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-20 02:13:08 +00:00
parent 5dd19faed9
commit 42db61d50d

View File

@ -66,6 +66,14 @@ GenericName[uk]=Програма для подкастів
GenericName[x-test]=xxPodcast Applicationxx GenericName[x-test]=xxPodcast Applicationxx
GenericName[zh_CN]= GenericName[zh_CN]=
Keywords=podcast Keywords=podcast
Keywords[ca]=podcast
Keywords[ca@valencia]=podcast
Keywords[es]=pódcast
Keywords[fr]=podcast
Keywords[nl]=podcast
Keywords[sv]=poddsändning
Keywords[uk]=трансляція
Keywords[x-test]=xxpodcastxx
Icon=kasts Icon=kasts
Exec=kasts Exec=kasts
Type=Application Type=Application