Merge branch 'dev' of https://github.com/ewhal/nyaa into dev

templates/_captcha.html

@@ -5,7 +5,7 @@
 		<label for="solution">{{T "captcha"}}</label>
 		<input type="text" name="captchaID" value="{{.CaptchaID}}" hidden>
 		<img src="/captcha/{{.CaptchaID}}.png">
-		<input type="text" name="solution" id="solution" class="form-control" placeholder="Captcha" autocomplete="off" required>
+		<input type="text" name="solution" id="solution" class="form-control" placeholder="{{T "captcha"}}" autocomplete="off" required>
 	</div>
 	{{end}}
 {{end}}

translations/th-th.all.json

@@ -317,11 +317,7 @@
   },
   {
     "id": "answer_which_trackers_do_you_recommend",
-    "translation": "เรามีแทรคเกอร์เป็นของตัวเองแล้ว! กรุณาใส่ไว้บนสุดของลิสต์ก่อนอัพโหลด:"
-  },
-  {
-    "id": "other_trackers",
-    "translation": "แต่คุณควรใส่ตามนี้ลงไปด้วยเผื่อมันมีอันเป็นไป"
+    "translation": "เรามีแทรคเกอร์เป็นของตัวเองในชื่อ doko.moe กรุณาใส่ไว้บนสุดของลิสต์ก่อนอัพโหลด และควรใส่แทรคเกอร์เหล่านี้ไปด้วยเพื่อให้ทอร์เรนท์คงความยืดหยุ่น"
   },
   {
     "id": "how_can_i_help",

translations/zh-cn.all.json

@@ -229,7 +229,7 @@
   },
   {
     "id": "official_nyaapocalipse_faq",
-    "translation": "NYAA末日的官方FAQ"
+    "translation": "关于Nyaa站临终的常见问题"
   },
   {
     "id": "links_replacement_mirror",
@@ -283,6 +283,14 @@
     "id": "answer_how_are_we_recovering",
     "translation": "前面所说的资料都存放在 nyaa.pantsu.cat 和 sukebei.pantsu.cat 的服务器上。 我们也会尽快恢复旧 nyaa 站的全部功能。"
   },
+  {
+    "id": "how_do_i_link_my_old_account",
+    "translation": "怎样把我以前上传的资源连接到我的新账号上?"
+  },
+  {
+    "id": "answer_how_do_i_link_my_old_account",
+    "translation": "加入 <a href=\"ircs://irc.rizon.net/nyaapantsu-help\">#nyaapantsu-help@Rizon</a> 找管理员并把你曾上传的资源，以及你的旧用户名和新用户名告诉他。"
+  },
   {
     "id": "are_the_trackers_working",
     "translation": "那..这些种子都还活着吗？"
@@ -349,7 +357,7 @@
   },
   {
     "id": "magnet_link",
-    "translation": "磁力链接地址"
+    "translation": "磁力链接"
   },
   {
     "id": "all_categories",
@@ -505,7 +513,7 @@
   },
   {
     "id": "submit_a_comment_as_username",
-    "translation": "以用户名 %s 评论"
+    "translation": "作为 %s 发表评论"
   },
   {
     "id": "submit_a_comment_as_anonymous",
@@ -571,13 +579,17 @@
     "id": "moderation",
     "translation": "节制"
   },
+  {
+    "id": "api_token",
+    "translation": "API Token"
+  },
   {
     "id": "who_is_renchon",
     "translation": "れんちょん是谁?"
   },
   {
     "id": "renchon_anon_explanation",
-    "translation": "れんちょん是匿名评论与上传者的默认用户名，同时也显示为Nyaa站原始资源的上传者."
+    "translation": "れんちょん(Ren-chon)是匿名评论与上传者的默认用户名，同时也显示为Nyaa站原始资源的上传者."
   },
   {
     "id": "mark_as_remake",
@@ -635,16 +647,24 @@
     "id": "delete",
     "translation": "删除"
   },
+  {
+    "id": "files",
+    "translation": "文件"
+  },
+  {
+    "id": "filename",
+    "translation": "文件名"
+  },
   {
     "id": "uploaded_by",
     "translation": "上传者"
   },
   {
     "id": "download_btn",
-    "translation": "下载!"
+    "translation": "下载！"
   },
   {
-    "id": "report",
+    "id": "report_btn",
     "translation": "举报!"
   },
   {