FB

resource/locales/en-US/translation.json

@@ -14,7 +14,7 @@
   "Cancel": "Cancel",
   "Create": "Create",
   "Admin": "Admin",
-  "Administrator": "Admin",
+  "administrator": "Admin",
   "Tag": "Tag",
   "Tags": "Tags",
   "New": "New",
@@ -26,8 +26,7 @@
   "Page Path": "Page Path",
   "Category": "Category",
   "User": "User",
-  "Status":"Status",
-  "Execution": "Execution",
+  "status":"Status",
 
   "Update": "Update",
   "Update Page": "Update Page",
@@ -689,22 +688,22 @@
     "external_account_list": "External Account List",
     "back_to_user_management": "Back to User Management",
     "authentication_provider": "Authentication Provider",
-    "Manage": "Manage",
-    "Edit_Menu": "Edit Menu",
+    "manage": "Manage",
+    "edit_menu": "Edit Menu",
     "password_setting": "Password Setting",
-    "password_setting_help": "Show whether the related user has a password set",
+    "password_setting_help": "Is password set?",
     "set": "Yes",
     "unset": "No",
     "temporary_password": "The created user has a temporary password",
-    "tell_temporary_password": "If you have not sent an invitation email, be sure to copy the temporary password on this screen and contact the invitee.",
-    "tell_new_password": "Please tell the new password to the target user.",
-    "password_never_seen": "The displayed password can not be displayed again when this screen is closed.",
-    "Reissue_password": "Reissue Password",
+    "send_temporary_password": "Be sure to copy the temporary password ON THIS SCREEN and send it to the user.",
+    "send_new_password": "Please send the new password to the user.",
+    "password_never_seen": "The temporary password can never be retrieved after this screen is closed.",
+    "reset_password": "Reset Password",
     "related_username": "Related user's <code>%s</code>",
     "accept": "Accept",
-    "Deactivate_account":"Deactivate Account",
+    "deactivate_account":"Deactivate Account",
     "your_own":"You cannot deactivate your own account",
-    "Administrator_menu":"Administrator Menu",
+    "administrator_menu":"Administrator Menu",
     "cannot_remove":"You cannot remove yourself from administrator",
     "cannot_invite_maximum_users": "Can not invite more than the maximum number of users.",
     "current_users": "Current users:"

resource/locales/ja/translation.json

@@ -14,7 +14,7 @@
   "Cancel": "キャンセル",
   "Create": "作成",
   "Admin": "管理",
-  "Administrator": "管理者",
+  "administrator": "管理者",
   "Tag": "タグ",
   "Tags": "タグ",
   "New": "作成",
@@ -26,8 +26,7 @@
   "Page Path": "ページパス",
   "Category": "カテゴリー",
   "User": "ユーザー",
-  "Status": "ステータス",
-  "Execution": "実行",
+  "status": "ステータス",
 
   "Update": "更新",
   "Update Page": "ページを更新",
@@ -689,22 +688,22 @@
     "external_account_list": "外部アカウント一覧",
     "back_to_user_management": "ユーザー管理に戻る",
     "authentication_provider": "認証情報プロバイダ",
-    "Manage": "操作",
-    "Edit_Menu": "編集メニュー",
+    "manage": "操作",
+    "edit_menu": "編集メニュー",
     "password_setting": "パスワード設定",
     "password_setting_help": "関連付けられているユーザーがパスワードを設定しているかどうかを表示します",
     "set": "設定済み",
     "unset": "未設定",
     "temporary_password": "作成したユーザーは仮パスワードが設定されています。",
-    "tell_temporary_password": "招待メールを送っていない場合、この画面で必ず仮パスワードをコピーし、招待者へ連絡してください。",
-    "tell_new_password": "新規発行したパスワードを、対象ユーザーへ連絡してください。",
+    "send_temporary_password": "招待メールを送っていない場合、この画面で必ず仮パスワードをコピーし、招待者へ連絡してください。",
+    "send_new_password": "新規発行したパスワードを、対象ユーザーへ連絡してください。",
     "password_never_seen": "表示されたパスワードはこの画面を閉じると二度と表示できませんのでご注意ください。",
-    "Reissue_password": "パスワードの再発行",
+    "reset_password": "パスワードの再発行",
     "related_username": "関連付けられているユーザーの <code>%s</code>",
     "accept": "承認する",
-    "Deactivate_account": "アカウント停止",
+    "deactivate_account": "アカウント停止",
     "your_own": "自分自身のアカウントを停止することはできません",
-    "Administrator_menu": "管理者メニュー",
+    "administrator_menu": "管理者メニュー",
     "cannot_remove": "自分自身を管理者から外すことはできません",
     "cannot_invite_maximum_users": "ユーザーが上限に達したため招待できません。",
     "current_users": "現在のユーザー数："

src/server/views/admin/users.html

