From da0a18a318c9810fed95785c42460950b9d71183 Mon Sep 17 00:00:00 2001
From: Yamagishi Kazutoshi <ykzts@desire.sh>
Date: Sat, 20 May 2017 20:39:03 +0900
Subject: [PATCH] Add Japanese translations (domain block & admin page) (#3160)

https://github.com/tootsuite/mastodon/pull/3100
https://github.com/tootsuite/mastodon/pull/3127
---
 app/javascript/mastodon/locales/defaultMessages.json | 4 ++++
 app/javascript/mastodon/locales/ja.json              | 8 ++++----
 config/locales/ja.yml                                | 1 +
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/app/javascript/mastodon/locales/defaultMessages.json b/app/javascript/mastodon/locales/defaultMessages.json
index 67c7cc527a..6b7e632451 100644
--- a/app/javascript/mastodon/locales/defaultMessages.json
+++ b/app/javascript/mastodon/locales/defaultMessages.json
@@ -316,6 +316,10 @@
         "defaultMessage": "Report @{name}",
         "id": "account.report"
       },
+      {
+        "defaultMessage": "Media",
+        "id": "account.media"
+      },
       {
         "defaultMessage": "This user is from another instance. This number may be larger.",
         "id": "account.disclaimer"
diff --git a/app/javascript/mastodon/locales/ja.json b/app/javascript/mastodon/locales/ja.json
index b4445719d6..58c33565f8 100644
--- a/app/javascript/mastodon/locales/ja.json
+++ b/app/javascript/mastodon/locales/ja.json
@@ -1,6 +1,6 @@
 {
   "account.block": "ブロック",
-  "account.block_domain": "Hide everything from {domain}",
+  "account.block_domain": "{domain}全体を非表示",
   "account.disclaimer": "このユーザーは他のインスタンスに所属しているため、数字が正確で無い場合があります。",
   "account.edit_profile": "プロフィールを編集",
   "account.follow": "フォロー",
@@ -14,7 +14,7 @@
   "account.report": "通報",
   "account.requested": "承認待ち",
   "account.unblock": "ブロック解除",
-  "account.unblock_domain": "Unhide {domain}",
+  "account.unblock_domain": "{domain}を表示",
   "account.unfollow": "フォロー解除",
   "account.unmute": "ミュート解除",
   "boost_modal.combo": "次からは{combo}を押せば、これをスキップできます。",
@@ -43,8 +43,8 @@
   "confirmations.block.message": "本当に{name}をブロックしますか？",
   "confirmations.delete.confirm": "削除",
   "confirmations.delete.message": "本当に削除しますか？",
-  "confirmations.domain_block.confirm": "Hide entire domain",
-  "confirmations.domain_block.message": "Are you really, really sure you want to block the entire {domain}? In most cases a few targeted blocks or mutes are sufficient and preferable.",
+  "confirmations.domain_block.confirm": "ドメイン全体を非表示",
+  "confirmations.domain_block.message": "本当に{domain}全体を非表示にしますか？　多くの場合は個別にブロックやミュートするだけで充分であり、また好ましいです。",
   "confirmations.mute.confirm": "ミュート",
   "confirmations.mute.message": "本当に{name}をミュートしますか？",
   "emoji_button.activity": "活動",
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index 4bacd12fae..cc5430c473 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -85,6 +85,7 @@ ja:
       profile_url: プロフィールURL
       public: パブリック
       push_subscription_expires: PuSH購読期限切れ
+      reset: リセット
       reset_password: パスワード再設定
       salmon_url: Salmon URL
       search: 検索