changeset 8742:075f2e7cec73

[gaim-migrate @ 9497] 3 updates committer: Tailor Script <tailor@pidgin.im>
author Luke Schierer <lschiere@pidgin.im>
date Wed, 21 Apr 2004 15:18:24 +0000
parents b994b0223335
children fb48b9472ea5
files po/ChangeLog po/am.po po/bg.po po/zh_CN.po po/zh_TW.po
diffstat 5 files changed, 12536 insertions(+), 9842 deletions(-) [+]
line wrap: on
line diff
--- a/po/ChangeLog	Wed Apr 21 06:48:16 2004 +0000
+++ b/po/ChangeLog	Wed Apr 21 15:18:24 2004 +0000
@@ -2,10 +2,12 @@
 
 version 0.77cvs:
 	* Chinese (Simplified) translation updated (Funda Wang)
+	* Chinese (Traditional) translation updated (Ambrose C. Li)
 	* Czech translation updated (Miloslav Trmac)
 	* Danish translation updated (Morten Brix Pedersen (mbrix))
 	* Dutch translation updated (Vincent van Adrighem)
 	* English (British) translation updated (Luke Ross (lukeross))
+	* Finnish translation updated (Arto Alakulju)
 	* French translation updated (Eric Boumaour)
 	* German Translation updated (Bjoern Voigt)
 	* Macedonian translation added (Tomislav Markovski)
--- a/po/am.po	Wed Apr 21 06:48:16 2004 +0000
+++ b/po/am.po	Wed Apr 21 15:18:24 2004 +0000
@@ -6,7 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gaim 0.60 \n"
-"POT-Creation-Date: 2003-10-09 15:23-0700\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2004-04-20 21:45-0400\n"
 "PO-Revision-Date: 2003-04-08 09:23:11+EDT\n"
 "Last-Translator: Ge'ez Frontier Foundation <locales@geez.org>\n"
 "Language-Team: Amharic <locales@geez.org>\n"
@@ -21,14 +22,15 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/autorecon.c:105
+#: plugins/autorecon.c:110
 msgid "Auto-Reconnect"
 msgstr ""
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/autorecon.c:108 plugins/autorecon.c:110
+#. *  description
+#: plugins/autorecon.c:113 plugins/autorecon.c:115
 msgid "When you are kicked offline, this reconnects you."
 msgstr ""
 
@@ -51,6 +53,66 @@
 msgid "Check email every X seconds.\n"
 msgstr ""
 
+#: plugins/contact_priority.c:82
+msgid "Point values to use when..."
+msgstr ""
+
+#: plugins/contact_priority.c:91
+msgid "Buddy is offline:"
+msgstr ""
+
+#: plugins/contact_priority.c:105
+msgid "Buddy is away:"
+msgstr ""
+
+#: plugins/contact_priority.c:119
+msgid "Buddy is idle:"
+msgstr ""
+
+#: plugins/contact_priority.c:133
+msgid "Use last matching buddy"
+msgstr ""
+
+#. Explanation
+#: plugins/contact_priority.c:139
+msgid ""
+"The buddy with the lowest score is the buddy who will have priority in the "
+"contact.\n"
+"The default values (offline = 4,away = 2, and idle = 1)\n"
+"will use what used to be the built-in order active->idle->away->away+idle-"
+">offline."
+msgstr ""
+
+#: plugins/contact_priority.c:142
+msgid "Point values to use for Account..."
+msgstr ""
+
+#. *< api_version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: plugins/contact_priority.c:191
+msgid "Contact Priority"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *< summary
+#: plugins/contact_priority.c:194
+msgid ""
+"Allows for controlling the values associated with different buddy states."
+msgstr ""
+
+#. *< description
+#: plugins/contact_priority.c:196
+msgid ""
+"Allows for changing the point values of idle/away/offline states for buddies "
+"in contact priority computations."
+msgstr ""
+
 #.
 #. *  DEFINES, MACROS & DATA TYPES
 #.
@@ -69,7 +131,7 @@
 msgid "Gaim - Away"
 msgstr "ጌም - አዲስ እሜይል"
 
-#: plugins/docklet/docklet.c:114 src/gtkaccount.c:482 src/gtkaccount.c:1765
+#: plugins/docklet/docklet.c:114 src/gtkaccount.c:497 src/gtkaccount.c:1891
 msgid "Auto-login"
 msgstr ""
 
@@ -86,16 +148,19 @@
 msgid "New..."
 msgstr "አዲስ.."
 
-#: plugins/docklet/docklet.c:153 src/gtkblist.c:1916 src/gtkpounce.c:461
-#: src/gtkprefs.c:1473 src/protocols/gg/gg.c:51 src/protocols/irc/msgs.c:187
-#: src/protocols/jabber/jabber.c:868 src/protocols/jabber/jutil.c:97
-#: src/protocols/jabber/presence.c:81 src/protocols/oscar/oscar.c:2833
-#: src/protocols/oscar/oscar.c:4529 src/protocols/oscar/oscar.c:5464
-#: src/protocols/oscar/oscar.c:6064
+#: plugins/docklet/docklet.c:153 src/gtkprefs.c:1626 src/protocols/gg/gg.c:51
+#: src/protocols/irc/msgs.c:187 src/protocols/jabber/jabber.c:952
+#: src/protocols/jabber/jutil.c:32 src/protocols/jabber/presence.c:63
+#: src/protocols/jabber/presence.c:119 src/protocols/novell/novell.c:2144
+#: src/protocols/novell/novell.c:2259 src/protocols/novell/novell.c:2311
+#: src/protocols/oscar/oscar.c:520 src/protocols/oscar/oscar.c:4825
+#: src/protocols/oscar/oscar.c:5808 src/protocols/oscar/oscar.c:6426
 msgid "Away"
 msgstr ""
 
-#: plugins/docklet/docklet.c:159 src/away.c:515
+#. else...
+#: plugins/docklet/docklet.c:159 src/away.c:522
+#: src/protocols/oscar/oscar.c:4743 src/protocols/oscar/oscar.c:6434
 msgid "Back"
 msgstr "ወደኋላ"
 
@@ -103,16 +168,16 @@
 msgid "Mute Sounds"
 msgstr ""
 
-#: plugins/docklet/docklet.c:172 src/gtkft.c:559
+#: 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:1924 src/main.c:323
+#: plugins/docklet/docklet.c:173 src/gtkaccount.c:2070 src/main.c:286
 msgid "Accounts"
 msgstr ""
 
-#: plugins/docklet/docklet.c:174 src/gtkprefs.c:2337 src/main.c:333
+#: plugins/docklet/docklet.c:174 src/gtkprefs.c:2576 src/main.c:292
 msgid "Preferences"
 msgstr "ምርጫዎች"
 
@@ -166,33 +231,45 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/filectl.c:201
+#: plugins/filectl.c:222
 msgid "Gaim File Control"
 msgstr ""
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/filectl.c:204 plugins/filectl.c:206
+#. *  description
+#: plugins/filectl.c:225 plugins/filectl.c:227
 msgid "Allows you to control Gaim by entering commands in a file."
 msgstr ""
 
-#: plugins/gaim-remote/remote.c:88
+#: plugins/gaim-remote/remote.c:89
 msgid "Not connected to AIM"
 msgstr ""
 
-#: plugins/gaim-remote/remote.c:97 plugins/gaim-remote/remote.c:136
+#: plugins/gaim-remote/remote.c:98 plugins/gaim-remote/remote.c:137
 msgid "No screenname given."
 msgstr ""
 
-#: plugins/gaim-remote/remote.c:173
+#: plugins/gaim-remote/remote.c:174
 msgid "No roomname given."
 msgstr ""
 
-#: plugins/gaim-remote/remote.c:192
+#: plugins/gaim-remote/remote.c:193
 msgid "Invalid AIM URI"
 msgstr ""
 
+#: plugins/gaim-remote/remote.c:651
+#, c-format
+msgid ""
+"Failed to assign %s to a socket:\n"
+"%s"
+msgstr ""
+
+#: plugins/gaim-remote/remote.c:674
+msgid "Unable to open socket"
+msgstr ""
+
 #. *< api_version
 #. *< type
 #. *< ui_requirement
@@ -200,7 +277,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/gaim-remote/remote.c:714
+#: plugins/gaim-remote/remote.c:722
 #, fuzzy
 msgid "Remote Control"
 msgstr "መድረክን አስወግድ"
@@ -208,12 +285,12 @@
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/gaim-remote/remote.c:717
+#: plugins/gaim-remote/remote.c:725
 msgid "Provides remote control for gaim applications."
 msgstr ""
 
 #. *  description
-#: plugins/gaim-remote/remote.c:719
+#: plugins/gaim-remote/remote.c:727
 msgid ""
 "Gives Gaim the ability to be remote-controlled through third-party "
 "applications or through the gaim-remote tool."
@@ -226,19 +303,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/gaiminc.c:81
+#: plugins/gaiminc.c:87
 msgid "Gaim Demonstration Plugin"
 msgstr ""
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/gaiminc.c:84
+#: plugins/gaiminc.c:90
 msgid "An example plugin that does stuff - see the description."
 msgstr ""
 
 #. *  description
-#: plugins/gaiminc.c:86
+#: plugins/gaiminc.c:92
 msgid ""
 "This is a really cool plugin that does a lot of stuff:\n"
 "- It tells you who wrote the program when you log in\n"
@@ -293,47 +370,185 @@
 "Drag up and then to the right to switch to the next conversation."
 msgstr ""
 
-#: plugins/gtik.c:719
-msgid "Gnome Stock Ticker Properties"
-msgstr ""
-
-#: plugins/gtik.c:731
-msgid "Update Frequency in min"
-msgstr ""
-
-#: plugins/gtik.c:747
-msgid "Enter symbols delimited with \"+\" in the box below."
-msgstr ""
-
-#. OUTPUT FORMAT and SCROLL DIRECTION
-#: plugins/gtik.c:757
-msgid "Check this box to display only symbols and price:"
-msgstr ""
-
-#: plugins/gtik.c:758
-msgid "Check this box to scroll left to right:"
-msgstr ""
-
-#: plugins/gtik.c:994
-msgid "(No"
-msgstr "(አይ"
-
-#: plugins/gtik.c:995
-msgid "Change"
-msgstr "ለውጥ"
-
-#: plugins/history.c:98
+#: 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:2964 src/gtkprefs.c:873 src/gtkprefs.c:1654
+#: src/protocols/jabber/jabber.c:916
+msgid "None"
+msgstr "ምንም"
+
+#: plugins/gevolution/add_buddy_dialog.c:190
+#: plugins/gevolution/assoc-buddy.c:180 src/gtkprefs.c:1991
+#: src/gtkroomlist.c:561 src/protocols/jabber/jabber.c:591
+#: src/protocols/msn/msn.c:1395 src/protocols/trepia/trepia.c:398
+msgid "Name"
+msgstr "ስም"
+
+#: plugins/gevolution/add_buddy_dialog.c:201
+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:6697
+msgid "Search"
+msgstr ""
+
+#: plugins/gevolution/add_buddy_dialog.c:566
+#: plugins/gevolution/new_person_dialog.c:310 src/gtkblist.c:3982
+#: src/gtkblist.c:4310
+#, fuzzy
+msgid "Group:"
+msgstr "መድረክ፦ (_G)"
+
+#. "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 ""
+
+#. Add the disclosure
+#: plugins/gevolution/assoc-buddy.c:451
+msgid "Show user details"
+msgstr ""
+
+#: plugins/gevolution/assoc-buddy.c:452
+msgid "Hide user details"
+msgstr ""
+
+#. "Associate Buddy" button
+#: plugins/gevolution/assoc-buddy.c:505
+msgid "_Associate Buddy"
+msgstr ""
+
+#: plugins/gevolution/gevo-util.c:66 plugins/gevolution/gevolution.c:90
+#: src/blist.c:685 src/blist.c:872 src/blist.c:2105 src/gtkblist.c:3807
+#: src/protocols/jabber/roster.c:66 src/protocols/msn/notification.c:793
+msgid "Buddies"
+msgstr ""
+
+#: plugins/gevolution/gevolution.c:214
+msgid "Add to Address Book"
+msgstr ""
+
+#. Configuration frame
+#: plugins/gevolution/gevolution.c:347
+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
+#, fuzzy
+msgid "Account"
+msgstr ""
+"\n"
+"<b>ቅጽል ስም፦</b>"
+
+#. *< 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
+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
+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:320
+#: src/protocols/oscar/oscar.c:425
+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:70
 msgid "History"
 msgstr "ታሪክ"
 
-#: plugins/history.c:100
+#: plugins/history.c:72
 msgid "Shows recently logged conversations in new conversations."
 msgstr ""
 
-#: plugins/history.c:101
-msgid ""
-"When a new conversation is opened this plugin will insert the last XXX of "
-"the last conversation into the current conversation."
+#: plugins/history.c:73
+msgid ""
+"When a new conversation is opened this plugin will insert the last "
+"conversation into the current conversation."
 msgstr ""
 
 #. *< api_version
@@ -350,6 +565,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 ""
@@ -366,7 +582,7 @@
 msgid "idle for"
 msgstr ""
 
-#: plugins/idle.c:90 plugins/timestamp.c:88
+#: plugins/idle.c:90 plugins/timestamp.c:109
 msgid "minutes."
 msgstr "ደቂቃዎች።"
 
@@ -431,14 +647,18 @@
 msgid "Test plugin IPC support, as a server. This registers the IPC commands."
 msgstr ""
 
-#: plugins/mailchk.c:156
+#: plugins/mailchk.c:157
 msgid "Mail Checker"
 msgstr ""
 
-#: plugins/mailchk.c:158 plugins/mailchk.c:159
+#: plugins/mailchk.c:159
 msgid "Checks for new local mail."
 msgstr ""
 
+#: plugins/mailchk.c:160
+msgid "Adds a small box to the buddy list that shows if you have new mail."
+msgstr ""
+
 #. ---------- "Notify For" ----------
 #: plugins/notify.c:572
 msgid "Notify For"
@@ -521,6 +741,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 ""
@@ -532,13 +753,14 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/perl/perl.c:524
+#: plugins/perl/perl.c:530
 msgid "Perl Plugin Loader"
 msgstr ""
 
 #. *< 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 ""
 
@@ -556,6 +778,29 @@
 "'Enter' in the entry box to send. Watch the debug window."
 msgstr ""
 
+#: plugins/relnot.c:62
+#, c-format
+msgid "You are using Gaim version %s.  The current version is %s.<hr>"
+msgstr ""
+
+#: plugins/relnot.c:68
+#, fuzzy, c-format
+msgid ""
+"<b>ChangeLog:</b>\n"
+"%s<br><br>"
+msgstr "<b>ሁኔታ፦</b> %s"
+
+#: plugins/relnot.c:73
+#, c-format
+msgid ""
+"You can get version %s from:<br><a href=\"http://gaim.sourceforge.net/"
+"\">http://gaim.sourceforge.net</a>."
+msgstr ""
+
+#: plugins/relnot.c:77 plugins/relnot.c:78
+msgid "New Version Available"
+msgstr ""
+
 #. *< api_version
 #. *< type
 #. *< ui_requirement
@@ -563,14 +808,40 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/signals-test.c:502
+#: plugins/relnot.c:134
+msgid "Release Notification"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+#: plugins/relnot.c:137
+msgid "Checks periodically for new releases."
+msgstr ""
+
+#. *  description
+#: plugins/relnot.c:139
+msgid ""
+"Checks periodically for new releases and notifies the user with the "
+"ChangeLog."
+msgstr ""
+
+#. *< api_version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: plugins/signals-test.c:465
 msgid "Signals Test"
 msgstr ""
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/signals-test.c:505 plugins/signals-test.c:507
+#. *  description
+#: plugins/signals-test.c:468 plugins/signals-test.c:470
 msgid "Test to see that all signals are working properly."
 msgstr ""
 
@@ -588,6 +859,7 @@
 #. *< name
 #. *< version
 #. *  summary
+#. *  description
 #: plugins/simple.c:34 plugins/simple.c:36
 msgid "Tests to see that most things are working."
 msgstr ""
@@ -631,14 +903,15 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/ssl/ssl-gnutls.c:190
+#: plugins/ssl/ssl-gnutls.c:223
 msgid "GNUTLS"
 msgstr ""
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/ssl/ssl-gnutls.c:193 plugins/ssl/ssl-gnutls.c:195
+#. *  description
+#: plugins/ssl/ssl-gnutls.c:226 plugins/ssl/ssl-gnutls.c:228
 msgid "Provides SSL support through GNUTLS."
 msgstr ""
 
@@ -649,14 +922,15 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/ssl/ssl-nss.c:287
+#: plugins/ssl/ssl-nss.c:312
 msgid "NSS"
 msgstr ""
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/ssl/ssl-nss.c:290 plugins/ssl/ssl-nss.c:292
+#. *  description
+#: plugins/ssl/ssl-nss.c:315 plugins/ssl/ssl-nss.c:317
 msgid "Provides SSL support through Mozilla NSS."
 msgstr ""
 
@@ -674,11 +948,12 @@
 #. *< name
 #. *< version
 #. *  summary
+#. *  description
 #: plugins/ssl/ssl.c:94 plugins/ssl/ssl.c:96
 msgid "Provides a wrapper around SSL support libraries."
 msgstr ""
 
-#: plugins/statenotify.c:30 src/gtkpounce.c:843
+#: plugins/statenotify.c:30 src/gtkpounce.c:820
 #, c-format
 msgid "%s has gone away."
 msgstr ""
@@ -712,17 +987,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:344
+#: plugins/tcl/tcl.c:349
 msgid "Tcl Plugin Loader"
 msgstr ""
 
-#: plugins/tcl/tcl.c:346 plugins/tcl/tcl.c:347
+#: plugins/tcl/tcl.c:351 plugins/tcl/tcl.c:352
 msgid "Provides support for loading Tcl plugins"
 msgstr ""
 
@@ -733,26 +1009,27 @@
 #. *< 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 ""
 
-#: plugins/timestamp.c:74
+#: plugins/timestamp.c:95
 msgid "iChat Timestamp"
 msgstr ""
 
-#: plugins/timestamp.c:81
+#: plugins/timestamp.c:102
 msgid "Delay"
 msgstr ""
 
-#: plugins/timestamp.c:94
+#: plugins/timestamp.c:115
 msgid "_Apply"
 msgstr "ተጠቀም (_A)"
 
@@ -763,14 +1040,15 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/timestamp.c:150
+#: plugins/timestamp.c:173
 msgid "Timestamp"
 msgstr ""
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/timestamp.c:153 plugins/timestamp.c:155
+#. *  description
+#: plugins/timestamp.c:176 plugins/timestamp.c:178
 msgid "Adds iChat-style timestamps to conversations every N minutes."
 msgstr ""
 
@@ -794,7 +1072,7 @@
 msgstr ""
 
 #. Buddy List trans options
-#: plugins/win32/transparency/win2ktrans.c:365 src/gtkprefs.c:845
+#: plugins/win32/transparency/win2ktrans.c:365 src/gtkprefs.c:876
 msgid "Buddy List Window"
 msgstr ""
 
@@ -816,6 +1094,7 @@
 #. *< name
 #. *< version
 #. *  summary
+#. *  description
 #: plugins/win32/transparency/win2ktrans.c:425
 #: plugins/win32/transparency/win2ktrans.c:427
 msgid ""
@@ -838,8 +1117,8 @@
 msgstr ""
 
 #. Buddy List
-#: plugins/win32/winprefs/winprefs.c:366 src/gtkblist.c:1756
-#: src/gtkprefs.c:2270
+#: plugins/win32/winprefs/winprefs.c:366 src/gtkblist.c:3005
+#: src/gtkprefs.c:2490
 msgid "Buddy List"
 msgstr ""
 
@@ -858,8 +1137,8 @@
 msgstr ""
 
 #. Conversations
-#: plugins/win32/winprefs/winprefs.c:386 src/gtkprefs.c:894
-#: src/gtkprefs.c:2271
+#: plugins/win32/winprefs/winprefs.c:386 src/gtkprefs.c:914
+#: src/gtkprefs.c:2491 src/protocols/msn/msn.c:1621
 msgid "Conversations"
 msgstr ""
 
@@ -875,52 +1154,56 @@
 msgid "Options specific to Windows Gaim."
 msgstr ""
 
-#: src/about.c:57
-#, c-format
-msgid "About Gaim v%s"
-msgstr ""
-
-#: src/about.c:89
+#: src/about.c:59
+msgid "About Gaim"
+msgstr ""
+
+#: src/about.c:74
+#, c-format
+msgid "<span weight=\"bold\" size=\"larger\">Gaim v%s</span>"
+msgstr ""
+
+#: 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 "
 "written using Gtk+ and is licensed under the GPL.<BR><BR>"
 msgstr ""
 
-#: src/about.c:99
-msgid "<FONT SIZE=\"3\">IRC:</FONT> #gaim on irc.freenode.net<BR><BR>"
-msgstr ""
-
 #: src/about.c:104
+msgid "<FONT SIZE=\"4\">IRC:</FONT> #gaim on irc.freenode.net<BR><BR>"
+msgstr ""
+
+#: src/about.c:109
 msgid "Active Developers"
 msgstr ""
 
-#: src/about.c:105
+#: src/about.c:110
 #, fuzzy
 msgid "maintainer"
 msgstr "ደቂቃ"
 
-#: src/about.c:107
+#: src/about.c:112
 msgid "lead developer"
 msgstr ""
 
-#: src/about.c:110
+#: src/about.c:115
 msgid "developer & webmaster"
 msgstr ""
 
-#: src/about.c:111
+#: src/about.c:116
 msgid "win32 port"
 msgstr ""
 
-#: src/about.c:114 src/about.c:115 src/about.c:116
+#: src/about.c:119 src/about.c:120 src/about.c:121
 msgid "developer"
 msgstr ""
 
-#: src/about.c:117
+#: src/about.c:122
 msgid "support"
 msgstr ""
 
-#: src/about.c:124
+#: src/about.c:129
 msgid "Crazy Patch Writers"
 msgstr ""
 
@@ -957,11 +1240,11 @@
 msgid "Current Translators"
 msgstr ""
 
-#: src/about.c:163 src/about.c:192
+#: src/about.c:163 src/about.c:197
 msgid "Catalan"
 msgstr ""
 
-#: src/about.c:164 src/about.c:193
+#: src/about.c:164 src/about.c:198
 msgid "Czech"
 msgstr ""
 
@@ -970,225 +1253,237 @@
 msgid "Danish"
 msgstr "ዝርዝሮች"
 
-#: src/about.c:166 src/about.c:194
+#: src/about.c:166
+msgid "British English"
+msgstr ""
+
+#: src/about.c:167 src/about.c:199
 msgid "German"
 msgstr ""
 
-#: src/about.c:167 src/about.c:195
+#: src/about.c:168 src/about.c:200
 msgid "Spanish"
 msgstr ""
 
-#: src/about.c:168 src/about.c:196
+#: src/about.c:169 src/about.c:201
+#, fuzzy
+msgid "Finnish"
+msgstr "ዝርዝሮች"
+
+#: src/about.c:170 src/about.c:202
 msgid "French"
 msgstr ""
 
-#: src/about.c:169
+#: src/about.c:171
 msgid "Hindi"
 msgstr ""
 
-#: src/about.c:170
+#: src/about.c:172
 msgid "Hungarian"
 msgstr ""
 
-#: src/about.c:171 src/about.c:198
+#: src/about.c:173 src/about.c:204
 #, fuzzy
 msgid "Italian"
 msgstr "አይታሊክ ማድረጊያ"
 
-#: src/about.c:172 src/about.c:200
+#: src/about.c:174 src/about.c:206
 msgid "Korean"
 msgstr ""
 
-#: src/about.c:173
-msgid "Dutch; Flemish"
-msgstr ""
-
-#: src/about.c:174 src/about.c:202
-#, fuzzy
-msgid "Polish"
-msgstr "ተጨማሪ ፕሮግራሞች (Plugins)"
-
 #: src/about.c:175
-msgid "Portuguese-Brazil"
+msgid "Dutch; Flemish"
 msgstr ""
 
 #: src/about.c:176
-msgid "Portuguese-Portugal"
+msgid "Macedonian"
 msgstr ""
 
 #: src/about.c:177
-msgid "Romanian"
-msgstr ""
-
-#: src/about.c:178 src/about.c:203
-msgid "Russian"
-msgstr ""
+msgid "Norwegian"
+msgstr ""
+
+#: src/about.c:178 src/about.c:207
+#, fuzzy
+msgid "Polish"
+msgstr "ተጨማሪ ፕሮግራሞች (Plugins)"
 
 #: src/about.c:179
-msgid "Serbian"
-msgstr ""
-
-#: src/about.c:180 src/about.c:205
-msgid "Swedish"
+msgid "Portuguese"
+msgstr ""
+
+#: src/about.c:180
+msgid "Portuguese-Brazil"
 msgstr ""
 
 #: src/about.c:181
+msgid "Romanian"
+msgstr ""
+
+#: src/about.c:182 src/about.c:208
+msgid "Russian"
+msgstr ""
+
+#: src/about.c:183
+msgid "Serbian"
+msgstr ""
+
+#: src/about.c:184 src/about.c:210
+msgid "Swedish"
+msgstr ""
+
+#: src/about.c:185
+#, fuzzy
+msgid "Vietnamese"
+msgstr "የፋይል ስም"
+
+#: src/about.c:185
+msgid "Gnome Vi Team"
+msgstr ""
+
+#: src/about.c:186
 msgid "Simplified Chinese"
 msgstr ""
 
-#: src/about.c:182
+#: src/about.c:187
 msgid "Traditional Chinese"
 msgstr ""
 
-#: src/about.c:189
+#: src/about.c:194
 msgid "Past Translators"
 msgstr ""
 
-#: src/about.c:190
+#: src/about.c:195
 #, fuzzy
 msgid "Amharic"
 msgstr "አውቶማቲክ"
 
-#: src/about.c:191
+#: src/about.c:196
 msgid "Bulgarian"
 msgstr ""
 
-#: src/about.c:197
+#: src/about.c:203
 msgid "Hebrew"
 msgstr ""
 
-#: src/about.c:199
+#: src/about.c:205
 msgid "Japanese"
 msgstr ""
 
-#: src/about.c:201
-msgid "Norwegian"
-msgstr ""
-
-#: src/about.c:204
+#: src/about.c:209
 msgid "Slovak"
 msgstr ""
 
-#: src/about.c:206
+#: src/about.c:211
 #, fuzzy
 msgid "Chinese"
 msgstr "ጣቢያ፦"
 
-#: src/about.c:219 src/dialogs.c:2290 src/gtkrequest.c:205
-#: src/protocols/msn/msn.c:247
-msgid "Close"
-msgstr "ዝጋ"
-
-#: src/account.c:265 src/protocols/jabber/jabber.c:918
+#: src/account.c:279 src/protocols/jabber/jabber.c:993
 msgid "New passwords do not match."
 msgstr ""
 
-#: src/account.c:273
+#: src/account.c:288
 msgid "Fill out all fields completely."
 msgstr ""
 
-#: src/account.c:298
+#: src/account.c:313
 #, fuzzy
 msgid "Original password"
 msgstr " የመጀመሪያው ሚስጢራዊ ቃል"
 
-#: src/account.c:304
+#: src/account.c:320
 #, fuzzy
 msgid "New password"
 msgstr "አዲስ ሚስጢራዊ ቃል"
 
-#: src/account.c:310
+#: src/account.c:327
 #, fuzzy
 msgid "New password (again)"
 msgstr "አዲስ ሚስጢራዊ ቃል"
 
-#: src/account.c:315
+#: src/account.c:333
 #, fuzzy, c-format
 msgid "Change password for %s"
 msgstr "ሚስጢራዊ ቃልን ለውጥ"
 
-#: src/account.c:321
+#: src/account.c:341
 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:324 src/connection.c:193 src/dialogs.c:1812
-#: src/dialogs.c:1855 src/dialogs.c:1986 src/gtkblist.c:1138
-#: src/gtkrequest.c:202 src/protocols/jabber/jabber.c:963
-#: 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:2448 src/protocols/oscar/oscar.c:2528
-#: src/protocols/oscar/oscar.c:6114 src/protocols/oscar/oscar.c:6210
-#: src/protocols/oscar/oscar.c:6259 src/protocols/oscar/oscar.c:6339
-#: src/protocols/yahoo/yahoo.c:2232 src/request.h:852
+#: src/account.c:344 src/connection.c:198 src/dialogs.c:471 src/dialogs.c:527
+#: src/gtkblist.c:2363 src/gtkrequest.c:235 src/protocols/jabber/jabber.c:1038
+#: src/protocols/jabber/xdata.c:337 src/protocols/msn/msn.c:195
+#: src/protocols/msn/msn.c:206 src/protocols/msn/msn.c:217
+#: src/protocols/msn/msn.c:228 src/protocols/oscar/oscar.c:2760
+#: src/protocols/oscar/oscar.c:2841 src/protocols/oscar/oscar.c:6487
+#: src/protocols/oscar/oscar.c:6583 src/protocols/oscar/oscar.c:6632
+#: src/protocols/oscar/oscar.c:6714 src/protocols/yahoo/yahoo.c:2504
+#: src/protocols/yahoo/yahoo.c:2512 src/request.h:1240
 msgid "OK"
 msgstr "እሺ"
 
-#. Cancel button.
-#: src/account.c:325 src/account.c:359 src/buddy_chat.c:375
-#: src/connection.c:194 src/dialogs.c:466 src/dialogs.c:478 src/dialogs.c:491
-#: src/dialogs.c:512 src/dialogs.c:897 src/dialogs.c:1646 src/dialogs.c:1813
-#: src/dialogs.c:1856 src/dialogs.c:1993 src/gtkaccount.c:1619
-#: src/gtkaccount.c:2087 src/gtkblist.c:1139 src/gtkblist.c:3038
-#: src/gtkconn.c:147 src/gtkprivacy.c:568 src/gtkprivacy.c:581
-#: src/gtkprivacy.c:606 src/gtkprivacy.c:617 src/gtkrequest.c:203
-#: src/protocols/icq/gaim_icq.c:277 src/protocols/jabber/buddy.c:520
-#: src/protocols/jabber/jabber.c:613 src/protocols/jabber/jabber.c:964
-#: 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:2412
-#: src/protocols/oscar/oscar.c:2449 src/protocols/oscar/oscar.c:2484
-#: src/protocols/oscar/oscar.c:2529 src/protocols/oscar/oscar.c:5942
-#: src/protocols/oscar/oscar.c:6115 src/protocols/oscar/oscar.c:6211
-#: src/protocols/oscar/oscar.c:6260 src/protocols/oscar/oscar.c:6325
-#: src/protocols/oscar/oscar.c:6340 src/protocols/trepia/trepia.c:338
-#: src/protocols/yahoo/yahoo.c:2233 src/request.h:852 src/request.h:862
+#: src/account.c:345 src/account.c:383 src/connection.c:199 src/dialogs.c:305
+#: src/dialogs.c:317 src/dialogs.c:330 src/dialogs.c:351 src/dialogs.c:472
+#: src/dialogs.c:528 src/dialogs.c:851 src/dialogs.c:872 src/dialogs.c:889
+#: src/dialogs.c:908 src/gtkaccount.c:1744 src/gtkaccount.c:2235
+#: src/gtkblist.c:2364 src/gtkblist.c:4349 src/gtkconn.c:168
+#: src/gtkimhtmltoolbar.c:399 src/gtkprivacy.c:575 src/gtkprivacy.c:588
+#: src/gtkprivacy.c:613 src/gtkprivacy.c:624 src/gtkrequest.c:236
+#: src/protocols/icq/gaim_icq.c:277 src/protocols/jabber/buddy.c:514
+#: src/protocols/jabber/chat.c:693 src/protocols/jabber/jabber.c:660
+#: src/protocols/jabber/jabber.c:1039 src/protocols/jabber/xdata.c:338
+#: src/protocols/msn/msn.c:196 src/protocols/msn/msn.c:207
+#: src/protocols/msn/msn.c:218 src/protocols/msn/msn.c:229
+#: src/protocols/msn/msn.c:242 src/protocols/oscar/oscar.c:2722
+#: src/protocols/oscar/oscar.c:2761 src/protocols/oscar/oscar.c:2797
+#: src/protocols/oscar/oscar.c:2842 src/protocols/oscar/oscar.c:6305
+#: src/protocols/oscar/oscar.c:6488 src/protocols/oscar/oscar.c:6584
+#: src/protocols/oscar/oscar.c:6633 src/protocols/oscar/oscar.c:6698
+#: src/protocols/oscar/oscar.c:6715 src/protocols/trepia/trepia.c:347
+#: src/protocols/yahoo/yahoo.c:2505 src/protocols/yahoo/yahoo.c:2513
+#: src/request.h:1240 src/request.h:1250
 msgid "Cancel"
 msgstr "ተወው"
 
-#: src/account.c:351
+#: src/account.c:374
 #, c-format
 msgid "Change user information for %s"
 msgstr ""
 
-#: src/account.c:358 src/dialogs.c:893 src/dialogs.c:1634 src/dialogs.c:2299
-#: src/gtkrequest.c:209 src/protocols/jabber/buddy.c:519
-#: src/protocols/trepia/trepia.c:337
+#: src/account.c:382 src/dialogs.c:839 src/gtkrequest.c:242
+#: src/protocols/jabber/buddy.c:513 src/protocols/trepia/trepia.c:346
 msgid "Save"
 msgstr "አስቀምጥ"
 
-#: src/away.c:208
-msgid "Gaim - Away!"
-msgstr ""
-
-#: src/away.c:269
+#: src/away.c:210
+msgid "Away!"
+msgstr ""
+
+#: 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:548 src/gtkprefs.c:2273
+#: src/blist.c:590 src/gtkprefs.c:2493
 msgid "Chats"
 msgstr ""
 
-#: src/blist.c:643 src/blist.c:816 src/blist.c:2018 src/gtkblist.c:2528
-#: src/protocols/jabber/roster.c:66 src/protocols/msn/notification.c:1146
-msgid "Buddies"
-msgstr ""
-
-#: src/blist.c:1103
+#: src/blist.c:1192
 #, c-format
 msgid ""
 "%d buddy from group %s was not removed because its account was not logged "
@@ -1199,139 +1494,116 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/blist.c:1112
+#: src/blist.c:1201
 msgid "Group not removed"
 msgstr ""
 
-#: src/blist.c:1163 src/gtkaccount.c:159 src/gtkpounce.c:307
-#: src/gtkutils.c:839 src/protocols/jabber/auth.c:97
-#: src/protocols/jabber/buddy.c:571
+#: src/blist.c:1251 src/gtkaccount.c:164 src/gtkft.c:153 src/gtkutils.c:860
+#: src/protocols/jabber/buddy.c:569 src/protocols/novell/novell.c:2156
 msgid "Unknown"
 msgstr "ያልታወቀ"
 
-#: src/blist.c:1491
+#: src/blist.c:1578
 msgid "Invalid Groupname"
 msgstr ""
 
-#: src/blist.c:2135
+#: src/blist.c:2220
 msgid ""
 "An error was encountered parsing your buddy list.  It has not been loaded."
 msgstr ""
 
-#: src/blist.c:2137
+#: src/blist.c:2222
 msgid "Buddy List Error"
 msgstr ""
 
-#: src/buddy_chat.c:316 src/gtkblist.c:2931
-msgid ""
-"You are not currently signed on with any protocols that have the ability to "
-"chat."
-msgstr ""
-
-#: src/buddy_chat.c:330
-msgid "Join Chat"
-msgstr "ውሪን አገጣጥም"
-
-#: src/buddy_chat.c:336
-msgid "Buddy Chat"
-msgstr ""
-
-#: src/buddy_chat.c:346
-msgid "Join Chat As:"
-msgstr ""
-
-#. Join button.
-#: src/buddy_chat.c:369
-msgid "Join"
-msgstr ""
-
-#: 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 ""
 
-#: src/connection.c:122
+#: src/connection.c:124
 msgid "Registration Error"
 msgstr ""
 
-#: src/connection.c:170 src/gtkconn.c:278
+#: src/connection.c:175
 #, fuzzy
 msgid "Connection Error"
 msgstr "ተገናኝቷል"
 
-#: src/connection.c:191
+#: src/connection.c:196
 #, c-format
 msgid "Enter password for %s"
 msgstr ""
 
-#: src/conversation.c:324
+#: src/conversation.c:296
 msgid "Unable to send message. The message is too large."
 msgstr ""
 
-#: src/conversation.c:332
+#: src/conversation.c:304
 msgid "Unable to send message."
 msgstr ""
 
-#: src/conversation.c:1888
+#: src/conversation.c:1969
 #, c-format
 msgid "%s entered the room."
 msgstr ""
 
-#: src/conversation.c:1891
+#: src/conversation.c:1972
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr ""
 
-#: src/conversation.c:1976
+#: src/conversation.c:2064
+#, c-format
+msgid "You are now known as %s"
+msgstr ""
+
+#: src/conversation.c:2067
 #, c-format
 msgid "%s is now known as %s"
 msgstr ""
 
-#: src/conversation.c:2018
+#: src/conversation.c:2110
 #, c-format
 msgid "%s left the room (%s)."
 msgstr ""
 
-#: src/conversation.c:2020
+#: src/conversation.c:2112
 #, c-format
 msgid "%s left the room."
 msgstr ""
 
-#: src/conversation.c:2093
+#: src/conversation.c:2185
 #, fuzzy, c-format
 msgid "(+%d more)"
 msgstr "(%d መልዕክቶች)"
 
-#: src/conversation.c:2095
+#: src/conversation.c:2187
 #, c-format
 msgid " left the room (%s)."
 msgstr ""
 
-#: src/conversation.c:2377
+#: src/conversation.c:2467
 msgid "Last created window"
 msgstr ""
 
-#: src/conversation.c:2379
+#: src/conversation.c:2469 src/gtkprefs.c:1402
 msgid "New window"
 msgstr "አዲስ መስኮት"
 
-#: src/conversation.c:2381
+#: src/conversation.c:2471
 msgid "By group"
 msgstr "በመድረክ"
 
-#: src/conversation.c:2383
+#: src/conversation.c:2473
 msgid "By account"
 msgstr ""
 
-#: src/dialogs.c:314
+#: src/dialogs.c:154
 msgid "Warn User"
 msgstr ""
 
-#: src/dialogs.c:317
-msgid "_Warn"
-msgstr ""
-
-#: src/dialogs.c:333
+#: src/dialogs.c:173
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Warn %s?</span>\n"
@@ -1340,271 +1612,175 @@
 "harsher rate limiting.\n"
 msgstr ""
 
-#: src/dialogs.c:342
+#: src/dialogs.c:182
 msgid "Warn _anonymously?"
 msgstr ""
 
-#: src/dialogs.c:349
+#: src/dialogs.c:189
 msgid "<b>Anonymous warnings are less severe.</b>"
 msgstr ""
 
-#: src/dialogs.c:462
+#: src/dialogs.c:301
 #, c-format
 msgid ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr ""
 
-#: src/dialogs.c:464 src/dialogs.c:465
+#: src/dialogs.c:303 src/dialogs.c:304
 msgid "Remove Buddy"
 msgstr ""
 
-#: src/dialogs.c:474
+#: src/dialogs.c:313
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
 "continue?"
 msgstr ""
 
-#: src/dialogs.c:476 src/dialogs.c:477
+#: src/dialogs.c:315 src/dialogs.c:316
 #, fuzzy
 msgid "Remove Chat"
 msgstr "አስወግድ"
 
-#: src/dialogs.c:486
+#: src/dialogs.c:325
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
 "list.  Do you want to continue?"
 msgstr ""
 
-#: src/dialogs.c:489 src/dialogs.c:490
+#: src/dialogs.c:328 src/dialogs.c:329
 msgid "Remove Group"
 msgstr "መድረክን አስወግድ"
 
-#: src/dialogs.c:507
+#: src/dialogs.c:346
 #, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddies from "
 "your buddy list.  Do you want to continue?"
 msgstr ""
 
-#: src/dialogs.c:510 src/dialogs.c:511
+#: src/dialogs.c:349 src/dialogs.c:350
 #, fuzzy
 msgid "Remove Contact"
 msgstr "አስወግድ"
 
-#: src/dialogs.c:659
-msgid "New Message"
+#: src/dialogs.c:453 src/dialogs.c:509
+#, fuzzy
+msgid "_Screen name"
+msgstr "እስክሪን ስም፦ (_S)"
+
+#: src/dialogs.c:459 src/dialogs.c:515
+msgid "_Account"
+msgstr ""
+
+#: src/dialogs.c:466
+#, fuzzy
+msgid "New Instant Message"
 msgstr "አዲስ መልእክት"
 
-#: src/dialogs.c:677
-msgid "Please enter the screenname of the person you would like to IM.\n"
-msgstr ""
-
-#: src/dialogs.c:693 src/dialogs.c:770
-msgid "_Screenname:"
-msgstr "እስክሪን ስም፦ (_S)"
-
-#: src/dialogs.c:708 src/dialogs.c:786 src/gtkpounce.c:408
-msgid "_Account:"
-msgstr ""
-
-#: src/dialogs.c:739
+#: src/dialogs.c:468
+msgid "Please enter the screen name of the person you would like to IM."
+msgstr ""
+
+#: src/dialogs.c:522
 msgid "Get User Info"
 msgstr ""
 
-#: src/dialogs.c:758
-msgid ""
-"Please enter the screenname of the person whose info you would like to "
-"view.\n"
-msgstr ""
-
-#: src/dialogs.c:852 src/protocols/jabber/jabber.c:974
-#: src/protocols/oscar/oscar.c:6408 src/protocols/toc/toc.c:1531
-msgid "Set User Info"
-msgstr ""
-
-#: src/dialogs.c:861
-#, c-format
-msgid "Changing info for %s:"
-msgstr ""
-
-#: src/dialogs.c:963
-msgid "Log Conversation"
-msgstr ""
-
-#: src/dialogs.c:1059
-msgid "Insert Link"
-msgstr "አያያዝ አስገባ"
-
-#: src/dialogs.c:1061
-msgid "Insert"
-msgstr "አስገባ"
-
-#: src/dialogs.c:1083
-msgid ""
-"Please enter the URL and description of the link that you want to insert.  "
-"The description is optional.\n"
-msgstr ""
-
-#: src/dialogs.c:1101 src/protocols/jabber/buddy.c:257
-#: src/protocols/jabber/jabber.c:594
-msgid "URL"
-msgstr "URL"
-
-#: src/dialogs.c:1111 src/gtkprefs.c:601 src/gtkprefs.c:1809
-#: src/protocols/jabber/buddy.c:271 src/protocols/jabber/buddy.c:744
-msgid "Description"
-msgstr "መግለጫ"
-
-#: src/dialogs.c:1247 src/dialogs.c:1264
+#: src/dialogs.c:524
+msgid ""
+"Please enter the screen name of the person whose info you would like to view."
+msgstr ""
+
+#: src/dialogs.c:552 src/gtkimhtmltoolbar.c:240
 msgid "Select Text Color"
 msgstr ""
 
-#: src/dialogs.c:1299 src/dialogs.c:1316
+#: src/dialogs.c:580 src/gtkimhtmltoolbar.c:310
 msgid "Select Background Color"
 msgstr ""
 
-#: src/dialogs.c:1401 src/dialogs.c:1427
+#: src/dialogs.c:619 src/gtkimhtmltoolbar.c:164
 msgid "Select Font"
 msgstr "የፊደል ቅርጽ ምረጡ"
 
-#: src/dialogs.c:1493
+#: src/dialogs.c:692
 msgid "You cannot save an away message with a blank title"
 msgstr ""
 
-#: src/dialogs.c:1495
+#: src/dialogs.c:694
 msgid ""
 "Please give the message a title, or choose \"Use\" to use without saving."
 msgstr ""
 
-#: src/dialogs.c:1505
+#: src/dialogs.c:704
 msgid "You cannot create an empty away message"
 msgstr ""
 
-#: src/dialogs.c:1570 src/dialogs.c:1578
+#: src/dialogs.c:766
 msgid "New away message"
 msgstr ""
 
-#: src/dialogs.c:1588
+#: src/dialogs.c:787
 msgid "Away title: "
 msgstr ""
 
-#: src/dialogs.c:1638
+#: src/dialogs.c:843
 msgid "Save & Use"
 msgstr "አስቀምጥ እና ተጠቀም"
 
-#: src/dialogs.c:1642
+#: src/dialogs.c:847
 msgid "Use"
 msgstr "ተጠቀም"
 
-#. show everything
-#: src/dialogs.c:1791
-msgid "Smile!"
-msgstr ""
-
-#: src/dialogs.c:1809
+#: src/dialogs.c:868
 #, fuzzy
 msgid "Alias Chat"
 msgstr "የጌም ማውሪያ"
 
-#: src/dialogs.c:1809
-#, fuzzy
-msgid "Alias chat"
+#: src/dialogs.c:869
+msgid "Enter an alias for this chat."
+msgstr ""
+
+#: src/dialogs.c:871 src/dialogs.c:888 src/dialogs.c:907 src/gtkrequest.c:243
+#, fuzzy
+msgid "Alias"
 msgstr "የጌም ማውሪያ"
 
-#: src/dialogs.c:1810
-msgid "Please enter an aliased name for this chat."
-msgstr ""
-
-#: src/dialogs.c:1841
-#, fuzzy
-msgid "_Screenname"
-msgstr "እስክሪን ስም፦ (_S)"
-
-#: src/dialogs.c:1846 src/gtkblist.c:523 src/gtkblist.c:616
-msgid "_Alias"
-msgstr ""
-
-#: src/dialogs.c:1850
+#: src/dialogs.c:885
+#, fuzzy
+msgid "Alias Contact"
+msgstr "የጌም ማውሪያ"
+
+#: src/dialogs.c:886
+msgid "Enter an alias for this contact."
+msgstr ""
+
+#: src/dialogs.c:903
+#, c-format
+msgid "Enter an alias for %s."
+msgstr ""
+
+#: src/dialogs.c:905
 msgid "Alias Buddy"
 msgstr ""
 
-#: src/dialogs.c:1851
-msgid "Alias buddy"
-msgstr ""
-
-#: src/dialogs.c:1852
-msgid ""
-"Please enter an aliased name for the person below, or rename this contact in "
-"your buddy list."
-msgstr ""
-
-#: src/dialogs.c:1888 src/dialogs.c:1895
-#, c-format
-msgid "Couldn't write to %s."
-msgstr ""
-
-#: src/dialogs.c:1919
-msgid "Save Log File"
-msgstr ""
-
-#: src/dialogs.c:1949
-#, c-format
-msgid "Couldn't remove file %s."
-msgstr ""
-
-#: src/dialogs.c:1968
-msgid "Clear Log"
-msgstr ""
-
-#: src/dialogs.c:1977
-msgid "Really clear log?"
-msgstr ""
-
-#: src/dialogs.c:2022 src/dialogs.c:2193
-#, c-format
-msgid "Couldn't open log file %s."
-msgstr ""
-
-#: src/dialogs.c:2170
-#, c-format
-msgid "Conversations with %s"
-msgstr ""
-
-#: src/dialogs.c:2172
-msgid "System Log"
-msgstr ""
-
-#: src/dialogs.c:2214 src/protocols/jabber/jabber.c:599
-msgid "Date"
-msgstr "ቀን"
-
-#: src/dialogs.c:2271
-#, fuzzy
-msgid "Log"
-msgstr "ዝምብለህ ይግባ"
-
-#: src/dialogs.c:2294
-msgid "Clear"
-msgstr "ሰርዝ"
-
-#: src/ft.c:123
+#: src/ft.c:144
 #, c-format
 msgid "%s is not a valid filename.\n"
 msgstr ""
 
-#: src/ft.c:137
+#: src/ft.c:157
 #, c-format
 msgid "%s was not found.\n"
 msgstr ""
 
-#: src/ft.c:693
+#: src/ft.c:786
 #, c-format
 msgid "File transfer to %s aborted.\n"
 msgstr ""
 
-#: src/ft.c:695
+#: src/ft.c:788
 #, c-format
 msgid "File transfer from %s aborted.\n"
 msgstr ""
@@ -1617,7 +1793,7 @@
 msgid "Size of the expander arrow"
 msgstr ""
 
-#: src/gaim-remote.c:33
+#: src/gaim-remote.c:65
 #, c-format
 msgid ""
 "Usage: %s command [OPTIONS] [URI]\n"
@@ -1630,67 +1806,62 @@
 "       -h, --help [commmand]    Show help for command\n"
 msgstr ""
 
-#: src/gaim-remote.c:139 src/gaim-remote.c:155
+#: src/gaim-remote.c:174 src/gaim-remote.c:190
 msgid "Gaim not running (on session 0)\n"
 msgstr ""
 
-#: src/gaim-remote.c:167
+#: src/gaim-remote.c:203
 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"
+"\tgaim-remote uri 'aim:goim?screenname=Penguin'\n"
 "\n"
 "Joining a chat:\n"
-"\tgaim-remote uri aim:gochat?roomname=PenguinLounge\n"
+"\tgaim-remote uri 'aim:gochat?roomname=PenguinLounge'\n"
 "...joins the 'PenguinLounge' chat room.\n"
 "\n"
 "Adding a buddy to your buddy list:\n"
-"\tgaim-remote uri aim:addbuddy?screenname=Penguin\n"
+"\tgaim-remote uri 'aim:addbuddy?screenname=Penguin'\n"
 "...prompts you to add 'Penguin' to your buddy list.\n"
 msgstr ""
 
-#: src/gaim-remote.c:187
+#: src/gaim-remote.c:222
 msgid ""
 "\n"
 "Close running copy of Gaim\n"
 msgstr ""
 
 #. 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:369 src/gaimrc.c:1460
+#: src/gaimrc.c:375 src/gaimrc.c:1451
 msgid "boring default"
 msgstr ""
 
-#: src/gaimrc.c:1267 src/gtkblist.c:1717
+#: src/gaimrc.c:1260 src/gtkblist.c:2966
 msgid "Alphabetical"
 msgstr ""
 
-#: src/gaimrc.c:1269 src/gtkblist.c:1718
+#: src/gaimrc.c:1262 src/gtkblist.c:2967
 #, fuzzy
 msgid "By status"
 msgstr "ሁኔታ፦"
 
-#: src/gaimrc.c:1271 src/gtkblist.c:1719
+#: src/gaimrc.c:1264 src/gtkblist.c:2968
 msgid "By log size"
 msgstr ""
 
-#: src/gaimrc.c:1558
-#, c-format
-msgid "Could not open config file %s."
-msgstr ""
-
-#: src/gtkaccount.c:287
+#: src/gtkaccount.c:289
 #, c-format
 msgid ""
 "<b>File:</b> %s\n"
@@ -1698,389 +1869,426 @@
 "<b>Image size:</b> %dx%d"
 msgstr ""
 
-#: src/gtkaccount.c:318 src/protocols/oscar/oscar.c:3067
-msgid "Buddy Icon"
-msgstr ""
-
 #. Build the login options frame.
-#: src/gtkaccount.c:369
+#: src/gtkaccount.c:384
 msgid "Login Options"
 msgstr "የዝምብለህ ይግባ መርጫዎች"
 
-#: src/gtkaccount.c:386
+#: src/gtkaccount.c:401
 msgid "Protocol:"
 msgstr ""
 
-#: src/gtkaccount.c:391
-msgid "Screenname:"
+#: src/gtkaccount.c:406 src/gtkblist.c:3954
+msgid "Screen Name:"
 msgstr "እስክሪን ስም፦"
 
-#: src/gtkaccount.c:464 src/main.c:307 src/protocols/irc/irc.c:161
-#: src/protocols/jabber/chat.c:55
+#: src/gtkaccount.c:479
 msgid "Password:"
 msgstr "ሚስጢራዊ ቃል፦"
 
-#: src/gtkaccount.c:469 src/gtkblist.c:2680 src/gtkblist.c:2989
+#: src/gtkaccount.c:484 src/gtkblist.c:3968 src/gtkblist.c:4296
 msgid "Alias:"
 msgstr ""
 
-#: src/gtkaccount.c:473
+#: src/gtkaccount.c:488
 #, fuzzy
 msgid "Remember password"
 msgstr "ሚስጢራዊ ቃልን አስታውስ"
 
 #. Build the user options frame.
-#: src/gtkaccount.c:527
+#: src/gtkaccount.c:542
 msgid "User Options"
 msgstr "ተጠቃሚ መርጫዎች"
 
-#: src/gtkaccount.c:540
+#: src/gtkaccount.c:555
 msgid "New mail notifications"
 msgstr ""
 
-#: src/gtkaccount.c:549
+#: src/gtkaccount.c:564
 msgid "Buddy icon file:"
 msgstr ""
 
-#: src/gtkaccount.c:558
+#: src/gtkaccount.c:574
 #, fuzzy
 msgid "_Browse"
 msgstr "መቃኛ (_B)"
 
-#: src/gtkaccount.c:564
+#: src/gtkaccount.c:580
 #, fuzzy
 msgid "_Reset"
 msgstr "እንደነበረ አድረግ"
 
 #. Build the protocol options frame.
-#: src/gtkaccount.c:626
+#: src/gtkaccount.c:642
 #, c-format
 msgid "%s Options"
 msgstr "%s ምርጫዎች"
 
 #. Use Global Proxy Settings
-#: src/gtkaccount.c:747
+#: src/gtkaccount.c:778 src/gtkaccount.c:825
 msgid "Use Global Proxy Settings"
 msgstr ""
 
 #. No Proxy
-#: src/gtkaccount.c:754
+#: src/gtkaccount.c:784 src/gtkaccount.c:832
 msgid "No Proxy"
 msgstr ""
 
 #. HTTP
-#: src/gtkaccount.c:761
+#: src/gtkaccount.c:790 src/gtkaccount.c:839
 msgid "HTTP"
 msgstr ""
 
 #. SOCKS 4
-#: src/gtkaccount.c:768
+#: src/gtkaccount.c:796 src/gtkaccount.c:846
 msgid "SOCKS 4"
 msgstr ""
 
 #. SOCKS 5
-#: src/gtkaccount.c:775
+#: src/gtkaccount.c:802 src/gtkaccount.c:853
 msgid "SOCKS 5"
 msgstr ""
 
 #. Use Environmental Settings
-#: src/gtkaccount.c:782 src/gtkprefs.c:1112
+#: src/gtkaccount.c:808 src/gtkaccount.c:860 src/gtkprefs.c:1203
 msgid "Use Environmental Settings"
 msgstr ""
 
-#: src/gtkaccount.c:815
+#: src/gtkaccount.c:899
 msgid "you can see the butterflies mating"
 msgstr ""
 
-#: src/gtkaccount.c:819
+#: src/gtkaccount.c:903
 msgid "If you look real closely"
 msgstr ""
 
-#: src/gtkaccount.c:835
+#: src/gtkaccount.c:919
 msgid "Proxy Options"
 msgstr ""
 
-#: src/gtkaccount.c:851 src/gtkprefs.c:1106
+#: src/gtkaccount.c:937 src/gtkprefs.c:1197
 msgid "Proxy _type:"
 msgstr ""
 
-#: src/gtkaccount.c:860
+#: src/gtkaccount.c:946 src/gtkprefs.c:1227
 msgid "_Host:"
 msgstr "እንግዳ ተቀባይ፦ (_H)"
 
-#: src/gtkaccount.c:864
+#: src/gtkaccount.c:950 src/gtkprefs.c:1245
 #, fuzzy
 msgid "_Port:"
 msgstr "ፖርት፦"
 
-#: src/gtkaccount.c:872
+#: src/gtkaccount.c:958
 #, fuzzy
 msgid "_Username:"
 msgstr "ተጠቃሚ፦ (_U)"
 
-#: src/gtkaccount.c:877
+#: src/gtkaccount.c:963 src/gtkprefs.c:1282
 msgid "Pa_ssword:"
 msgstr "ሚስጢራዊ ቃል፦ (_S)"
 
-#: src/gtkaccount.c:1215
+#: src/gtkaccount.c:1331
 msgid "Add Account"
 msgstr ""
 
-#: src/gtkaccount.c:1217
+#: src/gtkaccount.c:1333
 msgid "Modify Account"
 msgstr ""
 
 #. Add the disclosure
-#: src/gtkaccount.c:1241
+#: src/gtkaccount.c:1357
 msgid "Show more options"
 msgstr "ተጨማሪ ምርጫዎች አሳይ"
 
-#: src/gtkaccount.c:1242
+#: src/gtkaccount.c:1358
 msgid "Show fewer options"
 msgstr ""
 
 #. Register button
-#: src/gtkaccount.c:1269 src/protocols/jabber/jabber.c:612
+#: src/gtkaccount.c:1385 src/protocols/jabber/jabber.c:659
 msgid "Register"
 msgstr ""
 
-#: src/gtkaccount.c:1614
+#: src/gtkaccount.c:1739
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr ""
 
-#: src/gtkaccount.c:1618 src/gtkrequest.c:206
+#: src/gtkaccount.c:1743 src/gtkrequest.c:239
 msgid "Delete"
 msgstr "አጥፉ"
 
-#: src/gtkaccount.c:1731
+#: src/gtkaccount.c:1857 src/protocols/oscar/oscar.c:3365
 msgid "Screen Name"
 msgstr "እስክሪን ስም"
 
-#: src/gtkaccount.c:1754 src/protocols/jabber/jabber.c:866
-#: src/protocols/oscar/oscar.c:2839 src/protocols/oscar/oscar.c:4527
-#: src/protocols/oscar/oscar.c:6063 src/protocols/yahoo/yahoo.c:2032
-#: src/protocols/zephyr/zephyr.c:886 src/protocols/zephyr/zephyr.c:896
+#: src/gtkaccount.c:1880 src/protocols/jabber/jabber.c:950
+#: src/protocols/oscar/oscar.c:526 src/protocols/oscar/oscar.c:4823
+#: src/protocols/oscar/oscar.c:6425 src/protocols/yahoo/yahoo.c:2299
+#: src/protocols/zephyr/zephyr.c:1182 src/protocols/zephyr/zephyr.c:1192
 msgid "Online"
 msgstr "ኦንላይን"
 
-#: src/gtkaccount.c:1772
+#: src/gtkaccount.c:1898
 msgid "Protocol"
 msgstr ""
 
-#: src/gtkaccount.c:2062
+#: src/gtkaccount.c:2210
 #, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s%s"
 msgstr ""
 
-#: src/gtkaccount.c:2076
+#: src/gtkaccount.c:2224
 msgid ""
 "\n"
 "\n"
 "Do you wish to add him or her to your buddy list?"
 msgstr ""
 
-#: src/gtkaccount.c:2080
-msgid "Gaim - Information"
-msgstr "ጌም - መረጃ"
-
-#: src/gtkaccount.c:2084
+#: src/gtkaccount.c:2228
+#, fuzzy
+msgid "Information"
+msgstr "የቢሮ መረጃ፦"
+
+#: src/gtkaccount.c:2232
 msgid "Add buddy to your list?"
 msgstr ""
 
-#: src/gtkaccount.c:2086 src/gtkblist.c:3037 src/gtkconv.c:1137
-#: src/gtkconv.c:3017 src/gtkconv.c:4191 src/gtkrequest.c:207
-#: src/protocols/icq/gaim_icq.c:277 src/protocols/oscar/oscar.c:2681
+#. Add button
+#: src/gtkaccount.c:2234 src/gtkblist.c:4348 src/gtkconv.c:1107
+#: src/gtkconv.c:3338 src/gtkconv.c:3429 src/gtkrequest.c:240
+#: src/protocols/icq/gaim_icq.c:277 src/protocols/oscar/oscar.c:3004
 msgid "Add"
 msgstr "ጨምር"
 
-#: src/gtkblist.c:496
-msgid "_Get Info"
-msgstr ""
-
-#: src/gtkblist.c:499
-msgid "_IM"
-msgstr ""
-
-#: src/gtkblist.c:501
+#: src/gtkblist.c:801 src/gtkblist.c:4236
+msgid ""
+"You are not currently signed on with any protocols that have the ability to "
+"chat."
+msgstr ""
+
+#: src/gtkblist.c:814
+#, fuzzy
+msgid "Join a Chat"
+msgstr "ውሪን አገጣጥም"
+
+#: src/gtkblist.c:835
+msgid ""
+"Please enter the appropriate information about the chat you would like to "
+"join.\n"
+msgstr ""
+
+#: src/gtkblist.c:848 src/gtkpounce.c:361 src/gtkroomlist.c:365
+msgid "_Account:"
+msgstr ""
+
+#: src/gtkblist.c:1087 src/gtkblist.c:3155
+#, fuzzy
+msgid "Get _Info"
+msgstr "መረጃ አግኝ"
+
+#: src/gtkblist.c:1090 src/gtkblist.c:3146
+msgid "I_M"
+msgstr ""
+
+#: src/gtkblist.c:1092
 msgid "Add Buddy _Pounce"
 msgstr ""
 
-#: src/gtkblist.c:503
+#: src/gtkblist.c:1094
 msgid "View _Log"
 msgstr ""
 
-#: src/gtkblist.c:525 src/gtkblist.c:618 src/gtkblist.c:626
+#: src/gtkblist.c:1159 src/gtkblist.c:1260 src/gtkblist.c:1274
+msgid "_Alias..."
+msgstr ""
+
+#: src/gtkblist.c:1161 src/gtkblist.c:1262 src/gtkblist.c:1279
+#: src/gtkconn.c:361
 msgid "_Remove"
 msgstr "አስወግድ (_R)"
 
-#: src/gtkblist.c:597
+#: src/gtkblist.c:1206
 msgid "Add a _Buddy"
 msgstr ""
 
-#: src/gtkblist.c:599
+#: src/gtkblist.c:1208
 msgid "Add a C_hat"
 msgstr ""
 
-#: src/gtkblist.c:601
+#: src/gtkblist.c:1210
 msgid "_Delete Group"
 msgstr "መድረክ አጥፉ (_D)"
 
-#: src/gtkblist.c:603
+#: src/gtkblist.c:1212
 msgid "_Rename"
 msgstr "እንደገና ሰይም (_R)"
 
-#: src/gtkblist.c:611
+#. join button
+#: src/gtkblist.c:1238 src/gtkroomlist.c:261 src/gtkroomlist.c:417
+#: src/stock.c:87
 #, fuzzy
 msgid "_Join"
 msgstr "ዝምብለህ ይግባ (_L)"
 
-#: src/gtkblist.c:613
+#: src/gtkblist.c:1240
 msgid "Auto-Join"
 msgstr ""
 
-#: src/gtkblist.c:622 src/gtkblist.c:653
+#: src/gtkblist.c:1276 src/gtkblist.c:1302
 msgid "_Collapse"
 msgstr ""
 
-#: src/gtkblist.c:658
+#: src/gtkblist.c:1307
 msgid "_Expand"
 msgstr ""
 
+#: src/gtkblist.c:1964 src/gtkconv.c:3916
+msgid ""
+"You are not currently signed on with an account that can add that buddy."
+msgstr ""
+
 #. Buddies menu
-#: src/gtkblist.c:1088
+#: src/gtkblist.c:2312
 msgid "/_Buddies"
 msgstr ""
 
-#: src/gtkblist.c:1089
-msgid "/Buddies/New _Instant Message..."
-msgstr ""
-
-#: src/gtkblist.c:1090
+#: src/gtkblist.c:2313
+#, fuzzy
+msgid "/Buddies/New Instant _Message..."
+msgstr "አዲስ መልእክት..."
+
+#: src/gtkblist.c:2314
 msgid "/Buddies/Join a _Chat..."
 msgstr ""
 
-#: src/gtkblist.c:1091
-msgid "/Buddies/Get _User Info..."
-msgstr ""
-
-#: src/gtkblist.c:1093
+#: src/gtkblist.c:2315
+msgid "/Buddies/Get User _Info..."
+msgstr ""
+
+#: src/gtkblist.c:2317
 msgid "/Buddies/Show _Offline Buddies"
 msgstr ""
 
-#: src/gtkblist.c:1094
+#: src/gtkblist.c:2318
 msgid "/Buddies/Show _Empty Groups"
 msgstr ""
 
-#: src/gtkblist.c:1095
-msgid "/Buddies/_Add a Buddy..."
-msgstr ""
-
-#: src/gtkblist.c:1096
-msgid "/Buddies/Add a C_hat..."
-msgstr ""
-
-#: src/gtkblist.c:1097
-msgid "/Buddies/Add a _Group..."
-msgstr ""
-
-#: src/gtkblist.c:1099
+#: src/gtkblist.c:2319
+msgid "/Buddies/_Add Buddy..."
+msgstr ""
+
+#: src/gtkblist.c:2320
+msgid "/Buddies/Add C_hat..."
+msgstr ""
+
+#: src/gtkblist.c:2321
+msgid "/Buddies/Add _Group..."
+msgstr ""
+
+#: src/gtkblist.c:2323
 msgid "/Buddies/_Signoff"
 msgstr ""
 
-#: src/gtkblist.c:1100
+#: src/gtkblist.c:2324
 msgid "/Buddies/_Quit"
 msgstr ""
 
 #. Tools
-#: src/gtkblist.c:1103
+#: src/gtkblist.c:2327
 msgid "/_Tools"
 msgstr "/መሣሪያዎች (_T)"
 
-#: src/gtkblist.c:1104
+#: src/gtkblist.c:2328
 msgid "/Tools/_Away"
 msgstr ""
 
-#: src/gtkblist.c:1105
+#: src/gtkblist.c:2329
 msgid "/Tools/Buddy _Pounce"
 msgstr ""
 
-#: src/gtkblist.c:1106
+#: src/gtkblist.c:2330
 msgid "/Tools/P_rotocol Actions"
 msgstr ""
 
-#: src/gtkblist.c:1108
+#: src/gtkblist.c:2332
 msgid "/Tools/A_ccounts"
 msgstr ""
 
-#: src/gtkblist.c:1109
-msgid "/Tools/_File Transfers..."
-msgstr ""
-
-#: src/gtkblist.c:1110
-#, fuzzy
-msgid "/Tools/Preferences"
+#: src/gtkblist.c:2333
+#, fuzzy
+msgid "/Tools/_File Transfers"
 msgstr "ምርጫዎች"
 
-#: src/gtkblist.c:1111
+#: src/gtkblist.c:2334
+msgid "/Tools/R_oom List"
+msgstr ""
+
+#: src/gtkblist.c:2335
+#, fuzzy
+msgid "/Tools/Pr_eferences"
+msgstr "ምርጫዎች"
+
+#: src/gtkblist.c:2336
 msgid "/Tools/Pr_ivacy"
 msgstr ""
 
-#: src/gtkblist.c:1113
+#: src/gtkblist.c:2338
 msgid "/Tools/View System _Log"
 msgstr ""
 
 #. Help
-#: src/gtkblist.c:1116
+#: src/gtkblist.c:2341
 msgid "/_Help"
 msgstr "/መረጃ (_H)"
 
-#: src/gtkblist.c:1117
+#: src/gtkblist.c:2342
 msgid "/Help/Online _Help"
 msgstr ""
 
-#: src/gtkblist.c:1118
+#: src/gtkblist.c:2343
 msgid "/Help/_Debug Window"
 msgstr ""
 
-#: src/gtkblist.c:1119
+#: src/gtkblist.c:2344
 #, fuzzy
 msgid "/Help/_About"
 msgstr "/መረጃ/ስለ... (_A)"
 
-#: src/gtkblist.c:1135
+#: src/gtkblist.c:2360
 msgid "Rename Group"
 msgstr "መድረክን እንደገና ሰይም"
 
-#: src/gtkblist.c:1135
+#: src/gtkblist.c:2360
 #, fuzzy
 msgid "New group name"
 msgstr "አዲስ ስም፦"
 
-#: src/gtkblist.c:1136
+#: src/gtkblist.c:2361
 msgid "Please enter a new name for the selected group."
 msgstr ""
 
-#: src/gtkblist.c:1165
+#: src/gtkblist.c:2389
 #, fuzzy, c-format
 msgid ""
 "\n"
 "<b>Account:</b> %s"
 msgstr "<b>ሁኔታ፦</b> %s"
 
-#: src/gtkblist.c:1224 src/protocols/oscar/oscar.c:5444
+#: src/gtkblist.c:2453
 #, fuzzy
 msgid "<b>Status:</b> Offline"
 msgstr ""
 "\n"
 "<b>ሁኔታ፦</b>"
 
-#: src/gtkblist.c:1236
+#: src/gtkblist.c:2468
 #, c-format
 msgid "%d%%"
 msgstr "%d%%"
 
-#: src/gtkblist.c:1250
+#: src/gtkblist.c:2484
 #, fuzzy
 msgid ""
 "\n"
@@ -2089,13 +2297,22 @@
 "\n"
 "<b>ቅጽል ስም፦</b>"
 
-#: src/gtkblist.c:1251
+#: src/gtkblist.c:2485
+#, fuzzy
+msgid ""
+"\n"
+"<b>Contact Alias:</b>"
+msgstr ""
+"\n"
+"<b>ሁኔታ፦</b>"
+
+#: src/gtkblist.c:2486
 msgid ""
 "\n"
 "<b>Alias:</b>"
 msgstr ""
 
-#: src/gtkblist.c:1252
+#: src/gtkblist.c:2487
 msgid ""
 "\n"
 "<b>Nickname:</b>"
@@ -2103,25 +2320,34 @@
 "\n"
 "<b>ቅጽል ስም፦</b>"
 
-#: src/gtkblist.c:1253
+#: src/gtkblist.c:2488
+#, fuzzy
+msgid ""
+"\n"
+"<b>Logged In:</b>"
+msgstr ""
+"\n"
+"<b>ቅጽል ስም፦</b>"
+
+#: src/gtkblist.c:2489
 msgid ""
 "\n"
 "<b>Idle:</b>"
 msgstr ""
 
-#: src/gtkblist.c:1254
+#: src/gtkblist.c:2490
 msgid ""
 "\n"
 "<b>Warned:</b>"
 msgstr ""
 
-#: src/gtkblist.c:1256
+#: src/gtkblist.c:2492
 msgid ""
 "\n"
 "<b>Description:</b> Spooky"
 msgstr ""
 
-#: src/gtkblist.c:1257
+#: src/gtkblist.c:2493
 #, fuzzy
 msgid ""
 "\n"
@@ -2130,7 +2356,7 @@
 "\n"
 "<b>ሁኔታ፦</b>"
 
-#: src/gtkblist.c:1258
+#: src/gtkblist.c:2494
 #, fuzzy
 msgid ""
 "\n"
@@ -2139,673 +2365,773 @@
 "\n"
 "<b>ሁኔታ፦</b>"
 
-#: src/gtkblist.c:1514
+#: src/gtkblist.c:2764
 #, c-format
 msgid "Idle (%dh%02dm) "
 msgstr ""
 
-#: src/gtkblist.c:1516
+#: src/gtkblist.c:2766
 #, c-format
 msgid "Idle (%dm) "
 msgstr ""
 
-#: src/gtkblist.c:1520
+#: src/gtkblist.c:2771
 #, c-format
 msgid "Warned (%d%%) "
 msgstr ""
 
-#: src/gtkblist.c:1523
+#: src/gtkblist.c:2774
 msgid "Offline "
 msgstr ""
 
-#: src/gtkblist.c:1715 src/gtkprefs.c:842 src/gtkprefs.c:1501
-msgid "None"
-msgstr "ምንም"
-
-#: src/gtkblist.c:1780
+#: src/gtkblist.c:3032
 msgid "/Tools/Away"
 msgstr ""
 
-#: src/gtkblist.c:1783
+#: src/gtkblist.c:3035
 msgid "/Tools/Buddy Pounce"
 msgstr ""
 
-#: src/gtkblist.c:1786
+#: src/gtkblist.c:3038
 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:1870
+#: src/gtkblist.c:3126
 msgid "/Buddies/Show Offline Buddies"
 msgstr ""
 
-#: src/gtkblist.c:1872
+#: src/gtkblist.c:3128
 msgid "/Buddies/Show Empty Groups"
 msgstr ""
 
-#: src/gtkblist.c:1890 src/gtkconv.c:1096
-msgid "IM"
-msgstr ""
-
-#: src/gtkblist.c:1896
+#: src/gtkblist.c:3152
 msgid "Send a message to the selected buddy"
 msgstr ""
 
-#: src/gtkblist.c:1899 src/protocols/napster/napster.c:529
-msgid "Get Info"
-msgstr "መረጃ አግኝ"
-
-#: src/gtkblist.c:1905
+#: src/gtkblist.c:3161
 msgid "Get information on the selected buddy"
 msgstr ""
 
-#: src/gtkblist.c:1908 src/protocols/oscar/oscar.c:3076
-msgid "Chat"
+#: src/gtkblist.c:3164
+#, fuzzy
+msgid "_Chat"
 msgstr "ውሪ"
 
-#: src/gtkblist.c:1913
+#: src/gtkblist.c:3169
 msgid "Join a chat room"
 msgstr "የውሪ ቤትን አገጣጥም"
 
-#: src/gtkblist.c:1921
+#: src/gtkblist.c:3172
+msgid "_Away"
+msgstr ""
+
+#: src/gtkblist.c:3177
 msgid "Set an away message"
 msgstr ""
 
-#: src/gtkblist.c:2622 src/protocols/yahoo/yahoo.c:2166
+#: src/gtkblist.c:3909 src/protocols/yahoo/yahoo.c:2431
 msgid "Add Buddy"
 msgstr ""
 
-#: src/gtkblist.c:2645
+#: src/gtkblist.c:3932
 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. "
 "The alias will be displayed in place of the screen name whenever possible.\n"
 msgstr ""
 
-#: src/gtkblist.c:2667 src/main.c:289
-msgid "Screen Name:"
-msgstr "እስክሪን ስም፦"
-
-#: src/gtkblist.c:2693 src/gtkblist.c:3000
-#, fuzzy
-msgid "Group:"
-msgstr "መድረክ፦ (_G)"
-
 #. Set up stuff for the account box
-#: src/gtkblist.c:2702 src/gtkblist.c:2971
+#: src/gtkblist.c:3992 src/gtkblist.c:4276
 msgid "Account:"
 msgstr ""
 
-#: src/gtkblist.c:2938
+#: src/gtkblist.c:4243
 #, fuzzy
 msgid "Add Chat"
 msgstr "ውሪ"
 
-#: src/gtkblist.c:2961
+#: src/gtkblist.c:4266
 msgid ""
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
 msgstr ""
 
-#: src/gtkblist.c:3034
+#: src/gtkblist.c:4345
 msgid "Add Group"
 msgstr "መድረክ ጨምር"
 
-#: src/gtkblist.c:3034
-#, fuzzy
-msgid "Add a new group"
-msgstr "መድረክ ጨምር"
-
-#: src/gtkblist.c:3035
+#: src/gtkblist.c:4346
 msgid "Please enter the name of the group to be added."
 msgstr ""
 
-#: src/gtkblist.c:3547
+#: src/gtkblist.c:4866
 msgid "No actions available"
 msgstr ""
 
-#: src/gtkconn.c:57 src/gtkconn.c:241 src/gtkconn.c:252
+#: src/gtkconn.c:78 src/gtkconn.c:250 src/gtkconn.c:261
 msgid "Done."
 msgstr "ጨርሷል።"
 
-#: src/gtkconn.c:136
+#: src/gtkconn.c:157
 msgid "Signon: "
 msgstr ""
 
-#: src/gtkconn.c:194
+#: src/gtkconn.c:203
 msgid "Signon"
 msgstr ""
 
-#: src/gtkconn.c:207
+#: src/gtkconn.c:216
 msgid "Cancel All"
 msgstr ""
 
-#: src/gtkconn.c:274
-#, c-format
-msgid "%s has been disconnected"
-msgstr ""
-
-#: src/gtkconn.c:277
+#: src/gtkconn.c:361 src/gtkconn.c:593
+#, fuzzy
+msgid "_Reconnect"
+msgstr "አገናኝ"
+
+#: src/gtkconn.c:557
+#, c-format
+msgid ""
+"<span weight=\"bold\" size=\"larger\">%s has been disconnected.</span>\n"
+"\n"
+"%s\n"
+"%s"
+msgstr ""
+
+#: src/gtkconn.c:559
 #, fuzzy
 msgid "Reason Unknown."
 msgstr "ያልታወቀ።"
 
-#: src/gtkconv.c:185
+#: src/gtkconn.c:598
+msgid "Reconnect _All"
+msgstr ""
+
+#: src/gtkconn.c:628
+#, fuzzy
+msgid "Time"
+msgstr "አርእስት"
+
+#: src/gtkconv.c:172
+#, c-format
+msgid "<h1>Conversation with %s</h1>\n"
+msgstr ""
+
+#: src/gtkconv.c:190
 msgid "That file already exists"
 msgstr ""
 
-#: src/gtkconv.c:186 src/gtkft.c:1034
+#: src/gtkconv.c:191 src/gtkft.c:1106
 msgid "Would you like to overwrite it?"
 msgstr ""
 
-#: src/gtkconv.c:241
-#, c-format
-msgid "Failed to store image: %s\n"
-msgstr ""
-
-#: src/gtkconv.c:303
-msgid "Gaim - Insert Image"
-msgstr "ጌም - ምስል አስገባ"
-
-#: src/gtkconv.c:607
-msgid "Gaim - Invite Buddy Into Chat Room"
+#: src/gtkconv.c:505
+msgid "Invite Buddy Into Chat Room"
 msgstr ""
 
 #. Put our happy label in it.
-#: src/gtkconv.c:635
+#: src/gtkconv.c:533
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
 msgstr ""
 
-#: src/gtkconv.c:656
+#: src/gtkconv.c:554
 msgid "_Buddy:"
 msgstr ""
 
-#: src/gtkconv.c:676
+#: src/gtkconv.c:574
 msgid "_Message:"
 msgstr "መልእክት፦ (_M)"
 
-#: src/gtkconv.c:1104
+#: src/gtkconv.c:667
+#, fuzzy
+msgid "Find"
+msgstr "መስኮት"
+
+#: src/gtkconv.c:693
+msgid "_Search for:"
+msgstr ""
+
+#: src/gtkconv.c:1065
+msgid "IM"
+msgstr ""
+
+#: src/gtkconv.c:1073
 msgid "Un-Ignore"
 msgstr ""
 
-#: src/gtkconv.c:1106 src/gtkprefs.c:774
+#: src/gtkconv.c:1075 src/gtkprefs.c:806
 msgid "Ignore"
 msgstr "ተዉት"
 
 #. Info button
-#: src/gtkconv.c:1115 src/gtkconv.c:3040
+#: src/gtkconv.c:1084 src/gtkconv.c:3352
 msgid "Info"
 msgstr "መረጃ"
 
-#: src/gtkconv.c:1124
+#: src/gtkconv.c:1093
 msgid "Get Away Msg"
 msgstr ""
 
-#: src/gtkconv.c:1135 src/gtkconv.c:3023 src/gtkconv.c:4176
-#: src/gtkrequest.c:208
+#. Remove button
+#: src/gtkconv.c:1105 src/gtkconv.c:3345 src/gtkconv.c:3436
+#: src/gtkrequest.c:241
 msgid "Remove"
 msgstr "አስወግድ"
 
-#: src/gtkconv.c:2248
+#: src/gtkconv.c:2207
+msgid "Animate"
+msgstr ""
+
+#: src/gtkconv.c:2212
+msgid "Hide Icon"
+msgstr "ምልክትን ደብቅ"
+
+#: src/gtkconv.c:2218
+msgid "Save Icon As..."
+msgstr "ምልክትን በሌላ ስም አስቀምጥ..."
+
+#: src/gtkconv.c:2585
 msgid "User is typing..."
 msgstr ""
 
-#: src/gtkconv.c:2256
+#: src/gtkconv.c:2593
 msgid "User has typed something and paused"
 msgstr ""
 
 #. Build the Send As menu
-#: src/gtkconv.c:2359
+#: src/gtkconv.c:2696
 msgid "_Send As"
 msgstr ""
 
-#: src/gtkconv.c:2819
-msgid "Gaim - Save Conversation"
+#: src/gtkconv.c:3116
+msgid "Save Conversation"
 msgstr ""
 
 #. Conversation menu
-#: src/gtkconv.c:2836
+#: src/gtkconv.c:3133
 msgid "/_Conversation"
 msgstr ""
 
-#: src/gtkconv.c:2838
+#: src/gtkconv.c:3135
+msgid "/Conversation/New Instant _Message..."
+msgstr ""
+
+#: src/gtkconv.c:3140
+msgid "/Conversation/_Find..."
+msgstr ""
+
+#: src/gtkconv.c:3142
+msgid "/Conversation/View _Log"
+msgstr ""
+
+#: src/gtkconv.c:3143
 msgid "/Conversation/_Save As..."
 msgstr ""
 
-#: src/gtkconv.c:2840
-msgid "/Conversation/View _Log..."
-msgstr ""
-
-#: src/gtkconv.c:2844
+#: src/gtkconv.c:3148
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr ""
 
-#: src/gtkconv.c:2846
-msgid "/Conversation/A_lias..."
-msgstr ""
-
-#: src/gtkconv.c:2848
-msgid "/Conversation/_Get Info..."
-msgstr ""
-
-#: src/gtkconv.c:2850
+#: src/gtkconv.c:3150
+msgid "/Conversation/_Get Info"
+msgstr ""
+
+#: src/gtkconv.c:3152
+msgid "/Conversation/_Warn..."
+msgstr ""
+
+#: src/gtkconv.c:3154
 msgid "/Conversation/In_vite..."
 msgstr ""
 
-#: src/gtkconv.c:2855
-msgid "/Conversation/Insert _URL..."
-msgstr ""
-
-#: src/gtkconv.c:2857
-msgid "/Conversation/Insert _Image..."
-msgstr ""
-
-#: src/gtkconv.c:2862
-msgid "/Conversation/_Warn..."
-msgstr ""
-
-#: src/gtkconv.c:2864
+#: src/gtkconv.c:3159
+msgid "/Conversation/A_lias..."
+msgstr ""
+
+#: src/gtkconv.c:3161
 msgid "/Conversation/_Block..."
 msgstr ""
 
-#: src/gtkconv.c:2866
+#: src/gtkconv.c:3163
 msgid "/Conversation/_Add..."
 msgstr ""
 
-#: src/gtkconv.c:2868
+#: src/gtkconv.c:3165
 msgid "/Conversation/_Remove..."
 msgstr ""
 
-#: src/gtkconv.c:2873
+#: src/gtkconv.c:3170
+msgid "/Conversation/Insert Lin_k..."
+msgstr ""
+
+#: src/gtkconv.c:3172
+msgid "/Conversation/Insert Imag_e..."
+msgstr ""
+
+#: src/gtkconv.c:3177
 msgid "/Conversation/_Close"
 msgstr ""
 
 #. Options
-#: src/gtkconv.c:2877
+#: src/gtkconv.c:3181
 msgid "/_Options"
 msgstr "/ምርጫዎች (_O)"
 
-#: src/gtkconv.c:2878
+#: src/gtkconv.c:3182
 msgid "/Options/Enable _Logging"
 msgstr ""
 
-#: src/gtkconv.c:2879
+#: src/gtkconv.c:3183
 msgid "/Options/Enable _Sounds"
 msgstr ""
 
-#: src/gtkconv.c:2919
-msgid "/Conversation/View Log..."
-msgstr ""
-
-#: src/gtkconv.c:2924
+#: src/gtkconv.c:3184
+msgid "/Options/Show Formatting _Toolbar"
+msgstr ""
+
+#: src/gtkconv.c:3226
+msgid "/Conversation/View Log"
+msgstr ""
+
+#: src/gtkconv.c:3231
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr ""
 
-#: src/gtkconv.c:2928
-msgid "/Conversation/Alias..."
-msgstr ""
-
-#: src/gtkconv.c:2932
-msgid "/Conversation/Get Info..."
-msgstr ""
-
-#: src/gtkconv.c:2936
+#: src/gtkconv.c:3237
+msgid "/Conversation/Get Info"
+msgstr ""
+
+#: src/gtkconv.c:3241
+msgid "/Conversation/Warn..."
+msgstr ""
+
+#: src/gtkconv.c:3245
 msgid "/Conversation/Invite..."
 msgstr ""
 
-#: src/gtkconv.c:2942
-msgid "/Conversation/Insert URL..."
-msgstr ""
-
-#: src/gtkconv.c:2946
-msgid "/Conversation/Insert Image..."
-msgstr ""
-
-#: src/gtkconv.c:2952
-msgid "/Conversation/Warn..."
-msgstr ""
-
-#: src/gtkconv.c:2956
+#: src/gtkconv.c:3251
+msgid "/Conversation/Alias..."
+msgstr ""
+
+#: src/gtkconv.c:3255
 msgid "/Conversation/Block..."
 msgstr ""
 
-#: src/gtkconv.c:2960
+#: src/gtkconv.c:3259
 msgid "/Conversation/Add..."
 msgstr ""
 
-#: src/gtkconv.c:2964
+#: src/gtkconv.c:3263
 msgid "/Conversation/Remove..."
 msgstr ""
 
-#: src/gtkconv.c:2970
+#: src/gtkconv.c:3269
+msgid "/Conversation/Insert Link..."
+msgstr ""
+
+#: src/gtkconv.c:3273
+msgid "/Conversation/Insert Image..."
+msgstr ""
+
+#: src/gtkconv.c:3279
 msgid "/Options/Enable Logging"
 msgstr ""
 
-#: src/gtkconv.c:2973
+#: src/gtkconv.c:3282
 msgid "/Options/Enable Sounds"
 msgstr ""
 
+#: src/gtkconv.c:3285
+msgid "/Options/Show Formatting Toolbar"
+msgstr ""
+
 #. From right to left...
 #. Send button
-#: src/gtkconv.c:2997 src/gtkconv.c:2999 src/gtkconv.c:3097 src/gtkconv.c:3099
-#: src/gtkconv.c:5958
+#: src/gtkconv.c:3308 src/gtkconv.c:3310 src/gtkconv.c:3408 src/gtkconv.c:3410
 msgid "Send"
 msgstr "ላክ"
 
-#: src/gtkconv.c:3020 src/gtkconv.c:4194
-msgid "Add the user to your buddy list"
-msgstr ""
-
-#: src/gtkconv.c:3026 src/gtkconv.c:4179
-msgid "Remove the user from your buddy list"
-msgstr ""
-
+#. Now, um, just kind of all over the place. Huh?
 #. Warn button
-#: src/gtkconv.c:3033
+#: src/gtkconv.c:3324
 msgid "Warn"
 msgstr ""
 
-#: src/gtkconv.c:3037
+#: src/gtkconv.c:3327
 msgid "Warn the user"
 msgstr ""
 
-#: src/gtkconv.c:3044 src/gtkconv.c:3479
-msgid "Get the user's information"
-msgstr ""
-
 #. Block button
-#: src/gtkconv.c:3047 src/gtkprivacy.c:605 src/gtkprivacy.c:616
+#: src/gtkconv.c:3331 src/gtkprivacy.c:612 src/gtkprivacy.c:623
 msgid "Block"
 msgstr ""
 
-#: src/gtkconv.c:3051
+#: src/gtkconv.c:3334
 msgid "Block the user"
 msgstr ""
 
+#: src/gtkconv.c:3341
+msgid "Add the user to your buddy list"
+msgstr ""
+
+#: src/gtkconv.c:3348
+msgid "Remove the user from your buddy list"
+msgstr ""
+
+#: src/gtkconv.c:3355 src/gtkconv.c:3677
+msgid "Get the user's information"
+msgstr ""
+
 #. Invite
-#: src/gtkconv.c:3109 src/gtkconv.c:5961
+#: src/gtkconv.c:3422
 msgid "Invite"
 msgstr ""
 
-#: src/gtkconv.c:3112
+#: src/gtkconv.c:3425
 msgid "Invite a user"
 msgstr ""
 
-#: src/gtkconv.c:3151
-msgid "Bold"
-msgstr "ደማቅ"
-
-#: src/gtkconv.c:3162
-msgid "Italic"
-msgstr "አይታሊክ ማድረጊያ"
-
-#: src/gtkconv.c:3173
-msgid "Underline"
-msgstr "የስር መስመር"
-
-#: src/gtkconv.c:3189
-msgid "Larger font size"
-msgstr ""
-
-#: src/gtkconv.c:3201
-msgid "Normal font size"
-msgstr ""
-
-#: src/gtkconv.c:3213
-msgid "Smaller font size"
-msgstr ""
-
-#: src/gtkconv.c:3230
-msgid "Font Face"
-msgstr "የፊደል ቅርጽ ዘይቤ"
-
-#: src/gtkconv.c:3242
-msgid "Foreground font color"
-msgstr ""
-
-#: src/gtkconv.c:3254
-msgid "Background color"
-msgstr "የመደቡ ቀለም"
-
-#: src/gtkconv.c:3269
-msgid "Insert image"
-msgstr "ምስል አስገባ"
-
-#: src/gtkconv.c:3280
-msgid "Insert link"
-msgstr "አያያዝ አስገባ"
-
-#: src/gtkconv.c:3291
-msgid "Insert smiley"
-msgstr ""
-
-#: src/gtkconv.c:3348
+#: src/gtkconv.c:3432
+msgid "Add the chat to your buddy list"
+msgstr ""
+
+#: src/gtkconv.c:3439
+msgid "Remove the chat from your buddy list"
+msgstr ""
+
+#: src/gtkconv.c:3539
 msgid "Topic:"
 msgstr "ጉዳዩ፦"
 
 #. Setup the label telling how many people are in the room.
-#: src/gtkconv.c:3399
+#: src/gtkconv.c:3599
 msgid "0 people in room"
 msgstr ""
 
-#: src/gtkconv.c:3456
+#: src/gtkconv.c:3654
 msgid "IM the user"
 msgstr ""
 
-#: src/gtkconv.c:3468
+#: src/gtkconv.c:3666
 msgid "Ignore the user"
 msgstr ""
 
-#: src/gtkconv.c:3962 src/server.c:1380
-#, c-format
-msgid "<HR><BR><H3 Align=Center> ---- New Conversation @ %s ----</H3><BR>\n"
-msgstr ""
-
-#: src/gtkconv.c:3966 src/server.c:1383
-#, c-format
-msgid "---- New Conversation @ %s ----\n"
-msgstr ""
-
-#: src/gtkconv.c:3999
+#: src/gtkconv.c:4207
 msgid "Close conversation"
 msgstr ""
 
-#: src/gtkconv.c:4683 src/gtkconv.c:4715 src/gtkconv.c:4836 src/gtkconv.c:4903
+#: src/gtkconv.c:4752 src/gtkconv.c:4784 src/gtkconv.c:4905 src/gtkconv.c:4972
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/gtkconv.c:5225
-msgid "Disable Animation"
-msgstr ""
-
-#: src/gtkconv.c:5234
-msgid "Enable Animation"
-msgstr ""
-
-#: src/gtkconv.c:5241
-msgid "Hide Icon"
-msgstr "ምልክትን ደብቅ"
-
-#: src/gtkconv.c:5247
-msgid "Save Icon As..."
-msgstr "ምልክትን በሌላ ስም አስቀምጥ..."
-
-#: src/gtkconv.c:5728 src/gtkconv.c:5731
+#: src/gtkconv.c:5491 src/gtkconv.c:5494
 msgid "<main>/Conversation/Close"
 msgstr ""
 
-#: src/gtkdebug.c:133
+#: src/gtkdebug.c:135
 msgid "Debug Window"
 msgstr ""
 
-#: src/gtkdebug.c:173
+#: src/gtkdebug.c:175
 #, fuzzy
 msgid "Pause"
 msgstr "ለአጭር ጊዜ አሳርፍ (_P)"
 
-#: src/gtkdebug.c:179
+#: src/gtkdebug.c:181
 msgid "Timestamps"
 msgstr ""
 
-#: src/gtkft.c:126
+#: src/gtkft.c:135
 #, c-format
 msgid "%.2f KB/s"
 msgstr "%.2f KB/s"
 
-#: src/gtkft.c:200
+#: src/gtkft.c:156 src/gtkft.c:957
+msgid "Finished"
+msgstr ""
+
+#: src/gtkft.c:209
 msgid "<b>Receiving From:</b>"
 msgstr ""
 
-#: src/gtkft.c:203
+#: src/gtkft.c:212
 msgid "<b>Sending To:</b>"
 msgstr ""
 
-#: src/gtkft.c:436
+#: 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:443
+#: src/gtkft.c:489
 msgid "Filename"
 msgstr "የፋይል ስም"
 
-#: src/gtkft.c:450
+#: src/gtkft.c:496
 msgid "Size"
 msgstr "መጠን"
 
-#: src/gtkft.c:457
+#: src/gtkft.c:503
 msgid "Remaining"
 msgstr ""
 
-#: src/gtkft.c:487
+#: src/gtkft.c:533
 msgid "Filename:"
 msgstr "የፋይል ስም፦"
 
-#: src/gtkft.c:488
+#: src/gtkft.c:534
 msgid "Status:"
 msgstr "ሁኔታ፦"
 
-#: src/gtkft.c:489
+#: src/gtkft.c:535
 msgid "Speed:"
 msgstr "ፍጥነት፦"
 
-#: src/gtkft.c:490
+#: src/gtkft.c:536
 msgid "Time Elapsed:"
 msgstr ""
 
-#: src/gtkft.c:491
+#: src/gtkft.c:537
 msgid "Time Remaining:"
 msgstr ""
 
-#: src/gtkft.c:588
+#: src/gtkft.c:634
 msgid "_Keep the dialog open"
 msgstr ""
 
-#: src/gtkft.c:598
+#: src/gtkft.c:644
 msgid "_Clear finished transfers"
 msgstr ""
 
 #. "Download Details" arrow
-#: src/gtkft.c:607
-msgid "Show download details"
-msgstr ""
-
-#: src/gtkft.c:608
-msgid "Hide download details"
+#: src/gtkft.c:653
+msgid "Show transfer details"
+msgstr ""
+
+#: src/gtkft.c:654
+msgid "Hide transfer details"
 msgstr ""
 
 #. Pause button
-#: src/gtkft.c:650 src/stock.c:86
+#: src/gtkft.c:696 src/stock.c:90
 msgid "_Pause"
 msgstr "ለአጭር ጊዜ አሳርፍ (_P)"
 
 #. Resume button
-#: src/gtkft.c:660
+#: src/gtkft.c:706
 msgid "_Resume"
 msgstr "ቀጥል (_R)"
 
-#: src/gtkft.c:1011
+#: src/gtkft.c:908
+#, fuzzy
+msgid "Canceled"
+msgstr "ተወው"
+
+#: src/gtkft.c:910
+#, fuzzy
+msgid "Failed"
+msgstr "ሴት"
+
+#: src/gtkft.c:1082
 msgid "That file does not exist."
 msgstr ""
 
-#: src/gtkft.c:1020
+#: src/gtkft.c:1091
 msgid "Cannot send a file of 0 bytes."
 msgstr ""
 
-#: src/gtkft.c:1033
+#: src/gtkft.c:1105
 msgid "That file already exists."
 msgstr ""
 
-#: src/gtkft.c:1058
-msgid "Gaim - Open..."
+#: src/gtkft.c:1131
+#, fuzzy
+msgid "Open..."
 msgstr "ጌም - ክፈት..."
 
-#: src/gtkft.c:1060 src/protocols/toc/toc.c:2041
-msgid "Gaim - Save As..."
-msgstr ""
-
-#: src/gtkft.c:1107
+#: src/gtkft.c:1133
+#, fuzzy
+msgid "Save As..."
+msgstr "ምልክትን በሌላ ስም አስቀምጥ..."
+
+#: src/gtkft.c:1183
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr ""
 
-#: src/gtkimhtml.c:535
+#: src/gtkft.c:1216
+#, c-format
+msgid "Accept file transfer request from %s?"
+msgstr ""
+
+#: src/gtkft.c:1220
+#, c-format
+msgid ""
+"A file is available for download from:\n"
+"Remote host: %s\n"
+"Remote port: %d"
+msgstr ""
+
+#: src/gtkimhtml.c:1131
 #, fuzzy
 msgid "_Copy E-Mail Address"
 msgstr "ኢሜያል አድራሻ"
 
-#: src/gtkimhtml.c:547
+#: src/gtkimhtml.c:1143
 msgid "_Copy Link Location"
 msgstr "አያያዝ ቦታ ቅጂ"
 
-#: src/gtkimhtml.c:557
+#: src/gtkimhtml.c:1153
 msgid "_Open Link in Browser"
 msgstr ""
 
-#: src/gtkimhtml.c:1639
+#: src/gtkimhtml.c:2635
 msgid ""
 "Unable to guess the image type based on the file extension supplied.  "
 "Defaulting to PNG."
 msgstr ""
 
-#: src/gtkimhtml.c:1647
+#: src/gtkimhtml.c:2643
 #, c-format
 msgid "Error saving image: %s"
 msgstr ""
 
-#: src/gtkimhtml.c:1656
+#: src/gtkimhtml.c:2652
 #, fuzzy
 msgid "Save Image"
 msgstr "ምስሉን አስቀምጥ... (_S)"
 
-#: src/gtkimhtml.c:1679
+#: src/gtkimhtml.c:2675
 msgid "_Save Image..."
 msgstr "ምስሉን አስቀምጥ... (_S)"
 
-#: src/gtknotify.c:209
+#: src/gtkimhtmltoolbar.c:383
+#, fuzzy
+msgid "_URL"
+msgstr "URL"
+
+#: src/gtkimhtmltoolbar.c:387
+#, fuzzy
+msgid "_Description"
+msgstr "መግለጫ"
+
+#: src/gtkimhtmltoolbar.c:392
+msgid "Insert Link"
+msgstr "አያያዝ አስገባ"
+
+#: src/gtkimhtmltoolbar.c:394
+msgid ""
+"Please enter the URL and description of the link that you want to insert. "
+"The description is optional."
+msgstr ""
+
+#: src/gtkimhtmltoolbar.c:398
+#, fuzzy
+msgid "_Insert"
+msgstr "አስገባ"
+
+#: src/gtkimhtmltoolbar.c:455
+#, c-format
+msgid "Failed to store image: %s\n"
+msgstr ""
+
+#: src/gtkimhtmltoolbar.c:481
+#, fuzzy
+msgid "Insert Image"
+msgstr "ምስል አስገባ"
+
+#. show everything
+#: src/gtkimhtmltoolbar.c:625
+msgid "Smile!"
+msgstr ""
+
+#: src/gtkimhtmltoolbar.c:825
+msgid "Bold"
+msgstr "ደማቅ"
+
+#: src/gtkimhtmltoolbar.c:836
+msgid "Italic"
+msgstr "አይታሊክ ማድረጊያ"
+
+#: src/gtkimhtmltoolbar.c:847
+msgid "Underline"
+msgstr "የስር መስመር"
+
+#: src/gtkimhtmltoolbar.c:863
+msgid "Larger font size"
+msgstr ""
+
+#: src/gtkimhtmltoolbar.c:875
+msgid "Smaller font size"
+msgstr ""
+
+#: src/gtkimhtmltoolbar.c:892
+msgid "Font Face"
+msgstr "የፊደል ቅርጽ ዘይቤ"
+
+#: src/gtkimhtmltoolbar.c:904
+msgid "Foreground font color"
+msgstr ""
+
+#: src/gtkimhtmltoolbar.c:916
+msgid "Background color"
+msgstr "የመደቡ ቀለም"
+
+#: src/gtkimhtmltoolbar.c:931
+msgid "Insert link"
+msgstr "አያያዝ አስገባ"
+
+#: src/gtkimhtmltoolbar.c:941
+msgid "Insert image"
+msgstr "ምስል አስገባ"
+
+#: src/gtkimhtmltoolbar.c:952
+msgid "Insert smiley"
+msgstr ""
+
+#: src/gtklog.c:282
+msgid "Conversations with"
+msgstr ""
+
+#. Window **********
+#: src/gtklog.c:368 src/gtklog.c:384
+msgid "System Log"
+msgstr ""
+
+#. Descriptive label
+#: src/gtknotify.c:217
 #, c-format
 msgid "%s has %d new message."
 msgid_plural "%s has %d new messages."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/gtknotify.c:217
+#: src/gtknotify.c:229
 #, c-format
 msgid "<span weight=\"bold\">From:</span> %s\n"
 msgstr ""
 
-#: src/gtknotify.c:222
+#: src/gtknotify.c:235
 #, c-format
 msgid "<span weight=\"bold\">Subject:</span> %s\n"
 msgstr ""
 
-#: src/gtknotify.c:226
+#: src/gtknotify.c:239
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
@@ -2813,7 +3139,7 @@
 "%s%s%s%s"
 msgstr ""
 
-#: src/gtknotify.c:241
+#: src/gtknotify.c:255
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
@@ -2821,689 +3147,776 @@
 "%s"
 msgstr ""
 
-#: src/gtknotify.c:412 src/gtknotify.c:432 src/gtknotify.c:440
+#: src/gtknotify.c:441
+#, c-format
+msgid "The browser command \"%s\" is invalid."
+msgstr ""
+
+#: src/gtknotify.c:444 src/gtknotify.c:458 src/gtknotify.c:473
+#: src/gtknotify.c:581
 msgid "Unable to open URL"
 msgstr ""
 
-#: src/gtknotify.c:413
+#: src/gtknotify.c:455 src/gtknotify.c:470
+#, c-format
+msgid "Error launching \"%s\": %s"
+msgstr ""
+
+#: src/gtknotify.c:582
 msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr ""
 
-#: src/gtknotify.c:430
-#, c-format
-msgid "The browser \"%s\" is invalid."
-msgstr ""
-
-#: src/gtknotify.c:437
-#, c-format
-msgid "Error launching \"command\": %s"
-msgstr ""
-
-#: 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:383 src/gtkpounce.c:788
+#: src/gtkpounce.c:336 src/gtkpounce.c:756
 msgid "New Buddy Pounce"
 msgstr ""
 
-#: src/gtkpounce.c:383
+#: src/gtkpounce.c:336
 msgid "Edit Buddy Pounce"
 msgstr ""
 
 #. Create the "Pounce Who" frame.
-#: src/gtkpounce.c:401
+#: src/gtkpounce.c:354
 msgid "Pounce Who"
 msgstr ""
 
-#: src/gtkpounce.c:427
+#: src/gtkpounce.c:381
 msgid "_Buddy Name:"
 msgstr ""
 
 #. Create the "Pounce When" frame.
-#: src/gtkpounce.c:449
+#: src/gtkpounce.c:404
 msgid "Pounce When"
 msgstr ""
 
-#: src/gtkpounce.c:457 src/main.c:339
-msgid "Sign on"
-msgstr ""
-
-#: src/gtkpounce.c:459
-msgid "Sign off"
-msgstr ""
-
-#: src/gtkpounce.c:463
-msgid "Return from away"
-msgstr ""
-
-#: src/gtkpounce.c:465 src/gtkprefs.c:1498 src/protocols/msn/state.c:30
-#: src/protocols/yahoo/yahoo.c:2028
-msgid "Idle"
-msgstr ""
-
-#: src/gtkpounce.c:467
-msgid "Return from idle"
-msgstr ""
-
-#: src/gtkpounce.c:469
-msgid "Buddy starts typing"
-msgstr ""
-
-#: src/gtkpounce.c:471
-msgid "Buddy stops typing"
+#: src/gtkpounce.c:412
+msgid "_Sign on"
+msgstr ""
+
+#: src/gtkpounce.c:414
+#, fuzzy
+msgid "Sign _off"
+msgstr "ጌም -  ምልክትን አስቀምጥ"
+
+#: src/gtkpounce.c:416
+msgid "A_way"
+msgstr ""
+
+#: src/gtkpounce.c:418
+msgid "Re_turn from away"
+msgstr ""
+
+#: src/gtkpounce.c:420
+msgid "_Idle"
+msgstr ""
+
+#: src/gtkpounce.c:422
+msgid "Retur_n from idle"
+msgstr ""
+
+#: src/gtkpounce.c:424
+msgid "Buddy starts _typing"
+msgstr ""
+
+#: src/gtkpounce.c:426
+msgid "Buddy stops t_yping"
 msgstr ""
 
 #. Create the "Pounce Action" frame.
-#: src/gtkpounce.c:500
+#: src/gtkpounce.c:455
 msgid "Pounce Action"
 msgstr ""
 
-#: src/gtkpounce.c:507
-msgid "Open an IM window"
-msgstr ""
-
-#: src/gtkpounce.c:508
-msgid "Popup notification"
-msgstr ""
-
-#: src/gtkpounce.c:509
-#, fuzzy
-msgid "Send a message"
+#: src/gtkpounce.c:462
+msgid "Op_en an IM window"
+msgstr ""
+
+#: src/gtkpounce.c:463
+#, fuzzy
+msgid "_Popup notification"
+msgstr "አያያዝ ቦታ ቅጂ"
+
+#: src/gtkpounce.c:464
+#, fuzzy
+msgid "Send a _message"
 msgstr "[መልዕክት የለም]"
 
-#: src/gtkpounce.c:510
-msgid "Execute a command"
-msgstr ""
-
-#: src/gtkpounce.c:511
-msgid "Play a sound"
-msgstr ""
-
-#: src/gtkpounce.c:515 src/gtkpounce.c:517
-msgid "Browse"
+#: src/gtkpounce.c:465
+msgid "E_xecute a command"
+msgstr ""
+
+#: src/gtkpounce.c:466
+msgid "P_lay a sound"
+msgstr ""
+
+#: src/gtkpounce.c:470
+#, fuzzy
+msgid "B_rowse..."
 msgstr "ቃኝ"
 
-#: src/gtkpounce.c:518 src/gtkprefs.c:2087
-msgid "Test"
-msgstr "ፈተና"
-
-#: src/gtkpounce.c:601
-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
+msgid "Sav_e this pounce after activation"
 msgstr ""
 
 #. "Remove Buddy Pounce"
-#: src/gtkpounce.c:795
+#: src/gtkpounce.c:763
 msgid "Remove Buddy Pounce"
 msgstr ""
 
-#: src/gtkpounce.c:836
+#: src/gtkpounce.c:813
 #, c-format
 msgid "%s has started typing to you"
 msgstr ""
 
-#: src/gtkpounce.c:837
+#: src/gtkpounce.c:814
 #, c-format
 msgid "%s has signed on"
 msgstr ""
 
-#: src/gtkpounce.c:838
+#: src/gtkpounce.c:815
 #, c-format
 msgid "%s has returned from being idle"
 msgstr ""
 
-#: src/gtkpounce.c:839
+#: src/gtkpounce.c:816
 #, c-format
 msgid "%s has returned from being away"
 msgstr ""
 
-#: src/gtkpounce.c:840
+#: src/gtkpounce.c:817
 #, c-format
 msgid "%s has stopped typing to you"
 msgstr ""
 
-#: src/gtkpounce.c:841
+#: src/gtkpounce.c:818
 #, c-format
 msgid "%s has signed off"
 msgstr ""
 
-#: src/gtkpounce.c:842
+#: src/gtkpounce.c:819
 #, c-format
 msgid "%s has become idle"
 msgstr ""
 
-#: src/gtkpounce.c:844
+#: src/gtkpounce.c:821
 msgid "Unknown pounce event. Please report this!"
 msgstr ""
 
-#: src/gtkprefs.c:373
+#: src/gtkprefs.c:388
 msgid "Interface Options"
 msgstr ""
 
-#: src/gtkprefs.c:375
+#: src/gtkprefs.c:390
 msgid "D_isplay remote nicknames if no alias is set"
 msgstr ""
 
-#: src/gtkprefs.c:561
+#: src/gtkprefs.c:584
 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."
 msgstr ""
 
-#: src/gtkprefs.c:594
+#: src/gtkprefs.c:619
 msgid "Icon"
 msgstr "ምልክት"
 
-#: src/gtkprefs.c:668
+#: src/gtkprefs.c:626 src/gtkprefs.c:2028 src/protocols/jabber/buddy.c:265
+#: src/protocols/jabber/buddy.c:748 src/protocols/jabber/chat.c:684
+msgid "Description"
+msgstr "መግለጫ"
+
+#: src/gtkprefs.c:693
 msgid "Style"
 msgstr "ዓይነት"
 
-#: src/gtkprefs.c:669
+#: src/gtkprefs.c:694
 msgid "_Bold"
 msgstr "ደማቅ (_B)"
 
-#: src/gtkprefs.c:671
-msgid "_Italics"
+#: src/gtkprefs.c:696
+#, fuzzy
+msgid "_Italic"
 msgstr "አይታሊክ ማድረጊያ (_I)"
 
-#: src/gtkprefs.c:673
+#: src/gtkprefs.c:698
 msgid "_Underline"
 msgstr "የስር መስመር (_U)"
 
-#: src/gtkprefs.c:675
+#. 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:708
 msgid "_Strikethrough"
 msgstr "ስርዝ (_S)"
 
-#: src/gtkprefs.c:678
+#: src/gtkprefs.c:711
 msgid "Face"
 msgstr "የፊደል ቅርጽ ዘይቤ"
 
-#: src/gtkprefs.c:681
+#: src/gtkprefs.c:714
 msgid "Use custo_m face"
 msgstr ""
 
-#: src/gtkprefs.c:698
+#: src/gtkprefs.c:731
 msgid "Use custom si_ze"
 msgstr ""
 
-#: src/gtkprefs.c:711
+#: src/gtkprefs.c:743
 msgid "Color"
 msgstr "ቀለም"
 
-#: src/gtkprefs.c:715
+#: src/gtkprefs.c:747
 msgid "_Text color"
 msgstr "የጽሑፍ ቀለም (_T)"
 
-#: src/gtkprefs.c:734
+#: src/gtkprefs.c:766
 msgid "Bac_kground color"
 msgstr "የመደቡ ቀለም (_K)"
 
-#: src/gtkprefs.c:762 src/gtkprefs.c:1003 src/gtkprefs.c:1056
+#: src/gtkprefs.c:794 src/gtkprefs.c:1026 src/gtkprefs.c:1074
 msgid "Display"
 msgstr "አሳይ"
 
-#: src/gtkprefs.c:763
+#: src/gtkprefs.c:795
 msgid "Show graphical _smileys"
 msgstr ""
 
-#: src/gtkprefs.c:765
+#: src/gtkprefs.c:797
 msgid "Show _timestamp on messages"
 msgstr ""
 
-#: src/gtkprefs.c:767
-msgid "Show _URLs as links"
-msgstr ""
-
-#: src/gtkprefs.c:771
-msgid "_Highlight misspelled words"
-msgstr ""
-
-#: src/gtkprefs.c:775
-msgid "Ignore c_olors"
-msgstr ""
-
-#: src/gtkprefs.c:777
-msgid "Ignore font _faces"
-msgstr ""
-
-#: src/gtkprefs.c:779
-msgid "Ignore font si_zes"
-msgstr ""
-
-#: src/gtkprefs.c:792
-msgid "Send Message"
-msgstr ""
-
-#: src/gtkprefs.c:793
-msgid "Enter _sends message"
-msgstr ""
-
-#: src/gtkprefs.c:795
-msgid "C_ontrol-Enter sends message"
-msgstr ""
-
-#: src/gtkprefs.c:798
-msgid "Window Closing"
-msgstr ""
-
 #: src/gtkprefs.c:799
+msgid "Show _URLs as links"
+msgstr ""
+
+#: src/gtkprefs.c:803
+msgid "_Highlight misspelled words"
+msgstr ""
+
+#: src/gtkprefs.c:807
+msgid "Ignore c_olors"
+msgstr ""
+
+#: src/gtkprefs.c:809
+msgid "Ignore font _faces"
+msgstr ""
+
+#: src/gtkprefs.c:811
+msgid "Ignore font si_zes"
+msgstr ""
+
+#: src/gtkprefs.c:824
+msgid "Send Message"
+msgstr ""
+
+#: src/gtkprefs.c:825
+msgid "Enter _sends message"
+msgstr ""
+
+#: src/gtkprefs.c:827
+msgid "C_ontrol-Enter sends message"
+msgstr ""
+
+#: src/gtkprefs.c:830
+msgid "Window Closing"
+msgstr ""
+
+#: src/gtkprefs.c:831
 msgid "_Escape closes window"
 msgstr ""
 
-#: src/gtkprefs.c:802
+#: src/gtkprefs.c:834
 #, fuzzy
 msgid "Insertions"
 msgstr "አያያዝ አስገባ"
 
-#: src/gtkprefs.c:803
+#: src/gtkprefs.c:835
 msgid "Control-{B/I/U} inserts _HTML tags"
 msgstr ""
 
-#: src/gtkprefs.c:805
+#: src/gtkprefs.c:837
 msgid "Control-(number) _inserts smileys"
 msgstr ""
 
-#: src/gtkprefs.c:822
-msgid "Buddy List Sorting"
-msgstr ""
-
-#: src/gtkprefs.c:831
-#, fuzzy
-msgid "Sorting:"
-msgstr "ፖርት፦"
-
-#: src/gtkprefs.c:836
-msgid "Buddy List Toolbar"
-msgstr ""
-
-#: src/gtkprefs.c:837 src/gtkprefs.c:973 src/gtkprefs.c:1029
-msgid "Show _buttons as:"
-msgstr ""
-
-#: src/gtkprefs.c:839 src/gtkprefs.c:975 src/gtkprefs.c:1031
-msgid "Pictures"
-msgstr "ሥዕሎች"
-
-#: src/gtkprefs.c:840 src/gtkprefs.c:976 src/gtkprefs.c:1032
-msgid "Text"
-msgstr "ጽሑፍ"
-
-#: src/gtkprefs.c:841 src/gtkprefs.c:977 src/gtkprefs.c:1033
-msgid "Pictures and text"
-msgstr ""
-
-#: src/gtkprefs.c:846 src/gtkprefs.c:991 src/gtkprefs.c:1047
-msgid "_Raise window on events"
-msgstr ""
-
-#: src/gtkprefs.c:849
-msgid "Group Display"
-msgstr ""
-
-#: src/gtkprefs.c:850
-msgid "Show _numbers in groups"
-msgstr ""
-
 #: src/gtkprefs.c:853
+msgid "Buddy List Sorting"
+msgstr ""
+
+#: src/gtkprefs.c:862
+#, fuzzy
+msgid "_Sorting:"
+msgstr "ፖርት፦"
+
+#: src/gtkprefs.c:867
+msgid "Buddy List Toolbar"
+msgstr ""
+
+#: src/gtkprefs.c:868 src/gtkprefs.c:999 src/gtkprefs.c:1050
+msgid "Show _buttons as:"
+msgstr ""
+
+#: src/gtkprefs.c:870 src/gtkprefs.c:1001 src/gtkprefs.c:1052
+msgid "Pictures"
+msgstr "ሥዕሎች"
+
+#: src/gtkprefs.c:871 src/gtkprefs.c:1002 src/gtkprefs.c:1053
+msgid "Text"
+msgstr "ጽሑፍ"
+
+#: src/gtkprefs.c:872 src/gtkprefs.c:1003 src/gtkprefs.c:1054
+msgid "Pictures and text"
+msgstr ""
+
+#: src/gtkprefs.c:877 src/gtkprefs.c:1014 src/gtkprefs.c:1065
+msgid "_Raise window on events"
+msgstr ""
+
+#: src/gtkprefs.c:880
+msgid "Group Display"
+msgstr ""
+
+#: src/gtkprefs.c:881
+msgid "Show _numbers in groups"
+msgstr ""
+
+#: src/gtkprefs.c:884
 msgid "Buddy Display"
 msgstr ""
 
-#: src/gtkprefs.c:854 src/gtkprefs.c:998
+#: src/gtkprefs.c:885 src/gtkprefs.c:1021
 msgid "Show buddy _icons"
 msgstr ""
 
-#: src/gtkprefs.c:856
+#: src/gtkprefs.c:887
 msgid "Show _warning levels"
 msgstr ""
 
-#: src/gtkprefs.c:859
+#: src/gtkprefs.c:889
 msgid "Show idle _times"
 msgstr ""
 
-#: src/gtkprefs.c:873
+#: src/gtkprefs.c:891
 msgid "Dim i_dle buddies"
 msgstr ""
 
-#: src/gtkprefs.c:898
+#: src/gtkprefs.c:893
+msgid "_Automatically expand contacts"
+msgstr ""
+
+#: src/gtkprefs.c:918
 msgid "_Placement:"
 msgstr ""
 
-#: src/gtkprefs.c:905
-msgid "Send _URLs as Links"
-msgstr ""
-
-#: src/gtkprefs.c:908
-msgid "Tab Options"
-msgstr "የመክፈቻዎች ምርጫዎች"
-
-#: src/gtkprefs.c:910
-msgid "_Tab Placement:"
-msgstr ""
-
-#: src/gtkprefs.c:912
-msgid "Top"
-msgstr "ወደ ላይ"
-
-#: src/gtkprefs.c:913
-msgid "Bottom"
-msgstr "ወደ ታች"
-
-#: src/gtkprefs.c:914
-msgid "Left"
-msgstr "ግራ"
-
-#: src/gtkprefs.c:915
-msgid "Right"
-msgstr "ቀኝ"
-
-#: src/gtkprefs.c:921
-msgid "Show IMs and chats in _tabbed windows"
-msgstr ""
-
-#: src/gtkprefs.c:924
-msgid "Show IMs and chats in _same tabbed window"
+#: src/gtkprefs.c:925
+msgid "Send _URLs as links"
+msgstr ""
+
+#: src/gtkprefs.c:928
+msgid "Show _formatting toolbar"
+msgstr ""
+
+#: src/gtkprefs.c:931
+msgid "Show a_liases in tabs/titles"
 msgstr ""
 
 #: src/gtkprefs.c:934
+msgid "Tab Options"
+msgstr "የመክፈቻዎች ምርጫዎች"
+
+#: src/gtkprefs.c:936
+msgid "_Tab Placement:"
+msgstr ""
+
+#: src/gtkprefs.c:938
+msgid "Top"
+msgstr "ወደ ላይ"
+
+#: src/gtkprefs.c:939
+msgid "Bottom"
+msgstr "ወደ ታች"
+
+#: src/gtkprefs.c:940
+msgid "Left"
+msgstr "ግራ"
+
+#: src/gtkprefs.c:941
+msgid "Right"
+msgstr "ቀኝ"
+
+#: src/gtkprefs.c:947
+msgid "Show IMs and chats in _tabbed windows"
+msgstr ""
+
+#: src/gtkprefs.c:950
+msgid "Show IMs and chats in _same tabbed window"
+msgstr ""
+
+#: src/gtkprefs.c:960
 msgid "Show _close button on tabs"
 msgstr ""
 
-#: src/gtkprefs.c:945
+#: src/gtkprefs.c:971
 msgid "Show status _icons on tabs"
 msgstr ""
 
-#: src/gtkprefs.c:972 src/gtkprefs.c:1028
+#: src/gtkprefs.c:998 src/gtkprefs.c:1049
 msgid "Window"
 msgstr "መስኮት"
 
-#: src/gtkprefs.c:982 src/gtkprefs.c:1038
+#: src/gtkprefs.c:1008 src/gtkprefs.c:1059
 msgid "New window _width:"
 msgstr ""
 
-#: src/gtkprefs.c:985 src/gtkprefs.c:1041
+#: src/gtkprefs.c:1010 src/gtkprefs.c:1061
 msgid "New window _height:"
 msgstr ""
 
-#: src/gtkprefs.c:988 src/gtkprefs.c:1044
+#: src/gtkprefs.c:1012 src/gtkprefs.c:1063
 msgid "_Entry field height:"
 msgstr ""
 
-#: src/gtkprefs.c:993
+#: src/gtkprefs.c:1016
 msgid "Hide window on _send"
 msgstr ""
 
-#: src/gtkprefs.c:997
+#: src/gtkprefs.c:1020
 msgid "Buddy Icons"
 msgstr ""
 
-#: src/gtkprefs.c:1000
+#: src/gtkprefs.c:1023
 msgid "Enable buddy icon a_nimation"
 msgstr ""
 
-#: src/gtkprefs.c:1004
+#: src/gtkprefs.c:1027
 msgid "Show _logins in window"
 msgstr ""
 
-#: src/gtkprefs.c:1006
-msgid "Show a_liases in tabs/titles"
-msgstr ""
-
-#: src/gtkprefs.c:1009
+#: src/gtkprefs.c:1030
 msgid "Typing Notification"
 msgstr ""
 
-#: src/gtkprefs.c:1010
+#: src/gtkprefs.c:1031
 msgid "Notify buddies that you are _typing to them"
 msgstr ""
 
-#: src/gtkprefs.c:1050
+#: src/gtkprefs.c:1068
 msgid "Tab Completion"
 msgstr ""
 
-#: src/gtkprefs.c:1051
+#: src/gtkprefs.c:1069
 msgid "_Tab-complete nicks"
 msgstr ""
 
-#: src/gtkprefs.c:1053
+#: src/gtkprefs.c:1071
 msgid "_Old-style tab completion"
 msgstr ""
 
-#: src/gtkprefs.c:1057
+#: src/gtkprefs.c:1075
 msgid "_Show people joining in window"
 msgstr ""
 
-#: src/gtkprefs.c:1059
+#: src/gtkprefs.c:1077
 msgid "_Show people leaving in window"
 msgstr ""
 
-#: src/gtkprefs.c:1061
-msgid "Co_lorize screennames"
-msgstr ""
-
-#: src/gtkprefs.c:1105
+#: src/gtkprefs.c:1079
+#, fuzzy
+msgid "Co_lorize screen names"
+msgstr "እስክሪን ስም፦ (_S)"
+
+#: src/gtkprefs.c:1100 src/protocols/oscar/oscar.c:584
+#: src/protocols/oscar/oscar.c:4220
+#, fuzzy
+msgid "IP Address"
+msgstr "አድራሻ፦"
+
+#: src/gtkprefs.c:1102
+msgid "_Autodetect IP Address"
+msgstr ""
+
+#: src/gtkprefs.c:1111
+msgid "Public _IP:"
+msgstr ""
+
+#: src/gtkprefs.c:1135
+#, fuzzy
+msgid "Ports"
+msgstr "ፖርት"
+
+#: src/gtkprefs.c:1138
+msgid "_Manually specify range of ports to listen on"
+msgstr ""
+
+#: src/gtkprefs.c:1141
+#, fuzzy
+msgid "_Start Port:"
+msgstr "ፖርት፦"
+
+#: src/gtkprefs.c:1148
+#, fuzzy
+msgid "_End Port:"
+msgstr "ፖርት፦"
+
+#: src/gtkprefs.c:1196
 msgid "Proxy Type"
 msgstr ""
 
-#: src/gtkprefs.c:1108
+#: src/gtkprefs.c:1199
 msgid "No proxy"
 msgstr ""
 
-#: src/gtkprefs.c:1115
+#: src/gtkprefs.c:1206
 msgid "Proxy Server"
 msgstr ""
 
-#: src/gtkprefs.c:1136
-msgid "_Host"
-msgstr "እንግዳ ተቀባይ (_H)"
-
-#: src/gtkprefs.c:1153 src/protocols/irc/irc.c:551
-#: src/protocols/jabber/jabber.c:1087 src/protocols/msn/msn.c:1617
-#: src/protocols/napster/napster.c:642 src/protocols/trepia/trepia.c:1335
-msgid "Port"
-msgstr "ፖርት"
-
-#: src/gtkprefs.c:1171
-msgid "_User"
+#: src/gtkprefs.c:1264
+#, fuzzy
+msgid "_User:"
 msgstr "ተጠቃሚ (_U)"
 
-#: src/gtkprefs.c:1188
-msgid "Pa_ssword"
-msgstr "ሚስጢራዊ ቃል (_S)"
-
-#: src/gtkprefs.c:1225
+#: src/gtkprefs.c:1320
 msgid "Opera"
 msgstr "ኦፔራ"
 
-#: src/gtkprefs.c:1226
+#: src/gtkprefs.c:1321
 msgid "Netscape"
 msgstr "Netscape"
 
-#: src/gtkprefs.c:1227
+#: src/gtkprefs.c:1322
 msgid "Mozilla"
 msgstr "ሞዚላ"
 
-#: src/gtkprefs.c:1228
+#: src/gtkprefs.c:1323
 msgid "Konqueror"
 msgstr ""
 
-#: src/gtkprefs.c:1229
+#: src/gtkprefs.c:1324
 msgid "Galeon"
 msgstr "ጋልዮን"
 
-#: src/gtkprefs.c:1238
+#: src/gtkprefs.c:1325
+msgid "Firebird"
+msgstr ""
+
+#: src/gtkprefs.c:1326
+msgid "Firefox"
+msgstr ""
+
+#: src/gtkprefs.c:1327
+msgid "Gnome Default"
+msgstr ""
+
+#: src/gtkprefs.c:1336
 msgid "Manual"
 msgstr ""
 
-#: src/gtkprefs.c:1279
+#: src/gtkprefs.c:1387
 msgid "Browser Selection"
 msgstr ""
 
-#: src/gtkprefs.c:1283
+#: src/gtkprefs.c:1391
 #, fuzzy
 msgid "_Browser:"
 msgstr "መቃኛ (_B)"
 
-#: src/gtkprefs.c:1293
+#: src/gtkprefs.c:1398
+#, fuzzy
+msgid "_Open link in:"
+msgstr "ኦንላይን"
+
+#: src/gtkprefs.c:1400
+#, fuzzy
+msgid "Browser default"
+msgstr "መቃኛ"
+
+#: src/gtkprefs.c:1401
+msgid "Existing window"
+msgstr ""
+
+#: src/gtkprefs.c:1403
+#, fuzzy
+msgid "New tab"
+msgstr "አዲስ"
+
+#: src/gtkprefs.c:1417
 #, c-format
 msgid ""
 "_Manual:\n"
 "(%s for URL)"
 msgstr ""
 
-#: src/gtkprefs.c:1314
-msgid "Browser Options"
-msgstr "የመቃኛ ምርጫዎች"
-
-#: src/gtkprefs.c:1315
-msgid "Open new _window by default"
-msgstr ""
-
-#: src/gtkprefs.c:1330
+#: src/gtkprefs.c:1454
 msgid "Message Logs"
 msgstr ""
 
-#: src/gtkprefs.c:1331
+#: src/gtkprefs.c:1457
+msgid "Log _Format:"
+msgstr ""
+
+#: src/gtkprefs.c:1460
 msgid "_Log all instant messages"
 msgstr ""
 
-#: src/gtkprefs.c:1333
+#: src/gtkprefs.c:1462
 msgid "Log all c_hats"
 msgstr ""
 
-#: src/gtkprefs.c:1335
-msgid "Strip _HTML from logs"
-msgstr ""
-
-#: src/gtkprefs.c:1338
+#: src/gtkprefs.c:1465
 msgid "System Logs"
 msgstr ""
 
-#: src/gtkprefs.c:1339
+#: src/gtkprefs.c:1467
+msgid "_Enable system log"
+msgstr ""
+
+#: src/gtkprefs.c:1470
 msgid "Log when buddies _sign on/sign off"
 msgstr ""
 
-#: src/gtkprefs.c:1341
+#: src/gtkprefs.c:1476
 msgid "Log when buddies become _idle/un-idle"
 msgstr ""
 
-#: src/gtkprefs.c:1343
+#: src/gtkprefs.c:1482
 msgid "Log when buddies go away/come _back"
 msgstr ""
 
-#: src/gtkprefs.c:1345
+#: src/gtkprefs.c:1488
 msgid "Log your _own signons/idleness/awayness"
 msgstr ""
 
-#: src/gtkprefs.c:1347
-msgid "I_ndividual log file for each buddy's signons"
-msgstr ""
-
-#: src/gtkprefs.c:1390
+#: src/gtkprefs.c:1539
 msgid "Sound Options"
 msgstr "የድምፅ ምርጫዎች"
 
-#: src/gtkprefs.c:1391
-msgid "_No sounds when you log in"
-msgstr ""
-
-#: src/gtkprefs.c:1393
+#: src/gtkprefs.c:1540
+msgid "Sounds when you _log in"
+msgstr ""
+
+#: src/gtkprefs.c:1542
+msgid "Sounds when conversation has _focus"
+msgstr ""
+
+#: src/gtkprefs.c:1544
 msgid "_Sounds while away"
 msgstr ""
 
-#: src/gtkprefs.c:1397
+#: src/gtkprefs.c:1548
 msgid "Sound Method"
 msgstr ""
 
-#: src/gtkprefs.c:1398
+#: src/gtkprefs.c:1549
 msgid "_Method:"
 msgstr ""
 
-#: src/gtkprefs.c:1400
+#: src/gtkprefs.c:1551
 msgid "Console beep"
 msgstr ""
 
-#: src/gtkprefs.c:1402
+#: src/gtkprefs.c:1553
 msgid "Automatic"
 msgstr "አውቶማቲክ"
 
-#: src/gtkprefs.c:1409
+#: src/gtkprefs.c:1560
 msgid "Command"
 msgstr "ትእዛዝ"
 
-#: src/gtkprefs.c:1419
+#: src/gtkprefs.c:1570
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
 "(%s for filename)"
 msgstr ""
 
-#: src/gtkprefs.c:1474
+#: src/gtkprefs.c:1627
 msgid "_Sending messages removes away status"
 msgstr ""
 
-#: src/gtkprefs.c:1476
+#: src/gtkprefs.c:1629
 msgid "_Queue new messages when away"
 msgstr ""
 
-#: src/gtkprefs.c:1479
+#: src/gtkprefs.c:1632
 msgid "Auto-response"
 msgstr ""
 
-#: src/gtkprefs.c:1482
+#: src/gtkprefs.c:1635
 msgid "Seconds before _resending:"
 msgstr ""
 
-#: src/gtkprefs.c:1485
+#: src/gtkprefs.c:1638
 msgid "_Send auto-response"
 msgstr ""
 
-#: src/gtkprefs.c:1487
+#: src/gtkprefs.c:1640
 msgid "_Only send auto-response when idle"
 msgstr ""
 
-#: src/gtkprefs.c:1489
+#: src/gtkprefs.c:1642
 msgid "Send auto-response in _active conversations"
 msgstr ""
 
-#: src/gtkprefs.c:1499
+#: src/gtkprefs.c:1651 src/protocols/msn/state.c:30
+#: src/protocols/novell/novell.c:2150 src/protocols/oscar/oscar.c:3378
+#: src/protocols/yahoo/yahoo.c:2295
+msgid "Idle"
+msgstr ""
+
+#: src/gtkprefs.c:1652
 msgid "Idle _time reporting:"
 msgstr ""
 
-#: src/gtkprefs.c:1502
+#: src/gtkprefs.c:1655
 msgid "Gaim usage"
 msgstr "የጌም አጠቃቀም"
 
-#: src/gtkprefs.c:1505
+#: src/gtkprefs.c:1658
 msgid "X usage"
 msgstr "የX አጠቃቀም"
 
-#: src/gtkprefs.c:1507
+#: src/gtkprefs.c:1660
 msgid "Windows usage"
 msgstr "የWindows አጠቃቀም"
 
-#: src/gtkprefs.c:1515
+#: src/gtkprefs.c:1668
 msgid "Auto-away"
 msgstr ""
 
-#: src/gtkprefs.c:1516
+#: src/gtkprefs.c:1669
 msgid "Set away _when idle"
 msgstr ""
 
-#: src/gtkprefs.c:1518
+#: src/gtkprefs.c:1673
 msgid "_Minutes before setting away:"
 msgstr ""
 
-#: src/gtkprefs.c:1525
+#: src/gtkprefs.c:1681
 msgid "Away m_essage:"
 msgstr ""
 
-#: src/gtkprefs.c:1587
+#: src/gtkprefs.c:1756
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -3513,7 +3926,7 @@
 "<span weight=\"bold\">File name:</span>\t%s"
 msgstr ""
 
-#: src/gtkprefs.c:1592
+#: src/gtkprefs.c:1761
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -3523,177 +3936,189 @@
 "<span weight=\"bold\">File name:</span>  %s"
 msgstr ""
 
-#: src/gtkprefs.c:1773
+#: src/gtkprefs.c:1984
 msgid "Load"
 msgstr "ጫን"
 
-#: src/gtkprefs.c:1780 src/protocols/jabber/jabber.c:544
-#: src/protocols/msn/msn.c:1303 src/protocols/trepia/trepia.c:392
-msgid "Name"
-msgstr "ስም"
-
-#: src/gtkprefs.c:1827
+#: src/gtkprefs.c:1998
+msgid "Summary"
+msgstr ""
+
+#: src/gtkprefs.c:2046
 msgid "Details"
 msgstr "ዝርዝሮች"
 
-#: src/gtkprefs.c:1954
+#: src/gtkprefs.c:2173
 msgid "Sound Selection"
 msgstr ""
 
-#: src/gtkprefs.c:2061
+#: src/gtkprefs.c:2280
 msgid "Play"
 msgstr "አጫውት"
 
-#: src/gtkprefs.c:2068
+#: src/gtkprefs.c:2287
 msgid "Event"
 msgstr "ኩነት"
 
-#: src/gtkprefs.c:2091
+#: src/gtkprefs.c:2306
+msgid "Test"
+msgstr "ፈተና"
+
+#: src/gtkprefs.c:2310
 msgid "Reset"
 msgstr "እንደነበረ አድረግ"
 
-#: src/gtkprefs.c:2095
+#: src/gtkprefs.c:2314
 msgid "Choose..."
 msgstr "ምረጡ..."
 
-#: src/gtkprefs.c:2229
+#: src/gtkprefs.c:2449
 msgid "_Edit"
 msgstr "አስተካክል (_E)"
 
-#: src/gtkprefs.c:2265
+#: src/gtkprefs.c:2485
 msgid "Interface"
 msgstr ""
 
-#: src/gtkprefs.c:2266
+#: src/gtkprefs.c:2486
 msgid "Smiley Themes"
 msgstr ""
 
-#: src/gtkprefs.c:2267
+#: src/gtkprefs.c:2487
 msgid "Fonts"
 msgstr "የፊደል ቅርጾች"
 
-#: src/gtkprefs.c:2268
+#: src/gtkprefs.c:2488
 msgid "Message Text"
 msgstr ""
 
-#: src/gtkprefs.c:2269
+#: src/gtkprefs.c:2489
 msgid "Shortcuts"
 msgstr "አቋራጮች"
 
-#: src/gtkprefs.c:2272
+#: src/gtkprefs.c:2492
 msgid "IMs"
 msgstr ""
 
-#: src/gtkprefs.c:2274
+#: src/gtkprefs.c:2494
+#, fuzzy
+msgid "Network"
+msgstr "አዲስ"
+
+#: src/gtkprefs.c:2495
 msgid "Proxy"
 msgstr ""
 
 #. We use the registered default browser in windows
-#: src/gtkprefs.c:2277
+#: src/gtkprefs.c:2498
 msgid "Browser"
 msgstr "መቃኛ"
 
-#: src/gtkprefs.c:2279
+#: src/gtkprefs.c:2500
 msgid "Logging"
 msgstr ""
 
-#: src/gtkprefs.c:2280
+#: src/gtkprefs.c:2501
 msgid "Sounds"
 msgstr "ድምፆች"
 
-#: src/gtkprefs.c:2281
+#: src/gtkprefs.c:2502
 msgid "Sound Events"
 msgstr ""
 
-#: src/gtkprefs.c:2282
+#: src/gtkprefs.c:2503
 msgid "Away / Idle"
 msgstr ""
 
-#: src/gtkprefs.c:2283
+#: src/gtkprefs.c:2504
 msgid "Away Messages"
 msgstr ""
 
-#: src/gtkprefs.c:2286
+#: src/gtkprefs.c:2507
+msgid "Protocols"
+msgstr ""
+
+#: src/gtkprefs.c:2508
 msgid "Plugins"
 msgstr "ተጨማሪ ፕሮግራሞች (Plugins)"
 
-#: 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"
-msgstr ""
-
-#: src/gtkprivacy.c:368
+#: src/gtkprivacy.c:81
+msgid "Block only the users below"
+msgstr ""
+
+#: src/gtkprivacy.c:374 src/protocols/jabber/jabber.c:1272
 msgid "Privacy"
 msgstr ""
 
-#: src/gtkprivacy.c:383
+#: src/gtkprivacy.c:389
 msgid "Changes to privacy settings take effect immediately."
 msgstr ""
 
 #. "Set privacy for:" label
-#: src/gtkprivacy.c:395
+#: src/gtkprivacy.c:401
 msgid "Set privacy for:"
 msgstr ""
 
-#: src/gtkprivacy.c:562 src/gtkprivacy.c:578
+#: src/gtkprivacy.c:569 src/gtkprivacy.c:585
 msgid "Permit User"
 msgstr ""
 
-#: src/gtkprivacy.c:563
+#: src/gtkprivacy.c:570
 msgid "Type a user you permit to contact you."
 msgstr ""
 
-#: src/gtkprivacy.c:564
+#: src/gtkprivacy.c:571
 msgid "Please enter the name of the user you wish to be able to contact you."
 msgstr ""
 
-#: src/gtkprivacy.c:567 src/gtkprivacy.c:580
+#: src/gtkprivacy.c:574 src/gtkprivacy.c:587
 msgid "Permit"
 msgstr ""
 
-#: src/gtkprivacy.c:572
+#: src/gtkprivacy.c:579
 #, c-format
 msgid "Allow %s to contact you?"
 msgstr ""
 
-#: src/gtkprivacy.c:574
+#: src/gtkprivacy.c:581
 #, c-format
 msgid "Are you sure you wish to allow %s to contact you?"
 msgstr ""
 
-#: src/gtkprivacy.c:601 src/gtkprivacy.c:614
+#: src/gtkprivacy.c:608 src/gtkprivacy.c:621
 msgid "Block User"
 msgstr ""
 
-#: src/gtkprivacy.c:602
+#: src/gtkprivacy.c:609
 msgid "Type a user to block."
 msgstr ""
 
-#: src/gtkprivacy.c:603
-msgid "Please enter the name of the user you wish to block."
-msgstr ""
-
 #: src/gtkprivacy.c:610
+msgid "Please enter the name of the user you wish to block."
+msgstr ""
+
+#: src/gtkprivacy.c:617
 #, c-format
 msgid "Block %s?"
 msgstr ""
 
-#: src/gtkprivacy.c:612
+#: src/gtkprivacy.c:619
 #, c-format
 msgid "Are you sure you want to block %s?"
 msgstr ""
@@ -3701,217 +4126,175 @@
 #. *
 #. * A wrapper for gaim_request_action() that uses Yes and No buttons.
 #.
-#: src/gtkrequest.c:200 src/protocols/gg/gg.c:660 src/request.h:843
+#: src/gtkrequest.c:233 src/protocols/gg/gg.c:663
+#: src/protocols/novell/novell.c:1317 src/request.h:1231
 msgid "Yes"
 msgstr "አዎ"
 
-#: src/gtkrequest.c:201 src/protocols/gg/gg.c:660 src/request.h:843
+#: src/gtkrequest.c:234 src/protocols/gg/gg.c:663
+#: src/protocols/novell/novell.c:1318 src/request.h:1231
 msgid "No"
 msgstr "አይ"
 
-#: src/gtkrequest.c:204
+#: src/gtkrequest.c:237
 #, fuzzy
 msgid "Apply"
 msgstr "ተጠቀም (_Y)"
 
-#: src/gtksound.c:60
-msgid "Buddy logs in"
-msgstr ""
-
-#: src/gtksound.c:61
-msgid "Buddy logs out"
+#: src/gtkrequest.c:238 src/protocols/msn/msn.c:261
+msgid "Close"
+msgstr "ዝጋ"
+
+#: src/gtkroomlist.c:322
+msgid ""
+"You are not currently signed on with any protocols that have the ability to "
+"list rooms."
+msgstr ""
+
+#: src/gtkroomlist.c:335
+msgid "Room List"
+msgstr ""
+
+#. list button
+#: src/gtkroomlist.c:410
+msgid "_Get List"
 msgstr ""
 
 #: src/gtksound.c:62
-msgid "Message received"
+msgid "Buddy logs in"
 msgstr ""
 
 #: src/gtksound.c:63
-msgid "Message received begins conversation"
+msgid "Buddy logs out"
 msgstr ""
 
 #: src/gtksound.c:64
-msgid "Message sent"
+msgid "Message received"
 msgstr ""
 
 #: src/gtksound.c:65
-msgid "Person enters chat"
+msgid "Message received begins conversation"
 msgstr ""
 
 #: src/gtksound.c:66
-msgid "Person leaves chat"
+msgid "Message sent"
 msgstr ""
 
 #: src/gtksound.c:67
-msgid "You talk in chat"
+msgid "Person enters chat"
 msgstr ""
 
 #: src/gtksound.c:68
+msgid "Person leaves chat"
+msgstr ""
+
+#: src/gtksound.c:69
+msgid "You talk in chat"
+msgstr ""
+
+#: src/gtksound.c:70
 msgid "Others talk in chat"
 msgstr ""
 
-#: src/gtksound.c:71
+#: src/gtksound.c:73
 msgid "Someone says your name in chat"
 msgstr ""
 
-#: src/gtksound.c:153
+#: src/gtksound.c:158
 #, c-format
 msgid "Unable to play sound because the chosen file (%s) does not exist."
 msgstr ""
 
-#: src/gtksound.c:169
+#: src/gtksound.c:174
 msgid ""
 "Unable to play sound because the 'Command' sound method has been chosen, but "
 "no command has been set."
 msgstr ""
 
-#: src/gtksound.c:178
+#: src/gtksound.c:186
 #, c-format
 msgid ""
 "Unable to play sound because the configured sound command could not be "
 "launched: %s"
 msgstr ""
 
-#: src/gtkutils.c:286
+#: src/gtkutils.c:297
 msgid "Can't save icon file to disk."
 msgstr ""
 
-#: src/gtkutils.c:321
-msgid "Gaim - Save Icon"
-msgstr "ጌም -  ምልክትን አስቀምጥ"
-
-#: src/log.c:30
-msgid "Error in specifying buddy conversation."
-msgstr ""
-
-#: src/log.c:36
-msgid "Unable to find conversation log"
-msgstr ""
-
-#: src/log.c:119 src/log.c:140 src/log.c:153
-#, c-format
-msgid "Unable to make directory %s for logging"
-msgstr ""
-
-#: src/log.c:207 src/log.c:223
-#, c-format
-msgid "IM Sessions with %s\n"
-msgstr ""
-
-#: src/log.c:210 src/log.c:226
-#, c-format
-msgid "IM Sessions with %s"
-msgstr ""
-
-#: src/log.c:270
-#, c-format
-msgid "+++ %s (%s) signed on @ %s"
-msgstr ""
-
-#: src/log.c:275
-#, c-format
-msgid "+++ %s (%s) signed off @ %s"
-msgstr ""
-
-#: src/log.c:280
-#, c-format
-msgid "+++ %s (%s) changed away state @ %s"
-msgstr ""
-
-#: src/log.c:285
-#, c-format
-msgid "+++ %s (%s) came back @ %s"
-msgstr ""
-
-#: src/log.c:290
-#, c-format
-msgid "+++ %s (%s) became idle @ %s"
-msgstr ""
-
-#: src/log.c:295
-#, c-format
-msgid "+++ %s (%s) returned from idle @ %s"
-msgstr ""
-
-#: src/log.c:300
-#, c-format
-msgid "+++ Program exit @ %s"
-msgstr ""
-
-#: src/log.c:307
-#, c-format
-msgid "%s (%s) reported that %s (%s) signed on @ %s"
-msgstr ""
-
-#: src/log.c:312
-#, c-format
-msgid "%s (%s) reported that %s (%s) signed off @ %s"
-msgstr ""
-
-#: src/log.c:317
-#, c-format
-msgid "%s (%s) reported that %s (%s) went away @ %s"
-msgstr ""
-
-#: src/log.c:322
-#, c-format
-msgid "%s (%s) reported that %s (%s) came back @ %s"
-msgstr ""
-
-#: src/log.c:327
-#, c-format
-msgid "%s (%s) reported that %s (%s) became idle @ %s"
-msgstr ""
-
-#: src/log.c:333
-#, c-format
-msgid "%s (%s) reported that %s (%s) returned from idle @ %s"
-msgstr ""
-
-#: src/log.c:345
-#, c-format
-msgid "%s (%s) reported that %s signed on @ %s"
-msgstr ""
-
-#: src/log.c:350
-#, c-format
-msgid "%s (%s) reported that %s signed off @ %s"
-msgstr ""
-
-#: src/log.c:355
-#, c-format
-msgid "%s (%s) reported that %s went away @ %s"
-msgstr ""
-
-#: src/log.c:360
-#, c-format
-msgid "%s (%s) reported that %s came back @ %s"
-msgstr ""
-
-#: src/log.c:365
-#, c-format
-msgid "%s (%s) reported that %s became idle @ %s"
-msgstr ""
-
-#: src/log.c:371
-#, c-format
-msgid "%s (%s) reported that %s returned from idle @ %s"
-msgstr ""
-
-#: src/main.c:148
-msgid "Please enter your login."
-msgstr ""
-
-#: src/main.c:231
-msgid "<New User>"
-msgstr "<አዲስ ተጠቃሚ>"
-
-#: src/main.c:273
+#: src/gtkutils.c:332
+#, fuzzy
+msgid "Save Icon"
+msgstr "ምልክትን በሌላ ስም አስቀምጥ..."
+
+#: src/log.c:106
+msgid "<b><font color=\"red\">The logger has no read function</font></b>"
+msgstr ""
+
+#: src/log.c:476
+msgid "XML"
+msgstr ""
+
+#: src/log.c:561
+#, c-format
+msgid ""
+"<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
+"REPLY&gt;:</b></font> %s<br/>\n"
+msgstr ""
+
+#: src/log.c:563
+#, c-format
+msgid ""
+"<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
+"REPLY&gt;:</b></font> %s<br/>\n"
+msgstr ""
+
+#: src/log.c:614 src/log.c:800
+msgid "<font color=\"red\"><b>Unable to find log path!</b></font>"
+msgstr ""
+
+#: src/log.c:624 src/log.c:812
+#, c-format
+msgid "<font color=\"red\"><b>Could not read file: %s</b></font>"
+msgstr ""
+
+#: src/log.c:661
+msgid "HTML"
+msgstr ""
+
+#: src/log.c:745
+#, c-format
+msgid "(%s) %s <AUTO-REPLY>: %s\n"
+msgstr ""
+
+#: src/log.c:845
+msgid "Plain text"
+msgstr ""
+
+#: src/main.c:155
+msgid "Please create an account."
+msgstr ""
+
+#: src/main.c:237
 msgid "Login"
 msgstr "ዝምብለህ ይግባ"
 
+#: src/main.c:255
+#, fuzzy
+msgid "<b>Screen Name:</b>"
+msgstr "እስክሪን ስም፦"
+
+#: src/main.c:269
+#, fuzzy
+msgid "<b>Password:</b>"
+msgstr "ሚስጢራዊ ቃል፦"
+
+#: src/main.c:298
+msgid "Sign on"
+msgstr ""
+
 #. full help text
-#: src/main.c:550
+#: src/main.c:522
 #, c-format
 msgid ""
 "Gaim %s\n"
@@ -3924,43 +4307,45 @@
 "                      account(s) to use, seperated by commas)\n"
 "  -n, --loginwin      don't automatically login; show login window\n"
 "  -u, --user=NAME     use account NAME\n"
-"  -f, --file=FILE     use FILE as config\n"
+"  -c, --config=DIR    use DIR for config files\n"
 "  -d, --debug         print debugging messages to stdout\n"
 "  -v, --version       display the current version and exit\n"
 "  -h, --help          display this help and exit\n"
 msgstr ""
 
 #. short message
-#: src/main.c:565
+#: src/main.c:537
 #, c-format
 msgid "Gaim %s. Try `%s -h' for more information.\n"
 msgstr ""
 
-#: src/plugin.c:260
+#: src/plugin.c:269
 #, c-format
 msgid ""
 "The required plugin %s was not found. Please install this plugin and try "
 "again."
 msgstr ""
 
-#: src/plugin.c:265 src/plugin.c:293
+#: src/plugin.c:274 src/plugin.c:302
 msgid "Gaim was unable to load your plugin."
 msgstr ""
 
-#: src/plugin.c:289
+#: src/plugin.c:298
 #, c-format
 msgid "The required plugin %s was unable to load."
 msgstr ""
 
-#: src/prefs.c:111 src/status.c:270
+#: src/prefs.c:113 src/status.c:273
 msgid "Slightly less boring default"
 msgstr ""
 
-#: src/protocols/gg/gg.c:49 src/protocols/jabber/jutil.c:109
-#: src/protocols/msn/msn.c:344 src/protocols/msn/state.c:27
+#: src/protocols/gg/gg.c:49 src/protocols/jabber/jutil.c:44
+#: src/protocols/msn/msn.c:360 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:2304
-#: src/protocols/yahoo/yahoo.c:2405
+#: src/protocols/msn/state.c:36 src/protocols/novell/novell.c:2141
+#: src/protocols/novell/novell.c:2258 src/protocols/novell/novell.c:2309
+#: src/protocols/oscar/oscar.c:603 src/protocols/yahoo/yahoo.c:2599
+#: src/protocols/yahoo/yahoo.c:2714
 msgid "Available"
 msgstr ""
 
@@ -3972,11 +4357,12 @@
 msgid "Away for friends only"
 msgstr ""
 
-#: src/protocols/gg/gg.c:53 src/protocols/jabber/jabber.c:871
-#: src/protocols/jabber/presence.c:88 src/protocols/oscar/oscar.c:2837
-#: src/protocols/oscar/oscar.c:4517 src/protocols/oscar/oscar.c:4544
-#: src/protocols/oscar/oscar.c:6069 src/protocols/yahoo/yahoo.c:2026
-#: src/protocols/yahoo/yahoo.c:2324 src/protocols/yahoo/yahoo.c:2415
+#: src/protocols/gg/gg.c:53 src/protocols/jabber/jabber.c:956
+#: src/protocols/jabber/presence.c:126 src/protocols/oscar/oscar.c:524
+#: src/protocols/oscar/oscar.c:4738 src/protocols/oscar/oscar.c:4816
+#: src/protocols/oscar/oscar.c:4840 src/protocols/oscar/oscar.c:6431
+#: src/protocols/oscar/oscar.c:6436 src/protocols/yahoo/yahoo.c:2293
+#: src/protocols/yahoo/yahoo.c:2619 src/protocols/yahoo/yahoo.c:2724
 msgid "Invisible"
 msgstr ""
 
@@ -3992,11 +4378,14 @@
 msgid "Unable to resolve hostname."
 msgstr ""
 
-#: src/protocols/gg/gg.c:139
+#: src/protocols/gg/gg.c:139 src/protocols/novell/novell.c:1159
 msgid "Unable to connect to server."
 msgstr ""
 
-#: src/protocols/gg/gg.c:142
+#: 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:104
 msgid "Invalid response from server."
 msgstr ""
 
@@ -4030,226 +4419,235 @@
 msgstr ""
 
 #. 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/toc/toc.c:200
+#: src/protocols/gg/gg.c:402 src/protocols/icq/gaim_icq.c:344
+#: src/protocols/msn/dispatch.c:208 src/protocols/msn/msn.c:514
+#: src/protocols/msn/servconn.c:77 src/protocols/napster/napster.c:475
+#: src/protocols/napster/napster.c:506 src/protocols/toc/toc.c:200
+#: src/protocols/yahoo/yahoo.c:1958 src/protocols/yahoo/yahoo.c:1989
+#: src/protocols/yahoo/yahoo.c:2052 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 "Balancer handshake"
+msgid "Reading data"
 msgstr ""
 
 #: src/protocols/gg/gg.c:421
-msgid "Reading server key"
+msgid "Balancer handshake"
 msgstr ""
 
 #: src/protocols/gg/gg.c:424
+msgid "Reading server key"
+msgstr ""
+
+#: 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 ""
 
-#: 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 ""
 
-#: src/protocols/gg/gg.c:500
+#: src/protocols/gg/gg.c:503
 msgid "Unable to ping server"
 msgstr ""
 
-#: src/protocols/gg/gg.c:512
+#: src/protocols/gg/gg.c:515
 msgid "Send as message"
 msgstr ""
 
-#: src/protocols/gg/gg.c:517
-msgid "Looking up GG server"
-msgstr ""
-
 #: src/protocols/gg/gg.c:520
+msgid "Looking up GG server"
+msgstr ""
+
+#: src/protocols/gg/gg.c:523
 msgid "Invalid Gadu-Gadu UIN specified"
 msgstr ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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:3892
+#: src/protocols/gg/gg.c:667 src/protocols/oscar/oscar.c:4212
 msgid "UIN"
 msgstr "UIN"
 
-#: src/protocols/gg/gg.c:668
-msgid "First name"
-msgstr "ስም"
+#. First Name
+#: src/protocols/gg/gg.c:671 src/protocols/jabber/jabber.c:606
+#: src/protocols/oscar/oscar.c:4223 src/protocols/trepia/trepia.c:267
+msgid "First Name"
+msgstr "ስም፦"
 
 #. Last Name
-#: src/protocols/gg/gg.c:673 src/protocols/jabber/jabber.c:564
-#: src/protocols/oscar/oscar.c:3900 src/protocols/trepia/trepia.c:265
+#: src/protocols/gg/gg.c:676 src/protocols/jabber/jabber.c:611
+#: src/protocols/oscar/oscar.c:4224 src/protocols/trepia/trepia.c:274
 msgid "Last Name"
 msgstr "የአባት ስም"
 
-#: src/protocols/gg/gg.c:677 src/protocols/gg/gg.c:1389
-#: src/protocols/irc/msgs.c:183 src/protocols/oscar/oscar.c:3894
+#: src/protocols/gg/gg.c:680 src/protocols/gg/gg.c:1392
+#: src/protocols/irc/msgs.c:183 src/protocols/oscar/oscar.c:4213
 msgid "Nick"
 msgstr "ቅጽል"
 
-#: src/protocols/gg/gg.c:684 src/protocols/gg/gg.c:687
-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:687 src/protocols/gg/gg.c:690
+#, fuzzy
+msgid "Birth Year"
+msgstr "የልደት በዓል"
+
+#: 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:574
-#: src/protocols/oscar/oscar.c:3946 src/protocols/oscar/oscar.c:3962
-#: src/protocols/trepia/trepia.c:322 src/protocols/trepia/trepia.c:421
+#: src/protocols/gg/gg.c:704 src/protocols/jabber/jabber.c:621
+#: src/protocols/oscar/oscar.c:4266 src/protocols/oscar/oscar.c:4274
+#: src/protocols/trepia/trepia.c:331 src/protocols/trepia/trepia.c:410
 msgid "City"
 msgstr "ከተማ"
 
 #. res[0] == username
-#: src/protocols/gg/gg.c:722 src/protocols/msn/msn.c:1241
-#: src/protocols/msn/msn.c:1483 src/protocols/napster/napster.c:387
-#: src/protocols/oscar/oscar.c:2879 src/protocols/oscar/oscar.c:3187
-#: src/protocols/toc/toc.c:498 src/protocols/yahoo/yahoo.c:2581
-#: src/protocols/yahoo/yahoo.c:2603 src/protocols/yahoo/yahoo.c:2623
-#: src/protocols/yahoo/yahoo.c:2810 src/protocols/zephyr/zephyr.c:355
+#. show it to the user
+#: src/protocols/gg/gg.c:725 src/protocols/msn/msn.c:1331
+#: src/protocols/msn/msn.c:1575 src/protocols/napster/napster.c:393
+#: src/protocols/oscar/oscar.c:3190 src/protocols/oscar/oscar.c:3406
+#: src/protocols/toc/toc.c:498 src/protocols/yahoo/yahoo.c:2898
+#: src/protocols/yahoo/yahoo.c:2920 src/protocols/yahoo/yahoo.c:2943
+#: src/protocols/yahoo/yahoo.c:3101 src/protocols/zephyr/zephyr.c:567
 #, fuzzy
 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 ""
 
-#: 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 ""
 
-#: src/protocols/gg/gg.c:820
+#: src/protocols/gg/gg.c:823
 msgid "Couldn't transfer Buddy List to Gadu-Gadu server"
 msgstr ""
 
-#: src/protocols/gg/gg.c:828
+#: src/protocols/gg/gg.c:831
 msgid "Buddy List successfully deleted from Gadu-Gadu server"
 msgstr ""
 
-#: src/protocols/gg/gg.c:836
+#: src/protocols/gg/gg.c:839
 msgid "Couldn't delete Buddy List from Gadu-Gadu server"
 msgstr ""
 
-#: 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 ""
 
-#: 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."
 msgstr ""
 
-#: src/protocols/gg/gg.c:997
+#: src/protocols/gg/gg.c:1000
 msgid "Unable to import Gadu-Gadu buddy list"
 msgstr ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: src/protocols/gg/gg.c:1094
+#: src/protocols/gg/gg.c:1097
 msgid "Unable to delete Gadu-Gadu buddy list"
 msgstr ""
 
-#: 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."
 msgstr ""
 
-#: src/protocols/gg/gg.c:1177
+#: src/protocols/gg/gg.c:1180
 msgid "Unable to change Gadu-Gadu password"
 msgstr ""
 
-#: 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."
 msgstr ""
 
-#: 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:981
-#: src/protocols/oscar/oscar.c:6422 src/protocols/toc/toc.c:1545
+#: src/protocols/gg/gg.c:1207 src/protocols/jabber/jabber.c:1055
+#: 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."
@@ -4265,7 +4663,8 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/gg/gg.c:1370 src/protocols/gg/gg.c:1372
+#. *  description
+#: src/protocols/gg/gg.c:1373 src/protocols/gg/gg.c:1375
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr ""
 
@@ -4278,17 +4677,17 @@
 msgid "The user %s (%s%s%s%s%s) wants you to authorize them."
 msgstr ""
 
-#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:181
-#: src/protocols/msn/notification.c:935 src/protocols/msn/notification.c:1256
-#: src/protocols/msn/notification.c:1422 src/protocols/oscar/oscar.c:2609
-#: src/protocols/oscar/oscar.c:5080
+#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:229
+#: src/protocols/msn/notification.c:588 src/protocols/msn/notification.c:909
+#: src/protocols/msn/notification.c:1076 src/protocols/oscar/oscar.c:2932
+#: src/protocols/oscar/oscar.c:5451
 msgid "Authorize"
 msgstr ""
 
-#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:182
-#: src/protocols/msn/notification.c:936 src/protocols/msn/notification.c:1258
-#: src/protocols/msn/notification.c:1424 src/protocols/oscar/oscar.c:2611
-#: src/protocols/oscar/oscar.c:5081
+#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:230
+#: src/protocols/msn/notification.c:589 src/protocols/msn/notification.c:911
+#: src/protocols/msn/notification.c:1078 src/protocols/oscar/oscar.c:2934
+#: src/protocols/oscar/oscar.c:5452
 msgid "Deny"
 msgstr ""
 
@@ -4308,72 +4707,108 @@
 msgid "Gaim User"
 msgstr "የጌም ተጠቃሚ"
 
-#: src/protocols/irc/cmds.c:41
+#: src/protocols/irc/cmds.c:43
 #, c-format
 msgid "Unknown command: %s"
 msgstr ""
 
-#: src/protocols/irc/cmds.c:135
+#: src/protocols/irc/cmds.c:137
 msgid ""
 "<B>Supported IRC Commands:</B><BR>AWAY INVITE JOIN KICK<BR>ME MODE MSG "
 "NAMES<BR>NICK OP DEOP OPERWALL<BR>PART PING QUERY QUIT<BR>QUOTE REMOVE TOPIC "
 "UMODE<BR>VOICE DEVOICE WALLOPS WHOIS<BR>"
 msgstr ""
 
-#: src/protocols/irc/cmds.c:144
+#: src/protocols/irc/cmds.c:146
 msgid ""
 "<B>Supported IRC Commands:</B><BR>AWAY JOIN ME MODE<BR>MSG NICK OPERWALL "
 "PING<BR>QUERY QUIT QUOTE UMODE<BR>WALLOPS WHOIS"
 msgstr ""
 
-#: src/protocols/irc/cmds.c:459
+#: src/protocols/irc/cmds.c:469 src/protocols/jabber/chat.c:527
 #, c-format
 msgid "current topic is: %s"
 msgstr ""
 
-#: src/protocols/irc/cmds.c:461
+#: src/protocols/irc/cmds.c:472 src/protocols/jabber/chat.c:529
 msgid "No topic is set"
 msgstr ""
 
-#: src/protocols/irc/irc.c:64
+#: 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 ""
+
+#: src/protocols/irc/irc.c:73
 msgid "Error displaying MOTD"
 msgstr ""
 
-#: src/protocols/irc/irc.c:64
+#: src/protocols/irc/irc.c:73
 msgid "No MOTD available"
 msgstr ""
 
-#: src/protocols/irc/irc.c:65
+#: src/protocols/irc/irc.c:74
 msgid "There is no MOTD associated with this connection."
 msgstr ""
 
-#: src/protocols/irc/irc.c:68
+#: src/protocols/irc/irc.c:77
 #, c-format
 msgid "MOTD for %s"
 msgstr ""
 
-#: src/protocols/irc/irc.c:137
+#: src/protocols/irc/irc.c:140
 msgid "View MOTD"
 msgstr ""
 
-#: src/protocols/irc/irc.c:156
-msgid "Channel:"
+#: src/protocols/irc/irc.c:154 src/protocols/jabber/buddy.c:883
+#: src/protocols/oscar/oscar.c:440 src/protocols/oscar/oscar.c:6532
+#: src/protocols/yahoo/yahoo.c:2456
+msgid "Send File"
+msgstr "ፋይልን ላክ"
+
+#: src/protocols/irc/irc.c:168
+#, fuzzy
+msgid "_Channel:"
 msgstr "ጣቢያ፦"
 
-#: src/protocols/irc/irc.c:180
+#: src/protocols/irc/irc.c:173 src/protocols/jabber/chat.c:59
+#, fuzzy
+msgid "_Password:"
+msgstr "ሚስጢራዊ ቃል (_P)"
+
+#: src/protocols/irc/irc.c:193
 msgid "IRC nicks may not contain whitespace"
 msgstr ""
 
-#: src/protocols/irc/irc.c:199 src/protocols/oscar/oscar.c:679
-#: src/protocols/toc/toc.c:228
+#: src/protocols/irc/irc.c:212 src/protocols/toc/toc.c:228
 #, c-format
 msgid "Signon: %s"
 msgstr ""
 
-#: src/protocols/irc/irc.c:208
+#: src/protocols/irc/irc.c:221
 msgid "Couldn't create socket"
 msgstr ""
 
+#: src/protocols/irc/irc.c:370 src/protocols/trepia/trepia.c:926
+#, fuzzy
+msgid "Read error"
+msgstr "የIRC ስህተት"
+
+#: src/protocols/irc/irc.c:504 src/protocols/yahoo/yahoochat.c:1343
+#, fuzzy
+msgid "Users"
+msgstr "ተጠቃሚ (_U)"
+
+#: src/protocols/irc/irc.c:507 src/protocols/yahoo/yahoochat.c:1352
+#, fuzzy
+msgid "Topic"
+msgstr "ጉዳዩ፦"
+
 #. *< api_version
 #. *< type
 #. *< ui_requirement
@@ -4383,26 +4818,38 @@
 #. *< id
 #. *< name
 #. *< version
-#: src/protocols/irc/irc.c:530
+#: src/protocols/irc/irc.c:612
 msgid "IRC Protocol Plugin"
 msgstr ""
 
 #. *  summary
-#: src/protocols/irc/irc.c:531
+#: src/protocols/irc/irc.c:613
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr ""
 
-#: src/protocols/irc/irc.c:548 src/protocols/irc/msgs.c:197
-#: src/protocols/jabber/jabber.c:1077 src/protocols/napster/napster.c:637
+#: src/protocols/irc/irc.c:630 src/protocols/irc/msgs.c:197
+#: src/protocols/jabber/jabber.c:1382 src/protocols/napster/napster.c:657
 #, fuzzy
 msgid "Server"
 msgstr "ሰርቨር፦"
 
-#: src/protocols/irc/irc.c:554
+#: src/protocols/irc/irc.c:633 src/protocols/jabber/jabber.c:1403
+#: src/protocols/msn/msn.c:1741 src/protocols/napster/napster.c:662
+#: src/protocols/trepia/trepia.c:1306
+msgid "Port"
+msgstr "ፖርት"
+
+#: src/protocols/irc/irc.c:636 src/protocols/zephyr/zephyr.c:1400
 #, fuzzy
 msgid "Encoding"
 msgstr "የሆሄያት ኮድ፦"
 
+#: src/protocols/irc/irc.c:639 src/protocols/irc/msgs.c:191
+#: src/protocols/jabber/jabber.c:581
+#, fuzzy
+msgid "Username"
+msgstr "ተጠቃሚ፦ (_U)"
+
 #: src/protocols/irc/msgs.c:98
 msgid "Bad mode"
 msgstr ""
@@ -4424,12 +4871,7 @@
 msgid " <i>(identified)</i>"
 msgstr ""
 
-#: src/protocols/irc/msgs.c:191 src/protocols/jabber/jabber.c:534
-#, fuzzy
-msgid "Username"
-msgstr "ተጠቃሚ፦ (_U)"
-
-#: src/protocols/irc/msgs.c:192 src/protocols/yahoo/yahoo.c:2681
+#: src/protocols/irc/msgs.c:192 src/protocols/yahoo/yahoo.c:3001
 #, fuzzy
 msgid "Realname"
 msgstr "እንደገና ሰይም (_R)"
@@ -4457,283 +4899,266 @@
 msgid "Buddy Information for %s"
 msgstr ""
 
-#: src/protocols/irc/msgs.c:247
+#: src/protocols/irc/msgs.c:278
 #, c-format
 msgid "%s has changed the topic to: %s"
 msgstr ""
 
-#: src/protocols/irc/msgs.c:252
+#: src/protocols/irc/msgs.c:283
 #, c-format
 msgid "The topic for %s is: %s"
 msgstr ""
 
-#: src/protocols/irc/msgs.c:266
+#: src/protocols/irc/msgs.c:299
 #, c-format
 msgid "Unknown message '%s'"
 msgstr ""
 
-#: src/protocols/irc/msgs.c:267
+#: src/protocols/irc/msgs.c:300
 #, fuzzy
 msgid "Unknown message"
 msgstr "ያልታወቀ ስህተት"
 
-#: src/protocols/irc/msgs.c:267
+#: src/protocols/irc/msgs.c:300
 msgid "Gaim has sent a message the IRC server did not understand."
 msgstr ""
 
+#: src/protocols/irc/msgs.c:403
+msgid "No such channel"
+msgstr ""
+
 #. does this happen?
-#: src/protocols/irc/msgs.c:371
+#: src/protocols/irc/msgs.c:414
 msgid "no such channel"
 msgstr ""
 
-#: src/protocols/irc/msgs.c:374
+#: src/protocols/irc/msgs.c:417
 msgid "User is not logged in"
 msgstr ""
 
-#: src/protocols/irc/msgs.c:379
+#: src/protocols/irc/msgs.c:422
 msgid "No such nick or channel"
 msgstr ""
 
-#: src/protocols/irc/msgs.c:399
+#: src/protocols/irc/msgs.c:442
 msgid "Could not send"
 msgstr ""
 
-#: src/protocols/irc/msgs.c:455
+#: src/protocols/irc/msgs.c:498
 #, c-format
 msgid "Joining %s requires an invitation."
 msgstr ""
 
-#: src/protocols/irc/msgs.c:456
+#: src/protocols/irc/msgs.c:499
 msgid "Invitation only"
 msgstr ""
 
-#: src/protocols/irc/msgs.c:552
+#: src/protocols/irc/msgs.c:595
 #, c-format
 msgid "You have been kicked by %s: (%s)"
 msgstr ""
 
-#: src/protocols/irc/msgs.c:560
+#: src/protocols/irc/msgs.c:600
 #, c-format
 msgid "Kicked by %s (%s)"
 msgstr ""
 
-#: src/protocols/irc/msgs.c:581
+#: src/protocols/irc/msgs.c:621
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr ""
 
-#: src/protocols/irc/msgs.c:660
+#: src/protocols/irc/msgs.c:700
 msgid "Could not change nick"
 msgstr ""
 
-#: src/protocols/irc/msgs.c:661
+#: src/protocols/irc/msgs.c:701
 msgid "Cannot change nick"
 msgstr ""
 
-#: src/protocols/irc/msgs.c:682
-#, c-format
-msgid "You have parted the channel%s%s"
-msgstr ""
-
-#: src/protocols/irc/msgs.c:720
-msgid "Error: invalid PONG from server"
-msgstr ""
-
 #: src/protocols/irc/msgs.c:722
 #, c-format
+msgid "You have parted the channel%s%s"
+msgstr ""
+
+#: src/protocols/irc/msgs.c:762
+msgid "Error: invalid PONG from server"
+msgstr ""
+
+#: src/protocols/irc/msgs.c:764
+#, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr ""
 
-#: src/protocols/irc/msgs.c:792
+#: src/protocols/irc/msgs.c:839
 #, c-format
 msgid "Cannot join %s:"
 msgstr ""
 
-#: src/protocols/irc/msgs.c:793
+#: src/protocols/irc/msgs.c:840
 msgid "Cannot join channel"
 msgstr ""
 
-#: src/protocols/irc/msgs.c:823
+#: src/protocols/irc/msgs.c:870
 #, c-format
 msgid "Wallops from %s"
 msgstr ""
 
-#: src/protocols/irc/parse.c:160
+#: src/protocols/irc/parse.c:165 src/protocols/zephyr/zephyr.c:199
 msgid ""
 "(There was an error converting this message.  Check the 'Encoding' option in "
 "the Account Editor)"
 msgstr ""
 
-#: src/protocols/irc/parse.c:291
+#: src/protocols/irc/parse.c:318
 #, c-format
 msgid "Reply time from %s: %lu seconds"
 msgstr ""
 
-#: src/protocols/irc/parse.c:292
+#: src/protocols/irc/parse.c:319
 msgid "PONG"
 msgstr ""
 
-#: src/protocols/irc/parse.c:292
+#: src/protocols/irc/parse.c:319
 msgid "CTCP PING reply"
 msgstr ""
 
-#: src/protocols/irc/parse.c:391
-#, fuzzy
-msgid "Disconnected"
-msgstr "ተገናኝቷል"
-
-#: src/protocols/jabber/auth.c:50
+#: src/protocols/irc/parse.c:421 src/protocols/oscar/oscar.c:777
+#: 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:51
 msgid "Server requires SSL for login"
 msgstr ""
 
-#: src/protocols/jabber/auth.c:58 src/protocols/jabber/auth.c:342
-#: src/protocols/jabber/auth.c:354
-msgid "Invalid response from server"
-msgstr ""
-
-#: src/protocols/jabber/auth.c:77 src/protocols/jabber/auth.c:124
+#: 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
+msgid "Plaintext Authentication"
+msgstr ""
+
+#: 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:327
+#: src/protocols/jabber/auth.c:375
 msgid "Invalid challenge from server"
 msgstr ""
 
-#: src/protocols/jabber/auth.c:357
-msgid "Bad Protocol"
-msgstr ""
-
-#: src/protocols/jabber/auth.c:360
-msgid "Encryption Required"
-msgstr ""
-
-#: src/protocols/jabber/auth.c:363
-msgid "Invalid authzid"
-msgstr ""
-
-#: src/protocols/jabber/auth.c:366
-msgid "Invalid Mechanism"
-msgstr ""
-
-#: src/protocols/jabber/auth.c:368
-msgid "Invalid Realm"
-msgstr ""
-
-#: src/protocols/jabber/auth.c:371
-msgid "Mechanism Too Weak"
-msgstr ""
-
-#: src/protocols/jabber/auth.c:374 src/protocols/jabber/jabber.c:130
-#: src/protocols/jabber/jabber.c:806 src/protocols/jabber/jabber.c:856
-#: src/protocols/oscar/oscar.c:5472
-msgid "Not Authorized"
-msgstr ""
-
-#: src/protocols/jabber/auth.c:377
-msgid "Temporary Authentication Failure"
-msgstr ""
-
-#: src/protocols/jabber/auth.c:379
-msgid "Authentication Failure"
-msgstr ""
-
-#: src/protocols/jabber/buddy.c:253 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:254 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:255 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:256 src/protocols/jabber/buddy.c:631
-#: src/protocols/jabber/jabber.c:554 src/protocols/yahoo/yahoo.c:2675
+#: src/protocols/jabber/buddy.c:250 src/protocols/jabber/buddy.c:635
+#: src/protocols/jabber/jabber.c:601 src/protocols/yahoo/yahoo.c:2997
 msgid "Nickname"
 msgstr "ቅጽል ስም"
 
-#: src/protocols/jabber/buddy.c:258 src/protocols/jabber/buddy.c:659
+#: src/protocols/jabber/buddy.c:251 src/protocols/jabber/jabber.c:641
+msgid "URL"
+msgstr "URL"
+
+#: src/protocols/jabber/buddy.c:252 src/protocols/jabber/buddy.c:663
 msgid "Street Address"
 msgstr ""
 
-#: src/protocols/jabber/buddy.c:259 src/protocols/jabber/buddy.c:655
+#: src/protocols/jabber/buddy.c:253 src/protocols/jabber/buddy.c:659
 msgid "Extended Address"
 msgstr ""
 
-#: src/protocols/jabber/buddy.c:260 src/protocols/jabber/buddy.c:663
+#: src/protocols/jabber/buddy.c:254 src/protocols/jabber/buddy.c:667
 msgid "Locality"
 msgstr "አካባቢ"
 
-#: src/protocols/jabber/buddy.c:261 src/protocols/jabber/buddy.c:667
+#: src/protocols/jabber/buddy.c:255 src/protocols/jabber/buddy.c:671
 msgid "Region"
 msgstr "አካባቢ"
 
-#: src/protocols/jabber/buddy.c:262 src/protocols/jabber/buddy.c:671
-#: src/protocols/jabber/jabber.c:584
+#: src/protocols/jabber/buddy.c:256 src/protocols/jabber/buddy.c:675
+#: src/protocols/jabber/jabber.c:631
 msgid "Postal Code"
 msgstr ""
 
 #. Country
-#: src/protocols/jabber/buddy.c:263 src/protocols/jabber/buddy.c:676
-#: src/protocols/trepia/trepia.c:330 src/protocols/trepia/trepia.c:439
+#: src/protocols/jabber/buddy.c:257 src/protocols/jabber/buddy.c:680
+#: src/protocols/trepia/trepia.c:339 src/protocols/trepia/trepia.c:416
 msgid "Country"
 msgstr "አገር"
 
-#: src/protocols/jabber/buddy.c:264 src/protocols/jabber/buddy.c:687
-#: src/protocols/jabber/buddy.c:694
+#: 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:265 src/protocols/jabber/buddy.c:705
-#: src/protocols/jabber/buddy.c:713 src/protocols/yahoo/yahoo.c:2669
+#: src/protocols/jabber/buddy.c:259 src/protocols/jabber/buddy.c:709
+#: src/protocols/jabber/buddy.c:717 src/protocols/yahoo/yahoo.c:2993
 msgid "Email"
 msgstr "ኢሜይል"
 
-#: src/protocols/jabber/buddy.c:266 src/protocols/jabber/buddy.c:728
+#: src/protocols/jabber/buddy.c:260 src/protocols/jabber/buddy.c:732
 msgid "Organization Name"
 msgstr ""
 
-#: src/protocols/jabber/buddy.c:267 src/protocols/jabber/buddy.c:732
+#: src/protocols/jabber/buddy.c:261 src/protocols/jabber/buddy.c:736
 msgid "Organization Unit"
 msgstr ""
 
-#: src/protocols/jabber/buddy.c:268 src/protocols/jabber/buddy.c:738
+#: src/protocols/jabber/buddy.c:262 src/protocols/jabber/buddy.c:742
 msgid "Title"
 msgstr "አርእስት"
 
-#: src/protocols/jabber/buddy.c:269 src/protocols/jabber/buddy.c:741
+#: src/protocols/jabber/buddy.c:263 src/protocols/jabber/buddy.c:745
 msgid "Role"
 msgstr ""
 
-#: src/protocols/jabber/buddy.c:270 src/protocols/jabber/buddy.c:634
-#: src/protocols/oscar/oscar.c:3926
+#: src/protocols/jabber/buddy.c:264 src/protocols/jabber/buddy.c:638
+#: src/protocols/oscar/oscar.c:4247
 msgid "Birthday"
 msgstr "የልደት በዓል"
 
-#: src/protocols/jabber/buddy.c:514 src/protocols/jabber/buddy.c:515
+#: src/protocols/jabber/buddy.c:508 src/protocols/jabber/buddy.c:509
 msgid "Edit Jabber vCard"
 msgstr ""
 
-#: src/protocols/jabber/buddy.c:516
+#: 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:554
+#: src/protocols/jabber/buddy.c:552
 msgid "Jabber ID"
 msgstr ""
 
-#: src/protocols/jabber/buddy.c:564 src/protocols/jabber/buddy.c:571
-#: src/protocols/jabber/buddy.c:582 src/protocols/jabber/jabber.c:843
-#: src/protocols/jabber/jabber.c:856
+#: src/protocols/jabber/buddy.c:562 src/protocols/jabber/buddy.c:569
+#: src/protocols/jabber/buddy.c:580 src/protocols/jabber/jabber.c:930
+#: src/protocols/msn/msn.c:348 src/protocols/oscar/oscar.c:566
+#: src/protocols/oscar/oscar.c:572 src/protocols/oscar/oscar.c:574
+#: src/protocols/yahoo/yahoo.c:2407
 #, fuzzy
 msgid "Status"
 msgstr "ሁኔታ፦"
 
-#: src/protocols/jabber/buddy.c:580 src/protocols/jabber/jabber.c:1080
+#: src/protocols/jabber/buddy.c:578 src/protocols/jabber/jabber.c:1385
 #, fuzzy
 msgid "Resource"
 msgstr "ቀጥል (_R)"
@@ -4742,331 +5167,574 @@
 msgid "Middle Name"
 msgstr ""
 
-#: src/protocols/jabber/buddy.c:639 src/protocols/jabber/jabber.c:569
-#: src/protocols/oscar/oscar.c:3943 src/protocols/oscar/oscar.c:3959
+#: src/protocols/jabber/buddy.c:643 src/protocols/jabber/jabber.c:616
+#: src/protocols/oscar/oscar.c:4265 src/protocols/oscar/oscar.c:4273
 #, fuzzy
 msgid "Address"
 msgstr "አድራሻ፦"
 
-#: src/protocols/jabber/buddy.c:651
+#: src/protocols/jabber/buddy.c:655
 msgid "P.O. Box"
 msgstr ""
 
-#: src/protocols/jabber/buddy.c:757
+#: src/protocols/jabber/buddy.c:761
 #, fuzzy
 msgid "Photo"
 msgstr "ፖርት"
 
-#: src/protocols/jabber/buddy.c:757
+#: src/protocols/jabber/buddy.c:761
 #, fuzzy
 msgid "Logo"
 msgstr "ዝምብለህ ይግባ"
 
-#: src/protocols/jabber/buddy.c:771
+#: src/protocols/jabber/buddy.c:777
 #, fuzzy
 msgid "Jabber Profile"
 msgstr "የJabber ስህተት %s"
 
-#: src/protocols/jabber/buddy.c:866
+#: src/protocols/jabber/buddy.c:893
 msgid "Un-hide From"
 msgstr ""
 
-#: src/protocols/jabber/buddy.c:869
+#: src/protocols/jabber/buddy.c:896
 msgid "Temporarily Hide From"
 msgstr ""
 
-#: src/protocols/jabber/buddy.c:877
+#: src/protocols/jabber/buddy.c:905
 msgid "Cancel Presence Notification"
 msgstr ""
 
-#: src/protocols/jabber/buddy.c:885
-msgid "Re-request authorization"
-msgstr ""
-
-#: src/protocols/jabber/chat.c:36 src/protocols/yahoo/yahoochat.c:870
-msgid "Room:"
+#: src/protocols/jabber/buddy.c:913
+msgid "(Re-)Request authorization"
+msgstr ""
+
+#: src/protocols/jabber/buddy.c:919
+msgid "Unsubscribe"
+msgstr ""
+
+#: src/protocols/jabber/chat.c:42 src/protocols/yahoo/yahoochat.c:965
+#, fuzzy
+msgid "_Room:"
 msgstr "ቤት፦"
 
-#: src/protocols/jabber/chat.c:43
-msgid "Server:"
+#: src/protocols/jabber/chat.c:47
+#, fuzzy
+msgid "_Server:"
 msgstr "ሰርቨር፦"
 
-#: src/protocols/jabber/chat.c:49
-msgid "Handle:"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:80
+#: src/protocols/jabber/chat.c:53
+msgid "_Handle:"
+msgstr ""
+
+#: src/protocols/jabber/chat.c:164
+#, c-format
+msgid "%s is not a valid room name"
+msgstr ""
+
+#: src/protocols/jabber/chat.c:165
+msgid "Invalid Room Name"
+msgstr ""
+
+#: src/protocols/jabber/chat.c:170
+#, c-format
+msgid "%s is not a valid server name"
+msgstr ""
+
+#: src/protocols/jabber/chat.c:171 src/protocols/jabber/chat.c:172
+#, fuzzy
+msgid "Invalid Server Name"
+msgstr "የውስጥ ብልሽት"
+
+#: src/protocols/jabber/chat.c:176
+#, c-format
+msgid "%s is not a valid room handle"
+msgstr ""
+
+#: src/protocols/jabber/chat.c:177 src/protocols/jabber/chat.c:178
+msgid "Invalid Room Handle"
+msgstr ""
+
+#: src/protocols/jabber/chat.c:332
+#, fuzzy
+msgid "Configuration error"
+msgstr "ተገናኝቷል"
+
+#: src/protocols/jabber/chat.c:341 src/protocols/jabber/chat.c:486
+msgid "Unable to configure"
+msgstr ""
+
+#: src/protocols/jabber/chat.c:357
+#, fuzzy
+msgid "Room Configuration Error"
+msgstr "ተገናኝቷል"
+
+#: src/protocols/jabber/chat.c:358
+msgid "This room is not capable of being configured"
+msgstr ""
+
+#: src/protocols/jabber/chat.c:408 src/protocols/jabber/chat.c:477
+#, fuzzy
+msgid "Registration error"
+msgstr "የIRC ስህተት"
+
+#: src/protocols/jabber/chat.c:556
+msgid "Nick changing not supported in non-MUC chatrooms"
+msgstr ""
+
+#: src/protocols/jabber/chat.c:600 src/protocols/jabber/chat.c:611
+#, fuzzy
+msgid "Roomlist Error"
+msgstr "የIRC ስህተት"
+
+#: src/protocols/jabber/chat.c:601 src/protocols/jabber/chat.c:612
+msgid "Error retreiving roomlist"
+msgstr ""
+
+#: src/protocols/jabber/chat.c:652
+#, fuzzy
+msgid "Invalid Server"
+msgstr "ሰርቨር፦"
+
+#: src/protocols/jabber/chat.c:689
+#, fuzzy
+msgid "Enter a Conference Server"
+msgstr "የጌም ማውሪያ"
+
+#: src/protocols/jabber/chat.c:690
+msgid "Select a conference server to query"
+msgstr ""
+
+#: src/protocols/jabber/chat.c:693
+#, fuzzy
+msgid "Find Rooms"
+msgstr "የውሪ ቤቶች"
+
+#: src/protocols/jabber/jabber.c:74
 msgid "Error initializing session"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:105
+#: src/protocols/jabber/jabber.c:204 src/protocols/msn/httpmethod.c:255
+#: src/protocols/msn/msn.c:84 src/protocols/msn/msn.c:104
+#: src/protocols/msn/msn.c:174 src/protocols/msn/msn.c:274
+#: src/protocols/msn/msn.c:571 src/protocols/msn/msn.c:743
+#: src/protocols/msn/msn.c:772 src/protocols/msn/msn.c:804
+#: src/protocols/msn/msn.c:812 src/protocols/msn/msn.c:845
+#: src/protocols/msn/msn.c:853 src/protocols/msn/msn.c:867
+#: src/protocols/msn/msn.c:876 src/protocols/msn/msn.c:891
+#: src/protocols/msn/msn.c:901 src/protocols/msn/msn.c:923
+#: src/protocols/msn/msn.c:973 src/protocols/msn/msn.c:1011
+#: src/protocols/msn/msn.c:1113 src/protocols/msn/msn.c:1146
+#: src/protocols/msn/msn.c:1167 src/protocols/msn/msn.c:1178
+#: src/protocols/msn/msn.c:1189 src/protocols/msn/msn.c:1213
+#: src/protocols/msn/msn.c:1225 src/protocols/msn/msn.c:1306
+#: src/protocols/msn/notification.c:147 src/protocols/msn/notification.c:175
+#: src/protocols/msn/notification.c:1299 src/protocols/msn/notification.c:1319
+#: src/protocols/msn/session.c:209 src/protocols/trepia/trepia.c:248
+#: src/protocols/trepia/trepia.c:698 src/protocols/trepia/trepia.c:987
+#: src/protocols/trepia/trepia.c:1031 src/protocols/trepia/trepia.c:1130
+#: src/protocols/trepia/trepia.c:1186
+msgid "Write error"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:242 src/protocols/jabber/jabber.c:262
+#, fuzzy
+msgid "Read Error"
+msgstr "የIRC ስህተት"
+
+#: src/protocols/jabber/jabber.c:317
+#, fuzzy
+msgid "Connection Failed"
+msgstr "መድረክን አስወግድ"
+
+#: src/protocols/jabber/jabber.c:320
+msgid "SSL Handshake Failed"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:363 src/protocols/jabber/jabber.c:692
+msgid "Invalid Jabber ID"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:391 src/protocols/jabber/jabber.c:719
+msgid "SSL support unavailable"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:401 src/protocols/jabber/jabber.c:729
+#: src/protocols/trepia/trepia.c:1070
+msgid "Unable to create socket"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:426
+#, c-format
+msgid "Registration of %s@%s successful"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:428 src/protocols/jabber/jabber.c:429
+msgid "Registration Successful"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:435 src/protocols/jabber/jabber.c:1175
+#, fuzzy
+msgid "Unknown Error"
+msgstr "ያልታወቀ ስህተት"
+
+#: src/protocols/jabber/jabber.c:437 src/protocols/jabber/jabber.c:438
+msgid "Registration Failed"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:549 src/protocols/jabber/jabber.c:550
+msgid "Already Registered"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:585 src/protocols/jabber/jabber.c:1026
+#, fuzzy
+msgid "Password"
+msgstr "ሚስጢራዊ ቃል፦"
+
+#: src/protocols/jabber/jabber.c:596
+#, fuzzy
+msgid "E-Mail"
+msgstr "ኢሜይል"
+
+#. State
+#: src/protocols/jabber/jabber.c:626 src/protocols/oscar/oscar.c:4267
+#: src/protocols/oscar/oscar.c:4275 src/protocols/trepia/trepia.c:335
+#: src/protocols/trepia/trepia.c:413
+msgid "State"
+msgstr "ሁኔታ"
+
+#: src/protocols/jabber/jabber.c:636
+#, fuzzy
+msgid "Phone"
+msgstr "ምንም"
+
+#: src/protocols/jabber/jabber.c:646
+msgid "Date"
+msgstr "ቀን"
+
+#: src/protocols/jabber/jabber.c:654
+msgid "Please fill out the information below to register your new account."
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:657 src/protocols/jabber/jabber.c:658
+msgid "Register New Jabber Account"
+msgstr ""
+
+#. connect to the server
+#: src/protocols/jabber/jabber.c:775 src/protocols/msn/dispatch.c:212
+#: src/protocols/msn/msn.c:505 src/protocols/napster/napster.c:499
+#: src/protocols/novell/novell.c:1575 src/protocols/oscar/oscar.c:944
+#: src/protocols/trepia/trepia.c:1064 src/protocols/yahoo/yahoo.c:2177
+#: src/protocols/zephyr/zephyr.c:864
+msgid "Connecting"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:779
+msgid "Initializing Stream"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:785
+msgid "Authenticating"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:794
+msgid "Re-initializing Stream"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:874 src/protocols/jabber/jabber.c:1153
+#: src/protocols/jabber/jabber.c:1194 src/protocols/jabber/jabber.c:1227
+#: src/protocols/oscar/oscar.c:572 src/protocols/oscar/oscar.c:5816
+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
+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
+#, fuzzy
+msgid "Error"
+msgstr "የIRC ስህተት"
+
+#: src/protocols/jabber/jabber.c:951 src/protocols/jabber/jutil.c:35
+#: src/protocols/jabber/presence.c:66 src/protocols/jabber/presence.c:117
+msgid "Chatty"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:953 src/protocols/jabber/jutil.c:38
+#: src/protocols/jabber/presence.c:68 src/protocols/jabber/presence.c:122
+msgid "Extended Away"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:954 src/protocols/jabber/jutil.c:41
+#: src/protocols/jabber/presence.c:70 src/protocols/jabber/presence.c:124
+#: src/protocols/oscar/oscar.c:514 src/protocols/oscar/oscar.c:4828
+#: src/protocols/oscar/oscar.c:6427
+msgid "Do Not Disturb"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:971
+#, fuzzy
+msgid "Password Changed"
+msgstr "ሚስጢራዊ ቃል፦"
+
+#: src/protocols/jabber/jabber.c:972
+msgid "Your password has been changed."
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:976 src/protocols/jabber/jabber.c:977
+#, fuzzy
+msgid "Error changing password"
+msgstr " የመጀመሪያው ሚስጢራዊ ቃል"
+
+#: src/protocols/jabber/jabber.c:1031
+#, fuzzy
+msgid "Password (again)"
+msgstr "ሚስጢራዊ ቃል፦"
+
+#: src/protocols/jabber/jabber.c:1036 src/protocols/jabber/jabber.c:1037
+#, fuzzy
+msgid "Change Jabber Password"
+msgstr "ሚስጢራዊ ቃልን ለውጥ"
+
+#: src/protocols/jabber/jabber.c:1037
+msgid "Please enter your new password"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1048 src/protocols/toc/toc.c:1532
+msgid "Set User Info"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1133
+msgid "Bad Request"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1135
+#, fuzzy
+msgid "Conflict"
+msgstr "አገናኝ"
+
+#: src/protocols/jabber/jabber.c:1137
+msgid "Feature Not Implemented"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1139
+#, fuzzy
+msgid "Forbidden"
+msgstr "የተደበቀ"
+
+#: src/protocols/jabber/jabber.c:1141
+#, fuzzy
+msgid "Gone"
+msgstr "ምንም"
+
+#: src/protocols/jabber/jabber.c:1143 src/protocols/jabber/jabber.c:1217
+#, fuzzy
+msgid "Internal Server Error"
+msgstr "የውስጥ ብልሽት"
+
+#: src/protocols/jabber/jabber.c:1145
+msgid "Item Not Found"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1147
+msgid "Malformed Jabber ID"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1149
+msgid "Not Acceptable"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1151
+msgid "Not Allowed"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1155
+msgid "Payment Required"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1157
+msgid "Recipient Unavailable"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1161
+msgid "Registration Required"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1163
+msgid "Remote Server Not Found"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1165
+msgid "Remote Server Timeout"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1167
+msgid "Server Overloaded"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1169
+msgid "Service Unavailable"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1171
+msgid "Subscription Required"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1173
+msgid "Unexpected Request"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1180
+msgid "Authorization Aborted"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1182
+msgid "Incorrect encoding in authorization"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1185
+msgid "Invalid authzid"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1188
+msgid "Invalid Authorization Mechanism"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1191
+msgid "Authorization mechanism too weak"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1196
+msgid "Temporary Authentication Failure"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1198
+msgid "Authentication Failure"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1202
 msgid "Bad Format"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:107
+#: src/protocols/jabber/jabber.c:1204
 msgid "Bad Namespace Prefix"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:110
+#: src/protocols/jabber/jabber.c:1207
 #, fuzzy
 msgid "Resource Conflict"
 msgstr "ቀጥል (_R)"
 
-#: src/protocols/jabber/jabber.c:112
+#: src/protocols/jabber/jabber.c:1209
 msgid "Connection Timeout"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:114
+#: src/protocols/jabber/jabber.c:1211
 msgid "Host Gone"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:116
+#: src/protocols/jabber/jabber.c:1213
 #, fuzzy
 msgid "Host Unknown"
 msgstr "ያልታወቀ"
 
-#: src/protocols/jabber/jabber.c:118
+#: src/protocols/jabber/jabber.c:1215
 #, fuzzy
 msgid "Improper Addressing"
 msgstr "የቤት አድራሻ፦"
 
-#: src/protocols/jabber/jabber.c:120
-#, fuzzy
-msgid "Internal Server Error"
-msgstr "የውስጥ ብልሽት"
-
-#: src/protocols/jabber/jabber.c:122
+#: src/protocols/jabber/jabber.c:1219
 msgid "Invalid ID"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:124
+#: src/protocols/jabber/jabber.c:1221
 msgid "Invalid Namespace"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:126
+#: src/protocols/jabber/jabber.c:1223
 msgid "Invalid XML"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:128
+#: src/protocols/jabber/jabber.c:1225
 msgid "Non-matching Hosts"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:132
+#: src/protocols/jabber/jabber.c:1229
 msgid "Policy Violation"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:134
+#: src/protocols/jabber/jabber.c:1231
 #, fuzzy
 msgid "Remote Connection Failed"
 msgstr "መድረክን አስወግድ"
 
-#: src/protocols/jabber/jabber.c:136
+#: src/protocols/jabber/jabber.c:1233
 #, fuzzy
 msgid "Resource Constraint"
 msgstr "መድረክን አስወግድ"
 
-#: src/protocols/jabber/jabber.c:138
+#: src/protocols/jabber/jabber.c:1235
 msgid "Restricted XML"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:140
+#: src/protocols/jabber/jabber.c:1237
 msgid "See Other Host"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:142
+#: src/protocols/jabber/jabber.c:1239
 msgid "System Shutdown"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:144
+#: src/protocols/jabber/jabber.c:1241
 msgid "Undefined Condition"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:146
-msgid "Unsupported Condition"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:148
+#: src/protocols/jabber/jabber.c:1243
+msgid "Unsupported Encoding"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1245
 msgid "Unsupported Stanza Type"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:150
+#: src/protocols/jabber/jabber.c:1247
 msgid "Unsupported Version"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:152
+#: src/protocols/jabber/jabber.c:1249
 msgid "XML Not Well Formed"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:154
+#: src/protocols/jabber/jabber.c:1251
 #, fuzzy
 msgid "Stream Error"
 msgstr "የውስጥ ብልሽት"
 
-#: src/protocols/jabber/jabber.c:232 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:516
-#: src/protocols/msn/msn.c:627 src/protocols/msn/msn.c:643
-#: src/protocols/msn/msn.c:691 src/protocols/msn/msn.c:714
-#: src/protocols/msn/msn.c:746 src/protocols/msn/msn.c:754
-#: src/protocols/msn/msn.c:787 src/protocols/msn/msn.c:795
-#: src/protocols/msn/msn.c:809 src/protocols/msn/msn.c:818
-#: src/protocols/msn/msn.c:832 src/protocols/msn/msn.c:856
-#: src/protocols/msn/msn.c:906 src/protocols/msn/msn.c:944
-#: src/protocols/msn/msn.c:1042 src/protocols/msn/msn.c:1074
-#: src/protocols/msn/msn.c:1095 src/protocols/msn/msn.c:1106
-#: src/protocols/msn/msn.c:1117 src/protocols/msn/msn.c:1141
-#: src/protocols/msn/msn.c:1153 src/protocols/msn/msn.c:1218
-#: src/protocols/msn/notification.c:179 src/protocols/msn/notification.c:207
-#: src/protocols/msn/notification.c:1655 src/protocols/msn/notification.c:1675
-#: src/protocols/trepia/trepia.c:239 src/protocols/trepia/trepia.c:740
-#: src/protocols/trepia/trepia.c:1023 src/protocols/trepia/trepia.c:1067
-#: src/protocols/trepia/trepia.c:1166 src/protocols/trepia/trepia.c:1222
-msgid "Write error"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:269 src/protocols/jabber/jabber.c:289
-#, fuzzy
-msgid "Read Error"
-msgstr "የIRC ስህተት"
-
-#: src/protocols/jabber/jabber.c:394 src/protocols/jabber/jabber.c:671
-#: src/protocols/trepia/trepia.c:1106
-msgid "Unable to create socket"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:419
-#, c-format
-msgid "Registration of %s@%s successful"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:421 src/protocols/jabber/jabber.c:422
-msgid "Registration Successful"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:431
-#, fuzzy
-msgid "Unknown Error"
-msgstr "ያልታወቀ ስህተት"
-
-#: src/protocols/jabber/jabber.c:434
-#, c-format
-msgid "Registration of %s@%s failed: %s"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:436 src/protocols/jabber/jabber.c:437
-msgid "Registration Failed"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:524 src/protocols/jabber/jabber.c:525
-msgid "Already Registered"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:538 src/protocols/jabber/jabber.c:951
-#, fuzzy
-msgid "Password"
-msgstr "ሚስጢራዊ ቃል፦"
-
-#: src/protocols/jabber/jabber.c:549
-#, fuzzy
-msgid "E-Mail"
-msgstr "ኢሜይል"
-
-#. First Name
-#: src/protocols/jabber/jabber.c:559 src/protocols/oscar/oscar.c:3897
-#: src/protocols/trepia/trepia.c:258
-msgid "First Name"
-msgstr "ስም፦"
-
-#. State
-#: src/protocols/jabber/jabber.c:579 src/protocols/oscar/oscar.c:3949
-#: src/protocols/oscar/oscar.c:3965 src/protocols/trepia/trepia.c:326
-#: src/protocols/trepia/trepia.c:430
-msgid "State"
-msgstr "ሁኔታ"
-
-#: src/protocols/jabber/jabber.c:589
-#, fuzzy
-msgid "Phone"
-msgstr "ምንም"
-
-#: src/protocols/jabber/jabber.c:607
-msgid "Please fill out the information below to register your new account."
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:610 src/protocols/jabber/jabber.c:611
-msgid "Register New Jabber Account"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:710 src/protocols/msn/dispatch.c:219
-#: src/protocols/msn/msn.c:461 src/protocols/napster/napster.c:487
-#: src/protocols/trepia/trepia.c:1100 src/protocols/yahoo/yahoo.c:1923
-msgid "Connecting"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:714
-msgid "Initializing Stream"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:720
-msgid "Authenticating"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:728
-msgid "Re-initializing Stream"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:851 src/protocols/jabber/jabber.c:902
-#: src/protocols/jabber/presence.c:257
-#, fuzzy
-msgid "Error"
-msgstr "የIRC ስህተት"
-
-#: src/protocols/jabber/jabber.c:867 src/protocols/jabber/jutil.c:100
-#: src/protocols/jabber/presence.c:79
-msgid "Chatty"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:869 src/protocols/jabber/jutil.c:103
-#: src/protocols/jabber/presence.c:84
-msgid "Extended Away"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:870 src/protocols/jabber/jutil.c:106
-#: src/protocols/jabber/presence.c:86 src/protocols/oscar/oscar.c:2827
-#: src/protocols/oscar/oscar.c:4532 src/protocols/oscar/oscar.c:6065
-msgid "Do Not Disturb"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:884
-#, fuzzy
-msgid "Password Changed"
-msgstr "ሚስጢራዊ ቃል፦"
-
-#: src/protocols/jabber/jabber.c:885
-msgid "Your password has been changed."
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:895
-#, c-format
-msgid "Error changing password: %s"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:899
-msgid "Unknown error occurred changing password"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:956
-#, fuzzy
-msgid "Password (again)"
-msgstr "ሚስጢራዊ ቃል፦"
-
-#: src/protocols/jabber/jabber.c:961 src/protocols/jabber/jabber.c:962
-#, fuzzy
-msgid "Change Jabber Password"
-msgstr "ሚስጢራዊ ቃልን ለውጥ"
-
-#: src/protocols/jabber/jabber.c:962
-msgid "Please enter your new password"
+#: src/protocols/jabber/jabber.c:1276
+msgid "Hide Operating System"
 msgstr ""
 
 #. *< api_version
@@ -5079,75 +5747,123 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/jabber/jabber.c:1057 src/protocols/jabber/jabber.c:1059
+#. *  description
+#: src/protocols/jabber/jabber.c:1361 src/protocols/jabber/jabber.c:1363
 msgid "Jabber Protocol Plugin"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1083
-msgid "Force Old SSL"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:1091
+#: src/protocols/jabber/jabber.c:1388
+msgid "Use TLS if available"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1393
+msgid "Force old SSL"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1398
+msgid "Allow plaintext auth over unencrypted streams"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1407
 #, fuzzy
 msgid "Connect server"
 msgstr "ተገናኝቷል"
 
-#: src/protocols/jabber/message.c:95
+#: src/protocols/jabber/message.c:111
 #, c-format
 msgid "Message from %s"
 msgstr ""
 
-#: src/protocols/jabber/message.c:178
+#: src/protocols/jabber/message.c:173
+#, c-format
+msgid "%s has set the topic to: %s"
+msgstr ""
+
+#: src/protocols/jabber/message.c:175
+#, c-format
+msgid "The topic is: %s"
+msgstr ""
+
+#: src/protocols/jabber/message.c:225
 #, c-format
 msgid "Message delivery to %s failed: %s"
 msgstr ""
 
-#: src/protocols/jabber/message.c:181
+#: src/protocols/jabber/message.c:228
 #, fuzzy
 msgid "Jabber Message Error"
 msgstr "የJabber ስህተት %s"
 
-#: src/protocols/jabber/message.c:244
+#: src/protocols/jabber/message.c:291
 #, c-format
 msgid " (Code %s)"
 msgstr ""
 
-#: src/protocols/jabber/parser.c:129
+#: src/protocols/jabber/parser.c:131
 msgid "XML Parse error"
 msgstr ""
 
-#: src/protocols/jabber/presence.c:167
-#, c-format
-msgid "%s (Code %s)"
-msgstr ""
-
-#: src/protocols/jabber/presence.c:172
+#: src/protocols/jabber/presence.c:221
 msgid "Unknown Error in presence"
 msgstr ""
 
-#: src/protocols/jabber/presence.c:176
+#: src/protocols/jabber/presence.c:224
 #, c-format
 msgid "The user %s wants to add you to their buddy list."
 msgstr ""
 
-#: src/protocols/jabber/presence.c:253
-msgid "Unable to join chat"
-msgstr ""
-
-#: src/protocols/msn/dispatch.c:42 src/protocols/msn/notification.c:278
-#: src/protocols/msn/notification.c:509
+#: src/protocols/jabber/presence.c:277 src/protocols/jabber/presence.c:278
+#, fuzzy
+msgid "Create New Room"
+msgstr "የውሪ ቤቶች"
+
+#: src/protocols/jabber/presence.c:279
+msgid ""
+"You are creating a new room.  Would you like to configure it, or accept the "
+"default settings?"
+msgstr ""
+
+#: src/protocols/jabber/presence.c:281
+msgid "Configure Room"
+msgstr ""
+
+#: src/protocols/jabber/presence.c:283
+msgid "Accept Defaults"
+msgstr ""
+
+#: src/protocols/jabber/presence.c:303
+#, c-format
+msgid "Error in chat %s"
+msgstr ""
+
+#: src/protocols/jabber/presence.c:306
+#, c-format
+msgid "Error joining chat %s"
+msgstr ""
+
+#: 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
+#, fuzzy
+msgid "File Send Failed"
+msgstr "ፋይልን ላክ"
+
+#: src/protocols/msn/dispatch.c:42 src/protocols/msn/notification.c:240
 msgid "Unable to request USR\n"
 msgstr ""
 
-#: src/protocols/msn/dispatch.c:59 src/protocols/msn/notification.c:295
+#: src/protocols/msn/dispatch.c:59 src/protocols/msn/notification.c:257
 msgid "Unable to login using MD5"
 msgstr ""
 
-#: src/protocols/msn/dispatch.c:68 src/protocols/msn/notification.c:304
+#: src/protocols/msn/dispatch.c:68 src/protocols/msn/notification.c:266
 msgid "Unable to send USR"
 msgstr ""
 
-#: src/protocols/msn/dispatch.c:73 src/protocols/msn/notification.c:309
+#: src/protocols/msn/dispatch.c:73 src/protocols/msn/notification.c:271
 msgid "Requesting to send password"
 msgstr ""
 
@@ -5155,15 +5871,15 @@
 msgid "Protocol version not supported"
 msgstr ""
 
-#: src/protocols/msn/dispatch.c:117 src/protocols/msn/notification.c:771
+#: src/protocols/msn/dispatch.c:117 src/protocols/msn/notification.c:410
 msgid "Unable to request CVR\n"
 msgstr ""
 
-#: src/protocols/msn/dispatch.c:126 src/protocols/msn/notification.c:780
+#: src/protocols/msn/dispatch.c:126 src/protocols/msn/notification.c:419
 msgid "Unable to request INF\n"
 msgstr ""
 
-#: src/protocols/msn/dispatch.c:147 src/protocols/msn/notification.c:1889
+#: src/protocols/msn/dispatch.c:147 src/protocols/msn/notification.c:1564
 msgid "Got invalid XFR"
 msgstr ""
 
@@ -5171,452 +5887,479 @@
 msgid "Unable to transfer"
 msgstr ""
 
-#: src/protocols/msn/dispatch.c:199
+#: src/protocols/msn/dispatch.c:192
 msgid "Unable to parse message."
 msgstr ""
 
-#: src/protocols/msn/dispatch.c:215 src/protocols/msn/msn.c:470
-#: src/protocols/msn/notification.c:2116 src/protocols/napster/napster.c:463
-#: src/protocols/napster/napster.c:494 src/protocols/yahoo/yahoo.c:1715
-#: src/protocols/yahoo/yahoo.c:1746 src/protocols/yahoo/yahoo.c:1811
-msgid "Unable to connect"
-msgstr ""
-
-#: src/protocols/msn/dispatch.c:239 src/protocols/msn/notification.c:876
-#: src/protocols/msn/notification.c:2138
+#: src/protocols/msn/dispatch.c:232 src/protocols/msn/notification.c:528
+#: src/protocols/msn/notification.c:1826
 msgid "Unable to write to server"
 msgstr ""
 
-#: src/protocols/msn/dispatch.c:243 src/protocols/msn/notification.c:2145
+#: src/protocols/msn/dispatch.c:236 src/protocols/msn/notification.c:1833
 msgid "Syncing with server"
 msgstr ""
 
-#: src/protocols/msn/dispatch.c:257 src/protocols/msn/notification.c:2159
+#: src/protocols/msn/dispatch.c:250
 msgid "Error reading from server"
 msgstr ""
 
 #: src/protocols/msn/error.c:33
+msgid "Unable to parse message"
+msgstr ""
+
+#: src/protocols/msn/error.c:36
 msgid "Syntax Error (probably a Gaim bug)"
 msgstr ""
 
-#: src/protocols/msn/error.c:37
-msgid "Invalid Parameter (probably a Gaim bug)"
-msgstr ""
-
 #: src/protocols/msn/error.c:40
-msgid "Invalid User"
-msgstr ""
-
-#: src/protocols/msn/error.c:44
-msgid "Fully Qualified Domain Name missing"
+#, fuzzy
+msgid "Invalid email address"
+msgstr "ኢሜያል አድራሻ"
+
+#: src/protocols/msn/error.c:43
+msgid "User does not exist"
 msgstr ""
 
 #: src/protocols/msn/error.c:47
-msgid "Already Logged In"
+msgid "Fully Qualified Domain Name missing"
 msgstr ""
 
 #: src/protocols/msn/error.c:50
-msgid "Invalid Username"
+msgid "Already Logged In"
 msgstr ""
 
 #: src/protocols/msn/error.c:53
-msgid "Invalid Friendly Name"
+msgid "Invalid Username"
 msgstr ""
 
 #: src/protocols/msn/error.c:56
-msgid "List Full"
+msgid "Invalid Friendly Name"
 msgstr ""
 
 #: src/protocols/msn/error.c:59
-msgid "Already there"
+msgid "List Full"
 msgstr ""
 
 #: src/protocols/msn/error.c:62
-msgid "Not on list"
+msgid "Already there"
 msgstr ""
 
 #: src/protocols/msn/error.c:65
+msgid "Not on list"
+msgstr ""
+
+#: src/protocols/msn/error.c:68 src/protocols/zephyr/zephyr.c:527
 msgid "User is offline"
 msgstr ""
 
-#: src/protocols/msn/error.c:68
-msgid "Already in the mode"
-msgstr ""
-
 #: src/protocols/msn/error.c:71
-msgid "Already in opposite list"
+msgid "Already in the mode"
 msgstr ""
 
 #: src/protocols/msn/error.c:74
+msgid "Already in opposite list"
+msgstr ""
+
+#: src/protocols/msn/error.c:77
 #, fuzzy
 msgid "Too many groups"
 msgstr "በመድረክ"
 
-#: src/protocols/msn/error.c:77
+#: src/protocols/msn/error.c:80
 msgid "Invalid group"
 msgstr ""
 
-#: src/protocols/msn/error.c:80
-msgid "User not in group"
-msgstr ""
-
 #: src/protocols/msn/error.c:83
-msgid "Group name too long"
+msgid "User not in group"
 msgstr ""
 
 #: src/protocols/msn/error.c:86
+msgid "Group name too long"
+msgstr ""
+
+#: src/protocols/msn/error.c:89
 msgid "Cannot remove group zero"
 msgstr ""
 
-#: src/protocols/msn/error.c:90
+#: src/protocols/msn/error.c:93
 msgid "Tried to add a contact to a group that doesn't exist"
 msgstr ""
 
-#: src/protocols/msn/error.c:94
-msgid "Switchboard failed"
-msgstr ""
-
 #: src/protocols/msn/error.c:97
+msgid "Switchboard failed"
+msgstr ""
+
+#: src/protocols/msn/error.c:100
 msgid "Notify Transfer failed"
 msgstr ""
 
-#: src/protocols/msn/error.c:101
-msgid "Required fields missing"
-msgstr ""
-
 #: src/protocols/msn/error.c:104
+msgid "Required fields missing"
+msgstr ""
+
+#: src/protocols/msn/error.c:107
 msgid "Too many hits to a FND"
 msgstr ""
 
-#: src/protocols/msn/error.c:107 src/protocols/oscar/oscar.c:179
+#: src/protocols/msn/error.c:110 src/protocols/oscar/oscar.c:186
 msgid "Not logged in"
 msgstr ""
 
-#: src/protocols/msn/error.c:111
-msgid "Internal server error"
-msgstr ""
-
 #: src/protocols/msn/error.c:114
-msgid "Database server error"
+msgid "Service Temporarily Unavailable"
 msgstr ""
 
 #: src/protocols/msn/error.c:117
-msgid "File operation error"
+msgid "Database server error"
 msgstr ""
 
 #: src/protocols/msn/error.c:120
-msgid "Memory allocation error"
-msgstr ""
+#, fuzzy
+msgid "Command disabled"
+msgstr "ትእዛዝ"
 
 #: src/protocols/msn/error.c:123
+msgid "File operation error"
+msgstr ""
+
+#: src/protocols/msn/error.c:126
+msgid "Memory allocation error"
+msgstr ""
+
+#: src/protocols/msn/error.c:129
 msgid "Wrong CHL value sent to server"
 msgstr ""
 
-#: src/protocols/msn/error.c:127
-msgid "Server busy"
-msgstr ""
-
-#: src/protocols/msn/error.c:130 src/protocols/msn/error.c:143
-#: src/protocols/msn/error.c:198
-msgid "Server unavailable"
-msgstr ""
-
 #: src/protocols/msn/error.c:133
+msgid "Server busy"
+msgstr ""
+
+#: src/protocols/msn/error.c:136 src/protocols/msn/error.c:149
+#: src/protocols/msn/error.c:204
+msgid "Server unavailable"
+msgstr ""
+
+#: src/protocols/msn/error.c:139
 msgid "Peer Notification server down"
 msgstr ""
 
-#: src/protocols/msn/error.c:136
+#: src/protocols/msn/error.c:142
 msgid "Database connect error"
 msgstr ""
 
-#: src/protocols/msn/error.c:140
+#: src/protocols/msn/error.c:146
 msgid "Server is going down (abandon ship)"
 msgstr ""
 
-#: src/protocols/msn/error.c:147
+#: src/protocols/msn/error.c:153
 msgid "Error creating connection"
 msgstr ""
 
-#: src/protocols/msn/error.c:151
-msgid "CVR parameters are either unknown or not allowed"
-msgstr ""
-
-#: src/protocols/msn/error.c:154 src/protocols/msn/notification.c:623
-#: src/protocols/msn/notification.c:1269 src/protocols/msn/notification.c:1437
-msgid "Unable to write"
-msgstr ""
-
 #: src/protocols/msn/error.c:157
-msgid "Session overload"
-msgstr ""
-
-#: src/protocols/msn/error.c:160
-msgid "User is too active"
+msgid "CVR parameters are either unknown or not allowed"
+msgstr ""
+
+#: src/protocols/msn/error.c:160 src/protocols/msn/notification.c:304
+msgid "Unable to write"
 msgstr ""
 
 #: src/protocols/msn/error.c:163
-msgid "Too many sessions"
-msgstr ""
-
-#: src/protocols/msn/error.c:166 src/protocols/msn/error.c:172
-msgid "Not expected"
+msgid "Session overload"
+msgstr ""
+
+#: src/protocols/msn/error.c:166
+msgid "User is too active"
 msgstr ""
 
 #: src/protocols/msn/error.c:169
+msgid "Too many sessions"
+msgstr ""
+
+#: src/protocols/msn/error.c:172
+msgid "Passport not verified"
+msgstr ""
+
+#: src/protocols/msn/error.c:175
 msgid "Bad friend file"
 msgstr ""
 
-#: src/protocols/msn/error.c:177
+#: src/protocols/msn/error.c:178
+msgid "Not expected"
+msgstr ""
+
+#: src/protocols/msn/error.c:183
 msgid "Friendly name changes too rapidly"
 msgstr ""
 
-#: src/protocols/msn/error.c:186
+#: src/protocols/msn/error.c:192
 msgid "Server too busy"
 msgstr ""
 
-#: src/protocols/msn/error.c:190 src/protocols/oscar/oscar.c:1074
+#: src/protocols/msn/error.c:196 src/protocols/oscar/oscar.c:1357
 #: src/protocols/toc/toc.c:659
 msgid "Authentication failed"
 msgstr ""
 
-#: src/protocols/msn/error.c:193
+#: src/protocols/msn/error.c:199
 msgid "Not allowed when offline"
 msgstr ""
 
-#: src/protocols/msn/error.c:201
+#: src/protocols/msn/error.c:207
 msgid "Not accepting new users"
 msgstr ""
 
-#: src/protocols/msn/error.c:205
+#: src/protocols/msn/error.c:211
 msgid "Kids Passport without parental consent"
 msgstr ""
 
-#: src/protocols/msn/error.c:209
+#: src/protocols/msn/error.c:215
 msgid "Passport account not yet verified"
 msgstr ""
 
-#: src/protocols/msn/error.c:213
+#: src/protocols/msn/error.c:218
+msgid "Bad ticket"
+msgstr ""
+
+#: src/protocols/msn/error.c:222
 #, fuzzy, c-format
 msgid "Unknown Error Code %d"
 msgstr "ያልታወቀ የስህተት ኮድ"
 
-#: src/protocols/msn/msn.c:70
+#: src/protocols/msn/error.c:234
+#, fuzzy, c-format
+msgid "MSN Error: %s\n"
+msgstr "ስህተት %s፦ %s"
+
+#: src/protocols/msn/msn.c:72
 msgid "Your new MSN friendly name is too long."
 msgstr ""
 
-#: src/protocols/msn/msn.c:177
+#: src/protocols/msn/msn.c:191
 msgid "Set your friendly name."
 msgstr ""
 
-#: src/protocols/msn/msn.c:178
+#: src/protocols/msn/msn.c:192
 msgid "This is the name that other MSN buddies will see you as."
 msgstr ""
 
-#: src/protocols/msn/msn.c:190
+#: src/protocols/msn/msn.c:204
 msgid "Set your home phone number."
 msgstr ""
 
-#: src/protocols/msn/msn.c:201
+#: src/protocols/msn/msn.c:215
 msgid "Set your work phone number."
 msgstr ""
 
-#: src/protocols/msn/msn.c:212
+#: src/protocols/msn/msn.c:226
 msgid "Set your mobile phone number."
 msgstr ""
 
-#: src/protocols/msn/msn.c:221
+#: src/protocols/msn/msn.c:235
 msgid "Allow MSN Mobile pages?"
 msgstr ""
 
-#: src/protocols/msn/msn.c:222
+#: src/protocols/msn/msn.c:236
 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?"
 msgstr ""
 
-#: src/protocols/msn/msn.c:226
+#: src/protocols/msn/msn.c:240
 msgid "Allow"
 msgstr ""
 
-#: src/protocols/msn/msn.c:227
+#: src/protocols/msn/msn.c:241
 msgid "Disallow"
 msgstr ""
 
-#: src/protocols/msn/msn.c:244
+#: src/protocols/msn/msn.c:258
 msgid "Send a mobile message."
 msgstr ""
 
-#: src/protocols/msn/msn.c:246
+#: src/protocols/msn/msn.c:260
 #, fuzzy
 msgid "Page"
 msgstr "ድረ-ገጽ፦"
 
-#: src/protocols/msn/msn.c:332 src/protocols/yahoo/yahoo.c:2142
-#, c-format
-msgid "<b>Status:</b> %s"
-msgstr "<b>ሁኔታ፦</b> %s"
-
-#: src/protocols/msn/msn.c:345 src/protocols/msn/msn.c:603
+#: src/protocols/msn/msn.c:361 src/protocols/msn/msn.c:662
 #: src/protocols/msn/state.c:32
 msgid "Away From Computer"
 msgstr ""
 
-#: src/protocols/msn/msn.c:346 src/protocols/msn/msn.c:605
-#: src/protocols/msn/state.c:31 src/protocols/yahoo/yahoo.c:2008
-#: src/protocols/yahoo/yahoo.c:2306 src/protocols/yahoo/yahoo.c:2406
+#: src/protocols/msn/msn.c:362 src/protocols/msn/msn.c:664
+#: src/protocols/msn/state.c:31 src/protocols/yahoo/yahoo.c:2275
+#: src/protocols/yahoo/yahoo.c:2601 src/protocols/yahoo/yahoo.c:2715
 msgid "Be Right Back"
 msgstr ""
 
-#: src/protocols/msn/msn.c:347 src/protocols/msn/msn.c:607
-#: src/protocols/msn/state.c:29 src/protocols/yahoo/yahoo.c:2010
-#: src/protocols/yahoo/yahoo.c:2308 src/protocols/yahoo/yahoo.c:2407
+#: src/protocols/msn/msn.c:363 src/protocols/msn/msn.c:666
+#: src/protocols/msn/state.c:29 src/protocols/novell/novell.c:2147
+#: src/protocols/novell/novell.c:2260 src/protocols/novell/novell.c:2314
+#: src/protocols/yahoo/yahoo.c:2277 src/protocols/yahoo/yahoo.c:2603
+#: src/protocols/yahoo/yahoo.c:2716
 msgid "Busy"
 msgstr ""
 
-#: src/protocols/msn/msn.c:348 src/protocols/msn/msn.c:609
-#: src/protocols/msn/state.c:33 src/protocols/yahoo/yahoo.c:2018
-#: src/protocols/yahoo/yahoo.c:2316 src/protocols/yahoo/yahoo.c:2411
+#: src/protocols/msn/msn.c:364 src/protocols/msn/msn.c:668
+#: src/protocols/msn/state.c:33 src/protocols/yahoo/yahoo.c:2285
+#: src/protocols/yahoo/yahoo.c:2611 src/protocols/yahoo/yahoo.c:2720
 msgid "On The Phone"
 msgstr ""
 
-#: src/protocols/msn/msn.c:349 src/protocols/msn/msn.c:611
-#: src/protocols/msn/state.c:34 src/protocols/yahoo/yahoo.c:2022
-#: src/protocols/yahoo/yahoo.c:2320 src/protocols/yahoo/yahoo.c:2413
+#: src/protocols/msn/msn.c:365 src/protocols/msn/msn.c:670
+#: src/protocols/msn/state.c:34 src/protocols/yahoo/yahoo.c:2289
+#: src/protocols/yahoo/yahoo.c:2615 src/protocols/yahoo/yahoo.c:2722
 msgid "Out To Lunch"
 msgstr ""
 
-#: src/protocols/msn/msn.c:350 src/protocols/msn/msn.c:613
-#: src/protocols/zephyr/zephyr.c:883 src/protocols/zephyr/zephyr.c:898
+#: src/protocols/msn/msn.c:366 src/protocols/msn/msn.c:672
+#: src/protocols/zephyr/zephyr.c:1179 src/protocols/zephyr/zephyr.c:1194
 msgid "Hidden"
 msgstr "የተደበቀ"
 
-#: src/protocols/msn/msn.c:362
+#: src/protocols/msn/msn.c:378
 msgid "Set Friendly Name"
 msgstr ""
 
-#: src/protocols/msn/msn.c:370
+#: src/protocols/msn/msn.c:386
 msgid "Set Home Phone Number"
 msgstr ""
 
-#: src/protocols/msn/msn.c:376
+#: src/protocols/msn/msn.c:392
 msgid "Set Work Phone Number"
 msgstr ""
 
-#: src/protocols/msn/msn.c:382
+#: src/protocols/msn/msn.c:398
 #, fuzzy
 msgid "Set Mobile Phone Number"
 msgstr "የሞቢል ስልክ፦"
 
-#: src/protocols/msn/msn.c:391
+#: src/protocols/msn/msn.c:407
 msgid "Enable/Disable Mobile Devices"
 msgstr ""
 
-#: src/protocols/msn/msn.c:398
+#: src/protocols/msn/msn.c:414
 msgid "Allow/Disallow Mobile Pages"
 msgstr ""
 
-#: src/protocols/msn/msn.c:424
+#: src/protocols/msn/msn.c:440
 #, fuzzy
 msgid "Send to Mobile"
 msgstr "ፋይልን ላክ"
 
-#: src/protocols/msn/msn.c:433
+#: src/protocols/msn/msn.c:449
 #, fuzzy
 msgid "Initiate Chat"
 msgstr "የጌም ማውሪያ"
 
-#: src/protocols/msn/msn.c:727
-#, 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."
-msgstr ""
-
-#: src/protocols/msn/msn.c:731 src/protocols/msn/msn.c:771
-msgid "Invalid MSN screenname"
-msgstr ""
-
-#: src/protocols/msn/msn.c:767
-#, 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."
-msgstr ""
-
-#: src/protocols/msn/msn.c:1242 src/protocols/yahoo/yahoo.c:2582
+#: src/protocols/msn/msn.c:473
+msgid ""
+"SSL support is needed for MSN. Please install a supported SSL library. See "
+"http://gaim.sf.net/faq-ssl.php for more information."
+msgstr ""
+
+#: src/protocols/msn/msn.c:785
+#, 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 ""
+
+#: src/protocols/msn/msn.c:789 src/protocols/msn/msn.c:829
+#, fuzzy
+msgid "Invalid MSN screen name"
+msgstr "እስክሪን ስም"
+
+#: src/protocols/msn/msn.c:825
+#, 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 ""
+
+#: src/protocols/msn/msn.c:1332 src/protocols/yahoo/yahoo.c:2899
 msgid "<html><body><b>Error retrieving profile</b></body></html>"
 msgstr ""
 
 #. Age
-#: src/protocols/msn/msn.c:1310 src/protocols/oscar/oscar.c:3931
-#: src/protocols/trepia/trepia.c:276 src/protocols/trepia/trepia.c:404
-#: src/protocols/yahoo/yahoo.c:2693
+#: src/protocols/msn/msn.c:1402 src/protocols/oscar/oscar.c:4252
+#: src/protocols/trepia/trepia.c:285 src/protocols/trepia/trepia.c:404
+#: src/protocols/yahoo/yahoo.c:3009
 #, fuzzy
 msgid "Age"
 msgstr "ዕድሜ፦"
 
 #. Gender
-#: src/protocols/msn/msn.c:1317 src/protocols/oscar/oscar.c:3917
-#: src/protocols/trepia/trepia.c:270 src/protocols/trepia/trepia.c:412
-#: src/protocols/yahoo/yahoo.c:2705
+#: src/protocols/msn/msn.c:1409 src/protocols/oscar/oscar.c:4239
+#: src/protocols/trepia/trepia.c:279 src/protocols/trepia/trepia.c:406
+#: src/protocols/yahoo/yahoo.c:3017
 msgid "Gender"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1325 src/protocols/yahoo/yahoo.c:2699
+#: src/protocols/msn/msn.c:1417 src/protocols/yahoo/yahoo.c:3013
 msgid "Marital Status"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1332 src/protocols/yahoo/yahoo.c:2687
+#: src/protocols/msn/msn.c:1424 src/protocols/yahoo/yahoo.c:3005
 #, fuzzy
 msgid "Location"
 msgstr "አካባቢ"
 
-#: src/protocols/msn/msn.c:1340 src/protocols/yahoo/yahoo.c:2711
+#: src/protocols/msn/msn.c:1432 src/protocols/yahoo/yahoo.c:3021
 #, fuzzy
 msgid "Occupation"
 msgstr "/ምርጫዎች (_O)"
 
-#: src/protocols/msn/msn.c:1357 src/protocols/msn/msn.c:1363
-#: src/protocols/msn/msn.c:1370 src/protocols/msn/msn.c:1377
-#: src/protocols/msn/msn.c:1384
+#: src/protocols/msn/msn.c:1449 src/protocols/msn/msn.c:1455
+#: src/protocols/msn/msn.c:1462 src/protocols/msn/msn.c:1469
+#: src/protocols/msn/msn.c:1476
 msgid "A Little About Me"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1393 src/protocols/msn/msn.c:1406
-#: src/protocols/msn/msn.c:1413
+#: src/protocols/msn/msn.c:1485 src/protocols/msn/msn.c:1498
+#: src/protocols/msn/msn.c:1505
 msgid "Favorite Things"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1422 src/protocols/msn/msn.c:1428
-#: src/protocols/msn/msn.c:1435
+#: src/protocols/msn/msn.c:1514 src/protocols/msn/msn.c:1520
+#: src/protocols/msn/msn.c:1527
 msgid "Hobbies and Interests"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1444 src/protocols/msn/msn.c:1450
-#: src/protocols/yahoo/yahoo.c:2755
+#: src/protocols/msn/msn.c:1536 src/protocols/msn/msn.c:1542
+#: src/protocols/yahoo/yahoo.c:3056
 msgid "Favorite Quote"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1458 src/protocols/yahoo/yahoo.c:2799
+#: src/protocols/msn/msn.c:1550 src/protocols/yahoo/yahoo.c:3092
 #, fuzzy
 msgid "Last Updated"
 msgstr "የአባት ስም"
 
 #. Homepage
-#: src/protocols/msn/msn.c:1469 src/protocols/trepia/trepia.c:280
-#: src/protocols/trepia/trepia.c:448
+#: src/protocols/msn/msn.c:1561 src/protocols/trepia/trepia.c:289
+#: src/protocols/trepia/trepia.c:419
 msgid "Homepage"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1491 src/protocols/yahoo/yahoo.c:2817
+#: src/protocols/msn/msn.c:1583 src/protocols/yahoo/yahoo.c:3107
 #, c-format
 msgid "User information for %s unavailable"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1493 src/protocols/yahoo/yahoo.c:2819
+#: src/protocols/msn/msn.c:1585 src/protocols/yahoo/yahoo.c:3109
 msgid "The user's profile is empty."
 msgstr ""
 
+#: src/protocols/msn/msn.c:1626
+msgid "Display conversation closed notices"
+msgstr ""
+
+#: src/protocols/msn/msn.c:1631
+msgid "Display timeout notices"
+msgstr ""
+
 #. *< api_version
 #. *< type
 #. *< ui_requirement
@@ -5627,83 +6370,84 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/msn/msn.c:1591 src/protocols/msn/msn.c:1593
+#. *  description
+#: src/protocols/msn/msn.c:1716 src/protocols/msn/msn.c:1718
 msgid "MSN Protocol Plugin"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1612 src/protocols/trepia/trepia.c:1330
+#: src/protocols/msn/msn.c:1736 src/protocols/trepia/trepia.c:1301
 #, fuzzy
 msgid "Login server"
 msgstr "ሰርቨርን የለም"
 
-#: src/protocols/msn/notification.c:247
-#, fuzzy, c-format
-msgid "MSN Error: %s\n"
-msgstr "ስህተት %s፦ %s"
-
-#: src/protocols/msn/notification.c:366 src/protocols/msn/notification.c:534
+#: src/protocols/msn/msn.c:1745
+msgid "Use HTTP Method"
+msgstr ""
+
+#: src/protocols/msn/nexus.c:56
+#, fuzzy
+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 ""
 
-#: src/protocols/msn/notification.c:375 src/protocols/msn/notification.c:549
-msgid "Unable to read from MSN Nexus server."
-msgstr ""
-
-#: src/protocols/msn/notification.c:395
+#: src/protocols/msn/nexus.c:147
 msgid "MSN Nexus server returned invalid redirect information."
 msgstr ""
 
-#: src/protocols/msn/notification.c:448
+#: src/protocols/msn/nexus.c:204
 msgid "Unknown error when attempting to authorize with MSN login server."
 msgstr ""
 
-#: src/protocols/msn/notification.c:560
-msgid "MSN Nexus server returned invalid information."
-msgstr ""
-
-#: src/protocols/msn/notification.c:628 src/protocols/trepia/trepia.c:677
+#: src/protocols/msn/notification.c:309 src/protocols/trepia/trepia.c:635
 msgid "Retrieving buddy list"
 msgstr ""
 
-#: src/protocols/msn/notification.c:690
-msgid "Unable to connect to passport server"
-msgstr ""
-
-#: src/protocols/msn/notification.c:695 src/protocols/msn/notification.c:727
+#: src/protocols/msn/notification.c:334 src/protocols/msn/notification.c:366
+#: src/protocols/oscar/oscar.c:1646
 msgid "Password sent"
 msgstr ""
 
-#: src/protocols/msn/notification.c:722
+#: src/protocols/msn/notification.c:361
 msgid "Unable to send password"
 msgstr ""
 
-#: src/protocols/msn/notification.c:758
+#: src/protocols/msn/notification.c:397
 msgid "Protocol not supported"
 msgstr ""
 
-#: src/protocols/msn/notification.c:800
+#: src/protocols/msn/notification.c:440
 msgid "You have been disconnected. You have signed on from another location."
 msgstr ""
 
-#: src/protocols/msn/notification.c:805
+#: src/protocols/msn/notification.c:445
 msgid "You have been disconnected. The MSN servers are going down temporarily."
 msgstr ""
 
-#: src/protocols/msn/notification.c:931
+#: src/protocols/msn/notification.c:584
 #, c-format
 msgid "The user %s (%s) wants to add %s to his or her buddy list."
 msgstr ""
 
-#: src/protocols/msn/notification.c:1250 src/protocols/msn/notification.c:1416
+#: src/protocols/msn/notification.c:903 src/protocols/msn/notification.c:1070
 #, c-format
 msgid "The user %s (%s) wants to add you to their buddy list."
 msgstr ""
 
-#: src/protocols/msn/notification.c:1931
+#: src/protocols/msn/notification.c:1362
+#, c-format
+msgid ""
+"Your MSN buddy list for %s is temporarily unavailable. Please wait and try "
+"again."
+msgstr ""
+
+#: src/protocols/msn/notification.c:1607
 msgid "Unable to transfer to notification server"
 msgstr ""
 
-#: src/protocols/msn/notification.c:2079
+#: src/protocols/msn/notification.c:1776
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -5722,16 +6466,25 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/protocols/msn/switchboard.c:147
+#: src/protocols/msn/servconn.c:389
+#, fuzzy
+msgid "IO Error."
+msgstr "የIRC ስህተት"
+
+#: src/protocols/msn/servconn.c:527
+msgid "Received HTTP error. Please report this."
+msgstr ""
+
+#: 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 ""
 
-#: src/protocols/msn/switchboard.c:277
+#: src/protocols/msn/switchboard.c:300
 msgid "An MSN message may not have been received."
 msgstr ""
 
@@ -5744,43 +6497,230 @@
 msgid "Unable to read message from server.  Command is %hd, length is %hd."
 msgstr ""
 
-#: src/protocols/napster/napster.c:303
+#: src/protocols/napster/napster.c:307
 #, c-format
 msgid "users: %s, files: %s, size: %sGB"
 msgstr ""
 
 #. MSG_SERVER_HOTLIST_ERROR
-#: src/protocols/napster/napster.c:314
+#: src/protocols/napster/napster.c:318
 #, c-format
 msgid "Unable to add \"%s\" to your Napster hotlist"
 msgstr ""
 
-#: src/protocols/napster/napster.c:322
+#: src/protocols/napster/napster.c:326
 msgid "You were disconnected from the server."
 msgstr ""
 
 #. MSG_CLIENT_WHOIS
-#: src/protocols/napster/napster.c:378
+#: src/protocols/napster/napster.c:384
 #, c-format
 msgid "%s requested your information"
 msgstr ""
 
-#: src/protocols/napster/napster.c:410
+#: src/protocols/napster/napster.c:422
 msgid ""
 "You were disconnected from the server, because you logged on from a "
 "different location"
 msgstr ""
 
 #. MSG_CLIENT_PING
-#: src/protocols/napster/napster.c:416
+#: src/protocols/napster/napster.c:428
 #, c-format
 msgid "%s requested a PING"
 msgstr ""
 
-#: src/protocols/napster/napster.c:543 src/protocols/oscar/oscar.c:5151
-#: src/protocols/toc/toc.c:1258
-msgid "Join what group:"
-msgstr ""
+#: src/protocols/napster/napster.c:541
+msgid "Get Info"
+msgstr "መረጃ አግኝ"
+
+#: src/protocols/napster/napster.c:555 src/protocols/oscar/oscar.c:5522
+#: src/protocols/toc/toc.c:1259
+msgid "_Group:"
+msgstr "መድረክ፦ (_G)"
+
+#. *< api_version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: src/protocols/napster/napster.c:639 src/protocols/napster/napster.c:641
+msgid "NAPSTER Protocol Plugin"
+msgstr ""
+
+#: src/protocols/novell/novell.c:113
+#, c-format
+msgid "Login failed (0x%X)."
+msgstr ""
+
+#: src/protocols/novell/novell.c:225
+#, c-format
+msgid "Unable to send message. Could not get details for user (0x%X)."
+msgstr ""
+
+#: src/protocols/novell/novell.c:371
+#, c-format
+msgid "Unable to add %s to your buddy list (0x%X)."
+msgstr ""
+
+#. TODO: Improve this! message to who or for what conference?
+#: src/protocols/novell/novell.c:397
+#, c-format
+msgid "Unable to send message (0x%X)."
+msgstr ""
+
+#: src/protocols/novell/novell.c:485
+#, c-format
+msgid "Unable to send message to %s. Could not create the conference (0x%X)."
+msgstr ""
+
+#: src/protocols/novell/novell.c:489
+#, c-format
+msgid "Unable to send message. Could not create the conference (0x%X)."
+msgstr ""
+
+#: src/protocols/novell/novell.c:536
+#, c-format
+msgid ""
+"Unable to move user %s to folder %s in the server side list. Error while "
+"creating folder (0x%X)."
+msgstr ""
+
+#: src/protocols/novell/novell.c:584
+#, c-format
+msgid ""
+"Unable to add %s to your buddy list. Error creating folder in server side "
+"list (0x%X)."
+msgstr ""
+
+#: src/protocols/novell/novell.c:615 src/protocols/novell/novell.c:1344
+#, fuzzy, c-format
+msgid "GroupWise Conference %d"
+msgstr "የጌም ማውሪያ"
+
+#: src/protocols/novell/novell.c:659
+#, c-format
+msgid "Could not get details for user %s (0x%X)."
+msgstr ""
+
+#: src/protocols/novell/novell.c:773 src/protocols/novell/novell.c:1107
+msgid "Error communicating with server. Closing connection."
+msgstr ""
+
+#: src/protocols/novell/novell.c:982
+#, fuzzy
+msgid "Userid"
+msgstr "ተጠቃሚ (_U)"
+
+#. tag = _("DN");
+#. value = nm_user_record_get_dn(user_record);
+#. if (value) {
+#. g_string_append_printf(info_text, "<b>%s:</b> %s<br/>\n",
+#. tag, value);
+#. }
+#.
+#: src/protocols/novell/novell.c:996
+#, fuzzy
+msgid "Full name"
+msgstr "ሙሉ ስም"
+
+#: src/protocols/novell/novell.c:1016
+#, fuzzy
+msgid "User Properties"
+msgstr "ተጠቃሚ መርጫዎች"
+
+#: src/protocols/novell/novell.c:1084
+msgid "Unable to make SSL connection to server."
+msgstr ""
+
+#: src/protocols/novell/novell.c:1113
+#, c-format
+msgid "Error processing event or response. (0x%X)"
+msgstr ""
+
+#: src/protocols/novell/novell.c:1147
+msgid "Authenticating..."
+msgstr ""
+
+#: src/protocols/novell/novell.c:1162
+msgid "Waiting for response..."
+msgstr ""
+
+#: src/protocols/novell/novell.c:1302
+msgid "Invitation to Conversation"
+msgstr ""
+
+#: src/protocols/novell/novell.c:1303
+#, c-format
+msgid ""
+"Invitation from: %s\n"
+"\n"
+"Sent: %s"
+msgstr ""
+
+#: src/protocols/novell/novell.c:1305
+msgid "Would you like to join the conversation?"
+msgstr ""
+
+#: src/protocols/novell/novell.c:1408
+msgid "You have been logged out because you logged in at another workstation."
+msgstr ""
+
+#: src/protocols/novell/novell.c:1462
+#, c-format
+msgid ""
+"%s appears to be offline and did not receive the message that you just sent."
+msgstr ""
+
+#. TODO: Would be nice to prompt if not set!
+#. *  gaim_request_fields(gc, _("Server Address"),...);
+#.
+#. ...but for now just error out with a nice message.
+#: src/protocols/novell/novell.c:1560
+msgid ""
+"Unable to connect to server. Please enter the address of the server you wish "
+"to connect to."
+msgstr ""
+
+#: src/protocols/novell/novell.c:1582
+msgid "Error. SSL support is not installed."
+msgstr ""
+
+#: src/protocols/novell/novell.c:1846
+msgid "This conference has been closed. No more messages can be sent."
+msgstr ""
+
+#: src/protocols/novell/novell.c:2153 src/protocols/oscar/oscar.c:574
+#: src/protocols/oscar/oscar.c:5818 src/protocols/yahoo/yahoo.c:2297
+#, fuzzy
+msgid "Offline"
+msgstr "ኦንላይን"
+
+#: src/protocols/novell/novell.c:2161
+#, fuzzy, c-format
+msgid ""
+"\n"
+"<b>Status:</b> %s\n"
+"<b>Message:</b> %s"
+msgstr "<b>ሁኔታ፦</b> %s%s%s"
+
+#: src/protocols/novell/novell.c:2165
+#, fuzzy, c-format
+msgid ""
+"\n"
+"<b>Status:</b> %s"
+msgstr "<b>ሁኔታ፦</b> %s"
+
+#: src/protocols/novell/novell.c:2261 src/protocols/novell/novell.c:2317
+#, fuzzy
+msgid "Appear Offline"
+msgstr "ኦንላይን"
 
 #. *< api_version
 #. *< type
@@ -5792,279 +6732,418 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/napster/napster.c:619 src/protocols/napster/napster.c:621
-msgid "NAPSTER Protocol Plugin"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:175
-msgid "Invalid error"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:176
-msgid "Invalid SNAC"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:177
-msgid "Rate to host"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:178
-msgid "Rate to client"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:180
-msgid "Service unavailable"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:181
-msgid "Service not defined"
-msgstr ""
+#. *  description
+#: src/protocols/novell/novell.c:2405 src/protocols/novell/novell.c:2407
+msgid "Novell GroupWise Messenger Protocol Plugin"
+msgstr ""
+
+#: src/protocols/novell/novell.c:2424
+#, fuzzy
+msgid "Server address"
+msgstr "የቤት አድራሻ፦"
+
+#: src/protocols/novell/novell.c:2428
+#, fuzzy
+msgid "Server port"
+msgstr "ሰርቨር፦"
 
 #: src/protocols/oscar/oscar.c:182
-msgid "Obsolete SNAC"
+msgid "Invalid error"
 msgstr ""
 
 #: src/protocols/oscar/oscar.c:183
-msgid "Not supported by host"
+msgid "Invalid SNAC"
 msgstr ""
 
 #: src/protocols/oscar/oscar.c:184
-msgid "Not supported by client"
+msgid "Rate to host"
 msgstr ""
 
 #: src/protocols/oscar/oscar.c:185
-msgid "Refused by client"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:186
-msgid "Reply too big"
+msgid "Rate to client"
 msgstr ""
 
 #: src/protocols/oscar/oscar.c:187
-msgid "Responses lost"
+msgid "Service unavailable"
 msgstr ""
 
 #: src/protocols/oscar/oscar.c:188
-msgid "Request denied"
+msgid "Service not defined"
 msgstr ""
 
 #: src/protocols/oscar/oscar.c:189
-msgid "Busted SNAC payload"
+msgid "Obsolete SNAC"
 msgstr ""
 
 #: src/protocols/oscar/oscar.c:190
-msgid "Insufficient rights"
+msgid "Not supported by host"
 msgstr ""
 
 #: src/protocols/oscar/oscar.c:191
-msgid "In local permit/deny"
+msgid "Not supported by client"
 msgstr ""
 
 #: src/protocols/oscar/oscar.c:192
-msgid "Too evil (sender)"
+msgid "Refused by client"
 msgstr ""
 
 #: src/protocols/oscar/oscar.c:193
-msgid "Too evil (receiver)"
+msgid "Reply too big"
 msgstr ""
 
 #: src/protocols/oscar/oscar.c:194
-msgid "User temporarily unavailable"
+msgid "Responses lost"
 msgstr ""
 
 #: src/protocols/oscar/oscar.c:195
-msgid "No match"
+msgid "Request denied"
 msgstr ""
 
 #: src/protocols/oscar/oscar.c:196
-msgid "List overflow"
+msgid "Busted SNAC payload"
 msgstr ""
 
 #: src/protocols/oscar/oscar.c:197
-msgid "Request ambiguous"
+msgid "Insufficient rights"
 msgstr ""
 
 #: src/protocols/oscar/oscar.c:198
-msgid "Queue full"
+msgid "In local permit/deny"
 msgstr ""
 
 #: src/protocols/oscar/oscar.c:199
+msgid "Too evil (sender)"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:200
+msgid "Too evil (receiver)"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:201
+msgid "User temporarily unavailable"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:202
+msgid "No match"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:203
+msgid "List overflow"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:204
+msgid "Request ambiguous"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:205
+msgid "Queue full"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:206
 msgid "Not while on AOL"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:470
+#: src/protocols/oscar/oscar.c:428
+msgid "Voice"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:431
+msgid "AIM Direct IM"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:434
+msgid "Chat"
+msgstr "ውሪ"
+
+#: src/protocols/oscar/oscar.c:437 src/protocols/oscar/oscar.c:6540
+msgid "Get File"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:444
+msgid "Games"
+msgstr "ጨዋታዎች"
+
+#: src/protocols/oscar/oscar.c:447
+msgid "Add-Ins"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:450
+msgid "Send Buddy List"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:453
+msgid "ICQ Direct Connect"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:456
+msgid "AP User"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:459
+msgid "ICQ RTF"
+msgstr "ICQ RTF"
+
+#: src/protocols/oscar/oscar.c:462
+msgid "Nihilist"
+msgstr "Nihilist"
+
+#: src/protocols/oscar/oscar.c:465
+msgid "ICQ Server Relay"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:468
+#, fuzzy
+msgid "Old ICQ UTF8"
+msgstr "ICQ UTF8"
+
+#: src/protocols/oscar/oscar.c:471
+msgid "Trillian Encryption"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:474
+msgid "ICQ UTF8"
+msgstr "ICQ UTF8"
+
+#: src/protocols/oscar/oscar.c:477
+#, fuzzy
+msgid "Hiptop"
+msgstr "ታሪክ"
+
+#: src/protocols/oscar/oscar.c:480
+msgid "Security Enabled"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:483
+#, fuzzy
+msgid "Video Chat"
+msgstr "ውሪ"
+
+#: src/protocols/oscar/oscar.c:487
+#, fuzzy
+msgid "iChat AV"
+msgstr "ውሪ"
+
+#: src/protocols/oscar/oscar.c:490
+msgid "Live Video"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:493
+#, fuzzy
+msgid "Camera"
+msgstr "ስም"
+
+#: src/protocols/oscar/oscar.c:512 src/protocols/oscar/oscar.c:4837
+#: src/protocols/oscar/oscar.c:6430
+msgid "Free For Chat"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:516 src/protocols/oscar/oscar.c:4831
+#: src/protocols/oscar/oscar.c:6428
+msgid "Not Available"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:518 src/protocols/oscar/oscar.c:4834
+#: src/protocols/oscar/oscar.c:6429
+msgid "Occupied"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:522
+msgid "Web Aware"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:590
+#, fuzzy
+msgid "Capabilities"
+msgstr ""
+"\n"
+"<b>ሁኔታ፦</b>"
+
+#: src/protocols/oscar/oscar.c:596
+#, fuzzy
+msgid "Buddy Comment"
+msgstr "የቢሮ መረጃ፦"
+
+#: src/protocols/oscar/oscar.c:716
 #, c-format
 msgid "Direct IM with %s closed"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:472
+#: src/protocols/oscar/oscar.c:718
 #, c-format
 msgid "Direct IM with %s failed"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:531 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/oscar/oscar.c:543 src/protocols/toc/toc.c:885
+#: src/protocols/oscar/oscar.c:789 src/protocols/toc/toc.c:885
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:559
+#: src/protocols/oscar/oscar.c:805
 msgid "Chat is currently unavailable"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:633 src/protocols/oscar/oscar.c:690
+#: src/protocols/oscar/oscar.c:876 src/protocols/oscar/oscar.c:940
 msgid "Couldn't connect to host"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:675
+#: src/protocols/oscar/oscar.c:886
+#, fuzzy
+msgid "Screen name sent"
+msgstr "እስክሪን ስም"
+
+#: src/protocols/oscar/oscar.c:900
+#, 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:928
 msgid "Unable to login to AIM"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:778 src/protocols/oscar/oscar.c:1165
+#: src/protocols/oscar/oscar.c:1032 src/protocols/oscar/oscar.c:1450
 msgid "Could Not Connect"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:785
+#: src/protocols/oscar/oscar.c:1040
 msgid "Connection established, cookie sent"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:852 src/protocols/oscar/oscar.c:865
-#: src/protocols/oscar/oscar.c:870
-msgid "File Transfer Aborted"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:853
-msgid "Unable to establish listener socket."
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:866
+#: src/protocols/oscar/oscar.c:1153 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:871
+#: src/protocols/oscar/oscar.c:1158
 msgid "Unable to create new connection."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1051 src/protocols/toc/toc.c:571
+#: src/protocols/oscar/oscar.c:1229
+msgid "Unable to establish listener socket."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:1334 src/protocols/toc/toc.c:571
 msgid "Incorrect nickname or password."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1056
+#: src/protocols/oscar/oscar.c:1339
 msgid "Your account is currently suspended."
 msgstr ""
 
 #. service temporarily unavailable
-#: src/protocols/oscar/oscar.c:1060
+#: src/protocols/oscar/oscar.c:1343
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1065
+#: src/protocols/oscar/oscar.c:1348
 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."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1070
+#: src/protocols/oscar/oscar.c:1353
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1102
+#: src/protocols/oscar/oscar.c:1385
 msgid "Internal Error"
 msgstr "የውስጥ ብልሽት"
 
-#: src/protocols/oscar/oscar.c:1204 src/protocols/oscar/oscar.c:1234
-#: src/protocols/oscar/oscar.c:1322
+#: src/protocols/oscar/oscar.c:1457
+msgid "Received authorization"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:1493 src/protocols/oscar/oscar.c:1523
+#: src/protocols/oscar/oscar.c:1611
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
 "fixed.  Check %s for updates."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1207 src/protocols/oscar/oscar.c:1237
-msgid "Gaim was Unable to get a valid AIM login hash."
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:1325
-msgid "Gaim was Unable to get a valid login hash."
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:1905 src/protocols/oscar/oscar.c:5572
+#: src/protocols/oscar/oscar.c:1496 src/protocols/oscar/oscar.c:1526
+msgid "Gaim was unable to get a valid AIM login hash."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:1614
+msgid "Gaim was unable to get a valid login hash."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2196 src/protocols/oscar/oscar.c:5922
 #, c-format
 msgid "Direct IM with %s established"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2234 src/protocols/oscar/oscar.c:2256
+#: src/protocols/oscar/oscar.c:2530 src/protocols/oscar/oscar.c:2552
 msgid "(There was an error receiving this message)"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2403
+#: src/protocols/oscar/oscar.c:2713
 #, c-format
 msgid "%s has just asked to directly connect to %s"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2406
+#: src/protocols/oscar/oscar.c:2716
 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 "
 "considered a privacy risk."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2411 src/protocols/oscar/oscar.c:5941
+#: src/protocols/oscar/oscar.c:2721 src/protocols/oscar/oscar.c:6304
 msgid "Connect"
 msgstr "አገናኝ"
 
-#: src/protocols/oscar/oscar.c:2438
+#: src/protocols/oscar/oscar.c:2750
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2446
+#: src/protocols/oscar/oscar.c:2758
 msgid "Authorization Request Message:"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2447
+#: src/protocols/oscar/oscar.c:2759
 msgid "Please authorize me!"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2475
+#: src/protocols/oscar/oscar.c:2788
 #, c-format
 msgid ""
 "The user %s requires authorization before being added to a buddy list.  Do "
 "you want to send an authorization request?"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2480 src/protocols/oscar/oscar.c:2482
+#: src/protocols/oscar/oscar.c:2793 src/protocols/oscar/oscar.c:2795
 msgid "Request Authorization"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2518 src/protocols/oscar/oscar.c:2520
-#: src/protocols/oscar/oscar.c:2527 src/protocols/oscar/oscar.c:2599
-#: src/protocols/oscar/oscar.c:2619 src/protocols/oscar/oscar.c:2975
-#: src/protocols/oscar/oscar.c:5072 src/protocols/oscar/oscar.c:5118
+#: src/protocols/oscar/oscar.c:2831 src/protocols/oscar/oscar.c:2833
+#: src/protocols/oscar/oscar.c:2840 src/protocols/oscar/oscar.c:2922
+#: src/protocols/oscar/oscar.c:2942 src/protocols/oscar/oscar.c:3286
+#: src/protocols/oscar/oscar.c:3346 src/protocols/oscar/oscar.c:5443
+#: src/protocols/oscar/oscar.c:5489
 msgid "No reason given."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2526
+#: src/protocols/oscar/oscar.c:2839
 msgid "Authorization Denied Message:"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2599
+#: src/protocols/oscar/oscar.c:2922
 #, c-format
 msgid ""
 "The user %u wants to add you to their buddy list for the following reason:\n"
 "%s"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2607 src/protocols/oscar/oscar.c:5078
+#: src/protocols/oscar/oscar.c:2930 src/protocols/oscar/oscar.c:5449
 msgid "Authorization Request"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2619
+#: src/protocols/oscar/oscar.c:2942
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -6072,17 +7151,17 @@
 "%s"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2620
+#: src/protocols/oscar/oscar.c:2943
 msgid "ICQ authorization denied."
 msgstr ""
 
 #. Someone has granted you authorization
-#: src/protocols/oscar/oscar.c:2627
+#: src/protocols/oscar/oscar.c:2950
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2635
+#: src/protocols/oscar/oscar.c:2958
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -6091,7 +7170,7 @@
 "%s"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2643
+#: src/protocols/oscar/oscar.c:2966
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -6100,7 +7179,7 @@
 "%s"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2651
+#: src/protocols/oscar/oscar.c:2974
 #, c-format
 msgid ""
 "You have received an ICQ email from %s [%s]\n"
@@ -6109,34 +7188,34 @@
 "%s"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2672
+#: src/protocols/oscar/oscar.c:2995
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2678
+#: src/protocols/oscar/oscar.c:3001
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2682
+#: src/protocols/oscar/oscar.c:3005
 msgid "Decline"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2764
+#: src/protocols/oscar/oscar.c:3090
 #, 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] ""
 msgstr[1] ""
 
-#: src/protocols/oscar/oscar.c:2773
+#: src/protocols/oscar/oscar.c:3099
 #, 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] ""
 msgstr[1] ""
 
-#: src/protocols/oscar/oscar.c:2782
+#: src/protocols/oscar/oscar.c:3108
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -6145,369 +7224,280 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/protocols/oscar/oscar.c:2791
+#: src/protocols/oscar/oscar.c:3117
 #, 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] ""
 msgstr[1] ""
 
-#: src/protocols/oscar/oscar.c:2800
+#: src/protocols/oscar/oscar.c:3126
 #, 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] ""
 msgstr[1] ""
 
-#: src/protocols/oscar/oscar.c:2809
+#: src/protocols/oscar/oscar.c:3135
 #, 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] ""
 msgstr[1] ""
 
-#: src/protocols/oscar/oscar.c:2825 src/protocols/oscar/oscar.c:4541
-#: src/protocols/oscar/oscar.c:6068
-msgid "Free For Chat"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:2829 src/protocols/oscar/oscar.c:4535
-#: src/protocols/oscar/oscar.c:6066
-msgid "Not Available"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:2831 src/protocols/oscar/oscar.c:4538
-#: src/protocols/oscar/oscar.c:6067
-msgid "Occupied"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:2835
-msgid "Web Aware"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:2878
+#: src/protocols/oscar/oscar.c:3189
 #, c-format
 msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<HR>%s"
 msgstr "<B>UIN:</B> %s<BR><B>ሁኔታ:</B> %s<HR>%s"
 
-#: src/protocols/oscar/oscar.c:2937
+#: src/protocols/oscar/oscar.c:3248
 #, c-format
 msgid "SNAC threw error: %s\n"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2938
+#: src/protocols/oscar/oscar.c:3249
 msgid "Unknown error"
 msgstr "ያልታወቀ ስህተት"
 
 #. Data is assumed to be the destination sn
-#: src/protocols/oscar/oscar.c:2973
+#: src/protocols/oscar/oscar.c:3284
 #, c-format
 msgid "Your message to %s did not get sent:"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3070
-msgid "Voice"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:3073
-msgid "AIM Direct IM"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:3079 src/protocols/oscar/oscar.c:6167
-msgid "Get File"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:3082 src/protocols/oscar/oscar.c:6159
-msgid "Send File"
-msgstr "ፋይልን ላክ"
-
-#: src/protocols/oscar/oscar.c:3086
-msgid "Games"
-msgstr "ጨዋታዎች"
-
-#: src/protocols/oscar/oscar.c:3089
-msgid "Add-Ins"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:3092
-msgid "Send Buddy List"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:3095
-msgid "ICQ Direct Connect"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:3098
-msgid "AP User"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:3101
-msgid "ICQ RTF"
-msgstr "ICQ RTF"
-
-#: src/protocols/oscar/oscar.c:3104
-msgid "Nihilist"
-msgstr "Nihilist"
-
-#: src/protocols/oscar/oscar.c:3107
-msgid "ICQ Server Relay"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:3110
-#, fuzzy
-msgid "Old ICQ UTF8"
-msgstr "ICQ UTF8"
-
-#: src/protocols/oscar/oscar.c:3113
-msgid "Trillian Encryption"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:3116
-msgid "ICQ UTF8"
-msgstr "ICQ UTF8"
-
-#: src/protocols/oscar/oscar.c:3119
-#, fuzzy
-msgid "Hiptop"
-msgstr "ታሪክ"
-
-#: src/protocols/oscar/oscar.c:3122
-msgid "Secure IM"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:3151
-#, fuzzy, c-format
-msgid "Username: <b>%s</b><br>\n"
-msgstr "<b>ሁኔታ፦</b> %s"
-
-#: src/protocols/oscar/oscar.c:3152
-#, c-format
-msgid "Warning Level: <b>%d%%</b><br>\n"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:3155
-#, c-format
-msgid "Online Since: <b>%s</b><br>\n"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:3159
-#, c-format
-msgid "Member Since: <b>%s</b><br>\n"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:3164
-#, c-format
-msgid "Idle: <b>%s</b>"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:3167
-msgid "Idle: <b>Active</b>"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:3206
+#: src/protocols/oscar/oscar.c:3343
+#, c-format
+msgid "User information for %s unavailable:"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3366
+msgid "Warning Level"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3369
+#, fuzzy
+msgid "Online Since"
+msgstr "ኦንላይን"
+
+#: src/protocols/oscar/oscar.c:3373 src/protocols/yahoo/yahoo.c:3088
+msgid "Member Since"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3455
 msgid "Your AIM connection may be lost."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3594
+#. The conversion failed!
+#: src/protocols/oscar/oscar.c:3641
+msgid ""
+"[Unable to display a message from this user because it contained invalid "
+"characters.]"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3859
 msgid "Rate limiting error."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3595
+#: src/protocols/oscar/oscar.c:3860
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3656
+#: src/protocols/oscar/oscar.c:3923
 msgid ""
 "You have been disconnected because you have signed on with this screen name "
 "at another location."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3658
+#: src/protocols/oscar/oscar.c:3925
 msgid "You have been signed off for an unknown reason."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3903 src/protocols/oscar/oscar.c:3909
+#: src/protocols/oscar/oscar.c:3956
+msgid "Finalizing connection"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:4226 src/protocols/oscar/oscar.c:4233
 #, fuzzy
 msgid "Email Address"
 msgstr "ኢሜያል አድራሻ"
 
-#: src/protocols/oscar/oscar.c:3914
+#: src/protocols/oscar/oscar.c:4238
 #, fuzzy
 msgid "Mobile Phone"
 msgstr "የሞቢል ስልክ፦"
 
-#: src/protocols/oscar/oscar.c:3917 src/protocols/trepia/trepia.c:272
-#: src/protocols/trepia/trepia.c:413
+#: src/protocols/oscar/oscar.c:4239 src/protocols/trepia/trepia.c:281
+#: src/protocols/trepia/trepia.c:407
 msgid "Female"
 msgstr "ሴት"
 
-#: src/protocols/oscar/oscar.c:3917 src/protocols/trepia/trepia.c:271
-#: src/protocols/trepia/trepia.c:413
+#: src/protocols/oscar/oscar.c:4239 src/protocols/trepia/trepia.c:280
+#: src/protocols/trepia/trepia.c:407
 msgid "Male"
 msgstr "ወንድ"
 
-#: src/protocols/oscar/oscar.c:3934
+#: src/protocols/oscar/oscar.c:4255
 #, fuzzy
 msgid "Personal Web Page"
 msgstr "ድረ-ገጽ፦"
 
-#: src/protocols/oscar/oscar.c:3937
+#: src/protocols/oscar/oscar.c:4259
 #, fuzzy
 msgid "Additional Information"
 msgstr "የቢሮ መረጃ፦"
 
-#: src/protocols/oscar/oscar.c:3941
+#: src/protocols/oscar/oscar.c:4264
 #, fuzzy
 msgid "Home Address"
 msgstr "የቤት አድራሻ፦"
 
-#: src/protocols/oscar/oscar.c:3952 src/protocols/oscar/oscar.c:3968
+#: src/protocols/oscar/oscar.c:4268 src/protocols/oscar/oscar.c:4276
 msgid "Zip Code"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3957
+#: src/protocols/oscar/oscar.c:4272
 #, fuzzy
 msgid "Work Address"
 msgstr "የቢሮ አድራሻ፦"
 
-#: src/protocols/oscar/oscar.c:3973
+#: src/protocols/oscar/oscar.c:4280
 #, fuzzy
 msgid "Work Information"
 msgstr "የቢሮ መረጃ፦"
 
-#: src/protocols/oscar/oscar.c:3975
+#: src/protocols/oscar/oscar.c:4281
 #, fuzzy
 msgid "Company"
 msgstr "ትእዛዝ"
 
-#: src/protocols/oscar/oscar.c:3978
+#: src/protocols/oscar/oscar.c:4282
 msgid "Division"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3981
+#: src/protocols/oscar/oscar.c:4283
 #, fuzzy
 msgid "Position"
 msgstr "ቦታ፦"
 
-#: src/protocols/oscar/oscar.c:3984
+#: src/protocols/oscar/oscar.c:4285
 #, fuzzy
 msgid "Web Page"
 msgstr "ድረ-ገጽ፦"
 
-#: src/protocols/oscar/oscar.c:3990
+#: src/protocols/oscar/oscar.c:4291
 #, c-format
 msgid "ICQ Info for %s"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:4040
+#: src/protocols/oscar/oscar.c:4341
 #, fuzzy
 msgid "Pop-Up Message"
 msgstr "አዲስ መልእክት"
 
-#: src/protocols/oscar/oscar.c:4061
-#, c-format
-msgid "The following screennames are associated with %s"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:4065
+#: src/protocols/oscar/oscar.c:4362
+#, c-format
+msgid "The following screen names are associated with %s"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:4366
 msgid "Search Results"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:4082
+#: src/protocols/oscar/oscar.c:4383
 #, c-format
 msgid "No results found for email address %s"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:4103
+#: src/protocols/oscar/oscar.c:4404
 #, c-format
 msgid "You should receive an email asking to confirm %s."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:4105
+#: src/protocols/oscar/oscar.c:4406
 msgid "Account Confirmation Requested"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:4133
+#: src/protocols/oscar/oscar.c:4434
 msgid "Error Changing Account Info"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:4136
+#: src/protocols/oscar/oscar.c:4437
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
 "differs from the original."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:4139
+#: src/protocols/oscar/oscar.c:4440
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
 "ends in a space."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:4142
+#: src/protocols/oscar/oscar.c:4443
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
 "is too long."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:4145
+#: src/protocols/oscar/oscar.c:4446
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because there is already a "
 "request pending for this screen name."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:4148
+#: src/protocols/oscar/oscar.c:4449
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address has "
 "too many screen names associated with it."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:4151
+#: src/protocols/oscar/oscar.c:4452
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address is "
 "invalid."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:4154
+#: src/protocols/oscar/oscar.c:4455
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:4164
+#: src/protocols/oscar/oscar.c:4465
 #, c-format
 msgid ""
 "Your screen name is currently formatted as follows:\n"
 "%s"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:4165 src/protocols/oscar/oscar.c:4172
+#: src/protocols/oscar/oscar.c:4466 src/protocols/oscar/oscar.c:4473
 msgid "Account Info"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:4170
+#: src/protocols/oscar/oscar.c:4471
 #, c-format
 msgid "The email address for %s is %s"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:4400
+#: src/protocols/oscar/oscar.c:4686
 msgid "Unable to set AIM profile."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:4401
+#: src/protocols/oscar/oscar.c:4687
 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 "
 "fully connected."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:4431
+#: src/protocols/oscar/oscar.c:4714
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  Gaim has truncated "
@@ -6518,22 +7508,26 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/protocols/oscar/oscar.c:4436
+#: src/protocols/oscar/oscar.c:4719
 msgid "Profile too long."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:4455
+#: src/protocols/oscar/oscar.c:4735 src/protocols/oscar/oscar.c:6435
+msgid "Visible"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:4753
 msgid "Unable to set AIM away message."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:4456
+#: src/protocols/oscar/oscar.c:4754
 msgid ""
 "You have probably requested to set your away message before the login "
 "procedure completed.  You remain in a \"present\" state; try setting it "
 "again when you are fully connected."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:4496
+#: src/protocols/oscar/oscar.c:4794
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  Gaim has "
@@ -6544,42 +7538,52 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/protocols/oscar/oscar.c:4501
+#: src/protocols/oscar/oscar.c:4799
 msgid "Away message too long."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:4721
+#: src/protocols/oscar/oscar.c:4892
+#, 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:4893 src/protocols/oscar/oscar.c:5310
+#: src/protocols/oscar/oscar.c:5323
+msgid "Unable To Add"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:5029
 msgid "Unable To Retrieve Buddy List"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:4722
+#: src/protocols/oscar/oscar.c:5030
 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 "
 "a few hours."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:4813 src/protocols/oscar/oscar.c:4814
-#: src/protocols/oscar/oscar.c:4819
+#: src/protocols/oscar/oscar.c:5206 src/protocols/oscar/oscar.c:5207
+#: src/protocols/oscar/oscar.c:5212 src/protocols/oscar/oscar.c:5367
+#: src/protocols/oscar/oscar.c:5368 src/protocols/oscar/oscar.c:5373
 msgid "Orphans"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:4985
+#: src/protocols/oscar/oscar.c:5309
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
 "list.  Please remove one and try again."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:4985 src/protocols/oscar/oscar.c:4998
+#: src/protocols/oscar/oscar.c:5309 src/protocols/oscar/oscar.c:5322
 msgid "(no name)"
 msgstr "(ስም የለም)"
 
-#: src/protocols/oscar/oscar.c:4986 src/protocols/oscar/oscar.c:4999
-msgid "Unable To Add"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:4998
+#: src/protocols/oscar/oscar.c:5322
 #, c-format
 msgid ""
 "Could not add the buddy %s for an unknown reason.  The most common reason "
@@ -6587,18 +7591,18 @@
 "buddy list."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:5033
+#: src/protocols/oscar/oscar.c:5404
 #, c-format
 msgid ""
 "The user %s has given you permission to add you to their buddy list.  Do you "
 "want to add them?"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:5039
+#: src/protocols/oscar/oscar.c:5410
 msgid "Authorization Given"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:5072
+#: src/protocols/oscar/oscar.c:5443
 #, c-format
 msgid ""
 "The user %s wants to add you to their buddy list for the following reason:\n"
@@ -6606,17 +7610,17 @@
 msgstr ""
 
 #. Granted
-#: src/protocols/oscar/oscar.c:5114
+#: src/protocols/oscar/oscar.c:5485
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:5115
+#: src/protocols/oscar/oscar.c:5486
 msgid "Authorization Granted"
 msgstr ""
 
 #. Denied
-#: src/protocols/oscar/oscar.c:5118
+#: src/protocols/oscar/oscar.c:5489
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -6624,184 +7628,166 @@
 "%s"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:5119
+#: src/protocols/oscar/oscar.c:5490
 msgid "Authorization Denied"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:5156 src/protocols/toc/toc.c:1263
-msgid "Exchange:"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:5379
-#, fuzzy
-msgid "<b>Status:</b> "
-msgstr ""
-"\n"
-"<b>ሁኔታ፦</b>"
-
-#: src/protocols/oscar/oscar.c:5388
-msgid "<b>Logged In:</b> "
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:5400
-msgid "<b>IP Address:</b> "
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:5408
-#, fuzzy
-msgid "<b>Capabilities:</b> "
-msgstr ""
-"\n"
-"<b>ሁኔታ፦</b>"
-
-#: src/protocols/oscar/oscar.c:5415
-#, fuzzy
-msgid "<b>Available:</b> "
-msgstr ""
-"\n"
-"<b>ቅጽል ስም፦</b>"
-
-#: src/protocols/oscar/oscar.c:5431
-#, fuzzy
-msgid "<b>Away Message:</b> "
-msgstr ""
-"\n"
-"<b>ቅጽል ስም፦</b>"
-
-#: src/protocols/oscar/oscar.c:5440
-#, fuzzy
-msgid "<b>Status:</b> Not Authorized"
-msgstr ""
-"\n"
-"<b>ሁኔታ፦</b>"
-
-#: src/protocols/oscar/oscar.c:5474 src/protocols/yahoo/yahoo.c:2030
-#, fuzzy
-msgid "Offline"
-msgstr "ኦንላይን"
-
-#: src/protocols/oscar/oscar.c:5921
+#: src/protocols/oscar/oscar.c:5527 src/protocols/toc/toc.c:1264
+#, fuzzy
+msgid "_Exchange:"
+msgstr "ለውጥ"
+
+#: src/protocols/oscar/oscar.c:5549
+msgid "Invalid chat name specified."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:5790
+#, fuzzy
+msgid "Away Message"
+msgstr "አዲስ መልእክት"
+
+#: src/protocols/oscar/oscar.c:6284
 msgid "Unable to open Direct IM"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:5934
+#: src/protocols/oscar/oscar.c:6297
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:5937
+#: src/protocols/oscar/oscar.c:6300
 msgid ""
 "Because this reveals your IP address, it may be considered a privacy risk.  "
 "Do you wish to continue?"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:6112
+#: src/protocols/oscar/oscar.c:6485
 msgid "Buddy Comment:"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:6128
+#: src/protocols/oscar/oscar.c:6501
 msgid "Edit Buddy Comment"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:6136
+#: src/protocols/oscar/oscar.c:6509
 msgid "Get Status Msg"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:6151
+#: src/protocols/oscar/oscar.c:6524
 msgid "Direct IM"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:6180
+#: src/protocols/oscar/oscar.c:6553
 msgid "Re-request Authorization"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:6201
+#: src/protocols/oscar/oscar.c:6574
 msgid "The new formatting is invalid."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:6202
-msgid "Screenname formatting can change only capitalization and whitespace."
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:6208
-msgid "New screenname formatting:"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:6257
+#: src/protocols/oscar/oscar.c:6575
+msgid "Screen name formatting can change only capitalization and whitespace."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:6581
+msgid "New screen name formatting:"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:6630
 #, fuzzy
 msgid "Change Address To:"
 msgstr "የቤት አድራሻ፦"
 
-#: src/protocols/oscar/oscar.c:6301
+#: src/protocols/oscar/oscar.c:6674
 msgid "<i>you are not waiting for authorization</i>"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:6304
+#: src/protocols/oscar/oscar.c:6677
 msgid "You are awaiting authorization from the following buddies"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:6305
+#: src/protocols/oscar/oscar.c:6678
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:6319
+#: src/protocols/oscar/oscar.c:6692
 msgid "Find Buddy by E-mail"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:6320
+#: src/protocols/oscar/oscar.c:6693
 msgid "Search for a buddy by e-mail address"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:6321
+#: src/protocols/oscar/oscar.c:6694
 msgid "Type the e-mail address of the buddy you are searching for."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:6324
-msgid "Search"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:6337
+#: src/protocols/oscar/oscar.c:6711
 #, fuzzy
 msgid "Available Message:"
 msgstr "አዲስ መልእክት"
 
-#: src/protocols/oscar/oscar.c:6415
-msgid "Set Available Message"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:6429
+#: src/protocols/oscar/oscar.c:6712
+msgid "I'm doing work and hoping for a distraction--IM me!"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:6788
+msgid "Set User Info..."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:6795
+msgid "Set User Info (URL)..."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:6803
+#, fuzzy
+msgid "Set Available Message..."
+msgstr "አዲስ መልእክት"
+
+#: src/protocols/oscar/oscar.c:6810
+#, fuzzy
+msgid "Change Password..."
+msgstr "ሚስጢራዊ ቃልን ለውጥ"
+
+#: src/protocols/oscar/oscar.c:6817
 msgid "Change Password (URL)"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:6437
+#: src/protocols/oscar/oscar.c:6825
 msgid "Configure IM Forwarding (URL)"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:6448
-msgid "Format Screenname"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:6454
+#: src/protocols/oscar/oscar.c:6836
+#, fuzzy
+msgid "Format Screen Name..."
+msgstr "እስክሪን ስም"
+
+#: src/protocols/oscar/oscar.c:6842
 msgid "Confirm Account"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:6460
-msgid "Display Current Registered Address"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:6466
-msgid "Change Current Registered Address"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:6475
+#: src/protocols/oscar/oscar.c:6848
+msgid "Display Currently Registered Address"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:6854
+msgid "Change Currently Registered Address..."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:6863
 msgid "Show Buddies Awaiting Authorization"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:6483
-msgid "Search for Buddy by Email"
-msgstr ""
+#: src/protocols/oscar/oscar.c:6871
+msgid "Search for Buddy by Email..."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:6878
+#, fuzzy
+msgid "Search for Buddy by Information"
+msgstr "የቢሮ መረጃ፦"
 
 #. *< api_version
 #. *< type
@@ -6813,15 +7799,16 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/oscar/oscar.c:6604 src/protocols/oscar/oscar.c:6606
+#. *  description
+#: src/protocols/oscar/oscar.c:7001 src/protocols/oscar/oscar.c:7003
 msgid "AIM/ICQ Protocol Plugin"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:6623
+#: src/protocols/oscar/oscar.c:7020
 msgid "Auth host"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:6628
+#: src/protocols/oscar/oscar.c:7025
 msgid "Auth port"
 msgstr ""
 
@@ -6971,44 +7958,44 @@
 "is only temporary, please be patient."
 msgstr ""
 
-#: src/protocols/toc/toc.c:1401
+#: src/protocols/toc/toc.c:1402
 msgid "Get Dir Info"
 msgstr ""
 
-#: src/protocols/toc/toc.c:1538
+#: src/protocols/toc/toc.c:1539
 msgid "Set Dir Info"
 msgstr ""
 
-#: src/protocols/toc/toc.c:1663
+#: src/protocols/toc/toc.c:1664
 #, c-format
 msgid "Could not open %s for writing!"
 msgstr ""
 
-#: src/protocols/toc/toc.c:1699
+#: src/protocols/toc/toc.c:1700
 msgid "File transfer failed; other side probably canceled."
 msgstr ""
 
-#: src/protocols/toc/toc.c:1744 src/protocols/toc/toc.c:1784
-#: src/protocols/toc/toc.c:1996
+#: src/protocols/toc/toc.c:1745 src/protocols/toc/toc.c:1785
+#: src/protocols/toc/toc.c:1909 src/protocols/toc/toc.c:1997
 msgid "Could not connect for transfer."
 msgstr ""
 
-#: src/protocols/toc/toc.c:1908
-msgid "Could not connect for transfer!"
-msgstr ""
-
-#: src/protocols/toc/toc.c:1941
+#: src/protocols/toc/toc.c:1942
 msgid "Could not write file header.  The file will not be transferred."
 msgstr ""
 
-#: src/protocols/toc/toc.c:2075
+#: src/protocols/toc/toc.c:2042
+msgid "Gaim - Save As..."
+msgstr ""
+
+#: src/protocols/toc/toc.c:2076
 #, c-format
 msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
 msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/protocols/toc/toc.c:2082
+#: src/protocols/toc/toc.c:2083
 #, c-format
 msgid "%s requests you to send them a file"
 msgstr ""
@@ -7023,94 +8010,90 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/toc/toc.c:2158 src/protocols/toc/toc.c:2160
+#. *  description
+#: src/protocols/toc/toc.c:2167 src/protocols/toc/toc.c:2169
 msgid "TOC Protocol Plugin"
 msgstr ""
 
-#: src/protocols/toc/toc.c:2177
+#: src/protocols/toc/toc.c:2186
 #, fuzzy
 msgid "TOC host"
 msgstr "የTOC እንግዳ ተቀባይ"
 
-#: src/protocols/toc/toc.c:2181
+#: src/protocols/toc/toc.c:2190
 #, fuzzy
 msgid "TOC port"
 msgstr "የTOC ፖርት፦"
 
 #. Basic Profile group.
-#: src/protocols/trepia/trepia.c:254
+#: src/protocols/trepia/trepia.c:263
 msgid "Basic Profile"
 msgstr ""
 
 #. E-Mail Address
-#: src/protocols/trepia/trepia.c:285
+#: src/protocols/trepia/trepia.c:294
 #, fuzzy
 msgid "E-Mail Address"
 msgstr "ኢሜያል አድራሻ"
 
-#: src/protocols/trepia/trepia.c:291
+#: src/protocols/trepia/trepia.c:300
 #, fuzzy
 msgid "Profile Information"
 msgstr "የቢሮ መረጃ፦"
 
 #. Instant Messagers
-#: src/protocols/trepia/trepia.c:297
+#: src/protocols/trepia/trepia.c:306
 msgid "Instant Messagers"
 msgstr ""
 
 #. AIM
-#: src/protocols/trepia/trepia.c:301
+#: src/protocols/trepia/trepia.c:310
 msgid "AIM"
 msgstr ""
 
 #. ICQ
-#: src/protocols/trepia/trepia.c:305
+#: src/protocols/trepia/trepia.c:314
 #, fuzzy
 msgid "ICQ UIN"
 msgstr "ICQ UTF8"
 
 #. MSN
-#: src/protocols/trepia/trepia.c:309
+#: src/protocols/trepia/trepia.c:318
 msgid "MSN"
 msgstr ""
 
 #. Yahoo
-#: src/protocols/trepia/trepia.c:313
+#: src/protocols/trepia/trepia.c:322
 msgid "Yahoo"
 msgstr ""
 
 #. I'm From
-#: src/protocols/trepia/trepia.c:318
+#: src/protocols/trepia/trepia.c:327
 msgid "I'm From"
 msgstr ""
 
 #. Call the dialog.
-#: src/protocols/trepia/trepia.c:335
+#: src/protocols/trepia/trepia.c:344
 msgid "Set your Trepia profile data."
 msgstr ""
 
-#: src/protocols/trepia/trepia.c:459
+#: src/protocols/trepia/trepia.c:424
 msgid "Profile"
 msgstr ""
 
-#: src/protocols/trepia/trepia.c:481
+#: src/protocols/trepia/trepia.c:439
 msgid "Set Profile"
 msgstr ""
 
-#: src/protocols/trepia/trepia.c:517
+#: src/protocols/trepia/trepia.c:475
 msgid "Visit Homepage"
 msgstr ""
 
-#: src/protocols/trepia/trepia.c:863 src/protocols/trepia/trepia.c:866
+#: src/protocols/trepia/trepia.c:821 src/protocols/trepia/trepia.c:824
 msgid "Local Users"
 msgstr ""
 
-#: src/protocols/trepia/trepia.c:962
-#, fuzzy
-msgid "Read error"
-msgstr "የIRC ስህተት"
-
-#: src/protocols/trepia/trepia.c:1063
+#: src/protocols/trepia/trepia.c:1027
 #, fuzzy
 msgid "Logging in"
 msgstr "የዝምብለህ ይግባ መርጫዎች"
@@ -7125,31 +8108,47 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/trepia/trepia.c:1311 src/protocols/trepia/trepia.c:1313
+#. *  description
+#: src/protocols/trepia/trepia.c:1282 src/protocols/trepia/trepia.c:1284
 msgid "Trepia Protocol Plugin"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:700
+#: 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:747
 msgid "Your Yahoo! message did not get sent."
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:758
+#: src/protocols/yahoo/yahoo.c:765
+msgid "Buzz!!"
+msgstr ""
+
+#: src/protocols/yahoo/yahoo.c:800
+#, c-format
+msgid "Yahoo! system message for %s:"
+msgstr ""
+
+#: src/protocols/yahoo/yahoo.c:866
 #, c-format
 msgid "%s has (retroactively) denied your request to add them to your list."
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:760
+#: src/protocols/yahoo/yahoo.c:869
 #, c-format
 msgid ""
 "%s has (retroactively) denied your request to add them to your list for the "
 "following reason: %s."
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:761
+#: src/protocols/yahoo/yahoo.c:872
 msgid "Add buddy rejected"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:1381
+#: src/protocols/yahoo/yahoo.c:1599
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -7157,154 +8156,172 @@
 "on to Yahoo.  Check %s for updates."
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:1384
+#: src/protocols/yahoo/yahoo.c:1602
 msgid "Failed Yahoo! Authentication"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:1457
+#: src/protocols/yahoo/yahoo.c:1675
 #, c-format
 msgid ""
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
 "\"Yes\" will remove and ignore the buddy."
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:1460
+#: src/protocols/yahoo/yahoo.c:1678
 #, fuzzy
 msgid "Ignore buddy?"
 msgstr "ተዉት"
 
-#: src/protocols/yahoo/yahoo.c:1489
+#: src/protocols/yahoo/yahoo.c:1711
 msgid "Invalid username."
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:1492
+#: src/protocols/yahoo/yahoo.c:1714
 msgid "Incorrect password."
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:1495
-#, fuzzy
-msgid "Unknown error."
-msgstr "ያልታወቀ ስህተት"
-
-#: src/protocols/yahoo/yahoo.c:1542
+#: src/protocols/yahoo/yahoo.c:1717
+msgid "Your account is locked, please log in to the yahoo website."
+msgstr ""
+
+#: src/protocols/yahoo/yahoo.c:1720
+#, fuzzy, c-format
+msgid "Unknown error number %d."
+msgstr "ያልታወቀ የስህተት ኮድ"
+
+#: src/protocols/yahoo/yahoo.c:1777
 #, c-format
 msgid "Could not add buddy %s to group %s to the server list on account %s."
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:1544
+#: src/protocols/yahoo/yahoo.c:1779
 msgid "Could not add buddy to server list"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:1646 src/protocols/yahoo/yahoo.c:1776
+#: src/protocols/yahoo/yahoo.c:1889 src/protocols/yahoo/yahoo.c:2020
 msgid "Unable to read"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:1801 src/protocols/yahoo/yahoo.c:1910
-#: src/protocols/yahoo/yahoo.c:1934
+#: src/protocols/yahoo/yahoo.c:2042 src/protocols/yahoo/yahoo.c:2152
+#: src/protocols/yahoo/yahoo.c:2195 src/protocols/yahoo/yahoochat.c:1360
+#: src/protocols/yahoo/yahoochat.c:1421
 #, fuzzy
 msgid "Connection problem"
 msgstr "ተገናኝቷል"
 
-#: src/protocols/yahoo/yahoo.c:2012 src/protocols/yahoo/yahoo.c:2310
-#: src/protocols/yahoo/yahoo.c:2408
+#: src/protocols/yahoo/yahoo.c:2279 src/protocols/yahoo/yahoo.c:2605
+#: src/protocols/yahoo/yahoo.c:2717
 msgid "Not At Home"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:2014 src/protocols/yahoo/yahoo.c:2312
-#: src/protocols/yahoo/yahoo.c:2409
+#: src/protocols/yahoo/yahoo.c:2281 src/protocols/yahoo/yahoo.c:2607
+#: src/protocols/yahoo/yahoo.c:2718
 msgid "Not At Desk"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:2016 src/protocols/yahoo/yahoo.c:2314
-#: src/protocols/yahoo/yahoo.c:2410
+#: src/protocols/yahoo/yahoo.c:2283 src/protocols/yahoo/yahoo.c:2609
+#: src/protocols/yahoo/yahoo.c:2719
 msgid "Not In Office"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:2020 src/protocols/yahoo/yahoo.c:2318
-#: src/protocols/yahoo/yahoo.c:2412
+#: src/protocols/yahoo/yahoo.c:2287 src/protocols/yahoo/yahoo.c:2613
+#: src/protocols/yahoo/yahoo.c:2721
 msgid "On Vacation"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:2024 src/protocols/yahoo/yahoo.c:2322
-#: src/protocols/yahoo/yahoo.c:2414
+#: src/protocols/yahoo/yahoo.c:2291 src/protocols/yahoo/yahoo.c:2617
+#: src/protocols/yahoo/yahoo.c:2723
 msgid "Stepped Out"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:2088 src/protocols/yahoo/yahoo.c:2122
+#: src/protocols/yahoo/yahoo.c:2355 src/protocols/yahoo/yahoo.c:2387
 #, fuzzy
 msgid "Not on server list"
 msgstr "ሰርቨርን የለም"
 
-#: src/protocols/yahoo/yahoo.c:2178
+#: src/protocols/yahoo/yahoo.c:2407
+#, fuzzy, c-format
+msgid ""
+"\n"
+"<b>%s:</b> %s"
+msgstr "<b>ሁኔታ፦</b> %s"
+
+#: src/protocols/yahoo/yahoo.c:2443
 #, fuzzy
 msgid "Join in Chat"
 msgstr "ውሪን አገጣጥም"
 
-#: src/protocols/yahoo/yahoo.c:2184
+#: src/protocols/yahoo/yahoo.c:2449
 #, fuzzy
 msgid "Initiate Conference"
 msgstr "የጌም ማውሪያ"
 
-#: src/protocols/yahoo/yahoo.c:2230
+#: src/protocols/yahoo/yahoo.c:2502
 msgid "Active which ID?"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:2241
-msgid "Activate ID"
-msgstr ""
-
-#: src/protocols/yahoo/yahoo.c:2599
+#: src/protocols/yahoo/yahoo.c:2510
+#, fuzzy
+msgid "Join who in chat?"
+msgstr "ውሪን አገጣጥም"
+
+#: src/protocols/yahoo/yahoo.c:2521
+msgid "Activate ID..."
+msgstr ""
+
+#: src/protocols/yahoo/yahoo.c:2527
+#, fuzzy
+msgid "Join user in chat..."
+msgstr "ውሪ አገጣጥም..."
+
+#: src/protocols/yahoo/yahoo.c:2916
 msgid ""
 "<b>Sorry, profiles marked as containing adult content are not supported at "
 "this time.</b><br><br>\n"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:2600 src/protocols/yahoo/yahoo.c:2620
+#: src/protocols/yahoo/yahoo.c:2917 src/protocols/yahoo/yahoo.c:2940
 msgid ""
 "If you wish to view this profile, you will need to visit this link in your "
 "web browser<br>"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:2619
+#: src/protocols/yahoo/yahoo.c:2939
 msgid ""
 "<b>Sorry, non-English profiles are not supported at this time.</b><br><br>\n"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:2664
+#: src/protocols/yahoo/yahoo.c:2987 src/protocols/yahoo/yahoo.c:2988
 msgid "Yahoo! ID"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:2724 src/protocols/yahoo/yahoo.c:2728
-#: src/protocols/yahoo/yahoo.c:2732
+#: src/protocols/yahoo/yahoo.c:3032 src/protocols/yahoo/yahoo.c:3035
+#: src/protocols/yahoo/yahoo.c:3038
 msgid "Hobbies"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:2743 src/protocols/yahoo/yahoo.c:2747
+#: src/protocols/yahoo/yahoo.c:3047 src/protocols/yahoo/yahoo.c:3050
 #, fuzzy
 msgid "Latest News"
 msgstr "የአባት ስም"
 
-#: src/protocols/yahoo/yahoo.c:2765
+#: src/protocols/yahoo/yahoo.c:3064
 #, fuzzy
 msgid "Home Page"
 msgstr "ድረ-ገጽ፦"
 
-#: src/protocols/yahoo/yahoo.c:2779
+#: src/protocols/yahoo/yahoo.c:3076
 msgid "Cool Link 1"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:2784
+#: src/protocols/yahoo/yahoo.c:3080
 msgid "Cool Link 2"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:2787
+#: src/protocols/yahoo/yahoo.c:3082
 msgid "Cool Link 3"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:2793
-msgid "Member Since"
-msgstr ""
-
 #. *< api_version
 #. *< type
 #. *< ui_requirement
@@ -7315,90 +8332,140 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/yahoo/yahoo.c:2958 src/protocols/yahoo/yahoo.c:2960
+#. *  description
+#: src/protocols/yahoo/yahoo.c:3294 src/protocols/yahoo/yahoo.c:3296
 msgid "Yahoo Protocol Plugin"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:2977
+#: src/protocols/yahoo/yahoo.c:3313
 msgid "Pager host"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:2982
+#: src/protocols/yahoo/yahoo.c:3316
 msgid "Pager port"
 msgstr ""
 
-#: src/protocols/yahoo/yahoochat.c:194
+#: src/protocols/yahoo/yahoo.c:3319
+msgid "File transfer host"
+msgstr ""
+
+#: src/protocols/yahoo/yahoo.c:3322
+msgid "File transfer port"
+msgstr ""
+
+#: src/protocols/yahoo/yahoo.c:3325
+#, fuzzy
+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 ""
 
-#: src/protocols/yahoo/yahoochat.c:196
+#: src/protocols/yahoo/yahoochat.c:200
 msgid "Invitation Rejected"
 msgstr ""
 
-#: src/protocols/yahoo/yahoochat.c:333
+#: src/protocols/yahoo/yahoochat.c:350
 msgid "Failed to join chat"
 msgstr ""
 
-#: src/protocols/yahoo/yahoochat.c:333
+#: src/protocols/yahoo/yahoochat.c:350
 msgid "Maybe the room is full?"
 msgstr ""
 
-#: src/protocols/yahoo/yahoochat.c:531
+#: src/protocols/yahoo/yahoochat.c:426
+#, c-format
+msgid "You are now chatting in %s."
+msgstr ""
+
+#: src/protocols/yahoo/yahoochat.c:580
 msgid "Failed to join buddy in chat"
 msgstr ""
 
-#: src/protocols/yahoo/yahoochat.c:532
+#: 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
+msgid "Fetching the room list failed."
+msgstr ""
+
+#: src/protocols/yahoo/yahoochat.c:1346
+msgid "Voices"
+msgstr ""
+
+#: src/protocols/yahoo/yahoochat.c:1349
+msgid "Webcams"
+msgstr ""
+
+#: src/protocols/yahoo/yahoochat.c:1360 src/protocols/yahoo/yahoochat.c:1421
+msgid "Unable to fetch room list."
+msgstr ""
+
+#: src/protocols/yahoo/yahoochat.c:1414
+#, fuzzy
+msgid "User Rooms"
+msgstr "ተጠቃሚ መርጫዎች"
+
+#: src/protocols/zephyr/zephyr.c:557
 #, fuzzy, c-format
 msgid "<b>User:</b> %s<br>"
 msgstr "<b>ሁኔታ፦</b> %s"
 
-#: src/protocols/zephyr/zephyr.c:346
+#: src/protocols/zephyr/zephyr.c:559
 #, fuzzy, c-format
 msgid "<b>Alias:</b> %s<br>"
 msgstr "<b>ሁኔታ፦</b> %s"
 
-#: src/protocols/zephyr/zephyr.c:348
+#: src/protocols/zephyr/zephyr.c:561
 msgid "<br>Hidden or not logged-in"
 msgstr ""
 
-#: src/protocols/zephyr/zephyr.c:352
+#: src/protocols/zephyr/zephyr.c:565
 #, c-format
 msgid "<br>At %s since %s"
 msgstr ""
 
-#: src/protocols/zephyr/zephyr.c:584 src/protocols/zephyr/zephyr.c:585
+#: src/protocols/zephyr/zephyr.c:831 src/protocols/zephyr/zephyr.c:832
 msgid "Anyone"
 msgstr ""
 
-#: src/protocols/zephyr/zephyr.c:609
+#: src/protocols/zephyr/zephyr.c:858
 msgid "Already logged in with Zephyr"
 msgstr ""
 
-#: src/protocols/zephyr/zephyr.c:610
+#: src/protocols/zephyr/zephyr.c:858
 msgid ""
 "Because Zephyr uses your system username, you are unable to have multiple "
 "accounts on it when logged in as the same user."
 msgstr ""
 
-#: src/protocols/zephyr/zephyr.c:868
+#: src/protocols/zephyr/zephyr.c:1164
 msgid "ZLocate"
 msgstr ""
 
-#: src/protocols/zephyr/zephyr.c:908
-msgid "Class:"
-msgstr ""
-
-#: src/protocols/zephyr/zephyr.c:913
-msgid "Instance:"
-msgstr ""
-
-#: src/protocols/zephyr/zephyr.c:918
-msgid "Recipient:"
+#: src/protocols/zephyr/zephyr.c:1206
+msgid "_Class:"
+msgstr ""
+
+#: src/protocols/zephyr/zephyr.c:1212
+msgid "_Instance:"
+msgstr ""
+
+#: src/protocols/zephyr/zephyr.c:1218
+msgid "_Recipient:"
 msgstr ""
 
 #. *< api_version
@@ -7411,137 +8478,267 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/zephyr/zephyr.c:1050 src/protocols/zephyr/zephyr.c:1052
+#. *  description
+#: src/protocols/zephyr/zephyr.c:1372 src/protocols/zephyr/zephyr.c:1374
 msgid "Zephyr Protocol Plugin"
 msgstr ""
 
-#: src/proxy.c:1681
+#: src/protocols/zephyr/zephyr.c:1391
+msgid "Export to .anyone"
+msgstr ""
+
+#: src/protocols/zephyr/zephyr.c:1394
+msgid "Export to .zephyr.subs"
+msgstr ""
+
+#: src/protocols/zephyr/zephyr.c:1397
+msgid "Exposure"
+msgstr ""
+
+#. Forbidden
+#: src/proxy.c:955
+msgid "Access denied: proxy server forbids port 80 tunnelling."
+msgstr ""
+
+#: src/proxy.c:957
+#, fuzzy, c-format
+msgid "Proxy connection error %d"
+msgstr "ተገናኝቷል"
+
+#: src/proxy.c:1696
 msgid "Invalid proxy settings"
 msgstr ""
 
-#: src/proxy.c:1681
+#: src/proxy.c:1696
 msgid ""
 "Either the host name or port number specified for your given proxy type is "
 "invalid."
 msgstr ""
 
 #. * Custom away message.
-#: src/prpl.h:187
+#: src/prpl.h:194
 msgid "Custom"
 msgstr "የተለየ"
 
 #. *
 #. * A wrapper for gaim_request_action() that uses Accept and Cancel buttons.
 #.
-#: src/request.h:862
+#: src/request.h:1250
 msgid "Accept"
 msgstr ""
 
-#: src/server.c:56
+#: src/server.c:58
 msgid "Please enter your password"
 msgstr ""
 
-#: src/server.c:949
+#: src/server.c:962
 #, fuzzy, c-format
 msgid "(%d message)"
 msgid_plural "(%d messages)"
 msgstr[0] "(%d መልዕክቶች)"
 msgstr[1] "(%d መልዕክቶች)"
 
-#: src/server.c:962
+#: src/server.c:976
 msgid "(1 message)"
 msgstr "(1 መልዕክት)"
 
-#: src/server.c:1145 src/server.c:1155
+#: src/server.c:1160 src/server.c:1170
 #, c-format
 msgid "%s logged in."
 msgstr ""
 
-#: src/server.c:1172 src/server.c:1180
+#: src/server.c:1184
+#, c-format
+msgid "%s signed on"
+msgstr ""
+
+#: src/server.c:1200
+#, c-format
+msgid "%s came back"
+msgstr ""
+
+#: src/server.c:1202
+#, c-format
+msgid "%s went away"
+msgstr ""
+
+#: src/server.c:1217
+#, c-format
+msgid "%s became idle"
+msgstr ""
+
+#: src/server.c:1231
+#, c-format
+msgid "%s became unidle"
+msgstr ""
+
+#: src/server.c:1244 src/server.c:1252
 #, c-format
 msgid "%s logged out."
 msgstr ""
 
-#: src/server.c:1227
+#: src/server.c:1267
+#, fuzzy, c-format
+msgid "%s signed off"
+msgstr "ጌም -  ምልክትን አስቀምጥ"
+
+#: src/server.c:1317
 #, c-format
 msgid ""
 "%s has just been warned by %s.\n"
 "Your new warning level is %d%%"
 msgstr ""
 
-#: src/server.c:1230
+#: src/server.c:1320
 msgid "an anonymous person"
 msgstr ""
 
-#: src/server.c:1333
+#: src/server.c:1430
 #, c-format
 msgid ""
 "User '%s' invites %s to buddy chat room: '%s'\n"
 "%s"
 msgstr ""
 
-#: src/server.c:1337
+#: src/server.c:1434
 #, c-format
 msgid "User '%s' invites %s to buddy chat room: '%s'\n"
 msgstr ""
 
-#: src/server.c:1343
+#: src/server.c:1440
 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:84
+#: src/stock.c:86
+msgid "_Alias"
+msgstr ""
+
+#: src/stock.c:88
 msgid "_Modify"
 msgstr "ለውጡ (_M)"
 
-#: src/stock.c:85
+#: src/stock.c:89
 #, fuzzy
 msgid "_Open Mail"
 msgstr "እሜይልን ክፈት"
 
-#: src/util.c:1527
+#: src/stock.c:91
+msgid "_Warn"
+msgstr ""
+
+#: src/util.c:2040
 msgid "Calculating..."
 msgstr ""
 
-#: src/util.c:1530
+#: src/util.c:2043
 msgid "Unknown."
 msgstr "ያልታወቀ።"
 
-#: src/util.c:1561 src/util.c:1566 src/util.c:1571 src/util.c:1574
+#: src/util.c:2074 src/util.c:2079 src/util.c:2084 src/util.c:2087
 msgid "day"
 msgid_plural "days"
 msgstr[0] "ቀን"
 msgstr[1] "ቀን"
 
-#: src/util.c:1562 src/util.c:1566 src/util.c:1580 src/util.c:1582
+#: src/util.c:2075 src/util.c:2079 src/util.c:2093 src/util.c:2095
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "ሰዓት"
 msgstr[1] "ሰዓት"
 
-#: src/util.c:1562 src/util.c:1571 src/util.c:1580 src/util.c:1585
+#: src/util.c:2075 src/util.c:2084 src/util.c:2093 src/util.c:2098
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "ደቂቃ"
 msgstr[1] "ደቂቃ"
 
-#: src/util.c:1917
+#: src/util.c:2430
 msgid "g003: Error opening connection.\n"
 msgstr ""
 
-#: src/win32/win32dep.c:474
+#: src/win32/win32dep.c:272
+msgid "Moving Gaim Settings.."
+msgstr ""
+
+#: src/win32/win32dep.c:275
+msgid "Moving Gaim user settings to: "
+msgstr ""
+
+#: src/win32/win32dep.c:277
 msgid "Notification"
 msgstr ""
 
-#: src/win32/win32dep.c:475
-msgid "Moving Gaim user settings directory to:"
-msgstr ""
+#~ msgid "(No"
+#~ msgstr "(አይ"
+
+#~ msgid "_Screenname:"
+#~ msgstr "እስክሪን ስም፦ (_S)"
+
+#, fuzzy
+#~ msgid "Log"
+#~ msgstr "ዝምብለህ ይግባ"
+
+#~ msgid "Clear"
+#~ msgstr "ሰርዝ"
+
+#~ msgid "Gaim - Information"
+#~ msgstr "ጌም - መረጃ"
+
+#, fuzzy
+#~ msgid "Add a new group"
+#~ msgstr "መድረክ ጨምር"
+
+#~ msgid "Gaim - Insert Image"
+#~ msgstr "ጌም - ምስል አስገባ"
+
+#~ msgid "_Host"
+#~ msgstr "እንግዳ ተቀባይ (_H)"
+
+#~ msgid "Pa_ssword"
+#~ msgstr "ሚስጢራዊ ቃል (_S)"
+
+#~ msgid "Browser Options"
+#~ msgstr "የመቃኛ ምርጫዎች"
+
+#~ msgid "Gaim - Save Icon"
+#~ msgstr "ጌም -  ምልክትን አስቀምጥ"
+
+#, fuzzy
+#~ msgid "Disconnected"
+#~ msgstr "ተገናኝቷል"
+
+#, fuzzy
+#~ msgid "Username: <b>%s</b><br>\n"
+#~ msgstr "<b>ሁኔታ፦</b> %s"
+
+#, fuzzy
+#~ msgid "<b>Available:</b> "
+#~ msgstr ""
+#~ "\n"
+#~ "<b>ቅጽል ስም፦</b>"
+
+#, fuzzy
+#~ msgid "<b>Away Message:</b> "
+#~ msgstr ""
+#~ "\n"
+#~ "<b>ቅጽል ስም፦</b>"
+
+#, fuzzy
+#~ msgid "<b>Status:</b> Not Authorized"
+#~ msgstr ""
+#~ "\n"
+#~ "<b>ሁኔታ፦</b>"
+
+#, fuzzy
+#~ msgid "Unknown error."
+#~ msgstr "ያልታወቀ ስህተት"
 
 #, fuzzy
 #~ msgid "Event Test"
@@ -7550,13 +8747,6 @@
 #~ msgid "Appl_y"
 #~ msgstr "ተጠቀም (_Y)"
 
-#, fuzzy
-#~ msgid "User"
-#~ msgstr "ተጠቃሚ (_U)"
-
-#~ msgid "IRC Error"
-#~ msgstr "የIRC ስህተት"
-
 #~ msgid "IRC CTCP info"
 #~ msgstr "የIRC CTCP መረጃ"
 
@@ -7578,9 +8768,6 @@
 #~ msgid "First Name:"
 #~ msgstr "ስም፦"
 
-#~ msgid "Last Name:"
-#~ msgstr "የአባት ስም፦"
-
 #~ msgid "Birthday:"
 #~ msgstr "የልደት በዓል፦"
 
@@ -7593,15 +8780,9 @@
 #~ msgid "State:"
 #~ msgstr "ሁኔታ፦"
 
-#~ msgid "_Group:"
-#~ msgstr "መድረክ፦ (_G)"
-
 #~ msgid "Group"
 #~ msgstr "መድረክ"
 
-#~ msgid "Screenname"
-#~ msgstr "እስክሪን ስም"
-
 #, fuzzy
 #~ msgid "Gaim - Popup"
 #~ msgstr "ጌም - ክፈት..."
@@ -7612,15 +8793,9 @@
 #~ msgid "Preferences..."
 #~ msgstr "ምርጫዎች..."
 
-#~ msgid "Chat Rooms"
-#~ msgstr "የውሪ ቤቶች"
-
 #~ msgid "Refresh"
 #~ msgstr "በድጋሚ ጀምር"
 
-#~ msgid "<b>Status:</b> %s%s%s"
-#~ msgstr "<b>ሁኔታ፦</b> %s%s%s"
-
 #~ msgid "%dh%02dm"
 #~ msgstr "%dh%02dm"
 
@@ -7630,9 +8805,6 @@
 #~ msgid "Gaim - Save Image"
 #~ msgstr "ጌም - ምስሉን አስቀምት"
 
-#~ msgid "_Password"
-#~ msgstr "ሚስጢራዊ ቃል (_P)"
-
 #~ msgid ""
 #~ "%s\n"
 #~ "%s: %s"
@@ -7652,9 +8824,6 @@
 #~ msgid "No Subject"
 #~ msgstr "ጉዳዩ የለም"
 
-#~ msgid "New"
-#~ msgstr "አዲስ"
-
 #~ msgid "Exit"
 #~ msgstr "ውጣ"
 
--- a/po/bg.po	Wed Apr 21 06:48:16 2004 +0000
+++ b/po/bg.po	Wed Apr 21 15:18:24 2004 +0000
@@ -6,7 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Gaim 0.60\n"
-"POT-Creation-Date: 2003-10-09 15:23-0700\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2004-04-20 21:45-0400\n"
 "PO-Revision-Date: 2002-04-16 04:54+0200\n"
 "Last-Translator: Hristo Todorov <igel@bofh.bg>\n"
 "Language-Team: Bulgarian <bg@li.org>\n"
@@ -22,7 +23,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/autorecon.c:105
+#: plugins/autorecon.c:110
 #, fuzzy
 msgid "Auto-Reconnect"
 msgstr "Не мога да се свържа"
@@ -30,7 +31,8 @@
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/autorecon.c:108 plugins/autorecon.c:110
+#. *  description
+#: plugins/autorecon.c:113 plugins/autorecon.c:115
 msgid "When you are kicked offline, this reconnects you."
 msgstr ""
 
@@ -53,6 +55,70 @@
 msgid "Check email every X seconds.\n"
 msgstr ""
 
+#: plugins/contact_priority.c:82
+msgid "Point values to use when..."
+msgstr ""
+
+#: plugins/contact_priority.c:91
+#, fuzzy
+msgid "Buddy is offline:"
+msgstr "Файл за икона:"
+
+#: plugins/contact_priority.c:105
+#, fuzzy
+msgid "Buddy is away:"
+msgstr "Авери - показване"
+
+#: plugins/contact_priority.c:119
+#, fuzzy
+msgid "Buddy is idle:"
+msgstr "Файл за икона:"
+
+#: plugins/contact_priority.c:133
+msgid "Use last matching buddy"
+msgstr ""
+
+#. Explanation
+#: plugins/contact_priority.c:139
+msgid ""
+"The buddy with the lowest score is the buddy who will have priority in the "
+"contact.\n"
+"The default values (offline = 4,away = 2, and idle = 1)\n"
+"will use what used to be the built-in order active->idle->away->away+idle-"
+">offline."
+msgstr ""
+
+#: plugins/contact_priority.c:142
+msgid "Point values to use for Account..."
+msgstr ""
+
+#. *< api_version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: plugins/contact_priority.c:191
+#, fuzzy
+msgid "Contact Priority"
+msgstr "Контакт"
+
+#. *< name
+#. *< version
+#. *< summary
+#: plugins/contact_priority.c:194
+msgid ""
+"Allows for controlling the values associated with different buddy states."
+msgstr ""
+
+#. *< description
+#: plugins/contact_priority.c:196
+msgid ""
+"Allows for changing the point values of idle/away/offline states for buddies "
+"in contact priority computations."
+msgstr ""
+
 #.
 #. *  DEFINES, MACROS & DATA TYPES
 #.
@@ -71,7 +137,7 @@
 msgid "Gaim - Away"
 msgstr "Gaim - Отсъствие!"
 
-#: plugins/docklet/docklet.c:114 src/gtkaccount.c:482 src/gtkaccount.c:1765
+#: plugins/docklet/docklet.c:114 src/gtkaccount.c:497 src/gtkaccount.c:1891
 #, fuzzy
 msgid "Auto-login"
 msgstr "Авто влизане"
@@ -90,16 +156,19 @@
 msgid "New..."
 msgstr ""
 
-#: plugins/docklet/docklet.c:153 src/gtkblist.c:1916 src/gtkpounce.c:461
-#: src/gtkprefs.c:1473 src/protocols/gg/gg.c:51 src/protocols/irc/msgs.c:187
-#: src/protocols/jabber/jabber.c:868 src/protocols/jabber/jutil.c:97
-#: src/protocols/jabber/presence.c:81 src/protocols/oscar/oscar.c:2833
-#: src/protocols/oscar/oscar.c:4529 src/protocols/oscar/oscar.c:5464
-#: src/protocols/oscar/oscar.c:6064
+#: plugins/docklet/docklet.c:153 src/gtkprefs.c:1626 src/protocols/gg/gg.c:51
+#: src/protocols/irc/msgs.c:187 src/protocols/jabber/jabber.c:952
+#: src/protocols/jabber/jutil.c:32 src/protocols/jabber/presence.c:63
+#: src/protocols/jabber/presence.c:119 src/protocols/novell/novell.c:2144
+#: src/protocols/novell/novell.c:2259 src/protocols/novell/novell.c:2311
+#: src/protocols/oscar/oscar.c:520 src/protocols/oscar/oscar.c:4825
+#: src/protocols/oscar/oscar.c:5808 src/protocols/oscar/oscar.c:6426
 msgid "Away"
 msgstr "Отсъствие"
 
-#: plugins/docklet/docklet.c:159 src/away.c:515
+#. else...
+#: plugins/docklet/docklet.c:159 src/away.c:522
+#: src/protocols/oscar/oscar.c:4743 src/protocols/oscar/oscar.c:6434
 msgid "Back"
 msgstr "Връщане"
 
@@ -108,18 +177,18 @@
 msgid "Mute Sounds"
 msgstr "Звук"
 
-#: plugins/docklet/docklet.c:172 src/gtkft.c:559
+#: plugins/docklet/docklet.c:172 src/gtkft.c:605
 #, fuzzy
 msgid "File Transfers"
 msgstr "Не мога да пиша"
 
 #. And now for the buttons
-#: plugins/docklet/docklet.c:173 src/gtkaccount.c:1924 src/main.c:323
+#: plugins/docklet/docklet.c:173 src/gtkaccount.c:2070 src/main.c:286
 #, fuzzy
 msgid "Accounts"
 msgstr "Акаунт"
 
-#: plugins/docklet/docklet.c:174 src/gtkprefs.c:2337 src/main.c:333
+#: plugins/docklet/docklet.c:174 src/gtkprefs.c:2576 src/main.c:292
 #, fuzzy
 msgid "Preferences"
 msgstr "Настройки"
@@ -175,37 +244,50 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/filectl.c:201
+#: plugins/filectl.c:222
 msgid "Gaim File Control"
 msgstr ""
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/filectl.c:204 plugins/filectl.c:206
+#. *  description
+#: plugins/filectl.c:225 plugins/filectl.c:227
 msgid "Allows you to control Gaim by entering commands in a file."
 msgstr ""
 
-#: plugins/gaim-remote/remote.c:88
+#: plugins/gaim-remote/remote.c:89
 #, fuzzy
 msgid "Not connected to AIM"
 msgstr "Не мога да се свържа"
 
-#: plugins/gaim-remote/remote.c:97 plugins/gaim-remote/remote.c:136
+#: plugins/gaim-remote/remote.c:98 plugins/gaim-remote/remote.c:137
 #, fuzzy
 msgid "No screenname given."
 msgstr "Не е зададен прякор"
 
-#: plugins/gaim-remote/remote.c:173
+#: plugins/gaim-remote/remote.c:174
 #, fuzzy
 msgid "No roomname given."
 msgstr "Не е дадена причина."
 
-#: plugins/gaim-remote/remote.c:192
+#: plugins/gaim-remote/remote.c:193
 #, fuzzy
 msgid "Invalid AIM URI"
 msgstr "Невалидно име"
 
+#: plugins/gaim-remote/remote.c:651
+#, fuzzy, c-format
+msgid ""
+"Failed to assign %s to a socket:\n"
+"%s"
+msgstr "Не мога да чета файл %s"
+
+#: plugins/gaim-remote/remote.c:674
+#, fuzzy
+msgid "Unable to open socket"
+msgstr "Не мога да чета от socket"
+
 #. *< api_version
 #. *< type
 #. *< ui_requirement
@@ -213,19 +295,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/gaim-remote/remote.c:714
+#: plugins/gaim-remote/remote.c:722
 msgid "Remote Control"
 msgstr ""
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/gaim-remote/remote.c:717
+#: plugins/gaim-remote/remote.c:725
 msgid "Provides remote control for gaim applications."
 msgstr ""
 
 #. *  description
-#: plugins/gaim-remote/remote.c:719
+#: plugins/gaim-remote/remote.c:727
 msgid ""
 "Gives Gaim the ability to be remote-controlled through third-party "
 "applications or through the gaim-remote tool."
@@ -238,7 +320,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/gaiminc.c:81
+#: plugins/gaiminc.c:87
 #, fuzzy
 msgid "Gaim Demonstration Plugin"
 msgstr "Gaim - Регистрация"
@@ -246,12 +328,12 @@
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/gaiminc.c:84
+#: plugins/gaiminc.c:90
 msgid "An example plugin that does stuff - see the description."
 msgstr ""
 
 #. *  description
-#: plugins/gaiminc.c:86
+#: plugins/gaiminc.c:92
 msgid ""
 "This is a really cool plugin that does a lot of stuff:\n"
 "- It tells you who wrote the program when you log in\n"
@@ -306,50 +388,189 @@
 "Drag up and then to the right to switch to the next conversation."
 msgstr ""
 
-#: plugins/gtik.c:719
-msgid "Gnome Stock Ticker Properties"
-msgstr ""
-
-#: plugins/gtik.c:731
-msgid "Update Frequency in min"
-msgstr ""
-
-#: plugins/gtik.c:747
-msgid "Enter symbols delimited with \"+\" in the box below."
-msgstr ""
-
-#. OUTPUT FORMAT and SCROLL DIRECTION
-#: plugins/gtik.c:757
-msgid "Check this box to display only symbols and price:"
-msgstr ""
-
-#: plugins/gtik.c:758
-msgid "Check this box to scroll left to right:"
-msgstr ""
-
-#: plugins/gtik.c:994
-#, fuzzy
-msgid "(No"
-msgstr "Не"
-
-#: plugins/gtik.c:995
-#, fuzzy
-msgid "Change"
-msgstr "Канал:"
-
-#: plugins/history.c:98
+#: 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:2964 src/gtkprefs.c:873 src/gtkprefs.c:1654
+#: src/protocols/jabber/jabber.c:916
+msgid "None"
+msgstr "Не показва"
+
+#: plugins/gevolution/add_buddy_dialog.c:190
+#: plugins/gevolution/assoc-buddy.c:180 src/gtkprefs.c:1991
+#: src/gtkroomlist.c:561 src/protocols/jabber/jabber.c:591
+#: src/protocols/msn/msn.c:1395 src/protocols/trepia/trepia.c:398
+#, fuzzy
+msgid "Name"
+msgstr "Псевдоним"
+
+#: 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:6697
+msgid "Search"
+msgstr ""
+
+#: plugins/gevolution/add_buddy_dialog.c:566
+#: plugins/gevolution/new_person_dialog.c:310 src/gtkblist.c:3982
+#: src/gtkblist.c:4310
+#, fuzzy
+msgid "Group:"
+msgstr "Група"
+
+#. "New Person" button
+#: plugins/gevolution/add_buddy_dialog.c:592
+#: plugins/gevolution/assoc-buddy.c:488
+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 ""
+
+#. Add the disclosure
+#: plugins/gevolution/assoc-buddy.c:451
+#, fuzzy
+msgid "Show user details"
+msgstr "Прокси"
+
+#: plugins/gevolution/assoc-buddy.c:452
+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:685 src/blist.c:872 src/blist.c:2105 src/gtkblist.c:3807
+#: src/protocols/jabber/roster.c:66 src/protocols/msn/notification.c:793
+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 "Gaim - Звук - конфигуриране"
+
+#. 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
+#, fuzzy
+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
+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:320
+#: src/protocols/oscar/oscar.c:425
+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:70
 msgid "History"
 msgstr ""
 
-#: plugins/history.c:100
+#: plugins/history.c:72
 #, fuzzy
 msgid "Shows recently logged conversations in new conversations."
 msgstr "Всички разговори в един прозорец с етикети"
 
-#: plugins/history.c:101
-msgid ""
-"When a new conversation is opened this plugin will insert the last XXX of "
-"the last conversation into the current conversation."
+#: plugins/history.c:73
+msgid ""
+"When a new conversation is opened this plugin will insert the last "
+"conversation into the current conversation."
 msgstr ""
 
 #. *< api_version
@@ -366,6 +587,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 ""
@@ -384,7 +606,7 @@
 msgid "idle for"
 msgstr ""
 
-#: plugins/idle.c:90 plugins/timestamp.c:88
+#: plugins/idle.c:90 plugins/timestamp.c:109
 #, fuzzy
 msgid "minutes."
 msgstr "минути използвани"
@@ -451,14 +673,18 @@
 msgid "Test plugin IPC support, as a server. This registers the IPC commands."
 msgstr ""
 
-#: plugins/mailchk.c:156
+#: plugins/mailchk.c:157
 msgid "Mail Checker"
 msgstr ""
 
-#: plugins/mailchk.c:158 plugins/mailchk.c:159
+#: plugins/mailchk.c:159
 msgid "Checks for new local mail."
 msgstr ""
 
+#: plugins/mailchk.c:160
+msgid "Adds a small box to the buddy list that shows if you have new mail."
+msgstr ""
+
 #. ---------- "Notify For" ----------
 #: plugins/notify.c:572
 msgid "Notify For"
@@ -546,6 +772,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 ""
@@ -557,13 +784,14 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/perl/perl.c:524
+#: plugins/perl/perl.c:530
 msgid "Perl Plugin Loader"
 msgstr ""
 
 #. *< 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 ""
 
@@ -581,6 +809,30 @@
 "'Enter' in the entry box to send. Watch the debug window."
 msgstr ""
 
+#: plugins/relnot.c:62
+#, c-format
+msgid "You are using Gaim version %s.  The current version is %s.<hr>"
+msgstr ""
+
+#: plugins/relnot.c:68
+#, c-format
+msgid ""
+"<b>ChangeLog:</b>\n"
+"%s<br><br>"
+msgstr ""
+
+#: plugins/relnot.c:73
+#, c-format
+msgid ""
+"You can get version %s from:<br><a href=\"http://gaim.sourceforge.net/"
+"\">http://gaim.sourceforge.net</a>."
+msgstr ""
+
+#: plugins/relnot.c:77 plugins/relnot.c:78
+#, fuzzy
+msgid "New Version Available"
+msgstr "Недостъпен"
+
 #. *< api_version
 #. *< type
 #. *< ui_requirement
@@ -588,14 +840,41 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/signals-test.c:502
+#: plugins/relnot.c:134
+#, fuzzy
+msgid "Release Notification"
+msgstr "Показващо се известяване"
+
+#. *< name
+#. *< version
+#. *  summary
+#: plugins/relnot.c:137
+msgid "Checks periodically for new releases."
+msgstr ""
+
+#. *  description
+#: plugins/relnot.c:139
+msgid ""
+"Checks periodically for new releases and notifies the user with the "
+"ChangeLog."
+msgstr ""
+
+#. *< api_version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: plugins/signals-test.c:465
 msgid "Signals Test"
 msgstr ""
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/signals-test.c:505 plugins/signals-test.c:507
+#. *  description
+#: plugins/signals-test.c:468 plugins/signals-test.c:470
 msgid "Test to see that all signals are working properly."
 msgstr ""
 
@@ -614,6 +893,7 @@
 #. *< name
 #. *< version
 #. *  summary
+#. *  description
 #: plugins/simple.c:34 plugins/simple.c:36
 msgid "Tests to see that most things are working."
 msgstr ""
@@ -661,14 +941,15 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/ssl/ssl-gnutls.c:190
+#: plugins/ssl/ssl-gnutls.c:223
 msgid "GNUTLS"
 msgstr ""
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/ssl/ssl-gnutls.c:193 plugins/ssl/ssl-gnutls.c:195
+#. *  description
+#: plugins/ssl/ssl-gnutls.c:226 plugins/ssl/ssl-gnutls.c:228
 msgid "Provides SSL support through GNUTLS."
 msgstr ""
 
@@ -679,14 +960,15 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/ssl/ssl-nss.c:287
+#: plugins/ssl/ssl-nss.c:312
 msgid "NSS"
 msgstr ""
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/ssl/ssl-nss.c:290 plugins/ssl/ssl-nss.c:292
+#. *  description
+#: plugins/ssl/ssl-nss.c:315 plugins/ssl/ssl-nss.c:317
 msgid "Provides SSL support through Mozilla NSS."
 msgstr ""
 
@@ -704,11 +986,12 @@
 #. *< name
 #. *< version
 #. *  summary
+#. *  description
 #: plugins/ssl/ssl.c:94 plugins/ssl/ssl.c:96
 msgid "Provides a wrapper around SSL support libraries."
 msgstr ""
 
-#: plugins/statenotify.c:30 src/gtkpounce.c:843
+#: plugins/statenotify.c:30 src/gtkpounce.c:820
 #, c-format
 msgid "%s has gone away."
 msgstr ""
@@ -743,18 +1026,19 @@
 #. *< 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:344
+#: plugins/tcl/tcl.c:349
 #, fuzzy
 msgid "Tcl Plugin Loader"
 msgstr "Грешка при влизане"
 
-#: plugins/tcl/tcl.c:346 plugins/tcl/tcl.c:347
+#: plugins/tcl/tcl.c:351 plugins/tcl/tcl.c:352
 msgid "Provides support for loading Tcl plugins"
 msgstr ""
 
@@ -765,7 +1049,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/ticker/ticker.c:74 plugins/ticker/ticker.c:330
+#: plugins/ticker/ticker.c:74 plugins/ticker/ticker.c:328
 #, fuzzy
 msgid "Buddy Ticker"
 msgstr "Показва авер Ticker"
@@ -773,21 +1057,22 @@
 #. *< 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 ""
 
-#: plugins/timestamp.c:74
+#: plugins/timestamp.c:95
 #, fuzzy
 msgid "iChat Timestamp"
 msgstr "Тест"
 
-#: plugins/timestamp.c:81
+#: plugins/timestamp.c:102
 #, fuzzy
 msgid "Delay"
 msgstr "Отхвърляне"
 
-#: plugins/timestamp.c:94
+#: plugins/timestamp.c:115
 msgid "_Apply"
 msgstr ""
 
@@ -798,7 +1083,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/timestamp.c:150
+#: plugins/timestamp.c:173
 #, fuzzy
 msgid "Timestamp"
 msgstr "Тест"
@@ -806,7 +1091,8 @@
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/timestamp.c:153 plugins/timestamp.c:155
+#. *  description
+#: plugins/timestamp.c:176 plugins/timestamp.c:178
 msgid "Adds iChat-style timestamps to conversations every N minutes."
 msgstr ""
 
@@ -833,7 +1119,7 @@
 msgstr "Показва влизанията в прозореца"
 
 #. Buddy List trans options
-#: plugins/win32/transparency/win2ktrans.c:365 src/gtkprefs.c:845
+#: plugins/win32/transparency/win2ktrans.c:365 src/gtkprefs.c:876
 msgid "Buddy List Window"
 msgstr "Прозорец на листа"
 
@@ -856,6 +1142,7 @@
 #. *< name
 #. *< version
 #. *  summary
+#. *  description
 #: plugins/win32/transparency/win2ktrans.c:425
 #: plugins/win32/transparency/win2ktrans.c:427
 msgid ""
@@ -879,8 +1166,8 @@
 msgstr ""
 
 #. Buddy List
-#: plugins/win32/winprefs/winprefs.c:366 src/gtkblist.c:1756
-#: src/gtkprefs.c:2270
+#: plugins/win32/winprefs/winprefs.c:366 src/gtkblist.c:3005
+#: src/gtkprefs.c:2490
 msgid "Buddy List"
 msgstr "Лист"
 
@@ -902,8 +1189,8 @@
 msgstr "Прозорец на листа"
 
 #. Conversations
-#: plugins/win32/winprefs/winprefs.c:386 src/gtkprefs.c:894
-#: src/gtkprefs.c:2271
+#: plugins/win32/winprefs/winprefs.c:386 src/gtkprefs.c:914
+#: src/gtkprefs.c:2491 src/protocols/msn/msn.c:1621
 msgid "Conversations"
 msgstr "Разговори"
 
@@ -920,12 +1207,16 @@
 msgid "Options specific to Windows Gaim."
 msgstr ""
 
-#: src/about.c:57
-#, c-format
-msgid "About Gaim v%s"
-msgstr "Относно Gaim в%s"
-
-#: src/about.c:89
+#: src/about.c:59
+msgid "About Gaim"
+msgstr "Относно Gaim"
+
+#: src/about.c:74
+#, c-format
+msgid "<span weight=\"bold\" size=\"larger\">Gaim v%s</span>"
+msgstr ""
+
+#: src/about.c:94
 #, fuzzy
 msgid ""
 "Gaim is a modular Instant Messaging client capable of using AIM, ICQ, "
@@ -937,40 +1228,40 @@
 "\n"
 "URL: "
 
-#: src/about.c:99
-msgid "<FONT SIZE=\"3\">IRC:</FONT> #gaim on irc.freenode.net<BR><BR>"
-msgstr ""
-
 #: src/about.c:104
+msgid "<FONT SIZE=\"4\">IRC:</FONT> #gaim on irc.freenode.net<BR><BR>"
+msgstr ""
+
+#: src/about.c:109
 msgid "Active Developers"
 msgstr ""
 
-#: src/about.c:105
+#: src/about.c:110
 #, fuzzy
 msgid "maintainer"
 msgstr "минути използвани"
 
-#: src/about.c:107
+#: src/about.c:112
 msgid "lead developer"
 msgstr ""
 
-#: src/about.c:110
+#: src/about.c:115
 msgid "developer & webmaster"
 msgstr ""
 
-#: src/about.c:111
+#: src/about.c:116
 msgid "win32 port"
 msgstr ""
 
-#: src/about.c:114 src/about.c:115 src/about.c:116
+#: src/about.c:119 src/about.c:120 src/about.c:121
 msgid "developer"
 msgstr ""
 
-#: src/about.c:117
+#: src/about.c:122
 msgid "support"
 msgstr ""
 
-#: src/about.c:124
+#: src/about.c:129
 msgid "Crazy Patch Writers"
 msgstr ""
 
@@ -1007,11 +1298,11 @@
 msgid "Current Translators"
 msgstr ""
 
-#: src/about.c:163 src/about.c:192
+#: src/about.c:163 src/about.c:197
 msgid "Catalan"
 msgstr ""
 
-#: src/about.c:164 src/about.c:193
+#: src/about.c:164 src/about.c:198
 msgid "Czech"
 msgstr ""
 
@@ -1019,146 +1310,162 @@
 msgid "Danish"
 msgstr ""
 
-#: src/about.c:166 src/about.c:194
+#: src/about.c:166
+msgid "British English"
+msgstr ""
+
+#: src/about.c:167 src/about.c:199
 msgid "German"
 msgstr ""
 
-#: src/about.c:167 src/about.c:195
+#: src/about.c:168 src/about.c:200
 msgid "Spanish"
 msgstr ""
 
-#: src/about.c:168 src/about.c:196
+#: src/about.c:169 src/about.c:201
+msgid "Finnish"
+msgstr ""
+
+#: src/about.c:170 src/about.c:202
 msgid "French"
 msgstr ""
 
-#: src/about.c:169
+#: src/about.c:171
 #, fuzzy
 msgid "Hindi"
 msgstr "Криене на икона"
 
-#: src/about.c:170
+#: src/about.c:172
 msgid "Hungarian"
 msgstr ""
 
-#: src/about.c:171 src/about.c:198
+#: src/about.c:173 src/about.c:204
 #, fuzzy
 msgid "Italian"
 msgstr "Наклонен"
 
-#: src/about.c:172 src/about.c:200
+#: src/about.c:174 src/about.c:206
 msgid "Korean"
 msgstr ""
 
-#: src/about.c:173
-msgid "Dutch; Flemish"
-msgstr ""
-
-#: src/about.c:174 src/about.c:202
-#, fuzzy
-msgid "Polish"
-msgstr "Плъгини"
-
 #: src/about.c:175
-msgid "Portuguese-Brazil"
+msgid "Dutch; Flemish"
 msgstr ""
 
 #: src/about.c:176
-msgid "Portuguese-Portugal"
+msgid "Macedonian"
 msgstr ""
 
 #: src/about.c:177
-msgid "Romanian"
-msgstr ""
-
-#: src/about.c:178 src/about.c:203
-msgid "Russian"
-msgstr ""
+msgid "Norwegian"
+msgstr ""
+
+#: src/about.c:178 src/about.c:207
+#, fuzzy
+msgid "Polish"
+msgstr "Плъгини"
 
 #: src/about.c:179
-msgid "Serbian"
-msgstr ""
-
-#: src/about.c:180 src/about.c:205
-msgid "Swedish"
+msgid "Portuguese"
+msgstr ""
+
+#: src/about.c:180
+msgid "Portuguese-Brazil"
 msgstr ""
 
 #: src/about.c:181
+msgid "Romanian"
+msgstr ""
+
+#: src/about.c:182 src/about.c:208
+msgid "Russian"
+msgstr ""
+
+#: src/about.c:183
+msgid "Serbian"
+msgstr ""
+
+#: src/about.c:184 src/about.c:210
+msgid "Swedish"
+msgstr ""
+
+#: src/about.c:185
+#, fuzzy
+msgid "Vietnamese"
+msgstr "Преименуване"
+
+#: src/about.c:185
+msgid "Gnome Vi Team"
+msgstr ""
+
+#: src/about.c:186
 msgid "Simplified Chinese"
 msgstr ""
 
-#: src/about.c:182
+#: src/about.c:187
 msgid "Traditional Chinese"
 msgstr ""
 
-#: src/about.c:189
+#: src/about.c:194
 msgid "Past Translators"
 msgstr ""
 
-#: src/about.c:190
+#: src/about.c:195
 msgid "Amharic"
 msgstr ""
 
-#: src/about.c:191
+#: src/about.c:196
 msgid "Bulgarian"
 msgstr ""
 
-#: src/about.c:197
+#: src/about.c:203
 msgid "Hebrew"
 msgstr ""
 
-#: src/about.c:199
+#: src/about.c:205
 msgid "Japanese"
 msgstr ""
 
-#: src/about.c:201
-msgid "Norwegian"
-msgstr ""
-
-#: src/about.c:204
+#: src/about.c:209
 msgid "Slovak"
 msgstr ""
 
-#: src/about.c:206
+#: src/about.c:211
 #, fuzzy
 msgid "Chinese"
 msgstr "Канал:"
 
-#: src/about.c:219 src/dialogs.c:2290 src/gtkrequest.c:205
-#: src/protocols/msn/msn.c:247
-msgid "Close"
-msgstr "Затваряне"
-
-#: src/account.c:265 src/protocols/jabber/jabber.c:918
+#: src/account.c:279 src/protocols/jabber/jabber.c:993
 #, fuzzy
 msgid "New passwords do not match."
 msgstr "Паролите не съвпадат"
 
-#: src/account.c:273
+#: src/account.c:288
 #, fuzzy
 msgid "Fill out all fields completely."
 msgstr "Въведете всички полета"
 
-#: src/account.c:298
+#: src/account.c:313
 #, fuzzy
 msgid "Original password"
 msgstr "Стара парола"
 
-#: src/account.c:304
+#: src/account.c:320
 #, fuzzy
 msgid "New password"
 msgstr "Нова парола"
 
-#: src/account.c:310
+#: src/account.c:327
 #, fuzzy
 msgid "New password (again)"
 msgstr "Нова парола (отново)"
 
-#: src/account.c:315
+#: src/account.c:333
 #, fuzzy, c-format
 msgid "Change password for %s"
 msgstr "Пропадна промяна на паролата (%s)"
 
-#: src/account.c:321
+#: src/account.c:341
 #, fuzzy
 msgid "Please enter your current password and your new password."
 msgstr "Моля въведете парола"
@@ -1166,82 +1473,78 @@
 #. *
 #. * A wrapper for gaim_request_action() that uses OK and Cancel buttons.
 #.
-#: src/account.c:324 src/connection.c:193 src/dialogs.c:1812
-#: src/dialogs.c:1855 src/dialogs.c:1986 src/gtkblist.c:1138
-#: src/gtkrequest.c:202 src/protocols/jabber/jabber.c:963
-#: 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:2448 src/protocols/oscar/oscar.c:2528
-#: src/protocols/oscar/oscar.c:6114 src/protocols/oscar/oscar.c:6210
-#: src/protocols/oscar/oscar.c:6259 src/protocols/oscar/oscar.c:6339
-#: src/protocols/yahoo/yahoo.c:2232 src/request.h:852
+#: src/account.c:344 src/connection.c:198 src/dialogs.c:471 src/dialogs.c:527
+#: src/gtkblist.c:2363 src/gtkrequest.c:235 src/protocols/jabber/jabber.c:1038
+#: src/protocols/jabber/xdata.c:337 src/protocols/msn/msn.c:195
+#: src/protocols/msn/msn.c:206 src/protocols/msn/msn.c:217
+#: src/protocols/msn/msn.c:228 src/protocols/oscar/oscar.c:2760
+#: src/protocols/oscar/oscar.c:2841 src/protocols/oscar/oscar.c:6487
+#: src/protocols/oscar/oscar.c:6583 src/protocols/oscar/oscar.c:6632
+#: src/protocols/oscar/oscar.c:6714 src/protocols/yahoo/yahoo.c:2504
+#: src/protocols/yahoo/yahoo.c:2512 src/request.h:1240
 msgid "OK"
 msgstr "OK"
 
-#. Cancel button.
-#: src/account.c:325 src/account.c:359 src/buddy_chat.c:375
-#: src/connection.c:194 src/dialogs.c:466 src/dialogs.c:478 src/dialogs.c:491
-#: src/dialogs.c:512 src/dialogs.c:897 src/dialogs.c:1646 src/dialogs.c:1813
-#: src/dialogs.c:1856 src/dialogs.c:1993 src/gtkaccount.c:1619
-#: src/gtkaccount.c:2087 src/gtkblist.c:1139 src/gtkblist.c:3038
-#: src/gtkconn.c:147 src/gtkprivacy.c:568 src/gtkprivacy.c:581
-#: src/gtkprivacy.c:606 src/gtkprivacy.c:617 src/gtkrequest.c:203
-#: src/protocols/icq/gaim_icq.c:277 src/protocols/jabber/buddy.c:520
-#: src/protocols/jabber/jabber.c:613 src/protocols/jabber/jabber.c:964
-#: 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:2412
-#: src/protocols/oscar/oscar.c:2449 src/protocols/oscar/oscar.c:2484
-#: src/protocols/oscar/oscar.c:2529 src/protocols/oscar/oscar.c:5942
-#: src/protocols/oscar/oscar.c:6115 src/protocols/oscar/oscar.c:6211
-#: src/protocols/oscar/oscar.c:6260 src/protocols/oscar/oscar.c:6325
-#: src/protocols/oscar/oscar.c:6340 src/protocols/trepia/trepia.c:338
-#: src/protocols/yahoo/yahoo.c:2233 src/request.h:852 src/request.h:862
+#: src/account.c:345 src/account.c:383 src/connection.c:199 src/dialogs.c:305
+#: src/dialogs.c:317 src/dialogs.c:330 src/dialogs.c:351 src/dialogs.c:472
+#: src/dialogs.c:528 src/dialogs.c:851 src/dialogs.c:872 src/dialogs.c:889
+#: src/dialogs.c:908 src/gtkaccount.c:1744 src/gtkaccount.c:2235
+#: src/gtkblist.c:2364 src/gtkblist.c:4349 src/gtkconn.c:168
+#: src/gtkimhtmltoolbar.c:399 src/gtkprivacy.c:575 src/gtkprivacy.c:588
+#: src/gtkprivacy.c:613 src/gtkprivacy.c:624 src/gtkrequest.c:236
+#: src/protocols/icq/gaim_icq.c:277 src/protocols/jabber/buddy.c:514
+#: src/protocols/jabber/chat.c:693 src/protocols/jabber/jabber.c:660
+#: src/protocols/jabber/jabber.c:1039 src/protocols/jabber/xdata.c:338
+#: src/protocols/msn/msn.c:196 src/protocols/msn/msn.c:207
+#: src/protocols/msn/msn.c:218 src/protocols/msn/msn.c:229
+#: src/protocols/msn/msn.c:242 src/protocols/oscar/oscar.c:2722
+#: src/protocols/oscar/oscar.c:2761 src/protocols/oscar/oscar.c:2797
+#: src/protocols/oscar/oscar.c:2842 src/protocols/oscar/oscar.c:6305
+#: src/protocols/oscar/oscar.c:6488 src/protocols/oscar/oscar.c:6584
+#: src/protocols/oscar/oscar.c:6633 src/protocols/oscar/oscar.c:6698
+#: src/protocols/oscar/oscar.c:6715 src/protocols/trepia/trepia.c:347
+#: src/protocols/yahoo/yahoo.c:2505 src/protocols/yahoo/yahoo.c:2513
+#: src/request.h:1240 src/request.h:1250
 msgid "Cancel"
 msgstr "Отмяна"
 
-#: src/account.c:351
+#: src/account.c:374
 #, fuzzy, c-format
 msgid "Change user information for %s"
 msgstr "Потребителската информация за %s недостъпна: %s"
 
-#: src/account.c:358 src/dialogs.c:893 src/dialogs.c:1634 src/dialogs.c:2299
-#: src/gtkrequest.c:209 src/protocols/jabber/buddy.c:519
-#: src/protocols/trepia/trepia.c:337
+#: src/account.c:382 src/dialogs.c:839 src/gtkrequest.c:242
+#: src/protocols/jabber/buddy.c:513 src/protocols/trepia/trepia.c:346
 msgid "Save"
 msgstr "Запис"
 
-#: src/away.c:208
-msgid "Gaim - Away!"
-msgstr "Gaim - Отсъствие!"
-
-#: src/away.c:269
+#: src/away.c:210
+#, fuzzy
+msgid "Away!"
+msgstr "Отсъствие"
+
+#: 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:548 src/gtkprefs.c:2273
+#: src/blist.c:590 src/gtkprefs.c:2493
 #, fuzzy
 msgid "Chats"
 msgstr "Чат"
 
-#: src/blist.c:643 src/blist.c:816 src/blist.c:2018 src/gtkblist.c:2528
-#: src/protocols/jabber/roster.c:66 src/protocols/msn/notification.c:1146
-msgid "Buddies"
-msgstr "Авери"
-
-#: src/blist.c:1103
+#: src/blist.c:1192
 #, c-format
 msgid ""
 "%d buddy from group %s was not removed because its account was not logged "
@@ -1252,149 +1555,124 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/blist.c:1112
+#: src/blist.c:1201
 msgid "Group not removed"
 msgstr ""
 
-#: src/blist.c:1163 src/gtkaccount.c:159 src/gtkpounce.c:307
-#: src/gtkutils.c:839 src/protocols/jabber/auth.c:97
-#: src/protocols/jabber/buddy.c:571
+#: src/blist.c:1251 src/gtkaccount.c:164 src/gtkft.c:153 src/gtkutils.c:860
+#: src/protocols/jabber/buddy.c:569 src/protocols/novell/novell.c:2156
 msgid "Unknown"
 msgstr "Непознато"
 
-#: src/blist.c:1491
+#: src/blist.c:1578
 #, fuzzy
 msgid "Invalid Groupname"
 msgstr "Невалидно име"
 
-#: src/blist.c:2135
+#: src/blist.c:2220
 msgid ""
 "An error was encountered parsing your buddy list.  It has not been loaded."
 msgstr ""
 
-#: src/blist.c:2137
+#: src/blist.c:2222
 #, fuzzy
 msgid "Buddy List Error"
 msgstr "Лист"
 
-#: src/buddy_chat.c:316 src/gtkblist.c:2931
-#, fuzzy
-msgid ""
-"You are not currently signed on with any protocols that have the ability to "
-"chat."
-msgstr "В момента мямате протокол с възможност за регистрира нови акаунти."
-
-#: src/buddy_chat.c:330
-msgid "Join Chat"
-msgstr "Влизане в чат"
-
-#: src/buddy_chat.c:336
-msgid "Buddy Chat"
-msgstr "Чат"
-
-#: src/buddy_chat.c:346
-msgid "Join Chat As:"
-msgstr "Влизане в чат като:"
-
-#. Join button.
-#: src/buddy_chat.c:369
-msgid "Join"
-msgstr "Присъединяване"
-
-#: src/connection.c:117 src/connection.c:165
+#: src/connection.c:119 src/connection.c:170
 #, fuzzy, c-format
 msgid "Missing protocol plugin for %s"
 msgstr "Действия на протокола"
 
-#: src/connection.c:122
+#: src/connection.c:124
 #, fuzzy
 msgid "Registration Error"
 msgstr "Непозната грешка при регистрация"
 
-#: src/connection.c:170 src/gtkconn.c:278
+#: src/connection.c:175
 msgid "Connection Error"
 msgstr "Грешка на свързване"
 
-#: src/connection.c:191
+#: src/connection.c:196
 #, fuzzy, c-format
 msgid "Enter password for %s"
 msgstr "Парола"
 
-#: src/conversation.c:324
+#: src/conversation.c:296
 #, fuzzy
 msgid "Unable to send message. The message is too large."
 msgstr "Не може да се изпрати: прекалено голямо"
 
-#: src/conversation.c:332
+#: src/conversation.c:304
 #, fuzzy
 msgid "Unable to send message."
 msgstr "Не може да се изпрати: прекалено голямо"
 
-#: src/conversation.c:1888
+#: src/conversation.c:1969
 #, c-format
 msgid "%s entered the room."
 msgstr "%s влезе в стаята"
 
-#: src/conversation.c:1891
+#: src/conversation.c:1972
 #, fuzzy, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s влезе в стаята"
 
-#: src/conversation.c:1976
+#: src/conversation.c:2064
+#, fuzzy, c-format
+msgid "You are now known as %s"
+msgstr "%s се прекръсти на %s"
+
+#: src/conversation.c:2067
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s се прекръсти на %s"
 
-#: src/conversation.c:2018
+#: src/conversation.c:2110
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s напусна стая (%s)."
 
-#: src/conversation.c:2020
+#: src/conversation.c:2112
 #, c-format
 msgid "%s left the room."
 msgstr "%s напусна стаята."
 
-#: src/conversation.c:2093
+#: src/conversation.c:2185
 #, fuzzy, c-format
 msgid "(+%d more)"
 msgstr "(%d съобщения)"
 
-#: src/conversation.c:2095
+#: src/conversation.c:2187
 #, fuzzy, c-format
 msgid " left the room (%s)."
 msgstr "%s напусна стая (%s)."
 
-#: src/conversation.c:2377
+#: src/conversation.c:2467
 msgid "Last created window"
 msgstr ""
 
-#: src/conversation.c:2379
+#: src/conversation.c:2469 src/gtkprefs.c:1402
 #, fuzzy
 msgid "New window"
 msgstr "Ширина на прозореца"
 
-#: src/conversation.c:2381
+#: src/conversation.c:2471
 #, fuzzy
 msgid "By group"
 msgstr "Група"
 
-#: src/conversation.c:2383
+#: src/conversation.c:2473
 #, fuzzy
 msgid "By account"
 msgstr "Акаунт"
 
-#: src/dialogs.c:314
+#: src/dialogs.c:154
 #, fuzzy
 msgid "Warn User"
 msgstr "Използване на Gaim"
 
-#: src/dialogs.c:317
-#, fuzzy
-msgid "_Warn"
-msgstr "Предуреждение"
-
-#: src/dialogs.c:333
+#: src/dialogs.c:173
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Warn %s?</span>\n"
@@ -1403,17 +1681,17 @@
 "harsher rate limiting.\n"
 msgstr ""
 
-#: src/dialogs.c:342
+#: src/dialogs.c:182
 #, fuzzy
 msgid "Warn _anonymously?"
 msgstr "Предупреди анонимно?"
 
-#: src/dialogs.c:349
+#: src/dialogs.c:189
 #, fuzzy
 msgid "<b>Anonymous warnings are less severe.</b>"
 msgstr "Анонимните предупреждения са по-слаби."
 
-#: src/dialogs.c:462
+#: src/dialogs.c:301
 #, fuzzy, c-format
 msgid ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
@@ -1421,11 +1699,11 @@
 "Ще премахнете '%s' от листата.\n"
 "Сигурни ли сте?"
 
-#: src/dialogs.c:464 src/dialogs.c:465
+#: src/dialogs.c:303 src/dialogs.c:304
 msgid "Remove Buddy"
 msgstr "Премахване"
 
-#: src/dialogs.c:474
+#: src/dialogs.c:313
 #, fuzzy, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
@@ -1434,12 +1712,12 @@
 "Ще премахнете '%s' от листата.\n"
 "Сигурни ли сте?"
 
-#: src/dialogs.c:476 src/dialogs.c:477
+#: src/dialogs.c:315 src/dialogs.c:316
 #, fuzzy
 msgid "Remove Chat"
 msgstr "Премахване"
 
-#: src/dialogs.c:486
+#: src/dialogs.c:325
 #, fuzzy, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
@@ -1448,12 +1726,12 @@
 "Ще премахнете '%s' от листата.\n"
 "Сигурни ли сте?"
 
-#: src/dialogs.c:489 src/dialogs.c:490
+#: src/dialogs.c:328 src/dialogs.c:329
 #, fuzzy
 msgid "Remove Group"
 msgstr "Преименуване"
 
-#: src/dialogs.c:507
+#: src/dialogs.c:346
 #, fuzzy, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddies from "
@@ -1462,234 +1740,129 @@
 "Ще премахнете '%s' от листата.\n"
 "Сигурни ли сте?"
 
-#: src/dialogs.c:510 src/dialogs.c:511
+#: src/dialogs.c:349 src/dialogs.c:350
 #, fuzzy
 msgid "Remove Contact"
 msgstr "Премахване"
 
-#: src/dialogs.c:659
-#, fuzzy
-msgid "New Message"
-msgstr "Ново съобщение за отсъствие"
-
-#: src/dialogs.c:677
-msgid "Please enter the screenname of the person you would like to IM.\n"
-msgstr ""
-
-#: src/dialogs.c:693 src/dialogs.c:770
-#, fuzzy
-msgid "_Screenname:"
+#: src/dialogs.c:453 src/dialogs.c:509
+#, fuzzy
+msgid "_Screen name"
 msgstr "Номер:"
 
-#: src/dialogs.c:708 src/dialogs.c:786 src/gtkpounce.c:408
-#, fuzzy
-msgid "_Account:"
+#: src/dialogs.c:459 src/dialogs.c:515
+#, fuzzy
+msgid "_Account"
 msgstr "Акаунт"
 
-#: src/dialogs.c:739
+#: src/dialogs.c:466
+#, fuzzy
+msgid "New Instant Message"
+msgstr "Изпрати съобщение"
+
+#: src/dialogs.c:468
+msgid "Please enter the screen name of the person you would like to IM."
+msgstr ""
+
+#: src/dialogs.c:522
 #, fuzzy
 msgid "Get User Info"
 msgstr "Информация"
 
-#: src/dialogs.c:758
-msgid ""
-"Please enter the screenname of the person whose info you would like to "
-"view.\n"
-msgstr ""
-
-#: src/dialogs.c:852 src/protocols/jabber/jabber.c:974
-#: src/protocols/oscar/oscar.c:6408 src/protocols/toc/toc.c:1531
-msgid "Set User Info"
-msgstr "Настрока данни"
-
-#: src/dialogs.c:861
-#, c-format
-msgid "Changing info for %s:"
-msgstr ""
-
-#: src/dialogs.c:963
-#, fuzzy
-msgid "Log Conversation"
-msgstr "Разговор"
-
-#: src/dialogs.c:1059
-msgid "Insert Link"
-msgstr "Вмъкване на връзка"
-
-#: src/dialogs.c:1061
-#, fuzzy
-msgid "Insert"
-msgstr "Вмъкване на връзка"
-
-#: src/dialogs.c:1083
-msgid ""
-"Please enter the URL and description of the link that you want to insert.  "
-"The description is optional.\n"
-msgstr ""
-
-#: src/dialogs.c:1101 src/protocols/jabber/buddy.c:257
-#: src/protocols/jabber/jabber.c:594
-msgid "URL"
-msgstr "URL"
-
-#: src/dialogs.c:1111 src/gtkprefs.c:601 src/gtkprefs.c:1809
-#: src/protocols/jabber/buddy.c:271 src/protocols/jabber/buddy.c:744
-msgid "Description"
-msgstr "Описание"
-
-#: src/dialogs.c:1247 src/dialogs.c:1264
+#: src/dialogs.c:524
+msgid ""
+"Please enter the screen name of the person whose info you would like to view."
+msgstr ""
+
+#: src/dialogs.c:552 src/gtkimhtmltoolbar.c:240
 msgid "Select Text Color"
 msgstr "Цвят на текст"
 
-#: src/dialogs.c:1299 src/dialogs.c:1316
+#: src/dialogs.c:580 src/gtkimhtmltoolbar.c:310
 msgid "Select Background Color"
 msgstr "Фонов цвят"
 
-#: src/dialogs.c:1401 src/dialogs.c:1427
+#: src/dialogs.c:619 src/gtkimhtmltoolbar.c:164
 msgid "Select Font"
 msgstr "Избор на шрифт"
 
-#: src/dialogs.c:1493
+#: src/dialogs.c:692
 #, fuzzy
 msgid "You cannot save an away message with a blank title"
 msgstr "Съобщението не може да е без заглавие"
 
-#: src/dialogs.c:1495
+#: src/dialogs.c:694
 msgid ""
 "Please give the message a title, or choose \"Use\" to use without saving."
 msgstr ""
 
-#: src/dialogs.c:1505
+#: src/dialogs.c:704
 msgid "You cannot create an empty away message"
 msgstr "Съобщението не може да е празно"
 
-#: src/dialogs.c:1570 src/dialogs.c:1578
+#: src/dialogs.c:766
 msgid "New away message"
 msgstr "Ново съобщение за отсъствие"
 
-#: src/dialogs.c:1588
+#: src/dialogs.c:787
 msgid "Away title: "
 msgstr "Заглавие на отсъствие"
 
-#: src/dialogs.c:1638
+#: src/dialogs.c:843
 msgid "Save & Use"
 msgstr "Запазване и използване"
 
-#: src/dialogs.c:1642
+#: src/dialogs.c:847
 msgid "Use"
 msgstr "Използване"
 
-#. show everything
-#: src/dialogs.c:1791
-msgid "Smile!"
-msgstr "Усмивка!"
-
-#: src/dialogs.c:1809
+#: src/dialogs.c:868
 #, fuzzy
 msgid "Alias Chat"
 msgstr "Прякор"
 
-#: src/dialogs.c:1809
-#, fuzzy
-msgid "Alias chat"
+#: src/dialogs.c:869
+msgid "Enter an alias for this chat."
+msgstr ""
+
+#: src/dialogs.c:871 src/dialogs.c:888 src/dialogs.c:907 src/gtkrequest.c:243
+msgid "Alias"
+msgstr "Прякор"
+
+#: src/dialogs.c:885
+#, fuzzy
+msgid "Alias Contact"
 msgstr "Прякор"
 
-#: src/dialogs.c:1810
-msgid "Please enter an aliased name for this chat."
-msgstr ""
-
-#: src/dialogs.c:1841
-#, fuzzy
-msgid "_Screenname"
-msgstr "Номер:"
-
-#: src/dialogs.c:1846 src/gtkblist.c:523 src/gtkblist.c:616
-#, fuzzy
-msgid "_Alias"
-msgstr "Прякор"
-
-#: src/dialogs.c:1850
+#: src/dialogs.c:886
+msgid "Enter an alias for this contact."
+msgstr ""
+
+#: src/dialogs.c:903
+#, fuzzy, c-format
+msgid "Enter an alias for %s."
+msgstr "Парола"
+
+#: src/dialogs.c:905
 msgid "Alias Buddy"
 msgstr "Прякор"
 
-#: src/dialogs.c:1851
-#, fuzzy
-msgid "Alias buddy"
-msgstr "Прякор"
-
-#: src/dialogs.c:1852
-msgid ""
-"Please enter an aliased name for the person below, or rename this contact in "
-"your buddy list."
-msgstr ""
-
-#: src/dialogs.c:1888 src/dialogs.c:1895
-#, fuzzy, c-format
-msgid "Couldn't write to %s."
-msgstr "Не мога да се свържа"
-
-#: src/dialogs.c:1919
-#, fuzzy
-msgid "Save Log File"
-msgstr "Gaim - Записване на лог файл"
-
-#: src/dialogs.c:1949
-#, fuzzy, c-format
-msgid "Couldn't remove file %s."
-msgstr "Не можа да се отвори конфигурационен файл %s."
-
-#: src/dialogs.c:1968
-#, fuzzy
-msgid "Clear Log"
-msgstr "Изчистване"
-
-#: src/dialogs.c:1977
-msgid "Really clear log?"
-msgstr "Изчистване на лог-а?"
-
-#: src/dialogs.c:2022 src/dialogs.c:2193
-#, fuzzy, c-format
-msgid "Couldn't open log file %s."
-msgstr "Не можа да се отвори конфигурационен файл %s."
-
-#: src/dialogs.c:2170
-#, fuzzy, c-format
-msgid "Conversations with %s"
-msgstr "Разговори"
-
-#: src/dialogs.c:2172
-#, fuzzy
-msgid "System Log"
-msgstr "Системен лог"
-
-#: src/dialogs.c:2214 src/protocols/jabber/jabber.c:599
-msgid "Date"
-msgstr "Дата"
-
-#: src/dialogs.c:2271
-msgid "Log"
-msgstr ""
-
-#: src/dialogs.c:2294
-msgid "Clear"
-msgstr "Изчистване"
-
-#: src/ft.c:123
+#: src/ft.c:144
 #, fuzzy, c-format
 msgid "%s is not a valid filename.\n"
 msgstr "Чата в %s е невъзможен"
 
-#: src/ft.c:137
+#: src/ft.c:157
 #, c-format
 msgid "%s was not found.\n"
 msgstr ""
 
-#: src/ft.c:693
+#: src/ft.c:786
 #, c-format
 msgid "File transfer to %s aborted.\n"
 msgstr ""
 
-#: src/ft.c:695
+#: src/ft.c:788
 #, c-format
 msgid "File transfer from %s aborted.\n"
 msgstr ""
@@ -1702,7 +1875,7 @@
 msgid "Size of the expander arrow"
 msgstr ""
 
-#: src/gaim-remote.c:33
+#: src/gaim-remote.c:65
 #, c-format
 msgid ""
 "Usage: %s command [OPTIONS] [URI]\n"
@@ -1715,67 +1888,62 @@
 "       -h, --help [commmand]    Show help for command\n"
 msgstr ""
 
-#: src/gaim-remote.c:139 src/gaim-remote.c:155
+#: src/gaim-remote.c:174 src/gaim-remote.c:190
 msgid "Gaim not running (on session 0)\n"
 msgstr ""
 
-#: src/gaim-remote.c:167
+#: src/gaim-remote.c:203
 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"
+"\tgaim-remote uri 'aim:goim?screenname=Penguin'\n"
 "\n"
 "Joining a chat:\n"
-"\tgaim-remote uri aim:gochat?roomname=PenguinLounge\n"
+"\tgaim-remote uri 'aim:gochat?roomname=PenguinLounge'\n"
 "...joins the 'PenguinLounge' chat room.\n"
 "\n"
 "Adding a buddy to your buddy list:\n"
-"\tgaim-remote uri aim:addbuddy?screenname=Penguin\n"
+"\tgaim-remote uri 'aim:addbuddy?screenname=Penguin'\n"
 "...prompts you to add 'Penguin' to your buddy list.\n"
 msgstr ""
 
-#: src/gaim-remote.c:187
+#: src/gaim-remote.c:222
 msgid ""
 "\n"
 "Close running copy of Gaim\n"
 msgstr ""
 
 #. 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:369 src/gaimrc.c:1460
+#: src/gaimrc.c:375 src/gaimrc.c:1451
 msgid "boring default"
 msgstr ""
 
-#: src/gaimrc.c:1267 src/gtkblist.c:1717
+#: src/gaimrc.c:1260 src/gtkblist.c:2966
 msgid "Alphabetical"
 msgstr ""
 
-#: src/gaimrc.c:1269 src/gtkblist.c:1718
+#: src/gaimrc.c:1262 src/gtkblist.c:2967
 msgid "By status"
 msgstr ""
 
-#: src/gaimrc.c:1271 src/gtkblist.c:1719
+#: src/gaimrc.c:1264 src/gtkblist.c:2968
 #, fuzzy
 msgid "By log size"
 msgstr "Икона"
 
-#: src/gaimrc.c:1558
-#, c-format
-msgid "Could not open config file %s."
-msgstr "Не можа да се отвори конфигурационен файл %s."
-
-#: src/gtkaccount.c:287
+#: src/gtkaccount.c:289
 #, c-format
 msgid ""
 "<b>File:</b> %s\n"
@@ -1783,198 +1951,194 @@
 "<b>Image size:</b> %dx%d"
 msgstr ""
 
-#: src/gtkaccount.c:318 src/protocols/oscar/oscar.c:3067
-msgid "Buddy Icon"
-msgstr "Икона"
-
 #. Build the login options frame.
-#: src/gtkaccount.c:369
+#: src/gtkaccount.c:384
 #, fuzzy
 msgid "Login Options"
 msgstr "Шрифт"
 
-#: src/gtkaccount.c:386
+#: src/gtkaccount.c:401
 msgid "Protocol:"
 msgstr "Протокол:"
 
-#: src/gtkaccount.c:391
-msgid "Screenname:"
+#: src/gtkaccount.c:406 src/gtkblist.c:3954
+#, fuzzy
+msgid "Screen Name:"
 msgstr "Номер:"
 
-#: src/gtkaccount.c:464 src/main.c:307 src/protocols/irc/irc.c:161
-#: src/protocols/jabber/chat.c:55
+#: src/gtkaccount.c:479
 msgid "Password:"
 msgstr "Парола"
 
-#: src/gtkaccount.c:469 src/gtkblist.c:2680 src/gtkblist.c:2989
+#: src/gtkaccount.c:484 src/gtkblist.c:3968 src/gtkblist.c:4296
 #, fuzzy
 msgid "Alias:"
 msgstr "Прякор"
 
-#: src/gtkaccount.c:473
+#: src/gtkaccount.c:488
 #, fuzzy
 msgid "Remember password"
 msgstr "Помнене на парола"
 
 #. Build the user options frame.
-#: src/gtkaccount.c:527
+#: src/gtkaccount.c:542
 #, fuzzy
 msgid "User Options"
 msgstr "Прокси"
 
-#: src/gtkaccount.c:540
+#: src/gtkaccount.c:555
 #, fuzzy
 msgid "New mail notifications"
 msgstr "Бележка за нови писма"
 
-#: src/gtkaccount.c:549
+#: src/gtkaccount.c:564
 #, fuzzy
 msgid "Buddy icon file:"
 msgstr "Файл за икона:"
 
-#: src/gtkaccount.c:558
+#: src/gtkaccount.c:574
 #, fuzzy
 msgid "_Browse"
 msgstr "Браузър"
 
-#: src/gtkaccount.c:564
+#: src/gtkaccount.c:580
 #, fuzzy
 msgid "_Reset"
 msgstr "Подразбиране"
 
 #. Build the protocol options frame.
-#: src/gtkaccount.c:626
+#: src/gtkaccount.c:642
 #, fuzzy, c-format
 msgid "%s Options"
 msgstr "Опции"
 
 #. Use Global Proxy Settings
-#: src/gtkaccount.c:747
+#: src/gtkaccount.c:778 src/gtkaccount.c:825
 msgid "Use Global Proxy Settings"
 msgstr ""
 
 #. No Proxy
-#: src/gtkaccount.c:754
+#: src/gtkaccount.c:784 src/gtkaccount.c:832
 #, fuzzy
 msgid "No Proxy"
 msgstr "Без прокси"
 
 #. HTTP
-#: src/gtkaccount.c:761
+#: src/gtkaccount.c:790 src/gtkaccount.c:839
 msgid "HTTP"
 msgstr "HTTP"
 
 #. SOCKS 4
-#: src/gtkaccount.c:768
+#: src/gtkaccount.c:796 src/gtkaccount.c:846
 msgid "SOCKS 4"
 msgstr "SOCKS 4"
 
 #. SOCKS 5
-#: src/gtkaccount.c:775
+#: src/gtkaccount.c:802 src/gtkaccount.c:853
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
 #. Use Environmental Settings
-#: src/gtkaccount.c:782 src/gtkprefs.c:1112
+#: src/gtkaccount.c:808 src/gtkaccount.c:860 src/gtkprefs.c:1203
 msgid "Use Environmental Settings"
 msgstr ""
 
-#: src/gtkaccount.c:815
+#: src/gtkaccount.c:899
 msgid "you can see the butterflies mating"
 msgstr ""
 
-#: src/gtkaccount.c:819
+#: src/gtkaccount.c:903
 msgid "If you look real closely"
 msgstr ""
 
-#: src/gtkaccount.c:835
+#: src/gtkaccount.c:919
 #, fuzzy
 msgid "Proxy Options"
 msgstr "Уединие"
 
-#: src/gtkaccount.c:851 src/gtkprefs.c:1106
+#: src/gtkaccount.c:937 src/gtkprefs.c:1197
 #, fuzzy
 msgid "Proxy _type:"
 msgstr "Тип Proxy"
 
-#: src/gtkaccount.c:860
+#: src/gtkaccount.c:946 src/gtkprefs.c:1227
 #, fuzzy
 msgid "_Host:"
 msgstr "Хост"
 
-#: src/gtkaccount.c:864
+#: src/gtkaccount.c:950 src/gtkprefs.c:1245
 #, fuzzy
 msgid "_Port:"
 msgstr "Порт"
 
-#: src/gtkaccount.c:872
+#: src/gtkaccount.c:958
 #, fuzzy
 msgid "_Username:"
 msgstr "Потребител"
 
-#: src/gtkaccount.c:877
+#: src/gtkaccount.c:963 src/gtkprefs.c:1282
 #, fuzzy
 msgid "Pa_ssword:"
 msgstr "Парола"
 
-#: src/gtkaccount.c:1215
+#: src/gtkaccount.c:1331
 #, fuzzy
 msgid "Add Account"
 msgstr "Акаунт"
 
-#: src/gtkaccount.c:1217
+#: src/gtkaccount.c:1333
 #, fuzzy
 msgid "Modify Account"
 msgstr "Gaim - Промяна на акаунт"
 
 #. Add the disclosure
-#: src/gtkaccount.c:1241
+#: src/gtkaccount.c:1357
 #, fuzzy
 msgid "Show more options"
 msgstr "Прокси"
 
-#: src/gtkaccount.c:1242
+#: src/gtkaccount.c:1358
 #, fuzzy
 msgid "Show fewer options"
 msgstr "Прокси"
 
 #. Register button
-#: src/gtkaccount.c:1269 src/protocols/jabber/jabber.c:612
+#: src/gtkaccount.c:1385 src/protocols/jabber/jabber.c:659
 msgid "Register"
 msgstr "?Регистриране?"
 
-#: src/gtkaccount.c:1614
+#: src/gtkaccount.c:1739
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "Сигирни ли сте за изтриването на %s?"
 
-#: src/gtkaccount.c:1618 src/gtkrequest.c:206
+#: src/gtkaccount.c:1743 src/gtkrequest.c:239
 msgid "Delete"
 msgstr "Триене"
 
-#: src/gtkaccount.c:1731
+#: src/gtkaccount.c:1857 src/protocols/oscar/oscar.c:3365
 #, fuzzy
 msgid "Screen Name"
 msgstr "Номер:"
 
-#: src/gtkaccount.c:1754 src/protocols/jabber/jabber.c:866
-#: src/protocols/oscar/oscar.c:2839 src/protocols/oscar/oscar.c:4527
-#: src/protocols/oscar/oscar.c:6063 src/protocols/yahoo/yahoo.c:2032
-#: src/protocols/zephyr/zephyr.c:886 src/protocols/zephyr/zephyr.c:896
+#: src/gtkaccount.c:1880 src/protocols/jabber/jabber.c:950
+#: src/protocols/oscar/oscar.c:526 src/protocols/oscar/oscar.c:4823
+#: src/protocols/oscar/oscar.c:6425 src/protocols/yahoo/yahoo.c:2299
+#: src/protocols/zephyr/zephyr.c:1182 src/protocols/zephyr/zephyr.c:1192
 msgid "Online"
 msgstr "Онлайн"
 
-#: src/gtkaccount.c:1772
+#: src/gtkaccount.c:1898
 #, fuzzy
 msgid "Protocol"
 msgstr "Протокол:"
 
-#: src/gtkaccount.c:2062
+#: src/gtkaccount.c:2210
 #, 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:2076
+#: src/gtkaccount.c:2224
 msgid ""
 "\n"
 "\n"
@@ -1984,314 +2148,370 @@
 "\n"
 "Искате ли да ги добавите към листата?"
 
-#: src/gtkaccount.c:2080
-#, fuzzy
-msgid "Gaim - Information"
-msgstr "Информация Gadu-Gadu"
-
-#: src/gtkaccount.c:2084
+#: src/gtkaccount.c:2228
+#, fuzzy
+msgid "Information"
+msgstr "Регистрационна инфо"
+
+#: src/gtkaccount.c:2232
 msgid "Add buddy to your list?"
 msgstr ""
 
-#: src/gtkaccount.c:2086 src/gtkblist.c:3037 src/gtkconv.c:1137
-#: src/gtkconv.c:3017 src/gtkconv.c:4191 src/gtkrequest.c:207
-#: src/protocols/icq/gaim_icq.c:277 src/protocols/oscar/oscar.c:2681
+#. Add button
+#: src/gtkaccount.c:2234 src/gtkblist.c:4348 src/gtkconv.c:1107
+#: src/gtkconv.c:3338 src/gtkconv.c:3429 src/gtkrequest.c:240
+#: src/protocols/icq/gaim_icq.c:277 src/protocols/oscar/oscar.c:3004
 msgid "Add"
 msgstr "Добавяне"
 
-#: src/gtkblist.c:496
-#, fuzzy
-msgid "_Get Info"
+#: src/gtkblist.c:801 src/gtkblist.c:4236
+#, fuzzy
+msgid ""
+"You are not currently signed on with any protocols that have the ability to "
+"chat."
+msgstr "В момента мямате протокол с възможност за регистрира нови акаунти."
+
+#: src/gtkblist.c:814
+#, fuzzy
+msgid "Join a Chat"
+msgstr "Влизане в чат"
+
+#: src/gtkblist.c:835
+msgid ""
+"Please enter the appropriate information about the chat you would like to "
+"join.\n"
+msgstr ""
+
+#: src/gtkblist.c:848 src/gtkpounce.c:361 src/gtkroomlist.c:365
+#, fuzzy
+msgid "_Account:"
+msgstr "Акаунт"
+
+#: src/gtkblist.c:1087 src/gtkblist.c:3155
+#, fuzzy
+msgid "Get _Info"
 msgstr "Данни"
 
-#: src/gtkblist.c:499
-#, fuzzy
-msgid "_IM"
+#: src/gtkblist.c:1090 src/gtkblist.c:3146
+#, fuzzy
+msgid "I_M"
 msgstr "Съобщение"
 
-#: src/gtkblist.c:501
+#: src/gtkblist.c:1092
 #, fuzzy
 msgid "Add Buddy _Pounce"
 msgstr "Ново известие"
 
-#: src/gtkblist.c:503
+#: src/gtkblist.c:1094
 #, fuzzy
 msgid "View _Log"
 msgstr "Архив"
 
-#: src/gtkblist.c:525 src/gtkblist.c:618 src/gtkblist.c:626
+#: src/gtkblist.c:1159 src/gtkblist.c:1260 src/gtkblist.c:1274
+#, fuzzy
+msgid "_Alias..."
+msgstr "Прякор"
+
+#: src/gtkblist.c:1161 src/gtkblist.c:1262 src/gtkblist.c:1279
+#: src/gtkconn.c:361
 #, fuzzy
 msgid "_Remove"
 msgstr "Премахване"
 
-#: src/gtkblist.c:597
+#: src/gtkblist.c:1206
 #, fuzzy
 msgid "Add a _Buddy"
 msgstr "Добавяне авер"
 
-#: src/gtkblist.c:599
+#: src/gtkblist.c:1208
 #, fuzzy
 msgid "Add a C_hat"
 msgstr "Чат"
 
-#: src/gtkblist.c:601
+#: src/gtkblist.c:1210
 #, fuzzy
 msgid "_Delete Group"
 msgstr "Преименуване"
 
-#: src/gtkblist.c:603
+#: src/gtkblist.c:1212
 #, fuzzy
 msgid "_Rename"
 msgstr "Преименуване"
 
-#: src/gtkblist.c:611
+#. join button
+#: src/gtkblist.c:1238 src/gtkroomlist.c:261 src/gtkroomlist.c:417
+#: src/stock.c:87
 #, fuzzy
 msgid "_Join"
 msgstr "Присъединяване"
 
-#: src/gtkblist.c:613
+#: src/gtkblist.c:1240
 #, fuzzy
 msgid "Auto-Join"
 msgstr "Авто влизане"
 
-#: src/gtkblist.c:622 src/gtkblist.c:653
+#: src/gtkblist.c:1276 src/gtkblist.c:1302
 #, fuzzy
 msgid "_Collapse"
 msgstr "Затваряне"
 
-#: src/gtkblist.c:658
+#: src/gtkblist.c:1307
 msgid "_Expand"
 msgstr ""
 
+#: src/gtkblist.c:1964 src/gtkconv.c:3916
+#, fuzzy
+msgid ""
+"You are not currently signed on with an account that can add that buddy."
+msgstr "В момента мямате протокол с възможност за регистрира нови акаунти."
+
 #. Buddies menu
-#: src/gtkblist.c:1088
+#: src/gtkblist.c:2312
 #, fuzzy
 msgid "/_Buddies"
 msgstr "Авери"
 
-#: src/gtkblist.c:1089
-#, fuzzy
-msgid "/Buddies/New _Instant Message..."
+#: src/gtkblist.c:2313
+#, fuzzy
+msgid "/Buddies/New Instant _Message..."
 msgstr "Изпрати съобщение"
 
-#: src/gtkblist.c:1090
+#: src/gtkblist.c:2314
 msgid "/Buddies/Join a _Chat..."
 msgstr ""
 
-#: src/gtkblist.c:1091
-#, fuzzy
-msgid "/Buddies/Get _User Info..."
+#: src/gtkblist.c:2315
+#, fuzzy
+msgid "/Buddies/Get User _Info..."
 msgstr "Информация"
 
-#: src/gtkblist.c:1093
+#: src/gtkblist.c:2317
 msgid "/Buddies/Show _Offline Buddies"
 msgstr ""
 
-#: src/gtkblist.c:1094
+#: src/gtkblist.c:2318
 msgid "/Buddies/Show _Empty Groups"
 msgstr ""
 
-#: src/gtkblist.c:1095
-#, fuzzy
-msgid "/Buddies/_Add a Buddy..."
+#: src/gtkblist.c:2319
+#, fuzzy
+msgid "/Buddies/_Add Buddy..."
+msgstr "Добавяне"
+
+#: src/gtkblist.c:2320
+#, fuzzy
+msgid "/Buddies/Add C_hat..."
 msgstr "Добавяне"
 
-#: src/gtkblist.c:1096
-msgid "/Buddies/Add a C_hat..."
-msgstr ""
-
-#: src/gtkblist.c:1097
-msgid "/Buddies/Add a _Group..."
-msgstr ""
-
-#: src/gtkblist.c:1099
+#: src/gtkblist.c:2321
+#, fuzzy
+msgid "/Buddies/Add _Group..."
+msgstr "Добавяне"
+
+#: src/gtkblist.c:2323
 msgid "/Buddies/_Signoff"
 msgstr ""
 
-#: src/gtkblist.c:1100
+#: src/gtkblist.c:2324
 #, fuzzy
 msgid "/Buddies/_Quit"
 msgstr "Авери"
 
 #. Tools
-#: src/gtkblist.c:1103
+#: src/gtkblist.c:2327
 #, fuzzy
 msgid "/_Tools"
 msgstr "Инстрименти"
 
-#: src/gtkblist.c:1104
+#: src/gtkblist.c:2328
 msgid "/Tools/_Away"
 msgstr ""
 
-#: src/gtkblist.c:1105
+#: src/gtkblist.c:2329
 #, fuzzy
 msgid "/Tools/Buddy _Pounce"
 msgstr "Известие"
 
-#: src/gtkblist.c:1106
+#: src/gtkblist.c:2330
 #, fuzzy
 msgid "/Tools/P_rotocol Actions"
 msgstr "Действия на протокола"
 
-#: src/gtkblist.c:1108
+#: src/gtkblist.c:2332
 #, fuzzy
 msgid "/Tools/A_ccounts"
 msgstr "Акаунт"
 
-#: src/gtkblist.c:1109
-msgid "/Tools/_File Transfers..."
-msgstr ""
-
-#: src/gtkblist.c:1110
-#, fuzzy
-msgid "/Tools/Preferences"
+#: src/gtkblist.c:2333
+#, fuzzy
+msgid "/Tools/_File Transfers"
+msgstr "Не мога да пиша"
+
+#: src/gtkblist.c:2334
+#, fuzzy
+msgid "/Tools/R_oom List"
+msgstr "Действия на протокола"
+
+#: src/gtkblist.c:2335
+#, fuzzy
+msgid "/Tools/Pr_eferences"
 msgstr "Настройки"
 
-#: src/gtkblist.c:1111
+#: src/gtkblist.c:2336
 #, fuzzy
 msgid "/Tools/Pr_ivacy"
 msgstr "Уединиение"
 
-#: src/gtkblist.c:1113
+#: src/gtkblist.c:2338
 #, fuzzy
 msgid "/Tools/View System _Log"
 msgstr "Системен лог"
 
 #. Help
-#: src/gtkblist.c:1116
+#: src/gtkblist.c:2341
 #, fuzzy
 msgid "/_Help"
 msgstr "Помощ"
 
-#: src/gtkblist.c:1117
+#: src/gtkblist.c:2342
 #, fuzzy
 msgid "/Help/Online _Help"
 msgstr "Онлайн"
 
-#: src/gtkblist.c:1118
+#: src/gtkblist.c:2343
 #, fuzzy
 msgid "/Help/_Debug Window"
 msgstr "Показва Debug прозорец"
 
-#: src/gtkblist.c:1119
+#: src/gtkblist.c:2344
 msgid "/Help/_About"
 msgstr ""
 
-#: src/gtkblist.c:1135
+#: src/gtkblist.c:2360
 msgid "Rename Group"
 msgstr "Преименуване"
 
-#: src/gtkblist.c:1135
+#: src/gtkblist.c:2360
 #, fuzzy
 msgid "New group name"
 msgstr "Ново име:"
 
-#: src/gtkblist.c:1136
+#: src/gtkblist.c:2361
 #, fuzzy
 msgid "Please enter a new name for the selected group."
 msgstr "Изпращане на съобщение през сървър"
 
-#: src/gtkblist.c:1165
+#: src/gtkblist.c:2389
 #, c-format
 msgid ""
 "\n"
 "<b>Account:</b> %s"
 msgstr ""
 
-#: src/gtkblist.c:1224 src/protocols/oscar/oscar.c:5444
+#: src/gtkblist.c:2453
 msgid "<b>Status:</b> Offline"
 msgstr ""
 
-#: src/gtkblist.c:1236
+#: src/gtkblist.c:2468
 #, c-format
 msgid "%d%%"
 msgstr ""
 
-#: src/gtkblist.c:1250
+#: src/gtkblist.c:2484
 #, fuzzy
 msgid ""
 "\n"
 "<b>Account:</b>"
 msgstr "Акаунт"
 
-#: src/gtkblist.c:1251
+#: src/gtkblist.c:2485
+#, fuzzy
+msgid ""
+"\n"
+"<b>Contact Alias:</b>"
+msgstr "Статус: %s"
+
+#: src/gtkblist.c:2486
 msgid ""
 "\n"
 "<b>Alias:</b>"
 msgstr ""
 
-#: src/gtkblist.c:1252
+#: src/gtkblist.c:2487
 #, fuzzy
 msgid ""
 "\n"
 "<b>Nickname:</b>"
 msgstr "Псевдоним"
 
-#: src/gtkblist.c:1253
+#: src/gtkblist.c:2488
+#, fuzzy
+msgid ""
+"\n"
+"<b>Logged In:</b>"
+msgstr "Влязъл: %s\n"
+
+#: src/gtkblist.c:2489
 msgid ""
 "\n"
 "<b>Idle:</b>"
 msgstr ""
 
-#: src/gtkblist.c:1254
+#: src/gtkblist.c:2490
 msgid ""
 "\n"
 "<b>Warned:</b>"
 msgstr ""
 
-#: src/gtkblist.c:1256
+#: src/gtkblist.c:2492
 msgid ""
 "\n"
 "<b>Description:</b> Spooky"
 msgstr ""
 
-#: src/gtkblist.c:1257
+#: src/gtkblist.c:2493
 msgid ""
 "\n"
 "<b>Status</b>: Awesome"
 msgstr ""
 
-#: src/gtkblist.c:1258
+#: src/gtkblist.c:2494
 msgid ""
 "\n"
 "<b>Status</b>: Rockin'"
 msgstr ""
 
-#: src/gtkblist.c:1514
+#: src/gtkblist.c:2764
 #, c-format
 msgid "Idle (%dh%02dm) "
 msgstr ""
 
-#: src/gtkblist.c:1516
+#: src/gtkblist.c:2766
 #, c-format
 msgid "Idle (%dm) "
 msgstr ""
 
-#: src/gtkblist.c:1520
+#: src/gtkblist.c:2771
 #, fuzzy, c-format
 msgid "Warned (%d%%) "
 msgstr "Предупреждения: %d%%\n"
 
-#: src/gtkblist.c:1523
+#: src/gtkblist.c:2774
 #, fuzzy
 msgid "Offline "
 msgstr "Онлайн"
 
-#: src/gtkblist.c:1715 src/gtkprefs.c:842 src/gtkprefs.c:1501
-msgid "None"
-msgstr "Не показва"
-
-#: src/gtkblist.c:1780
+#: src/gtkblist.c:3032
 #, fuzzy
 msgid "/Tools/Away"
 msgstr "Инстрименти"
 
-#: src/gtkblist.c:1783
+#: src/gtkblist.c:3035
 #, fuzzy
 msgid "/Tools/Buddy Pounce"
 msgstr "Известие"
 
-#: src/gtkblist.c:1786
+#: src/gtkblist.c:3038
 #, fuzzy
 msgid "/Tools/Protocol Actions"
 msgstr "Действия на протокола"
@@ -2299,703 +2519,819 @@
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: src/gtkblist.c:1870
+#: src/gtkblist.c:3126
 msgid "/Buddies/Show Offline Buddies"
 msgstr ""
 
-#: src/gtkblist.c:1872
+#: src/gtkblist.c:3128
 msgid "/Buddies/Show Empty Groups"
 msgstr ""
 
-#: src/gtkblist.c:1890 src/gtkconv.c:1096
-msgid "IM"
-msgstr "Съобщение"
-
-#: src/gtkblist.c:1896
+#: src/gtkblist.c:3152
 #, fuzzy
 msgid "Send a message to the selected buddy"
 msgstr "Изпращане на съобщение през сървър"
 
-#: src/gtkblist.c:1899 src/protocols/napster/napster.c:529
-msgid "Get Info"
-msgstr "Данни"
-
-#: src/gtkblist.c:1905
+#: src/gtkblist.c:3161
 #, fuzzy
 msgid "Get information on the selected buddy"
 msgstr "Информация"
 
-#: src/gtkblist.c:1908 src/protocols/oscar/oscar.c:3076
-msgid "Chat"
+#: src/gtkblist.c:3164
+#, fuzzy
+msgid "_Chat"
 msgstr "Чат"
 
-#: src/gtkblist.c:1913
+#: src/gtkblist.c:3169
 #, fuzzy
 msgid "Join a chat room"
 msgstr "Присъединяване към група:"
 
-#: src/gtkblist.c:1921
+#: src/gtkblist.c:3172
+#, fuzzy
+msgid "_Away"
+msgstr "Отсъствие"
+
+#: src/gtkblist.c:3177
 #, fuzzy
 msgid "Set an away message"
 msgstr "Ново съобщение за отсъствие"
 
-#: src/gtkblist.c:2622 src/protocols/yahoo/yahoo.c:2166
+#: src/gtkblist.c:3909 src/protocols/yahoo/yahoo.c:2431
 msgid "Add Buddy"
 msgstr "Добавяне авер"
 
-#: src/gtkblist.c:2645
+#: src/gtkblist.c:3932
 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. "
 "The alias will be displayed in place of the screen name whenever possible.\n"
 msgstr ""
 
-#: src/gtkblist.c:2667 src/main.c:289
-#, fuzzy
-msgid "Screen Name:"
-msgstr "Номер:"
-
-#: src/gtkblist.c:2693 src/gtkblist.c:3000
-#, fuzzy
-msgid "Group:"
-msgstr "Група"
-
 #. Set up stuff for the account box
-#: src/gtkblist.c:2702 src/gtkblist.c:2971
+#: src/gtkblist.c:3992 src/gtkblist.c:4276
 #, fuzzy
 msgid "Account:"
 msgstr "Акаунт"
 
-#: src/gtkblist.c:2938
+#: src/gtkblist.c:4243
 #, fuzzy
 msgid "Add Chat"
 msgstr "Чат"
 
-#: src/gtkblist.c:2961
+#: src/gtkblist.c:4266
 msgid ""
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
 msgstr ""
 
-#: src/gtkblist.c:3034
+#: src/gtkblist.c:4345
 msgid "Add Group"
 msgstr "Добавяне група"
 
-#: src/gtkblist.c:3034
-#, fuzzy
-msgid "Add a new group"
-msgstr "Добавяне група"
-
-#: src/gtkblist.c:3035
+#: src/gtkblist.c:4346
 msgid "Please enter the name of the group to be added."
 msgstr ""
 
-#: src/gtkblist.c:3547
+#: src/gtkblist.c:4866
 #, fuzzy
 msgid "No actions available"
 msgstr "Недостъпен"
 
-#: src/gtkconn.c:57 src/gtkconn.c:241 src/gtkconn.c:252
+#: src/gtkconn.c:78 src/gtkconn.c:250 src/gtkconn.c:261
 #, fuzzy
 msgid "Done."
 msgstr "Не показва"
 
-#: src/gtkconn.c:136
+#: src/gtkconn.c:157
 #, fuzzy
 msgid "Signon: "
 msgstr "Влизане: %s"
 
-#: src/gtkconn.c:194
+#: src/gtkconn.c:203
 msgid "Signon"
 msgstr "Влизане"
 
-#: src/gtkconn.c:207
+#: src/gtkconn.c:216
 #, fuzzy
 msgid "Cancel All"
 msgstr "Отмяна"
 
-#: src/gtkconn.c:274
-#, fuzzy, c-format
-msgid "%s has been disconnected"
-msgstr "%s излезе"
-
-#: src/gtkconn.c:277
+#: src/gtkconn.c:361 src/gtkconn.c:593
+#, fuzzy
+msgid "_Reconnect"
+msgstr "Не мога да се свържа"
+
+#: src/gtkconn.c:557
+#, c-format
+msgid ""
+"<span weight=\"bold\" size=\"larger\">%s has been disconnected.</span>\n"
+"\n"
+"%s\n"
+"%s"
+msgstr ""
+
+#: src/gtkconn.c:559
 #, fuzzy
 msgid "Reason Unknown."
 msgstr "Незнайна причина"
 
-#: src/gtkconv.c:185
+#: src/gtkconn.c:598
+#, fuzzy
+msgid "Reconnect _All"
+msgstr "Не мога да се свържа"
+
+#: src/gtkconn.c:628
+#, fuzzy
+msgid "Time"
+msgstr "Длъжност"
+
+#: src/gtkconv.c:172
+#, fuzzy, c-format
+msgid "<h1>Conversation with %s</h1>\n"
+msgstr "Разговори"
+
+#: src/gtkconv.c:190
 msgid "That file already exists"
 msgstr ""
 
-#: src/gtkconv.c:186 src/gtkft.c:1034
+#: src/gtkconv.c:191 src/gtkft.c:1106
 msgid "Would you like to overwrite it?"
 msgstr ""
 
-#: src/gtkconv.c:241
-#, fuzzy, c-format
-msgid "Failed to store image: %s\n"
-msgstr "Не мога да чета файл %s"
-
-#: src/gtkconv.c:303
-msgid "Gaim - Insert Image"
-msgstr "Gaim - Вмъкване на образ"
-
-#: src/gtkconv.c:607
-msgid "Gaim - Invite Buddy Into Chat Room"
+#: src/gtkconv.c:505
+#, fuzzy
+msgid "Invite Buddy Into Chat Room"
 msgstr "Gaim - Покана на авер в стаята"
 
 #. Put our happy label in it.
-#: src/gtkconv.c:635
+#: src/gtkconv.c:533
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
 msgstr ""
 
-#: src/gtkconv.c:656
+#: src/gtkconv.c:554
 #, fuzzy
 msgid "_Buddy:"
 msgstr "Авер"
 
-#: src/gtkconv.c:676
+#: src/gtkconv.c:574
 #, fuzzy
 msgid "_Message:"
 msgstr "Съобщение"
 
-#: src/gtkconv.c:1104
+#: src/gtkconv.c:667
+#, fuzzy
+msgid "Find"
+msgstr "Криене на икона"
+
+#: src/gtkconv.c:693
+#, fuzzy
+msgid "_Search for:"
+msgstr "Търсене"
+
+#: src/gtkconv.c:1065
+msgid "IM"
+msgstr "Съобщение"
+
+#: src/gtkconv.c:1073
 msgid "Un-Ignore"
 msgstr "Не-игнориране"
 
-#: src/gtkconv.c:1106 src/gtkprefs.c:774
+#: src/gtkconv.c:1075 src/gtkprefs.c:806
 msgid "Ignore"
 msgstr "Игнориране"
 
 #. Info button
-#: src/gtkconv.c:1115 src/gtkconv.c:3040
+#: src/gtkconv.c:1084 src/gtkconv.c:3352
 msgid "Info"
 msgstr "Инфо"
 
-#: src/gtkconv.c:1124
+#: src/gtkconv.c:1093
 msgid "Get Away Msg"
 msgstr "Вземи away текст"
 
-#: src/gtkconv.c:1135 src/gtkconv.c:3023 src/gtkconv.c:4176
-#: src/gtkrequest.c:208
+#. Remove button
+#: src/gtkconv.c:1105 src/gtkconv.c:3345 src/gtkconv.c:3436
+#: src/gtkrequest.c:241
 msgid "Remove"
 msgstr "Премахване"
 
-#: src/gtkconv.c:2248
+#: src/gtkconv.c:2207
+#, fuzzy
+msgid "Animate"
+msgstr "Покана"
+
+#: src/gtkconv.c:2212
+msgid "Hide Icon"
+msgstr "Криене на икона"
+
+#: src/gtkconv.c:2218
+msgid "Save Icon As..."
+msgstr "Съхранение на иконата като..."
+
+#: src/gtkconv.c:2585
 msgid "User is typing..."
 msgstr ""
 
-#: src/gtkconv.c:2256
+#: src/gtkconv.c:2593
 msgid "User has typed something and paused"
 msgstr ""
 
 #. Build the Send As menu
-#: src/gtkconv.c:2359
+#: src/gtkconv.c:2696
 #, fuzzy
 msgid "_Send As"
 msgstr "Пращане"
 
-#: src/gtkconv.c:2819
-msgid "Gaim - Save Conversation"
-msgstr "Gaim - Записване на разговор"
+#: src/gtkconv.c:3116
+#, fuzzy
+msgid "Save Conversation"
+msgstr "Запис на разгово"
 
 #. Conversation menu
-#: src/gtkconv.c:2836
+#: src/gtkconv.c:3133
 #, fuzzy
 msgid "/_Conversation"
 msgstr "Разговор"
 
-#: src/gtkconv.c:2838
+#: src/gtkconv.c:3135
+#, fuzzy
+msgid "/Conversation/New Instant _Message..."
+msgstr "Изпращане на образ"
+
+#: src/gtkconv.c:3140
+#, fuzzy
+msgid "/Conversation/_Find..."
+msgstr "Разговор"
+
+#: src/gtkconv.c:3142
+#, fuzzy
+msgid "/Conversation/View _Log"
+msgstr "Разговор"
+
+#: src/gtkconv.c:3143
 #, fuzzy
 msgid "/Conversation/_Save As..."
 msgstr "Разговори"
 
-#: src/gtkconv.c:2840
-#, fuzzy
-msgid "/Conversation/View _Log..."
-msgstr "Разговор"
-
-#: src/gtkconv.c:2844
+#: src/gtkconv.c:3148
 #, fuzzy
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "Ново известие"
 
-#: src/gtkconv.c:2846
+#: src/gtkconv.c:3150
+#, fuzzy
+msgid "/Conversation/_Get Info"
+msgstr "Разговор"
+
+#: src/gtkconv.c:3152
+#, fuzzy
+msgid "/Conversation/_Warn..."
+msgstr "Разговор"
+
+#: src/gtkconv.c:3154
+#, fuzzy
+msgid "/Conversation/In_vite..."
+msgstr "Разговор"
+
+#: src/gtkconv.c:3159
 #, fuzzy
 msgid "/Conversation/A_lias..."
 msgstr "Разговори"
 
-#: src/gtkconv.c:2848
-#, fuzzy
-msgid "/Conversation/_Get Info..."
-msgstr "Разговор"
-
-#: src/gtkconv.c:2850
-#, fuzzy
-msgid "/Conversation/In_vite..."
-msgstr "Разговор"
-
-#: src/gtkconv.c:2855
-#, fuzzy
-msgid "/Conversation/Insert _URL..."
-msgstr "Разговори"
-
-#: src/gtkconv.c:2857
-#, fuzzy
-msgid "/Conversation/Insert _Image..."
-msgstr "Изпращане на образ"
-
-#: src/gtkconv.c:2862
-#, fuzzy
-msgid "/Conversation/_Warn..."
-msgstr "Разговор"
-
-#: src/gtkconv.c:2864
+#: src/gtkconv.c:3161
 #, fuzzy
 msgid "/Conversation/_Block..."
 msgstr "Разговор"
 
-#: src/gtkconv.c:2866
+#: src/gtkconv.c:3163
 #, fuzzy
 msgid "/Conversation/_Add..."
 msgstr "Разговор"
 
-#: src/gtkconv.c:2868
+#: src/gtkconv.c:3165
 #, fuzzy
 msgid "/Conversation/_Remove..."
 msgstr "Разговор"
 
-#: src/gtkconv.c:2873
+#: src/gtkconv.c:3170
+#, fuzzy
+msgid "/Conversation/Insert Lin_k..."
+msgstr "Разговори"
+
+#: src/gtkconv.c:3172
+#, fuzzy
+msgid "/Conversation/Insert Imag_e..."
+msgstr "Разговори"
+
+#: src/gtkconv.c:3177
 #, fuzzy
 msgid "/Conversation/_Close"
 msgstr "Разговори"
 
 #. Options
-#: src/gtkconv.c:2877
+#: src/gtkconv.c:3181
 #, fuzzy
 msgid "/_Options"
 msgstr "Опции"
 
-#: src/gtkconv.c:2878
+#: src/gtkconv.c:3182
 #, fuzzy
 msgid "/Options/Enable _Logging"
 msgstr "Позволяване на логванe"
 
-#: src/gtkconv.c:2879
+#: src/gtkconv.c:3183
 #, fuzzy
 msgid "/Options/Enable _Sounds"
 msgstr "Позволяване на звука"
 
-#: src/gtkconv.c:2919
-#, fuzzy
-msgid "/Conversation/View Log..."
+#: src/gtkconv.c:3184
+msgid "/Options/Show Formatting _Toolbar"
+msgstr ""
+
+#: src/gtkconv.c:3226
+#, fuzzy
+msgid "/Conversation/View Log"
 msgstr "Разговор"
 
-#: src/gtkconv.c:2924
+#: src/gtkconv.c:3231
 #, fuzzy
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "Ново известие"
 
-#: src/gtkconv.c:2928
-#, fuzzy
-msgid "/Conversation/Alias..."
-msgstr "Разговори"
-
-#: src/gtkconv.c:2932
-#, fuzzy
-msgid "/Conversation/Get Info..."
+#: src/gtkconv.c:3237
+#, fuzzy
+msgid "/Conversation/Get Info"
 msgstr "Разговор"
 
-#: src/gtkconv.c:2936
+#: src/gtkconv.c:3241
+#, fuzzy
+msgid "/Conversation/Warn..."
+msgstr "Разговор"
+
+#: src/gtkconv.c:3245
 #, fuzzy
 msgid "/Conversation/Invite..."
 msgstr "Разговор"
 
-#: src/gtkconv.c:2942
-#, fuzzy
-msgid "/Conversation/Insert URL..."
+#: src/gtkconv.c:3251
+#, fuzzy
+msgid "/Conversation/Alias..."
 msgstr "Разговори"
 
-#: src/gtkconv.c:2946
-#, fuzzy
-msgid "/Conversation/Insert Image..."
-msgstr "Разговори"
-
-#: src/gtkconv.c:2952
-#, fuzzy
-msgid "/Conversation/Warn..."
-msgstr "Разговор"
-
-#: src/gtkconv.c:2956
+#: src/gtkconv.c:3255
 #, fuzzy
 msgid "/Conversation/Block..."
 msgstr "Разговор"
 
-#: src/gtkconv.c:2960
+#: src/gtkconv.c:3259
 #, fuzzy
 msgid "/Conversation/Add..."
 msgstr "Разговор"
 
-#: src/gtkconv.c:2964
+#: src/gtkconv.c:3263
 #, fuzzy
 msgid "/Conversation/Remove..."
 msgstr "Разговор"
 
-#: src/gtkconv.c:2970
+#: src/gtkconv.c:3269
+#, fuzzy
+msgid "/Conversation/Insert Link..."
+msgstr "Разговори"
+
+#: src/gtkconv.c:3273
+#, fuzzy
+msgid "/Conversation/Insert Image..."
+msgstr "Разговори"
+
+#: src/gtkconv.c:3279
 #, fuzzy
 msgid "/Options/Enable Logging"
 msgstr "Позволяване на логванe"
 
-#: src/gtkconv.c:2973
+#: src/gtkconv.c:3282
 #, fuzzy
 msgid "/Options/Enable Sounds"
 msgstr "Позволяване на звука"
 
+#: src/gtkconv.c:3285
+msgid "/Options/Show Formatting Toolbar"
+msgstr ""
+
 #. From right to left...
 #. Send button
-#: src/gtkconv.c:2997 src/gtkconv.c:2999 src/gtkconv.c:3097 src/gtkconv.c:3099
-#: src/gtkconv.c:5958
+#: src/gtkconv.c:3308 src/gtkconv.c:3310 src/gtkconv.c:3408 src/gtkconv.c:3410
 msgid "Send"
 msgstr "Пращане"
 
-#: src/gtkconv.c:3020 src/gtkconv.c:4194
+#. Now, um, just kind of all over the place. Huh?
+#. Warn button
+#: src/gtkconv.c:3324
+msgid "Warn"
+msgstr "Предуреждение"
+
+#: src/gtkconv.c:3327
+msgid "Warn the user"
+msgstr ""
+
+#. Block button
+#: src/gtkconv.c:3331 src/gtkprivacy.c:612 src/gtkprivacy.c:623
+msgid "Block"
+msgstr "Блокиране"
+
+#: src/gtkconv.c:3334
+#, fuzzy
+msgid "Block the user"
+msgstr "Блокирай потребителите по-долу"
+
+#: src/gtkconv.c:3341
 #, fuzzy
 msgid "Add the user to your buddy list"
 msgstr "Позволи само потребителите по долу"
 
-#: src/gtkconv.c:3026 src/gtkconv.c:4179
+#: src/gtkconv.c:3348
 #, fuzzy
 msgid "Remove the user from your buddy list"
 msgstr "Премахване на '%s' от листа.\n"
 
-#. Warn button
-#: src/gtkconv.c:3033
-msgid "Warn"
-msgstr "Предуреждение"
-
-#: src/gtkconv.c:3037
-msgid "Warn the user"
-msgstr ""
-
-#: src/gtkconv.c:3044 src/gtkconv.c:3479
+#: src/gtkconv.c:3355 src/gtkconv.c:3677
 msgid "Get the user's information"
 msgstr ""
 
-#. Block button
-#: src/gtkconv.c:3047 src/gtkprivacy.c:605 src/gtkprivacy.c:616
-msgid "Block"
-msgstr "Блокиране"
-
-#: src/gtkconv.c:3051
-#, fuzzy
-msgid "Block the user"
-msgstr "Блокирай потребителите по-долу"
-
 #. Invite
-#: src/gtkconv.c:3109 src/gtkconv.c:5961
+#: src/gtkconv.c:3422
 msgid "Invite"
 msgstr "Покана"
 
-#: src/gtkconv.c:3112
+#: src/gtkconv.c:3425
 #, fuzzy
 msgid "Invite a user"
 msgstr "Невалидно име"
 
-#: src/gtkconv.c:3151
-msgid "Bold"
-msgstr "Удебелен"
-
-#: src/gtkconv.c:3162
-#, fuzzy
-msgid "Italic"
-msgstr "Наклонен"
-
-#: src/gtkconv.c:3173
-msgid "Underline"
-msgstr "Подчертан"
-
-#: src/gtkconv.c:3189
-#, fuzzy
-msgid "Larger font size"
-msgstr "Пренебрегва размерите на шрифта"
-
-#: src/gtkconv.c:3201
-msgid "Normal font size"
-msgstr "Нормален размер на шрифт"
-
-#: src/gtkconv.c:3213
-#, fuzzy
-msgid "Smaller font size"
-msgstr "Нормален размер на шрифт"
-
-#: src/gtkconv.c:3230
-#, fuzzy
-msgid "Font Face"
-msgstr "Шрифт за текст"
-
-#: src/gtkconv.c:3242
-#, fuzzy
-msgid "Foreground font color"
-msgstr "Фонов цвят"
-
-#: src/gtkconv.c:3254
-#, fuzzy
-msgid "Background color"
-msgstr "Фонов цвят"
-
-#: src/gtkconv.c:3269
-#, fuzzy
-msgid "Insert image"
-msgstr "Изпращане на образ"
-
-#: src/gtkconv.c:3280
-#, fuzzy
-msgid "Insert link"
-msgstr "Вмъкване на връзка"
-
-#: src/gtkconv.c:3291
-#, fuzzy
-msgid "Insert smiley"
-msgstr "Вмъкване на гримаса"
-
-#: src/gtkconv.c:3348
+#: src/gtkconv.c:3432
+#, fuzzy
+msgid "Add the chat to your buddy list"
+msgstr "Позволи само потребителите по долу"
+
+#: src/gtkconv.c:3439
+#, fuzzy
+msgid "Remove the chat from your buddy list"
+msgstr "Премахване на '%s' от листа.\n"
+
+#: src/gtkconv.c:3539
 msgid "Topic:"
 msgstr "Заглавие:"
 
 #. Setup the label telling how many people are in the room.
-#: src/gtkconv.c:3399
+#: src/gtkconv.c:3599
 msgid "0 people in room"
 msgstr "0 човека в стаята"
 
-#: src/gtkconv.c:3456
+#: src/gtkconv.c:3654
 msgid "IM the user"
 msgstr ""
 
-#: src/gtkconv.c:3468
+#: src/gtkconv.c:3666
 #, fuzzy
 msgid "Ignore the user"
 msgstr "Пренебрегва размерите на шрифта"
 
-#: src/gtkconv.c:3962 src/server.c:1380
-#, c-format
-msgid "<HR><BR><H3 Align=Center> ---- New Conversation @ %s ----</H3><BR>\n"
-msgstr ""
-
-#: src/gtkconv.c:3966 src/server.c:1383
-#, c-format
-msgid "---- New Conversation @ %s ----\n"
-msgstr ""
-
-#: src/gtkconv.c:3999
+#: src/gtkconv.c:4207
 #, fuzzy
 msgid "Close conversation"
 msgstr "Разговор"
 
-#: src/gtkconv.c:4683 src/gtkconv.c:4715 src/gtkconv.c:4836 src/gtkconv.c:4903
+#: src/gtkconv.c:4752 src/gtkconv.c:4784 src/gtkconv.c:4905 src/gtkconv.c:4972
 #, fuzzy, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "%d %s в стаята"
 msgstr[1] "%d %s в стаята"
 
-#: src/gtkconv.c:5225
-msgid "Disable Animation"
-msgstr "Забрана на анимаци"
-
-#: src/gtkconv.c:5234
-msgid "Enable Animation"
-msgstr "Позволяване на анимации"
-
-#: src/gtkconv.c:5241
-msgid "Hide Icon"
-msgstr "Криене на икона"
-
-#: src/gtkconv.c:5247
-msgid "Save Icon As..."
-msgstr "Съхранение на иконата като..."
-
-#: src/gtkconv.c:5728 src/gtkconv.c:5731
+#: src/gtkconv.c:5491 src/gtkconv.c:5494
 #, fuzzy
 msgid "<main>/Conversation/Close"
 msgstr "Разговори"
 
-#: src/gtkdebug.c:133
+#: src/gtkdebug.c:135
 #, fuzzy
 msgid "Debug Window"
 msgstr "Показва Debug прозорец"
 
-#: src/gtkdebug.c:173
+#: src/gtkdebug.c:175
 #, fuzzy
 msgid "Pause"
 msgstr "TOC пауза"
 
-#: src/gtkdebug.c:179
+#: src/gtkdebug.c:181
 #, fuzzy
 msgid "Timestamps"
 msgstr "Тест"
 
-#: src/gtkft.c:126
+#: src/gtkft.c:135
 #, c-format
 msgid "%.2f KB/s"
 msgstr ""
 
-#: src/gtkft.c:200
+#: src/gtkft.c:156 src/gtkft.c:957
+msgid "Finished"
+msgstr ""
+
+#: src/gtkft.c:209
 msgid "<b>Receiving From:</b>"
 msgstr ""
 
-#: src/gtkft.c:203
+#: src/gtkft.c:212
 msgid "<b>Sending To:</b>"
 msgstr ""
 
-#: src/gtkft.c:436
+#: 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:443
+#: src/gtkft.c:489
 #, fuzzy
 msgid "Filename"
 msgstr "Преименуване"
 
-#: src/gtkft.c:450
+#: src/gtkft.c:496
 msgid "Size"
 msgstr ""
 
-#: src/gtkft.c:457
+#: src/gtkft.c:503
 msgid "Remaining"
 msgstr ""
 
-#: src/gtkft.c:487
+#: src/gtkft.c:533
 #, fuzzy
 msgid "Filename:"
 msgstr "Преименуване"
 
-#: src/gtkft.c:488
+#: src/gtkft.c:534
 #, fuzzy
 msgid "Status:"
 msgstr "Статус: %s"
 
-#: src/gtkft.c:489
+#: src/gtkft.c:535
 #, fuzzy
 msgid "Speed:"
 msgstr "Сървър:"
 
-#: src/gtkft.c:490
+#: src/gtkft.c:536
 msgid "Time Elapsed:"
 msgstr ""
 
-#: src/gtkft.c:491
+#: src/gtkft.c:537
 msgid "Time Remaining:"
 msgstr ""
 
-#: src/gtkft.c:588
+#: src/gtkft.c:634
 msgid "_Keep the dialog open"
 msgstr ""
 
-#: src/gtkft.c:598
+#: src/gtkft.c:644
 msgid "_Clear finished transfers"
 msgstr ""
 
 #. "Download Details" arrow
-#: src/gtkft.c:607
-msgid "Show download details"
-msgstr ""
-
-#: src/gtkft.c:608
-msgid "Hide download details"
-msgstr ""
+#: src/gtkft.c:653
+#, fuzzy
+msgid "Show transfer details"
+msgstr "Прокси"
+
+#: src/gtkft.c:654
+#, fuzzy
+msgid "Hide transfer details"
+msgstr "Не мога да пиша"
 
 #. Pause button
-#: src/gtkft.c:650 src/stock.c:86
+#: src/gtkft.c:696 src/stock.c:90
 #, fuzzy
 msgid "_Pause"
 msgstr "TOC пауза"
 
 #. Resume button
-#: src/gtkft.c:660
+#: src/gtkft.c:706
 #, fuzzy
 msgid "_Resume"
 msgstr "TOC продължение"
 
-#: src/gtkft.c:1011
+#: src/gtkft.c:908
+#, fuzzy
+msgid "Canceled"
+msgstr "Отмяна"
+
+#: src/gtkft.c:910
+#, fuzzy
+msgid "Failed"
+msgstr "Файл"
+
+#: src/gtkft.c:1082
 msgid "That file does not exist."
 msgstr ""
 
-#: src/gtkft.c:1020
+#: src/gtkft.c:1091
 msgid "Cannot send a file of 0 bytes."
 msgstr ""
 
-#: src/gtkft.c:1033
+#: src/gtkft.c:1105
 msgid "That file already exists."
 msgstr ""
 
-#: src/gtkft.c:1058
-#, fuzzy
-msgid "Gaim - Open..."
+#: src/gtkft.c:1131
+#, fuzzy
+msgid "Open..."
 msgstr "Gaim - Запис като..."
 
-#: src/gtkft.c:1060 src/protocols/toc/toc.c:2041
-msgid "Gaim - Save As..."
-msgstr "Gaim - Запис като..."
-
-#: src/gtkft.c:1107
+#: src/gtkft.c:1133
+#, fuzzy
+msgid "Save As..."
+msgstr "Съхранение на иконата като..."
+
+#: src/gtkft.c:1183
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr ""
 
-#: src/gtkimhtml.c:535
+#: src/gtkft.c:1216
+#, c-format
+msgid "Accept file transfer request from %s?"
+msgstr ""
+
+#: src/gtkft.c:1220
+#, c-format
+msgid ""
+"A file is available for download from:\n"
+"Remote host: %s\n"
+"Remote port: %d"
+msgstr ""
+
+#: src/gtkimhtml.c:1131
 msgid "_Copy E-Mail Address"
 msgstr ""
 
-#: src/gtkimhtml.c:547
+#: src/gtkimhtml.c:1143
 msgid "_Copy Link Location"
 msgstr ""
 
-#: src/gtkimhtml.c:557
+#: src/gtkimhtml.c:1153
 msgid "_Open Link in Browser"
 msgstr ""
 
-#: src/gtkimhtml.c:1639
+#: src/gtkimhtml.c:2635
 msgid ""
 "Unable to guess the image type based on the file extension supplied.  "
 "Defaulting to PNG."
 msgstr ""
 
-#: src/gtkimhtml.c:1647
+#: src/gtkimhtml.c:2643
 #, c-format
 msgid "Error saving image: %s"
 msgstr ""
 
-#: src/gtkimhtml.c:1656
+#: src/gtkimhtml.c:2652
 #, fuzzy
 msgid "Save Image"
 msgstr "IM образ"
 
-#: src/gtkimhtml.c:1679
+#: src/gtkimhtml.c:2675
 #, fuzzy
 msgid "_Save Image..."
 msgstr "Съхранение на иконата като..."
 
-#: src/gtknotify.c:209
+#: src/gtkimhtmltoolbar.c:383
+#, fuzzy
+msgid "_URL"
+msgstr "URL"
+
+#: src/gtkimhtmltoolbar.c:387
+#, fuzzy
+msgid "_Description"
+msgstr "Описание"
+
+#: src/gtkimhtmltoolbar.c:392
+msgid "Insert Link"
+msgstr "Вмъкване на връзка"
+
+#: src/gtkimhtmltoolbar.c:394
+msgid ""
+"Please enter the URL and description of the link that you want to insert. "
+"The description is optional."
+msgstr ""
+
+#: src/gtkimhtmltoolbar.c:398
+#, fuzzy
+msgid "_Insert"
+msgstr "Вмъкване на връзка"
+
+#: src/gtkimhtmltoolbar.c:455
+#, fuzzy, c-format
+msgid "Failed to store image: %s\n"
+msgstr "Не мога да чета файл %s"
+
+#: src/gtkimhtmltoolbar.c:481
+#, fuzzy
+msgid "Insert Image"
+msgstr "Изпращане на образ"
+
+#. show everything
+#: src/gtkimhtmltoolbar.c:625
+msgid "Smile!"
+msgstr "Усмивка!"
+
+#: src/gtkimhtmltoolbar.c:825
+msgid "Bold"
+msgstr "Удебелен"
+
+#: src/gtkimhtmltoolbar.c:836
+#, fuzzy
+msgid "Italic"
+msgstr "Наклонен"
+
+#: src/gtkimhtmltoolbar.c:847
+msgid "Underline"
+msgstr "Подчертан"
+
+#: src/gtkimhtmltoolbar.c:863
+#, fuzzy
+msgid "Larger font size"
+msgstr "Пренебрегва размерите на шрифта"
+
+#: src/gtkimhtmltoolbar.c:875
+#, fuzzy
+msgid "Smaller font size"
+msgstr "Нормален размер на шрифт"
+
+#: src/gtkimhtmltoolbar.c:892
+#, fuzzy
+msgid "Font Face"
+msgstr "Шрифт за текст"
+
+#: src/gtkimhtmltoolbar.c:904
+#, fuzzy
+msgid "Foreground font color"
+msgstr "Фонов цвят"
+
+#: src/gtkimhtmltoolbar.c:916
+#, fuzzy
+msgid "Background color"
+msgstr "Фонов цвят"
+
+#: src/gtkimhtmltoolbar.c:931
+#, fuzzy
+msgid "Insert link"
+msgstr "Вмъкване на връзка"
+
+#: src/gtkimhtmltoolbar.c:941
+#, fuzzy
+msgid "Insert image"
+msgstr "Изпращане на образ"
+
+#: src/gtkimhtmltoolbar.c:952
+#, fuzzy
+msgid "Insert smiley"
+msgstr "Вмъкване на гримаса"
+
+#: src/gtklog.c:282
+#, fuzzy
+msgid "Conversations with"
+msgstr "Разговори"
+
+#. Window **********
+#: src/gtklog.c:368 src/gtklog.c:384
+#, fuzzy
+msgid "System Log"
+msgstr "Системен лог"
+
+#. Descriptive label
+#: src/gtknotify.c:217
 #, fuzzy, c-format
 msgid "%s has %d new message."
 msgid_plural "%s has %d new messages."
 msgstr[0] "<i>Потребителя няма съобщение за отсъствие</i>"
 msgstr[1] "<i>Потребителя няма съобщение за отсъствие</i>"
 
-#: src/gtknotify.c:217
+#: src/gtknotify.c:229
 #, c-format
 msgid "<span weight=\"bold\">From:</span> %s\n"
 msgstr ""
 
-#: src/gtknotify.c:222
+#: src/gtknotify.c:235
 #, c-format
 msgid "<span weight=\"bold\">Subject:</span> %s\n"
 msgstr ""
 
-#: src/gtknotify.c:226
+#: src/gtknotify.c:239
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
@@ -3003,7 +3339,7 @@
 "%s%s%s%s"
 msgstr ""
 
-#: src/gtknotify.c:241
+#: src/gtknotify.c:255
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
@@ -3011,719 +3347,793 @@
 "%s"
 msgstr ""
 
-#: src/gtknotify.c:412 src/gtknotify.c:432 src/gtknotify.c:440
+#: src/gtknotify.c:441
+#, c-format
+msgid "The browser command \"%s\" is invalid."
+msgstr ""
+
+#: src/gtknotify.c:444 src/gtknotify.c:458 src/gtknotify.c:473
+#: src/gtknotify.c:581
 #, fuzzy
 msgid "Unable to open URL"
 msgstr "Не може да се изпрати: прекалено голямо"
 
-#: src/gtknotify.c:413
+#: src/gtknotify.c:455 src/gtknotify.c:470
+#, fuzzy, c-format
+msgid "Error launching \"%s\": %s"
+msgstr "Пропадна промяна на паролата (%s)"
+
+#: src/gtknotify.c:582
 msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr ""
 
-#: src/gtknotify.c:430
-#, c-format
-msgid "The browser \"%s\" is invalid."
-msgstr ""
-
-#: src/gtknotify.c:437
-#, c-format
-msgid "Error launching \"command\": %s"
-msgstr ""
-
-#: src/gtkpounce.c:140
+#: src/gtkpounce.c:143
 #, fuzzy
 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:383 src/gtkpounce.c:788
+#: src/gtkpounce.c:336 src/gtkpounce.c:756
 msgid "New Buddy Pounce"
 msgstr "Ново известие"
 
-#: src/gtkpounce.c:383
+#: src/gtkpounce.c:336
 #, fuzzy
 msgid "Edit Buddy Pounce"
 msgstr "Ново известие"
 
 #. Create the "Pounce Who" frame.
-#: src/gtkpounce.c:401
+#: src/gtkpounce.c:354
 msgid "Pounce Who"
 msgstr "Извести кого"
 
-#: src/gtkpounce.c:427
+#: src/gtkpounce.c:381
 #, fuzzy
 msgid "_Buddy Name:"
 msgstr "Чат"
 
 #. Create the "Pounce When" frame.
-#: src/gtkpounce.c:449
+#: src/gtkpounce.c:404
 msgid "Pounce When"
 msgstr "Известяване при"
 
-#: src/gtkpounce.c:457 src/main.c:339
-#, fuzzy
-msgid "Sign on"
+#: src/gtkpounce.c:412
+#, fuzzy
+msgid "_Sign on"
 msgstr "Влизане"
 
-#: src/gtkpounce.c:459
-#, fuzzy
-msgid "Sign off"
+#: src/gtkpounce.c:414
+#, fuzzy
+msgid "Sign _off"
 msgstr "Излизане"
 
-#: src/gtkpounce.c:463
-#, fuzzy
-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:465 src/gtkprefs.c:1498 src/protocols/msn/state.c:30
-#: src/protocols/yahoo/yahoo.c:2028
-#, fuzzy
-msgid "Idle"
+#: src/gtkpounce.c:420
+#, fuzzy
+msgid "_Idle"
 msgstr "Бездейства:"
 
-#: src/gtkpounce.c:467
-#, fuzzy
-msgid "Return from idle"
+#: src/gtkpounce.c:422
+#, fuzzy
+msgid "Retur_n from idle"
 msgstr "Известяване при прекратяване на бездействието"
 
-#: src/gtkpounce.c:469
-#, fuzzy
-msgid "Buddy starts typing"
+#: src/gtkpounce.c:424
+#, fuzzy
+msgid "Buddy starts _typing"
 msgstr "Лист авери"
 
-#: src/gtkpounce.c:471
-#, fuzzy
-msgid "Buddy stops typing"
+#: src/gtkpounce.c:426
+#, fuzzy
+msgid "Buddy stops t_yping"
 msgstr "Икона"
 
 #. Create the "Pounce Action" frame.
-#: src/gtkpounce.c:500
+#: src/gtkpounce.c:455
 msgid "Pounce Action"
 msgstr "Действия"
 
-#: src/gtkpounce.c:507
-#, fuzzy
-msgid "Open an IM window"
+#: src/gtkpounce.c:462
+#, fuzzy
+msgid "Op_en an IM window"
 msgstr "Отваряне прозорец за съобщение"
 
-#: src/gtkpounce.c:508
-#, fuzzy
-msgid "Popup notification"
+#: src/gtkpounce.c:463
+#, fuzzy
+msgid "_Popup notification"
 msgstr "Показващо се известяване"
 
-#: src/gtkpounce.c:509
-#, fuzzy
-msgid "Send a message"
+#: src/gtkpounce.c:464
+#, fuzzy
+msgid "Send a _message"
 msgstr "Изпрати като съобщение"
 
-#: src/gtkpounce.c:510
-#, fuzzy
-msgid "Execute a command"
+#: src/gtkpounce.c:465
+#, fuzzy
+msgid "E_xecute a command"
 msgstr "Изпълняване"
 
-#: src/gtkpounce.c:511
-#, fuzzy
-msgid "Play a sound"
+#: src/gtkpounce.c:466
+#, fuzzy
+msgid "P_lay a sound"
 msgstr "Звук"
 
-#: src/gtkpounce.c:515 src/gtkpounce.c:517
-msgid "Browse"
+#: src/gtkpounce.c:470
+#, fuzzy
+msgid "B_rowse..."
+msgstr "Преглеждане"
+
+#: src/gtkpounce.c:472
+#, fuzzy
+msgid "Bro_wse..."
 msgstr "Преглеждане"
 
-#: src/gtkpounce.c:518 src/gtkprefs.c:2087
-msgid "Test"
-msgstr "Тест"
-
-#: src/gtkpounce.c:601
-#, fuzzy
-msgid "_Save this pounce after activation"
+#: src/gtkpounce.c:473
+msgid "Pre_view"
+msgstr ""
+
+#: src/gtkpounce.c:556
+#, fuzzy
+msgid "Sav_e this pounce after activation"
 msgstr "Запиши това известяване след активирането"
 
 #. "Remove Buddy Pounce"
-#: src/gtkpounce.c:795
+#: src/gtkpounce.c:763
 msgid "Remove Buddy Pounce"
 msgstr "Премахване на известие"
 
-#: src/gtkpounce.c:836
+#: src/gtkpounce.c:813
 #, c-format
 msgid "%s has started typing to you"
 msgstr ""
 
-#: src/gtkpounce.c:837
+#: src/gtkpounce.c:814
 #, fuzzy, c-format
 msgid "%s has signed on"
 msgstr "%s излезе"
 
-#: src/gtkpounce.c:838
+#: src/gtkpounce.c:815
 #, fuzzy, c-format
 msgid "%s has returned from being idle"
 msgstr "Известяване при прекратяване на бездействието"
 
-#: src/gtkpounce.c:839
+#: src/gtkpounce.c:816
 #, fuzzy, c-format
 msgid "%s has returned from being away"
 msgstr "Известяване при връщане от остсъствие"
 
-#: src/gtkpounce.c:840
+#: src/gtkpounce.c:817
 #, c-format
 msgid "%s has stopped typing to you"
 msgstr ""
 
-#: src/gtkpounce.c:841
+#: src/gtkpounce.c:818
 #, fuzzy, c-format
 msgid "%s has signed off"
 msgstr "%s излезе"
 
-#: src/gtkpounce.c:842
+#: src/gtkpounce.c:819
 #, fuzzy, c-format
 msgid "%s has become idle"
 msgstr "%s излезе"
 
-#: src/gtkpounce.c:844
+#: src/gtkpounce.c:821
 msgid "Unknown pounce event. Please report this!"
 msgstr ""
 
-#: src/gtkprefs.c:373
+#: src/gtkprefs.c:388
 #, fuzzy
 msgid "Interface Options"
 msgstr "Общи"
 
-#: src/gtkprefs.c:375
+#: src/gtkprefs.c:390
 msgid "D_isplay remote nicknames if no alias is set"
 msgstr ""
 
-#: src/gtkprefs.c:561
+#: src/gtkprefs.c:584
 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."
 msgstr ""
 
-#: src/gtkprefs.c:594
+#: src/gtkprefs.c:619
 #, fuzzy
 msgid "Icon"
 msgstr "Икона"
 
-#: src/gtkprefs.c:668
+#: src/gtkprefs.c:626 src/gtkprefs.c:2028 src/protocols/jabber/buddy.c:265
+#: src/protocols/jabber/buddy.c:748 src/protocols/jabber/chat.c:684
+msgid "Description"
+msgstr "Описание"
+
+#: src/gtkprefs.c:693
 #, fuzzy
 msgid "Style"
 msgstr "Състояние"
 
-#: src/gtkprefs.c:669
+#: src/gtkprefs.c:694
 #, fuzzy
 msgid "_Bold"
 msgstr "Удебелен"
 
-#: src/gtkprefs.c:671
-#, fuzzy
-msgid "_Italics"
+#: src/gtkprefs.c:696
+#, fuzzy
+msgid "_Italic"
 msgstr "Наклонен"
 
-#: src/gtkprefs.c:673
+#: src/gtkprefs.c:698
 #, fuzzy
 msgid "_Underline"
 msgstr "Подчертан"
 
-#: src/gtkprefs.c:675
+#. 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:708
 #, fuzzy
 msgid "_Strikethrough"
 msgstr "Пресечен през текста"
 
-#: src/gtkprefs.c:678
+#: src/gtkprefs.c:711
 #, fuzzy
 msgid "Face"
 msgstr "Отмяна"
 
-#: src/gtkprefs.c:681
+#: src/gtkprefs.c:714
 #, fuzzy
 msgid "Use custo_m face"
 msgstr "Вмъкване на гримаса"
 
-#: src/gtkprefs.c:698
+#: src/gtkprefs.c:731
 #, fuzzy
 msgid "Use custom si_ze"
 msgstr "Вмъкване на гримаса"
 
-#: src/gtkprefs.c:711
+#: src/gtkprefs.c:743
 msgid "Color"
 msgstr "Цвят"
 
-#: src/gtkprefs.c:715
+#: src/gtkprefs.c:747
 #, fuzzy
 msgid "_Text color"
 msgstr "Цвят на текст"
 
-#: src/gtkprefs.c:734
+#: src/gtkprefs.c:766
 #, fuzzy
 msgid "Bac_kground color"
 msgstr "Фонов цвят"
 
-#: src/gtkprefs.c:762 src/gtkprefs.c:1003 src/gtkprefs.c:1056
+#: src/gtkprefs.c:794 src/gtkprefs.c:1026 src/gtkprefs.c:1074
 #, fuzzy
 msgid "Display"
 msgstr "Авери - показване"
 
-#: src/gtkprefs.c:763
+#: src/gtkprefs.c:795
 #, fuzzy
 msgid "Show graphical _smileys"
 msgstr "Графични гримаси"
 
-#: src/gtkprefs.c:765
+#: src/gtkprefs.c:797
 #, fuzzy
 msgid "Show _timestamp on messages"
 msgstr "Показва време на съобщение"
 
-#: src/gtkprefs.c:767
+#: src/gtkprefs.c:799
 #, fuzzy
 msgid "Show _URLs as links"
 msgstr "Показва URL като връзки"
 
-#: src/gtkprefs.c:771
+#: src/gtkprefs.c:803
 #, fuzzy
 msgid "_Highlight misspelled words"
 msgstr "Осветя збъркани думи"
 
-#: src/gtkprefs.c:775
+#: src/gtkprefs.c:807
 #, fuzzy
 msgid "Ignore c_olors"
 msgstr "Пренебрегва цвят"
 
-#: src/gtkprefs.c:777
+#: src/gtkprefs.c:809
 #, fuzzy
 msgid "Ignore font _faces"
 msgstr "Пренебрегва шрифт"
 
-#: src/gtkprefs.c:779
+#: src/gtkprefs.c:811
 #, fuzzy
 msgid "Ignore font si_zes"
 msgstr "Пренебрегва размерите на шрифта"
 
-#: src/gtkprefs.c:792
+#: src/gtkprefs.c:824
 msgid "Send Message"
 msgstr "Изпращане на съобщение"
 
-#: src/gtkprefs.c:793
+#: src/gtkprefs.c:825
 #, fuzzy
 msgid "Enter _sends message"
 msgstr "Enter изпраща съобщение"
 
-#: src/gtkprefs.c:795
+#: src/gtkprefs.c:827
 #, fuzzy
 msgid "C_ontrol-Enter sends message"
 msgstr "Ctrl-Enter изпраща съобщение"
 
-#: src/gtkprefs.c:798
+#: src/gtkprefs.c:830
 #, fuzzy
 msgid "Window Closing"
 msgstr "Прозорец за съобщения"
 
-#: src/gtkprefs.c:799
+#: src/gtkprefs.c:831
 #, fuzzy
 msgid "_Escape closes window"
 msgstr "Esc затваря прозорец"
 
-#: src/gtkprefs.c:802
+#: src/gtkprefs.c:834
 #, fuzzy
 msgid "Insertions"
 msgstr "Вмъкване на връзка"
 
-#: src/gtkprefs.c:803
+#: src/gtkprefs.c:835
 #, fuzzy
 msgid "Control-{B/I/U} inserts _HTML tags"
 msgstr "Ctrl-{B/I/U/S} вмъква HTML таг"
 
-#: src/gtkprefs.c:805
+#: src/gtkprefs.c:837
 #, fuzzy
 msgid "Control-(number) _inserts smileys"
 msgstr "Ctrl-(цифра) вмъква гримаса"
 
-#: src/gtkprefs.c:822
+#: src/gtkprefs.c:853
 #, fuzzy
 msgid "Buddy List Sorting"
 msgstr "Лист авери"
 
-#: src/gtkprefs.c:831
-#, fuzzy
-msgid "Sorting:"
+#: src/gtkprefs.c:862
+#, fuzzy
+msgid "_Sorting:"
 msgstr "Порт"
 
-#: src/gtkprefs.c:836
+#: src/gtkprefs.c:867
 #, fuzzy
 msgid "Buddy List Toolbar"
 msgstr "Лист"
 
-#: src/gtkprefs.c:837 src/gtkprefs.c:973 src/gtkprefs.c:1029
+#: src/gtkprefs.c:868 src/gtkprefs.c:999 src/gtkprefs.c:1050
 #, fuzzy
 msgid "Show _buttons as:"
 msgstr "Бутоните като:"
 
-#: src/gtkprefs.c:839 src/gtkprefs.c:975 src/gtkprefs.c:1031
+#: src/gtkprefs.c:870 src/gtkprefs.c:1001 src/gtkprefs.c:1052
 msgid "Pictures"
 msgstr "Картини"
 
-#: src/gtkprefs.c:840 src/gtkprefs.c:976 src/gtkprefs.c:1032
+#: src/gtkprefs.c:871 src/gtkprefs.c:1002 src/gtkprefs.c:1053
 msgid "Text"
 msgstr "Текст"
 
-#: src/gtkprefs.c:841 src/gtkprefs.c:977 src/gtkprefs.c:1033
+#: src/gtkprefs.c:872 src/gtkprefs.c:1003 src/gtkprefs.c:1054
 #, fuzzy
 msgid "Pictures and text"
 msgstr "Картини и текст"
 
-#: src/gtkprefs.c:846 src/gtkprefs.c:991 src/gtkprefs.c:1047
+#: src/gtkprefs.c:877 src/gtkprefs.c:1014 src/gtkprefs.c:1065
 #, fuzzy
 msgid "_Raise window on events"
 msgstr "Повдига прозорец при събитие"
 
-#: src/gtkprefs.c:849
+#: src/gtkprefs.c:880
 #, fuzzy
 msgid "Group Display"
 msgstr "Групи"
 
-#: src/gtkprefs.c:850
+#: src/gtkprefs.c:881
 #, fuzzy
 msgid "Show _numbers in groups"
 msgstr "Показва броя в групата"
 
-#: src/gtkprefs.c:853
+#: src/gtkprefs.c:884
 #, fuzzy
 msgid "Buddy Display"
 msgstr "Авери - показване"
 
-#: src/gtkprefs.c:854 src/gtkprefs.c:998
+#: src/gtkprefs.c:885 src/gtkprefs.c:1021
 #, fuzzy
 msgid "Show buddy _icons"
 msgstr "Показва типови икони"
 
-#: src/gtkprefs.c:856
+#: src/gtkprefs.c:887
 #, fuzzy
 msgid "Show _warning levels"
 msgstr "Показва нива на предупреждение"
 
-#: src/gtkprefs.c:859
+#: src/gtkprefs.c:889
 #, fuzzy
 msgid "Show idle _times"
 msgstr "Покава време на бездействие"
 
-#: src/gtkprefs.c:873
+#: src/gtkprefs.c:891
 #, fuzzy
 msgid "Dim i_dle buddies"
 msgstr "Посивява бездайстващи авери"
 
-#: src/gtkprefs.c:898
+#: src/gtkprefs.c:893
+msgid "_Automatically expand contacts"
+msgstr ""
+
+#: src/gtkprefs.c:918
 #, fuzzy
 msgid "_Placement:"
 msgstr "Поставяне на етикети:"
 
-#: src/gtkprefs.c:905
-#, fuzzy
-msgid "Send _URLs as Links"
+#: src/gtkprefs.c:925
+#, fuzzy
+msgid "Send _URLs as links"
 msgstr "Показва URL като връзки"
 
-#: src/gtkprefs.c:908
+#: src/gtkprefs.c:928
+msgid "Show _formatting toolbar"
+msgstr ""
+
+#: src/gtkprefs.c:931
+#, fuzzy
+msgid "Show a_liases in tabs/titles"
+msgstr "Показва прякор в етикети/заглавия"
+
+#: src/gtkprefs.c:934
 #, fuzzy
 msgid "Tab Options"
 msgstr "Чат"
 
-#: src/gtkprefs.c:910
+#: src/gtkprefs.c:936
 #, fuzzy
 msgid "_Tab Placement:"
 msgstr "Постявяне на етикети"
 
-#: src/gtkprefs.c:912
+#: src/gtkprefs.c:938
 msgid "Top"
 msgstr "Горе"
 
-#: src/gtkprefs.c:913
+#: src/gtkprefs.c:939
 #, fuzzy
 msgid "Bottom"
 msgstr "Долу"
 
-#: src/gtkprefs.c:914
+#: src/gtkprefs.c:940
 msgid "Left"
 msgstr "Ляво"
 
-#: src/gtkprefs.c:915
+#: src/gtkprefs.c:941
 msgid "Right"
 msgstr "Дясно"
 
-#: src/gtkprefs.c:921
+#: src/gtkprefs.c:947
 #, fuzzy
 msgid "Show IMs and chats in _tabbed windows"
 msgstr "Чат-овете в един прозорец с етикети"
 
-#: src/gtkprefs.c:924
+#: src/gtkprefs.c:950
 #, fuzzy
 msgid "Show IMs and chats in _same tabbed window"
 msgstr "Чат-овете в един прозорец с етикети"
 
-#: src/gtkprefs.c:934
+#: src/gtkprefs.c:960
 #, fuzzy
 msgid "Show _close button on tabs"
 msgstr "Бутоните като:"
 
-#: src/gtkprefs.c:945
+#: src/gtkprefs.c:971
 #, fuzzy
 msgid "Show status _icons on tabs"
 msgstr "Бутоните като:"
 
-#: src/gtkprefs.c:972 src/gtkprefs.c:1028
+#: src/gtkprefs.c:998 src/gtkprefs.c:1049
 #, fuzzy
 msgid "Window"
 msgstr "Прозорец за съобщения"
 
-#: src/gtkprefs.c:982 src/gtkprefs.c:1038
+#: src/gtkprefs.c:1008 src/gtkprefs.c:1059
 #, fuzzy
 msgid "New window _width:"
 msgstr "Ширина на прозореца"
 
-#: src/gtkprefs.c:985 src/gtkprefs.c:1041
+#: src/gtkprefs.c:1010 src/gtkprefs.c:1061
 #, fuzzy
 msgid "New window _height:"
 msgstr "Височина на прозореца"
 
-#: src/gtkprefs.c:988 src/gtkprefs.c:1044
+#: src/gtkprefs.c:1012 src/gtkprefs.c:1063
 #, fuzzy
 msgid "_Entry field height:"
 msgstr "Височина на полето за писане"
 
-#: src/gtkprefs.c:993
+#: src/gtkprefs.c:1016
 #, fuzzy
 msgid "Hide window on _send"
 msgstr "Криене на прозореца след изпращане"
 
-#: src/gtkprefs.c:997
+#: src/gtkprefs.c:1020
 msgid "Buddy Icons"
 msgstr "Икони"
 
-#: src/gtkprefs.c:1000
+#: src/gtkprefs.c:1023
 #, fuzzy
 msgid "Enable buddy icon a_nimation"
 msgstr "Забрана анимацията на икони"
 
-#: src/gtkprefs.c:1004
+#: src/gtkprefs.c:1027
 #, fuzzy
 msgid "Show _logins in window"
 msgstr "Показва влизанията в прозореца"
 
-#: src/gtkprefs.c:1006
-#, fuzzy
-msgid "Show a_liases in tabs/titles"
-msgstr "Показва прякор в етикети/заглавия"
-
-#: src/gtkprefs.c:1009
+#: src/gtkprefs.c:1030
 #, fuzzy
 msgid "Typing Notification"
 msgstr "Показващо се известяване"
 
-#: src/gtkprefs.c:1010
+#: src/gtkprefs.c:1031
 #, fuzzy
 msgid "Notify buddies that you are _typing to them"
 msgstr "Оповестява дригия при писане"
 
-#: src/gtkprefs.c:1050
+#: src/gtkprefs.c:1068
 msgid "Tab Completion"
 msgstr "Етикетно допълване"
 
-#: src/gtkprefs.c:1051
+#: src/gtkprefs.c:1069
 #, fuzzy
 msgid "_Tab-complete nicks"
 msgstr "Tab - допълва прякор"
 
-#: src/gtkprefs.c:1053
+#: src/gtkprefs.c:1071
 #, fuzzy
 msgid "_Old-style tab completion"
 msgstr "Стар стил допълване на прякора"
 
-#: src/gtkprefs.c:1057
+#: src/gtkprefs.c:1075
 #, fuzzy
 msgid "_Show people joining in window"
 msgstr "Показва влизащи/излизащи хора в прозореца "
 
-#: src/gtkprefs.c:1059
+#: src/gtkprefs.c:1077
 #, fuzzy
 msgid "_Show people leaving in window"
 msgstr "Показва влизащи/излизащи хора в прозореца "
 
-#: src/gtkprefs.c:1061
-msgid "Co_lorize screennames"
-msgstr ""
-
-#: src/gtkprefs.c:1105
+#: src/gtkprefs.c:1079
+#, fuzzy
+msgid "Co_lorize screen names"
+msgstr "Номер:"
+
+#: src/gtkprefs.c:1100 src/protocols/oscar/oscar.c:584
+#: src/protocols/oscar/oscar.c:4220
+#, fuzzy
+msgid "IP Address"
+msgstr "Улица"
+
+#: src/gtkprefs.c:1102
+#, fuzzy
+msgid "_Autodetect IP Address"
+msgstr "Улица"
+
+#: src/gtkprefs.c:1111
+msgid "Public _IP:"
+msgstr ""
+
+#: src/gtkprefs.c:1135
+#, fuzzy
+msgid "Ports"
+msgstr "Порт"
+
+#: src/gtkprefs.c:1138
+msgid "_Manually specify range of ports to listen on"
+msgstr ""
+
+#: src/gtkprefs.c:1141
+#, fuzzy
+msgid "_Start Port:"
+msgstr "Порт"
+
+#: src/gtkprefs.c:1148
+#, fuzzy
+msgid "_End Port:"
+msgstr "Порт"
+
+#: src/gtkprefs.c:1196
 msgid "Proxy Type"
 msgstr "Тип Proxy"
 
-#: src/gtkprefs.c:1108
+#: src/gtkprefs.c:1199
 #, fuzzy
 msgid "No proxy"
 msgstr "Без прокси"
 
-#: src/gtkprefs.c:1115
+#: src/gtkprefs.c:1206
 msgid "Proxy Server"
 msgstr "Proxy сървър"
 
-#: src/gtkprefs.c:1136
-#, fuzzy
-msgid "_Host"
-msgstr "Хост"
-
-#: src/gtkprefs.c:1153 src/protocols/irc/irc.c:551
-#: src/protocols/jabber/jabber.c:1087 src/protocols/msn/msn.c:1617
-#: src/protocols/napster/napster.c:642 src/protocols/trepia/trepia.c:1335
-msgid "Port"
-msgstr "Порт"
-
-#: src/gtkprefs.c:1171
-#, fuzzy
-msgid "_User"
-msgstr "Потребител"
-
-#: src/gtkprefs.c:1188
-#, fuzzy
-msgid "Pa_ssword"
-msgstr "Парола"
-
-#: src/gtkprefs.c:1225
+#: src/gtkprefs.c:1264
+#, fuzzy
+msgid "_User:"
+msgstr "Потребител:"
+
+#: src/gtkprefs.c:1320
 msgid "Opera"
 msgstr "Opera"
 
-#: src/gtkprefs.c:1226
+#: src/gtkprefs.c:1321
 msgid "Netscape"
 msgstr "Netscape"
 
-#: src/gtkprefs.c:1227
+#: src/gtkprefs.c:1322
 msgid "Mozilla"
 msgstr ""
 
-#: src/gtkprefs.c:1228
+#: src/gtkprefs.c:1323
 msgid "Konqueror"
 msgstr ""
 
-#: src/gtkprefs.c:1229
+#: src/gtkprefs.c:1324
 msgid "Galeon"
 msgstr "Галеон"
 
-#: src/gtkprefs.c:1238
+#: src/gtkprefs.c:1325
+msgid "Firebird"
+msgstr ""
+
+#: src/gtkprefs.c:1326
+msgid "Firefox"
+msgstr ""
+
+#: src/gtkprefs.c:1327
+msgid "Gnome Default"
+msgstr ""
+
+#: src/gtkprefs.c:1336
 msgid "Manual"
 msgstr "Ръчно"
 
-#: src/gtkprefs.c:1279
+#: src/gtkprefs.c:1387
 msgid "Browser Selection"
 msgstr ""
 
-#: src/gtkprefs.c:1283
+#: src/gtkprefs.c:1391
 #, fuzzy
 msgid "_Browser:"
 msgstr "Браузър"
 
-#: src/gtkprefs.c:1293
+#: src/gtkprefs.c:1398
+#, fuzzy
+msgid "_Open link in:"
+msgstr "Онлайн"
+
+#: src/gtkprefs.c:1400
+#, fuzzy
+msgid "Browser default"
+msgstr "Браузър"
+
+#: src/gtkprefs.c:1401
+#, fuzzy
+msgid "Existing window"
+msgstr "Затворяне на прозореца"
+
+#: src/gtkprefs.c:1403
+msgid "New tab"
+msgstr ""
+
+#: src/gtkprefs.c:1417
 #, c-format
 msgid ""
 "_Manual:\n"
 "(%s for URL)"
 msgstr ""
 
-#: src/gtkprefs.c:1314
-#, fuzzy
-msgid "Browser Options"
-msgstr "Прокси"
-
-#: src/gtkprefs.c:1315
-#, fuzzy
-msgid "Open new _window by default"
-msgstr "Покава нов прозорец по подразбиране"
-
-#: src/gtkprefs.c:1330
+#: src/gtkprefs.c:1454
 #, fuzzy
 msgid "Message Logs"
 msgstr "Съобщения"
 
-#: src/gtkprefs.c:1331
+#: src/gtkprefs.c:1457
+msgid "Log _Format:"
+msgstr ""
+
+#: src/gtkprefs.c:1460
 #, fuzzy
 msgid "_Log all instant messages"
 msgstr "Ново съобщение"
 
-#: src/gtkprefs.c:1333
+#: src/gtkprefs.c:1462
 #, fuzzy
 msgid "Log all c_hats"
 msgstr "Логва всички разговори"
 
-#: src/gtkprefs.c:1335
-#, fuzzy
-msgid "Strip _HTML from logs"
-msgstr "Премахва HTML от логовете"
-
-#: src/gtkprefs.c:1338
+#: src/gtkprefs.c:1465
 #, fuzzy
 msgid "System Logs"
 msgstr "Системен лог"
 
-#: src/gtkprefs.c:1339
+#: src/gtkprefs.c:1467
+msgid "_Enable system log"
+msgstr ""
+
+#: src/gtkprefs.c:1470
 #, fuzzy
 msgid "Log when buddies _sign on/sign off"
 msgstr "Логва авера при влизане/излизане"
 
-#: src/gtkprefs.c:1341
+#: src/gtkprefs.c:1476
 #, fuzzy
 msgid "Log when buddies become _idle/un-idle"
 msgstr "Логва авера при бездействие/връщане"
 
-#: src/gtkprefs.c:1343
+#: src/gtkprefs.c:1482
 #, fuzzy
 msgid "Log when buddies go away/come _back"
 msgstr "Логва авера при смяна остсъствие/връщане"
 
-#: src/gtkprefs.c:1345
+#: src/gtkprefs.c:1488
 #, fuzzy
 msgid "Log your _own signons/idleness/awayness"
 msgstr "Логва собствено влизане/бездействие/остсъствие"
 
-#: src/gtkprefs.c:1347
-#, fuzzy
-msgid "I_ndividual log file for each buddy's signons"
-msgstr "Отделен лог файл за всяко влизане на авера"
-
-#: src/gtkprefs.c:1390
+#: src/gtkprefs.c:1539
 msgid "Sound Options"
 msgstr "Звук"
 
-#: src/gtkprefs.c:1391
-#, fuzzy
-msgid "_No sounds when you log in"
+#: src/gtkprefs.c:1540
+#, fuzzy
+msgid "Sounds when you _log in"
 msgstr "Без звук при мое влизане"
 
-#: src/gtkprefs.c:1393
+#: src/gtkprefs.c:1542
+#, fuzzy
+msgid "Sounds when conversation has _focus"
+msgstr "Разговор"
+
+#: src/gtkprefs.c:1544
 #, fuzzy
 msgid "_Sounds while away"
 msgstr "Звук при отсъствие"
 
-#: src/gtkprefs.c:1397
+#: src/gtkprefs.c:1548
 #, fuzzy
 msgid "Sound Method"
 msgstr "Звуков метод"
 
-#: src/gtkprefs.c:1398
+#: src/gtkprefs.c:1549
 #, fuzzy
 msgid "_Method:"
 msgstr "Звуков метод"
 
-#: src/gtkprefs.c:1400
+#: src/gtkprefs.c:1551
 msgid "Console beep"
 msgstr ""
 
-#: src/gtkprefs.c:1402
+#: src/gtkprefs.c:1553
 msgid "Automatic"
 msgstr ""
 
-#: src/gtkprefs.c:1409
+#: src/gtkprefs.c:1560
 msgid "Command"
 msgstr ""
 
-#: src/gtkprefs.c:1419
+#: src/gtkprefs.c:1570
 #, fuzzy, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -3732,78 +4142,85 @@
 "Звукова команда\n"
 "(%s за файла)"
 
-#: src/gtkprefs.c:1474
+#: src/gtkprefs.c:1627
 #, fuzzy
 msgid "_Sending messages removes away status"
 msgstr "Изпращането премахва отсъствие"
 
-#: src/gtkprefs.c:1476
+#: src/gtkprefs.c:1629
 #, fuzzy
 msgid "_Queue new messages when away"
 msgstr "Съобщенията в опашка при отсъствие"
 
-#: src/gtkprefs.c:1479
+#: src/gtkprefs.c:1632
 #, fuzzy
 msgid "Auto-response"
 msgstr "Не изпраща авто-орговори"
 
-#: src/gtkprefs.c:1482
+#: src/gtkprefs.c:1635
 msgid "Seconds before _resending:"
 msgstr ""
 
-#: src/gtkprefs.c:1485
+#: src/gtkprefs.c:1638
 #, fuzzy
 msgid "_Send auto-response"
 msgstr "Не изпраща авто-орговори"
 
-#: src/gtkprefs.c:1487
+#: src/gtkprefs.c:1640
 #, fuzzy
 msgid "_Only send auto-response when idle"
 msgstr "Авто-отговори само при бездействие"
 
-#: src/gtkprefs.c:1489
+#: src/gtkprefs.c:1642
 #, fuzzy
 msgid "Send auto-response in _active conversations"
 msgstr "Не изпраща авто-орговори"
 
-#: src/gtkprefs.c:1499
+#: src/gtkprefs.c:1651 src/protocols/msn/state.c:30
+#: src/protocols/novell/novell.c:2150 src/protocols/oscar/oscar.c:3378
+#: src/protocols/yahoo/yahoo.c:2295
+#, fuzzy
+msgid "Idle"
+msgstr "Бездейства:"
+
+#: src/gtkprefs.c:1652
 msgid "Idle _time reporting:"
 msgstr ""
 
-#: src/gtkprefs.c:1502
+#: src/gtkprefs.c:1655
 #, fuzzy
 msgid "Gaim usage"
 msgstr "Използване на Gaim"
 
-#: src/gtkprefs.c:1505
+#: src/gtkprefs.c:1658
 #, fuzzy
 msgid "X usage"
 msgstr "Използване на X"
 
-#: src/gtkprefs.c:1507
+#: src/gtkprefs.c:1660
 #, fuzzy
 msgid "Windows usage"
 msgstr "Прозорец за съобщения"
 
-#: src/gtkprefs.c:1515
+#: src/gtkprefs.c:1668
 #, fuzzy
 msgid "Auto-away"
 msgstr "Отсъствие"
 
-#: src/gtkprefs.c:1516
+#: src/gtkprefs.c:1669
 msgid "Set away _when idle"
 msgstr ""
 
-#: src/gtkprefs.c:1518
+#: src/gtkprefs.c:1673
 msgid "_Minutes before setting away:"
 msgstr ""
 
-#: src/gtkprefs.c:1525
+#: src/gtkprefs.c:1681
 #, fuzzy
 msgid "Away m_essage:"
 msgstr "Съобщение за отсъствие"
 
-#: src/gtkprefs.c:1587
+#: src/gtkprefs.c:1756
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -3813,7 +4230,7 @@
 "<span weight=\"bold\">File name:</span>\t%s"
 msgstr ""
 
-#: src/gtkprefs.c:1592
+#: src/gtkprefs.c:1761
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -3823,192 +4240,204 @@
 "<span weight=\"bold\">File name:</span>  %s"
 msgstr ""
 
-#: src/gtkprefs.c:1773
+#: src/gtkprefs.c:1984
 msgid "Load"
 msgstr "Зареждане"
 
-#: src/gtkprefs.c:1780 src/protocols/jabber/jabber.c:544
-#: src/protocols/msn/msn.c:1303 src/protocols/trepia/trepia.c:392
-#, fuzzy
-msgid "Name"
-msgstr "Псевдоним"
-
-#: src/gtkprefs.c:1827
+#: src/gtkprefs.c:1998
+msgid "Summary"
+msgstr ""
+
+#: src/gtkprefs.c:2046
 msgid "Details"
 msgstr ""
 
-#: src/gtkprefs.c:1954
+#: src/gtkprefs.c:2173
 #, fuzzy
 msgid "Sound Selection"
 msgstr "Звук"
 
-#: src/gtkprefs.c:2061
+#: src/gtkprefs.c:2280
 msgid "Play"
 msgstr ""
 
-#: src/gtkprefs.c:2068
+#: src/gtkprefs.c:2287
 msgid "Event"
 msgstr ""
 
-#: src/gtkprefs.c:2091
+#: src/gtkprefs.c:2306
+msgid "Test"
+msgstr "Тест"
+
+#: src/gtkprefs.c:2310
 msgid "Reset"
 msgstr "Подразбиране"
 
-#: src/gtkprefs.c:2095
+#: src/gtkprefs.c:2314
 msgid "Choose..."
 msgstr "Избор..."
 
-#: src/gtkprefs.c:2229
+#: src/gtkprefs.c:2449
 #, fuzzy
 msgid "_Edit"
 msgstr "Редактиране"
 
-#: src/gtkprefs.c:2265
+#: src/gtkprefs.c:2485
 #, fuzzy
 msgid "Interface"
 msgstr "Инстанция:"
 
-#: src/gtkprefs.c:2266
+#: src/gtkprefs.c:2486
 #, fuzzy
 msgid "Smiley Themes"
 msgstr "Вмъкване на гримаса"
 
-#: src/gtkprefs.c:2267
+#: src/gtkprefs.c:2487
 #, fuzzy
 msgid "Fonts"
 msgstr "Шрифт"
 
-#: src/gtkprefs.c:2268
+#: src/gtkprefs.c:2488
 #, fuzzy
 msgid "Message Text"
 msgstr "Съобщения"
 
-#: src/gtkprefs.c:2269
+#: src/gtkprefs.c:2489
 msgid "Shortcuts"
 msgstr ""
 
-#: src/gtkprefs.c:2272
+#: src/gtkprefs.c:2492
 #, fuzzy
 msgid "IMs"
 msgstr "Съобщение"
 
-#: src/gtkprefs.c:2274
+#: src/gtkprefs.c:2494
+msgid "Network"
+msgstr ""
+
+#: src/gtkprefs.c:2495
 msgid "Proxy"
 msgstr "Прокси"
 
 #. We use the registered default browser in windows
-#: src/gtkprefs.c:2277
+#: src/gtkprefs.c:2498
 msgid "Browser"
 msgstr "Браузър"
 
-#: src/gtkprefs.c:2279
+#: src/gtkprefs.c:2500
 msgid "Logging"
 msgstr "Архив"
 
-#: src/gtkprefs.c:2280
+#: src/gtkprefs.c:2501
 msgid "Sounds"
 msgstr "Звук"
 
-#: src/gtkprefs.c:2281
+#: src/gtkprefs.c:2502
 #, fuzzy
 msgid "Sound Events"
 msgstr "Звук"
 
-#: src/gtkprefs.c:2282
+#: src/gtkprefs.c:2503
 #, fuzzy
 msgid "Away / Idle"
 msgstr "Заглавие на отсъствие"
 
-#: src/gtkprefs.c:2283
+#: src/gtkprefs.c:2504
 msgid "Away Messages"
 msgstr "Съобщение за отсъствие"
 
-#: src/gtkprefs.c:2286
+#: src/gtkprefs.c:2507
+#, fuzzy
+msgid "Protocols"
+msgstr "Протокол:"
+
+#: src/gtkprefs.c:2508
 msgid "Plugins"
 msgstr "Плъгини"
 
-#: src/gtkprivacy.c:86
+#: src/gtkprivacy.c:77
 msgid "Allow all users to contact me"
 msgstr "Пoзволи всички"
 
-#: src/gtkprivacy.c:87
+#: src/gtkprivacy.c:78
 #, fuzzy
 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
 #, fuzzy
 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:368
+#: src/gtkprivacy.c:374 src/protocols/jabber/jabber.c:1272
 #, fuzzy
 msgid "Privacy"
 msgstr "Уединиение"
 
-#: src/gtkprivacy.c:383
+#: src/gtkprivacy.c:389
 msgid "Changes to privacy settings take effect immediately."
 msgstr ""
 
 #. "Set privacy for:" label
-#: src/gtkprivacy.c:395
+#: src/gtkprivacy.c:401
 msgid "Set privacy for:"
 msgstr "Уединие за:"
 
-#: src/gtkprivacy.c:562 src/gtkprivacy.c:578
+#: src/gtkprivacy.c:569 src/gtkprivacy.c:585
 #, fuzzy
 msgid "Permit User"
 msgstr "Позволяване"
 
-#: src/gtkprivacy.c:563
+#: src/gtkprivacy.c:570
 msgid "Type a user you permit to contact you."
 msgstr ""
 
-#: src/gtkprivacy.c:564
+#: src/gtkprivacy.c:571
 msgid "Please enter the name of the user you wish to be able to contact you."
 msgstr ""
 
-#: src/gtkprivacy.c:567 src/gtkprivacy.c:580
+#: src/gtkprivacy.c:574 src/gtkprivacy.c:587
 msgid "Permit"
 msgstr "Позволяване"
 
-#: src/gtkprivacy.c:572
+#: src/gtkprivacy.c:579
 #, fuzzy, c-format
 msgid "Allow %s to contact you?"
 msgstr "Пoзволи всички"
 
-#: src/gtkprivacy.c:574
+#: src/gtkprivacy.c:581
 #, fuzzy, c-format
 msgid "Are you sure you wish to allow %s to contact you?"
 msgstr "Сигирни ли сте за изтриването на %s?"
 
-#: src/gtkprivacy.c:601 src/gtkprivacy.c:614
+#: src/gtkprivacy.c:608 src/gtkprivacy.c:621
 #, fuzzy
 msgid "Block User"
 msgstr "Блокирай потребителите по-долу"
 
-#: src/gtkprivacy.c:602
+#: src/gtkprivacy.c:609
 msgid "Type a user to block."
 msgstr ""
 
-#: src/gtkprivacy.c:603
-msgid "Please enter the name of the user you wish to block."
-msgstr ""
-
 #: src/gtkprivacy.c:610
+msgid "Please enter the name of the user you wish to block."
+msgstr ""
+
+#: src/gtkprivacy.c:617
 #, fuzzy, c-format
 msgid "Block %s?"
 msgstr "Забранен лист"
 
-#: src/gtkprivacy.c:612
+#: src/gtkprivacy.c:619
 #, fuzzy, c-format
 msgid "Are you sure you want to block %s?"
 msgstr "Сигирни ли сте за изтриването на %s?"
@@ -4016,223 +4445,183 @@
 #. *
 #. * A wrapper for gaim_request_action() that uses Yes and No buttons.
 #.
-#: src/gtkrequest.c:200 src/protocols/gg/gg.c:660 src/request.h:843
+#: src/gtkrequest.c:233 src/protocols/gg/gg.c:663
+#: src/protocols/novell/novell.c:1317 src/request.h:1231
 msgid "Yes"
 msgstr "Да"
 
-#: src/gtkrequest.c:201 src/protocols/gg/gg.c:660 src/request.h:843
+#: src/gtkrequest.c:234 src/protocols/gg/gg.c:663
+#: src/protocols/novell/novell.c:1318 src/request.h:1231
 msgid "No"
 msgstr "Не"
 
-#: src/gtkrequest.c:204
+#: src/gtkrequest.c:237
 msgid "Apply"
 msgstr ""
 
-#: src/gtksound.c:60
+#: src/gtkrequest.c:238 src/protocols/msn/msn.c:261
+msgid "Close"
+msgstr "Затваряне"
+
+#: 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
 #, fuzzy
 msgid "Buddy logs in"
 msgstr "Икона"
 
-#: src/gtksound.c:61
+#: src/gtksound.c:63
 #, fuzzy
 msgid "Buddy logs out"
 msgstr "Лист"
 
-#: src/gtksound.c:62
+#: src/gtksound.c:64
 #, fuzzy
 msgid "Message received"
 msgstr "Грешка на съобщението"
 
-#: src/gtksound.c:63
+#: src/gtksound.c:65
 msgid "Message received begins conversation"
 msgstr ""
 
-#: src/gtksound.c:64
-#, fuzzy
-msgid "Message sent"
-msgstr "Съобщения"
-
-#: src/gtksound.c:65
-msgid "Person enters chat"
-msgstr ""
-
 #: src/gtksound.c:66
-msgid "Person leaves chat"
-msgstr ""
+#, fuzzy
+msgid "Message sent"
+msgstr "Съобщения"
 
 #: src/gtksound.c:67
-msgid "You talk in chat"
+msgid "Person enters chat"
 msgstr ""
 
 #: src/gtksound.c:68
+msgid "Person leaves chat"
+msgstr ""
+
+#: src/gtksound.c:69
+msgid "You talk in chat"
+msgstr ""
+
+#: src/gtksound.c:70
 msgid "Others talk in chat"
 msgstr ""
 
-#: src/gtksound.c:71
+#: src/gtksound.c:73
 msgid "Someone says your name in chat"
 msgstr ""
 
-#: src/gtksound.c:153
+#: src/gtksound.c:158
 #, c-format
 msgid "Unable to play sound because the chosen file (%s) does not exist."
 msgstr ""
 
-#: src/gtksound.c:169
+#: src/gtksound.c:174
 msgid ""
 "Unable to play sound because the 'Command' sound method has been chosen, but "
 "no command has been set."
 msgstr ""
 
-#: src/gtksound.c:178
+#: src/gtksound.c:186
 #, c-format
 msgid ""
 "Unable to play sound because the configured sound command could not be "
 "launched: %s"
 msgstr ""
 
-#: src/gtkutils.c:286
+#: src/gtkutils.c:297
 msgid "Can't save icon file to disk."
 msgstr ""
 
-#: src/gtkutils.c:321
-msgid "Gaim - Save Icon"
-msgstr "Gaim - Записване на икона"
-
-#: src/log.c:30
-msgid "Error in specifying buddy conversation."
-msgstr ""
-
-#: src/log.c:36
-#, fuzzy
-msgid "Unable to find conversation log"
-msgstr "Не може да се изпрати: прекалено голямо"
-
-#: src/log.c:119 src/log.c:140 src/log.c:153
-#, fuzzy, c-format
-msgid "Unable to make directory %s for logging"
-msgstr "Не мога да отворя директна връзка"
-
-#: src/log.c:207 src/log.c:223
-#, c-format
-msgid "IM Sessions with %s\n"
-msgstr ""
-
-#: src/log.c:210 src/log.c:226
-#, c-format
-msgid "IM Sessions with %s"
-msgstr ""
-
-#: src/log.c:270
-#, c-format
-msgid "+++ %s (%s) signed on @ %s"
-msgstr ""
-
-#: src/log.c:275
-#, fuzzy, c-format
-msgid "+++ %s (%s) signed off @ %s"
-msgstr "%s излезе"
-
-#: src/log.c:280
-#, c-format
-msgid "+++ %s (%s) changed away state @ %s"
-msgstr ""
-
-#: src/log.c:285
-#, c-format
-msgid "+++ %s (%s) came back @ %s"
-msgstr ""
-
-#: src/log.c:290
-#, c-format
-msgid "+++ %s (%s) became idle @ %s"
-msgstr ""
-
-#: src/log.c:295
-#, c-format
-msgid "+++ %s (%s) returned from idle @ %s"
-msgstr ""
-
-#: src/log.c:300
-#, c-format
-msgid "+++ Program exit @ %s"
-msgstr ""
-
-#: src/log.c:307
-#, c-format
-msgid "%s (%s) reported that %s (%s) signed on @ %s"
-msgstr ""
-
-#: src/log.c:312
-#, c-format
-msgid "%s (%s) reported that %s (%s) signed off @ %s"
-msgstr ""
-
-#: src/log.c:317
-#, c-format
-msgid "%s (%s) reported that %s (%s) went away @ %s"
-msgstr ""
-
-#: src/log.c:322
-#, c-format
-msgid "%s (%s) reported that %s (%s) came back @ %s"
-msgstr ""
-
-#: src/log.c:327
-#, c-format
-msgid "%s (%s) reported that %s (%s) became idle @ %s"
-msgstr ""
-
-#: src/log.c:333
-#, c-format
-msgid "%s (%s) reported that %s (%s) returned from idle @ %s"
-msgstr ""
-
-#: src/log.c:345
-#, c-format
-msgid "%s (%s) reported that %s signed on @ %s"
-msgstr ""
-
-#: src/log.c:350
-#, c-format
-msgid "%s (%s) reported that %s signed off @ %s"
-msgstr ""
-
-#: src/log.c:355
-#, c-format
-msgid "%s (%s) reported that %s went away @ %s"
-msgstr ""
-
-#: src/log.c:360
-#, c-format
-msgid "%s (%s) reported that %s came back @ %s"
-msgstr ""
-
-#: src/log.c:365
-#, c-format
-msgid "%s (%s) reported that %s became idle @ %s"
-msgstr ""
-
-#: src/log.c:371
-#, c-format
-msgid "%s (%s) reported that %s returned from idle @ %s"
-msgstr ""
-
-#: src/main.c:148
-#, fuzzy
-msgid "Please enter your login."
+#: src/gtkutils.c:332
+#, fuzzy
+msgid "Save Icon"
+msgstr "Съхранение на иконата като..."
+
+#: src/log.c:106
+msgid "<b><font color=\"red\">The logger has no read function</font></b>"
+msgstr ""
+
+#: src/log.c:476
+msgid "XML"
+msgstr ""
+
+#: src/log.c:561
+#, c-format
+msgid ""
+"<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
+"REPLY&gt;:</b></font> %s<br/>\n"
+msgstr ""
+
+#: src/log.c:563
+#, c-format
+msgid ""
+"<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
+"REPLY&gt;:</b></font> %s<br/>\n"
+msgstr ""
+
+#: src/log.c:614 src/log.c:800
+msgid "<font color=\"red\"><b>Unable to find log path!</b></font>"
+msgstr ""
+
+#: src/log.c:624 src/log.c:812
+#, c-format
+msgid "<font color=\"red\"><b>Could not read file: %s</b></font>"
+msgstr ""
+
+#: src/log.c:661
+msgid "HTML"
+msgstr ""
+
+#: src/log.c:745
+#, c-format
+msgid "(%s) %s <AUTO-REPLY>: %s\n"
+msgstr ""
+
+#: src/log.c:845
+msgid "Plain text"
+msgstr ""
+
+#: src/main.c:155
+#, fuzzy
+msgid "Please create an account."
 msgstr "Моля въведете вашия логин"
 
-#: src/main.c:231
-msgid "<New User>"
-msgstr ""
-
-#: src/main.c:273
+#: src/main.c:237
 #, fuzzy
 msgid "Login"
 msgstr "Архив"
 
+#: src/main.c:255
+#, fuzzy
+msgid "<b>Screen Name:</b>"
+msgstr "Номер:"
+
+#: src/main.c:269
+#, fuzzy
+msgid "<b>Password:</b>"
+msgstr "Парола"
+
+#: src/main.c:298
+#, fuzzy
+msgid "Sign on"
+msgstr "Влизане"
+
 #. full help text
-#: src/main.c:550
+#: src/main.c:522
 #, c-format
 msgid ""
 "Gaim %s\n"
@@ -4245,44 +4634,46 @@
 "                      account(s) to use, seperated by commas)\n"
 "  -n, --loginwin      don't automatically login; show login window\n"
 "  -u, --user=NAME     use account NAME\n"
-"  -f, --file=FILE     use FILE as config\n"
+"  -c, --config=DIR    use DIR for config files\n"
 "  -d, --debug         print debugging messages to stdout\n"
 "  -v, --version       display the current version and exit\n"
 "  -h, --help          display this help and exit\n"
 msgstr ""
 
 #. short message
-#: src/main.c:565
+#: src/main.c:537
 #, c-format
 msgid "Gaim %s. Try `%s -h' for more information.\n"
 msgstr ""
 
-#: src/plugin.c:260
+#: src/plugin.c:269
 #, c-format
 msgid ""
 "The required plugin %s was not found. Please install this plugin and try "
 "again."
 msgstr ""
 
-#: src/plugin.c:265 src/plugin.c:293
+#: src/plugin.c:274 src/plugin.c:302
 #, fuzzy
 msgid "Gaim was unable to load your plugin."
 msgstr "Gaim не успя да изпрати съобщение"
 
-#: src/plugin.c:289
+#: src/plugin.c:298
 #, c-format
 msgid "The required plugin %s was unable to load."
 msgstr ""
 
-#: src/prefs.c:111 src/status.c:270
+#: src/prefs.c:113 src/status.c:273
 msgid "Slightly less boring default"
 msgstr ""
 
-#: src/protocols/gg/gg.c:49 src/protocols/jabber/jutil.c:109
-#: src/protocols/msn/msn.c:344 src/protocols/msn/state.c:27
+#: src/protocols/gg/gg.c:49 src/protocols/jabber/jutil.c:44
+#: src/protocols/msn/msn.c:360 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:2304
-#: src/protocols/yahoo/yahoo.c:2405
+#: src/protocols/msn/state.c:36 src/protocols/novell/novell.c:2141
+#: src/protocols/novell/novell.c:2258 src/protocols/novell/novell.c:2309
+#: src/protocols/oscar/oscar.c:603 src/protocols/yahoo/yahoo.c:2599
+#: src/protocols/yahoo/yahoo.c:2714
 #, fuzzy
 msgid "Available"
 msgstr "Недостъпен"
@@ -4295,11 +4686,12 @@
 msgid "Away for friends only"
 msgstr ""
 
-#: src/protocols/gg/gg.c:53 src/protocols/jabber/jabber.c:871
-#: src/protocols/jabber/presence.c:88 src/protocols/oscar/oscar.c:2837
-#: src/protocols/oscar/oscar.c:4517 src/protocols/oscar/oscar.c:4544
-#: src/protocols/oscar/oscar.c:6069 src/protocols/yahoo/yahoo.c:2026
-#: src/protocols/yahoo/yahoo.c:2324 src/protocols/yahoo/yahoo.c:2415
+#: src/protocols/gg/gg.c:53 src/protocols/jabber/jabber.c:956
+#: src/protocols/jabber/presence.c:126 src/protocols/oscar/oscar.c:524
+#: src/protocols/oscar/oscar.c:4738 src/protocols/oscar/oscar.c:4816
+#: src/protocols/oscar/oscar.c:4840 src/protocols/oscar/oscar.c:6431
+#: src/protocols/oscar/oscar.c:6436 src/protocols/yahoo/yahoo.c:2293
+#: src/protocols/yahoo/yahoo.c:2619 src/protocols/yahoo/yahoo.c:2724
 #, fuzzy
 msgid "Invisible"
 msgstr "Покана"
@@ -4316,11 +4708,14 @@
 msgid "Unable to resolve hostname."
 msgstr "Не може да бъде намерено името."
 
-#: src/protocols/gg/gg.c:139
+#: src/protocols/gg/gg.c:139 src/protocols/novell/novell.c:1159
 msgid "Unable to connect to server."
 msgstr "Не мога да се свържа със сървъра."
 
-#: src/protocols/gg/gg.c:142
+#: 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:104
 msgid "Invalid response from server."
 msgstr "Грешен отговор от сървъра."
 
@@ -4354,235 +4749,244 @@
 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/toc/toc.c:200
+#: src/protocols/gg/gg.c:402 src/protocols/icq/gaim_icq.c:344
+#: src/protocols/msn/dispatch.c:208 src/protocols/msn/msn.c:514
+#: src/protocols/msn/servconn.c:77 src/protocols/napster/napster.c:475
+#: src/protocols/napster/napster.c:506 src/protocols/toc/toc.c:200
+#: src/protocols/yahoo/yahoo.c:1958 src/protocols/yahoo/yahoo.c:1989
+#: src/protocols/yahoo/yahoo.c:2052 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
+#: src/protocols/gg/gg.c:418
 msgid "Reading data"
 msgstr "Четене на дани"
 
-#: src/protocols/gg/gg.c:418
+#: src/protocols/gg/gg.c:421
 msgid "Balancer handshake"
 msgstr "?Балансирано ръкостискане?"
 
-#: src/protocols/gg/gg.c:421
+#: src/protocols/gg/gg.c:424
 msgid "Reading server key"
 msgstr "Четене на ключа на сървъра"
 
-#: src/protocols/gg/gg.c:424
+#: 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\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 "Не мога да пингна сървъра"
 
-#: 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:3892
+#: src/protocols/gg/gg.c:667 src/protocols/oscar/oscar.c:4212
 msgid "UIN"
 msgstr "UIN"
 
-#: src/protocols/gg/gg.c:668
-msgid "First name"
+#. First Name
+#: src/protocols/gg/gg.c:671 src/protocols/jabber/jabber.c:606
+#: src/protocols/oscar/oscar.c:4223 src/protocols/trepia/trepia.c:267
+msgid "First Name"
 msgstr "Име"
 
 #. Last Name
-#: src/protocols/gg/gg.c:673 src/protocols/jabber/jabber.c:564
-#: src/protocols/oscar/oscar.c:3900 src/protocols/trepia/trepia.c:265
+#: src/protocols/gg/gg.c:676 src/protocols/jabber/jabber.c:611
+#: src/protocols/oscar/oscar.c:4224 src/protocols/trepia/trepia.c:274
 msgid "Last Name"
 msgstr "Фамилно име"
 
-#: src/protocols/gg/gg.c:677 src/protocols/gg/gg.c:1389
-#: src/protocols/irc/msgs.c:183 src/protocols/oscar/oscar.c:3894
+#: src/protocols/gg/gg.c:680 src/protocols/gg/gg.c:1392
+#: src/protocols/irc/msgs.c:183 src/protocols/oscar/oscar.c:4213
 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:574
-#: src/protocols/oscar/oscar.c:3946 src/protocols/oscar/oscar.c:3962
-#: src/protocols/trepia/trepia.c:322 src/protocols/trepia/trepia.c:421
+#: src/protocols/gg/gg.c:704 src/protocols/jabber/jabber.c:621
+#: src/protocols/oscar/oscar.c:4266 src/protocols/oscar/oscar.c:4274
+#: src/protocols/trepia/trepia.c:331 src/protocols/trepia/trepia.c:410
 msgid "City"
 msgstr "Град"
 
 #. res[0] == username
-#: src/protocols/gg/gg.c:722 src/protocols/msn/msn.c:1241
-#: src/protocols/msn/msn.c:1483 src/protocols/napster/napster.c:387
-#: src/protocols/oscar/oscar.c:2879 src/protocols/oscar/oscar.c:3187
-#: src/protocols/toc/toc.c:498 src/protocols/yahoo/yahoo.c:2581
-#: src/protocols/yahoo/yahoo.c:2603 src/protocols/yahoo/yahoo.c:2623
-#: src/protocols/yahoo/yahoo.c:2810 src/protocols/zephyr/zephyr.c:355
+#. show it to the user
+#: src/protocols/gg/gg.c:725 src/protocols/msn/msn.c:1331
+#: src/protocols/msn/msn.c:1575 src/protocols/napster/napster.c:393
+#: src/protocols/oscar/oscar.c:3190 src/protocols/oscar/oscar.c:3406
+#: src/protocols/toc/toc.c:498 src/protocols/yahoo/yahoo.c:2898
+#: src/protocols/yahoo/yahoo.c:2920 src/protocols/yahoo/yahoo.c:2943
+#: src/protocols/yahoo/yahoo.c:3101 src/protocols/zephyr/zephyr.c:567
 #, fuzzy
 msgid "Buddy Information"
 msgstr "Регистрационна инфо"
 
-#: src/protocols/gg/gg.c:741
+#: src/protocols/gg/gg.c:744
 #, fuzzy
 msgid "There is no Buddy List stored on the Gadu-Gadu server."
 msgstr "Няма листа съхранена на сървъра. Съжялавам!"
 
-#: 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
 #, fuzzy
 msgid "Buddy List successfully transferred to Gadu-Gadu server"
 msgstr "Листата успешно прехвърлена на сървъра"
 
-#: src/protocols/gg/gg.c:820
+#: src/protocols/gg/gg.c:823
 #, fuzzy
 msgid "Couldn't transfer Buddy List to Gadu-Gadu server"
 msgstr "Не мога да прехвърля листата на сървъра"
 
-#: src/protocols/gg/gg.c:828
+#: src/protocols/gg/gg.c:831
 #, fuzzy
 msgid "Buddy List successfully deleted from Gadu-Gadu server"
 msgstr "Листата успешно изтрита от сървъра"
 
-#: src/protocols/gg/gg.c:836
+#: src/protocols/gg/gg.c:839
 #, fuzzy
 msgid "Couldn't delete Buddy List from Gadu-Gadu server"
 msgstr "Не мога да изтиря листата на сървъра"
 
-#: 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 ""
 
-#: 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."
 msgstr ""
 
-#: src/protocols/gg/gg.c:997
+#: src/protocols/gg/gg.c:1000
 msgid "Unable to import Gadu-Gadu buddy list"
 msgstr ""
 
-#: 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 ""
 
-#: src/protocols/gg/gg.c:1071
+#: src/protocols/gg/gg.c:1074
 #, fuzzy
 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 ""
 
-#: src/protocols/gg/gg.c:1094
+#: src/protocols/gg/gg.c:1097
 msgid "Unable to delete Gadu-Gadu buddy list"
 msgstr ""
 
-#: src/protocols/gg/gg.c:1143
+#: src/protocols/gg/gg.c:1146
 #, fuzzy
 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."
 msgstr ""
 
-#: src/protocols/gg/gg.c:1177
+#: src/protocols/gg/gg.c:1180
 #, fuzzy
 msgid "Unable to change Gadu-Gadu password"
 msgstr "Не мога да чета от socket"
 
-#: 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."
 msgstr ""
 
-#: 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:981
-#: src/protocols/oscar/oscar.c:6422 src/protocols/toc/toc.c:1545
+#: src/protocols/gg/gg.c:1207 src/protocols/jabber/jabber.c:1055
+#: 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
 #, fuzzy
 msgid "Unable to access user profile."
 msgstr "Не мога да чета файл %s"
 
-#: 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."
@@ -4598,7 +5002,8 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/gg/gg.c:1370 src/protocols/gg/gg.c:1372
+#. *  description
+#: src/protocols/gg/gg.c:1373 src/protocols/gg/gg.c:1375
 #, fuzzy
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr "Търсеща машина Gadu-Gadu"
@@ -4612,17 +5017,17 @@
 msgid "The user %s (%s%s%s%s%s) wants you to authorize them."
 msgstr "%s%s%s%s направи %s техен контакт %s%s%s"
 
-#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:181
-#: src/protocols/msn/notification.c:935 src/protocols/msn/notification.c:1256
-#: src/protocols/msn/notification.c:1422 src/protocols/oscar/oscar.c:2609
-#: src/protocols/oscar/oscar.c:5080
+#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:229
+#: src/protocols/msn/notification.c:588 src/protocols/msn/notification.c:909
+#: src/protocols/msn/notification.c:1076 src/protocols/oscar/oscar.c:2932
+#: src/protocols/oscar/oscar.c:5451
 msgid "Authorize"
 msgstr ""
 
-#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:182
-#: src/protocols/msn/notification.c:936 src/protocols/msn/notification.c:1258
-#: src/protocols/msn/notification.c:1424 src/protocols/oscar/oscar.c:2611
-#: src/protocols/oscar/oscar.c:5081
+#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:230
+#: src/protocols/msn/notification.c:589 src/protocols/msn/notification.c:911
+#: src/protocols/msn/notification.c:1078 src/protocols/oscar/oscar.c:2934
+#: src/protocols/oscar/oscar.c:5452
 msgid "Deny"
 msgstr "Отхвърляне"
 
@@ -4644,75 +5049,111 @@
 msgid "Gaim User"
 msgstr "Използване на Gaim"
 
-#: src/protocols/irc/cmds.c:41
+#: src/protocols/irc/cmds.c:43
 #, c-format
 msgid "Unknown command: %s"
 msgstr ""
 
-#: src/protocols/irc/cmds.c:135
+#: src/protocols/irc/cmds.c:137
 msgid ""
 "<B>Supported IRC Commands:</B><BR>AWAY INVITE JOIN KICK<BR>ME MODE MSG "
 "NAMES<BR>NICK OP DEOP OPERWALL<BR>PART PING QUERY QUIT<BR>QUOTE REMOVE TOPIC "
 "UMODE<BR>VOICE DEVOICE WALLOPS WHOIS<BR>"
 msgstr ""
 
-#: src/protocols/irc/cmds.c:144
+#: src/protocols/irc/cmds.c:146
 msgid ""
 "<B>Supported IRC Commands:</B><BR>AWAY JOIN ME MODE<BR>MSG NICK OPERWALL "
 "PING<BR>QUERY QUIT QUOTE UMODE<BR>WALLOPS WHOIS"
 msgstr ""
 
-#: src/protocols/irc/cmds.c:459
+#: src/protocols/irc/cmds.c:469 src/protocols/jabber/chat.c:527
 #, fuzzy, c-format
 msgid "current topic is: %s"
 msgstr "Връзката се загуби"
 
-#: src/protocols/irc/cmds.c:461
+#: src/protocols/irc/cmds.c:472 src/protocols/jabber/chat.c:529
 #, fuzzy
 msgid "No topic is set"
 msgstr "Връзката се загуби"
 
-#: src/protocols/irc/irc.c:64
+#: 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 ""
+
+#: src/protocols/irc/irc.c:73
 msgid "Error displaying MOTD"
 msgstr ""
 
-#: src/protocols/irc/irc.c:64
+#: src/protocols/irc/irc.c:73
 #, fuzzy
 msgid "No MOTD available"
 msgstr "Недостъпен"
 
-#: src/protocols/irc/irc.c:65
+#: src/protocols/irc/irc.c:74
 msgid "There is no MOTD associated with this connection."
 msgstr ""
 
-#: src/protocols/irc/irc.c:68
+#: src/protocols/irc/irc.c:77
 #, c-format
 msgid "MOTD for %s"
 msgstr ""
 
-#: src/protocols/irc/irc.c:137
+#: src/protocols/irc/irc.c:140
 msgid "View MOTD"
 msgstr ""
 
-#: src/protocols/irc/irc.c:156
-msgid "Channel:"
+#: src/protocols/irc/irc.c:154 src/protocols/jabber/buddy.c:883
+#: src/protocols/oscar/oscar.c:440 src/protocols/oscar/oscar.c:6532
+#: src/protocols/yahoo/yahoo.c:2456
+msgid "Send File"
+msgstr "Прати файл"
+
+#: src/protocols/irc/irc.c:168
+#, fuzzy
+msgid "_Channel:"
 msgstr "Канал:"
 
-#: src/protocols/irc/irc.c:180
+#: src/protocols/irc/irc.c:173 src/protocols/jabber/chat.c:59
+#, fuzzy
+msgid "_Password:"
+msgstr "Парола"
+
+#: src/protocols/irc/irc.c:193
 msgid "IRC nicks may not contain whitespace"
 msgstr ""
 
-#: src/protocols/irc/irc.c:199 src/protocols/oscar/oscar.c:679
-#: src/protocols/toc/toc.c:228
+#: src/protocols/irc/irc.c:212 src/protocols/toc/toc.c:228
 #, c-format
 msgid "Signon: %s"
 msgstr "Влизане: %s"
 
-#: src/protocols/irc/irc.c:208
+#: src/protocols/irc/irc.c:221
 #, fuzzy
 msgid "Couldn't create socket"
 msgstr "Не мога да чета от socket"
 
+#: src/protocols/irc/irc.c:370 src/protocols/trepia/trepia.c:926
+#, fuzzy
+msgid "Read error"
+msgstr "Невалидно име"
+
+#: src/protocols/irc/irc.c:504 src/protocols/yahoo/yahoochat.c:1343
+#, fuzzy
+msgid "Users"
+msgstr "Потребител"
+
+#: src/protocols/irc/irc.c:507 src/protocols/yahoo/yahoochat.c:1352
+#, fuzzy
+msgid "Topic"
+msgstr "Заглавие:"
+
 #. *< api_version
 #. *< type
 #. *< ui_requirement
@@ -4722,27 +5163,39 @@
 #. *< id
 #. *< name
 #. *< version
-#: src/protocols/irc/irc.c:530
+#: src/protocols/irc/irc.c:612
 #, fuzzy
 msgid "IRC Protocol Plugin"
 msgstr "Действия на протокола"
 
 #. *  summary
-#: src/protocols/irc/irc.c:531
+#: src/protocols/irc/irc.c:613
 #, fuzzy
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "Действия на протокола"
 
-#: src/protocols/irc/irc.c:548 src/protocols/irc/msgs.c:197
-#: src/protocols/jabber/jabber.c:1077 src/protocols/napster/napster.c:637
+#: src/protocols/irc/irc.c:630 src/protocols/irc/msgs.c:197
+#: src/protocols/jabber/jabber.c:1382 src/protocols/napster/napster.c:657
 #, fuzzy
 msgid "Server"
 msgstr "Сървър:"
 
-#: src/protocols/irc/irc.c:554
+#: src/protocols/irc/irc.c:633 src/protocols/jabber/jabber.c:1403
+#: src/protocols/msn/msn.c:1741 src/protocols/napster/napster.c:662
+#: src/protocols/trepia/trepia.c:1306
+msgid "Port"
+msgstr "Порт"
+
+#: src/protocols/irc/irc.c:636 src/protocols/zephyr/zephyr.c:1400
 msgid "Encoding"
 msgstr ""
 
+#: src/protocols/irc/irc.c:639 src/protocols/irc/msgs.c:191
+#: src/protocols/jabber/jabber.c:581
+#, fuzzy
+msgid "Username"
+msgstr "Потребител"
+
 #: src/protocols/irc/msgs.c:98
 msgid "Bad mode"
 msgstr ""
@@ -4765,12 +5218,7 @@
 msgid " <i>(identified)</i>"
 msgstr ""
 
-#: src/protocols/irc/msgs.c:191 src/protocols/jabber/jabber.c:534
-#, fuzzy
-msgid "Username"
-msgstr "Потребител"
-
-#: src/protocols/irc/msgs.c:192 src/protocols/yahoo/yahoo.c:2681
+#: src/protocols/irc/msgs.c:192 src/protocols/yahoo/yahoo.c:3001
 #, fuzzy
 msgid "Realname"
 msgstr "Преименуване"
@@ -4799,280 +5247,257 @@
 msgid "Buddy Information for %s"
 msgstr ""
 
-#: src/protocols/irc/msgs.c:247
+#: src/protocols/irc/msgs.c:278
 #, fuzzy, c-format
 msgid "%s has changed the topic to: %s"
 msgstr "<B>%s смени темата на: %s</B>"
 
-#: src/protocols/irc/msgs.c:252
+#: src/protocols/irc/msgs.c:283
 #, c-format
 msgid "The topic for %s is: %s"
 msgstr ""
 
-#: src/protocols/irc/msgs.c:266
+#: src/protocols/irc/msgs.c:299
 #, fuzzy, c-format
 msgid "Unknown message '%s'"
 msgstr "(1 съобщение)"
 
-#: src/protocols/irc/msgs.c:267
+#: src/protocols/irc/msgs.c:300
 #, fuzzy
 msgid "Unknown message"
 msgstr "(1 съобщение)"
 
-#: src/protocols/irc/msgs.c:267
+#: src/protocols/irc/msgs.c:300
 msgid "Gaim has sent a message the IRC server did not understand."
 msgstr ""
 
+#: src/protocols/irc/msgs.c:403
+#, fuzzy
+msgid "No such channel"
+msgstr "Няма такъв ник/канал"
+
 #. does this happen?
-#: src/protocols/irc/msgs.c:371
+#: src/protocols/irc/msgs.c:414
 #, fuzzy
 msgid "no such channel"
 msgstr "Няма такъв ник/канал"
 
-#: src/protocols/irc/msgs.c:374
+#: src/protocols/irc/msgs.c:417
 #, fuzzy
 msgid "User is not logged in"
 msgstr "%s влезе."
 
-#: src/protocols/irc/msgs.c:379
+#: src/protocols/irc/msgs.c:422
 #, fuzzy
 msgid "No such nick or channel"
 msgstr "Няма такъв ник/канал"
 
-#: src/protocols/irc/msgs.c:399
+#: src/protocols/irc/msgs.c:442
 #, fuzzy
 msgid "Could not send"
 msgstr "Не мога да се свържа"
 
-#: src/protocols/irc/msgs.c:455
+#: src/protocols/irc/msgs.c:498
 #, c-format
 msgid "Joining %s requires an invitation."
 msgstr ""
 
-#: src/protocols/irc/msgs.c:456
+#: src/protocols/irc/msgs.c:499
 msgid "Invitation only"
 msgstr ""
 
-#: src/protocols/irc/msgs.c:552
+#: src/protocols/irc/msgs.c:595
 #, fuzzy, c-format
 msgid "You have been kicked by %s: (%s)"
 msgstr "Бяхте изритани от %s: %s"
 
-#: src/protocols/irc/msgs.c:560
+#: src/protocols/irc/msgs.c:600
 #, fuzzy, c-format
 msgid "Kicked by %s (%s)"
 msgstr "Изритани от %s: %s"
 
-#: src/protocols/irc/msgs.c:581
+#: src/protocols/irc/msgs.c:621
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr ""
 
-#: src/protocols/irc/msgs.c:660
+#: src/protocols/irc/msgs.c:700
 #, fuzzy
 msgid "Could not change nick"
 msgstr "Не мога да се свържа"
 
-#: src/protocols/irc/msgs.c:661
+#: src/protocols/irc/msgs.c:701
 msgid "Cannot change nick"
 msgstr ""
 
-#: src/protocols/irc/msgs.c:682
+#: src/protocols/irc/msgs.c:722
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr ""
 
-#: src/protocols/irc/msgs.c:720
+#: src/protocols/irc/msgs.c:762
 #, fuzzy
 msgid "Error: invalid PONG from server"
 msgstr "Грешка при четене от socket."
 
-#: src/protocols/irc/msgs.c:722
+#: src/protocols/irc/msgs.c:764
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr ""
 
-#: src/protocols/irc/msgs.c:792
+#: src/protocols/irc/msgs.c:839
 #, c-format
 msgid "Cannot join %s:"
 msgstr ""
 
-#: src/protocols/irc/msgs.c:793
+#: src/protocols/irc/msgs.c:840
 msgid "Cannot join channel"
 msgstr ""
 
-#: src/protocols/irc/msgs.c:823
+#: src/protocols/irc/msgs.c:870
 #, c-format
 msgid "Wallops from %s"
 msgstr ""
 
-#: src/protocols/irc/parse.c:160
+#: src/protocols/irc/parse.c:165 src/protocols/zephyr/zephyr.c:199
 msgid ""
 "(There was an error converting this message.  Check the 'Encoding' option in "
 "the Account Editor)"
 msgstr ""
 
-#: src/protocols/irc/parse.c:291
+#: src/protocols/irc/parse.c:318
 #, c-format
 msgid "Reply time from %s: %lu seconds"
 msgstr ""
 
-#: src/protocols/irc/parse.c:292
+#: src/protocols/irc/parse.c:319
 msgid "PONG"
 msgstr ""
 
-#: src/protocols/irc/parse.c:292
+#: src/protocols/irc/parse.c:319
 msgid "CTCP PING reply"
 msgstr ""
 
-#: src/protocols/irc/parse.c:391
-#, fuzzy
-msgid "Disconnected"
+#: src/protocols/irc/parse.c:421 src/protocols/oscar/oscar.c:777
+#: 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:50
+#: src/protocols/jabber/auth.c:51
 msgid "Server requires SSL for login"
 msgstr ""
 
-#: src/protocols/jabber/auth.c:58 src/protocols/jabber/auth.c:342
-#: src/protocols/jabber/auth.c:354
-#, fuzzy
-msgid "Invalid response from server"
-msgstr "Грешен отговор от сървъра."
-
-#: src/protocols/jabber/auth.c:77 src/protocols/jabber/auth.c:124
+#: 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 "Автентикация"
+
+#: 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:327
+#: src/protocols/jabber/auth.c:375
 #, fuzzy
 msgid "Invalid challenge from server"
 msgstr "Грешен отговор от сървъра."
 
-#: src/protocols/jabber/auth.c:357
-#, fuzzy
-msgid "Bad Protocol"
-msgstr "Протокол:"
-
-#: src/protocols/jabber/auth.c:360
-msgid "Encryption Required"
-msgstr ""
-
-#: src/protocols/jabber/auth.c:363
-msgid "Invalid authzid"
-msgstr ""
-
-#: src/protocols/jabber/auth.c:366
-#, fuzzy
-msgid "Invalid Mechanism"
-msgstr "Невалидно име"
-
-#: src/protocols/jabber/auth.c:368
-#, fuzzy
-msgid "Invalid Realm"
-msgstr "Невалидно име"
-
-#: src/protocols/jabber/auth.c:371
-msgid "Mechanism Too Weak"
-msgstr ""
-
-#: src/protocols/jabber/auth.c:374 src/protocols/jabber/jabber.c:130
-#: src/protocols/jabber/jabber.c:806 src/protocols/jabber/jabber.c:856
-#: src/protocols/oscar/oscar.c:5472
-msgid "Not Authorized"
-msgstr ""
-
-#: src/protocols/jabber/auth.c:377
-#, fuzzy
-msgid "Temporary Authentication Failure"
-msgstr "Оторизирането пропадна"
-
-#: src/protocols/jabber/auth.c:379
-#, fuzzy
-msgid "Authentication Failure"
-msgstr "Оторизирането пропадна"
-
-#: src/protocols/jabber/buddy.c:253 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:254 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:255 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:256 src/protocols/jabber/buddy.c:631
-#: src/protocols/jabber/jabber.c:554 src/protocols/yahoo/yahoo.c:2675
+#: src/protocols/jabber/buddy.c:250 src/protocols/jabber/buddy.c:635
+#: src/protocols/jabber/jabber.c:601 src/protocols/yahoo/yahoo.c:2997
 msgid "Nickname"
 msgstr "Псевдоним"
 
-#: src/protocols/jabber/buddy.c:258 src/protocols/jabber/buddy.c:659
+#: src/protocols/jabber/buddy.c:251 src/protocols/jabber/jabber.c:641
+msgid "URL"
+msgstr "URL"
+
+#: src/protocols/jabber/buddy.c:252 src/protocols/jabber/buddy.c:663
 msgid "Street Address"
 msgstr "Улица"
 
-#: src/protocols/jabber/buddy.c:259 src/protocols/jabber/buddy.c:655
+#: src/protocols/jabber/buddy.c:253 src/protocols/jabber/buddy.c:659
 msgid "Extended Address"
 msgstr "Адрес"
 
-#: src/protocols/jabber/buddy.c:260 src/protocols/jabber/buddy.c:663
+#: src/protocols/jabber/buddy.c:254 src/protocols/jabber/buddy.c:667
 msgid "Locality"
 msgstr "?Локалност?"
 
-#: src/protocols/jabber/buddy.c:261 src/protocols/jabber/buddy.c:667
+#: src/protocols/jabber/buddy.c:255 src/protocols/jabber/buddy.c:671
 msgid "Region"
 msgstr "Регион"
 
-#: src/protocols/jabber/buddy.c:262 src/protocols/jabber/buddy.c:671
-#: src/protocols/jabber/jabber.c:584
+#: src/protocols/jabber/buddy.c:256 src/protocols/jabber/buddy.c:675
+#: src/protocols/jabber/jabber.c:631
 msgid "Postal Code"
 msgstr "Пощенски код"
 
 #. Country
-#: src/protocols/jabber/buddy.c:263 src/protocols/jabber/buddy.c:676
-#: src/protocols/trepia/trepia.c:330 src/protocols/trepia/trepia.c:439
+#: src/protocols/jabber/buddy.c:257 src/protocols/jabber/buddy.c:680
+#: src/protocols/trepia/trepia.c:339 src/protocols/trepia/trepia.c:416
 msgid "Country"
 msgstr "Държава"
 
-#: src/protocols/jabber/buddy.c:264 src/protocols/jabber/buddy.c:687
-#: src/protocols/jabber/buddy.c:694
+#: 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:265 src/protocols/jabber/buddy.c:705
-#: src/protocols/jabber/buddy.c:713 src/protocols/yahoo/yahoo.c:2669
+#: src/protocols/jabber/buddy.c:259 src/protocols/jabber/buddy.c:709
+#: src/protocols/jabber/buddy.c:717 src/protocols/yahoo/yahoo.c:2993
 msgid "Email"
 msgstr "и-мейл"
 
-#: src/protocols/jabber/buddy.c:266 src/protocols/jabber/buddy.c:728
+#: src/protocols/jabber/buddy.c:260 src/protocols/jabber/buddy.c:732
 msgid "Organization Name"
 msgstr "Име на организацията"
 
-#: src/protocols/jabber/buddy.c:267 src/protocols/jabber/buddy.c:732
+#: src/protocols/jabber/buddy.c:261 src/protocols/jabber/buddy.c:736
 msgid "Organization Unit"
 msgstr "Отдел"
 
-#: src/protocols/jabber/buddy.c:268 src/protocols/jabber/buddy.c:738
+#: src/protocols/jabber/buddy.c:262 src/protocols/jabber/buddy.c:742
 msgid "Title"
 msgstr "Длъжност"
 
-#: src/protocols/jabber/buddy.c:269 src/protocols/jabber/buddy.c:741
+#: src/protocols/jabber/buddy.c:263 src/protocols/jabber/buddy.c:745
 msgid "Role"
 msgstr "Позиция"
 
-#: src/protocols/jabber/buddy.c:270 src/protocols/jabber/buddy.c:634
-#: src/protocols/oscar/oscar.c:3926
+#: src/protocols/jabber/buddy.c:264 src/protocols/jabber/buddy.c:638
+#: src/protocols/oscar/oscar.c:4247
 msgid "Birthday"
 msgstr "Дата на раждане"
 
-#: src/protocols/jabber/buddy.c:514 src/protocols/jabber/buddy.c:515
+#: src/protocols/jabber/buddy.c:508 src/protocols/jabber/buddy.c:509
 #, fuzzy
 msgid "Edit Jabber vCard"
 msgstr "Gaim - Редактиране на Jabber vCard"
 
-#: src/protocols/jabber/buddy.c:516
+#: src/protocols/jabber/buddy.c:510
 #, fuzzy
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
@@ -5080,19 +5505,21 @@
 msgstr ""
 "Всички точки по-долу са незадължителни. Въведете само информациякоято желаете"
 
-#: src/protocols/jabber/buddy.c:554
+#: src/protocols/jabber/buddy.c:552
 #, fuzzy
 msgid "Jabber ID"
 msgstr "Jabber грешка"
 
-#: src/protocols/jabber/buddy.c:564 src/protocols/jabber/buddy.c:571
-#: src/protocols/jabber/buddy.c:582 src/protocols/jabber/jabber.c:843
-#: src/protocols/jabber/jabber.c:856
+#: src/protocols/jabber/buddy.c:562 src/protocols/jabber/buddy.c:569
+#: src/protocols/jabber/buddy.c:580 src/protocols/jabber/jabber.c:930
+#: src/protocols/msn/msn.c:348 src/protocols/oscar/oscar.c:566
+#: src/protocols/oscar/oscar.c:572 src/protocols/oscar/oscar.c:574
+#: src/protocols/yahoo/yahoo.c:2407
 #, fuzzy
 msgid "Status"
 msgstr "Статус: %s"
 
-#: src/protocols/jabber/buddy.c:580 src/protocols/jabber/jabber.c:1080
+#: src/protocols/jabber/buddy.c:578 src/protocols/jabber/jabber.c:1385
 #, fuzzy
 msgid "Resource"
 msgstr "Подразбиране"
@@ -5101,931 +5528,607 @@
 msgid "Middle Name"
 msgstr "Бащино име"
 
-#: src/protocols/jabber/buddy.c:639 src/protocols/jabber/jabber.c:569
-#: src/protocols/oscar/oscar.c:3943 src/protocols/oscar/oscar.c:3959
+#: src/protocols/jabber/buddy.c:643 src/protocols/jabber/jabber.c:616
+#: src/protocols/oscar/oscar.c:4265 src/protocols/oscar/oscar.c:4273
 #, fuzzy
 msgid "Address"
 msgstr "Улица"
 
-#: src/protocols/jabber/buddy.c:651
+#: src/protocols/jabber/buddy.c:655
 msgid "P.O. Box"
 msgstr ""
 
-#: src/protocols/jabber/buddy.c:757
+#: src/protocols/jabber/buddy.c:761
 #, fuzzy
 msgid "Photo"
 msgstr "Порт"
 
-#: src/protocols/jabber/buddy.c:757
+#: src/protocols/jabber/buddy.c:761
 #, fuzzy
 msgid "Logo"
 msgstr "Архив"
 
-#: src/protocols/jabber/buddy.c:771
+#: src/protocols/jabber/buddy.c:777
 #, fuzzy
 msgid "Jabber Profile"
 msgstr "Вземи файл"
 
-#: src/protocols/jabber/buddy.c:866
+#: src/protocols/jabber/buddy.c:893
 msgid "Un-hide From"
 msgstr ""
 
-#: src/protocols/jabber/buddy.c:869
+#: src/protocols/jabber/buddy.c:896
 msgid "Temporarily Hide From"
 msgstr ""
 
-#: src/protocols/jabber/buddy.c:877
+#: src/protocols/jabber/buddy.c:905
 #, fuzzy
 msgid "Cancel Presence Notification"
 msgstr "Показващо се известяване"
 
-#: src/protocols/jabber/buddy.c:885
-#, fuzzy
-msgid "Re-request authorization"
+#: src/protocols/jabber/buddy.c:913
+#, fuzzy
+msgid "(Re-)Request authorization"
 msgstr "Заявяване на абтентикационен метод"
 
-#: src/protocols/jabber/chat.c:36 src/protocols/yahoo/yahoochat.c:870
-msgid "Room:"
+#: src/protocols/jabber/buddy.c:919
+msgid "Unsubscribe"
+msgstr ""
+
+#: src/protocols/jabber/chat.c:42 src/protocols/yahoo/yahoochat.c:965
+#, fuzzy
+msgid "_Room:"
 msgstr "Стая:"
 
-#: src/protocols/jabber/chat.c:43
-msgid "Server:"
+#: src/protocols/jabber/chat.c:47
+#, fuzzy
+msgid "_Server:"
 msgstr "Сървър:"
 
-#: src/protocols/jabber/chat.c:49
-msgid "Handle:"
+#: src/protocols/jabber/chat.c:53
+#, fuzzy
+msgid "_Handle:"
 msgstr "?Дръжач?:"
 
-#: src/protocols/jabber/jabber.c:80
-msgid "Error initializing session"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:105
-msgid "Bad Format"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:107
-msgid "Bad Namespace Prefix"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:110
-#, fuzzy
-msgid "Resource Conflict"
-msgstr "Подразбиране"
-
-#: src/protocols/jabber/jabber.c:112
-#, fuzzy
-msgid "Connection Timeout"
-msgstr "Връзката се загуби"
-
-#: src/protocols/jabber/jabber.c:114
-msgid "Host Gone"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:116
-#, fuzzy
-msgid "Host Unknown"
-msgstr "Непознато"
-
-#: src/protocols/jabber/jabber.c:118
-#, fuzzy
-msgid "Improper Addressing"
-msgstr "Улица"
-
-#: src/protocols/jabber/jabber.c:120
-#, fuzzy
-msgid "Internal Server Error"
-msgstr "Вътрешна грешка"
-
-#: src/protocols/jabber/jabber.c:122
-#, fuzzy
-msgid "Invalid ID"
+#: src/protocols/jabber/chat.c:164
+#, fuzzy, c-format
+msgid "%s is not a valid room name"
+msgstr "Чата в %s е невъзможен"
+
+#: src/protocols/jabber/chat.c:165
+#, fuzzy
+msgid "Invalid Room Name"
 msgstr "Невалидно име"
 
-#: src/protocols/jabber/jabber.c:124
-#, fuzzy
-msgid "Invalid Namespace"
+#: src/protocols/jabber/chat.c:170
+#, fuzzy, c-format
+msgid "%s is not a valid server name"
+msgstr "Чата в %s е невъзможен"
+
+#: src/protocols/jabber/chat.c:171 src/protocols/jabber/chat.c:172
+#, fuzzy
+msgid "Invalid Server Name"
 msgstr "Невалидно име"
 
-#: src/protocols/jabber/jabber.c:126
-#, fuzzy
-msgid "Invalid XML"
+#: src/protocols/jabber/chat.c:176
+#, fuzzy, c-format
+msgid "%s is not a valid room handle"
+msgstr "Чата в %s е невъзможен"
+
+#: src/protocols/jabber/chat.c:177 src/protocols/jabber/chat.c:178
+#, fuzzy
+msgid "Invalid Room Handle"
 msgstr "Невалидно име"
 
-#: src/protocols/jabber/jabber.c:128
-msgid "Non-matching Hosts"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:132
-msgid "Policy Violation"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:134
-#, fuzzy
-msgid "Remote Connection Failed"
-msgstr "Връзката затворена"
-
-#: src/protocols/jabber/jabber.c:136
-msgid "Resource Constraint"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:138
-msgid "Restricted XML"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:140
-msgid "See Other Host"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:142
-#, fuzzy
-msgid "System Shutdown"
-msgstr "Системен лог"
-
-#: src/protocols/jabber/jabber.c:144
-msgid "Undefined Condition"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:146
-msgid "Unsupported Condition"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:148
-msgid "Unsupported Stanza Type"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:150
-msgid "Unsupported Version"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:152
-msgid "XML Not Well Formed"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:154
-#, fuzzy
-msgid "Stream Error"
-msgstr "Вътрешна грешка"
-
-#: src/protocols/jabber/jabber.c:232 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:516
-#: src/protocols/msn/msn.c:627 src/protocols/msn/msn.c:643
-#: src/protocols/msn/msn.c:691 src/protocols/msn/msn.c:714
-#: src/protocols/msn/msn.c:746 src/protocols/msn/msn.c:754
-#: src/protocols/msn/msn.c:787 src/protocols/msn/msn.c:795
-#: src/protocols/msn/msn.c:809 src/protocols/msn/msn.c:818
-#: src/protocols/msn/msn.c:832 src/protocols/msn/msn.c:856
-#: src/protocols/msn/msn.c:906 src/protocols/msn/msn.c:944
-#: src/protocols/msn/msn.c:1042 src/protocols/msn/msn.c:1074
-#: src/protocols/msn/msn.c:1095 src/protocols/msn/msn.c:1106
-#: src/protocols/msn/msn.c:1117 src/protocols/msn/msn.c:1141
-#: src/protocols/msn/msn.c:1153 src/protocols/msn/msn.c:1218
-#: src/protocols/msn/notification.c:179 src/protocols/msn/notification.c:207
-#: src/protocols/msn/notification.c:1655 src/protocols/msn/notification.c:1675
-#: src/protocols/trepia/trepia.c:239 src/protocols/trepia/trepia.c:740
-#: src/protocols/trepia/trepia.c:1023 src/protocols/trepia/trepia.c:1067
-#: src/protocols/trepia/trepia.c:1166 src/protocols/trepia/trepia.c:1222
+#: src/protocols/jabber/chat.c:332
+#, fuzzy
+msgid "Configuration error"
+msgstr "Грешка на свързване"
+
+#: src/protocols/jabber/chat.c:341 src/protocols/jabber/chat.c:486
+#, fuzzy
+msgid "Unable to configure"
+msgstr "Не мога да се свържа"
+
+#: src/protocols/jabber/chat.c:357
+#, fuzzy
+msgid "Room Configuration Error"
+msgstr "Непозната грешка при регистрация"
+
+#: src/protocols/jabber/chat.c:358
+msgid "This room is not capable of being configured"
+msgstr ""
+
+#: src/protocols/jabber/chat.c:408 src/protocols/jabber/chat.c:477
+#, fuzzy
+msgid "Registration error"
+msgstr "Непозната грешка при регистрация"
+
+#: src/protocols/jabber/chat.c:556
+msgid "Nick changing not supported in non-MUC chatrooms"
+msgstr ""
+
+#: src/protocols/jabber/chat.c:600 src/protocols/jabber/chat.c:611
+#, fuzzy
+msgid "Roomlist Error"
+msgstr "Протоколна грешка"
+
+#: src/protocols/jabber/chat.c:601 src/protocols/jabber/chat.c:612
+#, fuzzy
+msgid "Error retreiving roomlist"
+msgstr "Грешка при четене от socket."
+
+#: src/protocols/jabber/chat.c:652
+#, fuzzy
+msgid "Invalid Server"
+msgstr "Невалидно име"
+
+#: src/protocols/jabber/chat.c:689
+#, fuzzy
+msgid "Enter a Conference Server"
+msgstr "Прякор"
+
+#: src/protocols/jabber/chat.c:690
+msgid "Select a conference server to query"
+msgstr ""
+
+#: src/protocols/jabber/chat.c:693
+#, fuzzy
+msgid "Find Rooms"
+msgstr "Чат"
+
+#: src/protocols/jabber/jabber.c:74
+msgid "Error initializing session"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:204 src/protocols/msn/httpmethod.c:255
+#: src/protocols/msn/msn.c:84 src/protocols/msn/msn.c:104
+#: src/protocols/msn/msn.c:174 src/protocols/msn/msn.c:274
+#: src/protocols/msn/msn.c:571 src/protocols/msn/msn.c:743
+#: src/protocols/msn/msn.c:772 src/protocols/msn/msn.c:804
+#: src/protocols/msn/msn.c:812 src/protocols/msn/msn.c:845
+#: src/protocols/msn/msn.c:853 src/protocols/msn/msn.c:867
+#: src/protocols/msn/msn.c:876 src/protocols/msn/msn.c:891
+#: src/protocols/msn/msn.c:901 src/protocols/msn/msn.c:923
+#: src/protocols/msn/msn.c:973 src/protocols/msn/msn.c:1011
+#: src/protocols/msn/msn.c:1113 src/protocols/msn/msn.c:1146
+#: src/protocols/msn/msn.c:1167 src/protocols/msn/msn.c:1178
+#: src/protocols/msn/msn.c:1189 src/protocols/msn/msn.c:1213
+#: src/protocols/msn/msn.c:1225 src/protocols/msn/msn.c:1306
+#: src/protocols/msn/notification.c:147 src/protocols/msn/notification.c:175
+#: src/protocols/msn/notification.c:1299 src/protocols/msn/notification.c:1319
+#: src/protocols/msn/session.c:209 src/protocols/trepia/trepia.c:248
+#: src/protocols/trepia/trepia.c:698 src/protocols/trepia/trepia.c:987
+#: src/protocols/trepia/trepia.c:1031 src/protocols/trepia/trepia.c:1130
+#: src/protocols/trepia/trepia.c:1186
 #, fuzzy
 msgid "Write error"
 msgstr "AOL грешка"
 
-#: src/protocols/jabber/jabber.c:269 src/protocols/jabber/jabber.c:289
+#: src/protocols/jabber/jabber.c:242 src/protocols/jabber/jabber.c:262
 #, fuzzy
 msgid "Read Error"
 msgstr "Невалидно име"
 
-#: src/protocols/jabber/jabber.c:394 src/protocols/jabber/jabber.c:671
-#: src/protocols/trepia/trepia.c:1106
+#: src/protocols/jabber/jabber.c:317
+#, fuzzy
+msgid "Connection Failed"
+msgstr "Връзката затворена"
+
+#: src/protocols/jabber/jabber.c:320
+msgid "SSL Handshake Failed"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:363 src/protocols/jabber/jabber.c:692
+#, fuzzy
+msgid "Invalid Jabber ID"
+msgstr "Невалидно име"
+
+#: src/protocols/jabber/jabber.c:391 src/protocols/jabber/jabber.c:719
+#, fuzzy
+msgid "SSL support unavailable"
+msgstr "Недостъпен"
+
+#: src/protocols/jabber/jabber.c:401 src/protocols/jabber/jabber.c:729
+#: src/protocols/trepia/trepia.c:1070
 #, fuzzy
 msgid "Unable to create socket"
 msgstr "Не мога да чета от socket"
 
-#: src/protocols/jabber/jabber.c:419
+#: src/protocols/jabber/jabber.c:426
 #, fuzzy, c-format
 msgid "Registration of %s@%s successful"
 msgstr "Регистрирането в сървъра успешно!"
 
-#: src/protocols/jabber/jabber.c:421 src/protocols/jabber/jabber.c:422
+#: src/protocols/jabber/jabber.c:428 src/protocols/jabber/jabber.c:429
 #, fuzzy
 msgid "Registration Successful"
 msgstr "Регистрирането в сървъра успешно!"
 
-#: src/protocols/jabber/jabber.c:431
+#: src/protocols/jabber/jabber.c:435 src/protocols/jabber/jabber.c:1175
 #, fuzzy
 msgid "Unknown Error"
 msgstr "Непозната грешка при логване"
 
-#: src/protocols/jabber/jabber.c:434
-#, c-format
-msgid "Registration of %s@%s failed: %s"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:436 src/protocols/jabber/jabber.c:437
+#: src/protocols/jabber/jabber.c:437 src/protocols/jabber/jabber.c:438
 #, fuzzy
 msgid "Registration Failed"
 msgstr "Оторизирането пропадна"
 
-#: src/protocols/jabber/jabber.c:524 src/protocols/jabber/jabber.c:525
+#: src/protocols/jabber/jabber.c:549 src/protocols/jabber/jabber.c:550
 #, fuzzy
 msgid "Already Registered"
 msgstr "?Регистриране?"
 
-#: src/protocols/jabber/jabber.c:538 src/protocols/jabber/jabber.c:951
+#: src/protocols/jabber/jabber.c:585 src/protocols/jabber/jabber.c:1026
 #, fuzzy
 msgid "Password"
 msgstr "Парола"
 
-#: src/protocols/jabber/jabber.c:549
+#: src/protocols/jabber/jabber.c:596
 #, fuzzy
 msgid "E-Mail"
 msgstr "и-мейл"
 
-#. First Name
-#: src/protocols/jabber/jabber.c:559 src/protocols/oscar/oscar.c:3897
-#: src/protocols/trepia/trepia.c:258
-msgid "First Name"
-msgstr "Име"
-
 #. State
-#: src/protocols/jabber/jabber.c:579 src/protocols/oscar/oscar.c:3949
-#: src/protocols/oscar/oscar.c:3965 src/protocols/trepia/trepia.c:326
-#: src/protocols/trepia/trepia.c:430
+#: src/protocols/jabber/jabber.c:626 src/protocols/oscar/oscar.c:4267
+#: src/protocols/oscar/oscar.c:4275 src/protocols/trepia/trepia.c:335
+#: src/protocols/trepia/trepia.c:413
 msgid "State"
 msgstr "Състояние"
 
-#: src/protocols/jabber/jabber.c:589
+#: src/protocols/jabber/jabber.c:636
 #, fuzzy
 msgid "Phone"
 msgstr "Не показва"
 
-#: src/protocols/jabber/jabber.c:607
+#: src/protocols/jabber/jabber.c:646
+msgid "Date"
+msgstr "Дата"
+
+#: src/protocols/jabber/jabber.c:654
 msgid "Please fill out the information below to register your new account."
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:610 src/protocols/jabber/jabber.c:611
+#: src/protocols/jabber/jabber.c:657 src/protocols/jabber/jabber.c:658
 msgid "Register New Jabber Account"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:710 src/protocols/msn/dispatch.c:219
-#: src/protocols/msn/msn.c:461 src/protocols/napster/napster.c:487
-#: src/protocols/trepia/trepia.c:1100 src/protocols/yahoo/yahoo.c:1923
+#. connect to the server
+#: src/protocols/jabber/jabber.c:775 src/protocols/msn/dispatch.c:212
+#: src/protocols/msn/msn.c:505 src/protocols/napster/napster.c:499
+#: src/protocols/novell/novell.c:1575 src/protocols/oscar/oscar.c:944
+#: src/protocols/trepia/trepia.c:1064 src/protocols/yahoo/yahoo.c:2177
+#: src/protocols/zephyr/zephyr.c:864
 msgid "Connecting"
 msgstr "Свързване"
 
-#: src/protocols/jabber/jabber.c:714
+#: src/protocols/jabber/jabber.c:779
 msgid "Initializing Stream"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:720
+#: src/protocols/jabber/jabber.c:785
 msgid "Authenticating"
 msgstr "Автентикация"
 
-#: src/protocols/jabber/jabber.c:728
+#: src/protocols/jabber/jabber.c:794
 msgid "Re-initializing Stream"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:851 src/protocols/jabber/jabber.c:902
-#: src/protocols/jabber/presence.c:257
+#: src/protocols/jabber/jabber.c:874 src/protocols/jabber/jabber.c:1153
+#: src/protocols/jabber/jabber.c:1194 src/protocols/jabber/jabber.c:1227
+#: src/protocols/oscar/oscar.c:572 src/protocols/oscar/oscar.c:5816
+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
+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:867 src/protocols/jabber/jutil.c:100
-#: src/protocols/jabber/presence.c:79
+#: src/protocols/jabber/jabber.c:951 src/protocols/jabber/jutil.c:35
+#: src/protocols/jabber/presence.c:66 src/protocols/jabber/presence.c:117
 #, fuzzy
 msgid "Chatty"
 msgstr "Чат"
 
-#: src/protocols/jabber/jabber.c:869 src/protocols/jabber/jutil.c:103
-#: src/protocols/jabber/presence.c:84
+#: src/protocols/jabber/jabber.c:953 src/protocols/jabber/jutil.c:38
+#: src/protocols/jabber/presence.c:68 src/protocols/jabber/presence.c:122
 msgid "Extended Away"
 msgstr "Разширено отсъствие"
 
-#: src/protocols/jabber/jabber.c:870 src/protocols/jabber/jutil.c:106
-#: src/protocols/jabber/presence.c:86 src/protocols/oscar/oscar.c:2827
-#: src/protocols/oscar/oscar.c:4532 src/protocols/oscar/oscar.c:6065
+#: src/protocols/jabber/jabber.c:954 src/protocols/jabber/jutil.c:41
+#: src/protocols/jabber/presence.c:70 src/protocols/jabber/presence.c:124
+#: src/protocols/oscar/oscar.c:514 src/protocols/oscar/oscar.c:4828
+#: src/protocols/oscar/oscar.c:6427
 msgid "Do Not Disturb"
 msgstr "Не притеснявайте"
 
-#: src/protocols/jabber/jabber.c:884
+#: src/protocols/jabber/jabber.c:971
 #, fuzzy
 msgid "Password Changed"
 msgstr "Gaim - Смяна на паролата"
 
-#: src/protocols/jabber/jabber.c:885
+#: src/protocols/jabber/jabber.c:972
 #, fuzzy
 msgid "Your password has been changed."
 msgstr "Паролата не може да бъде променена"
 
-#: src/protocols/jabber/jabber.c:895
-#, fuzzy, c-format
-msgid "Error changing password: %s"
+#: src/protocols/jabber/jabber.c:976 src/protocols/jabber/jabber.c:977
+#, fuzzy
+msgid "Error changing password"
 msgstr "Пропадна промяна на паролата (%s)"
 
-#: src/protocols/jabber/jabber.c:899
-#, fuzzy
-msgid "Unknown error occurred changing password"
-msgstr "Не мога да чета от socket"
-
-#: src/protocols/jabber/jabber.c:956
+#: src/protocols/jabber/jabber.c:1031
 #, fuzzy
 msgid "Password (again)"
 msgstr "Нова парола (отново)"
 
-#: src/protocols/jabber/jabber.c:961 src/protocols/jabber/jabber.c:962
+#: src/protocols/jabber/jabber.c:1036 src/protocols/jabber/jabber.c:1037
 #, fuzzy
 msgid "Change Jabber Password"
 msgstr "Смяна на паролата"
 
-#: src/protocols/jabber/jabber.c:962
+#: src/protocols/jabber/jabber.c:1037
 #, fuzzy
 msgid "Please enter your new password"
 msgstr "Моля въведете парола"
 
-#. *< api_version
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#: src/protocols/jabber/jabber.c:1057 src/protocols/jabber/jabber.c:1059
-msgid "Jabber Protocol Plugin"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:1083
-msgid "Force Old SSL"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:1091
-#, fuzzy
-msgid "Connect server"
-msgstr "Свързан"
-
-#: src/protocols/jabber/message.c:95
-#, fuzzy, c-format
-msgid "Message from %s"
-msgstr "Съобщения"
-
-#: src/protocols/jabber/message.c:178
-#, c-format
-msgid "Message delivery to %s failed: %s"
-msgstr ""
-
-#: src/protocols/jabber/message.c:181
-#, fuzzy
-msgid "Jabber Message Error"
-msgstr "Грешка на съобщението"
-
-#: src/protocols/jabber/message.c:244
-#, c-format
-msgid " (Code %s)"
-msgstr ""
-
-#: src/protocols/jabber/parser.c:129
-#, fuzzy
-msgid "XML Parse error"
-msgstr "AOL грешка"
-
-#: src/protocols/jabber/presence.c:167
-#, c-format
-msgid "%s (Code %s)"
-msgstr ""
-
-#: src/protocols/jabber/presence.c:172
-#, fuzzy
-msgid "Unknown Error in presence"
-msgstr "Непознат код на грешка."
-
-#: src/protocols/jabber/presence.c:176
-#, fuzzy, c-format
-msgid "The user %s wants to add you to their buddy list."
-msgstr "Потребителят %d позволи да го добавите в листата"
-
-#: src/protocols/jabber/presence.c:253
-#, fuzzy
-msgid "Unable to join chat"
-msgstr "Не мога да се свържа"
-
-#: src/protocols/msn/dispatch.c:42 src/protocols/msn/notification.c:278
-#: src/protocols/msn/notification.c:509
-#, fuzzy
-msgid "Unable to request USR\n"
-msgstr "Не мога да отворя директна връзка"
-
-#: src/protocols/msn/dispatch.c:59 src/protocols/msn/notification.c:295
-#, fuzzy
-msgid "Unable to login using MD5"
-msgstr "Невъзможност за логване в AIM"
-
-#: src/protocols/msn/dispatch.c:68 src/protocols/msn/notification.c:304
-#, fuzzy
-msgid "Unable to send USR"
-msgstr "Не може да се изпрати: прекалено голямо"
-
-#: src/protocols/msn/dispatch.c:73 src/protocols/msn/notification.c:309
-msgid "Requesting to send password"
-msgstr ""
-
-#: src/protocols/msn/dispatch.c:104
-#, fuzzy
-msgid "Protocol version not supported"
-msgstr "Действия на протокола"
-
-#: src/protocols/msn/dispatch.c:117 src/protocols/msn/notification.c:771
-#, fuzzy
-msgid "Unable to request CVR\n"
-msgstr "Не мога да отворя директна връзка"
-
-#: src/protocols/msn/dispatch.c:126 src/protocols/msn/notification.c:780
-#, fuzzy
-msgid "Unable to request INF\n"
-msgstr "Не мога да отворя директна връзка"
-
-#: src/protocols/msn/dispatch.c:147 src/protocols/msn/notification.c:1889
-msgid "Got invalid XFR"
-msgstr ""
-
-#: src/protocols/msn/dispatch.c:178
-#, fuzzy
-msgid "Unable to transfer"
-msgstr "Не мога да пиша"
-
-#: src/protocols/msn/dispatch.c:199
-#, fuzzy
-msgid "Unable to parse message."
-msgstr "Не може да се изпрати: прекалено голямо"
-
-#: src/protocols/msn/dispatch.c:215 src/protocols/msn/msn.c:470
-#: src/protocols/msn/notification.c:2116 src/protocols/napster/napster.c:463
-#: src/protocols/napster/napster.c:494 src/protocols/yahoo/yahoo.c:1715
-#: src/protocols/yahoo/yahoo.c:1746 src/protocols/yahoo/yahoo.c:1811
-msgid "Unable to connect"
-msgstr "Не мога да се свържа"
-
-#: src/protocols/msn/dispatch.c:239 src/protocols/msn/notification.c:876
-#: src/protocols/msn/notification.c:2138
-#, fuzzy
-msgid "Unable to write to server"
-msgstr "Не мога да се свържа със сървъра."
-
-#: src/protocols/msn/dispatch.c:243 src/protocols/msn/notification.c:2145
-#, fuzzy
-msgid "Syncing with server"
-msgstr "Регистриране със сървъра"
-
-#: src/protocols/msn/dispatch.c:257 src/protocols/msn/notification.c:2159
-#, fuzzy
-msgid "Error reading from server"
-msgstr "Грешка при четене от socket."
-
-#: src/protocols/msn/error.c:33
-msgid "Syntax Error (probably a Gaim bug)"
-msgstr ""
-
-#: src/protocols/msn/error.c:37
-msgid "Invalid Parameter (probably a Gaim bug)"
-msgstr ""
-
-#: src/protocols/msn/error.c:40
-#, fuzzy
-msgid "Invalid User"
+#: src/protocols/jabber/jabber.c:1048 src/protocols/toc/toc.c:1532
+msgid "Set User Info"
+msgstr "Настрока данни"
+
+#: src/protocols/jabber/jabber.c:1133
+msgid "Bad Request"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1135
+#, fuzzy
+msgid "Conflict"
+msgstr "Контакт"
+
+#: src/protocols/jabber/jabber.c:1137
+msgid "Feature Not Implemented"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1139
+#, fuzzy
+msgid "Forbidden"
+msgstr "Криене на икона"
+
+#: src/protocols/jabber/jabber.c:1141
+#, fuzzy
+msgid "Gone"
+msgstr "Не показва"
+
+#: src/protocols/jabber/jabber.c:1143 src/protocols/jabber/jabber.c:1217
+#, fuzzy
+msgid "Internal Server Error"
+msgstr "Вътрешна грешка"
+
+#: src/protocols/jabber/jabber.c:1145
+msgid "Item Not Found"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1147
+#, fuzzy
+msgid "Malformed Jabber ID"
 msgstr "Невалидно име"
 
-#: src/protocols/msn/error.c:44
-msgid "Fully Qualified Domain Name missing"
-msgstr ""
-
-#: src/protocols/msn/error.c:47
-msgid "Already Logged In"
-msgstr ""
-
-#: src/protocols/msn/error.c:50
-#, fuzzy
-msgid "Invalid Username"
-msgstr "Невалидно име"
-
-#: src/protocols/msn/error.c:53
-#, fuzzy
-msgid "Invalid Friendly Name"
-msgstr "Невалидно име"
-
-#: src/protocols/msn/error.c:56
-msgid "List Full"
-msgstr ""
-
-#: src/protocols/msn/error.c:59
-msgid "Already there"
-msgstr ""
-
-#: src/protocols/msn/error.c:62
-#, fuzzy
-msgid "Not on list"
-msgstr "Връзката се загуби"
-
-#: src/protocols/msn/error.c:65
-msgid "User is offline"
-msgstr ""
-
-#: src/protocols/msn/error.c:68
-msgid "Already in the mode"
-msgstr ""
-
-#: src/protocols/msn/error.c:71
-msgid "Already in opposite list"
-msgstr ""
-
-#: src/protocols/msn/error.c:74
-#, fuzzy
-msgid "Too many groups"
-msgstr "Прекалено много съвпадения."
-
-#: src/protocols/msn/error.c:77
-#, fuzzy
-msgid "Invalid group"
-msgstr "Невалидно име"
-
-#: src/protocols/msn/error.c:80
-msgid "User not in group"
-msgstr ""
-
-#: src/protocols/msn/error.c:83
-msgid "Group name too long"
-msgstr ""
-
-#: src/protocols/msn/error.c:86
-msgid "Cannot remove group zero"
-msgstr ""
-
-#: src/protocols/msn/error.c:90
-msgid "Tried to add a contact to a group that doesn't exist"
-msgstr ""
-
-#: src/protocols/msn/error.c:94
-msgid "Switchboard failed"
-msgstr ""
-
-#: src/protocols/msn/error.c:97
-msgid "Notify Transfer failed"
-msgstr ""
-
-#: src/protocols/msn/error.c:101
-msgid "Required fields missing"
-msgstr ""
-
-#: src/protocols/msn/error.c:104
-msgid "Too many hits to a FND"
-msgstr ""
-
-#: src/protocols/msn/error.c:107 src/protocols/oscar/oscar.c:179
-#, fuzzy
-msgid "Not logged in"
-msgstr "%s влезе."
-
-#: src/protocols/msn/error.c:111
-#, fuzzy
-msgid "Internal server error"
-msgstr "Вътрешна грешка"
-
-#: src/protocols/msn/error.c:114
-msgid "Database server error"
-msgstr ""
-
-#: src/protocols/msn/error.c:117
-#, fuzzy
-msgid "File operation error"
-msgstr "вътрешна грешка на връзката\n"
-
-#: src/protocols/msn/error.c:120
-#, fuzzy
-msgid "Memory allocation error"
-msgstr "основна грешка на връзката\n"
-
-#: src/protocols/msn/error.c:123
-msgid "Wrong CHL value sent to server"
-msgstr ""
-
-#: src/protocols/msn/error.c:127
-#, fuzzy
-msgid "Server busy"
-msgstr "Сървър:"
-
-#: src/protocols/msn/error.c:130 src/protocols/msn/error.c:143
-#: src/protocols/msn/error.c:198
-#, fuzzy
-msgid "Server unavailable"
+#: src/protocols/jabber/jabber.c:1149
+#, fuzzy
+msgid "Not Acceptable"
+msgstr "Недостъпен"
+
+#: src/protocols/jabber/jabber.c:1151
+#, fuzzy
+msgid "Not Allowed"
+msgstr "Недостъпен"
+
+#: src/protocols/jabber/jabber.c:1155
+msgid "Payment Required"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1157
+#, fuzzy
+msgid "Recipient Unavailable"
+msgstr "Недостъпен"
+
+#: src/protocols/jabber/jabber.c:1161
+#, fuzzy
+msgid "Registration Required"
+msgstr "Оторизирането пропадна"
+
+#: src/protocols/jabber/jabber.c:1163
+msgid "Remote Server Not Found"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1165
+msgid "Remote Server Timeout"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1167
+#, fuzzy
+msgid "Server Overloaded"
+msgstr "Недостъпен"
+
+#: src/protocols/jabber/jabber.c:1169
+#, fuzzy
+msgid "Service Unavailable"
 msgstr "Недостъпен"
 
-#: src/protocols/msn/error.c:133
-msgid "Peer Notification server down"
-msgstr ""
-
-#: src/protocols/msn/error.c:136
-#, fuzzy
-msgid "Database connect error"
-msgstr "вътрешна грешка на връзката\n"
-
-#: src/protocols/msn/error.c:140
-msgid "Server is going down (abandon ship)"
-msgstr ""
-
-#: src/protocols/msn/error.c:147
-#, fuzzy
-msgid "Error creating connection"
-msgstr "g003: Грешка при отваряне на връзка.\n"
-
-#: src/protocols/msn/error.c:151
-msgid "CVR parameters are either unknown or not allowed"
-msgstr ""
-
-#: src/protocols/msn/error.c:154 src/protocols/msn/notification.c:623
-#: src/protocols/msn/notification.c:1269 src/protocols/msn/notification.c:1437
-msgid "Unable to write"
-msgstr "Не мога да пиша"
-
-#: src/protocols/msn/error.c:157
-msgid "Session overload"
-msgstr ""
-
-#: src/protocols/msn/error.c:160
-msgid "User is too active"
-msgstr ""
-
-#: src/protocols/msn/error.c:163
-#, fuzzy
-msgid "Too many sessions"
-msgstr "Прекалено много съвпадения."
-
-#: src/protocols/msn/error.c:166 src/protocols/msn/error.c:172
-msgid "Not expected"
-msgstr ""
-
-#: src/protocols/msn/error.c:169
-msgid "Bad friend file"
-msgstr ""
-
-#: src/protocols/msn/error.c:177
-msgid "Friendly name changes too rapidly"
-msgstr ""
-
-#: src/protocols/msn/error.c:186
-#, fuzzy
-msgid "Server too busy"
-msgstr "Сървър:"
-
-#: src/protocols/msn/error.c:190 src/protocols/oscar/oscar.c:1074
-#: src/protocols/toc/toc.c:659
-#, fuzzy
-msgid "Authentication failed"
-msgstr "Аудентикацията пропадна."
-
-#: src/protocols/msn/error.c:193
-#, fuzzy
-msgid "Not allowed when offline"
-msgstr "Без звук при мое влизане"
-
-#: src/protocols/msn/error.c:201
-msgid "Not accepting new users"
-msgstr ""
-
-#: src/protocols/msn/error.c:205
-msgid "Kids Passport without parental consent"
-msgstr ""
-
-#: src/protocols/msn/error.c:209
-msgid "Passport account not yet verified"
-msgstr ""
-
-#: src/protocols/msn/error.c:213
-#, fuzzy, c-format
-msgid "Unknown Error Code %d"
-msgstr "Непознат код на грешка."
-
-#: src/protocols/msn/msn.c:70
-msgid "Your new MSN friendly name is too long."
-msgstr ""
-
-#: src/protocols/msn/msn.c:177
-#, fuzzy
-msgid "Set your friendly name."
-msgstr "Бащино Име"
-
-#: src/protocols/msn/msn.c:178
-msgid "This is the name that other MSN buddies will see you as."
-msgstr ""
-
-#: src/protocols/msn/msn.c:190
-msgid "Set your home phone number."
-msgstr ""
-
-#: src/protocols/msn/msn.c:201
-msgid "Set your work phone number."
-msgstr ""
-
-#: src/protocols/msn/msn.c:212
-msgid "Set your mobile phone number."
-msgstr ""
-
-#: src/protocols/msn/msn.c:221
-msgid "Allow MSN Mobile pages?"
-msgstr ""
-
-#: src/protocols/msn/msn.c:222
-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?"
-msgstr ""
-
-#: src/protocols/msn/msn.c:226
-#, fuzzy
-msgid "Allow"
-msgstr "Позволен лист"
-
-#: src/protocols/msn/msn.c:227
-msgid "Disallow"
-msgstr ""
-
-#: src/protocols/msn/msn.c:244
-#, fuzzy
-msgid "Send a mobile message."
-msgstr "Изпрати като съобщение"
-
-#: src/protocols/msn/msn.c:246
-#, fuzzy
-msgid "Page"
-msgstr "Образ"
-
-#: src/protocols/msn/msn.c:332 src/protocols/yahoo/yahoo.c:2142
-#, fuzzy, c-format
-msgid "<b>Status:</b> %s"
-msgstr "Статус: %s"
-
-#: src/protocols/msn/msn.c:345 src/protocols/msn/msn.c:603
-#: src/protocols/msn/state.c:32
-msgid "Away From Computer"
-msgstr ""
-
-#: src/protocols/msn/msn.c:346 src/protocols/msn/msn.c:605
-#: src/protocols/msn/state.c:31 src/protocols/yahoo/yahoo.c:2008
-#: src/protocols/yahoo/yahoo.c:2306 src/protocols/yahoo/yahoo.c:2406
-msgid "Be Right Back"
-msgstr ""
-
-#: src/protocols/msn/msn.c:347 src/protocols/msn/msn.c:607
-#: src/protocols/msn/state.c:29 src/protocols/yahoo/yahoo.c:2010
-#: src/protocols/yahoo/yahoo.c:2308 src/protocols/yahoo/yahoo.c:2407
-#, fuzzy
-msgid "Busy"
-msgstr "Авер"
-
-#: src/protocols/msn/msn.c:348 src/protocols/msn/msn.c:609
-#: src/protocols/msn/state.c:33 src/protocols/yahoo/yahoo.c:2018
-#: src/protocols/yahoo/yahoo.c:2316 src/protocols/yahoo/yahoo.c:2411
-msgid "On The Phone"
-msgstr ""
-
-#: src/protocols/msn/msn.c:349 src/protocols/msn/msn.c:611
-#: src/protocols/msn/state.c:34 src/protocols/yahoo/yahoo.c:2022
-#: src/protocols/yahoo/yahoo.c:2320 src/protocols/yahoo/yahoo.c:2413
-msgid "Out To Lunch"
-msgstr ""
-
-#: src/protocols/msn/msn.c:350 src/protocols/msn/msn.c:613
-#: src/protocols/zephyr/zephyr.c:883 src/protocols/zephyr/zephyr.c:898
-#, fuzzy
-msgid "Hidden"
-msgstr "Криене на икона"
-
-#: src/protocols/msn/msn.c:362
-#, fuzzy
-msgid "Set Friendly Name"
-msgstr "Бащино Име"
-
-#: src/protocols/msn/msn.c:370
-msgid "Set Home Phone Number"
-msgstr ""
-
-#: src/protocols/msn/msn.c:376
-msgid "Set Work Phone Number"
-msgstr ""
-
-#: src/protocols/msn/msn.c:382
-msgid "Set Mobile Phone Number"
-msgstr ""
-
-#: src/protocols/msn/msn.c:391
-msgid "Enable/Disable Mobile Devices"
-msgstr ""
-
-#: src/protocols/msn/msn.c:398
-msgid "Allow/Disallow Mobile Pages"
-msgstr ""
-
-#: src/protocols/msn/msn.c:424
-#, fuzzy
-msgid "Send to Mobile"
-msgstr "Прати файл"
-
-#: src/protocols/msn/msn.c:433
-#, fuzzy
-msgid "Initiate Chat"
-msgstr "Прякор"
-
-#: src/protocols/msn/msn.c:727
-#, 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."
-msgstr ""
-
-#: src/protocols/msn/msn.c:731 src/protocols/msn/msn.c:771
-#, fuzzy
-msgid "Invalid MSN screenname"
+#: src/protocols/jabber/jabber.c:1171
+#, fuzzy
+msgid "Subscription Required"
+msgstr "Gaim - отказана е ауторизация"
+
+#: src/protocols/jabber/jabber.c:1173
+msgid "Unexpected Request"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1180
+#, fuzzy
+msgid "Authorization Aborted"
+msgstr "Gaim - ауторизацията е дадена"
+
+#: src/protocols/jabber/jabber.c:1182
+msgid "Incorrect encoding in authorization"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1185
+msgid "Invalid authzid"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1188
+#, fuzzy
+msgid "Invalid Authorization Mechanism"
 msgstr "Невалидно име"
 
-#: src/protocols/msn/msn.c:767
-#, 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."
-msgstr ""
-
-#: src/protocols/msn/msn.c:1242 src/protocols/yahoo/yahoo.c:2582
-msgid "<html><body><b>Error retrieving profile</b></body></html>"
-msgstr ""
-
-#. Age
-#: src/protocols/msn/msn.c:1310 src/protocols/oscar/oscar.c:3931
-#: src/protocols/trepia/trepia.c:276 src/protocols/trepia/trepia.c:404
-#: src/protocols/yahoo/yahoo.c:2693
-msgid "Age"
-msgstr ""
-
-#. Gender
-#: src/protocols/msn/msn.c:1317 src/protocols/oscar/oscar.c:3917
-#: src/protocols/trepia/trepia.c:270 src/protocols/trepia/trepia.c:412
-#: src/protocols/yahoo/yahoo.c:2705
-#, fuzzy
-msgid "Gender"
-msgstr "Основни"
-
-#: src/protocols/msn/msn.c:1325 src/protocols/yahoo/yahoo.c:2699
-msgid "Marital Status"
-msgstr ""
-
-#: src/protocols/msn/msn.c:1332 src/protocols/yahoo/yahoo.c:2687
-#, fuzzy
-msgid "Location"
-msgstr "ZLocate"
-
-#: src/protocols/msn/msn.c:1340 src/protocols/yahoo/yahoo.c:2711
-#, fuzzy
-msgid "Occupation"
-msgstr "Опции"
-
-#: src/protocols/msn/msn.c:1357 src/protocols/msn/msn.c:1363
-#: src/protocols/msn/msn.c:1370 src/protocols/msn/msn.c:1377
-#: src/protocols/msn/msn.c:1384
-msgid "A Little About Me"
-msgstr ""
-
-#: src/protocols/msn/msn.c:1393 src/protocols/msn/msn.c:1406
-#: src/protocols/msn/msn.c:1413
-msgid "Favorite Things"
-msgstr ""
-
-#: src/protocols/msn/msn.c:1422 src/protocols/msn/msn.c:1428
-#: src/protocols/msn/msn.c:1435
-msgid "Hobbies and Interests"
-msgstr ""
-
-#: src/protocols/msn/msn.c:1444 src/protocols/msn/msn.c:1450
-#: src/protocols/yahoo/yahoo.c:2755
-msgid "Favorite Quote"
-msgstr ""
-
-#: src/protocols/msn/msn.c:1458 src/protocols/yahoo/yahoo.c:2799
-#, fuzzy
-msgid "Last Updated"
-msgstr "Фамилно име"
-
-#. Homepage
-#: src/protocols/msn/msn.c:1469 src/protocols/trepia/trepia.c:280
-#: src/protocols/trepia/trepia.c:448
-#, fuzzy
-msgid "Homepage"
-msgstr "Образ"
-
-#: src/protocols/msn/msn.c:1491 src/protocols/yahoo/yahoo.c:2817
-#, fuzzy, c-format
-msgid "User information for %s unavailable"
-msgstr "Потребителската информация за %s недостъпна: %s"
-
-#: src/protocols/msn/msn.c:1493 src/protocols/yahoo/yahoo.c:2819
-msgid "The user's profile is empty."
+#: src/protocols/jabber/jabber.c:1191
+#, fuzzy
+msgid "Authorization mechanism too weak"
+msgstr "Gaim - отказана е ауторизация"
+
+#: src/protocols/jabber/jabber.c:1196
+#, fuzzy
+msgid "Temporary Authentication Failure"
+msgstr "Оторизирането пропадна"
+
+#: src/protocols/jabber/jabber.c:1198
+#, fuzzy
+msgid "Authentication Failure"
+msgstr "Оторизирането пропадна"
+
+#: src/protocols/jabber/jabber.c:1202
+msgid "Bad Format"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1204
+msgid "Bad Namespace Prefix"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1207
+#, fuzzy
+msgid "Resource Conflict"
+msgstr "Подразбиране"
+
+#: src/protocols/jabber/jabber.c:1209
+#, fuzzy
+msgid "Connection Timeout"
+msgstr "Връзката се загуби"
+
+#: src/protocols/jabber/jabber.c:1211
+msgid "Host Gone"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1213
+#, fuzzy
+msgid "Host Unknown"
+msgstr "Непознато"
+
+#: src/protocols/jabber/jabber.c:1215
+#, fuzzy
+msgid "Improper Addressing"
+msgstr "Улица"
+
+#: src/protocols/jabber/jabber.c:1219
+#, fuzzy
+msgid "Invalid ID"
+msgstr "Невалидно име"
+
+#: src/protocols/jabber/jabber.c:1221
+#, fuzzy
+msgid "Invalid Namespace"
+msgstr "Невалидно име"
+
+#: src/protocols/jabber/jabber.c:1223
+#, fuzzy
+msgid "Invalid XML"
+msgstr "Невалидно име"
+
+#: src/protocols/jabber/jabber.c:1225
+msgid "Non-matching Hosts"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1229
+msgid "Policy Violation"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1231
+#, fuzzy
+msgid "Remote Connection Failed"
+msgstr "Връзката затворена"
+
+#: src/protocols/jabber/jabber.c:1233
+msgid "Resource Constraint"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1235
+msgid "Restricted XML"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1237
+msgid "See Other Host"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1239
+#, fuzzy
+msgid "System Shutdown"
+msgstr "Системен лог"
+
+#: src/protocols/jabber/jabber.c:1241
+msgid "Undefined Condition"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1243
+msgid "Unsupported Encoding"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1245
+msgid "Unsupported Stanza Type"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1247
+msgid "Unsupported Version"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1249
+msgid "XML Not Well Formed"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1251
+#, fuzzy
+msgid "Stream Error"
+msgstr "Вътрешна грешка"
+
+#: src/protocols/jabber/jabber.c:1276
+msgid "Hide Operating System"
 msgstr ""
 
 #. *< api_version
@@ -6038,93 +6141,754 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/msn/msn.c:1591 src/protocols/msn/msn.c:1593
+#. *  description
+#: src/protocols/jabber/jabber.c:1361 src/protocols/jabber/jabber.c:1363
+msgid "Jabber Protocol Plugin"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1388
+#, fuzzy
+msgid "Use TLS if available"
+msgstr "Недостъпен"
+
+#: src/protocols/jabber/jabber.c:1393
+msgid "Force old SSL"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1398
+msgid "Allow plaintext auth over unencrypted streams"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1407
+#, fuzzy
+msgid "Connect server"
+msgstr "Свързан"
+
+#: src/protocols/jabber/message.c:111
+#, fuzzy, c-format
+msgid "Message from %s"
+msgstr "Съобщения"
+
+#: src/protocols/jabber/message.c:173
+#, fuzzy, c-format
+msgid "%s has set the topic to: %s"
+msgstr "<B>%s смени темата на: %s</B>"
+
+#: src/protocols/jabber/message.c:175
+#, fuzzy, c-format
+msgid "The topic is: %s"
+msgstr "Връзката се загуби"
+
+#: src/protocols/jabber/message.c:225
+#, c-format
+msgid "Message delivery to %s failed: %s"
+msgstr ""
+
+#: src/protocols/jabber/message.c:228
+#, fuzzy
+msgid "Jabber Message Error"
+msgstr "Грешка на съобщението"
+
+#: src/protocols/jabber/message.c:291
+#, c-format
+msgid " (Code %s)"
+msgstr ""
+
+#: src/protocols/jabber/parser.c:131
+#, fuzzy
+msgid "XML Parse error"
+msgstr "AOL грешка"
+
+#: src/protocols/jabber/presence.c:221
+#, fuzzy
+msgid "Unknown Error in presence"
+msgstr "Непознат код на грешка."
+
+#: src/protocols/jabber/presence.c:224
+#, fuzzy, c-format
+msgid "The user %s wants to add you to their buddy list."
+msgstr "Потребителят %d позволи да го добавите в листата"
+
+#: src/protocols/jabber/presence.c:277 src/protocols/jabber/presence.c:278
+#, fuzzy
+msgid "Create New Room"
+msgstr "Чат"
+
+#: src/protocols/jabber/presence.c:279
+msgid ""
+"You are creating a new room.  Would you like to configure it, or accept the "
+"default settings?"
+msgstr ""
+
+#: src/protocols/jabber/presence.c:281
+#, fuzzy
+msgid "Configure Room"
+msgstr "Настройка"
+
+#: src/protocols/jabber/presence.c:283
+msgid "Accept Defaults"
+msgstr ""
+
+#: src/protocols/jabber/presence.c:303
+#, fuzzy, c-format
+msgid "Error in chat %s"
+msgstr "Влизане в чат като:"
+
+#: src/protocols/jabber/presence.c:306
+#, 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
+#, fuzzy
+msgid "File Send Failed"
+msgstr "Прати файл"
+
+#: src/protocols/msn/dispatch.c:42 src/protocols/msn/notification.c:240
+#, fuzzy
+msgid "Unable to request USR\n"
+msgstr "Не мога да отворя директна връзка"
+
+#: src/protocols/msn/dispatch.c:59 src/protocols/msn/notification.c:257
+#, fuzzy
+msgid "Unable to login using MD5"
+msgstr "Невъзможност за логване в AIM"
+
+#: src/protocols/msn/dispatch.c:68 src/protocols/msn/notification.c:266
+#, fuzzy
+msgid "Unable to send USR"
+msgstr "Не може да се изпрати: прекалено голямо"
+
+#: src/protocols/msn/dispatch.c:73 src/protocols/msn/notification.c:271
+msgid "Requesting to send password"
+msgstr ""
+
+#: src/protocols/msn/dispatch.c:104
+#, fuzzy
+msgid "Protocol version not supported"
+msgstr "Действия на протокола"
+
+#: src/protocols/msn/dispatch.c:117 src/protocols/msn/notification.c:410
+#, fuzzy
+msgid "Unable to request CVR\n"
+msgstr "Не мога да отворя директна връзка"
+
+#: src/protocols/msn/dispatch.c:126 src/protocols/msn/notification.c:419
+#, fuzzy
+msgid "Unable to request INF\n"
+msgstr "Не мога да отворя директна връзка"
+
+#: src/protocols/msn/dispatch.c:147 src/protocols/msn/notification.c:1564
+msgid "Got invalid XFR"
+msgstr ""
+
+#: src/protocols/msn/dispatch.c:178
+#, fuzzy
+msgid "Unable to transfer"
+msgstr "Не мога да пиша"
+
+#: src/protocols/msn/dispatch.c:192
+#, fuzzy
+msgid "Unable to parse message."
+msgstr "Не може да се изпрати: прекалено голямо"
+
+#: src/protocols/msn/dispatch.c:232 src/protocols/msn/notification.c:528
+#: src/protocols/msn/notification.c:1826
+#, fuzzy
+msgid "Unable to write to server"
+msgstr "Не мога да се свържа със сървъра."
+
+#: src/protocols/msn/dispatch.c:236 src/protocols/msn/notification.c:1833
+#, fuzzy
+msgid "Syncing with server"
+msgstr "Регистриране със сървъра"
+
+#: src/protocols/msn/dispatch.c:250
+#, fuzzy
+msgid "Error reading from server"
+msgstr "Грешка при четене от socket."
+
+#: src/protocols/msn/error.c:33
+#, fuzzy
+msgid "Unable to parse message"
+msgstr "Не може да се изпрати: прекалено голямо"
+
+#: src/protocols/msn/error.c:36
+msgid "Syntax Error (probably a Gaim bug)"
+msgstr ""
+
+#: src/protocols/msn/error.c:40
+#, fuzzy
+msgid "Invalid email address"
+msgstr "Невалидно име"
+
+#: src/protocols/msn/error.c:43
+#, fuzzy
+msgid "User does not exist"
+msgstr "Потребителска идентичност"
+
+#: src/protocols/msn/error.c:47
+msgid "Fully Qualified Domain Name missing"
+msgstr ""
+
+#: src/protocols/msn/error.c:50
+msgid "Already Logged In"
+msgstr ""
+
+#: src/protocols/msn/error.c:53
+#, fuzzy
+msgid "Invalid Username"
+msgstr "Невалидно име"
+
+#: src/protocols/msn/error.c:56
+#, fuzzy
+msgid "Invalid Friendly Name"
+msgstr "Невалидно име"
+
+#: src/protocols/msn/error.c:59
+msgid "List Full"
+msgstr ""
+
+#: src/protocols/msn/error.c:62
+msgid "Already there"
+msgstr ""
+
+#: src/protocols/msn/error.c:65
+#, fuzzy
+msgid "Not on list"
+msgstr "Връзката се загуби"
+
+#: src/protocols/msn/error.c:68 src/protocols/zephyr/zephyr.c:527
+msgid "User is offline"
+msgstr ""
+
+#: src/protocols/msn/error.c:71
+msgid "Already in the mode"
+msgstr ""
+
+#: src/protocols/msn/error.c:74
+msgid "Already in opposite list"
+msgstr ""
+
+#: src/protocols/msn/error.c:77
+#, fuzzy
+msgid "Too many groups"
+msgstr "Прекалено много съвпадения."
+
+#: src/protocols/msn/error.c:80
+#, fuzzy
+msgid "Invalid group"
+msgstr "Невалидно име"
+
+#: src/protocols/msn/error.c:83
+msgid "User not in group"
+msgstr ""
+
+#: src/protocols/msn/error.c:86
+msgid "Group name too long"
+msgstr ""
+
+#: src/protocols/msn/error.c:89
+msgid "Cannot remove group zero"
+msgstr ""
+
+#: src/protocols/msn/error.c:93
+msgid "Tried to add a contact to a group that doesn't exist"
+msgstr ""
+
+#: src/protocols/msn/error.c:97
+msgid "Switchboard failed"
+msgstr ""
+
+#: src/protocols/msn/error.c:100
+msgid "Notify Transfer failed"
+msgstr ""
+
+#: src/protocols/msn/error.c:104
+msgid "Required fields missing"
+msgstr ""
+
+#: src/protocols/msn/error.c:107
+msgid "Too many hits to a FND"
+msgstr ""
+
+#: src/protocols/msn/error.c:110 src/protocols/oscar/oscar.c:186
+#, fuzzy
+msgid "Not logged in"
+msgstr "%s влезе."
+
+#: src/protocols/msn/error.c:114
+#, fuzzy
+msgid "Service Temporarily Unavailable"
+msgstr "Dir service временно недостъпен."
+
+#: src/protocols/msn/error.c:117
+msgid "Database server error"
+msgstr ""
+
+#: src/protocols/msn/error.c:120
+msgid "Command disabled"
+msgstr ""
+
+#: src/protocols/msn/error.c:123
+#, fuzzy
+msgid "File operation error"
+msgstr "вътрешна грешка на връзката\n"
+
+#: src/protocols/msn/error.c:126
+#, fuzzy
+msgid "Memory allocation error"
+msgstr "основна грешка на връзката\n"
+
+#: src/protocols/msn/error.c:129
+msgid "Wrong CHL value sent to server"
+msgstr ""
+
+#: src/protocols/msn/error.c:133
+#, fuzzy
+msgid "Server busy"
+msgstr "Сървър:"
+
+#: src/protocols/msn/error.c:136 src/protocols/msn/error.c:149
+#: src/protocols/msn/error.c:204
+#, fuzzy
+msgid "Server unavailable"
+msgstr "Недостъпен"
+
+#: src/protocols/msn/error.c:139
+msgid "Peer Notification server down"
+msgstr ""
+
+#: src/protocols/msn/error.c:142
+#, fuzzy
+msgid "Database connect error"
+msgstr "вътрешна грешка на връзката\n"
+
+#: src/protocols/msn/error.c:146
+msgid "Server is going down (abandon ship)"
+msgstr ""
+
+#: src/protocols/msn/error.c:153
+#, fuzzy
+msgid "Error creating connection"
+msgstr "g003: Грешка при отваряне на връзка.\n"
+
+#: src/protocols/msn/error.c:157
+msgid "CVR parameters are either unknown or not allowed"
+msgstr ""
+
+#: src/protocols/msn/error.c:160 src/protocols/msn/notification.c:304
+msgid "Unable to write"
+msgstr "Не мога да пиша"
+
+#: src/protocols/msn/error.c:163
+msgid "Session overload"
+msgstr ""
+
+#: src/protocols/msn/error.c:166
+msgid "User is too active"
+msgstr ""
+
+#: src/protocols/msn/error.c:169
+#, fuzzy
+msgid "Too many sessions"
+msgstr "Прекалено много съвпадения."
+
+#: src/protocols/msn/error.c:172
+msgid "Passport not verified"
+msgstr ""
+
+#: src/protocols/msn/error.c:175
+msgid "Bad friend file"
+msgstr ""
+
+#: src/protocols/msn/error.c:178
+msgid "Not expected"
+msgstr ""
+
+#: src/protocols/msn/error.c:183
+msgid "Friendly name changes too rapidly"
+msgstr ""
+
+#: src/protocols/msn/error.c:192
+#, fuzzy
+msgid "Server too busy"
+msgstr "Сървър:"
+
+#: src/protocols/msn/error.c:196 src/protocols/oscar/oscar.c:1357
+#: src/protocols/toc/toc.c:659
+#, fuzzy
+msgid "Authentication failed"
+msgstr "Аудентикацията пропадна."
+
+#: src/protocols/msn/error.c:199
+#, fuzzy
+msgid "Not allowed when offline"
+msgstr "Без звук при мое влизане"
+
+#: src/protocols/msn/error.c:207
+msgid "Not accepting new users"
+msgstr ""
+
+#: src/protocols/msn/error.c:211
+msgid "Kids Passport without parental consent"
+msgstr ""
+
+#: src/protocols/msn/error.c:215
+msgid "Passport account not yet verified"
+msgstr ""
+
+#: src/protocols/msn/error.c:218
+#, fuzzy
+msgid "Bad ticket"
+msgstr "Показва авер Ticker"
+
+#: src/protocols/msn/error.c:222
+#, fuzzy, c-format
+msgid "Unknown Error Code %d"
+msgstr "Непознат код на грешка."
+
+#: src/protocols/msn/error.c:234
+#, fuzzy, c-format
+msgid "MSN Error: %s\n"
+msgstr "Грешка в MSN"
+
+#: src/protocols/msn/msn.c:72
+msgid "Your new MSN friendly name is too long."
+msgstr ""
+
+#: src/protocols/msn/msn.c:191
+#, fuzzy
+msgid "Set your friendly name."
+msgstr "Бащино Име"
+
+#: src/protocols/msn/msn.c:192
+msgid "This is the name that other MSN buddies will see you as."
+msgstr ""
+
+#: src/protocols/msn/msn.c:204
+msgid "Set your home phone number."
+msgstr ""
+
+#: src/protocols/msn/msn.c:215
+msgid "Set your work phone number."
+msgstr ""
+
+#: src/protocols/msn/msn.c:226
+msgid "Set your mobile phone number."
+msgstr ""
+
+#: src/protocols/msn/msn.c:235
+msgid "Allow MSN Mobile pages?"
+msgstr ""
+
+#: src/protocols/msn/msn.c:236
+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?"
+msgstr ""
+
+#: src/protocols/msn/msn.c:240
+#, fuzzy
+msgid "Allow"
+msgstr "Позволен лист"
+
+#: src/protocols/msn/msn.c:241
+msgid "Disallow"
+msgstr ""
+
+#: src/protocols/msn/msn.c:258
+#, fuzzy
+msgid "Send a mobile message."
+msgstr "Изпрати като съобщение"
+
+#: src/protocols/msn/msn.c:260
+#, fuzzy
+msgid "Page"
+msgstr "Образ"
+
+#: src/protocols/msn/msn.c:361 src/protocols/msn/msn.c:662
+#: src/protocols/msn/state.c:32
+msgid "Away From Computer"
+msgstr ""
+
+#: src/protocols/msn/msn.c:362 src/protocols/msn/msn.c:664
+#: src/protocols/msn/state.c:31 src/protocols/yahoo/yahoo.c:2275
+#: src/protocols/yahoo/yahoo.c:2601 src/protocols/yahoo/yahoo.c:2715
+msgid "Be Right Back"
+msgstr ""
+
+#: src/protocols/msn/msn.c:363 src/protocols/msn/msn.c:666
+#: src/protocols/msn/state.c:29 src/protocols/novell/novell.c:2147
+#: src/protocols/novell/novell.c:2260 src/protocols/novell/novell.c:2314
+#: src/protocols/yahoo/yahoo.c:2277 src/protocols/yahoo/yahoo.c:2603
+#: src/protocols/yahoo/yahoo.c:2716
+#, fuzzy
+msgid "Busy"
+msgstr "Авер"
+
+#: src/protocols/msn/msn.c:364 src/protocols/msn/msn.c:668
+#: src/protocols/msn/state.c:33 src/protocols/yahoo/yahoo.c:2285
+#: src/protocols/yahoo/yahoo.c:2611 src/protocols/yahoo/yahoo.c:2720
+msgid "On The Phone"
+msgstr ""
+
+#: src/protocols/msn/msn.c:365 src/protocols/msn/msn.c:670
+#: src/protocols/msn/state.c:34 src/protocols/yahoo/yahoo.c:2289
+#: src/protocols/yahoo/yahoo.c:2615 src/protocols/yahoo/yahoo.c:2722
+msgid "Out To Lunch"
+msgstr ""
+
+#: src/protocols/msn/msn.c:366 src/protocols/msn/msn.c:672
+#: src/protocols/zephyr/zephyr.c:1179 src/protocols/zephyr/zephyr.c:1194
+#, fuzzy
+msgid "Hidden"
+msgstr "Криене на икона"
+
+#: src/protocols/msn/msn.c:378
+#, fuzzy
+msgid "Set Friendly Name"
+msgstr "Бащино Име"
+
+#: src/protocols/msn/msn.c:386
+msgid "Set Home Phone Number"
+msgstr ""
+
+#: src/protocols/msn/msn.c:392
+msgid "Set Work Phone Number"
+msgstr ""
+
+#: src/protocols/msn/msn.c:398
+msgid "Set Mobile Phone Number"
+msgstr ""
+
+#: src/protocols/msn/msn.c:407
+msgid "Enable/Disable Mobile Devices"
+msgstr ""
+
+#: src/protocols/msn/msn.c:414
+msgid "Allow/Disallow Mobile Pages"
+msgstr ""
+
+#: src/protocols/msn/msn.c:440
+#, fuzzy
+msgid "Send to Mobile"
+msgstr "Прати файл"
+
+#: src/protocols/msn/msn.c:449
+#, fuzzy
+msgid "Initiate Chat"
+msgstr "Прякор"
+
+#: src/protocols/msn/msn.c:473
+msgid ""
+"SSL support is needed for MSN. Please install a supported SSL library. See "
+"http://gaim.sf.net/faq-ssl.php for more information."
+msgstr ""
+
+#: src/protocols/msn/msn.c:785
+#, 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 ""
+
+#: src/protocols/msn/msn.c:789 src/protocols/msn/msn.c:829
+#, fuzzy
+msgid "Invalid MSN screen name"
+msgstr "Невалидно име"
+
+#: src/protocols/msn/msn.c:825
+#, 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 ""
+
+#: src/protocols/msn/msn.c:1332 src/protocols/yahoo/yahoo.c:2899
+msgid "<html><body><b>Error retrieving profile</b></body></html>"
+msgstr ""
+
+#. Age
+#: src/protocols/msn/msn.c:1402 src/protocols/oscar/oscar.c:4252
+#: src/protocols/trepia/trepia.c:285 src/protocols/trepia/trepia.c:404
+#: src/protocols/yahoo/yahoo.c:3009
+msgid "Age"
+msgstr ""
+
+#. Gender
+#: src/protocols/msn/msn.c:1409 src/protocols/oscar/oscar.c:4239
+#: src/protocols/trepia/trepia.c:279 src/protocols/trepia/trepia.c:406
+#: src/protocols/yahoo/yahoo.c:3017
+#, fuzzy
+msgid "Gender"
+msgstr "Основни"
+
+#: src/protocols/msn/msn.c:1417 src/protocols/yahoo/yahoo.c:3013
+msgid "Marital Status"
+msgstr ""
+
+#: src/protocols/msn/msn.c:1424 src/protocols/yahoo/yahoo.c:3005
+#, fuzzy
+msgid "Location"
+msgstr "ZLocate"
+
+#: src/protocols/msn/msn.c:1432 src/protocols/yahoo/yahoo.c:3021
+#, fuzzy
+msgid "Occupation"
+msgstr "Опции"
+
+#: src/protocols/msn/msn.c:1449 src/protocols/msn/msn.c:1455
+#: src/protocols/msn/msn.c:1462 src/protocols/msn/msn.c:1469
+#: src/protocols/msn/msn.c:1476
+msgid "A Little About Me"
+msgstr ""
+
+#: src/protocols/msn/msn.c:1485 src/protocols/msn/msn.c:1498
+#: src/protocols/msn/msn.c:1505
+msgid "Favorite Things"
+msgstr ""
+
+#: src/protocols/msn/msn.c:1514 src/protocols/msn/msn.c:1520
+#: src/protocols/msn/msn.c:1527
+msgid "Hobbies and Interests"
+msgstr ""
+
+#: src/protocols/msn/msn.c:1536 src/protocols/msn/msn.c:1542
+#: src/protocols/yahoo/yahoo.c:3056
+msgid "Favorite Quote"
+msgstr ""
+
+#: src/protocols/msn/msn.c:1550 src/protocols/yahoo/yahoo.c:3092
+#, fuzzy
+msgid "Last Updated"
+msgstr "Фамилно име"
+
+#. Homepage
+#: src/protocols/msn/msn.c:1561 src/protocols/trepia/trepia.c:289
+#: src/protocols/trepia/trepia.c:419
+#, fuzzy
+msgid "Homepage"
+msgstr "Образ"
+
+#: src/protocols/msn/msn.c:1583 src/protocols/yahoo/yahoo.c:3107
+#, fuzzy, c-format
+msgid "User information for %s unavailable"
+msgstr "Потребителската информация за %s недостъпна: %s"
+
+#: src/protocols/msn/msn.c:1585 src/protocols/yahoo/yahoo.c:3109
+msgid "The user's profile is empty."
+msgstr ""
+
+#: src/protocols/msn/msn.c:1626
+msgid "Display conversation closed notices"
+msgstr ""
+
+#: src/protocols/msn/msn.c:1631
+msgid "Display timeout notices"
+msgstr ""
+
+#. *< api_version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: src/protocols/msn/msn.c:1716 src/protocols/msn/msn.c:1718
 #, fuzzy
 msgid "MSN Protocol Plugin"
 msgstr "Действия на протокола"
 
-#: src/protocols/msn/msn.c:1612 src/protocols/trepia/trepia.c:1330
+#: src/protocols/msn/msn.c:1736 src/protocols/trepia/trepia.c:1301
 #, fuzzy
 msgid "Login server"
 msgstr "Грешка при влизане"
 
-#: src/protocols/msn/notification.c:247
-#, fuzzy, c-format
-msgid "MSN Error: %s\n"
-msgstr "Грешка в MSN"
-
-#: src/protocols/msn/notification.c:366 src/protocols/msn/notification.c:534
+#: src/protocols/msn/msn.c:1745
+msgid "Use HTTP Method"
+msgstr ""
+
+#: src/protocols/msn/nexus.c:56
+#, fuzzy
+msgid "Unable to connect to server"
+msgstr "Не мога да се свържа със сървъра."
+
+#: src/protocols/msn/nexus.c:121 src/protocols/msn/nexus.c:130
 #, fuzzy
 msgid "Unable to write to MSN Nexus server."
 msgstr "Не мога да се свържа със сървъра."
 
-#: src/protocols/msn/notification.c:375 src/protocols/msn/notification.c:549
-#, fuzzy
-msgid "Unable to read from MSN Nexus server."
-msgstr "Не мога да се свържа със сървъра."
-
-#: src/protocols/msn/notification.c:395
+#: src/protocols/msn/nexus.c:147
 msgid "MSN Nexus server returned invalid redirect information."
 msgstr ""
 
-#: src/protocols/msn/notification.c:448
+#: src/protocols/msn/nexus.c:204
 msgid "Unknown error when attempting to authorize with MSN login server."
 msgstr ""
 
-#: src/protocols/msn/notification.c:560
-msgid "MSN Nexus server returned invalid information."
-msgstr ""
-
-#: src/protocols/msn/notification.c:628 src/protocols/trepia/trepia.c:677
+#: src/protocols/msn/notification.c:309 src/protocols/trepia/trepia.c:635
 #, fuzzy
 msgid "Retrieving buddy list"
 msgstr "Премахване на '%s' от листа.\n"
 
-#: src/protocols/msn/notification.c:690
-#, fuzzy
-msgid "Unable to connect to passport server"
-msgstr "Не мога да се свържа със сървъра."
-
-#: src/protocols/msn/notification.c:695 src/protocols/msn/notification.c:727
+#: src/protocols/msn/notification.c:334 src/protocols/msn/notification.c:366
+#: src/protocols/oscar/oscar.c:1646
 #, fuzzy
 msgid "Password sent"
 msgstr "Парола:"
 
-#: src/protocols/msn/notification.c:722
+#: src/protocols/msn/notification.c:361
 #, fuzzy
 msgid "Unable to send password"
 msgstr "Не мога да чета от socket"
 
-#: src/protocols/msn/notification.c:758
+#: src/protocols/msn/notification.c:397
 #, fuzzy
 msgid "Protocol not supported"
 msgstr "Действия на протокола"
 
-#: src/protocols/msn/notification.c:800
+#: src/protocols/msn/notification.c:440
 msgid "You have been disconnected. You have signed on from another location."
 msgstr "Бяхте разкачени. Влезли сте от друго място."
 
-#: src/protocols/msn/notification.c:805
+#: src/protocols/msn/notification.c:445
 #, fuzzy
 msgid "You have been disconnected. The MSN servers are going down temporarily."
 msgstr "Бяхте разкачени. Влезли сте от друго място."
 
-#: src/protocols/msn/notification.c:931
+#: src/protocols/msn/notification.c:584
 #, fuzzy, c-format
 msgid "The user %s (%s) wants to add %s to his or her buddy list."
 msgstr "%s%s%s%s направи %s техен контакт %s%s%s"
 
-#: src/protocols/msn/notification.c:1250 src/protocols/msn/notification.c:1416
+#: src/protocols/msn/notification.c:903 src/protocols/msn/notification.c:1070
 #, fuzzy, c-format
 msgid "The user %s (%s) wants to add you to their buddy list."
 msgstr "Потребителят %d позволи да го добавите в листата"
 
-#: src/protocols/msn/notification.c:1931
+#: src/protocols/msn/notification.c:1362
+#, c-format
+msgid ""
+"Your MSN buddy list for %s is temporarily unavailable. Please wait and try "
+"again."
+msgstr ""
+
+#: src/protocols/msn/notification.c:1607
 #, fuzzy
 msgid "Unable to transfer to notification server"
 msgstr "Не мога да се свържа със сървъра."
 
-#: src/protocols/msn/notification.c:2079
+#: src/protocols/msn/notification.c:1776
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -6143,16 +6907,25 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/protocols/msn/switchboard.c:147
+#: src/protocols/msn/servconn.c:389
+#, fuzzy
+msgid "IO Error."
+msgstr "Грешка в IRC"
+
+#: src/protocols/msn/servconn.c:527
+msgid "Received HTTP error. Please report this."
+msgstr ""
+
+#: 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 ""
 
-#: src/protocols/msn/switchboard.c:277
+#: src/protocols/msn/switchboard.c:300
 msgid "An MSN message may not have been received."
 msgstr ""
 
@@ -6166,29 +6939,29 @@
 msgid "Unable to read message from server.  Command is %hd, length is %hd."
 msgstr ""
 
-#: src/protocols/napster/napster.c:303
+#: src/protocols/napster/napster.c:307
 #, c-format
 msgid "users: %s, files: %s, size: %sGB"
 msgstr ""
 
 #. MSG_SERVER_HOTLIST_ERROR
-#: src/protocols/napster/napster.c:314
+#: src/protocols/napster/napster.c:318
 #, c-format
 msgid "Unable to add \"%s\" to your Napster hotlist"
 msgstr ""
 
-#: src/protocols/napster/napster.c:322
+#: src/protocols/napster/napster.c:326
 #, fuzzy
 msgid "You were disconnected from the server."
 msgstr "Прекъснати сте от стаята за разговори %s."
 
 #. MSG_CLIENT_WHOIS
-#: src/protocols/napster/napster.c:378
+#: src/protocols/napster/napster.c:384
 #, fuzzy, c-format
 msgid "%s requested your information"
 msgstr "Потребителя няма данни в директорията."
 
-#: src/protocols/napster/napster.c:410
+#: src/protocols/napster/napster.c:422
 #, fuzzy
 msgid ""
 "You were disconnected from the server, because you logged on from a "
@@ -6196,15 +6969,208 @@
 msgstr "Бяхте разкачени. Влезли сте от друго място."
 
 #. MSG_CLIENT_PING
-#: src/protocols/napster/napster.c:416
+#: src/protocols/napster/napster.c:428
 #, c-format
 msgid "%s requested a PING"
 msgstr ""
 
-#: src/protocols/napster/napster.c:543 src/protocols/oscar/oscar.c:5151
-#: src/protocols/toc/toc.c:1258
-msgid "Join what group:"
-msgstr "Присъединяване към група:"
+#: src/protocols/napster/napster.c:541
+msgid "Get Info"
+msgstr "Данни"
+
+#: src/protocols/napster/napster.c:555 src/protocols/oscar/oscar.c:5522
+#: src/protocols/toc/toc.c:1259
+#, fuzzy
+msgid "_Group:"
+msgstr "Група"
+
+#. *< api_version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: src/protocols/napster/napster.c:639 src/protocols/napster/napster.c:641
+msgid "NAPSTER Protocol Plugin"
+msgstr ""
+
+#: src/protocols/novell/novell.c:113
+#, c-format
+msgid "Login failed (0x%X)."
+msgstr ""
+
+#: src/protocols/novell/novell.c:225
+#, fuzzy, c-format
+msgid "Unable to send message. Could not get details for user (0x%X)."
+msgstr "Не може да се изпрати: прекалено голямо"
+
+#: src/protocols/novell/novell.c:371
+#, fuzzy, c-format
+msgid "Unable to add %s to your buddy list (0x%X)."
+msgstr "Не мога да чета файл %s"
+
+#. TODO: Improve this! message to who or for what conference?
+#: src/protocols/novell/novell.c:397
+#, fuzzy, c-format
+msgid "Unable to send message (0x%X)."
+msgstr "Не може да се изпрати: прекалено голямо"
+
+#: src/protocols/novell/novell.c:485
+#, c-format
+msgid "Unable to send message to %s. Could not create the conference (0x%X)."
+msgstr ""
+
+#: src/protocols/novell/novell.c:489
+#, fuzzy, c-format
+msgid "Unable to send message. Could not create the conference (0x%X)."
+msgstr "Не може да се изпратисъобщение: Незнайна причина"
+
+#: src/protocols/novell/novell.c:536
+#, c-format
+msgid ""
+"Unable to move user %s to folder %s in the server side list. Error while "
+"creating folder (0x%X)."
+msgstr ""
+
+#: src/protocols/novell/novell.c:584
+#, c-format
+msgid ""
+"Unable to add %s to your buddy list. Error creating folder in server side "
+"list (0x%X)."
+msgstr ""
+
+#: src/protocols/novell/novell.c:615 src/protocols/novell/novell.c:1344
+#, fuzzy, c-format
+msgid "GroupWise Conference %d"
+msgstr "Прякор"
+
+#: src/protocols/novell/novell.c:659
+#, c-format
+msgid "Could not get details for user %s (0x%X)."
+msgstr ""
+
+#: src/protocols/novell/novell.c:773 src/protocols/novell/novell.c:1107
+msgid "Error communicating with server. Closing connection."
+msgstr ""
+
+#: src/protocols/novell/novell.c:982
+#, fuzzy
+msgid "Userid"
+msgstr "Потребител"
+
+#. tag = _("DN");
+#. value = nm_user_record_get_dn(user_record);
+#. if (value) {
+#. g_string_append_printf(info_text, "<b>%s:</b> %s<br/>\n",
+#. tag, value);
+#. }
+#.
+#: src/protocols/novell/novell.c:996
+#, fuzzy
+msgid "Full name"
+msgstr "Пълно име"
+
+#: src/protocols/novell/novell.c:1016
+#, fuzzy
+msgid "User Properties"
+msgstr "Прокси"
+
+#: src/protocols/novell/novell.c:1084
+#, fuzzy
+msgid "Unable to make SSL connection to server."
+msgstr "Не мога да се свържа със сървъра."
+
+#: src/protocols/novell/novell.c:1113
+#, c-format
+msgid "Error processing event or response. (0x%X)"
+msgstr ""
+
+#: src/protocols/novell/novell.c:1147
+#, fuzzy
+msgid "Authenticating..."
+msgstr "Автентикация"
+
+#: src/protocols/novell/novell.c:1162
+#, fuzzy
+msgid "Waiting for response..."
+msgstr "Изчакване на отговор..."
+
+#: src/protocols/novell/novell.c:1302
+#, fuzzy
+msgid "Invitation to Conversation"
+msgstr "Gaim - Разговори"
+
+#: src/protocols/novell/novell.c:1303
+#, c-format
+msgid ""
+"Invitation from: %s\n"
+"\n"
+"Sent: %s"
+msgstr ""
+
+#: src/protocols/novell/novell.c:1305
+msgid "Would you like to join the conversation?"
+msgstr ""
+
+#: src/protocols/novell/novell.c:1408
+#, fuzzy
+msgid "You have been logged out because you logged in at another workstation."
+msgstr "Бяхте разкачени. Влезли сте от друго място."
+
+#: src/protocols/novell/novell.c:1462
+#, c-format
+msgid ""
+"%s appears to be offline and did not receive the message that you just sent."
+msgstr ""
+
+#. TODO: Would be nice to prompt if not set!
+#. *  gaim_request_fields(gc, _("Server Address"),...);
+#.
+#. ...but for now just error out with a nice message.
+#: src/protocols/novell/novell.c:1560
+msgid ""
+"Unable to connect to server. Please enter the address of the server you wish "
+"to connect to."
+msgstr ""
+
+#: src/protocols/novell/novell.c:1582
+msgid "Error. SSL support is not installed."
+msgstr ""
+
+#: src/protocols/novell/novell.c:1846
+msgid "This conference has been closed. No more messages can be sent."
+msgstr ""
+
+#: src/protocols/novell/novell.c:2153 src/protocols/oscar/oscar.c:574
+#: src/protocols/oscar/oscar.c:5818 src/protocols/yahoo/yahoo.c:2297
+#, fuzzy
+msgid "Offline"
+msgstr "Онлайн"
+
+#: src/protocols/novell/novell.c:2161
+#, fuzzy, c-format
+msgid ""
+"\n"
+"<b>Status:</b> %s\n"
+"<b>Message:</b> %s"
+msgstr "Статус: %s"
+
+#: src/protocols/novell/novell.c:2165
+#, fuzzy, c-format
+msgid ""
+"\n"
+"<b>Status:</b> %s"
+msgstr "Статус: %s"
+
+#: src/protocols/novell/novell.c:2261 src/protocols/novell/novell.c:2317
+#, fuzzy
+msgid "Appear Offline"
+msgstr "Онлайн"
 
 #. *< api_version
 #. *< type
@@ -6216,186 +7182,321 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/napster/napster.c:619 src/protocols/napster/napster.c:621
-msgid "NAPSTER Protocol Plugin"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:175
+#. *  description
+#: src/protocols/novell/novell.c:2405 src/protocols/novell/novell.c:2407
+msgid "Novell GroupWise Messenger Protocol Plugin"
+msgstr ""
+
+#: src/protocols/novell/novell.c:2424
+#, fuzzy
+msgid "Server address"
+msgstr "Улица"
+
+#: src/protocols/novell/novell.c:2428
+#, fuzzy
+msgid "Server port"
+msgstr "Сървър:"
+
+#: src/protocols/oscar/oscar.c:182
 #, fuzzy
 msgid "Invalid error"
 msgstr "Невалидно име"
 
-#: src/protocols/oscar/oscar.c:176
+#: src/protocols/oscar/oscar.c:183
 #, fuzzy
 msgid "Invalid SNAC"
 msgstr "Невалидно име"
 
-#: src/protocols/oscar/oscar.c:177
+#: src/protocols/oscar/oscar.c:184
 msgid "Rate to host"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:178
+#: src/protocols/oscar/oscar.c:185
 msgid "Rate to client"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:180
+#: src/protocols/oscar/oscar.c:187
 #, fuzzy
 msgid "Service unavailable"
 msgstr "Недостъпен"
 
-#: src/protocols/oscar/oscar.c:181
+#: src/protocols/oscar/oscar.c:188
 msgid "Service not defined"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:182
-msgid "Obsolete SNAC"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:183
-msgid "Not supported by host"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:184
-msgid "Not supported by client"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:185
-msgid "Refused by client"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:186
-msgid "Reply too big"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:187
-msgid "Responses lost"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:188
-msgid "Request denied"
-msgstr ""
-
 #: src/protocols/oscar/oscar.c:189
-msgid "Busted SNAC payload"
+msgid "Obsolete SNAC"
 msgstr ""
 
 #: src/protocols/oscar/oscar.c:190
-msgid "Insufficient rights"
+msgid "Not supported by host"
 msgstr ""
 
 #: src/protocols/oscar/oscar.c:191
-msgid "In local permit/deny"
+msgid "Not supported by client"
 msgstr ""
 
 #: src/protocols/oscar/oscar.c:192
-msgid "Too evil (sender)"
+msgid "Refused by client"
 msgstr ""
 
 #: src/protocols/oscar/oscar.c:193
-msgid "Too evil (receiver)"
+msgid "Reply too big"
 msgstr ""
 
 #: src/protocols/oscar/oscar.c:194
+msgid "Responses lost"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:195
+msgid "Request denied"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:196
+msgid "Busted SNAC payload"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:197
+msgid "Insufficient rights"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:198
+msgid "In local permit/deny"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:199
+msgid "Too evil (sender)"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:200
+msgid "Too evil (receiver)"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:201
 #, fuzzy
 msgid "User temporarily unavailable"
 msgstr "Dir service временно недостъпен."
 
-#: src/protocols/oscar/oscar.c:195
+#: src/protocols/oscar/oscar.c:202
 msgid "No match"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:196
+#: src/protocols/oscar/oscar.c:203
 msgid "List overflow"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:197
+#: src/protocols/oscar/oscar.c:204
 msgid "Request ambiguous"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:198
+#: src/protocols/oscar/oscar.c:205
 msgid "Queue full"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:199
+#: src/protocols/oscar/oscar.c:206
 msgid "Not while on AOL"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:470
+#: src/protocols/oscar/oscar.c:428
+msgid "Voice"
+msgstr "Глас"
+
+#: src/protocols/oscar/oscar.c:431
+#, fuzzy
+msgid "AIM Direct IM"
+msgstr "Директна връзка"
+
+#: src/protocols/oscar/oscar.c:434
+msgid "Chat"
+msgstr "Чат"
+
+#: src/protocols/oscar/oscar.c:437 src/protocols/oscar/oscar.c:6540
+msgid "Get File"
+msgstr "Вземи файл"
+
+#: src/protocols/oscar/oscar.c:444
+msgid "Games"
+msgstr "Игри"
+
+#: src/protocols/oscar/oscar.c:447
+msgid "Add-Ins"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:450
+msgid "Send Buddy List"
+msgstr "Изпрати листата"
+
+#: src/protocols/oscar/oscar.c:453
+#, fuzzy
+msgid "ICQ Direct Connect"
+msgstr "Разкачам"
+
+#: src/protocols/oscar/oscar.c:456
+msgid "AP User"
+msgstr "AP потребител"
+
+#: src/protocols/oscar/oscar.c:459
+msgid "ICQ RTF"
+msgstr "ICQ RTF"
+
+#: src/protocols/oscar/oscar.c:462
+msgid "Nihilist"
+msgstr "Нихилист"
+
+#: src/protocols/oscar/oscar.c:465
+msgid "ICQ Server Relay"
+msgstr "Предаване през ICQ Server"
+
+#: src/protocols/oscar/oscar.c:468
+#, fuzzy
+msgid "Old ICQ UTF8"
+msgstr "ICQ RTF"
+
+#: src/protocols/oscar/oscar.c:471
+msgid "Trillian Encryption"
+msgstr "Кодиране Trillian"
+
+#: src/protocols/oscar/oscar.c:474
+#, fuzzy
+msgid "ICQ UTF8"
+msgstr "ICQ RTF"
+
+#: src/protocols/oscar/oscar.c:477
+msgid "Hiptop"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:480
+msgid "Security Enabled"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:483
+#, fuzzy
+msgid "Video Chat"
+msgstr "Чат"
+
+#: src/protocols/oscar/oscar.c:487
+#, fuzzy
+msgid "iChat AV"
+msgstr "Чат"
+
+#: src/protocols/oscar/oscar.c:490
+msgid "Live Video"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:493
+#, fuzzy
+msgid "Camera"
+msgstr "Псевдоним"
+
+#: src/protocols/oscar/oscar.c:512 src/protocols/oscar/oscar.c:4837
+#: src/protocols/oscar/oscar.c:6430
+msgid "Free For Chat"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:516 src/protocols/oscar/oscar.c:4831
+#: src/protocols/oscar/oscar.c:6428
+#, fuzzy
+msgid "Not Available"
+msgstr "Недостъпен"
+
+#: src/protocols/oscar/oscar.c:518 src/protocols/oscar/oscar.c:4834
+#: src/protocols/oscar/oscar.c:6429
+msgid "Occupied"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:522
+msgid "Web Aware"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:590
+#, fuzzy
+msgid "Capabilities"
+msgstr "Вземи възможностите"
+
+#: src/protocols/oscar/oscar.c:596
+#, fuzzy
+msgid "Buddy Comment"
+msgstr "Чат"
+
+#: src/protocols/oscar/oscar.c:716
 #, c-format
 msgid "Direct IM with %s closed"
 msgstr "Директни съобщения с %s затворени"
 
-#: src/protocols/oscar/oscar.c:472
+#: src/protocols/oscar/oscar.c:718
 #, c-format
 msgid "Direct IM with %s failed"
 msgstr "Директното съобщение с %s пропадна"
 
-#: src/protocols/oscar/oscar.c:531 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/oscar/oscar.c:543 src/protocols/toc/toc.c:885
+#: src/protocols/oscar/oscar.c:789 src/protocols/toc/toc.c:885
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "Прекъснати сте от стаята за разговори %s."
 
-#: src/protocols/oscar/oscar.c:559
+#: src/protocols/oscar/oscar.c:805
 msgid "Chat is currently unavailable"
 msgstr "Чат-а е текущо недостъпен"
 
-#: src/protocols/oscar/oscar.c:633 src/protocols/oscar/oscar.c:690
+#: src/protocols/oscar/oscar.c:876 src/protocols/oscar/oscar.c:940
 msgid "Couldn't connect to host"
 msgstr "Не мога да се свържа"
 
-#: src/protocols/oscar/oscar.c:675
+#: src/protocols/oscar/oscar.c:886
+#, fuzzy
+msgid "Screen name sent"
+msgstr "Номер:"
+
+#: src/protocols/oscar/oscar.c:900
+#, 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:928
 msgid "Unable to login to AIM"
 msgstr "Невъзможност за логване в AIM"
 
-#: src/protocols/oscar/oscar.c:778 src/protocols/oscar/oscar.c:1165
+#: src/protocols/oscar/oscar.c:1032 src/protocols/oscar/oscar.c:1450
 msgid "Could Not Connect"
 msgstr "Не мога да се свържа"
 
-#: src/protocols/oscar/oscar.c:785
+#: src/protocols/oscar/oscar.c:1040
 msgid "Connection established, cookie sent"
 msgstr "Връзката установена, изпратено е cookie"
 
-#: src/protocols/oscar/oscar.c:852 src/protocols/oscar/oscar.c:865
-#: src/protocols/oscar/oscar.c:870
-msgid "File Transfer Aborted"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:853
+#: src/protocols/oscar/oscar.c:1153 src/protocols/yahoo/yahoo_filexfer.c:209
+#: src/protocols/yahoo/yahoo_filexfer.c:218
+#, fuzzy
+msgid "Unable to establish file descriptor."
+msgstr "Не мога да чета файл %s"
+
+#: src/protocols/oscar/oscar.c:1158
+#, fuzzy
+msgid "Unable to create new connection."
+msgstr "Не мога да се свържа."
+
+#: src/protocols/oscar/oscar.c:1229
 #, fuzzy
 msgid "Unable to establish listener socket."
 msgstr "Не мога да чета от socket"
 
-#: src/protocols/oscar/oscar.c:866
-#, fuzzy
-msgid "Unable to establish file descriptor."
-msgstr "Не мога да чета файл %s"
-
-#: src/protocols/oscar/oscar.c:871
-#, fuzzy
-msgid "Unable to create new connection."
-msgstr "Не мога да се свържа."
-
-#: src/protocols/oscar/oscar.c:1051 src/protocols/toc/toc.c:571
+#: src/protocols/oscar/oscar.c:1334 src/protocols/toc/toc.c:571
 msgid "Incorrect nickname or password."
 msgstr "Грешен псевдоним или парола."
 
-#: src/protocols/oscar/oscar.c:1056
+#: src/protocols/oscar/oscar.c:1339
 msgid "Your account is currently suspended."
 msgstr "Акаунта Ви е текущо замразен."
 
 #. service temporarily unavailable
-#: src/protocols/oscar/oscar.c:1060
+#: src/protocols/oscar/oscar.c:1343
 #, fuzzy
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "Услугата е временно недостъпна."
 
-#: src/protocols/oscar/oscar.c:1065
+#: src/protocols/oscar/oscar.c:1348
 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."
@@ -6403,110 +7504,116 @@
 "Свързвате се прекалено често. Изчакайте 10 мин и опитайте пак. "
 "Акопродължитеда се опитвате, ще трябва да чакате дори повече."
 
-#: src/protocols/oscar/oscar.c:1070
+#: src/protocols/oscar/oscar.c:1353
 #, fuzzy, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr "Версията на клиента е прекалено стара. Моля обновете."
 
-#: src/protocols/oscar/oscar.c:1102
+#: src/protocols/oscar/oscar.c:1385
 msgid "Internal Error"
 msgstr "Вътрешна грешка"
 
-#: src/protocols/oscar/oscar.c:1204 src/protocols/oscar/oscar.c:1234
-#: src/protocols/oscar/oscar.c:1322
+#: src/protocols/oscar/oscar.c:1457
+#, fuzzy
+msgid "Received authorization"
+msgstr "Заявяване на абтентикационен метод"
+
+#: src/protocols/oscar/oscar.c:1493 src/protocols/oscar/oscar.c:1523
+#: src/protocols/oscar/oscar.c:1611
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
 "fixed.  Check %s for updates."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1207 src/protocols/oscar/oscar.c:1237
-#, fuzzy
-msgid "Gaim was Unable to get a valid AIM login hash."
+#: src/protocols/oscar/oscar.c:1496 src/protocols/oscar/oscar.c:1526
+#, fuzzy
+msgid "Gaim was unable to get a valid AIM login hash."
 msgstr "Gaim не успя да изпрати съобщение"
 
-#: src/protocols/oscar/oscar.c:1325
-#, fuzzy
-msgid "Gaim was Unable to get a valid login hash."
+#: src/protocols/oscar/oscar.c:1614
+#, fuzzy
+msgid "Gaim was unable to get a valid login hash."
 msgstr "Gaim не успя да изпрати съобщение"
 
-#: src/protocols/oscar/oscar.c:1905 src/protocols/oscar/oscar.c:5572
+#: src/protocols/oscar/oscar.c:2196 src/protocols/oscar/oscar.c:5922
 #, c-format
 msgid "Direct IM with %s established"
 msgstr "Диретно съобщение с %s установено"
 
-#: src/protocols/oscar/oscar.c:2234 src/protocols/oscar/oscar.c:2256
+#: src/protocols/oscar/oscar.c:2530 src/protocols/oscar/oscar.c:2552
 msgid "(There was an error receiving this message)"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2403
+#: src/protocols/oscar/oscar.c:2713
 #, c-format
 msgid "%s has just asked to directly connect to %s"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2406
+#: src/protocols/oscar/oscar.c:2716
 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 "
 "considered a privacy risk."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2411 src/protocols/oscar/oscar.c:5941
+#: src/protocols/oscar/oscar.c:2721 src/protocols/oscar/oscar.c:6304
 #, fuzzy
 msgid "Connect"
 msgstr "Свързан"
 
-#: src/protocols/oscar/oscar.c:2438
+#: src/protocols/oscar/oscar.c:2750
 #, fuzzy
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr "Потребителят %d позволи да го добавите в листата"
 
-#: src/protocols/oscar/oscar.c:2446
+#: src/protocols/oscar/oscar.c:2758
 #, fuzzy
 msgid "Authorization Request Message:"
 msgstr "Gaim - отказана е ауторизация"
 
-#: src/protocols/oscar/oscar.c:2447
+#: src/protocols/oscar/oscar.c:2759
 msgid "Please authorize me!"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2475
+#: src/protocols/oscar/oscar.c:2788
 #, c-format
 msgid ""
 "The user %s requires authorization before being added to a buddy list.  Do "
 "you want to send an authorization request?"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2480 src/protocols/oscar/oscar.c:2482
+#: src/protocols/oscar/oscar.c:2793 src/protocols/oscar/oscar.c:2795
 #, fuzzy
 msgid "Request Authorization"
 msgstr "Заявяване на абтентикационен метод"
 
-#: src/protocols/oscar/oscar.c:2518 src/protocols/oscar/oscar.c:2520
-#: src/protocols/oscar/oscar.c:2527 src/protocols/oscar/oscar.c:2599
-#: src/protocols/oscar/oscar.c:2619 src/protocols/oscar/oscar.c:2975
-#: src/protocols/oscar/oscar.c:5072 src/protocols/oscar/oscar.c:5118
+#: src/protocols/oscar/oscar.c:2831 src/protocols/oscar/oscar.c:2833
+#: src/protocols/oscar/oscar.c:2840 src/protocols/oscar/oscar.c:2922
+#: src/protocols/oscar/oscar.c:2942 src/protocols/oscar/oscar.c:3286
+#: src/protocols/oscar/oscar.c:3346 src/protocols/oscar/oscar.c:5443
+#: src/protocols/oscar/oscar.c:5489
 msgid "No reason given."
 msgstr "Не е дадена причина."
 
-#: src/protocols/oscar/oscar.c:2526
+#: src/protocols/oscar/oscar.c:2839
 #, fuzzy
 msgid "Authorization Denied Message:"
 msgstr "Gaim - отказана е ауторизация"
 
-#: src/protocols/oscar/oscar.c:2599
+#: src/protocols/oscar/oscar.c:2922
 #, fuzzy, c-format
 msgid ""
 "The user %u wants to add you to their buddy list for the following reason:\n"
 "%s"
 msgstr "Потребителят %d позволи да го добавите в листата"
 
-#: src/protocols/oscar/oscar.c:2607 src/protocols/oscar/oscar.c:5078
+#: src/protocols/oscar/oscar.c:2930 src/protocols/oscar/oscar.c:5449
 #, fuzzy
 msgid "Authorization Request"
 msgstr "Gaim - отказана е ауторизация"
 
-#: src/protocols/oscar/oscar.c:2619
+#: src/protocols/oscar/oscar.c:2942
 #, fuzzy, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -6516,18 +7623,18 @@
 "Потребителят %d оказа да го добавите в листата поради:\n"
 "\n"
 
-#: src/protocols/oscar/oscar.c:2620
+#: src/protocols/oscar/oscar.c:2943
 #, fuzzy
 msgid "ICQ authorization denied."
 msgstr "Gaim - отказана е ауторизация"
 
 #. Someone has granted you authorization
-#: src/protocols/oscar/oscar.c:2627
+#: src/protocols/oscar/oscar.c:2950
 #, fuzzy, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
 msgstr "Потребителят %d позволи да го добавите в листата"
 
-#: src/protocols/oscar/oscar.c:2635
+#: src/protocols/oscar/oscar.c:2958
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -6536,7 +7643,7 @@
 "%s"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2643
+#: src/protocols/oscar/oscar.c:2966
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -6545,7 +7652,7 @@
 "%s"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2651
+#: src/protocols/oscar/oscar.c:2974
 #, c-format
 msgid ""
 "You have received an ICQ email from %s [%s]\n"
@@ -6554,12 +7661,12 @@
 "%s"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2672
+#: src/protocols/oscar/oscar.c:2995
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2678
+#: src/protocols/oscar/oscar.c:3001
 #, fuzzy
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr ""
@@ -6567,26 +7674,26 @@
 "\n"
 "Искате ли да ги добавите към листата?"
 
-#: src/protocols/oscar/oscar.c:2682
+#: src/protocols/oscar/oscar.c:3005
 #, fuzzy
 msgid "Decline"
 msgstr "Подчертан"
 
-#: src/protocols/oscar/oscar.c:2764
+#: src/protocols/oscar/oscar.c:3090
 #, fuzzy, 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] "Изпуснахте %d събщение от %s, защото беше неправилно."
 msgstr[1] "Изпуснахте %d събщение от %s, защото беше неправилно."
 
-#: src/protocols/oscar/oscar.c:2773
+#: src/protocols/oscar/oscar.c:3099
 #, fuzzy, 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] "Изпуснахте %d събщение от %s, защото беше прекалено голямо."
 msgstr[1] "Изпуснахте %d събщение от %s, защото беше прекалено голямо."
 
-#: src/protocols/oscar/oscar.c:2782
+#: src/protocols/oscar/oscar.c:3108
 #, fuzzy, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -6597,179 +7704,85 @@
 msgstr[1] ""
 "Изпуснахте %d събщение от %s, защото границата на нивото е прехвълена."
 
-#: src/protocols/oscar/oscar.c:2791
+#: src/protocols/oscar/oscar.c:3117
 #, fuzzy, 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] "Изпуснахте %d събщение от %s,  защото беше прекалено зло."
 msgstr[1] "Изпуснахте %d събщение от %s,  защото беше прекалено зло."
 
-#: src/protocols/oscar/oscar.c:2800
+#: src/protocols/oscar/oscar.c:3126
 #, fuzzy, 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] "Изпуснахте %d събщение от %s,  защото сте прекалено зъл."
 msgstr[1] "Изпуснахте %d събщение от %s,  защото сте прекалено зъл."
 
-#: src/protocols/oscar/oscar.c:2809
+#: src/protocols/oscar/oscar.c:3135
 #, fuzzy, 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] "Изпуснахте %d събщение от %s по незнайни причини."
 msgstr[1] "Изпуснахте %d събщение от %s по незнайни причини."
 
-#: src/protocols/oscar/oscar.c:2825 src/protocols/oscar/oscar.c:4541
-#: src/protocols/oscar/oscar.c:6068
-msgid "Free For Chat"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:2829 src/protocols/oscar/oscar.c:4535
-#: src/protocols/oscar/oscar.c:6066
-#, fuzzy
-msgid "Not Available"
-msgstr "Недостъпен"
-
-#: src/protocols/oscar/oscar.c:2831 src/protocols/oscar/oscar.c:4538
-#: src/protocols/oscar/oscar.c:6067
-msgid "Occupied"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:2835
-msgid "Web Aware"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:2878
+#: src/protocols/oscar/oscar.c:3189
 #, c-format
 msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<HR>%s"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2937
+#: src/protocols/oscar/oscar.c:3248
 #, c-format
 msgid "SNAC threw error: %s\n"
 msgstr "SNAC изхвърляща грешка: %s\n"
 
-#: src/protocols/oscar/oscar.c:2938
+#: src/protocols/oscar/oscar.c:3249
 #, fuzzy
 msgid "Unknown error"
 msgstr "Непозната грешка при логване"
 
 #. Data is assumed to be the destination sn
-#: src/protocols/oscar/oscar.c:2973
+#: src/protocols/oscar/oscar.c:3284
 #, fuzzy, c-format
 msgid "Your message to %s did not get sent:"
 msgstr "Съобщението до %s не се изпрати: %s"
 
-#: src/protocols/oscar/oscar.c:3070
-msgid "Voice"
-msgstr "Глас"
-
-#: src/protocols/oscar/oscar.c:3073
-#, fuzzy
-msgid "AIM Direct IM"
-msgstr "Директна връзка"
-
-#: src/protocols/oscar/oscar.c:3079 src/protocols/oscar/oscar.c:6167
-msgid "Get File"
-msgstr "Вземи файл"
-
-#: src/protocols/oscar/oscar.c:3082 src/protocols/oscar/oscar.c:6159
-msgid "Send File"
-msgstr "Прати файл"
-
-#: src/protocols/oscar/oscar.c:3086
-msgid "Games"
-msgstr "Игри"
-
-#: src/protocols/oscar/oscar.c:3089
-msgid "Add-Ins"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:3092
-msgid "Send Buddy List"
-msgstr "Изпрати листата"
-
-#: src/protocols/oscar/oscar.c:3095
-#, fuzzy
-msgid "ICQ Direct Connect"
-msgstr "Разкачам"
-
-#: src/protocols/oscar/oscar.c:3098
-msgid "AP User"
-msgstr "AP потребител"
-
-#: src/protocols/oscar/oscar.c:3101
-msgid "ICQ RTF"
-msgstr "ICQ RTF"
-
-#: src/protocols/oscar/oscar.c:3104
-msgid "Nihilist"
-msgstr "Нихилист"
-
-#: src/protocols/oscar/oscar.c:3107
-msgid "ICQ Server Relay"
-msgstr "Предаване през ICQ Server"
-
-#: src/protocols/oscar/oscar.c:3110
-#, fuzzy
-msgid "Old ICQ UTF8"
-msgstr "ICQ RTF"
-
-#: src/protocols/oscar/oscar.c:3113
-msgid "Trillian Encryption"
-msgstr "Кодиране Trillian"
-
-#: src/protocols/oscar/oscar.c:3116
-#, fuzzy
-msgid "ICQ UTF8"
-msgstr "ICQ RTF"
-
-#: src/protocols/oscar/oscar.c:3119
-msgid "Hiptop"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:3122
-msgid "Secure IM"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:3151
-#, c-format
-msgid "Username: <b>%s</b><br>\n"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:3152
-#, c-format
-msgid "Warning Level: <b>%d%%</b><br>\n"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:3155
-#, c-format
-msgid "Online Since: <b>%s</b><br>\n"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:3159
-#, c-format
-msgid "Member Since: <b>%s</b><br>\n"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:3164
-#, c-format
-msgid "Idle: <b>%s</b>"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:3167
-msgid "Idle: <b>Active</b>"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:3206
+#: src/protocols/oscar/oscar.c:3343
+#, fuzzy, c-format
+msgid "User information for %s unavailable:"
+msgstr "Потребителската информация за %s недостъпна: %s"
+
+#: src/protocols/oscar/oscar.c:3366
+#, fuzzy
+msgid "Warning Level"
+msgstr "Показва нива на предупреждение"
+
+#: src/protocols/oscar/oscar.c:3369
+#, fuzzy
+msgid "Online Since"
+msgstr "Онлайн"
+
+#: src/protocols/oscar/oscar.c:3373 src/protocols/yahoo/yahoo.c:3088
+msgid "Member Since"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3455
 #, fuzzy
 msgid "Your AIM connection may be lost."
 msgstr "Връзката може да бъде прекъсната."
 
-#: src/protocols/oscar/oscar.c:3594
+#. The conversion failed!
+#: src/protocols/oscar/oscar.c:3641
+#, fuzzy
+msgid ""
+"[Unable to display a message from this user because it contained invalid "
+"characters.]"
+msgstr "Изпуснахте %d събщение от %s, защото беше неправилно."
+
+#: src/protocols/oscar/oscar.c:3859
 msgid "Rate limiting error."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3595
+#: src/protocols/oscar/oscar.c:3860
 #, fuzzy
 msgid ""
 "The last action you attempted could not be performed because you are over "
@@ -6778,198 +7791,203 @@
 "Съобщението не можа да бъде изпратено защото сте надхвърлили лимита. "
 "Моляопитайте след 10 сек."
 
-#: src/protocols/oscar/oscar.c:3656
+#: src/protocols/oscar/oscar.c:3923
 #, fuzzy
 msgid ""
 "You have been disconnected because you have signed on with this screen name "
 "at another location."
 msgstr "Бяхте разкачени. Влезли сте от друго място."
 
-#: src/protocols/oscar/oscar.c:3658
+#: src/protocols/oscar/oscar.c:3925
 #, fuzzy
 msgid "You have been signed off for an unknown reason."
 msgstr "Изпуснахте %d събщение от %s по незнайни причини."
 
-#: src/protocols/oscar/oscar.c:3903 src/protocols/oscar/oscar.c:3909
+#: src/protocols/oscar/oscar.c:3956
+#, fuzzy
+msgid "Finalizing connection"
+msgstr "g003: Грешка при отваряне на връзка.\n"
+
+#: src/protocols/oscar/oscar.c:4226 src/protocols/oscar/oscar.c:4233
 #, fuzzy
 msgid "Email Address"
 msgstr "Улица"
 
-#: src/protocols/oscar/oscar.c:3914
+#: src/protocols/oscar/oscar.c:4238
 msgid "Mobile Phone"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3917 src/protocols/trepia/trepia.c:272
-#: src/protocols/trepia/trepia.c:413
+#: src/protocols/oscar/oscar.c:4239 src/protocols/trepia/trepia.c:281
+#: src/protocols/trepia/trepia.c:407
 msgid "Female"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3917 src/protocols/trepia/trepia.c:271
-#: src/protocols/trepia/trepia.c:413
+#: src/protocols/oscar/oscar.c:4239 src/protocols/trepia/trepia.c:280
+#: src/protocols/trepia/trepia.c:407
 msgid "Male"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3934
+#: src/protocols/oscar/oscar.c:4255
 msgid "Personal Web Page"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3937
+#: src/protocols/oscar/oscar.c:4259
 #, fuzzy
 msgid "Additional Information"
 msgstr "Регистрационна инфо"
 
-#: src/protocols/oscar/oscar.c:3941
+#: src/protocols/oscar/oscar.c:4264
 #, fuzzy
 msgid "Home Address"
 msgstr "Улица"
 
-#: src/protocols/oscar/oscar.c:3952 src/protocols/oscar/oscar.c:3968
+#: src/protocols/oscar/oscar.c:4268 src/protocols/oscar/oscar.c:4276
 msgid "Zip Code"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3957
+#: src/protocols/oscar/oscar.c:4272
 #, fuzzy
 msgid "Work Address"
 msgstr "Улица"
 
-#: src/protocols/oscar/oscar.c:3973
+#: src/protocols/oscar/oscar.c:4280
 #, fuzzy
 msgid "Work Information"
 msgstr "Регистрационна инфо"
 
-#: src/protocols/oscar/oscar.c:3975
+#: src/protocols/oscar/oscar.c:4281
 msgid "Company"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3978
+#: src/protocols/oscar/oscar.c:4282
 msgid "Division"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3981
+#: src/protocols/oscar/oscar.c:4283
 #, fuzzy
 msgid "Position"
 msgstr "Описание"
 
-#: src/protocols/oscar/oscar.c:3984
+#: src/protocols/oscar/oscar.c:4285
 #, fuzzy
 msgid "Web Page"
 msgstr "Образ"
 
-#: src/protocols/oscar/oscar.c:3990
+#: src/protocols/oscar/oscar.c:4291
 #, fuzzy, c-format
 msgid "ICQ Info for %s"
 msgstr "Взимане на инфо за директроията"
 
-#: src/protocols/oscar/oscar.c:4040
+#: src/protocols/oscar/oscar.c:4341
 #, fuzzy
 msgid "Pop-Up Message"
 msgstr "Ново съобщение за отсъствие"
 
-#: src/protocols/oscar/oscar.c:4061
-#, c-format
-msgid "The following screennames are associated with %s"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:4065
+#: src/protocols/oscar/oscar.c:4362
+#, c-format
+msgid "The following screen names are associated with %s"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:4366
 msgid "Search Results"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:4082
+#: src/protocols/oscar/oscar.c:4383
 #, c-format
 msgid "No results found for email address %s"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:4103
+#: src/protocols/oscar/oscar.c:4404
 #, c-format
 msgid "You should receive an email asking to confirm %s."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:4105
+#: src/protocols/oscar/oscar.c:4406
 msgid "Account Confirmation Requested"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:4133
+#: src/protocols/oscar/oscar.c:4434
 #, fuzzy
 msgid "Error Changing Account Info"
 msgstr "g003: Грешка при отваряне на връзка.\n"
 
-#: src/protocols/oscar/oscar.c:4136
+#: src/protocols/oscar/oscar.c:4437
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
 "differs from the original."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:4139
+#: src/protocols/oscar/oscar.c:4440
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
 "ends in a space."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:4142
+#: src/protocols/oscar/oscar.c:4443
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
 "is too long."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:4145
+#: src/protocols/oscar/oscar.c:4446
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because there is already a "
 "request pending for this screen name."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:4148
+#: src/protocols/oscar/oscar.c:4449
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address has "
 "too many screen names associated with it."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:4151
+#: src/protocols/oscar/oscar.c:4452
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address is "
 "invalid."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:4154
+#: src/protocols/oscar/oscar.c:4455
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:4164
+#: src/protocols/oscar/oscar.c:4465
 #, c-format
 msgid ""
 "Your screen name is currently formatted as follows:\n"
 "%s"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:4165 src/protocols/oscar/oscar.c:4172
+#: src/protocols/oscar/oscar.c:4466 src/protocols/oscar/oscar.c:4473
 #, fuzzy
 msgid "Account Info"
 msgstr "Акаунт"
 
-#: src/protocols/oscar/oscar.c:4170
+#: src/protocols/oscar/oscar.c:4471
 #, c-format
 msgid "The email address for %s is %s"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:4400
+#: src/protocols/oscar/oscar.c:4686
 #, fuzzy
 msgid "Unable to set AIM profile."
 msgstr "Не мога да чета файл %s"
 
-#: src/protocols/oscar/oscar.c:4401
+#: src/protocols/oscar/oscar.c:4687
 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 "
 "fully connected."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:4431
+#: src/protocols/oscar/oscar.c:4714
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  Gaim has truncated "
@@ -6980,23 +7998,28 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/protocols/oscar/oscar.c:4436
+#: src/protocols/oscar/oscar.c:4719
 msgid "Profile too long."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:4455
+#: src/protocols/oscar/oscar.c:4735 src/protocols/oscar/oscar.c:6435
+#, fuzzy
+msgid "Visible"
+msgstr "Покана"
+
+#: src/protocols/oscar/oscar.c:4753
 #, fuzzy
 msgid "Unable to set AIM away message."
 msgstr "Gaim не успя да изпрати съобщение"
 
-#: src/protocols/oscar/oscar.c:4456
+#: src/protocols/oscar/oscar.c:4754
 msgid ""
 "You have probably requested to set your away message before the login "
 "procedure completed.  You remain in a \"present\" state; try setting it "
 "again when you are fully connected."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:4496
+#: src/protocols/oscar/oscar.c:4794
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  Gaim has "
@@ -7007,44 +8030,54 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/protocols/oscar/oscar.c:4501
+#: src/protocols/oscar/oscar.c:4799
 #, fuzzy
 msgid "Away message too long."
 msgstr "Съобщение за отсъствие"
 
-#: src/protocols/oscar/oscar.c:4721
+#: src/protocols/oscar/oscar.c:4892
+#, 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:4893 src/protocols/oscar/oscar.c:5310
+#: src/protocols/oscar/oscar.c:5323
+#, fuzzy
+msgid "Unable To Add"
+msgstr "Не мога да пиша"
+
+#: src/protocols/oscar/oscar.c:5029
 msgid "Unable To Retrieve Buddy List"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:4722
+#: src/protocols/oscar/oscar.c:5030
 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 "
 "a few hours."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:4813 src/protocols/oscar/oscar.c:4814
-#: src/protocols/oscar/oscar.c:4819
+#: src/protocols/oscar/oscar.c:5206 src/protocols/oscar/oscar.c:5207
+#: src/protocols/oscar/oscar.c:5212 src/protocols/oscar/oscar.c:5367
+#: src/protocols/oscar/oscar.c:5368 src/protocols/oscar/oscar.c:5373
 msgid "Orphans"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:4985
+#: src/protocols/oscar/oscar.c:5309
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
 "list.  Please remove one and try again."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:4985 src/protocols/oscar/oscar.c:4998
+#: src/protocols/oscar/oscar.c:5309 src/protocols/oscar/oscar.c:5322
 msgid "(no name)"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:4986 src/protocols/oscar/oscar.c:4999
-#, fuzzy
-msgid "Unable To Add"
-msgstr "Не мога да пиша"
-
-#: src/protocols/oscar/oscar.c:4998
+#: src/protocols/oscar/oscar.c:5322
 #, c-format
 msgid ""
 "Could not add the buddy %s for an unknown reason.  The most common reason "
@@ -7052,19 +8085,19 @@
 "buddy list."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:5033
+#: src/protocols/oscar/oscar.c:5404
 #, fuzzy, c-format
 msgid ""
 "The user %s has given you permission to add you to their buddy list.  Do you "
 "want to add them?"
 msgstr "Потребителят %d позволи да го добавите в листата"
 
-#: src/protocols/oscar/oscar.c:5039
+#: src/protocols/oscar/oscar.c:5410
 #, fuzzy
 msgid "Authorization Given"
 msgstr "Gaim - отказана е ауторизация"
 
-#: src/protocols/oscar/oscar.c:5072
+#: src/protocols/oscar/oscar.c:5443
 #, fuzzy, c-format
 msgid ""
 "The user %s wants to add you to their buddy list for the following reason:\n"
@@ -7072,18 +8105,18 @@
 msgstr "Потребителят %d позволи да го добавите в листата"
 
 #. Granted
-#: src/protocols/oscar/oscar.c:5114
+#: src/protocols/oscar/oscar.c:5485
 #, fuzzy, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
 msgstr "Потребителят %d позволи да го добавите в листата"
 
-#: src/protocols/oscar/oscar.c:5115
+#: src/protocols/oscar/oscar.c:5486
 #, fuzzy
 msgid "Authorization Granted"
 msgstr "Gaim - ауторизацията е дадена"
 
 #. Denied
-#: src/protocols/oscar/oscar.c:5118
+#: src/protocols/oscar/oscar.c:5489
 #, fuzzy, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -7093,185 +8126,179 @@
 "Потребителят %d оказа да го добавите в листата поради:\n"
 "\n"
 
-#: src/protocols/oscar/oscar.c:5119
+#: src/protocols/oscar/oscar.c:5490
 #, fuzzy
 msgid "Authorization Denied"
 msgstr "Gaim - отказана е ауторизация"
 
-#: src/protocols/oscar/oscar.c:5156 src/protocols/toc/toc.c:1263
-msgid "Exchange:"
+#: src/protocols/oscar/oscar.c:5527 src/protocols/toc/toc.c:1264
+#, fuzzy
+msgid "_Exchange:"
 msgstr "Размяна:"
 
-#: src/protocols/oscar/oscar.c:5379
-#, fuzzy
-msgid "<b>Status:</b> "
-msgstr "Статус: %s"
-
-#: src/protocols/oscar/oscar.c:5388
-#, fuzzy
-msgid "<b>Logged In:</b> "
-msgstr "Влязъл: %s\n"
-
-#: src/protocols/oscar/oscar.c:5400
-msgid "<b>IP Address:</b> "
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:5408
-#, fuzzy
-msgid "<b>Capabilities:</b> "
-msgstr "Възможности: %s\n"
-
-#: src/protocols/oscar/oscar.c:5415
-#, fuzzy
-msgid "<b>Available:</b> "
-msgstr "Недостъпен"
-
-#: src/protocols/oscar/oscar.c:5431
-#, fuzzy
-msgid "<b>Away Message:</b> "
+#: src/protocols/oscar/oscar.c:5549
+#, fuzzy
+msgid "Invalid chat name specified."
+msgstr "Невалиден Gadu-Gadu UIN"
+
+#: src/protocols/oscar/oscar.c:5790
+#, fuzzy
+msgid "Away Message"
 msgstr "Съобщение за отсъствие"
 
-#: src/protocols/oscar/oscar.c:5440
-msgid "<b>Status:</b> Not Authorized"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:5474 src/protocols/yahoo/yahoo.c:2030
-#, fuzzy
-msgid "Offline"
-msgstr "Онлайн"
-
-#: src/protocols/oscar/oscar.c:5921
+#: src/protocols/oscar/oscar.c:6284
 msgid "Unable to open Direct IM"
 msgstr "Не мога да отворя директна връзка"
 
-#: src/protocols/oscar/oscar.c:5934
+#: src/protocols/oscar/oscar.c:6297
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:5937
+#: src/protocols/oscar/oscar.c:6300
 msgid ""
 "Because this reveals your IP address, it may be considered a privacy risk.  "
 "Do you wish to continue?"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:6112
+#: src/protocols/oscar/oscar.c:6485
 #, fuzzy
 msgid "Buddy Comment:"
 msgstr "Чат"
 
-#: src/protocols/oscar/oscar.c:6128
+#: src/protocols/oscar/oscar.c:6501
 #, fuzzy
 msgid "Edit Buddy Comment"
 msgstr "Ново известие"
 
-#: src/protocols/oscar/oscar.c:6136
+#: src/protocols/oscar/oscar.c:6509
 #, fuzzy
 msgid "Get Status Msg"
 msgstr "Вземи away текст"
 
-#: src/protocols/oscar/oscar.c:6151
+#: src/protocols/oscar/oscar.c:6524
 msgid "Direct IM"
 msgstr "Директна връзка"
 
-#: src/protocols/oscar/oscar.c:6180
+#: src/protocols/oscar/oscar.c:6553
 #, fuzzy
 msgid "Re-request Authorization"
 msgstr "Заявяване на абтентикационен метод"
 
-#: src/protocols/oscar/oscar.c:6201
+#: src/protocols/oscar/oscar.c:6574
 msgid "The new formatting is invalid."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:6202
-msgid "Screenname formatting can change only capitalization and whitespace."
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:6208
-msgid "New screenname formatting:"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:6257
+#: src/protocols/oscar/oscar.c:6575
+msgid "Screen name formatting can change only capitalization and whitespace."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:6581
+#, fuzzy
+msgid "New screen name formatting:"
+msgstr "Не е зададен прякор"
+
+#: src/protocols/oscar/oscar.c:6630
 #, fuzzy
 msgid "Change Address To:"
 msgstr "Смяна на паролата"
 
-#: src/protocols/oscar/oscar.c:6301
+#: src/protocols/oscar/oscar.c:6674
 msgid "<i>you are not waiting for authorization</i>"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:6304
+#: src/protocols/oscar/oscar.c:6677
 msgid "You are awaiting authorization from the following buddies"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:6305
+#: src/protocols/oscar/oscar.c:6678
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:6319
+#: src/protocols/oscar/oscar.c:6692
 #, fuzzy
 msgid "Find Buddy by E-mail"
 msgstr "Gaim - Търсене по Email"
 
-#: src/protocols/oscar/oscar.c:6320
+#: src/protocols/oscar/oscar.c:6693
 #, fuzzy
 msgid "Search for a buddy by e-mail address"
 msgstr "Търсене"
 
-#: src/protocols/oscar/oscar.c:6321
+#: src/protocols/oscar/oscar.c:6694
 msgid "Type the e-mail address of the buddy you are searching for."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:6324
-msgid "Search"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:6337
+#: src/protocols/oscar/oscar.c:6711
 #, fuzzy
 msgid "Available Message:"
 msgstr "Недостъпен"
 
-#: src/protocols/oscar/oscar.c:6415
-#, fuzzy
-msgid "Set Available Message"
+#: src/protocols/oscar/oscar.c:6712
+msgid "I'm doing work and hoping for a distraction--IM me!"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:6788
+#, fuzzy
+msgid "Set User Info..."
+msgstr "Настрока данни"
+
+#: src/protocols/oscar/oscar.c:6795
+#, fuzzy
+msgid "Set User Info (URL)..."
+msgstr "Настрока данни"
+
+#: src/protocols/oscar/oscar.c:6803
+#, fuzzy
+msgid "Set Available Message..."
 msgstr "Ново съобщение за отсъствие"
 
-#: src/protocols/oscar/oscar.c:6429
+#: src/protocols/oscar/oscar.c:6810
+#, fuzzy
+msgid "Change Password..."
+msgstr "Смяна на паролата"
+
+#: src/protocols/oscar/oscar.c:6817
 #, fuzzy
 msgid "Change Password (URL)"
 msgstr "Смяна на паролата"
 
-#: src/protocols/oscar/oscar.c:6437
+#: src/protocols/oscar/oscar.c:6825
 msgid "Configure IM Forwarding (URL)"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:6448
-#, fuzzy
-msgid "Format Screenname"
+#: src/protocols/oscar/oscar.c:6836
+#, fuzzy
+msgid "Format Screen Name..."
 msgstr "Номер:"
 
-#: src/protocols/oscar/oscar.c:6454
+#: src/protocols/oscar/oscar.c:6842
 #, fuzzy
 msgid "Confirm Account"
 msgstr "Акаунт"
 
-#: src/protocols/oscar/oscar.c:6460
-msgid "Display Current Registered Address"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:6466
-msgid "Change Current Registered Address"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:6475
+#: src/protocols/oscar/oscar.c:6848
+msgid "Display Currently Registered Address"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:6854
+msgid "Change Currently Registered Address..."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:6863
 msgid "Show Buddies Awaiting Authorization"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:6483
-#, fuzzy
-msgid "Search for Buddy by Email"
+#: src/protocols/oscar/oscar.c:6871
+#, fuzzy
+msgid "Search for Buddy by Email..."
+msgstr "Търсене"
+
+#: src/protocols/oscar/oscar.c:6878
+#, fuzzy
+msgid "Search for Buddy by Information"
 msgstr "Търсене"
 
 #. *< api_version
@@ -7284,15 +8311,16 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/oscar/oscar.c:6604 src/protocols/oscar/oscar.c:6606
+#. *  description
+#: src/protocols/oscar/oscar.c:7001 src/protocols/oscar/oscar.c:7003
 msgid "AIM/ICQ Protocol Plugin"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:6623
+#: src/protocols/oscar/oscar.c:7020
 msgid "Auth host"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:6628
+#: src/protocols/oscar/oscar.c:7025
 msgid "Auth port"
 msgstr ""
 
@@ -7448,46 +8476,46 @@
 "и може да ви изхвърли ако опитате да изпратите. Gaim ще предпази каквото ида "
 "е от преминаване. Това е временно, моля имайте търпение "
 
-#: src/protocols/toc/toc.c:1401
+#: src/protocols/toc/toc.c:1402
 msgid "Get Dir Info"
 msgstr "Взимане на инфо за директроията"
 
-#: src/protocols/toc/toc.c:1538
+#: src/protocols/toc/toc.c:1539
 #, fuzzy
 msgid "Set Dir Info"
 msgstr "Взимане на инфо за директроията"
 
-#: src/protocols/toc/toc.c:1663
+#: src/protocols/toc/toc.c:1664
 #, fuzzy, c-format
 msgid "Could not open %s for writing!"
 msgstr "Не мога да се свържа за трансфер!"
 
-#: src/protocols/toc/toc.c:1699
+#: src/protocols/toc/toc.c:1700
 msgid "File transfer failed; other side probably canceled."
 msgstr ""
 
-#: src/protocols/toc/toc.c:1744 src/protocols/toc/toc.c:1784
-#: src/protocols/toc/toc.c:1996
+#: src/protocols/toc/toc.c:1745 src/protocols/toc/toc.c:1785
+#: src/protocols/toc/toc.c:1909 src/protocols/toc/toc.c:1997
 #, fuzzy
 msgid "Could not connect for transfer."
 msgstr "Не мога да се свържа за трансфер!"
 
-#: src/protocols/toc/toc.c:1908
-msgid "Could not connect for transfer!"
-msgstr "Не мога да се свържа за трансфер!"
-
-#: src/protocols/toc/toc.c:1941
+#: src/protocols/toc/toc.c:1942
 msgid "Could not write file header.  The file will not be transferred."
 msgstr ""
 
-#: src/protocols/toc/toc.c:2075
+#: src/protocols/toc/toc.c:2042
+msgid "Gaim - Save As..."
+msgstr "Gaim - Запис като..."
+
+#: src/protocols/toc/toc.c:2076
 #, fuzzy, c-format
 msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
 msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
 msgstr[0] "%s заявки %s за приемане на %d файл(а): %s (%.2f %s)%s%s"
 msgstr[1] "%s заявки %s за приемане на %d файл(а): %s (%.2f %s)%s%s"
 
-#: src/protocols/toc/toc.c:2082
+#: src/protocols/toc/toc.c:2083
 #, c-format
 msgid "%s requests you to send them a file"
 msgstr "%s изиква да му изпратите файл"
@@ -7502,98 +8530,94 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/toc/toc.c:2158 src/protocols/toc/toc.c:2160
+#. *  description
+#: src/protocols/toc/toc.c:2167 src/protocols/toc/toc.c:2169
 #, fuzzy
 msgid "TOC Protocol Plugin"
 msgstr "Действия на протокола"
 
-#: src/protocols/toc/toc.c:2177
+#: src/protocols/toc/toc.c:2186
 #, fuzzy
 msgid "TOC host"
 msgstr "Порт"
 
-#: src/protocols/toc/toc.c:2181
+#: src/protocols/toc/toc.c:2190
 #, fuzzy
 msgid "TOC port"
 msgstr "Порт"
 
 #. Basic Profile group.
-#: src/protocols/trepia/trepia.c:254
+#: src/protocols/trepia/trepia.c:263
 msgid "Basic Profile"
 msgstr ""
 
 #. E-Mail Address
-#: src/protocols/trepia/trepia.c:285
+#: src/protocols/trepia/trepia.c:294
 msgid "E-Mail Address"
 msgstr ""
 
-#: src/protocols/trepia/trepia.c:291
+#: src/protocols/trepia/trepia.c:300
 #, fuzzy
 msgid "Profile Information"
 msgstr "Регистрационна инфо"
 
 #. Instant Messagers
-#: src/protocols/trepia/trepia.c:297
+#: src/protocols/trepia/trepia.c:306
 #, fuzzy
 msgid "Instant Messagers"
 msgstr "Изпрати съобщение"
 
 #. AIM
-#: src/protocols/trepia/trepia.c:301
+#: src/protocols/trepia/trepia.c:310
 #, fuzzy
 msgid "AIM"
 msgstr "Съобщение"
 
 #. ICQ
-#: src/protocols/trepia/trepia.c:305
+#: src/protocols/trepia/trepia.c:314
 msgid "ICQ UIN"
 msgstr ""
 
 #. MSN
-#: src/protocols/trepia/trepia.c:309
+#: src/protocols/trepia/trepia.c:318
 msgid "MSN"
 msgstr ""
 
 #. Yahoo
-#: src/protocols/trepia/trepia.c:313
+#: src/protocols/trepia/trepia.c:322
 msgid "Yahoo"
 msgstr ""
 
 #. I'm From
-#: src/protocols/trepia/trepia.c:318
+#: src/protocols/trepia/trepia.c:327
 msgid "I'm From"
 msgstr ""
 
 #. Call the dialog.
-#: src/protocols/trepia/trepia.c:335
+#: src/protocols/trepia/trepia.c:344
 msgid "Set your Trepia profile data."
 msgstr ""
 
-#: src/protocols/trepia/trepia.c:459
+#: src/protocols/trepia/trepia.c:424
 #, fuzzy
 msgid "Profile"
 msgstr "Вземи файл"
 
-#: src/protocols/trepia/trepia.c:481
+#: src/protocols/trepia/trepia.c:439
 #, fuzzy
 msgid "Set Profile"
 msgstr "Вземи файл"
 
-#: src/protocols/trepia/trepia.c:517
+#: src/protocols/trepia/trepia.c:475
 msgid "Visit Homepage"
 msgstr ""
 
-#: src/protocols/trepia/trepia.c:863 src/protocols/trepia/trepia.c:866
+#: src/protocols/trepia/trepia.c:821 src/protocols/trepia/trepia.c:824
 #, fuzzy
 msgid "Local Users"
 msgstr "Невалидно име"
 
-#: src/protocols/trepia/trepia.c:962
-#, fuzzy
-msgid "Read error"
-msgstr "Невалидно име"
-
-#: src/protocols/trepia/trepia.c:1063
+#: src/protocols/trepia/trepia.c:1027
 #, fuzzy
 msgid "Logging in"
 msgstr "Архив"
@@ -7608,21 +8632,37 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/trepia/trepia.c:1311 src/protocols/trepia/trepia.c:1313
+#. *  description
+#: src/protocols/trepia/trepia.c:1282 src/protocols/trepia/trepia.c:1284
 msgid "Trepia Protocol Plugin"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:700
+#: 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:747
 #, fuzzy
 msgid "Your Yahoo! message did not get sent."
 msgstr "Съобщението не беше изпратено."
 
-#: src/protocols/yahoo/yahoo.c:758
+#: src/protocols/yahoo/yahoo.c:765
+msgid "Buzz!!"
+msgstr ""
+
+#: src/protocols/yahoo/yahoo.c:800
+#, c-format
+msgid "Yahoo! system message for %s:"
+msgstr ""
+
+#: src/protocols/yahoo/yahoo.c:866
 #, fuzzy, c-format
 msgid "%s has (retroactively) denied your request to add them to your list."
 msgstr "Потребителят %d позволи да го добавите в листата"
 
-#: src/protocols/yahoo/yahoo.c:760
+#: src/protocols/yahoo/yahoo.c:869
 #, fuzzy, c-format
 msgid ""
 "%s has (retroactively) denied your request to add them to your list for the "
@@ -7631,12 +8671,12 @@
 "Потребителят %d оказа да го добавите в листата поради:\n"
 "\n"
 
-#: src/protocols/yahoo/yahoo.c:761
+#: src/protocols/yahoo/yahoo.c:872
 #, fuzzy
 msgid "Add buddy rejected"
 msgstr "Ново известие"
 
-#: src/protocols/yahoo/yahoo.c:1381
+#: src/protocols/yahoo/yahoo.c:1599
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -7644,161 +8684,179 @@
 "on to Yahoo.  Check %s for updates."
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:1384
+#: src/protocols/yahoo/yahoo.c:1602
 #, fuzzy
 msgid "Failed Yahoo! Authentication"
 msgstr "Автентикация"
 
-#: src/protocols/yahoo/yahoo.c:1457
+#: src/protocols/yahoo/yahoo.c:1675
 #, c-format
 msgid ""
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
 "\"Yes\" will remove and ignore the buddy."
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:1460
+#: src/protocols/yahoo/yahoo.c:1678
 #, fuzzy
 msgid "Ignore buddy?"
 msgstr "Игнориране"
 
-#: src/protocols/yahoo/yahoo.c:1489
+#: src/protocols/yahoo/yahoo.c:1711
 #, fuzzy
 msgid "Invalid username."
 msgstr "Невалидно име"
 
-#: src/protocols/yahoo/yahoo.c:1492
+#: src/protocols/yahoo/yahoo.c:1714
 #, fuzzy
 msgid "Incorrect password."
 msgstr "Грешен псевдоним или парола."
 
-#: src/protocols/yahoo/yahoo.c:1495
-#, fuzzy
-msgid "Unknown error."
-msgstr "Непозната грешка при логване"
-
-#: src/protocols/yahoo/yahoo.c:1542
+#: src/protocols/yahoo/yahoo.c:1717
+msgid "Your account is locked, please log in to the yahoo website."
+msgstr ""
+
+#: src/protocols/yahoo/yahoo.c:1720
+#, fuzzy, c-format
+msgid "Unknown error number %d."
+msgstr "Непознат код на грешка."
+
+#: src/protocols/yahoo/yahoo.c:1777
 #, c-format
 msgid "Could not add buddy %s to group %s to the server list on account %s."
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:1544
+#: src/protocols/yahoo/yahoo.c:1779
 #, fuzzy
 msgid "Could not add buddy to server list"
 msgstr "Не мога да импортирам листата от сървъра"
 
-#: src/protocols/yahoo/yahoo.c:1646 src/protocols/yahoo/yahoo.c:1776
+#: src/protocols/yahoo/yahoo.c:1889 src/protocols/yahoo/yahoo.c:2020
 #, fuzzy
 msgid "Unable to read"
 msgstr "Не мога да пиша"
 
-#: src/protocols/yahoo/yahoo.c:1801 src/protocols/yahoo/yahoo.c:1910
-#: src/protocols/yahoo/yahoo.c:1934
+#: src/protocols/yahoo/yahoo.c:2042 src/protocols/yahoo/yahoo.c:2152
+#: src/protocols/yahoo/yahoo.c:2195 src/protocols/yahoo/yahoochat.c:1360
+#: src/protocols/yahoo/yahoochat.c:1421
 #, fuzzy
 msgid "Connection problem"
 msgstr "Грешка на свързване"
 
-#: src/protocols/yahoo/yahoo.c:2012 src/protocols/yahoo/yahoo.c:2310
-#: src/protocols/yahoo/yahoo.c:2408
+#: src/protocols/yahoo/yahoo.c:2279 src/protocols/yahoo/yahoo.c:2605
+#: src/protocols/yahoo/yahoo.c:2717
 msgid "Not At Home"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:2014 src/protocols/yahoo/yahoo.c:2312
-#: src/protocols/yahoo/yahoo.c:2409
+#: src/protocols/yahoo/yahoo.c:2281 src/protocols/yahoo/yahoo.c:2607
+#: src/protocols/yahoo/yahoo.c:2718
 msgid "Not At Desk"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:2016 src/protocols/yahoo/yahoo.c:2314
-#: src/protocols/yahoo/yahoo.c:2410
+#: src/protocols/yahoo/yahoo.c:2283 src/protocols/yahoo/yahoo.c:2609
+#: src/protocols/yahoo/yahoo.c:2719
 #, fuzzy
 msgid "Not In Office"
 msgstr "Бележка"
 
-#: src/protocols/yahoo/yahoo.c:2020 src/protocols/yahoo/yahoo.c:2318
-#: src/protocols/yahoo/yahoo.c:2412
+#: src/protocols/yahoo/yahoo.c:2287 src/protocols/yahoo/yahoo.c:2613
+#: src/protocols/yahoo/yahoo.c:2721
 msgid "On Vacation"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:2024 src/protocols/yahoo/yahoo.c:2322
-#: src/protocols/yahoo/yahoo.c:2414
+#: src/protocols/yahoo/yahoo.c:2291 src/protocols/yahoo/yahoo.c:2617
+#: src/protocols/yahoo/yahoo.c:2723
 msgid "Stepped Out"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:2088 src/protocols/yahoo/yahoo.c:2122
+#: src/protocols/yahoo/yahoo.c:2355 src/protocols/yahoo/yahoo.c:2387
 #, fuzzy
 msgid "Not on server list"
 msgstr "Връзката се загуби"
 
-#: src/protocols/yahoo/yahoo.c:2178
+#: src/protocols/yahoo/yahoo.c:2407
+#, fuzzy, c-format
+msgid ""
+"\n"
+"<b>%s:</b> %s"
+msgstr "Статус: %s"
+
+#: src/protocols/yahoo/yahoo.c:2443
 #, fuzzy
 msgid "Join in Chat"
 msgstr "Влизане в чат"
 
-#: src/protocols/yahoo/yahoo.c:2184
+#: src/protocols/yahoo/yahoo.c:2449
 #, fuzzy
 msgid "Initiate Conference"
 msgstr "Прякор"
 
-#: src/protocols/yahoo/yahoo.c:2230
+#: src/protocols/yahoo/yahoo.c:2502
 msgid "Active which ID?"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:2241
-#, fuzzy
-msgid "Activate ID"
+#: src/protocols/yahoo/yahoo.c:2510
+#, fuzzy
+msgid "Join who in chat?"
+msgstr "Влизане в чат"
+
+#: src/protocols/yahoo/yahoo.c:2521
+#, fuzzy
+msgid "Activate ID..."
 msgstr "Активен"
 
-#: src/protocols/yahoo/yahoo.c:2599
+#: src/protocols/yahoo/yahoo.c:2527
+#, fuzzy
+msgid "Join user in chat..."
+msgstr "Присъединяване към чат"
+
+#: src/protocols/yahoo/yahoo.c:2916
 msgid ""
 "<b>Sorry, profiles marked as containing adult content are not supported at "
 "this time.</b><br><br>\n"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:2600 src/protocols/yahoo/yahoo.c:2620
+#: src/protocols/yahoo/yahoo.c:2917 src/protocols/yahoo/yahoo.c:2940
 msgid ""
 "If you wish to view this profile, you will need to visit this link in your "
 "web browser<br>"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:2619
+#: src/protocols/yahoo/yahoo.c:2939
 msgid ""
 "<b>Sorry, non-English profiles are not supported at this time.</b><br><br>\n"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:2664
+#: src/protocols/yahoo/yahoo.c:2987 src/protocols/yahoo/yahoo.c:2988
 msgid "Yahoo! ID"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:2724 src/protocols/yahoo/yahoo.c:2728
-#: src/protocols/yahoo/yahoo.c:2732
+#: src/protocols/yahoo/yahoo.c:3032 src/protocols/yahoo/yahoo.c:3035
+#: src/protocols/yahoo/yahoo.c:3038
 msgid "Hobbies"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:2743 src/protocols/yahoo/yahoo.c:2747
+#: src/protocols/yahoo/yahoo.c:3047 src/protocols/yahoo/yahoo.c:3050
 #, fuzzy
 msgid "Latest News"
 msgstr "Фамилно име"
 
-#: src/protocols/yahoo/yahoo.c:2765
+#: src/protocols/yahoo/yahoo.c:3064
 #, fuzzy
 msgid "Home Page"
 msgstr "Образ"
 
-#: src/protocols/yahoo/yahoo.c:2779
+#: src/protocols/yahoo/yahoo.c:3076
 msgid "Cool Link 1"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:2784
+#: src/protocols/yahoo/yahoo.c:3080
 msgid "Cool Link 2"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:2787
+#: src/protocols/yahoo/yahoo.c:3082
 msgid "Cool Link 3"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:2793
-msgid "Member Since"
-msgstr ""
-
 #. *< api_version
 #. *< type
 #. *< ui_requirement
@@ -7809,92 +8867,149 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/yahoo/yahoo.c:2958 src/protocols/yahoo/yahoo.c:2960
+#. *  description
+#: src/protocols/yahoo/yahoo.c:3294 src/protocols/yahoo/yahoo.c:3296
 msgid "Yahoo Protocol Plugin"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:2977
+#: src/protocols/yahoo/yahoo.c:3313
 msgid "Pager host"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:2982
+#: src/protocols/yahoo/yahoo.c:3316
 msgid "Pager port"
 msgstr ""
 
-#: src/protocols/yahoo/yahoochat.c:194
+#: src/protocols/yahoo/yahoo.c:3319
+#, fuzzy
+msgid "File transfer host"
+msgstr "Не мога да пиша"
+
+#: src/protocols/yahoo/yahoo.c:3322
+#, fuzzy
+msgid "File transfer port"
+msgstr "Не мога да пиша"
+
+#: src/protocols/yahoo/yahoo.c:3325
+#, fuzzy
+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 ""
 
-#: src/protocols/yahoo/yahoochat.c:196
+#: src/protocols/yahoo/yahoochat.c:200
 msgid "Invitation Rejected"
 msgstr ""
 
-#: src/protocols/yahoo/yahoochat.c:333
+#: src/protocols/yahoo/yahoochat.c:350
 #, fuzzy
 msgid "Failed to join chat"
 msgstr "Не мога да се свържа"
 
-#: src/protocols/yahoo/yahoochat.c:333
+#: src/protocols/yahoo/yahoochat.c:350
 msgid "Maybe the room is full?"
 msgstr ""
 
-#: src/protocols/yahoo/yahoochat.c:531
+#: src/protocols/yahoo/yahoochat.c:426
+#, fuzzy, c-format
+msgid "You are now chatting in %s."
+msgstr "Бяхте изритани от %s: %s"
+
+#: src/protocols/yahoo/yahoochat.c:580
 #, fuzzy
 msgid "Failed to join buddy in chat"
 msgstr "Не мога да се свържа"
 
-#: src/protocols/yahoo/yahoochat.c:532
+#: 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
+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 "Не мога да чета файл %s"
+
+#: src/protocols/yahoo/yahoochat.c:1414
+#, fuzzy
+msgid "User Rooms"
+msgstr "Прокси"
+
+#: src/protocols/zephyr/zephyr.c:557
 #, c-format
 msgid "<b>User:</b> %s<br>"
 msgstr ""
 
-#: src/protocols/zephyr/zephyr.c:346
+#: src/protocols/zephyr/zephyr.c:559
 #, c-format
 msgid "<b>Alias:</b> %s<br>"
 msgstr ""
 
-#: src/protocols/zephyr/zephyr.c:348
+#: src/protocols/zephyr/zephyr.c:561
 msgid "<br>Hidden or not logged-in"
 msgstr ""
 
-#: src/protocols/zephyr/zephyr.c:352
+#: src/protocols/zephyr/zephyr.c:565
 #, c-format
 msgid "<br>At %s since %s"
 msgstr ""
 
-#: src/protocols/zephyr/zephyr.c:584 src/protocols/zephyr/zephyr.c:585
+#: src/protocols/zephyr/zephyr.c:831 src/protocols/zephyr/zephyr.c:832
 msgid "Anyone"
 msgstr ""
 
-#: src/protocols/zephyr/zephyr.c:609
+#: src/protocols/zephyr/zephyr.c:858
 msgid "Already logged in with Zephyr"
 msgstr ""
 
-#: src/protocols/zephyr/zephyr.c:610
+#: src/protocols/zephyr/zephyr.c:858
 msgid ""
 "Because Zephyr uses your system username, you are unable to have multiple "
 "accounts on it when logged in as the same user."
 msgstr ""
 
-#: src/protocols/zephyr/zephyr.c:868
+#: src/protocols/zephyr/zephyr.c:1164
 msgid "ZLocate"
 msgstr "ZLocate"
 
-#: src/protocols/zephyr/zephyr.c:908
-msgid "Class:"
+#: src/protocols/zephyr/zephyr.c:1206
+#, fuzzy
+msgid "_Class:"
 msgstr "Клас:"
 
-#: src/protocols/zephyr/zephyr.c:913
-msgid "Instance:"
+#: src/protocols/zephyr/zephyr.c:1212
+#, fuzzy
+msgid "_Instance:"
 msgstr "Инстанция:"
 
-#: src/protocols/zephyr/zephyr.c:918
-msgid "Recipient:"
+#: src/protocols/zephyr/zephyr.c:1218
+#, fuzzy
+msgid "_Recipient:"
 msgstr "Получател:"
 
 #. *< api_version
@@ -7907,142 +9022,418 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/zephyr/zephyr.c:1050 src/protocols/zephyr/zephyr.c:1052
+#. *  description
+#: src/protocols/zephyr/zephyr.c:1372 src/protocols/zephyr/zephyr.c:1374
 msgid "Zephyr Protocol Plugin"
 msgstr ""
 
-#: src/proxy.c:1681
+#: src/protocols/zephyr/zephyr.c:1391
+msgid "Export to .anyone"
+msgstr ""
+
+#: src/protocols/zephyr/zephyr.c:1394
+msgid "Export to .zephyr.subs"
+msgstr ""
+
+#: src/protocols/zephyr/zephyr.c:1397
+msgid "Exposure"
+msgstr ""
+
+#. Forbidden
+#: src/proxy.c:955
+msgid "Access denied: proxy server forbids port 80 tunnelling."
+msgstr ""
+
+#: src/proxy.c:957
+#, fuzzy, c-format
+msgid "Proxy connection error %d"
+msgstr "основна грешка на връзката\n"
+
+#: src/proxy.c:1696
 msgid "Invalid proxy settings"
 msgstr ""
 
-#: src/proxy.c:1681
+#: src/proxy.c:1696
 msgid ""
 "Either the host name or port number specified for your given proxy type is "
 "invalid."
 msgstr ""
 
 #. * Custom away message.
-#: src/prpl.h:187
+#: src/prpl.h:194
 msgid "Custom"
 msgstr ""
 
 #. *
 #. * A wrapper for gaim_request_action() that uses Accept and Cancel buttons.
 #.
-#: src/request.h:862
+#: src/request.h:1250
 msgid "Accept"
 msgstr "Приемане"
 
-#: src/server.c:56
+#: src/server.c:58
 msgid "Please enter your password"
 msgstr "Моля въведете парола"
 
-#: src/server.c:949
+#: src/server.c:962
 #, fuzzy, c-format
 msgid "(%d message)"
 msgid_plural "(%d messages)"
 msgstr[0] "(%d съобщения)"
 msgstr[1] "(%d съобщения)"
 
-#: src/server.c:962
+#: src/server.c:976
 msgid "(1 message)"
 msgstr "(1 съобщение)"
 
-#: src/server.c:1145 src/server.c:1155
+#: src/server.c:1160 src/server.c:1170
 #, c-format
 msgid "%s logged in."
 msgstr "%s влезе."
 
-#: src/server.c:1172 src/server.c:1180
+#: src/server.c:1184
+#, fuzzy, c-format
+msgid "%s signed on"
+msgstr "%s излезе"
+
+#: src/server.c:1200
+#, c-format
+msgid "%s came back"
+msgstr ""
+
+#: src/server.c:1202
+#, fuzzy, c-format
+msgid "%s went away"
+msgstr "Звук при отсъствие"
+
+#: src/server.c:1217
+#, fuzzy, c-format
+msgid "%s became idle"
+msgstr "%s излезе"
+
+#: src/server.c:1231
+#, fuzzy, c-format
+msgid "%s became unidle"
+msgstr "%s излезе"
+
+#: src/server.c:1244 src/server.c:1252
 #, c-format
 msgid "%s logged out."
 msgstr "%s излезе."
 
-#: src/server.c:1227
+#: src/server.c:1267
+#, fuzzy, c-format
+msgid "%s signed off"
+msgstr "%s излезе"
+
+#: src/server.c:1317
 #, c-format
 msgid ""
 "%s has just been warned by %s.\n"
 "Your new warning level is %d%%"
 msgstr ""
 
-#: src/server.c:1230
+#: src/server.c:1320
 #, fuzzy
 msgid "an anonymous person"
 msgstr "Предупреди анонимно?"
 
-#: src/server.c:1333
+#: src/server.c:1430
 #, c-format
 msgid ""
 "User '%s' invites %s to buddy chat room: '%s'\n"
 "%s"
 msgstr ""
 
-#: src/server.c:1337
+#: src/server.c:1434
 #, c-format
 msgid "User '%s' invites %s to buddy chat room: '%s'\n"
 msgstr ""
 
-#: src/server.c:1343
+#: src/server.c:1440
 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:84
+#: src/stock.c:86
+#, fuzzy
+msgid "_Alias"
+msgstr "Прякор"
+
+#: src/stock.c:88
 #, fuzzy
 msgid "_Modify"
 msgstr "Промяня"
 
-#: src/stock.c:85
+#: src/stock.c:89
 #, fuzzy
 msgid "_Open Mail"
 msgstr "?Отвори поща?"
 
-#: src/util.c:1527
+#: src/stock.c:91
+#, fuzzy
+msgid "_Warn"
+msgstr "Предуреждение"
+
+#: src/util.c:2040
 msgid "Calculating..."
 msgstr ""
 
-#: src/util.c:1530
+#: src/util.c:2043
 #, fuzzy
 msgid "Unknown."
 msgstr "Непознато"
 
-#: src/util.c:1561 src/util.c:1566 src/util.c:1571 src/util.c:1574
+#: src/util.c:2074 src/util.c:2079 src/util.c:2084 src/util.c:2087
 msgid "day"
 msgid_plural "days"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/util.c:1562 src/util.c:1566 src/util.c:1580 src/util.c:1582
+#: src/util.c:2075 src/util.c:2079 src/util.c:2093 src/util.c:2095
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/util.c:1562 src/util.c:1571 src/util.c:1580 src/util.c:1585
+#: src/util.c:2075 src/util.c:2084 src/util.c:2093 src/util.c:2098
 #, fuzzy
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "минути използвани"
 msgstr[1] "минути използвани"
 
-#: src/util.c:1917
+#: src/util.c:2430
 msgid "g003: Error opening connection.\n"
 msgstr "g003: Грешка при отваряне на връзка.\n"
 
-#: src/win32/win32dep.c:474
+#: src/win32/win32dep.c:272
+msgid "Moving Gaim Settings.."
+msgstr ""
+
+#: src/win32/win32dep.c:275
+msgid "Moving Gaim user settings to: "
+msgstr ""
+
+#: src/win32/win32dep.c:277
 #, fuzzy
 msgid "Notification"
 msgstr "Показващо се известяване"
 
-#: src/win32/win32dep.c:475
-msgid "Moving Gaim user settings directory to:"
-msgstr ""
+#, fuzzy
+#~ msgid "(No"
+#~ msgstr "Не"
+
+#, fuzzy
+#~ msgid "Change"
+#~ msgstr "Канал:"
+
+#~ msgid "About Gaim v%s"
+#~ msgstr "Относно Gaim в%s"
+
+#~ msgid "Gaim - Away!"
+#~ msgstr "Gaim - Отсъствие!"
+
+#~ msgid "Buddy Chat"
+#~ msgstr "Чат"
+
+#~ msgid "Join"
+#~ msgstr "Присъединяване"
+
+#, fuzzy
+#~ msgid "New Message"
+#~ msgstr "Ново съобщение за отсъствие"
+
+#, fuzzy
+#~ msgid "_Screenname:"
+#~ msgstr "Номер:"
+
+#, fuzzy
+#~ msgid "Log Conversation"
+#~ msgstr "Разговор"
+
+#, fuzzy
+#~ msgid "Alias chat"
+#~ msgstr "Прякор"
+
+#, fuzzy
+#~ msgid "Alias buddy"
+#~ msgstr "Прякор"
+
+#, fuzzy
+#~ msgid "Couldn't write to %s."
+#~ msgstr "Не мога да се свържа"
+
+#, fuzzy
+#~ msgid "Save Log File"
+#~ msgstr "Gaim - Записване на лог файл"
+
+#, fuzzy
+#~ msgid "Couldn't remove file %s."
+#~ msgstr "Не можа да се отвори конфигурационен файл %s."
+
+#, fuzzy
+#~ msgid "Clear Log"
+#~ msgstr "Изчистване"
+
+#~ msgid "Really clear log?"
+#~ msgstr "Изчистване на лог-а?"
+
+#, fuzzy
+#~ msgid "Couldn't open log file %s."
+#~ msgstr "Не можа да се отвори конфигурационен файл %s."
+
+#~ msgid "Clear"
+#~ msgstr "Изчистване"
+
+#~ msgid "Could not open config file %s."
+#~ msgstr "Не можа да се отвори конфигурационен файл %s."
+
+#, fuzzy
+#~ msgid "Gaim - Information"
+#~ msgstr "Информация Gadu-Gadu"
+
+#, fuzzy
+#~ msgid "_Get Info"
+#~ msgstr "Данни"
+
+#, fuzzy
+#~ msgid "_IM"
+#~ msgstr "Съобщение"
+
+#, fuzzy
+#~ msgid "Add a new group"
+#~ msgstr "Добавяне група"
+
+#, fuzzy
+#~ msgid "%s has been disconnected"
+#~ msgstr "%s излезе"
+
+#~ msgid "Gaim - Insert Image"
+#~ msgstr "Gaim - Вмъкване на образ"
+
+#~ msgid "Gaim - Save Conversation"
+#~ msgstr "Gaim - Записване на разговор"
+
+#, fuzzy
+#~ msgid "/Conversation/Insert _URL..."
+#~ msgstr "Разговори"
+
+#~ msgid "Normal font size"
+#~ msgstr "Нормален размер на шрифт"
+
+#~ msgid "Disable Animation"
+#~ msgstr "Забрана на анимаци"
+
+#~ msgid "Enable Animation"
+#~ msgstr "Позволяване на анимации"
+
+#, fuzzy
+#~ msgid "_Host"
+#~ msgstr "Хост"
+
+#, fuzzy
+#~ msgid "_User"
+#~ msgstr "Потребител"
+
+#, fuzzy
+#~ msgid "Pa_ssword"
+#~ msgstr "Парола"
+
+#, fuzzy
+#~ msgid "Browser Options"
+#~ msgstr "Прокси"
+
+#, fuzzy
+#~ msgid "Open new _window by default"
+#~ msgstr "Покава нов прозорец по подразбиране"
+
+#, fuzzy
+#~ msgid "Strip _HTML from logs"
+#~ msgstr "Премахва HTML от логовете"
+
+#, fuzzy
+#~ msgid "I_ndividual log file for each buddy's signons"
+#~ msgstr "Отделен лог файл за всяко влизане на авера"
+
+#~ msgid "Gaim - Save Icon"
+#~ msgstr "Gaim - Записване на икона"
+
+#, fuzzy
+#~ msgid "Unable to find conversation log"
+#~ msgstr "Не може да се изпрати: прекалено голямо"
+
+#, fuzzy
+#~ msgid "Unable to make directory %s for logging"
+#~ msgstr "Не мога да отворя директна връзка"
+
+#, fuzzy
+#~ msgid "+++ %s (%s) signed off @ %s"
+#~ msgstr "%s излезе"
+
+#, fuzzy
+#~ msgid "Disconnected"
+#~ msgstr "Прекиснати сте."
+
+#, fuzzy
+#~ msgid "Invalid response from server"
+#~ msgstr "Грешен отговор от сървъра."
+
+#, fuzzy
+#~ msgid "Bad Protocol"
+#~ msgstr "Протокол:"
+
+#, fuzzy
+#~ msgid "Unknown error occurred changing password"
+#~ msgstr "Не мога да чета от socket"
+
+#, fuzzy
+#~ msgid "Unable to join chat"
+#~ msgstr "Не мога да се свържа"
+
+#, fuzzy
+#~ msgid "Invalid User"
+#~ msgstr "Невалидно име"
+
+#, fuzzy
+#~ msgid "Internal server error"
+#~ msgstr "Вътрешна грешка"
+
+#, fuzzy
+#~ msgid "Unable to read from MSN Nexus server."
+#~ msgstr "Не мога да се свържа със сървъра."
+
+#, fuzzy
+#~ msgid "Unable to connect to passport server"
+#~ msgstr "Не мога да се свържа със сървъра."
+
+#~ msgid "Join what group:"
+#~ msgstr "Присъединяване към група:"
+
+#, fuzzy
+#~ msgid "<b>Capabilities:</b> "
+#~ msgstr "Възможности: %s\n"
+
+#, fuzzy
+#~ msgid "<b>Available:</b> "
+#~ msgstr "Недостъпен"
+
+#, fuzzy
+#~ msgid "<b>Away Message:</b> "
+#~ msgstr "Съобщение за отсъствие"
+
+#~ msgid "Could not connect for transfer!"
+#~ msgstr "Не мога да се свържа за трансфер!"
+
+#, fuzzy
+#~ msgid "Unknown error."
+#~ msgstr "Непозната грешка при логване"
 
 #, fuzzy
 #~ msgid "Unable to write to config file"
@@ -8063,10 +9454,6 @@
 #~ msgstr "DCC чат с %s затворен"
 
 #, fuzzy
-#~ msgid "User"
-#~ msgstr "Потребител"
-
-#, fuzzy
 #~ msgid "IRC Operator"
 #~ msgstr "Грешка в IRC"
 
@@ -8074,9 +9461,6 @@
 #~ msgid "Rehashing server"
 #~ msgstr "Четене на ключа на сървъра"
 
-#~ msgid "IRC Error"
-#~ msgstr "Грешка в IRC"
-
 #~ msgid "No such server"
 #~ msgstr "Няма такъв сървър"
 
@@ -8122,10 +9506,6 @@
 #~ msgid "Requesting Authentication Method"
 #~ msgstr "Заявяване на абтентикационен метод"
 
-#, fuzzy
-#~ msgid "Unable to add buddy."
-#~ msgstr "Не мога да чета файл %s"
-
 #~ msgid "Jabber Error"
 #~ msgstr "Jabber грешка"
 
@@ -8133,9 +9513,6 @@
 #~ msgid "View Error Msg"
 #~ msgstr "Архив"
 
-#~ msgid "User Identity"
-#~ msgstr "Потребителска идентичност"
-
 #, fuzzy
 #~ msgid "Unable to send USR\n"
 #~ msgstr "Не може да се изпрати: прекалено голямо"
@@ -8144,10 +9521,6 @@
 #~ msgid "Unable to request INF"
 #~ msgstr "Не мога да отворя директна връзка"
 
-#, fuzzy
-#~ msgid "<B>Status:</B> %s<HR>%s"
-#~ msgstr "Статус: %s"
-
 #~ msgid "EveryBuddy Bug"
 #~ msgstr "EveryBuddy Bug"
 
@@ -8184,10 +9557,6 @@
 #~ msgstr "Име"
 
 #, fuzzy
-#~ msgid "Last Name:"
-#~ msgstr "Фамилно име"
-
-#, fuzzy
 #~ msgid "Gender:"
 #~ msgstr "Основни"
 
@@ -8207,13 +9576,6 @@
 #~ msgid "Converting Buddy List"
 #~ msgstr "Импортиране на листа"
 
-#, fuzzy
-#~ msgid "_Group:"
-#~ msgstr "Група"
-
-#~ msgid "Alias"
-#~ msgstr "Прякор"
-
 #~ msgid "Group"
 #~ msgstr "Група"
 
@@ -8247,9 +9609,6 @@
 #~ msgid "Add Deny"
 #~ msgstr "Gaim - добавяне на забрана"
 
-#~ msgid "Search for Buddy"
-#~ msgstr "Търсене"
-
 #, fuzzy
 #~ msgid "Find Buddy By Info"
 #~ msgstr "Gaim - Търсене по данни"
@@ -8263,10 +9622,6 @@
 #~ msgstr "Не можа да се отвори конфигурационен файл %s."
 
 #, fuzzy
-#~ msgid "Screenname"
-#~ msgstr "Номер:"
-
-#, fuzzy
 #~ msgid "_Raise windows on events"
 #~ msgstr "Повдига прозорец при събитие"
 
@@ -8293,10 +9648,6 @@
 #~ msgid "Gaim Chat"
 #~ msgstr "Gaim - Чат"
 
-#, fuzzy
-#~ msgid "Chat Rooms"
-#~ msgstr "Чат"
-
 #~ msgid "yes"
 #~ msgstr "Да"
 
@@ -8321,9 +9672,6 @@
 #~ msgid "connection error (rend)\n"
 #~ msgstr "грешка на връзката (rend)\n"
 
-#~ msgid "major connection error\n"
-#~ msgstr "основна грешка на връзката\n"
-
 #~ msgid "Password sent, waiting for response\n"
 #~ msgstr "Паролата изпратена, изчакване на отговор\n"
 
@@ -8367,9 +9715,6 @@
 #~ msgid "Stocks"
 #~ msgstr "Ценни книжа"
 
-#~ msgid "Get Capabilities"
-#~ msgstr "Вземи възможностите"
-
 #~ msgid "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
 #~ msgstr "%s заявки  %s за приемане на %d файла: %s (%.2f %s)%s%s"
 
@@ -8403,9 +9748,6 @@
 #~ msgid "Gaim - Buddy List"
 #~ msgstr "Gaim - лист"
 
-#~ msgid "File"
-#~ msgstr "Файл"
-
 #, fuzzy
 #~ msgid "_Accounts..."
 #~ msgstr "Акаунти"
@@ -8414,9 +9756,6 @@
 #~ msgid "_Preferences..."
 #~ msgstr "Настройки"
 
-#~ msgid "About Gaim"
-#~ msgstr "Относно Gaim"
-
 #~ msgid "Add a new Buddy"
 #~ msgstr "Добавяне"
 
@@ -8429,13 +9768,6 @@
 #~ msgid "Gaim - Group Chats"
 #~ msgstr "Gaim - групови чатове"
 
-#, fuzzy
-#~ msgid "_Save Conversation"
-#~ msgstr "Запис на разгово"
-
-#~ msgid "Gaim - Conversations"
-#~ msgstr "Gaim - Разговори"
-
 #~ msgid "Send message as: "
 #~ msgstr "Изпращане от:"
 
@@ -8777,15 +10109,9 @@
 #~ msgid "IM who:"
 #~ msgstr "Съобщение на:"
 
-#~ msgid "User:"
-#~ msgstr "Потребител:"
-
 #~ msgid "Gaim - Get User Info"
 #~ msgstr "Информация"
 
-#~ msgid "Contact"
-#~ msgstr "Контакт"
-
 #~ msgid "Select Autos"
 #~ msgstr "Избиране на автоматичните"
 
@@ -8807,9 +10133,6 @@
 #~ msgid "Load a plugin from a file"
 #~ msgstr "Зареждане на плъгин от файл"
 
-#~ msgid "Configure"
-#~ msgstr "Настройка"
-
 #~ msgid "Configure settings of the selected plugin"
 #~ msgstr "Настройка на плъгина"
 
@@ -8825,9 +10148,6 @@
 #~ msgid "Unload the selected plugin"
 #~ msgstr "Спиране на плъгина"
 
-#~ msgid "Close this window"
-#~ msgstr "Затворяне на прозореца"
-
 #, fuzzy
 #~ msgid "Use _borderless buttons"
 #~ msgstr "Бутони без рамка"
@@ -8880,10 +10200,6 @@
 #~ msgid "Password Change Error!"
 #~ msgstr "Gaim - Смяна на паролата"
 
-#, fuzzy
-#~ msgid "Invalid Jabber I.D."
-#~ msgstr "Невалидно име"
-
 #~ msgid "Chat Error!"
 #~ msgstr "Грешка на чат-а!"
 
@@ -8924,9 +10240,6 @@
 #~ msgid "About..."
 #~ msgstr "Относно"
 
-#~ msgid "Unable to send message: Unknown reason"
-#~ msgstr "Не може да се изпратисъобщение: Незнайна причина"
-
 #~ msgid "Buddy Pounce Error"
 #~ msgstr "Грешка в известяването"
 
@@ -8942,9 +10255,6 @@
 #~ msgid "Perl Scripts"
 #~ msgstr "Perl скриптове"
 
-#~ msgid "Select"
-#~ msgstr "Избор"
-
 #~ msgid "Automatically show buddy list on sign on"
 #~ msgstr "Автоматично показване на листа при влизане"
 
@@ -8954,9 +10264,6 @@
 #~ msgid "Edit"
 #~ msgstr "Редактиране"
 
-#~ msgid "Protocol Error"
-#~ msgstr "Протоколна грешка"
-
 #, fuzzy
 #~ msgid "Protocol Warning"
 #~ msgstr "Действия на протокола"
--- a/po/zh_CN.po	Wed Apr 21 06:48:16 2004 +0000
+++ b/po/zh_CN.po	Wed Apr 21 15:18:24 2004 +0000
@@ -7,8 +7,8 @@
 msgstr ""
 "Project-Id-Version: gaim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-04-02 20:51-0500\n"
-"PO-Revision-Date: 2004-04-03 12:00+0800\n"
+"POT-Creation-Date: 2004-04-19 17:05-0500\n"
+"PO-Revision-Date: 2004-04-17 00:23+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
 "MIME-Version: 1.0\n"
@@ -30,7 +30,6 @@
 #. *< name
 #. *< version
 #. *  summary
-#. *  description
 #: plugins/autorecon.c:113 plugins/autorecon.c:115
 msgid "When you are kicked offline, this reconnects you."
 msgstr "如果您被踢出来了,程序将会自动重新连接。"
@@ -146,18 +145,18 @@
 msgid "New..."
 msgstr "新建..."
 
-#: plugins/docklet/docklet.c:153 src/gtkprefs.c:1595 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:2953
-#: src/protocols/oscar/oscar.c:4752 src/protocols/oscar/oscar.c:5798
-#: src/protocols/oscar/oscar.c:6416
+#: plugins/docklet/docklet.c:153 src/gtkprefs.c:1623 src/protocols/gg/gg.c:51
+#: src/protocols/irc/msgs.c:187 src/protocols/jabber/jabber.c:951
+#: src/protocols/jabber/jutil.c:32 src/protocols/jabber/presence.c:63
+#: src/protocols/jabber/presence.c:119 src/protocols/oscar/oscar.c:2958
+#: src/protocols/oscar/oscar.c:4744 src/protocols/oscar/oscar.c:5769
+#: src/protocols/oscar/oscar.c:6387
 msgid "Away"
 msgstr "离开"
 
 #. else...
 #: plugins/docklet/docklet.c:159 src/away.c:522
-#: src/protocols/oscar/oscar.c:4670 src/protocols/oscar/oscar.c:6424
+#: src/protocols/oscar/oscar.c:4662 src/protocols/oscar/oscar.c:6395
 msgid "Back"
 msgstr "回来"
 
@@ -170,11 +169,11 @@
 msgstr "文件传送"
 
 #. And now for the buttons
-#: plugins/docklet/docklet.c:173 src/gtkaccount.c:2070 src/main.c:288
+#: plugins/docklet/docklet.c:173 src/gtkaccount.c:2070 src/main.c:287
 msgid "Accounts"
 msgstr "账户"
 
-#: plugins/docklet/docklet.c:174 src/gtkprefs.c:2583 src/main.c:294
+#: plugins/docklet/docklet.c:174 src/gtkprefs.c:2611 src/main.c:293
 msgid "Preferences"
 msgstr "首选项"
 
@@ -238,7 +237,6 @@
 #. *< name
 #. *< version
 #. *  summary
-#. *  description
 #: plugins/filectl.c:225 plugins/filectl.c:227
 msgid "Allows you to control Gaim by entering commands in a file."
 msgstr "允许您输入文件中的命令来控制 Gaim。"
@@ -376,15 +374,15 @@
 #: 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:2886 src/gtkprefs.c:870 src/gtkprefs.c:1623
-#: src/protocols/jabber/jabber.c:916
+#: src/gtkblist.c:2918 src/gtkprefs.c:870 src/gtkprefs.c:1651
+#: src/protocols/jabber/jabber.c:915
 msgid "None"
 msgstr "无"
 
 #: plugins/gevolution/add_buddy_dialog.c:190
-#: plugins/gevolution/assoc-buddy.c:180 src/gtkprefs.c:2000
+#: plugins/gevolution/assoc-buddy.c:180 src/gtkprefs.c:2028
 #: src/gtkroomlist.c:561 src/protocols/jabber/jabber.c:590
-#: src/protocols/msn/msn.c:1379 src/protocols/trepia/trepia.c:401
+#: src/protocols/msn/msn.c:1394 src/protocols/trepia/trepia.c:398
 msgid "Name"
 msgstr "名称"
 
@@ -399,13 +397,13 @@
 
 #. "Search"
 #: plugins/gevolution/add_buddy_dialog.c:495
-#: plugins/gevolution/assoc-buddy.c:385 src/protocols/oscar/oscar.c:6687
+#: plugins/gevolution/assoc-buddy.c:385 src/protocols/oscar/oscar.c:6658
 msgid "Search"
 msgstr "搜索"
 
 #: plugins/gevolution/add_buddy_dialog.c:566
-#: plugins/gevolution/new_person_dialog.c:310 src/gtkblist.c:3904
-#: src/gtkblist.c:4232
+#: plugins/gevolution/new_person_dialog.c:310 src/gtkblist.c:3936
+#: src/gtkblist.c:4264
 msgid "Group:"
 msgstr "组:"
 
@@ -442,8 +440,8 @@
 msgstr "关联好友(_A)"
 
 #: 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:3729
-#: src/protocols/jabber/roster.c:66 src/protocols/msn/notification.c:792
+#: src/blist.c:685 src/blist.c:872 src/blist.c:2105 src/gtkblist.c:3761
+#: src/protocols/jabber/roster.c:66 src/protocols/msn/notification.c:793
 msgid "Buddies"
 msgstr "好友"
 
@@ -479,7 +477,6 @@
 #. *< name
 #. *< version
 #. *  summary
-#. *  description
 #: plugins/gevolution/gevolution.c:464 plugins/gevolution/gevolution.c:466
 msgid "Provides integration with Ximian Evolution."
 msgstr "提供与 Ximian Evolution 的集成。"
@@ -507,7 +504,7 @@
 
 #. Label
 #: plugins/gevolution/new_person_dialog.c:341 src/gtkaccount.c:320
-#: src/protocols/oscar/oscar.c:3188
+#: src/protocols/oscar/oscar.c:3178
 msgid "Buddy Icon"
 msgstr "好友图标"
 
@@ -551,7 +548,6 @@
 #. *< 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 "您离开后将好友列表和对话都变为图标。"
@@ -632,14 +628,18 @@
 msgid "Test plugin IPC support, as a server. This registers the IPC commands."
 msgstr "测试插件 IPC 支持,作为服务器。这将注册 IPC 命令。"
 
-#: plugins/mailchk.c:156
+#: plugins/mailchk.c:157
 msgid "Mail Checker"
 msgstr "邮件检查器"
 
-#: plugins/mailchk.c:158 plugins/mailchk.c:159
+#: plugins/mailchk.c:159
 msgid "Checks for new local mail."
 msgstr "检查新的本地邮件。"
 
+#: plugins/mailchk.c:160
+msgid "Adds a small box to the buddy list that shows if you have new mail."
+msgstr "在好友列表旁显示一个小方块,标明您是否有新邮件。"
+
 #. ---------- "Notify For" ----------
 #: plugins/notify.c:572
 msgid "Notify For"
@@ -720,7 +720,6 @@
 #. *< 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 "提供各种方法通知您有未读邮件。"
@@ -738,7 +737,6 @@
 
 #. *< name
 #. *< version
-#. *< summary
 #: plugins/perl/perl.c:532 plugins/perl/perl.c:533
 msgid "Provides support for loading perl plugins."
 msgstr "提供装入 Perl 插件的支持。"
@@ -825,7 +823,6 @@
 #. *< 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 "测试看看所有的信号是否都工作正确。"
@@ -844,7 +841,6 @@
 #. *< name
 #. *< version
 #. *  summary
-#. *  description
 #: plugins/simple.c:34 plugins/simple.c:36
 msgid "Tests to see that most things are working."
 msgstr "测试看看大多数功能是否正常。"
@@ -895,7 +891,6 @@
 #. *< name
 #. *< version
 #. *  summary
-#. *  description
 #: plugins/ssl/ssl-gnutls.c:226 plugins/ssl/ssl-gnutls.c:228
 msgid "Provides SSL support through GNUTLS."
 msgstr "提供通过 GNUTLS 的 SSL 支持。"
@@ -914,7 +909,6 @@
 #. *< name
 #. *< version
 #. *  summary
-#. *  description
 #: plugins/ssl/ssl-nss.c:315 plugins/ssl/ssl-nss.c:317
 msgid "Provides SSL support through Mozilla NSS."
 msgstr "提供通过 Mozilla NSS 的 SSL 支持。"
@@ -933,7 +927,6 @@
 #. *< name
 #. *< version
 #. *  summary
-#. *  description
 #: plugins/ssl/ssl.c:94 plugins/ssl/ssl.c:96
 msgid "Provides a wrapper around SSL support libraries."
 msgstr "提供 SSL 支持库。"
@@ -972,7 +965,6 @@
 #. *< 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 "
@@ -1001,7 +993,6 @@
 #. *< name
 #. *< version
 #. *  summary
-#. *  description
 #: plugins/ticker/ticker.c:331 plugins/ticker/ticker.c:333
 msgid "A horizontal scrolling version of the buddy list."
 msgstr "好友列表的水平滚动版本。"
@@ -1032,7 +1023,6 @@
 #. *< 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 风格的时间戳。"
@@ -1079,7 +1069,6 @@
 #. *< name
 #. *< version
 #. *  summary
-#. *  description
 #: plugins/win32/transparency/win2ktrans.c:425
 #: plugins/win32/transparency/win2ktrans.c:427
 msgid ""
@@ -1105,8 +1094,8 @@
 msgstr "Windows 启动时启动 Gaim(_S)"
 
 #. Buddy List
-#: plugins/win32/winprefs/winprefs.c:366 src/gtkblist.c:2927
-#: src/gtkprefs.c:2499
+#: plugins/win32/winprefs/winprefs.c:366 src/gtkblist.c:2959
+#: src/gtkprefs.c:2527
 msgid "Buddy List"
 msgstr "好友列表"
 
@@ -1126,7 +1115,7 @@
 
 #. Conversations
 #: plugins/win32/winprefs/winprefs.c:386 src/gtkprefs.c:911
-#: src/gtkprefs.c:2500 src/protocols/msn/msn.c:1709
+#: src/gtkprefs.c:2528 src/protocols/msn/msn.c:1731
 msgid "Conversations"
 msgstr "对话"
 
@@ -1229,11 +1218,11 @@
 msgid "Current Translators"
 msgstr "当前翻译者"
 
-#: src/about.c:163 src/about.c:196
+#: src/about.c:163 src/about.c:197
 msgid "Catalan"
 msgstr "加泰罗尼亚语"
 
-#: src/about.c:164 src/about.c:197
+#: src/about.c:164 src/about.c:198
 msgid "Czech"
 msgstr "捷克语"
 
@@ -1245,19 +1234,19 @@
 msgid "British English"
 msgstr "英国英语"
 
-#: src/about.c:167 src/about.c:198
+#: src/about.c:167 src/about.c:199
 msgid "German"
 msgstr "德语"
 
-#: src/about.c:168 src/about.c:199
+#: src/about.c:168 src/about.c:200
 msgid "Spanish"
 msgstr "西班牙语"
 
-#: src/about.c:169 src/about.c:200
+#: src/about.c:169 src/about.c:201
 msgid "Finnish"
 msgstr "芬兰语"
 
-#: src/about.c:170 src/about.c:201
+#: src/about.c:170 src/about.c:202
 msgid "French"
 msgstr "法语"
 
@@ -1269,11 +1258,11 @@
 msgid "Hungarian"
 msgstr "匈牙利语"
 
-#: src/about.c:173 src/about.c:203
+#: src/about.c:173 src/about.c:204
 msgid "Italian"
 msgstr "意大利语"
 
-#: src/about.c:174 src/about.c:205
+#: src/about.c:174 src/about.c:206
 msgid "Korean"
 msgstr "朝鲜语"
 
@@ -1282,154 +1271,158 @@
 msgstr "荷兰语"
 
 #: src/about.c:176
+msgid "Macedonian"
+msgstr "马其顿语"
+
+#: src/about.c:177
 msgid "Norwegian"
 msgstr "挪威语"
 
-#: src/about.c:177 src/about.c:206
+#: src/about.c:178 src/about.c:207
 msgid "Polish"
 msgstr "波兰语"
 
-#: src/about.c:178
+#: src/about.c:179
 msgid "Portuguese"
 msgstr "葡萄牙语"
 
-#: src/about.c:179
+#: src/about.c:180
 msgid "Portuguese-Brazil"
 msgstr "巴西葡萄牙语"
 
-#: src/about.c:180
+#: src/about.c:181
 msgid "Romanian"
 msgstr "罗马尼亚语"
 
-#: src/about.c:181 src/about.c:207
+#: src/about.c:182 src/about.c:208
 msgid "Russian"
 msgstr "俄语"
 
-#: src/about.c:182
+#: src/about.c:183
 msgid "Serbian"
 msgstr "塞尔维亚语"
 
-#: src/about.c:183 src/about.c:209
+#: src/about.c:184 src/about.c:210
 msgid "Swedish"
 msgstr "瑞典语"
 
-#: src/about.c:184
+#: src/about.c:185
 msgid "Vietnamese"
 msgstr "越南语"
 
-#: src/about.c:184
+#: src/about.c:185
 msgid "Gnome Vi Team"
 msgstr "Gnome 越南语团队"
 
-#: src/about.c:185
+#: src/about.c:186
 msgid "Simplified Chinese"
 msgstr "简体中文"
 
-#: src/about.c:186
+#: src/about.c:187
 msgid "Traditional Chinese"
 msgstr "繁体中文"
 
-#: src/about.c:193
+#: src/about.c:194
 msgid "Past Translators"
 msgstr "先前翻译者"
 
-#: src/about.c:194
+#: src/about.c:195
 msgid "Amharic"
 msgstr "阿姆哈拉语"
 
-#: src/about.c:195
+#: src/about.c:196
 msgid "Bulgarian"
 msgstr "保加利亚语"
 
-#: src/about.c:202
+#: src/about.c:203
 msgid "Hebrew"
 msgstr "希伯莱语"
 
-#: src/about.c:204
+#: src/about.c:205
 msgid "Japanese"
 msgstr "日语"
 
-#: src/about.c:208
+#: src/about.c:209
 msgid "Slovak"
 msgstr "斯洛伐克语"
 
-#: src/about.c:210
+#: src/about.c:211
 msgid "Chinese"
 msgstr "中文"
 
-#: src/account.c:275 src/protocols/jabber/jabber.c:1001
+#: src/account.c:279 src/protocols/jabber/jabber.c:992
 msgid "New passwords do not match."
 msgstr "新密码不相同。"
 
-#: src/account.c:283
+#: src/account.c:288
 msgid "Fill out all fields completely."
 msgstr "完全填入所有字段。"
 
-#: src/account.c:308
+#: src/account.c:313
 msgid "Original password"
 msgstr "旧密码"
 
-#: src/account.c:314
+#: src/account.c:320
 msgid "New password"
 msgstr "新密码"
 
-#: src/account.c:320
+#: src/account.c:327
 msgid "New password (again)"
 msgstr "再次输入新密码"
 
-#: src/account.c:325
+#: src/account.c:333
 #, c-format
 msgid "Change password for %s"
 msgstr "更改 %s 的密码"
 
-#: src/account.c:333
+#: src/account.c:341
 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:336 src/connection.c:198 src/dialogs.c:471 src/dialogs.c:527
-#: src/gtkblist.c:2285 src/gtkrequest.c:228 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:2557
-#: src/protocols/oscar/oscar.c:2638 src/protocols/oscar/oscar.c:6477
-#: src/protocols/oscar/oscar.c:6573 src/protocols/oscar/oscar.c:6622
-#: src/protocols/oscar/oscar.c:6704 src/protocols/yahoo/yahoo.c:2503
-#: src/protocols/yahoo/yahoo.c:2511 src/request.h:1237
+#: src/account.c:344 src/connection.c:198 src/dialogs.c:471 src/dialogs.c:527
+#: src/gtkblist.c:2317 src/gtkrequest.c:235 src/protocols/jabber/jabber.c:1037
+#: src/protocols/jabber/xdata.c:337 src/protocols/msn/msn.c:194
+#: src/protocols/msn/msn.c:205 src/protocols/msn/msn.c:216
+#: src/protocols/msn/msn.c:227 src/protocols/oscar/oscar.c:2562
+#: src/protocols/oscar/oscar.c:2643 src/protocols/oscar/oscar.c:6448
+#: src/protocols/oscar/oscar.c:6544 src/protocols/oscar/oscar.c:6593
+#: src/protocols/oscar/oscar.c:6675 src/protocols/yahoo/yahoo.c:2504
+#: src/protocols/yahoo/yahoo.c:2512 src/request.h:1240
 msgid "OK"
 msgstr "确定"
 
-#: src/account.c:337 src/account.c:371 src/connection.c:199 src/dialogs.c:305
+#: src/account.c:345 src/account.c:383 src/connection.c:199 src/dialogs.c:305
 #: src/dialogs.c:317 src/dialogs.c:330 src/dialogs.c:351 src/dialogs.c:472
 #: src/dialogs.c:528 src/dialogs.c:851 src/dialogs.c:872 src/dialogs.c:889
 #: src/dialogs.c:908 src/gtkaccount.c:1744 src/gtkaccount.c:2235
-#: src/gtkblist.c:2286 src/gtkblist.c:4271 src/gtkconn.c:168
-#: src/gtkimhtmltoolbar.c:397 src/gtkprivacy.c:575 src/gtkprivacy.c:588
-#: src/gtkprivacy.c:613 src/gtkprivacy.c:624 src/gtkrequest.c:229
+#: src/gtkblist.c:2318 src/gtkblist.c:4303 src/gtkconn.c:168
+#: src/gtkimhtmltoolbar.c:399 src/gtkprivacy.c:575 src/gtkprivacy.c:588
+#: src/gtkprivacy.c:613 src/gtkprivacy.c:624 src/gtkrequest.c:236
 #: src/protocols/icq/gaim_icq.c:277 src/protocols/jabber/buddy.c:514
-#: src/protocols/jabber/chat.c:692 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:2521
-#: src/protocols/oscar/oscar.c:2558 src/protocols/oscar/oscar.c:2594
-#: src/protocols/oscar/oscar.c:2639 src/protocols/oscar/oscar.c:6295
-#: src/protocols/oscar/oscar.c:6478 src/protocols/oscar/oscar.c:6574
-#: src/protocols/oscar/oscar.c:6623 src/protocols/oscar/oscar.c:6688
-#: src/protocols/oscar/oscar.c:6705 src/protocols/trepia/trepia.c:347
-#: src/protocols/yahoo/yahoo.c:2504 src/protocols/yahoo/yahoo.c:2512
-#: src/request.h:1237 src/request.h:1247
+#: src/protocols/jabber/chat.c:693 src/protocols/jabber/jabber.c:659
+#: src/protocols/jabber/jabber.c:1038 src/protocols/jabber/xdata.c:338
+#: src/protocols/msn/msn.c:195 src/protocols/msn/msn.c:206
+#: src/protocols/msn/msn.c:217 src/protocols/msn/msn.c:228
+#: src/protocols/msn/msn.c:241 src/protocols/oscar/oscar.c:2526
+#: src/protocols/oscar/oscar.c:2563 src/protocols/oscar/oscar.c:2599
+#: src/protocols/oscar/oscar.c:2644 src/protocols/oscar/oscar.c:6266
+#: src/protocols/oscar/oscar.c:6449 src/protocols/oscar/oscar.c:6545
+#: src/protocols/oscar/oscar.c:6594 src/protocols/oscar/oscar.c:6659
+#: src/protocols/oscar/oscar.c:6676 src/protocols/trepia/trepia.c:347
+#: src/protocols/yahoo/yahoo.c:2505 src/protocols/yahoo/yahoo.c:2513
+#: src/request.h:1240 src/request.h:1250
 msgid "Cancel"
 msgstr "取消"
 
-#: src/account.c:363
+#: src/account.c:374
 #, c-format
 msgid "Change user information for %s"
 msgstr "更改 %s 的用户信息"
 
-#: src/account.c:370 src/dialogs.c:839 src/gtkrequest.c:235
+#: src/account.c:382 src/dialogs.c:839 src/gtkrequest.c:242
 #: src/protocols/jabber/buddy.c:513 src/protocols/trepia/trepia.c:346
 msgid "Save"
 msgstr "保存"
@@ -1454,11 +1447,11 @@
 msgid "Set All Away"
 msgstr "全部设为离开"
 
-#: src/blist.c:579 src/gtkprefs.c:2502
+#: src/blist.c:590 src/gtkprefs.c:2530
 msgid "Chats"
 msgstr "聊天"
 
-#: src/blist.c:1181
+#: src/blist.c:1192
 #, c-format
 msgid ""
 "%d buddy from group %s was not removed because its account was not logged "
@@ -1470,25 +1463,25 @@
 "%2$s 组中的 %1$d 个好友未删除,原因是其账户未登入。这些好友和该组不会被删"
 "除。\n"
 
-#: src/blist.c:1190
+#: src/blist.c:1201
 msgid "Group not removed"
 msgstr "组未删除"
 
-#: src/blist.c:1240 src/gtkaccount.c:164 src/gtkft.c:153 src/gtkutils.c:860
+#: src/blist.c:1251 src/gtkaccount.c:164 src/gtkft.c:153 src/gtkutils.c:860
 #: src/protocols/jabber/buddy.c:569
 msgid "Unknown"
 msgstr "未知"
 
-#: src/blist.c:1567
+#: src/blist.c:1578
 msgid "Invalid Groupname"
 msgstr "组名无效"
 
-#: src/blist.c:2209
+#: src/blist.c:2220
 msgid ""
 "An error was encountered parsing your buddy list.  It has not been loaded."
 msgstr "处理您的好友列表时出错。好友列表未装入。"
 
-#: src/blist.c:2211
+#: src/blist.c:2222
 msgid "Buddy List Error"
 msgstr "好友列表出错"
 
@@ -1717,7 +1710,7 @@
 msgid "Enter an alias for this chat."
 msgstr "请输入此聊天的别名。"
 
-#: src/dialogs.c:871 src/dialogs.c:888 src/dialogs.c:907 src/gtkrequest.c:236
+#: src/dialogs.c:871 src/dialogs.c:888 src/dialogs.c:907 src/gtkrequest.c:243
 msgid "Alias"
 msgstr "别名"
 
@@ -1738,22 +1731,22 @@
 msgid "Alias Buddy"
 msgstr "好友别名"
 
-#: src/ft.c:139
+#: src/ft.c:144
 #, c-format
 msgid "%s is not a valid filename.\n"
 msgstr "%s 不是合法的文件名。\n"
 
-#: src/ft.c:152
+#: src/ft.c:157
 #, c-format
 msgid "%s was not found.\n"
 msgstr "%s 未找到。\n"
 
-#: src/ft.c:769
+#: src/ft.c:786
 #, c-format
 msgid "File transfer to %s aborted.\n"
 msgstr "您中止了给 %s 的文件传送。\n"
 
-#: src/ft.c:771
+#: src/ft.c:788
 #, c-format
 msgid "File transfer from %s aborted.\n"
 msgstr "%s 中止了给您的文件传送。\n"
@@ -1848,23 +1841,18 @@
 msgid "boring default"
 msgstr "烦死我了"
 
-#: src/gaimrc.c:1260 src/gtkblist.c:2888
+#: src/gaimrc.c:1260 src/gtkblist.c:2920
 msgid "Alphabetical"
 msgstr "字母序"
 
-#: src/gaimrc.c:1262 src/gtkblist.c:2889
+#: src/gaimrc.c:1262 src/gtkblist.c:2921
 msgid "By status"
 msgstr "按状态"
 
-#: src/gaimrc.c:1264 src/gtkblist.c:2890
+#: src/gaimrc.c:1264 src/gtkblist.c:2922
 msgid "By log size"
 msgstr "按日志大小"
 
-#: src/gaimrc.c:1549
-#, c-format
-msgid "Could not open config file %s."
-msgstr "无法打开配置文件 %s。"
-
 #: src/gtkaccount.c:289
 #, c-format
 msgid ""
@@ -1885,7 +1873,7 @@
 msgid "Protocol:"
 msgstr "协议:"
 
-#: src/gtkaccount.c:406 src/gtkblist.c:3876
+#: src/gtkaccount.c:406 src/gtkblist.c:3908
 msgid "Screen Name:"
 msgstr "用户名:"
 
@@ -1893,7 +1881,7 @@
 msgid "Password:"
 msgstr "密码:"
 
-#: src/gtkaccount.c:484 src/gtkblist.c:3890 src/gtkblist.c:4218
+#: src/gtkaccount.c:484 src/gtkblist.c:3922 src/gtkblist.c:4250
 msgid "Alias:"
 msgstr "别名:"
 
@@ -2017,7 +2005,7 @@
 msgid "Are you sure you want to delete %s?"
 msgstr "您真的想要删除 %s 吗?"
 
-#: src/gtkaccount.c:1743 src/gtkrequest.c:232
+#: src/gtkaccount.c:1743 src/gtkrequest.c:239
 msgid "Delete"
 msgstr "删除"
 
@@ -2025,10 +2013,10 @@
 msgid "Screen Name"
 msgstr "用户名"
 
-#: src/gtkaccount.c:1880 src/protocols/jabber/jabber.c:958
-#: src/protocols/oscar/oscar.c:2959 src/protocols/oscar/oscar.c:4750
-#: src/protocols/oscar/oscar.c:6415 src/protocols/yahoo/yahoo.c:2298
-#: src/protocols/zephyr/zephyr.c:1213 src/protocols/zephyr/zephyr.c:1223
+#: src/gtkaccount.c:1880 src/protocols/jabber/jabber.c:949
+#: src/protocols/oscar/oscar.c:2964 src/protocols/oscar/oscar.c:4742
+#: src/protocols/oscar/oscar.c:6386 src/protocols/yahoo/yahoo.c:2299
+#: src/protocols/zephyr/zephyr.c:1173 src/protocols/zephyr/zephyr.c:1183
 msgid "Online"
 msgstr "在线"
 
@@ -2060,212 +2048,212 @@
 msgstr "将用户加为好友吗?"
 
 #. Add button
-#: src/gtkaccount.c:2234 src/gtkblist.c:4270 src/gtkconv.c:1080
-#: src/gtkconv.c:3296 src/gtkconv.c:3387 src/gtkrequest.c:233
-#: src/protocols/icq/gaim_icq.c:277 src/protocols/oscar/oscar.c:2801
+#: src/gtkaccount.c:2234 src/gtkblist.c:4302 src/gtkconv.c:1108
+#: src/gtkconv.c:3339 src/gtkconv.c:3430 src/gtkrequest.c:240
+#: src/protocols/icq/gaim_icq.c:277 src/protocols/oscar/oscar.c:2806
 msgid "Add"
 msgstr "添加"
 
-#: src/gtkblist.c:803 src/gtkblist.c:4158
+#: src/gtkblist.c:801 src/gtkblist.c:4190
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
 msgstr "您目前登入的协议中没有一个可以聊天的。"
 
-#: src/gtkblist.c:816
+#: src/gtkblist.c:814
 msgid "Join a Chat"
 msgstr "加入聊天"
 
-#: src/gtkblist.c:837
+#: src/gtkblist.c:835
 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
+#: src/gtkblist.c:848 src/gtkpounce.c:361 src/gtkroomlist.c:365
 msgid "_Account:"
 msgstr "账户(_A):"
 
-#: src/gtkblist.c:1088 src/gtkblist.c:3077
+#: src/gtkblist.c:1086 src/gtkblist.c:3109
 msgid "Get _Info"
 msgstr "获取信息(_I)"
 
-#: src/gtkblist.c:1091 src/gtkblist.c:3068
+#: src/gtkblist.c:1089 src/gtkblist.c:3100
 msgid "I_M"
 msgstr "开聊(_M)"
 
+#: src/gtkblist.c:1091
+msgid "Add Buddy _Pounce"
+msgstr "添加好友千里眼(_P)"
+
 #: src/gtkblist.c:1093
-msgid "Add Buddy _Pounce"
-msgstr "添加好友千里眼(_P)"
-
-#: src/gtkblist.c:1095
 msgid "View _Log"
 msgstr "查看日志(_L)"
 
-#: src/gtkblist.c:1115 src/gtkblist.c:1187 src/gtkblist.c:1200
+#: src/gtkblist.c:1113 src/gtkblist.c:1214 src/gtkblist.c:1228
 msgid "_Alias..."
 msgstr "别名(_A)..."
 
-#: src/gtkblist.c:1117 src/gtkblist.c:1189 src/gtkblist.c:1205
+#: src/gtkblist.c:1115 src/gtkblist.c:1216 src/gtkblist.c:1233
 #: src/gtkconn.c:361
 msgid "_Remove"
 msgstr "删除(_R)"
 
-#: src/gtkblist.c:1162
+#: src/gtkblist.c:1160
 msgid "Add a _Buddy"
 msgstr "添加好友(_B)"
 
-#: src/gtkblist.c:1164
+#: src/gtkblist.c:1162
 msgid "Add a C_hat"
 msgstr "添加聊天(_H)"
 
-#: src/gtkblist.c:1166
+#: src/gtkblist.c:1164
 msgid "_Delete Group"
 msgstr "删除组(_D)"
 
-#: src/gtkblist.c:1168
+#: src/gtkblist.c:1166
 msgid "_Rename"
 msgstr "重命名(_R)"
 
 #. join button
-#: src/gtkblist.c:1182 src/gtkroomlist.c:261 src/gtkroomlist.c:417
+#: src/gtkblist.c:1192 src/gtkroomlist.c:261 src/gtkroomlist.c:417
 #: src/stock.c:87
 msgid "_Join"
 msgstr "加入(_J)"
 
-#: src/gtkblist.c:1184
+#: src/gtkblist.c:1194
 msgid "Auto-Join"
 msgstr "自动加入"
 
-#: src/gtkblist.c:1202 src/gtkblist.c:1228
+#: src/gtkblist.c:1230 src/gtkblist.c:1256
 msgid "_Collapse"
 msgstr "折叠(_C)"
 
-#: src/gtkblist.c:1233
+#: src/gtkblist.c:1261
 msgid "_Expand"
 msgstr "展开(_E)"
 
-#: src/gtkblist.c:1884 src/gtkconv.c:3874
+#: src/gtkblist.c:1918 src/gtkconv.c:3917
 msgid ""
 "You are not currently signed on with an account that can add that buddy."
 msgstr "您目前登入的协议中没有一个可以添加好友的。"
 
 #. Buddies menu
-#: src/gtkblist.c:2232
+#: src/gtkblist.c:2266
 msgid "/_Buddies"
 msgstr "/好友(_B)"
 
-#: src/gtkblist.c:2233
+#: src/gtkblist.c:2267
 msgid "/Buddies/New Instant _Message..."
 msgstr "/好友(B)/新即时消息(_M)..."
 
-#: src/gtkblist.c:2234
+#: src/gtkblist.c:2268
 msgid "/Buddies/Join a _Chat..."
 msgstr "/好友(B)/加入聊天(_C)..."
 
-#: src/gtkblist.c:2235
+#: src/gtkblist.c:2269
 msgid "/Buddies/Get User _Info..."
 msgstr "/好友(B)/获取用户信息(_I)..."
 
-#: src/gtkblist.c:2237
+#: src/gtkblist.c:2271
 msgid "/Buddies/Show _Offline Buddies"
 msgstr "/好友(B)/显示离线好友(_O)"
 
-#: src/gtkblist.c:2238
+#: src/gtkblist.c:2272
 msgid "/Buddies/Show _Empty Groups"
 msgstr "/好友(B)/显示空组(_E)"
 
-#: src/gtkblist.c:2239
+#: src/gtkblist.c:2273
 msgid "/Buddies/_Add Buddy..."
 msgstr "/好友(B)/添加好友(_A)..."
 
-#: src/gtkblist.c:2240
+#: src/gtkblist.c:2274
 msgid "/Buddies/Add C_hat..."
 msgstr "/好友(B)/添加聊天(_H)..."
 
-#: src/gtkblist.c:2241
+#: src/gtkblist.c:2275
 msgid "/Buddies/Add _Group..."
 msgstr "/好友(B)/添加组(_G)..."
 
-#: src/gtkblist.c:2243
+#: src/gtkblist.c:2277
 msgid "/Buddies/_Signoff"
 msgstr "/好友(B)/登出(_S)"
 
-#: src/gtkblist.c:2244
+#: src/gtkblist.c:2278
 msgid "/Buddies/_Quit"
 msgstr "/好友(B)/退出(_Q)"
 
 #. Tools
-#: src/gtkblist.c:2247
+#: src/gtkblist.c:2281
 msgid "/_Tools"
 msgstr "/工具(_T)"
 
-#: src/gtkblist.c:2248
+#: src/gtkblist.c:2282
 msgid "/Tools/_Away"
 msgstr "/工具(T)/离开(_A)"
 
-#: src/gtkblist.c:2249
+#: src/gtkblist.c:2283
 msgid "/Tools/Buddy _Pounce"
 msgstr "/工具(T)/好友千里眼(_P)"
 
-#: src/gtkblist.c:2250
+#: src/gtkblist.c:2284
 msgid "/Tools/P_rotocol Actions"
 msgstr "/工具(T)/协议操作(_R)"
 
-#: src/gtkblist.c:2252
+#: src/gtkblist.c:2286
 msgid "/Tools/A_ccounts"
 msgstr "/工具(T)/账户(_C)"
 
-#: src/gtkblist.c:2253
+#: src/gtkblist.c:2287
 msgid "/Tools/_File Transfers"
 msgstr "/工具(T)/文件传送(_F)"
 
-#: src/gtkblist.c:2254
+#: src/gtkblist.c:2288
 msgid "/Tools/R_oom List"
 msgstr "/工具(T)/房间列表(_O)"
 
-#: src/gtkblist.c:2255
+#: src/gtkblist.c:2289
 msgid "/Tools/Pr_eferences"
 msgstr "/工具(T)/首选项(_E)"
 
-#: src/gtkblist.c:2256
+#: src/gtkblist.c:2290
 msgid "/Tools/Pr_ivacy"
 msgstr "/工具(T)/隐私(_I)"
 
-#: src/gtkblist.c:2259
+#: src/gtkblist.c:2292
 msgid "/Tools/View System _Log"
 msgstr "/工具(T)/查看系统日志(_L)"
 
 #. Help
-#: src/gtkblist.c:2263
+#: src/gtkblist.c:2295
 msgid "/_Help"
 msgstr "/帮助(_H)"
 
-#: src/gtkblist.c:2264
+#: src/gtkblist.c:2296
 msgid "/Help/Online _Help"
 msgstr "/帮助(H)/在线帮助(_H)"
 
-#: src/gtkblist.c:2265
+#: src/gtkblist.c:2297
 msgid "/Help/_Debug Window"
 msgstr "/帮助(H)/调试窗口(_D)"
 
-#: src/gtkblist.c:2266
+#: src/gtkblist.c:2298
 msgid "/Help/_About"
 msgstr "/帮助(H)/关于(_A)"
 
-#: src/gtkblist.c:2282
+#: src/gtkblist.c:2314
 msgid "Rename Group"
 msgstr "重命名组"
 
-#: src/gtkblist.c:2282
+#: src/gtkblist.c:2314
 msgid "New group name"
 msgstr "新组名称"
 
-#: src/gtkblist.c:2283
+#: src/gtkblist.c:2315
 msgid "Please enter a new name for the selected group."
 msgstr "请输入选中组的新名字。"
 
-#: src/gtkblist.c:2311
+#: src/gtkblist.c:2343
 #, c-format
 msgid ""
 "\n"
@@ -2274,16 +2262,16 @@
 "\n"
 "<b>账户:</b>%s"
 
-#: src/gtkblist.c:2375 src/protocols/oscar/oscar.c:5778
+#: src/gtkblist.c:2407
 msgid "<b>Status:</b> Offline"
 msgstr "<b>状态:</b> 离线"
 
-#: src/gtkblist.c:2390
+#: src/gtkblist.c:2422
 #, c-format
 msgid "%d%%"
 msgstr "%d%%"
 
-#: src/gtkblist.c:2406
+#: src/gtkblist.c:2438
 msgid ""
 "\n"
 "<b>Account:</b>"
@@ -2291,7 +2279,7 @@
 "\n"
 "<b>账户:</b>"
 
-#: src/gtkblist.c:2407
+#: src/gtkblist.c:2439
 msgid ""
 "\n"
 "<b>Contact Alias:</b>"
@@ -2299,7 +2287,7 @@
 "\n"
 "<b>联系人别名:</b>"
 
-#: src/gtkblist.c:2408
+#: src/gtkblist.c:2440
 msgid ""
 "\n"
 "<b>Alias:</b>"
@@ -2307,7 +2295,7 @@
 "\n"
 "<b>别名:</b>"
 
-#: src/gtkblist.c:2409
+#: src/gtkblist.c:2441
 msgid ""
 "\n"
 "<b>Nickname:</b>"
@@ -2315,7 +2303,7 @@
 "\n"
 "<b>昵称:</b>"
 
-#: src/gtkblist.c:2410
+#: src/gtkblist.c:2442
 msgid ""
 "\n"
 "<b>Logged In:</b>"
@@ -2323,7 +2311,7 @@
 "\n"
 "<b>登入:</b>"
 
-#: src/gtkblist.c:2411
+#: src/gtkblist.c:2443
 msgid ""
 "\n"
 "<b>Idle:</b>"
@@ -2331,7 +2319,7 @@
 "\n"
 "<b>瞌睡:</b>"
 
-#: src/gtkblist.c:2412
+#: src/gtkblist.c:2444
 msgid ""
 "\n"
 "<b>Warned:</b>"
@@ -2339,7 +2327,7 @@
 "\n"
 "<b>警告:</b>"
 
-#: src/gtkblist.c:2414
+#: src/gtkblist.c:2446
 msgid ""
 "\n"
 "<b>Description:</b> Spooky"
@@ -2347,7 +2335,7 @@
 "\n"
 "<b>描述:</b>健谈"
 
-#: src/gtkblist.c:2415
+#: src/gtkblist.c:2447
 msgid ""
 "\n"
 "<b>Status</b>: Awesome"
@@ -2355,7 +2343,7 @@
 "\n"
 "<b>状态</b>:可怕"
 
-#: src/gtkblist.c:2416
+#: src/gtkblist.c:2448
 msgid ""
 "\n"
 "<b>Status</b>: Rockin'"
@@ -2363,77 +2351,77 @@
 "\n"
 "<b>状态</b>:混乱"
 
-#: src/gtkblist.c:2686
+#: src/gtkblist.c:2718
 #, c-format
 msgid "Idle (%dh%02dm) "
 msgstr "瞌睡中 (%d小时%02d分) "
 
-#: src/gtkblist.c:2688
+#: src/gtkblist.c:2720
 #, c-format
 msgid "Idle (%dm) "
 msgstr "瞌睡中 (%d分) "
 
-#: src/gtkblist.c:2693
+#: src/gtkblist.c:2725
 #, c-format
 msgid "Warned (%d%%) "
 msgstr "警告 (%d%%) "
 
-#: src/gtkblist.c:2696
+#: src/gtkblist.c:2728
 msgid "Offline "
 msgstr "离线 "
 
-#: src/gtkblist.c:2954
+#: src/gtkblist.c:2986
 msgid "/Tools/Away"
 msgstr "/工具(T)/离开(A)"
 
-#: src/gtkblist.c:2957
+#: src/gtkblist.c:2989
 msgid "/Tools/Buddy Pounce"
 msgstr "/工具(T)/好友千里眼(P)"
 
-#: src/gtkblist.c:2960
+#: src/gtkblist.c:2992
 msgid "/Tools/Protocol Actions"
 msgstr "/工具(T)/协议操作(R)"
 
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: src/gtkblist.c:3048
+#: src/gtkblist.c:3080
 msgid "/Buddies/Show Offline Buddies"
 msgstr "/好友(B)/显示离线好友(O)"
 
-#: src/gtkblist.c:3050
+#: src/gtkblist.c:3082
 msgid "/Buddies/Show Empty Groups"
 msgstr "/好友(B)/显示空组(E)"
 
-#: src/gtkblist.c:3074
+#: src/gtkblist.c:3106
 msgid "Send a message to the selected buddy"
 msgstr "向选中好友发送消息"
 
-#: src/gtkblist.c:3083
+#: src/gtkblist.c:3115
 msgid "Get information on the selected buddy"
 msgstr "获取选中好友的信息"
 
-#: src/gtkblist.c:3086
+#: src/gtkblist.c:3118
 msgid "_Chat"
 msgstr "聊天(_C)"
 
-#: src/gtkblist.c:3091
+#: src/gtkblist.c:3123
 msgid "Join a chat room"
 msgstr "加入聊天室"
 
-#: src/gtkblist.c:3094
+#: src/gtkblist.c:3126
 msgid "_Away"
 msgstr "离开(_A)"
 
-#: src/gtkblist.c:3099
+#: src/gtkblist.c:3131
 msgid "Set an away message"
 msgstr "设置离开消息"
 
-#: src/gtkblist.c:3831 src/protocols/yahoo/yahoo.c:2430
+#: src/gtkblist.c:3863 src/protocols/yahoo/yahoo.c:2431
 msgid "Add Buddy"
 msgstr "添加好友"
 
-#: src/gtkblist.c:3854
+#: src/gtkblist.c:3886
 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. "
@@ -2443,29 +2431,29 @@
 "的话,别名将会替代用户名显示。\n"
 
 #. Set up stuff for the account box
-#: src/gtkblist.c:3914 src/gtkblist.c:4198
+#: src/gtkblist.c:3946 src/gtkblist.c:4230
 msgid "Account:"
 msgstr "账户:"
 
-#: src/gtkblist.c:4165
+#: src/gtkblist.c:4197
 msgid "Add Chat"
 msgstr "添加聊天"
 
-#: src/gtkblist.c:4188
+#: src/gtkblist.c:4220
 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:4267
+#: src/gtkblist.c:4299
 msgid "Add Group"
 msgstr "添加组"
 
-#: src/gtkblist.c:4268
+#: src/gtkblist.c:4300
 msgid "Please enter the name of the group to be added."
 msgstr "请输入要添加的组名称。"
 
-#: src/gtkblist.c:4788
+#: src/gtkblist.c:4820
 msgid "No actions available"
 msgstr "没有可用的操作"
 
@@ -2527,309 +2515,309 @@
 msgid "Would you like to overwrite it?"
 msgstr "您是否想要覆盖?"
 
-#: src/gtkconv.c:478
+#: src/gtkconv.c:506
 msgid "Invite Buddy Into Chat Room"
 msgstr "邀请好友进入聊天室"
 
 #. Put our happy label in it.
-#: src/gtkconv.c:506
+#: src/gtkconv.c:534
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
 msgstr "您想要邀请谁?请输入他/她的名字,以及可选的邀请消息。"
 
-#: src/gtkconv.c:527
+#: src/gtkconv.c:555
 msgid "_Buddy:"
 msgstr "好友(_B):"
 
-#: src/gtkconv.c:547
+#: src/gtkconv.c:575
 msgid "_Message:"
 msgstr "消息(_M):"
 
-#: src/gtkconv.c:640
+#: src/gtkconv.c:668
 msgid "Find"
 msgstr "查找"
 
-#: src/gtkconv.c:666
+#: src/gtkconv.c:694
 msgid "_Search for:"
 msgstr "搜索文字(_S):"
 
-#: src/gtkconv.c:1038
+#: src/gtkconv.c:1066
 msgid "IM"
 msgstr "开聊"
 
-#: src/gtkconv.c:1046
+#: src/gtkconv.c:1074
 msgid "Un-Ignore"
 msgstr "取消忽略"
 
-#: src/gtkconv.c:1048 src/gtkprefs.c:803
+#: src/gtkconv.c:1076 src/gtkprefs.c:803
 msgid "Ignore"
 msgstr "忽略"
 
 #. Info button
-#: src/gtkconv.c:1057 src/gtkconv.c:3310
+#: src/gtkconv.c:1085 src/gtkconv.c:3353
 msgid "Info"
 msgstr "信息"
 
-#: src/gtkconv.c:1066
+#: src/gtkconv.c:1094
 msgid "Get Away Msg"
 msgstr "获得离开消息"
 
 #. Remove button
-#: src/gtkconv.c:1078 src/gtkconv.c:3303 src/gtkconv.c:3394
-#: src/gtkrequest.c:234
+#: src/gtkconv.c:1106 src/gtkconv.c:3346 src/gtkconv.c:3437
+#: src/gtkrequest.c:241
 msgid "Remove"
 msgstr "删除"
 
-#: src/gtkconv.c:2169
+#: src/gtkconv.c:2208
 msgid "Animate"
 msgstr "动画"
 
-#: src/gtkconv.c:2174
+#: src/gtkconv.c:2213
 msgid "Hide Icon"
 msgstr "隐藏图标"
 
-#: src/gtkconv.c:2180
+#: src/gtkconv.c:2219
 msgid "Save Icon As..."
 msgstr "图标另存为..."
 
-#: src/gtkconv.c:2543
+#: src/gtkconv.c:2586
 msgid "User is typing..."
 msgstr "用户正在打字..."
 
-#: src/gtkconv.c:2551
+#: src/gtkconv.c:2594
 msgid "User has typed something and paused"
 msgstr "用户打了几个字,停了一下"
 
 #. Build the Send As menu
-#: src/gtkconv.c:2654
+#: src/gtkconv.c:2697
 msgid "_Send As"
 msgstr "发送身份(_S)"
 
-#: src/gtkconv.c:3074
+#: src/gtkconv.c:3117
 msgid "Save Conversation"
 msgstr "保存对话"
 
 #. Conversation menu
-#: src/gtkconv.c:3091
+#: src/gtkconv.c:3134
 msgid "/_Conversation"
 msgstr "/对话(_C)"
 
-#: src/gtkconv.c:3093
+#: src/gtkconv.c:3136
 msgid "/Conversation/New Instant _Message..."
 msgstr "/对话(C)/新即时消息(_M)..."
 
-#: src/gtkconv.c:3098
+#: src/gtkconv.c:3141
 msgid "/Conversation/_Find..."
 msgstr "/对话(C)/查找(_F)..."
 
-#: src/gtkconv.c:3100
+#: src/gtkconv.c:3143
 msgid "/Conversation/View _Log"
 msgstr "/对话(C)/查看日志(_L)"
 
-#: src/gtkconv.c:3101
+#: src/gtkconv.c:3144
 msgid "/Conversation/_Save As..."
 msgstr "/对话(C)/另存为(_S)..."
 
-#: src/gtkconv.c:3106
+#: src/gtkconv.c:3149
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/对话(C)/添加好友千里眼(_P)..."
 
-#: src/gtkconv.c:3108
+#: src/gtkconv.c:3151
 msgid "/Conversation/_Get Info"
 msgstr "/对话(C)/获取信息(_G)"
 
-#: src/gtkconv.c:3110
+#: src/gtkconv.c:3153
 msgid "/Conversation/_Warn..."
 msgstr "/对话(C)/警告(_W)..."
 
-#: src/gtkconv.c:3112
+#: src/gtkconv.c:3155
 msgid "/Conversation/In_vite..."
 msgstr "/对话(C)/邀请(_V)..."
 
-#: src/gtkconv.c:3117
+#: src/gtkconv.c:3160
 msgid "/Conversation/A_lias..."
 msgstr "/对话(C)/别名(_L)..."
 
-#: src/gtkconv.c:3119
+#: src/gtkconv.c:3162
 msgid "/Conversation/_Block..."
 msgstr "/对话(C)/屏蔽(_B)..."
 
-#: src/gtkconv.c:3121
+#: src/gtkconv.c:3164
 msgid "/Conversation/_Add..."
 msgstr "/对话(C)/添加(_A)..."
 
-#: src/gtkconv.c:3123
+#: src/gtkconv.c:3166
 msgid "/Conversation/_Remove..."
 msgstr "/对话(C)/删除(_R)..."
 
-#: src/gtkconv.c:3128
+#: src/gtkconv.c:3171
 msgid "/Conversation/Insert Lin_k..."
 msgstr "/对话(C)/插入链接(_K)..."
 
-#: src/gtkconv.c:3130
+#: src/gtkconv.c:3173
 msgid "/Conversation/Insert Imag_e..."
 msgstr "/对话(C)/插入图像(_E)..."
 
-#: src/gtkconv.c:3135
+#: src/gtkconv.c:3178
 msgid "/Conversation/_Close"
 msgstr "/对话(C)/关闭(_C)"
 
 #. Options
-#: src/gtkconv.c:3139
+#: src/gtkconv.c:3182
 msgid "/_Options"
 msgstr "/选项(_O)"
 
-#: src/gtkconv.c:3140
+#: src/gtkconv.c:3183
 msgid "/Options/Enable _Logging"
 msgstr "/选项(O)/允许记录日志(_L)"
 
-#: src/gtkconv.c:3141
-msgid "/Options/Enable _Sounds"
-msgstr "/选项(O)/允许声音(_S)"
-
-#: src/gtkconv.c:3142
-msgid "/Options/Show Formatting _Toolbar"
-msgstr "/选项(O)/显示格式工具栏(_T)"
-
 #: src/gtkconv.c:3184
+msgid "/Options/Enable _Sounds"
+msgstr "/选项(O)/允许声音(_S)"
+
+#: src/gtkconv.c:3185
+msgid "/Options/Show Formatting _Toolbar"
+msgstr "/选项(O)/显示格式工具栏(_T)"
+
+#: src/gtkconv.c:3227
 msgid "/Conversation/View Log"
 msgstr "/对话(C)/查看日志(L)"
 
-#: src/gtkconv.c:3189
+#: src/gtkconv.c:3232
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/对话(C)/添加好友千里眼(P)..."
 
-#: src/gtkconv.c:3195
+#: src/gtkconv.c:3238
 msgid "/Conversation/Get Info"
 msgstr "/对话(C)/获取信息(G)"
 
-#: src/gtkconv.c:3199
+#: src/gtkconv.c:3242
 msgid "/Conversation/Warn..."
 msgstr "/对话(C)/警告(W)..."
 
-#: src/gtkconv.c:3203
+#: src/gtkconv.c:3246
 msgid "/Conversation/Invite..."
 msgstr "/对话(C)/邀请(V)..."
 
-#: src/gtkconv.c:3209
+#: src/gtkconv.c:3252
 msgid "/Conversation/Alias..."
 msgstr "/对话(C)/别名(L)..."
 
-#: src/gtkconv.c:3213
+#: src/gtkconv.c:3256
 msgid "/Conversation/Block..."
 msgstr "/对话(C)/屏蔽(B)..."
 
-#: src/gtkconv.c:3217
+#: src/gtkconv.c:3260
 msgid "/Conversation/Add..."
 msgstr "/对话(C)/添加(A)..."
 
-#: src/gtkconv.c:3221
+#: src/gtkconv.c:3264
 msgid "/Conversation/Remove..."
 msgstr "/对话(C)/删除(R)..."
 
-#: src/gtkconv.c:3227
+#: src/gtkconv.c:3270
 msgid "/Conversation/Insert Link..."
 msgstr "/对话(C)/插入链接(K)..."
 
-#: src/gtkconv.c:3231
+#: src/gtkconv.c:3274
 msgid "/Conversation/Insert Image..."
 msgstr "/对话(C)/插入图像(I)..."
 
-#: src/gtkconv.c:3237
+#: src/gtkconv.c:3280
 msgid "/Options/Enable Logging"
 msgstr "/选项(O)/允许记录(L)"
 
-#: src/gtkconv.c:3240
+#: src/gtkconv.c:3283
 msgid "/Options/Enable Sounds"
 msgstr "/选项(O)/允许声音(S)"
 
-#: src/gtkconv.c:3243
+#: src/gtkconv.c:3286
 msgid "/Options/Show Formatting Toolbar"
 msgstr "/选项(O)/显示格式工具栏(T)"
 
 #. From right to left...
 #. Send button
-#: src/gtkconv.c:3266 src/gtkconv.c:3268 src/gtkconv.c:3366 src/gtkconv.c:3368
+#: src/gtkconv.c:3309 src/gtkconv.c:3311 src/gtkconv.c:3409 src/gtkconv.c:3411
 msgid "Send"
 msgstr "发送"
 
 #. Now, um, just kind of all over the place. Huh?
 #. Warn button
-#: src/gtkconv.c:3282
+#: src/gtkconv.c:3325
 msgid "Warn"
 msgstr "警告"
 
-#: src/gtkconv.c:3285
+#: src/gtkconv.c:3328
 msgid "Warn the user"
 msgstr "警告用户"
 
 #. Block button
-#: src/gtkconv.c:3289 src/gtkprivacy.c:612 src/gtkprivacy.c:623
+#: src/gtkconv.c:3332 src/gtkprivacy.c:612 src/gtkprivacy.c:623
 msgid "Block"
 msgstr "屏蔽"
 
-#: src/gtkconv.c:3292
+#: src/gtkconv.c:3335
 msgid "Block the user"
 msgstr "屏蔽用户"
 
-#: src/gtkconv.c:3299
+#: src/gtkconv.c:3342
 msgid "Add the user to your buddy list"
 msgstr "将用户加为好友"
 
-#: src/gtkconv.c:3306
+#: src/gtkconv.c:3349
 msgid "Remove the user from your buddy list"
 msgstr "从您的好友列表中删除该用户"
 
-#: src/gtkconv.c:3313 src/gtkconv.c:3635
+#: src/gtkconv.c:3356 src/gtkconv.c:3678
 msgid "Get the user's information"
 msgstr "获取用户信息"
 
 #. Invite
-#: src/gtkconv.c:3380
+#: src/gtkconv.c:3423
 msgid "Invite"
 msgstr "邀请"
 
-#: src/gtkconv.c:3383
+#: src/gtkconv.c:3426
 msgid "Invite a user"
 msgstr "邀请用户"
 
-#: src/gtkconv.c:3390
+#: src/gtkconv.c:3433
 msgid "Add the chat to your buddy list"
 msgstr "将聊天添加到您的好友列表"
 
-#: src/gtkconv.c:3397
+#: src/gtkconv.c:3440
 msgid "Remove the chat from your buddy list"
 msgstr "从您的好友列表中删除聊天"
 
-#: src/gtkconv.c:3497
+#: src/gtkconv.c:3540
 msgid "Topic:"
 msgstr "话题:"
 
 #. Setup the label telling how many people are in the room.
-#: src/gtkconv.c:3557
+#: src/gtkconv.c:3600
 msgid "0 people in room"
 msgstr "聊天室里没有人"
 
-#: src/gtkconv.c:3612
+#: src/gtkconv.c:3655
 msgid "IM the user"
 msgstr "给用户发送即时消息"
 
-#: src/gtkconv.c:3624
+#: src/gtkconv.c:3667
 msgid "Ignore the user"
 msgstr "忽略用户"
 
-#: src/gtkconv.c:4165
+#: src/gtkconv.c:4208
 msgid "Close conversation"
 msgstr "关闭对话"
 
-#: src/gtkconv.c:4675 src/gtkconv.c:4707 src/gtkconv.c:4828 src/gtkconv.c:4895
+#: src/gtkconv.c:4736 src/gtkconv.c:4768 src/gtkconv.c:4889 src/gtkconv.c:4956
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "聊天室里有 %d 个人"
 
-#: src/gtkconv.c:5414 src/gtkconv.c:5417
+#: src/gtkconv.c:5475 src/gtkconv.c:5478
 msgid "<main>/Conversation/Close"
 msgstr "<main>/对话(C)/关闭(C)"
 
@@ -2961,126 +2949,147 @@
 msgid "Save As..."
 msgstr "另存为..."
 
-#: src/gtkft.c:1181
+#: src/gtkft.c:1183
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "%s 想要给您发送 %s (%s)"
 
-#: src/gtkimhtml.c:858
+#: src/gtkft.c:1216
+#, c-format
+msgid "Accept file transfer request from %s?"
+msgstr "接受来自 %s 的文件传送吗?"
+
+#: src/gtkft.c:1220
+#, c-format
+msgid ""
+"A file is available for download from:\n"
+"Remote host: %s\n"
+"Remote port: %d"
+msgstr ""
+"可从以下地址下载文件:\n"
+"远程主机: %s\n"
+"远程端口: %d"
+
+#: src/gtkimhtml.c:1107
 msgid "_Copy E-Mail Address"
-msgstr "电子邮件地址(_C)"
-
-#: src/gtkimhtml.c:870
+msgstr "复制电子邮件地址(_C)"
+
+#: src/gtkimhtml.c:1119
 msgid "_Copy Link Location"
 msgstr "复制链接地址(_C)"
 
-#: src/gtkimhtml.c:880
+#: src/gtkimhtml.c:1129
 msgid "_Open Link in Browser"
 msgstr "在浏览器中打开链接(_O)"
 
-#: src/gtkimhtml.c:2310
+#: src/gtkimhtml.c:2614
 msgid ""
 "Unable to guess the image type based on the file extension supplied.  "
 "Defaulting to PNG."
 msgstr "Gaim 无法根据提供的文件扩展名猜测图像类型。按默认值视为 PNG。"
 
-#: src/gtkimhtml.c:2318
+#: src/gtkimhtml.c:2622
 #, c-format
 msgid "Error saving image: %s"
 msgstr "保存图像出错:%s"
 
-#: src/gtkimhtml.c:2327
+#: src/gtkimhtml.c:2631
 msgid "Save Image"
 msgstr "保存图像"
 
-#: src/gtkimhtml.c:2350
+#: src/gtkimhtml.c:2654
 msgid "_Save Image..."
 msgstr "保存图像(_S)..."
 
-#: src/gtkimhtmltoolbar.c:381
+#: src/gtkimhtmltoolbar.c:383
 msgid "_URL"
 msgstr "_URL"
 
-#: src/gtkimhtmltoolbar.c:385
+#: src/gtkimhtmltoolbar.c:387
 msgid "_Description"
 msgstr "描述(_D)"
 
-#: src/gtkimhtmltoolbar.c:390
+#: src/gtkimhtmltoolbar.c:392
 msgid "Insert Link"
 msgstr "插入链接"
 
-#: src/gtkimhtmltoolbar.c:392
+#: src/gtkimhtmltoolbar.c:394
 msgid ""
 "Please enter the URL and description of the link that you want to insert. "
 "The description is optional."
 msgstr "请输入您想要插入的 URL 和链接描述。描述是可选的。"
 
-#: src/gtkimhtmltoolbar.c:396
+#: src/gtkimhtmltoolbar.c:398
 msgid "_Insert"
 msgstr "插入(_I)"
 
-#: src/gtkimhtmltoolbar.c:453
+#: src/gtkimhtmltoolbar.c:455
 #, c-format
 msgid "Failed to store image: %s\n"
 msgstr "存储图像失败: %s\n"
 
-#: src/gtkimhtmltoolbar.c:479
+#: src/gtkimhtmltoolbar.c:481
 msgid "Insert Image"
 msgstr "插入图像"
 
 #. show everything
-#: src/gtkimhtmltoolbar.c:623
+#: src/gtkimhtmltoolbar.c:625
 msgid "Smile!"
 msgstr "笑脸"
 
-#: src/gtkimhtmltoolbar.c:811
+#: src/gtkimhtmltoolbar.c:825
 msgid "Bold"
 msgstr "粗体"
 
-#: src/gtkimhtmltoolbar.c:822
+#: src/gtkimhtmltoolbar.c:836
 msgid "Italic"
 msgstr "斜体"
 
-#: src/gtkimhtmltoolbar.c:833
+#: src/gtkimhtmltoolbar.c:847
 msgid "Underline"
 msgstr "下划线"
 
-#: src/gtkimhtmltoolbar.c:849
+#: src/gtkimhtmltoolbar.c:863
 msgid "Larger font size"
 msgstr "较大字体"
 
-#: src/gtkimhtmltoolbar.c:861
+#: src/gtkimhtmltoolbar.c:875
 msgid "Smaller font size"
 msgstr "较小字体"
 
-#: src/gtkimhtmltoolbar.c:878
+#: src/gtkimhtmltoolbar.c:892
 msgid "Font Face"
 msgstr "字体"
 
-#: src/gtkimhtmltoolbar.c:890
+#: src/gtkimhtmltoolbar.c:904
 msgid "Foreground font color"
 msgstr "字体颜色"
 
-#: src/gtkimhtmltoolbar.c:902
+#: src/gtkimhtmltoolbar.c:916
 msgid "Background color"
 msgstr "背景颜色"
 
-#: src/gtkimhtmltoolbar.c:917
+#: src/gtkimhtmltoolbar.c:931
 msgid "Insert link"
 msgstr "插入链接"
 
-#: src/gtkimhtmltoolbar.c:927
+#: src/gtkimhtmltoolbar.c:941
 msgid "Insert image"
 msgstr "插入图像"
 
-#: src/gtkimhtmltoolbar.c:938
+#: src/gtkimhtmltoolbar.c:952
 msgid "Insert smiley"
 msgstr "插入笑脸"
 
-#: src/gtklog.c:257
+#: src/gtklog.c:282
 msgid "Conversations with"
 msgstr "交谈对象"
 
+#. Window **********
+#: src/gtklog.c:368 src/gtklog.c:384
+msgid "System Log"
+msgstr "系统日志"
+
 #. Descriptive label
 #: src/gtknotify.c:217
 #, c-format
@@ -3306,7 +3315,7 @@
 msgid "Icon"
 msgstr "图标"
 
-#: src/gtkprefs.c:623 src/gtkprefs.c:2037 src/protocols/jabber/buddy.c:265
+#: src/gtkprefs.c:623 src/gtkprefs.c:2065 src/protocols/jabber/buddy.c:265
 #: src/protocols/jabber/buddy.c:748 src/protocols/jabber/chat.c:684
 msgid "Description"
 msgstr "描述"
@@ -3320,7 +3329,7 @@
 msgstr "粗体(_B)"
 
 #: src/gtkprefs.c:693
-msgid "_Italics"
+msgid "_Italic"
 msgstr "斜体(_I)"
 
 #: src/gtkprefs.c:695
@@ -3495,11 +3504,11 @@
 msgstr "位置(_P):"
 
 #: src/gtkprefs.c:922
-msgid "Send _URLs as Links"
+msgid "Send _URLs as links"
 msgstr "将 URLs 发送为链接(_U)"
 
 #: src/gtkprefs.c:925
-msgid "Show _Formatting Toolbar"
+msgid "Show _formatting toolbar"
 msgstr "显示格式工具栏(_F)"
 
 #: src/gtkprefs.c:928
@@ -3610,7 +3619,8 @@
 msgid "Co_lorize screen names"
 msgstr "用户名着色(_L)"
 
-#: src/gtkprefs.c:1097
+#: src/gtkprefs.c:1097 src/protocols/oscar/oscar.c:4138
+#: src/protocols/oscar/oscar.c:5708
 msgid "IP Address"
 msgstr "IP 地址"
 
@@ -3723,55 +3733,83 @@
 "手动(_M):\n"
 "(%s 代表 URL)"
 
-#: src/gtkprefs.c:1447
+#: src/gtkprefs.c:1451
 msgid "Message Logs"
 msgstr "消息日志"
 
-#: src/gtkprefs.c:1450
+#: src/gtkprefs.c:1454
 msgid "Log _Format:"
 msgstr "日志格式(_F):"
 
-#: src/gtkprefs.c:1453
+#: src/gtkprefs.c:1457
 msgid "_Log all instant messages"
 msgstr "记录所有即时消息(_L)"
 
-#: src/gtkprefs.c:1455
+#: src/gtkprefs.c:1459
 msgid "Log all c_hats"
 msgstr "记录所有聊天(_H)"
 
-#: src/gtkprefs.c:1510
+#: src/gtkprefs.c:1462
+msgid "System Logs"
+msgstr "系统日志"
+
+#: src/gtkprefs.c:1464
+msgid "_Enable system log"
+msgstr "启用系统日志(_E)"
+
+#: src/gtkprefs.c:1467
+msgid "Log when buddies _sign on/sign off"
+msgstr "记录好友的登入/登出(_S)"
+
+#: src/gtkprefs.c:1473
+msgid "Log when buddies become _idle/un-idle"
+msgstr "记录好友的瞌睡/睡醒(_I)"
+
+#: src/gtkprefs.c:1479
+msgid "Log when buddies go away/come _back"
+msgstr "记录好友的离开/回来(_B)"
+
+#: src/gtkprefs.c:1485
+msgid "Log your _own signons/idleness/awayness"
+msgstr "记录您自己的登入/瞌睡/离开(_O)"
+
+#: src/gtkprefs.c:1536
 msgid "Sound Options"
 msgstr "声音选项"
 
-#: src/gtkprefs.c:1511
+#: src/gtkprefs.c:1537
 msgid "_No sounds when you log in"
 msgstr "您登入时无声(_N)"
 
-#: src/gtkprefs.c:1513
+#: src/gtkprefs.c:1539
+msgid "Sounds when conversation has _focus"
+msgstr "对话获得焦点后发声(_F)"
+
+#: src/gtkprefs.c:1541
 msgid "_Sounds while away"
 msgstr "离开时发声(_S)"
 
-#: src/gtkprefs.c:1517
+#: src/gtkprefs.c:1545
 msgid "Sound Method"
 msgstr "声音方式"
 
-#: src/gtkprefs.c:1518
+#: src/gtkprefs.c:1546
 msgid "_Method:"
 msgstr "方式(_M):"
 
-#: src/gtkprefs.c:1520
+#: src/gtkprefs.c:1548
 msgid "Console beep"
 msgstr "控制台响铃"
 
-#: src/gtkprefs.c:1522
+#: src/gtkprefs.c:1550
 msgid "Automatic"
 msgstr "自动"
 
-#: src/gtkprefs.c:1529
+#: src/gtkprefs.c:1557
 msgid "Command"
 msgstr "命令"
 
-#: src/gtkprefs.c:1539
+#: src/gtkprefs.c:1567
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -3780,72 +3818,72 @@
 "声音命令(_O):\n"
 "(%s 代表文件名)"
 
-#: src/gtkprefs.c:1596
+#: src/gtkprefs.c:1624
 msgid "_Sending messages removes away status"
 msgstr "发送消息就取消离开的状态(_S)"
 
-#: src/gtkprefs.c:1598
+#: src/gtkprefs.c:1626
 msgid "_Queue new messages when away"
 msgstr "离开时把新消息存入队列(_Q)"
 
-#: src/gtkprefs.c:1601
+#: src/gtkprefs.c:1629
 msgid "Auto-response"
 msgstr "自动回复"
 
-#: src/gtkprefs.c:1604
+#: src/gtkprefs.c:1632
 msgid "Seconds before _resending:"
 msgstr "重发前等的秒数(_R):"
 
-#: src/gtkprefs.c:1607
+#: src/gtkprefs.c:1635
 msgid "_Send auto-response"
 msgstr "发送自动回复(_S)"
 
-#: src/gtkprefs.c:1609
+#: src/gtkprefs.c:1637
 msgid "_Only send auto-response when idle"
 msgstr "仅在打瞌睡时发送自动回复(_O)"
 
-#: src/gtkprefs.c:1611
+#: src/gtkprefs.c:1639
 msgid "Send auto-response in _active conversations"
 msgstr "在当前对话中发送自动回复(_A)"
 
-#: src/gtkprefs.c:1620 src/protocols/msn/state.c:30
-#: src/protocols/yahoo/yahoo.c:2294
+#: src/gtkprefs.c:1648 src/protocols/msn/state.c:30
+#: src/protocols/yahoo/yahoo.c:2295
 msgid "Idle"
 msgstr "瞌睡"
 
-#: src/gtkprefs.c:1621
+#: src/gtkprefs.c:1649
 msgid "Idle _time reporting:"
 msgstr "瞌睡时间报告(_T):"
 
-#: src/gtkprefs.c:1624
+#: src/gtkprefs.c:1652
 msgid "Gaim usage"
 msgstr "Gaim 使用"
 
-#: src/gtkprefs.c:1627
+#: src/gtkprefs.c:1655
 msgid "X usage"
 msgstr "X 使用"
 
-#: src/gtkprefs.c:1629
+#: src/gtkprefs.c:1657
 msgid "Windows usage"
 msgstr "窗口使用"
 
-#: src/gtkprefs.c:1637
+#: src/gtkprefs.c:1665
 msgid "Auto-away"
 msgstr "自动离开"
 
-#: src/gtkprefs.c:1638
+#: src/gtkprefs.c:1666
 msgid "Set away _when idle"
 msgstr "瞌睡后即设置离开(_W)"
 
-#: src/gtkprefs.c:1642
+#: src/gtkprefs.c:1670
 msgid "_Minutes before setting away:"
 msgstr "设置离开前等几分钟(_M):"
 
-#: src/gtkprefs.c:1650
+#: src/gtkprefs.c:1678
 msgid "Away m_essage:"
 msgstr "离开消息(_E):"
 
-#: src/gtkprefs.c:1805
+#: src/gtkprefs.c:1833
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -3860,7 +3898,7 @@
 "<span weight=\"bold\">网站:</span>\t\t%s\n"
 "<span weight=\"bold\">文件名:</span>\t%s"
 
-#: src/gtkprefs.c:1810
+#: src/gtkprefs.c:1838
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -3875,108 +3913,108 @@
 "<span weight=\"bold\">URL:</span>  %s\n"
 "<span weight=\"bold\">文件名:</span>  %s"
 
-#: src/gtkprefs.c:1993
+#: src/gtkprefs.c:2021
 msgid "Load"
 msgstr "装入"
 
-#: src/gtkprefs.c:2007
+#: src/gtkprefs.c:2035
 msgid "Summary"
 msgstr "概览"
 
-#: src/gtkprefs.c:2055
+#: src/gtkprefs.c:2083
 msgid "Details"
 msgstr "细节"
 
-#: src/gtkprefs.c:2182
+#: src/gtkprefs.c:2210
 msgid "Sound Selection"
 msgstr "声音选择"
 
-#: src/gtkprefs.c:2289
+#: src/gtkprefs.c:2317
 msgid "Play"
 msgstr "播放"
 
-#: src/gtkprefs.c:2296
+#: src/gtkprefs.c:2324
 msgid "Event"
 msgstr "事件"
 
-#: src/gtkprefs.c:2315
+#: src/gtkprefs.c:2343
 msgid "Test"
 msgstr "测试"
 
-#: src/gtkprefs.c:2319
+#: src/gtkprefs.c:2347
 msgid "Reset"
 msgstr "重置"
 
-#: src/gtkprefs.c:2323
+#: src/gtkprefs.c:2351
 msgid "Choose..."
 msgstr "选择..."
 
-#: src/gtkprefs.c:2458
+#: src/gtkprefs.c:2486
 msgid "_Edit"
 msgstr "编辑(_E)"
 
-#: src/gtkprefs.c:2494
+#: src/gtkprefs.c:2522
 msgid "Interface"
 msgstr "界面"
 
-#: src/gtkprefs.c:2495
+#: src/gtkprefs.c:2523
 msgid "Smiley Themes"
 msgstr "笑脸主题"
 
-#: src/gtkprefs.c:2496
+#: src/gtkprefs.c:2524
 msgid "Fonts"
 msgstr "字体"
 
-#: src/gtkprefs.c:2497
+#: src/gtkprefs.c:2525
 msgid "Message Text"
 msgstr "消息文本"
 
-#: src/gtkprefs.c:2498
+#: src/gtkprefs.c:2526
 msgid "Shortcuts"
 msgstr "快捷键"
 
-#: src/gtkprefs.c:2501
+#: src/gtkprefs.c:2529
 msgid "IMs"
 msgstr "即时消息"
 
-#: src/gtkprefs.c:2503
+#: src/gtkprefs.c:2531
 msgid "Network"
 msgstr "网络"
 
-#: src/gtkprefs.c:2504
+#: src/gtkprefs.c:2532
 msgid "Proxy"
 msgstr "代理"
 
 #. We use the registered default browser in windows
-#: src/gtkprefs.c:2507
+#: src/gtkprefs.c:2535
 msgid "Browser"
 msgstr "浏览器"
 
-#: src/gtkprefs.c:2509
+#: src/gtkprefs.c:2537
 msgid "Logging"
 msgstr "日志"
 
-#: src/gtkprefs.c:2510
+#: src/gtkprefs.c:2538
 msgid "Sounds"
 msgstr "声音"
 
-#: src/gtkprefs.c:2511
+#: src/gtkprefs.c:2539
 msgid "Sound Events"
 msgstr "声音事件"
 
-#: src/gtkprefs.c:2512
+#: src/gtkprefs.c:2540
 msgid "Away / Idle"
 msgstr "离开/瞌睡"
 
-#: src/gtkprefs.c:2513
+#: src/gtkprefs.c:2541
 msgid "Away Messages"
 msgstr "离开消息"
 
-#: src/gtkprefs.c:2515
+#: src/gtkprefs.c:2543
 msgid "Protocols"
 msgstr "协议"
 
-#: src/gtkprefs.c:2531
+#: src/gtkprefs.c:2559
 msgid "Plugins"
 msgstr "插件"
 
@@ -4000,7 +4038,7 @@
 msgid "Block only the users below"
 msgstr "只屏蔽以下用户"
 
-#: src/gtkprivacy.c:374 src/protocols/jabber/jabber.c:1406
+#: src/gtkprivacy.c:374 src/protocols/jabber/jabber.c:1398
 msgid "Privacy"
 msgstr "隐私"
 
@@ -4064,19 +4102,19 @@
 #. *
 #. * A wrapper for gaim_request_action() that uses Yes and No buttons.
 #.
-#: src/gtkrequest.c:226 src/protocols/gg/gg.c:663 src/request.h:1228
+#: src/gtkrequest.c:233 src/protocols/gg/gg.c:663 src/request.h:1231
 msgid "Yes"
 msgstr "是"
 
-#: src/gtkrequest.c:227 src/protocols/gg/gg.c:663 src/request.h:1228
+#: src/gtkrequest.c:234 src/protocols/gg/gg.c:663 src/request.h:1231
 msgid "No"
 msgstr "否"
 
-#: src/gtkrequest.c:230
+#: src/gtkrequest.c:237
 msgid "Apply"
 msgstr "应用"
 
-#: src/gtkrequest.c:231 src/protocols/msn/msn.c:248
+#: src/gtkrequest.c:238 src/protocols/msn/msn.c:260
 msgid "Close"
 msgstr "关闭"
 
@@ -4135,18 +4173,18 @@
 msgid "Someone says your name in chat"
 msgstr "别人在聊天中提到您的名字"
 
-#: src/gtksound.c:157
+#: src/gtksound.c:158
 #, c-format
 msgid "Unable to play sound because the chosen file (%s) does not exist."
 msgstr "无法播放声音,原因是所选的文件(%s)不存在。"
 
-#: src/gtksound.c:173
+#: src/gtksound.c:174
 msgid ""
 "Unable to play sound because the 'Command' sound method has been chosen, but "
 "no command has been set."
 msgstr "无法播放声音,原因是选择了“命令”声音方法,但没有设置命令。"
 
-#: src/gtksound.c:185
+#: src/gtksound.c:186
 #, c-format
 msgid ""
 "Unable to play sound because the configured sound command could not be "
@@ -4161,15 +4199,15 @@
 msgid "Save Icon"
 msgstr "保存图标"
 
-#: src/log.c:88
+#: src/log.c:106
 msgid "<b><font color=\"red\">The logger has no read function</font></b>"
 msgstr "<b><font color\"=red\">登录程序没有读取功能</font></b>"
 
-#: src/log.c:433
+#: src/log.c:476
 msgid "XML"
 msgstr "XML"
 
-#: src/log.c:514
+#: src/log.c:561
 #, c-format
 msgid ""
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -4178,7 +4216,7 @@
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;自动回复&gt;:"
 "</b></font> %s<br/>\n"
 
-#: src/log.c:516
+#: src/log.c:563
 #, c-format
 msgid ""
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -4187,50 +4225,50 @@
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;自动回复&gt;:"
 "</b></font> %s<br/>\n"
 
-#: src/log.c:560 src/log.c:696
+#: src/log.c:614 src/log.c:800
 msgid "<font color=\"red\"><b>Unable to find log path!</b></font>"
 msgstr "<font color=\"red\"><b>找不到日志路径!</b></font>"
 
-#: src/log.c:570 src/log.c:708
+#: src/log.c:624 src/log.c:812
 #, 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:574
+#: src/log.c:661
 msgid "HTML"
 msgstr "HTML"
 
-#: src/log.c:649
+#: src/log.c:745
 #, c-format
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <自动回复>: %s\n"
 
-#: src/log.c:712
+#: src/log.c:845
 msgid "Plain text"
 msgstr "纯文本"
 
-#: src/main.c:157
+#: src/main.c:156
 msgid "Please create an account."
 msgstr "请创建一个账户。"
 
-#: src/main.c:239
+#: src/main.c:238
 msgid "Login"
 msgstr "登入"
 
-#: src/main.c:257
+#: src/main.c:256
 msgid "<b>Screen Name:</b>"
 msgstr "<b>用户名:</b>"
 
-#: src/main.c:271
+#: src/main.c:270
 msgid "<b>Password:</b>"
 msgstr "<b>密码:</b>"
 
-#: src/main.c:300
+#: src/main.c:299
 msgid "Sign on"
 msgstr "登入"
 
 #. full help text
-#: src/main.c:524
+#: src/main.c:523
 #, c-format
 msgid ""
 "Gaim %s\n"
@@ -4243,7 +4281,7 @@
 "                      account(s) to use, seperated by commas)\n"
 "  -n, --loginwin      don't automatically login; show login window\n"
 "  -u, --user=NAME     use account NAME\n"
-"  -f, --file=FILE     use FILE as config\n"
+"  -c, --config=DIR    use DIR for config files\n"
 "  -d, --debug         print debugging messages to stdout\n"
 "  -v, --version       display the current version and exit\n"
 "  -h, --help          display this help and exit\n"
@@ -4252,17 +4290,18 @@
 "用法:%s [选项]...\n"
 "\n"
 "  -a, --acct          显示账户编辑窗口\n"
-"  -w, --away[=消息]   登入后设为离开(“消息”指定要使用的离开消息名称)\n"
+"  -w, --away[=消息]   登入后设为离开(可选“消息”指定要使用的离开消息名称)\n"
 "  -l, --login[=名称]  自动登入(可选“名称”指定要使用的账户,用逗号分隔)\n"
 "  -n, --loginwin      不自动登入;显示登录窗口\n"
 "  -u, --user=名称     使用指定账户\n"
 "  -f, --file=文件     使用指定文件的配置\n"
+"  -c, --config=目录   使用“目录”存储配置文件\n"
 "  -d, --debug         将调试信息打印到标准输出\n"
 "  -v, --version       显示当前版本并退出\n"
 "  -h, --help          显示帮助并退出\n"
 
 #. short message
-#: src/main.c:539
+#: src/main.c:538
 #, c-format
 msgid "Gaim %s. Try `%s -h' for more information.\n"
 msgstr "Gaim %s。试试“%s -h”查看帮助。\n"
@@ -4287,11 +4326,11 @@
 msgid "Slightly less boring default"
 msgstr "烦死我了"
 
-#: src/protocols/gg/gg.c:49 src/protocols/jabber/jutil.c:111
-#: src/protocols/msn/msn.c:347 src/protocols/msn/state.c:27
+#: src/protocols/gg/gg.c:49 src/protocols/jabber/jutil.c:44
+#: src/protocols/msn/msn.c:359 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:2598
-#: src/protocols/yahoo/yahoo.c:2713
+#: src/protocols/msn/state.c:36 src/protocols/oscar/oscar.c:5727
+#: src/protocols/yahoo/yahoo.c:2599 src/protocols/yahoo/yahoo.c:2714
 msgid "Available"
 msgstr "可用"
 
@@ -4303,12 +4342,12 @@
 msgid "Away for friends only"
 msgstr "只对好友离开"
 
-#: src/protocols/gg/gg.c:53 src/protocols/jabber/jabber.c:964
-#: src/protocols/jabber/presence.c:121 src/protocols/oscar/oscar.c:2957
-#: src/protocols/oscar/oscar.c:4665 src/protocols/oscar/oscar.c:4743
-#: src/protocols/oscar/oscar.c:4767 src/protocols/oscar/oscar.c:6421
-#: src/protocols/oscar/oscar.c:6426 src/protocols/yahoo/yahoo.c:2292
-#: src/protocols/yahoo/yahoo.c:2618 src/protocols/yahoo/yahoo.c:2723
+#: src/protocols/gg/gg.c:53 src/protocols/jabber/jabber.c:955
+#: src/protocols/jabber/presence.c:126 src/protocols/oscar/oscar.c:2962
+#: src/protocols/oscar/oscar.c:4657 src/protocols/oscar/oscar.c:4735
+#: src/protocols/oscar/oscar.c:4759 src/protocols/oscar/oscar.c:6392
+#: src/protocols/oscar/oscar.c:6397 src/protocols/yahoo/yahoo.c:2293
+#: src/protocols/yahoo/yahoo.c:2619 src/protocols/yahoo/yahoo.c:2724
 msgid "Invisible"
 msgstr "隐身"
 
@@ -4366,11 +4405,11 @@
 
 #. we didn't successfully connect. tdt->toc_fd is valid here
 #: src/protocols/gg/gg.c:402 src/protocols/icq/gaim_icq.c:344
-#: src/protocols/msn/dispatch.c:208 src/protocols/msn/msn.c:500
-#: src/protocols/msn/notification.c:1789 src/protocols/napster/napster.c:475
+#: src/protocols/msn/dispatch.c:208 src/protocols/msn/msn.c:513
+#: src/protocols/msn/servconn.c:77 src/protocols/napster/napster.c:475
 #: src/protocols/napster/napster.c:506 src/protocols/toc/toc.c:200
-#: src/protocols/yahoo/yahoo.c:1957 src/protocols/yahoo/yahoo.c:1988
-#: src/protocols/yahoo/yahoo.c:2051 src/protocols/yahoo/yahoo_filexfer.c:68
+#: src/protocols/yahoo/yahoo.c:1958 src/protocols/yahoo/yahoo.c:1989
+#: src/protocols/yahoo/yahoo.c:2052 src/protocols/yahoo/yahoo_filexfer.c:68
 #: src/protocols/yahoo/yahoo_filexfer.c:139
 msgid "Unable to connect."
 msgstr "无法连接。"
@@ -4433,24 +4472,25 @@
 msgid "Active"
 msgstr "活跃"
 
-#: src/protocols/gg/gg.c:667 src/protocols/oscar/oscar.c:4120
+#: src/protocols/gg/gg.c:667 src/protocols/oscar/oscar.c:4130
 msgid "UIN"
 msgstr "UIN"
 
 #. First Name
 #: src/protocols/gg/gg.c:671 src/protocols/jabber/jabber.c:605
-#: src/protocols/oscar/oscar.c:4125 src/protocols/trepia/trepia.c:267
+#: src/protocols/oscar/oscar.c:4141 src/protocols/trepia/trepia.c:267
 msgid "First Name"
 msgstr "名"
 
 #. Last Name
 #: src/protocols/gg/gg.c:676 src/protocols/jabber/jabber.c:610
-#: src/protocols/oscar/oscar.c:4128 src/protocols/trepia/trepia.c:274
+#: src/protocols/oscar/oscar.c:4142 src/protocols/oscar/oscar.c:4143
+#: src/protocols/trepia/trepia.c:274
 msgid "Last Name"
 msgstr "姓"
 
-#: src/protocols/gg/gg.c:680 src/protocols/gg/gg.c:1392
-#: src/protocols/irc/msgs.c:183 src/protocols/oscar/oscar.c:4122
+#: src/protocols/gg/gg.c:680 src/protocols/gg/gg.c:1393
+#: src/protocols/irc/msgs.c:183 src/protocols/oscar/oscar.c:4131
 msgid "Nick"
 msgstr "昵称"
 
@@ -4465,19 +4505,18 @@
 
 #. City
 #: src/protocols/gg/gg.c:704 src/protocols/jabber/jabber.c:620
-#: src/protocols/oscar/oscar.c:4174 src/protocols/oscar/oscar.c:4190
-#: src/protocols/trepia/trepia.c:331 src/protocols/trepia/trepia.c:430
+#: src/protocols/oscar/oscar.c:4185 src/protocols/oscar/oscar.c:4193
+#: src/protocols/trepia/trepia.c:331 src/protocols/trepia/trepia.c:410
 msgid "City"
 msgstr "城市"
 
 #. res[0] == username
-#. show it to the user
-#: src/protocols/gg/gg.c:725 src/protocols/msn/msn.c:1315
-#: src/protocols/msn/msn.c:1559 src/protocols/napster/napster.c:393
-#: src/protocols/oscar/oscar.c:2999 src/protocols/oscar/oscar.c:3325
-#: src/protocols/toc/toc.c:498 src/protocols/yahoo/yahoo.c:2897
-#: src/protocols/yahoo/yahoo.c:2919 src/protocols/yahoo/yahoo.c:2942
-#: src/protocols/yahoo/yahoo.c:3100 src/protocols/zephyr/zephyr.c:565
+#: src/protocols/gg/gg.c:725 src/protocols/msn/msn.c:1330
+#: src/protocols/msn/msn.c:1574 src/protocols/napster/napster.c:393
+#: src/protocols/oscar/oscar.c:3004 src/protocols/oscar/oscar.c:3315
+#: src/protocols/toc/toc.c:498 src/protocols/yahoo/yahoo.c:2898
+#: src/protocols/yahoo/yahoo.c:2920 src/protocols/yahoo/yahoo.c:2943
+#: src/protocols/yahoo/yahoo.c:3101 src/protocols/zephyr/zephyr.c:567
 msgid "Buddy Information"
 msgstr "好友信息"
 
@@ -4573,7 +4612,7 @@
 msgid "Directory Search"
 msgstr "目录搜索"
 
-#: src/protocols/gg/gg.c:1207 src/protocols/jabber/jabber.c:1063
+#: src/protocols/gg/gg.c:1207 src/protocols/jabber/jabber.c:1054
 #: src/protocols/toc/toc.c:1546
 msgid "Change Password"
 msgstr "更改密码"
@@ -4611,8 +4650,7 @@
 #. *< name
 #. *< version
 #. *  summary
-#. *  description
-#: src/protocols/gg/gg.c:1373 src/protocols/gg/gg.c:1375
+#: src/protocols/gg/gg.c:1374 src/protocols/gg/gg.c:1376
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr "Gadu-Gadu 协议插件"
 
@@ -4625,17 +4663,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:224
-#: src/protocols/msn/notification.c:581 src/protocols/msn/notification.c:908
-#: src/protocols/msn/notification.c:1075 src/protocols/oscar/oscar.c:2729
-#: src/protocols/oscar/oscar.c:5378
+#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:229
+#: src/protocols/msn/notification.c:588 src/protocols/msn/notification.c:909
+#: src/protocols/msn/notification.c:1076 src/protocols/oscar/oscar.c:2734
+#: src/protocols/oscar/oscar.c:5370
 msgid "Authorize"
 msgstr "同意"
 
-#: 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:2731
-#: src/protocols/oscar/oscar.c:5379
+#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:230
+#: src/protocols/msn/notification.c:589 src/protocols/msn/notification.c:911
+#: src/protocols/msn/notification.c:1078 src/protocols/oscar/oscar.c:2736
+#: src/protocols/oscar/oscar.c:5371
 msgid "Deny"
 msgstr "拒绝"
 
@@ -4719,8 +4757,8 @@
 msgstr "查看 MOTD"
 
 #: src/protocols/irc/irc.c:154 src/protocols/jabber/buddy.c:883
-#: src/protocols/oscar/oscar.c:3203 src/protocols/oscar/oscar.c:6522
-#: src/protocols/yahoo/yahoo.c:2455
+#: src/protocols/oscar/oscar.c:3193 src/protocols/oscar/oscar.c:6493
+#: src/protocols/yahoo/yahoo.c:2456
 msgid "Send File"
 msgstr "发送文件"
 
@@ -4732,28 +4770,28 @@
 msgid "_Password:"
 msgstr "密码(_P):"
 
-#: src/protocols/irc/irc.c:192
+#: src/protocols/irc/irc.c:193
 msgid "IRC nicks may not contain whitespace"
 msgstr "IRC 昵称不能包含空格"
 
-#: src/protocols/irc/irc.c:211 src/protocols/toc/toc.c:228
+#: src/protocols/irc/irc.c:212 src/protocols/toc/toc.c:228
 #, c-format
 msgid "Signon: %s"
 msgstr "登录名:%s"
 
-#: src/protocols/irc/irc.c:220
+#: src/protocols/irc/irc.c:221
 msgid "Couldn't create socket"
 msgstr "无法创建套接字"
 
-#: src/protocols/irc/irc.c:369 src/protocols/trepia/trepia.c:977
+#: src/protocols/irc/irc.c:370 src/protocols/trepia/trepia.c:926
 msgid "Read error"
 msgstr "读取错误"
 
-#: src/protocols/irc/irc.c:503 src/protocols/yahoo/yahoochat.c:1343
+#: src/protocols/irc/irc.c:504 src/protocols/yahoo/yahoochat.c:1343
 msgid "Users"
 msgstr "用户"
 
-#: src/protocols/irc/irc.c:506 src/protocols/yahoo/yahoochat.c:1352
+#: src/protocols/irc/irc.c:507 src/protocols/yahoo/yahoochat.c:1352
 msgid "Topic"
 msgstr "话题"
 
@@ -4766,31 +4804,31 @@
 #. *< id
 #. *< name
 #. *< version
-#: src/protocols/irc/irc.c:611
+#: src/protocols/irc/irc.c:613
 msgid "IRC Protocol Plugin"
 msgstr "IRC 协议插件"
 
 #. *  summary
-#: src/protocols/irc/irc.c:612
+#: src/protocols/irc/irc.c:614
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "错误更少的 IRC 协议插件"
 
-#: src/protocols/irc/irc.c:629 src/protocols/irc/msgs.c:197
-#: src/protocols/jabber/jabber.c:1369 src/protocols/napster/napster.c:649
+#: src/protocols/irc/irc.c:631 src/protocols/irc/msgs.c:197
+#: src/protocols/jabber/jabber.c:1361 src/protocols/napster/napster.c:658
 msgid "Server"
 msgstr "服务器"
 
-#: src/protocols/irc/irc.c:632 src/protocols/jabber/jabber.c:1390
-#: src/protocols/msn/msn.c:1692 src/protocols/napster/napster.c:654
-#: src/protocols/trepia/trepia.c:1350
+#: src/protocols/irc/irc.c:634 src/protocols/jabber/jabber.c:1382
+#: src/protocols/msn/msn.c:1714 src/protocols/napster/napster.c:663
+#: src/protocols/trepia/trepia.c:1307
 msgid "Port"
 msgstr "端口"
 
-#: src/protocols/irc/irc.c:635 src/protocols/zephyr/zephyr.c:1423
+#: src/protocols/irc/irc.c:637 src/protocols/zephyr/zephyr.c:1392
 msgid "Encoding"
 msgstr "编码"
 
-#: src/protocols/irc/irc.c:638 src/protocols/irc/msgs.c:191
+#: src/protocols/irc/irc.c:640 src/protocols/irc/msgs.c:191
 #: src/protocols/jabber/jabber.c:580
 msgid "Username"
 msgstr "用户名"
@@ -4816,7 +4854,7 @@
 msgid " <i>(identified)</i>"
 msgstr " <i>(identified)</i>"
 
-#: src/protocols/irc/msgs.c:192 src/protocols/yahoo/yahoo.c:3000
+#: src/protocols/irc/msgs.c:192 src/protocols/yahoo/yahoo.c:3001
 msgid "Realname"
 msgstr "真名"
 
@@ -4946,26 +4984,26 @@
 msgid "Wallops from %s"
 msgstr "来自 %s 的冲击"
 
-#: src/protocols/irc/parse.c:164 src/protocols/zephyr/zephyr.c:198
+#: src/protocols/irc/parse.c:165 src/protocols/zephyr/zephyr.c:199
 msgid ""
 "(There was an error converting this message.  Check the 'Encoding' option in "
 "the Account Editor)"
 msgstr "(转换此信息出错。请检查账户编辑器中的“编码”选项)"
 
-#: src/protocols/irc/parse.c:317
+#: src/protocols/irc/parse.c:318
 #, c-format
 msgid "Reply time from %s: %lu seconds"
 msgstr "%s 的回复时间:%lu 秒"
 
-#: src/protocols/irc/parse.c:318
+#: src/protocols/irc/parse.c:319
 msgid "PONG"
 msgstr "PONG"
 
-#: src/protocols/irc/parse.c:318
+#: src/protocols/irc/parse.c:319
 msgid "CTCP PING reply"
 msgstr "CTCP PING 响应"
 
-#: src/protocols/irc/parse.c:420 src/protocols/oscar/oscar.c:582
+#: src/protocols/irc/parse.c:421 src/protocols/oscar/oscar.c:582
 #: 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."
@@ -5011,7 +5049,7 @@
 msgstr "名"
 
 #: src/protocols/jabber/buddy.c:250 src/protocols/jabber/buddy.c:635
-#: src/protocols/jabber/jabber.c:600 src/protocols/yahoo/yahoo.c:2996
+#: src/protocols/jabber/jabber.c:600 src/protocols/yahoo/yahoo.c:2997
 msgid "Nickname"
 msgstr "昵称"
 
@@ -5042,7 +5080,7 @@
 
 #. Country
 #: src/protocols/jabber/buddy.c:257 src/protocols/jabber/buddy.c:680
-#: src/protocols/trepia/trepia.c:339 src/protocols/trepia/trepia.c:448
+#: src/protocols/trepia/trepia.c:339 src/protocols/trepia/trepia.c:416
 msgid "Country"
 msgstr "国家"
 
@@ -5052,7 +5090,7 @@
 msgstr "电话号码"
 
 #: src/protocols/jabber/buddy.c:259 src/protocols/jabber/buddy.c:709
-#: src/protocols/jabber/buddy.c:717 src/protocols/yahoo/yahoo.c:2992
+#: src/protocols/jabber/buddy.c:717 src/protocols/yahoo/yahoo.c:2993
 msgid "Email"
 msgstr "电子邮件"
 
@@ -5073,7 +5111,7 @@
 msgstr "职务"
 
 #: src/protocols/jabber/buddy.c:264 src/protocols/jabber/buddy.c:638
-#: src/protocols/oscar/oscar.c:4154
+#: src/protocols/oscar/oscar.c:4166
 msgid "Birthday"
 msgstr "生日"
 
@@ -5092,11 +5130,14 @@
 msgstr "Jabber ID"
 
 #: src/protocols/jabber/buddy.c:562 src/protocols/jabber/buddy.c:569
-#: src/protocols/jabber/buddy.c:580 src/protocols/jabber/jabber.c:930
+#: src/protocols/jabber/buddy.c:580 src/protocols/jabber/jabber.c:929
+#: src/protocols/msn/msn.c:347 src/protocols/oscar/oscar.c:5698
+#: src/protocols/oscar/oscar.c:5752 src/protocols/oscar/oscar.c:5754
+#: src/protocols/yahoo/yahoo.c:2407
 msgid "Status"
 msgstr "状态"
 
-#: src/protocols/jabber/buddy.c:578 src/protocols/jabber/jabber.c:1372
+#: src/protocols/jabber/buddy.c:578 src/protocols/jabber/jabber.c:1364
 msgid "Resource"
 msgstr "资源"
 
@@ -5105,7 +5146,7 @@
 msgstr "中名"
 
 #: src/protocols/jabber/buddy.c:643 src/protocols/jabber/jabber.c:615
-#: src/protocols/oscar/oscar.c:4171 src/protocols/oscar/oscar.c:4187
+#: src/protocols/oscar/oscar.c:4184 src/protocols/oscar/oscar.c:4192
 msgid "Address"
 msgstr "地址"
 
@@ -5228,7 +5269,7 @@
 msgid "Select a conference server to query"
 msgstr "选择要查询的会议服务器"
 
-#: src/protocols/jabber/chat.c:692
+#: src/protocols/jabber/chat.c:693
 msgid "Find Rooms"
 msgstr "查找房间"
 
@@ -5238,24 +5279,24 @@
 
 #: 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:554 src/protocols/msn/msn.c:727
-#: src/protocols/msn/msn.c:756 src/protocols/msn/msn.c:788
-#: src/protocols/msn/msn.c:796 src/protocols/msn/msn.c:829
-#: src/protocols/msn/msn.c:837 src/protocols/msn/msn.c:851
-#: src/protocols/msn/msn.c:860 src/protocols/msn/msn.c:875
-#: src/protocols/msn/msn.c:885 src/protocols/msn/msn.c:907
-#: src/protocols/msn/msn.c:957 src/protocols/msn/msn.c:995
-#: src/protocols/msn/msn.c:1097 src/protocols/msn/msn.c:1130
-#: src/protocols/msn/msn.c:1151 src/protocols/msn/msn.c:1162
-#: src/protocols/msn/msn.c:1173 src/protocols/msn/msn.c:1197
-#: src/protocols/msn/msn.c:1209 src/protocols/msn/msn.c:1290
+#: src/protocols/msn/msn.c:173 src/protocols/msn/msn.c:273
+#: src/protocols/msn/msn.c:570 src/protocols/msn/msn.c:742
+#: src/protocols/msn/msn.c:771 src/protocols/msn/msn.c:803
+#: src/protocols/msn/msn.c:811 src/protocols/msn/msn.c:844
+#: src/protocols/msn/msn.c:852 src/protocols/msn/msn.c:866
+#: src/protocols/msn/msn.c:875 src/protocols/msn/msn.c:890
+#: src/protocols/msn/msn.c:900 src/protocols/msn/msn.c:922
+#: src/protocols/msn/msn.c:972 src/protocols/msn/msn.c:1010
+#: src/protocols/msn/msn.c:1112 src/protocols/msn/msn.c:1145
+#: src/protocols/msn/msn.c:1166 src/protocols/msn/msn.c:1177
+#: src/protocols/msn/msn.c:1188 src/protocols/msn/msn.c:1212
+#: src/protocols/msn/msn.c:1224 src/protocols/msn/msn.c:1305
 #: 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
+#: src/protocols/msn/notification.c:1299 src/protocols/msn/notification.c:1319
+#: src/protocols/msn/session.c:209 src/protocols/trepia/trepia.c:248
+#: src/protocols/trepia/trepia.c:698 src/protocols/trepia/trepia.c:987
+#: src/protocols/trepia/trepia.c:1031 src/protocols/trepia/trepia.c:1130
+#: src/protocols/trepia/trepia.c:1186
 msgid "Write error"
 msgstr "写错误"
 
@@ -5280,7 +5321,7 @@
 msgstr "SSL 支持不可用"
 
 #: src/protocols/jabber/jabber.c:400 src/protocols/jabber/jabber.c:728
-#: src/protocols/trepia/trepia.c:1121
+#: src/protocols/trepia/trepia.c:1070
 msgid "Unable to create socket"
 msgstr "无法创建套接字"
 
@@ -5293,7 +5334,7 @@
 msgid "Registration Successful"
 msgstr "注册成功"
 
-#: src/protocols/jabber/jabber.c:434 src/protocols/jabber/jabber.c:1183
+#: src/protocols/jabber/jabber.c:434 src/protocols/jabber/jabber.c:1174
 msgid "Unknown Error"
 msgstr "未知错误"
 
@@ -5305,7 +5346,7 @@
 msgid "Already Registered"
 msgstr "已注册"
 
-#: src/protocols/jabber/jabber.c:584 src/protocols/jabber/jabber.c:1034
+#: src/protocols/jabber/jabber.c:584 src/protocols/jabber/jabber.c:1025
 msgid "Password"
 msgstr "密码"
 
@@ -5314,9 +5355,9 @@
 msgstr "电子邮件"
 
 #. State
-#: src/protocols/jabber/jabber.c:625 src/protocols/oscar/oscar.c:4177
-#: src/protocols/oscar/oscar.c:4193 src/protocols/trepia/trepia.c:335
-#: src/protocols/trepia/trepia.c:439
+#: src/protocols/jabber/jabber.c:625 src/protocols/oscar/oscar.c:4186
+#: src/protocols/oscar/oscar.c:4194 src/protocols/trepia/trepia.c:335
+#: src/protocols/trepia/trepia.c:413
 msgid "State"
 msgstr "州/省"
 
@@ -5337,9 +5378,9 @@
 msgstr "注册新的 Jabber 账户"
 
 #: src/protocols/jabber/jabber.c:774 src/protocols/msn/dispatch.c:212
-#: src/protocols/msn/msn.c:491 src/protocols/napster/napster.c:499
-#: src/protocols/oscar/oscar.c:751 src/protocols/trepia/trepia.c:1115
-#: src/protocols/yahoo/yahoo.c:2176
+#: src/protocols/msn/msn.c:504 src/protocols/napster/napster.c:499
+#: src/protocols/oscar/oscar.c:749 src/protocols/trepia/trepia.c:1064
+#: src/protocols/yahoo/yahoo.c:2177 src/protocols/zephyr/zephyr.c:864
 msgid "Connecting"
 msgstr "正在连接"
 
@@ -5355,278 +5396,278 @@
 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:5806
+#: src/protocols/jabber/jabber.c:873 src/protocols/jabber/jabber.c:1152
+#: src/protocols/jabber/jabber.c:1193 src/protocols/jabber/jabber.c:1226
+#: src/protocols/oscar/oscar.c:5752 src/protocols/oscar/oscar.c:5777
 msgid "Not Authorized"
 msgstr "未认证"
 
-#: src/protocols/jabber/jabber.c:905
+#: src/protocols/jabber/jabber.c:904
 msgid "Both"
 msgstr "双向"
 
-#: src/protocols/jabber/jabber.c:907
+#: src/protocols/jabber/jabber.c:906
 msgid "From (To pending)"
 msgstr "来自(待推迟)"
 
-#: src/protocols/jabber/jabber.c:909
+#: src/protocols/jabber/jabber.c:908
 msgid "From"
 msgstr "来自"
 
-#: src/protocols/jabber/jabber.c:912
+#: src/protocols/jabber/jabber.c:911
 msgid "To"
 msgstr "到"
 
-#: src/protocols/jabber/jabber.c:914
+#: src/protocols/jabber/jabber.c:913
 msgid "None (To pending)"
 msgstr "无(待推迟)"
 
-#: src/protocols/jabber/jabber.c:918
+#: src/protocols/jabber/jabber.c:917
 msgid "Subscription"
 msgstr "订阅"
 
-#: src/protocols/jabber/jabber.c:938
+#: src/protocols/jabber/jabber.c:937
 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
+#: src/protocols/jabber/jabber.c:950 src/protocols/jabber/jutil.c:35
+#: src/protocols/jabber/presence.c:66 src/protocols/jabber/presence.c:117
 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
+#: src/protocols/jabber/jabber.c:952 src/protocols/jabber/jutil.c:38
+#: src/protocols/jabber/presence.c:68 src/protocols/jabber/presence.c:122
 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:2947 src/protocols/oscar/oscar.c:4755
-#: src/protocols/oscar/oscar.c:6417
+#: src/protocols/jabber/jabber.c:953 src/protocols/jabber/jutil.c:41
+#: src/protocols/jabber/presence.c:70 src/protocols/jabber/presence.c:124
+#: src/protocols/oscar/oscar.c:2952 src/protocols/oscar/oscar.c:4747
+#: src/protocols/oscar/oscar.c:6388
 msgid "Do Not Disturb"
 msgstr "请勿打扰"
 
-#: src/protocols/jabber/jabber.c:979
+#: src/protocols/jabber/jabber.c:970
 msgid "Password Changed"
 msgstr "密码已更改"
 
-#: src/protocols/jabber/jabber.c:980
+#: src/protocols/jabber/jabber.c:971
 msgid "Your password has been changed."
 msgstr "您的密码已更改。"
 
-#: src/protocols/jabber/jabber.c:984 src/protocols/jabber/jabber.c:985
+#: src/protocols/jabber/jabber.c:975 src/protocols/jabber/jabber.c:976
 msgid "Error changing password"
 msgstr "更改密码出错"
 
-#: src/protocols/jabber/jabber.c:1039
+#: src/protocols/jabber/jabber.c:1030
 msgid "Password (again)"
 msgstr "再次输入新密码"
 
-#: src/protocols/jabber/jabber.c:1044 src/protocols/jabber/jabber.c:1045
+#: src/protocols/jabber/jabber.c:1035 src/protocols/jabber/jabber.c:1036
 msgid "Change Jabber Password"
 msgstr "更改 Jabber 密码"
 
-#: src/protocols/jabber/jabber.c:1045
+#: src/protocols/jabber/jabber.c:1036
 msgid "Please enter your new password"
 msgstr "请输入您的新密码"
 
-#: src/protocols/jabber/jabber.c:1056 src/protocols/toc/toc.c:1532
+#: src/protocols/jabber/jabber.c:1047 src/protocols/toc/toc.c:1532
 msgid "Set User Info"
 msgstr "设置用户信息"
 
-#: src/protocols/jabber/jabber.c:1141
+#: src/protocols/jabber/jabber.c:1132
 msgid "Bad Request"
 msgstr "无效请求"
 
-#: src/protocols/jabber/jabber.c:1143
+#: src/protocols/jabber/jabber.c:1134
 msgid "Conflict"
 msgstr "冲突"
 
-#: src/protocols/jabber/jabber.c:1145
+#: src/protocols/jabber/jabber.c:1136
 msgid "Feature Not Implemented"
 msgstr "特性未实现"
 
-#: src/protocols/jabber/jabber.c:1147
+#: src/protocols/jabber/jabber.c:1138
 msgid "Forbidden"
 msgstr "禁止"
 
-#: src/protocols/jabber/jabber.c:1149
+#: src/protocols/jabber/jabber.c:1140
 msgid "Gone"
 msgstr "已走"
 
-#: src/protocols/jabber/jabber.c:1151 src/protocols/jabber/jabber.c:1225
+#: src/protocols/jabber/jabber.c:1142 src/protocols/jabber/jabber.c:1216
 msgid "Internal Server Error"
 msgstr "内部服务器错误"
 
-#: src/protocols/jabber/jabber.c:1153
+#: src/protocols/jabber/jabber.c:1144
 msgid "Item Not Found"
 msgstr "项目未找到"
 
-#: src/protocols/jabber/jabber.c:1155
+#: src/protocols/jabber/jabber.c:1146
 msgid "Malformed Jabber ID"
 msgstr "Jabber ID 格式错误"
 
-#: src/protocols/jabber/jabber.c:1157
+#: src/protocols/jabber/jabber.c:1148
 msgid "Not Acceptable"
 msgstr "不可接受"
 
-#: src/protocols/jabber/jabber.c:1159
+#: src/protocols/jabber/jabber.c:1150
 msgid "Not Allowed"
 msgstr "不允许"
 
-#: src/protocols/jabber/jabber.c:1163
+#: src/protocols/jabber/jabber.c:1154
 msgid "Payment Required"
 msgstr "需要付费"
 
-#: src/protocols/jabber/jabber.c:1165
+#: src/protocols/jabber/jabber.c:1156
 msgid "Recipient Unavailable"
 msgstr "收件人不可用"
 
-#: src/protocols/jabber/jabber.c:1169
+#: src/protocols/jabber/jabber.c:1160
 msgid "Registration Required"
 msgstr "需要注册"
 
-#: src/protocols/jabber/jabber.c:1171
+#: src/protocols/jabber/jabber.c:1162
 msgid "Remote Server Not Found"
 msgstr "远程服务器未找到"
 
-#: src/protocols/jabber/jabber.c:1173
+#: src/protocols/jabber/jabber.c:1164
 msgid "Remote Server Timeout"
 msgstr "远程服务器超时"
 
-#: src/protocols/jabber/jabber.c:1175
+#: src/protocols/jabber/jabber.c:1166
 msgid "Server Overloaded"
 msgstr "服务器超载"
 
-#: src/protocols/jabber/jabber.c:1177
+#: src/protocols/jabber/jabber.c:1168
 msgid "Service Unavailable"
 msgstr "服务不可用"
 
-#: src/protocols/jabber/jabber.c:1179
+#: src/protocols/jabber/jabber.c:1170
 msgid "Subscription Required"
 msgstr "需要订阅"
 
-#: src/protocols/jabber/jabber.c:1181
+#: src/protocols/jabber/jabber.c:1172
 msgid "Unexpected Request"
 msgstr "未预期的请求"
 
-#: src/protocols/jabber/jabber.c:1188
+#: src/protocols/jabber/jabber.c:1179
 msgid "Authorization Aborted"
 msgstr "认证被中断"
 
-#: src/protocols/jabber/jabber.c:1190
+#: src/protocols/jabber/jabber.c:1181
 msgid "Incorrect encoding in authorization"
 msgstr "认证的编码不正确"
 
-#: src/protocols/jabber/jabber.c:1193
+#: src/protocols/jabber/jabber.c:1184
 msgid "Invalid authzid"
 msgstr "无效的认证"
 
-#: src/protocols/jabber/jabber.c:1196
+#: src/protocols/jabber/jabber.c:1187
 msgid "Invalid Authorization Mechanism"
 msgstr "无效的认证算法"
 
-#: src/protocols/jabber/jabber.c:1199
+#: src/protocols/jabber/jabber.c:1190
 msgid "Authorization mechanism too weak"
 msgstr "认证算法太弱"
 
-#: src/protocols/jabber/jabber.c:1204
+#: src/protocols/jabber/jabber.c:1195
 msgid "Temporary Authentication Failure"
 msgstr "临时认证失败"
 
-#: src/protocols/jabber/jabber.c:1206
+#: src/protocols/jabber/jabber.c:1197
 msgid "Authentication Failure"
 msgstr "认证失败"
 
+#: src/protocols/jabber/jabber.c:1201
+msgid "Bad Format"
+msgstr "格式无效"
+
+#: src/protocols/jabber/jabber.c:1203
+msgid "Bad Namespace Prefix"
+msgstr "无效的命名空间前缀"
+
+#: src/protocols/jabber/jabber.c:1206
+msgid "Resource Conflict"
+msgstr "资源冲突"
+
+#: src/protocols/jabber/jabber.c:1208
+msgid "Connection Timeout"
+msgstr "连接超时"
+
 #: src/protocols/jabber/jabber.c:1210
-msgid "Bad Format"
-msgstr "格式无效"
-
-#: src/protocols/jabber/jabber.c:1212
-msgid "Bad Namespace Prefix"
-msgstr "无效的命名空间前缀"
-
-#: src/protocols/jabber/jabber.c:1215
-msgid "Resource Conflict"
-msgstr "资源冲突"
-
-#: src/protocols/jabber/jabber.c:1217
-msgid "Connection Timeout"
-msgstr "连接超时"
-
-#: src/protocols/jabber/jabber.c:1219
 msgid "Host Gone"
 msgstr "主机宕机"
 
-#: src/protocols/jabber/jabber.c:1221
+#: src/protocols/jabber/jabber.c:1212
 msgid "Host Unknown"
 msgstr "主机未知"
 
-#: src/protocols/jabber/jabber.c:1223
+#: src/protocols/jabber/jabber.c:1214
 msgid "Improper Addressing"
 msgstr "寻址不恰当"
 
-#: src/protocols/jabber/jabber.c:1227
+#: src/protocols/jabber/jabber.c:1218
 msgid "Invalid ID"
 msgstr "无效 ID"
 
-#: src/protocols/jabber/jabber.c:1229
+#: src/protocols/jabber/jabber.c:1220
 msgid "Invalid Namespace"
 msgstr "无效的命名空间"
 
-#: src/protocols/jabber/jabber.c:1231
+#: src/protocols/jabber/jabber.c:1222
 msgid "Invalid XML"
 msgstr "无效的 XML"
 
-#: src/protocols/jabber/jabber.c:1233
+#: src/protocols/jabber/jabber.c:1224
 msgid "Non-matching Hosts"
 msgstr "不匹配的主机"
 
-#: src/protocols/jabber/jabber.c:1237
+#: src/protocols/jabber/jabber.c:1228
 msgid "Policy Violation"
 msgstr "违背策略"
 
-#: src/protocols/jabber/jabber.c:1239
+#: src/protocols/jabber/jabber.c:1230
 msgid "Remote Connection Failed"
 msgstr "远程连接失败"
 
-#: src/protocols/jabber/jabber.c:1241
+#: src/protocols/jabber/jabber.c:1232
 msgid "Resource Constraint"
 msgstr "资源约束"
 
-#: src/protocols/jabber/jabber.c:1243
+#: src/protocols/jabber/jabber.c:1234
 msgid "Restricted XML"
 msgstr "限制的 XML"
 
-#: src/protocols/jabber/jabber.c:1245
+#: src/protocols/jabber/jabber.c:1236
 msgid "See Other Host"
 msgstr "查看其它主机"
 
-#: src/protocols/jabber/jabber.c:1247
+#: src/protocols/jabber/jabber.c:1238
 msgid "System Shutdown"
 msgstr "系统关机"
 
-#: src/protocols/jabber/jabber.c:1249
+#: src/protocols/jabber/jabber.c:1240
 msgid "Undefined Condition"
 msgstr "未定义的条件"
 
-#: src/protocols/jabber/jabber.c:1251
+#: src/protocols/jabber/jabber.c:1242
 msgid "Unsupported Encoding"
 msgstr "不支持的编码"
 
-#: src/protocols/jabber/jabber.c:1253
+#: src/protocols/jabber/jabber.c:1244
 msgid "Unsupported Stanza Type"
 msgstr "不支持的节类型"
 
-#: src/protocols/jabber/jabber.c:1255
+#: src/protocols/jabber/jabber.c:1246
 msgid "Unsupported Version"
 msgstr "不支持的版本"
 
-#: src/protocols/jabber/jabber.c:1257
+#: src/protocols/jabber/jabber.c:1248
 msgid "XML Not Well Formed"
 msgstr "XML 格式有错"
 
-#: src/protocols/jabber/jabber.c:1259
+#: src/protocols/jabber/jabber.c:1250
 msgid "Stream Error"
 msgstr "流错误"
 
@@ -5640,28 +5681,27 @@
 #. *< name
 #. *< version
 #. *  summary
-#. *  description
-#: src/protocols/jabber/jabber.c:1348 src/protocols/jabber/jabber.c:1350
+#: src/protocols/jabber/jabber.c:1340 src/protocols/jabber/jabber.c:1342
 msgid "Jabber Protocol Plugin"
 msgstr "Jabber 协议插件"
 
-#: src/protocols/jabber/jabber.c:1375
+#: src/protocols/jabber/jabber.c:1367
 msgid "Use TLS if available"
 msgstr "若可用则使用 TLS"
 
-#: src/protocols/jabber/jabber.c:1380
+#: src/protocols/jabber/jabber.c:1372
 msgid "Force old SSL"
 msgstr "强制旧 SSL"
 
-#: src/protocols/jabber/jabber.c:1385
+#: src/protocols/jabber/jabber.c:1377
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "允许在不加密流上的纯文本验证"
 
-#: src/protocols/jabber/jabber.c:1394
+#: src/protocols/jabber/jabber.c:1386
 msgid "Connect server"
 msgstr "连接服务器"
 
-#: src/protocols/jabber/jabber.c:1411
+#: src/protocols/jabber/jabber.c:1403
 msgid "Hide Operating System"
 msgstr "隐藏操作系统"
 
@@ -5698,39 +5738,39 @@
 msgid "XML Parse error"
 msgstr "XML 分析错误"
 
-#: src/protocols/jabber/presence.c:216
+#: src/protocols/jabber/presence.c:221
 msgid "Unknown Error in presence"
 msgstr "出现未知错误"
 
-#: src/protocols/jabber/presence.c:219
+#: src/protocols/jabber/presence.c:224
 #, c-format
 msgid "The user %s wants to add you to their buddy list."
 msgstr "用户 %s 想要将您添加为好友。"
 
-#: src/protocols/jabber/presence.c:272 src/protocols/jabber/presence.c:273
+#: src/protocols/jabber/presence.c:277 src/protocols/jabber/presence.c:278
 msgid "Create New Room"
 msgstr "创建新房间"
 
-#: src/protocols/jabber/presence.c:274
+#: src/protocols/jabber/presence.c:279
 msgid ""
 "You are creating a new room.  Would you like to configure it, or accept the "
 "default settings?"
 msgstr "您正在创建新房间。您是想要进行配置,还是想要接受默认设置?"
 
-#: src/protocols/jabber/presence.c:276
+#: src/protocols/jabber/presence.c:281
 msgid "Configure Room"
 msgstr "配置房间"
 
-#: src/protocols/jabber/presence.c:278
+#: src/protocols/jabber/presence.c:283
 msgid "Accept Defaults"
 msgstr "接受默认值"
 
-#: src/protocols/jabber/presence.c:298
+#: src/protocols/jabber/presence.c:303
 #, c-format
 msgid "Error in chat %s"
 msgstr "聊天 %s 出错"
 
-#: src/protocols/jabber/presence.c:301
+#: src/protocols/jabber/presence.c:306
 #, c-format
 msgid "Error joining chat %s"
 msgstr "加入聊天 %s 出错"
@@ -5744,19 +5784,19 @@
 msgid "File Send Failed"
 msgstr "发送文件失败"
 
-#: src/protocols/msn/dispatch.c:42 src/protocols/msn/notification.c:246
+#: src/protocols/msn/dispatch.c:42 src/protocols/msn/notification.c:240
 msgid "Unable to request USR\n"
 msgstr "无法请求 USR\n"
 
-#: src/protocols/msn/dispatch.c:59 src/protocols/msn/notification.c:263
+#: src/protocols/msn/dispatch.c:59 src/protocols/msn/notification.c:257
 msgid "Unable to login using MD5"
 msgstr "无法使用 MD5 登入"
 
-#: src/protocols/msn/dispatch.c:68 src/protocols/msn/notification.c:272
+#: src/protocols/msn/dispatch.c:68 src/protocols/msn/notification.c:266
 msgid "Unable to send USR"
 msgstr "无法发送 USR"
 
-#: src/protocols/msn/dispatch.c:73 src/protocols/msn/notification.c:277
+#: src/protocols/msn/dispatch.c:73 src/protocols/msn/notification.c:271
 msgid "Requesting to send password"
 msgstr "正在请求发送密码"
 
@@ -5764,15 +5804,15 @@
 msgid "Protocol version not supported"
 msgstr "协议版本不支持"
 
-#: src/protocols/msn/dispatch.c:117 src/protocols/msn/notification.c:416
+#: src/protocols/msn/dispatch.c:117 src/protocols/msn/notification.c:410
 msgid "Unable to request CVR\n"
 msgstr "无法请求 CVR\n"
 
-#: src/protocols/msn/dispatch.c:126 src/protocols/msn/notification.c:425
+#: src/protocols/msn/dispatch.c:126 src/protocols/msn/notification.c:419
 msgid "Unable to request INF\n"
 msgstr "无法请求 INF\n"
 
-#: src/protocols/msn/dispatch.c:147 src/protocols/msn/notification.c:1551
+#: src/protocols/msn/dispatch.c:147 src/protocols/msn/notification.c:1564
 msgid "Got invalid XFR"
 msgstr "得到无效的 XFR"
 
@@ -5784,259 +5824,272 @@
 msgid "Unable to parse message."
 msgstr "无法处理消息。"
 
-#: src/protocols/msn/dispatch.c:232 src/protocols/msn/notification.c:521
-#: src/protocols/msn/notification.c:1811
+#: src/protocols/msn/dispatch.c:232 src/protocols/msn/notification.c:528
+#: src/protocols/msn/notification.c:1826
 msgid "Unable to write to server"
 msgstr "无法写入服务器。"
 
-#: src/protocols/msn/dispatch.c:236 src/protocols/msn/notification.c:1818
+#: src/protocols/msn/dispatch.c:236 src/protocols/msn/notification.c:1833
 msgid "Syncing with server"
 msgstr "正在与服务器同步"
 
-#: src/protocols/msn/dispatch.c:250 src/protocols/msn/notification.c:1832
+#: src/protocols/msn/dispatch.c:250
 msgid "Error reading from server"
 msgstr "从服务器读取时出错"
 
 #: src/protocols/msn/error.c:33
+msgid "Unable to parse message"
+msgstr "无法处理消息"
+
+#: src/protocols/msn/error.c:36
 msgid "Syntax Error (probably a Gaim bug)"
 msgstr "语法错误(可能是 Gaim 的 bug)"
 
-#: src/protocols/msn/error.c:37
-msgid "Invalid Parameter (probably a Gaim bug)"
-msgstr "参数无效(可能是 Gaim 的 bug)"
-
 #: src/protocols/msn/error.c:40
-msgid "Invalid User"
-msgstr "用户无效"
-
-#: src/protocols/msn/error.c:44
+msgid "Invalid email address"
+msgstr "无效的电子邮件地址"
+
+#: src/protocols/msn/error.c:43
+msgid "User does not exist"
+msgstr "用户不存在"
+
+#: src/protocols/msn/error.c:47
 msgid "Fully Qualified Domain Name missing"
 msgstr "缺少全称域名"
 
-#: src/protocols/msn/error.c:47
-msgid "Already Logged In"
-msgstr "已登入"
-
 #: src/protocols/msn/error.c:50
-msgid "Invalid Username"
-msgstr "用户名无效"
+msgid "Already Logged In"
+msgstr "已登入"
 
 #: src/protocols/msn/error.c:53
+msgid "Invalid Username"
+msgstr "用户名无效"
+
+#: src/protocols/msn/error.c:56
 msgid "Invalid Friendly Name"
 msgstr "友好的名称无效"
 
-#: src/protocols/msn/error.c:56
+#: src/protocols/msn/error.c:59
 msgid "List Full"
 msgstr "列表满"
 
-#: src/protocols/msn/error.c:59
+#: src/protocols/msn/error.c:62
 msgid "Already there"
 msgstr "已列出"
 
-#: src/protocols/msn/error.c:62
+#: src/protocols/msn/error.c:65
 msgid "Not on list"
 msgstr "未列出"
 
-#: src/protocols/msn/error.c:65 src/protocols/zephyr/zephyr.c:526
+#: src/protocols/msn/error.c:68 src/protocols/zephyr/zephyr.c:527
 msgid "User is offline"
 msgstr "用户离线"
 
-#: src/protocols/msn/error.c:68
+#: src/protocols/msn/error.c:71
 msgid "Already in the mode"
 msgstr "已在模式中"
 
-#: src/protocols/msn/error.c:71
+#: src/protocols/msn/error.c:74
 msgid "Already in opposite list"
 msgstr "已在相对列表"
 
-#: src/protocols/msn/error.c:74
+#: src/protocols/msn/error.c:77
 msgid "Too many groups"
 msgstr "组太多"
 
-#: src/protocols/msn/error.c:77
+#: src/protocols/msn/error.c:80
 msgid "Invalid group"
 msgstr "无效的组"
 
-#: src/protocols/msn/error.c:80
+#: src/protocols/msn/error.c:83
 msgid "User not in group"
 msgstr "用户未在组中"
 
-#: src/protocols/msn/error.c:83
+#: src/protocols/msn/error.c:86
 msgid "Group name too long"
 msgstr "组名太长"
 
-#: src/protocols/msn/error.c:86
+#: src/protocols/msn/error.c:89
 msgid "Cannot remove group zero"
 msgstr "无法删除零组"
 
-#: src/protocols/msn/error.c:90
+#: src/protocols/msn/error.c:93
 msgid "Tried to add a contact to a group that doesn't exist"
 msgstr "试图向不存在的组中添加联系人"
 
-#: src/protocols/msn/error.c:94
+#: src/protocols/msn/error.c:97
 msgid "Switchboard failed"
 msgstr "切换板失败"
 
-#: src/protocols/msn/error.c:97
+#: src/protocols/msn/error.c:100
 msgid "Notify Transfer failed"
 msgstr "通知传送失败"
 
-#: src/protocols/msn/error.c:101
+#: src/protocols/msn/error.c:104
 msgid "Required fields missing"
-msgstr "缺少必须域"
-
-#: src/protocols/msn/error.c:104
+msgstr "缺少必需域"
+
+#: src/protocols/msn/error.c:107
 msgid "Too many hits to a FND"
 msgstr "FND 的次数太多"
 
-#: src/protocols/msn/error.c:107 src/protocols/oscar/oscar.c:186
+#: src/protocols/msn/error.c:110 src/protocols/oscar/oscar.c:186
 msgid "Not logged in"
 msgstr "未登入"
 
-#: src/protocols/msn/error.c:111
-msgid "Service Temporarily Unavailable"
-msgstr "服务暂时不可用"
-
 #: src/protocols/msn/error.c:114
-msgid "Database server error"
-msgstr "数据库服务器错误"
+msgid "Service Temporarily Unavailable"
+msgstr "服务暂时不可用"
 
 #: src/protocols/msn/error.c:117
+msgid "Database server error"
+msgstr "数据库服务器错误"
+
+#: src/protocols/msn/error.c:120
 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 "内存分配错误"
+msgid "File operation error"
+msgstr "文件操作错误"
 
 #: src/protocols/msn/error.c:126
+msgid "Memory allocation error"
+msgstr "内存分配错误"
+
+#: src/protocols/msn/error.c:129
 msgid "Wrong CHL value sent to server"
 msgstr "给服务器发送的 CHL 值错误"
 
-#: src/protocols/msn/error.c:130
+#: src/protocols/msn/error.c:133
 msgid "Server busy"
 msgstr "服务器忙"
 
-#: src/protocols/msn/error.c:133 src/protocols/msn/error.c:146
-#: src/protocols/msn/error.c:201
+#: src/protocols/msn/error.c:136 src/protocols/msn/error.c:149
+#: src/protocols/msn/error.c:204
 msgid "Server unavailable"
 msgstr "服务器不可用"
 
-#: src/protocols/msn/error.c:136
+#: src/protocols/msn/error.c:139
 msgid "Peer Notification server down"
 msgstr "点通知服务器维护中"
 
-#: src/protocols/msn/error.c:139
+#: src/protocols/msn/error.c:142
 msgid "Database connect error"
 msgstr "数据库连接错误"
 
-#: src/protocols/msn/error.c:143
+#: src/protocols/msn/error.c:146
 msgid "Server is going down (abandon ship)"
 msgstr "服务器即将维护"
 
-#: src/protocols/msn/error.c:150
+#: src/protocols/msn/error.c:153
 msgid "Error creating connection"
 msgstr "创建连接出错"
 
-#: src/protocols/msn/error.c:154
+#: src/protocols/msn/error.c:157
 msgid "CVR parameters are either unknown or not allowed"
 msgstr "CVR 参数未知或不允许"
 
-#: src/protocols/msn/error.c:157 src/protocols/msn/notification.c:310
+#: src/protocols/msn/error.c:160 src/protocols/msn/notification.c:304
 msgid "Unable to write"
 msgstr "无法写入"
 
-#: src/protocols/msn/error.c:160
+#: src/protocols/msn/error.c:163
 msgid "Session overload"
 msgstr "会话过载"
 
-#: src/protocols/msn/error.c:163
+#: src/protocols/msn/error.c:166
 msgid "User is too active"
 msgstr "用户太活跃"
 
-#: src/protocols/msn/error.c:166
+#: src/protocols/msn/error.c:169
 msgid "Too many sessions"
 msgstr "会话太多"
 
-#: src/protocols/msn/error.c:169 src/protocols/msn/error.c:175
-msgid "Not expected"
-msgstr "未期待"
-
 #: src/protocols/msn/error.c:172
+msgid "Passport not verified"
+msgstr "Passport 未验证"
+
+#: src/protocols/msn/error.c:175
 msgid "Bad friend file"
 msgstr "无效的好友文件"
 
-#: src/protocols/msn/error.c:180
+#: src/protocols/msn/error.c:178
+msgid "Not expected"
+msgstr "未期待"
+
+#: src/protocols/msn/error.c:183
 msgid "Friendly name changes too rapidly"
 msgstr "友好的名称更改太频繁"
 
-#: src/protocols/msn/error.c:189
+#: src/protocols/msn/error.c:192
 msgid "Server too busy"
 msgstr "服务器太忙"
 
-#: src/protocols/msn/error.c:193 src/protocols/oscar/oscar.c:1164
+#: src/protocols/msn/error.c:196 src/protocols/oscar/oscar.c:1162
 #: src/protocols/toc/toc.c:659
 msgid "Authentication failed"
 msgstr "认证失败"
 
-#: src/protocols/msn/error.c:196
+#: src/protocols/msn/error.c:199
 msgid "Not allowed when offline"
 msgstr "离线时不允许"
 
-#: src/protocols/msn/error.c:204
+#: src/protocols/msn/error.c:207
 msgid "Not accepting new users"
 msgstr "不接受新用户"
 
-#: src/protocols/msn/error.c:208
+#: src/protocols/msn/error.c:211
 msgid "Kids Passport without parental consent"
 msgstr "没有父母在的儿童 Passport"
 
-#: src/protocols/msn/error.c:212
+#: src/protocols/msn/error.c:215
 msgid "Passport account not yet verified"
 msgstr "Passport 账户未验证"
 
-#: src/protocols/msn/error.c:215
+#: src/protocols/msn/error.c:218
 msgid "Bad ticket"
 msgstr "无效的票证"
 
-#: src/protocols/msn/error.c:219
+#: src/protocols/msn/error.c:222
 #, c-format
 msgid "Unknown Error Code %d"
 msgstr "未知的错误代码 %d"
 
+#: src/protocols/msn/error.c:234
+#, c-format
+msgid "MSN Error: %s\n"
+msgstr "MSN 错误:%s\n"
+
 #: src/protocols/msn/msn.c:71
 msgid "Your new MSN friendly name is too long."
 msgstr "新的 MSN 友好名称太长。"
 
-#: src/protocols/msn/msn.c:178
+#: src/protocols/msn/msn.c:190
 msgid "Set your friendly name."
 msgstr "设置您的友好名称。"
 
-#: src/protocols/msn/msn.c:179
+#: src/protocols/msn/msn.c:191
 msgid "This is the name that other MSN buddies will see you as."
 msgstr "这是其他的 MSN 好友看到的名字。"
 
-#: src/protocols/msn/msn.c:191
+#: src/protocols/msn/msn.c:203
 msgid "Set your home phone number."
 msgstr "设置您的家庭电话号码。"
 
-#: src/protocols/msn/msn.c:202
+#: src/protocols/msn/msn.c:214
 msgid "Set your work phone number."
 msgstr "设置您的工作电话号码。"
 
-#: src/protocols/msn/msn.c:213
+#: src/protocols/msn/msn.c:225
 msgid "Set your mobile phone number."
 msgstr "设置您的移动电话号码。"
 
-#: src/protocols/msn/msn.c:222
+#: src/protocols/msn/msn.c:234
 msgid "Allow MSN Mobile pages?"
 msgstr "允许 MSN 移动寻呼吗?"
 
-#: src/protocols/msn/msn.c:223
+#: src/protocols/msn/msn.c:235
 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?"
@@ -6044,94 +6097,89 @@
 "在您的允许之下,您的好友可以给您的移动电话或其它移动设备发送 MSN 移动寻呼。您"
 "想要允许还是禁止这一功能?"
 
-#: src/protocols/msn/msn.c:227
+#: src/protocols/msn/msn.c:239
 msgid "Allow"
 msgstr "允许"
 
-#: src/protocols/msn/msn.c:228
+#: src/protocols/msn/msn.c:240
 msgid "Disallow"
 msgstr "禁止"
 
-#: src/protocols/msn/msn.c:245
+#: src/protocols/msn/msn.c:257
 msgid "Send a mobile message."
 msgstr "发送移动消息。"
 
-#: src/protocols/msn/msn.c:247
+#: src/protocols/msn/msn.c:259
 msgid "Page"
 msgstr "寻呼"
 
-#: src/protocols/msn/msn.c:335 src/protocols/yahoo/yahoo.c:2406
-#, c-format
-msgid "<b>Status:</b> %s"
-msgstr "<b>状态:</b> %s"
-
-#: src/protocols/msn/msn.c:348 src/protocols/msn/msn.c:646
+#: src/protocols/msn/msn.c:360 src/protocols/msn/msn.c:661
 #: src/protocols/msn/state.c:32
 msgid "Away From Computer"
 msgstr "远离电脑"
 
-#: src/protocols/msn/msn.c:349 src/protocols/msn/msn.c:648
-#: src/protocols/msn/state.c:31 src/protocols/yahoo/yahoo.c:2274
-#: src/protocols/yahoo/yahoo.c:2600 src/protocols/yahoo/yahoo.c:2714
+#: src/protocols/msn/msn.c:361 src/protocols/msn/msn.c:663
+#: src/protocols/msn/state.c:31 src/protocols/yahoo/yahoo.c:2275
+#: src/protocols/yahoo/yahoo.c:2601 src/protocols/yahoo/yahoo.c:2715
 msgid "Be Right Back"
 msgstr "马上回来"
 
-#: src/protocols/msn/msn.c:350 src/protocols/msn/msn.c:650
-#: src/protocols/msn/state.c:29 src/protocols/yahoo/yahoo.c:2276
-#: src/protocols/yahoo/yahoo.c:2602 src/protocols/yahoo/yahoo.c:2715
+#: src/protocols/msn/msn.c:362 src/protocols/msn/msn.c:665
+#: src/protocols/msn/state.c:29 src/protocols/yahoo/yahoo.c:2277
+#: src/protocols/yahoo/yahoo.c:2603 src/protocols/yahoo/yahoo.c:2716
 msgid "Busy"
 msgstr "忙碌"
 
-#: src/protocols/msn/msn.c:351 src/protocols/msn/msn.c:652
-#: src/protocols/msn/state.c:33 src/protocols/yahoo/yahoo.c:2284
-#: src/protocols/yahoo/yahoo.c:2610 src/protocols/yahoo/yahoo.c:2719
+#: src/protocols/msn/msn.c:363 src/protocols/msn/msn.c:667
+#: src/protocols/msn/state.c:33 src/protocols/yahoo/yahoo.c:2285
+#: src/protocols/yahoo/yahoo.c:2611 src/protocols/yahoo/yahoo.c:2720
 msgid "On The Phone"
 msgstr "接听电话"
 
-#: src/protocols/msn/msn.c:352 src/protocols/msn/msn.c:654
-#: src/protocols/msn/state.c:34 src/protocols/yahoo/yahoo.c:2288
-#: src/protocols/yahoo/yahoo.c:2614 src/protocols/yahoo/yahoo.c:2721
+#: src/protocols/msn/msn.c:364 src/protocols/msn/msn.c:669
+#: src/protocols/msn/state.c:34 src/protocols/yahoo/yahoo.c:2289
+#: src/protocols/yahoo/yahoo.c:2615 src/protocols/yahoo/yahoo.c:2722
 msgid "Out To Lunch"
 msgstr "外出就餐"
 
-#: src/protocols/msn/msn.c:353 src/protocols/msn/msn.c:656
-#: src/protocols/zephyr/zephyr.c:1210 src/protocols/zephyr/zephyr.c:1225
+#: src/protocols/msn/msn.c:365 src/protocols/msn/msn.c:671
+#: src/protocols/zephyr/zephyr.c:1170 src/protocols/zephyr/zephyr.c:1185
 msgid "Hidden"
 msgstr "隐身"
 
-#: src/protocols/msn/msn.c:365
+#: src/protocols/msn/msn.c:377
 msgid "Set Friendly Name"
 msgstr "设置友好的名称"
 
-#: src/protocols/msn/msn.c:373
+#: src/protocols/msn/msn.c:385
 msgid "Set Home Phone Number"
 msgstr "设置家庭电话号码"
 
-#: src/protocols/msn/msn.c:379
+#: src/protocols/msn/msn.c:391
 msgid "Set Work Phone Number"
 msgstr "设置工作电话号码"
 
-#: src/protocols/msn/msn.c:385
+#: src/protocols/msn/msn.c:397
 msgid "Set Mobile Phone Number"
 msgstr "设置移动电话号码"
 
-#: src/protocols/msn/msn.c:394
+#: src/protocols/msn/msn.c:406
 msgid "Enable/Disable Mobile Devices"
 msgstr "启用/禁用移动设备"
 
-#: src/protocols/msn/msn.c:401
+#: src/protocols/msn/msn.c:413
 msgid "Allow/Disallow Mobile Pages"
 msgstr "允许/禁止移动寻呼"
 
-#: src/protocols/msn/msn.c:427
+#: src/protocols/msn/msn.c:439
 msgid "Send to Mobile"
 msgstr "发送到移动设备"
 
-#: src/protocols/msn/msn.c:436
+#: src/protocols/msn/msn.c:448
 msgid "Initiate Chat"
 msgstr "进入聊天室"
 
-#: src/protocols/msn/msn.c:460
+#: src/protocols/msn/msn.c:472
 msgid ""
 "SSL support is needed for MSN. Please install a supported SSL library. See "
 "http://gaim.sf.net/faq-ssl.php for more information."
@@ -6139,7 +6187,7 @@
 "MSN 需要 SSL 支持。请安装本软件支持的 SSL 库。请参看 http://gaim.sf.net/faq-"
 "ssl.php 中的更多信息。"
 
-#: src/protocols/msn/msn.c:769
+#: src/protocols/msn/msn.c:784
 #, c-format
 msgid ""
 "An MSN screen name must be in the form \"user@server.com\". Perhaps you "
@@ -6148,11 +6196,11 @@
 "MSN 用户名的格式必须是“user@server.com”。可能您希望的是 %s@hotmail.com。您的"
 "允许列表未作任何更改。"
 
-#: src/protocols/msn/msn.c:773 src/protocols/msn/msn.c:813
+#: src/protocols/msn/msn.c:788 src/protocols/msn/msn.c:828
 msgid "Invalid MSN screen name"
 msgstr "无效的 MSN 用户名"
 
-#: src/protocols/msn/msn.c:809
+#: src/protocols/msn/msn.c:824
 #, c-format
 msgid ""
 "An MSN screen name must be in the form \"user@server.com\". Perhaps you "
@@ -6161,73 +6209,73 @@
 "MSN 用户名的格式必须是“user@server.com”。可能您希望的是 %s@hotmail.com。您的"
 "屏蔽列表未作任何更改。"
 
-#: src/protocols/msn/msn.c:1316 src/protocols/yahoo/yahoo.c:2898
+#: src/protocols/msn/msn.c:1331 src/protocols/yahoo/yahoo.c:2899
 msgid "<html><body><b>Error retrieving profile</b></body></html>"
 msgstr "<html><body><b>获取个人资料出错</b></body></html>"
 
 #. Age
-#: src/protocols/msn/msn.c:1386 src/protocols/oscar/oscar.c:4159
-#: src/protocols/trepia/trepia.c:285 src/protocols/trepia/trepia.c:413
-#: src/protocols/yahoo/yahoo.c:3008
+#: src/protocols/msn/msn.c:1401 src/protocols/oscar/oscar.c:4171
+#: src/protocols/trepia/trepia.c:285 src/protocols/trepia/trepia.c:404
+#: src/protocols/yahoo/yahoo.c:3009
 msgid "Age"
 msgstr "年龄"
 
 #. Gender
-#: src/protocols/msn/msn.c:1393 src/protocols/oscar/oscar.c:4145
-#: src/protocols/trepia/trepia.c:279 src/protocols/trepia/trepia.c:421
-#: src/protocols/yahoo/yahoo.c:3016
+#: src/protocols/msn/msn.c:1408 src/protocols/oscar/oscar.c:4158
+#: src/protocols/trepia/trepia.c:279 src/protocols/trepia/trepia.c:406
+#: src/protocols/yahoo/yahoo.c:3017
 msgid "Gender"
 msgstr "性别"
 
-#: src/protocols/msn/msn.c:1401 src/protocols/yahoo/yahoo.c:3012
+#: src/protocols/msn/msn.c:1416 src/protocols/yahoo/yahoo.c:3013
 msgid "Marital Status"
 msgstr "婚姻状况"
 
-#: src/protocols/msn/msn.c:1408 src/protocols/yahoo/yahoo.c:3004
+#: src/protocols/msn/msn.c:1423 src/protocols/yahoo/yahoo.c:3005
 msgid "Location"
 msgstr "位置"
 
-#: src/protocols/msn/msn.c:1416 src/protocols/yahoo/yahoo.c:3020
+#: src/protocols/msn/msn.c:1431 src/protocols/yahoo/yahoo.c:3021
 msgid "Occupation"
 msgstr "职业"
 
-#: src/protocols/msn/msn.c:1433 src/protocols/msn/msn.c:1439
-#: src/protocols/msn/msn.c:1446 src/protocols/msn/msn.c:1453
-#: src/protocols/msn/msn.c:1460
+#: src/protocols/msn/msn.c:1448 src/protocols/msn/msn.c:1454
+#: src/protocols/msn/msn.c:1461 src/protocols/msn/msn.c:1468
+#: src/protocols/msn/msn.c:1475
 msgid "A Little About Me"
 msgstr "自我介绍"
 
-#: src/protocols/msn/msn.c:1469 src/protocols/msn/msn.c:1482
-#: src/protocols/msn/msn.c:1489
+#: src/protocols/msn/msn.c:1484 src/protocols/msn/msn.c:1497
+#: src/protocols/msn/msn.c:1504
 msgid "Favorite Things"
 msgstr "收藏"
 
-#: src/protocols/msn/msn.c:1498 src/protocols/msn/msn.c:1504
-#: src/protocols/msn/msn.c:1511
+#: src/protocols/msn/msn.c:1513 src/protocols/msn/msn.c:1519
+#: src/protocols/msn/msn.c:1526
 msgid "Hobbies and Interests"
 msgstr "嗜好和兴趣"
 
-#: src/protocols/msn/msn.c:1520 src/protocols/msn/msn.c:1526
-#: src/protocols/yahoo/yahoo.c:3055
+#: src/protocols/msn/msn.c:1535 src/protocols/msn/msn.c:1541
+#: src/protocols/yahoo/yahoo.c:3056
 msgid "Favorite Quote"
 msgstr "格言"
 
-#: src/protocols/msn/msn.c:1534 src/protocols/yahoo/yahoo.c:3091
+#: src/protocols/msn/msn.c:1549 src/protocols/yahoo/yahoo.c:3092
 msgid "Last Updated"
 msgstr "上次更新"
 
 #. Homepage
-#: src/protocols/msn/msn.c:1545 src/protocols/trepia/trepia.c:289
-#: src/protocols/trepia/trepia.c:457
+#: src/protocols/msn/msn.c:1560 src/protocols/trepia/trepia.c:289
+#: src/protocols/trepia/trepia.c:419
 msgid "Homepage"
 msgstr "主页"
 
-#: src/protocols/msn/msn.c:1567 src/protocols/yahoo/yahoo.c:3106
+#: src/protocols/msn/msn.c:1582 src/protocols/yahoo/yahoo.c:3107
 #, c-format
 msgid "User information for %s unavailable"
 msgstr "%s 的用户信息不可用"
 
-#: src/protocols/msn/msn.c:1569 src/protocols/yahoo/yahoo.c:3108
+#: src/protocols/msn/msn.c:1584 src/protocols/yahoo/yahoo.c:3109
 msgid "The user's profile is empty."
 msgstr "用户的配置文件为空。"
 
@@ -6241,24 +6289,23 @@
 #. *< name
 #. *< version
 #. *  summary
-#. *  description
-#: src/protocols/msn/msn.c:1667 src/protocols/msn/msn.c:1669
+#: src/protocols/msn/msn.c:1689 src/protocols/msn/msn.c:1691
 msgid "MSN Protocol Plugin"
 msgstr "MSN 协议插件"
 
-#: src/protocols/msn/msn.c:1687 src/protocols/trepia/trepia.c:1345
+#: src/protocols/msn/msn.c:1709 src/protocols/trepia/trepia.c:1302
 msgid "Login server"
 msgstr "登录服务器"
 
-#: src/protocols/msn/msn.c:1696
+#: src/protocols/msn/msn.c:1718
 msgid "Use HTTP Method"
 msgstr "使用 HTTP 方式"
 
-#: src/protocols/msn/msn.c:1714
+#: src/protocols/msn/msn.c:1736
 msgid "Display conversation closed notices"
 msgstr "显示对话关闭通知"
 
-#: src/protocols/msn/msn.c:1719
+#: src/protocols/msn/msn.c:1741
 msgid "Display timeout notices"
 msgstr "显示超时通知"
 
@@ -6278,51 +6325,53 @@
 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:315 src/protocols/trepia/trepia.c:686
+#: src/protocols/msn/notification.c:309 src/protocols/trepia/trepia.c:635
 msgid "Retrieving buddy list"
 msgstr "正在获取好友列表"
 
-#: src/protocols/msn/notification.c:340 src/protocols/msn/notification.c:372
-#: src/protocols/oscar/oscar.c:1453
+#: src/protocols/msn/notification.c:334 src/protocols/msn/notification.c:366
+#: src/protocols/oscar/oscar.c:1451
 msgid "Password sent"
 msgstr "密码已送出"
 
-#: src/protocols/msn/notification.c:367
+#: src/protocols/msn/notification.c:361
 msgid "Unable to send password"
 msgstr "无法发送密码"
 
-#: src/protocols/msn/notification.c:403
+#: src/protocols/msn/notification.c:397
 msgid "Protocol not supported"
 msgstr "协议不支持"
 
+#: src/protocols/msn/notification.c:440
+msgid "You have been disconnected. You have signed on from another location."
+msgstr "您已经被断开。原因是您在其它位置用此用户名登入了。"
+
 #: src/protocols/msn/notification.c:445
-msgid "You have been disconnected. You have signed on from another location."
-msgstr "您已经被断开。原因是您在其它位置用此用户名登入了。"
-
-#: 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:577
+#: src/protocols/msn/notification.c:584
 #, 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:902 src/protocols/msn/notification.c:1069
+#: src/protocols/msn/notification.c:903 src/protocols/msn/notification.c:1070
 #, c-format
 msgid "The user %s (%s) wants to add you to their buddy list."
 msgstr "用户 %s(%s) 想要将您添加为好友。"
 
-#: src/protocols/msn/notification.c:1596
+#: src/protocols/msn/notification.c:1362
+#, c-format
+msgid ""
+"Your MSN buddy list for %s is temporarily unavailable. Please wait and try "
+"again."
+msgstr "您 %s 的 MSN 好友列表临时不可用。请稍候再试一次。"
+
+#: src/protocols/msn/notification.c:1607
 msgid "Unable to transfer to notification server"
 msgstr "无法传送到通知服务器。"
 
-#: src/protocols/msn/notification.c:1752
+#: src/protocols/msn/notification.c:1776
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -6344,7 +6393,11 @@
 "\n"
 "维护完成后,您将能够成功登入。"
 
-#: src/protocols/msn/servconn.c:536
+#: src/protocols/msn/servconn.c:389
+msgid "IO Error."
+msgstr "输入输出出错。"
+
+#: src/protocols/msn/servconn.c:527
 msgid "Received HTTP error. Please report this."
 msgstr "收到了 HTTP 错误。请进行报告。"
 
@@ -6357,7 +6410,7 @@
 msgid "%s has closed the conversation window."
 msgstr "%s 已经关闭了对话窗口。"
 
-#: src/protocols/msn/switchboard.c:288
+#: src/protocols/msn/switchboard.c:300
 msgid "An MSN message may not have been received."
 msgstr "MSN 消息可能没有收到。"
 
@@ -6407,7 +6460,7 @@
 msgid "Get Info"
 msgstr "信息"
 
-#: src/protocols/napster/napster.c:555 src/protocols/oscar/oscar.c:5449
+#: src/protocols/napster/napster.c:555 src/protocols/oscar/oscar.c:5441
 #: src/protocols/toc/toc.c:1259
 msgid "_Group:"
 msgstr "组(_G):"
@@ -6422,8 +6475,7 @@
 #. *< name
 #. *< version
 #. *  summary
-#. *  description
-#: src/protocols/napster/napster.c:631 src/protocols/napster/napster.c:633
+#: src/protocols/napster/napster.c:640 src/protocols/napster/napster.c:642
 msgid "NAPSTER Protocol Plugin"
 msgstr "NAPSTER 协议插件"
 
@@ -6542,7 +6594,7 @@
 msgid "Chat is currently unavailable"
 msgstr "聊天目前不可用"
 
-#: src/protocols/oscar/oscar.c:681 src/protocols/oscar/oscar.c:747
+#: src/protocols/oscar/oscar.c:681 src/protocols/oscar/oscar.c:745
 msgid "Couldn't connect to host"
 msgstr "无法连接到主机"
 
@@ -6550,7 +6602,7 @@
 msgid "Screen name sent"
 msgstr "用户名已发送"
 
-#: src/protocols/oscar/oscar.c:706
+#: src/protocols/oscar/oscar.c:705
 #, c-format
 msgid ""
 "Unable to login: Could not sign on as %s because the screen name is "
@@ -6560,45 +6612,45 @@
 "无法登入:无法以 %s 登入,原因是用户名无效。用户名必须以字母开头,其中只能包"
 "含字母、数字和空格,或者只包含数字。"
 
-#: src/protocols/oscar/oscar.c:735
+#: src/protocols/oscar/oscar.c:733
 msgid "Unable to login to AIM"
 msgstr "无法登入 AIM"
 
-#: src/protocols/oscar/oscar.c:839 src/protocols/oscar/oscar.c:1257
+#: src/protocols/oscar/oscar.c:837 src/protocols/oscar/oscar.c:1255
 msgid "Could Not Connect"
 msgstr "无法连接"
 
-#: src/protocols/oscar/oscar.c:847
+#: src/protocols/oscar/oscar.c:845
 msgid "Connection established, cookie sent"
 msgstr "连接已建立,已发送 cookie"
 
-#: src/protocols/oscar/oscar.c:960 src/protocols/yahoo/yahoo_filexfer.c:209
+#: src/protocols/oscar/oscar.c:958 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:965
+#: src/protocols/oscar/oscar.c:963
 msgid "Unable to create new connection."
 msgstr "无法创建新连接。"
 
-#: src/protocols/oscar/oscar.c:1036
+#: src/protocols/oscar/oscar.c:1034
 msgid "Unable to establish listener socket."
 msgstr "无法建立监听套接字。"
 
-#: src/protocols/oscar/oscar.c:1141 src/protocols/toc/toc.c:571
+#: src/protocols/oscar/oscar.c:1139 src/protocols/toc/toc.c:571
 msgid "Incorrect nickname or password."
 msgstr "昵称或密码不对。"
 
-#: src/protocols/oscar/oscar.c:1146
+#: src/protocols/oscar/oscar.c:1144
 msgid "Your account is currently suspended."
 msgstr "您的账户被停用。"
 
 #. service temporarily unavailable
-#: src/protocols/oscar/oscar.c:1150
+#: src/protocols/oscar/oscar.c:1148
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "AOL 即时通讯服务暂时不可用。"
 
-#: src/protocols/oscar/oscar.c:1155
+#: src/protocols/oscar/oscar.c:1153
 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."
@@ -6606,21 +6658,21 @@
 "您连接和断开得太频繁。请等十分钟,然后再试一次。如果您继续重试,您等的时间可"
 "能会更长。"
 
-#: src/protocols/oscar/oscar.c:1160
+#: src/protocols/oscar/oscar.c:1158
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr "您使用的客户版本太老。请在 %s 升级"
 
-#: src/protocols/oscar/oscar.c:1192
+#: src/protocols/oscar/oscar.c:1190
 msgid "Internal Error"
 msgstr "内部错误"
 
-#: src/protocols/oscar/oscar.c:1264
+#: src/protocols/oscar/oscar.c:1262
 msgid "Received authorization"
 msgstr "收到的认证"
 
-#: src/protocols/oscar/oscar.c:1300 src/protocols/oscar/oscar.c:1330
-#: src/protocols/oscar/oscar.c:1418
+#: src/protocols/oscar/oscar.c:1298 src/protocols/oscar/oscar.c:1328
+#: src/protocols/oscar/oscar.c:1416
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
@@ -6628,15 +6680,15 @@
 msgstr ""
 "您即将被断开。您可能想要使用 TOC 直到这一问题被修正。请检查 %s 上的更新。"
 
-#: src/protocols/oscar/oscar.c:1303 src/protocols/oscar/oscar.c:1333
+#: src/protocols/oscar/oscar.c:1301 src/protocols/oscar/oscar.c:1331
 msgid "Gaim was unable to get a valid AIM login hash."
 msgstr "Gaim 无法获取有效的 AIM 登录码。"
 
-#: src/protocols/oscar/oscar.c:1421
+#: src/protocols/oscar/oscar.c:1419
 msgid "Gaim was unable to get a valid login hash."
 msgstr "Gaim 无法获取有效的登录码。"
 
-#: src/protocols/oscar/oscar.c:2003 src/protocols/oscar/oscar.c:5912
+#: src/protocols/oscar/oscar.c:2001 src/protocols/oscar/oscar.c:5883
 #, c-format
 msgid "Direct IM with %s established"
 msgstr "与 %s 的二人世界已建立"
@@ -6645,12 +6697,12 @@
 msgid "(There was an error receiving this message)"
 msgstr "(接收此消息出错)"
 
-#: src/protocols/oscar/oscar.c:2512
+#: src/protocols/oscar/oscar.c:2517
 #, c-format
 msgid "%s has just asked to directly connect to %s"
 msgstr "%s 刚刚请求和 %s 二人世界"
 
-#: src/protocols/oscar/oscar.c:2515
+#: src/protocols/oscar/oscar.c:2520
 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 "
@@ -6659,46 +6711,46 @@
 "现在需要在两台计算机之间建立直接连接,这对于即时传送图像是必要的。但是这将暴"
 "露您的 IP 地址,所以可能造成潜在的隐私风险。"
 
-#: src/protocols/oscar/oscar.c:2520 src/protocols/oscar/oscar.c:6294
+#: src/protocols/oscar/oscar.c:2525 src/protocols/oscar/oscar.c:6265
 msgid "Connect"
 msgstr "连接"
 
-#: src/protocols/oscar/oscar.c:2547
+#: src/protocols/oscar/oscar.c:2552
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr "请同意我将您加入好友。"
 
-#: src/protocols/oscar/oscar.c:2555
+#: src/protocols/oscar/oscar.c:2560
 msgid "Authorization Request Message:"
 msgstr "认证请求消息:"
 
-#: src/protocols/oscar/oscar.c:2556
+#: src/protocols/oscar/oscar.c:2561
 msgid "Please authorize me!"
 msgstr "请同意我将您加入好友!"
 
-#: src/protocols/oscar/oscar.c:2585
+#: src/protocols/oscar/oscar.c:2590
 #, 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:2590 src/protocols/oscar/oscar.c:2592
+#: src/protocols/oscar/oscar.c:2595 src/protocols/oscar/oscar.c:2597
 msgid "Request Authorization"
 msgstr "请求认证"
 
-#: src/protocols/oscar/oscar.c:2628 src/protocols/oscar/oscar.c:2630
-#: src/protocols/oscar/oscar.c:2637 src/protocols/oscar/oscar.c:2719
-#: src/protocols/oscar/oscar.c:2739 src/protocols/oscar/oscar.c:3095
-#: src/protocols/oscar/oscar.c:3155 src/protocols/oscar/oscar.c:5370
-#: src/protocols/oscar/oscar.c:5416
+#: src/protocols/oscar/oscar.c:2633 src/protocols/oscar/oscar.c:2635
+#: src/protocols/oscar/oscar.c:2642 src/protocols/oscar/oscar.c:2724
+#: src/protocols/oscar/oscar.c:2744 src/protocols/oscar/oscar.c:3100
+#: src/protocols/oscar/oscar.c:3160 src/protocols/oscar/oscar.c:5362
+#: src/protocols/oscar/oscar.c:5408
 msgid "No reason given."
 msgstr "没有给出理由。"
 
-#: src/protocols/oscar/oscar.c:2636
+#: src/protocols/oscar/oscar.c:2641
 msgid "Authorization Denied Message:"
 msgstr "认证拒绝消息:"
 
-#: src/protocols/oscar/oscar.c:2719
+#: src/protocols/oscar/oscar.c:2724
 #, c-format
 msgid ""
 "The user %u wants to add you to their buddy list for the following reason:\n"
@@ -6707,11 +6759,11 @@
 "用户 %u 想要将您加为他/她的好友,理由如下:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2727 src/protocols/oscar/oscar.c:5376
+#: src/protocols/oscar/oscar.c:2732 src/protocols/oscar/oscar.c:5368
 msgid "Authorization Request"
 msgstr "认证请求"
 
-#: src/protocols/oscar/oscar.c:2739
+#: src/protocols/oscar/oscar.c:2744
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -6721,17 +6773,17 @@
 "用户 %u 拒绝了您将他/她加为好友的请求,原因如下:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2740
+#: src/protocols/oscar/oscar.c:2745
 msgid "ICQ authorization denied."
 msgstr "ICQ 请求认证被拒绝。"
 
 #. Someone has granted you authorization
-#: src/protocols/oscar/oscar.c:2747
+#: src/protocols/oscar/oscar.c:2752
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
 msgstr "用户 %u 同意您将他/她加为好友。"
 
-#: src/protocols/oscar/oscar.c:2755
+#: src/protocols/oscar/oscar.c:2760
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -6744,7 +6796,7 @@
 "发出人:%s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2763
+#: src/protocols/oscar/oscar.c:2768
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -6757,7 +6809,7 @@
 "发出人:%s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2771
+#: src/protocols/oscar/oscar.c:2776
 #, c-format
 msgid ""
 "You have received an ICQ email from %s [%s]\n"
@@ -6770,32 +6822,32 @@
 "内容是:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2792
+#: src/protocols/oscar/oscar.c:2797
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
 msgstr "ICQ 用户 %u 给您发送了一个好友:%s (%s)"
 
-#: src/protocols/oscar/oscar.c:2798
+#: src/protocols/oscar/oscar.c:2803
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr "您是否想要将此人加为好友?"
 
-#: src/protocols/oscar/oscar.c:2802
+#: src/protocols/oscar/oscar.c:2807
 msgid "Decline"
 msgstr "拒绝"
 
-#: src/protocols/oscar/oscar.c:2884
+#: src/protocols/oscar/oscar.c:2889
 #, 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] "您错过了 %2$s 的 %1$hu 条消息,原因是这些消息无效。"
 
-#: src/protocols/oscar/oscar.c:2893
+#: src/protocols/oscar/oscar.c:2898
 #, 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] "您错过了 %2$s 的 %1$hu 条消息,原因是这些消息太大。"
 
-#: src/protocols/oscar/oscar.c:2902
+#: src/protocols/oscar/oscar.c:2907
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -6803,190 +6855,197 @@
 "You missed %hu messages from %s because the rate limit has been exceeded."
 msgstr[0] "您错过了 %2$s 的 %1$hu 条消息,原因是达到了等级限制。"
 
-#: src/protocols/oscar/oscar.c:2911
+#: src/protocols/oscar/oscar.c:2916
 #, 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] "您错过了 %2$s 的 %1$hu 条消息,原因是他/她太可恶了。"
 
-#: src/protocols/oscar/oscar.c:2920
+#: src/protocols/oscar/oscar.c:2925
 #, 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] "您错过了 %2$s 的 %1$hu 条消息,原因是您太可恶了。"
 
-#: src/protocols/oscar/oscar.c:2929
+#: src/protocols/oscar/oscar.c:2934
 #, 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] "您错过了 %2$s 的 %1$hu 条消息,原因未知。"
 
-#: src/protocols/oscar/oscar.c:2945 src/protocols/oscar/oscar.c:4764
-#: src/protocols/oscar/oscar.c:6420
+#: src/protocols/oscar/oscar.c:2950 src/protocols/oscar/oscar.c:4756
+#: src/protocols/oscar/oscar.c:6391
 msgid "Free For Chat"
 msgstr "无事闲聊"
 
-#: src/protocols/oscar/oscar.c:2949 src/protocols/oscar/oscar.c:4758
-#: src/protocols/oscar/oscar.c:6418
+#: src/protocols/oscar/oscar.c:2954 src/protocols/oscar/oscar.c:4750
+#: src/protocols/oscar/oscar.c:6389
 msgid "Not Available"
 msgstr "不可用"
 
-#: src/protocols/oscar/oscar.c:2951 src/protocols/oscar/oscar.c:4761
-#: src/protocols/oscar/oscar.c:6419
+#: src/protocols/oscar/oscar.c:2956 src/protocols/oscar/oscar.c:4753
+#: src/protocols/oscar/oscar.c:6390
 msgid "Occupied"
 msgstr "琐事缠身"
 
-#: src/protocols/oscar/oscar.c:2955
+#: src/protocols/oscar/oscar.c:2960
 msgid "Web Aware"
 msgstr "网上留意"
 
-#: src/protocols/oscar/oscar.c:2998
+#: src/protocols/oscar/oscar.c:3003
 #, c-format
 msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<HR>%s"
 msgstr "<B>UIN:</B> %s<BR><B>状态:</B> %s<HR>%s"
 
-#: src/protocols/oscar/oscar.c:3057
+#: src/protocols/oscar/oscar.c:3062
 #, c-format
 msgid "SNAC threw error: %s\n"
 msgstr "SNAC 扔出错误:%s\n"
 
-#: src/protocols/oscar/oscar.c:3058
+#: src/protocols/oscar/oscar.c:3063
 msgid "Unknown error"
 msgstr "未知错误"
 
 #. Data is assumed to be the destination sn
-#: src/protocols/oscar/oscar.c:3093
+#: src/protocols/oscar/oscar.c:3098
 #, c-format
 msgid "Your message to %s did not get sent:"
 msgstr "您给 %s 的消息未发送:"
 
-#: src/protocols/oscar/oscar.c:3152
+#: src/protocols/oscar/oscar.c:3157
 #, c-format
 msgid "User information for %s unavailable:"
 msgstr "%s 的用户信息不可用:"
 
-#: src/protocols/oscar/oscar.c:3191
+#: src/protocols/oscar/oscar.c:3181
 msgid "Voice"
 msgstr "语音"
 
-#: src/protocols/oscar/oscar.c:3194
+#: src/protocols/oscar/oscar.c:3184
 msgid "AIM Direct IM"
 msgstr "AIM 二人世界"
 
+#: src/protocols/oscar/oscar.c:3187
+msgid "Chat"
+msgstr "聊天"
+
+#: src/protocols/oscar/oscar.c:3190 src/protocols/oscar/oscar.c:6501
+msgid "Get File"
+msgstr "获取文件"
+
 #: src/protocols/oscar/oscar.c:3197
-msgid "Chat"
-msgstr "聊天"
-
-#: src/protocols/oscar/oscar.c:3200 src/protocols/oscar/oscar.c:6530
-msgid "Get File"
-msgstr "获取文件"
-
-#: src/protocols/oscar/oscar.c:3207
 msgid "Games"
 msgstr "游戏"
 
-#: src/protocols/oscar/oscar.c:3210
+#: src/protocols/oscar/oscar.c:3200
 msgid "Add-Ins"
 msgstr "外挂"
 
-#: src/protocols/oscar/oscar.c:3213
+#: src/protocols/oscar/oscar.c:3203
 msgid "Send Buddy List"
 msgstr "发送好友列表"
 
-#: src/protocols/oscar/oscar.c:3216
+#: src/protocols/oscar/oscar.c:3206
 msgid "ICQ Direct Connect"
 msgstr "ICQ 直接连接"
 
-#: src/protocols/oscar/oscar.c:3219
+#: src/protocols/oscar/oscar.c:3209
 msgid "AP User"
 msgstr "AP 用户"
 
-#: src/protocols/oscar/oscar.c:3222
+#: src/protocols/oscar/oscar.c:3212
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
-#: src/protocols/oscar/oscar.c:3225
+#: src/protocols/oscar/oscar.c:3215
 msgid "Nihilist"
 msgstr "Nihilist"
 
-#: src/protocols/oscar/oscar.c:3228
+#: src/protocols/oscar/oscar.c:3218
 msgid "ICQ Server Relay"
 msgstr "ICQ 服务器转发"
 
-#: src/protocols/oscar/oscar.c:3231
+#: src/protocols/oscar/oscar.c:3221
 msgid "Old ICQ UTF8"
 msgstr "旧的 ICQ UTF8"
 
-#: src/protocols/oscar/oscar.c:3234
+#: src/protocols/oscar/oscar.c:3224
 msgid "Trillian Encryption"
 msgstr "Trillian 加密"
 
-#: src/protocols/oscar/oscar.c:3237
+#: src/protocols/oscar/oscar.c:3227
 msgid "ICQ UTF8"
 msgstr "ICQ UTF8"
 
-#: src/protocols/oscar/oscar.c:3240
+#: src/protocols/oscar/oscar.c:3230
 msgid "Hiptop"
 msgstr "Hiptop"
 
+#: src/protocols/oscar/oscar.c:3233
+msgid "Security Enabled"
+msgstr "安全已启用"
+
+#: src/protocols/oscar/oscar.c:3236
+msgid "Video Chat"
+msgstr "可视聊天"
+
+#: src/protocols/oscar/oscar.c:3240
+msgid "iChat AV"
+msgstr "iChat AV"
+
 #: src/protocols/oscar/oscar.c:3243
-msgid "Security Enabled"
-msgstr "安全已启用"
+msgid "Live Video"
+msgstr "实时视频"
 
 #: src/protocols/oscar/oscar.c:3246
-msgid "Video Chat"
-msgstr "可视聊天"
-
-#: src/protocols/oscar/oscar.c:3250
-msgid "iChat AV"
-msgstr "iChat AV"
-
-#: src/protocols/oscar/oscar.c:3253
-msgid "Live Video"
-msgstr "实时视频"
-
-#: src/protocols/oscar/oscar.c:3256
 msgid "Camera"
 msgstr "相机"
 
-#: src/protocols/oscar/oscar.c:3285
+#: src/protocols/oscar/oscar.c:3275
 #, c-format
 msgid "Username: <b>%s</b><br>\n"
 msgstr "用户名: <b>%s</b><br>\n"
 
-#: src/protocols/oscar/oscar.c:3286
+#: src/protocols/oscar/oscar.c:3276
 #, c-format
 msgid "Warning Level: <b>%d%%</b><br>\n"
 msgstr "警告级别: <b>%d%%</b><br>\n"
 
-#: src/protocols/oscar/oscar.c:3289
+#: src/protocols/oscar/oscar.c:3279
 #, c-format
 msgid "Online Since: <b>%s</b><br>\n"
 msgstr "上线时间: <b>%s</b><br>\n"
 
-#: src/protocols/oscar/oscar.c:3293
+#: src/protocols/oscar/oscar.c:3283
 #, c-format
 msgid "Member Since: <b>%s</b><br>\n"
 msgstr "成员时间: <b>%s</b><br>\n"
 
-#: src/protocols/oscar/oscar.c:3298
+#: src/protocols/oscar/oscar.c:3288
 #, c-format
 msgid "Idle: <b>%s</b>"
 msgstr "瞌睡: <b>%s</b>"
 
-#: src/protocols/oscar/oscar.c:3301
+#: src/protocols/oscar/oscar.c:3291
 msgid "Idle: <b>Active</b>"
 msgstr "瞌睡:<b>活跃</b>"
 
-#: src/protocols/oscar/oscar.c:3373
+#: src/protocols/oscar/oscar.c:3363
 msgid "Your AIM connection may be lost."
 msgstr "您的 AIM 连接可能已丢失。"
 
-#: src/protocols/oscar/oscar.c:3774
+#. The conversion failed!
+#: src/protocols/oscar/oscar.c:3549
+msgid ""
+"[Unable to display a message from this user because it contained invalid "
+"characters.]"
+msgstr "[无法显示来自此用户的信息,原因是其中包含了无效的字符。"
+
+#: src/protocols/oscar/oscar.c:3767
 msgid "Rate limiting error."
 msgstr "速度限制错误。"
 
-#: src/protocols/oscar/oscar.c:3775
+#: src/protocols/oscar/oscar.c:3768
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
@@ -6994,162 +7053,162 @@
 "您试图的最后一次操作未执行,原因是您已经得到了速度极限。请等 10 秒,然后再试"
 "一次。"
 
-#: src/protocols/oscar/oscar.c:3838
+#: src/protocols/oscar/oscar.c:3831
 msgid ""
 "You have been disconnected because you have signed on with this screen name "
 "at another location."
 msgstr "您已经断开了连接,原因是您在其它位置用此用户名登入了。"
 
-#: src/protocols/oscar/oscar.c:3840
+#: src/protocols/oscar/oscar.c:3833
 msgid "You have been signed off for an unknown reason."
 msgstr "您已经登出了,原因未知。"
 
-#: src/protocols/oscar/oscar.c:3871
+#: src/protocols/oscar/oscar.c:3864
 msgid "Finalizing connection"
 msgstr "正在完成连接"
 
-#: src/protocols/oscar/oscar.c:4131 src/protocols/oscar/oscar.c:4137
+#: src/protocols/oscar/oscar.c:4145 src/protocols/oscar/oscar.c:4152
 msgid "Email Address"
 msgstr "电子邮件地址"
 
-#: src/protocols/oscar/oscar.c:4142
+#: src/protocols/oscar/oscar.c:4157
 msgid "Mobile Phone"
 msgstr "移动电话"
 
-#: src/protocols/oscar/oscar.c:4145 src/protocols/trepia/trepia.c:281
-#: src/protocols/trepia/trepia.c:422
+#: src/protocols/oscar/oscar.c:4158 src/protocols/trepia/trepia.c:281
+#: src/protocols/trepia/trepia.c:407
 msgid "Female"
 msgstr "女"
 
-#: src/protocols/oscar/oscar.c:4145 src/protocols/trepia/trepia.c:280
-#: src/protocols/trepia/trepia.c:422
+#: src/protocols/oscar/oscar.c:4158 src/protocols/trepia/trepia.c:280
+#: src/protocols/trepia/trepia.c:407
 msgid "Male"
 msgstr "男"
 
-#: src/protocols/oscar/oscar.c:4162
+#: src/protocols/oscar/oscar.c:4174
 msgid "Personal Web Page"
 msgstr "个人主页"
 
-#: src/protocols/oscar/oscar.c:4165
+#: src/protocols/oscar/oscar.c:4178
 msgid "Additional Information"
 msgstr "额外信息"
 
-#: src/protocols/oscar/oscar.c:4169
+#: src/protocols/oscar/oscar.c:4183
 msgid "Home Address"
 msgstr "家庭住址"
 
-#: src/protocols/oscar/oscar.c:4180 src/protocols/oscar/oscar.c:4196
+#: src/protocols/oscar/oscar.c:4187 src/protocols/oscar/oscar.c:4195
 msgid "Zip Code"
 msgstr "邮政编码"
 
-#: src/protocols/oscar/oscar.c:4185
+#: src/protocols/oscar/oscar.c:4191
 msgid "Work Address"
 msgstr "办公地址"
 
-#: src/protocols/oscar/oscar.c:4201
+#: src/protocols/oscar/oscar.c:4199
 msgid "Work Information"
 msgstr "工作信息"
 
-#: src/protocols/oscar/oscar.c:4203
+#: src/protocols/oscar/oscar.c:4200
 msgid "Company"
 msgstr "公司"
 
-#: src/protocols/oscar/oscar.c:4206
+#: src/protocols/oscar/oscar.c:4201
 msgid "Division"
 msgstr "部门"
 
-#: src/protocols/oscar/oscar.c:4209
+#: src/protocols/oscar/oscar.c:4202
 msgid "Position"
 msgstr "职务"
 
-#: src/protocols/oscar/oscar.c:4212
+#: src/protocols/oscar/oscar.c:4204
 msgid "Web Page"
 msgstr "网页"
 
-#: src/protocols/oscar/oscar.c:4218
+#: src/protocols/oscar/oscar.c:4210
 #, c-format
 msgid "ICQ Info for %s"
 msgstr "%s 的 ICQ 信息"
 
-#: src/protocols/oscar/oscar.c:4268
+#: src/protocols/oscar/oscar.c:4260
 msgid "Pop-Up Message"
 msgstr "弹出消息"
 
-#: src/protocols/oscar/oscar.c:4289
+#: src/protocols/oscar/oscar.c:4281
 #, c-format
 msgid "The following screen names are associated with %s"
 msgstr "下列用户名已经和 %s 关联"
 
-#: src/protocols/oscar/oscar.c:4293
+#: src/protocols/oscar/oscar.c:4285
 msgid "Search Results"
 msgstr "搜索结果"
 
-#: src/protocols/oscar/oscar.c:4310
+#: src/protocols/oscar/oscar.c:4302
 #, c-format
 msgid "No results found for email address %s"
 msgstr "未找到与电子邮件地址 %s 匹配的结果"
 
-#: src/protocols/oscar/oscar.c:4331
+#: src/protocols/oscar/oscar.c:4323
 #, c-format
 msgid "You should receive an email asking to confirm %s."
 msgstr "您应当收到询问确认 %s 的邮件。"
 
-#: src/protocols/oscar/oscar.c:4333
+#: src/protocols/oscar/oscar.c:4325
 msgid "Account Confirmation Requested"
 msgstr "请求了账户确认"
 
-#: src/protocols/oscar/oscar.c:4361
+#: src/protocols/oscar/oscar.c:4353
 msgid "Error Changing Account Info"
 msgstr "更改账户信息出错"
 
-#: src/protocols/oscar/oscar.c:4364
+#: src/protocols/oscar/oscar.c:4356
 #, 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:4367
+#: src/protocols/oscar/oscar.c:4359
 #, 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:4370
+#: src/protocols/oscar/oscar.c:4362
 #, 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:4373
+#: src/protocols/oscar/oscar.c:4365
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because there is already a "
 "request pending for this screen name."
 msgstr "错误 0x%04x:无法更改电子邮件地址,原因是此用户名已经有被推后的请求。"
 
-#: src/protocols/oscar/oscar.c:4376
+#: src/protocols/oscar/oscar.c:4368
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address has "
 "too many screen names associated with it."
 msgstr "错误 0x%04x:无法更改电子邮件地址,原因是给定的地址关联的用户名太多。"
 
-#: src/protocols/oscar/oscar.c:4379
+#: src/protocols/oscar/oscar.c:4371
 #, 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:4382
+#: src/protocols/oscar/oscar.c:4374
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "错误 0x%04x:未知错误。"
 
-#: src/protocols/oscar/oscar.c:4392
+#: src/protocols/oscar/oscar.c:4384
 #, c-format
 msgid ""
 "Your screen name is currently formatted as follows:\n"
@@ -7158,20 +7217,20 @@
 "您的用户名格式化后如下:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:4393 src/protocols/oscar/oscar.c:4400
+#: src/protocols/oscar/oscar.c:4385 src/protocols/oscar/oscar.c:4392
 msgid "Account Info"
 msgstr "账户信息"
 
-#: src/protocols/oscar/oscar.c:4398
+#: src/protocols/oscar/oscar.c:4390
 #, c-format
 msgid "The email address for %s is %s"
 msgstr "%s 的电子邮件地址为 %s"
 
-#: src/protocols/oscar/oscar.c:4613
+#: src/protocols/oscar/oscar.c:4605
 msgid "Unable to set AIM profile."
 msgstr "无法设置 AIM 配置文件。"
 
-#: src/protocols/oscar/oscar.c:4614
+#: src/protocols/oscar/oscar.c:4606
 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 "
@@ -7180,7 +7239,7 @@
 "您在登录过程完成之前请求设定配置文件。您的配置文件尚未设定;请在您完全连接后"
 "再试一次。"
 
-#: src/protocols/oscar/oscar.c:4641
+#: src/protocols/oscar/oscar.c:4633
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  Gaim has truncated "
@@ -7190,19 +7249,19 @@
 "truncated it for you."
 msgstr[0] "已经超过了配置文件的最大长度 %d 字节。Gaim 为您自动截断了。"
 
-#: src/protocols/oscar/oscar.c:4646
+#: src/protocols/oscar/oscar.c:4638
 msgid "Profile too long."
 msgstr "配置文件太长。"
 
-#: src/protocols/oscar/oscar.c:4662 src/protocols/oscar/oscar.c:6425
+#: src/protocols/oscar/oscar.c:4654 src/protocols/oscar/oscar.c:6396
 msgid "Visible"
 msgstr "显身"
 
-#: src/protocols/oscar/oscar.c:4680
+#: src/protocols/oscar/oscar.c:4672
 msgid "Unable to set AIM away message."
 msgstr "无法设置 AIM 离开消息。"
 
-#: src/protocols/oscar/oscar.c:4681
+#: src/protocols/oscar/oscar.c:4673
 msgid ""
 "You have probably requested to set your away message before the login "
 "procedure completed.  You remain in a \"present\" state; try setting it "
@@ -7211,7 +7270,7 @@
 "您在登录过程完成之前请求设定离开消息。您仍将处于目前的状态;请在您完全连接后"
 "再试一次。"
 
-#: src/protocols/oscar/oscar.c:4721
+#: src/protocols/oscar/oscar.c:4713
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  Gaim has "
@@ -7223,11 +7282,11 @@
 "已经超过了离开消息的最大长度 %d 字节。Gaim 自动为您截断了消息,并将您设为离"
 "开。"
 
-#: src/protocols/oscar/oscar.c:4726
+#: src/protocols/oscar/oscar.c:4718
 msgid "Away message too long."
 msgstr "离开消息太长。"
 
-#: src/protocols/oscar/oscar.c:4819
+#: src/protocols/oscar/oscar.c:4811
 #, c-format
 msgid ""
 "Could not add the buddy %s because the screen name is invalid.  Screen names "
@@ -7237,16 +7296,16 @@
 "无法添加好友 %s,原因是用户名无效。用户名必须以字母开头,其中只能包含字母、数"
 "字和空格,或者只包含数字。该好友将从您的好友列表中删除。"
 
-#: src/protocols/oscar/oscar.c:4820 src/protocols/oscar/oscar.c:5237
-#: src/protocols/oscar/oscar.c:5250
+#: src/protocols/oscar/oscar.c:4812 src/protocols/oscar/oscar.c:5229
+#: src/protocols/oscar/oscar.c:5242
 msgid "Unable To Add"
 msgstr "无法添加"
 
-#: src/protocols/oscar/oscar.c:4956
+#: src/protocols/oscar/oscar.c:4948
 msgid "Unable To Retrieve Buddy List"
 msgstr "无法获取好友列表"
 
-#: src/protocols/oscar/oscar.c:4957
+#: src/protocols/oscar/oscar.c:4949
 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 "
@@ -7255,13 +7314,13 @@
 "Gaim 暂时无法从 AIM 服务器获取您的好友列表。您的好友列表没有丢失,可能稍等几"
 "小时就能用了。"
 
-#: src/protocols/oscar/oscar.c:5133 src/protocols/oscar/oscar.c:5134
-#: src/protocols/oscar/oscar.c:5139 src/protocols/oscar/oscar.c:5294
-#: src/protocols/oscar/oscar.c:5295 src/protocols/oscar/oscar.c:5300
+#: src/protocols/oscar/oscar.c:5125 src/protocols/oscar/oscar.c:5126
+#: src/protocols/oscar/oscar.c:5131 src/protocols/oscar/oscar.c:5286
+#: src/protocols/oscar/oscar.c:5287 src/protocols/oscar/oscar.c:5292
 msgid "Orphans"
 msgstr "孤儿"
 
-#: src/protocols/oscar/oscar.c:5236
+#: src/protocols/oscar/oscar.c:5228
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -7269,11 +7328,11 @@
 msgstr ""
 "无法将 %s 加为好友,原因是您的好友太多。请删除其中一个好友,然后再试一次。"
 
-#: src/protocols/oscar/oscar.c:5236 src/protocols/oscar/oscar.c:5249
+#: src/protocols/oscar/oscar.c:5228 src/protocols/oscar/oscar.c:5241
 msgid "(no name)"
 msgstr "(无名称)"
 
-#: src/protocols/oscar/oscar.c:5249
+#: src/protocols/oscar/oscar.c:5241
 #, c-format
 msgid ""
 "Could not add the buddy %s for an unknown reason.  The most common reason "
@@ -7283,18 +7342,18 @@
 "无法添加好友 %s,原因未知。最可能的原因是您的好友列表中好友的数目已经达到了所"
 "允许的最大值。"
 
-#: src/protocols/oscar/oscar.c:5331
+#: src/protocols/oscar/oscar.c:5323
 #, c-format
 msgid ""
 "The user %s has given you permission to add you to their buddy list.  Do you "
 "want to add them?"
 msgstr "用户 %s 允许您将他/她加为好友。您是否想要添加?"
 
-#: src/protocols/oscar/oscar.c:5337
+#: src/protocols/oscar/oscar.c:5329
 msgid "Authorization Given"
 msgstr "给出的认证"
 
-#: src/protocols/oscar/oscar.c:5370
+#: src/protocols/oscar/oscar.c:5362
 #, c-format
 msgid ""
 "The user %s wants to add you to their buddy list for the following reason:\n"
@@ -7304,17 +7363,17 @@
 "%s"
 
 #. Granted
-#: src/protocols/oscar/oscar.c:5412
+#: src/protocols/oscar/oscar.c:5404
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
 msgstr "用户 %s 允许您将他/她加入好友。"
 
-#: src/protocols/oscar/oscar.c:5413
+#: src/protocols/oscar/oscar.c:5405
 msgid "Authorization Granted"
 msgstr "认证被许可"
 
 #. Denied
-#: src/protocols/oscar/oscar.c:5416
+#: src/protocols/oscar/oscar.c:5408
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -7324,111 +7383,96 @@
 "用户 %s 拒绝了您将其加入好友列表的请求,原因如下:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:5417
+#: src/protocols/oscar/oscar.c:5409
 msgid "Authorization Denied"
 msgstr "认证被拒绝"
 
-#: src/protocols/oscar/oscar.c:5454 src/protocols/toc/toc.c:1264
+#: src/protocols/oscar/oscar.c:5446 src/protocols/toc/toc.c:1264
 msgid "_Exchange:"
 msgstr "交换(_E):"
 
-#: src/protocols/oscar/oscar.c:5476
+#: src/protocols/oscar/oscar.c:5468
 msgid "Invalid chat name specified."
 msgstr "指定的聊天名称无效。"
 
-#: src/protocols/oscar/oscar.c:5707
-msgid "<b>Status:</b> "
-msgstr "<b>状态:</b>"
-
-#: src/protocols/oscar/oscar.c:5719
-msgid "<b>IP Address:</b> "
-msgstr "<b>IP 地址:</b> "
-
-#: src/protocols/oscar/oscar.c:5727
-msgid "<b>Capabilities:</b> "
-msgstr "<b>能力:</b>"
-
-#: src/protocols/oscar/oscar.c:5736
-msgid "<b>Buddy Comment:</b> "
-msgstr "<b>好友注释:</b>"
-
-#: src/protocols/oscar/oscar.c:5745
-msgid "<b>Available:</b> "
-msgstr "<b>可用:</b>"
-
-#: src/protocols/oscar/oscar.c:5766
-msgid "<b>Away Message:</b> "
-msgstr "<b>离开消息:</b>"
-
-#: src/protocols/oscar/oscar.c:5774
-msgid "<b>Status:</b> Not Authorized"
-msgstr "<b>状态:</b>未认证"
-
-#: src/protocols/oscar/oscar.c:5808 src/protocols/yahoo/yahoo.c:2296
+#: src/protocols/oscar/oscar.c:5714
+msgid "Capabilities"
+msgstr "能力"
+
+#: src/protocols/oscar/oscar.c:5720
+msgid "Buddy Comment"
+msgstr "好友注释"
+
+#: src/protocols/oscar/oscar.c:5746
+msgid "Away Message"
+msgstr "离开消息"
+
+#: src/protocols/oscar/oscar.c:5754 src/protocols/oscar/oscar.c:5779
+#: src/protocols/yahoo/yahoo.c:2297
 msgid "Offline"
 msgstr "离线"
 
-#: src/protocols/oscar/oscar.c:6274
+#: src/protocols/oscar/oscar.c:6245
 msgid "Unable to open Direct IM"
 msgstr "无法开始二人世界"
 
-#: src/protocols/oscar/oscar.c:6287
+#: src/protocols/oscar/oscar.c:6258
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr "您选择了与 %s 进行二人世界连接。"
 
-#: src/protocols/oscar/oscar.c:6290
+#: src/protocols/oscar/oscar.c:6261
 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:6475
+#: src/protocols/oscar/oscar.c:6446
 msgid "Buddy Comment:"
 msgstr "好友注释:"
 
-#: src/protocols/oscar/oscar.c:6491
+#: src/protocols/oscar/oscar.c:6462
 msgid "Edit Buddy Comment"
 msgstr "编辑好友注释"
 
-#: src/protocols/oscar/oscar.c:6499
+#: src/protocols/oscar/oscar.c:6470
 msgid "Get Status Msg"
 msgstr "获取状态消息"
 
-#: src/protocols/oscar/oscar.c:6514
+#: src/protocols/oscar/oscar.c:6485
 msgid "Direct IM"
 msgstr "二人世界"
 
-#: src/protocols/oscar/oscar.c:6543
+#: src/protocols/oscar/oscar.c:6514
 msgid "Re-request Authorization"
 msgstr "重新请求认证"
 
-#: src/protocols/oscar/oscar.c:6564
+#: src/protocols/oscar/oscar.c:6535
 msgid "The new formatting is invalid."
 msgstr "新格式化无效。"
 
-#: src/protocols/oscar/oscar.c:6565
+#: src/protocols/oscar/oscar.c:6536
 msgid "Screen name formatting can change only capitalization and whitespace."
 msgstr "用户名格式化只更改大写和空格。"
 
-#: src/protocols/oscar/oscar.c:6571
+#: src/protocols/oscar/oscar.c:6542
 msgid "New screen name formatting:"
 msgstr "新的用户名格式化:"
 
-#: src/protocols/oscar/oscar.c:6620
+#: src/protocols/oscar/oscar.c:6591
 msgid "Change Address To:"
 msgstr "将地址更改为:"
 
-#: src/protocols/oscar/oscar.c:6664
+#: src/protocols/oscar/oscar.c:6635
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>您并不在等候认证</i>"
 
-#: src/protocols/oscar/oscar.c:6667
+#: src/protocols/oscar/oscar.c:6638
 msgid "You are awaiting authorization from the following buddies"
 msgstr "您正在等待下列好友的认证"
 
-#: src/protocols/oscar/oscar.c:6668
+#: src/protocols/oscar/oscar.c:6639
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
@@ -7436,70 +7480,78 @@
 "如果您想要向这些好友重新请求认证,只需用鼠标右键单击这些好友,然后单击“重新请"
 "求认证”。"
 
-#: src/protocols/oscar/oscar.c:6682
+#: src/protocols/oscar/oscar.c:6653
 msgid "Find Buddy by E-mail"
 msgstr "按电子邮件查找好友"
 
-#: src/protocols/oscar/oscar.c:6683
+#: src/protocols/oscar/oscar.c:6654
 msgid "Search for a buddy by e-mail address"
 msgstr "按电子邮件地址搜索好友"
 
-#: src/protocols/oscar/oscar.c:6684
+#: src/protocols/oscar/oscar.c:6655
 msgid "Type the e-mail address of the buddy you are searching for."
 msgstr "输入您想要搜索的好友的电子邮件地址。"
 
-#: src/protocols/oscar/oscar.c:6701
+#: src/protocols/oscar/oscar.c:6672
 msgid "Available Message:"
 msgstr "可用消息:"
 
-#: src/protocols/oscar/oscar.c:6702
+#: src/protocols/oscar/oscar.c:6673
 msgid "I'm doing work and hoping for a distraction--IM me!"
 msgstr "我正在工作,渴望被打扰 - 呼我!"
 
-#: src/protocols/oscar/oscar.c:6773
+#: src/protocols/oscar/oscar.c:6749
 msgid "Set User Info..."
 msgstr "设置用户信息..."
 
-#: src/protocols/oscar/oscar.c:6780
+#: src/protocols/oscar/oscar.c:6756
+msgid "Set User Info (URL)..."
+msgstr "设置用户信息(URL)..."
+
+#: src/protocols/oscar/oscar.c:6764
 msgid "Set Available Message..."
 msgstr "设置可用消息..."
 
-#: src/protocols/oscar/oscar.c:6787
+#: src/protocols/oscar/oscar.c:6771
 msgid "Change Password..."
 msgstr "更改密码..."
 
-#: src/protocols/oscar/oscar.c:6794
+#: src/protocols/oscar/oscar.c:6778
 msgid "Change Password (URL)"
 msgstr "更改密码(URL)"
 
-#: src/protocols/oscar/oscar.c:6802
+#: src/protocols/oscar/oscar.c:6786
 msgid "Configure IM Forwarding (URL)"
 msgstr "配置 IM 转发(URL)"
 
-#: src/protocols/oscar/oscar.c:6813
+#: src/protocols/oscar/oscar.c:6797
 msgid "Format Screen Name..."
 msgstr "格式化用户名..."
 
-#: src/protocols/oscar/oscar.c:6819
+#: src/protocols/oscar/oscar.c:6803
 msgid "Confirm Account"
 msgstr "确认账户"
 
-#: src/protocols/oscar/oscar.c:6825
+#: src/protocols/oscar/oscar.c:6809
 msgid "Display Currently Registered Address"
 msgstr "显示当前注册的地址"
 
-#: src/protocols/oscar/oscar.c:6831
+#: src/protocols/oscar/oscar.c:6815
 msgid "Change Currently Registered Address..."
 msgstr "更改当前注册的地址..."
 
-#: src/protocols/oscar/oscar.c:6840
+#: src/protocols/oscar/oscar.c:6824
 msgid "Show Buddies Awaiting Authorization"
 msgstr "显示正在等候认证的好友"
 
-#: src/protocols/oscar/oscar.c:6848
+#: src/protocols/oscar/oscar.c:6832
 msgid "Search for Buddy by Email..."
 msgstr "按电子邮件搜索好友..."
 
+#: src/protocols/oscar/oscar.c:6839
+msgid "Search for Buddy by Information"
+msgstr "按信息搜索好友"
+
 #. *< api_version
 #. *< type
 #. *< ui_requirement
@@ -7510,16 +7562,15 @@
 #. *< name
 #. *< version
 #. *  summary
-#. *  description
-#: src/protocols/oscar/oscar.c:6969 src/protocols/oscar/oscar.c:6971
+#: src/protocols/oscar/oscar.c:6963 src/protocols/oscar/oscar.c:6965
 msgid "AIM/ICQ Protocol Plugin"
 msgstr "AIM/ICQ 协议插件"
 
-#: src/protocols/oscar/oscar.c:6988
+#: src/protocols/oscar/oscar.c:6982
 msgid "Auth host"
 msgstr "认证主机"
 
-#: src/protocols/oscar/oscar.c:6993
+#: src/protocols/oscar/oscar.c:6987
 msgid "Auth port"
 msgstr "认证端口"
 
@@ -7725,16 +7776,15 @@
 #. *< name
 #. *< version
 #. *  summary
-#. *  description
-#: src/protocols/toc/toc.c:2159 src/protocols/toc/toc.c:2161
+#: src/protocols/toc/toc.c:2168 src/protocols/toc/toc.c:2170
 msgid "TOC Protocol Plugin"
 msgstr "TOC 协议插件"
 
-#: src/protocols/toc/toc.c:2178
+#: src/protocols/toc/toc.c:2187
 msgid "TOC host"
 msgstr "TOC 主机"
 
-#: src/protocols/toc/toc.c:2182
+#: src/protocols/toc/toc.c:2191
 msgid "TOC port"
 msgstr "TOC 端口"
 
@@ -7787,23 +7837,23 @@
 msgid "Set your Trepia profile data."
 msgstr "设置您的 Trepia 资料。"
 
-#: src/protocols/trepia/trepia.c:468
+#: src/protocols/trepia/trepia.c:424
 msgid "Profile"
 msgstr "资料"
 
-#: src/protocols/trepia/trepia.c:490
+#: src/protocols/trepia/trepia.c:439
 msgid "Set Profile"
 msgstr "设置资料"
 
-#: src/protocols/trepia/trepia.c:526
+#: src/protocols/trepia/trepia.c:475
 msgid "Visit Homepage"
 msgstr "浏览主页"
 
-#: src/protocols/trepia/trepia.c:872 src/protocols/trepia/trepia.c:875
+#: src/protocols/trepia/trepia.c:821 src/protocols/trepia/trepia.c:824
 msgid "Local Users"
 msgstr "本地用户"
 
-#: src/protocols/trepia/trepia.c:1078
+#: src/protocols/trepia/trepia.c:1027
 msgid "Logging in"
 msgstr "登入"
 
@@ -7817,8 +7867,7 @@
 #. *< name
 #. *< version
 #. *  summary
-#. *  description
-#: src/protocols/trepia/trepia.c:1326 src/protocols/trepia/trepia.c:1328
+#: src/protocols/trepia/trepia.c:1283 src/protocols/trepia/trepia.c:1285
 msgid "Trepia Protocol Plugin"
 msgstr "Trepia 协议插件"
 
@@ -7857,7 +7906,7 @@
 msgid "Add buddy rejected"
 msgstr "添加拒绝的好友"
 
-#: src/protocols/yahoo/yahoo.c:1598
+#: src/protocols/yahoo/yahoo.c:1599
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -7867,11 +7916,11 @@
 "Yahoo 服务器请求使用未识别的认证方式。此版本的 Gaim 可能无法成功登入 Yahoo。"
 "请检查 %s 上的更新。"
 
-#: src/protocols/yahoo/yahoo.c:1601
+#: src/protocols/yahoo/yahoo.c:1602
 msgid "Failed Yahoo! Authentication"
 msgstr "Yahoo! 认证失败"
 
-#: src/protocols/yahoo/yahoo.c:1674
+#: src/protocols/yahoo/yahoo.c:1675
 #, c-format
 msgid ""
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
@@ -7879,146 +7928,155 @@
 msgstr ""
 "您试图忽略 %s,但是该用户位于您的好友列表中。单击“是”将删除并忽略好友。"
 
-#: src/protocols/yahoo/yahoo.c:1677
+#: src/protocols/yahoo/yahoo.c:1678
 msgid "Ignore buddy?"
 msgstr "忽略好友?"
 
-#: src/protocols/yahoo/yahoo.c:1710
+#: src/protocols/yahoo/yahoo.c:1711
 msgid "Invalid username."
 msgstr "用户名无效。"
 
-#: src/protocols/yahoo/yahoo.c:1713
+#: src/protocols/yahoo/yahoo.c:1714
 msgid "Incorrect password."
 msgstr "密码不对。"
 
-#: src/protocols/yahoo/yahoo.c:1716
+#: src/protocols/yahoo/yahoo.c:1717
 msgid "Your account is locked, please log in to the yahoo website."
 msgstr "您的账户已锁定,请登录到 Yahoo 网站。"
 
-#: src/protocols/yahoo/yahoo.c:1719
+#: src/protocols/yahoo/yahoo.c:1720
 #, c-format
 msgid "Unknown error number %d."
 msgstr "未知的错误代码 %d。"
 
-#: src/protocols/yahoo/yahoo.c:1776
+#: src/protocols/yahoo/yahoo.c:1777
 #, c-format
 msgid "Could not add buddy %s to group %s to the server list on account %s."
 msgstr "无法将好友 %s 添加到账户 %s 位于服务器列表上的组 %s。"
 
-#: src/protocols/yahoo/yahoo.c:1778
+#: src/protocols/yahoo/yahoo.c:1779
 msgid "Could not add buddy to server list"
 msgstr "无法将好友添加到服务器列表"
 
-#: src/protocols/yahoo/yahoo.c:1888 src/protocols/yahoo/yahoo.c:2019
+#: src/protocols/yahoo/yahoo.c:1889 src/protocols/yahoo/yahoo.c:2020
 msgid "Unable to read"
 msgstr "无法读取"
 
-#: src/protocols/yahoo/yahoo.c:2041 src/protocols/yahoo/yahoo.c:2151
-#: src/protocols/yahoo/yahoo.c:2194 src/protocols/yahoo/yahoochat.c:1360
+#: src/protocols/yahoo/yahoo.c:2042 src/protocols/yahoo/yahoo.c:2152
+#: src/protocols/yahoo/yahoo.c:2195 src/protocols/yahoo/yahoochat.c:1360
 #: src/protocols/yahoo/yahoochat.c:1421
 msgid "Connection problem"
 msgstr "连接问题"
 
-#: src/protocols/yahoo/yahoo.c:2278 src/protocols/yahoo/yahoo.c:2604
-#: src/protocols/yahoo/yahoo.c:2716
+#: src/protocols/yahoo/yahoo.c:2279 src/protocols/yahoo/yahoo.c:2605
+#: src/protocols/yahoo/yahoo.c:2717
 msgid "Not At Home"
 msgstr "不在家"
 
-#: src/protocols/yahoo/yahoo.c:2280 src/protocols/yahoo/yahoo.c:2606
-#: src/protocols/yahoo/yahoo.c:2717
+#: src/protocols/yahoo/yahoo.c:2281 src/protocols/yahoo/yahoo.c:2607
+#: src/protocols/yahoo/yahoo.c:2718
 msgid "Not At Desk"
 msgstr "不在桌前"
 
-#: src/protocols/yahoo/yahoo.c:2282 src/protocols/yahoo/yahoo.c:2608
-#: src/protocols/yahoo/yahoo.c:2718
+#: src/protocols/yahoo/yahoo.c:2283 src/protocols/yahoo/yahoo.c:2609
+#: src/protocols/yahoo/yahoo.c:2719
 msgid "Not In Office"
 msgstr "不在办公室"
 
-#: src/protocols/yahoo/yahoo.c:2286 src/protocols/yahoo/yahoo.c:2612
-#: src/protocols/yahoo/yahoo.c:2720
+#: src/protocols/yahoo/yahoo.c:2287 src/protocols/yahoo/yahoo.c:2613
+#: src/protocols/yahoo/yahoo.c:2721
 msgid "On Vacation"
 msgstr "度假中"
 
-#: src/protocols/yahoo/yahoo.c:2290 src/protocols/yahoo/yahoo.c:2616
-#: src/protocols/yahoo/yahoo.c:2722
+#: src/protocols/yahoo/yahoo.c:2291 src/protocols/yahoo/yahoo.c:2617
+#: src/protocols/yahoo/yahoo.c:2723
 msgid "Stepped Out"
 msgstr "郊游"
 
-#: src/protocols/yahoo/yahoo.c:2354 src/protocols/yahoo/yahoo.c:2386
+#: src/protocols/yahoo/yahoo.c:2355 src/protocols/yahoo/yahoo.c:2387
 msgid "Not on server list"
 msgstr "不在服务器列表中"
 
-#: src/protocols/yahoo/yahoo.c:2442
+#: src/protocols/yahoo/yahoo.c:2407
+#, c-format
+msgid ""
+"\n"
+"<b>%s:</b> %s"
+msgstr ""
+"\n"
+"<b>%s:</b> %s"
+
+#: src/protocols/yahoo/yahoo.c:2443
 msgid "Join in Chat"
 msgstr "加入聊天"
 
-#: src/protocols/yahoo/yahoo.c:2448
+#: src/protocols/yahoo/yahoo.c:2449
 msgid "Initiate Conference"
 msgstr "发起会议"
 
-#: src/protocols/yahoo/yahoo.c:2501
+#: src/protocols/yahoo/yahoo.c:2502
 msgid "Active which ID?"
 msgstr "激活哪个 ID?"
 
-#: src/protocols/yahoo/yahoo.c:2509
+#: src/protocols/yahoo/yahoo.c:2510
 msgid "Join who in chat?"
 msgstr "将谁加入聊天?"
 
-#: src/protocols/yahoo/yahoo.c:2520
+#: src/protocols/yahoo/yahoo.c:2521
 msgid "Activate ID..."
 msgstr "激活 ID..."
 
-#: src/protocols/yahoo/yahoo.c:2526
+#: src/protocols/yahoo/yahoo.c:2527
 msgid "Join user in chat..."
 msgstr "在聊天中加入用户..."
 
-#: src/protocols/yahoo/yahoo.c:2915
+#: src/protocols/yahoo/yahoo.c:2916
 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"
 
-#: src/protocols/yahoo/yahoo.c:2916 src/protocols/yahoo/yahoo.c:2939
+#: src/protocols/yahoo/yahoo.c:2917 src/protocols/yahoo/yahoo.c:2940
 msgid ""
 "If you wish to view this profile, you will need to visit this link in your "
 "web browser<br>"
 msgstr "如果您想要查看此资料,您需要在您的 Web 浏览器中浏览此链接<br>"
 
-#: src/protocols/yahoo/yahoo.c:2938
+#: src/protocols/yahoo/yahoo.c:2939
 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:2986 src/protocols/yahoo/yahoo.c:2987
+#: src/protocols/yahoo/yahoo.c:2987 src/protocols/yahoo/yahoo.c:2988
 msgid "Yahoo! ID"
 msgstr "Yahoo! ID"
 
-#: src/protocols/yahoo/yahoo.c:3031 src/protocols/yahoo/yahoo.c:3034
-#: src/protocols/yahoo/yahoo.c:3037
+#: src/protocols/yahoo/yahoo.c:3032 src/protocols/yahoo/yahoo.c:3035
+#: src/protocols/yahoo/yahoo.c:3038
 msgid "Hobbies"
 msgstr "嗜好"
 
-#: src/protocols/yahoo/yahoo.c:3046 src/protocols/yahoo/yahoo.c:3049
+#: src/protocols/yahoo/yahoo.c:3047 src/protocols/yahoo/yahoo.c:3050
 msgid "Latest News"
 msgstr "最新新闻"
 
-#: src/protocols/yahoo/yahoo.c:3063
+#: src/protocols/yahoo/yahoo.c:3064
 msgid "Home Page"
 msgstr "主页"
 
-#: src/protocols/yahoo/yahoo.c:3075
+#: src/protocols/yahoo/yahoo.c:3076
 msgid "Cool Link 1"
 msgstr "酷链接 1"
 
-#: src/protocols/yahoo/yahoo.c:3079
+#: src/protocols/yahoo/yahoo.c:3080
 msgid "Cool Link 2"
 msgstr "酷链接 2"
 
-#: src/protocols/yahoo/yahoo.c:3081
+#: src/protocols/yahoo/yahoo.c:3082
 msgid "Cool Link 3"
 msgstr "酷链接 3"
 
-#: src/protocols/yahoo/yahoo.c:3087
+#: src/protocols/yahoo/yahoo.c:3088
 msgid "Member Since"
 msgstr "注册时间"
 
@@ -8032,28 +8090,27 @@
 #. *< name
 #. *< version
 #. *  summary
-#. *  description
-#: src/protocols/yahoo/yahoo.c:3293 src/protocols/yahoo/yahoo.c:3295
+#: src/protocols/yahoo/yahoo.c:3295 src/protocols/yahoo/yahoo.c:3297
 msgid "Yahoo Protocol Plugin"
 msgstr "Yahoo 协议插件"
 
-#: src/protocols/yahoo/yahoo.c:3312
+#: src/protocols/yahoo/yahoo.c:3314
 msgid "Pager host"
 msgstr "寻呼主机"
 
-#: src/protocols/yahoo/yahoo.c:3315
+#: src/protocols/yahoo/yahoo.c:3317
 msgid "Pager port"
 msgstr "寻呼端口"
 
-#: src/protocols/yahoo/yahoo.c:3318
+#: src/protocols/yahoo/yahoo.c:3320
 msgid "File transfer host"
 msgstr "文件传送主机"
 
-#: src/protocols/yahoo/yahoo.c:3321
+#: src/protocols/yahoo/yahoo.c:3323
 msgid "File transfer port"
 msgstr "文件传送端口"
 
-#: src/protocols/yahoo/yahoo.c:3324
+#: src/protocols/yahoo/yahoo.c:3326
 msgid "Chat Room List Url"
 msgstr "聊天房间列表 URL"
 
@@ -8117,31 +8174,30 @@
 msgid "User Rooms"
 msgstr "用户房间"
 
-#: src/protocols/zephyr/zephyr.c:554
+#: src/protocols/zephyr/zephyr.c:557
 #, c-format
 msgid "<b>User:</b> %s<br>"
 msgstr "<b>用户:</b> %s<br>"
 
-#: src/protocols/zephyr/zephyr.c:556
+#: src/protocols/zephyr/zephyr.c:559
 #, c-format
 msgid "<b>Alias:</b> %s<br>"
 msgstr "<b>别名:</b> %s<br>"
 
-#: src/protocols/zephyr/zephyr.c:558
+#: src/protocols/zephyr/zephyr.c:561
 msgid "<br>Hidden or not logged-in"
 msgstr "<br>隐身或未登入"
 
-#: src/protocols/zephyr/zephyr.c:562
+#: src/protocols/zephyr/zephyr.c:565
 #, c-format
 msgid "<br>At %s since %s"
 msgstr "<br>从 %s,自 %s 起"
 
-#: src/protocols/zephyr/zephyr.c:830 src/protocols/zephyr/zephyr.c:831
-#: src/protocols/zephyr/zephyr.c:1019 src/protocols/zephyr/zephyr.c:1020
+#: src/protocols/zephyr/zephyr.c:831 src/protocols/zephyr/zephyr.c:832
 msgid "Anyone"
 msgstr "任何人"
 
-#: src/protocols/zephyr/zephyr.c:857
+#: src/protocols/zephyr/zephyr.c:858
 msgid "Already logged in with Zephyr"
 msgstr "已经登入 Zephyr"
 
@@ -8153,19 +8209,19 @@
 "由于 Zephyr 将使用您的系统用户名,如果您已用相同的用户登入,您将无法拥有多个"
 "账户。"
 
-#: src/protocols/zephyr/zephyr.c:1195
+#: src/protocols/zephyr/zephyr.c:1155
 msgid "ZLocate"
 msgstr "ZLocate"
 
-#: src/protocols/zephyr/zephyr.c:1235
+#: src/protocols/zephyr/zephyr.c:1197
 msgid "_Class:"
 msgstr "类(_C):"
 
-#: src/protocols/zephyr/zephyr.c:1240
+#: src/protocols/zephyr/zephyr.c:1203
 msgid "_Instance:"
 msgstr "实例(_I):"
 
-#: src/protocols/zephyr/zephyr.c:1245
+#: src/protocols/zephyr/zephyr.c:1209
 msgid "_Recipient:"
 msgstr "接收者(_R):"
 
@@ -8179,20 +8235,19 @@
 #. *< name
 #. *< version
 #. *  summary
-#. *  description
-#: src/protocols/zephyr/zephyr.c:1395 src/protocols/zephyr/zephyr.c:1397
+#: src/protocols/zephyr/zephyr.c:1364 src/protocols/zephyr/zephyr.c:1366
 msgid "Zephyr Protocol Plugin"
 msgstr "Zephyr 协议插件"
 
-#: src/protocols/zephyr/zephyr.c:1414
+#: src/protocols/zephyr/zephyr.c:1383
 msgid "Export to .anyone"
 msgstr "导出到 .anyone"
 
-#: src/protocols/zephyr/zephyr.c:1417
+#: src/protocols/zephyr/zephyr.c:1386
 msgid "Export to .zephyr.subs"
 msgstr "导出到 .zephyr.subs"
 
-#: src/protocols/zephyr/zephyr.c:1420
+#: src/protocols/zephyr/zephyr.c:1389
 msgid "Exposure"
 msgstr "暴露"
 
@@ -8217,14 +8272,14 @@
 msgstr "您为给定代理类型所指定的主机名或端口号无效。"
 
 #. * Custom away message.
-#: src/prpl.h:189
+#: src/prpl.h:194
 msgid "Custom"
 msgstr "自定义"
 
 #. *
 #. * A wrapper for gaim_request_action() that uses Accept and Cancel buttons.
 #.
-#: src/request.h:1247
+#: src/request.h:1250
 msgid "Accept"
 msgstr "接受"
 
@@ -8232,27 +8287,57 @@
 msgid "Please enter your password"
 msgstr "请输入您的密码"
 
-#: src/server.c:961
+#: src/server.c:962
 #, c-format
 msgid "(%d message)"
 msgid_plural "(%d messages)"
 msgstr[0] "(%d 条消息)"
 
-#: src/server.c:975
+#: src/server.c:976
 msgid "(1 message)"
 msgstr "(1 条消息)"
 
-#: src/server.c:1162 src/server.c:1172
+#: src/server.c:1155 src/server.c:1165
 #, c-format
 msgid "%s logged in."
 msgstr "%s 登入了。"
 
-#: src/server.c:1189 src/server.c:1197
+#: src/server.c:1179
+#, c-format
+msgid "%s signed on"
+msgstr "%s 已登入"
+
+#: src/server.c:1195
+#, c-format
+msgid "%s came back"
+msgstr "%s 回来了"
+
+#: src/server.c:1197
+#, c-format
+msgid "%s went away"
+msgstr "%s 走了"
+
+#: src/server.c:1212
+#, c-format
+msgid "%s became idle"
+msgstr "%s 打起瞌睡"
+
+#: src/server.c:1226
+#, c-format
+msgid "%s became unidle"
+msgstr "%s 睡醒了"
+
+#: src/server.c:1239 src/server.c:1247
 #, c-format
 msgid "%s logged out."
 msgstr "%s 登出了。"
 
-#: src/server.c:1244
+#: src/server.c:1262
+#, c-format
+msgid "%s signed off"
+msgstr "%s 已登出"
+
+#: src/server.c:1312
 #, c-format
 msgid ""
 "%s has just been warned by %s.\n"
@@ -8261,11 +8346,11 @@
 "%s 刚刚被 %s 警告。\n"
 "您新的警告级别是 %d%%"
 
-#: src/server.c:1247
+#: src/server.c:1315
 msgid "an anonymous person"
 msgstr "无名氏"
 
-#: src/server.c:1357
+#: src/server.c:1425
 #, c-format
 msgid ""
 "User '%s' invites %s to buddy chat room: '%s'\n"
@@ -8274,12 +8359,12 @@
 "用户“%s”邀请 %s 加入好友聊天室:“%s”\n"
 "%s"
 
-#: src/server.c:1361
+#: src/server.c:1429
 #, c-format
 msgid "User '%s' invites %s to buddy chat room: '%s'\n"
 msgstr "用户“%s”邀请 %s 加入好友聊天室:“%s”\n"
 
-#: src/server.c:1367
+#: src/server.c:1435
 msgid "Accept chat invitation?"
 msgstr "接受聊天邀请吗?"
 
@@ -8306,30 +8391,30 @@
 msgid "_Warn"
 msgstr "警告(_W)"
 
-#: src/util.c:1930
+#: src/util.c:2039
 msgid "Calculating..."
 msgstr "正在计算..."
 
-#: src/util.c:1933
+#: src/util.c:2042
 msgid "Unknown."
 msgstr "未知。"
 
-#: src/util.c:1964 src/util.c:1969 src/util.c:1974 src/util.c:1977
+#: src/util.c:2073 src/util.c:2078 src/util.c:2083 src/util.c:2086
 msgid "day"
 msgid_plural "days"
 msgstr[0] "天"
 
-#: src/util.c:1965 src/util.c:1969 src/util.c:1983 src/util.c:1985
+#: src/util.c:2074 src/util.c:2078 src/util.c:2092 src/util.c:2094
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "小时"
 
-#: src/util.c:1965 src/util.c:1974 src/util.c:1983 src/util.c:1988
+#: src/util.c:2074 src/util.c:2083 src/util.c:2092 src/util.c:2097
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "分"
 
-#: src/util.c:2320
+#: src/util.c:2429
 msgid "g003: Error opening connection.\n"
 msgstr "g003:打开连接出错。\n"
 
@@ -8344,28 +8429,3 @@
 #: src/win32/win32dep.c:277
 msgid "Notification"
 msgstr "提示"
-
-#, fuzzy
-#~ msgid "Show _tooltips"
-#~ msgstr "显示全部选项"
-
-#~ msgid "Bad Protocol"
-#~ msgstr "无效的协议"
-
-#~ msgid "Invalid Realm"
-#~ msgstr "用户名域"
-
-#~ 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 "无法向 %2$s 发送 %1$s,协议不支持。"
--- a/po/zh_TW.po	Wed Apr 21 06:48:16 2004 +0000
+++ b/po/zh_TW.po	Wed Apr 21 15:18:24 2004 +0000
@@ -22,9 +22,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Gaim 0.75\n"
-"POT-Creation-Date: 2004-01-06 00:00-0500\n"
-"PO-Revision-Date: 2003-05-29 12:04+0800\n"
+"Project-Id-Version: Gaim 0.77\n"
+"POT-Creation-Date: 2004-04-21 02:13-0400\n"
+"PO-Revision-Date: 2004-04-21 00:29+0800\n"
 "Last-Translator: Ambrose C. Li <acli@ada.dhs.org>\n"
 "Language-Team: Chinese (Traditional) <zh-l10n@linux.org.tw>\n"
 "MIME-Version: 1.0\n"
@@ -33,6 +33,13 @@
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "\n"
 
+#  *< api_version
+#  *< type
+#  *< ui_requirement
+#  *< flags
+#  *< dependencies
+#  *< priority
+#  *< id
 #. *< api_version
 #. *< type
 #. *< ui_requirement
@@ -40,14 +47,14 @@
 #. *< 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
+#: plugins/autorecon.c:113 plugins/autorecon.c:115
 msgid "When you are kicked offline, this reconnects you."
 msgstr "當你斷線時,系統會自動幫你重新連線。"
 
@@ -153,7 +160,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:497 src/gtkaccount.c:1891
 msgid "Auto-login"
 msgstr "自動登入"
 
@@ -169,16 +176,19 @@
 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:1626 src/protocols/gg/gg.c:51
+#: src/protocols/irc/msgs.c:187 src/protocols/jabber/jabber.c:952
+#: src/protocols/jabber/jutil.c:32 src/protocols/jabber/presence.c:63
+#: src/protocols/jabber/presence.c:119 src/protocols/novell/novell.c:2144
+#: src/protocols/novell/novell.c:2259 src/protocols/novell/novell.c:2311
+#: src/protocols/oscar/oscar.c:520 src/protocols/oscar/oscar.c:4820
+#: src/protocols/oscar/oscar.c:5803 src/protocols/oscar/oscar.c:6421
 msgid "Away"
 msgstr "離開"
 
-#: plugins/docklet/docklet.c:159 src/away.c:515
+#. else...
+#: plugins/docklet/docklet.c:159 src/away.c:522
+#: src/protocols/oscar/oscar.c:4738 src/protocols/oscar/oscar.c:6429
 msgid "Back"
 msgstr "返回"
 
@@ -186,16 +196,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:2070 src/main.c:286
 msgid "Accounts"
 msgstr "帳號清單"
 
-#: plugins/docklet/docklet.c:174 src/gtkprefs.c:2323 src/main.c:330
+#: plugins/docklet/docklet.c:174 src/gtkprefs.c:2576 src/main.c:292
 msgid "Preferences"
 msgstr "偏好設定"
 
@@ -253,33 +263,45 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/filectl.c:223
+#: plugins/filectl.c:222
 msgid "Gaim File Control"
 msgstr "Gaim 檔案控制"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/filectl.c:226 plugins/filectl.c:228
+#: plugins/filectl.c:225 plugins/filectl.c:227
 msgid "Allows you to control Gaim by entering commands in a file."
 msgstr "允許您在檔案中輸入指令以控制 Gaim。"
 
-#: plugins/gaim-remote/remote.c:88
+#: plugins/gaim-remote/remote.c:89
 msgid "Not connected to AIM"
 msgstr "沒有連到 AIM"
 
-#: plugins/gaim-remote/remote.c:97 plugins/gaim-remote/remote.c:136
+#: plugins/gaim-remote/remote.c:98 plugins/gaim-remote/remote.c:137
 msgid "No screenname given."
 msgstr "沒有給予帳號。"
 
-#: plugins/gaim-remote/remote.c:173
+#: plugins/gaim-remote/remote.c:174
 msgid "No roomname given."
 msgstr "沒有給予聊天室名稱。"
 
-#: plugins/gaim-remote/remote.c:192
+#: plugins/gaim-remote/remote.c:193
 msgid "Invalid AIM URI"
 msgstr "無效的 AIM URI"
 
+#  TODO Untranslated
+#: plugins/gaim-remote/remote.c:651
+#, c-format
+msgid ""
+"Failed to assign %s to a socket:\n"
+"%s"
+msgstr ""
+
+#: plugins/gaim-remote/remote.c:674
+msgid "Unable to open socket"
+msgstr "無法開啟 Socket"
+
 #. *< api_version
 #. *< type
 #. *< ui_requirement
@@ -287,19 +309,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/gaim-remote/remote.c:715
+#: plugins/gaim-remote/remote.c:722
 msgid "Remote Control"
 msgstr "遠端控制"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/gaim-remote/remote.c:718
+#: plugins/gaim-remote/remote.c:725
 msgid "Provides remote control for gaim applications."
 msgstr "提供對 Gaim 應用程式進行遠端控制。"
 
 #. *  description
-#: plugins/gaim-remote/remote.c:720
+#: plugins/gaim-remote/remote.c:727
 msgid ""
 "Gives Gaim the ability to be remote-controlled through third-party "
 "applications or through the gaim-remote tool."
@@ -391,15 +413,190 @@
 "往上後向左拖曳為切換到前一個交談。\n"
 "往上後向右拖曳為切換到下一個交談。"
 
-#: plugins/history.c:74
+#  NOTE 本機端通錄訊
+#  NOTE 以下「Address book」及「Person」乃對應 evolution PO 檔之譯法,見
+#  NOTE http://developer.gnome.org/projects/gtp/status/gnome-2.6/PO/evolution.HEAD.zh_TW.po
+#  NOTE 譯文更動 by Ambrose
+#: plugins/gevolution/add_buddy_dialog.c:136
+#: plugins/gevolution/assoc-buddy.c:76
+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:2964 src/gtkprefs.c:873 src/gtkprefs.c:1654
+#: 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:1991
+#: src/gtkroomlist.c:561 src/protocols/jabber/jabber.c:591
+#: src/protocols/msn/msn.c:1395 src/protocols/trepia/trepia.c:398
+msgid "Name"
+msgstr "名稱"
+
+#  NOTE 原始碼指這個解「(即時訊息系統的)帳別」,我覺得有點離譜
+#  NOTE 譯文更動 by Ambrose
+#: plugins/gevolution/add_buddy_dialog.c:201
+msgid "Instant Messaging"
+msgstr "即時傳訊帳號"
+
+#  Add the label.
+#. 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:6692
+msgid "Search"
+msgstr "搜尋"
+
+#: plugins/gevolution/add_buddy_dialog.c:566
+#: plugins/gevolution/new_person_dialog.c:310 src/gtkblist.c:3982
+#: src/gtkblist.c:4310
+msgid "Group:"
+msgstr "群組:"
+
+#  NOTE 對應 evolution PO 檔之譯法,詳見上面「Local Addressbook」條
+#. "New Person" button
+#: plugins/gevolution/add_buddy_dialog.c:592
+#: plugins/gevolution/assoc-buddy.c:488
+msgid "New Person"
+msgstr "新增連絡人"
+
+#. "Select Buddy" button
+#: plugins/gevolution/add_buddy_dialog.c:609
+msgid "Select Buddy"
+msgstr "選擇好友"
+
+#  NOTE 對應 evolution PO 檔之譯法,詳見上面「Local Addressbook」條
+#. 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
+msgid "Show user details"
+msgstr "顯示使用者細節"
+
+# XXX 暫譯
+#: plugins/gevolution/assoc-buddy.c:452
+msgid "Hide user details"
+msgstr "隱藏使用者細節"
+
+# XXX 暫譯
+#. "Associate Buddy" button
+#: plugins/gevolution/assoc-buddy.c:505
+msgid "_Associate Buddy"
+msgstr "聯結好友 (_A)"
+
+#: plugins/gevolution/gevo-util.c:66 plugins/gevolution/gevolution.c:90
+#: src/blist.c:685 src/blist.c:872 src/blist.c:2105 src/gtkblist.c:3807
+#: src/protocols/jabber/roster.c:66 src/protocols/msn/notification.c:793
+msgid "Buddies"
+msgstr "好友"
+
+#  NOTE 注意!evolution 本身的譯法是「目錄服務」而非「通訊錄」
+#: plugins/gevolution/gevolution.c:214
+msgid "Add to Address Book"
+msgstr "增加到通訊錄"
+
+#. Configuration frame
+#: plugins/gevolution/gevolution.c:347
+msgid "Evolution Integration Configuration"
+msgstr "Evolution 整合設定"
+
+# TODO Untranslated
+#. 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
+msgid "Evolution Integration"
+msgstr "Evolution 整合"
+
+#  *< name
+#  *< version
+#  *  summary
+#. *< name
+#. *< version
+#. *  summary
+#: plugins/gevolution/gevolution.c:464 plugins/gevolution/gevolution.c:466
+msgid "Provides integration with Ximian Evolution."
+msgstr "提供和 Ximian Evolution 的整合。"
+
+#: plugins/gevolution/new_person_dialog.c:270
+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
+msgid "Account type:"
+msgstr "帳號類型:"
+
+#: plugins/gevolution/new_person_dialog.c:298
+msgid "Screenname:"
+msgstr "帳號:"
+
+#  NOTE 選擇性資訊
+#. Optional Information section
+#: plugins/gevolution/new_person_dialog.c:318
+msgid "Optional information:"
+msgstr "其他資訊:"
+
+#. Label
+#: plugins/gevolution/new_person_dialog.c:341 src/gtkaccount.c:320
+#: src/protocols/oscar/oscar.c:425
+msgid "Buddy Icon"
+msgstr "好友圖示"
+
+#: plugins/gevolution/new_person_dialog.c:353
+msgid "First name:"
+msgstr "名:"
+
+#: plugins/gevolution/new_person_dialog.c:365
+msgid "Last name:"
+msgstr "姓:"
+
+#: plugins/gevolution/new_person_dialog.c:385
+msgid "E-mail:"
+msgstr "電子郵件:"
+
+#: plugins/history.c:70
 msgid "History"
 msgstr "歷史記錄"
 
-#: plugins/history.c:76
+#: plugins/history.c:72
 msgid "Shows recently logged conversations in new conversations."
 msgstr "顯示最近所記錄的交談到新的交談視窗中"
 
-#: plugins/history.c:77
+#: plugins/history.c:73
 msgid ""
 "When a new conversation is opened this plugin will insert the last "
 "conversation into the current conversation."
@@ -506,14 +703,18 @@
 msgid "Test plugin IPC support, as a server. This registers the IPC commands."
 msgstr "以伺服器身份測試模組系統的 IPC 支援,即是掛載測試用的 IPC 指令。"
 
-#: plugins/mailchk.c:156
+#: plugins/mailchk.c:157
 msgid "Mail Checker"
 msgstr "郵件檢查"
 
-#: plugins/mailchk.c:158 plugins/mailchk.c:159
+#: plugins/mailchk.c:159
 msgid "Checks for new local mail."
 msgstr "檢查本地端的新郵件。"
 
+#: plugins/mailchk.c:160
+msgid "Adds a small box to the buddy list that shows if you have new mail."
+msgstr "在好友清單內加一小格,用來顯示您有沒有新郵件。"
+
 #. ---------- "Notify For" ----------
 #: plugins/notify.c:572
 msgid "Notify For"
@@ -608,13 +809,13 @@
 #. *< 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
+#: plugins/perl/perl.c:532 plugins/perl/perl.c:533
 msgid "Provides support for loading perl plugins."
 msgstr "提供讀入 Perl 模組的支援。"
 
@@ -772,14 +973,14 @@
 #. *< 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
+#: plugins/ssl/ssl-gnutls.c:226 plugins/ssl/ssl-gnutls.c:228
 msgid "Provides SSL support through GNUTLS."
 msgstr "透過 GNUTLS 提供 SSL 的支援。"
 
@@ -790,14 +991,14 @@
 #. *< 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
+#: plugins/ssl/ssl-nss.c:315 plugins/ssl/ssl-nss.c:317
 msgid "Provides SSL support through Mozilla NSS."
 msgstr "透過 Mozilla 的 NSS 提供 SSL 的支援。"
 
@@ -819,7 +1020,7 @@
 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 已經離開。"
@@ -859,11 +1060,11 @@
 "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 +1075,14 @@
 #. *< 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
+#: plugins/ticker/ticker.c:331 plugins/ticker/ticker.c:333
 msgid "A horizontal scrolling version of the buddy list."
 msgstr "好友清單的水平捲動版本"
 
@@ -935,7 +1136,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:876
 msgid "Buddy List Window"
 msgstr "好友清單視窗"
 
@@ -982,8 +1183,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:3005
+#: src/gtkprefs.c:2490
 msgid "Buddy List"
 msgstr "好友清單"
 
@@ -1002,8 +1203,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:914
+#: src/gtkprefs.c:2491 src/protocols/msn/msn.c:1621
 msgid "Conversations"
 msgstr "交談"
 
@@ -1019,16 +1220,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 +1240,320 @@
 "方式發佈。<BR><BR>"
 
 # NOTE  contains zh_TW-specific info here!!
-#: src/about.c:102
-msgid "<FONT SIZE=\"3\">IRC:</FONT> #gaim on irc.freenode.net<BR><BR>"
+#: src/about.c:104
+msgid "<FONT SIZE=\"4\">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/"
+"<FONT SIZE=\"4\">IRC:</FONT> irc.freenode.net 上的 #gaim 頻道<BR><BR><FONT "
+"SIZE=\"4\">正體中文化資訊:</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
-msgid "maintainer"
-msgstr "維護者"
-
 #: src/about.c:110
+msgid "maintainer"
+msgstr "維護者"
+
+#: 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:144
 msgid "Retired Developers"
 msgstr "前任開發者"
 
-#: src/about.c:142
+#: src/about.c:145
 msgid "former libfaim maintainer"
 msgstr "前 libfaim 維護者"
 
-#: src/about.c:143
-msgid "former lead developer"
-msgstr "前主要開發者"
-
 #: src/about.c:146
+msgid "former lead developer"
+msgstr "前主要開發者"
+
+#: src/about.c:149
 msgid "former maintainer"
 msgstr "前維護者"
 
-#: src/about.c:147
+#: src/about.c:150
 msgid "former Jabber developer"
 msgstr "前 Jabber 開發者"
 
-#: src/about.c:148
+#: src/about.c:151
 msgid "original author"
 msgstr "原作者"
 
-#: src/about.c:151
+#: src/about.c:154
 msgid "hacker and designated driver [lazy bum]"
 msgstr "程式編寫者兼指定司機 [懶人]"
 
-#: src/about.c:159
+#: src/about.c:162
 msgid "Current Translators"
 msgstr "現任譯者"
 
 # NOTE 寫出來的是「文」,不是「語」;下同 :-)
-#: src/about.c:160 src/about.c:193
+#: src/about.c:163 src/about.c:197
 msgid "Catalan"
 msgstr "加泰隆文"
 
-#: src/about.c:161 src/about.c:194
+#: src/about.c:164 src/about.c:198
 msgid "Czech"
 msgstr "捷克文"
 
-#: src/about.c:162
+#: src/about.c:165
 msgid "Danish"
 msgstr "丹麥文"
 
-#: src/about.c:163
+#: src/about.c:166
 msgid "British English"
 msgstr "英式英文"
 
-#: src/about.c:164 src/about.c:195
+#: src/about.c:167 src/about.c:199
 msgid "German"
 msgstr "德文"
 
-#: src/about.c:165 src/about.c:196
+#: src/about.c:168 src/about.c:200
 msgid "Spanish"
 msgstr "西班牙文"
 
-#: src/about.c:166 src/about.c:197
+#: src/about.c:169 src/about.c:201
 msgid "Finnish"
 msgstr "芬蘭文"
 
-#: src/about.c:167 src/about.c:198
+#: src/about.c:170 src/about.c:202
 msgid "French"
 msgstr "法文"
 
-#: src/about.c:168
+#: src/about.c:171
 msgid "Hindi"
 msgstr "北印度文"
 
-#: src/about.c:169
+#: src/about.c:172
 msgid "Hungarian"
 msgstr "匈牙利文"
 
 # NOTE 香港譯「意大利文」,但這是 zh-TW :-)
-#: src/about.c:170 src/about.c:200
+#: src/about.c:173 src/about.c:204
 msgid "Italian"
 msgstr "義大利文"
 
-#: src/about.c:171 src/about.c:202
+#: src/about.c:174 src/about.c:206
 msgid "Korean"
 msgstr "韓文"
 
 # NOTE Flemish 譯法是跟了http://www.ee.tku.edu.tw/~rexchen/cdict/
 # XXX Dutch 和 Flemish 是同一種語言,是否應該只寫「荷蘭文」,刪去「法蘭德斯文」?
-#: src/about.c:172
+#: src/about.c:175
 msgid "Dutch; Flemish"
 msgstr "荷蘭文/法蘭德斯文"
 
-#: src/about.c:173
+#: src/about.c:176
+msgid "Macedonian"
+msgstr "馬其頓文"
+
+#: src/about.c:177
 msgid "Norwegian"
 msgstr "挪威文"
 
-#: src/about.c:174 src/about.c:203
+#: src/about.c:178 src/about.c:207
 msgid "Polish"
 msgstr "波蘭文"
 
-#: src/about.c:175
+#: src/about.c:179
 msgid "Portuguese"
 msgstr "標準萄文"
 
-#: src/about.c:176
+#: src/about.c:180
 msgid "Portuguese-Brazil"
 msgstr "巴西萄文"
 
-#: src/about.c:177
+#: src/about.c:181
 msgid "Romanian"
 msgstr "羅馬尼亞文"
 
-#: src/about.c:178 src/about.c:204
+#: src/about.c:182 src/about.c:208
 msgid "Russian"
 msgstr "俄文"
 
-#: src/about.c:179
+#: src/about.c:183
 msgid "Serbian"
 msgstr "塞爾維亞文"
 
-#: src/about.c:180 src/about.c:206
+#: src/about.c:184 src/about.c:210
 msgid "Swedish"
 msgstr "瑞典文"
 
-#: src/about.c:181
+#: src/about.c:185
 msgid "Vietnamese"
 msgstr "越南文"
 
-#: src/about.c:181
+#: src/about.c:185
 msgid "Gnome Vi Team"
 msgstr "Gnome 越南文翻譯小組"
 
-#: src/about.c:182
+#: src/about.c:186
 msgid "Simplified Chinese"
 msgstr "簡體中文"
 
-#: src/about.c:183
+#: src/about.c:187
 msgid "Traditional Chinese"
 msgstr "正體中文"
 
-#: src/about.c:190
+#: src/about.c:194
 msgid "Past Translators"
 msgstr "前任譯者"
 
 # XXX Yahoo譯法
-#: src/about.c:191
+#: src/about.c:195
 msgid "Amharic"
 msgstr "阿姆哈拉文"
 
-#: src/about.c:192
+#: src/about.c:196
 msgid "Bulgarian"
 msgstr "保加利亞文"
 
-#: src/about.c:199
+#: src/about.c:203
 msgid "Hebrew"
 msgstr "希伯來文"
 
-#: src/about.c:201
+#: src/about.c:205
 msgid "Japanese"
 msgstr "日文"
 
-#: src/about.c:205
+#: src/about.c:209
 msgid "Slovak"
 msgstr "斯洛伐克文"
 
-#: src/about.c:207
+#: src/about.c:211
 msgid "Chinese"
 msgstr "中文"
 
-#: src/account.c:272 src/protocols/jabber/jabber.c:1017
+#: src/account.c:279 src/protocols/jabber/jabber.c:993
 msgid "New passwords do not match."
 msgstr "新密碼並不相符。"
 
 # NOTE 譯文更動 by Ambrose
-#: src/account.c:280
+#: src/account.c:288
 msgid "Fill out all fields completely."
 msgstr "請填妥整份表格所有的欄位。"
 
-#: src/account.c:305
+#: src/account.c:313
 msgid "Original password"
 msgstr "舊密碼"
 
-#: src/account.c:311
+#: src/account.c:320
 msgid "New password"
 msgstr "新密碼"
 
-#: src/account.c:317
+#: src/account.c:327
 msgid "New password (again)"
 msgstr "新密碼(再次確認)"
 
-#: src/account.c:322
+#: src/account.c:333
 #, c-format
 msgid "Change password for %s"
 msgstr "修改 %s 的密碼"
 
-#: src/account.c:330
+#: src/account.c:341
 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:344 src/connection.c:198 src/dialogs.c:471 src/dialogs.c:527
+#: src/gtkblist.c:2363 src/gtkrequest.c:235 src/protocols/jabber/jabber.c:1038
+#: src/protocols/jabber/xdata.c:337 src/protocols/msn/msn.c:195
+#: src/protocols/msn/msn.c:206 src/protocols/msn/msn.c:217
+#: src/protocols/msn/msn.c:228 src/protocols/oscar/oscar.c:2763
+#: src/protocols/oscar/oscar.c:2844 src/protocols/oscar/oscar.c:6482
+#: src/protocols/oscar/oscar.c:6578 src/protocols/oscar/oscar.c:6627
+#: src/protocols/oscar/oscar.c:6709 src/protocols/yahoo/yahoo.c:2504
+#: src/protocols/yahoo/yahoo.c:2512 src/request.h:1240
 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:345 src/account.c:383 src/connection.c:199 src/dialogs.c:305
+#: src/dialogs.c:317 src/dialogs.c:330 src/dialogs.c:351 src/dialogs.c:472
+#: src/dialogs.c:528 src/dialogs.c:851 src/dialogs.c:872 src/dialogs.c:889
+#: src/dialogs.c:908 src/gtkaccount.c:1744 src/gtkaccount.c:2235
+#: src/gtkblist.c:2364 src/gtkblist.c:4349 src/gtkconn.c:168
+#: src/gtkimhtmltoolbar.c:399 src/gtkprivacy.c:575 src/gtkprivacy.c:588
+#: src/gtkprivacy.c:613 src/gtkprivacy.c:624 src/gtkrequest.c:236
+#: src/protocols/icq/gaim_icq.c:277 src/protocols/jabber/buddy.c:514
+#: src/protocols/jabber/chat.c:693 src/protocols/jabber/jabber.c:660
+#: src/protocols/jabber/jabber.c:1039 src/protocols/jabber/xdata.c:338
+#: src/protocols/msn/msn.c:196 src/protocols/msn/msn.c:207
+#: src/protocols/msn/msn.c:218 src/protocols/msn/msn.c:229
+#: src/protocols/msn/msn.c:242 src/protocols/oscar/oscar.c:2725
+#: src/protocols/oscar/oscar.c:2764 src/protocols/oscar/oscar.c:2800
+#: src/protocols/oscar/oscar.c:2845 src/protocols/oscar/oscar.c:6300
+#: src/protocols/oscar/oscar.c:6483 src/protocols/oscar/oscar.c:6579
+#: src/protocols/oscar/oscar.c:6628 src/protocols/oscar/oscar.c:6693
+#: src/protocols/oscar/oscar.c:6710 src/protocols/trepia/trepia.c:347
+#: src/protocols/yahoo/yahoo.c:2505 src/protocols/yahoo/yahoo.c:2513
+#: src/request.h:1240 src/request.h:1250
 msgid "Cancel"
 msgstr "取消"
 
-#: src/account.c:360
+#: src/account.c:374
 #, 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:382 src/dialogs.c:839 src/gtkrequest.c:242
+#: 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:590 src/gtkprefs.c:2493
 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:1192
 #, c-format
 msgid ""
 "%d buddy from group %s was not removed because its account was not logged "
@@ -1368,78 +1568,51 @@
 "%d 個在 %s 群組的好友並沒有被移除,因為他們所對應的帳號並沒有登入。這些好友及"
 "群組沒有被移除。\n"
 
-#: src/blist.c:1167
+#: src/blist.c:1201
 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:1251 src/gtkaccount.c:164 src/gtkft.c:153 src/gtkutils.c:860
+#: src/protocols/jabber/buddy.c:569 src/protocols/novell/novell.c:2156
 msgid "Unknown"
 msgstr "未知"
 
-#: src/blist.c:1544
+#: src/blist.c:1578
 msgid "Invalid Groupname"
 msgstr "無效的群組名稱"
 
-#: src/blist.c:2194
+#: src/blist.c:2220
 msgid ""
 "An error was encountered parsing your buddy list.  It has not been loaded."
 msgstr "在解析您的好友清單時發生錯誤。好友清單沒有被讀入。"
 
-#: src/blist.c:2196
+#: src/blist.c:2222
 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 +1621,7 @@
 # #, c-format
 # msgid "%d %s in room"
 # msgstr "聊天室有 %d 家伙"
-#: src/conversation.c:1898
+#: src/conversation.c:1969
 #, c-format
 msgid "%s entered the room."
 msgstr "%s 進入聊天室。"
@@ -1458,61 +1631,62 @@
 # #, c-format
 # msgid "%d %s in room"
 # msgstr "聊天室有 %d 家伙"
-#: src/conversation.c:1901
+#: src/conversation.c:1972
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>] 進入聊天室。"
 
-#: src/conversation.c:1986
+#: src/conversation.c:2064
+#, c-format
+msgid "You are now known as %s"
+msgstr "你改變暱稱為 %s"
+
+#: src/conversation.c:2067
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s 改變暱稱為 %s"
 
-#: src/conversation.c:2028
+#: src/conversation.c:2110
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s 離開聊天室 (%s)。"
 
-#: src/conversation.c:2030
+#: src/conversation.c:2112
 #, c-format
 msgid "%s left the room."
 msgstr "%s 離開聊天室。"
 
-#: src/conversation.c:2103
+#: src/conversation.c:2185
 #, c-format
 msgid "(+%d more)"
 msgstr "(以及另外 %d 個)"
 
-#: src/conversation.c:2105
+#: src/conversation.c:2187
 #, c-format
 msgid " left the room (%s)."
 msgstr " 離開聊天室 (%s)。"
 
-#: src/conversation.c:2387
+#: src/conversation.c:2467
 msgid "Last created window"
 msgstr "上一個開啟的視窗"
 
-#: src/conversation.c:2389
+#: src/conversation.c:2469 src/gtkprefs.c:1402
 msgid "New window"
 msgstr "新視窗"
 
-#: src/conversation.c:2391
+#: src/conversation.c:2471
 msgid "By group"
 msgstr "依群組"
 
-#: src/conversation.c:2393
+#: src/conversation.c:2473
 msgid "By account"
 msgstr "依帳號"
 
-#: src/dialogs.c:200
+#: src/dialogs.c:154
 msgid "Warn User"
 msgstr "警告使用者"
 
-#: src/dialogs.c:203
-msgid "_Warn"
-msgstr "警告(_W)"
-
-#: src/dialogs.c:219
+#: src/dialogs.c:173
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Warn %s?</span>\n"
@@ -1524,37 +1698,37 @@
 "\n"
 "這個動作將會增加 %s 的警告等級,同時他 / 她將被限制以更嚴格的速率限制。\n"
 
-#: src/dialogs.c:228
+#: src/dialogs.c:182
 msgid "Warn _anonymously?"
 msgstr "以匿名的身份發出警告?(_A)"
 
-#: src/dialogs.c:235
+#: src/dialogs.c:189
 msgid "<b>Anonymous warnings are less severe.</b>"
 msgstr "<b>匿名的警告比較上沒有那麼嚴重。</b>"
 
-#: src/dialogs.c:347
+#: src/dialogs.c:301
 #, 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:303 src/dialogs.c:304
 msgid "Remove Buddy"
 msgstr "移除好友"
 
-#: src/dialogs.c:359
+#: src/dialogs.c:313
 #, 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:315 src/dialogs.c:316
 msgid "Remove Chat"
 msgstr "移除聊天室"
 
-#: src/dialogs.c:371
+#: src/dialogs.c:325
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
@@ -1562,11 +1736,11 @@
 msgstr ""
 "您正試著將群組 %s 及相關的成員從您的好友清單中移除。您要繼續這個動作嗎?"
 
-#: src/dialogs.c:374 src/dialogs.c:375
+#: src/dialogs.c:328 src/dialogs.c:329
 msgid "Remove Group"
 msgstr "移除群組"
 
-#: src/dialogs.c:392
+#: src/dialogs.c:346
 #, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddies from "
@@ -1576,143 +1750,123 @@
 "作嗎?"
 
 # XXX「Remove Buddy」和「Remove Contact」在中文版Gaim無法析別;可能有改進的空間
-#: src/dialogs.c:395 src/dialogs.c:396
+#: src/dialogs.c:349 src/dialogs.c:350
 msgid "Remove Contact"
 msgstr "移除好友"
 
-#: src/dialogs.c:541
+#: src/dialogs.c:453 src/dialogs.c:509
+msgid "_Screen name"
+msgstr "帳號(_S)"
+
+#: src/dialogs.c:459 src/dialogs.c:515
+msgid "_Account"
+msgstr "帳號(_A)"
+
+#: src/dialogs.c:466
 msgid "New Instant Message"
 msgstr "新即時訊息"
 
-#: src/dialogs.c:559
-msgid "Please enter the screenname of the person you would like to IM.\n"
-msgstr "請輸入您所想要發送即時訊息對象的帳號。\n"
-
-#: src/dialogs.c:571 src/dialogs.c:646
-msgid "_Screenname:"
-msgstr "帳號(_S):"
-
-#: src/dialogs.c:616
+#: src/dialogs.c:468
+msgid "Please enter the screen name of the person you would like to IM."
+msgstr "請輸入您所想要發送即時訊息對象的帳號。"
+
+#: src/dialogs.c:522
 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"
-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:524
+msgid ""
+"Please enter the screen name of the person whose info you would like to view."
+msgstr "請輸入您所想要查詢對象的帳號。"
+
+#: src/dialogs.c:552 src/gtkimhtmltoolbar.c:240
 msgid "Select Text Color"
 msgstr "設定文字顏色"
 
-#: src/dialogs.c:976 src/dialogs.c:993
+#: src/dialogs.c:580 src/gtkimhtmltoolbar.c:310
 msgid "Select Background Color"
 msgstr "設定背景顏色"
 
-#: src/dialogs.c:1078 src/dialogs.c:1104
+#: src/dialogs.c:619 src/gtkimhtmltoolbar.c:164
 msgid "Select Font"
 msgstr "選擇字型"
 
-#: src/dialogs.c:1168
+#: src/dialogs.c:692
 msgid "You cannot save an away message with a blank title"
 msgstr "您不能儲存一個沒有原因的離開訊息"
 
-#: src/dialogs.c:1170
+#: src/dialogs.c:694
 msgid ""
 "Please give the message a title, or choose \"Use\" to use without saving."
 msgstr "請給予訊息一個標題;或按「使用」來使用,同時不儲存它。"
 
-#: src/dialogs.c:1180
+#: src/dialogs.c:704
 msgid "You cannot create an empty away message"
 msgstr "您無法建立一個空白的離開訊息"
 
-#: src/dialogs.c:1242
+#: src/dialogs.c:766
 msgid "New away message"
 msgstr "新的離開訊息"
 
-#: src/dialogs.c:1263
+#: src/dialogs.c:787
 msgid "Away title: "
 msgstr "離開原因:"
 
-#: src/dialogs.c:1314
+#: src/dialogs.c:843
 msgid "Save & Use"
 msgstr "儲存並使用"
 
-#: src/dialogs.c:1318
+#: src/dialogs.c:847
 msgid "Use"
 msgstr "使用"
 
-#. show everything
-#: src/dialogs.c:1467
-msgid "Smile!"
-msgstr "笑一個!"
-
-#: src/dialogs.c:1485
+#: src/dialogs.c:868
 msgid "Alias Chat"
 msgstr "給聊天室改別名"
 
-#: src/dialogs.c:1486
+#: src/dialogs.c:869
 msgid "Enter an alias for this chat."
 msgstr "請為這個聊天室輸入一個別名。"
 
+#: src/dialogs.c:871 src/dialogs.c:888 src/dialogs.c:907 src/gtkrequest.c:243
+msgid "Alias"
+msgstr "別名"
+
 # XXX 中文譯文無法分別出「Alias Buddy」和「Alias Contact」
-#: src/dialogs.c:1502
+#: src/dialogs.c:885
 msgid "Alias Contact"
 msgstr "給好友改別名"
 
 # XXX 中文譯文無法分別出「Alias Buddy」和「Alias Contact」
-#: src/dialogs.c:1503
+#: src/dialogs.c:886
 msgid "Enter an alias for this contact."
 msgstr "請為這個好友輸入一個別名。"
 
-#: src/dialogs.c:1520
+#: src/dialogs.c:903
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "請為 %s 輸入一個別名"
 
-#: src/dialogs.c:1522
+#: src/dialogs.c:905
 msgid "Alias Buddy"
 msgstr "為好友加上別名"
 
-#: src/ft.c:139
+#: src/ft.c:144
 #, c-format
 msgid "%s is not a valid filename.\n"
 msgstr "%s 不是一個有效的檔案名稱。\n"
 
-#: src/ft.c:152
+#: src/ft.c:157
 #, c-format
 msgid "%s was not found.\n"
 msgstr "%s 找不到。\n"
 
-#: src/ft.c:754
+#: src/ft.c:786
 #, c-format
 msgid "File transfer to %s aborted.\n"
 msgstr "傳送檔案到 %s 被取消。\n"
 
-#: src/ft.c:756
+#: src/ft.c:788
 #, c-format
 msgid "File transfer from %s aborted.\n"
 msgstr "由 %s 傳送檔案被取消。\n"
@@ -1725,7 +1879,7 @@
 msgid "Size of the expander arrow"
 msgstr "展開器箭頭大小"
 
-#: src/gaim-remote.c:66
+#: src/gaim-remote.c:65
 #, c-format
 msgid ""
 "Usage: %s command [OPTIONS] [URI]\n"
@@ -1746,21 +1900,21 @@
 "    選項:\n"
 "       -h, --help [commmand]    顯示指令的說明\n"
 
-#: src/gaim-remote.c:175 src/gaim-remote.c:191
+#: src/gaim-remote.c:174 src/gaim-remote.c:190
 msgid "Gaim not running (on session 0)\n"
 msgstr "Gaim 並未執行(在工作階段 0)\n"
 
-#: src/gaim-remote.c:204
+#: src/gaim-remote.c:203
 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"
@@ -1791,7 +1945,7 @@
 "\tgaim-remote uri 'aim:addbuddy?screenname=Penguin'\n"
 "提示您加入「Penguin」到您的好友清單中。\n"
 
-#: src/gaim-remote.c:223
+#: src/gaim-remote.c:222
 msgid ""
 "\n"
 "Close running copy of Gaim\n"
@@ -1800,32 +1954,27 @@
 "關閉正在執行的 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:2966
 msgid "Alphabetical"
 msgstr "依照字母"
 
-#: src/gaimrc.c:1261 src/gtkblist.c:2349
+#: src/gaimrc.c:1262 src/gtkblist.c:2967
 msgid "By status"
 msgstr "依照狀態"
 
-#: src/gaimrc.c:1263 src/gtkblist.c:2350
+#: src/gaimrc.c:1264 src/gtkblist.c:2968
 msgid "By log size"
 msgstr "依照日誌大小"
 
-#: src/gaimrc.c:1548
-#, c-format
-msgid "Could not open config file %s."
-msgstr "無法開啟設定檔 %s。"
-
-#: src/gtkaccount.c:285
+#: src/gtkaccount.c:289
 #, c-format
 msgid ""
 "<b>File:</b> %s\n"
@@ -1836,178 +1985,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:384
 msgid "Login Options"
 msgstr "登入選項"
 
-#: src/gtkaccount.c:384
+#: src/gtkaccount.c:401
 msgid "Protocol:"
 msgstr "通訊協定:"
 
-#: src/gtkaccount.c:389
-msgid "Screenname:"
+#: src/gtkaccount.c:406 src/gtkblist.c:3954
+msgid "Screen Name:"
 msgstr "帳號:"
 
-#: src/gtkaccount.c:462 src/main.c:308
+#: src/gtkaccount.c:479
 msgid "Password:"
 msgstr "密碼:"
 
-#: src/gtkaccount.c:467 src/gtkblist.c:3328 src/gtkblist.c:3650
+#: src/gtkaccount.c:484 src/gtkblist.c:3968 src/gtkblist.c:4296
 msgid "Alias:"
 msgstr "別名:"
 
-#: src/gtkaccount.c:471
+#: src/gtkaccount.c:488
 msgid "Remember password"
 msgstr "記住密碼"
 
 #. Build the user options frame.
-#: src/gtkaccount.c:525
+#: src/gtkaccount.c:542
 msgid "User Options"
 msgstr "使用者自定選項"
 
-#: src/gtkaccount.c:538
+#: src/gtkaccount.c:555
 msgid "New mail notifications"
 msgstr "新郵件通知"
 
-#: src/gtkaccount.c:547
+#: src/gtkaccount.c:564
 msgid "Buddy icon file:"
 msgstr "好友圖示檔案:"
 
-#: src/gtkaccount.c:556
+#: src/gtkaccount.c:574
 msgid "_Browse"
 msgstr "瀏覽(_B)"
 
-#: src/gtkaccount.c:562
+#: src/gtkaccount.c:580
 msgid "_Reset"
 msgstr "重置(_R)"
 
 #. Build the protocol options frame.
-#: src/gtkaccount.c:624
+#: src/gtkaccount.c:642
 #, c-format
 msgid "%s Options"
 msgstr "%s 選項"
 
 #. Use Global Proxy Settings
-#: src/gtkaccount.c:739
+#: src/gtkaccount.c:778 src/gtkaccount.c:825
 msgid "Use Global Proxy Settings"
 msgstr "使用全域的代理伺服器設定"
 
 # NOTE 可以有代理伺服器但毋須用
 # NOTE 香港普遍用「毋須」,但講國語「毋須」會不通順,「不使用」較好
 #. No Proxy
-#: src/gtkaccount.c:746
+#: src/gtkaccount.c:784 src/gtkaccount.c:832
 msgid "No Proxy"
 msgstr "不使用代理伺服器"
 
 #. HTTP
-#: src/gtkaccount.c:753
+#: src/gtkaccount.c:790 src/gtkaccount.c:839
 msgid "HTTP"
 msgstr "HTTP"
 
 #. SOCKS 4
-#: src/gtkaccount.c:760
+#: src/gtkaccount.c:796 src/gtkaccount.c:846
 msgid "SOCKS 4"
 msgstr "SOCKS 4"
 
 #. SOCKS 5
-#: src/gtkaccount.c:767
+#: src/gtkaccount.c:802 src/gtkaccount.c:853
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
 #. Use Environmental Settings
-#: src/gtkaccount.c:774 src/gtkprefs.c:1091
+#: src/gtkaccount.c:808 src/gtkaccount.c:860 src/gtkprefs.c:1203
 msgid "Use Environmental Settings"
 msgstr "使用環境變數設定"
 
-#: src/gtkaccount.c:807
+#: src/gtkaccount.c:899
 msgid "you can see the butterflies mating"
 msgstr "鴛鴦蝴蝶也看得見耶"
 
-#: src/gtkaccount.c:811
+#: src/gtkaccount.c:903
 msgid "If you look real closely"
 msgstr "如果您看得夠仔細"
 
-#: src/gtkaccount.c:827
+#: src/gtkaccount.c:919
 msgid "Proxy Options"
 msgstr "代理伺服器選項"
 
-#: src/gtkaccount.c:843 src/gtkprefs.c:1085
+#: src/gtkaccount.c:937 src/gtkprefs.c:1197
 msgid "Proxy _type:"
 msgstr "代理伺服器型態(_T):"
 
-#: src/gtkaccount.c:852 src/gtkprefs.c:1115
+#: src/gtkaccount.c:946 src/gtkprefs.c:1227
 msgid "_Host:"
 msgstr "主機位址(_H):"
 
-#: src/gtkaccount.c:856 src/gtkprefs.c:1132
+#: src/gtkaccount.c:950 src/gtkprefs.c:1245
 msgid "_Port:"
 msgstr "通訊埠(_P):"
 
-#: src/gtkaccount.c:864
+#: src/gtkaccount.c:958
 msgid "_Username:"
 msgstr "使用者(_U):"
 
-#: src/gtkaccount.c:869 src/gtkprefs.c:1167
+#: src/gtkaccount.c:963 src/gtkprefs.c:1282
 msgid "Pa_ssword:"
 msgstr "密碼(_S):"
 
-#: src/gtkaccount.c:1208
+#: src/gtkaccount.c:1331
 msgid "Add Account"
 msgstr "新增帳號"
 
-#: src/gtkaccount.c:1210
+#: src/gtkaccount.c:1333
 msgid "Modify Account"
 msgstr "修改帳號"
 
 #. Add the disclosure
-#: src/gtkaccount.c:1234
+#: src/gtkaccount.c:1357
 msgid "Show more options"
 msgstr "顯示較多的選項"
 
-#: src/gtkaccount.c:1235
+#: src/gtkaccount.c:1358
 msgid "Show fewer options"
 msgstr "顯示較少的選項"
 
 #. Register button
-#: src/gtkaccount.c:1262 src/protocols/jabber/jabber.c:686
+#: src/gtkaccount.c:1385 src/protocols/jabber/jabber.c:659
 msgid "Register"
 msgstr "註冊"
 
-#: src/gtkaccount.c:1607
+#: src/gtkaccount.c:1739
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "您確定要刪除 %s?"
 
-#: src/gtkaccount.c:1611 src/gtkrequest.c:194
+#: src/gtkaccount.c:1743 src/gtkrequest.c:239
 msgid "Delete"
 msgstr "刪除"
 
-#: src/gtkaccount.c:1725
+#: src/gtkaccount.c:1857 src/protocols/oscar/oscar.c:3360
 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:1880 src/protocols/jabber/jabber.c:950
+#: src/protocols/oscar/oscar.c:526 src/protocols/oscar/oscar.c:4818
+#: src/protocols/oscar/oscar.c:6420 src/protocols/yahoo/yahoo.c:2299
+#: src/protocols/zephyr/zephyr.c:1182 src/protocols/zephyr/zephyr.c:1192
 msgid "Online"
 msgstr "上線"
 
-#: src/gtkaccount.c:1766
+#: src/gtkaccount.c:1898
 msgid "Protocol"
 msgstr "通訊協定"
 
-#: src/gtkaccount.c:2056
+#: src/gtkaccount.c:2210
 #, 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:2224
 msgid ""
 "\n"
 "\n"
@@ -2017,191 +2162,224 @@
 "\n"
 "您想將他(她)加入到您的好友名單中嗎?"
 
-#: src/gtkaccount.c:2074
+#: src/gtkaccount.c:2228
 msgid "Information"
 msgstr "資訊"
 
-#: src/gtkaccount.c:2078
+#: src/gtkaccount.c:2232
 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:2234 src/gtkblist.c:4348 src/gtkconv.c:1107
+#: src/gtkconv.c:3338 src/gtkconv.c:3429 src/gtkrequest.c:240
+#: src/protocols/icq/gaim_icq.c:277 src/protocols/oscar/oscar.c:3007
 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:801 src/gtkblist.c:4236
+msgid ""
+"You are not currently signed on with any protocols that have the ability to "
+"chat."
+msgstr "您並未登入任何一個可供您加入聊天室的通訊協定。"
+
+# TODO 看起來應該為加一個新的聊天室,並把聊天室歸類到某個群組。
+# NOTE 譯文更動 by Paladin
+#: src/gtkblist.c:814
+msgid "Join a Chat"
+msgstr "加入聊天室"
+
+#: src/gtkblist.c:835
+msgid ""
+"Please enter the appropriate information about the chat you would like to "
+"join.\n"
+msgstr "請輸入關於您所想加入好友清單的聊天室的適當資訊。\n"
+
+#: src/gtkblist.c:848 src/gtkpounce.c:361 src/gtkroomlist.c:365
+msgid "_Account:"
+msgstr "帳號(_A):"
+
+#: src/gtkblist.c:1087 src/gtkblist.c:3155
+msgid "Get _Info"
+msgstr "取得資訊(_I)"
+
+#: src/gtkblist.c:1090 src/gtkblist.c:3146
+msgid "I_M"
+msgstr "即時訊息(_M)"
+
+#: src/gtkblist.c:1092
 msgid "Add Buddy _Pounce"
 msgstr "加入好友狀態捕捉(_P)"
 
-#: src/gtkblist.c:822
+#: src/gtkblist.c:1094
 msgid "View _Log"
 msgstr "觀看日誌(_L)"
 
-#: src/gtkblist.c:842 src/gtkblist.c:931 src/gtkblist.c:950
+#: src/gtkblist.c:1159 src/gtkblist.c:1260 src/gtkblist.c:1274
 msgid "_Alias..."
 msgstr "別名(_A)..."
 
-#: src/gtkblist.c:844 src/gtkblist.c:933 src/gtkblist.c:955 src/gtkconn.c:358
+#: src/gtkblist.c:1161 src/gtkblist.c:1262 src/gtkblist.c:1279
+#: src/gtkconn.c:361
 msgid "_Remove"
 msgstr "移除(_R)"
 
-#: src/gtkblist.c:907
+#: src/gtkblist.c:1206
 msgid "Add a _Buddy"
 msgstr "新增一個好友(_B)"
 
-#: src/gtkblist.c:909
+#: src/gtkblist.c:1208
 msgid "Add a C_hat"
 msgstr "新增一個聊天室(_H)"
 
-#: src/gtkblist.c:911
+#: src/gtkblist.c:1210
 msgid "_Delete Group"
 msgstr "刪除群組(_D)"
 
-#: src/gtkblist.c:913
+#: src/gtkblist.c:1212
 msgid "_Rename"
 msgstr "重命名(_R)"
 
-#: src/gtkblist.c:928
+#. join button
+#: src/gtkblist.c:1238 src/gtkroomlist.c:261 src/gtkroomlist.c:417
+#: src/stock.c:87
+msgid "_Join"
+msgstr "加入(_J)"
+
+#: src/gtkblist.c:1240
 msgid "Auto-Join"
 msgstr "自動加入"
 
-#: src/gtkblist.c:952 src/gtkblist.c:987
+#: src/gtkblist.c:1276 src/gtkblist.c:1302
 msgid "_Collapse"
 msgstr "收起(_C)"
 
-#: src/gtkblist.c:992
+#: src/gtkblist.c:1307
 msgid "_Expand"
 msgstr "展開(_E)"
 
 # XXX 暫譯
-#: src/gtkblist.c:1391 src/gtkconv.c:3999
+#: src/gtkblist.c:1964 src/gtkconv.c:3916
 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:2312
 msgid "/_Buddies"
 msgstr "/好友(_B)"
 
-#: src/gtkblist.c:1691
+#: src/gtkblist.c:2313
 msgid "/Buddies/New Instant _Message..."
 msgstr "/好友/新即時訊息(_M)"
 
-#: src/gtkblist.c:1692
+#: src/gtkblist.c:2314
 msgid "/Buddies/Join a _Chat..."
 msgstr "/好友/加入聊天室(_C)"
 
-#: src/gtkblist.c:1693
-msgid "/Buddies/Get _User Info..."
-msgstr "/好友/取得使用者資訊(_U)"
-
-#: src/gtkblist.c:1695
+#: src/gtkblist.c:2315
+msgid "/Buddies/Get User _Info..."
+msgstr "/好友/取得使用者資訊(_I)..."
+
+#: src/gtkblist.c:2317
 msgid "/Buddies/Show _Offline Buddies"
 msgstr "/好友/顯示離線好友(_O)"
 
-#: src/gtkblist.c:1696
+#: src/gtkblist.c:2318
 msgid "/Buddies/Show _Empty Groups"
 msgstr "/好友/顯示空白的群組(_E)"
 
-#: src/gtkblist.c:1697
+#: src/gtkblist.c:2319
 msgid "/Buddies/_Add Buddy..."
 msgstr "/好友/新增好友(_A)..."
 
-#: src/gtkblist.c:1698
+#: src/gtkblist.c:2320
 msgid "/Buddies/Add C_hat..."
 msgstr "/好友/新增聊天室(_H)..."
 
-#: src/gtkblist.c:1699
+#: src/gtkblist.c:2321
 msgid "/Buddies/Add _Group..."
 msgstr "/好友/新增群組(_G)..."
 
-#: src/gtkblist.c:1701
+#: src/gtkblist.c:2323
 msgid "/Buddies/_Signoff"
 msgstr "/好友/登出(_S)"
 
-#: src/gtkblist.c:1702
+#: src/gtkblist.c:2324
 msgid "/Buddies/_Quit"
 msgstr "/好友/結束程式(_Q)"
 
 #. Tools
-#: src/gtkblist.c:1705
+#: src/gtkblist.c:2327
 msgid "/_Tools"
 msgstr "工具(_T)"
 
-#: src/gtkblist.c:1706
+#: src/gtkblist.c:2328
 msgid "/Tools/_Away"
 msgstr "/工具/離開(_A)"
 
-#: src/gtkblist.c:1707
+#: src/gtkblist.c:2329
 msgid "/Tools/Buddy _Pounce"
 msgstr "/工具/好友狀態捕捉(_P)"
 
-#: src/gtkblist.c:1708
+#: src/gtkblist.c:2330
 msgid "/Tools/P_rotocol Actions"
 msgstr "/工具/通訊協定相關設定(_R)"
 
-#: src/gtkblist.c:1710
+#: src/gtkblist.c:2332
 msgid "/Tools/A_ccounts"
 msgstr "/工具/帳號清單(_C)"
 
-#: src/gtkblist.c:1711
+#: src/gtkblist.c:2333
 msgid "/Tools/_File Transfers"
 msgstr "/工具/檔案傳輸(_F)"
 
-#: src/gtkblist.c:1712
+#: src/gtkblist.c:2334
+msgid "/Tools/R_oom List"
+msgstr "/工具/聊天室清單(_O)"
+
+#: src/gtkblist.c:2335
 msgid "/Tools/Pr_eferences"
 msgstr "/工具/偏好設定(_E)"
 
-#: src/gtkblist.c:1713
+#: src/gtkblist.c:2336
 msgid "/Tools/Pr_ivacy"
 msgstr "/工具/隱私設定(_I)"
 
-#: src/gtkblist.c:1716
+#: src/gtkblist.c:2338
 msgid "/Tools/View System _Log"
 msgstr "觀看系統日誌(_L)"
 
 #. Help
-#: src/gtkblist.c:1720
+#: src/gtkblist.c:2341
 msgid "/_Help"
 msgstr "說明(_H)"
 
-#: src/gtkblist.c:1721
+#: src/gtkblist.c:2342
 msgid "/Help/Online _Help"
 msgstr "線上說明(_H)"
 
-#: src/gtkblist.c:1722
+#: src/gtkblist.c:2343
 msgid "/Help/_Debug Window"
 msgstr "/說明/除錯視窗(_D)"
 
-#: src/gtkblist.c:1723
+#: src/gtkblist.c:2344
 msgid "/Help/_About"
 msgstr "/說明/關於(_A)"
 
-#: src/gtkblist.c:1739
+#: src/gtkblist.c:2360
 msgid "Rename Group"
 msgstr "修改群組名稱"
 
-#: src/gtkblist.c:1739
+#: src/gtkblist.c:2360
 msgid "New group name"
 msgstr "新名字"
 
-#: src/gtkblist.c:1740
+#: src/gtkblist.c:2361
 msgid "Please enter a new name for the selected group."
 msgstr "請為選取的群組輸入一個新的名稱。"
 
-#: src/gtkblist.c:1768
+#: src/gtkblist.c:2389
 #, c-format
 msgid ""
 "\n"
@@ -2210,16 +2388,16 @@
 "\n"
 "<b>帳號:</b>%s"
 
-#: src/gtkblist.c:1832 src/protocols/oscar/oscar.c:5525
+#: src/gtkblist.c:2453
 msgid "<b>Status:</b> Offline"
 msgstr "<b>狀態:</b>離線"
 
-#: src/gtkblist.c:1847
+#: src/gtkblist.c:2468
 #, c-format
 msgid "%d%%"
 msgstr "%d%%"
 
-#: src/gtkblist.c:1863
+#: src/gtkblist.c:2484
 msgid ""
 "\n"
 "<b>Account:</b>"
@@ -2227,7 +2405,7 @@
 "\n"
 "<b>帳號:</b>"
 
-#: src/gtkblist.c:1864
+#: src/gtkblist.c:2485
 msgid ""
 "\n"
 "<b>Contact Alias:</b>"
@@ -2235,7 +2413,7 @@
 "\n"
 "<b>別名:</b>"
 
-#: src/gtkblist.c:1865
+#: src/gtkblist.c:2486
 msgid ""
 "\n"
 "<b>Alias:</b>"
@@ -2243,7 +2421,7 @@
 "\n"
 "<b>別名:</b>"
 
-#: src/gtkblist.c:1866
+#: src/gtkblist.c:2487
 msgid ""
 "\n"
 "<b>Nickname:</b>"
@@ -2251,7 +2429,7 @@
 "\n"
 "<b>暱稱:</b>"
 
-#: src/gtkblist.c:1867
+#: src/gtkblist.c:2488
 msgid ""
 "\n"
 "<b>Logged In:</b>"
@@ -2259,7 +2437,7 @@
 "\n"
 "<b>登入時間:</b>"
 
-#: src/gtkblist.c:1868
+#: src/gtkblist.c:2489
 msgid ""
 "\n"
 "<b>Idle:</b>"
@@ -2267,7 +2445,7 @@
 "\n"
 "<b>閒置:</b>"
 
-#: src/gtkblist.c:1869
+#: src/gtkblist.c:2490
 msgid ""
 "\n"
 "<b>Warned:</b>"
@@ -2275,7 +2453,7 @@
 "\n"
 "<b>警告:<b>"
 
-#: src/gtkblist.c:1871
+#: src/gtkblist.c:2492
 msgid ""
 "\n"
 "<b>Description:</b> Spooky"
@@ -2283,7 +2461,7 @@
 "\n"
 "<b>介紹:</b>幽靈似的"
 
-#: src/gtkblist.c:1872
+#: src/gtkblist.c:2493
 msgid ""
 "\n"
 "<b>Status</b>: Awesome"
@@ -2291,7 +2469,7 @@
 "\n"
 "<b>狀態:</b>頂呱呱"
 
-#: src/gtkblist.c:1873
+#: src/gtkblist.c:2494
 msgid ""
 "\n"
 "<b>Status</b>: Rockin'"
@@ -2299,85 +2477,77 @@
 "\n"
 "<b>狀態:</b>頂呱呱"
 
-#: src/gtkblist.c:2143
+#: src/gtkblist.c:2764
 #, c-format
 msgid "Idle (%dh%02dm) "
 msgstr "閒置(%d 小時 %d 分)"
 
-#: src/gtkblist.c:2145
+#: src/gtkblist.c:2766
 #, c-format
 msgid "Idle (%dm) "
 msgstr "閒置(%d 分)"
 
-#: src/gtkblist.c:2150
+#: src/gtkblist.c:2771
 #, c-format
 msgid "Warned (%d%%) "
 msgstr "警告 (%d%%)"
 
-#: src/gtkblist.c:2153
+#: src/gtkblist.c:2774
 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:3032
 msgid "/Tools/Away"
 msgstr "/工具/離開"
 
-#: src/gtkblist.c:2416
+#: src/gtkblist.c:3035
 msgid "/Tools/Buddy Pounce"
 msgstr "/工具/好友狀態捕捉"
 
-#: src/gtkblist.c:2419
+#: src/gtkblist.c:3038
 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:3126
 msgid "/Buddies/Show Offline Buddies"
 msgstr "/好友/顯示離線好友"
 
-#: src/gtkblist.c:2508
+#: src/gtkblist.c:3128
 msgid "/Buddies/Show Empty Groups"
 msgstr "/好友/顯示空的好的群組"
 
-#: src/gtkblist.c:2526 src/gtkconv.c:1215
-msgid "IM"
-msgstr "即時訊息"
-
-#: src/gtkblist.c:2532
+#: src/gtkblist.c:3152
 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:3161
 msgid "Get information on the selected buddy"
 msgstr "取得被選取好友的資訊"
 
-#: src/gtkblist.c:2544 src/protocols/oscar/oscar.c:3086
-msgid "Chat"
-msgstr "聊天"
-
-#: src/gtkblist.c:2549
+#: src/gtkblist.c:3164
+msgid "_Chat"
+msgstr "聊天(_C)"
+
+#: src/gtkblist.c:3169
 msgid "Join a chat room"
 msgstr "加入一個聊天室"
 
-#: src/gtkblist.c:2557
+#: src/gtkblist.c:3172
+msgid "_Away"
+msgstr "離開(_A)"
+
+#: src/gtkblist.c:3177
 msgid "Set an away message"
 msgstr "設定一個離開訊息"
 
-#: src/gtkblist.c:3270 src/protocols/yahoo/yahoo.c:2325
+#: src/gtkblist.c:3909 src/protocols/yahoo/yahoo.c:2431
 msgid "Add Buddy"
 msgstr "新增好友"
 
-#: src/gtkblist.c:3293
+#: src/gtkblist.c:3932
 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 +2556,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:3992 src/gtkblist.c:4276
 msgid "Account:"
 msgstr "帳號:"
 
-#: src/gtkblist.c:3598
+#: src/gtkblist.c:4243
 msgid "Add Chat"
 msgstr "新增聊天室"
 
-#: src/gtkblist.c:3621
+#: src/gtkblist.c:4266
 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:4345
 msgid "Add Group"
 msgstr "加入群組"
 
-#: src/gtkblist.c:3698
+#: src/gtkblist.c:4346
 msgid "Please enter the name of the group to be added."
 msgstr "請給您新增的群組輸入名稱。"
 
-#: src/gtkblist.c:4215
+#: src/gtkblist.c:4866
 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 +2617,634 @@
 "%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:172
+#, c-format
+msgid "<h1>Conversation with %s</h1>\n"
+msgstr "<h1>與 %s 的交談</h1>\n"
+
+#: src/gtkconv.c:190
 msgid "That file already exists"
 msgstr "那個檔案已經存在"
 
-#: src/gtkconv.c:188 src/gtkft.c:1076
+#: src/gtkconv.c:191 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:505
 msgid "Invite Buddy Into Chat Room"
 msgstr "邀請好友進入聊天室"
 
 #. Put our happy label in it.
-#: src/gtkconv.c:657
+#: src/gtkconv.c:533
 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:554
 msgid "_Buddy:"
 msgstr "好友(_B):"
 
-#: src/gtkconv.c:698
+#: src/gtkconv.c:574
 msgid "_Message:"
 msgstr "訊息(_M):"
 
-#: src/gtkconv.c:788
+#: src/gtkconv.c:667
 msgid "Find"
 msgstr "搜尋"
 
-#: src/gtkconv.c:810
+#: src/gtkconv.c:693
 msgid "_Search for:"
 msgstr "搜尋(_S):"
 
-#: src/gtkconv.c:1223
+#: src/gtkconv.c:1065
+msgid "IM"
+msgstr "即時訊息"
+
+#: src/gtkconv.c:1073
 msgid "Un-Ignore"
 msgstr "取消忽略使用者"
 
-#: src/gtkconv.c:1225 src/gtkprefs.c:767
+#: src/gtkconv.c:1075 src/gtkprefs.c:806
 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:1084 src/gtkconv.c:3352
 msgid "Info"
 msgstr "取得資訊"
 
-#: src/gtkconv.c:1243
+#: src/gtkconv.c:1093
 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:1105 src/gtkconv.c:3345 src/gtkconv.c:3436
+#: src/gtkrequest.c:241
 msgid "Remove"
 msgstr "移除"
 
-#: src/gtkconv.c:2489
+#: src/gtkconv.c:2207
+msgid "Animate"
+msgstr "動畫"
+
+#: src/gtkconv.c:2212
+msgid "Hide Icon"
+msgstr "隱藏圖示"
+
+#: src/gtkconv.c:2218
+msgid "Save Icon As..."
+msgstr "儲存圖示為..."
+
+#: src/gtkconv.c:2585
 msgid "User is typing..."
 msgstr "使用者正在輸入..."
 
-#: src/gtkconv.c:2497
+#: src/gtkconv.c:2593
 msgid "User has typed something and paused"
 msgstr "使用者輸入了些東西,不過目前暫停輸入"
 
 #. Build the Send As menu
-#: src/gtkconv.c:2600
+#: src/gtkconv.c:2696
 msgid "_Send As"
 msgstr "使用帳號(_S)"
 
-#: src/gtkconv.c:3011
+#: src/gtkconv.c:3116
 msgid "Save Conversation"
 msgstr "儲存聊天內容"
 
 #. Conversation menu
-#: src/gtkconv.c:3028
+#: src/gtkconv.c:3133
 msgid "/_Conversation"
 msgstr "/交談(_C)"
 
-#: src/gtkconv.c:3030
+#: src/gtkconv.c:3135
 msgid "/Conversation/New Instant _Message..."
 msgstr "/好友/新即時訊息(_M)..."
 
-#: src/gtkconv.c:3035
+#: src/gtkconv.c:3140
 msgid "/Conversation/_Find..."
 msgstr "/交談/搜尋(_F)..."
 
-#: src/gtkconv.c:3036
+#: src/gtkconv.c:3142
 msgid "/Conversation/View _Log"
 msgstr "/交談/觀看歷史記錄(_L)"
 
-#: src/gtkconv.c:3037
+#: src/gtkconv.c:3143
 msgid "/Conversation/_Save As..."
 msgstr "/交談/另存新檔(_S)..."
 
-#: src/gtkconv.c:3042
+#: src/gtkconv.c:3148
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/交談/新增好友狀態捕捉(_P)..."
 
-#: src/gtkconv.c:3044
+#: src/gtkconv.c:3150
 msgid "/Conversation/_Get Info"
 msgstr "/交談/取得資訊(_G)"
 
-#: src/gtkconv.c:3046
+#: src/gtkconv.c:3152
 msgid "/Conversation/_Warn..."
 msgstr "/交談/警告(_W)..."
 
-#: src/gtkconv.c:3048
+#: src/gtkconv.c:3154
 msgid "/Conversation/In_vite..."
 msgstr "/交談/邀請(_V)..."
 
-#: src/gtkconv.c:3053
+#: src/gtkconv.c:3159
 msgid "/Conversation/A_lias..."
 msgstr "/交談/別名(_L)..."
 
-#: src/gtkconv.c:3055
+#: src/gtkconv.c:3161
 msgid "/Conversation/_Block..."
 msgstr "/交談/封鎖(_B)..."
 
-#: src/gtkconv.c:3057
+#: src/gtkconv.c:3163
 msgid "/Conversation/_Add..."
 msgstr "/交談/新增(_A)..."
 
-#: src/gtkconv.c:3059
+#: src/gtkconv.c:3165
 msgid "/Conversation/_Remove..."
 msgstr "/交談/移除(_R)..."
 
-#: src/gtkconv.c:3064
+#: src/gtkconv.c:3170
 msgid "/Conversation/Insert Lin_k..."
 msgstr "/交談/插入連結(_k)..."
 
-#: src/gtkconv.c:3066
+#: src/gtkconv.c:3172
 msgid "/Conversation/Insert Imag_e..."
 msgstr "/交談/插入影像(_E)..."
 
-#: src/gtkconv.c:3071
+#: src/gtkconv.c:3177
 msgid "/Conversation/_Close"
 msgstr "/交談/關閉(_C)"
 
 #. Options
-#: src/gtkconv.c:3075
+#: src/gtkconv.c:3181
 msgid "/_Options"
 msgstr "/選項(_O)"
 
-#: src/gtkconv.c:3076
+#: src/gtkconv.c:3182
 msgid "/Options/Enable _Logging"
 msgstr "/選項/開始記錄日誌(_L)"
 
-#: src/gtkconv.c:3077
+#: src/gtkconv.c:3183
 msgid "/Options/Enable _Sounds"
 msgstr "/選項/開啟音效(_S)"
 
-#: src/gtkconv.c:3078
+#: src/gtkconv.c:3184
 msgid "/Options/Show Formatting _Toolbar"
 msgstr "/選項/顯示格式工具列(_T)"
 
-#: src/gtkconv.c:3120
+#: src/gtkconv.c:3226
 msgid "/Conversation/View Log"
 msgstr "/交談/觀看歷史記錄"
 
-#: src/gtkconv.c:3125
+#: src/gtkconv.c:3231
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/交談/新增好友狀態捕捉..."
 
-#: src/gtkconv.c:3131
+#: src/gtkconv.c:3237
 msgid "/Conversation/Get Info"
 msgstr "/交談/取得資訊"
 
-#: src/gtkconv.c:3135
+#: src/gtkconv.c:3241
 msgid "/Conversation/Warn..."
 msgstr "/交談/警告..."
 
-#: src/gtkconv.c:3139
+#: src/gtkconv.c:3245
 msgid "/Conversation/Invite..."
 msgstr "/交談/邀請..."
 
-#: src/gtkconv.c:3145
+#: src/gtkconv.c:3251
 msgid "/Conversation/Alias..."
 msgstr "/交談/別名..."
 
-#: src/gtkconv.c:3149
+#: src/gtkconv.c:3255
 msgid "/Conversation/Block..."
 msgstr "/交談/封鎖..."
 
-#: src/gtkconv.c:3153
+#: src/gtkconv.c:3259
 msgid "/Conversation/Add..."
 msgstr "/交談/新增..."
 
-#: src/gtkconv.c:3157
+#: src/gtkconv.c:3263
 msgid "/Conversation/Remove..."
 msgstr "/交談/移除..."
 
-#: src/gtkconv.c:3163
+#: src/gtkconv.c:3269
 msgid "/Conversation/Insert Link..."
 msgstr "/交談/插入連結..."
 
-#: src/gtkconv.c:3167
+#: src/gtkconv.c:3273
 msgid "/Conversation/Insert Image..."
 msgstr "/交談/插入影像..."
 
-#: src/gtkconv.c:3173
+#: src/gtkconv.c:3279
 msgid "/Options/Enable Logging"
 msgstr "/選項/開始記錄日誌"
 
-#: src/gtkconv.c:3176
+#: src/gtkconv.c:3282
 msgid "/Options/Enable Sounds"
 msgstr "/選項/開啟音效"
 
-#: src/gtkconv.c:3179
+#: src/gtkconv.c:3285
 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:3308 src/gtkconv.c:3310 src/gtkconv.c:3408 src/gtkconv.c:3410
 msgid "Send"
 msgstr "送出"
 
 #. Now, um, just kind of all over the place. Huh?
 #. Warn button
-#: src/gtkconv.c:3218
+#: src/gtkconv.c:3324
 msgid "Warn"
 msgstr "警告"
 
-#: src/gtkconv.c:3221
+#: src/gtkconv.c:3327
 msgid "Warn the user"
 msgstr "警告使用者"
 
 #. Block button
-#: src/gtkconv.c:3225 src/gtkprivacy.c:606 src/gtkprivacy.c:617
+#: src/gtkconv.c:3331 src/gtkprivacy.c:612 src/gtkprivacy.c:623
 msgid "Block"
 msgstr "封鎖"
 
-#: src/gtkconv.c:3228
+#: src/gtkconv.c:3334
 msgid "Block the user"
 msgstr "封鎖使用者"
 
-#: src/gtkconv.c:3235
+#: src/gtkconv.c:3341
 msgid "Add the user to your buddy list"
 msgstr "將使用者加入您的好友清單"
 
-#: src/gtkconv.c:3242
+#: src/gtkconv.c:3348
 msgid "Remove the user from your buddy list"
 msgstr "將使用者自您的好友清單中移除"
 
-#: src/gtkconv.c:3249 src/gtkconv.c:3747
+#: src/gtkconv.c:3355 src/gtkconv.c:3677
 msgid "Get the user's information"
 msgstr "取得使用者資訊"
 
 #. Invite
-#: src/gtkconv.c:3316
+#: src/gtkconv.c:3422
 msgid "Invite"
 msgstr "邀請"
 
-#: src/gtkconv.c:3319
+#: src/gtkconv.c:3425
 msgid "Invite a user"
 msgstr "邀請使用者"
 
-#: src/gtkconv.c:3326
+#: src/gtkconv.c:3432
 msgid "Add the chat to your buddy list"
 msgstr "將這個聊天室加入您的好友清單"
 
-#: src/gtkconv.c:3333
-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
+msgid "Remove the chat from your buddy list"
+msgstr "將這個聊天室自您的好友清單中移除"
+
+#: src/gtkconv.c:3539
 msgid "Topic:"
 msgstr "主題:"
 
 #. Setup the label telling how many people are in the room.
-#: src/gtkconv.c:3671
+#: src/gtkconv.c:3599
 msgid "0 people in room"
 msgstr "沒有人在這個房間"
 
-#: src/gtkconv.c:3724
+#: src/gtkconv.c:3654
 msgid "IM the user"
 msgstr "送出即時訊息給使用者"
 
-#: src/gtkconv.c:3736
+#: src/gtkconv.c:3666
 msgid "Ignore the user"
 msgstr "忽略使用者"
 
-#: src/gtkconv.c:4284
+#: src/gtkconv.c:4207
 msgid "Close conversation"
 msgstr "關閉交談"
 
-#: src/gtkconv.c:4808 src/gtkconv.c:4840 src/gtkconv.c:4961 src/gtkconv.c:5028
+#: src/gtkconv.c:4752 src/gtkconv.c:4784 src/gtkconv.c:4905 src/gtkconv.c:4972
 #, 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:5491 src/gtkconv.c:5494
 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
+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:1183
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "%s 想要送 %s (%s) 給您"
 
-#: src/gtkimhtml.c:614
+#: src/gtkft.c:1216
+#, c-format
+msgid "Accept file transfer request from %s?"
+msgstr "接受來自於「%s」的檔案傳輸要求嗎?"
+
+#  XXX 暫譯
+#: src/gtkft.c:1220
+#, c-format
+msgid ""
+"A file is available for download from:\n"
+"Remote host: %s\n"
+"Remote port: %d"
+msgstr ""
+"有檔案可以下載:\n"
+"遠端主機 :%s\n"
+"遠端通訊埠:%d"
+
+#: src/gtkimhtml.c:1131
 msgid "_Copy E-Mail Address"
 msgstr "複製電子郵件地址(_C)"
 
-#: src/gtkimhtml.c:626
+#: src/gtkimhtml.c:1143
 msgid "_Copy Link Location"
 msgstr "複製連結位址(_C)"
 
-#: src/gtkimhtml.c:636
+#: src/gtkimhtml.c:1153
 msgid "_Open Link in Browser"
 msgstr "在瀏覽器中打開連結(_O)"
 
 # NOTE "Defaulting to PNG" 是指 gaim 在無計可施的情況下盲猜影像是 PNG 格式
-#: src/gtkimhtml.c:1752
+#: src/gtkimhtml.c:2635
 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:2643
 #, c-format
 msgid "Error saving image: %s"
 msgstr "儲存影像錯誤:%s"
 
-#: src/gtkimhtml.c:1769
+#: src/gtkimhtml.c:2652
 msgid "Save Image"
 msgstr "儲存影像"
 
-#: src/gtkimhtml.c:1792
+#: src/gtkimhtml.c:2675
 msgid "_Save Image..."
 msgstr "儲存影像(_S)..."
 
+#: src/gtkimhtmltoolbar.c:383
+msgid "_URL"
+msgstr "_URL"
+
+#: src/gtkimhtmltoolbar.c:387
+msgid "_Description"
+msgstr "描述(_D)"
+
+#: src/gtkimhtmltoolbar.c:392
+msgid "Insert Link"
+msgstr "加入連結"
+
+#: src/gtkimhtmltoolbar.c:394
+msgid ""
+"Please enter the URL and description of the link that you want to insert. "
+"The description is optional."
+msgstr "請輸入您所要插入的 URL 及它的描述,描述是選擇性的,可不用輸入。"
+
+#: src/gtkimhtmltoolbar.c:398
+msgid "_Insert"
+msgstr "插入(_I)"
+
+#: src/gtkimhtmltoolbar.c:455
+#, c-format
+msgid "Failed to store image: %s\n"
+msgstr "無法儲存影像:%s\n"
+
+#: src/gtkimhtmltoolbar.c:481
+msgid "Insert Image"
+msgstr "插入影像"
+
+#. show everything
+#: src/gtkimhtmltoolbar.c:625
+msgid "Smile!"
+msgstr "笑一個!"
+
+#: src/gtkimhtmltoolbar.c:825
+msgid "Bold"
+msgstr "粗體"
+
+#: src/gtkimhtmltoolbar.c:836
+msgid "Italic"
+msgstr "斜體"
+
+#: src/gtkimhtmltoolbar.c:847
+msgid "Underline"
+msgstr "底線"
+
+#: src/gtkimhtmltoolbar.c:863
+msgid "Larger font size"
+msgstr "放大字體"
+
+#: src/gtkimhtmltoolbar.c:875
+msgid "Smaller font size"
+msgstr "縮小字體"
+
+#: src/gtkimhtmltoolbar.c:892
+msgid "Font Face"
+msgstr "字型"
+
+#: src/gtkimhtmltoolbar.c:904
+msgid "Foreground font color"
+msgstr "前景顏色"
+
+#: src/gtkimhtmltoolbar.c:916
+msgid "Background color"
+msgstr "背景顏色"
+
+#: src/gtkimhtmltoolbar.c:931
+msgid "Insert link"
+msgstr "插入連結"
+
+#: src/gtkimhtmltoolbar.c:941
+msgid "Insert image"
+msgstr "插入影像"
+
+#: src/gtkimhtmltoolbar.c:952
+msgid "Insert smiley"
+msgstr "插入表情"
+
 # NOTE 這個處理的手法係由芬蘭文現任譯者Arto Alakulju提供的
-#: src/gtklog.c:255
+#: src/gtklog.c:282
 msgid "Conversations with"
 msgstr "交談:"
 
-#: src/gtknotify.c:211
+#. Window **********
+#: src/gtklog.c:368 src/gtklog.c:384
+msgid "System Log"
+msgstr "系統日誌"
+
+#. Descriptive label
+#: src/gtknotify.c:217
 #, 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:229
 #, c-format
 msgid "<span weight=\"bold\">From:</span> %s\n"
 msgstr "<span weight=\"bold\">來自:</span> %s\n"
 
-#: src/gtknotify.c:224
+#: src/gtknotify.c:235
 #, c-format
 msgid "<span weight=\"bold\">Subject:</span> %s\n"
 msgstr "<span weight=\"bold\">主題:</span> %s\n"
 
-#: src/gtknotify.c:228
+#: src/gtknotify.c:239
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
@@ -3030,7 +3255,7 @@
 "\n"
 "%s%s%s%s"
 
-#: src/gtknotify.c:243
+#: src/gtknotify.c:255
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
@@ -3041,175 +3266,183 @@
 "\n"
 "%s"
 
-#: src/gtknotify.c:430 src/gtknotify.c:450 src/gtknotify.c:458
+#: src/gtknotify.c:441
+#, c-format
+msgid "The browser command \"%s\" is invalid."
+msgstr "瀏覽器指令「%s」是無效的。"
+
+#: src/gtknotify.c:444 src/gtknotify.c:458 src/gtknotify.c:473
+#: src/gtknotify.c:581
 msgid "Unable to open URL"
 msgstr "無法開啟網頁"
 
-#: src/gtknotify.c:431
+#: src/gtknotify.c:455 src/gtknotify.c:470
+#, c-format
+msgid "Error launching \"%s\": %s"
+msgstr "執行「%s」時發生了錯誤:%s"
+
+#: src/gtknotify.c:582
 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"
-msgstr "登入"
-
-#: src/gtkpounce.c:409
-msgid "Sign off"
-msgstr "登出"
-
-#: src/gtkpounce.c:413
-msgid "Return 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"
-msgstr "閒置"
-
-#: src/gtkpounce.c:417
-msgid "Return from idle"
-msgstr "由閒置返回"
-
-#: src/gtkpounce.c:419
-msgid "Buddy starts typing"
-msgstr "好友開始輸入"
-
-#: src/gtkpounce.c:421
-msgid "Buddy stops typing"
-msgstr "好友停止輸入"
+#: src/gtkpounce.c:412
+msgid "_Sign on"
+msgstr "登入(_S)"
+
+#: src/gtkpounce.c:414
+msgid "Sign _off"
+msgstr "登出(_O)"
+
+#: src/gtkpounce.c:416
+msgid "A_way"
+msgstr "離開(_W)"
+
+#: src/gtkpounce.c:418
+msgid "Re_turn from away"
+msgstr "由離開返回(_T)"
+
+#: src/gtkpounce.c:420
+msgid "_Idle"
+msgstr "閒置(_I)"
+
+#: src/gtkpounce.c:422
+msgid "Retur_n from idle"
+msgstr "由閒置返回(_N)"
+
+#: src/gtkpounce.c:424
+msgid "Buddy starts _typing"
+msgstr "好友開始輸入(_T)"
+
+#: src/gtkpounce.c:426
+msgid "Buddy stops t_yping"
+msgstr "好友停止輸入(_Y)"
 
 #. 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"
-msgstr "開啟即時訊息視窗"
-
-#: src/gtkpounce.c:458
-msgid "Popup notification"
-msgstr "彈出通知"
-
-#: src/gtkpounce.c:459
-msgid "Send a message"
-msgstr "送出訊息"
-
-#: src/gtkpounce.c:460
-msgid "Execute a command"
-msgstr "執行指令"
-
-#: src/gtkpounce.c:461
-msgid "Play a sound"
-msgstr "播放音效"
-
-#: src/gtkpounce.c:465 src/gtkpounce.c:467
-msgid "Browse"
-msgstr "瀏覽"
-
-#: src/gtkpounce.c:468 src/gtkprefs.c:2072
-msgid "Test"
-msgstr "測試"
-
-#: src/gtkpounce.c:551
-msgid "_Save this pounce after activation"
-msgstr "儲存設定並啟動(_S)"
+#: src/gtkpounce.c:462
+msgid "Op_en an IM window"
+msgstr "開啟即時訊息視窗(_E)"
+
+#: src/gtkpounce.c:463
+msgid "_Popup notification"
+msgstr "彈出通知(_P)"
+
+#: src/gtkpounce.c:464
+msgid "Send a _message"
+msgstr "送出訊息(_M)"
+
+#: src/gtkpounce.c:465
+msgid "E_xecute a command"
+msgstr "執行指令(_X)"
+
+#: src/gtkpounce.c:466
+msgid "P_lay a sound"
+msgstr "播放音效(_L)"
+
+#: src/gtkpounce.c:470
+msgid "B_rowse..."
+msgstr "瀏覽(_R)..."
+
+#: src/gtkpounce.c:472
+msgid "Bro_wse..."
+msgstr "瀏覽(_W)..."
+
+#: src/gtkpounce.c:473
+msgid "Pre_view"
+msgstr "預覽(_V)"
+
+#: src/gtkpounce.c:556
+msgid "Sav_e this pounce after activation"
+msgstr "儲存設定並啟動(_E)"
 
 #. "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:388
 msgid "Interface Options"
 msgstr "介面選項"
 
-#: src/gtkprefs.c:367
+#: src/gtkprefs.c:390
 msgid "D_isplay remote nicknames if no alias is set"
 msgstr "當別名沒有設定時,以對方所設定的暱稱顯示(_I)"
 
-#: src/gtkprefs.c:553
+#: src/gtkprefs.c:584
 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 +3450,422 @@
 "在下面的清單中選取一個您所想喜歡的表情主題。您可以用拖曳的方式將新的表情主題"
 "安裝到清單中。"
 
-#: src/gtkprefs.c:588
+#: src/gtkprefs.c:619
 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:626 src/gtkprefs.c:2028 src/protocols/jabber/buddy.c:265
+#: src/protocols/jabber/buddy.c:748 src/protocols/jabber/chat.c:684
 msgid "Description"
 msgstr "描述"
 
-#: src/gtkprefs.c:662
+#: src/gtkprefs.c:693
 msgid "Style"
 msgstr "風格"
 
-#: src/gtkprefs.c:663
+#: src/gtkprefs.c:694
 msgid "_Bold"
 msgstr "粗體(_B)"
 
-#: src/gtkprefs.c:665
-msgid "_Italics"
+#: src/gtkprefs.c:696
+msgid "_Italic"
 msgstr "斜體(_I)"
 
-#: src/gtkprefs.c:667
+#: src/gtkprefs.c:698
 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:708
 msgid "_Strikethrough"
 msgstr "刪除的文字(_S)"
 
-#: src/gtkprefs.c:672
+#: src/gtkprefs.c:711
 msgid "Face"
 msgstr "字體"
 
-#: src/gtkprefs.c:675
+#: src/gtkprefs.c:714
 msgid "Use custo_m face"
 msgstr "使用者自定字體(_M)"
 
-#: src/gtkprefs.c:692
+#: src/gtkprefs.c:731
 msgid "Use custom si_ze"
 msgstr "使用者自定字體大小(_Z)"
 
-#: src/gtkprefs.c:704
+#: src/gtkprefs.c:743
 msgid "Color"
 msgstr "顏色"
 
-#: src/gtkprefs.c:708
+#: src/gtkprefs.c:747
 msgid "_Text color"
 msgstr "文字顏色(_T)"
 
-#: src/gtkprefs.c:727
+#: src/gtkprefs.c:766
 msgid "Bac_kground color"
 msgstr "背景顏色(_K)"
 
-#: src/gtkprefs.c:755 src/gtkprefs.c:987 src/gtkprefs.c:1035
+#: src/gtkprefs.c:794 src/gtkprefs.c:1026 src/gtkprefs.c:1074
 msgid "Display"
 msgstr "顯示"
 
-#: src/gtkprefs.c:756
+#: src/gtkprefs.c:795
 msgid "Show graphical _smileys"
 msgstr "顯示表情(_S)"
 
-#: src/gtkprefs.c:758
+#: src/gtkprefs.c:797
 msgid "Show _timestamp on messages"
 msgstr "顯示訊息時間(_T)"
 
-#: src/gtkprefs.c:760
+#: src/gtkprefs.c:799
 msgid "Show _URLs as links"
 msgstr "顯示 URL 為超連結(_U)"
 
-#: src/gtkprefs.c:764
+#: src/gtkprefs.c:803
 msgid "_Highlight misspelled words"
 msgstr "標示出拼錯的字(_H)"
 
-#: src/gtkprefs.c:768
+#: src/gtkprefs.c:807
 msgid "Ignore c_olors"
 msgstr "忽略顏色(_O)"
 
-#: src/gtkprefs.c:770
+#: src/gtkprefs.c:809
 msgid "Ignore font _faces"
 msgstr "忽略字體(_F)"
 
-#: src/gtkprefs.c:772
+#: src/gtkprefs.c:811
 msgid "Ignore font si_zes"
 msgstr "忽略字體大小(_Z)"
 
-#: src/gtkprefs.c:785
+#: src/gtkprefs.c:824
 msgid "Send Message"
 msgstr "送出訊息"
 
-#: src/gtkprefs.c:786
+#: src/gtkprefs.c:825
 msgid "Enter _sends message"
 msgstr "按下 Enter 送出訊息(_S)"
 
-#: src/gtkprefs.c:788
+#: src/gtkprefs.c:827
 msgid "C_ontrol-Enter sends message"
 msgstr "按下 Ctrl-Enter 送出訊息(_O)"
 
-#: src/gtkprefs.c:791
+#: src/gtkprefs.c:830
 msgid "Window Closing"
 msgstr "視窗關閉"
 
-#: src/gtkprefs.c:792
+#: src/gtkprefs.c:831
 msgid "_Escape closes window"
 msgstr "按下 Escape 關閉視窗(_E)"
 
-#: src/gtkprefs.c:795
+#: src/gtkprefs.c:834
 msgid "Insertions"
 msgstr "插入選項"
 
-#: src/gtkprefs.c:796
+#: src/gtkprefs.c:835
 msgid "Control-{B/I/U} inserts _HTML tags"
 msgstr "按下 Ctrl-{B/I/U} 插入 HTML 標籤(_H)"
 
-#: src/gtkprefs.c:798
+#: src/gtkprefs.c:837
 msgid "Control-(number) _inserts smileys"
 msgstr "按下 Ctrl-(數字鍵) 插入表情(_I)"
 
-#: src/gtkprefs.c:814
+#: src/gtkprefs.c:853
 msgid "Buddy List Sorting"
 msgstr "好友清單排序"
 
-#: src/gtkprefs.c:823
-msgid "Sorting:"
-msgstr "自動排序方式:"
-
-#: src/gtkprefs.c:828
+#: src/gtkprefs.c:862
+msgid "_Sorting:"
+msgstr "排序方式(_S):"
+
+#: src/gtkprefs.c:867
 msgid "Buddy List Toolbar"
 msgstr "好友清單工具列"
 
-#: src/gtkprefs.c:829 src/gtkprefs.c:960 src/gtkprefs.c:1011
+#: src/gtkprefs.c:868 src/gtkprefs.c:999 src/gtkprefs.c:1050
 msgid "Show _buttons as:"
 msgstr "顯示按鍵為(_B):"
 
-#: src/gtkprefs.c:831 src/gtkprefs.c:962 src/gtkprefs.c:1013
+#: src/gtkprefs.c:870 src/gtkprefs.c:1001 src/gtkprefs.c:1052
 msgid "Pictures"
 msgstr "圖形"
 
-#: src/gtkprefs.c:832 src/gtkprefs.c:963 src/gtkprefs.c:1014
+#: src/gtkprefs.c:871 src/gtkprefs.c:1002 src/gtkprefs.c:1053
 msgid "Text"
 msgstr "文字"
 
-#: src/gtkprefs.c:833 src/gtkprefs.c:964 src/gtkprefs.c:1015
+#: src/gtkprefs.c:872 src/gtkprefs.c:1003 src/gtkprefs.c:1054
 msgid "Pictures and text"
 msgstr "圖形與文字"
 
-#: src/gtkprefs.c:838 src/gtkprefs.c:975 src/gtkprefs.c:1026
+#: src/gtkprefs.c:877 src/gtkprefs.c:1014 src/gtkprefs.c:1065
 msgid "_Raise window on events"
 msgstr "當事件發生時,將視窗提到最上方(_R)"
 
-#: src/gtkprefs.c:841
+#: src/gtkprefs.c:880
 msgid "Group Display"
 msgstr "群組顯示"
 
-#: src/gtkprefs.c:842
+#: src/gtkprefs.c:881
 msgid "Show _numbers in groups"
 msgstr "顯示群組裡的好友/聊天室數目(_N)"
 
-#: src/gtkprefs.c:845
+#: src/gtkprefs.c:884
 msgid "Buddy Display"
 msgstr "好友顯示"
 
-#: src/gtkprefs.c:846 src/gtkprefs.c:982
+#: src/gtkprefs.c:885 src/gtkprefs.c:1021
 msgid "Show buddy _icons"
 msgstr "顯示好友圖示(_I)"
 
-#: src/gtkprefs.c:848
+#: src/gtkprefs.c:887
 msgid "Show _warning levels"
 msgstr "顯示警告等級(_W)"
 
-#: src/gtkprefs.c:850
+#: src/gtkprefs.c:889
 msgid "Show idle _times"
 msgstr "顯示閒置時間(_T)"
 
-#: src/gtkprefs.c:852
+#: src/gtkprefs.c:891
 msgid "Dim i_dle buddies"
 msgstr "把閒置的好友設為灰色(_D)"
 
 # XXX 暫譯
-#: src/gtkprefs.c:854
+#: src/gtkprefs.c:893
 msgid "_Automatically expand contacts"
 msgstr "自動展開好友(_A)"
 
-#: src/gtkprefs.c:879
+#: src/gtkprefs.c:918
 msgid "_Placement:"
 msgstr "位置(_P):"
 
-#: src/gtkprefs.c:886
-msgid "Send _URLs as Links"
+#: src/gtkprefs.c:925
+msgid "Send _URLs as links"
 msgstr "送出 URL 為超連結(_U)"
 
-#: src/gtkprefs.c:889
-msgid "Show Formatting Toolbar"
-msgstr "顯示格式工具列"
-
-#: src/gtkprefs.c:892
+#: src/gtkprefs.c:928
+msgid "Show _formatting toolbar"
+msgstr "顯示格式工具列(_F)"
+
+#: src/gtkprefs.c:931
 msgid "Show a_liases in tabs/titles"
 msgstr "在標題和標籤上顯示別名(_L)"
 
-#: src/gtkprefs.c:895
+#: src/gtkprefs.c:934
 msgid "Tab Options"
 msgstr "標籤選項"
 
-#: src/gtkprefs.c:897
+#: src/gtkprefs.c:936
 msgid "_Tab Placement:"
 msgstr "標籤位置(_T):"
 
-#: src/gtkprefs.c:899
+#: src/gtkprefs.c:938
 msgid "Top"
 msgstr "視窗上方"
 
-#: src/gtkprefs.c:900
+#: src/gtkprefs.c:939
 msgid "Bottom"
 msgstr "視窗下方"
 
-#: src/gtkprefs.c:901
+#: src/gtkprefs.c:940
 msgid "Left"
 msgstr "視窗左側"
 
-#: src/gtkprefs.c:902
+#: src/gtkprefs.c:941
 msgid "Right"
 msgstr "視窗右側"
 
-#: src/gtkprefs.c:908
+#: src/gtkprefs.c:947
 msgid "Show IMs and chats in _tabbed windows"
 msgstr "使用標籤視窗顯示即時訊息和聊天(_T)"
 
-#: src/gtkprefs.c:911
+#: src/gtkprefs.c:950
 msgid "Show IMs and chats in _same tabbed window"
 msgstr "使用同一個標籤視窗顯示即時訊息和聊天(_S)"
 
-#: src/gtkprefs.c:921
+#: src/gtkprefs.c:960
 msgid "Show _close button on tabs"
 msgstr "在標籤上顯示關閉鍵(_C)"
 
-#: src/gtkprefs.c:932
+#: src/gtkprefs.c:971
 msgid "Show status _icons on tabs"
 msgstr "在標籤上顯示好友狀態(_I)"
 
-#: src/gtkprefs.c:959 src/gtkprefs.c:1010
+#: src/gtkprefs.c:998 src/gtkprefs.c:1049
 msgid "Window"
 msgstr "視窗"
 
-#: src/gtkprefs.c:969 src/gtkprefs.c:1020
+#: src/gtkprefs.c:1008 src/gtkprefs.c:1059
 msgid "New window _width:"
 msgstr "新視窗寬度(_W):"
 
-#: src/gtkprefs.c:971 src/gtkprefs.c:1022
+#: src/gtkprefs.c:1010 src/gtkprefs.c:1061
 msgid "New window _height:"
 msgstr "新視窗高度(_H):"
 
-#: src/gtkprefs.c:973 src/gtkprefs.c:1024
+#: src/gtkprefs.c:1012 src/gtkprefs.c:1063
 msgid "_Entry field height:"
 msgstr "輸入欄高度(_E):"
 
-#: src/gtkprefs.c:977
+#: src/gtkprefs.c:1016
 msgid "Hide window on _send"
 msgstr "送出訊息後關閉視窗(_S)"
 
-#: src/gtkprefs.c:981
+#: src/gtkprefs.c:1020
 msgid "Buddy Icons"
 msgstr "好友圖示"
 
-#: src/gtkprefs.c:984
+#: src/gtkprefs.c:1023
 msgid "Enable buddy icon a_nimation"
 msgstr "啟動好友圖示動畫(_N)"
 
-#: src/gtkprefs.c:988
+#: src/gtkprefs.c:1027
 msgid "Show _logins in window"
 msgstr "在視窗中顯示登入訊息(_L)"
 
-#: src/gtkprefs.c:991
+#: src/gtkprefs.c:1030
 msgid "Typing Notification"
 msgstr "輸入通知"
 
-#: src/gtkprefs.c:992
+#: src/gtkprefs.c:1031
 msgid "Notify buddies that you are _typing to them"
 msgstr "通知您的好友您正在發訊息給他們(_T)"
 
-#: src/gtkprefs.c:1029
+#: src/gtkprefs.c:1068
 msgid "Tab Completion"
 msgstr "Tab Completion"
 
-#: src/gtkprefs.c:1030
+#: src/gtkprefs.c:1069
 msgid "_Tab-complete nicks"
 msgstr "使用 Tab 鍵幫助輸入暱稱(_T)"
 
-#: src/gtkprefs.c:1032
+#: src/gtkprefs.c:1071
 msgid "_Old-style tab completion"
 msgstr "舊式 Tab Completion (_O)"
 
-#: src/gtkprefs.c:1036
+#: src/gtkprefs.c:1075
 msgid "_Show people joining in window"
 msgstr "在視窗中顯示其他人進入的事件(_S)"
 
-#: src/gtkprefs.c:1038
+#: src/gtkprefs.c:1077
 msgid "_Show people leaving in window"
 msgstr "在視窗中顯示其他人離開的事件(_S)"
 
-#: src/gtkprefs.c:1040
-msgid "Co_lorize screennames"
+#: src/gtkprefs.c:1079
+msgid "Co_lorize screen names"
 msgstr "將帳號以顏色區別(_L)"
 
-#: src/gtkprefs.c:1084
+#: src/gtkprefs.c:1100 src/protocols/oscar/oscar.c:587
+#: src/protocols/oscar/oscar.c:4215
+msgid "IP Address"
+msgstr "IP 位址"
+
+#: src/gtkprefs.c:1102
+msgid "_Autodetect IP Address"
+msgstr "自動偵測 IP 位址(_A)"
+
+#: src/gtkprefs.c:1111
+msgid "Public _IP:"
+msgstr ""
+
+#: src/gtkprefs.c:1135
+msgid "Ports"
+msgstr "通訊埠"
+
+#: src/gtkprefs.c:1138
+msgid "_Manually specify range of ports to listen on"
+msgstr "自定通訊埠監聽範圍(_M)"
+
+#: src/gtkprefs.c:1141
+msgid "_Start Port:"
+msgstr "啟始通訊埠(_S):"
+
+#: src/gtkprefs.c:1148
+msgid "_End Port:"
+msgstr "結束通訊埠(_E):"
+
+#: src/gtkprefs.c:1196
 msgid "Proxy Type"
 msgstr "代理伺服器型態"
 
 # NOTE 理由同前,不用「毋須」,改為「不使用」
-#: src/gtkprefs.c:1087
+#: src/gtkprefs.c:1199
 msgid "No proxy"
 msgstr "不使用代理伺服器"
 
-#: src/gtkprefs.c:1094
+#: src/gtkprefs.c:1206
 msgid "Proxy Server"
 msgstr "代理伺服器"
 
-#: src/gtkprefs.c:1150
+#: src/gtkprefs.c:1264
 msgid "_User:"
 msgstr "使用者(_U):"
 
-#: src/gtkprefs.c:1204
+#: src/gtkprefs.c:1320
 msgid "Opera"
 msgstr "Opera"
 
-#: src/gtkprefs.c:1205
+#: src/gtkprefs.c:1321
 msgid "Netscape"
 msgstr "Netscape"
 
-#: src/gtkprefs.c:1206
+#: src/gtkprefs.c:1322
 msgid "Mozilla"
 msgstr "Mozilla"
 
-#: src/gtkprefs.c:1207
+#: src/gtkprefs.c:1323
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: src/gtkprefs.c:1208
+#: src/gtkprefs.c:1324
 msgid "Galeon"
 msgstr "Galeon"
 
-#: src/gtkprefs.c:1209
+#: src/gtkprefs.c:1325
 msgid "Firebird"
 msgstr "Firebird"
 
-#: src/gtkprefs.c:1218
+#: src/gtkprefs.c:1326
+msgid "Firefox"
+msgstr "Firefox"
+
+#: src/gtkprefs.c:1327
+msgid "Gnome Default"
+msgstr "GNOME預設值"
+
+#: src/gtkprefs.c:1336
 msgid "Manual"
 msgstr "使用者自定"
 
-#: src/gtkprefs.c:1259
+#: src/gtkprefs.c:1387
 msgid "Browser Selection"
 msgstr "選擇瀏覽器"
 
-#: src/gtkprefs.c:1263
+#: src/gtkprefs.c:1391
 msgid "_Browser:"
 msgstr "瀏覽器(_B):"
 
-#: src/gtkprefs.c:1273
+#: src/gtkprefs.c:1398
+msgid "_Open link in:"
+msgstr "在瀏覽器中打開連結(_O):"
+
+#: src/gtkprefs.c:1400
+msgid "Browser default"
+msgstr "瀏覽器預設"
+
+#: src/gtkprefs.c:1401
+msgid "Existing window"
+msgstr "既有的視窗"
+
+#: src/gtkprefs.c:1403
+msgid "New tab"
+msgstr "新標籤"
+
+#: src/gtkprefs.c:1417
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -3581,63 +3874,83 @@
 "使用者自定(_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:1454
 msgid "Message Logs"
 msgstr "訊息日誌"
 
-#: src/gtkprefs.c:1314
+#: src/gtkprefs.c:1457
 msgid "Log _Format:"
 msgstr "日誌格式(_F):"
 
-#: src/gtkprefs.c:1317
+#: src/gtkprefs.c:1460
 msgid "_Log all instant messages"
 msgstr "記錄所有即時訊息(_L)"
 
-#: src/gtkprefs.c:1319
+#: src/gtkprefs.c:1462
 msgid "Log all c_hats"
 msgstr "記錄所有聊天內容(_H)"
 
-#: src/gtkprefs.c:1374
+#: src/gtkprefs.c:1465
+msgid "System Logs"
+msgstr "系統日誌"
+
+#: src/gtkprefs.c:1467
+msgid "_Enable system log"
+msgstr "使用系統日誌(_E)"
+
+#: src/gtkprefs.c:1470
+msgid "Log when buddies _sign on/sign off"
+msgstr "記錄好友的登入/登出(_S)"
+
+#: src/gtkprefs.c:1476
+msgid "Log when buddies become _idle/un-idle"
+msgstr "記錄好友的閒置/取消閒置(_I)"
+
+#: src/gtkprefs.c:1482
+msgid "Log when buddies go away/come _back"
+msgstr "記錄好友離開/回來(_B)"
+
+#: src/gtkprefs.c:1488
+msgid "Log your _own signons/idleness/awayness"
+msgstr "記錄您自已登入/閒置/離開等狀態(_O)"
+
+#: src/gtkprefs.c:1539
 msgid "Sound Options"
 msgstr "音效選項"
 
-#: src/gtkprefs.c:1375
-msgid "_No sounds when you log in"
-msgstr "登入期間不啟動音效(_N)"
-
-#: src/gtkprefs.c:1377
+#: src/gtkprefs.c:1540
+msgid "Sounds when you _log in"
+msgstr "登入時發出音效(_L)"
+
+#: src/gtkprefs.c:1542
+msgid "Sounds when conversation has _focus"
+msgstr "當交談取得輸入焦點發出音效(_F)"
+
+#: src/gtkprefs.c:1544
 msgid "_Sounds while away"
 msgstr "離開時仍發出音效(_S)"
 
-#: src/gtkprefs.c:1381
+#: src/gtkprefs.c:1548
 msgid "Sound Method"
 msgstr "音效播放方式"
 
-#: src/gtkprefs.c:1382
+#: src/gtkprefs.c:1549
 msgid "_Method:"
 msgstr "播放方式(_M):"
 
-#: src/gtkprefs.c:1384
+#: src/gtkprefs.c:1551
 msgid "Console beep"
 msgstr "嗶一聲"
 
-#: src/gtkprefs.c:1386
+#: src/gtkprefs.c:1553
 msgid "Automatic"
 msgstr "自動"
 
-#: src/gtkprefs.c:1393
+#: src/gtkprefs.c:1560
 msgid "Command"
 msgstr "指令"
 
-#: src/gtkprefs.c:1403
+#: src/gtkprefs.c:1570
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -3646,68 +3959,74 @@
 "音效指令(_C):\n"
 "(請以 %s 代表檔名)"
 
-#: src/gtkprefs.c:1458
+#: src/gtkprefs.c:1627
 msgid "_Sending messages removes away status"
 msgstr "送出訊息時取消離開狀態(_S)"
 
-#: src/gtkprefs.c:1460
+#: src/gtkprefs.c:1629
 msgid "_Queue new messages when away"
 msgstr "在離開時,將所有的新訊息置入佇列中(_Q)"
 
-#: src/gtkprefs.c:1463
+#: src/gtkprefs.c:1632
 msgid "Auto-response"
 msgstr "自動回應"
 
-#: src/gtkprefs.c:1466
+#: src/gtkprefs.c:1635
 msgid "Seconds before _resending:"
 msgstr "送出回覆前的等待秒數(_R):"
 
-#: src/gtkprefs.c:1469
+#: src/gtkprefs.c:1638
 msgid "_Send auto-response"
 msgstr "送出自動回應(_S)"
 
-#: src/gtkprefs.c:1471
+#: src/gtkprefs.c:1640
 msgid "_Only send auto-response when idle"
 msgstr "只在閒置的時候送出自動回應(_O)"
 
-#: src/gtkprefs.c:1473
+#: src/gtkprefs.c:1642
 msgid "Send auto-response in _active conversations"
 msgstr "目前進行的交談也要送出自動回應(_A)"
 
-#: src/gtkprefs.c:1483
+#: src/gtkprefs.c:1651 src/protocols/msn/state.c:30
+#: src/protocols/novell/novell.c:2150 src/protocols/oscar/oscar.c:3373
+#: src/protocols/yahoo/yahoo.c:2295
+msgid "Idle"
+msgstr "閒置"
+
+#: src/gtkprefs.c:1652
 msgid "Idle _time reporting:"
 msgstr "閒置時間報告(_T):"
 
-#: src/gtkprefs.c:1486
+#: src/gtkprefs.c:1655
 msgid "Gaim usage"
 msgstr "Gaim 使用狀況"
 
-#: src/gtkprefs.c:1489
+#: src/gtkprefs.c:1658
 msgid "X usage"
 msgstr "X Window 使用狀況"
 
-#: src/gtkprefs.c:1491
+#: src/gtkprefs.c:1660
 msgid "Windows usage"
 msgstr "Windows 使用狀況"
 
-#: src/gtkprefs.c:1499
+#: src/gtkprefs.c:1668
 msgid "Auto-away"
 msgstr "自動離開"
 
-#: src/gtkprefs.c:1500
+#: src/gtkprefs.c:1669
 msgid "Set away _when idle"
 msgstr "閒置時自動設為離開(_W)"
 
 # NOTE 譯文更動 by Ambrose
-#: src/gtkprefs.c:1503
+#: src/gtkprefs.c:1673
 msgid "_Minutes before setting away:"
 msgstr "閒置多少分鐘設為離開(_M):"
 
-#: src/gtkprefs.c:1509
+#: src/gtkprefs.c:1681
 msgid "Away m_essage:"
 msgstr "離開訊息(_M):"
 
-#: src/gtkprefs.c:1571
+#: src/gtkprefs.c:1756
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -3722,7 +4041,7 @@
 "<span weight=\"bold\">網站:</span>\t\t%s\n"
 "<span weight=\"bold\">檔名:</span>\t%s"
 
-#: src/gtkprefs.c:1576
+#: src/gtkprefs.c:1761
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -3737,178 +4056,189 @@
 "<span weight=\"bold\">網站:</span>  %s\n"
 "<span weight=\"bold\">檔名:</span>  %s"
 
-#: src/gtkprefs.c:1758
+#: src/gtkprefs.c:1984
 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:1998
+msgid "Summary"
+msgstr "簡述"
+
+#  NOTE「細節」很恰當,因為畫面上的都是瑣碎的細節,連基本資料都久奉
+#: src/gtkprefs.c:2046
 msgid "Details"
-msgstr "詳細資料"
-
-#: src/gtkprefs.c:1939
+msgstr "細節"
+
+#: src/gtkprefs.c:2173
 msgid "Sound Selection"
 msgstr "選取音效"
 
-#: src/gtkprefs.c:2046
+#: src/gtkprefs.c:2280
 msgid "Play"
 msgstr "播放"
 
-#: src/gtkprefs.c:2053
+#: src/gtkprefs.c:2287
 msgid "Event"
 msgstr "事件"
 
-#: src/gtkprefs.c:2076
+#: src/gtkprefs.c:2306
+msgid "Test"
+msgstr "測試"
+
+#: src/gtkprefs.c:2310
 msgid "Reset"
 msgstr "重置"
 
-#: src/gtkprefs.c:2080
+#: src/gtkprefs.c:2314
 msgid "Choose..."
 msgstr "選擇..."
 
-#: src/gtkprefs.c:2215
+#: src/gtkprefs.c:2449
 msgid "_Edit"
 msgstr "編輯(_E)"
 
-#: src/gtkprefs.c:2251
+#: src/gtkprefs.c:2485
 msgid "Interface"
 msgstr "介面"
 
-#: src/gtkprefs.c:2252
+#: src/gtkprefs.c:2486
 msgid "Smiley Themes"
 msgstr "表情主題"
 
-#: src/gtkprefs.c:2253
+#: src/gtkprefs.c:2487
 msgid "Fonts"
 msgstr "字型"
 
-#: src/gtkprefs.c:2254
+#: src/gtkprefs.c:2488
 msgid "Message Text"
 msgstr "訊息文字"
 
-#: src/gtkprefs.c:2255
+#: src/gtkprefs.c:2489
 msgid "Shortcuts"
 msgstr "快捷鍵"
 
-#: src/gtkprefs.c:2258
+#: src/gtkprefs.c:2492
 msgid "IMs"
 msgstr "即時訊息"
 
-#: src/gtkprefs.c:2260
+#: src/gtkprefs.c:2494
+msgid "Network"
+msgstr "網路"
+
+#: src/gtkprefs.c:2495
 msgid "Proxy"
 msgstr "代理伺服器"
 
 #. We use the registered default browser in windows
-#: src/gtkprefs.c:2263
+#: src/gtkprefs.c:2498
 msgid "Browser"
 msgstr "瀏覽器"
 
-#: src/gtkprefs.c:2265
+#: src/gtkprefs.c:2500
 msgid "Logging"
 msgstr "日誌"
 
-#: src/gtkprefs.c:2266
+#: src/gtkprefs.c:2501
 msgid "Sounds"
 msgstr "音效"
 
-#: src/gtkprefs.c:2267
+#: src/gtkprefs.c:2502
 msgid "Sound Events"
 msgstr "事件音效"
 
-#: src/gtkprefs.c:2268
+#: src/gtkprefs.c:2503
 msgid "Away / Idle"
 msgstr "離開 / 閒置"
 
-#: src/gtkprefs.c:2269
+#: src/gtkprefs.c:2504
 msgid "Away Messages"
 msgstr "離開訊息"
 
-#: src/gtkprefs.c:2272
+#: src/gtkprefs.c:2507
+msgid "Protocols"
+msgstr "通訊協定"
+
+#: src/gtkprefs.c:2508
 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"
-msgstr "拒絕以下的使用者"
-
-#: src/gtkprivacy.c:369
+#: src/gtkprivacy.c:81
+msgid "Block only the users below"
+msgstr "封鎖以下的使用者"
+
+#: src/gtkprivacy.c:374 src/protocols/jabber/jabber.c:1272
 msgid "Privacy"
 msgstr "隱私設定"
 
-#: src/gtkprivacy.c:384
+#: src/gtkprivacy.c:389
 msgid "Changes to privacy settings take effect immediately."
 msgstr "隱私設定將立刻生效。"
 
 #. "Set privacy for:" label
-#: src/gtkprivacy.c:396
+#: src/gtkprivacy.c:401
 msgid "Set privacy for:"
 msgstr "帳號:"
 
-#: src/gtkprivacy.c:563 src/gtkprivacy.c:579
+#: src/gtkprivacy.c:569 src/gtkprivacy.c:585
 msgid "Permit User"
 msgstr "許可使用者"
 
-#: src/gtkprivacy.c:564
+#: src/gtkprivacy.c:570
 msgid "Type a user you permit to contact you."
 msgstr "輸入您所許可聯絡您的使用者。"
 
-#: src/gtkprivacy.c:565
+#: src/gtkprivacy.c:571
 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:574 src/gtkprivacy.c:587
 msgid "Permit"
 msgstr "許可"
 
-#: src/gtkprivacy.c:573
+#: src/gtkprivacy.c:579
 #, c-format
 msgid "Allow %s to contact you?"
 msgstr "許可 %s 聯絡您?"
 
-#: src/gtkprivacy.c:575
+#: src/gtkprivacy.c:581
 #, 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:608 src/gtkprivacy.c:621
 msgid "Block User"
 msgstr "拒絕使用者"
 
-#: src/gtkprivacy.c:603
+#: src/gtkprivacy.c:609
 msgid "Type a user to block."
 msgstr "輸入被拒絕的使用者。"
 
-#: src/gtkprivacy.c:604
+#: src/gtkprivacy.c:610
 msgid "Please enter the name of the user you wish to block."
 msgstr "請輸入被您拒絕的使用者的名稱。"
 
-#: src/gtkprivacy.c:611
+#: src/gtkprivacy.c:617
 #, c-format
 msgid "Block %s?"
 msgstr "拒絕 %s?"
 
-#: src/gtkprivacy.c:613
+#: src/gtkprivacy.c:619
 #, c-format
 msgid "Are you sure you want to block %s?"
 msgstr "您確定要拒絕 %s?"
@@ -3916,143 +4246,177 @@
 #. *
 #. * 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:233 src/protocols/gg/gg.c:663
+#: src/protocols/novell/novell.c:1317 src/request.h:1231
 msgid "Yes"
 msgstr "是"
 
-#: src/gtkrequest.c:189 src/protocols/gg/gg.c:660 src/request.h:1009
+#: src/gtkrequest.c:234 src/protocols/gg/gg.c:663
+#: src/protocols/novell/novell.c:1318 src/request.h:1231
 msgid "No"
 msgstr "否"
 
-#: src/gtkrequest.c:192
+#: src/gtkrequest.c:237
 msgid "Apply"
 msgstr "套用"
 
-#: src/gtkrequest.c:193 src/protocols/msn/msn.c:247
+#: src/gtkrequest.c:238 src/protocols/msn/msn.c:261
 msgid "Close"
 msgstr "關閉"
 
-#: src/gtksound.c:61
+#: src/gtkroomlist.c:322
+msgid ""
+"You are not currently signed on with any protocols that have the ability to "
+"list rooms."
+msgstr "您並未登入任何一個可供您列出聊天室的通訊協定。"
+
+#: src/gtkroomlist.c:335
+msgid "Room List"
+msgstr "聊天室清單"
+
+#  list button
+#. list button
+#: src/gtkroomlist.c:410
+msgid "_Get List"
+msgstr "取得清單(_G)"
+
+#: 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:158
 #, c-format
 msgid "Unable to play sound because the chosen file (%s) does not exist."
 msgstr "無法播放音效,因為所選取的檔案 (%s) 不存在。"
 
-#: src/gtksound.c:172
+#: src/gtksound.c:174
 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:186
 #, 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:106
 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:476
 msgid "XML"
 msgstr "XML"
 
-#: src/log.c:488
-#, c-format
-msgid "<font color=\"#16569E\">(%s) <b>%s <AUTO-REPLY>:</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"
-msgstr "<font color=\"#A82F2F\">(%s) <b>%s <自動回應>:</b></font>%s<br/>\n"
+#: src/log.c:561
+#, 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\"><font size=\"2\">(%s)</font> <b>%s &lt;自動回應&gt;:"
+"</b></font> %s<br/>\n"
+
+#: src/log.c:563
+#, 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\"><font size=\"2\">(%s)</font> <b>%s &lt;自動回應&gt;:"
+"</b></font> %s<br/>\n"
 
 # XXX 暫譯
-#: src/log.c:534 src/log.c:669
+#: src/log.c:614 src/log.c:800
 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:624 src/log.c:812
 #, 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:661
 msgid "HTML"
 msgstr "HTML"
 
-#: src/log.c:622
+#: src/log.c:745
 #, c-format
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <自動回應>:%s\n"
 
-#: src/log.c:683
+#: src/log.c:845
 msgid "Plain text"
 msgstr "純文字"
 
-#: src/main.c:149
-msgid "Please enter your login."
-msgstr "請您登入。"
-
-#: src/main.c:232
-msgid "<New User>"
-msgstr "<新使用者>"
-
-#: src/main.c:274
+#: src/main.c:155
+msgid "Please create an account."
+msgstr "請建立一個帳號。"
+
+#: src/main.c:237
 msgid "Login"
 msgstr "登入"
 
+#: src/main.c:255
+msgid "<b>Screen Name:</b>"
+msgstr "<b>帳號:</b>"
+
+#: src/main.c:269
+msgid "<b>Password:</b>"
+msgstr "<b>密碼:</b>"
+
+#: src/main.c:298
+msgid "Sign on"
+msgstr "登入"
+
 #. full help text
-#: src/main.c:553
+#: src/main.c:522
 #, c-format
 msgid ""
 "Gaim %s\n"
@@ -4065,7 +4429,7 @@
 "                      account(s) to use, seperated by commas)\n"
 "  -n, --loginwin      don't automatically login; show login window\n"
 "  -u, --user=NAME     use account NAME\n"
-"  -f, --file=FILE     use FILE as config\n"
+"  -c, --config=DIR    use DIR for config files\n"
 "  -d, --debug         print debugging messages to stdout\n"
 "  -v, --version       display the current version and exit\n"
 "  -h, --help          display this help and exit\n"
@@ -4080,43 +4444,45 @@
 "                      號,同時以逗號作為分隔)\n"
 "  -n, --loginwin      不自動登入;顯示登入視窗\n"
 "  -u, --user=NAME     使用帳號 NAME\n"
-"  -f, --file=FILE     使用 FILE 為設定檔\n"
+"  -c, --config=DIR    使用 DIR 內的設定檔\n"
 "  -d, --debug         將除錯訊息輸出到標準輸出上\n"
 "  -v, --version       顯示版本訊息並離開\n"
 "  -h, --help          顯示這個說明訊息並離開\n"
 
 #. short message
-#: src/main.c:568
+#: src/main.c:537
 #, 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:273
 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:44
+#: src/protocols/msn/msn.c:360 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/novell/novell.c:2141
+#: src/protocols/novell/novell.c:2258 src/protocols/novell/novell.c:2309
+#: src/protocols/oscar/oscar.c:606 src/protocols/yahoo/yahoo.c:2599
+#: src/protocols/yahoo/yahoo.c:2714
 msgid "Available"
 msgstr "上線"
 
@@ -4128,11 +4494,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:956
+#: src/protocols/jabber/presence.c:126 src/protocols/oscar/oscar.c:524
+#: src/protocols/oscar/oscar.c:4733 src/protocols/oscar/oscar.c:4811
+#: src/protocols/oscar/oscar.c:4835 src/protocols/oscar/oscar.c:6426
+#: src/protocols/oscar/oscar.c:6431 src/protocols/yahoo/yahoo.c:2293
+#: src/protocols/yahoo/yahoo.c:2619 src/protocols/yahoo/yahoo.c:2724
 msgid "Invisible"
 msgstr "隱身"
 
@@ -4149,13 +4516,14 @@
 msgid "Unable to resolve hostname."
 msgstr "無法解析主機名稱。"
 
-#: src/protocols/gg/gg.c:139
+#: src/protocols/gg/gg.c:139 src/protocols/novell/novell.c:1159
 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:104
 msgid "Invalid response from server."
 msgstr "無效的伺服器回應。"
 
@@ -4189,159 +4557,159 @@
 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/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/gg/gg.c:402 src/protocols/icq/gaim_icq.c:344
+#: src/protocols/msn/dispatch.c:208 src/protocols/msn/msn.c:514
+#: src/protocols/msn/servconn.c:77 src/protocols/napster/napster.c:475
+#: src/protocols/napster/napster.c:506 src/protocols/toc/toc.c:200
+#: src/protocols/yahoo/yahoo.c:1958 src/protocols/yahoo/yahoo.c:1989
+#: src/protocols/yahoo/yahoo.c:2052 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:4207
 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:606
+#: src/protocols/oscar/oscar.c:4218 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:611
+#: src/protocols/oscar/oscar.c:4219 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:4208
 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
+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/trepia/trepia.c:331 src/protocols/trepia/trepia.c:430
+#: src/protocols/gg/gg.c:704 src/protocols/jabber/jabber.c:621
+#: src/protocols/oscar/oscar.c:4261 src/protocols/oscar/oscar.c:4269
+#: src/protocols/trepia/trepia.c:331 src/protocols/trepia/trepia.c:410
 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
+#: src/protocols/gg/gg.c:725 src/protocols/msn/msn.c:1331
+#: src/protocols/msn/msn.c:1575 src/protocols/napster/napster.c:393
+#: src/protocols/oscar/oscar.c:3185 src/protocols/oscar/oscar.c:3401
+#: src/protocols/toc/toc.c:498 src/protocols/yahoo/yahoo.c:2898
+#: src/protocols/yahoo/yahoo.c:2920 src/protocols/yahoo/yahoo.c:2943
+#: src/protocols/yahoo/yahoo.c:3101 src/protocols/zephyr/zephyr.c:567
 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 +4717,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 +4752,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 +4764,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:1055
 #: 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 +4807,7 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/gg/gg.c:1369 src/protocols/gg/gg.c:1371
+#: src/protocols/gg/gg.c:1373 src/protocols/gg/gg.c:1375
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr "Gadu-Gadu 協定模組"
 
@@ -4452,17 +4820,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:229
+#: src/protocols/msn/notification.c:588 src/protocols/msn/notification.c:909
+#: src/protocols/msn/notification.c:1076 src/protocols/oscar/oscar.c:2935
+#: src/protocols/oscar/oscar.c:5446
 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:230
+#: src/protocols/msn/notification.c:589 src/protocols/msn/notification.c:911
+#: src/protocols/msn/notification.c:1078 src/protocols/oscar/oscar.c:2937
+#: src/protocols/oscar/oscar.c:5447
 msgid "Deny"
 msgstr "拒絕"
 
@@ -4482,12 +4850,12 @@
 msgid "Gaim User"
 msgstr "Gaim 使用者"
 
-#: src/protocols/irc/cmds.c:41
+#: src/protocols/irc/cmds.c:43
 #, c-format
 msgid "Unknown command: %s"
 msgstr "未知的指令:%s"
 
-#: src/protocols/irc/cmds.c:135
+#: src/protocols/irc/cmds.c:137
 msgid ""
 "<B>Supported IRC Commands:</B><BR>AWAY INVITE JOIN KICK<BR>ME MODE MSG "
 "NAMES<BR>NICK OP DEOP OPERWALL<BR>PART PING QUERY QUIT<BR>QUOTE REMOVE TOPIC "
@@ -4497,7 +4865,7 @@
 "NAMES<BR>NICK OP DEOP OPERWALL<BR>PART PING QUERY QUIT<BR>QUOTE REMOVE TOPIC "
 "UMODE<BR>VOICE DEVOICE WALLOPS WHOIS<BR>"
 
-#: src/protocols/irc/cmds.c:144
+#: src/protocols/irc/cmds.c:146
 msgid ""
 "<B>Supported IRC Commands:</B><BR>AWAY JOIN ME MODE<BR>MSG NICK OPERWALL "
 "PING<BR>QUERY QUIT QUOTE UMODE<BR>WALLOPS WHOIS"
@@ -4505,67 +4873,91 @@
 "<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:469 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:472 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 "Gaim 無法開啟監聽埠。"
+
 # 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:440 src/protocols/oscar/oscar.c:6527
+#: src/protocols/yahoo/yahoo.c:2456
+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:193
 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:212 src/protocols/toc/toc.c:228
 #, c-format
 msgid "Signon: %s"
 msgstr "登入:%s"
 
-#: src/protocols/irc/irc.c:210
+#: src/protocols/irc/irc.c:221
 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:370 src/protocols/trepia/trepia.c:926
 msgid "Read error"
 msgstr "讀取錯誤"
 
+#: src/protocols/irc/irc.c:504 src/protocols/yahoo/yahoochat.c:1343
+msgid "Users"
+msgstr "使用者"
+
+#: src/protocols/irc/irc.c:507 src/protocols/yahoo/yahoochat.c:1352
+msgid "Topic"
+msgstr "主題"
+
 #. *< api_version
 #. *< type
 #. *< ui_requirement
@@ -4575,32 +4967,32 @@
 #. *< id
 #. *< name
 #. *< version
-#: src/protocols/irc/irc.c:533
+#: src/protocols/irc/irc.c:612
 msgid "IRC Protocol Plugin"
 msgstr "IRC 協定模組"
 
 #. *  summary
-#: src/protocols/irc/irc.c:534
+#: src/protocols/irc/irc.c:613
 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:630 src/protocols/irc/msgs.c:197
+#: src/protocols/jabber/jabber.c:1382 src/protocols/napster/napster.c:657
 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:633 src/protocols/jabber/jabber.c:1403
+#: src/protocols/msn/msn.c:1741 src/protocols/napster/napster.c:662
+#: src/protocols/trepia/trepia.c:1306
 msgid "Port"
 msgstr "通訊埠"
 
-#: src/protocols/irc/irc.c:557
+#: src/protocols/irc/irc.c:636 src/protocols/zephyr/zephyr.c:1400
 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:639 src/protocols/irc/msgs.c:191
+#: src/protocols/jabber/jabber.c:581
 msgid "Username"
 msgstr "使用者"
 
@@ -4628,7 +5020,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:3001
 msgid "Realname"
 msgstr "姓名"
 
@@ -4656,295 +5048,262 @@
 msgstr "%s 的好友資訊"
 
 # NOTE 新版的IRC prpl起動時不顯示這個;直譯「修改」沒有問題
-#: src/protocols/irc/msgs.c:247
+#: src/protocols/irc/msgs.c:278
 #, c-format
 msgid "%s has changed the topic to: %s"
 msgstr "%s 把聊天主題修改為:%s"
 
-#: src/protocols/irc/msgs.c:252
+#: src/protocols/irc/msgs.c:283
 #, c-format
 msgid "The topic for %s is: %s"
 msgstr "%s 的主題為:%s"
 
-#: src/protocols/irc/msgs.c:266
+#: src/protocols/irc/msgs.c:299
 #, c-format
 msgid "Unknown message '%s'"
 msgstr "不明的訊息「%s」"
 
-#: src/protocols/irc/msgs.c:267
+#: src/protocols/irc/msgs.c:300
 msgid "Unknown message"
 msgstr "不明的訊息"
 
-#: src/protocols/irc/msgs.c:267
+#: src/protocols/irc/msgs.c:300
 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:403
 msgid "No such channel"
 msgstr "沒有那個頻道"
 
 #. does this happen?
-#: src/protocols/irc/msgs.c:381
+#: src/protocols/irc/msgs.c:414
 msgid "no such channel"
 msgstr "沒有那個頻道"
 
-#: src/protocols/irc/msgs.c:384
+#: src/protocols/irc/msgs.c:417
 msgid "User is not logged in"
 msgstr "使用者沒有登入"
 
-#: src/protocols/irc/msgs.c:389
+#: src/protocols/irc/msgs.c:422
 msgid "No such nick or channel"
 msgstr "沒有那個暱稱或頻道"
 
-#: src/protocols/irc/msgs.c:409
+#: src/protocols/irc/msgs.c:442
 msgid "Could not send"
 msgstr "無法送出"
 
-#: src/protocols/irc/msgs.c:465
+#: src/protocols/irc/msgs.c:498
 #, c-format
 msgid "Joining %s requires an invitation."
 msgstr "只有被邀請者才可加入 %s。"
 
-#: src/protocols/irc/msgs.c:466
+#: src/protocols/irc/msgs.c:499
 msgid "Invitation only"
 msgstr "只限被邀請者"
 
-#: src/protocols/irc/msgs.c:562
+#: src/protocols/irc/msgs.c:595
 #, c-format
 msgid "You have been kicked by %s: (%s)"
 msgstr "您被 %s 踢出:(%s)"
 
-#: src/protocols/irc/msgs.c:570
+#: src/protocols/irc/msgs.c:600
 #, c-format
 msgid "Kicked by %s (%s)"
 msgstr "被 %s 踢出 (%s)"
 
-#: src/protocols/irc/msgs.c:591
+#: src/protocols/irc/msgs.c:621
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr "模式 (%s %s) 被 %s 設定"
 
-#: src/protocols/irc/msgs.c:670
+#: src/protocols/irc/msgs.c:700
 msgid "Could not change nick"
 msgstr "無法更改暱稱"
 
-#: src/protocols/irc/msgs.c:671
+#: src/protocols/irc/msgs.c:701
 msgid "Cannot change nick"
 msgstr "無法更改暱稱"
 
-#: src/protocols/irc/msgs.c:692
+#: src/protocols/irc/msgs.c:722
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr "您離開了頻道%s%s"
 
-#: src/protocols/irc/msgs.c:730
+#: src/protocols/irc/msgs.c:762
 msgid "Error: invalid PONG from server"
 msgstr "錯誤:來自伺服器的 PONG 無效"
 
-#: src/protocols/irc/msgs.c:732
+#: src/protocols/irc/msgs.c:764
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr "PING 回答──延遲:%lu秒"
 
-#: src/protocols/irc/msgs.c:802
+#: src/protocols/irc/msgs.c:839
 #, c-format
 msgid "Cannot join %s:"
 msgstr "無法加入 %s:"
 
-#: src/protocols/irc/msgs.c:803
+#: src/protocols/irc/msgs.c:840
 msgid "Cannot join channel"
 msgstr "無法加入頻道"
 
-#: src/protocols/irc/msgs.c:833
+#: src/protocols/irc/msgs.c:870
 #, c-format
 msgid "Wallops from %s"
 msgstr "來自 %s 的 Wallops"
 
-#: src/protocols/irc/parse.c:161
+#: src/protocols/irc/parse.c:165 src/protocols/zephyr/zephyr.c:199
 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:318
 #, c-format
 msgid "Reply time from %s: %lu seconds"
 msgstr "%s 回答需時:%lu 秒"
 
-#: src/protocols/irc/parse.c:293
+#: src/protocols/irc/parse.c:319
 msgid "PONG"
 msgstr "PONG"
 
-#: src/protocols/irc/parse.c:293
+#: src/protocols/irc/parse.c:319
 msgid "CTCP PING reply"
 msgstr "CTCP PING 回答"
 
-#: src/protocols/irc/parse.c:392 src/protocols/oscar/oscar.c:534
+#: src/protocols/irc/parse.c:421 src/protocols/oscar/oscar.c:780
 #: 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
+msgid "Plaintext Authentication"
+msgstr "純文字認證"
+
+#  TODO Untranslated
+#: 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:601 src/protocols/yahoo/yahoo.c:2997
 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:641
 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:631
 msgid "Postal Code"
 msgstr "郵遞區號"
 
 #. Country
-#: src/protocols/jabber/buddy.c:255 src/protocols/jabber/buddy.c:680
-#: src/protocols/trepia/trepia.c:339 src/protocols/trepia/trepia.c:448
+#: src/protocols/jabber/buddy.c:257 src/protocols/jabber/buddy.c:680
+#: src/protocols/trepia/trepia.c:339 src/protocols/trepia/trepia.c:416
 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:2993
 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:4242
 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
+#: src/protocols/msn/msn.c:348 src/protocols/oscar/oscar.c:568
+#: src/protocols/oscar/oscar.c:574 src/protocols/oscar/oscar.c:576
+#: src/protocols/yahoo/yahoo.c:2407
 msgid "Status"
 msgstr "狀態"
 
@@ -4953,7 +5312,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:1385
 msgid "Resource"
 msgstr ""
 
@@ -4964,8 +5323,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:616
+#: src/protocols/oscar/oscar.c:4260 src/protocols/oscar/oscar.c:4268
 msgid "Address"
 msgstr "地址"
 
@@ -4985,33 +5344,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 +5382,424 @@
 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:600 src/protocols/jabber/chat.c:611
+msgid "Roomlist Error"
+msgstr "聊天室清單錯誤"
+
+#: src/protocols/jabber/chat.c:601 src/protocols/jabber/chat.c:612
+msgid "Error retreiving roomlist"
+msgstr "讀取聊天室清單時發生錯誤"
+
+#: src/protocols/jabber/chat.c:652
+msgid "Invalid Server"
+msgstr "無效的伺服器名"
+
+# NOTE「會議室」是暫時的意譯。Yahoo! 好像沒有為「Conference」提供正式中譯名。
+# XXX
+#: src/protocols/jabber/chat.c:689
+msgid "Enter a Conference Server"
+msgstr "登入會議伺服器"
+
+#: src/protocols/jabber/chat.c:690
+msgid "Select a conference server to query"
+msgstr "選擇查詢的會議伺服器"
+
+#: src/protocols/jabber/chat.c:693
+msgid "Find Rooms"
+msgstr "尋找聊天室"
+
 # XXX 譯文有待改進
-#: src/protocols/jabber/jabber.c:72
+#: src/protocols/jabber/jabber.c:74
 msgid "Error initializing session"
 msgstr "對工作階段進行初始化時發生了錯誤"
 
-#: src/protocols/jabber/jabber.c:123
+#: src/protocols/jabber/jabber.c:204 src/protocols/msn/httpmethod.c:255
+#: src/protocols/msn/msn.c:84 src/protocols/msn/msn.c:104
+#: src/protocols/msn/msn.c:174 src/protocols/msn/msn.c:274
+#: src/protocols/msn/msn.c:571 src/protocols/msn/msn.c:743
+#: src/protocols/msn/msn.c:772 src/protocols/msn/msn.c:804
+#: src/protocols/msn/msn.c:812 src/protocols/msn/msn.c:845
+#: src/protocols/msn/msn.c:853 src/protocols/msn/msn.c:867
+#: src/protocols/msn/msn.c:876 src/protocols/msn/msn.c:891
+#: src/protocols/msn/msn.c:901 src/protocols/msn/msn.c:923
+#: src/protocols/msn/msn.c:973 src/protocols/msn/msn.c:1011
+#: src/protocols/msn/msn.c:1113 src/protocols/msn/msn.c:1146
+#: src/protocols/msn/msn.c:1167 src/protocols/msn/msn.c:1178
+#: src/protocols/msn/msn.c:1189 src/protocols/msn/msn.c:1213
+#: src/protocols/msn/msn.c:1225 src/protocols/msn/msn.c:1306
+#: src/protocols/msn/notification.c:147 src/protocols/msn/notification.c:175
+#: src/protocols/msn/notification.c:1299 src/protocols/msn/notification.c:1319
+#: src/protocols/msn/session.c:209 src/protocols/trepia/trepia.c:248
+#: src/protocols/trepia/trepia.c:698 src/protocols/trepia/trepia.c:987
+#: src/protocols/trepia/trepia.c:1031 src/protocols/trepia/trepia.c:1130
+#: src/protocols/trepia/trepia.c:1186
+msgid "Write error"
+msgstr "寫入錯誤"
+
+#: src/protocols/jabber/jabber.c:242 src/protocols/jabber/jabber.c:262
+msgid "Read Error"
+msgstr "讀取錯誤"
+
+# NOTE Jabber 協定 Stream Error 的一種,即 <remote-connection-failed/>
+# NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
+# XXX 真正的意思是「無法連線至認證所需的遠端資源」,不是「連線失敗」(見上列文章)
+#: src/protocols/jabber/jabber.c:317
+msgid "Connection Failed"
+msgstr "無法連線至認證所需的遠端資源"
+
+#: src/protocols/jabber/jabber.c:320
+msgid "SSL Handshake Failed"
+msgstr "SSL 交談失敗"
+
+#: src/protocols/jabber/jabber.c:363 src/protocols/jabber/jabber.c:692
+msgid "Invalid Jabber ID"
+msgstr "Jabber 帳號無效"
+
+# XXX 暫譯
+#: src/protocols/jabber/jabber.c:391 src/protocols/jabber/jabber.c:719
+msgid "SSL support unavailable"
+msgstr "沒有 SSL 支援"
+
+#: src/protocols/jabber/jabber.c:401 src/protocols/jabber/jabber.c:729
+#: src/protocols/trepia/trepia.c:1070
+msgid "Unable to create socket"
+msgstr "無法建立 Socket"
+
+#: src/protocols/jabber/jabber.c:426
+#, c-format
+msgid "Registration of %s@%s successful"
+msgstr "成功註冊 %s@%s"
+
+#: src/protocols/jabber/jabber.c:428 src/protocols/jabber/jabber.c:429
+msgid "Registration Successful"
+msgstr "註冊成功"
+
+#: src/protocols/jabber/jabber.c:435 src/protocols/jabber/jabber.c:1175
+msgid "Unknown Error"
+msgstr "未知錯誤"
+
+#: src/protocols/jabber/jabber.c:437 src/protocols/jabber/jabber.c:438
+msgid "Registration Failed"
+msgstr "註冊失敗"
+
+#: src/protocols/jabber/jabber.c:549 src/protocols/jabber/jabber.c:550
+msgid "Already Registered"
+msgstr "已經註冊"
+
+#: src/protocols/jabber/jabber.c:585 src/protocols/jabber/jabber.c:1026
+msgid "Password"
+msgstr "密碼"
+
+#: src/protocols/jabber/jabber.c:596
+msgid "E-Mail"
+msgstr "電子郵件"
+
+#. State
+#: src/protocols/jabber/jabber.c:626 src/protocols/oscar/oscar.c:4262
+#: src/protocols/oscar/oscar.c:4270 src/protocols/trepia/trepia.c:335
+#: src/protocols/trepia/trepia.c:413
+msgid "State"
+msgstr "省/州"
+
+#: src/protocols/jabber/jabber.c:636
+msgid "Phone"
+msgstr "電話"
+
+#: src/protocols/jabber/jabber.c:646
+msgid "Date"
+msgstr "日期"
+
+#: src/protocols/jabber/jabber.c:654
+msgid "Please fill out the information below to register your new account."
+msgstr "為您的新帳戶註冊,請填寫下列資料:"
+
+#: src/protocols/jabber/jabber.c:657 src/protocols/jabber/jabber.c:658
+msgid "Register New Jabber Account"
+msgstr "註冊新的 Jabber 帳戶"
+
+#. connect to the server
+#: src/protocols/jabber/jabber.c:775 src/protocols/msn/dispatch.c:212
+#: src/protocols/msn/msn.c:505 src/protocols/napster/napster.c:499
+#: src/protocols/novell/novell.c:1575 src/protocols/oscar/oscar.c:947
+#: src/protocols/trepia/trepia.c:1064 src/protocols/yahoo/yahoo.c:2177
+#: src/protocols/zephyr/zephyr.c:864
+msgid "Connecting"
+msgstr "連線中"
+
+#: src/protocols/jabber/jabber.c:779
+msgid "Initializing Stream"
+msgstr "串流初始中"
+
+#: src/protocols/jabber/jabber.c:785
+msgid "Authenticating"
+msgstr "認證中"
+
+#: src/protocols/jabber/jabber.c:794
+msgid "Re-initializing Stream"
+msgstr "串流重新初始中"
+
+#: src/protocols/jabber/jabber.c:874 src/protocols/jabber/jabber.c:1153
+#: src/protocols/jabber/jabber.c:1194 src/protocols/jabber/jabber.c:1227
+#: src/protocols/oscar/oscar.c:574 src/protocols/oscar/oscar.c:5811
+msgid "Not Authorized"
+msgstr "未認證"
+
+# NOTE 這些奇怪術語(至「Subscription」條)的解釋由 faceprint 提供
+# NOTE LSchiere2 的補充如下:
+# NOTE in jabber each user has control over both who is in his/her buddy list and who has him/her in that other person's buddy list
+# NOTE ie each "subscription" represents the fact that either you send status notifications to someone, or that you recieve them, or both
+# NOTE thus "from" means you only recieve status notification, "to" means you only send status notification and "both" is thus obviously that you both send and recieve status notification
+#: src/protocols/jabber/jabber.c:905
+msgid "Both"
+msgstr "已互相認證"
+
+#  NOTE Jabber 術語,見上
+#: src/protocols/jabber/jabber.c:907
+msgid "From (To pending)"
+msgstr "已認證對方(但仍等待對方認證您)"
+
+#  NOTE Jabber 術語,見上
+#: src/protocols/jabber/jabber.c:909
+msgid "From"
+msgstr "已認證對方"
+
+#  NOTE Jabber 術語,見上
+#: src/protocols/jabber/jabber.c:912
+msgid "To"
+msgstr "已獲對方認證"
+
+#  NOTE Jabber 術語,見上
+#: src/protocols/jabber/jabber.c:914
+msgid "None (To pending)"
+msgstr "無(但正等待對方認證您)"
+
+#  NOTE Jabber 術語,見上
+#: src/protocols/jabber/jabber.c:918
+msgid "Subscription"
+msgstr "認證狀態"
+
+#: src/protocols/jabber/jabber.c:938
+msgid "Error"
+msgstr "錯誤"
+
+#: src/protocols/jabber/jabber.c:951 src/protocols/jabber/jutil.c:35
+#: src/protocols/jabber/presence.c:66 src/protocols/jabber/presence.c:117
+msgid "Chatty"
+msgstr "想聊天"
+
+#: src/protocols/jabber/jabber.c:953 src/protocols/jabber/jutil.c:38
+#: src/protocols/jabber/presence.c:68 src/protocols/jabber/presence.c:122
+msgid "Extended Away"
+msgstr "長時間離開"
+
+#: src/protocols/jabber/jabber.c:954 src/protocols/jabber/jutil.c:41
+#: src/protocols/jabber/presence.c:70 src/protocols/jabber/presence.c:124
+#: src/protocols/oscar/oscar.c:514 src/protocols/oscar/oscar.c:4823
+#: src/protocols/oscar/oscar.c:6422
+msgid "Do Not Disturb"
+msgstr "請勿打擾"
+
+#: src/protocols/jabber/jabber.c:971
+msgid "Password Changed"
+msgstr "密碼修改成功"
+
+#: src/protocols/jabber/jabber.c:972
+msgid "Your password has been changed."
+msgstr "成功修改了您的密碼。"
+
+#: src/protocols/jabber/jabber.c:976 src/protocols/jabber/jabber.c:977
+msgid "Error changing password"
+msgstr "修改密碼期間出現錯誤"
+
+#: src/protocols/jabber/jabber.c:1031
+msgid "Password (again)"
+msgstr "舊密碼(再次確認)"
+
+#: src/protocols/jabber/jabber.c:1036 src/protocols/jabber/jabber.c:1037
+msgid "Change Jabber Password"
+msgstr "修改 Jabber 密碼"
+
+#: src/protocols/jabber/jabber.c:1037
+msgid "Please enter your new password"
+msgstr "請輸入您的新密碼"
+
+#: src/protocols/jabber/jabber.c:1048 src/protocols/toc/toc.c:1532
+msgid "Set User Info"
+msgstr "設定使用者資訊"
+
+# NOTE 見 http://www.jabber.org/jeps/jep-0103.html
+#: src/protocols/jabber/jabber.c:1133
+msgid "Bad Request"
+msgstr "傳送網址時發生了不明的錯誤"
+
+# TODO 要看Jabber標準
+#: src/protocols/jabber/jabber.c:1135
+msgid "Conflict"
+msgstr "衝突"
+
+#: src/protocols/jabber/jabber.c:1137
+msgid "Feature Not Implemented"
+msgstr "該功能尚未實作"
+
+# TODO 要看Jabber標準
+#: src/protocols/jabber/jabber.c:1139
+msgid "Forbidden"
+msgstr ""
+
+# TODO 要看Jabber標準
+#: src/protocols/jabber/jabber.c:1141
+msgid "Gone"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1143 src/protocols/jabber/jabber.c:1217
+msgid "Internal Server Error"
+msgstr "伺服器內部錯誤"
+
+#: src/protocols/jabber/jabber.c:1145
+msgid "Item Not Found"
+msgstr "項目未找到"
+
+#: src/protocols/jabber/jabber.c:1147
+msgid "Malformed Jabber ID"
+msgstr "畸型的 Jabber ID"
+
+#: src/protocols/jabber/jabber.c:1149
+msgid "Not Acceptable"
+msgstr "無法接受"
+
+#: src/protocols/jabber/jabber.c:1151
+msgid "Not Allowed"
+msgstr "不被允許"
+
+#: src/protocols/jabber/jabber.c:1155
+msgid "Payment Required"
+msgstr "必須付款"
+
+#: src/protocols/jabber/jabber.c:1157
+msgid "Recipient Unavailable"
+msgstr "接收者不存在"
+
+#: src/protocols/jabber/jabber.c:1161
+msgid "Registration Required"
+msgstr "必須註冊"
+
+#: src/protocols/jabber/jabber.c:1163
+msgid "Remote Server Not Found"
+msgstr "遠端伺服器未找到"
+
+#: src/protocols/jabber/jabber.c:1165
+msgid "Remote Server Timeout"
+msgstr "遠端伺服器逾時"
+
+#: src/protocols/jabber/jabber.c:1167
+msgid "Server Overloaded"
+msgstr "伺服器超載"
+
+#: src/protocols/jabber/jabber.c:1169
+msgid "Service Unavailable"
+msgstr "伺服器不存在"
+
+# TODO 要看Jabber標準
+# XXX 暫時假設「Subscription」一詞為Jabber術語,譯「認證」,需要核實
+#: src/protocols/jabber/jabber.c:1171
+msgid "Subscription Required"
+msgstr "必須認證"
+
+#: src/protocols/jabber/jabber.c:1173
+msgid "Unexpected Request"
+msgstr "未預期的要求"
+
+#: src/protocols/jabber/jabber.c:1180
+msgid "Authorization Aborted"
+msgstr "認證取消"
+
+#: src/protocols/jabber/jabber.c:1182
+msgid "Incorrect encoding in authorization"
+msgstr "認證含錯誤的編碼"
+
+#: src/protocols/jabber/jabber.c:1185
+msgid "Invalid authzid"
+msgstr "無效的 authzid"
+
+# XXX 要覆查譯文
+#: src/protocols/jabber/jabber.c:1188
+msgid "Invalid Authorization Mechanism"
+msgstr "無效的認證機制"
+
+#: src/protocols/jabber/jabber.c:1191
+msgid "Authorization mechanism too weak"
+msgstr "認證機制太薄弱了"
+
+#: src/protocols/jabber/jabber.c:1196
+msgid "Temporary Authentication Failure"
+msgstr "認證暫時失敗"
+
+#: src/protocols/jabber/jabber.c:1198
+msgid "Authentication Failure"
+msgstr "認證失敗"
+
+#: src/protocols/jabber/jabber.c:1202
 msgid "Bad Format"
 msgstr "無效的格式"
 
-#: src/protocols/jabber/jabber.c:125
+#: src/protocols/jabber/jabber.c:1204
 msgid "Bad Namespace Prefix"
 msgstr "無效的 Namespace Prefix"
 
@@ -5105,292 +5809,121 @@
 # 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:1207
 msgid "Resource Conflict"
 msgstr "已經以指定的 Resource 在其他地方登入"
 
-#: src/protocols/jabber/jabber.c:130
+#: src/protocols/jabber/jabber.c:1209
 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:1211
 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:1213
 msgid "Host Unknown"
 msgstr "不明的伺服器名稱"
 
-#: src/protocols/jabber/jabber.c:136
+#: src/protocols/jabber/jabber.c:1215
 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:1219
 msgid "Invalid ID"
 msgstr "帳號無效"
 
 # FIXME 必須覆查譯文
-#: src/protocols/jabber/jabber.c:142
+#: src/protocols/jabber/jabber.c:1221
 msgid "Invalid Namespace"
 msgstr "命名空間無效"
 
-#: src/protocols/jabber/jabber.c:144
+#: src/protocols/jabber/jabber.c:1223
 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:1225
 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:1229
 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:1231
 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:1233
 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:1235
 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:1237
 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:1239
 msgid "System Shutdown"
 msgstr "伺服器目前在關機中"
 
 # NOTE 見 http://www.jabber.org/jeps/jep-0103.html
-#: src/protocols/jabber/jabber.c:162
+#: src/protocols/jabber/jabber.c:1241
 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:1243
 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:1245
 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:1247
 msgid "Unsupported Version"
 msgstr "不支援給定的 XMPP 版本"
 
-#: src/protocols/jabber/jabber.c:170
+#: src/protocols/jabber/jabber.c:1249
 msgid "XML Not Well Formed"
 msgstr "XML 文件格式有問題"
 
-#: src/protocols/jabber/jabber.c:172
+#: src/protocols/jabber/jabber.c:1251
 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 "設定使用者資訊"
+#: src/protocols/jabber/jabber.c:1276
+msgid "Hide Operating System"
+msgstr "隱藏作業系統"
 
 #. *< api_version
 #. *< type
@@ -5402,109 +5935,120 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/jabber/jabber.c:1193 src/protocols/jabber/jabber.c:1195
+#: src/protocols/jabber/jabber.c:1361 src/protocols/jabber/jabber.c:1363
 msgid "Jabber Protocol Plugin"
 msgstr "Jabber 協定模組"
 
 # XXX 暫譯
-#: src/protocols/jabber/jabber.c:1219
+#: src/protocols/jabber/jabber.c:1388
 msgid "Use TLS if available"
 msgstr "TLS 可用則用"
 
-#: src/protocols/jabber/jabber.c:1224
+#: src/protocols/jabber/jabber.c:1393
 msgid "Force old SSL"
 msgstr "強迫使用舊式 SSL"
 
-#: src/protocols/jabber/jabber.c:1232
+#  TODO Untranslated
+#: src/protocols/jabber/jabber.c:1398
+msgid "Allow plaintext auth over unencrypted streams"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1407
 msgid "Connect server"
 msgstr "連結伺服器"
 
-#: src/protocols/jabber/message.c:125
+#: 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:225
 #, c-format
 msgid "Message delivery to %s failed: %s"
 msgstr "無法傳送訊息到 %s:%s"
 
-#: src/protocols/jabber/message.c:239
+#: src/protocols/jabber/message.c:228
 msgid "Jabber Message Error"
 msgstr "Jabber 訊息錯誤"
 
-#: src/protocols/jabber/parser.c:129
+#: src/protocols/jabber/message.c:291
+#, 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:221
 msgid "Unknown Error in presence"
 msgstr "在確定好友的連線狀態時,發生了未知的錯誤"
 
-#: src/protocols/jabber/presence.c:183
+#: src/protocols/jabber/presence.c:224
 #, 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:277 src/protocols/jabber/presence.c:278
 msgid "Create New Room"
 msgstr "建立新聊天室"
 
-#: src/protocols/jabber/presence.c:246
+#: src/protocols/jabber/presence.c:279
 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:281
 msgid "Configure Room"
 msgstr "設定聊天室"
 
-#: src/protocols/jabber/presence.c:250
+#: src/protocols/jabber/presence.c:283
 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:303
+#, c-format
+msgid "Error in chat %s"
+msgstr "聊天室 %s 發生錯誤"
+
+#: src/protocols/jabber/presence.c:306
+#, 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 "無法傳送檔案至 %s,因為對方不支援檔案傳輸"
+
+#: 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:240
 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:257
 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:266
 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:271
 msgid "Requesting to send password"
 msgstr "送出密碼中"
 
@@ -5512,15 +6056,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:410
 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:419
 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:1564
 msgid "Got invalid XFR"
 msgstr "取得無效的 XFR"
 
@@ -5532,259 +6076,279 @@
 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:528
+#: src/protocols/msn/notification.c:1826
 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:1833
 msgid "Syncing with server"
 msgstr "與伺服器同步中"
 
-#: src/protocols/msn/dispatch.c:250 src/protocols/msn/notification.c:2208
+#: src/protocols/msn/dispatch.c:250
 msgid "Error reading from server"
 msgstr "由伺服器讀取時發生錯誤"
 
+#: src/protocols/msn/error.c:33
+msgid "Unable to parse message"
+msgstr "無法解析訊息"
+
 # NOTE MSN 錯誤訊息要參閱 http://www.hypothetic.org/docs/msn2/reference/error_list.php
-#: src/protocols/msn/error.c:33
+#: src/protocols/msn/error.c:36
 msgid "Syntax Error (probably a Gaim bug)"
 msgstr "語法錯誤(可能是 Gaim 的 Bug)"
 
-# NOTE: cf "Syntax error" above for word order
-#: src/protocols/msn/error.c:37
-msgid "Invalid Parameter (probably a Gaim bug)"
-msgstr "參數無效(可能是 Gaim 的 Bug)"
-
 #: src/protocols/msn/error.c:40
-msgid "Invalid User"
-msgstr "使用者無效"
-
-#: src/protocols/msn/error.c:44
-msgid "Fully Qualified Domain Name missing"
-msgstr "沒給予完整領域名稱 (FQDN)"
+msgid "Invalid email address"
+msgstr "無效的電子郵件位址"
+
+#: src/protocols/msn/error.c:43
+msgid "User does not exist"
+msgstr "使用者不存在"
 
 #: src/protocols/msn/error.c:47
+msgid "Fully Qualified Domain Name missing"
+msgstr "沒給予完整領域名稱 (FQDN)"
+
+#: src/protocols/msn/error.c:50
 msgid "Already Logged In"
 msgstr "已經登入"
 
-#: src/protocols/msn/error.c:50
+#: src/protocols/msn/error.c:53
 msgid "Invalid Username"
 msgstr "使用者名稱無效"
 
-#: src/protocols/msn/error.c:53
+#: src/protocols/msn/error.c:56
 msgid "Invalid Friendly Name"
 msgstr "暱稱無效"
 
-#: src/protocols/msn/error.c:56
-msgid "List Full"
-msgstr "好友清單已滿"
-
 #: src/protocols/msn/error.c:59
-msgid "Already there"
-msgstr "已經在清單裡"
+msgid "List Full"
+msgstr "好友清單已滿"
 
 #: src/protocols/msn/error.c:62
+msgid "Already there"
+msgstr "已經在清單裡"
+
+#: src/protocols/msn/error.c:65
 msgid "Not on list"
 msgstr "不在清單中"
 
-#: src/protocols/msn/error.c:65
+#: src/protocols/msn/error.c:68 src/protocols/zephyr/zephyr.c:527
 msgid "User is offline"
 msgstr "使用者是離線的"
 
-#: src/protocols/msn/error.c:68
+#: src/protocols/msn/error.c:71
 msgid "Already in the mode"
 msgstr "已經在這個模式中"
 
-#: src/protocols/msn/error.c:71
+#: src/protocols/msn/error.c:74
 msgid "Already in opposite list"
 msgstr "已經在相對的清單中"
 
-#: src/protocols/msn/error.c:74
-msgid "Too many groups"
-msgstr "太多群組"
-
 #: src/protocols/msn/error.c:77
-msgid "Invalid group"
-msgstr "無效的群組"
+msgid "Too many groups"
+msgstr "太多群組"
 
 #: src/protocols/msn/error.c:80
+msgid "Invalid group"
+msgstr "無效的群組"
+
+#: src/protocols/msn/error.c:83
 msgid "User not in group"
 msgstr "使用者不在群組內"
 
-#: src/protocols/msn/error.c:83
-msgid "Group name too long"
-msgstr "群組名稱過長"
-
 #: src/protocols/msn/error.c:86
+msgid "Group name too long"
+msgstr "群組名稱過長"
+
+#: src/protocols/msn/error.c:89
 msgid "Cannot remove group zero"
 msgstr "無法移除「零」號群組"
 
-#: src/protocols/msn/error.c:90
+#: src/protocols/msn/error.c:93
 msgid "Tried to add a contact to a group that doesn't exist"
 msgstr "無法將好友加入一個不存在的群組"
 
-#: src/protocols/msn/error.c:94
+#: src/protocols/msn/error.c:97
 msgid "Switchboard failed"
 msgstr "Switchboard 失敗"
 
-#: src/protocols/msn/error.c:97
+#: src/protocols/msn/error.c:100
 msgid "Notify Transfer failed"
 msgstr "傳送通知失敗"
 
-#: src/protocols/msn/error.c:101
+#: src/protocols/msn/error.c:104
 msgid "Required fields missing"
 msgstr "找不到所需要的欄位"
 
-#: src/protocols/msn/error.c:104
+#: src/protocols/msn/error.c:107
 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:110 src/protocols/oscar/oscar.c:186
 msgid "Not logged in"
 msgstr "尚未登入"
 
-# XXX 參閱上列網站 (www.hypothetic.org) 第500號錯誤
-# NOTE 譯文更動 by Ambrose
-#: src/protocols/msn/error.c:111
-msgid "Internal server error"
-msgstr "伺服器內部錯誤"
-
+#  XXX 暫譯
 #: src/protocols/msn/error.c:114
+msgid "Service Temporarily Unavailable"
+msgstr "服務暫時不存在。"
+
+#: src/protocols/msn/error.c:117
 msgid "Database server error"
 msgstr "資料庫錯誤"
 
-#: src/protocols/msn/error.c:117
+#  XXX 暫譯
+#: src/protocols/msn/error.c:120
+msgid "Command disabled"
+msgstr "指令被停用"
+
+#: src/protocols/msn/error.c:123
 msgid "File operation error"
 msgstr "檔案操作錯誤"
 
-#: src/protocols/msn/error.c:120
+#: src/protocols/msn/error.c:126
 msgid "Memory allocation error"
 msgstr "記憶體分配錯誤"
 
-#: src/protocols/msn/error.c:123
+#: src/protocols/msn/error.c:129
 msgid "Wrong CHL value sent to server"
 msgstr "錯誤的 CHL 值傳送到了伺服器"
 
-#: src/protocols/msn/error.c:127
+#: src/protocols/msn/error.c:133
 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:136 src/protocols/msn/error.c:149
+#: src/protocols/msn/error.c:204
 msgid "Server unavailable"
 msgstr "伺服器目前不提供服務"
 
-#: src/protocols/msn/error.c:133
+#: src/protocols/msn/error.c:139
 msgid "Peer Notification server down"
 msgstr "點對點通知伺服器暫停服務"
 
-#: src/protocols/msn/error.c:136
+#: src/protocols/msn/error.c:142
 msgid "Database connect error"
 msgstr "資料庫連結錯誤"
 
-#: src/protocols/msn/error.c:140
+#: src/protocols/msn/error.c:146
 msgid "Server is going down (abandon ship)"
 msgstr "伺服器將暫停服務"
 
-#: src/protocols/msn/error.c:147
+#: src/protocols/msn/error.c:153
 msgid "Error creating connection"
 msgstr "連線開啟錯誤"
 
-#: src/protocols/msn/error.c:151
+#: src/protocols/msn/error.c:157
 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:160 src/protocols/msn/notification.c:304
 msgid "Unable to write"
 msgstr "無法寫入"
 
-#: src/protocols/msn/error.c:157
+#: src/protocols/msn/error.c:163
 msgid "Session overload"
 msgstr "工作階段超載"
 
-#: src/protocols/msn/error.c:160
+#: src/protocols/msn/error.c:166
 msgid "User is too active"
 msgstr "使用者太過活躍"
 
-#: src/protocols/msn/error.c:163
+#: src/protocols/msn/error.c:169
 msgid "Too many sessions"
 msgstr "太多工作階段"
 
+#: src/protocols/msn/error.c:172
+msgid "Passport not verified"
+msgstr "護照帳號尚未經過驗證"
+
+#: src/protocols/msn/error.c:175
+msgid "Bad friend file"
+msgstr "好友檔案無效"
+
 # NOTE 參閱上列網站 (www.hypothetic.org) 第715號錯誤
-#: src/protocols/msn/error.c:166 src/protocols/msn/error.c:172
+#: src/protocols/msn/error.c:178
 msgid "Not expected"
 msgstr "沒有預期的無效參數"
 
-#: src/protocols/msn/error.c:169
-msgid "Bad friend file"
-msgstr "好友檔案無效"
-
-#: src/protocols/msn/error.c:177
+#: src/protocols/msn/error.c:183
 msgid "Friendly name changes too rapidly"
 msgstr "暱稱的變更過於急速"
 
-#: src/protocols/msn/error.c:186
+#: src/protocols/msn/error.c:192
 msgid "Server too busy"
 msgstr "伺服器太忙碌"
 
-#: src/protocols/msn/error.c:190 src/protocols/oscar/oscar.c:1075
+#: src/protocols/msn/error.c:196 src/protocols/oscar/oscar.c:1360
 #: src/protocols/toc/toc.c:659
 msgid "Authentication failed"
 msgstr "認證失敗"
 
-#: src/protocols/msn/error.c:193
+#: src/protocols/msn/error.c:199
 msgid "Not allowed when offline"
 msgstr "在離線時不允許這個指令"
 
-#: src/protocols/msn/error.c:201
+#: src/protocols/msn/error.c:207
 msgid "Not accepting new users"
 msgstr "不接受新的使用者"
 
-#: src/protocols/msn/error.c:205
+#: src/protocols/msn/error.c:211
 msgid "Kids Passport without parental consent"
 msgstr "未經家長同意下使用兒童護照"
 
-#: src/protocols/msn/error.c:209
+#: src/protocols/msn/error.c:215
 msgid "Passport account not yet verified"
 msgstr "護照帳號尚未經過驗證"
 
-#: src/protocols/msn/error.c:213
+#: src/protocols/msn/error.c:218
+msgid "Bad ticket"
+msgstr ""
+
+#: src/protocols/msn/error.c:222
 #, c-format
 msgid "Unknown Error Code %d"
 msgstr "未知的錯誤代碼 %d"
 
-#: src/protocols/msn/msn.c:70
+#: src/protocols/msn/error.c:234
+#, c-format
+msgid "MSN Error: %s\n"
+msgstr "MSN 錯誤:%s\n"
+
+#: src/protocols/msn/msn.c:72
 msgid "Your new MSN friendly name is too long."
 msgstr "您的新 MSN 暱稱太長。"
 
-#: src/protocols/msn/msn.c:177
+#: src/protocols/msn/msn.c:191
 msgid "Set your friendly name."
 msgstr "設定您的暱稱。"
 
 # NOTE MSN的暱稱不像Yahoo;使用者可以輸入任何的新暱稱,
 # NOTE 即使和使用者的帳號毫無關係,似乎也是有效的
 # XXX 這看來是一個鈙述句,事實上是對使用者發出的請求/問題
-#: src/protocols/msn/msn.c:178
+#: src/protocols/msn/msn.c:192
 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:204
 msgid "Set your home phone number."
 msgstr "設定您的住家電話號碼。"
 
-#: src/protocols/msn/msn.c:201
+#: src/protocols/msn/msn.c:215
 msgid "Set your work phone number."
 msgstr "設定您的辦公室電話號碼。"
 
-#: src/protocols/msn/msn.c:212
+#: src/protocols/msn/msn.c:226
 msgid "Set your mobile phone number."
 msgstr "設定您的行動電話號碼。"
 
-#: src/protocols/msn/msn.c:221
+#: src/protocols/msn/msn.c:235
 msgid "Allow MSN Mobile pages?"
 msgstr "允許 MSN 傳呼?"
 
-#: src/protocols/msn/msn.c:222
+#: src/protocols/msn/msn.c:236
 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 +6356,93 @@
 "您是否允許在您好友清單中的好友傳送 Mobile Page 到您的行動電話,或是其他的行動"
 "裝置上呢?"
 
-#: src/protocols/msn/msn.c:226
+#: src/protocols/msn/msn.c:240
 msgid "Allow"
 msgstr "允許"
 
-#: src/protocols/msn/msn.c:227
+#: src/protocols/msn/msn.c:241
 msgid "Disallow"
 msgstr "不允許"
 
-#: src/protocols/msn/msn.c:244
+#: src/protocols/msn/msn.c:258
 msgid "Send a mobile message."
 msgstr "送出行動訊息。"
 
-#: src/protocols/msn/msn.c:246
+#: src/protocols/msn/msn.c:260
 msgid "Page"
 msgstr "傳呼"
 
-#: src/protocols/msn/msn.c:332 src/protocols/yahoo/yahoo.c:2301
-#, 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:361 src/protocols/msn/msn.c:662
 #: 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:362 src/protocols/msn/msn.c:664
+#: src/protocols/msn/state.c:31 src/protocols/yahoo/yahoo.c:2275
+#: src/protocols/yahoo/yahoo.c:2601 src/protocols/yahoo/yahoo.c:2715
 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:363 src/protocols/msn/msn.c:666
+#: src/protocols/msn/state.c:29 src/protocols/novell/novell.c:2147
+#: src/protocols/novell/novell.c:2260 src/protocols/novell/novell.c:2314
+#: src/protocols/yahoo/yahoo.c:2277 src/protocols/yahoo/yahoo.c:2603
+#: src/protocols/yahoo/yahoo.c:2716
 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:364 src/protocols/msn/msn.c:668
+#: src/protocols/msn/state.c:33 src/protocols/yahoo/yahoo.c:2285
+#: src/protocols/yahoo/yahoo.c:2611 src/protocols/yahoo/yahoo.c:2720
 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:365 src/protocols/msn/msn.c:670
+#: src/protocols/msn/state.c:34 src/protocols/yahoo/yahoo.c:2289
+#: src/protocols/yahoo/yahoo.c:2615 src/protocols/yahoo/yahoo.c:2722
 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:366 src/protocols/msn/msn.c:672
+#: src/protocols/zephyr/zephyr.c:1179 src/protocols/zephyr/zephyr.c:1194
 msgid "Hidden"
 msgstr "隱藏"
 
-#: src/protocols/msn/msn.c:362
+#: src/protocols/msn/msn.c:378
 msgid "Set Friendly Name"
 msgstr "設定暱稱"
 
-#: src/protocols/msn/msn.c:370
+#: src/protocols/msn/msn.c:386
 msgid "Set Home Phone Number"
 msgstr "設定住家電話號碼"
 
-#: src/protocols/msn/msn.c:376
+#: src/protocols/msn/msn.c:392
 msgid "Set Work Phone Number"
 msgstr "設定工作電話號碼"
 
-#: src/protocols/msn/msn.c:382
+#: src/protocols/msn/msn.c:398
 msgid "Set Mobile Phone Number"
 msgstr "設定行動電話號碼"
 
-#: src/protocols/msn/msn.c:391
+#: src/protocols/msn/msn.c:407
 msgid "Enable/Disable Mobile Devices"
 msgstr "開啟 / 關閉行動裝置"
 
-#: src/protocols/msn/msn.c:398
+#: src/protocols/msn/msn.c:414
 msgid "Allow/Disallow Mobile Pages"
 msgstr "允許 / 不允許 Mobile Page"
 
-#: src/protocols/msn/msn.c:424
+#: src/protocols/msn/msn.c:440
 msgid "Send to Mobile"
 msgstr "傳送至行動電話"
 
 # NOTE: 原譯文有誤
-#: src/protocols/msn/msn.c:433
+#: src/protocols/msn/msn.c:449
 msgid "Initiate Chat"
 msgstr "開啟聊天室"
 
 # XXX 暫譯
-#: src/protocols/msn/msn.c:457
+#: src/protocols/msn/msn.c:473
 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,99 +6450,109 @@
 "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:785
+#, 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:789 src/protocols/msn/msn.c:829
+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."
+# MSN6.0中文版對「Block」一詞的譯文為「封鎖」
+#: src/protocols/msn/msn.c:825
+#, 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:1332 src/protocols/yahoo/yahoo.c:2899
 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/trepia/trepia.c:285 src/protocols/trepia/trepia.c:413
-#: src/protocols/yahoo/yahoo.c:2896
+#: src/protocols/msn/msn.c:1402 src/protocols/oscar/oscar.c:4247
+#: src/protocols/trepia/trepia.c:285 src/protocols/trepia/trepia.c:404
+#: src/protocols/yahoo/yahoo.c:3009
 msgid "Age"
 msgstr "年齡"
 
 #. Gender
-#: src/protocols/msn/msn.c:1364 src/protocols/oscar/oscar.c:3987
-#: src/protocols/trepia/trepia.c:279 src/protocols/trepia/trepia.c:421
-#: src/protocols/yahoo/yahoo.c:2904
+#: src/protocols/msn/msn.c:1409 src/protocols/oscar/oscar.c:4234
+#: src/protocols/trepia/trepia.c:279 src/protocols/trepia/trepia.c:406
+#: src/protocols/yahoo/yahoo.c:3017
 msgid "Gender"
 msgstr "性別"
 
-#: src/protocols/msn/msn.c:1372 src/protocols/yahoo/yahoo.c:2900
+#: src/protocols/msn/msn.c:1417 src/protocols/yahoo/yahoo.c:3013
 msgid "Marital Status"
 msgstr "婚姻狀況"
 
-#: src/protocols/msn/msn.c:1379 src/protocols/yahoo/yahoo.c:2892
+#: src/protocols/msn/msn.c:1424 src/protocols/yahoo/yahoo.c:3005
 msgid "Location"
 msgstr "所在位置"
 
-#: src/protocols/msn/msn.c:1387 src/protocols/yahoo/yahoo.c:2908
+#: src/protocols/msn/msn.c:1432 src/protocols/yahoo/yahoo.c:3021
 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:1449 src/protocols/msn/msn.c:1455
+#: src/protocols/msn/msn.c:1462 src/protocols/msn/msn.c:1469
+#: src/protocols/msn/msn.c:1476
 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:1485 src/protocols/msn/msn.c:1498
+#: src/protocols/msn/msn.c:1505
 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:1514 src/protocols/msn/msn.c:1520
+#: src/protocols/msn/msn.c:1527
 msgid "Hobbies and Interests"
 msgstr "嗜好/興趣"
 
-#: src/protocols/msn/msn.c:1491 src/protocols/msn/msn.c:1497
-#: src/protocols/yahoo/yahoo.c:2943
+# NOTE 日文po檔及MSN本身均譯「座右銘」
+#: src/protocols/msn/msn.c:1536 src/protocols/msn/msn.c:1542
+#: src/protocols/yahoo/yahoo.c:3056
 msgid "Favorite Quote"
-msgstr "至愛名言"
-
-#: src/protocols/msn/msn.c:1505 src/protocols/yahoo/yahoo.c:2979
+msgstr "座右銘"
+
+#: src/protocols/msn/msn.c:1550 src/protocols/yahoo/yahoo.c:3092
 msgid "Last Updated"
 msgstr "更新日期"
 
 #. Homepage
-#: src/protocols/msn/msn.c:1516 src/protocols/trepia/trepia.c:289
-#: src/protocols/trepia/trepia.c:457
+#: src/protocols/msn/msn.c:1561 src/protocols/trepia/trepia.c:289
+#: src/protocols/trepia/trepia.c:419
 msgid "Homepage"
 msgstr "網頁"
 
 # NOTE 譯文更動 by Ambrose
-#: src/protocols/msn/msn.c:1538 src/protocols/yahoo/yahoo.c:2994
+#: src/protocols/msn/msn.c:1583 src/protocols/yahoo/yahoo.c:3107
 #, 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:1585 src/protocols/yahoo/yahoo.c:3109
 msgid "The user's profile is empty."
 msgstr "這個使用者的資訊是空白的。"
 
+#: src/protocols/msn/msn.c:1626
+msgid "Display conversation closed notices"
+msgstr "顯示「交談視窗已關閉」的通知"
+
+#: src/protocols/msn/msn.c:1631
+msgid "Display timeout notices"
+msgstr "顯示「交談已逾時」的通知"
+
 #. *< api_version
 #. *< type
 #. *< ui_requirement
@@ -5992,93 +6563,83 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/msn/msn.c:1637 src/protocols/msn/msn.c:1639
+#: src/protocols/msn/msn.c:1716 src/protocols/msn/msn.c:1718
 msgid "MSN Protocol Plugin"
 msgstr "MSN 協定模組"
 
-#: src/protocols/msn/msn.c:1656 src/protocols/trepia/trepia.c:1339
+#: src/protocols/msn/msn.c:1736 src/protocols/trepia/trepia.c:1301
 msgid "Login server"
 msgstr "登入伺服器"
 
-#: src/protocols/msn/msn.c:1666
+#: src/protocols/msn/msn.c:1745
 msgid "Use HTTP Method"
 msgstr "使用 HTTP 方式"
 
-#: src/protocols/msn/notification.c:247
-#, c-format
-msgid "MSN Error: %s\n"
-msgstr "MSN 錯誤:%s\n"
-
-#: src/protocols/msn/notification.c:322
+#: src/protocols/msn/nexus.c:56
 msgid "Unable to connect to server"
 msgstr "無法連線到伺服器"
 
-#: src/protocols/msn/notification.c:377 src/protocols/msn/notification.c:546
+#: 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/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
+#: src/protocols/msn/nexus.c:147
 msgid "MSN Nexus server returned invalid redirect information."
 msgstr "MSN Nexus 伺服器傳回無效的重新導向資訊。"
 
-#: src/protocols/msn/notification.c:460
+#: src/protocols/msn/nexus.c:204
 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:309 src/protocols/trepia/trepia.c:635
 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:334 src/protocols/msn/notification.c:366
+#: src/protocols/oscar/oscar.c:1649
 msgid "Password sent"
 msgstr "密碼送出"
 
-#: src/protocols/msn/notification.c:743
+#: src/protocols/msn/notification.c:361
 msgid "Unable to send password"
 msgstr "無法送出密碼"
 
-#: src/protocols/msn/notification.c:779
+#: src/protocols/msn/notification.c:397
 msgid "Protocol not supported"
 msgstr "不支援這個通訊協定"
 
-#: src/protocols/msn/notification.c:821
+#: src/protocols/msn/notification.c:440
 msgid "You have been disconnected. You have signed on from another location."
 msgstr "您被中斷連線,因為您由其他的地方登入。"
 
-#: src/protocols/msn/notification.c:826
+#: src/protocols/msn/notification.c:445
 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:584
 #, 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:903 src/protocols/msn/notification.c:1070
 #, 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:1362
+#, c-format
+msgid ""
+"Your MSN buddy list for %s is temporarily unavailable. Please wait and try "
+"again."
+msgstr "暫時無法取得 %s 的好友清單,請過一會後重試。"
+
+#: src/protocols/msn/notification.c:1607
 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:1776
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -6105,20 +6666,24 @@
 "\n"
 "當維護工作結束,您將可以再度登入。"
 
-#: src/protocols/msn/servconn.c:533
+#: src/protocols/msn/servconn.c:389
+msgid "IO Error."
+msgstr "IO 錯誤。"
+
+#: src/protocols/msn/servconn.c:527
 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:300
 msgid "An MSN message may not have been received."
 msgstr "有個 MSN 訊息可能沒被收到。"
 
@@ -6131,40 +6696,44 @@
 msgid "Unable to read message from server.  Command is %hd, length is %hd."
 msgstr "無法由伺服器讀取資訊。指令為 %hd,長度為 %hd。"
 
-#: src/protocols/napster/napster.c:303
+#: src/protocols/napster/napster.c:307
 #, c-format
 msgid "users: %s, files: %s, size: %sGB"
 msgstr "使用者:%s,檔案:%s,大小:%sGB"
 
 #. MSG_SERVER_HOTLIST_ERROR
-#: src/protocols/napster/napster.c:314
+#: src/protocols/napster/napster.c:318
 #, c-format
 msgid "Unable to add \"%s\" to your Napster hotlist"
 msgstr "無法將「%s」加入您的 Napster 熱門清單中"
 
-#: src/protocols/napster/napster.c:322
+#: src/protocols/napster/napster.c:326
 msgid "You were disconnected from the server."
 msgstr "您已經停止與伺服器的連線。"
 
 #. MSG_CLIENT_WHOIS
-#: src/protocols/napster/napster.c:378
+#: src/protocols/napster/napster.c:384
 #, c-format
 msgid "%s requested your information"
 msgstr "%s 查詢您的使用者資訊"
 
-#: src/protocols/napster/napster.c:410
+#: src/protocols/napster/napster.c:422
 msgid ""
 "You were disconnected from the server, because you logged on from a "
 "different location"
 msgstr "您被中斷連線,因為您由其他的地方登入。"
 
 #. MSG_CLIENT_PING
-#: src/protocols/napster/napster.c:416
+#: src/protocols/napster/napster.c:428
 #, c-format
 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:541
+msgid "Get Info"
+msgstr "取得資訊"
+
+#: src/protocols/napster/napster.c:555 src/protocols/oscar/oscar.c:5517
 #: src/protocols/toc/toc.c:1259
 msgid "_Group:"
 msgstr "群組(_G):"
@@ -6179,182 +6748,517 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/napster/napster.c:618 src/protocols/napster/napster.c:620
+#: src/protocols/napster/napster.c:639 src/protocols/napster/napster.c:641
 msgid "NAPSTER Protocol Plugin"
 msgstr "NAPSTER 協定模組"
 
+#: src/protocols/novell/novell.c:113
+#, c-format
+msgid "Login failed (0x%X)."
+msgstr "登入失敗 (0x%X)。"
+
+#  XXX 暫譯
+#: src/protocols/novell/novell.c:225
+#, c-format
+msgid "Unable to send message. Could not get details for user (0x%X)."
+msgstr "無法送出訊息。無法取得使用者的細節 (0x%X)。"
+
+#: src/protocols/novell/novell.c:371
+#, c-format
+msgid "Unable to add %s to your buddy list (0x%X)."
+msgstr "無法把 %s 加至您的好友清單 (0x%X)。"
+
+#. TODO: Improve this! message to who or for what conference?
+#: src/protocols/novell/novell.c:397
+#, c-format
+msgid "Unable to send message (0x%X)."
+msgstr "無法送出訊息 (0x%X)。"
+
+#: src/protocols/novell/novell.c:485
+#, c-format
+msgid "Unable to send message to %s. Could not create the conference (0x%X)."
+msgstr "無法送出訊息至 %s。無法建立會議 (0x%X)。"
+
+#: src/protocols/novell/novell.c:489
+#, c-format
+msgid "Unable to send message. Could not create the conference (0x%X)."
+msgstr "無法送出訊息。無法建立會議 (0x%X)。"
+
+#  TODO Untranslated
+#: src/protocols/novell/novell.c:536
+#, c-format
+msgid ""
+"Unable to move user %s to folder %s in the server side list. Error while "
+"creating folder (0x%X)."
+msgstr ""
+"無法在伺服器上的清單把使用者 %s 移至目錄 %s。建立目錄時發生錯誤 (0x%X)。"
+
+#: src/protocols/novell/novell.c:584
+#, c-format
+msgid ""
+"Unable to add %s to your buddy list. Error creating folder in server side "
+"list (0x%X)."
+msgstr "無法新增 %s 至好友清單。在伺服器上的清單建立目錄時發生錯誤 (0x%X)。"
+
+#  NOTE「GroupWise」是軟件名稱,正式中文名大概不會是「群組」...
+#: src/protocols/novell/novell.c:615 src/protocols/novell/novell.c:1344
+#, c-format
+msgid "GroupWise Conference %d"
+msgstr "GroupWise 會議 %d"
+
+#: src/protocols/novell/novell.c:659
+#, c-format
+msgid "Could not get details for user %s (0x%X)."
+msgstr "無法取得使用者 %s 的細節 (0x%X)。"
+
+#: src/protocols/novell/novell.c:773 src/protocols/novell/novell.c:1107
+msgid "Error communicating with server. Closing connection."
+msgstr "和伺服器間的通訊發生錯誤。關閉連線。"
+
+#: src/protocols/novell/novell.c:982
+msgid "Userid"
+msgstr "使用者 ID"
+
+#  tag = _("DN");
+#  value = nm_user_record_get_dn(user_record);
+#  if (value) {
+#  g_string_append_printf(info_text, "<b>%s:</b> %s<br/>\n
+#  tag, value);
+#  }
+#. tag = _("DN");
+#. value = nm_user_record_get_dn(user_record);
+#. if (value) {
+#. g_string_append_printf(info_text, "<b>%s:</b> %s<br/>\n",
+#. tag, value);
+#. }
+#.
+#: src/protocols/novell/novell.c:996
+msgid "Full name"
+msgstr "全名"
+
+#  NOTE「User Properties」係指「使用者資訊」,感謝KingAnt及LSchiere解釋
+#: src/protocols/novell/novell.c:1016
+msgid "User Properties"
+msgstr "使用者資訊"
+
+#: src/protocols/novell/novell.c:1084
+msgid "Unable to make SSL connection to server."
+msgstr "無法使用 SSL 協定連線到伺服器。"
+
+#: src/protocols/novell/novell.c:1113
+#, c-format
+msgid "Error processing event or response. (0x%X)"
+msgstr "處理事件或回覆時發生錯誤 (0x%X)。"
+
+#: src/protocols/novell/novell.c:1147
+msgid "Authenticating..."
+msgstr "認證中..."
+
+#: src/protocols/novell/novell.c:1162
+msgid "Waiting for response..."
+msgstr "等待回覆中..."
+
+#: src/protocols/novell/novell.c:1302
+msgid "Invitation to Conversation"
+msgstr "邀請加入交談"
+
+#  NOTE「Sent」係指發出邀請時的時間
+#: src/protocols/novell/novell.c:1303
+#, c-format
+msgid ""
+"Invitation from: %s\n"
+"\n"
+"Sent: %s"
+msgstr ""
+"邀請者:%s\n"
+"\n"
+"時間:%s"
+
+#: src/protocols/novell/novell.c:1305
+msgid "Would you like to join the conversation?"
+msgstr "您要加入個這交談嗎?"
+
+# XXX 暫譯
+#: src/protocols/novell/novell.c:1408
+msgid "You have been logged out because you logged in at another workstation."
+msgstr "您已經被登出,因為您已在其他電腦上登入。"
+
+#: src/protocols/novell/novell.c:1462
+#, c-format
+msgid ""
+"%s appears to be offline and did not receive the message that you just sent."
+msgstr "%s 目前似乎離線,所以不會收到您剛才送出的訊息。"
+
+#. TODO: Would be nice to prompt if not set!
+#. *  gaim_request_fields(gc, _("Server Address"),...);
+#.
+#. ...but for now just error out with a nice message.
+#: src/protocols/novell/novell.c:1560
+msgid ""
+"Unable to connect to server. Please enter the address of the server you wish "
+"to connect to."
+msgstr "無法連線至伺服器。請輸入您希望連線至的伺服器的位址。"
+
+#: src/protocols/novell/novell.c:1582
+msgid "Error. SSL support is not installed."
+msgstr "錯誤:沒有安裝 SSL 支援。"
+
+#: src/protocols/novell/novell.c:1846
+msgid "This conference has been closed. No more messages can be sent."
+msgstr "這個會議已經關閉。無法繼續送出任何訊息。"
+
+#: src/protocols/novell/novell.c:2153 src/protocols/oscar/oscar.c:576
+#: src/protocols/oscar/oscar.c:5813 src/protocols/yahoo/yahoo.c:2297
+msgid "Offline"
+msgstr "離線"
+
+#: src/protocols/novell/novell.c:2161
+#, c-format
+msgid ""
+"\n"
+"<b>Status:</b> %s\n"
+"<b>Message:</b> %s"
+msgstr ""
+"\n"
+"<b>狀態:</b>%s\n"
+"<b>訊息:</b>%s"
+
+#: src/protocols/novell/novell.c:2165
+#, c-format
+msgid ""
+"\n"
+"<b>Status:</b> %s"
+msgstr ""
+"\n"
+"<b>狀態:</b>%s"
+
+#  NOTE 這是「似乎是離線」。其他協定的「離線」狀態也不一定真的是離線,我想只譯「離線」也不太離譜
+#: src/protocols/novell/novell.c:2261 src/protocols/novell/novell.c:2317
+msgid "Appear Offline"
+msgstr "離線"
+
+#. *< api_version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#: src/protocols/novell/novell.c:2405 src/protocols/novell/novell.c:2407
+msgid "Novell GroupWise Messenger Protocol Plugin"
+msgstr "Novell GroupWise Messenger 協定模組"
+
+#: src/protocols/novell/novell.c:2424
+msgid "Server address"
+msgstr "伺服器位址"
+
+#: src/protocols/novell/novell.c:2428
+msgid "Server port"
+msgstr "伺服器通訊埠"
+
 # NOTE OSCAR 錯誤訊息應可參閱 http://aimdoc.sourceforge.net/OSCARdoc/,但在該站很難找東西
-#: src/protocols/oscar/oscar.c:178
+#: src/protocols/oscar/oscar.c:182
 msgid "Invalid error"
 msgstr "無效錯誤"
 
-#: src/protocols/oscar/oscar.c:179
+#: src/protocols/oscar/oscar.c:183
 msgid "Invalid SNAC"
 msgstr "無效的 SNAC"
 
-#: src/protocols/oscar/oscar.c:180
-msgid "Rate to host"
-msgstr "到伺服器速率"
-
-#: src/protocols/oscar/oscar.c:181
-msgid "Rate to client"
-msgstr "到客戶端速率"
-
-#: src/protocols/oscar/oscar.c:183
-msgid "Service unavailable"
-msgstr "伺服器不存在"
-
 #: src/protocols/oscar/oscar.c:184
+msgid "Rate to host"
+msgstr "到伺服器速率"
+
+#: src/protocols/oscar/oscar.c:185
+msgid "Rate to client"
+msgstr "到客戶端速率"
+
+#: src/protocols/oscar/oscar.c:187
+msgid "Service unavailable"
+msgstr "伺服器不存在"
+
+#: src/protocols/oscar/oscar.c:188
 msgid "Service not defined"
 msgstr "沒有指定服務"
 
-#: src/protocols/oscar/oscar.c:185
+#: src/protocols/oscar/oscar.c:189
 msgid "Obsolete SNAC"
 msgstr "過時的 SNAC"
 
-#: src/protocols/oscar/oscar.c:186
+#: src/protocols/oscar/oscar.c:190
 msgid "Not supported by host"
 msgstr "伺服器不支援"
 
-#: src/protocols/oscar/oscar.c:187
+#: src/protocols/oscar/oscar.c:191
 msgid "Not supported by client"
 msgstr "客戶端不支援"
 
-#: src/protocols/oscar/oscar.c:188
+#: src/protocols/oscar/oscar.c:192
 msgid "Refused by client"
 msgstr "被客戶端拒絕"
 
-#: src/protocols/oscar/oscar.c:189
+#: src/protocols/oscar/oscar.c:193
 msgid "Reply too big"
 msgstr "回覆太大了"
 
-#: src/protocols/oscar/oscar.c:190
+#: src/protocols/oscar/oscar.c:194
 msgid "Responses lost"
 msgstr "遺失回應"
 
-#: src/protocols/oscar/oscar.c:191
+#: src/protocols/oscar/oscar.c:195
 msgid "Request denied"
 msgstr "要求被拒"
 
 # NOTE「Busted」與「SNAC payload」的說名由Luke Schierer在#gaim提供
 # NOTE 整句的意思其實係「您一次過傳送太多資訊了」
-#: src/protocols/oscar/oscar.c:192
+#: src/protocols/oscar/oscar.c:196
 msgid "Busted SNAC payload"
 msgstr "SNAC負載過大"
 
-#: src/protocols/oscar/oscar.c:193
+#: src/protocols/oscar/oscar.c:197
 msgid "Insufficient rights"
 msgstr "權限不夠"
 
 # NOTE Debian 譯「local」為「本地端」(Windows 舊譯「本地」,新譯「本機」)
-#: src/protocols/oscar/oscar.c:194
+#: src/protocols/oscar/oscar.c:198
 msgid "In local permit/deny"
 msgstr "本地端的允許/拒絕清單"
 
-#: src/protocols/oscar/oscar.c:195
+#: src/protocols/oscar/oscar.c:199
 msgid "Too evil (sender)"
 msgstr "太邪惡了(寄件人)"
 
-#: src/protocols/oscar/oscar.c:196
+#: src/protocols/oscar/oscar.c:200
 msgid "Too evil (receiver)"
 msgstr "太邪惡了(收件人)"
 
-#: src/protocols/oscar/oscar.c:197
+#: src/protocols/oscar/oscar.c:201
 msgid "User temporarily unavailable"
 msgstr "使用者暫時不在"
 
-#: src/protocols/oscar/oscar.c:198
+#: src/protocols/oscar/oscar.c:202
 msgid "No match"
 msgstr "沒有相符合的"
 
-#: src/protocols/oscar/oscar.c:199
+#: src/protocols/oscar/oscar.c:203
 msgid "List overflow"
 msgstr "清單溢出"
 
-#: src/protocols/oscar/oscar.c:200
+#: src/protocols/oscar/oscar.c:204
 msgid "Request ambiguous"
 msgstr "要求不明確"
 
-#: src/protocols/oscar/oscar.c:201
+#: src/protocols/oscar/oscar.c:205
 msgid "Queue full"
 msgstr "佇列滿了"
 
-#: src/protocols/oscar/oscar.c:202
+#: src/protocols/oscar/oscar.c:206
 msgid "Not while on AOL"
 msgstr "在 AOL 時不允許"
 
+#: src/protocols/oscar/oscar.c:428
+msgid "Voice"
+msgstr "聲音"
+
+# NOTE 將「直接消息」改譯為「即時訊息」
+#: src/protocols/oscar/oscar.c:431
+msgid "AIM Direct IM"
+msgstr "AIM 式即時訊息"
+
+#: src/protocols/oscar/oscar.c:434
+msgid "Chat"
+msgstr "聊天"
+
+#: src/protocols/oscar/oscar.c:437 src/protocols/oscar/oscar.c:6535
+msgid "Get File"
+msgstr "接收檔案"
+
+#: src/protocols/oscar/oscar.c:444
+msgid "Games"
+msgstr "遊戲"
+
+#: src/protocols/oscar/oscar.c:447
+msgid "Add-Ins"
+msgstr "模組"
+
+#: src/protocols/oscar/oscar.c:450
+msgid "Send Buddy List"
+msgstr "送出好友清單"
+
+#: src/protocols/oscar/oscar.c:453
+msgid "ICQ Direct Connect"
+msgstr "ICQ 式直接連線"
+
+#: src/protocols/oscar/oscar.c:456
+msgid "AP User"
+msgstr "應用程式使用者"
+
+#: src/protocols/oscar/oscar.c:459
+msgid "ICQ RTF"
+msgstr "ICQ RTF"
+
+# NOTE「Nihilist」是什麼呢?連開發者都不知道
+# NOTE (18:06:07) KingAnt: "nihilist" is actually the capability of all 0s--not no capabilities
+# NOTE (18:07:23) KingAnt: Yeah, what he said
+# NOTE (18:17:08) wing: capability of all 0s?
+# 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:462
+msgid "Nihilist"
+msgstr "Nihilist"
+
+#: src/protocols/oscar/oscar.c:465
+msgid "ICQ Server Relay"
+msgstr "ICQ 伺服器轉送"
+
+#: src/protocols/oscar/oscar.c:468
+msgid "Old ICQ UTF8"
+msgstr "舊式 ICQ UTF8"
+
+#: src/protocols/oscar/oscar.c:471
+msgid "Trillian Encryption"
+msgstr "Trillian 加密"
+
 #: src/protocols/oscar/oscar.c:474
+msgid "ICQ UTF8"
+msgstr "ICQ UTF8"
+
+# NOTE 這似乎是一種掌上電腦的牌子
+#: src/protocols/oscar/oscar.c:477
+msgid "Hiptop"
+msgstr "Hiptop"
+
+#: src/protocols/oscar/oscar.c:480
+msgid "Security Enabled"
+msgstr "有保安功能"
+
+# XXX 暫譯
+#: src/protocols/oscar/oscar.c:483
+msgid "Video Chat"
+msgstr "視像聊天"
+
+# XXX 暫譯
+#: src/protocols/oscar/oscar.c:487
+msgid "iChat AV"
+msgstr "iChat 視像聊天"
+
+#: src/protocols/oscar/oscar.c:490
+msgid "Live Video"
+msgstr ""
+
+#  NOTE AIM_CAPS_CAMERA,即是什麼呢(^^;)
+#: src/protocols/oscar/oscar.c:493
+msgid "Camera"
+msgstr "照相機"
+
+#: src/protocols/oscar/oscar.c:512 src/protocols/oscar/oscar.c:4832
+#: src/protocols/oscar/oscar.c:6425
+msgid "Free For Chat"
+msgstr "我有空聊天"
+
+#: src/protocols/oscar/oscar.c:516 src/protocols/oscar/oscar.c:4826
+#: src/protocols/oscar/oscar.c:6423
+msgid "Not Available"
+msgstr "長時間離開"
+
+#: src/protocols/oscar/oscar.c:518 src/protocols/oscar/oscar.c:4829
+#: src/protocols/oscar/oscar.c:6424
+msgid "Occupied"
+msgstr "忙碌"
+
+# NOTE 參閱 http://www.geocities.com/Athens/Delphi/6470/icq99.html
+#: src/protocols/oscar/oscar.c:522
+msgid "Web Aware"
+msgstr "允許其他使用者在網路上查看您目前的狀態"
+
+#: src/protocols/oscar/oscar.c:593
+msgid "Capabilities"
+msgstr "相容性"
+
+#: src/protocols/oscar/oscar.c:599
+msgid "Buddy Comment"
+msgstr "好友說明"
+
+#: src/protocols/oscar/oscar.c:719
 #, c-format
 msgid "Direct IM with %s closed"
 msgstr "和 %s 的即時訊息關閉"
 
-#: src/protocols/oscar/oscar.c:476
+#: src/protocols/oscar/oscar.c:721
 #, 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:792 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:808
 msgid "Chat is currently unavailable"
 msgstr "目前無法使用聊天室"
 
-#: src/protocols/oscar/oscar.c:633 src/protocols/oscar/oscar.c:689
+#: src/protocols/oscar/oscar.c:879 src/protocols/oscar/oscar.c:943
 msgid "Couldn't connect to host"
 msgstr "無法連到伺服器"
 
-#: src/protocols/oscar/oscar.c:643
+#: src/protocols/oscar/oscar.c:889
 msgid "Screen name sent"
 msgstr "送出帳號"
 
-#: src/protocols/oscar/oscar.c:677
+#: src/protocols/oscar/oscar.c:903
+#, 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 ""
+"無法登入:無法以 %s 身份登入,因為這個帳號是無效的。帳號必須以英文字母起始,"
+"並只含英文字母、數字及空白;或者只由數字組成。"
+
+#: src/protocols/oscar/oscar.c:931
 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:1035 src/protocols/oscar/oscar.c:1453
 msgid "Could Not Connect"
 msgstr "無法連線"
 
-#: src/protocols/oscar/oscar.c:786
+#: src/protocols/oscar/oscar.c:1043
 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:1156 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:1161
+msgid "Unable to create new connection."
+msgstr "無法開啟新連結。"
+
+#: src/protocols/oscar/oscar.c:1232
 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:1337 src/protocols/toc/toc.c:571
 msgid "Incorrect nickname or password."
 msgstr "錯誤的暱稱或密碼"
 
-#: src/protocols/oscar/oscar.c:1057
+#: src/protocols/oscar/oscar.c:1342
 msgid "Your account is currently suspended."
 msgstr "您的帳號目前停用中。"
 
 #. service temporarily unavailable
-#: src/protocols/oscar/oscar.c:1061
+#: src/protocols/oscar/oscar.c:1346
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "AOL 即時訊息服務暫時不存在。"
 
-#: src/protocols/oscar/oscar.c:1066
+#: src/protocols/oscar/oscar.c:1351
 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 +7266,21 @@
 "您的連線/斷線動作太過頻繁。請等待十分鐘後再行重試。如果您依然繼續嘗試著連"
 "線,那麼您的等待時間將會更加的延長。"
 
-#: src/protocols/oscar/oscar.c:1071
+#: src/protocols/oscar/oscar.c:1356
 #, 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:1388
 msgid "Internal Error"
 msgstr "內部錯誤"
 
-#: src/protocols/oscar/oscar.c:1173
+#: src/protocols/oscar/oscar.c:1460
 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:1496 src/protocols/oscar/oscar.c:1526
+#: src/protocols/oscar/oscar.c:1614
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
@@ -6385,29 +7289,29 @@
 "您可能會短時間中斷連線。您可能會想在這個問題被修正後使用 TOC。請到 %s 看看有"
 "沒有更新。"
 
-#: src/protocols/oscar/oscar.c:1211 src/protocols/oscar/oscar.c:1241
+#: src/protocols/oscar/oscar.c:1499 src/protocols/oscar/oscar.c:1529
 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:1617
 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:2199 src/protocols/oscar/oscar.c:5917
 #, 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:2533 src/protocols/oscar/oscar.c:2555
 msgid "(There was an error receiving this message)"
 msgstr "(收取這個訊息時發生錯誤)"
 
-#: src/protocols/oscar/oscar.c:2408
+#: src/protocols/oscar/oscar.c:2716
 #, 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:2719
 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 +7320,46 @@
 "這個要求將會在兩部電腦間建立起直接連線,而這是在傳送即時訊息影像時所必須的。"
 "這樣將會曝露您的 IP 位址,因此可能會有隱私方面的風險。"
 
-#: src/protocols/oscar/oscar.c:2416 src/protocols/oscar/oscar.c:6023
+#: src/protocols/oscar/oscar.c:2724 src/protocols/oscar/oscar.c:6299
 msgid "Connect"
 msgstr "連線"
 
-#: src/protocols/oscar/oscar.c:2443
+#: src/protocols/oscar/oscar.c:2753
 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:2761
 msgid "Authorization Request Message:"
 msgstr "認證要求訊息:"
 
-#: src/protocols/oscar/oscar.c:2452
+#: src/protocols/oscar/oscar.c:2762
 msgid "Please authorize me!"
 msgstr "請通過我的認證!"
 
-#: src/protocols/oscar/oscar.c:2480
+#: src/protocols/oscar/oscar.c:2791
 #, 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:2796 src/protocols/oscar/oscar.c:2798
 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:2834 src/protocols/oscar/oscar.c:2836
+#: src/protocols/oscar/oscar.c:2843 src/protocols/oscar/oscar.c:2925
+#: src/protocols/oscar/oscar.c:2945 src/protocols/oscar/oscar.c:3281
+#: src/protocols/oscar/oscar.c:3341 src/protocols/oscar/oscar.c:5438
+#: src/protocols/oscar/oscar.c:5484
 msgid "No reason given."
 msgstr "沒有給予原因。"
 
-#: src/protocols/oscar/oscar.c:2531
+#: src/protocols/oscar/oscar.c:2842
 msgid "Authorization Denied Message:"
 msgstr "拒絕認證訊息:"
 
-#: src/protocols/oscar/oscar.c:2608
+#: src/protocols/oscar/oscar.c:2925
 #, c-format
 msgid ""
 "The user %u wants to add you to their buddy list for the following reason:\n"
@@ -6464,11 +7368,11 @@
 "使用者 %u 因為下列原因,想要將您加入他(她)的好友清單中:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2616 src/protocols/oscar/oscar.c:5140
+#: src/protocols/oscar/oscar.c:2933 src/protocols/oscar/oscar.c:5444
 msgid "Authorization Request"
 msgstr "認證要求"
 
-#: src/protocols/oscar/oscar.c:2628
+#: src/protocols/oscar/oscar.c:2945
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -6478,17 +7382,17 @@
 "使用者 %u 因為下列原因,拒絕了您將其加入好友清單的要求:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2629
+#: src/protocols/oscar/oscar.c:2946
 msgid "ICQ authorization denied."
 msgstr "ICQ 認證拒絕。"
 
 #. Someone has granted you authorization
-#: src/protocols/oscar/oscar.c:2636
+#: src/protocols/oscar/oscar.c:2953
 #, 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:2961
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -6501,7 +7405,7 @@
 "來自:%s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2652
+#: src/protocols/oscar/oscar.c:2969
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -6514,7 +7418,7 @@
 "來自:%s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2660
+#: src/protocols/oscar/oscar.c:2977
 #, c-format
 msgid ""
 "You have received an ICQ email from %s [%s]\n"
@@ -6527,34 +7431,34 @@
 "訊息為:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2681
+#: src/protocols/oscar/oscar.c:2998
 #, 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:3004
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr "您想將他(她)加入到您的好友名單中嗎?"
 
-#: src/protocols/oscar/oscar.c:2691
+#: src/protocols/oscar/oscar.c:3008
 msgid "Decline"
 msgstr "婉拒"
 
-#: src/protocols/oscar/oscar.c:2773
+#: src/protocols/oscar/oscar.c:3090
 #, 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
+msgstr[1] "您遺失了 %hu 個由 %s 送來的訊息,因為它們是無效的。"
+
+#: src/protocols/oscar/oscar.c:3099
 #, 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:3108
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -6564,196 +7468,83 @@
 msgstr[1] "您遺失了 %hu 個由 %s 送來的訊息,因為它們傳送的速度太快。"
 
 # XXX 跟芬蘭文的譯者有同感,直譯「邪惡」好像行不通,下同
-#: src/protocols/oscar/oscar.c:2800
+#: src/protocols/oscar/oscar.c:3117
 #, 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
+msgstr[0] "您遺失了 %hu 個由 %s 送來的訊息,因為他(她)太邪惡了。"
+msgstr[1] "您遺失了 %hu 個由 %s 送來的訊息,因為他(她)太邪惡了。"
+
+#: src/protocols/oscar/oscar.c:3126
 #, 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:3135
 #, 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
-msgid "Free For Chat"
-msgstr "我有空聊天"
-
-#: src/protocols/oscar/oscar.c:2838 src/protocols/oscar/oscar.c:4602
-#: src/protocols/oscar/oscar.c:6148
-msgid "Not Available"
-msgstr "長時間離開"
-
-#: src/protocols/oscar/oscar.c:2840 src/protocols/oscar/oscar.c:4605
-#: src/protocols/oscar/oscar.c:6149
-msgid "Occupied"
-msgstr "忙碌"
-
-# NOTE 參閱 http://www.geocities.com/Athens/Delphi/6470/icq99.html
-#: src/protocols/oscar/oscar.c:2844
-msgid "Web Aware"
-msgstr "允許其他使用者在網路上查看您目前的狀態"
-
-#: src/protocols/oscar/oscar.c:2887
+msgstr[0] "您遺失了 %hu 個由 %s 送來的訊息,原因不明。"
+msgstr[1] "您遺失了 %hu 個由 %s 送來的訊息,原因不明。"
+
+#: src/protocols/oscar/oscar.c:3184
 #, 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:3243
 #, c-format
 msgid "SNAC threw error: %s\n"
 msgstr "SNAC 丟出錯誤:%s\n"
 
+#: src/protocols/oscar/oscar.c:3244
+msgid "Unknown error"
+msgstr "未知錯誤"
+
 #. Data is assumed to be the destination sn
-#: src/protocols/oscar/oscar.c:2982
+#: src/protocols/oscar/oscar.c:3279
 #, 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:3338
 #, c-format
 msgid "User information for %s unavailable:"
 msgstr "無法取得使用者 %s 的個人資訊:"
 
-#: src/protocols/oscar/oscar.c:3080
-msgid "Voice"
-msgstr "聲音"
-
-# NOTE 將「直接消息」改譯為「即時訊息」
-#: src/protocols/oscar/oscar.c:3083
-msgid "AIM Direct IM"
-msgstr "AIM 式即時訊息"
-
-#: src/protocols/oscar/oscar.c:3089 src/protocols/oscar/oscar.c:6249
-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
-msgid "Games"
-msgstr "遊戲"
-
-#: src/protocols/oscar/oscar.c:3099
-msgid "Add-Ins"
-msgstr "模組"
-
-#: src/protocols/oscar/oscar.c:3102
-msgid "Send Buddy List"
-msgstr "送出好友清單"
-
-#: src/protocols/oscar/oscar.c:3105
-msgid "ICQ Direct Connect"
-msgstr "ICQ 式直接連線"
-
-#: src/protocols/oscar/oscar.c:3108
-msgid "AP User"
-msgstr "應用程式使用者"
-
-#: src/protocols/oscar/oscar.c:3111
-msgid "ICQ RTF"
-msgstr "ICQ RTF"
-
-# NOTE「Nihilist」是什麼呢?連開發者都不知道
-# NOTE (18:06:07) KingAnt: "nihilist" is actually the capability of all 0s--not no capabilities
-# NOTE (18:07:23) KingAnt: Yeah, what he said
-# NOTE (18:17:08) wing: capability of all 0s?
-# 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
-msgid "Nihilist"
-msgstr "Nihilist"
-
-#: src/protocols/oscar/oscar.c:3117
-msgid "ICQ Server Relay"
-msgstr "ICQ 伺服器轉送"
-
-#: src/protocols/oscar/oscar.c:3120
-msgid "Old ICQ UTF8"
-msgstr "舊式 ICQ UTF8"
-
-#: src/protocols/oscar/oscar.c:3123
-msgid "Trillian Encryption"
-msgstr "Trillian 加密"
-
-#: src/protocols/oscar/oscar.c:3126
-msgid "ICQ UTF8"
-msgstr "ICQ UTF8"
-
-# NOTE 這似乎是一種掌上電腦的牌子
-#: src/protocols/oscar/oscar.c:3129
-msgid "Hiptop"
-msgstr "Hiptop"
-
-#: src/protocols/oscar/oscar.c:3132
-msgid "Security Enabled"
-msgstr "有保安功能"
-
-# XXX 暫譯
-#: src/protocols/oscar/oscar.c:3135
-msgid "Video Chat"
-msgstr "視像聊天"
-
-# XXX 暫譯
-#: src/protocols/oscar/oscar.c:3138
-msgid "iChat AV"
-msgstr "iChat 視像聊天"
-
-#: src/protocols/oscar/oscar.c:3167
-#, c-format
-msgid "Username: <b>%s</b><br>\n"
-msgstr "使用者名稱:<b>%s</b><br>\n"
-
-#: src/protocols/oscar/oscar.c:3168
-#, c-format
-msgid "Warning Level: <b>%d%%</b><br>\n"
-msgstr "警告等級:<b>%d%%</b><br>\n"
-
-#: src/protocols/oscar/oscar.c:3171
-#, c-format
-msgid "Online Since: <b>%s</b><br>\n"
-msgstr "上線時間:<b>%s</b><br>\n"
+#: src/protocols/oscar/oscar.c:3361
+msgid "Warning Level"
+msgstr "警告等級"
+
+#: src/protocols/oscar/oscar.c:3364
+msgid "Online Since"
+msgstr "上線自"
 
 # XXX 改譯「註冊日期」會否比較通順?
-#: src/protocols/oscar/oscar.c:3175
-#, c-format
-msgid "Member Since: <b>%s</b><br>\n"
-msgstr "成為成員的時間:<b>%s</b><br>\n"
-
-#: src/protocols/oscar/oscar.c:3180
-#, c-format
-msgid "Idle: <b>%s</b>"
-msgstr "閒置:<b>%s</b>"
-
-#: src/protocols/oscar/oscar.c:3183
-msgid "Idle: <b>Active</b>"
-msgstr "閒置:<b>沒閒置</b>"
-
-#: src/protocols/oscar/oscar.c:3222
+#: src/protocols/oscar/oscar.c:3368 src/protocols/yahoo/yahoo.c:3088
+msgid "Member Since"
+msgstr "成為成員的時間"
+
+#: src/protocols/oscar/oscar.c:3450
 msgid "Your AIM connection may be lost."
 msgstr "您的 AIM 可能斷線了。"
 
-#: src/protocols/oscar/oscar.c:3616
+#  The conversion failed!
+#. The conversion failed!
+#: src/protocols/oscar/oscar.c:3636
+msgid ""
+"[Unable to display a message from this user because it contained invalid "
+"characters.]"
+msgstr "「無法顯示來自這個使用者的訊息,因為它包含了無效字元。」"
+
+#: src/protocols/oscar/oscar.c:3854
 msgid "Rate limiting error."
 msgstr "速率限制錯誤。"
 
-#: src/protocols/oscar/oscar.c:3617
+#: src/protocols/oscar/oscar.c:3855
 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 +7552,138 @@
 "您最近做的一個動作無法完成,因為您已經達到發送訊息速率的上限。請等待十秒後再"
 "試一次。"
 
-#: src/protocols/oscar/oscar.c:3680
+#: src/protocols/oscar/oscar.c:3918
 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:3920
 msgid "You have been signed off for an unknown reason."
 msgstr "您因為不明原因而登出。"
 
-#: src/protocols/oscar/oscar.c:3713
+#: src/protocols/oscar/oscar.c:3951
 msgid "Finalizing connection"
 msgstr "完成連線"
 
-#: src/protocols/oscar/oscar.c:3973 src/protocols/oscar/oscar.c:3979
+#: src/protocols/oscar/oscar.c:4221 src/protocols/oscar/oscar.c:4228
 msgid "Email Address"
 msgstr "電子郵件"
 
-#: src/protocols/oscar/oscar.c:3984
+#: src/protocols/oscar/oscar.c:4233
 msgid "Mobile Phone"
 msgstr "行動電話"
 
-#: src/protocols/oscar/oscar.c:3987 src/protocols/trepia/trepia.c:281
-#: src/protocols/trepia/trepia.c:422
+#: src/protocols/oscar/oscar.c:4234 src/protocols/trepia/trepia.c:281
+#: src/protocols/trepia/trepia.c:407
 msgid "Female"
 msgstr "女"
 
-#: src/protocols/oscar/oscar.c:3987 src/protocols/trepia/trepia.c:280
-#: src/protocols/trepia/trepia.c:422
+#: src/protocols/oscar/oscar.c:4234 src/protocols/trepia/trepia.c:280
+#: src/protocols/trepia/trepia.c:407
 msgid "Male"
 msgstr "男"
 
-#: src/protocols/oscar/oscar.c:4004
+#: src/protocols/oscar/oscar.c:4250
 msgid "Personal Web Page"
 msgstr "個人網頁"
 
-#: src/protocols/oscar/oscar.c:4007
+#: src/protocols/oscar/oscar.c:4254
 msgid "Additional Information"
 msgstr "其他資訊"
 
-#: src/protocols/oscar/oscar.c:4011
+#: src/protocols/oscar/oscar.c:4259
 msgid "Home Address"
 msgstr "住家地址"
 
-#: src/protocols/oscar/oscar.c:4022 src/protocols/oscar/oscar.c:4038
+#: src/protocols/oscar/oscar.c:4263 src/protocols/oscar/oscar.c:4271
 msgid "Zip Code"
 msgstr "郵遞區號"
 
-#: src/protocols/oscar/oscar.c:4027
+#: src/protocols/oscar/oscar.c:4267
 msgid "Work Address"
 msgstr "工作地址"
 
-#: src/protocols/oscar/oscar.c:4043
+#: src/protocols/oscar/oscar.c:4275
 msgid "Work Information"
 msgstr "工作資訊"
 
-#: src/protocols/oscar/oscar.c:4045
+#: src/protocols/oscar/oscar.c:4276
 msgid "Company"
 msgstr "公司名稱"
 
-#: src/protocols/oscar/oscar.c:4048
+#: src/protocols/oscar/oscar.c:4277
 msgid "Division"
 msgstr "部門"
 
-#: src/protocols/oscar/oscar.c:4051
+#: src/protocols/oscar/oscar.c:4278
 msgid "Position"
 msgstr "職位"
 
-#: src/protocols/oscar/oscar.c:4054
+#: src/protocols/oscar/oscar.c:4280
 msgid "Web Page"
 msgstr "網頁"
 
-#: src/protocols/oscar/oscar.c:4060
+#: src/protocols/oscar/oscar.c:4286
 #, c-format
 msgid "ICQ Info for %s"
 msgstr "%s 的 ICQ 資訊"
 
 # XXX 這是什麼 (情形下出現的)? (好像是以前譯「訊息」的那個??)
-#: src/protocols/oscar/oscar.c:4110
+#: src/protocols/oscar/oscar.c:4336
 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:4357
+#, c-format
+msgid "The following screen names are associated with %s"
 msgstr "下列是 %s 的帳號"
 
-#: src/protocols/oscar/oscar.c:4135
+#: src/protocols/oscar/oscar.c:4361
 msgid "Search Results"
 msgstr "搜尋結果"
 
-#: src/protocols/oscar/oscar.c:4152
+#: src/protocols/oscar/oscar.c:4378
 #, c-format
 msgid "No results found for email address %s"
 msgstr "找不到和電子郵件地址 %s 相關的結果"
 
-#: src/protocols/oscar/oscar.c:4173
+#: src/protocols/oscar/oscar.c:4399
 #, 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:4401
 msgid "Account Confirmation Requested"
 msgstr "帳號確認"
 
-#: src/protocols/oscar/oscar.c:4203
+#: src/protocols/oscar/oscar.c:4429
 msgid "Error Changing Account Info"
 msgstr "更改帳號資訊錯誤"
 
-#: src/protocols/oscar/oscar.c:4206
+#: src/protocols/oscar/oscar.c:4432
 #, 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:4435
 #, 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:4438
 #, 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:4441
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because there is already a "
@@ -6900,7 +7691,7 @@
 msgstr ""
 "錯誤 0x%04x:無法改變電子郵件地址,因為您已經送出的其他要求還未處理好。"
 
-#: src/protocols/oscar/oscar.c:4218
+#: src/protocols/oscar/oscar.c:4444
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address has "
@@ -6908,19 +7699,19 @@
 msgstr ""
 "錯誤 0x%04x:無法改變電子郵件地址,因為這個電子郵件地址和太多的帳號產生關連。"
 
-#: src/protocols/oscar/oscar.c:4221
+#: src/protocols/oscar/oscar.c:4447
 #, 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:4450
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "錯誤 0x%04x:未知錯誤。"
 
-#: src/protocols/oscar/oscar.c:4234
+#: src/protocols/oscar/oscar.c:4460
 #, c-format
 msgid ""
 "Your screen name is currently formatted as follows:\n"
@@ -6929,20 +7720,20 @@
 "您的帳號目前被格式化如下:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:4235 src/protocols/oscar/oscar.c:4242
+#: src/protocols/oscar/oscar.c:4461 src/protocols/oscar/oscar.c:4468
 msgid "Account Info"
 msgstr "帳號資訊"
 
-#: src/protocols/oscar/oscar.c:4240
+#: src/protocols/oscar/oscar.c:4466
 #, c-format
 msgid "The email address for %s is %s"
 msgstr "%s 的電子郵件地址為 %s"
 
-#: src/protocols/oscar/oscar.c:4472
+#: src/protocols/oscar/oscar.c:4681
 msgid "Unable to set AIM profile."
 msgstr "無法設定 AIM 個人資料。"
 
-#: src/protocols/oscar/oscar.c:4473
+#: src/protocols/oscar/oscar.c:4682
 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 +7742,7 @@
 "您在未登入完成前要求修改您的個人資訊,所以這些資訊並未被修改。請在完成登入後"
 "再重新進行設定。"
 
-#: src/protocols/oscar/oscar.c:4500
+#: src/protocols/oscar/oscar.c:4709
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  Gaim has truncated "
@@ -6959,18 +7750,22 @@
 msgid_plural ""
 "The maximum profile length of %d bytes has been exceeded.  Gaim has "
 "truncated it for you."
-msgstr[0] "超出個人資訊的長度上限 %d 位元組。Gaim 將在截短內容後進行設定。"
-msgstr[1] "超出個人資訊的長度上限 %d 位元組。Gaim 將在截短內容後進行設定。"
-
-#: src/protocols/oscar/oscar.c:4505
+msgstr[0] "個人資訊的長度超出了 %d 個位元組的上限。Gaim 已替您截短內容。"
+msgstr[1] "個人資訊的長度超出了 %d 個位元組的上限。Gaim 已替您截短內容。"
+
+#: src/protocols/oscar/oscar.c:4714
 msgid "Profile too long."
 msgstr "個人資訊過長。"
 
-#: src/protocols/oscar/oscar.c:4522
+#: src/protocols/oscar/oscar.c:4730 src/protocols/oscar/oscar.c:6430
+msgid "Visible"
+msgstr "現身"
+
+#: src/protocols/oscar/oscar.c:4748
 msgid "Unable to set AIM away message."
 msgstr "無法設定 AIM 離開訊息。"
 
-#: src/protocols/oscar/oscar.c:4523
+#: src/protocols/oscar/oscar.c:4749
 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 +7774,7 @@
 "您試著在登入程序完成前修改您的離開訊息,您的狀態將維持目前所設定的狀態。請在"
 "完全登入後再設定一次。"
 
-#: src/protocols/oscar/oscar.c:4563
+#: src/protocols/oscar/oscar.c:4789
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  Gaim has "
@@ -6987,18 +7782,31 @@
 msgid_plural ""
 "The maximum away message length of %d bytes has been exceeded.  Gaim has "
 "truncated it for you."
-msgstr[0] "超出離開訊息的長度上限 %d 位元組。Gaim 將在截短內容後進行設定。"
-msgstr[1] "超出離開訊息的長度上限 %d 位元組。Gaim 將在截短內容後進行設定。"
-
-#: src/protocols/oscar/oscar.c:4568
+msgstr[0] "離開訊息的長度超出了 %d 個位元組的上限。Gaim 已替您截短內容。"
+msgstr[1] "離開訊息的長度超出了 %d 個位元組的上限。Gaim 已替您截短內容。"
+
+#: src/protocols/oscar/oscar.c:4794
 msgid "Away message too long."
 msgstr "離開訊息過長。"
 
-#: src/protocols/oscar/oscar.c:4782
+#: src/protocols/oscar/oscar.c:4887
+#, 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:4888 src/protocols/oscar/oscar.c:5305
+#: src/protocols/oscar/oscar.c:5318
+msgid "Unable To Add"
+msgstr "無法加入"
+
+#: src/protocols/oscar/oscar.c:5024
 msgid "Unable To Retrieve Buddy List"
 msgstr "無法讀取好友清單"
 
-#: src/protocols/oscar/oscar.c:4783
+#: src/protocols/oscar/oscar.c:5025
 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 +7815,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:5201 src/protocols/oscar/oscar.c:5202
+#: src/protocols/oscar/oscar.c:5207 src/protocols/oscar/oscar.c:5362
+#: src/protocols/oscar/oscar.c:5363 src/protocols/oscar/oscar.c:5368
 msgid "Orphans"
 msgstr "孤兒們"
 
-#: src/protocols/oscar/oscar.c:5047
+#: src/protocols/oscar/oscar.c:5304
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -7021,15 +7830,11 @@
 "因為您的好友法單中有太多的好友,所以沒有辦法加入好友 %s。請在移除部份好友後重"
 "試。"
 
-#: src/protocols/oscar/oscar.c:5047 src/protocols/oscar/oscar.c:5060
+#: src/protocols/oscar/oscar.c:5304 src/protocols/oscar/oscar.c:5317
 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:5317
 #, c-format
 msgid ""
 "Could not add the buddy %s for an unknown reason.  The most common reason "
@@ -7039,7 +7844,7 @@
 "因為不明原因而無法將好友 %s 加入。一般的原因是因為您的好友清單中的好友數目超"
 "過所系統允許的上限。"
 
-#: src/protocols/oscar/oscar.c:5095
+#: src/protocols/oscar/oscar.c:5399
 #, c-format
 msgid ""
 "The user %s has given you permission to add you to their buddy list.  Do you "
@@ -7049,11 +7854,11 @@
 "呢?"
 
 # NOTE 這是我們允許別人發出的認證要求後顯示給我們自己看的
-#: src/protocols/oscar/oscar.c:5101
+#: src/protocols/oscar/oscar.c:5405
 msgid "Authorization Given"
 msgstr "給予認證"
 
-#: src/protocols/oscar/oscar.c:5134
+#: src/protocols/oscar/oscar.c:5438
 #, c-format
 msgid ""
 "The user %s wants to add you to their buddy list for the following reason:\n"
@@ -7063,18 +7868,18 @@
 "%s"
 
 #. Granted
-#: src/protocols/oscar/oscar.c:5176
+#: src/protocols/oscar/oscar.c:5480
 #, 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:5481
 msgid "Authorization Granted"
 msgstr "認證獲允"
 
 #. Denied
-#: src/protocols/oscar/oscar.c:5180
+#: src/protocols/oscar/oscar.c:5484
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -7084,109 +7889,85 @@
 "使用者 %s 因為下列原因,拒絕了您將他(她)加入好友清單的要求:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:5181
+#: src/protocols/oscar/oscar.c:5485
 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:5522 src/protocols/toc/toc.c:1264
 msgid "_Exchange:"
 msgstr "頻道號碼(_E):"
 
-#: src/protocols/oscar/oscar.c:5456
-msgid "<b>Status:</b> "
-msgstr "<b>狀態:</b>"
-
-#: src/protocols/oscar/oscar.c:5468
-msgid "<b>IP Address:</b> "
-msgstr "<b>IP 位址:</b>"
-
-#: src/protocols/oscar/oscar.c:5476
-msgid "<b>Capabilities:</b> "
-msgstr "<b>相容性:</b>"
-
-#: src/protocols/oscar/oscar.c:5485
-msgid "<b>Buddy Comment:</b> "
-msgstr "<b>好友說明:</b>"
-
-#: src/protocols/oscar/oscar.c:5494
-msgid "<b>Available:</b> "
-msgstr "<b>上線:</b>"
-
-#: src/protocols/oscar/oscar.c:5512
-msgid "<b>Away Message:</b> "
-msgstr "<b>離開訊息:</b>"
-
-#: src/protocols/oscar/oscar.c:5521
-msgid "<b>Status:</b> Not Authorized"
-msgstr "<b>狀態:</b>未認證"
-
-#: src/protocols/oscar/oscar.c:5555 src/protocols/yahoo/yahoo.c:2191
-msgid "Offline"
-msgstr "離線"
-
-#: src/protocols/oscar/oscar.c:6003
+#: src/protocols/oscar/oscar.c:5544
+msgid "Invalid chat name specified."
+msgstr "給予了無效的聊天室名稱。"
+
+#: src/protocols/oscar/oscar.c:5785
+msgid "Away Message"
+msgstr "離開訊息"
+
+#: src/protocols/oscar/oscar.c:6279
 msgid "Unable to open Direct IM"
 msgstr "無法開啟直接的即時訊息"
 
-#: src/protocols/oscar/oscar.c:6016
+#: src/protocols/oscar/oscar.c:6292
 #, 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:6295
 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:6480
 msgid "Buddy Comment:"
 msgstr "好友說明:"
 
-#: src/protocols/oscar/oscar.c:6210
+#: src/protocols/oscar/oscar.c:6496
 msgid "Edit Buddy Comment"
 msgstr "編輯好友說明"
 
-#: src/protocols/oscar/oscar.c:6218
+#: src/protocols/oscar/oscar.c:6504
 msgid "Get Status Msg"
 msgstr "取得狀態訊息"
 
 # NOTE 將「直接消息」改譯為「即時訊息」
-#: src/protocols/oscar/oscar.c:6233
+#: src/protocols/oscar/oscar.c:6519
 msgid "Direct IM"
 msgstr "即時訊息"
 
-#: src/protocols/oscar/oscar.c:6262
+#: src/protocols/oscar/oscar.c:6548
 msgid "Re-request Authorization"
 msgstr "重新要求認證"
 
-#: src/protocols/oscar/oscar.c:6283
+#: src/protocols/oscar/oscar.c:6569
 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:6570
+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:6576
+msgid "New screen name formatting:"
 msgstr "新的帳號格式:"
 
-#: src/protocols/oscar/oscar.c:6339
+#: src/protocols/oscar/oscar.c:6625
 msgid "Change Address To:"
 msgstr "變更地址為:"
 
-#: src/protocols/oscar/oscar.c:6383
+#: src/protocols/oscar/oscar.c:6669
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>您並沒有在等待驗證</i>"
 
-#: src/protocols/oscar/oscar.c:6386
+#: src/protocols/oscar/oscar.c:6672
 msgid "You are awaiting authorization from the following buddies"
 msgstr "您目前正在等待下列好友的認證"
 
-#: src/protocols/oscar/oscar.c:6387
+#: src/protocols/oscar/oscar.c:6673
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
@@ -7194,75 +7975,79 @@
 "您可以重新要求這些好友的認證,只要在好友清單中以滑鼠右鍵點擊他們,然後選擇"
 "「要求重新認證」。"
 
-#: src/protocols/oscar/oscar.c:6401
+#: src/protocols/oscar/oscar.c:6687
 msgid "Find Buddy by E-mail"
 msgstr "以電子郵件地址來找尋好友"
 
-#: src/protocols/oscar/oscar.c:6402
+#: src/protocols/oscar/oscar.c:6688
 msgid "Search for a buddy by e-mail address"
 msgstr "使用電子郵件地址搜尋好友"
 
-#: src/protocols/oscar/oscar.c:6403
+#: src/protocols/oscar/oscar.c:6689
 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:6706
 msgid "Available Message:"
 msgstr "上線訊息:"
 
 # XXX 請覆查
-#: src/protocols/oscar/oscar.c:6421
+#: src/protocols/oscar/oscar.c:6707
 msgid "I'm doing work and hoping for a distraction--IM me!"
 msgstr "我在工作,但覺得很悶,同我聊聊天吧!"
 
-#: src/protocols/oscar/oscar.c:6492
+#: src/protocols/oscar/oscar.c:6783
 msgid "Set User Info..."
 msgstr "設定使用者資訊..."
 
-#: src/protocols/oscar/oscar.c:6499
+#: src/protocols/oscar/oscar.c:6790
+msgid "Set User Info (URL)..."
+msgstr "設定使用者資訊 (URL)..."
+
+#: src/protocols/oscar/oscar.c:6798
 msgid "Set Available Message..."
 msgstr "設定上線訊息..."
 
-#: src/protocols/oscar/oscar.c:6506
+#: src/protocols/oscar/oscar.c:6805
 msgid "Change Password..."
 msgstr "修改密碼..."
 
-#: src/protocols/oscar/oscar.c:6513
+#: src/protocols/oscar/oscar.c:6812
 msgid "Change Password (URL)"
 msgstr "修改密碼 (透過網頁)"
 
-#: src/protocols/oscar/oscar.c:6521
+#: src/protocols/oscar/oscar.c:6820
 msgid "Configure IM Forwarding (URL)"
 msgstr "設定即時訊息的轉送 (透過網頁)"
 
-#: src/protocols/oscar/oscar.c:6532
-msgid "Format Screenname..."
+#: src/protocols/oscar/oscar.c:6831
+msgid "Format Screen Name..."
 msgstr "格式化帳號..."
 
-#: src/protocols/oscar/oscar.c:6538
+#: src/protocols/oscar/oscar.c:6837
 msgid "Confirm Account"
 msgstr "確認帳號"
 
-#: src/protocols/oscar/oscar.c:6544
+#: src/protocols/oscar/oscar.c:6843
 msgid "Display Currently Registered Address"
 msgstr "顯示目前所註冊的地址"
 
-#: src/protocols/oscar/oscar.c:6550
+#: src/protocols/oscar/oscar.c:6849
 msgid "Change Currently Registered Address..."
 msgstr "修改目前所註冊的地址..."
 
-#: src/protocols/oscar/oscar.c:6559
+#: src/protocols/oscar/oscar.c:6858
 msgid "Show Buddies Awaiting Authorization"
 msgstr "顯示等待認證的好友"
 
-#: src/protocols/oscar/oscar.c:6567
+#: src/protocols/oscar/oscar.c:6866
 msgid "Search for Buddy by Email..."
 msgstr "使用電子郵件地址搜尋好友..."
 
+#: src/protocols/oscar/oscar.c:6873
+msgid "Search for Buddy by Information"
+msgstr "依照資訊尋找好友"
+
 #. *< api_version
 #. *< type
 #. *< ui_requirement
@@ -7273,15 +8058,15 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/oscar/oscar.c:6687 src/protocols/oscar/oscar.c:6689
+#: src/protocols/oscar/oscar.c:6996 src/protocols/oscar/oscar.c:6998
 msgid "AIM/ICQ Protocol Plugin"
 msgstr "AIM/ICQ 協定模組"
 
-#: src/protocols/oscar/oscar.c:6706
+#: src/protocols/oscar/oscar.c:7015
 msgid "Auth host"
 msgstr "認證伺服器"
 
-#: src/protocols/oscar/oscar.c:6711
+#: src/protocols/oscar/oscar.c:7020
 msgid "Auth port"
 msgstr "認證通訊埠"
 
@@ -7487,15 +8272,15 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/toc/toc.c:2158 src/protocols/toc/toc.c:2160
+#: src/protocols/toc/toc.c:2167 src/protocols/toc/toc.c:2169
 msgid "TOC Protocol Plugin"
 msgstr "TOC 協定模組"
 
-#: src/protocols/toc/toc.c:2177
+#: src/protocols/toc/toc.c:2186
 msgid "TOC host"
 msgstr "TOC 伺服器"
 
-#: src/protocols/toc/toc.c:2181
+#: src/protocols/toc/toc.c:2190
 msgid "TOC port"
 msgstr "TOC 通訊埠"
 
@@ -7513,7 +8298,6 @@
 msgid "Profile Information"
 msgstr "個人資訊"
 
-# XXX 看了原始碼,但不肯定譯得對
 # NOTE SimGuy: probably "Other IM services" if you can do that one :)
 #. Instant Messagers
 #: src/protocols/trepia/trepia.c:306
@@ -7550,26 +8334,26 @@
 msgid "Set your Trepia profile data."
 msgstr "設定您的 Trepia 個人資料。"
 
-#: src/protocols/trepia/trepia.c:468
+#: src/protocols/trepia/trepia.c:424
 msgid "Profile"
 msgstr "個人資料"
 
-#: src/protocols/trepia/trepia.c:490
+#: src/protocols/trepia/trepia.c:439
 msgid "Set Profile"
 msgstr "設定個人資料"
 
 # XXX 好像不太對
 # NOTE 譯文更動 by Paladin
-#: src/protocols/trepia/trepia.c:526
+#: src/protocols/trepia/trepia.c:475
 msgid "Visit Homepage"
 msgstr "參觀網頁"
 
 # NOTE Debian 譯「local」為「本地端」
-#: src/protocols/trepia/trepia.c:872 src/protocols/trepia/trepia.c:875
+#: src/protocols/trepia/trepia.c:821 src/protocols/trepia/trepia.c:824
 msgid "Local Users"
 msgstr "本地端的使用者"
 
-#: src/protocols/trepia/trepia.c:1073
+#: src/protocols/trepia/trepia.c:1027
 msgid "Logging in"
 msgstr "登入中"
 
@@ -7583,33 +8367,37 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/trepia/trepia.c:1320 src/protocols/trepia/trepia.c:1322
+#: src/protocols/trepia/trepia.c:1282 src/protocols/trepia/trepia.c:1284
 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 +8406,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:1599
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -7632,11 +8420,11 @@
 "Yahoo 伺服器要求了使用一種不明的認證方式,因此這個版本的 Gaim 很可能不會成功"
 "登入 Yahoo。請到 %s 檢查有沒有更新的版本。"
 
-#: src/protocols/yahoo/yahoo.c:1497
+#: src/protocols/yahoo/yahoo.c:1602
 msgid "Failed Yahoo! Authentication"
 msgstr "Yahoo! 認證失敗"
 
-#: src/protocols/yahoo/yahoo.c:1570
+#: src/protocols/yahoo/yahoo.c:1675
 #, c-format
 msgid ""
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
@@ -7645,68 +8433,69 @@
 "您嘗試忽略在您的好友名單內的 %s。如果您打算把他(她)從您的好友清單中移除,並"
 "隨即忽略他(她),請按一下「是」。"
 
-#: src/protocols/yahoo/yahoo.c:1573
+#: src/protocols/yahoo/yahoo.c:1678
 msgid "Ignore buddy?"
 msgstr "忽略使用者?"
 
-#: src/protocols/yahoo/yahoo.c:1606
+#: src/protocols/yahoo/yahoo.c:1711
 msgid "Invalid username."
 msgstr "使用者名稱無效。"
 
-#: src/protocols/yahoo/yahoo.c:1609
+#: src/protocols/yahoo/yahoo.c:1714
 msgid "Incorrect password."
 msgstr "錯誤的密碼。"
 
 # XXX 暫譯
-#: src/protocols/yahoo/yahoo.c:1612
+#: src/protocols/yahoo/yahoo.c:1717
 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:1720
 #, c-format
 msgid "Unknown error number %d."
 msgstr "未知的錯誤代碼 %d。"
 
-#: src/protocols/yahoo/yahoo.c:1672
+#: src/protocols/yahoo/yahoo.c:1777
 #, 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:1779
 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:1889 src/protocols/yahoo/yahoo.c:2020
 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:2042 src/protocols/yahoo/yahoo.c:2152
+#: src/protocols/yahoo/yahoo.c:2195 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:2279 src/protocols/yahoo/yahoo.c:2605
+#: src/protocols/yahoo/yahoo.c:2717
 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:2281 src/protocols/yahoo/yahoo.c:2607
+#: src/protocols/yahoo/yahoo.c:2718
 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:2283 src/protocols/yahoo/yahoo.c:2609
+#: src/protocols/yahoo/yahoo.c:2719
 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:2287 src/protocols/yahoo/yahoo.c:2613
+#: src/protocols/yahoo/yahoo.c:2721
 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:2291 src/protocols/yahoo/yahoo.c:2617
+#: src/protocols/yahoo/yahoo.c:2723
 msgid "Stepped Out"
 msgstr "走出去了"
 
@@ -7714,91 +8503,95 @@
 # 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:2355 src/protocols/yahoo/yahoo.c:2387
 msgid "Not on server list"
 msgstr "不在伺服器上的清單中"
 
+#: src/protocols/yahoo/yahoo.c:2407
+#, c-format
+msgid ""
+"\n"
+"<b>%s:</b> %s"
+msgstr ""
+"\n"
+"<b>%s:</b>%s"
+
 # NOTE #gaim 的 Vann 及 LSchiere 解:如果選取了的好友目前處於一個聊天,便加入該個聊天
 # NOTE Yahoo 的「Chat」正式譯文為「聯誼園地」
-#: src/protocols/yahoo/yahoo.c:2337
+#: src/protocols/yahoo/yahoo.c:2443
 msgid "Join in Chat"
 msgstr "加入好友目前所在的聊天室"
 
 # NOTE「會議室」是暫時的意譯。Yahoo! 好像沒有為「Conference」提供正式中譯名。
-#: src/protocols/yahoo/yahoo.c:2343
+#: src/protocols/yahoo/yahoo.c:2449
 msgid "Initiate Conference"
 msgstr "開啟會議室"
 
-#: src/protocols/yahoo/yahoo.c:2396
+#: src/protocols/yahoo/yahoo.c:2502
 msgid "Active which ID?"
 msgstr "啟動哪一個 ID?"
 
 # NOTE #gaim 的 Vann 及 LSchiere 解:如果選取了的好友目前處於一個聊天,便加入該個聊天
 # NOTE Yahoo 的「Chat」正式譯文為「聯誼園地」
-#: src/protocols/yahoo/yahoo.c:2404
+#: src/protocols/yahoo/yahoo.c:2510
 msgid "Join who in chat?"
 msgstr "加入哪個好友目前所在的聊天室?"
 
-#: src/protocols/yahoo/yahoo.c:2415
+#: src/protocols/yahoo/yahoo.c:2521
 msgid "Activate ID..."
 msgstr "啟動 ID..."
 
-#: src/protocols/yahoo/yahoo.c:2421
+#: src/protocols/yahoo/yahoo.c:2527
 msgid "Join user in chat..."
 msgstr "加入好友目前所在的聊天室..."
 
-#: src/protocols/yahoo/yahoo.c:2803
+#: src/protocols/yahoo/yahoo.c:2916
 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:2917 src/protocols/yahoo/yahoo.c:2940
 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:2939
 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:2987 src/protocols/yahoo/yahoo.c:2988
 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:3032 src/protocols/yahoo/yahoo.c:3035
+#: src/protocols/yahoo/yahoo.c:3038
 msgid "Hobbies"
 msgstr "嗜好"
 
-#: src/protocols/yahoo/yahoo.c:2934 src/protocols/yahoo/yahoo.c:2937
+#: src/protocols/yahoo/yahoo.c:3047 src/protocols/yahoo/yahoo.c:3050
 msgid "Latest News"
 msgstr "最新消息"
 
-#: src/protocols/yahoo/yahoo.c:2951
+#: src/protocols/yahoo/yahoo.c:3064
 msgid "Home Page"
 msgstr "網頁"
 
-#: src/protocols/yahoo/yahoo.c:2963
+#: src/protocols/yahoo/yahoo.c:3076
 msgid "Cool Link 1"
 msgstr "酷連結(一)"
 
-#: src/protocols/yahoo/yahoo.c:2967
+#: src/protocols/yahoo/yahoo.c:3080
 msgid "Cool Link 2"
 msgstr "酷連結(二)"
 
-#: src/protocols/yahoo/yahoo.c:2969
+#: src/protocols/yahoo/yahoo.c:3082
 msgid "Cool Link 3"
 msgstr "酷連結(三)"
 
-# XXX 改譯「註冊日期」會否比較通順?
-#: src/protocols/yahoo/yahoo.c:2975
-msgid "Member Since"
-msgstr "成為成員的時間"
-
 #. *< api_version
 #. *< type
 #. *< ui_requirement
@@ -7809,86 +8602,130 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/yahoo/yahoo.c:3175 src/protocols/yahoo/yahoo.c:3177
+#: src/protocols/yahoo/yahoo.c:3294 src/protocols/yahoo/yahoo.c:3296
 msgid "Yahoo Protocol Plugin"
 msgstr "Yahoo 協定模組"
 
-#: src/protocols/yahoo/yahoo.c:3194
+#: src/protocols/yahoo/yahoo.c:3313
 msgid "Pager host"
 msgstr "傳呼系統伺服器"
 
-#: src/protocols/yahoo/yahoo.c:3197
+#: src/protocols/yahoo/yahoo.c:3316
 msgid "Pager port"
 msgstr "傳呼系統通訊埠"
 
-#: src/protocols/yahoo/yahoo.c:3200
+#: src/protocols/yahoo/yahoo.c:3319
 msgid "File transfer host"
 msgstr "檔案傳輸主機"
 
-#: src/protocols/yahoo/yahoo.c:3203
+#: src/protocols/yahoo/yahoo.c:3322
 msgid "File transfer port"
 msgstr "檔案傳輸通訊埠"
 
-#: src/protocols/yahoo/yahoochat.c:194
+#: src/protocols/yahoo/yahoo.c:3325
+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 "Gaim 無法透過 Yahoo! 傳送大於 1MB (104,8576 個位元組) 的檔案。"
+
+#: 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
+#: src/protocols/yahoo/yahoochat.c:426
+#, 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
+msgid "Fetching the room list failed."
+msgstr "讀取聊天室清單發生錯誤。"
+
+# NOTE 解「可語音聊天的使用者數目」(marv)
+#: src/protocols/yahoo/yahoochat.c:1346
+msgid "Voices"
+msgstr "可語音聊天"
+
+# NOTE 解「可視像聊天的使用者數目」(marv)
+#: src/protocols/yahoo/yahoochat.c:1349
+msgid "Webcams"
+msgstr "可視像聊天"
+
+#: src/protocols/yahoo/yahoochat.c:1360 src/protocols/yahoo/yahoochat.c:1421
+msgid "Unable to fetch room list."
+msgstr "無法取得聊天室清單。"
+
+# NOTE wing: does "User Rooms" mean rooms created by users? i guess yes?
+# NOTE marv: wing: yeah, Yahoo has Yahoo rooms and user rooms
+# NOTE marv: marv: in the room list stuff? yeah it's a user created room as opposed to an official room
+#: src/protocols/yahoo/yahoochat.c:1414
+msgid "User Rooms"
+msgstr "使用者建立之聊天室"
+
+#: src/protocols/zephyr/zephyr.c:557
 #, c-format
 msgid "<b>User:</b> %s<br>"
 msgstr "<b>使用者:</b>%s<br>"
 
-#: src/protocols/zephyr/zephyr.c:346
+#: src/protocols/zephyr/zephyr.c:559
 #, c-format
 msgid "<b>Alias:</b> %s<br>"
 msgstr "<b>別名:</b>%s<br>"
 
-#: src/protocols/zephyr/zephyr.c:348
+#: src/protocols/zephyr/zephyr.c:561
 msgid "<br>Hidden or not logged-in"
 msgstr "<br>隱藏或未登入"
 
-#: src/protocols/zephyr/zephyr.c:352
+#: src/protocols/zephyr/zephyr.c:565
 #, 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:831 src/protocols/zephyr/zephyr.c:832
 msgid "Anyone"
 msgstr "任何人"
 
-#: src/protocols/zephyr/zephyr.c:609
+#: src/protocols/zephyr/zephyr.c:858
 msgid "Already logged in with Zephyr"
 msgstr "已經登入 Zephyr"
 
-#: src/protocols/zephyr/zephyr.c:610
+#: src/protocols/zephyr/zephyr.c:858
 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:1164
 msgid "ZLocate"
 msgstr "名錄搜尋 (ZLocate)"
 
@@ -7897,18 +8734,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:1206
 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:1212
 msgid "_Instance:"
 msgstr "實體/頻道(_I):"
 
-#: src/protocols/zephyr/zephyr.c:918
+#: src/protocols/zephyr/zephyr.c:1218
 msgid "_Recipient:"
 msgstr "接受者(_R):"
 
@@ -7922,26 +8759,47 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/zephyr/zephyr.c:1049 src/protocols/zephyr/zephyr.c:1051
+#: src/protocols/zephyr/zephyr.c:1372 src/protocols/zephyr/zephyr.c:1374
 msgid "Zephyr Protocol Plugin"
 msgstr "Zephyr 協定模組"
 
+# NOTE: 這是Zephyr使用者會自然明白的術語,不用費心解釋
+# NOTE: aatharuv: Most zephyr clients use ".anyone" to store the Zephyr
+# NOTE: buddylist. The export to .anyone option controls whether you want
+# NOTE: gaim to write to .anyone upon logout. Some people use multiple
+# NOTE: clients and prefer to have separate buddylists for separate clients.
+# NOTE: Similarly, .zephyr.subs controls the chats that a person subs.
+#: src/protocols/zephyr/zephyr.c:1391
+msgid "Export to .anyone"
+msgstr "匯出至 .anyone 檔"
+
+#: src/protocols/zephyr/zephyr.c:1394
+msgid "Export to .zephyr.subs"
+msgstr "匯出至 .zephyr.subs 檔"
+
+# FIXME 暫譯;譯得很差,有待改進
+# NOTE: Zephyr 的「Exposure」指隱身至現身之間的各種狀態
+# NOTE: aatharuv: exposure in zephyr controls your visibility.
+#: src/protocols/zephyr/zephyr.c:1397
+msgid "Exposure"
+msgstr "現身程度"
+
 # TODO Untranslated
 #. Forbidden
-#: src/proxy.c:1014
+#: src/proxy.c:955
 msgid "Access denied: proxy server forbids port 80 tunnelling."
 msgstr ""
 
-#: src/proxy.c:1016
+#: src/proxy.c:957
 #, c-format
 msgid "Proxy connection error %d"
 msgstr "代理伺服器連線錯誤 %d"
 
-#: src/proxy.c:1736
+#: src/proxy.c:1696
 msgid "Invalid proxy settings"
 msgstr "無效的代理伺服器設定"
 
-#: src/proxy.c:1736
+#: src/proxy.c:1696
 msgid ""
 "Either the host name or port number specified for your given proxy type is "
 "invalid."
@@ -7949,43 +8807,73 @@
 "對於您目前所設定的代理伺服器型態來說,您所給定的伺服器名稱及通訊埠是無效的"
 
 #. * Custom away message.
-#: src/prpl.h:187
+#: src/prpl.h:194
 msgid "Custom"
 msgstr "使用者自定"
 
 #. *
 #. * A wrapper for gaim_request_action() that uses Accept and Cancel buttons.
 #.
-#: src/request.h:1028
+#: src/request.h:1250
 msgid "Accept"
 msgstr "接受"
 
-#: src/server.c:56
+#: src/server.c:58
 msgid "Please enter your password"
 msgstr "請輸入您的密碼"
 
-#: src/server.c:948
+#: src/server.c:962
 #, c-format
 msgid "(%d message)"
 msgid_plural "(%d messages)"
 msgstr[0] "(%d 個訊息)"
 msgstr[1] "(%d 個訊息)"
 
-#: src/server.c:961
+#: src/server.c:976
 msgid "(1 message)"
 msgstr "(一個訊息)"
 
-#: src/server.c:1145 src/server.c:1155
+#: src/server.c:1160 src/server.c:1170
 #, c-format
 msgid "%s logged in."
 msgstr "%s 登入。"
 
-#: src/server.c:1172 src/server.c:1180
+#: src/server.c:1184
+#, c-format
+msgid "%s signed on"
+msgstr "%s 已經登入"
+
+#: src/server.c:1200
+#, c-format
+msgid "%s came back"
+msgstr "%s 回來了"
+
+#: src/server.c:1202
+#, c-format
+msgid "%s went away"
+msgstr "%s 已經離開"
+
+#: src/server.c:1217
+#, c-format
+msgid "%s became idle"
+msgstr "%s 變更狀態為閒置"
+
+#: src/server.c:1231
+#, c-format
+msgid "%s became unidle"
+msgstr "%s 由閒置返回"
+
+#: src/server.c:1244 src/server.c:1252
 #, c-format
 msgid "%s logged out."
 msgstr "%s 登出。"
 
-#: src/server.c:1227
+#: src/server.c:1267
+#, c-format
+msgid "%s signed off"
+msgstr "%s 已經登出"
+
+#: src/server.c:1317
 #, c-format
 msgid ""
 "%s has just been warned by %s.\n"
@@ -7994,11 +8882,11 @@
 "%s 剛剛被 %s 警告了。\n"
 "您的新警告等級為 %d%%"
 
-#: src/server.c:1230
+#: src/server.c:1320
 msgid "an anonymous person"
 msgstr "一個匿名者"
 
-#: src/server.c:1333
+#: src/server.c:1430
 #, c-format
 msgid ""
 "User '%s' invites %s to buddy chat room: '%s'\n"
@@ -8007,808 +8895,76 @@
 "使用者「%s」邀請 %s 到好友聊天室:「%s」\n"
 "%s"
 
-#: src/server.c:1337
+#: src/server.c:1434
 #, 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:1440
 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
+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:2040
 msgid "Calculating..."
 msgstr "計算中..."
 
-#: src/util.c:1896
+#: src/util.c:2043
 msgid "Unknown."
 msgstr "未知。"
 
-#: src/util.c:1927 src/util.c:1932 src/util.c:1937 src/util.c:1940
+#: src/util.c:2074 src/util.c:2079 src/util.c:2084 src/util.c:2087
 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
+msgstr[0] "日"
+msgstr[1] "日"
+
+#: src/util.c:2075 src/util.c:2079 src/util.c:2093 src/util.c:2095
 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:2075 src/util.c:2084 src/util.c:2093 src/util.c:2098
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "分"
 msgstr[1] "分"
 
-#: src/util.c:2283
+#: src/util.c:2430
 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 "Disconnected"
-#~ msgstr "已停止連線"
-
-#~ msgid "Invalid response from server"
-#~ msgstr "無效的伺服器回應"
-
-#~ msgid "Unable to connect"
-#~ msgstr "無法連線"
-
-#~ msgid "Could not connect for transfer!"
-#~ msgstr "無法開啟傳輸的連線!"
-
-#~ msgid "SSL support is needed for MSN. Please install it."
-#~ msgstr "MSN 需要 SSL 程式庫的支援,請安裝相關的程式庫。"
-
-# XXX 唉,不能寫「世界文」吧......
-#~ msgid "Esperanto"
-#~ msgstr "世界語"
-
-#~ msgid "Gaim - Away!"
-#~ msgstr "Gaim - 離開!"
-
-#~ msgid "Gaim - Information"
-#~ msgstr "Gaim - 資訊"
-
-#~ msgid "/Conversation/_New Conversation..."
-#~ msgstr "/交談/新交談(_N))..."
-
-#~ msgid "/Conversation/Insert _Image..."
-#~ msgstr "/交談/插入影像(_I)"
-
-#~ msgid "/Conversation/Insert URL..."
-#~ msgstr "/交談/插入 URL..."
-
-#~ msgid "Port:"
-#~ msgstr "通訊埠:"
-
-#~ msgid "Gaim - Save Icon"
-#~ msgstr "Gaim - 儲存圖示"
-
-#~ msgid "Unknown error."
-#~ msgstr "未知錯誤。"
-
-#~ msgid "Gnome Stock Ticker Properties"
-#~ msgstr "Gnome Stock Ticker 選項"
-
-#~ msgid "Update Frequency in min"
-#~ msgstr "更新頻率(以分為單位)"
-
-#~ msgid "Enter symbols delimited with \"+\" in the box below."
-#~ msgstr "在下面的輸入區中,以「+」符號做區隔。"
-
-#~ msgid "Check this box to display only symbols and price:"
-#~ msgstr "只顯示符號和價格:"
-
-#~ msgid "Check this box to scroll left to right:"
-#~ msgstr "選取這個選項,由左至右捲動:"
-
-#~ msgid "(No"
-#~ msgstr "(無"
-
-#~ msgid "Change"
-#~ msgstr "變更"
-
-#~ msgid "New Message"
-#~ msgstr "新訊息"
-
-#~ msgid "Add a new group"
-#~ msgstr "新增群組"
-
-#~ msgid "Gaim - Insert Image"
-#~ msgstr "Gaim - 插入影像"
-
-#~ msgid "/Conversation/Insert _URL..."
-#~ msgstr "/交談/插入 URL(_U)"
-
-#~ msgid "Alias chat"
-#~ msgstr "給聊天室改別名"
-
-# XXX 中文譯文無法分別出「Alias Buddy」和「Alias Contact」
-#~ msgid "Alias contact"
-#~ msgstr "給好友改別名"
-
-#~ msgid "_Screenname"
-#~ msgstr "帳號(_S)"
-
-#~ msgid "Alias buddy"
-#~ msgstr "為好友加上別名"
-
-# NOTE 這個譯句應該沒有問題。(執行「別名」來看實際使用情況)
-# NOTE 但我把「下列人員...」改為新的譯句...。
-#~ msgid ""
-#~ "Please enter an aliased name for the person below, or rename this contact "
-#~ "in your buddy list."
-#~ msgstr "請為這個好友設定別名,或者更改他(她)在好友清單中所記錄的帳號。"
-
-#~ msgid "Join what group:"
-#~ msgstr "加入哪個群組:"
-
-#~ msgid "Buddy Chat"
-#~ msgstr "好友聊天室"
-
-#~ msgid "Join"
-#~ msgstr "加入"
-
-#~ msgid "_Host"
-#~ msgstr "主機位址(_H)"
-
-#~ msgid "Pa_ssword"
-#~ msgstr "密碼(_S)"
-
-#~ msgid "Changing info for %s:"
-#~ msgstr "修改 %s 的資訊:"
-
-#~ msgid "Couldn't write to %s."
-#~ msgstr "無法寫入到 %s。"
-
-#~ msgid "Save Log File"
-#~ msgstr "儲存日誌檔"
-
-#~ msgid "Couldn't remove file %s."
-#~ msgstr "無法刪除檔案 %s。"
-
-#~ msgid ""
-#~ "You are about to remove the log file for %s.  Do you want to continue?"
-#~ msgstr "您正試著將 %s 的日誌移除。您要繼續這個動作嗎?"
-
-#~ msgid "System Log"
-#~ msgstr "系統日誌"
-
-#~ msgid "Remove Log"
-#~ msgstr "移除日誌"
-
-#~ msgid "Couldn't open log file %s."
-#~ msgstr "無法開啟日誌檔 %s。"
-
-#~ msgid "Conversations with %s"
-#~ msgstr "與 %s 的交談"
-
-#~ msgid "Log"
-#~ msgstr "日誌"
-
-#~ msgid "Clear"
-#~ msgstr "清除"
-
-#~ msgid ""
-#~ "<span weight='bold' size='larger'>Enter a search phrase\n"
-#~ "</span>"
-#~ msgstr ""
-#~ "<span weight='bold' size='larger'>請輸入搜尋字串\n"
-#~ "</span>"
-
-#~ msgid "/Conversation/Search..."
-#~ msgstr "/交談/搜尋..."
-
-#~ msgid "Hide download details"
-#~ msgstr "隱藏下載細節"
-
-#~ msgid "/Conversation/Send _File..."
-#~ msgstr "/交談/傳送檔案(_F)..."
-
-#~ msgid "/Conversation/Send File..."
-#~ msgstr "/交談/傳送檔案..."
-
-#~ msgid "%s (Code %s)"
-#~ msgstr "%s (代碼 %s)"
-
-#~ msgid "Send _File"
-#~ msgstr "傳送檔案(_F)"
-
-#~ msgid "This user can't accept files"
-#~ msgstr "這個使用者無法接收檔案"
-
-# TODO 原文有誤
-#~ msgid "Gaim just support file:// URIS currently"
-#~ msgstr "Gaim 目前只支援 file:// 協定的 URI"
-
-#~ msgid "You are trying to send a lot of files"
-#~ msgstr "您試圖傳送大量檔案"
-
-#~ msgid "Do you really want to send them ?"
-#~ msgstr "您確定要傳送嗎?"
-
-#~ msgid "<font color=\"red\"><b>log->logger_data was NULL!</b></font>"
-#~ msgstr "<font color=\"red\"><b>log->logger_data 之值為 NULL!</b></font>"
-
-#~ msgid "System Logs"
-#~ msgstr "系統日誌"
-
-#~ msgid "Log when buddies _sign on/sign off"
-#~ msgstr "記錄好友的登入/登出(_S)"
-
-#~ msgid "Log when buddies become _idle/un-idle"
-#~ msgstr "記錄好友的閒置/取消閒置(_I)"
-
-#~ msgid "Log when buddies go away/come _back"
-#~ msgstr "記錄好友離開/回來(_B)"
-
-#~ msgid "Log your _own signons/idleness/awayness"
-#~ msgstr "記錄您自已登入/閒置/離開等狀態(_O)"
-
-#~ msgid "I_ndividual log file for each buddy's signons"
-#~ msgstr "使用個別的檔案來記錄不同好友的登入(_N)"
-
-#~ msgid "Log Conversation"
-#~ msgstr "記錄交談"
-
-#~ msgid "<HR><BR><H3 Align=Center> ---- New Conversation @ %s ----</H3><BR>\n"
-#~ msgstr "<HR><BR><H3 Align=Center> ---- 於 %s 的新交談 ----</H3><BR>\n"
-
-#~ msgid "---- New Conversation @ %s ----\n"
-#~ msgstr "---- 於 %s 的新交談 ----\n"
-
-#~ msgid "Strip _HTML from logs"
-#~ msgstr "將交談記錄中的 HTML 標籤去除(_H)"
-
-#~ msgid "Error in specifying buddy conversation."
-#~ msgstr "在指定好友交談時發生錯誤。"
-
-#~ msgid "Unable to find conversation log"
-#~ msgstr "無法找到交談日誌"
-
-#~ msgid "Unable to make directory %s for logging"
-#~ msgstr "無法開啟目錄 %s 來進行記錄"
-
-#~ msgid "IM Sessions with %s\n"
-#~ msgstr "與 %s 的即時訊息工作階段\n"
-
-#~ msgid "IM Sessions with %s"
-#~ msgstr "與 %s 的即時訊息工作階段"
-
-#~ msgid "+++ %s (%s) signed on @ %s"
-#~ msgstr "+++ %s (%s) 登入 @ %s"
-
-#~ msgid "+++ %s (%s) signed off @ %s"
-#~ msgstr "+++ %s (%s) 已經登出 @ %s"
-
-#~ msgid "+++ %s (%s) changed away state @ %s"
-#~ msgstr "+++ %s (%s) 變更狀態為離開 @ %s"
-
-#~ msgid "+++ %s (%s) came back @ %s"
-#~ msgstr "+++ %s (%s) 回來了 @ %s"
-
-#~ msgid "+++ %s (%s) became idle @ %s"
-#~ msgstr "+++ %s (%s) 變更狀態為閒置 @ %s"
-
-#~ msgid "+++ %s (%s) returned from idle @ %s"
-#~ msgstr "+++ %s (%s) 由閒置返回 @ %s"
-
-#~ msgid "+++ Program exit @ %s"
-#~ msgstr "+++ 程式結束 @ %s"
-
-#~ msgid "%s (%s) reported that %s (%s) signed on @ %s"
-#~ msgstr "%s (%s) 報告 %s (%s) 登入 @ %s"
-
-#~ msgid "%s (%s) reported that %s (%s) signed off @ %s"
-#~ msgstr "%s (%s) 報告 %s (%s) 登出 @ %s"
-
-#~ msgid "%s (%s) reported that %s (%s) went away @ %s"
-#~ msgstr "%s (%s) 報告 %s (%s) 變更狀態為離開 @ %s"
-
-#~ msgid "%s (%s) reported that %s (%s) came back @ %s"
-#~ msgstr "%s (%s) 報告 %s (%s) 回來了 @ %s"
-
-#~ msgid "%s (%s) reported that %s (%s) became idle @ %s"
-#~ msgstr "%s (%s) 報告 %s (%s) 變更狀態為閒置 @ %s"
-
-#~ msgid "%s (%s) reported that %s (%s) returned from idle @ %s"
-#~ msgstr "%s (%s) 報告 %s (%s) 由閒置返回 @ %s"
-
-#~ msgid "%s (%s) reported that %s signed on @ %s"
-#~ msgstr "%s (%s) 報告 %s 登入 @ %s"
-
-#~ msgid "%s (%s) reported that %s signed off @ %s"
-#~ msgstr "%s (%s) 報告 %s 登出 @ %s"
-
-#~ msgid "%s (%s) reported that %s went away @ %s"
-#~ msgstr "%s (%s) 報告 %s 變更態為離開 @ %s"
-
-#~ msgid "%s (%s) reported that %s came back @ %s"
-#~ msgstr "%s (%s) 報告 %s 回來了 @ %s"
-
-#~ msgid "%s (%s) reported that %s became idle @ %s"
-#~ msgstr "%s (%s) 報告 %s 變更狀態為閒置 @ %s"
-
-#~ msgid "%s (%s) reported that %s returned from idle @ %s"
-#~ msgstr "%s (%s) 報告 %s 由閒置返回 @ %s"
-
-#~ msgid "%s has been disconnected"
-#~ msgstr "%s 已經中斷連線"
-
-#~ msgid "Portuguese-Portugal"
-#~ msgstr "標準萄文"
-
-#~ msgid "Clear Log"
-#~ msgstr "清除日誌"
-
-#~ msgid "Really clear log?"
-#~ msgstr "真的要清除日誌嗎?"
-
-#~ msgid "Secure IM"
-#~ msgstr "加密即時訊息"
-
-#~ msgid "Disable Animation"
-#~ msgstr "關閉動畫"
-
-#~ msgid "Enable Animation"
-#~ msgstr "開啟動畫"
-
-#~ msgid ""
-#~ "Communication with the browser failed. Please close all windows and try "
-#~ "again."
-#~ msgstr "和瀏覽器的溝通失敗。請關閉所有的視窗後重試。"
-
-#~ msgid "Alias"
-#~ msgstr "別名"
-
-#~ msgid "Group"
-#~ msgstr "群組"
-
-#~ msgid "Add To"
-#~ msgstr "增加到"
-
-#~ msgid "EveryBuddy Bug"
-#~ msgstr "EveryBuddy 錯誤"
-
-#~ msgid "<hr>%s"
-#~ msgstr "<hr>%s"
-
-#~ msgid "Set Directory Info"
-#~ msgstr "設定使用者資訊"
-
-#~ msgid "Directory Info"
-#~ msgstr "目錄資訊"
-
-#~ msgid "Setting Dir Info for %s:"
-#~ msgstr "設定 %s 的使用者資訊:"
-
-#~ msgid "Allow Web Searches To Find Your Info"
-#~ msgstr "允許在 Web 搜尋來檢視您的個人資訊"
-
-# NOTE「小名」大概也可以,但「Maiden Name」通常係指未嫁時的「本姓」
-#~ msgid "Maiden Name"
-#~ msgstr "本姓"
-
-#~ msgid "Below are the results of your search: "
-#~ msgstr "以下是您所做查詢的結果:"
-
-#~ msgid "Search for Buddy"
-#~ msgstr "找尋好友"
-
-#~ msgid "Find Buddy By Info"
-#~ msgstr "以資訊找尋好友"
-
-#~ msgid "Unable to change password."
-#~ msgstr "無法更改密碼。"
-
-#~ msgid ""
-#~ "The current password you entered is incorrect.  Your password has not "
-#~ "been changed."
-#~ msgstr "您所輸入的舊密碼是錯的。您的密碼沒有更改。"
-
-#~ msgid ""
-#~ "The new password you entered is the same as your current password.  Your "
-#~ "password remains the same."
-#~ msgstr "您所輸入的新密碼和舊密碼是一樣的。所以密碼沒有被改變。"
-
-#~ msgid "Jabber Error %s"
-#~ msgstr "Jabber 錯誤 %s"
-
-#~ msgid "Error %s: %s"
-#~ msgstr "錯誤 %s:%s"
-
-#~ msgid ""
-#~ "The Jabber user %s does not exist and was therefore not added to your "
-#~ "roster."
-#~ msgstr "Jabber 使用者 %s 並不存在,所以將不會加入到您的名單中。"
-
-#~ msgid "No such user."
-#~ msgstr "沒有這個使用者。"
-
-#~ msgid "Unknown login error"
-#~ msgstr "未知的登入錯誤"
-
-#~ msgid "Password successfully changed."
-#~ msgstr "密碼修改成功。"
-
-#~ msgid "Connected"
-#~ msgstr "連線成功"
-
-#~ msgid "Requesting Authentication Method"
-#~ msgstr "要求認證的方式中"
-
-#~ msgid "The user %s is an invalid Jabber I.D. and was therefore not added."
-#~ msgstr "使用者 %s 是一個無效的 Jabber 帳號,所以不會被加入到名單中。"
-
-#~ msgid "Unable to add buddy."
-#~ msgstr "無法加入好友。"
-
-#~ msgid "View Error Msg"
-#~ msgstr "觀看錯誤訊息"
-
-#~ msgid "Error %d: %s"
-#~ msgstr "錯誤 %d:%s"
-
-#~ msgid "Unknown registration error"
-#~ msgstr "未知的註冊錯誤"
-
-#~ msgid "<B>Status:</B> %s<HR>%s"
-#~ msgstr "<B>狀態:</B> %s<HR>%s"
-
-#~ msgid ""
-#~ "<i>Unable to display information because it was sent in an unknown "
-#~ "encoding.</i>"
-#~ msgstr "<I>因為使用了未知的編碼,所以無法顯示訊息。</i>"
-
-#~ msgid ""
-#~ "Username : <b>%s</b>  %s <br>\n"
-#~ "Warning Level : <b>%d %%</b><br>\n"
-#~ "%s%s%s\n"
-#~ "<hr>\n"
-#~ msgstr ""
-#~ "使用者名稱:<B>%s</B>  %s <BR>\n"
-#~ "警告等級:<B>%d %%</B><BR>\n"
-#~ "%s%s%s<BR>\n"
-#~ "<HR>\n"
-
-#~ msgid "<i>User has no away message</i>"
-#~ msgstr "<i>使用者沒有離開訊息</i>"
-
-#~ msgid "Client Capabilities: "
-#~ msgstr "客戶端相容性:"
-
-#~ msgid "<i>No Information Provided</i>"
-#~ msgstr "<i>未提供任何信息</i>"
-
-#~ msgid "Please talk to me, I'm lonely! (and single)"
-#~ msgstr "請和我聊聊吧!我覺得好寂寞!"
-
-#~ msgid "Gaim - Popup"
-#~ msgstr "Gaim - 訊息"
-
-#~ msgid "More Info"
-#~ msgstr "更多資訊"
-
-#~ msgid "_Quote window title"
-#~ msgstr "視窗標題前後加上引號(_Q)"
-
-#~ msgid "_Notify even if conversation is in focus"
-#~ msgstr "當這個交談取得輸入焦點時,依然執行通知的動作(_N)"
-
-#~ msgid "There was an error launching your chosen browser: %s"
-#~ msgstr "啟動您所選擇的瀏覽器時發生錯誤:%s"
-
-#~ msgid "ICQ Unknown"
-#~ msgstr "ICQ 未知"
-
-#~ msgid "<B>%s has the following screen names:</B><BR>"
-#~ msgstr "<B>%s 擁有下列的帳號:</B><BR>"
-
-#~ msgid ""
-#~ "Gaim is converting your old buddy lists to a new format, which will now "
-#~ "be located at %s"
-#~ msgstr "Gaim 正在轉換您的舊好友清單為新格式,同時將它存放於 %s"
-
-#~ msgid "Converting Buddy List"
-#~ msgstr "轉換好友清單中"
-
-#~ msgid "The plugin %s did not return any valid plugin information"
-#~ msgstr "這個模組 %s 並未傳回任何有效的模組訊息"
-
-#~ msgid "Couldn't open log file %s"
-#~ msgstr "無法開啟日誌檔 %s"
-
-#~ msgid "_Raise windows on events"
-#~ msgstr "當事件發生時,將視窗提到最上方(_R)"
-
-#~ msgid "Sign On"
-#~ msgstr "登入"
-
-#~ msgid "Unable to send USR\n"
-#~ msgstr "無法送出 USR\n"
-
-#~ msgid "Got invalid XFR\n"
-#~ msgstr "取得無效的 XFR\n"
-
-#~ msgid ""
-#~ "GAIM::register not called with proper arguments.  Consult PERL-HOWTO."
-#~ msgstr "GAIM::register 呼叫時並沒有提供適當的參數。請參考 PERL-HOWTO。"
-
-#~ msgid "has gone away."
-#~ msgstr "已經離開。"
-
-#~ msgid "has become idle."
-#~ msgstr "變更狀態為閒置。"
-
-#~ msgid "Deny all users"
-#~ msgstr "拒絕所有使用者"
-
-#~ msgid "Unblock %s?"
-#~ msgstr "解封 %s?"
-
-#~ msgid ""
-#~ "You are about to unblock %s. This will allow %s to speak to you again. Do "
-#~ "you want to continue?"
-#~ msgstr "您將要解封 %s;%s 將可再次對您說話。您要繼續這個動作嗎?"
-
-#~ msgid "Unblock"
-#~ msgstr "解封"
-
-#~ msgid ""
-#~ "You are about to block %s. This will prevent %s from speaking to you "
-#~ "again. Do you want to continue?"
-#~ msgstr "您將要封鎖 %s;%s 將不再能對您說話。您要繼續這個動作嗎?"
-
-#~ msgid "DCC Chat with %s closed"
-#~ msgstr "和 %s 的 DCC 聊天已關閉"
-
-#~ msgid "DCC Chat with %s established"
-#~ msgstr "和 %s 的 DCC 聊天已經被建立"
-
-#~ msgid "%ld seconds [signon: %s]"
-#~ msgstr "%ld 秒 [登入:%s]"
-
-#~ msgid "Rehashing server"
-#~ msgstr "重新設定伺服器中"
-
-#~ msgid "IRC Error"
-#~ msgstr "IRC 錯誤"
-
-#~ msgid "No such server"
-#~ msgstr "沒有那部伺服器"
-
-#~ msgid "No nickname given"
-#~ msgstr "沒有給予暱稱"
-
-#~ msgid "You're not an IRC operator!"
-#~ msgstr "您不是一個 IRC 操作者!"
-
-#~ msgid "That nick is already in use.  Please enter a new nick"
-#~ msgstr "這個暱稱已經在使用中。請輸入一個新的暱稱"
-
-#~ msgid "%s would like to establish a DCC chat"
-#~ msgstr "%s 想要建立一個 DCC 聊天"
-
-#~ msgid ""
-#~ "This requires a direct connection to be established between the two "
-#~ "computers.  Messages sent will not pass through the IRC server"
-#~ msgstr ""
-#~ "這個要求將會建立起兩部電腦間的連線,而訊息將不會透過 IRC 伺服器來進行傳送"
-
-#~ msgid "Received an invalid file send request from %s."
-#~ msgstr "收到一個來自於 %s 無效的檔案送出需求。"
-
-#~ msgid "CTCP UserInfo"
-#~ msgstr "CTCP 使用者資訊"
-
-#~ msgid "CTCP Version"
-#~ msgstr "CTCP 版本"
-
-#~ msgid "CTCP Ping"
-#~ msgstr "CTCP Ping"
-
-#~ msgid "You have left %s"
-#~ msgstr "您離開了 %s"
-
-#~ msgid "IRC Part"
-#~ msgstr "IRC 離開"
-
-#~ msgid "<I>Requesting DCC CHAT</I>"
-#~ msgstr "<I>要求 DCC 聊天中</I>"
-
-#~ msgid "DCC Chat"
-#~ msgstr "DCC 聊天"
-
-#~ msgid "User Identity"
-#~ msgstr "使用者識別"
-
-#~ msgid "Add Permit"
-#~ msgstr "加入許可"
-
-#~ msgid "Add Deny"
-#~ msgstr "加入拒絕"
-
-#~ msgid "_Alias:"
-#~ msgstr "別名(_A):"
-
-#~ msgid "Gaim Instant Messenger"
-#~ msgstr "Gaim"
-
-#~ msgid "Gaim Instant Messenger - Signed off"
-#~ msgstr "Gaim - 已登出"
-
-#~ msgid "Gaim Instant Messenger - Away"
-#~ msgstr "Gaim - 離開"
-
-#~ msgid "Unable to write to config file"
-#~ msgstr "無法寫入設定檔"
-
-#~ msgid "Notify plugin"
-#~ msgstr "通知模組"
-
-#~ msgid "Appl_y"
-#~ msgstr "套用(_Y)"
-
-#~ msgid "Enter your password."
-#~ msgstr "請輸入您的密碼。"
-
-#~ msgid ""
-#~ "%s\n"
-#~ "%s: %s"
-#~ msgstr ""
-#~ "%s\n"
-#~ "%s: %s"
-
-#~ msgid "%s was unable to sign on"
-#~ msgstr "%s 無法登入"
-
-#~ msgid "Signon Error"
-#~ msgstr "登入錯誤"
-
-#~ msgid "Notice"
-#~ msgstr "通知"
-
-#~ msgid "New"
-#~ msgstr "新訊息"
-
-#~ msgid "Set Away Message"
-#~ msgstr "設定離開訊息"
-
-#~ msgid "I'm Back"
-#~ msgstr "我回來了!"
-
-#~ msgid "Exit"
-#~ msgstr "離開"
-
-#~ msgid "Pager Host:"
-#~ msgstr "傳呼系統伺服器:"
-
-#~ msgid "Pager Port:"
-#~ msgstr "傳呼系統通訊埠:"
-
-#~ msgid "Rename Buddy"
-#~ msgstr "修改好友名稱"
-
-#~ msgid "Control-_W closes window"
-#~ msgstr "按下 Ctrl-W 關閉視窗(_W)"
-
-#~ msgid "Gaim - Save Image"
-#~ msgstr "Gaim - 儲存影像"
-
-#~ msgid ""
-#~ "You do not currently have any protocols available that are able to "
-#~ "register new accounts."
-#~ msgstr "您的系統中並未存在任何可供您註冊一個新帳號的通訊協定。"
-
-#~ msgid "Gaim - Registration"
-#~ msgstr "Gaim - 註冊"
-
-#~ msgid "Registration Information"
-#~ msgstr "註冊資訊"
-
-#~ msgid "Register with your server"
-#~ msgstr "向伺服器註冊"
-
-#~ msgid "File Transfers..."
-#~ msgstr "檔案傳輸"
-
-#~ msgid "Accounts..."
-#~ msgstr "帳號清單"
-
-#~ msgid "Preferences..."
-#~ msgstr "偏好設定"
-
-#~ msgid "Unable to Save Preferences"
-#~ msgstr "無法儲存偏好設定"
-
-#~ msgid ""
-#~ "Gaim was unable to save your preferences. Please verify that you have "
-#~ "enough free space."
-#~ msgstr "Gaim 無法寫入您的偏好設定。請確認您擁有足夠的磁碟空間。"
-
-#~ msgid "Hide buddy _icons"
-#~ msgstr "隱藏好友圖示(_I)"
-
-#~ msgid "IM Tabs"
-#~ msgstr "即時訊息標籤"
-
-#~ msgid ""
-#~ "Show all _instant messages in one tabbed\n"
-#~ "window"
-#~ msgstr "將所有的即時訊息顯示在同一個有標籤的視窗中(_I)"
-
-#~ msgid "Chat Tabs"
-#~ msgstr "聊天室標籤"
-
-#~ msgid "Show all c_hats in one tabbed window"
-#~ msgstr "將所有的聊天顯示在同一個有標籤的視窗中(_H)"
-
-#~ msgid "Tabs"
-#~ msgstr "標籤"
-
-#~ msgid "Load Buddy Icon"
-#~ msgstr "讀取好友圖示"
-
-#~ msgid "Proxy _Type"
-#~ msgstr "代理伺服器型態(_T)"
-
-#~ msgid "_Login"
-#~ msgstr "登入(_L)"
-
-#~ msgid "TOC not found."
-#~ msgstr "找不到 TOC。"
-
-#~ msgid ""
-#~ "You have attempted to login an IM account using the TOC protocol.  "
-#~ "Because this protocol is inferior to OSCAR, it is now compiled as a "
-#~ "plugin by default. To login, edit this account to use OSCAR or load the "
-#~ "TOC plugin."
-#~ msgstr ""
-#~ "您試著使用 TOC 協定來登入即時訊息的帳號。因為這個協定比 OSCAR 要來的差,所"
-#~ "以現在預設只被編譯為一個模組。如果要用這個來登入帳號,請將您的帳號改為使"
-#~ "用 OSCAR 或載入 TOC 模組。"
-
-#~ msgid "Protocol not found."
-#~ msgstr "找不到通訊協定。"
-
-#~ msgid ""
-#~ "You cannot log this account in; you do not have the protocol it uses "
-#~ "loaded, or the protocol does not have a login function."
-#~ msgstr ""
-#~ "您無法使用這個帳號來登入;您可能沒有設定這個帳號所使用的協定,或者這個協定"
-#~ "並沒有提供登入的功能。"
-
-#~ msgid "Account Editor"
-#~ msgstr "帳號清單"