aboutsummaryrefslogtreecommitdiffstats
path: root/chinese/po
diff options
context:
space:
mode:
authorBoyuan Yang <byang@debian.org>2018-11-11 23:58:58 -0500
committerBoyuan Yang <byang@debian.org>2018-11-11 23:59:00 -0500
commitf063762b8c7af29981e34f371873ddb1da42ea3d (patch)
tree47aa91446583279e92e11d618a8d445ec132de7a /chinese/po
parentfb8d0e08c2ebddbd92c531239b7e675dd2b61602 (diff)
chinese: po: Refresh po files
This is done by running "make update-po" in chinese/po dir.
Diffstat (limited to 'chinese/po')
-rw-r--r--chinese/po/blends.zh.po6
-rw-r--r--chinese/po/bugs.zh.po190
-rw-r--r--chinese/po/countries.zh.po6
-rw-r--r--chinese/po/doc.zh.po36
-rw-r--r--chinese/po/mailinglists.zh.po8
-rw-r--r--chinese/po/organization.zh.po256
-rw-r--r--chinese/po/others.zh.po96
-rw-r--r--chinese/po/partners.zh.po73
-rw-r--r--chinese/po/ports.zh.po38
-rw-r--r--chinese/po/security.zh.po10
-rw-r--r--chinese/po/stats.zh.po144
-rw-r--r--chinese/po/templates.zh.po398
-rw-r--r--chinese/po/vendors.zh.po94
13 files changed, 691 insertions, 664 deletions
diff --git a/chinese/po/blends.zh.po b/chinese/po/blends.zh.po
index d8f8c439d5d..8585842fee4 100644
--- a/chinese/po/blends.zh.po
+++ b/chinese/po/blends.zh.po
@@ -160,8 +160,8 @@ msgstr ""
"DebianParl 的目標是提供可以支持全世界各個議會議員、政治家及其下屬工作人員日常"
"工作的軟件。"
-#~ msgid "Debian Games"
-#~ msgstr "Debian Games(Debian 遊戲版)"
-
#~ msgid "Debian Accessibility"
#~ msgstr "Debian Accessibility(Debian 易訪問版)"
+
+#~ msgid "Debian Games"
+#~ msgstr "Debian Games(Debian 遊戲版)"
diff --git a/chinese/po/bugs.zh.po b/chinese/po/bugs.zh.po
index 739cee6f297..7f46e85dce5 100644
--- a/chinese/po/bugs.zh.po
+++ b/chinese/po/bugs.zh.po
@@ -160,146 +160,146 @@ msgstr "已歸檔"
msgid "Archived and Unarchived"
msgstr "已歸檔與未歸檔"
-#~ msgid "Exclude tag:"
-#~ msgstr "不包括標簽:"
-
-#~ msgid "Include tag:"
-#~ msgstr "包括標簽:"
+#~ msgid "Flags:"
+#~ msgstr "標記:"
-#~ msgid "lfs"
-#~ msgstr "lfs"
+#~ msgid "active bugs"
+#~ msgstr "未解決"
-#~ msgid "ipv6"
-#~ msgstr "ipv6"
+#~ msgid "display merged bugs only once"
+#~ msgstr "已合並的報告只顯示一次"
-#~ msgid "wontfix"
-#~ msgstr "不予修正 (wontfix)"
+#~ msgid "no ordering by status or severity"
+#~ msgstr "不按狀態或者嚴重性排序"
-#~ msgid "upstream"
-#~ msgstr "上遊 (upstream)"
+#~ msgid "don't show table of contents in the header"
+#~ msgstr "不在頁面開始處顯示目錄"
-#~ msgid "unreproducible"
-#~ msgstr "不可再現 (unreproducible)"
+#~ msgid "don't show statistics in the footer"
+#~ msgstr "不在頁腳處顯示統計結果"
-#~ msgid "security"
-#~ msgstr "安全性 (security)"
+#~ msgid "proposed-updates"
+#~ msgstr "proposed-updates"
-#~ msgid "patch"
-#~ msgstr "補丁 (patch)"
+#~ msgid "testing-proposed-updates"
+#~ msgstr "testing-proposed-updates"
-#~ msgid "moreinfo"
-#~ msgstr "附加信息 (moreinfo)"
+#~ msgid "Package version:"
+#~ msgstr "軟件包版本號:"
-#~ msgid "l10n"
-#~ msgstr "本地化 (l10n)"
+#~ msgid "Distribution:"
+#~ msgstr "發行版:"
-#~ msgid "help"
-#~ msgstr "幫助文檔 (help)"
+#~ msgid "bugs"
+#~ msgstr "數量"
-#~ msgid "fixed-upstream"
-#~ msgstr "已修正于上遊 (fixed-upstream)"
+#~ msgid "open"
+#~ msgstr "未解決"
-#~ msgid "fixed-in-experimental"
-#~ msgstr "已修正于 experimental (fixed-in-experimental)"
+#~ msgid "forwarded"
+#~ msgstr "已移交"
-#~ msgid "d-i"
-#~ msgstr "安裝程序 (d-i)"
+#~ msgid "pending"
+#~ msgstr "待完工"
-#~ msgid "confirmed"
-#~ msgstr "通過確認 (confirmed)"
+#~ msgid "fixed"
+#~ msgstr "已修正"
-#~ msgid "sid"
-#~ msgstr "sid"
+#~ msgid "done"
+#~ msgstr "已完工"
-#~ msgid "etch-ignore"
-#~ msgstr "etch-ignore"
+#~ msgid "Include status:"
+#~ msgstr "包括狀態:"
-#~ msgid "etch"
-#~ msgstr "etch"
+#~ msgid "Exclude status:"
+#~ msgstr "不包括狀態:"
-#~ msgid "sarge-ignore"
-#~ msgstr "sarge-ignore"
+#~ msgid "critical"
+#~ msgstr "致命"
-#~ msgid "woody"
-#~ msgstr "woody"
+#~ msgid "grave"
+#~ msgstr "危險"
-#~ msgid "potato"
-#~ msgstr "potato"
+#~ msgid "serious"
+#~ msgstr "嚴重"
-#~ msgid "Exclude severity:"
-#~ msgstr "不包括優先級:"
+#~ msgid "important"
+#~ msgstr "重要"
-#~ msgid "Include severity:"
-#~ msgstr "包括優先級:"
+#~ msgid "minor"
+#~ msgstr "輕微"
#~ msgid "wishlist"
#~ msgstr "[CN:小意思:][HKTW:心願:]"
-#~ msgid "minor"
-#~ msgstr "輕微"
+#~ msgid "Include severity:"
+#~ msgstr "包括優先級:"
-#~ msgid "important"
-#~ msgstr "重要"
+#~ msgid "Exclude severity:"
+#~ msgstr "不包括優先級:"
-#~ msgid "serious"
-#~ msgstr "嚴重"
+#~ msgid "potato"
+#~ msgstr "potato"
-#~ msgid "grave"
-#~ msgstr "危險"
+#~ msgid "woody"
+#~ msgstr "woody"
-#~ msgid "critical"
-#~ msgstr "致命"
+#~ msgid "sarge-ignore"
+#~ msgstr "sarge-ignore"
-#~ msgid "Exclude status:"
-#~ msgstr "不包括狀態:"
+#~ msgid "etch"
+#~ msgstr "etch"
-#~ msgid "Include status:"
-#~ msgstr "包括狀態:"
+#~ msgid "etch-ignore"
+#~ msgstr "etch-ignore"
-#~ msgid "done"
-#~ msgstr "已完工"
+#~ msgid "sid"
+#~ msgstr "sid"
-#~ msgid "fixed"
-#~ msgstr "已修正"
+#~ msgid "confirmed"
+#~ msgstr "通過確認 (confirmed)"
-#~ msgid "pending"
-#~ msgstr "待完工"
+#~ msgid "d-i"
+#~ msgstr "安裝程序 (d-i)"
-#~ msgid "forwarded"
-#~ msgstr "已移交"
+#~ msgid "fixed-in-experimental"
+#~ msgstr "已修正于 experimental (fixed-in-experimental)"
-#~ msgid "open"
-#~ msgstr "未解決"
+#~ msgid "fixed-upstream"
+#~ msgstr "已修正于上遊 (fixed-upstream)"
-#~ msgid "bugs"
-#~ msgstr "數量"
+#~ msgid "help"
+#~ msgstr "幫助文檔 (help)"
-#~ msgid "Distribution:"
-#~ msgstr "發行版:"
+#~ msgid "l10n"
+#~ msgstr "本地化 (l10n)"
-#~ msgid "Package version:"
-#~ msgstr "軟件包版本號:"
+#~ msgid "moreinfo"
+#~ msgstr "附加信息 (moreinfo)"
-#~ msgid "testing-proposed-updates"
-#~ msgstr "testing-proposed-updates"
+#~ msgid "patch"
+#~ msgstr "補丁 (patch)"
-#~ msgid "proposed-updates"
-#~ msgstr "proposed-updates"
+#~ msgid "security"
+#~ msgstr "安全性 (security)"
-#~ msgid "don't show statistics in the footer"
-#~ msgstr "不在頁腳處顯示統計結果"
+#~ msgid "unreproducible"
+#~ msgstr "不可再現 (unreproducible)"
-#~ msgid "don't show table of contents in the header"
-#~ msgstr "不在頁面開始處顯示目錄"
+#~ msgid "upstream"
+#~ msgstr "上遊 (upstream)"
-#~ msgid "no ordering by status or severity"
-#~ msgstr "不按狀態或者嚴重性排序"
+#~ msgid "wontfix"
+#~ msgstr "不予修正 (wontfix)"
-#~ msgid "display merged bugs only once"
-#~ msgstr "已合並的報告只顯示一次"
+#~ msgid "ipv6"
+#~ msgstr "ipv6"
-#~ msgid "active bugs"
-#~ msgstr "未解決"
+#~ msgid "lfs"
+#~ msgstr "lfs"
-#~ msgid "Flags:"
-#~ msgstr "標記:"
+#~ msgid "Include tag:"
+#~ msgstr "包括標簽:"
+
+#~ msgid "Exclude tag:"
+#~ msgstr "不包括標簽:"
diff --git a/chinese/po/countries.zh.po b/chinese/po/countries.zh.po
index 95fdf076c26..38934b1d892 100644
--- a/chinese/po/countries.zh.po
+++ b/chinese/po/countries.zh.po
@@ -430,8 +430,8 @@ msgstr "南非"
msgid "Zimbabwe"
msgstr "津巴布韦"
-#~ msgid "Yugoslavia"
-#~ msgstr "南斯拉夫"
-
#~ msgid "Great Britain"
#~ msgstr "英國"
+
+#~ msgid "Yugoslavia"
+#~ msgstr "南斯拉夫"
diff --git a/chinese/po/doc.zh.po b/chinese/po/doc.zh.po
index 48df3adb613..9bc4906ae0d 100644
--- a/chinese/po/doc.zh.po
+++ b/chinese/po/doc.zh.po
@@ -221,20 +221,14 @@ msgid "PDF"
msgstr "PDF"
#~ msgid ""
-#~ "Use <a href=\"cvs\">SVN</a> to download the SGML source text for <get-var "
-#~ "ddp_pkg_loc />."
+#~ "The latest <get-var srctype /> source is available through the <a href="
+#~ "\"https://www.debian.org/doc/cvs\">Subversion</a> repository."
#~ msgstr ""
-#~ "使用 <a href=\"cvs\">SVN</a> 來取得 <get-vard dp_pkg_loc /> 的 SGML 原始"
-#~ "檔。"
+#~ "<get-var srctype /> 的最新源代码可由 <a href=\"https://www.debian.org/doc/"
+#~ "cvs\">Subversion</a> 仓库获得。"
-#~ msgid ""
-#~ "<p>You can visit the current <a href=\"manuals/<get-var doc />/"
-#~ "\">development version</a> here, use <a href=\"cvs\">CVS</a> to download "
-#~ "the SGML source text."
-#~ msgstr ""
-#~ "<p>You can visit the current<a href=\"manuals/<get-var doc />/"
-#~ "\">development version</a> here,use <a href=\"cvs\">CVS</a> to download "
-#~ "the SGML source text."
+#~ msgid "Language:"
+#~ msgstr "語言:"
#~ msgid ""
#~ "CVS sources working copy: <p>Login to the CVS server using the command:"
@@ -252,12 +246,18 @@ msgstr "PDF"
#~ "check out the sources, use the command:<br><pre>cvs -d:pserver:"
#~ "anonymous@cvs.debian.org:/cvs/debian-policy co <get-var doc /></pre>"
-#~ msgid "Language:"
-#~ msgstr "語言:"
+#~ msgid ""
+#~ "<p>You can visit the current <a href=\"manuals/<get-var doc />/"
+#~ "\">development version</a> here, use <a href=\"cvs\">CVS</a> to download "
+#~ "the SGML source text."
+#~ msgstr ""
+#~ "<p>You can visit the current<a href=\"manuals/<get-var doc />/"
+#~ "\">development version</a> here,use <a href=\"cvs\">CVS</a> to download "
+#~ "the SGML source text."
#~ msgid ""
-#~ "The latest <get-var srctype /> source is available through the <a href="
-#~ "\"https://www.debian.org/doc/cvs\">Subversion</a> repository."
+#~ "Use <a href=\"cvs\">SVN</a> to download the SGML source text for <get-var "
+#~ "ddp_pkg_loc />."
#~ msgstr ""
-#~ "<get-var srctype /> 的最新源代码可由 <a href=\"https://www.debian.org/doc/"
-#~ "cvs\">Subversion</a> 仓库获得。"
+#~ "使用 <a href=\"cvs\">SVN</a> 來取得 <get-vard dp_pkg_loc /> 的 SGML 原始"
+#~ "檔。"
diff --git a/chinese/po/mailinglists.zh.po b/chinese/po/mailinglists.zh.po
index ac4f0a4c2ce..a77da0f0cc7 100644
--- a/chinese/po/mailinglists.zh.po
+++ b/chinese/po/mailinglists.zh.po
@@ -4,6 +4,7 @@
msgid ""
msgstr ""
"Project-Id-Version: Debian webwml organization\n"
+"POT-Creation-Date: \n"
"PO-Revision-Date: 2018-06-02 17:16+0800\n"
"Last-Translator: Boyuan Yang <073plan@gmail.com>\n"
"Language-Team: <debian-l10n-chinese@lists.debian.org>\n"
@@ -13,7 +14,6 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
"X-Generator: Poedit 2.0.7\n"
-"POT-Creation-Date: \n"
#: ../../english/MailingLists/mklist.tags:6
msgid "Mailing List Subscription"
@@ -125,8 +125,8 @@ msgstr "公開"
msgid "closed"
msgstr "關閉"
-#~ msgid "Please select which lists you want to subscribe to:"
-#~ msgstr "請選擇您想要訂閱的郵件列表:"
-
#~ msgid "Please select which lists you want to unsubscribe from:"
#~ msgstr "請選擇您要取消訂閱哪個列表:"
+
+#~ msgid "Please select which lists you want to subscribe to:"
+#~ msgstr "請選擇您想要訂閱的郵件列表:"
diff --git a/chinese/po/organization.zh.po b/chinese/po/organization.zh.po
index e94d8023ece..c4dd63bc3f6 100644
--- a/chinese/po/organization.zh.po
+++ b/chinese/po/organization.zh.po
@@ -57,7 +57,9 @@ msgid "wizard"
msgstr "巫師"
#: ../../english/intro/organization.data:39
-msgid "chairman"
+#, fuzzy
+#| msgid "chairman"
+msgid "chair"
msgstr "主席"
#: ../../english/intro/organization.data:42
@@ -69,256 +71,261 @@ msgid "secretary"
msgstr "秘書"
#: ../../english/intro/organization.data:53
-#: ../../english/intro/organization.data:63
+#: ../../english/intro/organization.data:66
msgid "Officers"
msgstr "總管"
#: ../../english/intro/organization.data:54
-#: ../../english/intro/organization.data:87
+#: ../../english/intro/organization.data:90
msgid "Distribution"
msgstr "發行版"
#: ../../english/intro/organization.data:55
-#: ../../english/intro/organization.data:229
+#: ../../english/intro/organization.data:232
msgid "Communication and Outreach"
msgstr ""
-#: ../../english/intro/organization.data:56
-#: ../../english/intro/organization.data:232
+#: ../../english/intro/organization.data:57
+#: ../../english/intro/organization.data:235
+msgid "Data Protection team"
+msgstr ""
+
+#: ../../english/intro/organization.data:58
+#: ../../english/intro/organization.data:239
msgid "Publicity team"
msgstr ""
-#: ../../english/intro/organization.data:57
-#: ../../english/intro/organization.data:300
+#: ../../english/intro/organization.data:60
+#: ../../english/intro/organization.data:304
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:59
+#: ../../english/intro/organization.data:62
msgid "Debian Pure Blends"
msgstr ""
-#: ../../english/intro/organization.data:66
+#: ../../english/intro/organization.data:69
msgid "Leader"
msgstr "領袖"
-#: ../../english/intro/organization.data:68
+#: ../../english/intro/organization.data:71
msgid "Technical Committee"
msgstr "技術委員會"
-#: ../../english/intro/organization.data:82
+#: ../../english/intro/organization.data:85
msgid "Secretary"
msgstr "秘書"
-#: ../../english/intro/organization.data:90
+#: ../../english/intro/organization.data:93
msgid "Development Projects"
msgstr "各項開發計劃"
-#: ../../english/intro/organization.data:91
+#: ../../english/intro/organization.data:94
msgid "FTP Archives"
msgstr "FTP 庫存"
-#: ../../english/intro/organization.data:93
+#: ../../english/intro/organization.data:96
#, fuzzy
#| msgid "FTP Master"
msgid "FTP Masters"
msgstr "FTP 總管"
-#: ../../english/intro/organization.data:99
+#: ../../english/intro/organization.data:102
msgid "FTP Assistants"
msgstr "FTP 助理"
-#: ../../english/intro/organization.data:104
+#: ../../english/intro/organization.data:107
msgid "FTP Wizards"
msgstr ""
-#: ../../english/intro/organization.data:108
+#: ../../english/intro/organization.data:111
msgid "Backports"
msgstr ""
-#: ../../english/intro/organization.data:110
+#: ../../english/intro/organization.data:113
msgid "Backports Team"
msgstr ""
-#: ../../english/intro/organization.data:114
+#: ../../english/intro/organization.data:117
msgid "Individual Packages"
msgstr "個別軟件包"
-#: ../../english/intro/organization.data:115
+#: ../../english/intro/organization.data:118
msgid "Release Management"
msgstr "釋出管理"
-#: ../../english/intro/organization.data:117
+#: ../../english/intro/organization.data:120
msgid "Release Team"
msgstr "釋出團隊"
-#: ../../english/intro/organization.data:130
+#: ../../english/intro/organization.data:133
msgid "Quality Assurance"
msgstr "品質管理"
-#: ../../english/intro/organization.data:131
+#: ../../english/intro/organization.data:134
msgid "Installation System Team"
msgstr "安裝系統小組"
-#: ../../english/intro/organization.data:132
+#: ../../english/intro/organization.data:135
msgid "Release Notes"
msgstr "釋出公告"
-#: ../../english/intro/organization.data:134
+#: ../../english/intro/organization.data:137
msgid "CD Images"
msgstr "光碟映像"
-#: ../../english/intro/organization.data:136
+#: ../../english/intro/organization.data:139
msgid "Production"
msgstr "產品"
-#: ../../english/intro/organization.data:144
+#: ../../english/intro/organization.data:147
msgid "Testing"
msgstr "測試"
-#: ../../english/intro/organization.data:146
+#: ../../english/intro/organization.data:149
#, fuzzy
#| msgid "Support and Infrastructure"
msgid "Autobuilding infrastructure"
msgstr "支援以及下級組織"
-#: ../../english/intro/organization.data:148
+#: ../../english/intro/organization.data:151
msgid "Wanna-build team"
msgstr ""
-#: ../../english/intro/organization.data:156
+#: ../../english/intro/organization.data:159
#, fuzzy
#| msgid "Buildd Administration"
msgid "Buildd administration"
msgstr "Buildd 管理"
-#: ../../english/intro/organization.data:175
+#: ../../english/intro/organization.data:178
msgid "Documentation"
msgstr "文件"
-#: ../../english/intro/organization.data:180
+#: ../../english/intro/organization.data:183
msgid "Work-Needing and Prospective Packages list"
msgstr "需要幫助的套件清單"
-#: ../../english/intro/organization.data:183
+#: ../../english/intro/organization.data:186
msgid "Debian Live Team"
msgstr ""
-#: ../../english/intro/organization.data:184
+#: ../../english/intro/organization.data:187
msgid "Ports"
msgstr "移植"
-#: ../../english/intro/organization.data:219
+#: ../../english/intro/organization.data:222
msgid "Special Configurations"
msgstr "特別[CN:配置:][HKTW:組態設定:]"
-#: ../../english/intro/organization.data:222
+#: ../../english/intro/organization.data:225
msgid "Laptops"
msgstr "筆記型電腦"
-#: ../../english/intro/organization.data:223
+#: ../../english/intro/organization.data:226
msgid "Firewalls"
msgstr "防火牆"
-#: ../../english/intro/organization.data:224
+#: ../../english/intro/organization.data:227
msgid "Embedded systems"
msgstr "嵌入式系統"
-#: ../../english/intro/organization.data:237
+#: ../../english/intro/organization.data:242
msgid "Press Contact"
msgstr ""
-#: ../../english/intro/organization.data:239
+#: ../../english/intro/organization.data:244
msgid "Web Pages"
msgstr "網頁"
-#: ../../english/intro/organization.data:249
+#: ../../english/intro/organization.data:254
msgid "Planet Debian"
msgstr "Debian 星球"
-#: ../../english/intro/organization.data:254
+#: ../../english/intro/organization.data:259
msgid "Outreach"
msgstr ""
-#: ../../english/intro/organization.data:258
+#: ../../english/intro/organization.data:263
msgid "Debian Women Project"
msgstr "Debian Women 計劃"
-#: ../../english/intro/organization.data:266
+#: ../../english/intro/organization.data:271
msgid "Anti-harassment"
msgstr ""
-#: ../../english/intro/organization.data:272
+#: ../../english/intro/organization.data:276
msgid "Events"
msgstr "活動"
-#: ../../english/intro/organization.data:278
+#: ../../english/intro/organization.data:282
#, fuzzy
#| msgid "Technical Committee"
msgid "DebConf Committee"
msgstr "技術委員會"
-#: ../../english/intro/organization.data:285
+#: ../../english/intro/organization.data:289
msgid "Partner Program"
msgstr "合作計劃"
-#: ../../english/intro/organization.data:290
+#: ../../english/intro/organization.data:294
msgid "Hardware Donations Coordination"
msgstr "協調硬體捐贈"
-#: ../../english/intro/organization.data:303
+#: ../../english/intro/organization.data:307
msgid "User support"
msgstr "[CNHK:用戶:][TW:使用者:][HKTW:支援:][CN:支持:]"
-#: ../../english/intro/organization.data:370
+#: ../../english/intro/organization.data:374
msgid "Bug Tracking System"
msgstr "錯誤追縱系統"
-#: ../../english/intro/organization.data:375
+#: ../../english/intro/organization.data:379
msgid "Mailing Lists Administration and Mailing List Archives"
msgstr "郵件列表管理與郵件列表庫存"
-#: ../../english/intro/organization.data:383
+#: ../../english/intro/organization.data:387
#, fuzzy
#| msgid "New Maintainers Front Desk"
msgid "New Members Front Desk"
msgstr "新進開發人員櫃台"
-#: ../../english/intro/organization.data:389
+#: ../../english/intro/organization.data:393
msgid "Debian Account Managers"
msgstr "Debian 帳號管理員"
-#: ../../english/intro/organization.data:393
+#: ../../english/intro/organization.data:397
msgid ""
"To send a private message to all DAMs, use the GPG key "
"57731224A9762EA155AB2A530CA8D15BB24D96F2."
msgstr ""
-#: ../../english/intro/organization.data:394
+#: ../../english/intro/organization.data:398
msgid "Keyring Maintainers (PGP and GPG)"
msgstr "Keyring (PGP 與 GPG) 管理員"
-#: ../../english/intro/organization.data:397
+#: ../../english/intro/organization.data:402
msgid "Security Team"
msgstr "安全團隊"
-#: ../../english/intro/organization.data:409
+#: ../../english/intro/organization.data:414
msgid "Consultants Page"
msgstr "顧問網頁"
-#: ../../english/intro/organization.data:414
+#: ../../english/intro/organization.data:419
msgid "CD Vendors Page"
msgstr "CD 廠商網頁"
-#: ../../english/intro/organization.data:417
+#: ../../english/intro/organization.data:422
msgid "Policy"
msgstr "政策"
-#: ../../english/intro/organization.data:422
+#: ../../english/intro/organization.data:425
msgid "System Administration"
msgstr "系統管理"
-#: ../../english/intro/organization.data:423
+#: ../../english/intro/organization.data:426
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."
@@ -326,7 +333,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:432
+#: ../../english/intro/organization.data:435
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 "
@@ -336,103 +343,98 @@ msgstr ""
"\"https://db.debian.org/machines.cgi\">Debian Machines</a> page,it should "
"contain per-machine administrator information."
-#: ../../english/intro/organization.data:433
+#: ../../english/intro/organization.data:436
msgid "LDAP Developer Directory Administrator"
msgstr "LDAP 開發人員目錄管理"
-#: ../../english/intro/organization.data:434
+#: ../../english/intro/organization.data:437
msgid "Mirrors"
msgstr "鏡像站台"
-#: ../../english/intro/organization.data:441
+#: ../../english/intro/organization.data:444
msgid "DNS Maintainer"
msgstr "DNS 管理"
-#: ../../english/intro/organization.data:442
+#: ../../english/intro/organization.data:445
msgid "Package Tracking System"
msgstr "套件追蹤系統"
-#: ../../english/intro/organization.data:444
+#: ../../english/intro/organization.data:447
msgid "Treasurer"
msgstr ""
-#: ../../english/intro/organization.data:450
+#: ../../english/intro/organization.data:453
msgid ""
"<a name=\"trademark\" href=\"m4_HOME/trademark\">Trademark</a> use requests"
msgstr ""
-#: ../../english/intro/organization.data:453
+#: ../../english/intro/organization.data:456
#, fuzzy
#| msgid "Alioth administrators"
msgid "Salsa administrators"
msgstr "Alioth 管理"
-#: ../../english/intro/organization.data:457
-msgid "Alioth administrators"
-msgstr "Alioth 管理"
-
-#: ../../english/intro/organization.data:470
+#: ../../english/intro/organization.data:467
msgid "Debian for children from 1 to 99"
msgstr "給 1 到 99 歲小孩使用的 Debian"
-#: ../../english/intro/organization.data:473
+#: ../../english/intro/organization.data:470
msgid "Debian for medical practice and research"
msgstr "給醫藥界使用的 Debian"
-#: ../../english/intro/organization.data:476
+#: ../../english/intro/organization.data:473
msgid "Debian for education"
msgstr "給教育界使用的 Debian"
-#: ../../english/intro/organization.data:481
+#: ../../english/intro/organization.data:478
msgid "Debian in legal offices"
msgstr "給法律界使用的 Debian"
-#: ../../english/intro/organization.data:485
+#: ../../english/intro/organization.data:482
msgid "Debian for people with disabilities"
msgstr "給殘障人士使用的 Debian"
-#: ../../english/intro/organization.data:489
+#: ../../english/intro/organization.data:486
#, fuzzy
#| msgid "Debian for medical practice and research"
msgid "Debian for science and related research"
msgstr "給醫藥界使用的 Debian"
-#: ../../english/intro/organization.data:492
+#: ../../english/intro/organization.data:489
#, fuzzy
#| msgid "Debian for education"
msgid "Debian for astronomy"
msgstr "給教育界使用的 Debian"
-#~ msgid "Live System Team"
-#~ msgstr "Live 系統小組"
+#~ msgid "Auditor"
+#~ msgstr "監察"
-#, fuzzy
-#~| msgid "Debian Maintainer Keyring Team"
-#~ msgid "Debian Maintainer (DM) Keyring Maintainers"
-#~ msgstr "Debian 開發人員 Keyring 團隊"
+#~ msgid "Testing Security Team"
+#~ msgstr "測試版安全團隊"
-#~ msgid "Custom Debian Distributions"
-#~ msgstr "客製化 Debian 發行版"
+#~ msgid "Security Audit Project"
+#~ msgstr "安全稽查計劃"
-#~ msgid "Release Team for ``stable''"
-#~ msgstr "穩定版的釋出團隊"
+#~ msgid "APT Team"
+#~ msgstr "APT 小組"
-#~ msgid "Vendors"
-#~ msgstr "廠商"
+#~ msgid "Mailing List Archives"
+#~ msgstr "郵件列表歸檔"
-#~ msgid "Handhelds"
-#~ msgstr "手持式設備"
+#~ msgid "Mailing list"
+#~ msgstr "郵件列表"
-#~ msgid "Marketing Team"
-#~ msgstr "行銷團隊"
+#~ msgid "Debian for non-profit organisations"
+#~ msgstr "給非營利組織用的 Debian"
-#~ msgid ""
-#~ "The admins responsible for buildd's for a particular arch can be reached "
-#~ "at <genericemail arch@buildd.debian.org>, for example <genericemail "
-#~ "i386@buildd.debian.org>."
-#~ msgstr ""
-#~ "負責管理 buildd 的特定硬體架構的管理員可以透過<genericemail arch@buildd."
-#~ "debian.org> 聯絡,如 <genericemail i386@buildd.debian.org>。"
+#~ msgid "The Universal Operating System as your Desktop"
+#~ msgstr "使用環球作業系統作為桌面環境"
+
+#~ msgid "Accountant"
+#~ msgstr "帳號管理"
+
+#~ msgid "Key Signing Coordination"
+#~ msgstr "Key Signing 協調"
#~ msgid ""
#~ "Names of individual buildd's admins can also be found on <a href=\"http://"
@@ -443,32 +445,36 @@ msgstr "給教育界使用的 Debian"
#~ "\">http://www.buildd.net</a> 找到。選擇特定硬體架構與發行版來查詢其 "
#~ "buildd 與管理員。"
-#~ msgid "Key Signing Coordination"
-#~ msgstr "Key Signing 協調"
-
-#~ msgid "Accountant"
-#~ msgstr "帳號管理"
+#~ msgid ""
+#~ "The admins responsible for buildd's for a particular arch can be reached "
+#~ "at <genericemail arch@buildd.debian.org>, for example <genericemail "
+#~ "i386@buildd.debian.org>."
+#~ msgstr ""
+#~ "負責管理 buildd 的特定硬體架構的管理員可以透過<genericemail arch@buildd."
+#~ "debian.org> 聯絡,如 <genericemail i386@buildd.debian.org>。"
-#~ msgid "The Universal Operating System as your Desktop"
-#~ msgstr "使用環球作業系統作為桌面環境"
+#~ msgid "Marketing Team"
+#~ msgstr "行銷團隊"
-#~ msgid "Debian for non-profit organisations"
-#~ msgstr "給非營利組織用的 Debian"
+#~ msgid "Handhelds"
+#~ msgstr "手持式設備"
-#~ msgid "Mailing list"
-#~ msgstr "郵件列表"
+#~ msgid "Vendors"
+#~ msgstr "廠商"
-#~ msgid "Mailing List Archives"
-#~ msgstr "郵件列表歸檔"
+#~ msgid "Release Team for ``stable''"
+#~ msgstr "穩定版的釋出團隊"
-#~ msgid "APT Team"
-#~ msgstr "APT 小組"
+#~ msgid "Custom Debian Distributions"
+#~ msgstr "客製化 Debian 發行版"
-#~ msgid "Security Audit Project"
-#~ msgstr "安全稽查計劃"
+#, fuzzy
+#~| msgid "Debian Maintainer Keyring Team"
+#~ msgid "Debian Maintainer (DM) Keyring Maintainers"
+#~ msgstr "Debian 開發人員 Keyring 團隊"
-#~ msgid "Testing Security Team"
-#~ msgstr "測試版安全團隊"
+#~ msgid "Live System Team"
+#~ msgstr "Live 系統小組"
-#~ msgid "Auditor"
-#~ msgstr "監察"
+#~ msgid "Alioth administrators"
+#~ msgstr "Alioth 管理"
diff --git a/chinese/po/others.zh.po b/chinese/po/others.zh.po
index abded666a2d..4e3a72edc0e 100644
--- a/chinese/po/others.zh.po
+++ b/chinese/po/others.zh.po
@@ -1,6 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: Debian webwml organization\n"
+"POT-Creation-Date: \n"
"PO-Revision-Date: 2018-06-02 17:22+0800\n"
"Last-Translator: Boyuan Yang <073plan@gmail.com>\n"
"Language-Team: Debian-user in Chinese [Big5] <debian-chinese-big5@lists."
@@ -9,7 +10,6 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"POT-Creation-Date: \n"
"X-Generator: Poedit 2.0.7\n"
#: ../../english/banners/index.tags:7
@@ -326,74 +326,74 @@ msgstr "版本"
msgid "URL"
msgstr "網址"
-#~ msgid "Name:"
-#~ msgstr "姓名:"
+#~ msgid "Wanted:"
+#~ msgstr "希望:"
-#~ msgid "Company:"
-#~ msgstr "公司:"
+#~ msgid "Who:"
+#~ msgstr "誰:"
-#~ msgid "URL:"
-#~ msgstr "網址:"
+#~ msgid "Architecture:"
+#~ msgstr "硬體架構:"
-#~ msgid "or"
-#~ msgstr "或"
+#~ msgid "Specifications:"
+#~ msgstr "詳細資訊:"
-#~ msgid "Email:"
-#~ msgstr "Email:"
+#~ msgid "Where:"
+#~ msgstr "地點:"
-#~ msgid "Rates:"
-#~ msgstr "收費:"
+#~ msgid "Debian Technical Committee only"
+#~ msgstr "限於 Debian 技術委員會"
-#~ msgid ""
-#~ "<total_consultant> Debian consultants listed in <total_country> countries "
-#~ "worldwide."
-#~ msgstr ""
-#~ "以下的名單中共有來自世界 <total_country> 個國家的 <total_consultant> 個 "
-#~ "Debian 顧問。"
+#~ msgid "deity developers only"
+#~ msgstr "限於 deity 開發者"
-#~ msgid "Mailing List Subscription"
-#~ msgstr "訂閱郵件列表"
+#~ msgid "developers only"
+#~ msgstr "限於開發者"
-#~ msgid "Your E-Mail address:"
-#~ msgstr "您的 E-Mail 地址:"
+#~ msgid "closed"
+#~ msgstr "關閉"
-#~ msgid "Clear"
-#~ msgstr "清除"
+#~ msgid "open"
+#~ msgstr "公開"
+
+#~ msgid "Mailing List Unsubscription"
+#~ msgstr "取消訂閱郵件列表"
#~ msgid ""
#~ "Please respect the <a href=\"./#ads\">Debian mailing list advertising "
#~ "policy</a>."
#~ msgstr "請尊重 <a href=\"./#ads\">Debian 郵件列表廣告政策</a>。"
-#~ msgid "Mailing List Unsubscription"
-#~ msgstr "取消訂閱郵件列表"
-
-#~ msgid "open"
-#~ msgstr "公開"
+#~ msgid "Clear"
+#~ msgstr "清除"
-#~ msgid "closed"
-#~ msgstr "關閉"
+#~ msgid "Your E-Mail address:"
+#~ msgstr "您的 E-Mail 地址:"
-#~ msgid "developers only"
-#~ msgstr "限於開發者"
+#~ msgid "Mailing List Subscription"
+#~ msgstr "訂閱郵件列表"
-#~ msgid "deity developers only"
-#~ msgstr "限於 deity 開發者"
+#~ 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 "Where:"
-#~ msgstr "地點:"
+#~ msgid "Email:"
+#~ msgstr "Email:"
-#~ msgid "Specifications:"
-#~ msgstr "詳細資訊:"
+#~ msgid "or"
+#~ msgstr "或"
-#~ msgid "Architecture:"
-#~ msgstr "硬體架構:"
+#~ msgid "URL:"
+#~ msgstr "網址:"
-#~ msgid "Who:"
-#~ msgstr "誰:"
+#~ msgid "Company:"
+#~ msgstr "公司:"
-#~ msgid "Wanted:"
-#~ msgstr "希望:"
+#~ msgid "Name:"
+#~ msgstr "姓名:"
diff --git a/chinese/po/partners.zh.po b/chinese/po/partners.zh.po
index 6d1e8018a15..ca69066803e 100644
--- a/chinese/po/partners.zh.po
+++ b/chinese/po/partners.zh.po
@@ -74,11 +74,11 @@ msgstr ""
#: ../../english/partners/partners.def:63
msgid ""
-"credativ is an independent 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."
+"<a href=\"https://www.credativ.com/\">credativ</a> is an independent "
+"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."
msgstr ""
#: ../../english/partners/partners.def:66
@@ -86,8 +86,8 @@ msgid ""
"From the very beginning credativ has actively supported the Debian project "
"and will continue to do so in the future. Furthermore many of our "
"consultants are also Debian developers and actively involved in contributing "
-"to free software projects worldwide. Further information can be found at "
-"<url \"http://www.credativ.com/\">."
+"to free software projects worldwide. Further information can be found at <a "
+"href=\"https://www.credativ.com/\">https://www.credativ.com/</a>."
msgstr ""
#: ../../english/partners/partners.def:72
@@ -258,28 +258,45 @@ msgid ""
"environment."
msgstr ""
-#: ../../english/partners/partners.def:172
+#: ../../english/partners/partners.def:173
+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:176
+msgid ""
+"StackPath is a platform of secure edge services that enables developers to "
+"protect, accelerate, and innovate cloud properties ranging from websites to "
+"media delivery and IoT services."
+msgstr ""
+
+#: ../../english/partners/partners.def:182
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:175
+#: ../../english/partners/partners.def:185
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:178
+#: ../../english/partners/partners.def:188
msgid ""
"Telegraaf Media Group runs some of the most popular Dutch websites (http://"
"www.telegraaf.nl, http://www.speurders.nl and http://www.dft.nl) as well as "
"the two biggest newspapers in The Netherlands."
msgstr ""
-#: ../../english/partners/partners.def:184
+#: ../../english/partners/partners.def:194
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 "
@@ -289,7 +306,7 @@ msgid ""
"thomas-krenn.com/linux</a>."
msgstr ""
-#: ../../english/partners/partners.def:187
+#: ../../english/partners/partners.def:197
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-"
@@ -299,7 +316,7 @@ msgid ""
"course they support Debian as operating system on their servers!"
msgstr ""
-#: ../../english/partners/partners.def:193
+#: ../../english/partners/partners.def:203
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. "
@@ -308,7 +325,7 @@ msgid ""
"for LinuxTag 2001 in Stuttgart."
msgstr ""
-#: ../../english/partners/partners.def:196
+#: ../../english/partners/partners.def:206
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 "
@@ -316,14 +333,14 @@ msgid ""
"\"mailto:info@trustsec.de\">info@trustsec.de</a> for more information."
msgstr ""
-#: ../../english/partners/partners.def:207
+#: ../../english/partners/partners.def:217
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:210
+#: ../../english/partners/partners.def:220
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, "
@@ -332,7 +349,7 @@ msgid ""
"\">debian-contact@brainfood.com</A>."
msgstr ""
-#: ../../english/partners/partners.def:217
+#: ../../english/partners/partners.def:227
msgid ""
"<a href=\"http://www.hp.com/\">Hewlett-Packard</a> has provided hardware for "
"port development, Debian mirrors, and other Debian services (current HP "
@@ -342,7 +359,7 @@ msgid ""
"com/products1/linux/\">HP Linux</a>."
msgstr ""
-#: ../../english/partners/partners.def:220
+#: ../../english/partners/partners.def:230
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, "
@@ -350,7 +367,7 @@ msgid ""
"solutions, etc."
msgstr ""
-#: ../../english/partners/partners.def:227
+#: ../../english/partners/partners.def:237
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 "
@@ -358,7 +375,7 @@ msgid ""
"current users."
msgstr ""
-#: ../../english/partners/partners.def:231
+#: ../../english/partners/partners.def:241
msgid ""
"Linux Central sells all the latest releases of Linux products such as "
"commercial software, books, hardware, and versions of major Linux "
@@ -368,14 +385,14 @@ msgid ""
"contact <A HREF=\"mailto:sales@linuxcentral.com\">sales@linuxcentral.com</A>."
msgstr ""
-#: ../../english/partners/partners.def:238
+#: ../../english/partners/partners.def:248
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:245
+#: ../../english/partners/partners.def:255
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 "
@@ -386,7 +403,7 @@ msgid ""
"copy of The Debian System to the Debian Project."
msgstr ""
-#: ../../english/partners/partners.def:252
+#: ../../english/partners/partners.def:262
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 "
@@ -394,7 +411,7 @@ msgid ""
"donate 1&euro; to the Debian Project."
msgstr ""
-#: ../../english/partners/partners.def:255
+#: ../../english/partners/partners.def:265
msgid ""
"Open Source Press specialises on books around Linux and Open Source "
"Software, written by authors with considerable experience in the fields, and "
@@ -402,7 +419,7 @@ msgid ""
"Source Press publications are renowned for their quality and depth."
msgstr ""
-#: ../../english/partners/partners.def:263
+#: ../../english/partners/partners.def:273
msgid ""
"<a href=\"http://www.rapidswitch.com/\">RapidSwitch</a> (formely Black Cat "
"Networks) is a UK ISP specialising in dedicated hosting. It provides "
@@ -410,13 +427,13 @@ msgid ""
"virtual servers."
msgstr ""
-#: ../../english/partners/partners.def:266
+#: ../../english/partners/partners.def:276
msgid ""
"It hosts a Debian development machine, <a href=\"https://db.debian.org/"
"machines.cgi?host=caballero\">caballero</a>."
msgstr ""
-#: ../../english/partners/partners.def:274
+#: ../../english/partners/partners.def:284
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 "
@@ -424,7 +441,7 @@ msgid ""
"ARM port."
msgstr ""
-#: ../../english/partners/partners.def:277
+#: ../../english/partners/partners.def:287
msgid ""
"Simtec is a leading provider of ARM based computing products. We have a "
"range of <a href=\"http://www.simtec.co.uk/products/boards.html\">boards</a> "
diff --git a/chinese/po/ports.zh.po b/chinese/po/ports.zh.po
index fe9b8fa4e03..279e8d38c17 100644
--- a/chinese/po/ports.zh.po
+++ b/chinese/po/ports.zh.po
@@ -116,32 +116,32 @@ msgstr "給 PowerPC 用的 Debian"
msgid "Debian for Sparc"
msgstr "給 Sparc 用的 Debian"
-#~ msgid "Debian for Laptops"
-#~ msgstr "給筆記型電腦用的 Debian"
-
-#~ msgid "Debian for AMD64"
-#~ msgstr "給 AMD64 用的 Debian"
+#~ msgid "Debian for Sparc64"
+#~ msgstr "給 Sparc64 用的 Debian"
-#~ msgid "Debian for ARM"
-#~ msgstr "給 ARM 用的 Debian"
+#~ msgid "Debian for S/390"
+#~ msgstr "給 S/390 用的 Debian"
-#~ msgid "Debian for Beowulf"
-#~ msgstr "給 Beowulf 用的 Debian"
+#~ msgid "Debian for MIPS"
+#~ msgstr "給 MIPS 用的 Debian"
-#~ msgid "Main"
-#~ msgstr "主要"
+#~ msgid "Debian for Motorola 680x0"
+#~ msgstr "給 Motorola 680x0 用的 Debian"
#~ msgid "Debian GNU/FreeBSD"
#~ msgstr "Debian GNU/FreeBSD"
-#~ msgid "Debian for Motorola 680x0"
-#~ msgstr "給 Motorola 680x0 用的 Debian"
+#~ msgid "Main"
+#~ msgstr "主要"
-#~ msgid "Debian for MIPS"
-#~ msgstr "給 MIPS 用的 Debian"
+#~ msgid "Debian for Beowulf"
+#~ msgstr "給 Beowulf 用的 Debian"
-#~ msgid "Debian for S/390"
-#~ msgstr "給 S/390 用的 Debian"
+#~ msgid "Debian for ARM"
+#~ msgstr "給 ARM 用的 Debian"
-#~ msgid "Debian for Sparc64"
-#~ msgstr "給 Sparc64 用的 Debian"
+#~ msgid "Debian for AMD64"
+#~ msgstr "給 AMD64 用的 Debian"
+
+#~ msgid "Debian for Laptops"
+#~ msgstr "給筆記型電腦用的 Debian"
diff --git a/chinese/po/security.zh.po b/chinese/po/security.zh.po
index 443a1b2d316..41380b45aec 100644
--- a/chinese/po/security.zh.po
+++ b/chinese/po/security.zh.po
@@ -1,6 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: Debian webwml organization\n"
+"POT-Creation-Date: \n"
"PO-Revision-Date: 2018-07-28 21:23+0800\n"
"Last-Translator: Kanru Chen <koster@debian.org>\n"
"Language-Team: Debian-user in Chinese [Big5] <debian-chinese-big5@lists."
@@ -9,7 +10,6 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"POT-Creation-Date: \n"
"X-Generator: Poedit 2.0.9\n"
#: ../../english/security/dsa.rdf.in:16
@@ -60,8 +60,8 @@ msgid ""
"MD5 checksums of the listed files are available in the <a href=\"<get-var "
"url />\">original advisory</a>."
msgstr ""
-"列出的檔案的 MD5 檢查可以由 <a href=\"<get-var url />\">original "
-"advisory</a> 取得。"
+"列出的檔案的 MD5 檢查可以由 <a href=\"<get-var url />\">original advisory</"
+"a> 取得。"
#. don't translate `<get-var url />'
#: ../../english/template/debian/security.wml:30
@@ -69,8 +69,8 @@ msgid ""
"MD5 checksums of the listed files are available in the <a href=\"<get-var "
"url />\">revised advisory</a>."
msgstr ""
-"列出的檔案的 MD5 檢查可以由 <a href=\"<get-var url />\">revised advisory</"
-"a> 取得。"
+"列出的檔案的 MD5 檢查可以由 <a href=\"<get-var url />\">revised advisory</a> "
+"取得。"
#: ../../english/template/debian/security.wml:42
msgid "Debian Security Advisory"
diff --git a/chinese/po/stats.zh.po b/chinese/po/stats.zh.po
index 145feaba425..df2f3ef03c6 100644
--- a/chinese/po/stats.zh.po
+++ b/chinese/po/stats.zh.po
@@ -1,14 +1,14 @@
msgid ""
msgstr ""
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
"Project-Id-Version: \n"
"POT-Creation-Date: \n"
"PO-Revision-Date: \n"
"Last-Translator: Boyuan Yang <073plan@gmail.com>\n"
"Language-Team: \n"
-"MIME-Version: 1.0\n"
"Language: zh\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Poedit 2.0.7\n"
#: ../../english/template/debian/stats_tags.wml:6
@@ -27,225 +27,221 @@ msgstr "一共有 %d [CN:字節:][HKTW:位元组:]需要翻譯。"
msgid "There are %d strings to translate."
msgstr "一共有 %d 個[CN:字符串:][HKTW:字串:]需要翻譯。"
-#: ../../stattrans.pl:282 ../../stattrans.pl:506
+#: ../../stattrans.pl:278 ../../stattrans.pl:494
msgid "Wrong translation version"
msgstr "譯文版本錯誤"
-#: ../../stattrans.pl:284
+#: ../../stattrans.pl:280
msgid "This translation is too out of date"
msgstr "此譯文太過時了"
-#: ../../stattrans.pl:286
+#: ../../stattrans.pl:282
msgid "The original is newer than this translation"
msgstr "原文比此譯文新"
-#: ../../stattrans.pl:290 ../../stattrans.pl:506
+#: ../../stattrans.pl:286 ../../stattrans.pl:494
msgid "The original no longer exists"
msgstr "原文不再存在"
-#: ../../stattrans.pl:482
+#: ../../stattrans.pl:470
msgid "hit count N/A"
msgstr ""
-#: ../../stattrans.pl:482
+#: ../../stattrans.pl:470
msgid "hits"
msgstr ""
-#: ../../stattrans.pl:500 ../../stattrans.pl:501
+#: ../../stattrans.pl:488 ../../stattrans.pl:489
msgid "Click to fetch diffstat data"
msgstr ""
-#: ../../stattrans.pl:516 ../../stattrans.pl:679 ../../stattrans.pl:680
-msgid "Unified diff"
-msgstr "合并差异"
-
-#: ../../stattrans.pl:519 ../../stattrans.pl:679 ../../stattrans.pl:680
-msgid "Colored diff"
-msgstr "带颜色差异"
-
-#: ../../stattrans.pl:524 ../../stattrans.pl:683
-msgid "Commit diff"
-msgstr "提交差异"
-
-#. FIXME - this is clearly wrong, but no idea what's meant to go here!
-#: ../../stattrans.pl:528 ../../stattrans.pl:683
-msgid "Git command line"
-msgstr ""
-
-#: ../../stattrans.pl:639 ../../stattrans.pl:785
+#: ../../stattrans.pl:599 ../../stattrans.pl:739
msgid "Created with <transstatslink>"
msgstr "使用 <transstatslink> 创建"
-#: ../../stattrans.pl:644
+#: ../../stattrans.pl:604
msgid "Translation summary for"
msgstr "翻譯概要 for"
-#: ../../stattrans.pl:647 ../../stattrans.pl:809 ../../stattrans.pl:855
-#: ../../stattrans.pl:898
+#: ../../stattrans.pl:607 ../../stattrans.pl:763 ../../stattrans.pl:809
+#: ../../stattrans.pl:852
msgid "Not translated"
msgstr "未翻譯"
-#: ../../stattrans.pl:647 ../../stattrans.pl:808 ../../stattrans.pl:854
+#: ../../stattrans.pl:607 ../../stattrans.pl:762 ../../stattrans.pl:808
msgid "Outdated"
msgstr "過時"
-#: ../../stattrans.pl:647
+#: ../../stattrans.pl:607
msgid "Translated"
msgstr "已翻譯"
-#: ../../stattrans.pl:647 ../../stattrans.pl:733 ../../stattrans.pl:807
-#: ../../stattrans.pl:853 ../../stattrans.pl:896
+#: ../../stattrans.pl:607 ../../stattrans.pl:687 ../../stattrans.pl:761
+#: ../../stattrans.pl:807 ../../stattrans.pl:850
msgid "Up to date"
msgstr "最新"
-#: ../../stattrans.pl:648 ../../stattrans.pl:649 ../../stattrans.pl:650
-#: ../../stattrans.pl:651
+#: ../../stattrans.pl:608 ../../stattrans.pl:609 ../../stattrans.pl:610
+#: ../../stattrans.pl:611
msgid "files"
msgstr "個[CN:文件:][HKTW:檔案:]"
-#: ../../stattrans.pl:654 ../../stattrans.pl:655 ../../stattrans.pl:656
-#: ../../stattrans.pl:657
+#: ../../stattrans.pl:614 ../../stattrans.pl:615 ../../stattrans.pl:616
+#: ../../stattrans.pl:617
msgid "bytes"
msgstr "[CN:字節:][HKTW:位元組:]"
-#: ../../stattrans.pl:664
+#: ../../stattrans.pl:624
msgid ""
"Note: the lists of pages are sorted by popularity. Hover over the page name "
"to see the number of hits."
msgstr ""
-#: ../../stattrans.pl:670
+#: ../../stattrans.pl:630
msgid "Outdated translations"
msgstr "過時的翻譯"
-#: ../../stattrans.pl:672 ../../stattrans.pl:732
+#: ../../stattrans.pl:632 ../../stattrans.pl:686
msgid "File"
msgstr "[CN:文件:][HKTW:檔案:]"
-#: ../../stattrans.pl:674 ../../stattrans.pl:681
+#: ../../stattrans.pl:634
msgid "Diff"
msgstr ""
-#: ../../stattrans.pl:676
+#: ../../stattrans.pl:636
msgid "Comment"
msgstr "備註"
-#: ../../stattrans.pl:677
+#: ../../stattrans.pl:637
msgid "Diffstat"
msgstr ""
-#: ../../stattrans.pl:686
+#: ../../stattrans.pl:638
+msgid "Git command line"
+msgstr ""
+
+#: ../../stattrans.pl:640
msgid "Log"
msgstr "日誌"
-#: ../../stattrans.pl:687
+#: ../../stattrans.pl:641
msgid "Translation"
msgstr "譯文"
-#: ../../stattrans.pl:688
+#: ../../stattrans.pl:642
msgid "Maintainer"
msgstr "維護者"
-#: ../../stattrans.pl:690
+#: ../../stattrans.pl:644
msgid "Status"
msgstr "狀態"
-#: ../../stattrans.pl:691
+#: ../../stattrans.pl:645
msgid "Translator"
msgstr "翻譯者"
-#: ../../stattrans.pl:692
+#: ../../stattrans.pl:646
msgid "Date"
msgstr "日期"
-#: ../../stattrans.pl:699
+#: ../../stattrans.pl:653
msgid "General pages not translated"
msgstr "未翻譯的一般頁面"
-#: ../../stattrans.pl:700
+#: ../../stattrans.pl:654
msgid "Untranslated general pages"
msgstr "未翻譯的一般頁面"
-#: ../../stattrans.pl:705
+#: ../../stattrans.pl:659
msgid "News items not translated"
msgstr "未翻譯的新聞"
-#: ../../stattrans.pl:706
+#: ../../stattrans.pl:660
msgid "Untranslated news items"
msgstr "未翻譯的新聞"
-#: ../../stattrans.pl:711
+#: ../../stattrans.pl:665
msgid "Consultant/user pages not translated"
msgstr "未翻譯的顧問/[CN:用戶:][HKTW:使用者:]頁面"
-#: ../../stattrans.pl:712
+#: ../../stattrans.pl:666
msgid "Untranslated consultant/user pages"
msgstr "未翻譯的顧問/[CN:用戶:][HKTW:使用者:]頁面"
-#: ../../stattrans.pl:717
+#: ../../stattrans.pl:671
msgid "International pages not translated"
msgstr "未翻譯的國際頁面"
-#: ../../stattrans.pl:718
+#: ../../stattrans.pl:672
msgid "Untranslated international pages"
msgstr "未翻譯的國際頁面"
-#: ../../stattrans.pl:723
+#: ../../stattrans.pl:677
msgid "Translated pages (up-to-date)"
msgstr "已翻譯頁面 (最新)"
-#: ../../stattrans.pl:730 ../../stattrans.pl:880
+#: ../../stattrans.pl:684 ../../stattrans.pl:834
msgid "Translated templates (PO files)"
msgstr "已翻譯模板 (PO [CN:文件:][HKTW:檔案:])"
-#: ../../stattrans.pl:731 ../../stattrans.pl:883
+#: ../../stattrans.pl:685 ../../stattrans.pl:837
msgid "PO Translation Statistics"
msgstr "PO 翻譯統計"
-#: ../../stattrans.pl:734 ../../stattrans.pl:897
+#: ../../stattrans.pl:688 ../../stattrans.pl:851
msgid "Fuzzy"
msgstr "模糊"
-#: ../../stattrans.pl:735
+#: ../../stattrans.pl:689
msgid "Untranslated"
msgstr "未翻譯"
-#: ../../stattrans.pl:736
+#: ../../stattrans.pl:690
#, fuzzy
#| msgid "Total:"
msgid "Total"
msgstr "總數:"
-#: ../../stattrans.pl:753
+#: ../../stattrans.pl:707
msgid "Total:"
msgstr "總數:"
-#: ../../stattrans.pl:787
+#: ../../stattrans.pl:741
msgid "Translated web pages"
msgstr "已翻譯網頁"
-#: ../../stattrans.pl:790
+#: ../../stattrans.pl:744
msgid "Translation Statistics by Page Count"
msgstr "翻譯統計,按頁面數量"
-#: ../../stattrans.pl:805 ../../stattrans.pl:851 ../../stattrans.pl:895
+#: ../../stattrans.pl:759 ../../stattrans.pl:805 ../../stattrans.pl:849
msgid "Language"
msgstr "語言"
-#: ../../stattrans.pl:806 ../../stattrans.pl:852
+#: ../../stattrans.pl:760 ../../stattrans.pl:806
msgid "Translations"
msgstr "翻譯"
-#: ../../stattrans.pl:833
+#: ../../stattrans.pl:787
msgid "Translated web pages (by size)"
msgstr "已翻譯網頁(按[CN:文件:][HKTW:檔案:]大小)"
-#: ../../stattrans.pl:836
+#: ../../stattrans.pl:790
msgid "Translation Statistics by Page Size"
msgstr "翻譯統計,按頁面大小"
+#~ msgid "Origin"
+#~ msgstr "原文"
+
#~ msgid "Created with"
#~ msgstr "此網頁創建工具:"
-#~ msgid "Origin"
-#~ msgstr "原文"
+#~ msgid "Commit diff"
+#~ msgstr "提交差异"
+
+#~ msgid "Colored diff"
+#~ msgstr "带颜色差异"
+
+#~ msgid "Unified diff"
+#~ msgstr "合并差异"
diff --git a/chinese/po/templates.zh.po b/chinese/po/templates.zh.po
index 81a4e5957b0..88f5744a094 100644
--- a/chinese/po/templates.zh.po
+++ b/chinese/po/templates.zh.po
@@ -5,7 +5,8 @@
msgid ""
msgstr ""
"Project-Id-Version: Debian webwml organization\n"
-"PO-Revision-Date: 2018-06-02 17:17+0800\n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: 2018-11-11 23:56-0500\n"
"Last-Translator: Boyuan Yang <073plan@gmail.com>\n"
"Language-Team: Chinese (Simplified) <debian-l10n-chinese@lists.debian.org>\n"
"Language: zh\n"
@@ -13,8 +14,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Poedit 2.0.7\n"
-"POT-Creation-Date: \n"
+"X-Generator: Poedit 2.2\n"
#: ../../english/search.xml.in:7
msgid "Debian website"
@@ -86,72 +86,80 @@ msgid "Contact Us"
msgstr "聯繫方法"
#: ../../english/template/debian/common_translation.wml:37
+msgid "Legal Info"
+msgstr "法律信息"
+
+#: ../../english/template/debian/common_translation.wml:40
+msgid "Data Privacy"
+msgstr "数据隐私"
+
+#: ../../english/template/debian/common_translation.wml:43
msgid "Donations"
msgstr "捐赠"
-#: ../../english/template/debian/common_translation.wml:40
+#: ../../english/template/debian/common_translation.wml:46
msgid "Events"
msgstr "活動"
-#: ../../english/template/debian/common_translation.wml:43
+#: ../../english/template/debian/common_translation.wml:49
msgid "News"
msgstr "新聞"
-#: ../../english/template/debian/common_translation.wml:46
+#: ../../english/template/debian/common_translation.wml:52
msgid "Distribution"
-msgstr "系統發佈"
+msgstr "发行版"
-#: ../../english/template/debian/common_translation.wml:49
+#: ../../english/template/debian/common_translation.wml:55
msgid "Support"
msgstr "[CN:支持:][HKTW:支援:]"
-#: ../../english/template/debian/common_translation.wml:52
+#: ../../english/template/debian/common_translation.wml:58
msgid "Pure Blends"
msgstr "Pure Blends"
-#: ../../english/template/debian/common_translation.wml:55
+#: ../../english/template/debian/common_translation.wml:61
#: ../../english/template/debian/links.tags.wml:46
msgid "Developers' Corner"
msgstr "開發者天地"
-#: ../../english/template/debian/common_translation.wml:58
+#: ../../english/template/debian/common_translation.wml:64
msgid "Documentation"
msgstr "說明[CN:文檔:][HKTW:文件:]"
-#: ../../english/template/debian/common_translation.wml:61
+#: ../../english/template/debian/common_translation.wml:67
msgid "Security Information"
msgstr "安全情報"
-#: ../../english/template/debian/common_translation.wml:64
+#: ../../english/template/debian/common_translation.wml:70
msgid "Search"
msgstr "搜索"
-#: ../../english/template/debian/common_translation.wml:67
+#: ../../english/template/debian/common_translation.wml:73
msgid "none"
msgstr "無"
-#: ../../english/template/debian/common_translation.wml:70
+#: ../../english/template/debian/common_translation.wml:76
msgid "Go"
msgstr "去 / Go"
-#: ../../english/template/debian/common_translation.wml:73
+#: ../../english/template/debian/common_translation.wml:79
msgid "worldwide"
msgstr "全球"
-#: ../../english/template/debian/common_translation.wml:76
+#: ../../english/template/debian/common_translation.wml:82
msgid "Site map"
msgstr "網站地圖"
-#: ../../english/template/debian/common_translation.wml:79
+#: ../../english/template/debian/common_translation.wml:85
msgid "Miscellaneous"
msgstr "雜項"
-#: ../../english/template/debian/common_translation.wml:82
+#: ../../english/template/debian/common_translation.wml:88
#: ../../english/template/debian/links.tags.wml:104
msgid "Getting Debian"
msgstr "取得 Debian"
-#: ../../english/template/debian/common_translation.wml:85
+#: ../../english/template/debian/common_translation.wml:91
msgid "The Debian Blog"
msgstr "Debian 博客"
@@ -200,7 +208,7 @@ msgstr "release 2.2 中"
#. you can add some information of your own translation mailing list
#. (i.e. debian-l10n-XXXXXX@lists.debian.org) for reporting things in
#. your language.
-#: ../../english/template/debian/footer.wml:105
+#: ../../english/template/debian/footer.wml:107
msgid ""
"To report a problem with the web site, please e-mail our publicly archived "
"mailing list <a href=\"mailto:debian-www@lists.debian.org\">debian-www@lists."
@@ -215,23 +223,23 @@ msgstr ""
"</a>。网站的源代码可<a href=\"https://salsa.debian.org/webmaster-team/webwml"
"\">在此处找到</a>。"
-#: ../../english/template/debian/footer.wml:108
+#: ../../english/template/debian/footer.wml:110
msgid "Last Modified"
msgstr "最近修訂日期"
-#: ../../english/template/debian/footer.wml:111
+#: ../../english/template/debian/footer.wml:113
msgid "Copyright"
msgstr "版權所有"
-#: ../../english/template/debian/footer.wml:114
+#: ../../english/template/debian/footer.wml:116
msgid "<a href=\"https://www.spi-inc.org/\">SPI</a> and others;"
msgstr "<a href=\"https://www.spi-inc.org/\">SPI</a> 及其他;"
-#: ../../english/template/debian/footer.wml:117
+#: ../../english/template/debian/footer.wml:119
msgid "See <a href=\"m4_HOME/license\" rel=\"copyright\">license terms</a>"
msgstr "查閱<a href=\"m4_HOME/license\" rel=\"copyright\">許可證條款</a>"
-#: ../../english/template/debian/footer.wml:120
+#: ../../english/template/debian/footer.wml:122
msgid ""
"Debian is a registered <a href=\"m4_HOME/trademark\">trademark</a> of "
"Software in the Public Interest, Inc."
@@ -422,7 +430,7 @@ msgstr "Alioth &ndash; Debian GForge"
#: ../../english/template/debian/links.tags.wml:140
msgid "Quality Assurance"
-msgstr "Quality Assurance"
+msgstr "质保"
#: ../../english/template/debian/links.tags.wml:143
msgid "Package Tracking System"
@@ -430,7 +438,7 @@ msgstr "套件追蹤系統"
#: ../../english/template/debian/links.tags.wml:146
msgid "Debian Developer's Packages Overview"
-msgstr "Debian Developers's 套件綜覽"
+msgstr "Debian 开发者套件綜覽(DDPO)"
#: ../../english/template/debian/navbar.wml:10
msgid "Debian Home"
@@ -513,169 +521,97 @@ msgstr "網址"
msgid "Back to the <a href=\"../\">Who's using Debian? page</a>."
msgstr "返回<a href=\"./\">谁在使用 Debian?页面</a>。"
-#~ msgid "Back to the <a href=\"./\">Debian consultants page</a>."
-#~ msgstr "返回 <a href=\"./\">Debian consultants page</a>."
-
-#, fuzzy
-#~ msgid "Download with Jigdo"
-#~ msgstr "用 jigdo 下載"
-
-#, fuzzy
-#~ msgid "Download via HTTP/FTP"
-#~ msgstr "透過 http/ftp 下載"
-
-#, fuzzy
-#~ msgid "Network Install"
-#~ msgstr "網絡安裝"
-
-#~ msgid "Debian CD team"
-#~ msgstr "<span lang=\"en\">Debian </span>光碟小組"
-
-#~ msgid "jigdo"
-#~ msgstr "jigdo"
-
-#~ msgid "http_ftp"
-#~ msgstr "http_ftp"
-
-#, fuzzy
-#~ msgid "Nominations"
-#~ msgstr "捐款"
-
-#, fuzzy
-#~ msgid "Debate"
-#~ msgstr "<span lang=\"en\">Debian </span>光碟小組"
-
-#, fuzzy
-#~ msgid "Minimum Discussion"
-#~ msgstr "討論中"
-
-#~ msgid "Waiting&nbsp;for&nbsp;Sponsors"
-#~ msgstr "有待贊助"
-
-#~ msgid "In&nbsp;Discussion"
-#~ msgstr "討論中"
+#~ msgid "Visit the site sponsor"
+#~ msgstr "[CN:訪問:][HKTW:拜訪:]本站贊助商"
-#~ msgid "Voting&nbsp;Open"
-#~ msgstr "接受投票中"
+#~ msgid "Select a server near you"
+#~ msgstr "請[CN:就近選擇服務器:][HKTW:選擇就近的伺服器:]"
-#~ msgid "Decided"
-#~ msgstr "已決定"
+#~ msgid "More information:"
+#~ msgstr "更多訊息:"
-#~ msgid "Other"
-#~ msgstr "其他"
+#~ msgid "Taken by:"
+#~ msgstr "認領:"
-#~ msgid "Home&nbsp;Vote&nbsp;Page"
-#~ msgstr "投票主頁"
+#~ msgid "Nobody"
+#~ msgstr "沒有人"
-#~ msgid "Submit&nbsp;a&nbsp;Proposal"
-#~ msgstr "提出議案"
+#~ msgid "Rating:"
+#~ msgstr "評分:"
-#~ msgid "Amend&nbsp;a&nbsp;Proposal"
-#~ msgstr "修正議案"
+#~ msgid "More information"
+#~ msgstr "更詳盡的[CN:信息:][HKTW:資訊:]"
-#~ msgid "Follow&nbsp;a&nbsp;Proposal"
-#~ msgstr "跟隨議案的進展"
+#~ msgid "Where"
+#~ msgstr "Where(何處*)"
-#~ msgid "Read&nbsp;a&nbsp;Result"
-#~ msgstr "查看結果"
+#~ msgid "More Info"
+#~ msgstr "更多[CN:信息:][HKTW:資訊:]"
-#~ msgid "Vote"
-#~ msgstr "投票"
+#~ msgid "<th>Project</th><th>Coordinator</th>"
+#~ msgstr "<th>計劃</th><th>Coordinator</th>"
-#~ msgid ""
-#~ "Debian Weekly News is edited by <a href=\"mailto:dwn@debian.org\">Martin "
-#~ "'Joey' Schulze</a>."
-#~ msgstr ""
-#~ "Debian 每周快訊 (Debian Weekly News) 由 <a href=\"mailto:dwn@debian.org"
-#~ "\">Martin 'Joey' Schulze</a> 負責編輯。"
+#~ msgid "Related Links"
+#~ msgstr "相關網址"
-#~ msgid ""
-#~ "Debian Weekly News is edited by <a href=\"mailto:dwn@debian.org"
-#~ "\">Yooseong Yang and Martin 'Joey' Schulze</a>."
-#~ msgstr ""
-#~ "Debian 每週快訊 (Debian Weekly News) 由 <a href=\"mailto:dwn@debian.org"
-#~ "\">Yooseong Yang 和 Martin 'Joey' Schulze</a> 負責編輯。"
+#~ msgid "Latest News"
+#~ msgstr "最新消息"
+#, fuzzy
#~ msgid ""
-#~ "Debian Weekly News is edited by <a href=\"mailto:dwn@debian.org\">Joe "
-#~ "'Zonker' Brockmeier, Jean-Christophe Helary and Tollef Fog Heen</a>."
-#~ msgstr ""
-#~ "Debian 每週快訊 (Debian Weekly News) 由 <a href=\"mailto:dwn@debian.org"
-#~ "\">Joe 'Zonker' Brockmeier, Jean-Christophe Helary 和 Tollef Fog Heen</a> "
-#~ "負責編輯。"
-
-#~ msgid "Fixed in"
-#~ msgstr "修改於"
-
-#~ msgid "Vulnerable"
-#~ msgstr "可被襲擊"
+#~ "Back to: other <a href=\"./\">Debian news</a> || <a href=\"m4_HOME/"
+#~ "\">Debian Project homepage</a>."
+#~ msgstr "返回 <a href=\"m4_HOME/\">Debian 計劃主頁</a>"
+#, fuzzy
#~ msgid ""
-#~ "See the Debian <a href=\"m4_HOME/contact\">contact page</a> for "
-#~ "information on contacting us."
+#~ "To receive this newsletter bi-weekly in your mailbox, <a href=\"http://"
+#~ "lists.debian.org/debian-news/\">subscribe to the debian-news mailing "
+#~ "list</a>."
#~ msgstr ""
-#~ "請參閱<a href=\"m4_HOME/contact\">聯繫方法</a>與我們[CN:取得聯繫:][HKTW:聯"
-#~ "絡:]。"
-
-#~ msgid "download with pik"
-#~ msgstr "用 pik 下載"
-
-#~ msgid "buy pre-made images"
-#~ msgstr "購買預製映像"
-
-#, fuzzy
-#~ msgid "non-free"
-#~ msgstr "無"
-
-#, fuzzy
-#~ msgid "Discussion"
-#~ msgstr "討論中"
-
-#, fuzzy
-#~ msgid "License Information"
-#~ msgstr "更詳盡的[CN:信息:][HKTW:資訊:]"
-
-#, fuzzy
-#~ msgid "No Requested packages"
-#~ msgstr "受影響的軟件"
+#~ "想每個星期都以電子郵件方式接收「每週快訊」嗎?請<a href=\"m4_HOME/"
+#~ "MailingLists/subscribe#debian-news\">訂閱</a> debian-news 郵件列表。"
-#, fuzzy
-#~ msgid "No requests for adoption"
-#~ msgstr "更詳盡的[CN:信息:][HKTW:資訊:]"
+#~ msgid "<a href=\"../../\">Back issues</a> of this newsletter are available."
+#~ msgstr "您亦可翻閱<a href=\"../../\">過往的報導</a>。"
#, fuzzy
#~ msgid ""
-#~ "<void id=\"plural\" />This issue of Debian Weekly News was edited by <a "
-#~ "href=\"mailto:dwn@debian.org\">%s</a>."
+#~ "<void id=\"singular\" />Debian Project News is edited by <a href=\"mailto:"
+#~ "debian-publicity@lists.debian.org\">%s</a>."
#~ msgstr ""
#~ "Debian 每周快訊 (Debian Weekly News) 由 <a href=\"mailto:dwn@debian.org"
#~ "\">Joey Hess</a> 負責編輯。"
#, fuzzy
#~ msgid ""
-#~ "<void id=\"singular\" />This issue of Debian Weekly News was edited by <a "
-#~ "href=\"mailto:dwn@debian.org\">%s</a>."
+#~ "<void id=\"plural\" />Debian Project News is edited by <a href=\"mailto:"
+#~ "debian-publicity@lists.debian.org\">%s</a>."
#~ msgstr ""
#~ "Debian 每周快訊 (Debian Weekly News) 由 <a href=\"mailto:dwn@debian.org"
#~ "\">Joey Hess</a> 負責編輯。"
#, fuzzy
#~ msgid ""
-#~ "<void id=\"plural\" />Debian Weekly News is edited by <a href=\"mailto:"
-#~ "dwn@debian.org\">%s</a>."
+#~ "<void id=\"singular\" />This issue of Debian Project News was edited by "
+#~ "<a href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
#~ msgstr ""
#~ "Debian 每周快訊 (Debian Weekly News) 由 <a href=\"mailto:dwn@debian.org"
#~ "\">Joey Hess</a> 負責編輯。"
#, fuzzy
#~ msgid ""
-#~ "<void id=\"singular\" />Debian Weekly News is edited by <a href=\"mailto:"
-#~ "dwn@debian.org\">%s</a>."
+#~ "<void id=\"plural\" />This issue of Debian Project News was edited by <a "
+#~ "href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
#~ msgstr ""
#~ "Debian 每周快訊 (Debian Weekly News) 由 <a href=\"mailto:dwn@debian.org"
#~ "\">Joey Hess</a> 負責編輯。"
#, fuzzy
+#~ msgid "Back to the <a href=\"./\">Debian speakers page</a>."
+#~ msgstr "返回 <a href=\"./\">Debian consultants page</a>."
+
+#, fuzzy
#~ msgid ""
#~ "To receive this newsletter weekly in your mailbox, <a href=\"http://lists."
#~ "debian.org/debian-news/\">subscribe to the debian-news mailing list</a>."
@@ -684,91 +620,163 @@ msgstr "返回<a href=\"./\">谁在使用 Debian?页面</a>。"
#~ "MailingLists/subscribe#debian-news\">訂閱</a> debian-news 郵件列表。"
#, fuzzy
-#~ msgid "Back to the <a href=\"./\">Debian speakers page</a>."
-#~ msgstr "返回 <a href=\"./\">Debian consultants page</a>."
-
-#, fuzzy
#~ msgid ""
-#~ "<void id=\"plural\" />This issue of Debian Project News was edited by <a "
-#~ "href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
+#~ "<void id=\"singular\" />Debian Weekly News is edited by <a href=\"mailto:"
+#~ "dwn@debian.org\">%s</a>."
#~ msgstr ""
#~ "Debian 每周快訊 (Debian Weekly News) 由 <a href=\"mailto:dwn@debian.org"
#~ "\">Joey Hess</a> 負責編輯。"
#, fuzzy
#~ msgid ""
-#~ "<void id=\"singular\" />This issue of Debian Project News was edited by "
-#~ "<a href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
+#~ "<void id=\"plural\" />Debian Weekly News is edited by <a href=\"mailto:"
+#~ "dwn@debian.org\">%s</a>."
#~ msgstr ""
#~ "Debian 每周快訊 (Debian Weekly News) 由 <a href=\"mailto:dwn@debian.org"
#~ "\">Joey Hess</a> 負責編輯。"
#, fuzzy
#~ msgid ""
-#~ "<void id=\"plural\" />Debian Project News is edited by <a href=\"mailto:"
-#~ "debian-publicity@lists.debian.org\">%s</a>."
+#~ "<void id=\"singular\" />This issue of Debian Weekly News was edited by <a "
+#~ "href=\"mailto:dwn@debian.org\">%s</a>."
#~ msgstr ""
#~ "Debian 每周快訊 (Debian Weekly News) 由 <a href=\"mailto:dwn@debian.org"
#~ "\">Joey Hess</a> 負責編輯。"
#, fuzzy
#~ msgid ""
-#~ "<void id=\"singular\" />Debian Project News is edited by <a href=\"mailto:"
-#~ "debian-publicity@lists.debian.org\">%s</a>."
+#~ "<void id=\"plural\" />This issue of Debian Weekly News was edited by <a "
+#~ "href=\"mailto:dwn@debian.org\">%s</a>."
#~ msgstr ""
#~ "Debian 每周快訊 (Debian Weekly News) 由 <a href=\"mailto:dwn@debian.org"
#~ "\">Joey Hess</a> 負責編輯。"
-#~ msgid "<a href=\"../../\">Back issues</a> of this newsletter are available."
-#~ msgstr "您亦可翻閱<a href=\"../../\">過往的報導</a>。"
+#, fuzzy
+#~ msgid "No requests for adoption"
+#~ msgstr "更詳盡的[CN:信息:][HKTW:資訊:]"
#, fuzzy
+#~ msgid "No Requested packages"
+#~ msgstr "受影響的軟件"
+
+#, fuzzy
+#~ msgid "License Information"
+#~ msgstr "更詳盡的[CN:信息:][HKTW:資訊:]"
+
+#, fuzzy
+#~ msgid "Discussion"
+#~ msgstr "討論中"
+
+#, fuzzy
+#~ msgid "non-free"
+#~ msgstr "無"
+
+#~ msgid "buy pre-made images"
+#~ msgstr "購買預製映像"
+
+#~ msgid "download with pik"
+#~ msgstr "用 pik 下載"
+
#~ msgid ""
-#~ "To receive this newsletter bi-weekly in your mailbox, <a href=\"http://"
-#~ "lists.debian.org/debian-news/\">subscribe to the debian-news mailing "
-#~ "list</a>."
+#~ "See the Debian <a href=\"m4_HOME/contact\">contact page</a> for "
+#~ "information on contacting us."
#~ msgstr ""
-#~ "想每個星期都以電子郵件方式接收「每週快訊」嗎?請<a href=\"m4_HOME/"
-#~ "MailingLists/subscribe#debian-news\">訂閱</a> debian-news 郵件列表。"
+#~ "請參閱<a href=\"m4_HOME/contact\">聯繫方法</a>與我們[CN:取得聯繫:][HKTW:聯"
+#~ "絡:]。"
+
+#~ msgid "Vulnerable"
+#~ msgstr "可被襲擊"
+
+#~ msgid "Fixed in"
+#~ msgstr "修改於"
-#, fuzzy
#~ msgid ""
-#~ "Back to: other <a href=\"./\">Debian news</a> || <a href=\"m4_HOME/"
-#~ "\">Debian Project homepage</a>."
-#~ msgstr "返回 <a href=\"m4_HOME/\">Debian 計劃主頁</a>"
+#~ "Debian Weekly News is edited by <a href=\"mailto:dwn@debian.org\">Joe "
+#~ "'Zonker' Brockmeier, Jean-Christophe Helary and Tollef Fog Heen</a>."
+#~ msgstr ""
+#~ "Debian 每週快訊 (Debian Weekly News) 由 <a href=\"mailto:dwn@debian.org"
+#~ "\">Joe 'Zonker' Brockmeier, Jean-Christophe Helary 和 Tollef Fog Heen</a> "
+#~ "負責編輯。"
-#~ msgid "Latest News"
-#~ msgstr "最新消息"
+#~ msgid ""
+#~ "Debian Weekly News is edited by <a href=\"mailto:dwn@debian.org"
+#~ "\">Yooseong Yang and Martin 'Joey' Schulze</a>."
+#~ msgstr ""
+#~ "Debian 每週快訊 (Debian Weekly News) 由 <a href=\"mailto:dwn@debian.org"
+#~ "\">Yooseong Yang 和 Martin 'Joey' Schulze</a> 負責編輯。"
-#~ msgid "Related Links"
-#~ msgstr "相關網址"
+#~ msgid ""
+#~ "Debian Weekly News is edited by <a href=\"mailto:dwn@debian.org\">Martin "
+#~ "'Joey' Schulze</a>."
+#~ msgstr ""
+#~ "Debian 每周快訊 (Debian Weekly News) 由 <a href=\"mailto:dwn@debian.org"
+#~ "\">Martin 'Joey' Schulze</a> 負責編輯。"
-#~ msgid "<th>Project</th><th>Coordinator</th>"
-#~ msgstr "<th>計劃</th><th>Coordinator</th>"
+#~ msgid "Vote"
+#~ msgstr "投票"
-#~ msgid "More Info"
-#~ msgstr "更多[CN:信息:][HKTW:資訊:]"
+#~ msgid "Read&nbsp;a&nbsp;Result"
+#~ msgstr "查看結果"
-#~ msgid "Where"
-#~ msgstr "Where(何處*)"
+#~ msgid "Follow&nbsp;a&nbsp;Proposal"
+#~ msgstr "跟隨議案的進展"
-#~ msgid "More information"
-#~ msgstr "更詳盡的[CN:信息:][HKTW:資訊:]"
+#~ msgid "Amend&nbsp;a&nbsp;Proposal"
+#~ msgstr "修正議案"
-#~ msgid "Rating:"
-#~ msgstr "評分:"
+#~ msgid "Submit&nbsp;a&nbsp;Proposal"
+#~ msgstr "提出議案"
-#~ msgid "Nobody"
-#~ msgstr "沒有人"
+#~ msgid "Home&nbsp;Vote&nbsp;Page"
+#~ msgstr "投票主頁"
-#~ msgid "Taken by:"
-#~ msgstr "認領:"
+#~ msgid "Other"
+#~ msgstr "其他"
-#~ msgid "More information:"
-#~ msgstr "更多訊息:"
+#~ msgid "Decided"
+#~ msgstr "已決定"
-#~ msgid "Select a server near you"
-#~ msgstr "請[CN:就近選擇服務器:][HKTW:選擇就近的伺服器:]"
+#~ msgid "Voting&nbsp;Open"
+#~ msgstr "接受投票中"
-#~ msgid "Visit the site sponsor"
-#~ msgstr "[CN:訪問:][HKTW:拜訪:]本站贊助商"
+#~ msgid "In&nbsp;Discussion"
+#~ msgstr "討論中"
+
+#~ msgid "Waiting&nbsp;for&nbsp;Sponsors"
+#~ msgstr "有待贊助"
+
+#, fuzzy
+#~ msgid "Minimum Discussion"
+#~ msgstr "討論中"
+
+#, fuzzy
+#~ msgid "Debate"
+#~ msgstr "<span lang=\"en\">Debian </span>光碟小組"
+
+#, fuzzy
+#~ msgid "Nominations"
+#~ msgstr "捐款"
+
+#~ msgid "http_ftp"
+#~ msgstr "http_ftp"
+
+#~ msgid "jigdo"
+#~ msgstr "jigdo"
+
+#~ msgid "Debian CD team"
+#~ msgstr "<span lang=\"en\">Debian </span>光碟小組"
+
+#, fuzzy
+#~ msgid "Network Install"
+#~ msgstr "網絡安裝"
+
+#, fuzzy
+#~ msgid "Download via HTTP/FTP"
+#~ msgstr "透過 http/ftp 下載"
+
+#, fuzzy
+#~ msgid "Download with Jigdo"
+#~ msgstr "用 jigdo 下載"
+
+#~ msgid "Back to the <a href=\"./\">Debian consultants page</a>."
+#~ msgstr "返回 <a href=\"./\">Debian consultants page</a>."
diff --git a/chinese/po/vendors.zh.po b/chinese/po/vendors.zh.po
index a5967fb766e..6cd168bccb9 100644
--- a/chinese/po/vendors.zh.po
+++ b/chinese/po/vendors.zh.po
@@ -68,74 +68,74 @@ msgstr "源碼"
msgid "and"
msgstr "和"
-#~ msgid "updated monthly"
-#~ msgstr "每月更新"
-
-#~ msgid "updated twice weekly"
-#~ msgstr "每兩週更新"
+#~ msgid "Vendor:"
+#~ msgstr "銷售商:"
-#~ msgid "updated weekly"
-#~ msgstr "每週更新"
+#~ msgid "URL for Debian Page:"
+#~ msgstr "為 Debian 而設的網址:"
-#~ msgid "reseller"
-#~ msgstr "分銷商"
+#~ msgid "Allows Contribution to Debian:"
+#~ msgstr "有否捐贈給 Debian:"
-#~ msgid "reseller of $var"
-#~ msgstr "$var 的分銷商"
+#~ msgid "Country:"
+#~ msgstr "國家:"
-#~ msgid "Custom Release"
-#~ msgstr "特別訂造"
+#~ msgid "Ship International:"
+#~ msgstr "是否接受國際訂購:"
-#~ msgid "vendor additions"
-#~ msgstr "銷售商增添軟件"
+#~ msgid "email:"
+#~ msgstr "電子郵箱:"
-#~ msgid "contrib included"
-#~ msgstr "包括 contrib"
+#~ msgid "CD Type:"
+#~ msgstr "CD 種類:"
-#~ msgid "non-free included"
-#~ msgstr "包括 non-free"
+#~ msgid "DVD Type:"
+#~ msgstr "DVD 種類:"
-#~ msgid "non-US included"
-#~ msgstr "包括 non-US"
+#~ msgid "Architectures:"
+#~ msgstr "硬體架構:"
-#~ msgid "Multiple Distribution"
-#~ msgstr "多重發佈"
+#~ msgid "Official CD"
+#~ msgstr "正式 CD 光碟"
-#~ msgid "Vendor Release"
-#~ msgstr "銷售商發行版本"
+#~ msgid "Official DVD"
+#~ msgstr "正式 DVD 光碟"
#~ msgid "Development Snapshot"
#~ msgstr "開發版快照"
-#~ msgid "Official DVD"
-#~ msgstr "正式 DVD 光碟"
+#~ msgid "Vendor Release"
+#~ msgstr "銷售商發行版本"
-#~ msgid "Official CD"
-#~ msgstr "正式 CD 光碟"
+#~ msgid "Multiple Distribution"
+#~ msgstr "多重發佈"
-#~ msgid "Architectures:"
-#~ msgstr "硬體架構:"
+#~ msgid "non-US included"
+#~ msgstr "包括 non-US"
-#~ msgid "DVD Type:"
-#~ msgstr "DVD 種類:"
+#~ msgid "non-free included"
+#~ msgstr "包括 non-free"
-#~ msgid "CD Type:"
-#~ msgstr "CD 種類:"
+#~ msgid "contrib included"
+#~ msgstr "包括 contrib"
-#~ msgid "email:"
-#~ msgstr "電子郵箱:"
+#~ msgid "vendor additions"
+#~ msgstr "銷售商增添軟件"
-#~ msgid "Ship International:"
-#~ msgstr "是否接受國際訂購:"
+#~ msgid "Custom Release"
+#~ msgstr "特別訂造"
-#~ msgid "Country:"
-#~ msgstr "國家:"
+#~ msgid "reseller of $var"
+#~ msgstr "$var 的分銷商"
-#~ msgid "Allows Contribution to Debian:"
-#~ msgstr "有否捐贈給 Debian:"
+#~ msgid "reseller"
+#~ msgstr "分銷商"
-#~ msgid "URL for Debian Page:"
-#~ msgstr "為 Debian 而設的網址:"
+#~ msgid "updated weekly"
+#~ msgstr "每週更新"
-#~ msgid "Vendor:"
-#~ msgstr "銷售商:"
+#~ msgid "updated twice weekly"
+#~ msgstr "每兩週更新"
+
+#~ msgid "updated monthly"
+#~ msgstr "每月更新"

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