From b574849df3f0b66e29e3aa58b35b1e52009fc455 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Sat, 26 Dec 2020 09:29:49 +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        | 1 +
 org.kde.neochat.desktop | 1 +
 2 files changed, 2 insertions(+)

diff --git a/neochat.notifyrc b/neochat.notifyrc
index 64a8ae03d..0431fa3d3 100644
--- a/neochat.notifyrc
+++ b/neochat.notifyrc
@@ -31,6 +31,7 @@ Comment[it]=Client di messaggistica istantanea per il protocollo Matrix
 Comment[nl]=IM-client voor het Matrix-protocol
 Comment[nn]=Lynmeldings­klient for Matrix-protokollen
 Comment[pt]=Cliente de MI para o protocolo Matrix
+Comment[sk]=IM klient pre protokol Matrix
 Comment[sl]=Odjemalec neposrednega sporočanja po protokolu Matrix
 Comment[sv]=Direktmeddelandeklient för protokollet Matrix
 Comment[uk]=Клієнт служби миттєвого обміну повідомленнями для протоколу Matrix
diff --git a/org.kde.neochat.desktop b/org.kde.neochat.desktop
index 9e98ee7ea..51da51200 100644
--- a/org.kde.neochat.desktop
+++ b/org.kde.neochat.desktop
@@ -46,6 +46,7 @@ Comment[it]=Client per il protocollo Matrix
 Comment[nl]=Client voor het Matrix-protocol
 Comment[nn]=Lynmeldings­klient for Matrix-protokollen
 Comment[pt]=Cliente para o protocolo Matrix
+Comment[sk]=Klient protokolu Matrix
 Comment[sl]=Odjemalec za protokol Matrix
 Comment[sv]=Klient för protokollet Matrix
 Comment[uk]=Клієнт протоколу Matrix