[Chinese] update language templates

12 files changed, 692 insertions, 638 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 6d15cce4138..203f2a5ea9d 100644
--- a/chinese/po/countries.zh.po
+++ b/chinese/po/countries.zh.po
@@ -431,8 +431,8 @@ msgstr "南非"
 msgid "Zimbabwe"
 msgstr "津巴布韦"
 
-#~ msgid "Great Britain"
-#~ msgstr "英國"
-
 #~ msgid "Yugoslavia"
 #~ msgstr "南斯拉夫"
+
+#~ msgid "Great Britain"
+#~ msgstr "英國"
diff --git a/chinese/po/doc.zh.po b/chinese/po/doc.zh.po
index c723e538acd..87491f1d25b 100644
--- a/chinese/po/doc.zh.po
+++ b/chinese/po/doc.zh.po
@@ -110,7 +110,6 @@ msgid "Author:"
 msgstr "作者："
 
 #: ../../english/doc/books.def:41
-#| msgid "Debian package"
 msgid "Debian Release:"
 msgstr "Debian 版本："
 
@@ -162,7 +161,8 @@ msgstr "(version <get-var version />)"
 msgid "plain text"
 msgstr "純文字"
 
-#: ../../english/doc/manuals.defs:159 ../../english/doc/manuals.defs:183
+#: ../../english/doc/manuals.defs:159 ../../english/doc/manuals.defs:169
+#: ../../english/doc/manuals.defs:193
 msgid ""
 "The latest <get-var srctype /> source is available through the <a href="
 "\"https://packages.debian.org/git\">Git</a> repository."
@@ -170,17 +170,19 @@ msgstr ""
 "最新的 <get-var srctype /> 格式的源代码可由 <a href=\"https://packages."
 "debian.org/git\">Git</a> 仓库获得。"
 
-#: ../../english/doc/manuals.defs:161 ../../english/doc/manuals.defs:169
-#: ../../english/doc/manuals.defs:177 ../../english/doc/manuals.defs:185
+#: ../../english/doc/manuals.defs:161 ../../english/doc/manuals.defs:171
+#: ../../english/doc/manuals.defs:179 ../../english/doc/manuals.defs:187
+#: ../../english/doc/manuals.defs:195
 msgid "Web interface: "
 msgstr "网页界面："
 
-#: ../../english/doc/manuals.defs:162 ../../english/doc/manuals.defs:170
-#: ../../english/doc/manuals.defs:178 ../../english/doc/manuals.defs:186
+#: ../../english/doc/manuals.defs:162 ../../english/doc/manuals.defs:172
+#: ../../english/doc/manuals.defs:180 ../../english/doc/manuals.defs:188
+#: ../../english/doc/manuals.defs:196
 msgid "VCS interface: "
 msgstr "VCS 界面："
 
-#: ../../english/doc/manuals.defs:167
+#: ../../english/doc/manuals.defs:177
 msgid ""
 "The latest <get-var srctype /> source is available through the <a href="
 "\"https://packages.debian.org/cvs\">Cvs</a> repository."
@@ -188,7 +190,7 @@ msgstr ""
 "最新的 <get-var srctype /> 格式的源代码可由 <a href=\"https://packages."
 "debian.org/cvs\">Cvs</a> 仓库获得。"
 
-#: ../../english/doc/manuals.defs:175
+#: ../../english/doc/manuals.defs:185
 msgid ""
 "The latest <get-var srctype /> source is available through the <a href="
 "\"https://packages.debian.org/subversion\">Subversion</a> repository."
@@ -196,7 +198,7 @@ msgstr ""
 "最新的 <get-var srctype /> 格式的源代码可由 <a href=\"https://packages."
 "debian.org/subversion\">Subversion</a> 仓库获得。"
 
-#: ../../english/doc/manuals.defs:193
+#: ../../english/doc/manuals.defs:203
 msgid ""
 "CVS sources working copy: set <code>CVSROOT</code>\n"
 "  to <kbd>:ext:<var>userid</var>@cvs.debian.org:/cvs/debian-boot</kbd>,\n"
@@ -206,15 +208,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:198
+#: ../../english/doc/manuals.defs:208
 msgid "CVS via web"
 msgstr "網頁檢視 CVS"
 
