Update language templates for languages [albanian-french]

13 files changed, 559 insertions, 513 deletions

diff --git a/chinese/po/blends.zh.po b/chinese/po/blends.zh.po
index 8585842fee4..d8f8c439d5d 100644
--- a/chinese/po/blends.zh.po
+++ b/chinese/po/blends.zh.po
@@ -160,8 +160,8 @@ msgstr ""
 "DebianParl 的目標是提供可以支持全世界各個議會議員、政治家及其下屬工作人員日常"
 "工作的軟件。"
 
-#~ msgid "Debian Accessibility"
-#~ msgstr "Debian Accessibility（Debian 易訪問版）"
-
 #~ msgid "Debian Games"
 #~ msgstr "Debian Games（Debian 遊戲版）"
+
+#~ msgid "Debian Accessibility"
+#~ msgstr "Debian Accessibility（Debian 易訪問版）"
diff --git a/chinese/po/bugs.zh.po b/chinese/po/bugs.zh.po
index 7f46e85dce5..739cee6f297 100644
--- a/chinese/po/bugs.zh.po
+++ b/chinese/po/bugs.zh.po
@@ -160,146 +160,146 @@ msgstr "已歸檔"
 msgid "Archived and Unarchived"
 msgstr "已歸檔與未歸檔"
 
-#~ msgid "Flags:"
-#~ msgstr "標記:"
-
-#~ msgid "active bugs"
-#~ msgstr "未解決"
+#~ msgid "Exclude tag:"
+#~ msgstr "不包括標簽:"
 
-#~ msgid "display merged bugs only once"
-#~ msgstr "已合並的報告只顯示一次"
+#~ msgid "Include tag:"
+#~ msgstr "包括標簽:"
 
-#~ msgid "no ordering by status or severity"
-#~ msgstr "不按狀態或者嚴重性排序"
+#~ msgid "lfs"
+#~ msgstr "lfs"
 
-#~ msgid "don't show table of contents in the header"
-#~ msgstr "不在頁面開始處顯示目錄"
+#~ msgid "ipv6"
+#~ msgstr "ipv6"
 
-#~ msgid "don't show statistics in the footer"
-#~ msgstr "不在頁腳處顯示統計結果"
+#~ msgid "wontfix"
+#~ msgstr "不予修正 (wontfix)"
 
-#~ msgid "proposed-updates"
-#~ msgstr "proposed-updates"
+#~ msgid "upstream"
+#~ msgstr "上遊 (upstream)"
 
-#~ msgid "testing-proposed-updates"
-#~ msgstr "testing-proposed-updates"
+#~ msgid "unreproducible"
+#~ msgstr "不可再現 (unreproducible)"
 
-#~ msgid "Package version:"
-#~ msgstr "軟件包版本號:"
+#~ msgid "security"
+#~ msgstr "安全性 (security)"
 
-#~ msgid "Distribution:"
-#~ msgstr "發行版:"
+#~ msgid "patch"
+#~ msgstr "補丁 (patch)"
 
-#~ msgid "bugs"
-#~ msgstr "數量"
+#~ msgid "moreinfo"
+#~ msgstr "附加信息 (moreinfo)"
 
-#~ msgid "open"
-#~ msgstr "未解決"
+#~ msgid "l10n"
+#~ msgstr "本地化 (l10n)"
 
-#~ msgid "forwarded"
-#~ msgstr "已移交"
+#~ msgid "help"
+#~ msgstr "幫助文檔 (help)"
 
-#~ msgid "pending"
-#~ msgstr "待完工"
+#~ msgid "fixed-upstream"
+#~ msgstr "已修正于上遊 (fixed-upstream)"
 
-#~ msgid "fixed"
-#~ msgstr "已修正"
+#~ msgid "fixed-in-experimental"
+#~ msgstr "已修正于 experimental (fixed-in-experimental)"
 
-#~ msgid "done"
-#~ msgstr "已完工"
+#~ msgid "d-i"
+#~ msgstr "安裝程序 (d-i)"
 
-#~ msgid "Include status:"
-#~ msgstr "包括狀態:"
+#~ msgid "confirmed"
+#~ msgstr "通過確認 (confirmed)"
 
-#~ msgid "Exclude status:"
-#~ msgstr "不包括狀態:"
+#~ msgid "sid"
+#~ msgstr "sid"
 
-#~ msgid "critical"
-#~ msgstr "致命"
+#~ msgid "etch-ignore"
+#~ msgstr "etch-ignore"
 
-#~ msgid "grave"
-#~ msgstr "危險"
+#~ msgid "etch"
+#~ msgstr "etch"
 
-#~ msgid "serious"
-#~ msgstr "嚴重"
+#~ msgid "sarge-ignore"
+#~ msgstr "sarge-ignore"
 
-#~ msgid "important"
-#~ msgstr "重要"
+#~ msgid "woody"
+#~ msgstr "woody"
 
-#~ msgid "minor"
-#~ msgstr "輕微"
+#~ msgid "potato"
+#~ msgstr "potato"
 
-#~ msgid "wishlist"
-#~ msgstr "[CN:小意思:][HKTW:心願:]"
+#~ msgid "Exclude severity:"
+#~ msgstr "不包括優先級:"
 
 #~ msgid "Include severity:"
 #~ msgstr "包括優先級:"
 
-#~ msgid "Exclude severity:"
-#~ msgstr "不包括優先級:"
+#~ msgid "wishlist"
+#~ msgstr "[CN:小意思:][HKTW:心願:]"
 
-#~ msgid "potato"
-#~ msgstr "potato"
+#~ msgid "minor"
+#~ msgstr "輕微"
 
-#~ msgid "woody"
-#~ msgstr "woody"
+#~ msgid "important"
+#~ msgstr "重要"
 
