tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'spoiler' of git://github.com/kagucho/mastodon into kagucho-spoiler

Browse Source
This commit is contained in:
Eugen Rochko
2018-03-13 09:18:11 +01:00
parent 9e3a6d6784 0dccb398bd
commit f0ae6b4cc5
39 changed files with 92 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/javascript/mastodon/locales/ja.json
View File

@ -62,7 +62,8 @@
"compose_form.publish_loud": "{publish}！",
"compose_form.sensitive.marked": "メディアに閲覧注意が設定されています",
"compose_form.sensitive.unmarked": "メディアに閲覧注意が設定されていません",
"compose_form.spoiler": "テキストを隠す",
"compose_form.spoiler.marked": "Text is hidden behind warning",
"compose_form.spoiler.unmarked": "Text is not hidden",
"compose_form.spoiler_placeholder": "ここに警告を書いてください",
"confirmation_modal.cancel": "キャンセル",
"confirmations.block.confirm": "ブロック",