mirror of
https://invent.kde.org/graphics/okular
synced 2024-08-27 19:50:27 +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
531e2b56a1
commit
d624d72d22
|
@ -121,7 +121,7 @@
|
|||
"Name[et]": "Markdowni taustaprogramm",
|
||||
"Name[eu]": "Markdown-en bizkarraldekoa",
|
||||
"Name[fi]": "Markdown-taustaosa",
|
||||
"Name[fr]": "Moteur de markdown",
|
||||
"Name[fr]": "Moteur de Markdown",
|
||||
"Name[gl]": "Motor de Markdown",
|
||||
"Name[hu]": "Markdown modul",
|
||||
"Name[ia]": "Retro-Administration Markdown",
|
||||
|
|
Loading…
Reference in a new issue