From f9ae1f97c46223dada68ee60a649732c57d6e534 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Mon, 10 May 2021 01:19:16 +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"
---
 neochat.notifyrc        | 1 +
 org.kde.neochat.desktop | 1 +
 2 files changed, 2 insertions(+)

diff --git a/neochat.notifyrc b/neochat.notifyrc
index 43a37e9f7..6ed4cbf69 100644
--- a/neochat.notifyrc
+++ b/neochat.notifyrc
@@ -8,6 +8,7 @@ Name[cs]=NeoChat
 Name[de]=NeoChat
 Name[en_GB]=NeoChat
 Name[es]=NeoChat
+Name[fi]=NeoChat
 Name[fr]=NeoChat
 Name[ia]=Neochat
 Name[it]=NeoChat
diff --git a/org.kde.neochat.desktop b/org.kde.neochat.desktop
index b97af09cd..fb7290fdc 100644
--- a/org.kde.neochat.desktop
+++ b/org.kde.neochat.desktop
@@ -7,6 +7,7 @@ Name[cs]=NeoChat
 Name[de]=NeoChat
 Name[en_GB]=NeoChat
 Name[es]=NeoChat
+Name[fi]=NeoChat
 Name[fr]=NeoChat
 Name[ia]=Neochat
 Name[it]=NeoChat