From efd22b1d211deab73cca0a712ae1eda8be89c130 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Fri, 30 Oct 2020 06:37:41 +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"
---
 linux/org.eu.encom.spectral.desktop | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/linux/org.eu.encom.spectral.desktop b/linux/org.eu.encom.spectral.desktop
index afc9e566a..a194bc900 100644
--- a/linux/org.eu.encom.spectral.desktop
+++ b/linux/org.eu.encom.spectral.desktop
@@ -4,6 +4,7 @@ Name[ca]=Spectral
 Name[ca@valencia]=Spectral
 Name[es]=Spectral
 Name[nl]=Spectral
+Name[nn]=Spectral
 Name[pt]=Spectral
 Name[sv]=Spectral
 Name[uk]=Spectral
@@ -13,6 +14,7 @@ GenericName[ca]=Client del Matrix
 GenericName[ca@valencia]=Client del Matrix
 GenericName[es]=Cliente para Matrix
 GenericName[nl]=Matrix-client
+GenericName[nn]=Matrix-klient
 GenericName[pt]=Cliente de Matrix
 GenericName[sv]=Matrix-klient
 GenericName[uk]=Клієнт Matrix
@@ -22,6 +24,7 @@ Comment[ca]=Client de MI per al protocol Matrix
 Comment[ca@valencia]=Client de MI per al protocol Matrix
 Comment[es]=Cliente de MI para el protocolo 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[sv]=Direktmeddelandeklient för protokollet Matrix
 Comment[uk]=Клієнт служби миттєвого обміну повідомленнями для протоколу Matrix