-#~ msgid "sarge-ignore"
-#~ msgstr "sarge-ignore"
+#~ msgid "serious"
+#~ msgstr "嚴重"
 
-#~ msgid "etch"
-#~ msgstr "etch"
+#~ msgid "grave"
+#~ msgstr "危險"
 
-#~ msgid "etch-ignore"
-#~ msgstr "etch-ignore"
+#~ msgid "critical"
+#~ msgstr "致命"
 
-#~ msgid "sid"
-#~ msgstr "sid"
+#~ msgid "Exclude status:"
+#~ msgstr "不包括狀態:"
 
-#~ msgid "confirmed"
-#~ msgstr "通過確認 (confirmed)"
+#~ msgid "Include status:"
+#~ msgstr "包括狀態:"
 
-#~ msgid "d-i"
-#~ msgstr "安裝程序 (d-i)"
+#~ msgid "done"
+#~ msgstr "已完工"
 
-#~ msgid "fixed-in-experimental"
-#~ msgstr "已修正于 experimental (fixed-in-experimental)"
+#~ msgid "fixed"
+#~ msgstr "已修正"
 
-#~ msgid "fixed-upstream"
-#~ msgstr "已修正于上遊 (fixed-upstream)"
+#~ msgid "pending"
+#~ msgstr "待完工"
 
-#~ msgid "help"
-#~ msgstr "幫助文檔 (help)"
+#~ msgid "forwarded"
+#~ msgstr "已移交"
 
-#~ msgid "l10n"
-#~ msgstr "本地化 (l10n)"
+#~ msgid "open"
+#~ msgstr "未解決"
 
-#~ msgid "moreinfo"
-#~ msgstr "附加信息 (moreinfo)"
+#~ msgid "bugs"
+#~ msgstr "數量"
 
-#~ msgid "patch"
-#~ msgstr "補丁 (patch)"
+#~ msgid "Distribution:"
+#~ msgstr "發行版:"
 
-#~ msgid "security"
-#~ msgstr "安全性 (security)"
+#~ msgid "Package version:"
+#~ msgstr "軟件包版本號:"
 
-#~ msgid "unreproducible"
-#~ msgstr "不可再現 (unreproducible)"
+#~ msgid "testing-proposed-updates"
+#~ msgstr "testing-proposed-updates"
 
-#~ msgid "upstream"
-#~ msgstr "上遊 (upstream)"
+#~ msgid "proposed-updates"
+#~ msgstr "proposed-updates"
 
-#~ msgid "wontfix"
-#~ msgstr "不予修正 (wontfix)"
+#~ msgid "don't show statistics in the footer"
+#~ msgstr "不在頁腳處顯示統計結果"
 
-#~ msgid "ipv6"
-#~ msgstr "ipv6"
+#~ msgid "don't show table of contents in the header"
+#~ msgstr "不在頁面開始處顯示目錄"
 
-#~ msgid "lfs"
-#~ msgstr "lfs"
+#~ msgid "no ordering by status or severity"
+#~ msgstr "不按狀態或者嚴重性排序"
 
-#~ msgid "Include tag:"
-#~ msgstr "包括標簽:"
+#~ msgid "display merged bugs only once"
+#~ msgstr "已合並的報告只顯示一次"
 
-#~ msgid "Exclude tag:"
-#~ msgstr "不包括標簽:"
+#~ msgid "active bugs"
+#~ msgstr "未解決"
+
+#~ msgid "Flags:"
+#~ msgstr "標記:"
diff --git a/chinese/po/countries.zh.po b/chinese/po/countries.zh.po
index 38934b1d892..95fdf076c26 100644
--- a/chinese/po/countries.zh.po
+++ b/chinese/po/countries.zh.po
@@ -430,8 +430,8 @@ msgstr "南非"
 msgid "Zimbabwe"
 msgstr "津巴布韦"
 
-#~ msgid "Great Britain"
-#~ msgstr "英國"
-
 #~ msgid "Yugoslavia"
 #~ msgstr "南斯拉夫"
+
+#~ msgid "Great Britain"
+#~ msgstr "英國"
diff --git a/chinese/po/distrib.zh.po b/chinese/po/distrib.zh.po
index bb5f08b8b3c..83f061e4409 100644
--- a/chinese/po/distrib.zh.po
+++ b/chinese/po/distrib.zh.po
@@ -194,13 +194,19 @@ msgid "POWER Processors"
 msgstr "POWER Processors"
 
 #: ../../english/releases/arches.data:26
+#, fuzzy
+#| msgid "64-bit MIPS (little endian)"
+msgid "RISC-V 64-bit little endian (riscv64)"
+msgstr "64 位 MIPS（小端序）"
+
+#: ../../english/releases/arches.data:27
 msgid "IBM S/390"
 msgstr "IBM S/390"
 
-#: ../../english/releases/arches.data:27
+#: ../../english/releases/arches.data:28
 msgid "IBM System z"
 msgstr "IBM System z"
 
-#: ../../english/releases/arches.data:28
+#: ../../english/releases/arches.data:29
 msgid "SPARC"
 msgstr "SPARC"
diff --git a/chinese/po/doc.zh.po b/chinese/po/doc.zh.po
index 9bc4906ae0d..df69d1182ab 100644
--- a/chinese/po/doc.zh.po
+++ b/chinese/po/doc.zh.po
@@ -152,7 +152,7 @@ msgstr "最新版本："
 msgid "(version <get-var version />)"
 msgstr "(version <get-var version />)"
 
-#: ../../english/doc/manuals.defs:138 ../../english/releases/arches.data:37
+#: ../../english/doc/manuals.defs:138 ../../english/releases/arches.data:38
 msgid "plain text"
 msgstr "純文字"
 
@@ -212,23 +212,29 @@ msgstr "Debian 套件"
 msgid "Debian package (archived)"
 msgstr "Debian 套件（已归档）"
 
