From e60ed3b8897de469e6c128ac7781ff599ec37f28 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Sun, 13 Jun 2021 02:20:41 +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 5419ff1a9..da12fdfea 100644
--- a/neochat.notifyrc
+++ b/neochat.notifyrc
@@ -6,6 +6,7 @@ Name[ca]=NeoChat
 Name[ca@valencia]=NeoChat
 Name[cs]=NeoChat
 Name[de]=NeoChat
+Name[en_GB]=NeoChat
 Name[es]=NeoChat
 Name[fi]=NeoChat
 Name[fr]=NeoChat
diff --git a/org.kde.neochat.desktop b/org.kde.neochat.desktop
index edffbd5cd..88b8a2b37 100644
--- a/org.kde.neochat.desktop
+++ b/org.kde.neochat.desktop
@@ -5,6 +5,7 @@ Name[ca]=NeoChat
 Name[ca@valencia]=NeoChat
 Name[cs]=NeoChat
 Name[de]=NeoChat
+Name[en_GB]=NeoChat
 Name[es]=NeoChat
 Name[fi]=NeoChat
 Name[fr]=NeoChat