From 1bce6ee8fa6d885f5238ddfd562a35a24f109121 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Sun, 1 Oct 2017 05:16:25 +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"
---
 touchscreentest/org.kde.touchtest.desktop | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/touchscreentest/org.kde.touchtest.desktop b/touchscreentest/org.kde.touchtest.desktop
index 6b28ac41..88d73d3b 100755
--- a/touchscreentest/org.kde.touchtest.desktop
+++ b/touchscreentest/org.kde.touchtest.desktop
@@ -2,6 +2,7 @@
 Name=Touch Test
 Name[ca]=Prova el tàctil
 Name[ca@valencia]=Prova el tàctil
+Name[es]=Prueba táctil
 Name[nl]=Aanraaktest
 Name[pt]=Teste de Toque
 Name[sv]=Beröringsprov
@@ -16,6 +17,7 @@ GenericName=Terminal
 GenericName[ca]=Terminal
 GenericName[ca@valencia]=Terminal
 GenericName[de]=Terminal
+GenericName[es]=Terminal
 GenericName[nl]=Terminal
 GenericName[pt]=Terminal
 GenericName[sv]=Terminal