Update language templates

13 files changed, 600 insertions, 596 deletions

diff --git a/chinese/po/blends.zh.po b/chinese/po/blends.zh.po
index f9d7f4f874f..2b83c1feddf 100644
--- a/chinese/po/blends.zh.po
+++ b/chinese/po/blends.zh.po
@@ -160,8 +160,8 @@ msgstr ""
 "DebianParl 的目標是提供可以支持全世界各個議會議員、政治家及其下屬工作人員日常"
 "工作的軟件。"
 
-#~ msgid "Debian Games"
-#~ msgstr "Debian Games（Debian 遊戲版）"
-
 #~ msgid "Debian Accessibility"
 #~ msgstr "Debian Accessibility（Debian 易訪問版）"
+
+#~ msgid "Debian Games"
+#~ msgstr "Debian Games（Debian 遊戲版）"
diff --git a/chinese/po/bugs.zh.po b/chinese/po/bugs.zh.po
index 739cee6f297..7f46e85dce5 100644
--- a/chinese/po/bugs.zh.po
+++ b/chinese/po/bugs.zh.po
@@ -160,146 +160,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 e2c156a9cd2..c65015374ec 100644
--- a/chinese/po/countries.zh.po
+++ b/chinese/po/countries.zh.po
@@ -439,8 +439,8 @@ msgstr "南非"
 msgid "Zimbabwe"
 msgstr "津巴布韦"
 
-#~ msgid "Yugoslavia"
-#~ msgstr "南斯拉夫"
-
 #~ msgid "Great Britain"
 #~ msgstr "英國"
+
+#~ msgid "Yugoslavia"
+#~ msgstr "南斯拉夫"
diff --git a/chinese/po/doc.zh.po b/chinese/po/doc.zh.po
index 0009f689de8..f06bc934c1a 100644
--- a/chinese/po/doc.zh.po
+++ b/chinese/po/doc.zh.po
@@ -199,29 +199,38 @@ msgstr "PDF"
 
 #~ msgid ""
 #~ "The latest <get-var srctype /> source is available through the <a href="
-#~ "\"https://packages.debian.org/cvs\">Cvs</a> repository."
+#~ "\"https://www.debian.org/doc/cvs\">Subversion</a> repository."
 #~ msgstr ""
-#~ "最新的 <get-var srctype /> 格式的源代码可由 <a href=\"https://packages."
-#~ "debian.org/cvs\">Cvs</a> 仓库获得。"
+#~ "<get-var srctype /> 的最新源代码可由 <a href=\"https://www.debian.org/doc/"
+#~ "cvs\">Subversion</a> 仓库获得。"
+
+#~ msgid "Language:"
+#~ msgstr "語言:"
 
 #~ msgid ""
-#~ "The latest <get-var srctype /> source is available through the <a href="
-#~ "\"https://packages.debian.org/subversion\">Subversion</a> repository."
+#~ "CVS sources working copy: <p>Login to the CVS server using the command:"
+#~ "<br>\n"
+#~ "<pre>cvs -d:pserver:anonymous@cvs.debian.org:/cvs/debian-policy login</"
+#~ "pre>\n"
+#~ "and just press enter when you are asked for a password. To check out the "
+#~ "sources, use the command:<br>\n"
+#~ "<pre>cvs -d:pserver:anonymous@cvs.debian.org:/cvs/debian-policy co <get-"
+#~ "var doc /></pre>"
 #~ msgstr ""
-#~ "最新的 <get-var srctype /> 格式的源代码可由 <a href=\"https://packages."
-#~ "debian.org/subversion\">Subversion</a> 仓库获得。"
+#~ "CVS sources working copy:<p>Login to the CVS server using the command:"
+#~ "<br><pre>cvs -d:pserver:anonymous@cvs.debian.org:/cvs/debian-policy "
+#~ "login</pre>and just press enter when you are asked for a password.To "
+#~ "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 ""
-#~ "CVS sources working copy: set <code>CVSROOT</code>\n"
-#~ "  to <kbd>:ext:<var>userid</var>@cvs.debian.org:/cvs/debian-boot</kbd>,\n"
-#~ "  and check out the <kbd>boot-floppies/documentation</kbd> module."
+#~ "<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 ""
-#~ "取出 CVS 中的原始檔： 將 <code>CVSROOT</code> 設定為\n"
-#~ "  <kbd>:ext:<var>userid</var>@cvs.debian.org:/cvs/debian-boot</kbd>,\n"
-#~ "  然後 check out <kbd>boot-floppies/documentation</kbd> module。"
-
-#~ msgid "CVS via web"
-#~ msgstr "網頁檢視 CVS"
+#~ "<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 "
@@ -230,37 +239,28 @@ msgstr "PDF"
 #~ "使用 <a href=\"cvs\">SVN</a> 來取得 <get-vard dp_pkg_loc /> 的 SGML 原始"
 #~ "檔。"
 
+#~ msgid "CVS via web"
+#~ msgstr "網頁檢視 CVS"
+
 #~ 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."
+#~ "CVS sources working copy: set <code>CVSROOT</code>\n"
+#~ "  to <kbd>:ext:<var>userid</var>@cvs.debian.org:/cvs/debian-boot</kbd>,\n"
+#~ "  and check out the <kbd>boot-floppies/documentation</kbd> module."
 #~ 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."
+#~ "取出 CVS 中的原始檔： 將 <code>CVSROOT</code> 設定為\n"
+#~ "  <kbd>:ext:<var>userid</var>@cvs.debian.org:/cvs/debian-boot</kbd>,\n"
+#~ "  然後 check out <kbd>boot-floppies/documentation</kbd> module。"
 
 #~ msgid ""
