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 2022-08-07 02:53:38 +00:00
parent 89194336b7
commit 0330558977

View File

@ -95,7 +95,7 @@
"Description[ar]": "خلفية DjVu بالمعتمدة على DjVuLibre",
"Description[az]": "DjVuLibre'yə əsaslanan DjVu modulu",
"Description[bg]": "Бекенд на DjVu, базиран на DjVuLibre",
"Description[ca@valencia]": "Dorsal DjVu basat en el DjVuLibre",
"Description[ca@valencia]": "Dorsal DjVu basat en DjVuLibre",
"Description[ca]": "Dorsal DjVu basat en el DjVuLibre",
"Description[cs]": "Implementace DjVu založena na DjVuLibre",
"Description[da]": "DjVu-backend baseret på DjVuLibre",