Update PO templates for Chinese

CVS version numbers

chinese/po/blends.zh.po: 1.1 -> 1.2 
chinese/po/bugs.zh.po: 1.8 -> 1.9 
chinese/po/countries.zh.po: 1.12 -> 1.13 
chinese/po/distrib.zh.po: 1.7 -> 1.8 
chinese/po/doc.zh.po: 1.7 -> 1.8 
chinese/po/mailinglists.zh.po: 1.6 -> 1.7 
chinese/po/organization.zh.po: 1.10 -> 1.11 
chinese/po/others.zh.po: 1.20 -> 1.21 
chinese/po/ports.zh.po: 1.7 -> 1.8 
chinese/po/stats.zh.po: 1.5 -> 1.6 
chinese/po/templates.zh.po: 1.30 -> 1.31 
chinese/po/vendors.zh.po: 1.10 -> 1.11

12 files changed, 723 insertions, 699 deletions

diff --git a/chinese/po/blends.zh.po b/chinese/po/blends.zh.po
index 6dec3ca77ca..c052a161317 100644
--- a/chinese/po/blends.zh.po
+++ b/chinese/po/blends.zh.po
@@ -2,15 +2,14 @@
 # Boyuan Yang <073plan@gmail.com>, 2016.
 msgid ""
 msgstr ""
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
 "Project-Id-Version: Debian webwml organization\n"
 "PO-Revision-Date: 2016-11-27 11:50+0800\n"
 "Last-Translator: Boyuan Yang <073plan@gmail.com>\n"
-"Language-Team: Debian Chinese Team <debian-l10n-chinese@lists."
-"debian.org>\n"
-"MIME-Version: 1.0\n"
+"Language-Team: Debian Chinese Team <debian-l10n-chinese@lists.debian.org>\n"
 "Language: zh\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Poedit 1.8.11\n"
 
diff --git a/chinese/po/bugs.zh.po b/chinese/po/bugs.zh.po
index a07ca642127..222dc747400 100644
--- a/chinese/po/bugs.zh.po
+++ b/chinese/po/bugs.zh.po
@@ -156,146 +156,146 @@ msgstr "已歸檔"
 msgid "Archived and Unarchived"
 msgstr "已歸檔與未歸檔"
 
-#~ msgid "Exclude tag:"
-#~ msgstr "不包括標簽:"
-
-#~ msgid "Include tag:"
-#~ msgstr "包括標簽:"
+#~ msgid "Flags:"
+#~ msgstr "標記:"
 
-#~ msgid "lfs"
-#~ msgstr "lfs"
+#~ msgid "active bugs"
+#~ msgstr "未解決"
 
-#~ msgid "ipv6"
-#~ msgstr "ipv6"
+#~ msgid "display merged bugs only once"
+#~ msgstr "已合並的報告只顯示一次"
 
-#~ msgid "wontfix"
-#~ msgstr "不予修正 (wontfix)"
+#~ msgid "no ordering by status or severity"
+#~ msgstr "不按狀態或者嚴重性排序"
 
-#~ msgid "upstream"
-#~ msgstr "上遊 (upstream)"
+#~ msgid "don't show table of contents in the header"
+#~ msgstr "不在頁面開始處顯示目錄"
 
-#~ msgid "unreproducible"
-#~ msgstr "不可再現 (unreproducible)"
+#~ msgid "don't show statistics in the footer"
+#~ msgstr "不在頁腳處顯示統計結果"
 
-#~ msgid "security"
-#~ msgstr "安全性 (security)"
+#~ msgid "proposed-updates"
+#~ msgstr "proposed-updates"
 
-#~ msgid "patch"
-#~ msgstr "補丁 (patch)"
+#~ msgid "testing-proposed-updates"
+#~ msgstr "testing-proposed-updates"
 
-#~ msgid "moreinfo"
-#~ msgstr "附加信息 (moreinfo)"
+#~ msgid "Package version:"
+#~ msgstr "軟件包版本號:"
 
-#~ msgid "l10n"
-#~ msgstr "本地化 (l10n)"
+#~ msgid "Distribution:"
+#~ msgstr "發行版:"
 
-#~ msgid "help"
-#~ msgstr "幫助文檔 (help)"
+#~ msgid "bugs"
+#~ msgstr "數量"
 
-#~ msgid "fixed-upstream"
-#~ msgstr "已修正于上遊 (fixed-upstream)"
+#~ msgid "open"
+#~ msgstr "未解決"
 
-#~ msgid "fixed-in-experimental"
-#~ msgstr "已修正于 experimental (fixed-in-experimental)"
+#~ msgid "forwarded"
+#~ msgstr "已移交"
 
-#~ msgid "d-i"
-#~ msgstr "安裝程序 (d-i)"
+#~ msgid "pending"
+#~ msgstr "待完工"
 
-#~ msgid "confirmed"
-#~ msgstr "通過確認 (confirmed)"
+#~ msgid "fixed"
+#~ msgstr "已修正"
 
-#~ msgid "sid"
-#~ msgstr "sid"
+#~ msgid "done"
+#~ msgstr "已完工"
 
-#~ msgid "etch-ignore"
-#~ msgstr "etch-ignore"
+#~ msgid "Include status:"
+#~ msgstr "包括狀態:"
 
-#~ msgid "etch"
-#~ msgstr "etch"
+#~ msgid "Exclude status:"
+#~ msgstr "不包括狀態:"
 
-#~ msgid "sarge-ignore"
-#~ msgstr "sarge-ignore"
+#~ msgid "critical"
+#~ msgstr "致命"
 
-#~ msgid "woody"
-#~ msgstr "woody"
+#~ msgid "grave"
+#~ msgstr "危險"
 
-#~ msgid "potato"
-#~ msgstr "potato"
+#~ msgid "serious"
+#~ msgstr "嚴重"
 
-#~ msgid "Exclude severity:"
-#~ msgstr "不包括優先級:"
+#~ msgid "important"
+#~ msgstr "重要"
 
-#~ msgid "Include severity:"
-#~ msgstr "包括優先級:"
+#~ msgid "minor"
+#~ msgstr "輕微"
 
 #~ msgid "wishlist"
 #~ msgstr "[CN:小意思:][HKTW:心願:]"
 
-#~ msgid "minor"
-#~ msgstr "輕微"
+#~ msgid "Include severity:"
+#~ msgstr "包括優先級:"
 
-#~ msgid "important"
-#~ msgstr "重要"
+#~ msgid "Exclude severity:"
+#~ msgstr "不包括優先級:"
 
-#~ msgid "serious"
-#~ msgstr "嚴重"
+#~ msgid "potato"
+#~ msgstr "potato"
 
-#~ msgid "grave"
-#~ msgstr "危險"
+#~ msgid "woody"
+#~ msgstr "woody"
 
-#~ msgid "critical"
-#~ msgstr "致命"
+#~ msgid "sarge-ignore"
+#~ msgstr "sarge-ignore"
 
-#~ msgid "Exclude status:"
-#~ msgstr "不包括狀態:"
+#~ msgid "etch"
+#~ msgstr "etch"
 
-#~ msgid "Include status:"
-#~ msgstr "包括狀態:"
+#~ msgid "etch-ignore"
+#~ msgstr "etch-ignore"
 
-#~ msgid "done"
-#~ msgstr "已完工"
+#~ msgid "sid"
+#~ msgstr "sid"
 
-#~ msgid "fixed"
-#~ msgstr "已修正"
+#~ msgid "confirmed"
+#~ msgstr "通過確認 (confirmed)"
 
-#~ msgid "pending"
-#~ msgstr "待完工"
+#~ msgid "d-i"
+#~ msgstr "安裝程序 (d-i)"
 
-#~ msgid "forwarded"
-#~ msgstr "已移交"
+#~ msgid "fixed-in-experimental"
+#~ msgstr "已修正于 experimental (fixed-in-experimental)"
 
-#~ msgid "open"
-#~ msgstr "未解決"
+#~ msgid "fixed-upstream"
+#~ msgstr "已修正于上遊 (fixed-upstream)"
 
-#~ msgid "bugs"
-#~ msgstr "數量"
+#~ msgid "help"
+#~ msgstr "幫助文檔 (help)"
 
-#~ msgid "Distribution:"
-#~ msgstr "發行版:"
+#~ msgid "l10n"
+#~ msgstr "本地化 (l10n)"
 
-#~ msgid "Package version:"
-#~ msgstr "軟件包版本號:"
+#~ msgid "moreinfo"
+#~ msgstr "附加信息 (moreinfo)"
 
-#~ msgid "testing-proposed-updates"
-#~ msgstr "testing-proposed-updates"
+#~ msgid "patch"
+#~ msgstr "補丁 (patch)"
 
-#~ msgid "proposed-updates"
-#~ msgstr "proposed-updates"
+#~ msgid "security"
+#~ msgstr "安全性 (security)"
 
-#~ msgid "don't show statistics in the footer"
-#~ msgstr "不在頁腳處顯示統計結果"
+#~ msgid "unreproducible"
+#~ msgstr "不可再現 (unreproducible)"
 
-#~ msgid "don't show table of contents in the header"
-#~ msgstr "不在頁面開始處顯示目錄"
+#~ msgid "upstream"
+#~ msgstr "上遊 (upstream)"
 
-#~ msgid "no ordering by status or severity"
-#~ msgstr "不按狀態或者嚴重性排序"
+#~ msgid "wontfix"
+#~ msgstr "不予修正 (wontfix)"
 
-#~ msgid "display merged bugs only once"
-#~ msgstr "已合並的報告只顯示一次"
+#~ msgid "ipv6"
+#~ msgstr "ipv6"
 
-#~ msgid "active bugs"
-#~ msgstr "未解決"
+#~ msgid "lfs"
+#~ msgstr "lfs"
 
-#~ msgid "Flags:"
-#~ msgstr "標記:"
+#~ msgid "Include tag:"
+#~ msgstr "包括標簽:"
+
+#~ msgid "Exclude tag:"
+#~ msgstr "不包括標簽:"
diff --git a/chinese/po/countries.zh.po b/chinese/po/countries.zh.po
index 4ac20c6a797..062c399ac62 100644
--- a/chinese/po/countries.zh.po
+++ b/chinese/po/countries.zh.po
@@ -331,99 +331,103 @@ msgid "Portugal"
 msgstr "葡萄牙"
 
 #: ../../english/template/debian/countries.wml:351
+msgid "Réunion"
+msgstr ""
+
+#: ../../english/template/debian/countries.wml:354
 msgid "Romania"
 msgstr "羅馬尼亞"
 
-#: ../../english/template/debian/countries.wml:354
+#: ../../english/template/debian/countries.wml:357
 msgid "Serbia"
 msgstr "塞爾維亞"
 
-#: ../../english/template/debian/countries.wml:357
+#: ../../english/template/debian/countries.wml:360
 msgid "Russia"
 msgstr "俄國"
 
-#: ../../english/template/debian/countries.wml:360
+#: ../../english/template/debian/countries.wml:363
 msgid "Saudi Arabia"
 msgstr "沙地阿拉伯"
 
-#: ../../english/template/debian/countries.wml:363
+#: ../../english/template/debian/countries.wml:366
 msgid "Sweden"
 msgstr "瑞典"
 
-#: ../../english/template/debian/countries.wml:366
+#: ../../english/template/debian/countries.wml:369
 msgid "Singapore"
 msgstr "新加坡"
 
-#: ../../english/template/debian/countries.wml:369
+#: ../../english/template/debian/countries.wml:372
 msgid "Slovenia"
 msgstr "斯洛文尼亞"
 
-#: ../../english/template/debian/countries.wml:372
+#: ../../english/template/debian/countries.wml:375
 msgid "Slovakia"
 msgstr "斯洛伐克"
 
-#: ../../english/template/debian/countries.wml:375
+#: ../../english/template/debian/countries.wml:378
 msgid "El Salvador"
 msgstr "薩爾瓦多"
 
-#: ../../english/template/debian/countries.wml:378
+#: ../../english/template/debian/countries.wml:381
 msgid "Thailand"
 msgstr "泰國"
 
