mirror of
https://invent.kde.org/graphics/okular
synced 2024-08-27 03:30:20 +00:00
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:
parent
5da85a88f1
commit
55c1cd433e
|
@ -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",
|
||||
|
|
Loading…
Reference in a new issue