(zh) update translation in *.po

9 files changed, 281 insertions, 311 deletions

diff --git a/chinese/po/blends.zh.po b/chinese/po/blends.zh.po
index 9cae171c1fb..3353e46f555 100644
--- a/chinese/po/blends.zh.po
+++ b/chinese/po/blends.zh.po
@@ -29,6 +29,15 @@ msgstr "衍生版"
 
 #: ../../english/blends/released.data:15
 msgid ""
+"The goal of Debian Accessibility is to develop Debian into an operating "
+"system that is particularly well suited for the requirements of people with "
+"disabilities."
+msgstr ""
+"Debian Accessibility（Debian 易訪問版）的目標是將 Debian 開發成為一個特別適合"
+"並滿足具有生理缺陷的人群的需要的操作系統。"
+
+#: ../../english/blends/released.data:23
+msgid ""
 "The goal of Debian Astro is to develop a Debian based operating system that "
 "fits the requirements of both professional and hobby astronomers. It "
 "integrates a large number of software packages covering telescope control, "
@@ -38,20 +47,12 @@ msgstr ""
 "餘天文學家需求的操作系統。它集成了大量的軟件包，範圍涉及望遠鏡控制、數據縮"
 "減、演示和其它各個領域。"
 
-#: ../../english/blends/released.data:23
+#: ../../english/blends/released.data:31
 msgid ""
 "The goal of DebiChem is to make Debian a good platform for chemists in their "
 "day-to-day work."
 msgstr "DebiChem 的目標是讓 Debian 成為化學家日常工作的優秀平台。"
 
-#: ../../english/blends/released.data:31
-msgid ""
-"The goal of Debian Games is to provide games in Debian from arcade and "
-"adventure to simulation and strategy."
-msgstr ""
-"Debian Games（Debian 遊戲版）的目標是在 Debian 中提供各類遊戲，從街機类、冒险"
-"类到模擬和策略遊戲。"
-
 #: ../../english/blends/released.data:39
 msgid ""
 "The goal of Debian Edu is to provide a Debian OS system suitable for "
@@ -62,19 +63,27 @@ msgstr ""
 
 #: ../../english/blends/released.data:47
 msgid ""
+"The goal of Debian Games is to provide games in Debian from arcade and "
+"adventure to simulation and strategy."
+msgstr ""
+"Debian Games（Debian 遊戲版）的目標是在 Debian 中提供各類遊戲，從街機类、冒险"
+"类到模擬和策略遊戲。"
+
+#: ../../english/blends/released.data:55
+msgid ""
 "The goal of Debian GIS is to develop Debian into the best distribution for "
 "Geographical Information System applications and users."
 msgstr ""
 "Debian GIS（Debian 地理信息系統版）的目標是將 Debian 變成適合地理信息系統應用"
 "程序與用戶的最佳發行版。"
 
-#: ../../english/blends/released.data:57
+#: ../../english/blends/released.data:64
 msgid ""
 "The goal of Debian Junior is to make Debian an OS that children will enjoy "
 "using."
 msgstr "Debian Junior 的目標是讓 Debian 成為孩童能夠樂于使用的操作系統。"
 
-#: ../../english/blends/released.data:65
+#: ../../english/blends/released.data:72
 msgid ""
 "The goal of Debian Med is a complete free and open system for all tasks in "
 "medical care and research. To achieve this goal Debian Med integrates "
@@ -85,7 +94,7 @@ msgstr ""
 "開放的操作系統。為了達到這個目標，Debian Med 將醫療影像、生物信息學、門診 IT "
 "基礎設施等相關的自由、開源軟件集成進入了 Debian 操作系統。"
 
-#: ../../english/blends/released.data:73
+#: ../../english/blends/released.data:80
 msgid ""
 "The goal of Debian Multimedia is to make Debian a good platform for audio "
 "and multimedia work."
@@ -93,7 +102,7 @@ msgstr ""
 "Debian Multimedia（Debian 多媒體版）的目標是讓 Debian 成為完成音頻與多媒體工"
 "作的良好平台。"
 
-#: ../../english/blends/released.data:81
+#: ../../english/blends/released.data:88
 msgid ""
 "The goal of Debian Science is to provide a better experience when using "
 "Debian to researchers and scientists."
@@ -101,15 +110,7 @@ msgstr ""
 "Debian Science（Debian 科學版）的目標是為使用 Debian 的研究人員與科學家提供更"
 "好的使用體驗。"
 
-#: ../../english/blends/released.data:89
-msgid ""
-"The goal of Debian Hamradio is to support the needs of radio amateurs in "
-"Debian by providing logging, data mode and packet mode applications and more."
-msgstr ""
-"Debian Hamradio（Debian 無線電版）的目標是支持滿足無線電愛好者的需求，在 "
-"Debian 內提供包括日志記錄、數據模式和包模式等等方面的應用程序。"
-
-#: ../../english/blends/released.data:98
+#: ../../english/blends/released.data:96
 msgid ""
 "The goal of FreedomBox is to develop, design and promote personal servers "
 "running free software for private, personal communications. Applications "
@@ -122,16 +123,15 @@ msgstr ""
 "以替代無線路由器的設備上運行用來保護用戶數據私密性與安全性的洋蔥頭（Tor）中繼"
 "節點。"
 
-#: ../../english/blends/unreleased.data:15
+#: ../../english/blends/released.data:104
 msgid ""
-"The goal of Debian Accessibility is to develop Debian into an operating "
-"system that is particularly well suited for the requirements of people with "
-"disabilities."
+"The goal of Debian Hamradio is to support the needs of radio amateurs in "
+"Debian by providing logging, data mode and packet mode applications and more."
 msgstr ""
