From 0f7ce1f2ad1d1f4b05d71beb53fccb53fbd5db21 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Sun, 14 Sep 2025 01:34:35 +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"
---
 kcms/navigation/kcm_navigation.json            | 4 ++++
 quicksettings/kscreenosd/package/metadata.json | 3 +++
 2 files changed, 7 insertions(+)

diff --git a/kcms/navigation/kcm_navigation.json b/kcms/navigation/kcm_navigation.json
index 3a90179c..cf30acf2 100644
--- a/kcms/navigation/kcm_navigation.json
+++ b/kcms/navigation/kcm_navigation.json
@@ -8,6 +8,7 @@
                 "Name[ca]": "Luis Büchi",
                 "Name[es]": "Luis Büchi",
                 "Name[eu]": "Luis Büchi",
+                "Name[fr]": "Luis Büchi",
                 "Name[he]": "לואי ביושי",
                 "Name[it]": "Luis Büchi",
                 "Name[ka]": "Luis Büchi",
@@ -25,6 +26,7 @@
         "Description[ca]": "Configura la navegació del sistema",
         "Description[es]": "Configurar la navegación del sistema",
         "Description[eu]": "Konfiguratu sistemaren nabigazioa",
+        "Description[fr]": "Configurer le système de navigation",
         "Description[he]": "הגדרת ניווט במערכת",
         "Description[it]": "Configura navigazione del sistema",
         "Description[ka]": "სისტემის ნავიგაციის მორგება",
@@ -48,6 +50,7 @@
         "Name[ca]": "Navegació",
         "Name[es]": "Navegación",
         "Name[eu]": "Nabigazioa",
+        "Name[fr]": "Système de navigation",
         "Name[he]": "ניווט",
         "Name[it]": "Navigazione",
         "Name[ka]": "ნავიგაცია",
@@ -64,6 +67,7 @@
     "X-KDE-Keywords[ca]": "sistema,intèrpret d'ordres,plafó,navegació,gest",
     "X-KDE-Keywords[es]": "sistema,intérprete,intérprete de órdenes,panel,navegación,gestos",
     "X-KDE-Keywords[eu]": "sistema,shell,oskola,panela,nabigazioa,keinua",
+    "X-KDE-Keywords[fr]": "système, shell, panneau, navigation, geste",
     "X-KDE-Keywords[he]": "מערכת,מעטפת,של,שאל,לוח,פאנל,מחווה,תנועת עכבר",
     "X-KDE-Keywords[it]": "sistema,shell,pannello,navigazione,gesto",
     "X-KDE-Keywords[ka]": "system,shell,panel,სისტემა,გარემო,პანელი,ჟესტი",
diff --git a/quicksettings/kscreenosd/package/metadata.json b/quicksettings/kscreenosd/package/metadata.json
index d9183015..7aea23d4 100644
--- a/quicksettings/kscreenosd/package/metadata.json
+++ b/quicksettings/kscreenosd/package/metadata.json
@@ -11,6 +11,7 @@
                 "Name[cs]": "Sebastian Kügler",
                 "Name[es]": "Sebastian Kügler",
                 "Name[eu]": "Sebastian Kügler",
+                "Name[fi]": "Sebastian Kügler",
                 "Name[fr]": "Sebastian Kügler",
                 "Name[he]": "סבסטיאן קיגלר",
                 "Name[it]": "Sebastian Kügler",
@@ -32,6 +33,7 @@
         "Description[ca]": "Configuració ràpida de l'OSD de la pantalla per al Plasma Mobile",
         "Description[es]": "Ajuste rápido del OSD de configuración de pantalla para Plasma Mobile",
         "Description[eu]": "Pantaila ezarpena OSD ezarpen azkarra Plasma Mugikorrerako",
+        "Description[fi]": "Näyttöjen ruutupika-asetus Plasma Mobileen",
         "Description[fr]": "Configuration rapide de l'incrustation vidéo sur écran (OSD) pour Plasma Mobile",
         "Description[he]": "חיווי על גבי המסך להגדרה מהירה של התצוגה לפלזמה לניידים",
         "Description[it]": "Configurazione rapida dell'OSD per Plasma Mobile",
@@ -54,6 +56,7 @@
         "Name[ca]": "OSD de la pantalla",
         "Name[es]": "OSD de pantalla",
         "Name[eu]": "Pantailako OSD",
+        "Name[fi]": "Näyttöjen ruutunäyttö",
         "Name[fr]": "Incrustation vidéo sur écran (OSD)",
         "Name[he]": "חיווי על גבי המסך",
         "Name[it]": "OSD schermo",