From 032140331cb56bc29433c642911a3d664a821621 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Wed, 28 Oct 2020 06:22:17 +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 f348d74ac..dbcb25830 100644
--- a/linux/org.eu.encom.spectral.desktop
+++ b/linux/org.eu.encom.spectral.desktop
@@ -2,6 +2,7 @@
 Name=Spectral
 Name[ca]=Spectral
 Name[ca@valencia]=Spectral
+Name[es]=Spectral
 Name[nl]=Spectral
 Name[sv]=Spectral
 Name[uk]=Spectral
@@ -9,6 +10,7 @@ Name[x-test]=xxSpectralxx
 GenericName=Matrix Client
 GenericName[ca]=Client del Matrix
 GenericName[ca@valencia]=Client del Matrix
+GenericName[es]=Cliente para Matrix
 GenericName[nl]=Matrix-client
 GenericName[sv]=Matrix-klient
 GenericName[uk]=Клієнт Matrix
@@ -16,6 +18,7 @@ GenericName[x-test]=xxMatrix Clientxx
 Comment=IM client for the Matrix protocol
 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[sv]=Direktmeddelandeklient för protokollet Matrix
 Comment[uk]=Клієнт служби миттєвого обміну повідомленнями для протоколу Matrix