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-03-11 06:00:21 +01:00
parent efb970ba11
commit 59269f63df
1 changed files with 1 additions and 0 deletions

View File

@ -56,6 +56,7 @@ Description[sk]=Práva správcu sú potrebné na správu diskov
Description[sv]=Administratörsprivilegier krävs för att hantera diskar
Description[uk]=Для керування дисками потрібні права доступу адміністратора (root)
Description[x-test]=xxAdministrative privileges are required to manage disksxx
Description[zh_CN]=管理磁盘需要管理权限
Description[zh_TW]=管理硬碟需要管理員權限
Policy=auth_admin
Persistence=session