From fcf898057774fa7aa9a05d14f36cafd465e65fa3 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Tue, 21 Jan 2020 06:17:31 +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"
---
 bin/plasma-mobile.desktop.cmake           | 2 ++
 shell/metadata.desktop                    | 1 +
 touchscreentest/org.kde.touchtest.desktop | 1 +
 3 files changed, 4 insertions(+)

diff --git a/bin/plasma-mobile.desktop.cmake b/bin/plasma-mobile.desktop.cmake
index 4f7753f6..b7c4bb7c 100644
--- a/bin/plasma-mobile.desktop.cmake
+++ b/bin/plasma-mobile.desktop.cmake
@@ -31,6 +31,7 @@ Name[sk]=Plasma Mobile
 Name[sv]=Plasma mobil
 Name[uk]=Мобільна Плазма
 Name[x-test]=xxPlasma Mobilexx
+Name[zh_CN]=Plasma Mobile
 Name[zh_TW]=Plasma 行動
 Comment=Plasma Mobile by KDE
 Comment[ca]=Plasma Mòbil, creat per la comunitat KDE
@@ -61,5 +62,6 @@ Comment[sk]=Plasma Mobile od KDE
 Comment[sv]=Plasma mobil av KDE
 Comment[uk]=Мобільна Плазма від KDE
 Comment[x-test]=xxPlasma Mobile by KDExx
+Comment[zh_CN]=KDE Plasma Mobile
 Comment[zh_TW]=來自 KDE 的 Plasma 行動作業系統
 X-KDE-PluginInfo-Version=${PROJECT_VERSION}
diff --git a/shell/metadata.desktop b/shell/metadata.desktop
index 29404e7f..ca92ada9 100644
--- a/shell/metadata.desktop
+++ b/shell/metadata.desktop
@@ -59,6 +59,7 @@ Comment[sk]=Plasma shell pre telefóny
 Comment[sv]=Plasma skal för telefoner
 Comment[uk]=Оболонка Плазми для телефонів
 Comment[x-test]=xxPlasma shell for phonesxx
+Comment[zh_CN]=适配手机的 Plasma 外壳
 Comment[zh_TW]=適用於手機的 Plasma Shell
 Type=Service
 
diff --git a/touchscreentest/org.kde.touchtest.desktop b/touchscreentest/org.kde.touchtest.desktop
index c4b5b889..0dbfd5bc 100755
--- a/touchscreentest/org.kde.touchtest.desktop
+++ b/touchscreentest/org.kde.touchtest.desktop
@@ -28,6 +28,7 @@ Name[sv]=Beröringsprov
 Name[tr]=Dokunma Testi
 Name[uk]=Тестування дотику
 Name[x-test]=xxTouch Testxx
+Name[zh_CN]=触摸测试
 Name[zh_TW]=觸控測試
 
 Categories=Qt;KDE;System;Development;