From b0663ba1b5cb40d0728f8680ab6b9b938158085c Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 7 Aug 2018 05:44:32 +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 72edd96..7a72a9a 100644 --- a/src/util/org.kde.kpmcore.externalcommand.actions +++ b/src/util/org.kde.kpmcore.externalcommand.actions @@ -18,6 +18,7 @@ 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[ca@valencia]=Es requereixen privilegis d'administrador per gestionar discs +Description[es]=Se necesitan permisos de administrador para gestionar discos Description[fi]=Levyjen hallinta vaatii pääkäyttäjäoikeuksia Description[lt]=Diskų tvarkymui reikalingos administratoriaus teisės Description[nl]=Er zijn administratieve rechten vereist om schijven te beheren