diff --git a/po/ChangeLog b/po/ChangeLog
index 694b59f8b2..7cc1ab9fea 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2005-07-21  Chao-Hsiung Liao  <j_h_liau@yahoo.com.tw>
+
+	* zh_TW.po: Updated Traditional Chinese translation.
+
 2005-07-20  Marcel Telka  <marcel@telka.sk>
 
 	* sk.po: Updated Slovak translation.
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 3153518b5a..8ca72d1a30 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -1,39 +1,438 @@
-# Traditional translation of NetworkManager.
-# Copyright (C) 2004-2005 The GNOME Foundation.
-# This file is distributed under the same license as the NetworkManager package.
-#
-# Jim Huang <jserv@kaffe.org>, 2005
-#
+# Traditional Chinese translation of Network Manager.
+# Copyright (C) 2005 Free Software Foundation, Inc.
+# Woodman Tuen <wmtuen@gmail.com>, 2005.
+# 
+# 
 msgid ""
 msgstr ""
-"Project-Id-Version: NetworkManager 0.3.3\n"
+"Project-Id-Version: Network Manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-02-23 12:04+0800\n"
-"PO-Revision-Date: 2005-02-23 23:52+0800\n"
-"Last-Translator: Jim Huang <jserv@kaffe.org>\n"
-"Language-Team: Traditioanl Chinese <zh@li.org>\n"
+"POT-Creation-Date: 2005-07-21 22:15+0800\n"
+"PO-Revision-Date: 2005-07-09 11:14+0800\n"
+"Last-Translator: Woodman Tuen <wmtuen@gmail.com>\n"
+"Language-Team: Chinese/Traditional <community@linuxhall.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
-#: info-daemon/networks.glade:11
-msgid "Modify Wireless Networks"
-msgstr "修改無線網路"
+#: ../gnome/applet/applet-dbus-info.c:986
+#, c-format
+msgid ""
+"The requested wireless network '%s' does not appear to be in range.  A "
+"different wireless network will be used if any are available."
+msgstr ""
 
-#: info-daemon/networks.glade:92
-msgid "<span weight=\"bold\">Wireless Networks:</span>"
-msgstr "<span weight=\"bold\">無線網路列表：</span>"
+#: ../gnome/applet/applet-dbus.c:597
+#, c-format
+msgid "Connection to the wireless network '%s' failed.\n"
+msgstr "連接無線網路‘%s’失敗。\n"
 
-#: info-daemon/passphrase.glade:9
-msgid "Wireless Network Key Required"
-msgstr "需要無線網路金鑰"
+#: ../gnome/applet/applet-dbus.c:602
+msgid "Connection to the wired network failed.\n"
+msgstr "連接有線網路失敗。\n"
 
-#: info-daemon/passphrase.glade:52
-msgid "_Login to Network"
-msgstr "登入網路 (_L)"
+#: ../gnome/applet/applet.c:192
+msgid "Error displaying connection information: "
+msgstr "顯示連線資訊發生錯誤："
 
