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

@@ -36,6 +36,7 @@ GenericName[x-test]=xxDevice Synchronizationxx
 Comment=Make all your devices one
 Comment[ca]=Fa que tots els vostres dispositius siguin un
 Comment[cs]=Sjednoťte svá zařízení
+Comment[de]=Gleichen Sie alle Ihre Geräte ab
 Comment[es]=Convertir todos sus dispositivos en uno
 Comment[fi]=Yhdistä kaikki laitteesi toisiinsa
 Comment[gl]=Unifique os seus dispositivos.

kdeconnect-non-plasma.desktop

@@ -30,6 +30,7 @@ Comment=Reach out to your devices
 Comment[bg]=Достигане до устройствата ви
 Comment[ca]=Connecteu amb els vostres dispositius
 Comment[cs]=Dosáhněte na svá zařízení
+Comment[de]=Zugriff auf Ihre Geräte
 Comment[en_GB]=Reach out to your devices
 Comment[es]=Contactar con sus dispositivos
 Comment[fi]=Tavoitettavuutta laitteillesi

plugins/mprisremote/kdeconnect_mprisremote.json

@@ -10,6 +10,7 @@
         "Description": "Control MPRIS services", 
         "Description[ca]": "Serveis de control del MPRIS", 
         "Description[cs]": "Ovládejte služby MPRIS", 
+        "Description[de]": "Steuerung von MPRIS-Diensten", 
         "Description[es]": "Controlar los servicios MPRIS", 
         "Description[fi]": "Ohjaa MPRIS-palveluita", 
         "Description[gl]": "Controle servizos de MPRIS.", 
@@ -30,6 +31,7 @@
         "Name": "MprisRemote", 
         "Name[ca]": "MprisRemote", 
         "Name[cs]": "MprisRemote", 
+        "Name[de]": "MprisRemote", 
         "Name[es]": "MprisRemote", 
         "Name[fi]": "MPRIS-kaukosäädin", 
         "Name[gl]": "MprisRemote",