From 9faece8d28595cc0b76aa66fc1c80435035799fb Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 28 Jul 2018 05:33:45 +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 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/util/org.kde.kpmcore.externalcommand.actions b/src/util/org.kde.kpmcore.externalcommand.actions index dd4937c..e3c06ce 100644 --- a/src/util/org.kde.kpmcore.externalcommand.actions +++ b/src/util/org.kde.kpmcore.externalcommand.actions @@ -4,14 +4,18 @@ Icon=partitionmanager [org.kde.kpmcore.externalcommand.init] Name=Start external command daemon Name[ca]=Inicia el dimoni d'ordres externes +Name[cs]=Spustit démona externích příkazů Name[nl]=Start externe opdrachtdaemon Name[pt]=Iniciar o servidor de comandos externos +Name[sk]=Spustiť externé démony príkazov Name[uk]=Запуск фонової служби зовнішньої команди Name[x-test]=xxStart external command daemonxx Description=Root privileges are needed to manage disks Description[ca]=Es requereixen privilegis d'administrador per gestionar discs +Description[cs]=Pro správu disků jsou potřeba práva uživatele Description[nl]=Er zijn root-privileges vereist om schijven te beheren Description[pt]=São necessários privilégios de 'root' (administrador) para gerir os discos +Description[sk]=Správa správcu sú potrebné na správu diskov Description[uk]=Для керування дисками потрібні права доступу адміністратора (root) Description[x-test]=xxRoot privileges are needed to manage disksxx Policy=auth_admin