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 2023-11-06 02:10:21 +00:00
parent d98944a93f
commit 8fdbcd7fbf

View File

@ -3,6 +3,7 @@
[Desktop Entry]
Name=Kasts
Name[ar]=كاستس
Name[ast]=Kasts
Name[ca]=Kasts
Name[ca@valencia]=Kasts
Name[cs]=Kasts