Sotaro KARASAWA 9 лет назад
Родитель
Сommit
0769bc7b2b

+ 3 - 3
lib/models/page.js

@@ -330,9 +330,9 @@ module.exports = function(crowi) {
   pageSchema.statics.getGrantLabels = function() {
     var grantLabels = {};
     grantLabels[GRANT_PUBLIC]     = 'Public'; // 公開
-    grantLabels[GRANT_RESTRICTED] = 'Only who know the link'; // リンクを知っている人のみ
-    //grantLabels[GRANT_SPECIFIED]  = 'Specified users'; // 特定ユーザーのみ
-    grantLabels[GRANT_OWNER]      = 'Only me'; // 自分のみ
+    grantLabels[GRANT_RESTRICTED] = 'Anyone with the link'; // リンクを知っている人のみ
+    //grantLabels[GRANT_SPECIFIED]  = 'Specified users only'; // 特定ユーザーのみ
+    grantLabels[GRANT_OWNER]      = 'Just me'; // 自分のみ
 
     return grantLabels;
   };

+ 11 - 11
lib/routes/me.js

@@ -85,7 +85,7 @@ module.exports = function(crowi, app) {
       var lang= userForm.lang;
 
       if (!User.isEmailValid(email)) {
-        req.form.errors.push('このメールアドレスは登録できません。(ホワイトリストなどを確認してください)');
+        req.form.errors.push('You can\'t update to that email address');
         return res.render('me/index', {});
       }
 
@@ -130,14 +130,14 @@ module.exports = function(crowi, app) {
       var oldPassword = passwordForm.oldPassword;
 
       if (userData.isPasswordSet() && !userData.isPasswordValid(oldPassword)) {
-        req.form.errors.push('現在のパスワードが違います。');
+        req.form.errors.push('Wrong current password');
         return res.render('me/password', {
         });
       }
 
       // check password confirm
       if (newPassword != newPasswordConfirm) {
-        req.form.errors.push('確認用パスワードが一致しません');
+        req.form.errors.push('Failed to verify passwords');
       } else {
         userData.updatePassword(newPassword, function(err, userData) {
           if (err) {
@@ -149,7 +149,7 @@ module.exports = function(crowi, app) {
             return res.render('me/password', {});
           }
 
-          req.flash('successMessage', 'パスワードを変更しました');
+          req.flash('successMessage', 'Password updated');
           return res.redirect('/me/password');
         });
       }
@@ -166,12 +166,12 @@ module.exports = function(crowi, app) {
     if (req.method == 'POST' && req.form.isValid) {
       userData.updateApiToken()
       .then(function(userData) {
-          req.flash('successMessage', 'API Token を更新しました');
+          req.flash('successMessage', 'API Token updated');
           return res.redirect('/me/apiToken');
       })
       .catch(function(err) {
           //req.flash('successMessage',);
-          req.form.errors.push('API Token の更新に失敗しました');
+          req.form.errors.push('Failed to update API Token');
           return res.render('me/api_token', {
           });
       });
@@ -189,7 +189,7 @@ module.exports = function(crowi, app) {
   actions.deletePicture = function(req, res) {
     // TODO: S3 からの削除
     req.user.deleteImage(function(err, data) {
-      req.flash('successMessage', 'プロフィール画像を削除しました');
+      req.flash('successMessage', 'Deleted profile picture');
       res.redirect('/me');
     });
   };
@@ -203,7 +203,7 @@ module.exports = function(crowi, app) {
     var toConnect = req.body.connectGoogle ? true : false;
     if (toDisconnect) {
       userData.deleteGoogleId(function(err, userData) {
-        req.flash('successMessage', 'Googleコネクトを解除しました。');
+        req.flash('successMessage', 'Disconnected from Google account');
 
         return res.redirect('/me');
       });
@@ -234,13 +234,13 @@ module.exports = function(crowi, app) {
       var googleId = tokenInfo.user_id;
       var googleEmail = tokenInfo.email;
       if (!User.isEmailValid(googleEmail)) {
-        req.flash('warningMessage.auth.google', 'このメールアドレスのGoogleアカウントはコネクトできません。');
+        req.flash('warningMessage.auth.google', 'You can\'t connect with this  Google\'s account');
         return res.redirect('/me');
       }
 
       User.findUserByGoogleId(googleId, function(err, googleUser) {
         if (!err && googleUser) {
-          req.flash('warningMessage.auth.google', 'このGoogleアカウントは他のユーザーがコネクト済みです。');
+          req.flash('warningMessage.auth.google', 'This Google\'s account is connected by another user');
           return res.redirect('/me');
         } else {
           userData.updateGoogleId(googleId, function(err, userData) {
@@ -251,7 +251,7 @@ module.exports = function(crowi, app) {
             }
 
             // TODO if err
-            req.flash('successMessage', 'Googleコネクトを設定しました。');
+            req.flash('successMessage', 'Connected with Google');
             return res.redirect('/me');
           });
         }

+ 1 - 1
lib/views/layout/2column.html

@@ -36,7 +36,7 @@
   {% endif %}
   {% if page && page.grant == 2 %}
   <p class="alert alert-info">
-    {{ t('Share link of this page') }}
+    {{ t('Shareable Link') }}
     <input type="text" class="copy-link form-control" value="{{ baseUrl }}/{{ page._id.toString() }}" readonly>
   </p>
   {% endif %}

+ 1 - 1
lib/views/layout/layout.html

@@ -90,7 +90,7 @@
           <li class="divider"></li>
           <li><a href="/trash/"><i class="fa fa-trash-o"></i> {{ t('Deleted Pages') }}</a></li>
           <li class="divider"></li>
-          <li><a href="/logout"><i class="fa fa-sign-out"></i> {{ t('Logout') }}</a></li>
+          <li><a href="/logout"><i class="fa fa-sign-out"></i> {{ t('Sign out') }}</a></li>
           {# <li><a href="#">今日の日報を作成</a></li> #}
           {# <li class="divider"></li> #}
           {# <li class="divider"></li> #}

+ 3 - 3
lib/views/login.html

@@ -75,7 +75,7 @@
   {% if config.crowi['security:registrationMode'] != 'Closed' %}
   <div class="register-dialog-inner back">
 
-    <h2>{{ t('Registration') }}</h2>
+    <h2>{{ t('Sign up') }}</h2>
 
     {% if config.crowi['security:registrationMode'] == 'Restricted' %}
     <p class="alert alert-warning">
@@ -165,7 +165,7 @@
         <input type="hidden" name="registerForm[googleImage]" value="{{ googleImage }}">
       {% endif  %}
       <input type="hidden" name="_csrf" value="{{ csrf() }}">
-      <input type="submit" class="btn btn-primary btn-lg btn-block" value="{{ t('Registration') }}">
+      <input type="submit" class="btn btn-primary btn-lg btn-block" value="{{ t('Sign up') }}">
     </form>
 
     <hr>
@@ -173,7 +173,7 @@
     <div class="row">
       {% if googleLoginEnabled() %}
       <div class="col-md-6">
-        <p>{{ t('Register by Google Account') }}</p>
+        <p>{{ t('Sign up with Google Account') }}</p>
         <form role="form" method="post" action="/register/google">
           <input type="hidden" name="_csrf" value="{{ csrf() }}">
           <button type="submit" class="btn btn-block btn-google"><i class="fa fa-google-plus-square"></i> {{ t('Login') }}</button>

+ 4 - 4
lib/views/me/api_token.html

@@ -1,7 +1,7 @@
 {% extends '../layout/2column.html' %}
 
 
-{% block html_title %}{{ t('API Setting') }} · {{ path }}{% endblock %}
+{% block html_title %}{{ t('API Settings') }} · {{ path }}{% endblock %}
 
 {% block content_head %}
 <div class="header-wrap">
@@ -15,9 +15,9 @@
 <div class="content-main">
 
   <ul class="nav nav-tabs">
-    <li><a href="/me"><i class="fa fa-gears"></i> {{ t('User Infomation') }}</a></li>
+    <li><a href="/me"><i class="fa fa-gears"></i> {{ t('User Information') }}</a></li>
     <li><a href="/me/password"><i class="fa fa-key"></i> {{ t('Password Setting') }}</a></li>
-    <li class="active"><a href="/me/apiToken"><i class="fa fa-rocket"></i> {{ t('API Setting') }}</a></li>
+    <li class="active"><a href="/me/apiToken"><i class="fa fa-rocket"></i> {{ t('API Settings') }}</a></li>
   </ul>
 
   <div class="tab-content">
@@ -43,7 +43,7 @@
 
     <form action="/me/apiToken" method="post" class="form-horizontal" role="form">
     <fieldset>
-      <legend>{{ t('API Token Setting') }}</legend>
+      <legend>{{ t('API Token Settings') }}</legend>
       <div class="form-group {% if not user.password %}has-error{% endif %}">
         <label for="" class="col-xs-3 control-label">{{ t('Current API Token') }}</label>
         <div class="col-xs-6">

+ 6 - 6
lib/views/me/index.html

@@ -14,9 +14,9 @@
 <div class="content-main">
 
   <ul class="nav nav-tabs">
-    <li class="active"><a href="/me"><i class="fa fa-gears"></i> {{ t('User Infomation') }}</a></li>
-    <li><a href="/me/password"><i class="fa fa-key"></i> {{ t('Password Setting') }}</a></li>
-    <li><a href="/me/apiToken"><i class="fa fa-rocket"></i> {{ t('API Setting') }}</a></li>
+    <li class="active"><a href="/me"><i class="fa fa-gears"></i> {{ t('User Information') }}</a></li>
+    <li><a href="/me/password"><i class="fa fa-key"></i> {{ t('Password Settings') }}</a></li>
+    <li><a href="/me/apiToken"><i class="fa fa-rocket"></i> {{ t('API Settings') }}</a></li>
   </ul>
 
   <div class="tab-content">
@@ -49,7 +49,7 @@
   <div class="form-box">
     <form action="/me" method="post" class="form-horizontal" role="form">
       <fieldset>
-        <legend>{{ t('User Basic Infomation') }}</legend>
+        <legend>{{ t('Basic Info') }}</legend>
       <div class="form-group">
         <label for="userForm[name]" class="col-sm-2 control-label">{{ t('Name') }}</label>
         <div class="col-sm-4">
@@ -95,7 +95,7 @@
 
   <div class="form-box">
     <fieldset>
-      <legend>{{ t('Profile Image Setting') }}</legend>
+      <legend>{{ t('Set Profile Image') }}</legend>
         <div class="form-group">
           <div id="pictureUploadFormMessage"></div>
           <label for="" class="col-sm-3 control-label">
@@ -107,7 +107,7 @@
             </p>
             <p>
             {% if user.image %}
-            <form action="/me/picture/delete" method="post" class="form-horizontal" role="form" onsubmit="return window.confirm('{{ t('Are you sure to delete?') }}');">
+            <form action="/me/picture/delete" method="post" class="form-horizontal" role="form" onsubmit="return window.confirm('{{ t('Delete this image?') }}');">
               <button type="submit" class="btn btn-danger">{{ t('Delete Image') }}</button>
             </form>
             {% endif %}

+ 5 - 5
lib/views/me/password.html

@@ -1,6 +1,6 @@
 {% extends '../layout/2column.html' %}
 
-{% block html_title %}{{ t('Password Setting') }} · {{ path }}{% endblock %}
+{% block html_title %}{{ t('Password Settings') }} · {{ path }}{% endblock %}
 
 {% block content_head %}
 <div class="header-wrap">
@@ -14,9 +14,9 @@
 <div class="content-main">
 
   <ul class="nav nav-tabs">
-    <li><a href="/me"><i class="fa fa-gears"></i> {{ t('User Infomation') }}</a></li>
-    <li class="active"><a href="/me/password"><i class="fa fa-key"></i> {{ t('Password Setting') }}</a></li>
-    <li><a href="/me/apiToken"><i class="fa fa-rocket"></i> {{ t('API Setting') }}</a></li>
+    <li><a href="/me"><i class="fa fa-gears"></i> {{ t('User Information') }}</a></li>
+    <li class="active"><a href="/me/password"><i class="fa fa-key"></i> {{ t('Password Settings') }}</a></li>
+    <li><a href="/me/apiToken"><i class="fa fa-rocket"></i> {{ t('API Settings') }}</a></li>
   </ul>
 
   <div class="tab-content">
@@ -46,7 +46,7 @@
 
   {% if user.email %}
   <p>
-    {{ t('You can login email and password', user.email) }}
+    {{ t('You can sign in with email and password', user.email) }}
   </p>
   {% endif %}
 

+ 1 - 1
lib/views/modal/create_page.html

@@ -18,7 +18,7 @@
               <span class="page-today-prefix">{{ userPageRoot(user) }}/</span>
               <input type="text" data-prefix="{{ userPageRoot(user) }}/" class="page-today-input1 form-control" value="{{ t('Memo') }}" id="" name="">
               <span class="page-today-suffix">/{{ now|datetz('Y/m/d') }}/</span>
-              <input type="text" data-prefix="/{{ now|datetz('Y/m/d') }}/" class="page-today-input2 form-control" id="page-today-input2" name="" placeholder="{{ t('Input page name empty ok') }}">
+              <input type="text" data-prefix="/{{ now|datetz('Y/m/d') }}/" class="page-today-input2 form-control" id="page-today-input2" name="" placeholder="{{ t('Input page name (optional)') }}">
             </div>
             <div class="col-xs-2">
               <button type="submit" class="btn btn-primary">{{ t('Create') }}</button>

+ 1 - 1
lib/views/page.html

@@ -202,7 +202,7 @@
   </div>
   {% endif %}
 
-  <div id="notifPageEdited" class="fk-notif fk-notif-danger"><i class="fa fa-exclamation-triangle"></i> <span class="edited-user"></span> {{ t('was edited this page') }} <a href="javascript:location.reload();"><i class="fa fa-angle-double-right"></i> {{ t('Load latest') }}</a></div>
+  <div id="notifPageEdited" class="fk-notif fk-notif-danger"><i class="fa fa-exclamation-triangle"></i> <span class="edited-user"></span> {{ t('edited this page') }} <a href="javascript:location.reload();"><i class="fa fa-angle-double-right"></i> {{ t('Load latest') }}</a></div>
 </div>
 
 {% block content_main_after %}

+ 3 - 1
lib/views/user_page.html

@@ -36,9 +36,11 @@
       <li>
         <a href="#user-created-list" data-toggle="tab"><i class="fa fa-pencil"></i> Recent Created</a>
       </li>
+      {% if user._id.toString() == pageUser._id.toString() %}
       <li>
-        <a href="/me"><i class="fa fa-gears"></i> Setting</a>
+        <a href="/me"><i class="fa fa-gears"></i> Settings</a>
       </li>
+      {% endif %}
     </ul>
     <div class="user-page-content-tab tab-content">
 

+ 1 - 1
lib/views/widget/page_side_header.html

@@ -42,7 +42,7 @@
         </p>
       </dd>
 
-      <dt><i class="fa fa-paw"></i> {{ t('Viewer') }}</dt>
+      <dt><i class="fa fa-paw"></i> {{ t('Seen by') }}</dt>
       <dd>
         <div id="seen-user-list" data-seen-users="{{ page.seenUsers|default([])|join(',') }}"></div>
       </dd>

+ 39 - 39
locales/en-US/translation.json

@@ -5,7 +5,7 @@
   "Move": "Move",
   "Moved": "Moved",
   "Like!": "Like!",
-  "Viewer": "Viewer",
+  "Seen by": "Seen by",
   "Cancel": "Cancel",
   "Create": "Create",
   "Admin": "Admin",
@@ -18,12 +18,12 @@
   "Sign in": "Sign in",
   "Sign up is here": "Sign up",
   "Sign in is here": "Sign in",
-  "Registration": "Registration",
-  "Register by Google Account": "Register by Google Account",
-  "Sign in by Google Account": "Sign in by Google Account",
-  "Register with this Google Account": "Register with this Google Account",
+  "Sign up": "Sign up",
+  "Sign up with Google Account": "Sign up with Google Account",
+  "Sign in with Google Account": "Sign in with Google Account",
+  "Sign up with this Google Account": "Sign up with this Google Account",
   "Example": "Example",
-  "Taro Yamada": "Taro Yamada",
+  "Taro Yamada": "James Bond",
 
   "List View": "List",
   "Timeline View": "Timeline",
@@ -43,17 +43,17 @@
 
   "User ID": "User ID",
   "User Settings": "User Settings",
-  "User Infomation": "User Infomation",
-  "User Basic Infomation": "User Basic Infomation",
+  "User Information": "User Information",
+  "Basic Info": "Basic Info",
   "Name": "Name",
   "Email": "Email",
   "Language": "Language",
   "English": "English",
   "Japanese": "Japanese",
-  "Profile Image Setting": "Profile Image Setting",
+  "Set Profile Image": "Set Profile Image",
   "Current Image": "Current Image",
   "Delete Image": "Delete Image",
-  "Are you sure to delete?": "Are you sure to delete?",
+  "Delete this image?": "Delete this image?",
   "Updated": "Updated",
   "Upload new image": "Upload new image",
   "Google Setting": "Google Setting",
@@ -63,35 +63,35 @@
   "Create today's": "Create today's ...",
   "Memo": "memo",
   "Input page name": "Input page name",
-  "Input page name empty ok": "Input page name (empty ok)",
+  "Input page name (optional)": "Input page name (optional)",
   "New Page": "New Page",
   "Create under": "Create page under: <code>%s</code>",
 
   "Table of Contents": "Table of Contents",
 
   "Public": "Public",
-  "Only who know the link": "Only who know the link",
-  "Specified users": "Specified users",
-  "Only me": "Only me",
-  "Share link of this page": "Share link of this page",
+  "Anyone with the link": "Anyone with the link",
+  "Specified users only": "Specified users only",
+  "Just me": "Just me",
+  "Shareable link": "Shareable link",
 
   "Show latest": "Show latest",
   "Load latest": "Load latest",
-  "was edited this page": "was edited this page.",
+  "edited this page": "edited this page.",
 
   "Deleted Pages": "Deleted Pages",
-  "Logout": "Logout",
+  "Sign out": "Logout",
 
   "page_register": {
     "notice": {
-      "restricted": "New registration to this wiki is restricted.",
-      "restricted_defail": "In order to start using it, approval by the administrator is necessary after new registration.",
-      "google_account_continue": "Please decide user ID, name and password and continue registration."
+      "restricted": "Admin approval required.",
+      "restricted_defail": "Once the admin approves your sign up, you'll be able to access this wiki.",
+      "google_account_continue": "Enter your user ID, name and password to continue."
     },
     "form_help": {
-      "email": "In this wiki, only the following e-mail address can be registered.",
-      "password": "Please enter at least 6 letters, numbers, alphanumeric characters, symbols etc for password.",
-      "user_id": "The user ID is used for the URL of the user page etc. Only half-width alphanumeric characters and some symbols can be used."
+      "email": "You must have email address which listed below to sign up to this wiki.",
+      "password": "Your password must be at least 6 characters long.",
+      "user_id": "The URL of pages you create will contain your User ID. Your User ID can consist of letters, numbers, and some symbols."
     }
   },
 
@@ -99,32 +99,32 @@
     "form_help": {
       "google_connect1": "With Google Connect, you can sign in with your Google Account.",
       "google_connect2": "Only Google Apps accounts with the following email addresses are connectable Google accounts:",
-      "google_disconnect1": "If disconnet Google, you can not login by Google Authentication.",
-      "google_disconnect2": "After disconnect, you can login using email and password."
+      "google_disconnect1": "If you disconnect your Google account, you will be unable to sign in using Google Authentication",
+      "google_disconnect2": "After disconnecting your Google account, you can sign in normally using your email and password"
     }
   },
   "page_me_apitoken": {
     "notice": {
       "apitoken_issued": "API Token is not issued.",
-      "update_token1": "With updating, the new API Token will be generated.",
-      "update_token2": "You have to update the processes using the current API Token."
+      "update_token1": "You can update to generate a new API Token.",
+      "update_token2": "You will need to update the API Token in any existing processes."
     },
     "form_help": {
     }
   },
 
   "Password": "Password",
-  "Password Setting": "Password Setting",
+  "Password Settings": "Password Settings",
   "Set new Password": "Set new Password",
   "Update Password": "Update Password",
   "Current password": "Current password",
   "New password": "New password",
   "for check": "for check",
   "Please set a password": "Please set a password",
-  "You can login email and password": "You can login <code>%s</code> and password",
+  "You can sign in with email and password": "You can sign in with <code>%s</code> and password",
 
-  "API Setting": "API Setting",
-  "API Token Setting": "API Token Setting",
+  "API Settings": "API Settings",
+  "API Token Settings": "API Token Settings",
   "Current API Token": "Current API Token",
   "Update API Token": "Update API Token",
 
@@ -142,23 +142,23 @@
   "Redirect": "Redirect",
   "modal_rename": {
     "help": {
-      "redirect": "Redirect to the new page if someone access <code>%s</code>"
+      "redirect": "Redirect to new page if someone accesses <code>%s</code>"
     }
   },
 
   "modal_help": {
       "basic": {
-          "title": "基本的な機能",
-          "body1": "表示される画面には、「一覧ページ」と「ページ」の2種類があります",
-          "body2": "スラッシュ <code>/</code> で終わるページは、その階層の一覧ページとなります。",
-          "body3": "ページでの変更はすべて記録されています。History からそのページの過去の状態を見ることができます。"
+          "title": "Basics",
+          "body1": "There are 2 types of pages: List pages (showing lists of links to other pages) and normal pages.",
+          "body2": "Pages that end with a slash / are List pages for anything following the slash.",
+          "body3": "You can view older versions of a page from the History tab. Any changes made will be stored here."
       },
       "tips": {
-          "title": "編集のコツ",
-          "body1": "文章の <strong>構造</strong> を意識しましょう。本を書くように、内容と文脈を整理してセクション・サブセクション...と構造的に書くと、わかりやすく他人に伝わりやすいページがになります。"
+          "title": "Quick Tips on Editing",
+          "body1": "Use sections and subsections to make it easier for your friends to read your pages."
       },
       "markdown": {
-          "title": "記法"
+          "title": "Markdown Rules"
       }
   }
 }

+ 19 - 19
locales/ja/translation.json

@@ -5,7 +5,7 @@
   "Move": "移動",
   "Moved": "移動しました",
   "Like!": "いいね!",
-  "Viewer": "見た人",
+  "Seen by": "見た人",
   "Cancel": "キャンセル",
   "Create": "作成",
   "Admin": "管理",
@@ -18,10 +18,10 @@
   "Sign in": "ログイン",
   "Sign up is here": "新規登録はこちら",
   "Sign in is here": "ログインはこちら",
-  "Registration": "新規登録",
-  "Register by Google Account": "Google で登録",
-  "Sign in by Google Account": "Google でログイン",
-  "Register with this Google Account": "この Google アカウントで登録します",
+  "Sign up": "新規登録",
+  "Sign up with Google Account": "Google で登録",
+  "Sign in with Google Account": "Google でログイン",
+  "Sign up with this Google Account": "この Google アカウントで登録します",
   "Example": "例",
   "Taro Yamada": "山田 太郎",
 
@@ -43,17 +43,17 @@
 
   "User ID": "ユーザーID",
   "User Settings": "ユーザー設定",
-  "User Infomation": "ユーザー情報",
-  "User Basic Infomation": "ユーザーの基本情報",
+  "User Information": "ユーザー情報",
+  "Basic Info": "ユーザーの基本情報",
   "Name": "名前",
   "Email": "メールアドレス",
   "Language": "言語",
   "English": "英語",
   "Japanese": "日本語",
-  "Profile Image Setting": "プロフィール画像の設定",
+  "Set Profile Image": "プロフィール画像の設定",
   "Current Image": "現在の画像",
   "Delete Image": "画像を削除",
-  "Are you sure to delete?": "削除してよろしいですか?",
+  "Delete this image?": "削除してよろしいですか?",
   "Updated": "更新しました",
   "Upload new image": "新しい画像をアップロード",
   "Google Setting": "Google設定",
@@ -63,24 +63,24 @@
   "Create today's": "今日の◯◯を作成",
   "Memo": "メモ",
   "Input page name": "ページ名を入力",
-  "Input page name empty ok": "ページ名を入力(空欄OK)",
+  "Input page name (optional)": "ページ名を入力(空欄OK)",
   "New Page": "新規ページ",
   "Create under": "<code>%s</code>以下に作成",
 
   "Table of Contents": "目次",
 
   "Public": "公開",
-  "Only who know the link": "リンクを知っている人のみ",
+  "Anyone with the link": "リンクを知っている人のみ",
   "Specified users": "特定ユーザーのみ",
-  "Only me": "自分のみ",
-  "Share link of this page": "このページの共有用URL",
+  "Just me": "自分のみ",
+  "Shareable link": "このページの共有用URL",
 
   "Show latest": "最新のページを表示",
   "Load latest": "最新版を読み込む",
-  "was edited this page": "さんがこのページを編集しました。",
+  "edited this page": "さんがこのページを編集しました。",
 
   "Deleted Pages": "削除済みページ",
-  "Logout": "ログアウト",
+  "Sign out": "ログアウト",
 
   "page_register": {
     "notice": {
@@ -114,17 +114,17 @@
   },
 
   "Password": "パスワード",
-  "Password Setting": "パスワード設定",
+  "Password Settings": "パスワード設定",
   "Set new Password": "パスワードを新規に設定",
   "Update Password": "パスワードを更新",
   "Current password": "現在のパスワード",
   "New password": "新しいパスワード",
   "for check": "(確認用)",
   "Please set a password": "パスワードを設定してください",
-  "You can login email and password": "<code>%s</code> と設定されたパスワードの組み合わせでログイン可能になります。",
+  "You can sign in with email and password": "<code>%s</code> と設定されたパスワードの組み合わせでログイン可能になります。",
 
-  "API Setting": "API設定",
-  "API Token Setting": "API Token設定",
+  "API Settings": "API設定",
+  "API Token Settings": "API Token設定",
   "Current API Token": "現在のAPI Token",
   "Update API Token": "API Tokenを更新",