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-06-22 01:20:30 +00:00
parent c7a510335a
commit 159688035a

View File

@ -10,6 +10,7 @@ Name[es]=Kasts
Name[fr]=Kasts Name[fr]=Kasts
Name[ko]=Kasts Name[ko]=Kasts
Name[nl]=Kasts Name[nl]=Kasts
Name[pa]=
Name[pl]=Kasts Name[pl]=Kasts
Name[pt]=Kasts Name[pt]=Kasts
Name[pt_BR]=Kasts Name[pt_BR]=Kasts
@ -26,6 +27,7 @@ Comment[es]=Aplicación de pódcast para móviles
Comment[fr]=Application mobile pour podcasts Comment[fr]=Application mobile pour podcasts
Comment[ko]= Comment[ko]=
Comment[nl]=Podcastprogramma voor mobiel Comment[nl]=Podcastprogramma voor mobiel
Comment[pa]=
Comment[pl]=Przenośna aplikacja do podkastów Comment[pl]=Przenośna aplikacja do podkastów
Comment[pt]=Aplicação Móvel de 'Podcasts' Comment[pt]=Aplicação Móvel de 'Podcasts'
Comment[pt_BR]=Aplicativo de podcast móvel Comment[pt_BR]=Aplicativo de podcast móvel
@ -42,6 +44,7 @@ GenericName[es]=Aplicación de pódcast
GenericName[fr]=Application pour podcasts GenericName[fr]=Application pour podcasts
GenericName[ko]= GenericName[ko]=
GenericName[nl]=Podcastprogramma GenericName[nl]=Podcastprogramma
GenericName[pa]=
GenericName[pl]=Aplikacja do podkastów GenericName[pl]=Aplikacja do podkastów
GenericName[pt]=Aplicação de 'Podcasts' GenericName[pt]=Aplicação de 'Podcasts'
GenericName[pt_BR]=Aplicativo de podcast GenericName[pt_BR]=Aplicativo de podcast