-#: ../../english/template/debian/countries.wml:381
+#: ../../english/template/debian/countries.wml:384
 msgid "Tajikistan"
 msgstr "塔吉克斯坦"
 
-#: ../../english/template/debian/countries.wml:384
+#: ../../english/template/debian/countries.wml:387
 msgid "Tunisia"
 msgstr "突尼西亞"
 
-#: ../../english/template/debian/countries.wml:387
+#: ../../english/template/debian/countries.wml:390
 msgid "Turkey"
 msgstr "土耳其"
 
-#: ../../english/template/debian/countries.wml:390
+#: ../../english/template/debian/countries.wml:393
 msgid "Taiwan"
 msgstr "台灣"
 
-#: ../../english/template/debian/countries.wml:393
+#: ../../english/template/debian/countries.wml:396
 msgid "Ukraine"
 msgstr "烏克蘭"
 
-#: ../../english/template/debian/countries.wml:396
+#: ../../english/template/debian/countries.wml:399
 msgid "United States"
 msgstr "美國"
 
-#: ../../english/template/debian/countries.wml:399
+#: ../../english/template/debian/countries.wml:402
 msgid "Uruguay"
 msgstr "烏拉圭"
 
-#: ../../english/template/debian/countries.wml:402
+#: ../../english/template/debian/countries.wml:405
 msgid "Uzbekistan"
 msgstr "烏茲別克"
 
-#: ../../english/template/debian/countries.wml:405
+#: ../../english/template/debian/countries.wml:408
 msgid "Venezuela"
 msgstr "委內瑞拉"
 
-#: ../../english/template/debian/countries.wml:408
+#: ../../english/template/debian/countries.wml:411
 msgid "Vietnam"
 msgstr "越南"
 
-#: ../../english/template/debian/countries.wml:411
+#: ../../english/template/debian/countries.wml:414
 msgid "Vanuatu"
 msgstr "瓦努阿图"
 
-#: ../../english/template/debian/countries.wml:414
+#: ../../english/template/debian/countries.wml:417
 msgid "South Africa"
 msgstr "南非"
 
-#: ../../english/template/debian/countries.wml:417
+#: ../../english/template/debian/countries.wml:420
 msgid "Zimbabwe"
 msgstr "津巴布韦"
 
-#~ msgid "Yugoslavia"
-#~ msgstr "南斯拉夫"
-
 #~ msgid "Great Britain"
 #~ msgstr "英國"
+
+#~ msgid "Yugoslavia"
+#~ msgstr "南斯拉夫"
diff --git a/chinese/po/distrib.zh.po b/chinese/po/distrib.zh.po
index 6460835b981..8f97d3a784d 100644
--- a/chinese/po/distrib.zh.po
+++ b/chinese/po/distrib.zh.po
@@ -15,59 +15,49 @@ msgstr ""
 msgid "Keyword"
 msgstr "關鍵字"
 
-#: ../../english/distrib/search_contents-form.inc:11
-#: ../../english/distrib/search_packages-form.inc:10
-msgid "Search"
-msgstr "搜尋"
-
-#: ../../english/distrib/search_contents-form.inc:12
-#: ../../english/distrib/search_packages-form.inc:10
-msgid "Reset"
-msgstr "重設"
-
-#: ../../english/distrib/search_contents-form.inc:14
+#: ../../english/distrib/search_contents-form.inc:13
 msgid "Display"
 msgstr "顯示"
 
-#: ../../english/distrib/search_contents-form.inc:17
+#: ../../english/distrib/search_contents-form.inc:16
 msgid "paths ending with the keyword"
 msgstr "路徑結尾是關鍵字"
 
-#: ../../english/distrib/search_contents-form.inc:20
+#: ../../english/distrib/search_contents-form.inc:19
 msgid "packages that contain files named like this"
 msgstr "套件包含檔案"
 
-#: ../../english/distrib/search_contents-form.inc:23
+#: ../../english/distrib/search_contents-form.inc:22
 msgid "packages that contain files whose names contain the keyword"
 msgstr "套件檔案中包含關鍵字"
 
 #: ../../english/distrib/search_contents-form.inc:25
-#: ../../english/distrib/search_packages-form.inc:23
+#: ../../english/distrib/search_packages-form.inc:25
 msgid "Distribution"
 msgstr "發行版"
 
 #: ../../english/distrib/search_contents-form.inc:27
-#: ../../english/distrib/search_packages-form.inc:25
+#: ../../english/distrib/search_packages-form.inc:27
 msgid "experimental"
 msgstr "experimental"
 
 #: ../../english/distrib/search_contents-form.inc:28
-#: ../../english/distrib/search_packages-form.inc:26
+#: ../../english/distrib/search_packages-form.inc:28
 msgid "unstable"
 msgstr "unstable"
 
 #: ../../english/distrib/search_contents-form.inc:29
-#: ../../english/distrib/search_packages-form.inc:27
+#: ../../english/distrib/search_packages-form.inc:29
 msgid "testing"
 msgstr "testing"
 
 #: ../../english/distrib/search_contents-form.inc:30
-#: ../../english/distrib/search_packages-form.inc:28
+#: ../../english/distrib/search_packages-form.inc:30
 msgid "stable"
 msgstr "stable"
 
 #: ../../english/distrib/search_contents-form.inc:31
-#: ../../english/distrib/search_packages-form.inc:29
+#: ../../english/distrib/search_packages-form.inc:31
 msgid "oldstable"
 msgstr "oldstable"
 
@@ -76,11 +66,21 @@ msgid "Architecture"
 msgstr "硬體架構"
 
 #: ../../english/distrib/search_contents-form.inc:38
-#: ../../english/distrib/search_packages-form.inc:30
-#: ../../english/distrib/search_packages-form.inc:37
+#: ../../english/distrib/search_packages-form.inc:32
+#: ../../english/distrib/search_packages-form.inc:39
 msgid "any"
 msgstr "any"
 
+#: ../../english/distrib/search_contents-form.inc:48
+#: ../../english/distrib/search_packages-form.inc:43
+msgid "Search"
+msgstr "搜尋"
+
+#: ../../english/distrib/search_contents-form.inc:49
+#: ../../english/distrib/search_packages-form.inc:44
+msgid "Reset"
+msgstr "重設"
+
 #: ../../english/distrib/search_packages-form.inc:12
 msgid "Search on"
 msgstr "僅搜尋"
@@ -97,23 +97,23 @@ msgstr "套件描述"
 msgid "Source package names"
 msgstr "源套件名稱"
 
-#: ../../english/distrib/search_packages-form.inc:20
+#: ../../english/distrib/search_packages-form.inc:21
 msgid "Only show exact matches"
 msgstr "僅顯示完全吻合結果"
 
-#: ../../english/distrib/search_packages-form.inc:32
+#: ../../english/distrib/search_packages-form.inc:34
 msgid "Section"
 msgstr "Section"
 
-#: ../../english/distrib/search_packages-form.inc:34
+#: ../../english/distrib/search_packages-form.inc:36
 msgid "main"
 msgstr "main"
 
-#: ../../english/distrib/search_packages-form.inc:35
+#: ../../english/distrib/search_packages-form.inc:37
 msgid "contrib"
 msgstr "contrib"
 
-#: ../../english/distrib/search_packages-form.inc:36
+#: ../../english/distrib/search_packages-form.inc:38
 msgid "non-free"
 msgstr "non-free"
 
@@ -136,11 +136,13 @@ msgid "64-bit ARM (AArch64)"
 msgstr "64位 PC(amd64)"
 
 #: ../../english/releases/arches.data:12
-msgid "EABI ARM"
+#, fuzzy
+#| msgid "EABI ARM"
+msgid "EABI ARM (armel)"
 msgstr "EABI ARM"
 
 #: ../../english/releases/arches.data:13
-msgid "Hard Float ABI ARM"
+msgid "Hard Float ABI ARM (armhf)"
 msgstr ""
 
 #: ../../english/releases/arches.data:14
@@ -176,25 +178,31 @@ msgid "MIPS (big endian)"
 msgstr "MIPS (big endian)"
 
 #: ../../english/releases/arches.data:22
-msgid "MIPS (little endian)"
+#, fuzzy
+#| msgid "MIPS (little endian)"
+msgid "64-bit MIPS (little endian)"
 msgstr "MIPS (little endian)"
 
 #: ../../english/releases/arches.data:23
+msgid "MIPS (little endian)"
+msgstr "MIPS (little endian)"
+
+#: ../../english/releases/arches.data:24
 msgid "PowerPC"
 msgstr "PowerPC"
 
-#: ../../english/releases/arches.data:24
+#: ../../english/releases/arches.data:25
 msgid "POWER Processors"
 msgstr ""
 
-#: ../../english/releases/arches.data:25
+#: ../../english/releases/arches.data:26
 msgid "IBM S/390"
 msgstr "IBM S/390"
 
-#: ../../english/releases/arches.data:26
+#: ../../english/releases/arches.data:27
 msgid "IBM System z"
 msgstr "IBM System z"
 
-#: ../../english/releases/arches.data:27
+#: ../../english/releases/arches.data:28
 msgid "SPARC"
 msgstr "SPARC"
diff --git a/chinese/po/doc.zh.po b/chinese/po/doc.zh.po
index 6bc688b0705..f5f23d0d902 100644
--- a/chinese/po/doc.zh.po
+++ b/chinese/po/doc.zh.po
@@ -367,7 +367,7 @@ msgstr "最新版本："
 msgid "(version <get-var version />)"
 msgstr "(version <get-var version />)"
 
-#: ../../english/doc/manuals.defs:138 ../../english/releases/arches.data:36
+#: ../../english/doc/manuals.defs:138 ../../english/releases/arches.data:37
 msgid "plain text"
 msgstr "純文字"
 
@@ -429,16 +429,29 @@ msgstr "Debian 套件"
 msgid "Debian package (archived)"
 msgstr "Debian 套件"
 
-#: ../../english/releases/arches.data:34
+#: ../../english/releases/arches.data:35
 msgid "HTML"
 msgstr ""
 
-#: ../../english/releases/arches.data:35
+#: ../../english/releases/arches.data:36
 msgid "PDF"
 msgstr ""
 
-#~ msgid "Language:"
-#~ msgstr "語言:"
+#~ msgid ""
+#~ "Use <a href=\"cvs\">SVN</a> to download the SGML source text for <get-var "
+#~ "ddp_pkg_loc />."
+#~ msgstr ""
+#~ "使用 <a href=\"cvs\">SVN</a> 來取得 <get-vard dp_pkg_loc /> 的 SGML 原始"
+#~ "檔。"
+
+#~ msgid ""
+#~ "<p>You can visit the current <a href=\"manuals/<get-var doc />/"
+#~ "\">development version</a> here, use <a href=\"cvs\">CVS</a> to download "
+#~ "the SGML source text."
+#~ msgstr ""
+#~ "<p>You can visit the current<a href=\"manuals/<get-var doc />/"
+#~ "\">development version</a> here,use <a href=\"cvs\">CVS</a> to download "
+#~ "the SGML source text."
 
 #~ msgid ""
 #~ "CVS sources working copy: <p>Login to the CVS server using the command:"
@@ -456,18 +469,5 @@ msgstr ""
 #~ "check out the sources, use the command:<br><pre>cvs -d:pserver:"
 #~ "anonymous@cvs.debian.org:/cvs/debian-policy co <get-var doc /></pre>"
 
-#~ msgid ""
-#~ "<p>You can visit the current <a href=\"manuals/<get-var doc />/"
-#~ "\">development version</a> here, use <a href=\"cvs\">CVS</a> to download "
-#~ "the SGML source text."
-#~ msgstr ""
-#~ "<p>You can visit the current<a href=\"manuals/<get-var doc />/"
-#~ "\">development version</a> here,use <a href=\"cvs\">CVS</a> to download "
-#~ "the SGML source text."
-
-#~ msgid ""
-#~ "Use <a href=\"cvs\">SVN</a> to download the SGML source text for <get-var "
-#~ "ddp_pkg_loc />."
-#~ msgstr ""
-#~ "使用 <a href=\"cvs\">SVN</a> 來取得 <get-vard dp_pkg_loc /> 的 SGML 原始"
-#~ "檔。"
+#~ msgid "Language:"
+#~ msgstr "語言:"
diff --git a/chinese/po/mailinglists.zh.po b/chinese/po/mailinglists.zh.po
index 38756c287f0..67d43c709c6 100644
--- a/chinese/po/mailinglists.zh.po
+++ b/chinese/po/mailinglists.zh.po
@@ -116,8 +116,8 @@ msgstr "公開"
 msgid "closed"
 msgstr "關閉"
 
