FreakU
/
mastodon
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Whoops, forgot to clean up a conflict.

This commit is contained in:
David Yip 2018-06-03 02:35:54 -05:00
parent 3550470c18
commit 8343f56b2c
No known key found for this signature in database
GPG Key ID: 7DA0036508FCC0CC
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -176,11 +176,8 @@
"navigation_bar.pins": "固定したトゥート", "navigation_bar.pins": "固定したトゥート",
"navigation_bar.preferences": "ユーザー設定", "navigation_bar.preferences": "ユーザー設定",
"navigation_bar.public_timeline": "連合タイムライン", "navigation_bar.public_timeline": "連合タイムライン",
<<<<<<< HEAD
"navigation_bar.misc": "その他", "navigation_bar.misc": "その他",
=======
"navigation_bar.security": "セキュリティ", "navigation_bar.security": "セキュリティ",
>>>>>>> origin/master
"notification.favourite": "{name}さんがあなたのトゥートをお気に入りに登録しました", "notification.favourite": "{name}さんがあなたのトゥートをお気に入りに登録しました",
"notification.follow": "{name}さんにフォローされました", "notification.follow": "{name}さんにフォローされました",
"notification.mention": "{name}さんがあなたに返信しました", "notification.mention": "{name}さんがあなたに返信しました",