Update PO files from english POT files

14 files changed, 720 insertions, 689 deletions

diff --git a/chinese/po/cdimage.zh.po b/chinese/po/cdimage.zh.po
index aca30da189b..d67ec50ec96 100644
--- a/chinese/po/cdimage.zh.po
+++ b/chinese/po/cdimage.zh.po
@@ -14,20 +14,6 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Gtranslator 2.91.7\n"
 
-#. Translators: string printed by gpg --fingerprint in your language, including spaces
-#: ../../english/CD/CD-keys.data:4 ../../english/CD/CD-keys.data:8
-#: ../../english/CD/CD-keys.data:13
-msgid "      Key fingerprint"
-msgstr "[CN:密钥指纹:][HKTW:      金鑰指紋:]"
-
-#: ../../english/devel/debian-installer/images.data:87
-msgid "ISO images"
-msgstr "ISO 映像"
-
-#: ../../english/devel/debian-installer/images.data:88
-msgid "Jigdo files"
-msgstr "Jigdo 文件"
-
 #. note: only change the sep(arator) if it's not good for your charset
 #: ../../english/template/debian/cdimage.wml:10
 msgid "·"
@@ -122,3 +108,17 @@ msgid ""
 "English-language <a href=\"/MailingLists/disclaimer\">public mailing list</"
 "a> for CDs/DVDs:"
 msgstr "CD/DVD <a href=\"/MailingLists/disclaimer\">公開郵件列表</a>（英文）："
+
+#. Translators: string printed by gpg --fingerprint in your language, including spaces
+#: ../../english/CD/CD-keys.data:4 ../../english/CD/CD-keys.data:8
+#: ../../english/CD/CD-keys.data:13
+msgid "      Key fingerprint"
+msgstr "[CN:密钥指纹:][HKTW:      金鑰指紋:]"
+
+#: ../../english/devel/debian-installer/images.data:87
+msgid "ISO images"
+msgstr "ISO 映像"
+
+#: ../../english/devel/debian-installer/images.data:88
+msgid "Jigdo files"
+msgstr "Jigdo 文件"
diff --git a/chinese/po/consultants.zh.po b/chinese/po/consultants.zh.po
index 5848cd55c99..743a591a00e 100644
--- a/chinese/po/consultants.zh.po
+++ b/chinese/po/consultants.zh.po
@@ -14,6 +14,14 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Gtranslator 2.91.7\n"
 
+#: ../../english/template/debian/consultant.wml:6
+msgid "List of Consultants"
+msgstr "顧問名單"
+
+#: ../../english/template/debian/consultant.wml:9
+msgid "Back to the <a href=\"./\">Debian consultants page</a>."
+msgstr "返回 <a href=\"./\">Debian 顾问页面</a>。"
+
 #: ../../english/consultants/consultant.defs:6
 msgid "Name:"
 msgstr "姓名："
@@ -69,11 +77,3 @@ msgid ""
 msgstr ""
 "以下的名單中共有來自世界 <total_country> 個國家的 <total_consultant> 個 "
 "Debian 顧問。"
-
-#: ../../english/template/debian/consultant.wml:6
-msgid "List of Consultants"
-msgstr "顧問名單"
-
-#: ../../english/template/debian/consultant.wml:9
-msgid "Back to the <a href=\"./\">Debian consultants page</a>."
-msgstr "返回 <a href=\"./\">Debian 顾问页面</a>。"
diff --git a/chinese/po/countries.zh.po b/chinese/po/countries.zh.po
index 203f2a5ea9d..ce5acc3f81f 100644
--- a/chinese/po/countries.zh.po
+++ b/chinese/po/countries.zh.po
@@ -224,210 +224,215 @@ msgid "Kenya"
 msgstr "[CN:肯尼亚:][HK:肯雅:][TW:肯亞:]"
 
 #: ../../english/template/debian/countries.wml:267
+#, fuzzy
+msgid "Kyrgyzstan"
+msgstr "[CN:哈萨克斯坦:][HKTW:哈薩克:]"
+
+#: ../../english/template/debian/countries.wml:270
 msgid "Korea"
 msgstr "韓國"
 
-#: ../../english/template/debian/countries.wml:270
+#: ../../english/template/debian/countries.wml:273
 msgid "Kuwait"
 msgstr "科威特"
 
-#: ../../english/template/debian/countries.wml:273
+#: ../../english/template/debian/countries.wml:276
 msgid "Kazakhstan"
 msgstr "[CN:哈萨克斯坦:][HKTW:哈薩克:]"
 
-#: ../../english/template/debian/countries.wml:276
+#: ../../english/template/debian/countries.wml:279
 msgid "Sri Lanka"
 msgstr "斯里蘭卡"
 
-#: ../../english/template/debian/countries.wml:279
+#: ../../english/template/debian/countries.wml:282
 msgid "Lithuania"
 msgstr "立陶宛"
 
-#: ../../english/template/debian/countries.wml:282
+#: ../../english/template/debian/countries.wml:285
 msgid "Luxembourg"
 msgstr "盧森堡"
 
-#: ../../english/template/debian/countries.wml:285
+#: ../../english/template/debian/countries.wml:288
 msgid "Latvia"
 msgstr "拉脫維亞"
 
-#: ../../english/template/debian/countries.wml:288
+#: ../../english/template/debian/countries.wml:291
 msgid "Morocco"
 msgstr "摩洛哥"
 
-#: ../../english/template/debian/countries.wml:291
+#: ../../english/template/debian/countries.wml:294
 msgid "Moldova"
 msgstr "摩爾多瓦"
 
-#: ../../english/template/debian/countries.wml:294
+#: ../../english/template/debian/countries.wml:297
 msgid "Montenegro"
 msgstr "[CNHK:黑山:][TW:蒙特內哥羅:]"
 
-#: ../../english/template/debian/countries.wml:297
+#: ../../english/template/debian/countries.wml:300
 msgid "Madagascar"
 msgstr "马达加斯加"
 
-#: ../../english/template/debian/countries.wml:300
+#: ../../english/template/debian/countries.wml:303
 msgid "Macedonia, Republic of"
 msgstr "馬其頓共和國"
 
-#: ../../english/template/debian/countries.wml:303
+#: ../../english/template/debian/countries.wml:306
 msgid "Mongolia"
 msgstr "蒙古"
 
-#: ../../english/template/debian/countries.wml:306
+#: ../../english/template/debian/countries.wml:309
 msgid "Malta"
 msgstr "[CN:马耳他:][HKTW:馬爾他:]"
 
-#: ../../english/template/debian/countries.wml:309
+#: ../../english/template/debian/countries.wml:312
 msgid "Mexico"
 msgstr "墨西哥"
 
-#: ../../english/template/debian/countries.wml:312
+#: ../../english/template/debian/countries.wml:315
 msgid "Malaysia"
 msgstr "馬來西亞"
 
-#: ../../english/template/debian/countries.wml:315
+#: ../../english/template/debian/countries.wml:318
 msgid "New Caledonia"
 msgstr "新喀里多尼亞"
 
-#: ../../english/template/debian/countries.wml:318
+#: ../../english/template/debian/countries.wml:321
 msgid "Nicaragua"
 msgstr "尼加拉瓜"
 
-#: ../../english/template/debian/countries.wml:321
+#: ../../english/template/debian/countries.wml:324
 msgid "Netherlands"
 msgstr "荷蘭"
 
-#: ../../english/template/debian/countries.wml:324
+#: ../../english/template/debian/countries.wml:327
 msgid "Norway"
 msgstr "挪威"
 
-#: ../../english/template/debian/countries.wml:327
+#: ../../english/template/debian/countries.wml:330
 msgid "New Zealand"
 msgstr "新西蘭"
 
-#: ../../english/template/debian/countries.wml:330
+#: ../../english/template/debian/countries.wml:333
 msgid "Panama"
 msgstr "巴拿馬"
 
-#: ../../english/template/debian/countries.wml:333
+#: ../../english/template/debian/countries.wml:336
 msgid "Peru"
 msgstr "秘魯"
 
-#: ../../english/template/debian/countries.wml:336
+#: ../../english/template/debian/countries.wml:339
 msgid "French Polynesia"
 msgstr "[CNHK:法属波利尼西亚:][TW:法屬玻里尼西亞:]"
 
-#: ../../english/template/debian/countries.wml:339
+#: ../../english/template/debian/countries.wml:342
 msgid "Philippines"
 msgstr "菲律賓"
 
-#: ../../english/template/debian/countries.wml:342
+#: ../../english/template/debian/countries.wml:345
 msgid "Pakistan"
 msgstr "巴基斯坦"
 
-#: ../../english/template/debian/countries.wml:345
+#: ../../english/template/debian/countries.wml:348
 msgid "Poland"
 msgstr "波蘭"
 
-#: ../../english/template/debian/countries.wml:348
+#: ../../english/template/debian/countries.wml:351
 msgid "Portugal"
 msgstr "葡萄牙"
 
-#: ../../english/template/debian/countries.wml:351
+#: ../../english/template/debian/countries.wml:354
 msgid "Réunion"
 msgstr "留尼旺"
 
-#: ../../english/template/debian/countries.wml:354
+#: ../../english/template/debian/countries.wml:357
 msgid "Romania"
 msgstr "羅馬尼亞"
 
-#: ../../english/template/debian/countries.wml:357
+#: ../../english/template/debian/countries.wml:360
 msgid "Serbia"
 msgstr "塞爾維亞"
 
-#: ../../english/template/debian/countries.wml:360
+#: ../../english/template/debian/countries.wml:363
 msgid "Russia"
 msgstr "俄罗斯"
 
-#: ../../english/template/debian/countries.wml:363
+#: ../../english/template/debian/countries.wml:366
 msgid "Saudi Arabia"
 msgstr "[CNHK:沙特阿拉伯:][TW:沙烏地阿拉伯:]"
 
-#: ../../english/template/debian/countries.wml:366
+#: ../../english/template/debian/countries.wml:369
 msgid "Sweden"
 msgstr "瑞典"
 
-#: ../../english/template/debian/countries.wml:369
+#: ../../english/template/debian/countries.wml:372
 msgid "Singapore"
 msgstr "新加坡"
 