-#~ msgid "Please select which lists you want to subscribe to:"
-#~ msgstr "請選擇您想要訂閱的郵件列表："
-
 #~ msgid "Please select which lists you want to unsubscribe from:"
 #~ msgstr "請選擇您要取消訂閱哪個列表："
+
+#~ msgid "Please select which lists you want to subscribe to:"
+#~ msgstr "請選擇您想要訂閱的郵件列表："
diff --git a/chinese/po/organization.zh.po b/chinese/po/organization.zh.po
index 4f99646de4c..17396f3e3b8 100644
--- a/chinese/po/organization.zh.po
+++ b/chinese/po/organization.zh.po
@@ -10,292 +10,292 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../english/intro/organization.data:13
+#: ../../english/intro/organization.data:15
 msgid "delegation mail"
 msgstr ""
 
-#: ../../english/intro/organization.data:14
+#: ../../english/intro/organization.data:16
 msgid "appointment mail"
 msgstr ""
 
 #. One male delegate
-#: ../../english/intro/organization.data:16
+#: ../../english/intro/organization.data:18
 msgid "<void id=\"male\"/>delegate"
 msgstr ""
 
 #. One female delegate
-#: ../../english/intro/organization.data:18
+#: ../../english/intro/organization.data:20
 msgid "<void id=\"female\"/>delegate"
 msgstr ""
 
-#: ../../english/intro/organization.data:21
 #: ../../english/intro/organization.data:23
+#: ../../english/intro/organization.data:25
 msgid "current"
 msgstr "目前"
 
-#: ../../english/intro/organization.data:25
 #: ../../english/intro/organization.data:27
+#: ../../english/intro/organization.data:29
 msgid "member"
 msgstr "會員"
 
-#: ../../english/intro/organization.data:30
+#: ../../english/intro/organization.data:32
 msgid "manager"
 msgstr "管理員"
 
-#: ../../english/intro/organization.data:32
+#: ../../english/intro/organization.data:34
 msgid "SRM"
 msgstr ""
 
-#: ../../english/intro/organization.data:32
+#: ../../english/intro/organization.data:34
 #, fuzzy
 #| msgid "Release Management"
 msgid "Stable Release Manager"
 msgstr "釋出管理"
 
-#: ../../english/intro/organization.data:34
+#: ../../english/intro/organization.data:36
 msgid "wizard"
 msgstr "巫師"
 
-#: ../../english/intro/organization.data:37
+#: ../../english/intro/organization.data:39
 msgid "chairman"
 msgstr "主席"
 
-#: ../../english/intro/organization.data:40
+#: ../../english/intro/organization.data:42
 msgid "assistant"
 msgstr "助理"
 
-#: ../../english/intro/organization.data:42
+#: ../../english/intro/organization.data:44
 msgid "secretary"
 msgstr "秘書"
 
-#: ../../english/intro/organization.data:51
-#: ../../english/intro/organization.data:60
+#: ../../english/intro/organization.data:53
+#: ../../english/intro/organization.data:62
 msgid "Officers"
 msgstr "總管"
 
-#: ../../english/intro/organization.data:52
-#: ../../english/intro/organization.data:77
+#: ../../english/intro/organization.data:54
+#: ../../english/intro/organization.data:79
 msgid "Distribution"
 msgstr "發行版"
 
-#: ../../english/intro/organization.data:53
-#: ../../english/intro/organization.data:220
+#: ../../english/intro/organization.data:55
+#: ../../english/intro/organization.data:223
 msgid "Publicity"
 msgstr ""
 
-#: ../../english/intro/organization.data:54
-#: ../../english/intro/organization.data:243
+#: ../../english/intro/organization.data:56
+#: ../../english/intro/organization.data:245
 msgid "Support and Infrastructure"
 msgstr "支援以及下級組織"
 
 #. formerly Custom Debian Distributions (CCDs); see https://blends.alioth.debian.org/blends/ch-about.en.html#s-Blends
-#: ../../english/intro/organization.data:56
+#: ../../english/intro/organization.data:58
 msgid "Debian Pure Blends"
 msgstr ""
 
-#: ../../english/intro/organization.data:63
+#: ../../english/intro/organization.data:65
 msgid "Leader"
 msgstr "領袖"
 
-#: ../../english/intro/organization.data:65
+#: ../../english/intro/organization.data:67
 msgid "Technical Committee"
 msgstr "技術委員會"
 
-#: ../../english/intro/organization.data:72
+#: ../../english/intro/organization.data:74
 msgid "Secretary"
 msgstr "秘書"
 
-#: ../../english/intro/organization.data:80
+#: ../../english/intro/organization.data:82
 msgid "Development Projects"
 msgstr "各項開發計劃"
 
-#: ../../english/intro/organization.data:81
+#: ../../english/intro/organization.data:83
 msgid "FTP Archives"
 msgstr "FTP 庫存"
 
-#: ../../english/intro/organization.data:83
+#: ../../english/intro/organization.data:85
 #, fuzzy
 #| msgid "FTP Master"
 msgid "FTP Masters"
 msgstr "FTP 總管"
 
-#: ../../english/intro/organization.data:87
+#: ../../english/intro/organization.data:89
 msgid "FTP Assistants"
 msgstr "FTP 助理"
 
-#: ../../english/intro/organization.data:95
+#: ../../english/intro/organization.data:98
 msgid "FTP Wizards"
 msgstr ""
 
-#: ../../english/intro/organization.data:99
+#: ../../english/intro/organization.data:102
 msgid "Backports"
 msgstr ""
 
-#: ../../english/intro/organization.data:101
+#: ../../english/intro/organization.data:104
 msgid "Backports Team"
 msgstr ""
 
-#: ../../english/intro/organization.data:105
+#: ../../english/intro/organization.data:108
 msgid "Individual Packages"
 msgstr "個別軟件包"
 
-#: ../../english/intro/organization.data:106
+#: ../../english/intro/organization.data:109
 msgid "Release Management"
 msgstr "釋出管理"
 
-#: ../../english/intro/organization.data:108
+#: ../../english/intro/organization.data:111
 msgid "Release Team"
 msgstr "釋出團隊"
 
-#: ../../english/intro/organization.data:121
+#: ../../english/intro/organization.data:124
 msgid "Quality Assurance"
 msgstr "品質管理"
 
-#: ../../english/intro/organization.data:122
+#: ../../english/intro/organization.data:125
 msgid "Installation System Team"
 msgstr "安裝系統小組"
 
-#: ../../english/intro/organization.data:123
+#: ../../english/intro/organization.data:126
 msgid "Release Notes"
 msgstr "釋出公告"
 
-#: ../../english/intro/organization.data:125
+#: ../../english/intro/organization.data:128
 msgid "CD Images"
 msgstr "光碟映像"
 
-#: ../../english/intro/organization.data:127
+#: ../../english/intro/organization.data:130
 msgid "Production"
 msgstr "產品"
 
-#: ../../english/intro/organization.data:135
+#: ../../english/intro/organization.data:138
 msgid "Testing"
 msgstr "測試"
 
-#: ../../english/intro/organization.data:137
+#: ../../english/intro/organization.data:140
 #, fuzzy
 #| msgid "Support and Infrastructure"
 msgid "Autobuilding infrastructure"
 msgstr "支援以及下級組織"
 
-#: ../../english/intro/organization.data:139
+#: ../../english/intro/organization.data:142
 msgid "Wanna-build team"
 msgstr ""
 
-#: ../../english/intro/organization.data:147
+#: ../../english/intro/organization.data:150
 #, fuzzy
 #| msgid "Buildd Administration"
 msgid "Buildd administration"
 msgstr "Buildd 管理"
 
-#: ../../english/intro/organization.data:166
+#: ../../english/intro/organization.data:169
 msgid "Documentation"
 msgstr "文件"
 
-#: ../../english/intro/organization.data:171
+#: ../../english/intro/organization.data:174
 msgid "Work-Needing and Prospective Packages list"
 msgstr "需要幫助的套件清單"
 
-#: ../../english/intro/organization.data:174
+#: ../../english/intro/organization.data:177
 msgid "Live System Team"
 msgstr "Live 系統小組"
 
-#: ../../english/intro/organization.data:175
+#: ../../english/intro/organization.data:178
 msgid "Ports"
 msgstr "移植"
 
-#: ../../english/intro/organization.data:210
+#: ../../english/intro/organization.data:213
 msgid "Special Configurations"
 msgstr "特別[CN:配置:][HKTW:組態設定:]"
 
-#: ../../english/intro/organization.data:213
+#: ../../english/intro/organization.data:216
 msgid "Laptops"
 msgstr "筆記型電腦"
 
-#: ../../english/intro/organization.data:214
+#: ../../english/intro/organization.data:217
 msgid "Firewalls"
 msgstr "防火牆"
 
-#: ../../english/intro/organization.data:215
+#: ../../english/intro/organization.data:218
 msgid "Embedded systems"
 msgstr "嵌入式系統"
 
-#: ../../english/intro/organization.data:223
+#: ../../english/intro/organization.data:226
+msgid "Publicity team"
+msgstr ""
+
+#: ../../english/intro/organization.data:231
 msgid "Press Contact"
 msgstr ""
 
-#: ../../english/intro/organization.data:229
+#: ../../english/intro/organization.data:233
 msgid "Partner Program"
 msgstr "合作計劃"
 
-#: ../../english/intro/organization.data:232
+#: ../../english/intro/organization.data:237
 msgid "Events"
 msgstr "活動"
 
-#: ../../english/intro/organization.data:237
-msgid "Bits from Debian"
-msgstr ""
-
-#: ../../english/intro/organization.data:246
+#: ../../english/intro/organization.data:248
 msgid "User support"
 msgstr "[CNHK:用戶:][TW:使用者:][HKTW:支援:][CN:支持:]"
 
-#: ../../english/intro/organization.data:313
+#: ../../english/intro/organization.data:315
 msgid "Bug Tracking System"
 msgstr "錯誤追縱系統"
 
-#: ../../english/intro/organization.data:318
+#: ../../english/intro/organization.data:320
 msgid "Mailing Lists Administration and Mailing List Archives"
 msgstr "郵件列表管理與郵件列表庫存"
 
-#: ../../english/intro/organization.data:326
+#: ../../english/intro/organization.data:328
 #, fuzzy
 #| msgid "New Maintainers Front Desk"
 msgid "New Members Front Desk"
 msgstr "新進開發人員櫃台"
 
-#: ../../english/intro/organization.data:332
+#: ../../english/intro/organization.data:334
 msgid "Debian Account Managers"
 msgstr "Debian 帳號管理員"
 
-#: ../../english/intro/organization.data:337
-msgid "Keyring Maintainers (PGP and GPG)"
-msgstr "Keyring (PGP 與 GPG) 管理員"
+#: ../../english/intro/organization.data:339
+msgid ""
+"To send a private message to all DAMs, use the GPG key "
+"57731224A9762EA155AB2A530CA8D15BB24D96F2."
+msgstr ""
 
 #: ../../english/intro/organization.data:340
-#, fuzzy
-#| msgid "Debian Maintainer Keyring Team"
-msgid "Debian Maintainer (DM) Keyring Maintainers"
-msgstr "Debian 開發人員 Keyring 團隊"
+msgid "Keyring Maintainers (PGP and GPG)"
+msgstr "Keyring (PGP 與 GPG) 管理員"
 
-#: ../../english/intro/organization.data:344
+#: ../../english/intro/organization.data:343
 msgid "Security Team"
 msgstr "安全團隊"
 
