From b51194f90ffac851369b6af1077ca5620dd3da27 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Wed, 13 Nov 2024 03:05:22 +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 | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/org.kde.neochat.desktop b/org.kde.neochat.desktop
index ec5ce6d99..4f6244145 100644
--- a/org.kde.neochat.desktop
+++ b/org.kde.neochat.desktop
@@ -91,7 +91,9 @@ Comment=Chat on Matrix
 Comment[ca]=Xat a Matrix
 Comment[es]=Chat en Matrix
 Comment[eu]=Berriketa Matrix-en
+Comment[fr]=Clavarder sur Matrix
 Comment[gl]=Charle en Matrix
+Comment[it]= su Matrix
 Comment[pl]=Rozmawiaj na Matriksie
 Comment[sl]=Klepet na Matrixu
 Comment[tr]=Matrix Üzerinde Sohbet Et