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/contacts/kdeconnect_contacts.json

@@ -56,6 +56,7 @@
         "Description[eu]": "Sinkronizatu kontaktuak konektatutako gailutik mahaigainera",
         "Description[fi]": "Synkronoi yhteystiedot yhdistetyltä laitteelta työpöydälle",
         "Description[fr]": "Synchroniser les contacts du périphérique connecté avec ceux du bureau",
+        "Description[ia]": "Synchronisa Contactos ex le dispositivo Connectite e le Scriptorio",
         "Description[is]": "Samstilltu tengiliði af tengda tækinu yfir á tölvuna",
         "Description[it]": "Sincronizza i contatti dal dispositivo connesso al desktop",
         "Description[ko]": "연결된 장치에서 데스크톱으로 연락처 동기화",