From 91ea6de3cdc902fc671fa103348d5a36494d8059 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 3 Jul 2021 01:22:57 +0000 Subject: [PATCH] SVN_SILENT made messages (.desktop file) - always resolve ours In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop" --- src/plugins/SSHManager/konsole_sshmanager.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/plugins/SSHManager/konsole_sshmanager.json b/src/plugins/SSHManager/konsole_sshmanager.json index 544eb8ac..89aa399c 100644 --- a/src/plugins/SSHManager/konsole_sshmanager.json +++ b/src/plugins/SSHManager/konsole_sshmanager.json @@ -9,10 +9,12 @@ "Name[el]": "Διαχειριστής SSH", "Name[es]": "Gestor de SSH", "Name[fr]": "Gestionnaire « SSH »", + "Name[it]": "Gestore SSH", "Name[nl]": "SSH-beheerder", "Name[pl]": "Zarządzanie SSH", "Name[pt]": "Gestor de SSH", "Name[pt_BR]": "Gerenciador de SSH", + "Name[sk]": "Správca SSH", "Name[sl]": "Upravljalnik SSH", "Name[sv]": "SSH-hanterare", "Name[uk]": "Керування SSH",