From 4c3d5bcb7f64d72db4b1352f2a288813a65b5302 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Tue, 26 Sep 2017 05:00:45 +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 | 1 +
 1 file changed, 1 insertion(+)

diff --git a/touchscreentest/org.kde.touchtest.desktop b/touchscreentest/org.kde.touchtest.desktop
index a6abecd3..54180a81 100755
--- a/touchscreentest/org.kde.touchtest.desktop
+++ b/touchscreentest/org.kde.touchtest.desktop
@@ -14,6 +14,7 @@ Exec=touchtest
 GenericName=Terminal
 GenericName[ca]=Terminal
 GenericName[ca@valencia]=Terminal
+GenericName[de]=Terminal
 GenericName[nl]=Terminal
 GenericName[pt]=Terminal
 GenericName[sv]=Terminal