chinese: po: Run "make update-po".

15 files changed, 756 insertions, 719 deletions

diff --git a/chinese/po/blends.zh.po b/chinese/po/blends.zh.po
index 8585842fee4..d8f8c439d5d 100644
--- a/chinese/po/blends.zh.po
+++ b/chinese/po/blends.zh.po
@@ -160,8 +160,8 @@ msgstr ""
 "DebianParl 的目標是提供可以支持全世界各個議會議員、政治家及其下屬工作人員日常"
 "工作的軟件。"
 
-#~ msgid "Debian Accessibility"
-#~ msgstr "Debian Accessibility（Debian 易訪問版）"
-
 #~ msgid "Debian Games"
 #~ msgstr "Debian Games（Debian 遊戲版）"
+
+#~ msgid "Debian Accessibility"
+#~ msgstr "Debian Accessibility（Debian 易訪問版）"
diff --git a/chinese/po/bugs.zh.po b/chinese/po/bugs.zh.po
index 7f46e85dce5..739cee6f297 100644
--- a/chinese/po/bugs.zh.po
+++ b/chinese/po/bugs.zh.po
@@ -160,146 +160,146 @@ msgstr "已歸檔"
 msgid "Archived and Unarchived"
 msgstr "已歸檔與未歸檔"
 
-#~ msgid "Flags:"
-#~ msgstr "標記:"
-
-#~ msgid "active bugs"
-#~ msgstr "未解決"
+#~ msgid "Exclude tag:"
+#~ msgstr "不包括標簽:"
 
-#~ msgid "display merged bugs only once"
-#~ msgstr "已合並的報告只顯示一次"
+#~ msgid "Include tag:"
+#~ msgstr "包括標簽:"
 
-#~ msgid "no ordering by status or severity"
-#~ msgstr "不按狀態或者嚴重性排序"
+#~ msgid "lfs"
+#~ msgstr "lfs"
 
-#~ msgid "don't show table of contents in the header"
-#~ msgstr "不在頁面開始處顯示目錄"
+#~ msgid "ipv6"
+#~ msgstr "ipv6"
 
-#~ msgid "don't show statistics in the footer"
-#~ msgstr "不在頁腳處顯示統計結果"
+#~ msgid "wontfix"
+#~ msgstr "不予修正 (wontfix)"
 
-#~ msgid "proposed-updates"
-#~ msgstr "proposed-updates"
+#~ msgid "upstream"
+#~ msgstr "上遊 (upstream)"
 
-#~ msgid "testing-proposed-updates"
-#~ msgstr "testing-proposed-updates"
+#~ msgid "unreproducible"
+#~ msgstr "不可再現 (unreproducible)"
 
-#~ msgid "Package version:"
-#~ msgstr "軟件包版本號:"
+#~ msgid "security"
+#~ msgstr "安全性 (security)"
 
-#~ msgid "Distribution:"
-#~ msgstr "發行版:"
+#~ msgid "patch"
+#~ msgstr "補丁 (patch)"
 
-#~ msgid "bugs"
-#~ msgstr "數量"
+#~ msgid "moreinfo"
+#~ msgstr "附加信息 (moreinfo)"
 
-#~ msgid "open"
-#~ msgstr "未解決"
+#~ msgid "l10n"
+#~ msgstr "本地化 (l10n)"
 
-#~ msgid "forwarded"
-#~ msgstr "已移交"
+#~ msgid "help"
+#~ msgstr "幫助文檔 (help)"
 
-#~ msgid "pending"
-#~ msgstr "待完工"
+#~ msgid "fixed-upstream"
+#~ msgstr "已修正于上遊 (fixed-upstream)"
 
-#~ msgid "fixed"
-#~ msgstr "已修正"
+#~ msgid "fixed-in-experimental"
+#~ msgstr "已修正于 experimental (fixed-in-experimental)"
 
-#~ msgid "done"
-#~ msgstr "已完工"
+#~ msgid "d-i"
+#~ msgstr "安裝程序 (d-i)"
 
-#~ msgid "Include status:"
-#~ msgstr "包括狀態:"
+#~ msgid "confirmed"
+#~ msgstr "通過確認 (confirmed)"
 
-#~ msgid "Exclude status:"
-#~ msgstr "不包括狀態:"
+#~ msgid "sid"
+#~ msgstr "sid"
 
-#~ msgid "critical"
-#~ msgstr "致命"
+#~ msgid "etch-ignore"
+#~ msgstr "etch-ignore"
 
-#~ msgid "grave"
-#~ msgstr "危險"
+#~ msgid "etch"
+#~ msgstr "etch"
 
-#~ msgid "serious"
-#~ msgstr "嚴重"
+#~ msgid "sarge-ignore"
+#~ msgstr "sarge-ignore"
 
-#~ msgid "important"
-#~ msgstr "重要"
+#~ msgid "woody"
+#~ msgstr "woody"
 
-#~ msgid "minor"
-#~ msgstr "輕微"
+#~ msgid "potato"
+#~ msgstr "potato"
 
-#~ msgid "wishlist"
-#~ msgstr "[CN:小意思:][HKTW:心願:]"
+#~ msgid "Exclude severity:"
+#~ msgstr "不包括優先級:"
 
 #~ msgid "Include severity:"
 #~ msgstr "包括優先級:"
 
-#~ msgid "Exclude severity:"
-#~ msgstr "不包括優先級:"
+#~ msgid "wishlist"
+#~ msgstr "[CN:小意思:][HKTW:心願:]"
 
-#~ msgid "potato"
-#~ msgstr "potato"
+#~ msgid "minor"
+#~ msgstr "輕微"
 
-#~ msgid "woody"
-#~ msgstr "woody"
+#~ msgid "important"
+#~ msgstr "重要"
 
-#~ msgid "sarge-ignore"
-#~ msgstr "sarge-ignore"
+#~ msgid "serious"
+#~ msgstr "嚴重"
 
-#~ msgid "etch"
-#~ msgstr "etch"
+#~ msgid "grave"
+#~ msgstr "危險"
 
-#~ msgid "etch-ignore"
-#~ msgstr "etch-ignore"
+#~ msgid "critical"
+#~ msgstr "致命"
 
-#~ msgid "sid"
-#~ msgstr "sid"
+#~ msgid "Exclude status:"
+#~ msgstr "不包括狀態:"
 
-#~ msgid "confirmed"
-#~ msgstr "通過確認 (confirmed)"
+#~ msgid "Include status:"
+#~ msgstr "包括狀態:"
 
-#~ msgid "d-i"
-#~ msgstr "安裝程序 (d-i)"
+#~ msgid "done"
+#~ msgstr "已完工"
 
-#~ msgid "fixed-in-experimental"
-#~ msgstr "已修正于 experimental (fixed-in-experimental)"
+#~ msgid "fixed"
+#~ msgstr "已修正"
 
-#~ msgid "fixed-upstream"
-#~ msgstr "已修正于上遊 (fixed-upstream)"
+#~ msgid "pending"
+#~ msgstr "待完工"
 
-#~ msgid "help"
-#~ msgstr "幫助文檔 (help)"
+#~ msgid "forwarded"
+#~ msgstr "已移交"
 
-#~ msgid "l10n"
-#~ msgstr "本地化 (l10n)"
+#~ msgid "open"
+#~ msgstr "未解決"
 
-#~ msgid "moreinfo"
-#~ msgstr "附加信息 (moreinfo)"
+#~ msgid "bugs"
+#~ msgstr "數量"
 
-#~ msgid "patch"
-#~ msgstr "補丁 (patch)"
+#~ msgid "Distribution:"
+#~ msgstr "發行版:"
 
-#~ msgid "security"
-#~ msgstr "安全性 (security)"
+#~ msgid "Package version:"
+#~ msgstr "軟件包版本號:"
 
-#~ msgid "unreproducible"
-#~ msgstr "不可再現 (unreproducible)"
+#~ msgid "testing-proposed-updates"
+#~ msgstr "testing-proposed-updates"
 
-#~ msgid "upstream"
-#~ msgstr "上遊 (upstream)"
+#~ msgid "proposed-updates"
+#~ msgstr "proposed-updates"
 
-#~ msgid "wontfix"
-#~ msgstr "不予修正 (wontfix)"
+#~ msgid "don't show statistics in the footer"
+#~ msgstr "不在頁腳處顯示統計結果"
 
-#~ msgid "ipv6"
-#~ msgstr "ipv6"
+#~ msgid "don't show table of contents in the header"
+#~ msgstr "不在頁面開始處顯示目錄"
 
-#~ msgid "lfs"
-#~ msgstr "lfs"
+#~ msgid "no ordering by status or severity"
+#~ msgstr "不按狀態或者嚴重性排序"
 
-#~ msgid "Include tag:"
-#~ msgstr "包括標簽:"
+#~ msgid "display merged bugs only once"
+#~ msgstr "已合並的報告只顯示一次"
 
-#~ msgid "Exclude tag:"
-#~ msgstr "不包括標簽:"
+#~ msgid "active bugs"
+#~ msgstr "未解決"
+
+#~ msgid "Flags:"
+#~ msgstr "標記:"
diff --git a/chinese/po/countries.zh.po b/chinese/po/countries.zh.po
index 38934b1d892..95fdf076c26 100644
--- a/chinese/po/countries.zh.po
+++ b/chinese/po/countries.zh.po
@@ -430,8 +430,8 @@ msgstr "南非"
 msgid "Zimbabwe"
 msgstr "津巴布韦"
 
-#~ msgid "Great Britain"
-#~ msgstr "英國"
-
 #~ msgid "Yugoslavia"
 #~ msgstr "南斯拉夫"
+
+#~ msgid "Great Britain"
+#~ msgstr "英國"
diff --git a/chinese/po/distrib.zh.po b/chinese/po/distrib.zh.po
index c684630e653..e92af7ec20a 100644
--- a/chinese/po/distrib.zh.po
+++ b/chinese/po/distrib.zh.po
@@ -4,6 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Debian webwml organization\n"
+"POT-Creation-Date: \n"
 "PO-Revision-Date: 2019-02-22 12:08-0500\n"
 "Last-Translator: Boyuan Yang <073plan@gmail.com>\n"
 "Language-Team: <debian-l10n-chinese@lists.debian.org>\n"
@@ -13,7 +14,6 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Poedit 2.2.1\n"
-"POT-Creation-Date: \n"
 
 #: ../../english/distrib/search_contents-form.inc:9
 #: ../../english/distrib/search_packages-form.inc:8
diff --git a/chinese/po/doc.zh.po b/chinese/po/doc.zh.po
index 8f7a780968a..7eafa6fbef1 100644
--- a/chinese/po/doc.zh.po
+++ b/chinese/po/doc.zh.po
@@ -14,10 +14,10 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Gtranslator 2.91.7\n"
 
-#: ../../english/doc/books.data:31
+#: ../../english/doc/books.data:32
 msgid ""
 "\n"
-"  Debian 8 is the must-have handbook for learning Linux. Start on the\n"
+"  Debian 9 is the must-have handbook for learning Linux. Start on the\n"
 "  beginners level and learn how to deploy the system with graphical\n"
 "  interface and terminal.\n"
 "  This book provides the basic knowledge to grow and become a 'junior'\n"
