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-29 02:19:23 +00:00
parent 17c264a71c
commit 350ba6403a

View File

@ -20,6 +20,7 @@ Name[pt_BR]=Kasts
Name[sk]=Kasts Name[sk]=Kasts
Name[sl]=Kasts Name[sl]=Kasts
Name[sv]=Kasts Name[sv]=Kasts
Name[tr]=Kasts
Name[uk]=Kasts Name[uk]=Kasts
Name[x-test]=xxKastsxx Name[x-test]=xxKastsxx
Name[zh_CN]=Kasts Name[zh_CN]=Kasts
@ -41,6 +42,7 @@ Comment[pt_BR]=Aplicativo de podcast móvel
Comment[sk]=Mobilná aplikácia na podcasty Comment[sk]=Mobilná aplikácia na podcasty
Comment[sl]=Aplikacija mobilnih podcastov Comment[sl]=Aplikacija mobilnih podcastov
Comment[sv]=Mobilt poddradioprogram Comment[sv]=Mobilt poddradioprogram
Comment[tr]=Taşınabilir Podcast Uygulaması
Comment[uk]=Мобільна програма для подкастів Comment[uk]=Мобільна програма для подкастів
Comment[x-test]=xxMobile Podcast Applicationxx Comment[x-test]=xxMobile Podcast Applicationxx
Comment[zh_CN]= Comment[zh_CN]=
@ -62,6 +64,7 @@ GenericName[pt_BR]=Aplicativo de podcast
GenericName[sk]=Aplikácia na podcasty GenericName[sk]=Aplikácia na podcasty
GenericName[sl]=Aplikacija podcastov GenericName[sl]=Aplikacija podcastov
GenericName[sv]=Poddradioprogram GenericName[sv]=Poddradioprogram
GenericName[tr]=Podcast Uygulaması
GenericName[uk]=Програма для подкастів GenericName[uk]=Програма для подкастів
GenericName[x-test]=xxPodcast Applicationxx GenericName[x-test]=xxPodcast Applicationxx
GenericName[zh_CN]= GenericName[zh_CN]=
@ -74,6 +77,7 @@ Keywords[nl]=podcast
Keywords[pl]=podkast Keywords[pl]=podkast
Keywords[sl]=podcast Keywords[sl]=podcast
Keywords[sv]=poddsändning Keywords[sv]=poddsändning
Keywords[tr]=podcast
Keywords[uk]=трансляція Keywords[uk]=трансляція
Keywords[x-test]=xxpodcastxx Keywords[x-test]=xxpodcastxx
Icon=kasts Icon=kasts