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-12-10 01:44:51 +00:00
parent 6310491216
commit b3dac269b7

View File

@ -10,6 +10,7 @@ Name[en_GB]=Kasts
Name[es]=Kasts
Name[fi]=Kasts
Name[fr]=Kasts
Name[it]=Kasts
Name[ko]=Kasts
Name[nl]=Kasts
Name[pa]=
@ -30,6 +31,7 @@ Comment[en_GB]=Mobile Podcast Application
Comment[es]=Aplicación de pódcast para móviles
Comment[fi]=Podcast-mobiilisovellus
Comment[fr]=Application mobile pour podcasts
Comment[it]=Applicazione mobile per podcast
Comment[ko]=
Comment[nl]=Podcastprogramma voor mobiel
Comment[pa]=
@ -50,6 +52,7 @@ GenericName[en_GB]=Podcast Application
GenericName[es]=Aplicación de pódcast
GenericName[fi]=Podcast-sovellus
GenericName[fr]=Application pour podcasts
GenericName[it]=Applicazione podcast
GenericName[ko]=
GenericName[nl]=Podcastprogramma
GenericName[pa]=