-#: ../../english/intro/organization.data:359
+#: ../../english/intro/organization.data:356
 msgid "Web Pages"
 msgstr "網頁"
 
-#: ../../english/intro/organization.data:366
+#: ../../english/intro/organization.data:365
 msgid "Consultants Page"
 msgstr "顧問網頁"
 
-#: ../../english/intro/organization.data:371
+#: ../../english/intro/organization.data:370
 msgid "CD Vendors Page"
 msgstr "CD 廠商網頁"
 
-#: ../../english/intro/organization.data:374
+#: ../../english/intro/organization.data:373
 msgid "Planet Debian"
 msgstr "Debian 星球"
 
-#: ../../english/intro/organization.data:378
+#: ../../english/intro/organization.data:377
 msgid "Policy"
 msgstr "政策"
 
-#: ../../english/intro/organization.data:383
+#: ../../english/intro/organization.data:382
 msgid "System Administration"
 msgstr "系統管理"
 
-#: ../../english/intro/organization.data:384
+#: ../../english/intro/organization.data:383
 msgid ""
 "This is the address to use when encountering problems on one of Debian's "
 "machines, including password problems or you need a package installed."
@@ -303,7 +303,7 @@ msgstr ""
 "This is the address to use when encountering problems on one of Debian's "
 "machines, including password problems or you need apackage installed."
 
-#: ../../english/intro/organization.data:394
+#: ../../english/intro/organization.data:393
 msgid ""
 "If you have hardware problems with Debian machines, please see <a href="
 "\"https://db.debian.org/machines.cgi\">Debian Machines</a> page, it should "
@@ -313,103 +313,109 @@ msgstr ""
 "\"https://db.debian.org/machines.cgi\">Debian Machines</a> page,it should "
 "contain per-machine administrator information."
 
-#: ../../english/intro/organization.data:395
+#: ../../english/intro/organization.data:394
 msgid "LDAP Developer Directory Administrator"
 msgstr "LDAP 開發人員目錄管理"
 
-#: ../../english/intro/organization.data:396
+#: ../../english/intro/organization.data:395
 msgid "Mirrors"
 msgstr "鏡像站台"
 
-#: ../../english/intro/organization.data:401
+#: ../../english/intro/organization.data:400
 msgid "DNS Maintainer"
 msgstr "DNS 管理"
 
-#: ../../english/intro/organization.data:402
+#: ../../english/intro/organization.data:401
 msgid "Package Tracking System"
 msgstr "套件追蹤系統"
 
-#: ../../english/intro/organization.data:404
+#: ../../english/intro/organization.data:403
 msgid "Hardware Donations Coordination"
 msgstr "協調硬體捐贈"
 
-#: ../../english/intro/organization.data:410
+#: ../../english/intro/organization.data:409
 msgid "Auditor"
 msgstr "監察"
 
-#: ../../english/intro/organization.data:413
+#: ../../english/intro/organization.data:415
 msgid ""
 "<a name=\"trademark\" href=\"m4_HOME/trademark\">Trademark</a> use requests"
 msgstr ""
 
-#: ../../english/intro/organization.data:416
+#: ../../english/intro/organization.data:418
 msgid "Alioth administrators"
 msgstr "Alioth 管理"
 
-#: ../../english/intro/organization.data:422
+#: ../../english/intro/organization.data:424
 msgid "Debian Women Project"
 msgstr "Debian Women 計劃"
 
-#: ../../english/intro/organization.data:429
-msgid "DebConf chairs"
-msgstr ""
+#: ../../english/intro/organization.data:431
+#, fuzzy
+#| msgid "Technical Committee"
+msgid "DebConf Committee"
+msgstr "技術委員會"
 
-#: ../../english/intro/organization.data:433
+#: ../../english/intro/organization.data:437
 msgid "Anti-harassment"
 msgstr ""
 
-#: ../../english/intro/organization.data:436
+#: ../../english/intro/organization.data:442
 msgid "Outreach"
 msgstr ""
 
-#: ../../english/intro/organization.data:446
+#: ../../english/intro/organization.data:452
 msgid "Debian for children from 1 to 99"
 msgstr "給 1 到 99 歲小孩使用的 Debian"
 
-#: ../../english/intro/organization.data:449
+#: ../../english/intro/organization.data:455
 msgid "Debian for medical practice and research"
 msgstr "給醫藥界使用的 Debian"
 
-#: ../../english/intro/organization.data:452
+#: ../../english/intro/organization.data:458
 msgid "Debian for education"
 msgstr "給教育界使用的 Debian"
 
-#: ../../english/intro/organization.data:457
+#: ../../english/intro/organization.data:463
 msgid "Debian in legal offices"
 msgstr "給法律界使用的 Debian"
 
-#: ../../english/intro/organization.data:461
+#: ../../english/intro/organization.data:467
 msgid "Debian for people with disabilities"
 msgstr "給殘障人士使用的 Debian"
 
-#: ../../english/intro/organization.data:465
+#: ../../english/intro/organization.data:471
 #, fuzzy
 #| msgid "Debian for medical practice and research"
 msgid "Debian for science and related research"
 msgstr "給醫藥界使用的 Debian"
 
-#~ msgid "Custom Debian Distributions"
-#~ msgstr "客製化 Debian 發行版"
+#~ msgid "Testing Security Team"
+#~ msgstr "測試版安全團隊"
 
-#~ msgid "Release Team for ``stable''"
-#~ msgstr "穩定版的釋出團隊"
+#~ msgid "Security Audit Project"
+#~ msgstr "安全稽查計劃"
 
-#~ msgid "Vendors"
-#~ msgstr "廠商"
+#~ msgid "APT Team"
+#~ msgstr "APT 小組"
 
-#~ msgid "Handhelds"
-#~ msgstr "手持式設備"
+#~ msgid "Mailing List Archives"
+#~ msgstr "郵件列表歸檔"
 
-#~ msgid "Marketing Team"
-#~ msgstr "行銷團隊"
+#~ msgid "Mailing list"
+#~ msgstr "郵件列表"
 
-#~ msgid ""
-#~ "The admins responsible for buildd's for a particular arch can be reached "
-#~ "at <genericemail arch@buildd.debian.org>, for example <genericemail "
-#~ "i386@buildd.debian.org>."
-#~ msgstr ""
-#~ "負責管理 buildd 的特定硬體架構的管理員可以透過<genericemail arch@buildd."
-#~ "debian.org> 聯絡，如 <genericemail i386@buildd.debian.org>。"
+#~ msgid "Debian for non-profit organisations"
+#~ msgstr "給非營利組織用的 Debian"
+
+#~ msgid "The Universal Operating System as your Desktop"
+#~ msgstr "使用環球作業系統作為桌面環境"
+
+#~ msgid "Accountant"
+#~ msgstr "帳號管理"
+
+#~ msgid "Key Signing Coordination"
+#~ msgstr "Key Signing 協調"
 
 #~ msgid ""
 #~ "Names of individual buildd's admins can also be found on <a href=\"http://"
@@ -420,29 +426,30 @@ msgstr "給醫藥界使用的 Debian"
 #~ "\">http://www.buildd.net</a> 找到。選擇特定硬體架構與發行版來查詢其 "
 #~ "buildd 與管理員。"
 
-#~ msgid "Key Signing Coordination"
-#~ msgstr "Key Signing 協調"
-
-#~ msgid "Accountant"
-#~ msgstr "帳號管理"
-
-#~ msgid "The Universal Operating System as your Desktop"
-#~ msgstr "使用環球作業系統作為桌面環境"
+#~ msgid ""
+#~ "The admins responsible for buildd's for a particular arch can be reached "
+#~ "at <genericemail arch@buildd.debian.org>, for example <genericemail "
+#~ "i386@buildd.debian.org>."
+#~ msgstr ""
+#~ "負責管理 buildd 的特定硬體架構的管理員可以透過<genericemail arch@buildd."
+#~ "debian.org> 聯絡，如 <genericemail i386@buildd.debian.org>。"
 
-#~ msgid "Debian for non-profit organisations"
-#~ msgstr "給非營利組織用的 Debian"
+#~ msgid "Marketing Team"
+#~ msgstr "行銷團隊"
 
-#~ msgid "Mailing list"
-#~ msgstr "郵件列表"
+#~ msgid "Handhelds"
+#~ msgstr "手持式設備"
 
-#~ msgid "Mailing List Archives"
-#~ msgstr "郵件列表歸檔"
+#~ msgid "Vendors"
+#~ msgstr "廠商"
 
-#~ msgid "APT Team"
-#~ msgstr "APT 小組"
+#~ msgid "Release Team for ``stable''"
+#~ msgstr "穩定版的釋出團隊"
 
-#~ msgid "Security Audit Project"
-#~ msgstr "安全稽查計劃"
+#~ msgid "Custom Debian Distributions"
+#~ msgstr "客製化 Debian 發行版"
 
-#~ msgid "Testing Security Team"
-#~ msgstr "測試版安全團隊"
+#, fuzzy
+#~| msgid "Debian Maintainer Keyring Team"
+#~ msgid "Debian Maintainer (DM) Keyring Maintainers"
+#~ msgstr "Debian 開發人員 Keyring 團隊"
diff --git a/chinese/po/others.zh.po b/chinese/po/others.zh.po
index e4b86bd2942..a3f804ca929 100644
--- a/chinese/po/others.zh.po
+++ b/chinese/po/others.zh.po
@@ -318,74 +318,74 @@ msgstr "版本"
 msgid "URL"
 msgstr "網址"
 
-#~ msgid "Name:"
-#~ msgstr "姓名："
+#~ msgid "Wanted:"
+#~ msgstr "希望："
 
-#~ msgid "Company:"
-#~ msgstr "公司："
+#~ msgid "Who:"
+#~ msgstr "誰："
 
-#~ msgid "URL:"
-#~ msgstr "網址："
+#~ msgid "Architecture:"
+#~ msgstr "硬體架構："
 
-#~ msgid "or"
-#~ msgstr "或"
+#~ msgid "Specifications:"
+#~ msgstr "詳細資訊："
 
-#~ msgid "Email:"
-#~ msgstr "Email："
+#~ msgid "Where:"
+#~ msgstr "地點："
 
-#~ msgid "Rates:"
-#~ msgstr "收費："
+#~ msgid "Debian Technical Committee only"
+#~ msgstr "限於 Debian 技術委員會"
 
-#~ msgid ""
-#~ "<total_consultant> Debian consultants listed in <total_country> countries "
-#~ "worldwide."
-#~ msgstr ""
-#~ "以下的名單中共有來自世界 <total_country> 個國家的 <total_consultant> 個 "
-#~ "Debian 顧問。"
+#~ msgid "deity developers only"
+#~ msgstr "限於 deity 開發者"
 
-#~ msgid "Mailing List Subscription"
-#~ msgstr "訂閱郵件列表"
+#~ msgid "developers only"
+#~ msgstr "限於開發者"
 
-#~ msgid "Your E-Mail address:"
-#~ msgstr "您的 E-Mail 地址："
+#~ msgid "closed"
+#~ msgstr "關閉"
 
-#~ msgid "Clear"
-#~ msgstr "清除"
+#~ msgid "open"
+#~ msgstr "公開"
+
+#~ msgid "Mailing List Unsubscription"
+#~ msgstr "取消訂閱郵件列表"
 
 #~ msgid ""
 #~ "Please respect the <a href=\"./#ads\">Debian mailing list advertising "
 #~ "policy</a>."
 #~ msgstr "請尊重 <a href=\"./#ads\">Debian 郵件列表廣告政策</a>。"
 
-#~ msgid "Mailing List Unsubscription"
-#~ msgstr "取消訂閱郵件列表"
-
-#~ msgid "open"
-#~ msgstr "公開"
+#~ msgid "Clear"
+#~ msgstr "清除"
 
-#~ msgid "closed"
-#~ msgstr "關閉"
+#~ msgid "Your E-Mail address:"
+#~ msgstr "您的 E-Mail 地址："
 
-#~ msgid "developers only"
-#~ msgstr "限於開發者"
+#~ msgid "Mailing List Subscription"
+#~ msgstr "訂閱郵件列表"
 
