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"

fileitemactionplugin/kdeconnectsendfile.json

@@ -7,6 +7,7 @@
         "Description[ca]": "Envia fitxers a un altre dispositiu mitjançant el KDE Connect",
         "Description[cs]": "Poslat soubor na jiné zařízení přes KDE Connect",
         "Description[da]": "Send fil til en anden enhed med brug af KDE Connect",
+        "Description[de]": "Datei zu anderem Gerät mit KDE Connect versenden",
         "Description[en_GB]": "Send file to other device using KDE Connect",
         "Description[es]": "Enviar archivo a otro dispositivo usando KDE Connect",
         "Description[et]": "Faili saatmine teise seadmesse KDE Connecti kaudu",

plugins/bigscreen/kdeconnect_bigscreen.json

@@ -38,6 +38,7 @@
         "Description[ca]": "Connector de la Bigscreen",
         "Description[cs]": "Modul pro velkou obrazovku",
         "Description[da]": "Plugin til storskærm",
+        "Description[de]": "Bigscreen-Modul",
         "Description[en_GB]": "Bigscreen Plugin",
         "Description[es]": "Complemento Bigscreen",
         "Description[et]": "Suurekraani plugin",
@@ -69,6 +70,7 @@
         "Name[ca]": "Bigscreen",
         "Name[cs]": "Velká obrazovka",
         "Name[da]": "Storskærm",
+        "Name[de]": "Bigscreen",
         "Name[en_GB]": "Bigscreen",
         "Name[es]": "Bigscreen",
         "Name[et]": "Suurekraan",