Merge branch 'origin/develop' into Weblate.

src/i18n/ja_pedantic.json

@@ -261,7 +261,7 @@
         "multiple_choices": "複数選択式",
         "not_enough_options": "相異なる選択肢が不足しています",
         "option": "選択肢",
-        "people_voted_count": "{count} 人投票 | {count} 人投票",
+        "people_voted_count": "{count} 人投票",
         "single_choice": "択一式",
         "type": "投票の形式",
         "vote": "投票",
@@ -562,7 +562,7 @@
         "notification_visibility_likes": "お気に入り",
         "notification_visibility_mentions": "メンション",
         "notification_visibility_moves": "ユーザーの引っ越し",
-        "notification_visibility_polls": "投票した投票の終了",
+        "notification_visibility_polls": "参加した投票の結果",
         "notification_visibility_repeats": "リピート",
         "notifications": "通知",
         "nsfw_clickthrough": "NSFWなファイルを隠す",