-#: ../../english/doc/manuals.defs:202 ../../english/doc/manuals.defs:206
+#: ../../english/doc/manuals.defs:212 ../../english/doc/manuals.defs:216
 msgid "Debian package"
 msgstr "Debian 套件"
 
-#: ../../english/doc/manuals.defs:211 ../../english/doc/manuals.defs:215
+#: ../../english/doc/manuals.defs:221 ../../english/doc/manuals.defs:225
 msgid "Debian package (archived)"
 msgstr "Debian 套件（已归档）"
 
@@ -227,14 +229,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:"
@@ -252,18 +260,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 140f313d39d..32afa915e5b 100644
--- a/chinese/po/newsevents.zh.po
+++ b/chinese/po/newsevents.zh.po
@@ -457,34 +457,34 @@ msgstr ""
 "<void id=\"plural\" />Debian 每周快訊 (Debian Weekly News) 由 <a href="
 "\"mailto:dwn@debian.org\">%s</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 郵件列表。"
 
-#~ msgid "Email:"
-#~ msgstr "Email："
+#~ msgid "Back to the <a href=\"./\">Debian speakers page</a>."
+#~ msgstr "返回 <a href=\"./\">Debian speakers page</a>."
 
-#~ msgid "Previous Talks:"
-#~ msgstr "前一次演講："
+#~ msgid "List of Speakers"
+#~ msgstr "演講者名單"
 
-#~ msgid "Languages:"
-#~ msgstr "語言："
+#~ msgid "Topics:"
+#~ msgstr "主題："
 
 #~ msgid "Location:"
 #~ msgstr "地點："
 
-#~ msgid "Topics:"
-#~ msgstr "主題："
+#~ msgid "Languages:"
+#~ msgstr "語言："
 
-#~ msgid "List of Speakers"
-#~ msgstr "演講者名單"
+#~ msgid "Previous Talks:"
+#~ msgstr "前一次演講："
 
-#~ msgid "Back to the <a href=\"./\">Debian speakers page</a>."
-#~ msgstr "返回 <a href=\"./\">Debian speakers page</a>."
+#~ msgid "Email:"
+#~ msgstr "Email："
 
-#~ 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 "姓名："
diff --git a/chinese/po/organization.zh.po b/chinese/po/organization.zh.po
index e098580aada..bc82dde10b7 100644
--- a/chinese/po/organization.zh.po
+++ b/chinese/po/organization.zh.po
@@ -69,256 +69,305 @@ msgstr "助理"
 msgid "secretary"
 msgstr "秘書"
 
-#: ../../english/intro/organization.data:59
-#: ../../english/intro/organization.data:72
+#: ../../english/intro/organization.data:45
+msgid "representative"
+msgstr ""
+
+#: ../../english/intro/organization.data:47
+msgid "role"
+msgstr ""
+
+#: ../../english/intro/organization.data:63
+#: ../../english/intro/organization.data:77
 msgid "Officers"
 msgstr "總管"
 
-#: ../../english/intro/organization.data:60
-#: ../../english/intro/organization.data:96
+#: ../../english/intro/organization.data:64
+#: ../../english/intro/organization.data:101
 msgid "Distribution"
 msgstr "發行版"
 
-#: ../../english/intro/organization.data:61
-#: ../../english/intro/organization.data:233
+#: ../../english/intro/organization.data:65
+#: ../../english/intro/organization.data:237
 msgid "Communication and Outreach"
 msgstr ""
 
-#: ../../english/intro/organization.data:63
-#: ../../english/intro/organization.data:236
+#: ../../english/intro/organization.data:67
+#: ../../english/intro/organization.data:240
 msgid "Data Protection team"
 msgstr "数据保护团队"
 
-#: ../../english/intro/organization.data:64
-#: ../../english/intro/organization.data:240
+#: ../../english/intro/organization.data:68
+#: ../../english/intro/organization.data:244
 msgid "Publicity team"
 msgstr "宣传团队"
 
-#: ../../english/intro/organization.data:66
-#: ../../english/intro/organization.data:307
+#: ../../english/intro/organization.data:70
+#: ../../english/intro/organization.data:311
+msgid "Membership in other organizations"
+msgstr ""
+
+#: ../../english/intro/organization.data:71
+#: ../../english/intro/organization.data:339
 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:68
