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"

wallpapers/image/imagepackage/setaswallpaper.desktop.in

@@ -11,6 +11,7 @@ Name[ar]=عين كخلفية
 Name[az]=Divar Kağızı təyin edin
 Name[ca]=Estableix com a fons de pantalla
 Name[ca@valencia]=Estableix com a fons de pantalla
+Name[cs]=Nastavit jako tapetu
 Name[de]=Als Hintergrundbild festlegen
 Name[en_GB]=Set as Wallpaper
 Name[es]=Definir como fondo del escritorio