From 0699bc4147ab9a562d0660c661a7194ea9288155 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Mon, 9 Dec 2024 01:26:04 +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"
---
 org.kde.neochat.desktop | 1 +
 1 file changed, 1 insertion(+)

diff --git a/org.kde.neochat.desktop b/org.kde.neochat.desktop
index 3cd5903c9..3934dec4b 100644
--- a/org.kde.neochat.desktop
+++ b/org.kde.neochat.desktop
@@ -95,6 +95,7 @@ Comment[de]=Über Matrix unterhalten
 Comment[en_GB]=Chat on Matrix
 Comment[es]=Chat en Matrix
 Comment[eu]=Berriketa Matrix-en
+Comment[fi]=Keskustele Matrixissä
 Comment[fr]=Clavarder sur Matrix
 Comment[gl]=Charle en Matrix
 Comment[he]=התכתבות דרך Matrix