From 8418d003fa1d4bfc399b65a977cd1a4a9ea3e745 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Sat, 6 Jan 2018 04:52:05 +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"
---
 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 7fafffcb..af48f080 100755
--- a/touchscreentest/org.kde.touchtest.desktop
+++ b/touchscreentest/org.kde.touchtest.desktop
@@ -34,6 +34,7 @@ GenericName[sv]=Terminal
 GenericName[tr]=Uçbirim
 GenericName[uk]=Термінал
 GenericName[x-test]=xxTerminalxx
+GenericName[zh_CN]=终端
 GenericName[zh_TW]=終端機
 Icon=input-touchpad
 MimeType=