Index: style/lang/zh-cn.xml
===================================================================
--- style/lang/zh-cn.xml	(revision 1069795)
+++ style/lang/zh-cn.xml	(working copy)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "../lang.dtd">
 <!-- $LastChangedRevision$ -->
 
@@ -19,128 +19,123 @@
  limitations under the License.
 -->
 
-<language id="en">
-    <name>English</name>
-    <charset>ISO-8859-1</charset>
+<language id="zh-cn">
+    <name>Simplified Chinese</name>
+    <charset>UTF-8</charset>
     <source-ext>.xml</source-ext>
-    <target-ext>.html.en</target-ext>
+    <target-ext>.html.zh-cn</target-ext>
 
     <chm>
-        <lang>0x409 English (United States)</lang>
-        <toc-font>,8,0</toc-font>
-        <charset>windows-1252</charset>
-        <settings>English (USA)</settings>
+        <lang>936 Simplified Chinese</lang>
+        <toc-font>,12,0</toc-font>
+        <charset>GBK</charset>
+        <settings>Simplified Chinese</settings>
     </chm>
 
     <man>
-        <charset>ISO-8859-1</charset>
+        <charset>UTF-8</charset>
     </man>
 
     <!-- Some strings might be used in other contexts, than stated in the -->
     <!-- comments...                                                      -->
     <messages>
         <!-- language link titles -->
-        <message id="nativename">English</message>
+        <message id="nativename">Simplified Chinese</message>
 
         <!-- Used for the moduleindex -->
-        <message id="corefeatures">Core Features and Multi-Processing
-            Modules</message>
-        <message id="othermodules">Other Modules</message>
-        <message id="obsoletemodules">Obsolete Modules</message>
+        <message id="corefeatures">核心特性与多处理模块(MPM)</message>
+        <message id="othermodules">其它模块</message>
+        <message id="obsoletemodules">过时的模块</message>
 
         <!-- Used for the modulesynopsis and sitemap -->
-        <message id="obsoleteapachemodule">Obsolete Apache Module</message>
-        <message id="apachemodule">Apache Module</message>
-        <message id="apachecore">Apache Core Features</message>
-        <message id="apachempmcommon">Apache MPM Common Directives</message>
+        <message id="obsoleteapachemodule">过时的 Apache 模块</message>
+        <message id="apachemodule">Apache 模块</message>
+        <message id="apachecore">Apache 核心特性</message>
+        <message id="apachempmcommon">Apache MPM 通用指令</message>
         <message id="apachempm">Apache MPM</message>
 
         <!-- Used in description box for modulesynopsis -->
-        <message id="description">Description</message>
-        <message id="seealso">See also</message>
-        <message id="topics">Topics</message>
-        <message id="status">Status</message>
-        <message id="moduleidentifier">Module&nbsp;Identifier</message>
-        <message id="sourcefile">Source&nbsp;File</message>
-        <message id="compatibility">Compatibility</message>
+        <message id="description">描述</message>
+        <message id="seealso">参见</message>
+        <message id="topics">主题</message>
+        <message id="status">状态</message>
+        <message id="moduleidentifier">模块标识</message>
+        <message id="sourcefile">源文件</message>
+        <message id="compatibility">兼容性</message>
 
         <!-- Used in manualpage -->
-        <message id="relatedmodules">Related Modules</message>
-        <message id="relateddirectives">Related Directives</message>
+        <message id="relatedmodules">相关模块</message>
+        <message id="relateddirectives">相关指令</message>
         <message id="lowercase">abcdefghijklmnopqrstuvwxyz</message>
         <message id="uppercase">ABCDEFGHIJKLMNOPQRSTUVWXYZ</message>
-        <message id="name-section">NAME</message>
+        <message id="name-section">名称</message>
         <message id="hyphenation"></message>
 
         <!-- Used in description box for directives -->
-        <message id="syntax">Syntax</message>
-        <message id="default">Default</message>
-        <message id="context">Context</message>
-        <message id="override">Override</message>
-        <message id="status">Status</message>
-        <message id="module">Module</message>
+        <message id="syntax">语法</message>
+        <message id="default">默认</message>
+        <message id="context">上下文</message>
+        <message id="override">覆盖</message>
+        <message id="status">状态</message>
+        <message id="module">模块</message>
 
         <!-- Status descriptions -->
