Fixes for M-02 to M-14, G-01 to G-14, K-02 to K-04, X-04 to X-14, not yet reviewed

Committed before review so Windows and WSL builds can start.
Each fix was tested and mutation-checked here; the codex review
of each item is still to come, so tasks/BUGS.md stays unticked.

M-02 is mid-review: round 1 findings are fixed (apps/ely-mark/src/tally.rs).
K-01 stays deferred. The ElyMark window test mark-outside.sh failed
once at its crash-recovery step in the last run; not yet looked into.

crates/ely-ui/src/i18n/mark.rs

@@ -83,6 +83,11 @@ pub(super) const EN: &[(&str, &str)] = &[
     ("mark.git.failed", "ElyTree did not open: {error}"),
     ("mark.large", "This file is {size} MB: it shows as source. Visual and preview are off; saving keeps every byte."),
     ("mark.large.modes", "Large files stay in source mode"),
+    (
+        "mark.visual.broke",
+        "The visual editor failed ({what}); the file shows as source",
+    ),
+    ("mark.page.broke", "The editor did not open ({what})"),
     ("mark.mode.visual", "Visual"),
     ("mark.mode.source", "Source"),
     ("mark.mode.preview", "Preview"),
@@ -179,6 +184,11 @@ pub(super) const ZH_CN: &[(&str, &str)] = &[
     ("mark.git.failed", "ElyTree 没能打开：{error}"),
     ("mark.large", "此文件 {size} MB，以源码显示。可视与预览已关闭；保存时保留全部内容。"),
     ("mark.large.modes", "大文件只用源码模式"),
+    (
+        "mark.visual.broke",
+        "可视编辑器出错（{what}），文件以源码显示",
+    ),
+    ("mark.page.broke", "编辑器没有打开（{what}）"),
     ("mark.mode.visual", "可视"),
     ("mark.mode.source", "源码"),
     ("mark.mode.preview", "预览"),

crates/ely-ui/src/i18n/office.rs

@@ -17,12 +17,31 @@ pub(super) const EN: &[(&str, &str)] = &[
     ),
     ("office.error.changed", "The document changed meanwhile; try again"),
     ("office.print.failed", "Printing failed: {error}"),
-    ("office.recovery.failed", "A recovery copy was not written: {error}"),
-    ("office.recovery.off", "Recovery copies are off for this run: {error}"),
-    ("office.recovery.lost", "{name} could not be recovered: {error}"),
-    ("office.recovery.back", "{name}: unsaved content from {at} is back; the cursor and undo history are not"),
-    ("office.recovery.index", "Recovery points cannot be listed, so a crash may lose them: {error}"),
-    ("office.stopped", "The document engine stopped ({why}). Last recovery point: {at}."),
+    ("office.link.refused", "Ely opens only web and mail links."),
+    (
+        "office.recovery.failed",
+        "A recovery copy was not written: {error}",
+    ),
+    (
+        "office.recovery.off",
+        "Recovery copies are off for this run: {error}",
+    ),
+    (
+        "office.recovery.lost",
+        "{name} could not be recovered: {error}",
+    ),
+    (
+        "office.recovery.back",
+        "{name}: unsaved content from {at} is back; the cursor and undo history are not",
+    ),
+    (
+        "office.recovery.index",
+        "Recovery points cannot be listed, so a crash may lose them: {error}",
+    ),
+    (
+        "office.stopped",
+        "The document engine stopped ({why}). Last recovery point: {at}.",
+    ),
     ("office.stopped.never", "none yet"),
     ("office.stopped.reopen", "Reopen documents"),
     ("office.stopped.lost", "Not reopened: {names}. Their unsaved changes had no recovery point."),
@@ -103,6 +122,7 @@ pub(super) const ZH_CN: &[(&str, &str)] = &[
     ("office.error.convert", "格式转换要写成新文件，请换个名字"),
     ("office.error.changed", "文档在此间已改动，请重试"),
     ("office.print.failed", "打印失败：{error}"),
+    ("office.link.refused", "Ely 只打开网页与邮件链接。"),
     ("office.recovery.failed", "恢复副本未能写入：{error}"),
     ("office.recovery.off", "本次运行不写恢复副本：{error}"),
     ("office.recovery.lost", "{name} 未能恢复：{error}"),

crates/ely-ui/src/i18n/pdf.rs

@@ -184,7 +184,6 @@ pub(super) const EN: &[(&str, &str)] = &[
         "pdf.link.bad",
         "Type a page number, or a web or mail address.",
     ),
-    ("pdf.link.refused", "Ely opens only web and mail links."),
     ("pdf.side.files", "Attachments"),
     ("pdf.files.none", "No attachments"),
     ("pdf.file.attach", "Attach File…"),
@@ -391,7 +390,6 @@ pub(super) const ZH_CN: &[(&str, &str)] = &[
     ("pdf.tool.link", "添加链接"),
     ("pdf.link.target", "目标"),
     ("pdf.link.bad", "请输入页码，或网址、邮件地址。"),
-    ("pdf.link.refused", "Ely 只打开网页与邮件链接。"),
     ("pdf.side.files", "附件"),
     ("pdf.files.none", "没有附件"),
     ("pdf.file.attach", "添加附件…"),

crates/ely-ui/src/i18n/tree.rs

@@ -52,6 +52,7 @@ pub(super) const EN: &[(&str, &str)] = &[
     ("tree.error.write", "Git failed: {error}"),
     ("tree.error.clone", "The clone failed: {error}"),
     ("tree.error.stop", "The clone did not stop: {error}"),
+    ("tree.error.stop_remote", "Git did not stop: {error}"),
     ("tree.error.panel", "The folder panel failed: {error}"),
     ("tree.space.exact", "Exact"),
     ("tree.space.changes", "Ignore Space Changes"),
@@ -179,6 +180,7 @@ pub(super) const ZH_CN: &[(&str, &str)] = &[
     ("tree.error.write", "Git 失败：{error}"),
     ("tree.error.clone", "克隆失败：{error}"),
     ("tree.error.stop", "克隆未能停止：{error}"),
+    ("tree.error.stop_remote", "Git 未能停止：{error}"),
     ("tree.error.panel", "文件夹面板失败：{error}"),
     ("tree.space.exact", "精确"),
     ("tree.space.changes", "忽略空白变化"),

crates/ely-ui/src/i18n/tree_ops.rs

@@ -75,6 +75,8 @@ pub(super) const EN: &[(&str, &str)] = &[
     ),
     ("tree.op.picking", "Cherry-picking {theirs} onto {ours}"),
     ("tree.op.reverting", "Reverting {theirs} on {ours}"),
+    ("tree.op.applying", "Applying patch {theirs} onto {ours}"),
+    ("tree.op.unread", "What Git is doing did not read: {error}"),
     (
         "tree.op.next",
         "Resolve the conflicts and mark each file resolved, then continue.",
@@ -98,6 +100,8 @@ pub(super) const EN: &[(&str, &str)] = &[
     ("tree.theirs.pick", "Picked, {name}"),
     ("tree.ours.revert", "Current, {name}"),
     ("tree.theirs.revert", "Reverting, {name}"),
+    ("tree.ours.am", "Current, {name}"),
+    ("tree.theirs.am", "Patch {name}"),
     ("tree.conflict.save", "Save"),
     ("tree.conflict.resolved", "Mark Resolved"),
     ("tree.conflict.use_ours", "Use Current File"),
@@ -107,6 +111,10 @@ pub(super) const EN: &[(&str, &str)] = &[
         "tree.conflict.hand",
         "The result was edited by hand; settle the rest in the result.",
     ),
+    (
+        "tree.conflict.taken",
+        "This conflict is settled; change it in the result.",
+    ),
     ("tree.conflict.unsaved", "Save the result first."),
     (
         "tree.conflict.kept",
@@ -215,6 +223,8 @@ pub(super) const ZH_CN: &[(&str, &str)] = &[
     ("tree.op.rebasing", "正在变基到 {ours}，应用 {theirs}"),
     ("tree.op.picking", "正在把 {theirs} 拣选到 {ours}"),
     ("tree.op.reverting", "正在 {ours} 上撤销 {theirs}"),
+    ("tree.op.applying", "正在 {ours} 上应用补丁 {theirs}"),
+    ("tree.op.unread", "读不出 Git 正在做什么：{error}"),
     ("tree.op.next", "解决冲突并把每个文件标为已解决，然后继续。"),
     ("tree.op.continue", "继续"),
     ("tree.op.skip", "跳过…"),
@@ -232,6 +242,8 @@ pub(super) const ZH_CN: &[(&str, &str)] = &[
     ("tree.theirs.pick", "拣选的 {name}"),
     ("tree.ours.revert", "当前 {name}"),
     ("tree.theirs.revert", "撤销的 {name}"),
+    ("tree.ours.am", "当前 {name}"),
+    ("tree.theirs.am", "补丁 {name}"),
     ("tree.conflict.save", "保存"),
     ("tree.conflict.resolved", "标为已解决"),
     ("tree.conflict.use_ours", "用当前侧的文件"),
@@ -241,6 +253,7 @@ pub(super) const ZH_CN: &[(&str, &str)] = &[
         "tree.conflict.hand",
         "结果已手动改过，其余冲突请在结果里处理。",
     ),
+    ("tree.conflict.taken", "此处冲突已选定，请在结果里修改。"),
     ("tree.conflict.unsaved", "请先保存结果。"),
     ("tree.conflict.kept", "文件在磁盘上变了，未保存的结果保留。"),
     ("tree.conflict.marked.title", "把 {name} 标为已解决？"),

crates/ely-ui/src/i18n/tree_places.rs

@@ -147,6 +147,7 @@ pub(super) const EN: &[(&str, &str)] = &[
     ("tree.locked.retry", "Retry"),
     ("tree.tool.terminal", "Open in Terminal"),
     ("tree.tool.reveal", "Show in Finder"),
+    ("tree.tool.reveal_folder", "Show in Folder"),
     ("tree.tool.editor", "Choose Editor…"),
     ("tree.tool.in_editor", "Open in Editor"),
     ("tree.tool.in_mark", "Open in ElyMark"),
@@ -283,6 +284,7 @@ pub(super) const ZH_CN: &[(&str, &str)] = &[
     ("tree.locked.retry", "重试"),
     ("tree.tool.terminal", "在终端中打开"),
     ("tree.tool.reveal", "在访达中显示"),
+    ("tree.tool.reveal_folder", "在文件夹中显示"),
     ("tree.tool.editor", "选择编辑器…"),
     ("tree.tool.in_editor", "在编辑器中打开"),
     ("tree.tool.in_mark", "在 ElyMark 中打开"),