-#: ../../english/template/debian/countries.wml:372
+#: ../../english/template/debian/countries.wml:375
 msgid "Slovenia"
 msgstr "斯洛文尼亞"
 
-#: ../../english/template/debian/countries.wml:375
+#: ../../english/template/debian/countries.wml:378
 msgid "Slovakia"
 msgstr "斯洛伐克"
 
-#: ../../english/template/debian/countries.wml:378
+#: ../../english/template/debian/countries.wml:381
 msgid "El Salvador"
 msgstr "薩爾瓦多"
 
-#: ../../english/template/debian/countries.wml:381
+#: ../../english/template/debian/countries.wml:384
 msgid "Thailand"
 msgstr "泰國"
 
-#: ../../english/template/debian/countries.wml:384
+#: ../../english/template/debian/countries.wml:387
 msgid "Tajikistan"
 msgstr "[CN:塔吉克斯坦:][HKTW:塔吉克:]"
 
-#: ../../english/template/debian/countries.wml:387
+#: ../../english/template/debian/countries.wml:390
 msgid "Tunisia"
 msgstr "[CN:突尼斯:][HKTW:突尼西亞:]"
 
-#: ../../english/template/debian/countries.wml:390
+#: ../../english/template/debian/countries.wml:393
 msgid "Turkey"
 msgstr "土耳其"
 
-#: ../../english/template/debian/countries.wml:393
+#: ../../english/template/debian/countries.wml:396
 msgid "Taiwan"
 msgstr "台灣"
 
-#: ../../english/template/debian/countries.wml:396
+#: ../../english/template/debian/countries.wml:399
 msgid "Ukraine"
 msgstr "烏克蘭"
 
-#: ../../english/template/debian/countries.wml:399
+#: ../../english/template/debian/countries.wml:402
 msgid "United States"
 msgstr "美國"
 
-#: ../../english/template/debian/countries.wml:402
+#: ../../english/template/debian/countries.wml:405
 msgid "Uruguay"
 msgstr "烏拉圭"
 
-#: ../../english/template/debian/countries.wml:405
+#: ../../english/template/debian/countries.wml:408
 msgid "Uzbekistan"
 msgstr "[CN:乌兹别克斯坦:][HKTW:烏茲別克:]"
 
-#: ../../english/template/debian/countries.wml:408
+#: ../../english/template/debian/countries.wml:411
 msgid "Venezuela"
 msgstr "委內瑞拉"
 
-#: ../../english/template/debian/countries.wml:411
+#: ../../english/template/debian/countries.wml:414
 msgid "Vietnam"
 msgstr "越南"
 
-#: ../../english/template/debian/countries.wml:414
+#: ../../english/template/debian/countries.wml:417
 msgid "Vanuatu"
 msgstr "[CNHK:瓦努阿图:][TW:萬那杜:]"
 
-#: ../../english/template/debian/countries.wml:417
+#: ../../english/template/debian/countries.wml:420
 msgid "South Africa"
 msgstr "南非"
 
-#: ../../english/template/debian/countries.wml:420
+#: ../../english/template/debian/countries.wml:423
 msgid "Zimbabwe"
 msgstr "津巴布韦"
 
diff --git a/chinese/po/distrib.zh.po b/chinese/po/distrib.zh.po
index e92af7ec20a..fa7fcb6df63 100644
--- a/chinese/po/distrib.zh.po
+++ b/chinese/po/distrib.zh.po
@@ -15,97 +15,67 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Poedit 2.2.1\n"
 
-#: ../../english/distrib/search_contents-form.inc:9
 #: ../../english/distrib/search_packages-form.inc:8
+#: ../../english/distrib/search_contents-form.inc:9
 msgid "Keyword"
 msgstr "關鍵字"
 
-#: ../../english/distrib/search_contents-form.inc:13
-msgid "Display"
-msgstr "顯示"
+#: ../../english/distrib/search_packages-form.inc:12
+msgid "Search on"
+msgstr "僅搜尋"
 
-#: ../../english/distrib/search_contents-form.inc:16
-msgid "paths ending with the keyword"
-msgstr "路徑結尾是關鍵字"
+#: ../../english/distrib/search_packages-form.inc:14
+msgid "Package names only"
+msgstr "套件名稱"
 
-#: ../../english/distrib/search_contents-form.inc:19
-msgid "packages that contain files named like this"
-msgstr "套件包含檔案"
+#: ../../english/distrib/search_packages-form.inc:16
+msgid "Descriptions"
+msgstr "套件描述"
 
-#: ../../english/distrib/search_contents-form.inc:22
-msgid "packages that contain files whose names contain the keyword"
-msgstr "套件檔案中包含關鍵字"
+#: ../../english/distrib/search_packages-form.inc:18
+msgid "Source package names"
+msgstr "源套件名稱"
+
+#: ../../english/distrib/search_packages-form.inc:21
+msgid "Only show exact matches"
+msgstr "僅顯示完全吻合結果"
 
-#: ../../english/distrib/search_contents-form.inc:25
 #: ../../english/distrib/search_packages-form.inc:25
+#: ../../english/distrib/search_contents-form.inc:25
 msgid "Distribution"
 msgstr "發行版"
 
-#: ../../english/distrib/search_contents-form.inc:27
 #: ../../english/distrib/search_packages-form.inc:27
+#: ../../english/distrib/search_contents-form.inc:27
 msgid "experimental"
 msgstr "experimental"
 
-#: ../../english/distrib/search_contents-form.inc:28
 #: ../../english/distrib/search_packages-form.inc:28
+#: ../../english/distrib/search_contents-form.inc:28
 msgid "unstable"
 msgstr "unstable"
 
-#: ../../english/distrib/search_contents-form.inc:29
 #: ../../english/distrib/search_packages-form.inc:29
+#: ../../english/distrib/search_contents-form.inc:29
 msgid "testing"
 msgstr "testing"
 
-#: ../../english/distrib/search_contents-form.inc:30
 #: ../../english/distrib/search_packages-form.inc:30
+#: ../../english/distrib/search_contents-form.inc:30
 msgid "stable"
 msgstr "stable"
 
-#: ../../english/distrib/search_contents-form.inc:31
 #: ../../english/distrib/search_packages-form.inc:31
+#: ../../english/distrib/search_contents-form.inc:31
 msgid "oldstable"
 msgstr "oldstable"
 
-#: ../../english/distrib/search_contents-form.inc:33
-msgid "Architecture"
-msgstr "硬體架構"
-
-#: ../../english/distrib/search_contents-form.inc:38
 #: ../../english/distrib/search_packages-form.inc:32
 #: ../../english/distrib/search_packages-form.inc:39
+#: ../../english/distrib/search_contents-form.inc:38
 msgid "any"
 msgstr "any"
 
-#: ../../english/distrib/search_contents-form.inc:48
-#: ../../english/distrib/search_packages-form.inc:43
-msgid "Search"
-msgstr "搜尋"
-
-#: ../../english/distrib/search_contents-form.inc:49
-#: ../../english/distrib/search_packages-form.inc:44
-msgid "Reset"
-msgstr "重設"
-
-#: ../../english/distrib/search_packages-form.inc:12
-msgid "Search on"
-msgstr "僅搜尋"
-
-#: ../../english/distrib/search_packages-form.inc:14
-msgid "Package names only"
-msgstr "套件名稱"
-
-#: ../../english/distrib/search_packages-form.inc:16
-msgid "Descriptions"
-msgstr "套件描述"
-
-#: ../../english/distrib/search_packages-form.inc:18
-msgid "Source package names"
-msgstr "源套件名稱"
-
-#: ../../english/distrib/search_packages-form.inc:21
-msgid "Only show exact matches"
-msgstr "僅顯示完全吻合結果"
-
 #: ../../english/distrib/search_packages-form.inc:34
 msgid "Section"
 msgstr "Section"
@@ -122,6 +92,36 @@ msgstr "contrib"
 msgid "non-free"
 msgstr "non-free"
 
+#: ../../english/distrib/search_packages-form.inc:43
+#: ../../english/distrib/search_contents-form.inc:48
+msgid "Search"
+msgstr "搜尋"
+
+#: ../../english/distrib/search_packages-form.inc:44
+#: ../../english/distrib/search_contents-form.inc:49
+msgid "Reset"
+msgstr "重設"
+
+#: ../../english/distrib/search_contents-form.inc:13
+msgid "Display"
+msgstr "顯示"
+
+#: ../../english/distrib/search_contents-form.inc:16
+msgid "paths ending with the keyword"
+msgstr "路徑結尾是關鍵字"
+
+#: ../../english/distrib/search_contents-form.inc:19
+msgid "packages that contain files named like this"
+msgstr "套件包含檔案"
+
+#: ../../english/distrib/search_contents-form.inc:22
+msgid "packages that contain files whose names contain the keyword"
+msgstr "套件檔案中包含關鍵字"
+
+#: ../../english/distrib/search_contents-form.inc:33
+msgid "Architecture"
+msgstr "硬體架構"
+
 #: ../../english/releases/arches.data:8
 msgid "Alpha"
 msgstr "Alpha"
diff --git a/chinese/po/doc.zh.po b/chinese/po/doc.zh.po
index 87491f1d25b..72668668286 100644
--- a/chinese/po/doc.zh.po
+++ b/chinese/po/doc.zh.po
@@ -15,96 +15,6 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0\n"
 "X-Generator: Gtranslator 3.30.1\n"
 
