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-03-21 01:45:32 +00:00
parent 42db61d50d
commit 09395b5bc5
1 changed files with 2 additions and 0 deletions

View File

@ -71,6 +71,8 @@ Keywords[ca@valencia]=podcast
Keywords[es]=pódcast
Keywords[fr]=podcast
Keywords[nl]=podcast
Keywords[pl]=podkast
Keywords[sl]=podcast
Keywords[sv]=poddsändning
Keywords[uk]=трансляція
Keywords[x-test]=xxpodcastxx