From af8460c208eb544ce22c2a49c2435c2735e2c4a7 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Fri, 1 Aug 2025 01:36: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"
---
 .../waydroidintegrationplugin/kauth/waydroidhelper.actions     | 3 +++
 quicksettings/flashlight/kauth/flashlighthelper.actions        | 1 +
 2 files changed, 4 insertions(+)

diff --git a/components/waydroidintegrationplugin/kauth/waydroidhelper.actions b/components/waydroidintegrationplugin/kauth/waydroidhelper.actions
index 81bf7579..3b0acd2f 100644
--- a/components/waydroidintegrationplugin/kauth/waydroidhelper.actions
+++ b/components/waydroidintegrationplugin/kauth/waydroidhelper.actions
@@ -8,6 +8,7 @@ Name[ca]=Gestió del Waydroid
 Name[ca@valencia]=Gestioneu Waydroid
 Name[es]=Gestión de Waydroid
 Name[eu]=Waydroid kudeaketa
+Name[fi]=Waydroidin hallinnointi
 Name[fr]=Gestion de Waydroid
 Name[he]=ניהול Waydroid
 Name[it]=Gestione di Waydroid
@@ -29,6 +30,7 @@ Name[ca]=Inicialitza el Waydroid
 Name[ca@valencia]=Restablix Waydroid
 Name[es]=Inicializar Waydroid
 Name[eu]=Hasieratu Waydroid
+Name[fi]=Valmistele Waydroid
 Name[fr]=Initialiser Waydroid
 Name[he]=אתחול Waydroid
 Name[it]=Inizializza Waydroid
@@ -47,6 +49,7 @@ Description[ca]=Permet la inicialització del Waydroid
 Description[ca@valencia]=Permet la inicialització de Waydroid
 Description[es]=Permitir la inicialización de Waydroid
 Description[eu]=Waydroid hasieratzeko aukera eskaintzen du
+Description[fi]=Salli Waydroidin valmistelu
 Description[fr]=Autoriser l'initialisation de Waydroid
 Description[he]=לאפשר אתחול של Waydroid
 Description[it]=Permetti l'inizializzazione di Waydroid
diff --git a/quicksettings/flashlight/kauth/flashlighthelper.actions b/quicksettings/flashlight/kauth/flashlighthelper.actions
index c8eedf99..3f7a1955 100644
--- a/quicksettings/flashlight/kauth/flashlighthelper.actions
+++ b/quicksettings/flashlight/kauth/flashlighthelper.actions
@@ -8,6 +8,7 @@ Name[ca]=Gestió del Waydroid
 Name[ca@valencia]=Gestioneu Waydroid
 Name[es]=Gestión de Waydroid
 Name[eu]=Waydroid kudeaketa
+Name[fi]=Waydroidin hallinnointi
 Name[fr]=Gestion de Waydroid
 Name[he]=ניהול Waydroid
 Name[it]=Gestione di Waydroid