mirror of
https://invent.kde.org/graphics/okular
synced 2024-09-28 20:24:09 +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
98792fb2b4
commit
8c7b7d7e23
|
@ -17,6 +17,7 @@
|
||||||
"Name[ca]": "Okular",
|
"Name[ca]": "Okular",
|
||||||
"Name[cs]": "Okular",
|
"Name[cs]": "Okular",
|
||||||
"Name[de]": "Okular",
|
"Name[de]": "Okular",
|
||||||
|
"Name[en_GB]": "Okular",
|
||||||
"Name[eo]": "Okular",
|
"Name[eo]": "Okular",
|
||||||
"Name[es]": "Okular",
|
"Name[es]": "Okular",
|
||||||
"Name[eu]": "Okular",
|
"Name[eu]": "Okular",
|
||||||
|
|
Loading…
Reference in a new issue