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"

effects/logout/package/metadata.desktop

@@ -3,6 +3,7 @@ Name=Logout
 Name[ca]=Sortida
 Name[ca@valencia]=Eixida
 Name[cs]=Odhlášení
+Name[de]=Abmeldung
 Name[en_GB]=Logout
 Name[es]=Cerrar la sesión
 Name[eu]=Saio-ixtea

effects/scale/scale_config.desktop

@@ -9,6 +9,7 @@ Name=Scale
 Name[ca]=Escala
 Name[ca@valencia]=Escala
 Name[cs]=Měřítko
+Name[de]=Skalieren
 Name[en_GB]=Scale
 Name[es]=Escalar
 Name[eu]=Eskalatu