fluffychat merge

lib/l10n/intl_nl.arb

@@ -2660,7 +2660,7 @@
     "@swipeRightToLeftToReply": {},
     "calls": "Gesprekken",
     "@calls": {},
-    "customEmojisAndStickers": "Aangepaste emoticons en stickers",
+    "customEmojisAndStickers": "Aangepaste emoji's en stickers",
     "@customEmojisAndStickers": {},
     "accessAndVisibilityDescription": "Wie mag toetreden tot deze chat en hoe de chat ontdekt kan worden.",
     "@accessAndVisibilityDescription": {},

lib/l10n/intl_zh.arb

@@ -3433,6 +3433,46 @@
     },
     "donate": "捐赠",
     "@donate": {},
+    "startedAPoll": "{username} 启动了投票。",
+    "@startedAPoll": {
+        "type": "String",
+        "placeholders": {
+            "username": {
+                "type": "String"
+            }
+        }
+    },
+    "poll": "投票",
+    "@poll": {},
+    "startPoll": "启动投票",
+    "@startPoll": {},
+    "endPoll": "结束投票",
+    "@endPoll": {},
+    "answersVisible": "答复可见",
+    "@answersVisible": {},
+    "answersHidden": "答复隐藏",
+    "@answersHidden": {},
+    "pollQuestion": "投票问题",
+    "@pollQuestion": {},
+    "answerOption": "答复选项",
+    "@answerOption": {},
+    "addAnswerOption": "添加答复选项",
+    "@addAnswerOption": {},
+    "allowMultipleAnswers": "允许多个答复",
+    "@allowMultipleAnswers": {},
+    "pollHasBeenEnded": "投票已结束",
+    "@pollHasBeenEnded": {},
+    "countVotes": "{count} 票",
+    "@countVotes": {
+        "type": "int",
+        "placeholders": {
+            "count": {
+                "type": "int"
+            }
+        }
+    },
+    "answersWillBeVisibleWhenPollHasEnded": "投票结束后将显示答复",
+    "@answersWillBeVisibleWhenPollHasEnded": {},
     "writeAMessageLangCodes": "输入 {l1} 或 {l2}...",
     "requests": "请求",
     "holdForInfo": "点击并按住获取单词信息。",