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 10:47:27 +00:00
parent 4f6be2e323
commit 069d2b852d
1 changed files with 2 additions and 2 deletions

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