@@ -31,8 +31,8 @@ msgid ""
 "  Project."
 msgstr ""
 
-#: ../../english/doc/books.data:59 ../../english/doc/books.data:163
-#: ../../english/doc/books.data:216
+#: ../../english/doc/books.data:61 ../../english/doc/books.data:171
+#: ../../english/doc/books.data:226
 msgid ""
 "Written by two Debian developers, this free book\n"
 "  started as a translation of their French best-seller known as Cahier de\n"
@@ -47,7 +47,7 @@ msgid ""
 "  virtualization with Xen, KVM or LXC."
 msgstr ""
 
-#: ../../english/doc/books.data:80
+#: ../../english/doc/books.data:83
 msgid ""
 "The aim of this freely available, up-to-date, book is to get you up to\n"
 "  speed with Debian (including both the current stable release and the\n"
@@ -56,7 +56,7 @@ msgid ""
 "  in the home, office, club, or school)."
 msgstr ""
 
-#: ../../english/doc/books.data:101
+#: ../../english/doc/books.data:105
 msgid ""
 "The first French book about Debian is already in its fifth edition. It\n"
 "  covers all aspects of the administration of Debian from the installation\n"
@@ -68,7 +68,7 @@ msgid ""
 "  administrator who wants to build a reliable network with Debian."
 msgstr ""
 
-#: ../../english/doc/books.data:120
+#: ../../english/doc/books.data:125
 msgid ""
 "The book covers topics ranging from concepts of package\n"
 "  management over the available tools and how they're used to concrete "
@@ -80,7 +80,7 @@ msgid ""
 "  PDF, ePub, Mobi), printed book planned.\n"
 msgstr ""
 
-#: ../../english/doc/books.data:140
+#: ../../english/doc/books.data:146
 msgid ""
 "This book teaches you how to install and configure the system and also how "
 "to use Debian in a professional environment.  It shows the full potential of "
@@ -88,7 +88,7 @@ msgid ""
 "for all users who want to learn more about Debian and its range of services."
 msgstr ""
 
-#: ../../english/doc/books.data:191
+#: ../../english/doc/books.data:200
 msgid ""
 "Written by two penetration researcher - Annihilator, Firstblood.\n"
 "  This book teaches you how to build and configure Debian 8.x server system\n"
@@ -109,18 +109,24 @@ msgid "Author:"
 msgstr "作者:"
 
 #: ../../english/doc/books.def:41
+#, fuzzy
+#| msgid "Debian package"
+msgid "Debian Release:"
+msgstr "Debian 套件"
+
+#: ../../english/doc/books.def:44
 msgid "email:"
 msgstr "電子郵箱:"
 
-#: ../../english/doc/books.def:45
+#: ../../english/doc/books.def:48
 msgid "Available at:"
 msgstr "售於:"
 
-#: ../../english/doc/books.def:48
+#: ../../english/doc/books.def:51
 msgid "CD Included:"
 msgstr "包括光碟:"
 
-#: ../../english/doc/books.def:51
+#: ../../english/doc/books.def:54
 msgid "Publisher:"
 msgstr "發行商:"
 
@@ -144,19 +150,19 @@ msgstr "狀態："
 msgid "Availability:"
 msgstr "取得難易度："
 
-#: ../../english/doc/manuals.defs:92
+#: ../../english/doc/manuals.defs:97
 msgid "Latest version:"
 msgstr "最新版本："
 
-#: ../../english/doc/manuals.defs:108
+#: ../../english/doc/manuals.defs:113
 msgid "(version <get-var version />)"
 msgstr "(version <get-var version />)"
 
-#: ../../english/doc/manuals.defs:138 ../../english/releases/arches.data:38
+#: ../../english/doc/manuals.defs:143 ../../english/releases/arches.data:38
 msgid "plain text"
 msgstr "純文字"
 
-#: ../../english/doc/manuals.defs:154 ../../english/doc/manuals.defs:178
+#: ../../english/doc/manuals.defs:159 ../../english/doc/manuals.defs:183
 msgid ""
 "The latest <get-var srctype /> source is available through the <a href="
 "\"https://packages.debian.org/git\">Git</a> repository."
@@ -164,17 +170,17 @@ msgstr ""
 "<get-var srctype /> 的最新源代码可由 <a href=\"https://packages.debian.org/"
 "git\">Git</a> 仓库获得。"
 
-#: ../../english/doc/manuals.defs:156 ../../english/doc/manuals.defs:164
-#: ../../english/doc/manuals.defs:172 ../../english/doc/manuals.defs:180
+#: ../../english/doc/manuals.defs:161 ../../english/doc/manuals.defs:169
+#: ../../english/doc/manuals.defs:177 ../../english/doc/manuals.defs:185
 msgid "Web interface: "
 msgstr "网页界面："
 
-#: ../../english/doc/manuals.defs:157 ../../english/doc/manuals.defs:165
-#: ../../english/doc/manuals.defs:173 ../../english/doc/manuals.defs:181
+#: ../../english/doc/manuals.defs:162 ../../english/doc/manuals.defs:170
+#: ../../english/doc/manuals.defs:178 ../../english/doc/manuals.defs:186
 msgid "VCS interface: "
 msgstr "VCS 界面："
 
-#: ../../english/doc/manuals.defs:162
+#: ../../english/doc/manuals.defs:167
 msgid ""
 "The latest <get-var srctype /> source is available through the <a href="
 "\"https://packages.debian.org/cvs\">Cvs</a> repository."
@@ -182,7 +188,7 @@ msgstr ""
 "<get-var srctype /> 的最新源代码可由 <a href=\"https://packages.debian.org/"
 "cvs\">Cvs</a> 仓库获得。"
 
-#: ../../english/doc/manuals.defs:170
+#: ../../english/doc/manuals.defs:175
 msgid ""
 "The latest <get-var srctype /> source is available through the <a href="
 "\"https://packages.debian.org/subversion\">Subversion</a> repository."
@@ -190,7 +196,7 @@ msgstr ""
 "<get-var srctype /> 的最新源代码可由 <a href=\"https://packages.debian.org/"
 "subversion\">Subversion</a> 仓库获得。"
 
-#: ../../english/doc/manuals.defs:188
+#: ../../english/doc/manuals.defs:193
 msgid ""
 "CVS sources working copy: set <code>CVSROOT</code>\n"
 "  to <kbd>:ext:<var>userid</var>@cvs.debian.org:/cvs/debian-boot</kbd>,\n"
@@ -200,15 +206,15 @@ msgstr ""
 "  <kbd>:ext:<var>userid</var>@cvs.debian.org:/cvs/debian-boot</kbd>,\n"
 "  然後 check out <kbd>boot-floppies/documentation</kbd> module。"
 
-#: ../../english/doc/manuals.defs:193
+#: ../../english/doc/manuals.defs:198
 msgid "CVS via web"
 msgstr "網頁檢視 CVS"
 
-#: ../../english/doc/manuals.defs:197 ../../english/doc/manuals.defs:201
+#: ../../english/doc/manuals.defs:202 ../../english/doc/manuals.defs:206
 msgid "Debian package"
 msgstr "Debian 套件"
 
-#: ../../english/doc/manuals.defs:206 ../../english/doc/manuals.defs:210
+#: ../../english/doc/manuals.defs:211 ../../english/doc/manuals.defs:215
 msgid "Debian package (archived)"
 msgstr "Debian 套件（已归档）"
 
@@ -221,14 +227,20 @@ msgid "PDF"
 msgstr "PDF"
 
 #~ msgid ""
-#~ "The latest <get-var srctype /> source is available through the <a href="
-#~ "\"https://www.debian.org/doc/cvs\">Subversion</a> repository."
+#~ "Use <a href=\"cvs\">SVN</a> to download the SGML source text for <get-var "
+#~ "ddp_pkg_loc />."
 #~ msgstr ""
-#~ "<get-var srctype /> 的最新源代码可由 <a href=\"https://www.debian.org/doc/"
-#~ "cvs\">Subversion</a> 仓库获得。"
+#~ "使用 <a href=\"cvs\">SVN</a> 來取得 <get-vard dp_pkg_loc /> 的 SGML 原始"
+#~ "檔。"
 
-#~ msgid "Language:"
-#~ msgstr "語言:"
+#~ 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:"
@@ -246,18 +258,12 @@ msgstr "PDF"
 #~ "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 "Language:"
+#~ msgstr "語言:"
 
 #~ msgid ""
-#~ "Use <a href=\"cvs\">SVN</a> to download the SGML source text for <get-var "
-#~ "ddp_pkg_loc />."
+#~ "The latest <get-var srctype /> source is available through the <a href="
+#~ "\"https://www.debian.org/doc/cvs\">Subversion</a> repository."
 #~ msgstr ""
-#~ "使用 <a href=\"cvs\">SVN</a> 來取得 <get-vard dp_pkg_loc /> 的 SGML 原始"
-#~ "檔。"
+#~ "<get-var srctype /> 的最新源代码可由 <a href=\"https://www.debian.org/doc/"
+#~ "cvs\">Subversion</a> 仓库获得。"
diff --git a/chinese/po/mailinglists.zh.po b/chinese/po/mailinglists.zh.po
index a77da0f0cc7..cc4a4b38be4 100644
--- a/chinese/po/mailinglists.zh.po
+++ b/chinese/po/mailinglists.zh.po
@@ -125,8 +125,8 @@ msgstr "公開"
 msgid "closed"
 msgstr "關閉"
 
-#~ msgid "Please select which lists you want to unsubscribe from:"
-#~ msgstr "請選擇您要取消訂閱哪個列表："
-
 #~ msgid "Please select which lists you want to subscribe to:"
 #~ msgstr "請選擇您想要訂閱的郵件列表："
+
+#~ msgid "Please select which lists you want to unsubscribe from:"
+#~ msgstr "請選擇您要取消訂閱哪個列表："
diff --git a/chinese/po/newsevents.zh.po b/chinese/po/newsevents.zh.po
index dec59345f2f..32afa915e5b 100644
--- a/chinese/po/newsevents.zh.po
+++ b/chinese/po/newsevents.zh.po
@@ -4,6 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Debian webwml organization\n"
+"POT-Creation-Date: \n"
 "PO-Revision-Date: 2019-02-22 12:12-0500\n"
 "Last-Translator: Boyuan Yang <073plan@gmail.com>\n"
 "Language-Team: <debian-l10n-chinese@lists.debian.org>\n"
@@ -13,7 +14,6 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Poedit 2.2.1\n"
-"POT-Creation-Date: \n"
 
 #: ../../english/News/news.rdf.in:16
 msgid "Debian News"
@@ -31,30 +31,6 @@ msgstr "p<get-var page />"
 msgid "The newsletter for the Debian community"
 msgstr "Debian 社区通讯"
 
