From 9515090157107340c893acbd4db1e8e8fa256ea1 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 1 Aug 2018 05:50:40 +0200 Subject: [PATCH] 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" --- src/util/org.kde.kpmcore.externalcommand.actions | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/util/org.kde.kpmcore.externalcommand.actions b/src/util/org.kde.kpmcore.externalcommand.actions index e8a5850..f13baf6 100644 --- a/src/util/org.kde.kpmcore.externalcommand.actions +++ b/src/util/org.kde.kpmcore.externalcommand.actions @@ -15,5 +15,10 @@ Name[sv]=Starta extern kommandodemon Name[uk]=Запуск фонової служби зовнішньої команди Name[x-test]=xxStart external command daemonxx Description=Administrative privileges are required to manage disks +Description[lt]=Diskų tvarkymui reikalingos administratoriaus teisės +Description[nl]=Er zijn administratieve rechten vereist om schijven te beheren +Description[pt]=São necessários privilégios de administrador para gerir os discos +Description[uk]=Для керування дисками потрібні права доступу адміністратора (root) +Description[x-test]=xxAdministrative privileges are required to manage disksxx Policy=auth_admin Persistence=session