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 2024-05-14 01:16:57 +00:00
parent 329ab5e448
commit 4a6c67f315

View File

@ -15,6 +15,7 @@ Name[eu]=Kasts
Name[fi]=Kasts
Name[fr]=Kasts
Name[gl]=Kasts
Name[he]=Kasts
Name[ia]=Kasts
Name[it]=Kasts
Name[ka]=Kasts
@ -46,6 +47,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[he]=יישומון הסכתים לניידים
Comment[ia]=Application de Podcast Mobile
Comment[it]=Applicazione mobile per podcast
Comment[ka]=
@ -77,6 +79,7 @@ GenericName[eu]=Podcast aplikazioa
GenericName[fi]=Podcast-sovellus
GenericName[fr]=Application pour podcasts
GenericName[gl]=Aplicación de podcasts
GenericName[he]=יישום הסכתים
GenericName[ia]=Application de Podcast
GenericName[it]=Applicazione podcast
GenericName[ka]=
@ -108,6 +111,7 @@ Keywords[eu]=podcast
Keywords[fi]=podcast
Keywords[fr]=podcast
Keywords[gl]=podcast
Keywords[he]=הסכת;פודקאסט
Keywords[ia]=podcast
Keywords[it]=podcast
Keywords[ka]=