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 2022-04-16 01:48:35 +00:00
parent 6416733153
commit a94d566295
1 changed files with 1 additions and 0 deletions

View File

@ -79,6 +79,7 @@ Keywords[en_GB]=podcast
Keywords[es]=pódcast Keywords[es]=pódcast
Keywords[fr]=podcast Keywords[fr]=podcast
Keywords[it]=podcast Keywords[it]=podcast
Keywords[ko]=팟캐스트
Keywords[nl]=podcast Keywords[nl]=podcast
Keywords[pl]=podkast Keywords[pl]=podkast
Keywords[sl]=podcast Keywords[sl]=podcast