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-12-06 02:09:48 +00:00
parent ab89460d74
commit 43e1318d52
1 changed files with 1 additions and 0 deletions

View File

@ -109,6 +109,7 @@ Keywords[ko]=팟캐스트
Keywords[nl]=podcast Keywords[nl]=podcast
Keywords[pl]=podkast Keywords[pl]=podkast
Keywords[pt]=podcast Keywords[pt]=podcast
Keywords[sk]=podcast
Keywords[sl]=podcast Keywords[sl]=podcast
Keywords[sv]=poddsändning Keywords[sv]=poddsändning
Keywords[tr]=pod yayını Keywords[tr]=pod yayını