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 2023-07-24 08:30:48 +00:00
parent c6441e0c96
commit 58aeeeb172

View File

@ -41,7 +41,7 @@ Comment[fr]=Application mobile pour podcasts
Comment[gl]=Aplicación de podcasts para móbiles.
Comment[it]=Applicazione mobile per podcast
Comment[ka]=
Comment[ko]=
Comment[ko]=
Comment[nl]=Podcastprogramma voor mobiel
Comment[pa]=
Comment[pl]=Przenośna aplikacja do podkastów
@ -67,7 +67,7 @@ GenericName[fr]=Application pour podcasts
GenericName[gl]=Aplicación de podcasts
GenericName[it]=Applicazione podcast
GenericName[ka]=
GenericName[ko]=
GenericName[ko]=
GenericName[nl]=Podcastprogramma
GenericName[pa]=
GenericName[pl]=Aplikacja do podkastów