about summary refs log tree commit diff
diff options
context:
space:
mode:
authorYamagishi Kazutoshi <ykzts@desire.sh>2017-05-06 01:46:51 +0900
committerEugen Rochko <eugen@zeonfederated.com>2017-05-05 18:46:51 +0200
commitd397d0d6816147b0e7ad78fe6cdf5e4831489836 (patch)
treed0754aa16d3d79be090a2040939790fc69410063
parent20c37ed0f988298de75a3c41472222076806d243 (diff)
Run manage:translations (#2816)
-rw-r--r--app/javascript/mastodon/locales/ar.json2
-rw-r--r--app/javascript/mastodon/locales/defaultMessages.json8
-rw-r--r--app/javascript/mastodon/locales/fa.json2
-rw-r--r--app/javascript/mastodon/locales/ja.json3
4 files changed, 7 insertions, 8 deletions
diff --git a/app/javascript/mastodon/locales/ar.json b/app/javascript/mastodon/locales/ar.json
index 55fc5a5e6..8644201aa 100644
--- a/app/javascript/mastodon/locales/ar.json
+++ b/app/javascript/mastodon/locales/ar.json
@@ -161,4 +161,4 @@
   "video_player.toggle_sound": "تبديل الصوت",
   "video_player.toggle_visible": "إظهار / إخفاء الفيديو",
   "video_player.video_error": "تعذر تشغيل الفيديو"
-}
+}
\ No newline at end of file
diff --git a/app/javascript/mastodon/locales/defaultMessages.json b/app/javascript/mastodon/locales/defaultMessages.json
index 03931aeff..06096125b 100644
--- a/app/javascript/mastodon/locales/defaultMessages.json
+++ b/app/javascript/mastodon/locales/defaultMessages.json
@@ -707,16 +707,16 @@
         "id": "column.home"
       },
       {
+        "defaultMessage": "Your home feed is empty. If you have been inactive for a while, it will be regenerated for you soon.",
+        "id": "empty_column.home.inactivity"
+      },
+      {
         "defaultMessage": "You aren't following anyone yet. Visit {public} or use search to get started and meet other users.",
         "id": "empty_column.home"
       },
       {
         "defaultMessage": "the public timeline",
         "id": "empty_column.home.public_timeline"
-      },
-      {
-        "defaultMessage": "Your home feed is empty. If you have been inactive for a while, it will be regenerated for you soon.",
-        "id": "empty_column.home.inactivity"
       }
     ],
     "path": "app/javascript/mastodon/features/home_timeline/index.json"
diff --git a/app/javascript/mastodon/locales/fa.json b/app/javascript/mastodon/locales/fa.json
index d61ff9f69..83914bfd8 100644
--- a/app/javascript/mastodon/locales/fa.json
+++ b/app/javascript/mastodon/locales/fa.json
@@ -161,4 +161,4 @@
   "video_player.toggle_sound": "تغییر صداداری",
   "video_player.toggle_visible": "تغییر پیدایی",
   "video_player.video_error": "ویدیو نمی‌تواند پخش شود"
-}
+}
\ No newline at end of file
diff --git a/app/javascript/mastodon/locales/ja.json b/app/javascript/mastodon/locales/ja.json
index 9b92fb69f..a9e8ef7d8 100644
--- a/app/javascript/mastodon/locales/ja.json
+++ b/app/javascript/mastodon/locales/ja.json
@@ -54,7 +54,6 @@
   "empty_column.community": "ローカルタイムラインはまだ使われていません。何か書いてみましょう!",
   "empty_column.hashtag": "このハッシュタグはまだ使われていません。",
   "empty_column.home": "まだ誰もフォローしていません。{public}を見に行くか、検索を使って他のユーザーを見つけましょう。",
-  "empty_column.home.inactivity.original": "Your home feed is empty. If you have been inactive for a while, it will be regenerated for you soon.",
   "empty_column.home.inactivity": "あなたのホームフィードにはなにもありません。あなたがしばらくの間アクティブではなかった場合はすぐ元通りになります。",
   "empty_column.home.public_timeline": "連合タイムライン",
   "empty_column.notifications": "まだ通知がありません。他の人とふれ合って会話を始めましょう。",
@@ -162,4 +161,4 @@
   "video_player.toggle_sound": "音の切り替え",
   "video_player.toggle_visible": "表示切り替え",
   "video_player.video_error": "動画の再生に失敗しました"
-}
+}
\ No newline at end of file