diff --git a/templates/layouts/partials/helpers/oldNav.jet.html b/templates/layouts/partials/helpers/oldNav.jet.html
index 5b0ef77a..98186e42 100644
--- a/templates/layouts/partials/helpers/oldNav.jet.html
+++ b/templates/layouts/partials/helpers/oldNav.jet.html
@@ -18,17 +18,17 @@
 	<tbody>
 		<tr>
 			<td>
-				{{ if Search.Sort != 2 && Search.Sort != 0}}<a href="{{ genSearchWithOrdering(URL, "2") }}">Date</a>{{else}}<b>Date</b>{{end}} / 
-				{{ if Search.Sort != 5}}<a href="{{ genSearchWithOrdering(URL, "5") }}">Seeders</a>{{else}}<b>Seeders</b>{{end}} / 
-				{{ if Search.Sort != 6}}<a href="{{ genSearchWithOrdering(URL, "6") }}">Leechers</a>{{else}}<b>Leechers</b>{{end}} / 
-				{{ if Search.Sort != 7}}<a href="{{ genSearchWithOrdering(URL, "7") }}">Downloads</a>{{else}}<b>Downloads</b>{{end}}  / 
-				{{ if Search.Sort != 4}}<a href="{{ genSearchWithOrdering(URL, "4") }}">Size</a>{{else}}<b>Size</b>{{end}}  / 
-				{{ if Search.Sort != 1}}<a href="{{ genSearchWithOrdering(URL, "1") }}">Name</a>{{else}}<b>Name</b>{{end}}  
+				{{ if Search.Sort != 2 && Search.Sort != 0}}<a href="{{ genSearchWithOrdering(URL, "2") }}">{{ T("date") }}</a>{{else}}<b>{{ T("date") }}</b>{{end}} / 
+				{{ if Search.Sort != 5}}<a href="{{ genSearchWithOrdering(URL, "5") }}">{{ T("seeders") }}</a>{{else}}<b>{{ T("seeders") }}</b>{{end}} / 
+				{{ if Search.Sort != 6}}<a href="{{ genSearchWithOrdering(URL, "6") }}">{{ T("leechers") }}</a>{{else}}<b>{{ T("leechers") }}</b>{{end}} / 
+				{{ if Search.Sort != 7}}<a href="{{ genSearchWithOrdering(URL, "7") }}">{{ T("downloads") }}</a>{{else}}<b>{{ T("downloads") }}</b>{{end}}  / 
+				{{ if Search.Sort != 4}}<a href="{{ genSearchWithOrdering(URL, "4") }}">{{ T("size") }}</a>{{else}}<b>{{ T("size") }}</b>{{end}}  / 
+				{{ if Search.Sort != 1}}<a href="{{ genSearchWithOrdering(URL, "1") }}">{{ T("name") }}</a>{{else}}<b>{{ T("name") }}</b>{{end}}  
 			</td>
 			<td style="padding: 0 0.35em!important;"> | </td>
 			<td>
-				{{ if Search.Order}}<a href="{{ genSearchWithOrdering(URL, toString(Search.Sort)) }}">Ascending</a>{{else}}<b>Ascending</b>{{end}} / 
-				{{ if !Search.Order}}<a href="{{ genSearchWithOrdering(URL, toString(Search.Sort)) }}">Descending</a>{{else}}<b>Descending</b>{{end}}
+				{{ if Search.Order}}<a href="{{ genSearchWithOrdering(URL, toString(Search.Sort)) }}">{{ T("ascending") }}</a>{{else}}<b>{{ T("ascending") }}</b>{{end}} / 
+				{{ if !Search.Order}}<a href="{{ genSearchWithOrdering(URL, toString(Search.Sort)) }}">{{ T("descending") }}</a>{{else}}<b>{{ T("descending") }}</b>{{end}}
 			</td>
 		</tr>
 	</tbody>
diff --git a/templates/site/torrents/view.jet.html b/templates/site/torrents/view.jet.html
index e1159181..9cee699a 100644
--- a/templates/site/torrents/view.jet.html
+++ b/templates/site/torrents/view.jet.html
@@ -325,7 +325,7 @@ document.querySelector("#modal_tag_form form").addEventListener("submit", functi
         document.getElementById("tags-torrent").innerHTML = tagHTml + document.getElementById("tags-torrent").innerHTML
       }
     } else {
-      alert("Couldn't add a tag, please check your internet connexion and that all fields are filled.")
+      alert("{{ T("tag_error") }}")
     }
   })
 
diff --git a/templates/site/user/edit.jet.html b/templates/site/user/edit.jet.html
index 4005705c..7864ec47 100644
--- a/templates/site/user/edit.jet.html
+++ b/templates/site/user/edit.jet.html
@@ -10,7 +10,7 @@
     {{ yield csrf_field()}}
     <label class="input-label">{{ T("api_token") }}:</label>
     <p style="font-family: monospace;">{{UserProfile.APIToken}}</p>