-#: ../../english/events/speakers/speakers.defs:12
-msgid "Name:"
-msgstr "姓名："
-
-#: ../../english/events/speakers/speakers.defs:15
-msgid "Email:"
-msgstr "Email："
-
-#: ../../english/events/speakers/speakers.defs:20
-msgid "Previous Talks:"
-msgstr "前一次演講："
-
-#: ../../english/events/speakers/speakers.defs:24
-msgid "Languages:"
-msgstr "語言："
-
-#: ../../english/events/speakers/speakers.defs:28
-msgid "Location:"
-msgstr "地點："
-
-#: ../../english/events/speakers/speakers.defs:31
-msgid "Topics:"
-msgstr "主題："
-
 #: ../../english/events/talks.defs:9
 msgid "Title:"
 msgstr "标题："
@@ -437,14 +413,6 @@ msgstr "<void id=\"singularfemale\" />由 %s 負責翻譯。"
 msgid "<void id=\"pluralfemale\" />It was translated by %s."
 msgstr "<void id=\"pluralfemale\" />由 %s 負責翻譯。"
 
-#: ../../english/template/debian/speakers.wml:6
-msgid "List of Speakers"
-msgstr "演講者名單"
-
-#: ../../english/template/debian/speakers.wml:9
-msgid "Back to the <a href=\"./\">Debian speakers page</a>."
-msgstr "返回 <a href=\"./\">Debian speakers page</a>."
-
 #: ../../english/template/debian/weeklynews/footer.wml:6
 msgid ""
 "To receive this newsletter weekly in your mailbox, <a href=\"https://lists."
@@ -496,3 +464,27 @@ msgstr ""
 #~ msgstr ""
 #~ "想每兩個星期都以電子郵件方式接收快訊嗎？請<a href=\"https://lists.debian."
 #~ "org/debian-news/\">訂閱</a> debian-news 郵件列表。"
+
+#~ msgid "Back to the <a href=\"./\">Debian speakers page</a>."
+#~ msgstr "返回 <a href=\"./\">Debian speakers page</a>."
+
+#~ msgid "List of Speakers"
+#~ msgstr "演講者名單"
+
+#~ msgid "Topics:"
+#~ msgstr "主題："
+
+#~ msgid "Location:"
+#~ msgstr "地點："
+
+#~ msgid "Languages:"
+#~ msgstr "語言："
+
+#~ msgid "Previous Talks:"
+#~ msgstr "前一次演講："
+
+#~ msgid "Email:"
+#~ msgstr "Email："
+
+#~ msgid "Name:"
+#~ msgstr "姓名："
diff --git a/chinese/po/organization.zh.po b/chinese/po/organization.zh.po
index c4dd63bc3f6..7b00e7b23f1 100644
--- a/chinese/po/organization.zh.po
+++ b/chinese/po/organization.zh.po
@@ -56,276 +56,281 @@ msgstr "釋出管理"
 msgid "wizard"
 msgstr "巫師"
 
-#: ../../english/intro/organization.data:39
+#. we only use the chair tag once, for techctte, I wonder why it's here.
+#: ../../english/intro/organization.data:38
 #, fuzzy
 #| msgid "chairman"
 msgid "chair"
 msgstr "主席"
 
-#: ../../english/intro/organization.data:42
+#: ../../english/intro/organization.data:41
 msgid "assistant"
 msgstr "助理"
 
-#: ../../english/intro/organization.data:44
+#: ../../english/intro/organization.data:43
 msgid "secretary"
 msgstr "秘書"
 
-#: ../../english/intro/organization.data:53
-#: ../../english/intro/organization.data:66
+#: ../../english/intro/organization.data:59
+#: ../../english/intro/organization.data:72
 msgid "Officers"
 msgstr "總管"
 
-#: ../../english/intro/organization.data:54
-#: ../../english/intro/organization.data:90
+#: ../../english/intro/organization.data:60
+#: ../../english/intro/organization.data:96
 msgid "Distribution"
 msgstr "發行版"
 
-#: ../../english/intro/organization.data:55
-#: ../../english/intro/organization.data:232
+#: ../../english/intro/organization.data:61
+#: ../../english/intro/organization.data:233
 msgid "Communication and Outreach"
 msgstr ""
 
-#: ../../english/intro/organization.data:57
-#: ../../english/intro/organization.data:235
+#: ../../english/intro/organization.data:63
+#: ../../english/intro/organization.data:236
 msgid "Data Protection team"
 msgstr ""
 
-#: ../../english/intro/organization.data:58
-#: ../../english/intro/organization.data:239
+#: ../../english/intro/organization.data:64
+#: ../../english/intro/organization.data:240
 msgid "Publicity team"
 msgstr ""
 
-#: ../../english/intro/organization.data:60
-#: ../../english/intro/organization.data:304
+#: ../../english/intro/organization.data:66
+#: ../../english/intro/organization.data:307
 msgid "Support and Infrastructure"
 msgstr "支援以及下級組織"
 
 #. formerly Custom Debian Distributions (CCDs); see https://blends.debian.org/blends/ch-about.en.html#s-Blends
-#: ../../english/intro/organization.data:62
+#: ../../english/intro/organization.data:68
 msgid "Debian Pure Blends"
 msgstr ""
 
-#: ../../english/intro/organization.data:69
+#: ../../english/intro/organization.data:75
 msgid "Leader"
 msgstr "領袖"
 
-#: ../../english/intro/organization.data:71
+#: ../../english/intro/organization.data:77
 msgid "Technical Committee"
 msgstr "技術委員會"
 
-#: ../../english/intro/organization.data:85
+#: ../../english/intro/organization.data:91
 msgid "Secretary"
 msgstr "秘書"
 
-#: ../../english/intro/organization.data:93
+#: ../../english/intro/organization.data:99
 msgid "Development Projects"
 msgstr "各項開發計劃"
 
-#: ../../english/intro/organization.data:94
+#: ../../english/intro/organization.data:100
 msgid "FTP Archives"
 msgstr "FTP 庫存"
 
-#: ../../english/intro/organization.data:96
+#: ../../english/intro/organization.data:102
 #, fuzzy
 #| msgid "FTP Master"
 msgid "FTP Masters"
 msgstr "FTP 總管"
 
-#: ../../english/intro/organization.data:102
+#: ../../english/intro/organization.data:108
 msgid "FTP Assistants"
 msgstr "FTP 助理"
 
-#: ../../english/intro/organization.data:107
+#: ../../english/intro/organization.data:113
 msgid "FTP Wizards"
 msgstr ""
 
-#: ../../english/intro/organization.data:111
+#: ../../english/intro/organization.data:117
 msgid "Backports"
 msgstr ""
 
-#: ../../english/intro/organization.data:113
+#: ../../english/intro/organization.data:119
 msgid "Backports Team"
 msgstr ""
 
-#: ../../english/intro/organization.data:117
+#: ../../english/intro/organization.data:123
 msgid "Individual Packages"
 msgstr "個別軟件包"
 
-#: ../../english/intro/organization.data:118
+#: ../../english/intro/organization.data:124
 msgid "Release Management"
 msgstr "釋出管理"
 
-#: ../../english/intro/organization.data:120
+#: ../../english/intro/organization.data:126
 msgid "Release Team"
 msgstr "釋出團隊"
 
-#: ../../english/intro/organization.data:133
+#: ../../english/intro/organization.data:139
 msgid "Quality Assurance"
 msgstr "品質管理"
 
-#: ../../english/intro/organization.data:134
+#: ../../english/intro/organization.data:140
 msgid "Installation System Team"
 msgstr "安裝系統小組"
 
-#: ../../english/intro/organization.data:135
+#: ../../english/intro/organization.data:141
 msgid "Release Notes"
 msgstr "釋出公告"
 
-#: ../../english/intro/organization.data:137
+#: ../../english/intro/organization.data:143
 msgid "CD Images"
 msgstr "光碟映像"
 
-#: ../../english/intro/organization.data:139
+#: ../../english/intro/organization.data:145
 msgid "Production"
 msgstr "產品"
 
-#: ../../english/intro/organization.data:147
+#: ../../english/intro/organization.data:153
 msgid "Testing"
 msgstr "測試"
 
-#: ../../english/intro/organization.data:149
+#: ../../english/intro/organization.data:155
+msgid "Cloud Team"
+msgstr ""
+
+#: ../../english/intro/organization.data:159
 #, fuzzy
 #| msgid "Support and Infrastructure"
 msgid "Autobuilding infrastructure"
 msgstr "支援以及下級組織"
 
-#: ../../english/intro/organization.data:151
+#: ../../english/intro/organization.data:161
 msgid "Wanna-build team"
 msgstr ""
 
-#: ../../english/intro/organization.data:159
+#: ../../english/intro/organization.data:168
 #, fuzzy
 #| msgid "Buildd Administration"
 msgid "Buildd administration"
 msgstr "Buildd 管理"
 
-#: ../../english/intro/organization.data:178
+#: ../../english/intro/organization.data:186
 msgid "Documentation"
 msgstr "文件"
 
-#: ../../english/intro/organization.data:183
+#: ../../english/intro/organization.data:191
 msgid "Work-Needing and Prospective Packages list"
 msgstr "需要幫助的套件清單"
 
-#: ../../english/intro/organization.data:186
+#: ../../english/intro/organization.data:193
 msgid "Debian Live Team"
 msgstr ""
 
-#: ../../english/intro/organization.data:187
+#: ../../english/intro/organization.data:194
 msgid "Ports"
 msgstr "移植"
 
-#: ../../english/intro/organization.data:222
+#: ../../english/intro/organization.data:224
 msgid "Special Configurations"
 msgstr "特別[CN:配置:][HKTW:組態設定:]"
 
-#: ../../english/intro/organization.data:225
+#: ../../english/intro/organization.data:226
 msgid "Laptops"
 msgstr "筆記型電腦"
 
-#: ../../english/intro/organization.data:226
+#: ../../english/intro/organization.data:227
 msgid "Firewalls"
 msgstr "防火牆"
 
-#: ../../english/intro/organization.data:227
+#: ../../english/intro/organization.data:228
 msgid "Embedded systems"
 msgstr "嵌入式系統"
 
-#: ../../english/intro/organization.data:242
+#: ../../english/intro/organization.data:243
 msgid "Press Contact"
 msgstr ""
 
-#: ../../english/intro/organization.data:244
+#: ../../english/intro/organization.data:245
 msgid "Web Pages"
 msgstr "網頁"
 
-#: ../../english/intro/organization.data:254
+#: ../../english/intro/organization.data:255
 msgid "Planet Debian"
 msgstr "Debian 星球"
 
-#: ../../english/intro/organization.data:259
+#: ../../english/intro/organization.data:260
 msgid "Outreach"
 msgstr ""
 
-#: ../../english/intro/organization.data:263
+#: ../../english/intro/organization.data:265
 msgid "Debian Women Project"
 msgstr "Debian Women 計劃"
 
-#: ../../english/intro/organization.data:271
+#: ../../english/intro/organization.data:273
 msgid "Anti-harassment"
 msgstr ""
 
-#: ../../english/intro/organization.data:276
+#: ../../english/intro/organization.data:278
 msgid "Events"
 msgstr "活動"
 
-#: ../../english/intro/organization.data:282
+#: ../../english/intro/organization.data:285
 #, fuzzy
 #| msgid "Technical Committee"
 msgid "DebConf Committee"
 msgstr "技術委員會"
 
-#: ../../english/intro/organization.data:289
+#: ../../english/intro/organization.data:292
 msgid "Partner Program"
 msgstr "合作計劃"
 