-"Debian Accessibility（Debian 易訪問版）的目標是將 Debian 開發成為一個特別適合"
-"並滿足具有生理缺陷的人群的需要的操作系統。"
+"Debian Hamradio（Debian 無線電版）的目標是支持滿足無線電愛好者的需求，在 "
+"Debian 內提供包括日志記錄、數據模式和包模式等等方面的應用程序。"
 
-#: ../../english/blends/unreleased.data:23
+#: ../../english/blends/unreleased.data:15
 msgid ""
 "The goal of Debian Design is to provide applications for designers. This "
 "includes graphic design, web design and multimedia design."
@@ -139,7 +139,7 @@ msgstr ""
 "Debian Design（Debian 設計師版）的目標是為設計師提供應用程序。它包含了圖像設"
 "計、網頁設計和多媒體設計。"
 
-#: ../../english/blends/unreleased.data:30
+#: ../../english/blends/unreleased.data:22
 msgid ""
 "The goal of DebianParl is to provide applications to support the needs of "
 "parliamentarians, politicians and their staffers all around the world."
diff --git a/chinese/po/doc.zh.po b/chinese/po/doc.zh.po
index af153647f67..db9b82136fd 100644
--- a/chinese/po/doc.zh.po
+++ b/chinese/po/doc.zh.po
@@ -40,8 +40,8 @@ msgstr ""
 "Debian 中和 Debian 之外的软件。使用 network-manager 等管理您的家庭网络。本书 "
 "10% 的利润将捐赠给 Debian 项目。"
 
-#: ../../english/doc/books.data:64 ../../english/doc/books.data:174
-#: ../../english/doc/books.data:229
+#: ../../english/doc/books.data:63 ../../english/doc/books.data:173
+#: ../../english/doc/books.data:228
 msgid ""
 "Written by two Debian developers, this free book\n"
 "  started as a translation of their French best-seller known as Cahier de\n"
@@ -62,7 +62,7 @@ msgstr ""
 "及监控、备份和迁移，同时也没有忘记像配置 SELinux 以保护服务、自动化安装、使"
 "用 Xen、KVM 或 LXC 进行虚拟化等等高级主题。"
 
-#: ../../english/doc/books.data:86
+#: ../../english/doc/books.data:85
 msgid ""
 "The aim of this freely available book is to get you up to\n"
 "  speed with Debian. It is comprehensive with basic support\n"
@@ -75,7 +75,7 @@ msgstr ""
 "在家庭、办公室、俱乐部还是学校）提供全面的基本支持。 一些关于 Debian 的信息十"
 "分过时。"
 
-#: ../../english/doc/books.data:108
+#: ../../english/doc/books.data:107
 msgid ""
 "The first French book about Debian is already in its fifth edition. It\n"
 "  covers all aspects of the administration of Debian from the installation\n"
@@ -91,7 +91,7 @@ msgstr ""
 "的兴趣：希望了解 Debian 的初学者、寻找精通 Debian 相关工具所需要的技巧的高级"
 "用户，以及想要使用 Debian 构建可靠网络的管理员。"
 
-#: ../../english/doc/books.data:128
+#: ../../english/doc/books.data:127
 msgid ""
 "The book covers topics ranging from concepts of package\n"
 "  management over the available tools and how they're used to concrete "
@@ -106,7 +106,7 @@ msgstr ""
 "实际使用中可能出现的具体问题，以及如何解决这些问题。这本书是用德语写的，计划"
 "翻译成英语。格式：电子书（在线、HTML、PDF、ePub、Mobi），计划出版纸质书籍。\n"
 
-#: ../../english/doc/books.data:149
+#: ../../english/doc/books.data:148
 msgid ""
 "This book teaches you how to install and configure the system and also how "
 "to use Debian in a professional environment.  It shows the full potential of "
@@ -117,7 +117,7 @@ msgstr ""
 "发行版（当前系统版本为第 8 版）的完整潜力，并提供了帮助所有想要了解 Debian 及"
 "其一系列服务的用户的实用手册。"
 
-#: ../../english/doc/books.data:203
+#: ../../english/doc/books.data:202
 msgid ""
 "Written by two penetration researcher - Annihilator, Firstblood.\n"
 "  This book teaches you how to build and configure Debian 8.x server system\n"
diff --git a/chinese/po/homepage.zh.po b/chinese/po/homepage.zh.po
index 069007c6e27..40a9b82489c 100644
--- a/chinese/po/homepage.zh.po
+++ b/chinese/po/homepage.zh.po
@@ -9,7 +9,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 3.3.2\n"
+"X-Generator: Poedit 3.4.2\n"
 
 #: ../../english/index.def:8
 msgid "The Universal Operating System"
@@ -32,46 +32,54 @@ msgid "DebConf22 Group Photo"
 msgstr "DebConf22 团队照片"
 
 #: ../../english/index.def:26
+msgid "DC23 Group Photo"
+msgstr "DC23 团队照片"
+
+#: ../../english/index.def:29
+msgid "DebConf23 Group Photo"
+msgstr "DebConf23 团队照片"
+
+#: ../../english/index.def:33
 msgid "Debian Reunion Hamburg 2023"
 msgstr "Debian Reunion（2023，汉堡）"
 
-#: ../../english/index.def:29
+#: ../../english/index.def:36
 msgid "Group photo of the Debian Reunion Hamburg 2023"
 msgstr "2023 年在汉堡举行的 Debian Reunion 的团队照片"
 
-#: ../../english/index.def:33
+#: ../../english/index.def:40
 msgid "MiniDebConf Brasília 2023"
 msgstr "迷你 DebConf（2023，巴西利亚）"
 
-#: ../../english/index.def:36
+#: ../../english/index.def:43
 msgid "Group photo of the MiniDebConf Brasília 2023"
 msgstr "2023 年在巴西利亚举行的迷你 DebConf 会议的团队照片"
 
-#: ../../english/index.def:40
+#: ../../english/index.def:47
 msgid "Mini DebConf Regensburg 2021"
 msgstr "迷你 DebConf（2021，雷根斯堡）"
 