-#~ "CVS sources working copy: <p>Login to the CVS server using the command:"
-#~ "<br>\n"
-#~ "<pre>cvs -d:pserver:anonymous@cvs.debian.org:/cvs/debian-policy login</"
-#~ "pre>\n"
-#~ "and just press enter when you are asked for a password. To check out the "
-#~ "sources, use the command:<br>\n"
-#~ "<pre>cvs -d:pserver:anonymous@cvs.debian.org:/cvs/debian-policy co <get-"
-#~ "var doc /></pre>"
+#~ "The latest <get-var srctype /> source is available through the <a href="
+#~ "\"https://packages.debian.org/subversion\">Subversion</a> repository."
 #~ msgstr ""
-#~ "CVS sources working copy:<p>Login to the CVS server using the command:"
-#~ "<br><pre>cvs -d:pserver:anonymous@cvs.debian.org:/cvs/debian-policy "
-#~ "login</pre>and just press enter when you are asked for a password.To "
-#~ "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 "Language:"
-#~ msgstr "語言:"
+#~ "最新的 <get-var srctype /> 格式的源代码可由 <a href=\"https://packages."
+#~ "debian.org/subversion\">Subversion</a> 仓库获得。"
 
 #~ msgid ""
 #~ "The latest <get-var srctype /> source is available through the <a href="
-#~ "\"https://www.debian.org/doc/cvs\">Subversion</a> repository."
+#~ "\"https://packages.debian.org/cvs\">Cvs</a> repository."
 #~ msgstr ""
-#~ "<get-var srctype /> 的最新源代码可由 <a href=\"https://www.debian.org/doc/"
-#~ "cvs\">Subversion</a> 仓库获得。"
+#~ "最新的 <get-var srctype /> 格式的源代码可由 <a href=\"https://packages."
+#~ "debian.org/cvs\">Cvs</a> 仓库获得。"
diff --git a/chinese/po/homepage.zh.po b/chinese/po/homepage.zh.po
index 1bcd3a793bd..068d603b6c8 100644
--- a/chinese/po/homepage.zh.po
+++ b/chinese/po/homepage.zh.po
@@ -1,14 +1,14 @@
 msgid ""
 msgstr ""
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
 "Project-Id-Version: \n"
 "POT-Creation-Date: \n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: \n"
-"MIME-Version: 1.0\n"
 "Language: zh\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Poedit 2.4.2\n"
 
 #: ../../english/index.def:8
@@ -40,11 +40,15 @@ msgid "Screenshot from the Calamares installer"
 msgstr "来自 Calamares 安装器的截图"
 
 #: ../../english/index.def:33 ../../english/index.def:36
-msgid "Debian is like a Swiss Knife"
+#, fuzzy
+#| msgid "Debian is like a Swiss Knife"
+msgid "Debian is like a Swiss Army Knife"
 msgstr "Debian 如同瑞士军刀一样"
 
 #: ../../english/index.def:40
-msgid "People have fun"
+#, fuzzy
+#| msgid "People have fun"
+msgid "People have fun with Debian"
 msgstr "享受乐趣的参与者们"
 
 #: ../../english/index.def:43
diff --git a/chinese/po/mailinglists.zh.po b/chinese/po/mailinglists.zh.po
index cc4a4b38be4..a77da0f0cc7 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 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/newsevents.zh.po b/chinese/po/newsevents.zh.po
index 48f428fc731..6a7be7b07b3 100644
--- a/chinese/po/newsevents.zh.po
+++ b/chinese/po/newsevents.zh.po
@@ -473,34 +473,34 @@ msgstr ""
 "<void id=\"plural\" />Debian 每周快訊 (Debian Weekly News) 由 <a href="
 "\"mailto:dwn@debian.org\">%s</a> 負責編輯。"
 
-#~ msgid ""
-#~ "To receive this newsletter bi-weekly in your mailbox, <a href=\"https://"
-#~ "lists.debian.org/debian-news/\">subscribe to the debian-news mailing "
-#~ "list</a>."
-#~ msgstr ""
-#~ "想每兩個星期都以電子郵件方式接收快訊嗎？請<a href=\"https://lists.debian."
-#~ "org/debian-news/\">訂閱</a> debian-news 郵件列表。"
+#~ msgid "Name:"
+#~ msgstr "姓名："
 
-#~ msgid "Back to the <a href=\"./\">Debian speakers page</a>."
-#~ msgstr "返回 <a href=\"./\">Debian speakers page</a>."
+#~ msgid "Email:"
+#~ msgstr "Email："
 
-#~ msgid "List of Speakers"
-#~ msgstr "演講者名單"
+#~ msgid "Previous Talks:"
+#~ msgstr "前一次演講："
 
-#~ msgid "Topics:"
-#~ msgstr "主題："
+#~ msgid "Languages:"
+#~ msgstr "語言："
 
 #~ msgid "Location:"
 #~ msgstr "地點："
 
-#~ msgid "Languages:"
-#~ msgstr "語言："
+#~ msgid "Topics:"
+#~ msgstr "主題："
 
-#~ msgid "Previous Talks:"
-#~ msgstr "前一次演講："
+#~ msgid "List of Speakers"
+#~ msgstr "演講者名單"
 
-#~ msgid "Email:"
-#~ msgstr "Email："
+#~ msgid "Back to the <a href=\"./\">Debian speakers page</a>."
+#~ msgstr "返回 <a href=\"./\">Debian speakers page</a>."
 