-#: ../../english/intro/organization.data:294
+#: ../../english/intro/organization.data:297
 msgid "Hardware Donations Coordination"
 msgstr "協調硬體捐贈"
 
-#: ../../english/intro/organization.data:307
+#: ../../english/intro/organization.data:310
 msgid "User support"
 msgstr "[CNHK:用戶:][TW:使用者:][HKTW:支援:][CN:支持:]"
 
-#: ../../english/intro/organization.data:374
+#: ../../english/intro/organization.data:377
 msgid "Bug Tracking System"
 msgstr "錯誤追縱系統"
 
-#: ../../english/intro/organization.data:379
+#: ../../english/intro/organization.data:382
 msgid "Mailing Lists Administration and Mailing List Archives"
 msgstr "郵件列表管理與郵件列表庫存"
 
-#: ../../english/intro/organization.data:387
+#: ../../english/intro/organization.data:390
 #, fuzzy
 #| msgid "New Maintainers Front Desk"
 msgid "New Members Front Desk"
 msgstr "新進開發人員櫃台"
 
-#: ../../english/intro/organization.data:393
+#: ../../english/intro/organization.data:396
 msgid "Debian Account Managers"
 msgstr "Debian 帳號管理員"
 
-#: ../../english/intro/organization.data:397
+#: ../../english/intro/organization.data:400
 msgid ""
 "To send a private message to all DAMs, use the GPG key "
 "57731224A9762EA155AB2A530CA8D15BB24D96F2."
 msgstr ""
 
-#: ../../english/intro/organization.data:398
+#: ../../english/intro/organization.data:401
 msgid "Keyring Maintainers (PGP and GPG)"
 msgstr "Keyring (PGP 與 GPG) 管理員"
 
-#: ../../english/intro/organization.data:402
+#: ../../english/intro/organization.data:405
 msgid "Security Team"
 msgstr "安全團隊"
 
-#: ../../english/intro/organization.data:414
+#: ../../english/intro/organization.data:417
 msgid "Consultants Page"
 msgstr "顧問網頁"
 
-#: ../../english/intro/organization.data:419
+#: ../../english/intro/organization.data:422
 msgid "CD Vendors Page"
 msgstr "CD 廠商網頁"
 
-#: ../../english/intro/organization.data:422
+#: ../../english/intro/organization.data:425
 msgid "Policy"
 msgstr "政策"
 
-#: ../../english/intro/organization.data:425
+#: ../../english/intro/organization.data:428
 msgid "System Administration"
 msgstr "系統管理"
 
-#: ../../english/intro/organization.data:426
+#: ../../english/intro/organization.data:429
 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."
@@ -333,7 +338,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:435
+#: ../../english/intro/organization.data:438
 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 "
@@ -343,98 +348,102 @@ msgstr ""
 "\"https://db.debian.org/machines.cgi\">Debian Machines</a> page,it should "
 "contain per-machine administrator information."
 
-#: ../../english/intro/organization.data:436
+#: ../../english/intro/organization.data:439
 msgid "LDAP Developer Directory Administrator"
 msgstr "LDAP 開發人員目錄管理"
 
-#: ../../english/intro/organization.data:437
+#: ../../english/intro/organization.data:440
 msgid "Mirrors"
 msgstr "鏡像站台"
 
-#: ../../english/intro/organization.data:444
+#: ../../english/intro/organization.data:447
 msgid "DNS Maintainer"
 msgstr "DNS 管理"
 
-#: ../../english/intro/organization.data:445
+#: ../../english/intro/organization.data:448
 msgid "Package Tracking System"
 msgstr "套件追蹤系統"
 
-#: ../../english/intro/organization.data:447
+#: ../../english/intro/organization.data:450
 msgid "Treasurer"
 msgstr ""
 
-#: ../../english/intro/organization.data:453
+#: ../../english/intro/organization.data:456
 msgid ""
 "<a name=\"trademark\" href=\"m4_HOME/trademark\">Trademark</a> use requests"
 msgstr ""
 
-#: ../../english/intro/organization.data:456
+#: ../../english/intro/organization.data:459
 #, fuzzy
 #| msgid "Alioth administrators"
 msgid "Salsa administrators"
 msgstr "Alioth 管理"
 
-#: ../../english/intro/organization.data:467
+#: ../../english/intro/organization.data:470
 msgid "Debian for children from 1 to 99"
 msgstr "給 1 到 99 歲小孩使用的 Debian"
 
-#: ../../english/intro/organization.data:470
+#: ../../english/intro/organization.data:473
 msgid "Debian for medical practice and research"
 msgstr "給醫藥界使用的 Debian"
 
-#: ../../english/intro/organization.data:473
+#: ../../english/intro/organization.data:476
 msgid "Debian for education"
 msgstr "給教育界使用的 Debian"
 
-#: ../../english/intro/organization.data:478
+#: ../../english/intro/organization.data:481
 msgid "Debian in legal offices"
 msgstr "給法律界使用的 Debian"
 
-#: ../../english/intro/organization.data:482
+#: ../../english/intro/organization.data:485
 msgid "Debian for people with disabilities"
 msgstr "給殘障人士使用的 Debian"
 
-#: ../../english/intro/organization.data:486
+#: ../../english/intro/organization.data:489
 #, fuzzy
 #| msgid "Debian for medical practice and research"
 msgid "Debian for science and related research"
 msgstr "給醫藥界使用的 Debian"
 
-#: ../../english/intro/organization.data:489
+#: ../../english/intro/organization.data:492
 #, fuzzy
 #| msgid "Debian for education"
 msgid "Debian for astronomy"
 msgstr "給教育界使用的 Debian"
 
-#~ msgid "Auditor"
-#~ msgstr "監察"
-
-#~ msgid "Testing Security Team"
-#~ msgstr "測試版安全團隊"
+#~ msgid "Alioth administrators"
+#~ msgstr "Alioth 管理"
 
-#~ msgid "Security Audit Project"
-#~ msgstr "安全稽查計劃"
+#~ msgid "Live System Team"
+#~ msgstr "Live 系統小組"
 
-#~ msgid "APT Team"
-#~ msgstr "APT 小組"
+#, fuzzy
+#~| msgid "Debian Maintainer Keyring Team"
+#~ msgid "Debian Maintainer (DM) Keyring Maintainers"
+#~ msgstr "Debian 開發人員 Keyring 團隊"
 
-#~ msgid "Mailing List Archives"
-#~ msgstr "郵件列表歸檔"
+#~ msgid "Custom Debian Distributions"
+#~ msgstr "客製化 Debian 發行版"
 
-#~ msgid "Mailing list"
-#~ msgstr "郵件列表"
+#~ msgid "Release Team for ``stable''"
+#~ msgstr "穩定版的釋出團隊"
 
-#~ msgid "Debian for non-profit organisations"
-#~ msgstr "給非營利組織用的 Debian"
+#~ msgid "Vendors"
+#~ msgstr "廠商"
 
-#~ msgid "The Universal Operating System as your Desktop"
-#~ msgstr "使用環球作業系統作為桌面環境"
+#~ msgid "Handhelds"
+#~ msgstr "手持式設備"
 
-#~ msgid "Accountant"
-#~ msgstr "帳號管理"
+#~ msgid "Marketing Team"
+#~ msgstr "行銷團隊"
 
-#~ msgid "Key Signing Coordination"
-#~ msgstr "Key Signing 協調"
+#~ 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 ""
 #~ "Names of individual buildd's admins can also be found on <a href=\"http://"
@@ -445,36 +454,32 @@ msgstr "給教育界使用的 Debian"
 #~ "\">http://www.buildd.net</a> 找到。選擇特定硬體架構與發行版來查詢其 "
 #~ "buildd 與管理員。"
 
-#~ 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 "Key Signing Coordination"
+#~ msgstr "Key Signing 協調"
 
-#~ msgid "Marketing Team"
-#~ msgstr "行銷團隊"
+#~ msgid "Accountant"
+#~ msgstr "帳號管理"
 
-#~ msgid "Handhelds"
-#~ msgstr "手持式設備"
+#~ msgid "The Universal Operating System as your Desktop"
+#~ msgstr "使用環球作業系統作為桌面環境"
 
-#~ msgid "Vendors"
-#~ msgstr "廠商"
+#~ msgid "Debian for non-profit organisations"
+#~ msgstr "給非營利組織用的 Debian"
 
-#~ msgid "Release Team for ``stable''"
-#~ msgstr "穩定版的釋出團隊"
+#~ msgid "Mailing list"
+#~ msgstr "郵件列表"
 
-#~ msgid "Custom Debian Distributions"
-#~ msgstr "客製化 Debian 發行版"
+#~ msgid "Mailing List Archives"
+#~ msgstr "郵件列表歸檔"
 
-#, fuzzy
-#~| msgid "Debian Maintainer Keyring Team"
-#~ msgid "Debian Maintainer (DM) Keyring Maintainers"
-#~ msgstr "Debian 開發人員 Keyring 團隊"
+#~ msgid "APT Team"
+#~ msgstr "APT 小組"
 
-#~ msgid "Live System Team"
-#~ msgstr "Live 系統小組"
+#~ msgid "Security Audit Project"
+#~ msgstr "安全稽查計劃"
 
-#~ msgid "Alioth administrators"
-#~ msgstr "Alioth 管理"
+#~ msgid "Testing Security Team"
+#~ msgstr "測試版安全團隊"
+
+#~ msgid "Auditor"
+#~ msgstr "監察"
diff --git a/chinese/po/others.zh.po b/chinese/po/others.zh.po
index c5e76c3f7d1..debb94c8bfb 100644
--- a/chinese/po/others.zh.po
+++ b/chinese/po/others.zh.po
@@ -163,91 +163,91 @@ msgstr "[Debian] (mini button)"
 msgid "same as the above"
 msgstr "同上"
 
-#: ../../english/misc/merchandise.def:8
+#: ../../english/misc/merchandise.def:10
 msgid "Products"
 msgstr "產品"
 
-#: ../../english/misc/merchandise.def:11
+#: ../../english/misc/merchandise.def:13
 msgid "T-shirts"
 msgstr "T-shirts"
 
-#: ../../english/misc/merchandise.def:14
+#: ../../english/misc/merchandise.def:16
 msgid "hats"
 msgstr "帽"
 
-#: ../../english/misc/merchandise.def:17
+#: ../../english/misc/merchandise.def:19
 msgid "stickers"
 msgstr "貼紙"
 
-#: ../../english/misc/merchandise.def:20
+#: ../../english/misc/merchandise.def:22
 msgid "mugs"
 msgstr "馬克杯"
 
-#: ../../english/misc/merchandise.def:23
+#: ../../english/misc/merchandise.def:25
 msgid "other clothing"
 msgstr "其他衣著"
 
-#: ../../english/misc/merchandise.def:26
+#: ../../english/misc/merchandise.def:28
 msgid "polo shirts"
 msgstr "polo 衫"
 
-#: ../../english/misc/merchandise.def:29
+#: ../../english/misc/merchandise.def:31
 msgid "frisbees"
 msgstr "[CN:飛盤:][HKTW:飛碟:]"
 
