aboutsummaryrefslogtreecommitdiffstats
path: root/chinese/po
diff options
context:
space:
mode:
authorWenbin Lv <wenbin816@gmail.com>2021-08-17 21:47:57 +0800
committerWenbin Lv <wenbin816@gmail.com>2021-08-17 21:48:43 +0800
commite20dfd7edbdfe9b79803e5ed1e46281b112b0ccc (patch)
tree0b0f6b76ee56c2fc46c212e793940bed87c1a60b /chinese/po
parentebcf02fd9f75480b449b4a4f2de0b12b5d4fe751 (diff)
(cn) run make update-po
Diffstat (limited to 'chinese/po')
-rw-r--r--chinese/po/bugs.zh.po164
-rw-r--r--chinese/po/countries.zh.po90
-rw-r--r--chinese/po/doc.zh.po58
-rw-r--r--chinese/po/mailinglists.zh.po6
-rw-r--r--chinese/po/newsevents.zh.po24
-rw-r--r--chinese/po/organization.zh.po130
-rw-r--r--chinese/po/others.zh.po182
-rw-r--r--chinese/po/partners.zh.po80
-rw-r--r--chinese/po/ports.zh.po36
-rw-r--r--chinese/po/stats.zh.po14
-rw-r--r--chinese/po/templates.zh.po298
-rw-r--r--chinese/po/vendors.zh.po70
12 files changed, 579 insertions, 573 deletions
diff --git a/chinese/po/bugs.zh.po b/chinese/po/bugs.zh.po
index 7f46e85dce5..f199bb8377b 100644
--- a/chinese/po/bugs.zh.po
+++ b/chinese/po/bugs.zh.po
@@ -160,92 +160,59 @@ msgstr "已歸檔"
msgid "Archived and Unarchived"
msgstr "已歸檔與未歸檔"
-#~ msgid "Flags:"
-#~ msgstr "標記:"
+#~ msgid "Distribution:"
+#~ msgstr "發行版:"
-#~ msgid "active bugs"
-#~ msgstr "未解決"
+#~ msgid "Exclude severity:"
+#~ msgstr "不包括優先級:"
-#~ msgid "display merged bugs only once"
-#~ msgstr "已合並的報告只顯示一次"
+#~ msgid "Exclude status:"
+#~ msgstr "不包括狀態:"
-#~ msgid "no ordering by status or severity"
-#~ msgstr "不按狀態或者嚴重性排序"
+#~ msgid "Exclude tag:"
+#~ msgstr "不包括標簽:"
-#~ msgid "don't show table of contents in the header"
-#~ msgstr "不在頁面開始處顯示目錄"
+#~ msgid "Flags:"
+#~ msgstr "標記:"
-#~ msgid "don't show statistics in the footer"
-#~ msgstr "不在頁腳處顯示統計結果"
+#~ msgid "Include severity:"
+#~ msgstr "包括優先級:"
-#~ msgid "proposed-updates"
-#~ msgstr "proposed-updates"
+#~ msgid "Include status:"
+#~ msgstr "包括狀態:"
-#~ msgid "testing-proposed-updates"
-#~ msgstr "testing-proposed-updates"
+#~ msgid "Include tag:"
+#~ msgstr "包括標簽:"
#~ msgid "Package version:"
#~ msgstr "軟件包版本號:"
-#~ msgid "Distribution:"
-#~ msgstr "發行版:"
+#~ msgid "active bugs"
+#~ msgstr "未解決"
#~ msgid "bugs"
#~ msgstr "數量"
-#~ msgid "open"
-#~ msgstr "未解決"
-
-#~ msgid "forwarded"
-#~ msgstr "已移交"
-
-#~ msgid "pending"
-#~ msgstr "待完工"
-
-#~ msgid "fixed"
-#~ msgstr "已修正"
-
-#~ msgid "done"
-#~ msgstr "已完工"
-
-#~ msgid "Include status:"
-#~ msgstr "包括狀態:"
-
-#~ msgid "Exclude status:"
-#~ msgstr "不包括狀態:"
+#~ msgid "confirmed"
+#~ msgstr "通過確認 (confirmed)"
#~ msgid "critical"
#~ msgstr "致命"
-#~ msgid "grave"
-#~ msgstr "危險"
-
-#~ msgid "serious"
-#~ msgstr "嚴重"
-
-#~ msgid "important"
-#~ msgstr "重要"
-
-#~ msgid "minor"
-#~ msgstr "輕微"
-
-#~ msgid "wishlist"
-#~ msgstr "[CN:小意思:][HKTW:心願:]"
-
-#~ msgid "Include severity:"
-#~ msgstr "包括優先級:"
+#~ msgid "d-i"
+#~ msgstr "安裝程序 (d-i)"
-#~ msgid "Exclude severity:"
-#~ msgstr "不包括優先級:"
+#~ msgid "display merged bugs only once"
+#~ msgstr "已合並的報告只顯示一次"
-#~ msgid "potato"
-#~ msgstr "potato"
+#~ msgid "don't show statistics in the footer"
+#~ msgstr "不在頁腳處顯示統計結果"
-#~ msgid "woody"
-#~ msgstr "woody"
+#~ msgid "don't show table of contents in the header"
+#~ msgstr "不在頁面開始處顯示目錄"
-#~ msgid "sarge-ignore"
-#~ msgstr "sarge-ignore"
+#~ msgid "done"
+#~ msgstr "已完工"
#~ msgid "etch"
#~ msgstr "etch"
@@ -253,14 +220,8 @@ msgstr "已歸檔與未歸檔"
#~ msgid "etch-ignore"
#~ msgstr "etch-ignore"
-#~ msgid "sid"
-#~ msgstr "sid"
-
-#~ msgid "confirmed"
-#~ msgstr "通過確認 (confirmed)"
-
-#~ msgid "d-i"
-#~ msgstr "安裝程序 (d-i)"
+#~ msgid "fixed"
+#~ msgstr "已修正"
#~ msgid "fixed-in-experimental"
#~ msgstr "已修正于 experimental (fixed-in-experimental)"
@@ -268,38 +229,77 @@ msgstr "已歸檔與未歸檔"
#~ msgid "fixed-upstream"
#~ msgstr "已修正于上遊 (fixed-upstream)"
+#~ msgid "forwarded"
+#~ msgstr "已移交"
+
+#~ msgid "grave"
+#~ msgstr "危險"
+
#~ msgid "help"
#~ msgstr "幫助文檔 (help)"
+#~ msgid "important"
+#~ msgstr "重要"
+
+#~ msgid "ipv6"
+#~ msgstr "ipv6"
+
#~ msgid "l10n"
#~ msgstr "本地化 (l10n)"
+#~ msgid "lfs"
+#~ msgstr "lfs"
+
+#~ msgid "minor"
+#~ msgstr "輕微"
+
#~ msgid "moreinfo"
#~ msgstr "附加信息 (moreinfo)"
+#~ msgid "no ordering by status or severity"
+#~ msgstr "不按狀態或者嚴重性排序"
+
+#~ msgid "open"
+#~ msgstr "未解決"
+
#~ msgid "patch"
#~ msgstr "補丁 (patch)"
+#~ msgid "pending"
+#~ msgstr "待完工"
+
+#~ msgid "potato"
+#~ msgstr "potato"
+
+#~ msgid "proposed-updates"
+#~ msgstr "proposed-updates"
+
+#~ msgid "sarge-ignore"
+#~ msgstr "sarge-ignore"
+
#~ msgid "security"
#~ msgstr "安全性 (security)"
+#~ msgid "serious"
+#~ msgstr "嚴重"
+
+#~ msgid "sid"
+#~ msgstr "sid"
+
+#~ msgid "testing-proposed-updates"
+#~ msgstr "testing-proposed-updates"
+
#~ msgid "unreproducible"
#~ msgstr "不可再現 (unreproducible)"
#~ msgid "upstream"
#~ msgstr "上遊 (upstream)"
+#~ msgid "wishlist"
+#~ msgstr "[CN:小意思:][HKTW:心願:]"
+
#~ msgid "wontfix"
#~ msgstr "不予修正 (wontfix)"
-#~ msgid "ipv6"
-#~ msgstr "ipv6"
-
-#~ msgid "lfs"
-#~ msgstr "lfs"
-
-#~ msgid "Include tag:"
-#~ msgstr "包括標簽:"
-
-#~ msgid "Exclude tag:"
-#~ msgstr "不包括標簽:"
+#~ msgid "woody"
+#~ msgstr "woody"
diff --git a/chinese/po/countries.zh.po b/chinese/po/countries.zh.po
index ed4d7156ef1..bfee5259ad2 100644
--- a/chinese/po/countries.zh.po
+++ b/chinese/po/countries.zh.po
@@ -264,178 +264,182 @@ msgid "Morocco"
msgstr "摩洛哥"
#: ../../english/template/debian/countries.wml:297
+msgid "Monaco"
+msgstr ""
+
+#: ../../english/template/debian/countries.wml:300
msgid "Moldova"
msgstr "摩爾多瓦"
-#: ../../english/template/debian/countries.wml:300
+#: ../../english/template/debian/countries.wml:303
msgid "Montenegro"
msgstr "[CNHK:黑山:][TW:蒙特內哥羅:]"
-#: ../../english/template/debian/countries.wml:303
+#: ../../english/template/debian/countries.wml:306
msgid "Madagascar"
msgstr "马达加斯加"
-#: ../../english/template/debian/countries.wml:306
+#: ../../english/template/debian/countries.wml:309
msgid "Macedonia, Republic of"
msgstr "馬其頓共和國"
-#: ../../english/template/debian/countries.wml:309
+#: ../../english/template/debian/countries.wml:312
msgid "Mongolia"
msgstr "蒙古"
-#: ../../english/template/debian/countries.wml:312
+#: ../../english/template/debian/countries.wml:315
msgid "Malta"
msgstr "[CN:马耳他:][HKTW:馬爾他:]"
-#: ../../english/template/debian/countries.wml:315
+#: ../../english/template/debian/countries.wml:318
msgid "Mexico"
msgstr "墨西哥"
-#: ../../english/template/debian/countries.wml:318
+#: ../../english/template/debian/countries.wml:321
msgid "Malaysia"
msgstr "馬來西亞"
-#: ../../english/template/debian/countries.wml:321
+#: ../../english/template/debian/countries.wml:324
msgid "New Caledonia"
msgstr "新喀里多尼亞"
-#: ../../english/template/debian/countries.wml:324
+#: ../../english/template/debian/countries.wml:327
msgid "Nicaragua"
msgstr "尼加拉瓜"
-#: ../../english/template/debian/countries.wml:327
+#: ../../english/template/debian/countries.wml:330
msgid "Netherlands"
msgstr "荷蘭"
-#: ../../english/template/debian/countries.wml:330
+#: ../../english/template/debian/countries.wml:333
msgid "Norway"
msgstr "挪威"
-#: ../../english/template/debian/countries.wml:333
+#: ../../english/template/debian/countries.wml:336
msgid "New Zealand"
msgstr "新西蘭"
-#: ../../english/template/debian/countries.wml:336
+#: ../../english/template/debian/countries.wml:339
msgid "Panama"
msgstr "巴拿馬"
-#: ../../english/template/debian/countries.wml:339
+#: ../../english/template/debian/countries.wml:342
msgid "Peru"
msgstr "秘魯"
-#: ../../english/template/debian/countries.wml:342
+#: ../../english/template/debian/countries.wml:345
msgid "French Polynesia"
msgstr "[CNHK:法属波利尼西亚:][TW:法屬玻里尼西亞:]"
-#: ../../english/template/debian/countries.wml:345
+#: ../../english/template/debian/countries.wml:348
msgid "Philippines"
msgstr "菲律賓"
-#: ../../english/template/debian/countries.wml:348
+#: ../../english/template/debian/countries.wml:351
msgid "Pakistan"
msgstr "巴基斯坦"
-#: ../../english/template/debian/countries.wml:351
+#: ../../english/template/debian/countries.wml:354
msgid "Poland"
msgstr "波蘭"
-#: ../../english/template/debian/countries.wml:354
+#: ../../english/template/debian/countries.wml:357
msgid "Portugal"
msgstr "葡萄牙"
-#: ../../english/template/debian/countries.wml:357
+#: ../../english/template/debian/countries.wml:360
msgid "Réunion"
msgstr "留尼旺"
-#: ../../english/template/debian/countries.wml:360
+#: ../../english/template/debian/countries.wml:363
msgid "Romania"
msgstr "羅馬尼亞"
-#: ../../english/template/debian/countries.wml:363
+#: ../../english/template/debian/countries.wml:366
msgid "Serbia"
msgstr "塞爾維亞"
-#: ../../english/template/debian/countries.wml:366
+#: ../../english/template/debian/countries.wml:369
msgid "Russia"
msgstr "俄罗斯"
-#: ../../english/template/debian/countries.wml:369
+#: ../../english/template/debian/countries.wml:372
msgid "Saudi Arabia"
msgstr "[CNHK:沙特阿拉伯:][TW:沙烏地阿拉伯:]"
-#: ../../english/template/debian/countries.wml:372
+#: ../../english/template/debian/countries.wml:375
msgid "Sweden"
msgstr "瑞典"
-#: ../../english/template/debian/countries.wml:375
+#: ../../english/template/debian/countries.wml:378
msgid "Singapore"
msgstr "新加坡"
-#: ../../english/template/debian/countries.wml:378
+#: ../../english/template/debian/countries.wml:381
msgid "Slovenia"
msgstr "斯洛文尼亞"
-#: ../../english/template/debian/countries.wml:381
+#: ../../english/template/debian/countries.wml:384
msgid "Slovakia"
msgstr "斯洛伐克"
-#: ../../english/template/debian/countries.wml:384
+#: ../../english/template/debian/countries.wml:387
msgid "El Salvador"
msgstr "薩爾瓦多"
-#: ../../english/template/debian/countries.wml:387
+#: ../../english/template/debian/countries.wml:390
msgid "Thailand"
msgstr "泰國"
-#: ../../english/template/debian/countries.wml:390
+#: ../../english/template/debian/countries.wml:393
msgid "Tajikistan"
msgstr "[CN:塔吉克斯坦:][HKTW:塔吉克:]"
-#: ../../english/template/debian/countries.wml:393
+#: ../../english/template/debian/countries.wml:396
msgid "Tunisia"
msgstr "[CN:突尼斯:][HKTW:突尼西亞:]"
-#: ../../english/template/debian/countries.wml:396
+#: ../../english/template/debian/countries.wml:399
msgid "Turkey"
msgstr "土耳其"
-#: ../../english/template/debian/countries.wml:399
+#: ../../english/template/debian/countries.wml:402
msgid "Taiwan"
msgstr "台灣"
-#: ../../english/template/debian/countries.wml:402
+#: ../../english/template/debian/countries.wml:405
msgid "Ukraine"
msgstr "烏克蘭"
-#: ../../english/template/debian/countries.wml:405
+#: ../../english/template/debian/countries.wml:408
msgid "United States"
msgstr "美國"
-#: ../../english/template/debian/countries.wml:408
+#: ../../english/template/debian/countries.wml:411
msgid "Uruguay"
msgstr "烏拉圭"
-#: ../../english/template/debian/countries.wml:411
+#: ../../english/template/debian/countries.wml:414
msgid "Uzbekistan"
msgstr "[CN:乌兹别克斯坦:][HKTW:烏茲別克:]"
-#: ../../english/template/debian/countries.wml:414
+#: ../../english/template/debian/countries.wml:417
msgid "Venezuela"
msgstr "委內瑞拉"
-#: ../../english/template/debian/countries.wml:417
+#: ../../english/template/debian/countries.wml:420
msgid "Vietnam"
msgstr "越南"
-#: ../../english/template/debian/countries.wml:420
+#: ../../english/template/debian/countries.wml:423
msgid "Vanuatu"
msgstr "[CNHK:瓦努阿图:][TW:萬那杜:]"
-#: ../../english/template/debian/countries.wml:423
+#: ../../english/template/debian/countries.wml:426
msgid "South Africa"
msgstr "南非"
-#: ../../english/template/debian/countries.wml:426
+#: ../../english/template/debian/countries.wml:429
msgid "Zimbabwe"
msgstr "津巴布韦"
diff --git a/chinese/po/doc.zh.po b/chinese/po/doc.zh.po
index f06bc934c1a..5aa85b9cf55 100644
--- a/chinese/po/doc.zh.po
+++ b/chinese/po/doc.zh.po
@@ -198,14 +198,13 @@ msgid "PDF"
msgstr "PDF"
#~ msgid ""
-#~ "The latest <get-var srctype /> source is available through the <a href="
-#~ "\"https://www.debian.org/doc/cvs\">Subversion</a> repository."
+#~ "<p>You can visit the current <a href=\"manuals/<get-var doc />/"
+#~ "\">development version</a> here, use <a href=\"cvs\">CVS</a> to download "
+#~ "the SGML source text."
#~ msgstr ""
-#~ "<get-var srctype /> 的最新源代码可由 <a href=\"https://www.debian.org/doc/"
-#~ "cvs\">Subversion</a> 仓库获得。"
-
-#~ msgid "Language:"
-#~ msgstr "語言:"
+#~ "<p>You can visit the current<a href=\"manuals/<get-var doc />/"
+#~ "\">development version</a> here,use <a href=\"cvs\">CVS</a> to download "
+#~ "the SGML source text."
#~ msgid ""
#~ "CVS sources working copy: <p>Login to the CVS server using the command:"
@@ -224,25 +223,6 @@ msgstr "PDF"
#~ "anonymous@cvs.debian.org:/cvs/debian-policy co <get-var doc /></pre>"
#~ msgid ""
-#~ "<p>You can visit the current <a href=\"manuals/<get-var doc />/"
-#~ "\">development version</a> here, use <a href=\"cvs\">CVS</a> to download "
-#~ "the SGML source text."
-#~ msgstr ""
-#~ "<p>You can visit the current<a href=\"manuals/<get-var doc />/"
-#~ "\">development version</a> here,use <a href=\"cvs\">CVS</a> to download "
-#~ "the SGML source text."
-
-#~ msgid ""
-#~ "Use <a href=\"cvs\">SVN</a> to download the SGML source text for <get-var "
-#~ "ddp_pkg_loc />."
-#~ msgstr ""
-#~ "使用 <a href=\"cvs\">SVN</a> 來取得 <get-vard dp_pkg_loc /> 的 SGML 原始"
-#~ "檔。"
-
-#~ msgid "CVS via web"
-#~ msgstr "網頁檢視 CVS"
-
-#~ msgid ""
#~ "CVS sources working copy: set <code>CVSROOT</code>\n"
#~ " to <kbd>:ext:<var>userid</var>@cvs.debian.org:/cvs/debian-boot</kbd>,\n"
#~ " and check out the <kbd>boot-floppies/documentation</kbd> module."
@@ -251,6 +231,19 @@ msgstr "PDF"
#~ " <kbd>:ext:<var>userid</var>@cvs.debian.org:/cvs/debian-boot</kbd>,\n"
#~ " 然後 check out <kbd>boot-floppies/documentation</kbd> module。"
+#~ msgid "CVS via web"
+#~ msgstr "網頁檢視 CVS"
+
+#~ msgid "Language:"
+#~ msgstr "語言:"
+
+#~ msgid ""
+#~ "The latest <get-var srctype /> source is available through the <a href="
+#~ "\"https://packages.debian.org/cvs\">Cvs</a> repository."
+#~ msgstr ""
+#~ "最新的 <get-var srctype /> 格式的源代码可由 <a href=\"https://packages."
+#~ "debian.org/cvs\">Cvs</a> 仓库获得。"
+
#~ msgid ""
#~ "The latest <get-var srctype /> source is available through the <a href="
#~ "\"https://packages.debian.org/subversion\">Subversion</a> repository."
@@ -260,7 +253,14 @@ msgstr "PDF"
#~ msgid ""
#~ "The latest <get-var srctype /> source is available through the <a href="
-#~ "\"https://packages.debian.org/cvs\">Cvs</a> repository."
+#~ "\"https://www.debian.org/doc/cvs\">Subversion</a> repository."
#~ msgstr ""
-#~ "最新的 <get-var srctype /> 格式的源代码可由 <a href=\"https://packages."
-#~ "debian.org/cvs\">Cvs</a> 仓库获得。"
+#~ "<get-var srctype /> 的最新源代码可由 <a href=\"https://www.debian.org/doc/"
+#~ "cvs\">Subversion</a> 仓库获得。"
+
+#~ msgid ""
+#~ "Use <a href=\"cvs\">SVN</a> to download the SGML source text for <get-var "
+#~ "ddp_pkg_loc />."
+#~ msgstr ""
+#~ "使用 <a href=\"cvs\">SVN</a> 來取得 <get-vard dp_pkg_loc /> 的 SGML 原始"
+#~ "檔。"
diff --git a/chinese/po/mailinglists.zh.po b/chinese/po/mailinglists.zh.po
index a77da0f0cc7..cc4a4b38be4 100644
--- a/chinese/po/mailinglists.zh.po
+++ b/chinese/po/mailinglists.zh.po
@@ -125,8 +125,8 @@ msgstr "公開"
msgid "closed"
msgstr "關閉"
-#~ msgid "Please select which lists you want to unsubscribe from:"
-#~ msgstr "請選擇您要取消訂閱哪個列表:"
-
#~ msgid "Please select which lists you want to subscribe to:"
#~ msgstr "請選擇您想要訂閱的郵件列表:"
+
+#~ msgid "Please select which lists you want to unsubscribe from:"
+#~ msgstr "請選擇您要取消訂閱哪個列表:"
diff --git a/chinese/po/newsevents.zh.po b/chinese/po/newsevents.zh.po
index 6a7be7b07b3..772eea0e249 100644
--- a/chinese/po/newsevents.zh.po
+++ b/chinese/po/newsevents.zh.po
@@ -473,29 +473,26 @@ msgstr ""
"<void id=\"plural\" />Debian 每周快訊 (Debian Weekly News) 由 <a href="
"\"mailto:dwn@debian.org\">%s</a> 負責編輯。"
-#~ msgid "Name:"
-#~ msgstr "姓名:"
+#~ msgid "Back to the <a href=\"./\">Debian speakers page</a>."
+#~ msgstr "返回 <a href=\"./\">Debian speakers page</a>."
#~ msgid "Email:"
#~ msgstr "Email:"
-#~ msgid "Previous Talks:"
-#~ msgstr "前一次演講:"
-
#~ msgid "Languages:"
#~ msgstr "語言:"
+#~ msgid "List of Speakers"
+#~ msgstr "演講者名單"
+
#~ msgid "Location:"
#~ msgstr "地點:"
-#~ msgid "Topics:"
-#~ msgstr "主題:"
-
-#~ msgid "List of Speakers"
-#~ msgstr "演講者名單"
+#~ msgid "Name:"
+#~ msgstr "姓名:"
-#~ msgid "Back to the <a href=\"./\">Debian speakers page</a>."
-#~ msgstr "返回 <a href=\"./\">Debian speakers page</a>."
+#~ msgid "Previous Talks:"
+#~ msgstr "前一次演講:"
#~ msgid ""
#~ "To receive this newsletter bi-weekly in your mailbox, <a href=\"https://"
@@ -504,3 +501,6 @@ msgstr ""
#~ msgstr ""
#~ "想每兩個星期都以電子郵件方式接收快訊嗎?請<a href=\"https://lists.debian."
#~ "org/debian-news/\">訂閱</a> debian-news 郵件列表。"
+
+#~ msgid "Topics:"
+#~ msgstr "主題:"
diff --git a/chinese/po/organization.zh.po b/chinese/po/organization.zh.po
index f464bdb805e..26a1d64b6ac 100644
--- a/chinese/po/organization.zh.po
+++ b/chinese/po/organization.zh.po
@@ -124,27 +124,27 @@ msgid "Distribution"
msgstr "發行版"
#: ../../english/intro/organization.data:72
-#: ../../english/intro/organization.data:203
+#: ../../english/intro/organization.data:204
msgid "Communication and Outreach"
msgstr ""
#: ../../english/intro/organization.data:74
-#: ../../english/intro/organization.data:206
+#: ../../english/intro/organization.data:207
msgid "Data Protection team"
msgstr "数据保护团队"
#: ../../english/intro/organization.data:75
-#: ../../english/intro/organization.data:211
+#: ../../english/intro/organization.data:212
msgid "Publicity team"
msgstr "宣传团队"
#: ../../english/intro/organization.data:77
-#: ../../english/intro/organization.data:284
+#: ../../english/intro/organization.data:279
msgid "Membership in other organizations"
msgstr ""
#: ../../english/intro/organization.data:78
-#: ../../english/intro/organization.data:312
+#: ../../english/intro/organization.data:305
msgid "Support and Infrastructure"
msgstr "支援以及下級組織"
@@ -196,186 +196,186 @@ msgstr "釋出管理"
msgid "Release Team"
msgstr "釋出團隊"
-#: ../../english/intro/organization.data:147
+#: ../../english/intro/organization.data:148
msgid "Quality Assurance"
msgstr "品質管理"
-#: ../../english/intro/organization.data:148
+#: ../../english/intro/organization.data:149
msgid "Installation System Team"
msgstr "安裝系統小組"
-#: ../../english/intro/organization.data:149
+#: ../../english/intro/organization.data:150
msgid "Debian Live Team"
msgstr ""
-#: ../../english/intro/organization.data:150
+#: ../../english/intro/organization.data:151
msgid "Release Notes"
msgstr "釋出公告"
-#: ../../english/intro/organization.data:152
+#: ../../english/intro/organization.data:153
#, fuzzy
#| msgid "CD Images"
msgid "CD/DVD/USB Images"
msgstr "光碟映像"
-#: ../../english/intro/organization.data:154
+#: ../../english/intro/organization.data:155
msgid "Production"
msgstr "產品"
-#: ../../english/intro/organization.data:161
+#: ../../english/intro/organization.data:162
msgid "Testing"
msgstr "測試"
-#: ../../english/intro/organization.data:163
+#: ../../english/intro/organization.data:164
msgid "Cloud Team"
msgstr "云服务团队"
-#: ../../english/intro/organization.data:167
+#: ../../english/intro/organization.data:168
msgid "Autobuilding infrastructure"
msgstr "自动构建架构"
-#: ../../english/intro/organization.data:169
+#: ../../english/intro/organization.data:170
msgid "Wanna-build team"
msgstr "Wanna-build 团队"
-#: ../../english/intro/organization.data:176
+#: ../../english/intro/organization.data:177
msgid "Buildd administration"
msgstr "Buildd 管理"
-#: ../../english/intro/organization.data:193
+#: ../../english/intro/organization.data:194
msgid "Documentation"
msgstr "文档"
-#: ../../english/intro/organization.data:198
+#: ../../english/intro/organization.data:199
msgid "Work-Needing and Prospective Packages list"
msgstr "需要幫助的套件清單"
-#: ../../english/intro/organization.data:214
+#: ../../english/intro/organization.data:215
msgid "Press Contact"
msgstr ""
-#: ../../english/intro/organization.data:216
+#: ../../english/intro/organization.data:217
msgid "Web Pages"
msgstr "網頁"
-#: ../../english/intro/organization.data:228
+#: ../../english/intro/organization.data:225
msgid "Planet Debian"
msgstr "Debian 星球"
-#: ../../english/intro/organization.data:233
+#: ../../english/intro/organization.data:230
msgid "Outreach"
msgstr ""
-#: ../../english/intro/organization.data:238
+#: ../../english/intro/organization.data:235
msgid "Debian Women Project"
msgstr "Debian Women 計劃"
-#: ../../english/intro/organization.data:246
+#: ../../english/intro/organization.data:243
msgid "Community"
msgstr ""
-#: ../../english/intro/organization.data:255
+#: ../../english/intro/organization.data:250
msgid ""
"To send a private message to all the members of the Community Team, use the "
"GPG key <a href=\"community-team-pubkey.txt"
"\">817DAE61E2FE4CA28E1B7762A89C4D0527C4C869</a>."
msgstr ""
-#: ../../english/intro/organization.data:257
+#: ../../english/intro/organization.data:252
msgid "Events"
msgstr "活動"
-#: ../../english/intro/organization.data:264
+#: ../../english/intro/organization.data:259
msgid "DebConf Committee"
msgstr "DebConf 委員會"
-#: ../../english/intro/organization.data:271
+#: ../../english/intro/organization.data:266
msgid "Partner Program"
msgstr "合作計劃"
-#: ../../english/intro/organization.data:275
+#: ../../english/intro/organization.data:270
msgid "Hardware Donations Coordination"
msgstr "硬體捐贈协调"
-#: ../../english/intro/organization.data:290
+#: ../../english/intro/organization.data:285
msgid "GNOME Foundation"
msgstr "GNOME 基金會"
-#: ../../english/intro/organization.data:292
+#: ../../english/intro/organization.data:287
msgid "Linux Professional Institute"
msgstr ""
-#: ../../english/intro/organization.data:294
+#: ../../english/intro/organization.data:288
msgid "Linux Magazine"
msgstr ""
-#: ../../english/intro/organization.data:296
+#: ../../english/intro/organization.data:290
msgid "Linux Standards Base"
msgstr ""
-#: ../../english/intro/organization.data:298
+#: ../../english/intro/organization.data:291
msgid "Free Standards Group"
msgstr ""
-#: ../../english/intro/organization.data:299
+#: ../../english/intro/organization.data:292
msgid "SchoolForge"
msgstr ""
-#: ../../english/intro/organization.data:302
+#: ../../english/intro/organization.data:295
msgid ""
"OASIS: Organization\n"
" for the Advancement of Structured Information Standards"
msgstr ""
-#: ../../english/intro/organization.data:305
+#: ../../english/intro/organization.data:298
msgid ""
"OVAL: Open Vulnerability\n"
" Assessment Language"
msgstr ""
-#: ../../english/intro/organization.data:308
+#: ../../english/intro/organization.data:301
msgid "Open Source Initiative"
msgstr ""
-#: ../../english/intro/organization.data:315
+#: ../../english/intro/organization.data:308
msgid "Bug Tracking System"
msgstr "錯誤追縱系統"
-#: ../../english/intro/organization.data:320
+#: ../../english/intro/organization.data:313
msgid "Mailing Lists Administration and Mailing List Archives"
msgstr "郵件列表管理與郵件列表庫存"
-#: ../../english/intro/organization.data:329
+#: ../../english/intro/organization.data:321
msgid "New Members Front Desk"
msgstr "新進開發人員前台"
-#: ../../english/intro/organization.data:335
+#: ../../english/intro/organization.data:327
msgid "Debian Account Managers"
msgstr "Debian 帳號管理員"
-#: ../../english/intro/organization.data:339
+#: ../../english/intro/organization.data:331
msgid ""
"To send a private message to all DAMs, use the GPG key "
"57731224A9762EA155AB2A530CA8D15BB24D96F2."
msgstr ""
-#: ../../english/intro/organization.data:340
+#: ../../english/intro/organization.data:332
msgid "Keyring Maintainers (PGP and GPG)"
msgstr "Keyring (PGP 與 GPG) 管理員"
-#: ../../english/intro/organization.data:344
+#: ../../english/intro/organization.data:336
msgid "Security Team"
msgstr "安全團隊"
-#: ../../english/intro/organization.data:355
+#: ../../english/intro/organization.data:347
msgid "Policy"
msgstr "政策"
-#: ../../english/intro/organization.data:358
+#: ../../english/intro/organization.data:350
msgid "System Administration"
msgstr "系統管理"
-#: ../../english/intro/organization.data:359
+#: ../../english/intro/organization.data:351
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."
@@ -383,7 +383,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:369
+#: ../../english/intro/organization.data:361
msgid ""
"If you have hardware problems with Debian machines, please see <a href="
"\"https://db.debian.org/machines.cgi\">Debian Machines</a> page, it should "
@@ -393,40 +393,43 @@ msgstr ""
"\"https://db.debian.org/machines.cgi\">Debian Machines</a> page,it should "
"contain per-machine administrator information."
-#: ../../english/intro/organization.data:370
+#: ../../english/intro/organization.data:362
msgid "LDAP Developer Directory Administrator"
msgstr "LDAP 開發人員目錄管理"
-#: ../../english/intro/organization.data:371
+#: ../../english/intro/organization.data:363
msgid "Mirrors"
msgstr "鏡像站台"
-#: ../../english/intro/organization.data:378
+#: ../../english/intro/organization.data:369
msgid "DNS Maintainer"
msgstr "DNS 管理"
-#: ../../english/intro/organization.data:379
+#: ../../english/intro/organization.data:370
msgid "Package Tracking System"
msgstr "套件追蹤系統"
-#: ../../english/intro/organization.data:381
+#: ../../english/intro/organization.data:372
msgid "Treasurer"
msgstr ""
-#: ../../english/intro/organization.data:388
+#: ../../english/intro/organization.data:379
msgid ""
"<a name=\"trademark\" href=\"m4_HOME/trademark\">Trademark</a> use requests"
msgstr ""
-#: ../../english/intro/organization.data:392
+#: ../../english/intro/organization.data:383
msgid "Salsa administrators"
msgstr "Salsa 管理员"
#~ msgid "Anti-harassment"
#~ msgstr "反骚扰"
-#~ msgid "User support"
-#~ msgstr "[CNHK:用戶:][TW:使用者:][HKTW:支援:][CN:支持:]"
+#~ msgid "CD Vendors Page"
+#~ msgstr "CD 廠商網頁"
+
+#~ msgid "Consultants Page"
+#~ msgstr "顧問網頁"
#~ msgid "Embedded systems"
#~ msgstr "嵌入式系統"
@@ -437,14 +440,11 @@ msgstr "Salsa 管理员"
#~ msgid "Laptops"
#~ msgstr "筆記型電腦"
-#~ msgid "Special Configurations"
-#~ msgstr "特別[CN:配置:][HKTW:組態設定:]"
-
#~ msgid "Ports"
#~ msgstr "移植"
-#~ msgid "CD Vendors Page"
-#~ msgstr "CD 廠商網頁"
+#~ msgid "Special Configurations"
+#~ msgstr "特別[CN:配置:][HKTW:組態設定:]"
-#~ msgid "Consultants Page"
-#~ msgstr "顧問網頁"
+#~ msgid "User support"
+#~ msgstr "[CNHK:用戶:][TW:使用者:][HKTW:支援:][CN:支持:]"
diff --git a/chinese/po/others.zh.po b/chinese/po/others.zh.po
index 6321e61cb77..c19747c74d6 100644
--- a/chinese/po/others.zh.po
+++ b/chinese/po/others.zh.po
@@ -251,143 +251,143 @@ msgstr "您是否认识其它位于技术团体中的女性?您能否给出名
msgid "A bit more about you..."
msgstr "关于您的更多信息..."
-#~ msgid "Wanted:"
-#~ msgstr "希望:"
-
-#~ msgid "Who:"
-#~ msgstr "誰:"
-
-#~ msgid "Architecture:"
-#~ msgstr "硬體架構:"
-
-#~ msgid "Specifications:"
-#~ msgstr "詳細資訊:"
+#~ msgid ""
+#~ "<total_consultant> Debian consultants listed in <total_country> countries "
+#~ "worldwide."
+#~ msgstr ""
+#~ "以下的名單中共有來自世界 <total_country> 個國家的 <total_consultant> 個 "
+#~ "Debian 顧問。"
-#~ msgid "Where:"
-#~ msgstr "地點:"
+#~ msgid "<void id=\"d-i\" />Unknown"
+#~ msgstr "<void id=\"d-i\" />未知"
-#~ msgid "Debian Technical Committee only"
-#~ msgstr "限於 Debian 技術委員會"
+#~ msgid "??"
+#~ msgstr "??"
-#~ msgid "deity developers only"
-#~ msgstr "限於 deity 開發者"
+#~ msgid "ALL"
+#~ msgstr "全部"
-#~ msgid "developers only"
-#~ msgstr "限於開發者"
+#~ msgid "Architecture:"
+#~ msgstr "硬體架構:"
-#~ msgid "closed"
-#~ msgstr "關閉"
+#~ msgid "BAD"
+#~ msgstr "不合格"
-#~ msgid "open"
-#~ msgstr "公開"
+#~ msgid "BAD?"
+#~ msgstr "不合格?"
-#~ msgid "Mailing List Unsubscription"
-#~ msgstr "取消訂閱郵件列表"
+#~ msgid "Booting"
+#~ msgstr "可開機"
-#~ msgid ""
-#~ "Please respect the <a href=\"./#ads\">Debian mailing list advertising "
-#~ "policy</a>."
-#~ msgstr "請尊重 <a href=\"./#ads\">Debian 郵件列表廣告政策</a>。"
+#~ msgid "Building"
+#~ msgstr "可以建置"
#~ msgid "Clear"
#~ msgstr "清除"
-#~ msgid "Your E-Mail address:"
-#~ msgstr "您的 E-Mail 地址:"
-
-#~ msgid "Mailing List Subscription"
-#~ msgstr "訂閱郵件列表"
+#~ msgid "Company:"
+#~ msgstr "公司:"
-#~ msgid ""
-#~ "<total_consultant> Debian consultants listed in <total_country> countries "
-#~ "worldwide."
-#~ msgstr ""
-#~ "以下的名單中共有來自世界 <total_country> 個國家的 <total_consultant> 個 "
-#~ "Debian 顧問。"
+#~ msgid "Debian Technical Committee only"
+#~ msgstr "限於 Debian 技術委員會"
-#~ msgid "Rates:"
-#~ msgstr "收費:"
+#~ msgid "Download"
+#~ msgstr "下載"
#~ msgid "Email:"
#~ msgstr "Email:"
-#~ msgid "or"
-#~ msgstr "或"
-
-#~ msgid "URL:"
-#~ msgstr "網址:"
+#~ msgid "Mailing List Subscription"
+#~ msgstr "訂閱郵件列表"
-#~ msgid "Company:"
-#~ msgstr "公司:"
+#~ msgid "Mailing List Unsubscription"
+#~ msgstr "取消訂閱郵件列表"
#~ msgid "Name:"
#~ msgstr "姓名:"
-#~ msgid "URL"
-#~ msgstr "網址"
+#~ msgid "No images"
+#~ msgstr "沒有映像檔"
-#~ msgid "Version"
-#~ msgstr "版本"
+#~ msgid "No kernel"
+#~ msgstr "沒有核心"
-#~ msgid "Status"
-#~ msgstr "狀況"
+#~ msgid "Not yet"
+#~ msgstr "尚未"
-#~ msgid "Package"
-#~ msgstr "軟件套件"
+#~ msgid "OK"
+#~ msgstr "合格"
-#~ msgid "ALL"
-#~ msgstr "全部"
+#~ msgid "OK?"
+#~ msgstr "合格?"
-#~ msgid "Unknown"
-#~ msgstr "[CN:未知:][HKTW:不詳:]"
+#~ msgid "Old banner ads"
+#~ msgstr "舊的橫幅廣告"
-#~ msgid "??"
-#~ msgstr "??"
+#~ msgid "Package"
+#~ msgstr "軟件套件"
-#~ msgid "BAD?"
-#~ msgstr "不合格?"
+#~ msgid ""
+#~ "Please respect the <a href=\"./#ads\">Debian mailing list advertising "
+#~ "policy</a>."
+#~ msgstr "請尊重 <a href=\"./#ads\">Debian 郵件列表廣告政策</a>。"
-#~ msgid "OK?"
-#~ msgstr "合格?"
+#~ msgid "Rates:"
+#~ msgstr "收費:"
-#~ msgid "BAD"
-#~ msgstr "不合格"
+#~ msgid "Specifications:"
+#~ msgstr "詳細資訊:"
-#~ msgid "OK"
-#~ msgstr "合格"
+#~ msgid "Status"
+#~ msgstr "狀況"
-#~ msgid "Old banner ads"
-#~ msgstr "舊的橫幅廣告"
+#~ msgid "URL"
+#~ msgstr "網址"
-#~ msgid "Download"
-#~ msgstr "下載"
+#~ msgid "URL:"
+#~ msgstr "網址:"
#~ msgid "Unavailable"
#~ msgstr "未提供"
-#~ msgid "<void id=\"d-i\" />Unknown"
-#~ msgstr "<void id=\"d-i\" />未知"
+#~ msgid "Unknown"
+#~ msgstr "[CN:未知:][HKTW:不詳:]"
-#~ msgid "No images"
-#~ msgstr "沒有映像檔"
+#~ msgid "Version"
+#~ msgstr "版本"
-#~ msgid "No kernel"
-#~ msgstr "沒有核心"
+#~ msgid "Wanted:"
+#~ msgstr "希望:"
-#~ msgid "Not yet"
-#~ msgstr "尚未"
+#~ msgid "Where:"
+#~ msgstr "地點:"
-#~ msgid "Building"
-#~ msgstr "可以建置"
+#~ msgid "Who:"
+#~ msgstr "誰:"
-#~ msgid "Booting"
-#~ msgstr "可開機"
+#~ msgid "Working"
+#~ msgstr "可用的"
-#~ msgid "sarge (broken)"
-#~ msgstr "sarge (損毀)"
+#~ msgid "Your E-Mail address:"
+#~ msgstr "您的 E-Mail 地址:"
+
+#~ msgid "closed"
+#~ msgstr "關閉"
+
+#~ msgid "deity developers only"
+#~ msgstr "限於 deity 開發者"
+
+#~ msgid "developers only"
+#~ msgstr "限於開發者"
+
+#~ msgid "open"
+#~ msgstr "公開"
+
+#~ msgid "or"
+#~ msgstr "或"
#~ msgid "sarge"
#~ msgstr "sarge"
-#~ msgid "Working"
-#~ msgstr "可用的"
+#~ msgid "sarge (broken)"
+#~ msgstr "sarge (損毀)"
diff --git a/chinese/po/partners.zh.po b/chinese/po/partners.zh.po
index 552cb833d2a..2693936b607 100644
--- a/chinese/po/partners.zh.po
+++ b/chinese/po/partners.zh.po
@@ -320,24 +320,7 @@ msgid ""
"environment."
msgstr ""
-#: ../../english/partners/partners.def:214
-msgid ""
-"<a href=\"https://www.stackpath.com/?utm_campaign=Partner%20Display&amp;"
-"utm_source=Partner%20Display&amp;utm_medium=Debian\">StackPath</a> provides "
-"Debian with content delivery network (CDN) services, allowing high "
-"availability of services like <a href=\"https://security-tracker.debian.org/"
-"\">the Security Bug Tracker</a> and <a href=\"https://planet.debian.org/"
-"\">Planet Debian</a>."
-msgstr ""
-
-#: ../../english/partners/partners.def:217
-msgid ""
-"StackPath is a platform of secure edge services that enables developers to "
-"protect, accelerate, and innovate cloud properties ranging from websites to "
-"media delivery and IoT services."
-msgstr ""
-
-#: ../../english/partners/partners.def:223
+#: ../../english/partners/partners.def:213
msgid ""
"<a href=\"http://www.thomas-krenn.com\">Thomas Krenn</a> has provided a new "
"high-end server for the Debian cdbuilder service. In addition, Thomas Krenn "
@@ -347,7 +330,7 @@ msgid ""
"thomas-krenn.com/linux</a>."
msgstr ""
-#: ../../english/partners/partners.def:226
+#: ../../english/partners/partners.def:216
msgid ""
"<a href=\"http://www.thomas-krenn.com\">Thomas Krenn</a> is Europe's leading "
"online shop for server systems and high-quality hosting. They offer rack-"
@@ -357,7 +340,7 @@ msgid ""
"course they support Debian as operating system on their servers!"
msgstr ""
-#: ../../english/partners/partners.def:232
+#: ../../english/partners/partners.def:222
msgid ""
"<a href=\"http://www.trustsec.de/\">trustsec</a> pays two Debian developers "
"to work on the S/390 port of Debian and packages mainly related to Java. "
@@ -366,7 +349,7 @@ msgid ""
"for LinuxTag 2001 in Stuttgart."
msgstr ""
-#: ../../english/partners/partners.def:235
+#: ../../english/partners/partners.def:225
msgid ""
"trustsec offers customer support, consulting and training for Debian on the "
"Intel PC architecture (i386), PowerPC and IBM S/390 and is specialized on "
@@ -374,7 +357,7 @@ msgid ""
"\"mailto:info@trustsec.de\">info@trustsec.de</a> for more information."
msgstr ""
-#: ../../english/partners/partners.def:243
+#: ../../english/partners/partners.def:233
msgid ""
"The <a href=\"https://www.sanger.ac.uk/\">Wellcome Sanger Institute</a> "
"provides infrastructure for the <a href=\"https://snapshot.debian.org/"
@@ -384,7 +367,7 @@ msgid ""
"increasing the amount of snapshot storage provided."
msgstr ""
-#: ../../english/partners/partners.def:246
+#: ../../english/partners/partners.def:236
msgid ""
"The Wellcome Sanger Institute is one of the world's leading genome centres. "
"Through its ability to conduct research at scale, it is able to engage in "
@@ -395,14 +378,14 @@ msgid ""
"treatments for human disease."
msgstr ""
-#: ../../english/partners/partners.def:256
+#: ../../english/partners/partners.def:246
msgid ""
"<A HREF=\"http://www.brainfood.com/\">Brainfood</A> (previously called "
"Novare) provides several machines to Debian, as well as hosting and server "
"administration services."
msgstr ""
-#: ../../english/partners/partners.def:259
+#: ../../english/partners/partners.def:249
msgid ""
"Brainfood is a technology solutions company whose goal is to work to produce "
"an ideal result for a specific need, whether it's a website or an ongoing, "
@@ -411,7 +394,7 @@ msgid ""
"\">debian-contact@brainfood.com</A>."
msgstr ""
-#: ../../english/partners/partners.def:266
+#: ../../english/partners/partners.def:256
msgid ""
"<a href=\"http://www.hp.com/\">Hewlett-Packard</a> has provided hardware for "
"port development, Debian mirrors, and other Debian services (current HP "
@@ -421,7 +404,7 @@ msgid ""
"com/products1/linux/\">HP Linux</a>."
msgstr ""
-#: ../../english/partners/partners.def:269
+#: ../../english/partners/partners.def:259
msgid ""
"Hewlett-Packard is one of the largest computer companies in the world, "
"providing a wide range of products and services, such as servers, PCs, "
@@ -429,7 +412,7 @@ msgid ""
"solutions, etc."
msgstr ""
-#: ../../english/partners/partners.def:276
+#: ../../english/partners/partners.def:266
msgid ""
"<A HREF=\"http://www.linuxcentral.com/\">Linux Central</A> provides us with "
"Debian GNU/Linux CD-ROM sets for trade show type events. These CD's help to "
@@ -437,7 +420,7 @@ msgid ""
"current users."
msgstr ""
-#: ../../english/partners/partners.def:280
+#: ../../english/partners/partners.def:270
msgid ""
"Linux Central sells all the latest releases of Linux products such as "
"commercial software, books, hardware, and versions of major Linux "
@@ -447,14 +430,14 @@ msgid ""
"contact <A HREF=\"mailto:sales@linuxcentral.com\">sales@linuxcentral.com</A>."
msgstr ""
-#: ../../english/partners/partners.def:287
+#: ../../english/partners/partners.def:277
msgid ""
"<a href=\"http://www.mythic-beasts.com\">Mythic Beasts Ltd.</a> supports "
"Debian (and SPI Inc) by providing domain registration facilities.</p><p>They "
"are a UK based web hosting, domain registration and co-location company."
msgstr ""
-#: ../../english/partners/partners.def:294
+#: ../../english/partners/partners.def:284
msgid ""
"San Francisco based <a href=\"http://www.nostarch.com/\">No Starch Press</"
"a>, publisher of \"The Finest in Geek Entertainment,\" is co-publisher of "
@@ -465,7 +448,7 @@ msgid ""
"copy of The Debian System to the Debian Project."
msgstr ""
-#: ../../english/partners/partners.def:301
+#: ../../english/partners/partners.def:291
msgid ""
"<a href=\"http://www.opensourcepress.de/\">Open Source Press</a> is the "
"Munich-based publisher of the book <a href=\"http://debiansystem.info/\">The "
@@ -473,7 +456,7 @@ msgid ""
"donate 1&euro; to the Debian Project."
msgstr ""
-#: ../../english/partners/partners.def:304
+#: ../../english/partners/partners.def:294
msgid ""
"Open Source Press specialises on books around Linux and Open Source "
"Software, written by authors with considerable experience in the fields, and "
@@ -481,7 +464,7 @@ msgid ""
"Source Press publications are renowned for their quality and depth."
msgstr ""
-#: ../../english/partners/partners.def:312
+#: ../../english/partners/partners.def:302
msgid ""
"<a href=\"http://www.rapidswitch.com/\">RapidSwitch</a> (formely Black Cat "
"Networks) is a UK ISP specialising in dedicated hosting. It provides "
@@ -489,13 +472,13 @@ msgid ""
"virtual servers."
msgstr ""
-#: ../../english/partners/partners.def:315
+#: ../../english/partners/partners.def:305
msgid ""
"It hosts a Debian development machine, <a href=\"https://db.debian.org/"
"machines.cgi?host=caballero\">caballero</a>."
msgstr ""
-#: ../../english/partners/partners.def:323
+#: ../../english/partners/partners.def:313
msgid ""
"<a href=\"http://www.simtec.co.uk\">Simtec</a> has provided several ARM "
"machines which make up the bulk of the Debian ARM infrastructure. In "
@@ -503,7 +486,7 @@ msgid ""
"ARM port."
msgstr ""
-#: ../../english/partners/partners.def:326
+#: ../../english/partners/partners.def:316
msgid ""
"Simtec is a leading provider of ARM based computing products. We have a "
"range of <a href=\"http://www.simtec.co.uk/products/boards.html\">boards</a> "
@@ -514,21 +497,38 @@ msgid ""
"operating systems."
msgstr ""
-#: ../../english/partners/partners.def:334
+#: ../../english/partners/partners.def:325
+msgid ""
+"<a href=\"https://www.stackpath.com/?utm_campaign=Partner%20Display&amp;"
+"utm_source=Partner%20Display&amp;utm_medium=Debian\">StackPath</a> provides "
+"Debian with content delivery network (CDN) services, allowing high "
+"availability of services like <a href=\"https://security-tracker.debian.org/"
+"\">the Security Bug Tracker</a> and <a href=\"https://planet.debian.org/"
+"\">Planet Debian</a>."
+msgstr ""
+
+#: ../../english/partners/partners.def:328
+msgid ""
+"StackPath is a platform of secure edge services that enables developers to "
+"protect, accelerate, and innovate cloud properties ranging from websites to "
+"media delivery and IoT services."
+msgstr ""
+
+#: ../../english/partners/partners.def:336
msgid ""
"<a href=\"http://www.telegraaf.nl/\">Telegraaf Media ICT BV</a> is "
"supporting the Debian community by donating hardware, rackspace and "
"bandwidth for the Debian server hosting alioth, arch and svn."
msgstr ""
-#: ../../english/partners/partners.def:337
+#: ../../english/partners/partners.def:339
msgid ""
"Telegraaf Media ICT BV is running its internet infrastructure (appx. 200 "
"Intel based servers) mainly based on Debian GNU/Linux servers; the sysadmins "
"are highly motivated Debian users and some of them also Debian maintainers."
msgstr ""
-#: ../../english/partners/partners.def:340
+#: ../../english/partners/partners.def:342
msgid ""
"Telegraaf Media Group runs some of the most popular Dutch websites (http://"
"www.telegraaf.nl, http://www.speurders.nl and http://www.dft.nl) as well as "
diff --git a/chinese/po/ports.zh.po b/chinese/po/ports.zh.po
index 279e8d38c17..21c74ed98cc 100644
--- a/chinese/po/ports.zh.po
+++ b/chinese/po/ports.zh.po
@@ -116,11 +116,20 @@ msgstr "給 PowerPC 用的 Debian"
msgid "Debian for Sparc"
msgstr "給 Sparc 用的 Debian"
-#~ msgid "Debian for Sparc64"
-#~ msgstr "給 Sparc64 用的 Debian"
+#~ msgid "Debian GNU/FreeBSD"
+#~ msgstr "Debian GNU/FreeBSD"
-#~ msgid "Debian for S/390"
-#~ msgstr "給 S/390 用的 Debian"
+#~ msgid "Debian for AMD64"
+#~ msgstr "給 AMD64 用的 Debian"
+
+#~ msgid "Debian for ARM"
+#~ msgstr "給 ARM 用的 Debian"
+
+#~ msgid "Debian for Beowulf"
+#~ msgstr "給 Beowulf 用的 Debian"
+
+#~ msgid "Debian for Laptops"
+#~ msgstr "給筆記型電腦用的 Debian"
#~ msgid "Debian for MIPS"
#~ msgstr "給 MIPS 用的 Debian"
@@ -128,20 +137,11 @@ msgstr "給 Sparc 用的 Debian"
#~ msgid "Debian for Motorola 680x0"
#~ msgstr "給 Motorola 680x0 用的 Debian"
-#~ msgid "Debian GNU/FreeBSD"
-#~ msgstr "Debian GNU/FreeBSD"
+#~ msgid "Debian for S/390"
+#~ msgstr "給 S/390 用的 Debian"
+
+#~ msgid "Debian for Sparc64"
+#~ msgstr "給 Sparc64 用的 Debian"
#~ msgid "Main"
#~ msgstr "主要"
-
-#~ msgid "Debian for Beowulf"
-#~ msgstr "給 Beowulf 用的 Debian"
-
-#~ msgid "Debian for ARM"
-#~ msgstr "給 ARM 用的 Debian"
-
-#~ msgid "Debian for AMD64"
-#~ msgstr "給 AMD64 用的 Debian"
-
-#~ msgid "Debian for Laptops"
-#~ msgstr "給筆記型電腦用的 Debian"
diff --git a/chinese/po/stats.zh.po b/chinese/po/stats.zh.po
index f2fe657e925..ca605d23bbc 100644
--- a/chinese/po/stats.zh.po
+++ b/chinese/po/stats.zh.po
@@ -231,17 +231,17 @@ msgstr "已翻譯網頁(按[CN:文件:][HKTW:檔案:]大小)"
msgid "Translation Statistics by Page Size"
msgstr "翻譯統計,按頁面大小"
-#~ msgid "Origin"
-#~ msgstr "原文"
-
-#~ msgid "Created with"
-#~ msgstr "此網頁創建工具:"
+#~ msgid "Colored diff"
+#~ msgstr "带颜色差异"
#~ msgid "Commit diff"
#~ msgstr "提交差异"
-#~ msgid "Colored diff"
-#~ msgstr "带颜色差异"
+#~ msgid "Created with"
+#~ msgstr "此網頁創建工具:"
+
+#~ msgid "Origin"
+#~ msgstr "原文"
#~ msgid "Unified diff"
#~ msgstr "合并差异"
diff --git a/chinese/po/templates.zh.po b/chinese/po/templates.zh.po
index 4715bc0082b..085b6f5712d 100644
--- a/chinese/po/templates.zh.po
+++ b/chinese/po/templates.zh.po
@@ -454,7 +454,9 @@ msgid "Debian-Edu project"
msgstr "Debian-Edu 計劃"
#: ../../english/template/debian/links.tags.wml:137
-msgid "Alioth &ndash; Debian GForge"
+#, fuzzy
+#| msgid "Alioth &ndash; Debian GForge"
+msgid "Salsa &ndash; Debian Gitlab"
msgstr "Alioth &ndash; Debian GForge"
#: ../../english/template/debian/links.tags.wml:140
@@ -559,59 +561,43 @@ msgstr "網址"
msgid "Back to the <a href=\"../\">Who's using Debian? page</a>."
msgstr "返回<a href=\"./\">谁在使用 Debian?页面</a>。"
-#~ msgid "Visit the site sponsor"
-#~ msgstr "[CN:訪問:][HKTW:拜訪:]本站贊助商"
-
-#~ msgid "Select a server near you"
-#~ msgstr "請[CN:就近選擇服務器:][HKTW:選擇就近的伺服器:]"
-
-#~ msgid "More information:"
-#~ msgstr "更多訊息:"
-
-#~ msgid "Taken by:"
-#~ msgstr "認領:"
-
-#~ msgid "Nobody"
-#~ msgstr "沒有人"
-
-#~ msgid "Rating:"
-#~ msgstr "評分:"
-
-#~ msgid "More information"
-#~ msgstr "更詳盡的[CN:信息:][HKTW:資訊:]"
-
-#~ msgid "Where"
-#~ msgstr "Where(何處*)"
-
-#~ msgid "More Info"
-#~ msgstr "更多[CN:信息:][HKTW:資訊:]"
+#~ msgid "<a href=\"../../\">Back issues</a> of this newsletter are available."
+#~ msgstr "您亦可翻閱<a href=\"../../\">過往的報導</a>。"
#~ msgid "<th>Project</th><th>Coordinator</th>"
#~ msgstr "<th>計劃</th><th>Coordinator</th>"
-#~ msgid "Related Links"
-#~ msgstr "相關網址"
-
-#~ msgid "Latest News"
-#~ msgstr "最新消息"
+#, fuzzy
+#~ msgid ""
+#~ "<void id=\"plural\" />Debian Project News is edited by <a href=\"mailto:"
+#~ "debian-publicity@lists.debian.org\">%s</a>."
+#~ msgstr ""
+#~ "Debian 每周快訊 (Debian Weekly News) 由 <a href=\"mailto:dwn@debian.org"
+#~ "\">Joey Hess</a> 負責編輯。"
#, fuzzy
#~ msgid ""
-#~ "Back to: other <a href=\"./\">Debian news</a> || <a href=\"m4_HOME/"
-#~ "\">Debian Project homepage</a>."
-#~ msgstr "返回 <a href=\"m4_HOME/\">Debian 計劃主頁</a>"
+#~ "<void id=\"plural\" />Debian Weekly News is edited by <a href=\"mailto:"
+#~ "dwn@debian.org\">%s</a>."
+#~ msgstr ""
+#~ "Debian 每周快訊 (Debian Weekly News) 由 <a href=\"mailto:dwn@debian.org"
+#~ "\">Joey Hess</a> 負責編輯。"
#, fuzzy
#~ msgid ""
-#~ "To receive this newsletter bi-weekly in your mailbox, <a href=\"http://"
-#~ "lists.debian.org/debian-news/\">subscribe to the debian-news mailing "
-#~ "list</a>."
+#~ "<void id=\"plural\" />This issue of Debian Project News was edited by <a "
+#~ "href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
#~ msgstr ""
-#~ "想每個星期都以電子郵件方式接收「每週快訊」嗎?請<a href=\"m4_HOME/"
-#~ "MailingLists/subscribe#debian-news\">訂閱</a> debian-news 郵件列表。"
+#~ "Debian 每周快訊 (Debian Weekly News) 由 <a href=\"mailto:dwn@debian.org"
+#~ "\">Joey Hess</a> 負責編輯。"
-#~ msgid "<a href=\"../../\">Back issues</a> of this newsletter are available."
-#~ msgstr "您亦可翻閱<a href=\"../../\">過往的報導</a>。"
+#, fuzzy
+#~ msgid ""
+#~ "<void id=\"plural\" />This issue of Debian Weekly News was edited by <a "
+#~ "href=\"mailto:dwn@debian.org\">%s</a>."
+#~ msgstr ""
+#~ "Debian 每周快訊 (Debian Weekly News) 由 <a href=\"mailto:dwn@debian.org"
+#~ "\">Joey Hess</a> 負責編輯。"
#, fuzzy
#~ msgid ""
@@ -623,8 +609,8 @@ msgstr "返回<a href=\"./\">谁在使用 Debian?页面</a>。"
#, fuzzy
#~ msgid ""
-#~ "<void id=\"plural\" />Debian Project News is edited by <a href=\"mailto:"
-#~ "debian-publicity@lists.debian.org\">%s</a>."
+#~ "<void id=\"singular\" />Debian Weekly News is edited by <a href=\"mailto:"
+#~ "dwn@debian.org\">%s</a>."
#~ msgstr ""
#~ "Debian 每周快訊 (Debian Weekly News) 由 <a href=\"mailto:dwn@debian.org"
#~ "\">Joey Hess</a> 負責編輯。"
@@ -639,81 +625,134 @@ msgstr "返回<a href=\"./\">谁在使用 Debian?页面</a>。"
#, fuzzy
#~ msgid ""
-#~ "<void id=\"plural\" />This issue of Debian Project News was edited by <a "
-#~ "href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
+#~ "<void id=\"singular\" />This issue of Debian Weekly News was edited by <a "
+#~ "href=\"mailto:dwn@debian.org\">%s</a>."
#~ msgstr ""
#~ "Debian 每周快訊 (Debian Weekly News) 由 <a href=\"mailto:dwn@debian.org"
#~ "\">Joey Hess</a> 負責編輯。"
+#~ msgid "Amend&nbsp;a&nbsp;Proposal"
+#~ msgstr "修正議案"
+
+#~ msgid "Back to the <a href=\"./\">Debian consultants page</a>."
+#~ msgstr "返回 <a href=\"./\">Debian consultants page</a>."
+
#, fuzzy
#~ msgid "Back to the <a href=\"./\">Debian speakers page</a>."
#~ msgstr "返回 <a href=\"./\">Debian consultants page</a>."
#, fuzzy
#~ msgid ""
-#~ "To receive this newsletter weekly in your mailbox, <a href=\"http://lists."
-#~ "debian.org/debian-news/\">subscribe to the debian-news mailing list</a>."
-#~ msgstr ""
-#~ "想每個星期都以電子郵件方式接收「每週快訊」嗎?請<a href=\"m4_HOME/"
-#~ "MailingLists/subscribe#debian-news\">訂閱</a> debian-news 郵件列表。"
+#~ "Back to: other <a href=\"./\">Debian news</a> || <a href=\"m4_HOME/"
+#~ "\">Debian Project homepage</a>."
+#~ msgstr "返回 <a href=\"m4_HOME/\">Debian 計劃主頁</a>"
#, fuzzy
+#~ msgid "Debate"
+#~ msgstr "<span lang=\"en\">Debian </span>光碟小組"
+
+#~ msgid "Debian CD team"
+#~ msgstr "<span lang=\"en\">Debian </span>光碟小組"
+
#~ msgid ""
-#~ "<void id=\"singular\" />Debian Weekly News is edited by <a href=\"mailto:"
-#~ "dwn@debian.org\">%s</a>."
+#~ "Debian Weekly News is edited by <a href=\"mailto:dwn@debian.org\">Joe "
+#~ "'Zonker' Brockmeier, Jean-Christophe Helary and Tollef Fog Heen</a>."
#~ msgstr ""
-#~ "Debian 每周快訊 (Debian Weekly News) 由 <a href=\"mailto:dwn@debian.org"
-#~ "\">Joey Hess</a> 負責編輯。"
+#~ "Debian 每週快訊 (Debian Weekly News) 由 <a href=\"mailto:dwn@debian.org"
+#~ "\">Joe 'Zonker' Brockmeier, Jean-Christophe Helary 和 Tollef Fog Heen</a> "
+#~ "負責編輯。"
-#, fuzzy
#~ msgid ""
-#~ "<void id=\"plural\" />Debian Weekly News is edited by <a href=\"mailto:"
-#~ "dwn@debian.org\">%s</a>."
+#~ "Debian Weekly News is edited by <a href=\"mailto:dwn@debian.org\">Martin "
+#~ "'Joey' Schulze</a>."
#~ msgstr ""
#~ "Debian 每周快訊 (Debian Weekly News) 由 <a href=\"mailto:dwn@debian.org"
-#~ "\">Joey Hess</a> 負責編輯。"
+#~ "\">Martin 'Joey' Schulze</a> 負責編輯。"
-#, fuzzy
#~ msgid ""
-#~ "<void id=\"singular\" />This issue of Debian Weekly News was edited by <a "
-#~ "href=\"mailto:dwn@debian.org\">%s</a>."
+#~ "Debian Weekly News is edited by <a href=\"mailto:dwn@debian.org"
+#~ "\">Yooseong Yang and Martin 'Joey' Schulze</a>."
#~ msgstr ""
-#~ "Debian 每周快訊 (Debian Weekly News) 由 <a href=\"mailto:dwn@debian.org"
-#~ "\">Joey Hess</a> 負責編輯。"
+#~ "Debian 每週快訊 (Debian Weekly News) 由 <a href=\"mailto:dwn@debian.org"
+#~ "\">Yooseong Yang 和 Martin 'Joey' Schulze</a> 負責編輯。"
+
+#~ msgid "Decided"
+#~ msgstr "已決定"
#, fuzzy
-#~ msgid ""
-#~ "<void id=\"plural\" />This issue of Debian Weekly News was edited by <a "
-#~ "href=\"mailto:dwn@debian.org\">%s</a>."
-#~ msgstr ""
-#~ "Debian 每周快訊 (Debian Weekly News) 由 <a href=\"mailto:dwn@debian.org"
-#~ "\">Joey Hess</a> 負責編輯。"
+#~ msgid "Discussion"
+#~ msgstr "討論中"
#, fuzzy
-#~ msgid "No requests for adoption"
-#~ msgstr "更詳盡的[CN:信息:][HKTW:資訊:]"
+#~ msgid "Download via HTTP/FTP"
+#~ msgstr "透過 http/ftp 下載"
#, fuzzy
-#~ msgid "No Requested packages"
-#~ msgstr "受影響的軟件"
+#~ msgid "Download with Jigdo"
+#~ msgstr "用 jigdo 下載"
+
+#~ msgid "Fixed in"
+#~ msgstr "修改於"
+
+#~ msgid "Follow&nbsp;a&nbsp;Proposal"
+#~ msgstr "跟隨議案的進展"
+
+#~ msgid "Home&nbsp;Vote&nbsp;Page"
+#~ msgstr "投票主頁"
+
+#~ msgid "In&nbsp;Discussion"
+#~ msgstr "討論中"
+
+#~ msgid "Latest News"
+#~ msgstr "最新消息"
#, fuzzy
#~ msgid "License Information"
#~ msgstr "更詳盡的[CN:信息:][HKTW:資訊:]"
#, fuzzy
-#~ msgid "Discussion"
+#~ msgid "Minimum Discussion"
#~ msgstr "討論中"
+#~ msgid "More Info"
+#~ msgstr "更多[CN:信息:][HKTW:資訊:]"
+
+#~ msgid "More information"
+#~ msgstr "更詳盡的[CN:信息:][HKTW:資訊:]"
+
+#~ msgid "More information:"
+#~ msgstr "更多訊息:"
+
#, fuzzy
-#~ msgid "non-free"
-#~ msgstr "無"
+#~ msgid "Network Install"
+#~ msgstr "網絡安裝"
-#~ msgid "buy pre-made images"
-#~ msgstr "購買預製映像"
+#, fuzzy
+#~ msgid "No Requested packages"
+#~ msgstr "受影響的軟件"
-#~ msgid "download with pik"
-#~ msgstr "用 pik 下載"
+#, fuzzy
+#~ msgid "No requests for adoption"
+#~ msgstr "更詳盡的[CN:信息:][HKTW:資訊:]"
+
+#~ msgid "Nobody"
+#~ msgstr "沒有人"
+
+#, fuzzy
+#~ msgid "Nominations"
+#~ msgstr "捐款"
+
+#~ msgid "Other"
+#~ msgstr "其他"
+
+#~ msgid "Rating:"
+#~ msgstr "評分:"
+
+#~ msgid "Read&nbsp;a&nbsp;Result"
+#~ msgstr "查看結果"
+
+#~ msgid "Related Links"
+#~ msgstr "相關網址"
#~ msgid ""
#~ "See the Debian <a href=\"m4_HOME/contact\">contact page</a> for "
@@ -722,78 +761,55 @@ msgstr "返回<a href=\"./\">谁在使用 Debian?页面</a>。"
#~ "請參閱<a href=\"m4_HOME/contact\">聯繫方法</a>與我們[CN:取得聯繫:][HKTW:聯"
#~ "絡:]。"
-#~ msgid "Vulnerable"
-#~ msgstr "可被襲擊"
+#~ msgid "Select a server near you"
+#~ msgstr "請[CN:就近選擇服務器:][HKTW:選擇就近的伺服器:]"
-#~ msgid "Fixed in"
-#~ msgstr "修改於"
+#~ msgid "Submit&nbsp;a&nbsp;Proposal"
+#~ msgstr "提出議案"
-#~ msgid ""
-#~ "Debian Weekly News is edited by <a href=\"mailto:dwn@debian.org\">Joe "
-#~ "'Zonker' Brockmeier, Jean-Christophe Helary and Tollef Fog Heen</a>."
-#~ msgstr ""
-#~ "Debian 每週快訊 (Debian Weekly News) 由 <a href=\"mailto:dwn@debian.org"
-#~ "\">Joe 'Zonker' Brockmeier, Jean-Christophe Helary 和 Tollef Fog Heen</a> "
-#~ "負責編輯。"
+#~ msgid "Taken by:"
+#~ msgstr "認領:"
+#, fuzzy
#~ msgid ""
-#~ "Debian Weekly News is edited by <a href=\"mailto:dwn@debian.org"
-#~ "\">Yooseong Yang and Martin 'Joey' Schulze</a>."
+#~ "To receive this newsletter bi-weekly in your mailbox, <a href=\"http://"
+#~ "lists.debian.org/debian-news/\">subscribe to the debian-news mailing "
+#~ "list</a>."
#~ msgstr ""
-#~ "Debian 每週快訊 (Debian Weekly News) 由 <a href=\"mailto:dwn@debian.org"
-#~ "\">Yooseong Yang 和 Martin 'Joey' Schulze</a> 負責編輯。"
+#~ "想每個星期都以電子郵件方式接收「每週快訊」嗎?請<a href=\"m4_HOME/"
+#~ "MailingLists/subscribe#debian-news\">訂閱</a> debian-news 郵件列表。"
+#, fuzzy
#~ msgid ""
-#~ "Debian Weekly News is edited by <a href=\"mailto:dwn@debian.org\">Martin "
-#~ "'Joey' Schulze</a>."
+#~ "To receive this newsletter weekly in your mailbox, <a href=\"http://lists."
+#~ "debian.org/debian-news/\">subscribe to the debian-news mailing list</a>."
#~ msgstr ""
-#~ "Debian 每周快訊 (Debian Weekly News) 由 <a href=\"mailto:dwn@debian.org"
-#~ "\">Martin 'Joey' Schulze</a> 負責編輯。"
+#~ "想每個星期都以電子郵件方式接收「每週快訊」嗎?請<a href=\"m4_HOME/"
+#~ "MailingLists/subscribe#debian-news\">訂閱</a> debian-news 郵件列表。"
+
+#~ msgid "Visit the site sponsor"
+#~ msgstr "[CN:訪問:][HKTW:拜訪:]本站贊助商"
#~ msgid "Vote"
#~ msgstr "投票"
-#~ msgid "Read&nbsp;a&nbsp;Result"
-#~ msgstr "查看結果"
-
-#~ msgid "Follow&nbsp;a&nbsp;Proposal"
-#~ msgstr "跟隨議案的進展"
-
-#~ msgid "Amend&nbsp;a&nbsp;Proposal"
-#~ msgstr "修正議案"
-
-#~ msgid "Submit&nbsp;a&nbsp;Proposal"
-#~ msgstr "提出議案"
-
-#~ msgid "Home&nbsp;Vote&nbsp;Page"
-#~ msgstr "投票主頁"
-
-#~ msgid "Other"
-#~ msgstr "其他"
-
-#~ msgid "Decided"
-#~ msgstr "已決定"
-
#~ msgid "Voting&nbsp;Open"
#~ msgstr "接受投票中"
-#~ msgid "In&nbsp;Discussion"
-#~ msgstr "討論中"
+#~ msgid "Vulnerable"
+#~ msgstr "可被襲擊"
#~ msgid "Waiting&nbsp;for&nbsp;Sponsors"
#~ msgstr "有待贊助"
-#, fuzzy
-#~ msgid "Minimum Discussion"
-#~ msgstr "討論中"
+#~ msgid "Where"
+#~ msgstr "Where(何處*)"
-#, fuzzy
-#~ msgid "Debate"
-#~ msgstr "<span lang=\"en\">Debian </span>光碟小組"
+#~ msgid "buy pre-made images"
+#~ msgstr "購買預製映像"
-#, fuzzy
-#~ msgid "Nominations"
-#~ msgstr "捐款"
+#~ msgid "download with pik"
+#~ msgstr "用 pik 下載"
#~ msgid "http_ftp"
#~ msgstr "http_ftp"
@@ -801,20 +817,6 @@ msgstr "返回<a href=\"./\">谁在使用 Debian?页面</a>。"
#~ msgid "jigdo"
#~ msgstr "jigdo"
-#~ msgid "Debian CD team"
-#~ msgstr "<span lang=\"en\">Debian </span>光碟小組"
-
-#, fuzzy
-#~ msgid "Network Install"
-#~ msgstr "網絡安裝"
-
-#, fuzzy
-#~ msgid "Download via HTTP/FTP"
-#~ msgstr "透過 http/ftp 下載"
-
#, fuzzy
-#~ msgid "Download with Jigdo"
-#~ msgstr "用 jigdo 下載"
-
-#~ msgid "Back to the <a href=\"./\">Debian consultants page</a>."
-#~ msgstr "返回 <a href=\"./\">Debian consultants page</a>."
+#~ msgid "non-free"
+#~ msgstr "無"
diff --git a/chinese/po/vendors.zh.po b/chinese/po/vendors.zh.po
index 6cd168bccb9..11ea95b18e2 100644
--- a/chinese/po/vendors.zh.po
+++ b/chinese/po/vendors.zh.po
@@ -68,32 +68,29 @@ msgstr "源碼"
msgid "and"
msgstr "和"
-#~ msgid "Vendor:"
-#~ msgstr "銷售商:"
-
-#~ msgid "URL for Debian Page:"
-#~ msgstr "為 Debian 而設的網址:"
-
#~ msgid "Allows Contribution to Debian:"
#~ msgstr "有否捐贈給 Debian:"
-#~ msgid "Country:"
-#~ msgstr "國家:"
-
-#~ msgid "Ship International:"
-#~ msgstr "是否接受國際訂購:"
-
-#~ msgid "email:"
-#~ msgstr "電子郵箱:"
+#~ msgid "Architectures:"
+#~ msgstr "硬體架構:"
#~ msgid "CD Type:"
#~ msgstr "CD 種類:"
+#~ msgid "Country:"
+#~ msgstr "國家:"
+
+#~ msgid "Custom Release"
+#~ msgstr "特別訂造"
+
#~ msgid "DVD Type:"
#~ msgstr "DVD 種類:"
-#~ msgid "Architectures:"
-#~ msgstr "硬體架構:"
+#~ msgid "Development Snapshot"
+#~ msgstr "開發版快照"
+
+#~ msgid "Multiple Distribution"
+#~ msgstr "多重發佈"
#~ msgid "Official CD"
#~ msgstr "正式 CD 光碟"
@@ -101,14 +98,23 @@ msgstr "和"
#~ msgid "Official DVD"
#~ msgstr "正式 DVD 光碟"
-#~ msgid "Development Snapshot"
-#~ msgstr "開發版快照"
+#~ msgid "Ship International:"
+#~ msgstr "是否接受國際訂購:"
+
+#~ msgid "URL for Debian Page:"
+#~ msgstr "為 Debian 而設的網址:"
#~ msgid "Vendor Release"
#~ msgstr "銷售商發行版本"
-#~ msgid "Multiple Distribution"
-#~ msgstr "多重發佈"
+#~ msgid "Vendor:"
+#~ msgstr "銷售商:"
+
+#~ msgid "contrib included"
+#~ msgstr "包括 contrib"
+
+#~ msgid "email:"
+#~ msgstr "電子郵箱:"
#~ msgid "non-US included"
#~ msgstr "包括 non-US"
@@ -116,26 +122,20 @@ msgstr "和"
#~ msgid "non-free included"
#~ msgstr "包括 non-free"
-#~ msgid "contrib included"
-#~ msgstr "包括 contrib"
-
-#~ msgid "vendor additions"
-#~ msgstr "銷售商增添軟件"
-
-#~ msgid "Custom Release"
-#~ msgstr "特別訂造"
+#~ msgid "reseller"
+#~ msgstr "分銷商"
#~ msgid "reseller of $var"
#~ msgstr "$var 的分銷商"
-#~ msgid "reseller"
-#~ msgstr "分銷商"
-
-#~ msgid "updated weekly"
-#~ msgstr "每週更新"
+#~ msgid "updated monthly"
+#~ msgstr "每月更新"
#~ msgid "updated twice weekly"
#~ msgstr "每兩週更新"
-#~ msgid "updated monthly"
-#~ msgstr "每月更新"
+#~ msgid "updated weekly"
+#~ msgstr "每週更新"
+
+#~ msgid "vendor additions"
+#~ msgstr "銷售商增添軟件"

© 2014-2024 Faster IT GmbH | imprint | privacy policy