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/photo/kdeconnect_photo.json

@@ -56,6 +56,7 @@
         "Name": "Photo",
         "Name[ca@valencia]": "Fotografia",
         "Name[ca]": "Fotografia",
+        "Name[de]": "Foto",
         "Name[en_GB]": "Photo",
         "Name[es]": "Fotografía",
         "Name[fi]": "Valokuva",

plugins/telephony/kdeconnect_telephony.json

@@ -43,6 +43,7 @@
         "Description": "Show notifications for incoming calls",
         "Description[ca@valencia]": "Mostra les notificacions de les trucades entrants",
         "Description[ca]": "Mostra les notificacions de les trucades entrants",
+        "Description[de]": "Benachrichtigungen über eingehende Anrufe anzeigen",
         "Description[en_GB]": "Show notifications for incoming calls",
         "Description[es]": "Mostrar notificaciones para llamadas entrantes",
         "Description[fi]": "Näytä saapuvista puheluista ilmoitus",

runners/remotecommands/plasma-runner-kdeconnect-remotecommands.desktop

@@ -3,6 +3,7 @@ Name=Run command
 Name[ca]=Executa una ordre
 Name[ca@valencia]=Executa una ordre
 Name[cs]=Spustit příkaz
+Name[de]=Befehl ausführen
 Name[en_GB]=Run command
 Name[es]=Ejecutar orden
 Name[fi]=Suorita komento