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"

app/org.kde.kdeconnect.app.desktop

@@ -1,6 +1,7 @@
 [Desktop Entry]
 Name=KDE Connect Application
 Name[ca]=Aplicació KDE Connect
+Name[fi]=KDE Connect -sovellus
 Name[gl]=Programa de KDE Connect
 Name[nl]=KDE Connect-toepassing
 Name[pt]=Aplicação do KDE Connect
@@ -10,6 +11,7 @@ Name[uk]=Програма KDE Connect
 Name[x-test]=xxKDE Connect Applicationxx
 GenericName=Device Synchronization
 GenericName[ca]=Sincronització de dispositius
+GenericName[fi]=Laitteiden synkronointi
 GenericName[gl]=Sincronización de dispositivos
 GenericName[nl]=Synchronisatie van apparaat
 GenericName[pt]=Sincronização de Dispositivos
@@ -19,6 +21,7 @@ GenericName[uk]=Синхронізація із пристроями
 GenericName[x-test]=xxDevice Synchronizationxx
 Comment=Make all your devices one
 Comment[ca]=Fa que tots els vostres dispositius siguin un
+Comment[fi]=Yhdistä kaikki laitteesi toisiinsa
 Comment[gl]=Unifique os seus dispositivos.
 Comment[nl]=Al uw apparaten een maken
 Comment[pt]=Unifique todos os seus dispositivos

plugins/mprisremote/kdeconnect_mprisremote.json

@@ -8,11 +8,25 @@
             }
         ], 
         "Description": "Control MPRIS services", 
+        "Description[ca]": "Serveis de control del MPRIS", 
+        "Description[gl]": "Controle servizos de MPRIS.", 
+        "Description[nl]": "MPRIS-services besturen", 
+        "Description[pt]": "Controlar os serviços MPRIS", 
+        "Description[sv]": "Styr MPRIS-tjänster", 
+        "Description[uk]": "Керування службами MPRIS", 
+        "Description[x-test]": "xxControl MPRIS servicesxx", 
         "EnabledByDefault": true, 
         "Icon": "applications-multimedia", 
         "Id": "kdeconnect_mprisremote", 
         "License": "GPL", 
         "Name": "MprisRemote", 
+        "Name[ca]": "MprisRemote", 
+        "Name[gl]": "MprisRemote", 
+        "Name[nl]": "MprisRemote", 
+        "Name[pt]": "Comando MPRIS", 
+        "Name[sv]": "MPRIS-fjärrkontroll", 
+        "Name[uk]": "MprisRemote", 
+        "Name[x-test]": "xxMprisRemotexx", 
         "ServiceTypes": [
             "KdeConnect/Plugin"
         ],