+#: ../../english/intro/organization.data:73
 msgid "Debian Pure Blends"
 msgstr ""
 
-#: ../../english/intro/organization.data:75
+#: ../../english/intro/organization.data:80
 msgid "Leader"
 msgstr "領袖"
 
-#: ../../english/intro/organization.data:77
+#: ../../english/intro/organization.data:82
 msgid "Technical Committee"
 msgstr "技術委員會"
 
-#: ../../english/intro/organization.data:91
+#: ../../english/intro/organization.data:96
 msgid "Secretary"
 msgstr "秘書"
 
-#: ../../english/intro/organization.data:99
+#: ../../english/intro/organization.data:104
 msgid "Development Projects"
 msgstr "各項開發計劃"
 
-#: ../../english/intro/organization.data:100
+#: ../../english/intro/organization.data:105
 msgid "FTP Archives"
 msgstr "FTP 庫存"
 
-#: ../../english/intro/organization.data:102
+#: ../../english/intro/organization.data:107
 msgid "FTP Masters"
 msgstr "FTP 總管"
 
-#: ../../english/intro/organization.data:108
+#: ../../english/intro/organization.data:113
 msgid "FTP Assistants"
 msgstr "FTP 助理"
 
-#: ../../english/intro/organization.data:113
+#: ../../english/intro/organization.data:118
 msgid "FTP Wizards"
 msgstr ""
 
-#: ../../english/intro/organization.data:117
+#: ../../english/intro/organization.data:122
 msgid "Backports"
 msgstr ""
 
-#: ../../english/intro/organization.data:119
+#: ../../english/intro/organization.data:124
 msgid "Backports Team"
 msgstr ""
 
-#: ../../english/intro/organization.data:123
-msgid "Individual Packages"
-msgstr "個別軟件包"
-
-#: ../../english/intro/organization.data:124
+#: ../../english/intro/organization.data:128
 msgid "Release Management"
 msgstr "釋出管理"
 
-#: ../../english/intro/organization.data:126
+#: ../../english/intro/organization.data:130
 msgid "Release Team"
 msgstr "釋出團隊"
 
-#: ../../english/intro/organization.data:139
+#: ../../english/intro/organization.data:143
 msgid "Quality Assurance"
 msgstr "品質管理"
 
-#: ../../english/intro/organization.data:140
+#: ../../english/intro/organization.data:144
 msgid "Installation System Team"
 msgstr "安裝系統小組"
 
-#: ../../english/intro/organization.data:141
+#: ../../english/intro/organization.data:145
+msgid "Debian Live Team"
+msgstr ""
+
+#: ../../english/intro/organization.data:146
 msgid "Release Notes"
 msgstr "釋出公告"
 
-#: ../../english/intro/organization.data:143
+#: ../../english/intro/organization.data:148
 msgid "CD Images"
 msgstr "光碟映像"
 
-#: ../../english/intro/organization.data:145
+#: ../../english/intro/organization.data:150
 msgid "Production"
 msgstr "產品"
 
-#: ../../english/intro/organization.data:153
+#: ../../english/intro/organization.data:158
 msgid "Testing"
 msgstr "測試"
 
-#: ../../english/intro/organization.data:155
+#: ../../english/intro/organization.data:160
 msgid "Cloud Team"
 msgstr "云服务团队"
 
-#: ../../english/intro/organization.data:159
+#: ../../english/intro/organization.data:164
 msgid "Autobuilding infrastructure"
 msgstr "自动构建架构"
 
-#: ../../english/intro/organization.data:161
+#: ../../english/intro/organization.data:166
 msgid "Wanna-build team"
 msgstr "Wanna-build 团队"
 
-#: ../../english/intro/organization.data:168
+#: ../../english/intro/organization.data:173
 msgid "Buildd administration"
 msgstr "Buildd 管理"
 
-#: ../../english/intro/organization.data:186
+#: ../../english/intro/organization.data:191
 msgid "Documentation"
 msgstr "文档"
 
-#: ../../english/intro/organization.data:191
+#: ../../english/intro/organization.data:196
 msgid "Work-Needing and Prospective Packages list"
 msgstr "需要幫助的套件清單"
 
