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-01 02:02:34 +00:00
parent 35cb9a2536
commit 893c647c94
1 changed files with 1 additions and 0 deletions

View File

@ -73,6 +73,7 @@ Keywords[ca]=podcast
Keywords[ca@valencia]=podcast
Keywords[es]=pódcast
Keywords[fr]=podcast
Keywords[it]=podcast
Keywords[nl]=podcast
Keywords[pl]=podkast
Keywords[sl]=podcast