From 0680356543b2fb534da93c775e63562422875340 Mon Sep 17 00:00:00 2001
From: Ruey-Cherng Yu <rcyu@FreeBSD.org>
Date: Thu, 10 Aug 2017 16:19:36 +0000
Subject: [PATCH] sync with the English version (Based on the zh_TW and en_US
 versions)

Submitted by:	Guangyuan (Charlie) Yang <cyang@freebsdfoundation.org>
Reviewed by:	delphij
Differential Revision:	https://reviews.freebsd.org/D11792
---
 zh_CN.UTF-8/htdocs/index.xsl | 164 +++++++++++++++++++----------------
 1 file changed, 87 insertions(+), 77 deletions(-)

diff --git a/zh_CN.UTF-8/htdocs/index.xsl b/zh_CN.UTF-8/htdocs/index.xsl
index eea8e4cfba..e3ce74695d 100644
--- a/zh_CN.UTF-8/htdocs/index.xsl
+++ b/zh_CN.UTF-8/htdocs/index.xsl
@@ -4,9 +4,9 @@
 <!ENTITY title "The FreeBSD Project">
 ]>
 
-<!-- The FreeBSD Simplified Chinese Documentation Project -->
-<!-- Original revision: 1.160 -->
 <!-- $FreeBSD$ -->
+<!-- The FreeBSD Simplified Chinese Documentation Project -->
+<!-- Original revision: r49485 -->
 
 <xsl:stylesheet version="1.0"
   xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
@@ -26,8 +26,7 @@
   <xsl:param name="news.project.xml" select="'none'"/>
   <xsl:param name="events.xml-master" select="'none'"/>
   <xsl:param name="events.xml" select="'none'"/>
-
-  <xsl:variable name="svnKeyword">$FreeBSD$</xsl:variable>
+  <xsl:param name="html.header.script.google" select="'IGNORE'"/>
 
   <xsl:variable name="title">&title;</xsl:variable>
 
@@ -38,56 +37,74 @@
 
 		<div id="frontfeatureleft">
 			<div id="frontfeaturecontent">
-				<h1>
-				  基于 BSD &unix;
-				</h1>
-				<p>
-				  FreeBSD&reg; 是可以用于
-				  x86 兼容机 (包括 Pentium&reg; 和 Athlon&trade;)、
-				  amd64 兼容机 (包括 Opteron&trade;、 Athlon&trade;64 和 EM64T)、
-				  UltraSPARC&reg;、 IA-64、 PC-98 以及 ARM 硬件架构上的一种先进的操作系统。
-				  它源于 BSD， 由加州大学伯克利分校开发的 &unix; 版本。 目前由
-				  <a href="&enbase;/doc/en_US.ISO8859-1/articles/contributors/staff-committers.html">一支包含大量开发人员的团队</a> 维护。
-				  对于一些其它的 <a href="&base;/platforms/">硬件平台</a> 的支持，
-				  也正处于不同的开发阶段。
-				</p>
-				<div id="txtfrontfeaturelink">
-				&#187;<a href="&base;/about.html" title="了解更多">了解更多</a>
-				</div> <!-- TXTFRONTFEATURELINK -->
-			</div> <!-- FRONTFEATURECONTENT -->
-		</div> <!-- FRONTFEATURELEFT -->
+				<h1>&os; 项目</h1>
+
+				<p>&os; 是一个适用于现代服务器，桌面与嵌入式 <a href="&base;/platforms/">平台</a> 的先进操作系统。
+				  由一个庞大的
+				  <a
+				  href="&enbase;/doc/en_US.ISO8859-1/articles/contributors/staff-committers.html">开发人员团队</a>
+				持续开发超过三十年。
+				&os; 先进的网络、安全性和存储方面的特色使得它成为许多
+				  <a href="&enbase;/doc/zh_CN.UTF-8/books/handbook/nutshell.html#introduction-nutshell-users">大型网站</a>
+			以及最普遍的嵌入式网络与存储设备的平台选择。 </p>
+
+                                  <div
+				  id="txtfrontfeaturelink"> &#187;<a
+				  href="&base;/about.html"
+				  title="Learn More">了解更多</a>
+				  </div> <!-- TXTFRONTFEATURELINK -->
+
+				  <div id="txtfrontjournalblock">
+				    <br/>&#187;
+				    <span
+				     id="txtfrontjournallink">
+				      立即获取 <a
+				       href="http://www.freebsdjournal.com/"
+				       title="&os;&nbsp;Journal">&os;&nbsp;Journal</a>
+				    </span> <!-- TXTFRONTJOURNALLINK -->
+				  </div> <!-- TXTFRONTJOURNALBLOCK -->
+
+				  <!-- IMPORTANT NOTICES -->
+				  <!--
+				  <div
+				    style="width:640px; margin: 16px 16px 16px 32px; auto">
+
+				    <h2>ANNOUNCEMENT: [header]</h2>
+
+				    <p align="justify">[text]</p>
+				  </div>
+				  -->
+				  <!-- END IMPORTANT NOTICES -->
+
+			  </div> <!-- FRONTFEATURECONTENT -->
+		  </div> <!-- FRONTFEATURELEFT -->
 
 		<div id="frontfeaturemiddle">
 			<div class="frontgetroundbox">
 			  <div class="frontgettop"><div><b style="display: none">.</b></div></div>
 				<div class="frontgetcontent">
