From 0e33224079c83c2a5458b9722b6ee06480f6eec9 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Thu, 11 Jun 2020 05:34:59 +0200
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"
---
 plugins/bigscreen/kdeconnect_bigscreen.json   | 3 +++
 urlhandler/org.kde.kdeconnect.handler.desktop | 1 +
 2 files changed, 4 insertions(+)

diff --git a/plugins/bigscreen/kdeconnect_bigscreen.json b/plugins/bigscreen/kdeconnect_bigscreen.json
index 95802ec60..45e39e75b 100644
--- a/plugins/bigscreen/kdeconnect_bigscreen.json
+++ b/plugins/bigscreen/kdeconnect_bigscreen.json
@@ -9,6 +9,7 @@
                 "Name[en_GB]": "Aditya Mehra",
                 "Name[es]": "Aditya Mehra",
                 "Name[et]": "Aditya Mehra",
+                "Name[fi]": "Aditya Mehra",
                 "Name[fr]": "Aditya Mehra",
                 "Name[it]": "Aditya Mehra",
                 "Name[lt]": "Aditya Mehra",
@@ -28,6 +29,7 @@
         "Description[en_GB]": "Bigscreen Plugin",
         "Description[es]": "Complemento Bigscreen",
         "Description[et]": "Suurekraani plugin",
+        "Description[fi]": "Bigscreen-liitännäinen",
         "Description[fr]": "Module externe « Bigscreen »",
         "Description[it]": "Estensione Bigscreen",
         "Description[lt]": "Bigscreen papildinys",
@@ -49,6 +51,7 @@
         "Name[en_GB]": "Bigscreen",
         "Name[es]": "Bigscreen",
         "Name[et]": "Suurekraan",
+        "Name[fi]": "Bigscreen",
         "Name[fr]": "Bigscreen",
         "Name[it]": "Bigscreen",
         "Name[lt]": "Bigscreen",
diff --git a/urlhandler/org.kde.kdeconnect.handler.desktop b/urlhandler/org.kde.kdeconnect.handler.desktop
index 38e043dd3..4f01810c3 100644
--- a/urlhandler/org.kde.kdeconnect.handler.desktop
+++ b/urlhandler/org.kde.kdeconnect.handler.desktop
@@ -5,6 +5,7 @@ Name[cs]=Nástroj pro práci s URL v KDE Connect
 Name[en_GB]=KDE Connect URL Handler
 Name[es]=Controlador de URL de KDE Connect
 Name[et]=KDE Connecti URL-ide käitleja
+Name[fi]=KDE Connectin verkko-osoitekäsittelijä
 Name[fr]=Gestionnaire d'URL de KDE Connect
 Name[it]=Gestore URL di KDE Connect
 Name[lt]=KDE Connect URL doroklė