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

@@ -82,7 +82,7 @@
         "Name[hu]": "Telefonintegráció",
         "Name[id]": "Telephony integration",
         "Name[it]": "Integrazione telefonica",
-        "Name[ja]": "Telephony 統合",
+        "Name[ja]": "電話の統合",
         "Name[ko]": "전화 통합",
         "Name[nl]": "Telefoonintegratie",
         "Name[nn]": "Telefonintegrering",