From 557d151ed483d3d40a98fb8c315a948ebba5df8b Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Fri, 15 Nov 2024 03:06:59 +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 e03487455..05fdcc64c 100644
--- a/org.kde.neochat.desktop
+++ b/org.kde.neochat.desktop
@@ -95,6 +95,7 @@ Comment[eu]=Berriketa Matrix-en
 Comment[fr]=Clavarder sur Matrix
 Comment[gl]=Charle en Matrix
 Comment[hu]=Csevegés Matrixon
+Comment[ia]=Conversation en ditecto sur Matrix
 Comment[it]= su Matrix
 Comment[pl]=Rozmawiaj na Matriksie
 Comment[sl]=Klepet na Matrixu