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"

thumbnail/opendocumentthumbnail.desktop

@@ -3,6 +3,7 @@ Type=Service
 Name=Office Documents (Open Document Files)
 Name[ca]=Documents Office (Fitxers Open Document)
 Name[ca@valencia]=Documents Office (Fitxers Open Document)
+Name[cs]=Kancelářské dokumenty (soubory Open Document)
 Name[de]=Office-Dokumente  (Open Document Dateien)
 Name[es]=Documentos de oficina (archivos de Open Document)
 Name[fr]=Documents Office (fichiers Open Document)