-#~ msgid "deity developers only"
-#~ msgstr "限於 deity 開發者"
+#~ msgid ""
+#~ "<total_consultant> Debian consultants listed in <total_country> countries "
+#~ "worldwide."
+#~ msgstr ""
+#~ "以下的名單中共有來自世界 <total_country> 個國家的 <total_consultant> 個 "
+#~ "Debian 顧問。"
 
-#~ msgid "Debian Technical Committee only"
-#~ msgstr "限於 Debian 技術委員會"
+#~ msgid "Rates:"
+#~ msgstr "收費："
 
-#~ msgid "Where:"
-#~ msgstr "地點："
+#~ msgid "Email:"
+#~ msgstr "Email："
 
-#~ msgid "Specifications:"
-#~ msgstr "詳細資訊："
+#~ msgid "or"
+#~ msgstr "或"
 
-#~ msgid "Architecture:"
-#~ msgstr "硬體架構："
+#~ msgid "URL:"
+#~ msgstr "網址："
 
-#~ msgid "Who:"
-#~ msgstr "誰："
+#~ msgid "Company:"
+#~ msgstr "公司："
 
-#~ msgid "Wanted:"
-#~ msgstr "希望："
+#~ msgid "Name:"
+#~ msgstr "姓名："
diff --git a/chinese/po/ports.zh.po b/chinese/po/ports.zh.po
index 2e75e2e85c5..1e76ef509af 100644
--- a/chinese/po/ports.zh.po
+++ b/chinese/po/ports.zh.po
@@ -114,32 +114,32 @@ msgstr "給 PowerPC 用的 Debian"
 msgid "Debian for Sparc"
 msgstr "給 Sparc 用的 Debian"
 
-#~ msgid "Debian for Laptops"
-#~ msgstr "給筆記型電腦用的 Debian"
-
-#~ msgid "Debian for AMD64"
-#~ msgstr "給 AMD64 用的 Debian"
+#~ msgid "Debian for Sparc64"
+#~ msgstr "給 Sparc64 用的 Debian"
 
-#~ msgid "Debian for ARM"
-#~ msgstr "給 ARM 用的 Debian"
+#~ msgid "Debian for S/390"
+#~ msgstr "給 S/390 用的 Debian"
 
-#~ msgid "Debian for Beowulf"
-#~ msgstr "給 Beowulf 用的 Debian"
+#~ msgid "Debian for MIPS"
+#~ msgstr "給 MIPS 用的 Debian"
 
-#~ msgid "Main"
-#~ msgstr "主要"
+#~ msgid "Debian for Motorola 680x0"
+#~ msgstr "給 Motorola 680x0 用的 Debian"
 
 #~ msgid "Debian GNU/FreeBSD"
 #~ msgstr "Debian GNU/FreeBSD"
 
-#~ msgid "Debian for Motorola 680x0"
-#~ msgstr "給 Motorola 680x0 用的 Debian"
+#~ msgid "Main"
+#~ msgstr "主要"
 
-#~ msgid "Debian for MIPS"
-#~ msgstr "給 MIPS 用的 Debian"
+#~ msgid "Debian for Beowulf"
+#~ msgstr "給 Beowulf 用的 Debian"
 
-#~ msgid "Debian for S/390"
-#~ msgstr "給 S/390 用的 Debian"
+#~ msgid "Debian for ARM"
+#~ msgstr "給 ARM 用的 Debian"
 
-#~ msgid "Debian for Sparc64"
-#~ msgstr "給 Sparc64 用的 Debian"
+#~ msgid "Debian for AMD64"
+#~ msgstr "給 AMD64 用的 Debian"
+
+#~ msgid "Debian for Laptops"
+#~ msgstr "給筆記型電腦用的 Debian"
diff --git a/chinese/po/stats.zh.po b/chinese/po/stats.zh.po
index 8ea2c4e4f1b..7c2d3456c1f 100644
--- a/chinese/po/stats.zh.po
+++ b/chinese/po/stats.zh.po
@@ -47,185 +47,188 @@ msgstr ""
 msgid "Click to fetch diffstat data"
 msgstr ""
 
-#: ../../stattrans.pl:436 ../../stattrans.pl:575 ../../stattrans.pl:576
+#: ../../stattrans.pl:436 ../../stattrans.pl:580 ../../stattrans.pl:581
 msgid "Unified diff"
 msgstr ""
 
-#: ../../stattrans.pl:439 ../../stattrans.pl:575 ../../stattrans.pl:576
+#: ../../stattrans.pl:439 ../../stattrans.pl:580 ../../stattrans.pl:581
 msgid "Colored diff"
 msgstr ""
 
-#: ../../stattrans.pl:541
+#: ../../stattrans.pl:541 ../../stattrans.pl:683
+msgid "Created with <transstatslink>"
+msgstr ""
+
+#: ../../stattrans.pl:546
 msgid "Translation summary for"
 msgstr "翻譯概要 for"
 
-#: ../../stattrans.pl:544 ../../stattrans.pl:700 ../../stattrans.pl:746
-#: ../../stattrans.pl:789
+#: ../../stattrans.pl:549 ../../stattrans.pl:707 ../../stattrans.pl:753
+#: ../../stattrans.pl:796
 msgid "Not translated"
 msgstr "未翻譯"
 
-#: ../../stattrans.pl:544 ../../stattrans.pl:699 ../../stattrans.pl:745
+#: ../../stattrans.pl:549 ../../stattrans.pl:706 ../../stattrans.pl:752
 msgid "Outdated"
 msgstr "過時"
 
-#: ../../stattrans.pl:544
+#: ../../stattrans.pl:549
 msgid "Translated"
 msgstr "已翻譯"
 
-#: ../../stattrans.pl:544 ../../stattrans.pl:626 ../../stattrans.pl:698
-#: ../../stattrans.pl:744 ../../stattrans.pl:787
+#: ../../stattrans.pl:549 ../../stattrans.pl:631 ../../stattrans.pl:705
+#: ../../stattrans.pl:751 ../../stattrans.pl:794
 msgid "Up to date"
 msgstr "最新"
 
-#: ../../stattrans.pl:545 ../../stattrans.pl:546 ../../stattrans.pl:547
-#: ../../stattrans.pl:548
+#: ../../stattrans.pl:550 ../../stattrans.pl:551 ../../stattrans.pl:552
+#: ../../stattrans.pl:553
 msgid "files"
 msgstr "個[CN:文件:][HKTW:檔案:]"
 
-#: ../../stattrans.pl:551 ../../stattrans.pl:552 ../../stattrans.pl:553
-#: ../../stattrans.pl:554
+#: ../../stattrans.pl:556 ../../stattrans.pl:557 ../../stattrans.pl:558
+#: ../../stattrans.pl:559
 msgid "bytes"
 msgstr "[CN:字節:][HKTW:位元組:]"
 
-#: ../../stattrans.pl:561
+#: ../../stattrans.pl:566
 msgid ""
 "Note: the lists of pages are sorted by popularity. Hover over the page name "
 "to see the number of hits."
 msgstr ""
 
-#: ../../stattrans.pl:567
+#: ../../stattrans.pl:572
 msgid "Outdated translations"
 msgstr "過時的翻譯"
 
-#: ../../stattrans.pl:569 ../../stattrans.pl:625
+#: ../../stattrans.pl:574 ../../stattrans.pl:630
 msgid "File"
 msgstr "[CN:文件:][HKTW:檔案:]"
 
-#: ../../stattrans.pl:571 ../../stattrans.pl:577
+#: ../../stattrans.pl:576 ../../stattrans.pl:582
 msgid "Diff"
 msgstr ""
 
-#: ../../stattrans.pl:573
+#: ../../stattrans.pl:578
 msgid "Comment"
 msgstr "備註"
 
-#: ../../stattrans.pl:574
+#: ../../stattrans.pl:579
 msgid "Diffstat"
 msgstr ""
 
-#: ../../stattrans.pl:579
+#: ../../stattrans.pl:584
 msgid "Log"
 msgstr "日誌"
 
-#: ../../stattrans.pl:580
+#: ../../stattrans.pl:585
 msgid "Translation"
 msgstr "譯文"
 
-#: ../../stattrans.pl:581
+#: ../../stattrans.pl:586
 msgid "Maintainer"
 msgstr "維護者"
 
-#: ../../stattrans.pl:583
+#: ../../stattrans.pl:588
 msgid "Status"
 msgstr "狀態"
 
-#: ../../stattrans.pl:584
+#: ../../stattrans.pl:589
 msgid "Translator"
 msgstr "翻譯者"
 
-#: ../../stattrans.pl:585
+#: ../../stattrans.pl:590
 msgid "Date"
 msgstr "日期"
 
-#: ../../stattrans.pl:592
+#: ../../stattrans.pl:597
 msgid "General pages not translated"
 msgstr "未翻譯的一般頁面"
 
-#: ../../stattrans.pl:593
+#: ../../stattrans.pl:598
 msgid "Untranslated general pages"
 msgstr "未翻譯的一般頁面"
 
-#: ../../stattrans.pl:598
+#: ../../stattrans.pl:603
 msgid "News items not translated"
 msgstr "未翻譯的新聞"
 
-#: ../../stattrans.pl:599
+#: ../../stattrans.pl:604
 msgid "Untranslated news items"
 msgstr "未翻譯的新聞"
 
-#: ../../stattrans.pl:604
+#: ../../stattrans.pl:609
 msgid "Consultant/user pages not translated"
 msgstr "未翻譯的顧問/[CN:用戶:][HKTW:使用者:]頁面"
 
-#: ../../stattrans.pl:605
+#: ../../stattrans.pl:610
 msgid "Untranslated consultant/user pages"
 msgstr "未翻譯的顧問/[CN:用戶:][HKTW:使用者:]頁面"
 
-#: ../../stattrans.pl:610
+#: ../../stattrans.pl:615
 msgid "International pages not translated"
 msgstr "未翻譯的國際頁面"
 
-#: ../../stattrans.pl:611
+#: ../../stattrans.pl:616
 msgid "Untranslated international pages"
 msgstr "未翻譯的國際頁面"
 
-#: ../../stattrans.pl:616
+#: ../../stattrans.pl:621
 msgid "Translated pages (up-to-date)"
 msgstr "已翻譯頁面 (最新)"
 
-#: ../../stattrans.pl:623 ../../stattrans.pl:771
+#: ../../stattrans.pl:628 ../../stattrans.pl:778
 msgid "Translated templates (PO files)"
 msgstr "已翻譯模板 (PO [CN:文件:][HKTW:檔案:])"
 
-#: ../../stattrans.pl:624 ../../stattrans.pl:774
+#: ../../stattrans.pl:629 ../../stattrans.pl:781
 msgid "PO Translation Statistics"
 msgstr "PO 翻譯統計"
 
-#: ../../stattrans.pl:627 ../../stattrans.pl:788
+#: ../../stattrans.pl:632 ../../stattrans.pl:795
 msgid "Fuzzy"
 msgstr "模糊"
 
-#: ../../stattrans.pl:628
+#: ../../stattrans.pl:633
 msgid "Untranslated"
 msgstr "未翻譯"
 
-#: ../../stattrans.pl:629
+#: ../../stattrans.pl:634
 #, fuzzy
 #| msgid "Total:"
 msgid "Total"
 msgstr "總數："
 
-#: ../../stattrans.pl:646
+#: ../../stattrans.pl:651
 msgid "Total:"
 msgstr "總數："
 
-#: ../../stattrans.pl:659 ../../stattrans.pl:813
-msgid "Created with"
-msgstr "此網頁創建工具："
-
-#: ../../stattrans.pl:678
+#: ../../stattrans.pl:685
 msgid "Translated web pages"
 msgstr "已翻譯網頁"
 
-#: ../../stattrans.pl:681
+#: ../../stattrans.pl:688
 msgid "Translation Statistics by Page Count"
 msgstr "翻譯統計，按頁面數量"
 
-#: ../../stattrans.pl:696 ../../stattrans.pl:742 ../../stattrans.pl:786
+#: ../../stattrans.pl:703 ../../stattrans.pl:749 ../../stattrans.pl:793
 msgid "Language"
 msgstr "語言"
 
