From f086f31b5bb0f70d99b53fcbb7259a337da118ef Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Sat, 16 Sep 2017 05:07:09 +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 | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/touchscreentest/org.kde.touchtest.desktop b/touchscreentest/org.kde.touchtest.desktop
index cfc75891..a6abecd3 100755
--- a/touchscreentest/org.kde.touchtest.desktop
+++ b/touchscreentest/org.kde.touchtest.desktop
@@ -1,10 +1,24 @@
 [Desktop Entry]
 Name=Touch Test
+Name[ca]=Prova el tàctil
+Name[ca@valencia]=Prova el tàctil
+Name[nl]=Aanraaktest
+Name[pt]=Teste de Toque
+Name[sv]=Beröringsprov
+Name[uk]=Тестування дотику
+Name[x-test]=xxTouch Testxx
 
 Categories=Qt;KDE;System;Development;
 
 Exec=touchtest
 GenericName=Terminal
+GenericName[ca]=Terminal
+GenericName[ca@valencia]=Terminal
+GenericName[nl]=Terminal
+GenericName[pt]=Terminal
+GenericName[sv]=Terminal
+GenericName[uk]=Термінал
+GenericName[x-test]=xxTerminalxx
 Icon=input-touchpad
 MimeType=