From dec5e40acd0414ac003939d6e4f87ca52911af50 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Tue, 23 Mar 2021 05:43:12 +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        | 2 ++
 org.kde.neochat.desktop | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/neochat.notifyrc b/neochat.notifyrc
index ff876bedd..1d2a5ed7d 100644
--- a/neochat.notifyrc
+++ b/neochat.notifyrc
@@ -1,7 +1,9 @@
 [Global]
 IconName=org.kde.neochat
 Name=NeoChat
+Name[az]=NeoChat
 Name[ca]=NeoChat
+Name[ca@valencia]=NeoChat
 Name[es]=NeoChat
 Name[ia]=Neochat
 Name[nl]=NeoChat
diff --git a/org.kde.neochat.desktop b/org.kde.neochat.desktop
index 8296c0a07..da5f8724c 100644
--- a/org.kde.neochat.desktop
+++ b/org.kde.neochat.desktop
@@ -1,6 +1,8 @@
 [Desktop Entry]
 Name=NeoChat
+Name[az]=NeoChat
 Name[ca]=NeoChat
+Name[ca@valencia]=NeoChat
 Name[es]=NeoChat
 Name[ia]=Neochat
 Name[nl]=NeoChat