-#: ../../english/doc/books.data:32
-msgid ""
-"\n"
-"  Debian 9 is the must-have handbook for learning Linux. Start on the\n"
-"  beginners level and learn how to deploy the system with graphical\n"
-"  interface and terminal.\n"
-"  This book provides the basic knowledge to grow and become a 'junior'\n"
-"  systems administrator. Start off with exploring the GNOME desktop\n"
-"  interface and adjust it to your personal needs. Overcome your fear of\n"
-"  using the Linux terminal and learn the most essential commands in\n"
-"  administering Debian. Expand your knowledge of system services (systemd)\n"
-"  and learn how to adapt them. Get more out of the software in Debian and\n"
-"  outside of Debian. Manage your home-network with network-manager, etc.\n"
-"  10 percent of the profits on this book will be donated to the Debian\n"
-"  Project."
-msgstr ""
-
-#: ../../english/doc/books.data:61 ../../english/doc/books.data:171
-#: ../../english/doc/books.data:226
-msgid ""
-"Written by two Debian developers, this free book\n"
-"  started as a translation of their French best-seller known as Cahier de\n"
-"  l'admin Debian (published by Eyrolles). Accessible to all, this book\n"
-"  teaches the essentials to anyone who wants to become an effective and\n"
-"  independent Debian GNU/Linux administrator.\n"
-"  It covers all the topics that a competent Linux administrator should\n"
-"  master, from the installation and the update of the system, up to the\n"
-"  creation of packages and the compilation of the kernel, but also\n"
-"  monitoring, backup and migration, without forgetting advanced topics\n"
-"  like SELinux setup to secure services, automated installations, or\n"
-"  virtualization with Xen, KVM or LXC."
-msgstr ""
-
-#: ../../english/doc/books.data:83
-msgid ""
-"The aim of this freely available, up-to-date, book is to get you up to\n"
-"  speed with Debian (including both the current stable release and the\n"
-"  current unstable distribution). It is comprehensive with basic support\n"
-"  for the user who installs and maintains the system themselves (whether\n"
-"  in the home, office, club, or school)."
-msgstr ""
-
-#: ../../english/doc/books.data:105
-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"
-"  to the configuration of network services.\n"
-"  Written by two Debian developers, this book can be of interest to many\n"
-"  people: the beginner wishing to discover Debian, the advanced user "
-"looking\n"
-"  for tips to enhance his mastership of the Debian tools and the\n"
-"  administrator who wants to build a reliable network with Debian."
-msgstr ""
-
-#: ../../english/doc/books.data:125
-msgid ""
-"The book covers topics ranging from concepts of package\n"
-"  management over the available tools and how they're used to concrete "
-"problems\n"
-"  which may occur in real life and how they can be solved. The book is "
-"written\n"
-"  in German, an English translation is planned. Format: e-book (Online, "
-"HTML,\n"
-"  PDF, ePub, Mobi), printed book planned.\n"
-msgstr ""
-
-#: ../../english/doc/books.data:146
-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 "
-"the distribution (in its current version 8) and provides a practical manual "
-"for all users who want to learn more about Debian and its range of services."
-msgstr ""
-
-#: ../../english/doc/books.data:200
-msgid ""
-"Written by two penetration researcher - Annihilator, Firstblood.\n"
-"  This book teaches you how to build and configure Debian 8.x server system\n"
-"  security hardening using Kali Linux and Debian simultaneously.\n"
-"  DNS, FTP, SAMBA, DHCP, Apache2 webserver, etc.\n"
-"  From the perspective that 'the origin of Kali Linux is Debian', it "
-"explains\n"
-"  how to enhance Debian's security by applying the method of penetration\n"
-"  testing.\n"
-"  This book covers various security issues like SSL cerificates, UFW "
-"firewall,\n"
-"  MySQL Vulnerability, commercial Symantec antivirus, including Snort\n"
-"  intrusion detection system."
-msgstr ""
-
 #: ../../english/doc/books.def:38
 msgid "Author:"
 msgstr "作者："
@@ -220,6 +130,96 @@ msgstr "Debian 套件"
 msgid "Debian package (archived)"
 msgstr "Debian 套件（已归档）"
 
+#: ../../english/doc/books.data:32
+msgid ""
+"\n"
+"  Debian 9 is the must-have handbook for learning Linux. Start on the\n"
+"  beginners level and learn how to deploy the system with graphical\n"
+"  interface and terminal.\n"
+"  This book provides the basic knowledge to grow and become a 'junior'\n"
+"  systems administrator. Start off with exploring the GNOME desktop\n"
+"  interface and adjust it to your personal needs. Overcome your fear of\n"
+"  using the Linux terminal and learn the most essential commands in\n"
+"  administering Debian. Expand your knowledge of system services (systemd)\n"
+"  and learn how to adapt them. Get more out of the software in Debian and\n"
+"  outside of Debian. Manage your home-network with network-manager, etc.\n"
+"  10 percent of the profits on this book will be donated to the Debian\n"
+"  Project."
+msgstr ""
+
+#: ../../english/doc/books.data:61 ../../english/doc/books.data:171
+#: ../../english/doc/books.data:226
+msgid ""
+"Written by two Debian developers, this free book\n"
+"  started as a translation of their French best-seller known as Cahier de\n"
+"  l'admin Debian (published by Eyrolles). Accessible to all, this book\n"
+"  teaches the essentials to anyone who wants to become an effective and\n"
+"  independent Debian GNU/Linux administrator.\n"
+"  It covers all the topics that a competent Linux administrator should\n"
+"  master, from the installation and the update of the system, up to the\n"
+"  creation of packages and the compilation of the kernel, but also\n"
+"  monitoring, backup and migration, without forgetting advanced topics\n"
+"  like SELinux setup to secure services, automated installations, or\n"
+"  virtualization with Xen, KVM or LXC."
+msgstr ""
+
+#: ../../english/doc/books.data:83
+msgid ""
+"The aim of this freely available, up-to-date, book is to get you up to\n"
+"  speed with Debian (including both the current stable release and the\n"
+"  current unstable distribution). It is comprehensive with basic support\n"
+"  for the user who installs and maintains the system themselves (whether\n"
+"  in the home, office, club, or school)."
+msgstr ""
+
+#: ../../english/doc/books.data:105
+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"
+"  to the configuration of network services.\n"
+"  Written by two Debian developers, this book can be of interest to many\n"
+"  people: the beginner wishing to discover Debian, the advanced user "
+"looking\n"
+"  for tips to enhance his mastership of the Debian tools and the\n"
+"  administrator who wants to build a reliable network with Debian."
+msgstr ""
+
+#: ../../english/doc/books.data:125
+msgid ""
+"The book covers topics ranging from concepts of package\n"
+"  management over the available tools and how they're used to concrete "
+"problems\n"
+"  which may occur in real life and how they can be solved. The book is "
+"written\n"
+"  in German, an English translation is planned. Format: e-book (Online, "
+"HTML,\n"
+"  PDF, ePub, Mobi), printed book planned.\n"
+msgstr ""
+
+#: ../../english/doc/books.data:146
+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 "
+"the distribution (in its current version 8) and provides a practical manual "
+"for all users who want to learn more about Debian and its range of services."
+msgstr ""
+
+#: ../../english/doc/books.data:200
+msgid ""
+"Written by two penetration researcher - Annihilator, Firstblood.\n"
+"  This book teaches you how to build and configure Debian 8.x server system\n"
+"  security hardening using Kali Linux and Debian simultaneously.\n"
+"  DNS, FTP, SAMBA, DHCP, Apache2 webserver, etc.\n"
+"  From the perspective that 'the origin of Kali Linux is Debian', it "
+"explains\n"
+"  how to enhance Debian's security by applying the method of penetration\n"
+"  testing.\n"
+"  This book covers various security issues like SSL cerificates, UFW "
+"firewall,\n"
+"  MySQL Vulnerability, commercial Symantec antivirus, including Snort\n"
+"  intrusion detection system."
+msgstr ""
+
 #: ../../english/releases/arches.data:36
 msgid "HTML"
 msgstr "HTML"
diff --git a/chinese/po/newsevents.zh.po b/chinese/po/newsevents.zh.po
index 32afa915e5b..5cdfe921368 100644
--- a/chinese/po/newsevents.zh.po
+++ b/chinese/po/newsevents.zh.po
@@ -15,66 +15,6 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Poedit 2.2.1\n"
 
-#: ../../english/News/news.rdf.in:16
-msgid "Debian News"
-msgstr "Debian 新闻"
-
-#: ../../english/News/news.rdf.in:19
-msgid "Debian Latest News"
-msgstr "Debian 最新消息"
-
-#: ../../english/News/press/press.tags:11
-msgid "p<get-var page />"
-msgstr "p<get-var page />"
-
-#: ../../english/News/weekly/dwn-to-rdf.pl:143
-msgid "The newsletter for the Debian community"
-msgstr "Debian 社区通讯"
-
-#: ../../english/events/talks.defs:9
-msgid "Title:"
-msgstr "标题："
-
-#: ../../english/events/talks.defs:12
-msgid "Author:"
-msgstr "作者："
-
-#: ../../english/events/talks.defs:15
-msgid "Language:"
-msgstr "语言:"
-
-#: ../../english/events/talks.defs:19
-msgid "Date:"
-msgstr "日期："
-
-#: ../../english/events/talks.defs:23
-msgid "Event:"
-msgstr "事件："
-
-#: ../../english/events/talks.defs:26
-msgid "Slides:"
-msgstr "幻灯片："
-
-#: ../../english/events/talks.defs:29
-msgid "source"
-msgstr "源代码"
-
-#: ../../english/events/talks.defs:32
-msgid "PDF"
-msgstr "PDF"
-
-#: ../../english/events/talks.defs:35
-msgid "HTML"
-msgstr "HTML"
-
-#: ../../english/events/talks.defs:38
-msgid "MagicPoint"
-msgstr "MagicPoint"
-
-#: ../../english/events/talks.defs:41
-msgid "Abstract"
-msgstr "摘要"
-
 #: ../../english/template/debian/events_common.wml:8
 msgid "Upcoming Attractions"
 msgstr "即将到来的事件"
@@ -133,6 +73,127 @@ msgstr ""
 msgid "<get-var url /> (dead link)"
 msgstr "<get-var url /> (連結失效)"
 
