Index: head/zh_CN.UTF-8/share/xml/navibar.l10n.ent
===================================================================
--- head/zh_CN.UTF-8/share/xml/navibar.l10n.ent	(revision 51939)
+++ head/zh_CN.UTF-8/share/xml/navibar.l10n.ent	(revision 51940)
@@ -1,168 +1,232 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $FreeBSD$ -->
 
 <!-- The FreeBSD Simplified Chinese Documentation Project -->
-<!-- From FreeBSD: www/share/xml/navibar.ent,v 1.12 2007/09/12 02:11:47 bland -->
+<!-- Original Revision: r51914 -->
 
 <!ENTITY nav.about '
 <div xmlns="http://www.w3.org/1999/xhtml" id="sidenav">
-<h2 class="blockhide">Section Navigation</h2>
-<ul>
-<li><a href="&base;/about.html">关于</a></li>
-<li><a href="&base;/features.html">特性</a></li>
-<li><a href="&base;/applications.html">应用程序</a></li>
-<li><a href="&base;/internet.html">互联网</a></li>
-<li><a href="&base;/advocacy/">促进项目</a></li>
-<li><a href="&enbase;/marketing/">市场</a></li>
-<li><a href="&enbase;/administration.html">管理团队</a></li>
-<li><a href="&base;/news/newsflash.html">新闻</a></li>
-<li><a href="&enbase;/events/events.html">近期活动</a></li>
-<li><a href="&base;/news/press.html">媒体报道</a></li>
-<li><a href="&enbase;/logo.html">标志</a></li>
-<li><a href="&base;/art.html">插图</a></li>
-<li><a href="&base;/donations/">捐赠</a></li>
-<li><a href="&base;/copyright/">法律须知</a></li>
-</ul>
-</div> <!-- sidenav -->
-'>
+  <h2 class="blockhide">Section Navigation</h2>
 
+  <ul>
+    <li><a href="&base;/about.html">关于</a></li>
+    <li><a href="&base;/features.html">特性</a></li>
+    <li><a href="&base;/applications.html">应用程序</a></li>
+    <li><a href="&base;/advocacy/">促进项目</a></li>
+    <li><a href="&enbase;/marketing/">市场</a></li>
+    <li><a href="&enbase;/administration.html">管理团队</a></li>
+    <li><a href="&base;/news/newsflash.html">新闻</a></li>
+    <li><a href="&enbase;/events/events.html">近期活动</a></li>
+    <li><a href="&base;/news/press.html">媒体报道</a></li>
+    <li><a href="&enbase;/multimedia/multimedia.html">多媒体</a></li>
+    <li><a href="&base;/art.html">插图</a></li>
+    <li><a href="&base;/logo.html">标志</a></li>
+    <li><a href="&enbase;/donations/">捐赠</a></li>
+    <li><a href="&base;/copyright/">法律须知</a></li>
+    <li><a href="&enbase;/privacy.html">隐私政策</a></li>
+  </ul>
+</div> <!-- SIDENAV -->'>
+
 <!ENTITY nav.community '
 <div xmlns="http://www.w3.org/1999/xhtml" id="sidenav">
-<h2 class="blockhide">Section Navigation</h2>
-<ul>
-<li><a href="&base;/community.html">社区</a></li>
-<li><a href="&enbase;/community/mailinglists.html">邮件列表</a></li>
-<li><a href="&enbase;/community/irc.html">IRC</a></li>
-<li><a href="&enbase;/community/newsgroups.html">新闻组</a></li>
-<li><a href="&enbase;/usergroups.html">用户组</a></li>
-<li><a href="&enbase;/community/webresources.html">Web 资源</a></li>
-</ul>
-</div> <!-- sidenav -->
-'>
+  <h2 class="blockhide">Section Navigation</h2>
 
