From e7431568889589e88061e31cb98c64129a4a6af0 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 16 Aug 2018 05:29:54 +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 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/util/org.kde.kpmcore.externalcommand.actions b/src/util/org.kde.kpmcore.externalcommand.actions index a6ab293..76df6ac 100644 --- a/src/util/org.kde.kpmcore.externalcommand.actions +++ b/src/util/org.kde.kpmcore.externalcommand.actions @@ -6,6 +6,7 @@ Name=Start external command daemon Name[ca]=Inicia el dimoni d'ordres externes Name[ca@valencia]=Inicia el dimoni d'ordres externes Name[cs]=Spustit démona externích příkazů +Name[en_GB]=Start external command daemon Name[es]=Iniciar el demonio de órdenes externas Name[fi]=Käynnistä ulkoinen komentopalvelu Name[lt]=Paleisti išorinių komandų tarnybą @@ -19,6 +20,7 @@ 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[cs]=Pro správu disků jsou potřeba práva administrátora +Description[en_GB]=Administrative privileges are required to manage disks 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