-#~ msgid "Name:"
-#~ msgstr "姓名："
+#~ msgid ""
+#~ "To receive this newsletter bi-weekly in your mailbox, <a href=\"https://"
+#~ "lists.debian.org/debian-news/\">subscribe to the debian-news mailing "
+#~ "list</a>."
+#~ msgstr ""
+#~ "想每兩個星期都以電子郵件方式接收快訊嗎？請<a href=\"https://lists.debian."
+#~ "org/debian-news/\">訂閱</a> debian-news 郵件列表。"
diff --git a/chinese/po/organization.zh.po b/chinese/po/organization.zh.po
index 1008223cdc9..f464bdb805e 100644
--- a/chinese/po/organization.zh.po
+++ b/chinese/po/organization.zh.po
@@ -124,27 +124,27 @@ msgid "Distribution"
 msgstr "發行版"
 
 #: ../../english/intro/organization.data:72
-#: ../../english/intro/organization.data:209
+#: ../../english/intro/organization.data:203
 msgid "Communication and Outreach"
 msgstr ""
 
 #: ../../english/intro/organization.data:74
-#: ../../english/intro/organization.data:212
+#: ../../english/intro/organization.data:206
 msgid "Data Protection team"
 msgstr "数据保护团队"
 
 #: ../../english/intro/organization.data:75
-#: ../../english/intro/organization.data:217
+#: ../../english/intro/organization.data:211
 msgid "Publicity team"
 msgstr "宣传团队"
 
 #: ../../english/intro/organization.data:77
-#: ../../english/intro/organization.data:290
+#: ../../english/intro/organization.data:284
 msgid "Membership in other organizations"
 msgstr ""
 
 #: ../../english/intro/organization.data:78
-#: ../../english/intro/organization.data:318
+#: ../../english/intro/organization.data:312
 msgid "Support and Infrastructure"
 msgstr "支援以及下級組織"
 
@@ -250,140 +250,132 @@ msgstr "文档"
 msgid "Work-Needing and Prospective Packages list"
 msgstr "需要幫助的套件清單"
 
-#: ../../english/intro/organization.data:220
+#: ../../english/intro/organization.data:214
 msgid "Press Contact"
 msgstr ""
 
-#: ../../english/intro/organization.data:222
+#: ../../english/intro/organization.data:216
 msgid "Web Pages"
 msgstr "網頁"
 
-#: ../../english/intro/organization.data:234
+#: ../../english/intro/organization.data:228
 msgid "Planet Debian"
 msgstr "Debian 星球"
 
-#: ../../english/intro/organization.data:239
+#: ../../english/intro/organization.data:233
 msgid "Outreach"
 msgstr ""
 
-#: ../../english/intro/organization.data:244
+#: ../../english/intro/organization.data:238
 msgid "Debian Women Project"
 msgstr "Debian Women 計劃"
 
-#: ../../english/intro/organization.data:252
+#: ../../english/intro/organization.data:246
 msgid "Community"
 msgstr ""
 
-#: ../../english/intro/organization.data:261
+#: ../../english/intro/organization.data:255
 msgid ""
 "To send a private message to all the members of the Community Team, use the "
 "GPG key <a href=\"community-team-pubkey.txt"
 "\">817DAE61E2FE4CA28E1B7762A89C4D0527C4C869</a>."
 msgstr ""
 
-#: ../../english/intro/organization.data:263
+#: ../../english/intro/organization.data:257
 msgid "Events"
 msgstr "活動"
 
-#: ../../english/intro/organization.data:270
+#: ../../english/intro/organization.data:264
 msgid "DebConf Committee"
 msgstr "DebConf 委員會"
 
-#: ../../english/intro/organization.data:277
+#: ../../english/intro/organization.data:271
 msgid "Partner Program"
 msgstr "合作計劃"
 
-#: ../../english/intro/organization.data:281
+#: ../../english/intro/organization.data:275
 msgid "Hardware Donations Coordination"
 msgstr "硬體捐贈协调"
 
-#: ../../english/intro/organization.data:296
+#: ../../english/intro/organization.data:290
 msgid "GNOME Foundation"
 msgstr "GNOME 基金會"
 
-#: ../../english/intro/organization.data:298
+#: ../../english/intro/organization.data:292
 msgid "Linux Professional Institute"
 msgstr ""
 
-#: ../../english/intro/organization.data:300
+#: ../../english/intro/organization.data:294
 msgid "Linux Magazine"
 msgstr ""
 
-#: ../../english/intro/organization.data:302
+#: ../../english/intro/organization.data:296
 msgid "Linux Standards Base"
 msgstr ""
 
-#: ../../english/intro/organization.data:304
+#: ../../english/intro/organization.data:298
 msgid "Free Standards Group"
 msgstr ""
 
-#: ../../english/intro/organization.data:305
+#: ../../english/intro/organization.data:299
 msgid "SchoolForge"
 msgstr ""
 
-#: ../../english/intro/organization.data:308
+#: ../../english/intro/organization.data:302
 msgid ""
 "OASIS: Organization\n"
 "      for the Advancement of Structured Information Standards"
 msgstr ""
 
-#: ../../english/intro/organization.data:311
+#: ../../english/intro/organization.data:305
 msgid ""
 "OVAL: Open Vulnerability\n"
 "      Assessment Language"
 msgstr ""
 
-#: ../../english/intro/organization.data:314
+#: ../../english/intro/organization.data:308
 msgid "Open Source Initiative"
 msgstr ""
 
-#: ../../english/intro/organization.data:321
+#: ../../english/intro/organization.data:315
 msgid "Bug Tracking System"
 msgstr "錯誤追縱系統"
 