-#: ../../english/releases/arches.data:35
+#: ../../english/releases/arches.data:36
 msgid "HTML"
 msgstr "HTML"
 
-#: ../../english/releases/arches.data:36
+#: ../../english/releases/arches.data:37
 msgid "PDF"
 msgstr "PDF"
 
 #~ msgid ""
-#~ "The latest <get-var srctype /> source is available through the <a href="
-#~ "\"https://www.debian.org/doc/cvs\">Subversion</a> repository."
+#~ "Use <a href=\"cvs\">SVN</a> to download the SGML source text for <get-var "
+#~ "ddp_pkg_loc />."
 #~ msgstr ""
-#~ "<get-var srctype /> 的最新源代码可由 <a href=\"https://www.debian.org/doc/"
-#~ "cvs\">Subversion</a> 仓库获得。"
+#~ "使用 <a href=\"cvs\">SVN</a> 來取得 <get-vard dp_pkg_loc /> 的 SGML 原始"
+#~ "檔。"
 
-#~ msgid "Language:"
-#~ msgstr "語言:"
+#~ msgid ""
+#~ "<p>You can visit the current <a href=\"manuals/<get-var doc />/"
+#~ "\">development version</a> here, use <a href=\"cvs\">CVS</a> to download "
+#~ "the SGML source text."
+#~ msgstr ""
+#~ "<p>You can visit the current<a href=\"manuals/<get-var doc />/"
+#~ "\">development version</a> here,use <a href=\"cvs\">CVS</a> to download "
+#~ "the SGML source text."
 
 #~ msgid ""
 #~ "CVS sources working copy: <p>Login to the CVS server using the command:"
@@ -246,18 +252,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/organization.zh.po b/chinese/po/organization.zh.po
index c4dd63bc3f6..e2fe2c2861b 100644
--- a/chinese/po/organization.zh.po
+++ b/chinese/po/organization.zh.po
@@ -406,35 +406,39 @@ msgstr "給醫藥界使用的 Debian"
 msgid "Debian for astronomy"
 msgstr "給教育界使用的 Debian"
 
-#~ msgid "Auditor"
-#~ msgstr "監察"
-
-#~ msgid "Testing Security Team"
-#~ msgstr "測試版安全團隊"
+#~ msgid "Alioth administrators"
+#~ msgstr "Alioth 管理"
 
-#~ msgid "Security Audit Project"
-#~ msgstr "安全稽查計劃"
+#~ msgid "Live System Team"
+#~ msgstr "Live 系統小組"
 
-#~ msgid "APT Team"
-#~ msgstr "APT 小組"
+#, fuzzy
+#~| msgid "Debian Maintainer Keyring Team"
+#~ msgid "Debian Maintainer (DM) Keyring Maintainers"
+#~ msgstr "Debian 開發人員 Keyring 團隊"
 
-#~ msgid "Mailing List Archives"
-#~ msgstr "郵件列表歸檔"
+#~ msgid "Custom Debian Distributions"
+#~ msgstr "客製化 Debian 發行版"
 
-#~ msgid "Mailing list"
-#~ msgstr "郵件列表"
+#~ msgid "Release Team for ``stable''"
+#~ msgstr "穩定版的釋出團隊"
 
-#~ msgid "Debian for non-profit organisations"
-#~ msgstr "給非營利組織用的 Debian"
+#~ msgid "Vendors"
+#~ msgstr "廠商"
 
-#~ msgid "The Universal Operating System as your Desktop"
-#~ msgstr "使用環球作業系統作為桌面環境"
+#~ msgid "Handhelds"
+#~ msgstr "手持式設備"
 
-#~ msgid "Accountant"
-#~ msgstr "帳號管理"
+#~ msgid "Marketing Team"
+#~ msgstr "行銷團隊"
 
-#~ msgid "Key Signing Coordination"
-#~ msgstr "Key Signing 協調"
+#~ msgid ""
+#~ "The admins responsible for buildd's for a particular arch can be reached "
+#~ "at <genericemail arch@buildd.debian.org>, for example <genericemail "
+#~ "i386@buildd.debian.org>."
+#~ msgstr ""
+#~ "負責管理 buildd 的特定硬體架構的管理員可以透過<genericemail arch@buildd."
+#~ "debian.org> 聯絡，如 <genericemail i386@buildd.debian.org>。"
 
 #~ msgid ""
 #~ "Names of individual buildd's admins can also be found on <a href=\"http://"
@@ -445,36 +449,32 @@ msgstr "給教育界使用的 Debian"
 #~ "\">http://www.buildd.net</a> 找到。選擇特定硬體架構與發行版來查詢其 "
 #~ "buildd 與管理員。"
 
-#~ msgid ""
-#~ "The admins responsible for buildd's for a particular arch can be reached "
-#~ "at <genericemail arch@buildd.debian.org>, for example <genericemail "
-#~ "i386@buildd.debian.org>."
-#~ msgstr ""
-#~ "負責管理 buildd 的特定硬體架構的管理員可以透過<genericemail arch@buildd."
-#~ "debian.org> 聯絡，如 <genericemail i386@buildd.debian.org>。"
+#~ msgid "Key Signing Coordination"
+#~ msgstr "Key Signing 協調"
 
-#~ msgid "Marketing Team"
-#~ msgstr "行銷團隊"
+#~ msgid "Accountant"
+#~ msgstr "帳號管理"
 
-#~ msgid "Handhelds"
-#~ msgstr "手持式設備"
+#~ msgid "The Universal Operating System as your Desktop"
+#~ msgstr "使用環球作業系統作為桌面環境"
 
-#~ msgid "Vendors"
-#~ msgstr "廠商"
+#~ msgid "Debian for non-profit organisations"
+#~ msgstr "給非營利組織用的 Debian"
 
