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-12-16 01:36:44 +00:00
parent d3a6417938
commit 26a5095792

View File

@ -17,6 +17,7 @@ Name[fi]=Kasts
Name[fr]=Kasts Name[fr]=Kasts
Name[gl]=Kasts Name[gl]=Kasts
Name[he]=Kasts Name[he]=Kasts
Name[hi]=ि
Name[ia]=Kasts Name[ia]=Kasts
Name[it]=Kasts Name[it]=Kasts
Name[ka]=Kasts Name[ka]=Kasts
@ -51,6 +52,7 @@ 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[gl]=Aplicación de podcasts para móbiles.
Comment[he]=יישומון הסכתים לניידים Comment[he]=יישומון הסכתים לניידים
Comment[hi]=
Comment[ia]=Application de Podcast Mobile Comment[ia]=Application de Podcast Mobile
Comment[it]=Applicazione mobile per podcast Comment[it]=Applicazione mobile per podcast
Comment[ka]= Comment[ka]=
@ -85,6 +87,7 @@ GenericName[fi]=Podcast-sovellus
GenericName[fr]=Application pour podcasts GenericName[fr]=Application pour podcasts
GenericName[gl]=Aplicación de podcasts GenericName[gl]=Aplicación de podcasts
GenericName[he]=יישום הסכתים GenericName[he]=יישום הסכתים
GenericName[hi]=
GenericName[ia]=Application de Podcast GenericName[ia]=Application de Podcast
GenericName[it]=Applicazione podcast GenericName[it]=Applicazione podcast
GenericName[ka]= GenericName[ka]=
@ -119,6 +122,7 @@ Keywords[fi]=podcast
Keywords[fr]=podcast Keywords[fr]=podcast
Keywords[gl]=podcast Keywords[gl]=podcast
Keywords[he]=הסכת;פודקאסט Keywords[he]=הסכת;פודקאסט
Keywords[hi]=
Keywords[ia]=podcast Keywords[ia]=podcast
Keywords[it]=podcast Keywords[it]=podcast
Keywords[ka]= Keywords[ka]=