@@ -77,7 +77,7 @@
             <div class="modal-body">
               <p>
                 {{ t('user_management.temporary_password') }}<br>
-                {{ t('user_management.password.never.seen') }}<span class="text-danger">{{ t('user_management.tell_temporary_password') }}</span>
+                {{ t('user_management.password.never.seen') }}<span class="text-danger">{{ t('user_management.send_temporary_password') }}</span>
               </p>
 
               <pre>{% for cUser in createdUser %}{% if cUser.user %}{{ cUser.email }} {{ cUser.password }}<br>{% else %}{{ cUser.email }} 作成失敗<br>{% endif %}{% endfor %}</pre>
@@ -94,13 +94,13 @@
           <div class="modal-content">
             <div class="modal-header">
               <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-              <div class="modal-title">{{ t('user_management.Reissue_password')}}</div>
+              <div class="modal-title">{{ t('user_management.reset_password')}}</div>
             </div>
 
             <div class="modal-body">
               <p>
                 {{ t('user_management.password_never_seen') }}<br>
-              <span class="text-danger">{{ t('user_management.tell_new_password') }}</span>
+              <span class="text-danger">{{ t('user_management.send_new_password') }}</span>
               </p>
               <p>
               {{ t('user_management.target_user') }}: <code id="admin-password-reset-user"></code>
@@ -110,7 +110,7 @@
                 <input type="hidden" name="user_id" value="">
                 <input type="hidden" name="_csrf" value="{{ csrf() }}">
                 <button type="submit" value="" class="btn btn-primary">
-                  {{ t('Execution')}}
+                  {{ t('user_management.reset_password')}}
                 </button>
               </form>
 
@@ -125,7 +125,7 @@
 
             <div class="modal-header">
               <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-              <div class="modal-title">Password reset!</div>
+              <div class="modal-title">{{ t('user_management.reset_password') }}</div>
             </div>
 
             <div class="modal-body">
@@ -150,7 +150,7 @@
         <thead>
           <tr>
             <th width="100px">#</th>
-            <th>{{ t('Status') }}</th>
+            <th>{{ t('status') }}</th>
             <th><code>{{ t('User') }}</code></th>
             <th>{{ t('Name') }}</th>
             <th>{{ t('Email') }}</th>
@@ -167,7 +167,7 @@
               <img src="{{ sUser|picture }}" class="picture img-circle" />
               {% if sUser.admin %}
               <span class="label label-inverse label-admin">
-              {{ t('Administrator') }}
+              {{ t('administrator') }}
               </span>
               {% endif %}
             </td>
@@ -193,7 +193,7 @@
                   <i class="icon-settings"></i> <span class="caret"></span>
                 </button>
                 <ul class="dropdown-menu" role="menu">
-                  <li class="dropdown-header">{{ t('user_management.Edit_Menu') }}</li>
+                  <li class="dropdown-header">{{ t('user_management.edit_menu') }}</li>
                   <li>
                     <a href="#"
                         data-user-id="{{ sUserId }}"
@@ -201,11 +201,11 @@
                         data-target="#admin-password-reset-modal"
                         data-toggle="modal">
                       <i class="icon-fw icon-key"></i>
-                      {{ t('user_management.Reissue_password') }}
+                      {{ t('user_management.reset_password') }}
                     </a>
                   </li>
                   <li class="divider"></li>
-                  <li class="dropdown-header">{{ t('Status') }}</li>
+                  <li class="dropdown-header">{{ t('status') }}</li>
 
                   {% if sUser.status == 1 %}
                   <form id="form_activate_{{ sUserId }}" action="/admin/user/{{ sUserId }}/activate" method="post">
@@ -226,12 +226,12 @@
                     {% if sUser.username != user.username %}
                     <a href="javascript:form_suspend_{{ sUserId }}.submit()">
                       <i class="icon-fw icon-ban"></i>
-                      {{ t('user_management.Deactivate_account') }}
+                      {{ t('user_management.deactivate_account') }}
                     </a>
                     {% else %}
                     <a disabled>
                       <i class="icon-fw icon-ban"></i>
-                      {{ t('user_management.Deactivate_account') }}
+                      {{ t('user_management.deactivate_account') }}
                     </a>
                     <p class="alert alert-danger m-l-10 m-r-10 p-10">{{ t("user_management.your_own") }}</p>
                     {% endif %}
@@ -272,7 +272,7 @@
 
                   {% if sUser.status == 2 %} {# activated な人だけこのメニューを表示 #}
                   <li class="divider"></li>
-                  <li class="dropdown-header">{{ t('user_management.Administrator_menu') }}</li>
+                  <li class="dropdown-header">{{ t('user_management.administrator_menu') }}</li>
 
                   {% if sUser.admin %}
                   <form id="form_removeFromAdmin_{{ sUserId }}" action="/admin/user/{{ sUser._id.toString() }}/removeFromAdmin" method="post">