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 2021-05-11 01:18:58 +00:00
parent b183925ad3
commit f794ebd899
1 changed files with 3 additions and 0 deletions

View File

@ -7,6 +7,7 @@ Name[es]=Kasts
Name[nl]=Kasts
Name[pl]=Kasts
Name[pt]=Kasts
Name[sl]=Kasts
Name[sv]=Kasts
Name[uk]=Kasts
Name[x-test]=xxKastsxx
@ -18,6 +19,7 @@ Comment[es]=Aplicación de pódcast para móviles
Comment[nl]=Podcastprogramma voor mobiel
Comment[pl]=Przenośna aplikacja do podkastów
Comment[pt]=Aplicação Móvel de 'Podcasts'
Comment[sl]=Aplikacija mobilnih podcastov
Comment[sv]=Mobilt poddradioprogram
Comment[uk]=Мобільна програма для подкастів
Comment[x-test]=xxMobile Podcast Applicationxx
@ -29,6 +31,7 @@ GenericName[es]=Aplicación de pódcast
GenericName[nl]=Podcastprogramma
GenericName[pl]=Aplikacja do podkastów
GenericName[pt]=Aplicação de 'Podcasts'
GenericName[sl]=Aplikacija podcastov
GenericName[sv]=Poddradioprogram
GenericName[uk]=Програма для подкастів
GenericName[x-test]=xxPodcast Applicationxx