Merge branch 'master' of framagit.org:tom79/fediplan

translations/fediplan+intl-icu.fr.yaml

@@ -1 +1,8 @@
 ---
+poll:
+  duration_m: >-
+    {minutes, plural, =0    {zéro minute} one   {une minute} other {# minutes} }
+  duration_h: >-
+    {hours, plural, =0    {zéro heure} one   {une heure} other {# heures} }
+  duration_d: >-
+    {days, plural, =0    {zéro jour} one   {un jour} other {# jours} }

translations/fediplan+intl-icu.zh-CN.yaml

@@ -1 +1,8 @@
 ---
+poll:
+  duration_m: >-
+    {minutes, plural, =0    {零分钟} other {# 分钟} }
+  duration_h: >-
+    {hours, plural, =0    {零小时} other {# 小时} }
+  duration_d: >-
+    {days, plural, =0    {零天} other {#天} }

translations/fediplan.zh-CN.yaml

@@ -26,6 +26,7 @@ common:
   error: 出错
   no: "否"
   yes: "是"
+  poll: 投票
 status:
   visibility:
     public: 公开
@@ -65,3 +66,8 @@ page:
       scheduled_at: 计划在
       send: 发送​​
       add_files: 添加文件...
+      multiple: 多个
+      end_in: 结束于
+      poll_item: 投票选择
+      add_poll_item: 添加选择
+      remove_poll_item: 删除这一选择