Merge pull request #498 from yueou/dev

Add new translations

templates/_captcha.html

@@ -2,7 +2,7 @@
 	{{/* unset if user doesn't need captcha */}}
 	{{if ne .CaptchaID ""}}
 	<div class="form-group captcha-container">
-		<label for="solution">Captcha</label>
+		<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>

templates/_profile_edit.html

@@ -102,7 +102,7 @@
             <div class="col-md-8">
               <input type="submit" class="btn btn-primary" name="save" value="{{ T "save_changes"}}">
               <span></span>
-              <input type="reset" class="btn btn-default" value="Cancel">
+              <input type="reset" class="btn btn-default" value="{{ T "cancel"}}">
             </div>
           </div>
         </form>

templates/admin/paneltorrentedit.html

@@ -10,7 +10,7 @@
 		{{end}}
       <div class="form-group">
       <label for="name">{{T "name"}}</label>
-          <input type="text" name="name" class="form-control" placeholder="File Name" value="{{.Name}}" required>
+          <input type="text" name="name" class="form-control" placeholder="{{T "file_name"}}" value="{{.Name}}" required>
       </div>
       <div class="form-group">
           <label for="c">{{T "category"}}</label>

templates/upload.html

@@ -7,7 +7,7 @@
 
       <div class="form-group">
       <label for="name">{{T "name"}}</label>
-          <input type="text" name="name" id="name" class="form-control" placeholder="File Name" value="{{.Name}}" autofocus required>
+          <input type="text" name="name" id="name" class="form-control" placeholder="{{T "file_name"}}" value="{{.Name}}" autofocus required>
       </div>
       <div class="form-group">
           <label for="torrent">{{T "torrent_file"}}</label>

translations/en-us.all.json

@@ -686,5 +686,17 @@
   {
     "id": "duplicate_deprecated",
     "translation": "Duplicate / Deprecated"
+  },
+  {
+    "id": "captcha",
+    "translation": "Captcha"
+  },
+  {
+    "id": "file_name",
+    "translation": "File Name"
+  },
+  {
+    "id": "cancel",
+    "translation": "Cancel"
   }
 ]

translations/zh-cn.all.json

@@ -634,5 +634,57 @@
   {
     "id": "delete",
     "translation": "删除"
+  },
+  {
+    "id": "uploaded_by",
+    "translation": "上传者"
+  },
+  {
+    "id": "download_btn",
+    "translation": "下载!"
+  },
+  {
+    "id": "report",
+    "translation": "举报!"
+  },
+  {
+    "id": "are_you_sure",
+    "translation": "真的要删除吗?"
+  },
+  {
+    "id": "report_torrent_number",
+    "translation": "举报种子 #"
+  },
+  {
+    "id": "report_type",
+    "translation": "举报理由"
+  },
+  {
+    "id": "illegal_content",
+    "translation": "内容错误"
+  },
+  {
+    "id": "spam_garbage",
+    "translation": "病毒 / 垃圾数据"
+  },
+  {
+    "id": "wrong_category",
+    "translation": "分类错误"
+  },
+  {
+    "id": "duplicate_deprecated",
+    "translation": "资源重复 / 低质量"
+  },
+  {
+    "id": "captcha",
+    "translation": "验证码"
+  },
+  {
+    "id": "file_name",
+    "translation": "文件名"
+  },
+  {
+    "id": "cancel",
+    "translation": "取消"
   }
 ]