-#~ msgid "Release Team for ``stable''"
-#~ msgstr "穩定版的釋出團隊"
+#~ msgid "Mailing list"
+#~ msgstr "郵件列表"
 
-#~ msgid "Custom Debian Distributions"
-#~ msgstr "客製化 Debian 發行版"
+#~ msgid "Mailing List Archives"
+#~ msgstr "郵件列表歸檔"
 
-#, fuzzy
-#~| msgid "Debian Maintainer Keyring Team"
-#~ msgid "Debian Maintainer (DM) Keyring Maintainers"
-#~ msgstr "Debian 開發人員 Keyring 團隊"
+#~ msgid "APT Team"
+#~ msgstr "APT 小組"
 
-#~ msgid "Live System Team"
-#~ msgstr "Live 系統小組"
+#~ msgid "Security Audit Project"
+#~ msgstr "安全稽查計劃"
 
-#~ msgid "Alioth administrators"
-#~ msgstr "Alioth 管理"
+#~ msgid "Testing Security Team"
+#~ msgstr "測試版安全團隊"
+
+#~ msgid "Auditor"
+#~ msgstr "監察"
diff --git a/chinese/po/others.zh.po b/chinese/po/others.zh.po
index 4e3a72edc0e..0633fb43794 100644
--- a/chinese/po/others.zh.po
+++ b/chinese/po/others.zh.po
@@ -326,74 +326,74 @@ msgstr "版本"
 msgid "URL"
 msgstr "網址"
 
-#~ msgid "Wanted:"
-#~ msgstr "希望："
-
-#~ msgid "Who:"
-#~ msgstr "誰："
+#~ msgid "Name:"
+#~ msgstr "姓名："
 
-#~ msgid "Architecture:"
-#~ msgstr "硬體架構："
+#~ msgid "Company:"
+#~ msgstr "公司："
 
-#~ msgid "Specifications:"
-#~ msgstr "詳細資訊："
+#~ msgid "URL:"
+#~ msgstr "網址："
 
-#~ msgid "Where:"
-#~ msgstr "地點："
+#~ msgid "or"
+#~ msgstr "或"
 
-#~ msgid "Debian Technical Committee only"
-#~ msgstr "限於 Debian 技術委員會"
+#~ msgid "Email:"
+#~ msgstr "Email："
 
-#~ msgid "deity developers only"
-#~ msgstr "限於 deity 開發者"
+#~ msgid "Rates:"
+#~ msgstr "收費："
 
-#~ msgid "developers only"
-#~ msgstr "限於開發者"
+#~ msgid ""
+#~ "<total_consultant> Debian consultants listed in <total_country> countries "
+#~ "worldwide."
+#~ msgstr ""
+#~ "以下的名單中共有來自世界 <total_country> 個國家的 <total_consultant> 個 "
+#~ "Debian 顧問。"
 
-#~ msgid "closed"
-#~ msgstr "關閉"
+#~ msgid "Mailing List Subscription"
+#~ msgstr "訂閱郵件列表"
 
-#~ msgid "open"
-#~ msgstr "公開"
+#~ msgid "Your E-Mail address:"
+#~ msgstr "您的 E-Mail 地址："
 
-#~ msgid "Mailing List Unsubscription"
-#~ msgstr "取消訂閱郵件列表"
+#~ msgid "Clear"
+#~ msgstr "清除"
 
 #~ msgid ""
 #~ "Please respect the <a href=\"./#ads\">Debian mailing list advertising "
 #~ "policy</a>."
 #~ msgstr "請尊重 <a href=\"./#ads\">Debian 郵件列表廣告政策</a>。"
 
-#~ msgid "Clear"
-#~ msgstr "清除"
+#~ msgid "Mailing List Unsubscription"
+#~ msgstr "取消訂閱郵件列表"
 
-#~ msgid "Your E-Mail address:"
-#~ msgstr "您的 E-Mail 地址："
+#~ msgid "open"
+#~ msgstr "公開"
 
-#~ msgid "Mailing List Subscription"
-#~ msgstr "訂閱郵件列表"
+#~ msgid "closed"
+#~ msgstr "關閉"
 
-#~ msgid ""
-#~ "<total_consultant> Debian consultants listed in <total_country> countries "
-#~ "worldwide."
-#~ msgstr ""
-#~ "以下的名單中共有來自世界 <total_country> 個國家的 <total_consultant> 個 "
-#~ "Debian 顧問。"
+#~ msgid "developers only"
+#~ msgstr "限於開發者"
 
-#~ msgid "Rates:"
-#~ msgstr "收費："
+#~ msgid "deity developers only"
+#~ msgstr "限於 deity 開發者"
 
-#~ msgid "Email:"
-#~ msgstr "Email："
+#~ msgid "Debian Technical Committee only"
+#~ msgstr "限於 Debian 技術委員會"
 
-#~ msgid "or"
-#~ msgstr "或"
+#~ msgid "Where:"
+#~ msgstr "地點："
 
-#~ msgid "URL:"
-#~ msgstr "網址："
+#~ msgid "Specifications:"
+#~ msgstr "詳細資訊："
 
-#~ msgid "Company:"
-#~ msgstr "公司："
+#~ msgid "Architecture:"
+#~ msgstr "硬體架構："
 
-#~ msgid "Name:"
-#~ msgstr "姓名："
+#~ msgid "Who:"
+#~ msgstr "誰："
+
+#~ msgid "Wanted:"
+#~ msgstr "希望："
diff --git a/chinese/po/partners.zh.po b/chinese/po/partners.zh.po
index ca69066803e..021ae624d61 100644
--- a/chinese/po/partners.zh.po
+++ b/chinese/po/partners.zh.po
@@ -38,13 +38,13 @@ msgid ""
 "servers."
 msgstr ""
 
