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"

plugins/telephony/kdeconnect_telephony.json

@@ -45,6 +45,7 @@
         "Description[en_GB]": "Show notifications for incoming calls",
         "Description[gl]": "Mostrar notificacións de chamadas entrantes",
         "Description[nl]": "Meldingen tonen van inkomende oproepen",
+        "Description[nn]": "Vis varsling ved oppringing",
         "Description[sv]": "Visa underrättelser om inkommande samtal",
         "Description[uk]": "Показ сповіщень щодо вхідних дзвінків",
         "Description[x-test]": "xxShow notifications for incoming callsxx",