+#: ../../english/template/debian/projectnews/footer.wml:6
+msgid ""
+"To receive this newsletter in your mailbox, <a href=\"https://lists.debian."
+"org/debian-news/\">subscribe to the debian-news mailing list</a>."
+msgstr ""
+"要以電子郵件方式接收快訊，請<a href=\"https://lists.debian.org/debian-news/"
+"\">訂閱 debian-news 郵件列表</a>。"
+
+#: ../../english/template/debian/projectnews/footer.wml:10
+#: ../../english/template/debian/weeklynews/footer.wml:10
+msgid "<a href=\"../../\">Back issues</a> of this newsletter are available."
+msgstr "您亦可翻閱<a href=\"../../\">過往的報導</a>。"
+
+#. One editor name only
+#: ../../english/template/debian/projectnews/footer.wml:15
+msgid ""
+"<void id=\"singular\" />Debian Project News is edited by <a href=\"mailto:"
+"debian-publicity@lists.debian.org\">%s</a>."
+msgstr ""
+"<void id=\"singular\" />Debian 計劃快訊 (Debian Project News) 由 <a href="
+"\"mailto:debian-publicity@lists.debian.org\">%s</a> 負責編輯。"
+
+#. Two or more editors
+#: ../../english/template/debian/projectnews/footer.wml:20
+msgid ""
+"<void id=\"plural\" />Debian Project News is edited by <a href=\"mailto:"
+"debian-publicity@lists.debian.org\">%s</a>."
+msgstr ""
+"<void id=\"plural\" />Debian 計劃快訊 (Debian Project News) 由 <a href="
+"\"mailto:debian-publicity@lists.debian.org\">%s</a> 負責編輯。"
+
+#. One editor name only
+#: ../../english/template/debian/projectnews/footer.wml:25
+msgid ""
+"<void id=\"singular\" />This issue of Debian Project News was edited by <a "
+"href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
+msgstr ""
+"<void id=\"singular\" />這次 Debian 計劃快訊 (Debian Weekly News) 由 <a href="
+"\"mailto:debian-publicity@lists.debian.org\">%s</a> 負責編輯。"
+
+#. Two or more editors
+#: ../../english/template/debian/projectnews/footer.wml:30
+msgid ""
+"<void id=\"plural\" />This issue of Debian Project News was edited by <a "
+"href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
+msgstr ""
+"<void id=\"plural\" />這次 Debian 計劃快訊 (Debian Weekly News) 由 <a href="
+"\"mailto:debian-publicity@lists.debian.org\">%s</a> 負責編輯。"
+
+#. One translator only
+#. One translator only
+#: ../../english/template/debian/projectnews/footer.wml:35
+#: ../../english/template/debian/weeklynews/footer.wml:35
+msgid "<void id=\"singular\" />It was translated by %s."
+msgstr "<void id=\"singular\" />由 %s 負責翻譯。"
+
+#. Two ore more translators
+#. Two ore more translators
+#: ../../english/template/debian/projectnews/footer.wml:40
+#: ../../english/template/debian/weeklynews/footer.wml:40
+msgid "<void id=\"plural\" />It was translated by %s."
+msgstr "<void id=\"plural\" />由 %s 負責翻譯。"
+
+#. One female translator only
+#. One female translator only
+#: ../../english/template/debian/projectnews/footer.wml:45
+#: ../../english/template/debian/weeklynews/footer.wml:45
+msgid "<void id=\"singularfemale\" />It was translated by %s."
+msgstr "<void id=\"singularfemale\" />由 %s 負責翻譯。"
+
+#. Two ore more female translators
+#. Two ore more female translators
+#: ../../english/template/debian/projectnews/footer.wml:50
+#: ../../english/template/debian/weeklynews/footer.wml:50
+msgid "<void id=\"pluralfemale\" />It was translated by %s."
+msgstr "<void id=\"pluralfemale\" />由 %s 負責翻譯。"
+
+#: ../../english/template/debian/weeklynews/footer.wml:6
+msgid ""
+"To receive this newsletter weekly in your mailbox, <a href=\"https://lists."
+"debian.org/debian-news/\">subscribe to the debian-news mailing list</a>."
+msgstr ""
+"想以電子郵件方式接收快訊嗎？請<a href=\"https://lists.debian.org/debian-news/"
+"\">訂閱</a> debian-news 郵件列表。"
+
+#. One editor name only
+#: ../../english/template/debian/weeklynews/footer.wml:15
+msgid ""
+"<void id=\"singular\" />Debian Weekly News is edited by <a href=\"mailto:"
+"dwn@debian.org\">%s</a>."
+msgstr ""
+"<void id=\"singular\" />Debian 每周快訊 (Debian Weekly News) 由 <a href="
+"\"mailto:dwn@debian.org\">%s</a> 負責編輯。"
+
+#. Two or more editors
+#: ../../english/template/debian/weeklynews/footer.wml:20
+msgid ""
+"<void id=\"plural\" />Debian Weekly News is edited by <a href=\"mailto:"
+"dwn@debian.org\">%s</a>."
+msgstr ""
+"<void id=\"plural\" />Debian 每周快訊 (Debian Weekly News) 由 <a href="
+"\"mailto:dwn@debian.org\">%s</a> 負責編輯。"
+
+#. One editor name only
+#: ../../english/template/debian/weeklynews/footer.wml:25
+msgid ""
+"<void id=\"singular\" />This issue of Debian Weekly News was edited by <a "
+"href=\"mailto:dwn@debian.org\">%s</a>."
+msgstr ""
+"<void id=\"singular\" />Debian 每周快訊 (Debian Weekly News) 由 <a href="
+"\"mailto:dwn@debian.org\">%s</a> 負責編輯。"
+
+#. Two or more editors
+#: ../../english/template/debian/weeklynews/footer.wml:30
+msgid ""
+"<void id=\"plural\" />This issue of Debian Weekly News was edited by <a href="
+"\"mailto:dwn@debian.org\">%s</a>."
+msgstr ""
+"<void id=\"plural\" />Debian 每周快訊 (Debian Weekly News) 由 <a href="
+"\"mailto:dwn@debian.org\">%s</a> 負責編輯。"
+
 #: ../../english/template/debian/projectnews/boilerplates.wml:35
 msgid ""
 "Welcome to this year's <get-var issue /> issue of DPN, the newsletter for "
@@ -336,126 +397,65 @@ msgid ""
 "the following topics:"
 msgstr ""
 
-#: ../../english/template/debian/projectnews/footer.wml:6
-msgid ""
-"To receive this newsletter in your mailbox, <a href=\"https://lists.debian."
-"org/debian-news/\">subscribe to the debian-news mailing list</a>."
-msgstr ""
-"要以電子郵件方式接收快訊，請<a href=\"https://lists.debian.org/debian-news/"
-"\">訂閱 debian-news 郵件列表</a>。"
+#: ../../english/News/press/press.tags:11
+msgid "p<get-var page />"
+msgstr "p<get-var page />"
 
-#: ../../english/template/debian/projectnews/footer.wml:10
-#: ../../english/template/debian/weeklynews/footer.wml:10
-msgid "<a href=\"../../\">Back issues</a> of this newsletter are available."
-msgstr "您亦可翻閱<a href=\"../../\">過往的報導</a>。"
+#: ../../english/events/talks.defs:9
+msgid "Title:"
+msgstr "标题："
 
-#. One editor name only
-#: ../../english/template/debian/projectnews/footer.wml:15
-msgid ""
-"<void id=\"singular\" />Debian Project News is edited by <a href=\"mailto:"
-"debian-publicity@lists.debian.org\">%s</a>."
-msgstr ""
-"<void id=\"singular\" />Debian 計劃快訊 (Debian Project News) 由 <a href="
-"\"mailto:debian-publicity@lists.debian.org\">%s</a> 負責編輯。"
+#: ../../english/events/talks.defs:12
+msgid "Author:"
+msgstr "作者："
 
-#. Two or more editors
-#: ../../english/template/debian/projectnews/footer.wml:20
-msgid ""
-"<void id=\"plural\" />Debian Project News is edited by <a href=\"mailto:"
-"debian-publicity@lists.debian.org\">%s</a>."
-msgstr ""
-"<void id=\"plural\" />Debian 計劃快訊 (Debian Project News) 由 <a href="
-"\"mailto:debian-publicity@lists.debian.org\">%s</a> 負責編輯。"
+#: ../../english/events/talks.defs:15
+msgid "Language:"
+msgstr "语言:"
 
-#. One editor name only
-#: ../../english/template/debian/projectnews/footer.wml:25
-msgid ""
-"<void id=\"singular\" />This issue of Debian Project News was edited by <a "
-"href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
-msgstr ""
-"<void id=\"singular\" />這次 Debian 計劃快訊 (Debian Weekly News) 由 <a href="
-"\"mailto:debian-publicity@lists.debian.org\">%s</a> 負責編輯。"
+#: ../../english/events/talks.defs:19
+msgid "Date:"
+msgstr "日期："
 
-#. Two or more editors
-#: ../../english/template/debian/projectnews/footer.wml:30
-msgid ""
-"<void id=\"plural\" />This issue of Debian Project News was edited by <a "
-"href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
-msgstr ""
-"<void id=\"plural\" />這次 Debian 計劃快訊 (Debian Weekly News) 由 <a href="
-"\"mailto:debian-publicity@lists.debian.org\">%s</a> 負責編輯。"
+#: ../../english/events/talks.defs:23
+msgid "Event:"
+msgstr "事件："
 
-#. One translator only
-#. One translator only
-#: ../../english/template/debian/projectnews/footer.wml:35
-#: ../../english/template/debian/weeklynews/footer.wml:35
-msgid "<void id=\"singular\" />It was translated by %s."
-msgstr "<void id=\"singular\" />由 %s 負責翻譯。"
+#: ../../english/events/talks.defs:26
+msgid "Slides:"
+msgstr "幻灯片："
 
-#. Two ore more translators
-#. Two ore more translators
-#: ../../english/template/debian/projectnews/footer.wml:40
-#: ../../english/template/debian/weeklynews/footer.wml:40
-msgid "<void id=\"plural\" />It was translated by %s."
-msgstr "<void id=\"plural\" />由 %s 負責翻譯。"
+#: ../../english/events/talks.defs:29
+msgid "source"
+msgstr "源代码"
 
-#. One female translator only
-#. One female translator only
-#: ../../english/template/debian/projectnews/footer.wml:45
-#: ../../english/template/debian/weeklynews/footer.wml:45
-msgid "<void id=\"singularfemale\" />It was translated by %s."
-msgstr "<void id=\"singularfemale\" />由 %s 負責翻譯。"
+#: ../../english/events/talks.defs:32
+msgid "PDF"
+msgstr "PDF"
 
