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

@@ -16,6 +16,7 @@
         "Name[it]": "Gestore SSH",
         "Name[ko]": "SSH 관리자",
         "Name[nl]": "SSH-beheerder",
+        "Name[nn]": "SSH-handsamar",
         "Name[pl]": "Zarządzanie SSH",
         "Name[pt]": "Gestor de SSH",
         "Name[pt_BR]": "Gerenciador de SSH",