From 65cf6a89daff34077801990a5aee5394dd98257d Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Sat, 4 May 2019 05:57:30 +0200
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"
---
 shell/metadata.desktop | 1 +
 1 file changed, 1 insertion(+)

diff --git a/shell/metadata.desktop b/shell/metadata.desktop
index f95a3e97..af92b8fa 100644
--- a/shell/metadata.desktop
+++ b/shell/metadata.desktop
@@ -23,6 +23,7 @@ Name[zh_CN]=手机
 Name[zh_TW]=電話
 Comment=Plasma shell for phones
 Comment[ca]=Espai de treball Plasma per a telèfons
+Comment[es]=Interfaz de Plasma para teléfonos
 Comment[nl]=Plasma-shell voor telefoons
 Comment[pt]=Área de trabalho Plasma para telemóveis
 Comment[sv]=Plasma skal för telefoner