From 9b7af2d504829447d8051bdd22049bc44699a767 Mon Sep 17 00:00:00 2001
From: MMP0 <mmmmpp0@yahoo.co.jp>
Date: Thu, 11 Jan 2018 23:27:24 +0900
Subject: [PATCH] Update translation (#1755)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Update upload.jet.html

"Upload to" → "Upload to %s"

* "Upload to" → "Upload to %s"

* "Uploader vers" → "Uploader vers %s"

* Update CHANGELOG.md

* Update ja-jp.all.json
---
 templates/site/torrents/upload.jet.html |  8 +++---
 translations/CHANGELOG.md               |  2 ++
 translations/en-us.all.json             |  2 +-
 translations/fr-fr.all.json             |  2 +-
 translations/ja-jp.all.json             | 36 +++++++++++++++++++++++++
 5 files changed, 44 insertions(+), 6 deletions(-)

diff --git a/templates/site/torrents/upload.jet.html b/templates/site/torrents/upload.jet.html
index 7623c590..15254b08 100644
--- a/templates/site/torrents/upload.jet.html
+++ b/templates/site/torrents/upload.jet.html
@@ -67,12 +67,12 @@
 		     <td class="table-input markdown-container"><textarea name="desc" id="desc" class="form-input up-input" style="height: 10rem;">{{Form.Description}}</textarea></td>
 		  </tr>
 		  <tr>
-			<td class="table-input-label">{{ T("upload_to") }} Anidex, Nyaa.si, TokyoTosho:</td>
+			<td class="table-input-label">{{ T("upload_to", "Anidex, Nyaa.si, TokyoTosho") }}:</td>
 			<td class="table-input">
 				 <details id="anidex-upload-info">
 				  <summary class="form-input">{{ T("upload_to_other") }}</summary>
 				  <div class="form-input">
-					<p>{{ T("upload_to") }} <b>Anidex</b>:</p>
+					<p>{{ T("upload_to", "<b>Anidex</b>") }}:</p>
 					<div>
 						<div class="checkbox-container"><input type="checkbox" value="true" name="anidex_upload" id="anidex_upload" class="form-torrent" {{if User.AnidexAPIToken != ""}}checked{{end}} /></div>
 						<input name="anidex_api" id="anidex_api" placeholder="Anidex API token" class="form-input" type="text" value="{{User.AnidexAPIToken}}" {{if User.AnidexAPIToken != ""}}disabled{{end}}/>
@@ -132,7 +132,7 @@
 						</select>
 					</div>
 					
-					<p>{{ T("upload_to") }} <b>Nyaa.si</b>:</p>
+					<p>{{ T("upload_to", "<b>Nyaa.si</b>") }}:</p>
 					<div>
 					<div class="checkbox-container"><input type="checkbox" value="true" name="nyaasi_upload" id="nyaasi_upload" class="form-torrent"/></div>
 					<input name="nyaasi_username" id="nyaasi_username" placeholder="Nyaa.si Username" class="form-input up-input" type="text" value="" />
@@ -140,7 +140,7 @@
 					<input name="nyaasi_password" id="nyaasi_password" placeholder="Nyaa.si Password" class="form-input up-input" type="password" value="" />
 					</div>
 					
-					<p>{{ T("upload_to") }} <b>TokyoTosho</b>:</p>
+					<p>{{ T("upload_to", "<b>TokyoTosho</b>") }}:</p>
 					<div>
 						<div class="checkbox-container"><input type="checkbox" value="true" name="tokyot_upload" id="tokyot_upload" {{if User.TokyoTAPIToken  != ""}}checked{{end}} class="form-torrent"/></div>
 						<input name="tokyot_api" id="tokyot_api" placeholder="TokyoTosho API token" class="form-input up-input" type="text" value="{{User.TokyoTAPIToken }}" {{if User.AnidexAPIToken != ""}}disabled{{end}}/>
diff --git a/translations/CHANGELOG.md b/translations/CHANGELOG.md
index c95eb3bb..1df53872 100644
--- a/translations/CHANGELOG.md
+++ b/translations/CHANGELOG.md
@@ -113,3 +113,5 @@
 * + torrent_uploaded_locked
 * + moderation_guidelines
 * + guidelines
+## 2018/01/09
+* + changed: upload_to
diff --git a/translations/en-us.all.json b/translations/en-us.all.json
index 2ba34df4..4b703957 100644
--- a/translations/en-us.all.json
+++ b/translations/en-us.all.json
@@ -2285,7 +2285,7 @@
   },
   {
     "id": "upload_to",
-    "translation": "Upload to"
+    "translation": "Upload to %s"
   },
   {
     "id": "upload_to_other",
diff --git a/translations/fr-fr.all.json b/translations/fr-fr.all.json
index 9f125ddd..5004a664 100644
--- a/translations/fr-fr.all.json
+++ b/translations/fr-fr.all.json
@@ -2301,7 +2301,7 @@
   },
   {
     "id": "upload_to",
-    "translation": "Uploader vers"
+    "translation": "Uploader vers %s"
   },
   {
     "id": "upload_to_other",
diff --git a/translations/ja-jp.all.json b/translations/ja-jp.all.json
index 36e6df6a..3c091103 100644
--- a/translations/ja-jp.all.json
+++ b/translations/ja-jp.all.json
@@ -2267,6 +2267,42 @@
     "id": "status",
     "translation": "状態"
   },
+  {
+    "id": "upload_status",
+    "translation": "アップロードの状態"
+  },
+  {
+    "id": "pending",
+    "translation": "保留中"
+  },
+  {
+    "id": "error",
+    "translation": "エラー"
+  },
+  {
+    "id": "finished",
+    "translation": "完了"
+  },
+  {
+    "id": "upload_to",
+    "translation": "%s へのアップロード"
+  },
+  {
+    "id": "upload_to_other",
+    "translation": "他の Web サイトにアップロード"
+  },
+  {
+    "id": "upload_to_other",
+    "translation": "他の Web サイトにアップロード"
+  },
+  {
+    "id":"choose_category",
+    "translation": "カテゴリーの選択 (必須)"
+  },
+  {
+    "id":"choose_language",
+    "translation": "言語の選択 (必須)"
+  },
   {
     "id": "event",
     "translation": "イベント"