From fc52af24f1418d6590a2d37a0d8cc31b123e38f6 Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <thomas@roundcube.net>
Date: Tue, 19 Aug 2014 12:08:35 -0400
Subject: [PATCH] Fix merge error that disabled contact drag'n'drop

---
 plugins/help/localization/zh_CN.inc |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/plugins/help/localization/zh_CN.inc b/plugins/help/localization/zh_CN.inc
index 5d6272e..5971947 100644
--- a/plugins/help/localization/zh_CN.inc
+++ b/plugins/help/localization/zh_CN.inc
@@ -19,6 +19,6 @@
 $labels = array();
 $labels['help'] = '帮助';
 $labels['about'] = '关于';
-$labels['license'] = '许可协议';
+$labels['license'] = '授权信息';
 
 ?>

--
Gitblit v1.9.1