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 2024-05-22 01:18:54 +00:00
parent 98792fb2b4
commit 8c7b7d7e23

View file

@ -17,6 +17,7 @@
"Name[ca]": "Okular",
"Name[cs]": "Okular",
"Name[de]": "Okular",
"Name[en_GB]": "Okular",
"Name[eo]": "Okular",
"Name[es]": "Okular",
"Name[eu]": "Okular",