-#: info-daemon/passphrase.glade:100
+#: ../gnome/applet/applet.c:217
+msgid "Could not find some required resources (the glade file)!"
+msgstr "無法找到一些需要的資源（glade 檔）！"
+
+#: ../gnome/applet/applet.c:227
+msgid "No active connections!"
+msgstr "沒有使用中的連線"
+
+#: ../gnome/applet/applet.c:236
+msgid "Could not open socket!"
+msgstr ""
+
+#: ../gnome/applet/applet.c:251
+msgid "Failed to get information about the interface!"
+msgstr "無法取得網路介面的訊資！"
+
+#: ../gnome/applet/applet.c:284
+#, c-format
+msgid "Wired Ethernet (%s)"
+msgstr "有線乙太網路 (%s)"
+
+#: ../gnome/applet/applet.c:286
+#, c-format
+msgid "Wireless Ethernet (%s)"
+msgstr "有線乙太網路 (%s)"
+
+#: ../gnome/applet/applet.c:380 ../gnome/applet/applet.c:398
+msgid "NetworkManager Applet"
+msgstr "NetworkManager 面板程式"
+
+#: ../gnome/applet/applet.c:382 ../gnome/applet/applet.c:400
+msgid "Copyright (C) 2004-2005 Red Hat, Inc."
+msgstr "版權所有 (C) 2004-2005 Red Hat, Inc."
+
+#: ../gnome/applet/applet.c:383 ../gnome/applet/applet.c:401
+msgid ""
+"Notification area applet for managing your network devices and connections."
+msgstr ""
+
+#: ../gnome/applet/applet.c:486
+msgid "VPN Error"
+msgstr "VPN 錯誤"
+
+#: ../gnome/applet/applet.c:490
+#, c-format
+msgid ""
+"<span weight=\"bold\" size=\"larger\">VPN Login Failure</span>\n"
+"\n"
+"Could not start the VPN connection '%s' due to a login failure.\n"
+"\n"
+"The VPN service said: \"%s\""
+msgstr ""
+
+#: ../gnome/applet/applet.c:495
+#, c-format
+msgid ""
+"<span weight=\"bold\" size=\"larger\">VPN Start Failure</span>\n"
+"\n"
+"Could not start the VPN connection '%s' due to a failure launching the VPN "
+"program.\n"
+"\n"
+"The VPN service said: \"%s\""
+msgstr ""
+
+#: ../gnome/applet/applet.c:500
+#, c-format
+msgid ""
+"<span weight=\"bold\" size=\"larger\">VPN Connect Failure</span>\n"
+"\n"
+"Could not start the VPN connection '%s' due to a connection error.\n"
+"\n"
+"The VPN service said: \"%s\""
+msgstr ""
+
+#: ../gnome/applet/applet.c:505
+#, c-format
+msgid ""
+"<span weight=\"bold\" size=\"larger\">VPN Configuration Error</span>\n"
+"\n"
+"The VPN connection '%s' was not correctly configured.\n"
+"\n"
+"The VPN service said: \"%s\""
+msgstr ""
+
+#: ../gnome/applet/applet.c:510
+#, c-format
+msgid ""
+"<span weight=\"bold\" size=\"larger\">VPN Connect Failure</span>\n"
+"\n"
+"Could not start the VPN connection '%s' because the VPN server did not "
+"return an adequate network configuration.\n"
+"\n"
+"The VPN service said: \"%s\""
+msgstr ""
+
+#: ../gnome/applet/applet.c:577
+#, c-format
+msgid ""
+"<span weight=\"bold\" size=\"larger\">VPN Login Message</span>\n"
+"\n"
+"VPN connection '%s' said:\n"
+"\n"
+"\"%s\""
+msgstr ""
+"<span weight=\"bold\" size=\"larger\">VPN 登入訊息</span>\n"
+"\n"
+"VPN 連線‘%s’說：\n"
+"\n"
+"\"%s\""
+
+#: ../gnome/applet/applet.c:795 ../gnome/applet/applet.c:2365
+#: ../gnome/applet/other-network-dialog.c:315
+#: ../gnome/applet/passphrase-dialog.c:455
+msgid ""
+"The NetworkManager Applet could not find some required resources (the glade "
+"file was not found)."
+msgstr "NetworkManager 面板程式無法找到一些需要的資源（找不到 glade 檔）"
+
+#: ../gnome/applet/applet.c:808
+#, c-format
+msgid "The network device \"%s (%s)\" does not support wireless scanning."
+msgstr "網路裝置“%s (%s)”不支援無線網路掃描。"
+
+#: ../gnome/applet/applet.c:815
+#, c-format
+msgid "The network device \"%s (%s)\" does not support link detection."
+msgstr "網路裝置“%s (%s)”不支援連接偵測"
+
+#: ../gnome/applet/applet.c:936
+#, c-format
+msgid "Preparing device %s for the wired network..."
+msgstr "裝置 %s 正準備連接有線網路..."
+
+#: ../gnome/applet/applet.c:938
+#, c-format
+msgid "Preparing device %s for the wireless network '%s'..."
+msgstr "裝置 %s 正準備連接無線網路‘%s’..."
+
+#: ../gnome/applet/applet.c:945
+#, fuzzy, c-format
+msgid "Configuring device %s for the wired network..."
+msgstr "正在連接到有線網路..."
+
+#: ../gnome/applet/applet.c:947
+#, c-format
+msgid "Attempting to join the wireless network '%s'..."
+msgstr "正在嘗試加入無線網路‘%s’..."
+
+#: ../gnome/applet/applet.c:954
+#, c-format
+msgid "Waiting for Network Key for the wireless network '%s'..."
+msgstr "正在等待無線網路‘%s’的網路金鑰..."
+
+#: ../gnome/applet/applet.c:961 ../gnome/applet/applet.c:970
+msgid "Requesting a network address from the wired network..."
+msgstr "正要求有線網路提供網路位址..."
+
+#: ../gnome/applet/applet.c:963 ../gnome/applet/applet.c:972
+#, c-format
+msgid "Requesting a network address from the wireless network '%s'..."
+msgstr "正要求無線網路‘%s’提供網路位址..."
+
+#: ../gnome/applet/applet.c:979
+msgid "Finishing connection to the wired network..."
+msgstr "連接有線網路完成..."
+
+#: ../gnome/applet/applet.c:981
+#, c-format
+msgid "Finishing connection to the wireless network '%s'..."
+msgstr "連接無線網路‘%s’完成..."
+
+#: ../gnome/applet/applet.c:1027
+msgid "NetworkManager is not running"
+msgstr "NetworkManager 沒有執行"
+
+#: ../gnome/applet/applet.c:1038
+msgid "No network connection"
+msgstr "沒有網路連接"
+
+#: ../gnome/applet/applet.c:1045
+msgid "Wired network connection"
+msgstr "有線網路連接"
+
+#: ../gnome/applet/applet.c:1052
+msgid "Connected to an Ad-Hoc wireless network"
+msgstr "連接到 Ad-Hoc 點對點式無線網路"
+
+#: ../gnome/applet/applet.c:1066
+#, c-format
+msgid "Wireless network connection to '%s' (%d%%)"
+msgstr "無線網路連接到‘%s’ (%d%%)"
+
+#: ../gnome/applet/applet.c:1091
+#, c-format
+msgid "VPN connection to '%s'"
+msgstr "VPN 連線連接到‘%s’"
+
+#: ../gnome/applet/applet.c:1517
+msgid "_Connect to Other Wireless Network..."
+msgstr "連接到其它的無線網路(_C)..."
+
+#: ../gnome/applet/applet.c:1538
+msgid "Create _New Wireless Network..."
+msgstr "建立新的無線網路(_N)..."
+
+#: ../gnome/applet/applet.c:1651
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:17
+msgid "VPN Connections"
+msgstr "VPN 連線"
+
+#: ../gnome/applet/applet.c:1678
+msgid "Configure VPN..."
+msgstr "設置 VPN..."
+
+#: ../gnome/applet/applet.c:1682
+msgid "Disconnect VPN..."
+msgstr "與 VPN 斷線..."
+
+#: ../gnome/applet/applet.c:1732
+msgid "No network devices have been found"
+msgstr "找不到任何網路裝置"
+
+#: ../gnome/applet/applet.c:1890
+msgid "NetworkManager is not running..."
+msgstr "NetworkManager 沒有執行...."
+
+#: ../gnome/applet/applet.c:1958
+msgid "_Stop All Wireless Devices"
+msgstr "停止所有無線網路裝置(_S)"
+
+#: ../gnome/applet/applet.c:1963
+msgid "_Start All Wireless Devices"
+msgstr "開始執行所有無線網路裝置(_S)"
+
+#: ../gnome/applet/applet.c:1994
+#, fuzzy
+msgid "_Wireless Network Discovery"
+msgstr "無線網路 (%s)"
+
+#: ../gnome/applet/applet.c:1997
+msgid "Always Search"
+msgstr "總是搜尋"
+
+#: ../gnome/applet/applet.c:2005
+msgid "Search Only When Disconnected"
+msgstr "在斷線時才搜尋"
+
+#: ../gnome/applet/applet.c:2013
+msgid "Never Search"
+msgstr "永不搜尋"
+
+#. Stop All Wireless Devices item
+#: ../gnome/applet/applet.c:2025
+msgid "Stop All Wireless Devices"
+msgstr "停止所有無線網路裝置"
+
+#: ../gnome/applet/applet.c:2031
+msgid "Connection _Information"
+msgstr "連線資訊(_I)"
+
+#: ../gnome/applet/applet.c:2039
+msgid "_Help"
+msgstr "求助(_H)"
+
+#: ../gnome/applet/applet.c:2046
+msgid "_About"
+msgstr "關於(_A)"
+
+#: ../gnome/applet/applet.c:2515
+msgid ""
+"The NetworkManager applet could not find some required resources.  It cannot "
+"continue.\n"
+msgstr "NetworkManager 面板程式無法找到一些需要的資源。它無法繼續。\n"
+
+#: ../gnome/applet/eggtrayicon.c:118
+msgid "Orientation"
+msgstr "方向"
+
+#: ../gnome/applet/eggtrayicon.c:119
+msgid "The orientation of the tray."
+msgstr "面板的方向"
+
+#: ../gnome/applet/menu-items.c:89
+#, c-format
+msgid "Wired Network (%s)"
+msgstr "有線網路 (%s)"
+
+#: ../gnome/applet/menu-items.c:92
+msgid "_Wired Network"
+msgstr "有線網路(_W)"
+
+#: ../gnome/applet/menu-items.c:165
+#, c-format
+msgid "Wireless Network (%s)"
+msgid_plural "Wireless Networks (%s)"
+msgstr[0] "無線網路 (%s)"
+
+#: ../gnome/applet/menu-items.c:167
+msgid "Wireless Network"
+msgid_plural "Wireless Networks"
+msgstr[0] "無線網路"
+
+#: ../gnome/applet/menu-items.c:309
+msgid " (invalid Unicode)"
+msgstr "（無效的統一碼）"
+
+#: ../gnome/applet/other-network-dialog.c:148
+#: ../gnome/applet/passphrase-dialog.c:163
+#: ../gnome/applet/wireless-applet.glade.h:34
+msgid "Passphrase:"
+msgstr "通行碼："
+
+#: ../gnome/applet/other-network-dialog.c:151
+#: ../gnome/applet/passphrase-dialog.c:166
+#, fuzzy
+msgid "ASCII Key:"
+msgstr "Acii 格式金鑰："
+
+#: ../gnome/applet/other-network-dialog.c:154
+#: ../gnome/applet/passphrase-dialog.c:169
+msgid "Hex Key:"
+msgstr "Hex 格式金鑰："
+
+#: ../gnome/applet/other-network-dialog.c:229
+msgid "Create new wireless network"
+msgstr "建立新的無線網路"
+
+#: ../gnome/applet/other-network-dialog.c:230
+msgid ""
+"Enter the ESSID and security settings of the wireless network you wish to "
+"create."
+msgstr "輸入您要建立的無線網路的 ESSID 及安全設定。"
+
+#: ../gnome/applet/other-network-dialog.c:235
+msgid "Custom wireless network"
+msgstr "自訂無線網路"
+
+#: ../gnome/applet/other-network-dialog.c:236
+msgid "Enter the ESSID of the wireless network to which you wish to connect."
+msgstr "輸入您要連接的無線網路的 ESSID。"
+
+#: ../gnome/applet/passphrase-dialog.c:248
+#, c-format
+msgid "Passphrase for wireless network %s"
+msgstr "無線網路 %s 的通行碼"
+
+#: ../gnome/applet/vpn-password-dialog.c:152
+#: ../gnome/applet/vpn-password-dialog.c:191
+#, c-format
+msgid "Cannot start VPN connection '%s'"
+msgstr "無法執行 VPN 連線‘%s’"
+
+#: ../gnome/applet/vpn-password-dialog.c:155
+#, c-format
+msgid ""
+"Could not find the authentication dialog for VPN connection type '%s'. "
+"Contact your system administrator."
+msgstr ""
+
+#: ../gnome/applet/vpn-password-dialog.c:194
+#, c-format
+msgid ""
+"There was a problem launching the authentication dialog for VPN connection "
+"type '%s'. Contact your system administrator."
+msgstr ""
+
+#: ../gnome/applet/wireless-applet.glade.h:1
+msgid " "
+msgstr " "
+
+#: ../gnome/applet/wireless-applet.glade.h:2
+msgid ""
+"128-bit Passphrase (WEP)\n"
+"Ascii Key (WEP)\n"
+"Hex Key (WEP)"
+msgstr ""
+"128位元通行碼 (WEP)\n"
+"Acii 格式金鑰 (WEP)\n"
+"Hex 格式金鑰 (WEP)"
+
+#: ../gnome/applet/wireless-applet.glade.h:5
+msgid ""
+"128-bit passphrase (WEP)\n"
+"Ascii key (WEP)\n"
+"Hex key (WEP)"
+msgstr ""
+"128位元通行碼 (WEP)\n"
+"Acii 格式金鑰 (WEP)\n"
+"Hex 格式金鑰 (WEP)"
+
+#: ../gnome/applet/wireless-applet.glade.h:8
+msgid ""
+"<span weight=\"bold\" size=\"larger\">Active Connection Information</span>"
+msgstr "<span weight=\"bold\">使用中的連線資訊：</span>"
+
+#: ../gnome/applet/wireless-applet.glade.h:10
+#, no-c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Passphrase Required by Wireless "
 "Network</span>\n"
@@ -41,241 +440,269 @@ msgid ""
 "A passphrase or encryption key is required to access the wireless network '%"
 "s'."
 msgstr ""
-"<span weight=\"bold\" size=\"larger\">無線網路需要密碼</span>\n"
+"<span weight=\"bold\" size=\"larger\">無線網路通行碼請求</span>\n"
 "\n"
-"為了存取無線網路「%s」，需要一組密碼或者加密過的金鑰"
-"s'."
+"需要一個通行碼或是密鑰來存取無線網路‘%s’"
 
-
-#: info-daemon/passphrase.glade:129
-msgid "Key Type:"
-msgstr "金鑰型態："
-
-#: info-daemon/passphrase.glade:150
+#: ../gnome/applet/wireless-applet.glade.h:14
+#, no-c-format
 msgid ""
-"128-bit Passphrase (WEP)\n"
-"Ascii Key (WEP)\n"
-"Hex Key (WEP)"
-msgstr ""
-"128 位元密碼 (WEP)\n"
-"Ascii 金鑰 (WEP)\n"
-"Hex 金鑰 (WEP)"
-
-#: info-daemon/passphrase.glade:181
-#: info-daemon/NetworkManagerInfoPassphraseDialog.c:139
-#: panel-applet/NMWirelessAppletOtherNetworkDialog.c:149
-#: panel-applet/essid.glade:269
-msgid "Passphrase:"
+"<span weight=\"bold\" size=\"larger\">Reduced Network Functionality</span>\n"
+"\n"
+"%s  It will not be completely functional."
 msgstr ""
 
-#: info-daemon/passphrase.glade:209 panel-applet/essid.glade:202
-#: panel-applet/essid.glade:299
-msgid "*"
-msgstr ""
-
-#: info-daemon/NetworkManagerInfoPassphraseDialog.c:142
-#: panel-applet/NMWirelessAppletOtherNetworkDialog.c:152
-msgid "Ascii Key:"
-msgstr "Ascii 金鑰："
-
-#: info-daemon/NetworkManagerInfoPassphraseDialog.c:145
-#: panel-applet/NMWirelessAppletOtherNetworkDialog.c:155
-msgid "Hex Key:"
-msgstr "Hex 金鑰："
-
-#: info-daemon/NetworkManagerInfoVPN.c:157
-#, c-format
-msgid "You must log in to access the private network %s"
-msgstr "為了存取私有網路「%s」，你必須先行登入"
-
-#: panel-applet/NMWirelessApplet.c:141 panel-applet/NMWirelessApplet.c:159
-msgid "NetworkManager Applet"
-msgstr ""
-
-#: panel-applet/NMWirelessApplet.c:143 panel-applet/NMWirelessApplet.c:161
-msgid "Copyright (C) 2004-2005 Red Hat, Inc."
-msgstr ""
-
-#: panel-applet/NMWirelessApplet.c:144 panel-applet/NMWirelessApplet.c:162
+#: ../gnome/applet/wireless-applet.glade.h:18
+#, no-c-format
 msgid ""
-"Notification area applet for managing your network devices and connections."
+"<span weight=\"bold\" size=\"larger\">Wireless Network Login Confirmation</"
+"span>\n"
+"\n"
+"You have chosen to log in to the wireless network '%s'.  If you are sure "
+"that this wireless network is secure, click the checkbox below and "
+"NetworkManager will not require confirmation on subsequent log ins."
 msgstr ""
-"管理網路裝置與連線的工具程式"
 
-#: panel-applet/NMWirelessApplet.c:378
-msgid "No network connection"
-msgstr "沒有網路連線"
+#: ../gnome/applet/wireless-applet.glade.h:21
+msgid "Always Trust this Wireless Network"
+msgstr "總是信任這無線網路"
 
-#: panel-applet/NMWirelessApplet.c:383
-msgid "Wired network connection"
-msgstr "有線網路連線"
+#: ../gnome/applet/wireless-applet.glade.h:22
+msgid "Broadcast Address:"
+msgstr "廣播位址："
 
-#: panel-applet/NMWirelessApplet.c:388
-msgid "Connecting to a wired network..."
-msgstr "正在連線到有線網路"
-
-#: panel-applet/NMWirelessApplet.c:397
-msgid "Connected to an Ad-Hoc wireless network"
-msgstr "已連線到一個 Ad-Hoc 無線網路"
-
-#: panel-applet/NMWirelessApplet.c:411
-#, c-format
-msgid "Wireless network connection to '%s' (%d%%)"
-msgstr "無線網路連結於「%s」(%d%%)"
-
-#: panel-applet/NMWirelessApplet.c:416
-msgid "Wireless network connection"
-msgstr "無線網路連線"
-
-#: panel-applet/NMWirelessApplet.c:421
-#, c-format
-msgid "Connecting to wireless network '%s'..."
-msgstr "正在連線到無線網路「%s」..."
-
-#: panel-applet/NMWirelessApplet.c:427
-msgid "NetworkManager is not running"
-msgstr "NetworkManager 並未啟動"
-
-#: panel-applet/NMWirelessApplet.c:432
-msgid "Scanning for wireless networks..."
-msgstr "掃描無線網路中..."
-
-#: panel-applet/NMWirelessApplet.c:729
-msgid "Other Wireless Networks..."
-msgstr "其餘無線網路..."
-
-#: panel-applet/NMWirelessApplet.c:750
-msgid "Create new Wireless Network..."
-msgstr "建立新的無線網路..."
-
-#: panel-applet/NMWirelessApplet.c:864
-msgid "No network devices have been found"
-msgstr "沒有找到任何網路裝置"
-
-#: panel-applet/NMWirelessApplet.c:1002
-msgid "NetworkManager is not running..."
-msgstr "NetworkManager 並未啟動..."
-
-#: panel-applet/NMWirelessApplet.c:1072 panel-applet/NMWirelessApplet.c:1121
-msgid "Pause Wireless Scanning"
-msgstr "暫停無線網路掃描動作"
-
-#: panel-applet/NMWirelessApplet.c:1077
-msgid "Resume Wireless Scanning"
-msgstr "繼續無線網路掃描"
-
-#: panel-applet/NMWirelessApplet.c:1087 panel-applet/NMWirelessApplet.c:1127
-msgid "Stop All Wireless Devices"
-msgstr "停止所有無腺網路裝置"
-
-#: panel-applet/NMWirelessApplet.c:1092
-msgid "Start All Wireless Devices"
-msgstr "啟動所有無腺網路裝置"
-
-#: panel-applet/NMWirelessApplet.c:1137
-msgid "Help"
-msgstr "輔助"
-
-#: panel-applet/NMWirelessApplet.c:1144
-msgid "About"
-msgstr "關於"
-
-#: panel-applet/NMWirelessAppletOtherNetworkDialog.c:229
-msgid "Create new wireless network"
-msgstr "建立新的無線網路"
-
-#: panel-applet/NMWirelessAppletOtherNetworkDialog.c:230
-msgid ""
-"Enter the ESSID and security settings of the wireless network you wish to "
-"create."
-msgstr ""
-"輸入 ESSID 與無線網路的安全行設定"
-
-#: panel-applet/NMWirelessAppletOtherNetworkDialog.c:235
-msgid "Custom wireless network"
-msgstr "自訂無線網路"
-
-#: panel-applet/NMWirelessAppletOtherNetworkDialog.c:236
-msgid "Enter the ESSID of the wireless network to which you wish to connect."
-msgstr ""
-"輸入你所要連線的無線網路 ESSID"
-
-#. Reuse the above string to make the translators less angry.
-#: panel-applet/NMWirelessAppletOtherNetworkDialog.c:316
-#: panel-applet/NMWirelessAppletOtherNetworkDialog.c:325
-msgid ""
-"The NetworkManager Applet could not find some required resources (the glade "
-"file was not found)."
-msgstr ""
-"NeworkManager 無法找到某些資源 (glade 當遺失了)"
-
-#: panel-applet/essid.glade:52
+#: ../gnome/applet/wireless-applet.glade.h:23
 msgid "C_onnect"
-msgstr ""
-"連線 (_o)"
+msgstr "連線(_O)"
 
-#: panel-applet/essid.glade:131
-msgid "Wireless _adapter:"
-msgstr ""
-"無線網路裝置：(_a)"
-
-#: panel-applet/essid.glade:171
-msgid "Wireless _network:"
-msgstr ""
-"無線網路 (_n)"
-
-#: panel-applet/essid.glade:245
-msgid "Key type:"
-msgstr ""
-"金鑰型態："
-
-#: panel-applet/essid.glade:314
-msgid ""
-"128-bit passphrase (WEP)\n"
-"Ascii key (WEP)\n"
-"Hex key (WEP)"
-msgstr ""
-"128 位元密碼 (WEP)\n"
-"Ascii 金鑰 (WEP)\n"
-"Hex 金鑰 (WEP)"
-
-#: panel-applet/essid.glade:336
+#: ../gnome/applet/wireless-applet.glade.h:24
 msgid "Connect with encryption enabled"
-msgstr ""
-"啟動加密連線"
+msgstr "啟用加密連接"
 
-#: panel-applet/menu-info.c:91
+#: ../gnome/applet/wireless-applet.glade.h:25
+msgid "Connection Information"
+msgstr "連線資訊"
+
+#: ../gnome/applet/wireless-applet.glade.h:26
+msgid "Destination Address:"
+msgstr "目的地位址："
+
+#: ../gnome/applet/wireless-applet.glade.h:27
+msgid "Don't remind me again"
+msgstr "不要再提醒我"
+
+#: ../gnome/applet/wireless-applet.glade.h:28
+msgid "Hardware Address:"
+msgstr "硬體位址："
+
+#: ../gnome/applet/wireless-applet.glade.h:29
+msgid "IP Address:"
+msgstr "IP 位址："
+
+#: ../gnome/applet/wireless-applet.glade.h:30
+msgid "Interface:"
+msgstr "介面："
+
+#: ../gnome/applet/wireless-applet.glade.h:31
+msgid "Key Type:"
+msgstr "金鑰類型："
+
+#: ../gnome/applet/wireless-applet.glade.h:32
+msgid "Key type:"
+msgstr "金鑰類型："
+
+#: ../gnome/applet/wireless-applet.glade.h:33
+msgid "Other Wireless Network..."
+msgstr "其它無線網路..."
+
+#: ../gnome/applet/wireless-applet.glade.h:35
+msgid "Subnet Mask:"
+msgstr "子網路遮罩："
+
+#: ../gnome/applet/wireless-applet.glade.h:36
+msgid "Wireless Network Key Required"
+msgstr "需要無線網路金鑰"
+
+#: ../gnome/applet/wireless-applet.glade.h:37
+msgid "Wireless _adapter:"
+msgstr "無線網絡卡(_A)："
+
+#: ../gnome/applet/wireless-applet.glade.h:38
+msgid "Wireless _network:"
+msgstr "無線網路(_N)："
+
+#: ../gnome/applet/wireless-applet.glade.h:39
+msgid "_Login to Network"
+msgstr "登入網路(_L)"
+
+#: ../gnome/applet/wireless-applet.glade.h:40
+msgid "_OK"
+msgstr "確定(_O)"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:374
+msgid "Cannot add VPN connection"
+msgstr "無法加入 VPN 連線"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:376
+msgid ""
+"No suitable VPN software was found on your system. Contact your system "
+"administrator."
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:428
+msgid "Cannot import VPN connection"
+msgstr "無法匯入 VPN 網路連線"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:430
 #, c-format
-msgid "Wired Network (%s)"
+msgid ""
+"Cannot find suitable software for VPN connection type '%s' to import the "
+"file '%s'. Contact your system administrator."
 msgstr ""
-"有線網路 (%s)"
 
-#: panel-applet/menu-info.c:93
-msgid "Wired Network"
-msgstr ""
-"有線網路"
-
-#: panel-applet/menu-info.c:166
+#: ../gnome/vpn-properties/nm-vpn-properties.c:570
 #, c-format
-msgid "Wireless Network (%s)"
-msgid_plural "Wireless Networks (%s)"
-msgstr[0] "無線網路 (%S)"
-msgstr[1] "無線網路 (%s)"
-
-#: panel-applet/menu-info.c:168
-msgid "Wireless Network"
-msgid_plural "Wireless Networks"
-msgstr[0] "無線網路"
-msgstr[1] "無線網路"
-
-#: panel-applet/menu-info.c:294
-msgid " (invalid Unicode)"
+msgid "Error retrieving VPN connection '%s'"
 msgstr ""
 
-#: examples/python/systray/eggtrayicon.c:111
-msgid "Orientation"
-msgstr "方位"
+#: ../gnome/vpn-properties/nm-vpn-properties.c:573
+#, c-format
+msgid ""
+"Could not find the UI files for VPN connection type '%s'. Contact your "
+"system administrator."
+msgstr ""
 