-#: ../../stattrans.pl:697 ../../stattrans.pl:743
+#: ../../stattrans.pl:704 ../../stattrans.pl:750
 msgid "Translations"
 msgstr "翻譯"
 
-#: ../../stattrans.pl:724
+#: ../../stattrans.pl:731
 msgid "Translated web pages (by size)"
 msgstr "已翻譯網頁（按[CN:文件:][HKTW:檔案:]大小）"
 
-#: ../../stattrans.pl:727
+#: ../../stattrans.pl:734
 msgid "Translation Statistics by Page Size"
 msgstr "翻譯統計，按頁面大小"
 
 #~ msgid "Origin"
 #~ msgstr "原文"
+
+#~ msgid "Created with"
+#~ msgstr "此網頁創建工具："
diff --git a/chinese/po/templates.zh.po b/chinese/po/templates.zh.po
index 515e6b8e293..ca6773dedb9 100644
--- a/chinese/po/templates.zh.po
+++ b/chinese/po/templates.zh.po
@@ -67,7 +67,7 @@ msgid "Back to the <a href=\"m4_HOME/\">Debian Project homepage</a>."
 msgstr "返回 <a href=\"m4_HOME/\">Debian 計劃主頁</a>"
 
 #: ../../english/template/debian/common_translation.wml:22
-#: ../../english/template/debian/links.tags.wml:152
+#: ../../english/template/debian/links.tags.wml:149
 msgid "Home"
 msgstr "主頁"
 
@@ -108,48 +108,52 @@ msgid "Support"
 msgstr "[CN:支持:][HKTW:支援:]"
 
 #: ../../english/template/debian/common_translation.wml:52
+msgid "Pure Blends"
+msgstr ""
+
+#: ../../english/template/debian/common_translation.wml:55
 #: ../../english/template/debian/links.tags.wml:46
 msgid "Developers' Corner"
 msgstr "開發者天地"
 
-#: ../../english/template/debian/common_translation.wml:55
+#: ../../english/template/debian/common_translation.wml:58
 msgid "Documentation"
 msgstr "說明[CN:文檔:][HKTW:文件:]"
 
-#: ../../english/template/debian/common_translation.wml:58
+#: ../../english/template/debian/common_translation.wml:61
 msgid "Security Information"
 msgstr "安全情報"
 
-#: ../../english/template/debian/common_translation.wml:61
+#: ../../english/template/debian/common_translation.wml:64
 msgid "Search"
 msgstr "搜索"
 
-#: ../../english/template/debian/common_translation.wml:64
+#: ../../english/template/debian/common_translation.wml:67
 msgid "none"
 msgstr "無"
 
-#: ../../english/template/debian/common_translation.wml:67
+#: ../../english/template/debian/common_translation.wml:70
 msgid "Go"
 msgstr "去 / Go"
 
-#: ../../english/template/debian/common_translation.wml:70
+#: ../../english/template/debian/common_translation.wml:73
 msgid "worldwide"
 msgstr "全球"
 
-#: ../../english/template/debian/common_translation.wml:73
+#: ../../english/template/debian/common_translation.wml:76
 msgid "Site map"
 msgstr "網站地圖"
 
-#: ../../english/template/debian/common_translation.wml:76
+#: ../../english/template/debian/common_translation.wml:79
 msgid "Miscellaneous"
 msgstr "雜項"
 
-#: ../../english/template/debian/common_translation.wml:79
-#: ../../english/template/debian/links.tags.wml:107
+#: ../../english/template/debian/common_translation.wml:82
+#: ../../english/template/debian/links.tags.wml:104
 msgid "Getting Debian"
 msgstr "取得 Debian"
 
-#: ../../english/template/debian/common_translation.wml:82
+#: ../../english/template/debian/common_translation.wml:85
 #, fuzzy
 #| msgid "Debian Books"
 msgid "The Debian Blog"
@@ -200,7 +204,7 @@ msgstr "release 2.2 中"
 #. you can add some information of your own translation mailing list
 #. (i.e. debian-l10n-XXXXXX@lists.debian.org) for reporting things in
 #. your language.
-#: ../../english/template/debian/footer.wml:97
+#: ../../english/template/debian/footer.wml:105
 #, fuzzy
 #| msgid ""
 #| "To report a problem with the web site, e-mail <a href=\"mailto:debian-"
@@ -220,23 +224,23 @@ msgstr ""
 "href=\"mailto:debian-l10n-chinese@lists.debian.org\">debian-l10n-"
 "chinese@lists.debian.org</a>。"
 
-#: ../../english/template/debian/footer.wml:100
+#: ../../english/template/debian/footer.wml:108
 msgid "Last Modified"
 msgstr "最近修訂日期"
 
-#: ../../english/template/debian/footer.wml:103
+#: ../../english/template/debian/footer.wml:111
 msgid "Copyright"
 msgstr "版權所有"
 
-#: ../../english/template/debian/footer.wml:106
+#: ../../english/template/debian/footer.wml:114
 msgid "<a href=\"http://www.spi-inc.org/\">SPI</a> and others;"
 msgstr ""
 
-#: ../../english/template/debian/footer.wml:109
+#: ../../english/template/debian/footer.wml:117
 msgid "See <a href=\"m4_HOME/license\" rel=\"copyright\">license terms</a>"
 msgstr "查閱<a href=\"m4_HOME/license\" rel=\"copyright\">許可證條款</a>"
 
-#: ../../english/template/debian/footer.wml:112
+#: ../../english/template/debian/footer.wml:120
 msgid ""
 "Debian is a registered <a href=\"m4_HOME/trademark\">trademark</a> of "
 "Software in the Public Interest, Inc."
@@ -320,128 +324,124 @@ msgid "Code of Conduct"
 msgstr ""
 
 #: ../../english/template/debian/links.tags.wml:55
-msgid "Visit the site sponsor"
-msgstr "[CN:訪問:][HKTW:拜訪:]本站贊助商"
-
-#: ../../english/template/debian/links.tags.wml:58
 msgid "Debian 5.0 - The universal operating system"
 msgstr "Debian 5.0 - 通用操作系統"
 
-#: ../../english/template/debian/links.tags.wml:61
+#: ../../english/template/debian/links.tags.wml:58
 msgid "Site map for Debian web pages"
 msgstr "Debian 網站地圖"
 
-#: ../../english/template/debian/links.tags.wml:64
+#: ../../english/template/debian/links.tags.wml:61
 msgid "Developer Database"
 msgstr "開發人員[CN:數據:][HKTW:資料:]庫"
 
-#: ../../english/template/debian/links.tags.wml:67
+#: ../../english/template/debian/links.tags.wml:64
 #, fuzzy
 #| msgid "Debian Books"
 msgid "Debian FAQ"
 msgstr "Debian 書籍"
 
-#: ../../english/template/debian/links.tags.wml:70
+#: ../../english/template/debian/links.tags.wml:67
 msgid "Debian Policy Manual"
 msgstr "Debian 政策[CN:文檔:][HKTW:文件:]"
 
-#: ../../english/template/debian/links.tags.wml:73
+#: ../../english/template/debian/links.tags.wml:70
 msgid "Developers' Reference"
 msgstr "開發人員指引"
 
-#: ../../english/template/debian/links.tags.wml:76
+#: ../../english/template/debian/links.tags.wml:73
 msgid "New Maintainers' Guide"
 msgstr "新手上路"
 
-#: ../../english/template/debian/links.tags.wml:79
+#: ../../english/template/debian/links.tags.wml:76
 msgid "Release Critical Bugs"
 msgstr "阻礙發行的嚴重問題"
 
-#: ../../english/template/debian/links.tags.wml:82
+#: ../../english/template/debian/links.tags.wml:79
 msgid "Lintian Reports"
 msgstr "Lintian 報告"
 
-#: ../../english/template/debian/links.tags.wml:86
+#: ../../english/template/debian/links.tags.wml:83
 msgid "Archives for users' mailing lists"
 msgstr "[CNHK:用戶:][TW:使用者:][CN:郵件列表歸檔:][HKTW:論壇文件集:]"
 
-#: ../../english/template/debian/links.tags.wml:89
+#: ../../english/template/debian/links.tags.wml:86
 msgid "Archives for developers' mailing lists"
 msgstr "開發人員[CN:郵件列表歸檔:][HKTW:論壇文件集:]"
 
-#: ../../english/template/debian/links.tags.wml:92
+#: ../../english/template/debian/links.tags.wml:89
 msgid "Archives for i18n/l10n mailing lists"
 msgstr "國際化/本土化 (i18n/l10n) [CN:郵件列表歸檔:][HKTW:論壇文件集:]"
 
-#: ../../english/template/debian/links.tags.wml:95
+#: ../../english/template/debian/links.tags.wml:92
 msgid "Archives for ports' mailing lists"
 msgstr "移植平台[CN:郵件列表歸檔:][HKTW:論壇文件集:]"
 
-#: ../../english/template/debian/links.tags.wml:98
+#: ../../english/template/debian/links.tags.wml:95
 msgid "Archives for mailing lists of the Bug tracking system"
 msgstr "臭蟲追蹤系統[CN:郵件列表歸檔:][HKTW:論壇文件集:]"
 
-#: ../../english/template/debian/links.tags.wml:101
+#: ../../english/template/debian/links.tags.wml:98
 msgid "Archives for miscellaneous mailing lists"
 msgstr "其他[CN:郵件列表歸檔:][HKTW:論壇文件集:]"
 
-#: ../../english/template/debian/links.tags.wml:104
+#: ../../english/template/debian/links.tags.wml:101
 msgid "Free Software"
 msgstr "自由軟件"
 
-#: ../../english/template/debian/links.tags.wml:110
+#: ../../english/template/debian/links.tags.wml:107
 msgid "Development"
 msgstr "開發"
 
-#: ../../english/template/debian/links.tags.wml:113
+#: ../../english/template/debian/links.tags.wml:110
 msgid "Help Debian"
 msgstr "協助 Debian"
 
-#: ../../english/template/debian/links.tags.wml:116
+#: ../../english/template/debian/links.tags.wml:113
 msgid "Bug reports"
 msgstr "錯誤報告"
 
-#: ../../english/template/debian/links.tags.wml:119
+#: ../../english/template/debian/links.tags.wml:116
 msgid "Ports/Architectures"
 msgstr "移植平台/體系架構"
 
-#: ../../english/template/debian/links.tags.wml:122
+#: ../../english/template/debian/links.tags.wml:119
 msgid "Installation manual"
 msgstr "安裝說明"
 
-#: ../../english/template/debian/links.tags.wml:125
+#: ../../english/template/debian/links.tags.wml:122
 msgid "CD vendors"
 msgstr "CD 製造商"
 
-#: ../../english/template/debian/links.tags.wml:128
+#: ../../english/template/debian/links.tags.wml:125
 msgid "CD/USB ISO images"
 msgstr "CD/USB ISO 映像檔"
 
-#: ../../english/template/debian/links.tags.wml:131
+#: ../../english/template/debian/links.tags.wml:128
 msgid "Network install"
 msgstr "網絡安裝"
 
-#: ../../english/template/debian/links.tags.wml:134
+#: ../../english/template/debian/links.tags.wml:131
 msgid "Pre-installed"
 msgstr "預先安裝"
 
-#: ../../english/template/debian/links.tags.wml:137
+#: ../../english/template/debian/links.tags.wml:134
 msgid "Debian-Edu project"
 msgstr "Debian-Edu 計劃"
 
-#: ../../english/template/debian/links.tags.wml:140
+#: ../../english/template/debian/links.tags.wml:137
 msgid "Alioth &ndash; Debian GForge"
 msgstr "Alioth &ndash; Debian GForge"
 
-#: ../../english/template/debian/links.tags.wml:143
+#: ../../english/template/debian/links.tags.wml:140
 msgid "Quality Assurance"
 msgstr "Quality Assurance"
 
-#: ../../english/template/debian/links.tags.wml:146
+#: ../../english/template/debian/links.tags.wml:143
 msgid "Package Tracking System"
 msgstr "套件追蹤系統"
 
