From 498240c6ec4d45158621dac0034dff09aadec946 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Sun, 6 Oct 2024 01:22:10 +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, 2 insertions(+)

diff --git a/src/neochat.notifyrc b/src/neochat.notifyrc
index ab5358d99..bcd2e7723 100644
--- a/src/neochat.notifyrc
+++ b/src/neochat.notifyrc
@@ -263,6 +263,7 @@ Name[ar]=شارك
 Name[ca]=Compartició
 Name[ca@valencia]=Compartició
 Name[cs]=Sdílet
+Name[de]=Teilen
 Name[el]=Κοινοποίηση
 Name[en_GB]=Share
 Name[eo]=Kundividi
@@ -292,6 +293,7 @@ Comment=The result of sharing a piece of content
 Comment[ar]=نتيجة مشاركة محتوى
 Comment[ca]=El resultat de compartir una peça de contingut
 Comment[ca@valencia]=El resultat de compartir una peça de contingut
+Comment[de]=Das Ergebnis nach dem Teilen eines Teils des Inhalts
 Comment[el]=Το αποτέλεσμα του διαμοιρασμού ενός περιεχομένου
 Comment[en_GB]=The result of sharing a piece of content
 Comment[eo]=La rezulto el kundividado de enhavero