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-11-19 01:24:36 +00:00
parent 58a7ff4a57
commit 464577491f
1 changed files with 1 additions and 0 deletions

View File

@ -123,6 +123,7 @@ Keywords[ko]=팟캐스트
Keywords[nl]=podcast Keywords[nl]=podcast
Keywords[pl]=podkast Keywords[pl]=podkast
Keywords[pt]=podcast Keywords[pt]=podcast
Keywords[pt_BR]=podcast
Keywords[ru]=подкаст Keywords[ru]=подкаст
Keywords[sk]=podcast Keywords[sk]=podcast
Keywords[sl]=podcast;podkast;spletna oddaja;oddaja;spletnaoddaja Keywords[sl]=podcast;podkast;spletna oddaja;oddaja;spletnaoddaja