From 53d84f3d34fac988cd40a97f08836fcc6532ebbd Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 14 Nov 2018 06:03:26 +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 | 1 + 1 file changed, 1 insertion(+) diff --git a/src/util/org.kde.kpmcore.externalcommand.actions b/src/util/org.kde.kpmcore.externalcommand.actions index 7590e14..bba0030 100644 --- a/src/util/org.kde.kpmcore.externalcommand.actions +++ b/src/util/org.kde.kpmcore.externalcommand.actions @@ -36,6 +36,7 @@ Description[lt]=Diskų tvarkymui reikalingos administratoriaus teisės 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[sv]=Administratörsprivilegier krävs för att hantera diskar Description[uk]=Для керування дисками потрібні права доступу адміністратора (root) Description[x-test]=xxAdministrative privileges are required to manage disksxx