-    <a class="form-input up-input" href="/user/{{ UserProfile.ID}}/{{UserProfile.Username }}/apireset">Reset API key</a>
+    <a class="form-input up-input" href="/user/{{ UserProfile.ID}}/{{UserProfile.Username }}/apireset">{{ T("reset_api_key") }}</a>
     <br/>
     <br/>
     <a href="/apidoc">{{ T("api_documentation")}}</a>
@@ -65,8 +65,8 @@
     <label class="input-label">{{  T("new_torrent_settings") }}:</label>
     <br/>
     <select id="new_torrent" name="new_torrent" class="form-input up-input">
-      <option value="0" {{ if !UserProfile.Settings.Get("new_torrent") }}selected{{end}}>{{  T("no")}}</option>
-      <option value="1" {{ if UserProfile.Settings.Get("new_torrent") }}selected{{end}}>{{  T("yes")}}</option>
+      <option value="0" {{ if !UserProfile.Settings.Get("new_torrent") }}selected{{end}}>{{  T("disabled")}}</option>
+      <option value="1" {{ if UserProfile.Settings.Get("new_torrent") }}selected{{end}}>{{  T("enabled")}}</option>
     </select>
     <br/>
     {{ yield errors(name="NewTorrent")}}
@@ -75,16 +75,16 @@
     <label class="input-label">{{  T("new_torrent_email_settings") }}:</label>
     <br/>
     <select id="new_torrent_email" name="new_torrent_email" class="form-input up-input">
-      <option value="0" {{ if !UserProfile.Settings.Get("new_torrent_email") }}selected{{end}}>{{  T("no")}}</option>
-      <option value="1" {{ if UserProfile.Settings.Get("new_torrent_email")}}selected{{end}}>{{  T("yes")}}</option>
+      <option value="0" {{ if !UserProfile.Settings.Get("new_torrent_email") }}selected{{end}}>{{  T("disabled")}}</option>
+      <option value="1" {{ if UserProfile.Settings.Get("new_torrent_email")}}selected{{end}}>{{  T("enabled")}}</option>
     </select> <br>
     {{ yield errors(name="NewTorrentEmail")}}
     {{end}}
     {{ if DefaultUserSettings("new_comment")}}
     <label class="input-label">{{  T("new_comment_settings") }}:</label> <br>
     <select id="new_comment" name="new_comment" class="form-input up-input">
-      <option value="0" {{ if !UserProfile.Settings.Get("new_comment") }}selected{{end}}>{{  T("no")}}</option>
-      <option value="1" {{ if UserProfile.Settings.Get("new_comment") }}selected{{end}}>{{  T("yes")}}</option>
+      <option value="0" {{ if !UserProfile.Settings.Get("new_comment") }}selected{{end}}>{{  T("disabled")}}</option>
+      <option value="1" {{ if UserProfile.Settings.Get("new_comment") }}selected{{end}}>{{  T("enabled")}}</option>
     </select> <br>
     {{ yield errors(name="NewComment")}}
     {{end}}
@@ -92,8 +92,8 @@
     <label class="input-label">{{  T("new_comment_email_settings") }}:</label>
     <br/>
     <select id="new_comment_email" name="new_comment_email" class="form-input up-input">
-      <option value="0" {{ if !UserProfile.Settings.Get("new_comment_email") }}selected{{end}}>{{  T("no")}}</option>
-      <option value="1" {{ if UserProfile.Settings.Get("new_comment_email") }}selected{{end}}>{{  T("yes")}}</option>
+      <option value="0" {{ if !UserProfile.Settings.Get("new_comment_email") }}selected{{end}}>{{  T("disabled")}}</option>
+      <option value="1" {{ if UserProfile.Settings.Get("new_comment_email") }}selected{{end}}>{{  T("enabled")}}</option>
     </select>
     <br/>
     {{ yield errors(name="NewCommentEmail")}}
@@ -102,8 +102,8 @@
     <label class="input-label">{{  T("new_responses_settings") }}:</label>
     <br/>
     <select id="new_responses" name="new_responses" class="form-input up-input">
-      <option value="0" {{ if !UserProfile.Settings.Get("new_responses") }}selected{{end}}>{{  T("no")}}</option>
-      <option value="1" {{ if UserProfile.Settings.Get("new_responses")}}selected{{end}}>{{  T("yes")}}</option>
+      <option value="0" {{ if !UserProfile.Settings.Get("new_responses") }}selected{{end}}>{{  T("disabled")}}</option>
+      <option value="1" {{ if UserProfile.Settings.Get("new_responses")}}selected{{end}}>{{  T("enabled")}}</option>
     </select>
     <br/>
     {{ yield errors(name="NewResponses")}}
