From e1a005524e17e27146447ee24f149238b6b37bd1 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Thu, 26 Mar 2020 06:26:12 +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"
---
 applets/krunner/metadata.desktop | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/applets/krunner/metadata.desktop b/applets/krunner/metadata.desktop
index 4f85adc6..deff9f06 100644
--- a/applets/krunner/metadata.desktop
+++ b/applets/krunner/metadata.desktop
@@ -20,6 +20,7 @@ Name[sk]=Hľadať a Spustiť
 Name[sv]=Sök och kör
 Name[uk]=Пошук і запуск
 Name[x-test]=xxSearch And Runxx
+Name[zh_CN]=搜索和运行
 Name[zh_TW]=搜尋並執行
 
 Comment=Search and run Applications and services
@@ -42,6 +43,7 @@ Comment[sk]=Hľadať a spustiť Aplikácie a služby
 Comment[sv]=Sök och kör program och tjänster
 Comment[uk]=Пошук і запуск програм і служб
 Comment[x-test]=xxSearch and run Applications and servicesxx
+Comment[zh_CN]=搜索和运行应用程序及服务
 Comment[zh_TW]=搜尋並執行應用程式及服務
 
 Icon=preferences-system-time