From 4f699fbc01266d41eefbb84ee550ab46153ec324 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Mon, 6 Aug 2018 05:33:12 +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 ba08745..72edd96 100644
--- a/src/util/org.kde.kpmcore.externalcommand.actions
+++ b/src/util/org.kde.kpmcore.externalcommand.actions
@@ -17,6 +17,7 @@ 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[ca@valencia]=Es requereixen privilegis d'administrador per gestionar discs
 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