From e2d7ae9fda444c018b7e968f85eb8ef8fc5641f5 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Thu, 15 Mar 2018 05:23:39 +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"
---
 gmenu-dbusmenu-proxy/gmenudbusmenuproxy.desktop | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gmenu-dbusmenu-proxy/gmenudbusmenuproxy.desktop b/gmenu-dbusmenu-proxy/gmenudbusmenuproxy.desktop
index fd7e34ed8..6c3dc558d 100644
--- a/gmenu-dbusmenu-proxy/gmenudbusmenuproxy.desktop
+++ b/gmenu-dbusmenu-proxy/gmenudbusmenuproxy.desktop
@@ -9,6 +9,7 @@ Name[nn]=GMenuDBusMenuProxy
 Name[pt]=GMenuDBusMenuProxy
 Name[uk]=Проксі-меню GMenu D-Bus
 Name[x-test]=xxGMenuDBusMenuProxyxx
+Name[zh_CN]=GMenuDBusMenuProxy
 Type=Application
 X-KDE-StartupNotify=false
 OnlyShowIn=KDE;