about summary refs log tree commit diff
path: root/app/javascript
diff options
context:
space:
mode:
authorDavid Yip <yipdw@member.fsf.org>2018-04-13 18:52:32 -0500
committerGitHub <noreply@github.com>2018-04-13 18:52:32 -0500
commit95a892accdb6a081447117f49c66431dc7e032fb (patch)
treea56f1b0b3eadd0a0829dd984a54dd81fffd78761 /app/javascript
parentb7804028c2708c82cbb15037abe569519975ba9d (diff)
parentdd4ad6300b571abd751b2e9f531d05beec814efe (diff)
Merge pull request #422 from KnzkDev/ja-translation
Add missing Japanese translation
Diffstat (limited to 'app/javascript')
-rw-r--r--app/javascript/flavours/glitch/locales/ja.js4
-rw-r--r--app/javascript/mastodon/locales/ja.json1
2 files changed, 4 insertions, 1 deletions
diff --git a/app/javascript/flavours/glitch/locales/ja.js b/app/javascript/flavours/glitch/locales/ja.js
index 38f11d3f7..f558d7ab7 100644
--- a/app/javascript/flavours/glitch/locales/ja.js
+++ b/app/javascript/flavours/glitch/locales/ja.js
@@ -62,6 +62,10 @@ const messages = {
   'advanced_options.threaded_mode.short': 'スレッドモード',
   'advanced_options.threaded_mode.long': '投稿時に自動的に返信するように設定します',
   'advanced_options.threaded_mode.tooltip': 'スレッドモードを有効にする',
+
+  'navigation_bar.direct': 'ダイレクトメッセージ',
+  'navigation_bar.bookmarks': 'ブックマーク',
+  'column.bookmarks': 'ブックマーク'
 };
 
 export default Object.assign({}, inherited, messages);
diff --git a/app/javascript/mastodon/locales/ja.json b/app/javascript/mastodon/locales/ja.json
index dbea02989..0efd367e9 100644
--- a/app/javascript/mastodon/locales/ja.json
+++ b/app/javascript/mastodon/locales/ja.json
@@ -159,7 +159,6 @@
   "mute_modal.hide_notifications": "このユーザーからの通知を隠しますか?",
   "navigation_bar.blocks": "ブロックしたユーザー",
   "navigation_bar.community_timeline": "ローカルタイムライン",
-  "navigation_bar.direct": "ダイレクトメッセージ",
   "navigation_bar.domain_blocks": "非表示にしたドメイン",
   "navigation_bar.edit_profile": "プロフィールを編集",
   "navigation_bar.favourites": "お気に入り",