-#. Two ore more female translators
-#. Two ore more female translators
-#: ../../english/template/debian/projectnews/footer.wml:50
-#: ../../english/template/debian/weeklynews/footer.wml:50
-msgid "<void id=\"pluralfemale\" />It was translated by %s."
-msgstr "<void id=\"pluralfemale\" />由 %s 負責翻譯。"
+#: ../../english/events/talks.defs:35
+msgid "HTML"
+msgstr "HTML"
 
-#: ../../english/template/debian/weeklynews/footer.wml:6
-msgid ""
-"To receive this newsletter weekly in your mailbox, <a href=\"https://lists."
-"debian.org/debian-news/\">subscribe to the debian-news mailing list</a>."
-msgstr ""
-"想以電子郵件方式接收快訊嗎？請<a href=\"https://lists.debian.org/debian-news/"
-"\">訂閱</a> debian-news 郵件列表。"
+#: ../../english/events/talks.defs:38
+msgid "MagicPoint"
+msgstr "MagicPoint"
 
-#. One editor name only
-#: ../../english/template/debian/weeklynews/footer.wml:15
-msgid ""
-"<void id=\"singular\" />Debian Weekly News is edited by <a href=\"mailto:"
-"dwn@debian.org\">%s</a>."
-msgstr ""
-"<void id=\"singular\" />Debian 每周快訊 (Debian Weekly News) 由 <a href="
-"\"mailto:dwn@debian.org\">%s</a> 負責編輯。"
+#: ../../english/events/talks.defs:41
+msgid "Abstract"
+msgstr "摘要"
 
-#. Two or more editors
-#: ../../english/template/debian/weeklynews/footer.wml:20
-msgid ""
-"<void id=\"plural\" />Debian Weekly News is edited by <a href=\"mailto:"
-"dwn@debian.org\">%s</a>."
-msgstr ""
-"<void id=\"plural\" />Debian 每周快訊 (Debian Weekly News) 由 <a href="
-"\"mailto:dwn@debian.org\">%s</a> 負責編輯。"
+#: ../../english/News/news.rdf.in:16
+msgid "Debian News"
+msgstr "Debian 新闻"
 
-#. One editor name only
-#: ../../english/template/debian/weeklynews/footer.wml:25
-msgid ""
-"<void id=\"singular\" />This issue of Debian Weekly News was edited by <a "
-"href=\"mailto:dwn@debian.org\">%s</a>."
-msgstr ""
-"<void id=\"singular\" />Debian 每周快訊 (Debian Weekly News) 由 <a href="
-"\"mailto:dwn@debian.org\">%s</a> 負責編輯。"
+#: ../../english/News/news.rdf.in:19
+msgid "Debian Latest News"
+msgstr "Debian 最新消息"
 
-#. Two or more editors
-#: ../../english/template/debian/weeklynews/footer.wml:30
-msgid ""
-"<void id=\"plural\" />This issue of Debian Weekly News was edited by <a href="
-"\"mailto:dwn@debian.org\">%s</a>."
-msgstr ""
-"<void id=\"plural\" />Debian 每周快訊 (Debian Weekly News) 由 <a href="
-"\"mailto:dwn@debian.org\">%s</a> 負責編輯。"
+#: ../../english/News/weekly/dwn-to-rdf.pl:143
+msgid "The newsletter for the Debian community"
+msgstr "Debian 社区通讯"
 
 #~ msgid ""
 #~ "To receive this newsletter bi-weekly in your mailbox, <a href=\"https://"
diff --git a/chinese/po/organization.zh.po b/chinese/po/organization.zh.po
index bc82dde10b7..c4e16774a7f 100644
--- a/chinese/po/organization.zh.po
+++ b/chinese/po/organization.zh.po
@@ -45,13 +45,13 @@ msgid "manager"
 msgstr "管理員"
 
 #: ../../english/intro/organization.data:34
-msgid "SRM"
-msgstr ""
-
-#: ../../english/intro/organization.data:34
 msgid "Stable Release Manager"
 msgstr "稳定版釋出管理员"
 
+#: ../../english/intro/organization.data:34
+msgid "SRM"
+msgstr ""
+
 #: ../../english/intro/organization.data:36
 msgid "wizard"
 msgstr "巫師"
@@ -78,27 +78,27 @@ msgid "role"
 msgstr ""
 
 #: ../../english/intro/organization.data:63
-#: ../../english/intro/organization.data:77
+#: ../../english/intro/organization.data:75
 msgid "Officers"
 msgstr "總管"
 
 #: ../../english/intro/organization.data:64
-#: ../../english/intro/organization.data:101
+#: ../../english/intro/organization.data:99
 msgid "Distribution"
 msgstr "發行版"
 
 #: ../../english/intro/organization.data:65
-#: ../../english/intro/organization.data:237
+#: ../../english/intro/organization.data:235
 msgid "Communication and Outreach"
 msgstr ""
 
 #: ../../english/intro/organization.data:67
-#: ../../english/intro/organization.data:240
+#: ../../english/intro/organization.data:238
 msgid "Data Protection team"
 msgstr "数据保护团队"
 
 #: ../../english/intro/organization.data:68
-#: ../../english/intro/organization.data:244
+#: ../../english/intro/organization.data:242
 msgid "Publicity team"
 msgstr "宣传团队"
 
@@ -112,136 +112,131 @@ msgstr ""
 msgid "Support and Infrastructure"
 msgstr "支援以及下級組織"
 
-#. formerly Custom Debian Distributions (CCDs); see https://blends.debian.org/blends/ch-about.en.html#s-Blends
-#: ../../english/intro/organization.data:73
-msgid "Debian Pure Blends"
-msgstr ""
-
-#: ../../english/intro/organization.data:80
+#: ../../english/intro/organization.data:78
 msgid "Leader"
 msgstr "領袖"
 
-#: ../../english/intro/organization.data:82
+#: ../../english/intro/organization.data:80
 msgid "Technical Committee"
 msgstr "技術委員會"
 
-#: ../../english/intro/organization.data:96
+#: ../../english/intro/organization.data:94
 msgid "Secretary"
 msgstr "秘書"
 
-#: ../../english/intro/organization.data:104
+#: ../../english/intro/organization.data:102
 msgid "Development Projects"
 msgstr "各項開發計劃"
 
-#: ../../english/intro/organization.data:105
+#: ../../english/intro/organization.data:103
 msgid "FTP Archives"
 msgstr "FTP 庫存"
 
-#: ../../english/intro/organization.data:107
+#: ../../english/intro/organization.data:105
 msgid "FTP Masters"
 msgstr "FTP 總管"
 
-#: ../../english/intro/organization.data:113
+#: ../../english/intro/organization.data:111
 msgid "FTP Assistants"
 msgstr "FTP 助理"
 
-#: ../../english/intro/organization.data:118
+#: ../../english/intro/organization.data:116
 msgid "FTP Wizards"
 msgstr ""
 
-#: ../../english/intro/organization.data:122
+#: ../../english/intro/organization.data:120
 msgid "Backports"
 msgstr ""
 
-#: ../../english/intro/organization.data:124
+#: ../../english/intro/organization.data:122
 msgid "Backports Team"
 msgstr ""
 
-#: ../../english/intro/organization.data:128
+#: ../../english/intro/organization.data:126
 msgid "Release Management"
 msgstr "釋出管理"
 
-#: ../../english/intro/organization.data:130
+#: ../../english/intro/organization.data:128
 msgid "Release Team"
 msgstr "釋出團隊"
 
-#: ../../english/intro/organization.data:143
+#: ../../english/intro/organization.data:141
 msgid "Quality Assurance"
 msgstr "品質管理"
 
-#: ../../english/intro/organization.data:144
+#: ../../english/intro/organization.data:142
 msgid "Installation System Team"
 msgstr "安裝系統小組"
 
-#: ../../english/intro/organization.data:145
+#: ../../english/intro/organization.data:143
 msgid "Debian Live Team"
 msgstr ""
 
-#: ../../english/intro/organization.data:146
+#: ../../english/intro/organization.data:144
 msgid "Release Notes"
 msgstr "釋出公告"
 
-#: ../../english/intro/organization.data:148
+#: ../../english/intro/organization.data:146
 msgid "CD Images"
 msgstr "光碟映像"
 
-#: ../../english/intro/organization.data:150
+#: ../../english/intro/organization.data:148
 msgid "Production"
 msgstr "產品"
 
-#: ../../english/intro/organization.data:158
+#: ../../english/intro/organization.data:156
 msgid "Testing"
 msgstr "測試"
 
-#: ../../english/intro/organization.data:160
+#: ../../english/intro/organization.data:158
 msgid "Cloud Team"
 msgstr "云服务团队"
 
-#: ../../english/intro/organization.data:164
+#: ../../english/intro/organization.data:162
 msgid "Autobuilding infrastructure"
 msgstr "自动构建架构"
 
-#: ../../english/intro/organization.data:166
+#: ../../english/intro/organization.data:164
 msgid "Wanna-build team"
 msgstr "Wanna-build 团队"
 
-#: ../../english/intro/organization.data:173
+#: ../../english/intro/organization.data:171
 msgid "Buildd administration"
 msgstr "Buildd 管理"
 
-#: ../../english/intro/organization.data:191
+#: ../../english/intro/organization.data:189
 msgid "Documentation"
 msgstr "文档"
 
-#: ../../english/intro/organization.data:196
+#: ../../english/intro/organization.data:194
 msgid "Work-Needing and Prospective Packages list"
 msgstr "需要幫助的套件清單"
 
-#: ../../english/intro/organization.data:198
+#: ../../english/intro/organization.data:196
 msgid "Ports"
 msgstr "移植"
 
-#: ../../english/intro/organization.data:228
+#: ../../english/intro/organization.data:226
 msgid "Special Configurations"
 msgstr "特別[CN:配置:][HKTW:組態設定:]"
 
-#: ../../english/intro/organization.data:230
+#: ../../english/intro/organization.data:228
 msgid "Laptops"
 msgstr "筆記型電腦"
 
-#: ../../english/intro/organization.data:231
+#: ../../english/intro/organization.data:229
 msgid "Firewalls"
 msgstr "防火牆"
 
-#: ../../english/intro/organization.data:232
+#: ../../english/intro/organization.data:230
 msgid "Embedded systems"
 msgstr "嵌入式系統"
 