-#: ../../english/misc/merchandise.def:32
+#: ../../english/misc/merchandise.def:34
 msgid "mouse pads"
 msgstr "滑鼠墊"
 
-#: ../../english/misc/merchandise.def:35
+#: ../../english/misc/merchandise.def:37
 msgid "badges"
 msgstr "徽章"
 
-#: ../../english/misc/merchandise.def:38
+#: ../../english/misc/merchandise.def:40
 msgid "basketball goals"
 msgstr ""
 
-#: ../../english/misc/merchandise.def:42
+#: ../../english/misc/merchandise.def:44
 msgid "earrings"
 msgstr "耳環"
 
-#: ../../english/misc/merchandise.def:45
+#: ../../english/misc/merchandise.def:47
 msgid "suitcases"
 msgstr ""
 
-#: ../../english/misc/merchandise.def:48
+#: ../../english/misc/merchandise.def:50
 msgid "umbrellas"
 msgstr "雨伞"
 
-#: ../../english/misc/merchandise.def:51
+#: ../../english/misc/merchandise.def:53
 msgid "pillowcases"
 msgstr "枕套"
 
-#: ../../english/misc/merchandise.def:54
+#: ../../english/misc/merchandise.def:56
 msgid "keychains"
 msgstr "钥匙环"
 
-#: ../../english/misc/merchandise.def:57
+#: ../../english/misc/merchandise.def:59
 msgid "Swiss army knives"
 msgstr "瑞士军刀"
 
-#: ../../english/misc/merchandise.def:60
+#: ../../english/misc/merchandise.def:62
 msgid "USB-Sticks"
 msgstr "U 盘"
 
-#: ../../english/misc/merchandise.def:75
+#: ../../english/misc/merchandise.def:77
 msgid "lanyards"
 msgstr ""
 
-#: ../../english/misc/merchandise.def:78
+#: ../../english/misc/merchandise.def:80
 msgid "others"
 msgstr "其它"
 
-#: ../../english/misc/merchandise.def:98
+#: ../../english/misc/merchandise.def:101
 msgid "Donates money to Debian"
 msgstr "向 Debian 捐献"
 
-#: ../../english/misc/merchandise.def:102
+#: ../../english/misc/merchandise.def:106
 msgid "Money is used to organize local free software events"
 msgstr "财物将被用来组织本地的自由软件活动"
 
@@ -326,74 +326,74 @@ msgstr "版本"
 msgid "URL"
 msgstr "網址"
 
-#~ msgid "Wanted:"
-#~ msgstr "希望："
-
-#~ msgid "Who:"
-#~ msgstr "誰："
+#~ msgid "Name:"
+#~ msgstr "姓名："
 
-#~ msgid "Architecture:"
-#~ msgstr "硬體架構："
+#~ msgid "Company:"
+#~ msgstr "公司："
 
-#~ msgid "Specifications:"
-#~ msgstr "詳細資訊："
+#~ msgid "URL:"
+#~ msgstr "網址："
 
-#~ msgid "Where:"
-#~ msgstr "地點："
+#~ msgid "or"
+#~ msgstr "或"
 
-#~ msgid "Debian Technical Committee only"
-#~ msgstr "限於 Debian 技術委員會"
+#~ msgid "Email:"
+#~ msgstr "Email："
 
-#~ msgid "deity developers only"
-#~ msgstr "限於 deity 開發者"
+#~ msgid "Rates:"
+#~ msgstr "收費："
 
-#~ msgid "developers only"
-#~ msgstr "限於開發者"
+#~ msgid ""
+#~ "<total_consultant> Debian consultants listed in <total_country> countries "
+#~ "worldwide."
+#~ msgstr ""
+#~ "以下的名單中共有來自世界 <total_country> 個國家的 <total_consultant> 個 "
+#~ "Debian 顧問。"
 
-#~ msgid "closed"
-#~ msgstr "關閉"
+#~ msgid "Mailing List Subscription"
+#~ msgstr "訂閱郵件列表"
 
-#~ msgid "open"
-#~ msgstr "公開"
+#~ msgid "Your E-Mail address:"
+#~ msgstr "您的 E-Mail 地址："
 
-#~ msgid "Mailing List Unsubscription"
-#~ msgstr "取消訂閱郵件列表"
+#~ msgid "Clear"
+#~ msgstr "清除"
 
 #~ msgid ""
 #~ "Please respect the <a href=\"./#ads\">Debian mailing list advertising "
 #~ "policy</a>."
 #~ msgstr "請尊重 <a href=\"./#ads\">Debian 郵件列表廣告政策</a>。"
 
-#~ msgid "Clear"
-#~ msgstr "清除"
+#~ msgid "Mailing List Unsubscription"
+#~ msgstr "取消訂閱郵件列表"
 
-#~ msgid "Your E-Mail address:"
-#~ msgstr "您的 E-Mail 地址："
+#~ msgid "open"
+#~ msgstr "公開"
 
-#~ msgid "Mailing List Subscription"
-#~ msgstr "訂閱郵件列表"
+#~ msgid "closed"
+#~ msgstr "關閉"
 
-#~ msgid ""
-#~ "<total_consultant> Debian consultants listed in <total_country> countries "
-#~ "worldwide."
-#~ msgstr ""
-#~ "以下的名單中共有來自世界 <total_country> 個國家的 <total_consultant> 個 "
-#~ "Debian 顧問。"
+#~ msgid "developers only"
+#~ msgstr "限於開發者"
 
-#~ msgid "Rates:"
-#~ msgstr "收費："
+#~ msgid "deity developers only"
+#~ msgstr "限於 deity 開發者"
 
-#~ msgid "Email:"
-#~ msgstr "Email："
+#~ msgid "Debian Technical Committee only"
+#~ msgstr "限於 Debian 技術委員會"
 
-#~ msgid "or"
-#~ msgstr "或"
+#~ msgid "Where:"
+#~ msgstr "地點："
 
-#~ msgid "URL:"
-#~ msgstr "網址："
+#~ msgid "Specifications:"
+#~ msgstr "詳細資訊："
 
-#~ msgid "Company:"
-#~ msgstr "公司："
+#~ msgid "Architecture:"
+#~ msgstr "硬體架構："
 
-#~ msgid "Name:"
-#~ msgstr "姓名："
+#~ msgid "Who:"
+#~ msgstr "誰："
+
+#~ msgid "Wanted:"
+#~ msgstr "希望："
diff --git a/chinese/po/partners.zh.po b/chinese/po/partners.zh.po
index 021ae624d61..db8c9e99938 100644
--- a/chinese/po/partners.zh.po
+++ b/chinese/po/partners.zh.po
@@ -162,20 +162,33 @@ msgstr ""
 
 #: ../../english/partners/partners.def:113
 msgid ""
+"<a href=\"https://www.google.com\">Google</a> sponsors parts of Salsa's "
+"continuous integration infrastructure within Google Cloud Platform."
+msgstr ""
+
+#: ../../english/partners/partners.def:116
+msgid ""
+"Google is one of the largest technology companies in the world, providing a "
+"wide range of Internet-related services and products as online advertising "
+"technologies, search, cloud computing, software, and hardware."
+msgstr ""
+
+#: ../../english/partners/partners.def:123
+msgid ""
 "<a href=\"http://www.hpe.com/engage/opensource\">Hewlett Packard Enterprise "
 "(HPE)</a> provides hardware for port development, Debian mirrors, and other "
 "Debian services (current HPE hardware donations are listed in the <a href="
 "\"https://db.debian.org/machines.cgi\">Debian machines</a> page)."
 msgstr ""
 
-#: ../../english/partners/partners.def:116
+#: ../../english/partners/partners.def:126
 msgid ""
 "HPE is one of the largest computer companies in the world, providing a wide "
 "range of products and services, such as servers, storage, networking, "
 "consulting and support, software, and financial services."
 msgstr ""
 
-#: ../../english/partners/partners.def:124
+#: ../../english/partners/partners.def:134
 msgid ""
 "<a href=\"https://www.leaseweb.com/\">LeaseWeb</a> has been one of two "
 "partners that provide the infrastructure for the <a href=\"https://snapshot."
@@ -186,7 +199,7 @@ msgid ""
 "50%, enough to accommodate anticipated growth for years to come."
 msgstr ""
 
-#: ../../english/partners/partners.def:127
+#: ../../english/partners/partners.def:137
 msgid ""
 "LeaseWeb is a global Infrastructure-as-a-Service (IaaS) provider – offering "
 "customers on-demand, world-class hosting solutions, from dedicated servers "
@@ -194,7 +207,7 @@ msgid ""
 "\"https://www.leaseweb.com/\">website</a>."
 msgstr ""
 
-#: ../../english/partners/partners.def:133
+#: ../../english/partners/partners.def:143
 msgid ""
 "<a href=\"http://www.loongson.cn\">Loongson</a> and <a href=\"http://www."
 "lemote.com\">Lemote</a> have provided several Loongson-based machines to "
@@ -203,7 +216,7 @@ msgid ""
 "Loongson</a>."
 msgstr ""
 
-#: ../../english/partners/partners.def:136
+#: ../../english/partners/partners.def:146
 msgid ""
 "Loongson processors are a series of MIPS-compatible processors. They have "
 "been widely used in many areas, such as desktop, server, embedded "
@@ -211,7 +224,7 @@ msgid ""
 "<a href=\"mailto:info@loongson.cn\">info@loongson.cn</a>."
 msgstr ""
 
-#: ../../english/partners/partners.def:142
+#: ../../english/partners/partners.def:152
 msgid ""
 "<a href=\"http://www.man-da.de/\">man-da.de GmbH</a> is the backbone "
 "provider of the Metropolitan Area Network Darmstadt. It is supporting Debian "
@@ -219,7 +232,7 @@ msgid ""
 "network for experimental and debconf.org machines."
 msgstr ""
 
-#: ../../english/partners/partners.def:146
+#: ../../english/partners/partners.def:156
 msgid ""
 "man-da.de GmbH is operating MANDA, a wide area network in the South Hessen "
 "region connecting educational and research organisations to a high speed "
@@ -229,27 +242,27 @@ msgid ""
 "both universities."
 msgstr ""
 
-#: ../../english/partners/partners.def:154
+#: ../../english/partners/partners.def:164
 msgid ""
 "<a href=\"http://osuosl.org/\">The Oregon State University Open Source Lab</"
 "a> provides hosting and administration services to the Debian project."
 msgstr ""
 
-#: ../../english/partners/partners.def:158
+#: ../../english/partners/partners.def:168
 msgid ""
 "The Open Source Lab is a focal point for open source development at Oregon "
 "State University and beyond. The OSL provides development, hosting and "
 "assorted other services to the Open Source community."
 msgstr ""
 
-#: ../../english/partners/partners.def:165
+#: ../../english/partners/partners.def:175
 msgid ""
 "nic.at is sponsoring the anycast service <a href=\"https://www.rcodezero.at/"
 "\">RcodeZero DNS</a> for Debian as it meets the needs to have geographically "
 "disperse locations and support DNSSEC."
 msgstr ""
 
