From 055396e133dfd4e725107d47a1b4524ad1425fbc Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Sat, 2 Aug 2025 01:34:55 +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/waydroidintegration/kcm_waydroidintegration.json | 4 ++++
 quicksettings/waydroid/metadata.json                  | 1 +
 2 files changed, 5 insertions(+)

diff --git a/kcms/waydroidintegration/kcm_waydroidintegration.json b/kcms/waydroidintegration/kcm_waydroidintegration.json
index 57725ae7..a951723d 100644
--- a/kcms/waydroidintegration/kcm_waydroidintegration.json
+++ b/kcms/waydroidintegration/kcm_waydroidintegration.json
@@ -9,6 +9,7 @@
                 "Name[ca]": "Florian RICHER",
                 "Name[es]": "Florian RICHER",
                 "Name[eu]": "Florian RICHER",
+                "Name[fi]": "Florian RICHER",
                 "Name[fr]": "Florian RICHER",
                 "Name[he]": "פלוריאן רישה",
                 "Name[it]": "Florian RICHER",
@@ -30,6 +31,7 @@
         "Description[ca]": "Configuració del Waydroid",
         "Description[es]": "Configuración de Waydroid",
         "Description[eu]": "Waydroid konfigurazioa",
+        "Description[fi]": "Waydroid-asetukset",
         "Description[fr]": "Configuration de Waydroid",
         "Description[he]": "הגדרות Waydroid",
         "Description[it]": "Configurazione di Waydroid",
@@ -57,6 +59,7 @@
         "Name[ca]": "Integració del Waydroid",
         "Name[es]": "Integración con Waydroid",
         "Name[eu]": "Waydroid bateratzea",
+        "Name[fi]": "Waydroid-eheytys",
         "Name[fr]": "Intégration de Waydroid",
         "Name[he]": "שילוב מול Waydroid",
         "Name[it]": "Integrazione Waydroid",
@@ -77,6 +80,7 @@
     "X-KDE-Keywords[ca]": "waydroid",
     "X-KDE-Keywords[es]": "waydroid",
     "X-KDE-Keywords[eu]": "waydroid",
+    "X-KDE-Keywords[fi]": "waydroid",
     "X-KDE-Keywords[fr]": "waydroid",
     "X-KDE-Keywords[he]": "waydroid",
     "X-KDE-Keywords[it]": "waydroid",
diff --git a/quicksettings/waydroid/metadata.json b/quicksettings/waydroid/metadata.json
index 88991239..b7b7d77b 100644
--- a/quicksettings/waydroid/metadata.json
+++ b/quicksettings/waydroid/metadata.json
@@ -10,6 +10,7 @@
                 "Name[ca]": "Florian RICHER",
                 "Name[es]": "Florian RICHER",
                 "Name[eu]": "Florian RICHER",
+                "Name[fi]": "Florian RICHER",
                 "Name[fr]": "Florian RICHER",
                 "Name[he]": "פלוריאן רישה",
                 "Name[it]": "Florian RICHER",