-#: ../../english/template/debian/links.tags.wml:149
+#: ../../english/template/debian/links.tags.wml:146
 msgid "Debian Developer's Packages Overview"
 msgstr "Debian Developers's 套件綜覽"
 
@@ -487,7 +487,7 @@ msgstr "過去活動"
 msgid "(new revision)"
 msgstr "(新版本)"
 
-#: ../../english/template/debian/recent_list.wml:301
+#: ../../english/template/debian/recent_list.wml:303
 msgid "Report"
 msgstr "報告"
 
@@ -524,94 +524,169 @@ msgstr "網址"
 msgid "Back to the <a href=\"../\">Who's using Debian? page</a>."
 msgstr "返回 <a href=\"./\">Who's using Debian? page</a>."
 
-#~ msgid "Select a server near you"
-#~ msgstr "請[CN:就近選擇服務器:][HKTW:選擇就近的伺服器:]"
+#~ msgid "Back to the <a href=\"./\">Debian consultants page</a>."
+#~ msgstr "返回 <a href=\"./\">Debian consultants page</a>."
 
-#~ msgid "More information:"
-#~ msgstr "更多訊息:"
+#, fuzzy
+#~ msgid "Download with Jigdo"
+#~ msgstr "用 jigdo 下載"
 
-#~ msgid "Taken by:"
-#~ msgstr "認領:"
+#, fuzzy
+#~ msgid "Download via HTTP/FTP"
+#~ msgstr "透過 http/ftp 下載"
 
-#~ msgid "Nobody"
-#~ msgstr "沒有人"
+#, fuzzy
+#~ msgid "Network Install"
+#~ msgstr "網絡安裝"
 
-#~ msgid "Rating:"
-#~ msgstr "評分:"
+#~ msgid "Debian CD team"
+#~ msgstr "<span lang=\"en\">Debian </span>光碟小組"
 
-#~ msgid "More information"
-#~ msgstr "更詳盡的[CN:信息:][HKTW:資訊:]"
+#~ msgid "jigdo"
+#~ msgstr "jigdo"
 
-#~ msgid "Where"
-#~ msgstr "Where（何處*）"
+#~ msgid "http_ftp"
+#~ msgstr "http_ftp"
 
-#~ msgid "More Info"
-#~ msgstr "更多[CN:信息:][HKTW:資訊:]"
+#, fuzzy
+#~ msgid "Nominations"
+#~ msgstr "捐款"
 
-#~ msgid "<th>Project</th><th>Coordinator</th>"
-#~ msgstr "<th>計劃</th><th>Coordinator</th>"
+#, fuzzy
+#~ msgid "Debate"
+#~ msgstr "<span lang=\"en\">Debian </span>光碟小組"
 
-#~ msgid "Related Links"
-#~ msgstr "相關網址"
+#, fuzzy
+#~ msgid "Minimum Discussion"
+#~ msgstr "討論中"
 
-#~ msgid "Latest News"
-#~ msgstr "最新消息"
+#~ msgid "Waiting&nbsp;for&nbsp;Sponsors"
+#~ msgstr "有待贊助"
+
+#~ msgid "In&nbsp;Discussion"
+#~ msgstr "討論中"
+
+#~ msgid "Voting&nbsp;Open"
+#~ msgstr "接受投票中"
+
+#~ msgid "Decided"
+#~ msgstr "已決定"
+
+#~ msgid "Other"
+#~ msgstr "其他"
+
+#~ msgid "Home&nbsp;Vote&nbsp;Page"
+#~ msgstr "投票主頁"
+
+#~ msgid "Submit&nbsp;a&nbsp;Proposal"
+#~ msgstr "提出議案"
+
+#~ msgid "Amend&nbsp;a&nbsp;Proposal"
+#~ msgstr "修正議案"
+
+#~ msgid "Follow&nbsp;a&nbsp;Proposal"
+#~ msgstr "跟隨議案的進展"
+
+#~ msgid "Read&nbsp;a&nbsp;Result"
+#~ msgstr "查看結果"
+
+#~ msgid "Vote"
+#~ msgstr "投票"
 
-#, fuzzy
 #~ msgid ""
-#~ "Back to: other <a href=\"./\">Debian news</a> || <a href=\"m4_HOME/"
-#~ "\">Debian Project homepage</a>."
-#~ msgstr "返回 <a href=\"m4_HOME/\">Debian 計劃主頁</a>"
+#~ "Debian Weekly News is edited by <a href=\"mailto:dwn@debian.org\">Martin "
+#~ "'Joey' Schulze</a>."
+#~ msgstr ""
+#~ "Debian 每周快訊 (Debian Weekly News) 由 <a href=\"mailto:dwn@debian.org"
+#~ "\">Martin 'Joey' Schulze</a> 負責編輯。"
 
-#, fuzzy
 #~ msgid ""
-#~ "To receive this newsletter bi-weekly in your mailbox, <a href=\"http://"
-#~ "lists.debian.org/debian-news/\">subscribe to the debian-news mailing "
-#~ "list</a>."
+#~ "Debian Weekly News is edited by <a href=\"mailto:dwn@debian.org"
+#~ "\">Yooseong Yang and Martin 'Joey' Schulze</a>."
 #~ msgstr ""
-#~ "想每個星期都以電子郵件方式接收「每週快訊」嗎？請<a href=\"m4_HOME/"
-#~ "MailingLists/subscribe#debian-news\">訂閱</a> debian-news 郵件列表。"
+#~ "Debian 每週快訊 (Debian Weekly News) 由 <a href=\"mailto:dwn@debian.org"
+#~ "\">Yooseong Yang 和 Martin 'Joey' Schulze</a> 負責編輯。"
 
-#~ msgid "<a href=\"../../\">Back issues</a> of this newsletter are available."
-#~ msgstr "您亦可翻閱<a href=\"../../\">過往的報導</a>。"
+#~ msgid ""
+#~ "Debian Weekly News is edited by <a href=\"mailto:dwn@debian.org\">Joe "
+#~ "'Zonker' Brockmeier, Jean-Christophe Helary and Tollef Fog Heen</a>."
+#~ msgstr ""
+#~ "Debian 每週快訊 (Debian Weekly News) 由 <a href=\"mailto:dwn@debian.org"
+#~ "\">Joe 'Zonker' Brockmeier, Jean-Christophe Helary 和 Tollef Fog Heen</a> "
+#~ "負責編輯。"
+
+#~ msgid "Fixed in"
+#~ msgstr "修改於"
+
+#~ msgid "Vulnerable"
+#~ msgstr "可被襲擊"
+
+#~ msgid ""
+#~ "See the Debian <a href=\"m4_HOME/contact\">contact page</a> for "
+#~ "information on contacting us."
+#~ msgstr ""
+#~ "請參閱<a href=\"m4_HOME/contact\">聯繫方法</a>與我們[CN:取得聯繫:][HKTW:聯"
+#~ "絡:]。"
+
+#~ msgid "download with pik"
+#~ msgstr "用 pik 下載"
+
+#~ msgid "buy pre-made images"
+#~ msgstr "購買預製映像"
+
+#, fuzzy
+#~ msgid "non-free"
+#~ msgstr "無"
+
+#, fuzzy
+#~ msgid "Discussion"
+#~ msgstr "討論中"
+
+#, fuzzy
+#~ msgid "License Information"
+#~ msgstr "更詳盡的[CN:信息:][HKTW:資訊:]"
+
+#, fuzzy
+#~ msgid "No Requested packages"
+#~ msgstr "受影響的軟件"
+
+#, fuzzy
+#~ msgid "No requests for adoption"
+#~ msgstr "更詳盡的[CN:信息:][HKTW:資訊:]"
 
 #, fuzzy
 #~ msgid ""
-#~ "<void id=\"singular\" />Debian Project News is edited by <a href=\"mailto:"
-#~ "debian-publicity@lists.debian.org\">%s</a>."
+#~ "<void id=\"plural\" />This issue of Debian Weekly News was edited by <a "
+#~ "href=\"mailto:dwn@debian.org\">%s</a>."
 #~ msgstr ""
 #~ "Debian 每周快訊 (Debian Weekly News) 由 <a href=\"mailto:dwn@debian.org"
 #~ "\">Joey Hess</a> 負責編輯。"
 
 #, fuzzy
 #~ msgid ""
-#~ "<void id=\"plural\" />Debian Project News is edited by <a href=\"mailto:"
-#~ "debian-publicity@lists.debian.org\">%s</a>."
+#~ "<void id=\"singular\" />This issue of Debian Weekly News was edited by <a "
+#~ "href=\"mailto:dwn@debian.org\">%s</a>."
 #~ msgstr ""
 #~ "Debian 每周快訊 (Debian Weekly News) 由 <a href=\"mailto:dwn@debian.org"
 #~ "\">Joey Hess</a> 負責編輯。"
 
 #, fuzzy
 #~ msgid ""
-#~ "<void id=\"singular\" />This issue of Debian Project News was edited by "
-#~ "<a href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
+#~ "<void id=\"plural\" />Debian Weekly News is edited by <a href=\"mailto:"
+#~ "dwn@debian.org\">%s</a>."
 #~ msgstr ""
 #~ "Debian 每周快訊 (Debian Weekly News) 由 <a href=\"mailto:dwn@debian.org"
 #~ "\">Joey Hess</a> 負責編輯。"
 
 #, fuzzy
 #~ msgid ""
-#~ "<void id=\"plural\" />This issue of Debian Project News was edited by <a "
-#~ "href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
+#~ "<void id=\"singular\" />Debian Weekly News is edited by <a href=\"mailto:"
+#~ "dwn@debian.org\">%s</a>."
 #~ msgstr ""
 #~ "Debian 每周快訊 (Debian Weekly News) 由 <a href=\"mailto:dwn@debian.org"
 #~ "\">Joey Hess</a> 負責編輯。"
 
 #, fuzzy
-#~ msgid "Back to the <a href=\"./\">Debian speakers page</a>."
-#~ msgstr "返回 <a href=\"./\">Debian consultants page</a>."
-
-#, fuzzy
 #~ msgid ""
 #~ "To receive this newsletter weekly in your mailbox, <a href=\"http://lists."
 #~ "debian.org/debian-news/\">subscribe to the debian-news mailing list</a>."
@@ -620,163 +695,91 @@ msgstr "返回 <a href=\"./\">Who's using Debian? page</a>."
 #~ "MailingLists/subscribe#debian-news\">訂閱</a> debian-news 郵件列表。"
 
 #, fuzzy
+#~ msgid "Back to the <a href=\"./\">Debian speakers page</a>."
+#~ msgstr "返回 <a href=\"./\">Debian consultants page</a>."
+
+#, fuzzy
 #~ msgid ""
-#~ "<void id=\"singular\" />Debian Weekly News is edited by <a href=\"mailto:"
-#~ "dwn@debian.org\">%s</a>."
+#~ "<void id=\"plural\" />This issue of Debian Project News was edited by <a "
+#~ "href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
 #~ msgstr ""
 #~ "Debian 每周快訊 (Debian Weekly News) 由 <a href=\"mailto:dwn@debian.org"
 #~ "\">Joey Hess</a> 負責編輯。"
 
 #, fuzzy
 #~ msgid ""
-#~ "<void id=\"plural\" />Debian Weekly News is edited by <a href=\"mailto:"
-#~ "dwn@debian.org\">%s</a>."
+#~ "<void id=\"singular\" />This issue of Debian Project News was edited by "
+#~ "<a href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
 #~ msgstr ""
 #~ "Debian 每周快訊 (Debian Weekly News) 由 <a href=\"mailto:dwn@debian.org"
 #~ "\">Joey Hess</a> 負責編輯。"
 
 #, fuzzy
 #~ msgid ""
-#~ "<void id=\"singular\" />This issue of Debian Weekly News was edited by <a "
-#~ "href=\"mailto:dwn@debian.org\">%s</a>."
+#~ "<void id=\"plural\" />Debian Project News is edited by <a href=\"mailto:"
+#~ "debian-publicity@lists.debian.org\">%s</a>."
 #~ msgstr ""
 #~ "Debian 每周快訊 (Debian Weekly News) 由 <a href=\"mailto:dwn@debian.org"
 #~ "\">Joey Hess</a> 負責編輯。"
 
 #, fuzzy
 #~ msgid ""
