From 184702fc1aa6ebcf5678ecf6447dd5e1371e7a47 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 30 Jul 2018 05:24:01 +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 f2c815e..285b678 100644 --- a/src/util/org.kde.kpmcore.externalcommand.actions +++ b/src/util/org.kde.kpmcore.externalcommand.actions @@ -4,6 +4,7 @@ Icon=partitionmanager [org.kde.kpmcore.externalcommand.init] 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[nl]=Start externe opdrachtdaemon Name[pt]=Iniciar o servidor de comandos externos @@ -13,6 +14,7 @@ Name[uk]=Запуск фонової служби зовнішньої кома Name[x-test]=xxStart external command daemonxx Description=Root privileges are needed 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 uživatele Description[nl]=Er zijn root-privileges vereist om schijven te beheren Description[pt]=São necessários privilégios de 'root' (administrador) para gerir os discos