-#: ../../english/partners/partners.def:169
+#: ../../english/partners/partners.def:179
 msgid ""
 "ipcom is a subsidiary of nic.at, the Austrian domain registry. nic.at has "
 "been managing the .at-zone since 1998 on a highly professional and reliable "
@@ -257,14 +270,14 @@ msgid ""
 "department and has been successfully in use for the .at zone."
 msgstr ""
 
-#: ../../english/partners/partners.def:175
+#: ../../english/partners/partners.def:185
 msgid ""
 "<a href=\"http://www.skolelinux.org/\">Skolelinux</a> is heavily involved in "
 "both the creation and testing of the new debian-installer and the "
 "localization of Debian."
 msgstr ""
 
-#: ../../english/partners/partners.def:178
+#: ../../english/partners/partners.def:188
 msgid ""
 "Skolelinux is an effort to create a Debian Pure Blend aimed at schools and "
 "universities. An easy 3-question installation results in a preconfigured "
@@ -273,7 +286,7 @@ msgid ""
 "environment."
 msgstr ""
 
-#: ../../english/partners/partners.def:185
+#: ../../english/partners/partners.def:195
 msgid ""
 "<a href=\"https://www.stackpath.com/?utm_campaign=Partner%20Display&amp;"
 "utm_source=Partner%20Display&amp;utm_medium=Debian\">StackPath</a> provides "
@@ -283,35 +296,35 @@ msgid ""
 "\">Planet Debian</a>."
 msgstr ""
 
-#: ../../english/partners/partners.def:188
+#: ../../english/partners/partners.def:198
 msgid ""
 "StackPath is a platform of secure edge services that enables developers to "
 "protect, accelerate, and innovate cloud properties ranging from websites to "
 "media delivery and IoT services."
 msgstr ""
 
-#: ../../english/partners/partners.def:194
+#: ../../english/partners/partners.def:204
 msgid ""
 "<a href=\"http://www.telegraaf.nl/\">Telegraaf Media ICT BV</a> is "
 "supporting the Debian community by donating hardware, rackspace and "
 "bandwidth for the Debian server hosting alioth, arch and svn."
 msgstr ""
 
-#: ../../english/partners/partners.def:197
+#: ../../english/partners/partners.def:207
 msgid ""
 "Telegraaf Media ICT BV is running its internet infrastructure (appx. 200 "
 "Intel based servers) mainly based on Debian GNU/Linux servers; the sysadmins "
 "are highly motivated Debian users and some of them also Debian maintainers."
 msgstr ""
 
-#: ../../english/partners/partners.def:200
+#: ../../english/partners/partners.def:210
 msgid ""
 "Telegraaf Media Group runs some of the most popular Dutch websites (http://"
 "www.telegraaf.nl, http://www.speurders.nl and http://www.dft.nl) as well as "
 "the two biggest newspapers in The Netherlands."
 msgstr ""
 
-#: ../../english/partners/partners.def:206
+#: ../../english/partners/partners.def:216
 msgid ""
 "<a href=\"http://www.thomas-krenn.com\">Thomas Krenn</a> has provided a new "
 "high-end server for the Debian cdbuilder service. In addition, Thomas Krenn "
@@ -321,7 +334,7 @@ msgid ""
 "thomas-krenn.com/linux</a>."
 msgstr ""
 
-#: ../../english/partners/partners.def:209
+#: ../../english/partners/partners.def:219
 msgid ""
 "<a href=\"http://www.thomas-krenn.com\">Thomas Krenn</a> is Europe's leading "
 "online shop for server systems and high-quality hosting. They offer rack-"
@@ -331,7 +344,7 @@ msgid ""
 "course they support Debian as operating system on their servers!"
 msgstr ""
 
-#: ../../english/partners/partners.def:215
+#: ../../english/partners/partners.def:225
 msgid ""
 "<a href=\"http://www.trustsec.de/\">trustsec</a> pays two Debian developers "
 "to work on the S/390 port of Debian and packages mainly related to Java. "
@@ -340,7 +353,7 @@ msgid ""
 "for LinuxTag 2001 in Stuttgart."
 msgstr ""
 
-#: ../../english/partners/partners.def:218
+#: ../../english/partners/partners.def:228
 msgid ""
 "trustsec offers customer support, consulting and training for Debian on the "
 "Intel PC architecture (i386), PowerPC and IBM S/390 and is specialized on "
@@ -348,7 +361,7 @@ msgid ""
 "\"mailto:info@trustsec.de\">info@trustsec.de</a> for more information."
 msgstr ""
 
-#: ../../english/partners/partners.def:226
+#: ../../english/partners/partners.def:236
 msgid ""
 "The <a href=\"https://www.sanger.ac.uk/\">Wellcome Sanger Institute</a> "
 "provides infrastructure for the <a href=\"https://snapshot.debian.org/"
@@ -358,7 +371,7 @@ msgid ""
 "increasing the amount of snapshot storage provided."
 msgstr ""
 
-#: ../../english/partners/partners.def:229
+#: ../../english/partners/partners.def:239
 msgid ""
 "The Wellcome Sanger Institute is one of the world's leading genome centres. "
 "Through its ability to conduct research at scale, it is able to engage in "
@@ -369,14 +382,14 @@ msgid ""
 "treatments for human disease."
 msgstr ""
 
-#: ../../english/partners/partners.def:239
+#: ../../english/partners/partners.def:249
 msgid ""
 "<A HREF=\"http://www.brainfood.com/\">Brainfood</A> (previously called "
 "Novare) provides several machines to Debian, as well as hosting and server "
 "administration services."
 msgstr ""
 
-#: ../../english/partners/partners.def:242
+#: ../../english/partners/partners.def:252
 msgid ""
 "Brainfood is a technology solutions company whose goal is to work to produce "
 "an ideal result for a specific need, whether it's a website or an ongoing, "
@@ -385,7 +398,7 @@ msgid ""
 "\">debian-contact@brainfood.com</A>."
 msgstr ""
 
-#: ../../english/partners/partners.def:249
+#: ../../english/partners/partners.def:259
 msgid ""
 "<a href=\"http://www.hp.com/\">Hewlett-Packard</a> has provided hardware for "
 "port development, Debian mirrors, and other Debian services (current HP "
@@ -395,7 +408,7 @@ msgid ""
 "com/products1/linux/\">HP Linux</a>."
 msgstr ""
 
-#: ../../english/partners/partners.def:252
+#: ../../english/partners/partners.def:262
 msgid ""
 "Hewlett-Packard is one of the largest computer companies in the world, "
 "providing a wide range of products and services, such as servers, PCs, "
@@ -403,7 +416,7 @@ msgid ""
 "solutions, etc."
 msgstr ""
 
-#: ../../english/partners/partners.def:259
+#: ../../english/partners/partners.def:269
 msgid ""
 "<A HREF=\"http://www.linuxcentral.com/\">Linux Central</A> provides us with "
 "Debian GNU/Linux CD-ROM sets for trade show type events. These CD's help to "
@@ -411,7 +424,7 @@ msgid ""
 "current users."
 msgstr ""
 
-#: ../../english/partners/partners.def:263
+#: ../../english/partners/partners.def:273
 msgid ""
 "Linux Central sells all the latest releases of Linux products such as "
 "commercial software, books, hardware, and versions of major Linux "
@@ -421,14 +434,14 @@ msgid ""
 "contact <A HREF=\"mailto:sales@linuxcentral.com\">sales@linuxcentral.com</A>."
 msgstr ""
 
-#: ../../english/partners/partners.def:270
+#: ../../english/partners/partners.def:280
 msgid ""
 "<a href=\"http://www.mythic-beasts.com\">Mythic Beasts Ltd.</a> supports "
 "Debian (and SPI Inc) by providing domain registration facilities.</p><p>They "
 "are a UK based web hosting, domain registration and co-location company."
 msgstr ""
 
-#: ../../english/partners/partners.def:277
+#: ../../english/partners/partners.def:287
 msgid ""
 "San Francisco based <a href=\"http://www.nostarch.com/\">No Starch Press</"
 "a>, publisher of \"The Finest in Geek Entertainment,\" is co-publisher of "
@@ -439,7 +452,7 @@ msgid ""
 "copy of The Debian System to the Debian Project."
 msgstr ""
 
-#: ../../english/partners/partners.def:284
+#: ../../english/partners/partners.def:294
 msgid ""
 "<a href=\"http://www.opensourcepress.de/\">Open Source Press</a> is the "
 "Munich-based publisher of the book <a href=\"http://debiansystem.info/\">The "
@@ -447,7 +460,7 @@ msgid ""
 "donate 1&euro; to the Debian Project."
 msgstr ""
 
-#: ../../english/partners/partners.def:287
+#: ../../english/partners/partners.def:297
 msgid ""
 "Open Source Press specialises on books around Linux and Open Source "
 "Software, written by authors with considerable experience in the fields, and "
@@ -455,7 +468,7 @@ msgid ""
 "Source Press publications are renowned for their quality and depth."
 msgstr ""
 
-#: ../../english/partners/partners.def:295
+#: ../../english/partners/partners.def:305
 msgid ""
 "<a href=\"http://www.rapidswitch.com/\">RapidSwitch</a> (formely Black Cat "
 "Networks) is a UK ISP specialising in dedicated hosting. It provides "
@@ -463,13 +476,13 @@ msgid ""
 "virtual servers."
 msgstr ""
 
-#: ../../english/partners/partners.def:298
+#: ../../english/partners/partners.def:308
 msgid ""
 "It hosts a Debian development machine, <a href=\"https://db.debian.org/"
 "machines.cgi?host=caballero\">caballero</a>."
 msgstr ""
 
-#: ../../english/partners/partners.def:306
+#: ../../english/partners/partners.def:316
 msgid ""
 "<a href=\"http://www.simtec.co.uk\">Simtec</a> has provided several ARM "
 "machines which make up the bulk of the Debian ARM infrastructure. In "
@@ -477,7 +490,7 @@ msgid ""
 "ARM port."
 msgstr ""
 
-#: ../../english/partners/partners.def:309
+#: ../../english/partners/partners.def:319
 msgid ""
 "Simtec is a leading provider of ARM based computing products. We have a "
 "range of <a href=\"http://www.simtec.co.uk/products/boards.html\">boards</a> "
diff --git a/chinese/po/ports.zh.po b/chinese/po/ports.zh.po
index 279e8d38c17..fe9b8fa4e03 100644
--- a/chinese/po/ports.zh.po
+++ b/chinese/po/ports.zh.po
@@ -116,32 +116,32 @@ msgstr "給 PowerPC 用的 Debian"
 msgid "Debian for Sparc"
 msgstr "給 Sparc 用的 Debian"
 
-#~ msgid "Debian for Sparc64"
-#~ msgstr "給 Sparc64 用的 Debian"
-
-#~ msgid "Debian for S/390"
-#~ msgstr "給 S/390 用的 Debian"
+#~ msgid "Debian for Laptops"
+#~ msgstr "給筆記型電腦用的 Debian"
 
-#~ msgid "Debian for MIPS"
-#~ msgstr "給 MIPS 用的 Debian"
+#~ msgid "Debian for AMD64"
+#~ msgstr "給 AMD64 用的 Debian"
 
