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

Merge branch 'master' into glitch-soc/merge-upstream

Browse Source
This commit is contained in:
Thibaut Girka
2020-01-13 13:14:35 +01:00
parent 7ab12b7654 3287ec8ca3
commit 83f8bf48d9
75 changed files with 311 additions and 245 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -88,8 +88,8 @@
"compose_form.poll.duration": "アンケート期間",
"compose_form.poll.option_placeholder": "項目 {number}",
"compose_form.poll.remove_option": "この項目を削除",
"compose_form.poll.switch_to_multiple": "Change poll to allow multiple choices",
"compose_form.poll.switch_to_single": "Change poll to allow for a single choice",
"compose_form.poll.switch_to_multiple": "複数選択用に変更",
"compose_form.poll.switch_to_single": "単一選択用に変更",
"compose_form.publish": "トゥート",
"compose_form.publish_loud": "{publish}！",
"compose_form.sensitive.hide": "メディアを閲覧注意にする",