diff --git a/.github/scripts/tests/test_command_descriptions.py b/.github/scripts/tests/test_command_descriptions.py index 569d58d8..e464d33e 100644 --- a/.github/scripts/tests/test_command_descriptions.py +++ b/.github/scripts/tests/test_command_descriptions.py @@ -123,6 +123,12 @@ class CommandDescriptionsTests(unittest.TestCase): for section, key in (("encryption", "pbsHelp"), ("keyfileActions", "pveKeyDescription")): messages["backup"][section].setdefault(key, english["backup"][section][key]) + for key in ("sshUserHelpMessage", "sshKeyHelpMessage", "sshKeySetupTitle", + "sshKeySetupHelp", "sshAuthorizedKeyHelp"): + messages["backup"]["destinations"].setdefault( + key, english["backup"]["destinations"][key]) + messages["backup"]["actions"].setdefault( + "prepareSshKey", english["backup"]["actions"]["prepareSshKey"]) path.write_text(json.dumps(messages, ensure_ascii=False)) before = {p: p.read_bytes() for p in root.glob("*/common.json")} argv = [str(SCRIPT), "--source", str(root / "en/common.json"), diff --git a/AppImage/components/host-backup.tsx b/AppImage/components/host-backup.tsx index b1f40b4a..bdb45280 100644 --- a/AppImage/components/host-backup.tsx +++ b/AppImage/components/host-backup.tsx @@ -6448,7 +6448,7 @@ function AddDestinationDialog({ setBorgSshUser(e.target.value)} className="font-mono mt-1" placeholder="borg" />

- {t("backup.destinations.sshUserHelpBefore")} borg serve. {t("backup.destinations.sshUserHelpAfter")} borg, {t("backup.destinations.not")} root. + {t("backup.destinations.sshUserHelpMessage")}

@@ -6477,14 +6477,13 @@ function AddDestinationDialog({ setBorgSshKeyPath(e.target.value)} className="font-mono mt-1" />

- {t("backup.destinations.sshKeyHelpBefore")} - {" "}{t("backup.destinations.sshKeyHelpMiddle")} {t("backup.actions.generateKey")} {t("backup.destinations.sshKeyHelpAfter")} + {t("backup.destinations.sshKeyHelpMessage", { action: t("backup.actions.prepareSshKey") })}

- {t("backup.destinations.generateNewSshKey")} + {t("backup.destinations.sshKeySetupTitle")}
{generatedKey ? ( <>

- {t("backup.destinations.appendAuthorizedKeyBefore")} ~{borgSshUser}/.ssh/authorized_keys: + {t("backup.destinations.sshAuthorizedKeyHelp", { user: borgSshUser })}