From a178b8b6ca2d70214ca424ee565eff8a88faf188 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Tue, 23 Jul 2024 03:04:52 +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"
---
 src/neochat.notifyrc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/neochat.notifyrc b/src/neochat.notifyrc
index e569f6622..9579b0bee 100644
--- a/src/neochat.notifyrc
+++ b/src/neochat.notifyrc
@@ -255,7 +255,7 @@ Action=Popup
 Name=Share
 Name[ar]=شارك
 Name[ca]=Compartició
-Name[ca@valencia]=Compartició
+Name[ca@valencia]=Compartiu
 Name[cs]=Sdílet
 Name[en_GB]=Share
 Name[eo]=Kundividi