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"
This commit is contained in:
l10n daemon script 2018-08-01 05:52:53 +02:00
parent 345c211674
commit f670a18bd9

View file

@ -34,7 +34,7 @@
"Description[es]": "Un visor de archivos PostScript basado en la biblioteca Spectre",
"Description[et]": "PostScript-faili renderdaja Spectre teegi alusel",
"Description[fi]": "Spectre-kirjastoon pohjautuva PostScript-tiedostohahmonnin",
"Description[fr]": "Système de rendu pour les fichiers « PostScript » utilisant la librairie Spectre",
"Description[fr]": "Système de rendu pour les fichiers « PostScript » utilisant la bibliothèque Spectre",
"Description[gl]": "Un renderizador de ficheiros PostScript baseado na biblioteca Spectre.",
"Description[ia]": "Un renditor de file Postscript basate sur bibliotheca Spectre",
"Description[it]": "Un visualizzatore di file PostScript basato sulla libreria Spectre",