-#: ../../english/partners/partners.def:41
+#: ../../english/partners/partners.def:42
 msgid ""
 "<a href=\"http://www.bytemark.co.uk/r/deb-partners\">Bytemark</a> support us "
 "by providing hosting services and sponsorship for the Debian Conference."
 msgstr ""
 
-#: ../../english/partners/partners.def:45
+#: ../../english/partners/partners.def:46
 msgid ""
 "They are a leading Internet Service Provider (ISP) in the United Kingdom and "
 "provide scalable, powerful and affordable hosting with lots of <q>geek "
@@ -54,7 +54,7 @@ msgid ""
 "are also well known for their expert and friendly support."
 msgstr ""
 
-#: ../../english/partners/partners.def:53
+#: ../../english/partners/partners.def:54
 msgid ""
 "<a href=\"https://www.conova.com\">conova communications GmbH</a> has been "
 "supporting the Debian project as a hosting partner for several years. In "
@@ -63,7 +63,7 @@ msgid ""
 "at conova."
 msgstr ""
 
-#: ../../english/partners/partners.def:56
+#: ../../english/partners/partners.def:57
 msgid ""
 "conova operates one of the most modern data centers in all of Europe in "
 "Salzburg, Austria. Their services: customized solutions for housing, "
@@ -72,7 +72,7 @@ msgid ""
 "highest level of supply and security on their 2,000 m² of technical area."
 msgstr ""
 
-#: ../../english/partners/partners.def:63
+#: ../../english/partners/partners.def:64
 msgid ""
 "<a href=\"https://www.credativ.com/\">credativ</a> is an independent "
 "consulting and services company and since 1999 been offering comprehensive "
@@ -81,7 +81,7 @@ msgid ""
 "q> is always available, 365 days a year, around the clock."
 msgstr ""
 
-#: ../../english/partners/partners.def:66
+#: ../../english/partners/partners.def:67
 msgid ""
 "From the very beginning credativ has actively supported the Debian project "
 "and will continue to do so in the future. Furthermore many of our "
@@ -90,7 +90,7 @@ msgid ""
 "href=\"https://www.credativ.com/\">https://www.credativ.com/</a>."
 msgstr ""
 
-#: ../../english/partners/partners.def:72
+#: ../../english/partners/partners.def:73
 msgid ""
 "<a href=\"http://www.dg-i.net/\">DG-i</a> provides the Debian project with "
 "hardware and hosting services from their colocation sites via high-speed "
@@ -98,7 +98,7 @@ msgid ""
 "an IBM x360 server. "
 msgstr ""
 
-#: ../../english/partners/partners.def:76
+#: ../../english/partners/partners.def:77
 msgid ""
 "Dembach Goo Informatik GmbH &amp; Co. KG (DG-i) offers consulting services "
 "on IT infrastructures, software development and hosting services. DG-i "
@@ -110,7 +110,7 @@ msgid ""
 "infrastructure in their Munich and Dusseldorf data centers."
 msgstr ""
 
-#: ../../english/partners/partners.def:82
+#: ../../english/partners/partners.def:83
 msgid ""
 "<a href=\"http://www.eaton.com/\">Eaton</a> helps Debian in protecting its "
 "infrastructure from power issues, and employs a Debian Developer to work on "
@@ -118,7 +118,7 @@ msgid ""
 "networkupstools.org/\">Network UPS Tools</a> and related packages."
 msgstr ""
 
-#: ../../english/partners/partners.def:85
+#: ../../english/partners/partners.def:86
 msgid ""
 "Eaton is a global technology leader in electrical components and systems for "
 "power quality, distribution and control; hydraulics components, systems and "
@@ -129,14 +129,14 @@ msgid ""
 "more than 150 countries, with 2008 sales of $15.4 billion."
 msgstr ""
 
-#: ../../english/partners/partners.def:92
+#: ../../english/partners/partners.def:93
 msgid ""
 "<a href=\"https://www.fastly.com/\">Fastly</a> provides Debian with content "
 "delivery network (CDN) services and is helping us deliver packages to users "
 "through <a href=\"https://deb.debian.org/\">deb.debian.org</a>."
 msgstr ""
 
-#: ../../english/partners/partners.def:95
+#: ../../english/partners/partners.def:96
 msgid ""
 "Fastly’s edge cloud platform provides advanced application delivery and "
 "cloud security for the world’s most popular online destinations. Fastly "
@@ -144,14 +144,14 @@ msgid ""
 "month, more than 10 percent of all internet requests."
 msgstr ""
 
-#: ../../english/partners/partners.def:102
+#: ../../english/partners/partners.def:103
 msgid ""
 "Since 2002, Genesi has provided the hardware it designs and develops to the "
 "Debian community. Genesi also employs Debian developers to support their "
 "platforms."
 msgstr ""
 
-#: ../../english/partners/partners.def:105
+#: ../../english/partners/partners.def:106
 msgid ""
 "Genesi's <a href=\"http://www.genesi-usa.com/products\">Efika MX</a> ARM-"
 "based computers are designed to bring low cost, energy efficient computing "
@@ -160,7 +160,7 @@ msgid ""
 "powerdeveloper.org/\">www.PowerDeveloper.org.</a>"
 msgstr ""
 
-#: ../../english/partners/partners.def:112
+#: ../../english/partners/partners.def:113
 msgid ""
 "<a href=\"http://www.hpe.com/engage/opensource\">Hewlett Packard Enterprise "
 "(HPE)</a> provides hardware for port development, Debian mirrors, and other "
@@ -168,14 +168,14 @@ msgid ""
 "\"https://db.debian.org/machines.cgi\">Debian machines</a> page)."
 msgstr ""
 
-#: ../../english/partners/partners.def:115
+#: ../../english/partners/partners.def:116
 msgid ""
 "HPE is one of the largest computer companies in the world, providing a wide "
 "range of products and services, such as servers, storage, networking, "
 "consulting and support, software, and financial services."
 msgstr ""
 
