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"

kcms/info/kcm_mobile_info.json

@@ -88,6 +88,7 @@
     "X-KDE-Keywords[ca@valencia]": "informació,distribució,sistema",
     "X-KDE-Keywords[ca]": "informació,distribució,sistema",
     "X-KDE-Keywords[cs]": "informace, distribuce, systém",
+    "X-KDE-Keywords[de]": "Information,Distribution,System",
     "X-KDE-Keywords[en_GB]": "info, distro, system",
     "X-KDE-Keywords[eo]": "informo, eldono, sistemo",
     "X-KDE-Keywords[es]": "información,distribución,sistema",

kcms/time/kcm_mobile_time.json

@@ -88,6 +88,7 @@
     "X-KDE-Keywords[ca@valencia]": "tema,aspecte,comportament",
     "X-KDE-Keywords[ca]": "tema,aspecte,comportament",
     "X-KDE-Keywords[cs]": "motiv,vzhled,chování",
+    "X-KDE-Keywords[de]": "Design,Erscheinungsbild",
     "X-KDE-Keywords[en_GB]": "theme, look, feel",
     "X-KDE-Keywords[eo]": "etoso, aspekto, sento",
     "X-KDE-Keywords[es]": "tema,aspecto",

kcms/virtualkeyboard/kcm_mobile_onscreenkeyboard.json

@@ -129,6 +129,7 @@
     "X-KDE-Keywords[ar]": "على الشاشة,لوحة المفاتيح الافتراضية,لوحة المفاتيح",
     "X-KDE-Keywords[ca@valencia]": "en pantalla,osk,teclat virtual,teclat",
     "X-KDE-Keywords[ca]": "en pantalla,osk,teclat virtual,teclat",
+    "X-KDE-Keywords[de]": "Bildschirmtastatur,Virtuelle Tastatur,Tastatur",
     "X-KDE-Keywords[en_GB]": "onscreen,osk,virtualkeyboard,keyboard",
     "X-KDE-Keywords[eo]": "surekrana,osk,virtualklavaro,klavaro",
     "X-KDE-Keywords[es]": "en pantalla,osk,teclado virtual,teclado",