From 77da4d2d534ba2e023bbdb032595401c2ab76025 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Thu, 29 Feb 2024 01:13:28 +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 | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/neochat.notifyrc b/src/neochat.notifyrc
index 664eabb28..2c8cf692a 100644
--- a/src/neochat.notifyrc
+++ b/src/neochat.notifyrc
@@ -247,26 +247,35 @@ Action=Popup
 [Event/Share]
 Name=Share
 Name[ca]=Compartició
+Name[ca@valencia]=Compartició
+Name[cs]=Sdílet
 Name[eo]=Kundividi
 Name[es]=Compartir
 Name[eu]=Partekatu
+Name[fr]=Partager
 Name[ia]=Comparti
+Name[it]=Condivisione
 Name[ka]=გაზიარება
 Name[nl]=Gedeelde
 Name[sl]=Deli
 Name[tr]=Paylaş
 Name[uk]=Оприлюднення
 Name[x-test]=xxSharexx
+Name[zh_TW]=分享
 Comment=The result of sharing a piece of content
 Comment[ca]=El resultat de compartir una peça de contingut
+Comment[ca@valencia]=El resultat de compartir una peça de contingut
 Comment[eo]=La rezulto el kundividado de enhavero
 Comment[es]=El resultado de compartir una parte de contenido
 Comment[eu]=Eduki pieza bat partekatzearen emaitza
+Comment[fr]=Le résultat du partage d'une partie de contenu.
 Comment[ia]=Le exito de compartir un pecietta de contento
+Comment[it]=Il risultato della condivisione di un contenuto
 Comment[ka]=შემცველობის ნაწილის გაზიარების შედეგი
 Comment[nl]=Het resultaat van het delen van een stukje inhoud
 Comment[sl]=Rezultat deljenega kosa vsebine
 Comment[tr]=Bir parça içerik paylaşımının sonucu
 Comment[uk]=Результат оприлюднення даних
 Comment[x-test]=xxThe result of sharing a piece of contentxx
+Comment[zh_TW]=分享一份內容之後的結果
 Action=Popup