From 7fe3c5366168f62d80e10c3cc17aab7ab793bfcb Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Mon, 14 Dec 2020 09:28:48 +0100
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 4f28530a8..69a236e75 100644
--- a/neochat.notifyrc
+++ b/neochat.notifyrc
@@ -3,6 +3,7 @@ IconName=neochat
 Name=Neochat
 Name[ca]=Neochat
 Name[ca@valencia]=Neochat
+Name[da]=Neochat
 Name[en_GB]=Neochat
 Name[es]=Neochat
 Name[fr]=Neochat
diff --git a/org.kde.neochat.desktop b/org.kde.neochat.desktop
index dfde134e0..c20d0d283 100644
--- a/org.kde.neochat.desktop
+++ b/org.kde.neochat.desktop
@@ -2,6 +2,7 @@
 Name=Neochat
 Name[ca]=Neochat
 Name[ca@valencia]=Neochat
+Name[da]=Neochat
 Name[en_GB]=Neochat
 Name[es]=Neochat
 Name[fr]=Neochat