-#: ../../english/partners/partners.def:123
+#: ../../english/partners/partners.def:124
 msgid ""
 "<a href=\"https://www.leaseweb.com/\">LeaseWeb</a> has been one of two "
 "partners that provide the infrastructure for the <a href=\"https://snapshot."
@@ -186,7 +186,7 @@ msgid ""
 "50%, enough to accommodate anticipated growth for years to come."
 msgstr ""
 
-#: ../../english/partners/partners.def:126
+#: ../../english/partners/partners.def:127
 msgid ""
 "LeaseWeb is a global Infrastructure-as-a-Service (IaaS) provider – offering "
 "customers on-demand, world-class hosting solutions, from dedicated servers "
@@ -194,7 +194,7 @@ msgid ""
 "\"https://www.leaseweb.com/\">website</a>."
 msgstr ""
 
-#: ../../english/partners/partners.def:132
+#: ../../english/partners/partners.def:133
 msgid ""
 "<a href=\"http://www.loongson.cn\">Loongson</a> and <a href=\"http://www."
 "lemote.com\">Lemote</a> have provided several Loongson-based machines to "
@@ -203,7 +203,7 @@ msgid ""
 "Loongson</a>."
 msgstr ""
 
-#: ../../english/partners/partners.def:135
+#: ../../english/partners/partners.def:136
 msgid ""
 "Loongson processors are a series of MIPS-compatible processors. They have "
 "been widely used in many areas, such as desktop, server, embedded "
@@ -211,7 +211,7 @@ msgid ""
 "<a href=\"mailto:info@loongson.cn\">info@loongson.cn</a>."
 msgstr ""
 
-#: ../../english/partners/partners.def:141
+#: ../../english/partners/partners.def:142
 msgid ""
 "<a href=\"http://www.man-da.de/\">man-da.de GmbH</a> is the backbone "
 "provider of the Metropolitan Area Network Darmstadt. It is supporting Debian "
@@ -219,7 +219,7 @@ msgid ""
 "network for experimental and debconf.org machines."
 msgstr ""
 
-#: ../../english/partners/partners.def:145
+#: ../../english/partners/partners.def:146
 msgid ""
 "man-da.de GmbH is operating MANDA, a wide area network in the South Hessen "
 "region connecting educational and research organisations to a high speed "
@@ -229,27 +229,42 @@ msgid ""
 "both universities."
 msgstr ""
 
-#: ../../english/partners/partners.def:153
+#: ../../english/partners/partners.def:154
 msgid ""
 "<a href=\"http://osuosl.org/\">The Oregon State University Open Source Lab</"
 "a> provides hosting and administration services to the Debian project."
 msgstr ""
 
-#: ../../english/partners/partners.def:157
+#: ../../english/partners/partners.def:158
 msgid ""
 "The Open Source Lab is a focal point for open source development at Oregon "
 "State University and beyond. The OSL provides development, hosting and "
 "assorted other services to the Open Source community."
 msgstr ""
 
-#: ../../english/partners/partners.def:163
+#: ../../english/partners/partners.def:165
+msgid ""
+"nic.at is sponsoring the anycast service <a href=\"https://www.rcodezero.at/"
+"\">RcodeZero DNS</a> for Debian as it meets the needs to have geographically "
+"disperse locations and support DNSSEC."
+msgstr ""
+
+#: ../../english/partners/partners.def:169
+msgid ""
+"ipcom is a subsidiary of nic.at, the Austrian domain registry. nic.at has "
+"been managing the .at-zone since 1998 on a highly professional and reliable "
+"level. The RcodeZero Anycast network has been developed by nic.at’s R&amp;D "
+"department and has been successfully in use for the .at zone."
+msgstr ""
+
+#: ../../english/partners/partners.def:175
 msgid ""
 "<a href=\"http://www.skolelinux.org/\">Skolelinux</a> is heavily involved in "
 "both the creation and testing of the new debian-installer and the "
 "localization of Debian."
 msgstr ""
 
-#: ../../english/partners/partners.def:166
+#: ../../english/partners/partners.def:178
 msgid ""
 "Skolelinux is an effort to create a Debian Pure Blend aimed at schools and "
 "universities. An easy 3-question installation results in a preconfigured "
@@ -258,7 +273,7 @@ msgid ""
 "environment."
 msgstr ""
 
-#: ../../english/partners/partners.def:173
+#: ../../english/partners/partners.def:185
 msgid ""
 "<a href=\"https://www.stackpath.com/?utm_campaign=Partner%20Display&amp;"
 "utm_source=Partner%20Display&amp;utm_medium=Debian\">StackPath</a> provides "
@@ -268,35 +283,35 @@ msgid ""
 "\">Planet Debian</a>."
 msgstr ""
 
-#: ../../english/partners/partners.def:176
+#: ../../english/partners/partners.def:188
 msgid ""
 "StackPath is a platform of secure edge services that enables developers to "
 "protect, accelerate, and innovate cloud properties ranging from websites to "
 "media delivery and IoT services."
 msgstr ""
 
-#: ../../english/partners/partners.def:182
+#: ../../english/partners/partners.def:194
 msgid ""
 "<a href=\"http://www.telegraaf.nl/\">Telegraaf Media ICT BV</a> is "
 "supporting the Debian community by donating hardware, rackspace and "
 "bandwidth for the Debian server hosting alioth, arch and svn."
 msgstr ""
 
-#: ../../english/partners/partners.def:185
+#: ../../english/partners/partners.def:197
 msgid ""
 "Telegraaf Media ICT BV is running its internet infrastructure (appx. 200 "
 "Intel based servers) mainly based on Debian GNU/Linux servers; the sysadmins "
 "are highly motivated Debian users and some of them also Debian maintainers."
 msgstr ""
 
