From 07dffa7e733994d413ccdd7e0fb00404d65e9c2f Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Wed, 10 Feb 2021 08:16: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        | 4 ++++
 org.kde.neochat.desktop | 3 +++
 2 files changed, 7 insertions(+)

diff --git a/neochat.notifyrc b/neochat.notifyrc
index a7a3ca92d..58cab00a9 100644
--- a/neochat.notifyrc
+++ b/neochat.notifyrc
@@ -1,6 +1,7 @@
 [Global]
 IconName=org.kde.neochat
 Name=Neochat
+Name[az]=Neochat
 Name[ca]=Neochat
 Name[ca@valencia]=Neochat
 Name[da]=Neochat
@@ -26,6 +27,7 @@ Name[x-test]=xxNeochatxx
 Name[zh_CN]=Neochat
 DesktopEntry=org.kde.neochat
 Comment=A client for matrix, the decentralized communication protocol
+Comment[az]=Matrix üçün müştəri, mərkəzləşməmiş kommunikasiya protokolu
 Comment[ca]=Un client per al Matrix, el protocol de comunicacions descentralitzat
 Comment[ca@valencia]=Un client per al Matrix, el protocol de comunicacions descentralitzat
 Comment[es]=Un cliente para Matrix, el protocolo de comunicaciones descentralizado
@@ -47,6 +49,7 @@ Comment[x-test]=xxA client for matrix, the decentralized communication protocolx
 
 [Event/message]
 Name=New message
+Name[az]=Yeni ismarıc
 Name[ca]=Missatge nou
 Name[ca@valencia]=Missatge nou
 Name[de]=Neue Nachricht
@@ -70,6 +73,7 @@ Name[uk]=Нове повідомлення
 Name[x-test]=xxNew messagexx
 Name[zh_CN]=新消息
 Comment=There is a new message
+Comment[az]=Yeni ismarıc var
 Comment[ca]=Hi ha un missatge nou
 Comment[ca@valencia]=Hi ha un missatge nou
 Comment[de]=Es ist eine neue Nachricht vorhanden
diff --git a/org.kde.neochat.desktop b/org.kde.neochat.desktop
index 163d9d841..59c80d4b0 100644
--- a/org.kde.neochat.desktop
+++ b/org.kde.neochat.desktop
@@ -1,5 +1,6 @@
 [Desktop Entry]
 Name=Neochat
+Name[az]=Neochat
 Name[ca]=Neochat
 Name[ca@valencia]=Neochat
 Name[da]=Neochat
@@ -24,6 +25,7 @@ Name[uk]=Neochat
 Name[x-test]=xxNeochatxx
 Name[zh_CN]=Neochat
 GenericName=Matrix Client
+GenericName[az]=Matrix Müştərisi
 GenericName[ca]=Client del Matrix
 GenericName[ca@valencia]=Client del Matrix
 GenericName[de]=Matrix-Programm
@@ -47,6 +49,7 @@ GenericName[uk]=Клієнт Matrix
 GenericName[x-test]=xxMatrix Clientxx
 GenericName[zh_CN]=Matrix 客户端
 Comment=Client for the Matrix protocol
+Comment[az]=Matrix protokolu üçün müştəri
 Comment[ca]=Client per al protocol Matrix
 Comment[ca@valencia]=Client per al protocol Matrix
 Comment[de]=Programm für das Matrix-Protokoll