about summary refs log tree commit diff
path: root/app/assets/javascripts/components/locales/ja.jsx
diff options
context:
space:
mode:
authorEugen <eugen@zeonfederated.com>2017-04-13 13:26:16 +0200
committerGitHub <noreply@github.com>2017-04-13 13:26:16 +0200
commit1a12fd14d438380e24421e9c8a8894cc705aba51 (patch)
treeb276d81e18839706eaebe1db5870edc0b8628064 /app/assets/javascripts/components/locales/ja.jsx
parenta18fd491b9ad9b2e1677d0e0355712a08967fe14 (diff)
parent282bb55c3cae07229d4c9a2fe58c1c2a136c57b9 (diff)
Merge branch 'master' into master
Diffstat (limited to 'app/assets/javascripts/components/locales/ja.jsx')
-rw-r--r--app/assets/javascripts/components/locales/ja.jsx4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/javascripts/components/locales/ja.jsx b/app/assets/javascripts/components/locales/ja.jsx
index 25a6f7f67..fdfc91c29 100644
--- a/app/assets/javascripts/components/locales/ja.jsx
+++ b/app/assets/javascripts/components/locales/ja.jsx
@@ -39,8 +39,8 @@ const ja = {
   "tabs_bar.compose": "投稿",
   "tabs_bar.home": "ホーム",
   "tabs_bar.mentions": "返信",
-  "tabs_bar.local_timeline": "ローカルTL",
-  "tabs_bar.federated_timeline": "連合TL",
+  "tabs_bar.local_timeline": "ローカル",
+  "tabs_bar.federated_timeline": "連合",
   "tabs_bar.notifications": "通知",
   "compose_form.placeholder": "今なにしてる?",
   "compose_form.publish": "トゥート",