-#: ../../english/intro/organization.data:193
-msgid "Debian Live Team"
-msgstr ""
-
-#: ../../english/intro/organization.data:194
+#: ../../english/intro/organization.data:198
 msgid "Ports"
 msgstr "移植"
 
-#: ../../english/intro/organization.data:224
+#: ../../english/intro/organization.data:228
 msgid "Special Configurations"
 msgstr "特別[CN:配置:][HKTW:組態設定:]"
 
-#: ../../english/intro/organization.data:226
+#: ../../english/intro/organization.data:230
 msgid "Laptops"
 msgstr "筆記型電腦"
 
-#: ../../english/intro/organization.data:227
+#: ../../english/intro/organization.data:231
 msgid "Firewalls"
 msgstr "防火牆"
 
-#: ../../english/intro/organization.data:228
+#: ../../english/intro/organization.data:232
 msgid "Embedded systems"
 msgstr "嵌入式系統"
 
-#: ../../english/intro/organization.data:243
+#: ../../english/intro/organization.data:247
 msgid "Press Contact"
 msgstr ""
 
-#: ../../english/intro/organization.data:245
+#: ../../english/intro/organization.data:249
 msgid "Web Pages"
 msgstr "網頁"
 
-#: ../../english/intro/organization.data:255
+#: ../../english/intro/organization.data:259
 msgid "Planet Debian"
 msgstr "Debian 星球"
 
-#: ../../english/intro/organization.data:260
+#: ../../english/intro/organization.data:264
 msgid "Outreach"
 msgstr ""
 
-#: ../../english/intro/organization.data:265
+#: ../../english/intro/organization.data:269
 msgid "Debian Women Project"
 msgstr "Debian Women 計劃"
 
-#: ../../english/intro/organization.data:273
+#: ../../english/intro/organization.data:277
 msgid "Anti-harassment"
 msgstr "反骚扰"
 
-#: ../../english/intro/organization.data:278
+#: ../../english/intro/organization.data:282
 msgid "Events"
 msgstr "活動"
 
-#: ../../english/intro/organization.data:285
+#: ../../english/intro/organization.data:289
 msgid "DebConf Committee"
 msgstr "DebConf 委員會"
 
-#: ../../english/intro/organization.data:292
+#: ../../english/intro/organization.data:296
 msgid "Partner Program"
 msgstr "合作計劃"
 
-#: ../../english/intro/organization.data:297
+#: ../../english/intro/organization.data:301
 msgid "Hardware Donations Coordination"
 msgstr "硬體捐贈协调"
 
-#: ../../english/intro/organization.data:310
+#: ../../english/intro/organization.data:317
+msgid "GNOME Foundation"
+msgstr ""
+
+#: ../../english/intro/organization.data:319
+msgid "Linux Professional Institute"
+msgstr ""
+
+#: ../../english/intro/organization.data:321
+msgid "Linux Magazine"
+msgstr ""
+
+#: ../../english/intro/organization.data:323
+msgid "Linux Standards Base"
+msgstr ""
+
+#: ../../english/intro/organization.data:325
+msgid "Free Standards Group"
+msgstr ""
+
+#: ../../english/intro/organization.data:326
+msgid "SchoolForge"
+msgstr ""
+
+#: ../../english/intro/organization.data:329
+msgid ""
+"OASIS: Organization\n"
+"      for the Advancement of Structured Information Standards"
+msgstr ""
+
+#: ../../english/intro/organization.data:332
+msgid ""
+"OVAL: Open Vulnerability\n"
+"      Assessment Language"
+msgstr ""
+
+#: ../../english/intro/organization.data:335
+msgid "Open Source Initiative"
+msgstr ""
+
+#: ../../english/intro/organization.data:342
 msgid "User support"
 msgstr "[CNHK:用戶:][TW:使用者:][HKTW:支援:][CN:支持:]"
 
-#: ../../english/intro/organization.data:377
+#: ../../english/intro/organization.data:409
 msgid "Bug Tracking System"
 msgstr "錯誤追縱系統"
 
-#: ../../english/intro/organization.data:382
+#: ../../english/intro/organization.data:414
 msgid "Mailing Lists Administration and Mailing List Archives"
 msgstr "郵件列表管理與郵件列表庫存"
 
