From 5103d1fcc0e7ee11482e484a56b26daa5cd009ff Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 2 Aug 2018 05:28:03 +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 | 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 f13baf6..0731c3b 100644 --- a/src/util/org.kde.kpmcore.externalcommand.actions +++ b/src/util/org.kde.kpmcore.externalcommand.actions @@ -15,6 +15,7 @@ Name[sv]=Starta extern kommandodemon Name[uk]=Запуск фонової служби зовнішньої команди Name[x-test]=xxStart external command daemonxx Description=Administrative privileges are required to manage disks +Description[ca]=Es requereixen privilegis d'administrador per gestionar discs 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