+  <ul>
+    <li><a href="&base;/community.html">社区</a></li>
+    <li><a href="&enbase;/community/mailinglists.html">邮件列表</a></li>
+    <li><a href="https://forums.FreeBSD.org/">论坛</a></li>
+    <li><a href="&enbase;/community/irc.html">IRC</a></li>
+    <li><a href="&enbase;/doc/en_US.ISO8859-1/books/handbook/eresources-news.html">新闻组</a></li>
+    <li><a href="&enbase;/usergroups.html">用户组</a></li>
+    <li><a href="https://planet.FreeBSD.org/">博客</a></li>
+    <li><a href="&enbase;/events/events.html">近期活动</a></li>
+    <li><a href="&enbase;/community/webresources.html">Web 资源</a></li>
+    <li><a href="http://serverfault.com/questions/tagged/freebsd">常见问题解答（外部链接）</a></li>
+  </ul>
+</div> <!-- SIDENAV -->'>
+
 <!ENTITY nav.developers '
 <div xmlns="http://www.w3.org/1999/xhtml" id="sidenav">
-<h2 class="blockhide">Section Navigation</h2>
-<ul>
-<li><a href="&enbase;/projects/index.html">开发</a></li>
-<li><a href="&enbase;/doc/zh_CN.UTF-8/books/developers-handbook">开发手册</a></li>
-<li><a href="&enbase;/doc/zh_CN.UTF-8/books/porters-handbook">Porter 手册</a></li>
-<li><a href="&enbase;/developers/cvs.html">CVS 代码库</a></li>
-<li><a href="&enbase;/releng/index.html">交付工程</a></li>
-<li><a href="&base;/platforms/">平台</a>
-	<ul>
-		<li><a href="&base;/platforms/alpha.html">alpha</a></li>
-		<li><a href="&base;/platforms/amd64.html">amd64</a></li>
-		<li><a href="&base;/platforms/arm.html">ARM</a></li>
-		<li><a href="&base;/platforms/i386.html">i386</a></li>
-		<li><a href="&base;/platforms/ia64/index.html">ia64</a></li>
-		<li><a href="&base;/platforms/mips.html">MIPS</a></li>
-		<li><a href="&base;/platforms/pc98.html">pc98</a></li>
-		<li><a href="&base;/platforms/ppc.html">ppc</a></li>
-		<li><a href="&base;/platforms/sparc.html">sparc64</a></li>
-		<li><a href="&base;/platforms/xbox.html">xbox</a></li>
-	</ul>
-</li>
-<li><a href="&base;/projects/ideas/">项目新点子</a></li>
-<li><a href="&enbase;/doc/zh_CN.UTF-8/articles/contributing/index.html">为 FreeBSD 提供帮助</a></li>
-</ul>
-</div> <!-- sidenav -->
-'>
+  <h2 class="blockhide">Section Navigation</h2>
 
+  <ul>
+    <li><a href="&base;/projects/index.html">开发者</a></li>
+    <li><a href="&base;/doc/en_US.ISO8859-1/books/developers-handbook">开发者手册</a></li>
+    <li><a href="&base;/doc/en_US.ISO8859-1/books/porters-handbook">Porter 手册</a></li>
+    <li><a href="&base;/developers/cvs.html">Source code repositories</a></li>
+    <li><a href="&base;/releng/index.html">发布工程</a></li>
+    <li><a href="&base;/platforms/">平台</a></li>
+    <li><a href="https://wiki.FreeBSD.org/IdeasPage">项目新点子</a></li>
+    <li><a href="&base;/doc/en_US.ISO8859-1/articles/contributing/index.html">贡献</a></li>
+  </ul>
+</div> <!-- SIDENAV -->'>
+
 <!ENTITY nav.docs '
 <div xmlns="http://www.w3.org/1999/xhtml" id="sidenav">
-<h2 class="blockhide">Section Navigation</h2>
-<ul>
-<li><a href="&base;/docs.html">文档</a></li>
-<li><a href="&enbase;/doc/zh_CN.UTF-8/books/faq/">FAQ</a></li>
-<li><a href="&enbase;/doc/zh_CN.UTF-8/books/handbook/">使用手册</a></li>
-<li><a href="&cgibase;/man.cgi">联机手册</a></li>
-<li><a href="&enbase;/docs/books.html">在线图书和文章</a></li>
-<li><a href="&enbase;/marketing/">市场文宣</a></li>
-<li><a href="&enbase;/publish.html">出版物</a></li>
-<li><a href="&enbase;/docs/webresources.html">Web 资源</a></li>
-<li><a href="&enbase;/projects/newbies.html">新手上路</a></li>
-<li><a href="&enbase;/docproj/">FreeBSD 文档计划</a></li>
-</ul>
-</div> <!-- sidenav -->
-'>
+  <h2 class="blockhide">Section Navigation</h2>
 
