From 047aa793e79d3895e62d474772e39a634621b405 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Mon, 7 Jun 2021 02:15:39 +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"
---
 neochat.notifyrc        | 1 +
 org.kde.neochat.desktop | 1 +
 2 files changed, 2 insertions(+)

diff --git a/neochat.notifyrc b/neochat.notifyrc
index 91b15fe91..5419ff1a9 100644
--- a/neochat.notifyrc
+++ b/neochat.notifyrc
@@ -5,6 +5,7 @@ Name[az]=NeoChat
 Name[ca]=NeoChat
 Name[ca@valencia]=NeoChat
 Name[cs]=NeoChat
+Name[de]=NeoChat
 Name[es]=NeoChat
 Name[fi]=NeoChat
 Name[fr]=NeoChat
diff --git a/org.kde.neochat.desktop b/org.kde.neochat.desktop
index d0d34b864..edffbd5cd 100644
--- a/org.kde.neochat.desktop
+++ b/org.kde.neochat.desktop
@@ -4,6 +4,7 @@ Name[az]=NeoChat
 Name[ca]=NeoChat
 Name[ca@valencia]=NeoChat
 Name[cs]=NeoChat
+Name[de]=NeoChat
 Name[es]=NeoChat
 Name[fi]=NeoChat
 Name[fr]=NeoChat