-#: ../../english/index.def:43
+#: ../../english/index.def:50
 msgid "Group photo of the MiniDebConf in Regensburg 2021"
 msgstr "2021 年在雷根斯堡举行的迷你 DebConf 会议的团队照片"
 
-#: ../../english/index.def:47
+#: ../../english/index.def:54
 msgid "Screenshot Calamares Installer"
 msgstr "Calamares 安装器截图"
 
-#: ../../english/index.def:50
+#: ../../english/index.def:57
 msgid "Screenshot from the Calamares installer"
 msgstr "来自 Calamares 安装器的截图"
 
-#: ../../english/index.def:54 ../../english/index.def:57
+#: ../../english/index.def:61 ../../english/index.def:64
 msgid "Debian is like a Swiss Army Knife"
 msgstr "Debian 如同瑞士军刀一样"
 
-#: ../../english/index.def:61
+#: ../../english/index.def:68
 msgid "People have fun with Debian"
 msgstr "享受 Debian 乐趣的参与者们"
 
-#: ../../english/index.def:64
+#: ../../english/index.def:71
 msgid "Debian people at Debconf18 in Hsinchu really having fun"
 msgstr "于新竹举办的 Debconf18 会议上享受乐趣的参与人员"
 
diff --git a/chinese/po/legal.zh.po b/chinese/po/legal.zh.po
index b249581ad64..0495f233ac7 100644
--- a/chinese/po/legal.zh.po
+++ b/chinese/po/legal.zh.po
@@ -10,84 +10,6 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../english/template/debian/legal.wml:15
-msgid "License Information"
-msgstr "授權[CN:信息:][HKTW:資訊:]"
-
-#: ../../english/template/debian/legal.wml:19
-msgid "DLS Index"
-msgstr "DLS 目錄"
-
-#: ../../english/template/debian/legal.wml:23
-msgid "DFSG"
-msgstr "DFSG"
-
-#: ../../english/template/debian/legal.wml:27
-msgid "DFSG FAQ"
-msgstr "DFSG 常見問題"
-
-#: ../../english/template/debian/legal.wml:31
-msgid "Debian-Legal Archive"
-msgstr "Debian-Legal 檔案庫"
-
-#. title string without version, on the form "dls-xxx - license name: status"
-#: ../../english/template/debian/legal.wml:49
-msgid "%s  – %s: %s"
-msgstr "%s  – %s: %s"
-
-#. title string with version, on the form "dls-xxx - license name, version: status"
-#: ../../english/template/debian/legal.wml:52
-msgid "%s  – %s, Version %s: %s"
-msgstr "%s  – %s, Version %s: %s"
-
-#: ../../english/template/debian/legal.wml:59
-msgid "Date published"
-msgstr "公佈日期"
-
-#: ../../english/template/debian/legal.wml:61
-msgid "License"
-msgstr "授權"
-
-#: ../../english/template/debian/legal.wml:64
-msgid "Version"
-msgstr "版本"
-
-#: ../../english/template/debian/legal.wml:66
-msgid "Summary"
-msgstr "摘要"
-
-#: ../../english/template/debian/legal.wml:70
-msgid "Justification"
-msgstr "判決"
-
-#: ../../english/template/debian/legal.wml:72
-msgid "Discussion"
-msgstr "討論"
-
-#: ../../english/template/debian/legal.wml:74
-msgid "Original Summary"
-msgstr "原始摘要"
-
-#: ../../english/template/debian/legal.wml:76
-msgid ""
-"The original summary by <summary-author/> can be found in the <a "
-"href=\"<summary-url/>\">list archives</a>."
-msgstr ""
-"由 <summary-author/> 撰寫的原始摘要可以在 <a href=\"<summary-url/>\">list "
-"archives</a> 找到。"
-
-#: ../../english/template/debian/legal.wml:77
-msgid "This summary was prepared by <summary-author/>."
-msgstr "這個摘要是由 <summary-author/> 準備的。"
-
-#: ../../english/template/debian/legal.wml:80
-msgid "License text (translated)"
-msgstr "授權文字 (翻譯)"
-
-#: ../../english/template/debian/legal.wml:83
-msgid "License text"
-msgstr "授權文字"
-
 #: ../../english/template/debian/legal_tags.wml:6
 msgid "free"
 msgstr "free"
@@ -120,3 +42,61 @@ msgid ""
 msgstr ""
 "請看<a href=\"./\">授權[CN:信息:][HKTW:資訊:]</a>頁面以了解Debian License "
 "Summaries (DLS) 的大概。"
+
+#~ msgid "%s  &ndash; %s, Version %s: %s"
+#~ msgstr "%s  &ndash; %s, Version %s: %s"
+
+#~ msgid "%s  &ndash; %s: %s"
+#~ msgstr "%s  &ndash; %s: %s"
+
+#~ msgid "DFSG"
+#~ msgstr "DFSG"
+
+#~ msgid "DFSG FAQ"
+#~ msgstr "DFSG 常見問題"
+
+#~ msgid "DLS Index"
+#~ msgstr "DLS 目錄"
+
+#~ msgid "Date published"
+#~ msgstr "公佈日期"
+
+#~ msgid "Debian-Legal Archive"
+#~ msgstr "Debian-Legal 檔案庫"
+
+#~ msgid "Discussion"
+#~ msgstr "討論"
+
+#~ msgid "Justification"
+#~ msgstr "判決"
+
+#~ msgid "License"
+#~ msgstr "授權"
+
+#~ msgid "License Information"
+#~ msgstr "授權[CN:信息:][HKTW:資訊:]"
+
+#~ msgid "License text"
+#~ msgstr "授權文字"
+
+#~ msgid "License text (translated)"
+#~ msgstr "授權文字 (翻譯)"
+
+#~ msgid "Original Summary"
+#~ msgstr "原始摘要"
+
+#~ msgid "Summary"
+#~ msgstr "摘要"
+
+#~ msgid ""
+#~ "The original summary by <summary-author/> can be found in the <a "
+#~ "href=\"<summary-url/>\">list archives</a>."
+#~ msgstr ""
+#~ "由 <summary-author/> 撰寫的原始摘要可以在 <a href=\"<summary-url/>\">list "
+#~ "archives</a> 找到。"
+
+#~ msgid "This summary was prepared by <summary-author/>."
+#~ msgstr "這個摘要是由 <summary-author/> 準備的。"
+
+#~ msgid "Version"
+#~ msgstr "版本"
diff --git a/chinese/po/organization.zh.po b/chinese/po/organization.zh.po
index d9f523166c5..788e62f7d3f 100644
--- a/chinese/po/organization.zh.po
+++ b/chinese/po/organization.zh.po
@@ -116,27 +116,27 @@ msgid "Distribution"
 msgstr "發行版"
 
 #: ../../english/intro/organization.data:72
