Index: head/zh_TW.UTF-8/share/xml/navibar.l10n.ent
===================================================================
--- head/zh_TW.UTF-8/share/xml/navibar.l10n.ent	(revision 50648)
+++ head/zh_TW.UTF-8/share/xml/navibar.l10n.ent	(revision 50649)
@@ -1,172 +1,180 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $FreeBSD$
 
   The FreeBSD Traditional Chinese Project
   Original Revision: 1.11
 -->
 
 <!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">Internet</a></li>
-<li><a href="&base;/advocacy/">提倡</a></li>
-<li><a href="&enbase;/marketing/">市場</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="&base;/art.html">插圖</a></li>
-<li><a href="&base;/logo.html">Logo</a></li>
-<li><a href="&base;/donations/">捐贈</a></li>
-<li><a href="&base;/copyright/">法律須知</a></li>
+  <h2 class="blockhide">Section Navigation</h2>
+
+  <ul>
+    <li><a href="&base;/about.html">關於</a></li>
+    <li><a href="&enbase;/features.html">特色</a></li>
+    <li><a href="&base;/applications.html">應用程式</a></li>
+    <li><a href="&enbase;/advocacy/">宣傳</a></li>
+    <li><a href="&enbase;/marketing/">行銷</a></li>
+    <li><a href="&base;/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="&base;/multimedia/multimedia.html">多媒體</a></li>
+    <li><a href="&base;/art.html">插圖</a></li>
+    <li><a href="&base;/logo.html">Logo</a></li>
+    <li><a href="&enbase;/donations/">捐贈</a></li>
+    <li><a href="&enbase;/copyright/">法律須知</a></li>
+    <li><a href="&base;/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">newsgroup</a></li>
-<li><a href="&enbase;/usergroups.html">愛用者組織</a></li>
-<li><a href="&enbase;/community/webresources.html">Web 資源</a></li>
-</ul>
+  <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;/community/newsgroups.html">newsgroup</a></li>
+    <li><a href="&enbase;/usergroups.html">愛用者組織</a></li>
+    <li><a href="https://planet.FreeBSD.org/">部落格</a></li>
+    <li><a href="&base;/events/events.html">近期活動</a></li>
+    <li><a href="&enbase;/community/webresources.html">Web 資源</a></li>
+    <li><a href="http://serverfault.com/questions/tagged/freebsd">Q&amp;A (外部資源)</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_TW.UTF-8/books/developers-handbook">開發手冊</a></li>
-<li><a href="&enbase;/doc/zh_TW.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">Release Engineering</a></li>
-<li><a href="&base;/platforms/">平台</a>
-	<ul>
-		<li><a href="&enbase;/platforms/alpha.html">alpha</a></li>
-		<li><a href="&enbase;/platforms/amd64.html">amd64</a></li>
-		<li><a href="&enbase;/platforms/arm.html">ARM</a></li>
-		<li><a href="&enbase;/platforms/i386.html">i386</a></li>
-		<li><a href="&enbase;/platforms/ia64/index.html">ia64</a></li>
-		<li><a href="&enbase;/platforms/mips.html">MIPS</a></li>
-		<li><a href="&enbase;/platforms/pc98.html">pc98</a></li>
-		<li><a href="&enbase;/platforms/ppc.html">ppc</a></li>
-		<li><a href="&enbase;/platforms/sparc.html">sparc64</a></li>
-		<li><a href="&enbase;/platforms/xbox.html">xbox</a></li>
-	</ul>
-</li>
-<li><a href="&base;/projects/ideas/">新點子計劃</a></li>
-<li><a href="&enbase;/doc/zh_TW.UTF-8/articles/contributing/index.html">為 FreeBSD 提供幫助</a></li>
-</ul>
+  <h2 class="blockhide">Section Navigation</h2>
+
+  <ul>
+    <li><a href="&enbase;/projects/index.html">開發者</a></li>
+    <li><a href="&enbase;/doc/zh_TW.UTF-8/books/developers-handbook">Developer 手冊</a></li>
+    <li><a href="&enbase;/doc/zh_TW.UTF-8/books/porters-handbook">Porter 手冊</a></li>
+    <li><a href="&enbase;/developers/cvs.html">原始碼庫</a></li>
+    <li><a href="&enbase;/releng/index.html">Release Engineering</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">貢獻 FreeBSD </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_TW.UTF-8/books/faq/">FAQ</a></li>
-<li><a href="&enbase;/doc/zh_TW.UTF-8/books/handbook/">使用手冊</a></li>
-<li><a href="&cgibase;/man.cgi">Manual 查閱</a></li>
-<li><a href="&base;/docs/books.html">網路文章</a></li>
-<li><a href="&enbase;/marketing/">市場文宣</a></li>
-<li><a href="&enbase;/publish.html">實體書本</a></li>
-<li><a href="&base;/docs/webresources.html">Web 資源</a></li>
-<li><a href="&enbase;/projects/newbies.html">新手上路</a></li>
-<li><a href="&enbase;/docproj/">FreeBSD 文件計劃</a></li>
-</ul>
+  <h2 class="blockhide">Section Navigation</h2>
+
+  <ul>
+    <li><a href="&base;/docs.html">文件</a></li>
+    <li><a href="&enbase;/doc/zh_TW.UTF-8/books/faq/">FAQ</a></li>
+    <li><a href="&enbase;/doc/zh_TW.UTF-8/books/handbook/">使用手冊</a></li>
+    <li><a href="&cgibase;/man.cgi">Manual 查閱</a></li>
+    <li><a href="&base;/docs/books.html">線上手冊與文章</a></li>
+    <li><a href="&enbase;/publish.html">實體出版品</a></li>
+    <li><a href="&base;/docs/webresources.html">Web 資源</a></li>
+    <li><a href="&enbase;/projects/newbies.html">新手上路</a></li>
+    <li><a href="&enbase;/docproj/">FreeBSD 文件計劃</a></li>
+    <li><a href="https://docs.freebsd.org/doc/">Archive</a></li>
+  </ul>
 </div> <!-- sidenav -->
 '>
 