-#~ msgid "Debian for Motorola 680x0"
-#~ msgstr "給 Motorola 680x0 用的 Debian"
+#~ msgid "Debian for ARM"
+#~ msgstr "給 ARM 用的 Debian"
 
-#~ msgid "Debian GNU/FreeBSD"
-#~ msgstr "Debian GNU/FreeBSD"
+#~ msgid "Debian for Beowulf"
+#~ msgstr "給 Beowulf 用的 Debian"
 
 #~ msgid "Main"
 #~ msgstr "主要"
 
-#~ msgid "Debian for Beowulf"
-#~ msgstr "給 Beowulf 用的 Debian"
+#~ msgid "Debian GNU/FreeBSD"
+#~ msgstr "Debian GNU/FreeBSD"
 
-#~ msgid "Debian for ARM"
-#~ msgstr "給 ARM 用的 Debian"
+#~ msgid "Debian for Motorola 680x0"
+#~ msgstr "給 Motorola 680x0 用的 Debian"
 
-#~ msgid "Debian for AMD64"
-#~ msgstr "給 AMD64 用的 Debian"
+#~ msgid "Debian for MIPS"
+#~ msgstr "給 MIPS 用的 Debian"
 
-#~ msgid "Debian for Laptops"
-#~ msgstr "給筆記型電腦用的 Debian"
+#~ msgid "Debian for S/390"
+#~ msgstr "給 S/390 用的 Debian"
+
+#~ msgid "Debian for Sparc64"
+#~ msgstr "給 Sparc64 用的 Debian"
diff --git a/chinese/po/stats.zh.po b/chinese/po/stats.zh.po
index 8fc887c189f..7f78ef4a261 100644
--- a/chinese/po/stats.zh.po
+++ b/chinese/po/stats.zh.po
@@ -231,17 +231,17 @@ msgstr "已翻譯網頁（按[CN:文件:][HKTW:檔案:]大小）"
 msgid "Translation Statistics by Page Size"
 msgstr "翻譯統計，按頁面大小"
 
-#~ msgid "Origin"
-#~ msgstr "原文"
+#~ msgid "Unified diff"
+#~ msgstr "合并差异"
 
-#~ msgid "Created with"
-#~ msgstr "此網頁創建工具："
+#~ msgid "Colored diff"
+#~ msgstr "带颜色差异"
 
 #~ msgid "Commit diff"
 #~ msgstr "提交差异"
 
-#~ msgid "Colored diff"
-#~ msgstr "带颜色差异"
+#~ msgid "Created with"
+#~ msgstr "此網頁創建工具："
 
-#~ msgid "Unified diff"
-#~ msgstr "合并差异"
+#~ msgid "Origin"
+#~ msgstr "原文"
diff --git a/chinese/po/templates.zh.po b/chinese/po/templates.zh.po
index bb6d3939f6c..60055dd256a 100644
--- a/chinese/po/templates.zh.po
+++ b/chinese/po/templates.zh.po
@@ -163,6 +163,12 @@ msgstr "取得 Debian"
 msgid "The Debian Blog"
 msgstr "Debian 博客"
 
+#: ../../english/template/debian/common_translation.wml:94
+#, fuzzy
+#| msgid "Last Modified"
+msgid "Last Updated"
+msgstr "最近修訂日期"
+
 #: ../../english/template/debian/ddp.wml:6
 msgid ""
 "Please send all comments, criticisms and suggestions about these web pages "
@@ -488,6 +494,15 @@ msgstr "（新版本）"
 msgid "Report"
 msgstr "報告"
 
+#: ../../english/template/debian/redirect.wml:6
+msgid "Page redirected to <newpage/>"
+msgstr ""
+
+#: ../../english/template/debian/redirect.wml:12
+msgid ""
+"This page has been renamed to <url <newpage/>>, please update your links."
+msgstr ""
+
 #. given a manual name and an architecture, join them
 #. if you need to reorder the two, use "%2$s ... %1$s", cf. printf(3)
 #: ../../english/template/debian/release.wml:7
@@ -521,101 +536,173 @@ msgstr "错误的翻译版本！"
 msgid "URL"
 msgstr "網址"
 
-#: ../../english/template/debian/users.wml:7
+#: ../../english/template/debian/users.wml:12
 msgid "Back to the <a href=\"../\">Who's using Debian? page</a>."
 msgstr "返回<a href=\"./\">谁在使用 Debian？页面</a>。"
 
-#~ msgid "Visit the site sponsor"
-#~ msgstr "[CN:訪問:][HKTW:拜訪:]本站贊助商"
+#~ msgid "Back to the <a href=\"./\">Debian consultants page</a>."
+#~ msgstr "返回 <a href=\"./\">Debian consultants page</a>."
 
-#~ msgid "Select a server near you"
-#~ msgstr "請[CN:就近選擇服務器:][HKTW:選擇就近的伺服器:]"
+#, fuzzy
+#~ msgid "Download with Jigdo"
+#~ msgstr "用 jigdo 下載"
 
-#~ msgid "More information:"
-#~ msgstr "更多訊息:"
+#, fuzzy
+#~ msgid "Download via HTTP/FTP"
+#~ msgstr "透過 http/ftp 下載"
 
-#~ msgid "Taken by:"
-#~ msgstr "認領:"
+#, fuzzy
+#~ msgid "Network Install"
+#~ msgstr "網絡安裝"
 
-#~ msgid "Nobody"
-#~ msgstr "沒有人"
+#~ msgid "Debian CD team"
+#~ msgstr "<span lang=\"en\">Debian </span>光碟小組"
 
-#~ msgid "Rating:"
-#~ msgstr "評分:"
+#~ msgid "jigdo"
+#~ msgstr "jigdo"
 
-#~ msgid "More information"
-#~ msgstr "更詳盡的[CN:信息:][HKTW:資訊:]"
+#~ msgid "http_ftp"
+#~ msgstr "http_ftp"
 
-#~ msgid "Where"
-#~ msgstr "Where（何處*）"
+#, fuzzy
+#~ msgid "Nominations"
+#~ msgstr "捐款"
 
-#~ msgid "More Info"
-#~ msgstr "更多[CN:信息:][HKTW:資訊:]"
+#, fuzzy
+#~ msgid "Debate"
+#~ msgstr "<span lang=\"en\">Debian </span>光碟小組"
 
-#~ msgid "<th>Project</th><th>Coordinator</th>"
-#~ msgstr "<th>計劃</th><th>Coordinator</th>"
+#, fuzzy
+#~ msgid "Minimum Discussion"
+#~ msgstr "討論中"
 
-#~ msgid "Related Links"
-#~ msgstr "相關網址"
+#~ msgid "Waiting&nbsp;for&nbsp;Sponsors"
+#~ msgstr "有待贊助"
 
-#~ msgid "Latest News"
-#~ 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>."
@@ -624,163 +711,91 @@ msgstr "返回<a href=\"./\">谁在使用 Debian？页面</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 6cd168bccb9..a5967fb766e 100644
--- a/chinese/po/vendors.zh.po
+++ b/chinese/po/vendors.zh.po
@@ -68,74 +68,74 @@ msgstr "源碼"
 msgid "and"
 msgstr "和"
 
-#~ msgid "Vendor:"
-#~ msgstr "銷售商:"
-
-#~ msgid "URL for Debian Page:"
-#~ msgstr "為 Debian 而設的網址:"
+#~ msgid "updated monthly"
+#~ msgstr "每月更新"
 
-#~ msgid "Allows Contribution to Debian:"
-#~ msgstr "有否捐贈給 Debian:"
+#~ msgid "updated twice weekly"
+#~ msgstr "每兩週更新"
 
-#~ msgid "Country:"
-#~ msgstr "國家:"
+#~ msgid "updated weekly"
+#~ msgstr "每週更新"
 
-#~ msgid "Ship International:"
-#~ msgstr "是否接受國際訂購:"
+#~ msgid "reseller"
+#~ msgstr "分銷商"
 
-#~ msgid "email:"
-#~ msgstr "電子郵箱:"
+#~ msgid "reseller of $var"
+#~ msgstr "$var 的分銷商"
 
-#~ msgid "CD Type:"
-#~ msgstr "CD 種類:"
+#~ msgid "Custom Release"
+#~ msgstr "特別訂造"
 
-#~ msgid "DVD Type:"
-#~ msgstr "DVD 種類:"
+#~ msgid "vendor additions"
+#~ msgstr "銷售商增添軟件"
 
-#~ msgid "Architectures:"
-#~ msgstr "硬體架構:"
+#~ msgid "contrib included"
+#~ msgstr "包括 contrib"
 
-#~ msgid "Official CD"
-#~ msgstr "正式 CD 光碟"
+#~ msgid "non-free included"
+#~ msgstr "包括 non-free"
 
-#~ msgid "Official DVD"
-#~ msgstr "正式 DVD 光碟"
+#~ msgid "non-US included"
+#~ msgstr "包括 non-US"
 
-#~ msgid "Development Snapshot"
-#~ msgstr "開發版快照"
+#~ msgid "Multiple Distribution"
+#~ msgstr "多重發佈"
 
 #~ msgid "Vendor Release"
 #~ msgstr "銷售商發行版本"
 
-#~ msgid "Multiple Distribution"
-#~ msgstr "多重發佈"
+#~ msgid "Development Snapshot"
+#~ msgstr "開發版快照"
 
-#~ msgid "non-US included"
-#~ msgstr "包括 non-US"
+#~ msgid "Official DVD"
+#~ msgstr "正式 DVD 光碟"
 
-#~ msgid "non-free included"
-#~ msgstr "包括 non-free"
+#~ msgid "Official CD"
+#~ msgstr "正式 CD 光碟"
 
-#~ msgid "contrib included"
-#~ msgstr "包括 contrib"
+#~ msgid "Architectures:"
+#~ msgstr "硬體架構:"
 
-#~ msgid "vendor additions"
-#~ msgstr "銷售商增添軟件"
+#~ msgid "DVD Type:"
+#~ msgstr "DVD 種類:"
 
-#~ msgid "Custom Release"
-#~ msgstr "特別訂造"
+#~ msgid "CD Type:"
+#~ msgstr "CD 種類:"
 
-#~ msgid "reseller of $var"
-#~ msgstr "$var 的分銷商"
+#~ msgid "email:"
+#~ msgstr "電子郵箱:"
 
-#~ msgid "reseller"
-#~ msgstr "分銷商"
+#~ msgid "Ship International:"
+#~ msgstr "是否接受國際訂購:"
 
-#~ msgid "updated weekly"
-#~ msgstr "每週更新"
+#~ msgid "Country:"
+#~ msgstr "國家:"
 
-#~ msgid "updated twice weekly"
-#~ msgstr "每兩週更新"
+#~ msgid "Allows Contribution to Debian:"
+#~ msgstr "有否捐贈給 Debian:"
 
-#~ msgid "updated monthly"
-#~ msgstr "每月更新"
+#~ msgid "URL for Debian Page:"
+#~ msgstr "為 Debian 而設的網址:"
+
+#~ msgid "Vendor:"
+#~ msgstr "銷售商:"
diff --git a/chinese/po/vote.zh.po b/chinese/po/vote.zh.po
index dc9d0eb755c..0215444ec53 100644
--- a/chinese/po/vote.zh.po
+++ b/chinese/po/vote.zh.po
@@ -29,237 +29,243 @@ msgid "Nominations"
 msgstr "提名"
 
 #: ../../english/template/debian/votebar.wml:25
