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/sms/kdeconnect_sms.json

@@ -8,11 +8,17 @@
             }
         ],
         "Description": "Send and receive SMS",
+        "Description[ca]": "Envia i rep SMS",
+        "Description[nl]": "SMS verzenden en ontvangen",
+        "Description[pt]": "Enviar e receber SMS's",
+        "Description[uk]": "Надсилання і отримання SMS",
+        "Description[x-test]": "xxSend and receive SMSxx",
         "EnabledByDefault": true,
         "Icon": "dialog-ok",
         "Id": "kdeconnect_sms",
         "License": "GPL",
         "Name": "SMS",
+        "Name[x-test]": "xxSMSxx",
         "ServiceTypes": [
             "KdeConnect/Plugin"
         ],