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-15 01:34:15 +00:00
parent d268e4c5cf
commit b0d130b421

View File

@ -27,6 +27,7 @@ Name[pl]=Kasts
Name[pt]=Kasts Name[pt]=Kasts
Name[pt_BR]=Kasts Name[pt_BR]=Kasts
Name[ru]=Kasts Name[ru]=Kasts
Name[sa]=
Name[sk]=Kasts Name[sk]=Kasts
Name[sl]=Kasts Name[sl]=Kasts
Name[sv]=Kasts Name[sv]=Kasts
@ -60,6 +61,7 @@ Comment[pl]=Przenośna aplikacja do podkastów
Comment[pt]=Aplicação Móvel de 'Podcasts' Comment[pt]=Aplicação Móvel de 'Podcasts'
Comment[pt_BR]=Aplicativo de podcast móvel Comment[pt_BR]=Aplicativo de podcast móvel
Comment[ru]=Мобильное приложение для прослушивания подкастов Comment[ru]=Мобильное приложение для прослушивания подкастов
Comment[sa]=
Comment[sk]=Mobilná aplikácia na podcasty Comment[sk]=Mobilná aplikácia na podcasty
Comment[sl]=Program za spremljanje spletnih oddaj Comment[sl]=Program za spremljanje spletnih oddaj
Comment[sv]=Mobilt poddradioprogram Comment[sv]=Mobilt poddradioprogram
@ -93,6 +95,7 @@ GenericName[pl]=Aplikacja do podkastów
GenericName[pt]=Aplicação de 'Podcasts' GenericName[pt]=Aplicação de 'Podcasts'
GenericName[pt_BR]=Aplicativo de podcast GenericName[pt_BR]=Aplicativo de podcast
GenericName[ru]=Приложение для прослушивания подкастов GenericName[ru]=Приложение для прослушивания подкастов
GenericName[sa]=
GenericName[sk]=Aplikácia na podcasty GenericName[sk]=Aplikácia na podcasty
GenericName[sl]=Program za spletne oddaje GenericName[sl]=Program za spletne oddaje
GenericName[sv]=Poddradioprogram GenericName[sv]=Poddradioprogram
@ -125,6 +128,7 @@ Keywords[pl]=podkast
Keywords[pt]=podcast Keywords[pt]=podcast
Keywords[pt_BR]=podcast Keywords[pt_BR]=podcast
Keywords[ru]=подкаст Keywords[ru]=подкаст
Keywords[sa]=
Keywords[sk]=podcast Keywords[sk]=podcast
Keywords[sl]=podcast;podkast;spletna oddaja;oddaja;spletnaoddaja Keywords[sl]=podcast;podkast;spletna oddaja;oddaja;spletnaoddaja
Keywords[sv]=poddsändning Keywords[sv]=poddsändning