-#: ../../english/intro/organization.data:198
+#: ../../english/intro/organization.data:168
 msgid "Communication and Outreach"
 msgstr "沟通与外展服务"
 
 #: ../../english/intro/organization.data:74
-#: ../../english/intro/organization.data:201
+#: ../../english/intro/organization.data:171
 msgid "Data Protection team"
 msgstr "数据保护团队"
 
 #: ../../english/intro/organization.data:75
-#: ../../english/intro/organization.data:206
+#: ../../english/intro/organization.data:176
 msgid "Publicity team"
 msgstr "宣传团队"
 
 #: ../../english/intro/organization.data:77
-#: ../../english/intro/organization.data:273
+#: ../../english/intro/organization.data:232
 msgid "Membership in other organizations"
 msgstr "其他组织的成员资格"
 
 #: ../../english/intro/organization.data:78
-#: ../../english/intro/organization.data:296
+#: ../../english/intro/organization.data:250
 msgid "Support and Infrastructure"
 msgstr "支援以及下級組織"
 
@@ -216,129 +216,95 @@ msgstr "測試"
 msgid "Cloud Team"
 msgstr "云服务团队"
 
-#: ../../english/intro/organization.data:163
-msgid "Autobuilding infrastructure"
-msgstr "自动构建架构"
-
-#: ../../english/intro/organization.data:165
-msgid "Wanna-build team"
-msgstr "Wanna-build 团队"
-
-#: ../../english/intro/organization.data:172
-msgid "Buildd administration"
-msgstr "Buildd 管理"
-
-#: ../../english/intro/organization.data:189
-msgid "Documentation"
-msgstr "文档"
-
-#: ../../english/intro/organization.data:193
-msgid "Work-Needing and Prospective Packages list"
-msgstr "需要幫助的套件清單"
-
-#: ../../english/intro/organization.data:208
+#: ../../english/intro/organization.data:181
 msgid "Press Contact"
 msgstr "媒体联络"
 
-#: ../../english/intro/organization.data:210
+#: ../../english/intro/organization.data:183
 msgid "Web Pages"
 msgstr "網頁"
 
-#: ../../english/intro/organization.data:218
+#: ../../english/intro/organization.data:191
 msgid "Planet Debian"
 msgstr "Debian 星球"
 
-#: ../../english/intro/organization.data:223
+#: ../../english/intro/organization.data:196
 msgid "Outreach"
 msgstr "外展服务"
 
-#: ../../english/intro/organization.data:228
-msgid "Debian Women Project"
-msgstr "Debian Women 計劃"
-
-#: ../../english/intro/organization.data:236
+#: ../../english/intro/organization.data:203
 msgid "Community"
 msgstr "社区"
 
-#: ../../english/intro/organization.data:243
+#: ../../english/intro/organization.data:209
 msgid ""
 "To send a private message to all the members of the Community Team, use the "
 "OpenPGP key <a href=\"community-team-pubkey."
 "txt\">817DAE61E2FE4CA28E1B7762A89C4D0527C4C869</a>."
 msgstr ""
 "如需向社区团队的所有成员发送加密消息，请使用 OpenPGP 密钥 <a "
-"href=\"community-team-pubkey."
-"txt\">817DAE61E2FE4CA28E1B7762A89C4D0527C4C869</a>。"
-
-#: ../../english/intro/organization.data:245
-msgid "Events"
-msgstr "活動"
+"href=\"community-team-pubkey.txt\">817DAE61E2FE4CA28E1B7762A89C4D0527C4C869</"
+"a>。"
 
-#: ../../english/intro/organization.data:253
+#: ../../english/intro/organization.data:211
 msgid "DebConf Committee"
 msgstr "DebConf 委員會"
 
-#: ../../english/intro/organization.data:260
+#: ../../english/intro/organization.data:219
 msgid "Partner Program"
 msgstr "合作計劃"
 
-#: ../../english/intro/organization.data:264
+#: ../../english/intro/organization.data:223
 msgid "Hardware Donations Coordination"
 msgstr "硬體捐贈协调"
 
-#: ../../english/intro/organization.data:279
+#: ../../english/intro/organization.data:238
 msgid "GNOME Foundation"
 msgstr "GNOME 基金會"
 
-#: ../../english/intro/organization.data:281
+#: ../../english/intro/organization.data:239
 msgid "Linux Professional Institute"
 msgstr "Linux 国际专业协会"
 
-#: ../../english/intro/organization.data:282
+#: ../../english/intro/organization.data:240
 msgid "Linux Magazine"
 msgstr "Linux 杂志"
 
-#: ../../english/intro/organization.data:284
+#: ../../english/intro/organization.data:242
 msgid "Linux Standards Base"
 msgstr "Linux 标准基础"
 
-#: ../../english/intro/organization.data:285
+#: ../../english/intro/organization.data:243
 msgid "Free Standards Group"
 msgstr "自由标准组织"
 