-#: ../../english/intro/organization.data:326
+#: ../../english/intro/organization.data:320
 msgid "Mailing Lists Administration and Mailing List Archives"
 msgstr "郵件列表管理與郵件列表庫存"
 
-#: ../../english/intro/organization.data:335
+#: ../../english/intro/organization.data:329
 msgid "New Members Front Desk"
 msgstr "新進開發人員前台"
 
-#: ../../english/intro/organization.data:341
+#: ../../english/intro/organization.data:335
 msgid "Debian Account Managers"
 msgstr "Debian 帳號管理員"
 
-#: ../../english/intro/organization.data:345
+#: ../../english/intro/organization.data:339
 msgid ""
 "To send a private message to all DAMs, use the GPG key "
 "57731224A9762EA155AB2A530CA8D15BB24D96F2."
 msgstr ""
 
-#: ../../english/intro/organization.data:346
+#: ../../english/intro/organization.data:340
 msgid "Keyring Maintainers (PGP and GPG)"
 msgstr "Keyring (PGP 與 GPG) 管理員"
 
-#: ../../english/intro/organization.data:350
+#: ../../english/intro/organization.data:344
 msgid "Security Team"
 msgstr "安全團隊"
 
-#: ../../english/intro/organization.data:361
-msgid "Consultants Page"
-msgstr "顧問網頁"
-
-#: ../../english/intro/organization.data:366
-msgid "CD Vendors Page"
-msgstr "CD 廠商網頁"
-
-#: ../../english/intro/organization.data:369
+#: ../../english/intro/organization.data:355
 msgid "Policy"
 msgstr "政策"
 
-#: ../../english/intro/organization.data:372
+#: ../../english/intro/organization.data:358
 msgid "System Administration"
 msgstr "系統管理"
 
-#: ../../english/intro/organization.data:373
+#: ../../english/intro/organization.data:359
 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."
@@ -391,7 +383,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:383
+#: ../../english/intro/organization.data:369
 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 "
@@ -401,52 +393,58 @@ msgstr ""
 "\"https://db.debian.org/machines.cgi\">Debian Machines</a> page,it should "
 "contain per-machine administrator information."
 
-#: ../../english/intro/organization.data:384
+#: ../../english/intro/organization.data:370
 msgid "LDAP Developer Directory Administrator"
 msgstr "LDAP 開發人員目錄管理"
 
-#: ../../english/intro/organization.data:385
+#: ../../english/intro/organization.data:371
 msgid "Mirrors"
 msgstr "鏡像站台"
 
-#: ../../english/intro/organization.data:392
+#: ../../english/intro/organization.data:378
 msgid "DNS Maintainer"
 msgstr "DNS 管理"
 
-#: ../../english/intro/organization.data:393
+#: ../../english/intro/organization.data:379
 msgid "Package Tracking System"
 msgstr "套件追蹤系統"
 
-#: ../../english/intro/organization.data:395
+#: ../../english/intro/organization.data:381
 msgid "Treasurer"
 msgstr ""
 
-#: ../../english/intro/organization.data:402
+#: ../../english/intro/organization.data:388
 msgid ""
 "<a name=\"trademark\" href=\"m4_HOME/trademark\">Trademark</a> use requests"
 msgstr ""
 
-#: ../../english/intro/organization.data:406
+#: ../../english/intro/organization.data:392
 msgid "Salsa administrators"
 msgstr "Salsa 管理员"
 
-#~ msgid "Ports"
-#~ msgstr "移植"
+#~ msgid "Anti-harassment"
+#~ msgstr "反骚扰"
 
-#~ msgid "Special Configurations"
-#~ msgstr "特別[CN:配置:][HKTW:組態設定:]"
+#~ msgid "User support"
+#~ msgstr "[CNHK:用戶:][TW:使用者:][HKTW:支援:][CN:支持:]"
 
-#~ msgid "Laptops"
-#~ msgstr "筆記型電腦"
+#~ msgid "Embedded systems"
+#~ msgstr "嵌入式系統"
 
 #~ msgid "Firewalls"
 #~ msgstr "防火牆"
 
-#~ msgid "Embedded systems"
-#~ msgstr "嵌入式系統"
+#~ msgid "Laptops"
+#~ msgstr "筆記型電腦"
 
-#~ msgid "User support"
-#~ msgstr "[CNHK:用戶:][TW:使用者:][HKTW:支援:][CN:支持:]"
+#~ msgid "Special Configurations"
+#~ msgstr "特別[CN:配置:][HKTW:組態設定:]"
 
-#~ msgid "Anti-harassment"
-#~ msgstr "反骚扰"
+#~ msgid "Ports"
+#~ msgstr "移植"
+
+#~ msgid "CD Vendors Page"
+#~ msgstr "CD 廠商網頁"
+
+#~ msgid "Consultants Page"
+#~ msgstr "顧問網頁"
diff --git a/chinese/po/others.zh.po b/chinese/po/others.zh.po
index c1ec872bf8f..6321e61cb77 100644
--- a/chinese/po/others.zh.po
+++ b/chinese/po/others.zh.po
@@ -12,46 +12,6 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Poedit 2.2.1\n"
 