@@ -111,8 +111,8 @@
     {{ if DefaultUserSettings("new_responses_email")}}
     <label class="input-label">{{  T("new_responses_email_settings") }}:</label> <br>
     <select id="new_responses_email" name="new_responses_email" class="form-input up-input">
-      <option value="0" {{ if UserProfile.Settings.Get("new_responses_email") }}selected{{end}}>{{  T("no")}}</option>
-      <option value="1" {{ if UserProfile.Settings.Get("new_responses_email")}}selected{{end}}>{{  T("yes")}}</option>
+      <option value="0" {{ if UserProfile.Settings.Get("new_responses_email") }}selected{{end}}>{{  T("disabled")}}</option>
+      <option value="1" {{ if UserProfile.Settings.Get("new_responses_email")}}selected{{end}}>{{  T("enabled")}}</option>
     </select>
     <br/>
     {{ yield errors(name="NewResponsesEmail")}}
@@ -120,8 +120,8 @@
     {{ if DefaultUserSettings("new_follower")}}
     <label class="input-label">{{  T("new_follower_settings") }}:</label> <br>
     <select id="new_follower" name="new_follower" class="form-input up-input">
-      <option value="0" {{ if UserProfile.Settings.Get("new_follower") }}selected{{end}}>{{  T("no")}}</option>
-      <option value="1" {{ if UserProfile.Settings.Get("new_follower")}}selected{{end}}>{{  T("yes")}}</option>
+      <option value="0" {{ if UserProfile.Settings.Get("new_follower") }}selected{{end}}>{{  T("disabled")}}</option>
+      <option value="1" {{ if UserProfile.Settings.Get("new_follower")}}selected{{end}}>{{  T("enabled")}}</option>
     </select>
     <br/>
     {{ yield errors(name="NewFollower")}}
@@ -129,8 +129,8 @@
     {{ if DefaultUserSettings("new_follower_email")}}
     <label class="input-label">{{  T("new_follower_email_settings") }}:</label> <br>
     <select id="new_follower_email" name="new_follower_email" class="form-input up-input">
-      <option value="0" {{ if UserProfile.Settings.Get("new_follower_email") }}selected{{end}}>{{  T("no")}}</option>
-      <option value="1" {{ if UserProfile.Settings.Get("new_follower_email")}}selected{{end}}>{{  T("yes")}}</option>
+      <option value="0" {{ if UserProfile.Settings.Get("new_follower_email") }}selected{{end}}>{{  T("disabled")}}</option>
+      <option value="1" {{ if UserProfile.Settings.Get("new_follower_email")}}selected{{end}}>{{  T("enabled")}}</option>
     </select>
     <br/>
     {{ yield errors(name="NewFollowerEmail")}}
@@ -138,8 +138,8 @@
     {{ if DefaultUserSettings("followed")}}
     <label class="input-label">{{  T("followed_settings") }}:</label> <br>
     <select id="followed" name="followed" class="form-input up-input">
-      <option value="0" {{ if UserProfile.Settings.Get("followed") }}selected{{end}}>{{  T("no")}}</option>
-      <option value="1" {{ if UserProfile.Settings.Get("followed")}}selected{{end}}>{{  T("yes")}}</option>
+      <option value="0" {{ if UserProfile.Settings.Get("followed") }}selected{{end}}>{{  T("disabled")}}</option>
+      <option value="1" {{ if UserProfile.Settings.Get("followed")}}selected{{end}}>{{  T("enabled")}}</option>
     </select>
     <br/>
     {{ yield errors(name="Followed")}}
@@ -148,8 +148,8 @@
     <label class="input-label">{{  T("followed_email_settings") }}:</label>
     <br/>
     <select id="followed_email" name="followed_email" class="form-input up-input">
-      <option value="0" {{ if UserProfile.Settings.Get("followed_email") }}selected{{end}}>{{  T("no")}}</option>
-      <option value="1" {{ if UserProfile.Settings.Get("followed_email")}}selected{{end}}>{{  T("yes")}}</option>
+      <option value="0" {{ if UserProfile.Settings.Get("followed_email") }}selected{{end}}>{{  T("disabled")}}</option>
+      <option value="1" {{ if UserProfile.Settings.Get("followed_email")}}selected{{end}}>{{  T("enabled")}}</option>
     </select>
     <br/>
     {{ yield errors(name="FollowedEmail")}}
diff --git a/templates/site/user/public/settings.jet.html b/templates/site/user/public/settings.jet.html
index b34fa027..7e60554f 100644
--- a/templates/site/user/public/settings.jet.html
+++ b/templates/site/user/public/settings.jet.html
@@ -29,8 +29,8 @@
     <h3>{{ T("old_nav") }}</h3>
       <p>{{ T("old_nav_explanation") }}</p>
     <select id="oldNav-selector" name="oldNav" class="form-input">