-#: ../../english/intro/organization.data:286
+#: ../../english/intro/organization.data:244
 msgid ""
 "OASIS: Organization\n"
 "      for the Advancement of Structured Information Standards"
 msgstr "OASIS：结构化信息标准促进组织"
 
-#: ../../english/intro/organization.data:289
-msgid ""
-"OVAL: Open Vulnerability\n"
-"      Assessment Language"
-msgstr "OVAL：开放漏洞评估语言"
-
-#: ../../english/intro/organization.data:292
+#: ../../english/intro/organization.data:246
 msgid "Open Source Initiative"
 msgstr "开放源代码促进会"
 
-#: ../../english/intro/organization.data:299
+#: ../../english/intro/organization.data:253
 msgid "Bug Tracking System"
 msgstr "錯誤追縱系統"
 
-#: ../../english/intro/organization.data:304
+#: ../../english/intro/organization.data:258
 msgid "Mailing Lists Administration and Mailing List Archives"
 msgstr "郵件列表管理與郵件列表庫存"
 
-#: ../../english/intro/organization.data:312
+#: ../../english/intro/organization.data:266
 msgid "New Members Front Desk"
 msgstr "新進開發人員前台"
 
-#: ../../english/intro/organization.data:321
+#: ../../english/intro/organization.data:275
 msgid "Debian Account Managers"
 msgstr "Debian 帳號管理員"
 
-#: ../../english/intro/organization.data:327
+#: ../../english/intro/organization.data:281
 msgid ""
 "To send a private message to all DAMs, use the OpenPGP key "
 "57731224A9762EA155AB2A530CA8D15BB24D96F2."
@@ -346,23 +312,23 @@ msgstr ""
 "如需向所有 DAM 发送加密消息，请使用 OpenPGP 密钥 "
 "57731224A9762EA155AB2A530CA8D15BB24D96F2。"
 
-#: ../../english/intro/organization.data:328
+#: ../../english/intro/organization.data:282
 msgid "Keyring Maintainers (OpenPGP)"
 msgstr "密钥环（OpenPGP）管理員"
 
-#: ../../english/intro/organization.data:332
+#: ../../english/intro/organization.data:286
 msgid "Security Team"
 msgstr "安全團隊"
 
-#: ../../english/intro/organization.data:343
+#: ../../english/intro/organization.data:298
 msgid "Policy"
 msgstr "政策"
 
-#: ../../english/intro/organization.data:346
+#: ../../english/intro/organization.data:301
 msgid "System Administration"
 msgstr "系統管理"
 
-#: ../../english/intro/organization.data:347
+#: ../../english/intro/organization.data:302
 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."
@@ -370,7 +336,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:357
+#: ../../english/intro/organization.data:312
 msgid ""
 "If you have hardware problems with Debian machines, please see <a "
 "href=\"https://db.debian.org/machines.cgi\">Debian Machines</a> page, it "
@@ -380,53 +346,72 @@ msgstr ""
 "href=\"https://db.debian.org/machines.cgi\">Debian Machines</a> page,it "
 "should contain per-machine administrator information."
 
-#: ../../english/intro/organization.data:358
-msgid "LDAP Developer Directory Administrator"
-msgstr "LDAP 開發人員目錄管理"
-
-#: ../../english/intro/organization.data:359
+#: ../../english/intro/organization.data:313
 msgid "Mirrors"
 msgstr "鏡像站台"
 
-#: ../../english/intro/organization.data:362
+#: ../../english/intro/organization.data:317
 msgid "DNS Maintainer"
 msgstr "DNS 管理"
 
-#: ../../english/intro/organization.data:363
+#: ../../english/intro/organization.data:318
 msgid "Package Tracking System"
 msgstr "套件追蹤系統"
 
-#: ../../english/intro/organization.data:365
+#: ../../english/intro/organization.data:320
 msgid "Treasurer"
 msgstr "财务主管"
 
-#: ../../english/intro/organization.data:370
-msgid ""
-"<a name=\"trademark\" href=\"m4_HOME/trademark\">Trademark</a> use requests"
-msgstr "<a name=\"trademark\" href=\"m4_HOME/trademark\">商标</a>使用授权"
-
-#: ../../english/intro/organization.data:373
+#: ../../english/intro/organization.data:325
 msgid "Salsa administrators"
 msgstr "Salsa 管理员"
 
+#~ msgid ""
+#~ "<a name=\"trademark\" href=\"m4_HOME/trademark\">Trademark</a> use "
+#~ "requests"
+#~ msgstr "<a name=\"trademark\" href=\"m4_HOME/trademark\">商标</a>使用授权"
+
 #~ msgid "Anti-harassment"
 #~ msgstr "反骚扰"
 
+#~ msgid "Autobuilding infrastructure"
+#~ msgstr "自动构建架构"
+
+#~ msgid "Buildd administration"
+#~ msgstr "Buildd 管理"
+
 #~ msgid "CD Vendors Page"
 #~ msgstr "CD 廠商網頁"
 
 #~ msgid "Consultants Page"
 #~ msgstr "顧問網頁"
 
+#~ msgid "Debian Women Project"
+#~ msgstr "Debian Women 計劃"
+
+#~ msgid "Documentation"
+#~ msgstr "文档"
+
 #~ msgid "Embedded systems"
 #~ msgstr "嵌入式系統"
 
+#~ msgid "Events"
+#~ msgstr "活動"
+
 #~ msgid "Firewalls"
 #~ msgstr "防火牆"
 
+#~ msgid "LDAP Developer Directory Administrator"
+#~ msgstr "LDAP 開發人員目錄管理"
+
 #~ msgid "Laptops"
 #~ msgstr "筆記型電腦"
 