-        <message id="base" letter="B">Base</message>
+        <message id="base" letter="B">基础</message>
         <message id="mpm" letter="M">MPM</message>
-        <message id="core" letter="C">Core</message>
-        <message id="extension" letter="E">Extension</message>
-        <message id="experimental" letter="X">Experimental</message>
+        <message id="core" letter="C">核心</message>
+        <message id="extension" letter="E">扩展</message>
+        <message id="experimental" letter="X">实验</message>
 
         <!-- Used in directive context lists -->
-        <message id="serverconfig" letter="s">server config</message>
-        <message id="virtualhost" letter="v">virtual host</message>
-        <message id="directory" letter="d">directory</message>
+        <message id="serverconfig" letter="s">服务器配置</message>
+        <message id="virtualhost" letter="v">虚拟主机</message>
+        <message id="directory" letter="d">目录</message>
         <message id="htaccess" letter="h">.htaccess</message>
 
         <!-- Used for directive lists -->
-        <message id="directives">Directives</message>
+        <message id="directives">指令</message>
         <!-- the optional attribute replace-space-with takes a string.
              if present, the space between <directive name> and 'Directive'
              in directivesynopsis headings will be replaced by the given string.
              (see de.xml for an example) -->
-        <message id="directive">Directive</message>
-        <message id="nodirectives">This module provides no
-            directives.</message>
+        <message id="directive">指令</message>
+        <message id="nodirectives">此模块没有提供指令。</message>
 
         <!-- Used in summaries -->
-        <message id="summary">Summary</message>
+        <message id="summary">摘要</message>
 
         <!-- Used for glossary link titles -->
-        <message id="glossarylink">see glossary</message>
+        <message id="glossarylink">参见术语</message>
 
         <!-- Used in headers and footers -->
-        <message id="apachetitle">- Apache HTTP Server</message>
-        <message id="apachehttpserver">Apache HTTP Server Version
+        <message id="apachetitle">- Apache HTTP 服务器</message>
+        <message id="apachehttpserver">Apache HTTP 服务器版本
             &httpd.major;.&httpd.minor;</message>
-        <message id="apachedocalt">[APACHE DOCUMENTATION]</message>
-        <message id="search">Google Search</message> <!-- search button -->
-        <message id="index">Index</message> <!-- deprecated -->
-        <message id="home">Home</message> <!-- deprecated -->
+        <message id="apachedocalt">[APACHE 文档]</message>
+        <message id="search">Google 搜索</message> <!-- search button -->
+        <message id="index">索引</message> <!-- deprecated -->
+        <message id="home">主页</message> <!-- deprecated -->
 
         <!-- breadcrumb links -->
         <message id="apache">Apache</message>
-        <message id="http-server">HTTP Server</message>
-        <message id="documentation">Documentation</message>
-        <message id="version">Version &httpd.major;.&httpd.minor;</message>
+        <message id="http-server">HTTP 服务器</message>
+        <message id="documentation">文档</message>
+        <message id="version">版本 &httpd.major;.&httpd.minor;</message>
 
         <!-- super menu -->
-        <message id="modules">Modules</message>
-        <message id="faq">FAQ</message>
-        <message id="glossary">Glossary</message>
-        <message id="sitemap">Sitemap</message>
+        <message id="modules">模块</message>
+        <message id="faq">常见问题</message>
+        <message id="glossary">术语</message>
+        <message id="sitemap">网站导航</message>
 
         <!-- footer line -->
-        <message id="before-license">Licensed under the</message>
-        <message id="after-license"></message>
-        <message id="langavail">Available Languages</message>
- 
+        <message id="before-license">基于</message>
+        <message id="after-license">许可证</message>
+        <message id="langavail">可用语言</message>
+
         <!-- not up to date -->
-        <message id="outofdate">This translation may be out of date. Check the
-            English version for recent changes.</message>
+        <message id="outofdate">此翻译可能过期。要了解最近的更改，请阅读英文版。</message>
         <!-- directive not translated yet -->
-        <message id="nottranslated">The documentation for this directive has
-            not been translated yet. Please have a look at the English
-            version.</message>
+        <message id="nottranslated">此指令的文档还没有被翻译。请阅读英文版。</message>
     </messages>
 </language>