-				  <a href="&base;/where.html">立即获得 FreeBSD</a>
+				  <a href="&base;/where.html">获取 &os;</a>
 				</div> <!-- frontgetcontent -->
 			  <div class="frontgetbot"><div><b style="display: none">.</b></div></div>
 			</div> <!-- frontgetroundbox -->
 
 			<div id="frontreleases">
 			  <div id="frontreleasescontent" class="txtshortcuts">
-				  <h2><a href="&base;/releases/"> 最新版本 </a></h2>
+				  <h2><a href="&base;/releases/">最新版本</a></h2>
 				  <ul id="frontreleaseslist">
-					<li>
-					  <a href="&enbase;/&u.rel.announce;">生产适用版 &rel.current;</a>
-					</li>
-					<li>
-					  <a href="&enbase;/&u.rel2.announce;">(旧式)生产适用版 &rel2.current;</a>
-					</li>
-			    <xsl:if test="'&beta.testing;' != 'IGNORE'">
-					<li>
-					  <a href="&base;/where.html#helptest">将发布的版本
-				            &betarel.current; - &betarel.vers;</a>
-					</li>
+					<li>生产环境适用:&nbsp;<a
+				href="&u.rel.announce;">&rel.current;</a>,
+					<a
+				href="&u.rel0.announce;">&rel0.current;</a></li>
+			    <xsl:if test="'&beta.upcoming;' != 'IGNORE'">
+					<li>即将发布: <a
+				href="&u.betarel.schedule;">&betarel.current;</a></li>
 			    </xsl:if>
-			    <xsl:if test="'&beta2.testing;' != 'IGNORE'">
-					<li>
-					  <a href="&base;/where.html#helptest">将发布的版本
-				            &betarel2.current; - &betarel2.vers;</a>
-					</li>
+			    <xsl:if test="'&beta2.upcoming;' != 'IGNORE'">
+					<li>即将发布: <a
+				href="&u.betarel2.schedule;">&betarel2.current;</a></li>
 			    </xsl:if>
+					<li><a href="&base;/security/security.html#sup">支持生命周期</a></li>
 				  </ul>
 			  </div> <!-- FRONTRELEASESCONTENT -->
 			</div> <!-- FRONTRELEASES -->
@@ -103,44 +120,18 @@
 				  <li>
 					<a href="&enbase;/" title="英语">en</a>
 				  </li>
-				  <li>
-					<a href="&enbase;/es/" title="西班牙语">es</a>
-				  </li>
-				  <li>
-					<a href="&enbase;/fr/" title="法语">fr</a>
-				  </li>
-				  <li>
-					<a href="&enbase;/hu/" title="匈牙利语">hu</a>
-				  </li>
-				  <li>
-					<a href="&enbase;/it/" title="意大利语">it</a>
-				  </li>
 				  <li>
 					<a href="&enbase;/ja/" title="日语">ja</a>
 				  </li>
 				  <li>
-					<a href="&enbase;/ru/" title="俄语">ru</a>
+					<a href="&enbase;/zh_CN/" title="中文 (简体)">zh_CN</a>
 				  </li>
 				  <li class="last-child">
-					<a href="&enbase;/zh_CN/" title="中文 (简体)">zh_CN</a>
+					<a href="&enbase;/zh_TW/" title="中文 (繁体)">zh_TW</a>
 				  </li>
 				</ul>
 			</div> <!-- LANGUAGENAV -->
 
-			<div id="mirror">
-			  <form action="&cgibase;/mirror.cgi" method="get">
-				<div>
-				  <h2 class="blockhide"><label for="MIRRORSEL">镜像</label></h2>
-				  <select id="mirrorsel" name="goto">
-					  <xsl:call-template name="html-index-mirrors-options-list">
-					    <xsl:with-param name="mirrors.xml" select="$mirrors.xml" />
-					  </xsl:call-template>
-				  </select>
-				</div> <!-- unnamed -->
-				<input type="submit" value="Go" />
-			  </form>
-			</div> <!-- MIRROR -->
-
 			<div id="frontshortcuts">
 			  <div id="frontshortcutscontent" class="txtshortcuts">
 				  <h2>常用链接</h2>
@@ -149,13 +140,13 @@
 					  <a href="&enbase;/community/mailinglists.html" title="邮件列表">邮件列表</a>
 					</li>
 					<li>
