From 7b6a1445e75e40ab3e74f3114454be368bf8436a Mon Sep 17 00:00:00 2001
From: shanyan baishui <Siramizu@gmail.com>
Date: Sat, 4 Sep 2010 07:58:27 +0200
Subject: [PATCH] Translation update done using Pootle.

---
 po/zh_CN.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 5581b2d84..7242d500c 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -2078,7 +2078,7 @@ msgstr "扩展插入"
 
 #: libraries/config.values.php:121
 msgid "both of the above"
-msgstr ""
+msgstr "以上兼有"
 
 #: libraries/config.values.php:122
 msgid "neither of the above"