From c7df3f903a4eba7fbd8565a52723efb2b48166b5 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Sat, 20 Mar 2021 06:26:36 +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        | 25 -------------------------
 org.kde.neochat.desktop | 25 -------------------------
 2 files changed, 50 deletions(-)

diff --git a/neochat.notifyrc b/neochat.notifyrc
index 4b926ddbb..7d6872387 100644
--- a/neochat.notifyrc
+++ b/neochat.notifyrc
@@ -1,31 +1,6 @@
 [Global]
 IconName=org.kde.neochat
 Name=NeoChat
-Name[az]=Neochat
-Name[ca]=Neochat
-Name[ca@valencia]=Neochat
-Name[cs]=Neochat
-Name[da]=Neochat
-Name[de]=Neochat
-Name[en_GB]=Neochat
-Name[es]=Neochat
-Name[eu]=Neochat
-Name[fi]=Neochat
-Name[fr]=Neochat
-Name[hu]=Neochat
-Name[it]=Neochat
-Name[nl]=Neochat
-Name[nn]=Neochat
-Name[pa]=ਨਿਓ-ਚੈਟ
-Name[pl]=Neochat
-Name[pt]=Neochat
-Name[pt_BR]=Neochat
-Name[sk]=Neochat
-Name[sl]=Neochat
-Name[sv]=Neochat
-Name[uk]=Neochat
-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
diff --git a/org.kde.neochat.desktop b/org.kde.neochat.desktop
index 89bf3715e..69388b7b5 100644
--- a/org.kde.neochat.desktop
+++ b/org.kde.neochat.desktop
@@ -1,30 +1,5 @@
 [Desktop Entry]
 Name=NeoChat
-Name[az]=Neochat
-Name[ca]=Neochat
-Name[ca@valencia]=Neochat
-Name[cs]=Neochat
-Name[da]=Neochat
-Name[de]=Neochat
-Name[en_GB]=Neochat
-Name[es]=Neochat
-Name[eu]=Neochat
-Name[fi]=Neochat
-Name[fr]=Neochat
-Name[hu]=Neochat
-Name[it]=Neochat
-Name[nl]=Neochat
-Name[nn]=Neochat
-Name[pa]=ਨਿਓ-ਚੈਟ
-Name[pl]=Neochat
-Name[pt]=Neochat
-Name[pt_BR]=Neochat
-Name[sk]=Neochat
-Name[sl]=Neochat
-Name[sv]=Neochat
-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