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-09-15 03:02:38 +00:00
parent 21fdaa0de1
commit d757c23058
1 changed files with 2 additions and 0 deletions

View File

@ -41,6 +41,7 @@ Comment[eu]=Mugikorreko podcast aplikazioa
Comment[fi]=Podcast-mobiilisovellus
Comment[fr]=Application mobile pour podcasts
Comment[gl]=Aplicación de podcasts para móbiles.
Comment[ia]=Application de Podcast Mobile
Comment[it]=Applicazione mobile per podcast
Comment[ka]=მობილური პოდკასტის აპლიკაცია
Comment[ko]=모바일 팟캐스트 앱
@ -68,6 +69,7 @@ GenericName[eu]=Podcast aplikazioa
GenericName[fi]=Podcast-sovellus
GenericName[fr]=Application pour podcasts
GenericName[gl]=Aplicación de podcasts
GenericName[ia]=Application de Podcast
GenericName[it]=Applicazione podcast
GenericName[ka]=პოდკასტის აპლიკაცია
GenericName[ko]=팟캐스트 앱