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
2025-10-03 01:35:21 +00:00
parent d1d50b4ea0
commit b1cbb1ec8d

View File

@@ -1038,6 +1038,7 @@ Name=Error
Name[bg]=Грешка
Name[ca]=Error
Name[ca@valencia]=S'ha produït un error
Name[cs]=Chyba
Name[es]=Error
Name[eu]=Errorea
Name[fr]=Erreur