From b107bd8a90bbcee35a400efa696aaa97cff4c8e3 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Sun, 31 Jul 2016 09:30:26 +0000
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"
---
 translations.desktop | 1 +
 1 file changed, 1 insertion(+)

diff --git a/translations.desktop b/translations.desktop
index 35b93e6b6..85f8bdbaf 100644
--- a/translations.desktop
+++ b/translations.desktop
@@ -31,5 +31,6 @@ Name[sr@latin]=Jezik
 Name[sv]=Språk
 Name[uk]=Мова
 Name[x-test]=xxLanguagexx
+Name[zh_CN]=语言
 
 Categories=Qt;KDE;X-KDE-settings-translations;