Update Chinese templates

CVS version numbers

chinese/po/bugs.zh.po: 1.9 -> 1.10 
chinese/po/countries.zh.po: 1.13 -> 1.14 
chinese/po/doc.zh.po: 1.8 -> 1.9 
chinese/po/mailinglists.zh.po: 1.7 -> 1.8 
chinese/po/organization.zh.po: 1.11 -> 1.12 
chinese/po/others.zh.po: 1.21 -> 1.22 
chinese/po/ports.zh.po: 1.8 -> 1.9 
chinese/po/stats.zh.po: 1.6 -> 1.7 
chinese/po/templates.zh.po: 1.31 -> 1.32 
chinese/po/vendors.zh.po: 1.11 -> 1.12

10 files changed, 459 insertions, 443 deletions

diff --git a/chinese/po/bugs.zh.po b/chinese/po/bugs.zh.po
index 222dc747400..a07ca642127 100644
--- a/chinese/po/bugs.zh.po
+++ b/chinese/po/bugs.zh.po
@@ -156,146 +156,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 062c399ac62..f7da8c3a857 100644
--- a/chinese/po/countries.zh.po
+++ b/chinese/po/countries.zh.po
@@ -426,8 +426,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 f5f23d0d902..47cec68a1e7 100644
--- a/chinese/po/doc.zh.po
+++ b/chinese/po/doc.zh.po
@@ -437,21 +437,8 @@ msgstr ""
 msgid "PDF"
 msgstr ""
 
-#~ msgid ""
-#~ "Use <a href=\"cvs\">SVN</a> to download the SGML source text for <get-var "
-#~ "ddp_pkg_loc />."
-#~ msgstr ""
-#~ "使用 <a href=\"cvs\">SVN</a> 來取得 <get-vard dp_pkg_loc /> 的 SGML 原始"
-#~ "檔。"
-
-#~ msgid ""
-#~ "<p>You can visit the current <a href=\"manuals/<get-var doc />/"
-#~ "\">development version</a> here, use <a href=\"cvs\">CVS</a> to download "
-#~ "the SGML source text."
-#~ msgstr ""
-#~ "<p>You can visit the current<a href=\"manuals/<get-var doc />/"
-#~ "\">development version</a> here,use <a href=\"cvs\">CVS</a> to download "
-#~ "the SGML source text."
+#~ msgid "Language:"
+#~ msgstr "語言:"
 
 #~ msgid ""
 #~ "CVS sources working copy: <p>Login to the CVS server using the command:"
@@ -469,5 +456,18 @@ msgstr ""
 #~ "check out the sources, use the command:<br><pre>cvs -d:pserver:"
 #~ "anonymous@cvs.debian.org:/cvs/debian-policy co <get-var doc /></pre>"
 
-#~ msgid "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 ""
+#~ "Use <a href=\"cvs\">SVN</a> to download the SGML source text for <get-var "
+#~ "ddp_pkg_loc />."
+#~ msgstr ""
+#~ "使用 <a href=\"cvs\">SVN</a> 來取得 <get-vard dp_pkg_loc /> 的 SGML 原始"
+#~ "檔。"
diff --git a/chinese/po/mailinglists.zh.po b/chinese/po/mailinglists.zh.po
index 67d43c709c6..38756c287f0 100644
--- a/chinese/po/mailinglists.zh.po
+++ b/chinese/po/mailinglists.zh.po
@@ -116,8 +116,8 @@ msgstr "公開"
 msgid "closed"
 msgstr "關閉"
 
-#~ msgid "Please select which lists you want to 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/organization.zh.po b/chinese/po/organization.zh.po
index 17396f3e3b8..5f5665291e5 100644
--- a/chinese/po/organization.zh.po
+++ b/chinese/po/organization.zh.po
@@ -390,32 +390,33 @@ msgstr "給殘障人士使用的 Debian"
 msgid "Debian for science and related research"
 msgstr "給醫藥界使用的 Debian"
 
-#~ msgid "Testing Security Team"
-#~ msgstr "測試版安全團隊"
-
-#~ msgid "Security Audit Project"
-#~ msgstr "安全稽查計劃"
-
-#~ 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://"
@@ -426,30 +427,29 @@ 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 "Security Audit Project"
+#~ msgstr "安全稽查計劃"
+
+#~ msgid "Testing Security Team"
+#~ msgstr "測試版安全團隊"
diff --git a/chinese/po/others.zh.po b/chinese/po/others.zh.po
index a3f804ca929..ca5df6703e0 100644
--- a/chinese/po/others.zh.po
+++ b/chinese/po/others.zh.po
@@ -239,10 +239,26 @@ msgstr ""
 msgid "Swiss army knives"
 msgstr ""
 
-#: ../../english/misc/merchandise.def:61
+#: ../../english/misc/merchandise.def:60
 msgid "USB-Sticks"
 msgstr ""
 
+#: ../../english/misc/merchandise.def:75
+msgid "lanyards"
+msgstr ""
+
+#: ../../english/misc/merchandise.def:78
+msgid "others"
+msgstr ""
+
+#: ../../english/misc/merchandise.def:98
+msgid "Donates money to Debian"
+msgstr ""
+
+#: ../../english/misc/merchandise.def:102
+msgid "Money is used to organize local free software events"
+msgstr ""
+
 #: ../../english/women/profiles/profiles.def:24
 msgid "How long have you been using Debian?"
 msgstr ""
@@ -318,74 +334,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 1e76ef509af..2e75e2e85c5 100644
--- a/chinese/po/ports.zh.po
+++ b/chinese/po/ports.zh.po
@@ -114,32 +114,32 @@ msgstr "給 PowerPC 用的 Debian"
 msgid "Debian for Sparc"
 msgstr "給 Sparc 用的 Debian"
 
-#~ msgid "Debian for 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 7c2d3456c1f..a014d1c0522 100644
--- a/chinese/po/stats.zh.po
+++ b/chinese/po/stats.zh.po
@@ -227,8 +227,8 @@ msgstr "已翻譯網頁（按[CN:文件:][HKTW:檔案:]大小）"
 msgid "Translation Statistics by Page Size"
 msgstr "翻譯統計，按頁面大小"
 
-#~ msgid "Origin"
-#~ msgstr "原文"
-
 #~ msgid "Created with"
 #~ msgstr "此網頁創建工具："
+
+#~ msgid "Origin"
+#~ msgstr "原文"
diff --git a/chinese/po/templates.zh.po b/chinese/po/templates.zh.po
index ca6773dedb9..29eb73f99ca 100644
--- a/chinese/po/templates.zh.po
+++ b/chinese/po/templates.zh.po
@@ -524,169 +524,97 @@ msgstr "網址"
 msgid "Back to the <a href=\"../\">Who's using Debian? page</a>."
 msgstr "返回 <a href=\"./\">Who's using Debian? page</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>."
@@ -695,91 +623,163 @@ msgstr "返回 <a href=\"./\">Who's using Debian? page</a>."
 #~ "MailingLists/subscribe#debian-news\">訂閱</a> debian-news 郵件列表。"
 
 #, fuzzy
-#~ msgid "Back to the <a href=\"./\">Debian speakers page</a>."
-#~ msgstr "返回 <a href=\"./\">Debian consultants page</a>."
-
-#, fuzzy
 #~ msgid ""
-#~ "<void id=\"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 f62661c2088..9b099126e67 100644
--- a/chinese/po/vendors.zh.po
+++ b/chinese/po/vendors.zh.po
@@ -66,74 +66,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 "銷售商:"