diff options
| author | beatrix <beatrix.bitrot@gmail.com> | 2017-12-21 22:49:30 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-21 22:49:30 -0500 |
| commit | 4a7782d5c98f830f5ef65a52f176d94bef53b7fc (patch) | |
| tree | 198388abfc7bf79b12c3b3a74ea04eae3e9ea4f2 /app/javascript | |
| parent | 60d415bc5e05c6f82d8ca643f52f6081246614f7 (diff) | |
| parent | fb57ec41df678bb10cd423f9e00f1c82621ca5db (diff) | |
Merge pull request #280 from KnzkDev/add-en-ja
i18n: Add en and ja
Diffstat (limited to 'app/javascript')
| -rw-r--r-- | app/javascript/mastodon/locales/en.json | 4 | ||||
| -rw-r--r-- | app/javascript/mastodon/locales/ja.json | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/app/javascript/mastodon/locales/en.json b/app/javascript/mastodon/locales/en.json index 3fc4a8c96..098bebf8f 100644 --- a/app/javascript/mastodon/locales/en.json +++ b/app/javascript/mastodon/locales/en.json @@ -49,6 +49,9 @@ "column_header.pin": "Pin", "column_header.show_settings": "Show settings", "column_header.unpin": "Unpin", + "column.heading": "Misc", + "column.subheading": "Miscellaneous options", + "column_subheading.lists": "Lists", "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.", @@ -150,6 +153,7 @@ "navigation_bar.info": "About this instance", "navigation_bar.keyboard_shortcuts": "Keyboard shortcuts", "navigation_bar.lists": "Lists", + "navigation_bar.misc": "Misc", "navigation_bar.logout": "Logout", "navigation_bar.mutes": "Muted users", "navigation_bar.pins": "Pinned toots", diff --git a/app/javascript/mastodon/locales/ja.json b/app/javascript/mastodon/locales/ja.json index 68abd906f..614ef8815 100644 --- a/app/javascript/mastodon/locales/ja.json +++ b/app/javascript/mastodon/locales/ja.json @@ -49,6 +49,9 @@ "column_header.pin": "ピン留めする", "column_header.show_settings": "設定を表示", "column_header.unpin": "ピン留めを外す", + "column.heading": "その他", + "column.subheading": "その他のオプション", + "column_subheading.lists": "リスト", "column_subheading.navigation": "ナビゲーション", "column_subheading.settings": "設定", "compose_form.lock_disclaimer": "あなたのアカウントは{locked}になっていません。誰でもあなたをフォローすることができ、フォロワー限定の投稿を見ることができます。", @@ -155,6 +158,7 @@ "navigation_bar.pins": "固定されたトゥート", "navigation_bar.preferences": "ユーザー設定", "navigation_bar.public_timeline": "連合タイムライン", + "navigation_bar.misc": "その他", "notification.favourite": "{name}さんがあなたのトゥートをお気に入りに登録しました", "notification.follow": "{name}さんにフォローされました", "notification.mention": "{name}さんがあなたに返信しました", |