-<![ %beta.testing; [
+  <ul>
+    <li><a href="&base;/docs.html">文档</a></li>
+    <li><a href="&enbase;/doc/en_US.ISO8859-1/books/faq/">常见问题解答</a></li>
+    <li><a href="&enbase;/doc/en_US.ISO8859-1/books/handbook/">使用手册</a></li>
+    <li><a href="&cgibase;/man.cgi">Man 手册</a></li>
+    <li><a href="&enbase;/docs/books.html">在线图书和文章</a></li>
+    <li><a href="&enbase;/publish.html">出版物</a></li>
+    <li><a href="&enbase;/docs/webresources.html">Web 资源</a></li>
+    <li><a href="&enbase;/projects/newbies.html">新手上路</a></li>
+    <li><a href="&enbase;/docproj/">文档计划</a></li>
+    <li><a href="https://docs.freebsd.org/doc/">已归档的文档</a></li>
+  </ul>
+</div> <!-- SIDENAV -->'>
+
+<![ %beta.upcoming; [
 <!ENTITY beta.listitem '
-  <li xmlns="http://www.w3.org/1999/xhtml"><a href="&enbase;/&u.betarel.schedule;">将发布的版本：: &betarel.current;</a></li>
+  <li xmlns="http://www.w3.org/1999/xhtml">即将发布:<br /><a href="&u.betarel.schedule;">&betarel.current;</a></li>
 '>
 ]]>
 <!ENTITY beta.listitem ''>
 
-<![ %beta2.testing; [
+<![ %beta2.upcoming; [
 <!ENTITY beta2.listitem '
-  <li xmlns="http://www.w3.org/1999/xhtml"><a href="&u.betarel2.schedule;">将发布的版本：: &betarel2.current;</a></li>
+  <li xmlns="http://www.w3.org/1999/xhtml">即将发布:<br /><a href="&u.betarel2.schedule;">&betarel2.current;</a></li>
 '>
 ]]>
 <!ENTITY beta2.listitem ''>
 
 <!ENTITY nav.download '
 <div xmlns="http://www.w3.org/1999/xhtml" id="sidenav">
-<h2 class="blockhide">Section Navigation</h2>
-<ul>
-<li><a href="&base;/where.html">获得 FreeBSD</a></li>
-<li><a href="&base;/releases/">发行版信息</a>
-	<ul>
-		<li><a href="&enbase;/&u.rel.announce;">生产适用版： &rel.current;</a></li>
-		<li><a href="&enbase;/&u.rel2.announce;">生产适用版 (旧式)： &rel2.current;</a></li>
-		<li><a href="&enbase;/snapshots/">快照版本</a></li>
-		&beta.listitem;
-		&beta2.listitem;
-	</ul>
-</li>
-<li><a href="&enbase;/ports/">移植的应用程序 (ports)</a></li>
-</ul>
-</div> <!-- sidenav -->
-'>
+  <h2 class="blockhide">Section Navigation</h2>
+  <ul>
+    <li><a href="&base;/where.html">获取 FreeBSD</a></li>
+    <li><a href="&base;/releases/">发行版信息</a>
+      <ul>
+	<li>生产适用版本: <br />
+	  <a href="&u.rel.announce;">&rel.current;</a></li>
+	<li>生产适用版本: <br />
+	  <a href="&u.rel1.announce;">&rel1.current;</a></li>
+	<li>生产适用版本: <br />
+	  <a href="&u.rel2.announce;">&rel2.current;</a></li>
+      </ul>
+    </li>
+    <li><a href="&enbase;/snapshots/">快照版本</a>
+      <ul>
+	&beta.listitem;
+	&beta2.listitem;
+      </ul>
+    </li>
+    <li><a href="&enbase;/ports/">移植的应用程序 (ports)</a></li>
+  </ul>
+</div> <!-- SIDENAV -->'>
 
-<!ENTITY nav.gnome ''>
+<!ENTITY nav.gnome '
+<div xmlns="http://www.w3.org/1999/xhtml" id="sidenav">
+  <h2 class="blockhide">Section Navigation</h2>
 
+  <ul>
+    <li><a href="&enbase;/gnome/index.html">GNOME</a>
+      <ul>
+        <li><a href="&enbase;/gnome/docs/faq2.html#q1">安装说明</a></li>
+        <li><a href="&enbase;/gnome/docs/faq232.html#q2">升级说明</a></li>
+        <li><a href="&enbase;/gnome/../ports/gnome.html">可用的程序</a></li>
+        <li><a href="&enbase;/gnome/docs/volunteer.html">如何参与贡献</a></li>
+        <li><a href="&enbase;/gnome/docs/bugging.html">Bug 报告</a></li>
+        <li><a href="&enbase;/gnome/screenshots.html">截图</a></li>
+        <li><a href="&enbase;/gnome/contact.html">联系我们</a></li>
+      </ul></li>
+    <li><a href="&enbase;/gnome/index.html">文档</a>
+      <ul>
+        <li><a href="&enbase;/gnome/docs/faq2.html">常见问题解答</a></li>
+	<li><a href="&enbase;/gnome/docs/halfaq.html">HAL 常见问题解答</a></li>
+        <li><a href="&enbase;/gnome/docs/faq232.html">从 2.30 升级到 2.32 的常见问题解答</a></li>
+        <li><a href="&enbase;/gnome/docs/develfaq.html">开发分支的常见问题解答</a></li>
+        <li><a href="&enbase;/gnome/docs/porting.html">创建 ports</a></li>
+        <li><a href="&enbase;/gnome/docs/faq232.html#q4">已知问题</a></li>
+      </ul></li>
+    </ul>
+</div> <!-- SIDENAV -->'>
+
 <!ENTITY nav.ports '
 <div xmlns="http://www.w3.org/1999/xhtml" id="sidenav">
-<h2 class="blockhide">Section Navigation</h2>
-<ul>
-<li><a href="&enbase;/ports/index.html">关于 ports</a></li>
-<li><a href="&enbase;/ports/installing.html">安装</a></li>
-<li><a href="&enbase;/ports/updating.html">更新</a></li>
-<li><a href="&enbase;/ports/searching.html">搜索</a></li>
-<li>&nbsp;&nbsp;&nbsp;&nbsp;目录
-	<ul>
-		<li><a href="&enbase;/ports/categories-alpha.html">按字母序</a></li>
-		<li><a href="&enbase;/ports/categories-grouped.html">按逻辑分类序</a></li>
-	</ul>
-</li>
-<li><a href="&enbase;/ports/master-index.html">全部 Ports</a></li>
-<li><a href="&enbase;/ports/references.html">更多信息</a></li>
-</ul>
-</div> <!-- sidenav -->
-'>
+  <h2 class="blockhide">Section Navigation</h2>
+  <ul>
+    <li><a href="&enbase;/ports/index.html">关于 ports</a></li>
+    <li><a href="&enbase;/ports/installing.html">安装</a></li>
+    <li><a href="&enbase;/ports/updating.html">更新</a></li>
+    <li><a href="&enbase;/ports/searching.html">搜索</a></li>
+    <li>&nbsp;&nbsp;&nbsp;目录
+      <ul>
+        <li><a href="&enbase;/ports/categories-alpha.html"></a>按字母序</li>
+        <li><a href="&enbase;/ports/categories-grouped.html">按逻辑分类序</a></li>
+      </ul></li>
+    <li><a href="&enbase;/ports/master-index.html">所有 ports 列表</a></li>
+    <li><a href="&enbase;/ports/references.html">更多信息</a></li>
+  </ul>
+</div> <!-- SIDENAV -->'>
 
 <!ENTITY nav.support '
 <div xmlns="http://www.w3.org/1999/xhtml" id="sidenav">
-<h2 class="blockhide">Section Navigation</h2>
-<ul>
-<li><a href="&enbase;/support.html">支持</a></li>
-<li><a href="&enbase;/commercial/">商业产品</a>
-	<ul>
-		<li><a href="&enbase;/commercial/software_bycat.html">软件</a></li>
-		<li><a href="&enbase;/commercial/hardware.html">硬件</a></li>
-		<li><a href="&enbase;/commercial/consult_bycat.html">咨询</a></li>
-		<li><a href="&enbase;/commercial/isp.html">Internet 服务</a></li>
-		<li><a href="&enbase;/commercial/misc.html">其它</a></li>
-	</ul>
-</li>
-<li><a href="&base;/security/">安全信息</a></li>
-<li><a href="&enbase;/support/bugreports.html">Bug 报告</a>
-	<ul>
-		<li><a href="&enbase;/send-pr.html">提交问题报告</a></li>
-	</ul>
-</li>
-<li><a href="&enbase;/support/webresources.html">Web 资源</a></li>
-</ul>
-</div> <!-- sidenav -->
-'>
+  <h2 class="blockhide">Section Navigation</h2>
+
+  <ul>
+    <li><a href="&base;/support.html">支持</a></li>
+    <li><a href="&enbase;/commercial/">商业产品</a>
+    <ul>
+      <li><a href="&enbase;/commercial/software_bycat.html">软件</a></li>
+      <li><a href="&enbase;/commercial/hardware.html">硬件</a></li>
+      <li><a href="&enbase;/commercial/consult_bycat.html">咨询</a></li>
+      <li><a href="&enbase;/commercial/isp.html">网络服务提供商</a></li>
+      <li><a href="&enbase;/commercial/misc.html">其它</a></li>
+    </ul></li>
+    <li><a href="&base;/security/index.html">安全信息</a>
+    <ul>
+      <li><a href="&enbase;/security/advisories.html">安全公告</a></li>
+      <li><a href="&enbase;/security/notices.html">勘误</a></li>
+      <li><a href="&base;/security/index.html#sup">支持的发行版本</a></li>
+      <li><a href="&enbase;/security/unsupported.html">不再支持的发行版本</a></li>
+      <li><a href="&base;/doc/en_US.ISO8859-1/books/handbook/security-advisories.html">
+	如何阅读 FreeBSD 安全公告</a></li>
+      <li><a href="&base;/security/charter.html">安全长官与安全团队宪章</a></li>
+    </ul></li>
+    <li><a href="&enbase;/support/bugreports.html">Bug 报告</a>
+      <ul>
+	<li><a href="https://bugs.FreeBSD.org/submit/">提交问题报告</a></li>
+      </ul></li>
+    <li><a href="&enbase;/support/webresources.html">Web 资源</a></li>
+  </ul>
+</div> <!-- SIDENAV -->'>
+
+<!--
+<!ENTITY % navinclude.about "IGNORE">
+<![%navinclude.about;[
+<!ENTITY nav '&nav.about;'>
+]]>
+<!ENTITY % navinclude.community "IGNORE">
+<![%navinclude.community;[
+<!ENTITY nav '&nav.community;'>
+]]>
+<!ENTITY % navinclude.developers "IGNORE">
+<![%navinclude.developers;[
+<!ENTITY nav '&nav.developers;'>
+]]>
+<!ENTITY % navinclude.docs "IGNORE">
+<![%navinclude.docs;[
+<!ENTITY nav '&nav.docs;'>
+]]>
+<!ENTITY % navinclude.download "IGNORE">
+<![%navinclude.download;[
+<!ENTITY nav '&nav.download;'>
+]>
+<!ENTITY % navinclude.gnome "IGNORE">
+<![%navinclude.gnome;[
+<!ENTITY nav '&nav.gnome;'>
+]]>
+<!ENTITY % navinclude.ports "IGNORE">
+<![%navinclude.ports;[
+<!ENTITY nav '&nav.ports;'>
+]]>
+<!ENTITY % navinclude.support "IGNORE">
+<![%navinclude.support;[
+<!ENTITY nav '&nav.support;'>
+]]>
+-->
+<!ENTITY nav ''>