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-12-27 02:06:15 +00:00
parent c3a74485ca
commit d69ed37374
1 changed files with 4 additions and 0 deletions

View File

@ -24,6 +24,7 @@ Name[pa]=ਕਾਸਟਸ
Name[pl]=Kasts
Name[pt]=Kasts
Name[pt_BR]=Kasts
Name[ru]=Kasts
Name[sk]=Kasts
Name[sl]=Kasts
Name[sv]=Kasts
@ -54,6 +55,7 @@ Comment[pa]=ਮੋਬਾਈਲ ਪੋਡਕਾਸਟ ਐਪਲੀਕੇਸ਼ਨ
Comment[pl]=Przenośna aplikacja do podkastów
Comment[pt]=Aplicação Móvel de 'Podcasts'
Comment[pt_BR]=Aplicativo de podcast móvel
Comment[ru]=Мобильное приложение для прослушивания подкастов
Comment[sk]=Mobilná aplikácia na podcasty
Comment[sl]=Aplikacija mobilnih podcastov
Comment[sv]=Mobilt poddradioprogram
@ -84,6 +86,7 @@ GenericName[pa]=ਪੋਡਕਾਸਟ ਐਪਲੀਕੇਸ਼ਨ
GenericName[pl]=Aplikacja do podkastów
GenericName[pt]=Aplicação de 'Podcasts'
GenericName[pt_BR]=Aplicativo de podcast
GenericName[ru]=Приложение для прослушивания подкастов
GenericName[sk]=Aplikácia na podcasty
GenericName[sl]=Aplikacija podcastov
GenericName[sv]=Poddradioprogram
@ -112,6 +115,7 @@ Keywords[ko]=팟캐스트
Keywords[nl]=podcast
Keywords[pl]=podkast
Keywords[pt]=podcast
Keywords[ru]=подкаст
Keywords[sk]=podcast
Keywords[sl]=podcast
Keywords[sv]=poddsändning