-#: ../../english/partners/partners.def:188
+#: ../../english/partners/partners.def:200
 msgid ""
 "Telegraaf Media Group runs some of the most popular Dutch websites (http://"
 "www.telegraaf.nl, http://www.speurders.nl and http://www.dft.nl) as well as "
 "the two biggest newspapers in The Netherlands."
 msgstr ""
 
-#: ../../english/partners/partners.def:194
+#: ../../english/partners/partners.def:206
 msgid ""
 "<a href=\"http://www.thomas-krenn.com\">Thomas Krenn</a> has provided a new "
 "high-end server for the Debian cdbuilder service. In addition, Thomas Krenn "
@@ -306,7 +321,7 @@ msgid ""
 "thomas-krenn.com/linux</a>."
 msgstr ""
 
-#: ../../english/partners/partners.def:197
+#: ../../english/partners/partners.def:209
 msgid ""
 "<a href=\"http://www.thomas-krenn.com\">Thomas Krenn</a> is Europe's leading "
 "online shop for server systems and high-quality hosting. They offer rack-"
@@ -316,7 +331,7 @@ msgid ""
 "course they support Debian as operating system on their servers!"
 msgstr ""
 
-#: ../../english/partners/partners.def:203
+#: ../../english/partners/partners.def:215
 msgid ""
 "<a href=\"http://www.trustsec.de/\">trustsec</a> pays two Debian developers "
 "to work on the S/390 port of Debian and packages mainly related to Java. "
@@ -325,7 +340,7 @@ msgid ""
 "for LinuxTag 2001 in Stuttgart."
 msgstr ""
 
-#: ../../english/partners/partners.def:206
+#: ../../english/partners/partners.def:218
 msgid ""
 "trustsec offers customer support, consulting and training for Debian on the "
 "Intel PC architecture (i386), PowerPC and IBM S/390 and is specialized on "
@@ -333,14 +348,35 @@ msgid ""
 "\"mailto:info@trustsec.de\">info@trustsec.de</a> for more information."
 msgstr ""
 
-#: ../../english/partners/partners.def:217
+#: ../../english/partners/partners.def:226
+msgid ""
+"The <a href=\"https://www.sanger.ac.uk/\">Wellcome Sanger Institute</a> "
+"provides infrastructure for the <a href=\"https://snapshot.debian.org/"
+"\">Debian OS Snapshot Archive</a> since the creation of the service in <a "
+"href=\"https://www.debian.org/News/2010/20100412\">April 2010</a>. In 2018 "
+"they renewed their support by provisioning a new frontend server and "
+"increasing the amount of snapshot storage provided."
+msgstr ""
+
+#: ../../english/partners/partners.def:229
+msgid ""
+"The Wellcome Sanger Institute is one of the world's leading genome centres. "
+"Through its ability to conduct research at scale, it is able to engage in "
+"bold and long-term exploratory projects that are designed to influence and "
+"empower medical science globally. Institute research findings, generated "
+"through its own research programmes and through its leading role in "
+"international consortia, are being used to develop new diagnostics and "
+"treatments for human disease."
+msgstr ""
+
+#: ../../english/partners/partners.def:239
 msgid ""
 "<A HREF=\"http://www.brainfood.com/\">Brainfood</A> (previously called "
 "Novare) provides several machines to Debian, as well as hosting and server "
 "administration services."
 msgstr ""
 
-#: ../../english/partners/partners.def:220
+#: ../../english/partners/partners.def:242
 msgid ""
 "Brainfood is a technology solutions company whose goal is to work to produce "
 "an ideal result for a specific need, whether it's a website or an ongoing, "
@@ -349,7 +385,7 @@ msgid ""
 "\">debian-contact@brainfood.com</A>."
 msgstr ""
 
-#: ../../english/partners/partners.def:227
+#: ../../english/partners/partners.def:249
 msgid ""
 "<a href=\"http://www.hp.com/\">Hewlett-Packard</a> has provided hardware for "
 "port development, Debian mirrors, and other Debian services (current HP "
@@ -359,7 +395,7 @@ msgid ""
 "com/products1/linux/\">HP Linux</a>."
 msgstr ""
 
-#: ../../english/partners/partners.def:230
+#: ../../english/partners/partners.def:252
 msgid ""
 "Hewlett-Packard is one of the largest computer companies in the world, "
 "providing a wide range of products and services, such as servers, PCs, "
@@ -367,7 +403,7 @@ msgid ""
 "solutions, etc."
 msgstr ""
 
-#: ../../english/partners/partners.def:237
+#: ../../english/partners/partners.def:259
 msgid ""
 "<A HREF=\"http://www.linuxcentral.com/\">Linux Central</A> provides us with "
 "Debian GNU/Linux CD-ROM sets for trade show type events. These CD's help to "
@@ -375,7 +411,7 @@ msgid ""
 "current users."
 msgstr ""
 
-#: ../../english/partners/partners.def:241
+#: ../../english/partners/partners.def:263
 msgid ""
 "Linux Central sells all the latest releases of Linux products such as "
 "commercial software, books, hardware, and versions of major Linux "
@@ -385,14 +421,14 @@ msgid ""
 "contact <A HREF=\"mailto:sales@linuxcentral.com\">sales@linuxcentral.com</A>."
 msgstr ""
 
-#: ../../english/partners/partners.def:248
+#: ../../english/partners/partners.def:270
 msgid ""
 "<a href=\"http://www.mythic-beasts.com\">Mythic Beasts Ltd.</a> supports "
 "Debian (and SPI Inc) by providing domain registration facilities.</p><p>They "
 "are a UK based web hosting, domain registration and co-location company."
 msgstr ""
 
-#: ../../english/partners/partners.def:255
+#: ../../english/partners/partners.def:277
 msgid ""
 "San Francisco based <a href=\"http://www.nostarch.com/\">No Starch Press</"
 "a>, publisher of \"The Finest in Geek Entertainment,\" is co-publisher of "
