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 2022-10-11 01:50:37 +00:00
parent ec078d5ae7
commit 1280728f90
1 changed files with 4 additions and 0 deletions

View File

@ -11,6 +11,7 @@ Name[es]=Kasts
Name[fi]=Kasts
Name[fr]=Kasts
Name[it]=Kasts
Name[ka]=Kasts
Name[ko]=Kasts
Name[nl]=Kasts
Name[pa]=ਕਾਸਟਸ
@ -34,6 +35,7 @@ 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[ka]=მობილური პოდკასტის აპლიკაცია
Comment[ko]=모바일 팟캐스트 프로그램
Comment[nl]=Podcastprogramma voor mobiel
Comment[pa]=ਮੋਬਾਈਲ ਪੋਡਕਾਸਟ ਐਪਲੀਕੇਸ਼ਨ
@ -57,6 +59,7 @@ GenericName[es]=Aplicación de pódcast
GenericName[fi]=Podcast-sovellus
GenericName[fr]=Application pour podcasts
GenericName[it]=Applicazione podcast
GenericName[ka]=პოდკასტის აპლიკაცია
GenericName[ko]=팟캐스트 프로그램
GenericName[nl]=Podcastprogramma
GenericName[pa]=ਪੋਡਕਾਸਟ ਐਪਲੀਕੇਸ਼ਨ
@ -80,6 +83,7 @@ Keywords[es]=pódcast
Keywords[fi]=podcast
Keywords[fr]=podcast
Keywords[it]=podcast
Keywords[ka]=პოდკასტი
Keywords[ko]=팟캐스트
Keywords[nl]=podcast
Keywords[pl]=podkast