Unverified Commit 8343f56b authored by David Yip's avatar David Yip
Browse files

Whoops, forgot to clean up a conflict.

parent 3550470c
......@@ -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}さんがあなたに返信しました",
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment