aboutsummaryrefslogtreecommitdiffstats
path: root/chinese/po
diff options
context:
space:
mode:
authorDavid Prévot <taffit>2013-12-25 19:37:43 +0000
committerDavid Prévot <taffit>2013-12-25 19:37:43 +0000
commit7d67c8e73141c07df85df57d01290040f5d03f38 (patch)
treef58ec193e7b4b81659929cce889d0edd4e3e9b1f /chinese/po
parent34a7487c8c17f60b3dd71ed5459dafced04e6d13 (diff)
(zh) Update PO files
CVS version numbers chinese/po/bugs.zh.po: 1.6 -> 1.7 chinese/po/cdimage.zh.po: 1.4 -> 1.5 chinese/po/consultants.zh.po: 1.3 -> 1.4 chinese/po/countries.zh.po: 1.10 -> 1.11 chinese/po/date.zh.po: 1.5 -> 1.6 chinese/po/doc.zh.po: 1.5 -> 1.6 chinese/po/langs.zh.po: 1.6 -> 1.7 chinese/po/legal.zh.po: 1.3 -> 1.4 chinese/po/mailinglists.zh.po: 1.4 -> 1.5 chinese/po/newsevents.zh.po: 1.7 -> 1.8 chinese/po/organization.zh.po: 1.7 -> 1.8 chinese/po/others.zh.po: 1.17 -> 1.18 chinese/po/ports.zh.po: 1.5 -> 1.6 chinese/po/security.zh.po: 1.6 -> 1.7 chinese/po/stats.zh.po: 1.2 -> 1.3 chinese/po/templates.zh.po: 1.27 -> 1.28 chinese/po/vendors.zh.po: 1.8 -> 1.9 chinese/po/vote.zh.po: 1.3 -> 1.4 chinese/po/wnpp.zh.po: 1.3 -> 1.4
Diffstat (limited to 'chinese/po')
-rw-r--r--chinese/po/bugs.zh.po304
-rw-r--r--chinese/po/cdimage.zh.po10
-rw-r--r--chinese/po/consultants.zh.po21
-rw-r--r--chinese/po/countries.zh.po8
-rw-r--r--chinese/po/date.zh.po17
-rw-r--r--chinese/po/doc.zh.po363
-rw-r--r--chinese/po/langs.zh.po163
-rw-r--r--chinese/po/legal.zh.po37
-rw-r--r--chinese/po/mailinglists.zh.po21
-rw-r--r--chinese/po/newsevents.zh.po158
-rw-r--r--chinese/po/organization.zh.po355
-rw-r--r--chinese/po/others.zh.po156
-rw-r--r--chinese/po/ports.zh.po90
-rw-r--r--chinese/po/security.zh.po8
-rw-r--r--chinese/po/stats.zh.po161
-rw-r--r--chinese/po/templates.zh.po475
-rw-r--r--chinese/po/vendors.zh.po57
-rw-r--r--chinese/po/vote.zh.po1
-rw-r--r--chinese/po/wnpp.zh.po92
19 files changed, 1633 insertions, 864 deletions
diff --git a/chinese/po/bugs.zh.po b/chinese/po/bugs.zh.po
index be1ec364a00..222dc747400 100644
--- a/chinese/po/bugs.zh.po
+++ b/chinese/po/bugs.zh.po
@@ -5,283 +5,297 @@ msgstr ""
"Last-Translator: Kanru Chen <koster@debian.org.tw>\n"
"Language-Team: Debian-user in Chinese [Big5] <debian-chinese-big5@lists."
"debian.org>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../../english/Bugs/pkgreport-opts.inc:16
+#: ../../english/Bugs/pkgreport-opts.inc:17
msgid "in package"
msgstr "在套件中"
-#: ../../english/Bugs/pkgreport-opts.inc:19
-#: ../../english/Bugs/pkgreport-opts.inc:59
-#: ../../english/Bugs/pkgreport-opts.inc:93
+#: ../../english/Bugs/pkgreport-opts.inc:20
+#: ../../english/Bugs/pkgreport-opts.inc:60
+#: ../../english/Bugs/pkgreport-opts.inc:94
msgid "tagged"
msgstr "標籤為"
-#: ../../english/Bugs/pkgreport-opts.inc:22
-#: ../../english/Bugs/pkgreport-opts.inc:62
-#: ../../english/Bugs/pkgreport-opts.inc:96
+#: ../../english/Bugs/pkgreport-opts.inc:23
+#: ../../english/Bugs/pkgreport-opts.inc:63
+#: ../../english/Bugs/pkgreport-opts.inc:97
msgid "with severity"
msgstr "嚴重性"
-#: ../../english/Bugs/pkgreport-opts.inc:25
+#: ../../english/Bugs/pkgreport-opts.inc:26
msgid "in source package"
msgstr "在源套件中"
-#: ../../english/Bugs/pkgreport-opts.inc:28
+#: ../../english/Bugs/pkgreport-opts.inc:29
msgid "in packages maintained by"
msgstr "在由誰維護的套件中"
-#: ../../english/Bugs/pkgreport-opts.inc:31
+#: ../../english/Bugs/pkgreport-opts.inc:32
msgid "submitted by"
msgstr "由誰提交"
-#: ../../english/Bugs/pkgreport-opts.inc:34
+#: ../../english/Bugs/pkgreport-opts.inc:35
msgid "owned by"
msgstr "屬於"
-#: ../../english/Bugs/pkgreport-opts.inc:37
+#: ../../english/Bugs/pkgreport-opts.inc:38
msgid "with status"
msgstr "狀態"
-#: ../../english/Bugs/pkgreport-opts.inc:40
+#: ../../english/Bugs/pkgreport-opts.inc:41
msgid "with mail from"
msgstr "來自郵件"
-#: ../../english/Bugs/pkgreport-opts.inc:43
+#: ../../english/Bugs/pkgreport-opts.inc:44
msgid "newest bugs"
msgstr "最新的"
-#: ../../english/Bugs/pkgreport-opts.inc:56
-#: ../../english/Bugs/pkgreport-opts.inc:90
+#: ../../english/Bugs/pkgreport-opts.inc:57
+#: ../../english/Bugs/pkgreport-opts.inc:91
msgid "with subject containing"
msgstr "主題包含"
-#: ../../english/Bugs/pkgreport-opts.inc:65
-#: ../../english/Bugs/pkgreport-opts.inc:99
+#: ../../english/Bugs/pkgreport-opts.inc:66
+#: ../../english/Bugs/pkgreport-opts.inc:100
msgid "with pending state"
msgstr "待解決的"
-#: ../../english/Bugs/pkgreport-opts.inc:68
-#: ../../english/Bugs/pkgreport-opts.inc:102
+#: ../../english/Bugs/pkgreport-opts.inc:69
+#: ../../english/Bugs/pkgreport-opts.inc:103
msgid "with submitter containing"
msgstr "提交者包含"
-#: ../../english/Bugs/pkgreport-opts.inc:71
-#: ../../english/Bugs/pkgreport-opts.inc:105
+#: ../../english/Bugs/pkgreport-opts.inc:72
+#: ../../english/Bugs/pkgreport-opts.inc:106
msgid "with forwarded containing"
msgstr "轉寄包含"
-#: ../../english/Bugs/pkgreport-opts.inc:74
-#: ../../english/Bugs/pkgreport-opts.inc:108
+#: ../../english/Bugs/pkgreport-opts.inc:75
+#: ../../english/Bugs/pkgreport-opts.inc:109
msgid "with owner containing"
msgstr "擁有者包含"
-#: ../../english/Bugs/pkgreport-opts.inc:77
-#: ../../english/Bugs/pkgreport-opts.inc:111
+#: ../../english/Bugs/pkgreport-opts.inc:78
+#: ../../english/Bugs/pkgreport-opts.inc:112
msgid "with package"
msgstr "套件"
-#: ../../english/Bugs/pkgreport-opts.inc:121
+#: ../../english/Bugs/pkgreport-opts.inc:122
msgid "normal"
msgstr "普通"
-#: ../../english/Bugs/pkgreport-opts.inc:124
+#: ../../english/Bugs/pkgreport-opts.inc:125
msgid "oldview"
msgstr "舊格式"
-#: ../../english/Bugs/pkgreport-opts.inc:127
+#: ../../english/Bugs/pkgreport-opts.inc:128
msgid "raw"
msgstr "原始"
-#: ../../english/Bugs/pkgreport-opts.inc:130
+#: ../../english/Bugs/pkgreport-opts.inc:131
msgid "age"
msgstr "時間"
-#: ../../english/Bugs/pkgreport-opts.inc:135
+#: ../../english/Bugs/pkgreport-opts.inc:137
msgid "Repeat Merged"
msgstr "重複合併的項目"
-#: ../../english/Bugs/pkgreport-opts.inc:136
+#: ../../english/Bugs/pkgreport-opts.inc:138
msgid "Reverse Bugs"
msgstr "反向缺陷"
-#: ../../english/Bugs/pkgreport-opts.inc:137
+#: ../../english/Bugs/pkgreport-opts.inc:139
msgid "Reverse Pending"
msgstr "反向等待"
-#: ../../english/Bugs/pkgreport-opts.inc:138
+#: ../../english/Bugs/pkgreport-opts.inc:140
msgid "Reverse Severity"
msgstr "反向嚴重程度"
#: ../../english/Bugs/pkgreport-opts.inc:141
-msgid "Unarchived"
-msgstr "未歸檔"
+msgid "No Bugs which affect packages"
+msgstr ""
+
+#: ../../english/Bugs/pkgreport-opts.inc:143
+msgid "None"
+msgstr ""
#: ../../english/Bugs/pkgreport-opts.inc:144
-msgid "Archived"
-msgstr "已歸檔"
+msgid "testing"
+msgstr "測試版"
-#: ../../english/Bugs/pkgreport-opts.inc:147
-msgid "Archived and Unarchived"
-msgstr "已歸檔與未歸檔"
+#: ../../english/Bugs/pkgreport-opts.inc:145
+msgid "oldstable"
+msgstr "舊穩定版"
-#~ msgid "Exclude tag:"
-#~ msgstr "不包括標簽:"
+#: ../../english/Bugs/pkgreport-opts.inc:146
+msgid "stable"
+msgstr "穩定版"
-#~ msgid "Include tag:"
-#~ msgstr "包括標簽:"
+#: ../../english/Bugs/pkgreport-opts.inc:147
+msgid "experimental"
+msgstr "experimental"
-#~ msgid "lfs"
-#~ msgstr "lfs"
+#: ../../english/Bugs/pkgreport-opts.inc:148
+msgid "unstable"
+msgstr "不穩定版"
-#~ msgid "ipv6"
-#~ msgstr "ipv6"
+#: ../../english/Bugs/pkgreport-opts.inc:152
+msgid "Unarchived"
+msgstr "未歸檔"
-#~ msgid "wontfix"
-#~ msgstr "不予修正 (wontfix)"
+#: ../../english/Bugs/pkgreport-opts.inc:155
+msgid "Archived"
+msgstr "已歸檔"
-#~ msgid "upstream"
-#~ msgstr "上遊 (upstream)"
+#: ../../english/Bugs/pkgreport-opts.inc:158
+msgid "Archived and Unarchived"
+msgstr "已歸檔與未歸檔"
-#~ msgid "unreproducible"
-#~ msgstr "不可再現 (unreproducible)"
+#~ msgid "Flags:"
+#~ msgstr "標記:"
-#~ msgid "security"
-#~ msgstr "安全性 (security)"
+#~ msgid "active bugs"
+#~ msgstr "未解決"
-#~ msgid "patch"
-#~ msgstr "補丁 (patch)"
+#~ msgid "display merged bugs only once"
+#~ msgstr "已合並的報告只顯示一次"
-#~ msgid "moreinfo"
-#~ msgstr "附加信息 (moreinfo)"
+#~ msgid "no ordering by status or severity"
+#~ msgstr "不按狀態或者嚴重性排序"
-#~ msgid "l10n"
-#~ msgstr "本地化 (l10n)"
+#~ msgid "don't show table of contents in the header"
+#~ msgstr "不在頁面開始處顯示目錄"
-#~ msgid "help"
-#~ msgstr "幫助文檔 (help)"
+#~ msgid "don't show statistics in the footer"
+#~ msgstr "不在頁腳處顯示統計結果"
-#~ msgid "fixed-upstream"
-#~ msgstr "已修正于上遊 (fixed-upstream)"
+#~ msgid "proposed-updates"
+#~ msgstr "proposed-updates"
-#~ msgid "fixed-in-experimental"
-#~ msgstr "已修正于 experimental (fixed-in-experimental)"
+#~ msgid "testing-proposed-updates"
+#~ msgstr "testing-proposed-updates"
-#~ msgid "d-i"
-#~ msgstr "安裝程序 (d-i)"
+#~ msgid "Package version:"
+#~ msgstr "軟件包版本號:"
-#~ msgid "confirmed"
-#~ msgstr "通過確認 (confirmed)"
+#~ msgid "Distribution:"
+#~ msgstr "發行版:"
-#~ msgid "sid"
-#~ msgstr "sid"
+#~ msgid "bugs"
+#~ msgstr "數量"
-#~ msgid "etch-ignore"
-#~ msgstr "etch-ignore"
+#~ msgid "open"
+#~ msgstr "未解決"
-#~ msgid "etch"
-#~ msgstr "etch"
+#~ msgid "forwarded"
+#~ msgstr "已移交"
-#~ msgid "sarge-ignore"
-#~ msgstr "sarge-ignore"
+#~ msgid "pending"
+#~ msgstr "待完工"
-#~ msgid "woody"
-#~ msgstr "woody"
+#~ msgid "fixed"
+#~ msgstr "已修正"
-#~ msgid "potato"
-#~ msgstr "potato"
+#~ msgid "done"
+#~ msgstr "已完工"
-#~ msgid "Exclude severity:"
-#~ msgstr "不包括優先級:"
+#~ msgid "Include status:"
+#~ msgstr "包括狀態:"
-#~ msgid "Include severity:"
-#~ msgstr "包括優先級:"
+#~ msgid "Exclude status:"
+#~ msgstr "不包括狀態:"
-#~ msgid "wishlist"
-#~ msgstr "[CN:小意思:][HKTW:心願:]"
+#~ msgid "critical"
+#~ msgstr "致命"
-#~ msgid "minor"
-#~ msgstr "輕微"
+#~ msgid "grave"
+#~ msgstr "危險"
+
+#~ msgid "serious"
+#~ msgstr "嚴重"
#~ msgid "important"
#~ msgstr "重要"
-#~ msgid "serious"
-#~ msgstr "嚴重"
+#~ msgid "minor"
+#~ msgstr "輕微"
-#~ msgid "grave"
-#~ msgstr "危險"
+#~ msgid "wishlist"
+#~ msgstr "[CN:小意思:][HKTW:心願:]"
-#~ msgid "critical"
-#~ msgstr "致命"
+#~ msgid "Include severity:"
+#~ msgstr "包括優先級:"
-#~ msgid "Exclude status:"
-#~ msgstr "不包括狀態:"
+#~ msgid "Exclude severity:"
+#~ msgstr "不包括優先級:"
-#~ msgid "Include status:"
-#~ msgstr "包括狀態:"
+#~ msgid "potato"
+#~ msgstr "potato"
-#~ msgid "done"
-#~ msgstr "已完工"
+#~ msgid "woody"
+#~ msgstr "woody"
-#~ msgid "fixed"
-#~ msgstr "已修正"
+#~ msgid "sarge-ignore"
+#~ msgstr "sarge-ignore"
-#~ msgid "pending"
-#~ msgstr "待完工"
+#~ msgid "etch"
+#~ msgstr "etch"
-#~ msgid "forwarded"
-#~ msgstr "已移交"
+#~ msgid "etch-ignore"
+#~ msgstr "etch-ignore"
-#~ msgid "open"
-#~ msgstr "未解決"
+#~ msgid "sid"
+#~ msgstr "sid"
-#~ msgid "bugs"
-#~ msgstr "數量"
+#~ msgid "confirmed"
+#~ msgstr "通過確認 (confirmed)"
-#~ msgid "Distribution:"
-#~ msgstr "發行版:"
+#~ msgid "d-i"
+#~ msgstr "安裝程序 (d-i)"
-#~ msgid "Package version:"
-#~ msgstr "軟件包版本號:"
+#~ msgid "fixed-in-experimental"
+#~ msgstr "已修正于 experimental (fixed-in-experimental)"
-#~ msgid "experimental"
-#~ msgstr "experimental"
+#~ msgid "fixed-upstream"
+#~ msgstr "已修正于上遊 (fixed-upstream)"
-#~ msgid "unstable"
-#~ msgstr "不穩定版"
+#~ msgid "help"
+#~ msgstr "幫助文檔 (help)"
-#~ msgid "testing-proposed-updates"
-#~ msgstr "testing-proposed-updates"
+#~ msgid "l10n"
+#~ msgstr "本地化 (l10n)"
-#~ msgid "testing"
-#~ msgstr "測試版"
+#~ msgid "moreinfo"
+#~ msgstr "附加信息 (moreinfo)"
-#~ msgid "proposed-updates"
-#~ msgstr "proposed-updates"
+#~ msgid "patch"
+#~ msgstr "補丁 (patch)"
-#~ msgid "stable"
-#~ msgstr "穩定版"
+#~ msgid "security"
+#~ msgstr "安全性 (security)"
-#~ msgid "oldstable"
-#~ msgstr "舊穩定版"
+#~ msgid "unreproducible"
+#~ msgstr "不可再現 (unreproducible)"
-#~ msgid "don't show statistics in the footer"
-#~ msgstr "不在頁腳處顯示統計結果"
+#~ msgid "upstream"
+#~ msgstr "上遊 (upstream)"
-#~ msgid "don't show table of contents in the header"
-#~ msgstr "不在頁面開始處顯示目錄"
+#~ msgid "wontfix"
+#~ msgstr "不予修正 (wontfix)"
-#~ msgid "no ordering by status or severity"
-#~ msgstr "不按狀態或者嚴重性排序"
+#~ msgid "ipv6"
+#~ msgstr "ipv6"
-#~ msgid "display merged bugs only once"
-#~ msgstr "已合並的報告只顯示一次"
+#~ msgid "lfs"
+#~ msgstr "lfs"
-#~ msgid "active bugs"
-#~ msgstr "未解決"
+#~ msgid "Include tag:"
+#~ msgstr "包括標簽:"
-#~ msgid "Flags:"
-#~ msgstr "標記:"
+#~ msgid "Exclude tag:"
+#~ msgstr "不包括標簽:"
diff --git a/chinese/po/cdimage.zh.po b/chinese/po/cdimage.zh.po
index 38afc240564..96faedbb553 100644
--- a/chinese/po/cdimage.zh.po
+++ b/chinese/po/cdimage.zh.po
@@ -14,10 +14,18 @@ msgstr ""
#: ../../english/CD/CD-keys.data:4 ../../english/CD/CD-keys.data:9
#: ../../english/CD/CD-keys.data:14 ../../english/CD/CD-keys.data:19
#: ../../english/CD/CD-keys.data:24 ../../english/CD/CD-keys.data:28
-#: ../../english/CD/CD-keys.data:33
+#: ../../english/CD/CD-keys.data:33 ../../english/CD/CD-keys.data:38
msgid " Key fingerprint"
msgstr "[CN:密钥指纹:][HKTW: 金鑰指紋:]"
+#: ../../english/devel/debian-installer/images.data:90
+msgid "ISO images"
+msgstr ""
+
+#: ../../english/devel/debian-installer/images.data:91
+msgid "Jigdo files"
+msgstr ""
+
#. note: only change the sep(arator) if it's not good for your charset
#: ../../english/template/debian/cdimage.wml:10
msgid "&middot;"
diff --git a/chinese/po/consultants.zh.po b/chinese/po/consultants.zh.po
index 6d4ee2407df..f59c8056ebe 100644
--- a/chinese/po/consultants.zh.po
+++ b/chinese/po/consultants.zh.po
@@ -5,6 +5,7 @@ msgstr ""
"Last-Translator: Kanru Chen <koster@debian.org.tw>\n"
"Language-Team: Debian-user in Chinese [Big5] <debian-chinese-big5@lists."
"debian.org>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -22,38 +23,42 @@ msgid "Address:"
msgstr "地址:"
#: ../../english/consultants/consultant.defs:15
+msgid "Contact:"
+msgstr ""
+
+#: ../../english/consultants/consultant.defs:19
msgid "Phone:"
msgstr "電話:"
-#: ../../english/consultants/consultant.defs:18
+#: ../../english/consultants/consultant.defs:22
msgid "Fax:"
msgstr "傳真:"
-#: ../../english/consultants/consultant.defs:21
+#: ../../english/consultants/consultant.defs:25
msgid "URL:"
msgstr "網址:"
-#: ../../english/consultants/consultant.defs:25
+#: ../../english/consultants/consultant.defs:29
msgid "or"
msgstr "或"
-#: ../../english/consultants/consultant.defs:30
+#: ../../english/consultants/consultant.defs:34
msgid "Email:"
msgstr "Email:"
-#: ../../english/consultants/consultant.defs:48
+#: ../../english/consultants/consultant.defs:52
msgid "Rates:"
msgstr "收費:"
-#: ../../english/consultants/consultant.defs:51
+#: ../../english/consultants/consultant.defs:55
msgid "Additional Information"
msgstr "其他資訊"
-#: ../../english/consultants/consultant.defs:54
+#: ../../english/consultants/consultant.defs:58
msgid "Willing to Relocate"
msgstr "移動的意願"
-#: ../../english/consultants/consultant.defs:57
+#: ../../english/consultants/consultant.defs:61
msgid ""
"<total_consultant> Debian consultants listed in <total_country> countries "
"worldwide."
diff --git a/chinese/po/countries.zh.po b/chinese/po/countries.zh.po
index 899d355c807..450053cf3dd 100644
--- a/chinese/po/countries.zh.po
+++ b/chinese/po/countries.zh.po
@@ -418,8 +418,12 @@ msgstr "瓦努阿图"
msgid "South Africa"
msgstr "南非"
-#~ msgid "Yugoslavia"
-#~ msgstr "南斯拉夫"
+#: ../../english/template/debian/countries.wml:417
+msgid "Zimbabwe"
+msgstr "津巴布韦"
#~ msgid "Great Britain"
#~ msgstr "英國"
+
+#~ msgid "Yugoslavia"
+#~ msgstr "南斯拉夫"
diff --git a/chinese/po/date.zh.po b/chinese/po/date.zh.po
index 0ff6b8263b8..afcd5df7843 100644
--- a/chinese/po/date.zh.po
+++ b/chinese/po/date.zh.po
@@ -5,6 +5,7 @@ msgstr ""
"Last-Translator: Kanru Chen <koster@debian.org.tw>\n"
"Language-Team: Debian-user in Chinese [Big5] <debian-chinese-big5@lists."
"debian.org>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -185,6 +186,18 @@ msgstr "q{[%]04d年[%]02d月[%]02d日}, $year, $mon, $mday"
msgid "q{[%]d [%]s}, $mday, $mon_str"
msgstr "q{[%]02d月[%]02d日}, $mon, $mday"
+#. $spokendateform_noday: Date format (sprintf) for "spoken" dates
+#. (such a conference event), without the day.
+#. Available variables are: $mon = month number,
+#. $mon_str = month string (from @longmoy), $year = year number.
+#. Percent signs are escaped because they are special during pass 2,
+#. replace all % by [%]
+#: ../../english/template/debian/ctime.wml:99
+#, fuzzy
+#| msgid "q{[%]02d [%]s [%]d}, $mday, $mon_str, $year"
+msgid "q{[%]s [%]s}, $mon_str, $year"
+msgstr "q{[%]04d年[%]02d月[%]02d日}, $year, $mon, $mday"
+
#. $rangeform_samemonth: Date format (sprintf) for date ranges
#. (used mainly for events pages), for ranges within the same month.
#. Any special cases (such as the st/nd/rd/th suffixes in English) are
@@ -193,7 +206,7 @@ msgstr "q{[%]02d月[%]02d日}, $mon, $mday"
#. day-of-month, $smon = month number, $smon_str = month string (from @longmoy)
#. Percent signs are escaped because they are special during pass 2,
#. replace all % by [%]
-#: ../../english/template/debian/ctime.wml:101
+#: ../../english/template/debian/ctime.wml:110
msgid "q{[%]d-[%]d [%]s}, $sday, $eday, $smon_str"
msgstr "q{[%]d-[%]d [%]s}, $sday, $eday, $smon_str"
@@ -206,6 +219,6 @@ msgstr "q{[%]d-[%]d [%]s}, $sday, $eday, $smon_str"
#. $smon_str = start month string (from @longmoy), $emon_str = end month string
#. Percent signs are escaped because they are special during pass 2,
#. replace all % by [%]
-#: ../../english/template/debian/ctime.wml:113
+#: ../../english/template/debian/ctime.wml:122
msgid "q{[%]d [%]s-[%]d [%]s}, $sday, $smon_str, $eday, $emon_str"
msgstr "q{[%]d [%]s-[%]d [%]s}, $sday, $smon_str, $eday, $emon_str"
diff --git a/chinese/po/doc.zh.po b/chinese/po/doc.zh.po
index 2a1d1ab7cb9..326139e15d0 100644
--- a/chinese/po/doc.zh.po
+++ b/chinese/po/doc.zh.po
@@ -5,76 +5,362 @@ msgstr ""
"Last-Translator: Kanru Chen <koster@debian.org.tw>\n"
"Language-Team: Debian-user in Chinese [Big5] <debian-chinese-big5@lists."
"debian.org>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../../english/doc/books.def:15
+#: ../../english/doc/books.data:30
+msgid ""
+"Written by two Debian developers, this free book\n"
+" started as a translation of their French best-seller known as Cahier de\n"
+" l'admin Debian (published by Eyrolles). Accessible to all, this book\n"
+" teaches the essentials to anyone who wants to become an effective and\n"
+" independent Debian GNU/Linux administrator. \n"
+" It covers all the topics that a competent Linux administrator should\n"
+" master, from the installation and the update of the system, up to the\n"
+" creation of packages and the compilation of the kernel, but also\n"
+" monitoring, backup and migration, without forgetting advanced topics\n"
+" like SELinux setup to secure services, automated installations, or\n"
+" virtualization with Xen, KVM or LXC."
+msgstr ""
+
+#: ../../english/doc/books.data:50
+msgid ""
+"The aim of this freely available, up-to-date, book is to get you up to\n"
+" speed with Debian (including both the current stable release and the\n"
+" current unstable distribution). It is comprehensive with basic support\n"
+" for the user who installs and maintains the system themselves (whether\n"
+" in the home, office, club, or school)."
+msgstr ""
+
+#: ../../english/doc/books.data:61
+msgid "Sarge CD with installer and a selection of packages"
+msgstr ""
+
+#: ../../english/doc/books.data:62
+msgid "Live CD with Knoppix"
+msgstr ""
+
+#: ../../english/doc/books.data:65
+msgid ""
+"Beginners and advanced users alike will find this book to be a\n"
+" comprehensive source of information on using Debian for desktops,\n"
+" intranet and internet servers, and development. It also contains\n"
+" background information on the project and extensive coverage of\n"
+" Debian's unique package management system."
+msgstr ""
+
+#: ../../english/doc/books.data:77 ../../english/doc/books.data:180
+#: ../../english/doc/books.data:229 ../../english/doc/books.data:274
+msgid "official Debian GNU/Linux 3.1r0a \"sarge\" on DVD (i386)"
+msgstr ""
+
+#: ../../english/doc/books.data:80 ../../english/doc/books.data:183
+#: ../../english/doc/books.data:232 ../../english/doc/books.data:277
+msgid ""
+"This book introduces the concepts and techniques of the Debian\n"
+" operating system, explaining their usage and pitfalls, and\n"
+" illustrating the thinking behind each of the approaches. The goal is\n"
+" not to be a reference book, but to give the reader enough insight\n"
+" into the workings of the project and operating system to learn and\n"
+" embrace the sophisticated and elegant, sometimes at first slightly\n"
+" non-intuitive solutions that have evolved as part of the Debian\n"
+" system over the past decade. While targeted at the well-versed\n"
+" UNIX/Linux administrator, the book can also serve as an excellent\n"
+" resource alongside a standard Linux reference to bootstrap one's\n"
+" Linux experience in Debian's bottom-up philosophy."
+msgstr ""
+
+#: ../../english/doc/books.data:100
+msgid ""
+"A hands-on reference guide to the Debian GNU/Linux system that shows,\n"
+" in over 1,500 <q>recipes</q>, how to use it for everyday activities -- "
+"from\n"
+" working with text, images, and sound to productivity and networking\n"
+" issues. Like the software the book describes, the book is copylefted\n"
+" and its source data is available."
+msgstr ""
+
+#: ../../english/doc/books.data:113
+msgid "Debian 2.2 ARM architecture"
+msgstr ""
+
+#: ../../english/doc/books.data:116
+msgid ""
+"This book is for developers working with GNU/Linux on ARM processors.\n"
+" It covers some devices specifically for quick set-up (LART, Assabet, "
+"Psion5).\n"
+" It also gives generic information, tools and techniques. The GNU\n"
+" toolchain is covered in native and cross-compiler form, as are "
+"bootloaders,\n"
+" kernel patches, RAMdisks, ARM peculiarities and other ARM resources. It "
+"also\n"
+" includes extensive tutorial information on GNU/Linux basics for "
+"developers\n"
+" coming from other platforms.\n"
+" It is not specific to Debian, but the Aleph\n"
+" ARMLinux distribution is closely based on Debian-ARM and it is assumed "
+"you\n"
+" will be working from this distribution and preferably have a Debian based\n"
+" host machine too."
+msgstr ""
+
+#: ../../english/doc/books.data:136
+msgid ""
+"Learning Debian GNU/Linux guides the new user of Linux through the\n"
+" installation and configuration of Debian GNU/Linux.\n"
+" Windows users will gain a gentle introduction to this exciting\n"
+" computing world guided by Bill McCarty in <q>Learning Debian GNU/Linux</q>."
+msgstr ""
+
+#: ../../english/doc/books.data:145
+msgid "Debian 2.1"
+msgstr ""
+
+#: ../../english/doc/books.data:148
+msgid ""
+"Includes 230+ pages and three CD-ROM discs. Topics covered by software\n"
+" include Debian Linux, networking, programming tools, GUI, desktop\n"
+" publishing, business, fun things, and multimedia. 30 days of free e-mail\n"
+" support included."
+msgstr ""
+
+#: ../../english/doc/books.data:163
+msgid "DVD Debian Squeeze i386/amd64"
+msgstr ""
+
+#: ../../english/doc/books.data:166
+msgid ""
+"The first French book about Debian is already in its fifth edition. It\n"
+" covers all aspects of the administration of Debian from the installation\n"
+" to the configuration of network services.\n"
+" Written by two Debian developers, this book can be of interest to many\n"
+" people: the beginner wishing to discover Debian, the advanced user "
+"looking\n"
+" for tips to enhance his mastership of the Debian tools and the\n"
+" administrator who wants to build a reliable network with Debian."
+msgstr ""
+
+#: ../../english/doc/books.data:205
+msgid "2 editions: One without a DVD, the other with 2 DVDs (i386)"
+msgstr ""
+
+#: ../../english/doc/books.data:208
+msgid ""
+"An alternative <a href=\"http://www.lob.de/cgi-bin/work/outputexpert?"
+"mode=viewone&amp;titnr=254925022\">\n"
+" publication</a> is available from Lehmanns Fachbuchhandlung and costs "
+"29.95\n"
+" euro (as of 2008)."
+msgstr ""
+
+#: ../../english/doc/books.data:218
+msgid "Debian Squeeze, 6.0.1a, Multi-Arch (i386 and amd64) on DVD"
+msgstr ""
+
+#: ../../english/doc/books.data:221
+msgid ""
+"This book teaches you how to install and configure the system and also how "
+"to use Debian in a professional environment. It shows the full potential of "
+"the distribution (in its current version 6.0) and provides a practical "
+"manual for all users who want to learn more about Debian and its range of "
+"services."
+msgstr ""
+
+#: ../../english/doc/books.data:249
+msgid ""
+"2 editions: One with no CD, the other with Official CD (i386, contrib and "
+"sources)"
+msgstr ""
+
+#: ../../english/doc/books.data:252
+msgid ""
+"The book covers all steps of planning and installing Debian GNU/Linux on\n"
+" PC based hardware, including important applications like the X Window\n"
+" System, window managers and desktop environments (KDE, GNOME) and a\n"
+" selection of important system services. Unix/Linux basics and\n"
+" concepts together with system usage and important components (bash,\n"
+" system services and important commands) are introduced.\n"
+" There is an explanation of Debian's package format and how to create\n"
+" packages in this format. It also includes an overview of standard Linux\n"
+" applications (networking, software development, LaTeX and office\n"
+" suites). Strong emphasis is on networking and system\n"
+" administration issues, like planing and building of a dial-in router or\n"
+" a server for Windows based clients (Samba)."
+msgstr ""
+
+#: ../../english/doc/books.data:295
+msgid "Debian GNU/Linux 3.1 Sarge installer (single-width CD)"
+msgstr ""
+
+#: ../../english/doc/books.data:298
+msgid ""
+"This book is dictionary style and covers various tips for beginners\n"
+" and intermediate skill users; installation via various ways,\n"
+" desktop customize, troubleshooting, profitable knowhow and so on."
+msgstr ""
+
+#: ../../english/doc/books.data:311
+msgid ""
+"Debian GNU/Linux 3.1r0 i386, author's edition (DVD +\n"
+" CD)"
+msgstr ""
+
+#: ../../english/doc/books.data:315
+msgid ""
+"This is the latest book for Sarge of the series that has been\n"
+" supported as a standard bible of Debian in Japan.\n"
+" This book covers all aspects of using Debian GNU/Linux 3.1 Sarge, such\n"
+" as installation, desktop environments, system administration, and\n"
+" server configuration. Furthermore, this book also includes commercial\n"
+" font package that decorates your desktop. This book might be useful\n"
+" for all Debian users from beginners to advanced users."
+msgstr ""
+
+#: ../../english/doc/books.data:330
+msgid "Debian 2.2r0 i386 author's edition (3 CDs)"
+msgstr ""
+
+#: ../../english/doc/books.data:333
+msgid ""
+"This book covers general topics about Debian GNU/Linux:\n"
+" installation, APT and dpkg, shell, X Window System, networking, system\n"
+" administration, kernel setup, sharing with Windows, building servers\n"
+" and so on.\n"
+" You will be able to install and start to use Debian GNU/Linux Japanese\n"
+" environment very easily with the customized CDs."
+msgstr ""
+
+#: ../../english/doc/books.data:349
+msgid "1 unofficial Woody, 3 Potato rev0"
+msgstr ""
+
+#: ../../english/doc/books.data:352
+msgid ""
+"This book gives a brief guide to installation of Debian\n"
+" GNU/Linux, fundamentals of Unix or Linux commands, basic configuration "
+"and\n"
+" maintenance of system and networking,\n"
+" X Window System setup, and using multimedia in Debian GNU/Linux.\n"
+" This book also includes a guide for maintainers, which stimulates\n"
+" people in Korea to become official Debian maintainers."
+msgstr ""
+
+#: ../../english/doc/books.data:366
+msgid "Three official potato r3 CDs and an unofficial woody CD"
+msgstr ""
+
+#: ../../english/doc/books.data:369
+msgid ""
+"This book introduces readers to Debian GNU/Linux with many\n"
+" hands-on tutorials and tips. Written in Korean, this book covers\n"
+" comprehensive aspects of Debian GNU/Linux system: first-time setup,\n"
+" package installation, setting up X, connecting to Internet, network\n"
+" maintenance, and more. This book provides a handful of tips on setting up\n"
+" Debian for Korean language environment, and it is good for newcomers, too."
+msgstr ""
+
+#: ../../english/doc/books.data:391
+msgid "Debian GNU/Linux 3.1r0 CD1"
+msgstr ""
+
+#: ../../english/doc/books.data:394
+msgid ""
+"The first Persian book about Debian GNU/Linux. This book helps you\n"
+" to install Debian GNU/Linux and set up network services like web,\n"
+" database, firewall, mail, ftp and ... on it. Also helps you to start\n"
+" using GNU/Linux and Debian's powerful package management system."
+msgstr ""
+
+#: ../../english/doc/books.data:410
+msgid ""
+"This book is divided into four parts: Basic concepts, Management of\n"
+" GNU/Linux, Administration of the system and Advanced operations. Each "
+"chapter\n"
+" explains in depth the features of the operating system. The first\n"
+" chapters explain the structure of GNU/Linux. These chapters will help\n"
+" the reader to understand how the system uses basic resources such as\n"
+" the processor and memory. A detailed analysis about filesystems such as\n"
+" Ext2, Ext3, and ReiserFS will enable users to make the correct choice\n"
+" for their needs. Many figures throughout the book show aspects about\n"
+" the performance of the system. This book caters for college students\n"
+" and anyone who wants to learn GNU/Linux in depth. This book covers\n"
+" Debian Sarge."
+msgstr ""
+
+#: ../../english/doc/books.data:433
+msgid ""
+"This is the right book for you to learn how to create basic and complex IT "
+"platforms using only Free Software. Inside it you will find a wide range of "
+"procedures reviewed and adjusted to fit into the best practices of "
+"technological infrastructure implementation. This easy to read and "
+"comprehensive guide will take you by the hand to achieve specific objectives "
+"with the Debian GNU/Linux operating system."
+msgstr ""
+
+#: ../../english/doc/books.def:38
msgid "Author:"
msgstr "作者:"
-#: ../../english/doc/books.def:18
+#: ../../english/doc/books.def:41
msgid "email:"
msgstr "電子郵箱:"
-#: ../../english/doc/books.def:22
+#: ../../english/doc/books.def:45
msgid "Available at:"
msgstr "售於:"
-#: ../../english/doc/books.def:25
-msgid "Language:"
-msgstr "語言:"
-
-#: ../../english/doc/books.def:29
+#: ../../english/doc/books.def:48
msgid "CD Included:"
msgstr "包括光碟:"
-#: ../../english/doc/books.def:32
+#: ../../english/doc/books.def:51
msgid "Publisher:"
msgstr "發行商:"
-#: ../../english/doc/manuals.defs:29
+#: ../../english/doc/manuals.defs:26
msgid "Authors:"
msgstr "作者:"
-#: ../../english/doc/manuals.defs:36
+#: ../../english/doc/manuals.defs:33
msgid "Editors:"
msgstr "編輯:"
-#: ../../english/doc/manuals.defs:43
+#: ../../english/doc/manuals.defs:40
msgid "Maintainer:"
msgstr "維護者:"
-#: ../../english/doc/manuals.defs:50
+#: ../../english/doc/manuals.defs:47
msgid "Status:"
msgstr "狀態:"
-#: ../../english/doc/manuals.defs:57
+#: ../../english/doc/manuals.defs:54
msgid "Availability:"
msgstr "取得難易度:"
-#: ../../english/doc/manuals.defs:83
+#: ../../english/doc/manuals.defs:86
msgid "Latest version:"
msgstr "最新版本:"
-#: ../../english/doc/manuals.defs:97
+#: ../../english/doc/manuals.defs:102
msgid "(version <get-var version />)"
msgstr "(version <get-var version />)"
-#: ../../english/doc/manuals.defs:127
+#: ../../english/doc/manuals.defs:133 ../../english/releases/arches.data:34
msgid "plain text"
msgstr "純文字"
#. The ddp_pkg_loc variable contains
-#. <a href="http://svn.debian.org/wsvn/ddp/manuals/trunk/manuals.sgml/[package]/">[package]</a>
-#: ../../english/doc/manuals.defs:146
+#. <a href="http://anonscm.debian.org/viewvc/ddp/manuals/trunk/manuals.sgml/[package]/">[package]</a>
+#: ../../english/doc/manuals.defs:152
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 原始檔。"
-#: ../../english/doc/manuals.defs:152
+#: ../../english/doc/manuals.defs:158
msgid ""
"CVS sources working copy: set <code>CVSROOT</code>\n"
" to <kbd>:ext:<var>userid</var>@cvs.debian.org:/cvs/debian-boot</kbd>,\n"
@@ -84,14 +370,37 @@ msgstr ""
" <kbd>:ext:<var>userid</var>@cvs.debian.org:/cvs/debian-boot</kbd>,\n"
" 然後 check out <kbd>boot-floppies/documentation</kbd> module。"
-#: ../../english/doc/manuals.defs:157
+#: ../../english/doc/manuals.defs:163
msgid "CVS via web"
msgstr "網頁檢視 CVS"
-#: ../../english/doc/manuals.defs:161 ../../english/doc/manuals.defs:165
+#: ../../english/doc/manuals.defs:167 ../../english/doc/manuals.defs:171
msgid "Debian package"
msgstr "Debian 套件"
+#: ../../english/doc/manuals.defs:177 ../../english/doc/manuals.defs:181
+#, fuzzy
+#| msgid "Debian package"
+msgid "Debian package (archived)"
+msgstr "Debian 套件"
+
+#: ../../english/releases/arches.data:32
+msgid "HTML"
+msgstr ""
+
+#: ../../english/releases/arches.data:33
+msgid "PDF"
+msgstr ""
+
+#~ msgid ""
+#~ "<p>You can visit the current <a href=\"manuals/<get-var doc />/"
+#~ "\">development version</a> here, use <a href=\"cvs\">CVS</a> to download "
+#~ "the SGML source text."
+#~ msgstr ""
+#~ "<p>You can visit the current<a href=\"manuals/<get-var doc />/"
+#~ "\">development version</a> here,use <a href=\"cvs\">CVS</a> to download "
+#~ "the SGML source text."
+
#~ msgid ""
#~ "CVS sources working copy: <p>Login to the CVS server using the command:"
#~ "<br>\n"
@@ -108,11 +417,5 @@ msgstr "Debian 套件"
#~ "check out the sources, use the command:<br><pre>cvs -d:pserver:"
#~ "anonymous@cvs.debian.org:/cvs/debian-policy co <get-var doc /></pre>"
-#~ msgid ""
-#~ "<p>You can visit the current <a href=\"manuals/<get-var doc />/"
-#~ "\">development version</a> here, use <a href=\"cvs\">CVS</a> to download "
-#~ "the SGML source text."
-#~ msgstr ""
-#~ "<p>You can visit the current<a href=\"manuals/<get-var doc />/"
-#~ "\">development version</a> here,use <a href=\"cvs\">CVS</a> to download "
-#~ "the SGML source text."
+#~ msgid "Language:"
+#~ msgstr "語言:"
diff --git a/chinese/po/langs.zh.po b/chinese/po/langs.zh.po
index 7917f164e90..387a6148603 100644
--- a/chinese/po/langs.zh.po
+++ b/chinese/po/langs.zh.po
@@ -5,6 +5,7 @@ msgstr ""
"Last-Translator: Kanru Chen <koster@debian.org.tw>\n"
"Language-Team: Debian-user in Chinese [Big5] <debian-chinese-big5@lists."
"debian.org>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -42,311 +43,315 @@ msgid "French"
msgstr "法語"
#: ../../english/template/debian/language_names.wml:16
+msgid "Galician"
+msgstr "加利西亞語"
+
+#: ../../english/template/debian/language_names.wml:17
msgid "German"
msgstr "德語"
-#: ../../english/template/debian/language_names.wml:17
+#: ../../english/template/debian/language_names.wml:18
msgid "Italian"
msgstr "意大利語"
-#: ../../english/template/debian/language_names.wml:18
+#: ../../english/template/debian/language_names.wml:19
msgid "Japanese"
msgstr "日本語"
-#: ../../english/template/debian/language_names.wml:19
+#: ../../english/template/debian/language_names.wml:20
msgid "Korean"
msgstr "[CN:朝鮮:][HKTW:韓:]語"
-#: ../../english/template/debian/language_names.wml:20
+#: ../../english/template/debian/language_names.wml:21
msgid "Spanish"
msgstr "西班牙語"
-#: ../../english/template/debian/language_names.wml:21
+#: ../../english/template/debian/language_names.wml:22
msgid "Portuguese"
msgstr "葡萄牙語"
-#: ../../english/template/debian/language_names.wml:22
+#: ../../english/template/debian/language_names.wml:23
msgid "Portuguese (Brazilian)"
msgstr "葡萄牙語 (巴西)"
-#: ../../english/template/debian/language_names.wml:23
+#: ../../english/template/debian/language_names.wml:24
msgid "Chinese"
msgstr "&#20013;&#25991;"
-#: ../../english/template/debian/language_names.wml:24
+#: ../../english/template/debian/language_names.wml:25
msgid "Chinese (China)"
msgstr "&#20013;&#25991;(&#20013;&#22283;)"
-#: ../../english/template/debian/language_names.wml:25
+#: ../../english/template/debian/language_names.wml:26
msgid "Chinese (Hong Kong)"
msgstr "&#20013;&#25991;(&#39321;&#28207;)"
-#: ../../english/template/debian/language_names.wml:26
+#: ../../english/template/debian/language_names.wml:27
msgid "Chinese (Taiwan)"
msgstr "&#20013;&#25991;(&#21488;&#28771;)"
-#: ../../english/template/debian/language_names.wml:27
+#: ../../english/template/debian/language_names.wml:28
msgid "Chinese (Traditional)"
msgstr "&#20013;&#25991;(&#32321;&#39636;)"
-#: ../../english/template/debian/language_names.wml:28
+#: ../../english/template/debian/language_names.wml:29
msgid "Chinese (Simplified)"
msgstr "&#20013;&#25991;(&#31777;&#39636;)"
-#: ../../english/template/debian/language_names.wml:29
+#: ../../english/template/debian/language_names.wml:30
msgid "Swedish"
msgstr "瑞典語"
-#: ../../english/template/debian/language_names.wml:30
+#: ../../english/template/debian/language_names.wml:31
msgid "Polish"
msgstr "波蘭語"
-#: ../../english/template/debian/language_names.wml:31
+#: ../../english/template/debian/language_names.wml:32
msgid "Norwegian"
msgstr "挪威語"
-#: ../../english/template/debian/language_names.wml:32
+#: ../../english/template/debian/language_names.wml:33
msgid "Turkish"
msgstr "土耳其語"
-#: ../../english/template/debian/language_names.wml:33
+#: ../../english/template/debian/language_names.wml:34
msgid "Russian"
msgstr "俄語"
-#: ../../english/template/debian/language_names.wml:34
+#: ../../english/template/debian/language_names.wml:35
msgid "Czech"
msgstr "捷克語"
-#: ../../english/template/debian/language_names.wml:35
+#: ../../english/template/debian/language_names.wml:36
msgid "Esperanto"
msgstr "世界語"
-#: ../../english/template/debian/language_names.wml:36
+#: ../../english/template/debian/language_names.wml:37
msgid "Hungarian"
msgstr "匈牙利語"
-#: ../../english/template/debian/language_names.wml:37
+#: ../../english/template/debian/language_names.wml:38
msgid "Romanian"
msgstr "羅馬尼亞語"
-#: ../../english/template/debian/language_names.wml:38
+#: ../../english/template/debian/language_names.wml:39
msgid "Slovak"
msgstr "斯洛法克語"
-#: ../../english/template/debian/language_names.wml:39
+#: ../../english/template/debian/language_names.wml:40
msgid "Greek"
msgstr "希臘語"
-#: ../../english/template/debian/language_names.wml:40
+#: ../../english/template/debian/language_names.wml:41
msgid "Catalan"
msgstr "[CNHK:加泰隆:][TW:卡達隆尼亞:]語"
-#: ../../english/template/debian/language_names.wml:41
+#: ../../english/template/debian/language_names.wml:42
msgid "Indonesian"
msgstr "印尼語"
-#: ../../english/template/debian/language_names.wml:42
+#: ../../english/template/debian/language_names.wml:43
msgid "Lithuanian"
msgstr "立陶宛語"
-#: ../../english/template/debian/language_names.wml:43
+#: ../../english/template/debian/language_names.wml:44
msgid "Slovene"
msgstr "[CNHK:斯洛文尼亞:][TW:斯洛伐克:]語"
-#: ../../english/template/debian/language_names.wml:44
+#: ../../english/template/debian/language_names.wml:45
msgid "Bulgarian"
msgstr "保加利亞語"
-#: ../../english/template/debian/language_names.wml:45
+#: ../../english/template/debian/language_names.wml:46
msgid "Tamil"
msgstr "坦米爾語"
#. for now, the following are only needed if you intend to translate intl/l10n
-#: ../../english/template/debian/language_names.wml:47
+#: ../../english/template/debian/language_names.wml:48
msgid "Afrikaans"
msgstr "南非荷蘭語"
-#: ../../english/template/debian/language_names.wml:48
+#: ../../english/template/debian/language_names.wml:49
msgid "Albanian"
msgstr "阿爾巴尼亞語"
-#: ../../english/template/debian/language_names.wml:49
+#: ../../english/template/debian/language_names.wml:50
+msgid "Asturian"
+msgstr ""
+
+#: ../../english/template/debian/language_names.wml:51
msgid "Amharic"
msgstr "衣索比亞語"
-#: ../../english/template/debian/language_names.wml:50
+#: ../../english/template/debian/language_names.wml:52
msgid "Azerbaijani"
msgstr "[CNHK:阿塞拜疆:][TW:亞塞拜然:]語"
-#: ../../english/template/debian/language_names.wml:51
+#: ../../english/template/debian/language_names.wml:53
msgid "Basque"
msgstr "巴斯克語"
-#: ../../english/template/debian/language_names.wml:52
+#: ../../english/template/debian/language_names.wml:54
msgid "Belarusian"
msgstr "白俄羅斯語"
-#: ../../english/template/debian/language_names.wml:53
+#: ../../english/template/debian/language_names.wml:55
msgid "Bengali"
msgstr "孟加拉語"
-#: ../../english/template/debian/language_names.wml:54
+#: ../../english/template/debian/language_names.wml:56
msgid "Bosnian"
msgstr "波士尼亞語"
-#: ../../english/template/debian/language_names.wml:55
+#: ../../english/template/debian/language_names.wml:57
msgid "Breton"
msgstr "布里多尼語"
-#: ../../english/template/debian/language_names.wml:56
+#: ../../english/template/debian/language_names.wml:58
msgid "Cornish"
msgstr "康瓦爾語"
-#: ../../english/template/debian/language_names.wml:57
+#: ../../english/template/debian/language_names.wml:59
msgid "Estonian"
msgstr "愛沙尼亞語"
-#: ../../english/template/debian/language_names.wml:58
+#: ../../english/template/debian/language_names.wml:60
msgid "Faeroese"
msgstr "法羅語"
-#: ../../english/template/debian/language_names.wml:59
+#: ../../english/template/debian/language_names.wml:61
msgid "Gaelic (Scots)"
msgstr "遣蜓y (蘇格蘭)"
-#: ../../english/template/debian/language_names.wml:60
-msgid "Galician"
-msgstr "加利西亞語"
-
-#: ../../english/template/debian/language_names.wml:61
+#: ../../english/template/debian/language_names.wml:62
msgid "Georgian"
msgstr "喬治亞語"
-#: ../../english/template/debian/language_names.wml:62
+#: ../../english/template/debian/language_names.wml:63
msgid "Hebrew"
msgstr "希伯來語"
-#: ../../english/template/debian/language_names.wml:63
+#: ../../english/template/debian/language_names.wml:64
msgid "Hindi"
msgstr "印地語"
-#: ../../english/template/debian/language_names.wml:64
+#: ../../english/template/debian/language_names.wml:65
msgid "Icelandic"
msgstr "冰島語"
-#: ../../english/template/debian/language_names.wml:65
+#: ../../english/template/debian/language_names.wml:66
msgid "Interlingua"
msgstr "國際語"
-#: ../../english/template/debian/language_names.wml:66
+#: ../../english/template/debian/language_names.wml:67
msgid "Irish"
msgstr "愛爾蘭語"
-#: ../../english/template/debian/language_names.wml:67
+#: ../../english/template/debian/language_names.wml:68
msgid "Kalaallisut"
msgstr "格陵蘭語"
-#: ../../english/template/debian/language_names.wml:68
+#: ../../english/template/debian/language_names.wml:69
msgid "Kannada"
msgstr "卡納達語"
-#: ../../english/template/debian/language_names.wml:69
+#: ../../english/template/debian/language_names.wml:70
msgid "Kurdish"
msgstr "庫爾德語"
-#: ../../english/template/debian/language_names.wml:70
+#: ../../english/template/debian/language_names.wml:71
msgid "Latvian"
msgstr "拉脫維亞"
-#: ../../english/template/debian/language_names.wml:71
+#: ../../english/template/debian/language_names.wml:72
msgid "Macedonian"
msgstr "馬其頓語"
-#: ../../english/template/debian/language_names.wml:72
+#: ../../english/template/debian/language_names.wml:73
msgid "Malay"
msgstr "馬來語"
-#: ../../english/template/debian/language_names.wml:73
+#: ../../english/template/debian/language_names.wml:74
msgid "Malayalam"
msgstr "馬拉雅拉姆語"
-#: ../../english/template/debian/language_names.wml:74
+#: ../../english/template/debian/language_names.wml:75
msgid "Maltese"
msgstr "馬爾他語"
-#: ../../english/template/debian/language_names.wml:75
+#: ../../english/template/debian/language_names.wml:76
msgid "Manx"
msgstr "曼島語"
-#: ../../english/template/debian/language_names.wml:76
+#: ../../english/template/debian/language_names.wml:77
msgid "Maori"
msgstr "毛利語"
-#: ../../english/template/debian/language_names.wml:77
+#: ../../english/template/debian/language_names.wml:78
msgid "Mongolian"
msgstr "蒙古語"
-#: ../../english/template/debian/language_names.wml:79
+#: ../../english/template/debian/language_names.wml:80
msgid "Norwegian Bokm&aring;l"
msgstr "挪威語 (Bokm&aring;l)"
-#: ../../english/template/debian/language_names.wml:81
+#: ../../english/template/debian/language_names.wml:82
msgid "Norwegian Nynorsk"
msgstr "挪威語 (Nynorsk)"
-#: ../../english/template/debian/language_names.wml:82
+#: ../../english/template/debian/language_names.wml:83
msgid "Occitan (post 1500)"
msgstr "奧克西唐語"
-#: ../../english/template/debian/language_names.wml:83
+#: ../../english/template/debian/language_names.wml:84
msgid "Persian"
msgstr "波斯語"
-#: ../../english/template/debian/language_names.wml:84
+#: ../../english/template/debian/language_names.wml:85
msgid "Serbian"
msgstr "塞爾維亞語"
-#: ../../english/template/debian/language_names.wml:85
+#: ../../english/template/debian/language_names.wml:86
msgid "Slovenian"
msgstr "[CNHK:斯洛文尼亞:][TW:斯洛伐克:]語"
-#: ../../english/template/debian/language_names.wml:86
+#: ../../english/template/debian/language_names.wml:87
msgid "Tajik"
msgstr "塔吉克語"
-#: ../../english/template/debian/language_names.wml:87
+#: ../../english/template/debian/language_names.wml:88
msgid "Thai"
msgstr "泰語"
-#: ../../english/template/debian/language_names.wml:88
+#: ../../english/template/debian/language_names.wml:89
msgid "Tonga"
msgstr "湯加語"
-#: ../../english/template/debian/language_names.wml:89
+#: ../../english/template/debian/language_names.wml:90
msgid "Twi"
msgstr "契維語"
-#: ../../english/template/debian/language_names.wml:90
+#: ../../english/template/debian/language_names.wml:91
msgid "Ukrainian"
msgstr "烏克蘭語"
-#: ../../english/template/debian/language_names.wml:91
+#: ../../english/template/debian/language_names.wml:92
msgid "Vietnamese"
msgstr "越南語"
-#: ../../english/template/debian/language_names.wml:92
+#: ../../english/template/debian/language_names.wml:93
msgid "Welsh"
msgstr "威爾斯語"
-#: ../../english/template/debian/language_names.wml:93
+#: ../../english/template/debian/language_names.wml:94
msgid "Xhosa"
msgstr "科薩語"
-#: ../../english/template/debian/language_names.wml:94
+#: ../../english/template/debian/language_names.wml:95
msgid "Yiddish"
msgstr "依地語"
-#: ../../english/template/debian/language_names.wml:95
+#: ../../english/template/debian/language_names.wml:96
msgid "Zulu"
msgstr "祖魯語"
diff --git a/chinese/po/legal.zh.po b/chinese/po/legal.zh.po
index f7554cfbaa7..c4cf81ce57e 100644
--- a/chinese/po/legal.zh.po
+++ b/chinese/po/legal.zh.po
@@ -5,69 +5,70 @@ msgstr ""
"Last-Translator: Kanru Chen <koster@debian.org.tw>\n"
"Language-Team: Debian-user in Chinese [Big5] <debian-chinese-big5@lists."
"debian.org>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../../english/template/debian/legal.wml:16
+#: ../../english/template/debian/legal.wml:15
msgid "License Information"
msgstr "授權[CN:信息:][HKTW:資訊:]"
-#: ../../english/template/debian/legal.wml:20
+#: ../../english/template/debian/legal.wml:19
msgid "DLS Index"
msgstr "DLS 目錄"
-#: ../../english/template/debian/legal.wml:24
+#: ../../english/template/debian/legal.wml:23
msgid "DFSG"
msgstr "DFSG"
-#: ../../english/template/debian/legal.wml:28
+#: ../../english/template/debian/legal.wml:27
msgid "DFSG FAQ"
msgstr "DFSG 常見問題"
-#: ../../english/template/debian/legal.wml:32
+#: ../../english/template/debian/legal.wml:31
msgid "Debian-Legal Archive"
msgstr "Debian-Legal 檔案庫"
#. title string without version, on the form "dls-xxx - license name: status"
-#: ../../english/template/debian/legal.wml:50
+#: ../../english/template/debian/legal.wml:49
msgid "%s &ndash; %s: %s"
msgstr "%s &ndash; %s: %s"
#. title string with version, on the form "dls-xxx - license name, version: status"
-#: ../../english/template/debian/legal.wml:53
+#: ../../english/template/debian/legal.wml:52
msgid "%s &ndash; %s, Version %s: %s"
msgstr "%s &ndash; %s, Version %s: %s"
-#: ../../english/template/debian/legal.wml:60
+#: ../../english/template/debian/legal.wml:59
msgid "Date published"
msgstr "公佈日期"
-#: ../../english/template/debian/legal.wml:62
+#: ../../english/template/debian/legal.wml:61
msgid "License"
msgstr "授權"
-#: ../../english/template/debian/legal.wml:65
+#: ../../english/template/debian/legal.wml:64
msgid "Version"
msgstr "版本"
-#: ../../english/template/debian/legal.wml:67
+#: ../../english/template/debian/legal.wml:66
msgid "Summary"
msgstr "摘要"
-#: ../../english/template/debian/legal.wml:71
+#: ../../english/template/debian/legal.wml:70
msgid "Justification"
msgstr "判決"
-#: ../../english/template/debian/legal.wml:73
+#: ../../english/template/debian/legal.wml:72
msgid "Discussion"
msgstr "討論"
-#: ../../english/template/debian/legal.wml:75
+#: ../../english/template/debian/legal.wml:74
msgid "Original Summary"
msgstr "原始摘要"
-#: ../../english/template/debian/legal.wml:77
+#: ../../english/template/debian/legal.wml:76
msgid ""
"The original summary by <summary-author/> can be found in the <a href="
"\"<summary-url/>\">list archives</a>."
@@ -75,15 +76,15 @@ msgstr ""
"由 <summary-author/> 撰寫的原始摘要可以在 <a href=\"<summary-url/>\">list "
"archives</a> 找到。"
-#: ../../english/template/debian/legal.wml:78
+#: ../../english/template/debian/legal.wml:77
msgid "This summary was prepared by <summary-author/>."
msgstr "這個摘要是由 <summary-author/> 準備的。"
-#: ../../english/template/debian/legal.wml:81
+#: ../../english/template/debian/legal.wml:80
msgid "License text (translated)"
msgstr "授權文字 (翻譯)"
-#: ../../english/template/debian/legal.wml:84
+#: ../../english/template/debian/legal.wml:83
msgid "License text"
msgstr "授權文字"
diff --git a/chinese/po/mailinglists.zh.po b/chinese/po/mailinglists.zh.po
index 0dd1391227f..67d43c709c6 100644
--- a/chinese/po/mailinglists.zh.po
+++ b/chinese/po/mailinglists.zh.po
@@ -5,6 +5,7 @@ msgstr ""
"Last-Translator: Kanru Chen <koster@debian.org.tw>\n"
"Language-Team: Debian-user in Chinese [Big5] <debian-chinese-big5@lists."
"debian.org>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -34,8 +35,11 @@ msgstr ""
"Debian 郵件列表。"
#: ../../english/MailingLists/mklist.tags:15
-msgid "Please select which lists you want to subscribe to:"
-msgstr "請選擇您想要訂閱的郵件列表:"
+msgid ""
+"Please select which lists you want to subscribe to (the number of "
+"subscriptions is limited, if your request doesn't succeed, please use <a "
+"href=\"./#subunsub\">another method</a>):"
+msgstr ""
#: ../../english/MailingLists/mklist.tags:18
msgid "No description given"
@@ -94,8 +98,11 @@ msgstr ""
"訂閱。<a href=\"unsubscribe\">訂閱網頁</a>可以用來線上訂閱郵件列表。"
#: ../../english/MailingLists/mklist.tags:54
-msgid "Please select which lists you want to unsubscribe from:"
-msgstr "請選擇您要取消訂閱哪個列表:"
+msgid ""
+"Please select which lists you want to unsubscribe from (the number of "
+"unsubscriptions is limited, if your request doesn't succeed, please use <a "
+"href=\"./#subunsub\">another method</a>):"
+msgstr ""
#: ../../english/MailingLists/mklist.tags:57
msgid "Unsubscribe"
@@ -108,3 +115,9 @@ msgstr "公開"
#: ../../english/MailingLists/mklist.tags:63
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 "請選擇您想要訂閱的郵件列表:"
diff --git a/chinese/po/newsevents.zh.po b/chinese/po/newsevents.zh.po
index 64860aa6bd0..5aa9eea9059 100644
--- a/chinese/po/newsevents.zh.po
+++ b/chinese/po/newsevents.zh.po
@@ -156,7 +156,9 @@ msgstr "<get-var url /> (連結失效)"
msgid ""
"Welcome to this year's <get-var issue /> issue of DPN, the newsletter for "
"the Debian community. Topics covered in this issue include:"
-msgstr "欢迎阅读本年度第<get-var issue />期 DPN,Debian 社区的时事通讯。本期主题包括:"
+msgstr ""
+"欢迎阅读本年度第<get-var issue />期 DPN,Debian 社区的时事通讯。本期主题包"
+"括:"
#: ../../english/template/debian/projectnews/boilerplates.wml:56
#: ../../english/template/debian/projectnews/boilerplates.wml:77
@@ -168,16 +170,20 @@ msgid ""
"to being solved, roughly speaking, about <get-var tobefixed /> Release-"
"Critical bugs remain to be solved for the release to happen."
msgstr ""
-"根据<a href=\"http://udd.debian.org/bugs.cgi\">终极 Debian 数据库(UDD)的 Bug\n"
+"根据<a href=\"http://udd.debian.org/bugs.cgi\">终极 Debian 数据库(UDD)的 "
+"Bug\n"
"搜索页</a>,即将到来的新版本 Debian <q><get-var release /></q> 目前还有\n"
-"<get-var testing />个 RC bug。忽略掉很容易修复的或正在被修复的 bug,大约还有\n"
+"<get-var testing />个 RC bug。忽略掉很容易修复的或正在被修复的 bug,大约还"
+"有\n"
" <get-var tobefixed />个 RC bug 需要修复,才能发行下一个版本。"
#: ../../english/template/debian/projectnews/boilerplates.wml:57
msgid ""
"There are also some <a href=\"http://wiki.debian.org/ProjectNews/RC-Stats"
"\">hints on how to interpret</a> these numbers."
-msgstr "<a href=\"http://wiki.debian.org/ProjectNews/RC-Stats\">一些提示,如何理解</a>这些数字。"
+msgstr ""
+"<a href=\"http://wiki.debian.org/ProjectNews/RC-Stats\">一些提示,如何理解</"
+"a>这些数字。"
#: ../../english/template/debian/projectnews/boilerplates.wml:78
msgid ""
@@ -186,7 +192,8 @@ msgid ""
"on how to interpret</a> these numbers."
msgstr ""
"这里有<a href=\"<get-var url />\">更详细的统计数据</a>,及\n"
-"<a href=\"http://wiki.debian.org/ProjectNews/RC-Stats\">如何理解</a>这些数字。"
+"<a href=\"http://wiki.debian.org/ProjectNews/RC-Stats\">如何理解</a>这些数"
+"字。"
#: ../../english/template/debian/projectnews/boilerplates.wml:102
msgid ""
@@ -210,10 +217,143 @@ msgid ""
"receiving your mail at <a href=\"mailto:debian-publicity@lists.debian.org"
"\">debian-publicity@lists.debian.org</a>."
msgstr ""
-"请帮助我们创建这份通讯。我们仍然需要更多的志愿写作者关注 Debian 社区并报告发生了什么事。请"
-"查看<a href=\"http://wiki.debian.org/ProjectNews/HowToContribute\">贡献页</a>"
-"以便知道如何帮助我们。我们期待在 <a href=\"mailto:debian-publicity@lists.debian.org"
-"\">debian-publicity@lists.debian.org</a> 列表收到你的邮件。"
+"请帮助我们创建这份通讯。我们仍然需要更多的志愿写作者关注 Debian 社区并报告发"
+"生了什么事。请查看<a href=\"http://wiki.debian.org/ProjectNews/"
+"HowToContribute\">贡献页</a>以便知道如何帮助我们。我们期待在 <a href="
+"\"mailto:debian-publicity@lists.debian.org\">debian-publicity@lists.debian."
+"org</a> 列表收到你的邮件。"
+
+#: ../../english/template/debian/projectnews/boilerplates.wml:175
+msgid ""
+"Please note that these are a selection of the more important security "
+"advisories of the last weeks. If you need to be kept up to date about "
+"security advisories released by the Debian Security Team, please subscribe "
+"to the <a href=\"<get-var url-dsa />\">security mailing list</a> (and the "
+"separate <a href=\"<get-var url-bpo />\">backports list</a>, and <a href="
+"\"<get-var url-stable-announce />\">stable updates list</a>) for "
+"announcements."
+msgstr ""
+
+#: ../../english/template/debian/projectnews/boilerplates.wml:176
+msgid ""
+"Please note that these are a selection of the more important security "
+"advisories of the last weeks. If you need to be kept up to date about "
+"security advisories released by the Debian Security Team, please subscribe "
+"to the <a href=\"<get-var url-dsa />\">security mailing list</a> (and the "
+"separate <a href=\"<get-var url-bpo />\">backports list</a>, and <a href="
+"\"<get-var url-stable-announce />\">stable updates list</a> or <a href="
+"\"<get-var url-volatile-announce />\">volatile list</a>, for <q><get-var old-"
+"stable /></q>, the oldstable distribution) for announcements."
+msgstr ""
+
+#: ../../english/template/debian/projectnews/boilerplates.wml:185
+msgid ""
+"Debian's Stable Release Team released an update announcement for the "
+"package: "
+msgstr ""
+
+#: ../../english/template/debian/projectnews/boilerplates.wml:187
+#: ../../english/template/debian/projectnews/boilerplates.wml:200
+#: ../../english/template/debian/projectnews/boilerplates.wml:213
+#: ../../english/template/debian/projectnews/boilerplates.wml:344
+#: ../../english/template/debian/projectnews/boilerplates.wml:358
+msgid ", "
+msgstr ""
+
+#: ../../english/template/debian/projectnews/boilerplates.wml:188
+#: ../../english/template/debian/projectnews/boilerplates.wml:201
+#: ../../english/template/debian/projectnews/boilerplates.wml:214
+#: ../../english/template/debian/projectnews/boilerplates.wml:345
+#: ../../english/template/debian/projectnews/boilerplates.wml:359
+msgid " and "
+msgstr ""
+
+#: ../../english/template/debian/projectnews/boilerplates.wml:189
+#: ../../english/template/debian/projectnews/boilerplates.wml:202
+#: ../../english/template/debian/projectnews/boilerplates.wml:215
+msgid ". "
+msgstr ""
+
+#: ../../english/template/debian/projectnews/boilerplates.wml:189
+#: ../../english/template/debian/projectnews/boilerplates.wml:202
+#: ../../english/template/debian/projectnews/boilerplates.wml:215
+msgid "Please read them carefully and take the proper measures."
+msgstr ""
+
+#: ../../english/template/debian/projectnews/boilerplates.wml:198
+msgid "Debian's Backports Team released advisories for these packages: "
+msgstr ""
+
+#: ../../english/template/debian/projectnews/boilerplates.wml:211
+msgid ""
+"Debian's Security Team recently released advisories for these packages "
+"(among others): "
+msgstr ""
+
+#: ../../english/template/debian/projectnews/boilerplates.wml:240
+msgid ""
+"<get-var num-newpkg /> packages were added to the unstable Debian archive "
+"recently."
+msgstr ""
+
+#: ../../english/template/debian/projectnews/boilerplates.wml:242
+msgid " <a href=\"<get-var url-newpkg />\">Among many others</a> are:"
+msgstr ""
+
+#: ../../english/template/debian/projectnews/boilerplates.wml:269
+msgid "There are several upcoming Debian-related events:"
+msgstr ""
+
+#: ../../english/template/debian/projectnews/boilerplates.wml:275
+msgid ""
+"You can find more information about Debian-related events and talks on the "
+"<a href=\"<get-var events-section />\">events section</a> of the Debian web "
+"site, or subscribe to one of our events mailing lists for different regions: "
+"<a href=\"<get-var events-ml-eu />\">Europe</a>, <a href=\"<get-var events-"
+"ml-nl />\">Netherlands</a>, <a href=\"<get-var events-ml-ha />\">Hispanic "
+"America</a>, <a href=\"<get-var events-ml-na />\">North America</a>."
+msgstr ""
+
+#: ../../english/template/debian/projectnews/boilerplates.wml:300
+msgid ""
+"Do you want to organise a Debian booth or a Debian install party? Are you "
+"aware of other upcoming Debian-related events? Have you delivered a Debian "
+"talk that you want to link on our <a href=\"<get-var events-talks />\">talks "
+"page</a>? Send an email to the <a href=\"<get-var events-team />\">Debian "
+"Events Team</a>."
+msgstr ""
+
+#: ../../english/template/debian/projectnews/boilerplates.wml:322
+msgid ""
+"<get-var dd-num /> applicants have been <a href=\"<get-var dd-url />"
+"\">accepted</a> as Debian Developers"
+msgstr ""
+
+#: ../../english/template/debian/projectnews/boilerplates.wml:329
+msgid ""
+"<get-var dm-num /> applicants have been <a href=\"<get-var dm-url />"
+"\">accepted</a> as Debian Maintainers"
+msgstr ""
+
+#: ../../english/template/debian/projectnews/boilerplates.wml:336
+msgid ""
+"<get-var uploader-num /> people have <a href=\"<get-var uploader-url />"
+"\">started to maintain packages</a>"
+msgstr ""
+
+#: ../../english/template/debian/projectnews/boilerplates.wml:381
+msgid ""
+"<get-var eval-newcontributors-text-list /> since the previous issue of the "
+"Debian Project News. Please welcome <get-var eval-newcontributors-name-list /"
+"> into our project!"
+msgstr ""
+
+#: ../../english/template/debian/projectnews/boilerplates.wml:394
+msgid ""
+"The <get-var issue-devel-news /> issue of the <a href=\"<get-var url-devel-"
+"news />\">miscellaneous news for developers</a> has been released and covers "
+"the following topics:"
+msgstr ""
#: ../../english/template/debian/projectnews/footer.wml:6
msgid ""
diff --git a/chinese/po/organization.zh.po b/chinese/po/organization.zh.po
index 2f57ddf933f..8f8d3ae63b8 100644
--- a/chinese/po/organization.zh.po
+++ b/chinese/po/organization.zh.po
@@ -5,253 +5,305 @@ msgstr ""
"Last-Translator: Kanru Chen <koster@debian.org.tw>\n"
"Language-Team: Debian-user in Chinese [Big5] <debian-chinese-big5@lists."
"debian.org>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../../english/intro/organization.data:15
-#: ../../english/intro/organization.data:17
+#: ../../english/intro/organization.data:13
+msgid "delegation mail"
+msgstr ""
+
+#: ../../english/intro/organization.data:14
+msgid "appointment mail"
+msgstr ""
+
+#. One male delegate
+#: ../../english/intro/organization.data:16
+msgid "<void id=\"male\"/>delegate"
+msgstr ""
+
+#. One female delegate
+#: ../../english/intro/organization.data:18
+msgid "<void id=\"female\"/>delegate"
+msgstr ""
+
+#: ../../english/intro/organization.data:21
+#: ../../english/intro/organization.data:23
msgid "current"
msgstr "目前"
-#: ../../english/intro/organization.data:19
-#: ../../english/intro/organization.data:21
+#: ../../english/intro/organization.data:25
+#: ../../english/intro/organization.data:27
msgid "member"
msgstr "會員"
-#: ../../english/intro/organization.data:24
+#: ../../english/intro/organization.data:30
msgid "manager"
msgstr "管理員"
-#: ../../english/intro/organization.data:26
+#: ../../english/intro/organization.data:32
+msgid "SRM"
+msgstr ""
+
+#: ../../english/intro/organization.data:32
+#, fuzzy
+#| msgid "Release Management"
+msgid "Stable Release Manager"
+msgstr "釋出管理"
+
+#: ../../english/intro/organization.data:34
msgid "wizard"
msgstr "巫師"
-#: ../../english/intro/organization.data:29
+#: ../../english/intro/organization.data:37
msgid "chairman"
msgstr "主席"
-#: ../../english/intro/organization.data:32
+#: ../../english/intro/organization.data:40
msgid "assistant"
msgstr "助理"
-#: ../../english/intro/organization.data:34
+#: ../../english/intro/organization.data:42
msgid "secretary"
msgstr "秘書"
-#: ../../english/intro/organization.data:43
#: ../../english/intro/organization.data:51
+#: ../../english/intro/organization.data:60
msgid "Officers"
msgstr "總管"
-#: ../../english/intro/organization.data:44
-#: ../../english/intro/organization.data:68
+#: ../../english/intro/organization.data:52
+#: ../../english/intro/organization.data:80
msgid "Distribution"
msgstr "發行版"
-#: ../../english/intro/organization.data:45
-#: ../../english/intro/organization.data:197
+#: ../../english/intro/organization.data:53
+#: ../../english/intro/organization.data:220
msgid "Publicity"
msgstr ""
-#: ../../english/intro/organization.data:46
-#: ../../english/intro/organization.data:218
+#: ../../english/intro/organization.data:54
+#: ../../english/intro/organization.data:246
msgid "Support and Infrastructure"
msgstr "支援以及下級組織"
-#: ../../english/intro/organization.data:47
-msgid "Custom Debian Distributions"
-msgstr "客製化 Debian 發行版"
+#. formerly Custom Debian Distributions (CCDs); see http://blends.alioth.debian.org/blends/ch-about.en.html#s-Blends
+#: ../../english/intro/organization.data:56
+msgid "Debian Pure Blends"
+msgstr ""
-#: ../../english/intro/organization.data:54
+#: ../../english/intro/organization.data:63
msgid "Leader"
msgstr "領袖"
-#: ../../english/intro/organization.data:56
+#: ../../english/intro/organization.data:65
msgid "Technical Committee"
msgstr "技術委員會"
-#: ../../english/intro/organization.data:63
+#: ../../english/intro/organization.data:74
msgid "Secretary"
msgstr "秘書"
-#: ../../english/intro/organization.data:71
+#: ../../english/intro/organization.data:83
msgid "Development Projects"
msgstr "各項開發計劃"
-#: ../../english/intro/organization.data:72
+#: ../../english/intro/organization.data:84
msgid "FTP Archives"
msgstr "FTP 庫存"
-#: ../../english/intro/organization.data:74
-msgid "FTP Master"
+#: ../../english/intro/organization.data:86
+#, fuzzy
+#| msgid "FTP Master"
+msgid "FTP Masters"
msgstr "FTP 總管"
-#: ../../english/intro/organization.data:77
+#: ../../english/intro/organization.data:90
msgid "FTP Assistants"
msgstr "FTP 助理"
-#: ../../english/intro/organization.data:83
+#: ../../english/intro/organization.data:97
+msgid "FTP Wizards"
+msgstr ""
+
+#: ../../english/intro/organization.data:101
+msgid "Backports"
+msgstr ""
+
+#: ../../english/intro/organization.data:103
+msgid "Backports Team"
+msgstr ""
+
+#: ../../english/intro/organization.data:107
msgid "Individual Packages"
msgstr "個別軟件包"
-#: ../../english/intro/organization.data:84
+#: ../../english/intro/organization.data:108
msgid "Release Management"
msgstr "釋出管理"
-#: ../../english/intro/organization.data:86
+#: ../../english/intro/organization.data:110
msgid "Release Team"
msgstr "釋出團隊"
-#: ../../english/intro/organization.data:97
-msgid "Release Team for ``stable''"
-msgstr "穩定版的釋出團隊"
-
-#: ../../english/intro/organization.data:105
+#: ../../english/intro/organization.data:122
msgid "Quality Assurance"
msgstr "品質管理"
-#: ../../english/intro/organization.data:106
+#: ../../english/intro/organization.data:123
msgid "Installation System Team"
msgstr "安裝系統小組"
-#: ../../english/intro/organization.data:107
+#: ../../english/intro/organization.data:124
msgid "Release Notes"
msgstr "釋出公告"
-#: ../../english/intro/organization.data:109
+#: ../../english/intro/organization.data:126
msgid "CD Images"
msgstr "光碟映像"
-#: ../../english/intro/organization.data:111
+#: ../../english/intro/organization.data:128
msgid "Production"
msgstr "產品"
-#: ../../english/intro/organization.data:118
-msgid "Vendors"
-msgstr "廠商"
-
-#: ../../english/intro/organization.data:120
+#: ../../english/intro/organization.data:136
msgid "Testing"
msgstr "測試"
-#: ../../english/intro/organization.data:122
+#: ../../english/intro/organization.data:138
+#, fuzzy
+#| msgid "Support and Infrastructure"
+msgid "Autobuilding infrastructure"
+msgstr "支援以及下級組織"
+
+#: ../../english/intro/organization.data:140
+msgid "Wanna-build team"
+msgstr ""
+
+#: ../../english/intro/organization.data:146
+#, fuzzy
+#| msgid "Buildd Administration"
+msgid "Buildd administration"
+msgstr "Buildd 管理"
+
+#: ../../english/intro/organization.data:165
msgid "Documentation"
msgstr "文件"
-#: ../../english/intro/organization.data:127
+#: ../../english/intro/organization.data:170
msgid "Work-Needing and Prospective Packages list"
msgstr "需要幫助的套件清單"
-#: ../../english/intro/organization.data:131
+#: ../../english/intro/organization.data:173
msgid "Live System Team"
msgstr "Live 系統小組"
-#: ../../english/intro/organization.data:132
+#: ../../english/intro/organization.data:174
msgid "Ports"
msgstr "移植"
-#: ../../english/intro/organization.data:186
+#: ../../english/intro/organization.data:210
msgid "Special Configurations"
msgstr "特別[CN:配置:][HKTW:組態設定:]"
-#: ../../english/intro/organization.data:189
+#: ../../english/intro/organization.data:213
msgid "Laptops"
msgstr "筆記型電腦"
-#: ../../english/intro/organization.data:190
+#: ../../english/intro/organization.data:214
msgid "Firewalls"
msgstr "防火牆"
-#: ../../english/intro/organization.data:191
-msgid "Handhelds"
-msgstr "手持式設備"
-
-#: ../../english/intro/organization.data:192
+#: ../../english/intro/organization.data:215
msgid "Embedded systems"
msgstr "嵌入式系統"
-#: ../../english/intro/organization.data:200
+#: ../../english/intro/organization.data:223
msgid "Press Contact"
msgstr ""
-#: ../../english/intro/organization.data:203
+#: ../../english/intro/organization.data:229
msgid "Partner Program"
msgstr "合作計劃"
-#: ../../english/intro/organization.data:208
+#: ../../english/intro/organization.data:234
msgid "Events"
msgstr "活動"
-#: ../../english/intro/organization.data:212
-msgid "Marketing Team"
-msgstr "行銷團隊"
+#: ../../english/intro/organization.data:240
+msgid "Bits from Debian"
+msgstr ""
-#: ../../english/intro/organization.data:221
+#: ../../english/intro/organization.data:249
msgid "User support"
msgstr "[CNHK:用戶:][TW:使用者:][HKTW:支援:][CN:支持:]"
-#: ../../english/intro/organization.data:288
+#: ../../english/intro/organization.data:316
msgid "Bug Tracking System"
msgstr "錯誤追縱系統"
-#: ../../english/intro/organization.data:295
+#: ../../english/intro/organization.data:321
msgid "Mailing Lists Administration and Mailing List Archives"
msgstr "郵件列表管理與郵件列表庫存"
-#: ../../english/intro/organization.data:303
-msgid "New Maintainers Front Desk"
+#: ../../english/intro/organization.data:329
+#, fuzzy
+#| msgid "New Maintainers Front Desk"
+msgid "New Members Front Desk"
msgstr "新進開發人員櫃台"
-#: ../../english/intro/organization.data:308
+#: ../../english/intro/organization.data:334
msgid "Debian Account Managers"
msgstr "Debian 帳號管理員"
-#: ../../english/intro/organization.data:311
+#: ../../english/intro/organization.data:338
msgid "Keyring Maintainers (PGP and GPG)"
msgstr "Keyring (PGP 與 GPG) 管理員"
-#: ../../english/intro/organization.data:314
-msgid "Debian Maintainer Keyring Team"
+#: ../../english/intro/organization.data:341
+#, fuzzy
+#| msgid "Debian Maintainer Keyring Team"
+msgid "Debian Maintainer (DM) Keyring Maintainers"
msgstr "Debian 開發人員 Keyring 團隊"
-#: ../../english/intro/organization.data:323
+#: ../../english/intro/organization.data:345
msgid "Security Team"
msgstr "安全團隊"
-#: ../../english/intro/organization.data:333
+#: ../../english/intro/organization.data:360
msgid "Testing Security Team"
msgstr "測試版安全團隊"
-#: ../../english/intro/organization.data:340
+#: ../../english/intro/organization.data:369
msgid "Security Audit Project"
msgstr "安全稽查計劃"
-#: ../../english/intro/organization.data:345
+#: ../../english/intro/organization.data:374
msgid "Web Pages"
msgstr "網頁"
-#: ../../english/intro/organization.data:351
+#: ../../english/intro/organization.data:382
msgid "Consultants Page"
msgstr "顧問網頁"
-#: ../../english/intro/organization.data:356
+#: ../../english/intro/organization.data:387
msgid "CD Vendors Page"
msgstr "CD 廠商網頁"
-#: ../../english/intro/organization.data:359
+#: ../../english/intro/organization.data:390
msgid "Planet Debian"
msgstr "Debian 星球"
-#: ../../english/intro/organization.data:364
+#: ../../english/intro/organization.data:394
msgid "Policy"
msgstr "政策"
-#: ../../english/intro/organization.data:370
+#: ../../english/intro/organization.data:400
msgid "System Administration"
msgstr "系統管理"
-#: ../../english/intro/organization.data:371
+#: ../../english/intro/organization.data:401
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."
@@ -259,7 +311,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:378
+#: ../../english/intro/organization.data:408
msgid ""
"If you have hardware problems with Debian machines, please see <a href="
"\"http://db.debian.org/machines.cgi\">Debian Machines</a> page, it should "
@@ -269,102 +321,129 @@ msgstr ""
"\"http://db.debian.org/machines.cgi\">Debian Machines</a> page,it should "
"contain per-machine administrator information."
-#: ../../english/intro/organization.data:379
-msgid "Buildd Administration"
-msgstr "Buildd 管理"
-
-#: ../../english/intro/organization.data:380
-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>。"
-
-#: ../../english/intro/organization.data:381
-msgid ""
-"Names of individual buildd's admins can also be found on <a href=\"http://"
-"www.buildd.net\">http://www.buildd.net</a>. Choose an architecture and a "
-"distribution to see the available buildd's and their admins."
-msgstr ""
-"個別 buildd 系統管理員的名字也可以在 <a href=\"http://www.buildd.net"
-"\">http://www.buildd.net</a> 找到。選擇特定硬體架構與發行版來查詢其 buildd 與"
-"管理員。"
-
-#: ../../english/intro/organization.data:382
+#: ../../english/intro/organization.data:409
msgid "LDAP Developer Directory Administrator"
msgstr "LDAP 開發人員目錄管理"
-#: ../../english/intro/organization.data:383
+#: ../../english/intro/organization.data:410
msgid "Mirrors"
msgstr "鏡像站台"
-#: ../../english/intro/organization.data:392
+#: ../../english/intro/organization.data:415
msgid "DNS Maintainer"
msgstr "DNS 管理"
-#: ../../english/intro/organization.data:393
+#: ../../english/intro/organization.data:416
msgid "Package Tracking System"
msgstr "套件追蹤系統"
-#: ../../english/intro/organization.data:395
-msgid "Key Signing Coordination"
-msgstr "Key Signing 協調"
-
-#: ../../english/intro/organization.data:398
+#: ../../english/intro/organization.data:418
msgid "Hardware Donations Coordination"
msgstr "協調硬體捐贈"
-#: ../../english/intro/organization.data:404
-msgid "Accountant"
-msgstr "帳號管理"
-
-#: ../../english/intro/organization.data:406
+#: ../../english/intro/organization.data:424
msgid "Auditor"
msgstr "監察"
-#: ../../english/intro/organization.data:408
+#: ../../english/intro/organization.data:427
+msgid "<a href=\"m4_HOME/trademark\">Trademark</a> use requests"
+msgstr ""
+
+#: ../../english/intro/organization.data:428
+msgid "current Debian Project Leader"
+msgstr ""
+
+#: ../../english/intro/organization.data:430
msgid "Alioth administrators"
msgstr "Alioth 管理"
-#: ../../english/intro/organization.data:413
+#: ../../english/intro/organization.data:436
msgid "Debian Women Project"
msgstr "Debian Women 計劃"
-#: ../../english/intro/organization.data:427
+#: ../../english/intro/organization.data:443
+msgid "DebConf chairs"
+msgstr ""
+
+#: ../../english/intro/organization.data:447
+msgid "Anti-harassment"
+msgstr ""
+
+#: ../../english/intro/organization.data:458
msgid "Debian for children from 1 to 99"
msgstr "給 1 到 99 歲小孩使用的 Debian"
-#: ../../english/intro/organization.data:430
+#: ../../english/intro/organization.data:461
msgid "Debian for medical practice and research"
msgstr "給醫藥界使用的 Debian"
-#: ../../english/intro/organization.data:433
+#: ../../english/intro/organization.data:464
msgid "Debian for education"
msgstr "給教育界使用的 Debian"
-#: ../../english/intro/organization.data:441
-msgid "The Universal Operating System as your Desktop"
-msgstr "使用環球作業系統作為桌面環境"
-
-#: ../../english/intro/organization.data:445
+#: ../../english/intro/organization.data:471
msgid "Debian in legal offices"
msgstr "給法律界使用的 Debian"
-#: ../../english/intro/organization.data:448
-msgid "Debian for non-profit organisations"
-msgstr "給非營利組織用的 Debian"
-
-#: ../../english/intro/organization.data:450
+#: ../../english/intro/organization.data:475
msgid "Debian for people with disabilities"
msgstr "給殘障人士使用的 Debian"
-#~ msgid "Mailing list"
-#~ msgstr "郵件列表"
+#: ../../english/intro/organization.data:479
+#, fuzzy
+#| msgid "Debian for medical practice and research"
+msgid "Debian for science and related research"
+msgstr "給醫藥界使用的 Debian"
+
+#~ msgid "APT Team"
+#~ msgstr "APT 小組"
#~ msgid "Mailing List Archives"
#~ msgstr "郵件列表歸檔"
-#~ msgid "APT Team"
-#~ msgstr "APT 小組"
+#~ msgid "Mailing list"
+#~ msgstr "郵件列表"
+
+#~ msgid "Debian for non-profit organisations"
+#~ msgstr "給非營利組織用的 Debian"
+
+#~ 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://"
+#~ "www.buildd.net\">http://www.buildd.net</a>. Choose an architecture and a "
+#~ "distribution to see the available buildd's and their admins."
+#~ msgstr ""
+#~ "個別 buildd 系統管理員的名字也可以在 <a href=\"http://www.buildd.net"
+#~ "\">http://www.buildd.net</a> 找到。選擇特定硬體架構與發行版來查詢其 "
+#~ "buildd 與管理員。"
+
+#~ msgid ""
+#~ "The admins responsible for buildd's for a particular arch can be reached "
+#~ "at <genericemail arch@buildd.debian.org>, for example <genericemail "
+#~ "i386@buildd.debian.org>."
+#~ msgstr ""
+#~ "負責管理 buildd 的特定硬體架構的管理員可以透過<genericemail arch@buildd."
+#~ "debian.org> 聯絡,如 <genericemail i386@buildd.debian.org>。"
+
+#~ msgid "Marketing Team"
+#~ msgstr "行銷團隊"
+
+#~ msgid "Handhelds"
+#~ msgstr "手持式設備"
+
+#~ msgid "Vendors"
+#~ msgstr "廠商"
+
+#~ msgid "Release Team for ``stable''"
+#~ msgstr "穩定版的釋出團隊"
+
+#~ msgid "Custom Debian Distributions"
+#~ msgstr "客製化 Debian 發行版"
diff --git a/chinese/po/others.zh.po b/chinese/po/others.zh.po
index 51e94cdf154..62845fed744 100644
--- a/chinese/po/others.zh.po
+++ b/chinese/po/others.zh.po
@@ -5,6 +5,7 @@ msgstr ""
"Last-Translator: Kanru Chen <koster@debian.org.tw>\n"
"Language-Team: Debian-user in Chinese [Big5] <debian-chinese-big5@lists."
"debian.org>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -58,7 +59,9 @@ msgid "Unavailable"
msgstr "未提供"
#: ../../english/devel/join/nm-steps.inc:7
-msgid "New Maintainers' Corner"
+#, fuzzy
+#| msgid "New Maintainers' Corner"
+msgid "New Members Corner"
msgstr "新進人員專區"
#: ../../english/devel/join/nm-steps.inc:10
@@ -93,15 +96,24 @@ msgstr "第七步"
msgid "Applicants' checklist"
msgstr "申請者自我檢查單"
-#: ../../english/devel/website/tc.data:13
+#: ../../english/devel/website/tc.data:11
msgid ""
-"See <a href=\"m4_HOME/intl/french/\">http://www.debian.org/intl/"
-"french/</a> (only available in French) for more information."
+"See <a href=\"m4_HOME/intl/french/\">http://www.debian.org/intl/french/</a> "
+"(only available in French) for more information."
msgstr ""
-"詳細資訊請參考 <a href=\"m4_HOME/intl/french/\">http://www."
-"debian.org/intl/french/</a> (只有法語)。"
+"詳細資訊請參考 <a href=\"m4_HOME/intl/french/\">http://www.debian.org/intl/"
+"french/</a> (只有法語)。"
+#: ../../english/devel/website/tc.data:12
+#: ../../english/devel/website/tc.data:14
#: ../../english/devel/website/tc.data:15
+#: ../../english/devel/website/tc.data:16
+#, fuzzy
+#| msgid "Additional Information"
+msgid "More information"
+msgstr "其他資訊"
+
+#: ../../english/devel/website/tc.data:13
msgid ""
"See <a href=\"m4_HOME/intl/spanish/\">http://www.debian.org/intl/spanish/</"
"a> (only available in Spanish) for more information."
@@ -109,16 +121,22 @@ msgstr ""
"詳細資訊請參考 <a href=\"m4_HOME/intl/spanish/\">http://www.debian.org/intl/"
"spanish/</a> (只有西班牙語)。"
-#: ../../english/distrib/pre-installed.data:40
-msgid "Phone:"
+#: ../../english/distrib/pre-installed.defs:18
+#, fuzzy
+#| msgid "Phone:"
+msgid "Phone"
msgstr "電話:"
-#: ../../english/distrib/pre-installed.data:43
-msgid "Fax:"
+#: ../../english/distrib/pre-installed.defs:19
+#, fuzzy
+#| msgid "Fax:"
+msgid "Fax"
msgstr "傳真:"
-#: ../../english/distrib/pre-installed.data:49
-msgid "Address:"
+#: ../../english/distrib/pre-installed.defs:21
+#, fuzzy
+#| msgid "Address:"
+msgid "Address"
msgstr "地址:"
#: ../../english/logos/index.data:6
@@ -225,6 +243,45 @@ msgstr "耳環"
msgid "suitcases"
msgstr ""
+#: ../../english/misc/merchandise.def:51
+msgid "umbrellas"
+msgstr ""
+
+#: ../../english/misc/merchandise.def:55
+msgid "pillowcases"
+msgstr ""
+
+#: ../../english/women/profiles/profiles.def:24
+msgid "How long have you been using Debian?"
+msgstr ""
+
+#: ../../english/women/profiles/profiles.def:27
+msgid "Are you a Debian Developer?"
+msgstr ""
+
+#: ../../english/women/profiles/profiles.def:30
+msgid "What areas of Debian are you involved in?"
+msgstr ""
+
+#: ../../english/women/profiles/profiles.def:33
+msgid "What got you interested in working with Debian?"
+msgstr ""
+
+#: ../../english/women/profiles/profiles.def:36
+msgid ""
+"Do you have any tips for women interested in getting more involved with "
+"Debian?"
+msgstr ""
+
+#: ../../english/women/profiles/profiles.def:39
+msgid ""
+"Are you involved with any other women in technology group? Which one(s)?"
+msgstr ""
+
+#: ../../english/women/profiles/profiles.def:42
+msgid "A bit more about you..."
+msgstr ""
+
#: ../../english/y2k/l10n.data:6
msgid "OK"
msgstr "合格"
@@ -269,62 +326,59 @@ msgstr "版本"
msgid "URL"
msgstr "網址"
-#~ msgid "Name:"
-#~ msgstr "姓名:"
-
-#~ msgid "Company:"
-#~ msgstr "公司:"
+#~ msgid "Debian Technical Committee only"
+#~ msgstr "限於 Debian 技術委員會"
-#~ msgid "URL:"
-#~ msgstr "網址:"
+#~ msgid "deity developers only"
+#~ msgstr "限於 deity 開發者"
-#~ msgid "or"
-#~ msgstr "或"
+#~ msgid "developers only"
+#~ msgstr "限於開發者"
-#~ msgid "Email:"
-#~ msgstr "Email:"
+#~ msgid "closed"
+#~ msgstr "關閉"
-#~ msgid "Rates:"
-#~ msgstr "收費:"
+#~ msgid "open"
+#~ msgstr "公開"
-#~ msgid "Additional Information"
-#~ msgstr "其他資訊"
+#~ msgid "Mailing List Unsubscription"
+#~ msgstr "取消訂閱郵件列表"
#~ msgid ""
-#~ "<total_consultant> Debian consultants listed in <total_country> countries "
-#~ "worldwide."
-#~ msgstr ""
-#~ "以下的名單中共有來自世界 <total_country> 個國家的 <total_consultant> 個 "
-#~ "Debian 顧問。"
+#~ "Please respect the <a href=\"./#ads\">Debian mailing list advertising "
+#~ "policy</a>."
+#~ msgstr "請尊重 <a href=\"./#ads\">Debian 郵件列表廣告政策</a>。"
-#~ msgid "Mailing List Subscription"
-#~ msgstr "訂閱郵件列表"
+#~ msgid "Clear"
+#~ msgstr "清除"
#~ msgid "Your E-Mail address:"
#~ msgstr "您的 E-Mail 地址:"
-#~ msgid "Clear"
-#~ msgstr "清除"
+#~ msgid "Mailing List Subscription"
+#~ msgstr "訂閱郵件列表"
#~ msgid ""
-#~ "Please respect the <a href=\"./#ads\">Debian mailing list advertising "
-#~ "policy</a>."
-#~ msgstr "請尊重 <a href=\"./#ads\">Debian 郵件列表廣告政策</a>。"
+#~ "<total_consultant> Debian consultants listed in <total_country> countries "
+#~ "worldwide."
+#~ msgstr ""
+#~ "以下的名單中共有來自世界 <total_country> 個國家的 <total_consultant> 個 "
+#~ "Debian 顧問。"
-#~ msgid "Mailing List Unsubscription"
-#~ msgstr "取消訂閱郵件列表"
+#~ msgid "Rates:"
+#~ msgstr "收費:"
-#~ msgid "open"
-#~ msgstr "公開"
+#~ msgid "Email:"
+#~ msgstr "Email:"
-#~ msgid "closed"
-#~ msgstr "關閉"
+#~ msgid "or"
+#~ msgstr "或"
-#~ msgid "developers only"
-#~ msgstr "限於開發者"
+#~ msgid "URL:"
+#~ msgstr "網址:"
-#~ msgid "deity developers only"
-#~ msgstr "限於 deity 開發者"
+#~ msgid "Company:"
+#~ msgstr "公司:"
-#~ msgid "Debian Technical Committee only"
-#~ msgstr "限於 Debian 技術委員會"
+#~ msgid "Name:"
+#~ msgstr "姓名:"
diff --git a/chinese/po/ports.zh.po b/chinese/po/ports.zh.po
index aef5c041c53..1e76ef509af 100644
--- a/chinese/po/ports.zh.po
+++ b/chinese/po/ports.zh.po
@@ -5,35 +5,15 @@ msgstr ""
"Last-Translator: Kanru Chen <koster@debian.org.tw>\n"
"Language-Team: Debian-user in Chinese [Big5] <debian-chinese-big5@lists."
"debian.org>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../../english/misc/laptops/menu.inc:8
-msgid "Debian for Laptops"
-msgstr "給筆記型電腦用的 Debian"
-
#: ../../english/ports/alpha/menu.inc:6
msgid "Debian for Alpha"
msgstr "給 Alpha 用的 Debian"
-#: ../../english/ports/amd64/menu.inc:6
-msgid "Debian for AMD64"
-msgstr "給 AMD64 用的 Debian"
-
-#: ../../english/ports/arm/menu.inc:6
-msgid "Debian for ARM"
-msgstr "給 ARM 用的 Debian"
-
-#: ../../english/ports/beowulf/menu.inc:6
-msgid "Debian for Beowulf"
-msgstr "給 Beowulf 用的 Debian"
-
-#: ../../english/ports/freebsd/menu.inc:6
-#: ../../english/ports/kfreebsd-gnu/menu.inc:6
-msgid "Main"
-msgstr "主要"
-
#: ../../english/ports/hppa/menu.inc:6
msgid "Debian for PA-RISC"
msgstr "給 PA-RISC 用的 Debian"
@@ -46,14 +26,6 @@ msgstr "Hurd 光碟"
msgid "Debian for IA-64"
msgstr "給 IA-64 用的 Debian"
-#: ../../english/ports/kfreebsd-gnu/menu.inc:9
-msgid "Debian GNU/FreeBSD"
-msgstr "Debian GNU/FreeBSD"
-
-#: ../../english/ports/m68k/menu.inc:6
-msgid "Debian for Motorola 680x0"
-msgstr "給 Motorola 680x0 用的 Debian"
-
#: ../../english/ports/menu.defs:11
msgid "Contact"
msgstr "聯絡方式"
@@ -79,45 +51,45 @@ msgid "Installation"
msgstr "安裝"
#: ../../english/ports/menu.defs:35
+msgid "Configuration"
+msgstr ""
+
+#: ../../english/ports/menu.defs:39
msgid "Links"
msgstr "連結"
-#: ../../english/ports/menu.defs:39
+#: ../../english/ports/menu.defs:43
msgid "News"
msgstr "新聞"
-#: ../../english/ports/menu.defs:43
+#: ../../english/ports/menu.defs:47
msgid "Porting"
msgstr "移植"
-#: ../../english/ports/menu.defs:47
+#: ../../english/ports/menu.defs:51
msgid "Ports"
msgstr "Ports"
-#: ../../english/ports/menu.defs:51
+#: ../../english/ports/menu.defs:55
msgid "Problems"
msgstr "問題"
-#: ../../english/ports/menu.defs:55
+#: ../../english/ports/menu.defs:59
msgid "Software Map"
msgstr "軟體地圖"
-#: ../../english/ports/menu.defs:59
+#: ../../english/ports/menu.defs:63
msgid "Status"
msgstr "狀況"
-#: ../../english/ports/menu.defs:63
+#: ../../english/ports/menu.defs:67
msgid "Supply"
msgstr "支援"
-#: ../../english/ports/menu.defs:67
+#: ../../english/ports/menu.defs:71
msgid "Systems"
msgstr "系統"
-#: ../../english/ports/mips/menu.inc:6
-msgid "Debian for MIPS"
-msgstr "給 MIPS 用的 Debian"
-
#: ../../english/ports/netbsd/menu.inc:6
msgid "Debian GNU/NetBSD for i386"
msgstr "給 i386 用的 Debian GNU/NetBSD"
@@ -138,14 +110,36 @@ msgstr "People"
msgid "Debian for PowerPC"
msgstr "給 PowerPC 用的 Debian"
-#: ../../english/ports/s390/menu.inc:6
-msgid "Debian for S/390"
-msgstr "給 S/390 用的 Debian"
-
#: ../../english/ports/sparc/menu.inc:6
msgid "Debian for Sparc"
msgstr "給 Sparc 用的 Debian"
-#: ../../english/ports/sparc64/menu.inc:6
-msgid "Debian for Sparc64"
-msgstr "給 Sparc64 用的 Debian"
+#~ msgid "Debian for Sparc64"
+#~ msgstr "給 Sparc64 用的 Debian"
+
+#~ msgid "Debian for S/390"
+#~ msgstr "給 S/390 用的 Debian"
+
+#~ msgid "Debian for MIPS"
+#~ msgstr "給 MIPS 用的 Debian"
+
+#~ msgid "Debian for Motorola 680x0"
+#~ msgstr "給 Motorola 680x0 用的 Debian"
+
+#~ msgid "Debian GNU/FreeBSD"
+#~ msgstr "Debian GNU/FreeBSD"
+
+#~ 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/security.zh.po b/chinese/po/security.zh.po
index 28d2d8b56d9..6c0adb262ff 100644
--- a/chinese/po/security.zh.po
+++ b/chinese/po/security.zh.po
@@ -28,19 +28,19 @@ msgid ""
"posterity"
msgstr "非常舊的、<a href=\\\"undated/\\\">沒有日期寄載的</a>安全警報。"
-#: ../../english/security/make-ref-table.pl:61
+#: ../../english/security/make-ref-table.pl:81
msgid "Mitre CVE dictionary"
msgstr "Mitre CVE dictionary"
-#: ../../english/security/make-ref-table.pl:64
+#: ../../english/security/make-ref-table.pl:84
msgid "Securityfocus Bugtraq database"
msgstr "Securityfocus Bugtraq database"
-#: ../../english/security/make-ref-table.pl:68
+#: ../../english/security/make-ref-table.pl:88
msgid "CERT Advisories"
msgstr "CERT Advisories"
-#: ../../english/security/make-ref-table.pl:72
+#: ../../english/security/make-ref-table.pl:92
msgid "US-CERT vulnerabilities Notes"
msgstr "US-CERT vulnerabilities Notes"
diff --git a/chinese/po/stats.zh.po b/chinese/po/stats.zh.po
index c7b82120326..4a4f3bfbaed 100644
--- a/chinese/po/stats.zh.po
+++ b/chinese/po/stats.zh.po
@@ -3,229 +3,234 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../../stattrans.pl:239 ../../stattrans.pl:243
+#: ../../english/template/debian/stats_tags.wml:6
+msgid "Debian web site translation statistics"
+msgstr "Debian 網站翻譯統計"
+
+#: ../../english/template/debian/stats_tags.wml:10
+msgid "There are %d pages to translate."
+msgstr "一共有 %d 個頁面需要翻譯。"
+
+#: ../../english/template/debian/stats_tags.wml:14
+msgid "There are %d bytes to translate."
+msgstr "一共有 %d [CN:字節:][HKTW:位元组:]需要翻譯。"
+
+#: ../../english/template/debian/stats_tags.wml:18
+msgid "There are %d strings to translate."
+msgstr "一共有 %d 個[CN:字符串:][HKTW:字串:]需要翻譯。"
+
+#. TRANSLATORS: The first string is hostname of the debian website mirror, second string is date and time.
+#: ../../english/template/debian/stats_tags.wml:23
+msgid "Hit data from %s, gathered %s."
+msgstr ""
+
+#: ../../stattrans.pl:240 ../../stattrans.pl:244
msgid "This translation is too out of date"
msgstr "此譯文太過時了"
-#: ../../stattrans.pl:241 ../../stattrans.pl:430
+#: ../../stattrans.pl:242 ../../stattrans.pl:461
msgid "Wrong translation version"
msgstr "譯文版本錯誤"
-#: ../../stattrans.pl:245
+#: ../../stattrans.pl:246
msgid "The original is newer than this translation"
msgstr "原文比此譯文新"
-#: ../../stattrans.pl:248 ../../stattrans.pl:430
+#: ../../stattrans.pl:249 ../../stattrans.pl:461
msgid "The original no longer exists"
msgstr "原文不再存在"
-#: ../../stattrans.pl:406
-msgid "hits"
+#: ../../stattrans.pl:437
+msgid "hit count N/A"
msgstr ""
-#: ../../stattrans.pl:406
-msgid "hit count N/A"
+#: ../../stattrans.pl:437
+msgid "hits"
msgstr ""
-#: ../../stattrans.pl:424 ../../stattrans.pl:425
+#: ../../stattrans.pl:455 ../../stattrans.pl:456
msgid "Click to fetch diffstat data"
msgstr ""
-#: ../../stattrans.pl:439 ../../stattrans.pl:573 ../../stattrans.pl:574
+#: ../../stattrans.pl:470 ../../stattrans.pl:612 ../../stattrans.pl:613
msgid "Unified diff"
msgstr ""
-#: ../../stattrans.pl:441 ../../stattrans.pl:573 ../../stattrans.pl:574
+#: ../../stattrans.pl:473 ../../stattrans.pl:612 ../../stattrans.pl:613
msgid "Colored diff"
msgstr ""
-#: ../../stattrans.pl:540
+#: ../../stattrans.pl:575
msgid "Translation summary for"
msgstr "翻譯概要 for"
-#: ../../stattrans.pl:543
+#: ../../stattrans.pl:578 ../../stattrans.pl:737 ../../stattrans.pl:783
+#: ../../stattrans.pl:826
+msgid "Not translated"
+msgstr "未翻譯"
+
+#: ../../stattrans.pl:578 ../../stattrans.pl:736 ../../stattrans.pl:782
+msgid "Outdated"
+msgstr "過時"
+
+#: ../../stattrans.pl:578
msgid "Translated"
msgstr "已翻譯"
-#: ../../stattrans.pl:543 ../../stattrans.pl:624 ../../stattrans.pl:693
-#: ../../stattrans.pl:739 ../../stattrans.pl:782
+#: ../../stattrans.pl:578 ../../stattrans.pl:663 ../../stattrans.pl:735
+#: ../../stattrans.pl:781 ../../stattrans.pl:824
msgid "Up to date"
msgstr "最新"
-#: ../../stattrans.pl:543 ../../stattrans.pl:694 ../../stattrans.pl:740
-msgid "Outdated"
-msgstr "過時"
-
-#: ../../stattrans.pl:543 ../../stattrans.pl:695 ../../stattrans.pl:741
-#: ../../stattrans.pl:784
-msgid "Not translated"
-msgstr "未翻譯"
-
-#: ../../stattrans.pl:544 ../../stattrans.pl:545 ../../stattrans.pl:546
-#: ../../stattrans.pl:547
+#: ../../stattrans.pl:579 ../../stattrans.pl:580 ../../stattrans.pl:581
+#: ../../stattrans.pl:582
msgid "files"
msgstr "個[CN:文件:][HKTW:檔案:]"
-#: ../../stattrans.pl:550 ../../stattrans.pl:551 ../../stattrans.pl:552
-#: ../../stattrans.pl:553
+#: ../../stattrans.pl:585 ../../stattrans.pl:586 ../../stattrans.pl:587
+#: ../../stattrans.pl:588
msgid "bytes"
msgstr "[CN:字節:][HKTW:位元組:]"
-#: ../../stattrans.pl:560
+#: ../../stattrans.pl:595
msgid ""
"Note: the lists of pages are sorted by popularity. Hover over the page name "
"to see the number of hits."
msgstr ""
-#: ../../stattrans.pl:565
+#: ../../stattrans.pl:604
msgid "Outdated translations"
msgstr "過時的翻譯"
-#: ../../stattrans.pl:567 ../../stattrans.pl:623
+#: ../../stattrans.pl:606 ../../stattrans.pl:662
msgid "File"
msgstr "[CN:文件:][HKTW:檔案:]"
-#: ../../stattrans.pl:569 ../../stattrans.pl:575
+#: ../../stattrans.pl:608 ../../stattrans.pl:614
msgid "Diff"
msgstr ""
-#: ../../stattrans.pl:571
+#: ../../stattrans.pl:610
msgid "Comment"
msgstr "備註"
-#: ../../stattrans.pl:572
+#: ../../stattrans.pl:611
msgid "Diffstat"
msgstr ""
-#: ../../stattrans.pl:577
+#: ../../stattrans.pl:616
msgid "Log"
msgstr "日誌"
-#: ../../stattrans.pl:578
+#: ../../stattrans.pl:617
msgid "Translation"
msgstr "譯文"
-#: ../../stattrans.pl:579
+#: ../../stattrans.pl:618
msgid "Maintainer"
msgstr "維護者"
-#: ../../stattrans.pl:581
+#: ../../stattrans.pl:620
msgid "Status"
msgstr "狀態"
-#: ../../stattrans.pl:582
+#: ../../stattrans.pl:621
msgid "Translator"
msgstr "翻譯者"
-#: ../../stattrans.pl:583
+#: ../../stattrans.pl:622
msgid "Date"
msgstr "日期"
-#: ../../stattrans.pl:590
+#: ../../stattrans.pl:629
msgid "General pages not translated"
msgstr "未翻譯的一般頁面"
-#: ../../stattrans.pl:591
+#: ../../stattrans.pl:630
msgid "Untranslated general pages"
msgstr "未翻譯的一般頁面"
-#: ../../stattrans.pl:596
+#: ../../stattrans.pl:635
msgid "News items not translated"
msgstr "未翻譯的新聞"
-#: ../../stattrans.pl:597
+#: ../../stattrans.pl:636
msgid "Untranslated news items"
msgstr "未翻譯的新聞"
-#: ../../stattrans.pl:602
+#: ../../stattrans.pl:641
msgid "Consultant/user pages not translated"
msgstr "未翻譯的顧問/[CN:用戶:][HKTW:使用者:]頁面"
-#: ../../stattrans.pl:603
+#: ../../stattrans.pl:642
msgid "Untranslated consultant/user pages"
msgstr "未翻譯的顧問/[CN:用戶:][HKTW:使用者:]頁面"
-#: ../../stattrans.pl:608
+#: ../../stattrans.pl:647
msgid "International pages not translated"
msgstr "未翻譯的國際頁面"
-#: ../../stattrans.pl:609
+#: ../../stattrans.pl:648
msgid "Untranslated international pages"
msgstr "未翻譯的國際頁面"
-#: ../../stattrans.pl:614
+#: ../../stattrans.pl:653
msgid "Translated pages (up-to-date)"
msgstr "已翻譯頁面 (最新)"
-#: ../../stattrans.pl:621 ../../stattrans.pl:766
+#: ../../stattrans.pl:660 ../../stattrans.pl:808
msgid "Translated templates (PO files)"
msgstr "已翻譯模板 (PO [CN:文件:][HKTW:檔案:])"
-#: ../../stattrans.pl:622 ../../stattrans.pl:769
+#: ../../stattrans.pl:661 ../../stattrans.pl:811
msgid "PO Translation Statistics"
msgstr "PO 翻譯統計"
-#: ../../stattrans.pl:625 ../../stattrans.pl:783
+#: ../../stattrans.pl:664 ../../stattrans.pl:825
msgid "Fuzzy"
msgstr "模糊"
-#: ../../stattrans.pl:626
+#: ../../stattrans.pl:665
msgid "Untranslated"
msgstr "未翻譯"
-#: ../../stattrans.pl:627
+#: ../../stattrans.pl:666
#, fuzzy
#| msgid "Total:"
msgid "Total"
msgstr "總數:"
-#: ../../stattrans.pl:644
+#: ../../stattrans.pl:683
msgid "Total:"
msgstr "總數:"
-#: ../../stattrans.pl:656 ../../stattrans.pl:807
+#: ../../stattrans.pl:696 ../../stattrans.pl:850
msgid "Created with"
msgstr "此網頁創建工具:"
-#: ../../stattrans.pl:673
+#: ../../stattrans.pl:715
msgid "Translated web pages"
msgstr "已翻譯網頁"
-#: ../../stattrans.pl:676
+#: ../../stattrans.pl:718
msgid "Translation Statistics by Page Count"
msgstr "翻譯統計,按頁面數量"
-#: ../../stattrans.pl:691 ../../stattrans.pl:737 ../../stattrans.pl:781
+#: ../../stattrans.pl:733 ../../stattrans.pl:779 ../../stattrans.pl:823
msgid "Language"
msgstr "語言"
-#: ../../stattrans.pl:692 ../../stattrans.pl:738
+#: ../../stattrans.pl:734 ../../stattrans.pl:780
msgid "Translations"
msgstr "翻譯"
-#: ../../stattrans.pl:719
+#: ../../stattrans.pl:761
msgid "Translated web pages (by size)"
msgstr "已翻譯網頁(按[CN:文件:][HKTW:檔案:]大小)"
-#: ../../stattrans.pl:722
+#: ../../stattrans.pl:764
msgid "Translation Statistics by Page Size"
msgstr "翻譯統計,按頁面大小"
-#: ../../english/template/debian/stats_tags.wml:6
-msgid "Debian web site translation statistics"
-msgstr "Debian 網站翻譯統計"
-
-#: ../../english/template/debian/stats_tags.wml:10
-msgid "There are %d pages to translate."
-msgstr "一共有 %d 個頁面需要翻譯。"
-
-#: ../../english/template/debian/stats_tags.wml:14
-msgid "There are %d bytes to translate."
-msgstr "一共有 %d [CN:字節:][HKTW:位元组:]需要翻譯。"
-
-#: ../../english/template/debian/stats_tags.wml:18
-msgid "There are %d strings to translate."
-msgstr "一共有 %d 個[CN:字符串:][HKTW:字串:]需要翻譯。"
-
#~ msgid "Origin"
#~ msgstr "原文"
diff --git a/chinese/po/templates.zh.po b/chinese/po/templates.zh.po
index 319a860388c..8af414b64ee 100644
--- a/chinese/po/templates.zh.po
+++ b/chinese/po/templates.zh.po
@@ -9,6 +9,27 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+#: ../../english/search.xml.in:7
+#, fuzzy
+#| msgid "Debian Project"
+msgid "Debian website"
+msgstr "Debian 計劃"
+
+#: ../../english/search.xml.in:9
+msgid "Search the Debian website."
+msgstr ""
+
+#: ../../english/template/debian/basic.wml:19
+#: ../../english/template/debian/navbar.wml:11
+#, fuzzy
+#| msgid "Help Debian"
+msgid "Debian"
+msgstr "協助 Debian"
+
+#: ../../english/template/debian/basic.wml:46
+msgid "Debian website search"
+msgstr ""
+
#: ../../english/template/debian/common_translation.wml:4
msgid "Yes"
msgstr "是"
@@ -22,13 +43,18 @@ msgid "Debian Project"
msgstr "Debian 計劃"
#: ../../english/template/debian/common_translation.wml:13
+#, fuzzy
+#| msgid ""
+#| "Debian GNU/Linux is a free distribution of the GNU/Linux operating "
+#| "system. It is maintained and updated through the work of many users who "
+#| "volunteer their time and effort."
msgid ""
-"Debian GNU/Linux is a free distribution of the GNU/Linux operating system. "
-"It is maintained and updated through the work of many users who volunteer "
-"their time and effort."
+"Debian is an operating system and a distribution of Free Software. It is "
+"maintained and updated through the work of many users who volunteer their "
+"time and effort."
msgstr ""
-"Debian GNU/Linux 是一個自由的 GNU/Linux 作業系統,它是由一群自願付出時間和精力"
-"的[CNTW:使用者:][HK:用家:]來維護並更新的。"
+"Debian GNU/Linux 是一個自由的 GNU/Linux 作業系統,它是由一群自願付出時間和精"
+"力的[CNTW:使用者:][HK:用家:]來維護並更新的。"
#: ../../english/template/debian/common_translation.wml:16
msgid "debian, GNU, linux, unix, open source, free, DFSG"
@@ -41,7 +67,7 @@ msgid "Back to the <a href=\"m4_HOME/\">Debian Project homepage</a>."
msgstr "返回 <a href=\"m4_HOME/\">Debian 計劃主頁</a>"
#: ../../english/template/debian/common_translation.wml:22
-#: ../../english/template/debian/links.tags.wml:143
+#: ../../english/template/debian/links.tags.wml:146
msgid "Home"
msgstr "主頁"
@@ -119,10 +145,16 @@ msgid "Miscellaneous"
msgstr "雜項"
#: ../../english/template/debian/common_translation.wml:79
-#: ../../english/template/debian/links.tags.wml:98
+#: ../../english/template/debian/links.tags.wml:101
msgid "Getting Debian"
msgstr "取得 Debian"
+#: ../../english/template/debian/common_translation.wml:82
+#, fuzzy
+#| msgid "Debian Books"
+msgid "The Debian Blog"
+msgstr "Debian 書籍"
+
#: ../../english/template/debian/ddp.wml:6
msgid ""
"Please send all comments, criticisms and suggestions about these web pages "
@@ -169,10 +201,18 @@ msgstr "release 2.2 中"
#. (i.e. debian-l10n-XXXXXX@lists.debian.org) for reporting things in
#. your language.
#: ../../english/template/debian/footer.wml:96
+#, fuzzy
+#| msgid ""
+#| "To report a problem with the web site, e-mail <a href=\"mailto:debian-"
+#| "www@lists.debian.org\">debian-www@lists.debian.org</a>. For other "
+#| "contact information, see the Debian <a href=\"m4_HOME/contact\">contact "
+#| "page</a>."
msgid ""
"To report a problem with the web site, e-mail <a href=\"mailto:debian-"
"www@lists.debian.org\">debian-www@lists.debian.org</a>. For other contact "
-"information, see the Debian <a href=\"m4_HOME/contact\">contact page</a>."
+"information, see the Debian <a href=\"m4_HOME/contact\">contact page</a>. "
+"Web site source code is <a href=\"m4_HOME/devel/website/using_cvs"
+"\">available</a>."
msgstr ""
"回報本網頁的問題,請以英文撰寫,寄信到 <a href=\"mailto:debian-www@lists."
"debian.org\">debian-www@lists.debian.org</a>。其他聯絡訊息請看 Debian <a "
@@ -189,10 +229,14 @@ msgid "Copyright"
msgstr "版權所有"
#: ../../english/template/debian/footer.wml:105
+msgid "<a href=\"http://www.spi-inc.org/\">SPI</a> and others;"
+msgstr ""
+
+#: ../../english/template/debian/footer.wml:108
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:108
+#: ../../english/template/debian/footer.wml:111
msgid ""
"Debian is a registered <a href=\"m4_HOME/trademark\">trademark</a> of "
"Software in the Public Interest, Inc."
@@ -200,12 +244,12 @@ msgstr ""
"Debian 是 Software in the Public Interest, Inc. 的<a href=\"m4_HOME/trademark"
"\">註冊商標</a>。"
-#: ../../english/template/debian/languages.wml:193
-#: ../../english/template/debian/languages.wml:229
+#: ../../english/template/debian/languages.wml:196
+#: ../../english/template/debian/languages.wml:232
msgid "This page is also available in the following languages:"
msgstr "本頁其他語言版本如下"
-#: ../../english/template/debian/languages.wml:231
+#: ../../english/template/debian/languages.wml:265
msgid "How to set <a href=m4_HOME/intro/cn>the default document language</a>"
msgstr "<a href=m4_HOME/intro/cn>如何設置[CN:缺省:][HKTW:預設:]語言</a>"
@@ -282,112 +326,120 @@ msgid "Developer Database"
msgstr "開發人員[CN:數據:][HKTW:資料:]庫"
#: ../../english/template/debian/links.tags.wml:61
+#, fuzzy
+#| msgid "Debian Books"
+msgid "Debian FAQ"
+msgstr "Debian 書籍"
+
+#: ../../english/template/debian/links.tags.wml:64
msgid "Debian Policy Manual"
msgstr "Debian 政策[CN:文檔:][HKTW:文件:]"
-#: ../../english/template/debian/links.tags.wml:64
+#: ../../english/template/debian/links.tags.wml:67
msgid "Developers' Reference"
msgstr "開發人員指引"
-#: ../../english/template/debian/links.tags.wml:67
+#: ../../english/template/debian/links.tags.wml:70
msgid "New Maintainers' Guide"
msgstr "新手上路"
-#: ../../english/template/debian/links.tags.wml:70
+#: ../../english/template/debian/links.tags.wml:73
msgid "Release Critical Bugs"
msgstr "阻礙發行的嚴重問題"
-#: ../../english/template/debian/links.tags.wml:73
+#: ../../english/template/debian/links.tags.wml:76
msgid "Lintian Reports"
msgstr "Lintian 報告"
-#: ../../english/template/debian/links.tags.wml:77
+#: ../../english/template/debian/links.tags.wml:80
msgid "Archives for users' mailing lists"
msgstr "[CNHK:用戶:][TW:使用者:][CN:郵件列表歸檔:][HKTW:論壇文件集:]"
-#: ../../english/template/debian/links.tags.wml:80
+#: ../../english/template/debian/links.tags.wml:83
msgid "Archives for developers' mailing lists"
msgstr "開發人員[CN:郵件列表歸檔:][HKTW:論壇文件集:]"
-#: ../../english/template/debian/links.tags.wml:83
+#: ../../english/template/debian/links.tags.wml:86
msgid "Archives for i18n/l10n mailing lists"
msgstr "國際化/本土化 (i18n/l10n) [CN:郵件列表歸檔:][HKTW:論壇文件集:]"
-#: ../../english/template/debian/links.tags.wml:86
+#: ../../english/template/debian/links.tags.wml:89
msgid "Archives for ports' mailing lists"
msgstr "移植平台[CN:郵件列表歸檔:][HKTW:論壇文件集:]"
-#: ../../english/template/debian/links.tags.wml:89
+#: ../../english/template/debian/links.tags.wml:92
msgid "Archives for mailing lists of the Bug tracking system"
msgstr "臭蟲追蹤系統[CN:郵件列表歸檔:][HKTW:論壇文件集:]"
-#: ../../english/template/debian/links.tags.wml:92
+#: ../../english/template/debian/links.tags.wml:95
msgid "Archives for miscellaneous mailing lists"
msgstr "其他[CN:郵件列表歸檔:][HKTW:論壇文件集:]"
-#: ../../english/template/debian/links.tags.wml:95
+#: ../../english/template/debian/links.tags.wml:98
msgid "Free Software"
msgstr "自由軟件"
-#: ../../english/template/debian/links.tags.wml:101
+#: ../../english/template/debian/links.tags.wml:104
msgid "Development"
msgstr "開發"
-#: ../../english/template/debian/links.tags.wml:104
+#: ../../english/template/debian/links.tags.wml:107
msgid "Help Debian"
msgstr "協助 Debian"
-#: ../../english/template/debian/links.tags.wml:107
+#: ../../english/template/debian/links.tags.wml:110
msgid "Bug reports"
msgstr "錯誤報告"
-#: ../../english/template/debian/links.tags.wml:110
+#: ../../english/template/debian/links.tags.wml:113
msgid "Ports/Architectures"
msgstr "移植平台/體系架構"
-#: ../../english/template/debian/links.tags.wml:113
+#: ../../english/template/debian/links.tags.wml:116
msgid "Installation manual"
msgstr "安裝說明"
-#: ../../english/template/debian/links.tags.wml:116
+#: ../../english/template/debian/links.tags.wml:119
msgid "CD vendors"
msgstr "CD 製造商"
-#: ../../english/template/debian/links.tags.wml:119
+#: ../../english/template/debian/links.tags.wml:122
msgid "CD ISO images"
msgstr "CD ISO 映像檔"
-#: ../../english/template/debian/links.tags.wml:122
+#: ../../english/template/debian/links.tags.wml:125
msgid "Network install"
msgstr "網絡安裝"
-#: ../../english/template/debian/links.tags.wml:125
+#: ../../english/template/debian/links.tags.wml:128
msgid "Pre-installed"
msgstr "預先安裝"
-#: ../../english/template/debian/links.tags.wml:128
+#: ../../english/template/debian/links.tags.wml:131
msgid "Debian-Edu project"
msgstr "Debian-Edu 計劃"
-#: ../../english/template/debian/links.tags.wml:131
+#: ../../english/template/debian/links.tags.wml:134
msgid "Alioth &ndash; Debian GForge"
msgstr "Alioth &ndash; Debian GForge"
-#: ../../english/template/debian/links.tags.wml:134
+#: ../../english/template/debian/links.tags.wml:137
msgid "Quality Assurance"
msgstr "Quality Assurance"
-#: ../../english/template/debian/links.tags.wml:137
+#: ../../english/template/debian/links.tags.wml:140
msgid "Package Tracking System"
msgstr "套件追蹤系統"
-#: ../../english/template/debian/links.tags.wml:140
+#: ../../english/template/debian/links.tags.wml:143
msgid "Debian Developer's Packages Overview"
msgstr "Debian Developers's 套件綜覽"
-#: ../../english/template/debian/mirrors.wml:8
-msgid "Select a server near you"
-msgstr "請[CN:就近選擇服務器:][HKTW:選擇就近的伺服器:]"
+#: ../../english/template/debian/navbar.wml:10
+#, fuzzy
+#| msgid "Debian Project"
+msgid "Debian Home"
+msgstr "Debian 計劃"
#: ../../english/template/debian/recent_list.wml:7
msgid "No items for this year."
@@ -425,7 +477,7 @@ msgstr "過去活動"
msgid "(new revision)"
msgstr "(新版本)"
-#: ../../english/template/debian/recent_list.wml:294
+#: ../../english/template/debian/recent_list.wml:301
msgid "Report"
msgstr "報告"
@@ -435,22 +487,6 @@ msgstr "報告"
msgid "<void id=\"doc_for_arch\" />%s for %s"
msgstr "<void id=\"doc_for_arch\" />%2$s 的%1$s"
-#: ../../english/template/debian/todoitem.wml:4
-msgid "More information:"
-msgstr "更多訊息:"
-
-#: ../../english/template/debian/todoitem.wml:8
-msgid "Taken by:"
-msgstr "認領:"
-
-#: ../../english/template/debian/todoitem.wml:12
-msgid "Nobody"
-msgstr "沒有人"
-
-#: ../../english/template/debian/todoitem.wml:16
-msgid "Rating:"
-msgstr "評分:"
-
#: ../../english/template/debian/translation-check.wml:37
msgid ""
"<em>Note:</em> The <a href=\"$link\">original document</a> is newer than "
@@ -478,79 +514,169 @@ msgstr "網址"
msgid "Back to the <a href=\"../\">Who's using Debian? page</a>."
msgstr "返回 <a href=\"./\">Who's using Debian? page</a>."
-#~ msgid "More information"
-#~ msgstr "更詳盡的[CN:信息:][HKTW:資訊:]"
+#~ msgid "Back to the <a href=\"./\">Debian consultants page</a>."
+#~ msgstr "返回 <a href=\"./\">Debian consultants page</a>."
-#~ msgid "Where"
-#~ msgstr "Where(何處*)"
+#, fuzzy
+#~ msgid "Download with Jigdo"
+#~ msgstr "用 jigdo 下載"
-#~ msgid "More Info"
-#~ msgstr "更多[CN:信息:][HKTW:資訊:]"
+#, fuzzy
+#~ msgid "Download via HTTP/FTP"
+#~ msgstr "透過 http/ftp 下載"
-#~ msgid "<th>Project</th><th>Coordinator</th>"
-#~ msgstr "<th>計劃</th><th>Coordinator</th>"
+#, fuzzy
+#~ msgid "Network Install"
+#~ msgstr "網絡安裝"
-#~ msgid "Related Links"
-#~ msgstr "相關網址"
+#~ msgid "Debian CD team"
+#~ msgstr "<span lang=\"en\">Debian </span>光碟小組"
-#~ msgid "Latest News"
-#~ msgstr "最新消息"
+#~ msgid "jigdo"
+#~ msgstr "jigdo"
+
+#~ msgid "http_ftp"
+#~ msgstr "http_ftp"
#, 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>"
+#~ 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 "Voting&nbsp;Open"
+#~ msgstr "接受投票中"
+
+#~ msgid "Decided"
+#~ msgstr "已決定"
+
+#~ msgid "Other"
+#~ msgstr "其他"
+
+#~ msgid "Home&nbsp;Vote&nbsp;Page"
+#~ msgstr "投票主頁"
+
+#~ msgid "Submit&nbsp;a&nbsp;Proposal"
+#~ msgstr "提出議案"
+
+#~ msgid "Amend&nbsp;a&nbsp;Proposal"
+#~ msgstr "修正議案"
+
+#~ msgid "Follow&nbsp;a&nbsp;Proposal"
+#~ msgstr "跟隨議案的進展"
+
+#~ msgid "Read&nbsp;a&nbsp;Result"
+#~ msgstr "查看結果"
+
+#~ msgid "Vote"
+#~ msgstr "投票"
+
#~ msgid ""
-#~ "To receive this newsletter bi-weekly in your mailbox, <a href=\"http://"
-#~ "lists.debian.org/debian-news/\">subscribe to the debian-news mailing "
-#~ "list</a>."
+#~ "Debian Weekly News is edited by <a href=\"mailto:dwn@debian.org\">Martin "
+#~ "'Joey' Schulze</a>."
#~ msgstr ""
-#~ "想每個星期都以電子郵件方式接收「每週快訊」嗎?請<a href=\"m4_HOME/"
-#~ "MailingLists/subscribe#debian-news\">訂閱</a> debian-news 郵件列表。"
+#~ "Debian 每周快訊 (Debian Weekly News) 由 <a href=\"mailto:dwn@debian.org"
+#~ "\">Martin 'Joey' Schulze</a> 負責編輯。"
-#~ msgid "<a href=\"../../\">Back issues</a> of this newsletter are available."
-#~ msgstr "您亦可翻閱<a href=\"../../\">過往的報導</a>。"
+#~ msgid ""
+#~ "Debian Weekly News is edited by <a href=\"mailto:dwn@debian.org"
+#~ "\">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 ""
+#~ "Debian Weekly News is edited by <a href=\"mailto:dwn@debian.org\">Joe "
+#~ "'Zonker' Brockmeier, Jean-Christophe Helary and Tollef Fog Heen</a>."
+#~ msgstr ""
+#~ "Debian 每週快訊 (Debian Weekly News) 由 <a href=\"mailto:dwn@debian.org"
+#~ "\">Joe 'Zonker' Brockmeier, Jean-Christophe Helary 和 Tollef Fog Heen</a> "
+#~ "負責編輯。"
+
+#~ msgid "Fixed in"
+#~ msgstr "修改於"
+
+#~ msgid "Vulnerable"
+#~ msgstr "可被襲擊"
+
+#~ msgid ""
+#~ "See the Debian <a href=\"m4_HOME/contact\">contact page</a> for "
+#~ "information on contacting us."
+#~ msgstr ""
+#~ "請參閱<a href=\"m4_HOME/contact\">聯繫方法</a>與我們[CN:取得聯繫:][HKTW:聯"
+#~ "絡:]。"
+
+#~ msgid "download with pik"
+#~ msgstr "用 pik 下載"
+
+#~ msgid "buy pre-made images"
+#~ msgstr "購買預製映像"
+
+#, fuzzy
+#~ msgid "non-free"
+#~ msgstr "無"
+
+#, fuzzy
+#~ msgid "Discussion"
+#~ msgstr "討論中"
+
+#, fuzzy
+#~ msgid "License Information"
+#~ msgstr "更詳盡的[CN:信息:][HKTW:資訊:]"
+
+#, fuzzy
+#~ msgid "No Requested packages"
+#~ msgstr "受影響的軟件"
+
+#, fuzzy
+#~ msgid "No requests for adoption"
+#~ msgstr "更詳盡的[CN:信息:][HKTW:資訊:]"
#, fuzzy
#~ msgid ""
-#~ "<void id=\"singular\" />Debian Project News is edited by <a href=\"mailto:"
-#~ "debian-publicity@lists.debian.org\">%s</a>."
+#~ "<void id=\"plural\" />This issue of Debian Weekly News was edited by <a "
+#~ "href=\"mailto:dwn@debian.org\">%s</a>."
#~ msgstr ""
#~ "Debian 每周快訊 (Debian Weekly News) 由 <a href=\"mailto:dwn@debian.org"
#~ "\">Joey Hess</a> 負責編輯。"
#, fuzzy
#~ msgid ""
-#~ "<void id=\"plural\" />Debian Project News is edited by <a href=\"mailto:"
-#~ "debian-publicity@lists.debian.org\">%s</a>."
+#~ "<void id=\"singular\" />This issue of Debian Weekly News was edited by <a "
+#~ "href=\"mailto:dwn@debian.org\">%s</a>."
#~ msgstr ""
#~ "Debian 每周快訊 (Debian Weekly News) 由 <a href=\"mailto:dwn@debian.org"
#~ "\">Joey Hess</a> 負責編輯。"
#, fuzzy
#~ msgid ""
-#~ "<void id=\"singular\" />This issue of Debian Project News was edited by "
-#~ "<a href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
+#~ "<void id=\"plural\" />Debian Weekly News is edited by <a href=\"mailto:"
+#~ "dwn@debian.org\">%s</a>."
#~ msgstr ""
#~ "Debian 每周快訊 (Debian Weekly News) 由 <a href=\"mailto:dwn@debian.org"
#~ "\">Joey Hess</a> 負責編輯。"
#, fuzzy
#~ msgid ""
-#~ "<void id=\"plural\" />This issue of Debian Project News was edited by <a "
-#~ "href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
+#~ "<void id=\"singular\" />Debian Weekly News is edited by <a href=\"mailto:"
+#~ "dwn@debian.org\">%s</a>."
#~ msgstr ""
#~ "Debian 每周快訊 (Debian Weekly News) 由 <a href=\"mailto:dwn@debian.org"
#~ "\">Joey Hess</a> 負責編輯。"
#, fuzzy
-#~ msgid "Back to the <a href=\"./\">Debian speakers page</a>."
-#~ msgstr "返回 <a href=\"./\">Debian consultants page</a>."
-
-#, fuzzy
#~ msgid ""
#~ "To receive this newsletter weekly in your mailbox, <a href=\"http://lists."
#~ "debian.org/debian-news/\">subscribe to the debian-news mailing list</a>."
@@ -559,163 +685,88 @@ msgstr "返回 <a href=\"./\">Who's using Debian? page</a>."
#~ "MailingLists/subscribe#debian-news\">訂閱</a> debian-news 郵件列表。"
#, fuzzy
+#~ msgid "Back to the <a href=\"./\">Debian speakers page</a>."
+#~ msgstr "返回 <a href=\"./\">Debian consultants page</a>."
+
+#, fuzzy
#~ msgid ""
-#~ "<void id=\"singular\" />Debian Weekly News is edited by <a href=\"mailto:"
-#~ "dwn@debian.org\">%s</a>."
+#~ "<void id=\"plural\" />This issue of Debian Project News was edited by <a "
+#~ "href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
#~ msgstr ""
#~ "Debian 每周快訊 (Debian Weekly News) 由 <a href=\"mailto:dwn@debian.org"
#~ "\">Joey Hess</a> 負責編輯。"
#, fuzzy
#~ msgid ""
-#~ "<void id=\"plural\" />Debian Weekly News is edited by <a href=\"mailto:"
-#~ "dwn@debian.org\">%s</a>."
+#~ "<void id=\"singular\" />This issue of Debian Project News was edited by "
+#~ "<a href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
#~ msgstr ""
#~ "Debian 每周快訊 (Debian Weekly News) 由 <a href=\"mailto:dwn@debian.org"
#~ "\">Joey Hess</a> 負責編輯。"
#, fuzzy
#~ msgid ""
-#~ "<void id=\"singular\" />This issue of Debian Weekly News was edited by <a "
-#~ "href=\"mailto:dwn@debian.org\">%s</a>."
+#~ "<void id=\"plural\" />Debian Project News is edited by <a href=\"mailto:"
+#~ "debian-publicity@lists.debian.org\">%s</a>."
#~ msgstr ""
#~ "Debian 每周快訊 (Debian Weekly News) 由 <a href=\"mailto:dwn@debian.org"
#~ "\">Joey Hess</a> 負責編輯。"
#, fuzzy
#~ msgid ""
-#~ "<void id=\"plural\" />This issue of Debian Weekly News was edited by <a "
-#~ "href=\"mailto:dwn@debian.org\">%s</a>."
+#~ "<void id=\"singular\" />Debian Project News is edited by <a href=\"mailto:"
+#~ "debian-publicity@lists.debian.org\">%s</a>."
#~ msgstr ""
#~ "Debian 每周快訊 (Debian Weekly News) 由 <a href=\"mailto:dwn@debian.org"
#~ "\">Joey Hess</a> 負責編輯。"
-#, fuzzy
-#~ msgid "No requests for adoption"
-#~ msgstr "更詳盡的[CN:信息:][HKTW:資訊:]"
-
-#, fuzzy
-#~ msgid "No Requested packages"
-#~ msgstr "受影響的軟件"
-
-#, fuzzy
-#~ msgid "License Information"
-#~ msgstr "更詳盡的[CN:信息:][HKTW:資訊:]"
-
-#, fuzzy
-#~ msgid "Discussion"
-#~ msgstr "討論中"
+#~ msgid "<a href=\"../../\">Back issues</a> of this newsletter are available."
+#~ msgstr "您亦可翻閱<a href=\"../../\">過往的報導</a>。"
#, fuzzy
-#~ msgid "non-free"
-#~ msgstr "無"
-
-#~ msgid "buy pre-made images"
-#~ msgstr "購買預製映像"
-
-#~ msgid "download with pik"
-#~ msgstr "用 pik 下載"
-
#~ msgid ""
-#~ "See the Debian <a href=\"m4_HOME/contact\">contact page</a> for "
-#~ "information on contacting us."
-#~ msgstr ""
-#~ "請參閱<a href=\"m4_HOME/contact\">聯繫方法</a>與我們[CN:取得聯繫:][HKTW:聯"
-#~ "絡:]。"
-
-#~ msgid "Vulnerable"
-#~ msgstr "可被襲擊"
-
-#~ msgid "Fixed in"
-#~ msgstr "修改於"
-
-#~ msgid ""
-#~ "Debian Weekly News is edited by <a href=\"mailto:dwn@debian.org\">Joe "
-#~ "'Zonker' Brockmeier, Jean-Christophe Helary and Tollef Fog Heen</a>."
-#~ msgstr ""
-#~ "Debian 每週快訊 (Debian Weekly News) 由 <a href=\"mailto:dwn@debian.org"
-#~ "\">Joe 'Zonker' Brockmeier, Jean-Christophe Helary 和 Tollef Fog Heen</a> "
-#~ "負責編輯。"
-
-#~ msgid ""
-#~ "Debian Weekly News is edited by <a href=\"mailto:dwn@debian.org"
-#~ "\">Yooseong Yang and Martin 'Joey' Schulze</a>."
+#~ "To receive this newsletter bi-weekly in your mailbox, <a href=\"http://"
+#~ "lists.debian.org/debian-news/\">subscribe to the debian-news mailing "
+#~ "list</a>."
#~ msgstr ""
-#~ "Debian 每週快訊 (Debian Weekly News) 由 <a href=\"mailto:dwn@debian.org"
-#~ "\">Yooseong Yang 和 Martin 'Joey' Schulze</a> 負責編輯。"
+#~ "想每個星期都以電子郵件方式接收「每週快訊」嗎?請<a href=\"m4_HOME/"
+#~ "MailingLists/subscribe#debian-news\">訂閱</a> debian-news 郵件列表。"
+#, fuzzy
#~ msgid ""
-#~ "Debian Weekly News is edited by <a href=\"mailto:dwn@debian.org\">Martin "
-#~ "'Joey' Schulze</a>."
-#~ msgstr ""
-#~ "Debian 每周快訊 (Debian Weekly News) 由 <a href=\"mailto:dwn@debian.org"
-#~ "\">Martin 'Joey' Schulze</a> 負責編輯。"
-
-#~ msgid "Vote"
-#~ msgstr "投票"
-
-#~ msgid "Read&nbsp;a&nbsp;Result"
-#~ msgstr "查看結果"
-
-#~ msgid "Follow&nbsp;a&nbsp;Proposal"
-#~ msgstr "跟隨議案的進展"
-
-#~ msgid "Amend&nbsp;a&nbsp;Proposal"
-#~ msgstr "修正議案"
-
-#~ msgid "Submit&nbsp;a&nbsp;Proposal"
-#~ msgstr "提出議案"
-
-#~ msgid "Home&nbsp;Vote&nbsp;Page"
-#~ msgstr "投票主頁"
-
-#~ msgid "Other"
-#~ msgstr "其他"
-
-#~ msgid "Decided"
-#~ msgstr "已決定"
-
-#~ msgid "Voting&nbsp;Open"
-#~ msgstr "接受投票中"
-
-#~ msgid "In&nbsp;Discussion"
-#~ msgstr "討論中"
+#~ "Back to: other <a href=\"./\">Debian news</a> || <a href=\"m4_HOME/"
+#~ "\">Debian Project homepage</a>."
+#~ msgstr "返回 <a href=\"m4_HOME/\">Debian 計劃主頁</a>"
-#~ msgid "Waiting&nbsp;for&nbsp;Sponsors"
-#~ msgstr "有待贊助"
+#~ msgid "Latest News"
+#~ msgstr "最新消息"
-#, fuzzy
-#~ msgid "Minimum Discussion"
-#~ msgstr "討論中"
+#~ msgid "Related Links"
+#~ msgstr "相關網址"
-#, fuzzy
-#~ msgid "Debate"
-#~ msgstr "<span lang=\"en\">Debian </span>光碟小組"
+#~ msgid "<th>Project</th><th>Coordinator</th>"
+#~ msgstr "<th>計劃</th><th>Coordinator</th>"
-#, fuzzy
-#~ msgid "Nominations"
-#~ msgstr "捐款"
+#~ msgid "More Info"
+#~ msgstr "更多[CN:信息:][HKTW:資訊:]"
-#~ msgid "http_ftp"
-#~ msgstr "http_ftp"
+#~ msgid "Where"
+#~ msgstr "Where(何處*)"
-#~ msgid "jigdo"
-#~ msgstr "jigdo"
+#~ msgid "More information"
+#~ msgstr "更詳盡的[CN:信息:][HKTW:資訊:]"
-#~ msgid "Debian CD team"
-#~ msgstr "<span lang=\"en\">Debian </span>光碟小組"
+#~ msgid "Rating:"
+#~ msgstr "評分:"
-#, fuzzy
-#~ msgid "Network Install"
-#~ msgstr "網絡安裝"
+#~ msgid "Nobody"
+#~ msgstr "沒有人"
-#, fuzzy
-#~ msgid "Download via HTTP/FTP"
-#~ msgstr "透過 http/ftp 下載"
+#~ msgid "Taken by:"
+#~ msgstr "認領:"
-#, fuzzy
-#~ msgid "Download with Jigdo"
-#~ msgstr "用 jigdo 下載"
+#~ msgid "More information:"
+#~ msgstr "更多訊息:"
-#~ msgid "Back to the <a href=\"./\">Debian consultants page</a>."
-#~ msgstr "返回 <a href=\"./\">Debian consultants page</a>."
+#~ msgid "Select a server near you"
+#~ msgstr "請[CN:就近選擇服務器:][HKTW:選擇就近的伺服器:]"
diff --git a/chinese/po/vendors.zh.po b/chinese/po/vendors.zh.po
index 2971014f053..cd434d8bd1a 100644
--- a/chinese/po/vendors.zh.po
+++ b/chinese/po/vendors.zh.po
@@ -5,6 +5,7 @@ msgstr ""
"Last-Translator: Kanru Chen <koster@debian.org.tw>\n"
"Language-Team: Debian-user in Chinese [Big5] <debian-chinese-big5@lists."
"debian.org>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -99,47 +100,47 @@ msgstr "源碼"
msgid "and"
msgstr "和"
-#~ msgid "updated monthly"
-#~ msgstr "每月更新"
+#~ msgid "Official CD"
+#~ msgstr "正式 CD 光碟"
-#~ msgid "updated twice weekly"
-#~ msgstr "每兩週更新"
+#~ msgid "Official DVD"
+#~ msgstr "正式 DVD 光碟"
-#~ msgid "updated weekly"
-#~ msgstr "每週更新"
+#~ msgid "Development Snapshot"
+#~ msgstr "開發版快照"
-#~ msgid "reseller"
-#~ msgstr "分銷商"
+#~ msgid "Vendor Release"
+#~ msgstr "銷售商發行版本"
-#~ msgid "reseller of $var"
-#~ msgstr "$var 的分銷商"
+#~ msgid "Multiple Distribution"
+#~ msgstr "多重發佈"
-#~ msgid "Custom Release"
-#~ msgstr "特別訂造"
+#~ msgid "non-US included"
+#~ msgstr "包括 non-US"
-#~ msgid "vendor additions"
-#~ msgstr "銷售商增添軟件"
+#~ msgid "non-free included"
+#~ msgstr "包括 non-free"
#~ msgid "contrib included"
#~ msgstr "包括 contrib"
-#~ msgid "non-free included"
-#~ msgstr "包括 non-free"
+#~ msgid "vendor additions"
+#~ msgstr "銷售商增添軟件"
-#~ msgid "non-US included"
-#~ msgstr "包括 non-US"
+#~ msgid "Custom Release"
+#~ msgstr "特別訂造"
-#~ msgid "Multiple Distribution"
-#~ msgstr "多重發佈"
+#~ msgid "reseller of $var"
+#~ msgstr "$var 的分銷商"
-#~ msgid "Vendor Release"
-#~ msgstr "銷售商發行版本"
+#~ msgid "reseller"
+#~ msgstr "分銷商"
-#~ msgid "Development Snapshot"
-#~ msgstr "開發版快照"
+#~ msgid "updated weekly"
+#~ msgstr "每週更新"
-#~ msgid "Official DVD"
-#~ msgstr "正式 DVD 光碟"
+#~ msgid "updated twice weekly"
+#~ msgstr "每兩週更新"
-#~ msgid "Official CD"
-#~ msgstr "正式 CD 光碟"
+#~ msgid "updated monthly"
+#~ msgstr "每月更新"
diff --git a/chinese/po/vote.zh.po b/chinese/po/vote.zh.po
index 619247dd470..09c180c22b2 100644
--- a/chinese/po/vote.zh.po
+++ b/chinese/po/vote.zh.po
@@ -5,6 +5,7 @@ msgstr ""
"Last-Translator: Kanru Chen <koster@debian.org.tw>\n"
"Language-Team: Debian-user in Chinese [Big5] <debian-chinese-big5@lists."
"debian.org>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff --git a/chinese/po/wnpp.zh.po b/chinese/po/wnpp.zh.po
index 6bde2329920..f17ec25608e 100644
--- a/chinese/po/wnpp.zh.po
+++ b/chinese/po/wnpp.zh.po
@@ -5,6 +5,7 @@ msgstr ""
"Last-Translator: Kanru Chen <koster@debian.org.tw>\n"
"Language-Team: Debian-user in Chinese [Big5] <debian-chinese-big5@lists."
"debian.org>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -47,32 +48,109 @@ msgstr "昨天到今天被認養的。"
msgid "%s days in adoption."
msgstr "過去 %s 天內被認養的。"
+#: ../../english/template/debian/wnpp.wml:46
+#, fuzzy
+#| msgid "%s days in adoption."
+msgid "%s days in adoption, last activity today."
+msgstr "過去 %s 天內被認養的。"
+
+#: ../../english/template/debian/wnpp.wml:50
+#, fuzzy
+#| msgid "in adoption since yesterday."
+msgid "%s days in adoption, last activity yesterday."
+msgstr "昨天到今天被認養的。"
+
+#: ../../english/template/debian/wnpp.wml:54
+msgid "%s days in adoption, last activity %s days ago."
+msgstr ""
+
#. timespans for being_packaged (ITPs)
-#: ../../english/template/debian/wnpp.wml:47
+#: ../../english/template/debian/wnpp.wml:60
msgid "in preparation since today."
msgstr "今天開始準備中的。"
-#: ../../english/template/debian/wnpp.wml:51
+#: ../../english/template/debian/wnpp.wml:64
msgid "in preparation since yesterday."
msgstr "昨天開始準備中的。"
-#: ../../english/template/debian/wnpp.wml:55
+#: ../../english/template/debian/wnpp.wml:68
msgid "%s days in preparation."
msgstr "過去 %s 天內開始準備中的。"
+#: ../../english/template/debian/wnpp.wml:72
+#, fuzzy
+#| msgid "%s days in preparation."
+msgid "%s days in preparation, last activity today."
+msgstr "過去 %s 天內開始準備中的。"
+
+#: ../../english/template/debian/wnpp.wml:76
+#, fuzzy
+#| msgid "in preparation since yesterday."
+msgid "%s days in preparation, last activity yesterday."
+msgstr "昨天開始準備中的。"
+
+#: ../../english/template/debian/wnpp.wml:80
+#, fuzzy
+#| msgid "%s days in preparation."
+msgid "%s days in preparation, last activity %s days ago."
+msgstr "過去 %s 天內開始準備中的。"
+
+#. timespans for request for adoption (RFAs)
+#: ../../english/template/debian/wnpp.wml:85
+#, fuzzy
+#| msgid "in adoption since today."
+msgid "adoption requested since today."
+msgstr "今天被認養的。"
+
+#: ../../english/template/debian/wnpp.wml:89
+#, fuzzy
+#| msgid "in adoption since yesterday."
+msgid "adoption requested since yesterday."
+msgstr "昨天到今天被認養的。"
+
+#: ../../english/template/debian/wnpp.wml:93
+#, fuzzy
+#| msgid "in adoption since today."
+msgid "adoption requested since %s days."
+msgstr "今天被認養的。"
+
+#. timespans for orphaned packages (Os)
+#: ../../english/template/debian/wnpp.wml:98
+#, fuzzy
+#| msgid "in adoption since today."
+msgid "orphaned since today."
+msgstr "今天被認養的。"
+
+#: ../../english/template/debian/wnpp.wml:102
+#, fuzzy
+#| msgid "in adoption since yesterday."
+msgid "orphaned since yesterday."
+msgstr "昨天到今天被認養的。"
+
+#: ../../english/template/debian/wnpp.wml:106
+#, fuzzy
+#| msgid "in preparation since today."
+msgid "orphaned since %s days."
+msgstr "今天開始準備中的。"
+
#. time spans for requested (RFPs) and help requested (RFHs)
-#: ../../english/template/debian/wnpp.wml:60
+#: ../../english/template/debian/wnpp.wml:111
msgid "requested today."
msgstr "今天提出要求的。"
-#: ../../english/template/debian/wnpp.wml:64
+#: ../../english/template/debian/wnpp.wml:115
msgid "requested yesterday."
msgstr "昨天開始提出要求的。"
-#: ../../english/template/debian/wnpp.wml:68
+#: ../../english/template/debian/wnpp.wml:119
msgid "requested %s days ago."
msgstr "%s 天前提出要求的。"
-#: ../../english/template/debian/wnpp.wml:82
+#: ../../english/template/debian/wnpp.wml:133
msgid "package info"
msgstr "套件資訊"
+
+#. popcon rank for RFH bugs
+#: ../../english/template/debian/wnpp.wml:139
+msgid "rank:"
+msgstr ""

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