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

locales/en/common.json

@@ -657,7 +657,7 @@
       "filters": "Filters",
       "templates": "Templates",
       "folders": "Folders",
-      "keywords": "Keywords",
+      "keywords": "Tags",
       "security": "Security",
       "files": "Files",
       "contacts": "Contacts",
@@ -725,23 +725,23 @@
       }
     },
     "keywords": {
-      "title": "Email Keywords",
-      "description": "Define keywords (labels/tags) to organize your emails with colors. These are stored as JMAP keywords on the server.",
-      "add_keyword": "Add Keyword",
+      "title": "Email Tags",
+      "description": "Define tags to organize your emails with colors. These are stored as JMAP keywords on the server.",
+      "add_keyword": "Add Tag",
       "reset_defaults": "Reset to Defaults",
       "label_field": "Display Name",
       "label_placeholder": "e.g. Work, Personal, Urgent",
-      "id_field": "Keyword ID",
+      "id_field": "Tag ID",
       "id_placeholder": "e.g. work, personal",
       "color_field": "Color",
-      "id_exists": "This keyword ID already exists",
-      "edit": "Edit keyword",
-      "delete": "Delete keyword",
+      "id_exists": "This tag ID already exists",
+      "edit": "Edit tag",
+      "delete": "Delete tag",
       "save": "Save",
       "add": "Add",
       "cancel": "Cancel",
-      "migrating": "Updating keyword on existing emails…",
-      "migration_error": "Failed to update keyword on existing emails"
+      "migrating": "Updating tag on existing emails…",
+      "migration_error": "Failed to update tag on existing emails"
     },
     "notifications": {
       "test_sound": "Test notification sound",
@@ -1337,7 +1337,7 @@
         "forward": "Forward to",
         "mark_read": "Mark as read",
         "star": "Star message",
-        "add_label": "Add label",
+        "add_label": "Add tag",
         "discard": "Discard (delete silently)",
         "reject": "Reject with message",
         "keep": "Keep in inbox",
@@ -1349,8 +1349,8 @@
       "forward_placeholder": "email@example.com",
       "reject_message": "Rejection message",
       "reject_placeholder": "Your email has been rejected",
-      "label_name": "Label name",
-      "label_placeholder": "e.g., important",
+      "label_name": "Tag name",
+      "label_placeholder": "Select tag",
       "header_name": "Header name",
       "header_placeholder": "e.g., X-Mailing-List",
       "size_bytes": "Size in bytes",
@@ -1524,8 +1524,8 @@
     "delete": "Delete",
     "mark_as_spam": "Report spam",
     "not_spam": "Not spam",
-    "color_tag": "Label",
-    "remove_color": "Remove Label",
+    "color_tag": "Tag",
+    "remove_color": "Remove tag",
     "items_selected": "{count} emails selected",
     "edit_draft": "Edit Draft"
   },