about summary refs log tree commit diff
path: root/app
diff options
context:
space:
mode:
authorncls7615 <himasoto@gmail.com>2017-12-22 12:22:41 +0900
committerncls7615 <himasoto@gmail.com>2017-12-22 12:22:41 +0900
commitfb57ec41df678bb10cd423f9e00f1c82621ca5db (patch)
tree198388abfc7bf79b12c3b3a74ea04eae3e9ea4f2 /app
parent4694dcfe162264af8a70e3fdc59346b73e661063 (diff)
Update and add some translate
Diffstat (limited to 'app')
-rw-r--r--app/javascript/mastodon/locales/en.json3
-rw-r--r--app/javascript/mastodon/locales/ja.json3
2 files changed, 4 insertions, 2 deletions
diff --git a/app/javascript/mastodon/locales/en.json b/app/javascript/mastodon/locales/en.json
index a4dbf173e..098bebf8f 100644
--- a/app/javascript/mastodon/locales/en.json
+++ b/app/javascript/mastodon/locales/en.json
@@ -51,6 +51,7 @@
   "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.",
@@ -152,7 +153,7 @@
   "navigation_bar.info": "About this instance",
   "navigation_bar.keyboard_shortcuts": "Keyboard shortcuts",
   "navigation_bar.lists": "Lists",
-  "column_subheading.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 0394085e1..614ef8815 100644
--- a/app/javascript/mastodon/locales/ja.json
+++ b/app/javascript/mastodon/locales/ja.json
@@ -51,6 +51,7 @@
   "column_header.unpin": "ピン留めを外す",
   "column.heading": "その他",
   "column.subheading": "その他のオプション",
+  "column_subheading.lists": "リスト",
   "column_subheading.navigation": "ナビゲーション",
   "column_subheading.settings": "設定",
   "compose_form.lock_disclaimer": "あなたのアカウントは{locked}になっていません。誰でもあなたをフォローすることができ、フォロワー限定の投稿を見ることができます。",
@@ -152,12 +153,12 @@
   "navigation_bar.info": "このインスタンスについて",
   "navigation_bar.keyboard_shortcuts": "キーボードショートカット",
   "navigation_bar.lists": "リスト",
-  "column_subheading.lists": "リスト",
   "navigation_bar.logout": "ログアウト",
   "navigation_bar.mutes": "ミュートしたユーザー",
   "navigation_bar.pins": "固定されたトゥート",
   "navigation_bar.preferences": "ユーザー設定",
   "navigation_bar.public_timeline": "連合タイムライン",
+  "navigation_bar.misc": "その他",
   "notification.favourite": "{name}さんがあなたのトゥートをお気に入りに登録しました",
   "notification.follow": "{name}さんにフォローされました",
   "notification.mention": "{name}さんがあなたに返信しました",