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-08-04 01:37:33 +00:00
parent d3e84bd564
commit 7b87847cff
1 changed files with 4 additions and 0 deletions

View File

@ -9,6 +9,7 @@ Name[de]=Kasts
Name[en_GB]=Kasts
Name[eo]=Kasts
Name[es]=Kasts
Name[eu]=Kasts
Name[fi]=Kasts
Name[fr]=Kasts
Name[gl]=Kasts
@ -36,6 +37,7 @@ Comment[de]=Podcast-Anwendung für Mobilgeräte
Comment[en_GB]=Mobile Podcast Application
Comment[eo]=Poŝtelefona Podkast-Aplikaĵo
Comment[es]=Aplicación de pódcast para móviles
Comment[eu]=Mugikorreko podcast aplikazioa
Comment[fi]=Podcast-mobiilisovellus
Comment[fr]=Application mobile pour podcasts
Comment[gl]=Aplicación de podcasts para móbiles.
@ -62,6 +64,7 @@ GenericName[de]=Podcast-Anwendung
GenericName[en_GB]=Podcast Application
GenericName[eo]=Podkast-Aplikaĵo
GenericName[es]=Aplicación de pódcast
GenericName[eu]=Podcast aplikazioa
GenericName[fi]=Podcast-sovellus
GenericName[fr]=Application pour podcasts
GenericName[gl]=Aplicación de podcasts
@ -88,6 +91,7 @@ Keywords[de]=Podcast
Keywords[en_GB]=podcast
Keywords[eo]=podkasto
Keywords[es]=pódcast
Keywords[eu]=podcast
Keywords[fi]=podcast
Keywords[fr]=podcast
Keywords[gl]=podcast