fix: standardize tag naming and fix unknown keyword display #184 #185

components/email/email-list-item.tsx

@@ -51,9 +51,9 @@ export function EmailListItem({ email, selected, onClick, onContextMenu, onToggl
   const isFocusedMailLayout = mailLayout === 'focus';
   const inlinePreview = showPreview && email.preview ? ` ${email.preview}` : '';
 
-  // Resolve color tags using keyword definitions from settings
+  // Resolve color tags using keyword definitions from settings; unknown tags fall back to gray
   const colorTagIds = getEmailColorTags(email.keywords);
-  const keywordDefs = colorTagIds.map(id => emailKeywords.find(k => k.id === id)).filter(Boolean) as typeof emailKeywords;
+  const keywordDefs = colorTagIds.map(id => emailKeywords.find(k => k.id === id) ?? { id, label: id, color: 'gray' });
   // Use first tag for background coloring
   const keywordDef = keywordDefs[0] ?? null;
   const colorTag = keywordDef ? KEYWORD_PALETTE[keywordDef.color]?.bg ?? null : null;

components/email/email-viewer.tsx

@@ -3070,13 +3070,13 @@ export function EmailViewer({
               <>
                 <span className="flex items-center gap-0.5">
                   {currentColors.slice(0, 3).map((tagId) => {
-                    const kw = emailKeywords.find(k => k.id === tagId);
+                    const kw = emailKeywords.find(k => k.id === tagId) ?? { id: tagId, label: tagId, color: 'gray' };
-                    return kw ? <span key={tagId} className={cn("w-3 h-3 rounded-full", KEYWORD_PALETTE[kw.color]?.dot)} /> : null;
+                    return <span key={tagId} className={cn("w-3 h-3 rounded-full", KEYWORD_PALETTE[kw.color]?.dot || 'bg-gray-500')} />;
                   })}
                 </span>
                 {showToolbarLabels && currentColors.length === 1 && (
                   <span className="text-xs font-medium text-foreground">
-                    {emailKeywords.find(k => k.id === currentColors[0])?.label}
+                    {emailKeywords.find(k => k.id === currentColors[0])?.label ?? currentColors[0]}
                   </span>
                 )}
               </>
@@ -3674,11 +3674,11 @@ export function EmailViewer({
                 {currentColors.length > 0 && (
                   <span className="flex items-center gap-0.5">
                     {currentColors.map((tagId) => {
-                      const kw = emailKeywords.find(k => k.id === tagId);
+                      const kw = emailKeywords.find(k => k.id === tagId) ?? { id: tagId, label: tagId, color: 'gray' };
-                      const dotClass = kw ? KEYWORD_PALETTE[kw.color]?.dot : null;
+                      const dotClass = KEYWORD_PALETTE[kw.color]?.dot || 'bg-gray-500';
-                      return dotClass ? (
+                      return (
-                        <span key={tagId} className={cn("w-2.5 h-2.5 rounded-full flex-shrink-0", dotClass)} title={kw!.label} />
+                        <span key={tagId} className={cn("w-2.5 h-2.5 rounded-full flex-shrink-0", dotClass)} title={kw.label} />
-                      ) : null;
+                      );
                     })}
                   </span>
                 )}

components/email/thread-list-item.tsx

@@ -67,9 +67,9 @@ const SingleEmailItem = React.forwardRef<HTMLDivElement, SingleEmailItemProps>(
     const isFocusedMailLayout = mailLayout === 'focus';
     const inlinePreview = showPreview && email.preview ? ` ${email.preview}` : '';
 
-    // Resolve color tags using keyword definitions
+    // Resolve color tags using keyword definitions; unknown tags fall back to gray
     const tagIds = getEmailColorTags(email.keywords);
-    const resolvedKeywordDefs = tagIds.map(id => emailKeywords.find(k => k.id === id)).filter(Boolean) as typeof emailKeywords;
+    const resolvedKeywordDefs = tagIds.map(id => emailKeywords.find(k => k.id === id) ?? { id, label: id, color: 'gray' });
     const resolvedKeywordDef = resolvedKeywordDefs[0] ?? null;
     const resolvedColorTag = (() => {
       if (colorTag) return colorTag;
@@ -375,7 +375,7 @@ export const ThreadListItem = React.forwardRef<HTMLDivElement, ThreadListItemPro
 
     const threadColor = getThreadColorTag(thread.emails);
     const emailKeywordDefs = useSettingsStore((state) => state.emailKeywords);
-    const keywordDef = threadColor ? emailKeywordDefs.find(k => k.id === threadColor) : null;
+    const keywordDef = threadColor ? (emailKeywordDefs.find(k => k.id === threadColor) ?? { id: threadColor, label: threadColor, color: 'gray' }) : null;
     const colorTag = keywordDef ? KEYWORD_PALETTE[keywordDef.color]?.bg ?? null : null;
 
     const isSelected = selectedEmailId === latestEmail.id ||

components/filters/filter-rule-modal.tsx

@@ -17,6 +17,7 @@ import type {
 } from "@/lib/jmap/sieve-types";
 import type { Mailbox } from "@/lib/jmap/types";
 import { buildMailboxTree, flattenMailboxTree, type MailboxNode, generateUUID } from "@/lib/utils";
+import { useSettingsStore } from "@/stores/settings-store";
 
 interface FilterRuleModalProps {
   rule?: FilterRule;
@@ -58,6 +59,7 @@ export function FilterRuleModal({
 }: FilterRuleModalProps) {
   const t = useTranslations("settings.filters");
   const isEdit = !!rule;
+  const emailKeywords = useSettingsStore((state) => state.emailKeywords);
 
   const [name, setName] = useState(rule?.name || "");
   const [matchType, setMatchType] = useState<"all" | "any">(rule?.matchType || "all");
@@ -375,12 +377,17 @@ export function FilterRuleModal({
                   )}
 
                   {action.type === "add_label" && (
-                    <Input
+                    <select
                       value={action.value || ""}
                       onChange={(e) => updateAction(index, { value: e.target.value })}
-                      placeholder={t("label_placeholder")}
+                      className={`${selectClass} flex-1 min-w-[140px]`}
-                      className="flex-1 min-w-[140px]"
+                      aria-label={t("label_placeholder")}
-                    />
+                    >
+                      <option value="">{t("label_placeholder")}</option>
+                      {emailKeywords.map((kw) => (
+                        <option key={kw.id} value={kw.id}>{kw.label}</option>
+                      ))}
+                    </select>
                   )}
 
                   <button

lib/sieve/__tests__/generator.test.ts

@@ -194,9 +194,9 @@ describe('generateScript', () => {
       expect(script).toContain('addflag "\\\\Flagged";');
     });
 
-    it('generates add_label as addflag $Label', () => {
+    it('generates add_label as addflag $label:Label', () => {
       const script = generateScript([makeRule({ actions: [{ type: 'add_label', value: 'Important' }] })]);
-      expect(script).toContain('addflag "$Important";');
+      expect(script).toContain('addflag "$label:Important";');
     });
 
     it('generates discard', () => {

lib/sieve/generator.ts

@@ -65,7 +65,7 @@ function generateActions(actions: FilterAction[]): string[] {
       case 'star':
         return 'addflag "\\\\Flagged";';
       case 'add_label':
-        return `addflag "$${escapeString(action.value || '')}";`;
+        return `addflag "$label:${escapeString(action.value || '')}";`;
       case 'discard':
         return 'discard;';
       case 'reject':

locales/de/common.json

@@ -639,7 +639,7 @@
       "filters": "Filter",
       "templates": "Vorlagen",
       "folders": "Ordner",
-      "keywords": "Schlüsselwörter",
+      "keywords": "Labels",
       "security": "Sicherheit",
       "encryption": "Verschlüsselung",
       "files": "Dateien",
@@ -707,23 +707,23 @@
       }
     },
     "keywords": {
-      "title": "E-Mail-Schlüsselwörter",
+      "title": "E-Mail-Labels",
-      "description": "Definieren Sie Schlüsselwörter (Labels/Tags) zum Organisieren Ihrer E-Mails mit Farben.",
+      "description": "Labels definieren, um Ihre E-Mails mit Farben zu organisieren. Diese werden als JMAP-Keywords auf dem Server gespeichert.",
-      "add_keyword": "Schlüsselwort hinzufügen",
+      "add_keyword": "Label hinzufügen",
       "reset_defaults": "Auf Standard zurücksetzen",
       "label_field": "Anzeigename",
       "label_placeholder": "z.B. Arbeit, Privat, Dringend",
-      "id_field": "Schlüsselwort-ID",
+      "id_field": "Label-ID",
       "id_placeholder": "z.B. arbeit, privat",
       "color_field": "Farbe",
-      "id_exists": "Diese Schlüsselwort-ID existiert bereits",
+      "id_exists": "Diese Label-ID existiert bereits",
-      "edit": "Schlüsselwort bearbeiten",
+      "edit": "Label bearbeiten",
-      "delete": "Schlüsselwort löschen",
+      "delete": "Label löschen",
       "save": "Speichern",
       "add": "Hinzufügen",
       "cancel": "Abbrechen",
-      "migrating": "Schlüsselwort bei bestehenden E-Mails aktualisieren…",
+      "migrating": "Label auf vorhandenen E-Mails aktualisieren…",
-      "migration_error": "Schlüsselwort konnte bei bestehenden E-Mails nicht aktualisiert werden"
+      "migration_error": "Label auf vorhandenen E-Mails konnte nicht aktualisiert werden"
     },
     "notifications": {
       "test_sound": "Benachrichtigungston testen",
@@ -902,7 +902,7 @@
         "star": "Markieren / Markierung aufheben",
         "mark_read": "Als gelesen / ungelesen markieren",
         "archive": "Archivieren",
-        "tag": "Schlagwort",
+        "tag": "Label",
         "spam": "Als Spam markieren",
         "none_selected": "Keine Aktionen ausgewählt",
         "mode_label": "Anzeigemodus",
@@ -1327,7 +1327,7 @@
       "reject_message": "Ablehnungsnachricht",
       "reject_placeholder": "Ihre E-Mail wurde abgelehnt",
       "label_name": "Label-Name",
-      "label_placeholder": "z.B. wichtig",
+      "label_placeholder": "Label auswählen",
       "header_name": "Header-Name",
       "header_placeholder": "z.B. X-Mailing-List",
       "size_bytes": "Größe in Bytes",

locales/en/common.json

@@ -639,7 +639,7 @@
       "filters": "Filters",
       "templates": "Templates",
       "folders": "Folders",
-      "keywords": "Keywords",
+      "keywords": "Tags",
       "security": "Security",
       "files": "Files",
       "contacts": "Contacts",
@@ -707,23 +707,23 @@
       }
     },
     "keywords": {
-      "title": "Email Keywords",
+      "title": "Email Tags",
-      "description": "Define keywords (labels/tags) to organize your emails with colors. These are stored as JMAP keywords on the server.",
+      "description": "Define tags to organize your emails with colors. These are stored as JMAP keywords on the server.",
-      "add_keyword": "Add Keyword",
+      "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",
+      "id_exists": "This tag ID already exists",
-      "edit": "Edit keyword",
+      "edit": "Edit tag",
-      "delete": "Delete keyword",
+      "delete": "Delete tag",
       "save": "Save",
       "add": "Add",
       "cancel": "Cancel",
-      "migrating": "Updating keyword on existing emails…",
+      "migrating": "Updating tag on existing emails…",
-      "migration_error": "Failed to update keyword on existing emails"
+      "migration_error": "Failed to update tag on existing emails"
     },
     "notifications": {
       "test_sound": "Test notification sound",
@@ -1319,7 +1319,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",
@@ -1331,8 +1331,8 @@
       "forward_placeholder": "email@example.com",
       "reject_message": "Rejection message",
       "reject_placeholder": "Your email has been rejected",
-      "label_name": "Label name",
+      "label_name": "Tag name",
-      "label_placeholder": "e.g., important",
+      "label_placeholder": "Select tag",
       "header_name": "Header name",
       "header_placeholder": "e.g., X-Mailing-List",
       "size_bytes": "Size in bytes",
@@ -1506,8 +1506,8 @@
     "delete": "Delete",
     "mark_as_spam": "Report spam",
     "not_spam": "Not spam",
-    "color_tag": "Label",
+    "color_tag": "Tag",
-    "remove_color": "Remove Label",
+    "remove_color": "Remove tag",
     "items_selected": "{count} emails selected",
     "edit_draft": "Edit Draft"
   },

locales/es/common.json

@@ -639,7 +639,7 @@
       "filters": "Filtros",
       "templates": "Plantillas",
       "folders": "Carpetas",
-      "keywords": "Palabras clave",
+      "keywords": "Etiquetas",
       "security": "Seguridad",
       "encryption": "Cifrado",
       "files": "Archivos",
@@ -707,18 +707,18 @@
       }
     },
     "keywords": {
-      "title": "Palabras clave de correo",
+      "title": "Etiquetas de correo",
-      "description": "Define palabras clave (etiquetas) para organizar tus correos con colores.",
+      "description": "Define etiquetas para organizar tus correos con colores. Se almacenan como palabras clave JMAP en el servidor.",
-      "add_keyword": "Añadir palabra clave",
+      "add_keyword": "Añadir etiqueta",
       "reset_defaults": "Restablecer valores predeterminados",
       "label_field": "Nombre para mostrar",
       "label_placeholder": "ej. Trabajo, Personal, Urgente",
-      "id_field": "ID de palabra clave",
+      "id_field": "ID de etiqueta",
       "id_placeholder": "ej. trabajo, personal",
       "color_field": "Color",
-      "id_exists": "Esta ID de palabra clave ya existe",
+      "id_exists": "Este ID de etiqueta ya existe",
-      "edit": "Editar palabra clave",
+      "edit": "Editar etiqueta",
-      "delete": "Eliminar palabra clave",
+      "delete": "Eliminar etiqueta",
       "save": "Guardar",
       "add": "Añadir",
       "cancel": "Cancelar",
@@ -1327,7 +1327,7 @@
       "reject_message": "Mensaje de rechazo",
       "reject_placeholder": "Su correo ha sido rechazado",
       "label_name": "Nombre de la etiqueta",
-      "label_placeholder": "ej. importante",
+      "label_placeholder": "Seleccionar etiqueta",
       "header_name": "Nombre del encabezado",
       "header_placeholder": "ej. X-Mailing-List",
       "size_bytes": "Tamaño en bytes",

locales/fr/common.json

@@ -639,7 +639,7 @@
       "filters": "Filtres",
       "templates": "Modèles",
       "folders": "Dossiers",
-      "keywords": "Mots-clés",
+      "keywords": "Étiquettes",
       "security": "Sécurité",
       "encryption": "Chiffrement",
       "files": "Fichiers",
@@ -707,23 +707,23 @@
       }
     },
     "keywords": {
-      "title": "Mots-clés des e-mails",
+      "title": "Étiquettes de messagerie",
-      "description": "Définissez des mots-clés (étiquettes) pour organiser vos e-mails avec des couleurs.",
+      "description": "Définissez des étiquettes pour organiser vos e-mails avec des couleurs. Elles sont stockées sous forme de mots-clés JMAP sur le serveur.",
-      "add_keyword": "Ajouter un mot-clé",
+      "add_keyword": "Ajouter une étiquette",
       "reset_defaults": "Réinitialiser par défaut",
       "label_field": "Nom d'affichage",
       "label_placeholder": "ex. Travail, Personnel, Urgent",
-      "id_field": "ID du mot-clé",
+      "id_field": "ID d'étiquette",
       "id_placeholder": "ex. travail, personnel",
       "color_field": "Couleur",
-      "id_exists": "Cet ID de mot-clé existe déjà",
+      "id_exists": "Cet ID d'étiquette existe déjà",
-      "edit": "Modifier le mot-clé",
+      "edit": "Éditer l'étiquette",
-      "delete": "Supprimer le mot-clé",
+      "delete": "Supprimer l'étiquette",
       "save": "Enregistrer",
       "add": "Ajouter",
       "cancel": "Annuler",
-      "migrating": "Mise à jour du mot-clé sur les e-mails existants…",
+      "migrating": "Mise à jour de l'étiquette sur les e-mails existants…",
-      "migration_error": "Échec de la mise à jour du mot-clé sur les e-mails existants"
+      "migration_error": "Impossible de mettre à jour l'étiquette sur les e-mails existants"
     },
     "notifications": {
       "test_sound": "Tester le son de notification",
@@ -1314,7 +1314,7 @@
         "forward": "Transférer à",
         "mark_read": "Marquer comme lu",
         "star": "Marquer d'une étoile",
-        "add_label": "Ajouter un libellé",
+        "add_label": "Ajouter une étiquette",
         "discard": "Supprimer silencieusement",
         "reject": "Rejeter avec un message",
         "keep": "Conserver dans la boîte de réception",
@@ -1326,8 +1326,8 @@
       "forward_placeholder": "email@exemple.com",
       "reject_message": "Message de rejet",
       "reject_placeholder": "Votre e-mail a été rejeté",
-      "label_name": "Nom du libellé",
+      "label_name": "Nom de l'étiquette",
-      "label_placeholder": "ex. important",
+      "label_placeholder": "Sélectionner une étiquette",
       "header_name": "Nom de l'en-tête",
       "header_placeholder": "ex. X-Mailing-List",
       "size_bytes": "Taille en octets",

locales/it/common.json

@@ -639,7 +639,7 @@
       "filters": "Filtri",
       "templates": "Modelli",
       "folders": "Cartelle",
-      "keywords": "Parole chiave",
+      "keywords": "Etichette",
       "security": "Sicurezza",
       "encryption": "Cifratura",
       "files": "File",
@@ -707,23 +707,23 @@
       }
     },
     "keywords": {
-      "title": "Parole chiave e-mail",
+      "title": "Etichette e-mail",
-      "description": "Definisci parole chiave (etichette) per organizzare le tue e-mail con colori.",
+      "description": "Definisci etichette per organizzare le tue e-mail con i colori. Vengono archiviate come parole chiave JMAP sul server.",
-      "add_keyword": "Aggiungi parola chiave",
+      "add_keyword": "Aggiungi etichetta",
       "reset_defaults": "Ripristina predefiniti",
       "label_field": "Nome visualizzato",
       "label_placeholder": "es. Lavoro, Personale, Urgente",
-      "id_field": "ID parola chiave",
+      "id_field": "ID etichetta",
       "id_placeholder": "es. lavoro, personale",
       "color_field": "Colore",
-      "id_exists": "Questo ID parola chiave esiste già",
+      "id_exists": "Questo ID etichetta esiste già",
-      "edit": "Modifica parola chiave",
+      "edit": "Modifica etichetta",
-      "delete": "Elimina parola chiave",
+      "delete": "Elimina etichetta",
       "save": "Salva",
       "add": "Aggiungi",
       "cancel": "Annulla",
-      "migrating": "Aggiornamento parola chiave sulle email esistenti…",
+      "migrating": "Aggiornamento dell'etichetta nelle e-mail esistenti…",
-      "migration_error": "Impossibile aggiornare la parola chiave sulle email esistenti"
+      "migration_error": "Impossibile aggiornare l'etichetta nelle e-mail esistenti"
     },
     "notifications": {
       "test_sound": "Testa il suono di notifica",
@@ -1327,7 +1327,7 @@
       "reject_message": "Messaggio di rifiuto",
       "reject_placeholder": "La tua email è stata rifiutata",
       "label_name": "Nome dell'etichetta",
-      "label_placeholder": "es. importante",
+      "label_placeholder": "Seleziona etichetta",
       "header_name": "Nome dell'intestazione",
       "header_placeholder": "es. X-Mailing-List",
       "size_bytes": "Dimensione in byte",

locales/ja/common.json

@@ -639,7 +639,7 @@
       "filters": "フィルター",
       "templates": "テンプレート",
       "folders": "フォルダー",
-      "keywords": "キーワード",
+      "keywords": "ラベル",
       "security": "セキュリティ",
       "encryption": "暗号化",
       "files": "ファイル",
@@ -707,23 +707,23 @@
       }
     },
     "keywords": {
-      "title": "メールキーワード",
+      "title": "メールラベル",
-      "description": "色でメールを整理するためのキーワード（ラベル/タグ）を定義します。",
+      "description": "メールをカラーで整理するためのラベルを定義します。サーバーにJMAPキーワードとして保存されます。",
-      "add_keyword": "キーワードを追加",
+      "add_keyword": "ラベルを追加",
       "reset_defaults": "デフォルトに戻す",
       "label_field": "表示名",
       "label_placeholder": "例：仕事、個人、緊急",
-      "id_field": "キーワードID",
+      "id_field": "ラベルID",
       "id_placeholder": "例：work、personal",
       "color_field": "色",
-      "id_exists": "このキーワードIDは既に存在します",
+      "id_exists": "このラベルIDは既に存在します",
-      "edit": "キーワードを編集",
+      "edit": "ラベルを編集",
-      "delete": "キーワードを削除",
+      "delete": "ラベルを削除",
       "save": "保存",
       "add": "追加",
       "cancel": "キャンセル",
-      "migrating": "既存のメールでキーワードを更新中…",
+      "migrating": "既存のメールのラベルを更新中…",
-      "migration_error": "既存のメールでのキーワード更新に失敗しました"
+      "migration_error": "既存のメールのラベルの更新に失敗しました"
     },
     "notifications": {
       "test_sound": "通知音をテスト",
@@ -902,7 +902,7 @@
         "star": "スター付け / 解除",
         "mark_read": "既読 / 未読にする",
         "archive": "アーカイブ",
-        "tag": "タグ",
+        "tag": "ラベル",
         "spam": "スパムとしてマーク",
         "none_selected": "アクションが選択されていません",
         "mode_label": "表示モード",
@@ -1327,7 +1327,7 @@
       "reject_message": "拒否メッセージ",
       "reject_placeholder": "あなたのメールは拒否されました",
       "label_name": "ラベル名",
-      "label_placeholder": "例：重要",
+      "label_placeholder": "ラベルを選択",
       "header_name": "ヘッダー名",
       "header_placeholder": "例：X-Mailing-List",
       "size_bytes": "サイズ（バイト）",

locales/ko/common.json

@@ -639,7 +639,7 @@
       "filters": "필터",
       "templates": "템플릿",
       "folders": "폴더",
-      "keywords": "키워드",
+      "keywords": "태그",
       "security": "보안",
       "files": "파일",
       "contacts": "연락처",
@@ -707,23 +707,23 @@
       }
     },
     "keywords": {
-      "title": "이메일 키워드",
+      "title": "이메일 태그",
-      "description": "이메일을 분류할 키워드(라벨/태그)를 설정해 보세요. 설정한 키워드는 서버에 저장돼요.",
+      "description": "색상으로 이메일을 정리하기 위한 태그를 정의합니다. 서버에 JMAP 키워드로 저장됩니다.",
-      "add_keyword": "키워드 추가",
+      "add_keyword": "태그 추가",
       "reset_defaults": "기본값으로 초기화",
       "label_field": "표시 이름",
       "label_placeholder": "예: 업무, 개인, 긴급",
-      "id_field": "키워드 ID",
+      "id_field": "태그 ID",
       "id_placeholder": "예: work, personal",
       "color_field": "색상",
-      "id_exists": "이미 존재하는 키워드 ID예요",
+      "id_exists": "이 태그 ID는 이미 존재합니다",
-      "edit": "키워드 수정",
+      "edit": "태그 편집",
-      "delete": "키워드 삭제",
+      "delete": "태그 삭제",
       "save": "저장",
       "add": "추가",
       "cancel": "취소",
-      "migrating": "기존 이메일의 키워드를 업데이트하는 중...",
+      "migrating": "기존 이메일의 태그 업데이트 중…",
-      "migration_error": "기존 이메일의 키워드를 업데이트하지 못했어요"
+      "migration_error": "기존 이메일의 태그 업데이트에 실패했습니다"
     },
     "notifications": {
       "test_sound": "알림음 테스트",
@@ -1314,7 +1314,7 @@
         "forward": "다음으로 전달",
         "mark_read": "읽은 상태로 표시",
         "star": "별표 달기",
-        "add_label": "라벨(태그) 추가",
+        "add_label": "태그 추가",
         "discard": "삭제 (조용히 지움)",
         "reject": "메시지와 함께 수신 거부",
         "keep": "받은편지함에 유지",
@@ -1326,8 +1326,8 @@
       "forward_placeholder": "email@example.com",
       "reject_message": "거부 메시지",
       "reject_placeholder": "메일 수신이 거부되었습니다",
-      "label_name": "라벨 이름",
+      "label_name": "태그 이름",
-      "label_placeholder": "예: important",
+      "label_placeholder": "태그 선택",
       "header_name": "헤더 이름",
       "header_placeholder": "예: X-Mailing-List",
       "size_bytes": "크기 (바이트)",
@@ -1501,8 +1501,8 @@
     "delete": "삭제",
     "mark_as_spam": "스팸 신고",
     "not_spam": "정상 메일",
-    "color_tag": "라벨 지정",
+    "color_tag": "태그",
-    "remove_color": "라벨 제거",
+    "remove_color": "태그 제거",
     "items_selected": "{count}개의 메일 선택됨",
     "edit_draft": "임시보관 메일 수정"
   },

locales/lv/common.json

@@ -638,7 +638,7 @@
       "filters": "Filtri",
       "templates": "Veidnes",
       "folders": "Mapes",
-      "keywords": "Atslēgvārdi",
+      "keywords": "Tagi",
       "security": "Drošība",
       "files": "Faili",
       "contacts": "Kontakti",
@@ -706,23 +706,23 @@
       }
     },
     "keywords": {
-      "title": "Vēstuļu atslēgvārdi",
+      "title": "E-pasta tagi",
-      "description": "Definējiet atslēgvārdus (etiķetes/tagus) vēstuļu organizēšanai ar krāsām. Tie tiek saglabāti serverī kā JMAP atslēgvārdi.",
+      "description": "Definējiet tagus, lai organizētu e-pastus ar krāsām. Tie tiek saglabāti kā JMAP atslēgvārdi serverī.",
-      "add_keyword": "Pievienot atslēgvārdu",
+      "add_keyword": "Pievienot tagu",
       "reset_defaults": "Atiestatīt noklusējumu",
       "label_field": "Redzamais nosaukums",
       "label_placeholder": "piem., Darbs, Personīgi, Steidzami",
-      "id_field": "Atslēgvārda identifikators",
+      "id_field": "Taga identifikators",
       "id_placeholder": "piem., darbs, personigi",
       "color_field": "Krāsa",
-      "id_exists": "Šāds atslēgvārda identifikators jau eksistē",
+      "id_exists": "Šāds taga identifikators jau pastāv",
-      "edit": "Rediģēt atslēgvārdu",
+      "edit": "Rediģēt tagu",
-      "delete": "Dzēst atslēgvārdu",
+      "delete": "Dzēst tagu",
       "save": "Saglabāt",
       "add": "Pievienot",
       "cancel": "Atcelt",
-      "migrating": "Atjaunina atslēgvārdu esošajās vēstulēs...",
+      "migrating": "Taga atjaunināšana esošajos e-pastos…",
-      "migration_error": "Neizdevās atjaunināt atslēgvārdu esošajās vēstulēs"
+      "migration_error": "Neizdevās atjaunināt tagu esošajos e-pastos"
     },
     "notifications": {
       "test_sound": "Pārbaudīt paziņojuma skaņu",
@@ -1284,7 +1284,7 @@
         "forward": "Pārsūtīt uz",
         "mark_read": "Atzīmēt kā izlasītu",
         "star": "Pievienot zvaigznīti",
-        "add_label": "Pievienot etiķeti",
+        "add_label": "Pievienot tagu",
         "discard": "Dzēst (bez paziņojuma)",
         "reject": "Noraidīt ar ziņojumu",
         "keep": "Atstāt iesūtnē",
@@ -1296,8 +1296,8 @@
       "forward_placeholder": "lietotajs@piemers.lv",
       "reject_message": "Noraidīšanas ziņojums",
       "reject_placeholder": "Jūsu e-pasts tika noraidīts",
-      "label_name": "Etiķetes nosaukums",
+      "label_name": "Taga nosaukums",
-      "label_placeholder": "piem., svarigi",
+      "label_placeholder": "Izvēlēties tagu",
       "header_name": "Galvenes nosaukums",
       "header_placeholder": "piem., X-Mailing-List",
       "size_bytes": "Izmērs baitos",
@@ -1471,8 +1471,8 @@
     "delete": "Dzēst",
     "mark_as_spam": "Atzīmēt kā mēstuli",
     "not_spam": "Nav mēstule",
-    "color_tag": "Etiķete",
+    "color_tag": "Tags",
-    "remove_color": "Noņemt etiķeti",
+    "remove_color": "Noņemt tagu",
     "items_selected": "{count} vēstules atlasītas",
     "edit_draft": "Rediģēt melnrakstu"
   },

locales/nl/common.json

@@ -639,7 +639,7 @@
       "filters": "Filters",
       "templates": "Sjablonen",
       "folders": "Mappen",
-      "keywords": "Sleutelwoorden",
+      "keywords": "Labels",
       "security": "Beveiliging",
       "encryption": "Versleuteling",
       "files": "Bestanden",
@@ -707,23 +707,23 @@
       }
     },
     "keywords": {
-      "title": "E-mail trefwoorden",
+      "title": "E-maillabels",
-      "description": "Definieer trefwoorden (labels/tags) om uw e-mails met kleuren te organiseren.",
+      "description": "Definieer labels om uw e-mails met kleuren te organiseren. Deze worden opgeslagen als JMAP-trefwoorden op de server.",
-      "add_keyword": "Trefwoord toevoegen",
+      "add_keyword": "Label toevoegen",
       "reset_defaults": "Standaardwaarden herstellen",
       "label_field": "Weergavenaam",
       "label_placeholder": "bijv. Werk, Persoonlijk, Urgent",
-      "id_field": "Trefwoord-ID",
+      "id_field": "Label-ID",
       "id_placeholder": "bijv. werk, persoonlijk",
       "color_field": "Kleur",
-      "id_exists": "Dit trefwoord-ID bestaat al",
+      "id_exists": "Deze label-ID bestaat al",
-      "edit": "Trefwoord bewerken",
+      "edit": "Label bewerken",
-      "delete": "Trefwoord verwijderen",
+      "delete": "Label verwijderen",
       "save": "Opslaan",
       "add": "Toevoegen",
       "cancel": "Annuleren",
-      "migrating": "Trefwoord bijwerken op bestaande e-mails…",
+      "migrating": "Label bijwerken op bestaande e-mails…",
-      "migration_error": "Kan trefwoord niet bijwerken op bestaande e-mails"
+      "migration_error": "Label bijwerken op bestaande e-mails mislukt"
     },
     "notifications": {
       "test_sound": "Meldingsgeluid testen",
@@ -1327,7 +1327,7 @@
       "reject_message": "Afwijzingsbericht",
       "reject_placeholder": "Uw e-mail is afgewezen",
       "label_name": "Labelnaam",
-      "label_placeholder": "bijv. belangrijk",
+      "label_placeholder": "Label kiezen",
       "header_name": "Headernaam",
       "header_placeholder": "bijv. X-Mailing-List",
       "size_bytes": "Grootte in bytes",

locales/pl/common.json

@@ -641,7 +641,7 @@
       "filters": "Filtry",
       "templates": "Szablony",
       "folders": "Foldery",
-      "keywords": "Słowa kluczowe",
+      "keywords": "Etykiety",
       "security": "Bezpieczeństwo",
       "files": "Pliki",
       "contacts": "Kontakty",
@@ -709,23 +709,23 @@
       }
     },
     "keywords": {
-      "title": "Słowa kluczowe wiadomości e-mail",
+      "title": "Etykiety e-mail",
-      "description": "Zdefiniuj słowa kluczowe (etykiety/tagi), aby porządkować wiadomości e-mail kolorami. Są one przechowywane na serwerze jako słowa kluczowe JMAP.",
+      "description": "Zdefiniuj etykiety do organizowania e-maili za pomocą kolorów. Są one przechowywane jako słowa kluczowe JMAP na serwerze.",
-      "add_keyword": "Dodaj słowo kluczowe",
+      "add_keyword": "Dodaj etykietę",
       "reset_defaults": "Przywróć domyślne",
       "label_field": "Nazwa wyświetlana",
       "label_placeholder": "np. Praca, Osobiste, Pilne",
-      "id_field": "Identyfikator słowa kluczowego",
+      "id_field": "ID etykiety",
       "id_placeholder": "np. praca, osobiste",
       "color_field": "Kolor",
-      "id_exists": "Ten identyfikator słowa kluczowego już istnieje",
+      "id_exists": "Ten ID etykiety już istnieje",
-      "edit": "Edytuj słowo kluczowe",
+      "edit": "Edytuj etykietę",
-      "delete": "Usuń słowo kluczowe",
+      "delete": "Usuń etykietę",
       "save": "Zapisz",
       "add": "Dodaj",
       "cancel": "Anuluj",
-      "migrating": "Aktualizowanie słowa kluczowego w istniejących wiadomościach e-mail…",
+      "migrating": "Aktualizowanie etykiety w istniejących e-mailach…",
-      "migration_error": "Nie udało się zaktualizować słowa kluczowego w istniejących wiadomościach e-mail"
+      "migration_error": "Nie udało się zaktualizować etykiety w istniejących e-mailach"
     },
     "notifications": {
       "test_sound": "Przetestuj dźwięk powiadomienia",
@@ -1329,7 +1329,7 @@
       "reject_message": "Wiadomość odrzucenia",
       "reject_placeholder": "Twoja wiadomość e-mail została odrzucona",
       "label_name": "Nazwa etykiety",
-      "label_placeholder": "np. ważne",
+      "label_placeholder": "Wybierz etykietę",
       "header_name": "Nazwa nagłówka",
       "header_placeholder": "np. X-Mailing-List",
       "size_bytes": "Rozmiar w bajtach",

locales/pt/common.json

@@ -639,7 +639,7 @@
       "filters": "Filtros",
       "templates": "Modelos",
       "folders": "Pastas",
-      "keywords": "Palavras-chave",
+      "keywords": "Etiquetas",
       "security": "Segurança",
       "encryption": "Criptografia",
       "files": "Arquivos",
@@ -707,22 +707,22 @@
       }
     },
     "keywords": {
-      "title": "Palavras-chave de e-mail",
+      "title": "Etiquetas de e-mail",
-      "description": "Defina palavras-chave (rótulos/tags) para organizar seus e-mails com cores.",
+      "description": "Defina etiquetas para organizar os seus e-mails com cores. São armazenadas como palavras-chave JMAP no servidor.",
-      "add_keyword": "Adicionar palavra-chave",
+      "add_keyword": "Adicionar etiqueta",
       "reset_defaults": "Restaurar padrões",
       "label_field": "Nome de exibição",
       "label_placeholder": "ex. Trabalho, Pessoal, Urgente",
-      "id_field": "ID da palavra-chave",
+      "id_field": "ID da etiqueta",
       "id_placeholder": "ex. trabalho, pessoal",
       "color_field": "Cor",
-      "id_exists": "Este ID de palavra-chave já existe",
+      "id_exists": "Este ID de etiqueta já existe",
-      "edit": "Editar palavra-chave",
+      "edit": "Editar etiqueta",
-      "delete": "Excluir palavra-chave",
+      "delete": "Eliminar etiqueta",
       "save": "Salvar",
       "add": "Adicionar",
       "cancel": "Cancelar",
-      "migrating": "Atualizando etiqueta nos e-mails existentes…",
+      "migrating": "A atualizar etiqueta nos e-mails existentes…",
       "migration_error": "Falha ao atualizar etiqueta nos e-mails existentes"
     },
     "notifications": {
@@ -1314,7 +1314,7 @@
         "forward": "Encaminhar para",
         "mark_read": "Marcar como lido",
         "star": "Destacar mensagem",
-        "add_label": "Adicionar rótulo",
+        "add_label": "Adicionar etiqueta",
         "discard": "Descartar (excluir silenciosamente)",
         "reject": "Rejeitar com mensagem",
         "keep": "Manter na caixa de entrada",
@@ -1326,8 +1326,8 @@
       "forward_placeholder": "email@exemplo.com",
       "reject_message": "Mensagem de rejeição",
       "reject_placeholder": "Seu e-mail foi rejeitado",
-      "label_name": "Nome do rótulo",
+      "label_name": "Nome da etiqueta",
-      "label_placeholder": "ex. importante",
+      "label_placeholder": "Selecionar etiqueta",
       "header_name": "Nome do cabeçalho",
       "header_placeholder": "ex. X-Mailing-List",
       "size_bytes": "Tamanho em bytes",

locales/ru/common.json

@@ -639,7 +639,7 @@
       "filters": "Фильтры",
       "templates": "Шаблоны",
       "folders": "Папки",
-      "keywords": "Ключевые слова",
+      "keywords": "Теги",
       "security": "Безопасность",
       "files": "Файлы",
       "contacts": "Контакты",
@@ -707,23 +707,23 @@
       }
     },
     "keywords": {
-      "title": "Ключевые слова писем",
+      "title": "Теги электронной почты",
-      "description": "Определите ключевые слова (метки/теги) для организации писем с помощью цветов. Они хранятся как ключевые слова JMAP на сервере.",
+      "description": "Определите теги для организации электронных писем с помощью цветов. Они хранятся как ключевые слова JMAP на сервере.",
-      "add_keyword": "Добавить ключевое слово",
+      "add_keyword": "Добавить тег",
       "reset_defaults": "Сбросить по умолчанию",
       "label_field": "Отображаемое название",
       "label_placeholder": "напр., Работа, Личное, Срочно",
-      "id_field": "Идентификатор ключевого слова",
+      "id_field": "Идентификатор тега",
       "id_placeholder": "напр., work, personal",
       "color_field": "Цвет",
-      "id_exists": "Этот идентификатор ключевого слова уже существует",
+      "id_exists": "Этот идентификатор тега уже существует",
-      "edit": "Редактировать ключевое слово",
+      "edit": "Редактировать тег",
-      "delete": "Удалить ключевое слово",
+      "delete": "Удалить тег",
       "save": "Сохранить",
       "add": "Добавить",
       "cancel": "Отмена",
-      "migrating": "Обновление ключевого слова в существующих письмах…",
+      "migrating": "Обновление тега в существующих письмах…",
-      "migration_error": "Не удалось обновить ключевое слово в существующих письмах"
+      "migration_error": "Не удалось обновить тег в существующих письмах"
     },
     "notifications": {
       "test_sound": "Проверить звук уведомления",
@@ -1314,7 +1314,7 @@
         "forward": "Переслать на",
         "mark_read": "Отметить прочитанным",
         "star": "Пометить сообщение",
-        "add_label": "Добавить метку",
+        "add_label": "Добавить тег",
         "discard": "Удалить (без уведомления)",
         "reject": "Отклонить с сообщением",
         "keep": "Оставить во входящих",
@@ -1326,8 +1326,8 @@
       "forward_placeholder": "user@пример.рф",
       "reject_message": "Сообщение об отклонении",
       "reject_placeholder": "Ваше письмо было отклонено",
-      "label_name": "Название метки",
+      "label_name": "Название тега",
-      "label_placeholder": "напр., важное",
+      "label_placeholder": "Выбрать тег",
       "header_name": "Имя заголовка",
       "header_placeholder": "напр., X-Mailing-List",
       "size_bytes": "Размер в байтах",
@@ -1501,8 +1501,8 @@
     "delete": "Удалить",
     "mark_as_spam": "Отметить как спам",
     "not_spam": "Не спам",
-    "color_tag": "Метка",
+    "color_tag": "Тег",
-    "remove_color": "Убрать метку",
+    "remove_color": "Удалить тег",
     "items_selected": "{count} писем выбрано",
     "edit_draft": "Редактировать черновик"
   },

locales/zh/common.json

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