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/sessionquit/package/metadata.desktop

@@ -3,6 +3,7 @@ Name=Session Quit
 Name[ca]=Sortida de la sessió
 Name[cs]=Sezení bylo ukončeno
 Name[da]=Afslutning af session
+Name[de]=Sitzung beenden
 Name[en_GB]=Session Quit
 Name[es]=Cierre de sesión
 Name[et]=Seansist väljumine