-					  <a href="&enbase;/support/bugreports.html" title="报告 Bug">报告 Bug</a>
+					  <a href="&enbase;/support/bugreports.html" title="问题报告">问题报告</a>
 					</li>
 					<li>
-					  <a href="&enbase;/doc/en_US.ISO8859-1/books/faq/index.html" title="FAQ">FAQ</a>
+					  <a href="&enbase;/doc/en_US.ISO8859-1/books/faq/index.html" title="常见问题解答">常见问题解答</a>
 					</li>
 					<li>
-					  <a href="&enbase;/doc/zh_CN.UTF-8/books/handbook/index.html" title="Handbook">使用手册</a>
+					  <a href="&enbase;/doc/zh_CN.UTF-8/books/handbook/index.html" title="使用手册">使用手册</a>
 					</li>
 					<li>
 					  <a href="&enbase;/ports/index.html" title="Ports">Ports</a>
@@ -180,7 +171,7 @@
             <div id="frontnemscontainer">
             	<div id="frontnews">
             	   <div id="frontnewscontent" class="txtnewsevent">
-			<h2>新闻</h2>
+			<h2>最新动态</h2>
 			<div class="newseventswrap">
 
 			<xsl:call-template name="html-index-news-project-items">
@@ -194,7 +185,7 @@
 					<a href="&base;/news/newsflash.html" title="更多新闻">更多新闻</a>
 				  </li>
 				  <li class="last-child">
-					<a href="&base;/news/news.rdf" title="新闻 RSS Feed"><img class="rssimage" src="&enbase;/layout/images/ico_rss.png" width="27" height="12" alt="新闻 RSS Feed" /></a>
+					<a href="&enbase;/news/rss.xml" title="新闻 RSS Feed"><img class="rssimage" src="&enbase;/layout/images/ico_rss.png" width="27" height="12" alt="新闻 RSS Feed" /></a>
 				  </li>
 				</ul>
 			  </div> <!-- unnamed -->
@@ -240,7 +231,7 @@
 			  <div>
 				<ul class="newseventslist">
 				  <li class="only-child">
-					<a href="&base;/news/press.html" title="更多媒体报道">更多媒体报道</a>
+					<a href="&enbase;/news/press.html" title="更多媒体报道">更多媒体报道</a>
 				  </li>
 				</ul>
 			  </div> <!-- unnamed -->
@@ -263,17 +254,17 @@
 			  <div>
 				<ul class="newseventslist">
 				  <li class="first-child">
-					<a href="&base;/security/" title="更多安全公告">更多</a>
+					<a href="&enbase;/security/advisories.html" title="更多安全公告">更多安全公告</a>
 				  </li>
 				  <li class="last-child">
-					<a href="&enbase;/security/advisories.rdf" title="安全公告 RSS Feed"><img class="rssimage" src="&enbase;/layout/images/ico_rss.png" width="27" height="12" alt="安全公告 RSS Feed" /></a>
+					<a href="&enbase;/security/rss.xml" title="安全公告 RSS Feed"><img class="rssimage" src="&enbase;/layout/images/ico_rss.png" width="27" height="12" alt="安全公告 RSS Feed" /></a>
 				  </li>
 				</ul>
 			  </div> <!-- unnamed -->
 			</div> <!-- newseventswrap -->
 
 			<br />
-			<h2>发行版修正公告</h2>
+			<h2>勘误公告</h2>
 			<div class="newseventswrap">
 
 			<xsl:call-template name="html-index-advisories-items">
@@ -281,6 +272,16 @@
 				<xsl:with-param name="type" select="'notice'" />
 			</xsl:call-template>
 
+			  <div>
+				<ul class="newseventslist">
+				  <li class="first-child">
+				    <a href="&enbase;/security/notices.html" title="更多勘误公告">更多勘误公告</a>
+				  </li>
+				  <li class="last-child">
+				    <a href="&enbase;/security/errata.xml" title="勘误公告 RSS Feed"><img class="rssimage" src="&enbase;/layout/images/ico_rss.png" width="27" height="12" alt="勘误公告 RSS Feed" /></a>
+				  </li>
+				</ul>
+			  </div> <!-- unnamed -->
 			</div> <!-- newseventswrap -->
 
 		   </div> <!-- FRONTSECURITYCONTENT -->
@@ -292,4 +293,13 @@
           </div> <!-- FRONTMAIN -->
         </div> <!-- FRONTCONTAINER -->
   </xsl:template>
+
+  <xsl:template name="process.footer">
+	&copyright;
+
+	FreeBSD 标志是 FreeBSD 基金会的注册商标
+	由 <a
+	  href="https://www.freebsdfoundation.org/documents/Guidelines.shtml">FreeBSD 基金会</a> 授权 FreeBSD 项目使用。
+	<a href="&enbase;/mailto.html" title="&header2.word.contact;">&header2.word.contact;</a>
+  </xsl:template>
 </xsl:stylesheet>