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"

kcmkwin/kwincompositing/kwineffect.knsrc

@@ -2,6 +2,7 @@
 Name=Window Manager Effects
 Name[ca]=Efectes del gestor de finestres
 Name[ca@valencia]=Efectes del gestor de finestres
+Name[de]=Fensterverwaltungs-Effekte
 Name[en_GB]=Window Manager Effects
 Name[es]=Efectos del gestor de ventanas
 Name[ia]=Gerente de effectos de fenestra

kcmkwin/kwinscripts/kwinscripts.knsrc

@@ -2,6 +2,7 @@
 Name=Window Manager Scripts
 Name[ca]=Scripts del gestor de finestres
 Name[ca@valencia]=Scripts del gestor de finestres
+Name[de]=Fensterverwaltungs-Skripte
 Name[en_GB]=Window Manager Scripts
 Name[es]=Guiones del gestor de ventanas
 Name[ia]=Gerente de scripts de fenestra 

plugins/kdecorations/aurorae/src/aurorae.knsrc

@@ -2,6 +2,7 @@
 Name=Aurorae Window Decorations
 Name[ca]=Decoracions de finestra Aurorae
 Name[ca@valencia]=Decoracions de finestra Aurorae
+Name[de]=Aurorae-Fensterdekoration
 Name[en_GB]=Aurorae Window Decorations
 Name[es]=Decoración de ventanas Aurorae
 Name[ia]=Decorationes de fenestra Aurorae