From 40883d9461902aacf3933f0388b2df9473b7dd61 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Wed, 26 Mar 2025 01:30:34 +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 3fa915454..4a86bc94f 100644
--- a/org.kde.neochat.desktop
+++ b/org.kde.neochat.desktop
@@ -113,6 +113,7 @@ Comment[lv]=Tērzējiet „Matrix“ tīklā
 Comment[nl]=Chat op Matrix
 Comment[pl]=Rozmawiaj na Matriksie
 Comment[pt_BR]=Bate papo na Matrix
+Comment[ru]=Общение в Matrix
 Comment[sa]=Matrix इत्यत्र गपशपं कुर्वन्तु
 Comment[sl]=Klepet na Matrixu
 Comment[sv]=Chatta på Matrix