From edfee495c6718236c573d92d80ecb622eec1b7ed Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Thu, 14 Nov 2024 01:24:49 +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 ++
 src/neochat.notifyrc    | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/org.kde.neochat.desktop b/org.kde.neochat.desktop
index 93f8cbc64..96c5d13b2 100644
--- a/org.kde.neochat.desktop
+++ b/org.kde.neochat.desktop
@@ -89,10 +89,12 @@ GenericName[zh_CN]=Matrix 客户端
 GenericName[zh_TW]=Matrix 用戶端
 Comment=Chat on Matrix
 Comment[ca]=Xat a Matrix
+Comment[ca@valencia]=Xat a Matrix
 Comment[es]=Chat en Matrix
 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[ka]=ჩატი Matrix-ზე
diff --git a/src/neochat.notifyrc b/src/neochat.notifyrc
index 787526b9d..24fc38e8c 100644
--- a/src/neochat.notifyrc
+++ b/src/neochat.notifyrc
@@ -261,7 +261,7 @@ Action=Popup
 Name=Share
 Name[ar]=شارك
 Name[ca]=Compartició
-Name[ca@valencia]=Compartició
+Name[ca@valencia]=Compartiu
 Name[cs]=Sdílet
 Name[de]=Teilen
 Name[el]=Κοινοποίηση