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-02-27 01:54:50 +00:00
parent 6759ab9aba
commit 73f2c46638
1 changed files with 1 additions and 1 deletions

View File

@ -43,7 +43,7 @@ Comment[sl]=Aplikacija mobilnih podcastov
Comment[sv]=Mobilt poddradioprogram
Comment[uk]=Мобільна програма для подкастів
Comment[x-test]=xxMobile Podcast Applicationxx
Comment[zh_CN]=移动播客应用程序
Comment[zh_CN]=移动设备播客应用程序
GenericName=Podcast Application
GenericName[ca]=Aplicació de podcast
GenericName[ca@valencia]=Aplicació de podcast