+#~ msgid ""
+#~ "OVAL: Open Vulnerability\n"
+#~ "      Assessment Language"
+#~ msgstr "OVAL：开放漏洞评估语言"
+
 #~ msgid "Ports"
 #~ msgstr "移植"
 
@@ -438,3 +423,9 @@ msgstr "Salsa 管理员"
 
 #~ msgid "User support"
 #~ msgstr "[CNHK:用戶:][TW:使用者:][HKTW:支援:][CN:支持:]"
+
+#~ msgid "Wanna-build team"
+#~ msgstr "Wanna-build 团队"
+
+#~ msgid "Work-Needing and Prospective Packages list"
+#~ msgstr "需要幫助的套件清單"
diff --git a/chinese/po/others.zh.po b/chinese/po/others.zh.po
index 6925f40b48a..cb84b59868d 100644
--- a/chinese/po/others.zh.po
+++ b/chinese/po/others.zh.po
@@ -72,15 +72,7 @@ msgstr ""
 "詳細資訊請參考 <a href=\"m4_HOME/intl/spanish/\">https://www.debian.org/intl/"
 "spanish/</a> (只有西班牙語)。"
 
-#: ../../english/distrib/pre-installed.defs:18
-msgid "Phone"
-msgstr "電話"
-
 #: ../../english/distrib/pre-installed.defs:19
-msgid "Fax"
-msgstr "傳真"
-
-#: ../../english/distrib/pre-installed.defs:21
 msgid "Address"
 msgstr "地址"
 
@@ -297,6 +289,9 @@ msgstr "关于您的更多信息..."
 #~ msgid "Email:"
 #~ msgstr "Email："
 
+#~ msgid "Fax"
+#~ msgstr "傳真"
+
 #~ msgid "Mailing List Subscription"
 #~ msgstr "訂閱郵件列表"
 
@@ -327,6 +322,9 @@ msgstr "关于您的更多信息..."
 #~ msgid "Package"
 #~ msgstr "軟件套件"
 
+#~ msgid "Phone"
+#~ msgstr "電話"
+
 #~ msgid ""
 #~ "Please respect the <a href=\"./#ads\">Debian mailing list advertising "
 #~ "policy</a>."
diff --git a/chinese/po/security.zh.po b/chinese/po/security.zh.po
index b969e087fef..b07e4e3e663 100644
--- a/chinese/po/security.zh.po
+++ b/chinese/po/security.zh.po
@@ -12,40 +12,10 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Poedit 3.0.1\n"
 
-#: ../../english/security/dsa.rdf.in:16
-msgid "Debian Security"
-msgstr "Debian 安全"
-
-#: ../../english/security/dsa.rdf.in:19
-msgid "Debian Security Advisories"
-msgstr "Debian 安全警报"
-
 #: ../../english/security/faq.inc:6
 msgid "Q"
 msgstr "Q"
 
-#: ../../english/security/index.include:17
-msgid ""
-"<a href=\\\"undated/\\\">undated</a> security advisories, included for "
-"posterity"
-msgstr "非常舊的、<a href=\\\"undated/\\\">沒有日期记载的</a>安全警报"
-
-#: ../../english/security/make-ref-table.pl:81
-msgid "Mitre CVE dictionary"
-msgstr "Mitre CVE dictionary"
-
-#: ../../english/security/make-ref-table.pl:84
-msgid "Securityfocus Bugtraq database"
-msgstr "Securityfocus Bugtraq database"
-
-#: ../../english/security/make-ref-table.pl:88
-msgid "CERT Advisories"
-msgstr "CERT Advisories"
-
-#: ../../english/security/make-ref-table.pl:92
-msgid "US-CERT vulnerabilities Notes"
-msgstr "US-CERT vulnerabilities Notes"
-
 #: ../../english/template/debian/security.wml:11
 msgid "Source:"
 msgstr "來源:"
@@ -127,3 +97,26 @@ msgstr "CERT 的弱點報告:"
 #: ../../english/template/debian/securityreferences.wml:88
 msgid "No other external database security references currently available."
 msgstr "目前沒有其他安全分析資料庫可以參考。"
+
+#~ msgid ""
+#~ "<a href=\\\"undated/\\\">undated</a> security advisories, included for "
+#~ "posterity"
+#~ msgstr "非常舊的、<a href=\\\"undated/\\\">沒有日期记载的</a>安全警报"
+
+#~ msgid "CERT Advisories"
+#~ msgstr "CERT Advisories"
+
+#~ msgid "Debian Security"
+#~ msgstr "Debian 安全"
+
+#~ msgid "Debian Security Advisories"
+#~ msgstr "Debian 安全警报"
+
+#~ msgid "Mitre CVE dictionary"
+#~ msgstr "Mitre CVE dictionary"
+
+#~ msgid "Securityfocus Bugtraq database"
+#~ msgstr "Securityfocus Bugtraq database"
+
+#~ msgid "US-CERT vulnerabilities Notes"
+#~ msgstr "US-CERT vulnerabilities Notes"
diff --git a/chinese/po/stats.zh.po b/chinese/po/stats.zh.po
index fd818b650a8..ef0e2ce6546 100644
--- a/chinese/po/stats.zh.po
+++ b/chinese/po/stats.zh.po
@@ -3,13 +3,13 @@ msgstr ""
 "Project-Id-Version: \n"
 "POT-Creation-Date: \n"
 "PO-Revision-Date: \n"
-"Last-Translator: Boyuan Yang <073plan@gmail.com>\n"
+"Last-Translator: Wenbin Lv <wenbin816@gmail.com>\n"
 "Language-Team: \n"
 "Language: zh\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 2.2.1\n"
+"X-Generator: Poedit 3.4.2\n"
 
 #: ../../english/template/debian/stats_tags.wml:6
 msgid "Debian web site translation statistics"
@@ -51,43 +51,43 @@ msgstr "命中计数 N/A"
 msgid "hits"
 msgstr "命中"
 
