diff options
Diffstat (limited to 'app')
-rw-r--r-- | app/javascript/mastodon/locales/ja.json | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/app/javascript/mastodon/locales/ja.json b/app/javascript/mastodon/locales/ja.json index 708ad2ca9..fc1a314e8 100644 --- a/app/javascript/mastodon/locales/ja.json +++ b/app/javascript/mastodon/locales/ja.json @@ -176,11 +176,8 @@ "navigation_bar.pins": "固定したトゥート", "navigation_bar.preferences": "ユーザー設定", "navigation_bar.public_timeline": "連合タイムライン", -<<<<<<< HEAD "navigation_bar.misc": "その他", -======= "navigation_bar.security": "セキュリティ", ->>>>>>> origin/master "notification.favourite": "{name}さんがあなたのトゥートをお気に入りに登録しました", "notification.follow": "{name}さんにフォローされました", "notification.mention": "{name}さんがあなたに返信しました", |