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

@@ -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",