-#: ../../english/intro/organization.data:247
+#: ../../english/intro/organization.data:245
 msgid "Press Contact"
 msgstr ""
 
-#: ../../english/intro/organization.data:249
+#: ../../english/intro/organization.data:247
 msgid "Web Pages"
 msgstr "網頁"
 
@@ -405,44 +400,37 @@ msgstr "套件追蹤系統"
 msgid "Treasurer"
 msgstr ""
 
-#: ../../english/intro/organization.data:487
+#: ../../english/intro/organization.data:488
 msgid ""
 "<a name=\"trademark\" href=\"m4_HOME/trademark\">Trademark</a> use requests"
 msgstr ""
 
-#: ../../english/intro/organization.data:490
+#: ../../english/intro/organization.data:491
 msgid "Salsa administrators"
 msgstr "Salsa 管理员"
 
-#: ../../english/intro/organization.data:501
-msgid "Debian for children from 1 to 99"
-msgstr "給 1 到 99 歲小孩使用的 Debian"
+#~ msgid "Debian for children from 1 to 99"
+#~ msgstr "給 1 到 99 歲小孩使用的 Debian"
 
-#: ../../english/intro/organization.data:504
-msgid "Debian for medical practice and research"
-msgstr "給醫藥界使用的 Debian"
+#~ msgid "Debian for medical practice and research"
+#~ msgstr "給醫藥界使用的 Debian"
 
-#: ../../english/intro/organization.data:507
-msgid "Debian for education"
-msgstr "給教育界使用的 Debian"
+#~ msgid "Debian for education"
+#~ msgstr "給教育界使用的 Debian"
 
-#: ../../english/intro/organization.data:512
-msgid "Debian in legal offices"
-msgstr "給法律界使用的 Debian"
+#~ msgid "Debian in legal offices"
+#~ msgstr "給法律界使用的 Debian"
 
-#: ../../english/intro/organization.data:516
-msgid "Debian for people with disabilities"
-msgstr "給殘障人士使用的 Debian"
+#~ msgid "Debian for people with disabilities"
+#~ msgstr "給殘障人士使用的 Debian"
 
-#: ../../english/intro/organization.data:520
 #, fuzzy
-#| msgid "Debian for medical practice and research"
-msgid "Debian for science and related research"
-msgstr "給醫藥界使用的 Debian"
+#~| msgid "Debian for medical practice and research"
+#~ msgid "Debian for science and related research"
+#~ msgstr "給醫藥界使用的 Debian"
 
-#: ../../english/intro/organization.data:523
-msgid "Debian for astronomy"
-msgstr "給天文界使用的 Debian"
+#~ msgid "Debian for astronomy"
+#~ msgstr "給天文界使用的 Debian"
 
 #~ msgid "Alioth administrators"
 #~ msgstr "Alioth 管理"
diff --git a/chinese/po/others.zh.po b/chinese/po/others.zh.po
index b8bbec2201c..8c446922ac4 100644
--- a/chinese/po/others.zh.po
+++ b/chinese/po/others.zh.po
@@ -60,42 +60,6 @@ msgstr "<void id=\"d-i\" />未知"
 msgid "Unavailable"
 msgstr "未提供"
 
-#: ../../english/devel/join/nm-steps.inc:7
-msgid "New Members Corner"
-msgstr "新成员专区"
-
-#: ../../english/devel/join/nm-steps.inc:10
-msgid "Step 1"
-msgstr "第一步"
-
-#: ../../english/devel/join/nm-steps.inc:11
-msgid "Step 2"
-msgstr "第二步"
-
-#: ../../english/devel/join/nm-steps.inc:12
-msgid "Step 3"
-msgstr "第三步"
-
-#: ../../english/devel/join/nm-steps.inc:13
-msgid "Step 4"
-msgstr "第四步"
-
-#: ../../english/devel/join/nm-steps.inc:14
-msgid "Step 5"
-msgstr "第五步"
-
-#: ../../english/devel/join/nm-steps.inc:15
-msgid "Step 6"
-msgstr "第六步"
-
-#: ../../english/devel/join/nm-steps.inc:16
-msgid "Step 7"
-msgstr "第七步"
-
-#: ../../english/devel/join/nm-steps.inc:19
-msgid "Applicants' checklist"
-msgstr "申請者自我檢查單"
-
 #: ../../english/devel/website/tc.data:11
 msgid ""
 "See <a href=\"m4_HOME/intl/french/\">https://www.debian.org/intl/french/</a> "
@@ -131,6 +95,34 @@ msgstr "傳真"
 msgid "Address"
 msgstr "地址"
 
+#: ../../english/logos/index.data:6
+msgid "With&nbsp;``Debian''"
+msgstr "包含&nbsp;``Debian''"
+
+#: ../../english/logos/index.data:9
+msgid "Without&nbsp;``Debian''"
+msgstr "不包含&nbsp;``Debian''"
+
+#: ../../english/logos/index.data:12
+msgid "Encapsulated PostScript"
+msgstr "精簡 PostScript"
+
+#: ../../english/logos/index.data:18
+msgid "[Powered by Debian]"
+msgstr "[Powered by Debian]"
+
+#: ../../english/logos/index.data:21
+msgid "[Powered by Debian GNU/Linux]"
+msgstr "[Powered by Debian GNU/Linux]"
+
+#: ../../english/logos/index.data:24
+msgid "[Debian powered]"
+msgstr "[Debian powered]"
+
+#: ../../english/logos/index.data:27
+msgid "[Debian] (mini button)"
+msgstr "[Debian] (mini button)"
+
 #: ../../english/events/merchandise.def:10
 msgid "Products"
 msgstr "產品"
@@ -219,69 +211,6 @@ msgstr "向 Debian 捐献"
 msgid "Money is used to organize local free software events"
 msgstr "财物将被用来组织本地的自由软件活动"
 
-#: ../../english/logos/index.data:6
-msgid "With&nbsp;``Debian''"
-msgstr "包含&nbsp;``Debian''"
-
-#: ../../english/logos/index.data:9
-msgid "Without&nbsp;``Debian''"
-msgstr "不包含&nbsp;``Debian''"
-
-#: ../../english/logos/index.data:12
-msgid "Encapsulated PostScript"
-msgstr "精簡 PostScript"
-
-#: ../../english/logos/index.data:18
-msgid "[Powered by Debian]"
-msgstr "[Powered by Debian]"
-
-#: ../../english/logos/index.data:21
-msgid "[Powered by Debian GNU/Linux]"
-msgstr "[Powered by Debian GNU/Linux]"
-
-#: ../../english/logos/index.data:24
-msgid "[Debian powered]"
-msgstr "[Debian powered]"
-
-#: ../../english/logos/index.data:27
-msgid "[Debian] (mini button)"
-msgstr "[Debian] (mini button)"
-
-#: ../../english/mirror/submit.inc:7
-msgid "same as the above"
-msgstr "同上"
-
-#: ../../english/women/profiles/profiles.def:24
-msgid "How long have you been using Debian?"
-msgstr "您使用 Debian 多长时间了？"
-
-#: ../../english/women/profiles/profiles.def:27
-msgid "Are you a Debian Developer?"
-msgstr "您是否为 Debian 开发者？"
-
-#: ../../english/women/profiles/profiles.def:30
-msgid "What areas of Debian are you involved in?"
-msgstr "您参与了 Debian 中的那些方面？"
-
-#: ../../english/women/profiles/profiles.def:33
-msgid "What got you interested in working with Debian?"
-msgstr "您为什么对在 Debian 中工作产生了兴趣？"
-
-#: ../../english/women/profiles/profiles.def:36
-msgid ""
-"Do you have any tips for women interested in getting more involved with "
-"Debian?"
-msgstr "您是否有鼓励女性更多参与到 Debian 中的建议？"
-
-#: ../../english/women/profiles/profiles.def:39
-msgid ""
-"Are you involved with any other women in technology group? Which one(s)?"
-msgstr "您是否认识其它位于技术团体中的女性？您能否给出名称？"
-
-#: ../../english/women/profiles/profiles.def:42
-msgid "A bit more about you..."
-msgstr "关于您的更多信息..."
-
 #: ../../english/y2k/l10n.data:6
 msgid "OK"
 msgstr "合格"
@@ -326,6 +255,77 @@ msgstr "版本"
 msgid "URL"
 msgstr "網址"
 
+#: ../../english/devel/join/nm-steps.inc:7
+msgid "New Members Corner"
+msgstr "新成员专区"
+
+#: ../../english/devel/join/nm-steps.inc:10
+msgid "Step 1"
+msgstr "第一步"
+
+#: ../../english/devel/join/nm-steps.inc:11
+msgid "Step 2"
+msgstr "第二步"
+
+#: ../../english/devel/join/nm-steps.inc:12
+msgid "Step 3"
+msgstr "第三步"
+
+#: ../../english/devel/join/nm-steps.inc:13
+msgid "Step 4"
+msgstr "第四步"
+
+#: ../../english/devel/join/nm-steps.inc:14
+msgid "Step 5"
+msgstr "第五步"
+
+#: ../../english/devel/join/nm-steps.inc:15
+msgid "Step 6"
+msgstr "第六步"
+
+#: ../../english/devel/join/nm-steps.inc:16
+msgid "Step 7"
+msgstr "第七步"
+
+#: ../../english/devel/join/nm-steps.inc:19
+msgid "Applicants' checklist"
+msgstr "申請者自我檢查單"
+
+#: ../../english/mirror/submit.inc:7
+msgid "same as the above"
+msgstr "同上"
+
+#: ../../english/women/profiles/profiles.def:24
+msgid "How long have you been using Debian?"
+msgstr "您使用 Debian 多长时间了？"
+
+#: ../../english/women/profiles/profiles.def:27
+msgid "Are you a Debian Developer?"
+msgstr "您是否为 Debian 开发者？"
+
+#: ../../english/women/profiles/profiles.def:30
+msgid "What areas of Debian are you involved in?"
+msgstr "您参与了 Debian 中的那些方面？"
+
+#: ../../english/women/profiles/profiles.def:33
+msgid "What got you interested in working with Debian?"
+msgstr "您为什么对在 Debian 中工作产生了兴趣？"
+
+#: ../../english/women/profiles/profiles.def:36
+msgid ""
+"Do you have any tips for women interested in getting more involved with "
+"Debian?"
+msgstr "您是否有鼓励女性更多参与到 Debian 中的建议？"
+
+#: ../../english/women/profiles/profiles.def:39
+msgid ""
+"Are you involved with any other women in technology group? Which one(s)?"
+msgstr "您是否认识其它位于技术团体中的女性？您能否给出名称？"
+
+#: ../../english/women/profiles/profiles.def:42
+msgid "A bit more about you..."
+msgstr "关于您的更多信息..."
+
 #~ msgid "Name:"
 #~ msgstr "姓名："
 