-#: ../../english/intro/organization.data:390
+#: ../../english/intro/organization.data:422
 msgid "New Members Front Desk"
 msgstr "新進開發人員前台"
 
-#: ../../english/intro/organization.data:396
+#: ../../english/intro/organization.data:428
 msgid "Debian Account Managers"
 msgstr "Debian 帳號管理員"
 
-#: ../../english/intro/organization.data:400
+#: ../../english/intro/organization.data:432
 msgid ""
 "To send a private message to all DAMs, use the GPG key "
 "57731224A9762EA155AB2A530CA8D15BB24D96F2."
 msgstr ""
 
-#: ../../english/intro/organization.data:401
+#: ../../english/intro/organization.data:433
 msgid "Keyring Maintainers (PGP and GPG)"
 msgstr "Keyring (PGP 與 GPG) 管理員"
 
-#: ../../english/intro/organization.data:405
+#: ../../english/intro/organization.data:437
 msgid "Security Team"
 msgstr "安全團隊"
 
-#: ../../english/intro/organization.data:417
+#: ../../english/intro/organization.data:448
 msgid "Consultants Page"
 msgstr "顧問網頁"
 
-#: ../../english/intro/organization.data:422
+#: ../../english/intro/organization.data:453
 msgid "CD Vendors Page"
 msgstr "CD 廠商網頁"
 
-#: ../../english/intro/organization.data:425
+#: ../../english/intro/organization.data:456
 msgid "Policy"
 msgstr "政策"
 
-#: ../../english/intro/organization.data:428
+#: ../../english/intro/organization.data:459
 msgid "System Administration"
 msgstr "系統管理"
 
-#: ../../english/intro/organization.data:429
+#: ../../english/intro/organization.data:460
 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."
@@ -326,7 +375,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:438
+#: ../../english/intro/organization.data:469
 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 "
@@ -336,94 +385,98 @@ msgstr ""
 "\"https://db.debian.org/machines.cgi\">Debian Machines</a> page,it should "
 "contain per-machine administrator information."
 
-#: ../../english/intro/organization.data:439
+#: ../../english/intro/organization.data:470
 msgid "LDAP Developer Directory Administrator"
 msgstr "LDAP 開發人員目錄管理"
 
-#: ../../english/intro/organization.data:440
+#: ../../english/intro/organization.data:471
 msgid "Mirrors"
 msgstr "鏡像站台"
 
-#: ../../english/intro/organization.data:447
+#: ../../english/intro/organization.data:478
 msgid "DNS Maintainer"
 msgstr "DNS 管理"
 
-#: ../../english/intro/organization.data:448
+#: ../../english/intro/organization.data:479
 msgid "Package Tracking System"
 msgstr "套件追蹤系統"
 
-#: ../../english/intro/organization.data:450
+#: ../../english/intro/organization.data:481
 msgid "Treasurer"
 msgstr ""
 
-#: ../../english/intro/organization.data:456
+#: ../../english/intro/organization.data:487
 msgid ""
 "<a name=\"trademark\" href=\"m4_HOME/trademark\">Trademark</a> use requests"
 msgstr ""
 
-#: ../../english/intro/organization.data:459
+#: ../../english/intro/organization.data:490
 msgid "Salsa administrators"
 msgstr "Salsa 管理员"
 
-#: ../../english/intro/organization.data:470
+#: ../../english/intro/organization.data:501
 msgid "Debian for children from 1 to 99"
 msgstr "給 1 到 99 歲小孩使用的 Debian"
 
-#: ../../english/intro/organization.data:473
+#: ../../english/intro/organization.data:504
 msgid "Debian for medical practice and research"
 msgstr "給醫藥界使用的 Debian"
 
-#: ../../english/intro/organization.data:476
+#: ../../english/intro/organization.data:507
 msgid "Debian for education"
 msgstr "給教育界使用的 Debian"
 
-#: ../../english/intro/organization.data:481
+#: ../../english/intro/organization.data:512
 msgid "Debian in legal offices"
 msgstr "給法律界使用的 Debian"
 