-#: ../../stattrans.pl:600 ../../stattrans.pl:739
+#: ../../stattrans.pl:598 ../../stattrans.pl:737
 msgid "Created with <transstatslink>"
 msgstr "使用 <transstatslink> 创建"
 
-#: ../../stattrans.pl:605
+#: ../../stattrans.pl:603
 msgid "Translation summary for"
 msgstr "翻譯概要 for"
 
-#: ../../stattrans.pl:608 ../../stattrans.pl:763 ../../stattrans.pl:809
-#: ../../stattrans.pl:852
+#: ../../stattrans.pl:606 ../../stattrans.pl:761 ../../stattrans.pl:807
+#: ../../stattrans.pl:850
 msgid "Not translated"
 msgstr "未翻譯"
 
-#: ../../stattrans.pl:608 ../../stattrans.pl:762 ../../stattrans.pl:808
+#: ../../stattrans.pl:606 ../../stattrans.pl:760 ../../stattrans.pl:806
 msgid "Outdated"
 msgstr "過時"
 
-#: ../../stattrans.pl:608
+#: ../../stattrans.pl:606
 msgid "Translated"
 msgstr "已翻譯"
 
-#: ../../stattrans.pl:608 ../../stattrans.pl:687 ../../stattrans.pl:761
-#: ../../stattrans.pl:807 ../../stattrans.pl:850
+#: ../../stattrans.pl:606 ../../stattrans.pl:685 ../../stattrans.pl:759
+#: ../../stattrans.pl:805 ../../stattrans.pl:848
 msgid "Up to date"
 msgstr "最新"
 
-#: ../../stattrans.pl:609 ../../stattrans.pl:610 ../../stattrans.pl:611
-#: ../../stattrans.pl:612
+#: ../../stattrans.pl:607 ../../stattrans.pl:608 ../../stattrans.pl:609
+#: ../../stattrans.pl:610
 msgid "files"
 msgstr "個[CN:文件:][HKTW:檔案:]"
 
-#: ../../stattrans.pl:615 ../../stattrans.pl:616 ../../stattrans.pl:617
-#: ../../stattrans.pl:618
+#: ../../stattrans.pl:613 ../../stattrans.pl:614 ../../stattrans.pl:615
+#: ../../stattrans.pl:616
 msgid "bytes"
 msgstr "[CN:字節:][HKTW:位元組:]"
 
-#: ../../stattrans.pl:625
+#: ../../stattrans.pl:623
 msgid ""
 "Note: the lists of pages are sorted by popularity. Hover over the page name "
 "to see the number of hits."
@@ -95,131 +95,131 @@ msgstr ""
 "注意：页面列表使用其访问次数进行排序。在页面名称上悬停鼠标光标可以查看访问命"
 "中次数。"
 
-#: ../../stattrans.pl:631
+#: ../../stattrans.pl:629
 msgid "Outdated translations"
 msgstr "過時的翻譯"
 
-#: ../../stattrans.pl:633 ../../stattrans.pl:686
+#: ../../stattrans.pl:631 ../../stattrans.pl:684
 msgid "File"
 msgstr "[CN:文件:][HKTW:檔案:]"
 
-#: ../../stattrans.pl:635
+#: ../../stattrans.pl:633
 msgid "Diff"
 msgstr "差异"
 
-#: ../../stattrans.pl:637
+#: ../../stattrans.pl:635
 msgid "Comment"
 msgstr "備註"
 
-#: ../../stattrans.pl:638
+#: ../../stattrans.pl:636
 msgid "Git command line"
 msgstr "Git 命令行"
 
-#: ../../stattrans.pl:640
+#: ../../stattrans.pl:638
 msgid "Log"
 msgstr "日誌"
 
-#: ../../stattrans.pl:641
+#: ../../stattrans.pl:639
 msgid "Translation"
 msgstr "譯文"
 
-#: ../../stattrans.pl:642
+#: ../../stattrans.pl:640
 msgid "Maintainer"
 msgstr "維護者"
 
-#: ../../stattrans.pl:644
+#: ../../stattrans.pl:642
 msgid "Status"
 msgstr "狀態"
 
-#: ../../stattrans.pl:645
+#: ../../stattrans.pl:643
 msgid "Translator"
 msgstr "翻譯者"
 
-#: ../../stattrans.pl:646
+#: ../../stattrans.pl:644
 msgid "Date"
 msgstr "日期"
 
-#: ../../stattrans.pl:653
+#: ../../stattrans.pl:651
 msgid "General pages not translated"
 msgstr "未翻譯的一般頁面"
 
-#: ../../stattrans.pl:654
+#: ../../stattrans.pl:652
 msgid "Untranslated general pages"
 msgstr "未翻譯的一般頁面"
 
-#: ../../stattrans.pl:659
-msgid "News items not translated"
-msgstr "未翻譯的新聞"
+#: ../../stattrans.pl:657
+msgid "News items not translated (low priority)"
+msgstr "未翻譯的新聞（低优先级）"
 
-#: ../../stattrans.pl:660
+#: ../../stattrans.pl:658
 msgid "Untranslated news items"
 msgstr "未翻譯的新聞"
 
-#: ../../stattrans.pl:665
-msgid "Consultant/user pages not translated"
-msgstr "未翻譯的顧問/[CN:用戶:][HKTW:使用者:]頁面"
+#: ../../stattrans.pl:663
+msgid "Consultant/user pages not translated (low priority)"
+msgstr "未翻譯的顧問/[CN:用戶:][HKTW:使用者:]頁面（低优先级）"
 
-#: ../../stattrans.pl:666
+#: ../../stattrans.pl:664
 msgid "Untranslated consultant/user pages"
 msgstr "未翻譯的顧問/[CN:用戶:][HKTW:使用者:]頁面"
 
