From 59269f63df7133209bca04d8c1d2101460ae79f5 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Wed, 11 Mar 2020 06:00:21 +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"
---
 src/util/org.kde.kpmcore.externalcommand.actions | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/util/org.kde.kpmcore.externalcommand.actions b/src/util/org.kde.kpmcore.externalcommand.actions
index 732ab70..245a626 100644
--- a/src/util/org.kde.kpmcore.externalcommand.actions
+++ b/src/util/org.kde.kpmcore.externalcommand.actions
@@ -56,6 +56,7 @@ Description[sk]=Práva správcu sú potrebné na správu diskov
 Description[sv]=Administratörsprivilegier krävs för att hantera diskar
 Description[uk]=Для керування дисками потрібні права доступу адміністратора (root)
 Description[x-test]=xxAdministrative privileges are required to manage disksxx
+Description[zh_CN]=管理磁盘需要管理权限
 Description[zh_TW]=管理硬碟需要管理員權限
 Policy=auth_admin
 Persistence=session