-#: ../../english/devel/debian-installer/ports-status.defs:10
-msgid "Working"
-msgstr "可用的"
-
-#: ../../english/devel/debian-installer/ports-status.defs:20
-msgid "sarge"
-msgstr "sarge"
-
-#: ../../english/devel/debian-installer/ports-status.defs:30
-msgid "sarge (broken)"
-msgstr "sarge (損毀)"
-
-#: ../../english/devel/debian-installer/ports-status.defs:40
-msgid "Booting"
-msgstr "可開機"
-
-#: ../../english/devel/debian-installer/ports-status.defs:50
-msgid "Building"
-msgstr "可以建置"
-
-#: ../../english/devel/debian-installer/ports-status.defs:56
-msgid "Not yet"
-msgstr "尚未"
-
-#: ../../english/devel/debian-installer/ports-status.defs:59
-msgid "No kernel"
-msgstr "沒有核心"
-
-#: ../../english/devel/debian-installer/ports-status.defs:62
-msgid "No images"
-msgstr "沒有映像檔"
-
-#: ../../english/devel/debian-installer/ports-status.defs:65
-msgid "<void id=\"d-i\" />Unknown"
-msgstr "<void id=\"d-i\" />未知"
-
-#: ../../english/devel/debian-installer/ports-status.defs:68
-msgid "Unavailable"
-msgstr "未提供"
-
 #: ../../english/devel/join/nm-steps.inc:7
 msgid "New Members Corner"
 msgstr "新成员专区"
@@ -291,62 +251,52 @@ msgstr "您是否认识其它位于技术团体中的女性？您能否给出名
 msgid "A bit more about you..."
 msgstr "关于您的更多信息..."
 
-#~ msgid "Download"
-#~ msgstr "下載"
-
-#~ msgid "Old banner ads"
-#~ msgstr "舊的橫幅廣告"
-
-#~ msgid "OK"
-#~ msgstr "合格"
-
-#~ msgid "BAD"
-#~ msgstr "不合格"
-
-#~ msgid "OK?"
-#~ msgstr "合格?"
+#~ msgid "Wanted:"
+#~ msgstr "希望："
 
-#~ msgid "BAD?"
-#~ msgstr "不合格?"
+#~ msgid "Who:"
+#~ msgstr "誰："
 
-#~ msgid "??"
-#~ msgstr "？？"
+#~ msgid "Architecture:"
+#~ msgstr "硬體架構："
 
-#~ msgid "Unknown"
-#~ msgstr "[CN:未知:][HKTW:不詳:]"
+#~ msgid "Specifications:"
+#~ msgstr "詳細資訊："
 
-#~ msgid "ALL"
-#~ msgstr "全部"
+#~ msgid "Where:"
+#~ msgstr "地點："
 
-#~ msgid "Package"
-#~ msgstr "軟件套件"
+#~ msgid "Debian Technical Committee only"
+#~ msgstr "限於 Debian 技術委員會"
 
-#~ msgid "Status"
-#~ msgstr "狀況"
+#~ msgid "deity developers only"
+#~ msgstr "限於 deity 開發者"
 
-#~ msgid "Version"
-#~ msgstr "版本"
+#~ msgid "developers only"
+#~ msgstr "限於開發者"
 
-#~ msgid "URL"
-#~ msgstr "網址"
+#~ msgid "closed"
+#~ msgstr "關閉"
 
-#~ msgid "Name:"
-#~ msgstr "姓名："
+#~ msgid "open"
+#~ msgstr "公開"
 
-#~ msgid "Company:"
-#~ msgstr "公司："
+#~ msgid "Mailing List Unsubscription"
+#~ msgstr "取消訂閱郵件列表"
 
-#~ msgid "URL:"
-#~ msgstr "網址："
+#~ msgid ""
+#~ "Please respect the <a href=\"./#ads\">Debian mailing list advertising "
+#~ "policy</a>."
+#~ msgstr "請尊重 <a href=\"./#ads\">Debian 郵件列表廣告政策</a>。"
 
-#~ msgid "or"
-#~ msgstr "或"
+#~ msgid "Clear"
+#~ msgstr "清除"
 
-#~ msgid "Email:"
-#~ msgstr "Email："
+#~ msgid "Your E-Mail address:"
+#~ msgstr "您的 E-Mail 地址："
 
-#~ msgid "Rates:"
-#~ msgstr "收費："
+#~ msgid "Mailing List Subscription"
+#~ msgstr "訂閱郵件列表"
 
 #~ msgid ""
 #~ "<total_consultant> Debian consultants listed in <total_country> countries "
@@ -355,49 +305,89 @@ msgstr "关于您的更多信息..."
 #~ "以下的名單中共有來自世界 <total_country> 個國家的 <total_consultant> 個 "
 #~ "Debian 顧問。"
 
-#~ msgid "Mailing List Subscription"
-#~ msgstr "訂閱郵件列表"
+#~ msgid "Rates:"
+#~ msgstr "收費："
 
-#~ msgid "Your E-Mail address:"
-#~ msgstr "您的 E-Mail 地址："
+#~ msgid "Email:"
+#~ msgstr "Email："
 
-#~ msgid "Clear"
-#~ msgstr "清除"
+#~ msgid "or"
+#~ msgstr "或"
 
-#~ msgid ""
-#~ "Please respect the <a href=\"./#ads\">Debian mailing list advertising "
-#~ "policy</a>."
-#~ msgstr "請尊重 <a href=\"./#ads\">Debian 郵件列表廣告政策</a>。"
+#~ msgid "URL:"
+#~ msgstr "網址："
 
-#~ msgid "Mailing List Unsubscription"
-#~ msgstr "取消訂閱郵件列表"
+#~ msgid "Company:"
+#~ msgstr "公司："
 
-#~ msgid "open"
-#~ msgstr "公開"
+#~ msgid "Name:"
+#~ msgstr "姓名："
 
