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

---
 po/zh_CN.po | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 65b6b9c13..8d4730732 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
 "POT-Creation-Date: 2010-08-30 17:37+0200\n"
-"PO-Revision-Date: 2010-09-04 07:31+0200\n"
+"PO-Revision-Date: 2010-09-04 07:33+0200\n"
 "Last-Translator: shanyan baishui <Siramizu@gmail.com>\n"
 "Language-Team: chinese_simplified <zh_CN@li.org>\n"
 "Language: zh_CN\n"
@@ -6495,7 +6495,6 @@ msgid "Displays a link to download this image."
 msgstr "显示下载此图像的链接。"
 
 #: libraries/transformations/text_plain__dateformat.inc.php:9
-#, fuzzy
 #| msgid ""
 #| "Displays a TIME, TIMESTAMP, DATETIME or numeric unix timestamp field as "
 #| "formatted date. The first option is the offset (in hours) which will be "
@@ -6515,11 +6514,10 @@ msgid ""
 "documentation for PHP's strftime() function and for \"utc\" it is done using "
 "gmdate() function."
 msgstr ""
-"将一个 TIME、TIMESTAMP、DATETIME 或数字 UNIX 时间戳字段格式化显示为日期。第一"
-"个选项是小时偏移量，该值将加到时间戳中 (默认：0)。第二个选项用于指定时间格式"
-"字符串。第三个选项决定显示本地时间还是 UTC 时间 (填入“local”或“utc”)，所以"
-"填“local”(参见 PHP 的 strftime() 函数文档)和“utc”(参见 PHP 的 gmdate() 函数文"
-"档)所到的结果是不一样的。"
+"将一个 TIME、TIMESTAMP、DATETIME 或数字 UNIX 时间戳字段格式化显示为日期。第一个选项是小时偏移量，该值将加到时间戳中 "
+"(默认：0)。第二个选项用于指定时间格式字符串。第三个选项决定显示本地时间还是 UTC 时间 "
+"(填入“local”或“utc”)，所以填“local”(参见 PHP 的 strftime() 函数文档)和“utc”(参见 PHP 的 "
+"gmdate() 函数文档)所到的结果是不一样的。"
 
 #: libraries/transformations/text_plain__external.inc.php:9
 msgid ""