-#: ../../english/intro/organization.data:485
+#: ../../english/intro/organization.data:516
 msgid "Debian for people with disabilities"
 msgstr "給殘障人士使用的 Debian"
 
-#: ../../english/intro/organization.data:489
+#: ../../english/intro/organization.data:520
 #, fuzzy
 #| msgid "Debian for medical practice and research"
 msgid "Debian for science and related research"
 msgstr "給醫藥界使用的 Debian"
 
-#: ../../english/intro/organization.data:492
+#: ../../english/intro/organization.data:523
 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://"
@@ -434,36 +487,35 @@ 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 "監察"
+
+#~ msgid "Individual Packages"
+#~ msgstr "個別軟件包"
diff --git a/chinese/po/others.zh.po b/chinese/po/others.zh.po
index f28609fd3a9..b8bbec2201c 100644
--- a/chinese/po/others.zh.po
+++ b/chinese/po/others.zh.po
@@ -131,126 +131,126 @@ msgstr "傳真"
 msgid "Address"
 msgstr "地址"
 
-#: ../../english/logos/index.data:6
-msgid "With&nbsp;``Debian''"
-msgstr "包含&nbsp;``Debian''"
-
-#: ../../english/logos/index.data:9
-msgid "Without&nbsp;``Debian''"
-msgstr "不包含&nbsp;``Debian''"
-
-#: ../../english/logos/index.data:12
-msgid "Encapsulated PostScript"
-msgstr "精簡 PostScript"
-
-#: ../../english/logos/index.data:18
-msgid "[Powered by Debian]"
-msgstr "[Powered by Debian]"
-
-#: ../../english/logos/index.data:21
-msgid "[Powered by Debian GNU/Linux]"
-msgstr "[Powered by Debian GNU/Linux]"
-
-#: ../../english/logos/index.data:24
-msgid "[Debian powered]"
-msgstr "[Debian powered]"
-
-#: ../../english/logos/index.data:27
-msgid "[Debian] (mini button)"
-msgstr "[Debian] (mini button)"
-
-#: ../../english/mirror/submit.inc:7
-msgid "same as the above"
-msgstr "同上"
-
-#: ../../english/misc/merchandise.def:10
+#: ../../english/events/merchandise.def:10
 msgid "Products"
 msgstr "產品"
 
-#: ../../english/misc/merchandise.def:13
+#: ../../english/events/merchandise.def:13
 msgid "T-shirts"
 msgstr "T-shirts"
 
-#: ../../english/misc/merchandise.def:16
+#: ../../english/events/merchandise.def:16
 msgid "hats"
 msgstr "帽"
 
-#: ../../english/misc/merchandise.def:19
+#: ../../english/events/merchandise.def:19
 msgid "stickers"
 msgstr "貼紙"
 
-#: ../../english/misc/merchandise.def:22
+#: ../../english/events/merchandise.def:22
 msgid "mugs"
 msgstr "馬克杯"
 
-#: ../../english/misc/merchandise.def:25
+#: ../../english/events/merchandise.def:25
 msgid "other clothing"
 msgstr "其他衣著"
 
-#: ../../english/misc/merchandise.def:28
+#: ../../english/events/merchandise.def:28
 msgid "polo shirts"
 msgstr "polo 衫"
 
-#: ../../english/misc/merchandise.def:31
+#: ../../english/events/merchandise.def:31
 msgid "frisbees"
 msgstr "[CN:飛盤:][HKTW:飛碟:]"
 
-#: ../../english/misc/merchandise.def:34
+#: ../../english/events/merchandise.def:34
 msgid "mouse pads"
 msgstr "滑鼠墊"
 
-#: ../../english/misc/merchandise.def:37
+#: ../../english/events/merchandise.def:37
 msgid "badges"
 msgstr "徽章"
 
-#: ../../english/misc/merchandise.def:40
+#: ../../english/events/merchandise.def:40
 msgid "basketball goals"
 msgstr "篮球框"
 
-#: ../../english/misc/merchandise.def:44
+#: ../../english/events/merchandise.def:44
 msgid "earrings"
 msgstr "耳環"
 
-#: ../../english/misc/merchandise.def:47
+#: ../../english/events/merchandise.def:47
 msgid "suitcases"
 msgstr "手提箱"
 