-#~ msgid "closed"
-#~ msgstr "關閉"
+#~ msgid "URL"
+#~ msgstr "網址"
 
-#~ msgid "developers only"
-#~ msgstr "限於開發者"
+#~ msgid "Version"
+#~ msgstr "版本"
 
-#~ msgid "deity developers only"
-#~ msgstr "限於 deity 開發者"
+#~ msgid "Status"
+#~ msgstr "狀況"
 
-#~ msgid "Debian Technical Committee only"
-#~ msgstr "限於 Debian 技術委員會"
+#~ msgid "Package"
+#~ msgstr "軟件套件"
 
-#~ msgid "Where:"
-#~ msgstr "地點："
+#~ msgid "ALL"
+#~ msgstr "全部"
 
-#~ msgid "Specifications:"
-#~ msgstr "詳細資訊："
+#~ msgid "Unknown"
+#~ msgstr "[CN:未知:][HKTW:不詳:]"
 
-#~ msgid "Architecture:"
-#~ msgstr "硬體架構："
+#~ msgid "??"
+#~ msgstr "？？"
 
-#~ msgid "Who:"
-#~ msgstr "誰："
+#~ msgid "BAD?"
+#~ msgstr "不合格?"
 
-#~ msgid "Wanted:"
-#~ msgstr "希望："
+#~ msgid "OK?"
+#~ msgstr "合格?"
+
+#~ msgid "BAD"
+#~ msgstr "不合格"
+
+#~ msgid "OK"
+#~ msgstr "合格"
+
+#~ msgid "Old banner ads"
+#~ msgstr "舊的橫幅廣告"
+
+#~ msgid "Download"
+#~ msgstr "下載"
+
+#~ msgid "Unavailable"
+#~ msgstr "未提供"
+
+#~ msgid "<void id=\"d-i\" />Unknown"
+#~ msgstr "<void id=\"d-i\" />未知"
+
+#~ msgid "No images"
+#~ msgstr "沒有映像檔"
+
+#~ msgid "No kernel"
+#~ msgstr "沒有核心"
+
+#~ msgid "Not yet"
+#~ msgstr "尚未"
+
+#~ msgid "Building"
+#~ msgstr "可以建置"
+
+#~ msgid "Booting"
+#~ msgstr "可開機"
+
+#~ msgid "sarge (broken)"
+#~ msgstr "sarge (損毀)"
+
+#~ msgid "sarge"
+#~ msgstr "sarge"
+
+#~ msgid "Working"
+#~ msgstr "可用的"
diff --git a/chinese/po/ports.zh.po b/chinese/po/ports.zh.po
index fe9b8fa4e03..279e8d38c17 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 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 b22f5c229fc..f2fe657e925 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 "Unified diff"
-#~ msgstr "合并差异"
+#~ msgid "Origin"
+#~ msgstr "原文"
 
-#~ msgid "Colored diff"
-#~ msgstr "带颜色差异"
+#~ msgid "Created with"
+#~ msgstr "此網頁創建工具："
 
 #~ msgid "Commit diff"
 #~ msgstr "提交差异"
 
-#~ msgid "Created with"
-#~ msgstr "此網頁創建工具："
+#~ msgid "Colored diff"
+#~ msgstr "带颜色差异"
 
-#~ msgid "Origin"
-#~ msgstr "原文"
+#~ msgid "Unified diff"
+#~ msgstr "合并差异"
diff --git a/chinese/po/templates.zh.po b/chinese/po/templates.zh.po
index 940642f062a..4715bc0082b 100644
--- a/chinese/po/templates.zh.po
+++ b/chinese/po/templates.zh.po
@@ -165,6 +165,18 @@ msgid "The Debian Blog"
 msgstr "Debian 博客"
 
 #: ../../english/template/debian/common_translation.wml:94
+#, fuzzy
+#| msgid "Debian Project News"
+msgid "Debian Micronews"
+msgstr "Debian 計劃新聞"
+
+#: ../../english/template/debian/common_translation.wml:97
+#, fuzzy
+#| msgid "Debian Project"
+msgid "Debian Planet"
+msgstr "Debian 計劃"
+
+#: ../../english/template/debian/common_translation.wml:100
 msgid "Last Updated"
 msgstr "最近更新日期"
 
@@ -213,7 +225,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:91
+#: ../../english/template/debian/footer.wml:89
 msgid ""
 "To report a problem with the web site, please e-mail our publicly archived "
 "mailing list <a href=\"mailto:debian-www@lists.debian.org\">debian-www@lists."
@@ -228,27 +240,27 @@ msgstr ""
 "</a>。网站的源代码可<a href=\"https://salsa.debian.org/webmaster-team/webwml"
 "\">在此处找到</a>。"
 
-#: ../../english/template/debian/footer.wml:94
+#: ../../english/template/debian/footer.wml:92
 msgid "Last Modified"
 msgstr "最近修訂日期"
 
-#: ../../english/template/debian/footer.wml:97
+#: ../../english/template/debian/footer.wml:95
 msgid "Last Built"
 msgstr "最近构建日期"
 
-#: ../../english/template/debian/footer.wml:100
+#: ../../english/template/debian/footer.wml:98
 msgid "Copyright"
 msgstr "版權所有"
 
-#: ../../english/template/debian/footer.wml:103
+#: ../../english/template/debian/footer.wml:101
 msgid "<a href=\"https://www.spi-inc.org/\">SPI</a> and others;"
 msgstr "<a href=\"https://www.spi-inc.org/\">SPI</a> 及其他；"
 
-#: ../../english/template/debian/footer.wml:106
+#: ../../english/template/debian/footer.wml:104
 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:109
