From 60bba03afa22a97865d3071dd138714d9951fc80 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 7 Aug 2019 05:01: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 14760cb..84ad970 100644 --- a/src/util/org.kde.kpmcore.externalcommand.actions +++ b/src/util/org.kde.kpmcore.externalcommand.actions @@ -3,6 +3,7 @@ Icon=partitionmanager [org.kde.kpmcore.externalcommand.init] Name=Start external command daemon +Name[ast]=Aniciu del degorriu de comandos esternos 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ů