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-07-05 01:18:52 +00:00
parent ad9c6b7417
commit 6a4c6011d1
1 changed files with 3 additions and 0 deletions

View File

@ -6,6 +6,7 @@ Name[ca]=Kasts
Name[ca@valencia]=Kasts
Name[cs]=Kasts
Name[de]=Kasts
Name[en_GB]=Kasts
Name[es]=Kasts
Name[fr]=Kasts
Name[ko]=Kasts
@ -23,6 +24,7 @@ Comment=Mobile Podcast Application
Comment[ca]=Aplicació mòbil per a podcast
Comment[ca@valencia]=Aplicació mòbil per a podcast
Comment[de]= Podcast-Anwendung für Mobilgeräte
Comment[en_GB]=Mobile Podcast Application
Comment[es]=Aplicación de pódcast para móviles
Comment[fr]=Application mobile pour podcasts
Comment[ko]=모바일 팟캐스트 프로그램
@ -40,6 +42,7 @@ GenericName=Podcast Application
GenericName[ca]=Aplicació de podcast
GenericName[ca@valencia]=Aplicació de podcast
GenericName[de]=Podcast-Anwendung
GenericName[en_GB]=Podcast Application
GenericName[es]=Aplicación de pódcast
GenericName[fr]=Application pour podcasts
GenericName[ko]=팟캐스트 프로그램