From 8a759679538a48b50da1231d59518afbe6a29748 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Sat, 8 Jun 2024 01:19:18 +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"
---
 src/neochat.notifyrc           | 2 ++
 src/purpose/purposeplugin.json | 3 +++
 2 files changed, 5 insertions(+)

diff --git a/src/neochat.notifyrc b/src/neochat.notifyrc
index c78032cee..9bba121cd 100644
--- a/src/neochat.notifyrc
+++ b/src/neochat.notifyrc
@@ -261,6 +261,7 @@ Name[en_GB]=Share
 Name[eo]=Kundividi
 Name[es]=Compartir
 Name[eu]=Partekatu
+Name[fi]=Jaa
 Name[fr]=Partager
 Name[hu]=Megosztás
 Name[ia]=Comparti
@@ -283,6 +284,7 @@ Comment[en_GB]=The result of sharing a piece of content
 Comment[eo]=La rezulto el kundividado de enhavero
 Comment[es]=El resultado de compartir una parte de contenido
 Comment[eu]=Eduki pieza bat partekatzearen emaitza
+Comment[fi]=Tulos yhden sisältöosasen jakamisesta
 Comment[fr]=Le résultat du partage d'une partie de contenu.
 Comment[hu]=Tartalom megosztásának eredménye
 Comment[ia]=Le exito de compartir un pecietta de contento
diff --git a/src/purpose/purposeplugin.json b/src/purpose/purposeplugin.json
index cf421371e..bed645741 100644
--- a/src/purpose/purposeplugin.json
+++ b/src/purpose/purposeplugin.json
@@ -12,6 +12,7 @@
                 "Name[eo]": "Tobias Fella",
                 "Name[es]": "Tobias Fella",
                 "Name[eu]": "Tobias Fella",
+                "Name[fi]": "Tobias Fella",
                 "Name[fr]": "Tobias Fella",
                 "Name[gl]": "Tobias Fella",
                 "Name[hu]": "Tobias Fella",
@@ -40,6 +41,7 @@
         "Description[eo]": "Kundividi per NeoChat",
         "Description[es]": "Compartir mediante NeoChat",
         "Description[eu]": "Partekatu NeoChat bidez",
+        "Description[fi]": "Jaa NeoChatillä",
         "Description[fr]": "Partager grâce à NeoChat",
         "Description[gl]": "Compartir por NeoChat",
         "Description[hu]": "Megosztás NeoChatben",
@@ -69,6 +71,7 @@
         "Name[eo]": "NeoChat",
         "Name[es]": "NeoChat",
         "Name[eu]": "NeoChat",
+        "Name[fi]": "NeoChat",
         "Name[fr]": "NeoChat",
         "Name[gl]": "NeoChat",
         "Name[hu]": "NeoChat",