Merge branch 'dev' of https://github.com/bulwarkmail/webmail into dev

locales/zh/common.json

@@ -657,7 +657,7 @@
       "filters": "过滤器",
       "templates": "模板",
       "folders": "文件夹",
-      "keywords": "关键词",
+      "keywords": "标签",
       "security": "安全",
       "files": "文件",
       "contacts": "联系人",
@@ -725,23 +725,23 @@
       }
     },
     "keywords": {
-      "title": "邮件关键字",
-      "description": "定义关键字（标签）并用颜色整理邮件。这些关键字会作为 JMAP 关键字保存在服务器上。",
-      "add_keyword": "添加关键字",
+      "title": "电子邮件标签",
+      "description": "定义标签以使用颜色组织您的电子邮件。这些标签作为JMAP关键词存储在服务器上。",
+      "add_keyword": "添加标签",
       "reset_defaults": "重置为默认值",
       "label_field": "显示名称",
       "label_placeholder": "例如工作、个人、紧急",
-      "id_field": "关键字 ID",
+      "id_field": "标签ID",
       "id_placeholder": "例如工作、个人",
       "color_field": "颜色",
-      "id_exists": "该关键字 ID 已存在",
-      "edit": "编辑关键字",
-      "delete": "删除关键字",
+      "id_exists": "此标签ID已存在",
+      "edit": "编辑标签",
+      "delete": "删除标签",
       "save": "保存",
       "add": "添加",
       "cancel": "取消",
-      "migrating": "正在更新现有邮件的关键字...",
-      "migration_error": "无法更新现有邮件的关键字"
+      "migrating": "正在更新现有邮件的标签…",
+      "migration_error": "更新现有邮件的标签失败"
     },
     "notifications": {
       "test_sound": "测试通知声音",
@@ -1350,7 +1350,7 @@
       "reject_message": "拒绝留言",
       "reject_placeholder": "您的邮件已被拒绝",
       "label_name": "标签名称",
-      "label_placeholder": "例如，重要",
+      "label_placeholder": "选择标签",
       "header_name": "标头名称",
       "header_placeholder": "例如，X-Mailing-List",
       "size_bytes": "大小（以字节为单位）",
@@ -1525,7 +1525,7 @@
     "mark_as_spam": "举报垃圾邮件",
     "not_spam": "不是垃圾邮件",
     "color_tag": "标签",
-    "remove_color": "移除标签",
+    "remove_color": "删除标签",
     "items_selected": "已选择 {count} 封邮件",
     "edit_draft": "编辑草稿"
   },