diff po/zh_TW.po @ 8459:3afd1761da09

[gaim-migrate @ 9189] make make dist work committer: Tailor Script <tailor@pidgin.im>
author Luke Schierer <lschiere@pidgin.im>
date Tue, 16 Mar 2004 20:35:22 +0000
parents a85ac2a94eb7
children 03b9ce930f0d
line wrap: on
line diff
--- a/po/zh_TW.po	Tue Mar 16 20:24:37 2004 +0000
+++ b/po/zh_TW.po	Tue Mar 16 20:35:22 2004 +0000
@@ -23,7 +23,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Gaim 0.75\n"
-"POT-Creation-Date: 2004-01-06 00:00-0500\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2004-03-16 15:37-0500\n"
 "PO-Revision-Date: 2003-05-29 12:04+0800\n"
 "Last-Translator: Ambrose C. Li <acli@ada.dhs.org>\n"
 "Language-Team: Chinese (Traditional) <zh-l10n@linux.org.tw>\n"
@@ -40,14 +41,15 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/autorecon.c:104
+#: plugins/autorecon.c:110
 msgid "Auto-Reconnect"
 msgstr "自動重新連線"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/autorecon.c:107 plugins/autorecon.c:109
+#. *  description
+#: plugins/autorecon.c:113 plugins/autorecon.c:115
 msgid "When you are kicked offline, this reconnects you."
 msgstr "當你斷線時,系統會自動幫你重新連線。"
 
@@ -153,7 +155,7 @@
 msgid "Gaim - Away"
 msgstr "Gaim - 離開"
 
-#: plugins/docklet/docklet.c:114 src/gtkaccount.c:480 src/gtkaccount.c:1759
+#: plugins/docklet/docklet.c:114 src/gtkaccount.c:495 src/gtkaccount.c:1820
 msgid "Auto-login"
 msgstr "自動登入"
 
@@ -169,16 +171,16 @@
 msgid "New..."
 msgstr "新增..."
 
-#: plugins/docklet/docklet.c:153 src/gtkblist.c:2552 src/gtkpounce.c:411
-#: src/gtkprefs.c:1457 src/protocols/gg/gg.c:51 src/protocols/irc/msgs.c:187
-#: src/protocols/jabber/jabber.c:965 src/protocols/jabber/jutil.c:98
-#: src/protocols/jabber/presence.c:84 src/protocols/oscar/oscar.c:2842
-#: src/protocols/oscar/oscar.c:4596 src/protocols/oscar/oscar.c:5545
-#: src/protocols/oscar/oscar.c:6146
+#: plugins/docklet/docklet.c:153 src/gtkprefs.c:1576 src/protocols/gg/gg.c:51
+#: src/protocols/irc/msgs.c:187 src/protocols/jabber/jabber.c:960
+#: src/protocols/jabber/jutil.c:99 src/protocols/jabber/presence.c:58
+#: src/protocols/jabber/presence.c:114 src/protocols/oscar/oscar.c:2939
+#: src/protocols/oscar/oscar.c:4748 src/protocols/oscar/oscar.c:5792
+#: src/protocols/oscar/oscar.c:6410
 msgid "Away"
 msgstr "離開"
 
-#: plugins/docklet/docklet.c:159 src/away.c:515
+#: plugins/docklet/docklet.c:159 src/away.c:522
 msgid "Back"
 msgstr "返回"
 
@@ -186,16 +188,16 @@
 msgid "Mute Sounds"
 msgstr "靜音"
 
-#: plugins/docklet/docklet.c:172 src/gtkft.c:581
+#: plugins/docklet/docklet.c:172 src/gtkft.c:605
 msgid "File Transfers"
 msgstr "檔案傳輸"
 
 #. And now for the buttons
-#: plugins/docklet/docklet.c:173 src/gtkaccount.c:1918 src/main.c:324
+#: plugins/docklet/docklet.c:173 src/gtkaccount.c:1999 src/main.c:288
 msgid "Accounts"
 msgstr "帳號清單"
 
-#: plugins/docklet/docklet.c:174 src/gtkprefs.c:2323 src/main.c:330
+#: plugins/docklet/docklet.c:174 src/gtkprefs.c:2564 src/main.c:294
 msgid "Preferences"
 msgstr "偏好設定"
 
@@ -260,6 +262,7 @@
 #. *< name
 #. *< version
 #. *  summary
+#. *  description
 #: plugins/filectl.c:226 plugins/filectl.c:228
 msgid "Allows you to control Gaim by entering commands in a file."
 msgstr "允許您在檔案中輸入指令以控制 Gaim。"
@@ -391,6 +394,181 @@
 "往上後向左拖曳為切換到前一個交談。\n"
 "往上後向右拖曳為切換到下一個交談。"
 
+#: plugins/gevolution/add_buddy_dialog.c:136
+#: plugins/gevolution/assoc-buddy.c:76
+#, fuzzy
+msgid "Local Addressbook"
+msgstr "電子郵件"
+
+#: plugins/gevolution/add_buddy_dialog.c:146
+#: plugins/gevolution/add_buddy_dialog.c:157
+#: plugins/gevolution/assoc-buddy.c:86 plugins/gevolution/assoc-buddy.c:97
+#: src/gtkblist.c:2879 src/gtkprefs.c:851 src/gtkprefs.c:1604
+#: src/protocols/jabber/jabber.c:916
+msgid "None"
+msgstr "無"
+
+# NOTE 只能譯「名稱」,因為同時解作「人名」及「模組名稱」
+#: plugins/gevolution/add_buddy_dialog.c:190
+#: plugins/gevolution/assoc-buddy.c:180 src/gtkprefs.c:1981
+#: src/gtkroomlist.c:561 src/protocols/jabber/jabber.c:590
+#: src/protocols/msn/msn.c:1367 src/protocols/trepia/trepia.c:401
+msgid "Name"
+msgstr "名稱"
+
+# XXX 看了原始碼,但不肯定譯得對
+# NOTE SimGuy: probably "Other IM services" if you can do that one :)
+#: plugins/gevolution/add_buddy_dialog.c:201
+#, fuzzy
+msgid "Instant Messaging"
+msgstr "其他即時傳訊帳號"
+
+#. Add the label.
+#: plugins/gevolution/add_buddy_dialog.c:482
+msgid "Select a person from your address book below, or add a new person."
+msgstr ""
+
+#. "Search"
+#: plugins/gevolution/add_buddy_dialog.c:495
+#: plugins/gevolution/assoc-buddy.c:385 src/protocols/oscar/oscar.c:6680
+msgid "Search"
+msgstr "搜尋"
+
+#: plugins/gevolution/add_buddy_dialog.c:566
+#: plugins/gevolution/new_person_dialog.c:310 src/gtkblist.c:3897
+#: src/gtkblist.c:4225
+msgid "Group:"
+msgstr "群組:"
+
+#. "New Person" button
+#: plugins/gevolution/add_buddy_dialog.c:592
+#: plugins/gevolution/assoc-buddy.c:488
+#, fuzzy
+msgid "New Person"
+msgstr "<新使用者>"
+
+#. "Select Buddy" button
+#: plugins/gevolution/add_buddy_dialog.c:609
+#, fuzzy
+msgid "Select Buddy"
+msgstr "修改好友名稱"
+
+#. Add the label.
+#: plugins/gevolution/assoc-buddy.c:372
+msgid ""
+"Select a person from your address book to add this buddy to, or create a new "
+"person."
+msgstr ""
+
+# XXX 暫譯
+#. Add the disclosure
+#: plugins/gevolution/assoc-buddy.c:451
+#, fuzzy
+msgid "Show user details"
+msgstr "顯示傳輸細節"
+
+# XXX 暫譯
+#: plugins/gevolution/assoc-buddy.c:452
+#, fuzzy
+msgid "Hide user details"
+msgstr "隱藏傳輸細節"
+
+#. "Associate Buddy" button
+#: plugins/gevolution/assoc-buddy.c:505
+#, fuzzy
+msgid "_Associate Buddy"
+msgstr "為好友加上別名"
+
+#: plugins/gevolution/gevo-util.c:66 plugins/gevolution/gevolution.c:90
+#: src/blist.c:674 src/blist.c:861 src/blist.c:2094 src/gtkblist.c:3722
+#: src/protocols/jabber/roster.c:66 src/protocols/msn/notification.c:792
+msgid "Buddies"
+msgstr "好友"
+
+#: plugins/gevolution/gevolution.c:214
+msgid "Add to Address Book"
+msgstr ""
+
+#. Configuration frame
+#: plugins/gevolution/gevolution.c:347
+#, fuzzy
+msgid "Evolution Integration Configuration"
+msgstr "工作匣圖示設定"
+
+#. Label
+#: plugins/gevolution/gevolution.c:350
+msgid "Select all accounts that buddies should be auto-added to."
+msgstr ""
+
+#: plugins/gevolution/gevolution.c:380 src/gtkconn.c:620
+msgid "Account"
+msgstr "帳號"
+
+#. *< api_version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: plugins/gevolution/gevolution.c:461
+#, fuzzy
+msgid "Evolution Integration"
+msgstr "其他資訊"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: plugins/gevolution/gevolution.c:464 plugins/gevolution/gevolution.c:466
+msgid "Provides integration with Ximian Evolution."
+msgstr ""
+
+#: plugins/gevolution/new_person_dialog.c:270
+#, fuzzy
+msgid "Please enter the person's information below."
+msgstr "取得使用者資訊"
+
+#: plugins/gevolution/new_person_dialog.c:274
+msgid "Please enter the buddy's screen name and account type below."
+msgstr ""
+
+#: plugins/gevolution/new_person_dialog.c:294
+#, fuzzy
+msgid "Account type:"
+msgstr "帳號:"
+
+#: plugins/gevolution/new_person_dialog.c:298
+msgid "Screenname:"
+msgstr "帳號:"
+
+#. Optional Information section
+#: plugins/gevolution/new_person_dialog.c:318
+#, fuzzy
+msgid "Optional information:"
+msgstr "其他資訊"
+
+#. Label
+#: plugins/gevolution/new_person_dialog.c:341 src/gtkaccount.c:318
+#: src/protocols/oscar/oscar.c:3174
+msgid "Buddy Icon"
+msgstr "好友圖示"
+
+#: plugins/gevolution/new_person_dialog.c:353
+#, fuzzy
+msgid "First name:"
+msgstr "名"
+
+#: plugins/gevolution/new_person_dialog.c:365
+#, fuzzy
+msgid "Last name:"
+msgstr "姓"
+
+#: plugins/gevolution/new_person_dialog.c:385
+#, fuzzy
+msgid "E-mail:"
+msgstr "電子郵件"
+
 #: plugins/history.c:74
 msgid "History"
 msgstr "歷史記錄"
@@ -419,6 +597,7 @@
 #. *< name
 #. *< version
 #. *  summary
+#. *  description
 #: plugins/iconaway.c:83 plugins/iconaway.c:85
 msgid "Iconifies the buddy list and your conversations when you go away."
 msgstr "在您離開時,最小化好友清單及各交談視窗。"
@@ -597,6 +776,7 @@
 #. *< name
 #. *< version
 #. *  summary
+#. *  description
 #: plugins/notify.c:765 plugins/notify.c:767
 msgid "Provides a variety of ways of notifying you of unread messages."
 msgstr "提供多種方式來通知您有未讀取的訊息。"
@@ -608,13 +788,14 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/perl/perl.c:524
+#: plugins/perl/perl.c:530
 msgid "Perl Plugin Loader"
 msgstr "Perl 模組載入器"
 
 #. *< name
 #. *< version
-#: plugins/perl/perl.c:526 plugins/perl/perl.c:527
+#. *< summary
+#: plugins/perl/perl.c:532 plugins/perl/perl.c:533
 msgid "Provides support for loading perl plugins."
 msgstr "提供讀入 Perl 模組的支援。"
 
@@ -711,6 +892,7 @@
 #. *< name
 #. *< version
 #. *  summary
+#. *  description
 #: plugins/signals-test.c:468 plugins/signals-test.c:470
 msgid "Test to see that all signals are working properly."
 msgstr "檢查各種信號是否都能正常運作。"
@@ -729,6 +911,7 @@
 #. *< name
 #. *< version
 #. *  summary
+#. *  description
 #: plugins/simple.c:34 plugins/simple.c:36
 msgid "Tests to see that most things are working."
 msgstr "用來測試是否大部份的東西都能正常運作。"
@@ -772,14 +955,15 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/ssl/ssl-gnutls.c:218
+#: plugins/ssl/ssl-gnutls.c:223
 msgid "GNUTLS"
 msgstr "GNUTLS"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/ssl/ssl-gnutls.c:221 plugins/ssl/ssl-gnutls.c:223
+#. *  description
+#: plugins/ssl/ssl-gnutls.c:226 plugins/ssl/ssl-gnutls.c:228
 msgid "Provides SSL support through GNUTLS."
 msgstr "透過 GNUTLS 提供 SSL 的支援。"
 
@@ -790,14 +974,15 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/ssl/ssl-nss.c:306
+#: plugins/ssl/ssl-nss.c:312
 msgid "NSS"
 msgstr "NSS"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/ssl/ssl-nss.c:309 plugins/ssl/ssl-nss.c:311
+#. *  description
+#: plugins/ssl/ssl-nss.c:315 plugins/ssl/ssl-nss.c:317
 msgid "Provides SSL support through Mozilla NSS."
 msgstr "透過 Mozilla 的 NSS 提供 SSL 的支援。"
 
@@ -815,11 +1000,12 @@
 #. *< name
 #. *< version
 #. *  summary
+#. *  description
 #: plugins/ssl/ssl.c:94 plugins/ssl/ssl.c:96
 msgid "Provides a wrapper around SSL support libraries."
 msgstr "為支援 SSL 的函式庫提供一個 Wrapper。"
 
-#: plugins/statenotify.c:30 src/gtkpounce.c:799
+#: plugins/statenotify.c:30 src/gtkpounce.c:820
 #, c-format
 msgid "%s has gone away."
 msgstr "%s 已經離開。"
@@ -853,17 +1039,18 @@
 #. *< name
 #. *< version
 #. *  summary
+#. *  description
 #: plugins/statenotify.c:81 plugins/statenotify.c:84
 msgid ""
 "Notifies in a conversation window when a buddy goes or returns from away or "
 "idle."
 msgstr "在交談視窗中顯示好友離開或是由離開(閒置)返回的通知訊息。"
 
-#: plugins/tcl/tcl.c:348
+#: plugins/tcl/tcl.c:349
 msgid "Tcl Plugin Loader"
 msgstr "Tcl 模組載入器"
 
-#: plugins/tcl/tcl.c:350 plugins/tcl/tcl.c:351
+#: plugins/tcl/tcl.c:351 plugins/tcl/tcl.c:352
 msgid "Provides support for loading Tcl plugins"
 msgstr "提供讀入 Tcl 模組的支援"
 
@@ -874,14 +1061,15 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/ticker/ticker.c:74 plugins/ticker/ticker.c:330
+#: plugins/ticker/ticker.c:74 plugins/ticker/ticker.c:328
 msgid "Buddy Ticker"
 msgstr "好友跑馬燈"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/ticker/ticker.c:333 plugins/ticker/ticker.c:335
+#. *  description
+#: plugins/ticker/ticker.c:331 plugins/ticker/ticker.c:333
 msgid "A horizontal scrolling version of the buddy list."
 msgstr "好友清單的水平捲動版本"
 
@@ -911,6 +1099,7 @@
 #. *< name
 #. *< version
 #. *  summary
+#. *  description
 #: plugins/timestamp.c:176 plugins/timestamp.c:178
 msgid "Adds iChat-style timestamps to conversations every N minutes."
 msgstr "每隔 N 分鐘加入 iChat 風格的時間戳記到交談中。"
@@ -935,7 +1124,7 @@
 msgstr "在即時訊息視窗中顯示 Slider Bar(_S)"
 
 #. Buddy List trans options
-#: plugins/win32/transparency/win2ktrans.c:365 src/gtkprefs.c:837
+#: plugins/win32/transparency/win2ktrans.c:365 src/gtkprefs.c:854
 msgid "Buddy List Window"
 msgstr "好友清單視窗"
 
@@ -957,6 +1146,7 @@
 #. *< name
 #. *< version
 #. *  summary
+#. *  description
 #: plugins/win32/transparency/win2ktrans.c:425
 #: plugins/win32/transparency/win2ktrans.c:427
 msgid ""
@@ -982,8 +1172,8 @@
 msgstr "當 Windows 啟動時同時執行 Gaim(_S)"
 
 #. Buddy List
-#: plugins/win32/winprefs/winprefs.c:366 src/gtkblist.c:2386
-#: src/gtkprefs.c:2256
+#: plugins/win32/winprefs/winprefs.c:366 src/gtkblist.c:2920
+#: src/gtkprefs.c:2480
 msgid "Buddy List"
 msgstr "好友清單"
 
@@ -1002,8 +1192,8 @@
 msgstr "將好友清單視窗保持在桌面的最上層(_K)"
 
 #. Conversations
-#: plugins/win32/winprefs/winprefs.c:386 src/gtkprefs.c:875
-#: src/gtkprefs.c:2257
+#: plugins/win32/winprefs/winprefs.c:386 src/gtkprefs.c:892
+#: src/gtkprefs.c:2481 src/protocols/msn/msn.c:1697
 msgid "Conversations"
 msgstr "交談"
 
@@ -1019,16 +1209,16 @@
 msgid "Options specific to Windows Gaim."
 msgstr "Windows Gaim 的相關選項。"
 
-#: src/about.c:57
+#: src/about.c:59
 msgid "About Gaim"
 msgstr "關於 Gaim"
 
-#: src/about.c:72
+#: src/about.c:74
 #, c-format
 msgid "<span weight=\"bold\" size=\"larger\">Gaim v%s</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">Gaim v%s</span>"
 
-#: src/about.c:92
+#: src/about.c:94
 msgid ""
 "Gaim is a modular Instant Messaging client capable of using AIM, ICQ, "
 "Yahoo!, MSN, IRC, Jabber, Napster, Zephyr, and Gadu-Gadu all at once.  It is "
@@ -1039,321 +1229,316 @@
 "方式發佈。<BR><BR>"
 
 # NOTE  contains zh_TW-specific info here!!
-#: src/about.c:102
+#: src/about.c:104
 msgid "<FONT SIZE=\"3\">IRC:</FONT> #gaim on irc.freenode.net<BR><BR>"
 msgstr ""
 "<FONT SIZE=\"3\">IRC:</FONT> irc.freenode.net 上的 #gaim 頻道<BR><BR><FONT "
 "SIZE=\"3\">正體中文化資訊:</FONT> <A HREF=\"http://gaim.myweb.hinet.net/"
 "\">http://gaim.myweb.hinet.net/</A><BR><BR>"
 
-#: src/about.c:107
+#: src/about.c:109
 msgid "Active Developers"
 msgstr "現任開發者"
 
-#: src/about.c:108
+#: src/about.c:110
 msgid "maintainer"
 msgstr "維護者"
 
-#: src/about.c:110
+#: src/about.c:112
 msgid "lead developer"
 msgstr "主要開發者"
 
-#: src/about.c:113
+#: src/about.c:115
 msgid "developer & webmaster"
 msgstr "開發者兼網站管理員"
 
-#: src/about.c:114
+#: src/about.c:116
 msgid "win32 port"
 msgstr "Windows 版本移植"
 
-#: src/about.c:117 src/about.c:118 src/about.c:119
+#: src/about.c:119 src/about.c:120 src/about.c:121
 msgid "developer"
 msgstr "開發者"
 
-#: src/about.c:120
+#: src/about.c:122
 msgid "support"
 msgstr "支援"
 
 # NOTE LSchiere2: wing: it means they must be crazy or they wouldn't work on gaim ;-)
 # NOTE Luke Schierer 說:「這些人一個是瘋了,否則不會為 gaim 賣力」
 # NOTE 不過,翻成「狂熱的模組作者」會比較好
-#: src/about.c:127
+#: src/about.c:129
 msgid "Crazy Patch Writers"
 msgstr "狂熱的模組作者"
 
-#: src/about.c:141
+#: src/about.c:143
 msgid "Retired Developers"
 msgstr "前任開發者"
 
-#: src/about.c:142
+#: src/about.c:144
 msgid "former libfaim maintainer"
 msgstr "前 libfaim 維護者"
 
-#: src/about.c:143
+#: src/about.c:145
 msgid "former lead developer"
 msgstr "前主要開發者"
 
-#: src/about.c:146
+#: src/about.c:148
 msgid "former maintainer"
 msgstr "前維護者"
 
-#: src/about.c:147
+#: src/about.c:149
 msgid "former Jabber developer"
 msgstr "前 Jabber 開發者"
 
-#: src/about.c:148
+#: src/about.c:150
 msgid "original author"
 msgstr "原作者"
 
-#: src/about.c:151
+#: src/about.c:153
 msgid "hacker and designated driver [lazy bum]"
 msgstr "程式編寫者兼指定司機 [懶人]"
 
-#: src/about.c:159
+#: src/about.c:161
 msgid "Current Translators"
 msgstr "現任譯者"
 
 # NOTE 寫出來的是「文」,不是「語」;下同 :-)
-#: src/about.c:160 src/about.c:193
+#: src/about.c:162 src/about.c:195
 msgid "Catalan"
 msgstr "加泰隆文"
 
-#: src/about.c:161 src/about.c:194
+#: src/about.c:163 src/about.c:196
 msgid "Czech"
 msgstr "捷克文"
 
-#: src/about.c:162
+#: src/about.c:164
 msgid "Danish"
 msgstr "丹麥文"
 
-#: src/about.c:163
+#: src/about.c:165
 msgid "British English"
 msgstr "英式英文"
 
-#: src/about.c:164 src/about.c:195
+#: src/about.c:166 src/about.c:197
 msgid "German"
 msgstr "德文"
 
-#: src/about.c:165 src/about.c:196
+#: src/about.c:167 src/about.c:198
 msgid "Spanish"
 msgstr "西班牙文"
 
-#: src/about.c:166 src/about.c:197
+#: src/about.c:168 src/about.c:199
 msgid "Finnish"
 msgstr "芬蘭文"
 
-#: src/about.c:167 src/about.c:198
+#: src/about.c:169 src/about.c:200
 msgid "French"
 msgstr "法文"
 
-#: src/about.c:168
+#: src/about.c:170
 msgid "Hindi"
 msgstr "北印度文"
 
-#: src/about.c:169
+#: src/about.c:171
 msgid "Hungarian"
 msgstr "匈牙利文"
 
 # NOTE 香港譯「意大利文」,但這是 zh-TW :-)
-#: src/about.c:170 src/about.c:200
+#: src/about.c:172 src/about.c:202
 msgid "Italian"
 msgstr "義大利文"
 
-#: src/about.c:171 src/about.c:202
+#: src/about.c:173 src/about.c:204
 msgid "Korean"
 msgstr "韓文"
 
 # NOTE Flemish 譯法是跟了http://www.ee.tku.edu.tw/~rexchen/cdict/
 # XXX Dutch 和 Flemish 是同一種語言,是否應該只寫「荷蘭文」,刪去「法蘭德斯文」?
-#: src/about.c:172
+#: src/about.c:174
 msgid "Dutch; Flemish"
 msgstr "荷蘭文/法蘭德斯文"
 
-#: src/about.c:173
-msgid "Norwegian"
-msgstr "挪威文"
-
-#: src/about.c:174 src/about.c:203
-msgid "Polish"
-msgstr "波蘭文"
-
 #: src/about.c:175
+msgid "Norwegian"
+msgstr "挪威文"
+
+#: src/about.c:176 src/about.c:205
+msgid "Polish"
+msgstr "波蘭文"
+
+#: src/about.c:177
 msgid "Portuguese"
 msgstr "標準萄文"
 
-#: src/about.c:176
+#: src/about.c:178
 msgid "Portuguese-Brazil"
 msgstr "巴西萄文"
 
-#: src/about.c:177
+#: src/about.c:179
 msgid "Romanian"
 msgstr "羅馬尼亞文"
 
-#: src/about.c:178 src/about.c:204
+#: src/about.c:180 src/about.c:206
 msgid "Russian"
 msgstr "俄文"
 
-#: src/about.c:179
+#: src/about.c:181
 msgid "Serbian"
 msgstr "塞爾維亞文"
 
-#: src/about.c:180 src/about.c:206
+#: src/about.c:182 src/about.c:208
 msgid "Swedish"
 msgstr "瑞典文"
 
-#: src/about.c:181
+#: src/about.c:183
 msgid "Vietnamese"
 msgstr "越南文"
 
-#: src/about.c:181
+#: src/about.c:183
 msgid "Gnome Vi Team"
 msgstr "Gnome 越南文翻譯小組"
 
-#: src/about.c:182
+#: src/about.c:184
 msgid "Simplified Chinese"
 msgstr "簡體中文"
 
-#: src/about.c:183
+#: src/about.c:185
 msgid "Traditional Chinese"
 msgstr "正體中文"
 
-#: src/about.c:190
+#: src/about.c:192
 msgid "Past Translators"
 msgstr "前任譯者"
 
 # XXX Yahoo譯法
-#: src/about.c:191
+#: src/about.c:193
 msgid "Amharic"
 msgstr "阿姆哈拉文"
 
-#: src/about.c:192
+#: src/about.c:194
 msgid "Bulgarian"
 msgstr "保加利亞文"
 
-#: src/about.c:199
-msgid "Hebrew"
-msgstr "希伯來文"
-
 #: src/about.c:201
+msgid "Hebrew"
+msgstr "希伯來文"
+
+#: src/about.c:203
 msgid "Japanese"
 msgstr "日文"
 
-#: src/about.c:205
+#: src/about.c:207
 msgid "Slovak"
 msgstr "斯洛伐克文"
 
-#: src/about.c:207
+#: src/about.c:209
 msgid "Chinese"
 msgstr "中文"
 
-#: src/account.c:272 src/protocols/jabber/jabber.c:1017
+#: src/account.c:275 src/protocols/jabber/jabber.c:1001
 msgid "New passwords do not match."
 msgstr "新密碼並不相符。"
 
 # NOTE 譯文更動 by Ambrose
-#: src/account.c:280
+#: src/account.c:283
 msgid "Fill out all fields completely."
 msgstr "請填妥整份表格所有的欄位。"
 
-#: src/account.c:305
+#: src/account.c:308
 msgid "Original password"
 msgstr "舊密碼"
 
-#: src/account.c:311
+#: src/account.c:314
 msgid "New password"
 msgstr "新密碼"
 
-#: src/account.c:317
+#: src/account.c:320
 msgid "New password (again)"
 msgstr "新密碼(再次確認)"
 
-#: src/account.c:322
+#: src/account.c:325
 #, c-format
 msgid "Change password for %s"
 msgstr "修改 %s 的密碼"
 
-#: src/account.c:330
+#: src/account.c:333
 msgid "Please enter your current password and your new password."
 msgstr "請輸入您目前的密碼以及希望使用的新密碼。"
 
 #. *
 #. * A wrapper for gaim_request_action() that uses OK and Cancel buttons.
 #.
-#: src/account.c:333 src/connection.c:193 src/dialogs.c:1488
-#: src/dialogs.c:1505 src/dialogs.c:1524 src/gtkblist.c:1742
-#: src/gtkrequest.c:190 src/protocols/jabber/jabber.c:1062
-#: src/protocols/jabber/xdata.c:334 src/protocols/msn/msn.c:181
-#: src/protocols/msn/msn.c:192 src/protocols/msn/msn.c:203
-#: src/protocols/msn/msn.c:214 src/protocols/oscar/oscar.c:2453
-#: src/protocols/oscar/oscar.c:2533 src/protocols/oscar/oscar.c:6196
-#: src/protocols/oscar/oscar.c:6292 src/protocols/oscar/oscar.c:6341
-#: src/protocols/oscar/oscar.c:6423 src/protocols/yahoo/yahoo.c:2398
-#: src/protocols/yahoo/yahoo.c:2406 src/request.h:1018
+#: src/account.c:336 src/connection.c:198 src/dialogs.c:472 src/dialogs.c:528
+#: src/gtkblist.c:2278 src/gtkrequest.c:225 src/protocols/jabber/jabber.c:1046
+#: src/protocols/jabber/xdata.c:337 src/protocols/msn/msn.c:182
+#: src/protocols/msn/msn.c:193 src/protocols/msn/msn.c:204
+#: src/protocols/msn/msn.c:215 src/protocols/oscar/oscar.c:2549
+#: src/protocols/oscar/oscar.c:2630 src/protocols/oscar/oscar.c:6470
+#: src/protocols/oscar/oscar.c:6566 src/protocols/oscar/oscar.c:6615
+#: src/protocols/oscar/oscar.c:6697 src/protocols/yahoo/yahoo.c:2500
+#: src/protocols/yahoo/yahoo.c:2508 src/request.h:1237
 msgid "OK"
 msgstr "確定"
 
-#: src/account.c:334 src/account.c:368 src/connection.c:194 src/dialogs.c:351
-#: src/dialogs.c:363 src/dialogs.c:376 src/dialogs.c:397 src/dialogs.c:1322
-#: src/dialogs.c:1489 src/dialogs.c:1506 src/dialogs.c:1525
-#: src/gtkaccount.c:1612 src/gtkaccount.c:2081 src/gtkblist.c:1743
-#: src/gtkblist.c:3701 src/gtkconn.c:167 src/gtkprivacy.c:569
-#: src/gtkprivacy.c:582 src/gtkprivacy.c:607 src/gtkprivacy.c:618
-#: src/gtkrequest.c:191 src/protocols/icq/gaim_icq.c:277
-#: src/protocols/jabber/buddy.c:512 src/protocols/jabber/jabber.c:687
-#: src/protocols/jabber/jabber.c:1063 src/protocols/jabber/xdata.c:335
-#: src/protocols/msn/msn.c:182 src/protocols/msn/msn.c:193
-#: src/protocols/msn/msn.c:204 src/protocols/msn/msn.c:215
-#: src/protocols/msn/msn.c:228 src/protocols/oscar/oscar.c:2417
-#: src/protocols/oscar/oscar.c:2454 src/protocols/oscar/oscar.c:2489
-#: src/protocols/oscar/oscar.c:2534 src/protocols/oscar/oscar.c:6024
-#: src/protocols/oscar/oscar.c:6197 src/protocols/oscar/oscar.c:6293
-#: src/protocols/oscar/oscar.c:6342 src/protocols/oscar/oscar.c:6407
-#: src/protocols/oscar/oscar.c:6424 src/protocols/trepia/trepia.c:347
-#: src/protocols/yahoo/yahoo.c:2399 src/protocols/yahoo/yahoo.c:2407
-#: src/request.h:1018 src/request.h:1028
+#: src/account.c:337 src/account.c:371 src/connection.c:199 src/dialogs.c:306
+#: src/dialogs.c:318 src/dialogs.c:331 src/dialogs.c:352 src/dialogs.c:473
+#: src/dialogs.c:529 src/dialogs.c:837 src/dialogs.c:858 src/dialogs.c:875
+#: src/dialogs.c:894 src/gtkaccount.c:1673 src/gtkaccount.c:2164
+#: src/gtkblist.c:2279 src/gtkblist.c:4264 src/gtkconn.c:168
+#: src/gtkimhtmltoolbar.c:366 src/gtkprivacy.c:561 src/gtkprivacy.c:574
+#: src/gtkprivacy.c:599 src/gtkprivacy.c:610 src/gtkrequest.c:226
+#: src/protocols/icq/gaim_icq.c:277 src/protocols/jabber/buddy.c:514
+#: src/protocols/jabber/chat.c:691 src/protocols/jabber/jabber.c:659
+#: src/protocols/jabber/jabber.c:1047 src/protocols/jabber/xdata.c:338
+#: src/protocols/msn/msn.c:183 src/protocols/msn/msn.c:194
+#: src/protocols/msn/msn.c:205 src/protocols/msn/msn.c:216
+#: src/protocols/msn/msn.c:229 src/protocols/oscar/oscar.c:2513
+#: src/protocols/oscar/oscar.c:2550 src/protocols/oscar/oscar.c:2586
+#: src/protocols/oscar/oscar.c:2631 src/protocols/oscar/oscar.c:6289
+#: src/protocols/oscar/oscar.c:6471 src/protocols/oscar/oscar.c:6567
+#: src/protocols/oscar/oscar.c:6616 src/protocols/oscar/oscar.c:6681
+#: src/protocols/oscar/oscar.c:6698 src/protocols/trepia/trepia.c:347
+#: src/protocols/yahoo/yahoo.c:2501 src/protocols/yahoo/yahoo.c:2509
+#: src/request.h:1237 src/request.h:1247
 msgid "Cancel"
 msgstr "取消"
 
-#: src/account.c:360
+#: src/account.c:363
 #, c-format
 msgid "Change user information for %s"
 msgstr "更改 %s 的個人資訊"
 
-#: src/account.c:367 src/dialogs.c:1310 src/gtkrequest.c:197
-#: src/protocols/jabber/buddy.c:511 src/protocols/trepia/trepia.c:346
+#: src/account.c:370 src/dialogs.c:825 src/gtkrequest.c:232
+#: src/protocols/jabber/buddy.c:513 src/protocols/trepia/trepia.c:346
 msgid "Save"
 msgstr "儲存"
 
-#: src/away.c:208
+#: src/away.c:210
 msgid "Away!"
 msgstr "離開!"
 
-#: src/away.c:269
+#: src/away.c:275
 msgid "I'm Back!"
 msgstr "我回來了!"
 
-#: src/away.c:368
+#: src/away.c:375
 msgid "New Away Message"
 msgstr "新的離開訊息"
 
-#: src/away.c:388
+#: src/away.c:395
 msgid "Remove Away Message"
 msgstr "移除離開訊息"
 
-#: src/away.c:583
+#: src/away.c:590
 msgid "Set All Away"
 msgstr "全部設為離開"
 
-#: src/blist.c:576 src/gtkprefs.c:2259
+#: src/blist.c:579 src/gtkprefs.c:2483
 msgid "Chats"
 msgstr "聊天"
 
-#: src/blist.c:671 src/blist.c:858 src/blist.c:2077 src/gtkblist.c:3168
-#: src/protocols/jabber/roster.c:66 src/protocols/msn/notification.c:1168
-msgid "Buddies"
-msgstr "好友"
-
-#: src/blist.c:1158
+#: src/blist.c:1181
 #, c-format
 msgid ""
 "%d buddy from group %s was not removed because its account was not logged "
@@ -1368,78 +1553,51 @@
 "%d 個在 %s 群組的好友並沒有被移除,因為他們所對應的帳號並沒有登入。這些好友及"
 "群組沒有被移除。\n"
 
-#: src/blist.c:1167
+#: src/blist.c:1190
 msgid "Group not removed"
 msgstr "群組未被移除"
 
-#: src/blist.c:1217 src/gtkaccount.c:158 src/gtkutils.c:850
-#: src/protocols/jabber/auth.c:135 src/protocols/jabber/buddy.c:568
+#: src/blist.c:1240 src/gtkaccount.c:162 src/gtkft.c:153 src/gtkutils.c:860
+#: src/protocols/jabber/buddy.c:569
 msgid "Unknown"
 msgstr "未知"
 
-#: src/blist.c:1544
+#: src/blist.c:1567
 msgid "Invalid Groupname"
 msgstr "無效的群組名稱"
 
-#: src/blist.c:2194
+#: src/blist.c:2209
 msgid ""
 "An error was encountered parsing your buddy list.  It has not been loaded."
 msgstr "在解析您的好友清單時發生錯誤。好友清單沒有被讀入。"
 
-#: src/blist.c:2196
+#: src/blist.c:2211
 msgid "Buddy List Error"
 msgstr "好友清單錯誤"
 
-#: src/buddy_chat.c:212 src/gtkblist.c:3591
-msgid ""
-"You are not currently signed on with any protocols that have the ability to "
-"chat."
-msgstr "您並未登入任何一個可供您加入聊天室的通訊協定。"
-
-# TODO 看起來應該為加一個新的聊天室,並把聊天室歸類到某個群組。
-# NOTE 譯文更動 by Paladin
-#: src/buddy_chat.c:223
-msgid "Join a Chat"
-msgstr "加入聊天室"
-
-#: src/buddy_chat.c:225 src/gtkblist.c:926
-msgid "_Join"
-msgstr "加入(_J)"
-
-#: src/buddy_chat.c:242
-msgid ""
-"Please enter the appropriate information about the chat you would like to "
-"join.\n"
-msgstr "請輸入關於您所想加入好友清單的聊天室的適當資訊。\n"
-
-#: src/buddy_chat.c:253 src/dialogs.c:587 src/dialogs.c:662
-#: src/gtkpounce.c:358
-msgid "_Account:"
-msgstr "帳號(_A):"
-
-#: src/connection.c:117 src/connection.c:165
+#: src/connection.c:119 src/connection.c:170
 #, c-format
 msgid "Missing protocol plugin for %s"
 msgstr "找不到 %s 的協定模組"
 
-#: src/connection.c:122
+#: src/connection.c:124
 msgid "Registration Error"
 msgstr "註冊錯誤"
 
-#: src/connection.c:170
+#: src/connection.c:175
 msgid "Connection Error"
 msgstr "連線錯誤"
 
-#: src/connection.c:191
+#: src/connection.c:196
 #, c-format
 msgid "Enter password for %s"
 msgstr "輸入 %s 的密碼"
 
-#: src/conversation.c:297
+#: src/conversation.c:296
 msgid "Unable to send message. The message is too large."
 msgstr "無法送出訊息。這個訊息太大了。"
 
-#: src/conversation.c:305
+#: src/conversation.c:304
 msgid "Unable to send message."
 msgstr "無法送出訊息。"
 
@@ -1448,7 +1606,7 @@
 # #, c-format
 # msgid "%d %s in room"
 # msgstr "聊天室有 %d 家伙"
-#: src/conversation.c:1898
+#: src/conversation.c:1968
 #, c-format
 msgid "%s entered the room."
 msgstr "%s 進入聊天室。"
@@ -1458,61 +1616,62 @@
 # #, c-format
 # msgid "%d %s in room"
 # msgstr "聊天室有 %d 家伙"
-#: src/conversation.c:1901
+#: src/conversation.c:1971
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>] 進入聊天室。"
 
-#: src/conversation.c:1986
+#: src/conversation.c:2063
+#, fuzzy, c-format
+msgid "You are now known as %s"
+msgstr "%s 改變暱稱為 %s"
+
+#: src/conversation.c:2066
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s 改變暱稱為 %s"
 
-#: src/conversation.c:2028
+#: src/conversation.c:2109
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s 離開聊天室 (%s)。"
 
-#: src/conversation.c:2030
+#: src/conversation.c:2111
 #, c-format
 msgid "%s left the room."
 msgstr "%s 離開聊天室。"
 
-#: src/conversation.c:2103
+#: src/conversation.c:2184
 #, c-format
 msgid "(+%d more)"
 msgstr "(以及另外 %d 個)"
 
-#: src/conversation.c:2105
+#: src/conversation.c:2186
 #, c-format
 msgid " left the room (%s)."
 msgstr " 離開聊天室 (%s)。"
 
-#: src/conversation.c:2387
+#: src/conversation.c:2466
 msgid "Last created window"
 msgstr "上一個開啟的視窗"
 
-#: src/conversation.c:2389
+#: src/conversation.c:2468 src/gtkprefs.c:1380
 msgid "New window"
 msgstr "新視窗"
 
-#: src/conversation.c:2391
+#: src/conversation.c:2470
 msgid "By group"
 msgstr "依群組"
 
-#: src/conversation.c:2393
+#: src/conversation.c:2472
 msgid "By account"
 msgstr "依帳號"
 
-#: src/dialogs.c:200
+#: src/dialogs.c:155
 msgid "Warn User"
 msgstr "警告使用者"
 
-#: src/dialogs.c:203
-msgid "_Warn"
-msgstr "警告(_W)"
-
-#: src/dialogs.c:219
+#: src/dialogs.c:174
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Warn %s?</span>\n"
@@ -1524,37 +1683,37 @@
 "\n"
 "這個動作將會增加 %s 的警告等級,同時他 / 她將被限制以更嚴格的速率限制。\n"
 
-#: src/dialogs.c:228
+#: src/dialogs.c:183
 msgid "Warn _anonymously?"
 msgstr "以匿名的身份發出警告?(_A)"
 
-#: src/dialogs.c:235
+#: src/dialogs.c:190
 msgid "<b>Anonymous warnings are less severe.</b>"
 msgstr "<b>匿名的警告比較上沒有那麼嚴重。</b>"
 
-#: src/dialogs.c:347
+#: src/dialogs.c:302
 #, c-format
 msgid ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr "您正試著將 %s  從您的好友清單中移除。您要繼續這個動作嗎?"
 
 # XXX「Remove Buddy」和「Remove Contact」在中文版Gaim無法析別;可能有改進的空間
-#: src/dialogs.c:349 src/dialogs.c:350
+#: src/dialogs.c:304 src/dialogs.c:305
 msgid "Remove Buddy"
 msgstr "移除好友"
 
-#: src/dialogs.c:359
+#: src/dialogs.c:314
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
 "continue?"
 msgstr "您正試著將 %s 從您的好友清單中移除。您要繼續這個動作嗎?"
 
-#: src/dialogs.c:361 src/dialogs.c:362
+#: src/dialogs.c:316 src/dialogs.c:317
 msgid "Remove Chat"
 msgstr "移除聊天室"
 
-#: src/dialogs.c:371
+#: src/dialogs.c:326
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
@@ -1562,11 +1721,11 @@
 msgstr ""
 "您正試著將群組 %s 及相關的成員從您的好友清單中移除。您要繼續這個動作嗎?"
 
-#: src/dialogs.c:374 src/dialogs.c:375
+#: src/dialogs.c:329 src/dialogs.c:330
 msgid "Remove Group"
 msgstr "移除群組"
 
-#: src/dialogs.c:392
+#: src/dialogs.c:347
 #, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddies from "
@@ -1576,124 +1735,108 @@
 "作嗎?"
 
 # XXX「Remove Buddy」和「Remove Contact」在中文版Gaim無法析別;可能有改進的空間
-#: src/dialogs.c:395 src/dialogs.c:396
+#: src/dialogs.c:350 src/dialogs.c:351
 msgid "Remove Contact"
 msgstr "移除好友"
 
-#: src/dialogs.c:541
+#: src/dialogs.c:454 src/dialogs.c:510
+#, fuzzy
+msgid "_Screen name"
+msgstr "帳號(_S)"
+
+#: src/dialogs.c:460 src/dialogs.c:516
+#, fuzzy
+msgid "_Account"
+msgstr "帳號(_A):"
+
+#: src/dialogs.c:467
 msgid "New Instant Message"
 msgstr "新即時訊息"
 
-#: src/dialogs.c:559
-msgid "Please enter the screenname of the person you would like to IM.\n"
+#: src/dialogs.c:469
+#, fuzzy
+msgid "Please enter the screen name of the person you would like to IM."
 msgstr "請輸入您所想要發送即時訊息對象的帳號。\n"
 
-#: src/dialogs.c:571 src/dialogs.c:646
-msgid "_Screenname:"
-msgstr "帳號(_S):"
-
-#: src/dialogs.c:616
+#: src/dialogs.c:523
 msgid "Get User Info"
 msgstr "取得使用者資訊"
 
-#: src/dialogs.c:634
-msgid ""
-"Please enter the screenname of the person whose info you would like to "
-"view.\n"
+#: src/dialogs.c:525
+#, fuzzy
+msgid ""
+"Please enter the screen name of the person whose info you would like to view."
 msgstr "請輸入您所想要查詢對象的帳號。\n"
 
-#: src/dialogs.c:740
-msgid "Insert Link"
-msgstr "加入連結"
-
-#: src/dialogs.c:742
-msgid "_Insert"
-msgstr "插入(_I)"
-
-#: src/dialogs.c:767
-msgid ""
-"Please enter the URL and description of the link that you want to insert.  "
-"The description is optional.\n"
-msgstr "請輸入您所要插入的 URL 及它的描述,描述是選擇性的,可不用輸入。\n"
-
-#: src/dialogs.c:780
-msgid "_URL:"
-msgstr "_URL:"
-
-#: src/dialogs.c:793
-msgid "_Description:"
-msgstr "描述(_D):"
-
-#: src/dialogs.c:924 src/dialogs.c:941
+#: src/dialogs.c:553 src/gtkimhtmltoolbar.c:209
 msgid "Select Text Color"
 msgstr "設定文字顏色"
 
-#: src/dialogs.c:976 src/dialogs.c:993
+#: src/dialogs.c:581 src/gtkimhtmltoolbar.c:279
 msgid "Select Background Color"
 msgstr "設定背景顏色"
 
-#: src/dialogs.c:1078 src/dialogs.c:1104
+#: src/dialogs.c:620 src/gtkimhtmltoolbar.c:133
 msgid "Select Font"
 msgstr "選擇字型"
 
-#: src/dialogs.c:1168
+#: src/dialogs.c:682
 msgid "You cannot save an away message with a blank title"
 msgstr "您不能儲存一個沒有原因的離開訊息"
 
-#: src/dialogs.c:1170
+#: src/dialogs.c:684
 msgid ""
 "Please give the message a title, or choose \"Use\" to use without saving."
 msgstr "請給予訊息一個標題;或按「使用」來使用,同時不儲存它。"
 
-#: src/dialogs.c:1180
+#: src/dialogs.c:694
 msgid "You cannot create an empty away message"
 msgstr "您無法建立一個空白的離開訊息"
 
-#: src/dialogs.c:1242
+#: src/dialogs.c:756
 msgid "New away message"
 msgstr "新的離開訊息"
 
-#: src/dialogs.c:1263
+#: src/dialogs.c:777
 msgid "Away title: "
 msgstr "離開原因:"
 
-#: src/dialogs.c:1314
+#: src/dialogs.c:829
 msgid "Save & Use"
 msgstr "儲存並使用"
 
-#: src/dialogs.c:1318
+#: src/dialogs.c:833
 msgid "Use"
 msgstr "使用"
 
-#. show everything
-#: src/dialogs.c:1467
-msgid "Smile!"
-msgstr "笑一個!"
-
-#: src/dialogs.c:1485
+#: src/dialogs.c:854
 msgid "Alias Chat"
 msgstr "給聊天室改別名"
 
-#: src/dialogs.c:1486
+#: src/dialogs.c:855
 msgid "Enter an alias for this chat."
 msgstr "請為這個聊天室輸入一個別名。"
 
+#: src/dialogs.c:857 src/dialogs.c:874 src/dialogs.c:893 src/gtkrequest.c:233
+msgid "Alias"
+msgstr "別名"
+
 # XXX 中文譯文無法分別出「Alias Buddy」和「Alias Contact」
-#: src/dialogs.c:1502
+#: src/dialogs.c:871
 msgid "Alias Contact"
 msgstr "給好友改別名"
 
 # XXX 中文譯文無法分別出「Alias Buddy」和「Alias Contact」
-#: src/dialogs.c:1503
+#: src/dialogs.c:872
 msgid "Enter an alias for this contact."
 msgstr "請為這個好友輸入一個別名。"
 
-#: src/dialogs.c:1520
+#: src/dialogs.c:889
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "請為 %s 輸入一個別名"
 
-#: src/dialogs.c:1522
+#: src/dialogs.c:891
 msgid "Alias Buddy"
 msgstr "為好友加上別名"
 
@@ -1707,12 +1850,12 @@
 msgid "%s was not found.\n"
 msgstr "%s 找不到。\n"
 
-#: src/ft.c:754
+#: src/ft.c:769
 #, c-format
 msgid "File transfer to %s aborted.\n"
 msgstr "傳送檔案到 %s 被取消。\n"
 
-#: src/ft.c:756
+#: src/ft.c:771
 #, c-format
 msgid "File transfer from %s aborted.\n"
 msgstr "由 %s 傳送檔案被取消。\n"
@@ -1751,16 +1894,17 @@
 msgstr "Gaim 並未執行(在工作階段 0)\n"
 
 #: src/gaim-remote.c:204
+#, fuzzy
 msgid ""
 "\n"
 "Using AIM: URIs:\n"
-"Sending an IM to a screenname:\n"
+"Sending an IM to a screen name:\n"
 "\tgaim-remote uri 'aim:goim?screenname=Penguin&message=hello+world'\n"
-"In this case, 'Penguin' is the screenname we wish to IM, and 'hello world'\n"
+"In this case, 'Penguin' is the screen name we wish to IM, and 'hello world'\n"
 "is the message to be sent.  '+' must be used in place of spaces.\n"
 "Please note the quoting used above - if you run this from a shell the '&'\n"
 "needs to be escaped, or the command will stop at that point.\n"
-"Also,the following will just open a conversation window to a screenname,\n"
+"Also,the following will just open a conversation window to a screen name,\n"
 "with no message:\n"
 "\tgaim-remote uri 'aim:goim?screenname=Penguin'\n"
 "\n"
@@ -1800,32 +1944,32 @@
 "關閉正在執行的 Gaim\n"
 
 #. for people like myself, who are too lazy to add an away msg :)
-#: src/gaimrc.c:44
+#: src/gaimrc.c:46
 msgid "sorry, i ran out for a while. bbl"
 msgstr "不好意思,我離開一下下。"
 
-#: src/gaimrc.c:373 src/gaimrc.c:1450
+#: src/gaimrc.c:375 src/gaimrc.c:1451
 msgid "boring default"
 msgstr "無聊(預設)"
 
-#: src/gaimrc.c:1259 src/gtkblist.c:2348
+#: src/gaimrc.c:1260 src/gtkblist.c:2881
 msgid "Alphabetical"
 msgstr "依照字母"
 
-#: src/gaimrc.c:1261 src/gtkblist.c:2349
+#: src/gaimrc.c:1262 src/gtkblist.c:2882
 msgid "By status"
 msgstr "依照狀態"
 
-#: src/gaimrc.c:1263 src/gtkblist.c:2350
+#: src/gaimrc.c:1264 src/gtkblist.c:2883
 msgid "By log size"
 msgstr "依照日誌大小"
 
-#: src/gaimrc.c:1548
+#: src/gaimrc.c:1549
 #, c-format
 msgid "Could not open config file %s."
 msgstr "無法開啟設定檔 %s。"
 
-#: src/gtkaccount.c:285
+#: src/gtkaccount.c:287
 #, c-format
 msgid ""
 "<b>File:</b> %s\n"
@@ -1836,178 +1980,174 @@
 "<b>檔案大小:</b> %s\n"
 "<b>圖像尺寸:</b> %d×%d"
 
-#: src/gtkaccount.c:316 src/protocols/oscar/oscar.c:3077
-msgid "Buddy Icon"
-msgstr "好友圖示"
-
 #. Build the login options frame.
-#: src/gtkaccount.c:367
+#: src/gtkaccount.c:382
 msgid "Login Options"
 msgstr "登入選項"
 
-#: src/gtkaccount.c:384
+#: src/gtkaccount.c:399
 msgid "Protocol:"
 msgstr "通訊協定:"
 
-#: src/gtkaccount.c:389
-msgid "Screenname:"
+#: src/gtkaccount.c:404 src/gtkblist.c:3869
+msgid "Screen Name:"
 msgstr "帳號:"
 
-#: src/gtkaccount.c:462 src/main.c:308
+#: src/gtkaccount.c:477
 msgid "Password:"
 msgstr "密碼:"
 
-#: src/gtkaccount.c:467 src/gtkblist.c:3328 src/gtkblist.c:3650
+#: src/gtkaccount.c:482 src/gtkblist.c:3883 src/gtkblist.c:4211
 msgid "Alias:"
 msgstr "別名:"
 
-#: src/gtkaccount.c:471
+#: src/gtkaccount.c:486
 msgid "Remember password"
 msgstr "記住密碼"
 
 #. Build the user options frame.
-#: src/gtkaccount.c:525
+#: src/gtkaccount.c:540
 msgid "User Options"
 msgstr "使用者自定選項"
 
-#: src/gtkaccount.c:538
+#: src/gtkaccount.c:553
 msgid "New mail notifications"
 msgstr "新郵件通知"
 
-#: src/gtkaccount.c:547
+#: src/gtkaccount.c:562
 msgid "Buddy icon file:"
 msgstr "好友圖示檔案:"
 
-#: src/gtkaccount.c:556
+#: src/gtkaccount.c:572
 msgid "_Browse"
 msgstr "瀏覽(_B)"
 
-#: src/gtkaccount.c:562
+#: src/gtkaccount.c:578
 msgid "_Reset"
 msgstr "重置(_R)"
 
 #. Build the protocol options frame.
-#: src/gtkaccount.c:624
+#: src/gtkaccount.c:640
 #, c-format
 msgid "%s Options"
 msgstr "%s 選項"
 
 #. Use Global Proxy Settings
-#: src/gtkaccount.c:739
+#: src/gtkaccount.c:772
 msgid "Use Global Proxy Settings"
 msgstr "使用全域的代理伺服器設定"
 
 # NOTE 可以有代理伺服器但毋須用
 # NOTE 香港普遍用「毋須」,但講國語「毋須」會不通順,「不使用」較好
 #. No Proxy
-#: src/gtkaccount.c:746
+#: src/gtkaccount.c:779
 msgid "No Proxy"
 msgstr "不使用代理伺服器"
 
 #. HTTP
-#: src/gtkaccount.c:753
+#: src/gtkaccount.c:786
 msgid "HTTP"
 msgstr "HTTP"
 
 #. SOCKS 4
-#: src/gtkaccount.c:760
+#: src/gtkaccount.c:793
 msgid "SOCKS 4"
 msgstr "SOCKS 4"
 
 #. SOCKS 5
-#: src/gtkaccount.c:767
+#: src/gtkaccount.c:800
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
 #. Use Environmental Settings
-#: src/gtkaccount.c:774 src/gtkprefs.c:1091
+#: src/gtkaccount.c:807 src/gtkprefs.c:1181
 msgid "Use Environmental Settings"
 msgstr "使用環境變數設定"
 
-#: src/gtkaccount.c:807
+#: src/gtkaccount.c:840
 msgid "you can see the butterflies mating"
 msgstr "鴛鴦蝴蝶也看得見耶"
 
-#: src/gtkaccount.c:811
+#: src/gtkaccount.c:844
 msgid "If you look real closely"
 msgstr "如果您看得夠仔細"
 
-#: src/gtkaccount.c:827
+#: src/gtkaccount.c:860
 msgid "Proxy Options"
 msgstr "代理伺服器選項"
 
-#: src/gtkaccount.c:843 src/gtkprefs.c:1085
+#: src/gtkaccount.c:876 src/gtkprefs.c:1175
 msgid "Proxy _type:"
 msgstr "代理伺服器型態(_T):"
 
-#: src/gtkaccount.c:852 src/gtkprefs.c:1115
+#: src/gtkaccount.c:885 src/gtkprefs.c:1205
 msgid "_Host:"
 msgstr "主機位址(_H):"
 
-#: src/gtkaccount.c:856 src/gtkprefs.c:1132
+#: src/gtkaccount.c:889 src/gtkprefs.c:1223
 msgid "_Port:"
 msgstr "通訊埠(_P):"
 
-#: src/gtkaccount.c:864
+#: src/gtkaccount.c:897
 msgid "_Username:"
 msgstr "使用者(_U):"
 
-#: src/gtkaccount.c:869 src/gtkprefs.c:1167
+#: src/gtkaccount.c:902 src/gtkprefs.c:1260
 msgid "Pa_ssword:"
 msgstr "密碼(_S):"
 
-#: src/gtkaccount.c:1208
+#: src/gtkaccount.c:1260
 msgid "Add Account"
 msgstr "新增帳號"
 
-#: src/gtkaccount.c:1210
+#: src/gtkaccount.c:1262
 msgid "Modify Account"
 msgstr "修改帳號"
 
 #. Add the disclosure
-#: src/gtkaccount.c:1234
+#: src/gtkaccount.c:1286
 msgid "Show more options"
 msgstr "顯示較多的選項"
 
-#: src/gtkaccount.c:1235
+#: src/gtkaccount.c:1287
 msgid "Show fewer options"
 msgstr "顯示較少的選項"
 
 #. Register button
-#: src/gtkaccount.c:1262 src/protocols/jabber/jabber.c:686
+#: src/gtkaccount.c:1314 src/protocols/jabber/jabber.c:658
 msgid "Register"
 msgstr "註冊"
 
-#: src/gtkaccount.c:1607
+#: src/gtkaccount.c:1668
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "您確定要刪除 %s?"
 
-#: src/gtkaccount.c:1611 src/gtkrequest.c:194
+#: src/gtkaccount.c:1672 src/gtkrequest.c:229
 msgid "Delete"
 msgstr "刪除"
 
-#: src/gtkaccount.c:1725
+#: src/gtkaccount.c:1786
 msgid "Screen Name"
 msgstr "帳號"
 
-#: src/gtkaccount.c:1748 src/protocols/jabber/jabber.c:963
-#: src/protocols/oscar/oscar.c:2848 src/protocols/oscar/oscar.c:4594
-#: src/protocols/oscar/oscar.c:6145 src/protocols/yahoo/yahoo.c:2193
-#: src/protocols/zephyr/zephyr.c:886 src/protocols/zephyr/zephyr.c:896
+#: src/gtkaccount.c:1809 src/protocols/jabber/jabber.c:958
+#: src/protocols/oscar/oscar.c:2945 src/protocols/oscar/oscar.c:4746
+#: src/protocols/oscar/oscar.c:6409 src/protocols/yahoo/yahoo.c:2295
+#: src/protocols/zephyr/zephyr.c:1176 src/protocols/zephyr/zephyr.c:1186
 msgid "Online"
 msgstr "上線"
 
-#: src/gtkaccount.c:1766
+#: src/gtkaccount.c:1827
 msgid "Protocol"
 msgstr "通訊協定"
 
-#: src/gtkaccount.c:2056
+#: src/gtkaccount.c:2139
 #, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s%s"
 msgstr "%s%s%s%s 加入了 %s 為他 / 她的好友 %s%s%s"
 
-#: src/gtkaccount.c:2070
+#: src/gtkaccount.c:2153
 msgid ""
 "\n"
 "\n"
@@ -2017,191 +2157,228 @@
 "\n"
 "您想將他(她)加入到您的好友名單中嗎?"
 
-#: src/gtkaccount.c:2074
+#: src/gtkaccount.c:2157
 msgid "Information"
 msgstr "資訊"
 
-#: src/gtkaccount.c:2078
+#: src/gtkaccount.c:2161
 msgid "Add buddy to your list?"
 msgstr "將使用者加入您的好友清單?"
 
 #. Add button
-#: src/gtkaccount.c:2080 src/gtkblist.c:3700 src/gtkconv.c:1256
-#: src/gtkconv.c:3232 src/gtkconv.c:3323 src/gtkrequest.c:195
-#: src/protocols/icq/gaim_icq.c:277 src/protocols/oscar/oscar.c:2690
+#: src/gtkaccount.c:2163 src/gtkblist.c:4263 src/gtkconv.c:1072
+#: src/gtkconv.c:3289 src/gtkconv.c:3380 src/gtkrequest.c:230
+#: src/protocols/icq/gaim_icq.c:277 src/protocols/oscar/oscar.c:2787
 msgid "Add"
 msgstr "加入"
 
-#: src/gtkblist.c:815
-msgid "_Get Info"
-msgstr "取得資訊(_G)"
-
-#: src/gtkblist.c:818
-msgid "_IM"
-msgstr "即時訊息(_I)"
-
-#: src/gtkblist.c:820
+#: src/gtkblist.c:803 src/gtkblist.c:4151
+msgid ""
+"You are not currently signed on with any protocols that have the ability to "
+"chat."
+msgstr "您並未登入任何一個可供您加入聊天室的通訊協定。"
+
+# TODO 看起來應該為加一個新的聊天室,並把聊天室歸類到某個群組。
+# NOTE 譯文更動 by Paladin
+#: src/gtkblist.c:816
+msgid "Join a Chat"
+msgstr "加入聊天室"
+
+#: src/gtkblist.c:837
+msgid ""
+"Please enter the appropriate information about the chat you would like to "
+"join.\n"
+msgstr "請輸入關於您所想加入好友清單的聊天室的適當資訊。\n"
+
+#: src/gtkblist.c:850 src/gtkpounce.c:361 src/gtkroomlist.c:365
+msgid "_Account:"
+msgstr "帳號(_A):"
+
+#: src/gtkblist.c:1088 src/gtkblist.c:3070
+#, fuzzy
+msgid "Get _Info"
+msgstr "取得資訊"
+
+#: src/gtkblist.c:1091 src/gtkblist.c:3061
+#, fuzzy
+msgid "I_M"
+msgstr "即時訊息"
+
+#: src/gtkblist.c:1093
 msgid "Add Buddy _Pounce"
 msgstr "加入好友狀態捕捉(_P)"
 
-#: src/gtkblist.c:822
+#: src/gtkblist.c:1095
 msgid "View _Log"
 msgstr "觀看日誌(_L)"
 
-#: src/gtkblist.c:842 src/gtkblist.c:931 src/gtkblist.c:950
+#: src/gtkblist.c:1115 src/gtkblist.c:1187 src/gtkblist.c:1200
 msgid "_Alias..."
 msgstr "別名(_A)..."
 
-#: src/gtkblist.c:844 src/gtkblist.c:933 src/gtkblist.c:955 src/gtkconn.c:358
+#: src/gtkblist.c:1117 src/gtkblist.c:1189 src/gtkblist.c:1205
+#: src/gtkconn.c:361
 msgid "_Remove"
 msgstr "移除(_R)"
 
-#: src/gtkblist.c:907
+#: src/gtkblist.c:1162
 msgid "Add a _Buddy"
 msgstr "新增一個好友(_B)"
 
-#: src/gtkblist.c:909
+#: src/gtkblist.c:1164
 msgid "Add a C_hat"
 msgstr "新增一個聊天室(_H)"
 
-#: src/gtkblist.c:911
+#: src/gtkblist.c:1166
 msgid "_Delete Group"
 msgstr "刪除群組(_D)"
 
-#: src/gtkblist.c:913
+#: src/gtkblist.c:1168
 msgid "_Rename"
 msgstr "重命名(_R)"
 
-#: src/gtkblist.c:928
+#. join button
+#: src/gtkblist.c:1182 src/gtkroomlist.c:261 src/gtkroomlist.c:417
+#: src/stock.c:87
+msgid "_Join"
+msgstr "加入(_J)"
+
+#: src/gtkblist.c:1184
 msgid "Auto-Join"
 msgstr "自動加入"
 
-#: src/gtkblist.c:952 src/gtkblist.c:987
+#: src/gtkblist.c:1202 src/gtkblist.c:1228
 msgid "_Collapse"
 msgstr "收起(_C)"
 
-#: src/gtkblist.c:992
+#: src/gtkblist.c:1233
 msgid "_Expand"
 msgstr "展開(_E)"
 
 # XXX 暫譯
-#: src/gtkblist.c:1391 src/gtkconv.c:3999
+#: src/gtkblist.c:1884 src/gtkconv.c:3864
 msgid ""
 "You are not currently signed on with an account that can add that buddy."
 msgstr "您並未登入任何一個可供您新增哪個好友的通訊協定。"
 
 #. Buddies menu
-#: src/gtkblist.c:1690
+#: src/gtkblist.c:2225
 msgid "/_Buddies"
 msgstr "/好友(_B)"
 
-#: src/gtkblist.c:1691
+#: src/gtkblist.c:2226
 msgid "/Buddies/New Instant _Message..."
 msgstr "/好友/新即時訊息(_M)"
 
-#: src/gtkblist.c:1692
+#: src/gtkblist.c:2227
 msgid "/Buddies/Join a _Chat..."
 msgstr "/好友/加入聊天室(_C)"
 
-#: src/gtkblist.c:1693
-msgid "/Buddies/Get _User Info..."
+#: src/gtkblist.c:2228
+#, fuzzy
+msgid "/Buddies/Get User _Info..."
 msgstr "/好友/取得使用者資訊(_U)"
 
-#: src/gtkblist.c:1695
+#: src/gtkblist.c:2230
 msgid "/Buddies/Show _Offline Buddies"
 msgstr "/好友/顯示離線好友(_O)"
 
-#: src/gtkblist.c:1696
+#: src/gtkblist.c:2231
 msgid "/Buddies/Show _Empty Groups"
 msgstr "/好友/顯示空白的群組(_E)"
 
-#: src/gtkblist.c:1697
+#: src/gtkblist.c:2232
 msgid "/Buddies/_Add Buddy..."
 msgstr "/好友/新增好友(_A)..."
 
-#: src/gtkblist.c:1698
+#: src/gtkblist.c:2233
 msgid "/Buddies/Add C_hat..."
 msgstr "/好友/新增聊天室(_H)..."
 
-#: src/gtkblist.c:1699
+#: src/gtkblist.c:2234
 msgid "/Buddies/Add _Group..."
 msgstr "/好友/新增群組(_G)..."
 
-#: src/gtkblist.c:1701
+#: src/gtkblist.c:2236
 msgid "/Buddies/_Signoff"
 msgstr "/好友/登出(_S)"
 
-#: src/gtkblist.c:1702
+#: src/gtkblist.c:2237
 msgid "/Buddies/_Quit"
 msgstr "/好友/結束程式(_Q)"
 
 #. Tools
-#: src/gtkblist.c:1705
+#: src/gtkblist.c:2240
 msgid "/_Tools"
 msgstr "工具(_T)"
 
-#: src/gtkblist.c:1706
+#: src/gtkblist.c:2241
 msgid "/Tools/_Away"
 msgstr "/工具/離開(_A)"
 
-#: src/gtkblist.c:1707
+#: src/gtkblist.c:2242
 msgid "/Tools/Buddy _Pounce"
 msgstr "/工具/好友狀態捕捉(_P)"
 
-#: src/gtkblist.c:1708
+#: src/gtkblist.c:2243
 msgid "/Tools/P_rotocol Actions"
 msgstr "/工具/通訊協定相關設定(_R)"
 
-#: src/gtkblist.c:1710
+#: src/gtkblist.c:2245
 msgid "/Tools/A_ccounts"
 msgstr "/工具/帳號清單(_C)"
 
-#: src/gtkblist.c:1711
+#: src/gtkblist.c:2246
 msgid "/Tools/_File Transfers"
 msgstr "/工具/檔案傳輸(_F)"
 
-#: src/gtkblist.c:1712
+#: src/gtkblist.c:2247
+#, fuzzy
+msgid "/Tools/R_oom List"
+msgstr "/工具/通訊協定相關設定(_R)"
+
+#: src/gtkblist.c:2248
 msgid "/Tools/Pr_eferences"
 msgstr "/工具/偏好設定(_E)"
 
-#: src/gtkblist.c:1713
+#: src/gtkblist.c:2249
 msgid "/Tools/Pr_ivacy"
 msgstr "/工具/隱私設定(_I)"
 
-#: src/gtkblist.c:1716
+#: src/gtkblist.c:2252
 msgid "/Tools/View System _Log"
 msgstr "觀看系統日誌(_L)"
 
 #. Help
-#: src/gtkblist.c:1720
+#: src/gtkblist.c:2256
 msgid "/_Help"
 msgstr "說明(_H)"
 
-#: src/gtkblist.c:1721
+#: src/gtkblist.c:2257
 msgid "/Help/Online _Help"
 msgstr "線上說明(_H)"
 
-#: src/gtkblist.c:1722
+#: src/gtkblist.c:2258
 msgid "/Help/_Debug Window"
 msgstr "/說明/除錯視窗(_D)"
 
-#: src/gtkblist.c:1723
+#: src/gtkblist.c:2259
 msgid "/Help/_About"
 msgstr "/說明/關於(_A)"
 
-#: src/gtkblist.c:1739
+#: src/gtkblist.c:2275
 msgid "Rename Group"
 msgstr "修改群組名稱"
 
-#: src/gtkblist.c:1739
+#: src/gtkblist.c:2275
 msgid "New group name"
 msgstr "新名字"
 
-#: src/gtkblist.c:1740
+#: src/gtkblist.c:2276
 msgid "Please enter a new name for the selected group."
 msgstr "請為選取的群組輸入一個新的名稱。"
 
-#: src/gtkblist.c:1768
+#: src/gtkblist.c:2304
 #, c-format
 msgid ""
 "\n"
@@ -2210,16 +2387,16 @@
 "\n"
 "<b>帳號:</b>%s"
 
-#: src/gtkblist.c:1832 src/protocols/oscar/oscar.c:5525
+#: src/gtkblist.c:2368 src/protocols/oscar/oscar.c:5772
 msgid "<b>Status:</b> Offline"
 msgstr "<b>狀態:</b>離線"
 
-#: src/gtkblist.c:1847
+#: src/gtkblist.c:2383
 #, c-format
 msgid "%d%%"
 msgstr "%d%%"
 
-#: src/gtkblist.c:1863
+#: src/gtkblist.c:2399
 msgid ""
 "\n"
 "<b>Account:</b>"
@@ -2227,7 +2404,7 @@
 "\n"
 "<b>帳號:</b>"
 
-#: src/gtkblist.c:1864
+#: src/gtkblist.c:2400
 msgid ""
 "\n"
 "<b>Contact Alias:</b>"
@@ -2235,7 +2412,7 @@
 "\n"
 "<b>別名:</b>"
 
-#: src/gtkblist.c:1865
+#: src/gtkblist.c:2401
 msgid ""
 "\n"
 "<b>Alias:</b>"
@@ -2243,7 +2420,7 @@
 "\n"
 "<b>別名:</b>"
 
-#: src/gtkblist.c:1866
+#: src/gtkblist.c:2402
 msgid ""
 "\n"
 "<b>Nickname:</b>"
@@ -2251,7 +2428,7 @@
 "\n"
 "<b>暱稱:</b>"
 
-#: src/gtkblist.c:1867
+#: src/gtkblist.c:2403
 msgid ""
 "\n"
 "<b>Logged In:</b>"
@@ -2259,7 +2436,7 @@
 "\n"
 "<b>登入時間:</b>"
 
-#: src/gtkblist.c:1868
+#: src/gtkblist.c:2404
 msgid ""
 "\n"
 "<b>Idle:</b>"
@@ -2267,7 +2444,7 @@
 "\n"
 "<b>閒置:</b>"
 
-#: src/gtkblist.c:1869
+#: src/gtkblist.c:2405
 msgid ""
 "\n"
 "<b>Warned:</b>"
@@ -2275,7 +2452,7 @@
 "\n"
 "<b>警告:<b>"
 
-#: src/gtkblist.c:1871
+#: src/gtkblist.c:2407
 msgid ""
 "\n"
 "<b>Description:</b> Spooky"
@@ -2283,7 +2460,7 @@
 "\n"
 "<b>介紹:</b>幽靈似的"
 
-#: src/gtkblist.c:1872
+#: src/gtkblist.c:2408
 msgid ""
 "\n"
 "<b>Status</b>: Awesome"
@@ -2291,7 +2468,7 @@
 "\n"
 "<b>狀態:</b>頂呱呱"
 
-#: src/gtkblist.c:1873
+#: src/gtkblist.c:2409
 msgid ""
 "\n"
 "<b>Status</b>: Rockin'"
@@ -2299,85 +2476,79 @@
 "\n"
 "<b>狀態:</b>頂呱呱"
 
-#: src/gtkblist.c:2143
+#: src/gtkblist.c:2679
 #, c-format
 msgid "Idle (%dh%02dm) "
 msgstr "閒置(%d 小時 %d 分)"
 
-#: src/gtkblist.c:2145
+#: src/gtkblist.c:2681
 #, c-format
 msgid "Idle (%dm) "
 msgstr "閒置(%d 分)"
 
-#: src/gtkblist.c:2150
+#: src/gtkblist.c:2686
 #, c-format
 msgid "Warned (%d%%) "
 msgstr "警告 (%d%%)"
 
-#: src/gtkblist.c:2153
+#: src/gtkblist.c:2689
 msgid "Offline "
 msgstr "離線"
 
-#: src/gtkblist.c:2346 src/gtkprefs.c:834 src/gtkprefs.c:1485
-msgid "None"
-msgstr "無"
-
-#: src/gtkblist.c:2413
+#: src/gtkblist.c:2947
 msgid "/Tools/Away"
 msgstr "/工具/離開"
 
-#: src/gtkblist.c:2416
+#: src/gtkblist.c:2950
 msgid "/Tools/Buddy Pounce"
 msgstr "/工具/好友狀態捕捉"
 
-#: src/gtkblist.c:2419
+#: src/gtkblist.c:2953
 msgid "/Tools/Protocol Actions"
 msgstr "/工具/通訊協定相關設定"
 
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: src/gtkblist.c:2506
+#: src/gtkblist.c:3041
 msgid "/Buddies/Show Offline Buddies"
 msgstr "/好友/顯示離線好友"
 
-#: src/gtkblist.c:2508
+#: src/gtkblist.c:3043
 msgid "/Buddies/Show Empty Groups"
 msgstr "/好友/顯示空的好的群組"
 
-#: src/gtkblist.c:2526 src/gtkconv.c:1215
-msgid "IM"
-msgstr "即時訊息"
-
-#: src/gtkblist.c:2532
+#: src/gtkblist.c:3067
 msgid "Send a message to the selected buddy"
 msgstr "傳送訊息給被選取的好友"
 
-#: src/gtkblist.c:2535 src/protocols/napster/napster.c:529
-msgid "Get Info"
-msgstr "取得資訊"
-
-#: src/gtkblist.c:2541
+#: src/gtkblist.c:3076
 msgid "Get information on the selected buddy"
 msgstr "取得被選取好友的資訊"
 
-#: src/gtkblist.c:2544 src/protocols/oscar/oscar.c:3086
-msgid "Chat"
+#: src/gtkblist.c:3079
+#, fuzzy
+msgid "_Chat"
 msgstr "聊天"
 
-#: src/gtkblist.c:2549
+#: src/gtkblist.c:3084
 msgid "Join a chat room"
 msgstr "加入一個聊天室"
 
-#: src/gtkblist.c:2557
+#: src/gtkblist.c:3087
+#, fuzzy
+msgid "_Away"
+msgstr "離開"
+
+#: src/gtkblist.c:3092
 msgid "Set an away message"
 msgstr "設定一個離開訊息"
 
-#: src/gtkblist.c:3270 src/protocols/yahoo/yahoo.c:2325
+#: src/gtkblist.c:3824 src/protocols/yahoo/yahoo.c:2427
 msgid "Add Buddy"
 msgstr "新增好友"
 
-#: src/gtkblist.c:3293
+#: src/gtkblist.c:3847
 msgid ""
 "Please enter the screen name of the person you would like to add to your "
 "buddy list. You may optionally enter an alias, or nickname,  for the buddy. "
@@ -2386,63 +2557,55 @@
 "請輸入您所想要加入好友的帳號。您可以為這個好友設定別名或暱稱,而這個設定將會"
 "在好友清單中顯示。\n"
 
-#: src/gtkblist.c:3315 src/main.c:290
-msgid "Screen Name:"
-msgstr "帳號:"
-
-#: src/gtkblist.c:3341 src/gtkblist.c:3663
-msgid "Group:"
-msgstr "群組:"
-
 #. Set up stuff for the account box
-#: src/gtkblist.c:3350 src/gtkblist.c:3631
+#: src/gtkblist.c:3907 src/gtkblist.c:4191
 msgid "Account:"
 msgstr "帳號:"
 
-#: src/gtkblist.c:3598
+#: src/gtkblist.c:4158
 msgid "Add Chat"
 msgstr "新增聊天室"
 
-#: src/gtkblist.c:3621
+#: src/gtkblist.c:4181
 msgid ""
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
 msgstr "請輸入別名,或者關於您所想加入好友清單的聊天室的適當資訊。\n"
 
-#: src/gtkblist.c:3697
+#: src/gtkblist.c:4260
 msgid "Add Group"
 msgstr "加入群組"
 
-#: src/gtkblist.c:3698
+#: src/gtkblist.c:4261
 msgid "Please enter the name of the group to be added."
 msgstr "請給您新增的群組輸入名稱。"
 
-#: src/gtkblist.c:4215
+#: src/gtkblist.c:4780
 msgid "No actions available"
 msgstr "不允許任何動作"
 
-#: src/gtkconn.c:77 src/gtkconn.c:249 src/gtkconn.c:260
+#: src/gtkconn.c:78 src/gtkconn.c:250 src/gtkconn.c:261
 msgid "Done."
 msgstr "完成。"
 
-#: src/gtkconn.c:156
+#: src/gtkconn.c:157
 msgid "Signon: "
 msgstr "登入:"
 
-#: src/gtkconn.c:202
+#: src/gtkconn.c:203
 msgid "Signon"
 msgstr "登入"
 
-#: src/gtkconn.c:215
+#: src/gtkconn.c:216
 msgid "Cancel All"
 msgstr "全部取消"
 
-#: src/gtkconn.c:358 src/gtkconn.c:585
+#: src/gtkconn.c:361 src/gtkconn.c:593
 msgid "_Reconnect"
 msgstr "重新連線(_R)"
 
 # XXX 暫譯
-#: src/gtkconn.c:549
+#: src/gtkconn.c:557
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">%s has been disconnected.</span>\n"
@@ -2455,571 +2618,611 @@
 "%s\n"
 "%s"
 
-#: src/gtkconn.c:551
+#: src/gtkconn.c:559
 msgid "Reason Unknown."
 msgstr "理由不明。"
 
-#: src/gtkconn.c:590
+#: src/gtkconn.c:598
 msgid "Reconnect _All"
 msgstr "全部重新連線(_A)"
 
-#: src/gtkconn.c:612
-msgid "Account"
-msgstr "帳號"
-
-#: src/gtkconn.c:620
+#: src/gtkconn.c:628
 msgid "Time"
 msgstr "時間"
 
-#: src/gtkconv.c:187
+#: src/gtkconv.c:183
 msgid "That file already exists"
 msgstr "那個檔案已經存在"
 
-#: src/gtkconv.c:188 src/gtkft.c:1076
+#: src/gtkconv.c:184 src/gtkft.c:1106
 msgid "Would you like to overwrite it?"
 msgstr "您要覆蓋它嗎?"
 
-#: src/gtkconv.c:244
-#, c-format
-msgid "Failed to store image: %s\n"
-msgstr "無法儲存影像:%s\n"
-
-#: src/gtkconv.c:300
-msgid "Insert Image"
-msgstr "插入影像"
-
-#: src/gtkconv.c:629
+#: src/gtkconv.c:470
 msgid "Invite Buddy Into Chat Room"
 msgstr "邀請好友進入聊天室"
 
 #. Put our happy label in it.
-#: src/gtkconv.c:657
+#: src/gtkconv.c:498
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
 msgstr "請輸入您想邀請的使用者名稱,以及邀請的訊息。"
 
-#: src/gtkconv.c:678
+#: src/gtkconv.c:519
 msgid "_Buddy:"
 msgstr "好友(_B):"
 
-#: src/gtkconv.c:698
+#: src/gtkconv.c:539
 msgid "_Message:"
 msgstr "訊息(_M):"
 
-#: src/gtkconv.c:788
+#: src/gtkconv.c:632
 msgid "Find"
 msgstr "搜尋"
 
-#: src/gtkconv.c:810
+#: src/gtkconv.c:658
 msgid "_Search for:"
 msgstr "搜尋(_S):"
 
-#: src/gtkconv.c:1223
+#: src/gtkconv.c:1030
+msgid "IM"
+msgstr "即時訊息"
+
+#: src/gtkconv.c:1038
 msgid "Un-Ignore"
 msgstr "取消忽略使用者"
 
-#: src/gtkconv.c:1225 src/gtkprefs.c:767
+#: src/gtkconv.c:1040 src/gtkprefs.c:784
 msgid "Ignore"
 msgstr "忽略使用者"
 
 # XXX「Info」的作用似乎係取得使用者資訊,但不肯定,看了其他po檔仍是不肯定這是什麼
 # XXX javajsp (Ka-Hing CHEUNG) 見過的「Info」按紐全都是「取得使用者資訊」
 #. Info button
-#: src/gtkconv.c:1234 src/gtkconv.c:3246
+#: src/gtkconv.c:1049 src/gtkconv.c:3303
 msgid "Info"
 msgstr "取得資訊"
 
-#: src/gtkconv.c:1243
+#: src/gtkconv.c:1058
 msgid "Get Away Msg"
 msgstr "取得離線訊息"
 
 #. Remove button
-#: src/gtkconv.c:1254 src/gtkconv.c:3239 src/gtkconv.c:3330
-#: src/gtkrequest.c:196
+#: src/gtkconv.c:1070 src/gtkconv.c:3296 src/gtkconv.c:3387
+#: src/gtkrequest.c:231
 msgid "Remove"
 msgstr "移除"
 
-#: src/gtkconv.c:2489
+#: src/gtkconv.c:2162
+msgid "Animate"
+msgstr "動畫"
+
+#: src/gtkconv.c:2167
+msgid "Hide Icon"
+msgstr "隱藏圖示"
+
+#: src/gtkconv.c:2173
+msgid "Save Icon As..."
+msgstr "儲存圖示為..."
+
+#: src/gtkconv.c:2536
 msgid "User is typing..."
 msgstr "使用者正在輸入..."
 
-#: src/gtkconv.c:2497
+#: src/gtkconv.c:2544
 msgid "User has typed something and paused"
 msgstr "使用者輸入了些東西,不過目前暫停輸入"
 
 #. Build the Send As menu
-#: src/gtkconv.c:2600
+#: src/gtkconv.c:2647
 msgid "_Send As"
 msgstr "使用帳號(_S)"
 
-#: src/gtkconv.c:3011
+#: src/gtkconv.c:3067
 msgid "Save Conversation"
 msgstr "儲存聊天內容"
 
 #. Conversation menu
-#: src/gtkconv.c:3028
+#: src/gtkconv.c:3084
 msgid "/_Conversation"
 msgstr "/交談(_C)"
 
-#: src/gtkconv.c:3030
+#: src/gtkconv.c:3086
 msgid "/Conversation/New Instant _Message..."
 msgstr "/好友/新即時訊息(_M)..."
 
-#: src/gtkconv.c:3035
+#: src/gtkconv.c:3091
 msgid "/Conversation/_Find..."
 msgstr "/交談/搜尋(_F)..."
 
-#: src/gtkconv.c:3036
+#: src/gtkconv.c:3093
 msgid "/Conversation/View _Log"
 msgstr "/交談/觀看歷史記錄(_L)"
 
-#: src/gtkconv.c:3037
+#: src/gtkconv.c:3094
 msgid "/Conversation/_Save As..."
 msgstr "/交談/另存新檔(_S)..."
 
-#: src/gtkconv.c:3042
+#: src/gtkconv.c:3099
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/交談/新增好友狀態捕捉(_P)..."
 
-#: src/gtkconv.c:3044
+#: src/gtkconv.c:3101
 msgid "/Conversation/_Get Info"
 msgstr "/交談/取得資訊(_G)"
 
-#: src/gtkconv.c:3046
+#: src/gtkconv.c:3103
 msgid "/Conversation/_Warn..."
 msgstr "/交談/警告(_W)..."
 
-#: src/gtkconv.c:3048
+#: src/gtkconv.c:3105
 msgid "/Conversation/In_vite..."
 msgstr "/交談/邀請(_V)..."
 
-#: src/gtkconv.c:3053
+#: src/gtkconv.c:3110
 msgid "/Conversation/A_lias..."
 msgstr "/交談/別名(_L)..."
 
-#: src/gtkconv.c:3055
+#: src/gtkconv.c:3112
 msgid "/Conversation/_Block..."
 msgstr "/交談/封鎖(_B)..."
 
-#: src/gtkconv.c:3057
+#: src/gtkconv.c:3114
 msgid "/Conversation/_Add..."
 msgstr "/交談/新增(_A)..."
 
-#: src/gtkconv.c:3059
+#: src/gtkconv.c:3116
 msgid "/Conversation/_Remove..."
 msgstr "/交談/移除(_R)..."
 
-#: src/gtkconv.c:3064
+#: src/gtkconv.c:3121
 msgid "/Conversation/Insert Lin_k..."
 msgstr "/交談/插入連結(_k)..."
 
-#: src/gtkconv.c:3066
+#: src/gtkconv.c:3123
 msgid "/Conversation/Insert Imag_e..."
 msgstr "/交談/插入影像(_E)..."
 
-#: src/gtkconv.c:3071
+#: src/gtkconv.c:3128
 msgid "/Conversation/_Close"
 msgstr "/交談/關閉(_C)"
 
 #. Options
-#: src/gtkconv.c:3075
+#: src/gtkconv.c:3132
 msgid "/_Options"
 msgstr "/選項(_O)"
 
-#: src/gtkconv.c:3076
+#: src/gtkconv.c:3133
 msgid "/Options/Enable _Logging"
 msgstr "/選項/開始記錄日誌(_L)"
 
-#: src/gtkconv.c:3077
+#: src/gtkconv.c:3134
 msgid "/Options/Enable _Sounds"
 msgstr "/選項/開啟音效(_S)"
 
-#: src/gtkconv.c:3078
+#: src/gtkconv.c:3135
 msgid "/Options/Show Formatting _Toolbar"
 msgstr "/選項/顯示格式工具列(_T)"
 
-#: src/gtkconv.c:3120
+#: src/gtkconv.c:3177
 msgid "/Conversation/View Log"
 msgstr "/交談/觀看歷史記錄"
 
-#: src/gtkconv.c:3125
+#: src/gtkconv.c:3182
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/交談/新增好友狀態捕捉..."
 
-#: src/gtkconv.c:3131
+#: src/gtkconv.c:3188
 msgid "/Conversation/Get Info"
 msgstr "/交談/取得資訊"
 
-#: src/gtkconv.c:3135
+#: src/gtkconv.c:3192
 msgid "/Conversation/Warn..."
 msgstr "/交談/警告..."
 
-#: src/gtkconv.c:3139
+#: src/gtkconv.c:3196
 msgid "/Conversation/Invite..."
 msgstr "/交談/邀請..."
 
-#: src/gtkconv.c:3145
+#: src/gtkconv.c:3202
 msgid "/Conversation/Alias..."
 msgstr "/交談/別名..."
 
-#: src/gtkconv.c:3149
+#: src/gtkconv.c:3206
 msgid "/Conversation/Block..."
 msgstr "/交談/封鎖..."
 
-#: src/gtkconv.c:3153
+#: src/gtkconv.c:3210
 msgid "/Conversation/Add..."
 msgstr "/交談/新增..."
 
-#: src/gtkconv.c:3157
+#: src/gtkconv.c:3214
 msgid "/Conversation/Remove..."
 msgstr "/交談/移除..."
 
-#: src/gtkconv.c:3163
+#: src/gtkconv.c:3220
 msgid "/Conversation/Insert Link..."
 msgstr "/交談/插入連結..."
 
-#: src/gtkconv.c:3167
+#: src/gtkconv.c:3224
 msgid "/Conversation/Insert Image..."
 msgstr "/交談/插入影像..."
 
-#: src/gtkconv.c:3173
+#: src/gtkconv.c:3230
 msgid "/Options/Enable Logging"
 msgstr "/選項/開始記錄日誌"
 
-#: src/gtkconv.c:3176
+#: src/gtkconv.c:3233
 msgid "/Options/Enable Sounds"
 msgstr "/選項/開啟音效"
 
-#: src/gtkconv.c:3179
+#: src/gtkconv.c:3236
 msgid "/Options/Show Formatting Toolbar"
 msgstr "/選項/顯示格式工具列"
 
 #. From right to left...
 #. Send button
-#: src/gtkconv.c:3202 src/gtkconv.c:3204 src/gtkconv.c:3302 src/gtkconv.c:3304
+#: src/gtkconv.c:3259 src/gtkconv.c:3261 src/gtkconv.c:3359 src/gtkconv.c:3361
 msgid "Send"
 msgstr "送出"
 
 #. Now, um, just kind of all over the place. Huh?
 #. Warn button
-#: src/gtkconv.c:3218
+#: src/gtkconv.c:3275
 msgid "Warn"
 msgstr "警告"
 
-#: src/gtkconv.c:3221
+#: src/gtkconv.c:3278
 msgid "Warn the user"
 msgstr "警告使用者"
 
 #. Block button
-#: src/gtkconv.c:3225 src/gtkprivacy.c:606 src/gtkprivacy.c:617
+#: src/gtkconv.c:3282 src/gtkprivacy.c:598 src/gtkprivacy.c:609
 msgid "Block"
 msgstr "封鎖"
 
-#: src/gtkconv.c:3228
+#: src/gtkconv.c:3285
 msgid "Block the user"
 msgstr "封鎖使用者"
 
-#: src/gtkconv.c:3235
+#: src/gtkconv.c:3292
 msgid "Add the user to your buddy list"
 msgstr "將使用者加入您的好友清單"
 
-#: src/gtkconv.c:3242
+#: src/gtkconv.c:3299
 msgid "Remove the user from your buddy list"
 msgstr "將使用者自您的好友清單中移除"
 
-#: src/gtkconv.c:3249 src/gtkconv.c:3747
+#: src/gtkconv.c:3306 src/gtkconv.c:3628
 msgid "Get the user's information"
 msgstr "取得使用者資訊"
 
 #. Invite
-#: src/gtkconv.c:3316
+#: src/gtkconv.c:3373
 msgid "Invite"
 msgstr "邀請"
 
-#: src/gtkconv.c:3319
+#: src/gtkconv.c:3376
 msgid "Invite a user"
 msgstr "邀請使用者"
 
-#: src/gtkconv.c:3326
+#: src/gtkconv.c:3383
 msgid "Add the chat to your buddy list"
 msgstr "將這個聊天室加入您的好友清單"
 
-#: src/gtkconv.c:3333
+#: src/gtkconv.c:3390
 msgid "Remove the chat from your buddy list"
 msgstr "將這個聊天室自您的好友清單中移除"
 
-#: src/gtkconv.c:3389
-msgid "Bold"
-msgstr "粗體"
-
-#: src/gtkconv.c:3400
-msgid "Italic"
-msgstr "斜體"
-
-#: src/gtkconv.c:3411
-msgid "Underline"
-msgstr "底線"
-
-#: src/gtkconv.c:3427
-msgid "Larger font size"
-msgstr "放大字體"
-
-#: src/gtkconv.c:3439
-msgid "Normal font size"
-msgstr "正常字體"
-
-#: src/gtkconv.c:3451
-msgid "Smaller font size"
-msgstr "縮小字體"
-
-#: src/gtkconv.c:3468
-msgid "Font Face"
-msgstr "字型"
-
-#: src/gtkconv.c:3480
-msgid "Foreground font color"
-msgstr "前景顏色"
-
-#: src/gtkconv.c:3492
-msgid "Background color"
-msgstr "背景顏色"
-
-#: src/gtkconv.c:3507
-msgid "Insert link"
-msgstr "插入連結"
-
-#: src/gtkconv.c:3518
-msgid "Insert image"
-msgstr "插入影像"
-
-#: src/gtkconv.c:3529
-msgid "Insert smiley"
-msgstr "插入表情"
-
-#: src/gtkconv.c:3614
+#: src/gtkconv.c:3490
 msgid "Topic:"
 msgstr "主題:"
 
 #. Setup the label telling how many people are in the room.
-#: src/gtkconv.c:3671
+#: src/gtkconv.c:3550
 msgid "0 people in room"
 msgstr "沒有人在這個房間"
 
-#: src/gtkconv.c:3724
+#: src/gtkconv.c:3605
 msgid "IM the user"
 msgstr "送出即時訊息給使用者"
 
-#: src/gtkconv.c:3736
+#: src/gtkconv.c:3617
 msgid "Ignore the user"
 msgstr "忽略使用者"
 
-#: src/gtkconv.c:4284
+#: src/gtkconv.c:4155
 msgid "Close conversation"
 msgstr "關閉交談"
 
-#: src/gtkconv.c:4808 src/gtkconv.c:4840 src/gtkconv.c:4961 src/gtkconv.c:5028
+#: src/gtkconv.c:4668 src/gtkconv.c:4700 src/gtkconv.c:4821 src/gtkconv.c:4888
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "%d 個人在這個房間"
 msgstr[1] "%d 個人在這個房間"
 
-#: src/gtkconv.c:5360
-msgid "Animate"
-msgstr "動畫"
-
-#: src/gtkconv.c:5365
-msgid "Hide Icon"
-msgstr "隱藏圖示"
-
-#: src/gtkconv.c:5371
-msgid "Save Icon As..."
-msgstr "儲存圖示為..."
-
-#: src/gtkconv.c:5767 src/gtkconv.c:5770
+#: src/gtkconv.c:5404 src/gtkconv.c:5407
 msgid "<main>/Conversation/Close"
 msgstr "<mail>/交談/關閉"
 
-#: src/gtkdebug.c:133
+#: src/gtkdebug.c:135
 msgid "Debug Window"
 msgstr "除錯視窗"
 
-#: src/gtkdebug.c:173
+#: src/gtkdebug.c:175
 msgid "Pause"
 msgstr "暫停"
 
-#: src/gtkdebug.c:179
+#: src/gtkdebug.c:181
 msgid "Timestamps"
 msgstr "時間戳記"
 
-#: src/gtkft.c:133
+#: src/gtkft.c:135
 #, c-format
 msgid "%.2f KB/s"
 msgstr "%.2f kB/s"
 
-#: src/gtkft.c:207
+#: src/gtkft.c:156 src/gtkft.c:957
+#, fuzzy
+msgid "Finished"
+msgstr "芬蘭文"
+
+#: src/gtkft.c:209
 msgid "<b>Receiving From:</b>"
 msgstr "<b>接收自:</b>"
 
-#: src/gtkft.c:210
+#: src/gtkft.c:212
 msgid "<b>Sending To:</b>"
 msgstr "<b>傳送到:</b>"
 
-#: src/gtkft.c:458
+#: src/gtkft.c:386
+msgid "There is no application configured to open this type of file."
+msgstr ""
+
+#: src/gtkft.c:391
+msgid "An error occurred while opening the file."
+msgstr ""
+
+#: src/gtkft.c:482
 msgid "Progress"
 msgstr "進度"
 
-#: src/gtkft.c:465
+#: src/gtkft.c:489
 msgid "Filename"
 msgstr "檔名"
 
-#: src/gtkft.c:472
+#: src/gtkft.c:496
 msgid "Size"
 msgstr "大小"
 
-#: src/gtkft.c:479
+#: src/gtkft.c:503
 msgid "Remaining"
 msgstr "剩餘"
 
-#: src/gtkft.c:509
+#: src/gtkft.c:533
 msgid "Filename:"
 msgstr "檔名:"
 
-#: src/gtkft.c:510
+#: src/gtkft.c:534
 msgid "Status:"
 msgstr "狀態:"
 
-#: src/gtkft.c:511
+#: src/gtkft.c:535
 msgid "Speed:"
 msgstr "速度:"
 
-#: src/gtkft.c:512
+#: src/gtkft.c:536
 msgid "Time Elapsed:"
 msgstr "經過時間:"
 
-#: src/gtkft.c:513
+#: src/gtkft.c:537
 msgid "Time Remaining:"
 msgstr "尚需時間:"
 
-#: src/gtkft.c:610
+#: src/gtkft.c:634
 msgid "_Keep the dialog open"
 msgstr "保持對話框開啟(_K)"
 
-#: src/gtkft.c:620
+#: src/gtkft.c:644
 msgid "_Clear finished transfers"
 msgstr "清除已完成的傳輸(_C)"
 
 # XXX 暫譯
 #. "Download Details" arrow
-#: src/gtkft.c:629
+#: src/gtkft.c:653
 msgid "Show transfer details"
 msgstr "顯示傳輸細節"
 
 # XXX 暫譯
-#: src/gtkft.c:630
+#: src/gtkft.c:654
 msgid "Hide transfer details"
 msgstr "隱藏傳輸細節"
 
 #. Pause button
-#: src/gtkft.c:672 src/stock.c:85
+#: src/gtkft.c:696 src/stock.c:90
 msgid "_Pause"
 msgstr "暫停(_P)"
 
 #. Resume button
-#: src/gtkft.c:682
+#: src/gtkft.c:706
 msgid "_Resume"
 msgstr "恢復(_R)"
 
-#: src/gtkft.c:882
+#: src/gtkft.c:908
 msgid "Canceled"
 msgstr "已取消"
 
-#: src/gtkft.c:884
+#: src/gtkft.c:910
 msgid "Failed"
 msgstr "失敗"
 
-#: src/gtkft.c:1053
+#: src/gtkft.c:1082
 msgid "That file does not exist."
 msgstr "檔案不存在。"
 
-#: src/gtkft.c:1062
+#: src/gtkft.c:1091
 msgid "Cannot send a file of 0 bytes."
 msgstr "無法傳送空的檔案。"
 
-#: src/gtkft.c:1075
+#: src/gtkft.c:1105
 msgid "That file already exists."
 msgstr "那個檔案已經存在。"
 
-#: src/gtkft.c:1100
+#: src/gtkft.c:1131
 msgid "Open..."
 msgstr "開啟..."
 
 # XXX 要覆查
-#: src/gtkft.c:1102
+#: src/gtkft.c:1133
 msgid "Save As..."
 msgstr "另存新檔..."
 
-#: src/gtkft.c:1149
+#: src/gtkft.c:1181
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "%s 想要送 %s (%s) 給您"
 
-#: src/gtkimhtml.c:614
+#: src/gtkimhtml.c:829
 msgid "_Copy E-Mail Address"
 msgstr "複製電子郵件地址(_C)"
 
-#: src/gtkimhtml.c:626
+#: src/gtkimhtml.c:841
 msgid "_Copy Link Location"
 msgstr "複製連結位址(_C)"
 
-#: src/gtkimhtml.c:636
+#: src/gtkimhtml.c:851
 msgid "_Open Link in Browser"
 msgstr "在瀏覽器中打開連結(_O)"
 
 # NOTE "Defaulting to PNG" 是指 gaim 在無計可施的情況下盲猜影像是 PNG 格式
-#: src/gtkimhtml.c:1752
+#: src/gtkimhtml.c:2262
 msgid ""
 "Unable to guess the image type based on the file extension supplied.  "
 "Defaulting to PNG."
 msgstr "Gaim 無法依照副檔名來判別影像格式,暫且當成 PNG 檔處理。"
 
-#: src/gtkimhtml.c:1760
+#: src/gtkimhtml.c:2270
 #, c-format
 msgid "Error saving image: %s"
 msgstr "儲存影像錯誤:%s"
 
-#: src/gtkimhtml.c:1769
+#: src/gtkimhtml.c:2279
 msgid "Save Image"
 msgstr "儲存影像"
 
-#: src/gtkimhtml.c:1792
+#: src/gtkimhtml.c:2302
 msgid "_Save Image..."
 msgstr "儲存影像(_S)..."
 
+#: src/gtkimhtmltoolbar.c:350
+#, fuzzy
+msgid "_URL"
+msgstr "_URL:"
+
+#: src/gtkimhtmltoolbar.c:354
+#, fuzzy
+msgid "_Description"
+msgstr "描述(_D):"
+
+#: src/gtkimhtmltoolbar.c:359
+msgid "Insert Link"
+msgstr "加入連結"
+
+#: src/gtkimhtmltoolbar.c:361
+#, fuzzy
+msgid ""
+"Please enter the URL and description of the link that you want to insert. "
+"The description is optional."
+msgstr "請輸入您所要插入的 URL 及它的描述,描述是選擇性的,可不用輸入。\n"
+
+#: src/gtkimhtmltoolbar.c:365
+msgid "_Insert"
+msgstr "插入(_I)"
+
+#: src/gtkimhtmltoolbar.c:422
+#, c-format
+msgid "Failed to store image: %s\n"
+msgstr "無法儲存影像:%s\n"
+
+#: src/gtkimhtmltoolbar.c:448
+msgid "Insert Image"
+msgstr "插入影像"
+
+#. show everything
+#: src/gtkimhtmltoolbar.c:592
+msgid "Smile!"
+msgstr "笑一個!"
+
+#: src/gtkimhtmltoolbar.c:722
+msgid "Bold"
+msgstr "粗體"
+
+#: src/gtkimhtmltoolbar.c:733
+msgid "Italic"
+msgstr "斜體"
+
+#: src/gtkimhtmltoolbar.c:744
+msgid "Underline"
+msgstr "底線"
+
+#: src/gtkimhtmltoolbar.c:760
+msgid "Larger font size"
+msgstr "放大字體"
+
+#: src/gtkimhtmltoolbar.c:772
+msgid "Smaller font size"
+msgstr "縮小字體"
+
+#: src/gtkimhtmltoolbar.c:789
+msgid "Font Face"
+msgstr "字型"
+
+#: src/gtkimhtmltoolbar.c:801
+msgid "Foreground font color"
+msgstr "前景顏色"
+
+#: src/gtkimhtmltoolbar.c:813
+msgid "Background color"
+msgstr "背景顏色"
+
+#: src/gtkimhtmltoolbar.c:828
+msgid "Insert link"
+msgstr "插入連結"
+
+#: src/gtkimhtmltoolbar.c:838
+msgid "Insert image"
+msgstr "插入影像"
+
+#: src/gtkimhtmltoolbar.c:849
+msgid "Insert smiley"
+msgstr "插入表情"
+
 # NOTE 這個處理的手法係由芬蘭文現任譯者Arto Alakulju提供的
-#: src/gtklog.c:255
+#: src/gtklog.c:257
 msgid "Conversations with"
 msgstr "交談:"
 
-#: src/gtknotify.c:211
+#. Descriptive label
+#: src/gtknotify.c:215
 #, c-format
 msgid "%s has %d new message."
 msgid_plural "%s has %d new messages."
 msgstr[0] "%s 有 %d 封新郵件。"
 msgstr[1] "%s 有 %d 封新郵件。"
 
-#: src/gtknotify.c:219
+#: src/gtknotify.c:227
 #, c-format
 msgid "<span weight=\"bold\">From:</span> %s\n"
 msgstr "<span weight=\"bold\">來自:</span> %s\n"
 
-#: src/gtknotify.c:224
+#: src/gtknotify.c:233
 #, c-format
 msgid "<span weight=\"bold\">Subject:</span> %s\n"
 msgstr "<span weight=\"bold\">主題:</span> %s\n"
 
-#: src/gtknotify.c:228
+#: src/gtknotify.c:237
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
@@ -3030,7 +3233,7 @@
 "\n"
 "%s%s%s%s"
 
-#: src/gtknotify.c:243
+#: src/gtknotify.c:253
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
@@ -3041,175 +3244,199 @@
 "\n"
 "%s"
 
-#: src/gtknotify.c:430 src/gtknotify.c:450 src/gtknotify.c:458
+#: src/gtknotify.c:439
+#, fuzzy, c-format
+msgid "The browser command \"%s\" is invalid."
+msgstr "瀏覽器「%s」是無效的。"
+
+#: src/gtknotify.c:442 src/gtknotify.c:456 src/gtknotify.c:471
+#: src/gtknotify.c:579
 msgid "Unable to open URL"
 msgstr "無法開啟網頁"
 
-#: src/gtknotify.c:431
+#: src/gtknotify.c:453 src/gtknotify.c:468
+#, fuzzy, c-format
+msgid "Error launching \"%s\": %s"
+msgstr "執行「指令」時發生了錯誤:%s"
+
+#: src/gtknotify.c:580
 msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr "您選用了「使用者自定瀏覽器」,卻未有設定指令。"
 
-#: src/gtknotify.c:448
-#, c-format
-msgid "The browser \"%s\" is invalid."
-msgstr "瀏覽器「%s」是無效的。"
-
-#: src/gtknotify.c:455
-#, c-format
-msgid "Error launching \"command\": %s"
-msgstr "執行「指令」時發生了錯誤:%s"
-
-#: src/gtkpounce.c:140
+#: src/gtkpounce.c:143
 msgid "Select a file"
 msgstr "選擇檔案"
 
-#: src/gtkpounce.c:189
+#: src/gtkpounce.c:192
 msgid "Please enter a buddy to pounce."
 msgstr "請輸入一個好友以進行捕捉。"
 
 #. "New Buddy Pounce"
-#: src/gtkpounce.c:333 src/gtkpounce.c:738
+#: src/gtkpounce.c:336 src/gtkpounce.c:756
 msgid "New Buddy Pounce"
 msgstr "新增好友狀態捕捉"
 
-#: src/gtkpounce.c:333
+#: src/gtkpounce.c:336
 msgid "Edit Buddy Pounce"
 msgstr "編輯好友狀態捕捉"
 
 #. Create the "Pounce Who" frame.
-#: src/gtkpounce.c:351
+#: src/gtkpounce.c:354
 msgid "Pounce Who"
 msgstr "要捕捉誰的狀態"
 
-#: src/gtkpounce.c:377
+#: src/gtkpounce.c:381
 msgid "_Buddy Name:"
 msgstr "好友名稱(_B):"
 
 #. Create the "Pounce When" frame.
-#: src/gtkpounce.c:399
+#: src/gtkpounce.c:404
 msgid "Pounce When"
 msgstr "捕捉什麼樣的狀態"
 
-#: src/gtkpounce.c:407 src/main.c:336
-msgid "Sign on"
+#: src/gtkpounce.c:412
+#, fuzzy
+msgid "_Sign on"
 msgstr "登入"
 
-#: src/gtkpounce.c:409
-msgid "Sign off"
+#: src/gtkpounce.c:414
+#, fuzzy
+msgid "Sign _off"
 msgstr "登出"
 
-#: src/gtkpounce.c:413
-msgid "Return from away"
+#: src/gtkpounce.c:416
+#, fuzzy
+msgid "A_way"
+msgstr "離開"
+
+#: src/gtkpounce.c:418
+#, fuzzy
+msgid "Re_turn from away"
 msgstr "由離開返回"
 
-#: src/gtkpounce.c:415 src/gtkprefs.c:1482 src/protocols/msn/state.c:30
-#: src/protocols/yahoo/yahoo.c:2189
-msgid "Idle"
+#: src/gtkpounce.c:420
+#, fuzzy
+msgid "_Idle"
 msgstr "閒置"
 
-#: src/gtkpounce.c:417
-msgid "Return from idle"
+#: src/gtkpounce.c:422
+#, fuzzy
+msgid "Retur_n from idle"
 msgstr "由閒置返回"
 
-#: src/gtkpounce.c:419
-msgid "Buddy starts typing"
+#: src/gtkpounce.c:424
+#, fuzzy
+msgid "Buddy starts _typing"
 msgstr "好友開始輸入"
 
-#: src/gtkpounce.c:421
-msgid "Buddy stops typing"
+#: src/gtkpounce.c:426
+#, fuzzy
+msgid "Buddy stops t_yping"
 msgstr "好友停止輸入"
 
 #. Create the "Pounce Action" frame.
-#: src/gtkpounce.c:450
+#: src/gtkpounce.c:455
 msgid "Pounce Action"
 msgstr "捕捉動作"
 
-#: src/gtkpounce.c:457
-msgid "Open an IM window"
+#: src/gtkpounce.c:462
+#, fuzzy
+msgid "Op_en an IM window"
 msgstr "開啟即時訊息視窗"
 
-#: src/gtkpounce.c:458
-msgid "Popup notification"
+#: src/gtkpounce.c:463
+#, fuzzy
+msgid "_Popup notification"
 msgstr "彈出通知"
 
-#: src/gtkpounce.c:459
-msgid "Send a message"
+#: src/gtkpounce.c:464
+#, fuzzy
+msgid "Send a _message"
 msgstr "送出訊息"
 
-#: src/gtkpounce.c:460
-msgid "Execute a command"
+#: src/gtkpounce.c:465
+#, fuzzy
+msgid "E_xecute a command"
 msgstr "執行指令"
 
-#: src/gtkpounce.c:461
-msgid "Play a sound"
+#: src/gtkpounce.c:466
+#, fuzzy
+msgid "P_lay a sound"
 msgstr "播放音效"
 
-#: src/gtkpounce.c:465 src/gtkpounce.c:467
-msgid "Browse"
+#: src/gtkpounce.c:470
+#, fuzzy
+msgid "B_rowse..."
 msgstr "瀏覽"
 
-#: src/gtkpounce.c:468 src/gtkprefs.c:2072
-msgid "Test"
-msgstr "測試"
-
-#: src/gtkpounce.c:551
-msgid "_Save this pounce after activation"
+#: src/gtkpounce.c:472
+#, fuzzy
+msgid "Bro_wse..."
+msgstr "瀏覽"
+
+#: src/gtkpounce.c:473
+msgid "Pre_view"
+msgstr ""
+
+#: src/gtkpounce.c:556
+#, fuzzy
+msgid "Sav_e this pounce after activation"
 msgstr "儲存設定並啟動(_S)"
 
 #. "Remove Buddy Pounce"
-#: src/gtkpounce.c:745
+#: src/gtkpounce.c:763
 msgid "Remove Buddy Pounce"
 msgstr "移除好友狀態捕捉"
 
-#: src/gtkpounce.c:792
+#: src/gtkpounce.c:813
 #, c-format
 msgid "%s has started typing to you"
 msgstr "%s 開始輸入訊息給您"
 
-#: src/gtkpounce.c:793
+#: src/gtkpounce.c:814
 #, c-format
 msgid "%s has signed on"
 msgstr "%s 已經登入"
 
-#: src/gtkpounce.c:794
+#: src/gtkpounce.c:815
 #, c-format
 msgid "%s has returned from being idle"
 msgstr "%s 由閒置返回"
 
-#: src/gtkpounce.c:795
+#: src/gtkpounce.c:816
 #, c-format
 msgid "%s has returned from being away"
 msgstr "%s 由離開返回"
 
-#: src/gtkpounce.c:796
+#: src/gtkpounce.c:817
 #, c-format
 msgid "%s has stopped typing to you"
 msgstr "%s 停止輸入訊息給您"
 
-#: src/gtkpounce.c:797
+#: src/gtkpounce.c:818
 #, c-format
 msgid "%s has signed off"
 msgstr "%s 已經登出"
 
-#: src/gtkpounce.c:798
+#: src/gtkpounce.c:819
 #, c-format
 msgid "%s has become idle"
 msgstr "%s 變更狀態為閒置"
 
-#: src/gtkpounce.c:800
+#: src/gtkpounce.c:821
 msgid "Unknown pounce event. Please report this!"
 msgstr "未知的捕捉事件。請回報這個問題!"
 
-#: src/gtkprefs.c:365
+#: src/gtkprefs.c:374
 msgid "Interface Options"
 msgstr "介面選項"
 
-#: src/gtkprefs.c:367
+#: src/gtkprefs.c:376
 msgid "D_isplay remote nicknames if no alias is set"
 msgstr "當別名沒有設定時,以對方所設定的暱稱顯示(_I)"
 
-#: src/gtkprefs.c:553
+#: src/gtkprefs.c:562
 msgid ""
 "Select a smiley theme that you would like to use from the list below. New "
 "themes can be installed by dragging and dropping them onto the theme list."
@@ -3217,362 +3444,433 @@
 "在下面的清單中選取一個您所想喜歡的表情主題。您可以用拖曳的方式將新的表情主題"
 "安裝到清單中。"
 
-#: src/gtkprefs.c:588
+#: src/gtkprefs.c:597
 msgid "Icon"
 msgstr "圖示"
 
-#: src/gtkprefs.c:595 src/gtkprefs.c:1794 src/protocols/jabber/buddy.c:263
-#: src/protocols/jabber/buddy.c:748
+#: src/gtkprefs.c:604 src/gtkprefs.c:2018 src/protocols/jabber/buddy.c:265
+#: src/protocols/jabber/buddy.c:748 src/protocols/jabber/chat.c:683
 msgid "Description"
 msgstr "描述"
 
-#: src/gtkprefs.c:662
+#: src/gtkprefs.c:671
 msgid "Style"
 msgstr "風格"
 
-#: src/gtkprefs.c:663
+#: src/gtkprefs.c:672
 msgid "_Bold"
 msgstr "粗體(_B)"
 
-#: src/gtkprefs.c:665
+#: src/gtkprefs.c:674
 msgid "_Italics"
 msgstr "斜體(_I)"
 
-#: src/gtkprefs.c:667
+#: src/gtkprefs.c:676
 msgid "_Underline"
 msgstr "底線(_U)"
 
-#: src/gtkprefs.c:669
+#. who in their right mind would use this as a default anyway?
+#. * and plus, it wouldn't work as the code currently existed,
+#. * and then i went and applied simguy's patch to remove the
+#. * non-functional code.
+#. *
+#. * remove this after string freeze ends
+#.
+#: src/gtkprefs.c:686
 msgid "_Strikethrough"
 msgstr "刪除的文字(_S)"
 
-#: src/gtkprefs.c:672
+#: src/gtkprefs.c:689
 msgid "Face"
 msgstr "字體"
 
-#: src/gtkprefs.c:675
+#: src/gtkprefs.c:692
 msgid "Use custo_m face"
 msgstr "使用者自定字體(_M)"
 
-#: src/gtkprefs.c:692
+#: src/gtkprefs.c:709
 msgid "Use custom si_ze"
 msgstr "使用者自定字體大小(_Z)"
 
-#: src/gtkprefs.c:704
+#: src/gtkprefs.c:721
 msgid "Color"
 msgstr "顏色"
 
-#: src/gtkprefs.c:708
+#: src/gtkprefs.c:725
 msgid "_Text color"
 msgstr "文字顏色(_T)"
 
-#: src/gtkprefs.c:727
+#: src/gtkprefs.c:744
 msgid "Bac_kground color"
 msgstr "背景顏色(_K)"
 
-#: src/gtkprefs.c:755 src/gtkprefs.c:987 src/gtkprefs.c:1035
+#: src/gtkprefs.c:772 src/gtkprefs.c:1004 src/gtkprefs.c:1052
 msgid "Display"
 msgstr "顯示"
 
-#: src/gtkprefs.c:756
+#: src/gtkprefs.c:773
 msgid "Show graphical _smileys"
 msgstr "顯示表情(_S)"
 
-#: src/gtkprefs.c:758
+#: src/gtkprefs.c:775
 msgid "Show _timestamp on messages"
 msgstr "顯示訊息時間(_T)"
 
-#: src/gtkprefs.c:760
+#: src/gtkprefs.c:777
 msgid "Show _URLs as links"
 msgstr "顯示 URL 為超連結(_U)"
 
-#: src/gtkprefs.c:764
+#: src/gtkprefs.c:781
 msgid "_Highlight misspelled words"
 msgstr "標示出拼錯的字(_H)"
 
-#: src/gtkprefs.c:768
-msgid "Ignore c_olors"
-msgstr "忽略顏色(_O)"
-
-#: src/gtkprefs.c:770
-msgid "Ignore font _faces"
-msgstr "忽略字體(_F)"
-
-#: src/gtkprefs.c:772
-msgid "Ignore font si_zes"
-msgstr "忽略字體大小(_Z)"
-
 #: src/gtkprefs.c:785
+msgid "Ignore c_olors"
+msgstr "忽略顏色(_O)"
+
+#: src/gtkprefs.c:787
+msgid "Ignore font _faces"
+msgstr "忽略字體(_F)"
+
+#: src/gtkprefs.c:789
+msgid "Ignore font si_zes"
+msgstr "忽略字體大小(_Z)"
+
+#: src/gtkprefs.c:802
 msgid "Send Message"
 msgstr "送出訊息"
 
-#: src/gtkprefs.c:786
+#: src/gtkprefs.c:803
 msgid "Enter _sends message"
 msgstr "按下 Enter 送出訊息(_S)"
 
-#: src/gtkprefs.c:788
+#: src/gtkprefs.c:805
 msgid "C_ontrol-Enter sends message"
 msgstr "按下 Ctrl-Enter 送出訊息(_O)"
 
-#: src/gtkprefs.c:791
+#: src/gtkprefs.c:808
 msgid "Window Closing"
 msgstr "視窗關閉"
 
-#: src/gtkprefs.c:792
+#: src/gtkprefs.c:809
 msgid "_Escape closes window"
 msgstr "按下 Escape 關閉視窗(_E)"
 
-#: src/gtkprefs.c:795
+#: src/gtkprefs.c:812
 msgid "Insertions"
 msgstr "插入選項"
 
-#: src/gtkprefs.c:796
+#: src/gtkprefs.c:813
 msgid "Control-{B/I/U} inserts _HTML tags"
 msgstr "按下 Ctrl-{B/I/U} 插入 HTML 標籤(_H)"
 
-#: src/gtkprefs.c:798
+#: src/gtkprefs.c:815
 msgid "Control-(number) _inserts smileys"
 msgstr "按下 Ctrl-(數字鍵) 插入表情(_I)"
 
-#: src/gtkprefs.c:814
+#: src/gtkprefs.c:831
 msgid "Buddy List Sorting"
 msgstr "好友清單排序"
 
-#: src/gtkprefs.c:823
-msgid "Sorting:"
+#: src/gtkprefs.c:840
+#, fuzzy
+msgid "_Sorting:"
 msgstr "自動排序方式:"
 
-#: src/gtkprefs.c:828
+#: src/gtkprefs.c:845
 msgid "Buddy List Toolbar"
 msgstr "好友清單工具列"
 
-#: src/gtkprefs.c:829 src/gtkprefs.c:960 src/gtkprefs.c:1011
+#: src/gtkprefs.c:846 src/gtkprefs.c:977 src/gtkprefs.c:1028
 msgid "Show _buttons as:"
 msgstr "顯示按鍵為(_B):"
 
-#: src/gtkprefs.c:831 src/gtkprefs.c:962 src/gtkprefs.c:1013
+#: src/gtkprefs.c:848 src/gtkprefs.c:979 src/gtkprefs.c:1030
 msgid "Pictures"
 msgstr "圖形"
 
-#: src/gtkprefs.c:832 src/gtkprefs.c:963 src/gtkprefs.c:1014
+#: src/gtkprefs.c:849 src/gtkprefs.c:980 src/gtkprefs.c:1031
 msgid "Text"
 msgstr "文字"
 
-#: src/gtkprefs.c:833 src/gtkprefs.c:964 src/gtkprefs.c:1015
+#: src/gtkprefs.c:850 src/gtkprefs.c:981 src/gtkprefs.c:1032
 msgid "Pictures and text"
 msgstr "圖形與文字"
 
-#: src/gtkprefs.c:838 src/gtkprefs.c:975 src/gtkprefs.c:1026
+#: src/gtkprefs.c:855 src/gtkprefs.c:992 src/gtkprefs.c:1043
 msgid "_Raise window on events"
 msgstr "當事件發生時,將視窗提到最上方(_R)"
 
-#: src/gtkprefs.c:841
+#: src/gtkprefs.c:858
 msgid "Group Display"
 msgstr "群組顯示"
 
-#: src/gtkprefs.c:842
+#: src/gtkprefs.c:859
 msgid "Show _numbers in groups"
 msgstr "顯示群組裡的好友/聊天室數目(_N)"
 
-#: src/gtkprefs.c:845
+#: src/gtkprefs.c:862
 msgid "Buddy Display"
 msgstr "好友顯示"
 
-#: src/gtkprefs.c:846 src/gtkprefs.c:982
+#: src/gtkprefs.c:863 src/gtkprefs.c:999
 msgid "Show buddy _icons"
 msgstr "顯示好友圖示(_I)"
 
-#: src/gtkprefs.c:848
+#: src/gtkprefs.c:865
 msgid "Show _warning levels"
 msgstr "顯示警告等級(_W)"
 
-#: src/gtkprefs.c:850
+#: src/gtkprefs.c:867
 msgid "Show idle _times"
 msgstr "顯示閒置時間(_T)"
 
-#: src/gtkprefs.c:852
+#: src/gtkprefs.c:869
 msgid "Dim i_dle buddies"
 msgstr "把閒置的好友設為灰色(_D)"
 
 # XXX 暫譯
-#: src/gtkprefs.c:854
+#: src/gtkprefs.c:871
 msgid "_Automatically expand contacts"
 msgstr "自動展開好友(_A)"
 
-#: src/gtkprefs.c:879
+#: src/gtkprefs.c:896
 msgid "_Placement:"
 msgstr "位置(_P):"
 
-#: src/gtkprefs.c:886
+#: src/gtkprefs.c:903
 msgid "Send _URLs as Links"
 msgstr "送出 URL 為超連結(_U)"
 
-#: src/gtkprefs.c:889
-msgid "Show Formatting Toolbar"
+#: src/gtkprefs.c:906
+#, fuzzy
+msgid "Show _Formatting Toolbar"
 msgstr "顯示格式工具列"
 
-#: src/gtkprefs.c:892
+#: src/gtkprefs.c:909
 msgid "Show a_liases in tabs/titles"
 msgstr "在標題和標籤上顯示別名(_L)"
 
-#: src/gtkprefs.c:895
+#: src/gtkprefs.c:912
 msgid "Tab Options"
 msgstr "標籤選項"
 
-#: src/gtkprefs.c:897
+#: src/gtkprefs.c:914
 msgid "_Tab Placement:"
 msgstr "標籤位置(_T):"
 
-#: src/gtkprefs.c:899
+#: src/gtkprefs.c:916
 msgid "Top"
 msgstr "視窗上方"
 
-#: src/gtkprefs.c:900
+#: src/gtkprefs.c:917
 msgid "Bottom"
 msgstr "視窗下方"
 
-#: src/gtkprefs.c:901
+#: src/gtkprefs.c:918
 msgid "Left"
 msgstr "視窗左側"
 
-#: src/gtkprefs.c:902
+#: src/gtkprefs.c:919
 msgid "Right"
 msgstr "視窗右側"
 
-#: src/gtkprefs.c:908
+#: src/gtkprefs.c:925
 msgid "Show IMs and chats in _tabbed windows"
 msgstr "使用標籤視窗顯示即時訊息和聊天(_T)"
 
-#: src/gtkprefs.c:911
+#: src/gtkprefs.c:928
 msgid "Show IMs and chats in _same tabbed window"
 msgstr "使用同一個標籤視窗顯示即時訊息和聊天(_S)"
 
-#: src/gtkprefs.c:921
+#: src/gtkprefs.c:938
 msgid "Show _close button on tabs"
 msgstr "在標籤上顯示關閉鍵(_C)"
 
-#: src/gtkprefs.c:932
+#: src/gtkprefs.c:949
 msgid "Show status _icons on tabs"
 msgstr "在標籤上顯示好友狀態(_I)"
 
-#: src/gtkprefs.c:959 src/gtkprefs.c:1010
+#: src/gtkprefs.c:976 src/gtkprefs.c:1027
 msgid "Window"
 msgstr "視窗"
 
-#: src/gtkprefs.c:969 src/gtkprefs.c:1020
+#: src/gtkprefs.c:986 src/gtkprefs.c:1037
 msgid "New window _width:"
 msgstr "新視窗寬度(_W):"
 
-#: src/gtkprefs.c:971 src/gtkprefs.c:1022
+#: src/gtkprefs.c:988 src/gtkprefs.c:1039
 msgid "New window _height:"
 msgstr "新視窗高度(_H):"
 
-#: src/gtkprefs.c:973 src/gtkprefs.c:1024
+#: src/gtkprefs.c:990 src/gtkprefs.c:1041
 msgid "_Entry field height:"
 msgstr "輸入欄高度(_E):"
 
-#: src/gtkprefs.c:977
+#: src/gtkprefs.c:994
 msgid "Hide window on _send"
 msgstr "送出訊息後關閉視窗(_S)"
 
-#: src/gtkprefs.c:981
+#: src/gtkprefs.c:998
 msgid "Buddy Icons"
 msgstr "好友圖示"
 
-#: src/gtkprefs.c:984
+#: src/gtkprefs.c:1001
 msgid "Enable buddy icon a_nimation"
 msgstr "啟動好友圖示動畫(_N)"
 
-#: src/gtkprefs.c:988
+#: src/gtkprefs.c:1005
 msgid "Show _logins in window"
 msgstr "在視窗中顯示登入訊息(_L)"
 
-#: src/gtkprefs.c:991
+#: src/gtkprefs.c:1008
 msgid "Typing Notification"
 msgstr "輸入通知"
 
-#: src/gtkprefs.c:992
+#: src/gtkprefs.c:1009
 msgid "Notify buddies that you are _typing to them"
 msgstr "通知您的好友您正在發訊息給他們(_T)"
 
-#: src/gtkprefs.c:1029
+#: src/gtkprefs.c:1046
 msgid "Tab Completion"
 msgstr "Tab Completion"
 
-#: src/gtkprefs.c:1030
+#: src/gtkprefs.c:1047
 msgid "_Tab-complete nicks"
 msgstr "使用 Tab 鍵幫助輸入暱稱(_T)"
 
-#: src/gtkprefs.c:1032
+#: src/gtkprefs.c:1049
 msgid "_Old-style tab completion"
 msgstr "舊式 Tab Completion (_O)"
 
-#: src/gtkprefs.c:1036
+#: src/gtkprefs.c:1053
 msgid "_Show people joining in window"
 msgstr "在視窗中顯示其他人進入的事件(_S)"
 
-#: src/gtkprefs.c:1038
+#: src/gtkprefs.c:1055
 msgid "_Show people leaving in window"
 msgstr "在視窗中顯示其他人離開的事件(_S)"
 
-#: src/gtkprefs.c:1040
-msgid "Co_lorize screennames"
+#: src/gtkprefs.c:1057
+#, fuzzy
+msgid "Co_lorize screen names"
 msgstr "將帳號以顏色區別(_L)"
 
-#: src/gtkprefs.c:1084
+#: src/gtkprefs.c:1078
+#, fuzzy
+msgid "IP Address"
+msgstr "地址"
+
+#: src/gtkprefs.c:1080
+#, fuzzy
+msgid "_Autodetect IP Address"
+msgstr "街道地址"
+
+#: src/gtkprefs.c:1089
+msgid "Public _IP:"
+msgstr ""
+
+#: src/gtkprefs.c:1113
+#, fuzzy
+msgid "Ports"
+msgstr "通訊埠"
+
+#: src/gtkprefs.c:1116
+msgid "_Manually specify range of ports to listen on"
+msgstr ""
+
+#: src/gtkprefs.c:1119
+#, fuzzy
+msgid "_Start Port:"
+msgstr "傳呼系統通訊埠:"
+
+#: src/gtkprefs.c:1126
+#, fuzzy
+msgid "_End Port:"
+msgstr "通訊埠(_P):"
+
+#: src/gtkprefs.c:1174
 msgid "Proxy Type"
 msgstr "代理伺服器型態"
 
 # NOTE 理由同前,不用「毋須」,改為「不使用」
-#: src/gtkprefs.c:1087
+#: src/gtkprefs.c:1177
 msgid "No proxy"
 msgstr "不使用代理伺服器"
 
-#: src/gtkprefs.c:1094
+#: src/gtkprefs.c:1184
 msgid "Proxy Server"
 msgstr "代理伺服器"
 
-#: src/gtkprefs.c:1150
+#: src/gtkprefs.c:1242
 msgid "_User:"
 msgstr "使用者(_U):"
 
-#: src/gtkprefs.c:1204
+#: src/gtkprefs.c:1298
 msgid "Opera"
 msgstr "Opera"
 
-#: src/gtkprefs.c:1205
+#: src/gtkprefs.c:1299
 msgid "Netscape"
 msgstr "Netscape"
 
-#: src/gtkprefs.c:1206
+#: src/gtkprefs.c:1300
 msgid "Mozilla"
 msgstr "Mozilla"
 
-#: src/gtkprefs.c:1207
+#: src/gtkprefs.c:1301
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: src/gtkprefs.c:1208
+#: src/gtkprefs.c:1302
 msgid "Galeon"
 msgstr "Galeon"
 
-#: src/gtkprefs.c:1209
+#: src/gtkprefs.c:1303
 msgid "Firebird"
 msgstr "Firebird"
 
-#: src/gtkprefs.c:1218
+#: src/gtkprefs.c:1304
+msgid "Firefox"
+msgstr ""
+
+#: src/gtkprefs.c:1305
+#, fuzzy
+msgid "Gnome Default"
+msgstr "使用預設值"
+
+#: src/gtkprefs.c:1314
 msgid "Manual"
 msgstr "使用者自定"
 
-#: src/gtkprefs.c:1259
+#: src/gtkprefs.c:1365
 msgid "Browser Selection"
 msgstr "選擇瀏覽器"
 
-#: src/gtkprefs.c:1263
+#: src/gtkprefs.c:1369
 msgid "_Browser:"
 msgstr "瀏覽器(_B):"
 
-#: src/gtkprefs.c:1273
+#: src/gtkprefs.c:1376
+#, fuzzy
+msgid "_Open link in:"
+msgstr "在瀏覽器中打開連結(_O)"
+
+#: src/gtkprefs.c:1378
+#, fuzzy
+msgid "Browser default"
+msgstr "無聊(預設)"
+
+#: src/gtkprefs.c:1379
+msgid "Existing window"
+msgstr ""
+
+#: src/gtkprefs.c:1381
+#, fuzzy
+msgid "New tab"
+msgstr "新訊息"
+
+#: src/gtkprefs.c:1395
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -3581,63 +3879,55 @@
 "使用者自定(_M):\n"
 "(請以 %s 代表網址)"
 
-#: src/gtkprefs.c:1294
-msgid "Browser Options"
-msgstr "瀏覽器選項"
-
-#: src/gtkprefs.c:1295
-msgid "Open new _window by default"
-msgstr "預設為彈出一個新的視窗(_W)"
-
-#: src/gtkprefs.c:1311
+#: src/gtkprefs.c:1428
 msgid "Message Logs"
 msgstr "訊息日誌"
 
-#: src/gtkprefs.c:1314
+#: src/gtkprefs.c:1431
 msgid "Log _Format:"
 msgstr "日誌格式(_F):"
 
-#: src/gtkprefs.c:1317
+#: src/gtkprefs.c:1434
 msgid "_Log all instant messages"
 msgstr "記錄所有即時訊息(_L)"
 
-#: src/gtkprefs.c:1319
+#: src/gtkprefs.c:1436
 msgid "Log all c_hats"
 msgstr "記錄所有聊天內容(_H)"
 
-#: src/gtkprefs.c:1374
+#: src/gtkprefs.c:1491
 msgid "Sound Options"
 msgstr "音效選項"
 
-#: src/gtkprefs.c:1375
+#: src/gtkprefs.c:1492
 msgid "_No sounds when you log in"
 msgstr "登入期間不啟動音效(_N)"
 
-#: src/gtkprefs.c:1377
+#: src/gtkprefs.c:1494
 msgid "_Sounds while away"
 msgstr "離開時仍發出音效(_S)"
 
-#: src/gtkprefs.c:1381
+#: src/gtkprefs.c:1498
 msgid "Sound Method"
 msgstr "音效播放方式"
 
-#: src/gtkprefs.c:1382
+#: src/gtkprefs.c:1499
 msgid "_Method:"
 msgstr "播放方式(_M):"
 
-#: src/gtkprefs.c:1384
+#: src/gtkprefs.c:1501
 msgid "Console beep"
 msgstr "嗶一聲"
 
-#: src/gtkprefs.c:1386
+#: src/gtkprefs.c:1503
 msgid "Automatic"
 msgstr "自動"
 
-#: src/gtkprefs.c:1393
+#: src/gtkprefs.c:1510
 msgid "Command"
 msgstr "指令"
 
-#: src/gtkprefs.c:1403
+#: src/gtkprefs.c:1520
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -3646,68 +3936,73 @@
 "音效指令(_C):\n"
 "(請以 %s 代表檔名)"
 
-#: src/gtkprefs.c:1458
+#: src/gtkprefs.c:1577
 msgid "_Sending messages removes away status"
 msgstr "送出訊息時取消離開狀態(_S)"
 
-#: src/gtkprefs.c:1460
+#: src/gtkprefs.c:1579
 msgid "_Queue new messages when away"
 msgstr "在離開時,將所有的新訊息置入佇列中(_Q)"
 
-#: src/gtkprefs.c:1463
+#: src/gtkprefs.c:1582
 msgid "Auto-response"
 msgstr "自動回應"
 
-#: src/gtkprefs.c:1466
+#: src/gtkprefs.c:1585
 msgid "Seconds before _resending:"
 msgstr "送出回覆前的等待秒數(_R):"
 
-#: src/gtkprefs.c:1469
+#: src/gtkprefs.c:1588
 msgid "_Send auto-response"
 msgstr "送出自動回應(_S)"
 
-#: src/gtkprefs.c:1471
+#: src/gtkprefs.c:1590
 msgid "_Only send auto-response when idle"
 msgstr "只在閒置的時候送出自動回應(_O)"
 
-#: src/gtkprefs.c:1473
+#: src/gtkprefs.c:1592
 msgid "Send auto-response in _active conversations"
 msgstr "目前進行的交談也要送出自動回應(_A)"
 
-#: src/gtkprefs.c:1483
+#: src/gtkprefs.c:1601 src/protocols/msn/state.c:30
+#: src/protocols/yahoo/yahoo.c:2291
+msgid "Idle"
+msgstr "閒置"
+
+#: src/gtkprefs.c:1602
 msgid "Idle _time reporting:"
 msgstr "閒置時間報告(_T):"
 
-#: src/gtkprefs.c:1486
+#: src/gtkprefs.c:1605
 msgid "Gaim usage"
 msgstr "Gaim 使用狀況"
 
-#: src/gtkprefs.c:1489
+#: src/gtkprefs.c:1608
 msgid "X usage"
 msgstr "X Window 使用狀況"
 
-#: src/gtkprefs.c:1491
+#: src/gtkprefs.c:1610
 msgid "Windows usage"
 msgstr "Windows 使用狀況"
 
-#: src/gtkprefs.c:1499
+#: src/gtkprefs.c:1618
 msgid "Auto-away"
 msgstr "自動離開"
 
-#: src/gtkprefs.c:1500
+#: src/gtkprefs.c:1619
 msgid "Set away _when idle"
 msgstr "閒置時自動設為離開(_W)"
 
 # NOTE 譯文更動 by Ambrose
-#: src/gtkprefs.c:1503
+#: src/gtkprefs.c:1623
 msgid "_Minutes before setting away:"
 msgstr "閒置多少分鐘設為離開(_M):"
 
-#: src/gtkprefs.c:1509
+#: src/gtkprefs.c:1631
 msgid "Away m_essage:"
 msgstr "離開訊息(_M):"
 
-#: src/gtkprefs.c:1571
+#: src/gtkprefs.c:1786
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -3722,7 +4017,7 @@
 "<span weight=\"bold\">網站:</span>\t\t%s\n"
 "<span weight=\"bold\">檔名:</span>\t%s"
 
-#: src/gtkprefs.c:1576
+#: src/gtkprefs.c:1791
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -3737,178 +4032,191 @@
 "<span weight=\"bold\">網站:</span>  %s\n"
 "<span weight=\"bold\">檔名:</span>  %s"
 
-#: src/gtkprefs.c:1758
+#: src/gtkprefs.c:1974
 msgid "Load"
 msgstr "載入"
 
-# NOTE 只能譯「名稱」,因為同時解作「人名」及「模組名稱」
-#: src/gtkprefs.c:1765 src/protocols/jabber/jabber.c:618
-#: src/protocols/msn/msn.c:1350 src/protocols/trepia/trepia.c:401
-msgid "Name"
-msgstr "名稱"
-
-#: src/gtkprefs.c:1812
+#: src/gtkprefs.c:1988
+msgid "Summary"
+msgstr ""
+
+#: src/gtkprefs.c:2036
 msgid "Details"
 msgstr "詳細資料"
 
-#: src/gtkprefs.c:1939
+#: src/gtkprefs.c:2163
 msgid "Sound Selection"
 msgstr "選取音效"
 
-#: src/gtkprefs.c:2046
+#: src/gtkprefs.c:2270
 msgid "Play"
 msgstr "播放"
 
-#: src/gtkprefs.c:2053
+#: src/gtkprefs.c:2277
 msgid "Event"
 msgstr "事件"
 
-#: src/gtkprefs.c:2076
+#: src/gtkprefs.c:2296
+msgid "Test"
+msgstr "測試"
+
+#: src/gtkprefs.c:2300
 msgid "Reset"
 msgstr "重置"
 
-#: src/gtkprefs.c:2080
+#: src/gtkprefs.c:2304
 msgid "Choose..."
 msgstr "選擇..."
 
-#: src/gtkprefs.c:2215
+#: src/gtkprefs.c:2439
 msgid "_Edit"
 msgstr "編輯(_E)"
 
-#: src/gtkprefs.c:2251
+#: src/gtkprefs.c:2475
 msgid "Interface"
 msgstr "介面"
 
-#: src/gtkprefs.c:2252
+#: src/gtkprefs.c:2476
 msgid "Smiley Themes"
 msgstr "表情主題"
 
-#: src/gtkprefs.c:2253
+#: src/gtkprefs.c:2477
 msgid "Fonts"
 msgstr "字型"
 
-#: src/gtkprefs.c:2254
+#: src/gtkprefs.c:2478
 msgid "Message Text"
 msgstr "訊息文字"
 
-#: src/gtkprefs.c:2255
+#: src/gtkprefs.c:2479
 msgid "Shortcuts"
 msgstr "快捷鍵"
 
-#: src/gtkprefs.c:2258
+#: src/gtkprefs.c:2482
 msgid "IMs"
 msgstr "即時訊息"
 
-#: src/gtkprefs.c:2260
+#: src/gtkprefs.c:2484
+#, fuzzy
+msgid "Network"
+msgstr "新訊息"
+
+#: src/gtkprefs.c:2485
 msgid "Proxy"
 msgstr "代理伺服器"
 
 #. We use the registered default browser in windows
-#: src/gtkprefs.c:2263
+#: src/gtkprefs.c:2488
 msgid "Browser"
 msgstr "瀏覽器"
 
-#: src/gtkprefs.c:2265
+#: src/gtkprefs.c:2490
 msgid "Logging"
 msgstr "日誌"
 
-#: src/gtkprefs.c:2266
+#: src/gtkprefs.c:2491
 msgid "Sounds"
 msgstr "音效"
 
-#: src/gtkprefs.c:2267
+#: src/gtkprefs.c:2492
 msgid "Sound Events"
 msgstr "事件音效"
 
-#: src/gtkprefs.c:2268
+#: src/gtkprefs.c:2493
 msgid "Away / Idle"
 msgstr "離開 / 閒置"
 
-#: src/gtkprefs.c:2269
+#: src/gtkprefs.c:2494
 msgid "Away Messages"
 msgstr "離開訊息"
 
-#: src/gtkprefs.c:2272
+#: src/gtkprefs.c:2496
+#, fuzzy
+msgid "Protocols"
+msgstr "通訊協定"
+
+#: src/gtkprefs.c:2512
 msgid "Plugins"
 msgstr "模組清單"
 
-#: src/gtkprivacy.c:86
+#: src/gtkprivacy.c:77
 msgid "Allow all users to contact me"
 msgstr "允許所有的使用者和我聯絡"
 
-#: src/gtkprivacy.c:87
+#: src/gtkprivacy.c:78
 msgid "Allow only the users on my buddy list"
 msgstr "只允許好友清單中的使用者"
 
-#: src/gtkprivacy.c:88
+#: src/gtkprivacy.c:79
 msgid "Allow only the users below"
 msgstr "允許下列的使用者和我聯絡"
 
-#: src/gtkprivacy.c:89
+#: src/gtkprivacy.c:80
 msgid "Block all users"
 msgstr "拒絕所有使用者"
 
-#: src/gtkprivacy.c:90
-msgid "Block the users below"
+#: src/gtkprivacy.c:81
+#, fuzzy
+msgid "Block only the users below"
 msgstr "拒絕以下的使用者"
 
-#: src/gtkprivacy.c:369
+#: src/gtkprivacy.c:360 src/protocols/jabber/jabber.c:1406
 msgid "Privacy"
 msgstr "隱私設定"
 
-#: src/gtkprivacy.c:384
+#: src/gtkprivacy.c:375
 msgid "Changes to privacy settings take effect immediately."
 msgstr "隱私設定將立刻生效。"
 
 #. "Set privacy for:" label
-#: src/gtkprivacy.c:396
+#: src/gtkprivacy.c:387
 msgid "Set privacy for:"
 msgstr "帳號:"
 
-#: src/gtkprivacy.c:563 src/gtkprivacy.c:579
+#: src/gtkprivacy.c:555 src/gtkprivacy.c:571
 msgid "Permit User"
 msgstr "許可使用者"
 
-#: src/gtkprivacy.c:564
+#: src/gtkprivacy.c:556
 msgid "Type a user you permit to contact you."
 msgstr "輸入您所許可聯絡您的使用者。"
 
-#: src/gtkprivacy.c:565
+#: src/gtkprivacy.c:557
 msgid "Please enter the name of the user you wish to be able to contact you."
 msgstr "請輸入您所許可聯絡您的使用者的名稱。"
 
-#: src/gtkprivacy.c:568 src/gtkprivacy.c:581
+#: src/gtkprivacy.c:560 src/gtkprivacy.c:573
 msgid "Permit"
 msgstr "許可"
 
-#: src/gtkprivacy.c:573
+#: src/gtkprivacy.c:565
 #, c-format
 msgid "Allow %s to contact you?"
 msgstr "許可 %s 聯絡您?"
 
-#: src/gtkprivacy.c:575
+#: src/gtkprivacy.c:567
 #, c-format
 msgid "Are you sure you wish to allow %s to contact you?"
 msgstr "您確定許可 %s 聯絡您嗎?"
 
-#: src/gtkprivacy.c:602 src/gtkprivacy.c:615
+#: src/gtkprivacy.c:594 src/gtkprivacy.c:607
 msgid "Block User"
 msgstr "拒絕使用者"
 
-#: src/gtkprivacy.c:603
+#: src/gtkprivacy.c:595
 msgid "Type a user to block."
 msgstr "輸入被拒絕的使用者。"
 
-#: src/gtkprivacy.c:604
+#: src/gtkprivacy.c:596
 msgid "Please enter the name of the user you wish to block."
 msgstr "請輸入被您拒絕的使用者的名稱。"
 
-#: src/gtkprivacy.c:611
+#: src/gtkprivacy.c:603
 #, c-format
 msgid "Block %s?"
 msgstr "拒絕 %s?"
 
-#: src/gtkprivacy.c:613
+#: src/gtkprivacy.c:605
 #, c-format
 msgid "Are you sure you want to block %s?"
 msgstr "您確定要拒絕 %s?"
@@ -3916,143 +4224,175 @@
 #. *
 #. * A wrapper for gaim_request_action() that uses Yes and No buttons.
 #.
-#: src/gtkrequest.c:188 src/protocols/gg/gg.c:660 src/request.h:1009
+#: src/gtkrequest.c:223 src/protocols/gg/gg.c:663 src/request.h:1228
 msgid "Yes"
 msgstr "是"
 
-#: src/gtkrequest.c:189 src/protocols/gg/gg.c:660 src/request.h:1009
+#: src/gtkrequest.c:224 src/protocols/gg/gg.c:663 src/request.h:1228
 msgid "No"
 msgstr "否"
 
-#: src/gtkrequest.c:192
+#: src/gtkrequest.c:227
 msgid "Apply"
 msgstr "套用"
 
-#: src/gtkrequest.c:193 src/protocols/msn/msn.c:247
+#: src/gtkrequest.c:228 src/protocols/msn/msn.c:248
 msgid "Close"
 msgstr "關閉"
 
-#: src/gtksound.c:61
+#: src/gtkroomlist.c:322
+#, fuzzy
+msgid ""
+"You are not currently signed on with any protocols that have the ability to "
+"list rooms."
+msgstr "您並未登入任何一個可供您加入聊天室的通訊協定。"
+
+#: src/gtkroomlist.c:335
+#, fuzzy
+msgid "Room List"
+msgstr "不在清單中"
+
+#. list button
+#: src/gtkroomlist.c:410
+msgid "_Get List"
+msgstr ""
+
+#: src/gtksound.c:62
 msgid "Buddy logs in"
 msgstr "好友登入"
 
-#: src/gtksound.c:62
+#: src/gtksound.c:63
 msgid "Buddy logs out"
 msgstr "好友登出"
 
-#: src/gtksound.c:63
-msgid "Message received"
-msgstr "收到訊息"
-
 #: src/gtksound.c:64
+msgid "Message received"
+msgstr "收到訊息"
+
+#: src/gtksound.c:65
 msgid "Message received begins conversation"
 msgstr "訊息收到,開始進行交談"
 
-#: src/gtksound.c:65
+#: src/gtksound.c:66
 msgid "Message sent"
 msgstr "訊息送出"
 
-#: src/gtksound.c:66
+#: src/gtksound.c:67
 msgid "Person enters chat"
 msgstr "有人進入聊天室"
 
-#: src/gtksound.c:67
+#: src/gtksound.c:68
 msgid "Person leaves chat"
 msgstr "有人離開聊天室"
 
-#: src/gtksound.c:68
+#: src/gtksound.c:69
 msgid "You talk in chat"
 msgstr "您在聊天室說話"
 
-#: src/gtksound.c:69
+#: src/gtksound.c:70
 msgid "Others talk in chat"
 msgstr "其他人進入聊天室"
 
-#: src/gtksound.c:72
+#: src/gtksound.c:73
 msgid "Someone says your name in chat"
 msgstr "有人在聊天室中提到您的名字"
 
-#: src/gtksound.c:156
+#: src/gtksound.c:157
 #, c-format
 msgid "Unable to play sound because the chosen file (%s) does not exist."
 msgstr "無法播放音效,因為所選取的檔案 (%s) 不存在。"
 
-#: src/gtksound.c:172
+#: src/gtksound.c:173
 msgid ""
 "Unable to play sound because the 'Command' sound method has been chosen, but "
 "no command has been set."
 msgstr "無法播放音效,因為選取了「指令」為播放模式,可是並沒有設定任何指令。"
 
-#: src/gtksound.c:184
+#: src/gtksound.c:185
 #, c-format
 msgid ""
 "Unable to play sound because the configured sound command could not be "
 "launched: %s"
 msgstr "無法播放音效,因為無法執行所設定的音效指令:%s"
 
-#: src/gtkutils.c:298
+#: src/gtkutils.c:297
 msgid "Can't save icon file to disk."
 msgstr "無法儲存圖示檔案磁碟上。"
 
-#: src/gtkutils.c:333
+#: src/gtkutils.c:332
 msgid "Save Icon"
 msgstr "儲存圖示"
 
-#: src/log.c:83
+#: src/log.c:88
 msgid "<b><font color=\"red\">The logger has no read function</font></b>"
 msgstr "<b><font color=\"red\">這個日誌模組沒有定義「讀取」函數</font></b>"
 
-#: src/log.c:408
+#: src/log.c:433
 msgid "XML"
 msgstr "XML"
 
-#: src/log.c:488
-#, c-format
-msgid "<font color=\"#16569E\">(%s) <b>%s <AUTO-REPLY>:</b></font> %s<br/>\n"
+#: src/log.c:514
+#, fuzzy, c-format
+msgid ""
+"<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
+"REPLY&gt;:</b></font> %s<br/>\n"
 msgstr "<font color=\"#16569E\">(%s) <b>%s <自動回應>:</b></font>%s<br/>\n"
 
-#: src/log.c:490
-#, c-format
-msgid "<font color=\"#A82F2F\">(%s) <b>%s <AUTO-REPLY>:</b></font> %s<br/>\n"
+#: src/log.c:516
+#, fuzzy, c-format
+msgid ""
+"<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
+"REPLY&gt;:</b></font> %s<br/>\n"
 msgstr "<font color=\"#A82F2F\">(%s) <b>%s <自動回應>:</b></font>%s<br/>\n"
 
 # XXX 暫譯
-#: src/log.c:534 src/log.c:669
+#: src/log.c:560 src/log.c:696
 msgid "<font color=\"red\"><b>Unable to find log path!</b></font>"
 msgstr "<font color=\"red\"><b>找不到日誌檔案!</b></font>"
 
-#: src/log.c:544 src/log.c:679
+#: src/log.c:570 src/log.c:706
 #, c-format
 msgid "<font color=\"red\"><b>Could not read file: %s</b></font>"
 msgstr "<font color=\"red\"><b>無法讀取檔案:%s</b></font>"
 
-#: src/log.c:548
+#: src/log.c:574
 msgid "HTML"
 msgstr "HTML"
 
-#: src/log.c:622
+#: src/log.c:649
 #, c-format
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <自動回應>:%s\n"
 
-#: src/log.c:683
+#: src/log.c:710
 msgid "Plain text"
 msgstr "純文字"
 
-#: src/main.c:149
-msgid "Please enter your login."
+#: src/main.c:157
+#, fuzzy
+msgid "Please create an account."
 msgstr "請您登入。"
 
-#: src/main.c:232
-msgid "<New User>"
-msgstr "<新使用者>"
-
-#: src/main.c:274
+#: src/main.c:239
 msgid "Login"
 msgstr "登入"
 
+#: src/main.c:257
+#, fuzzy
+msgid "<b>Screen Name:</b>"
+msgstr "帳號:"
+
+#: src/main.c:271
+#, fuzzy
+msgid "<b>Password:</b>"
+msgstr "密碼:"
+
+#: src/main.c:300
+msgid "Sign on"
+msgstr "登入"
+
 #. full help text
-#: src/main.c:553
+#: src/main.c:524
 #, c-format
 msgid ""
 "Gaim %s\n"
@@ -4086,37 +4426,37 @@
 "  -h, --help          顯示這個說明訊息並離開\n"
 
 #. short message
-#: src/main.c:568
+#: src/main.c:539
 #, c-format
 msgid "Gaim %s. Try `%s -h' for more information.\n"
 msgstr "Gaim %s。執行「%s -h」以獲得更進一步的資訊。\n"
 
-#: src/plugin.c:267
+#: src/plugin.c:269
 #, c-format
 msgid ""
 "The required plugin %s was not found. Please install this plugin and try "
 "again."
 msgstr "找不到需要的模組「%s」。請重新安裝這個模組之後重試。"
 
-#: src/plugin.c:272 src/plugin.c:300
+#: src/plugin.c:274 src/plugin.c:302
 msgid "Gaim was unable to load your plugin."
 msgstr "Gaim 無法讀入您所提供的模組。"
 
-#: src/plugin.c:296
+#: src/plugin.c:298
 #, c-format
 msgid "The required plugin %s was unable to load."
 msgstr "無法載入需要的模組「%s」。"
 
 # NOTE 勿依字面直譯,這樣的句子很奇怪
-#: src/prefs.c:111 src/status.c:270
+#: src/prefs.c:113 src/status.c:271
 msgid "Slightly less boring default"
 msgstr "無聊(預設)"
 
-#: src/protocols/gg/gg.c:49 src/protocols/jabber/jutil.c:110
-#: src/protocols/msn/msn.c:344 src/protocols/msn/state.c:27
+#: src/protocols/gg/gg.c:49 src/protocols/jabber/jutil.c:111
+#: src/protocols/msn/msn.c:345 src/protocols/msn/state.c:27
 #: src/protocols/msn/state.c:28 src/protocols/msn/state.c:35
-#: src/protocols/msn/state.c:36 src/protocols/yahoo/yahoo.c:2492
-#: src/protocols/yahoo/yahoo.c:2601
+#: src/protocols/msn/state.c:36 src/protocols/yahoo/yahoo.c:2594
+#: src/protocols/yahoo/yahoo.c:2703
 msgid "Available"
 msgstr "上線"
 
@@ -4128,11 +4468,12 @@
 msgid "Away for friends only"
 msgstr "離開(只有好友可以看到我)"
 
-#: src/protocols/gg/gg.c:53 src/protocols/jabber/jabber.c:968
-#: src/protocols/jabber/presence.c:91 src/protocols/oscar/oscar.c:2846
-#: src/protocols/oscar/oscar.c:4584 src/protocols/oscar/oscar.c:4611
-#: src/protocols/oscar/oscar.c:6151 src/protocols/yahoo/yahoo.c:2187
-#: src/protocols/yahoo/yahoo.c:2512 src/protocols/yahoo/yahoo.c:2611
+#: src/protocols/gg/gg.c:53 src/protocols/jabber/jabber.c:964
+#: src/protocols/jabber/presence.c:121 src/protocols/oscar/oscar.c:2943
+#: src/protocols/oscar/oscar.c:4668 src/protocols/oscar/oscar.c:4739
+#: src/protocols/oscar/oscar.c:4763 src/protocols/oscar/oscar.c:6415
+#: src/protocols/oscar/oscar.c:6419 src/protocols/yahoo/yahoo.c:2289
+#: src/protocols/yahoo/yahoo.c:2614 src/protocols/yahoo/yahoo.c:2713
 msgid "Invisible"
 msgstr "隱身"
 
@@ -4153,9 +4494,10 @@
 msgid "Unable to connect to server."
 msgstr "無法連線到伺服器。"
 
-#: src/protocols/gg/gg.c:142 src/protocols/jabber/auth.c:65
-#: src/protocols/jabber/auth.c:158 src/protocols/jabber/auth.c:317
-#: src/protocols/jabber/auth.c:417 src/protocols/jabber/auth.c:429
+#: src/protocols/gg/gg.c:142 src/protocols/jabber/auth.c:130
+#: src/protocols/jabber/auth.c:204 src/protocols/jabber/auth.c:354
+#: src/protocols/jabber/auth.c:452 src/protocols/jabber/auth.c:464
+#: src/protocols/jabber/jabber.c:103
 msgid "Invalid response from server."
 msgstr "無效的伺服器回應。"
 
@@ -4189,159 +4531,161 @@
 msgstr "無法讀取 Socket"
 
 #. we didn't successfully connect. tdt->toc_fd is valid here
-#: src/protocols/gg/gg.c:399 src/protocols/icq/gaim_icq.c:344
-#: src/protocols/msn/dispatch.c:208 src/protocols/msn/msn.c:492
-#: src/protocols/msn/notification.c:2165 src/protocols/napster/napster.c:463
+#: src/protocols/gg/gg.c:402 src/protocols/icq/gaim_icq.c:344
+#: src/protocols/msn/dispatch.c:208 src/protocols/msn/msn.c:496
+#: src/protocols/msn/notification.c:1789 src/protocols/napster/napster.c:463
 #: src/protocols/napster/napster.c:494 src/protocols/toc/toc.c:200
-#: src/protocols/yahoo/yahoo.c:1853 src/protocols/yahoo/yahoo.c:1884
-#: src/protocols/yahoo/yahoo.c:1949 src/protocols/yahoo/yahoo_filexfer.c:70
-#: src/protocols/yahoo/yahoo_filexfer.c:141
+#: src/protocols/yahoo/yahoo.c:1954 src/protocols/yahoo/yahoo.c:1985
+#: src/protocols/yahoo/yahoo.c:2048 src/protocols/yahoo/yahoo_filexfer.c:68
+#: src/protocols/yahoo/yahoo_filexfer.c:139
 msgid "Unable to connect."
 msgstr "無法連結。"
 
-#: src/protocols/gg/gg.c:415
-msgid "Reading data"
-msgstr "讀取資料中"
-
 #: src/protocols/gg/gg.c:418
+msgid "Reading data"
+msgstr "讀取資料中"
+
+#: src/protocols/gg/gg.c:421
 msgid "Balancer handshake"
 msgstr "和負載平衡器交談中"
 
-#: src/protocols/gg/gg.c:421
-msgid "Reading server key"
-msgstr "讀取 Server Key 中"
-
 #: src/protocols/gg/gg.c:424
+msgid "Reading server key"
+msgstr "讀取 Server Key 中"
+
+#: src/protocols/gg/gg.c:427
 msgid "Exchanging key hash"
 msgstr "交換密鑰中"
 
-#: src/protocols/gg/gg.c:434
+#: src/protocols/gg/gg.c:437
 msgid "Critical error in GG library\n"
 msgstr "在 GG Library 中的重大錯誤\n"
 
-#: src/protocols/gg/gg.c:452 src/protocols/gg/gg.c:543
+#: src/protocols/gg/gg.c:455 src/protocols/gg/gg.c:546
 #: src/protocols/toc/toc.c:176
 #, c-format
 msgid "Connect to %s failed"
 msgstr "連結到 %s 失敗"
 
-#: src/protocols/gg/gg.c:500
+#: src/protocols/gg/gg.c:503
 msgid "Unable to ping server"
 msgstr "無法取得伺服器回應"
 
 # XXX
-#: src/protocols/gg/gg.c:512
+#: src/protocols/gg/gg.c:515
 msgid "Send as message"
 msgstr "以訊息送出"
 
-#: src/protocols/gg/gg.c:517
+#: src/protocols/gg/gg.c:520
 msgid "Looking up GG server"
 msgstr "搜尋 GG 伺服器"
 
-#: src/protocols/gg/gg.c:520
+#: src/protocols/gg/gg.c:523
 msgid "Invalid Gadu-Gadu UIN specified"
 msgstr "給予了無效的 Gadu-Gadu UIN"
 
-#: src/protocols/gg/gg.c:567
+#: src/protocols/gg/gg.c:570
 msgid "You are trying to send a message to an invalid Gadu-Gadu UIN."
 msgstr "您試圖對無效的 Gadu-Gadu UIN 送出一個訊息。"
 
-#: src/protocols/gg/gg.c:629
+#: src/protocols/gg/gg.c:632
 msgid "Couldn't get search results"
 msgstr "無法取得搜尋結果"
 
-#: src/protocols/gg/gg.c:634
+#: src/protocols/gg/gg.c:637
 msgid "Gadu-Gadu Search Engine"
 msgstr "Gadu-Gadu 搜尋引擎"
 
-#: src/protocols/gg/gg.c:659
+#: src/protocols/gg/gg.c:662
 msgid "Active"
 msgstr "啟動"
 
-#: src/protocols/gg/gg.c:664 src/protocols/oscar/oscar.c:3962
+#: src/protocols/gg/gg.c:667 src/protocols/oscar/oscar.c:4106
 msgid "UIN"
 msgstr "帳號"
 
 #. First Name
-#: src/protocols/gg/gg.c:668 src/protocols/jabber/jabber.c:633
-#: src/protocols/oscar/oscar.c:3967 src/protocols/trepia/trepia.c:267
+#: src/protocols/gg/gg.c:671 src/protocols/jabber/jabber.c:605
+#: src/protocols/oscar/oscar.c:4111 src/protocols/trepia/trepia.c:267
 msgid "First Name"
 msgstr "名"
 
 #. Last Name
-#: src/protocols/gg/gg.c:673 src/protocols/jabber/jabber.c:638
-#: src/protocols/oscar/oscar.c:3970 src/protocols/trepia/trepia.c:274
+#: src/protocols/gg/gg.c:676 src/protocols/jabber/jabber.c:610
+#: src/protocols/oscar/oscar.c:4114 src/protocols/trepia/trepia.c:274
 msgid "Last Name"
 msgstr "姓"
 
-#: src/protocols/gg/gg.c:677 src/protocols/gg/gg.c:1388
-#: src/protocols/irc/msgs.c:183 src/protocols/oscar/oscar.c:3964
+#: src/protocols/gg/gg.c:680 src/protocols/gg/gg.c:1392
+#: src/protocols/irc/msgs.c:183 src/protocols/oscar/oscar.c:4108
 msgid "Nick"
 msgstr "暱稱"
 
-#: src/protocols/gg/gg.c:684 src/protocols/gg/gg.c:687
-msgid "Birth year"
+#: src/protocols/gg/gg.c:687 src/protocols/gg/gg.c:690
+#, fuzzy
+msgid "Birth Year"
 msgstr "出生年"
 
-#: src/protocols/gg/gg.c:693 src/protocols/gg/gg.c:695
-#: src/protocols/gg/gg.c:697
+#: src/protocols/gg/gg.c:696 src/protocols/gg/gg.c:698
+#: src/protocols/gg/gg.c:700
 msgid "Sex"
 msgstr "性別"
 
 #. City
-#: src/protocols/gg/gg.c:701 src/protocols/jabber/jabber.c:648
-#: src/protocols/oscar/oscar.c:4016 src/protocols/oscar/oscar.c:4032
+#: src/protocols/gg/gg.c:704 src/protocols/jabber/jabber.c:620
+#: src/protocols/oscar/oscar.c:4160 src/protocols/oscar/oscar.c:4176
 #: src/protocols/trepia/trepia.c:331 src/protocols/trepia/trepia.c:430
 msgid "City"
 msgstr "城市"
 
 #. res[0] == username
-#: src/protocols/gg/gg.c:722 src/protocols/msn/msn.c:1286
-#: src/protocols/msn/msn.c:1530 src/protocols/napster/napster.c:387
-#: src/protocols/oscar/oscar.c:2888 src/protocols/oscar/oscar.c:3203
-#: src/protocols/toc/toc.c:498 src/protocols/yahoo/yahoo.c:2785
-#: src/protocols/yahoo/yahoo.c:2807 src/protocols/yahoo/yahoo.c:2830
-#: src/protocols/yahoo/yahoo.c:2988 src/protocols/zephyr/zephyr.c:355
+#. show it to the user
+#: src/protocols/gg/gg.c:725 src/protocols/msn/msn.c:1303
+#: src/protocols/msn/msn.c:1547 src/protocols/napster/napster.c:387
+#: src/protocols/oscar/oscar.c:2985 src/protocols/oscar/oscar.c:3311
+#: src/protocols/toc/toc.c:498 src/protocols/yahoo/yahoo.c:2887
+#: src/protocols/yahoo/yahoo.c:2909 src/protocols/yahoo/yahoo.c:2932
+#: src/protocols/yahoo/yahoo.c:3090 src/protocols/zephyr/zephyr.c:536
 msgid "Buddy Information"
 msgstr "好友資訊"
 
-#: src/protocols/gg/gg.c:741
+#: src/protocols/gg/gg.c:744
 msgid "There is no Buddy List stored on the Gadu-Gadu server."
 msgstr "Gadu-Gadu 伺服器上並沒有儲存任何的好友清單。"
 
-#: src/protocols/gg/gg.c:749
+#: src/protocols/gg/gg.c:752
 msgid "Couldn't Import Buddy List from Server"
 msgstr "無法自伺服器上取得好友名單"
 
-#: src/protocols/gg/gg.c:812
+#: src/protocols/gg/gg.c:815
 msgid "Buddy List successfully transferred to Gadu-Gadu server"
 msgstr "成功的將好友清單傳送到 Gadu-Gadu 伺服器上"
 
-#: src/protocols/gg/gg.c:820
+#: src/protocols/gg/gg.c:823
 msgid "Couldn't transfer Buddy List to Gadu-Gadu server"
 msgstr "無法傳送好友清單到 Gadu-Gadu 伺服器上"
 
-#: src/protocols/gg/gg.c:828
+#: src/protocols/gg/gg.c:831
 msgid "Buddy List successfully deleted from Gadu-Gadu server"
 msgstr "成功的將好友清單自 Gadu-Gadu 伺服器上刪除"
 
-#: src/protocols/gg/gg.c:836
+#: src/protocols/gg/gg.c:839
 msgid "Couldn't delete Buddy List from Gadu-Gadu server"
 msgstr "無法刪除在 Gadu-Gadu 伺服器上的好友清單"
 
-#: src/protocols/gg/gg.c:844
+#: src/protocols/gg/gg.c:847
 msgid "Password changed successfully"
 msgstr "密碼修改成功"
 
-#: src/protocols/gg/gg.c:851
+#: src/protocols/gg/gg.c:854
 msgid "Password couldn't be changed"
 msgstr "密碼無法修改"
 
-#: src/protocols/gg/gg.c:968
+#: src/protocols/gg/gg.c:971
 msgid "Error communicating with Gadu-Gadu server"
 msgstr "和 Gadu-Gadu 伺服器溝通時發生錯誤"
 
-#: src/protocols/gg/gg.c:969
+#: src/protocols/gg/gg.c:972
 msgid ""
 "Gaim was unable to complete your request due to a problem communicating with "
 "the Gadu-Gadu HTTP server.  Please try again later."
@@ -4349,34 +4693,34 @@
 "因為和 Gadu-Gadu HTTP 伺服器溝通時發生問題,所以 Gaim 沒有辦法完成您所指定的"
 "工作。請待會兒重試。"
 
-#: src/protocols/gg/gg.c:997
+#: src/protocols/gg/gg.c:1000
 msgid "Unable to import Gadu-Gadu buddy list"
 msgstr "無法匯入 Gadu-Gadu 的好友清單"
 
-#: src/protocols/gg/gg.c:998
+#: src/protocols/gg/gg.c:1001
 msgid ""
 "Gaim was unable to connect to the Gadu-Gadu buddy list server.  Please try "
 "again later."
 msgstr "Gaim 無法連上 Gadu-Gadu 好友清單伺服器。請晚點再試一次。"
 
-#: src/protocols/gg/gg.c:1071
+#: src/protocols/gg/gg.c:1074
 msgid "Couldn't export buddy list"
 msgstr "無法匯出好友清單"
 
-#: src/protocols/gg/gg.c:1072 src/protocols/gg/gg.c:1095
+#: src/protocols/gg/gg.c:1075 src/protocols/gg/gg.c:1098
 msgid ""
 "Gaim was unable to connect to the buddy list server.  Please try again later."
 msgstr "Gaim 無法連上好友清單伺服器。請晚點再試一次。"
 
-#: src/protocols/gg/gg.c:1094
+#: src/protocols/gg/gg.c:1097
 msgid "Unable to delete Gadu-Gadu buddy list"
 msgstr "無法刪除 Gadu-Gadu 好友清單"
 
-#: src/protocols/gg/gg.c:1143
+#: src/protocols/gg/gg.c:1146
 msgid "Unable to access directory"
 msgstr "無法存取目錄"
 
-#: src/protocols/gg/gg.c:1144
+#: src/protocols/gg/gg.c:1147
 msgid ""
 "Gaim was unable to search the Directory because it was unable to connect to "
 "the directory server.  Please try again later."
@@ -4384,11 +4728,11 @@
 "因為 Gaim 沒有辦法連上名錄伺服器,所以無法搜尋名錄上的資料。請待會兒再試一"
 "次。"
 
-#: src/protocols/gg/gg.c:1177
+#: src/protocols/gg/gg.c:1180
 msgid "Unable to change Gadu-Gadu password"
 msgstr "無法修改 Gadu-Gadu 密碼"
 
-#: src/protocols/gg/gg.c:1178
+#: src/protocols/gg/gg.c:1181
 msgid ""
 "Gaim was unable to change your password due to an error connecting to the "
 "Gadu-Gadu server.  Please try again later."
@@ -4396,32 +4740,32 @@
 "因為 Gaim 沒有辦法連上 Gadu-Gadu 伺服器,所以無法修改您的密碼。請待會兒再試一"
 "次。"
 
-#: src/protocols/gg/gg.c:1195
+#: src/protocols/gg/gg.c:1198
 msgid "Directory Search"
 msgstr "名錄搜尋"
 
-#: src/protocols/gg/gg.c:1204 src/protocols/jabber/jabber.c:1080
+#: src/protocols/gg/gg.c:1207 src/protocols/jabber/jabber.c:1063
 #: src/protocols/toc/toc.c:1546
 msgid "Change Password"
 msgstr "修改密碼"
 
-#: src/protocols/gg/gg.c:1212
+#: src/protocols/gg/gg.c:1215
 msgid "Import Buddy List from Server"
 msgstr "自伺服器上匯入好友名單"
 
-#: src/protocols/gg/gg.c:1218
+#: src/protocols/gg/gg.c:1221
 msgid "Export Buddy List to Server"
 msgstr "匯出好友名單到伺服器上"
 
-#: src/protocols/gg/gg.c:1224
+#: src/protocols/gg/gg.c:1227
 msgid "Delete Buddy List from Server"
 msgstr "將伺服器上的好友名單刪除"
 
-#: src/protocols/gg/gg.c:1257
+#: src/protocols/gg/gg.c:1260
 msgid "Unable to access user profile."
 msgstr "無法讀取使用者簡介檔。"
 
-#: src/protocols/gg/gg.c:1258
+#: src/protocols/gg/gg.c:1261
 msgid ""
 "Gaim was unable to access this user's profile due to an error connecting to "
 "the directory server.  Please try again later."
@@ -4439,7 +4783,8 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/gg/gg.c:1369 src/protocols/gg/gg.c:1371
+#. *  description
+#: src/protocols/gg/gg.c:1373 src/protocols/gg/gg.c:1375
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr "Gadu-Gadu 協定模組"
 
@@ -4452,17 +4797,17 @@
 msgid "The user %s (%s%s%s%s%s) wants you to authorize them."
 msgstr "使用者 %s (%s%s%s%s%s) 要求您的認證。"
 
-#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:188
-#: src/protocols/msn/notification.c:957 src/protocols/msn/notification.c:1284
-#: src/protocols/msn/notification.c:1451 src/protocols/oscar/oscar.c:2618
-#: src/protocols/oscar/oscar.c:5142
+#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:224
+#: src/protocols/msn/notification.c:581 src/protocols/msn/notification.c:908
+#: src/protocols/msn/notification.c:1075 src/protocols/oscar/oscar.c:2715
+#: src/protocols/oscar/oscar.c:5374
 msgid "Authorize"
 msgstr "給予認證"
 
-#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:189
-#: src/protocols/msn/notification.c:958 src/protocols/msn/notification.c:1286
-#: src/protocols/msn/notification.c:1453 src/protocols/oscar/oscar.c:2620
-#: src/protocols/oscar/oscar.c:5143
+#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:225
+#: src/protocols/msn/notification.c:582 src/protocols/msn/notification.c:910
+#: src/protocols/msn/notification.c:1077 src/protocols/oscar/oscar.c:2717
+#: src/protocols/oscar/oscar.c:5375
 msgid "Deny"
 msgstr "拒絕"
 
@@ -4505,67 +4850,93 @@
 "<B>支援的 IRC 指令:</B><BR>AWAY JOIN ME MODE<BR>MSG NICK OPERWALL "
 "PING<BR>QUERY QUIT QUOTE UMODE<BR>WALLOPS WHOIS"
 
-#: src/protocols/irc/cmds.c:459 src/protocols/jabber/chat.c:544
+#: src/protocols/irc/cmds.c:466 src/protocols/jabber/chat.c:527
 #, c-format
 msgid "current topic is: %s"
 msgstr "現在的主題為:%s"
 
-#: src/protocols/irc/cmds.c:461 src/protocols/jabber/chat.c:546
+#: src/protocols/irc/cmds.c:468 src/protocols/jabber/chat.c:529
 msgid "No topic is set"
 msgstr "沒有設定主題"
 
+#: src/protocols/irc/dcc_send.c:272 src/protocols/yahoo/yahoo_filexfer.c:199
+#: src/protocols/yahoo/yahoo_filexfer.c:208
+#: src/protocols/yahoo/yahoo_filexfer.c:217
+msgid "File Transfer Aborted"
+msgstr "取消檔案傳輸"
+
+#: src/protocols/irc/dcc_send.c:273
+msgid "Gaim could not open a listening port."
+msgstr ""
+
 # XXX 暫譯
-#: src/protocols/irc/irc.c:72
+#: src/protocols/irc/irc.c:73
 msgid "Error displaying MOTD"
 msgstr "顯示是日訊息時發生了錯誤"
 
 # XXX 暫譯
-#: src/protocols/irc/irc.c:72
+#: src/protocols/irc/irc.c:73
 msgid "No MOTD available"
 msgstr "沒有是日訊息"
 
 # XXX 暫譯
-#: src/protocols/irc/irc.c:73
+#: src/protocols/irc/irc.c:74
 msgid "There is no MOTD associated with this connection."
 msgstr "這個連結沒有相關的是日訊息。"
 
 # XXX 暫譯
-#: src/protocols/irc/irc.c:76
+#: src/protocols/irc/irc.c:77
 #, c-format
 msgid "MOTD for %s"
 msgstr "%s 的是日訊息"
 
 # XXX 暫譯
-#: src/protocols/irc/irc.c:139
+#: src/protocols/irc/irc.c:140
 msgid "View MOTD"
 msgstr "顯示是日訊息 (MOTD)"
 
-#: src/protocols/irc/irc.c:158
+#: src/protocols/irc/irc.c:154 src/protocols/jabber/buddy.c:883
+#: src/protocols/oscar/oscar.c:3189 src/protocols/oscar/oscar.c:6515
+#: src/protocols/yahoo/yahoo.c:2452
+msgid "Send File"
+msgstr "傳送檔案"
+
+#: src/protocols/irc/irc.c:168
 msgid "_Channel:"
 msgstr "頻道(_C):"
 
-#: src/protocols/irc/irc.c:163 src/protocols/jabber/chat.c:59
+#: src/protocols/irc/irc.c:173 src/protocols/jabber/chat.c:59
 msgid "_Password:"
 msgstr "密碼(_P):"
 
-#: src/protocols/irc/irc.c:182
+#: src/protocols/irc/irc.c:192
 msgid "IRC nicks may not contain whitespace"
 msgstr "IRC 暱稱不可含有空白字元"
 
-#: src/protocols/irc/irc.c:201 src/protocols/toc/toc.c:228
+#: src/protocols/irc/irc.c:211 src/protocols/toc/toc.c:228
 #, c-format
 msgid "Signon: %s"
 msgstr "登入:%s"
 
-#: src/protocols/irc/irc.c:210
+#: src/protocols/irc/irc.c:220
 msgid "Couldn't create socket"
 msgstr "無法建立 Socket"
 
 # NOTE OSCAR 錯誤訊息應可參閱 http://aimdoc.sourceforge.net/OSCARdoc/,但在該站很難找東西
-#: src/protocols/irc/irc.c:359 src/protocols/trepia/trepia.c:972
+#: src/protocols/irc/irc.c:369 src/protocols/trepia/trepia.c:977
 msgid "Read error"
 msgstr "讀取錯誤"
 
+#: src/protocols/irc/irc.c:503 src/protocols/yahoo/yahoochat.c:1343
+#, fuzzy
+msgid "Users"
+msgstr "使用"
+
+#: src/protocols/irc/irc.c:506 src/protocols/yahoo/yahoochat.c:1352
+#, fuzzy
+msgid "Topic"
+msgstr "主題:"
+
 #. *< api_version
 #. *< type
 #. *< ui_requirement
@@ -4575,32 +4946,32 @@
 #. *< id
 #. *< name
 #. *< version
-#: src/protocols/irc/irc.c:533
+#: src/protocols/irc/irc.c:611
 msgid "IRC Protocol Plugin"
 msgstr "IRC 協定模組"
 
 #. *  summary
-#: src/protocols/irc/irc.c:534
+#: src/protocols/irc/irc.c:612
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "較好的 IRC 協定模組"
 
-#: src/protocols/irc/irc.c:551 src/protocols/irc/msgs.c:197
-#: src/protocols/jabber/jabber.c:1213 src/protocols/napster/napster.c:636
+#: src/protocols/irc/irc.c:629 src/protocols/irc/msgs.c:197
+#: src/protocols/jabber/jabber.c:1369 src/protocols/napster/napster.c:637
 msgid "Server"
 msgstr "伺服器"
 
-#: src/protocols/irc/irc.c:554 src/protocols/jabber/jabber.c:1228
-#: src/protocols/msn/msn.c:1661 src/protocols/napster/napster.c:641
-#: src/protocols/trepia/trepia.c:1344
+#: src/protocols/irc/irc.c:632 src/protocols/jabber/jabber.c:1390
+#: src/protocols/msn/msn.c:1680 src/protocols/napster/napster.c:642
+#: src/protocols/trepia/trepia.c:1350
 msgid "Port"
 msgstr "通訊埠"
 
-#: src/protocols/irc/irc.c:557
+#: src/protocols/irc/irc.c:635
 msgid "Encoding"
 msgstr "編碼"
 
-#: src/protocols/irc/irc.c:560 src/protocols/irc/msgs.c:191
-#: src/protocols/jabber/jabber.c:608
+#: src/protocols/irc/irc.c:638 src/protocols/irc/msgs.c:191
+#: src/protocols/jabber/jabber.c:580
 msgid "Username"
 msgstr "使用者"
 
@@ -4628,7 +4999,7 @@
 msgid " <i>(identified)</i>"
 msgstr " <i>(已驗證)</i>"
 
-#: src/protocols/irc/msgs.c:192 src/protocols/yahoo/yahoo.c:2888
+#: src/protocols/irc/msgs.c:192 src/protocols/yahoo/yahoo.c:2990
 msgid "Realname"
 msgstr "姓名"
 
@@ -4656,295 +5027,259 @@
 msgstr "%s 的好友資訊"
 
 # NOTE 新版的IRC prpl起動時不顯示這個;直譯「修改」沒有問題
-#: src/protocols/irc/msgs.c:247
+#: src/protocols/irc/msgs.c:277
 #, c-format
 msgid "%s has changed the topic to: %s"
 msgstr "%s 把聊天主題修改為:%s"
 
-#: src/protocols/irc/msgs.c:252
+#: src/protocols/irc/msgs.c:282
 #, c-format
 msgid "The topic for %s is: %s"
 msgstr "%s 的主題為:%s"
 
-#: src/protocols/irc/msgs.c:266
+#: src/protocols/irc/msgs.c:296
 #, c-format
 msgid "Unknown message '%s'"
 msgstr "不明的訊息「%s」"
 
-#: src/protocols/irc/msgs.c:267
+#: src/protocols/irc/msgs.c:297
 msgid "Unknown message"
 msgstr "不明的訊息"
 
-#: src/protocols/irc/msgs.c:267
+#: src/protocols/irc/msgs.c:297
 msgid "Gaim has sent a message the IRC server did not understand."
 msgstr "Gaim 傳送了一個 IRC 伺服器不明白的訊息。"
 
-#: src/protocols/irc/msgs.c:370
+#: src/protocols/irc/msgs.c:400
 msgid "No such channel"
 msgstr "沒有那個頻道"
 
 #. does this happen?
-#: src/protocols/irc/msgs.c:381
+#: src/protocols/irc/msgs.c:411
 msgid "no such channel"
 msgstr "沒有那個頻道"
 
-#: src/protocols/irc/msgs.c:384
+#: src/protocols/irc/msgs.c:414
 msgid "User is not logged in"
 msgstr "使用者沒有登入"
 
-#: src/protocols/irc/msgs.c:389
+#: src/protocols/irc/msgs.c:419
 msgid "No such nick or channel"
 msgstr "沒有那個暱稱或頻道"
 
-#: src/protocols/irc/msgs.c:409
+#: src/protocols/irc/msgs.c:439
 msgid "Could not send"
 msgstr "無法送出"
 
-#: src/protocols/irc/msgs.c:465
+#: src/protocols/irc/msgs.c:495
 #, c-format
 msgid "Joining %s requires an invitation."
 msgstr "只有被邀請者才可加入 %s。"
 
-#: src/protocols/irc/msgs.c:466
+#: src/protocols/irc/msgs.c:496
 msgid "Invitation only"
 msgstr "只限被邀請者"
 
-#: src/protocols/irc/msgs.c:562
+#: src/protocols/irc/msgs.c:592
 #, c-format
 msgid "You have been kicked by %s: (%s)"
 msgstr "您被 %s 踢出:(%s)"
 
-#: src/protocols/irc/msgs.c:570
+#: src/protocols/irc/msgs.c:597
 #, c-format
 msgid "Kicked by %s (%s)"
 msgstr "被 %s 踢出 (%s)"
 
-#: src/protocols/irc/msgs.c:591
+#: src/protocols/irc/msgs.c:618
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr "模式 (%s %s) 被 %s 設定"
 
-#: src/protocols/irc/msgs.c:670
+#: src/protocols/irc/msgs.c:697
 msgid "Could not change nick"
 msgstr "無法更改暱稱"
 
-#: src/protocols/irc/msgs.c:671
+#: src/protocols/irc/msgs.c:698
 msgid "Cannot change nick"
 msgstr "無法更改暱稱"
 
-#: src/protocols/irc/msgs.c:692
+#: src/protocols/irc/msgs.c:719
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr "您離開了頻道%s%s"
 
-#: src/protocols/irc/msgs.c:730
+#: src/protocols/irc/msgs.c:759
 msgid "Error: invalid PONG from server"
 msgstr "錯誤:來自伺服器的 PONG 無效"
 
-#: src/protocols/irc/msgs.c:732
+#: src/protocols/irc/msgs.c:761
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr "PING 回答──延遲:%lu秒"
 
-#: src/protocols/irc/msgs.c:802
+#: src/protocols/irc/msgs.c:836
 #, c-format
 msgid "Cannot join %s:"
 msgstr "無法加入 %s:"
 
-#: src/protocols/irc/msgs.c:803
+#: src/protocols/irc/msgs.c:837
 msgid "Cannot join channel"
 msgstr "無法加入頻道"
 
-#: src/protocols/irc/msgs.c:833
+#: src/protocols/irc/msgs.c:867
 #, c-format
 msgid "Wallops from %s"
 msgstr "來自 %s 的 Wallops"
 
-#: src/protocols/irc/parse.c:161
+#: src/protocols/irc/parse.c:166
 msgid ""
 "(There was an error converting this message.  Check the 'Encoding' option in "
 "the Account Editor)"
 msgstr "(為這個訊息轉換編碼時發生了錯誤。請檢查帳號清單中的「編碼」選項)"
 
-#: src/protocols/irc/parse.c:292
+#: src/protocols/irc/parse.c:297
 #, c-format
 msgid "Reply time from %s: %lu seconds"
 msgstr "%s 回答需時:%lu 秒"
 
-#: src/protocols/irc/parse.c:293
+#: src/protocols/irc/parse.c:298
 msgid "PONG"
 msgstr "PONG"
 
-#: src/protocols/irc/parse.c:293
+#: src/protocols/irc/parse.c:298
 msgid "CTCP PING reply"
 msgstr "CTCP PING 回答"
 
-#: src/protocols/irc/parse.c:392 src/protocols/oscar/oscar.c:534
+#: src/protocols/irc/parse.c:400 src/protocols/oscar/oscar.c:581
 #: src/protocols/toc/toc.c:218 src/protocols/toc/toc.c:625
 #: src/protocols/toc/toc.c:641 src/protocols/toc/toc.c:709
 msgid "Disconnected."
 msgstr "停止連線。"
 
-#: src/protocols/jabber/auth.c:52
+#: src/protocols/jabber/auth.c:51
 msgid "Server requires SSL for login"
 msgstr "登入這個伺服器需要使用 SSL"
 
-#: src/protocols/jabber/auth.c:106 src/protocols/jabber/auth.c:181
+#: src/protocols/jabber/auth.c:111
+msgid "Server requires plaintext authentication over an unencrypted stream"
+msgstr ""
+
+#: src/protocols/jabber/auth.c:160 src/protocols/jabber/auth.c:161
+#: src/protocols/jabber/auth.c:238 src/protocols/jabber/auth.c:239
+#, fuzzy
+msgid "Plaintext Authentication"
+msgstr "Yahoo! 認證失敗"
+
+#: src/protocols/jabber/auth.c:162 src/protocols/jabber/auth.c:240
+msgid ""
+"This server requires plaintext authentication over an unencrypted "
+"connection.  Allow this and continue authentication?"
+msgstr ""
+
+#: src/protocols/jabber/auth.c:170 src/protocols/jabber/auth.c:248
 msgid "Server does not use any supported authentication method"
 msgstr "伺服器並不提供任何一種被支援的認證方式"
 
-#: src/protocols/jabber/auth.c:170 src/protocols/jabber/jabber.c:462
-msgid "Unknown Error"
-msgstr "未知錯誤"
-
 # XXX 好像有些怪,譯文有待改進
-#: src/protocols/jabber/auth.c:338
+#: src/protocols/jabber/auth.c:375
 msgid "Invalid challenge from server"
 msgstr "伺服器送來了無效的驗證挑戰"
 
-#: src/protocols/jabber/auth.c:432
-msgid "Bad Protocol"
-msgstr "無效的協定"
-
-# NOTE Jabber 協定中 SASL Error 的一種,即 <encryption-required/>
-# NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
-#: src/protocols/jabber/auth.c:435
-msgid "Encryption Required"
-msgstr "必須加密才可使用給定的認證機制"
-
-#: src/protocols/jabber/auth.c:438
-msgid "Invalid authzid"
-msgstr "無效的 authzid"
-
-# XXX 要覆查譯文
-#: src/protocols/jabber/auth.c:441
-msgid "Invalid Mechanism"
-msgstr "機制無效"
-
-# FIXME 要覆查譯文,很可能譯錯了
-# NOTE Jabber 協定中 SASL Error 的一種,即 <invalid-realm/>
-# NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
-#: src/protocols/jabber/auth.c:443
-msgid "Invalid Realm"
-msgstr "領域無效"
-
-# XXX 要覆查譯文
-# NOTE Jabber 協定中 SASL Error 的一種,即 <mechanism-too-weak/>
-# NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
-#: src/protocols/jabber/auth.c:446
-msgid "Mechanism Too Weak"
-msgstr "認證機制太弱"
-
-#: src/protocols/jabber/auth.c:449 src/protocols/jabber/jabber.c:148
-#: src/protocols/jabber/jabber.c:903 src/protocols/jabber/jabber.c:953
-#: src/protocols/oscar/oscar.c:5553
-msgid "Not Authorized"
-msgstr "未認證"
-
-#: src/protocols/jabber/auth.c:452
-msgid "Temporary Authentication Failure"
-msgstr "認證暫時失敗"
-
-#: src/protocols/jabber/auth.c:454
-msgid "Authentication Failure"
-msgstr "認證失敗"
-
-#: src/protocols/jabber/buddy.c:245 src/protocols/jabber/buddy.c:603
+#: src/protocols/jabber/buddy.c:247 src/protocols/jabber/buddy.c:603
 msgid "Full Name"
 msgstr "全名"
 
-#: src/protocols/jabber/buddy.c:246 src/protocols/jabber/buddy.c:616
+#: src/protocols/jabber/buddy.c:248 src/protocols/jabber/buddy.c:616
 msgid "Family Name"
 msgstr "姓"
 
-#: src/protocols/jabber/buddy.c:247 src/protocols/jabber/buddy.c:620
+#: src/protocols/jabber/buddy.c:249 src/protocols/jabber/buddy.c:620
 msgid "Given Name"
 msgstr "名"
 
-#: src/protocols/jabber/buddy.c:248 src/protocols/jabber/buddy.c:635
-#: src/protocols/jabber/jabber.c:628 src/protocols/yahoo/yahoo.c:2884
+#: src/protocols/jabber/buddy.c:250 src/protocols/jabber/buddy.c:635
+#: src/protocols/jabber/jabber.c:600 src/protocols/yahoo/yahoo.c:2986
 msgid "Nickname"
 msgstr "暱稱"
 
-#: src/protocols/jabber/buddy.c:249 src/protocols/jabber/jabber.c:668
+#: src/protocols/jabber/buddy.c:251 src/protocols/jabber/jabber.c:640
 msgid "URL"
 msgstr "URL"
 
-#: src/protocols/jabber/buddy.c:250 src/protocols/jabber/buddy.c:663
+#: src/protocols/jabber/buddy.c:252 src/protocols/jabber/buddy.c:663
 msgid "Street Address"
 msgstr "街道地址"
 
-#: src/protocols/jabber/buddy.c:251 src/protocols/jabber/buddy.c:659
+#: src/protocols/jabber/buddy.c:253 src/protocols/jabber/buddy.c:659
 msgid "Extended Address"
 msgstr "地址(續)"
 
-#: src/protocols/jabber/buddy.c:252 src/protocols/jabber/buddy.c:667
+#: src/protocols/jabber/buddy.c:254 src/protocols/jabber/buddy.c:667
 msgid "Locality"
 msgstr "市/村"
 
-#: src/protocols/jabber/buddy.c:253 src/protocols/jabber/buddy.c:671
+#: src/protocols/jabber/buddy.c:255 src/protocols/jabber/buddy.c:671
 msgid "Region"
 msgstr "省/州"
 
-#: src/protocols/jabber/buddy.c:254 src/protocols/jabber/buddy.c:675
-#: src/protocols/jabber/jabber.c:658
+#: src/protocols/jabber/buddy.c:256 src/protocols/jabber/buddy.c:675
+#: src/protocols/jabber/jabber.c:630
 msgid "Postal Code"
 msgstr "郵遞區號"
 
 #. Country
-#: src/protocols/jabber/buddy.c:255 src/protocols/jabber/buddy.c:680
+#: src/protocols/jabber/buddy.c:257 src/protocols/jabber/buddy.c:680
 #: src/protocols/trepia/trepia.c:339 src/protocols/trepia/trepia.c:448
 msgid "Country"
 msgstr "國家"
 
-#: src/protocols/jabber/buddy.c:256 src/protocols/jabber/buddy.c:691
+#: src/protocols/jabber/buddy.c:258 src/protocols/jabber/buddy.c:691
 #: src/protocols/jabber/buddy.c:698
 msgid "Telephone"
 msgstr "電話"
 
-#: src/protocols/jabber/buddy.c:257 src/protocols/jabber/buddy.c:709
-#: src/protocols/jabber/buddy.c:717 src/protocols/yahoo/yahoo.c:2880
+#: src/protocols/jabber/buddy.c:259 src/protocols/jabber/buddy.c:709
+#: src/protocols/jabber/buddy.c:717 src/protocols/yahoo/yahoo.c:2982
 msgid "Email"
 msgstr "電子郵件"
 
-#: src/protocols/jabber/buddy.c:258 src/protocols/jabber/buddy.c:732
+#: src/protocols/jabber/buddy.c:260 src/protocols/jabber/buddy.c:732
 msgid "Organization Name"
 msgstr "所屬機構"
 
-#: src/protocols/jabber/buddy.c:259 src/protocols/jabber/buddy.c:736
+#: src/protocols/jabber/buddy.c:261 src/protocols/jabber/buddy.c:736
 msgid "Organization Unit"
 msgstr "所屬部門"
 
-#: src/protocols/jabber/buddy.c:260 src/protocols/jabber/buddy.c:742
+#: src/protocols/jabber/buddy.c:262 src/protocols/jabber/buddy.c:742
 msgid "Title"
 msgstr "職銜"
 
-#: src/protocols/jabber/buddy.c:261 src/protocols/jabber/buddy.c:745
+#: src/protocols/jabber/buddy.c:263 src/protocols/jabber/buddy.c:745
 msgid "Role"
 msgstr "職責"
 
-#: src/protocols/jabber/buddy.c:262 src/protocols/jabber/buddy.c:638
-#: src/protocols/oscar/oscar.c:3996
+#: src/protocols/jabber/buddy.c:264 src/protocols/jabber/buddy.c:638
+#: src/protocols/oscar/oscar.c:4140
 msgid "Birthday"
 msgstr "生日"
 
-#: src/protocols/jabber/buddy.c:506 src/protocols/jabber/buddy.c:507
+#: src/protocols/jabber/buddy.c:508 src/protocols/jabber/buddy.c:509
 msgid "Edit Jabber vCard"
 msgstr "編輯 Jabber vCard"
 
-#: src/protocols/jabber/buddy.c:508
+#: src/protocols/jabber/buddy.c:510
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable."
 msgstr "以下所有的欄位都是選擇性的。您只要輸入您想輸入您想填入的訊息即可。"
 
-#: src/protocols/jabber/buddy.c:551
+#: src/protocols/jabber/buddy.c:552
 msgid "Jabber ID"
 msgstr "Jabber 帳號"
 
-#: src/protocols/jabber/buddy.c:561 src/protocols/jabber/buddy.c:568
-#: src/protocols/jabber/buddy.c:579 src/protocols/jabber/jabber.c:940
-#: src/protocols/jabber/jabber.c:953
+#: src/protocols/jabber/buddy.c:562 src/protocols/jabber/buddy.c:569
+#: src/protocols/jabber/buddy.c:580 src/protocols/jabber/jabber.c:930
 msgid "Status"
 msgstr "狀態"
 
@@ -4953,7 +5288,7 @@
 # NOTE Jabber 協定的「Resource」一詞通常係指一種使用者自定的字串,
 # NOTE 用以表示在多處地方同時登入了的情形下,目前的實在位置
 # NOTE 見 http://www.jabber.org/user/userguide.html
-#: src/protocols/jabber/buddy.c:577 src/protocols/jabber/jabber.c:1216
+#: src/protocols/jabber/buddy.c:578 src/protocols/jabber/jabber.c:1372
 msgid "Resource"
 msgstr ""
 
@@ -4964,8 +5299,8 @@
 msgid "Middle Name"
 msgstr ""
 
-#: src/protocols/jabber/buddy.c:643 src/protocols/jabber/jabber.c:643
-#: src/protocols/oscar/oscar.c:4013 src/protocols/oscar/oscar.c:4029
+#: src/protocols/jabber/buddy.c:643 src/protocols/jabber/jabber.c:615
+#: src/protocols/oscar/oscar.c:4157 src/protocols/oscar/oscar.c:4173
 msgid "Address"
 msgstr "地址"
 
@@ -4985,33 +5320,33 @@
 msgid "Logo"
 msgstr ""
 
-#: src/protocols/jabber/buddy.c:775
+#: src/protocols/jabber/buddy.c:777
 msgid "Jabber Profile"
 msgstr "Jabber 個人資料"
 
-#: src/protocols/jabber/buddy.c:915
+#: src/protocols/jabber/buddy.c:893
 msgid "Un-hide From"
 msgstr "現身給"
 
-#: src/protocols/jabber/buddy.c:918
+#: src/protocols/jabber/buddy.c:896
 msgid "Temporarily Hide From"
 msgstr "暫時隱身於"
 
-#: src/protocols/jabber/buddy.c:926
+#: src/protocols/jabber/buddy.c:905
 msgid "Cancel Presence Notification"
 msgstr "取消出現通知"
 
-#: src/protocols/jabber/buddy.c:934
+#: src/protocols/jabber/buddy.c:913
 msgid "(Re-)Request authorization"
 msgstr "要求或重新要求認證"
 
 # NOTE Jabber協定的「Subscribe」一詞乃「加入好友名單」的意思
 # NOTE 見 http://www.jabber.org/user/userguide.html
-#: src/protocols/jabber/buddy.c:940
+#: src/protocols/jabber/buddy.c:919
 msgid "Unsubscribe"
 msgstr "從好友名單中移除"
 
-#: src/protocols/jabber/chat.c:40 src/protocols/yahoo/yahoochat.c:938
+#: src/protocols/jabber/chat.c:42 src/protocols/yahoo/yahoochat.c:965
 msgid "_Room:"
 msgstr "聊天室(_R):"
 
@@ -5023,79 +5358,435 @@
 msgid "_Handle:"
 msgstr "暱稱(_H):"
 
-#: src/protocols/jabber/chat.c:161
+#: src/protocols/jabber/chat.c:164
 #, c-format
 msgid "%s is not a valid room name"
 msgstr "%s 不是一個有效的聊天室名稱"
 
-#: src/protocols/jabber/chat.c:162
+#: src/protocols/jabber/chat.c:165
 msgid "Invalid Room Name"
 msgstr "聊天室名稱無效"
 
-#: src/protocols/jabber/chat.c:167
+#: src/protocols/jabber/chat.c:170
 #, c-format
 msgid "%s is not a valid server name"
 msgstr "%s 不是一個有效的伺服器名稱"
 
-#: src/protocols/jabber/chat.c:168 src/protocols/jabber/chat.c:169
+#: src/protocols/jabber/chat.c:171 src/protocols/jabber/chat.c:172
 msgid "Invalid Server Name"
 msgstr "伺服器名稱無效"
 
 # NOTE Arto Alakulju 發現「room handle」即是聊天室內使用者所用的暱稱而已
-#: src/protocols/jabber/chat.c:173
+#: src/protocols/jabber/chat.c:176
 #, c-format
 msgid "%s is not a valid room handle"
 msgstr "%s 不是一個有效的暱稱"
 
 # NOTE Arto Alakulju 發現「room handle」即是聊天室內使用者所用的暱稱而已
-#: src/protocols/jabber/chat.c:174 src/protocols/jabber/chat.c:175
+#: src/protocols/jabber/chat.c:177 src/protocols/jabber/chat.c:178
 msgid "Invalid Room Handle"
 msgstr "暱稱無效"
 
-#: src/protocols/jabber/chat.c:336 src/protocols/jabber/chat.c:489
-#: src/protocols/jabber/message.c:299
-#, c-format
-msgid " (Code %s)"
-msgstr " (代碼 %s)"
-
-#: src/protocols/jabber/chat.c:339
+#: src/protocols/jabber/chat.c:332
 msgid "Configuration error"
 msgstr "設定錯誤"
 
-#: src/protocols/jabber/chat.c:350 src/protocols/jabber/chat.c:503
+#: src/protocols/jabber/chat.c:341 src/protocols/jabber/chat.c:486
 msgid "Unable to configure"
 msgstr "無法設定"
 
-#: src/protocols/jabber/chat.c:364
+#: src/protocols/jabber/chat.c:357
 msgid "Room Configuration Error"
 msgstr "聊天室設定錯誤"
 
 # XXX 暫譯,譯文有問題,要改善
-#: src/protocols/jabber/chat.c:365
+#: src/protocols/jabber/chat.c:358
 msgid "This room is not capable of being configured"
 msgstr "這個聊天室不支援設定"
 
-#: src/protocols/jabber/chat.c:492
+#: src/protocols/jabber/chat.c:408 src/protocols/jabber/chat.c:477
 msgid "Registration error"
 msgstr "註冊錯誤"
 
 # XXX 暫譯
 # NOTE 據 faceprint (模組作者) 稱,MUC 是一種新的聊天室協定,
 # NOTE 較舊式的「Group Chat」有更多功能
-#: src/protocols/jabber/chat.c:573
+#: src/protocols/jabber/chat.c:556
 msgid "Nick changing not supported in non-MUC chatrooms"
 msgstr "在非 MUC 模式的聊天室內不支援修改暱稱"
 
+#: src/protocols/jabber/chat.c:599 src/protocols/jabber/chat.c:610
+#, fuzzy
+msgid "Roomlist Error"
+msgstr "聊天室設定錯誤"
+
+#: src/protocols/jabber/chat.c:600 src/protocols/jabber/chat.c:611
+#, fuzzy
+msgid "Error retreiving roomlist"
+msgstr "由伺服器讀取時發生錯誤"
+
+#: src/protocols/jabber/chat.c:651
+#, fuzzy
+msgid "Invalid Server"
+msgstr "伺服器名稱無效"
+
+# NOTE「會議室」是暫時的意譯。Yahoo! 好像沒有為「Conference」提供正式中譯名。
+#: src/protocols/jabber/chat.c:688
+#, fuzzy
+msgid "Enter a Conference Server"
+msgstr "開啟會議室"
+
+#: src/protocols/jabber/chat.c:689
+msgid "Select a conference server to query"
+msgstr ""
+
+#: src/protocols/jabber/chat.c:691
+msgid "Find Rooms"
+msgstr ""
+
 # XXX 譯文有待改進
-#: src/protocols/jabber/jabber.c:72
+#: src/protocols/jabber/jabber.c:73
 msgid "Error initializing session"
 msgstr "對工作階段進行初始化時發生了錯誤"
 
-#: src/protocols/jabber/jabber.c:123
+#: src/protocols/jabber/jabber.c:203 src/protocols/msn/httpmethod.c:255
+#: src/protocols/msn/msn.c:83 src/protocols/msn/msn.c:103
+#: src/protocols/msn/msn.c:161 src/protocols/msn/msn.c:261
+#: src/protocols/msn/msn.c:548 src/protocols/msn/msn.c:721
+#: src/protocols/msn/msn.c:744 src/protocols/msn/msn.c:776
+#: src/protocols/msn/msn.c:784 src/protocols/msn/msn.c:817
+#: src/protocols/msn/msn.c:825 src/protocols/msn/msn.c:839
+#: src/protocols/msn/msn.c:848 src/protocols/msn/msn.c:863
+#: src/protocols/msn/msn.c:873 src/protocols/msn/msn.c:895
+#: src/protocols/msn/msn.c:945 src/protocols/msn/msn.c:983
+#: src/protocols/msn/msn.c:1085 src/protocols/msn/msn.c:1118
+#: src/protocols/msn/msn.c:1139 src/protocols/msn/msn.c:1150
+#: src/protocols/msn/msn.c:1161 src/protocols/msn/msn.c:1185
+#: src/protocols/msn/msn.c:1197 src/protocols/msn/msn.c:1278
+#: src/protocols/msn/notification.c:147 src/protocols/msn/notification.c:175
+#: src/protocols/msn/notification.c:1304 src/protocols/msn/notification.c:1324
+#: src/protocols/msn/session.c:205 src/protocols/trepia/trepia.c:248
+#: src/protocols/trepia/trepia.c:749 src/protocols/trepia/trepia.c:1038
+#: src/protocols/trepia/trepia.c:1082 src/protocols/trepia/trepia.c:1181
+#: src/protocols/trepia/trepia.c:1237
+msgid "Write error"
+msgstr "寫入錯誤"
+
+#: src/protocols/jabber/jabber.c:241 src/protocols/jabber/jabber.c:261
+msgid "Read Error"
+msgstr "讀取錯誤"
+
+# NOTE Jabber 協定 Stream Error 的一種,即 <remote-connection-failed/>
+# NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
+#: src/protocols/jabber/jabber.c:316
+#, fuzzy
+msgid "Connection Failed"
+msgstr "無法連線至認證所需的遠端資源"
+
+#: src/protocols/jabber/jabber.c:319
+msgid "SSL Handshake Failed"
+msgstr "SSL 交談失敗"
+
+#: src/protocols/jabber/jabber.c:362 src/protocols/jabber/jabber.c:691
+msgid "Invalid Jabber ID"
+msgstr "Jabber 帳號無效"
+
+# XXX 暫譯
+#: src/protocols/jabber/jabber.c:390 src/protocols/jabber/jabber.c:718
+msgid "SSL support unavailable"
+msgstr "沒有 SSL 支援"
+
+#: src/protocols/jabber/jabber.c:400 src/protocols/jabber/jabber.c:728
+#: src/protocols/trepia/trepia.c:1121
+msgid "Unable to create socket"
+msgstr "無法建立 Socket"
+
+#: src/protocols/jabber/jabber.c:425
+#, c-format
+msgid "Registration of %s@%s successful"
+msgstr "成功註冊 %s@%s"
+
+#: src/protocols/jabber/jabber.c:427 src/protocols/jabber/jabber.c:428
+msgid "Registration Successful"
+msgstr "註冊成功"
+
+#: src/protocols/jabber/jabber.c:434 src/protocols/jabber/jabber.c:1183
+msgid "Unknown Error"
+msgstr "未知錯誤"
+
+#: src/protocols/jabber/jabber.c:436 src/protocols/jabber/jabber.c:437
+msgid "Registration Failed"
+msgstr "註冊失敗"
+
+#: src/protocols/jabber/jabber.c:548 src/protocols/jabber/jabber.c:549
+msgid "Already Registered"
+msgstr "已經註冊"
+
+#: src/protocols/jabber/jabber.c:584 src/protocols/jabber/jabber.c:1034
+msgid "Password"
+msgstr "密碼"
+
+#: src/protocols/jabber/jabber.c:595
+msgid "E-Mail"
+msgstr "電子郵件"
+
+#. State
+#: src/protocols/jabber/jabber.c:625 src/protocols/oscar/oscar.c:4163
+#: src/protocols/oscar/oscar.c:4179 src/protocols/trepia/trepia.c:335
+#: src/protocols/trepia/trepia.c:439
+msgid "State"
+msgstr "省/州"
+
+#: src/protocols/jabber/jabber.c:635
+msgid "Phone"
+msgstr "電話"
+
+#: src/protocols/jabber/jabber.c:645
+msgid "Date"
+msgstr "日期"
+
+#: src/protocols/jabber/jabber.c:653
+msgid "Please fill out the information below to register your new account."
+msgstr "為您的新帳戶註冊,請填寫下列資料:"
+
+#: src/protocols/jabber/jabber.c:656 src/protocols/jabber/jabber.c:657
+msgid "Register New Jabber Account"
+msgstr "註冊新的 Jabber 帳戶"
+
+#: src/protocols/jabber/jabber.c:774 src/protocols/msn/dispatch.c:212
+#: src/protocols/msn/msn.c:487 src/protocols/napster/napster.c:487
+#: src/protocols/oscar/oscar.c:750 src/protocols/trepia/trepia.c:1115
+#: src/protocols/yahoo/yahoo.c:2173
+msgid "Connecting"
+msgstr "連線中"
+
+#: src/protocols/jabber/jabber.c:778
+msgid "Initializing Stream"
+msgstr "串流初始中"
+
+#: src/protocols/jabber/jabber.c:784
+msgid "Authenticating"
+msgstr "認證中"
+
+#: src/protocols/jabber/jabber.c:793
+msgid "Re-initializing Stream"
+msgstr "串流重新初始中"
+
+#: src/protocols/jabber/jabber.c:873 src/protocols/jabber/jabber.c:1161
+#: src/protocols/jabber/jabber.c:1202 src/protocols/jabber/jabber.c:1235
+#: src/protocols/oscar/oscar.c:5800
+msgid "Not Authorized"
+msgstr "未認證"
+
+#: src/protocols/jabber/jabber.c:905
+#, fuzzy
+msgid "Both"
+msgstr "視窗下方"
+
+#: src/protocols/jabber/jabber.c:907
+msgid "From (To pending)"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:909
+#, fuzzy
+msgid "From"
+msgstr "我來自"
+
+#: src/protocols/jabber/jabber.c:912
+#, fuzzy
+msgid "To"
+msgstr "視窗上方"
+
+#: src/protocols/jabber/jabber.c:914
+msgid "None (To pending)"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:918
+#, fuzzy
+msgid "Subscription"
+msgstr "描述"
+
+#: src/protocols/jabber/jabber.c:938
+msgid "Error"
+msgstr "錯誤"
+
+#: src/protocols/jabber/jabber.c:959 src/protocols/jabber/jutil.c:102
+#: src/protocols/jabber/presence.c:61 src/protocols/jabber/presence.c:112
+msgid "Chatty"
+msgstr "想聊天"
+
+#: src/protocols/jabber/jabber.c:961 src/protocols/jabber/jutil.c:105
+#: src/protocols/jabber/presence.c:63 src/protocols/jabber/presence.c:117
+msgid "Extended Away"
+msgstr "長時間離開"
+
+#: src/protocols/jabber/jabber.c:962 src/protocols/jabber/jutil.c:108
+#: src/protocols/jabber/presence.c:65 src/protocols/jabber/presence.c:119
+#: src/protocols/oscar/oscar.c:2933 src/protocols/oscar/oscar.c:4751
+#: src/protocols/oscar/oscar.c:6411
+msgid "Do Not Disturb"
+msgstr "請勿打擾"
+
+#: src/protocols/jabber/jabber.c:979
+msgid "Password Changed"
+msgstr "密碼修改成功"
+
+#: src/protocols/jabber/jabber.c:980
+msgid "Your password has been changed."
+msgstr "成功修改了您的密碼。"
+
+#: src/protocols/jabber/jabber.c:984 src/protocols/jabber/jabber.c:985
+#, fuzzy
+msgid "Error changing password"
+msgstr "修改密碼期間出現了錯誤:%s"
+
+#: src/protocols/jabber/jabber.c:1039
+msgid "Password (again)"
+msgstr "舊密碼(再次確認)"
+
+#: src/protocols/jabber/jabber.c:1044 src/protocols/jabber/jabber.c:1045
+msgid "Change Jabber Password"
+msgstr "修改 Jabber 密碼"
+
+#: src/protocols/jabber/jabber.c:1045
+msgid "Please enter your new password"
+msgstr "請輸入您的新密碼"
+
+#: src/protocols/jabber/jabber.c:1056 src/protocols/toc/toc.c:1532
+msgid "Set User Info"
+msgstr "設定使用者資訊"
+
+#: src/protocols/jabber/jabber.c:1141
+msgid "Bad Request"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1143
+#, fuzzy
+msgid "Conflict"
+msgstr "連線"
+
+#: src/protocols/jabber/jabber.c:1145
+msgid "Feature Not Implemented"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1147
+#, fuzzy
+msgid "Forbidden"
+msgstr "隱藏"
+
+#: src/protocols/jabber/jabber.c:1149
+#, fuzzy
+msgid "Gone"
+msgstr "無"
+
+#: src/protocols/jabber/jabber.c:1151 src/protocols/jabber/jabber.c:1225
+msgid "Internal Server Error"
+msgstr "伺服器內部錯誤"
+
+#: src/protocols/jabber/jabber.c:1153
+msgid "Item Not Found"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1155
+#, fuzzy
+msgid "Malformed Jabber ID"
+msgstr "Jabber 帳號無效"
+
+#: src/protocols/jabber/jabber.c:1157
+#, fuzzy
+msgid "Not Acceptable"
+msgstr "長時間離開"
+
+#: src/protocols/jabber/jabber.c:1159
+#, fuzzy
+msgid "Not Allowed"
+msgstr "長時間離開"
+
+# NOTE Jabber 協定中 SASL Error 的一種,即 <encryption-required/>
+# NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
+#: src/protocols/jabber/jabber.c:1163
+#, fuzzy
+msgid "Payment Required"
+msgstr "必須加密才可使用給定的認證機制"
+
+#: src/protocols/jabber/jabber.c:1165
+#, fuzzy
+msgid "Recipient Unavailable"
+msgstr "伺服器不存在"
+
+#: src/protocols/jabber/jabber.c:1169
+#, fuzzy
+msgid "Registration Required"
+msgstr "註冊失敗"
+
+#: src/protocols/jabber/jabber.c:1171
+msgid "Remote Server Not Found"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1173
+msgid "Remote Server Timeout"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1175
+#, fuzzy
+msgid "Server Overloaded"
+msgstr "伺服器目前不提供服務"
+
+#: src/protocols/jabber/jabber.c:1177
+#, fuzzy
+msgid "Service Unavailable"
+msgstr "伺服器不存在"
+
+# NOTE Jabber 協定中 SASL Error 的一種,即 <encryption-required/>
+# NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
+#: src/protocols/jabber/jabber.c:1179
+#, fuzzy
+msgid "Subscription Required"
+msgstr "必須加密才可使用給定的認證機制"
+
+#: src/protocols/jabber/jabber.c:1181
+msgid "Unexpected Request"
+msgstr ""
+
+# NOTE 這是我們發出的認證要求被對方允許時顯示的
+#: src/protocols/jabber/jabber.c:1188
+#, fuzzy
+msgid "Authorization Aborted"
+msgstr "認證獲允"
+
+#: src/protocols/jabber/jabber.c:1190
+#, fuzzy
+msgid "Incorrect encoding in authorization"
+msgstr "收到認證"
+
+#: src/protocols/jabber/jabber.c:1193
+msgid "Invalid authzid"
+msgstr "無效的 authzid"
+
+# XXX 要覆查譯文
+#: src/protocols/jabber/jabber.c:1196
+#, fuzzy
+msgid "Invalid Authorization Mechanism"
+msgstr "機制無效"
+
+#: src/protocols/jabber/jabber.c:1199
+#, fuzzy
+msgid "Authorization mechanism too weak"
+msgstr "認證被拒"
+
+#: src/protocols/jabber/jabber.c:1204
+msgid "Temporary Authentication Failure"
+msgstr "認證暫時失敗"
+
+#: src/protocols/jabber/jabber.c:1206
+msgid "Authentication Failure"
+msgstr "認證失敗"
+
+#: src/protocols/jabber/jabber.c:1210
 msgid "Bad Format"
 msgstr "無效的格式"
 
-#: src/protocols/jabber/jabber.c:125
+#: src/protocols/jabber/jabber.c:1212
 msgid "Bad Namespace Prefix"
 msgstr "無效的 Namespace Prefix"
 
@@ -5105,293 +5796,118 @@
 # NOTE 見 http://www.jabber.org/user/userguide.html
 # NOTE Jabber 協定中 Stanza Error 的一種,即 <conflict/>
 # NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
-#: src/protocols/jabber/jabber.c:128
+#: src/protocols/jabber/jabber.c:1215
 msgid "Resource Conflict"
 msgstr "已經以指定的 Resource 在其他地方登入"
 
-#: src/protocols/jabber/jabber.c:130
+#: src/protocols/jabber/jabber.c:1217
 msgid "Connection Timeout"
 msgstr "連線已逾時"
 
 # NOTE Jabber 協定中 Stream Error 的一種,即 <host-gone/>
 # NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
-#: src/protocols/jabber/jabber.c:132
+#: src/protocols/jabber/jabber.c:1219
 msgid "Host Gone"
 msgstr "伺服器已不再支援所給定的伺服器名稱"
 
 # NOTE Jabber 協定中 Stream Error 的一種,即 <host-unknown/>
 # NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
-#: src/protocols/jabber/jabber.c:134
+#: src/protocols/jabber/jabber.c:1221
 msgid "Host Unknown"
 msgstr "不明的伺服器名稱"
 
-#: src/protocols/jabber/jabber.c:136
+#: src/protocols/jabber/jabber.c:1223
 msgid "Improper Addressing"
 msgstr "錯誤的定址"
 
-#: src/protocols/jabber/jabber.c:138
-msgid "Internal Server Error"
-msgstr "伺服器內部錯誤"
-
-#: src/protocols/jabber/jabber.c:140
+#: src/protocols/jabber/jabber.c:1227
 msgid "Invalid ID"
 msgstr "帳號無效"
 
 # FIXME 必須覆查譯文
-#: src/protocols/jabber/jabber.c:142
+#: src/protocols/jabber/jabber.c:1229
 msgid "Invalid Namespace"
 msgstr "命名空間無效"
 
-#: src/protocols/jabber/jabber.c:144
+#: src/protocols/jabber/jabber.c:1231
 msgid "Invalid XML"
 msgstr "無效的 XML"
 
 # XXX 這是暫譯,譯文有待改進
 # NOTE Jabber 協定中的「nonmatching-hosts」
 # NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
-#: src/protocols/jabber/jabber.c:146
+#: src/protocols/jabber/jabber.c:1233
 msgid "Non-matching Hosts"
 msgstr "主機名稱不相乎"
 
 # XXX 這是暫譯,譯文有待改進。不過好像真的有人這樣寫,大概沒有太大的問題
 # NOTE Jabber 協定 xmpp-core 中 Stream Error 的一種,即 <policy-violation/>
 # NOTE 見 http://www.jabber.org/ietf/draft-ietf-xmpp-core-19.html
-#: src/protocols/jabber/jabber.c:150
+#: src/protocols/jabber/jabber.c:1237
 msgid "Policy Violation"
 msgstr "違反了服務政策"
 
 # NOTE Jabber 協定 Stream Error 的一種,即 <remote-connection-failed/>
 # NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
-#: src/protocols/jabber/jabber.c:152
+#: src/protocols/jabber/jabber.c:1239
 msgid "Remote Connection Failed"
 msgstr "無法連線至認證所需的遠端資源"
 
 # NOTE Jabber 協定 Stream Error 的一種,即 <resource-constraint/>
 # NOTE 在這裏的 Resource 一詞與登入時使用者所用的 Resource 一詞意義並不相同
 # NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
-#: src/protocols/jabber/jabber.c:154
+#: src/protocols/jabber/jabber.c:1241
 msgid "Resource Constraint"
 msgstr "伺服器資源短缺"
 
 # NOTE Jabber 協定 xmpp-core 中 Stream Error 的一種,即 <restricted-xml/>
 # NOTE 見 http://www.jabber.org/ietf/draft-ietf-xmpp-core-18.html
-#: src/protocols/jabber/jabber.c:156
+#: src/protocols/jabber/jabber.c:1243
 msgid "Restricted XML"
 msgstr "XML 中存在有 Jabber 協定不容許的 XML 元素"
 
 # NOTE Jabber 協定中 Stream Error 的一種,即 <see-other-host/>
 # NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
-#: src/protocols/jabber/jabber.c:158
+#: src/protocols/jabber/jabber.c:1245
 msgid "See Other Host"
 msgstr "伺服器在認證期間要求了重新導向至另一伺服器"
 
 # NOTE Jabber 協定中 Stream Error 的一種,即 <system-shutdown/>
 # NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
-#: src/protocols/jabber/jabber.c:160
+#: src/protocols/jabber/jabber.c:1247
 msgid "System Shutdown"
 msgstr "伺服器目前在關機中"
 
 # NOTE 見 http://www.jabber.org/jeps/jep-0103.html
-#: src/protocols/jabber/jabber.c:162
+#: src/protocols/jabber/jabber.c:1249
 msgid "Undefined Condition"
 msgstr "傳送網址時發生了不明的錯誤"
 
 # NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-August/001431.html
-#: src/protocols/jabber/jabber.c:164
+#: src/protocols/jabber/jabber.c:1251
 msgid "Unsupported Encoding"
 msgstr "伺服器不支援給定的字元編碼"
 
 # NOTE Jabber 協定中 Stream Error 的一種,即 <unsupported-stanza-type/>
 # NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-March/000752.html
-#: src/protocols/jabber/jabber.c:166
+#: src/protocols/jabber/jabber.c:1253
 msgid "Unsupported Stanza Type"
 msgstr "伺服器不支援給定的段落類別 (Stanza Type)"
 
 # NOTE Jabber 協定中 Stream Error 的一種,即 <unsupported-version/>
 # NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-March/000752.html
-#: src/protocols/jabber/jabber.c:168
+#: src/protocols/jabber/jabber.c:1255
 msgid "Unsupported Version"
 msgstr "不支援給定的 XMPP 版本"
 
-#: src/protocols/jabber/jabber.c:170
+#: src/protocols/jabber/jabber.c:1257
 msgid "XML Not Well Formed"
 msgstr "XML 文件格式有問題"
 
-#: src/protocols/jabber/jabber.c:172
+#: src/protocols/jabber/jabber.c:1259
 msgid "Stream Error"
 msgstr "串流錯誤"
 
-#: src/protocols/jabber/jabber.c:237 src/protocols/msn/httpmethod.c:234
-#: src/protocols/msn/msn.c:82 src/protocols/msn/msn.c:102
-#: src/protocols/msn/msn.c:160 src/protocols/msn/msn.c:260
-#: src/protocols/msn/msn.c:538 src/protocols/msn/msn.c:709
-#: src/protocols/msn/msn.c:732 src/protocols/msn/msn.c:764
-#: src/protocols/msn/msn.c:772 src/protocols/msn/msn.c:805
-#: src/protocols/msn/msn.c:813 src/protocols/msn/msn.c:827
-#: src/protocols/msn/msn.c:836 src/protocols/msn/msn.c:851
-#: src/protocols/msn/msn.c:861 src/protocols/msn/msn.c:883
-#: src/protocols/msn/msn.c:933 src/protocols/msn/msn.c:971
-#: src/protocols/msn/msn.c:1069 src/protocols/msn/msn.c:1101
-#: src/protocols/msn/msn.c:1122 src/protocols/msn/msn.c:1133
-#: src/protocols/msn/msn.c:1144 src/protocols/msn/msn.c:1168
-#: src/protocols/msn/msn.c:1180 src/protocols/msn/msn.c:1261
-#: src/protocols/msn/notification.c:179 src/protocols/msn/notification.c:207
-#: src/protocols/msn/notification.c:1680 src/protocols/msn/notification.c:1700
-#: src/protocols/msn/session.c:208 src/protocols/trepia/trepia.c:248
-#: src/protocols/trepia/trepia.c:749 src/protocols/trepia/trepia.c:1033
-#: src/protocols/trepia/trepia.c:1077 src/protocols/trepia/trepia.c:1176
-#: src/protocols/trepia/trepia.c:1232
-msgid "Write error"
-msgstr "寫入錯誤"
-
-#: src/protocols/jabber/jabber.c:275 src/protocols/jabber/jabber.c:295
-msgid "Read Error"
-msgstr "讀取錯誤"
-
-#: src/protocols/jabber/jabber.c:349
-msgid "SSL Handshake Failed"
-msgstr "SSL 交談失敗"
-
-#: src/protocols/jabber/jabber.c:387 src/protocols/jabber/jabber.c:717
-msgid "Invalid Jabber ID"
-msgstr "Jabber 帳號無效"
-
-# XXX 暫譯
-#: src/protocols/jabber/jabber.c:415 src/protocols/jabber/jabber.c:744
-msgid "SSL support unavailable"
-msgstr "沒有 SSL 支援"
-
-#: src/protocols/jabber/jabber.c:425 src/protocols/jabber/jabber.c:754
-#: src/protocols/trepia/trepia.c:1116
-msgid "Unable to create socket"
-msgstr "無法建立 Socket"
-
-#: src/protocols/jabber/jabber.c:450
-#, c-format
-msgid "Registration of %s@%s successful"
-msgstr "成功註冊 %s@%s"
-
-#: src/protocols/jabber/jabber.c:452 src/protocols/jabber/jabber.c:453
-msgid "Registration Successful"
-msgstr "註冊成功"
-
-#: src/protocols/jabber/jabber.c:465
-#, c-format
-msgid "Registration of %s@%s failed: %s"
-msgstr "%s@%s 註冊失敗:%s"
-
-#: src/protocols/jabber/jabber.c:467 src/protocols/jabber/jabber.c:468
-msgid "Registration Failed"
-msgstr "註冊失敗"
-
-#: src/protocols/jabber/jabber.c:580 src/protocols/jabber/jabber.c:581
-msgid "Already Registered"
-msgstr "已經註冊"
-
-#: src/protocols/jabber/jabber.c:612 src/protocols/jabber/jabber.c:1050
-msgid "Password"
-msgstr "密碼"
-
-#: src/protocols/jabber/jabber.c:623
-msgid "E-Mail"
-msgstr "電子郵件"
-
-#. State
-#: src/protocols/jabber/jabber.c:653 src/protocols/oscar/oscar.c:4019
-#: src/protocols/oscar/oscar.c:4035 src/protocols/trepia/trepia.c:335
-#: src/protocols/trepia/trepia.c:439
-msgid "State"
-msgstr "省/州"
-
-#: src/protocols/jabber/jabber.c:663
-msgid "Phone"
-msgstr "電話"
-
-#: src/protocols/jabber/jabber.c:673
-msgid "Date"
-msgstr "日期"
-
-#: src/protocols/jabber/jabber.c:681
-msgid "Please fill out the information below to register your new account."
-msgstr "為您的新帳戶註冊,請填寫下列資料:"
-
-#: src/protocols/jabber/jabber.c:684 src/protocols/jabber/jabber.c:685
-msgid "Register New Jabber Account"
-msgstr "註冊新的 Jabber 帳戶"
-
-#: src/protocols/jabber/jabber.c:803 src/protocols/msn/dispatch.c:212
-#: src/protocols/msn/msn.c:483 src/protocols/napster/napster.c:487
-#: src/protocols/oscar/oscar.c:693 src/protocols/trepia/trepia.c:1110
-#: src/protocols/yahoo/yahoo.c:2073
-msgid "Connecting"
-msgstr "連線中"
-
-#: src/protocols/jabber/jabber.c:807
-msgid "Initializing Stream"
-msgstr "串流初始中"
-
-#: src/protocols/jabber/jabber.c:813
-msgid "Authenticating"
-msgstr "認證中"
-
-#: src/protocols/jabber/jabber.c:823
-msgid "Re-initializing Stream"
-msgstr "串流重新初始中"
-
-#: src/protocols/jabber/jabber.c:948 src/protocols/jabber/jabber.c:1001
-#: src/protocols/jabber/presence.c:293
-msgid "Error"
-msgstr "錯誤"
-
-#: src/protocols/jabber/jabber.c:964 src/protocols/jabber/jutil.c:101
-#: src/protocols/jabber/presence.c:82
-msgid "Chatty"
-msgstr "想聊天"
-
-#: src/protocols/jabber/jabber.c:966 src/protocols/jabber/jutil.c:104
-#: src/protocols/jabber/presence.c:87
-msgid "Extended Away"
-msgstr "長時間離開"
-
-#: src/protocols/jabber/jabber.c:967 src/protocols/jabber/jutil.c:107
-#: src/protocols/jabber/presence.c:89 src/protocols/oscar/oscar.c:2836
-#: src/protocols/oscar/oscar.c:4599 src/protocols/oscar/oscar.c:6147
-msgid "Do Not Disturb"
-msgstr "請勿打擾"
-
-#: src/protocols/jabber/jabber.c:983
-msgid "Password Changed"
-msgstr "密碼修改成功"
-
-#: src/protocols/jabber/jabber.c:984
-msgid "Your password has been changed."
-msgstr "成功修改了您的密碼。"
-
-#: src/protocols/jabber/jabber.c:994
-#, c-format
-msgid "Error changing password: %s"
-msgstr "修改密碼期間出現了錯誤:%s"
-
-#: src/protocols/jabber/jabber.c:998
-msgid "Unknown error occurred changing password"
-msgstr "修改密碼期間出現了不明的錯誤"
-
-#: src/protocols/jabber/jabber.c:1055
-msgid "Password (again)"
-msgstr "舊密碼(再次確認)"
-
-#: src/protocols/jabber/jabber.c:1060 src/protocols/jabber/jabber.c:1061
-msgid "Change Jabber Password"
-msgstr "修改 Jabber 密碼"
-
-#: src/protocols/jabber/jabber.c:1061
-msgid "Please enter your new password"
-msgstr "請輸入您的新密碼"
-
-#: src/protocols/jabber/jabber.c:1073 src/protocols/toc/toc.c:1532
-msgid "Set User Info"
-msgstr "設定使用者資訊"
-
 #. *< api_version
 #. *< type
 #. *< ui_requirement
@@ -5402,109 +5918,124 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/jabber/jabber.c:1193 src/protocols/jabber/jabber.c:1195
+#. *  description
+#: src/protocols/jabber/jabber.c:1348 src/protocols/jabber/jabber.c:1350
 msgid "Jabber Protocol Plugin"
 msgstr "Jabber 協定模組"
 
 # XXX 暫譯
-#: src/protocols/jabber/jabber.c:1219
+#: src/protocols/jabber/jabber.c:1375
 msgid "Use TLS if available"
 msgstr "TLS 可用則用"
 
-#: src/protocols/jabber/jabber.c:1224
+#: src/protocols/jabber/jabber.c:1380
 msgid "Force old SSL"
 msgstr "強迫使用舊式 SSL"
 
-#: src/protocols/jabber/jabber.c:1232
+#: src/protocols/jabber/jabber.c:1385
+msgid "Allow plaintext auth over unencrypted streams"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1394
 msgid "Connect server"
 msgstr "連結伺服器"
 
-#: src/protocols/jabber/message.c:125
+#: src/protocols/jabber/jabber.c:1411
+msgid "Hide Operating System"
+msgstr ""
+
+#: src/protocols/jabber/message.c:111
 #, c-format
 msgid "Message from %s"
 msgstr "由 %s 發出的訊息"
 
-#: src/protocols/jabber/message.c:187
+#: src/protocols/jabber/message.c:173
 #, c-format
 msgid "%s has set the topic to: %s"
 msgstr "%s 把聊天主題設定為:%s"
 
-#: src/protocols/jabber/message.c:189
+#: src/protocols/jabber/message.c:175
 #, c-format
 msgid "The topic is: %s"
 msgstr "主題:%s"
 
-#: src/protocols/jabber/message.c:236
+#: src/protocols/jabber/message.c:222
 #, c-format
 msgid "Message delivery to %s failed: %s"
 msgstr "無法傳送訊息到 %s:%s"
 
-#: src/protocols/jabber/message.c:239
+#: src/protocols/jabber/message.c:225
 msgid "Jabber Message Error"
 msgstr "Jabber 訊息錯誤"
 
-#: src/protocols/jabber/parser.c:129
+#: src/protocols/jabber/message.c:288
+#, c-format
+msgid " (Code %s)"
+msgstr " (代碼 %s)"
+
+#: src/protocols/jabber/parser.c:131
 msgid "XML Parse error"
 msgstr "XML 分析錯誤"
 
-#: src/protocols/jabber/presence.c:178
+#: src/protocols/jabber/presence.c:216
 msgid "Unknown Error in presence"
 msgstr "在確定好友的連線狀態時,發生了未知的錯誤"
 
-#: src/protocols/jabber/presence.c:183
+#: src/protocols/jabber/presence.c:219
 #, c-format
 msgid "The user %s wants to add you to their buddy list."
 msgstr "使用者 %s 想要將您加入他(她)的好友清單中。"
 
-#: src/protocols/jabber/presence.c:244 src/protocols/jabber/presence.c:245
+#: src/protocols/jabber/presence.c:272 src/protocols/jabber/presence.c:273
 msgid "Create New Room"
 msgstr "建立新聊天室"
 
-#: src/protocols/jabber/presence.c:246
+#: src/protocols/jabber/presence.c:274
 msgid ""
 "You are creating a new room.  Would you like to configure it, or accept the "
 "default settings?"
 msgstr "您正要建立一個新的聊天室,您要設定它,還是使用預設值?"
 
-#: src/protocols/jabber/presence.c:248
+#: src/protocols/jabber/presence.c:276
 msgid "Configure Room"
 msgstr "設定聊天室"
 
-#: src/protocols/jabber/presence.c:250
+#: src/protocols/jabber/presence.c:278
 msgid "Accept Defaults"
 msgstr "使用預設值"
 
-#: src/protocols/jabber/presence.c:283 src/protocols/oscar/oscar.c:2947
-msgid "Unknown error"
-msgstr "未知錯誤"
-
-#: src/protocols/jabber/presence.c:289
-msgid "Unable to join chat"
-msgstr "無法加入聊天室"
-
-#: src/protocols/jabber/si.c:233
-#, c-format
-msgid "Could not send %s to %s, protocol not supported."
-msgstr "無法傳送 %s 至 %s;協定不被支援。"
-
-#: src/protocols/jabber/si.c:234 src/protocols/jabber/si.c:235
+#: src/protocols/jabber/presence.c:298
+#, fuzzy, c-format
+msgid "Error in chat %s"
+msgstr "儲存影像錯誤:%s"
+
+#: src/protocols/jabber/presence.c:301
+#, fuzzy, c-format
+msgid "Error joining chat %s"
+msgstr "儲存影像錯誤:%s"
+
+#: src/protocols/jabber/si.c:579
+#, c-format
+msgid "Unable to send file to %s, user does not support file transfers"
+msgstr ""
+
+#: src/protocols/jabber/si.c:580 src/protocols/jabber/si.c:581
 msgid "File Send Failed"
 msgstr "傳送檔案失敗"
 
-#: src/protocols/msn/dispatch.c:42 src/protocols/msn/notification.c:278
-#: src/protocols/msn/notification.c:521
+#: src/protocols/msn/dispatch.c:42 src/protocols/msn/notification.c:246
 msgid "Unable to request USR\n"
 msgstr "無法取得 USR\n"
 
-#: src/protocols/msn/dispatch.c:59 src/protocols/msn/notification.c:295
+#: src/protocols/msn/dispatch.c:59 src/protocols/msn/notification.c:263
 msgid "Unable to login using MD5"
 msgstr "無法使用 MD5 登入"
 
-#: src/protocols/msn/dispatch.c:68 src/protocols/msn/notification.c:304
+#: src/protocols/msn/dispatch.c:68 src/protocols/msn/notification.c:272
 msgid "Unable to send USR"
 msgstr "無法送出 USR"
 
-#: src/protocols/msn/dispatch.c:73 src/protocols/msn/notification.c:309
+#: src/protocols/msn/dispatch.c:73 src/protocols/msn/notification.c:277
 msgid "Requesting to send password"
 msgstr "送出密碼中"
 
@@ -5512,15 +6043,15 @@
 msgid "Protocol version not supported"
 msgstr "不支援這個版本的通訊協定"
 
-#: src/protocols/msn/dispatch.c:117 src/protocols/msn/notification.c:792
+#: src/protocols/msn/dispatch.c:117 src/protocols/msn/notification.c:416
 msgid "Unable to request CVR\n"
 msgstr "無法取得 CVR\n"
 
-#: src/protocols/msn/dispatch.c:126 src/protocols/msn/notification.c:801
+#: src/protocols/msn/dispatch.c:126 src/protocols/msn/notification.c:425
 msgid "Unable to request INF\n"
 msgstr "無法取得 INF\n"
 
-#: src/protocols/msn/dispatch.c:147 src/protocols/msn/notification.c:1927
+#: src/protocols/msn/dispatch.c:147 src/protocols/msn/notification.c:1551
 msgid "Got invalid XFR"
 msgstr "取得無效的 XFR"
 
@@ -5532,16 +6063,16 @@
 msgid "Unable to parse message."
 msgstr "無法解析訊息。"
 
-#: src/protocols/msn/dispatch.c:232 src/protocols/msn/notification.c:897
-#: src/protocols/msn/notification.c:2187
+#: src/protocols/msn/dispatch.c:232 src/protocols/msn/notification.c:521
+#: src/protocols/msn/notification.c:1811
 msgid "Unable to write to server"
 msgstr "無法寫入到伺服器"
 
-#: src/protocols/msn/dispatch.c:236 src/protocols/msn/notification.c:2194
+#: src/protocols/msn/dispatch.c:236 src/protocols/msn/notification.c:1818
 msgid "Syncing with server"
 msgstr "與伺服器同步中"
 
-#: src/protocols/msn/dispatch.c:250 src/protocols/msn/notification.c:2208
+#: src/protocols/msn/dispatch.c:250 src/protocols/msn/notification.c:1832
 msgid "Error reading from server"
 msgstr "由伺服器讀取時發生錯誤"
 
@@ -5639,152 +6170,161 @@
 msgid "Too many hits to a FND"
 msgstr "FND 的結果有太多匹配"
 
-#: src/protocols/msn/error.c:107 src/protocols/oscar/oscar.c:182
+#: src/protocols/msn/error.c:107 src/protocols/oscar/oscar.c:185
 msgid "Not logged in"
 msgstr "尚未登入"
 
-# XXX 參閱上列網站 (www.hypothetic.org) 第500號錯誤
-# NOTE 譯文更動 by Ambrose
 #: src/protocols/msn/error.c:111
-msgid "Internal server error"
-msgstr "伺服器內部錯誤"
+#, fuzzy
+msgid "Service Temporarily Unavailable"
+msgstr "目錄服務暫時不存在。"
 
 #: src/protocols/msn/error.c:114
 msgid "Database server error"
 msgstr "資料庫錯誤"
 
 #: src/protocols/msn/error.c:117
-msgid "File operation error"
-msgstr "檔案操作錯誤"
+#, fuzzy
+msgid "Command disabled"
+msgstr "指令"
 
 #: src/protocols/msn/error.c:120
+msgid "File operation error"
+msgstr "檔案操作錯誤"
+
+#: src/protocols/msn/error.c:123
 msgid "Memory allocation error"
 msgstr "記憶體分配錯誤"
 
-#: src/protocols/msn/error.c:123
+#: src/protocols/msn/error.c:126
 msgid "Wrong CHL value sent to server"
 msgstr "錯誤的 CHL 值傳送到了伺服器"
 
-#: src/protocols/msn/error.c:127
+#: src/protocols/msn/error.c:130
 msgid "Server busy"
 msgstr "伺服器忙碌"
 
-#: src/protocols/msn/error.c:130 src/protocols/msn/error.c:143
-#: src/protocols/msn/error.c:198
+#: src/protocols/msn/error.c:133 src/protocols/msn/error.c:146
+#: src/protocols/msn/error.c:201
 msgid "Server unavailable"
 msgstr "伺服器目前不提供服務"
 
-#: src/protocols/msn/error.c:133
+#: src/protocols/msn/error.c:136
 msgid "Peer Notification server down"
 msgstr "點對點通知伺服器暫停服務"
 
-#: src/protocols/msn/error.c:136
+#: src/protocols/msn/error.c:139
 msgid "Database connect error"
 msgstr "資料庫連結錯誤"
 
-#: src/protocols/msn/error.c:140
+#: src/protocols/msn/error.c:143
 msgid "Server is going down (abandon ship)"
 msgstr "伺服器將暫停服務"
 
-#: src/protocols/msn/error.c:147
+#: src/protocols/msn/error.c:150
 msgid "Error creating connection"
 msgstr "連線開啟錯誤"
 
-#: src/protocols/msn/error.c:151
+#: src/protocols/msn/error.c:154
 msgid "CVR parameters are either unknown or not allowed"
 msgstr "CVR 參數是未知或是不允許的"
 
-#: src/protocols/msn/error.c:154 src/protocols/msn/notification.c:636
+#: src/protocols/msn/error.c:157 src/protocols/msn/notification.c:310
 msgid "Unable to write"
 msgstr "無法寫入"
 
-#: src/protocols/msn/error.c:157
+#: src/protocols/msn/error.c:160
 msgid "Session overload"
 msgstr "工作階段超載"
 
-#: src/protocols/msn/error.c:160
+#: src/protocols/msn/error.c:163
 msgid "User is too active"
 msgstr "使用者太過活躍"
 
-#: src/protocols/msn/error.c:163
+#: src/protocols/msn/error.c:166
 msgid "Too many sessions"
 msgstr "太多工作階段"
 
 # NOTE 參閱上列網站 (www.hypothetic.org) 第715號錯誤
-#: src/protocols/msn/error.c:166 src/protocols/msn/error.c:172
+#: src/protocols/msn/error.c:169 src/protocols/msn/error.c:175
 msgid "Not expected"
 msgstr "沒有預期的無效參數"
 
-#: src/protocols/msn/error.c:169
+#: src/protocols/msn/error.c:172
 msgid "Bad friend file"
 msgstr "好友檔案無效"
 
-#: src/protocols/msn/error.c:177
+#: src/protocols/msn/error.c:180
 msgid "Friendly name changes too rapidly"
 msgstr "暱稱的變更過於急速"
 
-#: src/protocols/msn/error.c:186
+#: src/protocols/msn/error.c:189
 msgid "Server too busy"
 msgstr "伺服器太忙碌"
 
-#: src/protocols/msn/error.c:190 src/protocols/oscar/oscar.c:1075
+#: src/protocols/msn/error.c:193 src/protocols/oscar/oscar.c:1163
 #: src/protocols/toc/toc.c:659
 msgid "Authentication failed"
 msgstr "認證失敗"
 
-#: src/protocols/msn/error.c:193
+#: src/protocols/msn/error.c:196
 msgid "Not allowed when offline"
 msgstr "在離線時不允許這個指令"
 
-#: src/protocols/msn/error.c:201
+#: src/protocols/msn/error.c:204
 msgid "Not accepting new users"
 msgstr "不接受新的使用者"
 
-#: src/protocols/msn/error.c:205
+#: src/protocols/msn/error.c:208
 msgid "Kids Passport without parental consent"
 msgstr "未經家長同意下使用兒童護照"
 
-#: src/protocols/msn/error.c:209
+#: src/protocols/msn/error.c:212
 msgid "Passport account not yet verified"
 msgstr "護照帳號尚未經過驗證"
 
-#: src/protocols/msn/error.c:213
+#: src/protocols/msn/error.c:215
+#, fuzzy
+msgid "Bad ticket"
+msgstr "好友跑馬燈"
+
+#: src/protocols/msn/error.c:219
 #, c-format
 msgid "Unknown Error Code %d"
 msgstr "未知的錯誤代碼 %d"
 
-#: src/protocols/msn/msn.c:70
+#: src/protocols/msn/msn.c:71
 msgid "Your new MSN friendly name is too long."
 msgstr "您的新 MSN 暱稱太長。"
 
-#: src/protocols/msn/msn.c:177
+#: src/protocols/msn/msn.c:178
 msgid "Set your friendly name."
 msgstr "設定您的暱稱。"
 
 # NOTE MSN的暱稱不像Yahoo;使用者可以輸入任何的新暱稱,
 # NOTE 即使和使用者的帳號毫無關係,似乎也是有效的
 # XXX 這看來是一個鈙述句,事實上是對使用者發出的請求/問題
-#: src/protocols/msn/msn.c:178
+#: src/protocols/msn/msn.c:179
 msgid "This is the name that other MSN buddies will see you as."
 msgstr "別人在 MSN 查閱您的個人資料時顯示這個暱稱。"
 
-#: src/protocols/msn/msn.c:190
+#: src/protocols/msn/msn.c:191
 msgid "Set your home phone number."
 msgstr "設定您的住家電話號碼。"
 
-#: src/protocols/msn/msn.c:201
+#: src/protocols/msn/msn.c:202
 msgid "Set your work phone number."
 msgstr "設定您的辦公室電話號碼。"
 
-#: src/protocols/msn/msn.c:212
+#: src/protocols/msn/msn.c:213
 msgid "Set your mobile phone number."
 msgstr "設定您的行動電話號碼。"
 
-#: src/protocols/msn/msn.c:221
+#: src/protocols/msn/msn.c:222
 msgid "Allow MSN Mobile pages?"
 msgstr "允許 MSN 傳呼?"
 
-#: src/protocols/msn/msn.c:222
+#: src/protocols/msn/msn.c:223
 msgid ""
 "Do you want to allow or disallow people on your buddy list to send you MSN "
 "Mobile pages to your cell phone or other mobile device?"
@@ -5792,96 +6332,96 @@
 "您是否允許在您好友清單中的好友傳送 Mobile Page 到您的行動電話,或是其他的行動"
 "裝置上呢?"
 
-#: src/protocols/msn/msn.c:226
+#: src/protocols/msn/msn.c:227
 msgid "Allow"
 msgstr "允許"
 
-#: src/protocols/msn/msn.c:227
+#: src/protocols/msn/msn.c:228
 msgid "Disallow"
 msgstr "不允許"
 
-#: src/protocols/msn/msn.c:244
+#: src/protocols/msn/msn.c:245
 msgid "Send a mobile message."
 msgstr "送出行動訊息。"
 
-#: src/protocols/msn/msn.c:246
+#: src/protocols/msn/msn.c:247
 msgid "Page"
 msgstr "傳呼"
 
-#: src/protocols/msn/msn.c:332 src/protocols/yahoo/yahoo.c:2301
+#: src/protocols/msn/msn.c:333 src/protocols/yahoo/yahoo.c:2403
 #, c-format
 msgid "<b>Status:</b> %s"
 msgstr "<b>狀態:</b>%s"
 
-#: src/protocols/msn/msn.c:345 src/protocols/msn/msn.c:628
+#: src/protocols/msn/msn.c:346 src/protocols/msn/msn.c:640
 #: src/protocols/msn/state.c:32
 msgid "Away From Computer"
 msgstr "不在電腦前"
 
-#: src/protocols/msn/msn.c:346 src/protocols/msn/msn.c:630
-#: src/protocols/msn/state.c:31 src/protocols/yahoo/yahoo.c:2169
-#: src/protocols/yahoo/yahoo.c:2494 src/protocols/yahoo/yahoo.c:2602
+#: src/protocols/msn/msn.c:347 src/protocols/msn/msn.c:642
+#: src/protocols/msn/state.c:31 src/protocols/yahoo/yahoo.c:2271
+#: src/protocols/yahoo/yahoo.c:2596 src/protocols/yahoo/yahoo.c:2704
 msgid "Be Right Back"
 msgstr "馬上回來"
 
-#: src/protocols/msn/msn.c:347 src/protocols/msn/msn.c:632
-#: src/protocols/msn/state.c:29 src/protocols/yahoo/yahoo.c:2171
-#: src/protocols/yahoo/yahoo.c:2496 src/protocols/yahoo/yahoo.c:2603
+#: src/protocols/msn/msn.c:348 src/protocols/msn/msn.c:644
+#: src/protocols/msn/state.c:29 src/protocols/yahoo/yahoo.c:2273
+#: src/protocols/yahoo/yahoo.c:2598 src/protocols/yahoo/yahoo.c:2705
 msgid "Busy"
 msgstr "忙碌"
 
-#: src/protocols/msn/msn.c:348 src/protocols/msn/msn.c:634
-#: src/protocols/msn/state.c:33 src/protocols/yahoo/yahoo.c:2179
-#: src/protocols/yahoo/yahoo.c:2504 src/protocols/yahoo/yahoo.c:2607
+#: src/protocols/msn/msn.c:349 src/protocols/msn/msn.c:646
+#: src/protocols/msn/state.c:33 src/protocols/yahoo/yahoo.c:2281
+#: src/protocols/yahoo/yahoo.c:2606 src/protocols/yahoo/yahoo.c:2709
 msgid "On The Phone"
 msgstr "電話中"
 
-#: src/protocols/msn/msn.c:349 src/protocols/msn/msn.c:636
-#: src/protocols/msn/state.c:34 src/protocols/yahoo/yahoo.c:2183
-#: src/protocols/yahoo/yahoo.c:2508 src/protocols/yahoo/yahoo.c:2609
+#: src/protocols/msn/msn.c:350 src/protocols/msn/msn.c:648
+#: src/protocols/msn/state.c:34 src/protocols/yahoo/yahoo.c:2285
+#: src/protocols/yahoo/yahoo.c:2610 src/protocols/yahoo/yahoo.c:2711
 msgid "Out To Lunch"
 msgstr "外出用餐"
 
-#: src/protocols/msn/msn.c:350 src/protocols/msn/msn.c:638
-#: src/protocols/zephyr/zephyr.c:883 src/protocols/zephyr/zephyr.c:898
+#: src/protocols/msn/msn.c:351 src/protocols/msn/msn.c:650
+#: src/protocols/zephyr/zephyr.c:1173 src/protocols/zephyr/zephyr.c:1188
 msgid "Hidden"
 msgstr "隱藏"
 
-#: src/protocols/msn/msn.c:362
+#: src/protocols/msn/msn.c:363
 msgid "Set Friendly Name"
 msgstr "設定暱稱"
 
-#: src/protocols/msn/msn.c:370
+#: src/protocols/msn/msn.c:371
 msgid "Set Home Phone Number"
 msgstr "設定住家電話號碼"
 
-#: src/protocols/msn/msn.c:376
+#: src/protocols/msn/msn.c:377
 msgid "Set Work Phone Number"
 msgstr "設定工作電話號碼"
 
-#: src/protocols/msn/msn.c:382
+#: src/protocols/msn/msn.c:383
 msgid "Set Mobile Phone Number"
 msgstr "設定行動電話號碼"
 
-#: src/protocols/msn/msn.c:391
+#: src/protocols/msn/msn.c:392
 msgid "Enable/Disable Mobile Devices"
 msgstr "開啟 / 關閉行動裝置"
 
-#: src/protocols/msn/msn.c:398
+#: src/protocols/msn/msn.c:399
 msgid "Allow/Disallow Mobile Pages"
 msgstr "允許 / 不允許 Mobile Page"
 
-#: src/protocols/msn/msn.c:424
+#: src/protocols/msn/msn.c:425
 msgid "Send to Mobile"
 msgstr "傳送至行動電話"
 
 # NOTE: 原譯文有誤
-#: src/protocols/msn/msn.c:433
+#: src/protocols/msn/msn.c:434
 msgid "Initiate Chat"
 msgstr "開啟聊天室"
 
 # XXX 暫譯
-#: src/protocols/msn/msn.c:457
+#: src/protocols/msn/msn.c:458
 msgid ""
 "SSL support is needed for MSN. Please install a supported SSL library. See "
 "http://gaim.sf.net/faq-ssl.php for more information."
@@ -5889,96 +6429,97 @@
 "MSN 需要 SSL 程式庫的支援,請安裝一個受支援的 SSL 程式庫。詳情請閱 http://"
 "gaim.sf.net/faq-ssl.php。"
 
-#: src/protocols/msn/msn.c:745
-#, c-format
-msgid ""
-"An MSN screenname must be in the form \"user@server.com\". Perhaps you meant "
-"%s@hotmail.com. No changes were made to your allow list."
+#: src/protocols/msn/msn.c:757
+#, fuzzy, c-format
+msgid ""
+"An MSN screen name must be in the form \"user@server.com\". Perhaps you "
+"meant %s@hotmail.com. No changes were made to your allow list."
 msgstr ""
 "MSN 的帳號必需為「user@server.com」的格式。或許您所指的是 %s@hotmail.com。目"
 "前將不會變更您的允許清單。"
 
-#: src/protocols/msn/msn.c:749 src/protocols/msn/msn.c:789
-msgid "Invalid MSN screenname"
+#: src/protocols/msn/msn.c:761 src/protocols/msn/msn.c:801
+#, fuzzy
+msgid "Invalid MSN screen name"
 msgstr "無效的 MSN 使用者帳號"
 
-#: src/protocols/msn/msn.c:785
-#, c-format
-msgid ""
-"An MSN screenname must be in the form \"user@server.com\". Perhaps you meant "
-"%s@hotmail.com. No changes were made to your block list."
+#: src/protocols/msn/msn.c:797
+#, fuzzy, c-format
+msgid ""
+"An MSN screen name must be in the form \"user@server.com\". Perhaps you "
+"meant %s@hotmail.com. No changes were made to your block list."
 msgstr ""
 "MSN 的帳號必需為「user@server.com」的格式。或許您所指的是 %s@hotmail.com。目"
 "前將不會變更您的拒絕清單。"
 
-#: src/protocols/msn/msn.c:1287 src/protocols/yahoo/yahoo.c:2786
+#: src/protocols/msn/msn.c:1304 src/protocols/yahoo/yahoo.c:2888
 msgid "<html><body><b>Error retrieving profile</b></body></html>"
 msgstr "<html><body><b>讀取個人資訊時發生錯誤</b></body></html>"
 
 #. Age
-#: src/protocols/msn/msn.c:1357 src/protocols/oscar/oscar.c:4001
+#: src/protocols/msn/msn.c:1374 src/protocols/oscar/oscar.c:4145
 #: src/protocols/trepia/trepia.c:285 src/protocols/trepia/trepia.c:413
-#: src/protocols/yahoo/yahoo.c:2896
+#: src/protocols/yahoo/yahoo.c:2998
 msgid "Age"
 msgstr "年齡"
 
 #. Gender
-#: src/protocols/msn/msn.c:1364 src/protocols/oscar/oscar.c:3987
+#: src/protocols/msn/msn.c:1381 src/protocols/oscar/oscar.c:4131
 #: src/protocols/trepia/trepia.c:279 src/protocols/trepia/trepia.c:421
-#: src/protocols/yahoo/yahoo.c:2904
+#: src/protocols/yahoo/yahoo.c:3006
 msgid "Gender"
 msgstr "性別"
 
-#: src/protocols/msn/msn.c:1372 src/protocols/yahoo/yahoo.c:2900
+#: src/protocols/msn/msn.c:1389 src/protocols/yahoo/yahoo.c:3002
 msgid "Marital Status"
 msgstr "婚姻狀況"
 
-#: src/protocols/msn/msn.c:1379 src/protocols/yahoo/yahoo.c:2892
+#: src/protocols/msn/msn.c:1396 src/protocols/yahoo/yahoo.c:2994
 msgid "Location"
 msgstr "所在位置"
 
-#: src/protocols/msn/msn.c:1387 src/protocols/yahoo/yahoo.c:2908
+#: src/protocols/msn/msn.c:1404 src/protocols/yahoo/yahoo.c:3010
 msgid "Occupation"
 msgstr "職業"
 
-#: src/protocols/msn/msn.c:1404 src/protocols/msn/msn.c:1410
-#: src/protocols/msn/msn.c:1417 src/protocols/msn/msn.c:1424
-#: src/protocols/msn/msn.c:1431
+#: src/protocols/msn/msn.c:1421 src/protocols/msn/msn.c:1427
+#: src/protocols/msn/msn.c:1434 src/protocols/msn/msn.c:1441
+#: src/protocols/msn/msn.c:1448
 msgid "A Little About Me"
 msgstr "自我簡介"
 
-#: src/protocols/msn/msn.c:1440 src/protocols/msn/msn.c:1453
-#: src/protocols/msn/msn.c:1460
+#: src/protocols/msn/msn.c:1457 src/protocols/msn/msn.c:1470
+#: src/protocols/msn/msn.c:1477
 msgid "Favorite Things"
 msgstr "喜愛事物"
 
-#: src/protocols/msn/msn.c:1469 src/protocols/msn/msn.c:1475
-#: src/protocols/msn/msn.c:1482
+#: src/protocols/msn/msn.c:1486 src/protocols/msn/msn.c:1492
+#: src/protocols/msn/msn.c:1499
 msgid "Hobbies and Interests"
 msgstr "嗜好/興趣"
 
-#: src/protocols/msn/msn.c:1491 src/protocols/msn/msn.c:1497
-#: src/protocols/yahoo/yahoo.c:2943
+#: src/protocols/msn/msn.c:1508 src/protocols/msn/msn.c:1514
+#: src/protocols/yahoo/yahoo.c:3045
 msgid "Favorite Quote"
 msgstr "至愛名言"
 
-#: src/protocols/msn/msn.c:1505 src/protocols/yahoo/yahoo.c:2979
+#: src/protocols/msn/msn.c:1522 src/protocols/yahoo/yahoo.c:3081
 msgid "Last Updated"
 msgstr "更新日期"
 
 #. Homepage
-#: src/protocols/msn/msn.c:1516 src/protocols/trepia/trepia.c:289
+#: src/protocols/msn/msn.c:1533 src/protocols/trepia/trepia.c:289
 #: src/protocols/trepia/trepia.c:457
 msgid "Homepage"
 msgstr "網頁"
 
 # NOTE 譯文更動 by Ambrose
-#: src/protocols/msn/msn.c:1538 src/protocols/yahoo/yahoo.c:2994
+#: src/protocols/msn/msn.c:1555 src/protocols/yahoo/yahoo.c:3096
 #, c-format
 msgid "User information for %s unavailable"
 msgstr "無法取得使用者 %s 的個人資訊"
 
-#: src/protocols/msn/msn.c:1540 src/protocols/yahoo/yahoo.c:2996
+#: src/protocols/msn/msn.c:1557 src/protocols/yahoo/yahoo.c:3098
 msgid "The user's profile is empty."
 msgstr "這個使用者的資訊是空白的。"
 
@@ -5992,93 +6533,90 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/msn/msn.c:1637 src/protocols/msn/msn.c:1639
+#. *  description
+#: src/protocols/msn/msn.c:1655 src/protocols/msn/msn.c:1657
 msgid "MSN Protocol Plugin"
 msgstr "MSN 協定模組"
 
-#: src/protocols/msn/msn.c:1656 src/protocols/trepia/trepia.c:1339
+#: src/protocols/msn/msn.c:1675 src/protocols/trepia/trepia.c:1345
 msgid "Login server"
 msgstr "登入伺服器"
 
-#: src/protocols/msn/msn.c:1666
+#: src/protocols/msn/msn.c:1684
 msgid "Use HTTP Method"
 msgstr "使用 HTTP 方式"
 
-#: src/protocols/msn/notification.c:247
+#: src/protocols/msn/msn.c:1702
+msgid "Display conversation closed notices"
+msgstr ""
+
+#: src/protocols/msn/msn.c:1707
+msgid "Display timeout notices"
+msgstr ""
+
+#: src/protocols/msn/nexus.c:56
+msgid "Unable to connect to server"
+msgstr "無法連線到伺服器"
+
+#: src/protocols/msn/nexus.c:121 src/protocols/msn/nexus.c:130
+msgid "Unable to write to MSN Nexus server."
+msgstr "無法寫入到 MSN 的 Nexus 伺服器。"
+
+#: src/protocols/msn/nexus.c:147
+msgid "MSN Nexus server returned invalid redirect information."
+msgstr "MSN Nexus 伺服器傳回無效的重新導向資訊。"
+
+#: src/protocols/msn/nexus.c:204
+msgid "Unknown error when attempting to authorize with MSN login server."
+msgstr "嘗試經由 MSN 的登入伺服器進行認證期間,發生了不明的錯誤。"
+
+#: src/protocols/msn/notification.c:215
 #, c-format
 msgid "MSN Error: %s\n"
 msgstr "MSN 錯誤:%s\n"
 
-#: src/protocols/msn/notification.c:322
-msgid "Unable to connect to server"
-msgstr "無法連線到伺服器"
-
-#: src/protocols/msn/notification.c:377 src/protocols/msn/notification.c:546
-msgid "Unable to write to MSN Nexus server."
-msgstr "無法寫入到 MSN 的 Nexus 伺服器。"
-
-#: src/protocols/msn/notification.c:386 src/protocols/msn/notification.c:561
-msgid "Unable to read from MSN Nexus server."
-msgstr "無法由 MSN 的 Nexus 伺服器讀取。"
-
-#: src/protocols/msn/notification.c:406
-msgid "MSN Nexus server returned invalid redirect information."
-msgstr "MSN Nexus 伺服器傳回無效的重新導向資訊。"
-
-#: src/protocols/msn/notification.c:460
-msgid "Unknown error when attempting to authorize with MSN login server."
-msgstr "嘗試經由 MSN 的登入伺服器進行認證期間,發生了不明的錯誤。"
-
-#: src/protocols/msn/notification.c:572
-msgid "MSN Nexus server returned invalid information."
-msgstr "MSN 的 Nexus 伺服器傳回了無效的資訊。"
-
-#: src/protocols/msn/notification.c:641 src/protocols/trepia/trepia.c:686
+#: src/protocols/msn/notification.c:315 src/protocols/trepia/trepia.c:686
 msgid "Retrieving buddy list"
 msgstr "讀取好友清單中"
 
-#: src/protocols/msn/notification.c:711
-msgid "Unable to connect to passport server"
-msgstr "無法連線到 Passport 伺服器。"
-
-#: src/protocols/msn/notification.c:716 src/protocols/msn/notification.c:748
-#: src/protocols/oscar/oscar.c:1361
+#: src/protocols/msn/notification.c:340 src/protocols/msn/notification.c:372
+#: src/protocols/oscar/oscar.c:1452
 msgid "Password sent"
 msgstr "密碼送出"
 
-#: src/protocols/msn/notification.c:743
+#: src/protocols/msn/notification.c:367
 msgid "Unable to send password"
 msgstr "無法送出密碼"
 
-#: src/protocols/msn/notification.c:779
+#: src/protocols/msn/notification.c:403
 msgid "Protocol not supported"
 msgstr "不支援這個通訊協定"
 
-#: src/protocols/msn/notification.c:821
+#: src/protocols/msn/notification.c:445
 msgid "You have been disconnected. You have signed on from another location."
 msgstr "您被中斷連線,因為您由其他的地方登入。"
 
-#: src/protocols/msn/notification.c:826
+#: src/protocols/msn/notification.c:450
 msgid "You have been disconnected. The MSN servers are going down temporarily."
 msgstr "您已中斷連線,MSN 伺服器將暫時關閉。"
 
-#: src/protocols/msn/notification.c:953
+#: src/protocols/msn/notification.c:577
 #, c-format
 msgid "The user %s (%s) wants to add %s to his or her buddy list."
 msgstr "使用者 %s(%s)想要將 %s 加入他(她)的好友清單。"
 
-#: src/protocols/msn/notification.c:1278 src/protocols/msn/notification.c:1445
+#: src/protocols/msn/notification.c:902 src/protocols/msn/notification.c:1069
 #, c-format
 msgid "The user %s (%s) wants to add you to their buddy list."
 msgstr "使用者 %s(%s)想要將您加入他(她)的好友清單"
 
-#: src/protocols/msn/notification.c:1972
+#: src/protocols/msn/notification.c:1596
 msgid "Unable to transfer to notification server"
 msgstr "無法傳送至通知伺服器"
 
 # NOTE "in %d minutes" 意為「在 %d 分鐘之內」的意思
 # NOTE 譯文更動 by Ambrose
-#: src/protocols/msn/notification.c:2128
+#: src/protocols/msn/notification.c:1752
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -6105,20 +6643,20 @@
 "\n"
 "當維護工作結束,您將可以再度登入。"
 
-#: src/protocols/msn/servconn.c:533
+#: src/protocols/msn/servconn.c:536
 msgid "Received HTTP error. Please report this."
 msgstr "收到一個 HTTP 錯誤;請向開發者報告。"
 
-#: src/protocols/msn/switchboard.c:147
+#: src/protocols/msn/switchboard.c:150
 msgid "The conversation has become inactive and timed out."
 msgstr "目前的交談閒置太久,並且已經逾時。"
 
-#: src/protocols/msn/switchboard.c:154
+#: src/protocols/msn/switchboard.c:159
 #, c-format
 msgid "%s has closed the conversation window."
 msgstr "%s 關閉了交談視窗。"
 
-#: src/protocols/msn/switchboard.c:277
+#: src/protocols/msn/switchboard.c:285
 msgid "An MSN message may not have been received."
 msgstr "有個 MSN 訊息可能沒被收到。"
 
@@ -6164,7 +6702,11 @@
 msgid "%s requested a PING"
 msgstr "%s 要求一個 PING"
 
-#: src/protocols/napster/napster.c:543 src/protocols/oscar/oscar.c:5213
+#: src/protocols/napster/napster.c:529
+msgid "Get Info"
+msgstr "取得資訊"
+
+#: src/protocols/napster/napster.c:543 src/protocols/oscar/oscar.c:5445
 #: src/protocols/toc/toc.c:1259
 msgid "_Group:"
 msgstr "群組(_G):"
@@ -6179,182 +6721,185 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/napster/napster.c:618 src/protocols/napster/napster.c:620
+#. *  description
+#: src/protocols/napster/napster.c:619 src/protocols/napster/napster.c:621
 msgid "NAPSTER Protocol Plugin"
 msgstr "NAPSTER 協定模組"
 
 # NOTE OSCAR 錯誤訊息應可參閱 http://aimdoc.sourceforge.net/OSCARdoc/,但在該站很難找東西
-#: src/protocols/oscar/oscar.c:178
+#: src/protocols/oscar/oscar.c:181
 msgid "Invalid error"
 msgstr "無效錯誤"
 
-#: src/protocols/oscar/oscar.c:179
+#: src/protocols/oscar/oscar.c:182
 msgid "Invalid SNAC"
 msgstr "無效的 SNAC"
 
-#: src/protocols/oscar/oscar.c:180
+#: src/protocols/oscar/oscar.c:183
 msgid "Rate to host"
 msgstr "到伺服器速率"
 
-#: src/protocols/oscar/oscar.c:181
+#: src/protocols/oscar/oscar.c:184
 msgid "Rate to client"
 msgstr "到客戶端速率"
 
-#: src/protocols/oscar/oscar.c:183
+#: src/protocols/oscar/oscar.c:186
 msgid "Service unavailable"
 msgstr "伺服器不存在"
 
-#: src/protocols/oscar/oscar.c:184
+#: src/protocols/oscar/oscar.c:187
 msgid "Service not defined"
 msgstr "沒有指定服務"
 
-#: src/protocols/oscar/oscar.c:185
+#: src/protocols/oscar/oscar.c:188
 msgid "Obsolete SNAC"
 msgstr "過時的 SNAC"
 
-#: src/protocols/oscar/oscar.c:186
+#: src/protocols/oscar/oscar.c:189
 msgid "Not supported by host"
 msgstr "伺服器不支援"
 
-#: src/protocols/oscar/oscar.c:187
+#: src/protocols/oscar/oscar.c:190
 msgid "Not supported by client"
 msgstr "客戶端不支援"
 
-#: src/protocols/oscar/oscar.c:188
+#: src/protocols/oscar/oscar.c:191
 msgid "Refused by client"
 msgstr "被客戶端拒絕"
 
-#: src/protocols/oscar/oscar.c:189
+#: src/protocols/oscar/oscar.c:192
 msgid "Reply too big"
 msgstr "回覆太大了"
 
-#: src/protocols/oscar/oscar.c:190
+#: src/protocols/oscar/oscar.c:193
 msgid "Responses lost"
 msgstr "遺失回應"
 
-#: src/protocols/oscar/oscar.c:191
+#: src/protocols/oscar/oscar.c:194
 msgid "Request denied"
 msgstr "要求被拒"
 
 # NOTE「Busted」與「SNAC payload」的說名由Luke Schierer在#gaim提供
 # NOTE 整句的意思其實係「您一次過傳送太多資訊了」
-#: src/protocols/oscar/oscar.c:192
+#: src/protocols/oscar/oscar.c:195
 msgid "Busted SNAC payload"
 msgstr "SNAC負載過大"
 
-#: src/protocols/oscar/oscar.c:193
+#: src/protocols/oscar/oscar.c:196
 msgid "Insufficient rights"
 msgstr "權限不夠"
 
 # NOTE Debian 譯「local」為「本地端」(Windows 舊譯「本地」,新譯「本機」)
-#: src/protocols/oscar/oscar.c:194
+#: src/protocols/oscar/oscar.c:197
 msgid "In local permit/deny"
 msgstr "本地端的允許/拒絕清單"
 
-#: src/protocols/oscar/oscar.c:195
+#: src/protocols/oscar/oscar.c:198
 msgid "Too evil (sender)"
 msgstr "太邪惡了(寄件人)"
 
-#: src/protocols/oscar/oscar.c:196
+#: src/protocols/oscar/oscar.c:199
 msgid "Too evil (receiver)"
 msgstr "太邪惡了(收件人)"
 
-#: src/protocols/oscar/oscar.c:197
+#: src/protocols/oscar/oscar.c:200
 msgid "User temporarily unavailable"
 msgstr "使用者暫時不在"
 
-#: src/protocols/oscar/oscar.c:198
+#: src/protocols/oscar/oscar.c:201
 msgid "No match"
 msgstr "沒有相符合的"
 
-#: src/protocols/oscar/oscar.c:199
+#: src/protocols/oscar/oscar.c:202
 msgid "List overflow"
 msgstr "清單溢出"
 
-#: src/protocols/oscar/oscar.c:200
+#: src/protocols/oscar/oscar.c:203
 msgid "Request ambiguous"
 msgstr "要求不明確"
 
-#: src/protocols/oscar/oscar.c:201
+#: src/protocols/oscar/oscar.c:204
 msgid "Queue full"
 msgstr "佇列滿了"
 
-#: src/protocols/oscar/oscar.c:202
+#: src/protocols/oscar/oscar.c:205
 msgid "Not while on AOL"
 msgstr "在 AOL 時不允許"
 
-#: src/protocols/oscar/oscar.c:474
+#: src/protocols/oscar/oscar.c:520
 #, c-format
 msgid "Direct IM with %s closed"
 msgstr "和 %s 的即時訊息關閉"
 
-#: src/protocols/oscar/oscar.c:476
+#: src/protocols/oscar/oscar.c:522
 #, c-format
 msgid "Direct IM with %s failed"
 msgstr "和 %s 的即時訊息失敗"
 
-#: src/protocols/oscar/oscar.c:546 src/protocols/toc/toc.c:885
+#: src/protocols/oscar/oscar.c:593 src/protocols/toc/toc.c:885
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "您已經由聊天室 %s 停止連線。"
 
-#: src/protocols/oscar/oscar.c:562
+#: src/protocols/oscar/oscar.c:609
 msgid "Chat is currently unavailable"
 msgstr "目前無法使用聊天室"
 
-#: src/protocols/oscar/oscar.c:633 src/protocols/oscar/oscar.c:689
+#: src/protocols/oscar/oscar.c:680 src/protocols/oscar/oscar.c:746
 msgid "Couldn't connect to host"
 msgstr "無法連到伺服器"
 
-#: src/protocols/oscar/oscar.c:643
+#: src/protocols/oscar/oscar.c:690
 msgid "Screen name sent"
 msgstr "送出帳號"
 
-#: src/protocols/oscar/oscar.c:677
+#: src/protocols/oscar/oscar.c:705
+#, c-format
+msgid ""
+"Unable to login: Could not sign on as %s because the screen name is "
+"invalid.  Screen names must either start with a letter and contain only "
+"letters, numbers and spaces, or contain only numbers."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:734
 msgid "Unable to login to AIM"
 msgstr "無法登入到 AIM"
 
-#: src/protocols/oscar/oscar.c:778 src/protocols/oscar/oscar.c:1166
+#: src/protocols/oscar/oscar.c:838 src/protocols/oscar/oscar.c:1256
 msgid "Could Not Connect"
 msgstr "無法連線"
 
-#: src/protocols/oscar/oscar.c:786
+#: src/protocols/oscar/oscar.c:846
 msgid "Connection established, cookie sent"
 msgstr "連線已建立,並已送出 Cookie"
 
-#: src/protocols/oscar/oscar.c:853 src/protocols/oscar/oscar.c:866
-#: src/protocols/oscar/oscar.c:871 src/protocols/yahoo/yahoo_filexfer.c:204
-#: src/protocols/yahoo/yahoo_filexfer.c:212
-msgid "File Transfer Aborted"
-msgstr "取消檔案傳輸"
-
-#: src/protocols/oscar/oscar.c:854
+#: src/protocols/oscar/oscar.c:959 src/protocols/yahoo/yahoo_filexfer.c:209
+#: src/protocols/yahoo/yahoo_filexfer.c:218
+msgid "Unable to establish file descriptor."
+msgstr "無法建立檔案介紹。"
+
+#: src/protocols/oscar/oscar.c:964
+msgid "Unable to create new connection."
+msgstr "無法開啟新連結。"
+
+#: src/protocols/oscar/oscar.c:1035
 msgid "Unable to establish listener socket."
 msgstr "無法建立監聽器 Socket。"
 
-#: src/protocols/oscar/oscar.c:867 src/protocols/yahoo/yahoo_filexfer.c:205
-#: src/protocols/yahoo/yahoo_filexfer.c:213
-msgid "Unable to establish file descriptor."
-msgstr "無法建立檔案介紹。"
-
-#: src/protocols/oscar/oscar.c:872
-msgid "Unable to create new connection."
-msgstr "無法開啟新連結。"
-
-#: src/protocols/oscar/oscar.c:1052 src/protocols/toc/toc.c:571
+#: src/protocols/oscar/oscar.c:1140 src/protocols/toc/toc.c:571
 msgid "Incorrect nickname or password."
 msgstr "錯誤的暱稱或密碼"
 
-#: src/protocols/oscar/oscar.c:1057
+#: src/protocols/oscar/oscar.c:1145
 msgid "Your account is currently suspended."
 msgstr "您的帳號目前停用中。"
 
 #. service temporarily unavailable
-#: src/protocols/oscar/oscar.c:1061
+#: src/protocols/oscar/oscar.c:1149
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "AOL 即時訊息服務暫時不存在。"
 
-#: src/protocols/oscar/oscar.c:1066
+#: src/protocols/oscar/oscar.c:1154
 msgid ""
 "You have been connecting and disconnecting too frequently. Wait ten minutes "
 "and try again. If you continue to try, you will need to wait even longer."
@@ -6362,21 +6907,21 @@
 "您的連線/斷線動作太過頻繁。請等待十分鐘後再行重試。如果您依然繼續嘗試著連"
 "線,那麼您的等待時間將會更加的延長。"
 
-#: src/protocols/oscar/oscar.c:1071
+#: src/protocols/oscar/oscar.c:1159
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr "您所使用的客戶端程式太過老舊。請到 %s 更新"
 
-#: src/protocols/oscar/oscar.c:1103
+#: src/protocols/oscar/oscar.c:1191
 msgid "Internal Error"
 msgstr "內部錯誤"
 
-#: src/protocols/oscar/oscar.c:1173
+#: src/protocols/oscar/oscar.c:1263
 msgid "Received authorization"
 msgstr "收到認證"
 
-#: src/protocols/oscar/oscar.c:1208 src/protocols/oscar/oscar.c:1238
-#: src/protocols/oscar/oscar.c:1326
+#: src/protocols/oscar/oscar.c:1299 src/protocols/oscar/oscar.c:1329
+#: src/protocols/oscar/oscar.c:1417
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
@@ -6385,29 +6930,29 @@
 "您可能會短時間中斷連線。您可能會想在這個問題被修正後使用 TOC。請到 %s 看看有"
 "沒有更新。"
 
-#: src/protocols/oscar/oscar.c:1211 src/protocols/oscar/oscar.c:1241
+#: src/protocols/oscar/oscar.c:1302 src/protocols/oscar/oscar.c:1332
 msgid "Gaim was unable to get a valid AIM login hash."
 msgstr "Gaim 無法取得有效的 AIM 登入碼。"
 
-#: src/protocols/oscar/oscar.c:1329
+#: src/protocols/oscar/oscar.c:1420
 msgid "Gaim was unable to get a valid login hash."
 msgstr "Gaim 無法取得有效的登入碼。"
 
-#: src/protocols/oscar/oscar.c:1910 src/protocols/oscar/oscar.c:5654
+#: src/protocols/oscar/oscar.c:2002 src/protocols/oscar/oscar.c:5906
 #, c-format
 msgid "Direct IM with %s established"
 msgstr "和 %s 的即時訊息已經被建立"
 
-#: src/protocols/oscar/oscar.c:2239 src/protocols/oscar/oscar.c:2261
+#: src/protocols/oscar/oscar.c:2333 src/protocols/oscar/oscar.c:2355
 msgid "(There was an error receiving this message)"
 msgstr "(收取這個訊息時發生錯誤)"
 
-#: src/protocols/oscar/oscar.c:2408
+#: src/protocols/oscar/oscar.c:2504
 #, c-format
 msgid "%s has just asked to directly connect to %s"
 msgstr "%s 剛剛要求直接連線到 %s"
 
-#: src/protocols/oscar/oscar.c:2411
+#: src/protocols/oscar/oscar.c:2507
 msgid ""
 "This requires a direct connection between the two computers and is necessary "
 "for IM Images.  Because your IP address will be revealed, this may be "
@@ -6416,46 +6961,46 @@
 "這個要求將會在兩部電腦間建立起直接連線,而這是在傳送即時訊息影像時所必須的。"
 "這樣將會曝露您的 IP 位址,因此可能會有隱私方面的風險。"
 
-#: src/protocols/oscar/oscar.c:2416 src/protocols/oscar/oscar.c:6023
+#: src/protocols/oscar/oscar.c:2512 src/protocols/oscar/oscar.c:6288
 msgid "Connect"
 msgstr "連線"
 
-#: src/protocols/oscar/oscar.c:2443
+#: src/protocols/oscar/oscar.c:2539
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr "請通過我的認證要求,好讓我可以將您加入我的好友清單中。"
 
-#: src/protocols/oscar/oscar.c:2451
+#: src/protocols/oscar/oscar.c:2547
 msgid "Authorization Request Message:"
 msgstr "認證要求訊息:"
 
-#: src/protocols/oscar/oscar.c:2452
+#: src/protocols/oscar/oscar.c:2548
 msgid "Please authorize me!"
 msgstr "請通過我的認證!"
 
-#: src/protocols/oscar/oscar.c:2480
+#: src/protocols/oscar/oscar.c:2577
 #, c-format
 msgid ""
 "The user %s requires authorization before being added to a buddy list.  Do "
 "you want to send an authorization request?"
 msgstr "使用者 %s 要求在加入好友清單前先取得他的認證。您要送出您的認證要求嗎?"
 
-#: src/protocols/oscar/oscar.c:2485 src/protocols/oscar/oscar.c:2487
+#: src/protocols/oscar/oscar.c:2582 src/protocols/oscar/oscar.c:2584
 msgid "Request Authorization"
 msgstr "要求認證"
 
-#: src/protocols/oscar/oscar.c:2523 src/protocols/oscar/oscar.c:2525
-#: src/protocols/oscar/oscar.c:2532 src/protocols/oscar/oscar.c:2608
-#: src/protocols/oscar/oscar.c:2628 src/protocols/oscar/oscar.c:2984
-#: src/protocols/oscar/oscar.c:3044 src/protocols/oscar/oscar.c:5134
-#: src/protocols/oscar/oscar.c:5180
+#: src/protocols/oscar/oscar.c:2620 src/protocols/oscar/oscar.c:2622
+#: src/protocols/oscar/oscar.c:2629 src/protocols/oscar/oscar.c:2705
+#: src/protocols/oscar/oscar.c:2725 src/protocols/oscar/oscar.c:3081
+#: src/protocols/oscar/oscar.c:3141 src/protocols/oscar/oscar.c:5366
+#: src/protocols/oscar/oscar.c:5412
 msgid "No reason given."
 msgstr "沒有給予原因。"
 
-#: src/protocols/oscar/oscar.c:2531
+#: src/protocols/oscar/oscar.c:2628
 msgid "Authorization Denied Message:"
 msgstr "拒絕認證訊息:"
 
-#: src/protocols/oscar/oscar.c:2608
+#: src/protocols/oscar/oscar.c:2705
 #, c-format
 msgid ""
 "The user %u wants to add you to their buddy list for the following reason:\n"
@@ -6464,11 +7009,11 @@
 "使用者 %u 因為下列原因,想要將您加入他(她)的好友清單中:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2616 src/protocols/oscar/oscar.c:5140
+#: src/protocols/oscar/oscar.c:2713 src/protocols/oscar/oscar.c:5372
 msgid "Authorization Request"
 msgstr "認證要求"
 
-#: src/protocols/oscar/oscar.c:2628
+#: src/protocols/oscar/oscar.c:2725
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -6478,17 +7023,17 @@
 "使用者 %u 因為下列原因,拒絕了您將其加入好友清單的要求:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2629
+#: src/protocols/oscar/oscar.c:2726
 msgid "ICQ authorization denied."
 msgstr "ICQ 認證拒絕。"
 
 #. Someone has granted you authorization
-#: src/protocols/oscar/oscar.c:2636
+#: src/protocols/oscar/oscar.c:2733
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
 msgstr "使用者 %u 同意了您將其加入好友清單的要求。"
 
-#: src/protocols/oscar/oscar.c:2644
+#: src/protocols/oscar/oscar.c:2741
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -6501,7 +7046,7 @@
 "來自:%s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2652
+#: src/protocols/oscar/oscar.c:2749
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -6514,7 +7059,7 @@
 "來自:%s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2660
+#: src/protocols/oscar/oscar.c:2757
 #, c-format
 msgid ""
 "You have received an ICQ email from %s [%s]\n"
@@ -6527,34 +7072,34 @@
 "訊息為:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2681
+#: src/protocols/oscar/oscar.c:2778
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
 msgstr "ICQ 使用者 %u 送來一個好友資訊:%s (%s)"
 
-#: src/protocols/oscar/oscar.c:2687
+#: src/protocols/oscar/oscar.c:2784
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr "您想將他(她)加入到您的好友名單中嗎?"
 
-#: src/protocols/oscar/oscar.c:2691
+#: src/protocols/oscar/oscar.c:2788
 msgid "Decline"
 msgstr "婉拒"
 
-#: src/protocols/oscar/oscar.c:2773
+#: src/protocols/oscar/oscar.c:2870
 #, c-format
 msgid "You missed %hu message from %s because it was invalid."
 msgid_plural "You missed %hu messages from %s because they were invalid."
 msgstr[0] "您遺失了 %hu 個由 %s 送來的訊息,因為它是無效的。"
 msgstr[1] "您遺失了 %hu 個由 %s 送來的訊息,因為它們都是無效的。"
 
-#: src/protocols/oscar/oscar.c:2782
+#: src/protocols/oscar/oscar.c:2879
 #, c-format
 msgid "You missed %hu message from %s because it was too large."
 msgid_plural "You missed %hu messages from %s because they were too large."
 msgstr[0] "您遺失了 %hu 個由 %s 送來的訊息,因為它太大了。"
 msgstr[1] "您遺失了 %hu 個由 %s 送來的訊息,因為它們太大了。"
 
-#: src/protocols/oscar/oscar.c:2791
+#: src/protocols/oscar/oscar.c:2888
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -6564,108 +7109,111 @@
 msgstr[1] "您遺失了 %hu 個由 %s 送來的訊息,因為它們傳送的速度太快。"
 
 # XXX 跟芬蘭文的譯者有同感,直譯「邪惡」好像行不通,下同
-#: src/protocols/oscar/oscar.c:2800
+#: src/protocols/oscar/oscar.c:2897
 #, c-format
 msgid "You missed %hu message from %s because he/she was too evil."
 msgid_plural "You missed %hu messages from %s because he/she was too evil."
 msgstr[0] "您遺失了 %hu 個由 %s 送來的訊息,因為他 / 她太邪惡了。"
 msgstr[1] "您遺失了 %hu 個由 %s 送來的訊息,因為他 / 她太邪惡了。"
 
-#: src/protocols/oscar/oscar.c:2809
+#: src/protocols/oscar/oscar.c:2906
 #, c-format
 msgid "You missed %hu message from %s because you are too evil."
 msgid_plural "You missed %hu messages from %s because you are too evil."
 msgstr[0] "您遺失了 %hu 個由 %s 送來的訊息,因為您太邪惡了。"
 msgstr[1] "您遺失了 %hu 個由 %s 送來的訊息,因為您太邪惡了。"
 
-#: src/protocols/oscar/oscar.c:2818
+#: src/protocols/oscar/oscar.c:2915
 #, c-format
 msgid "You missed %hu message from %s for an unknown reason."
 msgid_plural "You missed %hu messages from %s for an unknown reason."
 msgstr[0] "您因為不明原因而遺失了 %hu 個由 %s 送來的訊息。"
 msgstr[1] "您因為不明原因而遺失了 %hu 個由 %s 送來的訊息。"
 
-#: src/protocols/oscar/oscar.c:2834 src/protocols/oscar/oscar.c:4608
-#: src/protocols/oscar/oscar.c:6150
+#: src/protocols/oscar/oscar.c:2931 src/protocols/oscar/oscar.c:4760
+#: src/protocols/oscar/oscar.c:6414
 msgid "Free For Chat"
 msgstr "我有空聊天"
 
-#: src/protocols/oscar/oscar.c:2838 src/protocols/oscar/oscar.c:4602
-#: src/protocols/oscar/oscar.c:6148
+#: src/protocols/oscar/oscar.c:2935 src/protocols/oscar/oscar.c:4754
+#: src/protocols/oscar/oscar.c:6412
 msgid "Not Available"
 msgstr "長時間離開"
 
-#: src/protocols/oscar/oscar.c:2840 src/protocols/oscar/oscar.c:4605
-#: src/protocols/oscar/oscar.c:6149
+#: src/protocols/oscar/oscar.c:2937 src/protocols/oscar/oscar.c:4757
+#: src/protocols/oscar/oscar.c:6413
 msgid "Occupied"
 msgstr "忙碌"
 
 # NOTE 參閱 http://www.geocities.com/Athens/Delphi/6470/icq99.html
-#: src/protocols/oscar/oscar.c:2844
+#: src/protocols/oscar/oscar.c:2941
 msgid "Web Aware"
 msgstr "允許其他使用者在網路上查看您目前的狀態"
 
-#: src/protocols/oscar/oscar.c:2887
+#: src/protocols/oscar/oscar.c:2984
 #, c-format
 msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<HR>%s"
 msgstr "<B>帳號:</B> %s<BR><B>狀態:</B> %s<HR>%s"
 
-#: src/protocols/oscar/oscar.c:2946
+#: src/protocols/oscar/oscar.c:3043
 #, c-format
 msgid "SNAC threw error: %s\n"
 msgstr "SNAC 丟出錯誤:%s\n"
 
+#: src/protocols/oscar/oscar.c:3044
+msgid "Unknown error"
+msgstr "未知錯誤"
+
 #. Data is assumed to be the destination sn
-#: src/protocols/oscar/oscar.c:2982
+#: src/protocols/oscar/oscar.c:3079
 #, c-format
 msgid "Your message to %s did not get sent:"
 msgstr "您要送給 %s 的訊息無法送出:"
 
 # NOTE 譯文更動 by Ambrose
-#: src/protocols/oscar/oscar.c:3041
+#: src/protocols/oscar/oscar.c:3138
 #, c-format
 msgid "User information for %s unavailable:"
 msgstr "無法取得使用者 %s 的個人資訊:"
 
-#: src/protocols/oscar/oscar.c:3080
+#: src/protocols/oscar/oscar.c:3177
 msgid "Voice"
 msgstr "聲音"
 
 # NOTE 將「直接消息」改譯為「即時訊息」
-#: src/protocols/oscar/oscar.c:3083
+#: src/protocols/oscar/oscar.c:3180
 msgid "AIM Direct IM"
 msgstr "AIM 式即時訊息"
 
-#: src/protocols/oscar/oscar.c:3089 src/protocols/oscar/oscar.c:6249
+#: src/protocols/oscar/oscar.c:3183
+msgid "Chat"
+msgstr "聊天"
+
+#: src/protocols/oscar/oscar.c:3186 src/protocols/oscar/oscar.c:6523
 msgid "Get File"
 msgstr "接收檔案"
 
-#: src/protocols/oscar/oscar.c:3092 src/protocols/oscar/oscar.c:6241
-#: src/protocols/yahoo/yahoo.c:2350
-msgid "Send File"
-msgstr "傳送檔案"
-
-#: src/protocols/oscar/oscar.c:3096
+#: src/protocols/oscar/oscar.c:3193
 msgid "Games"
 msgstr "遊戲"
 
-#: src/protocols/oscar/oscar.c:3099
+#: src/protocols/oscar/oscar.c:3196
 msgid "Add-Ins"
 msgstr "模組"
 
-#: src/protocols/oscar/oscar.c:3102
+#: src/protocols/oscar/oscar.c:3199
 msgid "Send Buddy List"
 msgstr "送出好友清單"
 
-#: src/protocols/oscar/oscar.c:3105
+#: src/protocols/oscar/oscar.c:3202
 msgid "ICQ Direct Connect"
 msgstr "ICQ 式直接連線"
 
-#: src/protocols/oscar/oscar.c:3108
+#: src/protocols/oscar/oscar.c:3205
 msgid "AP User"
 msgstr "應用程式使用者"
 
-#: src/protocols/oscar/oscar.c:3111
+#: src/protocols/oscar/oscar.c:3208
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
@@ -6676,84 +7224,94 @@
 # NOTE (18:17:29) KingAnt: Right...
 # NOTE (18:17:36) wing: what does that mean though?
 # NOTE (18:17:48) KingAnt: I have no idea--probably nothing
-#: src/protocols/oscar/oscar.c:3114
+#: src/protocols/oscar/oscar.c:3211
 msgid "Nihilist"
 msgstr "Nihilist"
 
-#: src/protocols/oscar/oscar.c:3117
+#: src/protocols/oscar/oscar.c:3214
 msgid "ICQ Server Relay"
 msgstr "ICQ 伺服器轉送"
 
-#: src/protocols/oscar/oscar.c:3120
+#: src/protocols/oscar/oscar.c:3217
 msgid "Old ICQ UTF8"
 msgstr "舊式 ICQ UTF8"
 
-#: src/protocols/oscar/oscar.c:3123
+#: src/protocols/oscar/oscar.c:3220
 msgid "Trillian Encryption"
 msgstr "Trillian 加密"
 
-#: src/protocols/oscar/oscar.c:3126
+#: src/protocols/oscar/oscar.c:3223
 msgid "ICQ UTF8"
 msgstr "ICQ UTF8"
 
 # NOTE 這似乎是一種掌上電腦的牌子
-#: src/protocols/oscar/oscar.c:3129
+#: src/protocols/oscar/oscar.c:3226
 msgid "Hiptop"
 msgstr "Hiptop"
 
-#: src/protocols/oscar/oscar.c:3132
+#: src/protocols/oscar/oscar.c:3229
 msgid "Security Enabled"
 msgstr "有保安功能"
 
 # XXX 暫譯
-#: src/protocols/oscar/oscar.c:3135
+#: src/protocols/oscar/oscar.c:3232
 msgid "Video Chat"
 msgstr "視像聊天"
 
 # XXX 暫譯
-#: src/protocols/oscar/oscar.c:3138
+#: src/protocols/oscar/oscar.c:3236
 msgid "iChat AV"
 msgstr "iChat 視像聊天"
 
-#: src/protocols/oscar/oscar.c:3167
+#: src/protocols/oscar/oscar.c:3239
+msgid "Live Video"
+msgstr ""
+
+# NOTE 只能譯「名稱」,因為同時解作「人名」及「模組名稱」
+#: src/protocols/oscar/oscar.c:3242
+#, fuzzy
+msgid "Camera"
+msgstr "名稱"
+
+#: src/protocols/oscar/oscar.c:3271
 #, c-format
 msgid "Username: <b>%s</b><br>\n"
 msgstr "使用者名稱:<b>%s</b><br>\n"
 
-#: src/protocols/oscar/oscar.c:3168
+#: src/protocols/oscar/oscar.c:3272
 #, c-format
 msgid "Warning Level: <b>%d%%</b><br>\n"
 msgstr "警告等級:<b>%d%%</b><br>\n"
 
-#: src/protocols/oscar/oscar.c:3171
+#: src/protocols/oscar/oscar.c:3275
 #, c-format
 msgid "Online Since: <b>%s</b><br>\n"
 msgstr "上線時間:<b>%s</b><br>\n"
 
 # XXX 改譯「註冊日期」會否比較通順?
-#: src/protocols/oscar/oscar.c:3175
+#: src/protocols/oscar/oscar.c:3279
 #, c-format
 msgid "Member Since: <b>%s</b><br>\n"
 msgstr "成為成員的時間:<b>%s</b><br>\n"
 
-#: src/protocols/oscar/oscar.c:3180
+#: src/protocols/oscar/oscar.c:3284
 #, c-format
 msgid "Idle: <b>%s</b>"
 msgstr "閒置:<b>%s</b>"
 
-#: src/protocols/oscar/oscar.c:3183
+#: src/protocols/oscar/oscar.c:3287
 msgid "Idle: <b>Active</b>"
 msgstr "閒置:<b>沒閒置</b>"
 
-#: src/protocols/oscar/oscar.c:3222
+#: src/protocols/oscar/oscar.c:3359
 msgid "Your AIM connection may be lost."
 msgstr "您的 AIM 可能斷線了。"
 
-#: src/protocols/oscar/oscar.c:3616
+#: src/protocols/oscar/oscar.c:3760
 msgid "Rate limiting error."
 msgstr "速率限制錯誤。"
 
-#: src/protocols/oscar/oscar.c:3617
+#: src/protocols/oscar/oscar.c:3761
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
@@ -6761,138 +7319,138 @@
 "您最近做的一個動作無法完成,因為您已經達到發送訊息速率的上限。請等待十秒後再"
 "試一次。"
 
-#: src/protocols/oscar/oscar.c:3680
+#: src/protocols/oscar/oscar.c:3824
 msgid ""
 "You have been disconnected because you have signed on with this screen name "
 "at another location."
 msgstr "您被中斷連線,因為您由其他的地方登入這個帳號。"
 
-#: src/protocols/oscar/oscar.c:3682
+#: src/protocols/oscar/oscar.c:3826
 msgid "You have been signed off for an unknown reason."
 msgstr "您因為不明原因而登出。"
 
-#: src/protocols/oscar/oscar.c:3713
+#: src/protocols/oscar/oscar.c:3857
 msgid "Finalizing connection"
 msgstr "完成連線"
 
-#: src/protocols/oscar/oscar.c:3973 src/protocols/oscar/oscar.c:3979
+#: src/protocols/oscar/oscar.c:4117 src/protocols/oscar/oscar.c:4123
 msgid "Email Address"
 msgstr "電子郵件"
 
-#: src/protocols/oscar/oscar.c:3984
+#: src/protocols/oscar/oscar.c:4128
 msgid "Mobile Phone"
 msgstr "行動電話"
 
-#: src/protocols/oscar/oscar.c:3987 src/protocols/trepia/trepia.c:281
+#: src/protocols/oscar/oscar.c:4131 src/protocols/trepia/trepia.c:281
 #: src/protocols/trepia/trepia.c:422
 msgid "Female"
 msgstr "女"
 
-#: src/protocols/oscar/oscar.c:3987 src/protocols/trepia/trepia.c:280
+#: src/protocols/oscar/oscar.c:4131 src/protocols/trepia/trepia.c:280
 #: src/protocols/trepia/trepia.c:422
 msgid "Male"
 msgstr "男"
 
-#: src/protocols/oscar/oscar.c:4004
+#: src/protocols/oscar/oscar.c:4148
 msgid "Personal Web Page"
 msgstr "個人網頁"
 
-#: src/protocols/oscar/oscar.c:4007
+#: src/protocols/oscar/oscar.c:4151
 msgid "Additional Information"
 msgstr "其他資訊"
 
-#: src/protocols/oscar/oscar.c:4011
+#: src/protocols/oscar/oscar.c:4155
 msgid "Home Address"
 msgstr "住家地址"
 
-#: src/protocols/oscar/oscar.c:4022 src/protocols/oscar/oscar.c:4038
+#: src/protocols/oscar/oscar.c:4166 src/protocols/oscar/oscar.c:4182
 msgid "Zip Code"
 msgstr "郵遞區號"
 
-#: src/protocols/oscar/oscar.c:4027
+#: src/protocols/oscar/oscar.c:4171
 msgid "Work Address"
 msgstr "工作地址"
 
-#: src/protocols/oscar/oscar.c:4043
+#: src/protocols/oscar/oscar.c:4187
 msgid "Work Information"
 msgstr "工作資訊"
 
-#: src/protocols/oscar/oscar.c:4045
+#: src/protocols/oscar/oscar.c:4189
 msgid "Company"
 msgstr "公司名稱"
 
-#: src/protocols/oscar/oscar.c:4048
+#: src/protocols/oscar/oscar.c:4192
 msgid "Division"
 msgstr "部門"
 
-#: src/protocols/oscar/oscar.c:4051
+#: src/protocols/oscar/oscar.c:4195
 msgid "Position"
 msgstr "職位"
 
-#: src/protocols/oscar/oscar.c:4054
+#: src/protocols/oscar/oscar.c:4198
 msgid "Web Page"
 msgstr "網頁"
 
-#: src/protocols/oscar/oscar.c:4060
+#: src/protocols/oscar/oscar.c:4204
 #, c-format
 msgid "ICQ Info for %s"
 msgstr "%s 的 ICQ 資訊"
 
 # XXX 這是什麼 (情形下出現的)? (好像是以前譯「訊息」的那個??)
-#: src/protocols/oscar/oscar.c:4110
+#: src/protocols/oscar/oscar.c:4254
 msgid "Pop-Up Message"
 msgstr "彈出訊息"
 
 # Patch by Kevin Leung
-#: src/protocols/oscar/oscar.c:4131
-#, c-format
-msgid "The following screennames are associated with %s"
+#: src/protocols/oscar/oscar.c:4275
+#, fuzzy, c-format
+msgid "The following screen names are associated with %s"
 msgstr "下列是 %s 的帳號"
 
-#: src/protocols/oscar/oscar.c:4135
+#: src/protocols/oscar/oscar.c:4279
 msgid "Search Results"
 msgstr "搜尋結果"
 
-#: src/protocols/oscar/oscar.c:4152
+#: src/protocols/oscar/oscar.c:4296
 #, c-format
 msgid "No results found for email address %s"
 msgstr "找不到和電子郵件地址 %s 相關的結果"
 
-#: src/protocols/oscar/oscar.c:4173
+#: src/protocols/oscar/oscar.c:4317
 #, c-format
 msgid "You should receive an email asking to confirm %s."
 msgstr "您應該會收到一封要求對 %s 進行認證的電子郵件。"
 
-#: src/protocols/oscar/oscar.c:4175
+#: src/protocols/oscar/oscar.c:4319
 msgid "Account Confirmation Requested"
 msgstr "帳號確認"
 
-#: src/protocols/oscar/oscar.c:4203
+#: src/protocols/oscar/oscar.c:4347
 msgid "Error Changing Account Info"
 msgstr "更改帳號資訊錯誤"
 
-#: src/protocols/oscar/oscar.c:4206
+#: src/protocols/oscar/oscar.c:4350
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
 "differs from the original."
 msgstr "錯誤 0x%04x:無法格式化帳號,因為要求的帳號與原本的不同。"
 
-#: src/protocols/oscar/oscar.c:4209
+#: src/protocols/oscar/oscar.c:4353
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
 "ends in a space."
 msgstr "錯誤 0x%04x:無法格式化帳號,因為要求的帳號以空白結束。"
 
-#: src/protocols/oscar/oscar.c:4212
+#: src/protocols/oscar/oscar.c:4356
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
 "is too long."
 msgstr "錯誤 0x%04x:無法格式化帳號,因為要求的帳號太長。"
 
-#: src/protocols/oscar/oscar.c:4215
+#: src/protocols/oscar/oscar.c:4359
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because there is already a "
@@ -6900,7 +7458,7 @@
 msgstr ""
 "錯誤 0x%04x:無法改變電子郵件地址,因為您已經送出的其他要求還未處理好。"
 
-#: src/protocols/oscar/oscar.c:4218
+#: src/protocols/oscar/oscar.c:4362
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address has "
@@ -6908,19 +7466,19 @@
 msgstr ""
 "錯誤 0x%04x:無法改變電子郵件地址,因為這個電子郵件地址和太多的帳號產生關連。"
 
-#: src/protocols/oscar/oscar.c:4221
+#: src/protocols/oscar/oscar.c:4365
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address is "
 "invalid."
 msgstr "錯誤 0x%04x:無法改變電子郵件地址,因為這個電子郵件地址是無效的。"
 
-#: src/protocols/oscar/oscar.c:4224
+#: src/protocols/oscar/oscar.c:4368
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "錯誤 0x%04x:未知錯誤。"
 
-#: src/protocols/oscar/oscar.c:4234
+#: src/protocols/oscar/oscar.c:4378
 #, c-format
 msgid ""
 "Your screen name is currently formatted as follows:\n"
@@ -6929,20 +7487,20 @@
 "您的帳號目前被格式化如下:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:4235 src/protocols/oscar/oscar.c:4242
+#: src/protocols/oscar/oscar.c:4379 src/protocols/oscar/oscar.c:4386
 msgid "Account Info"
 msgstr "帳號資訊"
 
-#: src/protocols/oscar/oscar.c:4240
+#: src/protocols/oscar/oscar.c:4384
 #, c-format
 msgid "The email address for %s is %s"
 msgstr "%s 的電子郵件地址為 %s"
 
-#: src/protocols/oscar/oscar.c:4472
+#: src/protocols/oscar/oscar.c:4616
 msgid "Unable to set AIM profile."
 msgstr "無法設定 AIM 個人資料。"
 
-#: src/protocols/oscar/oscar.c:4473
+#: src/protocols/oscar/oscar.c:4617
 msgid ""
 "You have probably requested to set your profile before the login procedure "
 "completed.  Your profile remains unset; try setting it again when you are "
@@ -6951,7 +7509,7 @@
 "您在未登入完成前要求修改您的個人資訊,所以這些資訊並未被修改。請在完成登入後"
 "再重新進行設定。"
 
-#: src/protocols/oscar/oscar.c:4500
+#: src/protocols/oscar/oscar.c:4644
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  Gaim has truncated "
@@ -6962,15 +7520,20 @@
 msgstr[0] "超出個人資訊的長度上限 %d 位元組。Gaim 將在截短內容後進行設定。"
 msgstr[1] "超出個人資訊的長度上限 %d 位元組。Gaim 將在截短內容後進行設定。"
 
-#: src/protocols/oscar/oscar.c:4505
+#: src/protocols/oscar/oscar.c:4649
 msgid "Profile too long."
 msgstr "個人資訊過長。"
 
-#: src/protocols/oscar/oscar.c:4522
+#: src/protocols/oscar/oscar.c:4665 src/protocols/oscar/oscar.c:6418
+#, fuzzy
+msgid "Visible"
+msgstr "隱身"
+
+#: src/protocols/oscar/oscar.c:4676
 msgid "Unable to set AIM away message."
 msgstr "無法設定 AIM 離開訊息。"
 
-#: src/protocols/oscar/oscar.c:4523
+#: src/protocols/oscar/oscar.c:4677
 msgid ""
 "You have probably requested to set your away message before the login "
 "procedure completed.  You remain in a \"present\" state; try setting it "
@@ -6979,7 +7542,7 @@
 "您試著在登入程序完成前修改您的離開訊息,您的狀態將維持目前所設定的狀態。請在"
 "完全登入後再設定一次。"
 
-#: src/protocols/oscar/oscar.c:4563
+#: src/protocols/oscar/oscar.c:4717
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  Gaim has "
@@ -6990,15 +7553,28 @@
 msgstr[0] "超出離開訊息的長度上限 %d 位元組。Gaim 將在截短內容後進行設定。"
 msgstr[1] "超出離開訊息的長度上限 %d 位元組。Gaim 將在截短內容後進行設定。"
 
-#: src/protocols/oscar/oscar.c:4568
+#: src/protocols/oscar/oscar.c:4722
 msgid "Away message too long."
 msgstr "離開訊息過長。"
 
-#: src/protocols/oscar/oscar.c:4782
+#: src/protocols/oscar/oscar.c:4815
+#, c-format
+msgid ""
+"Could not add the buddy %s because the screen name is invalid.  Screen names "
+"must either start with a letter and contain only letters, numbers and "
+"spaces, or contain only numbers."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:4816 src/protocols/oscar/oscar.c:5233
+#: src/protocols/oscar/oscar.c:5246
+msgid "Unable To Add"
+msgstr "無法加入"
+
+#: src/protocols/oscar/oscar.c:4952
 msgid "Unable To Retrieve Buddy List"
 msgstr "無法讀取好友清單"
 
-#: src/protocols/oscar/oscar.c:4783
+#: src/protocols/oscar/oscar.c:4953
 msgid ""
 "Gaim was temporarily unable to retrieve your buddy list from the AIM "
 "servers.  Your buddy list is not lost, and will probably become available in "
@@ -7007,12 +7583,13 @@
 "Gaim 暫時沒有辦法由 AIM 伺服器上取得您的好友清單。不過這個好友清單並沒有遺"
 "失,可能可以在幾個小時後取得。"
 
-#: src/protocols/oscar/oscar.c:4875 src/protocols/oscar/oscar.c:4876
-#: src/protocols/oscar/oscar.c:4881
+#: src/protocols/oscar/oscar.c:5129 src/protocols/oscar/oscar.c:5130
+#: src/protocols/oscar/oscar.c:5135 src/protocols/oscar/oscar.c:5290
+#: src/protocols/oscar/oscar.c:5291 src/protocols/oscar/oscar.c:5296
 msgid "Orphans"
 msgstr "孤兒們"
 
-#: src/protocols/oscar/oscar.c:5047
+#: src/protocols/oscar/oscar.c:5232
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -7021,15 +7598,11 @@
 "因為您的好友法單中有太多的好友,所以沒有辦法加入好友 %s。請在移除部份好友後重"
 "試。"
 
-#: src/protocols/oscar/oscar.c:5047 src/protocols/oscar/oscar.c:5060
+#: src/protocols/oscar/oscar.c:5232 src/protocols/oscar/oscar.c:5245
 msgid "(no name)"
 msgstr "(沒有名字)"
 
-#: src/protocols/oscar/oscar.c:5048 src/protocols/oscar/oscar.c:5061
-msgid "Unable To Add"
-msgstr "無法加入"
-
-#: src/protocols/oscar/oscar.c:5060
+#: src/protocols/oscar/oscar.c:5245
 #, c-format
 msgid ""
 "Could not add the buddy %s for an unknown reason.  The most common reason "
@@ -7039,7 +7612,7 @@
 "因為不明原因而無法將好友 %s 加入。一般的原因是因為您的好友清單中的好友數目超"
 "過所系統允許的上限。"
 
-#: src/protocols/oscar/oscar.c:5095
+#: src/protocols/oscar/oscar.c:5327
 #, c-format
 msgid ""
 "The user %s has given you permission to add you to their buddy list.  Do you "
@@ -7049,11 +7622,11 @@
 "呢?"
 
 # NOTE 這是我們允許別人發出的認證要求後顯示給我們自己看的
-#: src/protocols/oscar/oscar.c:5101
+#: src/protocols/oscar/oscar.c:5333
 msgid "Authorization Given"
 msgstr "給予認證"
 
-#: src/protocols/oscar/oscar.c:5134
+#: src/protocols/oscar/oscar.c:5366
 #, c-format
 msgid ""
 "The user %s wants to add you to their buddy list for the following reason:\n"
@@ -7063,18 +7636,18 @@
 "%s"
 
 #. Granted
-#: src/protocols/oscar/oscar.c:5176
+#: src/protocols/oscar/oscar.c:5408
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
 msgstr "使用者 %s 允許了您將他(她)加入好友清單的要求。"
 
 # NOTE 這是我們發出的認證要求被對方允許時顯示的
-#: src/protocols/oscar/oscar.c:5177
+#: src/protocols/oscar/oscar.c:5409
 msgid "Authorization Granted"
 msgstr "認證獲允"
 
 #. Denied
-#: src/protocols/oscar/oscar.c:5180
+#: src/protocols/oscar/oscar.c:5412
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -7084,109 +7657,116 @@
 "使用者 %s 因為下列原因,拒絕了您將他(她)加入好友清單的要求:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:5181
+#: src/protocols/oscar/oscar.c:5413
 msgid "Authorization Denied"
 msgstr "認證被拒"
 
 # NOTE: 這裡的字義係由 #gaim 的 MrHappy 及 deryni 提供的
 # NOTE: KingAnt 提供的字義有些不同,暫時不予理會
-#: src/protocols/oscar/oscar.c:5218 src/protocols/toc/toc.c:1264
+#: src/protocols/oscar/oscar.c:5450 src/protocols/toc/toc.c:1264
 msgid "_Exchange:"
 msgstr "頻道號碼(_E):"
 
-#: src/protocols/oscar/oscar.c:5456
+#: src/protocols/oscar/oscar.c:5472
+#, fuzzy
+msgid "Invalid chat name specified."
+msgstr "給予了無效的 Gadu-Gadu UIN"
+
+#: src/protocols/oscar/oscar.c:5703
 msgid "<b>Status:</b> "
 msgstr "<b>狀態:</b>"
 
-#: src/protocols/oscar/oscar.c:5468
+#: src/protocols/oscar/oscar.c:5715
 msgid "<b>IP Address:</b> "
 msgstr "<b>IP 位址:</b>"
 
-#: src/protocols/oscar/oscar.c:5476
+#: src/protocols/oscar/oscar.c:5723
 msgid "<b>Capabilities:</b> "
 msgstr "<b>相容性:</b>"
 
-#: src/protocols/oscar/oscar.c:5485
+#: src/protocols/oscar/oscar.c:5732
 msgid "<b>Buddy Comment:</b> "
 msgstr "<b>好友說明:</b>"
 
-#: src/protocols/oscar/oscar.c:5494
+#: src/protocols/oscar/oscar.c:5741
 msgid "<b>Available:</b> "
 msgstr "<b>上線:</b>"
 
-#: src/protocols/oscar/oscar.c:5512
+#: src/protocols/oscar/oscar.c:5760
 msgid "<b>Away Message:</b> "
 msgstr "<b>離開訊息:</b>"
 
-#: src/protocols/oscar/oscar.c:5521
+#: src/protocols/oscar/oscar.c:5768
 msgid "<b>Status:</b> Not Authorized"
 msgstr "<b>狀態:</b>未認證"
 
-#: src/protocols/oscar/oscar.c:5555 src/protocols/yahoo/yahoo.c:2191
+#: src/protocols/oscar/oscar.c:5802 src/protocols/yahoo/yahoo.c:2293
 msgid "Offline"
 msgstr "離線"
 
-#: src/protocols/oscar/oscar.c:6003
+#: src/protocols/oscar/oscar.c:6268
 msgid "Unable to open Direct IM"
 msgstr "無法開啟直接的即時訊息"
 
-#: src/protocols/oscar/oscar.c:6016
+#: src/protocols/oscar/oscar.c:6281
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr "您選擇了與 %s 開啟一個直接即時訊息。"
 
-#: src/protocols/oscar/oscar.c:6019
+#: src/protocols/oscar/oscar.c:6284
 msgid ""
 "Because this reveals your IP address, it may be considered a privacy risk.  "
 "Do you wish to continue?"
 msgstr "這樣將會曝露出您的 IP 位址,因此可能會有隱私上的風險。您想要繼續嗎?"
 
-#: src/protocols/oscar/oscar.c:6194
+#: src/protocols/oscar/oscar.c:6468
 msgid "Buddy Comment:"
 msgstr "好友說明:"
 
-#: src/protocols/oscar/oscar.c:6210
+#: src/protocols/oscar/oscar.c:6484
 msgid "Edit Buddy Comment"
 msgstr "編輯好友說明"
 
-#: src/protocols/oscar/oscar.c:6218
+#: src/protocols/oscar/oscar.c:6492
 msgid "Get Status Msg"
 msgstr "取得狀態訊息"
 
 # NOTE 將「直接消息」改譯為「即時訊息」
-#: src/protocols/oscar/oscar.c:6233
+#: src/protocols/oscar/oscar.c:6507
 msgid "Direct IM"
 msgstr "即時訊息"
 
-#: src/protocols/oscar/oscar.c:6262
+#: src/protocols/oscar/oscar.c:6536
 msgid "Re-request Authorization"
 msgstr "重新要求認證"
 
-#: src/protocols/oscar/oscar.c:6283
+#: src/protocols/oscar/oscar.c:6557
 msgid "The new formatting is invalid."
 msgstr "新的格式是無效的。"
 
-#: src/protocols/oscar/oscar.c:6284
-msgid "Screenname formatting can change only capitalization and whitespace."
+#: src/protocols/oscar/oscar.c:6558
+#, fuzzy
+msgid "Screen name formatting can change only capitalization and whitespace."
 msgstr "帳號格式化只能改變大寫以及空白。"
 
-#: src/protocols/oscar/oscar.c:6290
-msgid "New screenname formatting:"
+#: src/protocols/oscar/oscar.c:6564
+#, fuzzy
+msgid "New screen name formatting:"
 msgstr "新的帳號格式:"
 
-#: src/protocols/oscar/oscar.c:6339
+#: src/protocols/oscar/oscar.c:6613
 msgid "Change Address To:"
 msgstr "變更地址為:"
 
-#: src/protocols/oscar/oscar.c:6383
+#: src/protocols/oscar/oscar.c:6657
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>您並沒有在等待驗證</i>"
 
-#: src/protocols/oscar/oscar.c:6386
+#: src/protocols/oscar/oscar.c:6660
 msgid "You are awaiting authorization from the following buddies"
 msgstr "您目前正在等待下列好友的認證"
 
-#: src/protocols/oscar/oscar.c:6387
+#: src/protocols/oscar/oscar.c:6661
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
@@ -7194,72 +7774,69 @@
 "您可以重新要求這些好友的認證,只要在好友清單中以滑鼠右鍵點擊他們,然後選擇"
 "「要求重新認證」。"
 
-#: src/protocols/oscar/oscar.c:6401
+#: src/protocols/oscar/oscar.c:6675
 msgid "Find Buddy by E-mail"
 msgstr "以電子郵件地址來找尋好友"
 
-#: src/protocols/oscar/oscar.c:6402
+#: src/protocols/oscar/oscar.c:6676
 msgid "Search for a buddy by e-mail address"
 msgstr "使用電子郵件地址搜尋好友"
 
-#: src/protocols/oscar/oscar.c:6403
+#: src/protocols/oscar/oscar.c:6677
 msgid "Type the e-mail address of the buddy you are searching for."
 msgstr "請輸入對方的電子郵件地址。"
 
-#: src/protocols/oscar/oscar.c:6406
-msgid "Search"
-msgstr "搜尋"
-
-#: src/protocols/oscar/oscar.c:6420
+#: src/protocols/oscar/oscar.c:6694
 msgid "Available Message:"
 msgstr "上線訊息:"
 
 # XXX 請覆查
-#: src/protocols/oscar/oscar.c:6421
+#: src/protocols/oscar/oscar.c:6695
 msgid "I'm doing work and hoping for a distraction--IM me!"
 msgstr "我在工作,但覺得很悶,同我聊聊天吧!"
 
-#: src/protocols/oscar/oscar.c:6492
+#: src/protocols/oscar/oscar.c:6766
 msgid "Set User Info..."
 msgstr "設定使用者資訊..."
 
-#: src/protocols/oscar/oscar.c:6499
+#: src/protocols/oscar/oscar.c:6773
 msgid "Set Available Message..."
 msgstr "設定上線訊息..."
 
-#: src/protocols/oscar/oscar.c:6506
+#: src/protocols/oscar/oscar.c:6780
 msgid "Change Password..."
 msgstr "修改密碼..."
 
-#: src/protocols/oscar/oscar.c:6513
+#: src/protocols/oscar/oscar.c:6787
 msgid "Change Password (URL)"
 msgstr "修改密碼 (透過網頁)"
 
-#: src/protocols/oscar/oscar.c:6521
+#: src/protocols/oscar/oscar.c:6795
 msgid "Configure IM Forwarding (URL)"
 msgstr "設定即時訊息的轉送 (透過網頁)"
 
-#: src/protocols/oscar/oscar.c:6532
-msgid "Format Screenname..."
+#: src/protocols/oscar/oscar.c:6806
+#, fuzzy
+msgid "Format Screen Name..."
 msgstr "格式化帳號..."
 
-#: src/protocols/oscar/oscar.c:6538
+#: src/protocols/oscar/oscar.c:6812
 msgid "Confirm Account"
 msgstr "確認帳號"
 
-#: src/protocols/oscar/oscar.c:6544
+#: src/protocols/oscar/oscar.c:6818
 msgid "Display Currently Registered Address"
 msgstr "顯示目前所註冊的地址"
 
-#: src/protocols/oscar/oscar.c:6550
+#: src/protocols/oscar/oscar.c:6824
 msgid "Change Currently Registered Address..."
 msgstr "修改目前所註冊的地址..."
 
-#: src/protocols/oscar/oscar.c:6559
+#: src/protocols/oscar/oscar.c:6833
 msgid "Show Buddies Awaiting Authorization"
 msgstr "顯示等待認證的好友"
 
-#: src/protocols/oscar/oscar.c:6567
+#: src/protocols/oscar/oscar.c:6841
 msgid "Search for Buddy by Email..."
 msgstr "使用電子郵件地址搜尋好友..."
 
@@ -7273,15 +7850,16 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/oscar/oscar.c:6687 src/protocols/oscar/oscar.c:6689
+#. *  description
+#: src/protocols/oscar/oscar.c:6962 src/protocols/oscar/oscar.c:6964
 msgid "AIM/ICQ Protocol Plugin"
 msgstr "AIM/ICQ 協定模組"
 
-#: src/protocols/oscar/oscar.c:6706
+#: src/protocols/oscar/oscar.c:6981
 msgid "Auth host"
 msgstr "認證伺服器"
 
-#: src/protocols/oscar/oscar.c:6711
+#: src/protocols/oscar/oscar.c:6986
 msgid "Auth port"
 msgstr "認證通訊埠"
 
@@ -7487,15 +8065,16 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/toc/toc.c:2158 src/protocols/toc/toc.c:2160
+#. *  description
+#: src/protocols/toc/toc.c:2159 src/protocols/toc/toc.c:2161
 msgid "TOC Protocol Plugin"
 msgstr "TOC 協定模組"
 
-#: src/protocols/toc/toc.c:2177
+#: src/protocols/toc/toc.c:2178
 msgid "TOC host"
 msgstr "TOC 伺服器"
 
-#: src/protocols/toc/toc.c:2181
+#: src/protocols/toc/toc.c:2182
 msgid "TOC port"
 msgstr "TOC 通訊埠"
 
@@ -7569,7 +8148,7 @@
 msgid "Local Users"
 msgstr "本地端的使用者"
 
-#: src/protocols/trepia/trepia.c:1073
+#: src/protocols/trepia/trepia.c:1078
 msgid "Logging in"
 msgstr "登入中"
 
@@ -7583,33 +8162,38 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/trepia/trepia.c:1320 src/protocols/trepia/trepia.c:1322
+#. *  description
+#: src/protocols/trepia/trepia.c:1326 src/protocols/trepia/trepia.c:1328
 msgid "Trepia Protocol Plugin"
 msgstr "Trepia 協定模組"
 
 # XXX 暫譯
-#: src/protocols/yahoo/yahoo.c:297
+#: src/protocols/yahoo/yahoo.c:308
 msgid ""
 "You have been logged off as you have logged in on a different machine or "
 "device."
 msgstr "您已經被登出,因為您已在另一處登入。"
 
-#: src/protocols/yahoo/yahoo.c:730
+#: src/protocols/yahoo/yahoo.c:747
 msgid "Your Yahoo! message did not get sent."
 msgstr "您的 Yahoo! 訊息並沒有被送出。"
 
+#: src/protocols/yahoo/yahoo.c:765
+msgid "Buzz!!"
+msgstr ""
+
 # XXX 暫譯
-#: src/protocols/yahoo/yahoo.c:772
+#: src/protocols/yahoo/yahoo.c:800
 #, c-format
 msgid "Yahoo! system message for %s:"
 msgstr "%s 的 Yahoo! 系統訊息:"
 
-#: src/protocols/yahoo/yahoo.c:838
+#: src/protocols/yahoo/yahoo.c:866
 #, c-format
 msgid "%s has (retroactively) denied your request to add them to your list."
 msgstr "使用者 %s 剛剛拒絕了您先前將他(她)新增至您的好友清單的要求。"
 
-#: src/protocols/yahoo/yahoo.c:841
+#: src/protocols/yahoo/yahoo.c:869
 #, c-format
 msgid ""
 "%s has (retroactively) denied your request to add them to your list for the "
@@ -7618,11 +8202,11 @@
 "使用者 %s 因為下列原因,剛剛拒絕了您先前將他(她)新增至您的好友清單的要求:%"
 "s"
 
-#: src/protocols/yahoo/yahoo.c:844
+#: src/protocols/yahoo/yahoo.c:872
 msgid "Add buddy rejected"
 msgstr "新增好友被拒"
 
-#: src/protocols/yahoo/yahoo.c:1494
+#: src/protocols/yahoo/yahoo.c:1595
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -7632,11 +8216,11 @@
 "Yahoo 伺服器要求了使用一種不明的認證方式,因此這個版本的 Gaim 很可能不會成功"
 "登入 Yahoo。請到 %s 檢查有沒有更新的版本。"
 
-#: src/protocols/yahoo/yahoo.c:1497
+#: src/protocols/yahoo/yahoo.c:1598
 msgid "Failed Yahoo! Authentication"
 msgstr "Yahoo! 認證失敗"
 
-#: src/protocols/yahoo/yahoo.c:1570
+#: src/protocols/yahoo/yahoo.c:1671
 #, c-format
 msgid ""
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
@@ -7645,68 +8229,69 @@
 "您嘗試忽略在您的好友名單內的 %s。如果您打算把他(她)從您的好友清單中移除,並"
 "隨即忽略他(她),請按一下「是」。"
 
-#: src/protocols/yahoo/yahoo.c:1573
+#: src/protocols/yahoo/yahoo.c:1674
 msgid "Ignore buddy?"
 msgstr "忽略使用者?"
 
-#: src/protocols/yahoo/yahoo.c:1606
+#: src/protocols/yahoo/yahoo.c:1707
 msgid "Invalid username."
 msgstr "使用者名稱無效。"
 
-#: src/protocols/yahoo/yahoo.c:1609
+#: src/protocols/yahoo/yahoo.c:1710
 msgid "Incorrect password."
 msgstr "錯誤的密碼。"
 
 # XXX 暫譯
-#: src/protocols/yahoo/yahoo.c:1612
+#: src/protocols/yahoo/yahoo.c:1713
 msgid "Your account is locked, please log in to the yahoo website."
 msgstr "你的帳戶目前被封鎖。請您登入 Yahoo 網站。"
 
-#: src/protocols/yahoo/yahoo.c:1615
+#: src/protocols/yahoo/yahoo.c:1716
 #, c-format
 msgid "Unknown error number %d."
 msgstr "未知的錯誤代碼 %d。"
 
-#: src/protocols/yahoo/yahoo.c:1672
+#: src/protocols/yahoo/yahoo.c:1773
 #, c-format
 msgid "Could not add buddy %s to group %s to the server list on account %s."
 msgstr "無法將好友「%1$s」新增至帳號「%3$s」在伺服器上的清單內的群組「%2$s」。"
 
-#: src/protocols/yahoo/yahoo.c:1674
+#: src/protocols/yahoo/yahoo.c:1775
 msgid "Could not add buddy to server list"
 msgstr "無法將好友新增至伺服器上的清單內"
 
-#: src/protocols/yahoo/yahoo.c:1784 src/protocols/yahoo/yahoo.c:1914
+#: src/protocols/yahoo/yahoo.c:1885 src/protocols/yahoo/yahoo.c:2016
 msgid "Unable to read"
 msgstr "無法讀取"
 
-#: src/protocols/yahoo/yahoo.c:1939 src/protocols/yahoo/yahoo.c:2048
-#: src/protocols/yahoo/yahoo.c:2089
+#: src/protocols/yahoo/yahoo.c:2038 src/protocols/yahoo/yahoo.c:2148
+#: src/protocols/yahoo/yahoo.c:2191 src/protocols/yahoo/yahoochat.c:1360
+#: src/protocols/yahoo/yahoochat.c:1421
 msgid "Connection problem"
 msgstr "連線錯誤"
 
-#: src/protocols/yahoo/yahoo.c:2173 src/protocols/yahoo/yahoo.c:2498
-#: src/protocols/yahoo/yahoo.c:2604
+#: src/protocols/yahoo/yahoo.c:2275 src/protocols/yahoo/yahoo.c:2600
+#: src/protocols/yahoo/yahoo.c:2706
 msgid "Not At Home"
 msgstr "不在家"
 
-#: src/protocols/yahoo/yahoo.c:2175 src/protocols/yahoo/yahoo.c:2500
-#: src/protocols/yahoo/yahoo.c:2605
+#: src/protocols/yahoo/yahoo.c:2277 src/protocols/yahoo/yahoo.c:2602
+#: src/protocols/yahoo/yahoo.c:2707
 msgid "Not At Desk"
 msgstr "不在座位"
 
-#: src/protocols/yahoo/yahoo.c:2177 src/protocols/yahoo/yahoo.c:2502
-#: src/protocols/yahoo/yahoo.c:2606
+#: src/protocols/yahoo/yahoo.c:2279 src/protocols/yahoo/yahoo.c:2604
+#: src/protocols/yahoo/yahoo.c:2708
 msgid "Not In Office"
 msgstr "不在辦公室"
 
-#: src/protocols/yahoo/yahoo.c:2181 src/protocols/yahoo/yahoo.c:2506
-#: src/protocols/yahoo/yahoo.c:2608
+#: src/protocols/yahoo/yahoo.c:2283 src/protocols/yahoo/yahoo.c:2608
+#: src/protocols/yahoo/yahoo.c:2710
 msgid "On Vacation"
 msgstr "渡假去了"
 
-#: src/protocols/yahoo/yahoo.c:2185 src/protocols/yahoo/yahoo.c:2510
-#: src/protocols/yahoo/yahoo.c:2610
+#: src/protocols/yahoo/yahoo.c:2287 src/protocols/yahoo/yahoo.c:2612
+#: src/protocols/yahoo/yahoo.c:2712
 msgid "Stepped Out"
 msgstr "走出去了"
 
@@ -7714,88 +8299,88 @@
 # NOTE 這也表示你不會看見這個好友登入等等。」(yeah, it mean the buddy
 # NOTE isn't on the server's buddy list/ which also means you won't
 # NOTE be able to see when they log on, etc)
-#: src/protocols/yahoo/yahoo.c:2249 src/protocols/yahoo/yahoo.c:2281
+#: src/protocols/yahoo/yahoo.c:2351 src/protocols/yahoo/yahoo.c:2383
 msgid "Not on server list"
 msgstr "不在伺服器上的清單中"
 
 # NOTE #gaim 的 Vann 及 LSchiere 解:如果選取了的好友目前處於一個聊天,便加入該個聊天
 # NOTE Yahoo 的「Chat」正式譯文為「聯誼園地」
-#: src/protocols/yahoo/yahoo.c:2337
+#: src/protocols/yahoo/yahoo.c:2439
 msgid "Join in Chat"
 msgstr "加入好友目前所在的聊天室"
 
 # NOTE「會議室」是暫時的意譯。Yahoo! 好像沒有為「Conference」提供正式中譯名。
-#: src/protocols/yahoo/yahoo.c:2343
+#: src/protocols/yahoo/yahoo.c:2445
 msgid "Initiate Conference"
 msgstr "開啟會議室"
 
-#: src/protocols/yahoo/yahoo.c:2396
+#: src/protocols/yahoo/yahoo.c:2498
 msgid "Active which ID?"
 msgstr "啟動哪一個 ID?"
 
 # NOTE #gaim 的 Vann 及 LSchiere 解:如果選取了的好友目前處於一個聊天,便加入該個聊天
 # NOTE Yahoo 的「Chat」正式譯文為「聯誼園地」
-#: src/protocols/yahoo/yahoo.c:2404
+#: src/protocols/yahoo/yahoo.c:2506
 msgid "Join who in chat?"
 msgstr "加入哪個好友目前所在的聊天室?"
 
-#: src/protocols/yahoo/yahoo.c:2415
+#: src/protocols/yahoo/yahoo.c:2517
 msgid "Activate ID..."
 msgstr "啟動 ID..."
 
-#: src/protocols/yahoo/yahoo.c:2421
+#: src/protocols/yahoo/yahoo.c:2523
 msgid "Join user in chat..."
 msgstr "加入好友目前所在的聊天室..."
 
-#: src/protocols/yahoo/yahoo.c:2803
+#: src/protocols/yahoo/yahoo.c:2905
 msgid ""
 "<b>Sorry, profiles marked as containing adult content are not supported at "
 "this time.</b><br><br>\n"
 msgstr "<b>對不起,暫時並不支援內容被列為兒童不宜的個人資訊。</b><br><br>\n"
 
 # NOTE 注意:鏈結在譯文之下顯示,故譯成「以下」
-#: src/protocols/yahoo/yahoo.c:2804 src/protocols/yahoo/yahoo.c:2827
+#: src/protocols/yahoo/yahoo.c:2906 src/protocols/yahoo/yahoo.c:2929
 msgid ""
 "If you wish to view this profile, you will need to visit this link in your "
 "web browser<br>"
 msgstr "您如果想看這則個人資訊,請用您的瀏覽器開啟以下連結<br>"
 
-#: src/protocols/yahoo/yahoo.c:2826
+#: src/protocols/yahoo/yahoo.c:2928
 msgid ""
 "<b>Sorry, non-English profiles are not supported at this time.</b><br><br>\n"
 msgstr "<b>對不起,暫時只支援英文的個人資訊。</b><br><br>\n"
 
-#: src/protocols/yahoo/yahoo.c:2874 src/protocols/yahoo/yahoo.c:2875
+#: src/protocols/yahoo/yahoo.c:2976 src/protocols/yahoo/yahoo.c:2977
 msgid "Yahoo! ID"
 msgstr "Yahoo! 帳號"
 
-#: src/protocols/yahoo/yahoo.c:2919 src/protocols/yahoo/yahoo.c:2922
-#: src/protocols/yahoo/yahoo.c:2925
+#: src/protocols/yahoo/yahoo.c:3021 src/protocols/yahoo/yahoo.c:3024
+#: src/protocols/yahoo/yahoo.c:3027
 msgid "Hobbies"
 msgstr "嗜好"
 
-#: src/protocols/yahoo/yahoo.c:2934 src/protocols/yahoo/yahoo.c:2937
+#: src/protocols/yahoo/yahoo.c:3036 src/protocols/yahoo/yahoo.c:3039
 msgid "Latest News"
 msgstr "最新消息"
 
-#: src/protocols/yahoo/yahoo.c:2951
+#: src/protocols/yahoo/yahoo.c:3053
 msgid "Home Page"
 msgstr "網頁"
 
-#: src/protocols/yahoo/yahoo.c:2963
+#: src/protocols/yahoo/yahoo.c:3065
 msgid "Cool Link 1"
 msgstr "酷連結(一)"
 
-#: src/protocols/yahoo/yahoo.c:2967
+#: src/protocols/yahoo/yahoo.c:3069
 msgid "Cool Link 2"
 msgstr "酷連結(二)"
 
-#: src/protocols/yahoo/yahoo.c:2969
+#: src/protocols/yahoo/yahoo.c:3071
 msgid "Cool Link 3"
 msgstr "酷連結(三)"
 
 # XXX 改譯「註冊日期」會否比較通順?
-#: src/protocols/yahoo/yahoo.c:2975
+#: src/protocols/yahoo/yahoo.c:3077
 msgid "Member Since"
 msgstr "成為成員的時間"
 
@@ -7809,86 +8394,132 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/yahoo/yahoo.c:3175 src/protocols/yahoo/yahoo.c:3177
+#. *  description
+#: src/protocols/yahoo/yahoo.c:3283 src/protocols/yahoo/yahoo.c:3285
 msgid "Yahoo Protocol Plugin"
 msgstr "Yahoo 協定模組"
 
-#: src/protocols/yahoo/yahoo.c:3194
+#: src/protocols/yahoo/yahoo.c:3302
 msgid "Pager host"
 msgstr "傳呼系統伺服器"
 
-#: src/protocols/yahoo/yahoo.c:3197
+#: src/protocols/yahoo/yahoo.c:3305
 msgid "Pager port"
 msgstr "傳呼系統通訊埠"
 
-#: src/protocols/yahoo/yahoo.c:3200
+#: src/protocols/yahoo/yahoo.c:3308
 msgid "File transfer host"
 msgstr "檔案傳輸主機"
 
-#: src/protocols/yahoo/yahoo.c:3203
+#: src/protocols/yahoo/yahoo.c:3311
 msgid "File transfer port"
 msgstr "檔案傳輸通訊埠"
 
-#: src/protocols/yahoo/yahoochat.c:194
+#: src/protocols/yahoo/yahoo.c:3314
+msgid "Chat Room List Url"
+msgstr ""
+
+#: src/protocols/yahoo/yahoo_filexfer.c:200
+msgid ""
+"Gaim cannot send files over Yahoo! that are bigger than One Megabyte "
+"(1,048,576 bytes)."
+msgstr ""
+
+#: src/protocols/yahoo/yahoochat.c:198
 #, c-format
 msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
 msgstr "%s 婉拒了你詢問他(她)到會議室「%s」的邀請,理由是「%s」。"
 
-#: src/protocols/yahoo/yahoochat.c:196
+#: src/protocols/yahoo/yahoochat.c:200
 msgid "Invitation Rejected"
 msgstr "邀請被婉拒了"
 
-#: src/protocols/yahoo/yahoochat.c:346
+#: src/protocols/yahoo/yahoochat.c:350
 msgid "Failed to join chat"
 msgstr "無法加入聊天室"
 
-#: src/protocols/yahoo/yahoochat.c:346
+#: src/protocols/yahoo/yahoochat.c:350
 msgid "Maybe the room is full?"
 msgstr "或許參與聊天室使用者已經到達上限?"
 
-#: src/protocols/yahoo/yahoochat.c:558
+# FIXME 這是暫譯
+#: src/protocols/yahoo/yahoochat.c:426
+#, fuzzy, c-format
+msgid "You are now chatting in %s."
+msgstr "您被禁於 %s 了。"
+
+#: src/protocols/yahoo/yahoochat.c:580
 msgid "Failed to join buddy in chat"
 msgstr "無法加入好友目前所在的聊天室"
 
-#: src/protocols/yahoo/yahoochat.c:559
+#: src/protocols/yahoo/yahoochat.c:581
 msgid "Maybe they're not in a chat?"
 msgstr "可能他(她)並不在聊天室內?"
 
-#: src/protocols/zephyr/zephyr.c:344
+#: src/protocols/yahoo/yahoochat.c:1301
+msgid "Unable to connect"
+msgstr "無法連線"
+
+#: src/protocols/yahoo/yahoochat.c:1301
+#, fuzzy
+msgid "Fetching the room list failed."
+msgstr "或許參與聊天室使用者已經到達上限?"
+
+#: src/protocols/yahoo/yahoochat.c:1346
+#, fuzzy
+msgid "Voices"
+msgstr "聲音"
+
+#: src/protocols/yahoo/yahoochat.c:1349
+msgid "Webcams"
+msgstr ""
+
+#: src/protocols/yahoo/yahoochat.c:1360 src/protocols/yahoo/yahoochat.c:1421
+#, fuzzy
+msgid "Unable to fetch room list."
+msgstr "無法設定 AIM 個人資料。"
+
+#: src/protocols/yahoo/yahoochat.c:1414
+#, fuzzy
+msgid "User Rooms"
+msgstr "使用者自定選項"
+
+#: src/protocols/zephyr/zephyr.c:525
 #, c-format
 msgid "<b>User:</b> %s<br>"
 msgstr "<b>使用者:</b>%s<br>"
 
-#: src/protocols/zephyr/zephyr.c:346
+#: src/protocols/zephyr/zephyr.c:527
 #, c-format
 msgid "<b>Alias:</b> %s<br>"
 msgstr "<b>別名:</b>%s<br>"
 
-#: src/protocols/zephyr/zephyr.c:348
+#: src/protocols/zephyr/zephyr.c:529
 msgid "<br>Hidden or not logged-in"
 msgstr "<br>隱藏或未登入"
 
-#: src/protocols/zephyr/zephyr.c:352
+#: src/protocols/zephyr/zephyr.c:533
 #, c-format
 msgid "<br>At %s since %s"
 msgstr "<br>從 %2$s 起已在 %1$s"
 
-#: src/protocols/zephyr/zephyr.c:584 src/protocols/zephyr/zephyr.c:585
+#: src/protocols/zephyr/zephyr.c:793 src/protocols/zephyr/zephyr.c:794
+#: src/protocols/zephyr/zephyr.c:982 src/protocols/zephyr/zephyr.c:983
 msgid "Anyone"
 msgstr "任何人"
 
-#: src/protocols/zephyr/zephyr.c:609
+#: src/protocols/zephyr/zephyr.c:820
 msgid "Already logged in with Zephyr"
 msgstr "已經登入 Zephyr"
 
-#: src/protocols/zephyr/zephyr.c:610
+#: src/protocols/zephyr/zephyr.c:821
 msgid ""
 "Because Zephyr uses your system username, you are unable to have multiple "
 "accounts on it when logged in as the same user."
 msgstr "因為 Zephyr 用您登入系統的帳號,您是不可能擁有多個 Zephyr 帳戶的。"
 
 # NOTE 這是法文po檔所用的處理方法,我認為比較清楚
-#: src/protocols/zephyr/zephyr.c:868
+#: src/protocols/zephyr/zephyr.c:1158
 msgid "ZLocate"
 msgstr "名錄搜尋 (ZLocate)"
 
@@ -7897,18 +8528,18 @@
 # NOTE 但另有說明(下列第二個鏈結)的實例似乎顯示 Class 基本上可以說是類別
 # NOTE 參閱 http://www.mit.edu/afs/sipb/project/doc/izephyr/html/node19.html 及其鏈結
 # NOTE 參閱 http://consult.stanford.edu/pub/communications/zephyr-guide
-#: src/protocols/zephyr/zephyr.c:908
+#: src/protocols/zephyr/zephyr.c:1198
 msgid "_Class:"
 msgstr "類別/聊天室(_C):"
 
 # XXX 暫譯
 # NOTE 參閱 http://www.mit.edu/afs/sipb/project/doc/izephyr/html/node19.html 及其鏈結
 # NOTE 參閱 http://consult.stanford.edu/pub/communications/zephyr-guide
-#: src/protocols/zephyr/zephyr.c:913
+#: src/protocols/zephyr/zephyr.c:1203
 msgid "_Instance:"
 msgstr "實體/頻道(_I):"
 
-#: src/protocols/zephyr/zephyr.c:918
+#: src/protocols/zephyr/zephyr.c:1208
 msgid "_Recipient:"
 msgstr "接受者(_R):"
 
@@ -7922,26 +8553,39 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/zephyr/zephyr.c:1049 src/protocols/zephyr/zephyr.c:1051
+#. *  description
+#: src/protocols/zephyr/zephyr.c:1358 src/protocols/zephyr/zephyr.c:1360
 msgid "Zephyr Protocol Plugin"
 msgstr "Zephyr 協定模組"
 
+#: src/protocols/zephyr/zephyr.c:1377
+msgid "Export to .anyone"
+msgstr ""
+
+#: src/protocols/zephyr/zephyr.c:1380
+msgid "Export to .zephyr.subs"
+msgstr ""
+
+#: src/protocols/zephyr/zephyr.c:1383
+msgid "Exposure"
+msgstr ""
+
 # TODO Untranslated
 #. Forbidden
-#: src/proxy.c:1014
+#: src/proxy.c:954
 msgid "Access denied: proxy server forbids port 80 tunnelling."
 msgstr ""
 
-#: src/proxy.c:1016
+#: src/proxy.c:956
 #, c-format
 msgid "Proxy connection error %d"
 msgstr "代理伺服器連線錯誤 %d"
 
-#: src/proxy.c:1736
+#: src/proxy.c:1695
 msgid "Invalid proxy settings"
 msgstr "無效的代理伺服器設定"
 
-#: src/proxy.c:1736
+#: src/proxy.c:1695
 msgid ""
 "Either the host name or port number specified for your given proxy type is "
 "invalid."
@@ -7949,43 +8593,43 @@
 "對於您目前所設定的代理伺服器型態來說,您所給定的伺服器名稱及通訊埠是無效的"
 
 #. * Custom away message.
-#: src/prpl.h:187
+#: src/prpl.h:189
 msgid "Custom"
 msgstr "使用者自定"
 
 #. *
 #. * A wrapper for gaim_request_action() that uses Accept and Cancel buttons.
 #.
-#: src/request.h:1028
+#: src/request.h:1247
 msgid "Accept"
 msgstr "接受"
 
-#: src/server.c:56
+#: src/server.c:58
 msgid "Please enter your password"
 msgstr "請輸入您的密碼"
 
-#: src/server.c:948
+#: src/server.c:960
 #, c-format
 msgid "(%d message)"
 msgid_plural "(%d messages)"
 msgstr[0] "(%d 個訊息)"
 msgstr[1] "(%d 個訊息)"
 
-#: src/server.c:961
+#: src/server.c:974
 msgid "(1 message)"
 msgstr "(一個訊息)"
 
-#: src/server.c:1145 src/server.c:1155
+#: src/server.c:1161 src/server.c:1171
 #, c-format
 msgid "%s logged in."
 msgstr "%s 登入。"
 
-#: src/server.c:1172 src/server.c:1180
+#: src/server.c:1188 src/server.c:1196
 #, c-format
 msgid "%s logged out."
 msgstr "%s 登出。"
 
-#: src/server.c:1227
+#: src/server.c:1243
 #, c-format
 msgid ""
 "%s has just been warned by %s.\n"
@@ -7994,11 +8638,11 @@
 "%s 剛剛被 %s 警告了。\n"
 "您的新警告等級為 %d%%"
 
-#: src/server.c:1230
+#: src/server.c:1246
 msgid "an anonymous person"
 msgstr "一個匿名者"
 
-#: src/server.c:1333
+#: src/server.c:1349
 #, c-format
 msgid ""
 "User '%s' invites %s to buddy chat room: '%s'\n"
@@ -8007,74 +8651,139 @@
 "使用者「%s」邀請 %s 到好友聊天室:「%s」\n"
 "%s"
 
-#: src/server.c:1337
+#: src/server.c:1353
 #, c-format
 msgid "User '%s' invites %s to buddy chat room: '%s'\n"
 msgstr "使用者「%s」邀請 %s 到好友聊天室:「%s」\n"
 
-#: src/server.c:1343
+#: src/server.c:1359
 msgid "Accept chat invitation?"
 msgstr "接受邀請嗎?"
 
 #. for people like myself who are too lazy to add an away msg :)
 #. I don't know who "myself" is in this context.  The exclamation point
 #. * makes it slightly less boring ;)
-#: src/status.c:35
+#: src/status.c:36
 msgid "Sorry, I ran out for a bit!"
 msgstr "不好意思,我離開一下下!"
 
-#: src/stock.c:83
+#: src/stock.c:86
+#, fuzzy
+msgid "_Alias"
+msgstr "別名(_A):"
+
+#: src/stock.c:88
 msgid "_Modify"
 msgstr "修改(_M)"
 
-#: src/stock.c:84
+#: src/stock.c:89
 msgid "_Open Mail"
 msgstr "開啟郵件(_O)"
 
-#: src/util.c:1893
+#: src/stock.c:91
+msgid "_Warn"
+msgstr "警告(_W)"
+
+#: src/util.c:1884
 msgid "Calculating..."
 msgstr "計算中..."
 
-#: src/util.c:1896
+#: src/util.c:1887
 msgid "Unknown."
 msgstr "未知。"
 
-#: src/util.c:1927 src/util.c:1932 src/util.c:1937 src/util.c:1940
+#: src/util.c:1918 src/util.c:1923 src/util.c:1928 src/util.c:1931
 msgid "day"
 msgid_plural "days"
 msgstr[0] "天"
 msgstr[1] "天"
 
-#: src/util.c:1928 src/util.c:1932 src/util.c:1946 src/util.c:1948
+#: src/util.c:1919 src/util.c:1923 src/util.c:1937 src/util.c:1939
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "小時"
 msgstr[1] "小時"
 
-#: src/util.c:1928 src/util.c:1937 src/util.c:1946 src/util.c:1951
+#: src/util.c:1919 src/util.c:1928 src/util.c:1937 src/util.c:1942
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "分"
 msgstr[1] "分"
 
-#: src/util.c:2283
+#: src/util.c:2274
 msgid "g003: Error opening connection.\n"
 msgstr "g003: 連線開啟錯誤。\n"
 
-#: src/win32/win32dep.c:271
+#: src/win32/win32dep.c:272
 msgid "Moving Gaim Settings.."
 msgstr "移動設定檔案中..."
 
-#: src/win32/win32dep.c:274
+#: src/win32/win32dep.c:275
 msgid "Moving Gaim user settings to: "
 msgstr "包含 Gaim 的使用者設定的目錄現在移至:"
 
-#: src/win32/win32dep.c:276
+#: src/win32/win32dep.c:277
 msgid "Notification"
 msgstr "通知"
 
-#~ msgid "First name"
-#~ msgstr "名"
+#~ msgid "_Screenname:"
+#~ msgstr "帳號(_S):"
+
+#~ msgid "_Get Info"
+#~ msgstr "取得資訊(_G)"
+
+#~ msgid "_IM"
+#~ msgstr "即時訊息(_I)"
+
+#~ msgid "Normal font size"
+#~ msgstr "正常字體"
+
+#~ msgid "Browser Options"
+#~ msgstr "瀏覽器選項"
+
+#~ msgid "Open new _window by default"
+#~ msgstr "預設為彈出一個新的視窗(_W)"
+
+#~ msgid "Bad Protocol"
+#~ msgstr "無效的協定"
+
+# FIXME 要覆查譯文,很可能譯錯了
+# NOTE Jabber 協定中 SASL Error 的一種,即 <invalid-realm/>
+# NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
+#~ msgid "Invalid Realm"
+#~ msgstr "領域無效"
+
+# XXX 要覆查譯文
+# NOTE Jabber 協定中 SASL Error 的一種,即 <mechanism-too-weak/>
+# NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
+#~ msgid "Mechanism Too Weak"
+#~ msgstr "認證機制太弱"
+
+#~ msgid "Registration of %s@%s failed: %s"
+#~ msgstr "%s@%s 註冊失敗:%s"
+
+#~ msgid "Unknown error occurred changing password"
+#~ msgstr "修改密碼期間出現了不明的錯誤"
+
+#~ msgid "Unable to join chat"
+#~ msgstr "無法加入聊天室"
+
+#~ msgid "Could not send %s to %s, protocol not supported."
+#~ msgstr "無法傳送 %s 至 %s;協定不被支援。"
+
+# XXX 參閱上列網站 (www.hypothetic.org) 第500號錯誤
+# NOTE 譯文更動 by Ambrose
+#~ msgid "Internal server error"
+#~ msgstr "伺服器內部錯誤"
+
+#~ msgid "Unable to read from MSN Nexus server."
+#~ msgstr "無法由 MSN 的 Nexus 伺服器讀取。"
+
+#~ msgid "MSN Nexus server returned invalid information."
+#~ msgstr "MSN 的 Nexus 伺服器傳回了無效的資訊。"
+
+#~ msgid "Unable to connect to passport server"
+#~ msgstr "無法連線到 Passport 伺服器。"
 
 #~ msgid "Disconnected"
 #~ msgstr "已停止連線"
@@ -8082,9 +8791,6 @@
 #~ msgid "Invalid response from server"
 #~ msgstr "無效的伺服器回應"
 
-#~ msgid "Unable to connect"
-#~ msgstr "無法連線"
-
 #~ msgid "Could not connect for transfer!"
 #~ msgstr "無法開啟傳輸的連線!"
 
@@ -8159,9 +8865,6 @@
 #~ msgid "Alias contact"
 #~ msgstr "給好友改別名"
 
-#~ msgid "_Screenname"
-#~ msgstr "帳號(_S)"
-
 #~ msgid "Alias buddy"
 #~ msgstr "為好友加上別名"
 
@@ -8390,9 +9093,6 @@
 #~ "again."
 #~ msgstr "和瀏覽器的溝通失敗。請關閉所有的視窗後重試。"
 
-#~ msgid "Alias"
-#~ msgstr "別名"
-
 #~ msgid "Group"
 #~ msgstr "群組"
 
@@ -8660,9 +9360,6 @@
 #~ msgid "Add Deny"
 #~ msgstr "加入拒絕"
 
-#~ msgid "_Alias:"
-#~ msgstr "別名(_A):"
-
 #~ msgid "Gaim Instant Messenger"
 #~ msgstr "Gaim"
 
@@ -8700,9 +9397,6 @@
 #~ msgid "Notice"
 #~ msgstr "通知"
 
-#~ msgid "New"
-#~ msgstr "新訊息"
-
 #~ msgid "Set Away Message"
 #~ msgstr "設定離開訊息"
 
@@ -8715,12 +9409,6 @@
 #~ msgid "Pager Host:"
 #~ msgstr "傳呼系統伺服器:"
 
-#~ msgid "Pager Port:"
-#~ msgstr "傳呼系統通訊埠:"
-
-#~ msgid "Rename Buddy"
-#~ msgstr "修改好友名稱"
-
 #~ msgid "Control-_W closes window"
 #~ msgstr "按下 Ctrl-W 關閉視窗(_W)"