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-05-20 03:10:40 +00:00
parent c4008db796
commit 6a09044d2f
1 changed files with 4 additions and 0 deletions

View File

@ -18,6 +18,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
@ -42,6 +43,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
@ -66,6 +68,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
@ -88,6 +91,7 @@ Keywords[ko]=팟캐스트
Keywords[nl]=podcast
Keywords[pl]=podkast
Keywords[pt]=podcast
Keywords[ru]=podcast;подкаст
Keywords[sl]=podcast
Keywords[sv]=poddsändning
Keywords[tr]=podcast