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-17 01:36:50 +00:00
parent 19936053a5
commit bd2586f33a
1 changed files with 3 additions and 0 deletions

View File

@ -9,6 +9,7 @@ Name[fr]=Kasts
Name[nl]=Kasts
Name[pl]=Kasts
Name[pt]=Kasts
Name[sk]=Kasts
Name[sl]=Kasts
Name[sv]=Kasts
Name[uk]=Kasts
@ -22,6 +23,7 @@ Comment[fr]=Application mobile pour podcasts
Comment[nl]=Podcastprogramma voor mobiel
Comment[pl]=Przenośna aplikacja do podkastów
Comment[pt]=Aplicação Móvel de 'Podcasts'
Comment[sk]=Mobilná aplikácia na podcasty
Comment[sl]=Aplikacija mobilnih podcastov
Comment[sv]=Mobilt poddradioprogram
Comment[uk]=Мобільна програма для подкастів
@ -35,6 +37,7 @@ GenericName[fr]=Application pour podcasts
GenericName[nl]=Podcastprogramma
GenericName[pl]=Aplikacja do podkastów
GenericName[pt]=Aplicação de 'Podcasts'
GenericName[sk]=Aplikácia na podcasty
GenericName[sl]=Aplikacija podcastov
GenericName[sv]=Poddradioprogram
GenericName[uk]=Програма для подкастів