diff po/en_GB.po @ 11274:67a929d50cfe

[gaim-migrate @ 13459] commit the make dist changes to po files, as otherwise it takes 15 minutes to process them (and a minute amount of time after the first attempt) committer: Tailor Script <tailor@pidgin.im>
author Luke Schierer <lschiere@pidgin.im>
date Mon, 15 Aug 2005 16:22:25 +0000
parents e099f00b2f93
children 4be6232ffcd3
line wrap: on
line diff
--- a/po/en_GB.po	Mon Aug 15 16:18:00 2005 +0000
+++ b/po/en_GB.po	Mon Aug 15 16:22:25 2005 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: Gaim 0.73\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-12-02 18:38-0500\n"
+"POT-Creation-Date: 2005-08-15 12:01-0400\n"
 "PO-Revision-Date: 2004-01-14 12:26+0000\n"
 "Last-Translator: Luke Ross <lukeross@sys3175.co.uk>\n"
 "Language-Team:  <en_GB@li.org>\n"
@@ -16,19 +16,19 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n>1;\n"
 
-#: plugins/autorecon.c:276
+#: plugins/autorecon.c:291
 msgid "Error Message Suppression"
 msgstr "Error Message Suppression"
 
-#: plugins/autorecon.c:280
+#: plugins/autorecon.c:295
 msgid "Hide Disconnect Errors"
 msgstr "Hide Disconnect Errors"
 
-#: plugins/autorecon.c:284
+#: plugins/autorecon.c:299
 msgid "Hide Login Errors"
 msgstr "Hide Login Errors"
 
-#: plugins/autorecon.c:288
+#: plugins/autorecon.c:303
 #, fuzzy
 msgid "Hide Reconnecting Dialog"
 msgstr "Hide Disconnect Errors"
@@ -39,7 +39,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/autorecon.c:312
+#: plugins/autorecon.c:327
 msgid "Auto-Reconnect"
 msgstr "Auto-Reconnect"
 
@@ -47,27 +47,10 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/autorecon.c:315 plugins/autorecon.c:317
+#: plugins/autorecon.c:330 plugins/autorecon.c:332
 msgid "When you are kicked offline, this reconnects you."
 msgstr "When you are kicked offline, this reconnects you."
 
-#: plugins/chkmail.c:94 plugins/chkmail.c:117 plugins/chkmail.c:126
-msgid "Mail Server"
-msgstr "Mail Server"
-
-#: plugins/chkmail.c:136
-#, c-format
-msgid "%s (%d new/%d total)"
-msgstr "%s (%d new/%d total)"
-
-#: plugins/chkmail.c:199
-msgid "Check Mail"
-msgstr "Check Mail"
-
-#: plugins/chkmail.c:203
-msgid "Check email every X seconds.\n"
-msgstr "Check email every X seconds.\n"
-
 #: plugins/contact_priority.c:84
 msgid "Point values to use when..."
 msgstr "Point values to use when..."
@@ -90,12 +73,13 @@
 
 #. Explanation
 #: plugins/contact_priority.c:141
+#, fuzzy
 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."
+"The default values (offline = 4, away = 2, and idle = 1) will use what used "
+"to be\n"
+"the built-in order: active, idle, away, away + idle, offline."
 msgstr ""
 "The buddy with the lowest score is the buddy who will have priority in the "
 "contact.\n"
@@ -104,7 +88,8 @@
 ">offline."
 
 #: plugins/contact_priority.c:144
-msgid "Point values to use for Account..."
+#, fuzzy
+msgid "Point values to use for account..."
 msgstr "Point values to use for Account..."
 
 #. *< type
@@ -150,68 +135,60 @@
 msgid "Gaim - Away"
 msgstr "Gaim - Away"
 
-#: plugins/docklet/docklet.c:140
-msgid "Auto-login"
-msgstr "Auto-login"
-
-#: plugins/docklet/docklet.c:143
+#: plugins/docklet/docklet.c:136
 msgid "New Message..."
 msgstr "New Message..."
 
-#: plugins/docklet/docklet.c:144
+#: plugins/docklet/docklet.c:137
 msgid "Join A Chat..."
 msgstr "Join A Chat..."
 
-#: plugins/docklet/docklet.c:181
+#: plugins/docklet/docklet.c:172
 msgid "New..."
 msgstr "New..."
 
-#: plugins/docklet/docklet.c:189 src/gtkprefs.c:1760 src/protocols/gg/gg.c:52
-#: src/protocols/irc/irc.c:169 src/protocols/irc/msgs.c:189
-#: src/protocols/jabber/buddy.c:1074 src/protocols/jabber/jabber.c:987
-#: src/protocols/msn/msn.c:542 src/protocols/novell/novell.c:2811
-#: src/protocols/novell/novell.c:2928 src/protocols/novell/novell.c:2980
-#: src/protocols/oscar/oscar.c:677 src/protocols/oscar/oscar.c:5592
-#: src/protocols/oscar/oscar.c:6662 src/protocols/oscar/oscar.c:6883
-#: src/protocols/silc/buddy.c:1384 src/protocols/silc/silc.c:52
-#: src/protocols/yahoo/yahoo.c:3167 src/protocols/zephyr/zephyr.c:2225
+#: plugins/docklet/docklet.c:176 src/gtkprefs.c:1757 src/gtkstatusbox.c:247
+#: src/protocols/gg/gg.c:52 src/protocols/irc/irc.c:180
+#: src/protocols/irc/msgs.c:222 src/protocols/jabber/buddy.c:1089
+#: src/protocols/jabber/jabber.c:1000 src/protocols/msn/msn.c:538
+#: src/protocols/novell/novell.c:2813 src/protocols/novell/novell.c:2951
+#: src/protocols/novell/novell.c:3039 src/protocols/oscar/oscar.c:698
+#: src/protocols/oscar/oscar.c:5868 src/protocols/oscar/oscar.c:6906
+#: src/protocols/oscar/oscar.c:7063 src/protocols/silc/buddy.c:1412
+#: src/protocols/silc/silc.c:54 src/protocols/yahoo/yahoo.c:3214
+#: src/protocols/zephyr/zephyr.c:2259 src/status.c:159
 msgid "Away"
 msgstr "Away"
 
-#: plugins/docklet/docklet.c:197
+#: plugins/docklet/docklet.c:184
 msgid "Back"
 msgstr "Back"
 
-#: plugins/docklet/docklet.c:206
+#: plugins/docklet/docklet.c:191
 msgid "Mute Sounds"
 msgstr "Mute Sounds"
 
-#: plugins/docklet/docklet.c:213 src/gtkft.c:628
+#: plugins/docklet/docklet.c:198 src/gtkft.c:694
 msgid "File Transfers"
 msgstr "File Transfers"
 
-#: plugins/docklet/docklet.c:214 src/gtkaccount.c:2345
+#: plugins/docklet/docklet.c:199 src/gtkaccount.c:2327
 msgid "Accounts"
 msgstr "Accounts"
 
-#: plugins/docklet/docklet.c:215 src/gtkprefs.c:2263
+#: plugins/docklet/docklet.c:200 src/gtkprefs.c:2144
 msgid "Preferences"
 msgstr "Preferences"
 
-#: plugins/docklet/docklet.c:224
-#, fuzzy
-msgid "Log Out"
-msgstr "Logged out"
-
-#: plugins/docklet/docklet.c:228
+#: plugins/docklet/docklet.c:204
 msgid "Quit"
 msgstr "Quit"
 
-#: plugins/docklet/docklet.c:553
+#: plugins/docklet/docklet.c:529
 msgid "Tray Icon Configuration"
 msgstr "Tray Icon Configuration"
 
-#: plugins/docklet/docklet.c:557
+#: plugins/docklet/docklet.c:533
 msgid "_Hide new messages until tray icon is clicked"
 msgstr "_Hide new messages until tray icon is clicked"
 
@@ -221,19 +198,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/docklet/docklet.c:583
+#: plugins/docklet/docklet.c:559
 msgid "System Tray Icon"
 msgstr "System Tray Icon"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/docklet/docklet.c:586
+#: plugins/docklet/docklet.c:562
 msgid "Displays an icon for Gaim in the system tray."
 msgstr "Displays an icon for Gaim in the system tray."
 
 #. *  description
-#: plugins/docklet/docklet.c:588
+#: plugins/docklet/docklet.c:564
 msgid ""
 "Displays a system tray icon (in GNOME, KDE or Windows for example) to show "
 "the current status of Gaim, allow fast access to commonly used functions, "
@@ -293,7 +270,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/filectl.c:249
+#: plugins/filectl.c:245
 msgid "Gaim File Control"
 msgstr "Gaim File Control"
 
@@ -301,7 +278,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/filectl.c:252 plugins/filectl.c:254
+#: plugins/filectl.c:248 plugins/filectl.c:250
 msgid "Allows you to control Gaim by entering commands in a file."
 msgstr "Allows you to control Gaim by entering commands in a file."
 
@@ -321,7 +298,7 @@
 msgid "Invalid AIM URI"
 msgstr "Invalid AIM URI"
 
-#: plugins/gaim-remote/remote.c:742
+#: plugins/gaim-remote/remote.c:750
 #, c-format
 msgid ""
 "Failed to assign %s to a socket:\n"
@@ -330,7 +307,7 @@
 "Failed to assign %s to a socket:\n"
 "%s"
 
-#: plugins/gaim-remote/remote.c:765
+#: plugins/gaim-remote/remote.c:774
 msgid "Unable to open socket"
 msgstr "Unable to open socket"
 
@@ -340,19 +317,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/gaim-remote/remote.c:815
+#: plugins/gaim-remote/remote.c:824
 msgid "Remote Control"
 msgstr "Remote Control"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/gaim-remote/remote.c:818
+#: plugins/gaim-remote/remote.c:827
 msgid "Provides remote control for gaim applications."
 msgstr "Provides remote control for gaim applications."
 
 #. *  description
-#: plugins/gaim-remote/remote.c:820
+#: plugins/gaim-remote/remote.c:829
 msgid ""
 "Gives Gaim the ability to be remote-controlled through third-party "
 "applications or through the gaim-remote tool."
@@ -390,21 +367,102 @@
 "- It reverses all incoming text\n"
 "- It sends a message to people on your list immediately when they sign on"
 
+#: plugins/gaimrc.c:40
+msgid "Cursor Color"
+msgstr ""
+
+#: plugins/gaimrc.c:41
+msgid "Secondary Cursor Color"
+msgstr ""
+
+#: plugins/gaimrc.c:42
+#, fuzzy
+msgid "Hyperlink Color"
+msgstr "Hyperlink colour"
+
+#: plugins/gaimrc.c:53
+#, fuzzy
+msgid "GtkTreeView Expander Size"
+msgstr "Expander Size"
+
+#: plugins/gaimrc.c:72
+#, fuzzy
+msgid "Conversation Entry"
+msgstr "Conversations"
+
+#: plugins/gaimrc.c:73
+#, fuzzy
+msgid "Conversation History"
+msgstr "Conversations"
+
+#: plugins/gaimrc.c:74
+#, fuzzy
+msgid "Log Viewer"
+msgstr "Login server"
+
+#: plugins/gaimrc.c:75
+#, fuzzy
+msgid "Request Dialog"
+msgstr "Request ambiguous"
+
+#: plugins/gaimrc.c:76
+#, fuzzy
+msgid "Notify Dialog"
+msgstr "Notify For"
+
+#: plugins/gaimrc.c:209
+#, fuzzy, c-format
+msgid "Select Color for %s"
+msgstr "Select Text Colour"
+
+#: plugins/gaimrc.c:211
+#, fuzzy
+msgid "Select Color"
+msgstr "Select Text Colour"
+
+#: plugins/gaimrc.c:246
+#, fuzzy, c-format
+msgid "Select Font for %s"
+msgstr "Select Font"
+
+#: plugins/gaimrc.c:284
+#, fuzzy
+msgid "Select Interface Font"
+msgstr "Select Font"
+
+#: plugins/gaimrc.c:343
+#, fuzzy
+msgid "GTK+ Interface Font"
+msgstr "Interface Options"
+
+#: plugins/gaimrc.c:362
+msgid "GTK+ Text Shortcut Theme"
+msgstr ""
+
+#: plugins/gaimrc.c:460
+#, fuzzy
+msgid "Gaim GTK+ Theme Control"
+msgstr "Gaim File Control"
+
+#: plugins/gaimrc.c:462 plugins/gaimrc.c:463
+msgid "Provides access to commonly used gtkrc settings."
+msgstr ""
+
 #. Configuration frame
-#: plugins/gestures/gestures.c:221
+#: plugins/gestures/gestures.c:241
 msgid "Mouse Gestures Configuration"
 msgstr "Mouse Gestures Configuration"
 
-#: plugins/gestures/gestures.c:228
+#: plugins/gestures/gestures.c:248
 msgid "Middle mouse button"
 msgstr "Middle mouse button"
 
-#: plugins/gestures/gestures.c:233
+#: plugins/gestures/gestures.c:253
 msgid "Right mouse button"
 msgstr "Right mouse button"
 
 #. "Visual gesture display" checkbox
-#: plugins/gestures/gestures.c:245
+#: plugins/gestures/gestures.c:265
 msgid "_Visual gesture display"
 msgstr "_Visual gesture display"
 
@@ -414,19 +472,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/gestures/gestures.c:274
+#: plugins/gestures/gestures.c:294
 msgid "Mouse Gestures"
 msgstr "Mouse Gestures"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/gestures/gestures.c:277
+#: plugins/gestures/gestures.c:297
 msgid "Provides support for mouse gestures"
 msgstr "Provides support for mouse gestures"
 
 #. *  description
-#: plugins/gestures/gestures.c:279
+#: plugins/gestures/gestures.c:299
 msgid ""
 "Allows support for mouse gestures in conversation windows.\n"
 "Drag the middle mouse button to perform certain actions:\n"
@@ -443,9 +501,9 @@
 "Drag up and then to the right to switch to the next conversation."
 
 #: plugins/gevolution/add_buddy_dialog.c:132
-#: plugins/gevolution/assoc-buddy.c:120 src/gtkprefs.c:2080
-#: src/gtkroomlist.c:553 src/protocols/jabber/jabber.c:606
-#: src/protocols/msn/msn.c:1501 src/protocols/trepia/trepia.c:399
+#: plugins/gevolution/assoc-buddy.c:120 src/gtkprefs.c:2003
+#: src/gtkroomlist.c:553 src/protocols/jabber/jabber.c:613
+#: src/protocols/msn/msn.c:1494 src/protocols/trepia/trepia.c:399
 msgid "Name"
 msgstr "Name"
 
@@ -454,30 +512,30 @@
 msgstr "Instant Messaging"
 
 #. Add the label.
-#: plugins/gevolution/add_buddy_dialog.c:455
+#: plugins/gevolution/add_buddy_dialog.c:459
 msgid "Select a person from your address book below, or add a new person."
 msgstr "Select a person from your address book below, or add a new person."
 
 #. "Search"
-#: plugins/gevolution/add_buddy_dialog.c:468
-#: plugins/gevolution/assoc-buddy.c:354 src/protocols/oscar/oscar.c:7189
+#: plugins/gevolution/add_buddy_dialog.c:472
+#: plugins/gevolution/assoc-buddy.c:354 src/protocols/oscar/oscar.c:7427
 msgid "Search"
 msgstr "Search"
 
-#: plugins/gevolution/add_buddy_dialog.c:549
-#: plugins/gevolution/new_person_dialog.c:304 src/gtkblist.c:4053
-#: src/gtkblist.c:4402
+#: plugins/gevolution/add_buddy_dialog.c:553
+#: plugins/gevolution/new_person_dialog.c:306 src/gtkblist.c:4400
+#: src/gtkblist.c:4777
 msgid "Group:"
 msgstr "Group:"
 
 #. "New Person" button
-#: plugins/gevolution/add_buddy_dialog.c:575
+#: plugins/gevolution/add_buddy_dialog.c:579
 #: plugins/gevolution/assoc-buddy.c:466
 msgid "New Person"
 msgstr "New Person"
 
 #. "Select Buddy" button
-#: plugins/gevolution/add_buddy_dialog.c:592
+#: plugins/gevolution/add_buddy_dialog.c:596
 msgid "Select Buddy"
 msgstr "Select Buddy"
 
@@ -504,27 +562,45 @@
 msgid "_Associate Buddy"
 msgstr "_Associate Buddy"
 
-#: plugins/gevolution/gevo-util.c:64 plugins/gevolution/gevolution.c:90
-#: src/blist.c:775 src/blist.c:982 src/blist.c:1933 src/gtkblist.c:3873
+#: plugins/gevolution/gevo-util.c:64 plugins/gevolution/gevolution.c:96
+#: src/blist.c:518 src/blist.c:1242 src/blist.c:1458 src/gtkblist.c:4217
 #: src/protocols/jabber/roster.c:66
 msgid "Buddies"
 msgstr "Buddies"
 
-#: plugins/gevolution/gevolution.c:221
+#: plugins/gevolution/gevolution.c:262 plugins/gevolution/gevolution.c:268
+#, fuzzy
+msgid "Unable to send e-mail"
+msgstr "Unable to send message."
+
+#: plugins/gevolution/gevolution.c:263
+msgid "The evolution executable was not found in the PATH."
+msgstr ""
+
+#: plugins/gevolution/gevolution.c:269
+msgid "The specified buddy was not found in the Evolution Contacts."
+msgstr ""
+
+#: plugins/gevolution/gevolution.c:286
 msgid "Add to Address Book"
 msgstr "Add to Address Book"
 
+#: plugins/gevolution/gevolution.c:290
+#, fuzzy
+msgid "Send E-Mail"
+msgstr "E-Mail"
+
 #. Configuration frame
-#: plugins/gevolution/gevolution.c:344
+#: plugins/gevolution/gevolution.c:414
 msgid "Evolution Integration Configuration"
 msgstr "Evolution Integration Configuration"
 
 #. Label
-#: plugins/gevolution/gevolution.c:347
+#: plugins/gevolution/gevolution.c:417
 msgid "Select all accounts that buddies should be auto-added to."
 msgstr "Select all accounts that buddies should be auto-added to."
 
-#: plugins/gevolution/gevolution.c:377 plugins/idle.c:52 src/gtkconn.c:626
+#: plugins/gevolution/gevolution.c:447 plugins/idle.c:52 src/gtkconn.c:431
 msgid "Account"
 msgstr "Account"
 
@@ -534,7 +610,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/gevolution/gevolution.c:460
+#: plugins/gevolution/gevolution.c:530
 msgid "Evolution Integration"
 msgstr "Evolution Integration"
 
@@ -542,64 +618,79 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/gevolution/gevolution.c:463 plugins/gevolution/gevolution.c:465
-msgid "Provides integration with Ximian Evolution."
+#: plugins/gevolution/gevolution.c:533 plugins/gevolution/gevolution.c:535
+#, fuzzy
+msgid "Provides integration with Evolution."
 msgstr "Provides integration with Ximian Evolution."
 
-#: plugins/gevolution/new_person_dialog.c:264
+#: plugins/gevolution/new_person_dialog.c:266
 msgid "Please enter the person's information below."
 msgstr "Please enter the person's information below."
 
-#: plugins/gevolution/new_person_dialog.c:268
+#: plugins/gevolution/new_person_dialog.c:270
 msgid "Please enter the buddy's screen name and account type below."
 msgstr "Please enter the buddy's screen name and account type below."
 
-#: plugins/gevolution/new_person_dialog.c:288
+#: plugins/gevolution/new_person_dialog.c:290
 msgid "Account type:"
 msgstr "Account type:"
 
-#: plugins/gevolution/new_person_dialog.c:292
+#: plugins/gevolution/new_person_dialog.c:294
 msgid "Screenname:"
 msgstr "Screenname:"
 
 #. Optional Information section
-#: plugins/gevolution/new_person_dialog.c:312
+#: plugins/gevolution/new_person_dialog.c:314
 msgid "Optional information:"
 msgstr "Optional information"
 
 #. Label
-#: plugins/gevolution/new_person_dialog.c:335 src/gtkaccount.c:372
-#: src/gtkaccount.c:402 src/protocols/oscar/oscar.c:583
+#: plugins/gevolution/new_person_dialog.c:337 src/gtkaccount.c:395
+#: src/gtkaccount.c:417 src/protocols/oscar/oscar.c:604
 msgid "Buddy Icon"
 msgstr "Buddy Icon"
 
-#: plugins/gevolution/new_person_dialog.c:347
+#: plugins/gevolution/new_person_dialog.c:349
 msgid "First name:"
 msgstr "First name:"
 
-#: plugins/gevolution/new_person_dialog.c:359
+#: plugins/gevolution/new_person_dialog.c:361
 msgid "Last name:"
 msgstr "Last name:"
 
-#: plugins/gevolution/new_person_dialog.c:379
+#: plugins/gevolution/new_person_dialog.c:381
 msgid "E-mail:"
 msgstr "E-mail:"
 
-#: plugins/history.c:92
+#: plugins/history.c:137
+msgid "History Plugin Requires Logging"
+msgstr ""
+
+#: plugins/history.c:138
+msgid ""
+"Logging can be enabled from Tools -> Preferences -> Logging.\n"
+"\n"
+"Enabling logs for instant messages and/or chats will activate history for "
+"the same conversation type(s)."
+msgstr ""
+
+#: plugins/history.c:177
 msgid "History"
 msgstr "History"
 
-#: plugins/history.c:94
+#: plugins/history.c:179
 msgid "Shows recently logged conversations in new conversations."
 msgstr "Shows recently logged conversations in new conversations."
 
-#: plugins/history.c:95
+#: plugins/history.c:180
 msgid ""
 "When a new conversation is opened this plugin will insert the last "
-"conversation into the current conversation."
-msgstr ""
-"When a new conversation is opened this plugin will insert the last "
-"conversation into the current conversation."
+"conversation into the current conversation.\n"
+"\n"
+"The history plugin requires logging be enabled. Logging can be enabled from "
+"Tools -> Preferences -> Logging. Enabling logs for instant messages and/or "
+"chats will activate history for the same conversation type(s)."
+msgstr ""
 
 #. *< type
 #. *< ui_requirement
@@ -623,7 +714,7 @@
 msgid "Minutes"
 msgstr "Minutes"
 
-#: plugins/idle.c:63 plugins/idle.c:98
+#: plugins/idle.c:63 plugins/idle.c:97
 msgid "I'dle Mak'er"
 msgstr "I'dle Mak'er"
 
@@ -639,7 +730,7 @@
 msgid "_Cancel"
 msgstr "_Cancel"
 
-#: plugins/idle.c:100 plugins/idle.c:101
+#: plugins/idle.c:99 plugins/idle.c:100
 msgid "Allows you to hand-configure how long you've been idle for"
 msgstr "Allows you to hand-configure how long you've been idle for"
 
@@ -704,68 +795,74 @@
 msgstr "Adds a small box to the buddy list that shows if you have new mail."
 
 #. ---------- "Notify For" ----------
-#: plugins/notify.c:599
+#: plugins/notify.c:642
 msgid "Notify For"
 msgstr "Notify For"
 
-#: plugins/notify.c:603
+#: plugins/notify.c:646
 msgid "_IM windows"
 msgstr "_IM windows"
 
-#: plugins/notify.c:610
+#: plugins/notify.c:653
 msgid "C_hat windows"
 msgstr "C_hat windows"
 
-#: plugins/notify.c:617
+#: plugins/notify.c:660
 msgid "_Focused windows"
 msgstr "_Focused windows"
 
 #. ---------- "Notification Methods" ----------
-#: plugins/notify.c:625
+#: plugins/notify.c:668
 msgid "Notification Methods"
 msgstr "Notification Methods"
 
-#: plugins/notify.c:632
+#: plugins/notify.c:675
 msgid "Prepend _string into window title:"
 msgstr "Prepend _string into window title:"
 
 #. Count method button
-#: plugins/notify.c:651
+#: plugins/notify.c:694
 msgid "Insert c_ount of new messages into window title"
 msgstr "Insert c_ount of new messages into window title"
 
 #. Urgent method button
-#: plugins/notify.c:659
+#: plugins/notify.c:702
 msgid "Set window manager \"_URGENT\" hint"
 msgstr "Set window manager \"_URGENT\" hint"
 
+#. Raise window method button
+#: plugins/notify.c:710
+#, fuzzy
+msgid "R_aise conversation window"
+msgstr "IM Conversation Windows"
+
 #. ---------- "Notification Removals" ----------
-#: plugins/notify.c:667
+#: plugins/notify.c:718
 msgid "Notification Removal"
 msgstr "Notification Removal"
 
 #. Remove on focus button
-#: plugins/notify.c:672
+#: plugins/notify.c:723
 msgid "Remove when conversation window _gains focus"
 msgstr "Remove when conversation window _gains focus"
 
 #. Remove on click button
-#: plugins/notify.c:679
+#: plugins/notify.c:730
 msgid "Remove when conversation window _receives click"
 msgstr "Remove when conversation window _receives click"
 
 #. Remove on type button
-#: plugins/notify.c:687
+#: plugins/notify.c:738
 msgid "Remove when _typing in conversation window"
 msgstr "Remove when _typing in conversation window"
 
 #. Remove on message send button
-#: plugins/notify.c:695
+#: plugins/notify.c:746
 msgid "Remove when a _message gets sent"
 msgstr "Remove when a _message gets sent"
 
 #. Remove on conversation switch button
-#: plugins/notify.c:704
+#: plugins/notify.c:755
 msgid "Remove on switch to conversation ta_b"
 msgstr "Remove on switch to conversation ta_b"
 
@@ -775,7 +872,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/notify.c:794
+#: plugins/notify.c:845
 msgid "Message Notification"
 msgstr "Message Notification"
 
@@ -783,7 +880,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/notify.c:797 plugins/notify.c:799
+#: plugins/notify.c:848 plugins/notify.c:850
 msgid "Provides a variety of ways of notifying you of unread messages."
 msgstr "Provides a variety of ways of notifying you of unread messages."
 
@@ -793,26 +890,26 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/perl/perl.c:535
+#: plugins/perl/perl.c:567
 msgid "Perl Plugin Loader"
 msgstr "Perl Plugin Loader"
 
 #. *< name
 #. *< version
 #. *< summary
-#: plugins/perl/perl.c:537 plugins/perl/perl.c:538
+#: plugins/perl/perl.c:569 plugins/perl/perl.c:570
 msgid "Provides support for loading perl plugins."
 msgstr "Provides support for loading perl plugins."
 
-#: plugins/raw.c:149
+#: plugins/raw.c:151
 msgid "Raw"
 msgstr "Raw"
 
-#: plugins/raw.c:151
+#: plugins/raw.c:153
 msgid "Lets you send raw input to text-based protocols."
 msgstr "Lets you send raw input to text-based protocols."
 
-#: plugins/raw.c:152
+#: plugins/raw.c:154
 msgid ""
 "Lets you send raw input to text-based protocols (Jabber, MSN, IRC, TOC). Hit "
 "'Enter' in the entry box to send. Watch the debug window."
@@ -879,7 +976,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/signals-test.c:585
+#: plugins/signals-test.c:626
 msgid "Signals Test"
 msgstr "Signals Test"
 
@@ -887,7 +984,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/signals-test.c:588 plugins/signals-test.c:590
+#: plugins/signals-test.c:629 plugins/signals-test.c:631
 msgid "Test to see that all signals are working properly."
 msgstr "Test to see that all signals are working properly."
 
@@ -909,35 +1006,43 @@
 msgid "Tests to see that most things are working."
 msgstr "Tests to see that most things are working."
 
-#: plugins/spellchk.c:415
+#: plugins/spellchk.c:1680
+msgid "Duplicate Correction"
+msgstr ""
+
+#: plugins/spellchk.c:1681
+msgid "The specified word already exists in the correction list."
+msgstr ""
+
+#: plugins/spellchk.c:1826
 msgid "Text Replacements"
 msgstr "Text Replacements"
 
-#: plugins/spellchk.c:439
+#: plugins/spellchk.c:1850
 msgid "You type"
 msgstr "You type"
 
-#: plugins/spellchk.c:451
+#: plugins/spellchk.c:1862
 msgid "You send"
 msgstr "You send"
 
-#: plugins/spellchk.c:477
+#: plugins/spellchk.c:1888
 msgid "Add a new text replacement"
 msgstr "Add a new text replacement"
 
-#: plugins/spellchk.c:484
+#: plugins/spellchk.c:1895
 msgid "You _type:"
 msgstr "You _type:"
 
-#: plugins/spellchk.c:498
+#: plugins/spellchk.c:1909
 msgid "You _send:"
 msgstr "You _send:"
 
-#: plugins/spellchk.c:540
+#: plugins/spellchk.c:1951
 msgid "Text replacement"
 msgstr "Text replacement"
 
-#: plugins/spellchk.c:542 plugins/spellchk.c:543
+#: plugins/spellchk.c:1953 plugins/spellchk.c:1954
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr "Replaces text in outgoing messages according to user-defined rules."
 
@@ -947,7 +1052,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/ssl/ssl-gnutls.c:226
+#: plugins/ssl/ssl-gnutls.c:227
 msgid "GNUTLS"
 msgstr "GNUTLS"
 
@@ -955,7 +1060,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/ssl/ssl-gnutls.c:229 plugins/ssl/ssl-gnutls.c:231
+#: plugins/ssl/ssl-gnutls.c:230 plugins/ssl/ssl-gnutls.c:232
 msgid "Provides SSL support through GNUTLS."
 msgstr "Provides SSL support through GNUTLS."
 
@@ -965,7 +1070,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/ssl/ssl-nss.c:318
+#: plugins/ssl/ssl-nss.c:319
 msgid "NSS"
 msgstr "NSS"
 
@@ -973,7 +1078,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/ssl/ssl-nss.c:321 plugins/ssl/ssl-nss.c:323
+#: plugins/ssl/ssl-nss.c:322 plugins/ssl/ssl-nss.c:324
 msgid "Provides SSL support through Mozilla NSS."
 msgstr "Provides SSL support through Mozilla NSS."
 
@@ -1075,19 +1180,19 @@
 msgid "A horizontal scrolling version of the buddy list."
 msgstr "A horizontal scrolling version of the buddy list."
 
-#: plugins/timestamp.c:183
+#: plugins/timestamp.c:202
 msgid "iChat Timestamp"
 msgstr "iChat Timestamp"
 
-#: plugins/timestamp.c:190
+#: plugins/timestamp.c:209
 msgid "Delay"
 msgstr "Delay"
 
-#: plugins/timestamp.c:197
+#: plugins/timestamp.c:216
 msgid "minutes."
 msgstr "minutes."
 
-#: plugins/timestamp.c:203
+#: plugins/timestamp.c:222
 msgid "_Apply"
 msgstr "_Apply"
 
@@ -1097,7 +1202,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/timestamp.c:268
+#: plugins/timestamp.c:287
 msgid "Timestamp"
 msgstr "Timestamp"
 
@@ -1105,35 +1210,35 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/timestamp.c:271 plugins/timestamp.c:273
+#: plugins/timestamp.c:290 plugins/timestamp.c:292
 msgid "Adds iChat-style timestamps to conversations every N minutes."
 msgstr "Adds iChat-style timestamps to conversations every N minutes."
 
 #: plugins/win32/transparency/win2ktrans.c:134
-#: plugins/win32/transparency/win2ktrans.c:404
-#: plugins/win32/transparency/win2ktrans.c:435
+#: plugins/win32/transparency/win2ktrans.c:413
+#: plugins/win32/transparency/win2ktrans.c:444
 msgid "Opacity:"
 msgstr "Opacity:"
 
 #. IM Convo trans options
-#: plugins/win32/transparency/win2ktrans.c:385
+#: plugins/win32/transparency/win2ktrans.c:394
 msgid "IM Conversation Windows"
 msgstr "IM Conversation Windows"
 
-#: plugins/win32/transparency/win2ktrans.c:386
+#: plugins/win32/transparency/win2ktrans.c:395
 msgid "_IM window transparency"
 msgstr "_IM window transparency"
 
-#: plugins/win32/transparency/win2ktrans.c:396
+#: plugins/win32/transparency/win2ktrans.c:405
 msgid "_Show slider bar in IM window"
 msgstr "_Show slider bar in IM window"
 
 #. Buddy List trans options
-#: plugins/win32/transparency/win2ktrans.c:421
+#: plugins/win32/transparency/win2ktrans.c:430
 msgid "Buddy List Window"
 msgstr "Buddy List Window"
 
-#: plugins/win32/transparency/win2ktrans.c:422
+#: plugins/win32/transparency/win2ktrans.c:431
 msgid "_Buddy List window transparency"
 msgstr "_Buddy List window transparency"
 
@@ -1143,19 +1248,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/win32/transparency/win2ktrans.c:480
+#: plugins/win32/transparency/win2ktrans.c:489
 msgid "Transparency"
 msgstr "Transparency"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/win32/transparency/win2ktrans.c:483
+#: plugins/win32/transparency/win2ktrans.c:492
 msgid "Variable Transparency for the buddy list and conversations."
 msgstr "Variable Transparency for the buddy list and conversations."
 
 #. *  description
-#: plugins/win32/transparency/win2ktrans.c:485
+#: plugins/win32/transparency/win2ktrans.c:494
 msgid ""
 "This plugin enables variable alpha transparency on conversation windows and "
 "the buddy list.\n"
@@ -1167,153 +1272,210 @@
 "\n"
 "* Note: This plugin requires Win2000 or WinXP."
 
-#: plugins/win32/winprefs/winprefs.c:344
+#: plugins/win32/winprefs/winprefs.c:401
 msgid "GTK+ Runtime Version"
 msgstr "GTK+ Runtime Version"
 
 #. Autostart
-#: plugins/win32/winprefs/winprefs.c:352
+#: plugins/win32/winprefs/winprefs.c:409
 msgid "Startup"
 msgstr "Startup"
 
-#: plugins/win32/winprefs/winprefs.c:353
+#: plugins/win32/winprefs/winprefs.c:410
 msgid "_Start Gaim on Windows startup"
 msgstr "_Start Gaim on Windows startup"
 
 #. Buddy List
-#: plugins/win32/winprefs/winprefs.c:362 src/gtkblist.c:3145
-#: src/gtkprefs.c:2178
+#: plugins/win32/winprefs/winprefs.c:421 src/gtkblist.c:3514
+#: src/gtkprefs.c:2099
 msgid "Buddy List"
 msgstr "Buddy List"
 
-#: plugins/win32/winprefs/winprefs.c:363
+#: plugins/win32/winprefs/winprefs.c:422
 msgid "_Dockable Buddy List"
 msgstr "_Dockable Buddy List"
 
-#. Docked Blist On Top
-#: plugins/win32/winprefs/winprefs.c:367
-msgid "Docked _Buddy List is always on top"
-msgstr "Docked _Buddy List is always on top"
-
 #. Blist On Top
-#: plugins/win32/winprefs/winprefs.c:377
-msgid "_Keep Buddy List window on top"
+#: plugins/win32/winprefs/winprefs.c:426
+#, fuzzy
+msgid "_Keep Buddy List window on top:"
 msgstr "_Keep Buddy List window on top"
 
+#: plugins/win32/winprefs/winprefs.c:428 src/gtkprefs.c:1763
+msgid "Never"
+msgstr "Never"
+
+#: plugins/win32/winprefs/winprefs.c:429
+#, fuzzy
+msgid "Always"
+msgstr "Away"
+
+#. XXX: Did this ever work?
+#: plugins/win32/winprefs/winprefs.c:431
+msgid "Only when docked"
+msgstr ""
+
 #. Conversations
-#: plugins/win32/winprefs/winprefs.c:382 src/gtkprefs.c:910
-#: src/gtkprefs.c:2179 src/protocols/msn/msn.c:1838
+#: plugins/win32/winprefs/winprefs.c:435 src/gtkprefs.c:883
+#: src/gtkprefs.c:2100
 msgid "Conversations"
 msgstr "Conversations"
 
-#: plugins/win32/winprefs/winprefs.c:383
-msgid "_Flash Window when messages are received"
+#: plugins/win32/winprefs/winprefs.c:436
+#, fuzzy
+msgid "_Flash window when messages are received"
 msgstr "_Flash Window when messages are received"
 
-#: plugins/win32/winprefs/winprefs.c:407
+#: plugins/win32/winprefs/winprefs.c:459
 msgid "WinGaim Options"
 msgstr "WinGaim Options"
 
-#: plugins/win32/winprefs/winprefs.c:409 plugins/win32/winprefs/winprefs.c:410
+#: plugins/win32/winprefs/winprefs.c:461
 msgid "Options specific to Windows Gaim."
 msgstr "Options specific to Windows Gaim."
 
-#: src/account.c:294 src/protocols/jabber/jabber.c:1043
-msgid "New passwords do not match."
-msgstr "New passwords do not match."
-
-#: src/account.c:303
-msgid "Fill out all fields completely."
-msgstr "Fill out all fields completely."
-
-#: src/account.c:328
-msgid "Original password"
-msgstr "Original password"
-
-#: src/account.c:335
-msgid "New password"
+#: plugins/win32/winprefs/winprefs.c:462
+msgid ""
+"Provides options specific to Windows Gaim, such as buddy list docking and "
+"conversation flashing."
+msgstr ""
+
+#: src/account.c:773
+#, fuzzy
+msgid "accounts"
+msgstr "Accounts"
+
+#: src/account.c:913
+#, fuzzy
+msgid "Password is required to sign on."
+msgstr "Password has expired"
+
+#: src/account.c:939
+#, c-format
+msgid "Enter password for %s (%s)"
+msgstr "Enter password for %s (%s)"
+
+#: src/account.c:946
+#, fuzzy
+msgid "Enter Password"
+msgstr "Change Password"
+
+#: src/account.c:951
+#, fuzzy
+msgid "Save password"
 msgstr "New password"
 
-#: src/account.c:342
-msgid "New password (again)"
-msgstr "New password (again)"
-
-#: src/account.c:348
-#, c-format
-msgid "Change password for %s"
-msgstr "Change password for %s"
-
-#: src/account.c:356
-msgid "Please enter your current password and your new password."
-msgstr "Please enter your current password and your new password."
-
 #. *
 #. * A wrapper for gaim_request_action() that uses OK and Cancel buttons.
 #.
-#: src/account.c:359 src/connection.c:188 src/gtkblist.c:2419
-#: src/gtkdialogs.c:375 src/gtkdialogs.c:518 src/gtkdialogs.c:574
-#: src/gtkrequest.c:259 src/protocols/jabber/jabber.c:1090
-#: src/protocols/jabber/xdata.c:337 src/protocols/msn/msn.c:228
-#: src/protocols/msn/msn.c:243 src/protocols/msn/msn.c:258
-#: src/protocols/msn/msn.c:273 src/protocols/oscar/oscar.c:3533
-#: src/protocols/oscar/oscar.c:3627 src/protocols/oscar/oscar.c:6976
-#: src/protocols/oscar/oscar.c:7068 src/protocols/oscar/oscar.c:7120
-#: src/protocols/silc/buddy.c:460 src/protocols/silc/buddy.c:1132
-#: src/protocols/silc/chat.c:421 src/protocols/silc/chat.c:459
-#: src/protocols/silc/chat.c:722 src/protocols/silc/ops.c:1083
-#: src/protocols/silc/ops.c:1689 src/protocols/silc/silc.c:717
-#: src/protocols/yahoo/yahoo.c:2892 src/protocols/yahoo/yahoo.c:2901
-#: src/request.h:1244
+#: src/account.c:959 src/account.c:1111 src/gtkdialogs.c:504
+#: src/gtkdialogs.c:647 src/gtkdialogs.c:703 src/gtkrequest.c:260
+#: src/protocols/jabber/jabber.c:1103 src/protocols/jabber/xdata.c:337
+#: src/protocols/msn/msn.c:226 src/protocols/msn/msn.c:241
+#: src/protocols/msn/msn.c:256 src/protocols/msn/msn.c:271
+#: src/protocols/oscar/oscar.c:2476 src/protocols/oscar/oscar.c:3774
+#: src/protocols/oscar/oscar.c:3855 src/protocols/oscar/oscar.c:7156
+#: src/protocols/oscar/oscar.c:7281 src/protocols/oscar/oscar.c:7306
+#: src/protocols/oscar/oscar.c:7358 src/protocols/silc/buddy.c:460
+#: src/protocols/silc/buddy.c:1132 src/protocols/silc/chat.c:422
+#: src/protocols/silc/chat.c:460 src/protocols/silc/chat.c:723
+#: src/protocols/silc/ops.c:1083 src/protocols/silc/ops.c:1700
+#: src/protocols/silc/silc.c:725 src/protocols/yahoo/yahoo.c:2922
+#: src/protocols/yahoo/yahoo.c:2931 src/request.h:1266
 msgid "OK"
 msgstr "OK"
 
-#: src/account.c:360 src/account.c:398 src/connection.c:189
-#: src/gtkaccount.c:2014 src/gtkaccount.c:2510 src/gtkblist.c:2420
-#: src/gtkblist.c:4440 src/gtkconn.c:171 src/gtkdialogs.c:376
-#: src/gtkdialogs.c:519 src/gtkdialogs.c:575 src/gtkdialogs.c:673
-#: src/gtkdialogs.c:695 src/gtkdialogs.c:715 src/gtkdialogs.c:751
-#: src/gtkdialogs.c:813 src/gtkdialogs.c:855 src/gtkdialogs.c:893
-#: src/gtkimhtmltoolbar.c:440 src/gtkprivacy.c:588 src/gtkprivacy.c:601
-#: src/gtkprivacy.c:626 src/gtkprivacy.c:637 src/gtkrequest.c:260
-#: src/protocols/jabber/buddy.c:565 src/protocols/jabber/chat.c:772
-#: src/protocols/jabber/jabber.c:675 src/protocols/jabber/jabber.c:1091
-#: src/protocols/jabber/xdata.c:338 src/protocols/msn/msn.c:229
-#: src/protocols/msn/msn.c:244 src/protocols/msn/msn.c:259
-#: src/protocols/msn/msn.c:274 src/protocols/msn/msn.c:291
-#: src/protocols/oscar/oscar.c:1534 src/protocols/oscar/oscar.c:3491
-#: src/protocols/oscar/oscar.c:3534 src/protocols/oscar/oscar.c:3571
-#: src/protocols/oscar/oscar.c:3628 src/protocols/oscar/oscar.c:6977
-#: src/protocols/oscar/oscar.c:7069 src/protocols/oscar/oscar.c:7121
-#: src/protocols/oscar/oscar.c:7190 src/protocols/silc/buddy.c:461
+#: src/account.c:960 src/account.c:1112 src/account.c:1150
+#: src/gtkaccount.c:2012 src/gtkaccount.c:2491 src/gtkblist.c:4815
+#: src/gtkdialogs.c:505 src/gtkdialogs.c:648 src/gtkdialogs.c:704
+#: src/gtkdialogs.c:723 src/gtkdialogs.c:745 src/gtkdialogs.c:765
+#: src/gtkdialogs.c:809 src/gtkdialogs.c:871 src/gtkdialogs.c:913
+#: src/gtkdialogs.c:955 src/gtkimhtmltoolbar.c:413 src/gtkprivacy.c:595
+#: src/gtkprivacy.c:608 src/gtkprivacy.c:633 src/gtkprivacy.c:644
+#: src/gtkrequest.c:261 src/gtksavedstatuses.c:188
+#: src/protocols/jabber/buddy.c:569 src/protocols/jabber/chat.c:780
+#: src/protocols/jabber/jabber.c:682 src/protocols/jabber/jabber.c:1104
+#: src/protocols/jabber/xdata.c:338 src/protocols/msn/msn.c:227
+#: src/protocols/msn/msn.c:242 src/protocols/msn/msn.c:257
+#: src/protocols/msn/msn.c:272 src/protocols/msn/msn.c:289
+#: src/protocols/oscar/oscar.c:1594 src/protocols/oscar/oscar.c:2477
+#: src/protocols/oscar/oscar.c:3732 src/protocols/oscar/oscar.c:3775
+#: src/protocols/oscar/oscar.c:3812 src/protocols/oscar/oscar.c:3856
+#: src/protocols/oscar/oscar.c:7157 src/protocols/oscar/oscar.c:7282
+#: src/protocols/oscar/oscar.c:7307 src/protocols/oscar/oscar.c:7359
+#: src/protocols/oscar/oscar.c:7428 src/protocols/silc/buddy.c:461
 #: src/protocols/silc/buddy.c:1037 src/protocols/silc/buddy.c:1133
-#: src/protocols/silc/chat.c:594 src/protocols/silc/chat.c:723
-#: src/protocols/silc/ops.c:1690 src/protocols/silc/silc.c:718
-#: src/protocols/trepia/trepia.c:348 src/protocols/yahoo/yahoo.c:2893
-#: src/protocols/yahoo/yahoo.c:2902 src/request.h:1244 src/request.h:1254
+#: src/protocols/silc/chat.c:595 src/protocols/silc/chat.c:724
+#: src/protocols/silc/ops.c:1701 src/protocols/silc/silc.c:726
+#: src/protocols/trepia/trepia.c:348 src/protocols/yahoo/yahoo.c:2923
+#: src/protocols/yahoo/yahoo.c:2932 src/request.h:1266 src/request.h:1276
 msgid "Cancel"
 msgstr "Cancel"
 
-#: src/account.c:389
+#: src/account.c:982 src/connection.c:96
+#, c-format
+msgid "Missing protocol plugin for %s"
+msgstr "Missing protocol plugin for %s"
+
+#: src/account.c:984 src/connection.c:99
+msgid "Connection Error"
+msgstr "Connection Error"
+
+#: src/account.c:1046 src/protocols/jabber/jabber.c:1056
+msgid "New passwords do not match."
+msgstr "New passwords do not match."
+
+#: src/account.c:1055
+msgid "Fill out all fields completely."
+msgstr "Fill out all fields completely."
+
+#: src/account.c:1080
+msgid "Original password"
+msgstr "Original password"
+
+#: src/account.c:1087
+msgid "New password"
+msgstr "New password"
+
+#: src/account.c:1094
+msgid "New password (again)"
+msgstr "New password (again)"
+
+#: src/account.c:1100
+#, c-format
+msgid "Change password for %s"
+msgstr "Change password for %s"
+
+#: src/account.c:1108
+msgid "Please enter your current password and your new password."
+msgstr "Please enter your current password and your new password."
+
+#: src/account.c:1141
 #, c-format
 msgid "Change user information for %s"
 msgstr "Change user information for %s"
 
-#: src/account.c:397 src/gtkrequest.c:266 src/protocols/jabber/buddy.c:564
-#: src/protocols/trepia/trepia.c:347
+#: src/account.c:1149 src/gtkdebug.c:669 src/gtkrequest.c:267
+#: src/protocols/jabber/buddy.c:568 src/protocols/trepia/trepia.c:347
 msgid "Save"
 msgstr "Save"
 
-#: src/account.c:802 src/gtkft.c:158 src/protocols/jabber/buddy.c:621
-#: src/protocols/jabber/buddy.c:1064 src/protocols/jabber/buddy.c:1081
-#: src/protocols/novell/novell.c:2823
+#: src/account.c:1605 src/gtkft.c:159 src/protocols/jabber/buddy.c:627
+#: src/protocols/jabber/buddy.c:1079 src/protocols/jabber/buddy.c:1096
+#: src/protocols/novell/novell.c:2825
 msgid "Unknown"
 msgstr "Unknown"
 
-#: src/blist.c:681
+#: src/blist.c:545
+#, fuzzy
+msgid "buddy list"
+msgstr "Buddy List"
+
+#: src/blist.c:1145
 msgid "Chats"
 msgstr "Chats"
 
-#: src/blist.c:1352
+#: src/blist.c:1835
 #, c-format
 msgid ""
 "%d buddy from group %s was not removed because its account was not logged "
@@ -1328,125 +1490,94 @@
 "%d buddies from group %s were not removed because their accounts were not "
 "logged in.  These buddies and the group were not removed.\n"
 
-#: src/blist.c:1361
+#: src/blist.c:1844
 msgid "Group not removed"
 msgstr "Group not removed"
 
-#: src/blist.c:2064
-msgid ""
-"An error was encountered parsing your buddy list.  It has not been loaded, "
-"and the old file has moved to blist.xml~."
-msgstr ""
-"An error was encountered parsing your buddy list.  It has not been loaded, "
-"and the old file has been moved to blist.xml~."
-
-#: src/blist.c:2067
-msgid "Buddy List Error"
-msgstr "Buddy List Error"
-
-#: src/connection.c:112 src/connection.c:161
-#, c-format
-msgid "Missing protocol plugin for %s"
-msgstr "Missing protocol plugin for %s"
-
-#: src/connection.c:116
+#: src/connection.c:98
 msgid "Registration Error"
 msgstr "Registration Error"
 
-#: src/connection.c:165
-msgid "Connection Error"
-msgstr "Connection Error"
-
-#: src/connection.c:185
-#, c-format
-msgid "Enter password for %s (%s)"
-msgstr "Enter password for %s (%s)"
-
-#: src/conversation.c:236
+#: src/conversation.c:237
 #, fuzzy
 msgid "Unable to send message: The message is too large."
 msgstr "Unable to send message. The message is too large."
 
-#: src/conversation.c:239
+#: src/conversation.c:240 src/conversation.c:253
 #, fuzzy, c-format
 msgid "Unable to send message to %s."
 msgstr "Unable to send message to %s:"
 
-#: src/conversation.c:240
+#: src/conversation.c:241
 #, fuzzy
 msgid "The message is too large."
 msgstr "Away message too long."
 
-#: src/conversation.c:249
+#: src/conversation.c:250
 msgid "Unable to send message."
 msgstr "Unable to send message."
 
-#: src/conversation.c:252
-#, fuzzy, c-format
-msgid "Unable to send messge to %s."
-msgstr "Unable to send message to %s:"
-
-#: src/conversation.c:2005
+#: src/conversation.c:1962
 #, c-format
 msgid "%s entered the room."
 msgstr "%s entered the room."
 
-#: src/conversation.c:2008
+#: src/conversation.c:1965
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>] entered the room."
 
-#: src/conversation.c:2104
+#: src/conversation.c:2062
 #, c-format
 msgid "You are now known as %s"
 msgstr "You are now known as %s"
 
-#: src/conversation.c:2107
+#: src/conversation.c:2065
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s is now known as %s"
 
-#: src/conversation.c:2148
+#: src/conversation.c:2107
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s left the room (%s)."
 
-#: src/conversation.c:2150
+#: src/conversation.c:2109
 #, c-format
 msgid "%s left the room."
 msgstr "%s left the room."
 
-#: src/conversation.c:2219
+#: src/conversation.c:2186
 #, c-format
 msgid "(+%d more)"
 msgstr "(+%d more)"
 
-#: src/conversation.c:2221
+#: src/conversation.c:2188
 #, c-format
 msgid " left the room (%s)."
 msgstr " left the room (%s)."
 
-#: src/conversation.c:2626
+#: src/conversation.c:2596
 msgid "Last created window"
 msgstr "Last created window"
 
-#: src/conversation.c:2628
+#: src/conversation.c:2598
 msgid "Separate IM and Chat windows"
 msgstr "Separate IM and Chat windows"
 
-#: src/conversation.c:2630 src/gtkprefs.c:1287
+#: src/conversation.c:2600 src/gtkprefs.c:1279
 msgid "New window"
 msgstr "New window"
 
-#: src/conversation.c:2632
+#: src/conversation.c:2602
 msgid "By group"
 msgstr "By group"
 
-#: src/conversation.c:2634
+#: src/conversation.c:2604
 msgid "By account"
 msgstr "By account"
 
-#: src/ft.c:148 src/protocols/msn/msn.c:370
+#: src/ft.c:150 src/protocols/msn/msn.c:369
 #, c-format
 msgid ""
 "Error reading %s: \n"
@@ -1455,7 +1586,7 @@
 "Error reading %s: \n"
 "%s.\n"
 
-#: src/ft.c:152
+#: src/ft.c:154
 #, c-format
 msgid ""
 "Error writing %s: \n"
@@ -1464,7 +1595,7 @@
 "Error writing %s: \n"
 "%s.\n"
 
-#: src/ft.c:156
+#: src/ft.c:158
 #, c-format
 msgid ""
 "Error accessing %s: \n"
@@ -1473,30 +1604,35 @@
 "Error accessing %s: \n"
 "%s.\n"
 
-#: src/ft.c:188
+#: src/ft.c:191
 msgid "Cannot send a file of 0 bytes."
 msgstr "Cannot send a file of 0 bytes."
 
-#: src/ft.c:198
+#: src/ft.c:201
 msgid "Cannot send a directory."
 msgstr "Cannot send a directory."
 
-#: src/ft.c:205
+#: src/ft.c:210
 #, c-format
 msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
 msgstr "%s is not a regular file. Cowardly refusing to overwrite it.\n"
 
-#: src/ft.c:260
+#: src/ft.c:268
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "%s wants to send you %s (%s)"
 
-#: src/ft.c:302
+#: src/ft.c:275
+#, fuzzy, c-format
+msgid "%s wants to send you a file"
+msgstr "%s wants to send you %s (%s)"
+
+#: src/ft.c:316
 #, c-format
 msgid "Accept file transfer request from %s?"
 msgstr "Accept file transfer request from %s?"
 
-#: src/ft.c:306
+#: src/ft.c:320
 #, c-format
 msgid ""
 "A file is available for download from:\n"
@@ -1507,39 +1643,64 @@
 "Remote host: %s\n"
 "Remote port: %d"
 
-#: src/ft.c:359
+#: src/ft.c:344
+#, fuzzy, c-format
+msgid "%s is offering to send file %s"
+msgstr "Unable to send message to %s:"
+
+#: src/ft.c:384
 #, c-format
 msgid "%s is not a valid filename.\n"
 msgstr "%s is not a valid filename.\n"
 
-#: src/ft.c:377
+#: src/ft.c:405
 #, fuzzy, c-format
 msgid "Offering to send %s to %s"
 msgstr "Unable to send message to %s:"
 
-#: src/ft.c:870
+#: src/ft.c:416
+#, fuzzy, c-format
+msgid "Starting transfer of %s from %s"
+msgstr "Accept file transfer request from %s?"
+
+#: src/ft.c:570
 #, fuzzy, c-format
-msgid "Transfer of %s complete"
+msgid "Transfer of file %s complete"
 msgstr "File transfer to %s aborted.\n"
 
-#: src/ft.c:918
+#: src/ft.c:573
+#, fuzzy
+msgid "File transfer complete"
+msgstr "File transfer host"
+
+#: src/ft.c:957
 #, fuzzy, c-format
 msgid "You canceled the transfer of %s"
 msgstr "%s cancelled the transfer of %s"
 
-#: src/ft.c:970
+#: src/ft.c:962
+#, fuzzy
+msgid "File transfer cancelled"
+msgstr "File transfer already started"
+
+#: src/ft.c:1019
 #, c-format
 msgid "%s canceled the transfer of %s"
 msgstr "%s cancelled the transfer of %s"
 
-#: src/ft.c:1020
-#, c-format
-msgid "File transfer to %s aborted.\n"
+#: src/ft.c:1024
+#, fuzzy, c-format
+msgid "%s canceled the file transfer"
+msgstr "%s cancelled the transfer of %s"
+
+#: src/ft.c:1081
+#, fuzzy, c-format
+msgid "File transfer to %s failed."
 msgstr "File transfer to %s aborted.\n"
 
-#: src/ft.c:1022
-#, c-format
-msgid "File transfer from %s aborted.\n"
+#: src/ft.c:1083
+#, fuzzy, c-format
+msgid "File transfer from %s failed."
 msgstr "File transfer from %s aborted.\n"
 
 #: src/gaim-remote.c:104
@@ -1548,11 +1709,12 @@
 "Usage: %s command [OPTIONS] [URI]\n"
 "\n"
 "    COMMANDS:\n"
+"       send                     Send message\n"
 "       uri                      Handle AIM: URI\n"
 "       away                     Popup the away dialog with the default "
 "message\n"
 "       back                     Remove the away dialog\n"
-"       send                     Send message\n"
+"       logout                   Log out all accounts\n"
 "       quit                     Close running copy of Gaim\n"
 "\n"
 "    OPTIONS:\n"
@@ -1576,7 +1738,7 @@
 "    OPTIONS:\n"
 "       -h, --help [command]     Show help for command\n"
 
-#: src/gaim-remote.c:193
+#: src/gaim-remote.c:195
 #, fuzzy, c-format
 msgid ""
 "Gaim not running (on session %d)\n"
@@ -1585,13 +1747,13 @@
 "Gaim not running (on session 0)\n"
 "Is the \"Remote Control\" plugin loaded?\n"
 
-#: src/gaim-remote.c:280
+#: src/gaim-remote.c:282
 msgid ""
 "Insufficient arguments (-t, -f, -p, & -m are all required) or arguments "
 "greater than 9999 chars\n"
 msgstr ""
 
-#: src/gaim-remote.c:291
+#: src/gaim-remote.c:293
 msgid ""
 "\n"
 "Using AIM: URIs:\n"
@@ -1633,7 +1795,14 @@
 "\tgaim-remote uri 'aim:addbuddy?screenname=Penguin'\n"
 "...prompts you to add 'Penguin' to your buddy list.\n"
 
-#: src/gaim-remote.c:311
+#: src/gaim-remote.c:313
+#, fuzzy
+msgid ""
+"\n"
+"Log out all accounts\n"
+msgstr "Log all c_hats"
+
+#: src/gaim-remote.c:317
 msgid ""
 "\n"
 "Close running copy of Gaim\n"
@@ -1641,7 +1810,7 @@
 "\n"
 "Close running copy of Gaim\n"
 
-#: src/gaim-remote.c:315
+#: src/gaim-remote.c:321
 msgid ""
 "\n"
 "Mark all accounts as \"away\" with the default message.\n"
@@ -1649,7 +1818,7 @@
 "\n"
 "Mark all accounts as \"away\" with the default message.\n"
 
-#: src/gaim-remote.c:319
+#: src/gaim-remote.c:325
 msgid ""
 "\n"
 "Set all accounts as not away.\n"
@@ -1657,14 +1826,14 @@
 "\n"
 "Set all accounts as not away.\n"
 
-#: src/gaim-remote.c:323
+#: src/gaim-remote.c:329
 #, fuzzy
 msgid ""
 "\n"
 "Send instant message\n"
 msgstr "Send a _message"
 
-#: src/gtkaccount.c:325
+#: src/gtkaccount.c:345
 #, c-format
 msgid ""
 "<b>File:</b> %s\n"
@@ -1676,188 +1845,153 @@
 "<b>Image size:</b> %dx%d"
 
 #. Build the login options frame.
-#: src/gtkaccount.c:625
+#: src/gtkaccount.c:665
 msgid "Login Options"
 msgstr "Login Options"
 
-#: src/gtkaccount.c:642 src/gtkft.c:555
+#: src/gtkaccount.c:682 src/gtkft.c:626
 msgid "Protocol:"
 msgstr "Protocol:"
 
-#: src/gtkaccount.c:647 src/gtkblist.c:4025
+#: src/gtkaccount.c:687 src/gtkblist.c:4369
 msgid "Screen Name:"
 msgstr "Screen Name:"
 
-#: src/gtkaccount.c:720
+#: src/gtkaccount.c:760
 msgid "Password:"
 msgstr "Password:"
 
-#: src/gtkaccount.c:725 src/gtkblist.c:4039 src/gtkblist.c:4388
+#: src/gtkaccount.c:765 src/gtkblist.c:4383 src/gtkblist.c:4762
 msgid "Alias:"
 msgstr "Alias:"
 
-#: src/gtkaccount.c:729
+#: src/gtkaccount.c:769
 msgid "Remember password"
 msgstr "Remember password"
 
-#: src/gtkaccount.c:738
-#, fuzzy
-msgid "Auto log in"
-msgstr "Auto-login"
-
 #. Build the user options frame.
-#: src/gtkaccount.c:785
+#: src/gtkaccount.c:814
 msgid "User Options"
 msgstr "User Options"
 
-#: src/gtkaccount.c:798
+#: src/gtkaccount.c:827
 msgid "New mail notifications"
 msgstr "New mail notifications"
 
-#: src/gtkaccount.c:807
+#: src/gtkaccount.c:836
 msgid "Buddy icon:"
 msgstr "Buddy icon:"
 
 #. Build the protocol options frame.
-#: src/gtkaccount.c:896
+#: src/gtkaccount.c:925
 #, c-format
 msgid "%s Options"
 msgstr "%s Options"
 
 #. Use Global Proxy Settings
-#: src/gtkaccount.c:1032 src/gtkaccount.c:1079
+#: src/gtkaccount.c:1063 src/gtkaccount.c:1110
 msgid "Use Global Proxy Settings"
 msgstr "Use Global Proxy Settings"
 
 #. No Proxy
-#: src/gtkaccount.c:1038 src/gtkaccount.c:1086
+#: src/gtkaccount.c:1069 src/gtkaccount.c:1117
 msgid "No Proxy"
 msgstr "No Proxy"
 
 #. HTTP
-#: src/gtkaccount.c:1044 src/gtkaccount.c:1093
+#: src/gtkaccount.c:1075 src/gtkaccount.c:1124
 msgid "HTTP"
 msgstr "HTTP"
 
 #. SOCKS 4
-#: src/gtkaccount.c:1050 src/gtkaccount.c:1100
+#: src/gtkaccount.c:1081 src/gtkaccount.c:1131
 msgid "SOCKS 4"
 msgstr "SOCKS 4"
 
 #. SOCKS 5
-#: src/gtkaccount.c:1056 src/gtkaccount.c:1107
+#: src/gtkaccount.c:1087 src/gtkaccount.c:1138
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
 #. Use Environmental Settings
-#: src/gtkaccount.c:1062 src/gtkaccount.c:1114 src/gtkprefs.c:1090
+#: src/gtkaccount.c:1093 src/gtkaccount.c:1145 src/gtkprefs.c:1080
 msgid "Use Environmental Settings"
 msgstr "Use Environmental Settings"
 
-#: src/gtkaccount.c:1153
+#: src/gtkaccount.c:1184
 msgid "you can see the butterflies mating"
 msgstr "you can see the butterflies mating"
 
-#: src/gtkaccount.c:1157
+#: src/gtkaccount.c:1188
 msgid "If you look real closely"
 msgstr "If you look real closely"
 
-#: src/gtkaccount.c:1173
+#: src/gtkaccount.c:1204
 msgid "Proxy Options"
 msgstr "Proxy Options"
 
-#: src/gtkaccount.c:1191 src/gtkprefs.c:1084
+#: src/gtkaccount.c:1222 src/gtkprefs.c:1074
 msgid "Proxy _type:"
 msgstr "Proxy _type:"
 
-#: src/gtkaccount.c:1200 src/gtkprefs.c:1111
+#: src/gtkaccount.c:1231 src/gtkprefs.c:1101
 msgid "_Host:"
 msgstr "_Host:"
 
-#: src/gtkaccount.c:1204 src/gtkprefs.c:1129
+#: src/gtkaccount.c:1235 src/gtkprefs.c:1119
 msgid "_Port:"
 msgstr "_Port:"
 
-#: src/gtkaccount.c:1212
+#: src/gtkaccount.c:1243
 msgid "_Username:"
 msgstr "_Username:"
 
-#: src/gtkaccount.c:1217 src/gtkprefs.c:1166
+#: src/gtkaccount.c:1248 src/gtkprefs.c:1156
 msgid "Pa_ssword:"
 msgstr "Pa_ssword:"
 
-#: src/gtkaccount.c:1589
+#: src/gtkaccount.c:1625
 msgid "Add Account"
 msgstr "Add Account"
 
-#: src/gtkaccount.c:1591
+#: src/gtkaccount.c:1627
 msgid "Modify Account"
 msgstr "Modify Account"
 
-#. Add the disclosure
-#: src/gtkaccount.c:1615
-msgid "Show more options"
-msgstr "Show more options"
-
-#: src/gtkaccount.c:1616
-msgid "Show fewer options"
-msgstr "Show fewer options"
-
 #. Register button
-#: src/gtkaccount.c:1643 src/protocols/jabber/jabber.c:674
+#: src/gtkaccount.c:1674 src/protocols/jabber/jabber.c:681
 msgid "Register"
 msgstr "Register"
 
-#: src/gtkaccount.c:2008
+#: src/gtkaccount.c:2006 src/gtksavedstatuses.c:184
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "Are you sure you want to delete %s?"
 
-#: src/gtkaccount.c:2013 src/gtkrequest.c:263
+#: src/gtkaccount.c:2011 src/gtkrequest.c:264 src/gtksavedstatuses.c:187
 msgid "Delete"
 msgstr "Delete"
 
-#: src/gtkaccount.c:2127 src/protocols/oscar/oscar.c:4179
+#: src/gtkaccount.c:2092 src/gtksavedstatuses.c:622
+#: src/protocols/oscar/oscar.c:4420
 msgid "Screen Name"
 msgstr "Screen Name"
 
-#. zephyr has several exposures
-#. NONE (where you are hidden, and zephyrs to you are in practice silently dropped -- yes this is wrong)
-#. OPSTAFF "hidden"
-#. REALM-VISIBLE visible to people in local realm
-#. REALM-ANNOUNCED REALM-VISIBLE+ plus your logins/logouts are announced to <login,username,*>
-#. NET-VISIBLE REALM-ANNOUNCED, plus visible to people in foreign realm
-#. NET-ANNOUNCED NET-VISIBLE, plus logins/logouts are announced	 to <login,username,*>
-#.
-#. Online will set the user to the exposure they have in their options (defaulting to REALM-VISIBLE),
-#. Hidden, will set the user's exposure to OPSTAFF
-#.
-#. Away won't change their exposure but will set an auto away message (for IMs only)
-#.
-#: src/gtkaccount.c:2151 src/protocols/gg/gg.c:272 src/protocols/irc/irc.c:161
-#: src/protocols/jabber/buddy.c:1070 src/protocols/jabber/jabber.c:975
-#: src/protocols/msn/msn.c:534 src/protocols/napster/napster.c:561
-#: src/protocols/oscar/oscar.c:683 src/protocols/oscar/oscar.c:6871
-#: src/protocols/silc/silc.c:48 src/protocols/yahoo/yahoo.c:2655
-#: src/protocols/yahoo/yahoo.c:3125 src/protocols/zephyr/zephyr.c:2218
-msgid "Online"
-msgstr "Online"
-
-#: src/gtkaccount.c:2164
-#, fuzzy
-msgid "Auto Log In"
-msgstr "Auto-login"
-
-#: src/gtkaccount.c:2172
+#: src/gtkaccount.c:2115
+#, fuzzy
+msgid "Enabled"
+msgstr "Failed"
+
+#: src/gtkaccount.c:2123
 msgid "Protocol"
 msgstr "Protocol"
 
-#: src/gtkaccount.c:2485
+#: src/gtkaccount.c:2466
 #, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s%s"
 msgstr "%s%s%s%s has made %s his or her buddy%s%s%s"
 
-#: src/gtkaccount.c:2499
+#: src/gtkaccount.c:2480
 msgid ""
 "\n"
 "\n"
@@ -1867,26 +2001,21 @@
 "\n"
 "Do you wish to add him or her to your buddy list?"
 
-#: src/gtkaccount.c:2503
-msgid "Information"
-msgstr "Information"
-
-#: src/gtkaccount.c:2507
+#: src/gtkaccount.c:2488
 msgid "Add buddy to your list?"
 msgstr "Add buddy to your list?"
 
-#. Add button
-#: src/gtkaccount.c:2509 src/gtkblist.c:4439 src/gtkconv.c:1476
-#: src/gtkconv.c:3790 src/gtkconv.c:3861 src/gtkrequest.c:264
-#: src/protocols/oscar/oscar.c:3805 src/protocols/silc/chat.c:593
+#: src/gtkaccount.c:2490 src/gtkblist.c:4814 src/gtkconv.c:1580
+#: src/gtkrequest.c:265 src/protocols/oscar/oscar.c:4045
+#: src/protocols/silc/chat.c:594
 msgid "Add"
 msgstr "Add"
 
-#: src/gtkblist.c:813
+#: src/gtkblist.c:888
 msgid "Join a Chat"
 msgstr "Join a Chat"
 
-#: src/gtkblist.c:834
+#: src/gtkblist.c:909
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
@@ -1894,234 +2023,219 @@
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 
-#: src/gtkblist.c:845 src/gtkpounce.c:415 src/gtkroomlist.c:354
+#: src/gtkblist.c:920 src/gtkpounce.c:415 src/gtkroomlist.c:354
 msgid "_Account:"
 msgstr "_Account:"
 
-#: src/gtkblist.c:1117
+#: src/gtkblist.c:1225
 msgid "Get _Info"
 msgstr "Get _Info"
 
-#: src/gtkblist.c:1120
+#: src/gtkblist.c:1228
 msgid "I_M"
 msgstr "I_M"
 
-#: src/gtkblist.c:1126
+#: src/gtkblist.c:1234
 msgid "_Send File"
 msgstr "_Send File"
 
-#: src/gtkblist.c:1132
+#: src/gtkblist.c:1240
 msgid "Add Buddy _Pounce"
 msgstr "Add Buddy _Pounce"
 
-#: src/gtkblist.c:1134 src/gtkblist.c:1231
+#: src/gtkblist.c:1244 src/gtkblist.c:1248 src/gtkblist.c:1346
+#: src/gtkblist.c:1369
 msgid "View _Log"
 msgstr "View _Log"
 
-#: src/gtkblist.c:1144
+#: src/gtkblist.c:1259
 #, fuzzy
 msgid "_Alias Buddy..."
 msgstr "Alias Buddy"
 
-#: src/gtkblist.c:1146
+#: src/gtkblist.c:1261
 #, fuzzy
 msgid "_Remove Buddy"
 msgstr "Remove Buddy"
 
-#: src/gtkblist.c:1148
+#: src/gtkblist.c:1263
 #, fuzzy
 msgid "Alias Contact..."
 msgstr "Alias Contact"
 
-#: src/gtkblist.c:1151 src/gtkdialogs.c:749 src/gtkdialogs.c:750
+#: src/gtkblist.c:1266 src/gtkdialogs.c:807 src/gtkdialogs.c:808
 msgid "Remove Contact"
 msgstr "Remove Contact"
 
-#: src/gtkblist.c:1155 src/gtkblist.c:1239 src/gtkblist.c:1253
+#: src/gtkblist.c:1270 src/gtkblist.c:1354 src/gtkblist.c:1375
 msgid "_Alias..."
 msgstr "_Alias..."
 
-#: src/gtkblist.c:1157 src/gtkblist.c:1241 src/gtkblist.c:1258
-#: src/gtkconn.c:367
+#: src/gtkblist.c:1272 src/gtkblist.c:1356 src/gtkblist.c:1377
+#: src/gtkconn.c:171
 msgid "_Remove"
 msgstr "_Remove"
 
-#: src/gtkblist.c:1203
+#: src/gtkblist.c:1318
 msgid "Add a _Buddy"
 msgstr "Add a _Buddy"
 
-#: src/gtkblist.c:1205
+#: src/gtkblist.c:1320
 msgid "Add a C_hat"
 msgstr "Add a C_hat"
 
-#: src/gtkblist.c:1207
+#: src/gtkblist.c:1322
 msgid "_Delete Group"
 msgstr "_Delete Group"
 
-#: src/gtkblist.c:1209
+#: src/gtkblist.c:1324
 msgid "_Rename"
 msgstr "_Rename"
 
 #. join button
-#: src/gtkblist.c:1227 src/gtkroomlist.c:264 src/gtkroomlist.c:409
-#: src/gtkstock.c:89
+#: src/gtkblist.c:1342 src/gtkroomlist.c:264 src/gtkroomlist.c:409
+#: src/gtkstock.c:102
 msgid "_Join"
 msgstr "_Join"
 
-#: src/gtkblist.c:1229
+#: src/gtkblist.c:1344
 msgid "Auto-Join"
 msgstr "Auto-Join"
 
-#: src/gtkblist.c:1255 src/gtkblist.c:1280
+#: src/gtkblist.c:1382 src/gtkblist.c:1405
 msgid "_Collapse"
 msgstr "_Collapse"
 
-#: src/gtkblist.c:1285
+#: src/gtkblist.c:1410
 msgid "_Expand"
 msgstr "_Expand"
 
-#: src/gtkblist.c:1502 src/gtkblist.c:1512 src/gtkblist.c:3284
-#: src/gtkblist.c:3287
+#: src/gtkblist.c:1637 src/gtkblist.c:1647 src/gtkblist.c:3646
+#: src/gtkblist.c:3649
 #, fuzzy
 msgid "/Tools/Mute Sounds"
 msgstr "Mute Sounds"
 
-#: src/gtkblist.c:1953 src/gtkconv.c:4356 src/gtkpounce.c:316
+#: src/gtkblist.c:2106 src/gtkconv.c:4255 src/gtkpounce.c:314
 msgid ""
 "You are not currently signed on with an account that can add that buddy."
 msgstr ""
 "You are not currently signed on with an account that can add that buddy."
 
 #. Buddies menu
-#: src/gtkblist.c:2363
+#: src/gtkblist.c:2675
 msgid "/_Buddies"
 msgstr "/_Buddies"
 
-#: src/gtkblist.c:2364
+#: src/gtkblist.c:2676
 msgid "/Buddies/New Instant _Message..."
 msgstr "/Buddies/New Instant _Message..."
 
-#: src/gtkblist.c:2365
+#: src/gtkblist.c:2677
 msgid "/Buddies/Join a _Chat..."
 msgstr "/Buddies/Join a _Chat..."
 
-#: src/gtkblist.c:2366
+#: src/gtkblist.c:2678
 msgid "/Buddies/Get User _Info..."
 msgstr "/Buddies/Get User _Info..."
 
-#: src/gtkblist.c:2367
+#: src/gtkblist.c:2679
 msgid "/Buddies/View User _Log..."
 msgstr "/Buddies/View User _Log..."
 
-#: src/gtkblist.c:2369
+#: src/gtkblist.c:2681
 msgid "/Buddies/Show _Offline Buddies"
 msgstr "/Buddies/Show _Offline Buddies"
 
-#: src/gtkblist.c:2370
+#: src/gtkblist.c:2682
 msgid "/Buddies/Show _Empty Groups"
 msgstr "/Buddies/Show _Empty Groups"
 
-#: src/gtkblist.c:2371
+#: src/gtkblist.c:2683
 msgid "/Buddies/_Add Buddy..."
 msgstr "/Buddies/_Add Buddy..."
 
-#: src/gtkblist.c:2372
+#: src/gtkblist.c:2684
 msgid "/Buddies/Add C_hat..."
 msgstr "/Buddies/Add C_hat..."
 
-#: src/gtkblist.c:2373
+#: src/gtkblist.c:2685
 msgid "/Buddies/Add _Group..."
 msgstr "/Buddies/Add _Group..."
 
-#: src/gtkblist.c:2375
-#, fuzzy
-msgid "/Buddies/_Log Out"
-msgstr "/Buddies/_Quit"
-
-#: src/gtkblist.c:2376
+#: src/gtkblist.c:2687
 msgid "/Buddies/_Quit"
 msgstr "/Buddies/_Quit"
 
 #. Tools
-#: src/gtkblist.c:2379
+#: src/gtkblist.c:2690
 msgid "/_Tools"
 msgstr "/_Tools"
 
-#: src/gtkblist.c:2380
-msgid "/Tools/_Away"
-msgstr "/Tools/_Away"
-
-#: src/gtkblist.c:2381
+#: src/gtkblist.c:2691
 msgid "/Tools/Buddy _Pounce"
 msgstr "/Tools/Buddy _Pounce"
 
-#: src/gtkblist.c:2382
+#: src/gtkblist.c:2692
 msgid "/Tools/Account Ac_tions"
 msgstr "/Tools/Account Ac_tions"
 
-#: src/gtkblist.c:2383
+#: src/gtkblist.c:2693
 msgid "/Tools/Pl_ugin Actions"
 msgstr "/Tools/Pl_ugin Actions"
 
-#: src/gtkblist.c:2385
+#: src/gtkblist.c:2695
+#, fuzzy
+msgid "/Tools/_Statuses"
+msgstr "Status"
+
+#: src/gtkblist.c:2696
 msgid "/Tools/A_ccounts"
 msgstr "/Tools/A_ccounts"
 
-#: src/gtkblist.c:2386
+#: src/gtkblist.c:2697
+msgid "/Tools/Pr_eferences"
+msgstr "/Tools/Pr_eferences"
+
+#: src/gtkblist.c:2698
+msgid "/Tools/Pr_ivacy"
+msgstr "/Tools/Pr_ivacy"
+
+#: src/gtkblist.c:2699
 msgid "/Tools/_File Transfers"
 msgstr "/Tools/_File Transfers"
 
-#: src/gtkblist.c:2387
+#: src/gtkblist.c:2700
 msgid "/Tools/R_oom List"
 msgstr "/Tools/R_oom List"
 
-#: src/gtkblist.c:2388
-msgid "/Tools/Pr_eferences"
-msgstr "/Tools/Pr_eferences"
-
-#: src/gtkblist.c:2389
-msgid "/Tools/Pr_ivacy"
-msgstr "/Tools/Pr_ivacy"
-
-#: src/gtkblist.c:2390
+#: src/gtkblist.c:2702
 #, fuzzy
 msgid "/Tools/Mute _Sounds"
 msgstr "Mute Sounds"
 
-#: src/gtkblist.c:2392
+#: src/gtkblist.c:2703
 msgid "/Tools/View System _Log"
 msgstr "/Tools/View System _Log"
 
 #. Help
-#: src/gtkblist.c:2395
+#: src/gtkblist.c:2706
 msgid "/_Help"
 msgstr "/_Help"
 
-#: src/gtkblist.c:2396
+#: src/gtkblist.c:2707
 msgid "/Help/Online _Help"
 msgstr "/Help/Online _Help"
 
-#: src/gtkblist.c:2397
+#: src/gtkblist.c:2708
 msgid "/Help/_Debug Window"
 msgstr "/Help/_Debug Window"
 
-#: src/gtkblist.c:2398
+#: src/gtkblist.c:2709
 msgid "/Help/_About"
 msgstr "/Help/_About"
 
-#: src/gtkblist.c:2416
-msgid "Rename Group"
-msgstr "Rename Group"
-
-#: src/gtkblist.c:2416
-msgid "New group name"
-msgstr "New group name"
-
-#: src/gtkblist.c:2417
-msgid "Please enter a new name for the selected group."
-msgstr "Please enter a new name for the selected group."
-
-#: src/gtkblist.c:2446
+#: src/gtkblist.c:2741 src/gtkblist.c:2808
 #, c-format
 msgid ""
 "\n"
@@ -2130,7 +2244,61 @@
 "\n"
 "<b>Account:</b> %s"
 
-#: src/gtkblist.c:2520
+#: src/gtkblist.c:2817
+#, fuzzy, c-format
+msgid ""
+"\n"
+"<b>Contact Alias:</b> %s"
+msgstr ""
+"\n"
+"<b>Contact Alias:</b>"
+
+#: src/gtkblist.c:2825
+#, fuzzy, c-format
+msgid ""
+"\n"
+"<b>Alias:</b> %s"
+msgstr ""
+"\n"
+"<b>Alias:</b>"
+
+#: src/gtkblist.c:2833
+#, fuzzy, c-format
+msgid ""
+"\n"
+"<b>Nickname:</b> %s"
+msgstr ""
+"\n"
+"<b>Nickname:</b>"
+
+#: src/gtkblist.c:2842
+#, fuzzy, c-format
+msgid ""
+"\n"
+"<b>Logged In:</b> %s"
+msgstr ""
+"\n"
+"<b>Logged In:</b>"
+
+#: src/gtkblist.c:2854
+#, fuzzy, c-format
+msgid ""
+"\n"
+"<b>Idle:</b> %s"
+msgstr ""
+"\n"
+"<b>Idle:</b>"
+
+#: src/gtkblist.c:2889
+#, fuzzy, c-format
+msgid ""
+"\n"
+"<b>Last Seen:</b> %s ago"
+msgstr ""
+"\n"
+"<b>%s:</b> %s"
+
+#: src/gtkblist.c:2897
 msgid ""
 "\n"
 "<b>Status:</b> Offline"
@@ -2138,77 +2306,7 @@
 "\n"
 "<b>Status:</b> Offline"
 
-#: src/gtkblist.c:2535
-#, c-format
-msgid "%d%%"
-msgstr "%d%%"
-
-#: src/gtkblist.c:2551
-msgid ""
-"\n"
-"<b>Account:</b>"
-msgstr ""
-"\n"
-"<b>Account:</b>"
-
-#: src/gtkblist.c:2552
-msgid ""
-"\n"
-"<b>Contact Alias:</b>"
-msgstr ""
-"\n"
-"<b>Contact Alias:</b>"
-
-#: src/gtkblist.c:2553
-msgid ""
-"\n"
-"<b>Alias:</b>"
-msgstr ""
-"\n"
-"<b>Alias:</b>"
-
-#: src/gtkblist.c:2554
-msgid ""
-"\n"
-"<b>Nickname:</b>"
-msgstr ""
-"\n"
-"<b>Nickname:</b>"
-
-#: src/gtkblist.c:2555
-msgid ""
-"\n"
-"<b>Logged In:</b>"
-msgstr ""
-"\n"
-"<b>Logged In:</b>"
-
-#: src/gtkblist.c:2556
-msgid ""
-"\n"
-"<b>Idle:</b>"
-msgstr ""
-"\n"
-"<b>Idle:</b>"
-
-#: src/gtkblist.c:2556
-#, fuzzy
-msgid ""
-"\n"
-"<b>Idle</b>"
-msgstr ""
-"\n"
-"<b>Idle:</b>"
-
-#: src/gtkblist.c:2558
-msgid ""
-"\n"
-"<b>Warned:</b>"
-msgstr ""
-"\n"
-"<b>Warned:</b>"
-
-#: src/gtkblist.c:2560
+#: src/gtkblist.c:2919
 msgid ""
 "\n"
 "<b>Description:</b> Spooky"
@@ -2216,116 +2314,127 @@
 "\n"
 "<b>Description:</b> Spooky"
 
-#: src/gtkblist.c:2561
-msgid ""
-"\n"
-"<b>Status</b>: Awesome"
+#: src/gtkblist.c:2921
+#, fuzzy
+msgid ""
+"\n"
+"<b>Status:</b> Awesome"
 msgstr ""
 "\n"
 "<b>Status</b>: Awesome"
 
-#: src/gtkblist.c:2562
-msgid ""
-"\n"
-"<b>Status</b>: Rockin'"
+#: src/gtkblist.c:2923
+#, fuzzy
+msgid ""
+"\n"
+"<b>Status:</b> Rockin'"
 msgstr ""
 "\n"
 "<b>Status</b>: Rockin'"
 
-#: src/gtkblist.c:2864
-#, c-format
-msgid "Idle (%dh%02dm) "
+#: src/gtkblist.c:3185
+#, fuzzy, c-format
+msgid "Idle (%dh %02dm) "
 msgstr "Idle (%dh%02dm) "
 
-#: src/gtkblist.c:2866
+#: src/gtkblist.c:3187
 #, c-format
 msgid "Idle (%dm) "
 msgstr "Idle (%dm) "
 
-#: src/gtkblist.c:2869
+#: src/gtkblist.c:3190
 #, fuzzy
 msgid "Idle "
 msgstr "Idle"
 
-#: src/gtkblist.c:2877
-#, c-format
-msgid "Warned (%d%%) "
-msgstr "Warned (%d%%) "
-
-#: src/gtkblist.c:2881
+#: src/gtkblist.c:3194
 msgid "Offline "
 msgstr "Offline "
 
-#. Make menu items sensitive/insensitive where appropriate
-#: src/gtkblist.c:3008
+#: src/gtkblist.c:3310
+#, fuzzy
+msgid "/Buddies/New Instant Message..."
+msgstr "/Buddies/New Instant _Message..."
+
+#: src/gtkblist.c:3311 src/gtkblist.c:3345
 msgid "/Buddies/Join a Chat..."
 msgstr "/Buddies/Join a Chat..."
 
-#: src/gtkblist.c:3011
+#: src/gtkblist.c:3312
+#, fuzzy
+msgid "/Buddies/Get User Info..."
+msgstr "/Buddies/Get User _Info..."
+
+#: src/gtkblist.c:3313
+#, fuzzy
+msgid "/Buddies/Add Buddy..."
+msgstr "/Buddies/_Add Buddy..."
+
+#: src/gtkblist.c:3314
+#, fuzzy
+msgid "/Buddies/Add Chat..."
+msgstr "/Buddies/Add C_hat..."
+
+#: src/gtkblist.c:3315
+#, fuzzy
+msgid "/Buddies/Add Group..."
+msgstr "/Buddies/Add _Group..."
+
+#: src/gtkblist.c:3348
 msgid "/Tools/Room List"
 msgstr "/Tools/Room List"
 
-#: src/gtkblist.c:3014
+#: src/gtkblist.c:3351
 msgid "/Tools/Privacy"
 msgstr "/Tools/Privacy"
 
-#: src/gtkblist.c:3070 src/gtkprefs.c:917 src/gtkprefs.c:1774
-#: src/protocols/jabber/jabber.c:935
+#: src/gtkblist.c:3427 src/gtkprefs.c:1771 src/protocols/jabber/jabber.c:941
+#: src/protocols/yahoo/yahoo.c:2749
 msgid "None"
 msgstr "None"
 
-#: src/gtkblist.c:3072
+#: src/gtkblist.c:3429
 msgid "Alphabetical"
 msgstr "Alphabetical"
 
-#: src/gtkblist.c:3073
+#: src/gtkblist.c:3430
 msgid "By status"
 msgstr "By status"
 
-#: src/gtkblist.c:3074
+#: src/gtkblist.c:3431
 msgid "By log size"
 msgstr "By log size"
 
-#: src/gtkblist.c:3110
-#, fuzzy
-msgid "Statuses"
-msgstr "Status"
-
-#. FIXME: Status
-#: src/gtkblist.c:3174
-msgid "/Tools/Away"
-msgstr "/Tools/Away"
-
-#: src/gtkblist.c:3177
+#: src/gtkblist.c:3542
 msgid "/Tools/Buddy Pounce"
 msgstr "/Tools/Buddy Pounce"
 
-#: src/gtkblist.c:3180
+#: src/gtkblist.c:3543
 msgid "/Tools/Account Actions"
 msgstr "/Tools/Account Actions"
 
-#: src/gtkblist.c:3183
+#: src/gtkblist.c:3544
 msgid "/Tools/Plugin Actions"
 msgstr "/Tools/Plugin Actions"
 
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: src/gtkblist.c:3280
+#: src/gtkblist.c:3642
 msgid "/Buddies/Show Offline Buddies"
 msgstr "/Buddies/Show Offline Buddies"
 
-#: src/gtkblist.c:3282
+#: src/gtkblist.c:3644
 msgid "/Buddies/Show Empty Groups"
 msgstr "/Buddies/Show Empty Groups"
 
-#: src/gtkblist.c:3979 src/protocols/silc/buddy.c:731
+#: src/gtkblist.c:4323 src/protocols/silc/buddy.c:731
 #: src/protocols/silc/buddy.c:989 src/protocols/silc/buddy.c:1034
-#: src/protocols/silc/buddy.c:1124 src/protocols/yahoo/yahoo.c:2822
+#: src/protocols/silc/buddy.c:1124 src/protocols/yahoo/yahoo.c:2847
 msgid "Add Buddy"
 msgstr "Add Buddy"
 
-#: src/gtkblist.c:4003
+#: src/gtkblist.c:4347
 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. "
@@ -2336,15 +2445,15 @@
 "The alias will be displayed in place of the screen name whenever possible.\n"
 
 #. Set up stuff for the account box
-#: src/gtkblist.c:4063 src/gtkblist.c:4368
+#: src/gtkblist.c:4410 src/gtkblist.c:4742
 msgid "Account:"
 msgstr "Account:"
 
-#: src/gtkblist.c:4301
+#: src/gtkblist.c:4675
 msgid "This protocol does not support chat rooms."
 msgstr "This protocol does not support chat rooms."
 
-#: src/gtkblist.c:4317
+#: src/gtkblist.c:4691
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
@@ -2352,11 +2461,11 @@
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
 
-#: src/gtkblist.c:4334
+#: src/gtkblist.c:4708
 msgid "Add Chat"
 msgstr "Add Chat"
 
-#: src/gtkblist.c:4358
+#: src/gtkblist.c:4732
 msgid ""
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
@@ -2364,41 +2473,24 @@
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
 
-#: src/gtkblist.c:4436
+#: src/gtkblist.c:4811
 msgid "Add Group"
 msgstr "Add Group"
 
-#: src/gtkblist.c:4437
+#: src/gtkblist.c:4812
 msgid "Please enter the name of the group to be added."
 msgstr "Please enter the name of the group to be added."
 
-#: src/gtkblist.c:5011 src/gtkblist.c:5108
+#: src/gtkblist.c:5362 src/gtkblist.c:5458
 msgid "No actions available"
 msgstr "No actions available"
 
-#: src/gtkconn.c:81 src/gtkconn.c:254 src/gtkconn.c:267
-msgid "Done."
-msgstr "Done."
-
-#: src/gtkconn.c:160
-#, fuzzy
-msgid "Logging in: "
-msgstr "Logging in"
-
-#: src/gtkconn.c:206
-#, fuzzy
-msgid "Logging In"
-msgstr "Logging in"
-
-#: src/gtkconn.c:218
-msgid "Cancel All"
-msgstr "Cancel All"
-
-#: src/gtkconn.c:367 src/gtkconn.c:599
-msgid "_Reconnect"
+#: src/gtkconn.c:171
+#, fuzzy
+msgid "Reconnect"
 msgstr "_Reconnect"
 
-#: src/gtkconn.c:563
+#: src/gtkconn.c:368
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">%s has been disconnected.</span>\n"
@@ -2411,37 +2503,51 @@
 "%s\n"
 "%s"
 
-#: src/gtkconn.c:565
+#: src/gtkconn.c:370
 msgid "Reason Unknown."
 msgstr "Reason Unknown."
 
-#: src/gtkconn.c:573
+#: src/gtkconn.c:378
 #, fuzzy
 msgid "Disconnected"
 msgstr "Disconnected."
 
-#: src/gtkconn.c:604
+#: src/gtkconn.c:404
+msgid "_Reconnect"
+msgstr "_Reconnect"
+
+#: src/gtkconn.c:409
 msgid "Reconnect _All"
 msgstr "Reconnect _All"
 
-#: src/gtkconn.c:634
+#: src/gtkconn.c:439
 msgid "Time"
 msgstr "Time"
 
-#: src/gtkconv.c:319
+#: src/gtkconv.c:148
+#, fuzzy
+msgid "Confirm close"
+msgstr "Confirm Account"
+
+#: src/gtkconv.c:180
+#, fuzzy
+msgid "You have unread messages. Are you sure you want to close the window?"
+msgstr "Are you sure you want to delete %s?"
+
+#: src/gtkconv.c:410
 #, c-format
 msgid "me is using Gaim v%s."
 msgstr "me is using Gaim v%s."
 
-#: src/gtkconv.c:328
+#: src/gtkconv.c:419
 msgid "Supported debug options are:  version"
 msgstr "Supported debug options are:  version"
 
-#: src/gtkconv.c:352
+#: src/gtkconv.c:456
 msgid "No such command (in this context)."
 msgstr "No such command (in this context)."
 
-#: src/gtkconv.c:355
+#: src/gtkconv.c:459
 msgid ""
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
 "The following commands are available in this context:\n"
@@ -2449,48 +2555,50 @@
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
 "The following commands are available in this context:\n"
 
-#: src/gtkconv.c:427
+#: src/gtkconv.c:531
 msgid "No such command."
 msgstr "No such command."
 
-#: src/gtkconv.c:434
+#: src/gtkconv.c:538
 msgid "Syntax Error:  You typed the wrong number of arguments to that command."
 msgstr ""
 "Syntax Error:  You typed the wrong number of arguments to that command."
 
-#: src/gtkconv.c:439
+#: src/gtkconv.c:543
 msgid "Your command failed for an unknown reason."
 msgstr "Your command failed for an unknown reason."
 
-#: src/gtkconv.c:446
-msgid "That command only works in Chats, not IMs."
+#: src/gtkconv.c:550
+#, fuzzy
+msgid "That command only works in chats, not IMs."
 msgstr "That command only works in Chats, not IMs."
 
-#: src/gtkconv.c:449
-msgid "That command only works in IMs, not Chats."
+#: src/gtkconv.c:553
+#, fuzzy
+msgid "That command only works in IMs, not chats."
 msgstr "That command only works in IMs, not Chats."
 
-#: src/gtkconv.c:453
+#: src/gtkconv.c:557
 msgid "That command doesn't work on this protocol."
 msgstr "That command doesn't work on this protocol."
 
-#: src/gtkconv.c:687 src/gtkconv.c:713
-msgid "That buddy is not on the same protocol as this chat"
-msgstr ""
-
-#: src/gtkconv.c:707
+#: src/gtkconv.c:783 src/gtkconv.c:809
+msgid "That buddy is not on the same protocol as this chat."
+msgstr ""
+
+#: src/gtkconv.c:803
 #, fuzzy
 msgid ""
 "You are not currently signed on with an account that can invite that buddy."
 msgstr ""
 "You are not currently signed on with an account that can add that buddy."
 
-#: src/gtkconv.c:761
+#: src/gtkconv.c:858
 msgid "Invite Buddy Into Chat Room"
 msgstr "Invite Buddy Into Chat Room"
 
 #. Put our happy label in it.
-#: src/gtkconv.c:791
+#: src/gtkconv.c:888
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
@@ -2498,345 +2606,292 @@
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
 
-#: src/gtkconv.c:812
+#: src/gtkconv.c:909
 msgid "_Buddy:"
 msgstr "_Buddy:"
 
-#: src/gtkconv.c:832
+#: src/gtkconv.c:929 src/gtksavedstatuses.c:774
 msgid "_Message:"
 msgstr "_Message:"
 
-#: src/gtkconv.c:888 src/gtkconv.c:2559 src/gtkdebug.c:179
+#: src/gtkconv.c:986 src/gtkconv.c:2636 src/gtkdebug.c:215 src/gtkft.c:473
 msgid "Unable to open file."
 msgstr "Unable to read file."
 
-#: src/gtkconv.c:893
+#: src/gtkconv.c:992
 #, c-format
 msgid "<h1>Conversation with %s</h1>\n"
 msgstr "<h1>Conversation with %s</h1>\n"
 
-#: src/gtkconv.c:907
+#: src/gtkconv.c:1016
 msgid "Save Conversation"
 msgstr "Save Conversation"
 
-#: src/gtkconv.c:992 src/gtkdebug.c:128
+#: src/gtkconv.c:1117 src/gtkdebug.c:163 src/gtkdebug.c:663
 msgid "Find"
 msgstr "Find"
 
-#: src/gtkconv.c:1018 src/gtkdebug.c:156
+#: src/gtkconv.c:1143 src/gtkdebug.c:191
 msgid "_Search for:"
 msgstr "_Search for:"
 
-#: src/gtkconv.c:1437
+#: src/gtkconv.c:1541
 msgid "IM"
 msgstr "IM"
 
-#. Send File button
-#: src/gtkconv.c:1443 src/gtkconv.c:3783 src/protocols/oscar/oscar.c:598
+#: src/gtkconv.c:1547 src/protocols/oscar/oscar.c:619
 msgid "Send File"
 msgstr "Send File"
 
-#: src/gtkconv.c:1450
+#: src/gtkconv.c:1554
 msgid "Un-Ignore"
 msgstr "Un-Ignore"
 
-#: src/gtkconv.c:1453 src/gtkprefs.c:781
+#: src/gtkconv.c:1557
 msgid "Ignore"
 msgstr "Ignore"
 
-#. Info button
-#: src/gtkconv.c:1458 src/gtkconv.c:3804
+#: src/gtkconv.c:1562
 msgid "Info"
 msgstr "Info"
 
-#: src/gtkconv.c:1464
+#: src/gtkconv.c:1568
 #, fuzzy
 msgid "Get Away Message"
 msgstr "New Away Message"
 
-#. Remove button
-#: src/gtkconv.c:1473 src/gtkconv.c:3797 src/gtkconv.c:3868
-#: src/gtkrequest.c:265
+#: src/gtkconv.c:1577 src/gtkrequest.c:266
 msgid "Remove"
 msgstr "Remove"
 
-#: src/gtkconv.c:2567
+#: src/gtkconv.c:2644
 msgid "Unable to save icon file to disk."
 msgstr "Unable to save icon file to disk."
 
-#: src/gtkconv.c:2588
+#: src/gtkconv.c:2667
 msgid "Save Icon"
 msgstr "Save Icon"
 
-#: src/gtkconv.c:2618
+#: src/gtkconv.c:2695
 msgid "Animate"
 msgstr "Animate"
 
-#: src/gtkconv.c:2623
+#: src/gtkconv.c:2700
 msgid "Hide Icon"
 msgstr "Hide Icon"
 
-#: src/gtkconv.c:2629
+#: src/gtkconv.c:2706
 msgid "Save Icon As..."
 msgstr "Save Icon As..."
 
-#: src/gtkconv.c:2996
+#: src/gtkconv.c:3067
 msgid "User is typing..."
 msgstr "User is typing..."
 
-#: src/gtkconv.c:3004
+#: src/gtkconv.c:3072
 msgid "User has typed something and paused"
 msgstr "User has typed something and paused"
 
 #. Build the Send As menu
-#: src/gtkconv.c:3107
+#: src/gtkconv.c:3173
 msgid "_Send As"
 msgstr "_Send As"
 
 #. Conversation menu
-#: src/gtkconv.c:3560
+#: src/gtkconv.c:3628
 msgid "/_Conversation"
 msgstr "/_Conversation"
 
-#: src/gtkconv.c:3562
+#: src/gtkconv.c:3630
 msgid "/Conversation/New Instant _Message..."
 msgstr "/Conversation/New Instant _Message..."
 
-#: src/gtkconv.c:3567
+#: src/gtkconv.c:3635
 msgid "/Conversation/_Find..."
 msgstr "/Conversation/_Find..."
 
-#: src/gtkconv.c:3569
+#: src/gtkconv.c:3637
 msgid "/Conversation/View _Log"
 msgstr "/Conversation/View _Log"
 
-#: src/gtkconv.c:3570
+#: src/gtkconv.c:3638
 msgid "/Conversation/_Save As..."
 msgstr "/Conversation/_Save As..."
 
-#: src/gtkconv.c:3572
+#: src/gtkconv.c:3640
 msgid "/Conversation/Clear"
 msgstr "/Conversation/Clear"
 
-#: src/gtkconv.c:3576
+#: src/gtkconv.c:3644
 msgid "/Conversation/Se_nd File..."
 msgstr "/Conversation/Se_nd File..."
 
-#: src/gtkconv.c:3577
+#: src/gtkconv.c:3645
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Conversation/Add Buddy _Pounce..."
 
-#: src/gtkconv.c:3579
+#: src/gtkconv.c:3647
 msgid "/Conversation/_Get Info"
 msgstr "/Conversation/_Get Info"
 
-#: src/gtkconv.c:3581
-msgid "/Conversation/_Warn..."
-msgstr "/Conversation/_Warn..."
-
-#: src/gtkconv.c:3583
+#: src/gtkconv.c:3649
 msgid "/Conversation/In_vite..."
 msgstr "/Conversation/In_vite..."
 
-#: src/gtkconv.c:3588
+#: src/gtkconv.c:3654
 msgid "/Conversation/Al_ias..."
 msgstr "/Conversation/Al_ias..."
 
-#: src/gtkconv.c:3590
+#: src/gtkconv.c:3656
 msgid "/Conversation/_Block..."
 msgstr "/Conversation/_Block..."
 
-#: src/gtkconv.c:3592
+#: src/gtkconv.c:3658
 msgid "/Conversation/_Add..."
 msgstr "/Conversation/_Add..."
 
-#: src/gtkconv.c:3594
+#: src/gtkconv.c:3660
 msgid "/Conversation/_Remove..."
 msgstr "/Conversation/_Remove..."
 
-#: src/gtkconv.c:3599
+#: src/gtkconv.c:3665
 msgid "/Conversation/Insert Lin_k..."
 msgstr "/Conversation/Insert Lin_k..."
 
-#: src/gtkconv.c:3601
+#: src/gtkconv.c:3667
 msgid "/Conversation/Insert Imag_e..."
 msgstr "/Conversation/Insert Imag_e..."
 
-#: src/gtkconv.c:3606
+#: src/gtkconv.c:3672
 msgid "/Conversation/_Close"
 msgstr "/Conversation/_Close"
 
 #. Options
-#: src/gtkconv.c:3610
+#: src/gtkconv.c:3676
 msgid "/_Options"
 msgstr "/_Options"
 
-#: src/gtkconv.c:3611
+#: src/gtkconv.c:3677
 msgid "/Options/Enable _Logging"
 msgstr "/Options/Enable _Logging"
 
-#: src/gtkconv.c:3612
+#: src/gtkconv.c:3678
 msgid "/Options/Enable _Sounds"
 msgstr "/Options/Enable _Sounds"
 
-#: src/gtkconv.c:3613
-msgid "/Options/Show Formatting _Toolbar"
+#: src/gtkconv.c:3679
+#, fuzzy
+msgid "/Options/Show Formatting _Toolbars"
 msgstr "/Options/Show Formatting _Toolbar"
 
-#: src/gtkconv.c:3614
+#: src/gtkconv.c:3680
 msgid "/Options/Show Ti_mestamps"
 msgstr "/Options/Show Ti_mestamps"
 
-#: src/gtkconv.c:3656
+#: src/gtkconv.c:3681
+#, fuzzy
+msgid "/Options/Show Buddy _Icon"
+msgstr "Show buddy _icons"
+
+#: src/gtkconv.c:3725
 msgid "/Conversation/View Log"
 msgstr "/Conversation/View Log"
 
-#: src/gtkconv.c:3661
+#: src/gtkconv.c:3731
 msgid "/Conversation/Send File..."
 msgstr "/Conversation/Send File..."
 
-#: src/gtkconv.c:3665
+#: src/gtkconv.c:3735
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Conversation/Add Buddy Pounce..."
 
-#: src/gtkconv.c:3671
+#: src/gtkconv.c:3741
 msgid "/Conversation/Get Info"
 msgstr "/Conversation/Get Info"
 
-#: src/gtkconv.c:3675
-msgid "/Conversation/Warn..."
-msgstr "/Conversation/Warn..."
-
-#: src/gtkconv.c:3679
+#: src/gtkconv.c:3745
 msgid "/Conversation/Invite..."
 msgstr "/Conversation/Invite..."
 
-#: src/gtkconv.c:3685
+#: src/gtkconv.c:3751
 msgid "/Conversation/Alias..."
 msgstr "/Conversation/Alias..."
 
-#: src/gtkconv.c:3689
+#: src/gtkconv.c:3755
 msgid "/Conversation/Block..."
 msgstr "/Conversation/Block..."
 
-#: src/gtkconv.c:3693
+#: src/gtkconv.c:3759
 msgid "/Conversation/Add..."
 msgstr "/Conversation/Add..."
 
-#: src/gtkconv.c:3697
+#: src/gtkconv.c:3763
 msgid "/Conversation/Remove..."
 msgstr "/Conversation/Remove..."
 
-#: src/gtkconv.c:3703
+#: src/gtkconv.c:3769
 msgid "/Conversation/Insert Link..."
 msgstr "/Conversation/Insert Link..."
 
-#: src/gtkconv.c:3707
+#: src/gtkconv.c:3773
 msgid "/Conversation/Insert Image..."
 msgstr "/Conversation/Insert Image..."
 
-#: src/gtkconv.c:3713
+#: src/gtkconv.c:3779
 msgid "/Options/Enable Logging"
 msgstr "/Options/Enable Logging"
 
-#: src/gtkconv.c:3716
+#: src/gtkconv.c:3782
 msgid "/Options/Enable Sounds"
 msgstr "/Options/Enable Sounds"
 
-#: src/gtkconv.c:3719
-msgid "/Options/Show Formatting Toolbar"
+#: src/gtkconv.c:3785
+#, fuzzy
+msgid "/Options/Show Formatting Toolbars"
 msgstr "/Options/Show Formatting Toolbar"
 
-#: src/gtkconv.c:3722
+#: src/gtkconv.c:3788
 msgid "/Options/Show Timestamps"
 msgstr "/Options/Show Timestamps"
 
-#. The buttons, from left to right
-#. Block button
-#: src/gtkconv.c:3776 src/gtkprivacy.c:625 src/gtkprivacy.c:636
-msgid "Block"
-msgstr "Block"
-
-#: src/gtkconv.c:3777
-msgid "Block the user"
-msgstr "Block the user"
-
-#: src/gtkconv.c:3784
-msgid "Send a file to the user"
-msgstr "Send a file to the user"
-
 #: src/gtkconv.c:3791
-msgid "Add the user to your buddy list"
-msgstr "Add the user to your buddy list"
-
-#: src/gtkconv.c:3798
-msgid "Remove the user from your buddy list"
-msgstr "Remove the user from your buddy list"
-
-#: src/gtkconv.c:3805 src/gtkconv.c:4126
-msgid "Get the user's information"
-msgstr "Get the user's information"
-
-#. Send button
-#: src/gtkconv.c:3811 src/gtkconv.c:3875
-msgid "Send"
-msgstr "Send"
-
-#: src/gtkconv.c:3812 src/gtkconv.c:3876
-msgid "Send message"
-msgstr "Send message"
-
-#. The buttons, from left to right
-#. Invite
-#: src/gtkconv.c:3854
-msgid "Invite"
-msgstr "Invite"
-
-#: src/gtkconv.c:3855
-msgid "Invite a user"
-msgstr "Invite a user"
-
-#: src/gtkconv.c:3862
-msgid "Add the chat to your buddy list"
-msgstr "Add the chat to your buddy list"
-
-#: src/gtkconv.c:3869
-msgid "Remove the chat from your buddy list"
-msgstr "Remove the chat from your buddy list"
-
-#: src/gtkconv.c:3993
+#, fuzzy
+msgid "/Options/Show Buddy Icon"
+msgstr "Show buddy _icons"
+
+#: src/gtkconv.c:3911
 msgid "Topic:"
 msgstr "Topic:"
 
 #. Setup the label telling how many people are in the room.
-#: src/gtkconv.c:4042
+#: src/gtkconv.c:3959
 msgid "0 people in room"
 msgstr "0 people in room"
 
-#: src/gtkconv.c:4103
+#: src/gtkconv.c:4021
 msgid "IM the user"
 msgstr "IM the user"
 
-#: src/gtkconv.c:4115
+#: src/gtkconv.c:4034
 msgid "Ignore the user"
 msgstr "Ignore the user"
 
-#: src/gtkconv.c:4634
+#: src/gtkconv.c:4046
+msgid "Get the user's information"
+msgstr "Get the user's information"
+
+#: src/gtkconv.c:4569
 msgid "Close conversation"
 msgstr "Close conversation"
 
-#: src/gtkconv.c:5169 src/gtkconv.c:5198 src/gtkconv.c:5294 src/gtkconv.c:5352
+#: src/gtkconv.c:5192 src/gtkconv.c:5220 src/gtkconv.c:5316 src/gtkconv.c:5373
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "%d person in room"
 msgstr[1] "%d people in room"
 
-#: src/gtkconv.c:5925 src/gtkconv.c:5928
-msgid "<main>/Conversation/Close"
-msgstr "<main>/Conversation/Close"
-
-#: src/gtkconv.c:6249
+#: src/gtkconv.c:6279
 msgid ""
 "say &lt;message&gt;:  Send a message normally as if you weren't using a "
 "command."
@@ -2844,11 +2899,11 @@
 "say &lt;message&gt;:  Send a message normally as if you weren't using a "
 "command."
 
-#: src/gtkconv.c:6252
+#: src/gtkconv.c:6282
 msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
 msgstr "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
 
-#: src/gtkconv.c:6255
+#: src/gtkconv.c:6285
 msgid ""
 "debug &lt;option&gt;:  Send various debug information to the current "
 "conversation."
@@ -2856,359 +2911,385 @@
 "debug &lt;option&gt;:  Send various debug information to the current "
 "conversation."
 
-#: src/gtkconv.c:6259
+#: src/gtkconv.c:6288
+#, fuzzy
+msgid "clear: Clears the conversation scrollback."
+msgstr "%s has closed the conversation window."
+
+#: src/gtkconv.c:6291
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr "help &lt;command&gt;:  Help on a specific command."
 
-#: src/gtkdebug.c:194
+#: src/gtkdebug.c:230
 msgid "Save Debug Log"
 msgstr "Save Debug Log"
 
-#: src/gtkdebug.c:247
+#: src/gtkdebug.c:571
+#, fuzzy
+msgid "Invert"
+msgstr "_Insert"
+
+#: src/gtkdebug.c:574
+msgid "Highlight matches"
+msgstr ""
+
+#: src/gtkdebug.c:621
 msgid "Debug Window"
 msgstr "Debug Window"
 
-#: src/gtkdebug.c:285
+#: src/gtkdebug.c:674
+#, fuzzy
+msgid "Clear"
+msgstr "Close"
+
+#: src/gtkdebug.c:683
 msgid "Pause"
 msgstr "Pause"
 
-#: src/gtkdebug.c:291
+#: src/gtkdebug.c:690 src/gtkdebug.c:691
 msgid "Timestamps"
 msgstr "Timestamps"
 
-#: src/gtkdialogs.c:66
-msgid "maintainer"
-msgstr "maintainer"
-
-#: src/gtkdialogs.c:67
+#: src/gtkdebug.c:709
+#, fuzzy
+msgid "Filter"
+msgstr "Failed"
+
+#: src/gtkdebug.c:722
+#, fuzzy
+msgid "Right click for more options."
+msgstr "Show more options"
+
+#: src/gtkdialogs.c:59 src/gtkdialogs.c:89
 msgid "lead developer"
 msgstr "lead developer"
 
-#: src/gtkdialogs.c:68
-msgid "developer & webmaster"
-msgstr "developer & webmaster"
-
-#: src/gtkdialogs.c:69
-msgid "win32 port"
-msgstr "win32 port"
-
-#: src/gtkdialogs.c:70 src/gtkdialogs.c:71 src/gtkdialogs.c:72
-#: src/gtkdialogs.c:73 src/gtkdialogs.c:75
+#: src/gtkdialogs.c:60 src/gtkdialogs.c:63 src/gtkdialogs.c:64
+#: src/gtkdialogs.c:65 src/gtkdialogs.c:66 src/gtkdialogs.c:67
+#: src/gtkdialogs.c:69 src/gtkdialogs.c:70 src/gtkdialogs.c:71
 msgid "developer"
 msgstr "developer"
 
-#: src/gtkdialogs.c:74
+#: src/gtkdialogs.c:61
+msgid "developer & webmaster"
+msgstr "developer & webmaster"
+
+#: src/gtkdialogs.c:62
+msgid "win32 port"
+msgstr "win32 port"
+
+#: src/gtkdialogs.c:68
 msgid "support"
 msgstr "support"
 
-#: src/gtkdialogs.c:80
-msgid "former libfaim maintainer"
+#: src/gtkdialogs.c:87 src/gtkdialogs.c:90
+msgid "maintainer"
+msgstr "maintainer"
+
+#: src/gtkdialogs.c:88
+#, fuzzy
+msgid "libfaim maintainer"
 msgstr "former libfaim maintainer"
 
-#: src/gtkdialogs.c:81
-msgid "former lead developer"
-msgstr "former lead developer"
-
-#: src/gtkdialogs.c:82
-msgid "former maintainer"
-msgstr "former maintainer"
-
-#: src/gtkdialogs.c:83
-msgid "former Jabber developer"
+#: src/gtkdialogs.c:91
+#, fuzzy
+msgid "Jabber developer"
 msgstr "former Jabber developer"
 
-#: src/gtkdialogs.c:84
+#: src/gtkdialogs.c:92
 msgid "original author"
 msgstr "original author"
 
-#: src/gtkdialogs.c:85
+#: src/gtkdialogs.c:93
 msgid "hacker and designated driver [lazy bum]"
 msgstr "hacker and designated driver [lazy bum]"
 
-#: src/gtkdialogs.c:90 src/gtkdialogs.c:128
+#: src/gtkdialogs.c:98 src/gtkdialogs.c:99 src/gtkdialogs.c:141
 msgid "Bulgarian"
 msgstr "Bulgarian"
 
-#: src/gtkdialogs.c:91 src/gtkdialogs.c:129 src/gtkdialogs.c:130
+#: src/gtkdialogs.c:100 src/gtkdialogs.c:142 src/gtkdialogs.c:143
 msgid "Catalan"
 msgstr "Catalan"
 
-#: src/gtkdialogs.c:92 src/gtkdialogs.c:131
+#: src/gtkdialogs.c:101 src/gtkdialogs.c:144
 msgid "Czech"
 msgstr "Czech"
 
-#: src/gtkdialogs.c:93
+#: src/gtkdialogs.c:102
 msgid "Danish"
 msgstr "Danish"
 
-#: src/gtkdialogs.c:94
+#: src/gtkdialogs.c:103 src/gtkdialogs.c:145
+msgid "German"
+msgstr "German"
+
+#: src/gtkdialogs.c:104
 #, fuzzy
 msgid "Australian English"
 msgstr "Canadian English"
 
-#: src/gtkdialogs.c:95
+#: src/gtkdialogs.c:105
 msgid "British English"
 msgstr "Proper English"
 
-#: src/gtkdialogs.c:96
+#: src/gtkdialogs.c:106
 msgid "Canadian English"
 msgstr "Canadian English"
 
-#: src/gtkdialogs.c:97 src/gtkdialogs.c:132
-msgid "German"
-msgstr "German"
-
-#: src/gtkdialogs.c:98 src/gtkdialogs.c:133
+#: src/gtkdialogs.c:107 src/gtkdialogs.c:146
 msgid "Spanish"
 msgstr "Spanish"
 
-#: src/gtkdialogs.c:99 src/gtkdialogs.c:134
+#: src/gtkdialogs.c:108 src/gtkdialogs.c:147
 msgid "Finnish"
 msgstr "Finnish"
 
-#: src/gtkdialogs.c:100 src/gtkdialogs.c:135
+#: src/gtkdialogs.c:109 src/gtkdialogs.c:148
 msgid "French"
 msgstr "French"
 
-#: src/gtkdialogs.c:101
+#: src/gtkdialogs.c:110
 msgid "Hebrew"
 msgstr "Hebrew"
 
-#: src/gtkdialogs.c:102
+#: src/gtkdialogs.c:111
 msgid "Hindi"
 msgstr "Hindi"
 
-#: src/gtkdialogs.c:103
+#: src/gtkdialogs.c:112
 msgid "Hungarian"
 msgstr "Hungarian"
 
-#: src/gtkdialogs.c:104 src/gtkdialogs.c:136
+#: src/gtkdialogs.c:113 src/gtkdialogs.c:149
 msgid "Italian"
 msgstr "Italian"
 
-#: src/gtkdialogs.c:105 src/gtkdialogs.c:137
+#: src/gtkdialogs.c:114 src/gtkdialogs.c:150
 msgid "Japanese"
 msgstr "Japanese"
 
-#: src/gtkdialogs.c:106
+#: src/gtkdialogs.c:115
 msgid "Lithuanian"
 msgstr "Lithuanian"
 
-#: src/gtkdialogs.c:107 src/gtkdialogs.c:138
+#: src/gtkdialogs.c:116
+#, fuzzy
+msgid "Georgian"
+msgstr "German"
+
+#: src/gtkdialogs.c:117 src/gtkdialogs.c:151
 msgid "Korean"
 msgstr "Korean"
 
-#: src/gtkdialogs.c:108
-msgid "Dutch; Flemish"
+#: src/gtkdialogs.c:118
+#, fuzzy
+msgid "Dutch, Flemish"
 msgstr "Dutch; Flemish"
 
-#: src/gtkdialogs.c:109
+#: src/gtkdialogs.c:119
 msgid "Macedonian"
 msgstr "Macedonian"
 
-#: src/gtkdialogs.c:110
+#: src/gtkdialogs.c:120
 msgid "Norwegian"
 msgstr "Norwegian"
 
-#: src/gtkdialogs.c:111 src/gtkdialogs.c:139
+#: src/gtkdialogs.c:121 src/gtkdialogs.c:122 src/gtkdialogs.c:152
 msgid "Polish"
 msgstr "Polish"
 
-#: src/gtkdialogs.c:112
+#: src/gtkdialogs.c:123
 msgid "Portuguese"
 msgstr "Portuguese"
 
-#: src/gtkdialogs.c:113
+#: src/gtkdialogs.c:124
 msgid "Portuguese-Brazil"
 msgstr "Portuguese-Brazil"
 
-#: src/gtkdialogs.c:114
+#: src/gtkdialogs.c:125
 msgid "Romanian"
 msgstr "Romanian"
 
-#: src/gtkdialogs.c:115 src/gtkdialogs.c:140 src/gtkdialogs.c:141
+#: src/gtkdialogs.c:126 src/gtkdialogs.c:153 src/gtkdialogs.c:154
 msgid "Russian"
 msgstr "Russian"
 
-#: src/gtkdialogs.c:116
+#: src/gtkdialogs.c:127 src/gtkdialogs.c:128
 msgid "Serbian"
 msgstr "Serbian"
 
-#: src/gtkdialogs.c:117
+#: src/gtkdialogs.c:129
 msgid "Slovenian"
 msgstr "Slovenian"
 
-#: src/gtkdialogs.c:118 src/gtkdialogs.c:143
+#: src/gtkdialogs.c:130 src/gtkdialogs.c:156
 msgid "Swedish"
 msgstr "Swedish"
 
-#: src/gtkdialogs.c:119
+#: src/gtkdialogs.c:131
 msgid "Vietnamese"
 msgstr "Vietnamese"
 
-#: src/gtkdialogs.c:119
+#: src/gtkdialogs.c:131
 msgid "T.M.Thanh and the Gnome-Vi Team"
 msgstr "T.M.Thanh and the Gnome-Vi Team"
 
-#: src/gtkdialogs.c:120
+#: src/gtkdialogs.c:132 src/gtkdialogs.c:157
 msgid "Simplified Chinese"
 msgstr "Simplified Chinese"
 
-#: src/gtkdialogs.c:121
+#: src/gtkdialogs.c:133 src/gtkdialogs.c:134 src/gtkdialogs.c:158
 msgid "Traditional Chinese"
 msgstr "Traditional Chinese"
 
-#: src/gtkdialogs.c:127
+#: src/gtkdialogs.c:140
 msgid "Amharic"
 msgstr "Amharic"
 
-#: src/gtkdialogs.c:142
+#: src/gtkdialogs.c:155
 msgid "Slovak"
 msgstr "Slovak"
 
-#: src/gtkdialogs.c:144
-msgid "Chinese"
-msgstr "Chinese"
-
-#: src/gtkdialogs.c:185
+#: src/gtkdialogs.c:199
 msgid "About Gaim"
 msgstr "About Gaim"
 
-#: src/gtkdialogs.c:208
+#: src/gtkdialogs.c:223
+#, fuzzy
 msgid ""
 "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, "
 "Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu all "
-"at once.  It is written using GTK+ and is licensed under the GPL.<BR><BR>"
+"at once.  It is written using GTK+ and is licensed under the GNU GPL.<BR><BR>"
 msgstr ""
 "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, "
 "Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu all "
 "at once.  It is written using GTK+ and is licensed under the GPL.<BR><BR>"
 
-#: src/gtkdialogs.c:217
+#: src/gtkdialogs.c:232
+#, fuzzy
+msgid "<FONT SIZE=\"4\">IRC:</FONT> #wingaim on irc.freenode.net<BR><BR>"
+msgstr "<FONT SIZE=\"4\">IRC:</FONT> #gaim on irc.freenode.net<BR><BR>"
+
+#: src/gtkdialogs.c:235
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #gaim on irc.freenode.net<BR><BR>"
 msgstr "<FONT SIZE=\"4\">IRC:</FONT> #gaim on irc.freenode.net<BR><BR>"
 
-#: src/gtkdialogs.c:222
+#: src/gtkdialogs.c:241
 msgid "Active Developers"
 msgstr "Active Developers"
 
-#: src/gtkdialogs.c:237
+#: src/gtkdialogs.c:256
 msgid "Crazy Patch Writers"
 msgstr "Crazy Patch Writers"
 
-#: src/gtkdialogs.c:252
+#: src/gtkdialogs.c:271
 msgid "Retired Developers"
 msgstr "Retired Developers"
 
-#: src/gtkdialogs.c:267
+#: src/gtkdialogs.c:286
 msgid "Current Translators"
 msgstr "Current Translators"
 
-#: src/gtkdialogs.c:287
+#: src/gtkdialogs.c:306
 msgid "Past Translators"
 msgstr "Past Translators"
 
-#: src/gtkdialogs.c:357 src/gtkdialogs.c:500 src/gtkdialogs.c:555
-msgid "_Screen name"
-msgstr "_Screen name"
-
-#: src/gtkdialogs.c:363 src/gtkdialogs.c:506 src/gtkdialogs.c:561
+#: src/gtkdialogs.c:324
+#, fuzzy
+msgid "Debugging Information"
+msgstr "User Information"
+
+#: src/gtkdialogs.c:486 src/gtkdialogs.c:629 src/gtkdialogs.c:684
+#, fuzzy
+msgid "_Name"
+msgstr "Name"
+
+#: src/gtkdialogs.c:491 src/gtkdialogs.c:634 src/gtkdialogs.c:689
 msgid "_Account"
 msgstr "_Account"
 
-#: src/gtkdialogs.c:370
+#: src/gtkdialogs.c:499
 msgid "New Instant Message"
 msgstr "New Instant Message"
 
-#: src/gtkdialogs.c:372
-msgid "Please enter the screen name of the person you would like to IM."
+#: src/gtkdialogs.c:501
+#, fuzzy
+msgid ""
+"Please enter the screen name or alias of the person you would like to IM."
 msgstr "Please enter the screen name of the person you would like to IM."
 
-#: src/gtkdialogs.c:513
+#: src/gtkdialogs.c:642
 msgid "Get User Info"
 msgstr "Get User Info"
 
-#: src/gtkdialogs.c:515
-msgid ""
-"Please enter the screen name of the person whose info you would like to view."
+#: src/gtkdialogs.c:644
+#, fuzzy
+msgid ""
+"Please enter the screen name or alias of the person whose info you would "
+"like to view."
 msgstr ""
 "Please enter the screen name of the person whose info you would like to view."
 
-#: src/gtkdialogs.c:569
-msgid "Get User Log"
+#: src/gtkdialogs.c:698
+#, fuzzy
+msgid "View User Log"
 msgstr "Get User Log"
 
-#: src/gtkdialogs.c:571
-msgid ""
-"Please enter the screen name of the person whose log you would like to view."
+#: src/gtkdialogs.c:700
+#, fuzzy
+msgid ""
+"Please enter the screen name or alias of the person whose log you would like "
+"to view."
 msgstr ""
 "Please enter the screen name of the person whose log you would like to view."
 
-#: src/gtkdialogs.c:611
-msgid "Warn User"
-msgstr "Warn User"
-
-#: src/gtkdialogs.c:632
-#, c-format
-msgid ""
-"<span weight=\"bold\" size=\"larger\">Warn %s?</span>\n"
-"\n"
-"This will increase %s's warning level and he or she will be subject to "
-"harsher rate limiting.\n"
-msgstr ""
-"<span weight=\"bold\" size=\"larger\">Warn %s?</span>\n"
-"\n"
-"This will increase %s's warning level and he or she will be subject to "
-"harsher rate limiting.\n"
-
-#: src/gtkdialogs.c:641
-msgid "Warn _anonymously?"
-msgstr "Warn _anonymously?"
-
-#: src/gtkdialogs.c:648
-msgid "<b>Anonymous warnings are less severe.</b>"
-msgstr "<b>Anonymous warnings are less severe.</b>"
-
-#: src/gtkdialogs.c:669
+#: src/gtkdialogs.c:719
 msgid "Alias Contact"
 msgstr "Alias Contact"
 
-#: src/gtkdialogs.c:670
+#: src/gtkdialogs.c:720
 msgid "Enter an alias for this contact."
 msgstr "Enter an alias for this contact."
 
-#: src/gtkdialogs.c:672 src/gtkdialogs.c:694 src/gtkdialogs.c:714
-#: src/gtkrequest.c:267 src/protocols/silc/chat.c:584
+#: src/gtkdialogs.c:722 src/gtkdialogs.c:744 src/gtkdialogs.c:764
+#: src/gtkrequest.c:268 src/protocols/silc/chat.c:585
 msgid "Alias"
 msgstr "Alias"
 
-#: src/gtkdialogs.c:690
+#: src/gtkdialogs.c:740
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "Enter an alias for %s."
 
-#: src/gtkdialogs.c:692
+#: src/gtkdialogs.c:742
 msgid "Alias Buddy"
 msgstr "Alias Buddy"
 
-#: src/gtkdialogs.c:711
+#: src/gtkdialogs.c:761
 msgid "Alias Chat"
 msgstr "Alias Chat"
 
-#: src/gtkdialogs.c:712
+#: src/gtkdialogs.c:762
 msgid "Enter an alias for this chat."
 msgstr "Enter an alias for this chat."
 
-#: src/gtkdialogs.c:746
-#, c-format
-msgid ""
+#: src/gtkdialogs.c:799
+#, fuzzy, c-format
+msgid ""
+"You are about to remove the contact containing %s and %d other buddy from "
+"your buddy list.  Do you want to continue?"
+msgid_plural ""
 "You are about to remove the contact containing %s and %d other buddies from "
 "your buddy list.  Do you want to continue?"
-msgstr ""
+msgstr[0] ""
 "You are about to remove the contact containing %s and %d other buddies from "
 "your buddy list.  Do you want to continue?"
-
-#: src/gtkdialogs.c:808
+msgstr[1] ""
+"You are about to remove the contact containing %s and %d other buddies from "
+"your buddy list.  Do you want to continue?"
+
+#: src/gtkdialogs.c:866
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
@@ -3217,22 +3298,22 @@
 "You are about to remove the group %s and all its members from your buddy "
 "list.  Do you want to continue?"
 
-#: src/gtkdialogs.c:811 src/gtkdialogs.c:812
+#: src/gtkdialogs.c:869 src/gtkdialogs.c:870
 msgid "Remove Group"
 msgstr "Remove Group"
 
-#: src/gtkdialogs.c:850
+#: src/gtkdialogs.c:908
 #, c-format
 msgid ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
 
-#: src/gtkdialogs.c:853 src/gtkdialogs.c:854
+#: src/gtkdialogs.c:911 src/gtkdialogs.c:912
 msgid "Remove Buddy"
 msgstr "Remove Buddy"
 
-#: src/gtkdialogs.c:887
+#: src/gtkdialogs.c:950
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
@@ -3241,115 +3322,135 @@
 "You are about to remove the chat %s from your buddy list.  Do you want to "
 "continue?"
 
-#: src/gtkdialogs.c:891 src/gtkdialogs.c:892
+#: src/gtkdialogs.c:953 src/gtkdialogs.c:954
 msgid "Remove Chat"
 msgstr "Remove Chat"
 
-#: src/gtkft.c:140
+#: src/gtkft.c:141
 #, c-format
 msgid "%.2f KB/s"
 msgstr "%.2f KB/s"
 
-#: src/gtkft.c:161 src/gtkft.c:978
+#: src/gtkft.c:162 src/gtkft.c:1046
 msgid "Finished"
 msgstr "Finished"
 
-#: src/gtkft.c:164 src/gtkft.c:929
+#: src/gtkft.c:165 src/gtkft.c:997
 msgid "Canceled"
 msgstr "Cancelled"
 
-#: src/gtkft.c:167 src/gtkft.c:848
+#: src/gtkft.c:168 src/gtkft.c:916
 msgid "Waiting for transfer to begin"
 msgstr "Waiting for transfer to begin"
 
-#: src/gtkft.c:220
+#: src/gtkft.c:221
 msgid "<b>Receiving As:</b>"
 msgstr "<b>Receiving As:</b>"
 
-#: src/gtkft.c:222
+#: src/gtkft.c:223
 msgid "<b>Receiving From:</b>"
 msgstr "<b>Receiving From:</b>"
 
-#: src/gtkft.c:226
+#: src/gtkft.c:227
 msgid "<b>Sending To:</b>"
 msgstr "<b>Sending To:</b>"
 
-#: src/gtkft.c:228
+#: src/gtkft.c:229
 msgid "<b>Sending As:</b>"
 msgstr "<b>Sending As:</b>"
 
-#: src/gtkft.c:407
+#: src/gtkft.c:445
 msgid "There is no application configured to open this type of file."
 msgstr "There is no application configured to open this type of file."
 
-#: src/gtkft.c:412
+#: src/gtkft.c:450
 msgid "An error occurred while opening the file."
 msgstr "An error occurred while opening the file."
 
-#: src/gtkft.c:503
+#: src/gtkft.c:470
+#, fuzzy, c-format
+msgid "Error launching %s: %s"
+msgstr "Error launching <b>%s</b>: %s"
+
+#: src/gtkft.c:479
+#, fuzzy, c-format
+msgid "Error running %s"
+msgstr "Error joining chat %s"
+
+#: src/gtkft.c:480
+#, c-format
+msgid "Process returned error code %d"
+msgstr ""
+
+#: src/gtkft.c:575
 msgid "Progress"
 msgstr "Progress"
 
-#: src/gtkft.c:510
+#: src/gtkft.c:582
 msgid "Filename"
 msgstr "Filename"
 
-#: src/gtkft.c:517
+#: src/gtkft.c:589
 msgid "Size"
 msgstr "Size"
 
-#: src/gtkft.c:524
+#: src/gtkft.c:596
 msgid "Remaining"
 msgstr "Remaining"
 
-#: src/gtkft.c:556
+#: src/gtkft.c:627
 msgid "Filename:"
 msgstr "Filename:"
 
-#: src/gtkft.c:557
+#: src/gtkft.c:628
+#, fuzzy
+msgid "Local File:"
+msgstr "Local Users"
+
+#: src/gtkft.c:629
 msgid "Status:"
 msgstr "Status:"
 
-#: src/gtkft.c:558
+#: src/gtkft.c:630
 msgid "Speed:"
 msgstr "Speed:"
 
-#: src/gtkft.c:559
+#: src/gtkft.c:631
 msgid "Time Elapsed:"
 msgstr "Time Elapsed:"
 
-#: src/gtkft.c:560
+#: src/gtkft.c:632
 msgid "Time Remaining:"
 msgstr "Time Remaining:"
 
-#: src/gtkft.c:652
+#: src/gtkft.c:718
 msgid "_Keep the dialog open"
 msgstr "_Keep the dialog open"
 
-#: src/gtkft.c:662
+#: src/gtkft.c:728
 msgid "_Clear finished transfers"
 msgstr "_Clear finished transfers"
 
 #. "Download Details" arrow
-#: src/gtkft.c:671
+#: src/gtkft.c:737
 msgid "Show transfer details"
 msgstr "Show transfer details"
 
-#: src/gtkft.c:672
+#: src/gtkft.c:738
 msgid "Hide transfer details"
 msgstr "Hide transfer details"
 
 #. Pause button
-#: src/gtkft.c:714 src/gtkstock.c:93
+#: src/gtkft.c:775 src/gtkstock.c:106
 msgid "_Pause"
 msgstr "_Pause"
 
 #. Resume button
-#: src/gtkft.c:724
+#: src/gtkft.c:785
 msgid "_Resume"
 msgstr "_Resume"
 
-#: src/gtkft.c:931
+#: src/gtkft.c:999
 msgid "Failed"
 msgstr "Failed"
 
@@ -3361,72 +3462,102 @@
 msgid "Size of the expander arrow"
 msgstr "Size of the expander arrow"
 
-#: src/gtkimhtml.c:536
+#: src/gtkimhtml.c:816
 msgid "Pa_ste As Text"
 msgstr "Pa_ste As Text"
 
-#: src/gtkimhtml.c:1019
+#: src/gtkimhtml.c:1263
 msgid "Hyperlink color"
 msgstr "Hyperlink colour"
 
-#: src/gtkimhtml.c:1020
+#: src/gtkimhtml.c:1264
 msgid "Color to draw hyperlinks."
 msgstr "Colour to draw hyperlinks."
 
-#: src/gtkimhtml.c:1237
+#: src/gtkimhtml.c:1267
+#, fuzzy
+msgid "Hyperlink prelight color"
+msgstr "Hyperlink colour"
+
+#: src/gtkimhtml.c:1268
+#, fuzzy
+msgid "Color to draw hyperlinks when mouse is over them."
+msgstr "Colour to draw hyperlinks."
+
+#: src/gtkimhtml.c:1486
 msgid "_Copy E-Mail Address"
 msgstr "_Copy E-Mail Address"
 
-#: src/gtkimhtml.c:1249
-msgid "_Copy Link Location"
-msgstr "_Copy Link Location"
-
-#: src/gtkimhtml.c:1259
+#: src/gtkimhtml.c:1498
 msgid "_Open Link in Browser"
 msgstr "_Open Link in Browser"
 
-#: src/gtkimhtml.c:2817
-msgid ""
-"Unable to guess the image type based on the file extension supplied.  "
+#: src/gtkimhtml.c:1508
+msgid "_Copy Link Location"
+msgstr "_Copy Link Location"
+
+#: src/gtkimhtml.c:3182
+msgid ""
+"<span size='larger' weight='bold'>Unrecognized file type</span>\n"
+"\n"
 "Defaulting to PNG."
 msgstr ""
-"Unable to guess the image type based on the file extension supplied.  "
+
+#: src/gtkimhtml.c:3185
+msgid ""
+"Unrecognized file type\n"
+"\n"
 "Defaulting to PNG."
-
-#: src/gtkimhtml.c:2825
-#, c-format
-msgid "Error saving image: %s"
+msgstr ""
+
+#: src/gtkimhtml.c:3198
+#, fuzzy, c-format
+msgid ""
+"<span size='larger' weight='bold'>Error saving image</span>\n"
+"\n"
+"%s"
+msgstr ""
+"<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
+"\n"
+"%s"
+
+#: src/gtkimhtml.c:3201
+#, fuzzy, c-format
+msgid ""
+"Error saving image\n"
+"\n"
+"%s"
 msgstr "Error saving image: %s"
 
-#: src/gtkimhtml.c:2902 src/gtkimhtml.c:2914
+#: src/gtkimhtml.c:3281 src/gtkimhtml.c:3293
 msgid "Save Image"
 msgstr "Save Image"
 
-#: src/gtkimhtml.c:2942
+#: src/gtkimhtml.c:3321
 msgid "_Save Image..."
 msgstr "_Save Image..."
 
-#: src/gtkimhtmltoolbar.c:180
+#: src/gtkimhtmltoolbar.c:141
 msgid "Select Font"
 msgstr "Select Font"
 
-#: src/gtkimhtmltoolbar.c:258
+#: src/gtkimhtmltoolbar.c:220
 msgid "Select Text Color"
 msgstr "Select Text Colour"
 
-#: src/gtkimhtmltoolbar.c:332
+#: src/gtkimhtmltoolbar.c:299
 msgid "Select Background Color"
 msgstr "Select Background Colour"
 
-#: src/gtkimhtmltoolbar.c:415
+#: src/gtkimhtmltoolbar.c:388
 msgid "_URL"
 msgstr "_URL"
 
-#: src/gtkimhtmltoolbar.c:423
+#: src/gtkimhtmltoolbar.c:396
 msgid "_Description"
 msgstr "_Description"
 
-#: src/gtkimhtmltoolbar.c:426
+#: src/gtkimhtmltoolbar.c:399
 msgid ""
 "Please enter the URL and description of the link that you want to insert. "
 "The description is optional."
@@ -3434,195 +3565,171 @@
 "Please enter the URL and description of the link that you want to insert. "
 "The description is optional."
 
-#: src/gtkimhtmltoolbar.c:430
+#: src/gtkimhtmltoolbar.c:403
 msgid "Please enter the URL of the link that you want to insert."
 msgstr "Please enter the URL of the link that you want to insert."
 
-#: src/gtkimhtmltoolbar.c:435
+#: src/gtkimhtmltoolbar.c:408
 msgid "Insert Link"
 msgstr "Insert Link"
 
-#: src/gtkimhtmltoolbar.c:439
+#: src/gtkimhtmltoolbar.c:412
 msgid "_Insert"
 msgstr "_Insert"
 
-#: src/gtkimhtmltoolbar.c:508
+#: src/gtkimhtmltoolbar.c:481
 #, c-format
 msgid "Failed to store image: %s\n"
 msgstr "Failed to store image: %s\n"
 
-#: src/gtkimhtmltoolbar.c:534 src/gtkimhtmltoolbar.c:544
+#: src/gtkimhtmltoolbar.c:507 src/gtkimhtmltoolbar.c:517
 msgid "Insert Image"
 msgstr "Insert Image"
 
-#: src/gtkimhtmltoolbar.c:703 src/gtkimhtmltoolbar.c:781
+#: src/gtkimhtmltoolbar.c:715
 msgid "This theme has no available smileys."
 msgstr "This theme has no available smileys."
 
 #. show everything
-#: src/gtkimhtmltoolbar.c:795
+#: src/gtkimhtmltoolbar.c:729
 msgid "Smile!"
 msgstr "Smile!"
 
-#: src/gtkimhtmltoolbar.c:974
+#: src/gtkimhtmltoolbar.c:917
 msgid "Bold"
 msgstr "Bold"
 
-#: src/gtkimhtmltoolbar.c:985
+#: src/gtkimhtmltoolbar.c:928
 msgid "Italic"
 msgstr "Italic"
 
-#: src/gtkimhtmltoolbar.c:996
+#: src/gtkimhtmltoolbar.c:939
 msgid "Underline"
 msgstr "Underline"
 
-#: src/gtkimhtmltoolbar.c:1012
+#: src/gtkimhtmltoolbar.c:955
 msgid "Larger font size"
 msgstr "Larger font size"
 
-#: src/gtkimhtmltoolbar.c:1024
+#: src/gtkimhtmltoolbar.c:967
 msgid "Smaller font size"
 msgstr "Smaller font size"
 
-#: src/gtkimhtmltoolbar.c:1041
+#: src/gtkimhtmltoolbar.c:984
 msgid "Font Face"
 msgstr "Font Face"
 
-#: src/gtkimhtmltoolbar.c:1053
+#: src/gtkimhtmltoolbar.c:996
 msgid "Foreground font color"
 msgstr "Foreground font colour"
 
-#: src/gtkimhtmltoolbar.c:1065
+#: src/gtkimhtmltoolbar.c:1008
 msgid "Background color"
 msgstr "Background colour"
 
-#: src/gtkimhtmltoolbar.c:1080
+#: src/gtkimhtmltoolbar.c:1024
+#, fuzzy
+msgid "Clear formatting"
+msgstr "_Clear Formatting"
+
+#: src/gtkimhtmltoolbar.c:1039
 msgid "Insert link"
 msgstr "Insert link"
 
-#: src/gtkimhtmltoolbar.c:1090
+#: src/gtkimhtmltoolbar.c:1049
 msgid "Insert image"
 msgstr "Insert image"
 
-#: src/gtkimhtmltoolbar.c:1101
+#: src/gtkimhtmltoolbar.c:1060
 msgid "Insert smiley"
 msgstr "Insert smiley"
 
-#: src/gtklog.c:303
+#: src/gtklog.c:200
+#, fuzzy, c-format
+msgid "Conversation in %s on %s"
+msgstr "Conversations with %s"
+
+#: src/gtklog.c:202
+#, fuzzy, c-format
+msgid "Conversation with %s on %s"
+msgstr "Conversations with %s"
+
+#: src/gtklog.c:397
+msgid ""
+"System events will only be logged if the <span style=\"italic\">Enable "
+"system log preference</span> is set."
+msgstr ""
+
+#: src/gtklog.c:401
+msgid ""
+"Instant messages will only be logged if the <span style=\"italic\">Log all "
+"instant messages</span> preference is enabled."
+msgstr ""
+
+#: src/gtklog.c:404
+msgid ""
+"Chats will only be logged if the <span style=\"italic\">Log all chats "
+"preference</span> is enabled."
+msgstr ""
+
+#: src/gtklog.c:409
+msgid "No logs were found."
+msgstr ""
+
+#: src/gtklog.c:455
+#, fuzzy, c-format
+msgid "Conversations in %s"
+msgstr "Conversations with %s"
+
+#: src/gtklog.c:463 src/gtklog.c:513
 #, c-format
 msgid "Conversations with %s"
 msgstr "Conversations with %s"
 
-#. Window **********
-#: src/gtklog.c:391 src/gtklog.c:407
+#: src/gtklog.c:538
 msgid "System Log"
 msgstr "System Log"
 
-#: src/gtkmain.c:151
-msgid "Please create an account."
-msgstr "Please create an account."
-
-#: src/gtkmain.c:233
-msgid "Login"
-msgstr "Login"
-
-#: src/gtkmain.c:249
-msgid "<b>_Account:</b>"
-msgstr "<b>_Account:</b>"
-
-#: src/gtkmain.c:263
-msgid "<b>_Password:</b>"
-msgstr "<b>_Password:</b>"
-
-#. And now for the buttons
-#: src/gtkmain.c:280
-#, fuzzy
-msgid "A_ccounts"
-msgstr "Accounts"
-
-#: src/gtkmain.c:286
-#, fuzzy
-msgid "P_references"
-msgstr "Preferences"
-
-#: src/gtkmain.c:292
-#, fuzzy
-msgid "_Log in"
-msgstr "Login"
-
-#. full help text
-#: src/gtkmain.c:517
+#: src/gtkmain.c:323
+#, c-format
+msgid "Gaim %s. Try `%s -h' for more information.\n"
+msgstr "Gaim %s. Try `%s -h' for more information.\n"
+
+#: src/gtkmain.c:325
 #, c-format
 msgid ""
 "Gaim %s\n"
 "Usage: %s [OPTION]...\n"
 "\n"
 "  -a, --acct          display account editor window\n"
-"  -w, --away[=MESG]   make away on signon (optional argument MESG specifies\n"
-"                      name of away message to use)\n"
-"  -l, --login[=NAME]  automatically login (optional argument NAME specifies\n"
-"                      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"
-"  -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 ""
-"Gaim %s\n"
-"Usage: %s [OPTION]...\n"
-"\n"
-"  -a, --acct          display account editor window\n"
-"  -w, --away[=MESG]   make away on signon (optional argument MESG specifies\n"
-"                      name of away message to use)\n"
-"  -l, --login[=NAME]  automatically login (optional argument NAME specifies\n"
-"                      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"
 "  -c, --config=DIR    use DIR for config files\n"
 "  -d, --debug         print debugging messages to stdout\n"
+"  -h, --help          display this help and exit\n"
+"  -n, --nologin       don't automatically login\n"
+"  -l, --login[=NAME]  automatically login (optional argument NAME specifies\n"
+"                      account(s) to use, seperated by commas)\n"
 "  -v, --version       display the current version and exit\n"
-"  -h, --help          display this help and exit\n"
-
-#. short message
-#: src/gtkmain.c:532
-#, c-format
-msgid "Gaim %s. Try `%s -h' for more information.\n"
-msgstr "Gaim %s. Try `%s -h' for more information.\n"
-
-#: src/gtkmain.c:899
-msgid "Unable to load preferences"
-msgstr "Unable to load preferences"
-
-#: src/gtkmain.c:899
-msgid ""
-"Gaim was not able to load your preferences because they are stored in an old "
-"format that is no longer used.  Please reconfigure your settings using the "
-"Preferences window."
-msgstr ""
-"Gaim was not able to load your preferences because they are stored in an old "
-"format that is no longer used.  Please reconfigure your settings using the "
-"Preferences window."
+msgstr ""
 
 #. Descriptive label
-#: src/gtknotify.c:218
+#: src/gtknotify.c:267
 #, c-format
 msgid "%s has %d new message."
 msgid_plural "%s has %d new messages."
 msgstr[0] "%s has %d new message."
 msgstr[1] "%s has %d new messages."
 
-#: src/gtknotify.c:232
+#: src/gtknotify.c:281
 #, c-format
 msgid "<span weight=\"bold\">From:</span> %s\n"
 msgstr "<span weight=\"bold\">From:</span> %s\n"
 
-#: src/gtknotify.c:241
+#: src/gtknotify.c:290
 #, c-format
 msgid "<span weight=\"bold\">Subject:</span> %s\n"
 msgstr "<span weight=\"bold\">Subject:</span> %s\n"
 
-#: src/gtknotify.c:246
+#: src/gtknotify.c:295
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
@@ -3633,7 +3740,7 @@
 "\n"
 "%s%s%s%s"
 
-#: src/gtknotify.c:262
+#: src/gtknotify.c:311
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
@@ -3644,22 +3751,26 @@
 "\n"
 "%s"
 
-#: src/gtknotify.c:419
+#: src/gtknotify.c:456
+msgid "Search Results"
+msgstr "Search Results"
+
+#: src/gtknotify.c:617
 #, c-format
 msgid "The browser command <b>%s</b> is invalid."
 msgstr "The browser command <b>%s</b> is invalid."
 
-#: src/gtknotify.c:421 src/gtknotify.c:433 src/gtknotify.c:446
-#: src/gtknotify.c:570
+#: src/gtknotify.c:619 src/gtknotify.c:631 src/gtknotify.c:644
+#: src/gtknotify.c:768
 msgid "Unable to open URL"
 msgstr "Unable to open URL"
 
-#: src/gtknotify.c:431 src/gtknotify.c:444
+#: src/gtknotify.c:629 src/gtknotify.c:642
 #, c-format
 msgid "Error launching <b>%s</b>: %s"
 msgstr "Error launching <b>%s</b>: %s"
 
-#: src/gtknotify.c:571
+#: src/gtknotify.c:769
 msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr ""
@@ -3674,7 +3785,7 @@
 msgstr "Please enter a buddy to pounce."
 
 #. "New Buddy Pounce"
-#: src/gtkpounce.c:391 src/gtkpounce.c:901
+#: src/gtkpounce.c:391 src/gtkpounce.c:898
 msgid "New Buddy Pounce"
 msgstr "New Buddy Pounce"
 
@@ -3770,63 +3881,55 @@
 msgstr "Sav_e this pounce after activation"
 
 #. "Remove Buddy Pounce"
-#: src/gtkpounce.c:908
+#: src/gtkpounce.c:906
 msgid "Remove Buddy Pounce"
 msgstr "Remove Buddy Pounce"
 
-#: src/gtkpounce.c:969
+#: src/gtkpounce.c:964
 #, c-format
 msgid "%s has started typing to you (%s)"
 msgstr "%s has started typing to you (%s)"
 
-#: src/gtkpounce.c:971
+#: src/gtkpounce.c:966
 #, c-format
 msgid "%s has signed on (%s)"
 msgstr "%s has signed on (%s)"
 
-#: src/gtkpounce.c:973
+#: src/gtkpounce.c:968
 #, c-format
 msgid "%s has returned from being idle (%s)"
 msgstr "%s has returned from being idle (%s)"
 
-#: src/gtkpounce.c:975
+#: src/gtkpounce.c:970
 #, c-format
 msgid "%s has returned from being away (%s)"
 msgstr "%s has returned from being away (%s)"
 
-#: src/gtkpounce.c:977
+#: src/gtkpounce.c:972
 #, c-format
 msgid "%s has stopped typing to you (%s)"
 msgstr "%s has stopped typing to you (%s)"
 
-#: src/gtkpounce.c:979
+#: src/gtkpounce.c:974
 #, c-format
 msgid "%s has signed off (%s)"
 msgstr "%s has signed off (%s)"
 
-#: src/gtkpounce.c:981
+#: src/gtkpounce.c:976
 #, c-format
 msgid "%s has become idle (%s)"
 msgstr "%s has become idle (%s)"
 
-#: src/gtkpounce.c:983
+#: src/gtkpounce.c:978
 #, c-format
 msgid "%s has gone away. (%s)"
 msgstr "%s has gone away. (%s)"
 
-#: src/gtkpounce.c:984
+#: src/gtkpounce.c:979
 msgid "Unknown pounce event. Please report this!"
 msgstr "Unknown pounce event. Please report this!"
 
-#: src/gtkprefs.c:398
-msgid "Interface Options"
-msgstr "Interface Options"
-
-#: src/gtkprefs.c:400
-msgid "D_isplay remote nicknames if no alias is set"
-msgstr "D_isplay remote nicknames if no alias is set"
-
-#: src/gtkprefs.c:632
+#: src/gtkprefs.c:685
 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."
@@ -3834,48 +3937,58 @@
 "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."
 
-#: src/gtkprefs.c:672
+#: src/gtkprefs.c:725
 msgid "Icon"
 msgstr "Icon"
 
-#: src/gtkprefs.c:679 src/gtkprefs.c:2117 src/protocols/jabber/buddy.c:267
-#: src/protocols/jabber/buddy.c:799 src/protocols/jabber/chat.c:761
+#: src/gtkprefs.c:732 src/gtkprefs.c:2040 src/protocols/jabber/buddy.c:266
+#: src/protocols/jabber/buddy.c:805 src/protocols/jabber/chat.c:769
 msgid "Description"
 msgstr "Description"
 
-#: src/gtkprefs.c:774
-msgid "Display"
-msgstr "Display"
-
-#: src/gtkprefs.c:775
-msgid "Show _timestamp on messages"
-msgstr "Show _timestamp on messages"
-
-#: src/gtkprefs.c:778
+#: src/gtkprefs.c:832
+msgid "Buddy List Sorting"
+msgstr "Buddy List Sorting"
+
+#: src/gtkprefs.c:841
+msgid "_Sorting:"
+msgstr "_Sorting:"
+
+#: src/gtkprefs.c:846
+msgid "Buddy Display"
+msgstr "Buddy Display"
+
+#: src/gtkprefs.c:847
+#, fuzzy
+msgid "Show more buddy details"
+msgstr "Show user details"
+
+#: src/gtkprefs.c:885
+msgid "Send unknown \"_slash\" commands as messages"
+msgstr "Send unknown \"_slash\" commands as messages"
+
+#: src/gtkprefs.c:887
+#, fuzzy
+msgid "Show _formatting on incoming messages"
+msgstr "Show _formatting toolbar"
+
+#: src/gtkprefs.c:889
+msgid "Show buddy _icons"
+msgstr "Show buddy _icons"
+
+#: src/gtkprefs.c:891
+msgid "Enable buddy ic_on animation"
+msgstr "Enable buddy ic_on animation"
+
+#: src/gtkprefs.c:893
+msgid "_Notify buddies that you are typing to them"
+msgstr "_Notify buddies that you are typing to them"
+
+#: src/gtkprefs.c:896
 msgid "_Highlight misspelled words"
 msgstr "_Highlight misspelled words"
 
-#: src/gtkprefs.c:782
-msgid "Ignore c_olors"
-msgstr "Ignore c_olours"
-
-#: src/gtkprefs.c:784
-msgid "Ignore font _faces"
-msgstr "Ignore font _faces"
-
-#: src/gtkprefs.c:786
-msgid "Ignore font si_zes"
-msgstr "Ignore font si_zes"
-
-#: src/gtkprefs.c:789
-msgid "Default Formatting"
-msgstr "Default Formatting"
-
-#: src/gtkprefs.c:791
-msgid "_Send default formatting with outgoing messages"
-msgstr "_Send default formatting with outgoing messages"
-
-#: src/gtkprefs.c:801
+#: src/gtkprefs.c:914
 msgid ""
 "This is how your outgoing message text will appear when you use protocols "
 "that support formatting. :)"
@@ -3883,238 +3996,152 @@
 "This is how your outgoing message text will appear when you use protocols "
 "that support formatting. :)"
 
-#: src/gtkprefs.c:804
-msgid "_Clear Formatting"
-msgstr "_Clear Formatting"
-
-#: src/gtkprefs.c:841
-msgid "Window Closing"
-msgstr "Window Closing"
-
-#: src/gtkprefs.c:842
-msgid "_Escape closes window"
-msgstr "_Escape closes window"
-
-#: src/gtkprefs.c:858
-msgid "Buddy List Sorting"
-msgstr "Buddy List Sorting"
-
-#: src/gtkprefs.c:867
-msgid "_Sorting:"
-msgstr "_Sorting:"
-
-#: src/gtkprefs.c:872
-msgid "Buddy Display"
-msgstr "Buddy Display"
-
-#: src/gtkprefs.c:873 src/gtkprefs.c:933
-msgid "Show buddy _icons"
-msgstr "Show buddy _icons"
-
-#: src/gtkprefs.c:875
-msgid "Show _warning levels"
-msgstr "Show _warning levels"
-
-#: src/gtkprefs.c:877
-msgid "Show idle _times"
-msgstr "Show idle _times"
-
-#: src/gtkprefs.c:879
-msgid "_Automatically expand contacts"
-msgstr "_Automatically expand contacts"
-
-#: src/gtkprefs.c:912
-msgid "Show _buttons as:"
-msgstr "Show _buttons as:"
-
-#: src/gtkprefs.c:914
-msgid "Pictures"
-msgstr "Pictures"
-
-#: src/gtkprefs.c:915
-msgid "Text"
-msgstr "Text"
-
-#: src/gtkprefs.c:916
-msgid "Pictures and text"
-msgstr "Pictures and text"
-
-#: src/gtkprefs.c:923
-msgid "Enable \"_slash\" commands"
-msgstr "Enable \"_slash\" commands"
-
-#: src/gtkprefs.c:926
-msgid "Send unknown \"_slash\" commands as messages"
-msgstr "Send unknown \"_slash\" commands as messages"
-
-#: src/gtkprefs.c:929
-msgid "Show _formatting toolbar"
-msgstr "Show _formatting toolbar"
-
-#: src/gtkprefs.c:931
-msgid "Show _aliases in tabs/titles"
-msgstr "Show _aliases in tabs/titles"
-
+#. All the tab options!
 #: src/gtkprefs.c:935
-msgid "Enable buddy ic_on animation"
-msgstr "Enable buddy ic_on animation"
+msgid "Tab Options"
+msgstr "Tab Options"
 
 #: src/gtkprefs.c:937
-msgid "_Notify buddies that you are typing to them"
-msgstr "_Notify buddies that you are typing to them"
-
-#: src/gtkprefs.c:939
-msgid "_Raise IM window on events"
-msgstr "_Raise IM window on events"
-
-#: src/gtkprefs.c:942
-msgid "Raise chat _window on events"
-msgstr "Raise chat _window on events"
-
-#. All the tab options!
-#: src/gtkprefs.c:946
-msgid "Tab Options"
-msgstr "Tab Options"
-
-#: src/gtkprefs.c:948
 msgid "Show IMs and chats in _tabbed windows"
 msgstr "Show IMs and chats in _tabbed windows"
 
-#: src/gtkprefs.c:962
+#: src/gtkprefs.c:951
 #, fuzzy
 msgid "Show close b_utton on tabs"
 msgstr "Show _close button on tabs"
 
-#: src/gtkprefs.c:965
-msgid "Tab p_lacement:"
-msgstr "Tab P_lacement:"
-
-#: src/gtkprefs.c:967
+#: src/gtkprefs.c:957
+#, fuzzy
+msgid "_Placement:"
+msgstr "ExtPlacement"
+
+#: src/gtkprefs.c:959
 msgid "Top"
 msgstr "Top"
 
-#: src/gtkprefs.c:968
+#: src/gtkprefs.c:960
 msgid "Bottom"
 msgstr "Bottom"
 
-#: src/gtkprefs.c:969
+#: src/gtkprefs.c:961
 msgid "Left"
 msgstr "Left"
 
-#: src/gtkprefs.c:970
+#: src/gtkprefs.c:962
 msgid "Right"
 msgstr "Right"
 
-#: src/gtkprefs.c:976
-msgid "New conversation _placement:"
-msgstr "New conversation _placement:"
-
-#: src/gtkprefs.c:1027 src/protocols/oscar/oscar.c:749
-#: src/protocols/oscar/oscar.c:5045
+#: src/gtkprefs.c:966
+#, fuzzy
+msgid "N_ew conversations:"
+msgstr "Close conversation"
+
+#: src/gtkprefs.c:1017 src/protocols/oscar/oscar.c:772
+#: src/protocols/oscar/oscar.c:5310
 msgid "IP Address"
 msgstr "IP Address"
 
-#: src/gtkprefs.c:1029
+#: src/gtkprefs.c:1019
 msgid "_Autodetect IP Address"
 msgstr "_Autodetect IP Address"
 
-#: src/gtkprefs.c:1038
+#: src/gtkprefs.c:1028
 msgid "Public _IP:"
 msgstr "Public _IP:"
 
-#: src/gtkprefs.c:1062
+#: src/gtkprefs.c:1052
 msgid "Ports"
 msgstr "Ports"
 
-#: src/gtkprefs.c:1065
+#: src/gtkprefs.c:1055
 msgid "_Manually specify range of ports to listen on"
 msgstr "_Manually specify range of ports to listen on"
 
-#: src/gtkprefs.c:1068
+#: src/gtkprefs.c:1058
 msgid "_Start Port:"
 msgstr "_Start Port:"
 
-#: src/gtkprefs.c:1075
+#: src/gtkprefs.c:1065
 msgid "_End Port:"
 msgstr "_End Port:"
 
-#: src/gtkprefs.c:1082
+#: src/gtkprefs.c:1072
 msgid "Proxy Server"
 msgstr "Proxy Server"
 
-#: src/gtkprefs.c:1086
+#: src/gtkprefs.c:1076
 msgid "No proxy"
 msgstr "No proxy"
 
-#: src/gtkprefs.c:1148
+#: src/gtkprefs.c:1138
 msgid "_User:"
 msgstr "_User:"
 
-#: src/gtkprefs.c:1204
+#: src/gtkprefs.c:1194
 msgid "Epiphany"
 msgstr "Epiphany"
 
-#: src/gtkprefs.c:1205
+#: src/gtkprefs.c:1195
 msgid "Firebird"
 msgstr "Firebird"
 
-#: src/gtkprefs.c:1206
+#: src/gtkprefs.c:1196
 msgid "Firefox"
 msgstr "Firefox"
 
-#: src/gtkprefs.c:1207
+#: src/gtkprefs.c:1197
 msgid "Galeon"
 msgstr "Galeon"
 
-#: src/gtkprefs.c:1208
+#: src/gtkprefs.c:1198
 msgid "Gnome Default"
 msgstr "Gnome Default"
 
-#: src/gtkprefs.c:1209
+#: src/gtkprefs.c:1199
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: src/gtkprefs.c:1210
+#: src/gtkprefs.c:1200
 msgid "Mozilla"
 msgstr "Mozilla"
 
-#: src/gtkprefs.c:1211
+#: src/gtkprefs.c:1201
 msgid "Netscape"
 msgstr "Netscape"
 
-#: src/gtkprefs.c:1212
+#: src/gtkprefs.c:1202
 msgid "Opera"
 msgstr "Opera"
 
-#: src/gtkprefs.c:1221
+#: src/gtkprefs.c:1211
 msgid "Manual"
 msgstr "Manual"
 
-#: src/gtkprefs.c:1272
+#: src/gtkprefs.c:1264
 msgid "Browser Selection"
 msgstr "Browser Selection"
 
-#: src/gtkprefs.c:1276
+#: src/gtkprefs.c:1268
 msgid "_Browser:"
 msgstr "_Browser:"
 
-#: src/gtkprefs.c:1283
+#: src/gtkprefs.c:1275
 msgid "_Open link in:"
 msgstr "_Open Link in:"
 
-#: src/gtkprefs.c:1285
+#: src/gtkprefs.c:1277
 msgid "Browser default"
 msgstr "Browser default"
 
-#: src/gtkprefs.c:1286
+#: src/gtkprefs.c:1278
 msgid "Existing window"
 msgstr "Existing window"
 
-#: src/gtkprefs.c:1288
+#: src/gtkprefs.c:1280
 msgid "New tab"
 msgstr "New tab"
 
-#: src/gtkprefs.c:1302
+#: src/gtkprefs.c:1294
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -4123,78 +4150,78 @@
 "_Manual:\n"
 "(%s for URL)"
 
-#: src/gtkprefs.c:1339
+#: src/gtkprefs.c:1333
 msgid "Message Logs"
 msgstr "Message Logs"
 
-#: src/gtkprefs.c:1342
+#: src/gtkprefs.c:1336
 msgid "Log _Format:"
 msgstr "Log _Format:"
 
-#: src/gtkprefs.c:1345
+#: src/gtkprefs.c:1339
 msgid "_Log all instant messages"
 msgstr "_Log all instant messages"
 
-#: src/gtkprefs.c:1347
+#: src/gtkprefs.c:1341
 msgid "Log all c_hats"
 msgstr "Log all c_hats"
 
-#: src/gtkprefs.c:1350
+#: src/gtkprefs.c:1344
 msgid "System Logs"
 msgstr "System Logs"
 
-#: src/gtkprefs.c:1352
+#: src/gtkprefs.c:1346
 msgid "_Enable system log"
 msgstr "_Enable system log"
 
-#: src/gtkprefs.c:1355
+#: src/gtkprefs.c:1349
 #, fuzzy
 msgid "Log when buddies log in/log _out"
 msgstr "Log when buddies _sign on/sign off"
 
-#: src/gtkprefs.c:1361
+#: src/gtkprefs.c:1355
 msgid "Log when buddies become _idle/un-idle"
 msgstr "Log when buddies become _idle/un-idle"
 
+#: src/gtkprefs.c:1361
+msgid "Log when buddies go away/come _back"
+msgstr "Log when buddies go away/come _back"
+
 #: src/gtkprefs.c:1367
-msgid "Log when buddies go away/come _back"
-msgstr "Log when buddies go away/come _back"
-
-#: src/gtkprefs.c:1373
 #, fuzzy
 msgid "Log your own _signons/idleness/awayness"
 msgstr "Log your _own signons/idleness/awayness"
 
-#: src/gtkprefs.c:1509
+#: src/gtkprefs.c:1504
 msgid "Sound Selection"
 msgstr "Sound Selection"
 
-#: src/gtkprefs.c:1561
+#: src/gtkprefs.c:1558
 msgid "Sound Method"
 msgstr "Sound Method"
 
-#: src/gtkprefs.c:1562
+#: src/gtkprefs.c:1559
 msgid "_Method:"
 msgstr "_Method:"
 
-#: src/gtkprefs.c:1564
+#: src/gtkprefs.c:1561
 msgid "Console beep"
 msgstr "Console beep"
 
-#: src/gtkprefs.c:1566
+#: src/gtkprefs.c:1563
 msgid "Automatic"
 msgstr "Automatic"
 
-#: src/gtkprefs.c:1573
+#: src/gtkprefs.c:1568
 msgid "Command"
 msgstr "Command"
 
-#: src/gtkprefs.c:1574
+#: src/gtkprefs.c:1569
 #, fuzzy
 msgid "No sounds"
 msgstr "Sounds"
 
-#: src/gtkprefs.c:1582
+#: src/gtkprefs.c:1577
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -4203,102 +4230,99 @@
 "Sound c_ommand:\n"
 "(%s for filename)"
 
-#: src/gtkprefs.c:1609
+#: src/gtkprefs.c:1604
 msgid "Sound Options"
 msgstr "Sound Options"
 
-#: src/gtkprefs.c:1610
+#: src/gtkprefs.c:1605
 msgid "Sounds when conversation has _focus"
 msgstr "Sounds when conversation has _focus"
 
-#: src/gtkprefs.c:1612
+#: src/gtkprefs.c:1607
 msgid "_Sounds while away"
 msgstr "_Sounds while away"
 
-#: src/gtkprefs.c:1622
+#: src/gtkprefs.c:1617
 msgid "Sound Events"
 msgstr "Sound Events"
 
-#: src/gtkprefs.c:1673
+#: src/gtkprefs.c:1668
 msgid "Play"
 msgstr "Play"
 
-#: src/gtkprefs.c:1680
+#: src/gtkprefs.c:1675
 msgid "Event"
 msgstr "Event"
 
-#: src/gtkprefs.c:1699
+#: src/gtkprefs.c:1694
 msgid "Test"
 msgstr "Test"
 
-#: src/gtkprefs.c:1703
+#: src/gtkprefs.c:1698
 msgid "Reset"
 msgstr "Reset"
 
-#: src/gtkprefs.c:1707
+#: src/gtkprefs.c:1702
 msgid "Choose..."
 msgstr "Choose..."
 
+#: src/gtkprefs.c:1758
+msgid "_Queue new messages when away"
+msgstr "_Queue new messages when away"
+
 #: src/gtkprefs.c:1761
-msgid "_Queue new messages when away"
-msgstr "_Queue new messages when away"
-
-#: src/gtkprefs.c:1764
 msgid "_Auto-reply:"
 msgstr "_Auto-reply:"
 
-#: src/gtkprefs.c:1766
-msgid "Never"
-msgstr "Never"
-
-#: src/gtkprefs.c:1767
+#: src/gtkprefs.c:1764
 msgid "When away"
 msgstr "When away"
 
-#: src/gtkprefs.c:1768
-msgid "When away and idle"
+#: src/gtkprefs.c:1765
+#, fuzzy
+msgid "When both away and idle"
 msgstr "When away and idle"
 
-#: src/gtkprefs.c:1771 src/protocols/msn/msn.c:507
-#: src/protocols/msn/msn.c:1356 src/protocols/msn/state.c:32
-#: src/protocols/novell/novell.c:2817 src/protocols/oscar/oscar.c:4194
-#: src/protocols/yahoo/yahoo.c:2651 src/protocols/yahoo/yahoo_profile.c:665
+#: src/gtkprefs.c:1768 src/protocols/msn/msn.c:503
+#: src/protocols/msn/state.c:32 src/protocols/novell/novell.c:2819
+#: src/protocols/oscar/oscar.c:4435 src/protocols/yahoo/yahoo.c:2604
+#: src/protocols/yahoo/yahoo_profile.c:665
 msgid "Idle"
 msgstr "Idle"
 
-#: src/gtkprefs.c:1772
+#: src/gtkprefs.c:1769
 msgid "Idle _time reporting:"
 msgstr "Idle _time reporting:"
 
-#: src/gtkprefs.c:1775
+#: src/gtkprefs.c:1772
 msgid "Gaim usage"
 msgstr "Gaim usage"
 
-#: src/gtkprefs.c:1778
+#: src/gtkprefs.c:1775
 msgid "X usage"
 msgstr "X usage"
 
-#: src/gtkprefs.c:1780
+#: src/gtkprefs.c:1777
 msgid "Windows usage"
 msgstr "Windows usage"
 
-#: src/gtkprefs.c:1788
+#: src/gtkprefs.c:1785
 msgid "Auto-away"
 msgstr "Auto-away"
 
-#: src/gtkprefs.c:1789
+#: src/gtkprefs.c:1786
 msgid "Set away _when idle"
 msgstr "Set away _when idle"
 
-#: src/gtkprefs.c:1793
+#: src/gtkprefs.c:1790
 msgid "_Minutes before setting away:"
 msgstr "_Minutes before setting away:"
 
-#: src/gtkprefs.c:1801
+#: src/gtkprefs.c:1798
 msgid "Away m_essage:"
 msgstr "Away m_essage:"
 
-#: src/gtkprefs.c:1859
+#: src/gtkprefs.c:1856
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -4313,7 +4337,7 @@
 "<span weight=\"bold\">Web site:</span>\t\t%s\n"
 "<span weight=\"bold\">File name:</span>\t%s"
 
-#: src/gtkprefs.c:1864
+#: src/gtkprefs.c:1861
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -4328,135 +4352,127 @@
 "<span weight=\"bold\">URL:</span>  %s\n"
 "<span weight=\"bold\">File name:</span>  %s"
 
-#: src/gtkprefs.c:2073
+#: src/gtkprefs.c:1996
 msgid "Load"
 msgstr "Load"
 
-#: src/gtkprefs.c:2087
+#: src/gtkprefs.c:2010
 msgid "Summary"
 msgstr "Summary"
 
-#: src/gtkprefs.c:2135
+#: src/gtkprefs.c:2058
 msgid "Details"
 msgstr "Details"
 
-#: src/gtkprefs.c:2177
-msgid "Interface"
-msgstr "Interface"
-
-#: src/gtkprefs.c:2180
-msgid "Message Text"
-msgstr "Message Text"
-
-#: src/gtkprefs.c:2181
-msgid "Shortcuts"
-msgstr "Shortcuts"
-
-#: src/gtkprefs.c:2182
+#: src/gtkprefs.c:2101
 msgid "Smiley Themes"
 msgstr "Smiley Themes"
 
-#: src/gtkprefs.c:2183
+#: src/gtkprefs.c:2102
 msgid "Sounds"
 msgstr "Sounds"
 
-#: src/gtkprefs.c:2184
+#: src/gtkprefs.c:2103 src/protocols/silc/silc.c:1598
 msgid "Network"
 msgstr "Network"
 
-#: src/gtkprefs.c:2189
+#: src/gtkprefs.c:2108
 msgid "Browser"
 msgstr "Browser"
 
-#: src/gtkprefs.c:2192
+#: src/gtkprefs.c:2111
 msgid "Logging"
 msgstr "Logging"
 
-#: src/gtkprefs.c:2193
+#: src/gtkprefs.c:2112
 msgid "Away / Idle"
 msgstr "Away / Idle"
 
-#: src/gtkprefs.c:2196
+#: src/gtkprefs.c:2115
 msgid "Plugins"
 msgstr "Plugins"
 
-#: src/gtkprivacy.c:78
+#: src/gtkprivacy.c:79
 msgid "Allow all users to contact me"
 msgstr "Allow all users to contact me"
 
-#: src/gtkprivacy.c:79
+#: src/gtkprivacy.c:80
 msgid "Allow only the users on my buddy list"
 msgstr "Allow only the users on my buddy list"
 
-#: src/gtkprivacy.c:80
+#: src/gtkprivacy.c:81
 msgid "Allow only the users below"
 msgstr "Allow only the users below"
 
-#: src/gtkprivacy.c:81
-msgid "Block all users"
-msgstr "Block all users"
-
 #: src/gtkprivacy.c:82
+msgid "Block all users"
+msgstr "Block all users"
+
+#: src/gtkprivacy.c:83
 msgid "Block only the users below"
 msgstr "Block only the users below"
 
-#: src/gtkprivacy.c:388 src/protocols/jabber/jabber.c:1508
+#: src/gtkprivacy.c:398
 msgid "Privacy"
 msgstr "Privacy"
 
-#: src/gtkprivacy.c:401
+#: src/gtkprivacy.c:411
 msgid "Changes to privacy settings take effect immediately."
 msgstr "Changes to privacy settings take effect immediately."
 
 #. "Set privacy for:" label
-#: src/gtkprivacy.c:413
+#: src/gtkprivacy.c:423
 msgid "Set privacy for:"
 msgstr "Set privacy for:"
 
-#: src/gtkprivacy.c:582 src/gtkprivacy.c:598
+#: src/gtkprivacy.c:589 src/gtkprivacy.c:605
 msgid "Permit User"
 msgstr "Permit User"
 
-#: src/gtkprivacy.c:583
+#: src/gtkprivacy.c:590
 msgid "Type a user you permit to contact you."
 msgstr "Type a user you permit to contact you."
 
-#: src/gtkprivacy.c:584
+#: src/gtkprivacy.c:591
 msgid "Please enter the name of the user you wish to be able to contact you."
 msgstr "Please enter the name of the user you wish to be able to contact you."
 
-#: src/gtkprivacy.c:587 src/gtkprivacy.c:600
+#: src/gtkprivacy.c:594 src/gtkprivacy.c:607
 msgid "Permit"
 msgstr "Permit"
 
-#: src/gtkprivacy.c:592
+#: src/gtkprivacy.c:599
 #, c-format
 msgid "Allow %s to contact you?"
 msgstr "Allow %s to contact you?"
 
-#: src/gtkprivacy.c:594
+#: src/gtkprivacy.c:601
 #, c-format
 msgid "Are you sure you wish to allow %s to contact you?"
 msgstr "Are you sure you wish to allow %s to contact you?"
 
-#: src/gtkprivacy.c:621 src/gtkprivacy.c:634
+#: src/gtkprivacy.c:628 src/gtkprivacy.c:641
 msgid "Block User"
 msgstr "Block User"
 
-#: src/gtkprivacy.c:622
+#: src/gtkprivacy.c:629
 msgid "Type a user to block."
 msgstr "Type a user to block."
 
-#: src/gtkprivacy.c:623
+#: src/gtkprivacy.c:630
 msgid "Please enter the name of the user you wish to block."
 msgstr "Please enter the name of the user you wish to block."
 
-#: src/gtkprivacy.c:630
+#: src/gtkprivacy.c:632 src/gtkprivacy.c:643
+msgid "Block"
+msgstr "Block"
+
+#: src/gtkprivacy.c:637
 #, c-format
 msgid "Block %s?"
 msgstr "Block %s?"
 
-#: src/gtkprivacy.c:632
+#: src/gtkprivacy.c:639
 #, c-format
 msgid "Are you sure you want to block %s?"
 msgstr "Are you sure you want to block %s?"
@@ -4464,42 +4480,44 @@
 #. *
 #. * A wrapper for gaim_request_action() that uses Yes and No buttons.
 #.
-#: src/gtkrequest.c:257 src/protocols/gg/gg.c:1013 src/protocols/msn/msn.c:514
-#: src/protocols/msn/msn.c:517 src/protocols/novell/novell.c:1901
+#: src/gtkrequest.c:258 src/protocols/gg/gg.c:1072
+#: src/protocols/msn/dialog.c:113 src/protocols/msn/msn.c:510
+#: src/protocols/msn/msn.c:513 src/protocols/novell/novell.c:1903
 #: src/protocols/silc/buddy.c:307 src/protocols/silc/pk.c:117
-#: src/request.h:1235
+#: src/request.h:1257
 msgid "Yes"
 msgstr "Yes"
 
-#: src/gtkrequest.c:258 src/protocols/gg/gg.c:1013 src/protocols/msn/msn.c:514
-#: src/protocols/msn/msn.c:517 src/protocols/novell/novell.c:1902
+#: src/gtkrequest.c:259 src/protocols/gg/gg.c:1072
+#: src/protocols/msn/dialog.c:114 src/protocols/msn/msn.c:510
+#: src/protocols/msn/msn.c:513 src/protocols/novell/novell.c:1904
 #: src/protocols/silc/buddy.c:308 src/protocols/silc/pk.c:118
-#: src/request.h:1235
+#: src/request.h:1257
 msgid "No"
 msgstr "No"
 
-#: src/gtkrequest.c:261
+#: src/gtkrequest.c:262
 msgid "Apply"
 msgstr "Apply"
 
-#: src/gtkrequest.c:262 src/protocols/msn/msn.c:316
-#: src/protocols/silc/util.c:332
+#: src/gtkrequest.c:263 src/protocols/msn/msn.c:314
+#: src/protocols/silc/util.c:335
 msgid "Close"
 msgstr "Close"
 
-#: src/gtkrequest.c:1483
+#: src/gtkrequest.c:1764
 msgid "That file already exists"
 msgstr "That file already exists"
 
-#: src/gtkrequest.c:1484
+#: src/gtkrequest.c:1765
 msgid "Would you like to overwrite it?"
 msgstr "Would you like to overwrite it?"
 
-#: src/gtkrequest.c:1522 src/gtkrequest.c:1543
+#: src/gtkrequest.c:1807 src/gtkrequest.c:1848
 msgid "Save File..."
 msgstr "Save File..."
 
-#: src/gtkrequest.c:1523 src/gtkrequest.c:1544
+#: src/gtkrequest.c:1808 src/gtkrequest.c:1849
 msgid "Open File..."
 msgstr "Open File..."
 
@@ -4512,52 +4530,118 @@
 msgid "_Get List"
 msgstr "_Get List"
 
-#: src/gtksound.c:65
+#: src/gtksavedstatuses.c:314 src/protocols/jabber/buddy.c:263
+#: src/protocols/jabber/buddy.c:799 src/protocols/novell/novell.c:1460
+msgid "Title"
+msgstr "Title"
+
+#: src/gtksavedstatuses.c:325
+msgid "Type"
+msgstr ""
+
+#: src/gtksavedstatuses.c:336 src/protocols/gg/gg.c:316
+#: src/protocols/gg/gg.c:322 src/protocols/gg/gg.c:328
+#: src/protocols/gg/gg.c:334 src/protocols/gg/gg.c:340
+#: src/protocols/gg/gg.c:346 src/protocols/gg/gg.c:352
+#: src/protocols/irc/irc.c:181 src/protocols/jabber/jabber.c:977
+#: src/protocols/jabber/jabber.c:983 src/protocols/jabber/jabber.c:989
+#: src/protocols/jabber/jabber.c:995 src/protocols/jabber/jabber.c:1001
+#: src/protocols/jabber/jabber.c:1007 src/protocols/jabber/jabber.c:1013
+#: src/protocols/novell/novell.c:2833 src/protocols/oscar/oscar.c:7057
+#: src/protocols/oscar/oscar.c:7064 src/protocols/yahoo/yahoo.c:3181
+#: src/protocols/yahoo/yahoo.c:3215 src/protocols/zephyr/zephyr.c:2260
+msgid "Message"
+msgstr "Message"
+
+#: src/gtksavedstatuses.c:399
+#, fuzzy
+msgid "Saved Statuses"
+msgstr "Status"
+
+#: src/gtksavedstatuses.c:520
+msgid "Title already in use.  You must choose a unique title."
+msgstr ""
+
+#: src/gtksavedstatuses.c:611
+#, fuzzy
+msgid "Custom status"
+msgstr "By status"
+
+#: src/gtksavedstatuses.c:714 src/protocols/jabber/buddy.c:620
+#: src/protocols/jabber/buddy.c:627 src/protocols/jabber/buddy.c:638
+#: src/protocols/jabber/jabber.c:956 src/protocols/msn/msn.c:501
+#: src/protocols/novell/novell.c:2832 src/protocols/novell/novell.c:2836
+#: src/protocols/oscar/oscar.c:754 src/protocols/oscar/oscar.c:760
+#: src/protocols/oscar/oscar.c:762 src/protocols/yahoo/yahoo.c:2756
+msgid "Status"
+msgstr "Status"
+
+#: src/gtksavedstatuses.c:733
+#, fuzzy
+msgid "_Title:"
+msgstr "Title"
+
+#: src/gtksavedstatuses.c:744
+#, fuzzy
+msgid "Out of the office"
+msgstr "Out of memory"
+
+#: src/gtksavedstatuses.c:755
+#, fuzzy
+msgid "_Status:"
+msgstr "Status:"
+
+#. Custom status message disclosure
+#: src/gtksavedstatuses.c:790 src/gtksavedstatuses.c:791
+msgid "Use a different status for some accounts"
+msgstr ""
+
+#: src/gtksound.c:60
 msgid "Buddy logs in"
 msgstr "Buddy logs in"
 
-#: src/gtksound.c:66
+#: src/gtksound.c:61
 msgid "Buddy logs out"
 msgstr "Buddy logs out"
 
-#: src/gtksound.c:67
+#: src/gtksound.c:62
 msgid "Message received"
 msgstr "Message received"
 
-#: src/gtksound.c:68
+#: src/gtksound.c:63
 msgid "Message received begins conversation"
 msgstr "Message received begins conversation"
 
-#: src/gtksound.c:69
+#: src/gtksound.c:64
 msgid "Message sent"
 msgstr "Message sent"
 
-#: src/gtksound.c:70
+#: src/gtksound.c:65
 msgid "Person enters chat"
 msgstr "Person enters chat"
 
-#: src/gtksound.c:71
+#: src/gtksound.c:66
 msgid "Person leaves chat"
 msgstr "Person leaves chat"
 
-#: src/gtksound.c:72
+#: src/gtksound.c:67
 msgid "You talk in chat"
 msgstr "You talk in chat"
 
-#: src/gtksound.c:73
+#: src/gtksound.c:68
 msgid "Others talk in chat"
 msgstr "Others talk in chat"
 
-#: src/gtksound.c:76
+#: src/gtksound.c:71
 msgid "Someone says your name in chat"
 msgstr "Someone says your name in chat"
 
-#: src/gtksound.c:180
+#: src/gtksound.c:257
 #, c-format
 msgid "Unable to play sound because the chosen file (%s) does not exist."
 msgstr "Unable to play sound because the chosen file (%s) does not exist."
 
-#: src/gtksound.c:196
+#: src/gtksound.c:273
 msgid ""
 "Unable to play sound because the 'Command' sound method has been chosen, but "
 "no command has been set."
@@ -4565,7 +4649,7 @@
 "Unable to play sound because the 'Command' sound method has been chosen, but "
 "no command has been set."
 
-#: src/gtksound.c:208
+#: src/gtksound.c:285
 #, c-format
 msgid ""
 "Unable to play sound because the configured sound command could not be "
@@ -4574,85 +4658,134 @@
 "Unable to play sound because the configured sound command could not be "
 "launched: %s"
 
-#: src/gtkstock.c:88
+#: src/gtkstatusbox.c:132
+#, fuzzy
+msgid "Typing"
+msgstr "Ping"
+
+#. connect to the server
+#: src/gtkstatusbox.c:135 src/protocols/irc/irc.c:262
+#: src/protocols/jabber/jabber.c:807 src/protocols/msn/session.c:362
+#: src/protocols/napster/napster.c:526 src/protocols/novell/novell.c:2165
+#: src/protocols/oscar/oscar.c:1819 src/protocols/trepia/trepia.c:1069
+#: src/protocols/yahoo/yahoo.c:2426 src/protocols/zephyr/zephyr.c:1546
+msgid "Connecting"
+msgstr "Connecting"
+
+#. hacks
+#: src/gtkstatusbox.c:246 src/protocols/gg/gg.c:50 src/protocols/irc/irc.c:176
+#: src/protocols/jabber/jabber.c:988 src/protocols/msn/msn.c:534
+#: src/protocols/msn/state.c:29 src/protocols/msn/state.c:30
+#: src/protocols/msn/state.c:37 src/protocols/msn/state.c:38
+#: src/protocols/novell/novell.c:2810 src/protocols/novell/novell.c:2948
+#: src/protocols/novell/novell.c:3037 src/protocols/oscar/oscar.c:801
+#: src/protocols/oscar/oscar.c:7056 src/protocols/silc/silc.c:50
+#: src/protocols/yahoo/yahoo.c:3175 src/status.c:156
+msgid "Available"
+msgstr "Available"
+
+#: src/gtkstatusbox.c:248 src/protocols/gg/gg.c:54
+#: src/protocols/oscar/oscar.c:702 src/protocols/oscar/oscar.c:7070
+#: src/protocols/yahoo/yahoo.c:2602 src/protocols/yahoo/yahoo.c:3219
+msgid "Invisible"
+msgstr "Invisible"
+
+#: src/gtkstatusbox.c:249 src/protocols/gg/gg.c:306
+#: src/protocols/irc/irc.c:168 src/protocols/jabber/buddy.c:1083
+#: src/protocols/jabber/jabber.c:977 src/protocols/msn/msn.c:526
+#: src/protocols/napster/napster.c:574 src/protocols/novell/novell.c:2822
+#: src/protocols/novell/novell.c:2941 src/protocols/oscar/oscar.c:762
+#: src/protocols/oscar/oscar.c:6892 src/protocols/oscar/oscar.c:7046
+#: src/protocols/silc/silc.c:46 src/protocols/yahoo/yahoo.c:2606
+#: src/protocols/yahoo/yahoo.c:3169 src/status.c:154
+msgid "Offline"
+msgstr "Offline"
+
+#. TODO: Add saved statuses here?
+#: src/gtkstatusselector.c:286 src/gtkstatusselector.c:659
+#, fuzzy
+msgid "New Status"
+msgstr "Status"
+
+#: src/gtkstock.c:101
 msgid "_Alias"
 msgstr "_Alias"
 
-#: src/gtkstock.c:90
+#: src/gtkstock.c:103
 msgid "_Invite"
 msgstr "_Invite"
 
-#: src/gtkstock.c:91
+#: src/gtkstock.c:104
 msgid "_Modify"
 msgstr "_Modify"
 
-#: src/gtkstock.c:92
+#: src/gtkstock.c:105
 msgid "_Open Mail"
 msgstr "_Open Mail"
 
-#: src/gtkstock.c:94
+#: src/gtkstock.c:107
 msgid "_Warn"
 msgstr "_Warn"
 
-#: src/gtkutils.c:1399 src/gtkutils.c:1424
+#: src/gtkutils.c:1386 src/gtkutils.c:1411
 #, fuzzy, c-format
 msgid "The following error has occurred loading %s: %s"
 msgstr "An unknown signon error has occurred: %s."
 
-#: src/gtkutils.c:1401 src/gtkutils.c:1426
+#: src/gtkutils.c:1388 src/gtkutils.c:1413
 #, fuzzy
 msgid "Failed to load image"
 msgstr "Failed to store image: %s\n"
 
-#: src/gtkutils.c:1487
+#: src/gtkutils.c:1488
 #, fuzzy, c-format
 msgid "Cannot send folder %s."
 msgstr "Cannot send file"
 
-#: src/gtkutils.c:1489
+#: src/gtkutils.c:1490
 msgid ""
 "Gaim cannot transfer a folder. You will need to send the files within "
 "individually"
 msgstr ""
 
-#: src/gtkutils.c:1516 src/gtkutils.c:1525 src/gtkutils.c:1530
+#: src/gtkutils.c:1518 src/gtkutils.c:1527 src/gtkutils.c:1532
 #, fuzzy
 msgid "You have dragged an image"
 msgstr "You have entered an invalid username"
 
-#: src/gtkutils.c:1517
+#: src/gtkutils.c:1519
 msgid ""
 "You can send this image as a file transfer, embed it into this message, or "
 "use it as the buddy icon for this user."
 msgstr ""
 
-#: src/gtkutils.c:1521 src/gtkutils.c:1536
+#: src/gtkutils.c:1523 src/gtkutils.c:1538
 #, fuzzy
 msgid "Set as buddy icon"
 msgstr "Show buddy _icons"
 
-#: src/gtkutils.c:1522 src/gtkutils.c:1537
+#: src/gtkutils.c:1524 src/gtkutils.c:1539
 #, fuzzy
 msgid "Send image file"
 msgstr "Send message"
 
-#: src/gtkutils.c:1523 src/gtkutils.c:1537
+#: src/gtkutils.c:1525 src/gtkutils.c:1539
 #, fuzzy
 msgid "Insert in message"
 msgstr "Insert image"
 
-#: src/gtkutils.c:1526
+#: src/gtkutils.c:1528
 #, fuzzy
 msgid "Would you like to set it as the buddy icon for this user?"
 msgstr "Would you like to join the conversation?"
 
-#: src/gtkutils.c:1531
-msgid ""
-"You can send this image as a file transfer orembed it into this message, or "
+#: src/gtkutils.c:1533
+msgid ""
+"You can send this image as a file transfer or embed it into this message, or "
 "use it as the buddy icon for this user."
 msgstr ""
 
-#: src/gtkutils.c:1533
+#: src/gtkutils.c:1535
 msgid ""
 "You can insert this image into this message, or use it as the buddy icon for "
 "this user"
@@ -4663,26 +4796,26 @@
 #. * send.  The only logical one is "Application," but do we really want to send a binary and nothing else?
 #. * Probably not.  I'll just give an error and return.
 #. The original patch sent the icon used by the launcher.  That's probably wrong
-#: src/gtkutils.c:1587
+#: src/gtkutils.c:1589
 #, fuzzy
 msgid "Cannot send launcher"
 msgstr "Cannot send file"
 
-#: src/gtkutils.c:1587
+#: src/gtkutils.c:1589
 msgid ""
 "You dragged a desktop launcher. Most likely you wanted to send whatever this "
 "launcher points to instead of this launcher itself."
 msgstr ""
 
-#: src/log.c:104
+#: src/log.c:105
 msgid "<b><font color=\"red\">The logger has no read function</font></b>"
 msgstr "<b><font color=\"red\">The logger has no read function</font></b>"
 
-#: src/log.c:528
+#: src/log.c:746
 msgid "XML"
 msgstr "XML"
 
-#: src/log.c:591
+#: src/log.c:811
 #, c-format
 msgid ""
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -4691,7 +4824,7 @@
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
 "REPLY&gt;:</b></font> %s<br/>\n"
 
-#: src/log.c:593
+#: src/log.c:813
 #, c-format
 msgid ""
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -4700,29 +4833,29 @@
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
 "REPLY&gt;:</b></font> %s<br/>\n"
 
-#: src/log.c:644 src/log.c:774
+#: src/log.c:864 src/log.c:995
 msgid "<font color=\"red\"><b>Unable to find log path!</b></font>"
 msgstr "<font color=\"red\"><b>Unable to find log path!</b></font>"
 
-#: src/log.c:654 src/log.c:786
+#: src/log.c:874 src/log.c:1007
 #, c-format
 msgid "<font color=\"red\"><b>Could not read file: %s</b></font>"
 msgstr "<font color=\"red\"><b>Could not read file: %s</b></font>"
 
-#: src/log.c:658
+#: src/log.c:878
 msgid "HTML"
 msgstr "HTML"
 
-#: src/log.c:719
+#: src/log.c:940
 #, c-format
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <AUTO-REPLY>: %s\n"
 
-#: src/log.c:790
+#: src/log.c:1011
 msgid "Plain text"
 msgstr "Plain text"
 
-#: src/plugin.c:304
+#: src/plugin.c:324
 #, c-format
 msgid ""
 "The required plugin %s was not found. Please install this plugin and try "
@@ -4731,29 +4864,19 @@
 "The required plugin %s was not found. Please install this plugin and try "
 "again."
 
-#: src/plugin.c:309 src/plugin.c:337
+#: src/plugin.c:329 src/plugin.c:357
 msgid "Gaim was unable to load your plugin."
 msgstr "Gaim was unable to load your plugin."
 
-#: src/plugin.c:333
+#: src/plugin.c:353
 #, c-format
 msgid "The required plugin %s was unable to load."
 msgstr "The required plugin %s was unable to load."
 
-#: src/prefs.c:114
+#: src/prefs.c:1094
 msgid "Slightly less boring default"
 msgstr "Slightly less boring default"
 
-#: src/protocols/gg/gg.c:50 src/protocols/irc/irc.c:165
-#: src/protocols/msn/msn.c:538 src/protocols/msn/state.c:29
-#: src/protocols/msn/state.c:30 src/protocols/msn/state.c:37
-#: src/protocols/msn/state.c:38 src/protocols/novell/novell.c:2808
-#: src/protocols/novell/novell.c:2927 src/protocols/novell/novell.c:2978
-#: src/protocols/oscar/oscar.c:771 src/protocols/oscar/oscar.c:6876
-#: src/protocols/yahoo/yahoo.c:3128
-msgid "Available"
-msgstr "Available"
-
 #: src/protocols/gg/gg.c:51
 msgid "Available for friends only"
 msgstr "Available for friends only"
@@ -4762,244 +4885,239 @@
 msgid "Away for friends only"
 msgstr "Away for friends only"
 
-#: src/protocols/gg/gg.c:54 src/protocols/oscar/oscar.c:681
-#: src/protocols/oscar/oscar.c:6890 src/protocols/yahoo/yahoo.c:2649
-#: src/protocols/yahoo/yahoo.c:3172
-msgid "Invisible"
-msgstr "Invisible"
-
 #: src/protocols/gg/gg.c:55
 msgid "Invisible for friends only"
 msgstr "Invisible for friends only"
 
-#: src/protocols/gg/gg.c:56
+#: src/protocols/gg/gg.c:56 src/status.c:157
 msgid "Unavailable"
 msgstr "Unavailable"
 
-#: src/protocols/gg/gg.c:137
+#: src/protocols/gg/gg.c:151
 msgid "Unable to resolve hostname."
 msgstr "Unable to resolve hostname."
 
-#: src/protocols/gg/gg.c:140 src/protocols/novell/novell.c:1720
+#: src/protocols/gg/gg.c:154 src/protocols/novell/novell.c:1720
 msgid "Unable to connect to server."
 msgstr "Unable to connect to server."
 
-#: src/protocols/gg/gg.c:143 src/protocols/jabber/auth.c:130
-#: src/protocols/jabber/auth.c:204 src/protocols/jabber/auth.c:365
-#: src/protocols/jabber/auth.c:463 src/protocols/jabber/auth.c:475
-#: src/protocols/jabber/jabber.c:108
+#: src/protocols/gg/gg.c:157 src/protocols/jabber/auth.c:133
+#: src/protocols/jabber/auth.c:207 src/protocols/jabber/auth.c:375
+#: src/protocols/jabber/auth.c:473 src/protocols/jabber/auth.c:485
+#: src/protocols/jabber/jabber.c:109
 msgid "Invalid response from server."
 msgstr "Invalid response from server."
 
-#: src/protocols/gg/gg.c:146
+#: src/protocols/gg/gg.c:160
 msgid "Error while reading from socket."
 msgstr "Error while reading from socket."
 
-#: src/protocols/gg/gg.c:149
+#: src/protocols/gg/gg.c:163
 msgid "Error while writing to socket."
 msgstr "Error while writing to socket."
 
-#: src/protocols/gg/gg.c:152
+#: src/protocols/gg/gg.c:166
 msgid "Authentication failed."
 msgstr "Authentication failed."
 
-#: src/protocols/gg/gg.c:155
+#: src/protocols/gg/gg.c:169
 msgid "Unknown Error Code."
 msgstr "Unknown Error Code."
 
-#: src/protocols/gg/gg.c:233 src/protocols/oscar/oscar.c:3994
+#: src/protocols/gg/gg.c:271 src/protocols/oscar/oscar.c:4234
 #, c-format
 msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<HR>%s"
 msgstr "<B>UIN:</B> %s<BR><B>Status:</B> %s<HR>%s"
 
 #. res[0] == username
-#: src/protocols/gg/gg.c:234 src/protocols/gg/gg.c:1075
-#: src/protocols/napster/napster.c:404 src/protocols/oscar/oscar.c:3998
-#: src/protocols/oscar/oscar.c:4223 src/protocols/silc/ops.c:1088
-#: src/protocols/silc/ops.c:1151 src/protocols/toc/toc.c:469
-#: src/protocols/zephyr/zephyr.c:721 src/protocols/zephyr/zephyr.c:1136
+#: src/protocols/gg/gg.c:272 src/protocols/gg/gg.c:1134
+#: src/protocols/napster/napster.c:423 src/protocols/oscar/oscar.c:4238
+#: src/protocols/oscar/oscar.c:4464 src/protocols/silc/ops.c:1088
+#: src/protocols/silc/ops.c:1151 src/protocols/toc/toc.c:470
+#: src/protocols/zephyr/zephyr.c:730 src/protocols/zephyr/zephyr.c:1145
 msgid "Buddy Information"
 msgstr "Buddy Information"
 
-#: src/protocols/gg/gg.c:268 src/protocols/irc/irc.c:157
-#: src/protocols/jabber/buddy.c:1068 src/protocols/jabber/jabber.c:970
-#: src/protocols/msn/msn.c:530 src/protocols/napster/napster.c:556
-#: src/protocols/novell/novell.c:2820 src/protocols/oscar/oscar.c:739
-#: src/protocols/oscar/oscar.c:6672 src/protocols/oscar/oscar.c:6866
-#: src/protocols/silc/silc.c:46 src/protocols/yahoo/yahoo.c:2653
-#: src/protocols/yahoo/yahoo.c:3122
-msgid "Offline"
-msgstr "Offline"
-
-#: src/protocols/gg/gg.c:278 src/protocols/gg/gg.c:284
-#: src/protocols/gg/gg.c:290 src/protocols/gg/gg.c:296
-#: src/protocols/gg/gg.c:302 src/protocols/gg/gg.c:308
-#: src/protocols/gg/gg.c:314 src/protocols/irc/irc.c:170
-#: src/protocols/jabber/jabber.c:970 src/protocols/jabber/jabber.c:976
-#: src/protocols/jabber/jabber.c:982 src/protocols/jabber/jabber.c:988
-#: src/protocols/jabber/jabber.c:994 src/protocols/jabber/jabber.c:1000
-#: src/protocols/novell/novell.c:2831 src/protocols/oscar/oscar.c:6877
-#: src/protocols/oscar/oscar.c:6884 src/protocols/yahoo/yahoo.c:3134
-#: src/protocols/yahoo/yahoo.c:3168 src/protocols/zephyr/zephyr.c:2226
-msgid "Message"
-msgstr "Message"
-
-#: src/protocols/gg/gg.c:327
+#. TODO: Do we need both an "online" and an "available" state?
+#. zephyr has several exposures
+#. NONE (where you are hidden, and zephyrs to you are in practice silently dropped -- yes this is wrong)
+#. OPSTAFF "hidden"
+#. REALM-VISIBLE visible to people in local realm
+#. REALM-ANNOUNCED REALM-VISIBLE+ plus your logins/logouts are announced to <login,username,*>
+#. NET-VISIBLE REALM-ANNOUNCED, plus visible to people in foreign realm
+#. NET-ANNOUNCED NET-VISIBLE, plus logins/logouts are announced	 to <login,username,*>
+#.
+#. Online will set the user to the exposure they have in their options (defaulting to REALM-VISIBLE),
+#. Hidden, will set the user's exposure to OPSTAFF
+#.
+#. Away won't change their exposure but will set an auto away message (for IMs only)
+#.
+#: src/protocols/gg/gg.c:310 src/protocols/irc/irc.c:172
+#: src/protocols/jabber/buddy.c:1085 src/protocols/jabber/jabber.c:982
+#: src/protocols/msn/msn.c:530 src/protocols/napster/napster.c:579
+#: src/protocols/novell/novell.c:2945 src/protocols/oscar/oscar.c:704
+#: src/protocols/oscar/oscar.c:7051 src/protocols/silc/silc.c:48
+#: src/protocols/yahoo/yahoo.c:2608 src/protocols/yahoo/yahoo.c:3172
+#: src/protocols/zephyr/zephyr.c:2252 src/status.c:155
+msgid "Online"
+msgstr "Online"
+
+#: src/protocols/gg/gg.c:365
 #, c-format
 msgid "Status: %s"
 msgstr "Status: %s"
 
-#: src/protocols/gg/gg.c:481
+#: src/protocols/gg/gg.c:519
 msgid "Could not connect"
 msgstr "Could not connect"
 
-#: src/protocols/gg/gg.c:488
+#: src/protocols/gg/gg.c:526
 msgid "Unable to read socket"
 msgstr "Unable to read socket"
 
 #. we didn't successfully connect. tdt->toc_fd is valid here
-#: src/protocols/gg/gg.c:738 src/protocols/napster/napster.c:486
-#: src/protocols/napster/napster.c:517 src/protocols/toc/toc.c:171
-#: src/protocols/yahoo/yahoo.c:2280 src/protocols/yahoo/yahoo.c:2309
-#: src/protocols/yahoo/yahoo.c:2372 src/protocols/yahoo/yahoo_filexfer.c:68
-#: src/protocols/yahoo/yahoo_filexfer.c:109 src/protocols/yahoo/ycht.c:482
+#: src/protocols/gg/gg.c:818 src/protocols/napster/napster.c:502
+#: src/protocols/napster/napster.c:533 src/protocols/toc/toc.c:172
+#: src/protocols/yahoo/yahoo.c:2185 src/protocols/yahoo/yahoo.c:2212
+#: src/protocols/yahoo/yahoo.c:2275 src/protocols/yahoo/yahoo_filexfer.c:70
+#: src/protocols/yahoo/yahoo_filexfer.c:114 src/protocols/yahoo/ycht.c:483
 msgid "Unable to connect."
 msgstr "Unable to connect."
 
-#: src/protocols/gg/gg.c:754
+#: src/protocols/gg/gg.c:834
 msgid "Reading data"
 msgstr "Reading data"
 
-#: src/protocols/gg/gg.c:757
+#: src/protocols/gg/gg.c:837
 msgid "Balancer handshake"
 msgstr "Balancer handshake"
 
-#: src/protocols/gg/gg.c:760
+#: src/protocols/gg/gg.c:840
 msgid "Reading server key"
 msgstr "Reading server key"
 
-#: src/protocols/gg/gg.c:763
+#: src/protocols/gg/gg.c:843
 msgid "Exchanging key hash"
 msgstr "Exchanging key hash"
 
-#: src/protocols/gg/gg.c:773
+#: src/protocols/gg/gg.c:853
 msgid "Critical error in GG library\n"
 msgstr "Critical error in GG library\n"
 
-#: src/protocols/gg/gg.c:791 src/protocols/gg/gg.c:882
-#: src/protocols/toc/toc.c:147
+#: src/protocols/gg/gg.c:871 src/protocols/gg/gg.c:964
+#: src/protocols/toc/toc.c:148
 #, c-format
 msgid "Connect to %s failed"
 msgstr "Connect to %s failed"
 
-#: src/protocols/gg/gg.c:839
+#: src/protocols/gg/gg.c:921
 msgid "Unable to ping server"
 msgstr "Unable to ping server"
 
-#: src/protocols/gg/gg.c:851
+#: src/protocols/gg/gg.c:933
 msgid "Send as message"
 msgstr "Send as message"
 
-#: src/protocols/gg/gg.c:856
+#: src/protocols/gg/gg.c:938
 msgid "Looking up GG server"
 msgstr "Looking up GG server"
 
-#: src/protocols/gg/gg.c:859
+#: src/protocols/gg/gg.c:941
 msgid "Invalid Gadu-Gadu UIN specified"
 msgstr "Invalid Gadu-Gadu UIN specified"
 
-#: src/protocols/gg/gg.c:906
+#: src/protocols/gg/gg.c:987
 msgid "You are trying to send a message to an invalid Gadu-Gadu UIN."
 msgstr "You are trying to send a message to an invalid Gadu-Gadu UIN."
 
-#: src/protocols/gg/gg.c:981
+#: src/protocols/gg/gg.c:1040
 msgid "Couldn't get search results"
 msgstr "Couldn't get search results"
 
-#: src/protocols/gg/gg.c:986
+#: src/protocols/gg/gg.c:1045
 msgid "Gadu-Gadu Search Engine"
 msgstr "Gadu-Gadu Search Engine"
 
-#: src/protocols/gg/gg.c:1012
+#: src/protocols/gg/gg.c:1071
 msgid "Active"
 msgstr "Active"
 
-#: src/protocols/gg/gg.c:1017 src/protocols/oscar/oscar.c:5037
+#: src/protocols/gg/gg.c:1076 src/protocols/oscar/oscar.c:5302
 msgid "UIN"
 msgstr "UIN"
 
 #. First Name
-#: src/protocols/gg/gg.c:1021 src/protocols/jabber/jabber.c:621
-#: src/protocols/oscar/oscar.c:5048 src/protocols/silc/ops.c:810
+#: src/protocols/gg/gg.c:1080 src/protocols/jabber/jabber.c:628
+#: src/protocols/oscar/oscar.c:5313 src/protocols/silc/ops.c:810
 #: src/protocols/trepia/trepia.c:268
 msgid "First Name"
 msgstr "Forename"
 
 #. Last Name
-#: src/protocols/gg/gg.c:1026 src/protocols/jabber/jabber.c:626
-#: src/protocols/oscar/oscar.c:5049 src/protocols/trepia/trepia.c:275
+#: src/protocols/gg/gg.c:1085 src/protocols/jabber/jabber.c:633
+#: src/protocols/oscar/oscar.c:5314 src/protocols/trepia/trepia.c:275
 msgid "Last Name"
 msgstr "Surname"
 
-#: src/protocols/gg/gg.c:1030 src/protocols/gg/gg.c:1775
-#: src/protocols/irc/msgs.c:182 src/protocols/oscar/oscar.c:5038
+#: src/protocols/gg/gg.c:1089 src/protocols/gg/gg.c:1833
+#: src/protocols/irc/msgs.c:214 src/protocols/oscar/oscar.c:5303
 #: src/protocols/silc/ops.c:1202
 msgid "Nick"
 msgstr "Nick"
 
-#: src/protocols/gg/gg.c:1037 src/protocols/gg/gg.c:1040
+#: src/protocols/gg/gg.c:1096 src/protocols/gg/gg.c:1099
 msgid "Birth Year"
 msgstr "Birth Year"
 
-#: src/protocols/gg/gg.c:1046 src/protocols/gg/gg.c:1048
-#: src/protocols/gg/gg.c:1050
+#: src/protocols/gg/gg.c:1105 src/protocols/gg/gg.c:1107
+#: src/protocols/gg/gg.c:1109
 msgid "Sex"
 msgstr "Sex"
 
 #. City
-#: src/protocols/gg/gg.c:1054 src/protocols/jabber/jabber.c:636
-#: src/protocols/oscar/oscar.c:5092 src/protocols/oscar/oscar.c:5100
+#: src/protocols/gg/gg.c:1113 src/protocols/jabber/jabber.c:643
+#: src/protocols/oscar/oscar.c:5357 src/protocols/oscar/oscar.c:5365
 #: src/protocols/trepia/trepia.c:332 src/protocols/trepia/trepia.c:411
 msgid "City"
 msgstr "City"
 
-#: src/protocols/gg/gg.c:1097
+#: src/protocols/gg/gg.c:1156
 msgid "There is no Buddy List stored on the Gadu-Gadu server."
 msgstr "There is no Buddy List stored on the Gadu-Gadu server."
 
-#: src/protocols/gg/gg.c:1105
+#: src/protocols/gg/gg.c:1164
 msgid "Couldn't Import Buddy List from Server"
 msgstr "Couldn't Import Buddy List from Server"
 
-#: src/protocols/gg/gg.c:1167
+#: src/protocols/gg/gg.c:1226
 msgid "Buddy List successfully transferred to Gadu-Gadu server"
 msgstr "Buddy List successfully transferred to Gadu-Gadu server"
 
-#: src/protocols/gg/gg.c:1175
+#: src/protocols/gg/gg.c:1234
 msgid "Couldn't transfer Buddy List to Gadu-Gadu server"
 msgstr "Couldn't transfer Buddy List to Gadu-Gadu server"
 
-#: src/protocols/gg/gg.c:1183
+#: src/protocols/gg/gg.c:1242
 msgid "Buddy List successfully deleted from Gadu-Gadu server"
 msgstr "Buddy List successfully deleted from Gadu-Gadu server"
 
-#: src/protocols/gg/gg.c:1191
+#: src/protocols/gg/gg.c:1250
 msgid "Couldn't delete Buddy List from Gadu-Gadu server"
 msgstr "Couldn't delete Buddy List from Gadu-Gadu server"
 
-#: src/protocols/gg/gg.c:1200
+#: src/protocols/gg/gg.c:1259
 msgid "Password changed successfully"
 msgstr "Password changed successfully"
 
-#: src/protocols/gg/gg.c:1207
+#: src/protocols/gg/gg.c:1266
 msgid "Password couldn't be changed"
 msgstr "Password couldn't be changed"
 
-#: src/protocols/gg/gg.c:1326
+#: src/protocols/gg/gg.c:1385
 msgid "Error communicating with Gadu-Gadu server"
 msgstr "Error communicating with Gadu-Gadu server"
 
-#: src/protocols/gg/gg.c:1327
+#: src/protocols/gg/gg.c:1386
 msgid ""
 "Gaim was unable to complete your request due to a problem communicating with "
 "the Gadu-Gadu HTTP server.  Please try again later."
@@ -5007,11 +5125,11 @@
 "Gaim was unable to complete your request due to a problem communicating with "
 "the Gadu-Gadu HTTP server.  Please try again later."
 
-#: src/protocols/gg/gg.c:1356
+#: src/protocols/gg/gg.c:1415
 msgid "Unable to import Gadu-Gadu buddy list"
 msgstr "Unable to import Gadu-Gadu buddy list"
 
-#: src/protocols/gg/gg.c:1357
+#: src/protocols/gg/gg.c:1416
 msgid ""
 "Gaim was unable to connect to the Gadu-Gadu buddy list server.  Please try "
 "again later."
@@ -5019,25 +5137,25 @@
 "Gaim was unable to connect to the Gadu-Gadu buddy list server.  Please try "
 "again later."
 
-#: src/protocols/gg/gg.c:1430
+#: src/protocols/gg/gg.c:1489
 msgid "Couldn't export buddy list"
 msgstr "Couldn't export buddy list"
 
-#: src/protocols/gg/gg.c:1431 src/protocols/gg/gg.c:1454
+#: src/protocols/gg/gg.c:1490 src/protocols/gg/gg.c:1513
 msgid ""
 "Gaim was unable to connect to the buddy list server.  Please try again later."
 msgstr ""
 "Gaim was unable to connect to the buddy list server.  Please try again later."
 
-#: src/protocols/gg/gg.c:1453
+#: src/protocols/gg/gg.c:1512
 msgid "Unable to delete Gadu-Gadu buddy list"
 msgstr "Unable to delete Gadu-Gadu buddy list"
 
-#: src/protocols/gg/gg.c:1504
+#: src/protocols/gg/gg.c:1563
 msgid "Unable to access directory"
 msgstr "Unable to access directory"
 
-#: src/protocols/gg/gg.c:1505
+#: src/protocols/gg/gg.c:1564
 msgid ""
 "Gaim was unable to search the Directory because it was unable to connect to "
 "the directory server.  Please try again later."
@@ -5045,11 +5163,11 @@
 "Gaim was unable to search the Directory because it was unable to connect to "
 "the directory server.  Please try again later."
 
-#: src/protocols/gg/gg.c:1539
+#: src/protocols/gg/gg.c:1598
 msgid "Unable to change Gadu-Gadu password"
 msgstr "Unable to change Gadu-Gadu password"
 
-#: src/protocols/gg/gg.c:1540
+#: src/protocols/gg/gg.c:1599
 msgid ""
 "Gaim was unable to change your password due to an error connecting to the "
 "Gadu-Gadu server.  Please try again later."
@@ -5057,33 +5175,33 @@
 "Gaim was unable to change your password due to an error connecting to the "
 "Gadu-Gadu server.  Please try again later."
 
-#: src/protocols/gg/gg.c:1556
+#: src/protocols/gg/gg.c:1615
 msgid "Directory Search"
 msgstr "Directory Search"
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
-#: src/protocols/gg/gg.c:1561 src/protocols/jabber/jabber.c:1104
-#: src/protocols/toc/toc.c:1571
+#: src/protocols/gg/gg.c:1620 src/protocols/jabber/jabber.c:1117
+#: src/protocols/toc/toc.c:1694
 msgid "Change Password"
 msgstr "Change Password"
 
-#: src/protocols/gg/gg.c:1565
+#: src/protocols/gg/gg.c:1624
 msgid "Import Buddy List from Server"
 msgstr "Import Buddy List from Server"
 
-#: src/protocols/gg/gg.c:1569
+#: src/protocols/gg/gg.c:1628
 msgid "Export Buddy List to Server"
 msgstr "Export Buddy List to Server"
 
-#: src/protocols/gg/gg.c:1573
+#: src/protocols/gg/gg.c:1632
 msgid "Delete Buddy List from Server"
 msgstr "Delete Buddy List from Server"
 
-#: src/protocols/gg/gg.c:1606
+#: src/protocols/gg/gg.c:1665
 msgid "Unable to access user profile."
 msgstr "Unable to access user profile."
 
-#: src/protocols/gg/gg.c:1607
+#: src/protocols/gg/gg.c:1666
 msgid ""
 "Gaim was unable to access this user's profile due to an error connecting to "
 "the directory server.  Please try again later."
@@ -5101,102 +5219,121 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/gg/gg.c:1754 src/protocols/gg/gg.c:1756
+#: src/protocols/gg/gg.c:1812 src/protocols/gg/gg.c:1814
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr "Gadu-Gadu Protocol Plugin"
 
-#: src/protocols/irc/cmds.c:43 src/protocols/silc/silc.c:1310
+#: src/protocols/irc/cmds.c:43 src/protocols/silc/silc.c:1322
 #, c-format
 msgid "Unknown command: %s"
 msgstr "Unknown command: %s"
 
-#: src/protocols/irc/cmds.c:450 src/protocols/jabber/chat.c:584
-#: src/protocols/silc/silc.c:1018
+#: src/protocols/irc/cmds.c:463 src/protocols/jabber/chat.c:592
+#: src/protocols/silc/silc.c:1030
 #, c-format
 msgid "current topic is: %s"
 msgstr "current topic is: %s"
 
-#: src/protocols/irc/cmds.c:454 src/protocols/jabber/chat.c:588
-#: src/protocols/silc/silc.c:1022
+#: src/protocols/irc/cmds.c:467 src/protocols/jabber/chat.c:596
+#: src/protocols/silc/silc.c:1034
 msgid "No topic is set"
 msgstr "No topic is set"
 
-#: src/protocols/irc/dcc_send.c:272 src/protocols/yahoo/yahoo_filexfer.c:169
-#: src/protocols/yahoo/yahoo_filexfer.c:179
-#: src/protocols/yahoo/yahoo_filexfer.c:188
-#: src/protocols/yahoo/yahoo_filexfer.c:198
-msgid "File Transfer Aborted"
+#: src/protocols/irc/dcc_send.c:272 src/protocols/yahoo/yahoo_filexfer.c:176
+#: src/protocols/yahoo/yahoo_filexfer.c:185
+#: src/protocols/yahoo/yahoo_filexfer.c:194
+#, fuzzy
+msgid "File Transfer Failed"
 msgstr "File Transfer Aborted"
 
 #: src/protocols/irc/dcc_send.c:273
 msgid "Gaim could not open a listening port."
 msgstr "Gaim could not open a listening port."
 
-#: src/protocols/irc/irc.c:75
+#: src/protocols/irc/irc.c:79
 msgid "Error displaying MOTD"
 msgstr "Error displaying MOTD"
 
-#: src/protocols/irc/irc.c:75
+#: src/protocols/irc/irc.c:79
 msgid "No MOTD available"
 msgstr "No MOTD available"
 
-#: src/protocols/irc/irc.c:76
+#: src/protocols/irc/irc.c:80
 msgid "There is no MOTD associated with this connection."
 msgstr "There is no MOTD associated with this connection."
 
-#: src/protocols/irc/irc.c:79
+#: src/protocols/irc/irc.c:83
 #, c-format
 msgid "MOTD for %s"
 msgstr "MOTD for %s"
 
-#: src/protocols/irc/irc.c:93 src/protocols/irc/irc.c:412
+#: src/protocols/irc/irc.c:103 src/protocols/irc/irc.c:530
+#: src/protocols/irc/irc.c:552
 msgid "Server has disconnected"
 msgstr "Server has disconnected"
 
-#: src/protocols/irc/irc.c:181
+#: src/protocols/irc/irc.c:192
 msgid "View MOTD"
 msgstr "View MOTD"
 
-#: src/protocols/irc/irc.c:193 src/protocols/silc/chat.c:32
+#: src/protocols/irc/irc.c:204 src/protocols/silc/chat.c:32
 msgid "_Channel:"
 msgstr "_Channel:"
 
-#: src/protocols/irc/irc.c:198 src/protocols/jabber/chat.c:56
+#: src/protocols/irc/irc.c:210 src/protocols/jabber/chat.c:59
 msgid "_Password:"
 msgstr "_Password:"
 
-#: src/protocols/irc/irc.c:230
+#: src/protocols/irc/irc.c:242
 msgid "IRC nicks may not contain whitespace"
 msgstr "IRC nicks may not contain whitespace"
 
-#: src/protocols/irc/irc.c:249
-#, fuzzy, c-format
-msgid "Logging in: %s"
-msgstr "Logging in"
-
-#: src/protocols/irc/irc.c:258
+#: src/protocols/irc/irc.c:270 src/protocols/jabber/jabber.c:410
+#: src/protocols/jabber/jabber.c:745
+msgid "SSL support unavailable"
+msgstr "SSL support unavailable"
+
+#: src/protocols/irc/irc.c:281
 msgid "Couldn't create socket"
 msgstr "Couldn't create socket"
 
-#: src/protocols/irc/irc.c:273 src/protocols/jabber/jabber.c:301
-#: src/protocols/oscar/oscar.c:1690 src/protocols/oscar/oscar.c:1757
+#: src/protocols/irc/irc.c:352 src/protocols/jabber/jabber.c:305
+#: src/protocols/oscar/oscar.c:1739 src/protocols/oscar/oscar.c:1815
 msgid "Couldn't connect to host"
 msgstr "Couldn't connect to host"
 
-#: src/protocols/irc/irc.c:409 src/protocols/trepia/trepia.c:929
+#: src/protocols/irc/irc.c:377 src/protocols/jabber/jabber.c:332
+msgid "Connection Failed"
+msgstr "Connection Failed"
+
+#: src/protocols/irc/irc.c:380 src/protocols/jabber/jabber.c:335
+msgid "SSL Handshake Failed"
+msgstr "SSL Handshake Failed"
+
+#: src/protocols/irc/irc.c:527 src/protocols/irc/irc.c:549
+#: src/protocols/trepia/trepia.c:929
 msgid "Read error"
 msgstr "Read error"
 
-#: src/protocols/irc/irc.c:564 src/protocols/silc/chat.c:1373
-#: src/protocols/yahoo/yahoochat.c:1398
+#: src/protocols/irc/irc.c:698 src/protocols/silc/chat.c:1388
+#: src/protocols/yahoo/yahoochat.c:1400
 msgid "Users"
 msgstr "Users"
 
-#: src/protocols/irc/irc.c:567 src/protocols/silc/chat.c:1376
-#: src/protocols/silc/ops.c:1170 src/protocols/yahoo/yahoochat.c:1407
+#: src/protocols/irc/irc.c:701 src/protocols/silc/chat.c:1391
+#: src/protocols/silc/ops.c:1170 src/protocols/yahoo/yahoochat.c:1409
 msgid "Topic"
 msgstr "Topic"
 
+#: src/protocols/irc/irc.c:738
+msgid "IRC"
+msgstr ""
+
+#: src/protocols/irc/irc.c:742
+#, fuzzy
+msgid "Quit message"
+msgstr "(1 message)"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -5205,219 +5342,249 @@
 #. *< id
 #. *< name
 #. *< version
-#: src/protocols/irc/irc.c:674
+#: src/protocols/irc/irc.c:828
 msgid "IRC Protocol Plugin"
 msgstr "IRC Protocol Plugin"
 
 #. *  summary
-#: src/protocols/irc/irc.c:675
+#: src/protocols/irc/irc.c:829
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "The IRC Protocol Plugin that Sucks Less"
 
-#: src/protocols/irc/irc.c:694 src/protocols/irc/msgs.c:201
-#: src/protocols/jabber/jabber.c:1621 src/protocols/napster/napster.c:691
+#: src/protocols/irc/irc.c:848 src/protocols/irc/msgs.c:234
+#: src/protocols/jabber/jabber.c:1612 src/protocols/napster/napster.c:708
 #: src/protocols/silc/ops.c:1028 src/protocols/silc/ops.c:1132
 msgid "Server"
 msgstr "Server"
 
-#: src/protocols/irc/irc.c:697 src/protocols/jabber/jabber.c:1642
-#: src/protocols/msn/msn.c:1961 src/protocols/napster/napster.c:696
-#: src/protocols/silc/silc.c:1604 src/protocols/trepia/trepia.c:1303
+#: src/protocols/irc/irc.c:851 src/protocols/jabber/jabber.c:1636
+#: src/protocols/msn/msn.c:1925 src/protocols/napster/napster.c:713
+#: src/protocols/silc/silc.c:1606 src/protocols/trepia/trepia.c:1304
 msgid "Port"
 msgstr "Port"
 
-#: src/protocols/irc/irc.c:700
+#: src/protocols/irc/irc.c:854
 #, fuzzy
 msgid "Encodings"
 msgstr "Encoding"
 
-#: src/protocols/irc/irc.c:703 src/protocols/irc/msgs.c:195
-#: src/protocols/jabber/jabber.c:596 src/protocols/silc/buddy.c:1450
+#: src/protocols/irc/irc.c:857 src/protocols/irc/msgs.c:228
+#: src/protocols/jabber/jabber.c:603 src/protocols/silc/buddy.c:1478
 #: src/protocols/silc/ops.c:975 src/protocols/silc/ops.c:977
 #: src/protocols/silc/ops.c:1126 src/protocols/silc/ops.c:1128
 msgid "Username"
 msgstr "Username"
 
-#: src/protocols/irc/irc.c:706
+#: src/protocols/irc/irc.c:860
 #, fuzzy
 msgid "Real name"
 msgstr "Realname"
 
-#: src/protocols/irc/msgs.c:97
+#: src/protocols/irc/irc.c:863
+#, fuzzy
+msgid "Use SSL"
+msgstr "SSL"
+
+#: src/protocols/irc/msgs.c:105
 msgid "Bad mode"
 msgstr "Bad mode"
 
-#: src/protocols/irc/msgs.c:108
+#: src/protocols/irc/msgs.c:116
 #, c-format
 msgid "You are banned from %s."
 msgstr "You are banned from %s."
 
-#: src/protocols/irc/msgs.c:109
+#: src/protocols/irc/msgs.c:117
 msgid "Banned"
 msgstr "Banned"
 
-#: src/protocols/irc/msgs.c:182 src/protocols/irc/msgs.c:201
-#: src/protocols/irc/msgs.c:214
+#: src/protocols/irc/msgs.c:134
+#, c-format
+msgid "Cannot ban %s: banlist is full"
+msgstr ""
+
+#: src/protocols/irc/msgs.c:214 src/protocols/irc/msgs.c:234
+#: src/protocols/irc/msgs.c:247
 #, c-format
 msgid "<b>%s:</b> %s"
 msgstr "<b>%s:</b> %s"
 
-#: src/protocols/irc/msgs.c:184
+#: src/protocols/irc/msgs.c:217
 msgid " <i>(ircop)</i>"
 msgstr " <i>(ircop)</i>"
 
-#: src/protocols/irc/msgs.c:185
+#: src/protocols/irc/msgs.c:218
 msgid " <i>(identified)</i>"
 msgstr " <i>(identified)</i>"
 
-#: src/protocols/irc/msgs.c:189 src/protocols/irc/msgs.c:195
-#: src/protocols/irc/msgs.c:196 src/protocols/irc/msgs.c:207
-#: src/protocols/msn/msn.c:1356 src/protocols/yahoo/yahoo_profile.c:665
+#: src/protocols/irc/msgs.c:222 src/protocols/irc/msgs.c:228
+#: src/protocols/irc/msgs.c:229 src/protocols/irc/msgs.c:240
+#: src/protocols/yahoo/yahoo_profile.c:665
 #, c-format
 msgid "<b>%s:</b> %s<br>"
 msgstr "<b>%s:</b> %s<br>"
 
-#: src/protocols/irc/msgs.c:196 src/protocols/silc/ops.c:969
-#: src/protocols/silc/ops.c:1120 src/protocols/yahoo/yahoo_profile.c:1007
+#: src/protocols/irc/msgs.c:229 src/protocols/silc/ops.c:969
+#: src/protocols/silc/ops.c:1120 src/protocols/yahoo/yahoo_profile.c:1014
 msgid "Realname"
 msgstr "Realname"
 
-#: src/protocols/irc/msgs.c:207 src/protocols/silc/ops.c:1041
+#: src/protocols/irc/msgs.c:240 src/protocols/silc/ops.c:1041
 msgid "Currently on"
 msgstr "Currently on"
 
-#: src/protocols/irc/msgs.c:212
+#: src/protocols/irc/msgs.c:245
 #, c-format
 msgid "<b>Idle for:</b> %s<br>"
 msgstr "<b>Idle for:</b> %s<br>"
 
-#: src/protocols/irc/msgs.c:214
+#: src/protocols/irc/msgs.c:247
 msgid "Online since"
 msgstr "Online since"
 
-#: src/protocols/irc/msgs.c:217
+#: src/protocols/irc/msgs.c:250
 msgid "<br><b>Defining adjective:</b> Glorious<br>"
 msgstr "<br><b>Defining adjective:</b> Glorious<br>"
 
-#: src/protocols/irc/msgs.c:224
+#: src/protocols/irc/msgs.c:257
 #, c-format
 msgid "Buddy Information for %s"
 msgstr "Buddy Information for %s"
 
-#: src/protocols/irc/msgs.c:286
+#: src/protocols/irc/msgs.c:320
 #, c-format
 msgid "%s has changed the topic to: %s"
 msgstr "%s has changed the topic to: %s"
 
-#: src/protocols/irc/msgs.c:291
+#: src/protocols/irc/msgs.c:325
 #, c-format
 msgid "The topic for %s is: %s"
 msgstr "The topic for %s is: %s"
 
-#: src/protocols/irc/msgs.c:308
+#: src/protocols/irc/msgs.c:342
 #, c-format
 msgid "Unknown message '%s'"
 msgstr "Unknown message '%s'"
 
-#: src/protocols/irc/msgs.c:309
+#: src/protocols/irc/msgs.c:343
 msgid "Unknown message"
 msgstr "Unknown message"
 
-#: src/protocols/irc/msgs.c:309
+#: src/protocols/irc/msgs.c:343
 msgid "Gaim has sent a message the IRC server did not understand."
 msgstr "Gaim has sent a message the IRC server did not understand."
 
-#: src/protocols/irc/msgs.c:332
+#: src/protocols/irc/msgs.c:366
 #, c-format
 msgid "Users on %s: %s"
 msgstr "Users on %s: %s"
 
-#: src/protocols/irc/msgs.c:426
+#: src/protocols/irc/msgs.c:463
+#, fuzzy
+msgid "Time Response"
+msgstr "Timezone"
+
+#: src/protocols/irc/msgs.c:464
+msgid "The IRC server's local time is:"
+msgstr ""
+
+#: src/protocols/irc/msgs.c:475
 msgid "No such channel"
 msgstr "No such channel"
 
 #. does this happen?
-#: src/protocols/irc/msgs.c:437
+#: src/protocols/irc/msgs.c:486
 msgid "no such channel"
 msgstr "no such channel"
 
-#: src/protocols/irc/msgs.c:440
+#: src/protocols/irc/msgs.c:489
 msgid "User is not logged in"
 msgstr "User is not logged in"
 
-#: src/protocols/irc/msgs.c:445
+#: src/protocols/irc/msgs.c:494
 msgid "No such nick or channel"
 msgstr "No such nick or channel"
 
-#: src/protocols/irc/msgs.c:465
+#: src/protocols/irc/msgs.c:514
 msgid "Could not send"
 msgstr "Could not send"
 
-#: src/protocols/irc/msgs.c:521
+#: src/protocols/irc/msgs.c:570
 #, c-format
 msgid "Joining %s requires an invitation."
 msgstr "Joining %s requires an invitation."
 
-#: src/protocols/irc/msgs.c:522
+#: src/protocols/irc/msgs.c:571
 msgid "Invitation only"
 msgstr "Invitation only"
 
-#: src/protocols/irc/msgs.c:623
+#: src/protocols/irc/msgs.c:673
 #, c-format
 msgid "You have been kicked by %s: (%s)"
 msgstr "You have been kicked by %s: (%s)"
 
-#: src/protocols/irc/msgs.c:628
+#: src/protocols/irc/msgs.c:678
 #, c-format
 msgid "Kicked by %s (%s)"
 msgstr "Kicked by %s (%s)"
 
-#: src/protocols/irc/msgs.c:649
+#: src/protocols/irc/msgs.c:702
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr "mode (%s %s) by %s"
 
-#: src/protocols/irc/msgs.c:758
+#: src/protocols/irc/msgs.c:786
+msgid ""
+"Your selected account name was rejected by the server.  It probably contains "
+"invalid characters."
+msgstr ""
+
+#: src/protocols/irc/msgs.c:825
+msgid "Cannot change nick"
+msgstr "Cannot change nick"
+
+#: src/protocols/irc/msgs.c:825
 msgid "Could not change nick"
 msgstr "Could not change nick"
 
-#: src/protocols/irc/msgs.c:759
-msgid "Cannot change nick"
-msgstr "Cannot change nick"
-
-#: src/protocols/irc/msgs.c:780
+#: src/protocols/irc/msgs.c:846
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr "You have parted the channel%s%s"
 
-#: src/protocols/irc/msgs.c:820
+#: src/protocols/irc/msgs.c:888
 msgid "Error: invalid PONG from server"
 msgstr "Error: invalid PONG from server"
 
-#: src/protocols/irc/msgs.c:822
+#: src/protocols/irc/msgs.c:890
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr "PING reply -- Lag: %lu seconds"
 
-#: src/protocols/irc/msgs.c:897
+#: src/protocols/irc/msgs.c:965
 #, c-format
 msgid "Cannot join %s:"
 msgstr "Cannot join %s:"
 
-#: src/protocols/irc/msgs.c:898 src/protocols/silc/ops.c:914
+#: src/protocols/irc/msgs.c:966 src/protocols/silc/ops.c:914
 msgid "Cannot join channel"
 msgstr "Cannot join channel"
 
-#: src/protocols/irc/msgs.c:934
+#: src/protocols/irc/msgs.c:1000
+#, fuzzy
+msgid "Nick or channel is temporarily unavailable."
+msgstr "The service is temporarily unavailable."
+
+#: src/protocols/irc/msgs.c:1012
 #, c-format
 msgid "Wallops from %s"
 msgstr "Wallops from %s"
 
-#: src/protocols/irc/parse.c:110
+#: src/protocols/irc/parse.c:114
 msgid "action &lt;action to perform&gt;:  Perform an action."
 msgstr "action &lt;action to perform&gt;:  Perform an action."
 
-#: src/protocols/irc/parse.c:111
+#: src/protocols/irc/parse.c:115
 msgid ""
 "away [message]:  Set an away message, or use no message to return from being "
 "away."
@@ -5425,7 +5592,7 @@
 "away [message]:  Set an away message, or use no message to return from being "
 "away."
 
-#: src/protocols/irc/parse.c:112
+#: src/protocols/irc/parse.c:116
 msgid ""
 "deop &lt;nick1&gt; [nick2] ...:  Remove channel operator status from "
 "someone. You must be a channel operator to do this."
@@ -5433,7 +5600,7 @@
 "deop &lt;nick1&gt; [nick2] ...:  Remove channel operator status from "
 "someone. You must be a channel operator to do this."
 
-#: src/protocols/irc/parse.c:113
+#: src/protocols/irc/parse.c:117
 msgid ""
 "devoice &lt;nick1&gt; [nick2] ...:  Remove channel voice status from "
 "someone, preventing them from speaking if the channel is moderated (+m). You "
@@ -5443,7 +5610,7 @@
 "someone, preventing them from speaking if the channel is moderated (+m). You "
 "must be a channel operator to do this."
 
-#: src/protocols/irc/parse.c:114
+#: src/protocols/irc/parse.c:118
 msgid ""
 "invite &lt;nick&gt; [room]:  Invite someone to join you in the specified "
 "channel, or the current channel."
@@ -5451,7 +5618,7 @@
 "invite &lt;nick&gt; [room]:  Invite someone to join you in the specified "
 "channel, or the current channel."
 
-#: src/protocols/irc/parse.c:115
+#: src/protocols/irc/parse.c:119
 msgid ""
 "j &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
 "channels, optionally providing a channel key for each if needed."
@@ -5459,7 +5626,7 @@
 "j &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
 "channels, optionally providing a channel key for each if needed."
 
-#: src/protocols/irc/parse.c:116
+#: src/protocols/irc/parse.c:120
 msgid ""
 "join &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
 "channels, optionally providing a channel key for each if needed."
@@ -5467,7 +5634,7 @@
 "join &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
 "channels, optionally providing a channel key for each if needed."
 
-#: src/protocols/irc/parse.c:117
+#: src/protocols/irc/parse.c:121
 msgid ""
 "kick &lt;nick&gt; [message]:  Remove someone from a channel. You must be a "
 "channel operator to do this."
@@ -5475,7 +5642,7 @@
 "kick &lt;nick&gt; [message]:  Remove someone from a channel. You must be a "
 "channel operator to do this."
 
-#: src/protocols/irc/parse.c:118
+#: src/protocols/irc/parse.c:122
 msgid ""
 "list:  Display a list of chat rooms on the network. <i>Warning, some servers "
 "may disconnect you upon doing this.</i>"
@@ -5483,19 +5650,20 @@
 "list:  Display a list of chat rooms on the network. <i>Warning, some servers "
 "may disconnect you upon doing this.</i>"
 
-#: src/protocols/irc/parse.c:119
+#: src/protocols/irc/parse.c:123
 msgid "me &lt;action to perform&gt;:  Perform an action."
 msgstr "me &lt;action to perform&gt;:  Perform an action."
 
-#: src/protocols/irc/parse.c:120
-msgid ""
-"mode &lt;nick|channel&gt; &lt;+|-&gt;&lt;A-Za-z&gt;:  Set or unset a channel "
+#: src/protocols/irc/parse.c:124
+#, fuzzy
+msgid ""
+"mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;nick|channel&gt;:  Set or unset a channel "
 "or user mode."
 msgstr ""
 "mode &lt;nick|channel&gt; &lt;+|-&gt;&lt;A-Za-z&gt;:  Set or unset a channel "
 "or user mode."
 
-#: src/protocols/irc/parse.c:121
+#: src/protocols/irc/parse.c:125
 msgid ""
 "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
 "opposed to a channel)."
@@ -5503,15 +5671,15 @@
 "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
 "opposed to a channel)."
 
-#: src/protocols/irc/parse.c:122
+#: src/protocols/irc/parse.c:126
 msgid "names [channel]:  List the users currently in a channel."
 msgstr "names [channel]:  List the users currently in a channel."
 
-#: src/protocols/irc/parse.c:123 src/protocols/jabber/jabber.c:1452
+#: src/protocols/irc/parse.c:127 src/protocols/jabber/jabber.c:1465
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr "nick &lt;new nickname&gt;:  Change your nickname."
 
-#: src/protocols/irc/parse.c:124
+#: src/protocols/irc/parse.c:128
 msgid ""
 "op &lt;nick1&gt; [nick2] ...:  Grant channel operator status to someone. You "
 "must be a channel operator to do this."
@@ -5519,7 +5687,7 @@
 "op &lt;nick1&gt; [nick2] ...:  Grant channel operator status to someone. You "
 "must be a channel operator to do this."
 
-#: src/protocols/irc/parse.c:125
+#: src/protocols/irc/parse.c:129
 msgid ""
 "operwall &lt;message&gt;:  If you don't know what this is, you probably "
 "can't use it."
@@ -5527,7 +5695,7 @@
 "operwall &lt;message&gt;:  If you don't know what this is, you probably "
 "can't use it."
 
-#: src/protocols/irc/parse.c:126
+#: src/protocols/irc/parse.c:130
 msgid ""
 "part [room] [message]:  Leave the current channel, or a specified channel, "
 "with an optional message."
@@ -5535,7 +5703,7 @@
 "part [room] [message]:  Leave the current channel, or a specified channel, "
 "with an optional message."
 
-#: src/protocols/irc/parse.c:127
+#: src/protocols/irc/parse.c:131
 msgid ""
 "ping [nick]:  Asks how much lag a user (or the server if no user specified) "
 "has."
@@ -5543,7 +5711,7 @@
 "ping [nick]:  Asks how much lag a user (or the server if no user specified) "
 "has."
 
-#: src/protocols/irc/parse.c:128
+#: src/protocols/irc/parse.c:132
 msgid ""
 "query &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
 "opposed to a channel)."
@@ -5551,15 +5719,15 @@
 "query &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
 "opposed to a channel)."
 
-#: src/protocols/irc/parse.c:129
+#: src/protocols/irc/parse.c:133
 msgid "quit [message]:  Disconnect from the server, with an optional message."
 msgstr "quit [message]:  Disconnect from the server, with an optional message."
 
-#: src/protocols/irc/parse.c:130
+#: src/protocols/irc/parse.c:134
 msgid "quote [...]:  Send a raw command to the server."
 msgstr "quote [...]:  Send a raw command to the server."
 
-#: src/protocols/irc/parse.c:131
+#: src/protocols/irc/parse.c:135
 msgid ""
 "remove &lt;nick&gt; [message]:  Remove someone from a room. You must be a "
 "channel operator to do this."
@@ -5567,15 +5735,19 @@
 "remove &lt;nick&gt; [message]:  Remove someone from a room. You must be a "
 "channel operator to do this."
 
-#: src/protocols/irc/parse.c:132
+#: src/protocols/irc/parse.c:136
+msgid "time: Displays the current local time at the IRC server."
+msgstr ""
+
+#: src/protocols/irc/parse.c:137
 msgid "topic [new topic]:  View or change the channel topic."
 msgstr "topic [new topic]:  View or change the channel topic."
 
-#: src/protocols/irc/parse.c:133
+#: src/protocols/irc/parse.c:138
 msgid "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Set or unset a user mode."
 msgstr "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Set or unset a user mode."
 
-#: src/protocols/irc/parse.c:134
+#: src/protocols/irc/parse.c:139
 msgid ""
 "voice &lt;nick1&gt; [nick2] ...:  Grant channel voice status to someone. You "
 "must be a channel operator to do this."
@@ -5583,7 +5755,7 @@
 "voice &lt;nick1&gt; [nick2] ...:  Grant channel voice status to someone. You "
 "must be a channel operator to do this."
 
-#: src/protocols/irc/parse.c:135
+#: src/protocols/irc/parse.c:140
 msgid ""
 "wallops &lt;message&gt;:  If you don't know what this is, you probably can't "
 "use it."
@@ -5591,44 +5763,52 @@
 "wallops &lt;message&gt;:  If you don't know what this is, you probably can't "
 "use it."
 
-#: src/protocols/irc/parse.c:136
-msgid "whois &lt;nick&gt;:  Get information on a user."
+#: src/protocols/irc/parse.c:141
+#, fuzzy
+msgid "whois [server] &lt;nick&gt;:  Get information on a user."
 msgstr "whois &lt;nick&gt;:  Get information on a user."
 
-#: src/protocols/irc/parse.c:414
+#: src/protocols/irc/parse.c:422
 #, c-format
 msgid "Reply time from %s: %lu seconds"
 msgstr "Reply time from %s: %lu seconds"
 
-#: src/protocols/irc/parse.c:415
+#: src/protocols/irc/parse.c:423
 msgid "PONG"
 msgstr "PONG"
 
-#: src/protocols/irc/parse.c:415
+#: src/protocols/irc/parse.c:423
 msgid "CTCP PING reply"
 msgstr "CTCP PING reply"
 
-#: src/protocols/irc/parse.c:518 src/protocols/irc/parse.c:522
-#: src/protocols/oscar/oscar.c:1587 src/protocols/toc/toc.c:189
-#: src/protocols/toc/toc.c:597 src/protocols/toc/toc.c:613
-#: src/protocols/toc/toc.c:690
+#: src/protocols/irc/parse.c:526 src/protocols/irc/parse.c:530
+#: src/protocols/oscar/oscar.c:1648 src/protocols/toc/toc.c:190
+#: src/protocols/toc/toc.c:688 src/protocols/toc/toc.c:704
+#: src/protocols/toc/toc.c:780
 msgid "Disconnected."
 msgstr "Disconnected."
 
 #: src/protocols/jabber/auth.c:51
-msgid "Server requires SSL for login"
+msgid ""
+"Server requires TLS/SSL for login.  Select \"Use TLS if available\" in "
+"account properties"
+msgstr ""
+
+#: src/protocols/jabber/auth.c:53
+#, fuzzy
+msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
 msgstr "Server requires SSL for login"
 
-#: src/protocols/jabber/auth.c:111
+#: src/protocols/jabber/auth.c:114
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr "Server requires plaintext authentication over an unencrypted stream"
 
-#: src/protocols/jabber/auth.c:160 src/protocols/jabber/auth.c:161
-#: src/protocols/jabber/auth.c:238 src/protocols/jabber/auth.c:239
+#: src/protocols/jabber/auth.c:163 src/protocols/jabber/auth.c:164
+#: src/protocols/jabber/auth.c:244 src/protocols/jabber/auth.c:245
 msgid "Plaintext Authentication"
 msgstr "Plaintext Authentication"
 
-#: src/protocols/jabber/auth.c:162 src/protocols/jabber/auth.c:240
+#: src/protocols/jabber/auth.c:165 src/protocols/jabber/auth.c:246
 msgid ""
 "This server requires plaintext authentication over an unencrypted "
 "connection.  Allow this and continue authentication?"
@@ -5636,105 +5816,100 @@
 "This server requires plaintext authentication over an unencrypted "
 "connection.  Allow this and continue authentication?"
 
-#: src/protocols/jabber/auth.c:170 src/protocols/jabber/auth.c:248
+#: src/protocols/jabber/auth.c:173 src/protocols/jabber/auth.c:254
 msgid "Server does not use any supported authentication method"
 msgstr "Server does not use any supported authentication method"
 
-#: src/protocols/jabber/auth.c:386
+#: src/protocols/jabber/auth.c:396
 msgid "Invalid challenge from server"
 msgstr "Invalid challenge from server"
 
-#: src/protocols/jabber/buddy.c:249 src/protocols/jabber/buddy.c:655
+#: src/protocols/jabber/buddy.c:248 src/protocols/jabber/buddy.c:661
 #: src/protocols/silc/ops.c:806
 msgid "Full Name"
 msgstr "Full Name"
 
-#: src/protocols/jabber/buddy.c:250 src/protocols/jabber/buddy.c:668
+#: src/protocols/jabber/buddy.c:249 src/protocols/jabber/buddy.c:674
 #: src/protocols/silc/ops.c:818
 msgid "Family Name"
 msgstr "Family Name"
 
-#: src/protocols/jabber/buddy.c:251 src/protocols/jabber/buddy.c:672
+#: src/protocols/jabber/buddy.c:250 src/protocols/jabber/buddy.c:678
 msgid "Given Name"
 msgstr "Given Name"
 
-#: src/protocols/jabber/buddy.c:252 src/protocols/jabber/buddy.c:686
-#: src/protocols/jabber/jabber.c:616 src/protocols/msn/msn.c:1346
-#: src/protocols/silc/buddy.c:1447 src/protocols/silc/ops.c:822
+#: src/protocols/jabber/buddy.c:251 src/protocols/jabber/buddy.c:692
+#: src/protocols/jabber/jabber.c:623 src/protocols/msn/msn.c:1348
+#: src/protocols/silc/buddy.c:1475 src/protocols/silc/ops.c:822
 #: src/protocols/silc/ops.c:965 src/protocols/silc/ops.c:1116
-#: src/protocols/yahoo/yahoo_profile.c:1002
+#: src/protocols/yahoo/yahoo_profile.c:1009
 msgid "Nickname"
 msgstr "Nickname"
 
-#: src/protocols/jabber/buddy.c:253 src/protocols/jabber/jabber.c:656
+#: src/protocols/jabber/buddy.c:252 src/protocols/jabber/jabber.c:663
 msgid "URL"
 msgstr "URL"
 
-#: src/protocols/jabber/buddy.c:254 src/protocols/jabber/buddy.c:714
+#: src/protocols/jabber/buddy.c:253 src/protocols/jabber/buddy.c:720
 msgid "Street Address"
 msgstr "Street Address"
 
-#: src/protocols/jabber/buddy.c:255 src/protocols/jabber/buddy.c:710
+#: src/protocols/jabber/buddy.c:254 src/protocols/jabber/buddy.c:716
 msgid "Extended Address"
 msgstr "Extended Address"
 
-#: src/protocols/jabber/buddy.c:256 src/protocols/jabber/buddy.c:718
+#: src/protocols/jabber/buddy.c:255 src/protocols/jabber/buddy.c:724
 msgid "Locality"
 msgstr "Locality"
 
-#: src/protocols/jabber/buddy.c:257 src/protocols/jabber/buddy.c:722
+#: src/protocols/jabber/buddy.c:256 src/protocols/jabber/buddy.c:728
 msgid "Region"
 msgstr "Region"
 
-#: src/protocols/jabber/buddy.c:258 src/protocols/jabber/buddy.c:726
-#: src/protocols/jabber/jabber.c:646
+#: src/protocols/jabber/buddy.c:257 src/protocols/jabber/buddy.c:732
+#: src/protocols/jabber/jabber.c:653
 msgid "Postal Code"
 msgstr "Postal Code"
 
 #. Country
-#: src/protocols/jabber/buddy.c:259 src/protocols/jabber/buddy.c:731
+#: src/protocols/jabber/buddy.c:258 src/protocols/jabber/buddy.c:737
 #: src/protocols/trepia/trepia.c:340 src/protocols/trepia/trepia.c:417
 msgid "Country"
 msgstr "Country"
 
-#: src/protocols/jabber/buddy.c:260 src/protocols/jabber/buddy.c:742
-#: src/protocols/jabber/buddy.c:749
+#: src/protocols/jabber/buddy.c:259 src/protocols/jabber/buddy.c:748
+#: src/protocols/jabber/buddy.c:755
 msgid "Telephone"
 msgstr "Telephone"
 
-#: src/protocols/jabber/buddy.c:261 src/protocols/jabber/buddy.c:760
-#: src/protocols/jabber/buddy.c:768 src/protocols/silc/silc.c:662
-#: src/protocols/silc/util.c:508 src/protocols/yahoo/yahoo_profile.c:997
+#: src/protocols/jabber/buddy.c:260 src/protocols/jabber/buddy.c:766
+#: src/protocols/jabber/buddy.c:774 src/protocols/silc/silc.c:670
+#: src/protocols/silc/util.c:511 src/protocols/yahoo/yahoo_profile.c:1004
 msgid "Email"
 msgstr "Email"
 
-#: src/protocols/jabber/buddy.c:262 src/protocols/jabber/buddy.c:783
+#: src/protocols/jabber/buddy.c:261 src/protocols/jabber/buddy.c:789
 msgid "Organization Name"
 msgstr "Organisation Name"
 
-#: src/protocols/jabber/buddy.c:263 src/protocols/jabber/buddy.c:787
+#: src/protocols/jabber/buddy.c:262 src/protocols/jabber/buddy.c:793
 msgid "Organization Unit"
 msgstr "Organisation Unit"
 
-#: src/protocols/jabber/buddy.c:264 src/protocols/jabber/buddy.c:793
-#: src/protocols/novell/novell.c:1460
-msgid "Title"
-msgstr "Title"
-
-#: src/protocols/jabber/buddy.c:265 src/protocols/jabber/buddy.c:796
+#: src/protocols/jabber/buddy.c:264 src/protocols/jabber/buddy.c:802
 msgid "Role"
 msgstr "Role"
 
-#: src/protocols/jabber/buddy.c:266 src/protocols/jabber/buddy.c:689
-#: src/protocols/oscar/oscar.c:5073
+#: src/protocols/jabber/buddy.c:265 src/protocols/jabber/buddy.c:695
+#: src/protocols/oscar/oscar.c:5338
 msgid "Birthday"
 msgstr "Birthday"
 
-#: src/protocols/jabber/buddy.c:559 src/protocols/jabber/buddy.c:560
+#: src/protocols/jabber/buddy.c:563 src/protocols/jabber/buddy.c:564
 msgid "Edit Jabber vCard"
 msgstr "Edit Jabber vCard"
 
-#: src/protocols/jabber/buddy.c:561
+#: src/protocols/jabber/buddy.c:565
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable."
@@ -5742,604 +5917,573 @@
 "All items below are optional. Enter only the information with which you feel "
 "comfortable."
 
-#: src/protocols/jabber/buddy.c:604
+#: src/protocols/jabber/buddy.c:610
 msgid "Jabber ID"
 msgstr "Jabber ID"
 
-#: src/protocols/jabber/buddy.c:614 src/protocols/jabber/buddy.c:621
-#: src/protocols/jabber/buddy.c:632 src/protocols/jabber/jabber.c:949
-#: src/protocols/msn/msn.c:505 src/protocols/novell/novell.c:2830
-#: src/protocols/novell/novell.c:2834 src/protocols/oscar/oscar.c:731
-#: src/protocols/oscar/oscar.c:737 src/protocols/oscar/oscar.c:739
-#: src/protocols/yahoo/yahoo.c:2774
-msgid "Status"
-msgstr "Status"
-
-#: src/protocols/jabber/buddy.c:630 src/protocols/jabber/jabber.c:1624
+#: src/protocols/jabber/buddy.c:636 src/protocols/jabber/jabber.c:1615
 msgid "Resource"
 msgstr "Resource"
 
-#: src/protocols/jabber/buddy.c:676 src/protocols/silc/ops.c:814
+#: src/protocols/jabber/buddy.c:682 src/protocols/silc/ops.c:814
 msgid "Middle Name"
 msgstr "Middle Name"
 
-#: src/protocols/jabber/buddy.c:694 src/protocols/jabber/jabber.c:631
-#: src/protocols/oscar/oscar.c:5091 src/protocols/oscar/oscar.c:5099
+#: src/protocols/jabber/buddy.c:700 src/protocols/jabber/jabber.c:638
+#: src/protocols/oscar/oscar.c:5356 src/protocols/oscar/oscar.c:5364
 #: src/protocols/silc/ops.c:850
 msgid "Address"
 msgstr "Address"
 
-#: src/protocols/jabber/buddy.c:706
+#: src/protocols/jabber/buddy.c:712
 msgid "P.O. Box"
 msgstr "P.O. Box"
 
-#: src/protocols/jabber/buddy.c:812
+#: src/protocols/jabber/buddy.c:824
 msgid "Photo"
 msgstr "Photo"
 
-#: src/protocols/jabber/buddy.c:812
+#: src/protocols/jabber/buddy.c:824
 msgid "Logo"
 msgstr "Logo"
 
-#: src/protocols/jabber/buddy.c:834
+#: src/protocols/jabber/buddy.c:849
 msgid "Jabber Profile"
 msgstr "Jabber Profile"
 
-#: src/protocols/jabber/buddy.c:1016
+#: src/protocols/jabber/buddy.c:1031
 msgid "Un-hide From"
 msgstr "Un-hide From"
 
-#: src/protocols/jabber/buddy.c:1019
+#: src/protocols/jabber/buddy.c:1034
 msgid "Temporarily Hide From"
 msgstr "Temporarily Hide From"
 
 #. && NOT ME
-#: src/protocols/jabber/buddy.c:1026
+#: src/protocols/jabber/buddy.c:1041
 msgid "Cancel Presence Notification"
 msgstr "Cancel Presence Notification"
 
-#: src/protocols/jabber/buddy.c:1032
+#: src/protocols/jabber/buddy.c:1047
 msgid "(Re-)Request authorization"
 msgstr "(Re-)Request authorisation"
 
 #. if(NOT ME)
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
-#: src/protocols/jabber/buddy.c:1040
+#: src/protocols/jabber/buddy.c:1055
 msgid "Unsubscribe"
 msgstr "Unsubscribe"
 
-#: src/protocols/jabber/buddy.c:1066 src/protocols/jabber/chat.c:669
-#: src/protocols/jabber/chat.c:680 src/protocols/jabber/jabber.c:957
+#: src/protocols/jabber/buddy.c:1081 src/protocols/jabber/chat.c:677
+#: src/protocols/jabber/chat.c:688 src/protocols/jabber/jabber.c:964
 #: src/protocols/silc/ops.c:1239
 msgid "Error"
 msgstr "Error"
 
-#: src/protocols/jabber/buddy.c:1072 src/protocols/jabber/jabber.c:981
+#: src/protocols/jabber/buddy.c:1087 src/protocols/jabber/jabber.c:994
 msgid "Chatty"
 msgstr "Chatty"
 
-#: src/protocols/jabber/buddy.c:1076 src/protocols/jabber/jabber.c:993
+#: src/protocols/jabber/buddy.c:1091 src/protocols/jabber/jabber.c:1006
+#: src/status.c:160
 msgid "Extended Away"
 msgstr "Extended Away"
 
-#: src/protocols/jabber/buddy.c:1078 src/protocols/jabber/jabber.c:999
-#: src/protocols/oscar/oscar.c:671 src/protocols/oscar/oscar.c:6910
+#: src/protocols/jabber/buddy.c:1093 src/protocols/jabber/jabber.c:1012
+#: src/protocols/oscar/oscar.c:692 src/protocols/oscar/oscar.c:7090
 msgid "Do Not Disturb"
 msgstr "Do Not Disturb"
 
-#: src/protocols/jabber/chat.c:41 src/protocols/oscar/oscar.c:6371
-#: src/protocols/yahoo/yahoochat.c:1003
+#: src/protocols/jabber/chat.c:41 src/protocols/oscar/oscar.c:6619
+#: src/protocols/yahoo/yahoochat.c:995
 msgid "_Room:"
 msgstr "_Room:"
 
-#: src/protocols/jabber/chat.c:46
+#: src/protocols/jabber/chat.c:47
 msgid "_Server:"
 msgstr "_Server:"
 
-#: src/protocols/jabber/chat.c:51
+#: src/protocols/jabber/chat.c:53
 msgid "_Handle:"
 msgstr "_Handle:"
 
-#: src/protocols/jabber/chat.c:217
+#: src/protocols/jabber/chat.c:223
 #, c-format
 msgid "%s is not a valid room name"
 msgstr "%s is not a valid room name"
 
-#: src/protocols/jabber/chat.c:218
+#: src/protocols/jabber/chat.c:224
 msgid "Invalid Room Name"
 msgstr "Invalid Room Name"
 
-#: src/protocols/jabber/chat.c:223
+#: src/protocols/jabber/chat.c:229
 #, c-format
 msgid "%s is not a valid server name"
 msgstr "%s is not a valid server name"
 
-#: src/protocols/jabber/chat.c:224 src/protocols/jabber/chat.c:225
+#: src/protocols/jabber/chat.c:230 src/protocols/jabber/chat.c:231
 msgid "Invalid Server Name"
 msgstr "Invalid Server Name"
 
-#: src/protocols/jabber/chat.c:229
+#: src/protocols/jabber/chat.c:235
 #, c-format
 msgid "%s is not a valid room handle"
 msgstr "%s is not a valid room handle"
 
-#: src/protocols/jabber/chat.c:230 src/protocols/jabber/chat.c:231
+#: src/protocols/jabber/chat.c:236 src/protocols/jabber/chat.c:237
 msgid "Invalid Room Handle"
 msgstr "Invalid Room Handle"
 
-#: src/protocols/jabber/chat.c:387
+#: src/protocols/jabber/chat.c:395
 msgid "Configuration error"
 msgstr "Configuration error"
 
-#: src/protocols/jabber/chat.c:396 src/protocols/jabber/chat.c:541
+#: src/protocols/jabber/chat.c:404 src/protocols/jabber/chat.c:549
 msgid "Unable to configure"
 msgstr "Unable to configure"
 
-#: src/protocols/jabber/chat.c:412
+#: src/protocols/jabber/chat.c:420
 msgid "Room Configuration Error"
 msgstr "Room Configuration Error"
 
-#: src/protocols/jabber/chat.c:413
+#: src/protocols/jabber/chat.c:421
 msgid "This room is not capable of being configured"
 msgstr "This room is not capable of being configured"
 
-#: src/protocols/jabber/chat.c:463 src/protocols/jabber/chat.c:532
+#: src/protocols/jabber/chat.c:471 src/protocols/jabber/chat.c:540
 msgid "Registration error"
 msgstr "Registration error"
 
-#: src/protocols/jabber/chat.c:620
+#: src/protocols/jabber/chat.c:628
 msgid "Nick changing not supported in non-MUC chatrooms"
 msgstr "Nick changing not supported in non-MUC chatrooms"
 
-#: src/protocols/jabber/chat.c:670 src/protocols/jabber/chat.c:681
+#: src/protocols/jabber/chat.c:678 src/protocols/jabber/chat.c:689
 #: src/protocols/silc/ops.c:1239
 #, fuzzy
 msgid "Error retrieving room list"
 msgstr "Error retreiving roomlist"
 
-#: src/protocols/jabber/chat.c:729
+#: src/protocols/jabber/chat.c:737
 msgid "Invalid Server"
 msgstr "Invalid Server"
 
-#: src/protocols/jabber/chat.c:767
+#: src/protocols/jabber/chat.c:775
 msgid "Enter a Conference Server"
 msgstr "Enter a Conference Server"
 
-#: src/protocols/jabber/chat.c:768
+#: src/protocols/jabber/chat.c:776
 msgid "Select a conference server to query"
 msgstr "Select a conference server to query"
 
-#: src/protocols/jabber/chat.c:771
+#: src/protocols/jabber/chat.c:779
 msgid "Find Rooms"
 msgstr "Find Rooms"
 
-#: src/protocols/jabber/jabber.c:77
+#: src/protocols/jabber/jabber.c:78
 msgid "Error initializing session"
 msgstr "Error initializing session"
 
-#: src/protocols/jabber/jabber.c:210 src/protocols/msn/httpmethod.c:266
-#: src/protocols/trepia/trepia.c:248 src/protocols/trepia/trepia.c:699
-#: src/protocols/trepia/trepia.c:990 src/protocols/trepia/trepia.c:1034
-#: src/protocols/trepia/trepia.c:1133 src/protocols/trepia/trepia.c:1179
+#: src/protocols/jabber/jabber.c:214 src/protocols/trepia/trepia.c:248
+#: src/protocols/trepia/trepia.c:699 src/protocols/trepia/trepia.c:991
+#: src/protocols/trepia/trepia.c:1036 src/protocols/trepia/trepia.c:1135
+#: src/protocols/trepia/trepia.c:1181
 msgid "Write error"
 msgstr "Write error"
 
-#: src/protocols/jabber/jabber.c:248 src/protocols/jabber/jabber.c:268
+#: src/protocols/jabber/jabber.c:252 src/protocols/jabber/jabber.c:272
 msgid "Read Error"
 msgstr "Read Error"
 
-#: src/protocols/jabber/jabber.c:328
-msgid "Connection Failed"
-msgstr "Connection Failed"
-
-#: src/protocols/jabber/jabber.c:331
-msgid "SSL Handshake Failed"
-msgstr "SSL Handshake Failed"
-
-#: src/protocols/jabber/jabber.c:375 src/protocols/jabber/jabber.c:708
+#: src/protocols/jabber/jabber.c:379 src/protocols/jabber/jabber.c:715
 msgid "Invalid Jabber ID"
 msgstr "Invalid Jabber ID"
 
-#: src/protocols/jabber/jabber.c:406 src/protocols/jabber/jabber.c:738
-msgid "SSL support unavailable"
-msgstr "SSL support unavailable"
-
-#: src/protocols/jabber/jabber.c:416 src/protocols/jabber/jabber.c:748
-#: src/protocols/trepia/trepia.c:1073
+#: src/protocols/jabber/jabber.c:420 src/protocols/jabber/jabber.c:755
+#: src/protocols/trepia/trepia.c:1075
 msgid "Unable to create socket"
 msgstr "Unable to create socket"
 
-#: src/protocols/jabber/jabber.c:441
+#: src/protocols/jabber/jabber.c:448
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "Registration of %s@%s successful"
 
-#: src/protocols/jabber/jabber.c:443 src/protocols/jabber/jabber.c:444
+#: src/protocols/jabber/jabber.c:450 src/protocols/jabber/jabber.c:451
 msgid "Registration Successful"
 msgstr "Registration Successful"
 
-#: src/protocols/jabber/jabber.c:450 src/protocols/jabber/jabber.c:1223
+#: src/protocols/jabber/jabber.c:457 src/protocols/jabber/jabber.c:1236
 msgid "Unknown Error"
 msgstr "Unknown Error"
 
-#: src/protocols/jabber/jabber.c:452 src/protocols/jabber/jabber.c:453
+#: src/protocols/jabber/jabber.c:459 src/protocols/jabber/jabber.c:460
 msgid "Registration Failed"
 msgstr "Registration Failed"
 
-#: src/protocols/jabber/jabber.c:564 src/protocols/jabber/jabber.c:565
+#: src/protocols/jabber/jabber.c:571 src/protocols/jabber/jabber.c:572
 msgid "Already Registered"
 msgstr "Already Registered"
 
-#: src/protocols/jabber/jabber.c:600 src/protocols/jabber/jabber.c:1078
+#: src/protocols/jabber/jabber.c:607 src/protocols/jabber/jabber.c:1091
 msgid "Password"
 msgstr "Password"
 
-#: src/protocols/jabber/jabber.c:611
+#: src/protocols/jabber/jabber.c:618
 msgid "E-Mail"
 msgstr "E-Mail"
 
 #. State
-#: src/protocols/jabber/jabber.c:641 src/protocols/oscar/oscar.c:5093
-#: src/protocols/oscar/oscar.c:5101 src/protocols/trepia/trepia.c:336
+#: src/protocols/jabber/jabber.c:648 src/protocols/oscar/oscar.c:5358
+#: src/protocols/oscar/oscar.c:5366 src/protocols/trepia/trepia.c:336
 #: src/protocols/trepia/trepia.c:414
 msgid "State"
 msgstr "County/State"
 
-#: src/protocols/jabber/jabber.c:651 src/protocols/silc/ops.c:855
-#: src/protocols/silc/silc.c:664 src/protocols/silc/util.c:510
+#: src/protocols/jabber/jabber.c:658 src/protocols/silc/ops.c:855
+#: src/protocols/silc/silc.c:672 src/protocols/silc/util.c:513
 msgid "Phone"
 msgstr "Telephone"
 
-#: src/protocols/jabber/jabber.c:661
+#: src/protocols/jabber/jabber.c:668
 msgid "Date"
 msgstr "Date"
 
-#: src/protocols/jabber/jabber.c:669
+#: src/protocols/jabber/jabber.c:676
 msgid "Please fill out the information below to register your new account."
 msgstr "Please fill out the information below to register your new account."
 
-#: src/protocols/jabber/jabber.c:672 src/protocols/jabber/jabber.c:673
+#: src/protocols/jabber/jabber.c:679 src/protocols/jabber/jabber.c:680
 msgid "Register New Jabber Account"
 msgstr "Register New Jabber Account"
 
-#. connect to the server
-#: src/protocols/jabber/jabber.c:800 src/protocols/msn/msn.c:697
-#: src/protocols/napster/napster.c:510 src/protocols/novell/novell.c:2163
-#: src/protocols/oscar/oscar.c:1761 src/protocols/trepia/trepia.c:1067
-#: src/protocols/yahoo/yahoo.c:2503 src/protocols/zephyr/zephyr.c:1492
-msgid "Connecting"
-msgstr "Connecting"
-
-#: src/protocols/jabber/jabber.c:804
+#: src/protocols/jabber/jabber.c:811
 msgid "Initializing Stream"
 msgstr "Initialising Stream"
 
-#: src/protocols/jabber/jabber.c:810
+#: src/protocols/jabber/jabber.c:817 src/protocols/msn/session.c:368
 msgid "Authenticating"
 msgstr "Authenticating"
 
-#: src/protocols/jabber/jabber.c:819
+#: src/protocols/jabber/jabber.c:826
 msgid "Re-initializing Stream"
 msgstr "Re-initialising Stream"
 
-#: src/protocols/jabber/jabber.c:891 src/protocols/jabber/jabber.c:1201
-#: src/protocols/jabber/jabber.c:1242 src/protocols/jabber/jabber.c:1275
-#: src/protocols/oscar/oscar.c:737 src/protocols/oscar/oscar.c:6670
+#: src/protocols/jabber/jabber.c:897 src/protocols/jabber/jabber.c:1214
+#: src/protocols/jabber/jabber.c:1255 src/protocols/jabber/jabber.c:1288
+#: src/protocols/oscar/oscar.c:760 src/protocols/oscar/oscar.c:6890
 msgid "Not Authorized"
 msgstr "Not Authorised"
 
-#: src/protocols/jabber/jabber.c:924
+#: src/protocols/jabber/jabber.c:930
 msgid "Both"
 msgstr "Both"
 
-#: src/protocols/jabber/jabber.c:926
+#: src/protocols/jabber/jabber.c:932
 msgid "From (To pending)"
 msgstr "From (To pending)"
 
-#: src/protocols/jabber/jabber.c:928
+#: src/protocols/jabber/jabber.c:934
 msgid "From"
 msgstr "From"
 
-#: src/protocols/jabber/jabber.c:931
+#: src/protocols/jabber/jabber.c:937
 msgid "To"
 msgstr "To"
 
-#: src/protocols/jabber/jabber.c:933
+#: src/protocols/jabber/jabber.c:939
 msgid "None (To pending)"
 msgstr "None (To pending)"
 
-#: src/protocols/jabber/jabber.c:937
+#: src/protocols/jabber/jabber.c:943
 msgid "Subscription"
 msgstr "Subscription"
 
-#: src/protocols/jabber/jabber.c:975 src/protocols/jabber/jabber.c:981
-#: src/protocols/jabber/jabber.c:987 src/protocols/jabber/jabber.c:993
-#: src/protocols/jabber/jabber.c:999
+#: src/protocols/jabber/jabber.c:982 src/protocols/jabber/jabber.c:988
+#: src/protocols/jabber/jabber.c:994 src/protocols/jabber/jabber.c:1000
+#: src/protocols/jabber/jabber.c:1006 src/protocols/jabber/jabber.c:1012
 #, fuzzy
 msgid "Priority"
 msgstr "Port"
 
-#: src/protocols/jabber/jabber.c:1021
+#: src/protocols/jabber/jabber.c:1034
 msgid "Password Changed"
 msgstr "Password Changed"
 
-#: src/protocols/jabber/jabber.c:1022
+#: src/protocols/jabber/jabber.c:1035
 msgid "Your password has been changed."
 msgstr "Your password has been changed."
 
-#: src/protocols/jabber/jabber.c:1026 src/protocols/jabber/jabber.c:1027
+#: src/protocols/jabber/jabber.c:1039 src/protocols/jabber/jabber.c:1040
 msgid "Error changing password"
 msgstr "Error changing password"
 
-#: src/protocols/jabber/jabber.c:1083
+#: src/protocols/jabber/jabber.c:1096
 msgid "Password (again)"
 msgstr "Password (again)"
 
-#: src/protocols/jabber/jabber.c:1088 src/protocols/jabber/jabber.c:1089
+#: src/protocols/jabber/jabber.c:1101 src/protocols/jabber/jabber.c:1102
 msgid "Change Jabber Password"
 msgstr "Change Jabber Password"
 
-#: src/protocols/jabber/jabber.c:1089
+#: src/protocols/jabber/jabber.c:1102
 msgid "Please enter your new password"
 msgstr "Please enter your new password"
 
-#: src/protocols/jabber/jabber.c:1099 src/protocols/toc/toc.c:1561
+#: src/protocols/jabber/jabber.c:1112 src/protocols/toc/toc.c:1684
 msgid "Set User Info"
 msgstr "Set User Info"
 
-#: src/protocols/jabber/jabber.c:1181
+#: src/protocols/jabber/jabber.c:1194
 msgid "Bad Request"
 msgstr "Bad Request"
 
-#: src/protocols/jabber/jabber.c:1183
+#: src/protocols/jabber/jabber.c:1196
 msgid "Conflict"
 msgstr "Conflict"
 
-#: src/protocols/jabber/jabber.c:1185
+#: src/protocols/jabber/jabber.c:1198
 msgid "Feature Not Implemented"
 msgstr "Feature Not Implemented"
 
-#: src/protocols/jabber/jabber.c:1187
+#: src/protocols/jabber/jabber.c:1200
 msgid "Forbidden"
 msgstr "Forbidden"
 
-#: src/protocols/jabber/jabber.c:1189
+#: src/protocols/jabber/jabber.c:1202
 msgid "Gone"
 msgstr "Gone"
 
-#: src/protocols/jabber/jabber.c:1191 src/protocols/jabber/jabber.c:1265
+#: src/protocols/jabber/jabber.c:1204 src/protocols/jabber/jabber.c:1278
 msgid "Internal Server Error"
 msgstr "Internal Server Error"
 
-#: src/protocols/jabber/jabber.c:1193
+#: src/protocols/jabber/jabber.c:1206
 msgid "Item Not Found"
 msgstr "Item Not Found"
 
-#: src/protocols/jabber/jabber.c:1195
+#: src/protocols/jabber/jabber.c:1208
 msgid "Malformed Jabber ID"
 msgstr "Malformed Jabber ID"
 
-#: src/protocols/jabber/jabber.c:1197
+#: src/protocols/jabber/jabber.c:1210
 msgid "Not Acceptable"
 msgstr "Not Acceptable"
 
-#: src/protocols/jabber/jabber.c:1199
+#: src/protocols/jabber/jabber.c:1212
 msgid "Not Allowed"
 msgstr "Not Allowed"
 
-#: src/protocols/jabber/jabber.c:1203
+#: src/protocols/jabber/jabber.c:1216
 msgid "Payment Required"
 msgstr "Payment Required"
 
-#: src/protocols/jabber/jabber.c:1205
+#: src/protocols/jabber/jabber.c:1218
 msgid "Recipient Unavailable"
 msgstr "Recipient unavailable"
 
-#: src/protocols/jabber/jabber.c:1209
+#: src/protocols/jabber/jabber.c:1222
 msgid "Registration Required"
 msgstr "Registration Required"
 
-#: src/protocols/jabber/jabber.c:1211
+#: src/protocols/jabber/jabber.c:1224
 msgid "Remote Server Not Found"
 msgstr "Remote Server Not Found"
 
-#: src/protocols/jabber/jabber.c:1213
+#: src/protocols/jabber/jabber.c:1226
 msgid "Remote Server Timeout"
 msgstr "Remote Server Timeout"
 
-#: src/protocols/jabber/jabber.c:1215
+#: src/protocols/jabber/jabber.c:1228
 msgid "Server Overloaded"
 msgstr "Server Overloaded"
 
-#: src/protocols/jabber/jabber.c:1217
+#: src/protocols/jabber/jabber.c:1230
 msgid "Service Unavailable"
 msgstr "Service Unavailable"
 
-#: src/protocols/jabber/jabber.c:1219
+#: src/protocols/jabber/jabber.c:1232
 msgid "Subscription Required"
 msgstr "Subscription Required"
 
-#: src/protocols/jabber/jabber.c:1221
+#: src/protocols/jabber/jabber.c:1234
 msgid "Unexpected Request"
 msgstr "Unexpected Request"
 
-#: src/protocols/jabber/jabber.c:1228
+#: src/protocols/jabber/jabber.c:1241
 msgid "Authorization Aborted"
 msgstr "Authorisation Aborted"
 
-#: src/protocols/jabber/jabber.c:1230
+#: src/protocols/jabber/jabber.c:1243
 msgid "Incorrect encoding in authorization"
 msgstr "Incorrect encoding in authorisation"
 
-#: src/protocols/jabber/jabber.c:1233
+#: src/protocols/jabber/jabber.c:1246
 msgid "Invalid authzid"
 msgstr "Invalid authzid"
 
-#: src/protocols/jabber/jabber.c:1236
+#: src/protocols/jabber/jabber.c:1249
 msgid "Invalid Authorization Mechanism"
 msgstr "Invalid Authorisation Mechanism"
 
-#: src/protocols/jabber/jabber.c:1239
+#: src/protocols/jabber/jabber.c:1252
 msgid "Authorization mechanism too weak"
 msgstr "Authorisation mechanism too weak"
 
-#: src/protocols/jabber/jabber.c:1244
+#: src/protocols/jabber/jabber.c:1257
 msgid "Temporary Authentication Failure"
 msgstr "Temporary Authentication Failure"
 
-#: src/protocols/jabber/jabber.c:1246
+#: src/protocols/jabber/jabber.c:1259
 msgid "Authentication Failure"
 msgstr "Authentication Failure"
 
-#: src/protocols/jabber/jabber.c:1250
+#: src/protocols/jabber/jabber.c:1263
 msgid "Bad Format"
 msgstr "Bad Format"
 
-#: src/protocols/jabber/jabber.c:1252
+#: src/protocols/jabber/jabber.c:1265
 msgid "Bad Namespace Prefix"
 msgstr "Bad Namespace Prefix"
 
-#: src/protocols/jabber/jabber.c:1255
+#: src/protocols/jabber/jabber.c:1268
 msgid "Resource Conflict"
 msgstr "Resource Conflict"
 
-#: src/protocols/jabber/jabber.c:1257 src/protocols/silc/ops.c:1509
+#: src/protocols/jabber/jabber.c:1270 src/protocols/silc/ops.c:1518
 msgid "Connection Timeout"
 msgstr "Connection Timeout"
 
-#: src/protocols/jabber/jabber.c:1259
+#: src/protocols/jabber/jabber.c:1272
 msgid "Host Gone"
 msgstr "Host Gone"
 
-#: src/protocols/jabber/jabber.c:1261
+#: src/protocols/jabber/jabber.c:1274
 msgid "Host Unknown"
 msgstr "Host Unknown"
 
-#: src/protocols/jabber/jabber.c:1263
+#: src/protocols/jabber/jabber.c:1276
 msgid "Improper Addressing"
 msgstr "Improper Addressing"
 
-#: src/protocols/jabber/jabber.c:1267
+#: src/protocols/jabber/jabber.c:1280
 msgid "Invalid ID"
 msgstr "Invalid ID"
 
-#: src/protocols/jabber/jabber.c:1269
+#: src/protocols/jabber/jabber.c:1282
 msgid "Invalid Namespace"
 msgstr "Invalid Namespace"
 
-#: src/protocols/jabber/jabber.c:1271
+#: src/protocols/jabber/jabber.c:1284
 msgid "Invalid XML"
 msgstr "Invalid XML"
 
-#: src/protocols/jabber/jabber.c:1273
+#: src/protocols/jabber/jabber.c:1286
 msgid "Non-matching Hosts"
 msgstr "Non-matching Hosts"
 
-#: src/protocols/jabber/jabber.c:1277
+#: src/protocols/jabber/jabber.c:1290
 msgid "Policy Violation"
 msgstr "Policy Violation"
 
-#: src/protocols/jabber/jabber.c:1279
+#: src/protocols/jabber/jabber.c:1292
 msgid "Remote Connection Failed"
 msgstr "Remote Connection Failed"
 
-#: src/protocols/jabber/jabber.c:1281
+#: src/protocols/jabber/jabber.c:1294
 msgid "Resource Constraint"
 msgstr "Resource Constraint"
 
-#: src/protocols/jabber/jabber.c:1283
+#: src/protocols/jabber/jabber.c:1296
 msgid "Restricted XML"
 msgstr "Restricted XML"
 
-#: src/protocols/jabber/jabber.c:1285
+#: src/protocols/jabber/jabber.c:1298
 msgid "See Other Host"
 msgstr "See Other Host"
 
-#: src/protocols/jabber/jabber.c:1287
+#: src/protocols/jabber/jabber.c:1300
 msgid "System Shutdown"
 msgstr "System Shutdown"
 
-#: src/protocols/jabber/jabber.c:1289
+#: src/protocols/jabber/jabber.c:1302
 msgid "Undefined Condition"
 msgstr "Undefined Condition"
 
-#: src/protocols/jabber/jabber.c:1291
+#: src/protocols/jabber/jabber.c:1304
 msgid "Unsupported Encoding"
 msgstr "Unsupported Encoding"
 
-#: src/protocols/jabber/jabber.c:1293
+#: src/protocols/jabber/jabber.c:1306
 msgid "Unsupported Stanza Type"
 msgstr "Unsupported Stanza Type"
 
-#: src/protocols/jabber/jabber.c:1295
+#: src/protocols/jabber/jabber.c:1308
 msgid "Unsupported Version"
 msgstr "Unsupported Version"
 
-#: src/protocols/jabber/jabber.c:1297
+#: src/protocols/jabber/jabber.c:1310
 msgid "XML Not Well Formed"
 msgstr "XML Not Well Formed"
 
-#: src/protocols/jabber/jabber.c:1299
+#: src/protocols/jabber/jabber.c:1312
 msgid "Stream Error"
 msgstr "Stream Error"
 
-#: src/protocols/jabber/jabber.c:1366
+#: src/protocols/jabber/jabber.c:1379
 #, c-format
 msgid "Unable to ban user %s"
 msgstr "Unable to ban user %s"
 
-#: src/protocols/jabber/jabber.c:1418
+#: src/protocols/jabber/jabber.c:1431
 #, c-format
 msgid "Unable to kick user %s"
 msgstr "Unable to kick user %s"
 
-#: src/protocols/jabber/jabber.c:1444
+#: src/protocols/jabber/jabber.c:1457
 msgid "config:  Configure a chat room."
 msgstr "config:  Configure a chat room."
 
-#: src/protocols/jabber/jabber.c:1448
+#: src/protocols/jabber/jabber.c:1461
 msgid "configure:  Configure a chat room."
 msgstr "configure:  Configure a chat room."
 
-#: src/protocols/jabber/jabber.c:1457
+#: src/protocols/jabber/jabber.c:1470
 msgid "part [room]:  Leave the room."
 msgstr "part [room]:  Leave the room."
 
-#: src/protocols/jabber/jabber.c:1462
+#: src/protocols/jabber/jabber.c:1475
 msgid "register:  Register with a chat room."
 msgstr "register:  Register with a chat room."
 
-#: src/protocols/jabber/jabber.c:1468
+#: src/protocols/jabber/jabber.c:1481
 msgid "topic [new topic]:  View or change the topic."
 msgstr "topic [new topic]:  View or change the topic."
 
-#: src/protocols/jabber/jabber.c:1474
+#: src/protocols/jabber/jabber.c:1487
 msgid "ban &lt;user&gt; [room]:  Ban a user from the room."
 msgstr "ban &lt;user&gt; [room]:  Ban a user from the room."
 
-#: src/protocols/jabber/jabber.c:1480
-msgid "invite &lt;user&gt; [room]:  Invite a user to the room."
+#: src/protocols/jabber/jabber.c:1493
+#, fuzzy
+msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
 msgstr "invite &lt;user&gt; [room]:  Invite a user to the room."
 
-#: src/protocols/jabber/jabber.c:1486
+#: src/protocols/jabber/jabber.c:1499
 msgid "join: &lt;room&gt; [server]:  Join a chat on this server."
 msgstr "join: &lt;room&gt; [server]:  Join a chat on this server."
 
-#: src/protocols/jabber/jabber.c:1492
+#: src/protocols/jabber/jabber.c:1505
 msgid "kick &lt;user&gt; [room]:  Kick a user from the room."
 msgstr "kick &lt;user&gt; [room]:  Kick a user from the room."
 
-#: src/protocols/jabber/jabber.c:1497
+#: src/protocols/jabber/jabber.c:1510
 msgid ""
 "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
 msgstr ""
 "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
 
-#: src/protocols/jabber/jabber.c:1512
-msgid "Hide Operating System"
-msgstr "Hide Operating System"
-
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -6350,38 +6494,43 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/jabber/jabber.c:1599 src/protocols/jabber/jabber.c:1601
+#: src/protocols/jabber/jabber.c:1590 src/protocols/jabber/jabber.c:1592
 msgid "Jabber Protocol Plugin"
 msgstr "Jabber Protocol Plugin"
 
-#: src/protocols/jabber/jabber.c:1627
+#: src/protocols/jabber/jabber.c:1618
 msgid "Use TLS if available"
 msgstr "Use TLS if available"
 
-#: src/protocols/jabber/jabber.c:1632
-msgid "Force old SSL"
+#: src/protocols/jabber/jabber.c:1623
+msgid "Require TLS"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1626
+#, fuzzy
+msgid "Force old (port 5223) SSL"
 msgstr "Force old SSL"
 
-#: src/protocols/jabber/jabber.c:1637
+#: src/protocols/jabber/jabber.c:1631
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Allow plaintext auth over unencrypted streams"
 
 #. Account options
-#: src/protocols/jabber/jabber.c:1646 src/protocols/silc/silc.c:1600
+#: src/protocols/jabber/jabber.c:1640 src/protocols/silc/silc.c:1602
 msgid "Connect server"
 msgstr "Connect server"
 
-#: src/protocols/jabber/message.c:111
+#: src/protocols/jabber/message.c:114
 #, c-format
 msgid "Message from %s"
 msgstr "Message from %s"
 
-#: src/protocols/jabber/message.c:175
+#: src/protocols/jabber/message.c:178
 #, c-format
 msgid "%s has set the topic to: %s"
 msgstr "%s has set the topic to: %s"
 
-#: src/protocols/jabber/message.c:177
+#: src/protocols/jabber/message.c:180
 #, c-format
 msgid "The topic is: %s"
 msgstr "The topic is: %s"
@@ -6404,30 +6553,32 @@
 msgid "XML Parse error"
 msgstr "XML Parse error"
 
-#: src/protocols/jabber/presence.c:255
+#: src/protocols/jabber/presence.c:284
 msgid "Unknown Error in presence"
 msgstr "Unknown Error in presence"
 
-#: src/protocols/jabber/presence.c:258
-#, c-format
-msgid "The user %s wants to add you to their buddy list."
-msgstr "The user %s wants to add you to their buddy list."
-
-#: src/protocols/jabber/presence.c:264 src/protocols/msn/userlist.c:102
-#: src/protocols/oscar/oscar.c:3733 src/protocols/oscar/oscar.c:6300
+#: src/protocols/jabber/presence.c:289 src/protocols/msn/userlist.c:93
+#, c-format
+msgid "The user %s wants to add %s to his or her buddy list."
+msgstr "The user %s wants to add %s to his or her buddy list."
+
+#: src/protocols/jabber/presence.c:297 src/protocols/msn/userlist.c:100
+#: src/protocols/oscar/oscar.c:3973 src/protocols/oscar/oscar.c:6549
+#: src/protocols/yahoo/yahoo.c:861
 msgid "Authorize"
 msgstr "Authorise"
 
-#: src/protocols/jabber/presence.c:265 src/protocols/msn/userlist.c:103
-#: src/protocols/oscar/oscar.c:3735 src/protocols/oscar/oscar.c:6301
+#: src/protocols/jabber/presence.c:298 src/protocols/msn/userlist.c:101
+#: src/protocols/oscar/oscar.c:3975 src/protocols/oscar/oscar.c:6550
+#: src/protocols/yahoo/yahoo.c:863
 msgid "Deny"
 msgstr "Deny"
 
-#: src/protocols/jabber/presence.c:312 src/protocols/jabber/presence.c:313
+#: src/protocols/jabber/presence.c:345 src/protocols/jabber/presence.c:346
 msgid "Create New Room"
 msgstr "Create New Room"
 
-#: src/protocols/jabber/presence.c:314
+#: src/protocols/jabber/presence.c:347
 msgid ""
 "You are creating a new room.  Would you like to configure it, or accept the "
 "default settings?"
@@ -6435,44 +6586,51 @@
 "You are creating a new room.  Would you like to configure it, or accept the "
 "default settings?"
 
-#: src/protocols/jabber/presence.c:316
+#: src/protocols/jabber/presence.c:349
 msgid "Configure Room"
 msgstr "Configure Room"
 
-#: src/protocols/jabber/presence.c:318
+#: src/protocols/jabber/presence.c:351
 msgid "Accept Defaults"
 msgstr "Accept Defaults"
 
-#: src/protocols/jabber/presence.c:355
+#: src/protocols/jabber/presence.c:388
 #, c-format
 msgid "Error in chat %s"
 msgstr "Error in chat %s"
 
-#: src/protocols/jabber/presence.c:358
+#: src/protocols/jabber/presence.c:391
 #, c-format
 msgid "Error joining chat %s"
 msgstr "Error joining chat %s"
 
-#: src/protocols/jabber/si.c:582
+#: src/protocols/jabber/si.c:591
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
 msgstr "Unable to send file to %s, user does not support file transfers"
 
-#: src/protocols/jabber/si.c:583 src/protocols/jabber/si.c:584
+#: src/protocols/jabber/si.c:592 src/protocols/jabber/si.c:593
 msgid "File Send Failed"
 msgstr "File Send Failed"
 
-#: src/protocols/msn/cmdproc.c:358
-msgid "Miscellaneous error"
-msgstr "Miscellaneous error"
-
-#: src/protocols/msn/cmdproc.c:361
-msgid "You have signed on from another location."
-msgstr "You have signed on from another location."
-
-#: src/protocols/msn/cmdproc.c:363
-msgid "The MSN servers are going down temporarily."
-msgstr "The MSN servers are going down temporarily."
+#: src/protocols/msn/dialog.c:91
+#, c-format
+msgid "Buddy list synchronization issue in %s (%s)"
+msgstr ""
+
+#: src/protocols/msn/dialog.c:97
+#, c-format
+msgid ""
+"%s on the local list is inside the group \"%s\" but not on the server list. "
+"Do you want this buddy to be added?"
+msgstr ""
+
+#: src/protocols/msn/dialog.c:105
+#, c-format
+msgid ""
+"%s is on the local list but not on the server list. Do you want this buddy "
+"to be added?"
+msgstr ""
 
 #: src/protocols/msn/error.c:35
 msgid "Unable to parse message"
@@ -6518,7 +6676,7 @@
 msgid "Not on list"
 msgstr "Not on list"
 
-#: src/protocols/msn/error.c:70 src/protocols/zephyr/zephyr.c:681
+#: src/protocols/msn/error.c:70 src/protocols/zephyr/zephyr.c:690
 msgid "User is offline"
 msgstr "User is offline"
 
@@ -6570,7 +6728,7 @@
 msgid "Too many hits to a FND"
 msgstr "Too many hits to a FND"
 
-#: src/protocols/msn/error.c:112 src/protocols/oscar/oscar.c:194
+#: src/protocols/msn/error.c:112 src/protocols/oscar/oscar.c:200
 msgid "Not logged in"
 msgstr "Not logged in"
 
@@ -6663,8 +6821,8 @@
 msgid "Server too busy"
 msgstr "Server too busy"
 
-#: src/protocols/msn/error.c:198 src/protocols/oscar/oscar.c:2194
-#: src/protocols/silc/ops.c:1498 src/protocols/toc/toc.c:631
+#: src/protocols/msn/error.c:198 src/protocols/oscar/oscar.c:2338
+#: src/protocols/silc/ops.c:1507 src/protocols/toc/toc.c:722
 msgid "Authentication failed"
 msgstr "Authentication failed"
 
@@ -6698,35 +6856,35 @@
 msgid "MSN Error: %s\n"
 msgstr "MSN Error: %s\n"
 
-#: src/protocols/msn/msn.c:116
+#: src/protocols/msn/msn.c:114
 msgid "Your new MSN friendly name is too long."
 msgstr "Your new MSN friendly name is too long."
 
-#: src/protocols/msn/msn.c:224
+#: src/protocols/msn/msn.c:222
 msgid "Set your friendly name."
 msgstr "Set your friendly name."
 
-#: src/protocols/msn/msn.c:225
+#: src/protocols/msn/msn.c:223
 msgid "This is the name that other MSN buddies will see you as."
 msgstr "This is the name that other MSN buddies will see you as."
 
-#: src/protocols/msn/msn.c:241
+#: src/protocols/msn/msn.c:239
 msgid "Set your home phone number."
 msgstr "Set your home phone number."
 
-#: src/protocols/msn/msn.c:256
+#: src/protocols/msn/msn.c:254
 msgid "Set your work phone number."
 msgstr "Set your work phone number."
 
-#: src/protocols/msn/msn.c:271
+#: src/protocols/msn/msn.c:269
 msgid "Set your mobile phone number."
 msgstr "Set your mobile phone number."
 
-#: src/protocols/msn/msn.c:284
+#: src/protocols/msn/msn.c:282
 msgid "Allow MSN Mobile pages?"
 msgstr "Allow MSN Mobile pages?"
 
-#: src/protocols/msn/msn.c:285
+#: src/protocols/msn/msn.c:283
 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?"
@@ -6734,24 +6892,25 @@
 "Do you want to allow or disallow people on your buddy list to send you MSN "
 "Mobile pages to your mobile phone or other mobile device?"
 
-#: src/protocols/msn/msn.c:289
+#: src/protocols/msn/msn.c:287
 msgid "Allow"
 msgstr "Allow"
 
-#: src/protocols/msn/msn.c:290
+#: src/protocols/msn/msn.c:288
 msgid "Disallow"
 msgstr "Disallow"
 
+#: src/protocols/msn/msn.c:311
+msgid "Send a mobile message."
+msgstr "Send a mobile message."
+
 #: src/protocols/msn/msn.c:313
-msgid "Send a mobile message."
-msgstr "Send a mobile message."
-
-#: src/protocols/msn/msn.c:315
 msgid "Page"
 msgstr "Page"
 
-#: src/protocols/msn/msn.c:505 src/protocols/msn/msn.c:512
-#: src/protocols/msn/msn.c:515 src/protocols/yahoo/yahoo.c:2774
+#: src/protocols/msn/msn.c:501 src/protocols/msn/msn.c:508
+#: src/protocols/msn/msn.c:511 src/protocols/yahoo/yahoo.c:2756
+#: src/protocols/yahoo/yahoo.c:2762
 #, c-format
 msgid ""
 "\n"
@@ -6760,75 +6919,76 @@
 "\n"
 "<b>%s:</b> %s"
 
-#: src/protocols/msn/msn.c:512
+#: src/protocols/msn/msn.c:508
 msgid "Has you"
 msgstr ""
 
-#: src/protocols/msn/msn.c:515
+#: src/protocols/msn/msn.c:511
 #, fuzzy
 msgid "Blocked"
 msgstr "Block"
 
-#: src/protocols/msn/msn.c:546 src/protocols/msn/state.c:33
-#: src/protocols/yahoo/yahoo.c:2631 src/protocols/yahoo/yahoo.c:3139
+#: src/protocols/msn/msn.c:542 src/protocols/msn/state.c:33
+#: src/protocols/yahoo/yahoo.c:2584 src/protocols/yahoo/yahoo.c:3186
 msgid "Be Right Back"
 msgstr "Be Right Back"
 
-#: src/protocols/msn/msn.c:550 src/protocols/msn/state.c:31
-#: src/protocols/novell/novell.c:2814 src/protocols/novell/novell.c:2929
-#: src/protocols/novell/novell.c:2983 src/protocols/silc/buddy.c:1388
-#: src/protocols/silc/silc.c:54 src/protocols/yahoo/yahoo.c:2633
-#: src/protocols/yahoo/yahoo.c:3142
+#: src/protocols/msn/msn.c:546 src/protocols/msn/state.c:31
+#: src/protocols/novell/novell.c:2816 src/protocols/novell/novell.c:2954
+#: src/protocols/novell/novell.c:3042 src/protocols/silc/buddy.c:1416
+#: src/protocols/silc/silc.c:56 src/protocols/yahoo/yahoo.c:2586
+#: src/protocols/yahoo/yahoo.c:3189
 msgid "Busy"
 msgstr "Busy"
 
-#: src/protocols/msn/msn.c:554 src/protocols/msn/state.c:35
-#: src/protocols/yahoo/yahoo.c:2641 src/protocols/yahoo/yahoo.c:3154
+#: src/protocols/msn/msn.c:550 src/protocols/msn/state.c:35
+#: src/protocols/yahoo/yahoo.c:2594 src/protocols/yahoo/yahoo.c:3201
 msgid "On The Phone"
 msgstr "On The Phone"
 
-#: src/protocols/msn/msn.c:558 src/protocols/msn/state.c:36
-#: src/protocols/yahoo/yahoo.c:2645 src/protocols/yahoo/yahoo.c:3160
+#: src/protocols/msn/msn.c:554 src/protocols/msn/state.c:36
+#: src/protocols/yahoo/yahoo.c:2598 src/protocols/yahoo/yahoo.c:3207
 msgid "Out To Lunch"
 msgstr "Out To Lunch"
 
-#: src/protocols/msn/msn.c:562 src/protocols/zephyr/zephyr.c:2221
+#: src/protocols/msn/msn.c:558 src/protocols/zephyr/zephyr.c:2255
+#: src/status.c:158
 msgid "Hidden"
 msgstr "Hidden"
 
-#: src/protocols/msn/msn.c:574
+#: src/protocols/msn/msn.c:570
 msgid "Set Friendly Name"
 msgstr "Set Friendly Name"
 
-#: src/protocols/msn/msn.c:579
+#: src/protocols/msn/msn.c:575
 msgid "Set Home Phone Number"
 msgstr "Set Home Phone Number"
 
-#: src/protocols/msn/msn.c:583
+#: src/protocols/msn/msn.c:579
 msgid "Set Work Phone Number"
 msgstr "Set Work Phone Number"
 
-#: src/protocols/msn/msn.c:587
+#: src/protocols/msn/msn.c:583
 msgid "Set Mobile Phone Number"
 msgstr "Set Mobile Phone Number"
 
-#: src/protocols/msn/msn.c:593
+#: src/protocols/msn/msn.c:589
 msgid "Enable/Disable Mobile Devices"
 msgstr "Enable/Disable Mobile Devices"
 
-#: src/protocols/msn/msn.c:598
+#: src/protocols/msn/msn.c:594
 msgid "Allow/Disallow Mobile Pages"
 msgstr "Allow/Disallow Mobile Pages"
 
-#: src/protocols/msn/msn.c:621
+#: src/protocols/msn/msn.c:617
 msgid "Send to Mobile"
 msgstr "Send to Mobile"
 
-#: src/protocols/msn/msn.c:631
-msgid "Initiate Chat"
-msgstr "Initiate Chat"
-
-#: src/protocols/msn/msn.c:667
+#: src/protocols/msn/msn.c:626 src/protocols/novell/novell.c:3440
+msgid "Initiate _Chat"
+msgstr "Initiate _Chat"
+
+#: src/protocols/msn/msn.c:663
 msgid ""
 "SSL support is needed for MSN. Please install a supported SSL library. See "
 "http://gaim.sf.net/faq-ssl.php for more information."
@@ -6836,91 +6996,96 @@
 "SSL support is needed for MSN. Please install a supported SSL library. See "
 "http://gaim.sf.net/faq-ssl.php for more information."
 
-#: src/protocols/msn/msn.c:1339 src/protocols/yahoo/yahoo_profile.c:659
-#: src/protocols/zephyr/zephyr.c:712 src/protocols/zephyr/zephyr.c:1126
+#: src/protocols/msn/msn.c:691
+#, fuzzy
+msgid "Failed to connect to server."
+msgstr "Unable to connect to server."
+
+#: src/protocols/msn/msn.c:1341 src/protocols/yahoo/yahoo_profile.c:659
+#: src/protocols/zephyr/zephyr.c:721 src/protocols/zephyr/zephyr.c:1135
 #, c-format
 msgid "<b>Alias:</b> %s<br>"
 msgstr "<b>Alias:</b> %s<br>"
 
 #. put a link to the actual profile URL
-#: src/protocols/msn/msn.c:1346 src/protocols/msn/msn.c:1702
-#: src/protocols/yahoo/yahoo_profile.c:1170 src/util.c:782
+#: src/protocols/msn/msn.c:1348 src/protocols/msn/msn.c:1695
+#: src/protocols/yahoo/yahoo_profile.c:1176 src/util.c:801
 #, c-format
 msgid "<b>%s:</b> "
 msgstr "<b>%s:</b> "
 
-#: src/protocols/msn/msn.c:1432
+#: src/protocols/msn/msn.c:1425
 msgid "MSN Profile"
 msgstr "MSN Profile"
 
-#: src/protocols/msn/msn.c:1437 src/protocols/msn/msn.c:1689
-#: src/protocols/yahoo/yahoo_profile.c:763
+#: src/protocols/msn/msn.c:1430 src/protocols/msn/msn.c:1682
+#: src/protocols/yahoo/yahoo_profile.c:765
 msgid "Error retrieving profile"
 msgstr "Error retreiving profile"
 
 #. Age
-#: src/protocols/msn/msn.c:1508 src/protocols/oscar/oscar.c:5078
+#: src/protocols/msn/msn.c:1501 src/protocols/oscar/oscar.c:5343
 #: src/protocols/trepia/trepia.c:286 src/protocols/trepia/trepia.c:405
-#: src/protocols/yahoo/yahoo_profile.c:1017
+#: src/protocols/yahoo/yahoo_profile.c:1024
 msgid "Age"
 msgstr "Age"
 
 #. Gender
-#: src/protocols/msn/msn.c:1515 src/protocols/oscar/oscar.c:5065
+#: src/protocols/msn/msn.c:1508 src/protocols/oscar/oscar.c:5330
 #: src/protocols/trepia/trepia.c:280 src/protocols/trepia/trepia.c:407
-#: src/protocols/yahoo/yahoo_profile.c:1027
+#: src/protocols/yahoo/yahoo_profile.c:1034
 msgid "Gender"
 msgstr "Gender"
 
-#: src/protocols/msn/msn.c:1524 src/protocols/yahoo/yahoo_profile.c:1022
+#: src/protocols/msn/msn.c:1517 src/protocols/yahoo/yahoo_profile.c:1029
 msgid "Marital Status"
 msgstr "Marital Status"
 
-#: src/protocols/msn/msn.c:1531 src/protocols/novell/novell.c:1454
-#: src/protocols/yahoo/yahoo_profile.c:1012
+#: src/protocols/msn/msn.c:1524 src/protocols/novell/novell.c:1454
+#: src/protocols/yahoo/yahoo_profile.c:1019
 msgid "Location"
 msgstr "Location"
 
-#: src/protocols/msn/msn.c:1539 src/protocols/yahoo/yahoo_profile.c:1032
+#: src/protocols/msn/msn.c:1532 src/protocols/yahoo/yahoo_profile.c:1039
 msgid "Occupation"
 msgstr "Occupation"
 
-#: src/protocols/msn/msn.c:1556 src/protocols/msn/msn.c:1562
-#: src/protocols/msn/msn.c:1569 src/protocols/msn/msn.c:1577
-#: src/protocols/msn/msn.c:1584
+#: src/protocols/msn/msn.c:1549 src/protocols/msn/msn.c:1555
+#: src/protocols/msn/msn.c:1562 src/protocols/msn/msn.c:1570
+#: src/protocols/msn/msn.c:1577
 msgid "A Little About Me"
 msgstr "A Little About Me"
 
-#: src/protocols/msn/msn.c:1593 src/protocols/msn/msn.c:1599
-#: src/protocols/msn/msn.c:1606 src/protocols/msn/msn.c:1613
+#: src/protocols/msn/msn.c:1586 src/protocols/msn/msn.c:1592
+#: src/protocols/msn/msn.c:1599 src/protocols/msn/msn.c:1606
 msgid "Favorite Things"
 msgstr "Favourite Things"
 
-#: src/protocols/msn/msn.c:1622 src/protocols/msn/msn.c:1628
-#: src/protocols/msn/msn.c:1635
+#: src/protocols/msn/msn.c:1615 src/protocols/msn/msn.c:1621
+#: src/protocols/msn/msn.c:1628
 msgid "Hobbies and Interests"
 msgstr "Hobbies and Interests"
 
-#: src/protocols/msn/msn.c:1644 src/protocols/msn/msn.c:1650
-#: src/protocols/yahoo/yahoo_profile.c:1074
+#: src/protocols/msn/msn.c:1637 src/protocols/msn/msn.c:1643
+#: src/protocols/yahoo/yahoo_profile.c:1081
 msgid "Favorite Quote"
 msgstr "Favourite Quote"
 
-#: src/protocols/msn/msn.c:1658 src/protocols/yahoo/yahoo_profile.c:1125
+#: src/protocols/msn/msn.c:1651
 msgid "Last Updated"
 msgstr "Last Updated"
 
 #. Homepage
-#: src/protocols/msn/msn.c:1669 src/protocols/silc/ops.c:846
+#: src/protocols/msn/msn.c:1662 src/protocols/silc/ops.c:846
 #: src/protocols/trepia/trepia.c:290 src/protocols/trepia/trepia.c:420
 msgid "Homepage"
 msgstr "Homepage"
 
-#: src/protocols/msn/msn.c:1691
+#: src/protocols/msn/msn.c:1684
 msgid "The user has not created a public profile."
 msgstr "The user has not created a public profile."
 
-#: src/protocols/msn/msn.c:1692
+#: src/protocols/msn/msn.c:1685
 msgid ""
 "MSN reported not being able to find the user's profile. This either means "
 "that the user does not exist, or that the user exists but has not created a "
@@ -6930,7 +7095,7 @@
 "that the user does not exist, or that the user exists but has not created a "
 "public profile."
 
-#: src/protocols/msn/msn.c:1696
+#: src/protocols/msn/msn.c:1689
 msgid ""
 "Gaim could not find any information in the user's profile. The user most "
 "likely does not exist."
@@ -6938,18 +7103,10 @@
 "Gaim could not find any information in the user's profile. The user most "
 "likely does not exist."
 
-#: src/protocols/msn/msn.c:1702 src/protocols/yahoo/yahoo_profile.c:1170
+#: src/protocols/msn/msn.c:1695 src/protocols/yahoo/yahoo_profile.c:1176
 msgid "Profile URL"
 msgstr "Profile URL"
 
-#: src/protocols/msn/msn.c:1843
-msgid "Display conversation closed notices"
-msgstr "Display conversation closed notices"
-
-#: src/protocols/msn/msn.c:1848
-msgid "Display timeout notices"
-msgstr "Display timeout notices"
-
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -6960,47 +7117,75 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/msn/msn.c:1935 src/protocols/msn/msn.c:1937
+#: src/protocols/msn/msn.c:1899 src/protocols/msn/msn.c:1901
 msgid "MSN Protocol Plugin"
 msgstr "MSN Protocol Plugin"
 
-#: src/protocols/msn/msn.c:1956 src/protocols/trepia/trepia.c:1298
+#: src/protocols/msn/msn.c:1920 src/protocols/trepia/trepia.c:1299
 msgid "Login server"
 msgstr "Login server"
 
-#: src/protocols/msn/msn.c:1965
+#: src/protocols/msn/msn.c:1929
 msgid "Use HTTP Method"
 msgstr "Use HTTP Method"
 
-#: src/protocols/msn/nexus.c:79
-msgid "Unable to connect to server"
-msgstr "Unable to connect to server"
-
-#: src/protocols/msn/nexus.c:218
-msgid "Unknown error when attempting to authorize with MSN login server."
-msgstr "Unknown error when attempting to authorise with MSN login server."
-
-#: src/protocols/msn/notification.c:85
-msgid "Requesting to send password"
-msgstr "Requesting to send password"
-
-#: src/protocols/msn/notification.c:119 src/protocols/trepia/trepia.c:636
-msgid "Retrieving buddy list"
-msgstr "Retrieving buddy list"
-
-#: src/protocols/msn/notification.c:145 src/protocols/msn/notification.c:174
-#: src/protocols/oscar/oscar.c:2483
-msgid "Password sent"
-msgstr "Password sent"
-
-#: src/protocols/msn/notification.c:732
-#, c-format
-msgid ""
-"Your MSN buddy list for %s is temporarily unavailable. Please wait and try "
-"again."
-msgstr ""
-
-#: src/protocols/msn/notification.c:1128
+#: src/protocols/msn/nexus.c:103 src/protocols/msn/servconn.c:127
+#: src/protocols/yahoo/yahoochat.c:1350
+msgid "Unable to connect"
+msgstr "Unable to connect"
+
+#: src/protocols/msn/notification.c:178
+#, fuzzy, c-format
+msgid "%s is not a valid group."
+msgstr "%s is not a valid room name"
+
+#: src/protocols/msn/notification.c:184 src/protocols/msn/notification.c:526
+#: src/protocols/msn/session.c:347
+#, fuzzy
+msgid "Unknown error."
+msgstr "Unknown error"
+
+#: src/protocols/msn/notification.c:187
+#, fuzzy, c-format
+msgid "%s on %s (%s)"
+msgstr "Users on %s: %s"
+
+#: src/protocols/msn/notification.c:496
+#, fuzzy, c-format
+msgid "Unable to add user on %s (%s)"
+msgstr "Unable to add user to privacy list (%s)."
+
+#: src/protocols/msn/notification.c:500
+#, fuzzy, c-format
+msgid "Unable to block user on %s (%s)"
+msgstr "Unable to kick user %s"
+
+#: src/protocols/msn/notification.c:504
+#, fuzzy, c-format
+msgid "Unable to permit user on %s (%s)"
+msgstr "Unable to invite user (%s)."
+
+#: src/protocols/msn/notification.c:512
+#, c-format
+msgid "%s could not be added because your buddy list is full."
+msgstr ""
+
+#: src/protocols/msn/notification.c:521
+#, fuzzy, c-format
+msgid "%s is not a valid passport account."
+msgstr "%s is not a valid server name"
+
+#: src/protocols/msn/notification.c:809
+#, fuzzy
+msgid "Unable to rename group"
+msgstr "Unable to read"
+
+#: src/protocols/msn/notification.c:864
+#, fuzzy
+msgid "Unable to delete group"
+msgstr "Unable to create socket"
+
+#: src/protocols/msn/notification.c:1297
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -7031,123 +7216,200 @@
 "After the maintenance has been completed, you will be able to successfully "
 "sign in."
 
-#: src/protocols/msn/servconn.c:93
-#, c-format
-msgid "Unable to connect to %s server"
-msgstr "Unable to connect to %s server"
-
-#: src/protocols/msn/servconn.c:97
-#, c-format
-msgid "Error writing to %s server"
-msgstr "Error writing to %s server"
-
-#: src/protocols/msn/servconn.c:101
-#, c-format
-msgid "Error reading from %s server"
-msgstr "Error reading from %s server"
-
-#: src/protocols/msn/servconn.c:105
-#, c-format
-msgid "Unknown error from %s server"
+#: src/protocols/msn/servconn.c:129
+#, fuzzy
+msgid "Writing error"
+msgstr "Write error"
+
+#: src/protocols/msn/servconn.c:131
+#, fuzzy
+msgid "Reading error"
+msgstr "Read error"
+
+#: src/protocols/msn/servconn.c:133 src/protocols/msn/session.c:339
+#: src/protocols/oscar/oscar.c:4296
+msgid "Unknown error"
+msgstr "Unknown error"
+
+#: src/protocols/msn/servconn.c:136
+#, fuzzy, c-format
+msgid ""
+"Connection error from %s server (%s):\n"
+"%s"
 msgstr "Unknown error from %s server"
 
-#: src/protocols/msn/servconn.c:334
-msgid "Received HTTP error. Please report this."
-msgstr "Received HTTP error. Please report this."
+#: src/protocols/msn/session.c:317
+#, fuzzy
+msgid "Our protocol is not supported by the server."
+msgstr "This protocol does not support chat rooms."
+
+#: src/protocols/msn/session.c:321
+#, fuzzy
+msgid "Error parsing HTTP."
+msgstr "Error displaying MOTD"
+
+#. MSG_SERVER_GHOST
+#. Looks like someone logged in as us! =-O
+#: src/protocols/msn/session.c:325 src/protocols/napster/napster.c:451
+#: src/protocols/oscar/oscar.c:4995 src/protocols/yahoo/yahoo.c:188
+msgid "You have signed on from another location."
+msgstr "You have signed on from another location."
+
+#: src/protocols/msn/session.c:328
+#, fuzzy
+msgid "The MSN servers are temporarily unavailable. Please wait and try again."
+msgstr "The service is temporarily unavailable."
+
+#: src/protocols/msn/session.c:333
+msgid "The MSN servers are going down temporarily."
+msgstr "The MSN servers are going down temporarily."
+
+#: src/protocols/msn/session.c:337
+#, fuzzy, c-format
+msgid "Unable to authenticate: %s"
+msgstr "Unable to send message: %s"
+
+#: src/protocols/msn/session.c:342
+msgid ""
+"Your MSN buddy list is temporarily unavailable. Please wait and try again."
+msgstr ""
+
+#: src/protocols/msn/session.c:363 src/protocols/msn/session.c:365
+msgid "Handshaking"
+msgstr ""
+
+#: src/protocols/msn/session.c:364
+#, fuzzy
+msgid "Transferring"
+msgstr "File Transfers"
+
+#: src/protocols/msn/session.c:366
+#, fuzzy
+msgid "Starting authentication"
+msgstr "Plaintext Authentication"
+
+#: src/protocols/msn/session.c:367
+msgid "Getting cookie"
+msgstr ""
+
+#: src/protocols/msn/session.c:369
+#, fuzzy
+msgid "Sending cookie"
+msgstr "Send to Mobile"
+
+#: src/protocols/msn/session.c:370 src/protocols/trepia/trepia.c:637
+msgid "Retrieving buddy list"
+msgstr "Retrieving buddy list"
 
 #: src/protocols/msn/state.c:34
 msgid "Away From Computer"
 msgstr "Away From Computer"
 
-#: src/protocols/msn/switchboard.c:197
-msgid "The conversation has become inactive and timed out."
-msgstr "The conversation has become inactive and timed out."
-
-#: src/protocols/msn/switchboard.c:216
+#: src/protocols/msn/switchboard.c:405
+msgid "Message may have not been sent because a timeout occurred:"
+msgstr ""
+
+#: src/protocols/msn/switchboard.c:413
+#, fuzzy
+msgid "Message could not be sent, not allowed while invisible:"
+msgstr "You have been signed off for an unknown reason."
+
+#: src/protocols/msn/switchboard.c:417
+#, fuzzy
+msgid "Message could not be sent because the user is offline:"
+msgstr "You have been signed off for an unknown reason."
+
+#: src/protocols/msn/switchboard.c:421
+#, fuzzy
+msgid "Message could not be sent because a connection error occurred:"
+msgstr "You have been signed off for an unknown reason."
+
+#: src/protocols/msn/switchboard.c:425
+#, fuzzy
+msgid ""
+"Message could not be sent because an error with the switchboard occurred:"
+msgstr "You have been signed off for an unknown reason."
+
+#: src/protocols/msn/switchboard.c:433
+#, fuzzy
+msgid "Message may have not been sent because an unknown error occurred:"
+msgstr "You have been signed off for an unknown reason."
+
+#: src/protocols/msn/switchboard.c:689
 #, c-format
 msgid "%s has closed the conversation window."
 msgstr "%s has closed the conversation window."
 
-#: src/protocols/msn/switchboard.c:485
-msgid "Message could not be sent, not allowed while invisible"
-msgstr ""
-
-#: src/protocols/msn/switchboard.c:488
-msgid "Message could not be sent because the user is offline"
-msgstr ""
-
-#: src/protocols/msn/switchboard.c:491
-msgid "Message could not be sent because a connection error occured"
-msgstr ""
-
-#: src/protocols/msn/switchboard.c:494
-#, fuzzy
-msgid "Message could not be sent for an unknown reason"
-msgstr "You have been signed off for an unknown reason."
-
-#: src/protocols/msn/switchboard.c:499
-#, c-format
-msgid ""
-"%s:\n"
-"%s"
-msgstr ""
-
-#: src/protocols/msn/userlist.c:86
+#: src/protocols/msn/userlist.c:85
 #, c-format
 msgid "The user %s (%s) wants to add %s to his or her buddy list."
 msgstr "The user %s (%s) wants to add %s to his or her buddy list."
 
-#: src/protocols/msn/userlist.c:95
-#, c-format
-msgid "The user %s wants to add %s to his or her buddy list."
+#: src/protocols/msn/userlist.c:276
+#, fuzzy, c-format
+msgid "%s has added you to his or her contact list."
 msgstr "The user %s wants to add %s to his or her buddy list."
 
-#: src/protocols/napster/napster.c:241
+#: src/protocols/msn/userlist.c:340
+#, c-format
+msgid "%s has removed you from his or her contact list."
+msgstr ""
+
+#: src/protocols/msn/userlist.c:655
+#, fuzzy, c-format
+msgid "Unable to add \"%s\"."
+msgstr "Unable to read file %s."
+
+#: src/protocols/msn/userlist.c:657
+#, fuzzy
+msgid "The screen name specified is invalid."
+msgstr "The new formatting is invalid."
+
+#: src/protocols/napster/napster.c:260
 msgid "Unable to read header from server"
 msgstr "Unable to read header from server"
 
-#: src/protocols/napster/napster.c:255
+#: src/protocols/napster/napster.c:274
 #, c-format
 msgid "Unable to read message from server: %s.  Command is %hd, length is %hd."
 msgstr ""
 "Unable to read message from server: %s.  Command is %hd, length is %hd."
 
-#: src/protocols/napster/napster.c:318
+#: src/protocols/napster/napster.c:290
+#, fuzzy
+msgid "Unknown server error."
+msgstr "Unknown error"
+
+#: src/protocols/napster/napster.c:339
 #, c-format
 msgid "users: %s, files: %s, size: %sGB"
 msgstr "users: %s, files: %s, size: %sGB"
 
 #. MSG_SERVER_HOTLIST_ERROR
-#: src/protocols/napster/napster.c:329
+#: src/protocols/napster/napster.c:350
 #, c-format
 msgid "Unable to add \"%s\" to your Napster hotlist"
 msgstr "Unable to add \"%s\" to your Napster hotlist"
 
-#: src/protocols/napster/napster.c:337
+#. MSG_SERVER_DISCONNECTING
+#. we have been kicked off =^(
+#: src/protocols/napster/napster.c:357
 msgid "You were disconnected from the server."
 msgstr "You were disconnected from the server."
 
 #. MSG_CLIENT_WHOIS
-#: src/protocols/napster/napster.c:395
+#: src/protocols/napster/napster.c:414
 #, c-format
 msgid "%s requested your information"
 msgstr "%s requested your information"
 
-#: src/protocols/napster/napster.c:433
-msgid ""
-"You were disconnected from the server, because you logged on from a "
-"different location"
-msgstr ""
-"You were disconnected from the server, because you logged on from a "
-"different location"
-
 #. MSG_CLIENT_PING
-#: src/protocols/napster/napster.c:439
+#: src/protocols/napster/napster.c:455
 #, c-format
 msgid "%s requested a PING"
 msgstr "%s requested a PING"
 
-#: src/protocols/napster/napster.c:573 src/protocols/toc/toc.c:1275
+#: src/protocols/napster/napster.c:591 src/protocols/toc/toc.c:1367
 msgid "_Group:"
 msgstr "_Group:"
 
@@ -7161,7 +7423,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/napster/napster.c:671 src/protocols/napster/napster.c:673
+#: src/protocols/napster/napster.c:688 src/protocols/napster/napster.c:690
 msgid "NAPSTER Protocol Plugin"
 msgstr "NAPSTER Protocol Plugin"
 
@@ -7403,8 +7665,8 @@
 msgid "Mailstop"
 msgstr "Mailstop"
 
-#: src/protocols/novell/novell.c:1464 src/protocols/oscar/oscar.c:5051
-#: src/protocols/oscar/oscar.c:5058
+#: src/protocols/novell/novell.c:1464 src/protocols/oscar/oscar.c:5316
+#: src/protocols/oscar/oscar.c:5323
 msgid "Email Address"
 msgstr "Email Address"
 
@@ -7454,11 +7716,11 @@
 msgid "%s has been invited to this conversation."
 msgstr "%s has been invited to this conversation."
 
-#: src/protocols/novell/novell.c:1885
+#: src/protocols/novell/novell.c:1886
 msgid "Invitation to Conversation"
 msgstr "Invitation to Conversation"
 
-#: src/protocols/novell/novell.c:1886
+#: src/protocols/novell/novell.c:1887
 #, c-format
 msgid ""
 "Invitation from: %s\n"
@@ -7469,15 +7731,15 @@
 "\n"
 "Sent: %s"
 
-#: src/protocols/novell/novell.c:1888
+#: src/protocols/novell/novell.c:1889
 msgid "Would you like to join the conversation?"
 msgstr "Would you like to join the conversation?"
 
-#: src/protocols/novell/novell.c:1994
+#: src/protocols/novell/novell.c:1996
 msgid "You have been logged out because you logged in at another workstation."
 msgstr "You have been logged out because you logged in at another workstation."
 
-#: src/protocols/novell/novell.c:2050
+#: src/protocols/novell/novell.c:2052
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
@@ -7489,7 +7751,7 @@
 #. *  gaim_request_fields(gc, _("Server Address"),...);
 #.
 #. ...but for now just error out with a nice message.
-#: src/protocols/novell/novell.c:2148
+#: src/protocols/novell/novell.c:2150
 msgid ""
 "Unable to connect to server. Please enter the address of the server you wish "
 "to connect to."
@@ -7497,22 +7759,19 @@
 "Unable to connect to server. Please enter the address of the server you wish "
 "to connect to."
 
-#: src/protocols/novell/novell.c:2170
+#: src/protocols/novell/novell.c:2172
 msgid "Error. SSL support is not installed."
 msgstr "Error: SSL support is not installed."
 
-#: src/protocols/novell/novell.c:2474
+#: src/protocols/novell/novell.c:2476
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "This conference has been closed. No more messages can be sent."
 
-#: src/protocols/novell/novell.c:2930 src/protocols/novell/novell.c:2986
+#: src/protocols/novell/novell.c:2957 src/protocols/novell/novell.c:3045
+#: src/protocols/yahoo/yahoo.c:2808
 msgid "Appear Offline"
 msgstr "Appear Offline"
 
-#: src/protocols/novell/novell.c:3380
-msgid "Initiate _Chat"
-msgstr "Initiate _Chat"
-
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -7523,115 +7782,115 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/novell/novell.c:3479 src/protocols/novell/novell.c:3481
+#: src/protocols/novell/novell.c:3538 src/protocols/novell/novell.c:3540
 msgid "Novell GroupWise Messenger Protocol Plugin"
 msgstr "Novell GroupWise Messenger Protocol Plugin"
 
-#: src/protocols/novell/novell.c:3500
+#: src/protocols/novell/novell.c:3559
 msgid "Server address"
 msgstr "Server address"
 
-#: src/protocols/novell/novell.c:3504
+#: src/protocols/novell/novell.c:3563
 msgid "Server port"
 msgstr "Server port"
 
-#: src/protocols/oscar/oscar.c:190
+#: src/protocols/oscar/oscar.c:196
 msgid "Invalid error"
 msgstr "Invalid error"
 
-#: src/protocols/oscar/oscar.c:191
+#: src/protocols/oscar/oscar.c:197
 msgid "Invalid SNAC"
 msgstr "Invalid SNAC"
 
-#: src/protocols/oscar/oscar.c:192
+#: src/protocols/oscar/oscar.c:198
 msgid "Rate to host"
 msgstr "Rate to host"
 
-#: src/protocols/oscar/oscar.c:193
+#: src/protocols/oscar/oscar.c:199
 msgid "Rate to client"
 msgstr "Rate to client"
 
-#: src/protocols/oscar/oscar.c:195
+#: src/protocols/oscar/oscar.c:201
 msgid "Service unavailable"
 msgstr "Service unavailable"
 
-#: src/protocols/oscar/oscar.c:196
+#: src/protocols/oscar/oscar.c:202
 msgid "Service not defined"
 msgstr "Service not defined"
 
-#: src/protocols/oscar/oscar.c:197
+#: src/protocols/oscar/oscar.c:203
 msgid "Obsolete SNAC"
 msgstr "Obsolete SNAC"
 
-#: src/protocols/oscar/oscar.c:198
+#: src/protocols/oscar/oscar.c:204
 msgid "Not supported by host"
 msgstr "Not supported by host"
 
-#: src/protocols/oscar/oscar.c:199
+#: src/protocols/oscar/oscar.c:205
 msgid "Not supported by client"
 msgstr "Not supported by client"
 
-#: src/protocols/oscar/oscar.c:200
+#: src/protocols/oscar/oscar.c:206
 msgid "Refused by client"
 msgstr "Refused by client"
 
-#: src/protocols/oscar/oscar.c:201
+#: src/protocols/oscar/oscar.c:207
 msgid "Reply too big"
 msgstr "Reply too big"
 
-#: src/protocols/oscar/oscar.c:202
+#: src/protocols/oscar/oscar.c:208
 msgid "Responses lost"
 msgstr "Responses lost"
 
-#: src/protocols/oscar/oscar.c:203
+#: src/protocols/oscar/oscar.c:209
 msgid "Request denied"
 msgstr "Request denied"
 
-#: src/protocols/oscar/oscar.c:204
+#: src/protocols/oscar/oscar.c:210
 msgid "Busted SNAC payload"
 msgstr "Busted SNAC payload"
 
-#: src/protocols/oscar/oscar.c:205
+#: src/protocols/oscar/oscar.c:211
 msgid "Insufficient rights"
 msgstr "Insufficient rights"
 
-#: src/protocols/oscar/oscar.c:206
+#: src/protocols/oscar/oscar.c:212
 msgid "In local permit/deny"
 msgstr "In local permit/deny"
 
-#: src/protocols/oscar/oscar.c:207
+#: src/protocols/oscar/oscar.c:213
 msgid "Too evil (sender)"
 msgstr "Too evil (sender)"
 
-#: src/protocols/oscar/oscar.c:208
+#: src/protocols/oscar/oscar.c:214
 msgid "Too evil (receiver)"
 msgstr "Too evil (receiver)"
 
-#: src/protocols/oscar/oscar.c:209
+#: src/protocols/oscar/oscar.c:215
 msgid "User temporarily unavailable"
 msgstr "User temporarily unavailable"
 
-#: src/protocols/oscar/oscar.c:210
+#: src/protocols/oscar/oscar.c:216
 msgid "No match"
 msgstr "No match"
 
-#: src/protocols/oscar/oscar.c:211
+#: src/protocols/oscar/oscar.c:217
 msgid "List overflow"
 msgstr "List overflow"
 
-#: src/protocols/oscar/oscar.c:212
+#: src/protocols/oscar/oscar.c:218
 msgid "Request ambiguous"
 msgstr "Request ambiguous"
 
-#: src/protocols/oscar/oscar.c:213
+#: src/protocols/oscar/oscar.c:219
 msgid "Queue full"
 msgstr "Queue full"
 
-#: src/protocols/oscar/oscar.c:214
+#: src/protocols/oscar/oscar.c:220
 msgid "Not while on AOL"
 msgstr "Not while on AOL"
 
-#: src/protocols/oscar/oscar.c:401 src/protocols/oscar/oscar.c:484
+#: src/protocols/oscar/oscar.c:408 src/protocols/oscar/oscar.c:493
 #, fuzzy
 msgid ""
 "(There was an error receiving this message.  The buddy you are speaking to "
@@ -7640,154 +7899,158 @@
 "(There was an error converting this message.  The buddy you are speaking to "
 "most likely has a buggy client.)"
 
-#: src/protocols/oscar/oscar.c:586
+#: src/protocols/oscar/oscar.c:607
 msgid "Voice"
 msgstr "Voice"
 
-#: src/protocols/oscar/oscar.c:589
+#: src/protocols/oscar/oscar.c:610
 msgid "AIM Direct IM"
 msgstr "AIM Direct IM"
 
-#: src/protocols/oscar/oscar.c:592 src/protocols/silc/silc.c:660
-#: src/protocols/silc/util.c:506
+#: src/protocols/oscar/oscar.c:613 src/protocols/silc/silc.c:668
+#: src/protocols/silc/util.c:509
 msgid "Chat"
 msgstr "Chat"
 
-#: src/protocols/oscar/oscar.c:595 src/protocols/oscar/oscar.c:7017
+#: src/protocols/oscar/oscar.c:616 src/protocols/oscar/oscar.c:7197
 msgid "Get File"
 msgstr "Get File"
 
-#: src/protocols/oscar/oscar.c:602
+#: src/protocols/oscar/oscar.c:623
 msgid "Games"
 msgstr "Games"
 
-#: src/protocols/oscar/oscar.c:605
+#: src/protocols/oscar/oscar.c:626
 msgid "Add-Ins"
 msgstr "Add-Ins"
 
-#: src/protocols/oscar/oscar.c:608
-msgid "Send Buddy List"
-msgstr "Send Buddy List"
-
-#: src/protocols/oscar/oscar.c:611
-msgid "ICQ Direct Connect"
-msgstr "ICQ Direct Connect"
-
-#: src/protocols/oscar/oscar.c:614
-msgid "AP User"
-msgstr "AP User"
-
-#: src/protocols/oscar/oscar.c:617
-msgid "ICQ RTF"
-msgstr "ICQ RTF"
-
-#: src/protocols/oscar/oscar.c:620
-msgid "Nihilist"
-msgstr "Nihilist"
-
-#: src/protocols/oscar/oscar.c:623
-msgid "ICQ Server Relay"
-msgstr "ICQ Server Relay"
-
-#: src/protocols/oscar/oscar.c:626
-msgid "Old ICQ UTF8"
-msgstr "Old ICQ UTF8"
-
 #: src/protocols/oscar/oscar.c:629
-msgid "Trillian Encryption"
-msgstr "Trillian Encryption"
+msgid "Send Buddy List"
+msgstr "Send Buddy List"
 
 #: src/protocols/oscar/oscar.c:632
-msgid "ICQ UTF8"
-msgstr "ICQ UTF8"
+msgid "ICQ Direct Connect"
+msgstr "ICQ Direct Connect"
 
 #: src/protocols/oscar/oscar.c:635
-msgid "Hiptop"
-msgstr "Hiptop"
+msgid "AP User"
+msgstr "AP User"
 
 #: src/protocols/oscar/oscar.c:638
+msgid "ICQ RTF"
+msgstr "ICQ RTF"
+
+#: src/protocols/oscar/oscar.c:641
+msgid "Nihilist"
+msgstr "Nihilist"
+
+#: src/protocols/oscar/oscar.c:644
+msgid "ICQ Server Relay"
+msgstr "ICQ Server Relay"
+
+#: src/protocols/oscar/oscar.c:647
+msgid "Old ICQ UTF8"
+msgstr "Old ICQ UTF8"
+
+#: src/protocols/oscar/oscar.c:650
+msgid "Trillian Encryption"
+msgstr "Trillian Encryption"
+
+#: src/protocols/oscar/oscar.c:653
+msgid "ICQ UTF8"
+msgstr "ICQ UTF8"
+
+#: src/protocols/oscar/oscar.c:656
+msgid "Hiptop"
+msgstr "Hiptop"
+
+#: src/protocols/oscar/oscar.c:659
 msgid "Security Enabled"
 msgstr "Security Enabled"
 
-#: src/protocols/oscar/oscar.c:641
+#: src/protocols/oscar/oscar.c:662
 msgid "Video Chat"
 msgstr "Video Chat"
 
-#: src/protocols/oscar/oscar.c:645
+#: src/protocols/oscar/oscar.c:666
 msgid "iChat AV"
 msgstr "iChat AV"
 
-#: src/protocols/oscar/oscar.c:648
+#: src/protocols/oscar/oscar.c:669
 msgid "Live Video"
 msgstr "Live Video"
 
-#: src/protocols/oscar/oscar.c:651
+#: src/protocols/oscar/oscar.c:672
 msgid "Camera"
 msgstr "Camera"
 
-#: src/protocols/oscar/oscar.c:669 src/protocols/oscar/oscar.c:6900
+#: src/protocols/oscar/oscar.c:690 src/protocols/oscar/oscar.c:7080
 msgid "Free For Chat"
 msgstr "Free For Chat"
 
-#: src/protocols/oscar/oscar.c:673 src/protocols/oscar/oscar.c:6915
+#: src/protocols/oscar/oscar.c:694 src/protocols/oscar/oscar.c:7095
 msgid "Not Available"
 msgstr "Not Available"
 
-#: src/protocols/oscar/oscar.c:675 src/protocols/oscar/oscar.c:6905
+#: src/protocols/oscar/oscar.c:696 src/protocols/oscar/oscar.c:7085
 msgid "Occupied"
 msgstr "Occupied"
 
-#: src/protocols/oscar/oscar.c:679
+#: src/protocols/oscar/oscar.c:700
 msgid "Web Aware"
 msgstr "Web Aware"
 
-#: src/protocols/oscar/oscar.c:755
+#: src/protocols/oscar/oscar.c:779 src/protocols/oscar/oscar.c:4421
+msgid "Warning Level"
+msgstr "Warning Level"
+
+#: src/protocols/oscar/oscar.c:785
 msgid "Capabilities"
 msgstr "Capabilities"
 
-#: src/protocols/oscar/oscar.c:764
+#: src/protocols/oscar/oscar.c:794
 msgid "Buddy Comment"
 msgstr "Buddy Comment"
 
-#: src/protocols/oscar/oscar.c:899
+#: src/protocols/oscar/oscar.c:951
 #, c-format
 msgid "Direct IM with %s closed"
 msgstr "Direct IM with %s closed"
 
-#: src/protocols/oscar/oscar.c:901
+#: src/protocols/oscar/oscar.c:953
 #, c-format
 msgid "Direct IM with %s failed"
 msgstr "Direct IM with %s failed"
 
-#: src/protocols/oscar/oscar.c:909
+#: src/protocols/oscar/oscar.c:961
 msgid "Direct Connect failed"
 msgstr "Direct Connect failed"
 
-#: src/protocols/oscar/oscar.c:986 src/protocols/oscar/oscar.c:1117
+#: src/protocols/oscar/oscar.c:1038 src/protocols/oscar/oscar.c:1169
 #, c-format
 msgid "Direct IM with %s established"
 msgstr "Direct IM with %s established"
 
-#: src/protocols/oscar/oscar.c:1067
+#: src/protocols/oscar/oscar.c:1119
 #, c-format
 msgid "Attempting to connect to %s at %s:%hu for Direct IM."
 msgstr "Attempting to connect to %s at %s:%hu for Direct IM."
 
-#: src/protocols/oscar/oscar.c:1485
+#: src/protocols/oscar/oscar.c:1545
 #, c-format
 msgid "Asking %s to connect to us at %s:%hu for Direct IM."
 msgstr "Asking %s to connect to us at %s:%hu for Direct IM."
 
-#: src/protocols/oscar/oscar.c:1490
+#: src/protocols/oscar/oscar.c:1550
 msgid "Unable to open Direct IM"
 msgstr "Unable to open Direct IM"
 
-#: src/protocols/oscar/oscar.c:1525
+#: src/protocols/oscar/oscar.c:1585
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr "You have selected to open a Direct IM connection with %s."
 
-#: src/protocols/oscar/oscar.c:1529
+#: src/protocols/oscar/oscar.c:1589
 msgid ""
 "Because this reveals your IP address, it may be considered a privacy risk.  "
 "Do you wish to continue?"
@@ -7795,24 +8058,24 @@
 "Because this reveals your IP address, it may be considered a privacy risk.  "
 "Do you wish to continue?"
 
-#: src/protocols/oscar/oscar.c:1533 src/protocols/oscar/oscar.c:3490
+#: src/protocols/oscar/oscar.c:1593 src/protocols/oscar/oscar.c:3731
 msgid "Connect"
 msgstr "Connect"
 
-#: src/protocols/oscar/oscar.c:1600 src/protocols/toc/toc.c:881
-#, c-format
-msgid "You have been disconnected from chat room %s."
+#: src/protocols/oscar/oscar.c:1657
+#, fuzzy, c-format
+msgid "You have lost your connection to chat room %s."
 msgstr "You have been disconnected from chat room %s."
 
-#: src/protocols/oscar/oscar.c:1619
+#: src/protocols/oscar/oscar.c:1680
 msgid "Chat is currently unavailable"
 msgstr "Chat is currently unavailable"
 
-#: src/protocols/oscar/oscar.c:1700
+#: src/protocols/oscar/oscar.c:1749
 msgid "Screen name sent"
 msgstr "Screen name sent"
 
-#: src/protocols/oscar/oscar.c:1714
+#: src/protocols/oscar/oscar.c:1773
 #, c-format
 msgid ""
 "Unable to login: Could not sign on as %s because the screen name is "
@@ -7823,46 +8086,51 @@
 "invalid.  Screen names must either start with a letter and contain only "
 "letters, numbers and spaces, or contain only numbers."
 
-#: src/protocols/oscar/oscar.c:1745
+#: src/protocols/oscar/oscar.c:1802
 msgid "Unable to login to AIM"
 msgstr "Unable to login to AIM"
 
-#: src/protocols/oscar/oscar.c:1848 src/protocols/oscar/oscar.c:2286
+#: src/protocols/oscar/oscar.c:1906 src/protocols/oscar/oscar.c:2428
 msgid "Could Not Connect"
 msgstr "Could Not Connect"
 
-#: src/protocols/oscar/oscar.c:1856
+#: src/protocols/oscar/oscar.c:1914
 msgid "Connection established, cookie sent"
 msgstr "Connection established, cookie sent"
 
-#: src/protocols/oscar/oscar.c:1969 src/protocols/yahoo/yahoo_filexfer.c:180
-#: src/protocols/yahoo/yahoo_filexfer.c:189
-#: src/protocols/yahoo/yahoo_filexfer.c:199
+#: src/protocols/oscar/oscar.c:2027
+#, fuzzy, c-format
+msgid "Transfer of file %s timed out."
+msgstr "File transfer to %s aborted.\n"
+
+#: src/protocols/oscar/oscar.c:2106 src/protocols/yahoo/yahoo_filexfer.c:177
+#: src/protocols/yahoo/yahoo_filexfer.c:186
+#: src/protocols/yahoo/yahoo_filexfer.c:195
 msgid "Unable to establish file descriptor."
 msgstr "Unable to establish file descriptor."
 
-#: src/protocols/oscar/oscar.c:1974
+#: src/protocols/oscar/oscar.c:2111
 msgid "Unable to create new connection."
 msgstr "Unable to create new connection."
 
-#: src/protocols/oscar/oscar.c:2046
+#: src/protocols/oscar/oscar.c:2190
 msgid "Unable to establish listener socket."
 msgstr "Unable to establish listener socket."
 
-#: src/protocols/oscar/oscar.c:2171 src/protocols/toc/toc.c:542
+#: src/protocols/oscar/oscar.c:2315 src/protocols/toc/toc.c:543
 msgid "Incorrect nickname or password."
 msgstr "Incorrect nickname or password."
 
-#: src/protocols/oscar/oscar.c:2176
+#: src/protocols/oscar/oscar.c:2320
 msgid "Your account is currently suspended."
 msgstr "Your account is currently suspended."
 
 #. service temporarily unavailable
-#: src/protocols/oscar/oscar.c:2180
+#: src/protocols/oscar/oscar.c:2324
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "The AOL Instant Messenger service is temporarily unavailable."
 
-#: src/protocols/oscar/oscar.c:2185
+#: src/protocols/oscar/oscar.c:2329
 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."
@@ -7870,21 +8138,33 @@
 "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."
 
-#: src/protocols/oscar/oscar.c:2190
+#: src/protocols/oscar/oscar.c:2334
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr "The client version you are using is too old. Please upgrade at %s"
 
-#: src/protocols/oscar/oscar.c:2221
+#: src/protocols/oscar/oscar.c:2365
 msgid "Internal Error"
 msgstr "Internal Error"
 
-#: src/protocols/oscar/oscar.c:2293
+#: src/protocols/oscar/oscar.c:2435
 msgid "Received authorization"
 msgstr "Received authorisation"
 
-#: src/protocols/oscar/oscar.c:2329 src/protocols/oscar/oscar.c:2359
-#: src/protocols/oscar/oscar.c:2448
+#: src/protocols/oscar/oscar.c:2459
+msgid "The SecurID key entered is invalid."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2473
+msgid "Enter SecurID"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2474
+msgid "Enter the 6 digit number from the digital display."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2514 src/protocols/oscar/oscar.c:2544
+#: src/protocols/oscar/oscar.c:2633
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
@@ -7893,20 +8173,24 @@
 "You may be disconnected shortly.  You may want to use TOC until this is "
 "fixed.  Check %s for updates."
 
-#: src/protocols/oscar/oscar.c:2332 src/protocols/oscar/oscar.c:2362
+#: src/protocols/oscar/oscar.c:2517 src/protocols/oscar/oscar.c:2547
 msgid "Gaim was unable to get a valid AIM login hash."
 msgstr "Gaim was unable to get a valid AIM login hash."
 
-#: src/protocols/oscar/oscar.c:2451
+#: src/protocols/oscar/oscar.c:2636
 msgid "Gaim was unable to get a valid login hash."
 msgstr "Gaim was unable to get a valid login hash."
 
-#: src/protocols/oscar/oscar.c:3481
+#: src/protocols/oscar/oscar.c:2667
+msgid "Password sent"
+msgstr "Password sent"
+
+#: src/protocols/oscar/oscar.c:3722
 #, c-format
 msgid "%s has just asked to directly connect to %s"
 msgstr "%s has just asked to directly connect to %s"
 
-#: src/protocols/oscar/oscar.c:3484
+#: src/protocols/oscar/oscar.c:3725
 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 "
@@ -7916,19 +8200,19 @@
 "for IM Images.  Because your IP address will be revealed, this may be "
 "considered a privacy risk."
 
-#: src/protocols/oscar/oscar.c:3523
+#: src/protocols/oscar/oscar.c:3764
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr "Please authorise me so I can add you to my buddy list."
 
-#: src/protocols/oscar/oscar.c:3531
+#: src/protocols/oscar/oscar.c:3772
 msgid "Authorization Request Message:"
 msgstr "Authorisation Request Message:"
 
-#: src/protocols/oscar/oscar.c:3532
+#: src/protocols/oscar/oscar.c:3773
 msgid "Please authorize me!"
 msgstr "Please authorise me!"
 
-#: src/protocols/oscar/oscar.c:3562
+#: src/protocols/oscar/oscar.c:3803
 #, c-format
 msgid ""
 "The user %s requires authorization before being added to a buddy list.  Do "
@@ -7937,35 +8221,34 @@
 "The user %s requires authorisation before being added to a buddy list.  Do "
 "you want to send an authorisation request?"
 
-#: src/protocols/oscar/oscar.c:3567 src/protocols/oscar/oscar.c:3569
+#: src/protocols/oscar/oscar.c:3808 src/protocols/oscar/oscar.c:3810
 msgid "Request Authorization"
 msgstr "Request Authorisation"
 
-#: src/protocols/oscar/oscar.c:3617 src/protocols/oscar/oscar.c:3619
-#: src/protocols/oscar/oscar.c:3626 src/protocols/oscar/oscar.c:3723
-#: src/protocols/oscar/oscar.c:3743 src/protocols/oscar/oscar.c:6292
-#: src/protocols/oscar/oscar.c:6338
+#: src/protocols/oscar/oscar.c:3848 src/protocols/oscar/oscar.c:3854
+#: src/protocols/oscar/oscar.c:3958 src/protocols/oscar/oscar.c:3983
+#: src/protocols/oscar/oscar.c:6535 src/protocols/oscar/oscar.c:6587
 msgid "No reason given."
 msgstr "No reason given."
 
-#: src/protocols/oscar/oscar.c:3625
+#: src/protocols/oscar/oscar.c:3853
 msgid "Authorization Denied Message:"
 msgstr "Authorisation Denied Message:"
 
-#: src/protocols/oscar/oscar.c:3723
-#, c-format
-msgid ""
-"The user %u wants to add you to their buddy list for the following reason:\n"
+#: src/protocols/oscar/oscar.c:3961
+#, fuzzy, c-format
+msgid ""
+"The user %u wants to add %s to their buddy list for the following reason:\n"
 "%s"
 msgstr ""
 "The user %u wants to add you to their buddy list for the following reason:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3731 src/protocols/oscar/oscar.c:6298
+#: src/protocols/oscar/oscar.c:3971 src/protocols/oscar/oscar.c:6547
 msgid "Authorization Request"
 msgstr "Authorisation Request"
 
-#: src/protocols/oscar/oscar.c:3743
+#: src/protocols/oscar/oscar.c:3983
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -7976,17 +8259,17 @@
 "following reason:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3744
+#: src/protocols/oscar/oscar.c:3984
 msgid "ICQ authorization denied."
 msgstr "ICQ authorisation denied."
 
 #. Someone has granted you authorization
-#: src/protocols/oscar/oscar.c:3751
+#: src/protocols/oscar/oscar.c:3991
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
 msgstr "The user %u has granted your request to add them to your buddy list."
 
-#: src/protocols/oscar/oscar.c:3759
+#: src/protocols/oscar/oscar.c:3999
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -7999,7 +8282,7 @@
 "From: %s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3767
+#: src/protocols/oscar/oscar.c:4007
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -8012,7 +8295,7 @@
 "From: %s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3775
+#: src/protocols/oscar/oscar.c:4015
 #, c-format
 msgid ""
 "You have received an ICQ email from %s [%s]\n"
@@ -8025,34 +8308,34 @@
 "Message is:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3796
+#: src/protocols/oscar/oscar.c:4036
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
 msgstr "ICQ user %u has sent you a buddy: %s (%s)"
 
-#: src/protocols/oscar/oscar.c:3802
+#: src/protocols/oscar/oscar.c:4042
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr "Do you want to add this buddy to your buddy list?"
 
-#: src/protocols/oscar/oscar.c:3806
+#: src/protocols/oscar/oscar.c:4046
 msgid "Decline"
 msgstr "Decline"
 
-#: src/protocols/oscar/oscar.c:3890
+#: src/protocols/oscar/oscar.c:4130
 #, 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] "You missed %hu message from %s because it was invalid."
 msgstr[1] "You missed %hu messages from %s because they were invalid."
 
-#: src/protocols/oscar/oscar.c:3899
+#: src/protocols/oscar/oscar.c:4139
 #, 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] "You missed %hu message from %s because it was too large."
 msgstr[1] "You missed %hu messages from %s because they were too large."
 
-#: src/protocols/oscar/oscar.c:3908
+#: src/protocols/oscar/oscar.c:4148
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -8063,86 +8346,78 @@
 msgstr[1] ""
 "You missed %hu messages from %s because the rate limit has been exceeded."
 
-#: src/protocols/oscar/oscar.c:3917
+#: src/protocols/oscar/oscar.c:4157
 #, 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] "You missed %hu message from %s because he/she was too evil."
 msgstr[1] "You missed %hu messages from %s because he/she was too evil."
 
-#: src/protocols/oscar/oscar.c:3926
+#: src/protocols/oscar/oscar.c:4166
 #, 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] "You missed %hu message from %s because you are too evil."
 msgstr[1] "You missed %hu messages from %s because you are too evil."
 
-#: src/protocols/oscar/oscar.c:3935
+#: src/protocols/oscar/oscar.c:4175
 #, 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] "You missed %hu message from %s for an unknown reason."
 msgstr[1] "You missed %hu messages from %s for an unknown reason."
 
-#: src/protocols/oscar/oscar.c:3989 src/protocols/oscar/oscar.c:4222
+#: src/protocols/oscar/oscar.c:4229 src/protocols/oscar/oscar.c:4463
 #: src/protocols/silc/ops.c:1087 src/protocols/silc/ops.c:1149
 #, c-format
 msgid "Info for %s"
 msgstr "Info for %s"
 
-#: src/protocols/oscar/oscar.c:4055
+#: src/protocols/oscar/oscar.c:4295
 #, c-format
 msgid "SNAC threw error: %s\n"
 msgstr "SNAC threw error: %s\n"
 
-#: src/protocols/oscar/oscar.c:4056
-msgid "Unknown error"
-msgstr "Unknown error"
-
 #. Data is assumed to be the destination sn
-#: src/protocols/oscar/oscar.c:4092
+#: src/protocols/oscar/oscar.c:4332
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "Unable to send message: %s"
 
-#: src/protocols/oscar/oscar.c:4092 src/protocols/oscar/oscar.c:4097
-#: src/protocols/oscar/oscar.c:4155 src/protocols/oscar/oscar.c:4159
+#: src/protocols/oscar/oscar.c:4332 src/protocols/oscar/oscar.c:4337
+#: src/protocols/oscar/oscar.c:4395 src/protocols/oscar/oscar.c:4399
 msgid "Unknown reason."
 msgstr "Unknown reason."
 
-#: src/protocols/oscar/oscar.c:4095
+#: src/protocols/oscar/oscar.c:4335
 #, c-format
 msgid "Unable to send message to %s:"
 msgstr "Unable to send message to %s:"
 
-#: src/protocols/oscar/oscar.c:4155
+#: src/protocols/oscar/oscar.c:4395
 #, c-format
 msgid "User information not available: %s"
 msgstr "User information not available: %s"
 
-#: src/protocols/oscar/oscar.c:4158
+#: src/protocols/oscar/oscar.c:4398
 #, c-format
 msgid "User information for %s unavailable:"
 msgstr "User information for %s unavailable:"
 
-#: src/protocols/oscar/oscar.c:4180
-msgid "Warning Level"
-msgstr "Warning Level"
-
-#: src/protocols/oscar/oscar.c:4184
+#: src/protocols/oscar/oscar.c:4425
 msgid "Online Since"
 msgstr "Online Since"
 
-#: src/protocols/oscar/oscar.c:4189 src/protocols/yahoo/yahoo_profile.c:1120
+#: src/protocols/oscar/oscar.c:4430 src/protocols/yahoo/yahoo_profile.c:1127
 msgid "Member Since"
 msgstr "Member Since"
 
-#: src/protocols/oscar/oscar.c:4273
+#: src/protocols/oscar/oscar.c:4514
 msgid "Your AIM connection may be lost."
 msgstr "Your AIM connection may be lost."
 
 #. The conversion failed!
-#: src/protocols/oscar/oscar.c:4459
+#: src/protocols/oscar/oscar.c:4700
 msgid ""
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
@@ -8150,11 +8425,11 @@
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
 
-#: src/protocols/oscar/oscar.c:4679
+#: src/protocols/oscar/oscar.c:4925
 msgid "Rate limiting error."
 msgstr "Rate limiting error."
 
-#: src/protocols/oscar/oscar.c:4680
+#: src/protocols/oscar/oscar.c:4926
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
@@ -8162,113 +8437,108 @@
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
 
-#: src/protocols/oscar/oscar.c:4747
-msgid ""
-"You have been disconnected because you have signed on with this screen name "
-"at another location."
-msgstr ""
-"You have been disconnected because you have signed on with this screen name "
-"at another location."
-
-#: src/protocols/oscar/oscar.c:4749
+#: src/protocols/oscar/oscar.c:4997
 msgid "You have been signed off for an unknown reason."
 msgstr "You have been signed off for an unknown reason."
 
-#: src/protocols/oscar/oscar.c:4780
+#: src/protocols/oscar/oscar.c:5010 src/protocols/toc/toc.c:971
+#, c-format
+msgid "You have been disconnected from chat room %s."
+msgstr "You have been disconnected from chat room %s."
+
+#. XXX - Don't call this with ssi
+#: src/protocols/oscar/oscar.c:5035
 msgid "Finalizing connection"
 msgstr "Finalizing connection"
 
-#: src/protocols/oscar/oscar.c:5063 src/protocols/silc/util.c:538
+#: src/protocols/oscar/oscar.c:5328 src/protocols/silc/util.c:541
 msgid "Mobile Phone"
 msgstr "Mobile Phone"
 
-#: src/protocols/oscar/oscar.c:5065 src/protocols/trepia/trepia.c:282
+#: src/protocols/oscar/oscar.c:5330 src/protocols/trepia/trepia.c:282
 #: src/protocols/trepia/trepia.c:408
 msgid "Female"
 msgstr "Female"
 
-#: src/protocols/oscar/oscar.c:5065 src/protocols/trepia/trepia.c:281
+#: src/protocols/oscar/oscar.c:5330 src/protocols/trepia/trepia.c:281
 #: src/protocols/trepia/trepia.c:408
 msgid "Male"
 msgstr "Male"
 
-#: src/protocols/oscar/oscar.c:5081
+#: src/protocols/oscar/oscar.c:5346
 msgid "Personal Web Page"
 msgstr "Personal Web Page"
 
-#: src/protocols/oscar/oscar.c:5085
+#: src/protocols/oscar/oscar.c:5350
 msgid "Additional Information"
 msgstr "Additional Information"
 
-#: src/protocols/oscar/oscar.c:5090
+#: src/protocols/oscar/oscar.c:5355
 msgid "Home Address"
 msgstr "Home Address"
 
-#: src/protocols/oscar/oscar.c:5094 src/protocols/oscar/oscar.c:5102
+#: src/protocols/oscar/oscar.c:5359 src/protocols/oscar/oscar.c:5367
 msgid "Zip Code"
 msgstr "Postcode"
 
-#: src/protocols/oscar/oscar.c:5098
+#: src/protocols/oscar/oscar.c:5363
 msgid "Work Address"
 msgstr "Work Address"
 
-#: src/protocols/oscar/oscar.c:5106
+#: src/protocols/oscar/oscar.c:5371
 msgid "Work Information"
 msgstr "Work Information"
 
-#: src/protocols/oscar/oscar.c:5107
+#: src/protocols/oscar/oscar.c:5372
 msgid "Company"
 msgstr "Company"
 
-#: src/protocols/oscar/oscar.c:5108
+#: src/protocols/oscar/oscar.c:5373
 msgid "Division"
 msgstr "Division"
 
-#: src/protocols/oscar/oscar.c:5109
+#: src/protocols/oscar/oscar.c:5374
 msgid "Position"
 msgstr "Position"
 
-#: src/protocols/oscar/oscar.c:5111
+#: src/protocols/oscar/oscar.c:5376
 msgid "Web Page"
 msgstr "Web Page"
 
-#: src/protocols/oscar/oscar.c:5121
+#: src/protocols/oscar/oscar.c:5386
 #, c-format
 msgid "ICQ Info for %s"
 msgstr "ICQ Info for %s"
 
-#: src/protocols/oscar/oscar.c:5170
+#: src/protocols/oscar/oscar.c:5435
 msgid "Pop-Up Message"
 msgstr "Pop-Up Message"
 
-#: src/protocols/oscar/oscar.c:5191
+#. TODO: Need to use ngettext() here
+#: src/protocols/oscar/oscar.c:5457
 #, c-format
 msgid "The following screen names are associated with %s"
 msgstr "The following screen names are associated with %s"
 
-#: src/protocols/oscar/oscar.c:5195
-msgid "Search Results"
-msgstr "Search Results"
-
-#: src/protocols/oscar/oscar.c:5212
+#: src/protocols/oscar/oscar.c:5482
 #, c-format
 msgid "No results found for email address %s"
 msgstr "No results found for email address %s"
 
-#: src/protocols/oscar/oscar.c:5233
+#: src/protocols/oscar/oscar.c:5503
 #, c-format
 msgid "You should receive an email asking to confirm %s."
 msgstr "You should receive an email asking to confirm %s."
 
-#: src/protocols/oscar/oscar.c:5235
+#: src/protocols/oscar/oscar.c:5505
 msgid "Account Confirmation Requested"
 msgstr "Account Confirmation Requested"
 
-#: src/protocols/oscar/oscar.c:5266
+#: src/protocols/oscar/oscar.c:5536
 msgid "Error Changing Account Info"
 msgstr "Error Changing Account Info"
 
-#: src/protocols/oscar/oscar.c:5269
+#: src/protocols/oscar/oscar.c:5539
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -8277,7 +8547,7 @@
 "Error 0x%04x: Unable to format screen name because the requested screen name "
 "differs from the original."
 
-#: src/protocols/oscar/oscar.c:5272
+#: src/protocols/oscar/oscar.c:5542
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -8286,7 +8556,7 @@
 "Error 0x%04x: Unable to format screen name because the requested screen name "
 "ends in a space."
 
-#: src/protocols/oscar/oscar.c:5275
+#: src/protocols/oscar/oscar.c:5545
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -8295,7 +8565,7 @@
 "Error 0x%04x: Unable to format screen name because the requested screen name "
 "is too long."
 
-#: src/protocols/oscar/oscar.c:5278
+#: src/protocols/oscar/oscar.c:5548
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because there is already a "
@@ -8304,7 +8574,7 @@
 "Error 0x%04x: Unable to change email address because there is already a "
 "request pending for this screen name."
 
-#: src/protocols/oscar/oscar.c:5281
+#: src/protocols/oscar/oscar.c:5551
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address has "
@@ -8313,7 +8583,7 @@
 "Error 0x%04x: Unable to change email address because the given address has "
 "too many screen names associated with it."
 
-#: src/protocols/oscar/oscar.c:5284
+#: src/protocols/oscar/oscar.c:5554
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address is "
@@ -8322,12 +8592,12 @@
 "Error 0x%04x: Unable to change email address because the given address is "
 "invalid."
 
-#: src/protocols/oscar/oscar.c:5287
+#: src/protocols/oscar/oscar.c:5557
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "Error 0x%04x: Unknown error."
 
-#: src/protocols/oscar/oscar.c:5297
+#: src/protocols/oscar/oscar.c:5567
 #, c-format
 msgid ""
 "Your screen name is currently formatted as follows:\n"
@@ -8336,26 +8606,26 @@
 "Your screen name is currently formatted as follows:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:5298 src/protocols/oscar/oscar.c:5305
+#: src/protocols/oscar/oscar.c:5568 src/protocols/oscar/oscar.c:5575
 msgid "Account Info"
 msgstr "Account Info"
 
-#: src/protocols/oscar/oscar.c:5303
+#: src/protocols/oscar/oscar.c:5573
 #, c-format
 msgid "The email address for %s is %s"
 msgstr "The email address for %s is %s"
 
-#: src/protocols/oscar/oscar.c:5370
+#: src/protocols/oscar/oscar.c:5640
 msgid ""
 "Your IM Image was not sent. You must be Direct Connected to send IM Images."
 msgstr ""
 "Your IM Image was not sent. You must be Direct Connected to send IM Images."
 
-#: src/protocols/oscar/oscar.c:5505
+#: src/protocols/oscar/oscar.c:5780
 msgid "Unable to set AIM profile."
 msgstr "Unable to set AIM profile."
 
-#: src/protocols/oscar/oscar.c:5506
+#: src/protocols/oscar/oscar.c:5781
 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 "
@@ -8365,7 +8635,7 @@
 "completed.  Your profile remains unset; try setting it again when you are "
 "fully connected."
 
-#: src/protocols/oscar/oscar.c:5533
+#: src/protocols/oscar/oscar.c:5808
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  Gaim has truncated "
@@ -8380,15 +8650,15 @@
 "The maximum profile length of %d bytes has been exceeded.  Gaim has "
 "truncated it for you."
 
-#: src/protocols/oscar/oscar.c:5538
+#: src/protocols/oscar/oscar.c:5813
 msgid "Profile too long."
 msgstr "Profile too long."
 
-#: src/protocols/oscar/oscar.c:5569
+#: src/protocols/oscar/oscar.c:5843
 msgid "Unable to set AIM away message."
 msgstr "Unable to set AIM away message."
 
-#: src/protocols/oscar/oscar.c:5570
+#: src/protocols/oscar/oscar.c:5844
 msgid ""
 "You have probably requested to set your away message before the login "
 "procedure completed.  You remain in a \"present\" state; try setting it "
@@ -8398,7 +8668,7 @@
 "procedure completed.  You remain in a \"present\" state; try setting it "
 "again when you are fully connected."
 
-#: src/protocols/oscar/oscar.c:5615
+#: src/protocols/oscar/oscar.c:5891
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  Gaim has "
@@ -8413,11 +8683,11 @@
 "The maximum away message length of %d bytes has been exceeded.  Gaim has "
 "truncated it for you."
 
-#: src/protocols/oscar/oscar.c:5620
+#: src/protocols/oscar/oscar.c:5896
 msgid "Away message too long."
 msgstr "Away message too long."
 
-#: src/protocols/oscar/oscar.c:5700
+#: src/protocols/oscar/oscar.c:5994
 #, c-format
 msgid ""
 "Could not add the buddy %s because the screen name is invalid.  Screen names "
@@ -8428,16 +8698,16 @@
 "must either start with a letter and contain only letters, numbers and "
 "spaces, or contain only numbers."
 
-#: src/protocols/oscar/oscar.c:5702 src/protocols/oscar/oscar.c:6158
-#: src/protocols/oscar/oscar.c:6172
+#: src/protocols/oscar/oscar.c:5996 src/protocols/oscar/oscar.c:6394
+#: src/protocols/oscar/oscar.c:6408
 msgid "Unable To Add"
 msgstr "Unable To Add"
 
-#: src/protocols/oscar/oscar.c:5864
+#: src/protocols/oscar/oscar.c:6100
 msgid "Unable To Retrieve Buddy List"
 msgstr "Unable To Retrieve Buddy List"
 
-#: src/protocols/oscar/oscar.c:5865
+#: src/protocols/oscar/oscar.c:6101
 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 "
@@ -8447,13 +8717,13 @@
 "servers.  Your buddy list is not lost, and will probably become available in "
 "a few hours."
 
-#: src/protocols/oscar/oscar.c:6049 src/protocols/oscar/oscar.c:6050
-#: src/protocols/oscar/oscar.c:6055 src/protocols/oscar/oscar.c:6216
-#: src/protocols/oscar/oscar.c:6217 src/protocols/oscar/oscar.c:6222
+#: src/protocols/oscar/oscar.c:6285 src/protocols/oscar/oscar.c:6286
+#: src/protocols/oscar/oscar.c:6291 src/protocols/oscar/oscar.c:6452
+#: src/protocols/oscar/oscar.c:6453 src/protocols/oscar/oscar.c:6458
 msgid "Orphans"
 msgstr "Orphans"
 
-#: src/protocols/oscar/oscar.c:6156
+#: src/protocols/oscar/oscar.c:6392
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -8462,11 +8732,11 @@
 "Could not add the buddy %s because you have too many buddies in your buddy "
 "list.  Please remove one and try again."
 
-#: src/protocols/oscar/oscar.c:6156 src/protocols/oscar/oscar.c:6170
+#: src/protocols/oscar/oscar.c:6392 src/protocols/oscar/oscar.c:6406
 msgid "(no name)"
 msgstr "(no name)"
 
-#: src/protocols/oscar/oscar.c:6170
+#: src/protocols/oscar/oscar.c:6406
 #, c-format
 msgid ""
 "Could not add the buddy %s for an unknown reason.  The most common reason "
@@ -8477,7 +8747,7 @@
 "for this is that you have the maximum number of allowed buddies in your "
 "buddy list."
 
-#: src/protocols/oscar/oscar.c:6253
+#: src/protocols/oscar/oscar.c:6489
 #, c-format
 msgid ""
 "The user %s has given you permission to add you to their buddy list.  Do you "
@@ -8486,31 +8756,31 @@
 "The user %s has given you permission to add you to their buddy list.  Do you "
 "want to add them?"
 
-#: src/protocols/oscar/oscar.c:6259
+#: src/protocols/oscar/oscar.c:6495
 msgid "Authorization Given"
 msgstr "Authorisation Given"
 
-#: src/protocols/oscar/oscar.c:6292
-#, c-format
-msgid ""
-"The user %s wants to add you to their buddy list for the following reason:\n"
+#: src/protocols/oscar/oscar.c:6538
+#, fuzzy, c-format
+msgid ""
+"The user %s wants to add %s to their buddy list for the following reason:\n"
 "%s"
 msgstr ""
 "The user %s wants to add you to their buddy list for the following reason:\n"
 "%s"
 
 #. Granted
-#: src/protocols/oscar/oscar.c:6334
+#: src/protocols/oscar/oscar.c:6583
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
 msgstr "The user %s has granted your request to add them to your buddy list."
 
-#: src/protocols/oscar/oscar.c:6335
+#: src/protocols/oscar/oscar.c:6584
 msgid "Authorization Granted"
 msgstr "Authorisation Granted"
 
 #. Denied
-#: src/protocols/oscar/oscar.c:6338
+#: src/protocols/oscar/oscar.c:6587
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -8521,76 +8791,96 @@
 "following reason:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:6339
+#: src/protocols/oscar/oscar.c:6588
 msgid "Authorization Denied"
 msgstr "Authorisation Denied"
 
-#: src/protocols/oscar/oscar.c:6376 src/protocols/toc/toc.c:1280
+#: src/protocols/oscar/oscar.c:6625 src/protocols/toc/toc.c:1372
 msgid "_Exchange:"
 msgstr "_Exchange:"
 
-#: src/protocols/oscar/oscar.c:6414
+#: src/protocols/oscar/oscar.c:6664
 msgid "Invalid chat name specified."
 msgstr "Invalid chat name specified."
 
-#: src/protocols/oscar/oscar.c:6503
+#: src/protocols/oscar/oscar.c:6731
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 msgstr "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 
-#: src/protocols/oscar/oscar.c:6638
+#: src/protocols/oscar/oscar.c:6866
 msgid "Away Message"
 msgstr "Away Message"
 
-#: src/protocols/oscar/oscar.c:6973
+#: src/protocols/oscar/oscar.c:7153
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "Buddy Comment for %s"
 
-#: src/protocols/oscar/oscar.c:6974
+#: src/protocols/oscar/oscar.c:7154
 msgid "Buddy Comment:"
 msgstr "Buddy Comment:"
 
-#: src/protocols/oscar/oscar.c:6993
+#: src/protocols/oscar/oscar.c:7173
 msgid "Edit Buddy Comment"
 msgstr "Edit Buddy Comment"
 
-#: src/protocols/oscar/oscar.c:6999
+#: src/protocols/oscar/oscar.c:7179
 msgid "Get Status Msg"
 msgstr "Get Status Msg"
 
-#: src/protocols/oscar/oscar.c:7011
+#: src/protocols/oscar/oscar.c:7191
 msgid "Direct IM"
 msgstr "Direct IM"
 
-#: src/protocols/oscar/oscar.c:7028
+#: src/protocols/oscar/oscar.c:7208
 msgid "Re-request Authorization"
 msgstr "Re-request Authorisation"
 
-#: src/protocols/oscar/oscar.c:7058
+#: src/protocols/oscar/oscar.c:7268
+#, fuzzy
+msgid "Require authorization"
+msgstr "Request Authorisation"
+
+#: src/protocols/oscar/oscar.c:7271
+#, fuzzy
+msgid "Hide IP address"
+msgstr "IP Address"
+
+#: src/protocols/oscar/oscar.c:7274
+#, fuzzy
+msgid "Web aware"
+msgstr "Web Aware"
+
+#: src/protocols/oscar/oscar.c:7279
+#, fuzzy
+msgid "ICQ Privacy Options"
+msgstr "Proxy Options"
+
+#: src/protocols/oscar/oscar.c:7296
 msgid "The new formatting is invalid."
 msgstr "The new formatting is invalid."
 
-#: src/protocols/oscar/oscar.c:7059
+#: src/protocols/oscar/oscar.c:7297
 msgid "Screen name formatting can change only capitalization and whitespace."
 msgstr "Screen name formatting can change only capitalisation and whitespace."
 
-#: src/protocols/oscar/oscar.c:7066
+#: src/protocols/oscar/oscar.c:7304
 msgid "New screen name formatting:"
 msgstr "New screen name formatting:"
 
-#: src/protocols/oscar/oscar.c:7118
+#: src/protocols/oscar/oscar.c:7356
 msgid "Change Address To:"
 msgstr "Change Address To:"
 
-#: src/protocols/oscar/oscar.c:7163
+#: src/protocols/oscar/oscar.c:7401
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>you are not waiting for authorisation</i>"
 
-#: src/protocols/oscar/oscar.c:7166
+#: src/protocols/oscar/oscar.c:7404
 msgid "You are awaiting authorization from the following buddies"
 msgstr "You are awaiting authorisation from the following buddies"
 
-#: src/protocols/oscar/oscar.c:7167
+#: src/protocols/oscar/oscar.c:7405
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
@@ -8598,72 +8888,79 @@
 "You can re-request authorisation from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorisation.\""
 
-#: src/protocols/oscar/oscar.c:7184
+#: src/protocols/oscar/oscar.c:7422
 msgid "Find Buddy by E-mail"
 msgstr "Find Buddy by E-mail"
 
-#: src/protocols/oscar/oscar.c:7185
+#: src/protocols/oscar/oscar.c:7423
 msgid "Search for a buddy by e-mail address"
 msgstr "Search for a buddy by e-mail address"
 
-#: src/protocols/oscar/oscar.c:7186
+#: src/protocols/oscar/oscar.c:7424
 msgid "Type the e-mail address of the buddy you are searching for."
 msgstr "Type the e-mail address of the buddy you are searching for."
 
-#: src/protocols/oscar/oscar.c:7267 src/protocols/silc/silc.c:814
+#: src/protocols/oscar/oscar.c:7505 src/protocols/silc/silc.c:826
 msgid "Set User Info..."
 msgstr "Set User Info..."
 
-#: src/protocols/oscar/oscar.c:7272
+#: src/protocols/oscar/oscar.c:7511
 msgid "Set User Info (URL)..."
 msgstr "Set User Info (URL)..."
 
-#: src/protocols/oscar/oscar.c:7277 src/protocols/silc/silc.c:810
+#: src/protocols/oscar/oscar.c:7516 src/protocols/silc/silc.c:822
 msgid "Change Password..."
 msgstr "Change Password..."
 
-#: src/protocols/oscar/oscar.c:7282
+#: src/protocols/oscar/oscar.c:7522
 msgid "Change Password (URL)"
 msgstr "Change Password (URL)"
 
-#: src/protocols/oscar/oscar.c:7286
+#: src/protocols/oscar/oscar.c:7526
 msgid "Configure IM Forwarding (URL)"
 msgstr "Configure IM Forwarding (URL)"
 
-#: src/protocols/oscar/oscar.c:7295
+#. ICQ actions
+#: src/protocols/oscar/oscar.c:7536
+#, fuzzy
+msgid "Show privacy options..."
+msgstr "Show more options"
+
+#. AIM actions
+#: src/protocols/oscar/oscar.c:7543
 msgid "Format Screen Name..."
 msgstr "Format Screen Name..."
 
-#: src/protocols/oscar/oscar.c:7299
+#: src/protocols/oscar/oscar.c:7547
 msgid "Confirm Account"
 msgstr "Confirm Account"
 
-#: src/protocols/oscar/oscar.c:7303
+#: src/protocols/oscar/oscar.c:7551
 msgid "Display Currently Registered Address"
 msgstr "Display Currently Registered Address"
 
-#: src/protocols/oscar/oscar.c:7307
+#: src/protocols/oscar/oscar.c:7555
 msgid "Change Currently Registered Address..."
 msgstr "Change Currently Registered Address"
 
-#: src/protocols/oscar/oscar.c:7314
+#: src/protocols/oscar/oscar.c:7562
 msgid "Show Buddies Awaiting Authorization"
 msgstr "Show Buddies Awaiting Authorisation"
 
-#: src/protocols/oscar/oscar.c:7320
+#: src/protocols/oscar/oscar.c:7568
 msgid "Search for Buddy by Email..."
 msgstr "Search for Buddy by Email..."
 
-#: src/protocols/oscar/oscar.c:7325
+#: src/protocols/oscar/oscar.c:7573
 msgid "Search for Buddy by Information"
 msgstr "Search for Buddy by Information"
 
-#: src/protocols/oscar/oscar.c:7394
+#: src/protocols/oscar/oscar.c:7643
 #, fuzzy
 msgid "Use recent buddies group"
 msgstr "User not in group"
 
-#: src/protocols/oscar/oscar.c:7397
+#: src/protocols/oscar/oscar.c:7646
 #, fuzzy
 msgid "Show how long you have been idle"
 msgstr "Allows you to hand-configure how long you've been idle for"
@@ -8678,19 +8975,19 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/oscar/oscar.c:7490 src/protocols/oscar/oscar.c:7492
+#: src/protocols/oscar/oscar.c:7763 src/protocols/oscar/oscar.c:7765
 msgid "AIM/ICQ Protocol Plugin"
 msgstr "AIM/ICQ Protocol Plugin"
 
-#: src/protocols/oscar/oscar.c:7511
+#: src/protocols/oscar/oscar.c:7788
 msgid "Auth host"
 msgstr "Auth host"
 
-#: src/protocols/oscar/oscar.c:7514
+#: src/protocols/oscar/oscar.c:7791
 msgid "Auth port"
 msgstr "Auth port"
 
-#: src/protocols/oscar/oscar.c:7517 src/protocols/zephyr/zephyr.c:2859
+#: src/protocols/oscar/oscar.c:7794 src/protocols/zephyr/zephyr.c:2892
 msgid "Encoding"
 msgstr "Encoding"
 
@@ -8779,21 +9076,21 @@
 msgstr "Set IM Password"
 
 #: src/protocols/silc/buddy.c:506 src/protocols/silc/buddy.c:541
-#: src/protocols/silc/ops.c:1274 src/protocols/silc/ops.c:1285
+#: src/protocols/silc/ops.c:1282 src/protocols/silc/ops.c:1293
 msgid "Get Public Key"
 msgstr "Get Public Key"
 
-#: src/protocols/silc/buddy.c:542 src/protocols/silc/ops.c:1275
-#: src/protocols/silc/ops.c:1286
+#: src/protocols/silc/buddy.c:542 src/protocols/silc/ops.c:1283
+#: src/protocols/silc/ops.c:1294
 msgid "Cannot fetch the public key"
 msgstr "Cannot fetch the public key"
 
-#: src/protocols/silc/buddy.c:629 src/protocols/silc/buddy.c:1549
+#: src/protocols/silc/buddy.c:629 src/protocols/silc/buddy.c:1578
 msgid "Show Public Key"
 msgstr "Show Public Key"
 
 #: src/protocols/silc/buddy.c:630 src/protocols/silc/buddy.c:989
-#: src/protocols/silc/chat.c:234
+#: src/protocols/silc/chat.c:235
 msgid "Could not load public key"
 msgstr "Could not load public key"
 
@@ -8863,213 +9160,213 @@
 "More than one user was found with the same name. Select the correct user "
 "from the list to add to the buddy list."
 
-#: src/protocols/silc/buddy.c:1382
+#: src/protocols/silc/buddy.c:1410
 msgid "Detached"
 msgstr "Detached"
 
-#: src/protocols/silc/buddy.c:1386 src/protocols/silc/silc.c:56
+#: src/protocols/silc/buddy.c:1414 src/protocols/silc/silc.c:58
 msgid "Indisposed"
 msgstr "Indisposed"
 
-#: src/protocols/silc/buddy.c:1390 src/protocols/silc/silc.c:58
+#: src/protocols/silc/buddy.c:1418 src/protocols/silc/silc.c:60
 msgid "Wake Me Up"
 msgstr "Wake Me Up"
 
-#: src/protocols/silc/buddy.c:1392 src/protocols/silc/silc.c:50
+#: src/protocols/silc/buddy.c:1420 src/protocols/silc/silc.c:52
 msgid "Hyper Active"
 msgstr "Hyper Active"
 
-#: src/protocols/silc/buddy.c:1394
+#: src/protocols/silc/buddy.c:1422
 msgid "Robot"
 msgstr "Robot"
 
-#: src/protocols/silc/buddy.c:1401 src/protocols/silc/silc.c:635
-#: src/protocols/silc/util.c:469
+#: src/protocols/silc/buddy.c:1429 src/protocols/silc/silc.c:643
+#: src/protocols/silc/util.c:472
 msgid "Happy"
 msgstr "Happy"
 
-#: src/protocols/silc/buddy.c:1403 src/protocols/silc/silc.c:637
-#: src/protocols/silc/util.c:471
+#: src/protocols/silc/buddy.c:1431 src/protocols/silc/silc.c:645
+#: src/protocols/silc/util.c:474
 msgid "Sad"
 msgstr "Sad"
 
-#: src/protocols/silc/buddy.c:1405 src/protocols/silc/silc.c:639
-#: src/protocols/silc/util.c:473
+#: src/protocols/silc/buddy.c:1433 src/protocols/silc/silc.c:647
+#: src/protocols/silc/util.c:476
 msgid "Angry"
 msgstr "Angry"
 
-#: src/protocols/silc/buddy.c:1407 src/protocols/silc/silc.c:641
-#: src/protocols/silc/util.c:475
+#: src/protocols/silc/buddy.c:1435 src/protocols/silc/silc.c:649
+#: src/protocols/silc/util.c:478
 msgid "Jealous"
 msgstr "Jealous"
 
-#: src/protocols/silc/buddy.c:1409 src/protocols/silc/silc.c:643
-#: src/protocols/silc/util.c:477
+#: src/protocols/silc/buddy.c:1437 src/protocols/silc/silc.c:651
+#: src/protocols/silc/util.c:480
 msgid "Ashamed"
 msgstr "Ashamed"
 
-#: src/protocols/silc/buddy.c:1411 src/protocols/silc/silc.c:645
-#: src/protocols/silc/util.c:479
+#: src/protocols/silc/buddy.c:1439 src/protocols/silc/silc.c:653
+#: src/protocols/silc/util.c:482
 msgid "Invincible"
 msgstr "Invincible"
 
-#: src/protocols/silc/buddy.c:1413 src/protocols/silc/silc.c:647
-#: src/protocols/silc/util.c:481
+#: src/protocols/silc/buddy.c:1441 src/protocols/silc/silc.c:655
+#: src/protocols/silc/util.c:484
 msgid "In Love"
 msgstr "In Love"
 
-#: src/protocols/silc/buddy.c:1415 src/protocols/silc/silc.c:649
-#: src/protocols/silc/util.c:483
+#: src/protocols/silc/buddy.c:1443 src/protocols/silc/silc.c:657
+#: src/protocols/silc/util.c:486
 msgid "Sleepy"
 msgstr "Sleepy"
 
-#: src/protocols/silc/buddy.c:1417 src/protocols/silc/silc.c:651
-#: src/protocols/silc/util.c:485
+#: src/protocols/silc/buddy.c:1445 src/protocols/silc/silc.c:659
+#: src/protocols/silc/util.c:488
 msgid "Bored"
 msgstr "Bored"
 
-#: src/protocols/silc/buddy.c:1419 src/protocols/silc/silc.c:653
-#: src/protocols/silc/util.c:487
+#: src/protocols/silc/buddy.c:1447 src/protocols/silc/silc.c:661
+#: src/protocols/silc/util.c:490
 msgid "Excited"
 msgstr "Excited"
 
-#: src/protocols/silc/buddy.c:1421 src/protocols/silc/silc.c:655
-#: src/protocols/silc/util.c:489
+#: src/protocols/silc/buddy.c:1449 src/protocols/silc/silc.c:663
+#: src/protocols/silc/util.c:492
 msgid "Anxious"
 msgstr "Anxious"
 
-#: src/protocols/silc/buddy.c:1453 src/protocols/silc/ops.c:982
+#: src/protocols/silc/buddy.c:1481 src/protocols/silc/ops.c:982
 msgid "User Modes"
 msgstr "User Modes"
 
-#: src/protocols/silc/buddy.c:1462 src/protocols/silc/ops.c:991
+#: src/protocols/silc/buddy.c:1490 src/protocols/silc/ops.c:991
 msgid "Mood"
 msgstr "Mood"
 
-#: src/protocols/silc/buddy.c:1466 src/protocols/silc/ops.c:997
+#: src/protocols/silc/buddy.c:1494 src/protocols/silc/ops.c:997
 msgid "Status Text"
 msgstr "Status Text"
 
-#: src/protocols/silc/buddy.c:1471 src/protocols/silc/ops.c:1003
+#: src/protocols/silc/buddy.c:1499 src/protocols/silc/ops.c:1003
 msgid "Preferred Contact"
 msgstr "Preferred Contact"
 
-#: src/protocols/silc/buddy.c:1476 src/protocols/silc/ops.c:1008
+#: src/protocols/silc/buddy.c:1504 src/protocols/silc/ops.c:1008
 msgid "Preferred Language"
 msgstr "Preferred Language"
 
-#: src/protocols/silc/buddy.c:1481 src/protocols/silc/ops.c:1013
+#: src/protocols/silc/buddy.c:1509 src/protocols/silc/ops.c:1013
 msgid "Device"
 msgstr "Device"
 
-#: src/protocols/silc/buddy.c:1486 src/protocols/silc/ops.c:1018
-#: src/protocols/silc/silc.c:703 src/protocols/silc/silc.c:705
+#: src/protocols/silc/buddy.c:1514 src/protocols/silc/ops.c:1018
+#: src/protocols/silc/silc.c:711 src/protocols/silc/silc.c:713
 msgid "Timezone"
 msgstr "Timezone"
 
-#: src/protocols/silc/buddy.c:1491 src/protocols/silc/ops.c:1023
+#: src/protocols/silc/buddy.c:1519 src/protocols/silc/ops.c:1023
 msgid "Geolocation"
 msgstr "Geolocation"
 
-#: src/protocols/silc/buddy.c:1534
+#: src/protocols/silc/buddy.c:1562
 msgid "Reset IM Key"
 msgstr "Reset IM Key"
 
-#: src/protocols/silc/buddy.c:1539
+#: src/protocols/silc/buddy.c:1567
 msgid "IM with Key Exchange"
 msgstr "IM with Key Exchange"
 
-#: src/protocols/silc/buddy.c:1543
+#: src/protocols/silc/buddy.c:1571
 msgid "IM with Password"
 msgstr "IM with Password"
 
-#: src/protocols/silc/buddy.c:1554
+#: src/protocols/silc/buddy.c:1583
 msgid "Get Public Key..."
 msgstr "Get Public Key..."
 
-#: src/protocols/silc/buddy.c:1560 src/protocols/silc/ops.c:1407
+#: src/protocols/silc/buddy.c:1590 src/protocols/silc/ops.c:1413
 msgid "Kill User"
 msgstr "Kill User"
 
-#: src/protocols/silc/chat.c:37
+#: src/protocols/silc/chat.c:38
 msgid "_Passphrase:"
 msgstr "_Passphrase:"
 
-#: src/protocols/silc/chat.c:78
+#: src/protocols/silc/chat.c:79
 #, c-format
 msgid "Channel %s does not exist in the network"
 msgstr "Channel %s does not exist in the network"
 
-#: src/protocols/silc/chat.c:79 src/protocols/silc/chat.c:171
+#: src/protocols/silc/chat.c:80 src/protocols/silc/chat.c:172
 msgid "Channel Information"
 msgstr "Channel Information"
 
-#: src/protocols/silc/chat.c:80
+#: src/protocols/silc/chat.c:81
 msgid "Cannot get channel information"
 msgstr "Cannot get channel information"
 
-#: src/protocols/silc/chat.c:117
+#: src/protocols/silc/chat.c:118
 #, c-format
 msgid "<b>Channel Name:</b> %s"
 msgstr "<b>Channel Name:</b> %s"
 
-#: src/protocols/silc/chat.c:120
+#: src/protocols/silc/chat.c:121
 #, c-format
 msgid "<br><b>User Count:</b> %d"
 msgstr "<br><b>User Count:</b> %d"
 
-#: src/protocols/silc/chat.c:127
+#: src/protocols/silc/chat.c:128
 #, c-format
 msgid "<br><b>Channel Founder:</b> %s"
 msgstr "<br><b>Channel Founder:</b> %s"
 
-#: src/protocols/silc/chat.c:136
+#: src/protocols/silc/chat.c:137
 #, c-format
 msgid "<br><b>Channel Cipher:</b> %s"
 msgstr "<br><b>Channel Cipher:</b> %s"
 
-#: src/protocols/silc/chat.c:139
+#: src/protocols/silc/chat.c:140
 #, c-format
 msgid "<br><b>Channel HMAC:</b> %s"
 msgstr "<br><b>Channel HMAC:</b> %s"
 
-#: src/protocols/silc/chat.c:144
+#: src/protocols/silc/chat.c:145
 #, c-format
 msgid "<br><b>Channel Topic:</b><br>%s"
 msgstr "<br><b>Channel Topic:</b><br>%s"
 
-#: src/protocols/silc/chat.c:149
+#: src/protocols/silc/chat.c:150
 msgid "<br><b>Channel Modes:</b> "
 msgstr "<br><b>Channel Modes:</b> "
 
-#: src/protocols/silc/chat.c:162
+#: src/protocols/silc/chat.c:163
 #, c-format
 msgid "<br><b>Founder Key Fingerprint:</b><br>%s"
 msgstr "<br><b>Founder Key Fingerprint:</b><br>%s"
 
-#: src/protocols/silc/chat.c:163
+#: src/protocols/silc/chat.c:164
 #, c-format
 msgid "<br><b>Founder Key Babbleprint:</b><br>%s"
 msgstr "<br><b>Founder Key Babbleprint:</b><br>%s"
 
-#: src/protocols/silc/chat.c:233
+#: src/protocols/silc/chat.c:234
 msgid "Add Channel Public Key"
 msgstr "Add Channel Public Key"
 
 #. Add new public key
-#: src/protocols/silc/chat.c:288
+#: src/protocols/silc/chat.c:289
 msgid "Open Public Key..."
 msgstr "Open Public Key..."
 
-#: src/protocols/silc/chat.c:397
+#: src/protocols/silc/chat.c:398
 msgid "Channel Passphrase"
 msgstr "Channel Passphrase"
 
-#: src/protocols/silc/chat.c:404
+#: src/protocols/silc/chat.c:405
 msgid "Channel Public Keys List"
 msgstr "Channel Public Keys List"
 
-#: src/protocols/silc/chat.c:409
+#: src/protocols/silc/chat.c:410
 msgid ""
 "Channel authentication is used to secure the channel from unauthorized "
 "access. The authentication may be based on passphrase and digital "
@@ -9083,123 +9380,123 @@
 "channel public keys are set then only users whose public keys are listed are "
 "able to join."
 
-#: src/protocols/silc/chat.c:418 src/protocols/silc/chat.c:419
-#: src/protocols/silc/chat.c:456 src/protocols/silc/chat.c:457
-#: src/protocols/silc/chat.c:886
+#: src/protocols/silc/chat.c:419 src/protocols/silc/chat.c:420
+#: src/protocols/silc/chat.c:457 src/protocols/silc/chat.c:458
+#: src/protocols/silc/chat.c:891
 msgid "Channel Authentication"
 msgstr "Channel Authentication"
 
-#: src/protocols/silc/chat.c:420 src/protocols/silc/chat.c:458
+#: src/protocols/silc/chat.c:421 src/protocols/silc/chat.c:459
 msgid "Add / Remove"
 msgstr "Add / Remove"
 
-#: src/protocols/silc/chat.c:575
+#: src/protocols/silc/chat.c:576
 msgid "Group Name"
 msgstr "Group name"
 
-#: src/protocols/silc/chat.c:579 src/protocols/silc/ops.c:1687
+#: src/protocols/silc/chat.c:580 src/protocols/silc/ops.c:1698
 msgid "Passphrase"
 msgstr "Passphrase"
 
-#: src/protocols/silc/chat.c:590
+#: src/protocols/silc/chat.c:591
 #, c-format
 msgid "Please enter the %s channel private group name and passphrase."
 msgstr "Please enter the %s channel private group name and passphrase."
 
-#: src/protocols/silc/chat.c:592
+#: src/protocols/silc/chat.c:593
 msgid "Add Channel Private Group"
 msgstr "Add Channel Private Group"
 
-#: src/protocols/silc/chat.c:719
+#: src/protocols/silc/chat.c:720
 msgid "User Limit"
 msgstr "User Limit"
 
-#: src/protocols/silc/chat.c:720
+#: src/protocols/silc/chat.c:721
 msgid "Set user limit on channel. Set to zero to reset user limit."
 msgstr "Set user limit on channel. Set to zero to reset user limit."
 
-#: src/protocols/silc/chat.c:862
+#: src/protocols/silc/chat.c:863
 msgid "Get Info"
 msgstr "Get Info"
 
-#: src/protocols/silc/chat.c:869
+#: src/protocols/silc/chat.c:871
 msgid "Invite List"
 msgstr "Invite List"
 
-#: src/protocols/silc/chat.c:873
+#: src/protocols/silc/chat.c:876
 msgid "Ban List"
 msgstr "Ban List"
 
-#: src/protocols/silc/chat.c:880
+#: src/protocols/silc/chat.c:884
 msgid "Add Private Group"
 msgstr "Add Private Group"
 
-#: src/protocols/silc/chat.c:891
+#: src/protocols/silc/chat.c:897
 msgid "Reset Permanent"
 msgstr "Reset Permanent"
 
-#: src/protocols/silc/chat.c:895
+#: src/protocols/silc/chat.c:902
 msgid "Set Permanent"
 msgstr "Set Permanent"
 
-#: src/protocols/silc/chat.c:902
+#: src/protocols/silc/chat.c:910
 msgid "Set User Limit"
 msgstr "Set User Limit"
 
-#: src/protocols/silc/chat.c:907
+#: src/protocols/silc/chat.c:916
 msgid "Reset Topic Restriction"
 msgstr "Reset Topic Restriction"
 
-#: src/protocols/silc/chat.c:911
+#: src/protocols/silc/chat.c:921
 msgid "Set Topic Restriction"
 msgstr "Set Topic Restriction"
 
-#: src/protocols/silc/chat.c:917
+#: src/protocols/silc/chat.c:928
 msgid "Reset Private Channel"
 msgstr "Reset Private Channel"
 
-#: src/protocols/silc/chat.c:921
+#: src/protocols/silc/chat.c:933
 msgid "Set Private Channel"
 msgstr "Set Private Channel"
 
-#: src/protocols/silc/chat.c:927
+#: src/protocols/silc/chat.c:940
 msgid "Reset Secret Channel"
 msgstr "Reset Secret Channel"
 
-#: src/protocols/silc/chat.c:931
+#: src/protocols/silc/chat.c:945
 msgid "Set Secret Channel"
 msgstr "Set Secret Channel"
 
-#: src/protocols/silc/chat.c:993
+#: src/protocols/silc/chat.c:1008
 #, c-format
 msgid "You are channel founder on <I>%s</I>"
 msgstr "You are channel founder on <I>%s</I>"
 
-#: src/protocols/silc/chat.c:997
+#: src/protocols/silc/chat.c:1012
 #, c-format
 msgid "Channel founder on <I>%s</I> is <I>%s</I>"
 msgstr "Channel founder on <I>%s</I> is <I>%s</I>"
 
-#: src/protocols/silc/chat.c:1056
+#: src/protocols/silc/chat.c:1071
 #, c-format
 msgid ""
 "You have to join the %s channel before you are able to join the private group"
 msgstr ""
 "You have to join the %s channel before you are able to join the private group"
 
-#: src/protocols/silc/chat.c:1058
+#: src/protocols/silc/chat.c:1073
 msgid "Join Private Group"
 msgstr "Join Private Group"
 
-#: src/protocols/silc/chat.c:1059
+#: src/protocols/silc/chat.c:1074
 msgid "Cannot join private group"
 msgstr "Cannot join private group"
 
-#: src/protocols/silc/chat.c:1252 src/protocols/silc/silc.c:914
+#: src/protocols/silc/chat.c:1267 src/protocols/silc/silc.c:926
 msgid "Cannot call command"
 msgstr "Cannot call command"
 
-#: src/protocols/silc/chat.c:1253 src/protocols/silc/silc.c:915
+#: src/protocols/silc/chat.c:1268 src/protocols/silc/silc.c:927
 msgid "Unknown command"
 msgstr "Unknown command"
 
@@ -9345,7 +9642,7 @@
 msgid "More..."
 msgstr "More..."
 
-#: src/protocols/silc/ops.c:1159 src/protocols/silc/silc.c:802
+#: src/protocols/silc/ops.c:1159 src/protocols/silc/silc.c:814
 msgid "Detach From Server"
 msgstr "Detach From Server"
 
@@ -9361,31 +9658,39 @@
 msgid "Failed to change nickname"
 msgstr "Failed to change nickname"
 
-#: src/protocols/silc/ops.c:1287
+#: src/protocols/silc/ops.c:1250
+msgid "Roomlist"
+msgstr "Room List"
+
+#: src/protocols/silc/ops.c:1250
+msgid "Cannot get room list"
+msgstr "Cannot get room list"
+
+#: src/protocols/silc/ops.c:1295
 msgid "No public key was received"
 msgstr "No public key was received"
 
-#: src/protocols/silc/ops.c:1300 src/protocols/silc/ops.c:1314
+#: src/protocols/silc/ops.c:1308 src/protocols/silc/ops.c:1321
 msgid "Server Information"
 msgstr "Server Information"
 
-#: src/protocols/silc/ops.c:1301
+#: src/protocols/silc/ops.c:1309
 msgid "Cannot get server information"
 msgstr "Cannot get server information"
 
-#: src/protocols/silc/ops.c:1332 src/protocols/silc/ops.c:1341
+#: src/protocols/silc/ops.c:1338 src/protocols/silc/ops.c:1347
 msgid "Server Statistics"
 msgstr "Server Statistics"
 
-#: src/protocols/silc/ops.c:1333
+#: src/protocols/silc/ops.c:1339
 msgid "Cannot get server statistics"
 msgstr "Cannot get server statistics"
 
-#: src/protocols/silc/ops.c:1342
+#: src/protocols/silc/ops.c:1348
 msgid "No server statistics available"
 msgstr "No server statistics available"
 
-#: src/protocols/silc/ops.c:1364
+#: src/protocols/silc/ops.c:1370
 #, c-format
 msgid ""
 "Local server start time: %s\n"
@@ -9420,98 +9725,98 @@
 "Total server operators: %d\n"
 "Total router operators: %d\n"
 
-#: src/protocols/silc/ops.c:1387
+#: src/protocols/silc/ops.c:1393
 msgid "Network Statistics"
 msgstr "Network Statistics"
 
-#: src/protocols/silc/ops.c:1395 src/protocols/silc/ops.c:1400
+#: src/protocols/silc/ops.c:1401 src/protocols/silc/ops.c:1406
 msgid "Ping"
 msgstr "Ping"
 
-#: src/protocols/silc/ops.c:1395
+#: src/protocols/silc/ops.c:1401
 msgid "Ping failed"
 msgstr "Ping failed"
 
-#: src/protocols/silc/ops.c:1400
+#: src/protocols/silc/ops.c:1406
 msgid "Ping reply received from server"
 msgstr "Ping reply received from server"
 
-#: src/protocols/silc/ops.c:1408
+#: src/protocols/silc/ops.c:1414
 msgid "Could not kill user"
 msgstr "Could not kill user"
 
-#: src/protocols/silc/ops.c:1489
+#: src/protocols/silc/ops.c:1498
 msgid "Error during connecting to SILC Server"
 msgstr "Error during connecting to SILC Server"
 
-#: src/protocols/silc/ops.c:1494
+#: src/protocols/silc/ops.c:1503
 msgid "Key Exchange failed"
 msgstr "Key Exchange failed"
 
-#: src/protocols/silc/ops.c:1503
+#: src/protocols/silc/ops.c:1512
 msgid ""
 "Resuming detached session failed. Press Reconnect to create new connection."
 msgstr ""
 "Resuming detached session failed. Press Reconnect to create new connection."
 
-#: src/protocols/silc/ops.c:1538
+#: src/protocols/silc/ops.c:1547
 msgid "Disconnected by server"
 msgstr "Disconnected by server"
 
-#: src/protocols/silc/ops.c:1598 src/protocols/silc/ops.c:1645
-#: src/protocols/silc/silc.c:192
+#: src/protocols/silc/ops.c:1609 src/protocols/silc/ops.c:1656
+#: src/protocols/silc/silc.c:203
 msgid "Resuming session"
 msgstr "Resuming session"
 
-#: src/protocols/silc/ops.c:1600
+#: src/protocols/silc/ops.c:1611
 msgid "Authenticating connection"
 msgstr "Authenticating connection"
 
-#: src/protocols/silc/ops.c:1647
+#: src/protocols/silc/ops.c:1658
 msgid "Verifying server public key"
 msgstr "Verifying server public key"
 
-#: src/protocols/silc/ops.c:1688
+#: src/protocols/silc/ops.c:1699
 msgid "Passphrase required"
 msgstr "Passphrase required"
 
-#: src/protocols/silc/ops.c:1717
+#: src/protocols/silc/ops.c:1728
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "Failure: Version mismatch, upgrade your client"
 
-#: src/protocols/silc/ops.c:1720
+#: src/protocols/silc/ops.c:1731
 msgid "Failure: Remote does not trust/support your public key"
 msgstr "Failure: Remote does not trust/support your public key"
 
-#: src/protocols/silc/ops.c:1723
+#: src/protocols/silc/ops.c:1734
 msgid "Failure: Remote does not support proposed KE group"
 msgstr "Failure: Remote does not support proposed KE group"
 
-#: src/protocols/silc/ops.c:1726
+#: src/protocols/silc/ops.c:1737
 msgid "Failure: Remote does not support proposed cipher"
 msgstr "Failure: Remote does not support proposed cipher"
 
-#: src/protocols/silc/ops.c:1729
+#: src/protocols/silc/ops.c:1740
 msgid "Failure: Remote does not support proposed PKCS"
 msgstr "Failure: Remote does not support proposed PKCS"
 
-#: src/protocols/silc/ops.c:1732
+#: src/protocols/silc/ops.c:1743
 msgid "Failure: Remote does not support proposed hash function"
 msgstr "Failure: Remote does not support proposed hash function"
 
-#: src/protocols/silc/ops.c:1735
+#: src/protocols/silc/ops.c:1746
 msgid "Failure: Remote does not support proposed HMAC"
 msgstr "Failure: Remote does not support proposed HMAC"
 
-#: src/protocols/silc/ops.c:1737
+#: src/protocols/silc/ops.c:1748
 msgid "Failure: Incorrect signature"
 msgstr "Failure: Incorrect signature"
 
-#: src/protocols/silc/ops.c:1739
+#: src/protocols/silc/ops.c:1750
 msgid "Failure: Invalid cookie"
 msgstr "Failure: Invalid cookie"
 
-#: src/protocols/silc/ops.c:1750
+#: src/protocols/silc/ops.c:1761
 msgid "Failure: Authentication failed"
 msgstr "Failure: Authentication failed"
 
@@ -9554,36 +9859,36 @@
 msgid "Unsupported public key type"
 msgstr "Unsupported public key type"
 
-#: src/protocols/silc/silc.c:152
+#: src/protocols/silc/silc.c:163
 msgid "Connection failed"
 msgstr "Connection failed"
 
-#: src/protocols/silc/silc.c:184
+#: src/protocols/silc/silc.c:195
 msgid "Cannot initialize SILC Client connection"
 msgstr "Cannot initialise SILC Client connection"
 
-#: src/protocols/silc/silc.c:195
+#: src/protocols/silc/silc.c:206
 msgid "Performing key exchange"
 msgstr "Performing key exchange"
 
-#: src/protocols/silc/silc.c:267
+#: src/protocols/silc/silc.c:279
 msgid "Out of memory"
 msgstr "Out of memory"
 
 #. Progress
-#: src/protocols/silc/silc.c:301
+#: src/protocols/silc/silc.c:318
 msgid "Connecting to SILC Server"
 msgstr "Connecting to SILC Server"
 
-#: src/protocols/silc/silc.c:631
+#: src/protocols/silc/silc.c:639
 msgid "Your Current Mood"
 msgstr "Your Current Mood"
 
-#: src/protocols/silc/silc.c:633
+#: src/protocols/silc/silc.c:641
 msgid "Normal"
 msgstr "Normal"
 
-#: src/protocols/silc/silc.c:658
+#: src/protocols/silc/silc.c:666
 msgid ""
 "\n"
 "Your Preferred Contact Methods"
@@ -9591,43 +9896,43 @@
 "\n"
 "Your Preferred Contact Methods"
 
-#: src/protocols/silc/silc.c:666 src/protocols/silc/util.c:514
+#: src/protocols/silc/silc.c:674 src/protocols/silc/util.c:517
 msgid "SMS"
 msgstr "SMS"
 
-#: src/protocols/silc/silc.c:668 src/protocols/silc/util.c:516
+#: src/protocols/silc/silc.c:676 src/protocols/silc/util.c:519
 msgid "MMS"
 msgstr "MMS"
 
-#: src/protocols/silc/silc.c:670 src/protocols/silc/util.c:518
+#: src/protocols/silc/silc.c:678 src/protocols/silc/util.c:521
 msgid "Video Conferencing"
 msgstr "Video Conferencing"
 
-#: src/protocols/silc/silc.c:675
+#: src/protocols/silc/silc.c:683
 msgid "Your Current Status"
 msgstr "Your Current Status"
 
-#: src/protocols/silc/silc.c:682
+#: src/protocols/silc/silc.c:690
 msgid "Online Services"
 msgstr "Online Services"
 
-#: src/protocols/silc/silc.c:685
+#: src/protocols/silc/silc.c:693
 msgid "Let others see what services you are using"
 msgstr "Let others see what services you are using"
 
-#: src/protocols/silc/silc.c:691
+#: src/protocols/silc/silc.c:699
 msgid "Let others see what computer you are using"
 msgstr "Let others see what computer you are using"
 
-#: src/protocols/silc/silc.c:698
+#: src/protocols/silc/silc.c:706
 msgid "Your VCard File"
 msgstr "Your VCard File"
 
-#: src/protocols/silc/silc.c:711 src/protocols/silc/silc.c:712
+#: src/protocols/silc/silc.c:719 src/protocols/silc/silc.c:720
 msgid "User Online Status Attributes"
 msgstr "User Online Status Attributes"
 
-#: src/protocols/silc/silc.c:713
+#: src/protocols/silc/silc.c:721
 msgid ""
 "You can let other users see your online status information and your personal "
 "information. Please fill the information you would like other users to see "
@@ -9637,127 +9942,127 @@
 "information. Please fill the information you would like other users to see "
 "about yourself."
 
-#: src/protocols/silc/silc.c:753 src/protocols/silc/silc.c:759
-#: src/protocols/silc/silc.c:1159
+#: src/protocols/silc/silc.c:761 src/protocols/silc/silc.c:767
+#: src/protocols/silc/silc.c:1171
 msgid "Message of the Day"
 msgstr "Message of the Day"
 
-#: src/protocols/silc/silc.c:753
+#: src/protocols/silc/silc.c:761
 msgid "No Message of the Day available"
 msgstr "No Message of the Day available"
 
-#: src/protocols/silc/silc.c:754 src/protocols/silc/silc.c:1154
+#: src/protocols/silc/silc.c:762 src/protocols/silc/silc.c:1166
 msgid "There is no Message of the Day associated with this connection"
 msgstr "There is no Message of the Day associated with this connection"
 
-#: src/protocols/silc/silc.c:797
+#: src/protocols/silc/silc.c:809
 msgid "Online Status"
 msgstr "Online Status"
 
-#: src/protocols/silc/silc.c:806
+#: src/protocols/silc/silc.c:818
 msgid "View Message of the Day"
 msgstr "View Message of the Day"
 
-#: src/protocols/silc/silc.c:879
+#: src/protocols/silc/silc.c:891
 #, c-format
 msgid "User <I>%s</I> is not present in the network"
 msgstr "User <I>%s</I> is not present in the network"
 
-#: src/protocols/silc/silc.c:1030
+#: src/protocols/silc/silc.c:1042
 msgid "Topic too long"
 msgstr "Topic too long."
 
-#: src/protocols/silc/silc.c:1111
+#: src/protocols/silc/silc.c:1123
 msgid "You must specify a nick"
 msgstr "You must specify a nick"
 
-#: src/protocols/silc/silc.c:1213
+#: src/protocols/silc/silc.c:1225
 #, c-format
 msgid "channel %s not found"
 msgstr "channel %s not found"
 
-#: src/protocols/silc/silc.c:1218
+#: src/protocols/silc/silc.c:1230
 #, c-format
 msgid "channel modes for %s: %s"
 msgstr "channel modes for %s: %s"
 
-#: src/protocols/silc/silc.c:1220
+#: src/protocols/silc/silc.c:1232
 #, c-format
 msgid "no channel modes are set on %s"
 msgstr "no channel modes are set on %s"
 
-#: src/protocols/silc/silc.c:1233
+#: src/protocols/silc/silc.c:1245
 #, c-format
 msgid "Failed to set cmodes for %s"
 msgstr "Failed to set cmodes for %s"
 
-#: src/protocols/silc/silc.c:1263
+#: src/protocols/silc/silc.c:1275
 #, c-format
 msgid "Unknown command: %s, (may be a Gaim bug)"
 msgstr "Unknown command: %s, (may be a Gaim bug)"
 
-#: src/protocols/silc/silc.c:1326
+#: src/protocols/silc/silc.c:1338
 msgid "part [channel]:  Leave the chat"
 msgstr "part [channel]:  Leave the chat"
 
-#: src/protocols/silc/silc.c:1330
+#: src/protocols/silc/silc.c:1342
 msgid "leave [channel]:  Leave the chat"
 msgstr "leave [channel]:  Leave the chat"
 
-#: src/protocols/silc/silc.c:1334
+#: src/protocols/silc/silc.c:1346
 msgid "topic [&lt;new topic&gt;]:  View or change the topic"
 msgstr "topic [&lt;new topic&gt;]:  View or change the topic"
 
-#: src/protocols/silc/silc.c:1339
+#: src/protocols/silc/silc.c:1351
 msgid "join &lt;channel&gt; [&lt;password&gt;]:  Join a chat on this network"
 msgstr "join &lt;channel&gt; [&lt;password&gt;]:  Join a chat on this network"
 
-#: src/protocols/silc/silc.c:1343
+#: src/protocols/silc/silc.c:1355
 msgid "list:  List channels on this network"
 msgstr "list:  List channels on this network"
 
-#: src/protocols/silc/silc.c:1347
+#: src/protocols/silc/silc.c:1359
 msgid "whois &lt;nick&gt;:  View nick's information"
 msgstr "whois &lt;nick&gt;:  View nick's information"
 
-#: src/protocols/silc/silc.c:1351 src/protocols/zephyr/zephyr.c:2563
+#: src/protocols/silc/silc.c:1363 src/protocols/zephyr/zephyr.c:2597
 msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user"
 msgstr "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user"
 
-#: src/protocols/silc/silc.c:1355
+#: src/protocols/silc/silc.c:1367
 msgid "query &lt;nick&gt; [&lt;message&gt;]:  Send a private message to a user"
 msgstr ""
 "query &lt;nick&gt; [&lt;message&gt;]:  Send a private message to a user"
 
-#: src/protocols/silc/silc.c:1359
+#: src/protocols/silc/silc.c:1371
 msgid "motd:  View the server's Message Of The Day"
 msgstr "motd:  View the server's Message Of The Day"
 
-#: src/protocols/silc/silc.c:1363
+#: src/protocols/silc/silc.c:1375
 msgid "detach:  Detach this session"
 msgstr "detach:  Detach this session"
 
-#: src/protocols/silc/silc.c:1367
+#: src/protocols/silc/silc.c:1379
 msgid "quit [message]:  Disconnect from the server, with an optional message"
 msgstr "quit [message]:  Disconnect from the server, with an optional message"
 
-#: src/protocols/silc/silc.c:1371
+#: src/protocols/silc/silc.c:1383
 msgid "call &lt;command&gt;:  Call any silc client command"
 msgstr "call &lt;command&gt;:  Call any silc client command"
 
-#: src/protocols/silc/silc.c:1377
+#: src/protocols/silc/silc.c:1389
 msgid "kill &lt;nick&gt; [-pubkey|&lt;reason&gt;]:  Kill nick"
 msgstr "kill &lt;nick&gt; [-pubkey|&lt;reason&gt;]:  Kill nick"
 
-#: src/protocols/silc/silc.c:1381
+#: src/protocols/silc/silc.c:1393
 msgid "nick &lt;newnick&gt;:  Change your nickname"
 msgstr "nick &lt;newnick&gt;:  Change your nickname"
 
-#: src/protocols/silc/silc.c:1385
+#: src/protocols/silc/silc.c:1397
 msgid "whowas &lt;nick&gt;:  View nick's information"
 msgstr "whowas &lt;nick&gt;:  View nick's information"
 
-#: src/protocols/silc/silc.c:1389
+#: src/protocols/silc/silc.c:1401
 msgid ""
 "cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display "
 "channel modes"
@@ -9765,7 +10070,7 @@
 "cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display "
 "channel modes"
 
-#: src/protocols/silc/silc.c:1393
+#: src/protocols/silc/silc.c:1405
 msgid ""
 "cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes "
 "on channel"
@@ -9773,15 +10078,15 @@
 "cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes "
 "on channel"
 
-#: src/protocols/silc/silc.c:1397
+#: src/protocols/silc/silc.c:1409
 msgid "umode &lt;usermodes&gt;:  Set your modes in the network"
 msgstr "umode &lt;usermodes&gt;:  Set your modes in the network"
 
-#: src/protocols/silc/silc.c:1401
+#: src/protocols/silc/silc.c:1413
 msgid "oper &lt;nick&gt; [-pubkey]:  Get server operator privileges"
 msgstr "oper &lt;nick&gt; [-pubkey]:  Get server operator privileges"
 
-#: src/protocols/silc/silc.c:1405
+#: src/protocols/silc/silc.c:1417
 msgid ""
 "invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
 "channel invite list"
@@ -9789,35 +10094,35 @@
 "invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
 "channel invite list"
 
-#: src/protocols/silc/silc.c:1409
+#: src/protocols/silc/silc.c:1421
 msgid "kick &lt;channel&gt; &lt;nick&gt; [comment]:  Kick client from channel"
 msgstr "kick &lt;channel&gt; &lt;nick&gt; [comment]:  Kick client from channel"
 
-#: src/protocols/silc/silc.c:1413
+#: src/protocols/silc/silc.c:1425
 msgid "info [server]:  View server administrative details"
 msgstr "info [server]:  View server administrative details"
 
-#: src/protocols/silc/silc.c:1417
+#: src/protocols/silc/silc.c:1429
 msgid "ban [&lt;channel&gt; +|-&lt;nick&gt;]:  Ban client from channel"
 msgstr "ban [&lt;channel&gt; +|-&lt;nick&gt;]:  Ban client from channel"
 
-#: src/protocols/silc/silc.c:1421
+#: src/protocols/silc/silc.c:1433
 msgid "getkey &lt;nick|server&gt;:  Retrieve client's or server's public key"
 msgstr "getkey &lt;nick|server&gt;:  Retrieve client's or server's public key"
 
-#: src/protocols/silc/silc.c:1425
+#: src/protocols/silc/silc.c:1437
 msgid "stats:  View server and network statistics"
 msgstr "stats:  View server and network statistics"
 
-#: src/protocols/silc/silc.c:1429
+#: src/protocols/silc/silc.c:1441
 msgid "ping:  Send PING to the connected server"
 msgstr "ping:  Send PING to the connected server"
 
-#: src/protocols/silc/silc.c:1434
+#: src/protocols/silc/silc.c:1446
 msgid "users &lt;channel&gt;:  List users in channel"
 msgstr "users &lt;channel&gt;:  List users in channel"
 
-#: src/protocols/silc/silc.c:1438
+#: src/protocols/silc/silc.c:1450
 msgid ""
 "names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List "
 "specific users in channel(s)"
@@ -9825,42 +10130,30 @@
 "names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List "
 "specific users in channel(s)"
 
-#: src/protocols/silc/silc.c:1450
+#: src/protocols/silc/silc.c:1462
 msgid "Instant Messages"
 msgstr "Instant Messages"
 
-#: src/protocols/silc/silc.c:1455
+#: src/protocols/silc/silc.c:1467
 msgid "Digitally sign all IM messages"
 msgstr "Digitally sign all IM messages"
 
-#: src/protocols/silc/silc.c:1460
+#: src/protocols/silc/silc.c:1472
 msgid "Verify all IM message signatures"
 msgstr "Verify all IM message signatures"
 
-#: src/protocols/silc/silc.c:1463
+#: src/protocols/silc/silc.c:1475
 msgid "Channel Messages"
 msgstr "Channel Messages"
 
-#: src/protocols/silc/silc.c:1468
+#: src/protocols/silc/silc.c:1480
 msgid "Digitally sign all channel messages"
 msgstr "Digitally sign all channel messages"
 
-#: src/protocols/silc/silc.c:1473
+#: src/protocols/silc/silc.c:1485
 msgid "Verify all channel message signatures"
 msgstr "Verify all channel message signatures"
 
-#: src/protocols/silc/silc.c:1476
-msgid "Default SILC Key Pair"
-msgstr "Default SILC Key Pair"
-
-#: src/protocols/silc/silc.c:1481
-msgid "SILC Public Key"
-msgstr "SILC Public Key"
-
-#: src/protocols/silc/silc.c:1486
-msgid "SILC Private Key"
-msgstr "SILC Private Key"
-
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -9870,91 +10163,93 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/silc/silc.c:1575
+#: src/protocols/silc/silc.c:1573
 msgid "SILC Protocol Plugin"
 msgstr "SILC Protocol Plugin"
 
 #. *  description
-#: src/protocols/silc/silc.c:1577
+#: src/protocols/silc/silc.c:1575
 msgid "Secure Internet Live Conferencing (SILC) Protocol"
 msgstr "Secure Internet Live Conferencing (SILC) Protocol"
 
-#: src/protocols/silc/silc.c:1607
-msgid "Public key authentication"
-msgstr "Public key authentication"
+#: src/protocols/silc/silc.c:1609
+#, fuzzy
+msgid "Public Key file"
+msgstr "Public Key File"
 
 #: src/protocols/silc/silc.c:1613
-msgid "Public Key File"
-msgstr "Public Key File"
-
-#: src/protocols/silc/silc.c:1617
-msgid "Private Key File"
+#, fuzzy
+msgid "Private Key file"
 msgstr "Private Key File"
 
-#: src/protocols/silc/silc.c:1622
+#: src/protocols/silc/silc.c:1616
+msgid "Public key authentication"
+msgstr "Public key authentication"
+
+#: src/protocols/silc/silc.c:1620
 msgid "Reject watching by other users"
 msgstr "Reject watching by other users"
 
-#: src/protocols/silc/silc.c:1625
+#: src/protocols/silc/silc.c:1623
 msgid "Block invites"
 msgstr "Block invites"
 
-#: src/protocols/silc/silc.c:1628
+#: src/protocols/silc/silc.c:1626
 msgid "Block IMs without Key Exchange"
 msgstr "Block IMs without Key Exchange"
 
-#: src/protocols/silc/silc.c:1631
+#: src/protocols/silc/silc.c:1629
 msgid "Reject online status attribute requests"
 msgstr "Reject online status attribute requests"
 
-#: src/protocols/silc/util.c:202 src/protocols/silc/util.c:227
+#: src/protocols/silc/util.c:205 src/protocols/silc/util.c:230
 msgid "Creating SILC key pair..."
 msgstr "Creating SILC key pair..."
 
 #. Hint for translators: Please check the tabulator width here and in
 #. the next strings (short strings: 2 tabs, longer strings 1 tab,
 #. sum: 3 tabs or 24 characters)
-#: src/protocols/silc/util.c:310
+#: src/protocols/silc/util.c:313
 #, c-format
 msgid "Real Name: \t%s\n"
 msgstr "Real Name: \t%s\n"
 
-#: src/protocols/silc/util.c:312
+#: src/protocols/silc/util.c:315
 #, c-format
 msgid "User Name: \t%s\n"
 msgstr "User Name: \t%s\n"
 
-#: src/protocols/silc/util.c:314
+#: src/protocols/silc/util.c:317
 #, c-format
 msgid "EMail: \t\t%s\n"
 msgstr "E-Mail: \t\t%s\n"
 
-#: src/protocols/silc/util.c:316
+#: src/protocols/silc/util.c:319
 #, c-format
 msgid "Host Name: \t%s\n"
 msgstr "Host Name: \t%s\n"
 
-#: src/protocols/silc/util.c:318
+#: src/protocols/silc/util.c:321
 #, c-format
 msgid "Organization: \t%s\n"
 msgstr "Organisation: \t%s\n"
 
-#: src/protocols/silc/util.c:320
+#: src/protocols/silc/util.c:323
 #, c-format
 msgid "Country: \t%s\n"
 msgstr "Country: \t%s\n"
 
-#: src/protocols/silc/util.c:321
+#: src/protocols/silc/util.c:324
 #, c-format
 msgid "Algorithm: \t%s\n"
 msgstr "Algorithm: \t%s\n"
 
-#: src/protocols/silc/util.c:322
+#: src/protocols/silc/util.c:325
 #, c-format
 msgid "Key Length: \t%d bits\n"
 msgstr "Key Length: \t%d bits\n"
 
-#: src/protocols/silc/util.c:324
+#: src/protocols/silc/util.c:327
 #, c-format
 msgid ""
 "Public Key Fingerprint:\n"
@@ -9965,7 +10260,7 @@
 "%s\n"
 "\n"
 
-#: src/protocols/silc/util.c:325
+#: src/protocols/silc/util.c:328
 #, c-format
 msgid ""
 "Public Key Babbleprint:\n"
@@ -9974,135 +10269,135 @@
 "Public Key Babbleprint:\n"
 "%s"
 
-#: src/protocols/silc/util.c:329 src/protocols/silc/util.c:330
+#: src/protocols/silc/util.c:332 src/protocols/silc/util.c:333
 msgid "Public Key Information"
 msgstr "Public Key Information"
 
-#: src/protocols/silc/util.c:512
+#: src/protocols/silc/util.c:515
 msgid "Paging"
 msgstr "Paging"
 
-#: src/protocols/silc/util.c:536
+#: src/protocols/silc/util.c:539
 msgid "Computer"
 msgstr "Computer"
 
-#: src/protocols/silc/util.c:540
+#: src/protocols/silc/util.c:543
 msgid "PDA"
 msgstr "PDA"
 
-#: src/protocols/silc/util.c:542
+#: src/protocols/silc/util.c:545
 msgid "Terminal"
 msgstr "Terminal"
 
-#: src/protocols/toc/toc.c:138
+#: src/protocols/toc/toc.c:139
 #, c-format
 msgid "Looking up %s"
 msgstr "Looking up %s"
 
-#: src/protocols/toc/toc.c:199
+#: src/protocols/toc/toc.c:200
 #, c-format
 msgid "Signon: %s"
 msgstr "Signon: %s"
 
-#: src/protocols/toc/toc.c:481
+#: src/protocols/toc/toc.c:482
 #, c-format
 msgid "Unable to write file %s."
 msgstr "Unable to write file %s."
 
-#: src/protocols/toc/toc.c:484
+#: src/protocols/toc/toc.c:485
 #, c-format
 msgid "Unable to read file %s."
 msgstr "Unable to read file %s."
 
-#: src/protocols/toc/toc.c:487
+#: src/protocols/toc/toc.c:488
 #, c-format
 msgid "Message too long, last %s bytes truncated."
 msgstr "Message too long, last %s bytes truncated."
 
-#: src/protocols/toc/toc.c:490
+#: src/protocols/toc/toc.c:491
 #, c-format
 msgid "%s not currently logged in."
 msgstr "%s not currently logged in."
 
-#: src/protocols/toc/toc.c:493
+#: src/protocols/toc/toc.c:494
 #, c-format
 msgid "Warning of %s not allowed."
 msgstr "Warning of %s not allowed."
 
-#: src/protocols/toc/toc.c:496
+#: src/protocols/toc/toc.c:497
 msgid "A message has been dropped, you are exceeding the server speed limit."
 msgstr "A message has been dropped, you are exceeding the server speed limit."
 
-#: src/protocols/toc/toc.c:499
+#: src/protocols/toc/toc.c:500
 #, c-format
 msgid "Chat in %s is not available."
 msgstr "Chat in %s is not available."
 
-#: src/protocols/toc/toc.c:502
+#: src/protocols/toc/toc.c:503
 #, c-format
 msgid "You are sending messages too fast to %s."
 msgstr "You are sending messages too fast to %s."
 
-#: src/protocols/toc/toc.c:505
+#: src/protocols/toc/toc.c:506
 #, c-format
 msgid "You missed an IM from %s because it was too big."
 msgstr "You missed an IM from %s because it was too big."
 
-#: src/protocols/toc/toc.c:508
+#: src/protocols/toc/toc.c:509
 #, c-format
 msgid "You missed an IM from %s because it was sent too fast."
 msgstr "You missed an IM from %s because it was sent too fast."
 
-#: src/protocols/toc/toc.c:511
+#: src/protocols/toc/toc.c:512
 msgid "Failure."
 msgstr "Failure."
 
-#: src/protocols/toc/toc.c:514
+#: src/protocols/toc/toc.c:515
 msgid "Too many matches."
 msgstr "Too many matches."
 
-#: src/protocols/toc/toc.c:517
+#: src/protocols/toc/toc.c:518
 msgid "Need more qualifiers."
 msgstr "Need more qualifiers."
 
-#: src/protocols/toc/toc.c:520
+#: src/protocols/toc/toc.c:521
 msgid "Dir service temporarily unavailable."
 msgstr "Dir service temporarily unavailable."
 
-#: src/protocols/toc/toc.c:523
+#: src/protocols/toc/toc.c:524
 msgid "Email lookup restricted."
 msgstr "Email lookup restricted."
 
-#: src/protocols/toc/toc.c:526
+#: src/protocols/toc/toc.c:527
 msgid "Keyword ignored."
 msgstr "Keyword ignored."
 
-#: src/protocols/toc/toc.c:529
+#: src/protocols/toc/toc.c:530
 msgid "No keywords."
 msgstr "No keywords."
 
-#: src/protocols/toc/toc.c:532
+#: src/protocols/toc/toc.c:533
 msgid "User has no directory information."
 msgstr "User has no directory information."
 
-#: src/protocols/toc/toc.c:536
+#: src/protocols/toc/toc.c:537
 msgid "Country not supported."
 msgstr "Country not supported."
 
-#: src/protocols/toc/toc.c:539
+#: src/protocols/toc/toc.c:540
 #, c-format
 msgid "Failure unknown: %s."
 msgstr "Failure unknown: %s."
 
-#: src/protocols/toc/toc.c:545
+#: src/protocols/toc/toc.c:546
 msgid "The service is temporarily unavailable."
 msgstr "The service is temporarily unavailable."
 
-#: src/protocols/toc/toc.c:548
+#: src/protocols/toc/toc.c:549
 msgid "Your warning level is currently too high to log in."
 msgstr "Your warning level is currently too high to log in."
 
-#: src/protocols/toc/toc.c:551
+#: src/protocols/toc/toc.c:552
 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."
@@ -10110,37 +10405,42 @@
 "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."
 
-#: src/protocols/toc/toc.c:553
+#: src/protocols/toc/toc.c:554
 #, c-format
 msgid "An unknown signon error has occurred: %s."
 msgstr "An unknown signon error has occurred: %s."
 
-#: src/protocols/toc/toc.c:556
+#: src/protocols/toc/toc.c:557
 #, c-format
 msgid "An unknown error, %d, has occurred.  Info: %s"
 msgstr "An unknown error, %d, has occurred.  Info: %s"
 
-#: src/protocols/toc/toc.c:577
+#: src/protocols/toc/toc.c:584
+#, fuzzy
+msgid "Invalid Groupname"
+msgstr "Invalid group"
+
+#: src/protocols/toc/toc.c:668
 msgid "Connection Closed"
 msgstr "Connection Closed"
 
-#: src/protocols/toc/toc.c:617
+#: src/protocols/toc/toc.c:708
 msgid "Waiting for reply..."
 msgstr "Waiting for reply..."
 
-#: src/protocols/toc/toc.c:696
+#: src/protocols/toc/toc.c:786
 msgid "TOC has come back from its pause. You may now send messages again."
 msgstr "TOC has come back from its pause. You may now send messages again."
 
-#: src/protocols/toc/toc.c:899
+#: src/protocols/toc/toc.c:989
 msgid "Password Change Successful"
 msgstr "Password Change Successful"
 
-#: src/protocols/toc/toc.c:903
+#: src/protocols/toc/toc.c:993
 msgid "TOC has sent a PAUSE command."
 msgstr "TOC has sent a PAUSE command."
 
-#: src/protocols/toc/toc.c:904
+#: src/protocols/toc/toc.c:994
 msgid ""
 "When this happens, TOC ignores any messages sent to it, and may kick you off "
 "if you send a message. Gaim will prevent anything from going through. This "
@@ -10150,44 +10450,44 @@
 "if you send a message. Gaim will prevent anything from going through. This "
 "is only temporary, please be patient."
 
-#: src/protocols/toc/toc.c:1430
+#: src/protocols/toc/toc.c:1549
 msgid "Get Dir Info"
 msgstr "Get Dir Info"
 
-#: src/protocols/toc/toc.c:1566
+#: src/protocols/toc/toc.c:1689
 msgid "Set Dir Info"
 msgstr "Set Dir Info"
 
-#: src/protocols/toc/toc.c:1688
+#: src/protocols/toc/toc.c:1811
 #, c-format
 msgid "Could not open %s for writing!"
 msgstr "Could not open %s for writing!"
 
-#: src/protocols/toc/toc.c:1724
+#: src/protocols/toc/toc.c:1847
 msgid "File transfer failed; other side probably canceled."
 msgstr "File transfer failed; other side probably cancelled."
 
-#: src/protocols/toc/toc.c:1769 src/protocols/toc/toc.c:1809
-#: src/protocols/toc/toc.c:1933 src/protocols/toc/toc.c:2021
+#: src/protocols/toc/toc.c:1892 src/protocols/toc/toc.c:1932
+#: src/protocols/toc/toc.c:2056 src/protocols/toc/toc.c:2144
 msgid "Could not connect for transfer."
 msgstr "Could not connect for transfer."
 
-#: src/protocols/toc/toc.c:1966
+#: src/protocols/toc/toc.c:2089
 msgid "Could not write file header.  The file will not be transferred."
 msgstr "Could not write file header.  The file will not be transferred."
 
-#: src/protocols/toc/toc.c:2066
+#: src/protocols/toc/toc.c:2189
 msgid "Gaim - Save As..."
 msgstr "Gaim - Save As..."
 
-#: src/protocols/toc/toc.c:2100
+#: src/protocols/toc/toc.c:2223
 #, 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 requests %s to accept %d file: %s (%.2f %s)%s%s"
 msgstr[1] "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
 
-#: src/protocols/toc/toc.c:2107
+#: src/protocols/toc/toc.c:2230
 #, c-format
 msgid "%s requests you to send them a file"
 msgstr "%s requests you to send them a file"
@@ -10202,15 +10502,15 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/toc/toc.c:2194 src/protocols/toc/toc.c:2196
+#: src/protocols/toc/toc.c:2316 src/protocols/toc/toc.c:2318
 msgid "TOC Protocol Plugin"
 msgstr "TOC Protocol Plugin"
 
-#: src/protocols/toc/toc.c:2215
+#: src/protocols/toc/toc.c:2337
 msgid "TOC host"
 msgstr "TOC host"
 
-#: src/protocols/toc/toc.c:2219
+#: src/protocols/toc/toc.c:2341
 msgid "TOC port"
 msgstr "TOC port"
 
@@ -10279,7 +10579,7 @@
 msgid "Local Users"
 msgstr "Local Users"
 
-#: src/protocols/trepia/trepia.c:1030
+#: src/protocols/trepia/trepia.c:1032
 msgid "Logging in"
 msgstr "Logging in"
 
@@ -10293,37 +10593,42 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/trepia/trepia.c:1277 src/protocols/trepia/trepia.c:1279
+#: src/protocols/trepia/trepia.c:1278 src/protocols/trepia/trepia.c:1280
 msgid "Trepia Protocol Plugin"
 msgstr "Trepia Protocol Plugin"
 
-#: src/protocols/yahoo/yahoo.c:400
-msgid ""
-"You have been logged off as you have logged in on a different machine or "
-"device."
-msgstr ""
-"You have been logged off as you have logged in on a different machine or "
-"device."
-
-#: src/protocols/yahoo/yahoo.c:884
+#: src/protocols/yahoo/yahoo.c:694
 msgid "Your Yahoo! message did not get sent."
 msgstr "Your Yahoo! message did not get sent."
 
-#: src/protocols/yahoo/yahoo.c:903 src/protocols/yahoo/yahoo.c:3429
+#: src/protocols/yahoo/yahoo.c:718 src/protocols/yahoo/yahoo.c:3462
 msgid "Buzz!!"
 msgstr "Buzz!!"
 
-#: src/protocols/yahoo/yahoo.c:948
+#: src/protocols/yahoo/yahoo.c:763
 #, c-format
 msgid "Yahoo! system message for %s:"
 msgstr "Yahoo! system message for %s:"
 
-#: src/protocols/yahoo/yahoo.c:1015
+#. TODO: this is almost exactly the same as what MSN does,
+#. * this should probably be moved to the core.
+#. *
+#: src/protocols/yahoo/yahoo.c:853
+#, fuzzy, c-format
+msgid "The user %s wants to add %s to his or her buddy list%s%s."
+msgstr "The user %s wants to add %s to his or her buddy list."
+
+#: src/protocols/yahoo/yahoo.c:859
+#, fuzzy
+msgid "Message (optional) :"
+msgstr "Message Notification"
+
+#: src/protocols/yahoo/yahoo.c:901
 #, c-format
 msgid "%s has (retroactively) denied your request to add them to your list."
 msgstr "%s has (retroactively) denied your request to add them to your list."
 
-#: src/protocols/yahoo/yahoo.c:1018
+#: src/protocols/yahoo/yahoo.c:904
 #, c-format
 msgid ""
 "%s has (retroactively) denied your request to add them to your list for the "
@@ -10332,11 +10637,11 @@
 "%s has (retroactively) denied your request to add them to your list for the "
 "following reason: %s."
 
-#: src/protocols/yahoo/yahoo.c:1021
+#: src/protocols/yahoo/yahoo.c:907
 msgid "Add buddy rejected"
 msgstr "Add buddy rejected"
 
-#: src/protocols/yahoo/yahoo.c:1782
+#: src/protocols/yahoo/yahoo.c:1659
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -10347,11 +10652,11 @@
 "method.  This version of Gaim will likely not be able to successfully sign "
 "on to Yahoo.  Check %s for updates."
 
-#: src/protocols/yahoo/yahoo.c:1785
+#: src/protocols/yahoo/yahoo.c:1662
 msgid "Failed Yahoo! Authentication"
 msgstr "Failed Yahoo! Authentication"
 
-#: src/protocols/yahoo/yahoo.c:1858
+#: src/protocols/yahoo/yahoo.c:1735
 #, c-format
 msgid ""
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
@@ -10360,19 +10665,19 @@
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
 "\"Yes\" will remove and ignore the buddy."
 
-#: src/protocols/yahoo/yahoo.c:1861
+#: src/protocols/yahoo/yahoo.c:1738
 msgid "Ignore buddy?"
 msgstr "Ignore buddy?"
 
-#: src/protocols/yahoo/yahoo.c:1895
+#: src/protocols/yahoo/yahoo.c:1772
 msgid "Invalid username."
 msgstr "Invalid username."
 
-#: src/protocols/yahoo/yahoo.c:1906
+#: src/protocols/yahoo/yahoo.c:1783
 msgid "Normal authentication failed!"
 msgstr "Normal authentication failed!"
 
-#: src/protocols/yahoo/yahoo.c:1907
+#: src/protocols/yahoo/yahoo.c:1784
 msgid ""
 "The normal authentication method has failed. This means either your password "
 "is incorrect, or Yahoo!'s authentication scheme has changed. Gaim will now "
@@ -10384,94 +10689,118 @@
 "attempt to log in using Web Messenger authentication, will which result in "
 "reduced functionality and features."
 
-#: src/protocols/yahoo/yahoo.c:1915
+#: src/protocols/yahoo/yahoo.c:1792
 msgid "Incorrect password."
 msgstr "Incorrect password."
 
-#: src/protocols/yahoo/yahoo.c:1918
+#: src/protocols/yahoo/yahoo.c:1795
 msgid "Your account is locked, please log in to the Yahoo! website."
 msgstr "Your account is locked, please log in to the Yahoo! website."
 
-#: src/protocols/yahoo/yahoo.c:1921
+#: src/protocols/yahoo/yahoo.c:1798
 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr "Unknown error number %d. Logging into the Yahoo! website may fix this."
 
-#: src/protocols/yahoo/yahoo.c:1975
+#: src/protocols/yahoo/yahoo.c:1852
 #, c-format
 msgid "Could not add buddy %s to group %s to the server list on account %s."
 msgstr "Could not add buddy %s to group %s to the server list on account %s."
 
-#: src/protocols/yahoo/yahoo.c:1978
+#: src/protocols/yahoo/yahoo.c:1855
 msgid "Could not add buddy to server list"
 msgstr "Could not add buddy to server list"
 
-#: src/protocols/yahoo/yahoo.c:2212 src/protocols/yahoo/yahoo.c:2340
-#: src/protocols/yahoo/ycht.c:414
+#: src/protocols/yahoo/yahoo.c:2097 src/protocols/yahoo/yahoo.c:2243
+#: src/protocols/yahoo/ycht.c:415
 msgid "Unable to read"
 msgstr "Unable to read"
 
-#: src/protocols/yahoo/yahoo.c:2362 src/protocols/yahoo/yahoo.c:2472
-#: src/protocols/yahoo/yahoo.c:2522 src/protocols/yahoo/yahoo.c:2532
-#: src/protocols/yahoo/yahoochat.c:1415 src/protocols/yahoo/yahoochat.c:1476
-#: src/protocols/yahoo/ycht.c:518
+#: src/protocols/yahoo/yahoo.c:2265 src/protocols/yahoo/yahoo.c:2393
+#: src/protocols/yahoo/yahoo.c:2477 src/protocols/yahoo/yahoo.c:2487
+#: src/protocols/yahoo/yahoochat.c:1417 src/protocols/yahoo/yahoochat.c:1484
+#: src/protocols/yahoo/ycht.c:519
 msgid "Connection problem"
 msgstr "Connection problem"
 
-#: src/protocols/yahoo/yahoo.c:2635 src/protocols/yahoo/yahoo.c:3145
+#: src/protocols/yahoo/yahoo.c:2588 src/protocols/yahoo/yahoo.c:3192
 msgid "Not At Home"
 msgstr "Not At Home"
 
-#: src/protocols/yahoo/yahoo.c:2637 src/protocols/yahoo/yahoo.c:3148
+#: src/protocols/yahoo/yahoo.c:2590 src/protocols/yahoo/yahoo.c:3195
 msgid "Not At Desk"
 msgstr "Not At Desk"
 
-#: src/protocols/yahoo/yahoo.c:2639 src/protocols/yahoo/yahoo.c:3151
+#: src/protocols/yahoo/yahoo.c:2592 src/protocols/yahoo/yahoo.c:3198
 msgid "Not In Office"
 msgstr "Not In Office"
 
-#: src/protocols/yahoo/yahoo.c:2643 src/protocols/yahoo/yahoo.c:3157
+#: src/protocols/yahoo/yahoo.c:2596 src/protocols/yahoo/yahoo.c:3204
 msgid "On Vacation"
 msgstr "On Vacation"
 
-#: src/protocols/yahoo/yahoo.c:2647 src/protocols/yahoo/yahoo.c:3163
+#: src/protocols/yahoo/yahoo.c:2600 src/protocols/yahoo/yahoo.c:3210
 msgid "Stepped Out"
 msgstr "Stepped Out"
 
-#: src/protocols/yahoo/yahoo.c:2728 src/protocols/yahoo/yahoo.c:2754
+#: src/protocols/yahoo/yahoo.c:2692 src/protocols/yahoo/yahoo.c:2719
 msgid "Not on server list"
 msgstr "Not on server list"
 
-#: src/protocols/yahoo/yahoo.c:2833
+#: src/protocols/yahoo/yahoo.c:2742 src/protocols/yahoo/yahoo.c:2802
+#, fuzzy
+msgid "Appear Online"
+msgstr "Appear Offline"
+
+#: src/protocols/yahoo/yahoo.c:2745 src/protocols/yahoo/yahoo.c:2824
+#, fuzzy
+msgid "Appear Permanently Offline"
+msgstr "Appear Offline"
+
+#: src/protocols/yahoo/yahoo.c:2763
+#, fuzzy
+msgid "Stealth"
+msgstr "County/State"
+
+#: src/protocols/yahoo/yahoo.c:2818
+#, fuzzy
+msgid "Don't Appear Permanently Offline"
+msgstr "Appear Offline"
+
+#: src/protocols/yahoo/yahoo.c:2857
 msgid "Join in Chat"
 msgstr "Join in Chat"
 
-#: src/protocols/yahoo/yahoo.c:2838
+#: src/protocols/yahoo/yahoo.c:2862
 msgid "Initiate Conference"
 msgstr "Initiate Conference"
 
-#: src/protocols/yahoo/yahoo.c:2890
+#: src/protocols/yahoo/yahoo.c:2887
+msgid "Stealth Settings"
+msgstr ""
+
+#: src/protocols/yahoo/yahoo.c:2920
 msgid "Active which ID?"
 msgstr "Active which ID?"
 
-#: src/protocols/yahoo/yahoo.c:2899
+#: src/protocols/yahoo/yahoo.c:2929
 msgid "Join who in chat?"
 msgstr "Join who in chat?"
 
-#: src/protocols/yahoo/yahoo.c:2909
+#: src/protocols/yahoo/yahoo.c:2939
 msgid "Activate ID..."
 msgstr "Activate ID..."
 
-#: src/protocols/yahoo/yahoo.c:2913
+#: src/protocols/yahoo/yahoo.c:2943
 msgid "Join user in chat..."
 msgstr "Join user in chat..."
 
-#: src/protocols/yahoo/yahoo.c:3473
+#: src/protocols/yahoo/yahoo.c:3505
 #, fuzzy
 msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
 msgstr "join: &lt;room&gt; [server]:  Join a chat on this server."
 
-#: src/protocols/yahoo/yahoo.c:3477
+#: src/protocols/yahoo/yahoo.c:3509
 msgid "buzz: Buzz a contact to get their attention"
 msgstr ""
 
@@ -10485,72 +10814,69 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/yahoo/yahoo.c:3557 src/protocols/yahoo/yahoo.c:3559
+#: src/protocols/yahoo/yahoo.c:3588 src/protocols/yahoo/yahoo.c:3590
 msgid "Yahoo Protocol Plugin"
 msgstr "Yahoo Protocol Plugin"
 
-#: src/protocols/yahoo/yahoo.c:3578
+#: src/protocols/yahoo/yahoo.c:3609
 msgid "Yahoo Japan"
 msgstr "Yahoo Japan"
 
-#: src/protocols/yahoo/yahoo.c:3581
+#: src/protocols/yahoo/yahoo.c:3612
 msgid "Pager host"
 msgstr "Pager host"
 
-#: src/protocols/yahoo/yahoo.c:3584
+#: src/protocols/yahoo/yahoo.c:3615
 msgid "Japan Pager host"
 msgstr "Japan Pager host"
 
-#: src/protocols/yahoo/yahoo.c:3587
+#: src/protocols/yahoo/yahoo.c:3618
 msgid "Pager port"
 msgstr "Pager port"
 
-#: src/protocols/yahoo/yahoo.c:3590
+#: src/protocols/yahoo/yahoo.c:3621
 msgid "File transfer host"
 msgstr "File transfer host"
 
-#: src/protocols/yahoo/yahoo.c:3593
+#: src/protocols/yahoo/yahoo.c:3624
 msgid "Japan File transfer host"
 msgstr "Japan File transfer host"
 
-#: src/protocols/yahoo/yahoo.c:3596
+#: src/protocols/yahoo/yahoo.c:3627
 msgid "File transfer port"
 msgstr "File transfer port"
 
-#: src/protocols/yahoo/yahoo.c:3599
+#: src/protocols/yahoo/yahoo.c:3630
+#, fuzzy
+msgid "Chat Room Locale"
+msgstr "Chat Room List Url"
+
+#: src/protocols/yahoo/yahoo.c:3633
 msgid "Chat Room List Url"
 msgstr "Chat Room List Url"
 
-#: src/protocols/yahoo/yahoo.c:3602
+#: src/protocols/yahoo/yahoo.c:3636
 msgid "YCHT Host"
 msgstr "YCHT Host"
 
-#: src/protocols/yahoo/yahoo.c:3605
+#: src/protocols/yahoo/yahoo.c:3639
 msgid "YCHT Port"
 msgstr "YCHT Port"
 
-#: src/protocols/yahoo/yahoo_filexfer.c:170
-msgid ""
-"Gaim cannot send files over Yahoo! that are bigger than One Megabyte "
-"(1,048,576 bytes)."
-msgstr ""
-"Gaim cannot send files over Yahoo! that are bigger than One Megabyte "
-"(1,048,576 bytes)."
-
 #: src/protocols/yahoo/yahoo_profile.c:677
 #, c-format
 msgid "<b>IP Address:</b> %s<br>"
 msgstr "<b>IP Address:</b> %s<br>"
 
-#: src/protocols/yahoo/yahoo_profile.c:751
+#: src/protocols/yahoo/yahoo_profile.c:753
 msgid "Yahoo! Japan Profile"
 msgstr "Yahoo! Japan Profile"
 
-#: src/protocols/yahoo/yahoo_profile.c:752
+#: src/protocols/yahoo/yahoo_profile.c:754
 msgid "Yahoo! Profile"
 msgstr "Yahoo! Profile"
 
-#: src/protocols/yahoo/yahoo_profile.c:796
+#: src/protocols/yahoo/yahoo_profile.c:798
 msgid ""
 "Sorry, profiles marked as containing adult content are not supported at this "
 "time."
@@ -10558,7 +10884,7 @@
 "Sorry, profiles marked as containing adult content are not supported at this "
 "time."
 
-#: src/protocols/yahoo/yahoo_profile.c:798
+#: src/protocols/yahoo/yahoo_profile.c:800
 msgid ""
 "If you wish to view this profile, you will need to visit this link in your "
 "web browser"
@@ -10566,43 +10892,48 @@
 "If you wish to view this profile, you will need to visit this link in your "
 "web browser"
 
-#: src/protocols/yahoo/yahoo_profile.c:971
+#: src/protocols/yahoo/yahoo_profile.c:978
 msgid "Yahoo! ID"
 msgstr "Yahoo! ID"
 
-#: src/protocols/yahoo/yahoo_profile.c:1045
-#: src/protocols/yahoo/yahoo_profile.c:1049
-#: src/protocols/yahoo/yahoo_profile.c:1053
+#: src/protocols/yahoo/yahoo_profile.c:1052
+#: src/protocols/yahoo/yahoo_profile.c:1056
+#: src/protocols/yahoo/yahoo_profile.c:1060
 msgid "Hobbies"
 msgstr "Hobbies"
 
-#: src/protocols/yahoo/yahoo_profile.c:1063
-#: src/protocols/yahoo/yahoo_profile.c:1067
+#: src/protocols/yahoo/yahoo_profile.c:1070
+#: src/protocols/yahoo/yahoo_profile.c:1074
 msgid "Latest News"
 msgstr "Latest News"
 
-#: src/protocols/yahoo/yahoo_profile.c:1088
+#: src/protocols/yahoo/yahoo_profile.c:1095
 msgid "Home Page"
 msgstr "Home Page"
 
-#: src/protocols/yahoo/yahoo_profile.c:1103
+#: src/protocols/yahoo/yahoo_profile.c:1110
 msgid "Cool Link 1"
 msgstr "Cool Link 1"
 
-#: src/protocols/yahoo/yahoo_profile.c:1108
+#: src/protocols/yahoo/yahoo_profile.c:1115
 msgid "Cool Link 2"
 msgstr "Cool Link 2"
 
-#: src/protocols/yahoo/yahoo_profile.c:1112
+#: src/protocols/yahoo/yahoo_profile.c:1119
 msgid "Cool Link 3"
 msgstr "Cool Link 3"
 
 #: src/protocols/yahoo/yahoo_profile.c:1132
+#, fuzzy
+msgid "Last Update"
+msgstr "Last Updated"
+
+#: src/protocols/yahoo/yahoo_profile.c:1138
 #, c-format
 msgid "User information for %s unavailable"
 msgstr "User information for %s unavailable"
 
-#: src/protocols/yahoo/yahoo_profile.c:1138
+#: src/protocols/yahoo/yahoo_profile.c:1144
 msgid ""
 "Sorry, this profile seems to be in a language that is not supported at this "
 "time."
@@ -10610,7 +10941,7 @@
 "Sorry, this profile seems to be in a language that is not supported at this "
 "time."
 
-#: src/protocols/yahoo/yahoo_profile.c:1154
+#: src/protocols/yahoo/yahoo_profile.c:1160
 msgid ""
 "Could not retrieve the user's profile. This most likely is a temporary "
 "server-side problem. Please try again later."
@@ -10618,7 +10949,7 @@
 "Could not retrieve the user's profile. This most likely is a temporary "
 "server-side problem. Please try again later."
 
-#: src/protocols/yahoo/yahoo_profile.c:1157
+#: src/protocols/yahoo/yahoo_profile.c:1163
 msgid ""
 "Could not retrieve the user's profile. This most likely means that the user "
 "does not exist; however, Yahoo! sometimes does fail to find a user's "
@@ -10628,69 +10959,65 @@
 "does not exist; however, Yahoo! sometimes does fail to find a user's "
 "profile. If you know that the user exists, please try again later."
 
-#: src/protocols/yahoo/yahoo_profile.c:1165
+#: src/protocols/yahoo/yahoo_profile.c:1171
 msgid "The user's profile is empty."
 msgstr "The user's profile is empty."
 
-#: src/protocols/yahoo/yahoochat.c:193
+#: src/protocols/yahoo/yahoochat.c:203
 #, c-format
 msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
 msgstr "%s declined your conference invitation to room \"%s\" because \"%s\"."
 
-#: src/protocols/yahoo/yahoochat.c:195
+#: src/protocols/yahoo/yahoochat.c:205
 msgid "Invitation Rejected"
 msgstr "Invitation Rejected"
 
-#: src/protocols/yahoo/yahoochat.c:347
+#: src/protocols/yahoo/yahoochat.c:360
 msgid "Failed to join chat"
 msgstr "Failed to join chat"
 
-#: src/protocols/yahoo/yahoochat.c:347
+#: src/protocols/yahoo/yahoochat.c:360
 msgid "Maybe the room is full?"
 msgstr "Perhaps the room is full?"
 
-#: src/protocols/yahoo/yahoochat.c:425
+#: src/protocols/yahoo/yahoochat.c:438
 #, c-format
 msgid "You are now chatting in %s."
 msgstr "You are now chatting in %s."
 
-#: src/protocols/yahoo/yahoochat.c:579
+#: src/protocols/yahoo/yahoochat.c:613
 msgid "Failed to join buddy in chat"
 msgstr "Failed to join buddy in chat"
 
-#: src/protocols/yahoo/yahoochat.c:580
+#: src/protocols/yahoo/yahoochat.c:614
 msgid "Maybe they're not in a chat?"
 msgstr "Perhaps they're not in a chat?"
 
-#: src/protocols/yahoo/yahoochat.c:1356
-msgid "Unable to connect"
-msgstr "Unable to connect"
-
-#: src/protocols/yahoo/yahoochat.c:1356
+#: src/protocols/yahoo/yahoochat.c:1350
 msgid "Fetching the room list failed."
 msgstr "Fetching the room list failed."
 
-#: src/protocols/yahoo/yahoochat.c:1401
+#: src/protocols/yahoo/yahoochat.c:1403
 msgid "Voices"
 msgstr "Voices"
 
-#: src/protocols/yahoo/yahoochat.c:1404
+#: src/protocols/yahoo/yahoochat.c:1406
 msgid "Webcams"
 msgstr "Webcams"
 
-#: src/protocols/yahoo/yahoochat.c:1415 src/protocols/yahoo/yahoochat.c:1476
+#: src/protocols/yahoo/yahoochat.c:1417 src/protocols/yahoo/yahoochat.c:1484
 msgid "Unable to fetch room list."
 msgstr "Unable to fetch room list."
 
-#: src/protocols/yahoo/yahoochat.c:1469
+#: src/protocols/yahoo/yahoochat.c:1477
 msgid "User Rooms"
 msgstr "User Rooms"
 
-#: src/protocols/yahoo/ycht.c:401
+#: src/protocols/yahoo/ycht.c:402
 msgid "Connection problem with the YCHT server."
 msgstr "Connection problem with the YCHT server."
 
-#: src/protocols/zephyr/zephyr.c:329
+#: src/protocols/zephyr/zephyr.c:331
 #, fuzzy
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
@@ -10699,78 +11026,78 @@
 "(There was an error converting this message.  Check the 'Encoding' option in "
 "the Account Editor)"
 
-#: src/protocols/zephyr/zephyr.c:677
-#, c-format
-msgid "Unable send to chat %s,%s,%s"
+#: src/protocols/zephyr/zephyr.c:686
+#, fuzzy, c-format
+msgid "Unable to send to chat %s,%s,%s"
 msgstr "Unable send to chat %s,%s,%s"
 
-#: src/protocols/zephyr/zephyr.c:710 src/protocols/zephyr/zephyr.c:1124
+#: src/protocols/zephyr/zephyr.c:719 src/protocols/zephyr/zephyr.c:1133
 #, c-format
 msgid "<b>User:</b> %s<br>"
 msgstr "<b>User:</b> %s<br>"
 
-#: src/protocols/zephyr/zephyr.c:714 src/protocols/zephyr/zephyr.c:1129
+#: src/protocols/zephyr/zephyr.c:723 src/protocols/zephyr/zephyr.c:1138
 msgid "<br>Hidden or not logged-in"
 msgstr "<br>Hidden or not logged-in"
 
-#: src/protocols/zephyr/zephyr.c:719 src/protocols/zephyr/zephyr.c:1131
+#: src/protocols/zephyr/zephyr.c:728 src/protocols/zephyr/zephyr.c:1140
 #, c-format
 msgid "<br>At %s since %s"
 msgstr "<br>At %s since %s"
 
-#: src/protocols/zephyr/zephyr.c:1420 src/protocols/zephyr/zephyr.c:1421
+#: src/protocols/zephyr/zephyr.c:1471 src/protocols/zephyr/zephyr.c:1472
 msgid "Anyone"
 msgstr "Anyone"
 
-#: src/protocols/zephyr/zephyr.c:2239
+#: src/protocols/zephyr/zephyr.c:2273
 msgid "_Class:"
 msgstr "_Class:"
 
-#: src/protocols/zephyr/zephyr.c:2245
+#: src/protocols/zephyr/zephyr.c:2279
 msgid "_Instance:"
 msgstr "_Instance:"
 
-#: src/protocols/zephyr/zephyr.c:2251
+#: src/protocols/zephyr/zephyr.c:2285
 msgid "_Recipient:"
 msgstr "_Recipient:"
 
-#: src/protocols/zephyr/zephyr.c:2262
+#: src/protocols/zephyr/zephyr.c:2296
 #, c-format
 msgid "Attempt to subscribe to %s,%s,%s failed"
 msgstr "Attempt to subscribe to %s,%s,%s failed"
 
-#: src/protocols/zephyr/zephyr.c:2568
+#: src/protocols/zephyr/zephyr.c:2602
 msgid "zlocate &lt;nick&gt;: Locate user"
 msgstr "zlocate &lt;nick&gt;: Locate user"
 
-#: src/protocols/zephyr/zephyr.c:2573
+#: src/protocols/zephyr/zephyr.c:2607
 msgid "zl &lt;nick&gt;: Locate user"
 msgstr "zl &lt;nick&gt;: Locate user"
 
-#: src/protocols/zephyr/zephyr.c:2578
+#: src/protocols/zephyr/zephyr.c:2612
 msgid "instance &lt;instance&gt;: Set the instance to be used on this class"
 msgstr "instance &lt;instance&gt;: Set the instance to be used on this class"
 
-#: src/protocols/zephyr/zephyr.c:2583
+#: src/protocols/zephyr/zephyr.c:2617
 msgid "inst &lt;instance&gt;: Set the instance to be used on this class"
 msgstr "inst &lt;instance&gt;: Set the instance to be used on this class"
 
-#: src/protocols/zephyr/zephyr.c:2588
+#: src/protocols/zephyr/zephyr.c:2622
 #, fuzzy
 msgid "topic &lt;instance&gt;: Set the instance to be used on this class"
 msgstr "inst &lt;instance&gt;: Set the instance to be used on this class"
 
-#: src/protocols/zephyr/zephyr.c:2594
+#: src/protocols/zephyr/zephyr.c:2628
 msgid "sub &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Join a new chat"
 msgstr "sub &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Join a new chat"
 
-#: src/protocols/zephyr/zephyr.c:2599
+#: src/protocols/zephyr/zephyr.c:2633
 msgid ""
 "zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
 msgstr ""
 "zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
 
-#: src/protocols/zephyr/zephyr.c:2605
+#: src/protocols/zephyr/zephyr.c:2639
 msgid ""
 "zci &lt;class&gt; &lt;instance&gt;: Send a message to &lt;<i>class</i>,"
 "<i>instance</i>,*&gt;"
@@ -10778,7 +11105,7 @@
 "zci &lt;class&gt; &lt;instance&gt;: Send a message to &lt;<i>class</i>,"
 "<i>instance</i>,*&gt;"
 
-#: src/protocols/zephyr/zephyr.c:2611
+#: src/protocols/zephyr/zephyr.c:2645
 msgid ""
 "zcir &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;"
 "<i>class</i>,<i>instance</i>,<i>recipient</i>&gt;"
@@ -10786,7 +11113,7 @@
 "zcir &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;"
 "<i>class</i>,<i>instance</i>,<i>recipient</i>&gt;"
 
-#: src/protocols/zephyr/zephyr.c:2617
+#: src/protocols/zephyr/zephyr.c:2651
 msgid ""
 "zir &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;MESSAGE,"
 "<i>instance</i>,<i>recipient</i>&gt;"
@@ -10794,15 +11121,15 @@
 "zir &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;MESSAGE,"
 "<i>instance</i>,<i>recipient</i>&gt;"
 
-#: src/protocols/zephyr/zephyr.c:2622
+#: src/protocols/zephyr/zephyr.c:2656
 msgid "zc &lt;class&gt;: Send a message to &lt;<i>class</i>,PERSONAL,*&gt;"
 msgstr "zc &lt;class&gt;: Send a message to &lt;<i>class</i>,PERSONAL,*&gt;"
 
-#: src/protocols/zephyr/zephyr.c:2728
+#: src/protocols/zephyr/zephyr.c:2762
 msgid "Resubscribe"
 msgstr "Resubscribe"
 
-#: src/protocols/zephyr/zephyr.c:2731
+#: src/protocols/zephyr/zephyr.c:2765
 msgid "Retrieve subscriptions from server"
 msgstr "Retrieve subscriptions from server"
 
@@ -10816,54 +11143,54 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/zephyr/zephyr.c:2814 src/protocols/zephyr/zephyr.c:2816
+#: src/protocols/zephyr/zephyr.c:2847 src/protocols/zephyr/zephyr.c:2849
 msgid "Zephyr Protocol Plugin"
 msgstr "Zephyr Protocol Plugin"
 
-#: src/protocols/zephyr/zephyr.c:2841
+#: src/protocols/zephyr/zephyr.c:2874
 msgid "Export to .anyone"
 msgstr "Export to .anyone"
 
-#: src/protocols/zephyr/zephyr.c:2844
+#: src/protocols/zephyr/zephyr.c:2877
 msgid "Export to .zephyr.subs"
 msgstr "Export to .zephyr.subs"
 
-#: src/protocols/zephyr/zephyr.c:2847
+#: src/protocols/zephyr/zephyr.c:2880
 #, fuzzy
 msgid "Import from .anyone"
 msgstr "Export to .anyone"
 
-#: src/protocols/zephyr/zephyr.c:2850
+#: src/protocols/zephyr/zephyr.c:2883
 #, fuzzy
 msgid "Import from .zephyr.subs"
 msgstr "Export to .zephyr.subs"
 
-#: src/protocols/zephyr/zephyr.c:2853
+#: src/protocols/zephyr/zephyr.c:2886
 #, fuzzy
 msgid "Realm"
 msgstr "Realname"
 
-#: src/protocols/zephyr/zephyr.c:2856
+#: src/protocols/zephyr/zephyr.c:2889
 msgid "Exposure"
 msgstr "Exposure"
 
 #. XXX: why in the hell are we calling gaim_connection_error() here?
 #. Forbidden
-#: src/proxy.c:953
+#: src/proxy.c:1038
 #, c-format
 msgid "Access denied: proxy server forbids port %d tunnelling."
 msgstr "Access denied: proxy server forbids port %d tunnelling."
 
-#: src/proxy.c:957
+#: src/proxy.c:1042
 #, c-format
 msgid "Proxy connection error %d"
 msgstr "Proxy connection error %d"
 
-#: src/proxy.c:1612
+#: src/proxy.c:1876
 msgid "Invalid proxy settings"
 msgstr "Invalid proxy settings"
 
-#: src/proxy.c:1612
+#: src/proxy.c:1876
 msgid ""
 "Either the host name or port number specified for your given proxy type is "
 "invalid."
@@ -10874,104 +11201,551 @@
 #. *
 #. * A wrapper for gaim_request_action() that uses Accept and Cancel buttons.
 #.
-#: src/request.h:1254
+#: src/request.h:1276
 msgid "Accept"
 msgstr "Accept"
 
-#: src/server.c:62
-msgid "Please enter your password"
-msgstr "Please enter your password"
-
-#: src/server.c:471
+#: src/server.c:351
 #, c-format
 msgid "%s is now known as %s.\n"
 msgstr "%s is now known as %s.\n"
 
-#: src/server.c:895
+#: src/server.c:733
 #, c-format
 msgid "(%d message)"
 msgid_plural "(%d messages)"
 msgstr[0] "(%d message)"
 msgstr[1] "(%d messages)"
 
-#: src/server.c:909
+#: src/server.c:747
 msgid "(1 message)"
 msgstr "(1 message)"
 
-#: src/server.c:1164
+#: src/server.c:1008
 #, fuzzy, c-format
 msgid ""
 "%s has invited %s to the chat room %s:\n"
-"<b>%s</b>"
-msgstr ""
-"User '%s' invites %s to buddy chat room: '%s'\n"
 "%s"
-
-#: src/server.c:1168
+msgstr "User '%s' invites %s to buddy chat room: '%s'\n"
+
+#: src/server.c:1013
 #, fuzzy, c-format
 msgid "%s has invited %s to the chat room %s\n"
 msgstr "User '%s' invites %s to buddy chat room: '%s'\n"
 
-#: src/server.c:1174
+#: src/server.c:1017
 msgid "Accept chat invitation?"
 msgstr "Accept chat invitation?"
 
-#: src/status.c:553
+#: src/status.c:153
+#, fuzzy
+msgid "Unset"
+msgstr "_Use"
+
+#: src/status.c:626
 #, c-format
 msgid "%s came back"
 msgstr "%s came back"
 
-#: src/status.c:558
+#: src/status.c:631
 #, c-format
 msgid "%s went away"
 msgstr "%s went away."
 
-#: src/status.c:1269
+#: src/status.c:1314
 #, c-format
 msgid "%s became idle"
 msgstr "%s became idle"
 
-#: src/status.c:1285
+#: src/status.c:1330
 #, c-format
 msgid "%s became unidle"
 msgstr "%s is no longer idle"
 
-#: src/util.c:2354
+#: src/util.c:2120
+#, fuzzy, c-format
+msgid "Error Reading %s"
+msgstr ""
+"Error reading %s: \n"
+"%s.\n"
+
+#: src/util.c:2121
+#, fuzzy, c-format
+msgid ""
+"An error was encountered reading your %s.  They have not been loaded, and "
+"the old file been renamed to %s~."
+msgstr ""
+"An error was encountered parsing your buddy list.  It has not been loaded, "
+"and the old file has been moved to blist.xml~."
+
+#: src/util.c:2558
 msgid "Calculating..."
 msgstr "Calculating..."
 
-#: src/util.c:2357
+#: src/util.c:2561
 msgid "Unknown."
 msgstr "Unknown."
 
-#: src/util.c:2387
+#: src/util.c:2591
 msgid "second"
 msgid_plural "seconds"
 msgstr[0] "second"
 msgstr[1] "seconds"
 
-#: src/util.c:2401
+#: src/util.c:2605
 msgid "day"
 msgid_plural "days"
 msgstr[0] "day"
 msgstr[1] "days"
 
-#: src/util.c:2409
+#: src/util.c:2613
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "hour"
 msgstr[1] "hours"
 
-#: src/util.c:2417
+#: src/util.c:2621
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minute"
 msgstr[1] "minutes"
 
-#: src/util.c:2834
+#: src/util.c:3041
 msgid "g003: Error opening connection.\n"
 msgstr "g003: Error opening connection.\n"
 
+#~ msgid "Mail Server"
+#~ msgstr "Mail Server"
+
+#~ msgid "%s (%d new/%d total)"
+#~ msgstr "%s (%d new/%d total)"
+
+#~ msgid "Check Mail"
+#~ msgstr "Check Mail"
+
+#~ msgid "Check email every X seconds.\n"
+#~ msgstr "Check email every X seconds.\n"
+
+#~ msgid "Auto-login"
+#~ msgstr "Auto-login"
+
+#, fuzzy
+#~ msgid "Log Out"
+#~ msgstr "Logged out"
+
+#~ msgid ""
+#~ "When a new conversation is opened this plugin will insert the last "
+#~ "conversation into the current conversation."
+#~ msgstr ""
+#~ "When a new conversation is opened this plugin will insert the last "
+#~ "conversation into the current conversation."
+
+#~ msgid "Docked _Buddy List is always on top"
+#~ msgstr "Docked _Buddy List is always on top"
+
+#~ msgid "Buddy List Error"
+#~ msgstr "Buddy List Error"
+
+#, fuzzy
+#~ msgid "Unable to send messge to %s."
+#~ msgstr "Unable to send message to %s:"
+
+#, fuzzy
+#~ msgid "Auto log in"
+#~ msgstr "Auto-login"
+
+#~ msgid "Show fewer options"
+#~ msgstr "Show fewer options"
+
+#, fuzzy
+#~ msgid "Auto Log In"
+#~ msgstr "Auto-login"
+
+#~ msgid "Information"
+#~ msgstr "Information"
+
+#, fuzzy
+#~ msgid "/Buddies/_Log Out"
+#~ msgstr "/Buddies/_Quit"
+
+#~ msgid "/Tools/_Away"
+#~ msgstr "/Tools/_Away"
+
+#~ msgid "Rename Group"
+#~ msgstr "Rename Group"
+
+#~ msgid "New group name"
+#~ msgstr "New group name"
+
+#~ msgid "Please enter a new name for the selected group."
+#~ msgstr "Please enter a new name for the selected group."
+
+#~ msgid "%d%%"
+#~ msgstr "%d%%"
+
+#~ msgid ""
+#~ "\n"
+#~ "<b>Account:</b>"
+#~ msgstr ""
+#~ "\n"
+#~ "<b>Account:</b>"
+
+#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "<b>Idle</b>"
+#~ msgstr ""
+#~ "\n"
+#~ "<b>Idle:</b>"
+
+#~ msgid ""
+#~ "\n"
+#~ "<b>Warned:</b>"
+#~ msgstr ""
+#~ "\n"
+#~ "<b>Warned:</b>"
+
+#~ msgid "Warned (%d%%) "
+#~ msgstr "Warned (%d%%) "
+
+#~ msgid "/Tools/Away"
+#~ msgstr "/Tools/Away"
+
+#~ msgid "Done."
+#~ msgstr "Done."
+
+#, fuzzy
+#~ msgid "Logging in: "
+#~ msgstr "Logging in"
+
+#, fuzzy
+#~ msgid "Logging In"
+#~ msgstr "Logging in"
+
+#~ msgid "Cancel All"
+#~ msgstr "Cancel All"
+
+#~ msgid "/Conversation/_Warn..."
+#~ msgstr "/Conversation/_Warn..."
+
+#~ msgid "/Conversation/Warn..."
+#~ msgstr "/Conversation/Warn..."
+
+#~ msgid "Block the user"
+#~ msgstr "Block the user"
+
+#~ msgid "Send a file to the user"
+#~ msgstr "Send a file to the user"
+
+#~ msgid "Add the user to your buddy list"
+#~ msgstr "Add the user to your buddy list"
+
+#~ msgid "Remove the user from your buddy list"
+#~ msgstr "Remove the user from your buddy list"
+
+#~ msgid "Send"
+#~ msgstr "Send"
+
+#~ msgid "Send message"
+#~ msgstr "Send message"
+
+#~ msgid "Invite"
+#~ msgstr "Invite"
+
+#~ msgid "Invite a user"
+#~ msgstr "Invite a user"
+
+#~ msgid "Add the chat to your buddy list"
+#~ msgstr "Add the chat to your buddy list"
+
+#~ msgid "Remove the chat from your buddy list"
+#~ msgstr "Remove the chat from your buddy list"
+
+#~ msgid "<main>/Conversation/Close"
+#~ msgstr "<main>/Conversation/Close"
+
+#~ msgid "former lead developer"
+#~ msgstr "former lead developer"
+
+#~ msgid "former maintainer"
+#~ msgstr "former maintainer"
+
+#~ msgid "Chinese"
+#~ msgstr "Chinese"
+
+#~ msgid "_Screen name"
+#~ msgstr "_Screen name"
+
+#~ msgid "Warn User"
+#~ msgstr "Warn User"
+
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">Warn %s?</span>\n"
+#~ "\n"
+#~ "This will increase %s's warning level and he or she will be subject to "
+#~ "harsher rate limiting.\n"
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">Warn %s?</span>\n"
+#~ "\n"
+#~ "This will increase %s's warning level and he or she will be subject to "
+#~ "harsher rate limiting.\n"
+
+#~ msgid "Warn _anonymously?"
+#~ msgstr "Warn _anonymously?"
+
+#~ msgid "<b>Anonymous warnings are less severe.</b>"
+#~ msgstr "<b>Anonymous warnings are less severe.</b>"
+
+#~ msgid ""
+#~ "Unable to guess the image type based on the file extension supplied.  "
+#~ "Defaulting to PNG."
+#~ msgstr ""
+#~ "Unable to guess the image type based on the file extension supplied.  "
+#~ "Defaulting to PNG."
+
+#~ msgid "Please create an account."
+#~ msgstr "Please create an account."
+
+#~ msgid "Login"
+#~ msgstr "Login"
+
+#~ msgid "<b>_Account:</b>"
+#~ msgstr "<b>_Account:</b>"
+
+#~ msgid "<b>_Password:</b>"
+#~ msgstr "<b>_Password:</b>"
+
+#, fuzzy
+#~ msgid "A_ccounts"
+#~ msgstr "Accounts"
+
+#, fuzzy
+#~ msgid "P_references"
+#~ msgstr "Preferences"
+
+#, fuzzy
+#~ msgid "_Log in"
+#~ msgstr "Login"
+
+#~ msgid ""
+#~ "Gaim %s\n"
+#~ "Usage: %s [OPTION]...\n"
+#~ "\n"
+#~ "  -a, --acct          display account editor window\n"
+#~ "  -w, --away[=MESG]   make away on signon (optional argument MESG "
+#~ "specifies\n"
+#~ "                      name of away message to use)\n"
+#~ "  -l, --login[=NAME]  automatically login (optional argument NAME "
+#~ "specifies\n"
+#~ "                      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"
+#~ "  -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 ""
+#~ "Gaim %s\n"
+#~ "Usage: %s [OPTION]...\n"
+#~ "\n"
+#~ "  -a, --acct          display account editor window\n"
+#~ "  -w, --away[=MESG]   make away on signon (optional argument MESG "
+#~ "specifies\n"
+#~ "                      name of away message to use)\n"
+#~ "  -l, --login[=NAME]  automatically login (optional argument NAME "
+#~ "specifies\n"
+#~ "                      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"
+#~ "  -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"
+
+#~ msgid "Unable to load preferences"
+#~ msgstr "Unable to load preferences"
+
+#~ msgid ""
+#~ "Gaim was not able to load your preferences because they are stored in an "
+#~ "old format that is no longer used.  Please reconfigure your settings "
+#~ "using the Preferences window."
+#~ msgstr ""
+#~ "Gaim was not able to load your preferences because they are stored in an "
+#~ "old format that is no longer used.  Please reconfigure your settings "
+#~ "using the Preferences window."
+
+#~ msgid "D_isplay remote nicknames if no alias is set"
+#~ msgstr "D_isplay remote nicknames if no alias is set"
+
+#~ msgid "Display"
+#~ msgstr "Display"
+
+#~ msgid "Show _timestamp on messages"
+#~ msgstr "Show _timestamp on messages"
+
+#~ msgid "Ignore c_olors"
+#~ msgstr "Ignore c_olours"
+
+#~ msgid "Ignore font _faces"
+#~ msgstr "Ignore font _faces"
+
+#~ msgid "Ignore font si_zes"
+#~ msgstr "Ignore font si_zes"
+
+#~ msgid "Default Formatting"
+#~ msgstr "Default Formatting"
+
+#~ msgid "_Send default formatting with outgoing messages"
+#~ msgstr "_Send default formatting with outgoing messages"
+
+#~ msgid "Window Closing"
+#~ msgstr "Window Closing"
+
+#~ msgid "_Escape closes window"
+#~ msgstr "_Escape closes window"
+
+#~ msgid "Show _warning levels"
+#~ msgstr "Show _warning levels"
+
+#~ msgid "Show idle _times"
+#~ msgstr "Show idle _times"
+
+#~ msgid "_Automatically expand contacts"
+#~ msgstr "_Automatically expand contacts"
+
+#~ msgid "Show _buttons as:"
+#~ msgstr "Show _buttons as:"
+
+#~ msgid "Pictures"
+#~ msgstr "Pictures"
+
+#~ msgid "Text"
+#~ msgstr "Text"
+
+#~ msgid "Pictures and text"
+#~ msgstr "Pictures and text"
+
+#~ msgid "Enable \"_slash\" commands"
+#~ msgstr "Enable \"_slash\" commands"
+
+#~ msgid "Show _aliases in tabs/titles"
+#~ msgstr "Show _aliases in tabs/titles"
+
+#~ msgid "_Raise IM window on events"
+#~ msgstr "_Raise IM window on events"
+
+#~ msgid "Raise chat _window on events"
+#~ msgstr "Raise chat _window on events"
+
+#~ msgid "Tab p_lacement:"
+#~ msgstr "Tab P_lacement:"
+
+#~ msgid "New conversation _placement:"
+#~ msgstr "New conversation _placement:"
+
+#~ msgid "Interface"
+#~ msgstr "Interface"
+
+#~ msgid "Message Text"
+#~ msgstr "Message Text"
+
+#~ msgid "Shortcuts"
+#~ msgstr "Shortcuts"
+
+#, fuzzy
+#~ msgid "Logging in: %s"
+#~ msgstr "Logging in"
+
+#~ msgid "Hide Operating System"
+#~ msgstr "Hide Operating System"
+
+#~ msgid "The user %s wants to add you to their buddy list."
+#~ msgstr "The user %s wants to add you to their buddy list."
+
+#~ msgid "Miscellaneous error"
+#~ msgstr "Miscellaneous error"
+
+#~ msgid "Initiate Chat"
+#~ msgstr "Initiate Chat"
+
+#~ msgid "Display conversation closed notices"
+#~ msgstr "Display conversation closed notices"
+
+#~ msgid "Display timeout notices"
+#~ msgstr "Display timeout notices"
+
+#~ msgid "Unable to connect to server"
+#~ msgstr "Unable to connect to server"
+
+#~ msgid "Unknown error when attempting to authorize with MSN login server."
+#~ msgstr "Unknown error when attempting to authorise with MSN login server."
+
+#~ msgid "Requesting to send password"
+#~ msgstr "Requesting to send password"
+
+#~ msgid "Unable to connect to %s server"
+#~ msgstr "Unable to connect to %s server"
+
+#~ msgid "Error writing to %s server"
+#~ msgstr "Error writing to %s server"
+
+#~ msgid "Error reading from %s server"
+#~ msgstr "Error reading from %s server"
+
+#~ msgid "Received HTTP error. Please report this."
+#~ msgstr "Received HTTP error. Please report this."
+
+#~ msgid "The conversation has become inactive and timed out."
+#~ msgstr "The conversation has become inactive and timed out."
+
+#~ msgid ""
+#~ "You were disconnected from the server, because you logged on from a "
+#~ "different location"
+#~ msgstr ""
+#~ "You were disconnected from the server, because you logged on from a "
+#~ "different location"
+
+#~ msgid ""
+#~ "You have been disconnected because you have signed on with this screen "
+#~ "name at another location."
+#~ msgstr ""
+#~ "You have been disconnected because you have signed on with this screen "
+#~ "name at another location."
+
+#~ msgid "Default SILC Key Pair"
+#~ msgstr "Default SILC Key Pair"
+
+#~ msgid "SILC Public Key"
+#~ msgstr "SILC Public Key"
+
+#~ msgid "SILC Private Key"
+#~ msgstr "SILC Private Key"
+
+#~ msgid ""
+#~ "You have been logged off as you have logged in on a different machine or "
+#~ "device."
+#~ msgstr ""
+#~ "You have been logged off as you have logged in on a different machine or "
+#~ "device."
+
+#~ msgid ""
+#~ "Gaim cannot send files over Yahoo! that are bigger than One Megabyte "
+#~ "(1,048,576 bytes)."
+#~ msgstr ""
+#~ "Gaim cannot send files over Yahoo! that are bigger than One Megabyte "
+#~ "(1,048,576 bytes)."
+
+#~ msgid "Please enter your password"
+#~ msgstr "Please enter your password"
+
+#, fuzzy
+#~ msgid ""
+#~ "%s has invited %s to the chat room %s:\n"
+#~ "<b>%s</b>"
+#~ msgstr ""
+#~ "User '%s' invites %s to buddy chat room: '%s'\n"
+#~ "%s"
+
 #~ msgid "Restore Away State On Reconnect"
 #~ msgstr "Restore Away State On Reconnect"
 
@@ -11022,9 +11796,6 @@
 #~ msgid "Sa_ve & Use"
 #~ msgstr "Sa_ve & Use"
 
-#~ msgid "_Use"
-#~ msgstr "_Use"
-
 #~ msgid "/Buddies/_Signoff"
 #~ msgstr "/Buddies/_Signoff"
 
@@ -11154,12 +11925,6 @@
 #~ msgid "Set Available Message..."
 #~ msgstr "Set Available Message..."
 
-#~ msgid "Roomlist"
-#~ msgstr "Room List"
-
-#~ msgid "Cannot get room list"
-#~ msgstr "Cannot get room list"
-
 #~ msgid "Failed to leave channel"
 #~ msgstr "Failed to leave channel"