about summary refs log tree commit diff
path: root/app/assets/javascripts
diff options
context:
space:
mode:
authorunarist <m.unarist@gmail.com>2017-04-28 03:41:25 +0900
committerEugen Rochko <eugen@zeonfederated.com>2017-04-27 20:41:25 +0200
commitebbbcfef1c805efbf0c6b80e4e9f1d7bcddba2ba (patch)
tree6856bc93ae9d7656f1cf4bf5dc209a5419045daf /app/assets/javascripts
parent3d776de2cba21241823e2981fb575d4cc3fd84b7 (diff)
Update Japanese translation (and English translation file) for JavaScript (#2538)
* Update English translation file for JavaScript

* Update Japanese translation for JavaScript
Diffstat (limited to 'app/assets/javascripts')
-rw-r--r--app/assets/javascripts/components/locales/en.jsx2
-rw-r--r--app/assets/javascripts/components/locales/ja.jsx7
2 files changed, 8 insertions, 1 deletions
diff --git a/app/assets/javascripts/components/locales/en.jsx b/app/assets/javascripts/components/locales/en.jsx
index b93633303..3e03312fc 100644
--- a/app/assets/javascripts/components/locales/en.jsx
+++ b/app/assets/javascripts/components/locales/en.jsx
@@ -25,7 +25,6 @@ const en = {
   "account.unfollow": "Unfollow",
   "account.unmute": "Unmute @{name}",
   "boost_modal.combo": "You can press {combo} to skip this next time",
-  "column_back_button.label": "Back",
   "column.blocks": "Blocked users",
   "column.community": "Local timeline",
   "column.favourites": "Favourites",
@@ -37,6 +36,7 @@ const en = {
   "column_back_button.label": "Back",
   "column_subheading.navigation": "Navigation",
   "column_subheading.settings": "Settings",
+  "compose_form.lock_disclaimer": "Your account is not {locked}. Anyone can follow you to view your follower-only posts.",
   "compose_form.lock_disclaimer.lock": "locked",
   "compose_form.placeholder": "What is on your mind?",
   "compose_form.privacy_disclaimer": "Your private status will be delivered to mentioned users on {domains}. Do you trust {domainsCount, plural, one {that server} other {those servers}}? Post privacy only works on Mastodon instances. If {domains} {domainsCount, plural, one {is not a Mastodon instance} other {are not Mastodon instances}}, there will be no indication that your post is private, and it may be boosted or otherwise made visible to unintended recipients.",
diff --git a/app/assets/javascripts/components/locales/ja.jsx b/app/assets/javascripts/components/locales/ja.jsx
index 97588e6f9..6a7536527 100644
--- a/app/assets/javascripts/components/locales/ja.jsx
+++ b/app/assets/javascripts/components/locales/ja.jsx
@@ -26,6 +26,8 @@ const ja = {
   "column_back_button.label": "戻る",
   "column_subheading.navigation": "ナビゲーション",
   "column_subheading.settings": "設定",
+  "compose_form.lock_disclaimer": "あなたのアカウントは{locked}になっていません。誰でもあなたをフォローすることができ、フォロワー限定の投稿を見ることができます。",
+  "compose_form.lock_disclaimer.lock": "非公開",
   "compose_form.placeholder": "今なにしてる?",
   "compose_form.privacy_disclaimer": "あなたの非公開トゥートは返信先ユーザーが所属する {domains} に送信されます。{domainsCount, plural, one {このサーバー} other {これらのサーバー}}は信頼できますか?投稿のプライバシー保護はMastodonサーバー内でのみ有効です。 {domains} {domainsCount, plural, one {がMastodonインスタンス} other {がMastodonインスタンス}}でない場合、あなたの投稿がプライベートなものとして扱われず、ブーストされたり予期しないユーザーに見られる可能性があります。",
   "compose_form.publish": "トゥート",
@@ -37,6 +39,8 @@ const ja = {
   "confirmations.block.message": "本当に {name} をブロックしますか?",
   "confirmations.delete.confirm": "削除",
   "confirmations.delete.message": "本当に削除しますか?",
+  "confirmations.mute.confirm": "ミュート",
+  "confirmations.mute.message": "本当に {name} をミュートしますか?",
   "emoji_button.label": "絵文字を追加",
   "emoji_button.search": "検索...",
   "emoji_button.people": "人々",
@@ -92,6 +96,7 @@ const ja = {
   "notifications.column_settings.show": "カラムに表示",
   "notifications.column_settings.sound": "通知音を再生",
   "notifications.settings": "カラム設定",
+  "onboarding.done": "完了",
   "onboarding.next": "次へ",
   "onboarding.page_one.welcome": "Mastodonへようこそ!",
   "onboarding.page_one.federation": "Mastodonは誰でも参加できるSNSです。",
@@ -109,6 +114,7 @@ const ja = {
   "onboarding.page_six.github": "MastodonはOSSです。バグ報告や機能要望あるいは貢献を{github}から行なえます。",
   "onboarding.page_six.apps_available": "iOS、Androidあるいは他のプラットフォームで使える{apps}があります。",
   "onboarding.page_six.various_app": "様々なモバイルアプリ",
+  "onboarding.page_six.appetoot": "Bon Appetoot!",
   "onboarding.skip": "スキップ",
   "privacy.change": "投稿のプライバシーを変更",
   "privacy.direct.long": "メンションしたユーザーだけに公開",
@@ -127,6 +133,7 @@ const ja = {
   "search.placeholder": "検索",
   "search.status_by": "{name}からの投稿",
   "search_results.total": "{count, number} 件の結果",
+  "status.cannot_reblog": "この投稿はブーストできません",
   "status.delete": "削除",
   "status.favourite": "お気に入り",
   "status.load_more": "もっと見る",