@@ -403,7 +439,7 @@ msgid ""
 "copy of The Debian System to the Debian Project."
 msgstr ""
 
-#: ../../english/partners/partners.def:262
+#: ../../english/partners/partners.def:284
 msgid ""
 "<a href=\"http://www.opensourcepress.de/\">Open Source Press</a> is the "
 "Munich-based publisher of the book <a href=\"http://debiansystem.info/\">The "
@@ -411,7 +447,7 @@ msgid ""
 "donate 1&euro; to the Debian Project."
 msgstr ""
 
-#: ../../english/partners/partners.def:265
+#: ../../english/partners/partners.def:287
 msgid ""
 "Open Source Press specialises on books around Linux and Open Source "
 "Software, written by authors with considerable experience in the fields, and "
@@ -419,7 +455,7 @@ msgid ""
 "Source Press publications are renowned for their quality and depth."
 msgstr ""
 
-#: ../../english/partners/partners.def:273
+#: ../../english/partners/partners.def:295
 msgid ""
 "<a href=\"http://www.rapidswitch.com/\">RapidSwitch</a> (formely Black Cat "
 "Networks) is a UK ISP specialising in dedicated hosting. It provides "
@@ -427,13 +463,13 @@ msgid ""
 "virtual servers."
 msgstr ""
 
-#: ../../english/partners/partners.def:276
+#: ../../english/partners/partners.def:298
 msgid ""
 "It hosts a Debian development machine, <a href=\"https://db.debian.org/"
 "machines.cgi?host=caballero\">caballero</a>."
 msgstr ""
 
-#: ../../english/partners/partners.def:284
+#: ../../english/partners/partners.def:306
 msgid ""
 "<a href=\"http://www.simtec.co.uk\">Simtec</a> has provided several ARM "
 "machines which make up the bulk of the Debian ARM infrastructure. In "
@@ -441,7 +477,7 @@ msgid ""
 "ARM port."
 msgstr ""
 
-#: ../../english/partners/partners.def:287
+#: ../../english/partners/partners.def:309
 msgid ""
 "Simtec is a leading provider of ARM based computing products. We have a "
 "range of <a href=\"http://www.simtec.co.uk/products/boards.html\">boards</a> "
diff --git a/chinese/po/ports.zh.po b/chinese/po/ports.zh.po
index 279e8d38c17..fe9b8fa4e03 100644
--- a/chinese/po/ports.zh.po
+++ b/chinese/po/ports.zh.po
@@ -116,32 +116,32 @@ msgstr "給 PowerPC 用的 Debian"
 msgid "Debian for Sparc"
 msgstr "給 Sparc 用的 Debian"
 
-#~ msgid "Debian for Sparc64"
-#~ msgstr "給 Sparc64 用的 Debian"
-
-#~ msgid "Debian for S/390"
-#~ msgstr "給 S/390 用的 Debian"
+#~ msgid "Debian for Laptops"
+#~ msgstr "給筆記型電腦用的 Debian"
 
-#~ msgid "Debian for MIPS"
-#~ msgstr "給 MIPS 用的 Debian"
+#~ msgid "Debian for AMD64"
+#~ msgstr "給 AMD64 用的 Debian"
 
-#~ msgid "Debian for Motorola 680x0"
-#~ msgstr "給 Motorola 680x0 用的 Debian"
+#~ msgid "Debian for ARM"
+#~ msgstr "給 ARM 用的 Debian"
 
-#~ msgid "Debian GNU/FreeBSD"
-#~ msgstr "Debian GNU/FreeBSD"
+#~ msgid "Debian for Beowulf"
+#~ msgstr "給 Beowulf 用的 Debian"
 
 #~ msgid "Main"
 #~ msgstr "主要"
 
-#~ msgid "Debian for Beowulf"
-#~ msgstr "給 Beowulf 用的 Debian"
+#~ msgid "Debian GNU/FreeBSD"
+#~ msgstr "Debian GNU/FreeBSD"
 
-#~ msgid "Debian for ARM"
-#~ msgstr "給 ARM 用的 Debian"
+#~ msgid "Debian for Motorola 680x0"
+#~ msgstr "給 Motorola 680x0 用的 Debian"
 
-#~ msgid "Debian for AMD64"
-#~ msgstr "給 AMD64 用的 Debian"
+#~ msgid "Debian for MIPS"
+#~ msgstr "給 MIPS 用的 Debian"
 
-#~ msgid "Debian for Laptops"
-#~ msgstr "給筆記型電腦用的 Debian"
+#~ msgid "Debian for S/390"
+#~ msgstr "給 S/390 用的 Debian"
+
+#~ msgid "Debian for Sparc64"
+#~ msgstr "給 Sparc64 用的 Debian"
diff --git a/chinese/po/stats.zh.po b/chinese/po/stats.zh.po
index df2f3ef03c6..cece3846fbe 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 88f5744a094..81e9ced4144 100644
--- a/chinese/po/templates.zh.po
+++ b/chinese/po/templates.zh.po
@@ -228,18 +228,22 @@ msgid "Last Modified"
 msgstr "最近修訂日期"
 
 #: ../../english/template/debian/footer.wml:113
+msgid "Last Built"
+msgstr ""
+
+#: ../../english/template/debian/footer.wml:116
 msgid "Copyright"
 msgstr "版權所有"
 
-#: ../../english/template/debian/footer.wml:116
+#: ../../english/template/debian/footer.wml:119
 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:119
+#: ../../english/template/debian/footer.wml:122
 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:122
+#: ../../english/template/debian/footer.wml:125
 msgid ""
 "Debian is a registered <a href=\"m4_HOME/trademark\">trademark</a> of "
 "Software in the Public Interest, Inc."
@@ -521,97 +525,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>."
@@ -620,163 +696,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 "銷售商:"