Merge remote-tracking branch 'refs/remotes/origin/dev' into xhr-torrent-refresh

templates/index.html

@@ -73,8 +73,8 @@
 			<footer id="footer">
 						<div class="container footer center">
 							<div class="footer-opt">
-								<button class="form-input btn" id="mascotKeepHide" onclick="toggleMascot(this)" value="hide"><span class="oi" data-glyph="eye"></span> Mascot</button>
-								<p><a href="/settings">Change Settings</a></p>
+								<button class="form-input btn" id="mascotKeepHide" onclick="toggleMascot(this)" value="hide"><span class="oi" data-glyph="eye"></span> {{ call $.T "mascot" }}</button>
+								<p><a href="/settings">{{ call $.T "change_settings" }}</a></p>
 							</div>
 							<span><i>Powered by <a href="#">NyaaPantsu</a></i></span>
 
@@ -84,4 +84,4 @@
 		<script type="text/javascript" charset="utf-8" src="{{.URL.Parse "/js/main.js"}}?v=3"></script>
 		{{ block "footer_js" .}}{{end}}
 	</body>
-</html>
+</html>

translations/en-us.all.json

@@ -971,6 +971,14 @@
     "id": "torrent_nav_deleted",
     "translation": "Torrents deleted"
   },
+  {
+    "id": "change_settings",
+    "translation": "Change Settings"
+  },
+  {
+    "id": "mascot",
+    "translation": "Mascot"
+  },
   {
     "id": "theme",
     "translation": "Theme"

translations/fr-fr.all.json

@@ -27,6 +27,14 @@
     "id": "nothing_here",
     "translation": "RAS"
   },
+  {
+    "id": "mascot",
+    "translation": "Mascotte"
+  },
+  {
+    "id": "change_settings",
+    "translation": "Préférences"
+  },
   {
     "id": "change_language",
     "translation": "Changer la langue"
@@ -101,7 +109,7 @@
   },
   {
     "id": "mark_as_hidden",
-    "translation": "Marquer comme caché"
+    "translation": "Marquer comme invisible"
   },
   {
     "id": "website_link",
@@ -585,7 +593,7 @@
   },
   {
     "id": "sign_in_box_title",
-    "translation": "Veuillez vous connecter"
+    "translation": "Connexion"
   },
   {
     "id": "email_address_or_username",

translations/ja-jp.all.json

@@ -969,7 +969,15 @@
   },
   {
     "id": "torrent_nav_deleted",
-    "translation": "Torrent は削除されました"
+    "translation": "Torrent は削除されます"
+  },
+  {
+    "id": "change_settings",
+    "translation": "設定の変更"
+  },
+  {
+    "id": "mascot",
+    "translation": "マスコット"
   },
   {
     "id": "theme",

translations/pt-br.all.json

@@ -971,6 +971,14 @@
     "id": "torrent_nav_deleted",
     "translation": "Torrents deletados"
   },
+  {
+    "id": "change_settings",
+    "translation": "Alterar Configurações"
+  },
+  {
+    "id": "mascot",
+    "translation": "Mascote"
+  },
   {
     "id": "theme",
     "translation": "Tema"