Index: style/lang-targets.xml
===================================================================
--- style/lang-targets.xml	(revision 1069795)
+++ style/lang-targets.xml	(working copy)
@@ -22,9 +22,9 @@
 <!-- ==================================================================== -->
 <project name="lang-targets">
 
-<target description="- builds all HTML files and nroff man pages" name="all" depends="de, en, es, fr, ja, ko, pt-br, ru, tr"/>
-<target description="- builds all zip download packages" name="zip-all" depends="zip-de, zip-en, zip-es, zip-fr, zip-ja, zip-ko, zip-pt-br, zip-ru, zip-tr"/>
-<target description="- builds all war download packages" name="war-all" depends="war-de, war-en, war-es, war-fr, war-ja, war-ko, war-pt-br, war-ru, war-tr"/>
+<target description="- builds all HTML files and nroff man pages" name="all" depends="de, en, es, fr, ja, ko, pt-br, ru, tr, zh-cn"/>
+<target description="- builds all zip download packages" name="zip-all" depends="zip-de, zip-en, zip-es, zip-fr, zip-ja, zip-ko, zip-pt-br, zip-ru, zip-tr, zip-zh-cn"/>
+<target description="- builds all war download packages" name="war-all" depends="war-de, war-en, war-es, war-fr, war-ja, war-ko, war-pt-br, war-ru, war-tr, war-zh-cn"/>
 
 <!-- German                                                               -->
 <!-- ==================================================================== -->
@@ -234,6 +234,36 @@
     <nroff.generic lang="tr"/>
 </target>
 
+<!-- Simplified Chinese                                                              -->
+<!-- ==================================================================== -->
+<property value=".xml" name="inputext.zh-cn"/>
+<property value=".html.zh-cn" name="outputext.zh-cn"/>
+
+<target description="- builds Simplified Chinese HTML files" name="zh-cn">
+    <html.generic lang="zh-cn"/>
+    <runtarget target="man-zh-cn"/>
+</target>
+<target unless="-off.zh-cn.done" depends="metafiles" name="-off-zh-cn">
+    <dependencies.offline dir="_off" style="zip" lang="zh-cn"/>
+    <offline.generic dir="_off" style="zip" lang="zh-cn"/>
+    <property value="yes" name="-off.zh-cn.done"/>
+</target>
+<target description="- builds the Simplified Chinese zipped download package" depends="-off-zh-cn" name="zip-zh-cn">
+    <zip.generic lang="zh-cn"/>
+</target>
+<target description="- builds the Simplified Chinese Konqueror Web Archive" depends="-off-zh-cn" name="war-zh-cn">
+    <war.generic lang="zh-cn"/>
+</target>
+<target description="- builds the Simplified Chinese CHM file" name="chm-zh-cn">
+    <chm.generic lang="zh-cn"/>
+</target>
+<target description="- builds the Simplified Chinese nroff files" name="man-zh-cn">
+    <nroff.generic lang="zh-cn"/>
+</target>
+<target description="- builds the Simplified Chinese latex file" name="latex-zh-cn">
+    <latex.generic lang="zh-cn"/>
+</target>
+
 <!-- XML validation.                                                      -->
 <!-- If you get an error during transformation, this task may be useful   -->
 <!-- because it mostly gives you a hint, where you forgot the </p> ;-)    -->
@@ -251,6 +281,7 @@
             <include name="**/*.xml.pt-br"/>
             <include name="**/*.xml.ru"/>
             <include name="**/*.xml.tr"/>
+            <include name="**/*.xml.zh-cn"/>
 
             <patternset refid="excludes"/>
             <patternset refid="scratch"/>
Index: style/manual.zh-cn.xsl
===================================================================
--- style/manual.zh-cn.xsl	(revision 1069795)
+++ style/manual.zh-cn.xsl	(working copy)
@@ -19,19 +19,19 @@
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
 
-<xsl:output method="xml" encoding="ISO-8859-1" indent="no" doctype-public="-//W3C//DTD XHTML 1.0 Strict//EN" doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"/>
+<xsl:output method="xml" encoding="UTF-8" indent="no" doctype-public="-//W3C//DTD XHTML 1.0 Strict//EN" doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"/>
 
 <!-- Read the localized messages from the specified language file -->