+#: ../../english/template/debian/footer.wml:107
 msgid ""
 "Debian is a registered <a href=\"m4_HOME/trademark\">trademark</a> of "
 "Software in the Public Interest, Inc."
@@ -547,169 +559,97 @@ msgstr "網址"
 msgid "Back to the <a href=\"../\">Who's using Debian? page</a>."
 msgstr "返回<a href=\"./\">谁在使用 Debian？页面</a>。"
 
-#~ msgid "Back to the <a href=\"./\">Debian consultants page</a>."
-#~ msgstr "返回 <a href=\"./\">Debian consultants page</a>."
-
-#, fuzzy
-#~ msgid "Download with Jigdo"
-#~ msgstr "用 jigdo 下載"
-
-#, fuzzy
-#~ msgid "Download via HTTP/FTP"
-#~ msgstr "透過 http/ftp 下載"
-
-#, fuzzy
-#~ msgid "Network Install"
-#~ msgstr "網絡安裝"
-
-#~ msgid "Debian CD team"
-#~ msgstr "<span lang=\"en\">Debian </span>光碟小組"
-
-#~ msgid "jigdo"
-#~ msgstr "jigdo"
-
-#~ msgid "http_ftp"
-#~ msgstr "http_ftp"
-
-#, fuzzy
-#~ msgid "Nominations"
-#~ msgstr "捐款"
-
-#, fuzzy
-#~ msgid "Debate"
-#~ msgstr "<span lang=\"en\">Debian </span>光碟小組"
-
-#, fuzzy
-#~ msgid "Minimum Discussion"
-#~ msgstr "討論中"
-
-#~ msgid "Waiting&nbsp;for&nbsp;Sponsors"
-#~ msgstr "有待贊助"
-
-#~ msgid "In&nbsp;Discussion"
-#~ msgstr "討論中"
+#~ msgid "Visit the site sponsor"
+#~ msgstr "[CN:訪問:][HKTW:拜訪:]本站贊助商"
 
-#~ msgid "Voting&nbsp;Open"
-#~ msgstr "接受投票中"
+#~ msgid "Select a server near you"
+#~ msgstr "請[CN:就近選擇服務器:][HKTW:選擇就近的伺服器:]"
 
-#~ msgid "Decided"
-#~ msgstr "已決定"
+#~ msgid "More information:"
+#~ msgstr "更多訊息:"
 
-#~ msgid "Other"
-#~ msgstr "其他"
+#~ msgid "Taken by:"
+#~ msgstr "認領:"
 
-#~ msgid "Home&nbsp;Vote&nbsp;Page"
-#~ msgstr "投票主頁"
+#~ msgid "Nobody"
+#~ msgstr "沒有人"
 
-#~ msgid "Submit&nbsp;a&nbsp;Proposal"
-#~ msgstr "提出議案"
+#~ msgid "Rating:"
+#~ msgstr "評分:"
 
-#~ msgid "Amend&nbsp;a&nbsp;Proposal"
-#~ msgstr "修正議案"
+#~ msgid "More information"
+#~ msgstr "更詳盡的[CN:信息:][HKTW:資訊:]"
 
-#~ msgid "Follow&nbsp;a&nbsp;Proposal"
-#~ msgstr "跟隨議案的進展"
+#~ msgid "Where"
+#~ msgstr "Where（何處*）"
 
-#~ msgid "Read&nbsp;a&nbsp;Result"
-#~ msgstr "查看結果"
+#~ msgid "More Info"
+#~ msgstr "更多[CN:信息:][HKTW:資訊:]"
 
-#~ msgid "Vote"
-#~ msgstr "投票"
+#~ msgid "<th>Project</th><th>Coordinator</th>"
+#~ msgstr "<th>計劃</th><th>Coordinator</th>"
 
-#~ 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 "Related Links"
+#~ msgstr "相關網址"
 
-#~ msgid ""
-#~ "Debian Weekly News is edited by <a href=\"mailto:dwn@debian.org"
-#~ "\">Yooseong Yang and Martin 'Joey' Schulze</a>."
-#~ msgstr ""
-#~ "Debian 每週快訊 (Debian Weekly News) 由 <a href=\"mailto:dwn@debian.org"
-#~ "\">Yooseong Yang 和 Martin 'Joey' Schulze</a> 負責編輯。"
+#~ msgid "Latest News"
+#~ msgstr "最新消息"
 
+#, fuzzy
 #~ 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 "可被襲擊"
+#~ "Back to: other <a href=\"./\">Debian news</a> || <a href=\"m4_HOME/"
+#~ "\">Debian Project homepage</a>."
+#~ msgstr "返回 <a href=\"m4_HOME/\">Debian 計劃主頁</a>"
 
+#, fuzzy
 #~ msgid ""
-#~ "See the Debian <a href=\"m4_HOME/contact\">contact page</a> for "
-#~ "information on contacting us."
+#~ "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 ""
-#~ "請參閱<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 "受影響的軟件"
+#~ "想每個星期都以電子郵件方式接收「每週快訊」嗎？請<a href=\"m4_HOME/"
+#~ "MailingLists/subscribe#debian-news\">訂閱</a> debian-news 郵件列表。"
 
-#, fuzzy
-#~ msgid "No requests for adoption"
-#~ msgstr "更詳盡的[CN:信息:][HKTW:資訊:]"
+#~ msgid "<a href=\"../../\">Back issues</a> of this newsletter are available."
+#~ msgstr "您亦可翻閱<a href=\"../../\">過往的報導</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 ""
-#~ "<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\" />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\" />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 "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>."
@@ -718,91 +658,163 @@ 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=\"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 ""
-#~ "<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\" />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\" />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> 負責編輯。"
 