-#: examples/python/systray/eggtrayicon.c:112
-msgid "The orientation of the tray."
-msgstr "系統圖示的方位"
+#: ../gnome/vpn-properties/nm-vpn-properties.c:733
+#, c-format
+msgid "Delete VPN connection \"%s\"?"
+msgstr "刪除 VPN 連線“%s”？"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:736
+#, c-format
+msgid ""
+"All information about the VPN connection \"%s\" will be lost and you may "
+"need your system administrator to provide information to create a new "
+"connection."
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:951
+msgid "Unable to load"
+msgstr "無法載入"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:953
+msgid "Cannot find some needed resources (the glade file)!"
+msgstr "無法找到一些需要的資源（ glade 檔）！"
+
+#. Edit dialog
+#: ../gnome/vpn-properties/nm-vpn-properties.c:1071
+msgid "Edit VPN Connection"
+msgstr "編輯 VPN 連線"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:1
+msgid "Add a new VPN connection"
+msgstr "加入新的 VPN 連線"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:2
+msgid "Connect to:"
+msgstr "連線到："
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:3
+msgid "Create VPN Connection"
+msgstr "建立 VPN 連線"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:4
+msgid "Create VPN Connection - 1 of 2"
+msgstr "建立 VPN 連線 - 第一步"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:5
+msgid "Create VPN Connection - 2 of 2"
+msgstr "建立 VPN 連線 - 第二步"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:6
+msgid "Delete the selected VPN connection"
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:7
+msgid ""
+"Dependent on the private network you want to connect to, you need to select "
+"what type of connection you want to create."
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:8
+msgid "E_xport"
+msgstr "匯出(_X)"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:9
+msgid "Edit the selected VPN connection"
+msgstr "編輯已選的 VPN 連線"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:10
+msgid "Export VPN connection to a file"
+msgstr "匯出 VPN 連線至檔案"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:11
+msgid "Export the VPN settings to a file"
+msgstr "匯出 VPN 設定至檔案"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:12
+msgid "Finish create VPN Connection"
+msgstr "建立 VPN 連線完成"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:13
+msgid "Manage Virtual Private Network connections"
+msgstr "管理虛擬私有網路連線"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:14
+msgid ""
+"This assistant will guide you through the creation of a new VPN connection "
+"to a private network.\n"
+"\n"
+"It will require some information, such as IP addresses and secrets, that "
+"will probably be provided by your system administrator as appropriate."
+msgstr ""
+
+#: ../src/nm-netlink-monitor.c:154
+#, c-format
+msgid ""
+"unable to create netlink socket for monitoring wired ethernet devices - %s"
+msgstr ""
+
+#: ../src/nm-netlink-monitor.c:172
+#, c-format
+msgid ""
+"unable to bind to netlink socket for monitoring wired ethernet devices - %s"
+msgstr ""
+
+#: ../src/nm-netlink-monitor.c:404
+msgid "operation took too long"
+msgstr ""
+
+#: ../src/nm-netlink-monitor.c:501
+msgid "received data from wrong type of sender"
+msgstr ""
+
+#: ../src/nm-netlink-monitor.c:514
+msgid "received data from unexpected sender"
+msgstr ""
+
+#: ../src/nm-netlink-monitor.c:536
+#, c-format
+msgid "%s"
+msgstr "%s"
+
+#: ../src/nm-netlink-monitor.c:645
+msgid "too much data was sent over socket and some of it was lost"
+msgstr ""
+
+#: ../src/nm-netlink-monitor.c:734
+msgid "error occurred while waiting for data on socket"
+msgstr ""
+
+#~ msgid "Modify Wireless Networks"
+#~ msgstr "修改無線網路"
+
+#~ msgid "*"
+#~ msgstr "*"
+
+#~ msgid "You must log in to access the private network %s"
+#~ msgstr "您需要登入來存取私有網路 %s"