-<![ %beta.testing; [
+<![ %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="&enbase;/&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="&enbase;/&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="&enbase;/releases/">發行資訊</a>
+  <h2 class="blockhide">Section Navigation</h2>
+  <ul>
+    <li><a href="&base;/where.html">取得 FreeBSD</a></li>
+    <li><a href="&enbase;/releases/">發行資訊</a>
       <ul>
 	<li>Production Release: <br />
 	  <a href="&enbase;/&u.rel.announce;">&rel.current;</a></li>
 	<li>Production Release: <br />
 	  <a href="&enbase;/&u.rel0.announce;">&rel0.current;</a></li>
+	<li>Production Release: <br />
+	  <a href="&u.rel1.announce;">&rel1.current;</a></li>
+	<li>即將發佈: <br />
+	  <a href="&u.betarel2.schedule;">&betarel2.current;</a></li>
       </ul>
-</li>
+    </li>
     <li><a href="&enbase;/snapshots/">開發快照</a>
       <ul>
 	&beta.listitem;
 	&beta2.listitem;
       </ul>
     </li>
-<li><a href="&enbase;/ports/">移植的應用程式(ports)</a></li>
-</ul>
+    <li><a href="&enbase;/ports/">移植的應用程式(ports)</a></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>
+  <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="&base;/send-pr.html">提交問題報告</a></li>
-	</ul>
-</li>
-<li><a href="&enbase;/support/webresources.html">Web 資源</a></li>
-</ul>
+  <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="&enbase;/security/">安全資訊</a></li>
+    <ul>
+      <li><a href="&enbase;/security/advisories.html">公告</a></li>
+      <li><a href="&enbase;/security/notices.html">勘誤注意事項</a></li>
+      <li><a href="&enbase;/security/index.html#sup">支援版本</a></li>
+      <li><a href="&enbase;/security/unsupported.html">不支援版本</a></li>
+      <li><a href="&enbase;/doc/en_US.ISO8859-1/books/handbook/security-advisories.html">
+	如何閱讀 FreeBSD 安全公告</a></li>
+      <li><a href="&enbase;/security/charter.html">Security Officer 與團隊的特許權</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">網路資源</a></li>
+  </ul>
 </div> <!-- sidenav -->
 '>