-#~ msgid "<a href=\"../../\">Back issues</a> of this newsletter are available."
-#~ msgstr "您亦可翻閱<a href=\"../../\">過往的報導</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 "討論中"
+
+#, fuzzy
+#~ msgid "non-free"
+#~ msgstr "無"
+
+#~ msgid "buy pre-made images"
+#~ msgstr "購買預製映像"
+
+#~ msgid "download with pik"
+#~ msgstr "用 pik 下載"
+
 #~ 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>."
+#~ "See the Debian <a href=\"m4_HOME/contact\">contact page</a> for "
+#~ "information on contacting us."
 #~ msgstr ""
-#~ "想每個星期都以電子郵件方式接收「每週快訊」嗎？請<a href=\"m4_HOME/"
-#~ "MailingLists/subscribe#debian-news\">訂閱</a> debian-news 郵件列表。"
+#~ "請參閱<a href=\"m4_HOME/contact\">聯繫方法</a>與我們[CN:取得聯繫:][HKTW:聯"
+#~ "絡:]。"
+
+#~ msgid "Vulnerable"
+#~ msgstr "可被襲擊"
+
+#~ msgid "Fixed in"
+#~ 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\">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 "Latest News"
-#~ msgstr "最新消息"
+#~ msgid ""
+#~ "Debian Weekly News is edited by <a href=\"mailto:dwn@debian.org"
+#~ "\">Yooseong Yang and Martin 'Joey' Schulze</a>."
+#~ msgstr ""
+#~ "Debian 每週快訊 (Debian Weekly News) 由 <a href=\"mailto:dwn@debian.org"
+#~ "\">Yooseong Yang 和 Martin 'Joey' Schulze</a> 負責編輯。"
 
-#~ msgid "Related Links"
-#~ msgstr "相關網址"
+#~ 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 "<th>Project</th><th>Coordinator</th>"
-#~ msgstr "<th>計劃</th><th>Coordinator</th>"
+#~ msgid "Vote"
+#~ msgstr "投票"
 
-#~ msgid "More Info"
-#~ msgstr "更多[CN:信息:][HKTW:資訊:]"
+#~ msgid "Read&nbsp;a&nbsp;Result"
+#~ msgstr "查看結果"
 
-#~ msgid "Where"
-#~ msgstr "Where（何處*）"
+#~ msgid "Follow&nbsp;a&nbsp;Proposal"
+#~ msgstr "跟隨議案的進展"
 
-#~ msgid "More information"
-#~ msgstr "更詳盡的[CN:信息:][HKTW:資訊:]"
+#~ msgid "Amend&nbsp;a&nbsp;Proposal"
+#~ msgstr "修正議案"
 
-#~ msgid "Rating:"
-#~ msgstr "評分:"
+#~ msgid "Submit&nbsp;a&nbsp;Proposal"
+#~ msgstr "提出議案"
 
-#~ msgid "Nobody"
-#~ msgstr "沒有人"
+#~ msgid "Home&nbsp;Vote&nbsp;Page"
+#~ msgstr "投票主頁"
 
-#~ msgid "Taken by:"
-#~ msgstr "認領:"
+#~ msgid "Other"
+#~ msgstr "其他"
 
-#~ msgid "More information:"
-#~ msgstr "更多訊息:"
+#~ msgid "Decided"
+#~ msgstr "已決定"
 
-#~ msgid "Select a server near you"
-#~ msgstr "請[CN:就近選擇服務器:][HKTW:選擇就近的伺服器:]"
+#~ msgid "Voting&nbsp;Open"
+#~ msgstr "接受投票中"
 
-#~ msgid "Visit the site sponsor"
-#~ msgstr "[CN:訪問:][HKTW:拜訪:]本站贊助商"
+#~ msgid "In&nbsp;Discussion"
+#~ msgstr "討論中"
+
+#~ msgid "Waiting&nbsp;for&nbsp;Sponsors"
+#~ msgstr "有待贊助"
+
+#, fuzzy
+#~ msgid "Minimum Discussion"
+#~ msgstr "討論中"
+
+#, fuzzy
+#~ msgid "Debate"
+#~ msgstr "<span lang=\"en\">Debian </span>光碟小組"
+
+#, fuzzy
+#~ msgid "Nominations"
+#~ msgstr "捐款"
+
+#~ msgid "http_ftp"
+#~ msgstr "http_ftp"
+
+#~ msgid "jigdo"
+#~ msgstr "jigdo"
+
+#~ msgid "Debian CD team"
+#~ msgstr "<span lang=\"en\">Debian </span>光碟小組"
+
+#, fuzzy
+#~ msgid "Network Install"
+#~ msgstr "網絡安裝"
+
+#, fuzzy
+#~ msgid "Download via HTTP/FTP"
+#~ msgstr "透過 http/ftp 下載"
+
+#, fuzzy
+#~ msgid "Download with Jigdo"
+#~ msgstr "用 jigdo 下載"
+
+#~ msgid "Back to the <a href=\"./\">Debian consultants page</a>."
+#~ msgstr "返回 <a href=\"./\">Debian consultants page</a>."
diff --git a/chinese/po/vendors.zh.po b/chinese/po/vendors.zh.po
index a5967fb766e..6cd168bccb9 100644
--- a/chinese/po/vendors.zh.po
+++ b/chinese/po/vendors.zh.po
@@ -68,74 +68,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 "每月更新"