diff --git a/chinese/po/partners.zh.po b/chinese/po/partners.zh.po
index db8c9e99938..644cd23a422 100644
--- a/chinese/po/partners.zh.po
+++ b/chinese/po/partners.zh.po
@@ -78,7 +78,7 @@ msgid ""
 "consulting and services company and since 1999 been offering comprehensive "
 "services and technical support for the implementation and operation of open "
 "source software in business applications. Our <q>Open Source Support Center</"
-"q> is always available, 365 days a year, around the clock."
+"q> is always available, 365 days a year, around the clock. "
 msgstr ""
 
 #: ../../english/partners/partners.def:67
diff --git a/chinese/po/ports.zh.po b/chinese/po/ports.zh.po
index fe9b8fa4e03..acea6eb22c1 100644
--- a/chinese/po/ports.zh.po
+++ b/chinese/po/ports.zh.po
@@ -12,22 +12,6 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Poedit 2.0.3\n"
 
-#: ../../english/ports/alpha/menu.inc:6
-msgid "Debian for Alpha"
-msgstr "給 Alpha 用的 Debian"
-
-#: ../../english/ports/hppa/menu.inc:6
-msgid "Debian for PA-RISC"
-msgstr "給 PA-RISC 用的 Debian"
-
-#: ../../english/ports/hurd/menu.inc:10
-msgid "Hurd CDs"
-msgstr "Hurd 光碟"
-
-#: ../../english/ports/ia64/menu.inc:6
-msgid "Debian for IA-64"
-msgstr "給 IA-64 用的 Debian"
-
 #: ../../english/ports/menu.defs:11
 msgid "Contact"
 msgstr "聯絡方式"
@@ -92,6 +76,22 @@ msgstr "支援"
 msgid "Systems"
 msgstr "系統"
 
+#: ../../english/ports/alpha/menu.inc:6
+msgid "Debian for Alpha"
+msgstr "給 Alpha 用的 Debian"
+
+#: ../../english/ports/hppa/menu.inc:6
+msgid "Debian for PA-RISC"
+msgstr "給 PA-RISC 用的 Debian"
+
+#: ../../english/ports/hurd/menu.inc:10
+msgid "Hurd CDs"
+msgstr "Hurd 光碟"
+
+#: ../../english/ports/ia64/menu.inc:6
+msgid "Debian for IA-64"
+msgstr "給 IA-64 用的 Debian"
+
 #: ../../english/ports/netbsd/menu.inc:6
 msgid "Debian GNU/NetBSD for i386"
 msgstr "給 i386 用的 Debian GNU/NetBSD"
diff --git a/chinese/po/security.zh.po b/chinese/po/security.zh.po
index 41380b45aec..51e9ab76e4c 100644
--- a/chinese/po/security.zh.po
+++ b/chinese/po/security.zh.po
@@ -12,40 +12,6 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Poedit 2.0.9\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 +93,37 @@ msgstr "CERT 的弱點報告:"
 #: ../../english/template/debian/securityreferences.wml:88
 msgid "No other external database security references currently available."
 msgstr "目前沒有其他安全分析資料庫可以參考。"
+
+#: ../../english/security/faq.inc:6
+msgid "Q"
+msgstr "Q"
+
+#: ../../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/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/security/index.include:17
+msgid ""
+"<a href=\\\"undated/\\\">undated</a> security advisories, included for "
+"posterity"
+msgstr "非常舊的、<a href=\\\"undated/\\\">沒有日期记载的</a>安全警"
diff --git a/chinese/po/stats.zh.po b/chinese/po/stats.zh.po
index 7f78ef4a261..f26ee17c93d 100644
--- a/chinese/po/stats.zh.po
+++ b/chinese/po/stats.zh.po
@@ -11,22 +11,6 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Poedit 2.2.1\n"
 
-#: ../../english/template/debian/stats_tags.wml:6
-msgid "Debian web site translation statistics"
-msgstr "Debian 網站翻譯統計"
-
-#: ../../english/template/debian/stats_tags.wml:10
-msgid "There are %d pages to translate."
-msgstr "一共有 %d 個頁面需要翻譯。"
-
-#: ../../english/template/debian/stats_tags.wml:14
-msgid "There are %d bytes to translate."
-msgstr "一共有 %d [CN:字節:][HKTW:位元组:]需要翻譯。"
-
-#: ../../english/template/debian/stats_tags.wml:18
-msgid "There are %d strings to translate."
-msgstr "一共有 %d 個[CN:字符串:][HKTW:字串:]需要翻譯。"
-
 #: ../../stattrans.pl:278 ../../stattrans.pl:494
 msgid "Wrong translation version"
 msgstr "譯文版本錯誤"
@@ -44,13 +28,13 @@ msgid "The original no longer exists"
 msgstr "原文不再存在"
 
 #: ../../stattrans.pl:470
-msgid "hit count N/A"
-msgstr "命中计数 N/A"
-
-#: ../../stattrans.pl:470
 msgid "hits"
 msgstr "命中"
 
+#: ../../stattrans.pl:470
+msgid "hit count N/A"
+msgstr "命中计数 N/A"
+
 #: ../../stattrans.pl:488 ../../stattrans.pl:489
 msgid "Click to fetch diffstat data"
 msgstr "点击以获取 diffstat 数据"
@@ -63,15 +47,6 @@ msgstr "使用 <transstatslink> 创建"
 msgid "Translation summary for"
 msgstr "翻譯概要 for"
 
-#: ../../stattrans.pl:607 ../../stattrans.pl:763 ../../stattrans.pl:809
-#: ../../stattrans.pl:852
-msgid "Not translated"
-msgstr "未翻譯"
-
-#: ../../stattrans.pl:607 ../../stattrans.pl:762 ../../stattrans.pl:808
-msgid "Outdated"
-msgstr "過時"
-
 #: ../../stattrans.pl:607
 msgid "Translated"
 msgstr "已翻譯"
@@ -81,6 +56,15 @@ msgstr "已翻譯"
 msgid "Up to date"
 msgstr "最新"
 
+#: ../../stattrans.pl:607 ../../stattrans.pl:762 ../../stattrans.pl:808
+msgid "Outdated"
+msgstr "過時"
+
+#: ../../stattrans.pl:607 ../../stattrans.pl:763 ../../stattrans.pl:809
+#: ../../stattrans.pl:852
+msgid "Not translated"
+msgstr "未翻譯"
+
 #: ../../stattrans.pl:608 ../../stattrans.pl:609 ../../stattrans.pl:610
 #: ../../stattrans.pl:611
 msgid "files"
@@ -231,6 +215,22 @@ msgstr "已翻譯網頁（按[CN:文件:][HKTW:檔案:]大小）"
 msgid "Translation Statistics by Page Size"
 msgstr "翻譯統計，按頁面大小"
 
+#: ../../english/template/debian/stats_tags.wml:6
+msgid "Debian web site translation statistics"
+msgstr "Debian 網站翻譯統計"
+
+#: ../../english/template/debian/stats_tags.wml:10
+msgid "There are %d pages to translate."
+msgstr "一共有 %d 個頁面需要翻譯。"
+
+#: ../../english/template/debian/stats_tags.wml:14
+msgid "There are %d bytes to translate."
+msgstr "一共有 %d [CN:字節:][HKTW:位元组:]需要翻譯。"
+
+#: ../../english/template/debian/stats_tags.wml:18
+msgid "There are %d strings to translate."
+msgstr "一共有 %d 個[CN:字符串:][HKTW:字串:]需要翻譯。"
+
 #~ msgid "Unified diff"
 #~ msgstr "合并差异"
 
diff --git a/chinese/po/templates.zh.po b/chinese/po/templates.zh.po
index 137b37137f5..2db769a1e76 100644
--- a/chinese/po/templates.zh.po
+++ b/chinese/po/templates.zh.po
@@ -17,14 +17,6 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0\n"
 "X-Generator: Gtranslator 3.30.1\n"
 
-#: ../../english/search.xml.in:7
-msgid "Debian website"
-msgstr "Debian 网站"
-
-#: ../../english/search.xml.in:9
-msgid "Search the Debian website."
-msgstr "搜索 Debian 网站。"
-
 #: ../../english/template/debian/basic.wml:19
 #: ../../english/template/debian/navbar.wml:11
 msgid "Debian"
@@ -265,6 +257,14 @@ msgstr "本頁其他語言版本如下"
 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
+msgid "Browser default"
+msgstr ""
+
+#: ../../english/template/debian/languages.wml:323
+msgid "Unset the language override cookie"
+msgstr ""
+
 #: ../../english/template/debian/links.tags.wml:4
 msgid "Debian International"
 msgstr "Debian 國際化"
@@ -539,6 +539,14 @@ msgstr "網址"
 msgid "Back to the <a href=\"../\">Who's using Debian? page</a>."
 msgstr "返回<a href=\"./\">谁在使用 Debian？页面</a>。"
 
+#: ../../english/search.xml.in:7
+msgid "Debian website"
+msgstr "Debian 网站"
+
+#: ../../english/search.xml.in:9
+msgid "Search the Debian website."
+msgstr "搜索 Debian 网站。"
+
 #~ msgid "Back to the <a href=\"./\">Debian consultants page</a>."
 #~ msgstr "返回 <a href=\"./\">Debian consultants page</a>."
 
diff --git a/chinese/po/vote.zh.po b/chinese/po/vote.zh.po
index 75f8e885298..2a38d3ae741 100644
--- a/chinese/po/vote.zh.po
+++ b/chinese/po/vote.zh.po
@@ -69,201 +69,231 @@ msgid "Proposal F Proposer"
 msgstr "提案 F 提名人"
 
 #: ../../english/template/debian/votebar.wml:55
