From 52c29aaf101d573dca9a406d963b3ce9efd77f24 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 25 Mar 2020 06:42:28 +0100 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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util/org.kde.kpmcore.externalcommand.actions b/src/util/org.kde.kpmcore.externalcommand.actions index 245a626..66012d7 100644 --- a/src/util/org.kde.kpmcore.externalcommand.actions +++ b/src/util/org.kde.kpmcore.externalcommand.actions @@ -52,7 +52,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[sk]=Práva správcu sú potrebné na správu diskov +Description[sk]=Na správu diskov sa vyžadujú práva správcu Description[sv]=Administratörsprivilegier krävs för att hantera diskar Description[uk]=Для керування дисками потрібні права доступу адміністратора (root) Description[x-test]=xxAdministrative privileges are required to manage disksxx