From fd99f8c325bcbd4c7b45de5cb8d344ab2e1c92b2 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Sat, 6 Jan 2018 04:45:50 +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"
---
 shell/metadata.desktop.cmake   | 1 +
 shell/package/metadata.desktop | 1 +
 2 files changed, 2 insertions(+)

diff --git a/shell/metadata.desktop.cmake b/shell/metadata.desktop.cmake
index 6b23e0b70..8a1f33fcf 100644
--- a/shell/metadata.desktop.cmake
+++ b/shell/metadata.desktop.cmake
@@ -49,6 +49,7 @@ Keywords[sk]=shell
 Keywords[sv]=skal
 Keywords[uk]=оболонка
 Keywords[x-test]=xxshellxx
+Keywords[zh_CN]=shell
 Keywords[zh_TW]=shell
 Type=Service
 
diff --git a/shell/package/metadata.desktop b/shell/package/metadata.desktop
index 5d5eea254..bf9becdf6 100644
--- a/shell/package/metadata.desktop
+++ b/shell/package/metadata.desktop
@@ -49,6 +49,7 @@ Keywords[sk]=shell
 Keywords[sv]=skal
 Keywords[uk]=оболонка
 Keywords[x-test]=xxshellxx
+Keywords[zh_CN]=shell
 Keywords[zh_TW]=shell
 Type=Service