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-11-23 01:35:41 +00:00
parent 7e53e98474
commit 7214753ea1

View File

@@ -1045,6 +1045,7 @@ Name[eu]=Errorea
Name[fi]=Virhe
Name[fr]=Erreur
Name[he]=שגיאה
Name[hu]=Hiba
Name[it]=Errore
Name[ka]=შეცდომა
Name[ko]=오류