+#, fuzzy
+msgid "Proposal G Proposer"
+msgstr "提案 A 提名人"
+
+#: ../../english/template/debian/votebar.wml:58
+#, fuzzy
+msgid "Proposal H Proposer"
+msgstr "提案 A 提名人"
+
+#: ../../english/template/debian/votebar.wml:61
 msgid "Seconds"
 msgstr "支持者"
 
-#: ../../english/template/debian/votebar.wml:58
+#: ../../english/template/debian/votebar.wml:64
 msgid "Proposal A Seconds"
 msgstr "提案 A 支持者"
 
-#: ../../english/template/debian/votebar.wml:61
+#: ../../english/template/debian/votebar.wml:67
 msgid "Proposal B Seconds"
 msgstr "提案 B 支持者"
 
-#: ../../english/template/debian/votebar.wml:64
+#: ../../english/template/debian/votebar.wml:70
 msgid "Proposal C Seconds"
 msgstr "提案 C 支持者"
 
-#: ../../english/template/debian/votebar.wml:67
+#: ../../english/template/debian/votebar.wml:73
 msgid "Proposal D Seconds"
 msgstr "提案 D 支持者"
 
-#: ../../english/template/debian/votebar.wml:70
+#: ../../english/template/debian/votebar.wml:76
 msgid "Proposal E Seconds"
 msgstr "提案 E 支持者"
 
-#: ../../english/template/debian/votebar.wml:73
+#: ../../english/template/debian/votebar.wml:79
 msgid "Proposal F Seconds"
 msgstr "提案 F 支持者"
 
-#: ../../english/template/debian/votebar.wml:76
+#: ../../english/template/debian/votebar.wml:82
+#, fuzzy
+msgid "Proposal G Seconds"
+msgstr "提案 A 支持者"
+
+#: ../../english/template/debian/votebar.wml:85
+#, fuzzy
+msgid "Proposal H Seconds"
+msgstr "提案 A 支持者"
+
+#: ../../english/template/debian/votebar.wml:88
 msgid "Opposition"
 msgstr "反對"
 
-#: ../../english/template/debian/votebar.wml:79
+#: ../../english/template/debian/votebar.wml:91
 msgid "Text"
 msgstr "內文"
 
-#: ../../english/template/debian/votebar.wml:82
+#: ../../english/template/debian/votebar.wml:94
 msgid "Proposal A"
 msgstr "提案 A"
 
-#: ../../english/template/debian/votebar.wml:85
+#: ../../english/template/debian/votebar.wml:97
 msgid "Proposal B"
 msgstr "提案 B"
 
-#: ../../english/template/debian/votebar.wml:88
+#: ../../english/template/debian/votebar.wml:100
 msgid "Proposal C"
 msgstr "提案 C"
 
-#: ../../english/template/debian/votebar.wml:91
+#: ../../english/template/debian/votebar.wml:103
 msgid "Proposal D"
 msgstr "提案 D"
 
-#: ../../english/template/debian/votebar.wml:94
+#: ../../english/template/debian/votebar.wml:106
 msgid "Proposal E"
 msgstr "提案 E"
 
-#: ../../english/template/debian/votebar.wml:97
+#: ../../english/template/debian/votebar.wml:109
 msgid "Proposal F"
 msgstr "提案 F"
 
-#: ../../english/template/debian/votebar.wml:100
+#: ../../english/template/debian/votebar.wml:112
+#, fuzzy
+msgid "Proposal G"
+msgstr "提案 A"
+
+#: ../../english/template/debian/votebar.wml:115
+#, fuzzy
+msgid "Proposal H"
+msgstr "提案 A"
+
+#: ../../english/template/debian/votebar.wml:118
 msgid "Choices"
 msgstr "選擇"
 
-#: ../../english/template/debian/votebar.wml:103
+#: ../../english/template/debian/votebar.wml:121
 msgid "Amendment Proposer"
 msgstr "修正案提名人"
 
-#: ../../english/template/debian/votebar.wml:106
+#: ../../english/template/debian/votebar.wml:124
 msgid "Amendment Seconds"
 msgstr "修正案支持者"
 
-#: ../../english/template/debian/votebar.wml:109
+#: ../../english/template/debian/votebar.wml:127
 msgid "Amendment Text"
 msgstr "修正案內文"
 
-#: ../../english/template/debian/votebar.wml:112
+#: ../../english/template/debian/votebar.wml:130
 msgid "Amendment Proposer A"
 msgstr "修正案 A 提名人"
 
-#: ../../english/template/debian/votebar.wml:115
+#: ../../english/template/debian/votebar.wml:133
 msgid "Amendment Seconds A"
 msgstr "修正案 A 支持者"
 
-#: ../../english/template/debian/votebar.wml:118
+#: ../../english/template/debian/votebar.wml:136
 msgid "Amendment Text A"
 msgstr "修正案 A 內文"
 
-#: ../../english/template/debian/votebar.wml:121
+#: ../../english/template/debian/votebar.wml:139
 msgid "Amendment Proposer B"
 msgstr "修正案 B 提名人"
 
-#: ../../english/template/debian/votebar.wml:124
+#: ../../english/template/debian/votebar.wml:142
 msgid "Amendment Seconds B"
 msgstr "修正案 B 支持者"
 
-#: ../../english/template/debian/votebar.wml:127
+#: ../../english/template/debian/votebar.wml:145
 msgid "Amendment Text B"
 msgstr "修正案 B 內文"
 
-#: ../../english/template/debian/votebar.wml:130
+#: ../../english/template/debian/votebar.wml:148
 msgid "Amendment Proposer C"
 msgstr "修正案 C 提名人"
 
-#: ../../english/template/debian/votebar.wml:133
+#: ../../english/template/debian/votebar.wml:151
 msgid "Amendment Seconds C"
 msgstr "修正案 C 支持者"
 
-#: ../../english/template/debian/votebar.wml:136
+#: ../../english/template/debian/votebar.wml:154
 msgid "Amendment Text C"
 msgstr "修正案 C 內文"
 
-#: ../../english/template/debian/votebar.wml:139
+#: ../../english/template/debian/votebar.wml:157
 msgid "Amendments"
 msgstr "修正案"
 
-#: ../../english/template/debian/votebar.wml:142
+#: ../../english/template/debian/votebar.wml:160
 msgid "Proceedings"
 msgstr "會議記錄"
 
-#: ../../english/template/debian/votebar.wml:145
+#: ../../english/template/debian/votebar.wml:163
 msgid "Majority Requirement"
 msgstr "主要要求"
 
-#: ../../english/template/debian/votebar.wml:148
+#: ../../english/template/debian/votebar.wml:166
 msgid "Data and Statistics"
 msgstr "資料與統計"
 
-#: ../../english/template/debian/votebar.wml:151
+#: ../../english/template/debian/votebar.wml:169
 msgid "Quorum"
 msgstr "最低人數"
 
-#: ../../english/template/debian/votebar.wml:154
+#: ../../english/template/debian/votebar.wml:172
 msgid "Minimum Discussion"
 msgstr "最少量討論"
 
-#: ../../english/template/debian/votebar.wml:157
+#: ../../english/template/debian/votebar.wml:175
 msgid "Ballot"
 msgstr "投票"
 
-#: ../../english/template/debian/votebar.wml:160
+#: ../../english/template/debian/votebar.wml:178
 msgid "Forum"
 msgstr "討論區"
 
-#: ../../english/template/debian/votebar.wml:163
+#: ../../english/template/debian/votebar.wml:181
 msgid "Outcome"
 msgstr "結果"
 
-#: ../../english/template/debian/votebar.wml:167
+#: ../../english/template/debian/votebar.wml:185
 msgid "Waiting&nbsp;for&nbsp;Sponsors"
 msgstr "有待贊助"
 
-#: ../../english/template/debian/votebar.wml:170
+#: ../../english/template/debian/votebar.wml:188
 msgid "In&nbsp;Discussion"
 msgstr "討論中"
 
-#: ../../english/template/debian/votebar.wml:173
+#: ../../english/template/debian/votebar.wml:191
 msgid "Voting&nbsp;Open"
 msgstr "接受投票中"
 
-#: ../../english/template/debian/votebar.wml:176
+#: ../../english/template/debian/votebar.wml:194
 msgid "Decided"
 msgstr "已決定"
 
-#: ../../english/template/debian/votebar.wml:179
+#: ../../english/template/debian/votebar.wml:197
 msgid "Withdrawn"
 msgstr "撤銷"
 
-#: ../../english/template/debian/votebar.wml:182
+#: ../../english/template/debian/votebar.wml:200
 msgid "Other"
 msgstr "其他"
 
-#: ../../english/template/debian/votebar.wml:186
+#: ../../english/template/debian/votebar.wml:204
 msgid "Home&nbsp;Vote&nbsp;Page"
 msgstr "投票主頁"
 
-#: ../../english/template/debian/votebar.wml:189
+#: ../../english/template/debian/votebar.wml:207
 msgid "How&nbsp;To"
 msgstr "How&nbsp;To"
 
-#: ../../english/template/debian/votebar.wml:192
+#: ../../english/template/debian/votebar.wml:210
 msgid "Submit&nbsp;a&nbsp;Proposal"
 msgstr "提出議案"
 
-#: ../../english/template/debian/votebar.wml:195
+#: ../../english/template/debian/votebar.wml:213
 msgid "Amend&nbsp;a&nbsp;Proposal"
 msgstr "修正議案"
 
-#: ../../english/template/debian/votebar.wml:198
+#: ../../english/template/debian/votebar.wml:216
 msgid "Follow&nbsp;a&nbsp;Proposal"
 msgstr "跟隨議案的進展"
 
-#: ../../english/template/debian/votebar.wml:201
+#: ../../english/template/debian/votebar.wml:219
 msgid "Read&nbsp;a&nbsp;Result"
 msgstr "查看結果"
 
-#: ../../english/template/debian/votebar.wml:204
+#: ../../english/template/debian/votebar.wml:222
 msgid "Vote"
 msgstr "投票"