-#: ../../english/misc/merchandise.def:50
+#: ../../english/events/merchandise.def:50
 msgid "umbrellas"
 msgstr "雨伞"
 
-#: ../../english/misc/merchandise.def:53
+#: ../../english/events/merchandise.def:53
 msgid "pillowcases"
 msgstr "枕套"
 
-#: ../../english/misc/merchandise.def:56
+#: ../../english/events/merchandise.def:56
 msgid "keychains"
 msgstr "钥匙环"
 
-#: ../../english/misc/merchandise.def:59
+#: ../../english/events/merchandise.def:59
 msgid "Swiss army knives"
 msgstr "瑞士军刀"
 
-#: ../../english/misc/merchandise.def:62
+#: ../../english/events/merchandise.def:62
 msgid "USB-Sticks"
 msgstr "U 盘"
 
-#: ../../english/misc/merchandise.def:77
+#: ../../english/events/merchandise.def:77
 msgid "lanyards"
 msgstr "项带"
 
-#: ../../english/misc/merchandise.def:80
+#: ../../english/events/merchandise.def:80
 msgid "others"
 msgstr "其它"
 
-#: ../../english/misc/merchandise.def:101
+#: ../../english/events/merchandise.def:101
 msgid "Donates money to Debian"
 msgstr "向 Debian 捐献"
 
-#: ../../english/misc/merchandise.def:106
+#: ../../english/events/merchandise.def:106
 msgid "Money is used to organize local free software events"
 msgstr "财物将被用来组织本地的自由软件活动"
 
+#: ../../english/logos/index.data:6
+msgid "With&nbsp;``Debian''"
+msgstr "包含&nbsp;``Debian''"
+
+#: ../../english/logos/index.data:9
+msgid "Without&nbsp;``Debian''"
+msgstr "不包含&nbsp;``Debian''"
+
+#: ../../english/logos/index.data:12
+msgid "Encapsulated PostScript"
+msgstr "精簡 PostScript"
+
+#: ../../english/logos/index.data:18
+msgid "[Powered by Debian]"
+msgstr "[Powered by Debian]"
+
+#: ../../english/logos/index.data:21
+msgid "[Powered by Debian GNU/Linux]"
+msgstr "[Powered by Debian GNU/Linux]"
+
+#: ../../english/logos/index.data:24
+msgid "[Debian powered]"
+msgstr "[Debian powered]"
+
+#: ../../english/logos/index.data:27
+msgid "[Debian] (mini button)"
+msgstr "[Debian] (mini button)"
+
+#: ../../english/mirror/submit.inc:7
+msgid "same as the above"
+msgstr "同上"
+
 #: ../../english/women/profiles/profiles.def:24
 msgid "How long have you been using Debian?"
 msgstr "您使用 Debian 多长时间了？"
@@ -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/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 77a55cbedba..137b37137f5 100644
--- a/chinese/po/templates.zh.po
+++ b/chinese/po/templates.zh.po
@@ -213,7 +213,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:107
+#: ../../english/template/debian/footer.wml:106
 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 +228,27 @@ msgstr ""
 "</a>。网站的源代码可<a href=\"https://salsa.debian.org/webmaster-team/webwml"
 "\">在此处找到</a>。"
 
-#: ../../english/template/debian/footer.wml:110
+#: ../../english/template/debian/footer.wml:109
 msgid "Last Modified"
 msgstr "最近修訂日期"
 
-#: ../../english/template/debian/footer.wml:113
+#: ../../english/template/debian/footer.wml:112
 msgid "Last Built"
 msgstr "最近构建日期"
 
-#: ../../english/template/debian/footer.wml:116
+#: ../../english/template/debian/footer.wml:115
 msgid "Copyright"
 msgstr "版權所有"
 
-#: ../../english/template/debian/footer.wml:119
+#: ../../english/template/debian/footer.wml:118
 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:122
+#: ../../english/template/debian/footer.wml:121
 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:125
+#: ../../english/template/debian/footer.wml:124
 msgid ""
 "Debian is a registered <a href=\"m4_HOME/trademark\">trademark</a> of "
 "Software in the Public Interest, Inc."
@@ -539,97 +539,169 @@ msgstr "網址"
 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>."
@@ -638,163 +710,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 "銷售商:"