From 036e4e873a9edc58a576175c35315dd2e672ed3c Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Mon, 5 Jul 2021 01:20:17 +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 89aa399c..3903b849 100644
--- a/src/plugins/SSHManager/konsole_sshmanager.json
+++ b/src/plugins/SSHManager/konsole_sshmanager.json
@@ -7,7 +7,9 @@
         "Name[cs]": "Správce SSH",
         "Name[de]": "SSH-Verwaltung",
         "Name[el]": "Διαχειριστής SSH",
+        "Name[en_GB]": "SSH Manager",
         "Name[es]": "Gestor de SSH",
+        "Name[fi]": "SSH-hallinta",
         "Name[fr]": "Gestionnaire « SSH »",
         "Name[it]": "Gestore SSH",
         "Name[nl]": "SSH-beheerder",