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-03 01:58:13 +00:00
parent d98bb3cc96
commit e5a3408f1f

View File

@ -71,6 +71,7 @@ GenericName[zh_CN]=播客应用程序
Keywords=podcast Keywords=podcast
Keywords[ca]=podcast Keywords[ca]=podcast
Keywords[ca@valencia]=podcast Keywords[ca@valencia]=podcast
Keywords[en_GB]=podcast
Keywords[es]=pódcast Keywords[es]=pódcast
Keywords[fr]=podcast Keywords[fr]=podcast
Keywords[it]=podcast Keywords[it]=podcast