changeset 9524:533c99c79c44

[gaim-migrate @ 10351] 2 updates committer: Tailor Script <tailor@pidgin.im>
author Luke Schierer <lschiere@pidgin.im>
date Tue, 13 Jul 2004 21:00:58 +0000
parents be96293982d2
children a3be930b7fad
files po/ChangeLog po/en_GB.po po/es.po
diffstat 3 files changed, 3807 insertions(+), 3233 deletions(-) [+]
line wrap: on
line diff
--- a/po/ChangeLog	Tue Jul 13 12:07:53 2004 +0000
+++ b/po/ChangeLog	Tue Jul 13 21:00:58 2004 +0000
@@ -1,6 +1,7 @@
 Gaim: The Pimpin' Penguin IM Clone that's good for the soul!
 
 version 0.80cvs:
+	* English (British) translation updated (Luke Ross (lukeross))
 	* English (Canadian) translation updated (Adam Weinberger)
 	* Japanese translation updated (Takeshi Aihana)
 	* Lithuanian translation added (Gediminas ¿i¿inskas)
--- a/po/en_GB.po	Tue Jul 13 12:07:53 2004 +0000
+++ b/po/en_GB.po	Tue Jul 13 21:00:58 2004 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: Gaim 0.73\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-06-22 12:44+0100\n"
+"POT-Creation-Date: 2004-07-13 15:04+0100\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"
@@ -146,7 +146,7 @@
 msgid "Gaim - Away"
 msgstr "Gaim - Away"
 
-#: plugins/docklet/docklet.c:114 src/gtkaccount.c:643 src/gtkaccount.c:2065
+#: plugins/docklet/docklet.c:114 src/gtkaccount.c:727 src/gtkaccount.c:2152
 msgid "Auto-login"
 msgstr "Auto-login"
 
@@ -162,13 +162,13 @@
 msgid "New..."
 msgstr "New..."
 
-#: plugins/docklet/docklet.c:153 src/gtkprefs.c:1796 src/protocols/gg/gg.c:51
-#: src/protocols/irc/msgs.c:187 src/protocols/jabber/jabber.c:959
+#: plugins/docklet/docklet.c:153 src/gtkprefs.c:1809 src/protocols/gg/gg.c:51
+#: src/protocols/irc/msgs.c:187 src/protocols/jabber/jabber.c:960
 #: src/protocols/jabber/jutil.c:32 src/protocols/jabber/presence.c:63
-#: src/protocols/jabber/presence.c:119 src/protocols/novell/novell.c:2718
-#: src/protocols/novell/novell.c:2835 src/protocols/novell/novell.c:2887
-#: src/protocols/oscar/oscar.c:528 src/protocols/oscar/oscar.c:5465
-#: src/protocols/oscar/oscar.c:6463 src/protocols/oscar/oscar.c:6662
+#: src/protocols/jabber/presence.c:119 src/protocols/novell/novell.c:2724
+#: src/protocols/novell/novell.c:2841 src/protocols/novell/novell.c:2893
+#: src/protocols/oscar/oscar.c:532 src/protocols/oscar/oscar.c:5481
+#: src/protocols/oscar/oscar.c:6480 src/protocols/oscar/oscar.c:6679
 #: src/protocols/silc/buddy.c:1379 src/protocols/silc/silc.c:46
 #: src/protocols/silc/silc.c:76
 msgid "Away"
@@ -176,7 +176,7 @@
 
 #. else...
 #: plugins/docklet/docklet.c:159 src/away.c:550
-#: src/protocols/oscar/oscar.c:5383 src/protocols/oscar/oscar.c:6670
+#: src/protocols/oscar/oscar.c:5399 src/protocols/oscar/oscar.c:6687
 msgid "Back"
 msgstr "Back"
 
@@ -184,15 +184,15 @@
 msgid "Mute Sounds"
 msgstr "Mute Sounds"
 
-#: plugins/docklet/docklet.c:172 src/gtkft.c:619
+#: plugins/docklet/docklet.c:172 src/gtkft.c:612
 msgid "File Transfers"
 msgstr "File Transfers"
 
-#: plugins/docklet/docklet.c:173 src/gtkaccount.c:2244
+#: plugins/docklet/docklet.c:173 src/gtkaccount.c:2333
 msgid "Accounts"
 msgstr "Accounts"
 
-#: plugins/docklet/docklet.c:174 src/gtkprefs.c:2490
+#: plugins/docklet/docklet.c:174 src/gtkprefs.c:2503
 msgid "Preferences"
 msgstr "Preferences"
 
@@ -243,18 +243,22 @@
 "and to toggle display of the buddy list or login window. Also allows "
 "messages to be queued until the icon is clicked, similar to ICQ."
 
-#: plugins/extplacement.c:68
+#: plugins/extplacement.c:75
 msgid "By conversation count"
 msgstr "By conversation count"
 
-#: plugins/extplacement.c:89
+#: plugins/extplacement.c:96
 msgid "Conversation Placement"
 msgstr "Conversation Placement"
 
-#: plugins/extplacement.c:94
+#: plugins/extplacement.c:101
 msgid "Number of conversations per window"
 msgstr "Number of conversations per window"
 
+#: plugins/extplacement.c:107
+msgid "Separate IM and Chat windows when placing by number"
+msgstr "Separate IM and Chat windows when placing by number"
+
 #. *< api_version
 #. *< type
 #. *< ui_requirement
@@ -262,25 +266,25 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/extplacement.c:114
+#: plugins/extplacement.c:126
 msgid "ExtPlacement"
 msgstr "ExtPlacement"
 
 #. *< name
 #. *< version
-#: plugins/extplacement.c:116
+#: plugins/extplacement.c:128
 msgid "Extra conversation placement options."
 msgstr "Extra conversation placement options."
 
 #. *< summary
 #. *  description
-#: plugins/extplacement.c:118
-msgid ""
-"Either restrict the number of conversations per windows or use separate "
-"windows for IMs and Chats"
-msgstr ""
-"Either restrict the number of conversations per windows or use separate "
-"windows for IMs and Chats"
+#: plugins/extplacement.c:130
+msgid ""
+"Restrict the number of conversations per windows, optionally separating IMs "
+"and Chats"
+msgstr ""
+"Restrict the number of conversations per windows, optionally separating IMs "
+"and Chats"
 
 #. *< api_version
 #. *< type
@@ -440,60 +444,60 @@
 "Drag up and then to the left to switch to the previous conversation.\n"
 "Drag up and then to the right to switch to the next conversation."
 
-#: plugins/gevolution/add_buddy_dialog.c:136
-#: plugins/gevolution/assoc-buddy.c:74
+#: plugins/gevolution/add_buddy_dialog.c:133
+#: plugins/gevolution/assoc-buddy.c:71
 msgid "Local Addressbook"
 msgstr "Local Addressbook"
 
-#: plugins/gevolution/add_buddy_dialog.c:146
-#: plugins/gevolution/add_buddy_dialog.c:157
-#: plugins/gevolution/assoc-buddy.c:84 plugins/gevolution/assoc-buddy.c:95
-#: src/gtkblist.c:2982 src/gtkprefs.c:913 src/gtkprefs.c:966
-#: src/gtkprefs.c:1809 src/protocols/jabber/jabber.c:923
+#: plugins/gevolution/add_buddy_dialog.c:143
+#: plugins/gevolution/add_buddy_dialog.c:154
+#: plugins/gevolution/assoc-buddy.c:81 plugins/gevolution/assoc-buddy.c:92
+#: src/gtkblist.c:3015 src/gtkprefs.c:961 src/gtkprefs.c:1014
+#: src/gtkprefs.c:1822 src/protocols/jabber/jabber.c:924
 msgid "None"
 msgstr "None"
 
-#: plugins/gevolution/add_buddy_dialog.c:190
-#: plugins/gevolution/assoc-buddy.c:178 src/gtkprefs.c:2162
-#: src/gtkroomlist.c:553 src/protocols/jabber/jabber.c:597
-#: src/protocols/msn/msn.c:1286 src/protocols/trepia/trepia.c:398
+#: plugins/gevolution/add_buddy_dialog.c:187
+#: plugins/gevolution/assoc-buddy.c:175 src/gtkprefs.c:2175
+#: src/gtkroomlist.c:553 src/protocols/jabber/jabber.c:598
+#: src/protocols/msn/msn.c:1311 src/protocols/trepia/trepia.c:398
 msgid "Name"
 msgstr "Name"
 
-#: plugins/gevolution/add_buddy_dialog.c:201
+#: plugins/gevolution/add_buddy_dialog.c:198
 msgid "Instant Messaging"
 msgstr "Instant Messaging"
 
 #. Add the label.
-#: plugins/gevolution/add_buddy_dialog.c:482
+#: plugins/gevolution/add_buddy_dialog.c:479
 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:495
-#: plugins/gevolution/assoc-buddy.c:383 src/protocols/oscar/oscar.c:6949
+#: plugins/gevolution/add_buddy_dialog.c:492
+#: plugins/gevolution/assoc-buddy.c:380 src/protocols/oscar/oscar.c:6965
 msgid "Search"
 msgstr "Search"
 
-#: plugins/gevolution/add_buddy_dialog.c:566
-#: plugins/gevolution/new_person_dialog.c:310 src/gtkblist.c:4011
-#: src/gtkblist.c:4339
+#: plugins/gevolution/add_buddy_dialog.c:563
+#: plugins/gevolution/new_person_dialog.c:307 src/gtkblist.c:4045
+#: src/gtkblist.c:4373
 msgid "Group:"
 msgstr "Group:"
 
 #. "New Person" button
-#: plugins/gevolution/add_buddy_dialog.c:592
-#: plugins/gevolution/assoc-buddy.c:486
+#: plugins/gevolution/add_buddy_dialog.c:589
+#: plugins/gevolution/assoc-buddy.c:483
 msgid "New Person"
 msgstr "New Person"
 
 #. "Select Buddy" button
-#: plugins/gevolution/add_buddy_dialog.c:609
+#: plugins/gevolution/add_buddy_dialog.c:606
 msgid "Select Buddy"
 msgstr "Select Buddy"
 
 #. Add the label.
-#: plugins/gevolution/assoc-buddy.c:370
+#: plugins/gevolution/assoc-buddy.c:367
 msgid ""
 "Select a person from your address book to add this buddy to, or create a new "
 "person."
@@ -502,40 +506,40 @@
 "person."
 
 #. Add the disclosure
-#: plugins/gevolution/assoc-buddy.c:449
+#: plugins/gevolution/assoc-buddy.c:446
 msgid "Show user details"
 msgstr "Show user details"
 
-#: plugins/gevolution/assoc-buddy.c:450
+#: plugins/gevolution/assoc-buddy.c:447
 msgid "Hide user details"
 msgstr "Hide user details"
 
 #. "Associate Buddy" button
-#: plugins/gevolution/assoc-buddy.c:503
+#: plugins/gevolution/assoc-buddy.c:500
 msgid "_Associate Buddy"
 msgstr "_Associate Buddy"
 
-#: plugins/gevolution/gevo-util.c:66 plugins/gevolution/gevolution.c:90
-#: src/blist.c:775 src/blist.c:963 src/blist.c:2060 src/gtkblist.c:3832
+#: plugins/gevolution/gevo-util.c:64 plugins/gevolution/gevolution.c:89
+#: src/blist.c:775 src/blist.c:963 src/blist.c:1870 src/gtkblist.c:3866
 #: src/protocols/jabber/roster.c:66
 msgid "Buddies"
 msgstr "Buddies"
 
-#: plugins/gevolution/gevolution.c:221
+#: plugins/gevolution/gevolution.c:220
 msgid "Add to Address Book"
 msgstr "Add to Address Book"
 
 #. Configuration frame
-#: plugins/gevolution/gevolution.c:352
+#: plugins/gevolution/gevolution.c:351
 msgid "Evolution Integration Configuration"
 msgstr "Evolution Integration Configuration"
 
 #. Label
-#: plugins/gevolution/gevolution.c:355
+#: plugins/gevolution/gevolution.c:354
 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:385 plugins/idle.c:51 src/gtkconn.c:620
+#: plugins/gevolution/gevolution.c:384 plugins/idle.c:51 src/gtkconn.c:620
 msgid "Account"
 msgstr "Account"
 
@@ -546,53 +550,53 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/gevolution/gevolution.c:466
+#: plugins/gevolution/gevolution.c:465
 msgid "Evolution Integration"
 msgstr "Evolution Integration"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/gevolution/gevolution.c:469 plugins/gevolution/gevolution.c:471
+#: plugins/gevolution/gevolution.c:468 plugins/gevolution/gevolution.c:470
 msgid "Provides integration with Ximian Evolution."
 msgstr "Provides integration with Ximian Evolution."
 
-#: plugins/gevolution/new_person_dialog.c:270
+#: plugins/gevolution/new_person_dialog.c:267
 msgid "Please enter the person's information below."
 msgstr "Please enter the person's information below."
 
-#: plugins/gevolution/new_person_dialog.c:274
+#: plugins/gevolution/new_person_dialog.c:271
 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:294
+#: plugins/gevolution/new_person_dialog.c:291
 msgid "Account type:"
 msgstr "Account type:"
 
-#: plugins/gevolution/new_person_dialog.c:298
+#: plugins/gevolution/new_person_dialog.c:295
 msgid "Screenname:"
 msgstr "Screenname:"
 
 #. Optional Information section
-#: plugins/gevolution/new_person_dialog.c:318
+#: plugins/gevolution/new_person_dialog.c:315
 msgid "Optional information:"
 msgstr "Optional information"
 
 #. Label
-#: plugins/gevolution/new_person_dialog.c:341 src/gtkaccount.c:340
-#: src/protocols/oscar/oscar.c:433
+#: plugins/gevolution/new_person_dialog.c:338 src/gtkaccount.c:378
+#: src/gtkaccount.c:408 src/protocols/oscar/oscar.c:438
 msgid "Buddy Icon"
 msgstr "Buddy Icon"
 
-#: plugins/gevolution/new_person_dialog.c:353
+#: plugins/gevolution/new_person_dialog.c:350
 msgid "First name:"
 msgstr "First name:"
 
-#: plugins/gevolution/new_person_dialog.c:365
+#: plugins/gevolution/new_person_dialog.c:362
 msgid "Last name:"
 msgstr "Last name:"
 
-#: plugins/gevolution/new_person_dialog.c:385
+#: plugins/gevolution/new_person_dialog.c:382
 msgid "E-mail:"
 msgstr "E-mail:"
 
@@ -817,15 +821,15 @@
 msgid "Provides support for loading perl plugins."
 msgstr "Provides support for loading perl plugins."
 
-#: plugins/raw.c:154
+#: plugins/raw.c:146
 msgid "Raw"
 msgstr "Raw"
 
-#: plugins/raw.c:156
+#: plugins/raw.c:148
 msgid "Lets you send raw input to text-based protocols."
 msgstr "Lets you send raw input to text-based protocols."
 
-#: plugins/raw.c:157
+#: plugins/raw.c:149
 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."
@@ -894,14 +898,14 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/signals-test.c:554
+#: plugins/signals-test.c:566
 msgid "Signals Test"
 msgstr "Signals Test"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/signals-test.c:557 plugins/signals-test.c:559
+#: plugins/signals-test.c:569 plugins/signals-test.c:571
 msgid "Test to see that all signals are working properly."
 msgstr "Test to see that all signals are working properly."
 
@@ -1112,30 +1116,30 @@
 msgstr "Adds iChat-style timestamps to conversations every N minutes."
 
 #: plugins/win32/transparency/win2ktrans.c:133
-#: plugins/win32/transparency/win2ktrans.c:389
-#: plugins/win32/transparency/win2ktrans.c:420
+#: plugins/win32/transparency/win2ktrans.c:388
+#: plugins/win32/transparency/win2ktrans.c:419
 msgid "Opacity:"
 msgstr "Opacity:"
 
 #. IM Convo trans options
-#: plugins/win32/transparency/win2ktrans.c:370
+#: plugins/win32/transparency/win2ktrans.c:369
 msgid "IM Conversation Windows"
 msgstr "IM Conversation Windows"
 
-#: plugins/win32/transparency/win2ktrans.c:371
+#: plugins/win32/transparency/win2ktrans.c:370
 msgid "_IM window transparency"
 msgstr "_IM window transparency"
 
-#: plugins/win32/transparency/win2ktrans.c:381
+#: plugins/win32/transparency/win2ktrans.c:380
 msgid "_Show slider bar in IM window"
 msgstr "_Show slider bar in IM window"
 
 #. Buddy List trans options
-#: plugins/win32/transparency/win2ktrans.c:406 src/gtkprefs.c:907
+#: plugins/win32/transparency/win2ktrans.c:405 src/gtkprefs.c:955
 msgid "Buddy List Window"
 msgstr "Buddy List Window"
 
-#: plugins/win32/transparency/win2ktrans.c:407
+#: plugins/win32/transparency/win2ktrans.c:406
 msgid "_Buddy List window transparency"
 msgstr "_Buddy List window transparency"
 
@@ -1146,19 +1150,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/win32/transparency/win2ktrans.c:463
+#: plugins/win32/transparency/win2ktrans.c:462
 msgid "Transparency"
 msgstr "Transparency"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/win32/transparency/win2ktrans.c:466
+#: plugins/win32/transparency/win2ktrans.c:465
 msgid "Variable Transparency for the buddy list and conversations."
 msgstr "Variable Transparency for the buddy list and conversations."
 
 #. *  description
-#: plugins/win32/transparency/win2ktrans.c:468
+#: plugins/win32/transparency/win2ktrans.c:467
 msgid ""
 "This plugin enables variable alpha transparency on conversation windows and "
 "the buddy list.\n"
@@ -1184,8 +1188,8 @@
 msgstr "_Start Gaim on Windows startup"
 
 #. Buddy List
-#: plugins/win32/winprefs/winprefs.c:362 src/gtkblist.c:3023
-#: src/gtkprefs.c:2399
+#: plugins/win32/winprefs/winprefs.c:362 src/gtkblist.c:3057
+#: src/gtkprefs.c:2412
 msgid "Buddy List"
 msgstr "Buddy List"
 
@@ -1204,8 +1208,8 @@
 msgstr "_Keep Buddy List window on top"
 
 #. Conversations
-#: plugins/win32/winprefs/winprefs.c:382 src/gtkprefs.c:958
-#: src/gtkprefs.c:2400 src/protocols/msn/msn.c:1611
+#: plugins/win32/winprefs/winprefs.c:382 src/gtkprefs.c:1006
+#: src/gtkprefs.c:2413 src/protocols/msn/msn.c:1638
 msgid "Conversations"
 msgstr "Conversations"
 
@@ -1276,260 +1280,264 @@
 msgid "Crazy Patch Writers"
 msgstr "Crazy Patch Writers"
 
-#: src/about.c:147
+#: src/about.c:148
 msgid "Retired Developers"
 msgstr "Retired Developers"
 
-#: src/about.c:148
+#: src/about.c:149
 msgid "former libfaim maintainer"
 msgstr "former libfaim maintainer"
 
-#: src/about.c:149
+#: src/about.c:150
 msgid "former lead developer"
 msgstr "former lead developer"
 
-#: src/about.c:152
+#: src/about.c:153
 msgid "former maintainer"
 msgstr "former maintainer"
 
-#: src/about.c:153
+#: src/about.c:154
 msgid "former Jabber developer"
 msgstr "former Jabber developer"
 
-#: src/about.c:154
+#: src/about.c:155
 msgid "original author"
 msgstr "original author"
 
-#: src/about.c:157
+#: src/about.c:158
 msgid "hacker and designated driver [lazy bum]"
 msgstr "hacker and designated driver [lazy bum]"
 
-#: src/about.c:165
+#: src/about.c:166
 msgid "Current Translators"
 msgstr "Current Translators"
 
-#: src/about.c:166 src/about.c:204
+#: src/about.c:167 src/about.c:207
 msgid "Catalan"
 msgstr "Catalan"
 
-#: src/about.c:167 src/about.c:205
+#: src/about.c:168 src/about.c:208
 msgid "Czech"
 msgstr "Czech"
 
-#: src/about.c:168
+#: src/about.c:169
 msgid "Danish"
 msgstr "Danish"
 
-#: src/about.c:169
+#: src/about.c:170
 msgid "British English"
 msgstr "Proper English"
 
-#: src/about.c:170
+#: src/about.c:171
 msgid "Canadian English"
 msgstr "Canadian English"
 
-#: src/about.c:171 src/about.c:206
+#: src/about.c:172 src/about.c:209
 msgid "German"
 msgstr "German"
 
-#: src/about.c:172 src/about.c:207
+#: src/about.c:173 src/about.c:210
 msgid "Spanish"
 msgstr "Spanish"
 
-#: src/about.c:173 src/about.c:208
+#: src/about.c:174 src/about.c:211
 msgid "Finnish"
 msgstr "Finnish"
 
-#: src/about.c:174 src/about.c:209
+#: src/about.c:175 src/about.c:212
 msgid "French"
 msgstr "French"
 
-#: src/about.c:175
+#: src/about.c:176
 msgid "Hebrew"
 msgstr "Hebrew"
 
-#: src/about.c:176
+#: src/about.c:177
 msgid "Hindi"
 msgstr "Hindi"
 
-#: src/about.c:177
+#: src/about.c:178
 msgid "Hungarian"
 msgstr "Hungarian"
 
-#: src/about.c:178 src/about.c:210
+#: src/about.c:179 src/about.c:213
 msgid "Italian"
 msgstr "Italian"
 
-#: src/about.c:179 src/about.c:212
+#: src/about.c:180 src/about.c:214
+msgid "Japanese"
+msgstr "Japanese"
+
+#: src/about.c:181
+msgid "Lithuanian"
+msgstr "Lithuanian"
+
+#: src/about.c:182 src/about.c:215
 msgid "Korean"
 msgstr "Korean"
 
-#: src/about.c:180
+#: src/about.c:183
 msgid "Dutch; Flemish"
 msgstr "Dutch; Flemish"
 
-#: src/about.c:181
+#: src/about.c:184
 msgid "Macedonian"
 msgstr "Macedonian"
 
-#: src/about.c:182
+#: src/about.c:185
 msgid "Norwegian"
 msgstr "Norwegian"
 
-#: src/about.c:183 src/about.c:213
+#: src/about.c:186 src/about.c:216
 msgid "Polish"
 msgstr "Polish"
 
-#: src/about.c:184
+#: src/about.c:187
 msgid "Portuguese"
 msgstr "Portuguese"
 
-#: src/about.c:185
+#: src/about.c:188
 msgid "Portuguese-Brazil"
 msgstr "Portuguese-Brazil"
 
-#: src/about.c:186
+#: src/about.c:189
 msgid "Romanian"
 msgstr "Romanian"
 
-#: src/about.c:187 src/about.c:214 src/about.c:215
+#: src/about.c:190 src/about.c:217 src/about.c:218
 msgid "Russian"
 msgstr "Russian"
 
-#: src/about.c:188
+#: src/about.c:191
 msgid "Serbian"
 msgstr "Serbian"
 
-#: src/about.c:189
+#: src/about.c:192
 msgid "Slovenian"
 msgstr "Slovenian"
 
-#: src/about.c:190 src/about.c:217
+#: src/about.c:193 src/about.c:220
 msgid "Swedish"
 msgstr "Swedish"
 
-#: src/about.c:191
+#: src/about.c:194
 msgid "Vietnamese"
 msgstr "Vietnamese"
 
-#: src/about.c:191
-msgid "Gnome Vi Team"
-msgstr "Gnome Vi Team"
-
-#: src/about.c:193
-msgid "Simplified Chinese"
-msgstr "Simplified Chinese"
-
 #: src/about.c:194
+msgid "and the Gnome-Vi Team"
+msgstr "and the Gnome-Vi Team"
+
+#: src/about.c:196
+msgid "Simplified Chinese"
+msgstr "Simplified Chinese"
+
+#: src/about.c:197
 msgid "Traditional Chinese"
 msgstr "Traditional Chinese"
 
-#: src/about.c:201
+#: src/about.c:204
 msgid "Past Translators"
 msgstr "Past Translators"
 
-#: src/about.c:202
+#: src/about.c:205
 msgid "Amharic"
 msgstr "Amharic"
 
-#: src/about.c:203
+#: src/about.c:206
 msgid "Bulgarian"
 msgstr "Bulgarian"
 
-#: src/about.c:211
-msgid "Japanese"
-msgstr "Japanese"
-
-#: src/about.c:216
+#: src/about.c:219
 msgid "Slovak"
 msgstr "Slovak"
 
-#: src/about.c:218
+#: src/about.c:221
 msgid "Chinese"
 msgstr "Chinese"
 
-#: src/account.c:278 src/protocols/jabber/jabber.c:1000
+#: src/account.c:277 src/protocols/jabber/jabber.c:1001
 msgid "New passwords do not match."
 msgstr "New passwords do not match."
 
-#: src/account.c:287
+#: src/account.c:286
 msgid "Fill out all fields completely."
 msgstr "Fill out all fields completely."
 
-#: src/account.c:312
+#: src/account.c:311
 msgid "Original password"
 msgstr "Original password"
 
-#: src/account.c:319
+#: src/account.c:318
 msgid "New password"
 msgstr "New password"
 
-#: src/account.c:326
+#: src/account.c:325
 msgid "New password (again)"
 msgstr "New password (again)"
 
-#: src/account.c:332
+#: src/account.c:331
 #, c-format
 msgid "Change password for %s"
 msgstr "Change password for %s"
 
-#: src/account.c:340
+#: src/account.c:339
 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:343 src/connection.c:197 src/dialogs.c:462 src/dialogs.c:518
-#: src/dialogs.c:571 src/gtkblist.c:2341 src/gtkrequest.c:235
-#: src/protocols/jabber/jabber.c:1047 src/protocols/jabber/xdata.c:337
+#: src/account.c:342 src/connection.c:197 src/dialogs.c:462 src/dialogs.c:518
+#: src/dialogs.c:571 src/gtkblist.c:2391 src/gtkrequest.c:242
+#: src/protocols/jabber/jabber.c:1048 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:3353 src/protocols/oscar/oscar.c:3447
-#: src/protocols/oscar/oscar.c:6731 src/protocols/oscar/oscar.c:6828
-#: src/protocols/oscar/oscar.c:6880 src/protocols/oscar/oscar.c:6966
+#: src/protocols/oscar/oscar.c:3369 src/protocols/oscar/oscar.c:3463
+#: src/protocols/oscar/oscar.c:6748 src/protocols/oscar/oscar.c:6844
+#: src/protocols/oscar/oscar.c:6896 src/protocols/oscar/oscar.c:6982
 #: src/protocols/silc/buddy.c:460 src/protocols/silc/buddy.c:1132
-#: src/protocols/silc/chat.c:406 src/protocols/silc/chat.c:444
-#: src/protocols/silc/chat.c:707 src/protocols/silc/ops.c:994
-#: src/protocols/silc/ops.c:1405 src/protocols/silc/silc.c:688
-#: src/protocols/yahoo/yahoo.c:2745 src/protocols/yahoo/yahoo.c:2754
-#: src/request.h:1242
+#: src/protocols/silc/chat.c:409 src/protocols/silc/chat.c:447
+#: src/protocols/silc/chat.c:710 src/protocols/silc/ops.c:1063
+#: src/protocols/silc/ops.c:1671 src/protocols/silc/silc.c:692
+#: src/protocols/yahoo/yahoo.c:2752 src/protocols/yahoo/yahoo.c:2761
+#: src/request.h:1243
 msgid "OK"
 msgstr "OK"
 
-#: src/account.c:344 src/account.c:382 src/away.c:334 src/connection.c:198
+#: src/account.c:343 src/account.c:381 src/away.c:334 src/connection.c:198
 #: src/dialogs.c:299 src/dialogs.c:311 src/dialogs.c:324 src/dialogs.c:345
 #: src/dialogs.c:463 src/dialogs.c:519 src/dialogs.c:572 src/dialogs.c:808
-#: src/dialogs.c:824 src/dialogs.c:842 src/gtkaccount.c:1918
-#: src/gtkaccount.c:2409 src/gtkblist.c:2342 src/gtkblist.c:4377
+#: src/dialogs.c:824 src/dialogs.c:842 src/gtkaccount.c:2002
+#: src/gtkaccount.c:2498 src/gtkblist.c:2392 src/gtkblist.c:4411
 #: src/gtkconn.c:168 src/gtkimhtmltoolbar.c:414 src/gtkprivacy.c:587
 #: src/gtkprivacy.c:600 src/gtkprivacy.c:625 src/gtkprivacy.c:636
-#: src/gtkrequest.c:236 src/protocols/icq/gaim_icq.c:277
+#: src/gtkrequest.c:243 src/protocols/icq/gaim_icq.c:277
 #: src/protocols/jabber/buddy.c:515 src/protocols/jabber/chat.c:710
-#: src/protocols/jabber/jabber.c:666 src/protocols/jabber/jabber.c:1048
+#: src/protocols/jabber/jabber.c:667 src/protocols/jabber/jabber.c:1049
 #: 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:1371 src/protocols/oscar/oscar.c:3313
-#: src/protocols/oscar/oscar.c:3354 src/protocols/oscar/oscar.c:3391
-#: src/protocols/oscar/oscar.c:3448 src/protocols/oscar/oscar.c:6732
-#: src/protocols/oscar/oscar.c:6829 src/protocols/oscar/oscar.c:6881
-#: src/protocols/oscar/oscar.c:6950 src/protocols/oscar/oscar.c:6967
+#: src/protocols/oscar/oscar.c:1377 src/protocols/oscar/oscar.c:3329
+#: src/protocols/oscar/oscar.c:3370 src/protocols/oscar/oscar.c:3407
+#: src/protocols/oscar/oscar.c:3464 src/protocols/oscar/oscar.c:6749
+#: src/protocols/oscar/oscar.c:6845 src/protocols/oscar/oscar.c:6897
+#: src/protocols/oscar/oscar.c:6966 src/protocols/oscar/oscar.c:6983
 #: src/protocols/silc/buddy.c:461 src/protocols/silc/buddy.c:1037
-#: src/protocols/silc/buddy.c:1133 src/protocols/silc/chat.c:579
-#: src/protocols/silc/chat.c:708 src/protocols/silc/ops.c:1406
-#: src/protocols/silc/silc.c:689 src/protocols/trepia/trepia.c:347
-#: src/protocols/yahoo/yahoo.c:2746 src/protocols/yahoo/yahoo.c:2755
-#: src/request.h:1242 src/request.h:1252
+#: src/protocols/silc/buddy.c:1133 src/protocols/silc/chat.c:582
+#: src/protocols/silc/chat.c:711 src/protocols/silc/ops.c:1672
+#: src/protocols/silc/silc.c:693 src/protocols/trepia/trepia.c:347
+#: src/protocols/yahoo/yahoo.c:2753 src/protocols/yahoo/yahoo.c:2762
+#: src/request.h:1243 src/request.h:1253
 msgid "Cancel"
 msgstr "Cancel"
 
-#: src/account.c:373
+#: src/account.c:372
 #, c-format
 msgid "Change user information for %s"
 msgstr "Change user information for %s"
 
-#: src/account.c:381 src/gtkrequest.c:242 src/protocols/jabber/buddy.c:514
+#: src/account.c:380 src/gtkrequest.c:249 src/protocols/jabber/buddy.c:514
 #: src/protocols/trepia/trepia.c:346
 msgid "Save"
 msgstr "Save"
@@ -1552,8 +1560,8 @@
 msgstr "Remove Away Message"
 
 #. Remove button
-#: src/away.c:333 src/gtkconv.c:1352 src/gtkconv.c:3570 src/gtkconv.c:3669
-#: src/gtkrequest.c:241
+#: src/away.c:333 src/gtkconv.c:1388 src/gtkconv.c:3680 src/gtkconv.c:3784
+#: src/gtkrequest.c:248
 msgid "Remove"
 msgstr "Remove"
 
@@ -1588,16 +1596,12 @@
 msgid "Group not removed"
 msgstr "Group not removed"
 
-#: src/blist.c:1393 src/gtkaccount.c:167 src/gtkft.c:161 src/gtkutils.c:721
-#: src/protocols/jabber/buddy.c:570 src/protocols/novell/novell.c:2730
+#: src/blist.c:1393 src/gtkaccount.c:167 src/gtkft.c:154 src/gtkutils.c:627
+#: src/protocols/jabber/buddy.c:570 src/protocols/novell/novell.c:2736
 msgid "Unknown"
 msgstr "Unknown"
 
-#: src/blist.c:1721
-msgid "Invalid Groupname"
-msgstr "Invalid Groupname"
-
-#: src/blist.c:2192
+#: src/blist.c:2001
 msgid ""
 "An error was encountered parsing your buddy list.  It has not been loaded, "
 "and the old file has moved to blist.xml~."
@@ -1605,7 +1609,7 @@
 "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:2195
+#: src/blist.c:2004
 msgid "Buddy List Error"
 msgstr "Buddy List Error"
 
@@ -1627,71 +1631,71 @@
 msgid "Enter password for %s"
 msgstr "Enter password for %s"
 
-#: src/conversation.c:271
+#: src/conversation.c:261
 msgid "Unable to send message. The message is too large."
 msgstr "Unable to send message. The message is too large."
 
-#: src/conversation.c:279
+#: src/conversation.c:269
 msgid "Unable to send message."
 msgstr "Unable to send message."
 
-#: src/conversation.c:1960
+#: src/conversation.c:1953
 #, c-format
 msgid "%s entered the room."
 msgstr "%s entered the room."
 
-#: src/conversation.c:1963
+#: src/conversation.c:1956
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>] entered the room."
 
-#: src/conversation.c:2054
+#: src/conversation.c:2047
 #, c-format
 msgid "You are now known as %s"
 msgstr "You are now known as %s"
 
-#: src/conversation.c:2057
+#: src/conversation.c:2050
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s is now known as %s"
 
-#: src/conversation.c:2099
+#: src/conversation.c:2092
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s left the room (%s)."
 
-#: src/conversation.c:2101
+#: src/conversation.c:2094
 #, c-format
 msgid "%s left the room."
 msgstr "%s left the room."
 
-#: src/conversation.c:2172
+#: src/conversation.c:2165
 #, c-format
 msgid "(+%d more)"
 msgstr "(+%d more)"
 
-#: src/conversation.c:2174
+#: src/conversation.c:2167
 #, c-format
 msgid " left the room (%s)."
 msgstr " left the room (%s)."
 
-#: src/conversation.c:2464
+#: src/conversation.c:2457
 msgid "Last created window"
 msgstr "Last created window"
 
-#: src/conversation.c:2466
+#: src/conversation.c:2459
 msgid "Separate IM and Chat windows"
 msgstr "Separate IM and Chat windows"
 
-#: src/conversation.c:2468 src/gtkprefs.c:1335
+#: src/conversation.c:2461 src/gtkprefs.c:1384
 msgid "New window"
 msgstr "New window"
 
-#: src/conversation.c:2470
+#: src/conversation.c:2463
 msgid "By group"
 msgstr "By group"
 
-#: src/conversation.c:2472
+#: src/conversation.c:2465
 msgid "By account"
 msgstr "By account"
 
@@ -1848,8 +1852,8 @@
 msgid "Enter an alias for this chat."
 msgstr "Enter an alias for this chat."
 
-#: src/dialogs.c:807 src/dialogs.c:823 src/dialogs.c:841 src/gtkrequest.c:243
-#: src/protocols/silc/chat.c:569
+#: src/dialogs.c:807 src/dialogs.c:823 src/dialogs.c:841 src/gtkrequest.c:250
+#: src/protocols/silc/chat.c:572
 msgid "Alias"
 msgstr "Alias"
 
@@ -1870,22 +1874,51 @@
 msgid "Alias Buddy"
 msgstr "Alias Buddy"
 
-#: src/ft.c:144
+#: src/ft.c:125
+msgid "That file does not exist."
+msgstr "That file does not exist."
+
+#: src/ft.c:134
+msgid "Cannot send a file of 0 bytes."
+msgstr "Cannot send a file of 0 bytes."
+
+#: src/ft.c:194
+#, c-format
+msgid "%s wants to send you %s (%s)"
+msgstr "%s wants to send you %s (%s)"
+
+#: src/ft.c:229
+#, c-format
+msgid "Accept file transfer request from %s?"
+msgstr "Accept file transfer request from %s?"
+
+#: src/ft.c:233
+#, c-format
+msgid ""
+"A file is available for download from:\n"
+"Remote host: %s\n"
+"Remote port: %d"
+msgstr ""
+"A file is available for download from:\n"
+"Remote host: %s\n"
+"Remote port: %d"
+
+#: src/ft.c:285
 #, c-format
 msgid "%s is not a valid filename.\n"
 msgstr "%s is not a valid filename.\n"
 
-#: src/ft.c:157
+#: src/ft.c:298
 #, c-format
 msgid "%s was not found.\n"
 msgstr "%s was not found.\n"
 
-#: src/ft.c:786
+#: src/ft.c:927
 #, c-format
 msgid "File transfer to %s aborted.\n"
 msgstr "File transfer to %s aborted.\n"
 
-#: src/ft.c:788
+#: src/ft.c:929
 #, c-format
 msgid "File transfer from %s aborted.\n"
 msgstr "File transfer from %s aborted.\n"
@@ -1978,23 +2011,23 @@
 msgid "sorry, i ran out for a while. bbl"
 msgstr "sorry, i ran out for a while. bbl"
 
-#: src/gaimrc.c:372 src/gaimrc.c:1409
+#: src/gaimrc.c:372 src/gaimrc.c:1417
 msgid "boring default"
 msgstr "boring default"
 
-#: src/gaimrc.c:1219 src/gtkblist.c:2984
+#: src/gaimrc.c:1227 src/gtkblist.c:3017
 msgid "Alphabetical"
 msgstr "Alphabetical"
 
-#: src/gaimrc.c:1221 src/gtkblist.c:2985
+#: src/gaimrc.c:1229 src/gtkblist.c:3018
 msgid "By status"
 msgstr "By status"
 
-#: src/gaimrc.c:1223 src/gtkblist.c:2986
+#: src/gaimrc.c:1231 src/gtkblist.c:3019
 msgid "By log size"
 msgstr "By log size"
 
-#: src/gtkaccount.c:309
+#: src/gtkaccount.c:331
 #, c-format
 msgid ""
 "<b>File:</b> %s\n"
@@ -2006,164 +2039,164 @@
 "<b>Image size:</b> %dx%d"
 
 #. Build the login options frame.
-#: src/gtkaccount.c:530
+#: src/gtkaccount.c:614
 msgid "Login Options"
 msgstr "Login Options"
 
-#: src/gtkaccount.c:547
+#: src/gtkaccount.c:631
 msgid "Protocol:"
 msgstr "Protocol:"
 
-#: src/gtkaccount.c:552 src/gtkblist.c:3983
+#: src/gtkaccount.c:636 src/gtkblist.c:4017
 msgid "Screen Name:"
 msgstr "Screen Name:"
 
-#: src/gtkaccount.c:625
+#: src/gtkaccount.c:709
 msgid "Password:"
 msgstr "Password:"
 
-#: src/gtkaccount.c:630 src/gtkblist.c:3997 src/gtkblist.c:4325
+#: src/gtkaccount.c:714 src/gtkblist.c:4031 src/gtkblist.c:4359
 msgid "Alias:"
 msgstr "Alias:"
 
-#: src/gtkaccount.c:634
+#: src/gtkaccount.c:718
 msgid "Remember password"
 msgstr "Remember password"
 
 #. Build the user options frame.
-#: src/gtkaccount.c:690
+#: src/gtkaccount.c:774
 msgid "User Options"
 msgstr "User Options"
 
-#: src/gtkaccount.c:703
+#: src/gtkaccount.c:787
 msgid "New mail notifications"
 msgstr "New mail notifications"
 
-#: src/gtkaccount.c:712
+#: src/gtkaccount.c:796
 msgid "Buddy icon:"
 msgstr "Buddy icon:"
 
 #. Build the protocol options frame.
-#: src/gtkaccount.c:801
+#: src/gtkaccount.c:885
 #, c-format
 msgid "%s Options"
 msgstr "%s Options"
 
 #. Use Global Proxy Settings
-#: src/gtkaccount.c:937 src/gtkaccount.c:984
+#: src/gtkaccount.c:1021 src/gtkaccount.c:1068
 msgid "Use Global Proxy Settings"
 msgstr "Use Global Proxy Settings"
 
 #. No Proxy
-#: src/gtkaccount.c:943 src/gtkaccount.c:991
+#: src/gtkaccount.c:1027 src/gtkaccount.c:1075
 msgid "No Proxy"
 msgstr "No Proxy"
 
 #. HTTP
-#: src/gtkaccount.c:949 src/gtkaccount.c:998
+#: src/gtkaccount.c:1033 src/gtkaccount.c:1082
 msgid "HTTP"
 msgstr "HTTP"
 
 #. SOCKS 4
-#: src/gtkaccount.c:955 src/gtkaccount.c:1005
+#: src/gtkaccount.c:1039 src/gtkaccount.c:1089
 msgid "SOCKS 4"
 msgstr "SOCKS 4"
 
 #. SOCKS 5
-#: src/gtkaccount.c:961 src/gtkaccount.c:1012
+#: src/gtkaccount.c:1045 src/gtkaccount.c:1096
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
 #. Use Environmental Settings
-#: src/gtkaccount.c:967 src/gtkaccount.c:1019 src/gtkprefs.c:1139
+#: src/gtkaccount.c:1051 src/gtkaccount.c:1103 src/gtkprefs.c:1187
 msgid "Use Environmental Settings"
 msgstr "Use Environmental Settings"
 
-#: src/gtkaccount.c:1058
+#: src/gtkaccount.c:1142
 msgid "you can see the butterflies mating"
 msgstr "you can see the butterflies mating"
 
-#: src/gtkaccount.c:1062
+#: src/gtkaccount.c:1146
 msgid "If you look real closely"
 msgstr "If you look real closely"
 
-#: src/gtkaccount.c:1078
+#: src/gtkaccount.c:1162
 msgid "Proxy Options"
 msgstr "Proxy Options"
 
-#: src/gtkaccount.c:1096 src/gtkprefs.c:1133
+#: src/gtkaccount.c:1180 src/gtkprefs.c:1181
 msgid "Proxy _type:"
 msgstr "Proxy _type:"
 
-#: src/gtkaccount.c:1105 src/gtkprefs.c:1160
+#: src/gtkaccount.c:1189 src/gtkprefs.c:1208
 msgid "_Host:"
 msgstr "_Host:"
 
-#: src/gtkaccount.c:1109 src/gtkprefs.c:1178
+#: src/gtkaccount.c:1193 src/gtkprefs.c:1226
 msgid "_Port:"
 msgstr "_Port:"
 
-#: src/gtkaccount.c:1117
+#: src/gtkaccount.c:1201
 msgid "_Username:"
 msgstr "_Username:"
 
-#: src/gtkaccount.c:1122 src/gtkprefs.c:1215
+#: src/gtkaccount.c:1206 src/gtkprefs.c:1263
 msgid "Pa_ssword:"
 msgstr "Pa_ssword:"
 
-#: src/gtkaccount.c:1494
+#: src/gtkaccount.c:1578
 msgid "Add Account"
 msgstr "Add Account"
 
-#: src/gtkaccount.c:1496
+#: src/gtkaccount.c:1580
 msgid "Modify Account"
 msgstr "Modify Account"
 
 #. Add the disclosure
-#: src/gtkaccount.c:1520
+#: src/gtkaccount.c:1604
 msgid "Show more options"
 msgstr "Show more options"
 
-#: src/gtkaccount.c:1521
+#: src/gtkaccount.c:1605
 msgid "Show fewer options"
 msgstr "Show fewer options"
 
 #. Register button
-#: src/gtkaccount.c:1548 src/protocols/jabber/jabber.c:665
+#: src/gtkaccount.c:1632 src/protocols/jabber/jabber.c:666
 msgid "Register"
 msgstr "Register"
 
-#: src/gtkaccount.c:1913
+#: src/gtkaccount.c:1997
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "Are you sure you want to delete %s?"
 
-#: src/gtkaccount.c:1917 src/gtkrequest.c:239
+#: src/gtkaccount.c:2001 src/gtkrequest.c:246
 msgid "Delete"
 msgstr "Delete"
 
-#: src/gtkaccount.c:2031 src/protocols/oscar/oscar.c:3981
+#: src/gtkaccount.c:2115 src/protocols/oscar/oscar.c:3997
 msgid "Screen Name"
 msgstr "Screen Name"
 
-#: src/gtkaccount.c:2054 src/protocols/jabber/jabber.c:957
-#: src/protocols/oscar/oscar.c:534 src/protocols/oscar/oscar.c:5463
-#: src/protocols/oscar/oscar.c:6661 src/protocols/silc/silc.c:44
-#: src/protocols/yahoo/yahoo.c:2492 src/protocols/zephyr/zephyr.c:1208
-#: src/protocols/zephyr/zephyr.c:1218
+#: src/gtkaccount.c:2139 src/protocols/jabber/jabber.c:958
+#: src/protocols/oscar/oscar.c:538 src/protocols/oscar/oscar.c:5479
+#: src/protocols/oscar/oscar.c:6678 src/protocols/silc/silc.c:44
+#: src/protocols/yahoo/yahoo.c:2515 src/protocols/zephyr/zephyr.c:1360
+#: src/protocols/zephyr/zephyr.c:1372
 msgid "Online"
 msgstr "Online"
 
-#: src/gtkaccount.c:2072
+#: src/gtkaccount.c:2160
 msgid "Protocol"
 msgstr "Protocol"
 
-#: src/gtkaccount.c:2384
+#: src/gtkaccount.c:2473
 #, 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:2398
+#: src/gtkaccount.c:2487
 msgid ""
 "\n"
 "\n"
@@ -2173,27 +2206,27 @@
 "\n"
 "Do you wish to add him or her to your buddy list?"
 
-#: src/gtkaccount.c:2402
+#: src/gtkaccount.c:2491
 msgid "Information"
 msgstr "Information"
 
-#: src/gtkaccount.c:2406
+#: src/gtkaccount.c:2495
 msgid "Add buddy to your list?"
 msgstr "Add buddy to your list?"
 
 #. Add button
-#: src/gtkaccount.c:2408 src/gtkblist.c:4376 src/gtkconv.c:1354
-#: src/gtkconv.c:3563 src/gtkconv.c:3662 src/gtkrequest.c:240
-#: src/protocols/icq/gaim_icq.c:277 src/protocols/oscar/oscar.c:3610
-#: src/protocols/silc/chat.c:578
+#: src/gtkaccount.c:2497 src/gtkblist.c:4410 src/gtkconv.c:1390
+#: src/gtkconv.c:3673 src/gtkconv.c:3777 src/gtkrequest.c:247
+#: src/protocols/icq/gaim_icq.c:277 src/protocols/oscar/oscar.c:3626
+#: src/protocols/silc/chat.c:581
 msgid "Add"
 msgstr "Add"
 
-#: src/gtkblist.c:810
+#: src/gtkblist.c:815
 msgid "Join a Chat"
 msgstr "Join a Chat"
 
-#: src/gtkblist.c:831
+#: src/gtkblist.c:836
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
@@ -2201,199 +2234,203 @@
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 
-#: src/gtkblist.c:842 src/gtkpounce.c:445 src/gtkroomlist.c:354
+#: src/gtkblist.c:847 src/gtkpounce.c:412 src/gtkroomlist.c:354
 msgid "_Account:"
 msgstr "_Account:"
 
-#: src/gtkblist.c:1128 src/gtkblist.c:3177
+#: src/gtkblist.c:1133 src/gtkblist.c:3211
 msgid "Get _Info"
 msgstr "Get _Info"
 
-#: src/gtkblist.c:1131 src/gtkblist.c:3168
+#: src/gtkblist.c:1136 src/gtkblist.c:3202
 msgid "I_M"
 msgstr "I_M"
 
-#: src/gtkblist.c:1133
+#: src/gtkblist.c:1141
+msgid "_Send File"
+msgstr "_Send File"
+
+#: src/gtkblist.c:1145
 msgid "Add Buddy _Pounce"
 msgstr "Add Buddy _Pounce"
 
-#: src/gtkblist.c:1135
+#: src/gtkblist.c:1147
 msgid "View _Log"
 msgstr "View _Log"
 
-#: src/gtkblist.c:1143 src/gtkblist.c:1229 src/gtkblist.c:1243
+#: src/gtkblist.c:1155 src/gtkblist.c:1241 src/gtkblist.c:1255
 msgid "_Alias..."
 msgstr "_Alias..."
 
-#: src/gtkblist.c:1145 src/gtkblist.c:1231 src/gtkblist.c:1248
+#: src/gtkblist.c:1157 src/gtkblist.c:1243 src/gtkblist.c:1260
 #: src/gtkconn.c:361
 msgid "_Remove"
 msgstr "_Remove"
 
-#: src/gtkblist.c:1191
+#: src/gtkblist.c:1203
 msgid "Add a _Buddy"
 msgstr "Add a _Buddy"
 
-#: src/gtkblist.c:1193
+#: src/gtkblist.c:1205
 msgid "Add a C_hat"
 msgstr "Add a C_hat"
 
-#: src/gtkblist.c:1195
+#: src/gtkblist.c:1207
 msgid "_Delete Group"
 msgstr "_Delete Group"
 
-#: src/gtkblist.c:1197
+#: src/gtkblist.c:1209
 msgid "_Rename"
 msgstr "_Rename"
 
 #. join button
-#: src/gtkblist.c:1219 src/gtkroomlist.c:263 src/gtkroomlist.c:409
+#: src/gtkblist.c:1231 src/gtkroomlist.c:263 src/gtkroomlist.c:409
 #: src/stock.c:87
 msgid "_Join"
 msgstr "_Join"
 
-#: src/gtkblist.c:1221
+#: src/gtkblist.c:1233
 msgid "Auto-Join"
 msgstr "Auto-Join"
 
-#: src/gtkblist.c:1245 src/gtkblist.c:1274
+#: src/gtkblist.c:1257 src/gtkblist.c:1286
 msgid "_Collapse"
 msgstr "_Collapse"
 
-#: src/gtkblist.c:1279
+#: src/gtkblist.c:1291
 msgid "_Expand"
 msgstr "_Expand"
 
-#: src/gtkblist.c:1935 src/gtkconv.c:4199 src/gtkpounce.c:347
+#: src/gtkblist.c:1949 src/gtkconv.c:4317 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:2286
+#: src/gtkblist.c:2336
 msgid "/_Buddies"
 msgstr "/_Buddies"
 
-#: src/gtkblist.c:2287
+#: src/gtkblist.c:2337
 msgid "/Buddies/New Instant _Message..."
 msgstr "/Buddies/New Instant _Message..."
 
-#: src/gtkblist.c:2288
+#: src/gtkblist.c:2338
 msgid "/Buddies/Join a _Chat..."
 msgstr "/Buddies/Join a _Chat..."
 
-#: src/gtkblist.c:2289
+#: src/gtkblist.c:2339
 msgid "/Buddies/Get User _Info..."
 msgstr "/Buddies/Get User _Info..."
 
-#: src/gtkblist.c:2290
+#: src/gtkblist.c:2340
 msgid "/Buddies/View User _Log..."
 msgstr "/Buddies/View User _Log..."
 
-#: src/gtkblist.c:2292
+#: src/gtkblist.c:2342
 msgid "/Buddies/Show _Offline Buddies"
 msgstr "/Buddies/Show _Offline Buddies"
 
-#: src/gtkblist.c:2293
+#: src/gtkblist.c:2343
 msgid "/Buddies/Show _Empty Groups"
 msgstr "/Buddies/Show _Empty Groups"
 
-#: src/gtkblist.c:2294
+#: src/gtkblist.c:2344
 msgid "/Buddies/_Add Buddy..."
 msgstr "/Buddies/_Add Buddy..."
 
-#: src/gtkblist.c:2295
+#: src/gtkblist.c:2345
 msgid "/Buddies/Add C_hat..."
 msgstr "/Buddies/Add C_hat..."
 
-#: src/gtkblist.c:2296
+#: src/gtkblist.c:2346
 msgid "/Buddies/Add _Group..."
 msgstr "/Buddies/Add _Group..."
 
-#: src/gtkblist.c:2298
+#: src/gtkblist.c:2348
 msgid "/Buddies/_Signoff"
 msgstr "/Buddies/_Signoff"
 
-#: src/gtkblist.c:2299
+#: src/gtkblist.c:2349
 msgid "/Buddies/_Quit"
 msgstr "/Buddies/_Quit"
 
 #. Tools
-#: src/gtkblist.c:2302
+#: src/gtkblist.c:2352
 msgid "/_Tools"
 msgstr "/_Tools"
 
-#: src/gtkblist.c:2303
+#: src/gtkblist.c:2353
 msgid "/Tools/_Away"
 msgstr "/Tools/_Away"
 
-#: src/gtkblist.c:2304
+#: src/gtkblist.c:2354
 msgid "/Tools/Buddy _Pounce"
 msgstr "/Tools/Buddy _Pounce"
 
-#: src/gtkblist.c:2305
+#: src/gtkblist.c:2355
 msgid "/Tools/Account Ac_tions"
 msgstr "/Tools/Account Ac_tions"
 
-#: src/gtkblist.c:2306
+#: src/gtkblist.c:2356
 msgid "/Tools/Pl_ugin Actions"
 msgstr "/Tools/Pl_ugin Actions"
 
-#: src/gtkblist.c:2308
+#: src/gtkblist.c:2358
 msgid "/Tools/A_ccounts"
 msgstr "/Tools/A_ccounts"
 
-#: src/gtkblist.c:2309
+#: src/gtkblist.c:2359
 msgid "/Tools/_File Transfers"
 msgstr "/Tools/_File Transfers"
 
-#: src/gtkblist.c:2310
+#: src/gtkblist.c:2360
 msgid "/Tools/R_oom List"
 msgstr "/Tools/R_oom List"
 
-#: src/gtkblist.c:2311
+#: src/gtkblist.c:2361
 msgid "/Tools/Pr_eferences"
 msgstr "/Tools/Pr_eferences"
 
-#: src/gtkblist.c:2312
+#: src/gtkblist.c:2362
 msgid "/Tools/Pr_ivacy"
 msgstr "/Tools/Pr_ivacy"
 
-#: src/gtkblist.c:2314
+#: src/gtkblist.c:2364
 msgid "/Tools/View System _Log"
 msgstr "/Tools/View System _Log"
 
 #. Help
-#: src/gtkblist.c:2317
+#: src/gtkblist.c:2367
 msgid "/_Help"
 msgstr "/_Help"
 
-#: src/gtkblist.c:2318
+#: src/gtkblist.c:2368
 msgid "/Help/Online _Help"
 msgstr "/Help/Online _Help"
 
-#: src/gtkblist.c:2319
+#: src/gtkblist.c:2369
 msgid "/Help/_Debug Window"
 msgstr "/Help/_Debug Window"
 
-#: src/gtkblist.c:2320
+#: src/gtkblist.c:2370
 msgid "/Help/_About"
 msgstr "/Help/_About"
 
-#: src/gtkblist.c:2338
+#: src/gtkblist.c:2388
 msgid "Rename Group"
 msgstr "Rename Group"
 
-#: src/gtkblist.c:2338
+#: src/gtkblist.c:2388
 msgid "New group name"
 msgstr "New group name"
 
-#: src/gtkblist.c:2339
+#: src/gtkblist.c:2389
 msgid "Please enter a new name for the selected group."
 msgstr "Please enter a new name for the selected group."
 
-#: src/gtkblist.c:2367
+#: src/gtkblist.c:2417
 #, c-format
 msgid ""
 "\n"
@@ -2402,7 +2439,7 @@
 "\n"
 "<b>Account:</b> %s"
 
-#: src/gtkblist.c:2431
+#: src/gtkblist.c:2481
 msgid ""
 "\n"
 "<b>Status:</b> Offline"
@@ -2410,12 +2447,12 @@
 "\n"
 "<b>Status:</b> Offline"
 
-#: src/gtkblist.c:2446
+#: src/gtkblist.c:2496
 #, c-format
 msgid "%d%%"
 msgstr "%d%%"
 
-#: src/gtkblist.c:2462
+#: src/gtkblist.c:2512
 msgid ""
 "\n"
 "<b>Account:</b>"
@@ -2423,7 +2460,7 @@
 "\n"
 "<b>Account:</b>"
 
-#: src/gtkblist.c:2463
+#: src/gtkblist.c:2513
 msgid ""
 "\n"
 "<b>Contact Alias:</b>"
@@ -2431,7 +2468,7 @@
 "\n"
 "<b>Contact Alias:</b>"
 
-#: src/gtkblist.c:2464
+#: src/gtkblist.c:2514
 msgid ""
 "\n"
 "<b>Alias:</b>"
@@ -2439,7 +2476,7 @@
 "\n"
 "<b>Alias:</b>"
 
-#: src/gtkblist.c:2465
+#: src/gtkblist.c:2515
 msgid ""
 "\n"
 "<b>Nickname:</b>"
@@ -2447,7 +2484,7 @@
 "\n"
 "<b>Nickname:</b>"
 
-#: src/gtkblist.c:2466
+#: src/gtkblist.c:2516
 msgid ""
 "\n"
 "<b>Logged In:</b>"
@@ -2455,7 +2492,7 @@
 "\n"
 "<b>Logged In:</b>"
 
-#: src/gtkblist.c:2467
+#: src/gtkblist.c:2517
 msgid ""
 "\n"
 "<b>Idle:</b>"
@@ -2463,7 +2500,7 @@
 "\n"
 "<b>Idle:</b>"
 
-#: src/gtkblist.c:2468
+#: src/gtkblist.c:2518
 msgid ""
 "\n"
 "<b>Warned:</b>"
@@ -2471,7 +2508,7 @@
 "\n"
 "<b>Warned:</b>"
 
-#: src/gtkblist.c:2470
+#: src/gtkblist.c:2520
 msgid ""
 "\n"
 "<b>Description:</b> Spooky"
@@ -2479,7 +2516,7 @@
 "\n"
 "<b>Description:</b> Spooky"
 
-#: src/gtkblist.c:2471
+#: src/gtkblist.c:2521
 msgid ""
 "\n"
 "<b>Status</b>: Awesome"
@@ -2487,7 +2524,7 @@
 "\n"
 "<b>Status</b>: Awesome"
 
-#: src/gtkblist.c:2472
+#: src/gtkblist.c:2522
 msgid ""
 "\n"
 "<b>Status</b>: Rockin'"
@@ -2495,96 +2532,96 @@
 "\n"
 "<b>Status</b>: Rockin'"
 
-#: src/gtkblist.c:2771
+#: src/gtkblist.c:2804
 #, c-format
 msgid "Idle (%dh%02dm) "
 msgstr "Idle (%dh%02dm) "
 
-#: src/gtkblist.c:2773
+#: src/gtkblist.c:2806
 #, c-format
 msgid "Idle (%dm) "
 msgstr "Idle (%dm) "
 
-#: src/gtkblist.c:2778
+#: src/gtkblist.c:2811
 #, c-format
 msgid "Warned (%d%%) "
 msgstr "Warned (%d%%) "
 
-#: src/gtkblist.c:2781
+#: src/gtkblist.c:2814
 msgid "Offline "
 msgstr "Offline "
 
 #. Make menu items sensitive/insensitive where appropriate
-#: src/gtkblist.c:2899
+#: src/gtkblist.c:2932
 msgid "/Buddies/Join a Chat..."
 msgstr "/Buddies/Join a Chat..."
 
-#: src/gtkblist.c:2902
+#: src/gtkblist.c:2935
 msgid "/Tools/Room List"
 msgstr "/Tools/Room List"
 
-#: src/gtkblist.c:2905
+#: src/gtkblist.c:2938
 msgid "/Tools/Privacy"
 msgstr "/Tools/Privacy"
 
-#: src/gtkblist.c:3050
+#: src/gtkblist.c:3084
 msgid "/Tools/Away"
 msgstr "/Tools/Away"
 
-#: src/gtkblist.c:3053
+#: src/gtkblist.c:3087
 msgid "/Tools/Buddy Pounce"
 msgstr "/Tools/Buddy Pounce"
 
-#: src/gtkblist.c:3056
+#: src/gtkblist.c:3090
 msgid "/Tools/Account Actions"
 msgstr "/Tools/Account Actions"
 
-#: src/gtkblist.c:3059
+#: src/gtkblist.c:3093
 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:3148
+#: src/gtkblist.c:3182
 msgid "/Buddies/Show Offline Buddies"
 msgstr "/Buddies/Show Offline Buddies"
 
-#: src/gtkblist.c:3150
+#: src/gtkblist.c:3184
 msgid "/Buddies/Show Empty Groups"
 msgstr "/Buddies/Show Empty Groups"
 
-#: src/gtkblist.c:3174
+#: src/gtkblist.c:3208
 msgid "Send a message to the selected buddy"
 msgstr "Send a message to the selected buddy"
 
-#: src/gtkblist.c:3183
+#: src/gtkblist.c:3217
 msgid "Get information on the selected buddy"
 msgstr "Get information on the selected buddy"
 
-#: src/gtkblist.c:3186
+#: src/gtkblist.c:3220
 msgid "_Chat"
 msgstr "_Chat"
 
-#: src/gtkblist.c:3191
+#: src/gtkblist.c:3225
 msgid "Join a chat room"
 msgstr "Join a chat room"
 
-#: src/gtkblist.c:3194
+#: src/gtkblist.c:3228
 msgid "_Away"
 msgstr "_Away"
 
-#: src/gtkblist.c:3199
+#: src/gtkblist.c:3233
 msgid "Set an away message"
 msgstr "Set an away message"
 
-#: src/gtkblist.c:3937 src/protocols/silc/buddy.c:731
+#: src/gtkblist.c:3971 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:2672
+#: src/protocols/silc/buddy.c:1124 src/protocols/yahoo/yahoo.c:2682
 msgid "Add Buddy"
 msgstr "Add Buddy"
 
-#: src/gtkblist.c:3961
+#: src/gtkblist.c:3995
 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. "
@@ -2595,11 +2632,11 @@
 "The alias will be displayed in place of the screen name whenever possible.\n"
 
 #. Set up stuff for the account box
-#: src/gtkblist.c:4021 src/gtkblist.c:4305
+#: src/gtkblist.c:4055 src/gtkblist.c:4339
 msgid "Account:"
 msgstr "Account:"
 
-#: src/gtkblist.c:4264
+#: src/gtkblist.c:4298
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
@@ -2607,11 +2644,11 @@
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
 
-#: src/gtkblist.c:4271
+#: src/gtkblist.c:4305
 msgid "Add Chat"
 msgstr "Add Chat"
 
-#: src/gtkblist.c:4295
+#: src/gtkblist.c:4329
 msgid ""
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
@@ -2619,15 +2656,15 @@
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
 
-#: src/gtkblist.c:4373
+#: src/gtkblist.c:4407
 msgid "Add Group"
 msgstr "Add Group"
 
-#: src/gtkblist.c:4374
+#: src/gtkblist.c:4408
 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:4941 src/gtkblist.c:5038
+#: src/gtkblist.c:4975 src/gtkblist.c:5072
 msgid "No actions available"
 msgstr "No actions available"
 
@@ -2676,29 +2713,16 @@
 msgid "Time"
 msgstr "Time"
 
-#: src/gtkconv.c:168
-#, c-format
-msgid "<h1>Conversation with %s</h1>\n"
-msgstr "<h1>Conversation with %s</h1>\n"
-
-#: src/gtkconv.c:186 src/gtkdebug.c:212
-msgid "That file already exists"
-msgstr "That file already exists"
-
-#: src/gtkconv.c:187 src/gtkdebug.c:213 src/gtkft.c:1123
-msgid "Would you like to overwrite it?"
-msgstr "Would you like to overwrite it?"
-
-#: src/gtkconv.c:365
+#: src/gtkconv.c:314
 #, c-format
 msgid "me is using Gaim v%s."
 msgstr "me is using Gaim v%s."
 
-#: src/gtkconv.c:374
+#: src/gtkconv.c:323
 msgid "Supported debug options are:  version"
 msgstr "Supported debug options are:  version"
 
-#: src/gtkconv.c:387
+#: src/gtkconv.c:336
 msgid ""
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
 "The following commands are available in this context:\n"
@@ -2706,11 +2730,11 @@
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
 "The following commands are available in this context:\n"
 
-#: src/gtkconv.c:421
+#: src/gtkconv.c:370
 msgid "No such command (in this context)."
 msgstr "No such command (in this context)."
 
-#: src/gtkconv.c:468
+#: src/gtkconv.c:443
 msgid ""
 "No such command. If you didn't mean to type a command, you can turn commands "
 "off from Tools->Preferences->Interface->Conversation->Enable \"slash\" "
@@ -2720,7 +2744,7 @@
 "off from Tools->Preferences->Interface->Conversation->Enable \"slash\" "
 "commands."
 
-#: src/gtkconv.c:476
+#: src/gtkconv.c:451
 msgid ""
 "Syntax Error:  You typed the wrong number of arguments to that command. If "
 "you didn't mean to type a command, you can turn commands off from Tools-"
@@ -2730,28 +2754,28 @@
 "you didn't mean to type a command, you can turn commands off from Tools-"
 ">Preferences->Interface->Conversation->Enable \"slash\" commands."
 
-#: src/gtkconv.c:483
+#: src/gtkconv.c:458
 msgid "Your command failed for an unknown reason."
 msgstr "Your command failed for an unknown reason."
 
-#: src/gtkconv.c:490
+#: src/gtkconv.c:465
 msgid "That command only works in Chats, not IMs."
 msgstr "That command only works in Chats, not IMs."
 
-#: src/gtkconv.c:493
+#: src/gtkconv.c:468
 msgid "That command only works in IMs, not Chats."
 msgstr "That command only works in IMs, not Chats."
 
-#: src/gtkconv.c:497
+#: src/gtkconv.c:472
 msgid "That command doesn't work on this protocol."
 msgstr "That command doesn't work on this protocol."
 
-#: src/gtkconv.c:713
+#: src/gtkconv.c:693
 msgid "Invite Buddy Into Chat Room"
 msgstr "Invite Buddy Into Chat Room"
 
 #. Put our happy label in it.
-#: src/gtkconv.c:741
+#: src/gtkconv.c:721
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
@@ -2759,313 +2783,348 @@
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
 
-#: src/gtkconv.c:762
+#: src/gtkconv.c:742
 msgid "_Buddy:"
 msgstr "_Buddy:"
 
-#: src/gtkconv.c:782
+#: src/gtkconv.c:762
 msgid "_Message:"
 msgstr "_Message:"
 
-#: src/gtkconv.c:890 src/gtkdebug.c:127
+#: src/gtkconv.c:799 src/gtkconv.c:2489 src/gtkdebug.c:182
+msgid "Unable to open file."
+msgstr "Unable to read file."
+
+#: src/gtkconv.c:804
+#, c-format
+msgid "<h1>Conversation with %s</h1>\n"
+msgstr "<h1>Conversation with %s</h1>\n"
+
+#: src/gtkconv.c:818
+msgid "Save Conversation"
+msgstr "Save Conversation"
+
+#: src/gtkconv.c:895 src/gtkdebug.c:131
 msgid "Find"
 msgstr "Find"
 
-#: src/gtkconv.c:916 src/gtkdebug.c:155
+#: src/gtkconv.c:921 src/gtkdebug.c:159
 msgid "_Search for:"
 msgstr "_Search for:"
 
-#: src/gtkconv.c:1312
+#: src/gtkconv.c:1338
 msgid "IM"
 msgstr "IM"
 
-#: src/gtkconv.c:1320
+#. Block button
+#: src/gtkconv.c:1347 src/gtkconv.c:3666 src/protocols/oscar/oscar.c:453
+#: src/protocols/oscar/oscar.c:6788
+msgid "Send File"
+msgstr "Send File"
+
+#: src/gtkconv.c:1356
 msgid "Un-Ignore"
 msgstr "Un-Ignore"
 
-#: src/gtkconv.c:1322 src/gtkprefs.c:778
+#: src/gtkconv.c:1358 src/gtkprefs.c:826
 msgid "Ignore"
 msgstr "Ignore"
 
 #. Info button
-#: src/gtkconv.c:1331 src/gtkconv.c:3577
+#: src/gtkconv.c:1367 src/gtkconv.c:3687
 msgid "Info"
 msgstr "Info"
 
-#: src/gtkconv.c:1340
+#: src/gtkconv.c:1376
 msgid "Get Away Msg"
 msgstr "Get Away Msg"
 
-#: src/gtkconv.c:2467
+#: src/gtkconv.c:2497
+msgid "Unable to save icon file to disk."
+msgstr "Unable to save icon file to disk."
+
+#: src/gtkconv.c:2514
+msgid "Save Icon"
+msgstr "Save Icon"
+
+#: src/gtkconv.c:2544
 msgid "Animate"
 msgstr "Animate"
 
-#: src/gtkconv.c:2472
+#: src/gtkconv.c:2549
 msgid "Hide Icon"
 msgstr "Hide Icon"
 
-#: src/gtkconv.c:2478
+#: src/gtkconv.c:2555
 msgid "Save Icon As..."
 msgstr "Save Icon As..."
 
-#: src/gtkconv.c:2847
+#: src/gtkconv.c:2939
 msgid "User is typing..."
 msgstr "User is typing..."
 
-#: src/gtkconv.c:2855
+#: src/gtkconv.c:2947
 msgid "User has typed something and paused"
 msgstr "User has typed something and paused"
 
 #. Build the Send As menu
-#: src/gtkconv.c:2958
+#: src/gtkconv.c:3050
 msgid "_Send As"
 msgstr "_Send As"
 
-#: src/gtkconv.c:3335
-msgid "Save Conversation"
-msgstr "Save Conversation"
-
 #. Conversation menu
-#: src/gtkconv.c:3352
+#: src/gtkconv.c:3450
 msgid "/_Conversation"
 msgstr "/_Conversation"
 
-#: src/gtkconv.c:3354
+#: src/gtkconv.c:3452
 msgid "/Conversation/New Instant _Message..."
 msgstr "/Conversation/New Instant _Message..."
 
-#: src/gtkconv.c:3359
+#: src/gtkconv.c:3457
 msgid "/Conversation/_Find..."
 msgstr "/Conversation/_Find..."
 
-#: src/gtkconv.c:3361
+#: src/gtkconv.c:3459
 msgid "/Conversation/View _Log"
 msgstr "/Conversation/View _Log"
 
-#: src/gtkconv.c:3362
+#: src/gtkconv.c:3460
 msgid "/Conversation/_Save As..."
 msgstr "/Conversation/_Save As..."
 
-#: src/gtkconv.c:3364
+#: src/gtkconv.c:3462
 msgid "/Conversation/Clear"
 msgstr "/Conversation/Clear"
 
-#: src/gtkconv.c:3368
+#: src/gtkconv.c:3466
+msgid "/Conversation/Se_nd File..."
+msgstr "/Conversation/Se_nd File..."
+
+#: src/gtkconv.c:3467
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Conversation/Add Buddy _Pounce..."
 
-#: src/gtkconv.c:3370
+#: src/gtkconv.c:3469
 msgid "/Conversation/_Get Info"
 msgstr "/Conversation/_Get Info"
 
-#: src/gtkconv.c:3372
+#: src/gtkconv.c:3471
 msgid "/Conversation/_Warn..."
 msgstr "/Conversation/_Warn..."
 
-#: src/gtkconv.c:3374
+#: src/gtkconv.c:3473
 msgid "/Conversation/In_vite..."
 msgstr "/Conversation/In_vite..."
 
-#: src/gtkconv.c:3379
+#: src/gtkconv.c:3478
 msgid "/Conversation/A_lias..."
 msgstr "/Conversation/A_lias..."
 
-#: src/gtkconv.c:3381
+#: src/gtkconv.c:3480
 msgid "/Conversation/_Block..."
 msgstr "/Conversation/_Block..."
 
-#: src/gtkconv.c:3383
+#: src/gtkconv.c:3482
 msgid "/Conversation/_Add..."
 msgstr "/Conversation/_Add..."
 
-#: src/gtkconv.c:3385
+#: src/gtkconv.c:3484
 msgid "/Conversation/_Remove..."
 msgstr "/Conversation/_Remove..."
 
-#: src/gtkconv.c:3390
+#: src/gtkconv.c:3489
 msgid "/Conversation/Insert Lin_k..."
 msgstr "/Conversation/Insert Lin_k..."
 
-#: src/gtkconv.c:3392
+#: src/gtkconv.c:3491
 msgid "/Conversation/Insert Imag_e..."
 msgstr "/Conversation/Insert Imag_e..."
 
-#: src/gtkconv.c:3397
+#: src/gtkconv.c:3496
 msgid "/Conversation/_Close"
 msgstr "/Conversation/_Close"
 
 #. Options
-#: src/gtkconv.c:3401
+#: src/gtkconv.c:3500
 msgid "/_Options"
 msgstr "/_Options"
 
-#: src/gtkconv.c:3402
+#: src/gtkconv.c:3501
 msgid "/Options/Enable _Logging"
 msgstr "/Options/Enable _Logging"
 
-#: src/gtkconv.c:3403
+#: src/gtkconv.c:3502
 msgid "/Options/Enable _Sounds"
 msgstr "/Options/Enable _Sounds"
 
-#: src/gtkconv.c:3404
+#: src/gtkconv.c:3503
 msgid "/Options/Show Formatting _Toolbar"
 msgstr "/Options/Show Formatting _Toolbar"
 
-#: src/gtkconv.c:3405
+#: src/gtkconv.c:3504
 msgid "/Options/Show T_imestamps"
 msgstr "/Options/Show T_imestamps"
 
-#: src/gtkconv.c:3447
+#: src/gtkconv.c:3546
 msgid "/Conversation/View Log"
 msgstr "/Conversation/View Log"
 
-#: src/gtkconv.c:3452
+#: src/gtkconv.c:3551
+msgid "/Conversation/Send File..."
+msgstr "/Conversation/Send File..."
+
+#: src/gtkconv.c:3555
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Conversation/Add Buddy Pounce..."
 
-#: src/gtkconv.c:3458
+#: src/gtkconv.c:3561
 msgid "/Conversation/Get Info"
 msgstr "/Conversation/Get Info"
 
-#: src/gtkconv.c:3462
+#: src/gtkconv.c:3565
 msgid "/Conversation/Warn..."
 msgstr "/Conversation/Warn..."
 
-#: src/gtkconv.c:3466
+#: src/gtkconv.c:3569
 msgid "/Conversation/Invite..."
 msgstr "/Conversation/Invite..."
 
-#: src/gtkconv.c:3472
+#: src/gtkconv.c:3575
 msgid "/Conversation/Alias..."
 msgstr "/Conversation/Alias..."
 
-#: src/gtkconv.c:3476
+#: src/gtkconv.c:3579
 msgid "/Conversation/Block..."
 msgstr "/Conversation/Block..."
 
-#: src/gtkconv.c:3480
+#: src/gtkconv.c:3583
 msgid "/Conversation/Add..."
 msgstr "/Conversation/Add..."
 
-#: src/gtkconv.c:3484
+#: src/gtkconv.c:3587
 msgid "/Conversation/Remove..."
 msgstr "/Conversation/Remove..."
 
-#: src/gtkconv.c:3490
+#: src/gtkconv.c:3593
 msgid "/Conversation/Insert Link..."
 msgstr "/Conversation/Insert Link..."
 
-#: src/gtkconv.c:3494
+#: src/gtkconv.c:3597
 msgid "/Conversation/Insert Image..."
 msgstr "/Conversation/Insert Image..."
 
-#: src/gtkconv.c:3500
+#: src/gtkconv.c:3603
 msgid "/Options/Enable Logging"
 msgstr "/Options/Enable Logging"
 
-#: src/gtkconv.c:3503
+#: src/gtkconv.c:3606
 msgid "/Options/Enable Sounds"
 msgstr "/Options/Enable Sounds"
 
-#: src/gtkconv.c:3506
+#: src/gtkconv.c:3609
 msgid "/Options/Show Formatting Toolbar"
 msgstr "/Options/Show Formatting Toolbar"
 
-#: src/gtkconv.c:3509
+#: src/gtkconv.c:3612
 msgid "/Options/Show Timestamps"
 msgstr "/Options/Show Timestamps"
 
 #. From right to left...
 #. Send button
-#: src/gtkconv.c:3533 src/gtkconv.c:3535 src/gtkconv.c:3641 src/gtkconv.c:3643
+#: src/gtkconv.c:3636 src/gtkconv.c:3638 src/gtkconv.c:3756 src/gtkconv.c:3758
 msgid "Send"
 msgstr "Send"
 
 #. Now, um, just kind of all over the place. Huh?
 #. Warn button
-#: src/gtkconv.c:3549
+#: src/gtkconv.c:3652
 msgid "Warn"
 msgstr "Warn"
 
-#: src/gtkconv.c:3552
+#: src/gtkconv.c:3655
 msgid "Warn the user"
 msgstr "Warn the user"
 
 #. Block button
-#: src/gtkconv.c:3556 src/gtkprivacy.c:624 src/gtkprivacy.c:635
+#: src/gtkconv.c:3659 src/gtkprivacy.c:624 src/gtkprivacy.c:635
 msgid "Block"
 msgstr "Block"
 
-#: src/gtkconv.c:3559
+#: src/gtkconv.c:3662
 msgid "Block the user"
 msgstr "Block the user"
 
-#: src/gtkconv.c:3566
+#: src/gtkconv.c:3669
+msgid "Send a file to the user"
+msgstr "Send a file to the user"
+
+#: src/gtkconv.c:3676
 msgid "Add the user to your buddy list"
 msgstr "Add the user to your buddy list"
 
-#: src/gtkconv.c:3573
+#: src/gtkconv.c:3683
 msgid "Remove the user from your buddy list"
 msgstr "Remove the user from your buddy list"
 
-#: src/gtkconv.c:3580 src/gtkconv.c:3923
+#: src/gtkconv.c:3690 src/gtkconv.c:4041
 msgid "Get the user's information"
 msgstr "Get the user's information"
 
 #. Invite
-#: src/gtkconv.c:3655
+#: src/gtkconv.c:3770
 msgid "Invite"
 msgstr "Invite"
 
-#: src/gtkconv.c:3658
+#: src/gtkconv.c:3773
 msgid "Invite a user"
 msgstr "Invite a user"
 
-#: src/gtkconv.c:3665
+#: src/gtkconv.c:3780
 msgid "Add the chat to your buddy list"
 msgstr "Add the chat to your buddy list"
 
-#: src/gtkconv.c:3672
+#: src/gtkconv.c:3787
 msgid "Remove the chat from your buddy list"
 msgstr "Remove the chat from your buddy list"
 
-#: src/gtkconv.c:3782
+#: src/gtkconv.c:3897
 msgid "Topic:"
 msgstr "Topic:"
 
 #. Setup the label telling how many people are in the room.
-#: src/gtkconv.c:3845
+#: src/gtkconv.c:3960
 msgid "0 people in room"
 msgstr "0 people in room"
 
-#: src/gtkconv.c:3900
+#: src/gtkconv.c:4018
 msgid "IM the user"
 msgstr "IM the user"
 
-#: src/gtkconv.c:3912
+#: src/gtkconv.c:4030
 msgid "Ignore the user"
 msgstr "Ignore the user"
 
-#: src/gtkconv.c:4490
+#: src/gtkconv.c:4629
 msgid "Close conversation"
 msgstr "Close conversation"
 
-#: src/gtkconv.c:5035 src/gtkconv.c:5067 src/gtkconv.c:5188 src/gtkconv.c:5255
+#: src/gtkconv.c:5171 src/gtkconv.c:5203 src/gtkconv.c:5324 src/gtkconv.c:5391
 #, 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:5757 src/gtkconv.c:5760
+#: src/gtkconv.c:5903 src/gtkconv.c:5906
 msgid "<main>/Conversation/Close"
 msgstr "<main>/Conversation/Close"
 
-#: src/gtkconv.c:6132
+#: src/gtkconv.c:6278
 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:6135
+#: src/gtkconv.c:6281
 msgid ""
 "debug &lt;option&gt;:  Send various debug information to the current "
 "conversation."
@@ -3073,197 +3132,155 @@
 "debug &lt;option&gt;:  Send various debug information to the current "
 "conversation."
 
-#: src/gtkconv.c:6139
+#: src/gtkconv.c:6285
 msgid "help:  List available commands."
 msgstr "help:  List available commands."
 
-#: src/gtkconv.c:6143
+#: src/gtkconv.c:6289
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr "help &lt;command&gt;:  Help on a specific command."
 
-#: src/gtkdebug.c:226
+#: src/gtkdebug.c:197
 msgid "Save Debug Log"
 msgstr "Save Debug Log"
 
-#: src/gtkdebug.c:289
+#: src/gtkdebug.c:250
 msgid "Debug Window"
 msgstr "Debug Window"
 
-#: src/gtkdebug.c:327
+#: src/gtkdebug.c:288
 msgid "Pause"
 msgstr "Pause"
 
-#: src/gtkdebug.c:333
+#: src/gtkdebug.c:294
 msgid "Timestamps"
 msgstr "Timestamps"
 
-#: src/gtkft.c:143
+#: src/gtkft.c:136
 #, c-format
 msgid "%.2f KB/s"
 msgstr "%.2f KB/s"
 
-#: src/gtkft.c:164 src/gtkft.c:974
+#: src/gtkft.c:157 src/gtkft.c:967
 msgid "Finished"
 msgstr "Finished"
 
-#: src/gtkft.c:167 src/gtkft.c:925
+#: src/gtkft.c:160 src/gtkft.c:918
 msgid "Canceled"
 msgstr "Cancelled"
 
-#: src/gtkft.c:170
+#: src/gtkft.c:163
 msgid "Waiting for transfer to begin"
 msgstr "Waiting for transfer to begin"
 
-#: src/gtkft.c:223
+#: src/gtkft.c:216
 msgid "<b>Receiving From:</b>"
 msgstr "<b>Receiving From:</b>"
 
-#: src/gtkft.c:226
+#: src/gtkft.c:219
 msgid "<b>Sending To:</b>"
 msgstr "<b>Sending To:</b>"
 
-#: src/gtkft.c:400
+#: src/gtkft.c:393
 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:405
+#: src/gtkft.c:398
 msgid "An error occurred while opening the file."
 msgstr "An error occurred while opening the file."
 
+#: src/gtkft.c:489
+msgid "Progress"
+msgstr "Progress"
+
 #: src/gtkft.c:496
-msgid "Progress"
-msgstr "Progress"
-
-#: src/gtkft.c:503
 msgid "Filename"
 msgstr "Filename"
 
-#: src/gtkft.c:510
+#: src/gtkft.c:503
 msgid "Size"
 msgstr "Size"
 
-#: src/gtkft.c:517
+#: src/gtkft.c:510
 msgid "Remaining"
 msgstr "Remaining"
 
-#: src/gtkft.c:547
+#: src/gtkft.c:540
 msgid "Filename:"
 msgstr "Filename:"
 
-#: src/gtkft.c:548
+#: src/gtkft.c:541
 msgid "Status:"
 msgstr "Status:"
 
-#: src/gtkft.c:549
+#: src/gtkft.c:542
 msgid "Speed:"
 msgstr "Speed:"
 
-#: src/gtkft.c:550
+#: src/gtkft.c:543
 msgid "Time Elapsed:"
 msgstr "Time Elapsed:"
 
-#: src/gtkft.c:551
+#: src/gtkft.c:544
 msgid "Time Remaining:"
 msgstr "Time Remaining:"
 
-#: src/gtkft.c:648
+#: src/gtkft.c:641
 msgid "_Keep the dialog open"
 msgstr "_Keep the dialog open"
 
-#: src/gtkft.c:658
+#: src/gtkft.c:651
 msgid "_Clear finished transfers"
 msgstr "_Clear finished transfers"
 
 #. "Download Details" arrow
-#: src/gtkft.c:667
+#: src/gtkft.c:660
 msgid "Show transfer details"
 msgstr "Show transfer details"
 
-#: src/gtkft.c:668
+#: src/gtkft.c:661
 msgid "Hide transfer details"
 msgstr "Hide transfer details"
 
 #. Pause button
-#: src/gtkft.c:710 src/stock.c:90
+#: src/gtkft.c:703 src/stock.c:90
 msgid "_Pause"
 msgstr "_Pause"
 
 #. Resume button
-#: src/gtkft.c:720
+#: src/gtkft.c:713
 msgid "_Resume"
 msgstr "_Resume"
 
-#: src/gtkft.c:927
+#: src/gtkft.c:920
 msgid "Failed"
 msgstr "Failed"
 
-#: src/gtkft.c:1099
-msgid "That file does not exist."
-msgstr "That file does not exist."
-
-#: src/gtkft.c:1108
-msgid "Cannot send a file of 0 bytes."
-msgstr "Cannot send a file of 0 bytes."
-
-#: src/gtkft.c:1122
-msgid "That file already exists."
-msgstr "That file already exists."
-
-#. Open file selector to select the public key.
-#: src/gtkft.c:1148 src/protocols/silc/buddy.c:1023
-msgid "Open..."
-msgstr "Open..."
-
-#: src/gtkft.c:1150
-msgid "Save As..."
-msgstr "Save As..."
-
-#: src/gtkft.c:1200
-#, c-format
-msgid "%s wants to send you %s (%s)"
-msgstr "%s wants to send you %s (%s)"
-
-#: src/gtkft.c:1233
-#, c-format
-msgid "Accept file transfer request from %s?"
-msgstr "Accept file transfer request from %s?"
-
-#: src/gtkft.c:1237
-#, c-format
-msgid ""
-"A file is available for download from:\n"
-"Remote host: %s\n"
-"Remote port: %d"
-msgstr ""
-"A file is available for download from:\n"
-"Remote host: %s\n"
-"Remote port: %d"
-
-#: src/gtkimhtml.c:567
+#: src/gtkimhtml.c:602
 msgid "Pa_ste As Text"
 msgstr "Pa_ste As Text"
 
-#: src/gtkimhtml.c:1012
+#: src/gtkimhtml.c:1047
 msgid "Hyperlink color"
 msgstr "Hyperlink colour"
 
-#: src/gtkimhtml.c:1013
+#: src/gtkimhtml.c:1048
 msgid "Color to draw hyperlinks."
 msgstr "Colour to draw hyperlinks."
 
-#: src/gtkimhtml.c:1218
+#: src/gtkimhtml.c:1253
 msgid "_Copy E-Mail Address"
 msgstr "_Copy E-Mail Address"
 
-#: src/gtkimhtml.c:1230
+#: src/gtkimhtml.c:1265
 msgid "_Copy Link Location"
 msgstr "_Copy Link Location"
 
-#: src/gtkimhtml.c:1240
+#: src/gtkimhtml.c:1275
 msgid "_Open Link in Browser"
 msgstr "_Open Link in Browser"
 
-#: src/gtkimhtml.c:2761
+#: src/gtkimhtml.c:2797
 msgid ""
 "Unable to guess the image type based on the file extension supplied.  "
 "Defaulting to PNG."
@@ -3271,16 +3288,16 @@
 "Unable to guess the image type based on the file extension supplied.  "
 "Defaulting to PNG."
 
-#: src/gtkimhtml.c:2769
+#: src/gtkimhtml.c:2805
 #, c-format
 msgid "Error saving image: %s"
 msgstr "Error saving image: %s"
 
-#: src/gtkimhtml.c:2778
+#: src/gtkimhtml.c:2814
 msgid "Save Image"
 msgstr "Save Image"
 
-#: src/gtkimhtml.c:2801
+#: src/gtkimhtml.c:2837
 msgid "_Save Image..."
 msgstr "_Save Image..."
 
@@ -3324,74 +3341,74 @@
 msgid "_Insert"
 msgstr "_Insert"
 
-#: src/gtkimhtmltoolbar.c:472
+#: src/gtkimhtmltoolbar.c:481
 #, c-format
 msgid "Failed to store image: %s\n"
 msgstr "Failed to store image: %s\n"
 
-#: src/gtkimhtmltoolbar.c:498
+#: src/gtkimhtmltoolbar.c:507 src/gtkimhtmltoolbar.c:517
 msgid "Insert Image"
 msgstr "Insert Image"
 
-#: src/gtkimhtmltoolbar.c:637
+#: src/gtkimhtmltoolbar.c:655
 msgid "This theme has no available smileys."
 msgstr "This theme has no available smileys."
 
 #. show everything
-#: src/gtkimhtmltoolbar.c:652
+#: src/gtkimhtmltoolbar.c:670
 msgid "Smile!"
 msgstr "Smile!"
 
-#: src/gtkimhtmltoolbar.c:870
+#: src/gtkimhtmltoolbar.c:888
 msgid "Bold"
 msgstr "Bold"
 
-#: src/gtkimhtmltoolbar.c:881
+#: src/gtkimhtmltoolbar.c:899
 msgid "Italic"
 msgstr "Italic"
 
-#: src/gtkimhtmltoolbar.c:892
+#: src/gtkimhtmltoolbar.c:910
 msgid "Underline"
 msgstr "Underline"
 
-#: src/gtkimhtmltoolbar.c:908
+#: src/gtkimhtmltoolbar.c:926
 msgid "Larger font size"
 msgstr "Larger font size"
 
-#: src/gtkimhtmltoolbar.c:920
+#: src/gtkimhtmltoolbar.c:938
 msgid "Smaller font size"
 msgstr "Smaller font size"
 
-#: src/gtkimhtmltoolbar.c:937
+#: src/gtkimhtmltoolbar.c:955
 msgid "Font Face"
 msgstr "Font Face"
 
-#: src/gtkimhtmltoolbar.c:949
+#: src/gtkimhtmltoolbar.c:967
 msgid "Foreground font color"
 msgstr "Foreground font colour"
 
-#: src/gtkimhtmltoolbar.c:961
+#: src/gtkimhtmltoolbar.c:979
 msgid "Background color"
 msgstr "Background colour"
 
-#: src/gtkimhtmltoolbar.c:976
+#: src/gtkimhtmltoolbar.c:994
 msgid "Insert link"
 msgstr "Insert link"
 
-#: src/gtkimhtmltoolbar.c:986
+#: src/gtkimhtmltoolbar.c:1004
 msgid "Insert image"
 msgstr "Insert image"
 
-#: src/gtkimhtmltoolbar.c:997
+#: src/gtkimhtmltoolbar.c:1015
 msgid "Insert smiley"
 msgstr "Insert smiley"
 
-#: src/gtklog.c:282
+#: src/gtklog.c:302
 msgid "Conversations with"
 msgstr "Conversations with"
 
 #. Window **********
-#: src/gtklog.c:372 src/gtklog.c:388
+#: src/gtklog.c:392 src/gtklog.c:408
 msgid "System Log"
 msgstr "System Log"
 
@@ -3441,7 +3458,7 @@
 msgstr "The browser command \"%s\" is invalid."
 
 #: src/gtknotify.c:432 src/gtknotify.c:446 src/gtknotify.c:461
-#: src/gtknotify.c:569
+#: src/gtknotify.c:579
 msgid "Unable to open URL"
 msgstr "Unable to open URL"
 
@@ -3450,174 +3467,174 @@
 msgid "Error launching \"%s\": %s"
 msgstr "Error launching \"%s\": %s"
 
-#: src/gtknotify.c:570
+#: src/gtknotify.c:580
 msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 
-#: src/gtkpounce.c:144
+#: src/gtkpounce.c:130
 msgid "Select a file"
 msgstr "Select a file"
 
-#: src/gtkpounce.c:194
+#: src/gtkpounce.c:161
 msgid "Please enter a buddy to pounce."
 msgstr "Please enter a buddy to pounce."
 
 #. "New Buddy Pounce"
-#: src/gtkpounce.c:420 src/gtkpounce.c:923
+#: src/gtkpounce.c:387 src/gtkpounce.c:890
 msgid "New Buddy Pounce"
 msgstr "New Buddy Pounce"
 
-#: src/gtkpounce.c:420
+#: src/gtkpounce.c:387
 msgid "Edit Buddy Pounce"
 msgstr "Edit Buddy Pounce"
 
 #. Create the "Pounce Who" frame.
-#: src/gtkpounce.c:438
+#: src/gtkpounce.c:405
 msgid "Pounce Who"
 msgstr "Pounce Who"
 
-#: src/gtkpounce.c:465
+#: src/gtkpounce.c:432
 msgid "_Buddy name:"
 msgstr "_Buddy name:"
 
 #. Create the "Pounce When" frame.
-#: src/gtkpounce.c:489
+#: src/gtkpounce.c:456
 msgid "Pounce When"
 msgstr "Pounce When"
 
-#: src/gtkpounce.c:497 src/main.c:296
+#: src/gtkpounce.c:464 src/main.c:296
 msgid "_Sign on"
 msgstr "_Sign on"
 
-#: src/gtkpounce.c:499
+#: src/gtkpounce.c:466
 msgid "Sign _off"
 msgstr "Sign _off"
 
-#: src/gtkpounce.c:501
+#: src/gtkpounce.c:468
 msgid "A_way"
 msgstr "A_way"
 
-#: src/gtkpounce.c:503
+#: src/gtkpounce.c:470
 msgid "Re_turn from away"
 msgstr "Re_turn from away"
 
-#: src/gtkpounce.c:505
+#: src/gtkpounce.c:472
 msgid "_Idle"
 msgstr "_Idle"
 
-#: src/gtkpounce.c:507
+#: src/gtkpounce.c:474
 msgid "Retur_n from idle"
 msgstr "Retur_n from idle"
 
-#: src/gtkpounce.c:509
+#: src/gtkpounce.c:476
 msgid "Buddy starts _typing"
 msgstr "Buddy starts _typing"
 
-#: src/gtkpounce.c:511
+#: src/gtkpounce.c:478
 msgid "Buddy stops t_yping"
 msgstr "Buddy stops t_yping"
 
 #. Create the "Pounce Action" frame.
-#: src/gtkpounce.c:540
+#: src/gtkpounce.c:507
 msgid "Pounce Action"
 msgstr "Pounce Action"
 
-#: src/gtkpounce.c:548
+#: src/gtkpounce.c:515
 msgid "Op_en an IM window"
 msgstr "Op_en an IM window"
 
-#: src/gtkpounce.c:550
+#: src/gtkpounce.c:517
 msgid "_Popup notification"
 msgstr "_Popup notification"
 
-#: src/gtkpounce.c:552
+#: src/gtkpounce.c:519
 msgid "Send a _message"
 msgstr "Send a _message"
 
-#: src/gtkpounce.c:554
+#: src/gtkpounce.c:521
 msgid "E_xecute a command"
 msgstr "E_xecute a command"
 
-#: src/gtkpounce.c:556
+#: src/gtkpounce.c:523
 msgid "P_lay a sound"
 msgstr "P_lay a sound"
 
-#: src/gtkpounce.c:560
+#: src/gtkpounce.c:527
 msgid "B_rowse..."
 msgstr "B_rowse..."
 
-#: src/gtkpounce.c:562
+#: src/gtkpounce.c:529
 msgid "Bro_wse..."
 msgstr "Bro_wse..."
 
-#: src/gtkpounce.c:563
+#: src/gtkpounce.c:530
 msgid "Pre_view"
 msgstr "Pre_view"
 
-#: src/gtkpounce.c:646
+#: src/gtkpounce.c:613
 msgid "Sav_e this pounce after activation"
 msgstr "Sav_e this pounce after activation"
 
 #. "Remove Buddy Pounce"
-#: src/gtkpounce.c:930
+#: src/gtkpounce.c:897
 msgid "Remove Buddy Pounce"
 msgstr "Remove Buddy Pounce"
 
-#: src/gtkpounce.c:994
+#: src/gtkpounce.c:961
 #, c-format
 msgid "%s has started typing to you (%s)"
 msgstr "%s has started typing to you (%s)"
 
-#: src/gtkpounce.c:996
+#: src/gtkpounce.c:963
 #, c-format
 msgid "%s has signed on (%s)"
 msgstr "%s has signed on (%s)"
 
-#: src/gtkpounce.c:998
+#: src/gtkpounce.c:965
 #, c-format
 msgid "%s has returned from being idle (%s)"
 msgstr "%s has returned from being idle (%s)"
 
-#: src/gtkpounce.c:1000
+#: src/gtkpounce.c:967
 #, c-format
 msgid "%s has returned from being away (%s)"
 msgstr "%s has returned from being away (%s)"
 
-#: src/gtkpounce.c:1002
+#: src/gtkpounce.c:969
 #, c-format
 msgid "%s has stopped typing to you (%s)"
 msgstr "%s has stopped typing to you (%s)"
 
-#: src/gtkpounce.c:1004
+#: src/gtkpounce.c:971
 #, c-format
 msgid "%s has signed off (%s)"
 msgstr "%s has signed off (%s)"
 
-#: src/gtkpounce.c:1006
+#: src/gtkpounce.c:973
 #, c-format
 msgid "%s has become idle (%s)"
 msgstr "%s has become idle (%s)"
 
-#: src/gtkpounce.c:1008
+#: src/gtkpounce.c:975
 #, c-format
 msgid "%s has gone away. (%s)"
 msgstr "%s has gone away. (%s)"
 
-#: src/gtkpounce.c:1009
+#: src/gtkpounce.c:976
 msgid "Unknown pounce event. Please report this!"
 msgstr "Unknown pounce event. Please report this!"
 
-#: src/gtkprefs.c:401
+#: src/gtkprefs.c:446
 msgid "Interface Options"
 msgstr "Interface Options"
 
-#: src/gtkprefs.c:403
+#: src/gtkprefs.c:448
 msgid "D_isplay remote nicknames if no alias is set"
 msgstr "D_isplay remote nicknames if no alias is set"
 
-#: src/gtkprefs.c:627
+#: src/gtkprefs.c:675
 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."
@@ -3625,52 +3642,52 @@
 "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:667
+#: src/gtkprefs.c:715
 msgid "Icon"
 msgstr "Icon"
 
-#: src/gtkprefs.c:674 src/gtkprefs.c:2199 src/protocols/jabber/buddy.c:265
+#: src/gtkprefs.c:722 src/gtkprefs.c:2212 src/protocols/jabber/buddy.c:264
 #: src/protocols/jabber/buddy.c:748 src/protocols/jabber/chat.c:701
 msgid "Description"
 msgstr "Description"
 
-#: src/gtkprefs.c:770
+#: src/gtkprefs.c:818
 msgid "Display"
 msgstr "Display"
 
-#: src/gtkprefs.c:771
+#: src/gtkprefs.c:819
 msgid "Show _timestamp on messages"
 msgstr "Show _timestamp on messages"
 
-#: src/gtkprefs.c:774
+#: src/gtkprefs.c:822
 msgid "_Highlight misspelled words"
 msgstr "_Highlight misspelled words"
 
-#: src/gtkprefs.c:779
+#: src/gtkprefs.c:827
 msgid "Ignore c_olors"
 msgstr "Ignore c_olours"
 
-#: src/gtkprefs.c:781
+#: src/gtkprefs.c:829
 msgid "Ignore font _faces"
 msgstr "Ignore font _faces"
 
-#: src/gtkprefs.c:783
+#: src/gtkprefs.c:831
 msgid "Ignore font si_zes"
 msgstr "Ignore font si_zes"
 
-#: src/gtkprefs.c:786
+#: src/gtkprefs.c:834
 msgid "_Ignore formatting on incoming messages"
 msgstr "_Ignore formatting on incoming messages"
 
-#: src/gtkprefs.c:790
+#: src/gtkprefs.c:838
 msgid "Default Formatting"
 msgstr "Default Formatting"
 
-#: src/gtkprefs.c:792
+#: src/gtkprefs.c:840
 msgid "_Send default formatting with outgoing messages"
 msgstr "_Send default formatting with outgoing messages"
 
-#: src/gtkprefs.c:824
+#: src/gtkprefs.c:872
 msgid ""
 "This is how your outgoing message text will appear when you use protocols "
 "that support formatting. :)"
@@ -3678,265 +3695,269 @@
 "This is how your outgoing message text will appear when you use protocols "
 "that support formatting. :)"
 
-#: src/gtkprefs.c:827
+#: src/gtkprefs.c:875
 msgid "_Clear Formatting"
 msgstr "_Clear Formatting"
 
-#: src/gtkprefs.c:864
+#: src/gtkprefs.c:912
 msgid "Send Message"
 msgstr "Send Message"
 
-#: src/gtkprefs.c:865
+#: src/gtkprefs.c:913
 msgid "Enter _sends message"
 msgstr "Enter _sends message"
 
-#: src/gtkprefs.c:867
+#: src/gtkprefs.c:915
 msgid "C_ontrol-Enter sends message"
 msgstr "C_ontrol-Enter sends message"
 
-#: src/gtkprefs.c:870
+#: src/gtkprefs.c:918
 msgid "Window Closing"
 msgstr "Window Closing"
 
-#: src/gtkprefs.c:871
+#: src/gtkprefs.c:919
 msgid "_Escape closes window"
 msgstr "_Escape closes window"
 
-#: src/gtkprefs.c:874
+#: src/gtkprefs.c:922
 msgid "Insertions"
 msgstr "Insertions"
 
-#: src/gtkprefs.c:875
+#: src/gtkprefs.c:923
 msgid "Control-{B/I/U} changes _formatting"
 msgstr "Control-{B/I/U} changes _formatting"
 
-#: src/gtkprefs.c:877
+#: src/gtkprefs.c:925
 msgid "Control-(number) _inserts smileys"
 msgstr "Control-(number) _inserts smileys"
 
-#: src/gtkprefs.c:893
+#: src/gtkprefs.c:941
 msgid "Buddy List Sorting"
 msgstr "Buddy List Sorting"
 
-#: src/gtkprefs.c:902
+#: src/gtkprefs.c:950
 msgid "_Sorting:"
 msgstr "_Sorting:"
 
-#: src/gtkprefs.c:908 src/gtkprefs.c:961
+#: src/gtkprefs.c:956 src/gtkprefs.c:1009
 msgid "Show _buttons as:"
 msgstr "Show _buttons as:"
 
-#: src/gtkprefs.c:910 src/gtkprefs.c:963
+#: src/gtkprefs.c:958 src/gtkprefs.c:1011
 msgid "Pictures"
 msgstr "Pictures"
 
-#: src/gtkprefs.c:911 src/gtkprefs.c:964
+#: src/gtkprefs.c:959 src/gtkprefs.c:1012
 msgid "Text"
 msgstr "Text"
 
-#: src/gtkprefs.c:912 src/gtkprefs.c:965
+#: src/gtkprefs.c:960 src/gtkprefs.c:1013
 msgid "Pictures and text"
 msgstr "Pictures and text"
 
-#: src/gtkprefs.c:915
+#: src/gtkprefs.c:963
 msgid "_Raise window on events"
 msgstr "_Raise window on events"
 
-#: src/gtkprefs.c:918
+#: src/gtkprefs.c:966
 msgid "Buddy Display"
 msgstr "Buddy Display"
 
-#: src/gtkprefs.c:919 src/gtkprefs.c:979
+#: src/gtkprefs.c:967 src/gtkprefs.c:1027
 msgid "Show buddy _icons"
 msgstr "Show buddy _icons"
 
-#: src/gtkprefs.c:921
+#: src/gtkprefs.c:969
 msgid "Show _warning levels"
 msgstr "Show _warning levels"
 
-#: src/gtkprefs.c:923
+#: src/gtkprefs.c:971
 msgid "Show idle _times"
 msgstr "Show idle _times"
 
-#: src/gtkprefs.c:925
+#: src/gtkprefs.c:973
 msgid "Dim i_dle buddies"
 msgstr "Dim i_dle buddies"
 
-#: src/gtkprefs.c:927
+#: src/gtkprefs.c:975
 msgid "_Automatically expand contacts"
 msgstr "_Automatically expand contacts"
 
-#: src/gtkprefs.c:972
+#: src/gtkprefs.c:1020
 msgid "Enable \"_slash\" commands"
 msgstr "Enable \"_slash\" commands"
 
-#: src/gtkprefs.c:975
+#: src/gtkprefs.c:1023
 msgid "Show _formatting toolbar"
 msgstr "Show _formatting toolbar"
 
-#: src/gtkprefs.c:977
+#: src/gtkprefs.c:1025
 msgid "Show _aliases in tabs/titles"
 msgstr "Show _aliases in tabs/titles"
 
-#: src/gtkprefs.c:981
+#: src/gtkprefs.c:1029
 msgid "Enable buddy ic_on animation"
 msgstr "Enable buddy ic_on animation"
 
-#: src/gtkprefs.c:983
+#: src/gtkprefs.c:1031
 msgid "_Notify buddies that you are typing to them"
 msgstr "_Notify buddies that you are typing to them"
 
-#: src/gtkprefs.c:985
+#: src/gtkprefs.c:1033
 msgid "_Raise IM window on events"
 msgstr "_Raise IM window on events"
 
-#: src/gtkprefs.c:988
+#: src/gtkprefs.c:1036
 msgid "Raise chat _window on events"
 msgstr "Raise chat _window on events"
 
-#: src/gtkprefs.c:990
+#: src/gtkprefs.c:1038
 msgid "Use _multi-colored screen names in chats"
-msgstr "Use _multi-colored screen names in chats"
+msgstr "Use _multi-coloured screen names in chats"
 
 #. All the tab options!
-#: src/gtkprefs.c:994
+#: src/gtkprefs.c:1042
 msgid "Tab Options"
 msgstr "Tab Options"
 
-#: src/gtkprefs.c:996
+#: src/gtkprefs.c:1044
 msgid "Show IMs and chats in _tabbed windows"
 msgstr "Show IMs and chats in _tabbed windows"
 
-#: src/gtkprefs.c:1011
+#: src/gtkprefs.c:1059
 msgid "Show _close button on tabs"
 msgstr "Show _close button on tabs"
 
-#: src/gtkprefs.c:1014
+#: src/gtkprefs.c:1062
 msgid "Tab p_lacement:"
 msgstr "Tab P_lacement:"
 
-#: src/gtkprefs.c:1016
+#: src/gtkprefs.c:1064
 msgid "Top"
 msgstr "Top"
 
-#: src/gtkprefs.c:1017
+#: src/gtkprefs.c:1065
 msgid "Bottom"
 msgstr "Bottom"
 
-#: src/gtkprefs.c:1018
+#: src/gtkprefs.c:1066
 msgid "Left"
 msgstr "Left"
 
-#: src/gtkprefs.c:1019
+#: src/gtkprefs.c:1067
 msgid "Right"
 msgstr "Right"
 
-#: src/gtkprefs.c:1025
+#: src/gtkprefs.c:1073
 msgid "New conversation _placement:"
 msgstr "New conversation _placement:"
 
-#: src/gtkprefs.c:1076 src/protocols/oscar/oscar.c:592
-#: src/protocols/oscar/oscar.c:4837
+#: src/gtkprefs.c:1124 src/protocols/oscar/oscar.c:596
+#: src/protocols/oscar/oscar.c:4853
 msgid "IP Address"
 msgstr "IP Address"
 
-#: src/gtkprefs.c:1078
+#: src/gtkprefs.c:1126
 msgid "_Autodetect IP Address"
 msgstr "_Autodetect IP Address"
 
-#: src/gtkprefs.c:1087
+#: src/gtkprefs.c:1135
 msgid "Public _IP:"
 msgstr "Public _IP:"
 
-#: src/gtkprefs.c:1111
+#: src/gtkprefs.c:1159
 msgid "Ports"
 msgstr "Ports"
 
-#: src/gtkprefs.c:1114
+#: src/gtkprefs.c:1162
 msgid "_Manually specify range of ports to listen on"
 msgstr "_Manually specify range of ports to listen on"
 
-#: src/gtkprefs.c:1117
+#: src/gtkprefs.c:1165
 msgid "_Start Port:"
 msgstr "_Start Port:"
 
-#: src/gtkprefs.c:1124
+#: src/gtkprefs.c:1172
 msgid "_End Port:"
 msgstr "_End Port:"
 
-#: src/gtkprefs.c:1131
+#: src/gtkprefs.c:1179
 msgid "Proxy Server"
 msgstr "Proxy Server"
 
-#: src/gtkprefs.c:1135
+#: src/gtkprefs.c:1183
 msgid "No proxy"
 msgstr "No proxy"
 
-#: src/gtkprefs.c:1197
+#: src/gtkprefs.c:1245
 msgid "_User:"
 msgstr "_User:"
 
-#: src/gtkprefs.c:1253
-msgid "Opera"
-msgstr "Opera"
-
-#: src/gtkprefs.c:1254
-msgid "Netscape"
-msgstr "Netscape"
-
-#: src/gtkprefs.c:1255
-msgid "Mozilla"
-msgstr "Mozilla"
-
-#: src/gtkprefs.c:1256
-msgid "Konqueror"
-msgstr "Konqueror"
-
-#: src/gtkprefs.c:1257
-msgid "Galeon"
-msgstr "Galeon"
-
-#: src/gtkprefs.c:1258
+#: src/gtkprefs.c:1301
+msgid "Epiphany"
+msgstr "Epiphany"
+
+#: src/gtkprefs.c:1302
 msgid "Firebird"
 msgstr "Firebird"
 
-#: src/gtkprefs.c:1259
+#: src/gtkprefs.c:1303
 msgid "Firefox"
 msgstr "Firefox"
 
-#: src/gtkprefs.c:1260
+#: src/gtkprefs.c:1304
+msgid "Galeon"
+msgstr "Galeon"
+
+#: src/gtkprefs.c:1305
 msgid "Gnome Default"
 msgstr "Gnome Default"
 
-#: src/gtkprefs.c:1269
+#: src/gtkprefs.c:1306
+msgid "Konqueror"
+msgstr "Konqueror"
+
+#: src/gtkprefs.c:1307
+msgid "Mozilla"
+msgstr "Mozilla"
+
+#: src/gtkprefs.c:1308
+msgid "Netscape"
+msgstr "Netscape"
+
+#: src/gtkprefs.c:1309
+msgid "Opera"
+msgstr "Opera"
+
+#: src/gtkprefs.c:1318
 msgid "Manual"
 msgstr "Manual"
 
-#: src/gtkprefs.c:1320
+#: src/gtkprefs.c:1369
 msgid "Browser Selection"
 msgstr "Browser Selection"
 
-#: src/gtkprefs.c:1324
+#: src/gtkprefs.c:1373
 msgid "_Browser:"
 msgstr "_Browser:"
 
-#: src/gtkprefs.c:1331
+#: src/gtkprefs.c:1380
 msgid "_Open link in:"
 msgstr "_Open Link in:"
 
-#: src/gtkprefs.c:1333
+#: src/gtkprefs.c:1382
 msgid "Browser default"
 msgstr "Browser default"
 
-#: src/gtkprefs.c:1334
+#: src/gtkprefs.c:1383
 msgid "Existing window"
 msgstr "Existing window"
 
-#: src/gtkprefs.c:1336
+#: src/gtkprefs.c:1385
 msgid "New tab"
 msgstr "New tab"
 
-#: src/gtkprefs.c:1350
+#: src/gtkprefs.c:1399
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -3945,83 +3966,83 @@
 "_Manual:\n"
 "(%s for URL)"
 
-#: src/gtkprefs.c:1387
+#: src/gtkprefs.c:1436
 msgid "Message Logs"
 msgstr "Message Logs"
 
-#: src/gtkprefs.c:1390
+#: src/gtkprefs.c:1439
 msgid "Log _Format:"
 msgstr "Log _Format:"
 
-#: src/gtkprefs.c:1393
+#: src/gtkprefs.c:1442
 msgid "_Log all instant messages"
 msgstr "_Log all instant messages"
 
-#: src/gtkprefs.c:1395
+#: src/gtkprefs.c:1444
 msgid "Log all c_hats"
 msgstr "Log all c_hats"
 
-#: src/gtkprefs.c:1398
+#: src/gtkprefs.c:1447
 msgid "System Logs"
 msgstr "System Logs"
 
-#: src/gtkprefs.c:1400
+#: src/gtkprefs.c:1449
 msgid "_Enable system log"
 msgstr "_Enable system log"
 
-#: src/gtkprefs.c:1403
+#: src/gtkprefs.c:1452
 msgid "Log when buddies _sign on/sign off"
 msgstr "Log when buddies _sign on/sign off"
 
-#: src/gtkprefs.c:1409
+#: src/gtkprefs.c:1458
 msgid "Log when buddies become _idle/un-idle"
 msgstr "Log when buddies become _idle/un-idle"
 
-#: src/gtkprefs.c:1415
+#: src/gtkprefs.c:1464
 msgid "Log when buddies go away/come _back"
 msgstr "Log when buddies go away/come _back"
 
-#: src/gtkprefs.c:1421
+#: src/gtkprefs.c:1470
 msgid "Log your _own signons/idleness/awayness"
 msgstr "Log your _own signons/idleness/awayness"
 
-#: src/gtkprefs.c:1559
+#: src/gtkprefs.c:1596
 msgid "Sound Selection"
 msgstr "Sound Selection"
 
-#: src/gtkprefs.c:1634
+#: src/gtkprefs.c:1647
 msgid "Sound Options"
 msgstr "Sound Options"
 
-#: src/gtkprefs.c:1635
+#: src/gtkprefs.c:1648
 msgid "Sounds when conversation has _focus"
 msgstr "Sounds when conversation has _focus"
 
-#: src/gtkprefs.c:1637
+#: src/gtkprefs.c:1650
 msgid "_Sounds while away"
 msgstr "_Sounds while away"
 
-#: src/gtkprefs.c:1641
+#: src/gtkprefs.c:1654
 msgid "Sound Method"
 msgstr "Sound Method"
 
-#: src/gtkprefs.c:1642
+#: src/gtkprefs.c:1655
 msgid "_Method:"
 msgstr "_Method:"
 
-#: src/gtkprefs.c:1644
+#: src/gtkprefs.c:1657
 msgid "Console beep"
 msgstr "Console beep"
 
-#: src/gtkprefs.c:1646
+#: src/gtkprefs.c:1659
 msgid "Automatic"
 msgstr "Automatic"
 
-#: src/gtkprefs.c:1653
+#: src/gtkprefs.c:1666
 msgid "Command"
 msgstr "Command"
 
-#: src/gtkprefs.c:1661
+#: src/gtkprefs.c:1674
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -4030,86 +4051,86 @@
 "Sound c_ommand:\n"
 "(%s for filename)"
 
-#: src/gtkprefs.c:1688
+#: src/gtkprefs.c:1701
 msgid "Sound Events"
 msgstr "Sound Events"
 
-#: src/gtkprefs.c:1739
+#: src/gtkprefs.c:1752
 msgid "Play"
 msgstr "Play"
 
-#: src/gtkprefs.c:1746
+#: src/gtkprefs.c:1759
 msgid "Event"
 msgstr "Event"
 
-#: src/gtkprefs.c:1765
+#: src/gtkprefs.c:1778
 msgid "Test"
 msgstr "Test"
 
-#: src/gtkprefs.c:1769
+#: src/gtkprefs.c:1782
 msgid "Reset"
 msgstr "Reset"
 
-#: src/gtkprefs.c:1773
+#: src/gtkprefs.c:1786
 msgid "Choose..."
 msgstr "Choose..."
 
-#: src/gtkprefs.c:1797
+#: src/gtkprefs.c:1810
 msgid "_Queue new messages when away"
 msgstr "_Queue new messages when away"
 
-#: src/gtkprefs.c:1800
+#: src/gtkprefs.c:1813
 msgid "Auto-response"
 msgstr "Auto-response"
 
-#: src/gtkprefs.c:1801
+#: src/gtkprefs.c:1814
 msgid "_Send auto-response"
 msgstr "_Send auto-response"
 
-#: src/gtkprefs.c:1803
+#: src/gtkprefs.c:1816
 msgid "_Only send auto-response when idle"
 msgstr "_Only send auto-response when idle"
 
-#: src/gtkprefs.c:1806 src/protocols/msn/msn.c:1156
-#: src/protocols/msn/state.c:32 src/protocols/novell/novell.c:2724
-#: src/protocols/oscar/oscar.c:3994 src/protocols/yahoo/yahoo.c:2488
-#: src/protocols/yahoo/yahoo_profile.c:653
+#: src/gtkprefs.c:1819 src/protocols/msn/msn.c:1179
+#: src/protocols/msn/state.c:32 src/protocols/novell/novell.c:2730
+#: src/protocols/oscar/oscar.c:4010 src/protocols/yahoo/yahoo.c:2511
+#: src/protocols/yahoo/yahoo_profile.c:664
 msgid "Idle"
 msgstr "Idle"
 
-#: src/gtkprefs.c:1807
+#: src/gtkprefs.c:1820
 msgid "Idle _time reporting:"
 msgstr "Idle _time reporting:"
 
-#: src/gtkprefs.c:1810
+#: src/gtkprefs.c:1823
 msgid "Gaim usage"
 msgstr "Gaim usage"
 
-#: src/gtkprefs.c:1813
+#: src/gtkprefs.c:1826
 msgid "X usage"
 msgstr "X usage"
 
-#: src/gtkprefs.c:1815
+#: src/gtkprefs.c:1828
 msgid "Windows usage"
 msgstr "Windows usage"
 
-#: src/gtkprefs.c:1823
+#: src/gtkprefs.c:1836
 msgid "Auto-away"
 msgstr "Auto-away"
 
-#: src/gtkprefs.c:1824
+#: src/gtkprefs.c:1837
 msgid "Set away _when idle"
 msgstr "Set away _when idle"
 
-#: src/gtkprefs.c:1828
+#: src/gtkprefs.c:1841
 msgid "_Minutes before setting away:"
 msgstr "_Minutes before setting away:"
 
-#: src/gtkprefs.c:1836
+#: src/gtkprefs.c:1849
 msgid "Away m_essage:"
 msgstr "Away m_essage:"
 
-#: src/gtkprefs.c:1917
+#: src/gtkprefs.c:1930
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -4124,7 +4145,7 @@
 "<span weight=\"bold\">Web site:</span>\t\t%s\n"
 "<span weight=\"bold\">File name:</span>\t%s"
 
-#: src/gtkprefs.c:1922
+#: src/gtkprefs.c:1935
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -4139,64 +4160,64 @@
 "<span weight=\"bold\">URL:</span>  %s\n"
 "<span weight=\"bold\">File name:</span>  %s"
 
-#: src/gtkprefs.c:2155
+#: src/gtkprefs.c:2168
 msgid "Load"
 msgstr "Load"
 
-#: src/gtkprefs.c:2169
+#: src/gtkprefs.c:2182
 msgid "Summary"
 msgstr "Summary"
 
-#: src/gtkprefs.c:2217
+#: src/gtkprefs.c:2230
 msgid "Details"
 msgstr "Details"
 
-#: src/gtkprefs.c:2362
+#: src/gtkprefs.c:2375
 msgid "_Edit"
 msgstr "_Edit"
 
-#: src/gtkprefs.c:2398
+#: src/gtkprefs.c:2411
 msgid "Interface"
 msgstr "Interface"
 
-#: src/gtkprefs.c:2401
+#: src/gtkprefs.c:2414
 msgid "Message Text"
 msgstr "Message Text"
 
-#: src/gtkprefs.c:2402
+#: src/gtkprefs.c:2415
 msgid "Shortcuts"
 msgstr "Shortcuts"
 
-#: src/gtkprefs.c:2403
+#: src/gtkprefs.c:2416
 msgid "Smiley Themes"
 msgstr "Smiley Themes"
 
-#: src/gtkprefs.c:2404
+#: src/gtkprefs.c:2417
 msgid "Sounds"
 msgstr "Sounds"
 
-#: src/gtkprefs.c:2405
+#: src/gtkprefs.c:2418
 msgid "Network"
 msgstr "Network"
 
 #. We use the registered default browser in windows
-#: src/gtkprefs.c:2408
+#: src/gtkprefs.c:2421
 msgid "Browser"
 msgstr "Browser"
 
-#: src/gtkprefs.c:2410
+#: src/gtkprefs.c:2423
 msgid "Logging"
 msgstr "Logging"
 
-#: src/gtkprefs.c:2411
+#: src/gtkprefs.c:2424
 msgid "Away / Idle"
 msgstr "Away / Idle"
 
-#: src/gtkprefs.c:2412
+#: src/gtkprefs.c:2425
 msgid "Away Messages"
 msgstr "Away Messages"
 
-#: src/gtkprefs.c:2415
+#: src/gtkprefs.c:2428
 msgid "Plugins"
 msgstr "Plugins"
 
@@ -4220,7 +4241,7 @@
 msgid "Block only the users below"
 msgstr "Block only the users below"
 
-#: src/gtkprivacy.c:385 src/protocols/jabber/jabber.c:1448
+#: src/gtkprivacy.c:385 src/protocols/jabber/jabber.c:1449
 msgid "Privacy"
 msgstr "Privacy"
 
@@ -4284,27 +4305,43 @@
 #. *
 #. * A wrapper for gaim_request_action() that uses Yes and No buttons.
 #.
-#: src/gtkrequest.c:233 src/protocols/gg/gg.c:867
-#: src/protocols/novell/novell.c:1844 src/protocols/silc/buddy.c:307
-#: src/protocols/silc/pk.c:116 src/request.h:1233
+#: src/gtkrequest.c:240 src/protocols/gg/gg.c:949
+#: src/protocols/novell/novell.c:1845 src/protocols/silc/buddy.c:307
+#: src/protocols/silc/pk.c:116 src/request.h:1234
 msgid "Yes"
 msgstr "Yes"
 
-#: src/gtkrequest.c:234 src/protocols/gg/gg.c:867
-#: src/protocols/novell/novell.c:1845 src/protocols/silc/buddy.c:308
-#: src/protocols/silc/pk.c:117 src/request.h:1233
+#: src/gtkrequest.c:241 src/protocols/gg/gg.c:949
+#: src/protocols/novell/novell.c:1846 src/protocols/silc/buddy.c:308
+#: src/protocols/silc/pk.c:117 src/request.h:1234
 msgid "No"
 msgstr "No"
 
-#: src/gtkrequest.c:237
+#: src/gtkrequest.c:244
 msgid "Apply"
 msgstr "Apply"
 
-#: src/gtkrequest.c:238 src/protocols/msn/msn.c:316
-#: src/protocols/silc/util.c:311
+#: src/gtkrequest.c:245 src/protocols/msn/msn.c:314
+#: src/protocols/silc/util.c:332
 msgid "Close"
 msgstr "Close"
 
+#: src/gtkrequest.c:1391
+msgid "That file already exists"
+msgstr "That file already exists"
+
+#: src/gtkrequest.c:1392
+msgid "Would you like to overwrite it?"
+msgstr "Would you like to overwrite it?"
+
+#: src/gtkrequest.c:1430 src/gtkrequest.c:1451
+msgid "Save File..."
+msgstr "Save File..."
+
+#: src/gtkrequest.c:1431 src/gtkrequest.c:1452
+msgid "Open File..."
+msgstr "Open File..."
+
 #: src/gtkroomlist.c:330
 msgid "Room List"
 msgstr "Room List"
@@ -4376,23 +4413,15 @@
 "Unable to play sound because the configured sound command could not be "
 "launched: %s"
 
-#: src/gtkutils.c:149
-msgid "Can't save icon file to disk."
-msgstr "Can't save icon file to disk."
-
-#: src/gtkutils.c:184
-msgid "Save Icon"
-msgstr "Save Icon"
-
 #: src/log.c:106
 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:486
+#: src/log.c:489
 msgid "XML"
 msgstr "XML"
 
-#: src/log.c:571
+#: src/log.c:574
 #, c-format
 msgid ""
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -4401,7 +4430,7 @@
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
 "REPLY&gt;:</b></font> %s<br/>\n"
 
-#: src/log.c:573
+#: src/log.c:576
 #, c-format
 msgid ""
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -4410,25 +4439,25 @@
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
 "REPLY&gt;:</b></font> %s<br/>\n"
 
-#: src/log.c:624 src/log.c:811
+#: src/log.c:627 src/log.c:814
 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:634 src/log.c:823
+#: src/log.c:637 src/log.c:826
 #, 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:671
+#: src/log.c:674
 msgid "HTML"
 msgstr "HTML"
 
-#: src/log.c:756
+#: src/log.c:759
 #, c-format
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <AUTO-REPLY>: %s\n"
 
-#: src/log.c:856
+#: src/log.c:859
 msgid "Plain text"
 msgstr "Plain text"
 
@@ -4520,12 +4549,12 @@
 msgstr "Slightly less boring default"
 
 #: src/protocols/gg/gg.c:49 src/protocols/jabber/jutil.c:44
-#: src/protocols/msn/msn.c:465 src/protocols/msn/state.c:29
+#: src/protocols/msn/msn.c:462 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:2715
-#: src/protocols/novell/novell.c:2834 src/protocols/novell/novell.c:2885
-#: src/protocols/oscar/oscar.c:611 src/protocols/yahoo/yahoo.c:2844
-#: src/protocols/yahoo/yahoo.c:2959
+#: src/protocols/msn/state.c:38 src/protocols/novell/novell.c:2721
+#: src/protocols/novell/novell.c:2840 src/protocols/novell/novell.c:2891
+#: src/protocols/oscar/oscar.c:616 src/protocols/yahoo/yahoo.c:2851
+#: src/protocols/yahoo/yahoo.c:2967
 msgid "Available"
 msgstr "Available"
 
@@ -4537,12 +4566,12 @@
 msgid "Away for friends only"
 msgstr "Away for friends only"
 
-#: src/protocols/gg/gg.c:53 src/protocols/jabber/jabber.c:963
-#: src/protocols/jabber/presence.c:126 src/protocols/oscar/oscar.c:532
-#: src/protocols/oscar/oscar.c:5378 src/protocols/oscar/oscar.c:5456
-#: src/protocols/oscar/oscar.c:5480 src/protocols/oscar/oscar.c:6667
-#: src/protocols/oscar/oscar.c:6672 src/protocols/yahoo/yahoo.c:2486
-#: src/protocols/yahoo/yahoo.c:2864 src/protocols/yahoo/yahoo.c:2969
+#: src/protocols/gg/gg.c:53 src/protocols/jabber/jabber.c:964
+#: src/protocols/jabber/presence.c:126 src/protocols/oscar/oscar.c:536
+#: src/protocols/oscar/oscar.c:5394 src/protocols/oscar/oscar.c:5472
+#: src/protocols/oscar/oscar.c:5496 src/protocols/oscar/oscar.c:6684
+#: src/protocols/oscar/oscar.c:6689 src/protocols/yahoo/yahoo.c:2509
+#: src/protocols/yahoo/yahoo.c:2871 src/protocols/yahoo/yahoo.c:2979
 msgid "Invisible"
 msgstr "Invisible"
 
@@ -4558,14 +4587,14 @@
 msgid "Unable to resolve hostname."
 msgstr "Unable to resolve hostname."
 
-#: src/protocols/gg/gg.c:139 src/protocols/novell/novell.c:1664
+#: src/protocols/gg/gg.c:139 src/protocols/novell/novell.c:1665
 msgid "Unable to connect to server."
 msgstr "Unable to connect to server."
 
 #: src/protocols/gg/gg.c:142 src/protocols/jabber/auth.c:130
 #: src/protocols/jabber/auth.c:204 src/protocols/jabber/auth.c:354
 #: src/protocols/jabber/auth.c:452 src/protocols/jabber/auth.c:464
-#: src/protocols/jabber/jabber.c:105
+#: src/protocols/jabber/jabber.c:106
 msgid "Invalid response from server."
 msgstr "Invalid response from server."
 
@@ -4585,174 +4614,177 @@
 msgid "Unknown Error Code."
 msgstr "Unknown Error Code."
 
-#: src/protocols/gg/gg.c:253
+#: src/protocols/gg/gg.c:242 src/protocols/oscar/oscar.c:3819
+#, 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:243 src/protocols/gg/gg.c:1011
+#: src/protocols/napster/napster.c:393 src/protocols/oscar/oscar.c:3823
+#: src/protocols/oscar/oscar.c:4039 src/protocols/silc/ops.c:1067
+#: src/protocols/silc/ops.c:1128 src/protocols/toc/toc.c:468
+#: src/protocols/zephyr/zephyr.c:635
+msgid "Buddy Information"
+msgstr "Buddy Information"
+
+#: src/protocols/gg/gg.c:293
 #, c-format
 msgid "Status: %s"
 msgstr "Status: %s"
 
-#: src/protocols/gg/gg.c:406
+#: src/protocols/gg/gg.c:446
 msgid "Could not connect"
 msgstr "Could not connect"
 
-#: src/protocols/gg/gg.c:413
+#: src/protocols/gg/gg.c:453
 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:600 src/protocols/icq/gaim_icq.c:344
+#: src/protocols/gg/gg.c:674 src/protocols/icq/gaim_icq.c:344
 #: src/protocols/napster/napster.c:475 src/protocols/napster/napster.c:506
-#: src/protocols/toc/toc.c:170 src/protocols/yahoo/yahoo.c:2124
-#: src/protocols/yahoo/yahoo.c:2155 src/protocols/yahoo/yahoo.c:2218
+#: src/protocols/toc/toc.c:170 src/protocols/yahoo/yahoo.c:2156
+#: src/protocols/yahoo/yahoo.c:2185 src/protocols/yahoo/yahoo.c:2248
 #: src/protocols/yahoo/yahoo_filexfer.c:68
 #: src/protocols/yahoo/yahoo_filexfer.c:109
 msgid "Unable to connect."
 msgstr "Unable to connect."
 
-#: src/protocols/gg/gg.c:616
+#: src/protocols/gg/gg.c:690
 msgid "Reading data"
 msgstr "Reading data"
 
-#: src/protocols/gg/gg.c:619
+#: src/protocols/gg/gg.c:693
 msgid "Balancer handshake"
 msgstr "Balancer handshake"
 
-#: src/protocols/gg/gg.c:622
+#: src/protocols/gg/gg.c:696
 msgid "Reading server key"
 msgstr "Reading server key"
 
-#: src/protocols/gg/gg.c:625
+#: src/protocols/gg/gg.c:699
 msgid "Exchanging key hash"
 msgstr "Exchanging key hash"
 
-#: src/protocols/gg/gg.c:635
+#: src/protocols/gg/gg.c:709
 msgid "Critical error in GG library\n"
 msgstr "Critical error in GG library\n"
 
-#: src/protocols/gg/gg.c:653 src/protocols/gg/gg.c:744
+#: src/protocols/gg/gg.c:727 src/protocols/gg/gg.c:818
 #: src/protocols/toc/toc.c:146
 #, c-format
 msgid "Connect to %s failed"
 msgstr "Connect to %s failed"
 
-#: src/protocols/gg/gg.c:701
+#: src/protocols/gg/gg.c:775
 msgid "Unable to ping server"
 msgstr "Unable to ping server"
 
-#: src/protocols/gg/gg.c:713
+#: src/protocols/gg/gg.c:787
 msgid "Send as message"
 msgstr "Send as message"
 
-#: src/protocols/gg/gg.c:718
+#: src/protocols/gg/gg.c:792
 msgid "Looking up GG server"
 msgstr "Looking up GG server"
 
-#: src/protocols/gg/gg.c:721
+#: src/protocols/gg/gg.c:795
 msgid "Invalid Gadu-Gadu UIN specified"
 msgstr "Invalid Gadu-Gadu UIN specified"
 
-#: src/protocols/gg/gg.c:768
+#: src/protocols/gg/gg.c:842
 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:835
+#: src/protocols/gg/gg.c:917
 msgid "Couldn't get search results"
 msgstr "Couldn't get search results"
 
-#: src/protocols/gg/gg.c:840
+#: src/protocols/gg/gg.c:922
 msgid "Gadu-Gadu Search Engine"
 msgstr "Gadu-Gadu Search Engine"
 
-#: src/protocols/gg/gg.c:866
+#: src/protocols/gg/gg.c:948
 msgid "Active"
 msgstr "Active"
 
-#: src/protocols/gg/gg.c:871 src/protocols/oscar/oscar.c:4829
+#: src/protocols/gg/gg.c:953 src/protocols/oscar/oscar.c:4845
 msgid "UIN"
 msgstr "UIN"
 
 #. First Name
-#: src/protocols/gg/gg.c:875 src/protocols/jabber/jabber.c:612
-#: src/protocols/oscar/oscar.c:4840 src/protocols/silc/ops.c:774
+#: src/protocols/gg/gg.c:957 src/protocols/jabber/jabber.c:613
+#: src/protocols/oscar/oscar.c:4856 src/protocols/silc/ops.c:790
 #: src/protocols/trepia/trepia.c:267
 msgid "First Name"
 msgstr "Forename"
 
 #. Last Name
-#: src/protocols/gg/gg.c:880 src/protocols/jabber/jabber.c:617
-#: src/protocols/oscar/oscar.c:4841 src/protocols/trepia/trepia.c:274
+#: src/protocols/gg/gg.c:962 src/protocols/jabber/jabber.c:618
+#: src/protocols/oscar/oscar.c:4857 src/protocols/trepia/trepia.c:274
 msgid "Last Name"
 msgstr "Surname"
 
-#: src/protocols/gg/gg.c:884 src/protocols/gg/gg.c:1623
-#: src/protocols/irc/msgs.c:183 src/protocols/oscar/oscar.c:4830
+#: src/protocols/gg/gg.c:966 src/protocols/gg/gg.c:1707
+#: src/protocols/irc/msgs.c:183 src/protocols/oscar/oscar.c:4846
+#: src/protocols/silc/ops.c:1184
 msgid "Nick"
 msgstr "Nick"
 
-#: src/protocols/gg/gg.c:891 src/protocols/gg/gg.c:894
+#: src/protocols/gg/gg.c:973 src/protocols/gg/gg.c:976
 msgid "Birth Year"
 msgstr "Birth Year"
 
-#: src/protocols/gg/gg.c:900 src/protocols/gg/gg.c:902
-#: src/protocols/gg/gg.c:904
+#: src/protocols/gg/gg.c:982 src/protocols/gg/gg.c:984
+#: src/protocols/gg/gg.c:986
 msgid "Sex"
 msgstr "Sex"
 
 #. City
-#: src/protocols/gg/gg.c:908 src/protocols/jabber/jabber.c:627
-#: src/protocols/oscar/oscar.c:4884 src/protocols/oscar/oscar.c:4892
+#: src/protocols/gg/gg.c:990 src/protocols/jabber/jabber.c:628
+#: src/protocols/oscar/oscar.c:4900 src/protocols/oscar/oscar.c:4908
 #: src/protocols/trepia/trepia.c:331 src/protocols/trepia/trepia.c:410
 msgid "City"
 msgstr "City"
 
-#. res[0] == username
-#: src/protocols/gg/gg.c:929 src/protocols/msn/msn.c:1225
-#: src/protocols/msn/msn.c:1533 src/protocols/msn/msn.c:1549
-#: src/protocols/napster/napster.c:393 src/protocols/oscar/oscar.c:3807
-#: src/protocols/oscar/oscar.c:4023 src/protocols/toc/toc.c:468
-#: src/protocols/yahoo/yahoo_profile.c:748
-#: src/protocols/yahoo/yahoo_profile.c:785
-#: src/protocols/yahoo/yahoo_profile.c:837
-#: src/protocols/yahoo/yahoo_profile.c:1132 src/protocols/zephyr/zephyr.c:610
-msgid "Buddy Information"
-msgstr "Buddy Information"
-
-#: src/protocols/gg/gg.c:951
+#: src/protocols/gg/gg.c:1033
 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:959
+#: src/protocols/gg/gg.c:1041
 msgid "Couldn't Import Buddy List from Server"
 msgstr "Couldn't Import Buddy List from Server"
 
-#: src/protocols/gg/gg.c:1021
+#: src/protocols/gg/gg.c:1103
 msgid "Buddy List successfully transferred to Gadu-Gadu server"
 msgstr "Buddy List successfully transferred to Gadu-Gadu server"
 
-#: src/protocols/gg/gg.c:1029
+#: src/protocols/gg/gg.c:1111
 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:1037
+#: src/protocols/gg/gg.c:1119
 msgid "Buddy List successfully deleted from Gadu-Gadu server"
 msgstr "Buddy List successfully deleted from Gadu-Gadu server"
 
-#: src/protocols/gg/gg.c:1045
+#: src/protocols/gg/gg.c:1127
 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:1054
+#: src/protocols/gg/gg.c:1136
 msgid "Password changed successfully"
 msgstr "Password changed successfully"
 
-#: src/protocols/gg/gg.c:1061
+#: src/protocols/gg/gg.c:1143
 msgid "Password couldn't be changed"
 msgstr "Password couldn't be changed"
 
-#: src/protocols/gg/gg.c:1180
+#: src/protocols/gg/gg.c:1262
 msgid "Error communicating with Gadu-Gadu server"
 msgstr "Error communicating with Gadu-Gadu server"
 
-#: src/protocols/gg/gg.c:1181
+#: src/protocols/gg/gg.c:1263
 msgid ""
 "Gaim was unable to complete your request due to a problem communicating with "
 "the Gadu-Gadu HTTP server.  Please try again later."
@@ -4760,11 +4792,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:1210
+#: src/protocols/gg/gg.c:1292
 msgid "Unable to import Gadu-Gadu buddy list"
 msgstr "Unable to import Gadu-Gadu buddy list"
 
-#: src/protocols/gg/gg.c:1211
+#: src/protocols/gg/gg.c:1293
 msgid ""
 "Gaim was unable to connect to the Gadu-Gadu buddy list server.  Please try "
 "again later."
@@ -4772,25 +4804,25 @@
 "Gaim was unable to connect to the Gadu-Gadu buddy list server.  Please try "
 "again later."
 
-#: src/protocols/gg/gg.c:1284
+#: src/protocols/gg/gg.c:1366
 msgid "Couldn't export buddy list"
 msgstr "Couldn't export buddy list"
 
-#: src/protocols/gg/gg.c:1285 src/protocols/gg/gg.c:1308
+#: src/protocols/gg/gg.c:1367 src/protocols/gg/gg.c:1390
 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:1307
+#: src/protocols/gg/gg.c:1389
 msgid "Unable to delete Gadu-Gadu buddy list"
 msgstr "Unable to delete Gadu-Gadu buddy list"
 
-#: src/protocols/gg/gg.c:1358
+#: src/protocols/gg/gg.c:1440
 msgid "Unable to access directory"
 msgstr "Unable to access directory"
 
-#: src/protocols/gg/gg.c:1359
+#: src/protocols/gg/gg.c:1441
 msgid ""
 "Gaim was unable to search the Directory because it was unable to connect to "
 "the directory server.  Please try again later."
@@ -4798,11 +4830,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:1393
+#: src/protocols/gg/gg.c:1475
 msgid "Unable to change Gadu-Gadu password"
 msgstr "Unable to change Gadu-Gadu password"
 
-#: src/protocols/gg/gg.c:1394
+#: src/protocols/gg/gg.c:1476
 msgid ""
 "Gaim was unable to change your password due to an error connecting to the "
 "Gadu-Gadu server.  Please try again later."
@@ -4810,33 +4842,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:1410
+#: src/protocols/gg/gg.c:1492
 msgid "Directory Search"
 msgstr "Directory Search"
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
-#: src/protocols/gg/gg.c:1415 src/protocols/jabber/jabber.c:1061
+#: src/protocols/gg/gg.c:1497 src/protocols/jabber/jabber.c:1062
 #: src/protocols/toc/toc.c:1550
 msgid "Change Password"
 msgstr "Change Password"
 
-#: src/protocols/gg/gg.c:1419
+#: src/protocols/gg/gg.c:1501
 msgid "Import Buddy List from Server"
 msgstr "Import Buddy List from Server"
 
-#: src/protocols/gg/gg.c:1423
+#: src/protocols/gg/gg.c:1505
 msgid "Export Buddy List to Server"
 msgstr "Export Buddy List to Server"
 
-#: src/protocols/gg/gg.c:1427
+#: src/protocols/gg/gg.c:1509
 msgid "Delete Buddy List from Server"
 msgstr "Delete Buddy List from Server"
 
-#: src/protocols/gg/gg.c:1460
+#: src/protocols/gg/gg.c:1542
 msgid "Unable to access user profile."
 msgstr "Unable to access user profile."
 
-#: src/protocols/gg/gg.c:1461
+#: src/protocols/gg/gg.c:1543
 msgid ""
 "Gaim was unable to access this user's profile due to an error connecting to "
 "the directory server.  Please try again later."
@@ -4854,7 +4886,7 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/gg/gg.c:1602 src/protocols/gg/gg.c:1604
+#: src/protocols/gg/gg.c:1686 src/protocols/gg/gg.c:1688
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr "Gadu-Gadu Protocol Plugin"
 
@@ -4868,14 +4900,14 @@
 msgstr "The user %s (%s%s%s%s%s) wants you to authorise them."
 
 #: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:232
-#: src/protocols/msn/userlist.c:100 src/protocols/oscar/oscar.c:3538
-#: src/protocols/oscar/oscar.c:6100
+#: src/protocols/msn/userlist.c:100 src/protocols/oscar/oscar.c:3554
+#: src/protocols/oscar/oscar.c:6117
 msgid "Authorize"
 msgstr "Authorise"
 
 #: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:233
-#: src/protocols/msn/userlist.c:101 src/protocols/oscar/oscar.c:3540
-#: src/protocols/oscar/oscar.c:6101
+#: src/protocols/msn/userlist.c:101 src/protocols/oscar/oscar.c:3556
+#: src/protocols/oscar/oscar.c:6118
 msgid "Deny"
 msgstr "Deny"
 
@@ -4895,17 +4927,19 @@
 msgid "Gaim User"
 msgstr "Gaim User"
 
-#: src/protocols/irc/cmds.c:43
+#: src/protocols/irc/cmds.c:43 src/protocols/silc/silc.c:1286
 #, c-format
 msgid "Unknown command: %s"
 msgstr "Unknown command: %s"
 
-#: src/protocols/irc/cmds.c:444 src/protocols/jabber/chat.c:544
+#: src/protocols/irc/cmds.c:448 src/protocols/jabber/chat.c:544
+#: src/protocols/silc/silc.c:995
 #, c-format
 msgid "current topic is: %s"
 msgstr "current topic is: %s"
 
-#: src/protocols/irc/cmds.c:447 src/protocols/jabber/chat.c:546
+#: src/protocols/irc/cmds.c:451 src/protocols/jabber/chat.c:546
+#: src/protocols/silc/silc.c:998
 msgid "No topic is set"
 msgstr "No topic is set"
 
@@ -4937,54 +4971,51 @@
 msgid "MOTD for %s"
 msgstr "MOTD for %s"
 
-#: src/protocols/irc/irc.c:141
+#: src/protocols/irc/irc.c:93 src/protocols/irc/irc.c:373
+msgid "Server has disconnected"
+msgstr "Server has disconnected"
+
+#: src/protocols/irc/irc.c:147
 msgid "View MOTD"
 msgstr "View MOTD"
 
-#. FIXME: remove this when the ui does it for us.
-#: src/protocols/irc/irc.c:168 src/protocols/jabber/buddy.c:928
-#: src/protocols/msn/msn.c:543 src/protocols/oscar/oscar.c:448
-#: src/protocols/oscar/oscar.c:6771 src/protocols/yahoo/yahoo.c:2691
-msgid "Send File"
-msgstr "Send File"
-
-#: src/protocols/irc/irc.c:182 src/protocols/silc/chat.c:32
+#: src/protocols/irc/irc.c:169 src/protocols/silc/chat.c:32
 msgid "_Channel:"
 msgstr "_Channel:"
 
-#: src/protocols/irc/irc.c:187 src/protocols/jabber/chat.c:59
+#: src/protocols/irc/irc.c:174 src/protocols/jabber/chat.c:59
 msgid "_Password:"
 msgstr "_Password:"
 
-#: src/protocols/irc/irc.c:207
+#: src/protocols/irc/irc.c:194
 msgid "IRC nicks may not contain whitespace"
 msgstr "IRC nicks may not contain whitespace"
 
-#: src/protocols/irc/irc.c:226 src/protocols/toc/toc.c:198
+#: src/protocols/irc/irc.c:213 src/protocols/toc/toc.c:198
 #, c-format
 msgid "Signon: %s"
 msgstr "Signon: %s"
 
-#: src/protocols/irc/irc.c:235
+#: src/protocols/irc/irc.c:222
 msgid "Couldn't create socket"
 msgstr "Couldn't create socket"
 
-#: src/protocols/irc/irc.c:250 src/protocols/jabber/jabber.c:296
-#: src/protocols/oscar/oscar.c:1523 src/protocols/oscar/oscar.c:1587
+#: src/protocols/irc/irc.c:237 src/protocols/jabber/jabber.c:297
+#: src/protocols/oscar/oscar.c:1529 src/protocols/oscar/oscar.c:1593
 msgid "Couldn't connect to host"
 msgstr "Couldn't connect to host"
 
-#: src/protocols/irc/irc.c:387 src/protocols/trepia/trepia.c:926
+#: src/protocols/irc/irc.c:370 src/protocols/trepia/trepia.c:926
 msgid "Read error"
 msgstr "Read error"
 
-#: src/protocols/irc/irc.c:538 src/protocols/silc/chat.c:1343
-#: src/protocols/yahoo/yahoochat.c:1341
+#: src/protocols/irc/irc.c:521 src/protocols/silc/chat.c:1363
+#: src/protocols/yahoo/yahoochat.c:1380
 msgid "Users"
 msgstr "Users"
 
-#: src/protocols/irc/irc.c:541 src/protocols/silc/chat.c:1346
-#: src/protocols/silc/ops.c:1017 src/protocols/yahoo/yahoochat.c:1350
+#: src/protocols/irc/irc.c:524 src/protocols/silc/chat.c:1366
+#: src/protocols/silc/ops.c:1146 src/protocols/yahoo/yahoochat.c:1389
 msgid "Topic"
 msgstr "Topic"
 
@@ -4997,34 +5028,35 @@
 #. *< id
 #. *< name
 #. *< version
-#: src/protocols/irc/irc.c:643
+#: src/protocols/irc/irc.c:628
 msgid "IRC Protocol Plugin"
 msgstr "IRC Protocol Plugin"
 
 #. *  summary
-#: src/protocols/irc/irc.c:644
+#: src/protocols/irc/irc.c:629
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "The IRC Protocol Plugin that Sucks Less"
 
-#: src/protocols/irc/irc.c:663 src/protocols/irc/msgs.c:197
-#: src/protocols/jabber/jabber.c:1556 src/protocols/napster/napster.c:642
-#: src/protocols/silc/ops.c:935
+#: src/protocols/irc/irc.c:648 src/protocols/irc/msgs.c:197
+#: src/protocols/jabber/jabber.c:1559 src/protocols/napster/napster.c:644
+#: src/protocols/silc/ops.c:1008 src/protocols/silc/ops.c:1110
 msgid "Server"
 msgstr "Server"
 
-#: src/protocols/irc/irc.c:666 src/protocols/jabber/jabber.c:1577
-#: src/protocols/msn/msn.c:1729 src/protocols/napster/napster.c:647
-#: src/protocols/silc/silc.c:1363 src/protocols/trepia/trepia.c:1295
+#: src/protocols/irc/irc.c:651 src/protocols/jabber/jabber.c:1580
+#: src/protocols/msn/msn.c:1758 src/protocols/napster/napster.c:649
+#: src/protocols/silc/silc.c:1576 src/protocols/trepia/trepia.c:1297
 msgid "Port"
 msgstr "Port"
 
-#: src/protocols/irc/irc.c:669 src/protocols/zephyr/zephyr.c:1442
+#: src/protocols/irc/irc.c:654 src/protocols/zephyr/zephyr.c:1915
 msgid "Encoding"
 msgstr "Encoding"
 
-#: src/protocols/irc/irc.c:672 src/protocols/irc/msgs.c:191
-#: src/protocols/jabber/jabber.c:587 src/protocols/silc/buddy.c:1449
-#: src/protocols/silc/ops.c:931
+#: src/protocols/irc/irc.c:657 src/protocols/irc/msgs.c:191
+#: src/protocols/jabber/jabber.c:588 src/protocols/silc/buddy.c:1445
+#: src/protocols/silc/ops.c:955 src/protocols/silc/ops.c:957
+#: src/protocols/silc/ops.c:1104 src/protocols/silc/ops.c:1106
 msgid "Username"
 msgstr "Username"
 
@@ -5049,12 +5081,12 @@
 msgid " <i>(identified)</i>"
 msgstr " <i>(identified)</i>"
 
-#: src/protocols/irc/msgs.c:192 src/protocols/silc/ops.c:929
-#: src/protocols/yahoo/yahoo_profile.c:1000
+#: src/protocols/irc/msgs.c:192 src/protocols/silc/ops.c:949
+#: src/protocols/silc/ops.c:1098 src/protocols/yahoo/yahoo_profile.c:1005
 msgid "Realname"
 msgstr "Realname"
 
-#: src/protocols/irc/msgs.c:202
+#: src/protocols/irc/msgs.c:202 src/protocols/silc/ops.c:1021
 msgid "Currently on"
 msgstr "Currently on"
 
@@ -5076,111 +5108,111 @@
 msgid "Buddy Information for %s"
 msgstr "Buddy Information for %s"
 
-#: src/protocols/irc/msgs.c:278
+#: src/protocols/irc/msgs.c:279
 #, c-format
 msgid "%s has changed the topic to: %s"
 msgstr "%s has changed the topic to: %s"
 
-#: src/protocols/irc/msgs.c:283
+#: src/protocols/irc/msgs.c:284
 #, c-format
 msgid "The topic for %s is: %s"
 msgstr "The topic for %s is: %s"
 
-#: src/protocols/irc/msgs.c:299
+#: src/protocols/irc/msgs.c:301
 #, c-format
 msgid "Unknown message '%s'"
 msgstr "Unknown message '%s'"
 
-#: src/protocols/irc/msgs.c:300
+#: src/protocols/irc/msgs.c:302
 msgid "Unknown message"
 msgstr "Unknown message"
 
-#: src/protocols/irc/msgs.c:300
+#: src/protocols/irc/msgs.c:302
 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:323
+#: src/protocols/irc/msgs.c:325
 #, c-format
 msgid "Users on %s: %s"
 msgstr "Users on %s: %s"
 
-#: src/protocols/irc/msgs.c:405
+#: src/protocols/irc/msgs.c:407
 msgid "No such channel"
 msgstr "No such channel"
 
 #. does this happen?
-#: src/protocols/irc/msgs.c:416
+#: src/protocols/irc/msgs.c:418
 msgid "no such channel"
 msgstr "no such channel"
 
-#: src/protocols/irc/msgs.c:419
+#: src/protocols/irc/msgs.c:421
 msgid "User is not logged in"
 msgstr "User is not logged in"
 
-#: src/protocols/irc/msgs.c:424
+#: src/protocols/irc/msgs.c:426
 msgid "No such nick or channel"
 msgstr "No such nick or channel"
 
-#: src/protocols/irc/msgs.c:444
+#: src/protocols/irc/msgs.c:446
 msgid "Could not send"
 msgstr "Could not send"
 
-#: src/protocols/irc/msgs.c:500
+#: src/protocols/irc/msgs.c:502
 #, c-format
 msgid "Joining %s requires an invitation."
 msgstr "Joining %s requires an invitation."
 
-#: src/protocols/irc/msgs.c:501
+#: src/protocols/irc/msgs.c:503
 msgid "Invitation only"
 msgstr "Invitation only"
 
-#: src/protocols/irc/msgs.c:604
+#: src/protocols/irc/msgs.c:606
 #, c-format
 msgid "You have been kicked by %s: (%s)"
 msgstr "You have been kicked by %s: (%s)"
 
-#: src/protocols/irc/msgs.c:609
+#: src/protocols/irc/msgs.c:611
 #, c-format
 msgid "Kicked by %s (%s)"
 msgstr "Kicked by %s (%s)"
 
-#: src/protocols/irc/msgs.c:630
+#: src/protocols/irc/msgs.c:632
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr "mode (%s %s) by %s"
 
-#: src/protocols/irc/msgs.c:709
+#: src/protocols/irc/msgs.c:711
 msgid "Could not change nick"
 msgstr "Could not change nick"
 
-#: src/protocols/irc/msgs.c:710
+#: src/protocols/irc/msgs.c:712
 msgid "Cannot change nick"
 msgstr "Cannot change nick"
 
-#: src/protocols/irc/msgs.c:731
+#: src/protocols/irc/msgs.c:733
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr "You have parted the channel%s%s"
 
-#: src/protocols/irc/msgs.c:771
+#: src/protocols/irc/msgs.c:773
 msgid "Error: invalid PONG from server"
 msgstr "Error: invalid PONG from server"
 
-#: src/protocols/irc/msgs.c:773
+#: src/protocols/irc/msgs.c:775
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr "PING reply -- Lag: %lu seconds"
 
-#: src/protocols/irc/msgs.c:848
+#: src/protocols/irc/msgs.c:850
 #, c-format
 msgid "Cannot join %s:"
 msgstr "Cannot join %s:"
 
-#: src/protocols/irc/msgs.c:849 src/protocols/silc/ops.c:878
+#: src/protocols/irc/msgs.c:851 src/protocols/silc/ops.c:894
 msgid "Cannot join channel"
 msgstr "Cannot join channel"
 
-#: src/protocols/irc/msgs.c:885
+#: src/protocols/irc/msgs.c:887
 #, c-format
 msgid "Wallops from %s"
 msgstr "Wallops from %s"
@@ -5279,7 +5311,7 @@
 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:122 src/protocols/jabber/jabber.c:1406
+#: src/protocols/irc/parse.c:122 src/protocols/jabber/jabber.c:1407
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr "nick &lt;new nickname&gt;:  Change your nickname."
 
@@ -5367,7 +5399,7 @@
 msgid "whois &lt;nick&gt;:  Get information on a user."
 msgstr "whois &lt;nick&gt;:  Get information on a user."
 
-#: src/protocols/irc/parse.c:228 src/protocols/zephyr/zephyr.c:236
+#: src/protocols/irc/parse.c:228 src/protocols/zephyr/zephyr.c:256
 msgid ""
 "(There was an error converting this message.  Check the 'Encoding' option in "
 "the Account Editor)"
@@ -5388,7 +5420,7 @@
 msgid "CTCP PING reply"
 msgstr "CTCP PING reply"
 
-#: src/protocols/irc/parse.c:485 src/protocols/oscar/oscar.c:1424
+#: src/protocols/irc/parse.c:485 src/protocols/oscar/oscar.c:1430
 #: src/protocols/toc/toc.c:188 src/protocols/toc/toc.c:596
 #: src/protocols/toc/toc.c:612 src/protocols/toc/toc.c:689
 msgid "Disconnected."
@@ -5423,87 +5455,88 @@
 msgid "Invalid challenge from server"
 msgstr "Invalid challenge from server"
 
-#: src/protocols/jabber/buddy.c:247 src/protocols/jabber/buddy.c:604
-#: src/protocols/silc/ops.c:770
+#: src/protocols/jabber/buddy.c:246 src/protocols/jabber/buddy.c:604
+#: src/protocols/silc/ops.c:786
 msgid "Full Name"
 msgstr "Full Name"
 
-#: src/protocols/jabber/buddy.c:248 src/protocols/jabber/buddy.c:617
-#: src/protocols/silc/ops.c:782
+#: src/protocols/jabber/buddy.c:247 src/protocols/jabber/buddy.c:617
+#: src/protocols/silc/ops.c:798
 msgid "Family Name"
 msgstr "Family Name"
 
-#: src/protocols/jabber/buddy.c:249 src/protocols/jabber/buddy.c:621
+#: src/protocols/jabber/buddy.c:248 src/protocols/jabber/buddy.c:621
 msgid "Given Name"
 msgstr "Given Name"
 
-#: src/protocols/jabber/buddy.c:250 src/protocols/jabber/buddy.c:635
-#: src/protocols/jabber/jabber.c:607 src/protocols/msn/msn.c:1150
-#: src/protocols/silc/buddy.c:1446 src/protocols/silc/ops.c:786
-#: src/protocols/silc/ops.c:927 src/protocols/yahoo/yahoo_profile.c:995
+#: src/protocols/jabber/buddy.c:249 src/protocols/jabber/buddy.c:635
+#: src/protocols/jabber/jabber.c:608 src/protocols/msn/msn.c:1172
+#: src/protocols/silc/buddy.c:1442 src/protocols/silc/ops.c:802
+#: src/protocols/silc/ops.c:945 src/protocols/silc/ops.c:1094
+#: src/protocols/yahoo/yahoo_profile.c:1000
 msgid "Nickname"
 msgstr "Nickname"
 
-#: src/protocols/jabber/buddy.c:251 src/protocols/jabber/jabber.c:647
+#: src/protocols/jabber/buddy.c:250 src/protocols/jabber/jabber.c:648
 msgid "URL"
 msgstr "URL"
 
-#: src/protocols/jabber/buddy.c:252 src/protocols/jabber/buddy.c:663
+#: src/protocols/jabber/buddy.c:251 src/protocols/jabber/buddy.c:663
 msgid "Street Address"
 msgstr "Street Address"
 
-#: src/protocols/jabber/buddy.c:253 src/protocols/jabber/buddy.c:659
+#: src/protocols/jabber/buddy.c:252 src/protocols/jabber/buddy.c:659
 msgid "Extended Address"
 msgstr "Extended Address"
 
-#: src/protocols/jabber/buddy.c:254 src/protocols/jabber/buddy.c:667
+#: src/protocols/jabber/buddy.c:253 src/protocols/jabber/buddy.c:667
 msgid "Locality"
 msgstr "Locality"
 
-#: src/protocols/jabber/buddy.c:255 src/protocols/jabber/buddy.c:671
+#: src/protocols/jabber/buddy.c:254 src/protocols/jabber/buddy.c:671
 msgid "Region"
 msgstr "Region"
 
-#: src/protocols/jabber/buddy.c:256 src/protocols/jabber/buddy.c:675
-#: src/protocols/jabber/jabber.c:637
+#: src/protocols/jabber/buddy.c:255 src/protocols/jabber/buddy.c:675
+#: src/protocols/jabber/jabber.c:638
 msgid "Postal Code"
 msgstr "Postal Code"
 
 #. Country
-#: src/protocols/jabber/buddy.c:257 src/protocols/jabber/buddy.c:680
+#: src/protocols/jabber/buddy.c:256 src/protocols/jabber/buddy.c:680
 #: src/protocols/trepia/trepia.c:339 src/protocols/trepia/trepia.c:416
 msgid "Country"
 msgstr "Country"
 
-#: src/protocols/jabber/buddy.c:258 src/protocols/jabber/buddy.c:691
+#: src/protocols/jabber/buddy.c:257 src/protocols/jabber/buddy.c:691
 #: src/protocols/jabber/buddy.c:698
 msgid "Telephone"
 msgstr "Telephone"
 
-#: src/protocols/jabber/buddy.c:259 src/protocols/jabber/buddy.c:709
-#: src/protocols/jabber/buddy.c:717 src/protocols/silc/buddy.c:1499
-#: src/protocols/silc/silc.c:633 src/protocols/yahoo/yahoo_profile.c:990
+#: src/protocols/jabber/buddy.c:258 src/protocols/jabber/buddy.c:709
+#: src/protocols/jabber/buddy.c:717 src/protocols/silc/silc.c:637
+#: src/protocols/silc/util.c:508 src/protocols/yahoo/yahoo_profile.c:995
 msgid "Email"
 msgstr "Email"
 
-#: src/protocols/jabber/buddy.c:260 src/protocols/jabber/buddy.c:732
+#: src/protocols/jabber/buddy.c:259 src/protocols/jabber/buddy.c:732
 msgid "Organization Name"
 msgstr "Organisation Name"
 
-#: src/protocols/jabber/buddy.c:261 src/protocols/jabber/buddy.c:736
+#: src/protocols/jabber/buddy.c:260 src/protocols/jabber/buddy.c:736
 msgid "Organization Unit"
 msgstr "Organisation Unit"
 
-#: src/protocols/jabber/buddy.c:262 src/protocols/jabber/buddy.c:742
+#: src/protocols/jabber/buddy.c:261 src/protocols/jabber/buddy.c:742
 msgid "Title"
 msgstr "Title"
 
-#: src/protocols/jabber/buddy.c:263 src/protocols/jabber/buddy.c:745
+#: src/protocols/jabber/buddy.c:262 src/protocols/jabber/buddy.c:745
 msgid "Role"
 msgstr "Role"
 
-#: src/protocols/jabber/buddy.c:264 src/protocols/jabber/buddy.c:638
-#: src/protocols/oscar/oscar.c:4865
+#: src/protocols/jabber/buddy.c:263 src/protocols/jabber/buddy.c:638
+#: src/protocols/oscar/oscar.c:4881
 msgid "Birthday"
 msgstr "Birthday"
 
@@ -5524,25 +5557,25 @@
 msgstr "Jabber ID"
 
 #: src/protocols/jabber/buddy.c:563 src/protocols/jabber/buddy.c:570
-#: src/protocols/jabber/buddy.c:581 src/protocols/jabber/jabber.c:937
-#: src/protocols/msn/msn.c:453 src/protocols/novell/novell.c:2737
-#: src/protocols/novell/novell.c:2741 src/protocols/oscar/oscar.c:574
-#: src/protocols/oscar/oscar.c:580 src/protocols/oscar/oscar.c:582
-#: src/protocols/yahoo/yahoo.c:2611
+#: src/protocols/jabber/buddy.c:581 src/protocols/jabber/jabber.c:938
+#: src/protocols/msn/msn.c:450 src/protocols/novell/novell.c:2743
+#: src/protocols/novell/novell.c:2747 src/protocols/oscar/oscar.c:578
+#: src/protocols/oscar/oscar.c:584 src/protocols/oscar/oscar.c:586
+#: src/protocols/yahoo/yahoo.c:2634
 msgid "Status"
 msgstr "Status"
 
-#: src/protocols/jabber/buddy.c:579 src/protocols/jabber/jabber.c:1559
+#: src/protocols/jabber/buddy.c:579 src/protocols/jabber/jabber.c:1562
 msgid "Resource"
 msgstr "Resource"
 
-#: src/protocols/jabber/buddy.c:625 src/protocols/silc/ops.c:778
+#: src/protocols/jabber/buddy.c:625 src/protocols/silc/ops.c:794
 msgid "Middle Name"
 msgstr "Middle Name"
 
-#: src/protocols/jabber/buddy.c:643 src/protocols/jabber/jabber.c:622
-#: src/protocols/oscar/oscar.c:4883 src/protocols/oscar/oscar.c:4891
-#: src/protocols/silc/ops.c:814
+#: src/protocols/jabber/buddy.c:643 src/protocols/jabber/jabber.c:623
+#: src/protocols/oscar/oscar.c:4899 src/protocols/oscar/oscar.c:4907
+#: src/protocols/silc/ops.c:830
 msgid "Address"
 msgstr "Address"
 
@@ -5562,31 +5595,31 @@
 msgid "Jabber Profile"
 msgstr "Jabber Profile"
 
-#: src/protocols/jabber/buddy.c:936
+#: src/protocols/jabber/buddy.c:932
 msgid "Un-hide From"
 msgstr "Un-hide From"
 
-#: src/protocols/jabber/buddy.c:939
+#: src/protocols/jabber/buddy.c:935
 msgid "Temporarily Hide From"
 msgstr "Temporarily Hide From"
 
 #. && NOT ME
-#: src/protocols/jabber/buddy.c:946
+#: src/protocols/jabber/buddy.c:942
 msgid "Cancel Presence Notification"
 msgstr "Cancel Presence Notification"
 
-#: src/protocols/jabber/buddy.c:952
+#: src/protocols/jabber/buddy.c:948
 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:960
+#: src/protocols/jabber/buddy.c:956
 msgid "Unsubscribe"
 msgstr "Unsubscribe"
 
-#: src/protocols/jabber/chat.c:42 src/protocols/yahoo/yahoochat.c:963
+#: src/protocols/jabber/chat.c:42 src/protocols/yahoo/yahoochat.c:1002
 msgid "_Room:"
 msgstr "_Room:"
 
@@ -5673,447 +5706,447 @@
 msgid "Find Rooms"
 msgstr "Find Rooms"
 
-#: src/protocols/jabber/jabber.c:75
+#: src/protocols/jabber/jabber.c:76
 msgid "Error initializing session"
 msgstr "Error initializing session"
 
-#: src/protocols/jabber/jabber.c:205 src/protocols/msn/httpmethod.c:266
+#: src/protocols/jabber/jabber.c:206 src/protocols/msn/httpmethod.c:266
 #: src/protocols/trepia/trepia.c:247 src/protocols/trepia/trepia.c:698
 #: src/protocols/trepia/trepia.c:987 src/protocols/trepia/trepia.c:1031
 #: src/protocols/trepia/trepia.c:1130 src/protocols/trepia/trepia.c:1176
 msgid "Write error"
 msgstr "Write error"
 
-#: src/protocols/jabber/jabber.c:243 src/protocols/jabber/jabber.c:263
+#: src/protocols/jabber/jabber.c:244 src/protocols/jabber/jabber.c:264
 msgid "Read Error"
 msgstr "Read Error"
 
-#: src/protocols/jabber/jabber.c:323
+#: src/protocols/jabber/jabber.c:324
 msgid "Connection Failed"
 msgstr "Connection Failed"
 
-#: src/protocols/jabber/jabber.c:326
+#: src/protocols/jabber/jabber.c:327
 msgid "SSL Handshake Failed"
 msgstr "SSL Handshake Failed"
 
-#: src/protocols/jabber/jabber.c:369 src/protocols/jabber/jabber.c:698
+#: src/protocols/jabber/jabber.c:370 src/protocols/jabber/jabber.c:699
 msgid "Invalid Jabber ID"
 msgstr "Invalid Jabber ID"
 
-#: src/protocols/jabber/jabber.c:397 src/protocols/jabber/jabber.c:725
+#: src/protocols/jabber/jabber.c:398 src/protocols/jabber/jabber.c:726
 msgid "SSL support unavailable"
 msgstr "SSL support unavailable"
 
-#: src/protocols/jabber/jabber.c:407 src/protocols/jabber/jabber.c:735
+#: src/protocols/jabber/jabber.c:408 src/protocols/jabber/jabber.c:736
 #: src/protocols/trepia/trepia.c:1070
 msgid "Unable to create socket"
 msgstr "Unable to create socket"
 
-#: src/protocols/jabber/jabber.c:432
+#: src/protocols/jabber/jabber.c:433
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "Registration of %s@%s successful"
 
-#: src/protocols/jabber/jabber.c:434 src/protocols/jabber/jabber.c:435
+#: src/protocols/jabber/jabber.c:435 src/protocols/jabber/jabber.c:436
 msgid "Registration Successful"
 msgstr "Registration Successful"
 
-#: src/protocols/jabber/jabber.c:441 src/protocols/jabber/jabber.c:1180
+#: src/protocols/jabber/jabber.c:442 src/protocols/jabber/jabber.c:1181
 msgid "Unknown Error"
 msgstr "Unknown Error"
 
-#: src/protocols/jabber/jabber.c:443 src/protocols/jabber/jabber.c:444
+#: src/protocols/jabber/jabber.c:444 src/protocols/jabber/jabber.c:445
 msgid "Registration Failed"
 msgstr "Registration Failed"
 
-#: src/protocols/jabber/jabber.c:555 src/protocols/jabber/jabber.c:556
+#: src/protocols/jabber/jabber.c:556 src/protocols/jabber/jabber.c:557
 msgid "Already Registered"
 msgstr "Already Registered"
 
-#: src/protocols/jabber/jabber.c:591 src/protocols/jabber/jabber.c:1035
+#: src/protocols/jabber/jabber.c:592 src/protocols/jabber/jabber.c:1036
 msgid "Password"
 msgstr "Password"
 
-#: src/protocols/jabber/jabber.c:602
+#: src/protocols/jabber/jabber.c:603
 msgid "E-Mail"
 msgstr "E-Mail"
 
 #. State
-#: src/protocols/jabber/jabber.c:632 src/protocols/oscar/oscar.c:4885
-#: src/protocols/oscar/oscar.c:4893 src/protocols/trepia/trepia.c:335
+#: src/protocols/jabber/jabber.c:633 src/protocols/oscar/oscar.c:4901
+#: src/protocols/oscar/oscar.c:4909 src/protocols/trepia/trepia.c:335
 #: src/protocols/trepia/trepia.c:413
 msgid "State"
 msgstr "County/State"
 
-#: src/protocols/jabber/jabber.c:642 src/protocols/silc/buddy.c:1501
-#: src/protocols/silc/ops.c:819 src/protocols/silc/silc.c:635
+#: src/protocols/jabber/jabber.c:643 src/protocols/silc/ops.c:835
+#: src/protocols/silc/silc.c:639 src/protocols/silc/util.c:510
 msgid "Phone"
 msgstr "Telephone"
 
-#: src/protocols/jabber/jabber.c:652
+#: src/protocols/jabber/jabber.c:653
 msgid "Date"
 msgstr "Date"
 
-#: src/protocols/jabber/jabber.c:660
+#: src/protocols/jabber/jabber.c:661
 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:663 src/protocols/jabber/jabber.c:664
+#: src/protocols/jabber/jabber.c:664 src/protocols/jabber/jabber.c:665
 msgid "Register New Jabber Account"
 msgstr "Register New Jabber Account"
 
-#: src/protocols/jabber/jabber.c:743
+#: src/protocols/jabber/jabber.c:744
 msgid "Logged out"
 msgstr "Logged out"
 
 #. connect to the server
-#: src/protocols/jabber/jabber.c:782 src/protocols/msn/msn.c:616
-#: src/protocols/napster/napster.c:499 src/protocols/novell/novell.c:2104
-#: src/protocols/oscar/oscar.c:1591 src/protocols/trepia/trepia.c:1064
-#: src/protocols/yahoo/yahoo.c:2353 src/protocols/zephyr/zephyr.c:906
+#: src/protocols/jabber/jabber.c:783 src/protocols/msn/msn.c:608
+#: src/protocols/napster/napster.c:499 src/protocols/novell/novell.c:2105
+#: src/protocols/oscar/oscar.c:1597 src/protocols/trepia/trepia.c:1064
+#: src/protocols/yahoo/yahoo.c:2379 src/protocols/zephyr/zephyr.c:1017
 msgid "Connecting"
 msgstr "Connecting"
 
-#: src/protocols/jabber/jabber.c:786
+#: src/protocols/jabber/jabber.c:787
 msgid "Initializing Stream"
 msgstr "Initialising Stream"
 
-#: src/protocols/jabber/jabber.c:792
+#: src/protocols/jabber/jabber.c:793
 msgid "Authenticating"
 msgstr "Authenticating"
 
-#: src/protocols/jabber/jabber.c:801
+#: src/protocols/jabber/jabber.c:802
 msgid "Re-initializing Stream"
 msgstr "Re-initialising Stream"
 
-#: src/protocols/jabber/jabber.c:881 src/protocols/jabber/jabber.c:1158
-#: src/protocols/jabber/jabber.c:1199 src/protocols/jabber/jabber.c:1232
-#: src/protocols/oscar/oscar.c:580 src/protocols/oscar/oscar.c:6471
+#: src/protocols/jabber/jabber.c:882 src/protocols/jabber/jabber.c:1159
+#: src/protocols/jabber/jabber.c:1200 src/protocols/jabber/jabber.c:1233
+#: src/protocols/oscar/oscar.c:584 src/protocols/oscar/oscar.c:6488
 msgid "Not Authorized"
 msgstr "Not Authorised"
 
-#: src/protocols/jabber/jabber.c:912
+#: src/protocols/jabber/jabber.c:913
 msgid "Both"
 msgstr "Both"
 
-#: src/protocols/jabber/jabber.c:914
+#: src/protocols/jabber/jabber.c:915
 msgid "From (To pending)"
 msgstr "From (To pending)"
 
-#: src/protocols/jabber/jabber.c:916
+#: src/protocols/jabber/jabber.c:917
 msgid "From"
 msgstr "From"
 
-#: src/protocols/jabber/jabber.c:919
+#: src/protocols/jabber/jabber.c:920
 msgid "To"
 msgstr "To"
 
-#: src/protocols/jabber/jabber.c:921
+#: src/protocols/jabber/jabber.c:922
 msgid "None (To pending)"
 msgstr "None (To pending)"
 
-#: src/protocols/jabber/jabber.c:925
+#: src/protocols/jabber/jabber.c:926
 msgid "Subscription"
 msgstr "Subscription"
 
-#: src/protocols/jabber/jabber.c:945
+#: src/protocols/jabber/jabber.c:946
 msgid "Error"
 msgstr "Error"
 
-#: src/protocols/jabber/jabber.c:958 src/protocols/jabber/jutil.c:35
+#: src/protocols/jabber/jabber.c:959 src/protocols/jabber/jutil.c:35
 #: src/protocols/jabber/presence.c:66 src/protocols/jabber/presence.c:117
 msgid "Chatty"
 msgstr "Chatty"
 
-#: src/protocols/jabber/jabber.c:960 src/protocols/jabber/jutil.c:38
+#: src/protocols/jabber/jabber.c:961 src/protocols/jabber/jutil.c:38
 #: src/protocols/jabber/presence.c:68 src/protocols/jabber/presence.c:122
 msgid "Extended Away"
 msgstr "Extended Away"
 
-#: src/protocols/jabber/jabber.c:961 src/protocols/jabber/jutil.c:41
+#: src/protocols/jabber/jabber.c:962 src/protocols/jabber/jutil.c:41
 #: src/protocols/jabber/presence.c:70 src/protocols/jabber/presence.c:124
-#: src/protocols/oscar/oscar.c:522 src/protocols/oscar/oscar.c:5468
-#: src/protocols/oscar/oscar.c:6663
+#: src/protocols/oscar/oscar.c:526 src/protocols/oscar/oscar.c:5484
+#: src/protocols/oscar/oscar.c:6680
 msgid "Do Not Disturb"
 msgstr "Do Not Disturb"
 
-#: src/protocols/jabber/jabber.c:978
-msgid "Password Changed"
-msgstr "Password Changed"
-
 #: src/protocols/jabber/jabber.c:979
+msgid "Password Changed"
+msgstr "Password Changed"
+
+#: src/protocols/jabber/jabber.c:980
 msgid "Your password has been changed."
 msgstr "Your password has been changed."
 
-#: src/protocols/jabber/jabber.c:983 src/protocols/jabber/jabber.c:984
+#: src/protocols/jabber/jabber.c:984 src/protocols/jabber/jabber.c:985
 msgid "Error changing password"
 msgstr "Error changing password"
 
-#: src/protocols/jabber/jabber.c:1040
+#: src/protocols/jabber/jabber.c:1041
 msgid "Password (again)"
 msgstr "Password (again)"
 
-#: src/protocols/jabber/jabber.c:1045 src/protocols/jabber/jabber.c:1046
+#: src/protocols/jabber/jabber.c:1046 src/protocols/jabber/jabber.c:1047
 msgid "Change Jabber Password"
 msgstr "Change Jabber Password"
 
-#: src/protocols/jabber/jabber.c:1046
+#: src/protocols/jabber/jabber.c:1047
 msgid "Please enter your new password"
 msgstr "Please enter your new password"
 
-#: src/protocols/jabber/jabber.c:1056 src/protocols/toc/toc.c:1540
+#: src/protocols/jabber/jabber.c:1057 src/protocols/toc/toc.c:1540
 msgid "Set User Info"
 msgstr "Set User Info"
 
-#: src/protocols/jabber/jabber.c:1138
+#: src/protocols/jabber/jabber.c:1139
 msgid "Bad Request"
 msgstr "Bad Request"
 
-#: src/protocols/jabber/jabber.c:1140
+#: src/protocols/jabber/jabber.c:1141
 msgid "Conflict"
 msgstr "Conflict"
 
-#: src/protocols/jabber/jabber.c:1142
+#: src/protocols/jabber/jabber.c:1143
 msgid "Feature Not Implemented"
 msgstr "Feature Not Implemented"
 
-#: src/protocols/jabber/jabber.c:1144
+#: src/protocols/jabber/jabber.c:1145
 msgid "Forbidden"
 msgstr "Forbidden"
 
-#: src/protocols/jabber/jabber.c:1146
+#: src/protocols/jabber/jabber.c:1147
 msgid "Gone"
 msgstr "Gone"
 
-#: src/protocols/jabber/jabber.c:1148 src/protocols/jabber/jabber.c:1222
+#: src/protocols/jabber/jabber.c:1149 src/protocols/jabber/jabber.c:1223
 msgid "Internal Server Error"
 msgstr "Internal Server Error"
 
-#: src/protocols/jabber/jabber.c:1150
+#: src/protocols/jabber/jabber.c:1151
 msgid "Item Not Found"
 msgstr "Item Not Found"
 
-#: src/protocols/jabber/jabber.c:1152
+#: src/protocols/jabber/jabber.c:1153
 msgid "Malformed Jabber ID"
 msgstr "Malformed Jabber ID"
 
-#: src/protocols/jabber/jabber.c:1154
+#: src/protocols/jabber/jabber.c:1155
 msgid "Not Acceptable"
 msgstr "Not Acceptable"
 
-#: src/protocols/jabber/jabber.c:1156
+#: src/protocols/jabber/jabber.c:1157
 msgid "Not Allowed"
 msgstr "Not Allowed"
 
-#: src/protocols/jabber/jabber.c:1160
+#: src/protocols/jabber/jabber.c:1161
 msgid "Payment Required"
 msgstr "Payment Required"
 
-#: src/protocols/jabber/jabber.c:1162
+#: src/protocols/jabber/jabber.c:1163
 msgid "Recipient Unavailable"
 msgstr "Recipient unavailable"
 
-#: src/protocols/jabber/jabber.c:1166
+#: src/protocols/jabber/jabber.c:1167
 msgid "Registration Required"
 msgstr "Registration Required"
 
-#: src/protocols/jabber/jabber.c:1168
+#: src/protocols/jabber/jabber.c:1169
 msgid "Remote Server Not Found"
 msgstr "Remote Server Not Found"
 
-#: src/protocols/jabber/jabber.c:1170
+#: src/protocols/jabber/jabber.c:1171
 msgid "Remote Server Timeout"
 msgstr "Remote Server Timeout"
 
-#: src/protocols/jabber/jabber.c:1172
+#: src/protocols/jabber/jabber.c:1173
 msgid "Server Overloaded"
 msgstr "Server Overloaded"
 
-#: src/protocols/jabber/jabber.c:1174
+#: src/protocols/jabber/jabber.c:1175
 msgid "Service Unavailable"
 msgstr "Service Unavailable"
 
-#: src/protocols/jabber/jabber.c:1176
+#: src/protocols/jabber/jabber.c:1177
 msgid "Subscription Required"
 msgstr "Subscription Required"
 
-#: src/protocols/jabber/jabber.c:1178
+#: src/protocols/jabber/jabber.c:1179
 msgid "Unexpected Request"
 msgstr "Unexpected Request"
 
-#: src/protocols/jabber/jabber.c:1185
+#: src/protocols/jabber/jabber.c:1186
 msgid "Authorization Aborted"
 msgstr "Authorisation Aborted"
 
-#: src/protocols/jabber/jabber.c:1187
+#: src/protocols/jabber/jabber.c:1188
 msgid "Incorrect encoding in authorization"
 msgstr "Incorrect encoding in authorisation"
 
-#: src/protocols/jabber/jabber.c:1190
+#: src/protocols/jabber/jabber.c:1191
 msgid "Invalid authzid"
 msgstr "Invalid authzid"
 
-#: src/protocols/jabber/jabber.c:1193
+#: src/protocols/jabber/jabber.c:1194
 msgid "Invalid Authorization Mechanism"
 msgstr "Invalid Authorisation Mechanism"
 
-#: src/protocols/jabber/jabber.c:1196
+#: src/protocols/jabber/jabber.c:1197
 msgid "Authorization mechanism too weak"
 msgstr "Authorisation mechanism too weak"
 
-#: src/protocols/jabber/jabber.c:1201
+#: src/protocols/jabber/jabber.c:1202
 msgid "Temporary Authentication Failure"
 msgstr "Temporary Authentication Failure"
 
-#: src/protocols/jabber/jabber.c:1203
+#: src/protocols/jabber/jabber.c:1204
 msgid "Authentication Failure"
 msgstr "Authentication Failure"
 
-#: src/protocols/jabber/jabber.c:1207
+#: src/protocols/jabber/jabber.c:1208
 msgid "Bad Format"
 msgstr "Bad Format"
 
-#: src/protocols/jabber/jabber.c:1209
+#: src/protocols/jabber/jabber.c:1210
 msgid "Bad Namespace Prefix"
 msgstr "Bad Namespace Prefix"
 
-#: src/protocols/jabber/jabber.c:1212
+#: src/protocols/jabber/jabber.c:1213
 msgid "Resource Conflict"
 msgstr "Resource Conflict"
 
-#: src/protocols/jabber/jabber.c:1214 src/protocols/silc/ops.c:1225
+#: src/protocols/jabber/jabber.c:1215 src/protocols/silc/ops.c:1491
 msgid "Connection Timeout"
 msgstr "Connection Timeout"
 
-#: src/protocols/jabber/jabber.c:1216
+#: src/protocols/jabber/jabber.c:1217
 msgid "Host Gone"
 msgstr "Host Gone"
 
-#: src/protocols/jabber/jabber.c:1218
+#: src/protocols/jabber/jabber.c:1219
 msgid "Host Unknown"
 msgstr "Host Unknown"
 
-#: src/protocols/jabber/jabber.c:1220
+#: src/protocols/jabber/jabber.c:1221
 msgid "Improper Addressing"
 msgstr "Improper Addressing"
 
-#: src/protocols/jabber/jabber.c:1224
+#: src/protocols/jabber/jabber.c:1225
 msgid "Invalid ID"
 msgstr "Invalid ID"
 
-#: src/protocols/jabber/jabber.c:1226
+#: src/protocols/jabber/jabber.c:1227
 msgid "Invalid Namespace"
 msgstr "Invalid Namespace"
 
-#: src/protocols/jabber/jabber.c:1228
+#: src/protocols/jabber/jabber.c:1229
 msgid "Invalid XML"
 msgstr "Invalid XML"
 
-#: src/protocols/jabber/jabber.c:1230
+#: src/protocols/jabber/jabber.c:1231
 msgid "Non-matching Hosts"
 msgstr "Non-matching Hosts"
 
-#: src/protocols/jabber/jabber.c:1234
+#: src/protocols/jabber/jabber.c:1235
 msgid "Policy Violation"
 msgstr "Policy Violation"
 
-#: src/protocols/jabber/jabber.c:1236
+#: src/protocols/jabber/jabber.c:1237
 msgid "Remote Connection Failed"
 msgstr "Remote Connection Failed"
 
-#: src/protocols/jabber/jabber.c:1238
+#: src/protocols/jabber/jabber.c:1239
 msgid "Resource Constraint"
 msgstr "Resource Constraint"
 
-#: src/protocols/jabber/jabber.c:1240
+#: src/protocols/jabber/jabber.c:1241
 msgid "Restricted XML"
 msgstr "Restricted XML"
 
-#: src/protocols/jabber/jabber.c:1242
+#: src/protocols/jabber/jabber.c:1243
 msgid "See Other Host"
 msgstr "See Other Host"
 
-#: src/protocols/jabber/jabber.c:1244
+#: src/protocols/jabber/jabber.c:1245
 msgid "System Shutdown"
 msgstr "System Shutdown"
 
-#: src/protocols/jabber/jabber.c:1246
+#: src/protocols/jabber/jabber.c:1247
 msgid "Undefined Condition"
 msgstr "Undefined Condition"
 
-#: src/protocols/jabber/jabber.c:1248
+#: src/protocols/jabber/jabber.c:1249
 msgid "Unsupported Encoding"
 msgstr "Unsupported Encoding"
 
-#: src/protocols/jabber/jabber.c:1250
+#: src/protocols/jabber/jabber.c:1251
 msgid "Unsupported Stanza Type"
 msgstr "Unsupported Stanza Type"
 
-#: src/protocols/jabber/jabber.c:1252
+#: src/protocols/jabber/jabber.c:1253
 msgid "Unsupported Version"
 msgstr "Unsupported Version"
 
-#: src/protocols/jabber/jabber.c:1254
+#: src/protocols/jabber/jabber.c:1255
 msgid "XML Not Well Formed"
 msgstr "XML Not Well Formed"
 
-#: src/protocols/jabber/jabber.c:1256
+#: src/protocols/jabber/jabber.c:1257
 msgid "Stream Error"
 msgstr "Stream Error"
 
-#: src/protocols/jabber/jabber.c:1323
+#: src/protocols/jabber/jabber.c:1324
 #, c-format
 msgid "Unable to ban user %s"
 msgstr "Unable to ban user %s"
 
-#: src/protocols/jabber/jabber.c:1375
+#: src/protocols/jabber/jabber.c:1376
 #, c-format
 msgid "Unable to kick user %s"
 msgstr "Unable to kick user %s"
 
-#: src/protocols/jabber/jabber.c:1400
+#: src/protocols/jabber/jabber.c:1401
 msgid "config:  Configure a chat room."
 msgstr "config:  Configure a chat room."
 
-#: src/protocols/jabber/jabber.c:1403
+#: src/protocols/jabber/jabber.c:1404
 msgid "configure:  Configure a chat room."
 msgstr "configure:  Configure a chat room."
 
-#: src/protocols/jabber/jabber.c:1410
+#: src/protocols/jabber/jabber.c:1411
 msgid "part [room]:  Leave the room."
 msgstr "part [room]:  Leave the room."
 
-#: src/protocols/jabber/jabber.c:1413
+#: src/protocols/jabber/jabber.c:1414
 msgid "register:  Register with a chat room."
 msgstr "register:  Register with a chat room."
 
-#: src/protocols/jabber/jabber.c:1418
+#: src/protocols/jabber/jabber.c:1419
 msgid "topic [new topic]:  View or change the topic."
 msgstr "topic [new topic]:  View or change the topic."
 
-#: src/protocols/jabber/jabber.c:1422
+#: src/protocols/jabber/jabber.c:1423
 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:1426
+#: src/protocols/jabber/jabber.c:1427
 msgid "invite &lt;user&gt; [room]:  Invite a user to the room."
 msgstr "invite &lt;user&gt; [room]:  Invite a user to the room."
 
-#: src/protocols/jabber/jabber.c:1430
+#: src/protocols/jabber/jabber.c:1431
 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:1434
+#: src/protocols/jabber/jabber.c:1435
 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:1438
+#: src/protocols/jabber/jabber.c:1439
 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:1452
+#: src/protocols/jabber/jabber.c:1453
 msgid "Hide Operating System"
 msgstr "Hide Operating System"
 
@@ -6127,24 +6160,24 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/jabber/jabber.c:1534 src/protocols/jabber/jabber.c:1536
+#: src/protocols/jabber/jabber.c:1537 src/protocols/jabber/jabber.c:1539
 msgid "Jabber Protocol Plugin"
 msgstr "Jabber Protocol Plugin"
 
-#: src/protocols/jabber/jabber.c:1562
+#: src/protocols/jabber/jabber.c:1565
 msgid "Use TLS if available"
 msgstr "Use TLS if available"
 
-#: src/protocols/jabber/jabber.c:1567
+#: src/protocols/jabber/jabber.c:1570
 msgid "Force old SSL"
 msgstr "Force old SSL"
 
-#: src/protocols/jabber/jabber.c:1572
+#: src/protocols/jabber/jabber.c:1575
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Allow plaintext auth over unencrypted streams"
 
 #. Account options
-#: src/protocols/jabber/jabber.c:1581 src/protocols/silc/silc.c:1359
+#: src/protocols/jabber/jabber.c:1584 src/protocols/silc/silc.c:1572
 msgid "Connect server"
 msgstr "Connect server"
 
@@ -6285,7 +6318,7 @@
 msgid "Not on list"
 msgstr "Not on list"
 
-#: src/protocols/msn/error.c:70 src/protocols/zephyr/zephyr.c:570
+#: src/protocols/msn/error.c:70 src/protocols/zephyr/zephyr.c:593
 msgid "User is offline"
 msgstr "User is offline"
 
@@ -6430,8 +6463,8 @@
 msgid "Server too busy"
 msgstr "Server too busy"
 
-#: src/protocols/msn/error.c:198 src/protocols/oscar/oscar.c:2010
-#: src/protocols/silc/ops.c:1214 src/protocols/toc/toc.c:630
+#: src/protocols/msn/error.c:198 src/protocols/oscar/oscar.c:2026
+#: src/protocols/silc/ops.c:1480 src/protocols/toc/toc.c:630
 msgid "Authentication failed"
 msgstr "Authentication failed"
 
@@ -6509,88 +6542,88 @@
 msgid "Disallow"
 msgstr "Disallow"
 
-#: src/protocols/msn/msn.c:313
+#: src/protocols/msn/msn.c:311
 msgid "Send a mobile message."
 msgstr "Send a mobile message."
 
-#: src/protocols/msn/msn.c:315
+#: src/protocols/msn/msn.c:313
 msgid "Page"
 msgstr "Page"
 
-#: src/protocols/msn/msn.c:466 src/protocols/msn/msn.c:764
+#: src/protocols/msn/msn.c:463 src/protocols/msn/msn.c:756
 #: src/protocols/msn/state.c:34
 msgid "Away From Computer"
 msgstr "Away From Computer"
 
-#: src/protocols/msn/msn.c:467 src/protocols/msn/msn.c:766
-#: src/protocols/msn/state.c:33 src/protocols/yahoo/yahoo.c:2468
-#: src/protocols/yahoo/yahoo.c:2846 src/protocols/yahoo/yahoo.c:2960
+#: src/protocols/msn/msn.c:464 src/protocols/msn/msn.c:758
+#: src/protocols/msn/state.c:33 src/protocols/yahoo/yahoo.c:2491
+#: src/protocols/yahoo/yahoo.c:2853 src/protocols/yahoo/yahoo.c:2969
 msgid "Be Right Back"
 msgstr "Be Right Back"
 
-#: src/protocols/msn/msn.c:468 src/protocols/msn/msn.c:768
-#: src/protocols/msn/state.c:31 src/protocols/novell/novell.c:2721
-#: src/protocols/novell/novell.c:2836 src/protocols/novell/novell.c:2890
+#: src/protocols/msn/msn.c:465 src/protocols/msn/msn.c:760
+#: src/protocols/msn/state.c:31 src/protocols/novell/novell.c:2727
+#: src/protocols/novell/novell.c:2842 src/protocols/novell/novell.c:2896
 #: src/protocols/silc/buddy.c:1383 src/protocols/silc/silc.c:47
-#: src/protocols/silc/silc.c:78 src/protocols/yahoo/yahoo.c:2470
-#: src/protocols/yahoo/yahoo.c:2848 src/protocols/yahoo/yahoo.c:2961
+#: src/protocols/silc/silc.c:78 src/protocols/yahoo/yahoo.c:2493
+#: src/protocols/yahoo/yahoo.c:2855 src/protocols/yahoo/yahoo.c:2970
 msgid "Busy"
 msgstr "Busy"
 
-#: src/protocols/msn/msn.c:469 src/protocols/msn/msn.c:770
-#: src/protocols/msn/state.c:35 src/protocols/yahoo/yahoo.c:2478
-#: src/protocols/yahoo/yahoo.c:2856 src/protocols/yahoo/yahoo.c:2965
+#: src/protocols/msn/msn.c:466 src/protocols/msn/msn.c:762
+#: src/protocols/msn/state.c:35 src/protocols/yahoo/yahoo.c:2501
+#: src/protocols/yahoo/yahoo.c:2863 src/protocols/yahoo/yahoo.c:2974
 msgid "On The Phone"
 msgstr "On The Phone"
 
-#: src/protocols/msn/msn.c:470 src/protocols/msn/msn.c:772
-#: src/protocols/msn/state.c:36 src/protocols/yahoo/yahoo.c:2482
-#: src/protocols/yahoo/yahoo.c:2860 src/protocols/yahoo/yahoo.c:2967
+#: src/protocols/msn/msn.c:467 src/protocols/msn/msn.c:764
+#: src/protocols/msn/state.c:36 src/protocols/yahoo/yahoo.c:2505
+#: src/protocols/yahoo/yahoo.c:2867 src/protocols/yahoo/yahoo.c:2976
 msgid "Out To Lunch"
 msgstr "Out To Lunch"
 
-#: src/protocols/msn/msn.c:471 src/protocols/msn/msn.c:774
-#: src/protocols/zephyr/zephyr.c:1205 src/protocols/zephyr/zephyr.c:1220
+#: src/protocols/msn/msn.c:468 src/protocols/msn/msn.c:766
+#: src/protocols/zephyr/zephyr.c:1355 src/protocols/zephyr/zephyr.c:1374
 msgid "Hidden"
 msgstr "Hidden"
 
-#: src/protocols/msn/msn.c:482
+#: src/protocols/msn/msn.c:479
 msgid "Set Friendly Name"
 msgstr "Set Friendly Name"
 
-#: src/protocols/msn/msn.c:487
+#: src/protocols/msn/msn.c:484
 msgid "Set Home Phone Number"
 msgstr "Set Home Phone Number"
 
-#: src/protocols/msn/msn.c:491
+#: src/protocols/msn/msn.c:488
 msgid "Set Work Phone Number"
 msgstr "Set Work Phone Number"
 
-#: src/protocols/msn/msn.c:495
+#: src/protocols/msn/msn.c:492
 msgid "Set Mobile Phone Number"
 msgstr "Set Mobile Phone Number"
 
-#: src/protocols/msn/msn.c:501
+#: src/protocols/msn/msn.c:498
 msgid "Enable/Disable Mobile Devices"
 msgstr "Enable/Disable Mobile Devices"
 
-#: src/protocols/msn/msn.c:506
+#: src/protocols/msn/msn.c:503
 msgid "Allow/Disallow Mobile Pages"
 msgstr "Allow/Disallow Mobile Pages"
 
-#: src/protocols/msn/msn.c:529
+#: src/protocols/msn/msn.c:526
 msgid "Send to Mobile"
 msgstr "Send to Mobile"
 
-#: src/protocols/msn/msn.c:539
+#: src/protocols/msn/msn.c:536
 msgid "Initiate Chat"
 msgstr "Initiate Chat"
 
-#: src/protocols/msn/msn.c:548
+#: src/protocols/msn/msn.c:540
 msgid "Update Buddy Icon"
 msgstr "Update Buddy Icon"
 
-#: src/protocols/msn/msn.c:585
+#: src/protocols/msn/msn.c:577
 msgid ""
 "SSL support is needed for MSN. Please install a supported SSL library. See "
 "http://gaim.sf.net/faq-ssl.php for more information."
@@ -6598,106 +6631,127 @@
 "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:1137 src/protocols/msn/msn.c:1150
-#: src/protocols/msn/msn.c:1156 src/protocols/yahoo/yahoo_profile.c:640
-#: src/protocols/yahoo/yahoo_profile.c:653
+#: src/protocols/msn/msn.c:1167 src/protocols/yahoo/yahoo_profile.c:659
+#: src/protocols/zephyr/zephyr.c:626
+#, 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:1172 src/protocols/msn/msn.c:1512
+#: src/protocols/yahoo/yahoo_profile.c:1168 src/util.c:792
+#, c-format
+msgid "<b>%s:</b> "
+msgstr "<b>%s:</b> "
+
+#: src/protocols/msn/msn.c:1173
+#, c-format
+msgid "<font sml=\"msn\">%s</font><br>"
+msgstr "<font sml=\"msn\">%s</font><br>"
+
+#: src/protocols/msn/msn.c:1179 src/protocols/yahoo/yahoo_profile.c:664
 #, c-format
 msgid "<b>%s:</b> %s<br>"
 msgstr "<b>%s:</b> %s<br>"
 
-#: src/protocols/msn/msn.c:1137
-msgid "MSN ID"
-msgstr "MSN ID"
-
-#: src/protocols/msn/msn.c:1145 src/protocols/yahoo/yahoo_profile.c:648
-#: src/protocols/zephyr/zephyr.c:602
-#, c-format
-msgid "<b>Alias:</b> %s<br>"
-msgstr "<b>Alias:</b> %s<br>"
-
-#: src/protocols/msn/msn.c:1222 src/protocols/msn/msn.c:1546
-#: src/protocols/yahoo/yahoo_profile.c:746
-#: src/protocols/yahoo/yahoo_profile.c:834
+#: src/protocols/msn/msn.c:1242
+msgid "MSN Profile"
+msgstr "MSN Profile"
+
+#: src/protocols/msn/msn.c:1247 src/protocols/msn/msn.c:1499
+#: src/protocols/yahoo/yahoo_profile.c:761
 msgid "Error retrieving profile"
 msgstr "Error retreiving profile"
 
 #. Age
-#: src/protocols/msn/msn.c:1293 src/protocols/oscar/oscar.c:4870
+#: src/protocols/msn/msn.c:1318 src/protocols/oscar/oscar.c:4886
 #: src/protocols/trepia/trepia.c:285 src/protocols/trepia/trepia.c:404
-#: src/protocols/yahoo/yahoo_profile.c:1010
+#: src/protocols/yahoo/yahoo_profile.c:1015
 msgid "Age"
 msgstr "Age"
 
 #. Gender
-#: src/protocols/msn/msn.c:1300 src/protocols/oscar/oscar.c:4856
+#: src/protocols/msn/msn.c:1325 src/protocols/oscar/oscar.c:4872
 #: src/protocols/trepia/trepia.c:279 src/protocols/trepia/trepia.c:406
-#: src/protocols/yahoo/yahoo_profile.c:1020
+#: src/protocols/yahoo/yahoo_profile.c:1025
 msgid "Gender"
 msgstr "Gender"
 
-#: src/protocols/msn/msn.c:1309 src/protocols/yahoo/yahoo_profile.c:1015
+#: src/protocols/msn/msn.c:1334 src/protocols/yahoo/yahoo_profile.c:1020
 msgid "Marital Status"
 msgstr "Marital Status"
 
-#: src/protocols/msn/msn.c:1316 src/protocols/yahoo/yahoo_profile.c:1005
+#: src/protocols/msn/msn.c:1341 src/protocols/yahoo/yahoo_profile.c:1010
 msgid "Location"
 msgstr "Location"
 
-#: src/protocols/msn/msn.c:1324 src/protocols/yahoo/yahoo_profile.c:1025
+#: src/protocols/msn/msn.c:1349 src/protocols/yahoo/yahoo_profile.c:1030
 msgid "Occupation"
 msgstr "Occupation"
 
-#: src/protocols/msn/msn.c:1341 src/protocols/msn/msn.c:1347
-#: src/protocols/msn/msn.c:1354 src/protocols/msn/msn.c:1362
-#: src/protocols/msn/msn.c:1369
+#: src/protocols/msn/msn.c:1366 src/protocols/msn/msn.c:1372
+#: src/protocols/msn/msn.c:1379 src/protocols/msn/msn.c:1387
+#: src/protocols/msn/msn.c:1394
 msgid "A Little About Me"
 msgstr "A Little About Me"
 
-#: src/protocols/msn/msn.c:1378 src/protocols/msn/msn.c:1384
-#: src/protocols/msn/msn.c:1391 src/protocols/msn/msn.c:1398
+#: src/protocols/msn/msn.c:1403 src/protocols/msn/msn.c:1409
+#: src/protocols/msn/msn.c:1416 src/protocols/msn/msn.c:1423
 msgid "Favorite Things"
 msgstr "Favourite Things"
 
-#: src/protocols/msn/msn.c:1407 src/protocols/msn/msn.c:1413
-#: src/protocols/msn/msn.c:1420
+#: src/protocols/msn/msn.c:1432 src/protocols/msn/msn.c:1438
+#: src/protocols/msn/msn.c:1445
 msgid "Hobbies and Interests"
 msgstr "Hobbies and Interests"
 
-#: src/protocols/msn/msn.c:1429 src/protocols/msn/msn.c:1435
-#: src/protocols/yahoo/yahoo_profile.c:1067
+#: src/protocols/msn/msn.c:1454 src/protocols/msn/msn.c:1460
+#: src/protocols/yahoo/yahoo_profile.c:1072
 msgid "Favorite Quote"
 msgstr "Favourite Quote"
 
-#: src/protocols/msn/msn.c:1443 src/protocols/yahoo/yahoo_profile.c:1118
+#: src/protocols/msn/msn.c:1468 src/protocols/yahoo/yahoo_profile.c:1123
 msgid "Last Updated"
 msgstr "Last Updated"
 
 #. Homepage
-#: src/protocols/msn/msn.c:1454 src/protocols/silc/ops.c:810
+#: src/protocols/msn/msn.c:1479 src/protocols/silc/ops.c:826
 #: src/protocols/trepia/trepia.c:289 src/protocols/trepia/trepia.c:419
 msgid "Homepage"
 msgstr "Homepage"
 
-#. put a link to the actual profile URL
-#: src/protocols/msn/msn.c:1465 src/protocols/yahoo/yahoo_profile.c:1121
-#: src/util.c:792
-#, c-format
-msgid "<b>%s:</b> "
-msgstr "<b>%s:</b> "
-
-#: src/protocols/msn/msn.c:1465 src/protocols/yahoo/yahoo_profile.c:1121
+#: src/protocols/msn/msn.c:1501
+msgid "The user has not created a public profile."
+msgstr "The user has not created a public profile."
+
+#: src/protocols/msn/msn.c:1502
+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 "
+"public profile."
+msgstr ""
+"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 "
+"public profile."
+
+#. This should never happen
+#: src/protocols/msn/msn.c:1506
+msgid ""
+"Gaim could not find any information in the user's profile. The user most "
+"likely does not exist."
+msgstr ""
+"Gaim could not find any information in the user's profile. The user most "
+"likely does not exist."
+
+#: src/protocols/msn/msn.c:1512 src/protocols/yahoo/yahoo_profile.c:1168
 msgid "Profile URL"
 msgstr "Profile URL"
 
-#: src/protocols/msn/msn.c:1547 src/protocols/yahoo/yahoo_profile.c:1140
-msgid "The user's profile is empty."
-msgstr "The user's profile is empty."
-
-#: src/protocols/msn/msn.c:1616
+#: src/protocols/msn/msn.c:1643
 msgid "Display conversation closed notices"
 msgstr "Display conversation closed notices"
 
-#: src/protocols/msn/msn.c:1621
+#: src/protocols/msn/msn.c:1648
 msgid "Display timeout notices"
 msgstr "Display timeout notices"
 
@@ -6711,15 +6765,15 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/msn/msn.c:1703 src/protocols/msn/msn.c:1705
+#: src/protocols/msn/msn.c:1732 src/protocols/msn/msn.c:1734
 msgid "MSN Protocol Plugin"
 msgstr "MSN Protocol Plugin"
 
-#: src/protocols/msn/msn.c:1724 src/protocols/trepia/trepia.c:1290
+#: src/protocols/msn/msn.c:1753 src/protocols/trepia/trepia.c:1292
 msgid "Login server"
 msgstr "Login server"
 
-#: src/protocols/msn/msn.c:1733
+#: src/protocols/msn/msn.c:1762
 msgid "Use HTTP Method"
 msgstr "Use HTTP Method"
 
@@ -6740,11 +6794,11 @@
 msgstr "Retrieving buddy list"
 
 #: src/protocols/msn/notification.c:144 src/protocols/msn/notification.c:173
-#: src/protocols/oscar/oscar.c:2299
+#: src/protocols/oscar/oscar.c:2315
 msgid "Password sent"
 msgstr "Password sent"
 
-#: src/protocols/msn/notification.c:1069
+#: src/protocols/msn/notification.c:1071
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -6775,7 +6829,7 @@
 "After the maintenance has been completed, you will be able to successfully "
 "sign in."
 
-#: src/protocols/msn/notification.c:1134
+#: src/protocols/msn/notification.c:1136
 msgid "Syncing with server"
 msgstr "Syncing with server"
 
@@ -6808,11 +6862,11 @@
 msgid "Received HTTP error. Please report this."
 msgstr "Received HTTP error. Please report this."
 
-#: src/protocols/msn/switchboard.c:201
+#: src/protocols/msn/switchboard.c:191
 msgid "The conversation has become inactive and timed out."
 msgstr "The conversation has become inactive and timed out."
 
-#: src/protocols/msn/switchboard.c:209
+#: src/protocols/msn/switchboard.c:199
 #, c-format
 msgid "%s has closed the conversation window."
 msgstr "%s has closed the conversation window."
@@ -6872,7 +6926,7 @@
 msgid "%s requested a PING"
 msgstr "%s requested a PING"
 
-#: src/protocols/napster/napster.c:541 src/protocols/oscar/oscar.c:6171
+#: src/protocols/napster/napster.c:541 src/protocols/oscar/oscar.c:6188
 #: src/protocols/toc/toc.c:1266
 msgid "_Group:"
 msgstr "_Group:"
@@ -6887,91 +6941,91 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/napster/napster.c:622 src/protocols/napster/napster.c:624
+#: src/protocols/napster/napster.c:624 src/protocols/napster/napster.c:626
 msgid "NAPSTER Protocol Plugin"
 msgstr "NAPSTER Protocol Plugin"
 
-#: src/protocols/novell/nmuser.c:2046
+#: src/protocols/novell/nmuser.c:1868
 msgid "Required parameters not passed in"
 msgstr "Required parameters not passed in"
 
-#: src/protocols/novell/nmuser.c:2049
+#: src/protocols/novell/nmuser.c:1871
 msgid "Unable to write to network"
 msgstr "Unable to write to network"
 
-#: src/protocols/novell/nmuser.c:2052
+#: src/protocols/novell/nmuser.c:1874
 msgid "Unable to read from network"
 msgstr "Unable to read from network"
 
-#: src/protocols/novell/nmuser.c:2055
+#: src/protocols/novell/nmuser.c:1877
 msgid "Error communicating with server"
 msgstr "Error communicating with server"
 
-#: src/protocols/novell/nmuser.c:2059
+#: src/protocols/novell/nmuser.c:1881
 msgid "Conference not found"
 msgstr "Conference not found"
 
-#: src/protocols/novell/nmuser.c:2062
+#: src/protocols/novell/nmuser.c:1884
 msgid "Conference does not exist"
 msgstr "Conference does not exist"
 
-#: src/protocols/novell/nmuser.c:2066
+#: src/protocols/novell/nmuser.c:1888
 msgid "A folder with that name already exists"
 msgstr "A folder with that name already exists"
 
-#: src/protocols/novell/nmuser.c:2069
+#: src/protocols/novell/nmuser.c:1891
 msgid "Not supported"
 msgstr "Not supported"
 
-#: src/protocols/novell/nmuser.c:2073
+#: src/protocols/novell/nmuser.c:1895
 msgid "Password has expired"
 msgstr "Password has expired"
 
-#: src/protocols/novell/nmuser.c:2076
+#: src/protocols/novell/nmuser.c:1898
 msgid "Invalid password"
 msgstr "Invalid password"
 
-#: src/protocols/novell/nmuser.c:2079
+#: src/protocols/novell/nmuser.c:1901
 msgid "User not found"
 msgstr "User not found"
 
-#: src/protocols/novell/nmuser.c:2082
+#: src/protocols/novell/nmuser.c:1904
 msgid "Account has been disabled"
 msgstr "Account has been disabled"
 
-#: src/protocols/novell/nmuser.c:2085
+#: src/protocols/novell/nmuser.c:1907
 msgid "The server could not access the directory"
 msgstr "The server could not access the directory"
 
-#: src/protocols/novell/nmuser.c:2088
+#: src/protocols/novell/nmuser.c:1910
 msgid "Your system administrator has disabled this operation"
 msgstr "Your system administrator has disabled this operation"
 
-#: src/protocols/novell/nmuser.c:2091
+#: src/protocols/novell/nmuser.c:1913
 msgid "The server is unavailable; try again later"
 msgstr "The server is unavailable; try again later"
 
-#: src/protocols/novell/nmuser.c:2094
+#: src/protocols/novell/nmuser.c:1916
 msgid "Cannot add a contact to the same folder twice"
 msgstr "Cannot add a contact to the same folder twice"
 
-#: src/protocols/novell/nmuser.c:2097
+#: src/protocols/novell/nmuser.c:1919
 msgid "Cannot add yourself"
 msgstr "Cannot add yourself"
 
-#: src/protocols/novell/nmuser.c:2100
+#: src/protocols/novell/nmuser.c:1922
 msgid "Master archive is misconfigured"
 msgstr "Master archive is misconfigured"
 
-#: src/protocols/novell/nmuser.c:2104
+#: src/protocols/novell/nmuser.c:1926
 msgid "Invalid username or password"
 msgstr "Invalid username or password"
 
-#: src/protocols/novell/nmuser.c:2107
+#: src/protocols/novell/nmuser.c:1929
 msgid "Could not recognize the host of the username you entered"
-msgstr "Could not recognize the host of the username you entered"
-
-#: src/protocols/novell/nmuser.c:2110
+msgstr "Could not recognise the host of the username you entered"
+
+#: src/protocols/novell/nmuser.c:1932
 msgid ""
 "Your account has been disabled because too many invalid passwords were "
 "entered"
@@ -6979,31 +7033,31 @@
 "Your account has been disabled because too many invalid passwords were "
 "entered"
 
-#: src/protocols/novell/nmuser.c:2113
+#: src/protocols/novell/nmuser.c:1935
 msgid "You cannot add the same person twice to a conversation"
 msgstr "You cannot add the same person twice to a conversation"
 
-#: src/protocols/novell/nmuser.c:2117
+#: src/protocols/novell/nmuser.c:1939
 msgid "You have reached your limit for the number of contacts allowed"
 msgstr "You have reached your limit for the number of contacts allowed"
 
-#: src/protocols/novell/nmuser.c:2120
+#: src/protocols/novell/nmuser.c:1942
 msgid "You have entered an invalid username"
 msgstr "You have entered an invalid username"
 
-#: src/protocols/novell/nmuser.c:2123
+#: src/protocols/novell/nmuser.c:1945
 msgid "An error occurred while updating the directory"
 msgstr "An error occurred while updating the directory"
 
-#: src/protocols/novell/nmuser.c:2126
+#: src/protocols/novell/nmuser.c:1948
 msgid "Incompatible protocol version"
 msgstr "Incompatible protocol version"
 
-#: src/protocols/novell/nmuser.c:2129
+#: src/protocols/novell/nmuser.c:1951
 msgid "The user has blocked you"
 msgstr "The user has blocked you"
 
-#: src/protocols/novell/nmuser.c:2132
+#: src/protocols/novell/nmuser.c:1954
 msgid ""
 "This evaluation version does not allow more than ten users to log in at one "
 "time"
@@ -7011,11 +7065,11 @@
 "This evaluation version does not allow more than ten users to log in at one "
 "time"
 
-#: src/protocols/novell/nmuser.c:2135
+#: src/protocols/novell/nmuser.c:1957
 msgid "The user is either offline or you are blocked"
 msgstr "The user is either offline or you are blocked"
 
-#: src/protocols/novell/nmuser.c:2138
+#: src/protocols/novell/nmuser.c:1960
 #, c-format
 msgid "Unknown error: 0x%X"
 msgstr "Unknown error: 0x%X"
@@ -7099,7 +7153,7 @@
 msgid "Unable to remove %s from privacy list (%s)."
 msgstr "Unable to remove %s from privacy list (%s)."
 
-#: src/protocols/novell/novell.c:920 src/protocols/novell/novell.c:1573
+#: src/protocols/novell/novell.c:920 src/protocols/novell/novell.c:1574
 #, c-format
 msgid "Unable to change server side privacy settings (%s)."
 msgstr "Unable to change server side privacy settings (%s)."
@@ -7109,11 +7163,11 @@
 msgid "Unable to create conference (%s)."
 msgstr "Unable to create conference (%s)."
 
-#: src/protocols/novell/novell.c:1103 src/protocols/novell/novell.c:1612
+#: src/protocols/novell/novell.c:1103 src/protocols/novell/novell.c:1613
 msgid "Error communicating with server. Closing connection."
 msgstr "Error communicating with server. Closing connection."
 
-#: src/protocols/novell/novell.c:1425
+#: src/protocols/novell/novell.c:1426
 msgid "Userid"
 msgstr "User ID"
 
@@ -7124,46 +7178,46 @@
 #. tag, value);
 #. }
 #.
-#: src/protocols/novell/novell.c:1439
+#: src/protocols/novell/novell.c:1440
 msgid "Full name"
 msgstr "Full name"
 
-#: src/protocols/novell/novell.c:1459
+#: src/protocols/novell/novell.c:1460
 msgid "User Properties"
 msgstr "User Properties"
 
-#: src/protocols/novell/novell.c:1563
+#: src/protocols/novell/novell.c:1564
 #, c-format
 msgid "GroupWise Conference %d"
 msgstr "GroupWise Conference %d"
 
-#: src/protocols/novell/novell.c:1588
+#: src/protocols/novell/novell.c:1589
 msgid "Unable to make SSL connection to server."
 msgstr "Unable to make SSL connection to server."
 
-#: src/protocols/novell/novell.c:1618
+#: src/protocols/novell/novell.c:1619
 #, c-format
 msgid "Error processing event or response (%s)."
 msgstr "Error processing event or response (%s)."
 
-#: src/protocols/novell/novell.c:1652
+#: src/protocols/novell/novell.c:1653
 msgid "Authenticating..."
 msgstr "Authenticating..."
 
-#: src/protocols/novell/novell.c:1667
+#: src/protocols/novell/novell.c:1668
 msgid "Waiting for response..."
 msgstr "Waiting for response..."
 
-#: src/protocols/novell/novell.c:1802
+#: src/protocols/novell/novell.c:1803
 #, c-format
 msgid "%s has been invited to this conversation."
 msgstr "%s has been invited to this conversation."
 
-#: src/protocols/novell/novell.c:1829
+#: src/protocols/novell/novell.c:1830
 msgid "Invitation to Conversation"
 msgstr "Invitation to Conversation"
 
-#: src/protocols/novell/novell.c:1830
+#: src/protocols/novell/novell.c:1831
 #, c-format
 msgid ""
 "Invitation from: %s\n"
@@ -7174,15 +7228,15 @@
 "\n"
 "Sent: %s"
 
-#: src/protocols/novell/novell.c:1832
+#: src/protocols/novell/novell.c:1833
 msgid "Would you like to join the conversation?"
 msgstr "Would you like to join the conversation?"
 
-#: src/protocols/novell/novell.c:1937
+#: src/protocols/novell/novell.c:1938
 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:1991
+#: src/protocols/novell/novell.c:1992
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
@@ -7194,7 +7248,7 @@
 #. *  gaim_request_fields(gc, _("Server Address"),...);
 #.
 #. ...but for now just error out with a nice message.
-#: src/protocols/novell/novell.c:2089
+#: src/protocols/novell/novell.c:2090
 msgid ""
 "Unable to connect to server. Please enter the address of the server you wish "
 "to connect to."
@@ -7202,28 +7256,28 @@
 "Unable to connect to server. Please enter the address of the server you wish "
 "to connect to."
 
-#: src/protocols/novell/novell.c:2111
+#: src/protocols/novell/novell.c:2112
 msgid "Error. SSL support is not installed."
 msgstr "Error: SSL support is not installed."
 
-#: src/protocols/novell/novell.c:2420
+#: src/protocols/novell/novell.c:2421
 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:2727 src/protocols/oscar/oscar.c:582
-#: src/protocols/oscar/oscar.c:6473 src/protocols/yahoo/yahoo.c:2490
+#: src/protocols/novell/novell.c:2733 src/protocols/oscar/oscar.c:586
+#: src/protocols/oscar/oscar.c:6490 src/protocols/yahoo/yahoo.c:2513
 msgid "Offline"
 msgstr "Offline"
 
-#: src/protocols/novell/novell.c:2738
+#: src/protocols/novell/novell.c:2744
 msgid "Message"
 msgstr "Message"
 
-#: src/protocols/novell/novell.c:2837 src/protocols/novell/novell.c:2893
+#: src/protocols/novell/novell.c:2843 src/protocols/novell/novell.c:2899
 msgid "Appear Offline"
 msgstr "Appear Offline"
 
-#: src/protocols/novell/novell.c:3287
+#: src/protocols/novell/novell.c:3293
 msgid "Initiate _Chat"
 msgstr "Initiate _Chat"
 
@@ -7237,15 +7291,15 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/novell/novell.c:3381 src/protocols/novell/novell.c:3383
+#: src/protocols/novell/novell.c:3389 src/protocols/novell/novell.c:3391
 msgid "Novell GroupWise Messenger Protocol Plugin"
 msgstr "Novell GroupWise Messenger Protocol Plugin"
 
-#: src/protocols/novell/novell.c:3402
+#: src/protocols/novell/novell.c:3410
 msgid "Server address"
 msgstr "Server address"
 
-#: src/protocols/novell/novell.c:3406
+#: src/protocols/novell/novell.c:3414
 msgid "Server port"
 msgstr "Server port"
 
@@ -7345,157 +7399,165 @@
 msgid "Not while on AOL"
 msgstr "Not while on AOL"
 
-#: src/protocols/oscar/oscar.c:436
+#: src/protocols/oscar/oscar.c:403
+msgid ""
+"(There was an error converting this message.  The buddy you are speaking to "
+"most likely has a buggy client.)"
+msgstr ""
+"(There was an error converting this message.  The buddy you are speaking to "
+"most likely has a buggy client.)"
+
+#: src/protocols/oscar/oscar.c:441
 msgid "Voice"
 msgstr "Voice"
 
-#: src/protocols/oscar/oscar.c:439
+#: src/protocols/oscar/oscar.c:444
 msgid "AIM Direct IM"
 msgstr "AIM Direct IM"
 
-#: src/protocols/oscar/oscar.c:442 src/protocols/silc/buddy.c:1497
-#: src/protocols/silc/silc.c:631
+#: src/protocols/oscar/oscar.c:447 src/protocols/silc/silc.c:635
+#: src/protocols/silc/util.c:506
 msgid "Chat"
 msgstr "Chat"
 
-#: src/protocols/oscar/oscar.c:445 src/protocols/oscar/oscar.c:6777
+#: src/protocols/oscar/oscar.c:450 src/protocols/oscar/oscar.c:6793
 msgid "Get File"
 msgstr "Get File"
 
-#: src/protocols/oscar/oscar.c:452
+#: src/protocols/oscar/oscar.c:457
 msgid "Games"
 msgstr "Games"
 
-#: src/protocols/oscar/oscar.c:455
+#: src/protocols/oscar/oscar.c:460
 msgid "Add-Ins"
 msgstr "Add-Ins"
 
-#: src/protocols/oscar/oscar.c:458
+#: src/protocols/oscar/oscar.c:463
 msgid "Send Buddy List"
 msgstr "Send Buddy List"
 
-#: src/protocols/oscar/oscar.c:461
+#: src/protocols/oscar/oscar.c:466
 msgid "ICQ Direct Connect"
 msgstr "ICQ Direct Connect"
 
-#: src/protocols/oscar/oscar.c:464
+#: src/protocols/oscar/oscar.c:469
 msgid "AP User"
 msgstr "AP User"
 
-#: src/protocols/oscar/oscar.c:467
+#: src/protocols/oscar/oscar.c:472
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
-#: src/protocols/oscar/oscar.c:470
+#: src/protocols/oscar/oscar.c:475
 msgid "Nihilist"
 msgstr "Nihilist"
 
-#: src/protocols/oscar/oscar.c:473
+#: src/protocols/oscar/oscar.c:478
 msgid "ICQ Server Relay"
 msgstr "ICQ Server Relay"
 
-#: src/protocols/oscar/oscar.c:476
+#: src/protocols/oscar/oscar.c:481
 msgid "Old ICQ UTF8"
 msgstr "Old ICQ UTF8"
 
-#: src/protocols/oscar/oscar.c:479
+#: src/protocols/oscar/oscar.c:484
 msgid "Trillian Encryption"
 msgstr "Trillian Encryption"
 
-#: src/protocols/oscar/oscar.c:482
+#: src/protocols/oscar/oscar.c:487
 msgid "ICQ UTF8"
 msgstr "ICQ UTF8"
 
-#: src/protocols/oscar/oscar.c:485
+#: src/protocols/oscar/oscar.c:490
 msgid "Hiptop"
 msgstr "Hiptop"
 
-#: src/protocols/oscar/oscar.c:488
+#: src/protocols/oscar/oscar.c:493
 msgid "Security Enabled"
 msgstr "Security Enabled"
 
-#: src/protocols/oscar/oscar.c:491
+#: src/protocols/oscar/oscar.c:496
 msgid "Video Chat"
 msgstr "Video Chat"
 
-#: src/protocols/oscar/oscar.c:495
+#: src/protocols/oscar/oscar.c:500
 msgid "iChat AV"
 msgstr "iChat AV"
 
-#: src/protocols/oscar/oscar.c:498
+#: src/protocols/oscar/oscar.c:503
 msgid "Live Video"
 msgstr "Live Video"
 
-#: src/protocols/oscar/oscar.c:501
+#: src/protocols/oscar/oscar.c:506
 msgid "Camera"
 msgstr "Camera"
 
-#: src/protocols/oscar/oscar.c:520 src/protocols/oscar/oscar.c:5477
-#: src/protocols/oscar/oscar.c:6666
+#: src/protocols/oscar/oscar.c:524 src/protocols/oscar/oscar.c:5493
+#: src/protocols/oscar/oscar.c:6683
 msgid "Free For Chat"
 msgstr "Free For Chat"
 
-#: src/protocols/oscar/oscar.c:524 src/protocols/oscar/oscar.c:5471
-#: src/protocols/oscar/oscar.c:6664
+#: src/protocols/oscar/oscar.c:528 src/protocols/oscar/oscar.c:5487
+#: src/protocols/oscar/oscar.c:6681
 msgid "Not Available"
 msgstr "Not Available"
 
-#: src/protocols/oscar/oscar.c:526 src/protocols/oscar/oscar.c:5474
-#: src/protocols/oscar/oscar.c:6665
+#: src/protocols/oscar/oscar.c:530 src/protocols/oscar/oscar.c:5490
+#: src/protocols/oscar/oscar.c:6682
 msgid "Occupied"
 msgstr "Occupied"
 
-#: src/protocols/oscar/oscar.c:530
+#: src/protocols/oscar/oscar.c:534
 msgid "Web Aware"
 msgstr "Web Aware"
 
-#: src/protocols/oscar/oscar.c:598
+#: src/protocols/oscar/oscar.c:602
 msgid "Capabilities"
 msgstr "Capabilities"
 
-#: src/protocols/oscar/oscar.c:604
+#: src/protocols/oscar/oscar.c:609
 msgid "Buddy Comment"
 msgstr "Buddy Comment"
 
-#: src/protocols/oscar/oscar.c:739
+#: src/protocols/oscar/oscar.c:744
 #, c-format
 msgid "Direct IM with %s closed"
 msgstr "Direct IM with %s closed"
 
-#: src/protocols/oscar/oscar.c:741
+#: src/protocols/oscar/oscar.c:746
 #, c-format
 msgid "Direct IM with %s failed"
 msgstr "Direct IM with %s failed"
 
-#: src/protocols/oscar/oscar.c:748
+#: src/protocols/oscar/oscar.c:753
 msgid "Direct Connect failed"
 msgstr "Direct Connect failed"
 
-#: src/protocols/oscar/oscar.c:825 src/protocols/oscar/oscar.c:956
+#: src/protocols/oscar/oscar.c:830 src/protocols/oscar/oscar.c:961
 #, c-format
 msgid "Direct IM with %s established"
 msgstr "Direct IM with %s established"
 
-#: src/protocols/oscar/oscar.c:906
+#: src/protocols/oscar/oscar.c:911
 #, 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:1322
+#: src/protocols/oscar/oscar.c:1328
 #, 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:1327
+#: src/protocols/oscar/oscar.c:1333
 msgid "Unable to open Direct IM"
 msgstr "Unable to open Direct IM"
 
-#: src/protocols/oscar/oscar.c:1362
+#: src/protocols/oscar/oscar.c:1368
 #, 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:1366
+#: src/protocols/oscar/oscar.c:1372
 msgid ""
 "Because this reveals your IP address, it may be considered a privacy risk.  "
 "Do you wish to continue?"
@@ -7503,24 +7565,24 @@
 "Because this reveals your IP address, it may be considered a privacy risk.  "
 "Do you wish to continue?"
 
-#: src/protocols/oscar/oscar.c:1370 src/protocols/oscar/oscar.c:3312
+#: src/protocols/oscar/oscar.c:1376 src/protocols/oscar/oscar.c:3328
 msgid "Connect"
 msgstr "Connect"
 
-#: src/protocols/oscar/oscar.c:1436 src/protocols/toc/toc.c:872
+#: src/protocols/oscar/oscar.c:1442 src/protocols/toc/toc.c:872
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "You have been disconnected from chat room %s."
 
-#: src/protocols/oscar/oscar.c:1452
+#: src/protocols/oscar/oscar.c:1458
 msgid "Chat is currently unavailable"
 msgstr "Chat is currently unavailable"
 
-#: src/protocols/oscar/oscar.c:1533
+#: src/protocols/oscar/oscar.c:1539
 msgid "Screen name sent"
 msgstr "Screen name sent"
 
-#: src/protocols/oscar/oscar.c:1547
+#: src/protocols/oscar/oscar.c:1553
 #, c-format
 msgid ""
 "Unable to login: Could not sign on as %s because the screen name is "
@@ -7531,46 +7593,46 @@
 "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:1575
+#: src/protocols/oscar/oscar.c:1581
 msgid "Unable to login to AIM"
 msgstr "Unable to login to AIM"
 
-#: src/protocols/oscar/oscar.c:1676 src/protocols/oscar/oscar.c:2103
+#: src/protocols/oscar/oscar.c:1682 src/protocols/oscar/oscar.c:2119
 msgid "Could Not Connect"
 msgstr "Could Not Connect"
 
-#: src/protocols/oscar/oscar.c:1684
+#: src/protocols/oscar/oscar.c:1690
 msgid "Connection established, cookie sent"
 msgstr "Connection established, cookie sent"
 
-#: src/protocols/oscar/oscar.c:1797 src/protocols/yahoo/yahoo_filexfer.c:180
+#: src/protocols/oscar/oscar.c:1803 src/protocols/yahoo/yahoo_filexfer.c:180
 #: src/protocols/yahoo/yahoo_filexfer.c:189
 #: src/protocols/yahoo/yahoo_filexfer.c:199
 msgid "Unable to establish file descriptor."
 msgstr "Unable to establish file descriptor."
 
-#: src/protocols/oscar/oscar.c:1802
+#: src/protocols/oscar/oscar.c:1808
 msgid "Unable to create new connection."
 msgstr "Unable to create new connection."
 
-#: src/protocols/oscar/oscar.c:1873
+#: src/protocols/oscar/oscar.c:1879
 msgid "Unable to establish listener socket."
 msgstr "Unable to establish listener socket."
 
-#: src/protocols/oscar/oscar.c:1987 src/protocols/toc/toc.c:541
+#: src/protocols/oscar/oscar.c:2003 src/protocols/toc/toc.c:541
 msgid "Incorrect nickname or password."
 msgstr "Incorrect nickname or password."
 
-#: src/protocols/oscar/oscar.c:1992
+#: src/protocols/oscar/oscar.c:2008
 msgid "Your account is currently suspended."
 msgstr "Your account is currently suspended."
 
 #. service temporarily unavailable
-#: src/protocols/oscar/oscar.c:1996
+#: src/protocols/oscar/oscar.c:2012
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "The AOL Instant Messenger service is temporarily unavailable."
 
-#: src/protocols/oscar/oscar.c:2001
+#: src/protocols/oscar/oscar.c:2017
 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."
@@ -7578,21 +7640,21 @@
 "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:2006
+#: src/protocols/oscar/oscar.c:2022
 #, 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:2038
+#: src/protocols/oscar/oscar.c:2054
 msgid "Internal Error"
 msgstr "Internal Error"
 
-#: src/protocols/oscar/oscar.c:2110
+#: src/protocols/oscar/oscar.c:2126
 msgid "Received authorization"
 msgstr "Received authorisation"
 
-#: src/protocols/oscar/oscar.c:2146 src/protocols/oscar/oscar.c:2176
-#: src/protocols/oscar/oscar.c:2264
+#: src/protocols/oscar/oscar.c:2162 src/protocols/oscar/oscar.c:2192
+#: src/protocols/oscar/oscar.c:2280
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
@@ -7601,24 +7663,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:2149 src/protocols/oscar/oscar.c:2179
+#: src/protocols/oscar/oscar.c:2165 src/protocols/oscar/oscar.c:2195
 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:2267
+#: src/protocols/oscar/oscar.c:2283
 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:3096 src/protocols/oscar/oscar.c:3118
+#: src/protocols/oscar/oscar.c:3112 src/protocols/oscar/oscar.c:3134
 msgid "(There was an error receiving this message)"
 msgstr "(There was an error receiving this message)"
 
-#: src/protocols/oscar/oscar.c:3304
+#: src/protocols/oscar/oscar.c:3320
 #, 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:3307
+#: src/protocols/oscar/oscar.c:3323
 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 "
@@ -7628,19 +7690,19 @@
 "for IM Images.  Because your IP address will be revealed, this may be "
 "considered a privacy risk."
 
-#: src/protocols/oscar/oscar.c:3343
+#: src/protocols/oscar/oscar.c:3359
 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:3351
+#: src/protocols/oscar/oscar.c:3367
 msgid "Authorization Request Message:"
 msgstr "Authorisation Request Message:"
 
-#: src/protocols/oscar/oscar.c:3352
+#: src/protocols/oscar/oscar.c:3368
 msgid "Please authorize me!"
 msgstr "Please authorise me!"
 
-#: src/protocols/oscar/oscar.c:3382
+#: src/protocols/oscar/oscar.c:3398
 #, c-format
 msgid ""
 "The user %s requires authorization before being added to a buddy list.  Do "
@@ -7649,23 +7711,23 @@
 "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:3387 src/protocols/oscar/oscar.c:3389
+#: src/protocols/oscar/oscar.c:3403 src/protocols/oscar/oscar.c:3405
 msgid "Request Authorization"
 msgstr "Request Authorisation"
 
-#: src/protocols/oscar/oscar.c:3437 src/protocols/oscar/oscar.c:3439
-#: src/protocols/oscar/oscar.c:3446 src/protocols/oscar/oscar.c:3528
-#: src/protocols/oscar/oscar.c:3548 src/protocols/oscar/oscar.c:3902
-#: src/protocols/oscar/oscar.c:3962 src/protocols/oscar/oscar.c:6092
-#: src/protocols/oscar/oscar.c:6138
+#: src/protocols/oscar/oscar.c:3453 src/protocols/oscar/oscar.c:3455
+#: src/protocols/oscar/oscar.c:3462 src/protocols/oscar/oscar.c:3544
+#: src/protocols/oscar/oscar.c:3564 src/protocols/oscar/oscar.c:3918
+#: src/protocols/oscar/oscar.c:3978 src/protocols/oscar/oscar.c:6109
+#: src/protocols/oscar/oscar.c:6155
 msgid "No reason given."
 msgstr "No reason given."
 
-#: src/protocols/oscar/oscar.c:3445
+#: src/protocols/oscar/oscar.c:3461
 msgid "Authorization Denied Message:"
 msgstr "Authorisation Denied Message:"
 
-#: src/protocols/oscar/oscar.c:3528
+#: src/protocols/oscar/oscar.c:3544
 #, c-format
 msgid ""
 "The user %u wants to add you to their buddy list for the following reason:\n"
@@ -7674,11 +7736,11 @@
 "The user %u wants to add you to their buddy list for the following reason:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3536 src/protocols/oscar/oscar.c:6098
+#: src/protocols/oscar/oscar.c:3552 src/protocols/oscar/oscar.c:6115
 msgid "Authorization Request"
 msgstr "Authorisation Request"
 
-#: src/protocols/oscar/oscar.c:3548
+#: src/protocols/oscar/oscar.c:3564
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -7689,17 +7751,17 @@
 "following reason:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3549
+#: src/protocols/oscar/oscar.c:3565
 msgid "ICQ authorization denied."
 msgstr "ICQ authorisation denied."
 
 #. Someone has granted you authorization
-#: src/protocols/oscar/oscar.c:3556
+#: src/protocols/oscar/oscar.c:3572
 #, 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:3564
+#: src/protocols/oscar/oscar.c:3580
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -7712,7 +7774,7 @@
 "From: %s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3572
+#: src/protocols/oscar/oscar.c:3588
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -7725,7 +7787,7 @@
 "From: %s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3580
+#: src/protocols/oscar/oscar.c:3596
 #, c-format
 msgid ""
 "You have received an ICQ email from %s [%s]\n"
@@ -7738,34 +7800,34 @@
 "Message is:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3601
+#: src/protocols/oscar/oscar.c:3617
 #, 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:3607
+#: src/protocols/oscar/oscar.c:3623
 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:3611
+#: src/protocols/oscar/oscar.c:3627
 msgid "Decline"
 msgstr "Decline"
 
-#: src/protocols/oscar/oscar.c:3696
+#: src/protocols/oscar/oscar.c:3712
 #, 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:3705
+#: src/protocols/oscar/oscar.c:3721
 #, 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:3714
+#: src/protocols/oscar/oscar.c:3730
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -7776,75 +7838,70 @@
 msgstr[1] ""
 "You missed %hu messages from %s because the rate limit has been exceeded."
 
-#: src/protocols/oscar/oscar.c:3723
+#: src/protocols/oscar/oscar.c:3739
 #, 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:3732
+#: src/protocols/oscar/oscar.c:3748
 #, 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:3741
+#: src/protocols/oscar/oscar.c:3757
 #, 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:3798 src/protocols/oscar/oscar.c:4022
+#: src/protocols/oscar/oscar.c:3814 src/protocols/oscar/oscar.c:4038
 #, c-format
 msgid "Info for %s"
 msgstr "Info for %s"
 
-#: src/protocols/oscar/oscar.c:3803
-#, 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"
-
-#: src/protocols/oscar/oscar.c:3864
+#: src/protocols/oscar/oscar.c:3880
 #, c-format
 msgid "SNAC threw error: %s\n"
 msgstr "SNAC threw error: %s\n"
 
-#: src/protocols/oscar/oscar.c:3865
+#: src/protocols/oscar/oscar.c:3881
 msgid "Unknown error"
 msgstr "Unknown error"
 
 #. Data is assumed to be the destination sn
-#: src/protocols/oscar/oscar.c:3900
+#: src/protocols/oscar/oscar.c:3916
 #, c-format
 msgid "Your message to %s did not get sent:"
 msgstr "Your message to %s did not get sent:"
 
-#: src/protocols/oscar/oscar.c:3959
+#: src/protocols/oscar/oscar.c:3975
 #, c-format
 msgid "User information for %s unavailable:"
 msgstr "User information for %s unavailable:"
 
-#: src/protocols/oscar/oscar.c:3982
+#: src/protocols/oscar/oscar.c:3998
 msgid "Warning Level"
 msgstr "Warning Level"
 
-#: src/protocols/oscar/oscar.c:3985
+#: src/protocols/oscar/oscar.c:4001
 msgid "Online Since"
 msgstr "Online Since"
 
-#: src/protocols/oscar/oscar.c:3989 src/protocols/yahoo/yahoo_profile.c:1113
+#: src/protocols/oscar/oscar.c:4005 src/protocols/yahoo/yahoo_profile.c:1118
 msgid "Member Since"
 msgstr "Member Since"
 
-#: src/protocols/oscar/oscar.c:4073
+#: src/protocols/oscar/oscar.c:4089
 msgid "Your AIM connection may be lost."
 msgstr "Your AIM connection may be lost."
 
 #. The conversion failed!
-#: src/protocols/oscar/oscar.c:4259
+#: src/protocols/oscar/oscar.c:4275
 msgid ""
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
@@ -7852,11 +7909,11 @@
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
 
-#: src/protocols/oscar/oscar.c:4476
+#: src/protocols/oscar/oscar.c:4492
 msgid "Rate limiting error."
 msgstr "Rate limiting error."
 
-#: src/protocols/oscar/oscar.c:4477
+#: src/protocols/oscar/oscar.c:4493
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
@@ -7864,7 +7921,7 @@
 "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:4540
+#: src/protocols/oscar/oscar.c:4556
 msgid ""
 "You have been disconnected because you have signed on with this screen name "
 "at another location."
@@ -7872,113 +7929,113 @@
 "You have been disconnected because you have signed on with this screen name "
 "at another location."
 
-#: src/protocols/oscar/oscar.c:4542
+#: src/protocols/oscar/oscar.c:4558
 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:4573
+#: src/protocols/oscar/oscar.c:4589
 msgid "Finalizing connection"
 msgstr "Finalizing connection"
 
-#: src/protocols/oscar/oscar.c:4843 src/protocols/oscar/oscar.c:4850
+#: src/protocols/oscar/oscar.c:4859 src/protocols/oscar/oscar.c:4866
 msgid "Email Address"
 msgstr "Email Address"
 
-#: src/protocols/oscar/oscar.c:4855 src/protocols/silc/buddy.c:1524
+#: src/protocols/oscar/oscar.c:4871 src/protocols/silc/util.c:538
 msgid "Mobile Phone"
 msgstr "Mobile Phone"
 
-#: src/protocols/oscar/oscar.c:4856
+#: src/protocols/oscar/oscar.c:4872
 msgid "Not specified"
 msgstr "Not specified"
 
-#: src/protocols/oscar/oscar.c:4857 src/protocols/trepia/trepia.c:281
+#: src/protocols/oscar/oscar.c:4873 src/protocols/trepia/trepia.c:281
 #: src/protocols/trepia/trepia.c:407
 msgid "Female"
 msgstr "Female"
 
-#: src/protocols/oscar/oscar.c:4857 src/protocols/trepia/trepia.c:280
+#: src/protocols/oscar/oscar.c:4873 src/protocols/trepia/trepia.c:280
 #: src/protocols/trepia/trepia.c:407
 msgid "Male"
 msgstr "Male"
 
-#: src/protocols/oscar/oscar.c:4873
+#: src/protocols/oscar/oscar.c:4889
 msgid "Personal Web Page"
 msgstr "Personal Web Page"
 
-#: src/protocols/oscar/oscar.c:4877
+#: src/protocols/oscar/oscar.c:4893
 msgid "Additional Information"
 msgstr "Additional Information"
 
-#: src/protocols/oscar/oscar.c:4882
-msgid "Home Address"
-msgstr "Home Address"
-
-#: src/protocols/oscar/oscar.c:4886 src/protocols/oscar/oscar.c:4894
-msgid "Zip Code"
-msgstr "Postcode"
-
-#: src/protocols/oscar/oscar.c:4890
-msgid "Work Address"
-msgstr "Work Address"
-
 #: src/protocols/oscar/oscar.c:4898
+msgid "Home Address"
+msgstr "Home Address"
+
+#: src/protocols/oscar/oscar.c:4902 src/protocols/oscar/oscar.c:4910
+msgid "Zip Code"
+msgstr "Postcode"
+
+#: src/protocols/oscar/oscar.c:4906
+msgid "Work Address"
+msgstr "Work Address"
+
+#: src/protocols/oscar/oscar.c:4914
 msgid "Work Information"
 msgstr "Work Information"
 
-#: src/protocols/oscar/oscar.c:4899
+#: src/protocols/oscar/oscar.c:4915
 msgid "Company"
 msgstr "Company"
 
-#: src/protocols/oscar/oscar.c:4900
+#: src/protocols/oscar/oscar.c:4916
 msgid "Division"
 msgstr "Division"
 
-#: src/protocols/oscar/oscar.c:4901
+#: src/protocols/oscar/oscar.c:4917
 msgid "Position"
 msgstr "Position"
 
-#: src/protocols/oscar/oscar.c:4903
+#: src/protocols/oscar/oscar.c:4919
 msgid "Web Page"
 msgstr "Web Page"
 
-#: src/protocols/oscar/oscar.c:4909
+#: src/protocols/oscar/oscar.c:4925
 #, c-format
 msgid "ICQ Info for %s"
 msgstr "ICQ Info for %s"
 
-#: src/protocols/oscar/oscar.c:4958
+#: src/protocols/oscar/oscar.c:4974
 msgid "Pop-Up Message"
 msgstr "Pop-Up Message"
 
-#: src/protocols/oscar/oscar.c:4979
+#: src/protocols/oscar/oscar.c:4995
 #, 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:4983
+#: src/protocols/oscar/oscar.c:4999
 msgid "Search Results"
 msgstr "Search Results"
 
-#: src/protocols/oscar/oscar.c:5000
+#: src/protocols/oscar/oscar.c:5016
 #, c-format
 msgid "No results found for email address %s"
 msgstr "No results found for email address %s"
 
-#: src/protocols/oscar/oscar.c:5021
+#: src/protocols/oscar/oscar.c:5037
 #, 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:5023
+#: src/protocols/oscar/oscar.c:5039
 msgid "Account Confirmation Requested"
 msgstr "Account Confirmation Requested"
 
-#: src/protocols/oscar/oscar.c:5051
+#: src/protocols/oscar/oscar.c:5067
 msgid "Error Changing Account Info"
 msgstr "Error Changing Account Info"
 
-#: src/protocols/oscar/oscar.c:5054
+#: src/protocols/oscar/oscar.c:5070
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -7987,7 +8044,7 @@
 "Error 0x%04x: Unable to format screen name because the requested screen name "
 "differs from the original."
 
-#: src/protocols/oscar/oscar.c:5057
+#: src/protocols/oscar/oscar.c:5073
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -7996,7 +8053,7 @@
 "Error 0x%04x: Unable to format screen name because the requested screen name "
 "ends in a space."
 
-#: src/protocols/oscar/oscar.c:5060
+#: src/protocols/oscar/oscar.c:5076
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -8005,7 +8062,7 @@
 "Error 0x%04x: Unable to format screen name because the requested screen name "
 "is too long."
 
-#: src/protocols/oscar/oscar.c:5063
+#: src/protocols/oscar/oscar.c:5079
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because there is already a "
@@ -8014,7 +8071,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:5066
+#: src/protocols/oscar/oscar.c:5082
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address has "
@@ -8023,7 +8080,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:5069
+#: src/protocols/oscar/oscar.c:5085
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address is "
@@ -8032,12 +8089,12 @@
 "Error 0x%04x: Unable to change email address because the given address is "
 "invalid."
 
-#: src/protocols/oscar/oscar.c:5072
+#: src/protocols/oscar/oscar.c:5088
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "Error 0x%04x: Unknown error."
 
-#: src/protocols/oscar/oscar.c:5082
+#: src/protocols/oscar/oscar.c:5098
 #, c-format
 msgid ""
 "Your screen name is currently formatted as follows:\n"
@@ -8046,26 +8103,26 @@
 "Your screen name is currently formatted as follows:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:5083 src/protocols/oscar/oscar.c:5090
+#: src/protocols/oscar/oscar.c:5099 src/protocols/oscar/oscar.c:5106
 msgid "Account Info"
 msgstr "Account Info"
 
-#: src/protocols/oscar/oscar.c:5088
+#: src/protocols/oscar/oscar.c:5104
 #, c-format
 msgid "The email address for %s is %s"
 msgstr "The email address for %s is %s"
 
-#: src/protocols/oscar/oscar.c:5153
+#: src/protocols/oscar/oscar.c:5169
 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:5326
+#: src/protocols/oscar/oscar.c:5342
 msgid "Unable to set AIM profile."
 msgstr "Unable to set AIM profile."
 
-#: src/protocols/oscar/oscar.c:5327
+#: src/protocols/oscar/oscar.c:5343
 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 "
@@ -8075,7 +8132,7 @@
 "completed.  Your profile remains unset; try setting it again when you are "
 "fully connected."
 
-#: src/protocols/oscar/oscar.c:5354
+#: src/protocols/oscar/oscar.c:5370
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  Gaim has truncated "
@@ -8090,19 +8147,19 @@
 "The maximum profile length of %d bytes has been exceeded.  Gaim has "
 "truncated it for you."
 
-#: src/protocols/oscar/oscar.c:5359
+#: src/protocols/oscar/oscar.c:5375
 msgid "Profile too long."
 msgstr "Profile too long."
 
-#: src/protocols/oscar/oscar.c:5375 src/protocols/oscar/oscar.c:6671
+#: src/protocols/oscar/oscar.c:5391 src/protocols/oscar/oscar.c:6688
 msgid "Visible"
 msgstr "Visible"
 
-#: src/protocols/oscar/oscar.c:5393
+#: src/protocols/oscar/oscar.c:5409
 msgid "Unable to set AIM away message."
 msgstr "Unable to set AIM away message."
 
-#: src/protocols/oscar/oscar.c:5394
+#: src/protocols/oscar/oscar.c:5410
 msgid ""
 "You have probably requested to set your away message before the login "
 "procedure completed.  You remain in a \"present\" state; try setting it "
@@ -8112,7 +8169,7 @@
 "procedure completed.  You remain in a \"present\" state; try setting it "
 "again when you are fully connected."
 
-#: src/protocols/oscar/oscar.c:5434
+#: src/protocols/oscar/oscar.c:5450
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  Gaim has "
@@ -8127,11 +8184,11 @@
 "The maximum away message length of %d bytes has been exceeded.  Gaim has "
 "truncated it for you."
 
-#: src/protocols/oscar/oscar.c:5439
+#: src/protocols/oscar/oscar.c:5455
 msgid "Away message too long."
 msgstr "Away message too long."
 
-#: src/protocols/oscar/oscar.c:5517
+#: src/protocols/oscar/oscar.c:5533
 #, c-format
 msgid ""
 "Could not add the buddy %s because the screen name is invalid.  Screen names "
@@ -8142,16 +8199,16 @@
 "must either start with a letter and contain only letters, numbers and "
 "spaces, or contain only numbers."
 
-#: src/protocols/oscar/oscar.c:5518 src/protocols/oscar/oscar.c:5959
-#: src/protocols/oscar/oscar.c:5972
+#: src/protocols/oscar/oscar.c:5534 src/protocols/oscar/oscar.c:5976
+#: src/protocols/oscar/oscar.c:5989
 msgid "Unable To Add"
 msgstr "Unable To Add"
 
-#: src/protocols/oscar/oscar.c:5678
+#: src/protocols/oscar/oscar.c:5695
 msgid "Unable To Retrieve Buddy List"
 msgstr "Unable To Retrieve Buddy List"
 
-#: src/protocols/oscar/oscar.c:5679
+#: src/protocols/oscar/oscar.c:5696
 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 "
@@ -8161,13 +8218,13 @@
 "servers.  Your buddy list is not lost, and will probably become available in "
 "a few hours."
 
-#: src/protocols/oscar/oscar.c:5855 src/protocols/oscar/oscar.c:5856
-#: src/protocols/oscar/oscar.c:5861 src/protocols/oscar/oscar.c:6016
-#: src/protocols/oscar/oscar.c:6017 src/protocols/oscar/oscar.c:6022
+#: src/protocols/oscar/oscar.c:5872 src/protocols/oscar/oscar.c:5873
+#: src/protocols/oscar/oscar.c:5878 src/protocols/oscar/oscar.c:6033
+#: src/protocols/oscar/oscar.c:6034 src/protocols/oscar/oscar.c:6039
 msgid "Orphans"
 msgstr "Orphans"
 
-#: src/protocols/oscar/oscar.c:5958
+#: src/protocols/oscar/oscar.c:5975
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -8176,11 +8233,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:5958 src/protocols/oscar/oscar.c:5971
+#: src/protocols/oscar/oscar.c:5975 src/protocols/oscar/oscar.c:5988
 msgid "(no name)"
 msgstr "(no name)"
 
-#: src/protocols/oscar/oscar.c:5971
+#: src/protocols/oscar/oscar.c:5988
 #, c-format
 msgid ""
 "Could not add the buddy %s for an unknown reason.  The most common reason "
@@ -8191,7 +8248,7 @@
 "for this is that you have the maximum number of allowed buddies in your "
 "buddy list."
 
-#: src/protocols/oscar/oscar.c:6053
+#: src/protocols/oscar/oscar.c:6070
 #, c-format
 msgid ""
 "The user %s has given you permission to add you to their buddy list.  Do you "
@@ -8200,11 +8257,11 @@
 "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:6059
+#: src/protocols/oscar/oscar.c:6076
 msgid "Authorization Given"
 msgstr "Authorisation Given"
 
-#: src/protocols/oscar/oscar.c:6092
+#: src/protocols/oscar/oscar.c:6109
 #, c-format
 msgid ""
 "The user %s wants to add you to their buddy list for the following reason:\n"
@@ -8214,17 +8271,17 @@
 "%s"
 
 #. Granted
-#: src/protocols/oscar/oscar.c:6134
+#: src/protocols/oscar/oscar.c:6151
 #, 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:6135
+#: src/protocols/oscar/oscar.c:6152
 msgid "Authorization Granted"
 msgstr "Authorisation Granted"
 
 #. Denied
-#: src/protocols/oscar/oscar.c:6138
+#: src/protocols/oscar/oscar.c:6155
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -8235,71 +8292,71 @@
 "following reason:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:6139
+#: src/protocols/oscar/oscar.c:6156
 msgid "Authorization Denied"
 msgstr "Authorisation Denied"
 
-#: src/protocols/oscar/oscar.c:6176 src/protocols/toc/toc.c:1271
+#: src/protocols/oscar/oscar.c:6193 src/protocols/toc/toc.c:1271
 msgid "_Exchange:"
 msgstr "_Exchange:"
 
-#: src/protocols/oscar/oscar.c:6198
+#: src/protocols/oscar/oscar.c:6215
 msgid "Invalid chat name specified."
 msgstr "Invalid chat name specified."
 
-#: src/protocols/oscar/oscar.c:6288
+#: src/protocols/oscar/oscar.c:6305
 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:6445
+#: src/protocols/oscar/oscar.c:6462
 msgid "Away Message"
 msgstr "Away Message"
 
-#: src/protocols/oscar/oscar.c:6729
+#: src/protocols/oscar/oscar.c:6746
 msgid "Buddy Comment:"
 msgstr "Buddy Comment:"
 
-#: src/protocols/oscar/oscar.c:6747
+#: src/protocols/oscar/oscar.c:6764
 msgid "Edit Buddy Comment"
 msgstr "Edit Buddy Comment"
 
-#: src/protocols/oscar/oscar.c:6753
+#: src/protocols/oscar/oscar.c:6770
 msgid "Get Status Msg"
 msgstr "Get Status Msg"
 
-#: src/protocols/oscar/oscar.c:6765
+#: src/protocols/oscar/oscar.c:6782
 msgid "Direct IM"
 msgstr "Direct IM"
 
-#: src/protocols/oscar/oscar.c:6788
+#: src/protocols/oscar/oscar.c:6804
 msgid "Re-request Authorization"
 msgstr "Re-request Authorisation"
 
-#: src/protocols/oscar/oscar.c:6818
+#: src/protocols/oscar/oscar.c:6834
 msgid "The new formatting is invalid."
 msgstr "The new formatting is invalid."
 
-#: src/protocols/oscar/oscar.c:6819
+#: src/protocols/oscar/oscar.c:6835
 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:6826
+#: src/protocols/oscar/oscar.c:6842
 msgid "New screen name formatting:"
 msgstr "New screen name formatting:"
 
-#: src/protocols/oscar/oscar.c:6878
+#: src/protocols/oscar/oscar.c:6894
 msgid "Change Address To:"
 msgstr "Change Address To:"
 
-#: src/protocols/oscar/oscar.c:6923
+#: src/protocols/oscar/oscar.c:6939
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>you are not waiting for authorisation</i>"
 
-#: src/protocols/oscar/oscar.c:6926
+#: src/protocols/oscar/oscar.c:6942
 msgid "You are awaiting authorization from the following buddies"
 msgstr "You are awaiting authorisation from the following buddies"
 
-#: src/protocols/oscar/oscar.c:6927
+#: src/protocols/oscar/oscar.c:6943
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
@@ -8307,75 +8364,75 @@
 "You can re-request authorisation from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorisation.\""
 
-#: src/protocols/oscar/oscar.c:6944
+#: src/protocols/oscar/oscar.c:6960
 msgid "Find Buddy by E-mail"
 msgstr "Find Buddy by E-mail"
 
-#: src/protocols/oscar/oscar.c:6945
+#: src/protocols/oscar/oscar.c:6961
 msgid "Search for a buddy by e-mail address"
 msgstr "Search for a buddy by e-mail address"
 
-#: src/protocols/oscar/oscar.c:6946
+#: src/protocols/oscar/oscar.c:6962
 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:6963
+#: src/protocols/oscar/oscar.c:6979
 msgid "Available Message:"
 msgstr "Available Message:"
 
-#: src/protocols/oscar/oscar.c:6964
+#: src/protocols/oscar/oscar.c:6980
 msgid "I'm doing work and hoping for a distraction--IM me!"
 msgstr "I'm doing work and hoping for a distraction--IM me!"
 
-#: src/protocols/oscar/oscar.c:7045 src/protocols/silc/silc.c:782
+#: src/protocols/oscar/oscar.c:7061 src/protocols/silc/silc.c:789
 msgid "Set User Info..."
 msgstr "Set User Info..."
 
-#: src/protocols/oscar/oscar.c:7050
+#: src/protocols/oscar/oscar.c:7066
 msgid "Set User Info (URL)..."
 msgstr "Set User Info (URL)..."
 
-#: src/protocols/oscar/oscar.c:7056
+#: src/protocols/oscar/oscar.c:7072
 msgid "Set Available Message..."
 msgstr "Set Available Message..."
 
-#: src/protocols/oscar/oscar.c:7061 src/protocols/silc/silc.c:778
+#: src/protocols/oscar/oscar.c:7077 src/protocols/silc/silc.c:785
 msgid "Change Password..."
 msgstr "Change Password..."
 
-#: src/protocols/oscar/oscar.c:7066
+#: src/protocols/oscar/oscar.c:7082
 msgid "Change Password (URL)"
 msgstr "Change Password (URL)"
 
-#: src/protocols/oscar/oscar.c:7070
+#: src/protocols/oscar/oscar.c:7086
 msgid "Configure IM Forwarding (URL)"
 msgstr "Configure IM Forwarding (URL)"
 
-#: src/protocols/oscar/oscar.c:7079
+#: src/protocols/oscar/oscar.c:7095
 msgid "Format Screen Name..."
 msgstr "Format Screen Name..."
 
-#: src/protocols/oscar/oscar.c:7083
+#: src/protocols/oscar/oscar.c:7099
 msgid "Confirm Account"
 msgstr "Confirm Account"
 
-#: src/protocols/oscar/oscar.c:7087
+#: src/protocols/oscar/oscar.c:7103
 msgid "Display Currently Registered Address"
 msgstr "Display Currently Registered Address"
 
-#: src/protocols/oscar/oscar.c:7091
+#: src/protocols/oscar/oscar.c:7107
 msgid "Change Currently Registered Address..."
 msgstr "Change Currently Registered Address"
 
-#: src/protocols/oscar/oscar.c:7098
+#: src/protocols/oscar/oscar.c:7114
 msgid "Show Buddies Awaiting Authorization"
 msgstr "Show Buddies Awaiting Authorisation"
 
-#: src/protocols/oscar/oscar.c:7104
+#: src/protocols/oscar/oscar.c:7120
 msgid "Search for Buddy by Email..."
 msgstr "Search for Buddy by Email..."
 
-#: src/protocols/oscar/oscar.c:7109
+#: src/protocols/oscar/oscar.c:7125
 msgid "Search for Buddy by Information"
 msgstr "Search for Buddy by Information"
 
@@ -8389,15 +8446,15 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/oscar/oscar.c:7225 src/protocols/oscar/oscar.c:7227
+#: src/protocols/oscar/oscar.c:7243 src/protocols/oscar/oscar.c:7245
 msgid "AIM/ICQ Protocol Plugin"
 msgstr "AIM/ICQ Protocol Plugin"
 
-#: src/protocols/oscar/oscar.c:7246
+#: src/protocols/oscar/oscar.c:7264
 msgid "Auth host"
 msgstr "Auth host"
 
-#: src/protocols/oscar/oscar.c:7251
+#: src/protocols/oscar/oscar.c:7269
 msgid "Auth port"
 msgstr "Auth port"
 
@@ -8486,32 +8543,32 @@
 msgstr "Set IM Password"
 
 #: src/protocols/silc/buddy.c:506 src/protocols/silc/buddy.c:541
-#: src/protocols/silc/ops.c:1080 src/protocols/silc/ops.c:1091
+#: src/protocols/silc/ops.c:1256 src/protocols/silc/ops.c:1267
 msgid "Get Public Key"
 msgstr "Get Public Key"
 
-#: src/protocols/silc/buddy.c:542 src/protocols/silc/ops.c:1081
-#: src/protocols/silc/ops.c:1092
+#: src/protocols/silc/buddy.c:542 src/protocols/silc/ops.c:1257
+#: src/protocols/silc/ops.c:1268
 msgid "Cannot fetch the public key"
 msgstr "Cannot fetch the public key"
 
-#: src/protocols/silc/buddy.c:629 src/protocols/silc/buddy.c:1619
+#: src/protocols/silc/buddy.c:629 src/protocols/silc/buddy.c:1544
 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:219
+#: src/protocols/silc/chat.c:222
 msgid "Could not load public key"
 msgstr "Could not load public key"
 
-#: src/protocols/silc/buddy.c:707 src/protocols/silc/ops.c:837
-#: src/protocols/silc/ops.c:908 src/protocols/silc/ops.c:991
-#: src/protocols/silc/ops.c:992 src/protocols/silc/ops.c:998
-#: src/protocols/silc/ops.c:999
+#: src/protocols/silc/buddy.c:707 src/protocols/silc/ops.c:853
+#: src/protocols/silc/ops.c:925 src/protocols/silc/ops.c:1060
+#: src/protocols/silc/ops.c:1061 src/protocols/silc/ops.c:1079
 msgid "User Information"
 msgstr "User Information"
 
-#: src/protocols/silc/buddy.c:708 src/protocols/silc/ops.c:909
+#: src/protocols/silc/buddy.c:708 src/protocols/silc/ops.c:926
+#: src/protocols/silc/ops.c:1080
 msgid "Cannot get user information"
 msgstr "Cannot get user information"
 
@@ -8528,6 +8585,11 @@
 "You cannot receive buddy notifications until you import their public key.  "
 "You can use the Get Public Key command to get the public key."
 
+#. Open file selector to select the public key.
+#: src/protocols/silc/buddy.c:1023
+msgid "Open..."
+msgstr "Open..."
+
 #: src/protocols/silc/buddy.c:1032
 #, c-format
 msgid "The %s buddy is not present in the network"
@@ -8588,143 +8650,111 @@
 msgid "Robot"
 msgstr "Robot"
 
-#: src/protocols/silc/buddy.c:1396 src/protocols/silc/buddy.c:1464
-#: src/protocols/silc/silc.c:606
+#: src/protocols/silc/buddy.c:1396 src/protocols/silc/silc.c:610
+#: src/protocols/silc/util.c:469
 msgid "Happy"
 msgstr "Happy"
 
-#: src/protocols/silc/buddy.c:1398 src/protocols/silc/buddy.c:1466
-#: src/protocols/silc/silc.c:608
+#: src/protocols/silc/buddy.c:1398 src/protocols/silc/silc.c:612
+#: src/protocols/silc/util.c:471
 msgid "Sad"
 msgstr "Sad"
 
-#: src/protocols/silc/buddy.c:1400 src/protocols/silc/buddy.c:1468
-#: src/protocols/silc/silc.c:610
+#: src/protocols/silc/buddy.c:1400 src/protocols/silc/silc.c:614
+#: src/protocols/silc/util.c:473
 msgid "Angry"
 msgstr "Angry"
 
-#: src/protocols/silc/buddy.c:1402 src/protocols/silc/buddy.c:1470
-#: src/protocols/silc/silc.c:612
+#: src/protocols/silc/buddy.c:1402 src/protocols/silc/silc.c:616
+#: src/protocols/silc/util.c:475
 msgid "Jealous"
 msgstr "Jealous"
 
-#: src/protocols/silc/buddy.c:1404 src/protocols/silc/buddy.c:1472
-#: src/protocols/silc/silc.c:614
+#: src/protocols/silc/buddy.c:1404 src/protocols/silc/silc.c:618
+#: src/protocols/silc/util.c:477
 msgid "Ashamed"
 msgstr "Ashamed"
 
-#: src/protocols/silc/buddy.c:1406 src/protocols/silc/buddy.c:1474
-#: src/protocols/silc/silc.c:616
+#: src/protocols/silc/buddy.c:1406 src/protocols/silc/silc.c:620
+#: src/protocols/silc/util.c:479
 msgid "Invincible"
 msgstr "Invincible"
 
-#: src/protocols/silc/buddy.c:1408 src/protocols/silc/buddy.c:1476
-#: src/protocols/silc/silc.c:618
+#: src/protocols/silc/buddy.c:1408 src/protocols/silc/silc.c:622
+#: src/protocols/silc/util.c:481
 msgid "In Love"
 msgstr "In Love"
 
-#: src/protocols/silc/buddy.c:1410 src/protocols/silc/buddy.c:1478
-#: src/protocols/silc/silc.c:620
+#: src/protocols/silc/buddy.c:1410 src/protocols/silc/silc.c:624
+#: src/protocols/silc/util.c:483
 msgid "Sleepy"
 msgstr "Sleepy"
 
-#: src/protocols/silc/buddy.c:1412 src/protocols/silc/buddy.c:1480
-#: src/protocols/silc/silc.c:622
+#: src/protocols/silc/buddy.c:1412 src/protocols/silc/silc.c:626
+#: src/protocols/silc/util.c:485
 msgid "Bored"
 msgstr "Bored"
 
-#: src/protocols/silc/buddy.c:1414 src/protocols/silc/buddy.c:1482
-#: src/protocols/silc/silc.c:624
+#: src/protocols/silc/buddy.c:1414 src/protocols/silc/silc.c:628
+#: src/protocols/silc/util.c:487
 msgid "Excited"
 msgstr "Excited"
 
-#: src/protocols/silc/buddy.c:1416 src/protocols/silc/buddy.c:1484
-#: src/protocols/silc/silc.c:626
+#: src/protocols/silc/buddy.c:1416 src/protocols/silc/silc.c:630
+#: src/protocols/silc/util.c:489
 msgid "Anxious"
 msgstr "Anxious"
 
-#: src/protocols/silc/buddy.c:1452
-msgid "Modes"
-msgstr "Modes"
-
-#: src/protocols/silc/buddy.c:1462
+#: src/protocols/silc/buddy.c:1448 src/protocols/silc/ops.c:962
+msgid "User Modes"
+msgstr "User Modes"
+
+#: src/protocols/silc/buddy.c:1457 src/protocols/silc/ops.c:971
 msgid "Mood"
 msgstr "Mood"
 
-#: src/protocols/silc/buddy.c:1490
+#: src/protocols/silc/buddy.c:1461 src/protocols/silc/ops.c:977
 msgid "Status Text"
 msgstr "Status Text"
 
-#: src/protocols/silc/buddy.c:1495
+#: src/protocols/silc/buddy.c:1466 src/protocols/silc/ops.c:983
 msgid "Preferred Contact"
 msgstr "Preferred Contact"
 
-#: src/protocols/silc/buddy.c:1503
-msgid "Paging"
-msgstr "Paging"
-
-#: src/protocols/silc/buddy.c:1505 src/protocols/silc/silc.c:637
-msgid "SMS"
-msgstr "SMS"
-
-#: src/protocols/silc/buddy.c:1507 src/protocols/silc/silc.c:639
-msgid "MMS"
-msgstr "MMS"
-
-#: src/protocols/silc/buddy.c:1509 src/protocols/silc/silc.c:641
-msgid "Video Conferencing"
-msgstr "Video Conferencing"
-
-#: src/protocols/silc/buddy.c:1515
+#: src/protocols/silc/buddy.c:1471 src/protocols/silc/ops.c:988
 msgid "Preferred Language"
 msgstr "Preferred Language"
 
-#: src/protocols/silc/buddy.c:1520
+#: src/protocols/silc/buddy.c:1476 src/protocols/silc/ops.c:993
 msgid "Device"
 msgstr "Device"
 
-#: src/protocols/silc/buddy.c:1522
-msgid "Computer"
-msgstr "Computer"
-
-#: src/protocols/silc/buddy.c:1526
-msgid "PDA"
-msgstr "PDA"
-
-#: src/protocols/silc/buddy.c:1528
-msgid "Terminal"
-msgstr "Terminal"
-
-#: src/protocols/silc/buddy.c:1539 src/protocols/silc/silc.c:674
-#: src/protocols/silc/silc.c:676
+#: src/protocols/silc/buddy.c:1481 src/protocols/silc/ops.c:998
+#: src/protocols/silc/silc.c:678 src/protocols/silc/silc.c:680
 msgid "Timezone"
 msgstr "Timezone"
 
-#: src/protocols/silc/buddy.c:1545
+#: src/protocols/silc/buddy.c:1486 src/protocols/silc/ops.c:1003
 msgid "Geolocation"
 msgstr "Geolocation"
 
-#: src/protocols/silc/buddy.c:1604
+#: src/protocols/silc/buddy.c:1529
 msgid "Reset IM Key"
 msgstr "Reset IM Key"
 
-#: src/protocols/silc/buddy.c:1609
+#: src/protocols/silc/buddy.c:1534
 msgid "IM with Key Exchange"
 msgstr "IM with Key Exchange"
 
-#: src/protocols/silc/buddy.c:1613
+#: src/protocols/silc/buddy.c:1538
 msgid "IM with Password"
 msgstr "IM with Password"
 
-#: src/protocols/silc/buddy.c:1624
+#: src/protocols/silc/buddy.c:1549
 msgid "Get Public Key..."
 msgstr "Get Public Key..."
 
-#: src/protocols/silc/buddy.c:1629
-msgid "Send File..."
-msgstr "Send File..."
-
-#: src/protocols/silc/buddy.c:1634 src/protocols/silc/ops.c:1127
+#: src/protocols/silc/buddy.c:1555 src/protocols/silc/ops.c:1389
 msgid "Kill User"
 msgstr "Kill User"
 
@@ -8737,8 +8767,7 @@
 msgid "Channel %s does not exist in the network"
 msgstr "Channel %s does not exist in the network"
 
-#: src/protocols/silc/chat.c:67 src/protocols/silc/chat.c:154
-#: src/protocols/silc/chat.c:155
+#: src/protocols/silc/chat.c:67 src/protocols/silc/chat.c:159
 msgid "Channel Information"
 msgstr "Channel Information"
 
@@ -8746,90 +8775,68 @@
 msgid "Cannot get channel information"
 msgstr "Cannot get channel information"
 
-#: src/protocols/silc/chat.c:104
-#, c-format
-msgid "Channel Name:\t\t%s\n"
-msgstr "Channel Name:\t\t%s\n"
-
-#: src/protocols/silc/chat.c:106
-#, c-format
-msgid "User Count:\t\t%d\n"
-msgstr "User Count:\t\t%d\n"
-
-#: src/protocols/silc/chat.c:112
-#, c-format
-msgid "Channel Founder:\t%s\n"
-msgstr "Channel Founder:\t%s\n"
-
-#: src/protocols/silc/chat.c:120
-#, c-format
-msgid "Channel Cipher:\t\t%s\n"
-msgstr "Channel Cipher:\t\t%s\n"
-
-#: src/protocols/silc/chat.c:123
-#, c-format
-msgid "Channel HMAC:\t\t%s\n"
-msgstr "Channel HMAC:\t\t%s\n"
+#: src/protocols/silc/chat.c:105
+#, c-format
+msgid "<b>Channel Name:</b> %s"
+msgstr "<b>Channel Name:</b> %s"
+
+#: src/protocols/silc/chat.c:108
+#, c-format
+msgid "<br><b>User Count:</b> %d"
+msgstr "<br><b>User Count:</b> %d"
+
+#: src/protocols/silc/chat.c:115
+#, c-format
+msgid "<br><b>Channel Founder:</b> %s"
+msgstr "<br><b>Channel Founder:</b> %s"
+
+#: src/protocols/silc/chat.c:124
+#, c-format
+msgid "<br><b>Channel Cipher:</b> %s"
+msgstr "<br><b>Channel Cipher:</b> %s"
 
 #: src/protocols/silc/chat.c:127
 #, c-format
-msgid ""
-"\n"
-"Channel Topic:\n"
-"\t%s\n"
-msgstr ""
-"\n"
-"Channel Topic:\n"
-"\t%s\n"
-
-#: src/protocols/silc/chat.c:130
-msgid ""
-"\n"
-"Channel Modes:\n"
-msgstr ""
-"\n"
-"Channel Modes:\n"
-
-#: src/protocols/silc/chat.c:144
-#, c-format
-msgid ""
-"\n"
-"Founder Key Fingerprint:\n"
-"%s\n"
-"\n"
-msgstr ""
-"\n"
-"Founder Key Fingerprint:\n"
-"%s\n"
-"\n"
-
-#: src/protocols/silc/chat.c:145
-#, c-format
-msgid ""
-"Founder Key Babbleprint:\n"
-"%s"
-msgstr ""
-"Founder Key Babbleprint:\n"
-"%s"
-
-#: src/protocols/silc/chat.c:218
+msgid "<br><b>Channel HMAC:</b> %s"
+msgstr "<br><b>Channel HMAC:</b> %s"
+
+#: src/protocols/silc/chat.c:132
+#, c-format
+msgid "<br><b>Channel Topic:</b><br>%s"
+msgstr "<br><b>Channel Topic:</b><br>%s"
+
+#: src/protocols/silc/chat.c:137
+msgid "<br><b>Channel Modes:</b> "
+msgstr "<br><b>Channel Modes:</b> "
+
+#: src/protocols/silc/chat.c:150
+#, 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:151
+#, 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:221
 msgid "Add Channel Public Key"
 msgstr "Add Channel Public Key"
 
 #. Add new public key
-#: src/protocols/silc/chat.c:273
+#: src/protocols/silc/chat.c:276
 msgid "Open Public Key..."
 msgstr "Open Public Key..."
 
-#: src/protocols/silc/chat.c:382
+#: src/protocols/silc/chat.c:385
 msgid "Channel Passphrase"
 msgstr "Channel Passphrase"
 
-#: src/protocols/silc/chat.c:389
+#: src/protocols/silc/chat.c:392
 msgid "Channel Public Keys List"
 msgstr "Channel Public Keys List"
 
-#: src/protocols/silc/chat.c:394
+#: src/protocols/silc/chat.c:397
 msgid ""
 "Channel authentication is used to secure the channel from unauthorized "
 "access. The authentication may be based on passphrase and digital "
@@ -8843,123 +8850,123 @@
 "channel public keys are set then only users whose public keys are listed are "
 "able to join."
 
-#: src/protocols/silc/chat.c:403 src/protocols/silc/chat.c:404
-#: src/protocols/silc/chat.c:441 src/protocols/silc/chat.c:442
-#: src/protocols/silc/chat.c:871
+#: src/protocols/silc/chat.c:406 src/protocols/silc/chat.c:407
+#: src/protocols/silc/chat.c:444 src/protocols/silc/chat.c:445
+#: src/protocols/silc/chat.c:874
 msgid "Channel Authentication"
 msgstr "Channel Authentication"
 
-#: src/protocols/silc/chat.c:405 src/protocols/silc/chat.c:443
+#: src/protocols/silc/chat.c:408 src/protocols/silc/chat.c:446
 msgid "Add / Remove"
 msgstr "Add / Remove"
 
-#: src/protocols/silc/chat.c:560
+#: src/protocols/silc/chat.c:563
 msgid "Group Name"
 msgstr "Group name"
 
-#: src/protocols/silc/chat.c:564 src/protocols/silc/ops.c:1403
+#: src/protocols/silc/chat.c:567 src/protocols/silc/ops.c:1669
 msgid "Passphrase"
 msgstr "Passphrase"
 
-#: src/protocols/silc/chat.c:575
+#: src/protocols/silc/chat.c:578
 #, 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:577
+#: src/protocols/silc/chat.c:580
 msgid "Add Channel Private Group"
 msgstr "Add Channel Private Group"
 
-#: src/protocols/silc/chat.c:704
+#: src/protocols/silc/chat.c:707
 msgid "User Limit"
 msgstr "User Limit"
 
-#: src/protocols/silc/chat.c:705
+#: src/protocols/silc/chat.c:708
 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:847
+#: src/protocols/silc/chat.c:850
 msgid "Get Info"
 msgstr "Get Info"
 
-#: src/protocols/silc/chat.c:854
+#: src/protocols/silc/chat.c:857
 msgid "Invite List"
 msgstr "Invite List"
 
-#: src/protocols/silc/chat.c:858
+#: src/protocols/silc/chat.c:861
 msgid "Ban List"
 msgstr "Ban List"
 
-#: src/protocols/silc/chat.c:865
+#: src/protocols/silc/chat.c:868
 msgid "Add Private Group"
 msgstr "Add Private Group"
 
-#: src/protocols/silc/chat.c:876
+#: src/protocols/silc/chat.c:879
 msgid "Reset Permanent"
 msgstr "Reset Permanent"
 
-#: src/protocols/silc/chat.c:880
+#: src/protocols/silc/chat.c:883
 msgid "Set Permanent"
 msgstr "Set Permanent"
 
-#: src/protocols/silc/chat.c:887
+#: src/protocols/silc/chat.c:890
 msgid "Set User Limit"
 msgstr "Set User Limit"
 
-#: src/protocols/silc/chat.c:892
+#: src/protocols/silc/chat.c:895
 msgid "Reset Topic Restriction"
 msgstr "Reset Topic Restriction"
 
-#: src/protocols/silc/chat.c:896
+#: src/protocols/silc/chat.c:899
 msgid "Set Topic Restriction"
 msgstr "Set Topic Restriction"
 
-#: src/protocols/silc/chat.c:902
+#: src/protocols/silc/chat.c:905
 msgid "Reset Private Channel"
 msgstr "Reset Private Channel"
 
-#: src/protocols/silc/chat.c:906
+#: src/protocols/silc/chat.c:909
 msgid "Set Private Channel"
 msgstr "Set Private Channel"
 
-#: src/protocols/silc/chat.c:912
+#: src/protocols/silc/chat.c:915
 msgid "Reset Secret Channel"
 msgstr "Reset Secret Channel"
 
-#: src/protocols/silc/chat.c:916
+#: src/protocols/silc/chat.c:919
 msgid "Set Secret Channel"
 msgstr "Set Secret Channel"
 
-#: src/protocols/silc/chat.c:986
+#: src/protocols/silc/chat.c:989
 #, 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:990
+#: src/protocols/silc/chat.c:993
 #, 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:1040
+#: src/protocols/silc/chat.c:1046
 #, 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:1042
+#: src/protocols/silc/chat.c:1048
 msgid "Join Private Group"
 msgstr "Join Private Group"
 
-#: src/protocols/silc/chat.c:1043
+#: src/protocols/silc/chat.c:1049
 msgid "Cannot join private group"
 msgstr "Cannot join private group"
 
-#: src/protocols/silc/chat.c:1225 src/protocols/silc/silc.c:875
+#: src/protocols/silc/chat.c:1242 src/protocols/silc/silc.c:888
 msgid "Cannot call command"
 msgstr "Cannot call command"
 
-#: src/protocols/silc/chat.c:1226 src/protocols/silc/silc.c:876
+#: src/protocols/silc/chat.c:1243 src/protocols/silc/silc.c:889
 msgid "Unknown command"
 msgstr "Unknown command"
 
@@ -9009,222 +9016,276 @@
 msgid "Cannot send file"
 msgstr "Cannot send file"
 
-#: src/protocols/silc/ops.c:324 src/protocols/silc/ops.c:331
-#: src/protocols/silc/ops.c:338
+#: src/protocols/silc/ops.c:333 src/protocols/silc/ops.c:342
+#: src/protocols/silc/ops.c:351
 #, c-format
 msgid "%s has changed the topic of <I>%s</I> to: %s"
 msgstr "%s has changed the topic of <I>%s</I> to: %s"
 
-#: src/protocols/silc/ops.c:398
+#: src/protocols/silc/ops.c:413
 #, c-format
 msgid "<I>%s</I> set channel <I>%s</I> modes to: %s"
 msgstr "<I>%s</I> set channel <I>%s</I> modes to: %s"
 
-#: src/protocols/silc/ops.c:402
+#: src/protocols/silc/ops.c:417
 #, c-format
 msgid "<I>%s</I> removed all channel <I>%s</I> modes"
 msgstr "<I>%s</I> removed all channel <I>%s</I> modes"
 
-#: src/protocols/silc/ops.c:433
+#: src/protocols/silc/ops.c:448
 #, c-format
 msgid "<I>%s</I> set <I>%s's</I> modes to: %s"
 msgstr "<I>%s</I> set <I>%s's</I> modes to: %s"
 
-#: src/protocols/silc/ops.c:437
+#: src/protocols/silc/ops.c:452
 #, c-format
 msgid "<I>%s</I> removed all <I>%s's</I> modes"
 msgstr "<I>%s</I> removed all <I>%s's</I> modes"
 
-#: src/protocols/silc/ops.c:464
+#: src/protocols/silc/ops.c:479
 #, c-format
 msgid "You have been kicked off <I>%s</I> by <I>%s</I> (%s)"
 msgstr "You have been kicked off <I>%s</I> by <I>%s</I> (%s)"
 
-#: src/protocols/silc/ops.c:494 src/protocols/silc/ops.c:499
-#: src/protocols/silc/ops.c:504
+#: src/protocols/silc/ops.c:509 src/protocols/silc/ops.c:514
+#: src/protocols/silc/ops.c:519
 #, c-format
 msgid "You have been killed by %s (%s)"
 msgstr "You have been killed by %s (%s)"
 
-#: src/protocols/silc/ops.c:525 src/protocols/silc/ops.c:530
-#: src/protocols/silc/ops.c:535
+#: src/protocols/silc/ops.c:540 src/protocols/silc/ops.c:545
+#: src/protocols/silc/ops.c:550
 #, c-format
 msgid "Killed by %s (%s)"
 msgstr "Killed by %s (%s)"
 
-#: src/protocols/silc/ops.c:581
+#: src/protocols/silc/ops.c:596
 msgid "Server signoff"
 msgstr "Server signoff"
 
-#: src/protocols/silc/ops.c:767
+#: src/protocols/silc/ops.c:783
 msgid "Personal Information"
 msgstr "Personal Information"
 
-#: src/protocols/silc/ops.c:790
+#: src/protocols/silc/ops.c:806
 msgid "Birth Day"
 msgstr "Birth Day"
 
-#: src/protocols/silc/ops.c:794
+#: src/protocols/silc/ops.c:810
 msgid "Job Title"
 msgstr "Job Title"
 
-#: src/protocols/silc/ops.c:798
+#: src/protocols/silc/ops.c:814
 msgid "Job Role"
 msgstr "Job Role"
 
-#: src/protocols/silc/ops.c:802
+#: src/protocols/silc/ops.c:818
 msgid "Organization"
 msgstr "Organisation"
 
-#: src/protocols/silc/ops.c:806
+#: src/protocols/silc/ops.c:822
 msgid "Unit"
 msgstr "Unit"
 
-#: src/protocols/silc/ops.c:825
+#: src/protocols/silc/ops.c:841
 msgid "EMail"
 msgstr "E-Mail"
 
-#: src/protocols/silc/ops.c:830
+#: src/protocols/silc/ops.c:846
 msgid "Note"
 msgstr "Note"
 
-#: src/protocols/silc/ops.c:878
+#: src/protocols/silc/ops.c:894
 msgid "Join Chat"
 msgstr "Join Chat"
 
-#: src/protocols/silc/ops.c:933
-msgid "Hostname"
-msgstr "Hostname"
-
-#: src/protocols/silc/ops.c:940
-msgid "User Mode"
-msgstr "User Mode"
-
-#: src/protocols/silc/ops.c:954
-msgid "Channels"
-msgstr "Channels"
-
-#: src/protocols/silc/ops.c:981
+#: src/protocols/silc/ops.c:1050 src/protocols/silc/ops.c:1120
 msgid "Public Key Fingerprint"
 msgstr "Public Key Fingerprint"
 
-#: src/protocols/silc/ops.c:982
+#: src/protocols/silc/ops.c:1051 src/protocols/silc/ops.c:1121
 msgid "Public Key Babbleprint"
 msgstr "Public Key Babbleprint"
 
-#: src/protocols/silc/ops.c:995
+#: src/protocols/silc/ops.c:1064
 msgid "More..."
 msgstr "More..."
 
-#: src/protocols/silc/ops.c:1006 src/protocols/silc/silc.c:770
+#: src/protocols/silc/ops.c:1135 src/protocols/silc/silc.c:777
 msgid "Detach From Server"
 msgstr "Detach From Server"
 
-#: src/protocols/silc/ops.c:1006
+#: src/protocols/silc/ops.c:1135
 msgid "Cannot detach"
 msgstr "Cannot detach"
 
-#: src/protocols/silc/ops.c:1017
+#: src/protocols/silc/ops.c:1146
 msgid "Cannot set topic"
 msgstr "Cannot set topic"
 
-#: src/protocols/silc/ops.c:1045
+#: src/protocols/silc/ops.c:1184
+msgid "Failed to change nickname"
+msgstr "Failed to change nickname"
+
+#: src/protocols/silc/ops.c:1221
 msgid "Roomlist"
 msgstr "Room List"
 
-#: src/protocols/silc/ops.c:1045
+#: src/protocols/silc/ops.c:1221
 msgid "Cannot get room list"
 msgstr "Cannot get room list"
 
-#: src/protocols/silc/ops.c:1093
+#: src/protocols/silc/ops.c:1269
 msgid "No public key was received"
 msgstr "No public key was received"
 
-#: src/protocols/silc/ops.c:1106 src/protocols/silc/ops.c:1119
-#: src/protocols/silc/ops.c:1120
+#: src/protocols/silc/ops.c:1282 src/protocols/silc/ops.c:1296
 msgid "Server Information"
 msgstr "Server Information"
 
-#: src/protocols/silc/ops.c:1107
+#: src/protocols/silc/ops.c:1283
 msgid "Cannot get server information"
 msgstr "Cannot get server information"
 
-#: src/protocols/silc/ops.c:1128
+#: src/protocols/silc/ops.c:1314 src/protocols/silc/ops.c:1323
+msgid "Server Statistics"
+msgstr "Server Statistics"
+
+#: src/protocols/silc/ops.c:1315
+msgid "Cannot get server statistics"
+msgstr "Cannot get server statistics"
+
+#: src/protocols/silc/ops.c:1324
+msgid "No server statisitics available"
+msgstr "No server statisitics available"
+
+#: src/protocols/silc/ops.c:1346
+#, c-format
+msgid ""
+"Local server start time: %s\n"
+"Local server uptime: %s\n"
+"Local server clients: %d\n"
+"Local server channels: %d\n"
+"Local server operators: %d\n"
+"Local router operators: %d\n"
+"Local cell clients: %d\n"
+"Local cell channels: %d\n"
+"Local cell servers: %d\n"
+"Total clients: %d\n"
+"Total channels: %d\n"
+"Total servers: %d\n"
+"Total routers: %d\n"
+"Total server operators: %d\n"
+"Total router operators: %d\n"
+msgstr ""
+"Local server start time: %s\n"
+"Local server uptime: %s\n"
+"Local server clients: %d\n"
+"Local server channels: %d\n"
+"Local server operators: %d\n"
+"Local router operators: %d\n"
+"Local cell clients: %d\n"
+"Local cell channels: %d\n"
+"Local cell servers: %d\n"
+"Total clients: %d\n"
+"Total channels: %d\n"
+"Total servers: %d\n"
+"Total routers: %d\n"
+"Total server operators: %d\n"
+"Total router operators: %d\n"
+
+#: src/protocols/silc/ops.c:1369
+msgid "Network Statistics"
+msgstr "Network Statistics"
+
+#: src/protocols/silc/ops.c:1377 src/protocols/silc/ops.c:1382
+msgid "Ping"
+msgstr "Ping"
+
+#: src/protocols/silc/ops.c:1377
+msgid "Ping failed"
+msgstr "Ping failed"
+
+#: src/protocols/silc/ops.c:1382
+msgid "Ping reply received from server"
+msgstr "Ping reply received from server"
+
+#: src/protocols/silc/ops.c:1390
 msgid "Could not kill user"
 msgstr "Could not kill user"
 
-#: src/protocols/silc/ops.c:1205
+#: src/protocols/silc/ops.c:1471
 msgid "Error during connecting to SILC Server"
 msgstr "Error during connecting to SILC Server"
 
-#: src/protocols/silc/ops.c:1210
+#: src/protocols/silc/ops.c:1476
 msgid "Key Exchange failed"
 msgstr "Key Exchange failed"
 
-#: src/protocols/silc/ops.c:1219
+#: src/protocols/silc/ops.c:1485
 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:1254
+#: src/protocols/silc/ops.c:1520
 msgid "Disconnected by server"
 msgstr "Disconnected by server"
 
-#: src/protocols/silc/ops.c:1314 src/protocols/silc/ops.c:1361
+#: src/protocols/silc/ops.c:1580 src/protocols/silc/ops.c:1627
 #: src/protocols/silc/silc.c:167
 msgid "Resuming session"
 msgstr "Resuming session"
 
-#: src/protocols/silc/ops.c:1316
+#: src/protocols/silc/ops.c:1582
 msgid "Authenticating connection"
 msgstr "Authenticating connection"
 
-#: src/protocols/silc/ops.c:1363
+#: src/protocols/silc/ops.c:1629
 msgid "Verifying server public key"
 msgstr "Verifying server public key"
 
-#: src/protocols/silc/ops.c:1404
+#: src/protocols/silc/ops.c:1670
 msgid "Passphrase required"
 msgstr "Passphrase required"
 
-#: src/protocols/silc/ops.c:1433
+#: src/protocols/silc/ops.c:1699
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "Failure: Version mismatch, upgrade your client"
 
-#: src/protocols/silc/ops.c:1436
+#: src/protocols/silc/ops.c:1702
 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:1439
+#: src/protocols/silc/ops.c:1705
 msgid "Failure: Remote does not support proposed KE group"
 msgstr "Failure: Remote does not support proposed KE group"
 
-#: src/protocols/silc/ops.c:1442
+#: src/protocols/silc/ops.c:1708
 msgid "Failure: Remote does not support proposed cipher"
 msgstr "Failure: Remote does not support proposed cipher"
 
-#: src/protocols/silc/ops.c:1445
+#: src/protocols/silc/ops.c:1711
 msgid "Failure: Remote does not support proposed PKCS"
 msgstr "Failure: Remote does not support proposed PKCS"
 
-#: src/protocols/silc/ops.c:1448
+#: src/protocols/silc/ops.c:1714
 msgid "Failure: Remote does not support proposed hash function"
 msgstr "Failure: Remote does not support proposed hash function"
 
-#: src/protocols/silc/ops.c:1451
+#: src/protocols/silc/ops.c:1717
 msgid "Failure: Remote does not support proposed HMAC"
 msgstr "Failure: Remote does not support proposed HMAC"
 
-#: src/protocols/silc/ops.c:1453
+#: src/protocols/silc/ops.c:1719
 msgid "Failure: Incorrect signature"
 msgstr "Failure: Incorrect signature"
 
-#: src/protocols/silc/ops.c:1455
+#: src/protocols/silc/ops.c:1721
 msgid "Failure: Invalid cookie"
 msgstr "Failure: Invalid cookie"
 
-#: src/protocols/silc/ops.c:1466
+#: src/protocols/silc/ops.c:1732
 msgid "Failure: Authentication failed"
 msgstr "Failure: Authentication failed"
 
@@ -9288,15 +9349,15 @@
 msgid "Connecting to SILC Server"
 msgstr "Connecting to SILC Server"
 
-#: src/protocols/silc/silc.c:602
+#: src/protocols/silc/silc.c:606
 msgid "Your Current Mood"
 msgstr "Your Current Mood"
 
-#: src/protocols/silc/silc.c:604
+#: src/protocols/silc/silc.c:608
 msgid "Normal"
 msgstr "Normal"
 
-#: src/protocols/silc/silc.c:629
+#: src/protocols/silc/silc.c:633
 msgid ""
 "\n"
 "Your Preferred Contact Methods"
@@ -9304,31 +9365,43 @@
 "\n"
 "Your Preferred Contact Methods"
 
-#: src/protocols/silc/silc.c:646
+#: src/protocols/silc/silc.c:641 src/protocols/silc/util.c:514
+msgid "SMS"
+msgstr "SMS"
+
+#: src/protocols/silc/silc.c:643 src/protocols/silc/util.c:516
+msgid "MMS"
+msgstr "MMS"
+
+#: src/protocols/silc/silc.c:645 src/protocols/silc/util.c:518
+msgid "Video Conferencing"
+msgstr "Video Conferencing"
+
+#: src/protocols/silc/silc.c:650
 msgid "Your Current Status"
 msgstr "Your Current Status"
 
-#: src/protocols/silc/silc.c:653
+#: src/protocols/silc/silc.c:657
 msgid "Online Services"
 msgstr "Online Services"
 
-#: src/protocols/silc/silc.c:656
+#: src/protocols/silc/silc.c:660
 msgid "Let others see what services you are using"
 msgstr "Let others see what services you are using"
 
-#: src/protocols/silc/silc.c:662
+#: src/protocols/silc/silc.c:666
 msgid "Let others see what computer you are using"
 msgstr "Let others see what computer you are using"
 
-#: src/protocols/silc/silc.c:669
+#: src/protocols/silc/silc.c:673
 msgid "Your VCard File"
 msgstr "Your VCard File"
 
-#: src/protocols/silc/silc.c:682 src/protocols/silc/silc.c:683
+#: src/protocols/silc/silc.c:686 src/protocols/silc/silc.c:687
 msgid "User Online Status Attributes"
 msgstr "User Online Status Attributes"
 
-#: src/protocols/silc/silc.c:684
+#: src/protocols/silc/silc.c:688
 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 "
@@ -9338,114 +9411,231 @@
 "information. Please fill the information you would like other users to see "
 "about yourself."
 
-#: src/protocols/silc/silc.c:723 src/protocols/silc/silc.c:728
-#: src/protocols/silc/silc.c:1096 src/protocols/silc/silc.c:1101
+#: src/protocols/silc/silc.c:728 src/protocols/silc/silc.c:734
+#: src/protocols/silc/silc.c:1135
 msgid "Message of the Day"
 msgstr "Message of the Day"
 
-#: src/protocols/silc/silc.c:723 src/protocols/silc/silc.c:1096
+#: src/protocols/silc/silc.c:728
 msgid "No Message of the Day available"
 msgstr "No Message of the Day available"
 
-#: src/protocols/silc/silc.c:724 src/protocols/silc/silc.c:1097
+#: src/protocols/silc/silc.c:729 src/protocols/silc/silc.c:1130
 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:765
+#: src/protocols/silc/silc.c:772
 msgid "Online Status"
 msgstr "Online Status"
 
-#: src/protocols/silc/silc.c:774
+#: src/protocols/silc/silc.c:781
 msgid "View Message of the Day"
 msgstr "View Message of the Day"
 
-#: src/protocols/silc/silc.c:846
+#: src/protocols/silc/silc.c:853
 #, 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:1159
-msgid "part:  Leave the chat"
-msgstr "part:  Leave the chat"
-
-#: src/protocols/silc/silc.c:1162
-msgid "leave:  Leave the chat"
-msgstr "leave:  Leave the chat"
-
-#: src/protocols/silc/silc.c:1166
+#: src/protocols/silc/silc.c:962
+msgid "Failed to leave channel"
+msgstr "Failed to leave channel"
+
+#: src/protocols/silc/silc.c:1006
+msgid "Topic too long"
+msgstr "Topic too long."
+
+#: src/protocols/silc/silc.c:1087
+msgid "You must specify a nick"
+msgstr "You must specify a nick"
+
+#: src/protocols/silc/silc.c:1189
+#, c-format
+msgid "channel %s not found"
+msgstr "channel %s not found"
+
+#: src/protocols/silc/silc.c:1194
+#, c-format
+msgid "channel modes for %s: %s"
+msgstr "channel modes for %s: %s"
+
+#: src/protocols/silc/silc.c:1196
+#, c-format
+msgid "no channel modes are set on %s"
+msgstr "no channel modes are set on %s"
+
+#: src/protocols/silc/silc.c:1209
+#, c-format
+msgid "Failed to set cmodes for %s"
+msgstr "Failed to set cmodes for %s"
+
+#: src/protocols/silc/silc.c:1239
+#, 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:1302
+msgid "part [channel]:  Leave the chat"
+msgstr "part [channel]:  Leave the chat"
+
+#: src/protocols/silc/silc.c:1306
+msgid "leave [channel]:  Leave the chat"
+msgstr "leave [channel]:  Leave the chat"
+
+#: src/protocols/silc/silc.c:1310
 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:1171
+#: src/protocols/silc/silc.c:1315
 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:1175
+#: src/protocols/silc/silc.c:1319
 msgid "list:  List channels on this network"
 msgstr "list:  List channels on this network"
 
-#: src/protocols/silc/silc.c:1179
+#: src/protocols/silc/silc.c:1323
 msgid "whois &lt;nick&gt;:  View nick's information"
 msgstr "whois &lt;nick&gt;:  View nick's information"
 
-#: src/protocols/silc/silc.c:1183
-msgid "invite &lt;nick&gt;:  Invite nick to join this channel"
-msgstr "invite &lt;nick&gt;:  Invite nick to join this channel"
-
-#: src/protocols/silc/silc.c:1187
+#: src/protocols/silc/silc.c:1327 src/protocols/zephyr/zephyr.c:1673
 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:1191
+#: src/protocols/silc/silc.c:1331
 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:1195
+#: src/protocols/silc/silc.c:1335
 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:1199
+#: src/protocols/silc/silc.c:1339
 msgid "detach:  Detach this session"
 msgstr "detach:  Detach this session"
 
-#: src/protocols/silc/silc.c:1203
-msgid "umode &lt;usermodes&gt;:  Set your user options"
-msgstr "umode &lt;usermodes&gt;:  Set your user options"
-
-#: src/protocols/silc/silc.c:1214
+#: src/protocols/silc/silc.c:1343
+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:1347
+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:1352
+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:1356
+msgid "nick &lt;newnick&gt;:  Change your nickname"
+msgstr "nick &lt;newnick&gt;:  Change your nickname"
+
+#: src/protocols/silc/silc.c:1360
+msgid "whowas &lt;nick&gt;:  View nick's information"
+msgstr "whowas &lt;nick&gt;:  View nick's information"
+
+#: src/protocols/silc/silc.c:1364
+msgid ""
+"cmode &lt;channel&gt; [+|-&lt;modes&gt]; [arguments]:  Change or display "
+"channel modes"
+msgstr ""
+"cmode &lt;channel&gt; [+|-&lt;modes&gt]; [arguments]:  Change or display "
+"channel modes"
+
+#: src/protocols/silc/silc.c:1368
+msgid ""
+"cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes "
+"on channel"
+msgstr ""
+"cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes "
+"on channel"
+
+#: src/protocols/silc/silc.c:1372
+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:1376
+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:1380
+msgid ""
+"invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
+"channel invite list"
+msgstr ""
+"invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
+"channel invite list"
+
+#: src/protocols/silc/silc.c:1384
+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:1388
+msgid "info [server]:  View server administrative details"
+msgstr "info [server]:  View server administrative details"
+
+#: src/protocols/silc/silc.c:1392
+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:1396
+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:1400
+msgid "stats:  View server and network statistics"
+msgstr "stats:  View server and network statistics"
+
+#: src/protocols/silc/silc.c:1404
+msgid "ping:  Send PING to the connected server"
+msgstr "ping:  Send PING to the connected server"
+
+#: src/protocols/silc/silc.c:1409
+msgid "users &lt;channel&gt;:  List users in channel"
+msgstr "users &lt;channel&gt;:  List users in channel"
+
+#: src/protocols/silc/silc.c:1413
+msgid ""
+"names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List "
+"specific users in channel(s)"
+msgstr ""
+"names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List "
+"specific users in channel(s)"
+
+#: src/protocols/silc/silc.c:1425
 msgid "Instant Messages"
 msgstr "Instant Messages"
 
-#: src/protocols/silc/silc.c:1219
+#: src/protocols/silc/silc.c:1430
 msgid "Digitally sign all IM messages"
 msgstr "Digitally sign all IM messages"
 
-#: src/protocols/silc/silc.c:1224
+#: src/protocols/silc/silc.c:1435
 msgid "Verify all IM message signatures"
 msgstr "Verify all IM message signatures"
 
-#: src/protocols/silc/silc.c:1227
+#: src/protocols/silc/silc.c:1438
 msgid "Channel Messages"
 msgstr "Channel Messages"
 
-#: src/protocols/silc/silc.c:1232
+#: src/protocols/silc/silc.c:1443
 msgid "Digitally sign all channel messages"
 msgstr "Digitally sign all channel messages"
 
-#: src/protocols/silc/silc.c:1237
+#: src/protocols/silc/silc.c:1448
 msgid "Verify all channel message signatures"
 msgstr "Verify all channel message signatures"
 
-#: src/protocols/silc/silc.c:1240
+#: src/protocols/silc/silc.c:1451
 msgid "Default SILC Key Pair"
 msgstr "Default SILC Key Pair"
 
-#: src/protocols/silc/silc.c:1245
+#: src/protocols/silc/silc.c:1456
 msgid "SILC Public Key"
 msgstr "SILC Public Key"
 
-#: src/protocols/silc/silc.c:1250
+#: src/protocols/silc/silc.c:1461
 msgid "SILC Private Key"
 msgstr "SILC Private Key"
 
@@ -9459,91 +9649,91 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/silc/silc.c:1334
+#: src/protocols/silc/silc.c:1547
 msgid "SILC Protocol Plugin"
 msgstr "SILC Protocol Plugin"
 
 #. *  description
-#: src/protocols/silc/silc.c:1336
+#: src/protocols/silc/silc.c:1549
 msgid "Secure Internet Live Conferencing (SILC) Protocol"
 msgstr "Secure Internet Live Conferencing (SILC) Protocol"
 
-#: src/protocols/silc/silc.c:1366
+#: src/protocols/silc/silc.c:1579
 msgid "Public key authentication"
 msgstr "Public key authentication"
 
-#: src/protocols/silc/silc.c:1372
+#: src/protocols/silc/silc.c:1585
 msgid "Public Key File"
 msgstr "Public Key File"
 
-#: src/protocols/silc/silc.c:1376
+#: src/protocols/silc/silc.c:1589
 msgid "Private Key File"
 msgstr "Private Key File"
 
-#: src/protocols/silc/silc.c:1381
+#: src/protocols/silc/silc.c:1594
 msgid "Reject watching by other users"
 msgstr "Reject watching by other users"
 
-#: src/protocols/silc/silc.c:1384
+#: src/protocols/silc/silc.c:1597
 msgid "Block invites"
 msgstr "Block invites"
 
-#: src/protocols/silc/silc.c:1387
+#: src/protocols/silc/silc.c:1600
 msgid "Block IMs without Key Exchange"
 msgstr "Block IMs without Key Exchange"
 
-#: src/protocols/silc/silc.c:1390
+#: src/protocols/silc/silc.c:1603
 msgid "Reject online status attribute requests"
 msgstr "Reject online status attribute requests"
 
-#: src/protocols/silc/util.c:200 src/protocols/silc/util.c:223
+#: src/protocols/silc/util.c:202 src/protocols/silc/util.c:227
 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:289
+#: src/protocols/silc/util.c:310
 #, c-format
 msgid "Real Name: \t%s\n"
 msgstr "Real Name: \t%s\n"
 
-#: src/protocols/silc/util.c:291
+#: src/protocols/silc/util.c:312
 #, c-format
 msgid "User Name: \t%s\n"
 msgstr "User Name: \t%s\n"
 
-#: src/protocols/silc/util.c:293
+#: src/protocols/silc/util.c:314
 #, c-format
 msgid "EMail: \t\t%s\n"
 msgstr "E-Mail: \t\t%s\n"
 
-#: src/protocols/silc/util.c:295
+#: src/protocols/silc/util.c:316
 #, c-format
 msgid "Host Name: \t%s\n"
 msgstr "Host Name: \t%s\n"
 
-#: src/protocols/silc/util.c:297
+#: src/protocols/silc/util.c:318
 #, c-format
 msgid "Organization: \t%s\n"
 msgstr "Organisation: \t%s\n"
 
-#: src/protocols/silc/util.c:299
+#: src/protocols/silc/util.c:320
 #, c-format
 msgid "Country: \t%s\n"
 msgstr "Country: \t%s\n"
 
-#: src/protocols/silc/util.c:300
-#, c-format
-msgid "Algorithm: \t\t%s\n"
-msgstr "Algorithm: \t\t%s\n"
-
-#: src/protocols/silc/util.c:301
+#: src/protocols/silc/util.c:321
+#, c-format
+msgid "Algorithm: \t%s\n"
+msgstr "Algorithm: \t%s\n"
+
+#: src/protocols/silc/util.c:322
 #, c-format
 msgid "Key Length: \t%d bits\n"
 msgstr "Key Length: \t%d bits\n"
 
-#: src/protocols/silc/util.c:303
+#: src/protocols/silc/util.c:324
 #, c-format
 msgid ""
 "Public Key Fingerprint:\n"
@@ -9554,7 +9744,7 @@
 "%s\n"
 "\n"
 
-#: src/protocols/silc/util.c:304
+#: src/protocols/silc/util.c:325
 #, c-format
 msgid ""
 "Public Key Babbleprint:\n"
@@ -9563,10 +9753,26 @@
 "Public Key Babbleprint:\n"
 "%s"
 
-#: src/protocols/silc/util.c:308 src/protocols/silc/util.c:309
+#: src/protocols/silc/util.c:329 src/protocols/silc/util.c:330
 msgid "Public Key Information"
 msgstr "Public Key Information"
 
+#: src/protocols/silc/util.c:512
+msgid "Paging"
+msgstr "Paging"
+
+#: src/protocols/silc/util.c:536
+msgid "Computer"
+msgstr "Computer"
+
+#: src/protocols/silc/util.c:540
+msgid "PDA"
+msgstr "PDA"
+
+#: src/protocols/silc/util.c:542
+msgid "Terminal"
+msgstr "Terminal"
+
 #: src/protocols/toc/toc.c:137
 #, c-format
 msgid "Looking up %s"
@@ -9770,15 +9976,15 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/toc/toc.c:2167 src/protocols/toc/toc.c:2169
+#: src/protocols/toc/toc.c:2169 src/protocols/toc/toc.c:2171
 msgid "TOC Protocol Plugin"
 msgstr "TOC Protocol Plugin"
 
-#: src/protocols/toc/toc.c:2188
+#: src/protocols/toc/toc.c:2190
 msgid "TOC host"
 msgstr "TOC host"
 
-#: src/protocols/toc/toc.c:2192
+#: src/protocols/toc/toc.c:2194
 msgid "TOC port"
 msgstr "TOC port"
 
@@ -9861,11 +10067,11 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/trepia/trepia.c:1269 src/protocols/trepia/trepia.c:1271
+#: src/protocols/trepia/trepia.c:1271 src/protocols/trepia/trepia.c:1273
 msgid "Trepia Protocol Plugin"
 msgstr "Trepia Protocol Plugin"
 
-#: src/protocols/yahoo/yahoo.c:328
+#: src/protocols/yahoo/yahoo.c:338
 msgid ""
 "You have been logged off as you have logged in on a different machine or "
 "device."
@@ -9873,25 +10079,25 @@
 "You have been logged off as you have logged in on a different machine or "
 "device."
 
-#: src/protocols/yahoo/yahoo.c:798
+#: src/protocols/yahoo/yahoo.c:808
 msgid "Your Yahoo! message did not get sent."
 msgstr "Your Yahoo! message did not get sent."
 
-#: src/protocols/yahoo/yahoo.c:817
+#: src/protocols/yahoo/yahoo.c:827
 msgid "Buzz!!"
 msgstr "Buzz!!"
 
-#: src/protocols/yahoo/yahoo.c:860
+#: src/protocols/yahoo/yahoo.c:870
 #, c-format
 msgid "Yahoo! system message for %s:"
 msgstr "Yahoo! system message for %s:"
 
-#: src/protocols/yahoo/yahoo.c:926
+#: src/protocols/yahoo/yahoo.c:936
 #, 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:929
+#: src/protocols/yahoo/yahoo.c:939
 #, c-format
 msgid ""
 "%s has (retroactively) denied your request to add them to your list for the "
@@ -9900,11 +10106,11 @@
 "%s has (retroactively) denied your request to add them to your list for the "
 "following reason: %s."
 
-#: src/protocols/yahoo/yahoo.c:932
+#: src/protocols/yahoo/yahoo.c:942
 msgid "Add buddy rejected"
 msgstr "Add buddy rejected"
 
-#: src/protocols/yahoo/yahoo.c:1688
+#: src/protocols/yahoo/yahoo.c:1702
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -9915,11 +10121,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:1691
+#: src/protocols/yahoo/yahoo.c:1705
 msgid "Failed Yahoo! Authentication"
 msgstr "Failed Yahoo! Authentication"
 
-#: src/protocols/yahoo/yahoo.c:1763
+#: src/protocols/yahoo/yahoo.c:1777
 #, c-format
 msgid ""
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
@@ -9928,76 +10134,92 @@
 "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:1766
+#: src/protocols/yahoo/yahoo.c:1780
 msgid "Ignore buddy?"
 msgstr "Ignore buddy?"
 
-#: src/protocols/yahoo/yahoo.c:1799
+#: src/protocols/yahoo/yahoo.c:1814
 msgid "Invalid username."
 msgstr "Invalid username."
 
-#: src/protocols/yahoo/yahoo.c:1802
+#: src/protocols/yahoo/yahoo.c:1825
+msgid "Normal authencation failed!"
+msgstr "Normal authencation failed!"
+
+#: src/protocols/yahoo/yahoo.c:1826
+msgid ""
+"The normal authencation method has failed. This means either your password "
+"is incorrect, or Yahoo!'s authencation scheme has changed. Gaim will now "
+"attempt to log in using Web Messenger authencation, will which result in "
+"reduced functionality and features."
+msgstr ""
+"The normal authentication method has failed. This means either your password "
+"is incorrect, or Yahoo!'s authencation scheme has changed. Gaim will now "
+"attempt to log in using Web Messenger authentication, will which result in "
+"reduced functionality and features."
+
+#: src/protocols/yahoo/yahoo.c:1834
 msgid "Incorrect password."
 msgstr "Incorrect password."
 
-#: src/protocols/yahoo/yahoo.c:1805
+#: src/protocols/yahoo/yahoo.c:1837
 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:1808
+#: src/protocols/yahoo/yahoo.c:1840
 #, 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:1862
+#: src/protocols/yahoo/yahoo.c:1894
 #, 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:1864
+#: src/protocols/yahoo/yahoo.c:1896
 msgid "Could not add buddy to server list"
 msgstr "Could not add buddy to server list"
 
-#: src/protocols/yahoo/yahoo.c:2055 src/protocols/yahoo/yahoo.c:2186
+#: src/protocols/yahoo/yahoo.c:2088 src/protocols/yahoo/yahoo.c:2216
 msgid "Unable to read"
 msgstr "Unable to read"
 
-#: src/protocols/yahoo/yahoo.c:2208 src/protocols/yahoo/yahoo.c:2318
-#: src/protocols/yahoo/yahoo.c:2374 src/protocols/yahoo/yahoo.c:2384
-#: src/protocols/yahoo/yahoochat.c:1358 src/protocols/yahoo/yahoochat.c:1419
+#: src/protocols/yahoo/yahoo.c:2238 src/protocols/yahoo/yahoo.c:2348
+#: src/protocols/yahoo/yahoo.c:2398 src/protocols/yahoo/yahoo.c:2408
+#: src/protocols/yahoo/yahoochat.c:1397 src/protocols/yahoo/yahoochat.c:1458
 msgid "Connection problem"
 msgstr "Connection problem"
 
-#: src/protocols/yahoo/yahoo.c:2472 src/protocols/yahoo/yahoo.c:2850
-#: src/protocols/yahoo/yahoo.c:2962
+#: src/protocols/yahoo/yahoo.c:2495 src/protocols/yahoo/yahoo.c:2857
+#: src/protocols/yahoo/yahoo.c:2971
 msgid "Not At Home"
 msgstr "Not At Home"
 
-#: src/protocols/yahoo/yahoo.c:2474 src/protocols/yahoo/yahoo.c:2852
-#: src/protocols/yahoo/yahoo.c:2963
+#: src/protocols/yahoo/yahoo.c:2497 src/protocols/yahoo/yahoo.c:2859
+#: src/protocols/yahoo/yahoo.c:2972
 msgid "Not At Desk"
 msgstr "Not At Desk"
 
-#: src/protocols/yahoo/yahoo.c:2476 src/protocols/yahoo/yahoo.c:2854
-#: src/protocols/yahoo/yahoo.c:2964
+#: src/protocols/yahoo/yahoo.c:2499 src/protocols/yahoo/yahoo.c:2861
+#: src/protocols/yahoo/yahoo.c:2973
 msgid "Not In Office"
 msgstr "Not In Office"
 
-#: src/protocols/yahoo/yahoo.c:2480 src/protocols/yahoo/yahoo.c:2858
-#: src/protocols/yahoo/yahoo.c:2966
+#: src/protocols/yahoo/yahoo.c:2503 src/protocols/yahoo/yahoo.c:2865
+#: src/protocols/yahoo/yahoo.c:2975
 msgid "On Vacation"
 msgstr "On Vacation"
 
-#: src/protocols/yahoo/yahoo.c:2484 src/protocols/yahoo/yahoo.c:2862
-#: src/protocols/yahoo/yahoo.c:2968
+#: src/protocols/yahoo/yahoo.c:2507 src/protocols/yahoo/yahoo.c:2869
+#: src/protocols/yahoo/yahoo.c:2977
 msgid "Stepped Out"
 msgstr "Stepped Out"
 
-#: src/protocols/yahoo/yahoo.c:2565 src/protocols/yahoo/yahoo.c:2591
+#: src/protocols/yahoo/yahoo.c:2588 src/protocols/yahoo/yahoo.c:2614
 msgid "Not on server list"
 msgstr "Not on server list"
 
-#: src/protocols/yahoo/yahoo.c:2611
+#: src/protocols/yahoo/yahoo.c:2634
 #, c-format
 msgid ""
 "\n"
@@ -10006,27 +10228,27 @@
 "\n"
 "<b>%s:</b> %s"
 
-#: src/protocols/yahoo/yahoo.c:2682
+#: src/protocols/yahoo/yahoo.c:2693
 msgid "Join in Chat"
 msgstr "Join in Chat"
 
-#: src/protocols/yahoo/yahoo.c:2686
+#: src/protocols/yahoo/yahoo.c:2698
 msgid "Initiate Conference"
 msgstr "Initiate Conference"
 
-#: src/protocols/yahoo/yahoo.c:2743
+#: src/protocols/yahoo/yahoo.c:2750
 msgid "Active which ID?"
 msgstr "Active which ID?"
 
-#: src/protocols/yahoo/yahoo.c:2752
+#: src/protocols/yahoo/yahoo.c:2759
 msgid "Join who in chat?"
 msgstr "Join who in chat?"
 
-#: src/protocols/yahoo/yahoo.c:2762
+#: src/protocols/yahoo/yahoo.c:2769
 msgid "Activate ID..."
 msgstr "Activate ID..."
 
-#: src/protocols/yahoo/yahoo.c:2766
+#: src/protocols/yahoo/yahoo.c:2773
 msgid "Join user in chat..."
 msgstr "Join user in chat..."
 
@@ -10040,42 +10262,50 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/yahoo/yahoo.c:3286 src/protocols/yahoo/yahoo.c:3288
+#: src/protocols/yahoo/yahoo.c:3292 src/protocols/yahoo/yahoo.c:3294
 msgid "Yahoo Protocol Plugin"
 msgstr "Yahoo Protocol Plugin"
 
-#: src/protocols/yahoo/yahoo.c:3307
+#: src/protocols/yahoo/yahoo.c:3313
 msgid "Yahoo Japan"
 msgstr "Yahoo Japan"
 
-#: src/protocols/yahoo/yahoo.c:3310
-msgid "Pager host"
-msgstr "Pager host"
-
-#: src/protocols/yahoo/yahoo.c:3313
-msgid "Japan Pager host"
-msgstr "Japan Pager host"
-
 #: src/protocols/yahoo/yahoo.c:3316
-msgid "Pager port"
-msgstr "Pager port"
+msgid "Pager host"
+msgstr "Pager host"
 
 #: src/protocols/yahoo/yahoo.c:3319
-msgid "File transfer host"
-msgstr "File transfer host"
+msgid "Japan Pager host"
+msgstr "Japan Pager host"
 
 #: src/protocols/yahoo/yahoo.c:3322
-msgid "Japan File transfer host"
-msgstr "Japan File transfer host"
+msgid "Pager port"
+msgstr "Pager port"
 
 #: src/protocols/yahoo/yahoo.c:3325
+msgid "File transfer host"
+msgstr "File transfer host"
+
+#: src/protocols/yahoo/yahoo.c:3328
+msgid "Japan File transfer host"
+msgstr "Japan File transfer host"
+
+#: src/protocols/yahoo/yahoo.c:3331
 msgid "File transfer port"
 msgstr "File transfer port"
 
-#: src/protocols/yahoo/yahoo.c:3328
+#: src/protocols/yahoo/yahoo.c:3334
 msgid "Chat Room List Url"
 msgstr "Chat Room List Url"
 
+#: src/protocols/yahoo/yahoo.c:3337
+msgid "YCHT Host"
+msgstr "YCHT Host"
+
+#: src/protocols/yahoo/yahoo.c:3340
+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 "
@@ -10084,17 +10314,20 @@
 "Gaim cannot send files over Yahoo! that are bigger than One Megabyte "
 "(1,048,576 bytes)."
 
-#: src/protocols/yahoo/yahoo_profile.c:640
-#: src/protocols/yahoo/yahoo_profile.c:961
-msgid "Yahoo! ID"
-msgstr "Yahoo! ID"
-
-#: src/protocols/yahoo/yahoo_profile.c:664
+#: src/protocols/yahoo/yahoo_profile.c:675
 #, c-format
 msgid "<b>IP Address:</b> %s<br>"
 msgstr "<b>IP Address:</b> %s<br>"
 
-#: src/protocols/yahoo/yahoo_profile.c:779
+#: src/protocols/yahoo/yahoo_profile.c:749
+msgid "Yahoo! Japan Profile"
+msgstr "Yahoo! Japan Profile"
+
+#: src/protocols/yahoo/yahoo_profile.c:750
+msgid "Yahoo! Profile"
+msgstr "Yahoo! Profile"
+
+#: src/protocols/yahoo/yahoo_profile.c:794
 msgid ""
 "Sorry, profiles marked as containing adult content are not supported at this "
 "time."
@@ -10102,8 +10335,7 @@
 "Sorry, profiles marked as containing adult content are not supported at this "
 "time."
 
-#: src/protocols/yahoo/yahoo_profile.c:781
-#: src/protocols/yahoo/yahoo_profile.c:829
+#: src/protocols/yahoo/yahoo_profile.c:796
 msgid ""
 "If you wish to view this profile, you will need to visit this link in your "
 "web browser"
@@ -10111,7 +10343,43 @@
 "If you wish to view this profile, you will need to visit this link in your "
 "web browser"
 
-#: src/protocols/yahoo/yahoo_profile.c:827
+#: src/protocols/yahoo/yahoo_profile.c:969
+msgid "Yahoo! ID"
+msgstr "Yahoo! ID"
+
+#: src/protocols/yahoo/yahoo_profile.c:1043
+#: src/protocols/yahoo/yahoo_profile.c:1047
+#: src/protocols/yahoo/yahoo_profile.c:1051
+msgid "Hobbies"
+msgstr "Hobbies"
+
+#: src/protocols/yahoo/yahoo_profile.c:1061
+#: src/protocols/yahoo/yahoo_profile.c:1065
+msgid "Latest News"
+msgstr "Latest News"
+
+#: src/protocols/yahoo/yahoo_profile.c:1086
+msgid "Home Page"
+msgstr "Home Page"
+
+#: src/protocols/yahoo/yahoo_profile.c:1101
+msgid "Cool Link 1"
+msgstr "Cool Link 1"
+
+#: src/protocols/yahoo/yahoo_profile.c:1106
+msgid "Cool Link 2"
+msgstr "Cool Link 2"
+
+#: src/protocols/yahoo/yahoo_profile.c:1110
+msgid "Cool Link 3"
+msgstr "Cool Link 3"
+
+#: src/protocols/yahoo/yahoo_profile.c:1130
+#, c-format
+msgid "User information for %s unavailable"
+msgstr "User information for %s unavailable"
+
+#: src/protocols/yahoo/yahoo_profile.c:1136
 msgid ""
 "Sorry, this profile seems to be in a language that is not supported at this "
 "time."
@@ -10119,120 +10387,110 @@
 "Sorry, this profile seems to be in a language that is not supported at this "
 "time."
 
-#: src/protocols/yahoo/yahoo_profile.c:1038
-#: src/protocols/yahoo/yahoo_profile.c:1042
-#: src/protocols/yahoo/yahoo_profile.c:1046
-msgid "Hobbies"
-msgstr "Hobbies"
-
-#: src/protocols/yahoo/yahoo_profile.c:1056
-#: src/protocols/yahoo/yahoo_profile.c:1060
-msgid "Latest News"
-msgstr "Latest News"
-
-#: src/protocols/yahoo/yahoo_profile.c:1081
-msgid "Home Page"
-msgstr "Home Page"
-
-#: src/protocols/yahoo/yahoo_profile.c:1096
-msgid "Cool Link 1"
-msgstr "Cool Link 1"
-
-#: src/protocols/yahoo/yahoo_profile.c:1101
-msgid "Cool Link 2"
-msgstr "Cool Link 2"
-
-#: src/protocols/yahoo/yahoo_profile.c:1105
-msgid "Cool Link 3"
-msgstr "Cool Link 3"
-
-#: src/protocols/yahoo/yahoo_profile.c:1138
-#, c-format
-msgid "User information for %s unavailable"
-msgstr "User information for %s unavailable"
-
-#: src/protocols/yahoo/yahoochat.c:198
+#: src/protocols/yahoo/yahoo_profile.c:1152
+msgid ""
+"Could not retrieve the user's profile. This most likely is a temporary "
+"server-side problem. Please try again later."
+msgstr ""
+"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:1155
+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 "
+"profile. If you know that the user exists, please try again later."
+msgstr ""
+"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 "
+"profile. If you know that the user exists, please try again later."
+
+#: src/protocols/yahoo/yahoo_profile.c:1163
+msgid "The user's profile is empty."
+msgstr "The user's profile is empty."
+
+#: 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:200
+#: src/protocols/yahoo/yahoochat.c:205
 msgid "Invitation Rejected"
 msgstr "Invitation Rejected"
 
-#: src/protocols/yahoo/yahoochat.c:350
+#: src/protocols/yahoo/yahoochat.c:355
 msgid "Failed to join chat"
 msgstr "Failed to join chat"
 
-#: src/protocols/yahoo/yahoochat.c:350
+#: src/protocols/yahoo/yahoochat.c:355
 msgid "Maybe the room is full?"
 msgstr "Perhaps the room is full?"
 
-#: src/protocols/yahoo/yahoochat.c:424
+#: src/protocols/yahoo/yahoochat.c:429
 #, c-format
 msgid "You are now chatting in %s."
 msgstr "You are now chatting in %s."
 
-#: src/protocols/yahoo/yahoochat.c:578
+#: src/protocols/yahoo/yahoochat.c:583
 msgid "Failed to join buddy in chat"
 msgstr "Failed to join buddy in chat"
 
-#: src/protocols/yahoo/yahoochat.c:579
+#: src/protocols/yahoo/yahoochat.c:584
 msgid "Maybe they're not in a chat?"
 msgstr "Perhaps they're not in a chat?"
 
-#: src/protocols/yahoo/yahoochat.c:1299
+#: src/protocols/yahoo/yahoochat.c:1338
 msgid "Unable to connect"
 msgstr "Unable to connect"
 
-#: src/protocols/yahoo/yahoochat.c:1299
+#: src/protocols/yahoo/yahoochat.c:1338
 msgid "Fetching the room list failed."
 msgstr "Fetching the room list failed."
 
-#: src/protocols/yahoo/yahoochat.c:1344
+#: src/protocols/yahoo/yahoochat.c:1383
 msgid "Voices"
 msgstr "Voices"
 
-#: src/protocols/yahoo/yahoochat.c:1347
+#: src/protocols/yahoo/yahoochat.c:1386
 msgid "Webcams"
 msgstr "Webcams"
 
-#: src/protocols/yahoo/yahoochat.c:1358 src/protocols/yahoo/yahoochat.c:1419
+#: src/protocols/yahoo/yahoochat.c:1397 src/protocols/yahoo/yahoochat.c:1458
 msgid "Unable to fetch room list."
 msgstr "Unable to fetch room list."
 
-#: src/protocols/yahoo/yahoochat.c:1412
+#: src/protocols/yahoo/yahoochat.c:1451
 msgid "User Rooms"
 msgstr "User Rooms"
 
-#: src/protocols/zephyr/zephyr.c:566
+#: src/protocols/zephyr/zephyr.c:589
 #, c-format
 msgid "Unable send to chat %s,%s,%s"
 msgstr "Unable send to chat %s,%s,%s"
 
-#: src/protocols/zephyr/zephyr.c:600
+#: src/protocols/zephyr/zephyr.c:624
 #, c-format
 msgid "<b>User:</b> %s<br>"
 msgstr "<b>User:</b> %s<br>"
 
-#: src/protocols/zephyr/zephyr.c:604
+#: src/protocols/zephyr/zephyr.c:628
 msgid "<br>Hidden or not logged-in"
 msgstr "<br>Hidden or not logged-in"
 
-#: src/protocols/zephyr/zephyr.c:608
+#: src/protocols/zephyr/zephyr.c:633
 #, c-format
 msgid "<br>At %s since %s"
 msgstr "<br>At %s since %s"
 
-#: src/protocols/zephyr/zephyr.c:873 src/protocols/zephyr/zephyr.c:874
+#: src/protocols/zephyr/zephyr.c:983 src/protocols/zephyr/zephyr.c:984
 msgid "Anyone"
 msgstr "Anyone"
 
-#: src/protocols/zephyr/zephyr.c:900
+#: src/protocols/zephyr/zephyr.c:1011
 msgid "Already logged in with Zephyr"
 msgstr "Already logged in with Zephyr"
 
-#: src/protocols/zephyr/zephyr.c:900
+#: src/protocols/zephyr/zephyr.c:1011
 msgid ""
 "Because Zephyr uses your system username, you are unable to have multiple "
 "accounts on it when logged in as the same user."
@@ -10240,18 +10498,85 @@
 "Because Zephyr uses your system username, you are unable to have multiple "
 "accounts on it when logged in as the same user."
 
-#: src/protocols/zephyr/zephyr.c:1232
+#: src/protocols/zephyr/zephyr.c:1386
 msgid "_Class:"
 msgstr "_Class:"
 
-#: src/protocols/zephyr/zephyr.c:1238
+#: src/protocols/zephyr/zephyr.c:1392
 msgid "_Instance:"
 msgstr "_Instance:"
 
-#: src/protocols/zephyr/zephyr.c:1244
+#: src/protocols/zephyr/zephyr.c:1398
 msgid "_Recipient:"
 msgstr "_Recipient:"
 
+#: src/protocols/zephyr/zephyr.c:1409
+#, 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:1678
+msgid "zlocate &lt;nick&gt;: Locate user"
+msgstr "zlocate &lt;nick&gt;: Locate user"
+
+#: src/protocols/zephyr/zephyr.c:1683
+msgid "zl &lt;nick&gt;: Locate user"
+msgstr "zl &lt;nick&gt;: Locate user"
+
+#: src/protocols/zephyr/zephyr.c:1688
+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:1693
+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:1699
+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:1704
+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:1710
+msgid ""
+"zci &lt;class&gt; &lt;instance&gt;: Send a message to &lt;<i>class</i>,"
+"<i>instance</i>,*&gt;"
+msgstr ""
+"zci &lt;class&gt; &lt;instance&gt;: Send a message to &lt;<i>class</i>,"
+"<i>instance</i>,*&gt;"
+
+#: src/protocols/zephyr/zephyr.c:1716
+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;"
+msgstr ""
+"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:1722
+msgid ""
+"zir &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;MESSAGE,"
+"<i>instance</i>,<i>recipient</i>&gt;"
+msgstr ""
+"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:1727
+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:1802
+msgid "Resubscribe"
+msgstr "Resubscribe"
+
+#: src/protocols/zephyr/zephyr.c:1805
+msgid "Retrieve subscriptions from server"
+msgstr "Retrieve subscriptions from server"
+
 #. *< api_version
 #. *< type
 #. *< ui_requirement
@@ -10262,19 +10587,19 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/zephyr/zephyr.c:1412 src/protocols/zephyr/zephyr.c:1414
+#: src/protocols/zephyr/zephyr.c:1885 src/protocols/zephyr/zephyr.c:1887
 msgid "Zephyr Protocol Plugin"
 msgstr "Zephyr Protocol Plugin"
 
-#: src/protocols/zephyr/zephyr.c:1433
+#: src/protocols/zephyr/zephyr.c:1906
 msgid "Export to .anyone"
 msgstr "Export to .anyone"
 
-#: src/protocols/zephyr/zephyr.c:1436
+#: src/protocols/zephyr/zephyr.c:1909
 msgid "Export to .zephyr.subs"
 msgstr "Export to .zephyr.subs"
 
-#: src/protocols/zephyr/zephyr.c:1439
+#: src/protocols/zephyr/zephyr.c:1912
 msgid "Exposure"
 msgstr "Exposure"
 
@@ -10303,14 +10628,14 @@
 "invalid."
 
 #. * Custom away message.
-#: src/prpl.h:205
+#: src/prpl.h:165
 msgid "Custom"
 msgstr "Custom"
 
 #. *
 #. * A wrapper for gaim_request_action() that uses Accept and Cancel buttons.
 #.
-#: src/request.h:1252
+#: src/request.h:1253
 msgid "Accept"
 msgstr "Accept"
 
@@ -10334,27 +10659,27 @@
 msgid "(1 message)"
 msgstr "(1 message)"
 
-#: src/server.c:1176 src/server.c:1186
+#: src/server.c:1180 src/server.c:1189
 #, c-format
 msgid "%s logged in."
 msgstr "%s logged in."
 
-#: src/server.c:1199
+#: src/server.c:1201
 #, c-format
 msgid "%s signed on"
 msgstr "%s signed on"
 
-#: src/server.c:1215
+#: src/server.c:1216
 #, c-format
 msgid "%s came back"
 msgstr "%s came back"
 
-#: src/server.c:1217
+#: src/server.c:1218
 #, c-format
 msgid "%s went away"
 msgstr "%s went away."
 
-#: src/server.c:1231
+#: src/server.c:1232
 #, c-format
 msgid "%s became idle"
 msgstr "%s became idle"
@@ -10364,17 +10689,17 @@
 msgid "%s became unidle"
 msgstr "%s is no longer idle"
 
-#: src/server.c:1254 src/server.c:1262
+#: src/server.c:1253 src/server.c:1260
 #, c-format
 msgid "%s logged out."
 msgstr "%s logged out."
 
-#: src/server.c:1276
+#: src/server.c:1273
 #, c-format
 msgid "%s signed off"
 msgstr "%s signed off"
 
-#: src/server.c:1338
+#: src/server.c:1335
 #, c-format
 msgid ""
 "%s has just been warned by %s.\n"
@@ -10383,11 +10708,11 @@
 "%s has just been warned by %s.\n"
 "Your new warning level is %d%%"
 
-#: src/server.c:1341
+#: src/server.c:1338
 msgid "an anonymous person"
 msgstr "an anonymous person"
 
-#: src/server.c:1451
+#: src/server.c:1448
 #, c-format
 msgid ""
 "User '%s' invites %s to buddy chat room: '%s'\n"
@@ -10396,12 +10721,12 @@
 "User '%s' invites %s to buddy chat room: '%s'\n"
 "%s"
 
-#: src/server.c:1455
+#: src/server.c:1452
 #, c-format
 msgid "User '%s' invites %s to buddy chat room: '%s'\n"
 msgstr "User '%s' invites %s to buddy chat room: '%s'\n"
 
-#: src/server.c:1461
+#: src/server.c:1458
 msgid "Accept chat invitation?"
 msgstr "Accept chat invitation?"
 
@@ -10436,25 +10761,31 @@
 msgid "Unknown."
 msgstr "Unknown."
 
-#: src/util.c:2399
+#: src/util.c:2392
+msgid "second"
+msgid_plural "seconds"
+msgstr[0] "second"
+msgstr[1] "seconds"
+
+#: src/util.c:2406
 msgid "day"
 msgid_plural "days"
 msgstr[0] "day"
 msgstr[1] "days"
 
-#: src/util.c:2407
+#: src/util.c:2414
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "hour"
 msgstr[1] "hours"
 
-#: src/util.c:2415
+#: src/util.c:2422
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minute"
 msgstr[1] "minutes"
 
-#: src/util.c:2824
+#: src/util.c:2832
 msgid "g003: Error opening connection.\n"
 msgstr "g003: Error opening connection.\n"
 
--- a/po/es.po	Tue Jul 13 12:07:53 2004 +0000
+++ b/po/es.po	Tue Jul 13 21:00:58 2004 +0000
@@ -43,9 +43,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Gaim\n"
-"Report-Msgid-Bugs-To:  gaim-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2004-06-25 00:00-0400\n"
-"PO-Revision-Date: 2004-06-26 13:55+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2004-07-08 00:01-0400\n"
+"PO-Revision-Date: 2004-07-08 16:53+0200\n"
 "Last-Translator: Javier Fernández-Sanguino <jfs@debian.org>\n"
 "Language-Team:  Spanish team <es@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -202,13 +202,13 @@
 msgid "New..."
 msgstr "Nuevo..."
 
-#: plugins/docklet/docklet.c:153 src/gtkprefs.c:1796 src/protocols/gg/gg.c:51
-#: src/protocols/irc/msgs.c:187 src/protocols/jabber/jabber.c:959
+#: plugins/docklet/docklet.c:153 src/gtkprefs.c:1841 src/protocols/gg/gg.c:51
+#: src/protocols/irc/msgs.c:187 src/protocols/jabber/jabber.c:960
 #: src/protocols/jabber/jutil.c:32 src/protocols/jabber/presence.c:63
 #: src/protocols/jabber/presence.c:119 src/protocols/novell/novell.c:2724
 #: src/protocols/novell/novell.c:2841 src/protocols/novell/novell.c:2893
-#: src/protocols/oscar/oscar.c:528 src/protocols/oscar/oscar.c:5465
-#: src/protocols/oscar/oscar.c:6464 src/protocols/oscar/oscar.c:6663
+#: src/protocols/oscar/oscar.c:532 src/protocols/oscar/oscar.c:5481
+#: src/protocols/oscar/oscar.c:6480 src/protocols/oscar/oscar.c:6679
 #: src/protocols/silc/buddy.c:1379 src/protocols/silc/silc.c:46
 #: src/protocols/silc/silc.c:76
 msgid "Away"
@@ -216,7 +216,7 @@
 
 #. else...
 #: plugins/docklet/docklet.c:159 src/away.c:550
-#: src/protocols/oscar/oscar.c:5383 src/protocols/oscar/oscar.c:6671
+#: src/protocols/oscar/oscar.c:5399 src/protocols/oscar/oscar.c:6687
 msgid "Back"
 msgstr "Volver atrás"
 
@@ -226,13 +226,13 @@
 
 #: plugins/docklet/docklet.c:172 src/gtkft.c:619
 msgid "File Transfers"
-msgstr "Transferencia de archivos"
+msgstr "Transferencia de ficheros"
 
 #: plugins/docklet/docklet.c:173 src/gtkaccount.c:2274
 msgid "Accounts"
 msgstr "Cuentas"
 
-#: plugins/docklet/docklet.c:174 src/gtkprefs.c:2490
+#: plugins/docklet/docklet.c:174 src/gtkprefs.c:2535
 msgid "Preferences"
 msgstr "Preferencias"
 
@@ -291,18 +291,22 @@
 "o la ventana de conexión. También permite encolar los mensajes hasta que se "
 "pulse el icono, similar a cómo se hace en ICQ."
 
-#: plugins/extplacement.c:68
+#: plugins/extplacement.c:75
 msgid "By conversation count"
 msgstr "Por número de conversaciones"
 
-#: plugins/extplacement.c:89
+#: plugins/extplacement.c:96
 msgid "Conversation Placement"
 msgstr "Localización de la conversación"
 
-#: plugins/extplacement.c:94
+#: plugins/extplacement.c:101
 msgid "Number of conversations per window"
 msgstr "Número de conversaciones por ventana"
 
+#: plugins/extplacement.c:107
+msgid "Separate IM and Chat windows when placing by number"
+msgstr "Separar ventanas de MIs y chats cuando se ubican por número"
+
 #. *< api_version
 #. *< type
 #. *< ui_requirement
@@ -310,23 +314,23 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/extplacement.c:114
+#: plugins/extplacement.c:126
 msgid "ExtPlacement"
 msgstr "_UbicaciónExt"
 
 #. *< name
 #. *< version
-#: plugins/extplacement.c:116
+#: plugins/extplacement.c:128
 msgid "Extra conversation placement options."
 msgstr "Opciones adicionales de ubicación de conversaciones."
 
 #. *< summary
 #. *  description
-#: plugins/extplacement.c:118
-msgid ""
-"Either restrict the number of conversations per windows or use separate "
-"windows for IMs and Chats"
-msgstr "Puede o bien restringir el número de conversaciones por ventana o utilizar ventanas distintas para MIs y Chats"
+#: plugins/extplacement.c:130
+msgid ""
+"Restrict the number of conversations per windows, optionally separating IMs "
+"and Chats"
+msgstr "Restringir el número de conversaciones por ventana, de forma optativa utilizar ventanas distintas para MIs y Chats"
 
 #. *< api_version
 #. *< type
@@ -337,7 +341,7 @@
 #. *< id
 #: plugins/filectl.c:222
 msgid "Gaim File Control"
-msgstr "Control de archivos de Gaim"
+msgstr "Control de ficheros de Gaim"
 
 #. *< name
 #. *< version
@@ -497,15 +501,15 @@
 #: plugins/gevolution/add_buddy_dialog.c:143
 #: plugins/gevolution/add_buddy_dialog.c:154
 #: plugins/gevolution/assoc-buddy.c:81 plugins/gevolution/assoc-buddy.c:92
-#: src/gtkblist.c:2984 src/gtkprefs.c:913 src/gtkprefs.c:966
-#: src/gtkprefs.c:1809 src/protocols/jabber/jabber.c:923
+#: src/gtkblist.c:2979 src/gtkprefs.c:957 src/gtkprefs.c:1010
+#: src/gtkprefs.c:1854 src/protocols/jabber/jabber.c:924
 msgid "None"
 msgstr "Ninguno"
 
 #: plugins/gevolution/add_buddy_dialog.c:187
-#: plugins/gevolution/assoc-buddy.c:175 src/gtkprefs.c:2162
-#: src/gtkroomlist.c:553 src/protocols/jabber/jabber.c:597
-#: src/protocols/msn/msn.c:1305 src/protocols/trepia/trepia.c:398
+#: plugins/gevolution/assoc-buddy.c:175 src/gtkprefs.c:2207
+#: src/gtkroomlist.c:553 src/protocols/jabber/jabber.c:598
+#: src/protocols/msn/msn.c:1296 src/protocols/trepia/trepia.c:398
 msgid "Name"
 msgstr "Nombre"
 
@@ -522,13 +526,13 @@
 
 #. "Search"
 #: plugins/gevolution/add_buddy_dialog.c:492
-#: plugins/gevolution/assoc-buddy.c:380 src/protocols/oscar/oscar.c:6950
+#: plugins/gevolution/assoc-buddy.c:380 src/protocols/oscar/oscar.c:6965
 msgid "Search"
 msgstr "Buscar"
 
 #: plugins/gevolution/add_buddy_dialog.c:563
-#: plugins/gevolution/new_person_dialog.c:307 src/gtkblist.c:4013
-#: src/gtkblist.c:4341
+#: plugins/gevolution/new_person_dialog.c:307 src/gtkblist.c:4008
+#: src/gtkblist.c:4336
 msgid "Group:"
 msgstr "Grupo:"
 
@@ -567,7 +571,7 @@
 msgstr "_Asociar amigo"
 
 #: plugins/gevolution/gevo-util.c:64 plugins/gevolution/gevolution.c:89
-#: src/blist.c:775 src/blist.c:963 src/blist.c:2060 src/gtkblist.c:3834
+#: src/blist.c:775 src/blist.c:963 src/blist.c:1870 src/gtkblist.c:3829
 #: src/protocols/jabber/roster.c:66
 msgid "Buddies"
 msgstr "Amigos"
@@ -635,7 +639,7 @@
 
 #. Label
 #: plugins/gevolution/new_person_dialog.c:338 src/gtkaccount.c:340
-#: src/protocols/oscar/oscar.c:433
+#: src/protocols/oscar/oscar.c:438
 msgid "Buddy Icon"
 msgstr "Icono de amigo"
 
@@ -884,15 +888,15 @@
 msgid "Provides support for loading perl plugins."
 msgstr "Provee soporte para cargar complementos en perl."
 
-#: plugins/raw.c:154
+#: plugins/raw.c:146
 msgid "Raw"
 msgstr "En bruto"
 
-#: plugins/raw.c:156
+#: plugins/raw.c:148
 msgid "Lets you send raw input to text-based protocols."
 msgstr "Le permite enviar datos en bruto a protocolos basados en texto."
 
-#: plugins/raw.c:157
+#: plugins/raw.c:149
 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."
@@ -1194,30 +1198,30 @@
 "minutos."
 
 #: plugins/win32/transparency/win2ktrans.c:133
-#: plugins/win32/transparency/win2ktrans.c:389
-#: plugins/win32/transparency/win2ktrans.c:420
+#: plugins/win32/transparency/win2ktrans.c:388
+#: plugins/win32/transparency/win2ktrans.c:419
 msgid "Opacity:"
 msgstr "Opacidad:"
 
 #. IM Convo trans options
-#: plugins/win32/transparency/win2ktrans.c:370
+#: plugins/win32/transparency/win2ktrans.c:369
 msgid "IM Conversation Windows"
 msgstr "Ventanas de conversación de MI"
 
-#: plugins/win32/transparency/win2ktrans.c:371
+#: plugins/win32/transparency/win2ktrans.c:370
 msgid "_IM window transparency"
 msgstr "Transparencia de las ventanas de M_I"
 
-#: plugins/win32/transparency/win2ktrans.c:381
+#: plugins/win32/transparency/win2ktrans.c:380
 msgid "_Show slider bar in IM window"
 msgstr "_Mostrar barra deslizante en la ventana MI"
 
 #. Buddy List trans options
-#: plugins/win32/transparency/win2ktrans.c:406 src/gtkprefs.c:907
+#: plugins/win32/transparency/win2ktrans.c:405 src/gtkprefs.c:951
 msgid "Buddy List Window"
 msgstr "Ventana de la lista de amigos"
 
-#: plugins/win32/transparency/win2ktrans.c:407
+#: plugins/win32/transparency/win2ktrans.c:406
 msgid "_Buddy List window transparency"
 msgstr "Transparencia de la ventana de lista de _amigos"
 
@@ -1228,26 +1232,27 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/win32/transparency/win2ktrans.c:463
+#: plugins/win32/transparency/win2ktrans.c:462
 msgid "Transparency"
 msgstr "Transparencia"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/win32/transparency/win2ktrans.c:466
+#: plugins/win32/transparency/win2ktrans.c:465
 msgid "Variable Transparency for the buddy list and conversations."
 msgstr "Transparencia variable para la lista de amigos y las conversaciones."
 
 #. *  description
-#: plugins/win32/transparency/win2ktrans.c:468
+#: plugins/win32/transparency/win2ktrans.c:467
 msgid ""
 "This plugin enables variable alpha transparency on conversation windows and "
 "the buddy list.\n"
 "\n"
 "* Note: This plugin requires Win2000 or WinXP."
 msgstr ""
-"Este complemento activa diversas transparencias alpha en las ventanas de conversación y en la lista de amigos.\n"
+"Este complemento activa diversas transparencias alpha en las ventanas de "
+"conversación y en la lista de amigos.\n"
 "\n"
 "* Nota: Este complemento requiere Win2000 o WinXP."
 
@@ -1265,8 +1270,8 @@
 msgstr "_Iniciar Gaim al iniciar Windows"
 
 #. Buddy List
-#: plugins/win32/winprefs/winprefs.c:362 src/gtkblist.c:3025
-#: src/gtkprefs.c:2399
+#: plugins/win32/winprefs/winprefs.c:362 src/gtkblist.c:3020
+#: src/gtkprefs.c:2444
 msgid "Buddy List"
 msgstr "Lista de amigos"
 
@@ -1285,8 +1290,8 @@
 msgstr "_Mantener la ventana de amigos por encima del resto"
 
 #. Conversations
-#: plugins/win32/winprefs/winprefs.c:382 src/gtkprefs.c:958
-#: src/gtkprefs.c:2400 src/protocols/msn/msn.c:1630
+#: plugins/win32/winprefs/winprefs.c:382 src/gtkprefs.c:1002
+#: src/gtkprefs.c:2445 src/protocols/msn/msn.c:1621
 msgid "Conversations"
 msgstr "Conversaciones"
 
@@ -1316,7 +1321,11 @@
 "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>"
-msgstr "Gaim es un cliente modular de mensajería instantánea, capaz de utilizar AIM, MSN, Yahoo!, Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr y Gadu-Gadu al mismo tiempo.  Está escrito usando Gtk+ y se licencia con la GPL.<BR><BR>"
+msgstr ""
+"Gaim es un cliente modular de mensajería instantánea, capaz de utilizar AIM, "
+"MSN, Yahoo!, Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr y "
+"Gadu-Gadu al mismo tiempo.  Está escrito usando Gtk+ y se licencia con la "
+"GPL.<BR><BR>"
 
 #: src/about.c:106
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #gaim on irc.freenode.net<BR><BR>"
@@ -1354,261 +1363,265 @@
 msgid "Crazy Patch Writers"
 msgstr "Locos escritores de parches"
 
-#: src/about.c:147
+#: src/about.c:148
 msgid "Retired Developers"
 msgstr "Desarrolladores retirados"
 
-#: src/about.c:148
+#: src/about.c:149
 msgid "former libfaim maintainer"
 msgstr "desarrollador anterior de libfaim"
 
-#: src/about.c:149
+#: src/about.c:150
 msgid "former lead developer"
 msgstr "desarrollador principal previo"
 
-#: src/about.c:152
-msgid "former maintainer"
-msgstr "desarrollador previo"
-
 #: src/about.c:153
+msgid "former maintainer"
+msgstr "desarrollador previo"
+
+#: src/about.c:154
 msgid "former Jabber developer"
 msgstr "desarrollador de Jabber previo"
 
-#: src/about.c:154
+#: src/about.c:155
 msgid "original author"
 msgstr "autor original"
 
-#: src/about.c:157
+#: src/about.c:158
 msgid "hacker and designated driver [lazy bum]"
 msgstr "hacker y diseñador de controladores [lazy bum]"
 
-#: src/about.c:165
+#: src/about.c:166
 msgid "Current Translators"
 msgstr "Traductores actuales"
 
-#: src/about.c:166 src/about.c:204
+#: src/about.c:167 src/about.c:207
 msgid "Catalan"
 msgstr "Catalán"
 
-#: src/about.c:167 src/about.c:205
+#: src/about.c:168 src/about.c:208
 msgid "Czech"
 msgstr "Checo"
 
-#: src/about.c:168
-msgid "Danish"
-msgstr "Danés"
-
 #: src/about.c:169
-msgid "British English"
-msgstr "Inglés británico"
+msgid "Danish"
+msgstr "Danés"
 
 #: src/about.c:170
+msgid "British English"
+msgstr "Inglés británico"
+
+#: src/about.c:171
 msgid "Canadian English"
 msgstr "Inglés canadiense"
 
-#: src/about.c:171 src/about.c:206
+#: src/about.c:172 src/about.c:209
 msgid "German"
 msgstr "Alemán"
 
-#: src/about.c:172 src/about.c:207
+#: src/about.c:173 src/about.c:210
 msgid "Spanish"
 msgstr "Español"
 
-#: src/about.c:173 src/about.c:208
+#: src/about.c:174 src/about.c:211
 msgid "Finnish"
 msgstr "Finlandés"
 
-#: src/about.c:174 src/about.c:209
+#: src/about.c:175 src/about.c:212
 msgid "French"
 msgstr "Francés"
 
-#: src/about.c:175
+#: src/about.c:176
 msgid "Hebrew"
 msgstr "Hebreo"
 
-#: src/about.c:176
+#: src/about.c:177
 msgid "Hindi"
 msgstr "Hindú"
 
-#: src/about.c:177
+#: src/about.c:178
 msgid "Hungarian"
 msgstr "Húngaro"
 
-#: src/about.c:178 src/about.c:210
+#: src/about.c:179 src/about.c:213
 msgid "Italian"
 msgstr "Italiano"
 
-#: src/about.c:179 src/about.c:212
-msgid "Korean"
-msgstr "Coreano"
-
-#: src/about.c:180
-msgid "Dutch; Flemish"
-msgstr "Danés; Flamenco"
+#: src/about.c:180 src/about.c:214
+msgid "Japanese"
+msgstr "Japonés"
 
 #: src/about.c:181
+msgid "Lithuanian"
+msgstr "Lituano"
+
+#: src/about.c:182 src/about.c:215
+msgid "Korean"
+msgstr "Coreano"
+
+#: src/about.c:183
+msgid "Dutch; Flemish"
+msgstr "Danés; Flamenco"
+
+#: src/about.c:184
 msgid "Macedonian"
 msgstr "Macedonio"
 
-#: src/about.c:182
+#: src/about.c:185
 msgid "Norwegian"
 msgstr "Noruego"
 
-#: src/about.c:183 src/about.c:213
+#: src/about.c:186 src/about.c:216
 msgid "Polish"
 msgstr "Polaco"
 
-#: src/about.c:184
+#: src/about.c:187
 msgid "Portuguese"
 msgstr "Portugués"
 
-#: src/about.c:185
+#: src/about.c:188
 msgid "Portuguese-Brazil"
 msgstr "Portugués brasileño"
 
-#: src/about.c:186
+#: src/about.c:189
 msgid "Romanian"
 msgstr "Rumano"
 
-#: src/about.c:187 src/about.c:214 src/about.c:215
+#: src/about.c:190 src/about.c:217 src/about.c:218
 msgid "Russian"
 msgstr "Ruso"
 
-#: src/about.c:188
+#: src/about.c:191
 msgid "Serbian"
 msgstr "Serbio"
 
-#: src/about.c:189
+#: src/about.c:192
 msgid "Slovenian"
 msgstr "Esloveno"
 
-#: src/about.c:190 src/about.c:217
+#: src/about.c:193 src/about.c:220
 msgid "Swedish"
 msgstr "Sueco"
 
-#: src/about.c:191
+#: src/about.c:194
 msgid "Vietnamese"
 msgstr "Vietnamita"
 
-#: src/about.c:191
+#: src/about.c:194
 msgid "Gnome Vi Team"
 msgstr "Equipo Gnome Vi"
 
-#: src/about.c:193
+#: src/about.c:196
 msgid "Simplified Chinese"
 msgstr "Chino simplificado"
 
-#: src/about.c:194
+#: src/about.c:197
 msgid "Traditional Chinese"
 msgstr "Chino tradicional"
 
-#: src/about.c:201
+#: src/about.c:204
 msgid "Past Translators"
 msgstr "Traductores anteriores"
 
 # Amhario
-#: src/about.c:202
+#: src/about.c:205
 msgid "Amharic"
 msgstr "Amhárico"
 
-#: src/about.c:203
+#: src/about.c:206
 msgid "Bulgarian"
 msgstr "Búlgaro"
 
-#: src/about.c:211
-msgid "Japanese"
-msgstr "Japonés"
-
-#: src/about.c:216
+#: src/about.c:219
 msgid "Slovak"
 msgstr "Eslovaco"
 
-#: src/about.c:218
+#: src/about.c:221
 msgid "Chinese"
 msgstr "Chino"
 
-#: src/account.c:278 src/protocols/jabber/jabber.c:1000
+#: src/account.c:277 src/protocols/jabber/jabber.c:1001
 msgid "New passwords do not match."
 msgstr "Las nuevas contraseñas no coinciden"
 
-#: src/account.c:287
+#: src/account.c:286
 msgid "Fill out all fields completely."
 msgstr "Rellene todos los campos completamente."
 
-#: src/account.c:312
+#: src/account.c:311
 msgid "Original password"
 msgstr "Contraseña original"
 
-#: src/account.c:319
+#: src/account.c:318
 msgid "New password"
 msgstr "Nueva contraseña"
 
-#: src/account.c:326
+#: src/account.c:325
 msgid "New password (again)"
 msgstr "Nueva contraseña (otra vez)"
 
-#: src/account.c:332
+#: src/account.c:331
 #, c-format
 msgid "Change password for %s"
 msgstr "Cambiar la contraseña de %s:"
 
-#: src/account.c:340
+#: src/account.c:339
 msgid "Please enter your current password and your new password."
 msgstr "Introduzca su contraseña actual y la contraseña nueva."
 
 #. *
 #. * A wrapper for gaim_request_action() that uses OK and Cancel buttons.
 #.
-#: src/account.c:343 src/connection.c:197 src/dialogs.c:462 src/dialogs.c:518
-#: src/dialogs.c:571 src/gtkblist.c:2343 src/gtkrequest.c:235
-#: src/protocols/jabber/jabber.c:1047 src/protocols/jabber/xdata.c:337
+#: src/account.c:342 src/connection.c:197 src/dialogs.c:462 src/dialogs.c:518
+#: src/dialogs.c:571 src/gtkblist.c:2355 src/gtkrequest.c:235
+#: src/protocols/jabber/jabber.c:1048 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:3353 src/protocols/oscar/oscar.c:3447
-#: src/protocols/oscar/oscar.c:6732 src/protocols/oscar/oscar.c:6829
-#: src/protocols/oscar/oscar.c:6881 src/protocols/oscar/oscar.c:6967
+#: src/protocols/oscar/oscar.c:3369 src/protocols/oscar/oscar.c:3463
+#: src/protocols/oscar/oscar.c:6748 src/protocols/oscar/oscar.c:6844
+#: src/protocols/oscar/oscar.c:6896 src/protocols/oscar/oscar.c:6982
 #: src/protocols/silc/buddy.c:460 src/protocols/silc/buddy.c:1132
 #: src/protocols/silc/chat.c:406 src/protocols/silc/chat.c:444
 #: src/protocols/silc/chat.c:707 src/protocols/silc/ops.c:1004
 #: src/protocols/silc/ops.c:1465 src/protocols/silc/silc.c:692
-#: src/protocols/yahoo/yahoo.c:2757 src/protocols/yahoo/yahoo.c:2766
+#: src/protocols/yahoo/yahoo.c:2752 src/protocols/yahoo/yahoo.c:2761
 #: src/request.h:1242
 msgid "OK"
 msgstr "Aceptar"
 
-#: src/account.c:344 src/account.c:382 src/away.c:334 src/connection.c:198
+#: src/account.c:343 src/account.c:381 src/away.c:334 src/connection.c:198
 #: src/dialogs.c:299 src/dialogs.c:311 src/dialogs.c:324 src/dialogs.c:345
 #: src/dialogs.c:463 src/dialogs.c:519 src/dialogs.c:572 src/dialogs.c:808
 #: src/dialogs.c:824 src/dialogs.c:842 src/gtkaccount.c:1948
-#: src/gtkaccount.c:2439 src/gtkblist.c:2344 src/gtkblist.c:4379
+#: src/gtkaccount.c:2439 src/gtkblist.c:2356 src/gtkblist.c:4374
 #: src/gtkconn.c:168 src/gtkimhtmltoolbar.c:414 src/gtkprivacy.c:587
 #: src/gtkprivacy.c:600 src/gtkprivacy.c:625 src/gtkprivacy.c:636
 #: src/gtkrequest.c:236 src/protocols/icq/gaim_icq.c:277
-#: src/protocols/jabber/buddy.c:516 src/protocols/jabber/chat.c:710
-#: src/protocols/jabber/jabber.c:666 src/protocols/jabber/jabber.c:1048
+#: src/protocols/jabber/buddy.c:515 src/protocols/jabber/chat.c:710
+#: src/protocols/jabber/jabber.c:667 src/protocols/jabber/jabber.c:1049
 #: 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:1371 src/protocols/oscar/oscar.c:3313
-#: src/protocols/oscar/oscar.c:3354 src/protocols/oscar/oscar.c:3391
-#: src/protocols/oscar/oscar.c:3448 src/protocols/oscar/oscar.c:6733
-#: src/protocols/oscar/oscar.c:6830 src/protocols/oscar/oscar.c:6882
-#: src/protocols/oscar/oscar.c:6951 src/protocols/oscar/oscar.c:6968
+#: src/protocols/oscar/oscar.c:1377 src/protocols/oscar/oscar.c:3329
+#: src/protocols/oscar/oscar.c:3370 src/protocols/oscar/oscar.c:3407
+#: src/protocols/oscar/oscar.c:3464 src/protocols/oscar/oscar.c:6749
+#: src/protocols/oscar/oscar.c:6845 src/protocols/oscar/oscar.c:6897
+#: src/protocols/oscar/oscar.c:6966 src/protocols/oscar/oscar.c:6983
 #: src/protocols/silc/buddy.c:461 src/protocols/silc/buddy.c:1037
 #: src/protocols/silc/buddy.c:1133 src/protocols/silc/chat.c:579
 #: src/protocols/silc/chat.c:708 src/protocols/silc/ops.c:1466
 #: src/protocols/silc/silc.c:693 src/protocols/trepia/trepia.c:347
-#: src/protocols/yahoo/yahoo.c:2758 src/protocols/yahoo/yahoo.c:2767
+#: src/protocols/yahoo/yahoo.c:2753 src/protocols/yahoo/yahoo.c:2762
 #: src/request.h:1242 src/request.h:1252
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: src/account.c:373
+#: src/account.c:372
 #, c-format
 msgid "Change user information for %s"
 msgstr "Cambiar la información del usuario %s"
 
-#: src/account.c:381 src/gtkrequest.c:242 src/protocols/jabber/buddy.c:515
+#: src/account.c:380 src/gtkrequest.c:242 src/protocols/jabber/buddy.c:514
 #: src/protocols/trepia/trepia.c:346
 msgid "Save"
 msgstr "Guardar"
@@ -1631,7 +1644,7 @@
 msgstr "Eliminar mensaje de ausencia"
 
 #. Remove button
-#: src/away.c:333 src/gtkconv.c:1373 src/gtkconv.c:3591 src/gtkconv.c:3690
+#: src/away.c:333 src/gtkconv.c:1421 src/gtkconv.c:3666 src/gtkconv.c:3770
 #: src/gtkrequest.c:241
 msgid "Remove"
 msgstr "Quitar"
@@ -1668,21 +1681,19 @@
 msgstr "Grupo no eliminado"
 
 #: src/blist.c:1393 src/gtkaccount.c:167 src/gtkft.c:161 src/gtkutils.c:721
-#: src/protocols/jabber/buddy.c:571 src/protocols/novell/novell.c:2736
+#: src/protocols/jabber/buddy.c:570 src/protocols/novell/novell.c:2736
 msgid "Unknown"
 msgstr "Desconocido"
 
-#: src/blist.c:1721
-msgid "Invalid Groupname"
-msgstr "Nombre de grupo inválido"
-
-#: src/blist.c:2192
+#: src/blist.c:2001
 msgid ""
 "An error was encountered parsing your buddy list.  It has not been loaded, "
 "and the old file has moved to blist.xml~."
-msgstr "Se ha encontrado un error al interpretar la lista de amigos. No se ha cargado y el fichero antiguo ha sido movido a blist.xml~."
-
-#: src/blist.c:2195
+msgstr ""
+"Se ha encontrado un error al interpretar la lista de amigos. No se ha "
+"cargado y el fichero antiguo ha sido movido a blist.xml~."
+
+#: src/blist.c:2004
 msgid "Buddy List Error"
 msgstr "Error en la lista de amigos"
 
@@ -1760,7 +1771,7 @@
 msgid "Separate IM and Chat windows"
 msgstr "Separar ventanas de MIs y chats"
 
-#: src/conversation.c:2458 src/gtkprefs.c:1335
+#: src/conversation.c:2458 src/gtkprefs.c:1380
 msgid "New window"
 msgstr "Ventana nueva"
 
@@ -1859,7 +1870,8 @@
 
 #: src/dialogs.c:459
 msgid "Please enter the screen name of the person you would like to IM."
-msgstr "Introduzca el nombre de usuario de la persona con la que quiere comunicarse."
+msgstr ""
+"Introduzca el nombre de usuario de la persona con la que quiere comunicarse."
 
 #: src/dialogs.c:513
 msgid "Get User Info"
@@ -1879,7 +1891,9 @@
 #: src/dialogs.c:568
 msgid ""
 "Please enter the screen name of the person whose log you would like to view."
-msgstr "Introduzca el nombre de usuario de la persona de la cual quiere ver informaciónde registro."
+msgstr ""
+"Introduzca el nombre de usuario de la persona de la cual quiere ver "
+"informaciónde registro."
 
 #: src/dialogs.c:623
 msgid "You cannot save an away message with a blank title"
@@ -1949,7 +1963,7 @@
 #: src/ft.c:144
 #, c-format
 msgid "%s is not a valid filename.\n"
-msgstr "%s no es un nombre de archivo válido.\n"
+msgstr "%s no es un nombre de fichero válido.\n"
 
 #: src/ft.c:157
 #, c-format
@@ -1959,12 +1973,12 @@
 #: src/ft.c:786
 #, c-format
 msgid "File transfer to %s aborted.\n"
-msgstr "Transferencia de archivo a %s abortada.\n"
+msgstr "Transferencia de fichero a %s abortada.\n"
 
 #: src/ft.c:788
 #, c-format
 msgid "File transfer from %s aborted.\n"
-msgstr "Transferencia de archivo de %s abortada.\n"
+msgstr "Transferencia de fichero de %s abortada.\n"
 
 #: src/gaim-disclosure.c:253
 msgid "Expander Size"
@@ -2056,19 +2070,19 @@
 msgid "sorry, i ran out for a while. bbl"
 msgstr "Lo siento, ya hace un rato que me he ido. Tardaré en volver."
 
-#: src/gaimrc.c:372 src/gaimrc.c:1409
+#: src/gaimrc.c:372 src/gaimrc.c:1417
 msgid "boring default"
 msgstr "Opción por omisión"
 
-#: src/gaimrc.c:1219 src/gtkblist.c:2986
+#: src/gaimrc.c:1227 src/gtkblist.c:2981
 msgid "Alphabetical"
 msgstr "Alfabético"
 
-#: src/gaimrc.c:1221 src/gtkblist.c:2987
+#: src/gaimrc.c:1229 src/gtkblist.c:2982
 msgid "By status"
 msgstr "Por estado"
 
-#: src/gaimrc.c:1223 src/gtkblist.c:2988
+#: src/gaimrc.c:1231 src/gtkblist.c:2983
 msgid "By log size"
 msgstr "Por tamaño de registro"
 
@@ -2079,8 +2093,8 @@
 "<b>File size:</b> %s\n"
 "<b>Image size:</b> %dx%d"
 msgstr ""
-"<b>Archivo:</b> %s\n"
-"<b>Tamaño de archivo:</b> %s\n"
+"<b>Fichero:</b> %s\n"
+"<b>Tamaño de fichero:</b> %s\n"
 "<b>Tamaño de imagen:</b> %dx%d"
 
 #. Build the login options frame.
@@ -2092,7 +2106,7 @@
 msgid "Protocol:"
 msgstr "Protocolo:"
 
-#: src/gtkaccount.c:582 src/gtkblist.c:3985
+#: src/gtkaccount.c:582 src/gtkblist.c:3980
 msgid "Screen Name:"
 msgstr "Nombre de usuario:"
 
@@ -2100,7 +2114,7 @@
 msgid "Password:"
 msgstr "Contraseña:"
 
-#: src/gtkaccount.c:660 src/gtkblist.c:3999 src/gtkblist.c:4327
+#: src/gtkaccount.c:660 src/gtkblist.c:3994 src/gtkblist.c:4322
 msgid "Alias:"
 msgstr "Apodo:"
 
@@ -2153,7 +2167,7 @@
 msgstr "SOCKS 5"
 
 #. Use Environmental Settings
-#: src/gtkaccount.c:997 src/gtkaccount.c:1049 src/gtkprefs.c:1139
+#: src/gtkaccount.c:997 src/gtkaccount.c:1049 src/gtkprefs.c:1183
 msgid "Use Environmental Settings"
 msgstr "Usar configuración del entorno"
 
@@ -2169,15 +2183,15 @@
 msgid "Proxy Options"
 msgstr "Opciones del proxy"
 
-#: src/gtkaccount.c:1126 src/gtkprefs.c:1133
+#: src/gtkaccount.c:1126 src/gtkprefs.c:1177
 msgid "Proxy _type:"
 msgstr "_Tipo de proxy:"
 
-#: src/gtkaccount.c:1135 src/gtkprefs.c:1160
+#: src/gtkaccount.c:1135 src/gtkprefs.c:1204
 msgid "_Host:"
 msgstr "_Servidor:"
 
-#: src/gtkaccount.c:1139 src/gtkprefs.c:1178
+#: src/gtkaccount.c:1139 src/gtkprefs.c:1222
 msgid "_Port:"
 msgstr "_Puerto:"
 
@@ -2185,7 +2199,7 @@
 msgid "_Username:"
 msgstr "Nombre de _usuario:"
 
-#: src/gtkaccount.c:1152 src/gtkprefs.c:1215
+#: src/gtkaccount.c:1152 src/gtkprefs.c:1259
 msgid "Pa_ssword:"
 msgstr "_Contraseña:"
 
@@ -2207,7 +2221,7 @@
 msgstr "Mostrar menos opciones"
 
 #. Register button
-#: src/gtkaccount.c:1578 src/protocols/jabber/jabber.c:665
+#: src/gtkaccount.c:1578 src/protocols/jabber/jabber.c:666
 msgid "Register"
 msgstr "Registrar"
 
@@ -2220,15 +2234,15 @@
 msgid "Delete"
 msgstr "Borrar"
 
-#: src/gtkaccount.c:2061 src/protocols/oscar/oscar.c:3981
+#: src/gtkaccount.c:2061 src/protocols/oscar/oscar.c:3997
 msgid "Screen Name"
 msgstr "Nombre de usuario:"
 
-#: src/gtkaccount.c:2084 src/protocols/jabber/jabber.c:957
-#: src/protocols/oscar/oscar.c:534 src/protocols/oscar/oscar.c:5463
-#: src/protocols/oscar/oscar.c:6662 src/protocols/silc/silc.c:44
-#: src/protocols/yahoo/yahoo.c:2501 src/protocols/zephyr/zephyr.c:1208
-#: src/protocols/zephyr/zephyr.c:1218
+#: src/gtkaccount.c:2084 src/protocols/jabber/jabber.c:958
+#: src/protocols/oscar/oscar.c:538 src/protocols/oscar/oscar.c:5479
+#: src/protocols/oscar/oscar.c:6678 src/protocols/silc/silc.c:44
+#: src/protocols/yahoo/yahoo.c:2515 src/protocols/zephyr/zephyr.c:1360
+#: src/protocols/zephyr/zephyr.c:1372
 msgid "Online"
 msgstr "Conectado"
 
@@ -2260,215 +2274,219 @@
 msgstr "¿Desea añadir el amigo a su lista?"
 
 #. Add button
-#: src/gtkaccount.c:2438 src/gtkblist.c:4378 src/gtkconv.c:1375
-#: src/gtkconv.c:3584 src/gtkconv.c:3683 src/gtkrequest.c:240
-#: src/protocols/icq/gaim_icq.c:277 src/protocols/oscar/oscar.c:3610
+#: src/gtkaccount.c:2438 src/gtkblist.c:4373 src/gtkconv.c:1423
+#: src/gtkconv.c:3659 src/gtkconv.c:3763 src/gtkrequest.c:240
+#: src/protocols/icq/gaim_icq.c:277 src/protocols/oscar/oscar.c:3626
 #: src/protocols/silc/chat.c:578
 msgid "Add"
 msgstr "Añadir"
 
-#: src/gtkblist.c:810
+#: src/gtkblist.c:815
 msgid "Join a Chat"
 msgstr "Unirse a un chat"
 
-#: src/gtkblist.c:831
+#: src/gtkblist.c:836
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 msgstr "Introduzca la información apropiada del chat al que desearía unirse.\n"
 
-#: src/gtkblist.c:842 src/gtkpounce.c:445 src/gtkroomlist.c:354
+#: src/gtkblist.c:847 src/gtkpounce.c:445 src/gtkroomlist.c:354
 msgid "_Account:"
 msgstr "_Cuenta:"
 
-#: src/gtkblist.c:1128 src/gtkblist.c:3179
+#: src/gtkblist.c:1133 src/gtkblist.c:3174
 msgid "Get _Info"
 msgstr "Obtener _información"
 
-#: src/gtkblist.c:1131 src/gtkblist.c:3170
+#: src/gtkblist.c:1136 src/gtkblist.c:3165
 msgid "I_M"
 msgstr "_MI"
 
-#: src/gtkblist.c:1133
+#: src/gtkblist.c:1141
+msgid "_Send File"
+msgstr "_Enviar fichero"
+
+#: src/gtkblist.c:1145
 msgid "Add Buddy _Pounce"
 msgstr "Añadir _aviso de amigo"
 
-#: src/gtkblist.c:1135
+#: src/gtkblist.c:1147
 msgid "View _Log"
 msgstr "Ver _registro"
 
-#: src/gtkblist.c:1143 src/gtkblist.c:1229 src/gtkblist.c:1243
+#: src/gtkblist.c:1155 src/gtkblist.c:1241 src/gtkblist.c:1255
 msgid "_Alias..."
 msgstr "_Apodo..."
 
-#: src/gtkblist.c:1145 src/gtkblist.c:1231 src/gtkblist.c:1248
+#: src/gtkblist.c:1157 src/gtkblist.c:1243 src/gtkblist.c:1260
 #: src/gtkconn.c:361
 msgid "_Remove"
 msgstr "Elimina_r"
 
-#: src/gtkblist.c:1191
+#: src/gtkblist.c:1203
 msgid "Add a _Buddy"
 msgstr "Añadir un _amigo"
 
-#: src/gtkblist.c:1193
+#: src/gtkblist.c:1205
 msgid "Add a C_hat"
 msgstr "Añadir un _chat"
 
-#: src/gtkblist.c:1195
+#: src/gtkblist.c:1207
 msgid "_Delete Group"
 msgstr "_Eliminar grupo"
 
-#: src/gtkblist.c:1197
+#: src/gtkblist.c:1209
 msgid "_Rename"
 msgstr "_Renombrar"
 
 #. join button
-#: src/gtkblist.c:1219 src/gtkroomlist.c:263 src/gtkroomlist.c:409
+#: src/gtkblist.c:1231 src/gtkroomlist.c:263 src/gtkroomlist.c:409
 #: src/stock.c:87
 msgid "_Join"
 msgstr "_Unirse"
 
-#: src/gtkblist.c:1221
+#: src/gtkblist.c:1233
 msgid "Auto-Join"
 msgstr "Conectarse automáticamente"
 
-#: src/gtkblist.c:1245 src/gtkblist.c:1274
+#: src/gtkblist.c:1257 src/gtkblist.c:1286
 msgid "_Collapse"
 msgstr "_Contraer"
 
-#: src/gtkblist.c:1279
+#: src/gtkblist.c:1291
 msgid "_Expand"
 msgstr "_Expandir"
 
-#: src/gtkblist.c:1937 src/gtkconv.c:4220 src/gtkpounce.c:347
+#: src/gtkblist.c:1949 src/gtkconv.c:4300 src/gtkpounce.c:347
 msgid ""
 "You are not currently signed on with an account that can add that buddy."
 msgstr "No está conectado con ninguna cuenta que pueda añadir a ese amigo."
 
 #. Buddies menu
-#: src/gtkblist.c:2288
+#: src/gtkblist.c:2300
 msgid "/_Buddies"
 msgstr "/_Amigos"
 
-#: src/gtkblist.c:2289
+#: src/gtkblist.c:2301
 msgid "/Buddies/New Instant _Message..."
 msgstr "/Amigos/Mensaje _instantáneo nuevo"
 
-#: src/gtkblist.c:2290
+#: src/gtkblist.c:2302
 msgid "/Buddies/Join a _Chat..."
 msgstr "/Amigos/Unirse a un _chat..."
 
-#: src/gtkblist.c:2291
+#: src/gtkblist.c:2303
 msgid "/Buddies/Get User _Info..."
 msgstr "/Amigos/Obtener _información del usuario..."
 
-#: src/gtkblist.c:2292
+#: src/gtkblist.c:2304
 msgid "/Buddies/View User _Log..."
 msgstr "/Amigos/Ver _registro del usuario..."
 
-#: src/gtkblist.c:2294
+#: src/gtkblist.c:2306
 msgid "/Buddies/Show _Offline Buddies"
 msgstr "/Amigos/Mostrar amigos _desconectados"
 
-#: src/gtkblist.c:2295
+#: src/gtkblist.c:2307
 msgid "/Buddies/Show _Empty Groups"
 msgstr "/Amigos/Mostrar grupos _vacíos"
 
-#: src/gtkblist.c:2296
+#: src/gtkblist.c:2308
 msgid "/Buddies/_Add Buddy..."
 msgstr "/Amigos/_Añadir un amigo..."
 
-#: src/gtkblist.c:2297
+#: src/gtkblist.c:2309
 msgid "/Buddies/Add C_hat..."
 msgstr "/Amigos/Añadir un _chat..."
 
-#: src/gtkblist.c:2298
+#: src/gtkblist.c:2310
 msgid "/Buddies/Add _Group..."
 msgstr "/Amigos/Añadir _grupo..."
 
-#: src/gtkblist.c:2300
+#: src/gtkblist.c:2312
 msgid "/Buddies/_Signoff"
 msgstr "/Amigos/_Desconectar"
 
-#: src/gtkblist.c:2301
+#: src/gtkblist.c:2313
 msgid "/Buddies/_Quit"
 msgstr "/Amigos/_Salir"
 
 #. Tools
-#: src/gtkblist.c:2304
+#: src/gtkblist.c:2316
 msgid "/_Tools"
 msgstr "/_Herramientas"
 
-#: src/gtkblist.c:2305
+#: src/gtkblist.c:2317
 msgid "/Tools/_Away"
 msgstr "/Herramientas/_Ausentarse"
 
-#: src/gtkblist.c:2306
+#: src/gtkblist.c:2318
 msgid "/Tools/Buddy _Pounce"
 msgstr "/Herramientas/_Aviso de amigo"
 
-#: src/gtkblist.c:2307
+#: src/gtkblist.c:2319
 msgid "/Tools/Account Ac_tions"
 msgstr "/Herramientas/Acc_iones"
 
-#: src/gtkblist.c:2308
+#: src/gtkblist.c:2320
 msgid "/Tools/Pl_ugin Actions"
 msgstr "/Herramientas/Acciones del com_plemento"
 
-#: src/gtkblist.c:2310
+#: src/gtkblist.c:2322
 msgid "/Tools/A_ccounts"
 msgstr "/Herramientas/_Cuentas"
 
-#: src/gtkblist.c:2311
+#: src/gtkblist.c:2323
 msgid "/Tools/_File Transfers"
-msgstr "/Herramientas/Transferencias de _archivos"
-
-#: src/gtkblist.c:2312
+msgstr "/Herramientas/Transferencias de _ficheros"
+
+#: src/gtkblist.c:2324
 msgid "/Tools/R_oom List"
 msgstr "/Herramientas/Lista de _salas"
 
-#: src/gtkblist.c:2313
+#: src/gtkblist.c:2325
 msgid "/Tools/Pr_eferences"
 msgstr "/Herramientas/Pr_eferencias"
 
-#: src/gtkblist.c:2314
+#: src/gtkblist.c:2326
 msgid "/Tools/Pr_ivacy"
 msgstr "/Herramientas/Pr_ivacidad"
 
-#: src/gtkblist.c:2316
+#: src/gtkblist.c:2328
 msgid "/Tools/View System _Log"
 msgstr "/Herramientas/_Ver registro del sistema"
 
 #. Help
-#: src/gtkblist.c:2319
+#: src/gtkblist.c:2331
 msgid "/_Help"
 msgstr "/_Ayuda"
 
-#: src/gtkblist.c:2320
+#: src/gtkblist.c:2332
 msgid "/Help/Online _Help"
 msgstr "/Ayuda/Ayuda en _línea"
 
-#: src/gtkblist.c:2321
+#: src/gtkblist.c:2333
 msgid "/Help/_Debug Window"
 msgstr "/Ayuda/Ventana de _depuración"
 
-#: src/gtkblist.c:2322
+#: src/gtkblist.c:2334
 msgid "/Help/_About"
 msgstr "/Ayuda/_Acerca de"
 
-#: src/gtkblist.c:2340
+#: src/gtkblist.c:2352
 msgid "Rename Group"
 msgstr "Renombrar grupo"
 
-#: src/gtkblist.c:2340
+#: src/gtkblist.c:2352
 msgid "New group name"
 msgstr "Nuevo nombre de grupo:"
 
-#: src/gtkblist.c:2341
+#: src/gtkblist.c:2353
 msgid "Please enter a new name for the selected group."
 msgstr "Introduzca un nombre para el grupo seleccionado."
 
-#: src/gtkblist.c:2369
+#: src/gtkblist.c:2381
 #, c-format
 msgid ""
 "\n"
@@ -2477,18 +2495,20 @@
 "\n"
 "<b>Cuenta:</b> %s"
 
-#: src/gtkblist.c:2433
+#: src/gtkblist.c:2445
 msgid ""
 "\n"
 "<b>Status:</b> Offline"
-msgstr "\n<b>Estado:</b> Desconectado"
-
-#: src/gtkblist.c:2448
+msgstr ""
+"\n"
+"<b>Estado:</b> Desconectado"
+
+#: src/gtkblist.c:2460
 #, c-format
 msgid "%d%%"
 msgstr "%d%%"
 
-#: src/gtkblist.c:2464
+#: src/gtkblist.c:2476
 msgid ""
 "\n"
 "<b>Account:</b>"
@@ -2496,7 +2516,7 @@
 "\n"
 "<b>Cuenta:</b>"
 
-#: src/gtkblist.c:2465
+#: src/gtkblist.c:2477
 msgid ""
 "\n"
 "<b>Contact Alias:</b>"
@@ -2504,7 +2524,7 @@
 "\n"
 "<b>Apodo del contacto:</b>"
 
-#: src/gtkblist.c:2466
+#: src/gtkblist.c:2478
 msgid ""
 "\n"
 "<b>Alias:</b>"
@@ -2512,7 +2532,7 @@
 "\n"
 "<b>Apodo:</b>"
 
-#: src/gtkblist.c:2467
+#: src/gtkblist.c:2479
 msgid ""
 "\n"
 "<b>Nickname:</b>"
@@ -2520,7 +2540,7 @@
 "\n"
 "<b>Apodo:</b>"
 
-#: src/gtkblist.c:2468
+#: src/gtkblist.c:2480
 msgid ""
 "\n"
 "<b>Logged In:</b>"
@@ -2528,7 +2548,7 @@
 "\n"
 "<b>Conectado:</b>"
 
-#: src/gtkblist.c:2469
+#: src/gtkblist.c:2481
 msgid ""
 "\n"
 "<b>Idle:</b>"
@@ -2536,7 +2556,7 @@
 "\n"
 "<b>Ausente:</b>"
 
-#: src/gtkblist.c:2470
+#: src/gtkblist.c:2482
 msgid ""
 "\n"
 "<b>Warned:</b>"
@@ -2544,7 +2564,7 @@
 "\n"
 "<b>Avisado:</b>"
 
-#: src/gtkblist.c:2472
+#: src/gtkblist.c:2484
 msgid ""
 "\n"
 "<b>Description:</b> Spooky"
@@ -2552,7 +2572,7 @@
 "\n"
 "<b>Descripción:</b> Terrorífica"
 
-#: src/gtkblist.c:2473
+#: src/gtkblist.c:2485
 msgid ""
 "\n"
 "<b>Status</b>: Awesome"
@@ -2560,7 +2580,7 @@
 "\n"
 "<b>Estado:</b> Genial "
 
-#: src/gtkblist.c:2474
+#: src/gtkblist.c:2486
 msgid ""
 "\n"
 "<b>Status</b>: Rockin'"
@@ -2568,96 +2588,96 @@
 "\n"
 "<b>Estado:</b> Rock & roll "
 
-#: src/gtkblist.c:2773
+#: src/gtkblist.c:2768
 #, c-format
 msgid "Idle (%dh%02dm) "
 msgstr "Ausente (%dh%02dm) "
 
-#: src/gtkblist.c:2775
+#: src/gtkblist.c:2770
 #, c-format
 msgid "Idle (%dm) "
 msgstr "Ausente (%dm)"
 
-#: src/gtkblist.c:2780
+#: src/gtkblist.c:2775
 #, c-format
 msgid "Warned (%d%%) "
 msgstr "Avisado (%d%%) "
 
-#: src/gtkblist.c:2783
+#: src/gtkblist.c:2778
 msgid "Offline "
 msgstr "Desconectado "
 
 #. Make menu items sensitive/insensitive where appropriate
-#: src/gtkblist.c:2901
+#: src/gtkblist.c:2896
 msgid "/Buddies/Join a Chat..."
 msgstr "/Amigos/Unirse a un chat..."
 
-#: src/gtkblist.c:2904
+#: src/gtkblist.c:2899
 msgid "/Tools/Room List"
 msgstr "/Herramientas/Lista de salas"
 
-#: src/gtkblist.c:2907
+#: src/gtkblist.c:2902
 msgid "/Tools/Privacy"
 msgstr "/Herramientas/Privacidad"
 
-#: src/gtkblist.c:3052
+#: src/gtkblist.c:3047
 msgid "/Tools/Away"
 msgstr "/Herramientas/Ausencia"
 
-#: src/gtkblist.c:3055
+#: src/gtkblist.c:3050
 msgid "/Tools/Buddy Pounce"
 msgstr "/Herramientas/Aviso de amigo"
 
-#: src/gtkblist.c:3058
+#: src/gtkblist.c:3053
 msgid "/Tools/Account Actions"
 msgstr "/Herramientas/Acciones de cuentas"
 
-#: src/gtkblist.c:3061
+#: src/gtkblist.c:3056
 msgid "/Tools/Plugin Actions"
 msgstr "/Herramientas/Acciones de complemento"
 
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: src/gtkblist.c:3150
+#: src/gtkblist.c:3145
 msgid "/Buddies/Show Offline Buddies"
 msgstr "/Amigos/Mostrar amigos desconectados"
 
-#: src/gtkblist.c:3152
+#: src/gtkblist.c:3147
 msgid "/Buddies/Show Empty Groups"
 msgstr "/Amigos/Mostrar grupos vacíos"
 
-#: src/gtkblist.c:3176
+#: src/gtkblist.c:3171
 msgid "Send a message to the selected buddy"
 msgstr "Enviar un mensaje al amigo seleccionado"
 
-#: src/gtkblist.c:3185
+#: src/gtkblist.c:3180
 msgid "Get information on the selected buddy"
 msgstr "Obtener información sobre el amigo seleccionado"
 
+#: src/gtkblist.c:3183
+msgid "_Chat"
+msgstr "_Charlar"
+
 #: src/gtkblist.c:3188
-msgid "_Chat"
-msgstr "_Charlar"
-
-#: src/gtkblist.c:3193
 msgid "Join a chat room"
 msgstr "Unirse a una sala de chat"
 
+#: src/gtkblist.c:3191
+msgid "_Away"
+msgstr "_Ausente"
+
 #: src/gtkblist.c:3196
-msgid "_Away"
-msgstr "_Ausente"
-
-#: src/gtkblist.c:3201
 msgid "Set an away message"
 msgstr "Poner un mensaje de ausencia"
 
-#: src/gtkblist.c:3939 src/protocols/silc/buddy.c:731
+#: src/gtkblist.c:3934 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:2682
 msgid "Add Buddy"
 msgstr "Añadir amigo"
 
-#: src/gtkblist.c:3963
+#: src/gtkblist.c:3958
 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. "
@@ -2669,11 +2689,11 @@
 "posible.\n"
 
 #. Set up stuff for the account box
-#: src/gtkblist.c:4023 src/gtkblist.c:4307
+#: src/gtkblist.c:4018 src/gtkblist.c:4302
 msgid "Account:"
 msgstr "Cuenta:"
 
-#: src/gtkblist.c:4266
+#: src/gtkblist.c:4261
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
@@ -2681,11 +2701,11 @@
 "No está conectado con ninguna cuenta que tenga la capacidad de acceder a "
 "chats."
 
-#: src/gtkblist.c:4273
+#: src/gtkblist.c:4268
 msgid "Add Chat"
 msgstr "Añadir chat"
 
-#: src/gtkblist.c:4297
+#: src/gtkblist.c:4292
 msgid ""
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
@@ -2693,15 +2713,15 @@
 "Introduzca el apodo, y la información que crea conveniente del chatque "
 "desearía añadir en la lista de amigos.\n"
 
-#: src/gtkblist.c:4375
+#: src/gtkblist.c:4370
 msgid "Add Group"
 msgstr "Añadir grupo"
 
-#: src/gtkblist.c:4376
+#: src/gtkblist.c:4371
 msgid "Please enter the name of the group to be added."
 msgstr "Introduzca el nombre del grupo a añadir."
 
-#: src/gtkblist.c:4943 src/gtkblist.c:5040
+#: src/gtkblist.c:4938 src/gtkblist.c:5035
 msgid "No actions available"
 msgstr "No hay acciones disponibles"
 
@@ -2755,24 +2775,24 @@
 msgid "<h1>Conversation with %s</h1>\n"
 msgstr "<h1>Conversaciones con %s</h1>\n"
 
-#: src/gtkconv.c:186 src/gtkdebug.c:212
+#: src/gtkconv.c:186 src/gtkdebug.c:240
 msgid "That file already exists"
-msgstr "Ese archivo ya existe"
-
-#: src/gtkconv.c:187 src/gtkdebug.c:213 src/gtkft.c:1122
+msgstr "Ese fichero ya existe"
+
+#: src/gtkconv.c:187 src/gtkdebug.c:241 src/gtkft.c:1122
 msgid "Would you like to overwrite it?"
 msgstr "¿Quiere sobreescribirlo?"
 
-#: src/gtkconv.c:365
+#: src/gtkconv.c:371
 #, c-format
 msgid "me is using Gaim v%s."
 msgstr "yo estoy utilizando Gaim v%s."
 
-#: src/gtkconv.c:374
+#: src/gtkconv.c:380
 msgid "Supported debug options are:  version"
 msgstr "Las opciones de depuración soportadas son:  version"
 
-#: src/gtkconv.c:387
+#: src/gtkconv.c:393
 msgid ""
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
 "The following commands are available in this context:\n"
@@ -2780,46 +2800,52 @@
 "Utilize \"/help &lt;orden&gt;\" para obtener ayuda de una orden concreta.\n"
 "Las siguientes órdenes están disponibles en este contexto:\n"
 
-#: src/gtkconv.c:421
+#: src/gtkconv.c:427
 msgid "No such command (in this context)."
 msgstr "No existe esa orden (en este contexto)"
 
-#: src/gtkconv.c:487
+#: src/gtkconv.c:500
 msgid ""
 "No such command. If you didn't mean to type a command, you can turn commands "
 "off from Tools->Preferences->Interface->Conversation->Enable \"slash\" "
 "commands."
-msgstr "No existe esa orden. Si no quería escribir una orden, puede desactivar las órdenes de Herramientas->Preferencias->Interfaz->Conversación->Activar órdenes \"barra\""
-
-#: src/gtkconv.c:495
+msgstr ""
+"No existe esa orden. Si no quería escribir una orden, puede desactivar las "
+"órdenes de Herramientas->Preferencias->Interfaz->Conversación->Activar "
+"órdenes \"barra\""
+
+#: src/gtkconv.c:508
 msgid ""
 "Syntax Error:  You typed the wrong number of arguments to that command. If "
 "you didn't mean to type a command, you can turn commands off from Tools-"
 ">Preferences->Interface->Conversation->Enable \"slash\" commands."
-msgstr "Error sintáctio: no ha escrito el número de argumentos correctos para esa orden. Si no quería escribir una orden, puede desactivar las órdenes de Herramientas->Preferencias->Interfaz->Conversación->Activar órdenes \"barra\""
-
-#: src/gtkconv.c:502
+msgstr ""
+"Error sintáctio: no ha escrito el número de argumentos correctos para esa "
+"orden. Si no quería escribir una orden, puede desactivar las órdenes de "
+"Herramientas->Preferencias->Interfaz->Conversación->Activar órdenes \"barra\""
+
+#: src/gtkconv.c:515
 msgid "Your command failed for an unknown reason."
 msgstr "Su orden ha fallado por motivos desconocidos."
 
-#: src/gtkconv.c:509
+#: src/gtkconv.c:522
 msgid "That command only works in Chats, not IMs."
 msgstr "Esa orden sólo funciona en Chats, no en MIs."
 
-#: src/gtkconv.c:512
+#: src/gtkconv.c:525
 msgid "That command only works in IMs, not Chats."
 msgstr "Esa orden sólo funciona en MIs, no en Chats."
 
-#: src/gtkconv.c:516
+#: src/gtkconv.c:529
 msgid "That command doesn't work on this protocol."
 msgstr "Esa orden no funciona en este protocolo."
 
-#: src/gtkconv.c:734
+#: src/gtkconv.c:751
 msgid "Invite Buddy Into Chat Room"
 msgstr "Invitar a un amigo a la sala de chat"
 
 #. Put our happy label in it.
-#: src/gtkconv.c:762
+#: src/gtkconv.c:779
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
@@ -2827,339 +2853,368 @@
 "Introduzca el nombre de usuario al que desea invitar, junto con un mensaje "
 "de invitación opcional."
 
-#: src/gtkconv.c:783
+#: src/gtkconv.c:800
 msgid "_Buddy:"
 msgstr "_Amigo:"
 
-#: src/gtkconv.c:803
+#: src/gtkconv.c:820
 msgid "_Message:"
 msgstr "_Mensaje:"
 
-#: src/gtkconv.c:911 src/gtkdebug.c:127
+#: src/gtkconv.c:928 src/gtkdebug.c:131
 msgid "Find"
 msgstr "Buscar"
 
-#: src/gtkconv.c:937 src/gtkdebug.c:155
+#: src/gtkconv.c:954 src/gtkdebug.c:159
 msgid "_Search for:"
 msgstr "Término a _buscar:"
 
-#: src/gtkconv.c:1333
+#: src/gtkconv.c:1371
 msgid "IM"
 msgstr "MI"
 
-#: src/gtkconv.c:1341
+#. Block button
+#: src/gtkconv.c:1380 src/gtkconv.c:3652 src/protocols/oscar/oscar.c:453
+#: src/protocols/oscar/oscar.c:6788
+msgid "Send File"
+msgstr "Enviar fichero"
+
+#: src/gtkconv.c:1389
 msgid "Un-Ignore"
 msgstr "No ignorar"
 
-#: src/gtkconv.c:1343 src/gtkprefs.c:778
+#: src/gtkconv.c:1391 src/gtkprefs.c:822
 msgid "Ignore"
 msgstr "Ignorar"
 
 #. Info button
-#: src/gtkconv.c:1352 src/gtkconv.c:3598
+#: src/gtkconv.c:1400 src/gtkconv.c:3673
 msgid "Info"
 msgstr "Info"
 
-#: src/gtkconv.c:1361
+#: src/gtkconv.c:1409
 msgid "Get Away Msg"
 msgstr "Mensaje de ausencia"
 
-#: src/gtkconv.c:2488
+#: src/gtkconv.c:2536
 msgid "Animate"
 msgstr "Animar"
 
-#: src/gtkconv.c:2493
+#: src/gtkconv.c:2541
 msgid "Hide Icon"
 msgstr "Ocultar icono"
 
-#: src/gtkconv.c:2499
+#: src/gtkconv.c:2547
 msgid "Save Icon As..."
 msgstr "Guardar icono como..."
 
-#: src/gtkconv.c:2868
+#: src/gtkconv.c:2931
 msgid "User is typing..."
 msgstr "El usuario está escribiendo..."
 
-#: src/gtkconv.c:2876
+#: src/gtkconv.c:2939
 msgid "User has typed something and paused"
 msgstr "El usuario ha escrito algo y ha parado"
 
 #. Build the Send As menu
-#: src/gtkconv.c:2979
+#: src/gtkconv.c:3042
 msgid "_Send As"
 msgstr "_Enviar como"
 
-#: src/gtkconv.c:3356
+#: src/gtkconv.c:3419 src/gtkdebug.c:269
 msgid "Save Conversation"
 msgstr "Guardar conversación"
 
 #. Conversation menu
-#: src/gtkconv.c:3373
+#: src/gtkconv.c:3436
 msgid "/_Conversation"
 msgstr "/_Conversación"
 
-#: src/gtkconv.c:3375
+#: src/gtkconv.c:3438
 msgid "/Conversation/New Instant _Message..."
 msgstr "/Conversación/Mensaje _instantáneo nuevo"
 
-#: src/gtkconv.c:3380
+#: src/gtkconv.c:3443
 msgid "/Conversation/_Find..."
 msgstr "/Conversación/_Buscar..."
 
-#: src/gtkconv.c:3382
+#: src/gtkconv.c:3445
 msgid "/Conversation/View _Log"
 msgstr "/Conversación/Ver _historial"
 
-#: src/gtkconv.c:3383
+#: src/gtkconv.c:3446
 msgid "/Conversation/_Save As..."
 msgstr "/Conversación/_Guardar como..."
 
-#: src/gtkconv.c:3385
+#: src/gtkconv.c:3448
 msgid "/Conversation/Clear"
 msgstr "/Conversación/Limpiar"
 
-#: src/gtkconv.c:3389
+#: src/gtkconv.c:3452
+msgid "/Conversation/Se_nd File..."
+msgstr "/Conversación/_Enviar fichero..."
+
+#: src/gtkconv.c:3453
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Conversación/Añadir _aviso de amigo..."
 
-#: src/gtkconv.c:3391
+#: src/gtkconv.c:3455
 msgid "/Conversation/_Get Info"
 msgstr "/Conversación/_Obtener información"
 
-#: src/gtkconv.c:3393
+#: src/gtkconv.c:3457
 msgid "/Conversation/_Warn..."
 msgstr "/Conversación/Avi_sar..."
 
-#: src/gtkconv.c:3395
+#: src/gtkconv.c:3459
 msgid "/Conversation/In_vite..."
 msgstr "/Conversación/In_vitar..."
 
-#: src/gtkconv.c:3400
+#: src/gtkconv.c:3464
 msgid "/Conversation/A_lias..."
 msgstr "/Conversación/A_podo..."
 
-#: src/gtkconv.c:3402
+#: src/gtkconv.c:3466
 msgid "/Conversation/_Block..."
 msgstr "/Conversación/_Bloquear"
 
-#: src/gtkconv.c:3404
+#: src/gtkconv.c:3468
 msgid "/Conversation/_Add..."
 msgstr "/Conversación/_Añadir..."
 
-#: src/gtkconv.c:3406
+#: src/gtkconv.c:3470
 msgid "/Conversation/_Remove..."
 msgstr "/Conversación/Elimina_r..."
 
-#: src/gtkconv.c:3411
+#: src/gtkconv.c:3475
 msgid "/Conversation/Insert Lin_k..."
 msgstr "/Conversación/Insertar en_lace"
 
-#: src/gtkconv.c:3413
+#: src/gtkconv.c:3477
 msgid "/Conversation/Insert Imag_e..."
 msgstr "/Conversación/Insertar imag_en..."
 
-#: src/gtkconv.c:3418
+#: src/gtkconv.c:3482
 msgid "/Conversation/_Close"
 msgstr "/Conversación/_Cerrar"
 
 #. Options
-#: src/gtkconv.c:3422
+#: src/gtkconv.c:3486
 msgid "/_Options"
 msgstr "/_Opciones"
 
-#: src/gtkconv.c:3423
+#: src/gtkconv.c:3487
 msgid "/Options/Enable _Logging"
 msgstr "/Opciones/_Habilitar registro"
 
-#: src/gtkconv.c:3424
+#: src/gtkconv.c:3488
 msgid "/Options/Enable _Sounds"
 msgstr "/Opciones/Habilitar _sonidos"
 
-#: src/gtkconv.c:3425
+#: src/gtkconv.c:3489
 msgid "/Options/Show Formatting _Toolbar"
 msgstr "/Opciones/Mostrar _barra de formato"
 
-#: src/gtkconv.c:3426
+#: src/gtkconv.c:3490
 msgid "/Options/Show T_imestamps"
 msgstr "/Opciones/Mostrar _marcas de tiempo"
 
-#: src/gtkconv.c:3468
+#: src/gtkconv.c:3532
 msgid "/Conversation/View Log"
 msgstr "/Conversación/Ver registro"
 
-#: src/gtkconv.c:3473
+#: src/gtkconv.c:3537
+msgid "/Conversation/Send File..."
+msgstr "/Conversación/Enviar fichero..."
+
+#: src/gtkconv.c:3541
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Conversación/Añadir aviso de amigo..."
 
-#: src/gtkconv.c:3479
+#: src/gtkconv.c:3547
 msgid "/Conversation/Get Info"
 msgstr "/Conversación/Obtener información"
 
-#: src/gtkconv.c:3483
+#: src/gtkconv.c:3551
 msgid "/Conversation/Warn..."
 msgstr "/Conversación/Avisar..."
 
-#: src/gtkconv.c:3487
+#: src/gtkconv.c:3555
 msgid "/Conversation/Invite..."
 msgstr "/Conversación/Invitar..."
 
-#: src/gtkconv.c:3493
+#: src/gtkconv.c:3561
 msgid "/Conversation/Alias..."
 msgstr "/Conversación/Apodo..."
 
-#: src/gtkconv.c:3497
+#: src/gtkconv.c:3565
 msgid "/Conversation/Block..."
 msgstr "/Conversación/Bloquear..."
 
-#: src/gtkconv.c:3501
+#: src/gtkconv.c:3569
 msgid "/Conversation/Add..."
 msgstr "/Conversación/Añadir..."
 
-#: src/gtkconv.c:3505
+#: src/gtkconv.c:3573
 msgid "/Conversation/Remove..."
 msgstr "/Conversación/Eliminar..."
 
-#: src/gtkconv.c:3511
+#: src/gtkconv.c:3579
 msgid "/Conversation/Insert Link..."
 msgstr "/Opciones/Insertar enlace..."
 
-#: src/gtkconv.c:3515
+#: src/gtkconv.c:3583
 msgid "/Conversation/Insert Image..."
 msgstr "/Opciones/Insertar imagen..."
 
-#: src/gtkconv.c:3521
+#: src/gtkconv.c:3589
 msgid "/Options/Enable Logging"
 msgstr "/Opciones/_Habilitar registro"
 
-#: src/gtkconv.c:3524
+#: src/gtkconv.c:3592
 msgid "/Options/Enable Sounds"
 msgstr "/Opciones/Habilitar _sonidos"
 
-#: src/gtkconv.c:3527
+#: src/gtkconv.c:3595
 msgid "/Options/Show Formatting Toolbar"
 msgstr "/Opciones/Mostrar barra de formato"
 
-#: src/gtkconv.c:3530
+#: src/gtkconv.c:3598
 msgid "/Options/Show Timestamps"
 msgstr "/Opciones/Mostrar marcas de tiempo"
 
 #. From right to left...
 #. Send button
-#: src/gtkconv.c:3554 src/gtkconv.c:3556 src/gtkconv.c:3662 src/gtkconv.c:3664
+#: src/gtkconv.c:3622 src/gtkconv.c:3624 src/gtkconv.c:3742 src/gtkconv.c:3744
 msgid "Send"
 msgstr "Enviar"
 
 #. Now, um, just kind of all over the place. Huh?
 #. Warn button
-#: src/gtkconv.c:3570
+#: src/gtkconv.c:3638
 msgid "Warn"
 msgstr "Advertir"
 
-#: src/gtkconv.c:3573
+#: src/gtkconv.c:3641
 msgid "Warn the user"
 msgstr "Avisar al usuario"
 
 #. Block button
-#: src/gtkconv.c:3577 src/gtkprivacy.c:624 src/gtkprivacy.c:635
+#: src/gtkconv.c:3645 src/gtkprivacy.c:624 src/gtkprivacy.c:635
 msgid "Block"
 msgstr "Bloquear"
 
-#: src/gtkconv.c:3580
+#: src/gtkconv.c:3648
 msgid "Block the user"
 msgstr "Bloquear al usuario"
 
-#: src/gtkconv.c:3587
+#: src/gtkconv.c:3655
+msgid "Send a file to the user"
+msgstr "Enviar un fichero al usuario."
+
+#: src/gtkconv.c:3662
 msgid "Add the user to your buddy list"
 msgstr "Añadir al usuario a la lista de amigos"
 
-#: src/gtkconv.c:3594
+#: src/gtkconv.c:3669
 msgid "Remove the user from your buddy list"
 msgstr "Eliminar al usuario de la lista de amigos"
 
-#: src/gtkconv.c:3601 src/gtkconv.c:3944
+#: src/gtkconv.c:3676 src/gtkconv.c:4024
 msgid "Get the user's information"
 msgstr "Obtener la información del usuario"
 
 #. Invite
-#: src/gtkconv.c:3676
+#: src/gtkconv.c:3756
 msgid "Invite"
 msgstr "Invitar"
 
-#: src/gtkconv.c:3679
+#: src/gtkconv.c:3759
 msgid "Invite a user"
 msgstr "Invitar al usuario"
 
-#: src/gtkconv.c:3686
+#: src/gtkconv.c:3766
 msgid "Add the chat to your buddy list"
 msgstr "Añadir el chat a su lista de amigos"
 
-#: src/gtkconv.c:3693
+#: src/gtkconv.c:3773
 msgid "Remove the chat from your buddy list"
 msgstr "Eliminar el chat de su lista de amigos"
 
-#: src/gtkconv.c:3803
+#: src/gtkconv.c:3883
 msgid "Topic:"
 msgstr "Tema:"
 
 #. Setup the label telling how many people are in the room.
-#: src/gtkconv.c:3866
+#: src/gtkconv.c:3946
 msgid "0 people in room"
 msgstr "0 personas en la conversación"
 
-#: src/gtkconv.c:3921
+#: src/gtkconv.c:4001
 msgid "IM the user"
 msgstr "Enviar un MI al usuario"
 
-#: src/gtkconv.c:3933
+#: src/gtkconv.c:4013
 msgid "Ignore the user"
 msgstr "Ignorar al usuario"
 
-#: src/gtkconv.c:4511
+#: src/gtkconv.c:4591
 msgid "Close conversation"
 msgstr "Cerrar conversación"
 
-#: src/gtkconv.c:5056 src/gtkconv.c:5088 src/gtkconv.c:5209 src/gtkconv.c:5276
+#: src/gtkconv.c:5136 src/gtkconv.c:5168 src/gtkconv.c:5289 src/gtkconv.c:5356
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "%d persona en la conversación"
 msgstr[1] "%d personas en la conversación"
 
-#: src/gtkconv.c:5778 src/gtkconv.c:5781
+#: src/gtkconv.c:5868 src/gtkconv.c:5871
 msgid "<main>/Conversation/Close"
 msgstr "<main>/Conversación/_Cerrar"
 
-#: src/gtkconv.c:6153
+#: src/gtkconv.c:6243
 msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
-msgstr "me &lt;acción&gt;: enviar una acción estilo IRC a un amigo o a un chat."
-
-#: src/gtkconv.c:6156
+msgstr ""
+"me &lt;acción&gt;: enviar una acción estilo IRC a un amigo o a un chat."
+
+#: src/gtkconv.c:6246
 msgid ""
 "debug &lt;option&gt;:  Send various debug information to the current "
 "conversation."
-msgstr "debug &lt;opción&gt;: Enviar información de depuración sobre la conversación actual."
-
-#: src/gtkconv.c:6160
+msgstr ""
+"debug &lt;opción&gt;: Enviar información de depuración sobre la conversación "
+"actual."
+
+#: src/gtkconv.c:6250
 msgid "help:  List available commands."
 msgstr "help:  Muestra las órdenes disponibles"
 
-#: src/gtkconv.c:6164
+#: src/gtkconv.c:6254
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr "help &lt;orden&gt;:  Recibir ayuda sobre una orden concreta."
 
-#: src/gtkdebug.c:226
+#: src/gtkdebug.c:190
+msgid "Invalid file name."
+msgstr "Nombre de fichero no válido."
+
+#: src/gtkdebug.c:195
+msgid "Unable to open file."
+msgstr "No se pudo leer el fichero."
+
+#: src/gtkdebug.c:283
 msgid "Save Debug Log"
 msgstr "Guardar registro de depuración"
 
-#: src/gtkdebug.c:289
+#: src/gtkdebug.c:348
 msgid "Debug Window"
 msgstr "Ventana de depuración"
 
-#: src/gtkdebug.c:327
+#: src/gtkdebug.c:386
 msgid "Pause"
 msgstr "Pausar"
 
-#: src/gtkdebug.c:333
+#: src/gtkdebug.c:392
 msgid "Timestamps"
 msgstr "Marcas de tiempo"
 
@@ -3203,7 +3258,7 @@
 
 #: src/gtkft.c:503
 msgid "Filename"
-msgstr "Nombre de archivo"
+msgstr "Nombre de fichero"
 
 #: src/gtkft.c:510
 msgid "Size"
@@ -3215,7 +3270,7 @@
 
 #: src/gtkft.c:547
 msgid "Filename:"
-msgstr "Nombre de archivo:"
+msgstr "Nombre de fichero:"
 
 #: src/gtkft.c:548
 msgid "Status:"
@@ -3306,31 +3361,31 @@
 "Servidor remoto: %s\n"
 "Puerto remoto: %d"
 
-#: src/gtkimhtml.c:567
+#: src/gtkimhtml.c:602
 msgid "Pa_ste As Text"
 msgstr "Pe_gar como texto"
 
-#: src/gtkimhtml.c:1012
+#: src/gtkimhtml.c:1047
 msgid "Hyperlink color"
 msgstr "Color de hiperenlace"
 
-#: src/gtkimhtml.c:1013
+#: src/gtkimhtml.c:1048
 msgid "Color to draw hyperlinks."
 msgstr "Color para dibujar hiperenlaces."
 
-#: src/gtkimhtml.c:1218
+#: src/gtkimhtml.c:1253
 msgid "_Copy E-Mail Address"
 msgstr "_Copiar dirección de correo electrónico"
 
-#: src/gtkimhtml.c:1230
+#: src/gtkimhtml.c:1265
 msgid "_Copy Link Location"
 msgstr "_Copiar destino del enlace"
 
-#: src/gtkimhtml.c:1240
+#: src/gtkimhtml.c:1275
 msgid "_Open Link in Browser"
 msgstr "_Abrir enlace en navegador"
 
-#: src/gtkimhtml.c:2761
+#: src/gtkimhtml.c:2797
 msgid ""
 "Unable to guess the image type based on the file extension supplied.  "
 "Defaulting to PNG."
@@ -3338,16 +3393,16 @@
 "Gaim no ha podido deducir el tipo de imagen a partir de la extensión del "
 "archivo. Tomando PNG por omisión."
 
-#: src/gtkimhtml.c:2769
+#: src/gtkimhtml.c:2805
 #, c-format
 msgid "Error saving image: %s"
 msgstr "Error guardando imagen: %s"
 
-#: src/gtkimhtml.c:2778
+#: src/gtkimhtml.c:2814
 msgid "Save Image"
 msgstr "Guardar imagen..."
 
-#: src/gtkimhtml.c:2801
+#: src/gtkimhtml.c:2837
 msgid "_Save Image..."
 msgstr "_Guardar imagen..."
 
@@ -3454,12 +3509,12 @@
 msgid "Insert smiley"
 msgstr "Insertar emoticono"
 
-#: src/gtklog.c:282
+#: src/gtklog.c:302
 msgid "Conversations with"
 msgstr "Conversaciones con"
 
 #. Window **********
-#: src/gtklog.c:372 src/gtklog.c:388
+#: src/gtklog.c:392 src/gtklog.c:408
 msgid "System Log"
 msgstr "Registro del Sistema"
 
@@ -3509,7 +3564,7 @@
 msgstr "La orden de navegador «%s» no es válida."
 
 #: src/gtknotify.c:432 src/gtknotify.c:446 src/gtknotify.c:461
-#: src/gtknotify.c:570
+#: src/gtknotify.c:579
 msgid "Unable to open URL"
 msgstr "No se pudo abrir la URL"
 
@@ -3518,7 +3573,7 @@
 msgid "Error launching \"%s\": %s"
 msgstr "Error al ejecutar «%s»: %s"
 
-#: src/gtknotify.c:571
+#: src/gtknotify.c:580
 msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr ""
@@ -3680,15 +3735,15 @@
 msgid "Unknown pounce event. Please report this!"
 msgstr "Evento de aviso desconocido. ¡Por favor, informe de esto! "
 
-#: src/gtkprefs.c:401
+#: src/gtkprefs.c:445
 msgid "Interface Options"
 msgstr "Opciones de la interfaz"
 
-#: src/gtkprefs.c:403
+#: src/gtkprefs.c:447
 msgid "D_isplay remote nicknames if no alias is set"
 msgstr "_Mostrar los apodos remotos si no se ha establecido un apodo"
 
-#: src/gtkprefs.c:627
+#: src/gtkprefs.c:671
 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."
@@ -3696,316 +3751,322 @@
 "Seleccione de la lista inferior el tema de emoticonos que desee. Puede "
 "instalar temas nuevos arrastrándolos y soltándolos sobre esta lista de temas."
 
-#: src/gtkprefs.c:667
+#: src/gtkprefs.c:711
 msgid "Icon"
 msgstr "Icono"
 
-#: src/gtkprefs.c:674 src/gtkprefs.c:2199 src/protocols/jabber/buddy.c:265
-#: src/protocols/jabber/buddy.c:749 src/protocols/jabber/chat.c:701
+#: src/gtkprefs.c:718 src/gtkprefs.c:2244 src/protocols/jabber/buddy.c:264
+#: src/protocols/jabber/buddy.c:748 src/protocols/jabber/chat.c:701
 msgid "Description"
 msgstr "Descripción"
 
-#: src/gtkprefs.c:770
+#: src/gtkprefs.c:814
 msgid "Display"
 msgstr "Mostrar"
 
-#: src/gtkprefs.c:771
+#: src/gtkprefs.c:815
 msgid "Show _timestamp on messages"
 msgstr "Mostrar la _hora en los mensajes"
 
-#: src/gtkprefs.c:774
+#: src/gtkprefs.c:818
 msgid "_Highlight misspelled words"
 msgstr "_Resaltar las faltas de ortografía"
 
-#: src/gtkprefs.c:779
+#: src/gtkprefs.c:823
 msgid "Ignore c_olors"
 msgstr "Ignorar c_olores"
 
-#: src/gtkprefs.c:781
+#: src/gtkprefs.c:825
 msgid "Ignore font _faces"
 msgstr "Ignorar _aspectos de la tipografía"
 
-#: src/gtkprefs.c:783
+#: src/gtkprefs.c:827
 msgid "Ignore font si_zes"
 msgstr "Ignorar t_amaños de tipografía"
 
-#: src/gtkprefs.c:786
+#: src/gtkprefs.c:830
 msgid "_Ignore formatting on incoming messages"
 msgstr "_Ignorar el formato de los mensajes entrantes."
 
-#: src/gtkprefs.c:790
+#: src/gtkprefs.c:834
 msgid "Default Formatting"
 msgstr "Formato por omisión"
 
-#: src/gtkprefs.c:792
+#: src/gtkprefs.c:836
 msgid "_Send default formatting with outgoing messages"
 msgstr "_Enviar formato por omisión en los mensajes salientes"
 
-#: src/gtkprefs.c:824
+#: src/gtkprefs.c:868
 msgid ""
 "This is how your outgoing message text will appear when you use protocols "
 "that support formatting. :)"
-msgstr "Así se verá el texto de sus mensajes salientes cuando utilice protocolos que soportan formatos. :)"
-
-#: src/gtkprefs.c:827
+msgstr ""
+"Así se verá el texto de sus mensajes salientes cuando utilice protocolos que "
+"soportan formatos. :)"
+
+#: src/gtkprefs.c:871
 msgid "_Clear Formatting"
 msgstr "_Limpiar formatos"
 
-#: src/gtkprefs.c:864
+#: src/gtkprefs.c:908
 msgid "Send Message"
 msgstr "Envío de mensajes"
 
-#: src/gtkprefs.c:865
+#: src/gtkprefs.c:909
 msgid "Enter _sends message"
 msgstr "«Enter» _envía el mensaje"
 
-#: src/gtkprefs.c:867
+#: src/gtkprefs.c:911
 msgid "C_ontrol-Enter sends message"
 msgstr "«C_ontrol-Enter» envía el mensaje"
 
-#: src/gtkprefs.c:870
+#: src/gtkprefs.c:914
 msgid "Window Closing"
 msgstr "Cierre de Ventanas"
 
-#: src/gtkprefs.c:871
+#: src/gtkprefs.c:915
 msgid "_Escape closes window"
 msgstr "«E_scape» cierra la ventana"
 
-#: src/gtkprefs.c:874
+#: src/gtkprefs.c:918
 msgid "Insertions"
 msgstr "Inserciones"
 
-#: src/gtkprefs.c:875
+#: src/gtkprefs.c:919
 msgid "Control-{B/I/U} changes _formatting"
 msgstr "«Control-{B/I/U}» introduce _formatos"
 
-#: src/gtkprefs.c:877
+#: src/gtkprefs.c:921
 msgid "Control-(number) _inserts smileys"
 msgstr "«Control-(número)» _inserta emoticonos"
 
-#: src/gtkprefs.c:893
+#: src/gtkprefs.c:937
 msgid "Buddy List Sorting"
 msgstr "Orden de la lista de amigos"
 
-#: src/gtkprefs.c:902
+#: src/gtkprefs.c:946
 msgid "_Sorting:"
 msgstr "Orden:"
 
-#: src/gtkprefs.c:908 src/gtkprefs.c:961
+#: src/gtkprefs.c:952 src/gtkprefs.c:1005
 msgid "Show _buttons as:"
 msgstr "Mostrar los _botones como:"
 
-#: src/gtkprefs.c:910 src/gtkprefs.c:963
+#: src/gtkprefs.c:954 src/gtkprefs.c:1007
 msgid "Pictures"
 msgstr "Imágenes"
 
-#: src/gtkprefs.c:911 src/gtkprefs.c:964
+#: src/gtkprefs.c:955 src/gtkprefs.c:1008
 msgid "Text"
 msgstr "Texto"
 
-#: src/gtkprefs.c:912 src/gtkprefs.c:965
+#: src/gtkprefs.c:956 src/gtkprefs.c:1009
 msgid "Pictures and text"
 msgstr "Imágenes y texto"
 
-#: src/gtkprefs.c:915
+#: src/gtkprefs.c:959
 msgid "_Raise window on events"
 msgstr "_Alzar ventanas al recibir un evento"
 
-#: src/gtkprefs.c:918
+#: src/gtkprefs.c:962
 msgid "Buddy Display"
 msgstr "Mostrar amigos"
 
-#: src/gtkprefs.c:919 src/gtkprefs.c:979
+#: src/gtkprefs.c:963 src/gtkprefs.c:1023
 msgid "Show buddy _icons"
 msgstr "Mostrar _iconos de los amigos"
 
-#: src/gtkprefs.c:921
+#: src/gtkprefs.c:965
 msgid "Show _warning levels"
 msgstr "Mostrar niveles de _aviso"
 
-#: src/gtkprefs.c:923
+#: src/gtkprefs.c:967
 msgid "Show idle _times"
 msgstr "Mostrar el _tiempo de inactividad"
 
-#: src/gtkprefs.c:925
+#: src/gtkprefs.c:969
 msgid "Dim i_dle buddies"
 msgstr "Poner en g_ris los amigos inactivos"
 
-#: src/gtkprefs.c:927
+#: src/gtkprefs.c:971
 msgid "_Automatically expand contacts"
 msgstr "Expandir contactos _automáticamente"
 
-#: src/gtkprefs.c:972
+#: src/gtkprefs.c:1016
 msgid "Enable \"_slash\" commands"
 msgstr "Activar órdenes \"_barra\""
 
-#: src/gtkprefs.c:975
+#: src/gtkprefs.c:1019
 msgid "Show _formatting toolbar"
 msgstr "Mostrar barra de _formato"
 
-#: src/gtkprefs.c:977
+#: src/gtkprefs.c:1021
 msgid "Show _aliases in tabs/titles"
 msgstr "Mostrar _apodos en las solapas/títulos"
 
-#: src/gtkprefs.c:981
+#: src/gtkprefs.c:1025
 msgid "Enable buddy ic_on animation"
 msgstr "Habilitar animaciones en los i_conos de amigos"
 
-#: src/gtkprefs.c:983
+#: src/gtkprefs.c:1027
 msgid "_Notify buddies that you are typing to them"
 msgstr "_Notificar a los amigos cuando les esté escribiendo"
 
-#: src/gtkprefs.c:985
+#: src/gtkprefs.c:1029
 msgid "_Raise IM window on events"
 msgstr "_Alzar ventanas de MI al recibir un evento"
 
-#: src/gtkprefs.c:988
+#: src/gtkprefs.c:1032
 msgid "Raise chat _window on events"
 msgstr "Alzar _ventanas de chat al recibir un evento"
 
-#: src/gtkprefs.c:990
+#: src/gtkprefs.c:1034
 msgid "Use _multi-colored screen names in chats"
 msgstr "Utilizar nombres de usuario _multicolor en chats"
 
 #. All the tab options!
-#: src/gtkprefs.c:994
+#: src/gtkprefs.c:1038
 msgid "Tab Options"
 msgstr "Opciones de las solapas"
 
-#: src/gtkprefs.c:996
+#: src/gtkprefs.c:1040
 msgid "Show IMs and chats in _tabbed windows"
 msgstr "Mostrar MIs y chats en ventanas distintas con solapas."
 
-#: src/gtkprefs.c:1011
+#: src/gtkprefs.c:1055
 msgid "Show _close button on tabs"
 msgstr "Mostrar botones de _cierre en las solapas."
 
-#: src/gtkprefs.c:1014
+#: src/gtkprefs.c:1058
 msgid "Tab p_lacement:"
 msgstr "_Ubicación de las solapas:"
 
-#: src/gtkprefs.c:1016
+#: src/gtkprefs.c:1060
 msgid "Top"
 msgstr "Arriba"
 
-#: src/gtkprefs.c:1017
+#: src/gtkprefs.c:1061
 msgid "Bottom"
 msgstr "Abajo"
 
-#: src/gtkprefs.c:1018
+#: src/gtkprefs.c:1062
 msgid "Left"
 msgstr "Izquierda"
 
-#: src/gtkprefs.c:1019
+#: src/gtkprefs.c:1063
 msgid "Right"
 msgstr "Derecha"
 
-#: src/gtkprefs.c:1025
+#: src/gtkprefs.c:1069
 msgid "New conversation _placement:"
 msgstr "U_bicación de las nuevas conversaciones:"
 
-#: src/gtkprefs.c:1076 src/protocols/oscar/oscar.c:592
-#: src/protocols/oscar/oscar.c:4837
+#: src/gtkprefs.c:1120 src/protocols/oscar/oscar.c:596
+#: src/protocols/oscar/oscar.c:4853
 msgid "IP Address"
 msgstr "Dirección IP"
 
-#: src/gtkprefs.c:1078
+#: src/gtkprefs.c:1122
 msgid "_Autodetect IP Address"
 msgstr "_Autodetectar la dirección IP"
 
-#: src/gtkprefs.c:1087
+#: src/gtkprefs.c:1131
 msgid "Public _IP:"
 msgstr "_IP pública:"
 
-#: src/gtkprefs.c:1111
+#: src/gtkprefs.c:1155
 msgid "Ports"
 msgstr "Puertos"
 
-#: src/gtkprefs.c:1114
+#: src/gtkprefs.c:1158
 msgid "_Manually specify range of ports to listen on"
 msgstr "Especificar _manualmente el rango de puertos en el que se escuchará:"
 
-#: src/gtkprefs.c:1117
+#: src/gtkprefs.c:1161
 msgid "_Start Port:"
 msgstr "Puerto _inicial:"
 
-#: src/gtkprefs.c:1124
+#: src/gtkprefs.c:1168
 msgid "_End Port:"
 msgstr "Puerto _final:"
 
-#: src/gtkprefs.c:1131
+#: src/gtkprefs.c:1175
 msgid "Proxy Server"
 msgstr "Servidor proxy"
 
-#: src/gtkprefs.c:1135
+#: src/gtkprefs.c:1179
 msgid "No proxy"
 msgstr "Sin proxy"
 
-#: src/gtkprefs.c:1197
+#: src/gtkprefs.c:1241
 msgid "_User:"
 msgstr "_Usuario:"
 
-#: src/gtkprefs.c:1253
-msgid "Opera"
-msgstr "Opera"
-
-#: src/gtkprefs.c:1254
-msgid "Netscape"
-msgstr "Netscape"
-
-#: src/gtkprefs.c:1255
-msgid "Mozilla"
-msgstr "Mozilla"
-
-#: src/gtkprefs.c:1256
-msgid "Konqueror"
-msgstr "Konqueror"
-
-#: src/gtkprefs.c:1257
-msgid "Galeon"
-msgstr "Galeon"
-
-#: src/gtkprefs.c:1258
+#: src/gtkprefs.c:1297
+msgid "Epiphany"
+msgstr "Epiphany"
+
+#: src/gtkprefs.c:1298
 msgid "Firebird"
 msgstr "Firebird"
 
-#: src/gtkprefs.c:1259
+#: src/gtkprefs.c:1299
 msgid "Firefox"
 msgstr "Firefox"
 
-#: src/gtkprefs.c:1260
+#: src/gtkprefs.c:1300
+msgid "Galeon"
+msgstr "Galeon"
+
+#: src/gtkprefs.c:1301
 msgid "Gnome Default"
 msgstr "Valores por omisión de Gnome"
 
-#: src/gtkprefs.c:1269
+#: src/gtkprefs.c:1302
+msgid "Konqueror"
+msgstr "Konqueror"
+
+#: src/gtkprefs.c:1303
+msgid "Mozilla"
+msgstr "Mozilla"
+
+#: src/gtkprefs.c:1304
+msgid "Netscape"
+msgstr "Netscape"
+
+#: src/gtkprefs.c:1305
+msgid "Opera"
+msgstr "Opera"
+
+#: src/gtkprefs.c:1314
 msgid "Manual"
 msgstr "Manual"
 
-#: src/gtkprefs.c:1320
+#: src/gtkprefs.c:1365
 msgid "Browser Selection"
 msgstr "Selección de navegador"
 
-#: src/gtkprefs.c:1324
+#: src/gtkprefs.c:1369
 msgid "_Browser:"
 msgstr "_Navegador:"
 
-#: src/gtkprefs.c:1331
+#: src/gtkprefs.c:1376
 msgid "_Open link in:"
 msgstr "_Abrir enlace en:"
 
-#: src/gtkprefs.c:1333
+#: src/gtkprefs.c:1378
 msgid "Browser default"
 msgstr "Navegador por omisión"
 
-#: src/gtkprefs.c:1334
+#: src/gtkprefs.c:1379
 msgid "Existing window"
 msgstr "Ventana existente"
 
-#: src/gtkprefs.c:1336
+#: src/gtkprefs.c:1381
 msgid "New tab"
 msgstr "Nueva pestaña"
 
-#: src/gtkprefs.c:1350
+#: src/gtkprefs.c:1395
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -4014,83 +4075,83 @@
 "_Manual:\n"
 "(%s para URL)"
 
-#: src/gtkprefs.c:1387
+#: src/gtkprefs.c:1432
 msgid "Message Logs"
 msgstr "Registro de mensajes"
 
-#: src/gtkprefs.c:1390
+#: src/gtkprefs.c:1435
 msgid "Log _Format:"
 msgstr "Formato de _registro:"
 
-#: src/gtkprefs.c:1393
+#: src/gtkprefs.c:1438
 msgid "_Log all instant messages"
 msgstr "Registrar _todos mensaje instantáneo"
 
-#: src/gtkprefs.c:1395
+#: src/gtkprefs.c:1440
 msgid "Log all c_hats"
 msgstr "Registrar todas las _charlas"
 
-#: src/gtkprefs.c:1398
+#: src/gtkprefs.c:1443
 msgid "System Logs"
 msgstr "Registros del sistema"
 
-#: src/gtkprefs.c:1400
+#: src/gtkprefs.c:1445
 msgid "_Enable system log"
 msgstr "_Habilitar registro del sistema"
 
-#: src/gtkprefs.c:1403
+#: src/gtkprefs.c:1448
 msgid "Log when buddies _sign on/sign off"
 msgstr "Registrar cuándo se _conectan/desconectan los amigos"
 
-#: src/gtkprefs.c:1409
+#: src/gtkprefs.c:1454
 msgid "Log when buddies become _idle/un-idle"
 msgstr "Registrar cuándo los amigos están _activos/inactivos"
 
-#: src/gtkprefs.c:1415
+#: src/gtkprefs.c:1460
 msgid "Log when buddies go away/come _back"
 msgstr "Registrar cuándo los amigos se ausentan/_regresan"
 
-#: src/gtkprefs.c:1421
+#: src/gtkprefs.c:1466
 msgid "Log your _own signons/idleness/awayness"
 msgstr "Registrar sus _propias conexiones/ausencias/inactividades"
 
-#: src/gtkprefs.c:1559
+#: src/gtkprefs.c:1604
 msgid "Sound Selection"
 msgstr "Selección de sonido"
 
-#: src/gtkprefs.c:1634
+#: src/gtkprefs.c:1679
 msgid "Sound Options"
 msgstr "Opciones de sonido"
 
-#: src/gtkprefs.c:1635
+#: src/gtkprefs.c:1680
 msgid "Sounds when conversation has _focus"
 msgstr "Suena cuando la conversación obtiene el _foco"
 
-#: src/gtkprefs.c:1637
+#: src/gtkprefs.c:1682
 msgid "_Sounds while away"
 msgstr "_Sonidos mientras vd. está ausente"
 
-#: src/gtkprefs.c:1641
+#: src/gtkprefs.c:1686
 msgid "Sound Method"
 msgstr "Método para reproducir sonidos"
 
-#: src/gtkprefs.c:1642
+#: src/gtkprefs.c:1687
 msgid "_Method:"
 msgstr "_Método:"
 
-#: src/gtkprefs.c:1644
+#: src/gtkprefs.c:1689
 msgid "Console beep"
 msgstr "Timbre de la consola"
 
-#: src/gtkprefs.c:1646
+#: src/gtkprefs.c:1691
 msgid "Automatic"
 msgstr "Automático"
 
-#: src/gtkprefs.c:1653
+#: src/gtkprefs.c:1698
 msgid "Command"
 msgstr "Comando"
 
-#: src/gtkprefs.c:1661
+#: src/gtkprefs.c:1706
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -4099,86 +4160,86 @@
 "_Comando para sonido:\n"
 "(%s para nombre de archivo)"
 
-#: src/gtkprefs.c:1688
+#: src/gtkprefs.c:1733
 msgid "Sound Events"
 msgstr "Eventos de sonido"
 
-#: src/gtkprefs.c:1739
+#: src/gtkprefs.c:1784
 msgid "Play"
 msgstr "Reproducir"
 
-#: src/gtkprefs.c:1746
+#: src/gtkprefs.c:1791
 msgid "Event"
 msgstr "Acontecimiento"
 
-#: src/gtkprefs.c:1765
+#: src/gtkprefs.c:1810
 msgid "Test"
 msgstr "Probar"
 
-#: src/gtkprefs.c:1769
+#: src/gtkprefs.c:1814
 msgid "Reset"
 msgstr "Restablecer"
 
-#: src/gtkprefs.c:1773
+#: src/gtkprefs.c:1818
 msgid "Choose..."
 msgstr "Seleccionar..."
 
-#: src/gtkprefs.c:1797
+#: src/gtkprefs.c:1842
 msgid "_Queue new messages when away"
 msgstr "En_colar mensajes nuevos durante las ausencias"
 
-#: src/gtkprefs.c:1800
+#: src/gtkprefs.c:1845
 msgid "Auto-response"
 msgstr "Respuesta automática"
 
-#: src/gtkprefs.c:1801
+#: src/gtkprefs.c:1846
 msgid "_Send auto-response"
 msgstr "_Enviar respuesta automática"
 
-#: src/gtkprefs.c:1803
+#: src/gtkprefs.c:1848
 msgid "_Only send auto-response when idle"
 msgstr "Sólo enviar la respuesta automática cuando esté _inactivo"
 
-#: src/gtkprefs.c:1806 src/protocols/msn/msn.c:1175
+#: src/gtkprefs.c:1851 src/protocols/msn/msn.c:1166
 #: src/protocols/msn/state.c:32 src/protocols/novell/novell.c:2730
-#: src/protocols/oscar/oscar.c:3994 src/protocols/yahoo/yahoo.c:2497
+#: src/protocols/oscar/oscar.c:4010 src/protocols/yahoo/yahoo.c:2511
 #: src/protocols/yahoo/yahoo_profile.c:653
 msgid "Idle"
 msgstr "Está inactivo"
 
-#: src/gtkprefs.c:1807
+#: src/gtkprefs.c:1852
 msgid "Idle _time reporting:"
 msgstr "Informe de _tiempo de inactividad:"
 
-#: src/gtkprefs.c:1810
+#: src/gtkprefs.c:1855
 msgid "Gaim usage"
 msgstr "Uso de Gaim"
 
-#: src/gtkprefs.c:1813
+#: src/gtkprefs.c:1858
 msgid "X usage"
 msgstr "Uso de X"
 
-#: src/gtkprefs.c:1815
+#: src/gtkprefs.c:1860
 msgid "Windows usage"
 msgstr "Uso de Windows"
 
-#: src/gtkprefs.c:1823
+#: src/gtkprefs.c:1868
 msgid "Auto-away"
 msgstr "Auto-ausencia"
 
-#: src/gtkprefs.c:1824
+#: src/gtkprefs.c:1869
 msgid "Set away _when idle"
 msgstr "Establecer como _ausente cuando esté inactivo"
 
-#: src/gtkprefs.c:1828
+#: src/gtkprefs.c:1873
 msgid "_Minutes before setting away:"
 msgstr "_Minutos antes de establecerlo como ausente:"
 
-#: src/gtkprefs.c:1836
+#: src/gtkprefs.c:1881
 msgid "Away m_essage:"
 msgstr "_Mensaje de ausencia:"
 
-#: src/gtkprefs.c:1917
+#: src/gtkprefs.c:1962
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -4191,9 +4252,9 @@
 "\n"
 "<span weight=\"bold\">Escrito por:</span>\t%s\n"
 "<span weight=\"bold\">Sitio Web:</span>\t\t%s\n"
-"<span weight=\"bold\">Nombre del archivo:</span>\t%s"
-
-#: src/gtkprefs.c:1922
+"<span weight=\"bold\">Nombre del fichero:</span>\t%s"
+
+#: src/gtkprefs.c:1967
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -4206,66 +4267,66 @@
 "\n"
 "<span weight=\"bold\">Escrito por:</span>  %s\n"
 "<span weight=\"bold\">URL:</span>  %s\n"
-"<span weight=\"bold\">Nombre del archivo:</span>  %s"
-
-#: src/gtkprefs.c:2155
+"<span weight=\"bold\">Nombre del fichero:</span>  %s"
+
+#: src/gtkprefs.c:2200
 msgid "Load"
 msgstr "Cargar"
 
-#: src/gtkprefs.c:2169
+#: src/gtkprefs.c:2214
 msgid "Summary"
 msgstr "Resumen"
 
-#: src/gtkprefs.c:2217
+#: src/gtkprefs.c:2262
 msgid "Details"
 msgstr "Detalles"
 
-#: src/gtkprefs.c:2362
+#: src/gtkprefs.c:2407
 msgid "_Edit"
 msgstr "_Editar"
 
-#: src/gtkprefs.c:2398
+#: src/gtkprefs.c:2443
 msgid "Interface"
 msgstr "Interfaz"
 
-#: src/gtkprefs.c:2401
+#: src/gtkprefs.c:2446
 msgid "Message Text"
 msgstr "Texto de los mensajes"
 
-#: src/gtkprefs.c:2402
+#: src/gtkprefs.c:2447
 msgid "Shortcuts"
 msgstr "Atajos"
 
-#: src/gtkprefs.c:2403
+#: src/gtkprefs.c:2448
 msgid "Smiley Themes"
 msgstr "Temas de emoticonos"
 
-#: src/gtkprefs.c:2404
+#: src/gtkprefs.c:2449
 msgid "Sounds"
 msgstr "Sonidos"
 
-#: src/gtkprefs.c:2405
+#: src/gtkprefs.c:2450
 msgid "Network"
 msgstr "Red"
 
 #. We use the registered default browser in windows
-#: src/gtkprefs.c:2408
+#: src/gtkprefs.c:2453
 msgid "Browser"
 msgstr "Navegador"
 
-#: src/gtkprefs.c:2410
+#: src/gtkprefs.c:2455
 msgid "Logging"
 msgstr "Registro"
 
-#: src/gtkprefs.c:2411
+#: src/gtkprefs.c:2456
 msgid "Away / Idle"
 msgstr "Ausencia / Inactividad"
 
-#: src/gtkprefs.c:2412
+#: src/gtkprefs.c:2457
 msgid "Away Messages"
 msgstr "Mensajes de ausencia"
 
-#: src/gtkprefs.c:2415
+#: src/gtkprefs.c:2460
 msgid "Plugins"
 msgstr "Complementos"
 
@@ -4289,7 +4350,7 @@
 msgid "Block only the users below"
 msgstr "Bloquear sólo los siguientes usuarios"
 
-#: src/gtkprivacy.c:385 src/protocols/jabber/jabber.c:1448
+#: src/gtkprivacy.c:385 src/protocols/jabber/jabber.c:1449
 msgid "Privacy"
 msgstr "Privacidad"
 
@@ -4355,13 +4416,13 @@
 #. *
 #. * A wrapper for gaim_request_action() that uses Yes and No buttons.
 #.
-#: src/gtkrequest.c:233 src/protocols/gg/gg.c:867
+#: src/gtkrequest.c:233 src/protocols/gg/gg.c:949
 #: src/protocols/novell/novell.c:1845 src/protocols/silc/buddy.c:307
 #: src/protocols/silc/pk.c:116 src/request.h:1233
 msgid "Yes"
 msgstr "Sí"
 
-#: src/gtkrequest.c:234 src/protocols/gg/gg.c:867
+#: src/gtkrequest.c:234 src/protocols/gg/gg.c:949
 #: src/protocols/novell/novell.c:1846 src/protocols/silc/buddy.c:308
 #: src/protocols/silc/pk.c:117 src/request.h:1233
 msgid "No"
@@ -4599,12 +4660,12 @@
 msgstr "Opción por omisión un poco menos aburrida"
 
 #: src/protocols/gg/gg.c:49 src/protocols/jabber/jutil.c:44
-#: src/protocols/msn/msn.c:466 src/protocols/msn/state.c:29
+#: src/protocols/msn/msn.c:462 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:2721
 #: src/protocols/novell/novell.c:2840 src/protocols/novell/novell.c:2891
-#: src/protocols/oscar/oscar.c:611 src/protocols/yahoo/yahoo.c:2856
-#: src/protocols/yahoo/yahoo.c:2972
+#: src/protocols/oscar/oscar.c:616 src/protocols/yahoo/yahoo.c:2851
+#: src/protocols/yahoo/yahoo.c:2967
 msgid "Available"
 msgstr "Disponible"
 
@@ -4616,12 +4677,12 @@
 msgid "Away for friends only"
 msgstr "Ausente sólo para los amigos"
 
-#: src/protocols/gg/gg.c:53 src/protocols/jabber/jabber.c:963
-#: src/protocols/jabber/presence.c:126 src/protocols/oscar/oscar.c:532
-#: src/protocols/oscar/oscar.c:5378 src/protocols/oscar/oscar.c:5456
-#: src/protocols/oscar/oscar.c:5480 src/protocols/oscar/oscar.c:6668
-#: src/protocols/oscar/oscar.c:6673 src/protocols/yahoo/yahoo.c:2495
-#: src/protocols/yahoo/yahoo.c:2876 src/protocols/yahoo/yahoo.c:2984
+#: src/protocols/gg/gg.c:53 src/protocols/jabber/jabber.c:964
+#: src/protocols/jabber/presence.c:126 src/protocols/oscar/oscar.c:536
+#: src/protocols/oscar/oscar.c:5394 src/protocols/oscar/oscar.c:5472
+#: src/protocols/oscar/oscar.c:5496 src/protocols/oscar/oscar.c:6684
+#: src/protocols/oscar/oscar.c:6689 src/protocols/yahoo/yahoo.c:2509
+#: src/protocols/yahoo/yahoo.c:2871 src/protocols/yahoo/yahoo.c:2979
 msgid "Invisible"
 msgstr "Invisible"
 
@@ -4644,7 +4705,7 @@
 #: src/protocols/gg/gg.c:142 src/protocols/jabber/auth.c:130
 #: src/protocols/jabber/auth.c:204 src/protocols/jabber/auth.c:354
 #: src/protocols/jabber/auth.c:452 src/protocols/jabber/auth.c:464
-#: src/protocols/jabber/jabber.c:105
+#: src/protocols/jabber/jabber.c:106
 msgid "Invalid response from server."
 msgstr "Respuesta inválida del servidor."
 
@@ -4664,175 +4725,180 @@
 msgid "Unknown Error Code."
 msgstr "Código de error desconocido."
 
-#: src/protocols/gg/gg.c:253
+#: src/protocols/gg/gg.c:242 src/protocols/oscar/oscar.c:3819
+#, c-format
+msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<HR>%s"
+msgstr "<B>UIN:</B> %s<BR><B>Estado:</B> %s<HR>%s"
+
+#. res[0] == username
+#. show it to the user
+#: src/protocols/gg/gg.c:243 src/protocols/gg/gg.c:1011
+#: src/protocols/msn/msn.c:1235 src/protocols/msn/msn.c:1543
+#: src/protocols/msn/msn.c:1559 src/protocols/napster/napster.c:393
+#: src/protocols/oscar/oscar.c:3823 src/protocols/oscar/oscar.c:4039
+#: src/protocols/toc/toc.c:468 src/protocols/yahoo/yahoo_profile.c:748
+#: src/protocols/yahoo/yahoo_profile.c:785
+#: src/protocols/yahoo/yahoo_profile.c:837
+#: src/protocols/yahoo/yahoo_profile.c:1132 src/protocols/zephyr/zephyr.c:635
+msgid "Buddy Information"
+msgstr "Información de amigos"
+
+#: src/protocols/gg/gg.c:293
 #, c-format
 msgid "Status: %s"
 msgstr "Estado: %s"
 
-#: src/protocols/gg/gg.c:406
+#: src/protocols/gg/gg.c:446
 msgid "Could not connect"
 msgstr "No se pudo conectar"
 
-#: src/protocols/gg/gg.c:413
+#: src/protocols/gg/gg.c:453
 msgid "Unable to read socket"
 msgstr "No se pudo leer el socket"
 
 #. we didn't successfully connect. tdt->toc_fd is valid here
-#: src/protocols/gg/gg.c:600 src/protocols/icq/gaim_icq.c:344
+#: src/protocols/gg/gg.c:674 src/protocols/icq/gaim_icq.c:344
 #: src/protocols/napster/napster.c:475 src/protocols/napster/napster.c:506
-#: src/protocols/toc/toc.c:170 src/protocols/yahoo/yahoo.c:2136
-#: src/protocols/yahoo/yahoo.c:2165 src/protocols/yahoo/yahoo.c:2228
+#: src/protocols/toc/toc.c:170 src/protocols/yahoo/yahoo.c:2156
+#: src/protocols/yahoo/yahoo.c:2185 src/protocols/yahoo/yahoo.c:2248
 #: src/protocols/yahoo/yahoo_filexfer.c:68
 #: src/protocols/yahoo/yahoo_filexfer.c:109
 msgid "Unable to connect."
 msgstr "No se pudo conectar."
 
-#: src/protocols/gg/gg.c:616
+#: src/protocols/gg/gg.c:690
 msgid "Reading data"
 msgstr "Leyendo datos"
 
-#: src/protocols/gg/gg.c:619
+#: src/protocols/gg/gg.c:693
 msgid "Balancer handshake"
 msgstr "Negociación del balanceador"
 
-#: src/protocols/gg/gg.c:622
+#: src/protocols/gg/gg.c:696
 msgid "Reading server key"
 msgstr "Leyendo la clave del servidor"
 
-#: src/protocols/gg/gg.c:625
+#: src/protocols/gg/gg.c:699
 msgid "Exchanging key hash"
 msgstr "Intercambiando el hash de la clave"
 
-#: src/protocols/gg/gg.c:635
+#: src/protocols/gg/gg.c:709
 msgid "Critical error in GG library\n"
 msgstr "Error crítico en la biblioteca GG\n"
 
-#: src/protocols/gg/gg.c:653 src/protocols/gg/gg.c:744
+#: src/protocols/gg/gg.c:727 src/protocols/gg/gg.c:818
 #: src/protocols/toc/toc.c:146
 #, c-format
 msgid "Connect to %s failed"
 msgstr "Falló la conexión a %s"
 
-#: src/protocols/gg/gg.c:701
+#: src/protocols/gg/gg.c:775
 msgid "Unable to ping server"
 msgstr "No se pudo hacer ping al servidor"
 
-#: src/protocols/gg/gg.c:713
+#: src/protocols/gg/gg.c:787
 msgid "Send as message"
 msgstr "Enviar como mensaje"
 
-#: src/protocols/gg/gg.c:718
+#: src/protocols/gg/gg.c:792
 msgid "Looking up GG server"
 msgstr "Buscando servidor GG"
 
-#: src/protocols/gg/gg.c:721
+#: src/protocols/gg/gg.c:795
 msgid "Invalid Gadu-Gadu UIN specified"
 msgstr "El UIN Gadu-Gadu especificado es inválido"
 
-#: src/protocols/gg/gg.c:768
+#: src/protocols/gg/gg.c:842
 msgid "You are trying to send a message to an invalid Gadu-Gadu UIN."
 msgstr "Está intentando enviar un mensaje a un UIN Gadu-Gadu inválido."
 
-#: src/protocols/gg/gg.c:835
+#: src/protocols/gg/gg.c:917
 msgid "Couldn't get search results"
 msgstr "No se pudieron obtener los resultados de la búsqueda"
 
-#: src/protocols/gg/gg.c:840
+#: src/protocols/gg/gg.c:922
 msgid "Gadu-Gadu Search Engine"
 msgstr "Motor de búsquedas de Gadu-Gadu"
 
-#: src/protocols/gg/gg.c:866
+#: src/protocols/gg/gg.c:948
 msgid "Active"
 msgstr "Activo"
 
-#: src/protocols/gg/gg.c:871 src/protocols/oscar/oscar.c:4829
+#: src/protocols/gg/gg.c:953 src/protocols/oscar/oscar.c:4845
 msgid "UIN"
 msgstr "UIN"
 
 #. First Name
-#: src/protocols/gg/gg.c:875 src/protocols/jabber/jabber.c:612
-#: src/protocols/oscar/oscar.c:4840 src/protocols/silc/ops.c:784
+#: src/protocols/gg/gg.c:957 src/protocols/jabber/jabber.c:613
+#: src/protocols/oscar/oscar.c:4856 src/protocols/silc/ops.c:784
 #: src/protocols/trepia/trepia.c:267
 msgid "First Name"
 msgstr "Nombre"
 
 #. Last Name
-#: src/protocols/gg/gg.c:880 src/protocols/jabber/jabber.c:617
-#: src/protocols/oscar/oscar.c:4841 src/protocols/trepia/trepia.c:274
+#: src/protocols/gg/gg.c:962 src/protocols/jabber/jabber.c:618
+#: src/protocols/oscar/oscar.c:4857 src/protocols/trepia/trepia.c:274
 msgid "Last Name"
 msgstr "Apellidos"
 
-#: src/protocols/gg/gg.c:884 src/protocols/gg/gg.c:1623
-#: src/protocols/irc/msgs.c:183 src/protocols/oscar/oscar.c:4830
+#: src/protocols/gg/gg.c:966 src/protocols/gg/gg.c:1707
+#: src/protocols/irc/msgs.c:183 src/protocols/oscar/oscar.c:4846
 msgid "Nick"
 msgstr "Apodo"
 
-#: src/protocols/gg/gg.c:891 src/protocols/gg/gg.c:894
+#: src/protocols/gg/gg.c:973 src/protocols/gg/gg.c:976
 msgid "Birth Year"
 msgstr "Año de nacimiento"
 
-#: src/protocols/gg/gg.c:900 src/protocols/gg/gg.c:902
-#: src/protocols/gg/gg.c:904
+#: src/protocols/gg/gg.c:982 src/protocols/gg/gg.c:984
+#: src/protocols/gg/gg.c:986
 msgid "Sex"
 msgstr "Sexo"
 
 #. City
-#: src/protocols/gg/gg.c:908 src/protocols/jabber/jabber.c:627
-#: src/protocols/oscar/oscar.c:4884 src/protocols/oscar/oscar.c:4892
+#: src/protocols/gg/gg.c:990 src/protocols/jabber/jabber.c:628
+#: src/protocols/oscar/oscar.c:4900 src/protocols/oscar/oscar.c:4908
 #: src/protocols/trepia/trepia.c:331 src/protocols/trepia/trepia.c:410
 msgid "City"
 msgstr "Ciudad"
 
-#. res[0] == username
-#. show it to the user
-#: src/protocols/gg/gg.c:929 src/protocols/msn/msn.c:1244
-#: src/protocols/msn/msn.c:1552 src/protocols/msn/msn.c:1568
-#: src/protocols/napster/napster.c:393 src/protocols/oscar/oscar.c:3807
-#: src/protocols/oscar/oscar.c:4023 src/protocols/toc/toc.c:468
-#: src/protocols/yahoo/yahoo_profile.c:748
-#: src/protocols/yahoo/yahoo_profile.c:785
-#: src/protocols/yahoo/yahoo_profile.c:837
-#: src/protocols/yahoo/yahoo_profile.c:1132 src/protocols/zephyr/zephyr.c:610
-msgid "Buddy Information"
-msgstr "Información de amigos"
-
-#: src/protocols/gg/gg.c:951
+#: src/protocols/gg/gg.c:1033
 msgid "There is no Buddy List stored on the Gadu-Gadu server."
 msgstr "No hay una lista de amigos almacenada en el servidor Gadu-Gadu."
 
-#: src/protocols/gg/gg.c:959
+#: src/protocols/gg/gg.c:1041
 msgid "Couldn't Import Buddy List from Server"
 msgstr "No se pudo importar la lista de amigos del servidor"
 
-#: src/protocols/gg/gg.c:1021
+#: src/protocols/gg/gg.c:1103
 msgid "Buddy List successfully transferred to Gadu-Gadu server"
 msgstr "Se envío la lista de amigos correctamente al servidor Gadu-Gadu"
 
-#: src/protocols/gg/gg.c:1029
+#: src/protocols/gg/gg.c:1111
 msgid "Couldn't transfer Buddy List to Gadu-Gadu server"
 msgstr "No se pudo enviar la lista de amigos al servidor Gadu-Gadu"
 
-#: src/protocols/gg/gg.c:1037
+#: src/protocols/gg/gg.c:1119
 msgid "Buddy List successfully deleted from Gadu-Gadu server"
 msgstr "La lista de amigos se borró correctamente del servidor Gadu-Gadu"
 
-#: src/protocols/gg/gg.c:1045
+#: src/protocols/gg/gg.c:1127
 msgid "Couldn't delete Buddy List from Gadu-Gadu server"
 msgstr "No se pudo borrar la lista de amigos del servidor Gadu-Gadu"
 
-#: src/protocols/gg/gg.c:1054
+#: src/protocols/gg/gg.c:1136
 msgid "Password changed successfully"
 msgstr "Se cambió con éxito la contraseña"
 
-#: src/protocols/gg/gg.c:1061
+#: src/protocols/gg/gg.c:1143
 msgid "Password couldn't be changed"
 msgstr "No se pudo cambiar la contraseña"
 
-#: src/protocols/gg/gg.c:1180
+#: src/protocols/gg/gg.c:1262
 msgid "Error communicating with Gadu-Gadu server"
 msgstr "Error comunicándose con el servidor Gadu-Gadu"
 
-#: src/protocols/gg/gg.c:1181
+#: src/protocols/gg/gg.c:1263
 msgid ""
 "Gaim was unable to complete your request due to a problem communicating with "
 "the Gadu-Gadu HTTP server.  Please try again later."
@@ -4840,11 +4906,11 @@
 "Gaim no pudo completar su petición debido a problemas al comunicarse con el "
 "servidor HTTP de Gadu-Gadu.  Vuelva a intentarlo más tarde."
 
-#: src/protocols/gg/gg.c:1210
+#: src/protocols/gg/gg.c:1292
 msgid "Unable to import Gadu-Gadu buddy list"
 msgstr "No se pudo importar la lista de amigos de Gadu-Gadu"
 
-#: src/protocols/gg/gg.c:1211
+#: src/protocols/gg/gg.c:1293
 msgid ""
 "Gaim was unable to connect to the Gadu-Gadu buddy list server.  Please try "
 "again later."
@@ -4852,26 +4918,26 @@
 "Gaim no pudo conectarse con el servidor de listas de amigos Gadu-Gadu.  Por "
 "favor inténtelo más tarde."
 
-#: src/protocols/gg/gg.c:1284
+#: src/protocols/gg/gg.c:1366
 msgid "Couldn't export buddy list"
 msgstr "No se pudo exportar la lista de amigos"
 
-#: src/protocols/gg/gg.c:1285 src/protocols/gg/gg.c:1308
+#: src/protocols/gg/gg.c:1367 src/protocols/gg/gg.c:1390
 msgid ""
 "Gaim was unable to connect to the buddy list server.  Please try again later."
 msgstr ""
 "Gaim no pudo conectarse con el servidor de listas de amigos.  Por favor, "
 "inténtelo más tarde."
 
-#: src/protocols/gg/gg.c:1307
+#: src/protocols/gg/gg.c:1389
 msgid "Unable to delete Gadu-Gadu buddy list"
 msgstr "No se pudo borrar la lista de amigos Gadu-Gadu"
 
-#: src/protocols/gg/gg.c:1358
+#: src/protocols/gg/gg.c:1440
 msgid "Unable to access directory"
 msgstr "No se pudo acceder al directorio"
 
-#: src/protocols/gg/gg.c:1359
+#: src/protocols/gg/gg.c:1441
 msgid ""
 "Gaim was unable to search the Directory because it was unable to connect to "
 "the directory server.  Please try again later."
@@ -4879,11 +4945,11 @@
 "Gaim no pudo buscar en el directorio porque no pudo conectarse con el "
 "servidor de directorio. Por favor, inténtelo más tarde."
 
-#: src/protocols/gg/gg.c:1393
+#: src/protocols/gg/gg.c:1475
 msgid "Unable to change Gadu-Gadu password"
 msgstr "No se pudo cambiar la contraseña Gadu-Gadu"
 
-#: src/protocols/gg/gg.c:1394
+#: src/protocols/gg/gg.c:1476
 msgid ""
 "Gaim was unable to change your password due to an error connecting to the "
 "Gadu-Gadu server.  Please try again later."
@@ -4891,33 +4957,33 @@
 "Gaim no pudo cambiar su contraseña porque no pudo conectarse con el servidor "
 "Gadu-Gadu. Por favor, inténtelo más tarde."
 
-#: src/protocols/gg/gg.c:1410
+#: src/protocols/gg/gg.c:1492
 msgid "Directory Search"
 msgstr "Búsqueda en el directorio"
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
-#: src/protocols/gg/gg.c:1415 src/protocols/jabber/jabber.c:1061
+#: src/protocols/gg/gg.c:1497 src/protocols/jabber/jabber.c:1062
 #: src/protocols/toc/toc.c:1550
 msgid "Change Password"
 msgstr "Cambiar contraseña"
 
-#: src/protocols/gg/gg.c:1419
+#: src/protocols/gg/gg.c:1501
 msgid "Import Buddy List from Server"
 msgstr "Importar la lista de amigos del servidor"
 
-#: src/protocols/gg/gg.c:1423
+#: src/protocols/gg/gg.c:1505
 msgid "Export Buddy List to Server"
 msgstr "Exportar lista de amigos al servidor"
 
-#: src/protocols/gg/gg.c:1427
+#: src/protocols/gg/gg.c:1509
 msgid "Delete Buddy List from Server"
 msgstr "Borrar lista de amigos del servidor"
 
-#: src/protocols/gg/gg.c:1460
+#: src/protocols/gg/gg.c:1542
 msgid "Unable to access user profile."
 msgstr "No se pudo acceder al perfil del usuario."
 
-#: src/protocols/gg/gg.c:1461
+#: src/protocols/gg/gg.c:1543
 msgid ""
 "Gaim was unable to access this user's profile due to an error connecting to "
 "the directory server.  Please try again later."
@@ -4937,7 +5003,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/gg/gg.c:1602 src/protocols/gg/gg.c:1604
+#: src/protocols/gg/gg.c:1686 src/protocols/gg/gg.c:1688
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr "Complemento de protocol Gadu-Gadu"
 
@@ -4951,14 +5017,14 @@
 msgstr "El usuario %s (%s%s%s%s%s) quiere que los autorice."
 
 #: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:232
-#: src/protocols/msn/userlist.c:100 src/protocols/oscar/oscar.c:3538
-#: src/protocols/oscar/oscar.c:6101
+#: src/protocols/msn/userlist.c:100 src/protocols/oscar/oscar.c:3554
+#: src/protocols/oscar/oscar.c:6117
 msgid "Authorize"
 msgstr "Autorizar"
 
 #: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:233
-#: src/protocols/msn/userlist.c:101 src/protocols/oscar/oscar.c:3540
-#: src/protocols/oscar/oscar.c:6102
+#: src/protocols/msn/userlist.c:101 src/protocols/oscar/oscar.c:3556
+#: src/protocols/oscar/oscar.c:6118
 msgid "Deny"
 msgstr "Denegar"
 
@@ -4983,12 +5049,12 @@
 msgid "Unknown command: %s"
 msgstr "Orden desconocida: %s"
 
-#: src/protocols/irc/cmds.c:444 src/protocols/jabber/chat.c:544
+#: src/protocols/irc/cmds.c:448 src/protocols/jabber/chat.c:544
 #, c-format
 msgid "current topic is: %s"
 msgstr "el tema actual es: %s"
 
-#: src/protocols/irc/cmds.c:447 src/protocols/jabber/chat.c:546
+#: src/protocols/irc/cmds.c:451 src/protocols/jabber/chat.c:546
 msgid "No topic is set"
 msgstr "No hay tema establecido"
 
@@ -4997,7 +5063,7 @@
 #: src/protocols/yahoo/yahoo_filexfer.c:188
 #: src/protocols/yahoo/yahoo_filexfer.c:198
 msgid "File Transfer Aborted"
-msgstr "Transferencia de archivo abortada"
+msgstr "Transferencia de fichero abortada"
 
 #: src/protocols/irc/dcc_send.c:273
 msgid "Gaim could not open a listening port."
@@ -5020,53 +5086,50 @@
 msgid "MOTD for %s"
 msgstr "MOTD para %s"
 
-#: src/protocols/irc/irc.c:141
+#: src/protocols/irc/irc.c:93 src/protocols/irc/irc.c:373
+msgid "Server has disconnected"
+msgstr "El servidor se ha desconectado"
+
+#: src/protocols/irc/irc.c:147
 msgid "View MOTD"
 msgstr "Ver MOTD"
 
-#. FIXME: remove this when the ui does it for us.
-#: src/protocols/irc/irc.c:168 src/protocols/jabber/buddy.c:929
-#: src/protocols/msn/msn.c:544 src/protocols/oscar/oscar.c:448
-#: src/protocols/oscar/oscar.c:6772 src/protocols/yahoo/yahoo.c:2703
-msgid "Send File"
-msgstr "Enviar archivo"
-
-#: src/protocols/irc/irc.c:182 src/protocols/silc/chat.c:32
+#: src/protocols/irc/irc.c:169 src/protocols/silc/chat.c:32
 msgid "_Channel:"
 msgstr "_Canal:"
 
-#: src/protocols/irc/irc.c:187 src/protocols/jabber/chat.c:59
+#: src/protocols/irc/irc.c:174 src/protocols/jabber/chat.c:59
 msgid "_Password:"
 msgstr "Contra_seña:"
 
-#: src/protocols/irc/irc.c:207
+#: src/protocols/irc/irc.c:194
 msgid "IRC nicks may not contain whitespace"
 msgstr "Los apodos de IRC no pueden tener espacios en blanco"
 
-#: src/protocols/irc/irc.c:226 src/protocols/toc/toc.c:198
+#: src/protocols/irc/irc.c:213 src/protocols/toc/toc.c:198
 #, c-format
 msgid "Signon: %s"
 msgstr "Conectado: %s"
 
-#: src/protocols/irc/irc.c:235
+#: src/protocols/irc/irc.c:222
 msgid "Couldn't create socket"
 msgstr "No se pudo crear el socket"
 
-#: src/protocols/irc/irc.c:250 src/protocols/jabber/jabber.c:296
-#: src/protocols/oscar/oscar.c:1523 src/protocols/oscar/oscar.c:1587
+#: src/protocols/irc/irc.c:237 src/protocols/jabber/jabber.c:297
+#: src/protocols/oscar/oscar.c:1529 src/protocols/oscar/oscar.c:1593
 msgid "Couldn't connect to host"
 msgstr "No se pudo conectar al servidor"
 
-#: src/protocols/irc/irc.c:387 src/protocols/trepia/trepia.c:926
+#: src/protocols/irc/irc.c:370 src/protocols/trepia/trepia.c:926
 msgid "Read error"
 msgstr "Error de lectura"
 
-#: src/protocols/irc/irc.c:538 src/protocols/silc/chat.c:1360
+#: src/protocols/irc/irc.c:521 src/protocols/silc/chat.c:1360
 #: src/protocols/yahoo/yahoochat.c:1380
 msgid "Users"
 msgstr "Usuarios"
 
-#: src/protocols/irc/irc.c:541 src/protocols/silc/chat.c:1363
+#: src/protocols/irc/irc.c:524 src/protocols/silc/chat.c:1363
 #: src/protocols/silc/ops.c:1027 src/protocols/yahoo/yahoochat.c:1389
 msgid "Topic"
 msgstr "Tema"
@@ -5080,33 +5143,33 @@
 #. *< id
 #. *< name
 #. *< version
-#: src/protocols/irc/irc.c:643
+#: src/protocols/irc/irc.c:628
 msgid "IRC Protocol Plugin"
 msgstr "Complemento de protocolo IRC"
 
 #. *  summary
-#: src/protocols/irc/irc.c:644
+#: src/protocols/irc/irc.c:629
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "Plugin de protocolo IRC menos malo"
 
-#: src/protocols/irc/irc.c:663 src/protocols/irc/msgs.c:197
-#: src/protocols/jabber/jabber.c:1556 src/protocols/napster/napster.c:642
+#: src/protocols/irc/irc.c:648 src/protocols/irc/msgs.c:197
+#: src/protocols/jabber/jabber.c:1559 src/protocols/napster/napster.c:644
 #: src/protocols/silc/ops.c:945
 msgid "Server"
 msgstr "Servidor"
 
-#: src/protocols/irc/irc.c:666 src/protocols/jabber/jabber.c:1577
-#: src/protocols/msn/msn.c:1748 src/protocols/napster/napster.c:647
-#: src/protocols/silc/silc.c:1484 src/protocols/trepia/trepia.c:1295
+#: src/protocols/irc/irc.c:651 src/protocols/jabber/jabber.c:1580
+#: src/protocols/msn/msn.c:1741 src/protocols/napster/napster.c:649
+#: src/protocols/silc/silc.c:1486 src/protocols/trepia/trepia.c:1297
 msgid "Port"
 msgstr "Puerto"
 
-#: src/protocols/irc/irc.c:669 src/protocols/zephyr/zephyr.c:1442
+#: src/protocols/irc/irc.c:654 src/protocols/zephyr/zephyr.c:1915
 msgid "Encoding"
 msgstr "Codificación"
 
-#: src/protocols/irc/irc.c:672 src/protocols/irc/msgs.c:191
-#: src/protocols/jabber/jabber.c:587 src/protocols/silc/buddy.c:1449
+#: src/protocols/irc/irc.c:657 src/protocols/irc/msgs.c:191
+#: src/protocols/jabber/jabber.c:588 src/protocols/silc/buddy.c:1449
 #: src/protocols/silc/ops.c:941
 msgid "Username"
 msgstr "Nombre de usuario:"
@@ -5277,50 +5340,67 @@
 msgid ""
 "away [message]:  Set an away message, or use no message to return from being "
 "away."
-msgstr "away [mensaje]:  Fija el mensaje cuando se está ausente, o no utilizar un mensaje al dejar de estar ausente."
+msgstr ""
+"away [mensaje]:  Fija el mensaje cuando se está ausente, o no utilizar un "
+"mensaje al dejar de estar ausente."
 
 #: src/protocols/irc/parse.c:111
 msgid ""
 "deop &lt;nick1&gt; [nick2] ...:  Remove channel operator status from "
 "someone. You must be a channel operator to do this."
-msgstr "deop &lt;apodo1&gt; [apodo2] ....: Quitarle a alguien el estado de operador de canal. Sólo un operador de canal puede hacerlo."
+msgstr ""
+"deop &lt;apodo1&gt; [apodo2] ....: Quitarle a alguien el estado de operador "
+"de canal. Sólo un operador de canal puede hacerlo."
 
 #: src/protocols/irc/parse.c:112
 msgid ""
 "devoice &lt;nick1&gt; [nick2] ...:  Remove channel voice status from "
 "someone, preventing them from speaking if the channel is moderated (+m). You "
 "must be a channel operator to do this."
-msgstr "devoice &lt;apodo1&gt; [apodo2] ...:  Silenciar a alguien, impidiéndoles hablar en el canal si éste está moderado (+m). Sólo lo puede hacer un operador de canal."
+msgstr ""
+"devoice &lt;apodo1&gt; [apodo2] ...:  Silenciar a alguien, impidiéndoles "
+"hablar en el canal si éste está moderado (+m). Sólo lo puede hacer un "
+"operador de canal."
 
 #: src/protocols/irc/parse.c:113
 msgid ""
 "invite &lt;nick&gt; [room]:  Invite someone to join you in the specified "
 "channel, or the current channel."
-msgstr "invite %lt;apodo&gt; [sala]:  Invitar a alguien a unirse al canal especificado o al canal actual."
+msgstr ""
+"invite %lt;apodo&gt; [sala]:  Invitar a alguien a unirse al canal "
+"especificado o al canal actual."
 
 #: src/protocols/irc/parse.c:114
 msgid ""
 "j &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
 "channels, optionally providing a channel key for each if needed."
-msgstr "j &lt;sala1&gt;[,sala2][,...] [clave1[,clave2][,...]]:  Entrar en un o más canales utilizando, opcionalmente, una clave de canal si fuera necesario."
+msgstr ""
+"j &lt;sala1&gt;[,sala2][,...] [clave1[,clave2][,...]]:  Entrar en un o más "
+"canales utilizando, opcionalmente, una clave de canal si fuera necesario."
 
 #: src/protocols/irc/parse.c:115
 msgid ""
 "join &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
 "channels, optionally providing a channel key for each if needed."
-msgstr "join &lt;sala1&gt;[,sala2][,...] [clave1[,clave2][,...]]:  Entrar en un o más canales utilizando, opcionalmente, una clave de canal si fuera necesario."
+msgstr ""
+"join &lt;sala1&gt;[,sala2][,...] [clave1[,clave2][,...]]:  Entrar en un o "
+"más canales utilizando, opcionalmente, una clave de canal si fuera necesario."
 
 #: src/protocols/irc/parse.c:116
 msgid ""
 "kick &lt;nick&gt; [message]:  Remove someone from a channel. You must be a "
 "channel operator to do this."
-msgstr "kick &lt;apodo&gt; [mensaje]:  Echar a alguien del canal. Sólo lo pueden hacer los operadores de canal."
+msgstr ""
+"kick &lt;apodo&gt; [mensaje]:  Echar a alguien del canal. Sólo lo pueden "
+"hacer los operadores de canal."
 
 #: src/protocols/irc/parse.c:117
 msgid ""
 "list:  Display a list of chat rooms on the network. <i>Warning, some servers "
 "may disconnect you upon doing this.</i>"
-msgstr "list:  Mostrar una lista de las salas de chat disponibles en la red. <i>Aviso: algunos servidores puede que le desconecten si hace ésto.</i>"
+msgstr ""
+"list:  Mostrar una lista de las salas de chat disponibles en la red. "
+"<i>Aviso: algunos servidores puede que le desconecten si hace ésto.</i>"
 
 #: src/protocols/irc/parse.c:118
 msgid "me &lt;action to perform&gt;:  Perform an action."
@@ -5330,19 +5410,24 @@
 msgid ""
 "mode &lt;nick|channel&gt; &lt;+|-&gt;&lt;A-Za-z&gt;:  Set or unset a channel "
 "or user mode."
-msgstr "mode &lt;apodo|canal&gt; &lt;+|-&gt;&lt;A-Za-z&gt;:  Fija o elimina un modo de canal o de usuario."
+msgstr ""
+"mode &lt;apodo|canal&gt; &lt;+|-&gt;&lt;A-Za-z&gt;:  Fija o elimina un modo "
+"de canal o de usuario."
 
 #: src/protocols/irc/parse.c:120
 msgid ""
 "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
 "opposed to a channel)."
-msgstr "msg &lt;apodo&gt; &lt;mensaje&gt;:  Enviar un mensaje privado a un usuario (lo opuesto a un canal)."
+msgstr ""
+"msg &lt;apodo&gt; &lt;mensaje&gt;:  Enviar un mensaje privado a un usuario "
+"(lo opuesto a un canal)."
 
 #: src/protocols/irc/parse.c:121
 msgid "names [channel]:  List the users currently in a channel."
-msgstr "names [canal]:  Obtener la lista de los usuarios que están en el canal."
-
-#: src/protocols/irc/parse.c:122 src/protocols/jabber/jabber.c:1406
+msgstr ""
+"names [canal]:  Obtener la lista de los usuarios que están en el canal."
+
+#: src/protocols/irc/parse.c:122 src/protocols/jabber/jabber.c:1407
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr "nick &lt;nuevo apodo&gt;:  Cambia su apodo."
 
@@ -5350,35 +5435,47 @@
 msgid ""
 "op &lt;nick1&gt; [nick2] ...:  Grant channel operator status to someone. You "
 "must be a channel operator to do this."
-msgstr "op &lt;apodo1&gt; [apodo2] ...:  Dar estatus de operador de canal a otra persona. Sólo lo puede hacer un operador de canal."
+msgstr ""
+"op &lt;apodo1&gt; [apodo2] ...:  Dar estatus de operador de canal a otra "
+"persona. Sólo lo puede hacer un operador de canal."
 
 #: src/protocols/irc/parse.c:124
 msgid ""
 "operwall &lt;message&gt;:  If you don't know what this is, you probably "
 "can't use it."
-msgstr "operwall &lt;mensaje&gt;:  Si no sabe lo que es probablemente no puede utilizarlo."
+msgstr ""
+"operwall &lt;mensaje&gt;:  Si no sabe lo que es probablemente no puede "
+"utilizarlo."
 
 #: src/protocols/irc/parse.c:125
 msgid ""
 "part [room] [message]:  Leave the current channel, or a specified channel, "
 "with an optional message."
-msgstr "part [sala] [mensaje]:  Abandonar el canal actual, o un canal específico, con el mensaje opcional."
+msgstr ""
+"part [sala] [mensaje]:  Abandonar el canal actual, o un canal específico, "
+"con el mensaje opcional."
 
 #: src/protocols/irc/parse.c:126
 msgid ""
 "ping [nick]:  Asks how much lag a user (or the server if no user specified) "
 "has."
-msgstr "ping [apodo]:  Pregunta cuanta latencia tiene un usuario (o el servidor si no se especifica un usuario)."
+msgstr ""
+"ping [apodo]:  Pregunta cuanta latencia tiene un usuario (o el servidor si "
+"no se especifica un usuario)."
 
 #: src/protocols/irc/parse.c:127
 msgid ""
 "query &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
 "opposed to a channel)."
-msgstr "query &lt;apodo&gt; &lt;mensaje&gt;:  Envía un mensaje privado a un usuario (lo opuesto a un canal)."
+msgstr ""
+"query &lt;apodo&gt; &lt;mensaje&gt;:  Envía un mensaje privado a un usuario "
+"(lo opuesto a un canal)."
 
 #: src/protocols/irc/parse.c:128
 msgid "quit [message]:  Disconnect from the server, with an optional message."
-msgstr "quit [mensaje]:  Desconecta del servidor actual indicando un mensaje (opcional)."
+msgstr ""
+"quit [mensaje]:  Desconecta del servidor actual indicando un mensaje "
+"(opcional)."
 
 #: src/protocols/irc/parse.c:129
 msgid "quote [...]:  Send a raw command to the server."
@@ -5388,7 +5485,9 @@
 msgid ""
 "remove &lt;nick&gt; [message]:  Remove someone from a room. You must be a "
 "channel operator to do this."
-msgstr "remove &lt;apodo&gt; [mensaje]:  Eliminar a alguien de una sala. Sólo puede hacerlo un operador de canal."
+msgstr ""
+"remove &lt;apodo&gt; [mensaje]:  Eliminar a alguien de una sala. Sólo puede "
+"hacerlo un operador de canal."
 
 #: src/protocols/irc/parse.c:131
 msgid "topic [new topic]:  View or change the channel topic."
@@ -5396,25 +5495,29 @@
 
 #: src/protocols/irc/parse.c:132
 msgid "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Set or unset a user mode."
-msgstr "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Establece o elimina un modo de usuario."
+msgstr ""
+"umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Establece o elimina un modo de usuario."
 
 #: src/protocols/irc/parse.c:133
 msgid ""
 "voice &lt;nick1&gt; [nick2] ...:  Grant channel voice status to someone. You "
 "must be a channel operator to do this."
-msgstr "voice &lt;apodo1&gt; [apodo2] ...:  Dar la posibilidad de hablar en el canal a alguien. Sólo lo puede hacer un operador de canal."
+msgstr ""
+"voice &lt;apodo1&gt; [apodo2] ...:  Dar la posibilidad de hablar en el canal "
+"a alguien. Sólo lo puede hacer un operador de canal."
 
 #: src/protocols/irc/parse.c:134
 msgid ""
 "wallops &lt;message&gt;:  If you don't know what this is, you probably can't "
 "use it."
-msgstr "wallops &lt;mensaje&gt;:  Si no sabe lo que es probablemente no pueda usarlo."
+msgstr ""
+"wallops &lt;mensaje&gt;:  Si no sabe lo que es probablemente no pueda usarlo."
 
 #: src/protocols/irc/parse.c:135
 msgid "whois &lt;nick&gt;:  Get information on a user."
 msgstr "whois &lt;apodo&gt;:  Obtiene información de un usuario."
 
-#: src/protocols/irc/parse.c:228 src/protocols/zephyr/zephyr.c:236
+#: src/protocols/irc/parse.c:228 src/protocols/zephyr/zephyr.c:256
 msgid ""
 "(There was an error converting this message.  Check the 'Encoding' option in "
 "the Account Editor)"
@@ -5435,7 +5538,7 @@
 msgid "CTCP PING reply"
 msgstr "Respuesta a PING CTCP"
 
-#: src/protocols/irc/parse.c:485 src/protocols/oscar/oscar.c:1424
+#: src/protocols/irc/parse.c:485 src/protocols/oscar/oscar.c:1430
 #: src/protocols/toc/toc.c:188 src/protocols/toc/toc.c:596
 #: src/protocols/toc/toc.c:612 src/protocols/toc/toc.c:689
 msgid "Disconnected."
@@ -5470,95 +5573,95 @@
 msgid "Invalid challenge from server"
 msgstr "Desafío inválido del servidor"
 
-#: src/protocols/jabber/buddy.c:247 src/protocols/jabber/buddy.c:605
+#: src/protocols/jabber/buddy.c:246 src/protocols/jabber/buddy.c:604
 #: src/protocols/silc/ops.c:780
 msgid "Full Name"
 msgstr "Nombre completo"
 
-#: src/protocols/jabber/buddy.c:248 src/protocols/jabber/buddy.c:618
+#: src/protocols/jabber/buddy.c:247 src/protocols/jabber/buddy.c:617
 #: src/protocols/silc/ops.c:792
 msgid "Family Name"
 msgstr "Apellidos"
 
-#: src/protocols/jabber/buddy.c:249 src/protocols/jabber/buddy.c:622
+#: src/protocols/jabber/buddy.c:248 src/protocols/jabber/buddy.c:621
 msgid "Given Name"
 msgstr "Nombre propio"
 
-#: src/protocols/jabber/buddy.c:250 src/protocols/jabber/buddy.c:636
-#: src/protocols/jabber/jabber.c:607 src/protocols/msn/msn.c:1169
+#: src/protocols/jabber/buddy.c:249 src/protocols/jabber/buddy.c:635
+#: src/protocols/jabber/jabber.c:608 src/protocols/msn/msn.c:1160
 #: src/protocols/silc/buddy.c:1446 src/protocols/silc/ops.c:796
 #: src/protocols/silc/ops.c:937 src/protocols/yahoo/yahoo_profile.c:995
 msgid "Nickname"
 msgstr "Apodo"
 
-#: src/protocols/jabber/buddy.c:251 src/protocols/jabber/jabber.c:647
+#: src/protocols/jabber/buddy.c:250 src/protocols/jabber/jabber.c:648
 msgid "URL"
 msgstr "URL"
 
-#: src/protocols/jabber/buddy.c:252 src/protocols/jabber/buddy.c:664
+#: src/protocols/jabber/buddy.c:251 src/protocols/jabber/buddy.c:663
 msgid "Street Address"
 msgstr "Calle"
 
-#: src/protocols/jabber/buddy.c:253 src/protocols/jabber/buddy.c:660
+#: src/protocols/jabber/buddy.c:252 src/protocols/jabber/buddy.c:659
 msgid "Extended Address"
 msgstr "Dirección extendida"
 
-#: src/protocols/jabber/buddy.c:254 src/protocols/jabber/buddy.c:668
+#: src/protocols/jabber/buddy.c:253 src/protocols/jabber/buddy.c:667
 msgid "Locality"
 msgstr "Localidad"
 
-#: src/protocols/jabber/buddy.c:255 src/protocols/jabber/buddy.c:672
+#: src/protocols/jabber/buddy.c:254 src/protocols/jabber/buddy.c:671
 msgid "Region"
 msgstr "Región"
 
-#: src/protocols/jabber/buddy.c:256 src/protocols/jabber/buddy.c:676
-#: src/protocols/jabber/jabber.c:637
+#: src/protocols/jabber/buddy.c:255 src/protocols/jabber/buddy.c:675
+#: src/protocols/jabber/jabber.c:638
 msgid "Postal Code"
 msgstr "Código postal"
 
 #. Country
-#: src/protocols/jabber/buddy.c:257 src/protocols/jabber/buddy.c:681
+#: src/protocols/jabber/buddy.c:256 src/protocols/jabber/buddy.c:680
 #: src/protocols/trepia/trepia.c:339 src/protocols/trepia/trepia.c:416
 msgid "Country"
 msgstr "País"
 
-#: src/protocols/jabber/buddy.c:258 src/protocols/jabber/buddy.c:692
-#: src/protocols/jabber/buddy.c:699
+#: src/protocols/jabber/buddy.c:257 src/protocols/jabber/buddy.c:691
+#: src/protocols/jabber/buddy.c:698
 msgid "Telephone"
 msgstr "Teléfono"
 
-#: src/protocols/jabber/buddy.c:259 src/protocols/jabber/buddy.c:710
-#: src/protocols/jabber/buddy.c:718 src/protocols/silc/buddy.c:1499
+#: src/protocols/jabber/buddy.c:258 src/protocols/jabber/buddy.c:709
+#: src/protocols/jabber/buddy.c:717 src/protocols/silc/buddy.c:1499
 #: src/protocols/silc/silc.c:637 src/protocols/yahoo/yahoo_profile.c:990
 msgid "Email"
 msgstr "Correo electrónico"
 
-#: src/protocols/jabber/buddy.c:260 src/protocols/jabber/buddy.c:733
+#: src/protocols/jabber/buddy.c:259 src/protocols/jabber/buddy.c:732
 msgid "Organization Name"
 msgstr "Nombre de la organización"
 
-#: src/protocols/jabber/buddy.c:261 src/protocols/jabber/buddy.c:737
+#: src/protocols/jabber/buddy.c:260 src/protocols/jabber/buddy.c:736
 msgid "Organization Unit"
 msgstr "Grupo de trabajo"
 
-#: src/protocols/jabber/buddy.c:262 src/protocols/jabber/buddy.c:743
+#: src/protocols/jabber/buddy.c:261 src/protocols/jabber/buddy.c:742
 msgid "Title"
 msgstr "Título"
 
-#: src/protocols/jabber/buddy.c:263 src/protocols/jabber/buddy.c:746
+#: src/protocols/jabber/buddy.c:262 src/protocols/jabber/buddy.c:745
 msgid "Role"
 msgstr "Rol"
 
-#: src/protocols/jabber/buddy.c:264 src/protocols/jabber/buddy.c:639
-#: src/protocols/oscar/oscar.c:4865
+#: src/protocols/jabber/buddy.c:263 src/protocols/jabber/buddy.c:638
+#: src/protocols/oscar/oscar.c:4881
 msgid "Birthday"
 msgstr "Cumpleaños"
 
-#: src/protocols/jabber/buddy.c:510 src/protocols/jabber/buddy.c:511
+#: src/protocols/jabber/buddy.c:509 src/protocols/jabber/buddy.c:510
 msgid "Edit Jabber vCard"
 msgstr "Editar vCard de Jabber"
 
-#: src/protocols/jabber/buddy.c:512
+#: src/protocols/jabber/buddy.c:511
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable."
@@ -5566,70 +5669,70 @@
 "Todos los campos siguientes son opcionales. Introduzca sólo la información "
 "con la que se sienta cómodo."
 
-#: src/protocols/jabber/buddy.c:554
+#: src/protocols/jabber/buddy.c:553
 msgid "Jabber ID"
 msgstr "ID Jabber"
 
-#: src/protocols/jabber/buddy.c:564 src/protocols/jabber/buddy.c:571
-#: src/protocols/jabber/buddy.c:582 src/protocols/jabber/jabber.c:937
-#: src/protocols/msn/msn.c:454 src/protocols/novell/novell.c:2743
-#: src/protocols/novell/novell.c:2747 src/protocols/oscar/oscar.c:574
-#: src/protocols/oscar/oscar.c:580 src/protocols/oscar/oscar.c:582
-#: src/protocols/yahoo/yahoo.c:2620
+#: src/protocols/jabber/buddy.c:563 src/protocols/jabber/buddy.c:570
+#: src/protocols/jabber/buddy.c:581 src/protocols/jabber/jabber.c:938
+#: src/protocols/msn/msn.c:450 src/protocols/novell/novell.c:2743
+#: src/protocols/novell/novell.c:2747 src/protocols/oscar/oscar.c:578
+#: src/protocols/oscar/oscar.c:584 src/protocols/oscar/oscar.c:586
+#: src/protocols/yahoo/yahoo.c:2634
 msgid "Status"
 msgstr "Estado"
 
-#: src/protocols/jabber/buddy.c:580 src/protocols/jabber/jabber.c:1559
+#: src/protocols/jabber/buddy.c:579 src/protocols/jabber/jabber.c:1562
 msgid "Resource"
 msgstr "Recurso"
 
-#: src/protocols/jabber/buddy.c:626 src/protocols/silc/ops.c:788
+#: src/protocols/jabber/buddy.c:625 src/protocols/silc/ops.c:788
 msgid "Middle Name"
 msgstr "Nombre medio"
 
-#: src/protocols/jabber/buddy.c:644 src/protocols/jabber/jabber.c:622
-#: src/protocols/oscar/oscar.c:4883 src/protocols/oscar/oscar.c:4891
+#: src/protocols/jabber/buddy.c:643 src/protocols/jabber/jabber.c:623
+#: src/protocols/oscar/oscar.c:4899 src/protocols/oscar/oscar.c:4907
 #: src/protocols/silc/ops.c:824
 msgid "Address"
 msgstr "Dirección"
 
-#: src/protocols/jabber/buddy.c:656
+#: src/protocols/jabber/buddy.c:655
 msgid "P.O. Box"
 msgstr "Código postal"
 
-#: src/protocols/jabber/buddy.c:762
+#: src/protocols/jabber/buddy.c:761
 msgid "Photo"
 msgstr "Foto"
 
-#: src/protocols/jabber/buddy.c:762
+#: src/protocols/jabber/buddy.c:761
 msgid "Logo"
 msgstr "Logotipo"
 
-#: src/protocols/jabber/buddy.c:778
+#: src/protocols/jabber/buddy.c:777
 msgid "Jabber Profile"
 msgstr "Perfil Jabber"
 
-#: src/protocols/jabber/buddy.c:937
+#: src/protocols/jabber/buddy.c:932
 msgid "Un-hide From"
 msgstr "No ocultarse de"
 
-#: src/protocols/jabber/buddy.c:940
+#: src/protocols/jabber/buddy.c:935
 msgid "Temporarily Hide From"
 msgstr "Ocultarse temporalmente de"
 
 #. && NOT ME
-#: src/protocols/jabber/buddy.c:947
+#: src/protocols/jabber/buddy.c:942
 msgid "Cancel Presence Notification"
 msgstr "Cancelar notificación de presencia"
 
-#: src/protocols/jabber/buddy.c:953
+#: src/protocols/jabber/buddy.c:948
 msgid "(Re-)Request authorization"
 msgstr "Volver a pedir autorización"
 
 #. if(NOT ME)
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
-#: src/protocols/jabber/buddy.c:961
+#: src/protocols/jabber/buddy.c:956
 msgid "Unsubscribe"
 msgstr "De-suscribir"
 
@@ -5720,448 +5823,450 @@
 msgid "Find Rooms"
 msgstr "Buscar salas"
 
-#: src/protocols/jabber/jabber.c:75
+#: src/protocols/jabber/jabber.c:76
 msgid "Error initializing session"
 msgstr "Error al inicializar la sesión"
 
-#: src/protocols/jabber/jabber.c:205 src/protocols/msn/httpmethod.c:266
+#: src/protocols/jabber/jabber.c:206 src/protocols/msn/httpmethod.c:266
 #: src/protocols/trepia/trepia.c:247 src/protocols/trepia/trepia.c:698
 #: src/protocols/trepia/trepia.c:987 src/protocols/trepia/trepia.c:1031
 #: src/protocols/trepia/trepia.c:1130 src/protocols/trepia/trepia.c:1176
 msgid "Write error"
 msgstr "Error de escritura"
 
-#: src/protocols/jabber/jabber.c:243 src/protocols/jabber/jabber.c:263
+#: src/protocols/jabber/jabber.c:244 src/protocols/jabber/jabber.c:264
 msgid "Read Error"
 msgstr "Error de lectura"
 
-#: src/protocols/jabber/jabber.c:323
+#: src/protocols/jabber/jabber.c:324
 msgid "Connection Failed"
 msgstr "Falló la conexión"
 
-#: src/protocols/jabber/jabber.c:326
+#: src/protocols/jabber/jabber.c:327
 msgid "SSL Handshake Failed"
 msgstr "Falló en la negociación SSL"
 
-#: src/protocols/jabber/jabber.c:369 src/protocols/jabber/jabber.c:698
+#: src/protocols/jabber/jabber.c:370 src/protocols/jabber/jabber.c:699
 msgid "Invalid Jabber ID"
 msgstr "ID de Jabber no válido"
 
-#: src/protocols/jabber/jabber.c:397 src/protocols/jabber/jabber.c:725
+#: src/protocols/jabber/jabber.c:398 src/protocols/jabber/jabber.c:726
 msgid "SSL support unavailable"
 msgstr "Soporte SSL no disponible"
 
-#: src/protocols/jabber/jabber.c:407 src/protocols/jabber/jabber.c:735
+#: src/protocols/jabber/jabber.c:408 src/protocols/jabber/jabber.c:736
 #: src/protocols/trepia/trepia.c:1070
 msgid "Unable to create socket"
 msgstr "No se pudo crear el socket"
 
-#: src/protocols/jabber/jabber.c:432
+#: src/protocols/jabber/jabber.c:433
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "Registro de %s@%s efectuado con éxito"
 
-#: src/protocols/jabber/jabber.c:434 src/protocols/jabber/jabber.c:435
+#: src/protocols/jabber/jabber.c:435 src/protocols/jabber/jabber.c:436
 msgid "Registration Successful"
 msgstr "Éxito en el registro"
 
-#: src/protocols/jabber/jabber.c:441 src/protocols/jabber/jabber.c:1180
+#: src/protocols/jabber/jabber.c:442 src/protocols/jabber/jabber.c:1181
 msgid "Unknown Error"
 msgstr "Error desconocido"
 
-#: src/protocols/jabber/jabber.c:443 src/protocols/jabber/jabber.c:444
+#: src/protocols/jabber/jabber.c:444 src/protocols/jabber/jabber.c:445
 msgid "Registration Failed"
 msgstr "Falló el registro"
 
-#: src/protocols/jabber/jabber.c:555 src/protocols/jabber/jabber.c:556
+#: src/protocols/jabber/jabber.c:556 src/protocols/jabber/jabber.c:557
 msgid "Already Registered"
 msgstr "Ya está registrado"
 
-#: src/protocols/jabber/jabber.c:591 src/protocols/jabber/jabber.c:1035
+#: src/protocols/jabber/jabber.c:592 src/protocols/jabber/jabber.c:1036
 msgid "Password"
 msgstr "Contraseña"
 
-#: src/protocols/jabber/jabber.c:602
+#: src/protocols/jabber/jabber.c:603
 msgid "E-Mail"
 msgstr "Correo electrónico"
 
 #. State
-#: src/protocols/jabber/jabber.c:632 src/protocols/oscar/oscar.c:4885
-#: src/protocols/oscar/oscar.c:4893 src/protocols/trepia/trepia.c:335
+#: src/protocols/jabber/jabber.c:633 src/protocols/oscar/oscar.c:4901
+#: src/protocols/oscar/oscar.c:4909 src/protocols/trepia/trepia.c:335
 #: src/protocols/trepia/trepia.c:413
 msgid "State"
 msgstr "Estado"
 
-#: src/protocols/jabber/jabber.c:642 src/protocols/silc/buddy.c:1501
+#: src/protocols/jabber/jabber.c:643 src/protocols/silc/buddy.c:1501
 #: src/protocols/silc/ops.c:829 src/protocols/silc/silc.c:639
 msgid "Phone"
 msgstr "Teléfono"
 
-#: src/protocols/jabber/jabber.c:652
+#: src/protocols/jabber/jabber.c:653
 msgid "Date"
 msgstr "Fecha"
 
-#: src/protocols/jabber/jabber.c:660
+#: src/protocols/jabber/jabber.c:661
 msgid "Please fill out the information below to register your new account."
 msgstr ""
 "Por favor, rellene la información abajo indicada para registrar su nueva "
 "cuenta."
 
-#: src/protocols/jabber/jabber.c:663 src/protocols/jabber/jabber.c:664
+#: src/protocols/jabber/jabber.c:664 src/protocols/jabber/jabber.c:665
 msgid "Register New Jabber Account"
 msgstr "Registrando cuenta nueva de Jabber"
 
-#: src/protocols/jabber/jabber.c:743
+#: src/protocols/jabber/jabber.c:744
 msgid "Logged out"
 msgstr "Desconectado"
 
 #. connect to the server
-#: src/protocols/jabber/jabber.c:782 src/protocols/msn/msn.c:617
+#: src/protocols/jabber/jabber.c:783 src/protocols/msn/msn.c:608
 #: src/protocols/napster/napster.c:499 src/protocols/novell/novell.c:2105
-#: src/protocols/oscar/oscar.c:1591 src/protocols/trepia/trepia.c:1064
-#: src/protocols/yahoo/yahoo.c:2359 src/protocols/zephyr/zephyr.c:906
+#: src/protocols/oscar/oscar.c:1597 src/protocols/trepia/trepia.c:1064
+#: src/protocols/yahoo/yahoo.c:2379 src/protocols/zephyr/zephyr.c:1017
 msgid "Connecting"
 msgstr "Conectando"
 
-#: src/protocols/jabber/jabber.c:786
+#: src/protocols/jabber/jabber.c:787
 msgid "Initializing Stream"
 msgstr "Inicializando flujo"
 
-#: src/protocols/jabber/jabber.c:792
+#: src/protocols/jabber/jabber.c:793
 msgid "Authenticating"
 msgstr "Autenticando"
 
-#: src/protocols/jabber/jabber.c:801
+#: src/protocols/jabber/jabber.c:802
 msgid "Re-initializing Stream"
 msgstr "Reinicializando flujo"
 
-#: src/protocols/jabber/jabber.c:881 src/protocols/jabber/jabber.c:1158
-#: src/protocols/jabber/jabber.c:1199 src/protocols/jabber/jabber.c:1232
-#: src/protocols/oscar/oscar.c:580 src/protocols/oscar/oscar.c:6472
+#: src/protocols/jabber/jabber.c:882 src/protocols/jabber/jabber.c:1159
+#: src/protocols/jabber/jabber.c:1200 src/protocols/jabber/jabber.c:1233
+#: src/protocols/oscar/oscar.c:584 src/protocols/oscar/oscar.c:6488
 msgid "Not Authorized"
 msgstr "No autorizado"
 
-#: src/protocols/jabber/jabber.c:912
+#: src/protocols/jabber/jabber.c:913
 msgid "Both"
 msgstr "Ambos"
 
-#: src/protocols/jabber/jabber.c:914
+#: src/protocols/jabber/jabber.c:915
 msgid "From (To pending)"
 msgstr "Desde (Destino pendiente)"
 
-#: src/protocols/jabber/jabber.c:916
+#: src/protocols/jabber/jabber.c:917
 msgid "From"
 msgstr "De"
 
-#: src/protocols/jabber/jabber.c:919
+#: src/protocols/jabber/jabber.c:920
 msgid "To"
 msgstr "A"
 
-#: src/protocols/jabber/jabber.c:921
+#: src/protocols/jabber/jabber.c:922
 msgid "None (To pending)"
 msgstr "Nadie (Destino pendiente)"
 
-#: src/protocols/jabber/jabber.c:925
+#: src/protocols/jabber/jabber.c:926
 msgid "Subscription"
 msgstr "Subscripción"
 
-#: src/protocols/jabber/jabber.c:945
+#: src/protocols/jabber/jabber.c:946
 msgid "Error"
 msgstr "Error"
 
-#: src/protocols/jabber/jabber.c:958 src/protocols/jabber/jutil.c:35
+#: src/protocols/jabber/jabber.c:959 src/protocols/jabber/jutil.c:35
 #: src/protocols/jabber/presence.c:66 src/protocols/jabber/presence.c:117
 msgid "Chatty"
 msgstr "Hablador"
 
-#: src/protocols/jabber/jabber.c:960 src/protocols/jabber/jutil.c:38
+#: src/protocols/jabber/jabber.c:961 src/protocols/jabber/jutil.c:38
 #: src/protocols/jabber/presence.c:68 src/protocols/jabber/presence.c:122
 msgid "Extended Away"
 msgstr "Ausencia extendida"
 
-#: src/protocols/jabber/jabber.c:961 src/protocols/jabber/jutil.c:41
+#: src/protocols/jabber/jabber.c:962 src/protocols/jabber/jutil.c:41
 #: src/protocols/jabber/presence.c:70 src/protocols/jabber/presence.c:124
-#: src/protocols/oscar/oscar.c:522 src/protocols/oscar/oscar.c:5468
-#: src/protocols/oscar/oscar.c:6664
+#: src/protocols/oscar/oscar.c:526 src/protocols/oscar/oscar.c:5484
+#: src/protocols/oscar/oscar.c:6680
 msgid "Do Not Disturb"
 msgstr "No molestar"
 
-#: src/protocols/jabber/jabber.c:978
-msgid "Password Changed"
-msgstr "Contraseña modificada"
-
 #: src/protocols/jabber/jabber.c:979
+msgid "Password Changed"
+msgstr "Contraseña modificada"
+
+#: src/protocols/jabber/jabber.c:980
 msgid "Your password has been changed."
 msgstr "Su contraseña ha sido modificada."
 
-#: src/protocols/jabber/jabber.c:983 src/protocols/jabber/jabber.c:984
+#: src/protocols/jabber/jabber.c:984 src/protocols/jabber/jabber.c:985
 msgid "Error changing password"
 msgstr "Error al cambiar la contraseña"
 
-#: src/protocols/jabber/jabber.c:1040
+#: src/protocols/jabber/jabber.c:1041
 msgid "Password (again)"
 msgstr "Contraseña (de nuevo)"
 
-#: src/protocols/jabber/jabber.c:1045 src/protocols/jabber/jabber.c:1046
+#: src/protocols/jabber/jabber.c:1046 src/protocols/jabber/jabber.c:1047
 msgid "Change Jabber Password"
 msgstr "Cambiar contraseña de Jabber"
 
-#: src/protocols/jabber/jabber.c:1046
+#: src/protocols/jabber/jabber.c:1047
 msgid "Please enter your new password"
 msgstr "Por favor, indique su nueva contraseña"
 
-#: src/protocols/jabber/jabber.c:1056 src/protocols/toc/toc.c:1540
+#: src/protocols/jabber/jabber.c:1057 src/protocols/toc/toc.c:1540
 msgid "Set User Info"
 msgstr "Establecer información de usuario"
 
-#: src/protocols/jabber/jabber.c:1138
+#: src/protocols/jabber/jabber.c:1139
 msgid "Bad Request"
 msgstr "Solicitud errónea"
 
-#: src/protocols/jabber/jabber.c:1140
+#: src/protocols/jabber/jabber.c:1141
 msgid "Conflict"
 msgstr "Conflicto"
 
-#: src/protocols/jabber/jabber.c:1142
+#: src/protocols/jabber/jabber.c:1143
 msgid "Feature Not Implemented"
 msgstr "Funcionalidad no implementada"
 
-#: src/protocols/jabber/jabber.c:1144
+#: src/protocols/jabber/jabber.c:1145
 msgid "Forbidden"
 msgstr "Prohibido"
 
-#: src/protocols/jabber/jabber.c:1146
+#: src/protocols/jabber/jabber.c:1147
 msgid "Gone"
 msgstr "Se fue"
 
-#: src/protocols/jabber/jabber.c:1148 src/protocols/jabber/jabber.c:1222
+#: src/protocols/jabber/jabber.c:1149 src/protocols/jabber/jabber.c:1223
 msgid "Internal Server Error"
 msgstr "Error interno del servidor"
 
-#: src/protocols/jabber/jabber.c:1150
+#: src/protocols/jabber/jabber.c:1151
 msgid "Item Not Found"
 msgstr "Elemento no encontrado"
 
-#: src/protocols/jabber/jabber.c:1152
+#: src/protocols/jabber/jabber.c:1153
 msgid "Malformed Jabber ID"
 msgstr "ID de Jabber no válido"
 
-#: src/protocols/jabber/jabber.c:1154
+#: src/protocols/jabber/jabber.c:1155
 msgid "Not Acceptable"
 msgstr "No aceptable"
 
-#: src/protocols/jabber/jabber.c:1156
+#: src/protocols/jabber/jabber.c:1157
 msgid "Not Allowed"
 msgstr "No permitido"
 
-#: src/protocols/jabber/jabber.c:1160
+#: src/protocols/jabber/jabber.c:1161
 msgid "Payment Required"
 msgstr "Pago necesario"
 
-#: src/protocols/jabber/jabber.c:1162
+#: src/protocols/jabber/jabber.c:1163
 msgid "Recipient Unavailable"
 msgstr "Destinatario no disponible"
 
-#: src/protocols/jabber/jabber.c:1166
+#: src/protocols/jabber/jabber.c:1167
 msgid "Registration Required"
 msgstr "Registro necesario"
 
-#: src/protocols/jabber/jabber.c:1168
+#: src/protocols/jabber/jabber.c:1169
 msgid "Remote Server Not Found"
 msgstr "No se encontró el servidor remoto"
 
-#: src/protocols/jabber/jabber.c:1170
+#: src/protocols/jabber/jabber.c:1171
 msgid "Remote Server Timeout"
 msgstr "Expiró el tiempo del servidor remoto"
 
-#: src/protocols/jabber/jabber.c:1172
+#: src/protocols/jabber/jabber.c:1173
 msgid "Server Overloaded"
 msgstr "Servidor sobrecargado"
 
-#: src/protocols/jabber/jabber.c:1174
+#: src/protocols/jabber/jabber.c:1175
 msgid "Service Unavailable"
 msgstr "Servicio no disponible"
 
-#: src/protocols/jabber/jabber.c:1176
+#: src/protocols/jabber/jabber.c:1177
 msgid "Subscription Required"
 msgstr "Subscripción necesaria"
 
-#: src/protocols/jabber/jabber.c:1178
+#: src/protocols/jabber/jabber.c:1179
 msgid "Unexpected Request"
 msgstr "Solicitud no esperada"
 
-#: src/protocols/jabber/jabber.c:1185
+#: src/protocols/jabber/jabber.c:1186
 msgid "Authorization Aborted"
 msgstr "Autorización interrumpida"
 
-#: src/protocols/jabber/jabber.c:1187
+#: src/protocols/jabber/jabber.c:1188
 msgid "Incorrect encoding in authorization"
 msgstr "Codificación incorrecta en la autorización"
 
-#: src/protocols/jabber/jabber.c:1190
+#: src/protocols/jabber/jabber.c:1191
 msgid "Invalid authzid"
 msgstr "Authzid inválido"
 
-#: src/protocols/jabber/jabber.c:1193
+#: src/protocols/jabber/jabber.c:1194
 msgid "Invalid Authorization Mechanism"
 msgstr "Mecanismo de autorización inválido"
 
-#: src/protocols/jabber/jabber.c:1196
+#: src/protocols/jabber/jabber.c:1197
 msgid "Authorization mechanism too weak"
 msgstr "Mecanismo de autorización demasiado débil"
 
-#: src/protocols/jabber/jabber.c:1201
+#: src/protocols/jabber/jabber.c:1202
 msgid "Temporary Authentication Failure"
 msgstr "Falló temporal de la autenticación"
 
-#: src/protocols/jabber/jabber.c:1203
+#: src/protocols/jabber/jabber.c:1204
 msgid "Authentication Failure"
 msgstr "Falló de autenticación"
 
-#: src/protocols/jabber/jabber.c:1207
+#: src/protocols/jabber/jabber.c:1208
 msgid "Bad Format"
 msgstr "Formato erróneo"
 
-#: src/protocols/jabber/jabber.c:1209
+#: src/protocols/jabber/jabber.c:1210
 msgid "Bad Namespace Prefix"
 msgstr "Prefijo del espacio de nombres erróneo"
 
-#: src/protocols/jabber/jabber.c:1212
+#: src/protocols/jabber/jabber.c:1213
 msgid "Resource Conflict"
 msgstr "Conflicto de recursos"
 
-#: src/protocols/jabber/jabber.c:1214 src/protocols/silc/ops.c:1285
+#: src/protocols/jabber/jabber.c:1215 src/protocols/silc/ops.c:1285
 msgid "Connection Timeout"
 msgstr "Expiró la conexión"
 
-#: src/protocols/jabber/jabber.c:1216
+#: src/protocols/jabber/jabber.c:1217
 msgid "Host Gone"
 msgstr "Servidor desaparecido"
 
-#: src/protocols/jabber/jabber.c:1218
+#: src/protocols/jabber/jabber.c:1219
 msgid "Host Unknown"
 msgstr "Servidor desconocido"
 
-#: src/protocols/jabber/jabber.c:1220
+#: src/protocols/jabber/jabber.c:1221
 msgid "Improper Addressing"
 msgstr "Direccionamiento incorrecto"
 
-#: src/protocols/jabber/jabber.c:1224
+#: src/protocols/jabber/jabber.c:1225
 msgid "Invalid ID"
 msgstr "ID no válido"
 
-#: src/protocols/jabber/jabber.c:1226
+#: src/protocols/jabber/jabber.c:1227
 msgid "Invalid Namespace"
 msgstr "Espacio de nombres no válido"
 
-#: src/protocols/jabber/jabber.c:1228
+#: src/protocols/jabber/jabber.c:1229
 msgid "Invalid XML"
 msgstr "XML inválido"
 
-#: src/protocols/jabber/jabber.c:1230
+#: src/protocols/jabber/jabber.c:1231
 msgid "Non-matching Hosts"
 msgstr "No existen servidores coincidentes"
 
-#: src/protocols/jabber/jabber.c:1234
+#: src/protocols/jabber/jabber.c:1235
 msgid "Policy Violation"
 msgstr "Violación de la política"
 
-#: src/protocols/jabber/jabber.c:1236
+#: src/protocols/jabber/jabber.c:1237
 msgid "Remote Connection Failed"
 msgstr "Falló la conexión remota"
 
-#: src/protocols/jabber/jabber.c:1238
+#: src/protocols/jabber/jabber.c:1239
 msgid "Resource Constraint"
 msgstr "Restricción de recursos"
 
-#: src/protocols/jabber/jabber.c:1240
+#: src/protocols/jabber/jabber.c:1241
 msgid "Restricted XML"
 msgstr "XML restringido"
 
-#: src/protocols/jabber/jabber.c:1242
+#: src/protocols/jabber/jabber.c:1243
 msgid "See Other Host"
 msgstr "Ver otros servidores"
 
-#: src/protocols/jabber/jabber.c:1244
+#: src/protocols/jabber/jabber.c:1245
 msgid "System Shutdown"
 msgstr "Parada del sistema"
 
-#: src/protocols/jabber/jabber.c:1246
+#: src/protocols/jabber/jabber.c:1247
 msgid "Undefined Condition"
 msgstr "Condición no definida"
 
-#: src/protocols/jabber/jabber.c:1248
+#: src/protocols/jabber/jabber.c:1249
 msgid "Unsupported Encoding"
 msgstr "Codificación no soportada"
 
-#: src/protocols/jabber/jabber.c:1250
+#: src/protocols/jabber/jabber.c:1251
 msgid "Unsupported Stanza Type"
 msgstr "Tipo de «stanza» no soportado"
 
-#: src/protocols/jabber/jabber.c:1252
+#: src/protocols/jabber/jabber.c:1253
 msgid "Unsupported Version"
 msgstr "Versión no soportada"
 
-#: src/protocols/jabber/jabber.c:1254
+#: src/protocols/jabber/jabber.c:1255
 msgid "XML Not Well Formed"
 msgstr "XML malformado"
 
-#: src/protocols/jabber/jabber.c:1256
+#: src/protocols/jabber/jabber.c:1257
 msgid "Stream Error"
 msgstr "Error de flujo"
 
-#: src/protocols/jabber/jabber.c:1323
+#: src/protocols/jabber/jabber.c:1324
 #, c-format
 msgid "Unable to ban user %s"
 msgstr "No puede echar al usuario %s."
 
-#: src/protocols/jabber/jabber.c:1375
+#: src/protocols/jabber/jabber.c:1376
 #, c-format
 msgid "Unable to kick user %s"
 msgstr "No puede expulsar al usuario %s."
 
-#: src/protocols/jabber/jabber.c:1400
+#: src/protocols/jabber/jabber.c:1401
 msgid "config:  Configure a chat room."
 msgstr "config:  Configurar una sala de chat"
 
-#: src/protocols/jabber/jabber.c:1403
+#: src/protocols/jabber/jabber.c:1404
 msgid "configure:  Configure a chat room."
 msgstr "configure:  Configurar una sala de chat"
 
-#: src/protocols/jabber/jabber.c:1410
+#: src/protocols/jabber/jabber.c:1411
 msgid "part [room]:  Leave the room."
 msgstr "part [habitación]:  Abandonar la habitación."
 
-#: src/protocols/jabber/jabber.c:1413
+#: src/protocols/jabber/jabber.c:1414
 msgid "register:  Register with a chat room."
 msgstr "register:  Registrarse en una sala de chat."
 
-#: src/protocols/jabber/jabber.c:1418
+#: src/protocols/jabber/jabber.c:1419
 msgid "topic [new topic]:  View or change the topic."
 msgstr "topic [nuevo tema]:  Mostrar o cambiar el tema."
 
-#: src/protocols/jabber/jabber.c:1422
+#: src/protocols/jabber/jabber.c:1423
 msgid "ban &lt;user&gt; [room]:  Ban a user from the room."
 msgstr "ban &lt;usuario&gt; [sala]:  Echar a un usuario de la sala."
 
-#: src/protocols/jabber/jabber.c:1426
+#: src/protocols/jabber/jabber.c:1427
 msgid "invite &lt;user&gt; [room]:  Invite a user to the room."
 msgstr "invite &lt;usuario&gt; [sala]:  Invitar a un usuario a la sala."
 
-#: src/protocols/jabber/jabber.c:1430
+#: src/protocols/jabber/jabber.c:1431
 msgid "join: &lt;room&gt; [server]:  Join a chat on this server."
-msgstr "join: &lt;sala&gt; [servidor]:  Unirse a una sala en el servidor indicado."
-
-#: src/protocols/jabber/jabber.c:1434
+msgstr ""
+"join: &lt;sala&gt; [servidor]:  Unirse a una sala en el servidor indicado."
+
+#: src/protocols/jabber/jabber.c:1435
 msgid "kick &lt;user&gt; [room]:  Kick a user from the room."
 msgstr "kick &lt;usuario&gt; [sala]:  Echar a un usuario de la sala."
 
-#: src/protocols/jabber/jabber.c:1438
+#: src/protocols/jabber/jabber.c:1439
 msgid ""
 "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
-msgstr "msg &lt;nick&gt; &lt;mensaje&gt;:  Enviar un mensaje en privado a un usuario."
-
-#: src/protocols/jabber/jabber.c:1452
+msgstr ""
+"msg &lt;nick&gt; &lt;mensaje&gt;:  Enviar un mensaje en privado a un usuario."
+
+#: src/protocols/jabber/jabber.c:1453
 msgid "Hide Operating System"
 msgstr "Ocultar el sistema operativo"
 
@@ -6176,24 +6281,24 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/jabber/jabber.c:1534 src/protocols/jabber/jabber.c:1536
+#: src/protocols/jabber/jabber.c:1537 src/protocols/jabber/jabber.c:1539
 msgid "Jabber Protocol Plugin"
 msgstr "Complemento de protocolo Jabber"
 
-#: src/protocols/jabber/jabber.c:1562
+#: src/protocols/jabber/jabber.c:1565
 msgid "Use TLS if available"
 msgstr "Usar TLS si está disponible"
 
-#: src/protocols/jabber/jabber.c:1567
+#: src/protocols/jabber/jabber.c:1570
 msgid "Force old SSL"
 msgstr "Forzar SSL antiguo"
 
-#: src/protocols/jabber/jabber.c:1572
+#: src/protocols/jabber/jabber.c:1575
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Permitir autenticación en claro sobre canales no cifrados"
 
 #. Account options
-#: src/protocols/jabber/jabber.c:1581 src/protocols/silc/silc.c:1480
+#: src/protocols/jabber/jabber.c:1584 src/protocols/silc/silc.c:1482
 msgid "Connect server"
 msgstr "Conectar con el servidor"
 
@@ -6278,7 +6383,7 @@
 
 #: src/protocols/jabber/si.c:583 src/protocols/jabber/si.c:584
 msgid "File Send Failed"
-msgstr "Fallo en el envío del archivo"
+msgstr "Fallo en el envío del fichero"
 
 #: src/protocols/msn/cmdproc.c:336
 msgid "Miscellaneous error"
@@ -6336,7 +6441,7 @@
 msgid "Not on list"
 msgstr "No está en la lista"
 
-#: src/protocols/msn/error.c:70 src/protocols/zephyr/zephyr.c:570
+#: src/protocols/msn/error.c:70 src/protocols/zephyr/zephyr.c:593
 msgid "User is offline"
 msgstr "El usuario no está conectado"
 
@@ -6406,7 +6511,7 @@
 
 #: src/protocols/msn/error.c:125
 msgid "File operation error"
-msgstr "Error de operación de archivos"
+msgstr "Error de operación de ficheros"
 
 #: src/protocols/msn/error.c:128
 msgid "Memory allocation error"
@@ -6485,7 +6590,7 @@
 msgid "Server too busy"
 msgstr "Servidor muy ocupado"
 
-#: src/protocols/msn/error.c:198 src/protocols/oscar/oscar.c:2010
+#: src/protocols/msn/error.c:198 src/protocols/oscar/oscar.c:2026
 #: src/protocols/silc/ops.c:1274 src/protocols/toc/toc.c:630
 msgid "Authentication failed"
 msgstr "Falló la autenticación"
@@ -6572,80 +6677,80 @@
 msgid "Page"
 msgstr "Buscapersonas"
 
-#: src/protocols/msn/msn.c:467 src/protocols/msn/msn.c:765
+#: src/protocols/msn/msn.c:463 src/protocols/msn/msn.c:756
 #: src/protocols/msn/state.c:34
 msgid "Away From Computer"
 msgstr "Ausente"
 
-#: src/protocols/msn/msn.c:468 src/protocols/msn/msn.c:767
-#: src/protocols/msn/state.c:33 src/protocols/yahoo/yahoo.c:2477
-#: src/protocols/yahoo/yahoo.c:2858 src/protocols/yahoo/yahoo.c:2974
+#: src/protocols/msn/msn.c:464 src/protocols/msn/msn.c:758
+#: src/protocols/msn/state.c:33 src/protocols/yahoo/yahoo.c:2491
+#: src/protocols/yahoo/yahoo.c:2853 src/protocols/yahoo/yahoo.c:2969
 msgid "Be Right Back"
 msgstr "Vuelvo enseguida"
 
-#: src/protocols/msn/msn.c:469 src/protocols/msn/msn.c:769
+#: src/protocols/msn/msn.c:465 src/protocols/msn/msn.c:760
 #: src/protocols/msn/state.c:31 src/protocols/novell/novell.c:2727
 #: src/protocols/novell/novell.c:2842 src/protocols/novell/novell.c:2896
 #: src/protocols/silc/buddy.c:1383 src/protocols/silc/silc.c:47
-#: src/protocols/silc/silc.c:78 src/protocols/yahoo/yahoo.c:2479
-#: src/protocols/yahoo/yahoo.c:2860 src/protocols/yahoo/yahoo.c:2975
+#: src/protocols/silc/silc.c:78 src/protocols/yahoo/yahoo.c:2493
+#: src/protocols/yahoo/yahoo.c:2855 src/protocols/yahoo/yahoo.c:2970
 msgid "Busy"
 msgstr "Ocupado"
 
-#: src/protocols/msn/msn.c:470 src/protocols/msn/msn.c:771
-#: src/protocols/msn/state.c:35 src/protocols/yahoo/yahoo.c:2487
-#: src/protocols/yahoo/yahoo.c:2868 src/protocols/yahoo/yahoo.c:2979
+#: src/protocols/msn/msn.c:466 src/protocols/msn/msn.c:762
+#: src/protocols/msn/state.c:35 src/protocols/yahoo/yahoo.c:2501
+#: src/protocols/yahoo/yahoo.c:2863 src/protocols/yahoo/yahoo.c:2974
 msgid "On The Phone"
 msgstr "Al teléfono"
 
-#: src/protocols/msn/msn.c:471 src/protocols/msn/msn.c:773
-#: src/protocols/msn/state.c:36 src/protocols/yahoo/yahoo.c:2491
-#: src/protocols/yahoo/yahoo.c:2872 src/protocols/yahoo/yahoo.c:2981
+#: src/protocols/msn/msn.c:467 src/protocols/msn/msn.c:764
+#: src/protocols/msn/state.c:36 src/protocols/yahoo/yahoo.c:2505
+#: src/protocols/yahoo/yahoo.c:2867 src/protocols/yahoo/yahoo.c:2976
 msgid "Out To Lunch"
 msgstr "Salí a comer"
 
-#: src/protocols/msn/msn.c:472 src/protocols/msn/msn.c:775
-#: src/protocols/zephyr/zephyr.c:1205 src/protocols/zephyr/zephyr.c:1220
+#: src/protocols/msn/msn.c:468 src/protocols/msn/msn.c:766
+#: src/protocols/zephyr/zephyr.c:1355 src/protocols/zephyr/zephyr.c:1374
 msgid "Hidden"
 msgstr "Oculto"
 
-#: src/protocols/msn/msn.c:483
+#: src/protocols/msn/msn.c:479
 msgid "Set Friendly Name"
 msgstr "Establecer nombre de amigo"
 
-#: src/protocols/msn/msn.c:488
+#: src/protocols/msn/msn.c:484
 msgid "Set Home Phone Number"
 msgstr "Establecer número de teléfono del domicilio"
 
-#: src/protocols/msn/msn.c:492
+#: src/protocols/msn/msn.c:488
 msgid "Set Work Phone Number"
 msgstr "Establecer número de teléfono del trabajo"
 
-#: src/protocols/msn/msn.c:496
+#: src/protocols/msn/msn.c:492
 msgid "Set Mobile Phone Number"
 msgstr "Establecer el número de teléfono movil"
 
-#: src/protocols/msn/msn.c:502
+#: src/protocols/msn/msn.c:498
 msgid "Enable/Disable Mobile Devices"
 msgstr "Permitir/Rechazar dispositivos móviles"
 
-#: src/protocols/msn/msn.c:507
+#: src/protocols/msn/msn.c:503
 msgid "Allow/Disallow Mobile Pages"
 msgstr "Permitir/Rechazar mensajes a móviles"
 
-#: src/protocols/msn/msn.c:530
+#: src/protocols/msn/msn.c:526
 msgid "Send to Mobile"
 msgstr "Enviar a un móvil"
 
-#: src/protocols/msn/msn.c:540
+#: src/protocols/msn/msn.c:536
 msgid "Initiate Chat"
 msgstr "Iniciar conversación"
 
-#: src/protocols/msn/msn.c:549
+#: src/protocols/msn/msn.c:540
 msgid "Update Buddy Icon"
 msgstr "Actualizar icono de amigo"
 
-#: src/protocols/msn/msn.c:586
+#: src/protocols/msn/msn.c:577
 msgid ""
 "SSL support is needed for MSN. Please install a supported SSL library. See "
 "http://gaim.sf.net/faq-ssl.php for more information."
@@ -6653,106 +6758,106 @@
 "El soporte SSL es necesario para MSN. Por favor, instale una biblioteca SSL "
 "soportada. Para más información, consulte http://gaim.sf.net/faq-ssl.php."
 
-#: src/protocols/msn/msn.c:1156 src/protocols/msn/msn.c:1169
-#: src/protocols/msn/msn.c:1175 src/protocols/yahoo/yahoo_profile.c:640
+#: src/protocols/msn/msn.c:1147 src/protocols/msn/msn.c:1160
+#: src/protocols/msn/msn.c:1166 src/protocols/yahoo/yahoo_profile.c:640
 #: src/protocols/yahoo/yahoo_profile.c:653
 #, c-format
 msgid "<b>%s:</b> %s<br>"
 msgstr "<b>%s:</b> %s<br>"
 
-#: src/protocols/msn/msn.c:1156
+#: src/protocols/msn/msn.c:1147
 msgid "MSN ID"
 msgstr "ID MSN"
 
-#: src/protocols/msn/msn.c:1164 src/protocols/yahoo/yahoo_profile.c:648
-#: src/protocols/zephyr/zephyr.c:602
+#: src/protocols/msn/msn.c:1155 src/protocols/yahoo/yahoo_profile.c:648
+#: src/protocols/zephyr/zephyr.c:626
 #, c-format
 msgid "<b>Alias:</b> %s<br>"
 msgstr "<B>Apodo:</b> %s<br>"
 
-#: src/protocols/msn/msn.c:1241 src/protocols/msn/msn.c:1565
+#: src/protocols/msn/msn.c:1232 src/protocols/msn/msn.c:1556
 #: src/protocols/yahoo/yahoo_profile.c:746
 #: src/protocols/yahoo/yahoo_profile.c:834
 msgid "Error retrieving profile"
 msgstr "Error al obtener el perfil"
 
 #. Age
-#: src/protocols/msn/msn.c:1312 src/protocols/oscar/oscar.c:4870
+#: src/protocols/msn/msn.c:1303 src/protocols/oscar/oscar.c:4886
 #: src/protocols/trepia/trepia.c:285 src/protocols/trepia/trepia.c:404
 #: src/protocols/yahoo/yahoo_profile.c:1010
 msgid "Age"
 msgstr "Edad"
 
 #. Gender
-#: src/protocols/msn/msn.c:1319 src/protocols/oscar/oscar.c:4856
+#: src/protocols/msn/msn.c:1310 src/protocols/oscar/oscar.c:4872
 #: src/protocols/trepia/trepia.c:279 src/protocols/trepia/trepia.c:406
 #: src/protocols/yahoo/yahoo_profile.c:1020
 msgid "Gender"
 msgstr "Sexo"
 
-#: src/protocols/msn/msn.c:1328 src/protocols/yahoo/yahoo_profile.c:1015
+#: src/protocols/msn/msn.c:1319 src/protocols/yahoo/yahoo_profile.c:1015
 msgid "Marital Status"
 msgstr "Estado civil"
 
-#: src/protocols/msn/msn.c:1335 src/protocols/yahoo/yahoo_profile.c:1005
+#: src/protocols/msn/msn.c:1326 src/protocols/yahoo/yahoo_profile.c:1005
 msgid "Location"
 msgstr "Ubicación"
 
-#: src/protocols/msn/msn.c:1343 src/protocols/yahoo/yahoo_profile.c:1025
+#: src/protocols/msn/msn.c:1334 src/protocols/yahoo/yahoo_profile.c:1025
 msgid "Occupation"
 msgstr "Ocupación"
 
-#: src/protocols/msn/msn.c:1360 src/protocols/msn/msn.c:1366
-#: src/protocols/msn/msn.c:1373 src/protocols/msn/msn.c:1381
-#: src/protocols/msn/msn.c:1388
+#: src/protocols/msn/msn.c:1351 src/protocols/msn/msn.c:1357
+#: src/protocols/msn/msn.c:1364 src/protocols/msn/msn.c:1372
+#: src/protocols/msn/msn.c:1379
 msgid "A Little About Me"
 msgstr "Un poco sobre mí"
 
-#: src/protocols/msn/msn.c:1397 src/protocols/msn/msn.c:1403
-#: src/protocols/msn/msn.c:1410 src/protocols/msn/msn.c:1417
+#: src/protocols/msn/msn.c:1388 src/protocols/msn/msn.c:1394
+#: src/protocols/msn/msn.c:1401 src/protocols/msn/msn.c:1408
 msgid "Favorite Things"
 msgstr "Cosas preferidas"
 
-#: src/protocols/msn/msn.c:1426 src/protocols/msn/msn.c:1432
-#: src/protocols/msn/msn.c:1439
+#: src/protocols/msn/msn.c:1417 src/protocols/msn/msn.c:1423
+#: src/protocols/msn/msn.c:1430
 msgid "Hobbies and Interests"
 msgstr "Aficiones e intereses"
 
-#: src/protocols/msn/msn.c:1448 src/protocols/msn/msn.c:1454
+#: src/protocols/msn/msn.c:1439 src/protocols/msn/msn.c:1445
 #: src/protocols/yahoo/yahoo_profile.c:1067
 msgid "Favorite Quote"
 msgstr "Cita preferida"
 
-#: src/protocols/msn/msn.c:1462 src/protocols/yahoo/yahoo_profile.c:1118
+#: src/protocols/msn/msn.c:1453 src/protocols/yahoo/yahoo_profile.c:1118
 msgid "Last Updated"
 msgstr "Actualizado por última vez"
 
 #. Homepage
-#: src/protocols/msn/msn.c:1473 src/protocols/silc/ops.c:820
+#: src/protocols/msn/msn.c:1464 src/protocols/silc/ops.c:820
 #: src/protocols/trepia/trepia.c:289 src/protocols/trepia/trepia.c:419
 msgid "Homepage"
 msgstr "Página personal"
 
 #. put a link to the actual profile URL
-#: src/protocols/msn/msn.c:1484 src/protocols/yahoo/yahoo_profile.c:1121
+#: src/protocols/msn/msn.c:1475 src/protocols/yahoo/yahoo_profile.c:1121
 #: src/util.c:792
 #, c-format
 msgid "<b>%s:</b> "
 msgstr "<b>%s:</b>"
 
-#: src/protocols/msn/msn.c:1484 src/protocols/yahoo/yahoo_profile.c:1121
+#: src/protocols/msn/msn.c:1475 src/protocols/yahoo/yahoo_profile.c:1121
 msgid "Profile URL"
 msgstr "URL del perfil"
 
-#: src/protocols/msn/msn.c:1566 src/protocols/yahoo/yahoo_profile.c:1140
+#: src/protocols/msn/msn.c:1557 src/protocols/yahoo/yahoo_profile.c:1140
 msgid "The user's profile is empty."
 msgstr "El perfil del usuario está vacío."
 
-#: src/protocols/msn/msn.c:1635
+#: src/protocols/msn/msn.c:1626
 msgid "Display conversation closed notices"
 msgstr "Mostrar los avisos de cierre de conversación"
 
-#: src/protocols/msn/msn.c:1640
+#: src/protocols/msn/msn.c:1631
 msgid "Display timeout notices"
 msgstr "Mostrar avisos de expiración"
 
@@ -6767,15 +6872,15 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/msn/msn.c:1722 src/protocols/msn/msn.c:1724
+#: src/protocols/msn/msn.c:1715 src/protocols/msn/msn.c:1717
 msgid "MSN Protocol Plugin"
 msgstr "Complemento de protocolo MSN"
 
-#: src/protocols/msn/msn.c:1743 src/protocols/trepia/trepia.c:1290
+#: src/protocols/msn/msn.c:1736 src/protocols/trepia/trepia.c:1292
 msgid "Login server"
 msgstr "Servidor de conexión"
 
-#: src/protocols/msn/msn.c:1752
+#: src/protocols/msn/msn.c:1745
 msgid "Use HTTP Method"
 msgstr "Usar método HTTP"
 
@@ -6798,7 +6903,7 @@
 msgstr "Recuperando lista de amigos"
 
 #: src/protocols/msn/notification.c:144 src/protocols/msn/notification.c:173
-#: src/protocols/oscar/oscar.c:2299
+#: src/protocols/oscar/oscar.c:2315
 msgid "Password sent"
 msgstr "Contraseña enviada"
 
@@ -6892,7 +6997,9 @@
 #: src/protocols/napster/napster.c:244
 #, c-format
 msgid "Unable to read message from server: %s.  Command is %hd, length is %hd."
-msgstr "No se pudieron leer los mensajes del servidor %s. La orden es %hd, la longitud es %hd."
+msgstr ""
+"No se pudieron leer los mensajes del servidor %s. La orden es %hd, la "
+"longitud es %hd."
 
 #: src/protocols/napster/napster.c:307
 #, c-format
@@ -6929,7 +7036,7 @@
 msgid "%s requested a PING"
 msgstr "%s solicitó un PING"
 
-#: src/protocols/napster/napster.c:541 src/protocols/oscar/oscar.c:6172
+#: src/protocols/napster/napster.c:541 src/protocols/oscar/oscar.c:6188
 #: src/protocols/toc/toc.c:1266
 msgid "_Group:"
 msgstr "_Grupo:"
@@ -6945,7 +7052,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/napster/napster.c:622 src/protocols/napster/napster.c:624
+#: src/protocols/napster/napster.c:624 src/protocols/napster/napster.c:626
 msgid "NAPSTER Protocol Plugin"
 msgstr "Complemento de protocolo NAPSTER"
 
@@ -7033,7 +7140,9 @@
 msgid ""
 "Your account has been disabled because too many invalid passwords were "
 "entered"
-msgstr "Su cuenta ha sido deshabilitada porque se introdujo demasiadas veces una contraseña inválida"
+msgstr ""
+"Su cuenta ha sido deshabilitada porque se introdujo demasiadas veces una "
+"contraseña inválida"
 
 #: src/protocols/novell/nmuser.c:1935
 msgid "You cannot add the same person twice to a conversation"
@@ -7063,7 +7172,9 @@
 msgid ""
 "This evaluation version does not allow more than ten users to log in at one "
 "time"
-msgstr "Esta versión de evaluación no permite la conexión simultánea de más de diez usuarios"
+msgstr ""
+"Esta versión de evaluación no permite la conexión simultánea de más de diez "
+"usuarios"
 
 #: src/protocols/novell/nmuser.c:1957
 msgid "The user is either offline or you are blocked"
@@ -7082,7 +7193,9 @@
 #: src/protocols/novell/novell.c:229
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
-msgstr "No se pudo enviar el mensaje. No se pudiero obtener los detalles del usuario (%s)"
+msgstr ""
+"No se pudo enviar el mensaje. No se pudiero obtener los detalles del usuario "
+"(%s)"
 
 #: src/protocols/novell/novell.c:375
 #, c-format
@@ -7103,7 +7216,8 @@
 #: src/protocols/novell/novell.c:511
 #, c-format
 msgid "Unable to send message to %s. Could not create the conference (%s)."
-msgstr "No se pudo enviar un mensaje a %s. No se pudo crear la conferencia (%s)."
+msgstr ""
+"No se pudo enviar un mensaje a %s. No se pudo crear la conferencia (%s)."
 
 #: src/protocols/novell/novell.c:516
 #, c-format
@@ -7115,14 +7229,18 @@
 msgid ""
 "Unable to move user %s to folder %s in the server side list. Error while "
 "creating folder (%s)."
-msgstr "No se pudo mover al usuario %s a la carpeta %s en la lista del servidor. Se produjo un error al crear la carpeta (%s)."
+msgstr ""
+"No se pudo mover al usuario %s a la carpeta %s en la lista del servidor. Se "
+"produjo un error al crear la carpeta (%s)."
 
 #: src/protocols/novell/novell.c:611
 #, c-format
 msgid ""
 "Unable to add %s to your buddy list. Error creating folder in server side "
 "list (%s)."
-msgstr "No se pudo añadir en su lista de amigos a %s. Se produjo un error al crear la carpeta en la lista del servidor (%s)."
+msgstr ""
+"No se pudo añadir en su lista de amigos a %s. Se produjo un error al crear "
+"la carpeta en la lista del servidor (%s)."
 
 #: src/protocols/novell/novell.c:683
 #, c-format
@@ -7230,13 +7348,16 @@
 
 #: src/protocols/novell/novell.c:1938
 msgid "You have been logged out because you logged in at another workstation."
-msgstr "Ha sido desconectado porque se ha conectado desde otra estación de trabajo."
+msgstr ""
+"Ha sido desconectado porque se ha conectado desde otra estación de trabajo."
 
 #: src/protocols/novell/novell.c:1992
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
-msgstr "No parece que %s esté conectado y no ha recibido el mensaje que acaba de enviar."
+msgstr ""
+"No parece que %s esté conectado y no ha recibido el mensaje que acaba de "
+"enviar."
 
 #. TODO: Would be nice to prompt if not set!
 #. *  gaim_request_fields(gc, _("Server Address"),...);
@@ -7246,7 +7367,9 @@
 msgid ""
 "Unable to connect to server. Please enter the address of the server you wish "
 "to connect to."
-msgstr "No se pudo contactar con el servidor. Por favor, indique la dirección del servidor con el que desea conectarse."
+msgstr ""
+"No se pudo contactar con el servidor. Por favor, indique la dirección del "
+"servidor con el que desea conectarse."
 
 #: src/protocols/novell/novell.c:2112
 msgid "Error. SSL support is not installed."
@@ -7256,8 +7379,8 @@
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "Se ha cerrado esta conferencia. No se pueden enviar más mensajes."
 
-#: src/protocols/novell/novell.c:2733 src/protocols/oscar/oscar.c:582
-#: src/protocols/oscar/oscar.c:6474 src/protocols/yahoo/yahoo.c:2499
+#: src/protocols/novell/novell.c:2733 src/protocols/oscar/oscar.c:586
+#: src/protocols/oscar/oscar.c:6490 src/protocols/yahoo/yahoo.c:2513
 msgid "Offline"
 msgstr "Desconectado"
 
@@ -7284,15 +7407,15 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/novell/novell.c:3387 src/protocols/novell/novell.c:3389
+#: src/protocols/novell/novell.c:3389 src/protocols/novell/novell.c:3391
 msgid "Novell GroupWise Messenger Protocol Plugin"
 msgstr "Complemento de protocolo de Mensajería de Grupos de Novell"
 
-#: src/protocols/novell/novell.c:3408
+#: src/protocols/novell/novell.c:3410
 msgid "Server address"
 msgstr "Dirección del servidor"
 
-#: src/protocols/novell/novell.c:3412
+#: src/protocols/novell/novell.c:3414
 msgid "Server port"
 msgstr "Puerto del servidor"
 
@@ -7392,157 +7515,163 @@
 msgid "Not while on AOL"
 msgstr "No mientras esté en AOL"
 
-#: src/protocols/oscar/oscar.c:436
+#: src/protocols/oscar/oscar.c:403
+msgid ""
+"(There was an error converting this message.  The buddy you are speaking to "
+"most likely has a buggy client.)"
+msgstr "(Se produjo un error al convertir este mensaje. Es posible que el amigo con el que está hablando tiene un cliente defectuoso.)"
+
+#: src/protocols/oscar/oscar.c:441
 msgid "Voice"
 msgstr "Voz"
 
-#: src/protocols/oscar/oscar.c:439
+#: src/protocols/oscar/oscar.c:444
 msgid "AIM Direct IM"
 msgstr "MI Directo AIM"
 
-#: src/protocols/oscar/oscar.c:442 src/protocols/silc/buddy.c:1497
+#: src/protocols/oscar/oscar.c:447 src/protocols/silc/buddy.c:1497
 #: src/protocols/silc/silc.c:635
 msgid "Chat"
 msgstr "Charlar"
 
-#: src/protocols/oscar/oscar.c:445 src/protocols/oscar/oscar.c:6778
+#: src/protocols/oscar/oscar.c:450 src/protocols/oscar/oscar.c:6793
 msgid "Get File"
-msgstr "Recibir archivo"
-
-#: src/protocols/oscar/oscar.c:452
+msgstr "Recibir fichero"
+
+#: src/protocols/oscar/oscar.c:457
 msgid "Games"
 msgstr "Juegos"
 
-#: src/protocols/oscar/oscar.c:455
+#: src/protocols/oscar/oscar.c:460
 msgid "Add-Ins"
 msgstr "Extensiones"
 
-#: src/protocols/oscar/oscar.c:458
+#: src/protocols/oscar/oscar.c:463
 msgid "Send Buddy List"
 msgstr "Enviar lista de amigos"
 
-#: src/protocols/oscar/oscar.c:461
+#: src/protocols/oscar/oscar.c:466
 msgid "ICQ Direct Connect"
 msgstr "Conexión directa ICQ"
 
-#: src/protocols/oscar/oscar.c:464
+#: src/protocols/oscar/oscar.c:469
 msgid "AP User"
 msgstr "Usuario de AP"
 
-#: src/protocols/oscar/oscar.c:467
+#: src/protocols/oscar/oscar.c:472
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
-#: src/protocols/oscar/oscar.c:470
+#: src/protocols/oscar/oscar.c:475
 msgid "Nihilist"
 msgstr "Nihilista"
 
-#: src/protocols/oscar/oscar.c:473
+#: src/protocols/oscar/oscar.c:478
 msgid "ICQ Server Relay"
 msgstr "ICQ Server Relay"
 
-#: src/protocols/oscar/oscar.c:476
+#: src/protocols/oscar/oscar.c:481
 msgid "Old ICQ UTF8"
 msgstr "Antiguo ICQ UTF8"
 
-#: src/protocols/oscar/oscar.c:479
+#: src/protocols/oscar/oscar.c:484
 msgid "Trillian Encryption"
 msgstr "Cifrado Trillian"
 
-#: src/protocols/oscar/oscar.c:482
+#: src/protocols/oscar/oscar.c:487
 msgid "ICQ UTF8"
 msgstr "ICQ UTF8"
 
-#: src/protocols/oscar/oscar.c:485
+#: src/protocols/oscar/oscar.c:490
 msgid "Hiptop"
 msgstr "Hiptop"
 
-#: src/protocols/oscar/oscar.c:488
+#: src/protocols/oscar/oscar.c:493
 msgid "Security Enabled"
 msgstr "Seguridad activada"
 
-#: src/protocols/oscar/oscar.c:491
+#: src/protocols/oscar/oscar.c:496
 msgid "Video Chat"
 msgstr "Video chat"
 
-#: src/protocols/oscar/oscar.c:495
+#: src/protocols/oscar/oscar.c:500
 msgid "iChat AV"
 msgstr "iChat AV"
 
-#: src/protocols/oscar/oscar.c:498
+#: src/protocols/oscar/oscar.c:503
 msgid "Live Video"
 msgstr "Vídeo en tiempo real"
 
-#: src/protocols/oscar/oscar.c:501
+#: src/protocols/oscar/oscar.c:506
 msgid "Camera"
 msgstr "Cámara"
 
-#: src/protocols/oscar/oscar.c:520 src/protocols/oscar/oscar.c:5477
-#: src/protocols/oscar/oscar.c:6667
+#: src/protocols/oscar/oscar.c:524 src/protocols/oscar/oscar.c:5493
+#: src/protocols/oscar/oscar.c:6683
 msgid "Free For Chat"
 msgstr "Disponible para conversar"
 
-#: src/protocols/oscar/oscar.c:524 src/protocols/oscar/oscar.c:5471
-#: src/protocols/oscar/oscar.c:6665
+#: src/protocols/oscar/oscar.c:528 src/protocols/oscar/oscar.c:5487
+#: src/protocols/oscar/oscar.c:6681
 msgid "Not Available"
 msgstr "No disponible"
 
-#: src/protocols/oscar/oscar.c:526 src/protocols/oscar/oscar.c:5474
-#: src/protocols/oscar/oscar.c:6666
+#: src/protocols/oscar/oscar.c:530 src/protocols/oscar/oscar.c:5490
+#: src/protocols/oscar/oscar.c:6682
 msgid "Occupied"
 msgstr "Ocupado"
 
-#: src/protocols/oscar/oscar.c:530
+#: src/protocols/oscar/oscar.c:534
 msgid "Web Aware"
 msgstr "Capacidad web"
 
-#: src/protocols/oscar/oscar.c:598
+#: src/protocols/oscar/oscar.c:602
 msgid "Capabilities"
 msgstr "Capacidades"
 
-#: src/protocols/oscar/oscar.c:604
+#: src/protocols/oscar/oscar.c:609
 msgid "Buddy Comment"
 msgstr "Comentario de amigo"
 
-#: src/protocols/oscar/oscar.c:739
+#: src/protocols/oscar/oscar.c:744
 #, c-format
 msgid "Direct IM with %s closed"
 msgstr "Se cerró el MI con %s"
 
-#: src/protocols/oscar/oscar.c:741
+#: src/protocols/oscar/oscar.c:746
 #, c-format
 msgid "Direct IM with %s failed"
 msgstr "Fallo un MI directo con %s"
 
-#: src/protocols/oscar/oscar.c:748
+#: src/protocols/oscar/oscar.c:753
 msgid "Direct Connect failed"
 msgstr "Falló la conexión directa"
 
-#: src/protocols/oscar/oscar.c:825 src/protocols/oscar/oscar.c:956
+#: src/protocols/oscar/oscar.c:830 src/protocols/oscar/oscar.c:961
 #, c-format
 msgid "Direct IM with %s established"
 msgstr "Se estableció un MI directo con %s"
 
-#: src/protocols/oscar/oscar.c:906
+#: src/protocols/oscar/oscar.c:911
 #, c-format
 msgid "Attempting to connect to %s at %s:%hu for Direct IM."
 msgstr "Intentando conectarse a %s en %s:%hu para IM directo."
 
-#: src/protocols/oscar/oscar.c:1322
+#: src/protocols/oscar/oscar.c:1328
 #, c-format
 msgid "Asking %s to connect to us at %s:%hu for Direct IM."
 msgstr "Solicitando a %s que se conecte con nostros en %s:%hu para IM directo."
 
-#: src/protocols/oscar/oscar.c:1327
+#: src/protocols/oscar/oscar.c:1333
 msgid "Unable to open Direct IM"
 msgstr "No se pudo conectar a MI"
 
-#: src/protocols/oscar/oscar.c:1362
+#: src/protocols/oscar/oscar.c:1368
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr "Usted pidió abrir una conexión MI directa con %s."
 
-#: src/protocols/oscar/oscar.c:1366
+#: src/protocols/oscar/oscar.c:1372
 msgid ""
 "Because this reveals your IP address, it may be considered a privacy risk.  "
 "Do you wish to continue?"
@@ -7550,24 +7679,24 @@
 "Como ésto revela su dirección IP, puede ser considerado como un riesgo a su "
 "privacidad.  ¿Quiere continuar?"
 
-#: src/protocols/oscar/oscar.c:1370 src/protocols/oscar/oscar.c:3312
+#: src/protocols/oscar/oscar.c:1376 src/protocols/oscar/oscar.c:3328
 msgid "Connect"
 msgstr "Conectar"
 
-#: src/protocols/oscar/oscar.c:1436 src/protocols/toc/toc.c:872
+#: src/protocols/oscar/oscar.c:1442 src/protocols/toc/toc.c:872
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "Ha sido desconectado de la sala de chat: %s"
 
-#: src/protocols/oscar/oscar.c:1452
+#: src/protocols/oscar/oscar.c:1458
 msgid "Chat is currently unavailable"
 msgstr "El chat no está disponible"
 
-#: src/protocols/oscar/oscar.c:1533
+#: src/protocols/oscar/oscar.c:1539
 msgid "Screen name sent"
 msgstr "Se ha enviado el nombre de usuario"
 
-#: src/protocols/oscar/oscar.c:1547
+#: src/protocols/oscar/oscar.c:1553
 #, c-format
 msgid ""
 "Unable to login: Could not sign on as %s because the screen name is "
@@ -7578,47 +7707,47 @@
 "no es válido. Los nombres de usuario deben empezar con letras y sólo pueden "
 "contener letras, números y espacios, o contener sólo numeros."
 
-#: src/protocols/oscar/oscar.c:1575
+#: src/protocols/oscar/oscar.c:1581
 msgid "Unable to login to AIM"
 msgstr "No se pudo conectar con AIM"
 
-#: src/protocols/oscar/oscar.c:1676 src/protocols/oscar/oscar.c:2103
+#: src/protocols/oscar/oscar.c:1682 src/protocols/oscar/oscar.c:2119
 msgid "Could Not Connect"
 msgstr "No se pudo conectar"
 
-#: src/protocols/oscar/oscar.c:1684
+#: src/protocols/oscar/oscar.c:1690
 msgid "Connection established, cookie sent"
 msgstr "Conexión establecida, cookie enviada"
 
-#: src/protocols/oscar/oscar.c:1797 src/protocols/yahoo/yahoo_filexfer.c:180
+#: src/protocols/oscar/oscar.c:1803 src/protocols/yahoo/yahoo_filexfer.c:180
 #: src/protocols/yahoo/yahoo_filexfer.c:189
 #: src/protocols/yahoo/yahoo_filexfer.c:199
 msgid "Unable to establish file descriptor."
 msgstr "No se pudo establecer el descriptor de archivo."
 
-#: src/protocols/oscar/oscar.c:1802
+#: src/protocols/oscar/oscar.c:1808
 msgid "Unable to create new connection."
 msgstr "No se pudo crear una nueva conexión."
 
-#: src/protocols/oscar/oscar.c:1873
+#: src/protocols/oscar/oscar.c:1879
 msgid "Unable to establish listener socket."
 msgstr "No se pudo crear el socket de escucha."
 
-#: src/protocols/oscar/oscar.c:1987 src/protocols/toc/toc.c:541
+#: src/protocols/oscar/oscar.c:2003 src/protocols/toc/toc.c:541
 msgid "Incorrect nickname or password."
 msgstr "Nombre de cuenta o contraseña incorrecta."
 
-#: src/protocols/oscar/oscar.c:1992
+#: src/protocols/oscar/oscar.c:2008
 msgid "Your account is currently suspended."
 msgstr "Su cuenta está deshabilitada actualmente."
 
 #. service temporarily unavailable
-#: src/protocols/oscar/oscar.c:1996
+#: src/protocols/oscar/oscar.c:2012
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr ""
 "El servicio de Mensajería Instantáneo AOL está temporalmente no disponible."
 
-#: src/protocols/oscar/oscar.c:2001
+#: src/protocols/oscar/oscar.c:2017
 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."
@@ -7627,23 +7756,23 @@
 "inténtelo de nuevo. Si sigue intentándolo, necesitará esperar incluso más "
 "tiempo."
 
-#: src/protocols/oscar/oscar.c:2006
+#: src/protocols/oscar/oscar.c:2022
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr ""
 "La versión del cliente que usa es demasiado antigua. Por favor, actualícela "
 "en %s"
 
-#: src/protocols/oscar/oscar.c:2038
+#: src/protocols/oscar/oscar.c:2054
 msgid "Internal Error"
 msgstr "Error interno"
 
-#: src/protocols/oscar/oscar.c:2110
+#: src/protocols/oscar/oscar.c:2126
 msgid "Received authorization"
 msgstr "Se recibió la autorización"
 
-#: src/protocols/oscar/oscar.c:2146 src/protocols/oscar/oscar.c:2176
-#: src/protocols/oscar/oscar.c:2264
+#: src/protocols/oscar/oscar.c:2162 src/protocols/oscar/oscar.c:2192
+#: src/protocols/oscar/oscar.c:2280
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
@@ -7652,24 +7781,24 @@
 "Quizá sea desconectado en breve.  Puede querer usar TOC hasta que esto se "
 "resuelva.  Compruebe %s para novedades."
 
-#: src/protocols/oscar/oscar.c:2149 src/protocols/oscar/oscar.c:2179
+#: src/protocols/oscar/oscar.c:2165 src/protocols/oscar/oscar.c:2195
 msgid "Gaim was unable to get a valid AIM login hash."
 msgstr "Gaim no pudo obtener un «hash» de conexión a AIM válido."
 
-#: src/protocols/oscar/oscar.c:2267
+#: src/protocols/oscar/oscar.c:2283
 msgid "Gaim was unable to get a valid login hash."
 msgstr "Gaim no pudo un «hash» de conexión válido."
 
-#: src/protocols/oscar/oscar.c:3096 src/protocols/oscar/oscar.c:3118
+#: src/protocols/oscar/oscar.c:3112 src/protocols/oscar/oscar.c:3134
 msgid "(There was an error receiving this message)"
 msgstr "(Hubo un error recibiendo este mensaje)"
 
-#: src/protocols/oscar/oscar.c:3304
+#: src/protocols/oscar/oscar.c:3320
 #, c-format
 msgid "%s has just asked to directly connect to %s"
 msgstr "%s pide conectarse directamente a %s"
 
-#: src/protocols/oscar/oscar.c:3307
+#: src/protocols/oscar/oscar.c:3323
 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 "
@@ -7679,19 +7808,19 @@
 "para Imágenes de MI.  Como su dirección IP será revelada, puede considerarse "
 "esto como un riesgo a su privacidad."
 
-#: src/protocols/oscar/oscar.c:3343
+#: src/protocols/oscar/oscar.c:3359
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr "Por favor, autoríceme para que pueda añadirle a mi lista de amigos."
 
-#: src/protocols/oscar/oscar.c:3351
+#: src/protocols/oscar/oscar.c:3367
 msgid "Authorization Request Message:"
 msgstr "Mensaje de solicitud de autorización:"
 
-#: src/protocols/oscar/oscar.c:3352
+#: src/protocols/oscar/oscar.c:3368
 msgid "Please authorize me!"
 msgstr "¡Por favor, autoríceme!"
 
-#: src/protocols/oscar/oscar.c:3382
+#: src/protocols/oscar/oscar.c:3398
 #, c-format
 msgid ""
 "The user %s requires authorization before being added to a buddy list.  Do "
@@ -7700,23 +7829,23 @@
 "El usuario %s requiere autorización antes permitir que lo incorporen a una "
 "lista de amigos.  ¿Desea enviar una solicitud de autorización?"
 
-#: src/protocols/oscar/oscar.c:3387 src/protocols/oscar/oscar.c:3389
+#: src/protocols/oscar/oscar.c:3403 src/protocols/oscar/oscar.c:3405
 msgid "Request Authorization"
 msgstr "Pedir autorización"
 
-#: src/protocols/oscar/oscar.c:3437 src/protocols/oscar/oscar.c:3439
-#: src/protocols/oscar/oscar.c:3446 src/protocols/oscar/oscar.c:3528
-#: src/protocols/oscar/oscar.c:3548 src/protocols/oscar/oscar.c:3902
-#: src/protocols/oscar/oscar.c:3962 src/protocols/oscar/oscar.c:6093
-#: src/protocols/oscar/oscar.c:6139
+#: src/protocols/oscar/oscar.c:3453 src/protocols/oscar/oscar.c:3455
+#: src/protocols/oscar/oscar.c:3462 src/protocols/oscar/oscar.c:3544
+#: src/protocols/oscar/oscar.c:3564 src/protocols/oscar/oscar.c:3918
+#: src/protocols/oscar/oscar.c:3978 src/protocols/oscar/oscar.c:6109
+#: src/protocols/oscar/oscar.c:6155
 msgid "No reason given."
 msgstr "No se indicó una razón."
 
-#: src/protocols/oscar/oscar.c:3445
+#: src/protocols/oscar/oscar.c:3461
 msgid "Authorization Denied Message:"
 msgstr "Mensaje de autorización denegada:"
 
-#: src/protocols/oscar/oscar.c:3528
+#: src/protocols/oscar/oscar.c:3544
 #, c-format
 msgid ""
 "The user %u wants to add you to their buddy list for the following reason:\n"
@@ -7725,11 +7854,11 @@
 "El usuario %u quiere añadirle a su lista de amigos por el siguiente motivo:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3536 src/protocols/oscar/oscar.c:6099
+#: src/protocols/oscar/oscar.c:3552 src/protocols/oscar/oscar.c:6115
 msgid "Authorization Request"
 msgstr "Solicitud de autorización"
 
-#: src/protocols/oscar/oscar.c:3548
+#: src/protocols/oscar/oscar.c:3564
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -7740,18 +7869,18 @@
 "la siguiente razón:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3549
+#: src/protocols/oscar/oscar.c:3565
 msgid "ICQ authorization denied."
 msgstr "Autorización ICQ denegada."
 
 #. Someone has granted you authorization
-#: src/protocols/oscar/oscar.c:3556
+#: src/protocols/oscar/oscar.c:3572
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
 msgstr ""
 "El usuario %u ha autorizado su petición de añadirlo a su lista de amigos."
 
-#: src/protocols/oscar/oscar.c:3564
+#: src/protocols/oscar/oscar.c:3580
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -7764,7 +7893,7 @@
 "De: %s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3572
+#: src/protocols/oscar/oscar.c:3588
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -7777,7 +7906,7 @@
 "De: %s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3580
+#: src/protocols/oscar/oscar.c:3596
 #, c-format
 msgid ""
 "You have received an ICQ email from %s [%s]\n"
@@ -7790,34 +7919,34 @@
 "Mensaje:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3601
+#: src/protocols/oscar/oscar.c:3617
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
 msgstr "El usuario ICQ %u le ha enviado un amigo: %s (%s)"
 
-#: src/protocols/oscar/oscar.c:3607
+#: src/protocols/oscar/oscar.c:3623
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr "¿Desea añadir este amigo a su lista de amigos?"
 
-#: src/protocols/oscar/oscar.c:3611
+#: src/protocols/oscar/oscar.c:3627
 msgid "Decline"
 msgstr "No añadirlo"
 
-#: src/protocols/oscar/oscar.c:3696
+#: src/protocols/oscar/oscar.c:3712
 #, 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] "Usted perdió %hu mensaje de %s porque no era válido."
 msgstr[1] "Se perdieron %hu mensajes de %s porque porque no eran válidos."
 
-#: src/protocols/oscar/oscar.c:3705
+#: src/protocols/oscar/oscar.c:3721
 #, 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] "Se perdió %hu mensaje de %s porque era demasiado largo."
 msgstr[1] "Se perdieron %hu mensajes de %s porque eran demasiado largos."
 
-#: src/protocols/oscar/oscar.c:3714
+#: src/protocols/oscar/oscar.c:3730
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -7827,75 +7956,70 @@
 msgstr[1] ""
 "Se perdieron %hu mensajes de %s porque fueron mandados demasiado rápido."
 
-#: src/protocols/oscar/oscar.c:3723
+#: src/protocols/oscar/oscar.c:3739
 #, 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] "Se perdió %hu mensaje de %s porque el/ella es muy malvado/a."
 msgstr[1] "Se perdieron %hu mensajes de %s porque el/ella es muy malvado/a."
 
-#: src/protocols/oscar/oscar.c:3732
+#: src/protocols/oscar/oscar.c:3748
 #, 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] "Se perdió %hu mensaje de %s porque usted es muy malvado/a."
 msgstr[1] "Se perdieron %hu mensajes de %s porque usted es muy malvado/a."
 
-#: src/protocols/oscar/oscar.c:3741
+#: src/protocols/oscar/oscar.c:3757
 #, 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] "Se perdió %hu mensaje de %s por motivos desconocidos."
 msgstr[1] "Se perdieron %hu mensajes de %s por motivos desconocidos."
 
-#: src/protocols/oscar/oscar.c:3798 src/protocols/oscar/oscar.c:4022
+#: src/protocols/oscar/oscar.c:3814 src/protocols/oscar/oscar.c:4038
 #, c-format
 msgid "Info for %s"
 msgstr "Información para %s:"
 
-#: src/protocols/oscar/oscar.c:3803
-#, c-format
-msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<HR>%s"
-msgstr "<B>UIN:</B> %s<BR><B>Estado:</B> %s<HR>%s"
-
-#: src/protocols/oscar/oscar.c:3864
+#: src/protocols/oscar/oscar.c:3880
 #, c-format
 msgid "SNAC threw error: %s\n"
 msgstr "SNAC envió el error: %s\n"
 
-#: src/protocols/oscar/oscar.c:3865
+#: src/protocols/oscar/oscar.c:3881
 msgid "Unknown error"
 msgstr "Error desconocido"
 
 #. Data is assumed to be the destination sn
-#: src/protocols/oscar/oscar.c:3900
+#: src/protocols/oscar/oscar.c:3916
 #, c-format
 msgid "Your message to %s did not get sent:"
 msgstr "Su mensaje a %s no fue enviado:"
 
-#: src/protocols/oscar/oscar.c:3959
+#: src/protocols/oscar/oscar.c:3975
 #, c-format
 msgid "User information for %s unavailable:"
 msgstr "Información de usuario de %s no disponible:"
 
-#: src/protocols/oscar/oscar.c:3982
+#: src/protocols/oscar/oscar.c:3998
 msgid "Warning Level"
 msgstr "Niveles de aviso"
 
-#: src/protocols/oscar/oscar.c:3985
+#: src/protocols/oscar/oscar.c:4001
 msgid "Online Since"
 msgstr "Conectado desde"
 
-#: src/protocols/oscar/oscar.c:3989 src/protocols/yahoo/yahoo_profile.c:1113
+#: src/protocols/oscar/oscar.c:4005 src/protocols/yahoo/yahoo_profile.c:1113
 msgid "Member Since"
 msgstr "Miembro desde"
 
-#: src/protocols/oscar/oscar.c:4073
+#: src/protocols/oscar/oscar.c:4089
 msgid "Your AIM connection may be lost."
 msgstr "Su conexión AIM puede haberse perdido."
 
 #. The conversion failed!
-#: src/protocols/oscar/oscar.c:4259
+#: src/protocols/oscar/oscar.c:4275
 msgid ""
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
@@ -7903,11 +8027,11 @@
 "[No se pudo mostrar un mensaje de este usuario porque contenía caracteres "
 "inválidos.]"
 
-#: src/protocols/oscar/oscar.c:4476
+#: src/protocols/oscar/oscar.c:4492
 msgid "Rate limiting error."
 msgstr "Error del limitador de tasa de mensajes."
 
-#: src/protocols/oscar/oscar.c:4477
+#: src/protocols/oscar/oscar.c:4493
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
@@ -7916,7 +8040,7 @@
 "límite en la tasa de envío de mensajes. Por favor, espere 10 segundos y "
 "vuelva a intentarlo."
 
-#: src/protocols/oscar/oscar.c:4540
+#: src/protocols/oscar/oscar.c:4556
 msgid ""
 "You have been disconnected because you have signed on with this screen name "
 "at another location."
@@ -7924,113 +8048,113 @@
 "Ha sido desconectado porque se ha conectado con el mismo nombre de usuario "
 "desde otra ubicación."
 
-#: src/protocols/oscar/oscar.c:4542
+#: src/protocols/oscar/oscar.c:4558
 msgid "You have been signed off for an unknown reason."
 msgstr "Ha sido desconectado por motivos desconocidos."
 
-#: src/protocols/oscar/oscar.c:4573
+#: src/protocols/oscar/oscar.c:4589
 msgid "Finalizing connection"
 msgstr "Terminando la conexión"
 
-#: src/protocols/oscar/oscar.c:4843 src/protocols/oscar/oscar.c:4850
+#: src/protocols/oscar/oscar.c:4859 src/protocols/oscar/oscar.c:4866
 msgid "Email Address"
 msgstr "Correo electrónico"
 
-#: src/protocols/oscar/oscar.c:4855 src/protocols/silc/buddy.c:1524
+#: src/protocols/oscar/oscar.c:4871 src/protocols/silc/buddy.c:1524
 msgid "Mobile Phone"
 msgstr "Teléfono móvil"
 
-#: src/protocols/oscar/oscar.c:4856
+#: src/protocols/oscar/oscar.c:4872
 msgid "Not specified"
 msgstr "No especificado"
 
-#: src/protocols/oscar/oscar.c:4857 src/protocols/trepia/trepia.c:281
+#: src/protocols/oscar/oscar.c:4873 src/protocols/trepia/trepia.c:281
 #: src/protocols/trepia/trepia.c:407
 msgid "Female"
 msgstr "Mujer"
 
-#: src/protocols/oscar/oscar.c:4857 src/protocols/trepia/trepia.c:280
+#: src/protocols/oscar/oscar.c:4873 src/protocols/trepia/trepia.c:280
 #: src/protocols/trepia/trepia.c:407
 msgid "Male"
 msgstr "Hombre"
 
-#: src/protocols/oscar/oscar.c:4873
+#: src/protocols/oscar/oscar.c:4889
 msgid "Personal Web Page"
 msgstr "Página web personal"
 
-#: src/protocols/oscar/oscar.c:4877
+#: src/protocols/oscar/oscar.c:4893
 msgid "Additional Information"
 msgstr "Información adicional"
 
-#: src/protocols/oscar/oscar.c:4882
-msgid "Home Address"
-msgstr "Domicilio"
-
-#: src/protocols/oscar/oscar.c:4886 src/protocols/oscar/oscar.c:4894
-msgid "Zip Code"
-msgstr "Código postal"
-
-#: src/protocols/oscar/oscar.c:4890
-msgid "Work Address"
-msgstr "Dirección de trabajo"
-
 #: src/protocols/oscar/oscar.c:4898
+msgid "Home Address"
+msgstr "Domicilio"
+
+#: src/protocols/oscar/oscar.c:4902 src/protocols/oscar/oscar.c:4910
+msgid "Zip Code"
+msgstr "Código postal"
+
+#: src/protocols/oscar/oscar.c:4906
+msgid "Work Address"
+msgstr "Dirección de trabajo"
+
+#: src/protocols/oscar/oscar.c:4914
 msgid "Work Information"
 msgstr "Información de trabajo"
 
-#: src/protocols/oscar/oscar.c:4899
+#: src/protocols/oscar/oscar.c:4915
 msgid "Company"
 msgstr "Compañía"
 
-#: src/protocols/oscar/oscar.c:4900
+#: src/protocols/oscar/oscar.c:4916
 msgid "Division"
 msgstr "Sección"
 
-#: src/protocols/oscar/oscar.c:4901
+#: src/protocols/oscar/oscar.c:4917
 msgid "Position"
 msgstr "Cargo"
 
-#: src/protocols/oscar/oscar.c:4903
+#: src/protocols/oscar/oscar.c:4919
 msgid "Web Page"
 msgstr "Página web"
 
-#: src/protocols/oscar/oscar.c:4909
+#: src/protocols/oscar/oscar.c:4925
 #, c-format
 msgid "ICQ Info for %s"
 msgstr "Información ICQ para %s:"
 
-#: src/protocols/oscar/oscar.c:4958
+#: src/protocols/oscar/oscar.c:4974
 msgid "Pop-Up Message"
 msgstr "Mensaje emergente"
 
-#: src/protocols/oscar/oscar.c:4979
+#: src/protocols/oscar/oscar.c:4995
 #, c-format
 msgid "The following screen names are associated with %s"
 msgstr "Los siguientes nombres de usuarios están asociados a %s"
 
-#: src/protocols/oscar/oscar.c:4983
+#: src/protocols/oscar/oscar.c:4999
 msgid "Search Results"
 msgstr "Resultados de la búsqueda"
 
-#: src/protocols/oscar/oscar.c:5000
+#: src/protocols/oscar/oscar.c:5016
 #, c-format
 msgid "No results found for email address %s"
 msgstr "No se encontraron resultados para la dirección de correo %s"
 
-#: src/protocols/oscar/oscar.c:5021
+#: src/protocols/oscar/oscar.c:5037
 #, c-format
 msgid "You should receive an email asking to confirm %s."
 msgstr "Debería recibir un mensaje solicitando confirmación de %s."
 
-#: src/protocols/oscar/oscar.c:5023
+#: src/protocols/oscar/oscar.c:5039
 msgid "Account Confirmation Requested"
 msgstr "Confirmación de cuenta solicitada"
 
-#: src/protocols/oscar/oscar.c:5051
+#: src/protocols/oscar/oscar.c:5067
 msgid "Error Changing Account Info"
 msgstr "Error cambiando la información de la cuenta"
 
-#: src/protocols/oscar/oscar.c:5054
+#: src/protocols/oscar/oscar.c:5070
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -8039,7 +8163,7 @@
 "Error 0x%04x: No se puede dar formato al nombre de usuario porque el nombre "
 "de usuario solicitado difiere del original."
 
-#: src/protocols/oscar/oscar.c:5057
+#: src/protocols/oscar/oscar.c:5073
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -8048,7 +8172,7 @@
 "Error 0x%04x: No se puede dar formato al nombre de usuario porque el nombre "
 "de usuario solicitado termina con un espacio."
 
-#: src/protocols/oscar/oscar.c:5060
+#: src/protocols/oscar/oscar.c:5076
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -8057,7 +8181,7 @@
 "Error 0x%04x: No se puede dar formato al nombre de usuario porque el nombre "
 "de usuario solicitado es demasiado largo."
 
-#: src/protocols/oscar/oscar.c:5063
+#: src/protocols/oscar/oscar.c:5079
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because there is already a "
@@ -8066,7 +8190,7 @@
 "Error 0x%04x: No se puede cambiar la dirección de correo electrónico porque "
 "ya existe una solicitud pendiente para este nombre de usuario."
 
-#: src/protocols/oscar/oscar.c:5066
+#: src/protocols/oscar/oscar.c:5082
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address has "
@@ -8075,7 +8199,7 @@
 "Error 0x%04x: No se puede cambiar la dirección de correo electrónico porque "
 "la dirección dada ya tiene demasiados nombres de usuarios asociados."
 
-#: src/protocols/oscar/oscar.c:5069
+#: src/protocols/oscar/oscar.c:5085
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address is "
@@ -8084,12 +8208,12 @@
 "Error 0x%04x: No se puede cambiar la dirección de correo electrónico porque "
 "la dirección dada es inválida."
 
-#: src/protocols/oscar/oscar.c:5072
+#: src/protocols/oscar/oscar.c:5088
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "Error 0x%04x: Error desconocido."
 
-#: src/protocols/oscar/oscar.c:5082
+#: src/protocols/oscar/oscar.c:5098
 #, c-format
 msgid ""
 "Your screen name is currently formatted as follows:\n"
@@ -8098,25 +8222,27 @@
 "El formato de su nombre de usuario es actualmente el siguiente:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:5083 src/protocols/oscar/oscar.c:5090
+#: src/protocols/oscar/oscar.c:5099 src/protocols/oscar/oscar.c:5106
 msgid "Account Info"
 msgstr "Información de la cuenta"
 
-#: src/protocols/oscar/oscar.c:5088
+#: src/protocols/oscar/oscar.c:5104
 #, c-format
 msgid "The email address for %s is %s"
 msgstr "La dirección de correo electrónico de %s es %s"
 
-#: src/protocols/oscar/oscar.c:5153
+#: src/protocols/oscar/oscar.c:5169
 msgid ""
 "Your IM Image was not sent. You must be Direct Connected to send IM Images."
-msgstr "No se ha enviado su imagen MI. Debe estar directamente conectado para enviar imágenes IM."
-
-#: src/protocols/oscar/oscar.c:5326
+msgstr ""
+"No se ha enviado su imagen MI. Debe estar directamente conectado para enviar "
+"imágenes IM."
+
+#: src/protocols/oscar/oscar.c:5342
 msgid "Unable to set AIM profile."
 msgstr "No se pudo establecer el perfil AIM."
 
-#: src/protocols/oscar/oscar.c:5327
+#: src/protocols/oscar/oscar.c:5343
 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 "
@@ -8126,7 +8252,7 @@
 "conexión se haya completado.  Su perfil quedará sin cambiar, inténtelo "
 "nuevamente cuando ya esté conectado completamente."
 
-#: src/protocols/oscar/oscar.c:5354
+#: src/protocols/oscar/oscar.c:5370
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  Gaim has truncated "
@@ -8141,19 +8267,19 @@
 "Se ha excedido el tamaño máximo de perfil de %d bytes.  Gaim lo aplicó "
 "truncado."
 
-#: src/protocols/oscar/oscar.c:5359
+#: src/protocols/oscar/oscar.c:5375
 msgid "Profile too long."
 msgstr "Perfil demasiado largo."
 
-#: src/protocols/oscar/oscar.c:5375 src/protocols/oscar/oscar.c:6672
+#: src/protocols/oscar/oscar.c:5391 src/protocols/oscar/oscar.c:6688
 msgid "Visible"
 msgstr "Visible"
 
-#: src/protocols/oscar/oscar.c:5393
+#: src/protocols/oscar/oscar.c:5409
 msgid "Unable to set AIM away message."
 msgstr "No se pudo establecer el mensaje de ausencia AIM."
 
-#: src/protocols/oscar/oscar.c:5394
+#: src/protocols/oscar/oscar.c:5410
 msgid ""
 "You have probably requested to set your away message before the login "
 "procedure completed.  You remain in a \"present\" state; try setting it "
@@ -8163,7 +8289,7 @@
 "finalice el proceso de conexión.  Usted quedará en un estado «presente», "
 "intente volver a aplicarlo cuando esté conectado por completo."
 
-#: src/protocols/oscar/oscar.c:5434
+#: src/protocols/oscar/oscar.c:5450
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  Gaim has "
@@ -8178,11 +8304,11 @@
 "Se excedió el límite de %d bytes de longitud en el mensaje de ausencia.  "
 "Gaim lo ha truncado.."
 
-#: src/protocols/oscar/oscar.c:5439
+#: src/protocols/oscar/oscar.c:5455
 msgid "Away message too long."
 msgstr "Mensaje de ausencia demasiado largo"
 
-#: src/protocols/oscar/oscar.c:5517
+#: src/protocols/oscar/oscar.c:5533
 #, c-format
 msgid ""
 "Could not add the buddy %s because the screen name is invalid.  Screen names "
@@ -8193,16 +8319,16 @@
 "nombres de usuario deben empezar con letras y sólo pueden contener letras, "
 "números y espacios, o contener sólo numeros."
 
-#: src/protocols/oscar/oscar.c:5518 src/protocols/oscar/oscar.c:5960
-#: src/protocols/oscar/oscar.c:5973
+#: src/protocols/oscar/oscar.c:5534 src/protocols/oscar/oscar.c:5976
+#: src/protocols/oscar/oscar.c:5989
 msgid "Unable To Add"
 msgstr "No se pudo añadir"
 
-#: src/protocols/oscar/oscar.c:5679
+#: src/protocols/oscar/oscar.c:5695
 msgid "Unable To Retrieve Buddy List"
 msgstr "No se ha podido obtener la lista de amigos"
 
-#: src/protocols/oscar/oscar.c:5680
+#: src/protocols/oscar/oscar.c:5696
 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 "
@@ -8212,13 +8338,13 @@
 "de AIM. La lista no se ha borrado, y seguramente volverá a estar disponible "
 "en unas horas."
 
-#: src/protocols/oscar/oscar.c:5856 src/protocols/oscar/oscar.c:5857
-#: src/protocols/oscar/oscar.c:5862 src/protocols/oscar/oscar.c:6017
-#: src/protocols/oscar/oscar.c:6018 src/protocols/oscar/oscar.c:6023
+#: src/protocols/oscar/oscar.c:5872 src/protocols/oscar/oscar.c:5873
+#: src/protocols/oscar/oscar.c:5878 src/protocols/oscar/oscar.c:6033
+#: src/protocols/oscar/oscar.c:6034 src/protocols/oscar/oscar.c:6039
 msgid "Orphans"
 msgstr "Huérfanos"
 
-#: src/protocols/oscar/oscar.c:5959
+#: src/protocols/oscar/oscar.c:5975
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -8227,11 +8353,11 @@
 "No se ha podido añadir al amigo %s porque hay demasiados contactos en la "
 "lista de amigos. Por favor, elimine uno y vuelva a probar."
 
-#: src/protocols/oscar/oscar.c:5959 src/protocols/oscar/oscar.c:5972
+#: src/protocols/oscar/oscar.c:5975 src/protocols/oscar/oscar.c:5988
 msgid "(no name)"
 msgstr "(sin nombre)"
 
-#: src/protocols/oscar/oscar.c:5972
+#: src/protocols/oscar/oscar.c:5988
 #, c-format
 msgid ""
 "Could not add the buddy %s for an unknown reason.  The most common reason "
@@ -8242,7 +8368,7 @@
 "habitual es que ha llegado al máximo número de amigos permitidos en su lista "
 "de amigos."
 
-#: src/protocols/oscar/oscar.c:6054
+#: src/protocols/oscar/oscar.c:6070
 #, c-format
 msgid ""
 "The user %s has given you permission to add you to their buddy list.  Do you "
@@ -8251,11 +8377,11 @@
 "El usuario %s le ha dado a usted permiso para añadirle a su lista de "
 "amigos.  ¿Desea hacerlo?"
 
-#: src/protocols/oscar/oscar.c:6060
+#: src/protocols/oscar/oscar.c:6076
 msgid "Authorization Given"
 msgstr "Autorización otorgada"
 
-#: src/protocols/oscar/oscar.c:6093
+#: src/protocols/oscar/oscar.c:6109
 #, c-format
 msgid ""
 "The user %s wants to add you to their buddy list for the following reason:\n"
@@ -8265,18 +8391,18 @@
 "%s"
 
 #. Granted
-#: src/protocols/oscar/oscar.c:6135
+#: src/protocols/oscar/oscar.c:6151
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
 msgstr ""
 "El usuario %s ha autorizado su solicitud de añadirlo a su lista de amigos."
 
-#: src/protocols/oscar/oscar.c:6136
+#: src/protocols/oscar/oscar.c:6152
 msgid "Authorization Granted"
 msgstr "Autorización aceptada"
 
 #. Denied
-#: src/protocols/oscar/oscar.c:6139
+#: src/protocols/oscar/oscar.c:6155
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -8287,73 +8413,74 @@
 "la siguiente razón:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:6140
+#: src/protocols/oscar/oscar.c:6156
 msgid "Authorization Denied"
 msgstr "Autorización denegada"
 
-#: src/protocols/oscar/oscar.c:6177 src/protocols/toc/toc.c:1271
+#: src/protocols/oscar/oscar.c:6193 src/protocols/toc/toc.c:1271
 msgid "_Exchange:"
 msgstr "_Intercambio:"
 
-#: src/protocols/oscar/oscar.c:6199
+#: src/protocols/oscar/oscar.c:6215
 msgid "Invalid chat name specified."
 msgstr "Se especificó un nombre de chat no válido"
 
-#: src/protocols/oscar/oscar.c:6289
+#: src/protocols/oscar/oscar.c:6305
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
-msgstr "No se ha enviado su imagen MI. No se pueden enviar imágenes IM en chats AIM."
-
-#: src/protocols/oscar/oscar.c:6446
+msgstr ""
+"No se ha enviado su imagen MI. No se pueden enviar imágenes IM en chats AIM."
+
+#: src/protocols/oscar/oscar.c:6462
 msgid "Away Message"
 msgstr "Mensaje de ausencia"
 
-#: src/protocols/oscar/oscar.c:6730
+#: src/protocols/oscar/oscar.c:6746
 msgid "Buddy Comment:"
 msgstr "Comentario de amigo:"
 
-#: src/protocols/oscar/oscar.c:6748
+#: src/protocols/oscar/oscar.c:6764
 msgid "Edit Buddy Comment"
 msgstr "Editar comentario de amigo"
 
-#: src/protocols/oscar/oscar.c:6754
+#: src/protocols/oscar/oscar.c:6770
 msgid "Get Status Msg"
 msgstr "Obtener msj de estado"
 
-#: src/protocols/oscar/oscar.c:6766
+#: src/protocols/oscar/oscar.c:6782
 msgid "Direct IM"
 msgstr "MI directo"
 
-#: src/protocols/oscar/oscar.c:6789
+#: src/protocols/oscar/oscar.c:6804
 msgid "Re-request Authorization"
 msgstr "Solicitar autorización otra vez"
 
-#: src/protocols/oscar/oscar.c:6819
+#: src/protocols/oscar/oscar.c:6834
 msgid "The new formatting is invalid."
 msgstr "El nuevo formato es inválido."
 
-#: src/protocols/oscar/oscar.c:6820
+#: src/protocols/oscar/oscar.c:6835
 msgid "Screen name formatting can change only capitalization and whitespace."
 msgstr ""
 "El formato del nombre de usuario sólo puede cambiar en la capitalización y "
 "espacios en blanco."
 
-#: src/protocols/oscar/oscar.c:6827
+#: src/protocols/oscar/oscar.c:6842
 msgid "New screen name formatting:"
 msgstr "Nuevo formato del nombre de usuario:"
 
-#: src/protocols/oscar/oscar.c:6879
+#: src/protocols/oscar/oscar.c:6894
 msgid "Change Address To:"
 msgstr "Cambiar dirección a:"
 
-#: src/protocols/oscar/oscar.c:6924
+#: src/protocols/oscar/oscar.c:6939
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>usted no está esperando autorización</i>"
 
-#: src/protocols/oscar/oscar.c:6927
+#: src/protocols/oscar/oscar.c:6942
 msgid "You are awaiting authorization from the following buddies"
 msgstr "En espera de la autorización de los siguientes amigos:"
 
-#: src/protocols/oscar/oscar.c:6928
+#: src/protocols/oscar/oscar.c:6943
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
@@ -8361,76 +8488,76 @@
 "Puede volver a pedir autorización a estos amigos apretando el botón derecho "
 "del ratón sobre ellos y escogiendo «Solicitar autorización otra vez.»"
 
-#: src/protocols/oscar/oscar.c:6945
+#: src/protocols/oscar/oscar.c:6960
 msgid "Find Buddy by E-mail"
 msgstr "Buscar un amigo en base a su correo electrónico"
 
-#: src/protocols/oscar/oscar.c:6946
+#: src/protocols/oscar/oscar.c:6961
 msgid "Search for a buddy by e-mail address"
 msgstr "Buscar amigo por la dirección correo electrónico"
 
-#: src/protocols/oscar/oscar.c:6947
+#: src/protocols/oscar/oscar.c:6962
 msgid "Type the e-mail address of the buddy you are searching for."
 msgstr ""
 "Escriba la dirección de correo electrónico del amigo que está buscando."
 
-#: src/protocols/oscar/oscar.c:6964
+#: src/protocols/oscar/oscar.c:6979
 msgid "Available Message:"
 msgstr "Mensajes disponibles:"
 
-#: src/protocols/oscar/oscar.c:6965
+#: src/protocols/oscar/oscar.c:6980
 msgid "I'm doing work and hoping for a distraction--IM me!"
 msgstr "Estoy trabajando y deseando ser distraido -- ¡envíame un MI!"
 
-#: src/protocols/oscar/oscar.c:7046 src/protocols/silc/silc.c:786
+#: src/protocols/oscar/oscar.c:7061 src/protocols/silc/silc.c:786
 msgid "Set User Info..."
 msgstr "Establecer información de usuario..."
 
-#: src/protocols/oscar/oscar.c:7051
+#: src/protocols/oscar/oscar.c:7066
 msgid "Set User Info (URL)..."
 msgstr "Establecer información de usuario (URL)..."
 
-#: src/protocols/oscar/oscar.c:7057
+#: src/protocols/oscar/oscar.c:7072
 msgid "Set Available Message..."
 msgstr "Establecer mensaje de disponibilidad..."
 
-#: src/protocols/oscar/oscar.c:7062 src/protocols/silc/silc.c:782
+#: src/protocols/oscar/oscar.c:7077 src/protocols/silc/silc.c:782
 msgid "Change Password..."
 msgstr "Cambiar contraseña..."
 
-#: src/protocols/oscar/oscar.c:7067
+#: src/protocols/oscar/oscar.c:7082
 msgid "Change Password (URL)"
 msgstr "Cambiar contraseña (URL)"
 
-#: src/protocols/oscar/oscar.c:7071
+#: src/protocols/oscar/oscar.c:7086
 msgid "Configure IM Forwarding (URL)"
 msgstr "Configurar reenvío de MI (URL)"
 
-#: src/protocols/oscar/oscar.c:7080
+#: src/protocols/oscar/oscar.c:7095
 msgid "Format Screen Name..."
 msgstr "Formato del nombre de usuario..."
 
-#: src/protocols/oscar/oscar.c:7084
+#: src/protocols/oscar/oscar.c:7099
 msgid "Confirm Account"
 msgstr "Confirmar cuenta"
 
-#: src/protocols/oscar/oscar.c:7088
+#: src/protocols/oscar/oscar.c:7103
 msgid "Display Currently Registered Address"
 msgstr "Mostrar dirección registrada actualmente"
 
-#: src/protocols/oscar/oscar.c:7092
+#: src/protocols/oscar/oscar.c:7107
 msgid "Change Currently Registered Address..."
 msgstr "Cambiar la dirección registrada..."
 
-#: src/protocols/oscar/oscar.c:7099
+#: src/protocols/oscar/oscar.c:7114
 msgid "Show Buddies Awaiting Authorization"
 msgstr "Mostrar amigos pendientes de autorización"
 
-#: src/protocols/oscar/oscar.c:7105
+#: src/protocols/oscar/oscar.c:7120
 msgid "Search for Buddy by Email..."
 msgstr "Buscar amigo por correo electrónico..."
 
-#: src/protocols/oscar/oscar.c:7110
+#: src/protocols/oscar/oscar.c:7125
 msgid "Search for Buddy by Information"
 msgstr "Buscar un amigo a través de su información"
 
@@ -8445,15 +8572,15 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/oscar/oscar.c:7226 src/protocols/oscar/oscar.c:7228
+#: src/protocols/oscar/oscar.c:7243 src/protocols/oscar/oscar.c:7245
 msgid "AIM/ICQ Protocol Plugin"
 msgstr "Complemento de protocolo AIM/ICQ"
 
-#: src/protocols/oscar/oscar.c:7247
+#: src/protocols/oscar/oscar.c:7264
 msgid "Auth host"
 msgstr "Servidor de autenticación"
 
-#: src/protocols/oscar/oscar.c:7252
+#: src/protocols/oscar/oscar.c:7269
 msgid "Auth port"
 msgstr "Puerto de autenticación"
 
@@ -8509,7 +8636,9 @@
 msgid ""
 "Key agreement request received from %s. Would you like to perform the key "
 "agreement?"
-msgstr "Se ha recibido una solicitud de acuerdo de claves de %s. ¿Desea realizar el intercambio de claves?"
+msgstr ""
+"Se ha recibido una solicitud de acuerdo de claves de %s. ¿Desea realizar el "
+"intercambio de claves?"
 
 #: src/protocols/silc/buddy.c:292
 #, c-format
@@ -8549,7 +8678,7 @@
 msgid "Cannot fetch the public key"
 msgstr "No se pudo obtener la clave pública"
 
-#: src/protocols/silc/buddy.c:629 src/protocols/silc/buddy.c:1619
+#: src/protocols/silc/buddy.c:629 src/protocols/silc/buddy.c:1605
 msgid "Show Public Key"
 msgstr "Mostrar clave pública"
 
@@ -8578,7 +8707,9 @@
 msgid ""
 "You cannot receive buddy notifications until you import his/her public key.  "
 "You can use the Get Public Key command to get the public key."
-msgstr "No puede recibir notificaciones de este amigo hasta que importe su clave pública. Puede utilizar la orden \"Obtener clave pública\" para importarla."
+msgstr ""
+"No puede recibir notificaciones de este amigo hasta que importe su clave "
+"pública. Puede utilizar la orden \"Obtener clave pública\" para importarla."
 
 #: src/protocols/silc/buddy.c:1032
 #, c-format
@@ -8589,7 +8720,9 @@
 msgid ""
 "To add the buddy you must import his/her public key. Press Import to import "
 "a public key."
-msgstr "Para añadir al amigo debe importar su clave pública. Pulse Importar para importar una clave pública."
+msgstr ""
+"Para añadir al amigo debe importar su clave pública. Pulse Importar para "
+"importar una clave pública."
 
 #: src/protocols/silc/buddy.c:1038
 msgid "Import..."
@@ -8603,13 +8736,17 @@
 msgid ""
 "More than one user was found with the same public key. Select the correct "
 "user from the list to add to the buddy list."
-msgstr "Se ha encontrado más de un usuario con la misma clave pública. Seleccione el usuario que desea añar a su lista de amigos de la lista mostrada."
+msgstr ""
+"Se ha encontrado más de un usuario con la misma clave pública. Seleccione el "
+"usuario que desea añar a su lista de amigos de la lista mostrada."
 
 #: src/protocols/silc/buddy.c:1129
 msgid ""
 "More than one user was found with the same name. Select the correct user "
 "from the list to add to the buddy list."
-msgstr "Se ha encontrado más de un usuario con el mismo nombre. Seleccione el usuario que desea añadir a su lista de amigos de la listas mostrada."
+msgstr ""
+"Se ha encontrado más de un usuario con el mismo nombre. Seleccione el "
+"usuario que desea añadir a su lista de amigos de la listas mostrada."
 
 #: src/protocols/silc/buddy.c:1377
 msgid "Detached"
@@ -8750,27 +8887,23 @@
 msgid "Geolocation"
 msgstr "Localización"
 
-#: src/protocols/silc/buddy.c:1604
+#: src/protocols/silc/buddy.c:1590
 msgid "Reset IM Key"
 msgstr "Borrar la clave MI"
 
-#: src/protocols/silc/buddy.c:1609
+#: src/protocols/silc/buddy.c:1595
 msgid "IM with Key Exchange"
 msgstr "MI con intercambio de claves"
 
-#: src/protocols/silc/buddy.c:1613
+#: src/protocols/silc/buddy.c:1599
 msgid "IM with Password"
 msgstr "MI con contraseña"
 
-#: src/protocols/silc/buddy.c:1624
+#: src/protocols/silc/buddy.c:1610
 msgid "Get Public Key..."
 msgstr "Obtener clave pública..."
 
-#: src/protocols/silc/buddy.c:1629
-msgid "Send File..."
-msgstr "Enviar archivo..."
-
-#: src/protocols/silc/buddy.c:1634 src/protocols/silc/ops.c:1182
+#: src/protocols/silc/buddy.c:1616 src/protocols/silc/ops.c:1182
 msgid "Kill User"
 msgstr "Matar usuario"
 
@@ -8832,7 +8965,9 @@
 msgid ""
 "\n"
 "Channel Modes:\n"
-msgstr "\nModos del canal:\n"
+msgstr ""
+"\n"
+"Modos del canal:\n"
 
 #: src/protocols/silc/chat.c:144
 #, c-format
@@ -8880,7 +9015,12 @@
 "signatures. If passphrase is set, it is required to be able to join. If "
 "channel public keys are set then only users whose public keys are listed are "
 "able to join."
-msgstr "Se utiliza La autenticación de canal para prevenir el acceso no autorizado. La autenticación puede estar basada en una contraseña o en firmas digitales. Se necesita la contraseña del canal si ésta se ha establecido. Sólo podrán conectarse los usuarios que estén en la lista de claves públicas si se utilizan claves públicas para el acceso."
+msgstr ""
+"Se utiliza La autenticación de canal para prevenir el acceso no autorizado. "
+"La autenticación puede estar basada en una contraseña o en firmas digitales. "
+"Se necesita la contraseña del canal si ésta se ha establecido. Sólo podrán "
+"conectarse los usuarios que estén en la lista de claves públicas si se "
+"utilizan claves públicas para el acceso."
 
 #: src/protocols/silc/chat.c:403 src/protocols/silc/chat.c:404
 #: src/protocols/silc/chat.c:441 src/protocols/silc/chat.c:442
@@ -8903,7 +9043,9 @@
 #: src/protocols/silc/chat.c:575
 #, c-format
 msgid "Please enter the %s channel private group name and passphrase."
-msgstr "Por favor, indique el nombre del grupo de canales privados %s y una contraseña."
+msgstr ""
+"Por favor, indique el nombre del grupo de canales privados %s y una "
+"contraseña."
 
 #: src/protocols/silc/chat.c:577
 msgid "Add Channel Private Group"
@@ -8915,7 +9057,9 @@
 
 #: src/protocols/silc/chat.c:705
 msgid "Set user limit on channel. Set to zero to reset user limit."
-msgstr "Fijar un limite de usuarios en el canal. Poner a cero para quitar el límite de usuarios."
+msgstr ""
+"Fijar un limite de usuarios en el canal. Poner a cero para quitar el límite "
+"de usuarios."
 
 #: src/protocols/silc/chat.c:847
 msgid "Get Info"
@@ -9008,7 +9152,7 @@
 #: src/protocols/silc/ft.c:211 src/protocols/silc/ft.c:216
 #: src/protocols/silc/ft.c:222 src/protocols/silc/ft.c:342
 msgid "Secure File Transfer"
-msgstr "Transferencia de archivos segura"
+msgstr "Transferencia segura de ficheros"
 
 #: src/protocols/silc/ft.c:90 src/protocols/silc/ft.c:93
 #: src/protocols/silc/ft.c:97 src/protocols/silc/ft.c:101
@@ -9026,7 +9170,7 @@
 
 #: src/protocols/silc/ft.c:102
 msgid "File transfer sessions does not exist"
-msgstr "No existen sesiones de transferencia de archivos"
+msgstr "No existen sesiones de transferencia de ficheros"
 
 #: src/protocols/silc/ft.c:207
 msgid "No file transfer session active"
@@ -9034,11 +9178,13 @@
 
 #: src/protocols/silc/ft.c:212
 msgid "File transfer already started"
-msgstr "Ya se ha iniciado la transferencia de archivos"
+msgstr "Ya se ha iniciado la transferencia de ficheros"
 
 #: src/protocols/silc/ft.c:217
 msgid "Could not perform key agreement for file transfer"
-msgstr "No se pudo realizar el acuerdo de claves para realizar la transferencia de ficheros."
+msgstr ""
+"No se pudo realizar el acuerdo de claves para realizar la transferencia de "
+"ficheros."
 
 #: src/protocols/silc/ft.c:223
 msgid "Could not start the file transfer"
@@ -9204,7 +9350,9 @@
 #: src/protocols/silc/ops.c:1279
 msgid ""
 "Resuming detached session failed. Press Reconnect to create new connection."
-msgstr "Se produjo un fallo al retomar la sesión desligada. Pulse Reconectar para crear una nueva conexión."
+msgstr ""
+"Se produjo un fallo al retomar la sesión desligada. Pulse Reconectar para "
+"crear una nueva conexión."
 
 #: src/protocols/silc/ops.c:1314
 msgid "Disconnected by server"
@@ -9229,7 +9377,9 @@
 
 #: src/protocols/silc/ops.c:1493
 msgid "Failure: Version mismatch, upgrade your client"
-msgstr "Fallo: Existe una diferencia en las versiones, por favor, actualice su cliente."
+msgstr ""
+"Fallo: Existe una diferencia en las versiones, por favor, actualice su "
+"cliente."
 
 #: src/protocols/silc/ops.c:1496
 msgid "Failure: Remote does not trust/support your public key"
@@ -9241,7 +9391,8 @@
 
 #: src/protocols/silc/ops.c:1502
 msgid "Failure: Remote does not support proposed cipher"
-msgstr "Fallo: El servidor remoto no soporta los sistemas de cifrado propuestos"
+msgstr ""
+"Fallo: El servidor remoto no soporta los sistemas de cifrado propuestos"
 
 #: src/protocols/silc/ops.c:1505
 msgid "Failure: Remote does not support proposed PKCS"
@@ -9272,7 +9423,9 @@
 msgid ""
 "Received %s's public key. Your local copy does not match this key. Would you "
 "still like to accept this public key?"
-msgstr "Se recibió la clave pública de %s. Su copia local no coincide con esta clave. ¿Desea aceptar la clave pública de todas formas?"
+msgstr ""
+"Se recibió la clave pública de %s. Su copia local no coincide con esta "
+"clave. ¿Desea aceptar la clave pública de todas formas?"
 
 #: src/protocols/silc/pk.c:108
 #, c-format
@@ -9337,7 +9490,9 @@
 msgid ""
 "\n"
 "Your Preferred Contact Methods"
-msgstr "\nSus métodos de contacto preferidos"
+msgstr ""
+"\n"
+"Sus métodos de contacto preferidos"
 
 #: src/protocols/silc/silc.c:650
 msgid "Your Current Status"
@@ -9368,7 +9523,10 @@
 "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 "
 "about yourself."
-msgstr "Puede permitir que otros usuarios consulten la información de su estado en línea así como su información personal. Por favor, rellene la información que desea que otros usuarios vean de vd."
+msgstr ""
+"Puede permitir que otros usuarios consulten la información de su estado en "
+"línea así como su información personal. Por favor, rellene la información "
+"que desea que otros usuarios vean de vd."
 
 #: src/protocols/silc/silc.c:727 src/protocols/silc/silc.c:732
 #: src/protocols/silc/silc.c:1101 src/protocols/silc/silc.c:1106
@@ -9420,13 +9578,15 @@
 msgid "whois &lt;nick&gt;:  View nick's information"
 msgstr "whois &lt;apodo&gt;:  Mostrar información del apodo"
 
-#: src/protocols/silc/silc.c:1241
+#: src/protocols/silc/silc.c:1241 src/protocols/zephyr/zephyr.c:1673
 msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user"
-msgstr "msg &lt;apodo&gt; &lt;mensaje&gt;:  Enviar un mensaje privado a un usuario"
+msgstr ""
+"msg &lt;apodo&gt; &lt;mensaje&gt;:  Enviar un mensaje privado a un usuario"
 
 #: src/protocols/silc/silc.c:1245
 msgid "query &lt;nick&gt; [&lt;message&gt;]:  Send a private message to a user"
-msgstr "query &lt;apodo&gt; [&lt;mensaje&gt;]:  Enviar un mensaje privado al usuario"
+msgstr ""
+"query &lt;apodo&gt; [&lt;mensaje&gt;]:  Enviar un mensaje privado al usuario"
 
 #: src/protocols/silc/silc.c:1249
 msgid "motd:  View the server's Message Of The Day"
@@ -9486,40 +9646,40 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/silc/silc.c:1455
+#: src/protocols/silc/silc.c:1457
 msgid "SILC Protocol Plugin"
 msgstr "Complemento de protocolo SILC"
 
 #. *  description
-#: src/protocols/silc/silc.c:1457
+#: src/protocols/silc/silc.c:1459
 msgid "Secure Internet Live Conferencing (SILC) Protocol"
 msgstr "Protocolo de Conferencia segura en vívo en Internet (SILC)"
 
-#: src/protocols/silc/silc.c:1487
+#: src/protocols/silc/silc.c:1489
 msgid "Public key authentication"
 msgstr "Autenticación de clave pública"
 
-#: src/protocols/silc/silc.c:1493
+#: src/protocols/silc/silc.c:1495
 msgid "Public Key File"
 msgstr "Fichero de clave pública"
 
-#: src/protocols/silc/silc.c:1497
+#: src/protocols/silc/silc.c:1499
 msgid "Private Key File"
 msgstr "Fichero de clave privada"
 
-#: src/protocols/silc/silc.c:1502
+#: src/protocols/silc/silc.c:1504
 msgid "Reject watching by other users"
 msgstr "Impedir que otros usuarios miren"
 
-#: src/protocols/silc/silc.c:1505
+#: src/protocols/silc/silc.c:1507
 msgid "Block invites"
 msgstr "Bloquear invitaciones"
 
-#: src/protocols/silc/silc.c:1508
+#: src/protocols/silc/silc.c:1510
 msgid "Block IMs without Key Exchange"
 msgstr "Bloquear MIs que no hagan un intercambio de claves"
 
-#: src/protocols/silc/silc.c:1511
+#: src/protocols/silc/silc.c:1513
 msgid "Reject online status attribute requests"
 msgstr "Rechazar solicitudes de los atributos del estado en línea"
 
@@ -9763,9 +9923,7 @@
 
 #: src/protocols/toc/toc.c:1703
 msgid "File transfer failed; other side probably canceled."
-msgstr ""
-"Falló la transferencia del archivo; posiblemente fue cancelado por el otro "
-"extremo."
+msgstr "Se produjo un fallo en la transferencia del fichero; posiblemente fue cancelado por el otro extremo."
 
 #: src/protocols/toc/toc.c:1748 src/protocols/toc/toc.c:1788
 #: src/protocols/toc/toc.c:1912 src/protocols/toc/toc.c:2000
@@ -9804,15 +9962,15 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/toc/toc.c:2167 src/protocols/toc/toc.c:2169
+#: src/protocols/toc/toc.c:2169 src/protocols/toc/toc.c:2171
 msgid "TOC Protocol Plugin"
 msgstr "Complemento de protocolo TOC"
 
-#: src/protocols/toc/toc.c:2188
+#: src/protocols/toc/toc.c:2190
 msgid "TOC host"
 msgstr "Servidor TOC"
 
-#: src/protocols/toc/toc.c:2192
+#: src/protocols/toc/toc.c:2194
 msgid "TOC port"
 msgstr "Puerto TOC"
 
@@ -9896,38 +10054,38 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/trepia/trepia.c:1269 src/protocols/trepia/trepia.c:1271
+#: src/protocols/trepia/trepia.c:1271 src/protocols/trepia/trepia.c:1273
 msgid "Trepia Protocol Plugin"
 msgstr "Complemento de protocolo Trepia"
 
-#: src/protocols/yahoo/yahoo.c:337
+#: src/protocols/yahoo/yahoo.c:338
 msgid ""
 "You have been logged off as you have logged in on a different machine or "
 "device."
 msgstr ""
 "Ha sido desconectado dado que se ha conectado en otro equipo o dispositivo."
 
-#: src/protocols/yahoo/yahoo.c:807
+#: src/protocols/yahoo/yahoo.c:808
 msgid "Your Yahoo! message did not get sent."
 msgstr "Su mensaje Yahoo! no se envió."
 
-#: src/protocols/yahoo/yahoo.c:826
+#: src/protocols/yahoo/yahoo.c:827
 msgid "Buzz!!"
 msgstr "¡¡Buzz!!"
 
-#: src/protocols/yahoo/yahoo.c:869
+#: src/protocols/yahoo/yahoo.c:870
 #, c-format
 msgid "Yahoo! system message for %s:"
 msgstr "Mensaje del sistema Yahoo! para %s:"
 
-#: src/protocols/yahoo/yahoo.c:935
+#: src/protocols/yahoo/yahoo.c:936
 #, c-format
 msgid "%s has (retroactively) denied your request to add them to your list."
 msgstr ""
 "El usuario %s ha rechazado su solicitud de añadirlo a su lista de amigos (de "
 "forma retroactiva)."
 
-#: src/protocols/yahoo/yahoo.c:938
+#: src/protocols/yahoo/yahoo.c:939
 #, c-format
 msgid ""
 "%s has (retroactively) denied your request to add them to your list for the "
@@ -9936,11 +10094,11 @@
 "El usuario %s ha negado (de forma retroactiva) su solicitud de añadirlo a su "
 "lista de amigos por la siguiente razón: %s."
 
-#: src/protocols/yahoo/yahoo.c:941
+#: src/protocols/yahoo/yahoo.c:942
 msgid "Add buddy rejected"
 msgstr "Se rechazó la adición del amigo"
 
-#: src/protocols/yahoo/yahoo.c:1701
+#: src/protocols/yahoo/yahoo.c:1702
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -9951,11 +10109,11 @@
 "desconocido. Esta versión de Gaim posiblemente no sea capaz de conectarse a "
 "Yahoo. Compruebe %s para obtener una actualización."
 
-#: src/protocols/yahoo/yahoo.c:1704
+#: src/protocols/yahoo/yahoo.c:1705
 msgid "Failed Yahoo! Authentication"
 msgstr "Falló la autenticación en Yahoo!"
 
-#: src/protocols/yahoo/yahoo.c:1776
+#: src/protocols/yahoo/yahoo.c:1777
 #, c-format
 msgid ""
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
@@ -9964,78 +10122,93 @@
 "Ha intentado ignorar a %s, pero el usuario está en su lista de amigos. Si "
 "selecciona «Sí» se le eliminará y se ignorará a este amigo."
 
-#: src/protocols/yahoo/yahoo.c:1779
+#: src/protocols/yahoo/yahoo.c:1780
 msgid "Ignore buddy?"
 msgstr "¿Ignorar amigo?"
 
-#: src/protocols/yahoo/yahoo.c:1812
+#: src/protocols/yahoo/yahoo.c:1814
 msgid "Invalid username."
 msgstr "Nombre de usuario no válido."
 
-#: src/protocols/yahoo/yahoo.c:1815
+#: src/protocols/yahoo/yahoo.c:1825
+msgid "Normal authencation failed!"
+msgstr "¡Falló la autenticación normal!"
+
+#: src/protocols/yahoo/yahoo.c:1826
+msgid ""
+"The normal authencation method has failed. This means either your password "
+"is incorrect, or Yahoo!'s authencation scheme has changed. Gaim will now "
+"attempt to log in using Web Messenger authencation, will which result in "
+"reduced functionality and features."
+msgstr "El método de autenticación habitual falló. Esto significa o bien que que su contraseña no es correcta o bien que el sistema de autenticación de Yahoo! ha cambiado. Gaim intentará conectarse a través de la autenticación de Mensajería web que podrá dar lugar a un acceso a menos funcionalidades y funciones."
+
+#: src/protocols/yahoo/yahoo.c:1834
 msgid "Incorrect password."
 msgstr "Contraseña incorrecta."
 
-#: src/protocols/yahoo/yahoo.c:1818
+#: src/protocols/yahoo/yahoo.c:1837
 msgid "Your account is locked, please log in to the Yahoo! website."
-msgstr "Su cuenta está bloqueada. Por favor, conéctese al servidor de web de Yahoo!"
-
-#: src/protocols/yahoo/yahoo.c:1821
+msgstr ""
+"Su cuenta está bloqueada. Por favor, conéctese al servidor de web de Yahoo!"
+
+#: src/protocols/yahoo/yahoo.c:1840
 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
-msgstr "Error desconocido número %d. Si se conecta al servidor de web de Yahoo! es posible que ésto se arregle."
-
-#: src/protocols/yahoo/yahoo.c:1875
+msgstr ""
+"Error desconocido número %d. Si se conecta al servidor de web de Yahoo! es "
+"posible que ésto se arregle."
+
+#: src/protocols/yahoo/yahoo.c:1894
 #, c-format
 msgid "Could not add buddy %s to group %s to the server list on account %s."
 msgstr ""
 "No se pudo añadir al amigo %s al grupo %s de la lista en el servidor para la "
 "cuenta %s."
 
-#: src/protocols/yahoo/yahoo.c:1877
+#: src/protocols/yahoo/yahoo.c:1896
 msgid "Could not add buddy to server list"
 msgstr "No se pudo añadir el amigo a la lista del servidor"
 
-#: src/protocols/yahoo/yahoo.c:2068 src/protocols/yahoo/yahoo.c:2196
+#: src/protocols/yahoo/yahoo.c:2088 src/protocols/yahoo/yahoo.c:2216
 msgid "Unable to read"
 msgstr "No se pudo leer"
 
-#: src/protocols/yahoo/yahoo.c:2218 src/protocols/yahoo/yahoo.c:2328
-#: src/protocols/yahoo/yahoo.c:2378 src/protocols/yahoo/yahoo.c:2389
+#: src/protocols/yahoo/yahoo.c:2238 src/protocols/yahoo/yahoo.c:2348
+#: src/protocols/yahoo/yahoo.c:2398 src/protocols/yahoo/yahoo.c:2408
 #: src/protocols/yahoo/yahoochat.c:1397 src/protocols/yahoo/yahoochat.c:1458
 msgid "Connection problem"
 msgstr "Error de conexión"
 
-#: src/protocols/yahoo/yahoo.c:2481 src/protocols/yahoo/yahoo.c:2862
-#: src/protocols/yahoo/yahoo.c:2976
+#: src/protocols/yahoo/yahoo.c:2495 src/protocols/yahoo/yahoo.c:2857
+#: src/protocols/yahoo/yahoo.c:2971
 msgid "Not At Home"
 msgstr "Fuera de casa"
 
-#: src/protocols/yahoo/yahoo.c:2483 src/protocols/yahoo/yahoo.c:2864
-#: src/protocols/yahoo/yahoo.c:2977
+#: src/protocols/yahoo/yahoo.c:2497 src/protocols/yahoo/yahoo.c:2859
+#: src/protocols/yahoo/yahoo.c:2972
 msgid "Not At Desk"
 msgstr "Lejos del escritorio"
 
-#: src/protocols/yahoo/yahoo.c:2485 src/protocols/yahoo/yahoo.c:2866
-#: src/protocols/yahoo/yahoo.c:2978
+#: src/protocols/yahoo/yahoo.c:2499 src/protocols/yahoo/yahoo.c:2861
+#: src/protocols/yahoo/yahoo.c:2973
 msgid "Not In Office"
 msgstr "Fuera de la oficina"
 
-#: src/protocols/yahoo/yahoo.c:2489 src/protocols/yahoo/yahoo.c:2870
-#: src/protocols/yahoo/yahoo.c:2980
+#: src/protocols/yahoo/yahoo.c:2503 src/protocols/yahoo/yahoo.c:2865
+#: src/protocols/yahoo/yahoo.c:2975
 msgid "On Vacation"
 msgstr "De vacaciones"
 
-#: src/protocols/yahoo/yahoo.c:2493 src/protocols/yahoo/yahoo.c:2874
-#: src/protocols/yahoo/yahoo.c:2982
+#: src/protocols/yahoo/yahoo.c:2507 src/protocols/yahoo/yahoo.c:2869
+#: src/protocols/yahoo/yahoo.c:2977
 msgid "Stepped Out"
 msgstr "Ha abandonado"
 
-#: src/protocols/yahoo/yahoo.c:2574 src/protocols/yahoo/yahoo.c:2600
+#: src/protocols/yahoo/yahoo.c:2588 src/protocols/yahoo/yahoo.c:2614
 msgid "Not on server list"
 msgstr "No está en la lista del servidor"
 
-#: src/protocols/yahoo/yahoo.c:2620
+#: src/protocols/yahoo/yahoo.c:2634
 #, c-format
 msgid ""
 "\n"
@@ -10052,19 +10225,19 @@
 msgid "Initiate Conference"
 msgstr "Iniciar conferencia"
 
-#: src/protocols/yahoo/yahoo.c:2755
+#: src/protocols/yahoo/yahoo.c:2750
 msgid "Active which ID?"
 msgstr "¿Qué ID quiere activar?"
 
-#: src/protocols/yahoo/yahoo.c:2764
+#: src/protocols/yahoo/yahoo.c:2759
 msgid "Join who in chat?"
 msgstr "¿Juntarse con quién en un chat?"
 
-#: src/protocols/yahoo/yahoo.c:2774
+#: src/protocols/yahoo/yahoo.c:2769
 msgid "Activate ID..."
 msgstr "Activar ID..."
 
-#: src/protocols/yahoo/yahoo.c:2778
+#: src/protocols/yahoo/yahoo.c:2773
 msgid "Join user in chat..."
 msgstr "Juntarse con un usuario en un chat..."
 
@@ -10079,47 +10252,47 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/yahoo/yahoo.c:3307 src/protocols/yahoo/yahoo.c:3309
+#: src/protocols/yahoo/yahoo.c:3292 src/protocols/yahoo/yahoo.c:3294
 msgid "Yahoo Protocol Plugin"
 msgstr "Complemento de protocolo Yahoo"
 
-#: src/protocols/yahoo/yahoo.c:3328
+#: src/protocols/yahoo/yahoo.c:3313
 msgid "Yahoo Japan"
 msgstr "Yahoo Japón"
 
+#: src/protocols/yahoo/yahoo.c:3316
+msgid "Pager host"
+msgstr "Servidor de buscapersonas:"
+
+#: src/protocols/yahoo/yahoo.c:3319
+msgid "Japan Pager host"
+msgstr "Servidor de buscapersonas japonés"
+
+#: src/protocols/yahoo/yahoo.c:3322
+msgid "Pager port"
+msgstr "Puerto del buscapersonas"
+
+#: src/protocols/yahoo/yahoo.c:3325
+msgid "File transfer host"
+msgstr "Servidor de transferencia de ficheros"
+
+#: src/protocols/yahoo/yahoo.c:3328
+msgid "Japan File transfer host"
+msgstr "Servidor de transferencia de ficheros japonés"
+
 #: src/protocols/yahoo/yahoo.c:3331
-msgid "Pager host"
-msgstr "Servidor de buscapersonas:"
+msgid "File transfer port"
+msgstr "Puerto de transferencia de ficheros"
 
 #: src/protocols/yahoo/yahoo.c:3334
-msgid "Japan Pager host"
-msgstr "Servidor de buscapersonas japonés"
+msgid "Chat Room List Url"
+msgstr "Url de lista de salas de chat"
 
 #: src/protocols/yahoo/yahoo.c:3337
-msgid "Pager port"
-msgstr "Puerto del buscapersonas"
+msgid "YCHT Host"
+msgstr "Servidor YCHT"
 
 #: src/protocols/yahoo/yahoo.c:3340
-msgid "File transfer host"
-msgstr "Servidor de transferencia de archivos"
-
-#: src/protocols/yahoo/yahoo.c:3343
-msgid "Japan File transfer host"
-msgstr "Servidor de transferencia de archivos japonés"
-
-#: src/protocols/yahoo/yahoo.c:3346
-msgid "File transfer port"
-msgstr "Puerto de transferencia de archivos"
-
-#: src/protocols/yahoo/yahoo.c:3349
-msgid "Chat Room List Url"
-msgstr "Url de lista de salas de chat"
-
-#: src/protocols/yahoo/yahoo.c:3352
-msgid "YCHT Host"
-msgstr "Servidor YCHT"
-
-#: src/protocols/yahoo/yahoo.c:3355
 msgid "YCHT Port"
 msgstr "Puerto YCHT"
 
@@ -10145,14 +10318,17 @@
 msgid ""
 "Sorry, profiles marked as containing adult content are not supported at this "
 "time."
-msgstr "Lo siento, los perfiles con contenido sólo para adultos no están soportados aún."
+msgstr ""
+"Lo siento, los perfiles con contenido sólo para adultos no están soportados "
+"aún."
 
 #: src/protocols/yahoo/yahoo_profile.c:781
 #: src/protocols/yahoo/yahoo_profile.c:829
 msgid ""
 "If you wish to view this profile, you will need to visit this link in your "
 "web browser"
-msgstr "Si desea ver este perfil, deberá visitar este enlace con su navegador web"
+msgstr ""
+"Si desea ver este perfil, deberá visitar este enlace con su navegador web"
 
 #: src/protocols/yahoo/yahoo_profile.c:827
 msgid ""
@@ -10247,34 +10423,34 @@
 msgid "User Rooms"
 msgstr "Salas de usuarios"
 
-#: src/protocols/zephyr/zephyr.c:566
+#: src/protocols/zephyr/zephyr.c:589
 #, c-format
 msgid "Unable send to chat %s,%s,%s"
 msgstr "No se pudo enviar al chat %s,%s,%s"
 
-#: src/protocols/zephyr/zephyr.c:600
+#: src/protocols/zephyr/zephyr.c:624
 #, c-format
 msgid "<b>User:</b> %s<br>"
 msgstr "<b>Usuario:</b> %s<br>"
 
-#: src/protocols/zephyr/zephyr.c:604
+#: src/protocols/zephyr/zephyr.c:628
 msgid "<br>Hidden or not logged-in"
 msgstr "<br>Oculto o no conectado"
 
-#: src/protocols/zephyr/zephyr.c:608
+#: src/protocols/zephyr/zephyr.c:633
 #, c-format
 msgid "<br>At %s since %s"
 msgstr "<br>En %s desde %s"
 
-#: src/protocols/zephyr/zephyr.c:873 src/protocols/zephyr/zephyr.c:874
+#: src/protocols/zephyr/zephyr.c:983 src/protocols/zephyr/zephyr.c:984
 msgid "Anyone"
 msgstr "Cualquiera"
 
-#: src/protocols/zephyr/zephyr.c:900
+#: src/protocols/zephyr/zephyr.c:1011
 msgid "Already logged in with Zephyr"
 msgstr "Ya está registrado en Zephyr"
 
-#: src/protocols/zephyr/zephyr.c:900
+#: src/protocols/zephyr/zephyr.c:1011
 msgid ""
 "Because Zephyr uses your system username, you are unable to have multiple "
 "accounts on it when logged in as the same user."
@@ -10282,18 +10458,78 @@
 "Dado que Zephyr usa el nombre de usuario del sistema, no puede tener "
 "múltiples cuentas de éste cuando se conecta como el mismo usuario."
 
-#: src/protocols/zephyr/zephyr.c:1232
+#: src/protocols/zephyr/zephyr.c:1386
 msgid "_Class:"
 msgstr "_Clase:"
 
-#: src/protocols/zephyr/zephyr.c:1238
+#: src/protocols/zephyr/zephyr.c:1392
 msgid "_Instance:"
 msgstr "_Instancia:"
 
-#: src/protocols/zephyr/zephyr.c:1244
+#: src/protocols/zephyr/zephyr.c:1398
 msgid "_Recipient:"
 msgstr "_Destinatario:"
 
+#: src/protocols/zephyr/zephyr.c:1409
+#, c-format
+msgid "Attempt to subscribe to %s,%s,%s failed"
+msgstr "Falló el intento de suscripción a %s,%s,%s"
+
+#: src/protocols/zephyr/zephyr.c:1678
+msgid "zlocate &lt;nick&gt;: Locate user"
+msgstr "zlocates &lt;apodo&gt;: Localiza un usuario"
+
+#: src/protocols/zephyr/zephyr.c:1683
+msgid "zl &lt;nick&gt;: Locate user"
+msgstr "zl &lt;apodo&gt;: Localiza un usuario"
+
+#: src/protocols/zephyr/zephyr.c:1688
+msgid "instance &lt;instance&gt;: Set the instance to be used on this class"
+msgstr "instance &lt;instancia&gt;: Fijar la instancia a utilizar en esta clase"
+
+#: src/protocols/zephyr/zephyr.c:1693
+msgid "inst &lt;instance&gt;: Set the instance to be used on this class"
+msgstr "inst &lt;instancia&gt;: Fijar la instancia a utilizar en esta clase"
+
+#: src/protocols/zephyr/zephyr.c:1699
+msgid "sub &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Join a new chat"
+msgstr "sub &lt;clase&gt; &lt;instancia&gt; &lt;receptor&gt;: Unirse a un nuevo chat"
+
+#: src/protocols/zephyr/zephyr.c:1704
+msgid ""
+"zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
+msgstr "zi &lt;instancia&gt;: Enviar un mensaje a &lt;mensaje,<i>instancia</i>,*&gt;"
+
+#: src/protocols/zephyr/zephyr.c:1710
+msgid ""
+"zci &lt;class&gt; &lt;instance&gt;: Send a message to &lt;<i>class</i>,"
+"<i>instance</i>,*&gt;"
+msgstr "zci &lt;clase&gt; &lt;instancia&gt;: Enviar un mensaje a &lt;<i>clase</i>,<i>instancia</i>,*&gt;"
+
+#: src/protocols/zephyr/zephyr.c:1716
+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;"
+msgstr "zcir &lt;clase&gt; &lt;instancia&gt; &lt;receptor&gt;: Enviar un mensaje a &lt;<i>clase</i>,<i>instancia</i>,<i>receptor</i>&gt;"
+
+#: src/protocols/zephyr/zephyr.c:1722
+msgid ""
+"zir &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;MESSAGE,"
+"<i>instance</i>,<i>recipient</i>&gt;"
+msgstr "zir &lt;instancia&gt; &lt;receptor&gt;: Enviar un mensaje a &lt;MENSAJE,<i>instancia</i>,<i>receptor</i>&gt;"
+
+#: src/protocols/zephyr/zephyr.c:1727
+msgid "zc &lt;class&gt;: Send a message to &lt;<i>class</i>,PERSONAL,*&gt;"
+msgstr "zc &lt;clase&gt;: Enviar un mensaje a &lt;<i>clase</i>,PERSONAL,*&gt;"
+
+#: src/protocols/zephyr/zephyr.c:1802
+msgid "Resubscribe"
+msgstr "Re-suscribir"
+
+#: src/protocols/zephyr/zephyr.c:1805
+msgid "Retrieve subscriptions from server"
+msgstr "Obtener las suscripciones del servidor"
+
 #. *< api_version
 #. *< type
 #. *< ui_requirement
@@ -10305,19 +10541,19 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/zephyr/zephyr.c:1412 src/protocols/zephyr/zephyr.c:1414
+#: src/protocols/zephyr/zephyr.c:1885 src/protocols/zephyr/zephyr.c:1887
 msgid "Zephyr Protocol Plugin"
 msgstr "Complemento de protocolo Zephyr"
 
-#: src/protocols/zephyr/zephyr.c:1433
+#: src/protocols/zephyr/zephyr.c:1906
 msgid "Export to .anyone"
 msgstr "Exportar a .anyone"
 
-#: src/protocols/zephyr/zephyr.c:1436
+#: src/protocols/zephyr/zephyr.c:1909
 msgid "Export to .zephyr.subs"
 msgstr "Exportar a .zephyr.subs"
 
-#: src/protocols/zephyr/zephyr.c:1439
+#: src/protocols/zephyr/zephyr.c:1912
 msgid "Exposure"
 msgstr "Exposición"
 
@@ -10346,7 +10582,7 @@
 "de proxy."
 
 #. * Custom away message.
-#: src/prpl.h:205
+#: src/prpl.h:165
 msgid "Custom"
 msgstr "Personalizado"
 
@@ -10377,27 +10613,27 @@
 msgid "(1 message)"
 msgstr "(1 mensaje)"
 
-#: src/server.c:1176 src/server.c:1186
+#: src/server.c:1180 src/server.c:1189
 #, c-format
 msgid "%s logged in."
 msgstr "%s se ha conectado."
 
-#: src/server.c:1199
+#: src/server.c:1201
 #, c-format
 msgid "%s signed on"
 msgstr "%s se ha conectado"
 
-#: src/server.c:1215
+#: src/server.c:1216
 #, c-format
 msgid "%s came back"
 msgstr "%s ha vuelto"
 
-#: src/server.c:1217
+#: src/server.c:1218
 #, c-format
 msgid "%s went away"
 msgstr "%s se ha marchado"
 
-#: src/server.c:1231
+#: src/server.c:1232
 #, c-format
 msgid "%s became idle"
 msgstr "%s ahora está inactivo"
@@ -10407,17 +10643,17 @@
 msgid "%s became unidle"
 msgstr "%s ahora está activo"
 
-#: src/server.c:1254 src/server.c:1262
+#: src/server.c:1253 src/server.c:1260
 #, c-format
 msgid "%s logged out."
 msgstr "%s se ha desconectado."
 
-#: src/server.c:1276
+#: src/server.c:1273
 #, c-format
 msgid "%s signed off"
 msgstr "%s se ha desconectado"
 
-#: src/server.c:1338
+#: src/server.c:1335
 #, c-format
 msgid ""
 "%s has just been warned by %s.\n"
@@ -10426,13 +10662,13 @@
 "%s ha sido avisado por %s.\n"
 "Su nuevo nivel de advertencias es %d%%"
 
-#: src/server.c:1341
+#: src/server.c:1338
 msgid "an anonymous person"
 msgstr "una persona anónima"
 
 # 'Buddy chat room' es una sala de chat en la que se habla
 # con amigos
-#: src/server.c:1451
+#: src/server.c:1448
 #, c-format
 msgid ""
 "User '%s' invites %s to buddy chat room: '%s'\n"
@@ -10441,12 +10677,12 @@
 "El usuario '%s' invita a %s a la sala de chat de amigos: '%s'\n"
 "%s"
 
-#: src/server.c:1455
+#: src/server.c:1452
 #, c-format
 msgid "User '%s' invites %s to buddy chat room: '%s'\n"
 msgstr "El usuario '%s' invita a %s a la sala de chat de amigos: '%s'\n"
 
-#: src/server.c:1461
+#: src/server.c:1458
 msgid "Accept chat invitation?"
 msgstr "¿Aceptar la invitación de chat?"
 
@@ -10481,25 +10717,31 @@
 msgid "Unknown."
 msgstr "Desconocido."
 
-#: src/util.c:2399
+#: src/util.c:2392
+msgid "second"
+msgid_plural "seconds"
+msgstr[0] "segundo"
+msgstr[1] "segundos"
+
+#: src/util.c:2406
 msgid "day"
 msgid_plural "days"
 msgstr[0] "día"
 msgstr[1] "días"
 
-#: src/util.c:2407
+#: src/util.c:2414
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "hora"
 msgstr[1] "horas"
 
-#: src/util.c:2415
+#: src/util.c:2422
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minuto"
 msgstr[1] "minutos"
 
-#: src/util.c:2825
+#: src/util.c:2832
 msgid "g003: Error opening connection.\n"
 msgstr "g003: Error abriendo la conexión.\n"
 
@@ -10515,6 +10757,12 @@
 msgid "Notification"
 msgstr "Notificación"
 
+#~ msgid "Invalid Groupname"
+#~ msgstr "Nombre de grupo inválido"
+
+#~ msgid "Send File..."
+#~ msgstr "Enviar archivo..."
+
 #~ msgid "Buddy icon file:"
 #~ msgstr "Archivo de icono de amigo:"
 
@@ -10975,12 +11223,6 @@
 #~ msgid "Gaim - Save Icon"
 #~ msgstr "Gaim - Guardar icono"
 
-#~ msgid "Disconnected"
-#~ msgstr "Desconectado"
-
-#~ msgid "Invalid response from server"
-#~ msgstr "Respuesta inválida del servidor."
-
 #~ msgid "Could not connect for transfer!"
 #~ msgstr "¡No se pudo conectar para realizar la transferencia!"