From 5828ee1ada29997dd57558b0f66b3f13717d3747 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Thu, 26 Oct 2023 02:17:19 +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"
---
 org.kde.neochat.desktop           | 1 +
 src/neochat.notifyrc              | 1 +
 src/plasma-runner-neochat.desktop | 1 +
 3 files changed, 3 insertions(+)

diff --git a/org.kde.neochat.desktop b/org.kde.neochat.desktop
index 9375e8725..c467542bb 100644
--- a/org.kde.neochat.desktop
+++ b/org.kde.neochat.desktop
@@ -4,6 +4,7 @@
 Version=1.5
 Name=NeoChat
 Name[ar]=نيوتشات
+Name[ast]=NeoChat
 Name[az]=NeoChat
 Name[ca]=NeoChat
 Name[ca@valencia]=NeoChat
diff --git a/src/neochat.notifyrc b/src/neochat.notifyrc
index 250e10492..aa3676062 100644
--- a/src/neochat.notifyrc
+++ b/src/neochat.notifyrc
@@ -2,6 +2,7 @@
 IconName=org.kde.neochat
 Name=NeoChat
 Name[ar]=نيوتشات
+Name[ast]=NeoChat
 Name[az]=NeoChat
 Name[ca]=NeoChat
 Name[ca@valencia]=NeoChat
diff --git a/src/plasma-runner-neochat.desktop b/src/plasma-runner-neochat.desktop
index bb8d1be85..ccfb14f3d 100644
--- a/src/plasma-runner-neochat.desktop
+++ b/src/plasma-runner-neochat.desktop
@@ -3,6 +3,7 @@
 [Desktop Entry]
 Name=NeoChat
 Name[ar]=نيوتشات
+Name[ast]=NeoChat
 Name[az]=NeoChat
 Name[ca]=NeoChat
 Name[ca@valencia]=NeoChat