From b9c3a5c3e4d2abe87ad920fc44db4f8a4b50a3e2 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Sun, 7 Aug 2022 02:55:46 +0000
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"
---
 dataengines/mpris2/plasma-dataengine-mpris2.json | 2 +-
 systemmonitor/ksysguard.json                     | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dataengines/mpris2/plasma-dataengine-mpris2.json b/dataengines/mpris2/plasma-dataengine-mpris2.json
index 74170fc23..ea6948669 100644
--- a/dataengines/mpris2/plasma-dataengine-mpris2.json
+++ b/dataengines/mpris2/plasma-dataengine-mpris2.json
@@ -11,7 +11,7 @@
         "Description[ar]": "يوفر معلومات من مشغلات الوسائط والتحكم فيها عبر MPRIS2",
         "Description[az]": "MPRIS2 ilə media pleyerin idarəsini və onun haqqında məlumatları təmin edir",
         "Description[bg]": "Предоставя информация и контрол за медийни плейъри чрез MPRIS2",
-        "Description[ca@valencia]": "Proporciona informació i controla els reproductors de suports via el MPRIS2",
+        "Description[ca@valencia]": "Proporciona informació i controla els reproductors de suports via MPRIS2",
         "Description[ca]": "Proporciona informació i controla els reproductors de suports via el MPRIS2",
         "Description[cs]": "Poskytuje informace a ovládání přehrávačů médií přes MPRIS2",
         "Description[da]": "Giver information fra og kontrol over medieafspillere via MPRIS2",
diff --git a/systemmonitor/ksysguard.json b/systemmonitor/ksysguard.json
index cfd46e317..2ccba4a79 100644
--- a/systemmonitor/ksysguard.json
+++ b/systemmonitor/ksysguard.json
@@ -4,7 +4,7 @@
         "Description[ar]": "يُطلِق مرقاب نظام.ك عند الضغط على Ctrl+Escape",
         "Description[az]": "Ctrl + Escape-lə KSysguard-ı başladır",
         "Description[bg]": "Стартира KSysguard при натискане на  Ctrl + Escape",
-        "Description[ca@valencia]": "Inicia el KSysguard amb Ctrl + Esc",
+        "Description[ca@valencia]": "Inicia KSysGuard amb Ctrl + Esc",
         "Description[ca]": "Llança el KSysguard amb Ctrl + Esc",
         "Description[cs]": "Při Ctrl+Esc spustí KSysguard",
         "Description[da]": "Starter KSysguard med Ctrl + Escape",
@@ -44,7 +44,7 @@
         "Name[az]": "KSysguard",
         "Name[bg]": "KSysguard",
         "Name[bs]": "KSysguard",
-        "Name[ca@valencia]": "KSysguard",
+        "Name[ca@valencia]": "KSysGuard",
         "Name[ca]": "KSysguard",
         "Name[cs]": "KSysGuard",
         "Name[da]": "KSysguard",