From aaca28dbf6f08ee38fab5d46ad505e3d3b0925d4 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Wed, 13 Nov 2024 01:24:06 +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 5e186cfd8..93f8cbc64 100644
--- a/org.kde.neochat.desktop
+++ b/org.kde.neochat.desktop
@@ -91,8 +91,10 @@ 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[ia]=Conversation en ditecto sur Matrix
+Comment[it]= su Matrix
 Comment[ka]=ჩატი Matrix-ზე
 Comment[nl]=Chat op Matrix
 Comment[pl]=Rozmawiaj na Matriksie