From 4f8beb3717b9ab5e0bd0c33a529ddee90c63e583 Mon Sep 17 00:00:00 2001 From: mayaeh Date: Mon, 8 Apr 2019 09:16:14 +0900 Subject: [PATCH] i18n: Update Japanese translations (#10494) * Update Japanese translations * Update Japanese translations. --- .../mastodon/locales/defaultMessages.json | 52 +++++++++---------- app/javascript/mastodon/locales/en.json | 2 +- app/javascript/mastodon/locales/ja.json | 6 +-- config/locales/activerecord.ja.yml | 2 +- config/locales/en.yml | 2 + config/locales/ja.yml | 11 ++-- 6 files changed, 41 insertions(+), 34 deletions(-) diff --git a/app/javascript/mastodon/locales/defaultMessages.json b/app/javascript/mastodon/locales/defaultMessages.json index 5d13670206..e7b4b479a2 100644 --- a/app/javascript/mastodon/locales/defaultMessages.json +++ b/app/javascript/mastodon/locales/defaultMessages.json @@ -203,26 +203,6 @@ }, { "descriptors": [ - { - "defaultMessage": "Moments remaining", - "id": "time_remaining.moments" - }, - { - "defaultMessage": "{number, plural, one {# second} other {# seconds}} left", - "id": "time_remaining.seconds" - }, - { - "defaultMessage": "{number, plural, one {# minute} other {# minutes}} left", - "id": "time_remaining.minutes" - }, - { - "defaultMessage": "{number, plural, one {# hour} other {# hours}} left", - "id": "time_remaining.hours" - }, - { - "defaultMessage": "{number, plural, one {# day} other {# days}} left", - "id": "time_remaining.days" - }, { "defaultMessage": "Closed", "id": "poll.closed" @@ -263,6 +243,26 @@ { "defaultMessage": "{number}d", "id": "relative_time.days" + }, + { + "defaultMessage": "Moments remaining", + "id": "time_remaining.moments" + }, + { + "defaultMessage": "{number, plural, one {# second} other {# seconds}} left", + "id": "time_remaining.seconds" + }, + { + "defaultMessage": "{number, plural, one {# minute} other {# minutes}} left", + "id": "time_remaining.minutes" + }, + { + "defaultMessage": "{number, plural, one {# hour} other {# hours}} left", + "id": "time_remaining.hours" + }, + { + "defaultMessage": "{number, plural, one {# day} other {# days}} left", + "id": "time_remaining.days" } ], "path": "app/javascript/mastodon/components/relative_timestamp.json" @@ -552,8 +552,8 @@ { "descriptors": [ { - "defaultMessage": "You are blocked", - "id": "empty_column.account_timeline_blocked" + "defaultMessage": "Profile unavailable", + "id": "empty_column.account_unavailable" }, { "defaultMessage": "No toots here!", @@ -1256,8 +1256,8 @@ { "descriptors": [ { - "defaultMessage": "You are blocked", - "id": "empty_column.account_timeline_blocked" + "defaultMessage": "Profile unavailable", + "id": "empty_column.account_unavailable" }, { "defaultMessage": "No one follows this user yet.", @@ -1269,8 +1269,8 @@ { "descriptors": [ { - "defaultMessage": "You are blocked", - "id": "empty_column.account_timeline_blocked" + "defaultMessage": "Profile unavailable", + "id": "empty_column.account_unavailable" }, { "defaultMessage": "This user doesn't follow anyone yet.", diff --git a/app/javascript/mastodon/locales/en.json b/app/javascript/mastodon/locales/en.json index 45548eb556..baed4939c4 100644 --- a/app/javascript/mastodon/locales/en.json +++ b/app/javascript/mastodon/locales/en.json @@ -117,7 +117,7 @@ "emoji_button.symbols": "Symbols", "emoji_button.travel": "Travel & Places", "empty_column.account_timeline": "No toots here!", - "empty_column.account_timeline_blocked": "You are blocked", + "empty_column.account_unavailable": "Profile unavailable", "empty_column.blocks": "You haven't blocked any users yet.", "empty_column.community": "The local timeline is empty. Write something publicly to get the ball rolling!", "empty_column.direct": "You don't have any direct messages yet. When you send or receive one, it will show up here.", diff --git a/app/javascript/mastodon/locales/ja.json b/app/javascript/mastodon/locales/ja.json index 9f00332fc7..f80988d0d4 100644 --- a/app/javascript/mastodon/locales/ja.json +++ b/app/javascript/mastodon/locales/ja.json @@ -73,8 +73,8 @@ "compose_form.placeholder": "今なにしてる？", "compose_form.poll.add_option": "追加", "compose_form.poll.duration": "アンケート期間", - "compose_form.poll.option_placeholder": "選択肢 {number}", - "compose_form.poll.remove_option": "この選択肢を削除", + "compose_form.poll.option_placeholder": "項目 {number}", + "compose_form.poll.remove_option": "この項目を削除", "compose_form.publish": "トゥート", "compose_form.publish_loud": "{publish}！", "compose_form.sensitive.marked": "メディアに閲覧注意が設定されています", @@ -117,7 +117,7 @@ "emoji_button.symbols": "記号", "emoji_button.travel": "旅行と場所", "empty_column.account_timeline": "トゥートがありません！", - "empty_column.account_timeline_blocked": "ブロックされています", + "empty_column.account_unavailable": "プロフィールは利用できません", "empty_column.blocks": "まだ誰もブロックしていません。", "empty_column.community": "ローカルタイムラインはまだ使われていません。何か書いてみましょう！", "empty_column.direct": "ダイレクトメッセージはまだありません。ダイレクトメッセージをやりとりすると、ここに表示されます。", diff --git a/config/locales/activerecord.ja.yml b/config/locales/activerecord.ja.yml index c3b4b7484d..ce147819a5 100644 --- a/config/locales/activerecord.ja.yml +++ b/config/locales/activerecord.ja.yml @@ -4,7 +4,7 @@ ja: attributes: poll: expires_at: 期限 - options: 選択肢 + options: 項目 user: email: メールアドレス errors: diff --git a/config/locales/en.yml b/config/locales/en.yml index f7feaec36b..e56008a89b 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -81,6 +81,7 @@ en: destroyed_msg: Moderation note successfully destroyed! accounts: approve: Approve + approve_all: Approve all are_you_sure: Are you sure? avatar: Avatar by_domain: Domain @@ -145,6 +146,7 @@ en: push_subscription_expires: PuSH subscription expires redownload: Refresh profile reject: Reject + reject_all: Reject all remove_avatar: Remove avatar remove_header: Remove header resend_confirmation: diff --git a/config/locales/ja.yml b/config/locales/ja.yml index 09214a937c..f68df97106 100644 --- a/config/locales/ja.yml +++ b/config/locales/ja.yml @@ -68,6 +68,7 @@ ja: admin: Admin bot: Bot moderator: Mod + unavailable: プロフィールは利用できません unfollow: フォロー解除 admin: account_actions: @@ -80,6 +81,7 @@ ja: destroyed_msg: モデレーションメモを削除しました！ accounts: approve: 承認 + approve_all: すべて承認 are_you_sure: 本当に実行しますか？ avatar: アイコン by_domain: ドメイン @@ -125,7 +127,7 @@ ja: moderation: active: アクティブ all: すべて - pending: 保留中 + pending: 承認待ち silenced: サイレンス済み suspended: 停止済み title: モデレーション @@ -135,7 +137,7 @@ ja: no_limits_imposed: 制限なし not_subscribed: 購読していない outbox_url: Outbox URL - pending: 審査待ち + pending: 承認待ち perform_full_suspension: 活動を完全に停止させる profile_url: プロフィールURL promote: 昇格 @@ -144,6 +146,7 @@ ja: push_subscription_expires: PuSH購読期限 redownload: プロフィールを更新 reject: 却下 + reject_all: すべて却下 remove_avatar: アイコンを削除 remove_header: ヘッダーを削除 resend_confirmation: @@ -330,6 +333,8 @@ ja: expired: 期限切れ title: フィルター title: 招待 + pending_accounts: + title: 承認待ちアカウント (%{count}) relays: add_new: リレーを追加 delete: 削除 @@ -486,7 +491,7 @@ ja: admin_mailer: new_pending_account: body: 新しいアカウントの詳細は以下の通りです。この申請を承認または却下することができます。 - subject: "%{instance} で新しいアカウント (%{username}) が審査待ちです" + subject: "%{instance} で新しいアカウント (%{username}) が承認待ちです" new_report: body: "%{reporter} が %{target} を通報しました" body_remote: "%{domain} の誰かが %{target} を通報しました"