From 7c1ff3cc195be75c1c198839bdddc49f7183fe40 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Sun, 24 Dec 2017 04:48:55 +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/org.kde.partitionmanager.desktop | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/org.kde.partitionmanager.desktop b/src/org.kde.partitionmanager.desktop
index f871822..2aacb0c 100644
--- a/src/org.kde.partitionmanager.desktop
+++ b/src/org.kde.partitionmanager.desktop
@@ -183,3 +183,4 @@ Keywords[sv]=partition;disk;
 Keywords[tr]=bölümleme;disk;
 Keywords[uk]=розділ;диск;
 Keywords[x-test]=xxpartitionxx;xxdiskxx;
+Keywords[zh_CN]=partition;disk;分区;磁盘;