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-08-15 01:25:31 +00:00
parent 1ae4f66952
commit 4efca614f6
1 changed files with 3 additions and 0 deletions

View File

@ -8,6 +8,7 @@ Name[cs]=Kasts
Name[de]=Kasts Name[de]=Kasts
Name[en_GB]=Kasts Name[en_GB]=Kasts
Name[es]=Kasts Name[es]=Kasts
Name[fi]=Kasts
Name[fr]=Kasts Name[fr]=Kasts
Name[ko]=Kasts Name[ko]=Kasts
Name[nl]=Kasts Name[nl]=Kasts
@ -26,6 +27,7 @@ Comment[ca@valencia]=Aplicació mòbil per a podcast
Comment[de]= Podcast-Anwendung für Mobilgeräte Comment[de]= Podcast-Anwendung für Mobilgeräte
Comment[en_GB]=Mobile Podcast Application Comment[en_GB]=Mobile Podcast Application
Comment[es]=Aplicación de pódcast para móviles Comment[es]=Aplicación de pódcast para móviles
Comment[fi]=Podcast-mobiilisovellus
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
@ -44,6 +46,7 @@ GenericName[ca@valencia]=Aplicació de podcast
GenericName[de]=Podcast-Anwendung GenericName[de]=Podcast-Anwendung
GenericName[en_GB]=Podcast Application GenericName[en_GB]=Podcast Application
GenericName[es]=Aplicación de pódcast GenericName[es]=Aplicación de pódcast
GenericName[fi]=Podcast-sovellus
GenericName[fr]=Application pour podcasts GenericName[fr]=Application pour podcasts
GenericName[ko]=팟캐스트 프로그램 GenericName[ko]=팟캐스트 프로그램
GenericName[nl]=Podcastprogramma GenericName[nl]=Podcastprogramma