-<xsl:variable name="message" select="document('lang/en.xml')/language/messages/message"/>
-<xsl:variable name="doclang">en</xsl:variable>
+<xsl:variable name="message" select="document('lang/zh-cn.xml')/language/messages/message"/>
+<xsl:variable name="doclang">zh</xsl:variable>
 <xsl:variable name="allmodules" select="document('xsl/util/allmodules.xml')/items/item[@lang=$doclang]"/>
 
 <!-- some meta information have to be passed to the transformation -->
-<xsl:variable name="output-encoding">ISO-8859-1</xsl:variable>
+<xsl:variable name="output-encoding">UTF-8</xsl:variable>
 <xsl:variable name="is-chm" select="false()"/>
 <xsl:variable name="is-zip" select="false()"/>
 
 <!-- Now get the real guts of the stylesheet -->
 <xsl:include href="xsl/common.xsl"/>
 
-</xsl:stylesheet>
\ No newline at end of file
+</xsl:stylesheet>
Index: style/xsl/util/designations.xml
===================================================================
--- style/xsl/util/designations.xml	(revision 1069795)
+++ style/xsl/util/designations.xml	(working copy)
@@ -9,4 +9,5 @@
 <item charset="ISO-8859-1" lang="pt-br">.html.pt-br</item>
 <item charset="KOI8-R" lang="ru">.html.ru.koi8-r</item>
 <item charset="UTF-8" lang="tr">.html.tr.utf8</item>
+<item charset="UTF-8" lang="zh-cn">.html.zh-cn</item>
 </items>
Index: index.xml.zh-cn
===================================================================
--- index.xml.zh-cn	(revision 1069795)
+++ index.xml.zh-cn	(working copy)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE indexpage SYSTEM "./style/sitemap.dtd">
-<?xml-stylesheet type="text/xsl" href="./style/manual.en.xsl"?>
-<!-- $LastChangedRevision$ -->
+<?xml-stylesheet type="text/xsl" href="./style/manual.zh-cn.xsl"?>
+<!-- English revision : 1044382 -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
@@ -23,71 +23,67 @@
 <indexpage metafile="index.xml.meta">
 <parentdocument href="http://httpd.apache.org/docs-project/" />
 
-<title>Apache HTTP Server Version &httpd.major;.&httpd.minor;
-Documentation</title>
+<title>Apache HTTP 服务器 &httpd.major;.&httpd.minor; 文档</title>
 
-<category id="release"><title>Release Notes</title>
-    <page href="new_features_2_2.html">New features with Apache 2.1/2.2</page>
-    <page href="new_features_2_0.html">New features with Apache 2.0</page>
-    <page href="upgrading.html">Upgrading to 2.2 from 2.0</page>
-    <page href="license.html">Apache License</page>
+<category id="release"><title>发行说明</title>
+    <page href="new_features_2_2.html">Apache 2.1/2.2 的新特性</page>
+    <page href="new_features_2_0.html">Apache 2.0 的新特性</page>
+    <page href="upgrading.html">从 2.0 升级到 2.2</page>
+    <page href="license.html">Apache 许可证</page>
 </category>
 
-<category id="manual"><title>Reference Manual</title>
-    <page href="install.html">Compiling and Installing</page>
-    <page href="invoking.html">Starting</page>
-    <page href="stopping.html">Stopping or Restarting</page>
-    <page href="mod/directives.html">Run-time Configuration Directives</page>
-    <page href="mod/quickreference.html">Directive Quick-Reference</page>
-    <page href="mod/">Modules</page>
-    <page href="mpm.html">Multi-Processing Modules (MPMs)</page>
-    <page href="filter.html">Filters</page>
-    <page href="handler.html">Handlers</page>
-    <page href="programs/">Server and Supporting Programs</page>
-    <page href="glossary.html">Glossary</page>
-</category>    
+<category id="manual"><title>参考手册</title>
+    <page href="install.html">编译与安装</page>
+    <page href="invoking.html">启动</page>
+    <page href="stopping.html">停止与重启</page>
+    <page href="mod/directives.html">配置指令</page>
+    <page href="mod/quickreference.html">指令快速参考</page>
+    <page href="mod/">模块</page>
+    <page href="mpm.html">多处理模块(MPM)</page>
+    <page href="filter.html">过滤器</page>
+    <page href="handler.html">处理器</page>
+    <page href="programs/">服务器与支持程序</page>
+    <page href="glossary.html">术语</page>
+</category>
 
