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/userinfo/localization/zh_CN.inc |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/userinfo/localization/zh_CN.inc b/plugins/userinfo/localization/zh_CN.inc
index 265c070..2b06ab2 100644
--- a/plugins/userinfo/localization/zh_CN.inc
+++ b/plugins/userinfo/localization/zh_CN.inc
@@ -18,8 +18,8 @@
 
 $labels = array();
 $labels['userinfo'] = '用户信息';
-$labels['created'] = '创建';
-$labels['lastlogin'] = '最后登录';
+$labels['created'] = '创建于';
+$labels['lastlogin'] = '最近登录';
 $labels['defaultidentity'] = '默认身份';
 
 ?>
\ No newline at end of file

--
Gitblit v1.9.1