From: Jenkins <jenkins@jenkins.ninjawedding.org>
Date: Wed, 3 Jan 2018 20:17:13 +0000 (+0000)
Subject: Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=fc884d015a1a2d6c31976af3d63039390fa15939;p=mastodon.git

Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
---

fc884d015a1a2d6c31976af3d63039390fa15939
diff --cc app/javascript/mastodon/locales/en.json
index 098bebf8f,d214fe85f..b1dbaa698
--- a/app/javascript/mastodon/locales/en.json
+++ b/app/javascript/mastodon/locales/en.json
@@@ -49,11 -48,9 +49,12 @@@
    "column_header.pin": "Pin",
    "column_header.show_settings": "Show settings",
    "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.hashtag_warning": "This toot won't be listed under any hashtag as it is unlisted. Only public toots can be searched by hashtag.",
    "compose_form.lock_disclaimer": "Your account is not {locked}. Anyone can follow you to view your follower-only posts.",
    "compose_form.lock_disclaimer.lock": "locked",
    "compose_form.placeholder": "What is on your mind?",
diff --cc app/javascript/mastodon/locales/ja.json
index 614ef8815,e7f15691c..19885056c
--- a/app/javascript/mastodon/locales/ja.json
+++ b/app/javascript/mastodon/locales/ja.json
@@@ -49,11 -48,9 +49,12 @@@
    "column_header.pin": "ピン留めする",
    "column_header.show_settings": "設定を表示",
    "column_header.unpin": "ピン留めを外す",
 +  "column.heading": "その他",
 +  "column.subheading": "その他のオプション",
 +  "column_subheading.lists": "リスト",
    "column_subheading.navigation": "ナビゲーション",
    "column_subheading.settings": "設定",
+   "compose_form.hashtag_warning": "このトゥートは未収載なのでハッシュタグの一覧に表示されません。公開トゥートだけがハッシュタグで検索できます。",
    "compose_form.lock_disclaimer": "あなたのアカウントは{locked}になっていません。誰でもあなたをフォローすることができ、フォロワー限定の投稿を見ることができます。",
    "compose_form.lock_disclaimer.lock": "非公開",
    "compose_form.placeholder": "今なにしてる？",