+#, fuzzy
+#| msgid "Withdrawn"
+msgid "Withdrawals"
+msgstr "撤銷"
+
+#: ../../english/template/debian/votebar.wml:28
 msgid "Debate"
 msgstr "辯論"
 
-#: ../../english/template/debian/votebar.wml:28
+#: ../../english/template/debian/votebar.wml:31
 msgid "Platforms"
 msgstr "政見"
 
-#: ../../english/template/debian/votebar.wml:31
+#: ../../english/template/debian/votebar.wml:34
 msgid "Proposer"
 msgstr "提名人"
 
-#: ../../english/template/debian/votebar.wml:34
+#: ../../english/template/debian/votebar.wml:37
 msgid "Proposal A Proposer"
 msgstr "提案 A 提名人"
 
-#: ../../english/template/debian/votebar.wml:37
+#: ../../english/template/debian/votebar.wml:40
 msgid "Proposal B Proposer"
 msgstr "提案 B 提名人"
 
-#: ../../english/template/debian/votebar.wml:40
+#: ../../english/template/debian/votebar.wml:43
 msgid "Proposal C Proposer"
 msgstr "提案 C 提名人"
 
-#: ../../english/template/debian/votebar.wml:43
+#: ../../english/template/debian/votebar.wml:46
 msgid "Proposal D Proposer"
 msgstr "提案 D 提名人"
 
-#: ../../english/template/debian/votebar.wml:46
+#: ../../english/template/debian/votebar.wml:49
 msgid "Proposal E Proposer"
 msgstr "提案 E 提名人"
 
-#: ../../english/template/debian/votebar.wml:49
+#: ../../english/template/debian/votebar.wml:52
 msgid "Proposal F Proposer"
 msgstr "提案 F 提名人"
 
-#: ../../english/template/debian/votebar.wml:52
+#: ../../english/template/debian/votebar.wml:55
 msgid "Seconds"
 msgstr "支持者"
 
-#: ../../english/template/debian/votebar.wml:55
+#: ../../english/template/debian/votebar.wml:58
 msgid "Proposal A Seconds"
 msgstr "提案 A 支持者"
 
-#: ../../english/template/debian/votebar.wml:58
+#: ../../english/template/debian/votebar.wml:61
 msgid "Proposal B Seconds"
 msgstr "提案 B 支持者"
 
-#: ../../english/template/debian/votebar.wml:61
+#: ../../english/template/debian/votebar.wml:64
 msgid "Proposal C Seconds"
 msgstr "提案 C 支持者"
 
-#: ../../english/template/debian/votebar.wml:64
+#: ../../english/template/debian/votebar.wml:67
 msgid "Proposal D Seconds"
 msgstr "提案 D 支持者"
 
-#: ../../english/template/debian/votebar.wml:67
+#: ../../english/template/debian/votebar.wml:70
 msgid "Proposal E Seconds"
 msgstr "提案 E 支持者"
 
-#: ../../english/template/debian/votebar.wml:70
+#: ../../english/template/debian/votebar.wml:73
 msgid "Proposal F Seconds"
 msgstr "提案 F 支持者"
 
-#: ../../english/template/debian/votebar.wml:73
+#: ../../english/template/debian/votebar.wml:76
 msgid "Opposition"
 msgstr "反對"
 
-#: ../../english/template/debian/votebar.wml:76
+#: ../../english/template/debian/votebar.wml:79
 msgid "Text"
 msgstr "內文"
 
-#: ../../english/template/debian/votebar.wml:79
+#: ../../english/template/debian/votebar.wml:82
 msgid "Proposal A"
 msgstr "提案 A"
 
-#: ../../english/template/debian/votebar.wml:82
+#: ../../english/template/debian/votebar.wml:85
 msgid "Proposal B"
 msgstr "提案 B"
 
-#: ../../english/template/debian/votebar.wml:85
+#: ../../english/template/debian/votebar.wml:88
 msgid "Proposal C"
 msgstr "提案 C"
 
-#: ../../english/template/debian/votebar.wml:88
+#: ../../english/template/debian/votebar.wml:91
 msgid "Proposal D"
 msgstr "提案 D"
 
-#: ../../english/template/debian/votebar.wml:91
+#: ../../english/template/debian/votebar.wml:94
 msgid "Proposal E"
 msgstr "提案 E"
 
-#: ../../english/template/debian/votebar.wml:94
+#: ../../english/template/debian/votebar.wml:97
 msgid "Proposal F"
 msgstr "提案 F"
 
-#: ../../english/template/debian/votebar.wml:97
+#: ../../english/template/debian/votebar.wml:100
 msgid "Choices"
 msgstr "選擇"
 
-#: ../../english/template/debian/votebar.wml:100
+#: ../../english/template/debian/votebar.wml:103
 msgid "Amendment Proposer"
 msgstr "修正案提名人"
 
-#: ../../english/template/debian/votebar.wml:103
+#: ../../english/template/debian/votebar.wml:106
 msgid "Amendment Seconds"
 msgstr "修正案支持者"
 
-#: ../../english/template/debian/votebar.wml:106
+#: ../../english/template/debian/votebar.wml:109
 msgid "Amendment Text"
 msgstr "修正案內文"
 
-#: ../../english/template/debian/votebar.wml:109
+#: ../../english/template/debian/votebar.wml:112
 msgid "Amendment Proposer A"
 msgstr "修正案 A 提名人"
 
-#: ../../english/template/debian/votebar.wml:112
+#: ../../english/template/debian/votebar.wml:115
 msgid "Amendment Seconds A"
 msgstr "修正案 A 支持者"
 
-#: ../../english/template/debian/votebar.wml:115
+#: ../../english/template/debian/votebar.wml:118
 msgid "Amendment Text A"
 msgstr "修正案 A 內文"
 
-#: ../../english/template/debian/votebar.wml:118
+#: ../../english/template/debian/votebar.wml:121
 msgid "Amendment Proposer B"
 msgstr "修正案 B 提名人"
 
-#: ../../english/template/debian/votebar.wml:121
+#: ../../english/template/debian/votebar.wml:124
 msgid "Amendment Seconds B"
 msgstr "修正案 B 支持者"
 
-#: ../../english/template/debian/votebar.wml:124
+#: ../../english/template/debian/votebar.wml:127
 msgid "Amendment Text B"
 msgstr "修正案 B 內文"
 
-#: ../../english/template/debian/votebar.wml:127
+#: ../../english/template/debian/votebar.wml:130
 msgid "Amendment Proposer C"
 msgstr "修正案 C 提名人"
 
-#: ../../english/template/debian/votebar.wml:130
+#: ../../english/template/debian/votebar.wml:133
 msgid "Amendment Seconds C"
 msgstr "修正案 C 支持者"
 
-#: ../../english/template/debian/votebar.wml:133
+#: ../../english/template/debian/votebar.wml:136
 msgid "Amendment Text C"
 msgstr "修正案 C 內文"
 
-#: ../../english/template/debian/votebar.wml:136
+#: ../../english/template/debian/votebar.wml:139
 msgid "Amendments"
 msgstr "修正案"
 
-#: ../../english/template/debian/votebar.wml:139
+#: ../../english/template/debian/votebar.wml:142
 msgid "Proceedings"
 msgstr "會議記錄"
 
-#: ../../english/template/debian/votebar.wml:142
+#: ../../english/template/debian/votebar.wml:145
 msgid "Majority Requirement"
 msgstr "主要要求"
 
-#: ../../english/template/debian/votebar.wml:145
+#: ../../english/template/debian/votebar.wml:148
 msgid "Data and Statistics"
 msgstr "資料與統計"
 
-#: ../../english/template/debian/votebar.wml:148
+#: ../../english/template/debian/votebar.wml:151
 msgid "Quorum"
 msgstr "最低人數"
 
-#: ../../english/template/debian/votebar.wml:151
+#: ../../english/template/debian/votebar.wml:154
 msgid "Minimum Discussion"
 msgstr "最少量討論"
 
-#: ../../english/template/debian/votebar.wml:154
+#: ../../english/template/debian/votebar.wml:157
 msgid "Ballot"
 msgstr "投票"
 
-#: ../../english/template/debian/votebar.wml:157
+#: ../../english/template/debian/votebar.wml:160
 msgid "Forum"
 msgstr "討論區"
 
-#: ../../english/template/debian/votebar.wml:160
+#: ../../english/template/debian/votebar.wml:163
 msgid "Outcome"
 msgstr "結果"
 
-#: ../../english/template/debian/votebar.wml:164
+#: ../../english/template/debian/votebar.wml:167
 msgid "Waiting&nbsp;for&nbsp;Sponsors"
 msgstr "有待贊助"
 
-#: ../../english/template/debian/votebar.wml:167
+#: ../../english/template/debian/votebar.wml:170
 msgid "In&nbsp;Discussion"
 msgstr "討論中"
 
-#: ../../english/template/debian/votebar.wml:170
+#: ../../english/template/debian/votebar.wml:173
 msgid "Voting&nbsp;Open"
 msgstr "接受投票中"
 
-#: ../../english/template/debian/votebar.wml:173
+#: ../../english/template/debian/votebar.wml:176
 msgid "Decided"
 msgstr "已決定"
 
-#: ../../english/template/debian/votebar.wml:176
+#: ../../english/template/debian/votebar.wml:179
 msgid "Withdrawn"
 msgstr "撤銷"
 
-#: ../../english/template/debian/votebar.wml:179
+#: ../../english/template/debian/votebar.wml:182
 msgid "Other"
 msgstr "其他"
 
-#: ../../english/template/debian/votebar.wml:183
+#: ../../english/template/debian/votebar.wml:186
 msgid "Home&nbsp;Vote&nbsp;Page"
 msgstr "投票主頁"
 
-#: ../../english/template/debian/votebar.wml:186
+#: ../../english/template/debian/votebar.wml:189
 msgid "How&nbsp;To"
 msgstr "How&nbsp;To"
 
-#: ../../english/template/debian/votebar.wml:189
+#: ../../english/template/debian/votebar.wml:192
 msgid "Submit&nbsp;a&nbsp;Proposal"
 msgstr "提出議案"
 
-#: ../../english/template/debian/votebar.wml:192
+#: ../../english/template/debian/votebar.wml:195
 msgid "Amend&nbsp;a&nbsp;Proposal"
 msgstr "修正議案"
 
-#: ../../english/template/debian/votebar.wml:195
+#: ../../english/template/debian/votebar.wml:198
 msgid "Follow&nbsp;a&nbsp;Proposal"
 msgstr "跟隨議案的進展"
 
-#: ../../english/template/debian/votebar.wml:198
+#: ../../english/template/debian/votebar.wml:201
 msgid "Read&nbsp;a&nbsp;Result"
 msgstr "查看結果"
 
-#: ../../english/template/debian/votebar.wml:201
+#: ../../english/template/debian/votebar.wml:204
 msgid "Vote"
 msgstr "投票"