-      <option value="false">Disabled</option>
-      <option value="true" {{if OldNav}}selected{{end}}>Enabled</option>
+      <option value="false">{{ T("disabled") }}</option>
+      <option value="true" {{if OldNav}}selected{{end}}>{{ T("enabled") }}</option>
     </select>
     <br/>
     </span>
@@ -53,8 +53,8 @@
     <span class="form-group">
     <h3>{{ T("alternating_color") }}</h3>
     <select id="altColors-selector" name="altColors" class="form-input">
-      <option value="false">Disabled</option>
-      <option value="true" {{if AltColors}}selected{{end}}>Enabled</option>
+      <option value="false">{{ T("disabled") }}</option>
+      <option value="true" {{if AltColors}}selected{{end}}>{{ T("enabled") }}</option>
     </select>
     <br/>
     </span>
diff --git a/translations/CHANGELOG.md b/translations/CHANGELOG.md
index ab4088f9..cbc10da9 100644
--- a/translations/CHANGELOG.md
+++ b/translations/CHANGELOG.md
@@ -45,3 +45,8 @@
 * + read_rules
 ## 2017/09/18
 * - language_not_mandatory
+## 2017/09/24
+* + enabled
+* + disabled
+* + reset_api_key
+* + tag_error
diff --git a/translations/en-us.all.json b/translations/en-us.all.json
index dd9eda85..92d5cc13 100644
--- a/translations/en-us.all.json
+++ b/translations/en-us.all.json
@@ -1,4 +1,5 @@
-[{
+[
+  {
     "id": "read_rules",
     "translation": "Please read <a href=\"/faq#rules\">the rules</a> before uploading."
   },
@@ -2125,5 +2126,21 @@
   {
     "id": "cookie_warning",
     "translation": "By using this website, you agree to the usage of cookies for purposes such as customizing content.<br/>This message will be hidden at the next page load."
+  },
+  {
+    "id": "enabled",
+    "translation": "Enabled"
+  },
+  {
+    "id": "disabled",
+    "translation": "Disabled"
+  },
+  {
+    "id": "reset_api_key",
+    "translation": "Reset API key"
+  },
+  {
+    "id": "tag_error",
+    "translation": "Couldn't add a tag, please check your internet connection and that all fields are filled."
   }
 ]
diff --git a/translations/ja-jp.all.json b/translations/ja-jp.all.json
index 68d00a6f..baa96064 100644
--- a/translations/ja-jp.all.json
+++ b/translations/ja-jp.all.json
@@ -1289,7 +1289,7 @@
   },
   {
     "id": "reassign_warning",
-    "translation": "Torrent の新しいユーザーへの再割り当ては容易に元に戻すことができないため、注意して行うようにしてください。"
+    "translation": "Torrent の新しいユーザーへの再割り当ては容易に元に戻すことができないため、注意を払って行うようにください。"
   },
   {
     "id": "previous_username",
@@ -1333,7 +1333,7 @@
   },
   {
     "id": "old_nav_explanation",
-    "translation": "nyaa.se のように、検索中にページの上部にメインカテゴリとページ番号を表示します。絞り込みを置き換えます。"
+    "translation": "nyaa.se のように、検索中にページの上部に主要カテゴリーとページ番号を表示します。絞り込み部分を置き換えます。"
   },
   {
     "id": "no_notifications",
@@ -1837,7 +1837,7 @@
   },
   {
     "id": "torrent_lang_invalid",
-    "translation": "送信された言語はまだサポートされていません。私たちの GitHub ページへの貢献で支援できます"
+    "translation": "送信された言語はまだサポートされていません。私たちの GitHub ページで是非ご支援ください"
   },
   {
     "id": "torrent_cat_is_english",
@@ -2105,7 +2105,7 @@
   },
   {
     "id": "complement",
-    "translation": "補足"
+    "translation": "補充"
   },
   {
     "id": "from",
@@ -2126,5 +2126,21 @@
   {
     "id": "cookie_warning",
     "translation": "この Web サイトを使用することにより、Cookie がコンテンツのカスタマイズなどの目的で使用されることに同意したものとみなします。<br/>このメッセージは、次回から表示されなくなります。"
+  },
+  {
+    "id": "enabled",
+    "translation": "有効"
+  },
+  {
+    "id": "disabled",
+    "translation": "無効"
+  },
+  {
+    "id": "reset_api_key",
+    "translation": "API キーをリセット"
+  },
+  {
+    "id": "tag_error",
+    "translation": "タグを追加できませんでした。インターネットに接続されているか、すべてのフィールドが入力されているかを確認してください。"
   }
 ]