about summary refs log tree commit diff
path: root/app/javascript/flavours/glitch/locales/ja.js
diff options
context:
space:
mode:
authorDavid Yip <yipdw@member.fsf.org>2018-04-14 03:50:31 -0500
committerDavid Yip <yipdw@member.fsf.org>2018-04-14 03:50:31 -0500
commitd66192f21c22dd79735a6c3ea6e2ed115b42e0d0 (patch)
treefec9f7eab346901c571c57023aa6231b0f855421 /app/javascript/flavours/glitch/locales/ja.js
parent78aca92689cd896f4be34daeb1852f75abc57472 (diff)
parent95a892accdb6a081447117f49c66431dc7e032fb (diff)
Merge remote-tracking branch 'glitchsoc/master' into gs-master
  Conflicts:
 	db/schema.rb
Diffstat (limited to 'app/javascript/flavours/glitch/locales/ja.js')
-rw-r--r--app/javascript/flavours/glitch/locales/ja.js4
1 files changed, 4 insertions, 0 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);