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 2020-05-09 06:34:55 +02:00
parent 1d9b1161d4
commit 3c6ee043f6
1 changed files with 1 additions and 0 deletions

View File

@ -53,6 +53,7 @@ Description[nl]=Er zijn administratieve rechten vereist om schijven te beheren
Description[pl]=Do zarządzania dyskami wymagane są uprawnienia administratora
Description[pt]=São necessários privilégios de administrador para gerir os discos
Description[pt_BR]=São necessários privilégios administrativos para gerenciar discos
Description[ru]=Для управления дисками требуются права администратора
Description[sk]=Na správu diskov sa vyžadujú práva správcu
Description[sl]=Za upravljanje diskov so potrebne pravice upravljavca računalnika
Description[sv]=Administratörsprivilegier krävs för att hantera diskar