@fresh-editor/fresh-editor 0.1.67 → 0.1.69

package/plugins/markdown_compose.ts

@@ -6,6 +6,8 @@
 //
 // Syntax highlighting is handled by the TextMate grammar (built-in to the editor)
 // This plugin only adds the compose mode layout features.
+const editor = getEditor();
+
 
 interface MarkdownConfig {
   composeWidth: number;
@@ -364,18 +366,18 @@ globalThis.markdownToggleCompose = function(): void {
 
   // Only work with markdown files
   if (!info.path.endsWith('.md') && !info.path.endsWith('.markdown')) {
-    editor.setStatus("Not a Markdown file");
+    editor.setStatus(editor.t("status.not_markdown_file"));
     return;
   }
 
   if (composeBuffers.has(bufferId)) {
     disableMarkdownCompose(bufferId);
-    editor.setStatus("Markdown Compose: OFF");
+    editor.setStatus(editor.t("status.compose_off"));
   } else {
     enableMarkdownCompose(bufferId);
     // Trigger a re-render to apply the transform
     editor.refreshLines(bufferId);
-    editor.setStatus("Markdown Compose: ON (soft breaks, centered)");
+    editor.setStatus(editor.t("status.compose_on"));
   }
 };
 
@@ -577,12 +579,12 @@ editor.on("prompt_confirmed", "onMarkdownComposeWidthConfirmed");
 
 // Set compose width command - starts interactive prompt
 globalThis.markdownSetComposeWidth = function(): void {
-  editor.startPrompt("Compose width: ", "markdown-compose-width");
+  editor.startPrompt(editor.t("prompt.compose_width"), "markdown-compose-width");
   editor.setPromptSuggestions([
-    { text: "60", description: "Narrow - good for side panels" },
-    { text: "72", description: "Classic - traditional terminal width" },
-    { text: "80", description: "Standard - default width" },
-    { text: "100", description: "Wide - more content per line" },
+    { text: "60", description: editor.t("suggestion.narrow") },
+    { text: "72", description: editor.t("suggestion.classic") },
+    { text: "80", description: editor.t("suggestion.standard") },
+    { text: "100", description: editor.t("suggestion.wide") },
   ]);
 };
 
@@ -596,7 +598,7 @@ globalThis.onMarkdownComposeWidthConfirmed = function(args: {
   const width = parseInt(args.text, 10);
   if (!isNaN(width) && width > 20 && width < 300) {
     config.composeWidth = width;
-    editor.setStatus(`Markdown compose width set to ${width}`);
+    editor.setStatus(editor.t("status.width_set", { width: String(width) }));
 
     // Re-process active buffer if in compose mode
     const bufferId = editor.getActiveBufferId();
@@ -604,25 +606,25 @@ globalThis.onMarkdownComposeWidthConfirmed = function(args: {
       editor.refreshLines(bufferId);  // Trigger re-transform
     }
   } else {
-    editor.setStatus("Invalid width - must be between 20 and 300");
+    editor.setStatus(editor.t("status.invalid_width"));
   }
 };
 
 // Register commands
 editor.registerCommand(
-  "Markdown: Toggle Compose",
-  "Toggle compose mode (soft wrapping, centered margins)",
+  "%cmd.toggle_compose",
+  "%cmd.toggle_compose_desc",
   "markdownToggleCompose",
   "normal"
 );
 
 editor.registerCommand(
-  "Markdown: Set Compose Width",
-  "Set the width for compose mode wrapping and margins",
+  "%cmd.set_compose_width",
+  "%cmd.set_compose_width_desc",
   "markdownSetComposeWidth",
   "normal"
 );
 
 // Initialization
 editor.debug("Markdown Compose plugin loaded - use 'Markdown: Toggle Compose' command");
-editor.setStatus("Markdown plugin ready");
+editor.setStatus(editor.t("status.plugin_ready"));

package/plugins/merge_conflict.i18n.json

@@ -0,0 +1,380 @@
+{
+  "en": {
+    "cmd.start": "Merge: Start Resolution",
+    "cmd.start_desc": "Start 3-way merge conflict resolution for current file",
+    "cmd.next": "Merge: Next Conflict",
+    "cmd.next_desc": "Jump to next unresolved conflict",
+    "cmd.prev": "Merge: Previous Conflict",
+    "cmd.prev_desc": "Jump to previous unresolved conflict",
+    "cmd.use_ours": "Merge: Use Ours",
+    "cmd.use_ours_desc": "Accept our version for current conflict",
+    "cmd.take_theirs": "Merge: Take Theirs",
+    "cmd.take_theirs_desc": "Accept their version for current conflict",
+    "cmd.use_both": "Merge: Use Both",
+    "cmd.use_both_desc": "Accept both versions for current conflict",
+    "cmd.save_exit": "Merge: Save & Exit",
+    "cmd.save_exit_desc": "Save resolved content and exit merge mode",
+    "cmd.abort": "Merge: Abort",
+    "cmd.abort_desc": "Abort merge resolution without saving",
+    "status.ready": "Merge Conflict Resolution plugin loaded",
+    "status.already_active": "Merge mode already active",
+    "status.no_file": "No file open",
+    "status.not_git_repo": "Not in a git repository - merge conflict resolution requires git",
+    "status.no_unmerged": "No unmerged entries - file is not in a merge conflict state",
+    "status.failed_read": "Failed to read file content",
+    "status.no_markers": "No conflict markers found in file content",
+    "status.starting": "Starting merge conflict resolution...",
+    "status.failed_parse": "Failed to parse conflict markers",
+    "status.progress": "Merge: {remaining} of {total} conflicts remaining | Current: {current}",
+    "status.all_resolved": "Merge: All {total} conflicts resolved! Press 's' to save",
+    "status.no_active_merge": "No active merge - use 'Merge: Start Resolution' first",
+    "status.no_conflicts": "No conflicts to navigate",
+    "status.single_refocused": "Conflict 1 of 1 (re-focused)",
+    "status.conflict_of": "Conflict {current} of {total}",
+    "status.conflict_all_resolved": "Conflict {current} of {total} (all resolved)",
+    "status.cannot_save": "Cannot save: {count} unresolved conflicts remaining",
+    "status.complete": "Merge complete! File updated with resolved content",
+    "status.nothing_to_abort": "No active merge - nothing to abort",
+    "status.aborted": "Merge aborted - no changes made",
+    "status.help": "Merge: [n/p] Navigate | [u] Ours [t] Theirs [b] Both | [s] Save [q] Abort",
+    "status.detected": "Conflicts detected! Use 'Merge: Start Resolution' or run start_merge_conflict",
+    "status.detected_file": "Merge conflicts detected in {path} - Use 'Merge: Start Resolution'",
+    "status.conflicts_to_resolve": "Merge: {remaining} conflicts to resolve ({auto_resolved} auto-resolved)",
+    "status.all_auto_resolved": "Merge: All {total} conflicts auto-resolved! Press 's' to save",
+    "panel.ours_header": "OURS (Read-only) - Changes from your branch",
+    "panel.theirs_header": "THEIRS (Read-only) - Incoming changes",
+    "panel.result_header": "RESULT (Editable) - Resolved content",
+    "panel.git_unavailable": "(Git version not available - showing conflict regions only)",
+    "panel.conflict": "Conflict {index}",
+    "panel.resolved": "[RESOLVED]",
+    "panel.pending": "[PENDING]",
+    "panel.empty": "(empty)",
+    "panel.remaining": "{count} conflict(s) remaining",
+    "panel.all_resolved": "All conflicts resolved!",
+    "panel.resolved_with": "[Resolved: {resolution}]",
+    "btn.accept_ours": "[u] Accept Ours",
+    "btn.accept_theirs": "[t] Accept Theirs",
+    "btn.both": "[b] Both",
+    "btn.next": "[n] Next",
+    "btn.prev": "[p] Prev",
+    "btn.use_ours": "[u] Use Ours",
+    "btn.take_theirs": "[t] Take Theirs",
+    "btn.save_exit": "[s] Save & Exit",
+    "btn.abort": "[q] Abort"
+  },
+  "es": {
+    "cmd.start": "Fusionar: Iniciar Resolucion",
+    "cmd.start_desc": "Iniciar resolucion de conflictos de fusion de 3 vias para el archivo actual",
+    "cmd.next": "Fusionar: Siguiente Conflicto",
+    "cmd.next_desc": "Saltar al siguiente conflicto sin resolver",
+    "cmd.prev": "Fusionar: Conflicto Anterior",
+    "cmd.prev_desc": "Saltar al conflicto anterior sin resolver",
+    "cmd.use_ours": "Fusionar: Usar Nuestro",
+    "cmd.use_ours_desc": "Aceptar nuestra version para el conflicto actual",
+    "cmd.take_theirs": "Fusionar: Tomar Suyo",
+    "cmd.take_theirs_desc": "Aceptar su version para el conflicto actual",
+    "cmd.use_both": "Fusionar: Usar Ambos",
+    "cmd.use_both_desc": "Aceptar ambas versiones para el conflicto actual",
+    "cmd.save_exit": "Fusionar: Guardar y Salir",
+    "cmd.save_exit_desc": "Guardar contenido resuelto y salir del modo de fusion",
+    "cmd.abort": "Fusionar: Abortar",
+    "cmd.abort_desc": "Abortar resolucion de fusion sin guardar",
+    "status.ready": "Plugin de Resolucion de Conflictos de Fusion cargado",
+    "status.already_active": "El modo de fusion ya esta activo",
+    "status.no_file": "Ningun archivo abierto",
+    "status.not_git_repo": "No esta en un repositorio git - la resolucion de conflictos requiere git",
+    "status.no_unmerged": "No hay entradas sin fusionar - el archivo no esta en estado de conflicto",
+    "status.failed_read": "Error al leer el contenido del archivo",
+    "status.no_markers": "No se encontraron marcadores de conflicto en el contenido del archivo",
+    "status.starting": "Iniciando resolucion de conflictos de fusion...",
+    "status.failed_parse": "Error al analizar marcadores de conflicto",
+    "status.progress": "Fusion: {remaining} de {total} conflictos restantes | Actual: {current}",
+    "status.all_resolved": "Fusion: Todos los {total} conflictos resueltos! Presiona 's' para guardar",
+    "status.no_active_merge": "No hay fusion activa - usa 'Fusionar: Iniciar Resolucion' primero",
+    "status.no_conflicts": "No hay conflictos para navegar",
+    "status.single_refocused": "Conflicto 1 de 1 (reenfocado)",
+    "status.conflict_of": "Conflicto {current} de {total}",
+    "status.conflict_all_resolved": "Conflicto {current} de {total} (todos resueltos)",
+    "status.cannot_save": "No se puede guardar: {count} conflictos sin resolver restantes",
+    "status.complete": "Fusion completa! Archivo actualizado con contenido resuelto",
+    "status.nothing_to_abort": "No hay fusion activa - nada que abortar",
+    "status.aborted": "Fusion abortada - no se hicieron cambios",
+    "status.help": "Fusion: [n/p] Navegar | [u] Nuestro [t] Suyo [b] Ambos | [s] Guardar [q] Abortar",
+    "status.detected": "Conflictos detectados! Usa 'Fusionar: Iniciar Resolucion' o ejecuta start_merge_conflict",
+    "status.detected_file": "Conflictos de fusion detectados en {path} - Usa 'Fusionar: Iniciar Resolucion'",
+    "status.conflicts_to_resolve": "Fusion: {remaining} conflictos por resolver ({auto_resolved} auto-resueltos)",
+    "status.all_auto_resolved": "Fusion: Todos los {total} conflictos auto-resueltos! Presiona 's' para guardar",
+    "panel.ours_header": "NUESTRO (Solo lectura) - Cambios de tu rama",
+    "panel.theirs_header": "SUYO (Solo lectura) - Cambios entrantes",
+    "panel.result_header": "RESULTADO (Editable) - Contenido resuelto",
+    "panel.git_unavailable": "(Version de Git no disponible - mostrando solo regiones de conflicto)",
+    "panel.conflict": "Conflicto {index}",
+    "panel.resolved": "[RESUELTO]",
+    "panel.pending": "[PENDIENTE]",
+    "panel.empty": "(vacio)",
+    "panel.remaining": "{count} conflicto(s) restante(s)",
+    "panel.all_resolved": "Todos los conflictos resueltos!",
+    "panel.resolved_with": "[Resuelto: {resolution}]",
+    "btn.accept_ours": "[u] Aceptar Nuestro",
+    "btn.accept_theirs": "[t] Aceptar Suyo",
+    "btn.both": "[b] Ambos",
+    "btn.next": "[n] Siguiente",
+    "btn.prev": "[p] Anterior",
+    "btn.use_ours": "[u] Usar Nuestro",
+    "btn.take_theirs": "[t] Tomar Suyo",
+    "btn.save_exit": "[s] Guardar y Salir",
+    "btn.abort": "[q] Abortar"
+  },
+  "de": {
+    "cmd.start": "Merge: Auflosung starten",
+    "cmd.start_desc": "3-Wege-Merge-Konfliktauflosung fur aktuelle Datei starten",
+    "cmd.next": "Merge: Nachster Konflikt",
+    "cmd.next_desc": "Zum nachsten ungelosten Konflikt springen",
+    "cmd.prev": "Merge: Vorheriger Konflikt",
+    "cmd.prev_desc": "Zum vorherigen ungelosten Konflikt springen",
+    "cmd.use_ours": "Merge: Unsere Version",
+    "cmd.use_ours_desc": "Unsere Version fur aktuellen Konflikt akzeptieren",
+    "cmd.take_theirs": "Merge: Ihre Version",
+    "cmd.take_theirs_desc": "Ihre Version fur aktuellen Konflikt akzeptieren",
+    "cmd.use_both": "Merge: Beide",
+    "cmd.use_both_desc": "Beide Versionen fur aktuellen Konflikt akzeptieren",
+    "cmd.save_exit": "Merge: Speichern & Beenden",
+    "cmd.save_exit_desc": "Gelosten Inhalt speichern und Merge-Modus beenden",
+    "cmd.abort": "Merge: Abbrechen",
+    "cmd.abort_desc": "Merge-Auflosung ohne Speichern abbrechen",
+    "status.ready": "Merge-Konfliktauflosungs-Plugin geladen",
+    "status.already_active": "Merge-Modus bereits aktiv",
+    "status.no_file": "Keine Datei geoffnet",
+    "status.not_git_repo": "Nicht in einem Git-Repository - Merge-Konfliktauflosung erfordert Git",
+    "status.no_unmerged": "Keine nicht zusammengefuhrten Eintrage - Datei ist nicht im Konfliktzustand",
+    "status.failed_read": "Fehler beim Lesen des Dateiinhalts",
+    "status.no_markers": "Keine Konfliktmarkierungen im Dateiinhalt gefunden",
+    "status.starting": "Starte Merge-Konfliktauflosung...",
+    "status.failed_parse": "Fehler beim Parsen der Konfliktmarkierungen",
+    "status.progress": "Merge: {remaining} von {total} Konflikten verbleibend | Aktuell: {current}",
+    "status.all_resolved": "Merge: Alle {total} Konflikte gelost! Drucke 's' zum Speichern",
+    "status.no_active_merge": "Kein aktiver Merge - verwende zuerst 'Merge: Auflosung starten'",
+    "status.no_conflicts": "Keine Konflikte zum Navigieren",
+    "status.single_refocused": "Konflikt 1 von 1 (neu fokussiert)",
+    "status.conflict_of": "Konflikt {current} von {total}",
+    "status.conflict_all_resolved": "Konflikt {current} von {total} (alle gelost)",
+    "status.cannot_save": "Kann nicht speichern: {count} ungeloste Konflikte verbleibend",
+    "status.complete": "Merge abgeschlossen! Datei mit gelostem Inhalt aktualisiert",
+    "status.nothing_to_abort": "Kein aktiver Merge - nichts abzubrechen",
+    "status.aborted": "Merge abgebrochen - keine Anderungen vorgenommen",
+    "status.help": "Merge: [n/p] Navigieren | [u] Unsere [t] Ihre [b] Beide | [s] Speichern [q] Abbrechen",
+    "status.detected": "Konflikte erkannt! Verwende 'Merge: Auflosung starten' oder fuhre start_merge_conflict aus",
+    "status.detected_file": "Merge-Konflikte in {path} erkannt - Verwende 'Merge: Auflosung starten'",
+    "status.conflicts_to_resolve": "Merge: {remaining} Konflikte zu losen ({auto_resolved} automatisch gelost)",
+    "status.all_auto_resolved": "Merge: Alle {total} Konflikte automatisch gelost! Drucke 's' zum Speichern",
+    "panel.ours_header": "UNSERE (Schreibgeschutzt) - Anderungen aus deinem Branch",
+    "panel.theirs_header": "IHRE (Schreibgeschutzt) - Eingehende Anderungen",
+    "panel.result_header": "ERGEBNIS (Bearbeitbar) - Geloster Inhalt",
+    "panel.git_unavailable": "(Git-Version nicht verfugbar - zeige nur Konfliktbereiche)",
+    "panel.conflict": "Konflikt {index}",
+    "panel.resolved": "[GELOST]",
+    "panel.pending": "[AUSSTEHEND]",
+    "panel.empty": "(leer)",
+    "panel.remaining": "{count} Konflikt(e) verbleibend",
+    "panel.all_resolved": "Alle Konflikte gelost!",
+    "panel.resolved_with": "[Gelost: {resolution}]",
+    "btn.accept_ours": "[u] Unsere akzeptieren",
+    "btn.accept_theirs": "[t] Ihre akzeptieren",
+    "btn.both": "[b] Beide",
+    "btn.next": "[n] Nachster",
+    "btn.prev": "[p] Vorheriger",
+    "btn.use_ours": "[u] Unsere verwenden",
+    "btn.take_theirs": "[t] Ihre nehmen",
+    "btn.save_exit": "[s] Speichern & Beenden",
+    "btn.abort": "[q] Abbrechen"
+  },
+  "fr": {
+    "cmd.start": "Fusion: Demarrer la Resolution",
+    "cmd.start_desc": "Demarrer la resolution de conflit de fusion 3 voies pour le fichier actuel",
+    "cmd.next": "Fusion: Conflit Suivant",
+    "cmd.next_desc": "Aller au prochain conflit non resolu",
+    "cmd.prev": "Fusion: Conflit Precedent",
+    "cmd.prev_desc": "Aller au conflit precedent non resolu",
+    "cmd.use_ours": "Fusion: Utiliser le Notre",
+    "cmd.use_ours_desc": "Accepter notre version pour le conflit actuel",
+    "cmd.take_theirs": "Fusion: Prendre le Leur",
+    "cmd.take_theirs_desc": "Accepter leur version pour le conflit actuel",
+    "cmd.use_both": "Fusion: Utiliser les Deux",
+    "cmd.use_both_desc": "Accepter les deux versions pour le conflit actuel",
+    "cmd.save_exit": "Fusion: Sauvegarder et Quitter",
+    "cmd.save_exit_desc": "Sauvegarder le contenu resolu et quitter le mode fusion",
+    "cmd.abort": "Fusion: Abandonner",
+    "cmd.abort_desc": "Abandonner la resolution de fusion sans sauvegarder",
+    "status.ready": "Plugin de Resolution de Conflits de Fusion charge",
+    "status.already_active": "Le mode fusion est deja actif",
+    "status.no_file": "Aucun fichier ouvert",
+    "status.not_git_repo": "Pas dans un depot git - la resolution de conflit necessite git",
+    "status.no_unmerged": "Pas d'entrees non fusionnees - le fichier n'est pas en etat de conflit",
+    "status.failed_read": "Echec de la lecture du contenu du fichier",
+    "status.no_markers": "Aucun marqueur de conflit trouve dans le contenu du fichier",
+    "status.starting": "Demarrage de la resolution de conflit de fusion...",
+    "status.failed_parse": "Echec de l'analyse des marqueurs de conflit",
+    "status.progress": "Fusion: {remaining} sur {total} conflits restants | Actuel: {current}",
+    "status.all_resolved": "Fusion: Tous les {total} conflits resolus! Appuyez sur 's' pour sauvegarder",
+    "status.no_active_merge": "Pas de fusion active - utilisez d'abord 'Fusion: Demarrer la Resolution'",
+    "status.no_conflicts": "Pas de conflits a naviguer",
+    "status.single_refocused": "Conflit 1 sur 1 (refocalise)",
+    "status.conflict_of": "Conflit {current} sur {total}",
+    "status.conflict_all_resolved": "Conflit {current} sur {total} (tous resolus)",
+    "status.cannot_save": "Impossible de sauvegarder: {count} conflits non resolus restants",
+    "status.complete": "Fusion terminee! Fichier mis a jour avec le contenu resolu",
+    "status.nothing_to_abort": "Pas de fusion active - rien a abandonner",
+    "status.aborted": "Fusion abandonnee - aucune modification effectuee",
+    "status.help": "Fusion: [n/p] Naviguer | [u] Notre [t] Leur [b] Deux | [s] Sauver [q] Quitter",
+    "status.detected": "Conflits detectes! Utilisez 'Fusion: Demarrer la Resolution' ou executez start_merge_conflict",
+    "status.detected_file": "Conflits de fusion detectes dans {path} - Utilisez 'Fusion: Demarrer la Resolution'",
+    "status.conflicts_to_resolve": "Fusion: {remaining} conflits a resoudre ({auto_resolved} auto-resolus)",
+    "status.all_auto_resolved": "Fusion: Tous les {total} conflits auto-resolus! Appuyez sur 's' pour sauvegarder",
+    "panel.ours_header": "NOTRE (Lecture seule) - Modifications de votre branche",
+    "panel.theirs_header": "LEUR (Lecture seule) - Modifications entrantes",
+    "panel.result_header": "RESULTAT (Modifiable) - Contenu resolu",
+    "panel.git_unavailable": "(Version Git non disponible - affichage des regions de conflit uniquement)",
+    "panel.conflict": "Conflit {index}",
+    "panel.resolved": "[RESOLU]",
+    "panel.pending": "[EN ATTENTE]",
+    "panel.empty": "(vide)",
+    "panel.remaining": "{count} conflit(s) restant(s)",
+    "panel.all_resolved": "Tous les conflits resolus!",
+    "panel.resolved_with": "[Resolu: {resolution}]",
+    "btn.accept_ours": "[u] Accepter le Notre",
+    "btn.accept_theirs": "[t] Accepter le Leur",
+    "btn.both": "[b] Les Deux",
+    "btn.next": "[n] Suivant",
+    "btn.prev": "[p] Precedent",
+    "btn.use_ours": "[u] Utiliser le Notre",
+    "btn.take_theirs": "[t] Prendre le Leur",
+    "btn.save_exit": "[s] Sauvegarder et Quitter",
+    "btn.abort": "[q] Abandonner"
+  },
+  "ja": {
+    "cmd.start": "Merge: 解決を開始",
+    "cmd.start_desc": "現在のファイルの3方向マージ競合解決を開始",
+    "cmd.next": "Merge: 次の競合",
+    "cmd.next_desc": "次の未解決の競合にジャンプ",
+    "cmd.prev": "Merge: 前の競合",
+    "cmd.prev_desc": "前の未解決の競合にジャンプ",
+    "cmd.use_ours": "Merge: 自分のを使用",
+    "cmd.use_ours_desc": "現在の競合に自分のバージョンを採用",
+    "cmd.take_theirs": "Merge: 相手のを使用",
+    "cmd.take_theirs_desc": "現在の競合に相手のバージョンを採用",
+    "cmd.use_both": "Merge: 両方を使用",
+    "cmd.use_both_desc": "現在の競合に両方のバージョンを採用",
+    "cmd.save_exit": "Merge: 保存して終了",
+    "cmd.save_exit_desc": "解決したコンテンツを保存してマージモードを終了",
+    "cmd.abort": "Merge: 中止",
+    "cmd.abort_desc": "保存せずにマージ解決を中止",
+    "status.ready": "マージ競合解決プラグインが読み込まれました",
+    "status.already_active": "マージモードは既にアクティブです",
+    "status.no_file": "ファイルが開かれていません",
+    "status.not_git_repo": "gitリポジトリ内ではありません - マージ競合解決にはgitが必要です",
+    "status.no_unmerged": "未マージのエントリがありません - ファイルは競合状態ではありません",
+    "status.failed_read": "ファイルコンテンツの読み取りに失敗しました",
+    "status.no_markers": "ファイルコンテンツに競合マーカーが見つかりません",
+    "status.starting": "マージ競合解決を開始しています...",
+    "status.failed_parse": "競合マーカーの解析に失敗しました",
+    "status.progress": "Merge: {total}件中{remaining}件の競合が残っています | 現在: {current}",
+    "status.all_resolved": "Merge: 全{total}件の競合が解決しました! 's'を押して保存",
+    "status.no_active_merge": "アクティブなマージがありません - まず 'Merge: 解決を開始' を使用してください",
+    "status.no_conflicts": "ナビゲートする競合がありません",
+    "status.single_refocused": "競合 1/1 (再フォーカス)",
+    "status.conflict_of": "競合 {current}/{total}",
+    "status.conflict_all_resolved": "競合 {current}/{total} (全て解決済み)",
+    "status.cannot_save": "保存できません: 未解決の競合が{count}件残っています",
+    "status.complete": "マージ完了! 解決したコンテンツでファイルを更新しました",
+    "status.nothing_to_abort": "アクティブなマージがありません - 中止するものがありません",
+    "status.aborted": "マージを中止しました - 変更はありません",
+    "status.help": "Merge: [n/p] ナビゲート | [u] 自分の [t] 相手の [b] 両方 | [s] 保存 [q] 中止",
+    "status.detected": "競合を検出! 'Merge: 解決を開始' を使用するか start_merge_conflict を実行してください",
+    "status.detected_file": "{path} でマージ競合を検出 - 'Merge: 解決を開始' を使用してください",
+    "status.conflicts_to_resolve": "Merge: 解決すべき競合が{remaining}件 ({auto_resolved}件自動解決済み)",
+    "status.all_auto_resolved": "Merge: 全{total}件の競合が自動解決しました! 's'を押して保存",
+    "panel.ours_header": "OURS (読み取り専用) - あなたのブランチからの変更",
+    "panel.theirs_header": "THEIRS (読み取り専用) - 着信する変更",
+    "panel.result_header": "RESULT (編集可能) - 解決されたコンテンツ",
+    "panel.git_unavailable": "(Gitバージョンが利用できません - 競合領域のみ表示)",
+    "panel.conflict": "競合 {index}",
+    "panel.resolved": "[解決済み]",
+    "panel.pending": "[保留中]",
+    "panel.empty": "(空)",
+    "panel.remaining": "{count}件の競合が残っています",
+    "panel.all_resolved": "全ての競合が解決しました!",
+    "panel.resolved_with": "[解決: {resolution}]",
+    "btn.accept_ours": "[u] 自分のを採用",
+    "btn.accept_theirs": "[t] 相手のを採用",
+    "btn.both": "[b] 両方",
+    "btn.next": "[n] 次",
+    "btn.prev": "[p] 前",
+    "btn.use_ours": "[u] 自分のを使用",
+    "btn.take_theirs": "[t] 相手のを使用",
+    "btn.save_exit": "[s] 保存して終了",
+    "btn.abort": "[q] 中止"
+  },
+  "zh-CN": {
+    "cmd.start": "Merge: 开始解决",
+    "cmd.start_desc": "为当前文件开始3路合并冲突解决",
+    "cmd.next": "Merge: 下一个冲突",
+    "cmd.next_desc": "跳转到下一个未解决的冲突",
+    "cmd.prev": "Merge: 上一个冲突",
+    "cmd.prev_desc": "跳转到上一个未解决的冲突",
+    "cmd.use_ours": "Merge: 使用我们的",
+    "cmd.use_ours_desc": "为当前冲突采用我们的版本",
+    "cmd.take_theirs": "Merge: 使用他们的",
+    "cmd.take_theirs_desc": "为当前冲突采用他们的版本",
+    "cmd.use_both": "Merge: 使用两者",
+    "cmd.use_both_desc": "为当前冲突采用两个版本",
+    "cmd.save_exit": "Merge: 保存并退出",
+    "cmd.save_exit_desc": "保存已解决的内容并退出合并模式",
+    "cmd.abort": "Merge: 中止",
+    "cmd.abort_desc": "不保存中止合并解决",
+    "status.ready": "合并冲突解决插件已加载",
+    "status.already_active": "合并模式已激活",
+    "status.no_file": "没有打开的文件",
+    "status.not_git_repo": "不在git仓库中 - 合并冲突解决需要git",
+    "status.no_unmerged": "没有未合并的条目 - 文件不处于冲突状态",
+    "status.failed_read": "读取文件内容失败",
+    "status.no_markers": "在文件内容中未找到冲突标记",
+    "status.starting": "正在开始合并冲突解决...",
+    "status.failed_parse": "解析冲突标记失败",
+    "status.progress": "Merge: 剩余 {remaining}/{total} 个冲突 | 当前: {current}",
+    "status.all_resolved": "Merge: 所有 {total} 个冲突已解决! 按 's' 保存",
+    "status.no_active_merge": "没有活动的合并 - 请先使用 'Merge: 开始解决'",
+    "status.no_conflicts": "没有可导航的冲突",
+    "status.single_refocused": "冲突 1/1 (重新聚焦)",
+    "status.conflict_of": "冲突 {current}/{total}",
+    "status.conflict_all_resolved": "冲突 {current}/{total} (全部已解决)",
+    "status.cannot_save": "无法保存: 剩余 {count} 个未解决的冲突",
+    "status.complete": "合并完成! 文件已更新为解决后的内容",
+    "status.nothing_to_abort": "没有活动的合并 - 没有可中止的内容",
+    "status.aborted": "合并已中止 - 未做任何更改",
+    "status.help": "Merge: [n/p] 导航 | [u] 我们的 [t] 他们的 [b] 两者 | [s] 保存 [q] 中止",
+    "status.detected": "检测到冲突! 使用 'Merge: 开始解决' 或运行 start_merge_conflict",
+    "status.detected_file": "在 {path} 中检测到合并冲突 - 使用 'Merge: 开始解决'",
+    "status.conflicts_to_resolve": "Merge: {remaining} 个冲突待解决 ({auto_resolved} 个自动解决)",
+    "status.all_auto_resolved": "Merge: 所有 {total} 个冲突已自动解决! 按 's' 保存",
+    "panel.ours_header": "OURS (只读) - 来自您分支的更改",
+    "panel.theirs_header": "THEIRS (只读) - 传入的更改",
+    "panel.result_header": "RESULT (可编辑) - 已解决的内容",
+    "panel.git_unavailable": "(Git版本不可用 - 仅显示冲突区域)",
+    "panel.conflict": "冲突 {index}",
+    "panel.resolved": "[已解决]",
+    "panel.pending": "[待处理]",
+    "panel.empty": "(空)",
+    "panel.remaining": "剩余 {count} 个冲突",
+    "panel.all_resolved": "所有冲突已解决!",
+    "panel.resolved_with": "[已解决: {resolution}]",
+    "btn.accept_ours": "[u] 采用我们的",
+    "btn.accept_theirs": "[t] 采用他们的",
+    "btn.both": "[b] 两者",
+    "btn.next": "[n] 下一个",
+    "btn.prev": "[p] 上一个",
+    "btn.use_ours": "[u] 使用我们的",
+    "btn.take_theirs": "[t] 使用他们的",
+    "btn.save_exit": "[s] 保存并退出",
+    "btn.abort": "[q] 中止"
+  }
+}