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-06-19 03:29:59 +00:00
parent 1781230ad8
commit c6eb9d7a2b
1 changed files with 4 additions and 0 deletions

View File

@ -10,6 +10,7 @@ Name[en_GB]=Kasts
Name[es]=Kasts Name[es]=Kasts
Name[fi]=Kasts Name[fi]=Kasts
Name[fr]=Kasts Name[fr]=Kasts
Name[gl]=Kasts
Name[it]=Kasts Name[it]=Kasts
Name[ka]=Kasts Name[ka]=Kasts
Name[ko]=Kasts Name[ko]=Kasts
@ -35,6 +36,7 @@ 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[fi]=Podcast-mobiilisovellus
Comment[fr]=Application mobile pour podcasts Comment[fr]=Application mobile pour podcasts
Comment[gl]=Aplicación de podcasts para móbiles.
Comment[it]=Applicazione mobile per podcast Comment[it]=Applicazione mobile per podcast
Comment[ka]=მობილური პოდკასტის აპლიკაცია Comment[ka]=მობილური პოდკასტის აპლიკაცია
Comment[ko]=모바일 팟캐스트 프로그램 Comment[ko]=모바일 팟캐스트 프로그램
@ -60,6 +62,7 @@ GenericName[en_GB]=Podcast Application
GenericName[es]=Aplicación de pódcast GenericName[es]=Aplicación de pódcast
GenericName[fi]=Podcast-sovellus GenericName[fi]=Podcast-sovellus
GenericName[fr]=Application pour podcasts GenericName[fr]=Application pour podcasts
GenericName[gl]=Aplicación de podcasts
GenericName[it]=Applicazione podcast GenericName[it]=Applicazione podcast
GenericName[ka]=პოდკასტის აპლიკაცია GenericName[ka]=პოდკასტის აპლიკაცია
GenericName[ko]=팟캐스트 프로그램 GenericName[ko]=팟캐스트 프로그램
@ -85,6 +88,7 @@ Keywords[en_GB]=podcast
Keywords[es]=pódcast Keywords[es]=pódcast
Keywords[fi]=podcast Keywords[fi]=podcast
Keywords[fr]=podcast Keywords[fr]=podcast
Keywords[gl]=podcast
Keywords[it]=podcast Keywords[it]=podcast
Keywords[ka]=პოდკასტი Keywords[ka]=პოდკასტი
Keywords[ko]=팟캐스트 Keywords[ko]=팟캐스트