-#~ "<void id=\"plural\" />This issue of Debian Weekly News was edited by <a "
-#~ "href=\"mailto:dwn@debian.org\">%s</a>."
+#~ "<void id=\"singular\" />Debian Project News is edited by <a href=\"mailto:"
+#~ "debian-publicity@lists.debian.org\">%s</a>."
 #~ msgstr ""
 #~ "Debian 每周快訊 (Debian Weekly News) 由 <a href=\"mailto:dwn@debian.org"
 #~ "\">Joey Hess</a> 負責編輯。"
 
-#, fuzzy
-#~ msgid "No requests for adoption"
-#~ msgstr "更詳盡的[CN:信息:][HKTW:資訊:]"
-
-#, fuzzy
-#~ msgid "No Requested packages"
-#~ msgstr "受影響的軟件"
-
-#, fuzzy
-#~ msgid "License Information"
-#~ msgstr "更詳盡的[CN:信息:][HKTW:資訊:]"
-
-#, fuzzy
-#~ msgid "Discussion"
-#~ msgstr "討論中"
+#~ msgid "<a href=\"../../\">Back issues</a> of this newsletter are available."
+#~ msgstr "您亦可翻閱<a href=\"../../\">過往的報導</a>。"
 
 #, fuzzy
-#~ msgid "non-free"
-#~ msgstr "無"
-
-#~ msgid "buy pre-made images"
-#~ msgstr "購買預製映像"
-
-#~ msgid "download with pik"
-#~ msgstr "用 pik 下載"
-
-#~ msgid ""
-#~ "See the Debian <a href=\"m4_HOME/contact\">contact page</a> for "
-#~ "information on contacting us."
-#~ msgstr ""
-#~ "請參閱<a href=\"m4_HOME/contact\">聯繫方法</a>與我們[CN:取得聯繫:][HKTW:聯"
-#~ "絡:]。"
-
-#~ msgid "Vulnerable"
-#~ msgstr "可被襲擊"
-
-#~ msgid "Fixed in"
-#~ msgstr "修改於"
-
 #~ msgid ""
-#~ "Debian Weekly News is edited by <a href=\"mailto:dwn@debian.org\">Joe "
-#~ "'Zonker' Brockmeier, Jean-Christophe Helary and Tollef Fog Heen</a>."
-#~ msgstr ""
-#~ "Debian 每週快訊 (Debian Weekly News) 由 <a href=\"mailto:dwn@debian.org"
-#~ "\">Joe 'Zonker' Brockmeier, Jean-Christophe Helary 和 Tollef Fog Heen</a> "
-#~ "負責編輯。"
-
-#~ msgid ""
-#~ "Debian Weekly News is edited by <a href=\"mailto:dwn@debian.org"
-#~ "\">Yooseong Yang and Martin 'Joey' Schulze</a>."
+#~ "To receive this newsletter bi-weekly in your mailbox, <a href=\"http://"
+#~ "lists.debian.org/debian-news/\">subscribe to the debian-news mailing "
+#~ "list</a>."
 #~ msgstr ""
-#~ "Debian 每週快訊 (Debian Weekly News) 由 <a href=\"mailto:dwn@debian.org"
-#~ "\">Yooseong Yang 和 Martin 'Joey' Schulze</a> 負責編輯。"
+#~ "想每個星期都以電子郵件方式接收「每週快訊」嗎？請<a href=\"m4_HOME/"
+#~ "MailingLists/subscribe#debian-news\">訂閱</a> debian-news 郵件列表。"
 
+#, fuzzy
 #~ msgid ""
-#~ "Debian Weekly News is edited by <a href=\"mailto:dwn@debian.org\">Martin "
-#~ "'Joey' Schulze</a>."
-#~ msgstr ""
-#~ "Debian 每周快訊 (Debian Weekly News) 由 <a href=\"mailto:dwn@debian.org"
-#~ "\">Martin 'Joey' Schulze</a> 負責編輯。"
-
-#~ msgid "Vote"
-#~ msgstr "投票"
-
-#~ msgid "Read&nbsp;a&nbsp;Result"
-#~ msgstr "查看結果"
-
-#~ msgid "Follow&nbsp;a&nbsp;Proposal"
-#~ msgstr "跟隨議案的進展"
-
-#~ msgid "Amend&nbsp;a&nbsp;Proposal"
-#~ msgstr "修正議案"
-
-#~ msgid "Submit&nbsp;a&nbsp;Proposal"
-#~ msgstr "提出議案"
-
-#~ msgid "Home&nbsp;Vote&nbsp;Page"
-#~ msgstr "投票主頁"
-
-#~ msgid "Other"
-#~ msgstr "其他"
-
-#~ msgid "Decided"
-#~ msgstr "已決定"
-
-#~ msgid "Voting&nbsp;Open"
-#~ msgstr "接受投票中"
+#~ "Back to: other <a href=\"./\">Debian news</a> || <a href=\"m4_HOME/"
+#~ "\">Debian Project homepage</a>."
+#~ msgstr "返回 <a href=\"m4_HOME/\">Debian 計劃主頁</a>"
 
-#~ msgid "In&nbsp;Discussion"
-#~ msgstr "討論中"
+#~ msgid "Latest News"
+#~ msgstr "最新消息"
 
-#~ msgid "Waiting&nbsp;for&nbsp;Sponsors"
-#~ msgstr "有待贊助"
+#~ msgid "Related Links"
+#~ msgstr "相關網址"
 
-#, fuzzy
-#~ msgid "Minimum Discussion"
-#~ msgstr "討論中"
+#~ msgid "<th>Project</th><th>Coordinator</th>"
+#~ msgstr "<th>計劃</th><th>Coordinator</th>"
 
-#, fuzzy
-#~ msgid "Debate"
-#~ msgstr "<span lang=\"en\">Debian </span>光碟小組"
+#~ msgid "More Info"
+#~ msgstr "更多[CN:信息:][HKTW:資訊:]"
 
-#, fuzzy
-#~ msgid "Nominations"
-#~ msgstr "捐款"
+#~ msgid "Where"
+#~ msgstr "Where（何處*）"
 
-#~ msgid "http_ftp"
-#~ msgstr "http_ftp"
+#~ msgid "More information"
+#~ msgstr "更詳盡的[CN:信息:][HKTW:資訊:]"
 
-#~ msgid "jigdo"
-#~ msgstr "jigdo"
+#~ msgid "Rating:"
+#~ msgstr "評分:"
 
-#~ msgid "Debian CD team"
-#~ msgstr "<span lang=\"en\">Debian </span>光碟小組"
+#~ msgid "Nobody"
+#~ msgstr "沒有人"
 
-#, fuzzy
-#~ msgid "Network Install"
-#~ msgstr "網絡安裝"
+#~ msgid "Taken by:"
+#~ msgstr "認領:"
 
-#, fuzzy
-#~ msgid "Download via HTTP/FTP"
-#~ msgstr "透過 http/ftp 下載"
+#~ msgid "More information:"
+#~ msgstr "更多訊息:"
 
-#, fuzzy
-#~ msgid "Download with Jigdo"
-#~ msgstr "用 jigdo 下載"
+#~ msgid "Select a server near you"
+#~ msgstr "請[CN:就近選擇服務器:][HKTW:選擇就近的伺服器:]"
 
-#~ msgid "Back to the <a href=\"./\">Debian consultants page</a>."
-#~ msgstr "返回 <a href=\"./\">Debian consultants page</a>."
+#~ msgid "Visit the site sponsor"
+#~ msgstr "[CN:訪問:][HKTW:拜訪:]本站贊助商"
diff --git a/chinese/po/vendors.zh.po b/chinese/po/vendors.zh.po
index 9b099126e67..f62661c2088 100644
--- a/chinese/po/vendors.zh.po
+++ b/chinese/po/vendors.zh.po
@@ -66,74 +66,74 @@ msgstr "源碼"
 msgid "and"
 msgstr "和"
 
-#~ msgid "updated monthly"
-#~ msgstr "每月更新"
-
-#~ msgid "updated twice weekly"
-#~ msgstr "每兩週更新"
+#~ msgid "Vendor:"
+#~ msgstr "銷售商:"
 
-#~ msgid "updated weekly"
-#~ msgstr "每週更新"
+#~ msgid "URL for Debian Page:"
+#~ msgstr "為 Debian 而設的網址:"
 
-#~ msgid "reseller"
-#~ msgstr "分銷商"
+#~ msgid "Allows Contribution to Debian:"
+#~ msgstr "有否捐贈給 Debian:"
 
-#~ msgid "reseller of $var"
-#~ msgstr "$var 的分銷商"
+#~ msgid "Country:"
+#~ msgstr "國家:"
 
-#~ msgid "Custom Release"
-#~ msgstr "特別訂造"
+#~ msgid "Ship International:"
+#~ msgstr "是否接受國際訂購:"
 
-#~ msgid "vendor additions"
-#~ msgstr "銷售商增添軟件"
+#~ msgid "email:"
+#~ msgstr "電子郵箱:"
 
-#~ msgid "contrib included"
-#~ msgstr "包括 contrib"
+#~ msgid "CD Type:"
+#~ msgstr "CD 種類:"
 
-#~ msgid "non-free included"
-#~ msgstr "包括 non-free"
+#~ msgid "DVD Type:"
+#~ msgstr "DVD 種類:"
 
-#~ msgid "non-US included"
-#~ msgstr "包括 non-US"
+#~ msgid "Architectures:"
+#~ msgstr "硬體架構:"
 
-#~ msgid "Multiple Distribution"
-#~ msgstr "多重發佈"
+#~ msgid "Official CD"
+#~ msgstr "正式 CD 光碟"
 
-#~ msgid "Vendor Release"
-#~ msgstr "銷售商發行版本"
+#~ msgid "Official DVD"
+#~ msgstr "正式 DVD 光碟"
 
 #~ msgid "Development Snapshot"
 #~ msgstr "開發版快照"
 
-#~ msgid "Official DVD"
-#~ msgstr "正式 DVD 光碟"
+#~ msgid "Vendor Release"
+#~ msgstr "銷售商發行版本"
 
-#~ msgid "Official CD"
-#~ msgstr "正式 CD 光碟"
+#~ msgid "Multiple Distribution"
+#~ msgstr "多重發佈"
 
-#~ msgid "Architectures:"
-#~ msgstr "硬體架構:"
+#~ msgid "non-US included"
+#~ msgstr "包括 non-US"
 
-#~ msgid "DVD Type:"
-#~ msgstr "DVD 種類:"
+#~ msgid "non-free included"
+#~ msgstr "包括 non-free"
 
-#~ msgid "CD Type:"
-#~ msgstr "CD 種類:"
+#~ msgid "contrib included"
+#~ msgstr "包括 contrib"
 
-#~ msgid "email:"
-#~ msgstr "電子郵箱:"
+#~ msgid "vendor additions"
+#~ msgstr "銷售商增添軟件"
 
-#~ msgid "Ship International:"
-#~ msgstr "是否接受國際訂購:"
+#~ msgid "Custom Release"
+#~ msgstr "特別訂造"
 
-#~ msgid "Country:"
-#~ msgstr "國家:"
+#~ msgid "reseller of $var"
+#~ msgstr "$var 的分銷商"
 
-#~ msgid "Allows Contribution to Debian:"
-#~ msgstr "有否捐贈給 Debian:"
+#~ msgid "reseller"
+#~ msgstr "分銷商"
 
-#~ msgid "URL for Debian Page:"
-#~ msgstr "為 Debian 而設的網址:"
+#~ msgid "updated weekly"
+#~ msgstr "每週更新"
 
-#~ msgid "Vendor:"
-#~ msgstr "銷售商:"
+#~ msgid "updated twice weekly"
+#~ msgstr "每兩週更新"
+
+#~ msgid "updated monthly"
+#~ msgstr "每月更新"