-<category id="usersguide"><title>Users' Guide</title>
-    <page href="bind.html">Binding</page>
-    <page href="configuring.html">Configuration Files</page>
-    <page href="sections.html">Configuration Sections</page>
-    <page href="caching.html">Content Caching</page>
-    <page href="content-negotiation.html">Content Negotiation</page>
-    <page href="dso.html">Dynamic Shared Objects (DSO)</page>
-    <page href="env.html">Environment Variables</page>
-    <page href="logs.html">Log Files</page>
-    <page href="urlmapping.html">Mapping URLs to the Filesystem</page>
-    <page href="misc/perf-tuning.html">Performance Tuning</page>
-    <page href="misc/security_tips.html">Security Tips</page>
-    <page href="server-wide.html">Server-Wide Configuration</page>
-    <page href="ssl/">SSL/TLS Encryption</page>
-    <page href="suexec.html">Suexec Execution for CGI</page>
-    <page href="rewrite/">URL Rewriting Guide</page>
-    <page href="vhosts/">Virtual Hosts</page>
+<category id="usersguide"><title>用户指南</title>
+    <page href="bind.html">绑定</page>
+    <page href="configuring.html">配置文件</page>
+    <page href="sections.html">配置节</page>
+    <page href="caching.html">内容缓存</page>
+    <page href="content-negotiation.html">内容协商</page>
+    <page href="dso.html">动态共享对象(DSO)</page>
+    <page href="env.html">环境变量</page>
+    <page href="logs.html">日志文件</page>
+    <page href="urlmapping.html">从 URL 映射到文件系统</page>
+    <page href="misc/perf-tuning.html">性能调谐</page>
+    <page href="misc/security_tips.html">安全技巧</page>
+    <page href="server-wide.html">服务器全局配置</page>
+    <page href="ssl/">SSL/TLS 加密</page>
+    <page href="suexec.html">执行 CGI 前的用户切换</page>
+    <page href="rewrite/">URL 改写指南</page>
+    <page href="vhosts/">虚拟主机</page>
 </category>
 
-<category id="howto"><title>How-To / Tutorials</title>
-    <page href="howto/auth.html">Authentication, Authorization, and Access
-    Control</page>
-    <page href="howto/cgi.html">CGI: Dynamic Content</page>
-    <page href="howto/htaccess.html">.htaccess files</page>
-    <page href="howto/ssi.html">Server Side Includes (SSI)</page>
-    <page href="howto/public_html.html">Per-user Web Directories
-    (public_html)</page>
+<category id="howto"><title>指引/教程</title>
+    <page href="howto/auth.html">认证，授权与访问控制</page>
+    <page href="howto/cgi.html">CGI: 动态内容</page>
+    <page href="howto/htaccess.html">.htaccess 文件</page>
+    <page href="howto/ssi.html">服务器端插入(SSI)</page>
+    <page href="howto/public_html.html">用户私人网站目录(public_html)</page>
 </category>
 
-<category id="platform"><title>Platform Specific Notes</title>
+<category id="platform"><title>平台相关说明</title>
     <page href="platform/windows.html">Microsoft Windows</page>
     <page href="platform/netware.html">Novell NetWare</page>
-    <page href="platform/ebcdic.html">EBCDIC Port</page>
+    <page href="platform/ebcdic.html">EBCDIC 系统</page>
 </category>
 
-<category id="other"><title>Other Topics</title>
-    <page href="http://wiki.apache.org/httpd/FAQ">Frequently Asked Questions</page>
-    <page href="sitemap.html">Sitemap</page>
-    <page href="developer/">Documentation for Developers</page>
-    <page href="misc/">Other Notes</page>
+<category id="other"><title>其它主题</title>
+    <page href="http://wiki.apache.org/httpd/FAQ">常见问题</page>
+    <page href="sitemap.html">网站导航</page>
+    <page href="developer/">开发文档</page>
+    <page href="misc/">其它说明</page>
 </category>
 
 </indexpage>
-