-#: ../../stattrans.pl:671
-msgid "International pages not translated"
-msgstr "未翻譯的國際頁面"
+#: ../../stattrans.pl:669
+msgid "International pages not translated (very low priority)"
+msgstr "未翻譯的國際頁面（极低优先级）"
 
-#: ../../stattrans.pl:672
+#: ../../stattrans.pl:670
 msgid "Untranslated international pages"
 msgstr "未翻譯的國際頁面"
 
-#: ../../stattrans.pl:677
+#: ../../stattrans.pl:675
 msgid "Translated pages (up-to-date)"
 msgstr "已翻譯頁面 (最新)"
 
-#: ../../stattrans.pl:684 ../../stattrans.pl:834
+#: ../../stattrans.pl:682 ../../stattrans.pl:832
 msgid "Translated templates (PO files)"
 msgstr "已翻譯模板 (PO [CN:文件:][HKTW:檔案:])"
 
-#: ../../stattrans.pl:685 ../../stattrans.pl:837
+#: ../../stattrans.pl:683 ../../stattrans.pl:835
 msgid "PO Translation Statistics"
 msgstr "PO 翻譯統計"
 
-#: ../../stattrans.pl:688 ../../stattrans.pl:851
+#: ../../stattrans.pl:686 ../../stattrans.pl:849
 msgid "Fuzzy"
 msgstr "模糊"
 
-#: ../../stattrans.pl:689
+#: ../../stattrans.pl:687
 msgid "Untranslated"
 msgstr "未翻譯"
 
-#: ../../stattrans.pl:690
+#: ../../stattrans.pl:688
 msgid "Total"
 msgstr "總數"
 
-#: ../../stattrans.pl:707
+#: ../../stattrans.pl:705
 msgid "Total:"
 msgstr "總數："
 
-#: ../../stattrans.pl:741
+#: ../../stattrans.pl:739
 msgid "Translated web pages"
 msgstr "已翻譯網頁"
 
-#: ../../stattrans.pl:744
+#: ../../stattrans.pl:742
 msgid "Translation Statistics by Page Count"
 msgstr "翻譯統計，按頁面數量"
 
-#: ../../stattrans.pl:759 ../../stattrans.pl:805 ../../stattrans.pl:849
+#: ../../stattrans.pl:757 ../../stattrans.pl:803 ../../stattrans.pl:847
 msgid "Language"
 msgstr "語言"
 
-#: ../../stattrans.pl:760 ../../stattrans.pl:806
+#: ../../stattrans.pl:758 ../../stattrans.pl:804
 msgid "Translations"
 msgstr "翻譯"
 
-#: ../../stattrans.pl:787
+#: ../../stattrans.pl:785
 msgid "Translated web pages (by size)"
 msgstr "已翻譯網頁（按[CN:文件:][HKTW:檔案:]大小）"
 
-#: ../../stattrans.pl:790
+#: ../../stattrans.pl:788
 msgid "Translation Statistics by Page Size"
 msgstr "翻譯統計，按頁面大小"
 
diff --git a/chinese/po/templates.zh.po b/chinese/po/templates.zh.po
index 90394f17587..ff1842a56d4 100644
--- a/chinese/po/templates.zh.po
+++ b/chinese/po/templates.zh.po
@@ -216,7 +216,7 @@ msgstr "release 2.1 中"
 msgid "in release 2.2"
 msgstr "release 2.2 中"
 
-#: ../../english/template/debian/footer.wml:84
+#: ../../english/template/debian/footer.wml:17
 msgid ""
 "See our <a href=\"m4_HOME/contact\">contact page</a> to get in touch. Web "
 "site source code is <a href=\"https://salsa.debian.org/webmaster-team/"
@@ -226,27 +226,27 @@ msgstr ""
 "网站的源代码可<a href=\"https://salsa.debian.org/webmaster-team/webwml\">在此"
 "处找到</a>。"
 
-#: ../../english/template/debian/footer.wml:87
+#: ../../english/template/debian/footer.wml:20
 msgid "Last Modified"
 msgstr "最近修訂日期"
 
-#: ../../english/template/debian/footer.wml:90
+#: ../../english/template/debian/footer.wml:23
 msgid "Last Built"
 msgstr "最近构建日期"
 
-#: ../../english/template/debian/footer.wml:93
+#: ../../english/template/debian/footer.wml:26
 msgid "Copyright"
 msgstr "版權所有"
 
-#: ../../english/template/debian/footer.wml:96
+#: ../../english/template/debian/footer.wml:29
 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:99
+#: ../../english/template/debian/footer.wml:32
 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:102
+#: ../../english/template/debian/footer.wml:35
 msgid ""
 "Debian is a registered <a href=\"m4_HOME/trademark\">trademark</a> of "
 "Software in the Public Interest, Inc."
@@ -254,20 +254,20 @@ msgstr ""
 "Debian 是 Software in the Public Interest, Inc. 的<a href=\"m4_HOME/"
 "trademark\">註冊商標</a>。"
 
-#: ../../english/template/debian/languages.wml:196
-#: ../../english/template/debian/languages.wml:232
+#: ../../english/template/debian/languages.wml:190
+#: ../../english/template/debian/languages.wml:226
 msgid "This page is also available in the following languages:"
 msgstr "本頁其他語言版本如下："
 
-#: ../../english/template/debian/languages.wml:265
+#: ../../english/template/debian/languages.wml:259
 msgid "How to set <a href=m4_HOME/intro/cn>the default document language</a>"
 msgstr "<a href=m4_HOME/intro/cn>如何設置[CN:默认:][HKTW:預設:]語言</a>"
 
-#: ../../english/template/debian/languages.wml:323
+#: ../../english/template/debian/languages.wml:317
 msgid "Browser default"
 msgstr "浏览器默认"
 
-#: ../../english/template/debian/languages.wml:323
+#: ../../english/template/debian/languages.wml:317
 msgid "Unset the language override cookie"
 msgstr "取消覆盖语言设置的 cookie"