From ed8957ebc165e34b68a5f1072bf033bc89602408 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Mon, 25 Apr 2022 01:51:44 +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"
---
 applets/batterymonitor/package/metadata.json           | 2 +-
 kcms/colors/accentColorService/accentColorService.json | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/applets/batterymonitor/package/metadata.json b/applets/batterymonitor/package/metadata.json
index c3d462e8b..d8a7cd5d6 100644
--- a/applets/batterymonitor/package/metadata.json
+++ b/applets/batterymonitor/package/metadata.json
@@ -43,7 +43,7 @@
         "Description": "See the power status of your battery",
         "Description[ar]": "طالع حالة طاقة البطارية",
         "Description[az]": "Batareyanızın enerji səviyyəsinə baxın",
-        "Description[ca@valencia]": "Vegeu l'estat d'energia de la bateria",
+        "Description[ca@valencia]": "Vejau l'estat d'energia de la bateria",
         "Description[ca]": "Vegeu l'estat d'energia de la bateria",
         "Description[cs]": "Zobrazí stav nabití vaší baterie",
         "Description[de]": "Den Ladestatus des Akkus anzeigen",
diff --git a/kcms/colors/accentColorService/accentColorService.json b/kcms/colors/accentColorService/accentColorService.json
index f44e36048..35edbf3da 100644
--- a/kcms/colors/accentColorService/accentColorService.json
+++ b/kcms/colors/accentColorService/accentColorService.json
@@ -2,19 +2,25 @@
     "KPlugin": {
         "Description": "Applies extracted accent color from wallpaper on dbus request",
         "Description[az]": "Divar kağızından alınmış vurğu rəngini DBus sorğusuna tətbiq edir",
+        "Description[ca@valencia]": "Aplicar el color d'accent extret a partir del fons de pantalla a petició de D-Bus",
         "Description[ca]": "Aplicar el color d'accent extret a partir del fons de pantalla a petició del D-Bus",
         "Description[en_GB]": "Applies extracted accent colour from wallpaper on dbus request",
         "Description[es]": "Aplica el color de acentuación extraído del fondo de pantalla en una petición D-Bus",
+        "Description[fr]": "Applique une couleur accentuée extraite du fonds d'écran à partir d'une requête « D-Bus »",
         "Description[nl]": "Past de uitgepakte accentkleur uit achtergrondafbeelding toe op dbus-verzoek",
+        "Description[sv]": "Använder extraherad accentfärg från skrivbordsunderlägg på begäran från D-bus",
         "Description[tr]": "dbus isteğinde, duvar kağıdından çıkarılan vurgu rengini uygular",
         "Description[uk]": "Застосовує видобутий з фонового зображення стільниці колір акценту у відповідь на запит DBus",
         "Description[x-test]": "xxApplies extracted accent color from wallpaper on dbus requestxx",
         "Name": "accentColorService",
         "Name[az]": "vurğu_rəngi_xidməti",
+        "Name[ca@valencia]": "ServeiColorAccent",
         "Name[ca]": "ServeiColorAccent",
         "Name[en_GB]": "accentColorService",
         "Name[es]": "Servicio de color de acentuación",
+        "Name[fr]": "Service de couleurs accentuées",
         "Name[nl]": "accentColorService",
+        "Name[sv]": "Accentfärgtjänst",
         "Name[tr]": "accentColorService",
         "Name[uk]": "accentColorService",
         "Name[x-test]": "xxaccentColorServicexx"