changeset 10697:9b50ea54f3bb

[gaim-migrate @ 12251] some i18n love for cvs HEAD also committer: Tailor Script <tailor@pidgin.im>
author Luke Schierer <lschiere@pidgin.im>
date Tue, 15 Mar 2005 02:04:53 +0000
parents fab584dc09d3
children 2f646d020011
files po/ca.po po/en_CA.po po/zh_CN.po
diffstat 3 files changed, 6734 insertions(+), 6493 deletions(-) [+]
line wrap: on
line diff
--- a/po/ca.po	Mon Mar 14 15:48:34 2005 +0000
+++ b/po/ca.po	Tue Mar 15 02:04:53 2005 +0000
@@ -32,8 +32,8 @@
 msgstr ""
 "Project-Id-Version: Gaim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-03-01 13:21+0100\n"
-"PO-Revision-Date: 2005-03-01 14:06+0100\n"
+"POT-Creation-Date: 2005-03-14 02:24+0100\n"
+"PO-Revision-Date: 2005-03-14 02:22+0100\n"
 "Last-Translator: Josep Puigdemont i Casamajó <josep@imatge-sintetica.com>\n"
 "Language-Team: Catalan <tradgnome@softcatala.net>\n"
 "MIME-Version: 1.0\n"
@@ -41,21 +41,21 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: plugins/autorecon.c:281
+#: plugins/autorecon.c:234
 msgid "Error Message Suppression"
 msgstr "Supressió del missatge d'error"
 
-#: plugins/autorecon.c:285
+#: plugins/autorecon.c:238
 msgid "Hide Disconnect Errors"
 msgstr "Oculta els errors de desconnexió"
 
-#: plugins/autorecon.c:289
+#: plugins/autorecon.c:242
 msgid "Hide Login Errors"
 msgstr "Oculta els errors en entrar"
 
-#: plugins/autorecon.c:293
-msgid "Hide Reconnecting Dialog"
-msgstr "Oculta el quadre de diàleg de reconnexió"
+#: plugins/autorecon.c:246
+msgid "Restore Away State On Reconnect"
+msgstr "Recupera l'estat d'absent en tornar a connectar"
 
 #. *< type
 #. *< ui_requirement
@@ -63,33 +63,32 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/autorecon.c:317
+#: plugins/autorecon.c:270
 msgid "Auto-Reconnect"
-msgstr "Reconnecta automàticament"
+msgstr "Torna a connectar automàticament"
 
 #. *< name
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/autorecon.c:320 plugins/autorecon.c:322
+#: plugins/autorecon.c:273 plugins/autorecon.c:275
 msgid "When you are kicked offline, this reconnects you."
-msgstr "Això us reconnectarà si us fan fora."
-
-#: plugins/chkmail.c:92 plugins/chkmail.c:114 plugins/chkmail.c:123
+msgstr "Això us tornarà a connectar si us fan fora."
+
+#: plugins/chkmail.c:94 plugins/chkmail.c:117 plugins/chkmail.c:126
 msgid "Mail Server"
 msgstr "Servidor de correu"
 
-#. XXX - This needs to use ngettext()
-#: plugins/chkmail.c:132
+#: plugins/chkmail.c:136
 #, c-format
 msgid "%s (%d new/%d total)"
 msgstr "%s (%d nous/%d total)"
 
-#: plugins/chkmail.c:194
+#: plugins/chkmail.c:199
 msgid "Check Mail"
 msgstr "Comprova el correu"
 
-#: plugins/chkmail.c:198
+#: plugins/chkmail.c:203
 msgid "Check email every X seconds.\n"
 msgstr "Comprova el correu electrònic cada X segons.\n"
 
@@ -174,68 +173,69 @@
 msgid "Gaim - Away"
 msgstr "Gaim - Absent"
 
-#: plugins/docklet/docklet.c:140
+#: plugins/docklet/docklet.c:136 src/gtkaccount.c:751 src/gtkaccount.c:2179
 msgid "Auto-login"
 msgstr "Connexió automàtica"
 
-#: plugins/docklet/docklet.c:143
+#: plugins/docklet/docklet.c:139
 msgid "New Message..."
 msgstr "Missatge nou..."
 
-#: plugins/docklet/docklet.c:144
+#: plugins/docklet/docklet.c:140
 msgid "Join A Chat..."
 msgstr "Entra a un xat..."
 
-#: plugins/docklet/docklet.c:181
+#: plugins/docklet/docklet.c:176
 msgid "New..."
 msgstr "Nou..."
 
-#: plugins/docklet/docklet.c:189 src/gtkprefs.c:1694 src/gtkstatusbox.c:244
-#: src/protocols/gg/gg.c:52 src/protocols/irc/irc.c:179
-#: src/protocols/irc/msgs.c:191 src/protocols/jabber/buddy.c:1076
-#: src/protocols/jabber/jabber.c:994 src/protocols/msn/msn.c:539
-#: src/protocols/novell/novell.c:2811 src/protocols/novell/novell.c:2928
-#: src/protocols/novell/novell.c:2980 src/protocols/oscar/oscar.c:691
-#: src/protocols/oscar/oscar.c:5760 src/protocols/oscar/oscar.c:6821
-#: src/protocols/oscar/oscar.c:7042 src/protocols/silc/buddy.c:1393
-#: src/protocols/silc/silc.c:52 src/protocols/yahoo/yahoo.c:2947
-#: src/protocols/zephyr/zephyr.c:2225 src/status.c:160
+#: plugins/docklet/docklet.c:184 src/gtkprefs.c:1812 src/protocols/gg/gg.c:52
+#: src/protocols/irc/msgs.c:212 src/protocols/jabber/jabber.c:973
+#: src/protocols/jabber/jutil.c:32 src/protocols/jabber/presence.c:69
+#: src/protocols/jabber/presence.c:132 src/protocols/novell/novell.c:2800
+#: src/protocols/novell/novell.c:2917 src/protocols/novell/novell.c:2969
+#: src/protocols/oscar/oscar.c:679 src/protocols/oscar/oscar.c:5700
+#: src/protocols/oscar/oscar.c:6691 src/protocols/oscar/oscar.c:6891
+#: src/protocols/silc/buddy.c:1388 src/protocols/silc/silc.c:47
+#: src/protocols/silc/silc.c:81
 msgid "Away"
 msgstr "Absent"
 
-#: plugins/docklet/docklet.c:197
+#. else...
+#: plugins/docklet/docklet.c:190 src/away.c:584
+#: src/protocols/oscar/oscar.c:5618 src/protocols/oscar/oscar.c:6899
 msgid "Back"
 msgstr "De tornada"
 
-#: plugins/docklet/docklet.c:206
+#: plugins/docklet/docklet.c:198
 msgid "Mute Sounds"
 msgstr "Deshabilita els sons"
 
-#: plugins/docklet/docklet.c:213 src/gtkft.c:621
+#: plugins/docklet/docklet.c:203 src/gtkft.c:628
 msgid "File Transfers"
 msgstr "Transferència de fitxers"
 
-#: plugins/docklet/docklet.c:214 src/gtkaccount.c:2285
+#: plugins/docklet/docklet.c:204 src/gtkaccount.c:2391
 msgid "Accounts"
 msgstr "Comptes"
 
-#: plugins/docklet/docklet.c:215 src/gtkprefs.c:2195
+#: plugins/docklet/docklet.c:205 src/gtkprefs.c:2513
 msgid "Preferences"
 msgstr "Preferències"
 
-#: plugins/docklet/docklet.c:224
-msgid "Log Out"
+#: plugins/docklet/docklet.c:214
+msgid "Signoff"
 msgstr "Desconnecta"
 
-#: plugins/docklet/docklet.c:228
+#: plugins/docklet/docklet.c:218
 msgid "Quit"
 msgstr "Surt"
 
-#: plugins/docklet/docklet.c:559
+#: plugins/docklet/docklet.c:533
 msgid "Tray Icon Configuration"
 msgstr "Configuració de la icona d'estat"
 
-#: plugins/docklet/docklet.c:563
+#: plugins/docklet/docklet.c:537
 msgid "_Hide new messages until tray icon is clicked"
 msgstr "_Oculta missatges nous fins que no es faci clic a la icona d'estat"
 
@@ -245,19 +245,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/docklet/docklet.c:589
+#: plugins/docklet/docklet.c:563
 msgid "System Tray Icon"
 msgstr "Icona d'estat"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/docklet/docklet.c:592
+#: plugins/docklet/docklet.c:566
 msgid "Displays an icon for Gaim in the system tray."
 msgstr "Mostra una icona per al Gaim a la barra d'estat."
 
 #. *  description
-#: plugins/docklet/docklet.c:594
+#: plugins/docklet/docklet.c:568
 msgid ""
 "Displays a system tray icon (in GNOME, KDE or Windows for example) to show "
 "the current status of Gaim, allow fast access to commonly used functions, "
@@ -318,7 +318,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/filectl.c:248
+#: plugins/filectl.c:224
 msgid "Gaim File Control"
 msgstr "Control de fitxers del Gaim"
 
@@ -326,7 +326,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/filectl.c:251 plugins/filectl.c:253
+#: plugins/filectl.c:227 plugins/filectl.c:229
 msgid "Allows you to control Gaim by entering commands in a file."
 msgstr "Us permet controlar el Gaim entrant ordres en un fitxer."
 
@@ -346,7 +346,7 @@
 msgid "Invalid AIM URI"
 msgstr "L'URI d'AIM no és vàlida"
 
-#: plugins/gaim-remote/remote.c:751
+#: plugins/gaim-remote/remote.c:673
 #, c-format
 msgid ""
 "Failed to assign %s to a socket:\n"
@@ -355,7 +355,7 @@
 "No s'ha pogut assignar %s al sòcol:\n"
 "%s"
 
-#: plugins/gaim-remote/remote.c:775
+#: plugins/gaim-remote/remote.c:697
 msgid "Unable to open socket"
 msgstr "No s'ha pogut obrir el sòcol"
 
@@ -365,19 +365,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/gaim-remote/remote.c:825
+#: plugins/gaim-remote/remote.c:747
 msgid "Remote Control"
 msgstr "Control remot"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/gaim-remote/remote.c:828
+#: plugins/gaim-remote/remote.c:750
 msgid "Provides remote control for gaim applications."
 msgstr "Proporciona control remot per a aplicacions Gaim."
 
 #. *  description
-#: plugins/gaim-remote/remote.c:830
+#: plugins/gaim-remote/remote.c:752
 msgid ""
 "Gives Gaim the ability to be remote-controlled through third-party "
 "applications or through the gaim-remote tool."
@@ -391,19 +391,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/gaiminc.c:91
+#: plugins/gaiminc.c:90
 msgid "Gaim Demonstration Plugin"
 msgstr "Connector de demostració del Gaim"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/gaiminc.c:94
+#: plugins/gaiminc.c:93
 msgid "An example plugin that does stuff - see the description."
 msgstr "Un connector d'exemple que fa coses - vegeu-ne la descripció."
 
 #. *  description
-#: plugins/gaiminc.c:96
+#: plugins/gaiminc.c:95
 msgid ""
 "This is a really cool plugin that does a lot of stuff:\n"
 "- It tells you who wrote the program when you log in\n"
@@ -416,76 +416,6 @@
 "- envia un missatge a tots els amics immediatament després de que es "
 "connectin"
 
-#: plugins/gaimrc.c:40
-msgid "Cursor Color"
-msgstr "Color del cursor"
-
-#: plugins/gaimrc.c:41
-msgid "Secondary Cursor Color"
-msgstr "Color secundari del cursor"
-
-#: plugins/gaimrc.c:42
-msgid "Hyperlink Color"
-msgstr "Color dels hiperenllaços"
-
-#: plugins/gaimrc.c:53
-msgid "GtkTreeView Expander Size"
-msgstr "Mida de l'expansor del GTkTreeView"
-
-#: plugins/gaimrc.c:72
-msgid "Conversation Entry"
-msgstr "Entrada de la conversa"
-
-#: plugins/gaimrc.c:73
-msgid "Conversation History"
-msgstr "Històric de converses"
-
-#: plugins/gaimrc.c:74
-msgid "Log Viewer"
-msgstr "Visualitzador del registre"
-
-#: plugins/gaimrc.c:75
-msgid "Request Dialog"
-msgstr "Diàleg de sol·licitud"
-
-#: plugins/gaimrc.c:76
-msgid "Notify Dialog"
-msgstr "Diàleg de notificació"
-
-#: plugins/gaimrc.c:209
-#, c-format
-msgid "Select Color for %s"
-msgstr "Selecciona el color per a %s"
-
-#: plugins/gaimrc.c:211
-msgid "Select Color"
-msgstr "Selecciona el color per a %s"
-
-#: plugins/gaimrc.c:246
-#, c-format
-msgid "Select Font for %s"
-msgstr "Selecciona el tipus de lletra per a %s"
-
-#: plugins/gaimrc.c:284
-msgid "Select Interface Font"
-msgstr "Selecciona el tipus de lletra de la interfície"
-
-#: plugins/gaimrc.c:343
-msgid "Gtk interface font"
-msgstr "Tipus de lletra de la interfície Gtk"
-
-#: plugins/gaimrc.c:362
-msgid "Gtk text shortcut theme"
-msgstr "Tema de la drecera de text de Gtk"
-
-#: plugins/gaimrc.c:460
-msgid "Gaim GTK+ Theme Control"
-msgstr "Control de temes GTK+ del Gaim"
-
-#: plugins/gaimrc.c:462 plugins/gaimrc.c:463
-msgid "Provides access to commonly used gtkrc settings."
-msgstr "Proporciona accés a peràmetres del gtkrc utilitzats habitualment ."
-
 #. Configuration frame
 #: plugins/gestures/gestures.c:221
 msgid "Mouse Gestures Configuration"
@@ -539,9 +469,9 @@
 "A dalt i després a la dreta per passar a la següent conversa"
 
 #: plugins/gevolution/add_buddy_dialog.c:132
-#: plugins/gevolution/assoc-buddy.c:120 src/gtkprefs.c:2014
+#: plugins/gevolution/assoc-buddy.c:120 src/gtkprefs.c:2167
 #: src/gtkroomlist.c:553 src/protocols/jabber/jabber.c:607
-#: src/protocols/msn/msn.c:1483 src/protocols/trepia/trepia.c:399
+#: src/protocols/msn/msn.c:1469 src/protocols/trepia/trepia.c:399
 msgid "Name"
 msgstr "Nom"
 
@@ -558,13 +488,13 @@
 
 #. "Search"
 #: plugins/gevolution/add_buddy_dialog.c:468
-#: plugins/gevolution/assoc-buddy.c:354 src/protocols/oscar/oscar.c:7406
+#: plugins/gevolution/assoc-buddy.c:354 src/protocols/oscar/oscar.c:7175
 msgid "Search"
 msgstr "Cerca"
 
 #: plugins/gevolution/add_buddy_dialog.c:549
-#: plugins/gevolution/new_person_dialog.c:304 src/gtkblist.c:4277
-#: src/gtkblist.c:4655
+#: plugins/gevolution/new_person_dialog.c:304 src/gtkblist.c:4141
+#: src/gtkblist.c:4489
 msgid "Group:"
 msgstr "Grup:"
 
@@ -602,8 +532,14 @@
 msgid "_Associate Buddy"
 msgstr "_Associa amic"
 
+#: plugins/gevolution/eds-utils.c:74 plugins/gevolution/eds-utils.c:87
+#: src/gtkblist.c:3085 src/gtkprefs.c:962 src/gtkprefs.c:1014
+#: src/gtkprefs.c:1826 src/protocols/jabber/jabber.c:937
+msgid "None"
+msgstr "Cap"
+
 #: plugins/gevolution/gevo-util.c:64 plugins/gevolution/gevolution.c:90
-#: src/blist.c:517 src/blist.c:1226 src/blist.c:1440 src/gtkblist.c:4097
+#: src/blist.c:774 src/blist.c:981 src/blist.c:1928 src/gtkblist.c:3960
 #: src/protocols/jabber/roster.c:66
 msgid "Buddies"
 msgstr "Amics"
@@ -623,7 +559,7 @@
 msgstr ""
 "Seleccioneu tots els comptes on els amics s'hagin d'afegir automàticament."
 
-#: plugins/gevolution/gevolution.c:377 plugins/idle.c:52 src/gtkconn.c:426
+#: plugins/gevolution/gevolution.c:377 plugins/idle.c:52 src/gtkconn.c:621
 msgid "Account"
 msgstr "Comptes"
 
@@ -667,8 +603,8 @@
 msgstr "Informació opcional:"
 
 #. Label
-#: plugins/gevolution/new_person_dialog.c:335 src/gtkaccount.c:392
-#: src/gtkaccount.c:414 src/protocols/oscar/oscar.c:597
+#: plugins/gevolution/new_person_dialog.c:335 src/gtkaccount.c:379
+#: src/gtkaccount.c:409 src/protocols/oscar/oscar.c:585
 msgid "Buddy Icon"
 msgstr "Icona de l'amic"
 
@@ -684,6 +620,26 @@
 msgid "E-mail:"
 msgstr "Correu electrònic:"
 
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: plugins/gtk-signals-test.c:102
+msgid "GTK Signals Test"
+msgstr "Comprovació de senyals GTK"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: plugins/gtk-signals-test.c:105 plugins/gtk-signals-test.c:107
+msgid "Test to see that all ui signals are working properly."
+msgstr ""
+"Prova per veure si tots els senyals de la interfície d'usuari funcionen "
+"correctament."
+
 #: plugins/history.c:92
 msgid "History"
 msgstr "Historial"
@@ -706,7 +662,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/iconaway.c:106
+#: plugins/iconaway.c:104
 msgid "Iconify on Away"
 msgstr "Iconifica si s'està absent"
 
@@ -714,7 +670,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/iconaway.c:109 plugins/iconaway.c:111
+#: plugins/iconaway.c:107 plugins/iconaway.c:109
 msgid "Iconifies the buddy list and your conversations when you go away."
 msgstr "Iconifica la llista d'amics i les converses quan passeu a absent."
 
@@ -734,7 +690,7 @@
 msgid "_Set"
 msgstr "E_specifica"
 
-#: plugins/idle.c:68
+#: plugins/idle.c:68 src/away.c:911
 msgid "_Cancel"
 msgstr "_Cancel·la"
 
@@ -804,73 +760,68 @@
 "Afegeix una caixeta a la llista d'amics que indica si teniu correus nous."
 
 #. ---------- "Notify For" ----------
-#: plugins/notify.c:638
+#: plugins/notify.c:604
 msgid "Notify For"
 msgstr "Notifica per a"
 
-#: plugins/notify.c:642
+#: plugins/notify.c:608
 msgid "_IM windows"
 msgstr "Finestres de M_I"
 
-#: plugins/notify.c:649
+#: plugins/notify.c:615
 msgid "C_hat windows"
 msgstr "Finestres de _xat"
 
-#: plugins/notify.c:656
+#: plugins/notify.c:622
 msgid "_Focused windows"
 msgstr "_Finestres actives"
 
 #. ---------- "Notification Methods" ----------
-#: plugins/notify.c:664
+#: plugins/notify.c:630
 msgid "Notification Methods"
 msgstr "Mètodes de notificació"
 
-#: plugins/notify.c:671
+#: plugins/notify.c:637
 msgid "Prepend _string into window title:"
 msgstr "Po_sa aquesta cadena davant del títol de la finestra:"
 
 #. Count method button
-#: plugins/notify.c:690
+#: plugins/notify.c:656
 msgid "Insert c_ount of new messages into window title"
 msgstr "Insereix el _nombre de missatges nous al títol de la finestra"
 
 #. Urgent method button
-#: plugins/notify.c:698
+#: plugins/notify.c:664
 msgid "Set window manager \"_URGENT\" hint"
 msgstr "Aplica l'opció \"_URGENT\" del gestor de finestres"
 
-#. Raise window method button
-#: plugins/notify.c:706
-msgid "R_aise conversation window"
-msgstr "_Alça la finestra de conversa"
-
 #. ---------- "Notification Removals" ----------
-#: plugins/notify.c:714
+#: plugins/notify.c:672
 msgid "Notification Removal"
 msgstr "Supressió de notificacions"
 
 #. Remove on focus button
-#: plugins/notify.c:719
+#: plugins/notify.c:677
 msgid "Remove when conversation window _gains focus"
 msgstr "Suprimeix quan la finestra de la conversa esti_gui activada"
 
 #. Remove on click button
-#: plugins/notify.c:726
+#: plugins/notify.c:684
 msgid "Remove when conversation window _receives click"
 msgstr "Suprimeix quan es faci clic a la finestra de la conve_rsa"
 
 #. Remove on type button
-#: plugins/notify.c:734
+#: plugins/notify.c:692
 msgid "Remove when _typing in conversation window"
 msgstr "Suprimeix quan s'escrigui a la fines_tra de la conversa"
 
 #. Remove on message send button
-#: plugins/notify.c:742
+#: plugins/notify.c:700
 msgid "Remove when a _message gets sent"
 msgstr "Suprimeix quan s'enviï un _missatge"
 
 #. Remove on conversation switch button
-#: plugins/notify.c:751
+#: plugins/notify.c:709
 msgid "Remove on switch to conversation ta_b"
 msgstr "Suprimeix en canviar a la _pestanya de la conversa"
 
@@ -880,7 +831,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/notify.c:841
+#: plugins/notify.c:799
 msgid "Message Notification"
 msgstr "Notificació de missatges"
 
@@ -888,7 +839,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/notify.c:844 plugins/notify.c:846
+#: plugins/notify.c:802 plugins/notify.c:804
 msgid "Provides a variety of ways of notifying you of unread messages."
 msgstr ""
 "Us proporciona diferents maneres de notificar-vos la presència de missatges "
@@ -1017,35 +968,35 @@
 msgid "Tests to see that most things are working."
 msgstr "Proves per veure si la majoria de coses funcionen."
 
-#: plugins/spellchk.c:417
+#: plugins/spellchk.c:414
 msgid "Text Replacements"
 msgstr "Substitució de text"
 
-#: plugins/spellchk.c:441
+#: plugins/spellchk.c:438
 msgid "You type"
 msgstr "Quan escriviu"
 
-#: plugins/spellchk.c:453
+#: plugins/spellchk.c:450
 msgid "You send"
 msgstr "S'enviarà"
 
-#: plugins/spellchk.c:479
+#: plugins/spellchk.c:476
 msgid "Add a new text replacement"
 msgstr "Afegeix una altra substitució de text"
 
-#: plugins/spellchk.c:486
+#: plugins/spellchk.c:483
 msgid "You _type:"
 msgstr "_Escriviu:"
 
-#: plugins/spellchk.c:500
+#: plugins/spellchk.c:497
 msgid "You _send:"
 msgstr "_S'envia:"
 
-#: plugins/spellchk.c:542
+#: plugins/spellchk.c:539
 msgid "Text replacement"
 msgstr "Substitució de text"
 
-#: plugins/spellchk.c:544 plugins/spellchk.c:545
+#: plugins/spellchk.c:541 plugins/spellchk.c:542
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr ""
 "Substitueix el text dels missatges que s'envien usant les regles que hagueu "
@@ -1105,35 +1056,35 @@
 msgid "Provides a wrapper around SSL support libraries."
 msgstr "Proporciona una interfície per a les biblioteques de suport d'SSL."
 
-#: plugins/statenotify.c:42
+#: plugins/statenotify.c:41
 #, c-format
 msgid "%s has gone away."
 msgstr "%s ha passat a absent."
 
-#: plugins/statenotify.c:49
+#: plugins/statenotify.c:48
 #, c-format
 msgid "%s is no longer away."
 msgstr "%s ja no està absent."
 
-#: plugins/statenotify.c:56
+#: plugins/statenotify.c:55
 #, c-format
 msgid "%s has become idle."
 msgstr "%s ha passat a inactiu."
 
-#: plugins/statenotify.c:63
+#: plugins/statenotify.c:62
 #, c-format
 msgid "%s is no longer idle."
 msgstr "%s ja no està inactiu."
 
-#: plugins/statenotify.c:74
+#: plugins/statenotify.c:73
 msgid "Notify When"
 msgstr "Notifica quan"
 
-#: plugins/statenotify.c:77
+#: plugins/statenotify.c:76
 msgid "Buddy Goes _Away"
 msgstr "L'amic passa a _absent:"
 
-#: plugins/statenotify.c:80
+#: plugins/statenotify.c:79
 msgid "Buddy Goes _Idle"
 msgstr "L'amic passa a _innactiu:"
 
@@ -1143,7 +1094,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/statenotify.c:120
+#: plugins/statenotify.c:119
 msgid "Buddy State Notification"
 msgstr "Notificació de l'estat dels amics"
 
@@ -1151,7 +1102,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/statenotify.c:123 plugins/statenotify.c:126
+#: plugins/statenotify.c:122 plugins/statenotify.c:125
 msgid ""
 "Notifies in a conversation window when a buddy goes or returns from away or "
 "idle."
@@ -1165,6 +1116,7 @@
 msgid "Provides support for loading Tcl plugins"
 msgstr "Proporciona suport per carregar els connectors en Tcl"
 
+# FIXME (josep)
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -1173,7 +1125,7 @@
 #. *< id
 #: plugins/ticker/ticker.c:75 plugins/ticker/ticker.c:331
 msgid "Buddy Ticker"
-msgstr ""
+msgstr "Indicador d'amics"
 
 #. *< name
 #. *< version
@@ -1183,19 +1135,19 @@
 msgid "A horizontal scrolling version of the buddy list."
 msgstr "Una versió horitzontal de la llista d'amics."
 
-#: plugins/timestamp.c:202
+#: plugins/timestamp.c:186
 msgid "iChat Timestamp"
 msgstr "Marca horària per a l'iChat"
 
-#: plugins/timestamp.c:209
+#: plugins/timestamp.c:193
 msgid "Delay"
 msgstr "Retard"
 
-#: plugins/timestamp.c:216
+#: plugins/timestamp.c:200
 msgid "minutes."
 msgstr "minuts."
 
-#: plugins/timestamp.c:222
+#: plugins/timestamp.c:206
 msgid "_Apply"
 msgstr "_Aplica"
 
@@ -1205,7 +1157,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/timestamp.c:295
+#: plugins/timestamp.c:271
 msgid "Timestamp"
 msgstr "Marca horària"
 
@@ -1213,7 +1165,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/timestamp.c:298 plugins/timestamp.c:300
+#: plugins/timestamp.c:274 plugins/timestamp.c:276
 msgid "Adds iChat-style timestamps to conversations every N minutes."
 msgstr ""
 "Afegeix marques horàries a les converses a l'estil iChat cada N minuts."
@@ -1238,7 +1190,7 @@
 msgstr "_Mostra la barra d'ajustament a la finestra de MI"
 
 #. Buddy List trans options
-#: plugins/win32/transparency/win2ktrans.c:421
+#: plugins/win32/transparency/win2ktrans.c:421 src/gtkprefs.c:956
 msgid "Buddy List Window"
 msgstr "Finestra de la llista d'amics"
 
@@ -1276,163 +1228,225 @@
 "\n"
 "* Nota: aquest connector requereix Windows 2000 o Windows XP."
 
-#: plugins/win32/winprefs/winprefs.c:320
+#: plugins/win32/winprefs/winprefs.c:344
 msgid "GTK+ Runtime Version"
 msgstr "Versió del mòdul d'execució de GTK+"
 
 #. Autostart
-#: plugins/win32/winprefs/winprefs.c:328
+#: plugins/win32/winprefs/winprefs.c:352
 msgid "Startup"
 msgstr "Inicialització"
 
-#: plugins/win32/winprefs/winprefs.c:329
+#: plugins/win32/winprefs/winprefs.c:353
 msgid "_Start Gaim on Windows startup"
 msgstr "_Inicia el Gaim en iniciar Windows"
 
 #. Buddy List
-#: plugins/win32/winprefs/winprefs.c:338 src/gtkblist.c:3376
-#: src/gtkprefs.c:2111
+#: plugins/win32/winprefs/winprefs.c:362 src/gtkblist.c:3130
+#: src/gtkprefs.c:2420
 msgid "Buddy List"
 msgstr "Llista d'amics"
 
-#: plugins/win32/winprefs/winprefs.c:339
+#: plugins/win32/winprefs/winprefs.c:363
 msgid "_Dockable Buddy List"
 msgstr "Llista _d'amics acoblable"
 
 #. Docked Blist On Top
-#: plugins/win32/winprefs/winprefs.c:343
+#: plugins/win32/winprefs/winprefs.c:367
 msgid "Docked _Buddy List is always on top"
 msgstr "Posa la llista d'amics aco_blable sempre per sobre"
 
 #. Blist On Top
-#: plugins/win32/winprefs/winprefs.c:353
+#: plugins/win32/winprefs/winprefs.c:377
 msgid "_Keep Buddy List window on top"
 msgstr "_Conserva la finestra d'amics per sobre"
 
 #. Conversations
-#: plugins/win32/winprefs/winprefs.c:358 src/gtkprefs.c:867
-#: src/gtkprefs.c:2112
+#: plugins/win32/winprefs/winprefs.c:382 src/gtkprefs.c:1007
+#: src/gtkprefs.c:2421 src/protocols/msn/msn.c:1806
 msgid "Conversations"
 msgstr "Converses"
 
-#: plugins/win32/winprefs/winprefs.c:359
+#: plugins/win32/winprefs/winprefs.c:383
 msgid "_Flash Window when messages are received"
 msgstr "_Fes que la finestra faci un flaix quan hi arribin missatges"
 
-#: plugins/win32/winprefs/winprefs.c:383
+#: plugins/win32/winprefs/winprefs.c:407
 msgid "WinGaim Options"
 msgstr "Opcions del WinGaim"
 
-#: plugins/win32/winprefs/winprefs.c:385 plugins/win32/winprefs/winprefs.c:386
+#: plugins/win32/winprefs/winprefs.c:409 plugins/win32/winprefs/winprefs.c:410
 msgid "Options specific to Windows Gaim."
 msgstr "Opcions específiques de la versió del Gaim per a Windows"
 
-#: src/account.c:532
-msgid "accounts"
-msgstr "comptes"
-
-#: src/account.c:732 src/protocols/jabber/jabber.c:1050
+#: src/account.c:277 src/protocols/jabber/jabber.c:1014
 msgid "New passwords do not match."
 msgstr "Les noves contrasenyes no coincideixen."
 
-#: src/account.c:741
+#: src/account.c:286
 msgid "Fill out all fields completely."
 msgstr "Ompliu tots els camps completament."
 
-#: src/account.c:766
+#: src/account.c:311
 msgid "Original password"
 msgstr "Contrasenya original"
 
-#: src/account.c:773
+#: src/account.c:318
 msgid "New password"
 msgstr "Nova contrasenya"
 
-#: src/account.c:780
+#: src/account.c:325
 msgid "New password (again)"
 msgstr "Nova contrasenya (repetiu-la)"
 
-#: src/account.c:786
+#: src/account.c:331
 #, c-format
 msgid "Change password for %s"
 msgstr "Canvia la contrasenya per a %s"
 
-#: src/account.c:794
+#: src/account.c:339
 msgid "Please enter your current password and your new password."
 msgstr "Introduïu la contrasenya actual, i la nova."
 
 #. *
 #. * A wrapper for gaim_request_action() that uses OK and Cancel buttons.
 #.
-#: src/account.c:797 src/connection.c:187 src/gtkblist.c:2605
-#: src/gtkdialogs.c:472 src/gtkdialogs.c:615 src/gtkdialogs.c:671
-#: src/gtkrequest.c:259 src/protocols/jabber/jabber.c:1097
+#: src/account.c:342 src/connection.c:198 src/gtkblist.c:2457
+#: src/gtkdialogs.c:495 src/gtkdialogs.c:637 src/gtkdialogs.c:691
+#: src/gtkrequest.c:242 src/protocols/jabber/jabber.c:1061
 #: 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:2398
-#: src/protocols/oscar/oscar.c:3661 src/protocols/oscar/oscar.c:3755
-#: src/protocols/oscar/oscar.c:7135 src/protocols/oscar/oscar.c:7260
-#: src/protocols/oscar/oscar.c:7285 src/protocols/oscar/oscar.c:7337
+#: src/protocols/msn/msn.c:271 src/protocols/oscar/oscar.c:2333
+#: src/protocols/oscar/oscar.c:3595 src/protocols/oscar/oscar.c:3689
+#: src/protocols/oscar/oscar.c:6962 src/protocols/oscar/oscar.c:7054
+#: src/protocols/oscar/oscar.c:7106 src/protocols/oscar/oscar.c:7192
 #: src/protocols/silc/buddy.c:460 src/protocols/silc/buddy.c:1132
-#: src/protocols/silc/chat.c:422 src/protocols/silc/chat.c:460
-#: src/protocols/silc/chat.c:723 src/protocols/silc/ops.c:1083
-#: src/protocols/silc/ops.c:1689 src/protocols/silc/silc.c:706
-#: src/protocols/yahoo/yahoo.c:2670 src/protocols/yahoo/yahoo.c:2679
-#: src/request.h:1244
+#: src/protocols/silc/chat.c:421 src/protocols/silc/chat.c:459
+#: src/protocols/silc/chat.c:722 src/protocols/silc/ops.c:1081
+#: src/protocols/silc/ops.c:1691 src/protocols/silc/silc.c:703
+#: src/protocols/yahoo/yahoo.c:2846 src/protocols/yahoo/yahoo.c:2855
+#: src/request.h:1245
 msgid "OK"
 msgstr "D'acord"
 
-#: src/account.c:798 src/account.c:836 src/connection.c:188
-#: src/gtkaccount.c:1999 src/gtkaccount.c:2445 src/gtkblist.c:2606
-#: src/gtkblist.c:4693 src/gtkdialogs.c:473 src/gtkdialogs.c:616
-#: src/gtkdialogs.c:672 src/gtkdialogs.c:770 src/gtkdialogs.c:792
-#: src/gtkdialogs.c:812 src/gtkdialogs.c:856 src/gtkdialogs.c:918
-#: src/gtkdialogs.c:960 src/gtkdialogs.c:998 src/gtkimhtmltoolbar.c:443
-#: src/gtkprivacy.c:585 src/gtkprivacy.c:598 src/gtkprivacy.c:623
-#: src/gtkprivacy.c:634 src/gtkrequest.c:260 src/gtksavedstatuses.c:188
-#: src/protocols/jabber/buddy.c:565 src/protocols/jabber/chat.c:777
-#: src/protocols/jabber/jabber.c:676 src/protocols/jabber/jabber.c:1098
-#: 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:1580 src/protocols/oscar/oscar.c:2399
-#: src/protocols/oscar/oscar.c:3619 src/protocols/oscar/oscar.c:3662
-#: src/protocols/oscar/oscar.c:3699 src/protocols/oscar/oscar.c:3756
-#: src/protocols/oscar/oscar.c:7136 src/protocols/oscar/oscar.c:7261
-#: src/protocols/oscar/oscar.c:7286 src/protocols/oscar/oscar.c:7338
-#: src/protocols/oscar/oscar.c:7407 src/protocols/silc/buddy.c:461
-#: src/protocols/silc/buddy.c:1037 src/protocols/silc/buddy.c:1133
-#: src/protocols/silc/chat.c:595 src/protocols/silc/chat.c:724
-#: src/protocols/silc/ops.c:1690 src/protocols/silc/silc.c:707
-#: src/protocols/trepia/trepia.c:348 src/protocols/yahoo/yahoo.c:2671
-#: src/protocols/yahoo/yahoo.c:2680 src/request.h:1244 src/request.h:1254
+#: src/account.c:343 src/account.c:381 src/away.c:367 src/connection.c:199
+#: src/gtkaccount.c:2029 src/gtkaccount.c:2556 src/gtkblist.c:2458
+#: src/gtkblist.c:4527 src/gtkconn.c:169 src/gtkdialogs.c:496
+#: src/gtkdialogs.c:638 src/gtkdialogs.c:692 src/gtkdialogs.c:790
+#: src/gtkdialogs.c:812 src/gtkdialogs.c:832 src/gtkdialogs.c:869
+#: src/gtkdialogs.c:929 src/gtkdialogs.c:972 src/gtkdialogs.c:1010
+#: src/gtkimhtmltoolbar.c:423 src/gtkprivacy.c:586 src/gtkprivacy.c:599
+#: src/gtkprivacy.c:624 src/gtkprivacy.c:635 src/gtkrequest.c:243
+#: src/protocols/icq/gaim_icq.c:276 src/protocols/jabber/buddy.c:515
+#: src/protocols/jabber/chat.c:754 src/protocols/jabber/jabber.c:676
+#: src/protocols/jabber/jabber.c:1062 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:1529
+#: src/protocols/oscar/oscar.c:2334 src/protocols/oscar/oscar.c:3553
+#: src/protocols/oscar/oscar.c:3596 src/protocols/oscar/oscar.c:3633
+#: src/protocols/oscar/oscar.c:3690 src/protocols/oscar/oscar.c:6963
+#: src/protocols/oscar/oscar.c:7055 src/protocols/oscar/oscar.c:7107
+#: src/protocols/oscar/oscar.c:7176 src/protocols/oscar/oscar.c:7193
+#: src/protocols/silc/buddy.c:461 src/protocols/silc/buddy.c:1037
+#: src/protocols/silc/buddy.c:1133 src/protocols/silc/chat.c:594
+#: src/protocols/silc/chat.c:723 src/protocols/silc/ops.c:1692
+#: src/protocols/silc/silc.c:704 src/protocols/trepia/trepia.c:348
+#: src/protocols/yahoo/yahoo.c:2847 src/protocols/yahoo/yahoo.c:2856
+#: src/request.h:1245 src/request.h:1255
 msgid "Cancel"
 msgstr "Cancel·la"
 
-#: src/account.c:827
+#: src/account.c:372
 #, c-format
 msgid "Change user information for %s"
 msgstr "Canvia la informació d'usuari de %s"
 
-#: src/account.c:835 src/gtkrequest.c:266 src/protocols/jabber/buddy.c:564
+#: src/account.c:380 src/gtkrequest.c:249 src/protocols/jabber/buddy.c:514
 #: src/protocols/trepia/trepia.c:347
 msgid "Save"
 msgstr "Desa"
 
-#: src/account.c:1240 src/gtkft.c:158 src/protocols/jabber/buddy.c:623
-#: src/protocols/jabber/buddy.c:1066 src/protocols/jabber/buddy.c:1083
-#: src/protocols/novell/novell.c:2823
+#: src/account.c:739 src/gtkft.c:158 src/protocols/jabber/buddy.c:570
+#: src/protocols/novell/novell.c:2812
 msgid "Unknown"
 msgstr "Desconegut"
 
-#: src/blist.c:544
-msgid "buddy list"
-msgstr "llista d'amics"
-
-#: src/blist.c:1132
+#: src/away.c:233
+msgid "Away!"
+msgstr "Absent."
+
+#: src/away.c:303
+msgid "Edit This Message"
+msgstr "Edita aquest missatge"
+
+#: src/away.c:308
+msgid "I'm Back!"
+msgstr "He tornat."
+
+#: src/away.c:362
+#, c-format
+msgid "Are you sure you want to remove the away message \"%s\"?"
+msgstr "Esteu segur que voleu suprimir el missatge d'absència \"%s\"?"
+
+#: src/away.c:364 src/away.c:456
+msgid "Remove Away Message"
+msgstr "Suprimeix el missatge d'absència"
+
+#. Remove button
+#: src/away.c:366 src/gtkconv.c:1500 src/gtkconv.c:3875 src/gtkconv.c:3946
+#: src/gtkrequest.c:248
+msgid "Remove"
+msgstr "Suprimeix"
+
+#: src/away.c:436
+msgid "New Away Message"
+msgstr "Missatge d'absència nou"
+
+#: src/away.c:652
+msgid "Set All Away"
+msgstr "Passa'ls tots a absent"
+
+#: src/away.c:759
+msgid "You cannot save an away message with a blank title"
+msgstr "No es pot desar un missatge d'absència amb un títol en blanc"
+
+#: src/away.c:761
+msgid ""
+"Please give the message a title, or choose \"Use\" to use without saving."
+msgstr ""
+"Indiqueu un títol per al missatge, o escolliu \"Usa\" per usar-lo sense "
+"desar."
+
+#: src/away.c:771
+msgid "You cannot create an empty away message"
+msgstr "No es pot crear un missatge d'absència buit"
+
+#: src/away.c:836
+msgid "New away message"
+msgstr "Missatge d'absència nou"
+
+#: src/away.c:851
+msgid "Away title: "
+msgstr "Motiu de l'absència: "
+
+#: src/away.c:899
+msgid "_Save"
+msgstr "De_sa"
+
+#: src/away.c:903
+msgid "Sa_ve & Use"
+msgstr "Desa i _fes servir"
+
+#: src/away.c:907
+msgid "_Use"
+msgstr "_Usa"
+
+#: src/blist.c:680
 msgid "Chats"
 msgstr "Xats"
 
-#: src/blist.c:1813
+#: src/blist.c:1352
 #, c-format
 msgid ""
 "%d buddy from group %s was not removed because its account was not logged "
@@ -1447,115 +1461,119 @@
 "No s'han suprimit %d amics del grup %s perquè no estaven connectats. No "
 "s'han suprimit ni els amics ni el grup.\n"
 
-#: src/blist.c:1822
+#: src/blist.c:1361
 msgid "Group not removed"
 msgstr "No s'ha suprimit el grup"
 
-#: src/connection.c:113 src/connection.c:159
+#: src/blist.c:2059
+msgid ""
+"An error was encountered parsing your buddy list.  It has not been loaded, "
+"and the old file has moved to blist.xml~."
+msgstr ""
+"S'ha produït un error en analitzar la vostra llista d'amics. No s'ha "
+"carregat, i s'ha reanomenat el fitxer antic com a blist.xml~."
+
+#: src/blist.c:2062
+msgid "Buddy List Error"
+msgstr "Error en la llista d'amics"
+
+#: src/connection.c:118 src/connection.c:169
 #, c-format
 msgid "Missing protocol plugin for %s"
 msgstr "No s'ha trobat el connector per al protocol %s"
 
-#: src/connection.c:117
+#: src/connection.c:123
 msgid "Registration Error"
 msgstr "Error en el registre"
 
-#: src/connection.c:163
+#: src/connection.c:174
 msgid "Connection Error"
 msgstr "Error de connexió"
 
-#: src/connection.c:183
+#: src/connection.c:195
 #, c-format
 msgid "Enter password for %s (%s)"
 msgstr "Entreu la contrasenya per a %s (%s)"
 
-#: src/connection.c:185
-msgid "Enter Password"
-msgstr "Introduïu la contrasenya"
-
-#: src/conversation.c:236
-msgid "Unable to send message: The message is too large."
-msgstr "No s'ha pogut enviar el missatge: el missatge és massa llarg."
+#: src/conversation.c:233
+msgid "Unable to send message. The message is too large."
+msgstr "No s'ha pogut enviar el missatge. El missatge és massa llarg."
+
+#: src/conversation.c:237 src/conversation.c:251
+#: src/protocols/oscar/oscar.c:4156
+#, c-format
+msgid "Unable to send message to %s:"
+msgstr "No s'ha pogut enviar el missatge a %s:"
 
 #: src/conversation.c:239
-#, c-format
-msgid "Unable to send message to %s."
-msgstr "No s'ha pogut enviar el missatge a %s."
-
-#: src/conversation.c:240
 msgid "The message is too large."
 msgstr "El missatge és massa llarg."
 
-#: src/conversation.c:249
+#: src/conversation.c:248
 msgid "Unable to send message."
 msgstr "No s'ha pogut enviar el missatge."
 
-#: src/conversation.c:252
-#, c-format
-msgid "Unable to send messge to %s."
-msgstr "No s'ha pogut enviar el missatge a %s."
-
-#: src/conversation.c:2052
+#: src/conversation.c:2022
 #, c-format
 msgid "%s entered the room."
 msgstr "%s ha entrat a la sala."
 
-#: src/conversation.c:2055
+#: src/conversation.c:2025
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>] ha entrat a la sala."
 
-#: src/conversation.c:2151
+#: src/conversation.c:2121
 #, c-format
 msgid "You are now known as %s"
 msgstr "Ara us feu dir %s"
 
-#: src/conversation.c:2154
+#: src/conversation.c:2124
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s es fa dir %s"
 
-#: src/conversation.c:2195
+#: src/conversation.c:2165
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s ha sortit de la sala (%s)."
 
-#: src/conversation.c:2197
+#: src/conversation.c:2167
 #, c-format
 msgid "%s left the room."
 msgstr "%s ha sortit de la sala."
 
-#: src/conversation.c:2270
+#: src/conversation.c:2236
 #, c-format
 msgid "(+%d more)"
 msgstr "(i %d més)"
 
-#: src/conversation.c:2272
+#: src/conversation.c:2238
 #, c-format
 msgid " left the room (%s)."
 msgstr " ha sortit de la sala (%s)."
 
-#: src/conversation.c:2677
+#: src/conversation.c:2643
 msgid "Last created window"
 msgstr "Finestra creada per últim cop"
 
-#: src/conversation.c:2679
+#: src/conversation.c:2645
 msgid "Separate IM and Chat windows"
 msgstr "Separa les finestres de MI de les de xat."
 
-#: src/conversation.c:2681 src/gtkprefs.c:1221
+#: src/conversation.c:2647 src/gtkprefs.c:1387
 msgid "New window"
 msgstr "Nova finestra"
 
-#: src/conversation.c:2683
+#: src/conversation.c:2649
 msgid "By group"
 msgstr "Per grup"
 
-#: src/conversation.c:2685
+#: src/conversation.c:2651
 msgid "By account"
 msgstr "Per compte"
 
-#: src/ft.c:148 src/protocols/msn/msn.c:368
+#: src/ft.c:147 src/protocols/msn/msn.c:368
 #, c-format
 msgid ""
 "Error reading %s: \n"
@@ -1564,7 +1582,7 @@
 "Error en llegir %s: \n"
 "%s.\n"
 
-#: src/ft.c:152
+#: src/ft.c:151
 #, c-format
 msgid ""
 "Error writing %s: \n"
@@ -1573,7 +1591,7 @@
 "Error en escriure %s: \n"
 "%s.\n"
 
-#: src/ft.c:156
+#: src/ft.c:155
 #, c-format
 msgid ""
 "Error accessing %s: \n"
@@ -1582,35 +1600,35 @@
 "Error en accedir %s: \n"
 "%s.\n"
 
-#: src/ft.c:188
+#: src/ft.c:187
 msgid "Cannot send a file of 0 bytes."
 msgstr "No es pot enviar un fitxer de 0 octets."
 
-#: src/ft.c:198
+#: src/ft.c:197
 msgid "Cannot send a directory."
 msgstr "No es pot enviar un directori."
 
-#: src/ft.c:205
+#: src/ft.c:204
 #, c-format
 msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
 msgstr "%s no és un fitxer normal, no se sobreescriurà.\n"
 
-#: src/ft.c:261
+#: src/ft.c:260
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "%s us vol enviar %s (%s)"
 
-#: src/ft.c:269
+#: src/ft.c:268
 #, c-format
 msgid "%s wants to send you a file"
 msgstr "%s us vol enviar un fitxer"
 
-#: src/ft.c:308
+#: src/ft.c:306
 #, c-format
 msgid "Accept file transfer request from %s?"
 msgstr "Voleu acceptar la transferència del fitxer de %s?"
 
-#: src/ft.c:312
+#: src/ft.c:310
 #, c-format
 msgid ""
 "A file is available for download from:\n"
@@ -1621,75 +1639,75 @@
 "Ordinador remot: %s\n"
 "Port remot: %d"
 
-#: src/ft.c:365
+#: src/ft.c:362
 #, c-format
 msgid "%s is not a valid filename.\n"
 msgstr "%s no és un nom de fitxer vàlid.\n"
 
-#: src/ft.c:383
+#: src/ft.c:380
 #, c-format
 msgid "Offering to send %s to %s"
 msgstr "S'està oferint enviar %s a %s"
 
-#: src/ft.c:877
+#: src/ft.c:874
 #, c-format
 msgid "Transfer of file %s complete"
 msgstr "S'ha completat la transferència del fitxer %s"
 
-#: src/ft.c:880
+#: src/ft.c:877
 msgid "File transfer complete"
 msgstr "S'ha completat la transferència del fitxer"
 
-#: src/ft.c:929
+#: src/ft.c:926
 #, c-format
 msgid "You canceled the transfer of %s"
 msgstr "Heu cancel·lat la transferència de %s"
 
-#: src/ft.c:935
+#: src/ft.c:932
 msgid "File transfer cancelled"
 msgstr "S'ha cancel·lat la transferència del fitxer"
 
-#: src/ft.c:988
+#: src/ft.c:985
 #, c-format
 msgid "%s canceled the transfer of %s"
 msgstr "%s ha cancel·lat la transferència de %s"
 
-#: src/ft.c:994
+#: src/ft.c:991
 #, c-format
 msgid "%s canceled the file transfer"
 msgstr "%s ha cancel·lat la transferència del fitxer"
 
-#: src/ft.c:1043
+#: src/ft.c:1040
 #, c-format
 msgid "File transfer to %s aborted.\n"
 msgstr "S'ha avortat la transferència del fitxer a %s.\n"
 
-#: src/ft.c:1045
+#: src/ft.c:1042
 #, c-format
 msgid "File transfer from %s aborted.\n"
 msgstr "S'ha avortat la transferència del fitxer de %s.\n"
 
-#: src/gaim-remote.c:104
+#: src/gaim-disclosure.c:253
+msgid "Expander Size"
+msgstr "Mida de l'expansor"
+
+#: src/gaim-disclosure.c:254
+msgid "Size of the expander arrow"
+msgstr "Mida de la fletxa d'expansió"
+
+#: src/gaim-remote.c:108
 #, c-format
 msgid ""
 "Usage: %s command [OPTIONS] [URI]\n"
 "\n"
 "    COMMANDS:\n"
-"       send                     Send message\n"
 "       uri                      Handle AIM: URI\n"
 "       away                     Popup the away dialog with the default "
 "message\n"
 "       back                     Remove the away dialog\n"
-"       logout                   Log out all accounts\n"
 "       quit                     Close running copy of Gaim\n"
 "\n"
 "    OPTIONS:\n"
-"       -m, --message=MESG       Message to send or show in conversation "
-"window\n"
-"       -t, --to=SCREENNAME      Select a target for command\n"
-"       -p, --protocol=PROTO     Specify protocol to use\n"
-"       -f, --from=SCREENNAME    Specify screen name to use\n"
-"       -s, --session=SESSION    Specify which Gaim session to use\n"
 "       -h, --help [command]     Show help for command\n"
 msgstr ""
 "Ús: %s ordre [OPCIONS] [URI]\n"
@@ -1699,36 +1717,20 @@
 "      away               Emergeix diàleg d'absència amb el missatge per "
 "defecte\n"
 "      back               Suprimeix el diàleg d'absència\n"
-"      logout             Surt de tots els comptes\n"
 "      quit               Tanca la còpia en execució del Gaim\n"
 "\n"
 "    OPCIONS:\n"
-"      -m, --messages=MSG Missatge a enviar o mostrar en la finestra de "
-"conversa\n"
-"      -t, --to=NOMUSUARI Selecciona l'objectiu de l'ordre\n"
-"      -p, --protocol=PRO Especifica el protocol a usar\n"
-"      -f, --from=SESSIÓ  Especifica el nom d'usuari a fer servir\n"
-"      -s, --session=SESS Especifica quina sessió del Gaim fer servir\n"
 "      -h, --help [ordre] Mostra una ajuda per a l'ordre\n"
 
-#: src/gaim-remote.c:195
-#, c-format
-msgid ""
-"Gaim not running (on session %d)\n"
+#: src/gaim-remote.c:185 src/gaim-remote.c:203
+msgid ""
+"Gaim not running (on session 0)\n"
 "Is the \"Remote Control\" plugin loaded?\n"
 msgstr ""
-"El Gaim no s'està executant (en la sessió %d)\n"
+"El Gaim no s'està executant (en la sessió 0)\n"
 "Ja heu carregat el controlador \"Control remot\"?\n"
 
-#: src/gaim-remote.c:282
-msgid ""
-"Insufficient arguments (-t, -f, -p, & -m are all required) or arguments "
-"greater than 9999 chars\n"
-msgstr ""
-"No hi ha prou arguments (-t, -f, -p, i -m en requereixen) o els arguments "
-"contenen més de 9999 caràcters\n"
-
-#: src/gaim-remote.c:293
+#: src/gaim-remote.c:219
 msgid ""
 "\n"
 "Using AIM: URIs:\n"
@@ -1772,15 +1774,7 @@
 "\tgaim-remote uri aim:addbuddy?screenname=Pingüí\n"
 "...sol·licita a 'Pingüí' afegir-lo a la llista d'amics.\n"
 
-#: src/gaim-remote.c:313
-msgid ""
-"\n"
-"Log out all accounts\n"
-msgstr ""
-"\n"
-"Desconnecta tots els comptes\n"
-
-#: src/gaim-remote.c:317
+#: src/gaim-remote.c:239
 msgid ""
 "\n"
 "Close running copy of Gaim\n"
@@ -1788,7 +1782,7 @@
 "\n"
 "Tanca la instància en execució del Gaim\n"
 
-#: src/gaim-remote.c:321
+#: src/gaim-remote.c:243
 msgid ""
 "\n"
 "Mark all accounts as \"away\" with the default message.\n"
@@ -1796,7 +1790,7 @@
 "\n"
 "Posa el missatge per defecte d'\"absent\" a tots els comptes.\n"
 
-#: src/gaim-remote.c:325
+#: src/gaim-remote.c:247
 msgid ""
 "\n"
 "Set all accounts as not away.\n"
@@ -1804,15 +1798,7 @@
 "\n"
 "Treu el missatge d'absència de tots els comptes.\n"
 
-#: src/gaim-remote.c:329
-msgid ""
-"\n"
-"Send instant message\n"
-msgstr ""
-"\n"
-"Envia missatge instantani\n"
-
-#: src/gtkaccount.c:342
+#: src/gtkaccount.c:331
 #, c-format
 msgid ""
 "<b>File:</b> %s\n"
@@ -1824,162 +1810,165 @@
 "<b>Mida de la imatge:</b> %dx%d"
 
 #. Build the login options frame.
-#: src/gtkaccount.c:662
+#: src/gtkaccount.c:638
 msgid "Login Options"
 msgstr "Opcions d'entrada"
 
-#: src/gtkaccount.c:679 src/gtkft.c:554
+#: src/gtkaccount.c:655 src/gtkft.c:555
 msgid "Protocol:"
 msgstr "Protocol:"
 
 # Mozilla 1.3->ScreenName.label
-#: src/gtkaccount.c:684 src/gtkblist.c:4249
+#: src/gtkaccount.c:660 src/gtkblist.c:4113
 msgid "Screen Name:"
 msgstr "Nom d'usuari:"
 
-#: src/gtkaccount.c:757
+#: src/gtkaccount.c:733
 msgid "Password:"
 msgstr "Contrasenya:"
 
-#: src/gtkaccount.c:762 src/gtkblist.c:4263 src/gtkblist.c:4640
+#: src/gtkaccount.c:738 src/gtkblist.c:4127 src/gtkblist.c:4474
 msgid "Alias:"
 msgstr "Àlies:"
 
-#: src/gtkaccount.c:766
+#: src/gtkaccount.c:742
 msgid "Remember password"
 msgstr "Recorda la constrasenya"
 
 #. Build the user options frame.
-#: src/gtkaccount.c:811
+#: src/gtkaccount.c:798
 msgid "User Options"
 msgstr "Opcions d'usuari"
 
-#: src/gtkaccount.c:824
+#: src/gtkaccount.c:811
 msgid "New mail notifications"
 msgstr "Notifica si hi ha nou correu"
 
-#: src/gtkaccount.c:833
+#: src/gtkaccount.c:820
 msgid "Buddy icon:"
 msgstr "Icona de l'amic:"
 
 #. Build the protocol options frame.
-#: src/gtkaccount.c:922
+#: src/gtkaccount.c:909
 #, c-format
 msgid "%s Options"
 msgstr "Opcions de %s"
 
 #. Use Global Proxy Settings
-#: src/gtkaccount.c:1058 src/gtkaccount.c:1105
+#: src/gtkaccount.c:1048 src/gtkaccount.c:1095
 msgid "Use Global Proxy Settings"
 msgstr "Usa les opcions globals per al servidor intermediari"
 
 #. No Proxy
-#: src/gtkaccount.c:1064 src/gtkaccount.c:1112
+#: src/gtkaccount.c:1054 src/gtkaccount.c:1102
 msgid "No Proxy"
 msgstr "Sense servidor intermediari"
 
 #. HTTP
-#: src/gtkaccount.c:1070 src/gtkaccount.c:1119
+#: src/gtkaccount.c:1060 src/gtkaccount.c:1109
 msgid "HTTP"
 msgstr "HTTP"
 
 #. SOCKS 4
-#: src/gtkaccount.c:1076 src/gtkaccount.c:1126
+#: src/gtkaccount.c:1066 src/gtkaccount.c:1116
 msgid "SOCKS 4"
 msgstr "SOCKS 4"
 
 #. SOCKS 5
-#: src/gtkaccount.c:1082 src/gtkaccount.c:1133
+#: src/gtkaccount.c:1072 src/gtkaccount.c:1123
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
 #. Use Environmental Settings
-#: src/gtkaccount.c:1088 src/gtkaccount.c:1140 src/gtkprefs.c:1024
+#: src/gtkaccount.c:1078 src/gtkaccount.c:1130 src/gtkprefs.c:1190
 msgid "Use Environmental Settings"
 msgstr "Usa les opcions de l'entorn"
 
-#: src/gtkaccount.c:1179
+#: src/gtkaccount.c:1169
 msgid "you can see the butterflies mating"
 msgstr "podeu veure les papallones aparellant-se"
 
-#: src/gtkaccount.c:1183
+#: src/gtkaccount.c:1173
 msgid "If you look real closely"
 msgstr "Si mireu de ben a prop"
 
-#: src/gtkaccount.c:1199
+#: src/gtkaccount.c:1189
 msgid "Proxy Options"
 msgstr "Opcions del servidor intermediari"
 
-#: src/gtkaccount.c:1217 src/gtkprefs.c:1018
+#: src/gtkaccount.c:1207 src/gtkprefs.c:1184
 msgid "Proxy _type:"
 msgstr "_Tipus de servidor intermediari"
 
-#: src/gtkaccount.c:1226 src/gtkprefs.c:1045
+#: src/gtkaccount.c:1216 src/gtkprefs.c:1211
 msgid "_Host:"
 msgstr "_Ordinador:"
 
-#: src/gtkaccount.c:1230 src/gtkprefs.c:1063
+#: src/gtkaccount.c:1220 src/gtkprefs.c:1229
 msgid "_Port:"
 msgstr "_Port:"
 
-#: src/gtkaccount.c:1238
+#: src/gtkaccount.c:1228
 msgid "_Username:"
 msgstr "_Nom d'usuari:"
 
-#: src/gtkaccount.c:1243 src/gtkprefs.c:1100
+#: src/gtkaccount.c:1233 src/gtkprefs.c:1266
 msgid "Pa_ssword:"
 msgstr "_Contrasenya:"
 
-#: src/gtkaccount.c:1612
+#: src/gtkaccount.c:1604
 msgid "Add Account"
 msgstr "Afegeix compte"
 
-#: src/gtkaccount.c:1614
+#: src/gtkaccount.c:1606
 msgid "Modify Account"
 msgstr "Modifica compte"
 
 #. Add the disclosure
-#: src/gtkaccount.c:1638
+#: src/gtkaccount.c:1630
 msgid "Show more options"
 msgstr "Mostra més opcions"
 
-#: src/gtkaccount.c:1639
+#: src/gtkaccount.c:1631
 msgid "Show fewer options"
 msgstr "Mostra menys opcions"
 
 #. Register button
-#: src/gtkaccount.c:1661 src/protocols/jabber/jabber.c:675
+#: src/gtkaccount.c:1658 src/protocols/jabber/jabber.c:675
 msgid "Register"
 msgstr "Registra"
 
-#: src/gtkaccount.c:1993 src/gtksavedstatuses.c:184
+#: src/gtkaccount.c:2023
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "Esteu segur que voleu suprimir %s?"
 
-#: src/gtkaccount.c:1998 src/gtkrequest.c:263 src/gtksavedstatuses.c:187
+#: src/gtkaccount.c:2028 src/gtkrequest.c:246
 msgid "Delete"
 msgstr "Suprimeix"
 
-#: src/gtkaccount.c:2055 src/gtksavedstatuses.c:622
-#: src/protocols/oscar/oscar.c:4308
+#: src/gtkaccount.c:2142 src/protocols/oscar/oscar.c:4240
 msgid "Screen Name"
 msgstr "Nom d'usuari"
 
-#: src/gtkaccount.c:2078
-msgid "Enabled"
-msgstr "Habilitat"
-
-#: src/gtkaccount.c:2086
+#: src/gtkaccount.c:2166 src/protocols/jabber/jabber.c:971
+#: src/protocols/oscar/oscar.c:685 src/protocols/oscar/oscar.c:5698
+#: src/protocols/oscar/oscar.c:6890 src/protocols/silc/silc.c:45
+#: src/protocols/yahoo/yahoo.c:2609 src/protocols/zephyr/zephyr.c:2122
+#: src/protocols/zephyr/zephyr.c:2141
+msgid "Online"
+msgstr "En línia"
+
+#: src/gtkaccount.c:2187
 msgid "Protocol"
 msgstr "Protocol"
 
-#: src/gtkaccount.c:2420
+#: src/gtkaccount.c:2531
 #, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s%s"
 msgstr "%s%s%s%s ha fet a %s un dels seus amics%s%s%s"
 
-#: src/gtkaccount.c:2434
+#: src/gtkaccount.c:2545
 msgid ""
 "\n"
 "\n"
@@ -1989,253 +1978,246 @@
 "\n"
 "Voleu afegir-lo a la llista d'amics?"
 
-#: src/gtkaccount.c:2438
+#: src/gtkaccount.c:2549
 msgid "Information"
 msgstr "Informació"
 
-#: src/gtkaccount.c:2442
+#: src/gtkaccount.c:2553
 msgid "Add buddy to your list?"
 msgstr "Voleu afegir l'amic a la llista?"
 
-#: src/gtkaccount.c:2444 src/gtkblist.c:4692 src/gtkconv.c:1454
-#: src/gtkrequest.c:264 src/protocols/oscar/oscar.c:3933
-#: src/protocols/silc/chat.c:594
+#. Add button
+#: src/gtkaccount.c:2555 src/gtkblist.c:4526 src/gtkconv.c:1502
+#: src/gtkconv.c:3868 src/gtkconv.c:3939 src/gtkrequest.c:247
+#: src/protocols/icq/gaim_icq.c:276 src/protocols/oscar/oscar.c:3867
+#: src/protocols/silc/chat.c:593
 msgid "Add"
 msgstr "Afegeix"
 
-#: src/gtkblist.c:840
+#: src/gtkblist.c:839
 msgid "Join a Chat"
 msgstr "Entra a un xat"
 
-#: src/gtkblist.c:861
+#: src/gtkblist.c:860
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 msgstr "Entreu la informació necessària sobre el xat al que vulgueu entrar.\n"
 
-#: src/gtkblist.c:872 src/gtkpounce.c:415 src/gtkroomlist.c:354
+#: src/gtkblist.c:871 src/gtkpounce.c:415 src/gtkroomlist.c:354
 msgid "_Account:"
 msgstr "_Compte:"
 
 # Això és el botó, alerta l'amplada!
-#: src/gtkblist.c:1144
+#: src/gtkblist.c:1166 src/gtkblist.c:3283
 msgid "Get _Info"
 msgstr "_Informa"
 
-#: src/gtkblist.c:1147
+#: src/gtkblist.c:1169 src/gtkblist.c:3273
 msgid "I_M"
 msgstr "_MI"
 
-#: src/gtkblist.c:1153
-msgid "_Send File"
-msgstr "_Envia un fitxer"
-
-#: src/gtkblist.c:1159
-msgid "Add Buddy _Pounce"
-msgstr "Afegeix un avís _per a l'amic"
-
-#: src/gtkblist.c:1161 src/gtkblist.c:1258
-msgid "View _Log"
-msgstr "Visua_litza el registre"
-
-#: src/gtkblist.c:1171
-msgid "_Alias Buddy..."
-msgstr "Pos_a un àlies a un amic..."
-
-#: src/gtkblist.c:1173
-msgid "_Remove Buddy"
-msgstr "Sup_rimeix un amic"
-
 #: src/gtkblist.c:1175
+msgid "_Send File"
+msgstr "_Envia un fitxer"
+
+#: src/gtkblist.c:1181
+msgid "Add Buddy _Pounce"
+msgstr "Afegeix un avís _per a l'amic"
+
+#: src/gtkblist.c:1183 src/gtkblist.c:1280
+msgid "View _Log"
+msgstr "Visua_litza el registre"
+
+#: src/gtkblist.c:1193
+msgid "_Alias Buddy..."
+msgstr "Pos_a un àlies a un amic..."
+
+#: src/gtkblist.c:1195
+msgid "_Remove Buddy"
+msgstr "Sup_rimeix un amic"
+
+#: src/gtkblist.c:1197
 msgid "Alias Contact..."
 msgstr "Posa un àlies a un contacte..."
 
-#: src/gtkblist.c:1178 src/gtkdialogs.c:854 src/gtkdialogs.c:855
+#: src/gtkblist.c:1200 src/gtkdialogs.c:866 src/gtkdialogs.c:868
 msgid "Remove Contact"
 msgstr "Suprimeix un contacte"
 
-#: src/gtkblist.c:1182 src/gtkblist.c:1266 src/gtkblist.c:1280
+#: src/gtkblist.c:1204 src/gtkblist.c:1288 src/gtkblist.c:1302
 msgid "_Alias..."
 msgstr "À_lies..."
 
-#: src/gtkblist.c:1184 src/gtkblist.c:1268 src/gtkblist.c:1285
-#: src/gtkconn.c:166
+#: src/gtkblist.c:1206 src/gtkblist.c:1290 src/gtkblist.c:1307
+#: src/gtkconn.c:361
 msgid "_Remove"
 msgstr "Sup_rimeix"
 
-#: src/gtkblist.c:1230
+#: src/gtkblist.c:1252
 msgid "Add a _Buddy"
 msgstr "_Afegeix un amic"
 
-#: src/gtkblist.c:1232
+#: src/gtkblist.c:1254
 msgid "Add a C_hat"
 msgstr "A_fegeix un xat"
 
-#: src/gtkblist.c:1234
+#: src/gtkblist.c:1256
 msgid "_Delete Group"
 msgstr "_Suprimeix un grup"
 
-#: src/gtkblist.c:1236
+#: src/gtkblist.c:1258
 msgid "_Rename"
 msgstr "_Canvia el nom"
 
 # Gnome_2.6_Extras [gossip.HEAD.ca.po]
 #. join button
-#: src/gtkblist.c:1254 src/gtkroomlist.c:264 src/gtkroomlist.c:409
-#: src/gtkstock.c:101
+#: src/gtkblist.c:1276 src/gtkroomlist.c:264 src/gtkroomlist.c:409
+#: src/stock.c:88
 msgid "_Join"
 msgstr "En_tra"
 
-#: src/gtkblist.c:1256
+#: src/gtkblist.c:1278
 msgid "Auto-Join"
 msgstr "Entra automàticament"
 
-#: src/gtkblist.c:1282 src/gtkblist.c:1307
+#: src/gtkblist.c:1304 src/gtkblist.c:1329
 msgid "_Collapse"
 msgstr "_Redueix"
 
-#: src/gtkblist.c:1312
+#: src/gtkblist.c:1334
 msgid "_Expand"
 msgstr "_Expandeix"
 
-#: src/gtkblist.c:1529 src/gtkblist.c:1539 src/gtkblist.c:3509
-#: src/gtkblist.c:3512
-msgid "/Tools/Mute Sounds"
-msgstr "/Eines/Deshabilita els sons"
-
-#: src/gtkblist.c:1980 src/gtkconv.c:4149 src/gtkpounce.c:314
+#: src/gtkblist.c:1981 src/gtkconv.c:4511 src/gtkpounce.c:316
 msgid ""
 "You are not currently signed on with an account that can add that buddy."
 msgstr "No esteu connectat amb cap protocol que permeti afegir aquest amic."
 
 #. Buddies menu
-#: src/gtkblist.c:2549
+#: src/gtkblist.c:2402
 msgid "/_Buddies"
 msgstr "/_Amics"
 
-#: src/gtkblist.c:2550
+#: src/gtkblist.c:2403
 msgid "/Buddies/New Instant _Message..."
 msgstr "/Amics/Missatge _instantani nou..."
 
-#: src/gtkblist.c:2551
+#: src/gtkblist.c:2404
 msgid "/Buddies/Join a _Chat..."
 msgstr "/Amics/Entra a un _xat..."
 
-#: src/gtkblist.c:2552
+#: src/gtkblist.c:2405
 msgid "/Buddies/Get User _Info..."
 msgstr "/Amics/Obtingues informació de l'_usuari..."
 
-#: src/gtkblist.c:2553
+#: src/gtkblist.c:2406
 msgid "/Buddies/View User _Log..."
 msgstr "/Amics/Visua_litza el registre de l'usuari..."
 
-#: src/gtkblist.c:2555
+#: src/gtkblist.c:2408
 msgid "/Buddies/Show _Offline Buddies"
 msgstr "/Amics/Mostra amics desc_onnectats"
 
-#: src/gtkblist.c:2556
+#: src/gtkblist.c:2409
 msgid "/Buddies/Show _Empty Groups"
 msgstr "/Amics/Mostra grups _buits"
 
-#: src/gtkblist.c:2557
+#: src/gtkblist.c:2410
 msgid "/Buddies/_Add Buddy..."
 msgstr "/Amics/_Afegeix un amic..."
 
-#: src/gtkblist.c:2558
+#: src/gtkblist.c:2411
 msgid "/Buddies/Add C_hat..."
 msgstr "/Amics/Afegeix un _xat..."
 
-#: src/gtkblist.c:2559
+#: src/gtkblist.c:2412
 msgid "/Buddies/Add _Group..."
 msgstr "/Amics/Afegeix un _grup..."
 
-#: src/gtkblist.c:2561
-msgid "/Buddies/_Log Out"
+#: src/gtkblist.c:2414
+msgid "/Buddies/_Signoff"
 msgstr "/Amics/_Desconnecta"
 
-#: src/gtkblist.c:2562
+#: src/gtkblist.c:2415
 msgid "/Buddies/_Quit"
 msgstr "/Amics/_Surt"
 
 #. Tools
-#: src/gtkblist.c:2565
+#: src/gtkblist.c:2418
 msgid "/_Tools"
 msgstr "/_Eines"
 
-#: src/gtkblist.c:2566
+#: src/gtkblist.c:2419
+msgid "/Tools/_Away"
+msgstr "/Eines/_Absent"
+
+#: src/gtkblist.c:2420
 msgid "/Tools/Buddy _Pounce"
 msgstr "/Eines/Avís _per a amics"
 
-#: src/gtkblist.c:2567
+#: src/gtkblist.c:2421
 msgid "/Tools/Account Ac_tions"
 msgstr "/Eines/Accions dels comp_tes"
 
-#: src/gtkblist.c:2568
+#: src/gtkblist.c:2422
 msgid "/Tools/Pl_ugin Actions"
 msgstr "/Eines/Acci_ons del connector"
 
-#: src/gtkblist.c:2570
-msgid "/Tools/_Statuses"
-msgstr "/Eines/_Estats"
-
-#: src/gtkblist.c:2571
+#: src/gtkblist.c:2424
 msgid "/Tools/A_ccounts"
 msgstr "/Eines/_Comptes"
 
-#: src/gtkblist.c:2572
-msgid "/Tools/Pr_eferences"
-msgstr "/Eines/Pr_eferències"
-
-#: src/gtkblist.c:2573
-msgid "/Tools/Pr_ivacy"
-msgstr "/Eines/_Privadesa"
-
-#: src/gtkblist.c:2574
+#: src/gtkblist.c:2425
 msgid "/Tools/_File Transfers"
 msgstr "/Eines/Transferència de _fitxers"
 
-#: src/gtkblist.c:2575
+#: src/gtkblist.c:2426
 msgid "/Tools/R_oom List"
 msgstr "/Eines/_Llista de sales"
 
-#: src/gtkblist.c:2577
-msgid "/Tools/Mute _Sounds"
-msgstr "/Eines/Deshabilita els _sons"
-
-#: src/gtkblist.c:2578
+#: src/gtkblist.c:2427
+msgid "/Tools/Pr_eferences"
+msgstr "/Eines/Pr_eferències"
+
+#: src/gtkblist.c:2428
+msgid "/Tools/Pr_ivacy"
+msgstr "/Eines/_Privadesa"
+
+#: src/gtkblist.c:2430
 msgid "/Tools/View System _Log"
 msgstr "/Eines/Visua_litza el registre del sistema"
 
 #. Help
-#: src/gtkblist.c:2581
+#: src/gtkblist.c:2433
 msgid "/_Help"
 msgstr "/_Ajuda"
 
-#: src/gtkblist.c:2582
+#: src/gtkblist.c:2434
 msgid "/Help/Online _Help"
 msgstr "/Ajuda/_Ajuda en línia"
 
-#: src/gtkblist.c:2583
+#: src/gtkblist.c:2435
 msgid "/Help/_Debug Window"
 msgstr "/Ajuda/Finestra de _depuració"
 
-#: src/gtkblist.c:2584
+#: src/gtkblist.c:2436
 msgid "/Help/_About"
 msgstr "/Ajuda/_Quant a"
 
-#: src/gtkblist.c:2602
+#: src/gtkblist.c:2454
 msgid "Rename Group"
 msgstr "Reanomena el grup"
 
-#: src/gtkblist.c:2602
+#: src/gtkblist.c:2454
 msgid "New group name"
 msgstr "Nom de grup nou"
 
-#: src/gtkblist.c:2603
+#: src/gtkblist.c:2455
 msgid "Please enter a new name for the selected group."
 msgstr "Entreu un nou nom per al grup seleccionat."
 
-#: src/gtkblist.c:2634 src/gtkblist.c:2701
+#: src/gtkblist.c:2484
 #, c-format
 msgid ""
 "\n"
@@ -2244,83 +2226,7 @@
 "\n"
 "<b>Compte:</b> %s"
 
-#: src/gtkblist.c:2710
-#, c-format
-msgid ""
-"\n"
-"<b>Contact Alias:</b> %s"
-msgstr ""
-"\n"
-"<b>Àlies del contacte:</b> %s"
-
-#: src/gtkblist.c:2718
-#, c-format
-msgid ""
-"\n"
-"<b>Alias:</b> %s"
-msgstr ""
-"\n"
-"<b>Àlies:</b> %s"
-
-#: src/gtkblist.c:2726
-#, c-format
-msgid ""
-"\n"
-"<b>Nickname:</b> %s"
-msgstr ""
-"\n"
-"<b>Sobrenom:</b> %s"
-
-#: src/gtkblist.c:2735
-#, c-format
-msgid ""
-"\n"
-"<b>Logged In:</b> %s"
-msgstr ""
-"\n"
-"<b>Connectat:</b> %s"
-
-#: src/gtkblist.c:2747
-#, c-format
-msgid ""
-"\n"
-"<b>Idle:</b> %s"
-msgstr ""
-"\n"
-"<b>Inactiu:</b> %s"
-
-#: src/gtkblist.c:2751
-msgid ""
-"\n"
-"<b>Idle</b>"
-msgstr ""
-"\n"
-"<b>Inactiu</b>"
-
-#: src/gtkblist.c:2762
-#, c-format
-msgid ""
-"\n"
-"<b>Last Seen:</b> %s ago"
-msgstr ""
-"\n"
-"<b>Vist per darrera vegada:</b> fa %s"
-
-#: src/gtkblist.c:2771
-#, c-format
-msgid "%d%%"
-msgstr "%d%%"
-
-#: src/gtkblist.c:2772
-#, c-format
-msgid ""
-"\n"
-"<b>Warned:</b> %s"
-msgstr ""
-"\n"
-"<b>Avisat:</b> %s"
-
-#: src/gtkblist.c:2778
+#: src/gtkblist.c:2548
 msgid ""
 "\n"
 "<b>Status:</b> Offline"
@@ -2328,7 +2234,68 @@
 "\n"
 "<b>Estat:</b> Desconnectat"
 
-#: src/gtkblist.c:2799
+#: src/gtkblist.c:2563
+#, c-format
+msgid "%d%%"
+msgstr "%d%%"
+
+#: src/gtkblist.c:2579
+msgid ""
+"\n"
+"<b>Account:</b>"
+msgstr ""
+"\n"
+"<b>Compte:</b>"
+
+#: src/gtkblist.c:2580
+msgid ""
+"\n"
+"<b>Contact Alias:</b>"
+msgstr ""
+"\n"
+"<b>Àlies del contacte:</b>"
+
+#: src/gtkblist.c:2581
+msgid ""
+"\n"
+"<b>Alias:</b>"
+msgstr ""
+"\n"
+"<b>Àlies:</b>"
+
+#: src/gtkblist.c:2582
+msgid ""
+"\n"
+"<b>Nickname:</b>"
+msgstr ""
+"\n"
+"<b>Sobrenom:</b>"
+
+#: src/gtkblist.c:2583
+msgid ""
+"\n"
+"<b>Logged In:</b>"
+msgstr ""
+"\n"
+"<b>Connectat:</b>"
+
+#: src/gtkblist.c:2584
+msgid ""
+"\n"
+"<b>Idle:</b>"
+msgstr ""
+"\n"
+"<b>Inactiu:</b>"
+
+#: src/gtkblist.c:2585
+msgid ""
+"\n"
+"<b>Warned:</b>"
+msgstr ""
+"\n"
+"<b>Avisat:</b>"
+
+#: src/gtkblist.c:2587
 msgid ""
 "\n"
 "<b>Description:</b> Spooky"
@@ -2336,127 +2303,124 @@
 "\n"
 "<b>Descripció:</b> Xerraire"
 
-#: src/gtkblist.c:2801
+#: src/gtkblist.c:2588
 msgid ""
 "\n"
-"<b>Status:</b> Awesome"
+"<b>Status</b>: Awesome"
 msgstr ""
 "\n"
-"<b>Estat:</b> Imponent"
-
-#: src/gtkblist.c:2803
+"<b>Estat</b>: Imponent"
+
+#: src/gtkblist.c:2589
 msgid ""
 "\n"
-"<b>Status:</b> Rockin'"
+"<b>Status</b>: Rockin'"
 msgstr ""
 "\n"
-"<b>Estat:</b> De conya"
-
-#: src/gtkblist.c:3045
+"<b>Estat</b>: De conya"
+
+#: src/gtkblist.c:2871
 #, c-format
 msgid "Idle (%dh%02dm) "
 msgstr "Inactiu (%d h i %02d min) "
 
-#: src/gtkblist.c:3047
+#: src/gtkblist.c:2873
 #, c-format
 msgid "Idle (%dm) "
 msgstr "Inactiu (%d min) "
 
-#: src/gtkblist.c:3050
-msgid "Idle "
-msgstr "Inactiu "
-
-#: src/gtkblist.c:3056
+#: src/gtkblist.c:2878
 #, c-format
 msgid "Warned (%d%%) "
 msgstr "Avisat (%d%%) "
 
-#: src/gtkblist.c:3060
+#: src/gtkblist.c:2881
 msgid "Offline "
 msgstr "Fora de línia "
 
-#: src/gtkblist.c:3179
-msgid "/Buddies/New Instant Message..."
-msgstr "/Amics/Missatge instantani nou..."
-
-#: src/gtkblist.c:3180 src/gtkblist.c:3215
+#. Make menu items sensitive/insensitive where appropriate
+#: src/gtkblist.c:2999
 msgid "/Buddies/Join a Chat..."
 msgstr "/Amics/Entra a un xat..."
 
-#: src/gtkblist.c:3181
-msgid "/Buddies/Get User Info..."
-msgstr "/Amics/Obtingues informació de l'usuari..."
-
-#: src/gtkblist.c:3182
-msgid "/Buddies/Add Buddy..."
-msgstr "/Amics/Afegeix un amic..."
-
-#: src/gtkblist.c:3183
-msgid "/Buddies/Add Chat..."
-msgstr "/Amics/Afegeix un xat..."
-
-#: src/gtkblist.c:3184
-msgid "/Buddies/Add Group..."
-msgstr "/Amics/Afegeix un grup..."
-
-#: src/gtkblist.c:3185
-msgid "/Buddies/Log Out"
-msgstr "/Amics/Desconnecta"
-
-#: src/gtkblist.c:3218
+#: src/gtkblist.c:3002
 msgid "/Tools/Room List"
 msgstr "/Eines/Llista de sales"
 
-#: src/gtkblist.c:3221
+#: src/gtkblist.c:3005
 msgid "/Tools/Privacy"
 msgstr "/Eines/Privadesa"
 
-#: src/gtkblist.c:3289 src/gtkprefs.c:1708 src/protocols/jabber/jabber.c:936
-msgid "None"
-msgstr "Cap"
-
-#: src/gtkblist.c:3291
+#: src/gtkblist.c:3087
 msgid "Alphabetical"
 msgstr "Alfabèticament"
 
-#: src/gtkblist.c:3292
+#: src/gtkblist.c:3088
 msgid "By status"
 msgstr "Per estat"
 
-#: src/gtkblist.c:3293
+#: src/gtkblist.c:3089
 msgid "By log size"
 msgstr "Per la mida del registre"
 
-#: src/gtkblist.c:3404
+#: src/gtkblist.c:3155
+msgid "/Tools/Away"
+msgstr "/Eines/Absent"
+
+#: src/gtkblist.c:3158
 msgid "/Tools/Buddy Pounce"
 msgstr "/Eines/Avís de l'amic"
 
-#: src/gtkblist.c:3405
+#: src/gtkblist.c:3161
 msgid "/Tools/Account Actions"
 msgstr "/Eines/Accions del compte"
 
-#: src/gtkblist.c:3406
+#: src/gtkblist.c:3164
 msgid "/Tools/Plugin Actions"
 msgstr "/Eines/Accions del connector"
 
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: src/gtkblist.c:3505
+#: src/gtkblist.c:3252
 msgid "/Buddies/Show Offline Buddies"
 msgstr "/Amics/Mostra amics desconnectats"
 
-#: src/gtkblist.c:3507
+#: src/gtkblist.c:3254
 msgid "/Buddies/Show Empty Groups"
 msgstr "/Amics/Mostra grups buits"
 
-#: src/gtkblist.c:4203 src/protocols/silc/buddy.c:731
+#: src/gtkblist.c:3279
+msgid "Send a message to the selected buddy"
+msgstr "Envia un missatge a l'amic seleccionat"
+
+#: src/gtkblist.c:3289
+msgid "Get information on the selected buddy"
+msgstr "Obtingues dades sobre l'amic seleccionat"
+
+#: src/gtkblist.c:3293
+msgid "_Chat"
+msgstr "_Xat"
+
+#: src/gtkblist.c:3298
+msgid "Join a chat room"
+msgstr "Entra a una sala"
+
+#: src/gtkblist.c:3303
+msgid "_Away"
+msgstr "_Absent"
+
+#: src/gtkblist.c:3308
+msgid "Set an away message"
+msgstr "Estableix un missatge d'absència"
+
+#: src/gtkblist.c:4067 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:2601
+#: src/protocols/silc/buddy.c:1124 src/protocols/yahoo/yahoo.c:2776
 msgid "Add Buddy"
 msgstr "Afegeix un amic"
 
-#: src/gtkblist.c:4227
+#: src/gtkblist.c:4091
 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. "
@@ -2467,25 +2431,25 @@
 "sobrenom substituirà el nom d'usuari allà on sigui possible.\n"
 
 #. Set up stuff for the account box
-#: src/gtkblist.c:4287 src/gtkblist.c:4620
+#: src/gtkblist.c:4151 src/gtkblist.c:4454
 msgid "Account:"
 msgstr "Compte:"
 
-#: src/gtkblist.c:4553
+#: src/gtkblist.c:4387
 msgid "This protocol does not support chat rooms."
 msgstr "Aquest protocol no implementa sales de xat."
 
-#: src/gtkblist.c:4569
+#: src/gtkblist.c:4403
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
 msgstr "No esteu connectat amb cap protocol que permeti fer xats."
 
-#: src/gtkblist.c:4586
+#: src/gtkblist.c:4420
 msgid "Add Chat"
 msgstr "Afegeix xat"
 
-#: src/gtkblist.c:4610
+#: src/gtkblist.c:4444
 msgid ""
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
@@ -2493,23 +2457,39 @@
 "Entreu un àlies i la informació addient sobre el xat que vulgueu afegir a la "
 "llista d'amics.\n"
 
-#: src/gtkblist.c:4689
+#: src/gtkblist.c:4523
 msgid "Add Group"
 msgstr "Afegeix un grup"
 
-#: src/gtkblist.c:4690
+#: src/gtkblist.c:4524
 msgid "Please enter the name of the group to be added."
 msgstr "Entreu el nom del grup que vulgueu afegir."
 
-#: src/gtkblist.c:5240 src/gtkblist.c:5336
+#: src/gtkblist.c:5093 src/gtkblist.c:5190
 msgid "No actions available"
 msgstr "No hi ha accions disponibles"
 
-#: src/gtkconn.c:166 src/gtkconn.c:399
+#: src/gtkconn.c:79 src/gtkconn.c:250 src/gtkconn.c:261
+msgid "Done."
+msgstr "Fet."
+
+#: src/gtkconn.c:158
+msgid "Signon: "
+msgstr "Connexió: "
+
+#: src/gtkconn.c:204
+msgid "Signon"
+msgstr "Connexió"
+
+#: src/gtkconn.c:216
+msgid "Cancel All"
+msgstr "Cancel·la-ho tot"
+
+#: src/gtkconn.c:361 src/gtkconn.c:594
 msgid "_Reconnect"
-msgstr "Connecta de _nou"
-
-#: src/gtkconn.c:363
+msgstr "To_rna a connectar"
+
+#: src/gtkconn.c:558
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">%s has been disconnected.</span>\n"
@@ -2522,36 +2502,32 @@
 "%s\n"
 "%s"
 
-#: src/gtkconn.c:365
+#: src/gtkconn.c:560
 msgid "Reason Unknown."
 msgstr "No se'n coneix el motiu."
 
-#: src/gtkconn.c:373
-msgid "Disconnected"
-msgstr "Desconnectat"
-
-#: src/gtkconn.c:404
+#: src/gtkconn.c:599
 msgid "Reconnect _All"
 msgstr "Connect_a'ls tots de nou"
 
-#: src/gtkconn.c:434
+#: src/gtkconn.c:629
 msgid "Time"
 msgstr "Temps"
 
-#: src/gtkconv.c:310
+#: src/gtkconv.c:326
 #, c-format
 msgid "me is using Gaim v%s."
 msgstr "me fa servir el Gaim v%s."
 
-#: src/gtkconv.c:319
+#: src/gtkconv.c:335
 msgid "Supported debug options are:  version"
 msgstr "Les opcions de depuració disponibles són:  version"
 
-#: src/gtkconv.c:343
+#: src/gtkconv.c:359
 msgid "No such command (in this context)."
 msgstr "L'ordre no existeix (en aquest context)."
 
-#: src/gtkconv.c:346
+#: src/gtkconv.c:362
 msgid ""
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
 "The following commands are available in this context:\n"
@@ -2559,47 +2535,47 @@
 "Feu servir \"/help &lt;ordre&gt;\" per obtenir ajuda sobre una ordre.\n"
 "Les següents ordres estan disponibles en aquest context:\n"
 
-#: src/gtkconv.c:418
+#: src/gtkconv.c:434
 msgid "No such command."
 msgstr "No existeix l'ordre."
 
-#: src/gtkconv.c:425
+#: src/gtkconv.c:441
 msgid "Syntax Error:  You typed the wrong number of arguments to that command."
 msgstr ""
 "Error de sintaxi: Heu escrit un nombre d'arguments equivocat per a aquesta "
 "ordre."
 
-#: src/gtkconv.c:430
+#: src/gtkconv.c:446
 msgid "Your command failed for an unknown reason."
 msgstr "L'ordre ha fallat per motius desconeguts."
 
-#: src/gtkconv.c:437
+#: src/gtkconv.c:453
 msgid "That command only works in Chats, not IMs."
 msgstr "Aquesta ordre només funciona en xats, i no en MI."
 
-#: src/gtkconv.c:440
+#: src/gtkconv.c:456
 msgid "That command only works in IMs, not Chats."
 msgstr "Aquesta ordre només funciona en MI, i no en xats."
 
-#: src/gtkconv.c:444
+#: src/gtkconv.c:460
 msgid "That command doesn't work on this protocol."
 msgstr "Aquesta ordre no funciona per a aquest protocol."
 
-#: src/gtkconv.c:672 src/gtkconv.c:698
+#: src/gtkconv.c:703 src/gtkconv.c:729
 msgid "That buddy is not on the same protocol as this chat"
 msgstr "L'amic no està en el mateix protocol que aquest xat"
 
-#: src/gtkconv.c:692
+#: src/gtkconv.c:723
 msgid ""
 "You are not currently signed on with an account that can invite that buddy."
 msgstr "No esteu connectat amb cap protocol que permeti convidar aquest amic."
 
-#: src/gtkconv.c:746
+#: src/gtkconv.c:777
 msgid "Invite Buddy Into Chat Room"
 msgstr "Convida l'amic a una sala de xat"
 
 #. Put our happy label in it.
-#: src/gtkconv.c:776
+#: src/gtkconv.c:807
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
@@ -2607,295 +2583,347 @@
 "Entreu el nom de l'usuari que vulgueu convidar, així com un missatge "
 "d'invitació opcional."
 
-#: src/gtkconv.c:797
+#: src/gtkconv.c:828
 msgid "_Buddy:"
 msgstr "_Amic:"
 
-#: src/gtkconv.c:817 src/gtksavedstatuses.c:774
+#: src/gtkconv.c:848
 msgid "_Message:"
 msgstr "_Missatge:"
 
-#: src/gtkconv.c:873 src/gtkconv.c:2528 src/gtkdebug.c:177
+#: src/gtkconv.c:904 src/gtkconv.c:2625 src/gtkdebug.c:182
 msgid "Unable to open file."
 msgstr "No s'ha pogut obrir el fitxer."
 
-#: src/gtkconv.c:878
+#: src/gtkconv.c:909
 #, c-format
 msgid "<h1>Conversation with %s</h1>\n"
 msgstr "<h1>Conversa amb %s</h1>\n"
 
-#: src/gtkconv.c:892
+#: src/gtkconv.c:923
 msgid "Save Conversation"
 msgstr "Desa la conversa"
 
-#: src/gtkconv.c:977 src/gtkdebug.c:126
+#: src/gtkconv.c:1008 src/gtkdebug.c:131
 msgid "Find"
 msgstr "Cerca"
 
-#: src/gtkconv.c:1003 src/gtkdebug.c:154
+#: src/gtkconv.c:1034 src/gtkdebug.c:159
 msgid "_Search for:"
 msgstr "_Cerca:"
 
-#: src/gtkconv.c:1415
+#: src/gtkconv.c:1450
 msgid "IM"
 msgstr "MI"
 
-#: src/gtkconv.c:1421 src/protocols/oscar/oscar.c:612
+#. Send File button
+#: src/gtkconv.c:1459 src/gtkconv.c:3861 src/protocols/oscar/oscar.c:600
 msgid "Send File"
 msgstr "Envia un fitxer"
 
-#: src/gtkconv.c:1428
+#: src/gtkconv.c:1468
 msgid "Un-Ignore"
 msgstr "No ignoris"
 
-#: src/gtkconv.c:1431 src/gtkprefs.c:762
+#: src/gtkconv.c:1470 src/gtkprefs.c:831
 msgid "Ignore"
 msgstr "Ignora"
 
-#: src/gtkconv.c:1436
+#. Info button
+#: src/gtkconv.c:1479 src/gtkconv.c:3882
 msgid "Info"
 msgstr "Info"
 
-#: src/gtkconv.c:1442
-msgid "Get Away Message"
+#: src/gtkconv.c:1488
+msgid "Get Away Msg"
 msgstr "Obtingues el missatge d'absència"
 
-#: src/gtkconv.c:1451 src/gtkrequest.c:265
-msgid "Remove"
-msgstr "Suprimeix"
-
-#: src/gtkconv.c:2536
+#: src/gtkconv.c:2633
 msgid "Unable to save icon file to disk."
 msgstr "No s'ha pogut desar el fitxer de la icona al disc."
 
-#: src/gtkconv.c:2557
+#: src/gtkconv.c:2654
 msgid "Save Icon"
 msgstr "Desa la icona"
 
-#: src/gtkconv.c:2587
+#: src/gtkconv.c:2684
 msgid "Animate"
 msgstr "Anima"
 
-#: src/gtkconv.c:2592
+#: src/gtkconv.c:2689
 msgid "Hide Icon"
 msgstr "Oculta la icona"
 
-#: src/gtkconv.c:2598
+#: src/gtkconv.c:2695
 msgid "Save Icon As..."
 msgstr "Anomena i desa la icona..."
 
-#: src/gtkconv.c:2956
+#: src/gtkconv.c:3067
 msgid "User is typing..."
 msgstr "L'usuari està escrivint..."
 
-#: src/gtkconv.c:2961
+#: src/gtkconv.c:3075
 msgid "User has typed something and paused"
 msgstr "L'usuari ha escrit alguna cosa i s'ha aturat"
 
 #. Build the Send As menu
-#: src/gtkconv.c:3062
+#: src/gtkconv.c:3178
 msgid "_Send As"
 msgstr "_Envia com a"
 
 #. Conversation menu
-#: src/gtkconv.c:3516
+#: src/gtkconv.c:3631
 msgid "/_Conversation"
 msgstr "/_Conversa"
 
-#: src/gtkconv.c:3518
+#: src/gtkconv.c:3633
 msgid "/Conversation/New Instant _Message..."
 msgstr "/Conversa/_Missatge instantani nou..."
 
-#: src/gtkconv.c:3523
+#: src/gtkconv.c:3638
 msgid "/Conversation/_Find..."
 msgstr "/Conversa/_Cerca..."
 
-#: src/gtkconv.c:3525
+#: src/gtkconv.c:3640
 msgid "/Conversation/View _Log"
 msgstr "/Conversa/Visualitza el _registre"
 
-#: src/gtkconv.c:3526
+#: src/gtkconv.c:3641
 msgid "/Conversation/_Save As..."
 msgstr "/Conversa/Anomena i _desa..."
 
-#: src/gtkconv.c:3528
+#: src/gtkconv.c:3643
 msgid "/Conversation/Clear"
 msgstr "/Conversa/_Neteja"
 
-#: src/gtkconv.c:3532
+#: src/gtkconv.c:3647
 msgid "/Conversation/Se_nd File..."
 msgstr "/Conversa/Envia un _fitxer..."
 
-#: src/gtkconv.c:3533
+#: src/gtkconv.c:3648
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Conversa/Afegeix un a_vís per a l'amic..."
 
-#: src/gtkconv.c:3535
+#: src/gtkconv.c:3650
 msgid "/Conversation/_Get Info"
 msgstr "/Conversa/_Obtingues informació"
 
-#: src/gtkconv.c:3537
+#: src/gtkconv.c:3652
 msgid "/Conversation/_Warn..."
 msgstr "/Conversa/_Avisa..."
 
-#: src/gtkconv.c:3539
+#: src/gtkconv.c:3654
 msgid "/Conversation/In_vite..."
 msgstr "/Conversa/Con_vida..."
 
-#: src/gtkconv.c:3544
+#: src/gtkconv.c:3659
 msgid "/Conversation/A_lias..."
 msgstr "/Conversa/À_lies..."
 
-#: src/gtkconv.c:3546
+#: src/gtkconv.c:3661
 msgid "/Conversation/_Block..."
 msgstr "/Conversa/_Bloca..."
 
-#: src/gtkconv.c:3548
+#: src/gtkconv.c:3663
 msgid "/Conversation/_Add..."
 msgstr "/Conversa/_Afegeix..."
 
-#: src/gtkconv.c:3550
+#: src/gtkconv.c:3665
 msgid "/Conversation/_Remove..."
 msgstr "/Conversa/Sup_rimeix..."
 
-#: src/gtkconv.c:3555
+#: src/gtkconv.c:3670
 msgid "/Conversation/Insert Lin_k..."
 msgstr "/Conversa/Inserta un _enllaç..."
 
-#: src/gtkconv.c:3557
+#: src/gtkconv.c:3672
 msgid "/Conversation/Insert Imag_e..."
 msgstr "/Conversa/Inserta una _imatge..."
 
-#: src/gtkconv.c:3562
+#: src/gtkconv.c:3677
 msgid "/Conversation/_Close"
 msgstr "/Conversa/_Tanca"
 
 #. Options
-#: src/gtkconv.c:3566
+#: src/gtkconv.c:3681
 msgid "/_Options"
 msgstr "/_Opcions"
 
-#: src/gtkconv.c:3567
+#: src/gtkconv.c:3682
 msgid "/Options/Enable _Logging"
 msgstr "/Opcions/Habilita el _registre"
 
-#: src/gtkconv.c:3568
+#: src/gtkconv.c:3683
 msgid "/Options/Enable _Sounds"
 msgstr "/Opcions/Habilita els _sons"
 
-#: src/gtkconv.c:3569
-msgid "/Options/Show Formatting _Toolbars"
-msgstr "/Opcions/Mos_tra les barres d'eines per al format"
-
-#: src/gtkconv.c:3570
+#: src/gtkconv.c:3684
+msgid "/Options/Show Formatting _Toolbar"
+msgstr "/Opcions/Mos_tra la barra d'eines per al format"
+
+#: src/gtkconv.c:3685
 msgid "/Options/Show T_imestamps"
 msgstr "/Opcions/Mostra marques de _temps"
 
-#: src/gtkconv.c:3571
-msgid "/Options/Show Buddy _Icon"
-msgstr "/Opcions/Mostra la icona de l'amic"
-
-#: src/gtkconv.c:3615
+#: src/gtkconv.c:3727
 msgid "/Conversation/View Log"
 msgstr "/Conversa/Visualitza el registre"
 
-#: src/gtkconv.c:3620
+#: src/gtkconv.c:3732
 msgid "/Conversation/Send File..."
 msgstr "/Conversa/Envia un fitxer..."
 
-#: src/gtkconv.c:3624
+#: src/gtkconv.c:3736
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Conversa/Afegeix avís per a l'amic..."
 
-#: src/gtkconv.c:3630
+#: src/gtkconv.c:3742
 msgid "/Conversation/Get Info"
 msgstr "/Conversa/Obtingues informació"
 
-#: src/gtkconv.c:3634
+#: src/gtkconv.c:3746
 msgid "/Conversation/Warn..."
 msgstr "/Conversa/Avisa..."
 
-#: src/gtkconv.c:3638
+#: src/gtkconv.c:3750
 msgid "/Conversation/Invite..."
 msgstr "/Conversa/Convida..."
 
-#: src/gtkconv.c:3644
+#: src/gtkconv.c:3756
 msgid "/Conversation/Alias..."
 msgstr "/Conversa/Àlies..."
 
-#: src/gtkconv.c:3648
+#: src/gtkconv.c:3760
 msgid "/Conversation/Block..."
 msgstr "/Conversa/Bloca"
 
-#: src/gtkconv.c:3652
+#: src/gtkconv.c:3764
 msgid "/Conversation/Add..."
 msgstr "/Conversa/Afegeix..."
 
-#: src/gtkconv.c:3656
+#: src/gtkconv.c:3768
 msgid "/Conversation/Remove..."
 msgstr "/Conversa/Suprimeix..."
 
-#: src/gtkconv.c:3662
+#: src/gtkconv.c:3774
 msgid "/Conversation/Insert Link..."
 msgstr "/Conversa/Insereix un enllaç..."
 
-#: src/gtkconv.c:3666
+#: src/gtkconv.c:3778
 msgid "/Conversation/Insert Image..."
 msgstr "/Conversa/Insereix una imatge..."
 
-#: src/gtkconv.c:3672
+#: src/gtkconv.c:3784
 msgid "/Options/Enable Logging"
 msgstr "/Opcions/Habilita el registre"
 
-#: src/gtkconv.c:3675
+#: src/gtkconv.c:3787
 msgid "/Options/Enable Sounds"
 msgstr "/Opcions/Habilita els sons"
 
-#: src/gtkconv.c:3678
-msgid "/Options/Show Formatting Toolbars"
-msgstr "/Opcions/Mostra les barres d'eines per al format"
-
-#: src/gtkconv.c:3681
+#: src/gtkconv.c:3790
+msgid "/Options/Show Formatting Toolbar"
+msgstr "/Opcions/Mostra la barra d'eines per al format"
+
+#: src/gtkconv.c:3793
 msgid "/Options/Show Timestamps"
 msgstr "/Opcions/Mostra les marques de temps"
 
-#: src/gtkconv.c:3684
-msgid "/Options/Show Buddy Icon"
-msgstr "/Options/Mostra la icona de l'amic"
-
-#: src/gtkconv.c:3799
+#. The buttons, from left to right
+#. Warn button
+#: src/gtkconv.c:3847
+msgid "Warn"
+msgstr "Avisa"
+
+#: src/gtkconv.c:3848
+msgid "Warn the user"
+msgstr "Avisa l'usuari"
+
+#. Block button
+#: src/gtkconv.c:3854 src/gtkprivacy.c:623 src/gtkprivacy.c:634
+msgid "Block"
+msgstr "Bloca"
+
+#: src/gtkconv.c:3855
+msgid "Block the user"
+msgstr "Bloca l'usuari"
+
+#: src/gtkconv.c:3862
+msgid "Send a file to the user"
+msgstr "Envia un fitxer a l'usuari"
+
+#: src/gtkconv.c:3869
+msgid "Add the user to your buddy list"
+msgstr "Afegeix l'usuari a la llista d'amics"
+
+#: src/gtkconv.c:3876
+msgid "Remove the user from your buddy list"
+msgstr "Suprimeix l'usuari de la llista d'amics"
+
+#: src/gtkconv.c:3883 src/gtkconv.c:4218
+msgid "Get the user's information"
+msgstr "Obtingues informació de l'usuari"
+
+#. Send button
+#: src/gtkconv.c:3889 src/gtkconv.c:3953
+msgid "Send"
+msgstr "Envia"
+
+#: src/gtkconv.c:3890 src/gtkconv.c:3954
+msgid "Send message"
+msgstr "Envia el missatge"
+
+#. The buttons, from left to right
+#. Invite
+#: src/gtkconv.c:3932
+msgid "Invite"
+msgstr "Convida"
+
+#: src/gtkconv.c:3933
+msgid "Invite a user"
+msgstr "Convida un usuari"
+
+#: src/gtkconv.c:3940
+msgid "Add the chat to your buddy list"
+msgstr "Afegeix el xat a la llista d'amics"
+
+#: src/gtkconv.c:3947
+msgid "Remove the chat from your buddy list"
+msgstr "Suprimeix l'usuari de la llista d'amics"
+
+#: src/gtkconv.c:4071
 msgid "Topic:"
 msgstr "Tema:"
 
 #. Setup the label telling how many people are in the room.
-#: src/gtkconv.c:3847
+#: src/gtkconv.c:4134
 msgid "0 people in room"
 msgstr "No hi ha ningú a la sala"
 
-#: src/gtkconv.c:3909
+#: src/gtkconv.c:4195
 msgid "IM the user"
 msgstr "Envieu un MI a l'usuari"
 
-#: src/gtkconv.c:3922
+#: src/gtkconv.c:4207
 msgid "Ignore the user"
 msgstr "Ignora l'usuari"
 
-#: src/gtkconv.c:3934
-msgid "Get the user's information"
-msgstr "Obtingues informació de l'usuari"
-
-#: src/gtkconv.c:4435
+#: src/gtkconv.c:4802
 msgid "Close conversation"
 msgstr "Tanca la conversa"
 
-#: src/gtkconv.c:4937 src/gtkconv.c:4966 src/gtkconv.c:5062 src/gtkconv.c:5120
+#: src/gtkconv.c:5335 src/gtkconv.c:5364 src/gtkconv.c:5460 src/gtkconv.c:5518
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "%d persona a la sala"
 msgstr[1] "%d persones a la sala"
 
-#: src/gtkconv.c:6025
+#: src/gtkconv.c:6095 src/gtkconv.c:6098
+msgid "<main>/Conversation/Close"
+msgstr "<main>/Conversa/Tanca"
+
+#: src/gtkconv.c:6470
 msgid ""
 "say &lt;message&gt;:  Send a message normally as if you weren't using a "
 "command."
@@ -2903,11 +2931,11 @@
 "say &lt;missatge&gt;: Envia un missatge normalment com si no fessiu servir "
 "cap ordre."
 
-#: src/gtkconv.c:6028
+#: src/gtkconv.c:6473
 msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
 msgstr "me &lt;acció&gt;: Envia una acció a l'estil IRC a un amic o xat."
 
-#: src/gtkconv.c:6031
+#: src/gtkconv.c:6476
 msgid ""
 "debug &lt;option&gt;:  Send various debug information to the current "
 "conversation."
@@ -2915,225 +2943,246 @@
 "debug &lt;opció&gt;: Envia informació de depuració diversa a la conversa "
 "actual."
 
-#: src/gtkconv.c:6035
+#: src/gtkconv.c:6480
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr "help &lt;ordre&gt;: Ajuda específica quant a l'ordre."
 
-#: src/gtkdebug.c:192
+#: src/gtkdebug.c:197
 msgid "Save Debug Log"
 msgstr "Desa el registre de depuració"
 
-#: src/gtkdebug.c:245
+#: src/gtkdebug.c:250
 msgid "Debug Window"
 msgstr "Finestra de depuració"
 
-#: src/gtkdebug.c:283
+#: src/gtkdebug.c:288
 msgid "Pause"
 msgstr "Pausa"
 
-#: src/gtkdebug.c:289
+#: src/gtkdebug.c:294
 msgid "Timestamps"
 msgstr "Marques de temps"
 
+#: src/gtkdialogs.c:63
+msgid "lead developer"
+msgstr "desenvolupador principal"
+
+#: src/gtkdialogs.c:64 src/gtkdialogs.c:67 src/gtkdialogs.c:68
+#: src/gtkdialogs.c:69 src/gtkdialogs.c:70 src/gtkdialogs.c:71
+#: src/gtkdialogs.c:73
+msgid "developer"
+msgstr "desenvolupador"
+
+#: src/gtkdialogs.c:65
+msgid "developer & webmaster"
+msgstr "desenvolupador i mantenidor de la pàgina web"
+
 #: src/gtkdialogs.c:66
-msgid "lead developer"
-msgstr "desenvolupador principal"
-
-#: src/gtkdialogs.c:67 src/gtkdialogs.c:70 src/gtkdialogs.c:71
-#: src/gtkdialogs.c:72 src/gtkdialogs.c:73 src/gtkdialogs.c:74
-#: src/gtkdialogs.c:76
-msgid "developer"
-msgstr "desenvolupador"
-
-#: src/gtkdialogs.c:68
-msgid "developer & webmaster"
-msgstr "desenvolupador i mantenidor de la pàgina web"
-
-#: src/gtkdialogs.c:69
 msgid "win32 port"
 msgstr "adaptació a win32"
 
-#: src/gtkdialogs.c:75
+#: src/gtkdialogs.c:72
 msgid "support"
 msgstr "suport"
 
+#: src/gtkdialogs.c:89
+msgid "maintainer"
+msgstr "mantenidor"
+
+#: src/gtkdialogs.c:90
+msgid "former libfaim maintainer"
+msgstr "antic mantenidor de libfaim"
+
+#: src/gtkdialogs.c:91
+msgid "former lead developer"
+msgstr "antic desenvolupador principal"
+
 #: src/gtkdialogs.c:92
-msgid "maintainer"
-msgstr "mantenidor"
+msgid "former maintainer"
+msgstr "antic mantenidor"
 
 #: src/gtkdialogs.c:93
-msgid "former libfaim maintainer"
-msgstr "antic mantenidor de libfaim"
-
-#: src/gtkdialogs.c:94
-msgid "former lead developer"
-msgstr "antic desenvolupador principal"
-
-#: src/gtkdialogs.c:95
-msgid "former maintainer"
-msgstr "antic mantenidor"
-
-#: src/gtkdialogs.c:96
 msgid "former Jabber developer"
 msgstr "antic desenvolupador de Jabber"
 
-#: src/gtkdialogs.c:97
+#: src/gtkdialogs.c:94
 msgid "original author"
 msgstr "autor original"
 
-#: src/gtkdialogs.c:98
+#: src/gtkdialogs.c:95
 msgid "hacker and designated driver [lazy bum]"
 msgstr "hacker i conductor designat"
 
-#: src/gtkdialogs.c:103 src/gtkdialogs.c:141
+#: src/gtkdialogs.c:100 src/gtkdialogs.c:142
 msgid "Bulgarian"
 msgstr "Búlgar"
 
-#: src/gtkdialogs.c:104 src/gtkdialogs.c:142 src/gtkdialogs.c:143
+#: src/gtkdialogs.c:101 src/gtkdialogs.c:143 src/gtkdialogs.c:144
 msgid "Catalan"
 msgstr "Català"
 
-#: src/gtkdialogs.c:105 src/gtkdialogs.c:144
+#: src/gtkdialogs.c:102 src/gtkdialogs.c:145
 msgid "Czech"
 msgstr "Txec"
 
-#: src/gtkdialogs.c:106
+#: src/gtkdialogs.c:103
 msgid "Danish"
 msgstr "Danès"
 
+#: src/gtkdialogs.c:104 src/gtkdialogs.c:146
+msgid "German"
+msgstr "Alemany"
+
+#: src/gtkdialogs.c:105
+msgid "Australian English"
+msgstr "Anglès d'Austràlia"
+
+#: src/gtkdialogs.c:106
+msgid "Canadian English"
+msgstr "Anglès canadenc"
+
 #: src/gtkdialogs.c:107
-msgid "Australian English"
-msgstr "Anglès d'Austràlia"
-
-#: src/gtkdialogs.c:108
 msgid "British English"
 msgstr "Anglès britànic"
 
-#: src/gtkdialogs.c:109
-msgid "Canadian English"
-msgstr "Anglès canadenc"
-
-#: src/gtkdialogs.c:110 src/gtkdialogs.c:145
-msgid "German"
-msgstr "Alemany"
-
-#: src/gtkdialogs.c:111 src/gtkdialogs.c:146
+#: src/gtkdialogs.c:108 src/gtkdialogs.c:147
 msgid "Spanish"
 msgstr "Espanyol"
 
-#: src/gtkdialogs.c:112 src/gtkdialogs.c:147
+#: src/gtkdialogs.c:109 src/gtkdialogs.c:148
 msgid "Finnish"
 msgstr "Finès"
 
-#: src/gtkdialogs.c:113 src/gtkdialogs.c:148
+#: src/gtkdialogs.c:110 src/gtkdialogs.c:149
 msgid "French"
 msgstr "Francès"
 
-#: src/gtkdialogs.c:114
+#: src/gtkdialogs.c:111
 msgid "Hebrew"
 msgstr "Hebreu"
 
-#: src/gtkdialogs.c:115
+#: src/gtkdialogs.c:112
 msgid "Hindi"
 msgstr "Hindi"
 
-#: src/gtkdialogs.c:116
+#: src/gtkdialogs.c:113
 msgid "Hungarian"
 msgstr "Hungarès"
 
-#: src/gtkdialogs.c:117 src/gtkdialogs.c:149
+#: src/gtkdialogs.c:114 src/gtkdialogs.c:150
 msgid "Italian"
 msgstr "Italià"
 
-#: src/gtkdialogs.c:118 src/gtkdialogs.c:150
+#: src/gtkdialogs.c:115 src/gtkdialogs.c:151
 msgid "Japanese"
 msgstr "Japonès"
 
-#: src/gtkdialogs.c:119
+#: src/gtkdialogs.c:116 src/gtkdialogs.c:152
+msgid "Korean"
+msgstr "Coreà"
+
+#: src/gtkdialogs.c:117
 msgid "Lithuanian"
 msgstr "Lituà"
 
-#: src/gtkdialogs.c:120 src/gtkdialogs.c:151
-msgid "Korean"
-msgstr "Coreà"
+#: src/gtkdialogs.c:118
+msgid "Macedonian"
+msgstr "Macedoni"
+
+#: src/gtkdialogs.c:119
+msgid "Burmese"
+msgstr "Birmà"
+
+#: src/gtkdialogs.c:120
+msgid "Dutch; Flemish"
+msgstr "Holandès; Flamenc"
 
 #: src/gtkdialogs.c:121
-msgid "Dutch; Flemish"
-msgstr "Holandès; Flamenc"
-
-#: src/gtkdialogs.c:122
-msgid "Macedonian"
-msgstr "Macedoni"
+msgid "Norwegian"
+msgstr "Noruec"
+
+#: src/gtkdialogs.c:122 src/gtkdialogs.c:153
+msgid "Polish"
+msgstr "Polonès"
 
 #: src/gtkdialogs.c:123
-msgid "Norwegian"
-msgstr "Noruec"
-
-#: src/gtkdialogs.c:124 src/gtkdialogs.c:152
-msgid "Polish"
-msgstr "Polonès"
-
-#: src/gtkdialogs.c:125
 msgid "Portuguese"
 msgstr "Portuguès"
 
-#: src/gtkdialogs.c:126
+#: src/gtkdialogs.c:124
 msgid "Portuguese-Brazil"
 msgstr "Portuguès de Brasil"
 
+#: src/gtkdialogs.c:125
+msgid "Romanian"
+msgstr "Romanès"
+
+#: src/gtkdialogs.c:126 src/gtkdialogs.c:154 src/gtkdialogs.c:155
+msgid "Russian"
+msgstr "Rus"
+
 #: src/gtkdialogs.c:127
-msgid "Romanian"
-msgstr "Romanès"
-
-#: src/gtkdialogs.c:128 src/gtkdialogs.c:153 src/gtkdialogs.c:154
-msgid "Russian"
-msgstr "Rus"
+msgid "Slovenian"
+msgstr "Eslovè"
+
+#: src/gtkdialogs.c:128
+msgid "Albanian"
+msgstr "Albanès"
 
 #: src/gtkdialogs.c:129
 msgid "Serbian"
 msgstr "Serbi"
 
-#: src/gtkdialogs.c:130
-msgid "Slovenian"
-msgstr "Eslovè"
-
-#: src/gtkdialogs.c:131 src/gtkdialogs.c:156
+#: src/gtkdialogs.c:130 src/gtkdialogs.c:157 src/gtkdialogs.c:158
 msgid "Swedish"
 msgstr "Suec"
 
+#: src/gtkdialogs.c:131
+msgid "Turkish"
+msgstr "Turc"
+
 #: src/gtkdialogs.c:132
+msgid "Ukrainian"
+msgstr "Ucraïnès"
+
+#: src/gtkdialogs.c:133
 msgid "Vietnamese"
 msgstr "Vietnamita"
 
-#: src/gtkdialogs.c:132
+#: src/gtkdialogs.c:133
 msgid "T.M.Thanh and the Gnome-Vi Team"
 msgstr "Equip del Vi de Gnome i T.M.Thanh"
 
-#: src/gtkdialogs.c:133
-msgid "Simplified Chinese"
-msgstr "Xinès simplificat"
-
 #: src/gtkdialogs.c:134
+msgid "Simplified Chinese"
+msgstr "Xinès simplificat"
+
+#: src/gtkdialogs.c:135
 msgid "Traditional Chinese"
 msgstr "Xinès tradicional"
 
-#: src/gtkdialogs.c:140
+#: src/gtkdialogs.c:141
 msgid "Amharic"
 msgstr "Amhàric"
 
-#: src/gtkdialogs.c:155
+#: src/gtkdialogs.c:156
 msgid "Slovak"
 msgstr "Eslovac"
 
-#: src/gtkdialogs.c:157
+#: src/gtkdialogs.c:159
 msgid "Chinese"
 msgstr "Xinès"
 
-#: src/gtkdialogs.c:198
+#: src/gtkdialogs.c:201
 msgid "About Gaim"
 msgstr "Quant al Gaim"
 
-#: src/gtkdialogs.c:222
+#: src/gtkdialogs.c:216
+#, c-format
+msgid "<span weight=\"bold\" size=\"larger\">Gaim v%s</span>"
+msgstr "<span weight=\"bold\" size=\"larger\">Gaim v%s</span>"
+
+#: src/gtkdialogs.c:238
 msgid ""
 "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, "
 "Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu all "
@@ -3143,77 +3192,77 @@
 "Yahoo!, Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, i Gadu-"
 "Gadu, tots alhora. Està escrit usant Gtk+ i roman sota llicència GPL.<BR><BR>"
 
-#: src/gtkdialogs.c:231
+#: src/gtkdialogs.c:248
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #wingaim on irc.freenode.net<BR><BR>"
 msgstr "<FONT SIZE=\"4\">IRC:</FONT> #wingaim a irc.freenode.net<BR><BR>"
 
-#: src/gtkdialogs.c:234
+#: src/gtkdialogs.c:251
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #gaim on irc.freenode.net<BR><BR>"
 msgstr "<FONT SIZE=\"4\">IRC:</FONT> #gaim a irc.freenode.net<BR><BR>"
 
-#: src/gtkdialogs.c:240
+#: src/gtkdialogs.c:257
 msgid "Active Developers"
 msgstr "Desenvolupadors actius"
 
-#: src/gtkdialogs.c:255
+#: src/gtkdialogs.c:272
 msgid "Crazy Patch Writers"
 msgstr "Esbojarrats escriptors de pedaços"
 
-#: src/gtkdialogs.c:270
+#: src/gtkdialogs.c:287
 msgid "Retired Developers"
 msgstr "Desenvolupadors retirats"
 
-#: src/gtkdialogs.c:285
+#: src/gtkdialogs.c:302
 msgid "Current Translators"
 msgstr "Traductors actuals"
 
-#: src/gtkdialogs.c:305
+#: src/gtkdialogs.c:322
 msgid "Past Translators"
 msgstr "Antics traductors"
 
-#: src/gtkdialogs.c:454 src/gtkdialogs.c:597 src/gtkdialogs.c:652
+#: src/gtkdialogs.c:477 src/gtkdialogs.c:619 src/gtkdialogs.c:672
 msgid "_Screen name"
 msgstr "_Nom d'usuari:"
 
-#: src/gtkdialogs.c:460 src/gtkdialogs.c:603 src/gtkdialogs.c:658
+#: src/gtkdialogs.c:483 src/gtkdialogs.c:625 src/gtkdialogs.c:678
 msgid "_Account"
 msgstr "_Compte"
 
-#: src/gtkdialogs.c:467
+#: src/gtkdialogs.c:490
 msgid "New Instant Message"
 msgstr "Missatge instantani nou"
 
-#: src/gtkdialogs.c:469
+#: src/gtkdialogs.c:492
 msgid "Please enter the screen name of the person you would like to IM."
 msgstr ""
 "Entreu el nom d'usuari de la persona a qui vulgueu enviar un missatge "
 "instantani."
 
-#: src/gtkdialogs.c:610
+#: src/gtkdialogs.c:632
 msgid "Get User Info"
 msgstr "Obtingues dades de l'usuari"
 
-#: src/gtkdialogs.c:612
+#: src/gtkdialogs.c:634
 msgid ""
 "Please enter the screen name of the person whose info you would like to view."
 msgstr ""
 "Entreu el nom d'usuari de la persona de la qui vulgueu veure la informació."
 
-#: src/gtkdialogs.c:666
+#: src/gtkdialogs.c:686
 msgid "Get User Log"
 msgstr "Obtingues el registre de l'usuari"
 
-#: src/gtkdialogs.c:668
+#: src/gtkdialogs.c:688
 msgid ""
 "Please enter the screen name of the person whose log you would like to view."
 msgstr ""
 "Entreu el nom d'usuari de la persona de la qui vulgueu veure el registre."
 
-#: src/gtkdialogs.c:708
+#: src/gtkdialogs.c:728
 msgid "Warn User"
 msgstr "Avisa l'usuari"
 
-#: src/gtkdialogs.c:729
+#: src/gtkdialogs.c:749
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Warn %s?</span>\n"
@@ -3226,60 +3275,54 @@
 "Això incrementarà el nivell d'avís de %s i estarà subjecte a una limitació "
 "de velocitat més estricta.\n"
 
-#: src/gtkdialogs.c:738
+#: src/gtkdialogs.c:758
 msgid "Warn _anonymously?"
 msgstr "Voleu _avisar anònimament?"
 
-#: src/gtkdialogs.c:745
+#: src/gtkdialogs.c:765
 msgid "<b>Anonymous warnings are less severe.</b>"
 msgstr "<b>Els avisos anònims són menys estrictes.</b>"
 
-#: src/gtkdialogs.c:766
+#: src/gtkdialogs.c:786
 msgid "Alias Contact"
 msgstr "Posa un àlies al contacte"
 
-#: src/gtkdialogs.c:767
+#: src/gtkdialogs.c:787
 msgid "Enter an alias for this contact."
 msgstr "Introduïu un àlies per a aquest contacte."
 
-#: src/gtkdialogs.c:769 src/gtkdialogs.c:791 src/gtkdialogs.c:811
-#: src/gtkrequest.c:267 src/protocols/silc/chat.c:585
+#: src/gtkdialogs.c:789 src/gtkdialogs.c:811 src/gtkdialogs.c:831
+#: src/gtkrequest.c:250 src/protocols/silc/chat.c:584
 msgid "Alias"
 msgstr "Àlies"
 
-#: src/gtkdialogs.c:787
+#: src/gtkdialogs.c:807
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "Introduïu un àlies per a %s."
 
-#: src/gtkdialogs.c:789
+#: src/gtkdialogs.c:809
 msgid "Alias Buddy"
 msgstr "Posa un àlies a un amic"
 
-#: src/gtkdialogs.c:808
+#: src/gtkdialogs.c:828
 msgid "Alias Chat"
 msgstr "Posa un àlies a un xat"
 
-#: src/gtkdialogs.c:809
+#: src/gtkdialogs.c:829
 msgid "Enter an alias for this chat."
 msgstr "Introduïu un àlies per a aquest xat."
 
-#: src/gtkdialogs.c:846
-#, c-format
-msgid ""
-"You are about to remove the contact containing %s and %d other buddy from "
-"your buddy list.  Do you want to continue?"
-msgid_plural ""
+#: src/gtkdialogs.c:863
+#, c-format
+msgid ""
 "You are about to remove the contact containing %s and %d other buddies from "
 "your buddy list.  Do you want to continue?"
-msgstr[0] ""
-"Ara se suprimirà el contacte que conté %s i %d altre amic de la llista "
+msgstr ""
+"Ara se suprimirà el contacte que conté %s i %d altres amics de la llista "
 "d'amics. Voleu continuar?"
-msgstr[1] ""
-"Ara se suprimirà el contacte que conté %s i els altres %d amics de la llista "
-"d'amics. Voleu continuar?"
-
-#: src/gtkdialogs.c:913
+
+#: src/gtkdialogs.c:924
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
@@ -3288,28 +3331,28 @@
 "Ara se suprimirà el grup %s i tots els seus membres de la llista d'amics. "
 "Voleu continuar?"
 
-#: src/gtkdialogs.c:916 src/gtkdialogs.c:917
+#: src/gtkdialogs.c:927 src/gtkdialogs.c:928
 msgid "Remove Group"
 msgstr "Suprimeix el grup"
 
-#: src/gtkdialogs.c:955
+#: src/gtkdialogs.c:966
 #, c-format
 msgid ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr "Esteu segur que voleu suprimir %s de la llista d'amics?"
 
-#: src/gtkdialogs.c:958 src/gtkdialogs.c:959
+#: src/gtkdialogs.c:969 src/gtkdialogs.c:971
 msgid "Remove Buddy"
 msgstr "Suprimeix l'amic"
 
-#: src/gtkdialogs.c:992
+#: src/gtkdialogs.c:1004
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
 "continue?"
 msgstr "Esteu segur que voleu suprimir el xat %s de la llista d'amics?"
 
-#: src/gtkdialogs.c:996 src/gtkdialogs.c:997
+#: src/gtkdialogs.c:1008 src/gtkdialogs.c:1009
 msgid "Remove Chat"
 msgstr "Suprimeix el Xat"
 
@@ -3318,15 +3361,15 @@
 msgid "%.2f KB/s"
 msgstr "%.2f KB/s"
 
-#: src/gtkft.c:161 src/gtkft.c:966
+#: src/gtkft.c:161 src/gtkft.c:978
 msgid "Finished"
 msgstr "S'ha finalitzat"
 
-#: src/gtkft.c:164 src/gtkft.c:917
+#: src/gtkft.c:164 src/gtkft.c:929
 msgid "Canceled"
 msgstr "S'ha cancel·lat"
 
-#: src/gtkft.c:167 src/gtkft.c:836
+#: src/gtkft.c:167 src/gtkft.c:848
 msgid "Waiting for transfer to begin"
 msgstr "S'està esperant a iniciar la transferència"
 
@@ -3370,90 +3413,82 @@
 msgid "Remaining"
 msgstr "Restant"
 
-#: src/gtkft.c:555
+#: src/gtkft.c:556
 msgid "Filename:"
 msgstr "Nom del fitxer:"
 
-#: src/gtkft.c:556
+#: src/gtkft.c:557
 msgid "Status:"
 msgstr "Estat:"
 
-#: src/gtkft.c:557
-msgid "Speed:"
-msgstr "Velocitat:"
-
 #: src/gtkft.c:558
+msgid "Speed:"
+msgstr "Velocitat:"
+
+#: src/gtkft.c:559
 msgid "Time Elapsed:"
 msgstr "Temps transcorregut:"
 
-#: src/gtkft.c:559
+#: src/gtkft.c:560
 msgid "Time Remaining:"
 msgstr "Temps restant:"
 
-#: src/gtkft.c:645
+#: src/gtkft.c:652
 msgid "_Keep the dialog open"
 msgstr "_Mantingues el quadre de diàleg obert"
 
-#: src/gtkft.c:655
+#: src/gtkft.c:662
 msgid "_Clear finished transfers"
 msgstr "_Neteja les transferències acabades"
 
 #. "Download Details" arrow
-#: src/gtkft.c:664
+#: src/gtkft.c:671
 msgid "Show transfer details"
 msgstr "Mostra els detalls de la transferència"
 
-#: src/gtkft.c:665
+#: src/gtkft.c:672
 msgid "Hide transfer details"
 msgstr "Oculta els detalls de la transferència"
 
 #. Pause button
-#: src/gtkft.c:702 src/gtkstock.c:105
+#: src/gtkft.c:714 src/stock.c:92
 msgid "_Pause"
 msgstr "_Pausa"
 
 #. Resume button
-#: src/gtkft.c:712
+#: src/gtkft.c:724
 msgid "_Resume"
 msgstr "_Continua"
 
-#: src/gtkft.c:919
+#: src/gtkft.c:931
 msgid "Failed"
 msgstr "Ha fallat"
 
-#: src/gtkgaim-disclosure.c:258
-msgid "Expander Size"
-msgstr "Mida de l'expansor"
-
-#: src/gtkgaim-disclosure.c:259
-msgid "Size of the expander arrow"
-msgstr "Mida de la fletxa d'expansió"
-
-#: src/gtkimhtml.c:536
+#: src/gtkimhtml.c:602
 msgid "Pa_ste As Text"
 msgstr "_Enganxa com a text"
 
-#: src/gtkimhtml.c:1021
+#: src/gtkimhtml.c:1049
 msgid "Hyperlink color"
 msgstr "Color dels enllaços"
 
-#: src/gtkimhtml.c:1022
+#: src/gtkimhtml.c:1050
 msgid "Color to draw hyperlinks."
 msgstr "El color amb el que pintar els enllaços."
 
-#: src/gtkimhtml.c:1236
+#: src/gtkimhtml.c:1256
 msgid "_Copy E-Mail Address"
 msgstr "_Copia l'adreça de correu"
 
-#: src/gtkimhtml.c:1248
+#: src/gtkimhtml.c:1268
 msgid "_Copy Link Location"
 msgstr "_Copia la ubicació de l'enllaç"
 
-#: src/gtkimhtml.c:1258
+#: src/gtkimhtml.c:1278
 msgid "_Open Link in Browser"
 msgstr "_Obre l'enllaç en el navegador"
 
-#: src/gtkimhtml.c:2848
+#: src/gtkimhtml.c:2854
 msgid ""
 "Unable to guess the image type based on the file extension supplied.  "
 "Defaulting to PNG."
@@ -3461,40 +3496,40 @@
 "No ha estat possible descobrir el tipus d'imatge a partir de l'extensió del "
 "fitxer. S'agafarà PNG com a predeterminat."
 
-#: src/gtkimhtml.c:2856
+#: src/gtkimhtml.c:2862
 #, c-format
 msgid "Error saving image: %s"
 msgstr "S'ha produït un error en desar la imatge: %s"
 
-#: src/gtkimhtml.c:2933 src/gtkimhtml.c:2945
+#: src/gtkimhtml.c:2939 src/gtkimhtml.c:2951
 msgid "Save Image"
 msgstr "Desa imatge"
 
-#: src/gtkimhtml.c:2973
+#: src/gtkimhtml.c:2979
 msgid "_Save Image..."
 msgstr "_Desa imatge..."
 
-#: src/gtkimhtmltoolbar.c:180
+#: src/gtkimhtmltoolbar.c:164
 msgid "Select Font"
 msgstr "Selecciona el tipus de lletra"
 
-#: src/gtkimhtmltoolbar.c:259
+#: src/gtkimhtmltoolbar.c:240
 msgid "Select Text Color"
 msgstr "Selecciona el color del text"
 
-#: src/gtkimhtmltoolbar.c:334
+#: src/gtkimhtmltoolbar.c:314
 msgid "Select Background Color"
 msgstr "Selecciona el color de fons"
 
-#: src/gtkimhtmltoolbar.c:418
+#: src/gtkimhtmltoolbar.c:398
 msgid "_URL"
 msgstr "_URL"
 
-#: src/gtkimhtmltoolbar.c:426
+#: src/gtkimhtmltoolbar.c:406
 msgid "_Description"
 msgstr "_Descripció"
 
-#: src/gtkimhtmltoolbar.c:429
+#: src/gtkimhtmltoolbar.c:409
 msgid ""
 "Please enter the URL and description of the link that you want to insert. "
 "The description is optional."
@@ -3502,156 +3537,109 @@
 "Introduïu la URL i la descripció de l'enllaç que vulgueu inserir. La "
 "descripció és opcional."
 
-#: src/gtkimhtmltoolbar.c:433
+#: src/gtkimhtmltoolbar.c:413
 msgid "Please enter the URL of the link that you want to insert."
 msgstr "Introduïu la URL i la descripció de l'enllaç que vulgueu inserir."
 
-#: src/gtkimhtmltoolbar.c:438
+#: src/gtkimhtmltoolbar.c:418
 msgid "Insert Link"
 msgstr "Insereix enllaç"
 
-#: src/gtkimhtmltoolbar.c:442
+#: src/gtkimhtmltoolbar.c:422
 msgid "_Insert"
 msgstr "_Insereix"
 
-#: src/gtkimhtmltoolbar.c:511
+#: src/gtkimhtmltoolbar.c:491
 #, c-format
 msgid "Failed to store image: %s\n"
 msgstr "No s'ha pogut emmagatzemar la imatge: %s\n"
 
-#: src/gtkimhtmltoolbar.c:537 src/gtkimhtmltoolbar.c:547
+#: src/gtkimhtmltoolbar.c:517 src/gtkimhtmltoolbar.c:527
 msgid "Insert Image"
 msgstr "Insereix imatge"
 
-#: src/gtkimhtmltoolbar.c:706 src/gtkimhtmltoolbar.c:784
+#: src/gtkimhtmltoolbar.c:665
 msgid "This theme has no available smileys."
 msgstr "Aquest tema no disposa d'emoticones."
 
 #. show everything
-#: src/gtkimhtmltoolbar.c:798
+#: src/gtkimhtmltoolbar.c:680
 msgid "Smile!"
 msgstr "Sonrigueu!"
 
-#: src/gtkimhtmltoolbar.c:977
+#: src/gtkimhtmltoolbar.c:898
 msgid "Bold"
 msgstr "Negreta"
 
-#: src/gtkimhtmltoolbar.c:988
+#: src/gtkimhtmltoolbar.c:909
 msgid "Italic"
 msgstr "Itàlica"
 
-#: src/gtkimhtmltoolbar.c:999
+#: src/gtkimhtmltoolbar.c:920
 msgid "Underline"
 msgstr "Subratllat"
 
-#: src/gtkimhtmltoolbar.c:1015
+#: src/gtkimhtmltoolbar.c:936
 msgid "Larger font size"
 msgstr "Tipus de lletra més gran"
 
-#: src/gtkimhtmltoolbar.c:1027
+#: src/gtkimhtmltoolbar.c:948
 msgid "Smaller font size"
 msgstr "Tipus de lletra més petita"
 
-#: src/gtkimhtmltoolbar.c:1044
+#: src/gtkimhtmltoolbar.c:965
 msgid "Font Face"
 msgstr "Tipus de lletra"
 
-#: src/gtkimhtmltoolbar.c:1056
+#: src/gtkimhtmltoolbar.c:977
 msgid "Foreground font color"
 msgstr "Color del text"
 
-#: src/gtkimhtmltoolbar.c:1068
+#: src/gtkimhtmltoolbar.c:989
 msgid "Background color"
 msgstr "Color de fons"
 
-#: src/gtkimhtmltoolbar.c:1083
+#: src/gtkimhtmltoolbar.c:1004
 msgid "Insert link"
 msgstr "Insereix un enllaç"
 
-#: src/gtkimhtmltoolbar.c:1093
+#: src/gtkimhtmltoolbar.c:1014
 msgid "Insert image"
 msgstr "Insereix una imatge"
 
-#: src/gtkimhtmltoolbar.c:1104
+#: src/gtkimhtmltoolbar.c:1025
 msgid "Insert smiley"
 msgstr "Insereix una emoticona"
 
-#: src/gtklog.c:311
+#: src/gtklog.c:307
 #, c-format
 msgid "Conversations with %s"
 msgstr "Converses amb %s"
 
 #. Window **********
-#: src/gtklog.c:399 src/gtklog.c:415
+#: src/gtklog.c:400 src/gtklog.c:416
 msgid "System Log"
 msgstr "Registre del sistema"
 
-#: src/gtkmain.c:319
-#, c-format
-msgid "Gaim %s. Try `%s -h' for more information.\n"
-msgstr "Gaim %s. Proveu '%s -h' per a més informació.\n"
-
-#: src/gtkmain.c:321
-#, c-format
-msgid ""
-"Gaim %s\n"
-"Usage: %s [OPTION]...\n"
-"\n"
-"  -a, --acct          display account editor window\n"
-"  -c, --config=DIR    use DIR for config files\n"
-"  -d, --debug         print debugging messages to stdout\n"
-"  -h, --help          display this help and exit\n"
-"  -n, --nologin       don't automatically login\n"
-"  -l, --login[=NAME]  automatically login (optional argument NAME specifies\n"
-"                      account(s) to use, seperated by commas)\n"
-"  -v, --version       display the current version and exit\n"
-msgstr ""
-"Gaim %s\n"
-"Forma d'ús: %s [OPTCIÓ]...\n"
-"\n"
-"  -a, --acct          mostra la finestra d'edició de comptes\n"
-"  -c, --config=DIR    utilitza DIR per als fitxers de configuració\n"
-"  -d, --debug         mostra missatges de depuració a la sortida estàndard\n"
-"  -h, --help          mostra aquesta ajuda i surt\n"
-"  -n, --nologin       no entra automàticament\n"
-"  -l, --login[=NOM]   entra automàticament (l'argument opcional NOM indica "
-"els\n"
-"                      comptes a fer servir, separats per comes)\n"
-"  -v, --version       mostra la versió actual i surt\n"
-
-#: src/gtkmain.c:633
-msgid "Unable to load preferences"
-msgstr "No s'han pogut carregar les preferències"
-
-#: src/gtkmain.c:634
-msgid ""
-"Gaim was not able to load your preferences because they are stored in an old "
-"format that is no longer used.  Please reconfigure your settings using the "
-"Preferences window."
-msgstr ""
-"El Gaim no ha pogut carregar les vostres preferències perquè estan desades "
-"en un format antic que ja no es fa servir. Reconfigureu els vostres "
-"paràmetres en la finestra de preferències."
-
 #. Descriptive label
-#: src/gtknotify.c:262
+#: src/gtknotify.c:216
 #, c-format
 msgid "%s has %d new message."
 msgid_plural "%s has %d new messages."
 msgstr[0] "%s té %d missatge nou."
 msgstr[1] "%s té %d missatges nous."
 
-#: src/gtknotify.c:276
+#: src/gtknotify.c:230
 #, c-format
 msgid "<span weight=\"bold\">From:</span> %s\n"
 msgstr "<span weight=\"bold\">De:</span> %s\n"
 
-#: src/gtknotify.c:285
+#: src/gtknotify.c:239
 #, c-format
 msgid "<span weight=\"bold\">Subject:</span> %s\n"
 msgstr "<span weight=\"bold\">Tema:</span> %s\n"
 
-#: src/gtknotify.c:290
+#: src/gtknotify.c:244
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
@@ -3662,7 +3650,7 @@
 "\n"
 "%s%s%s%s"
 
-#: src/gtknotify.c:306
+#: src/gtknotify.c:260
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
@@ -3673,26 +3661,22 @@
 "\n"
 "%s"
 
-#: src/gtknotify.c:446
-msgid "Search Results"
-msgstr "Resultats de la cerca"
-
-#: src/gtknotify.c:601
+#: src/gtknotify.c:430
 #, c-format
 msgid "The browser command <b>%s</b> is invalid."
 msgstr "L'ordre <b>%s</b> per al navegador no és vàlida."
 
-#: src/gtknotify.c:603 src/gtknotify.c:615 src/gtknotify.c:628
-#: src/gtknotify.c:752
+#: src/gtknotify.c:432 src/gtknotify.c:444 src/gtknotify.c:457
+#: src/gtknotify.c:581
 msgid "Unable to open URL"
 msgstr "No s'ha pogut obrir la URL"
 
-#: src/gtknotify.c:613 src/gtknotify.c:626
+#: src/gtknotify.c:442 src/gtknotify.c:455
 #, c-format
 msgid "Error launching <b>%s</b>: %s"
 msgstr "S'ha produït un error en executar <b>%s</b>: %s"
 
-#: src/gtknotify.c:753
+#: src/gtknotify.c:582
 msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr ""
@@ -3708,7 +3692,7 @@
 msgstr "Introduïu un amic a qui avisar."
 
 #. "New Buddy Pounce"
-#: src/gtkpounce.c:391 src/gtkpounce.c:898
+#: src/gtkpounce.c:391 src/gtkpounce.c:895
 msgid "New Buddy Pounce"
 msgstr "Avís nou per a l'amic"
 
@@ -3804,55 +3788,63 @@
 msgstr "_Desa aquest avís després de l'activació"
 
 #. "Remove Buddy Pounce"
-#: src/gtkpounce.c:906
+#: src/gtkpounce.c:902
 msgid "Remove Buddy Pounce"
 msgstr "Suprimeix l'avís d'un amic"
 
-#: src/gtkpounce.c:967
+#: src/gtkpounce.c:963
 #, c-format
 msgid "%s has started typing to you (%s)"
 msgstr "%s us ha començat a escriure (%s)"
 
-#: src/gtkpounce.c:969
+#: src/gtkpounce.c:965
 #, c-format
 msgid "%s has signed on (%s)"
 msgstr "%s s'ha connectat (%s)"
 
-#: src/gtkpounce.c:971
+#: src/gtkpounce.c:967
 #, c-format
 msgid "%s has returned from being idle (%s)"
 msgstr "%s ha deixat d'estar inactiu (%s)"
 
-#: src/gtkpounce.c:973
+#: src/gtkpounce.c:969
 #, c-format
 msgid "%s has returned from being away (%s)"
 msgstr "%s ha deixat d'estar absent (%s)"
 
-#: src/gtkpounce.c:975
+#: src/gtkpounce.c:971
 #, c-format
 msgid "%s has stopped typing to you (%s)"
 msgstr "%s ha deixat d'escriure-us (%s)"
 
-#: src/gtkpounce.c:977
+#: src/gtkpounce.c:973
 #, c-format
 msgid "%s has signed off (%s)"
 msgstr "%s s'ha desconnectat (%s)"
 
-#: src/gtkpounce.c:979
+#: src/gtkpounce.c:975
 #, c-format
 msgid "%s has become idle (%s)"
 msgstr "%s ha passat a inactiu (%s)"
 
-#: src/gtkpounce.c:981
+#: src/gtkpounce.c:977
 #, c-format
 msgid "%s has gone away. (%s)"
 msgstr "%s ha passat a absent (%s)"
 
-#: src/gtkpounce.c:982
+#: src/gtkpounce.c:978
 msgid "Unknown pounce event. Please report this!"
 msgstr "Esdeveniment d'avís desconegut, informeu-nos-en."
 
-#: src/gtkprefs.c:615
+#: src/gtkprefs.c:447
+msgid "Interface Options"
+msgstr "Opcions de la interfície"
+
+#: src/gtkprefs.c:449
+msgid "D_isplay remote nicknames if no alias is set"
+msgstr "Mostra els sobrenoms remots s_i no se'ls ha establert cap àlies"
+
+#: src/gtkprefs.c:681
 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."
@@ -3860,36 +3852,48 @@
 "Seleccioneu un tema d'emoticones de la llista següent. Es poden instal·lar "
 "temes nous arrosegant-los i deixant-los anar a la llista de temes."
 
-#: src/gtkprefs.c:655
+#: src/gtkprefs.c:721
 msgid "Icon"
 msgstr "Icona"
 
-#: src/gtkprefs.c:662 src/gtkprefs.c:2051 src/protocols/jabber/buddy.c:267
-#: src/protocols/jabber/buddy.c:801 src/protocols/jabber/chat.c:766
+#: src/gtkprefs.c:728 src/gtkprefs.c:2204 src/protocols/jabber/buddy.c:264
+#: src/protocols/jabber/buddy.c:749 src/protocols/jabber/chat.c:743
 msgid "Description"
 msgstr "Descripció"
 
-#: src/gtkprefs.c:757
+#: src/gtkprefs.c:824
 msgid "Display"
 msgstr "Visualitza"
 
-#: src/gtkprefs.c:759
+#: src/gtkprefs.c:825
+msgid "Show _timestamp on messages"
+msgstr "Mos_tra marques horàries en els missatges"
+
+#: src/gtkprefs.c:828
 msgid "_Highlight misspelled words"
 msgstr "_Ressalta paraules mal escrites"
 
-#: src/gtkprefs.c:763
-msgid "Ignore _formatting"
-msgstr "Ignora el _formatat"
-
-#: src/gtkprefs.c:766
+#: src/gtkprefs.c:832
+msgid "Ignore c_olors"
+msgstr "Ignora _colors"
+
+#: src/gtkprefs.c:834
+msgid "Ignore font _faces"
+msgstr "Ignora _tipus de lletra"
+
+#: src/gtkprefs.c:836
+msgid "Ignore font si_zes"
+msgstr "Ignora la _mida de la lletra"
+
+#: src/gtkprefs.c:839
 msgid "Default Formatting"
 msgstr "Formatació per defecte"
 
-#: src/gtkprefs.c:768
+#: src/gtkprefs.c:841
 msgid "_Send default formatting with outgoing messages"
 msgstr "_Envia la formatació per defecte per als missatges sortints"
 
-#: src/gtkprefs.c:778
+#: src/gtkprefs.c:873
 msgid ""
 "This is how your outgoing message text will appear when you use protocols "
 "that support formatting. :)"
@@ -3897,185 +3901,273 @@
 "Així és com els missatges de text sortints apareixeran quan feu servir "
 "protocols que impementin la formatació. :)"
 
-#: src/gtkprefs.c:781
+#: src/gtkprefs.c:876
 msgid "_Clear Formatting"
 msgstr "_Neteja la formatació"
 
-#: src/gtkprefs.c:821
+#: src/gtkprefs.c:913
+msgid "Send Message"
+msgstr "Enviament dels missatges"
+
+#: src/gtkprefs.c:914
+msgid "Enter _sends message"
+msgstr "La tecla de _retorn envia el missatge"
+
+#: src/gtkprefs.c:916
+msgid "C_ontrol-Enter sends message"
+msgstr "La c_ombinació de tecles control-retorn envia el missatge"
+
+#: src/gtkprefs.c:919
+msgid "Window Closing"
+msgstr "Tancament de les finestres"
+
+#: src/gtkprefs.c:920
+msgid "_Escape closes window"
+msgstr "La tecla d'_escapament tanca la finestra"
+
+#: src/gtkprefs.c:923
+msgid "Insertions"
+msgstr "Insercions"
+
+#: src/gtkprefs.c:924
+msgid "Control-{B/I/U} changes _formatting"
+msgstr "Control-{B/I/U/S} canvia la _formatació"
+
+#: src/gtkprefs.c:926
+msgid "Control-(number) _inserts smileys"
+msgstr "Control-(nombre) _insereix emoticones"
+
+#: src/gtkprefs.c:942
 msgid "Buddy List Sorting"
 msgstr "Ordenació de la llista d'amics"
 
-#: src/gtkprefs.c:830
+#: src/gtkprefs.c:951
 msgid "_Sorting:"
 msgstr "_Ordenació:"
 
-#: src/gtkprefs.c:835
+#: src/gtkprefs.c:957 src/gtkprefs.c:1009
+msgid "Show _buttons as:"
+msgstr "Mostra els _botons com a:"
+
+#: src/gtkprefs.c:959 src/gtkprefs.c:1011
+msgid "Pictures"
+msgstr "Imatges"
+
+#: src/gtkprefs.c:960 src/gtkprefs.c:1012
+msgid "Text"
+msgstr "Text"
+
+#: src/gtkprefs.c:961 src/gtkprefs.c:1013
+msgid "Pictures and text"
+msgstr "Imatges i text"
+
+#: src/gtkprefs.c:964
+msgid "_Raise window on events"
+msgstr "_Alça les finestres en rebre-hi esdeveniments"
+
+#: src/gtkprefs.c:967
 msgid "Buddy Display"
 msgstr "Visualització d'amics"
 
-#: src/gtkprefs.c:836
-msgid "Show more buddy details"
-msgstr "Mostra mésdetalls de l'amic"
-
-#: src/gtkprefs.c:869
-msgid "Send unknown \"_slash\" commands as messages"
-msgstr "Envia les ordre_s \"barra inversa\" desconegudes com a missatges"
-
-#: src/gtkprefs.c:872
+#: src/gtkprefs.c:968 src/gtkprefs.c:1030
 msgid "Show buddy _icons"
 msgstr "Mostra les _icones dels amics"
 
-#: src/gtkprefs.c:874
+#: src/gtkprefs.c:970
+msgid "Show _warning levels"
+msgstr "Mostra nivells d'_avís"
+
+#: src/gtkprefs.c:972
+msgid "Show idle _times"
+msgstr "Mostra _temps inactiu"
+
+#: src/gtkprefs.c:974
+msgid "Dim i_dle buddies"
+msgstr "Enfosqueix els amics inactius"
+
+#: src/gtkprefs.c:976
+msgid "_Automatically expand contacts"
+msgstr "Expandeix _automàticament els contactes"
+
+#: src/gtkprefs.c:1020
+msgid "Enable \"_slash\" commands"
+msgstr "Habilita les ordre_s \"barra inversa\""
+
+#: src/gtkprefs.c:1023
+msgid "Send unknown \"_slash\" commands as messages"
+msgstr "Envia les ordre_s \"barra inversa\" desconegudes com a missatges"
+
+#: src/gtkprefs.c:1026
+msgid "Show _formatting toolbar"
+msgstr "Mostra la barra d'eines per a la _formatació"
+
+#: src/gtkprefs.c:1028
+msgid "Show _aliases in tabs/titles"
+msgstr "Mostr_a els àlies a les pestanyes/títols"
+
+#: src/gtkprefs.c:1032
 msgid "Enable buddy ic_on animation"
 msgstr "Habilita l'_animació de les icones dels amics"
 
-#: src/gtkprefs.c:876
+#: src/gtkprefs.c:1034
 msgid "_Notify buddies that you are typing to them"
 msgstr "_Notifica als amics quan els escrigui"
 
+#: src/gtkprefs.c:1036
+msgid "_Raise IM window on events"
+msgstr "Alça les finestres de MI en _rebre-hi esdeveniments"
+
+#: src/gtkprefs.c:1039
+msgid "Raise chat _window on events"
+msgstr "Alça les finestres de _xat en rebre-hi esdeveniments"
+
+#: src/gtkprefs.c:1041
+msgid "Use _multi-colored screen names in chats"
+msgstr "Fes servir àlies _multicolors en els xats"
+
 #. All the tab options!
-#: src/gtkprefs.c:880
+#: src/gtkprefs.c:1045
 msgid "Tab Options"
 msgstr "Opcions de les pestanyes"
 
-#: src/gtkprefs.c:882
+#: src/gtkprefs.c:1047
 msgid "Show IMs and chats in _tabbed windows"
 msgstr "Mostra MI i xats en finestres amb _pestanyes"
 
-#: src/gtkprefs.c:896
+#: src/gtkprefs.c:1062
 msgid "Show close b_utton on tabs"
 msgstr "Mosta el b_otó de tancar a les pestanyes"
 
-#: src/gtkprefs.c:899
+#: src/gtkprefs.c:1065
 msgid "Tab p_lacement:"
 msgstr "Situació de _les pestanyes:"
 
-#: src/gtkprefs.c:901
+#: src/gtkprefs.c:1067
 msgid "Top"
 msgstr "A dalt"
 
-#: src/gtkprefs.c:902
+#: src/gtkprefs.c:1068
 msgid "Bottom"
 msgstr "A baix"
 
-#: src/gtkprefs.c:903
+#: src/gtkprefs.c:1069
 msgid "Left"
 msgstr "A la dreta"
 
-#: src/gtkprefs.c:904
+#: src/gtkprefs.c:1070
 msgid "Right"
 msgstr "A l'esquerra"
 
-#: src/gtkprefs.c:910
+#: src/gtkprefs.c:1076
 msgid "New conversation _placement:"
 msgstr "_Posicionament d'una nova conversa:"
 
-#: src/gtkprefs.c:961 src/protocols/oscar/oscar.c:765
-#: src/protocols/oscar/oscar.c:5203
+#: src/gtkprefs.c:1127 src/protocols/oscar/oscar.c:743
+#: src/protocols/oscar/oscar.c:5102
 msgid "IP Address"
 msgstr "Adreça IP"
 
-#: src/gtkprefs.c:963
+#: src/gtkprefs.c:1129
 msgid "_Autodetect IP Address"
 msgstr "_Autodetecta l'adreça IP"
 
-#: src/gtkprefs.c:972
+#: src/gtkprefs.c:1138
 msgid "Public _IP:"
 msgstr "_IP pública:"
 
-#: src/gtkprefs.c:996
+#: src/gtkprefs.c:1162
 msgid "Ports"
 msgstr "Ports"
 
-#: src/gtkprefs.c:999
+#: src/gtkprefs.c:1165
 msgid "_Manually specify range of ports to listen on"
 msgstr "Especifica _manualment el rang de ports on escoltar"
 
-#: src/gtkprefs.c:1002
+#: src/gtkprefs.c:1168
 msgid "_Start Port:"
 msgstr "Port _inicial:"
 
-#: src/gtkprefs.c:1009
+#: src/gtkprefs.c:1175
 msgid "_End Port:"
 msgstr "Port _final:"
 
-#: src/gtkprefs.c:1016
+#: src/gtkprefs.c:1182
 msgid "Proxy Server"
 msgstr "Servidor intermediari"
 
-#: src/gtkprefs.c:1020
+#: src/gtkprefs.c:1186
 msgid "No proxy"
 msgstr "Sense servidor intermediari"
 
-#: src/gtkprefs.c:1082
+#: src/gtkprefs.c:1248
 msgid "_User:"
 msgstr "_Usuari:"
 
-#: src/gtkprefs.c:1138
+#: src/gtkprefs.c:1304
 msgid "Epiphany"
 msgstr "Epiphany"
 
-#: src/gtkprefs.c:1139
+#: src/gtkprefs.c:1305
 msgid "Firebird"
 msgstr "Firebird"
 
-#: src/gtkprefs.c:1140
+#: src/gtkprefs.c:1306
 msgid "Firefox"
 msgstr "Firefox"
 
-#: src/gtkprefs.c:1141
+#: src/gtkprefs.c:1307
 msgid "Galeon"
 msgstr "Galeon"
 
-#: src/gtkprefs.c:1142
+#: src/gtkprefs.c:1308
 msgid "Gnome Default"
 msgstr "Predeterminat del Gnome"
 
-#: src/gtkprefs.c:1143
+#: src/gtkprefs.c:1309
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: src/gtkprefs.c:1144
+#: src/gtkprefs.c:1310
 msgid "Mozilla"
 msgstr "Mozilla"
 
-#: src/gtkprefs.c:1145
+#: src/gtkprefs.c:1311
 msgid "Netscape"
 msgstr "Netscape"
 
-#: src/gtkprefs.c:1146
+#: src/gtkprefs.c:1312
 msgid "Opera"
 msgstr "Opera"
 
-#: src/gtkprefs.c:1155
+#: src/gtkprefs.c:1321
 msgid "Manual"
 msgstr "Manual"
 
-#: src/gtkprefs.c:1206
+#: src/gtkprefs.c:1372
 msgid "Browser Selection"
 msgstr "Selecció del navegador"
 
-#: src/gtkprefs.c:1210
+#: src/gtkprefs.c:1376
 msgid "_Browser:"
 msgstr "_Navegador:"
 
-#: src/gtkprefs.c:1217
+#: src/gtkprefs.c:1383
 msgid "_Open link in:"
 msgstr "_Obre la ubicació de l'enllaç a:"
 
-#: src/gtkprefs.c:1219
+#: src/gtkprefs.c:1385
 msgid "Browser default"
 msgstr "Predeterminat del navegador"
 
-#: src/gtkprefs.c:1220
+#: src/gtkprefs.c:1386
 msgid "Existing window"
 msgstr "Finestra existent"
 
-#: src/gtkprefs.c:1222
+#: src/gtkprefs.c:1388
 msgid "New tab"
 msgstr "Nova pestanya"
 
-#: src/gtkprefs.c:1236
+#: src/gtkprefs.c:1402
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -4084,75 +4176,83 @@
 "_Manual:\n"
 "(%s per a l'URL)"
 
-#: src/gtkprefs.c:1273
+#: src/gtkprefs.c:1439
 msgid "Message Logs"
 msgstr "Registres de missatges"
 
-#: src/gtkprefs.c:1276
+#: src/gtkprefs.c:1442
 msgid "Log _Format:"
 msgstr "_Format del registre:"
 
-#: src/gtkprefs.c:1279
+#: src/gtkprefs.c:1445
 msgid "_Log all instant messages"
 msgstr "_Registra tots els missatges instantanis"
 
-#: src/gtkprefs.c:1281
+#: src/gtkprefs.c:1447
 msgid "Log all c_hats"
 msgstr "Registra tots els _xats"
 
-#: src/gtkprefs.c:1284
+#: src/gtkprefs.c:1450
 msgid "System Logs"
 msgstr "Registres del sistema"
 
-#: src/gtkprefs.c:1286
+#: src/gtkprefs.c:1452
 msgid "_Enable system log"
 msgstr "Habilita el r_egistre del sistema"
 
-#: src/gtkprefs.c:1289
-msgid "Log when buddies log in/log _out"
-msgstr "Registra quan els amics es c_onnecten/desconnecten"
-
-#: src/gtkprefs.c:1295
+#: src/gtkprefs.c:1455
+msgid "Log when buddies _sign on/sign off"
+msgstr "Regi_stra quan els amics es connecten/desconnecten"
+
+#: src/gtkprefs.c:1461
 msgid "Log when buddies become _idle/un-idle"
 msgstr "Registra quan els amics passen a _inactiu/actiu"
 
-#: src/gtkprefs.c:1301
+#: src/gtkprefs.c:1467
 msgid "Log when buddies go away/come _back"
 msgstr "Registra quan els amics passen a a_bsent/tornen"
 
-#: src/gtkprefs.c:1307
-msgid "Log your own _signons/idleness/awayness"
-msgstr "Regi_stra la pròpia connexió/inactivitat/absència"
-
-#: src/gtkprefs.c:1443
+#: src/gtkprefs.c:1473
+msgid "Log your _own signons/idleness/awayness"
+msgstr "Registra la pròpia c_onnexió/inactivitat/absència"
+
+#: src/gtkprefs.c:1599
 msgid "Sound Selection"
 msgstr "Selecció de sons"
 
-#: src/gtkprefs.c:1495
+#: src/gtkprefs.c:1650
+msgid "Sound Options"
+msgstr "Opcions de so"
+
+#: src/gtkprefs.c:1651
+msgid "Sounds when conversation has _focus"
+msgstr "Sons quan la conversa tingui el _focus"
+
+#: src/gtkprefs.c:1653
+msgid "_Sounds while away"
+msgstr "_Sons mentre s'està absent"
+
+#: src/gtkprefs.c:1657
 msgid "Sound Method"
 msgstr "Mètodes de reproducció del so"
 
-#: src/gtkprefs.c:1496
+#: src/gtkprefs.c:1658
 msgid "_Method:"
 msgstr "_Mètode:"
 
-#: src/gtkprefs.c:1498
+#: src/gtkprefs.c:1660
 msgid "Console beep"
 msgstr "Avís sonor del terminal"
 
-#: src/gtkprefs.c:1500
+#: src/gtkprefs.c:1662
 msgid "Automatic"
 msgstr "Automàtic"
 
-#: src/gtkprefs.c:1507
+#: src/gtkprefs.c:1669
 msgid "Command"
 msgstr "Ordre"
 
-#: src/gtkprefs.c:1508
-msgid "No sounds"
-msgstr "Sense sons"
-
-#: src/gtkprefs.c:1516
+#: src/gtkprefs.c:1677
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -4161,102 +4261,90 @@
 "Ordre per al so\n"
 "(%s per al nom de fitxer)"
 
-#: src/gtkprefs.c:1543
-msgid "Sound Options"
-msgstr "Opcions de so"
-
-#: src/gtkprefs.c:1544
-msgid "Sounds when conversation has _focus"
-msgstr "Sons quan la conversa tingui el _focus"
-
-#: src/gtkprefs.c:1546
-msgid "_Sounds while away"
-msgstr "_Sons mentre s'està absent"
-
-#: src/gtkprefs.c:1556
+#: src/gtkprefs.c:1704
 msgid "Sound Events"
 msgstr "Esdeveniments de so"
 
-#: src/gtkprefs.c:1607
+#: src/gtkprefs.c:1755
 msgid "Play"
 msgstr "Reprodueix"
 
-#: src/gtkprefs.c:1614
+#: src/gtkprefs.c:1762
 msgid "Event"
 msgstr "Esdeveniment"
 
-#: src/gtkprefs.c:1633
+#: src/gtkprefs.c:1781
 msgid "Test"
 msgstr "Prova"
 
-#: src/gtkprefs.c:1637
+#: src/gtkprefs.c:1785
 msgid "Reset"
 msgstr "Reinicia"
 
-#: src/gtkprefs.c:1641
+#: src/gtkprefs.c:1789
 msgid "Choose..."
 msgstr "Escull..."
 
-#: src/gtkprefs.c:1695
+#: src/gtkprefs.c:1813
 msgid "_Queue new messages when away"
 msgstr "Posa els missatges en una cua _quan estigui absent"
 
-#: src/gtkprefs.c:1698
+#: src/gtkprefs.c:1816
 msgid "_Auto-reply:"
 msgstr "Resposta _automàtica:"
 
-#: src/gtkprefs.c:1700
+#: src/gtkprefs.c:1818
 msgid "Never"
 msgstr "Mai"
 
-#: src/gtkprefs.c:1701
+#: src/gtkprefs.c:1819
 msgid "When away"
 msgstr "En estar absent"
 
-#: src/gtkprefs.c:1702
+#: src/gtkprefs.c:1820
 msgid "When away and idle"
 msgstr "En estar absent i inactiu"
 
-#: src/gtkprefs.c:1705 src/protocols/msn/msn.c:504
-#: src/protocols/msn/state.c:32 src/protocols/novell/novell.c:2817
-#: src/protocols/oscar/oscar.c:4323 src/protocols/yahoo/yahoo.c:2430
-#: src/protocols/yahoo/yahoo_profile.c:665
+#: src/gtkprefs.c:1823 src/protocols/msn/msn.c:1322
+#: src/protocols/msn/state.c:32 src/protocols/novell/novell.c:2806
+#: src/protocols/oscar/oscar.c:4255 src/protocols/yahoo/yahoo.c:2605
+#: src/protocols/yahoo/yahoo_profile.c:664
 msgid "Idle"
 msgstr "Inactiu"
 
-#: src/gtkprefs.c:1706
+#: src/gtkprefs.c:1824
 msgid "Idle _time reporting:"
 msgstr "Informe del _temps inactiu:"
 
-#: src/gtkprefs.c:1709
+#: src/gtkprefs.c:1827
 msgid "Gaim usage"
 msgstr "Ús del Gaim"
 
-#: src/gtkprefs.c:1712
+#: src/gtkprefs.c:1830
 msgid "X usage"
 msgstr "Ús de les X"
 
-#: src/gtkprefs.c:1714
+#: src/gtkprefs.c:1832
 msgid "Windows usage"
 msgstr "Ús del Windows"
 
-#: src/gtkprefs.c:1722
+#: src/gtkprefs.c:1840
 msgid "Auto-away"
 msgstr "Auto-absència"
 
-#: src/gtkprefs.c:1723
+#: src/gtkprefs.c:1841
 msgid "Set away _when idle"
 msgstr "Passa a a_bsent quan estigui inactiu"
 
-#: src/gtkprefs.c:1727
+#: src/gtkprefs.c:1845
 msgid "_Minutes before setting away:"
 msgstr "_Minuts abans de passar a absent:"
 
-#: src/gtkprefs.c:1735
+#: src/gtkprefs.c:1853
 msgid "Away m_essage:"
 msgstr "Missatge d'absència:"
 
-#: src/gtkprefs.c:1793
+#: src/gtkprefs.c:1922
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -4271,7 +4359,7 @@
 "<span weight=\"bold\">Pàgina web:</span>\t\t%s\n"
 "<span weight=\"bold\">Nom del fitxer:</span>\t%s"
 
-#: src/gtkprefs.c:1798
+#: src/gtkprefs.c:1927
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -4286,47 +4374,63 @@
 "<span weight=\"bold\">URL:</span>  %s\n"
 "<span weight=\"bold\">Nom del fitxer:</span>  %s"
 
-#: src/gtkprefs.c:2007
+#: src/gtkprefs.c:2160
 msgid "Load"
 msgstr "Carrega"
 
-#: src/gtkprefs.c:2021
+#: src/gtkprefs.c:2174
 msgid "Summary"
 msgstr "Sumari"
 
-#: src/gtkprefs.c:2069
+#: src/gtkprefs.c:2222
 msgid "Details"
 msgstr "Detalls"
 
-#: src/gtkprefs.c:2113
+#: src/gtkprefs.c:2383
+msgid "_Edit"
+msgstr "_Edita"
+
+#: src/gtkprefs.c:2419
+msgid "Interface"
+msgstr "Interfície"
+
+#: src/gtkprefs.c:2422
 msgid "Message Text"
 msgstr "Text del missatge"
 
-#: src/gtkprefs.c:2114
+#: src/gtkprefs.c:2423
+msgid "Shortcuts"
+msgstr "Dreceres"
+
+#: src/gtkprefs.c:2424
 msgid "Smiley Themes"
 msgstr "Temes d'emoticones"
 
-#: src/gtkprefs.c:2115
+#: src/gtkprefs.c:2425
 msgid "Sounds"
 msgstr "Sons"
 
-#: src/gtkprefs.c:2116
+#: src/gtkprefs.c:2426
 msgid "Network"
 msgstr "Xarxa"
 
-#: src/gtkprefs.c:2121
+#: src/gtkprefs.c:2431
 msgid "Browser"
 msgstr "Navegador"
 
-#: src/gtkprefs.c:2124
+#: src/gtkprefs.c:2434
 msgid "Logging"
 msgstr "Registre"
 
-#: src/gtkprefs.c:2125
+#: src/gtkprefs.c:2435
 msgid "Away / Idle"
 msgstr "Absent/Inactiu"
 
-#: src/gtkprefs.c:2128
+#: src/gtkprefs.c:2436
+msgid "Away Messages"
+msgstr "Missatges d'absència"
+
+#: src/gtkprefs.c:2439
 msgid "Plugins"
 msgstr "Connectors"
 
@@ -4350,67 +4454,63 @@
 msgid "Block only the users below"
 msgstr "Bloca els usuaris indicats aquí baix"
 
-#: src/gtkprivacy.c:388
+#: src/gtkprivacy.c:386 src/protocols/jabber/jabber.c:1479
 msgid "Privacy"
 msgstr "Privadesa"
 
-#: src/gtkprivacy.c:401
+#: src/gtkprivacy.c:399
 msgid "Changes to privacy settings take effect immediately."
 msgstr "Els canvis en les opcions de privadesa es realitzen immediatament."
 
 #. "Set privacy for:" label
-#: src/gtkprivacy.c:413
+#: src/gtkprivacy.c:411
 msgid "Set privacy for:"
 msgstr "Estableix la privadesa de:"
 
-#: src/gtkprivacy.c:579 src/gtkprivacy.c:595
+#: src/gtkprivacy.c:580 src/gtkprivacy.c:596
 msgid "Permit User"
 msgstr "Permet l'usuari"
 
-#: src/gtkprivacy.c:580
+#: src/gtkprivacy.c:581
 msgid "Type a user you permit to contact you."
 msgstr "Escriviu quin usuari permeteu que us contacti."
 
-#: src/gtkprivacy.c:581
+#: src/gtkprivacy.c:582
 msgid "Please enter the name of the user you wish to be able to contact you."
 msgstr "Introduïu el nom de l'usuari que vulgueu que us pugui contactar."
 
-#: src/gtkprivacy.c:584 src/gtkprivacy.c:597
+#: src/gtkprivacy.c:585 src/gtkprivacy.c:598
 msgid "Permit"
 msgstr "Permet"
 
-#: src/gtkprivacy.c:589
+#: src/gtkprivacy.c:590
 #, c-format
 msgid "Allow %s to contact you?"
 msgstr "Voleu permetre que %s us pugui contactar?"
 
-#: src/gtkprivacy.c:591
+#: src/gtkprivacy.c:592
 #, c-format
 msgid "Are you sure you wish to allow %s to contact you?"
 msgstr "Esteu segur que voleu permetre que %s us pugui contactar?"
 
-#: src/gtkprivacy.c:618 src/gtkprivacy.c:631
+#: src/gtkprivacy.c:619 src/gtkprivacy.c:632
 msgid "Block User"
 msgstr "Bloca un usuari"
 
-#: src/gtkprivacy.c:619
-msgid "Type a user to block."
-msgstr "Escriviu l'usuari que vulgueu blocar."
-
 #: src/gtkprivacy.c:620
+msgid "Type a user to block."
+msgstr "Escriviu l'usuari que vulgueu blocar."
+
+#: src/gtkprivacy.c:621
 msgid "Please enter the name of the user you wish to block."
 msgstr "Introduïu el nom de l'usuari que vulgueu blocar."
 
-#: src/gtkprivacy.c:622 src/gtkprivacy.c:633
-msgid "Block"
-msgstr "Bloca"
-
-#: src/gtkprivacy.c:627
+#: src/gtkprivacy.c:628
 #, c-format
 msgid "Block %s?"
 msgstr "Voleu blocar %s?"
 
-#: src/gtkprivacy.c:629
+#: src/gtkprivacy.c:630
 #, c-format
 msgid "Are you sure you want to block %s?"
 msgstr "Esteu segur que voleu blocar %s?"
@@ -4418,44 +4518,44 @@
 #. *
 #. * A wrapper for gaim_request_action() that uses Yes and No buttons.
 #.
-#: src/gtkrequest.c:257 src/protocols/gg/gg.c:1026
-#: src/protocols/msn/dialog.c:113 src/protocols/msn/msn.c:511
-#: src/protocols/msn/msn.c:514 src/protocols/novell/novell.c:1901
+#: src/gtkrequest.c:240 src/protocols/gg/gg.c:949
+#: src/protocols/msn/dialog.c:113 src/protocols/msn/msn.c:498
+#: src/protocols/msn/msn.c:501 src/protocols/novell/novell.c:1892
 #: src/protocols/silc/buddy.c:307 src/protocols/silc/pk.c:117
-#: src/request.h:1235
+#: src/request.h:1236
 msgid "Yes"
 msgstr "Sí"
 
-#: src/gtkrequest.c:258 src/protocols/gg/gg.c:1026
-#: src/protocols/msn/dialog.c:114 src/protocols/msn/msn.c:511
-#: src/protocols/msn/msn.c:514 src/protocols/novell/novell.c:1902
+#: src/gtkrequest.c:241 src/protocols/gg/gg.c:949
+#: src/protocols/msn/dialog.c:114 src/protocols/msn/msn.c:498
+#: src/protocols/msn/msn.c:501 src/protocols/novell/novell.c:1893
 #: src/protocols/silc/buddy.c:308 src/protocols/silc/pk.c:118
-#: src/request.h:1235
+#: src/request.h:1236
 msgid "No"
 msgstr "No"
 
-#: src/gtkrequest.c:261
+#: src/gtkrequest.c:244
 msgid "Apply"
 msgstr "Aplica"
 
-#: src/gtkrequest.c:262 src/protocols/msn/msn.c:314
+#: src/gtkrequest.c:245 src/protocols/msn/msn.c:314
 #: src/protocols/silc/util.c:332
 msgid "Close"
 msgstr "Tanca"
 
-#: src/gtkrequest.c:1522
+#: src/gtkrequest.c:1416
 msgid "That file already exists"
 msgstr "Aquest fitxer ja existeix"
 
-#: src/gtkrequest.c:1523
+#: src/gtkrequest.c:1417
 msgid "Would you like to overwrite it?"
 msgstr "Voleu sobrescriurer-lo?"
 
-#: src/gtkrequest.c:1562 src/gtkrequest.c:1588
+#: src/gtkrequest.c:1455 src/gtkrequest.c:1476
 msgid "Save File..."
 msgstr "Desa fitxer..."
 
-#: src/gtkrequest.c:1563 src/gtkrequest.c:1589
+#: src/gtkrequest.c:1456 src/gtkrequest.c:1477
 msgid "Open File..."
 msgstr "Obre fitxer..."
 
@@ -4468,114 +4568,53 @@
 msgid "_Get List"
 msgstr "_Obtingues la llista"
 
-#: src/gtksavedstatuses.c:314 src/protocols/jabber/buddy.c:264
-#: src/protocols/jabber/buddy.c:795 src/protocols/novell/novell.c:1460
-msgid "Title"
-msgstr "Títol"
-
-#: src/gtksavedstatuses.c:325
-msgid "Type"
-msgstr "Tipus"
-
-#: src/gtksavedstatuses.c:336 src/protocols/gg/gg.c:292
-#: src/protocols/gg/gg.c:298 src/protocols/gg/gg.c:304
-#: src/protocols/gg/gg.c:310 src/protocols/gg/gg.c:316
-#: src/protocols/gg/gg.c:322 src/protocols/gg/gg.c:328
-#: src/protocols/irc/irc.c:180 src/protocols/jabber/jabber.c:971
-#: src/protocols/jabber/jabber.c:977 src/protocols/jabber/jabber.c:983
-#: src/protocols/jabber/jabber.c:989 src/protocols/jabber/jabber.c:995
-#: src/protocols/jabber/jabber.c:1001 src/protocols/jabber/jabber.c:1007
-#: src/protocols/novell/novell.c:2831 src/protocols/oscar/oscar.c:7036
-#: src/protocols/oscar/oscar.c:7043 src/protocols/yahoo/yahoo.c:2914
-#: src/protocols/yahoo/yahoo.c:2948 src/protocols/zephyr/zephyr.c:2226
-msgid "Message"
-msgstr "Missatge"
-
-#: src/gtksavedstatuses.c:399
-msgid "Saved Statuses"
-msgstr "Estats desats"
-
-#: src/gtksavedstatuses.c:520
-msgid "Title already in use.  You must choose a unique title."
-msgstr "Ja s'utilitza aquest títol. Heu d'escollir un títol únic."
-
-#: src/gtksavedstatuses.c:611
-msgid "Custom status"
-msgstr "Estat personalitzat"
-
-#: src/gtksavedstatuses.c:714 src/protocols/jabber/buddy.c:616
-#: src/protocols/jabber/buddy.c:623 src/protocols/jabber/buddy.c:634
-#: src/protocols/jabber/jabber.c:950 src/protocols/msn/msn.c:502
-#: src/protocols/novell/novell.c:2830 src/protocols/novell/novell.c:2834
-#: src/protocols/oscar/oscar.c:747 src/protocols/oscar/oscar.c:753
-#: src/protocols/oscar/oscar.c:755 src/protocols/yahoo/yahoo.c:2553
-msgid "Status"
-msgstr "Estat"
-
-#: src/gtksavedstatuses.c:733
-msgid "_Title:"
-msgstr "_Títol:"
-
-#: src/gtksavedstatuses.c:744
-msgid "Out of the office"
-msgstr "Fora de l'oficina"
-
-#: src/gtksavedstatuses.c:755
-msgid "_Status:"
-msgstr "E_stat:"
-
-#. Custom status message disclosure
-#: src/gtksavedstatuses.c:790 src/gtksavedstatuses.c:791
-msgid "Use a different status for some accounts"
-msgstr "Utilitza un estat diferent per a determinats comptes"
+#: src/gtksound.c:63
+msgid "Buddy logs in"
+msgstr "L'amic es connecta"
+
+#: src/gtksound.c:64
+msgid "Buddy logs out"
+msgstr "L'amic es desconnecta"
 
 #: src/gtksound.c:65
-msgid "Buddy logs in"
-msgstr "L'amic es connecta"
+msgid "Message received"
+msgstr "Es rep un missatge"
 
 #: src/gtksound.c:66
-msgid "Buddy logs out"
-msgstr "L'amic es desconnecta"
+msgid "Message received begins conversation"
+msgstr "El missatge rebut inicia una conversa"
 
 #: src/gtksound.c:67
-msgid "Message received"
-msgstr "Es rep un missatge"
+msgid "Message sent"
+msgstr "S'envia un missatge"
 
 #: src/gtksound.c:68
-msgid "Message received begins conversation"
-msgstr "El missatge rebut inicia una conversa"
+msgid "Person enters chat"
+msgstr "Una persona entra al xat"
 
 #: src/gtksound.c:69
-msgid "Message sent"
-msgstr "S'envia un missatge"
+msgid "Person leaves chat"
+msgstr "Una persona surt del xat"
 
 #: src/gtksound.c:70
-msgid "Person enters chat"
-msgstr "Una persona entra al xat"
-
-#: src/gtksound.c:71
-msgid "Person leaves chat"
-msgstr "Una persona surt del xat"
-
-#: src/gtksound.c:72
 msgid "You talk in chat"
 msgstr "Parleu en un xat"
 
-#: src/gtksound.c:73
+#: src/gtksound.c:71
 msgid "Others talk in chat"
 msgstr "Altres parlen en un xat"
 
-#: src/gtksound.c:76
+#: src/gtksound.c:74
 msgid "Someone says your name in chat"
 msgstr "Algú diu el vostre nom en un xat"
 
-#: src/gtksound.c:282
+#: src/gtksound.c:158
 #, c-format
 msgid "Unable to play sound because the chosen file (%s) does not exist."
 msgstr ""
 "No s'ha pogut reproduir el so perquè el fitxer seleccionat (%s) no existeix."
 
-#: src/gtksound.c:298
+#: src/gtksound.c:174
 msgid ""
 "Unable to play sound because the 'Command' sound method has been chosen, but "
 "no command has been set."
@@ -4583,7 +4622,7 @@
 "No s'ha pogut reproduir el so perquè s'ha escollit 'ordre' per reproduir el "
 "so, però no se n'ha indicat cap."
 
-#: src/gtksound.c:310
+#: src/gtksound.c:186
 #, c-format
 msgid ""
 "Unable to play sound because the configured sound command could not be "
@@ -4592,156 +4631,6 @@
 "No s'ha pogut reproduir el so perquè no es pot executar l'ordre de so "
 "configurada: %s"
 
-#: src/gtkstatusbox.c:129
-msgid "Typing"
-msgstr "Teclejant"
-
-#. connect to the server
-#: src/gtkstatusbox.c:134 src/protocols/irc/irc.c:259
-#: src/protocols/jabber/jabber.c:801 src/protocols/msn/session.c:359
-#: src/protocols/napster/napster.c:510 src/protocols/novell/novell.c:2163
-#: src/protocols/oscar/oscar.c:1818 src/protocols/trepia/trepia.c:1067
-#: src/protocols/yahoo/yahoo.c:2250 src/protocols/zephyr/zephyr.c:1492
-msgid "Connecting"
-msgstr "S'està connectant"
-
-#. hacks
-#: src/gtkstatusbox.c:243 src/protocols/gg/gg.c:50 src/protocols/irc/irc.c:175
-#: src/protocols/jabber/jabber.c:982 src/protocols/msn/msn.c:535
-#: src/protocols/msn/state.c:29 src/protocols/msn/state.c:30
-#: src/protocols/msn/state.c:37 src/protocols/msn/state.c:38
-#: src/protocols/novell/novell.c:2808 src/protocols/novell/novell.c:2927
-#: src/protocols/novell/novell.c:2978 src/protocols/oscar/oscar.c:787
-#: src/protocols/oscar/oscar.c:7035 src/protocols/yahoo/yahoo.c:2908
-#: src/status.c:157
-msgid "Available"
-msgstr "Disponible"
-
-#: src/gtkstatusbox.c:245 src/protocols/gg/gg.c:54
-#: src/protocols/oscar/oscar.c:695 src/protocols/oscar/oscar.c:7049
-#: src/protocols/yahoo/yahoo.c:2428 src/protocols/yahoo/yahoo.c:2952
-msgid "Invisible"
-msgstr "Invisible"
-
-#: src/gtkstatusbox.c:246 src/protocols/gg/gg.c:282
-#: src/protocols/irc/irc.c:167 src/protocols/jabber/buddy.c:1070
-#: src/protocols/jabber/jabber.c:971 src/protocols/msn/msn.c:527
-#: src/protocols/napster/napster.c:556 src/protocols/novell/novell.c:2820
-#: src/protocols/oscar/oscar.c:755 src/protocols/oscar/oscar.c:6831
-#: src/protocols/oscar/oscar.c:7025 src/protocols/silc/silc.c:46
-#: src/protocols/yahoo/yahoo.c:2432 src/protocols/yahoo/yahoo.c:2902
-#: src/status.c:155
-msgid "Offline"
-msgstr "Fora de línia"
-
-#. TODO: Add saved statuses here?
-#: src/gtkstatusselector.c:286 src/gtkstatusselector.c:659
-msgid "New Status"
-msgstr "Estat nou"
-
-#: src/gtkstock.c:100
-msgid "_Alias"
-msgstr "À_lies"
-
-#: src/gtkstock.c:102
-msgid "_Invite"
-msgstr "Conv_ida"
-
-#: src/gtkstock.c:103
-msgid "_Modify"
-msgstr "_Modifica"
-
-#: src/gtkstock.c:104
-msgid "_Open Mail"
-msgstr "_Obre el correu"
-
-#: src/gtkstock.c:106
-msgid "_Warn"
-msgstr "_Avisa"
-
-#: src/gtkutils.c:1393 src/gtkutils.c:1418
-#, c-format
-msgid "The following error has occurred loading %s: %s"
-msgstr "S'ha produït el següent error en carregar %s: %s"
-
-#: src/gtkutils.c:1395 src/gtkutils.c:1420
-msgid "Failed to load image"
-msgstr "No s'ha pogut carregar la imatge"
-
-#: src/gtkutils.c:1483
-#, c-format
-msgid "Cannot send folder %s."
-msgstr "No s'ha pogut enviar la carpeta %s."
-
-#: src/gtkutils.c:1485
-msgid ""
-"Gaim cannot transfer a folder. You will need to send the files within "
-"individually"
-msgstr ""
-"El Gaim no pot transferir una carpeta. Haureu d'enviar per separat cada un "
-"dels fitxers"
-
-#: src/gtkutils.c:1513 src/gtkutils.c:1522 src/gtkutils.c:1527
-msgid "You have dragged an image"
-msgstr "Heu arrossegat una imatge"
-
-#: src/gtkutils.c:1514
-msgid ""
-"You can send this image as a file transfer, embed it into this message, or "
-"use it as the buddy icon for this user."
-msgstr ""
-"Podeu enviar aquesta imatge com una transferència de fitxer, incrustar-la en "
-"el missatge, o usar-la com a icona d'amic per a aquest usuari."
-
-#: src/gtkutils.c:1518 src/gtkutils.c:1533
-msgid "Set as buddy icon"
-msgstr "Estableix com a icona de l'amic"
-
-#: src/gtkutils.c:1519 src/gtkutils.c:1534
-msgid "Send image file"
-msgstr "Envia unfitxer d'imatge"
-
-#: src/gtkutils.c:1520 src/gtkutils.c:1534
-msgid "Insert in message"
-msgstr "Insereix un el missatge"
-
-#: src/gtkutils.c:1523
-msgid "Would you like to set it as the buddy icon for this user?"
-msgstr "Voleu establir-la com la icona per a aquest amic?"
-
-#: src/gtkutils.c:1528
-msgid ""
-"You can send this image as a file transfer orembed it into this message, or "
-"use it as the buddy icon for this user."
-msgstr ""
-"Podeu enviar aquesta imatge com a una transferència de fitxer, incrustar-la "
-"en el missatge o utilitzar-la com a icona per a aquest usuari."
-
-#: src/gtkutils.c:1530
-msgid ""
-"You can insert this image into this message, or use it as the buddy icon for "
-"this user"
-msgstr ""
-"Podeu incrustar aquesta imatge en el missatge o utilitzar-la com a icona per "
-"a aquest usuari."
-
-#. I don't know if we really want to do anything here.  Most of the desktop item types are crap like
-#. * "MIME Type" (I have no clue how that would be a desktop item) and "Comment"... nothing we can really
-#. * send.  The only logical one is "Application," but do we really want to send a binary and nothing else?
-#. * Probably not.  I'll just give an error and return.
-#. The original patch sent the icon used by the launcher.  That's probably wrong
-#: src/gtkutils.c:1584
-msgid "Cannot send launcher"
-msgstr "No es pot enviar el llançador"
-
-#: src/gtkutils.c:1584
-msgid ""
-"You dragged a desktop launcher. Most likely you wanted to send whatever this "
-"launcher points to instead of this launcher itself."
-msgstr ""
-"Heu arrossegat un llançador de l'escriptori. Segurament voleu enviar allò al "
-"que aquest llançador apunta i no pas el llançador."
-
 #: src/log.c:104
 msgid "<b><font color=\"red\">The logger has no read function</font></b>"
 msgstr ""
@@ -4751,7 +4640,7 @@
 msgid "XML"
 msgstr "XML"
 
-#: src/log.c:607
+#: src/log.c:608
 #, c-format
 msgid ""
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -4760,7 +4649,7 @@
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
 "RESPOSTA&gt;:</b></font> %s<br/>\n"
 
-#: src/log.c:609
+#: src/log.c:610
 #, c-format
 msgid ""
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -4769,30 +4658,117 @@
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
 "RESPOSTA&gt;:</b></font> %s<br/>\n"
 
-#: src/log.c:660 src/log.c:790
+#: src/log.c:661 src/log.c:791
 msgid "<font color=\"red\"><b>Unable to find log path!</b></font>"
 msgstr ""
 "<font color=\"red\"><b>No s'ha pogut trobar la ruta del registre.</b></font>"
 
-#: src/log.c:670 src/log.c:802
+#: src/log.c:671 src/log.c:803
 #, c-format
 msgid "<font color=\"red\"><b>Could not read file: %s</b></font>"
 msgstr "<font color=\"red\"><b>No s'ha pogut llegir el fitxer: %s</b></font>"
 
-#: src/log.c:674
+#: src/log.c:675
 msgid "HTML"
 msgstr "HTML"
 
-#: src/log.c:735
+#: src/log.c:736
 #, c-format
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <AUTO-RESPOSTA>: %s\n"
 
-#: src/log.c:806
+#: src/log.c:807
 msgid "Plain text"
 msgstr "Text"
 
-#: src/plugin.c:287
+#: src/main.c:150
+msgid "Please create an account."
+msgstr "Creeu un compte."
+
+#: src/main.c:232
+msgid "Login"
+msgstr "Nom d'usuari"
+
+#: src/main.c:248
+msgid "<b>_Account:</b>"
+msgstr "<b>_Compte:</b>"
+
+#: src/main.c:262
+msgid "<b>_Password:</b>"
+msgstr "<b>C_ontrasenya:</b>"
+
+#. And now for the buttons
+#: src/main.c:279
+msgid "A_ccounts"
+msgstr "_Comptes"
+
+#: src/main.c:285
+msgid "P_references"
+msgstr "P_referències"
+
+#: src/main.c:291
+msgid "_Sign on"
+msgstr "Co_nnecta"
+
+#. full help text
+#: src/main.c:513
+#, c-format
+msgid ""
+"Gaim %s\n"
+"Usage: %s [OPTION]...\n"
+"\n"
+"  -a, --acct          display account editor window\n"
+"  -w, --away[=MESG]   make away on signon (optional argument MESG specifies\n"
+"                      name of away message to use)\n"
+"  -l, --login[=NAME]  automatically login (optional argument NAME specifies\n"
+"                      account(s) to use, seperated by commas)\n"
+"  -n, --loginwin      don't automatically login; show login window\n"
+"  -u, --user=NAME     use account NAME\n"
+"  -c, --config=DIR    use DIR for config files\n"
+"  -d, --debug         print debugging messages to stdout\n"
+"  -v, --version       display the current version and exit\n"
+"  -h, --help          display this help and exit\n"
+msgstr ""
+"Gaim %s\n"
+"Ús: %s [OPCIÓ]...\n"
+"\n"
+"  -a, --acct             mostra la finestra d'edició de comptes\n"
+"  -w, --away[=MISSATGE]  entra com a absent quan es connecta\n"
+"                         (l'argument opcional MISSATGE especifica el "
+"missatge\n"
+"                         d'absència a mostrar)\n"
+"  -l, --login[=NOM]      connexió automàtica (l'argument opcional NOM\n"
+"                         especifica els comptes a usar, separats per comes)\n"
+"  -n, --loginwin         no es connecta automàticament; mostra la finestra\n"
+"                         de connexió\n"
+"  -u, --user=NOM         usa el compte NOM\n"
+"  -c, --config=DIR       utilitza DIR per a fitxers de configuració\n"
+"  -d, --debug            escriu els missatges de depuració a la sortida\n"
+"                         estàndard\n"
+"  -v, --version          mostra la versió i surt\n"
+"  -h, --help             mostra aquesta ajuda i surt\n"
+
+#. short message
+#: src/main.c:528
+#, c-format
+msgid "Gaim %s. Try `%s -h' for more information.\n"
+msgstr "Gaim %s. Proveu '%s -h' per a més informació.\n"
+
+#: src/main.c:895
+msgid "Unable to load preferences"
+msgstr "No s'han pogut carregar les preferències"
+
+#: src/main.c:895
+msgid ""
+"Gaim was not able to load your preferences because they are stored in an old "
+"format that is no longer used.  Please reconfigure your settings using the "
+"Preferences window."
+msgstr ""
+"El Gaim no ha pogut carregar les vostres preferències perquè estan desades "
+"en un format antic que ja no es fa servir. Reconfigureu els vostres "
+"paràmetres en la finestra de preferències."
+
+#: src/plugin.c:295
 #, c-format
 msgid ""
 "The required plugin %s was not found. Please install this plugin and try "
@@ -4801,19 +4777,29 @@
 "No s'ha pogut trobar el connector requerit %s. Instal·leu aquest connector i "
 "intenteu-ho de nou."
 
-#: src/plugin.c:292 src/plugin.c:320
+#: src/plugin.c:300 src/plugin.c:328
 msgid "Gaim was unable to load your plugin."
 msgstr "El Gaim no ha pogut carregar el connector."
 
-#: src/plugin.c:316
+#: src/plugin.c:324
 #, c-format
 msgid "The required plugin %s was unable to load."
 msgstr "No s'ha pogut carregar el connector requerit %s."
 
-#: src/prefs.c:1094
+#: src/prefs.c:113 src/status.c:273
 msgid "Slightly less boring default"
 msgstr "Opció per defecte lleugerament menys avorrida"
 
+#: src/protocols/gg/gg.c:50 src/protocols/jabber/jutil.c:44
+#: src/protocols/msn/msn.c:512 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:2797
+#: src/protocols/novell/novell.c:2916 src/protocols/novell/novell.c:2967
+#: src/protocols/oscar/oscar.c:765 src/protocols/yahoo/yahoo.c:2950
+#: src/protocols/yahoo/yahoo.c:3066
+msgid "Available"
+msgstr "Disponible"
+
 #: src/protocols/gg/gg.c:51
 msgid "Available for friends only"
 msgstr "Només disponible per als amics"
@@ -4822,239 +4808,237 @@
 msgid "Away for friends only"
 msgstr "Només absent per als amics"
 
+#: src/protocols/gg/gg.c:54 src/protocols/jabber/jabber.c:977
+#: src/protocols/jabber/presence.c:139 src/protocols/oscar/oscar.c:683
+#: src/protocols/oscar/oscar.c:5613 src/protocols/oscar/oscar.c:5691
+#: src/protocols/oscar/oscar.c:5715 src/protocols/oscar/oscar.c:6896
+#: src/protocols/oscar/oscar.c:6901 src/protocols/yahoo/yahoo.c:2603
+#: src/protocols/yahoo/yahoo.c:2970 src/protocols/yahoo/yahoo.c:3078
+msgid "Invisible"
+msgstr "Invisible"
+
 #: src/protocols/gg/gg.c:55
 msgid "Invisible for friends only"
 msgstr "Només invisible per als amics"
 
-#: src/protocols/gg/gg.c:56 src/status.c:158
+#: src/protocols/gg/gg.c:56
 msgid "Unavailable"
 msgstr "No disponbible"
 
-#: src/protocols/gg/gg.c:151
+#: src/protocols/gg/gg.c:137
 msgid "Unable to resolve hostname."
 msgstr "No s'ha pogut resoldre el nom de l'ordinador."
 
-#: src/protocols/gg/gg.c:154 src/protocols/novell/novell.c:1720
+#: src/protocols/gg/gg.c:140 src/protocols/novell/novell.c:1711
 msgid "Unable to connect to server."
 msgstr "No s'ha pogut connectar al servidor."
 
-#: src/protocols/gg/gg.c:157 src/protocols/jabber/auth.c:134
+#: src/protocols/gg/gg.c:143 src/protocols/jabber/auth.c:134
 #: src/protocols/jabber/auth.c:208 src/protocols/jabber/auth.c:369
 #: src/protocols/jabber/auth.c:467 src/protocols/jabber/auth.c:479
 #: src/protocols/jabber/jabber.c:108
 msgid "Invalid response from server."
 msgstr "La resposta del servidor no és vàlida."
 
-#: src/protocols/gg/gg.c:160
+#: src/protocols/gg/gg.c:146
 msgid "Error while reading from socket."
 msgstr "S'ha produït un error en llegir del sòcol."
 
-#: src/protocols/gg/gg.c:163
+#: src/protocols/gg/gg.c:149
 msgid "Error while writing to socket."
 msgstr "S'ha produït un error en escriure al sòcol."
 
-#: src/protocols/gg/gg.c:166
+#: src/protocols/gg/gg.c:152
 msgid "Authentication failed."
 msgstr "Ha fallat l'autenticació."
 
-#: src/protocols/gg/gg.c:169
+#: src/protocols/gg/gg.c:155
 msgid "Unknown Error Code."
 msgstr "Codi d'error desconegut."
 
-#: src/protocols/gg/gg.c:247 src/protocols/oscar/oscar.c:4122
+#: src/protocols/gg/gg.c:243 src/protocols/oscar/oscar.c:4056
 #, c-format
 msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<HR>%s"
 msgstr "<B>UIN:</B> %s<BR><B>Estat:</B> %s<HR>%s"
 
 #. res[0] == username
-#: src/protocols/gg/gg.c:248 src/protocols/gg/gg.c:1088
-#: src/protocols/napster/napster.c:404 src/protocols/oscar/oscar.c:4126
-#: src/protocols/oscar/oscar.c:4352 src/protocols/silc/ops.c:1088
-#: src/protocols/silc/ops.c:1151 src/protocols/toc/toc.c:469
-#: src/protocols/zephyr/zephyr.c:721 src/protocols/zephyr/zephyr.c:1136
+#. XXX this should use gaim_notify_userinfo, but it is unclear to me what should be passed for 'who'
+#: src/protocols/gg/gg.c:244 src/protocols/gg/gg.c:1011
+#: src/protocols/napster/napster.c:404 src/protocols/oscar/oscar.c:4060
+#: src/protocols/oscar/oscar.c:4284 src/protocols/silc/ops.c:1086
+#: src/protocols/silc/ops.c:1148 src/protocols/toc/toc.c:468
+#: src/protocols/zephyr/zephyr.c:720 src/protocols/zephyr/zephyr.c:1130
 msgid "Buddy Information"
 msgstr "Informació sobre l'amic"
 
-#. zephyr has several exposures
-#. NONE (where you are hidden, and zephyrs to you are in practice silently dropped -- yes this is wrong)
-#. OPSTAFF "hidden"
-#. REALM-VISIBLE visible to people in local realm
-#. REALM-ANNOUNCED REALM-VISIBLE+ plus your logins/logouts are announced to <login,username,*>
-#. NET-VISIBLE REALM-ANNOUNCED, plus visible to people in foreign realm
-#. NET-ANNOUNCED NET-VISIBLE, plus logins/logouts are announced	 to <login,username,*>
-#.
-#. Online will set the user to the exposure they have in their options (defaulting to REALM-VISIBLE),
-#. Hidden, will set the user's exposure to OPSTAFF
-#.
-#. Away won't change their exposure but will set an auto away message (for IMs only)
-#.
-#: src/protocols/gg/gg.c:286 src/protocols/irc/irc.c:171
-#: src/protocols/jabber/buddy.c:1072 src/protocols/jabber/jabber.c:976
-#: src/protocols/msn/msn.c:531 src/protocols/napster/napster.c:561
-#: src/protocols/oscar/oscar.c:697 src/protocols/oscar/oscar.c:7030
-#: src/protocols/silc/silc.c:48 src/protocols/yahoo/yahoo.c:2434
-#: src/protocols/yahoo/yahoo.c:2905 src/protocols/zephyr/zephyr.c:2218
-#: src/status.c:156
-msgid "Online"
-msgstr "En línia"
-
-#: src/protocols/gg/gg.c:341
+#: src/protocols/gg/gg.c:294
 #, c-format
 msgid "Status: %s"
 msgstr "Estat: %s"
 
-#: src/protocols/gg/gg.c:495
+#: src/protocols/gg/gg.c:447
 msgid "Could not connect"
 msgstr "No s'ha pogut connectar"
 
-#: src/protocols/gg/gg.c:502
+#: src/protocols/gg/gg.c:454
 msgid "Unable to read socket"
 msgstr "No s'ha pogut llegir el sòcol"
 
 #. we didn't successfully connect. tdt->toc_fd is valid here
-#: src/protocols/gg/gg.c:751 src/protocols/napster/napster.c:486
-#: src/protocols/napster/napster.c:517 src/protocols/toc/toc.c:171
-#: src/protocols/yahoo/yahoo.c:2029 src/protocols/yahoo/yahoo.c:2056
-#: src/protocols/yahoo/yahoo.c:2119 src/protocols/yahoo/yahoo_filexfer.c:69
-#: src/protocols/yahoo/yahoo_filexfer.c:112 src/protocols/yahoo/ycht.c:483
+#: src/protocols/gg/gg.c:674 src/protocols/icq/gaim_icq.c:343
+#: src/protocols/napster/napster.c:486 src/protocols/napster/napster.c:517
+#: src/protocols/toc/toc.c:170 src/protocols/yahoo/yahoo.c:2241
+#: src/protocols/yahoo/yahoo.c:2270 src/protocols/yahoo/yahoo.c:2333
+#: src/protocols/yahoo/yahoo_filexfer.c:68
+#: src/protocols/yahoo/yahoo_filexfer.c:111 src/protocols/yahoo/ycht.c:482
 msgid "Unable to connect."
 msgstr "No s'ha pogut connectar."
 
-#: src/protocols/gg/gg.c:767
+#: src/protocols/gg/gg.c:690
 msgid "Reading data"
 msgstr "S'estan llegint dades"
 
-#: src/protocols/gg/gg.c:770
+# A balancer is a server whose purpose is to balance/distribute the
+# workload between two or more real servers.
+#
+# "Balancer handshake" is the act of doing "handshaking" with the
+# balancer.
+#
+# This is a status message displayed during the login process,
+# indicating that gaim is doing "handshaking" with the "balancer"
+# server.
+# -- by Ambrose Li on a mail to the gaim-i18n list (josep)
+#: src/protocols/gg/gg.c:693
 msgid "Balancer handshake"
-msgstr ""
-
-#: src/protocols/gg/gg.c:773
+msgstr "S'stà negociant amb el distribuïdor"
+
+#: src/protocols/gg/gg.c:696
 msgid "Reading server key"
 msgstr "S'està llegint la clau del servidor"
 
-#: src/protocols/gg/gg.c:776
+#: src/protocols/gg/gg.c:699
 msgid "Exchanging key hash"
 msgstr "S'està intercanviant la clau hash"
 
-#: src/protocols/gg/gg.c:786
+#: src/protocols/gg/gg.c:709
 msgid "Critical error in GG library\n"
 msgstr "Error crític a la biblioteca GG\n"
 
-#: src/protocols/gg/gg.c:804 src/protocols/gg/gg.c:895
-#: src/protocols/toc/toc.c:147
+#: 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 "Ha fallat la connexió a %s"
 
-#: src/protocols/gg/gg.c:852
+#: src/protocols/gg/gg.c:775
 msgid "Unable to ping server"
 msgstr "No s'ha pogut fer ping al servidor"
 
-#: src/protocols/gg/gg.c:864
+#: src/protocols/gg/gg.c:787
 msgid "Send as message"
 msgstr "Envia com a missatge"
 
-#: src/protocols/gg/gg.c:869
+#: src/protocols/gg/gg.c:792
 msgid "Looking up GG server"
 msgstr "S'està cercant el servidor GG"
 
-#: src/protocols/gg/gg.c:872
+#: src/protocols/gg/gg.c:795
 msgid "Invalid Gadu-Gadu UIN specified"
 msgstr "La UIN de Gadu-Gadu especificada no és vàlida"
 
-#: src/protocols/gg/gg.c:919
+#: src/protocols/gg/gg.c:842
 msgid "You are trying to send a message to an invalid Gadu-Gadu UIN."
 msgstr "Esteu intentant enviar un missatge a una UIN de Gadu-Gadu invàlida."
 
-#: src/protocols/gg/gg.c:994
+#: src/protocols/gg/gg.c:917
 msgid "Couldn't get search results"
 msgstr "No s'han pogut obtenir els resultats de la cerca"
 
-#: src/protocols/gg/gg.c:999
+#: src/protocols/gg/gg.c:922
 msgid "Gadu-Gadu Search Engine"
 msgstr "Cercador de Gadu-Gadu"
 
-#: src/protocols/gg/gg.c:1025
+#: src/protocols/gg/gg.c:948
 msgid "Active"
 msgstr "Actiu"
 
-#: src/protocols/gg/gg.c:1030 src/protocols/oscar/oscar.c:5195
+#: src/protocols/gg/gg.c:953 src/protocols/oscar/oscar.c:5094
 msgid "UIN"
 msgstr "UIN"
 
 #. First Name
-#: src/protocols/gg/gg.c:1034 src/protocols/jabber/jabber.c:622
-#: src/protocols/oscar/oscar.c:5206 src/protocols/silc/ops.c:810
+#: src/protocols/gg/gg.c:957 src/protocols/jabber/jabber.c:622
+#: src/protocols/oscar/oscar.c:5105 src/protocols/silc/ops.c:808
 #: src/protocols/trepia/trepia.c:268
 msgid "First Name"
 msgstr "Nom"
 
 #. Last Name
-#: src/protocols/gg/gg.c:1039 src/protocols/jabber/jabber.c:627
-#: src/protocols/oscar/oscar.c:5207 src/protocols/trepia/trepia.c:275
+#: src/protocols/gg/gg.c:962 src/protocols/jabber/jabber.c:627
+#: src/protocols/oscar/oscar.c:5106 src/protocols/trepia/trepia.c:275
 msgid "Last Name"
 msgstr "Cognoms"
 
-#: src/protocols/gg/gg.c:1043 src/protocols/gg/gg.c:1788
-#: src/protocols/irc/msgs.c:183 src/protocols/oscar/oscar.c:5196
-#: src/protocols/silc/ops.c:1202
+#: src/protocols/gg/gg.c:966 src/protocols/gg/gg.c:1710
+#: src/protocols/irc/msgs.c:204 src/protocols/oscar/oscar.c:5095
+#: src/protocols/silc/ops.c:1204
 msgid "Nick"
 msgstr "Sobrenom"
 
-#: src/protocols/gg/gg.c:1050 src/protocols/gg/gg.c:1053
+#: src/protocols/gg/gg.c:973 src/protocols/gg/gg.c:976
 msgid "Birth Year"
 msgstr "Data de naixement"
 
-#: src/protocols/gg/gg.c:1059 src/protocols/gg/gg.c:1061
-#: src/protocols/gg/gg.c:1063
+#: src/protocols/gg/gg.c:982 src/protocols/gg/gg.c:984
+#: src/protocols/gg/gg.c:986
 msgid "Sex"
 msgstr "Sexe"
 
 #. City
-#: src/protocols/gg/gg.c:1067 src/protocols/jabber/jabber.c:637
-#: src/protocols/oscar/oscar.c:5250 src/protocols/oscar/oscar.c:5258
+#: src/protocols/gg/gg.c:990 src/protocols/jabber/jabber.c:637
+#: src/protocols/oscar/oscar.c:5149 src/protocols/oscar/oscar.c:5157
 #: src/protocols/trepia/trepia.c:332 src/protocols/trepia/trepia.c:411
 msgid "City"
 msgstr "Ciutat"
 
-#: src/protocols/gg/gg.c:1110
+#: src/protocols/gg/gg.c:1033
 msgid "There is no Buddy List stored on the Gadu-Gadu server."
 msgstr "No hi ha cap llista d'amics al servidor Gadu-Gadu."
 
-#: src/protocols/gg/gg.c:1118
+#: src/protocols/gg/gg.c:1041
 msgid "Couldn't Import Buddy List from Server"
 msgstr "No s'ha pogut importar la llista d'amics del servidor"
 
-#: src/protocols/gg/gg.c:1180
+#: src/protocols/gg/gg.c:1103
 msgid "Buddy List successfully transferred to Gadu-Gadu server"
 msgstr "S'ha enviat satisfactòriament la llista d'amics al servidor Gadu-Gadu"
 
-#: src/protocols/gg/gg.c:1188
+#: src/protocols/gg/gg.c:1111
 msgid "Couldn't transfer Buddy List to Gadu-Gadu server"
 msgstr "No s'ha pogut transmetre la llista d'amics al servidor Gadu-Gadu"
 
-#: src/protocols/gg/gg.c:1196
+#: src/protocols/gg/gg.c:1119
 msgid "Buddy List successfully deleted from Gadu-Gadu server"
 msgstr ""
 "S'ha esborrat satisfactòriament la llista d'amics del servidor Gadu-Gadu"
 
-#: src/protocols/gg/gg.c:1204
+#: src/protocols/gg/gg.c:1127
 msgid "Couldn't delete Buddy List from Gadu-Gadu server"
 msgstr "No s'ha pogut esborrar la llista d'amics del servidor Gadu-Gadu"
 
-#: src/protocols/gg/gg.c:1213
+#: src/protocols/gg/gg.c:1136
 msgid "Password changed successfully"
 msgstr "S'ha canviat la contrasenya"
 
-#: src/protocols/gg/gg.c:1220
+#: src/protocols/gg/gg.c:1143
 msgid "Password couldn't be changed"
 msgstr "No s'ha pogut canviar la contrasenya"
 
-#: src/protocols/gg/gg.c:1339
+#: src/protocols/gg/gg.c:1262
 msgid "Error communicating with Gadu-Gadu server"
 msgstr "S'ha produït un error en comunicar amb el servidor Gadu-Gadu"
 
-#: src/protocols/gg/gg.c:1340
+#: 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."
@@ -5063,11 +5047,11 @@
 "problema en la comunicació amb el servidor HTTP Gadu-Gadu. Torneu-ho a "
 "intentar més tard."
 
-#: src/protocols/gg/gg.c:1369
+#: src/protocols/gg/gg.c:1292
 msgid "Unable to import Gadu-Gadu buddy list"
 msgstr "No s'ha pogut importar la llista d'amics de Gadu-Gadu"
 
-#: src/protocols/gg/gg.c:1370
+#: src/protocols/gg/gg.c:1293
 msgid ""
 "Gaim was unable to connect to the Gadu-Gadu buddy list server.  Please try "
 "again later."
@@ -5075,26 +5059,26 @@
 "El Gaim no ha pogut connectar-se al servidor de llistes d'amics del Gadu-"
 "Gadu. Torneu-ho a intentar més tard."
 
-#: src/protocols/gg/gg.c:1443
+#: src/protocols/gg/gg.c:1366
 msgid "Couldn't export buddy list"
 msgstr "No s'ha pogut exportar la llista d'amics"
 
-#: src/protocols/gg/gg.c:1444 src/protocols/gg/gg.c:1467
+#: 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 ""
 "El Gaim no s'ha pogut connectar al servidor de llistes d'amics. Torneu-ho a "
 "intentar més tard."
 
-#: src/protocols/gg/gg.c:1466
+#: src/protocols/gg/gg.c:1389
 msgid "Unable to delete Gadu-Gadu buddy list"
 msgstr "No s'ha pogut esborrar la llista d'amics de Gadu-Gadu"
 
-#: src/protocols/gg/gg.c:1517
+#: src/protocols/gg/gg.c:1440
 msgid "Unable to access directory"
 msgstr "No s'ha pogut accedir al directori"
 
-#: src/protocols/gg/gg.c:1518
+#: 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."
@@ -5102,11 +5086,11 @@
 "El Gaim no ha pogut cercar al directori perquè no s'hi ha pogut connectar. "
 "Torneu-ho a intentar més tard."
 
-#: src/protocols/gg/gg.c:1552
+#: src/protocols/gg/gg.c:1475
 msgid "Unable to change Gadu-Gadu password"
 msgstr "No s'ha pogut canviar la contrasenya per al Gadu-Gadu"
 
-#: src/protocols/gg/gg.c:1553
+#: 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."
@@ -5114,33 +5098,33 @@
 "El Gaim no ha pogut canviar la contrasenya degut a un error mentre es "
 "comunicava amb el servidor Gadu-Gadu. Torneu-ho a intentar més tard."
 
-#: src/protocols/gg/gg.c:1569
+#: src/protocols/gg/gg.c:1492
 msgid "Directory Search"
 msgstr "Cerca al directori"
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
-#: src/protocols/gg/gg.c:1574 src/protocols/jabber/jabber.c:1111
-#: src/protocols/toc/toc.c:1577
+#: src/protocols/gg/gg.c:1497 src/protocols/jabber/jabber.c:1075
+#: src/protocols/toc/toc.c:1564
 msgid "Change Password"
 msgstr "Canvia la contrasenya"
 
-#: src/protocols/gg/gg.c:1578
+#: src/protocols/gg/gg.c:1501
 msgid "Import Buddy List from Server"
 msgstr "Importa la llista d'amics del servidor"
 
-#: src/protocols/gg/gg.c:1582
+#: src/protocols/gg/gg.c:1505
 msgid "Export Buddy List to Server"
 msgstr "Exporta la llista d'amics al servidor"
 
-#: src/protocols/gg/gg.c:1586
+#: src/protocols/gg/gg.c:1509
 msgid "Delete Buddy List from Server"
 msgstr "Esborra la llista d'amics del servidor"
 
-#: src/protocols/gg/gg.c:1619
+#: src/protocols/gg/gg.c:1542
 msgid "Unable to access user profile."
 msgstr "No s'ha pogut accedir al perfil de l'usuari."
 
-#: src/protocols/gg/gg.c:1620
+#: 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."
@@ -5159,30 +5143,66 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/gg/gg.c:1767 src/protocols/gg/gg.c:1769
+#: src/protocols/gg/gg.c:1689 src/protocols/gg/gg.c:1691
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr "Connector per al protocol Gadu-Gadu"
 
+#: src/protocols/icq/gaim_icq.c:223
+msgid "Gaim encountered an error communicating with the ICQ server."
+msgstr "Gaim ha trobat un error en la comunicació amb el servidor ICQ."
+
+#: src/protocols/icq/gaim_icq.c:293
+#, c-format
+msgid "The user %s (%s%s%s%s%s) wants you to authorize them."
+msgstr "L'usuari %s (%s%s%s%s%s) vol que l'autoritzeu."
+
+#: src/protocols/icq/gaim_icq.c:296 src/protocols/jabber/presence.c:248
+#: src/protocols/msn/userlist.c:103 src/protocols/oscar/oscar.c:3795
+#: src/protocols/oscar/oscar.c:6344
+msgid "Authorize"
+msgstr "Autoritza"
+
+#: src/protocols/icq/gaim_icq.c:296 src/protocols/jabber/presence.c:249
+#: src/protocols/msn/userlist.c:104 src/protocols/oscar/oscar.c:3797
+#: src/protocols/oscar/oscar.c:6345
+msgid "Deny"
+msgstr "Denega"
+
+#: src/protocols/icq/gaim_icq.c:309
+msgid "Send message through server"
+msgstr "Envia el missatge a través del servidor"
+
+#: src/protocols/icq/gaim_icq.c:351
+msgid "Connecting..."
+msgstr "S'està connectant..."
+
+#: src/protocols/icq/gaim_icq.c:497
+msgid "Nick:"
+msgstr "Sobrenom:"
+
+#: src/protocols/icq/gaim_icq.c:498
+msgid "Gaim User"
+msgstr "Usuari de Gaim"
+
 #: src/protocols/irc/cmds.c:43 src/protocols/silc/silc.c:1299
 #, c-format
 msgid "Unknown command: %s"
 msgstr "Ordre desconeguda: %s"
 
-#: src/protocols/irc/cmds.c:461 src/protocols/jabber/chat.c:589
+#: src/protocols/irc/cmds.c:461 src/protocols/jabber/chat.c:576
 #: src/protocols/silc/silc.c:1007
 #, c-format
 msgid "current topic is: %s"
 msgstr "El tema actual és: %s"
 
-#: src/protocols/irc/cmds.c:465 src/protocols/jabber/chat.c:593
+#: src/protocols/irc/cmds.c:465 src/protocols/jabber/chat.c:580
 #: src/protocols/silc/silc.c:1011
 msgid "No topic is set"
 msgstr "No hi ha cap tema establert"
 
-#: src/protocols/irc/dcc_send.c:272 src/protocols/yahoo/yahoo_filexfer.c:168
-#: src/protocols/yahoo/yahoo_filexfer.c:178
-#: src/protocols/yahoo/yahoo_filexfer.c:187
-#: src/protocols/yahoo/yahoo_filexfer.c:197
+#: src/protocols/irc/dcc_send.c:272 src/protocols/yahoo/yahoo_filexfer.c:174
+#: src/protocols/yahoo/yahoo_filexfer.c:183
+#: src/protocols/yahoo/yahoo_filexfer.c:192
 msgid "File Transfer Aborted"
 msgstr "S'ha cancel·lat la transferència de fitxers"
 
@@ -5190,78 +5210,72 @@
 msgid "Gaim could not open a listening port."
 msgstr "El Gaim no ha pogut obrir un port on escoltar."
 
-#: src/protocols/irc/irc.c:78
+#: src/protocols/irc/irc.c:75
 msgid "Error displaying MOTD"
 msgstr "S'ha produït un error en mostrar la frase del dia"
 
-#: src/protocols/irc/irc.c:78
+#: src/protocols/irc/irc.c:75
 msgid "No MOTD available"
 msgstr "La frase del dia no està disponible"
 
-#: src/protocols/irc/irc.c:79
+#: src/protocols/irc/irc.c:76
 msgid "There is no MOTD associated with this connection."
 msgstr "No hi ha cap frase del dia associada amb aquesta connexió."
 
-#: src/protocols/irc/irc.c:82
+#: src/protocols/irc/irc.c:79
 #, c-format
 msgid "MOTD for %s"
 msgstr "Frase del dia per a %s"
 
-#: src/protocols/irc/irc.c:102 src/protocols/irc/irc.c:517
-#: src/protocols/irc/irc.c:539
+#: src/protocols/irc/irc.c:93 src/protocols/irc/irc.c:401
 msgid "Server has disconnected"
 msgstr "El servidor ha desconnectat"
 
-#: src/protocols/irc/irc.c:191
+#: src/protocols/irc/irc.c:158
 msgid "View MOTD"
 msgstr "Mostra la frase del dia"
 
-#: src/protocols/irc/irc.c:203 src/protocols/silc/chat.c:32
+#: src/protocols/irc/irc.c:180 src/protocols/silc/chat.c:32
 msgid "_Channel:"
 msgstr "_Canal:"
 
-#: src/protocols/irc/irc.c:208 src/protocols/jabber/chat.c:56
+#: src/protocols/irc/irc.c:185 src/protocols/jabber/chat.c:56
 msgid "_Password:"
 msgstr "_Contrasenya:"
 
-#: src/protocols/irc/irc.c:240
+#: src/protocols/irc/irc.c:217
 msgid "IRC nicks may not contain whitespace"
 msgstr "Els sobrenoms d'IRC no poden contenir espais en blanc"
 
-#: src/protocols/irc/irc.c:267 src/protocols/jabber/jabber.c:407
-#: src/protocols/jabber/jabber.c:739
-msgid "SSL support unavailable"
-msgstr "El suport per a SSL no està disponible"
-
-#: src/protocols/irc/irc.c:278
+#. connect to the server
+#: src/protocols/irc/irc.c:236 src/protocols/jabber/jabber.c:796
+#: src/protocols/msn/session.c:361 src/protocols/napster/napster.c:510
+#: src/protocols/novell/novell.c:2152 src/protocols/oscar/oscar.c:1754
+#: src/protocols/trepia/trepia.c:1065 src/protocols/yahoo/yahoo.c:2464
+#: src/protocols/zephyr/zephyr.c:1452
+msgid "Connecting"
+msgstr "S'està connectant"
+
+#: src/protocols/irc/irc.c:243
 msgid "Couldn't create socket"
 msgstr "No s'ha pogut crear el sòcol"
 
-#: src/protocols/irc/irc.c:346 src/protocols/jabber/jabber.c:302
-#: src/protocols/oscar/oscar.c:1737 src/protocols/oscar/oscar.c:1814
+#: src/protocols/irc/irc.c:258 src/protocols/jabber/jabber.c:302
+#: src/protocols/oscar/oscar.c:1685 src/protocols/oscar/oscar.c:1750
 msgid "Couldn't connect to host"
 msgstr "No s'ha pogut connectar a l'ordinador"
 
-#: src/protocols/irc/irc.c:371 src/protocols/jabber/jabber.c:329
-msgid "Connection Failed"
-msgstr "Ha fallat la connexió"
-
-#: src/protocols/irc/irc.c:374 src/protocols/jabber/jabber.c:332
-msgid "SSL Handshake Failed"
-msgstr "Ha fallat la negociació de la connexió SSL"
-
-#: src/protocols/irc/irc.c:514 src/protocols/irc/irc.c:536
-#: src/protocols/trepia/trepia.c:929
+#: src/protocols/irc/irc.c:398 src/protocols/trepia/trepia.c:927
 msgid "Read error"
 msgstr "Error de lectura"
 
-#: src/protocols/irc/irc.c:675 src/protocols/silc/chat.c:1374
-#: src/protocols/yahoo/yahoochat.c:1355
+#: src/protocols/irc/irc.c:553 src/protocols/silc/chat.c:1373
+#: src/protocols/yahoo/yahoochat.c:1400
 msgid "Users"
 msgstr "Usuaris"
 
-#: src/protocols/irc/irc.c:678 src/protocols/silc/chat.c:1377
-#: src/protocols/silc/ops.c:1170 src/protocols/yahoo/yahoochat.c:1364
+#: src/protocols/irc/irc.c:556 src/protocols/silc/chat.c:1376
+#: src/protocols/silc/ops.c:1166 src/protocols/yahoo/yahoochat.c:1409
 msgid "Topic"
 msgstr "Tema"
 
@@ -5273,46 +5287,42 @@
 #. *< id
 #. *< name
 #. *< version
-#: src/protocols/irc/irc.c:785
+#: src/protocols/irc/irc.c:663
 msgid "IRC Protocol Plugin"
 msgstr "Connector per al protocol d'IRC"
 
 #. *  summary
-#: src/protocols/irc/irc.c:786
+#: src/protocols/irc/irc.c:664
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "El connector per al protocol d'IRC que és menys dolent"
 
-#: src/protocols/irc/irc.c:805 src/protocols/irc/msgs.c:203
-#: src/protocols/jabber/jabber.c:1607 src/protocols/napster/napster.c:691
-#: src/protocols/silc/ops.c:1028 src/protocols/silc/ops.c:1132
+#: src/protocols/irc/irc.c:683 src/protocols/irc/msgs.c:224
+#: src/protocols/jabber/jabber.c:1592 src/protocols/napster/napster.c:670
+#: src/protocols/silc/ops.c:1026 src/protocols/silc/ops.c:1129
 msgid "Server"
 msgstr "Servidor"
 
-#: src/protocols/irc/irc.c:808 src/protocols/jabber/jabber.c:1628
-#: src/protocols/msn/msn.c:1915 src/protocols/napster/napster.c:696
-#: src/protocols/silc/silc.c:1593 src/protocols/trepia/trepia.c:1303
+#: src/protocols/irc/irc.c:686 src/protocols/jabber/jabber.c:1613
+#: src/protocols/msn/msn.c:1929 src/protocols/napster/napster.c:675
+#: src/protocols/silc/silc.c:1593 src/protocols/trepia/trepia.c:1301
 msgid "Port"
 msgstr "Port"
 
-#: src/protocols/irc/irc.c:811
+#: src/protocols/irc/irc.c:689
 msgid "Encodings"
 msgstr "Codificacions"
 
-#: src/protocols/irc/irc.c:814 src/protocols/irc/msgs.c:197
-#: src/protocols/jabber/jabber.c:597 src/protocols/silc/buddy.c:1459
-#: src/protocols/silc/ops.c:975 src/protocols/silc/ops.c:977
-#: src/protocols/silc/ops.c:1126 src/protocols/silc/ops.c:1128
+#: src/protocols/irc/irc.c:692 src/protocols/irc/msgs.c:218
+#: src/protocols/jabber/jabber.c:597 src/protocols/silc/buddy.c:1454
+#: src/protocols/silc/ops.c:973 src/protocols/silc/ops.c:975
+#: src/protocols/silc/ops.c:1123 src/protocols/silc/ops.c:1125
 msgid "Username"
 msgstr "Nom d'usuari"
 
-#: src/protocols/irc/irc.c:817
+#: src/protocols/irc/irc.c:695
 msgid "Real name"
 msgstr "Nom real"
 
-#: src/protocols/irc/irc.c:820
-msgid "Use SSL"
-msgstr "Usa SSL"
-
 #: src/protocols/irc/msgs.c:97
 msgid "Bad mode"
 msgstr "Mode dolent"
@@ -5326,136 +5336,141 @@
 msgid "Banned"
 msgstr "Proscrit"
 
-#: src/protocols/irc/msgs.c:183 src/protocols/irc/msgs.c:203
-#: src/protocols/irc/msgs.c:216
+#: src/protocols/irc/msgs.c:126
+#, c-format
+msgid "Cannot ban %s: banlist is full"
+msgstr "No es pot proscriure %s: la llista de proscrits està plena"
+
+#: src/protocols/irc/msgs.c:204 src/protocols/irc/msgs.c:224
+#: src/protocols/irc/msgs.c:237
 #, c-format
 msgid "<b>%s:</b> %s"
 msgstr "<b>%s:</b> %s"
 
-#: src/protocols/irc/msgs.c:186
+#: src/protocols/irc/msgs.c:207
 msgid " <i>(ircop)</i>"
 msgstr " <i>(ircop)</i>"
 
-#: src/protocols/irc/msgs.c:187
+#: src/protocols/irc/msgs.c:208
 msgid " <i>(identified)</i>"
 msgstr "<i>(identificat)</i>"
 
-#: src/protocols/irc/msgs.c:191 src/protocols/irc/msgs.c:197
-#: src/protocols/irc/msgs.c:198 src/protocols/irc/msgs.c:209
-#: src/protocols/yahoo/yahoo_profile.c:665
+#: src/protocols/irc/msgs.c:212 src/protocols/irc/msgs.c:218
+#: src/protocols/irc/msgs.c:219 src/protocols/irc/msgs.c:230
+#: src/protocols/msn/msn.c:1322 src/protocols/yahoo/yahoo_profile.c:664
 #, c-format
 msgid "<b>%s:</b> %s<br>"
 msgstr "<b>%s:</b> %s<br>"
 
-#: src/protocols/irc/msgs.c:198 src/protocols/silc/ops.c:969
-#: src/protocols/silc/ops.c:1120 src/protocols/yahoo/yahoo_profile.c:1007
+#: src/protocols/irc/msgs.c:219 src/protocols/silc/ops.c:967
+#: src/protocols/silc/ops.c:1117 src/protocols/yahoo/yahoo_profile.c:1005
 msgid "Realname"
 msgstr "Nom real"
 
-#: src/protocols/irc/msgs.c:209 src/protocols/silc/ops.c:1041
+#: src/protocols/irc/msgs.c:230 src/protocols/silc/ops.c:1039
 msgid "Currently on"
 msgstr "Actualment a"
 
-#: src/protocols/irc/msgs.c:214
+#: src/protocols/irc/msgs.c:235
 #, c-format
 msgid "<b>Idle for:</b> %s<br>"
 msgstr "<b>Innactiu durant:</b> %s<br>"
 
-#: src/protocols/irc/msgs.c:216
+#: src/protocols/irc/msgs.c:237
 msgid "Online since"
 msgstr "En línia des de"
 
-#: src/protocols/irc/msgs.c:219
+#: src/protocols/irc/msgs.c:240
 msgid "<br><b>Defining adjective:</b> Glorious<br>"
 msgstr "<br><b>Adjectiu de definició:</b> gloriós<br>"
 
-#: src/protocols/irc/msgs.c:226
+#: src/protocols/irc/msgs.c:247
 #, c-format
 msgid "Buddy Information for %s"
 msgstr "Informació d'amic per a %s"
 
-#: src/protocols/irc/msgs.c:289
+#: src/protocols/irc/msgs.c:310
 #, c-format
 msgid "%s has changed the topic to: %s"
 msgstr "%s ha canviat el tema a: %s"
 
-#: src/protocols/irc/msgs.c:294
+#: src/protocols/irc/msgs.c:315
 #, c-format
 msgid "The topic for %s is: %s"
 msgstr "El tema de %s és: %s"
 
-#: src/protocols/irc/msgs.c:311
+#: src/protocols/irc/msgs.c:332
 #, c-format
 msgid "Unknown message '%s'"
 msgstr "Missatge desconegut '%s'"
 
-#: src/protocols/irc/msgs.c:312
+#: src/protocols/irc/msgs.c:333
 msgid "Unknown message"
 msgstr "Missatge desconegut"
 
-#: src/protocols/irc/msgs.c:312
+#: src/protocols/irc/msgs.c:333
 msgid "Gaim has sent a message the IRC server did not understand."
 msgstr "El Gaim ha enviat un missatge que el servidor d'IRC no ha entès."
 
-#: src/protocols/irc/msgs.c:335
+#: src/protocols/irc/msgs.c:356
 #, c-format
 msgid "Users on %s: %s"
 msgstr "Usuaris a %s: %s"
 
-#: src/protocols/irc/msgs.c:430
+#: src/protocols/irc/msgs.c:451
 msgid "Time Response"
 msgstr "Resposta de l'hora"
 
-#: src/protocols/irc/msgs.c:431
+#: src/protocols/irc/msgs.c:452
 msgid "The IRC server's local time is:"
 msgstr "L'hora local del servidor d'IRC és:"
 
-#: src/protocols/irc/msgs.c:442
+#: src/protocols/irc/msgs.c:463
 msgid "No such channel"
 msgstr "Aquest canal no existeix"
 
 #. does this happen?
-#: src/protocols/irc/msgs.c:454
+#: src/protocols/irc/msgs.c:475
 msgid "no such channel"
 msgstr "aquest canal no existeix"
 
-#: src/protocols/irc/msgs.c:457
+#: src/protocols/irc/msgs.c:478
 msgid "User is not logged in"
 msgstr "L'usuari no està connectat"
 
-#: src/protocols/irc/msgs.c:463
+#: src/protocols/irc/msgs.c:484
 msgid "No such nick or channel"
 msgstr "Nom d'usuari o canal inexistent"
 
-#: src/protocols/irc/msgs.c:484
+#: src/protocols/irc/msgs.c:505
 msgid "Could not send"
 msgstr "No s'ha pogut enviar"
 
-#: src/protocols/irc/msgs.c:540
+#: src/protocols/irc/msgs.c:561
 #, c-format
 msgid "Joining %s requires an invitation."
 msgstr "Per entrar a %s fa falta invitació."
 
-#: src/protocols/irc/msgs.c:541
+#: src/protocols/irc/msgs.c:562
 msgid "Invitation only"
 msgstr "Només amb invitació"
 
-#: src/protocols/irc/msgs.c:642
+#: src/protocols/irc/msgs.c:665
 #, c-format
 msgid "You have been kicked by %s: (%s)"
 msgstr "%s us ha fet fora: (%s)"
 
-#: src/protocols/irc/msgs.c:647
+#: src/protocols/irc/msgs.c:670
 #, c-format
 msgid "Kicked by %s (%s)"
 msgstr "%s us ha fet fora (%s)"
 
-#: src/protocols/irc/msgs.c:668
+#: src/protocols/irc/msgs.c:691
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr "mode (%s %s) per %s"
 
-#: src/protocols/irc/msgs.c:751
+#: src/protocols/irc/msgs.c:773
 msgid ""
 "Your selected account name was rejected by the server.  It probably contains "
 "invalid characters."
@@ -5463,47 +5478,47 @@
 "El servidor ha rebutjat el nom del compte que heu escollit. Possiblement "
 "conté caràcters invàlids."
 
-#: src/protocols/irc/msgs.c:791
+#: src/protocols/irc/msgs.c:813
 msgid "Could not change nick"
 msgstr "No s'ha pogut canviar el sobrenom"
 
-#: src/protocols/irc/msgs.c:792
+#: src/protocols/irc/msgs.c:814
 msgid "Cannot change nick"
 msgstr "No es pot canviar el sobrenom"
 
-#: src/protocols/irc/msgs.c:813
+#: src/protocols/irc/msgs.c:835
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr "Heu sortit del canal%s%s"
 
-#: src/protocols/irc/msgs.c:854
+#: src/protocols/irc/msgs.c:876
 msgid "Error: invalid PONG from server"
 msgstr "Error: PONG invàlid del servidor"
 
-#: src/protocols/irc/msgs.c:856
+#: src/protocols/irc/msgs.c:878
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr "Resposta al PING -- Retard: %lu segons"
 
-#: src/protocols/irc/msgs.c:931
+#: src/protocols/irc/msgs.c:953
 #, c-format
 msgid "Cannot join %s:"
 msgstr "No es pot entrar a %s:"
 
-#: src/protocols/irc/msgs.c:932 src/protocols/silc/ops.c:914
+#: src/protocols/irc/msgs.c:954 src/protocols/silc/ops.c:912
 msgid "Cannot join channel"
 msgstr "No es pot entrar al canal"
 
-#: src/protocols/irc/msgs.c:968
+#: src/protocols/irc/msgs.c:990
 #, c-format
 msgid "Wallops from %s"
 msgstr "Wallops de %s"
 
-#: src/protocols/irc/parse.c:112
+#: src/protocols/irc/parse.c:113
 msgid "action &lt;action to perform&gt;:  Perform an action."
 msgstr "action &lt;acció a dur a terme&gt;:  Realitza una acció."
 
-#: src/protocols/irc/parse.c:113
+#: src/protocols/irc/parse.c:114
 msgid ""
 "away [message]:  Set an away message, or use no message to return from being "
 "away."
@@ -5511,7 +5526,7 @@
 "away [missatge]: Posa un missatge d'absència, o no utilitzeu cap missatge "
 "per deixar d'estar absent."
 
-#: src/protocols/irc/parse.c:114
+#: src/protocols/irc/parse.c:115
 msgid ""
 "deop &lt;nick1&gt; [nick2] ...:  Remove channel operator status from "
 "someone. You must be a channel operator to do this."
@@ -5519,7 +5534,7 @@
 "deop &lt;sobrenom1&gt; [sobrenom2] ...:  Treu l'estat d'operador del canal a "
 "algú. Heu de ser operador del canal per poder fer això."
 
-#: src/protocols/irc/parse.c:115
+#: src/protocols/irc/parse.c:116
 msgid ""
 "devoice &lt;nick1&gt; [nick2] ...:  Remove channel voice status from "
 "someone, preventing them from speaking if the channel is moderated (+m). You "
@@ -5529,7 +5544,7 @@
 "prevenint que parlin al canal si aquest està moderat (+m). Heu de ser "
 "operador del canal per poder fer això."
 
-#: src/protocols/irc/parse.c:116
+#: src/protocols/irc/parse.c:117
 msgid ""
 "invite &lt;nick&gt; [room]:  Invite someone to join you in the specified "
 "channel, or the current channel."
@@ -5537,7 +5552,7 @@
 "invite &lt;sobrenom&gt; [canal]:  Convida algú a que entri al canal indicat, "
 "o al canal actual."
 
-#: src/protocols/irc/parse.c:117
+#: src/protocols/irc/parse.c:118
 msgid ""
 "j &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
 "channels, optionally providing a channel key for each if needed."
@@ -5545,7 +5560,7 @@
 "j &lt;canal1&gt;[,canal2][,...] [clau1[,clau2][,...]]:  Entra a un o més "
 "canals, opcionalment proporcionant una clau si fa falta."
 
-#: src/protocols/irc/parse.c:118
+#: src/protocols/irc/parse.c:119
 msgid ""
 "join &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
 "channels, optionally providing a channel key for each if needed."
@@ -5553,7 +5568,7 @@
 "join &lt;canal1&gt;[,canal2][,...] [clau1[,clau2][,...]]:  Entra a un o més "
 "canals, opcionalment proporcionant una clau si fa falta."
 
-#: src/protocols/irc/parse.c:119
+#: src/protocols/irc/parse.c:120
 msgid ""
 "kick &lt;nick&gt; [message]:  Remove someone from a channel. You must be a "
 "channel operator to do this."
@@ -5561,7 +5576,7 @@
 "kick &lt;sobrenom1&gt; [missatge]:  Fa fora a algú del canal. Heu de ser "
 "operador del canal per poder fer això."
 
-#: src/protocols/irc/parse.c:120
+#: src/protocols/irc/parse.c:121
 msgid ""
 "list:  Display a list of chat rooms on the network. <i>Warning, some servers "
 "may disconnect you upon doing this.</i>"
@@ -5569,11 +5584,11 @@
 "list:  Mostra una llista de canals de xat a la xarxa. <i>Avís, alguns "
 "servidors poden desconnectar-vos si feu això.</i>"
 
-#: src/protocols/irc/parse.c:121
+#: src/protocols/irc/parse.c:122
 msgid "me &lt;action to perform&gt;:  Perform an action."
 msgstr "me &lt;acció a dur a terme&gt;:  Realitza una acció."
 
-#: src/protocols/irc/parse.c:122
+#: src/protocols/irc/parse.c:123
 msgid ""
 "mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;nick|channel&gt;:  Set or unset a channel "
 "or user mode."
@@ -5581,7 +5596,7 @@
 "mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;sobrenom|canal&gt;:  Estableix o no el "
 "mode del canal o d'usuari."
 
-#: src/protocols/irc/parse.c:123
+#: src/protocols/irc/parse.c:124
 msgid ""
 "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
 "opposed to a channel)."
@@ -5589,15 +5604,15 @@
 "msg &lt;sobrenom&gt; &lt;missatge&gt;:  Envia un missatge privat a l'usuari "
 "(contràriament a enviar-lo al canal)."
 
-#: src/protocols/irc/parse.c:124
+#: src/protocols/irc/parse.c:125
 msgid "names [channel]:  List the users currently in a channel."
 msgstr "names [canal]:  Llista els usuaris connectats al canal."
 
-#: src/protocols/irc/parse.c:125 src/protocols/jabber/jabber.c:1459
+#: src/protocols/irc/parse.c:126 src/protocols/jabber/jabber.c:1423
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr "nick &lt;sobrenom nou&gt;:  Canvia el vostre sobrenom."
 
-#: src/protocols/irc/parse.c:126
+#: src/protocols/irc/parse.c:127
 msgid ""
 "op &lt;nick1&gt; [nick2] ...:  Grant channel operator status to someone. You "
 "must be a channel operator to do this."
@@ -5605,7 +5620,7 @@
 "op &lt;sobrenom1&gt; [nick2] ...:  Dóna estat d'operador del canal a algú. "
 "Heu de ser operador del canal per poder fer això."
 
-#: src/protocols/irc/parse.c:127
+#: src/protocols/irc/parse.c:128
 msgid ""
 "operwall &lt;message&gt;:  If you don't know what this is, you probably "
 "can't use it."
@@ -5613,7 +5628,7 @@
 "operwall &lt;missatge&gt;:  Si no sabeu què és això, segurament no podeu fer-"
 "ho servir."
 
-#: src/protocols/irc/parse.c:128
+#: src/protocols/irc/parse.c:129
 msgid ""
 "part [room] [message]:  Leave the current channel, or a specified channel, "
 "with an optional message."
@@ -5621,7 +5636,7 @@
 "part [canal] [missatge]:  Surt del canal actual, o de l'especificat, amb un "
 "missatge opcional."
 
-#: src/protocols/irc/parse.c:129
+#: src/protocols/irc/parse.c:130
 msgid ""
 "ping [nick]:  Asks how much lag a user (or the server if no user specified) "
 "has."
@@ -5629,7 +5644,7 @@
 "ping [sobrenom]:  Indica el retard que té un usuari (o el servidor si no "
 "s'indica cap usuari)."
 
-#: src/protocols/irc/parse.c:130
+#: src/protocols/irc/parse.c:131
 msgid ""
 "query &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
 "opposed to a channel)."
@@ -5637,15 +5652,15 @@
 "query &lt;sobrenom&gt; &lt;missatge&gt;: envia un missatge privat a l'usuari "
 "(contràriament al canal)."
 
-#: src/protocols/irc/parse.c:131
+#: src/protocols/irc/parse.c:132
 msgid "quit [message]:  Disconnect from the server, with an optional message."
 msgstr "quit [missatge]: Desconnecta del servidor amb un missatge opcional."
 
-#: src/protocols/irc/parse.c:132
+#: src/protocols/irc/parse.c:133
 msgid "quote [...]:  Send a raw command to the server."
 msgstr "quote [...]:  Envia un missatge en brut al servidor."
 
-#: src/protocols/irc/parse.c:133
+#: src/protocols/irc/parse.c:134
 msgid ""
 "remove &lt;nick&gt; [message]:  Remove someone from a room. You must be a "
 "channel operator to do this."
@@ -5653,19 +5668,19 @@
 "remove &lt;sobrenom&gt; [missatge]:  Suprimeix algú de la sala. Heu de ser "
 "operador del canal per poder fer això."
 
-#: src/protocols/irc/parse.c:134
+#: src/protocols/irc/parse.c:135
 msgid "time: Displays the current local time at the IRC server."
 msgstr "time: Mostra l'hora local del servidor d'IRC."
 
-#: src/protocols/irc/parse.c:135
+#: src/protocols/irc/parse.c:136
 msgid "topic [new topic]:  View or change the channel topic."
 msgstr "topic [tema nou]: Visualitza o canvia el tema del canal."
 
-#: src/protocols/irc/parse.c:136
+#: src/protocols/irc/parse.c:137
 msgid "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Set or unset a user mode."
 msgstr "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Posa o treu un mode d'usuari."
 
-#: src/protocols/irc/parse.c:137
+#: src/protocols/irc/parse.c:138
 msgid ""
 "voice &lt;nick1&gt; [nick2] ...:  Grant channel voice status to someone. You "
 "must be a channel operator to do this."
@@ -5673,7 +5688,7 @@
 "voice &lt;sobrenom1&gt; [sobrenom2] ...:  Dóna estat de veu a algú. Heu de "
 "ser operador del canal per poder fer això."
 
-#: src/protocols/irc/parse.c:138
+#: src/protocols/irc/parse.c:139
 msgid ""
 "wallops &lt;message&gt;:  If you don't know what this is, you probably can't "
 "use it."
@@ -5681,27 +5696,27 @@
 "wallops &lt;missatge&gt;: Si no sabeu què és això, segurament és que no "
 "podeu fer-ho servir."
 
-#: src/protocols/irc/parse.c:139
+#: src/protocols/irc/parse.c:140
 msgid "whois [server] &lt;nick&gt;:  Get information on a user."
 msgstr "whois [servidor] &lt;sobrenom&gt;:  Obté informació sobre un usuari."
 
-#: src/protocols/irc/parse.c:420
+#: src/protocols/irc/parse.c:421
 #, c-format
 msgid "Reply time from %s: %lu seconds"
 msgstr "Temps de resposta de %s: %lu segons"
 
-#: src/protocols/irc/parse.c:421
+#: src/protocols/irc/parse.c:422
 msgid "PONG"
 msgstr "PONG"
 
-#: src/protocols/irc/parse.c:421
+#: src/protocols/irc/parse.c:422
 msgid "CTCP PING reply"
 msgstr "Resposta de CTCP PING"
 
-#: src/protocols/irc/parse.c:524 src/protocols/irc/parse.c:528
-#: src/protocols/oscar/oscar.c:1634 src/protocols/toc/toc.c:189
-#: src/protocols/toc/toc.c:597 src/protocols/toc/toc.c:613
-#: src/protocols/toc/toc.c:690
+#: src/protocols/irc/parse.c:525 src/protocols/irc/parse.c:529
+#: src/protocols/oscar/oscar.c:1582 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."
 msgstr "Desconnectat."
 
@@ -5744,92 +5759,97 @@
 msgid "Invalid challenge from server"
 msgstr "Repte del servidor invàlid"
 
-#: src/protocols/jabber/buddy.c:249 src/protocols/jabber/buddy.c:657
-#: src/protocols/silc/ops.c:806
+#: src/protocols/jabber/buddy.c:246 src/protocols/jabber/buddy.c:605
+#: src/protocols/silc/ops.c:804
 msgid "Full Name"
 msgstr "Nom"
 
-#: src/protocols/jabber/buddy.c:250 src/protocols/jabber/buddy.c:670
-#: src/protocols/silc/ops.c:818
+#: src/protocols/jabber/buddy.c:247 src/protocols/jabber/buddy.c:618
+#: src/protocols/silc/ops.c:816
 msgid "Family Name"
 msgstr "Cognoms"
 
-#: src/protocols/jabber/buddy.c:251 src/protocols/jabber/buddy.c:674
+#: src/protocols/jabber/buddy.c:248 src/protocols/jabber/buddy.c:622
 msgid "Given Name"
 msgstr "Nom comú"
 
-#: src/protocols/jabber/buddy.c:252 src/protocols/jabber/buddy.c:688
-#: src/protocols/jabber/jabber.c:617 src/protocols/msn/msn.c:1337
-#: src/protocols/silc/buddy.c:1456 src/protocols/silc/ops.c:822
-#: src/protocols/silc/ops.c:965 src/protocols/silc/ops.c:1116
-#: src/protocols/yahoo/yahoo_profile.c:1002
+#: src/protocols/jabber/buddy.c:249 src/protocols/jabber/buddy.c:636
+#: src/protocols/jabber/jabber.c:617 src/protocols/msn/msn.c:1312
+#: src/protocols/silc/buddy.c:1451 src/protocols/silc/ops.c:820
+#: src/protocols/silc/ops.c:963 src/protocols/silc/ops.c:1113
+#: src/protocols/yahoo/yahoo_profile.c:1000
 msgid "Nickname"
 msgstr "Sobrenom"
 
-#: src/protocols/jabber/buddy.c:253 src/protocols/jabber/jabber.c:657
+#: src/protocols/jabber/buddy.c:250 src/protocols/jabber/jabber.c:657
 msgid "URL"
 msgstr "URL"
 
-#: src/protocols/jabber/buddy.c:254 src/protocols/jabber/buddy.c:716
+#: src/protocols/jabber/buddy.c:251 src/protocols/jabber/buddy.c:664
 msgid "Street Address"
 msgstr "Adreça"
 
-#: src/protocols/jabber/buddy.c:255 src/protocols/jabber/buddy.c:712
+#: src/protocols/jabber/buddy.c:252 src/protocols/jabber/buddy.c:660
 msgid "Extended Address"
 msgstr "Adreça (cont.)"
 
-#: src/protocols/jabber/buddy.c:256 src/protocols/jabber/buddy.c:720
+#: src/protocols/jabber/buddy.c:253 src/protocols/jabber/buddy.c:668
 msgid "Locality"
 msgstr "Ubicació"
 
-#: src/protocols/jabber/buddy.c:257 src/protocols/jabber/buddy.c:724
+#: src/protocols/jabber/buddy.c:254 src/protocols/jabber/buddy.c:672
 msgid "Region"
 msgstr "Província"
 
-#: src/protocols/jabber/buddy.c:258 src/protocols/jabber/buddy.c:728
+#: src/protocols/jabber/buddy.c:255 src/protocols/jabber/buddy.c:676
 #: src/protocols/jabber/jabber.c:647
 msgid "Postal Code"
 msgstr "Codi postal"
 
 #. Country
-#: src/protocols/jabber/buddy.c:259 src/protocols/jabber/buddy.c:733
+#: src/protocols/jabber/buddy.c:256 src/protocols/jabber/buddy.c:681
 #: src/protocols/trepia/trepia.c:340 src/protocols/trepia/trepia.c:417
 msgid "Country"
 msgstr "País"
 
-#: src/protocols/jabber/buddy.c:260 src/protocols/jabber/buddy.c:744
-#: src/protocols/jabber/buddy.c:751
+#: src/protocols/jabber/buddy.c:257 src/protocols/jabber/buddy.c:692
+#: src/protocols/jabber/buddy.c:699
 msgid "Telephone"
 msgstr "Telèfon"
 
-#: src/protocols/jabber/buddy.c:261 src/protocols/jabber/buddy.c:762
-#: src/protocols/jabber/buddy.c:770 src/protocols/silc/silc.c:651
-#: src/protocols/silc/util.c:508 src/protocols/yahoo/yahoo_profile.c:997
+#: src/protocols/jabber/buddy.c:258 src/protocols/jabber/buddy.c:710
+#: src/protocols/jabber/buddy.c:718 src/protocols/silc/silc.c:648
+#: src/protocols/silc/util.c:508 src/protocols/yahoo/yahoo_profile.c:995
 msgid "Email"
 msgstr "Correu electrònic"
 
-#: src/protocols/jabber/buddy.c:262 src/protocols/jabber/buddy.c:785
+#: src/protocols/jabber/buddy.c:259 src/protocols/jabber/buddy.c:733
 msgid "Organization Name"
 msgstr "Nom de l'organització"
 
-#: src/protocols/jabber/buddy.c:263 src/protocols/jabber/buddy.c:789
+#: src/protocols/jabber/buddy.c:260 src/protocols/jabber/buddy.c:737
 msgid "Organization Unit"
 msgstr "Secció de l'organització"
 
-#: src/protocols/jabber/buddy.c:265 src/protocols/jabber/buddy.c:798
+#: src/protocols/jabber/buddy.c:261 src/protocols/jabber/buddy.c:743
+#: src/protocols/novell/novell.c:1451
+msgid "Title"
+msgstr "Títol"
+
+#: src/protocols/jabber/buddy.c:262 src/protocols/jabber/buddy.c:746
 msgid "Role"
 msgstr "Rol"
 
-#: src/protocols/jabber/buddy.c:266 src/protocols/jabber/buddy.c:691
-#: src/protocols/oscar/oscar.c:5231
+#: src/protocols/jabber/buddy.c:263 src/protocols/jabber/buddy.c:639
+#: src/protocols/oscar/oscar.c:5130
 msgid "Birthday"
 msgstr "Data de naixement"
 
-#: src/protocols/jabber/buddy.c:559 src/protocols/jabber/buddy.c:560
+#: src/protocols/jabber/buddy.c:509 src/protocols/jabber/buddy.c:510
 msgid "Edit Jabber vCard"
 msgstr "Edita la vCard del Jabber"
 
-#: src/protocols/jabber/buddy.c:561
+#: src/protocols/jabber/buddy.c:511
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable."
@@ -5837,86 +5857,75 @@
 "Les dades de continuació són opcionals. Entreu només la informació que us "
 "sembli."
 
-#: src/protocols/jabber/buddy.c:606
+#: src/protocols/jabber/buddy.c:553
 msgid "Jabber ID"
 msgstr "ID per al Jabber"
 
-#: src/protocols/jabber/buddy.c:632 src/protocols/jabber/jabber.c:1610
+#: src/protocols/jabber/buddy.c:563 src/protocols/jabber/buddy.c:570
+#: src/protocols/jabber/buddy.c:582 src/protocols/jabber/jabber.c:951
+#: src/protocols/msn/msn.c:488 src/protocols/novell/novell.c:2819
+#: src/protocols/novell/novell.c:2823 src/protocols/oscar/oscar.c:725
+#: src/protocols/oscar/oscar.c:731 src/protocols/oscar/oscar.c:733
+#: src/protocols/yahoo/yahoo.c:2728
+msgid "Status"
+msgstr "Estat"
+
+#: src/protocols/jabber/buddy.c:580 src/protocols/jabber/jabber.c:1595
 msgid "Resource"
 msgstr "Recurs"
 
-#: src/protocols/jabber/buddy.c:678 src/protocols/silc/ops.c:814
+#: src/protocols/jabber/buddy.c:626 src/protocols/silc/ops.c:812
 msgid "Middle Name"
 msgstr "Primer Cognom"
 
-#: src/protocols/jabber/buddy.c:696 src/protocols/jabber/jabber.c:632
-#: src/protocols/oscar/oscar.c:5249 src/protocols/oscar/oscar.c:5257
-#: src/protocols/silc/ops.c:850
+#: src/protocols/jabber/buddy.c:644 src/protocols/jabber/jabber.c:632
+#: src/protocols/oscar/oscar.c:5148 src/protocols/oscar/oscar.c:5156
+#: src/protocols/silc/ops.c:848
 msgid "Address"
 msgstr "Adreça"
 
-#: src/protocols/jabber/buddy.c:708
+#: src/protocols/jabber/buddy.c:656
 msgid "P.O. Box"
 msgstr "Compte postal"
 
-#: src/protocols/jabber/buddy.c:814
+#: src/protocols/jabber/buddy.c:762
 msgid "Photo"
 msgstr "Foto"
 
-#: src/protocols/jabber/buddy.c:814
+#: src/protocols/jabber/buddy.c:762
 msgid "Logo"
 msgstr "Logotip"
 
-#: src/protocols/jabber/buddy.c:836
+#: src/protocols/jabber/buddy.c:778
 msgid "Jabber Profile"
 msgstr "Perfil Jabber"
 
-#: src/protocols/jabber/buddy.c:1018
+#: src/protocols/jabber/buddy.c:933
 msgid "Un-hide From"
 msgstr "No m'amaguis de"
 
-#: src/protocols/jabber/buddy.c:1021
+#: src/protocols/jabber/buddy.c:936
 msgid "Temporarily Hide From"
 msgstr "Amaga-me'n temporalment"
 
 #. && NOT ME
-#: src/protocols/jabber/buddy.c:1028
+#: src/protocols/jabber/buddy.c:943
 msgid "Cancel Presence Notification"
 msgstr "Cancel·la la notificació de presència"
 
-#: src/protocols/jabber/buddy.c:1034
+#: src/protocols/jabber/buddy.c:949
 msgid "(Re-)Request authorization"
 msgstr "Tornar a demanar l'autorització"
 
 #. if(NOT ME)
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
-#: src/protocols/jabber/buddy.c:1042
+#: src/protocols/jabber/buddy.c:957
 msgid "Unsubscribe"
 msgstr "Dessubscriu"
 
-#: src/protocols/jabber/buddy.c:1068 src/protocols/jabber/chat.c:674
-#: src/protocols/jabber/chat.c:685 src/protocols/jabber/jabber.c:958
-#: src/protocols/silc/ops.c:1239
-msgid "Error"
-msgstr "Error"
-
-#: src/protocols/jabber/buddy.c:1074 src/protocols/jabber/jabber.c:988
-msgid "Chatty"
-msgstr "Xerraire"
-
-#: src/protocols/jabber/buddy.c:1078 src/protocols/jabber/jabber.c:1000
-#: src/status.c:161
-msgid "Extended Away"
-msgstr "Absent durant una bona estona"
-
-#: src/protocols/jabber/buddy.c:1080 src/protocols/jabber/jabber.c:1006
-#: src/protocols/oscar/oscar.c:685 src/protocols/oscar/oscar.c:7069
-msgid "Do Not Disturb"
-msgstr "No molesteu"
-
-#: src/protocols/jabber/chat.c:41 src/protocols/oscar/oscar.c:6550
-#: src/protocols/yahoo/yahoochat.c:958
+#: src/protocols/jabber/chat.c:41 src/protocols/oscar/oscar.c:6415
+#: src/protocols/yahoo/yahoochat.c:1003
 msgid "_Room:"
 msgstr "Sa_la:"
 
@@ -5928,75 +5937,78 @@
 msgid "_Handle:"
 msgstr "_Gestor:"
 
-#: src/protocols/jabber/chat.c:220
+#: src/protocols/jabber/chat.c:212
 #, c-format
 msgid "%s is not a valid room name"
 msgstr "%s no és un nom de sala vàlid"
 
-#: src/protocols/jabber/chat.c:221
+#: src/protocols/jabber/chat.c:213
 msgid "Invalid Room Name"
 msgstr "El nom de sala no és vàlid"
 
-#: src/protocols/jabber/chat.c:226
+#: src/protocols/jabber/chat.c:218
 #, c-format
 msgid "%s is not a valid server name"
 msgstr "%s no és un nom de servidor vàlid"
 
-#: src/protocols/jabber/chat.c:227 src/protocols/jabber/chat.c:228
+#: src/protocols/jabber/chat.c:219 src/protocols/jabber/chat.c:220
 msgid "Invalid Server Name"
 msgstr "Nom de servidor invàlid"
 
-#: src/protocols/jabber/chat.c:232
+#: src/protocols/jabber/chat.c:224
 #, c-format
 msgid "%s is not a valid room handle"
 msgstr "%s no és un nom de gestor de sala vàlid"
 
-#: src/protocols/jabber/chat.c:233 src/protocols/jabber/chat.c:234
+#: src/protocols/jabber/chat.c:225 src/protocols/jabber/chat.c:226
 msgid "Invalid Room Handle"
 msgstr "El nom del gestor no és vàlid"
 
-#: src/protocols/jabber/chat.c:392
+#: src/protocols/jabber/chat.c:379
 msgid "Configuration error"
 msgstr "Hi ha un error en la configuració"
 
-#: src/protocols/jabber/chat.c:401 src/protocols/jabber/chat.c:546
+#: src/protocols/jabber/chat.c:388 src/protocols/jabber/chat.c:533
 msgid "Unable to configure"
 msgstr "No s'ha pogut configurar"
 
-#: src/protocols/jabber/chat.c:417
+#: src/protocols/jabber/chat.c:404
 msgid "Room Configuration Error"
 msgstr "Error en la configuració de la sala"
 
-#: src/protocols/jabber/chat.c:418
+#: src/protocols/jabber/chat.c:405
 msgid "This room is not capable of being configured"
 msgstr "Aquest sala no es pot configurar"
 
-#: src/protocols/jabber/chat.c:468 src/protocols/jabber/chat.c:537
+#: src/protocols/jabber/chat.c:455 src/protocols/jabber/chat.c:524
 msgid "Registration error"
 msgstr "S'ha produït un error en el registre"
 
-#: src/protocols/jabber/chat.c:625
+#: src/protocols/jabber/chat.c:607
 msgid "Nick changing not supported in non-MUC chatrooms"
 msgstr "El canvi de sobrenom no està suportat en sales de xat no-MUC"
 
-#: src/protocols/jabber/chat.c:675 src/protocols/jabber/chat.c:686
-#: src/protocols/silc/ops.c:1239
-msgid "Error retrieving room list"
+#: src/protocols/jabber/chat.c:651 src/protocols/jabber/chat.c:662
+msgid "Roomlist Error"
+msgstr "Error en la llista de sales"
+
+#: src/protocols/jabber/chat.c:652 src/protocols/jabber/chat.c:663
+msgid "Error retreiving roomlist"
 msgstr "S'ha produït un error en obtenir la llista de sales"
 
-#: src/protocols/jabber/chat.c:734
+#: src/protocols/jabber/chat.c:711
 msgid "Invalid Server"
 msgstr "Servidor invàlid"
 
-#: src/protocols/jabber/chat.c:772
+#: src/protocols/jabber/chat.c:749
 msgid "Enter a Conference Server"
 msgstr "Entreu un servidor de conferències"
 
-#: src/protocols/jabber/chat.c:773
+#: src/protocols/jabber/chat.c:750
 msgid "Select a conference server to query"
 msgstr "Seleccioneu a quin servidor de conferencies consultar"
 
-#: src/protocols/jabber/chat.c:776
+#: src/protocols/jabber/chat.c:753
 msgid "Find Rooms"
 msgstr "Cerca sales"
 
@@ -6005,9 +6017,9 @@
 msgstr "S'ha produït un error en inicialitzar la sessió"
 
 #: src/protocols/jabber/jabber.c:211 src/protocols/trepia/trepia.c:248
-#: src/protocols/trepia/trepia.c:699 src/protocols/trepia/trepia.c:990
-#: src/protocols/trepia/trepia.c:1034 src/protocols/trepia/trepia.c:1133
-#: src/protocols/trepia/trepia.c:1179
+#: src/protocols/trepia/trepia.c:699 src/protocols/trepia/trepia.c:988
+#: src/protocols/trepia/trepia.c:1032 src/protocols/trepia/trepia.c:1131
+#: src/protocols/trepia/trepia.c:1177
 msgid "Write error"
 msgstr "Error d'escriptura"
 
@@ -6015,12 +6027,24 @@
 msgid "Read Error"
 msgstr "Error de lectura"
 
+#: src/protocols/jabber/jabber.c:329
+msgid "Connection Failed"
+msgstr "Ha fallat la connexió"
+
+#: src/protocols/jabber/jabber.c:332
+msgid "SSL Handshake Failed"
+msgstr "Ha fallat la negociació de la connexió SSL"
+
 #: src/protocols/jabber/jabber.c:376 src/protocols/jabber/jabber.c:709
 msgid "Invalid Jabber ID"
 msgstr "ID Jabber invàlid"
 
+#: src/protocols/jabber/jabber.c:407 src/protocols/jabber/jabber.c:739
+msgid "SSL support unavailable"
+msgstr "El suport per a SSL no està disponible"
+
 #: src/protocols/jabber/jabber.c:417 src/protocols/jabber/jabber.c:749
-#: src/protocols/trepia/trepia.c:1073
+#: src/protocols/trepia/trepia.c:1071
 msgid "Unable to create socket"
 msgstr "No s'ha pogut crear el sòcol"
 
@@ -6033,7 +6057,7 @@
 msgid "Registration Successful"
 msgstr "S'ha registrat amb èxit"
 
-#: src/protocols/jabber/jabber.c:451 src/protocols/jabber/jabber.c:1230
+#: src/protocols/jabber/jabber.c:451 src/protocols/jabber/jabber.c:1194
 msgid "Unknown Error"
 msgstr "Error desconegut"
 
@@ -6045,7 +6069,7 @@
 msgid "Already Registered"
 msgstr "Ja esteu registrat"
 
-#: src/protocols/jabber/jabber.c:601 src/protocols/jabber/jabber.c:1085
+#: src/protocols/jabber/jabber.c:601 src/protocols/jabber/jabber.c:1049
 msgid "Password"
 msgstr "Contrasenya"
 
@@ -6054,14 +6078,14 @@
 msgstr "Correu electrònic"
 
 #. State
-#: src/protocols/jabber/jabber.c:642 src/protocols/oscar/oscar.c:5251
-#: src/protocols/oscar/oscar.c:5259 src/protocols/trepia/trepia.c:336
+#: src/protocols/jabber/jabber.c:642 src/protocols/oscar/oscar.c:5150
+#: src/protocols/oscar/oscar.c:5158 src/protocols/trepia/trepia.c:336
 #: src/protocols/trepia/trepia.c:414
 msgid "State"
 msgstr "Estat"
 
-#: src/protocols/jabber/jabber.c:652 src/protocols/silc/ops.c:855
-#: src/protocols/silc/silc.c:653 src/protocols/silc/util.c:510
+#: src/protocols/jabber/jabber.c:652 src/protocols/silc/ops.c:853
+#: src/protocols/silc/silc.c:650 src/protocols/silc/util.c:510
 msgid "Phone"
 msgstr "Telèfon"
 
@@ -6077,332 +6101,355 @@
 msgid "Register New Jabber Account"
 msgstr "Registra un compte Jabber nou"
 
-#: src/protocols/jabber/jabber.c:805
+#: src/protocols/jabber/jabber.c:757
+msgid "Logged out"
+msgstr "Desconnectat"
+
+#: src/protocols/jabber/jabber.c:800
 msgid "Initializing Stream"
 msgstr "S'està inicialitzant el flux"
 
-#: src/protocols/jabber/jabber.c:811 src/protocols/msn/session.c:365
+#: src/protocols/jabber/jabber.c:806 src/protocols/msn/session.c:367
 msgid "Authenticating"
 msgstr "S'està autenticant"
 
-#: src/protocols/jabber/jabber.c:820
+#: src/protocols/jabber/jabber.c:815
 msgid "Re-initializing Stream"
 msgstr "S'està reinicialitzant el flux"
 
-#: src/protocols/jabber/jabber.c:892 src/protocols/jabber/jabber.c:1208
-#: src/protocols/jabber/jabber.c:1249 src/protocols/jabber/jabber.c:1282
-#: src/protocols/oscar/oscar.c:753 src/protocols/oscar/oscar.c:6829
+#: src/protocols/jabber/jabber.c:895 src/protocols/jabber/jabber.c:1172
+#: src/protocols/jabber/jabber.c:1213 src/protocols/jabber/jabber.c:1246
+#: src/protocols/oscar/oscar.c:731 src/protocols/oscar/oscar.c:6699
 msgid "Not Authorized"
 msgstr "No Autoritzat"
 
-#: src/protocols/jabber/jabber.c:925
+#: src/protocols/jabber/jabber.c:926
 msgid "Both"
 msgstr "Ambdós"
 
-#: src/protocols/jabber/jabber.c:927
+#: src/protocols/jabber/jabber.c:928
 msgid "From (To pending)"
 msgstr "De (a pendent)"
 
-#: src/protocols/jabber/jabber.c:929
+#: src/protocols/jabber/jabber.c:930
 msgid "From"
 msgstr "De"
 
-#: src/protocols/jabber/jabber.c:932
+#: src/protocols/jabber/jabber.c:933
 msgid "To"
 msgstr "A"
 
-#: src/protocols/jabber/jabber.c:934
+#: src/protocols/jabber/jabber.c:935
 msgid "None (To pending)"
 msgstr "Cap (a pendent)"
 
-#: src/protocols/jabber/jabber.c:938
+#: src/protocols/jabber/jabber.c:939
 msgid "Subscription"
 msgstr "Subscripció"
 
-#: src/protocols/jabber/jabber.c:976 src/protocols/jabber/jabber.c:982
-#: src/protocols/jabber/jabber.c:988 src/protocols/jabber/jabber.c:994
-#: src/protocols/jabber/jabber.c:1000 src/protocols/jabber/jabber.c:1006
-msgid "Priority"
-msgstr "Prioritat"
-
-#: src/protocols/jabber/jabber.c:1028
+#: src/protocols/jabber/jabber.c:959
+msgid "Error"
+msgstr "Error"
+
+#: src/protocols/jabber/jabber.c:972 src/protocols/jabber/jutil.c:35
+#: src/protocols/jabber/presence.c:72 src/protocols/jabber/presence.c:130
+msgid "Chatty"
+msgstr "Xerraire"
+
+#: src/protocols/jabber/jabber.c:974 src/protocols/jabber/jutil.c:38
+#: src/protocols/jabber/presence.c:74 src/protocols/jabber/presence.c:135
+msgid "Extended Away"
+msgstr "Absent durant una bona estona"
+
+#: src/protocols/jabber/jabber.c:975 src/protocols/jabber/jutil.c:41
+#: src/protocols/jabber/presence.c:76 src/protocols/jabber/presence.c:137
+#: src/protocols/oscar/oscar.c:673 src/protocols/oscar/oscar.c:5703
+#: src/protocols/oscar/oscar.c:6892
+msgid "Do Not Disturb"
+msgstr "No molesteu"
+
+#: src/protocols/jabber/jabber.c:992
 msgid "Password Changed"
 msgstr "S'ha canviat la contrasenya"
 
-#: src/protocols/jabber/jabber.c:1029
+#: src/protocols/jabber/jabber.c:993
 msgid "Your password has been changed."
 msgstr "La vostra contrasenya s'ha canviat."
 
-#: src/protocols/jabber/jabber.c:1033 src/protocols/jabber/jabber.c:1034
+#: src/protocols/jabber/jabber.c:997 src/protocols/jabber/jabber.c:998
 msgid "Error changing password"
 msgstr "S'ha produït un error en canviar la contrsaenya"
 
-#: src/protocols/jabber/jabber.c:1090
+#: src/protocols/jabber/jabber.c:1054
 msgid "Password (again)"
 msgstr "Contrasenya (repetiu-la)"
 
-#: src/protocols/jabber/jabber.c:1095 src/protocols/jabber/jabber.c:1096
+#: src/protocols/jabber/jabber.c:1059 src/protocols/jabber/jabber.c:1060
 msgid "Change Jabber Password"
 msgstr "Canvia la contrasenya per al Jabber"
 
-#: src/protocols/jabber/jabber.c:1096
+#: src/protocols/jabber/jabber.c:1060
 msgid "Please enter your new password"
 msgstr "Introduïu la nova contrasenya"
 
-#: src/protocols/jabber/jabber.c:1106 src/protocols/toc/toc.c:1567
+#: src/protocols/jabber/jabber.c:1070 src/protocols/toc/toc.c:1554
 msgid "Set User Info"
 msgstr "Estableix les dades d'usuari"
 
-#: src/protocols/jabber/jabber.c:1188
+#: src/protocols/jabber/jabber.c:1152
 msgid "Bad Request"
 msgstr "Sol·licitud incorrecta"
 
-#: src/protocols/jabber/jabber.c:1190
+#: src/protocols/jabber/jabber.c:1154
 msgid "Conflict"
 msgstr "Conflicte"
 
-#: src/protocols/jabber/jabber.c:1192
+#: src/protocols/jabber/jabber.c:1156
 msgid "Feature Not Implemented"
 msgstr "La característica no està implementada"
 
-#: src/protocols/jabber/jabber.c:1194
+#: src/protocols/jabber/jabber.c:1158
 msgid "Forbidden"
 msgstr "Prohibit"
 
-#: src/protocols/jabber/jabber.c:1196
+#: src/protocols/jabber/jabber.c:1160
 msgid "Gone"
 msgstr "Desaparegut"
 
-#: src/protocols/jabber/jabber.c:1198 src/protocols/jabber/jabber.c:1272
+#: src/protocols/jabber/jabber.c:1162 src/protocols/jabber/jabber.c:1236
 msgid "Internal Server Error"
 msgstr "Error intern del servidor"
 
-#: src/protocols/jabber/jabber.c:1200
+#: src/protocols/jabber/jabber.c:1164
 msgid "Item Not Found"
 msgstr "No s'ha trobat l'element"
 
-#: src/protocols/jabber/jabber.c:1202
+#: src/protocols/jabber/jabber.c:1166
 msgid "Malformed Jabber ID"
 msgstr "l'ID Jabber està mal format"
 
-#: src/protocols/jabber/jabber.c:1204
+#: src/protocols/jabber/jabber.c:1168
 msgid "Not Acceptable"
 msgstr "No acceptable"
 
-#: src/protocols/jabber/jabber.c:1206
+#: src/protocols/jabber/jabber.c:1170
 msgid "Not Allowed"
 msgstr "No permès"
 
-#: src/protocols/jabber/jabber.c:1210
+#: src/protocols/jabber/jabber.c:1174
 msgid "Payment Required"
 msgstr "De pagament"
 
-#: src/protocols/jabber/jabber.c:1212
+#: src/protocols/jabber/jabber.c:1176
 msgid "Recipient Unavailable"
 msgstr "El destinatari no està disponible"
 
-#: src/protocols/jabber/jabber.c:1216
+#: src/protocols/jabber/jabber.c:1180
 msgid "Registration Required"
 msgstr "Cal registre"
 
-#: src/protocols/jabber/jabber.c:1218
+#: src/protocols/jabber/jabber.c:1182
 msgid "Remote Server Not Found"
 msgstr "No s'ha trobat el servidor remot"
 
-#: src/protocols/jabber/jabber.c:1220
+#: src/protocols/jabber/jabber.c:1184
 msgid "Remote Server Timeout"
 msgstr "El servidor remot ha excedit el temps d'espera"
 
-#: src/protocols/jabber/jabber.c:1222
+#: src/protocols/jabber/jabber.c:1186
 msgid "Server Overloaded"
 msgstr "El servidor està sobrecarregat"
 
-#: src/protocols/jabber/jabber.c:1224
+#: src/protocols/jabber/jabber.c:1188
 msgid "Service Unavailable"
 msgstr "El servei no està disponible"
 
-#: src/protocols/jabber/jabber.c:1226
+#: src/protocols/jabber/jabber.c:1190
 msgid "Subscription Required"
 msgstr "Cal subscripció"
 
-#: src/protocols/jabber/jabber.c:1228
+#: src/protocols/jabber/jabber.c:1192
 msgid "Unexpected Request"
 msgstr "Sol·licitut inesperada"
 
-#: src/protocols/jabber/jabber.c:1235
+#: src/protocols/jabber/jabber.c:1199
 msgid "Authorization Aborted"
 msgstr "S'ha avortat l'autorització"
 
-#: src/protocols/jabber/jabber.c:1237
+#: src/protocols/jabber/jabber.c:1201
 msgid "Incorrect encoding in authorization"
 msgstr "La codificació de l'autorització no és correcta"
 
-#: src/protocols/jabber/jabber.c:1240
+#: src/protocols/jabber/jabber.c:1204
 msgid "Invalid authzid"
 msgstr "Authzid invàlid"
 
-#: src/protocols/jabber/jabber.c:1243
+#: src/protocols/jabber/jabber.c:1207
 msgid "Invalid Authorization Mechanism"
 msgstr "El mecanisme d'autorització no és vàlid"
 
-#: src/protocols/jabber/jabber.c:1246
+#: src/protocols/jabber/jabber.c:1210
 msgid "Authorization mechanism too weak"
 msgstr "El mecanisme d'autorització és massa feble"
 
-#: src/protocols/jabber/jabber.c:1251
+#: src/protocols/jabber/jabber.c:1215
 msgid "Temporary Authentication Failure"
 msgstr "Ha fallat temporalment l'autenticació"
 
-#: src/protocols/jabber/jabber.c:1253
+#: src/protocols/jabber/jabber.c:1217
 msgid "Authentication Failure"
 msgstr "S'ha produït un error en l'autenticació"
 
-#: src/protocols/jabber/jabber.c:1257
+#: src/protocols/jabber/jabber.c:1221
 msgid "Bad Format"
 msgstr "Format incorrecte"
 
-#: src/protocols/jabber/jabber.c:1259
+#: src/protocols/jabber/jabber.c:1223
 msgid "Bad Namespace Prefix"
 msgstr "Prefix d'espai de noms incorrecte"
 
-#: src/protocols/jabber/jabber.c:1262
+#: src/protocols/jabber/jabber.c:1226
 msgid "Resource Conflict"
 msgstr "Conflicte de recurs"
 
-#: src/protocols/jabber/jabber.c:1264 src/protocols/silc/ops.c:1509
+#: src/protocols/jabber/jabber.c:1228 src/protocols/silc/ops.c:1511
 msgid "Connection Timeout"
 msgstr "La connexió ha excedit el temps d'espera"
 
-#: src/protocols/jabber/jabber.c:1266
+#: src/protocols/jabber/jabber.c:1230
 msgid "Host Gone"
 msgstr "L'ordinador ha desaparegut"
 
-#: src/protocols/jabber/jabber.c:1268
+#: src/protocols/jabber/jabber.c:1232
 msgid "Host Unknown"
 msgstr "Servidor desconegut"
 
-#: src/protocols/jabber/jabber.c:1270
+#: src/protocols/jabber/jabber.c:1234
 msgid "Improper Addressing"
 msgstr "Adreçament incorrecte"
 
-#: src/protocols/jabber/jabber.c:1274
+#: src/protocols/jabber/jabber.c:1238
 msgid "Invalid ID"
 msgstr "ID invàlid"
 
-#: src/protocols/jabber/jabber.c:1276
+#: src/protocols/jabber/jabber.c:1240
 msgid "Invalid Namespace"
 msgstr "Espai de noms invàlid"
 
-#: src/protocols/jabber/jabber.c:1278
+#: src/protocols/jabber/jabber.c:1242
 msgid "Invalid XML"
 msgstr "XML invàlid"
 
-#: src/protocols/jabber/jabber.c:1280
+#: src/protocols/jabber/jabber.c:1244
 msgid "Non-matching Hosts"
 msgstr "Ordinadors no coincidents"
 
-#: src/protocols/jabber/jabber.c:1284
+#: src/protocols/jabber/jabber.c:1248
 msgid "Policy Violation"
 msgstr "Violació de la política"
 
-#: src/protocols/jabber/jabber.c:1286
+#: src/protocols/jabber/jabber.c:1250
 msgid "Remote Connection Failed"
 msgstr "Ha fallat la connexió remota"
 
 # Mirar com es traduïa 'Constraint variables'
-#: src/protocols/jabber/jabber.c:1288
+#: src/protocols/jabber/jabber.c:1252
 msgid "Resource Constraint"
 msgstr "Restriccions del recurs"
 
-#: src/protocols/jabber/jabber.c:1290
+#: src/protocols/jabber/jabber.c:1254
 msgid "Restricted XML"
 msgstr "XML restringit"
 
-#: src/protocols/jabber/jabber.c:1292
+#: src/protocols/jabber/jabber.c:1256
 msgid "See Other Host"
 msgstr "Veu altres ordinadors"
 
-#: src/protocols/jabber/jabber.c:1294
+#: src/protocols/jabber/jabber.c:1258
 msgid "System Shutdown"
 msgstr "Apagada del Sistema"
 
-#: src/protocols/jabber/jabber.c:1296
+#: src/protocols/jabber/jabber.c:1260
 msgid "Undefined Condition"
 msgstr "Condició no definida"
 
-#: src/protocols/jabber/jabber.c:1298
+#: src/protocols/jabber/jabber.c:1262
 msgid "Unsupported Encoding"
 msgstr "Codificació no suportada"
 
-#: src/protocols/jabber/jabber.c:1300
+#: src/protocols/jabber/jabber.c:1264
 msgid "Unsupported Stanza Type"
 msgstr "Tipus de permanència no suportat"
 
-#: src/protocols/jabber/jabber.c:1302
+#: src/protocols/jabber/jabber.c:1266
 msgid "Unsupported Version"
 msgstr "Versió no suportada"
 
-#: src/protocols/jabber/jabber.c:1304
+#: src/protocols/jabber/jabber.c:1268
 msgid "XML Not Well Formed"
 msgstr "XML mal format"
 
-#: src/protocols/jabber/jabber.c:1306
+#: src/protocols/jabber/jabber.c:1270
 msgid "Stream Error"
 msgstr "Error de flux"
 
-#: src/protocols/jabber/jabber.c:1373
+#: src/protocols/jabber/jabber.c:1337
 #, c-format
 msgid "Unable to ban user %s"
 msgstr "No s'ha pogut proscriure l'usuari %s"
 
-#: src/protocols/jabber/jabber.c:1425
+#: src/protocols/jabber/jabber.c:1389
 #, c-format
 msgid "Unable to kick user %s"
 msgstr "No s'ha pogut fer fora l'usuari %s"
 
-#: src/protocols/jabber/jabber.c:1451
+#: src/protocols/jabber/jabber.c:1415
 msgid "config:  Configure a chat room."
 msgstr "config:  Configura la sala de xat."
 
-#: src/protocols/jabber/jabber.c:1455
+#: src/protocols/jabber/jabber.c:1419
 msgid "configure:  Configure a chat room."
 msgstr "configure:  Configura la sala de xat."
 
-#: src/protocols/jabber/jabber.c:1464
+#: src/protocols/jabber/jabber.c:1428
 msgid "part [room]:  Leave the room."
 msgstr "part [sala]:  Surt de la sala."
 
-#: src/protocols/jabber/jabber.c:1469
+#: src/protocols/jabber/jabber.c:1433
 msgid "register:  Register with a chat room."
 msgstr "register:  Registra a una sala de xat."
 
-#: src/protocols/jabber/jabber.c:1475
+#: src/protocols/jabber/jabber.c:1439
 msgid "topic [new topic]:  View or change the topic."
 msgstr "topic [tema nou]:  Mostra o canvia el tema."
 
-#: src/protocols/jabber/jabber.c:1481
+#: src/protocols/jabber/jabber.c:1445
 msgid "ban &lt;user&gt; [room]:  Ban a user from the room."
 msgstr "ban &lt;user&gt; [sala]:  Proscriu un usuari de la sala."
 
-#: src/protocols/jabber/jabber.c:1487
+#: src/protocols/jabber/jabber.c:1451
 msgid "invite &lt;user&gt; [room]:  Invite a user to the room."
 msgstr "invite &lt;usuari&gt; [sala]:  Convida un usuari a la sala."
 
-#: src/protocols/jabber/jabber.c:1493
+#: src/protocols/jabber/jabber.c:1457
 msgid "join: &lt;room&gt; [server]:  Join a chat on this server."
 msgstr "join: &lt;sala&gt; [servidor]:  Entra en un xat d'aquest servidor."
 
-#: src/protocols/jabber/jabber.c:1499
+#: src/protocols/jabber/jabber.c:1463
 msgid "kick &lt;user&gt; [room]:  Kick a user from the room."
 msgstr "kick &lt;usuari&gt; [sala]:  Fa fora de la sala un usuari."
 
-#: src/protocols/jabber/jabber.c:1504
+#: src/protocols/jabber/jabber.c:1468
 msgid ""
 "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
 msgstr ""
 "msg &lt;usuari&gt; &lt;missatge&gt;:  Envia un missatge privat a un altre "
 "usuari."
 
+#: src/protocols/jabber/jabber.c:1483
+msgid "Hide Operating System"
+msgstr "Oculta el sistema operatiu"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -6413,52 +6460,52 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/jabber/jabber.c:1585 src/protocols/jabber/jabber.c:1587
+#: src/protocols/jabber/jabber.c:1570 src/protocols/jabber/jabber.c:1572
 msgid "Jabber Protocol Plugin"
 msgstr "Connector per al protocol Jabber"
 
-#: src/protocols/jabber/jabber.c:1613
+#: src/protocols/jabber/jabber.c:1598
 msgid "Use TLS if available"
 msgstr "Usa TLS si està disponible"
 
-#: src/protocols/jabber/jabber.c:1618
+#: src/protocols/jabber/jabber.c:1603
 msgid "Force old SSL"
 msgstr "Força antic SSL"
 
-#: src/protocols/jabber/jabber.c:1623
+#: src/protocols/jabber/jabber.c:1608
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Permet autorització de text sobre fluxes sense xifrar"
 
 #. Account options
-#: src/protocols/jabber/jabber.c:1632 src/protocols/silc/silc.c:1589
+#: src/protocols/jabber/jabber.c:1617 src/protocols/silc/silc.c:1589
 msgid "Connect server"
 msgstr "Servidor on connectar-se"
 
-#: src/protocols/jabber/message.c:114
+#: src/protocols/jabber/message.c:111
 #, c-format
 msgid "Message from %s"
 msgstr "Missatge de %s"
 
-#: src/protocols/jabber/message.c:178
+#: src/protocols/jabber/message.c:175
 #, c-format
 msgid "%s has set the topic to: %s"
 msgstr "%s ha canviat el tema a: %s"
 
-#: src/protocols/jabber/message.c:180
+#: src/protocols/jabber/message.c:177
 #, c-format
 msgid "The topic is: %s"
 msgstr "El tema és: %s"
 
-#: src/protocols/jabber/message.c:233
+#: src/protocols/jabber/message.c:230
 #, c-format
 msgid "Message delivery to %s failed: %s"
 msgstr "No s'ha pogut fer arribar el missatge a %s: %s"
 
-#: src/protocols/jabber/message.c:236
+#: src/protocols/jabber/message.c:233
 msgid "Jabber Message Error"
 msgstr "Missatge d'error de Jabber"
 
-#: src/protocols/jabber/message.c:300
+#: src/protocols/jabber/message.c:297
 #, c-format
 msgid " (Code %s)"
 msgstr " (Codi %s)"
@@ -6467,30 +6514,20 @@
 msgid "XML Parse error"
 msgstr "Error en l'anàlisi de l'XML"
 
-#: src/protocols/jabber/presence.c:264
+#: src/protocols/jabber/presence.c:239
 msgid "Unknown Error in presence"
 msgstr "Error desconegut en la presència"
 
-#: src/protocols/jabber/presence.c:267
+#: src/protocols/jabber/presence.c:242
 #, c-format
 msgid "The user %s wants to add you to their buddy list."
 msgstr "L'usuari %s vol afegir-vos a la seva llista d'amics."
 
-#: src/protocols/jabber/presence.c:273 src/protocols/msn/userlist.c:102
-#: src/protocols/oscar/oscar.c:3861 src/protocols/oscar/oscar.c:6479
-msgid "Authorize"
-msgstr "Autoritza"
-
-#: src/protocols/jabber/presence.c:274 src/protocols/msn/userlist.c:103
-#: src/protocols/oscar/oscar.c:3863 src/protocols/oscar/oscar.c:6480
-msgid "Deny"
-msgstr "Denega"
-
-#: src/protocols/jabber/presence.c:321 src/protocols/jabber/presence.c:322
+#: src/protocols/jabber/presence.c:296 src/protocols/jabber/presence.c:297
 msgid "Create New Room"
 msgstr "Crea una nova sala"
 
-#: src/protocols/jabber/presence.c:323
+#: src/protocols/jabber/presence.c:298
 msgid ""
 "You are creating a new room.  Would you like to configure it, or accept the "
 "default settings?"
@@ -6498,20 +6535,20 @@
 "Ara es crearà una nova sala. Voleu configurar-la o acceptar els valors "
 "predeterminats?"
 
-#: src/protocols/jabber/presence.c:325
+#: src/protocols/jabber/presence.c:300
 msgid "Configure Room"
 msgstr "Configura la sala"
 
-#: src/protocols/jabber/presence.c:327
+#: src/protocols/jabber/presence.c:302
 msgid "Accept Defaults"
 msgstr "Accepta els valors predeterminats"
 
-#: src/protocols/jabber/presence.c:364
+#: src/protocols/jabber/presence.c:332
 #, c-format
 msgid "Error in chat %s"
 msgstr "S'ha produït un error en el xat %s"
 
-#: src/protocols/jabber/presence.c:367
+#: src/protocols/jabber/presence.c:335
 #, c-format
 msgid "Error joining chat %s"
 msgstr "S'ha produït un error en entrar al xat %s"
@@ -6594,7 +6631,7 @@
 msgid "Not on list"
 msgstr "No és a la llista"
 
-#: src/protocols/msn/error.c:70 src/protocols/zephyr/zephyr.c:681
+#: src/protocols/msn/error.c:70 src/protocols/zephyr/zephyr.c:680
 msgid "User is offline"
 msgstr "L'usuari està fora de línia"
 
@@ -6646,7 +6683,7 @@
 msgid "Too many hits to a FND"
 msgstr "Massa coincidències per un FND"
 
-#: src/protocols/msn/error.c:112 src/protocols/oscar/oscar.c:197
+#: src/protocols/msn/error.c:112 src/protocols/oscar/oscar.c:188
 msgid "Not logged in"
 msgstr "No està connectat"
 
@@ -6739,8 +6776,8 @@
 msgid "Server too busy"
 msgstr "El servidor està massa ocupat"
 
-#: src/protocols/msn/error.c:198 src/protocols/oscar/oscar.c:2258
-#: src/protocols/silc/ops.c:1498 src/protocols/toc/toc.c:631
+#: src/protocols/msn/error.c:198 src/protocols/oscar/oscar.c:2192
+#: src/protocols/silc/ops.c:1500 src/protocols/toc/toc.c:630
 msgid "Authentication failed"
 msgstr "Ha fallat l'autenticació"
 
@@ -6826,8 +6863,8 @@
 msgid "Page"
 msgstr "Pàgina"
 
-#: src/protocols/msn/msn.c:502 src/protocols/msn/msn.c:509
-#: src/protocols/msn/msn.c:512 src/protocols/yahoo/yahoo.c:2553
+#: src/protocols/msn/msn.c:488 src/protocols/msn/msn.c:496
+#: src/protocols/msn/msn.c:499 src/protocols/yahoo/yahoo.c:2728
 #, c-format
 msgid ""
 "\n"
@@ -6836,75 +6873,84 @@
 "\n"
 "<b>%s:</b> %s"
 
-#: src/protocols/msn/msn.c:509
+#: src/protocols/msn/msn.c:496
 msgid "Has you"
 msgstr "Us té"
 
-#: src/protocols/msn/msn.c:512
+#: src/protocols/msn/msn.c:499
 msgid "Blocked"
 msgstr "Blocat"
 
-#: src/protocols/msn/msn.c:543 src/protocols/msn/state.c:33
-#: src/protocols/yahoo/yahoo.c:2410 src/protocols/yahoo/yahoo.c:2919
+#: src/protocols/msn/msn.c:513 src/protocols/msn/msn.c:797
+#: src/protocols/msn/state.c:34
+msgid "Away From Computer"
+msgstr "Lluny de l'ordinador"
+
+#: src/protocols/msn/msn.c:514 src/protocols/msn/msn.c:799
+#: src/protocols/msn/state.c:33 src/protocols/yahoo/yahoo.c:2585
+#: src/protocols/yahoo/yahoo.c:2952 src/protocols/yahoo/yahoo.c:3068
 msgid "Be Right Back"
 msgstr "Tornaré de seguida"
 
-#: src/protocols/msn/msn.c:547 src/protocols/msn/state.c:31
-#: src/protocols/novell/novell.c:2814 src/protocols/novell/novell.c:2929
-#: src/protocols/novell/novell.c:2983 src/protocols/silc/buddy.c:1397
-#: src/protocols/silc/silc.c:54 src/protocols/yahoo/yahoo.c:2412
-#: src/protocols/yahoo/yahoo.c:2922
+#: src/protocols/msn/msn.c:515 src/protocols/msn/msn.c:801
+#: src/protocols/msn/state.c:31 src/protocols/novell/novell.c:2803
+#: src/protocols/novell/novell.c:2918 src/protocols/novell/novell.c:2972
+#: src/protocols/silc/buddy.c:1392 src/protocols/silc/silc.c:48
+#: src/protocols/silc/silc.c:83 src/protocols/yahoo/yahoo.c:2587
+#: src/protocols/yahoo/yahoo.c:2954 src/protocols/yahoo/yahoo.c:3069
 msgid "Busy"
 msgstr "Ocupat"
 
-#: src/protocols/msn/msn.c:551 src/protocols/msn/state.c:35
-#: src/protocols/yahoo/yahoo.c:2420 src/protocols/yahoo/yahoo.c:2934
+#: src/protocols/msn/msn.c:516 src/protocols/msn/msn.c:803
+#: src/protocols/msn/state.c:35 src/protocols/yahoo/yahoo.c:2595
+#: src/protocols/yahoo/yahoo.c:2962 src/protocols/yahoo/yahoo.c:3073
 msgid "On The Phone"
 msgstr "Al telèfon"
 
-#: src/protocols/msn/msn.c:555 src/protocols/msn/state.c:36
-#: src/protocols/yahoo/yahoo.c:2424 src/protocols/yahoo/yahoo.c:2940
+#: src/protocols/msn/msn.c:517 src/protocols/msn/msn.c:805
+#: src/protocols/msn/state.c:36 src/protocols/yahoo/yahoo.c:2599
+#: src/protocols/yahoo/yahoo.c:2966 src/protocols/yahoo/yahoo.c:3075
 msgid "Out To Lunch"
 msgstr "Fora esmorzant"
 
-#: src/protocols/msn/msn.c:559 src/protocols/zephyr/zephyr.c:2221
-#: src/status.c:159
+#: src/protocols/msn/msn.c:518 src/protocols/msn/msn.c:807
+#: src/protocols/zephyr/zephyr.c:2111 src/protocols/zephyr/zephyr.c:2143
 msgid "Hidden"
 msgstr "Ocult"
 
-#: src/protocols/msn/msn.c:571
+#: src/protocols/msn/msn.c:529
 msgid "Set Friendly Name"
 msgstr "Estableix el nom amistós"
 
-#: src/protocols/msn/msn.c:576
+#: src/protocols/msn/msn.c:534
 msgid "Set Home Phone Number"
 msgstr "Estableix el número de telèfon de casa"
 
-#: src/protocols/msn/msn.c:580
+#: src/protocols/msn/msn.c:538
 msgid "Set Work Phone Number"
 msgstr "Estableix el número de telèfon de la feina"
 
-#: src/protocols/msn/msn.c:584
+#: src/protocols/msn/msn.c:542
 msgid "Set Mobile Phone Number"
 msgstr "Estableix el número del telèfon mòbil"
 
-#: src/protocols/msn/msn.c:590
+#: src/protocols/msn/msn.c:548
 msgid "Enable/Disable Mobile Devices"
 msgstr "Habilita/inhabilita dispositius mòbils"
 
-#: src/protocols/msn/msn.c:595
+#: src/protocols/msn/msn.c:553
 msgid "Allow/Disallow Mobile Pages"
 msgstr "Permet/denega pàgines de mòbil"
 
-#: src/protocols/msn/msn.c:618
+#: src/protocols/msn/msn.c:576
 msgid "Send to Mobile"
 msgstr "Envia a un mòbil"
 
-#: src/protocols/msn/msn.c:627 src/protocols/novell/novell.c:3380
+#: src/protocols/msn/msn.c:585 src/protocols/novell/novell.c:3369
 msgid "Initiate _Chat"
 msgstr "Inicia un _xat"
 
-#: src/protocols/msn/msn.c:663
+#: src/protocols/msn/msn.c:621
 msgid ""
 "SSL support is needed for MSN. Please install a supported SSL library. See "
 "http://gaim.sf.net/faq-ssl.php for more information."
@@ -6912,95 +6958,95 @@
 "L'MSN necessita SSL, instal·leu alguna biblioteca d'SSL suportada. Vegeu "
 "http://gaim.sf.net/faq-ssl.php (en anglès) per a més informació."
 
-#: src/protocols/msn/msn.c:691
+#: src/protocols/msn/msn.c:649
 msgid "Failed to connect to server."
 msgstr "No s'ha pogut connectar al servidor."
 
-#: src/protocols/msn/msn.c:1330 src/protocols/yahoo/yahoo_profile.c:659
-#: src/protocols/zephyr/zephyr.c:712 src/protocols/zephyr/zephyr.c:1126
+#: src/protocols/msn/msn.c:1304 src/protocols/yahoo/yahoo_profile.c:659
+#: src/protocols/zephyr/zephyr.c:711 src/protocols/zephyr/zephyr.c:1120
 #, c-format
 msgid "<b>Alias:</b> %s<br>"
 msgstr "<b>Àlies:</b> %s<br>"
 
 #. put a link to the actual profile URL
-#: src/protocols/msn/msn.c:1337 src/protocols/msn/msn.c:1684
-#: src/protocols/yahoo/yahoo_profile.c:1170 src/util.c:787
+#: src/protocols/msn/msn.c:1312 src/protocols/msn/msn.c:1670
+#: src/protocols/yahoo/yahoo_profile.c:1168 src/util.c:782
 #, c-format
 msgid "<b>%s:</b> "
 msgstr "<b>%s:</b> "
 
-#: src/protocols/msn/msn.c:1414
+#: src/protocols/msn/msn.c:1400
 msgid "MSN Profile"
 msgstr "Perfil MSN"
 
-#: src/protocols/msn/msn.c:1419 src/protocols/msn/msn.c:1671
-#: src/protocols/yahoo/yahoo_profile.c:763
+#: src/protocols/msn/msn.c:1405 src/protocols/msn/msn.c:1657
+#: src/protocols/yahoo/yahoo_profile.c:761
 msgid "Error retrieving profile"
 msgstr "S'ha produït un error en recuperar el perfil"
 
 #. Age
-#: src/protocols/msn/msn.c:1490 src/protocols/oscar/oscar.c:5236
+#: src/protocols/msn/msn.c:1476 src/protocols/oscar/oscar.c:5135
 #: src/protocols/trepia/trepia.c:286 src/protocols/trepia/trepia.c:405
-#: src/protocols/yahoo/yahoo_profile.c:1017
+#: src/protocols/yahoo/yahoo_profile.c:1015
 msgid "Age"
 msgstr "Edat"
 
 #. Gender
-#: src/protocols/msn/msn.c:1497 src/protocols/oscar/oscar.c:5223
+#: src/protocols/msn/msn.c:1483 src/protocols/oscar/oscar.c:5121
 #: src/protocols/trepia/trepia.c:280 src/protocols/trepia/trepia.c:407
-#: src/protocols/yahoo/yahoo_profile.c:1027
+#: src/protocols/yahoo/yahoo_profile.c:1025
 msgid "Gender"
 msgstr "Sexe"
 
-#: src/protocols/msn/msn.c:1506 src/protocols/yahoo/yahoo_profile.c:1022
+#: src/protocols/msn/msn.c:1492 src/protocols/yahoo/yahoo_profile.c:1020
 msgid "Marital Status"
 msgstr "Estat civil"
 
-#: src/protocols/msn/msn.c:1513 src/protocols/novell/novell.c:1454
-#: src/protocols/yahoo/yahoo_profile.c:1012
+#: src/protocols/msn/msn.c:1499 src/protocols/novell/novell.c:1445
+#: src/protocols/yahoo/yahoo_profile.c:1010
 msgid "Location"
 msgstr "Ubicació"
 
-#: src/protocols/msn/msn.c:1521 src/protocols/yahoo/yahoo_profile.c:1032
+#: src/protocols/msn/msn.c:1507 src/protocols/yahoo/yahoo_profile.c:1030
 msgid "Occupation"
 msgstr "Ocupació"
 
-#: src/protocols/msn/msn.c:1538 src/protocols/msn/msn.c:1544
-#: src/protocols/msn/msn.c:1551 src/protocols/msn/msn.c:1559
-#: src/protocols/msn/msn.c:1566
+#: src/protocols/msn/msn.c:1524 src/protocols/msn/msn.c:1530
+#: src/protocols/msn/msn.c:1537 src/protocols/msn/msn.c:1545
+#: src/protocols/msn/msn.c:1552
 msgid "A Little About Me"
 msgstr "Una mica sobre mi"
 
-#: src/protocols/msn/msn.c:1575 src/protocols/msn/msn.c:1581
-#: src/protocols/msn/msn.c:1588 src/protocols/msn/msn.c:1595
+#: src/protocols/msn/msn.c:1561 src/protocols/msn/msn.c:1567
+#: src/protocols/msn/msn.c:1574 src/protocols/msn/msn.c:1581
 msgid "Favorite Things"
 msgstr "Coses preferides"
 
-#: src/protocols/msn/msn.c:1604 src/protocols/msn/msn.c:1610
-#: src/protocols/msn/msn.c:1617
+#: src/protocols/msn/msn.c:1590 src/protocols/msn/msn.c:1596
+#: src/protocols/msn/msn.c:1603
 msgid "Hobbies and Interests"
 msgstr "Aficions i interessos"
 
-#: src/protocols/msn/msn.c:1626 src/protocols/msn/msn.c:1632
-#: src/protocols/yahoo/yahoo_profile.c:1074
+#: src/protocols/msn/msn.c:1612 src/protocols/msn/msn.c:1618
+#: src/protocols/yahoo/yahoo_profile.c:1072
 msgid "Favorite Quote"
 msgstr "Cita textual favorita"
 
-#: src/protocols/msn/msn.c:1640 src/protocols/yahoo/yahoo_profile.c:1125
+#: src/protocols/msn/msn.c:1626 src/protocols/yahoo/yahoo_profile.c:1123
 msgid "Last Updated"
 msgstr "Última actualització"
 
 #. Homepage
-#: src/protocols/msn/msn.c:1651 src/protocols/silc/ops.c:846
+#: src/protocols/msn/msn.c:1637 src/protocols/silc/ops.c:844
 #: src/protocols/trepia/trepia.c:290 src/protocols/trepia/trepia.c:420
 msgid "Homepage"
 msgstr "Pàgina web"
 
-#: src/protocols/msn/msn.c:1673
+#: src/protocols/msn/msn.c:1659
 msgid "The user has not created a public profile."
 msgstr "L'usuari no ha creat cap perfil públic."
 
-#: src/protocols/msn/msn.c:1674
+#: src/protocols/msn/msn.c:1660
 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 "
@@ -7009,7 +7055,7 @@
 "L'MSN no ha pogut trobar el perfil de l'usuari. Això pot voler dir que o bé "
 "l'usuari no existeix, o que existeix però el seu perfil no és públic."
 
-#: src/protocols/msn/msn.c:1678
+#: src/protocols/msn/msn.c:1664
 msgid ""
 "Gaim could not find any information in the user's profile. The user most "
 "likely does not exist."
@@ -7017,10 +7063,18 @@
 "El Gaim no ha pogut trobar informació del perfil de l'usuari. El més segur "
 "és que l'usuari no existeixi."
 
-#: src/protocols/msn/msn.c:1684 src/protocols/yahoo/yahoo_profile.c:1170
+#: src/protocols/msn/msn.c:1670 src/protocols/yahoo/yahoo_profile.c:1168
 msgid "Profile URL"
 msgstr "URL del perfil"
 
+#: src/protocols/msn/msn.c:1811
+msgid "Display conversation closed notices"
+msgstr "Mostra notícies tancades de la conversa"
+
+#: src/protocols/msn/msn.c:1816
+msgid "Display timeout notices"
+msgstr "Mostra notificacions de temps excedit"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -7031,20 +7085,20 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/msn/msn.c:1889 src/protocols/msn/msn.c:1891
+#: src/protocols/msn/msn.c:1903 src/protocols/msn/msn.c:1905
 msgid "MSN Protocol Plugin"
 msgstr "Connector per al protocol MSN"
 
-#: src/protocols/msn/msn.c:1910 src/protocols/trepia/trepia.c:1298
+#: src/protocols/msn/msn.c:1924 src/protocols/trepia/trepia.c:1296
 msgid "Login server"
 msgstr "Servidor d'entrada"
 
-#: src/protocols/msn/msn.c:1919
+#: src/protocols/msn/msn.c:1933
 msgid "Use HTTP Method"
 msgstr "Usa el mètode HTTP"
 
 #: src/protocols/msn/nexus.c:103 src/protocols/msn/servconn.c:127
-#: src/protocols/yahoo/yahoochat.c:1312
+#: src/protocols/yahoo/yahoochat.c:1357
 msgid "Unable to connect"
 msgstr "No s'ha pogut connectar"
 
@@ -7054,7 +7108,7 @@
 msgstr "%s no és un nom de grup vàlid"
 
 #: src/protocols/msn/notification.c:184 src/protocols/msn/notification.c:522
-#: src/protocols/msn/session.c:344
+#: src/protocols/msn/session.c:346
 msgid "Unknown error."
 msgstr "Error desconegut."
 
@@ -7089,15 +7143,15 @@
 msgid "%s is not a valid passport account."
 msgstr "%s no és un compte de passaport vàlid."
 
-#: src/protocols/msn/notification.c:774
+#: src/protocols/msn/notification.c:773
 msgid "Unable to rename group"
 msgstr "No s'ha pogut canviar el nom del grup"
 
-#: src/protocols/msn/notification.c:829
+#: src/protocols/msn/notification.c:828
 msgid "Unable to delete group"
 msgstr "No s'ha pogut suprimir el grup"
 
-#: src/protocols/msn/notification.c:1254
+#: src/protocols/msn/notification.c:1255
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -7134,8 +7188,8 @@
 msgid "Reading error"
 msgstr "Error en llegir"
 
-#: src/protocols/msn/servconn.c:133 src/protocols/msn/session.c:336
-#: src/protocols/oscar/oscar.c:4184
+#: src/protocols/msn/servconn.c:133 src/protocols/msn/session.c:338
+#: src/protocols/oscar/oscar.c:4118
 msgid "Unknown error"
 msgstr "Error desconegut"
 
@@ -7148,111 +7202,111 @@
 "S'ha produït un error de connexió del servidor %s (%s):\n"
 "%s"
 
-#: src/protocols/msn/session.c:314
+#: src/protocols/msn/session.c:316
 msgid "Our protocol is not supported by the server."
 msgstr "El servidor no implementa el nostre protocol."
 
-#: src/protocols/msn/session.c:318
+#: src/protocols/msn/session.c:320
 msgid "Error parsing HTTP."
 msgstr "S'ha produït un error en analitzar HTTP."
 
-#: src/protocols/msn/session.c:322
+#: src/protocols/msn/session.c:324
 msgid "You have signed on from another location."
 msgstr "Us heu connectat des d'un altre lloc."
 
-#: src/protocols/msn/session.c:325
+#: src/protocols/msn/session.c:327
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr ""
 "Els servidors MSN estan temporalment no disponibles. Espereu i proveu-ho més "
 "tard."
 
-#: src/protocols/msn/session.c:330
+#: src/protocols/msn/session.c:332
 msgid "The MSN servers are going down temporarily."
 msgstr "Els servidors MSN no seran accessibles temporalment."
 
-#: src/protocols/msn/session.c:334
+#: src/protocols/msn/session.c:336
 #, c-format
 msgid "Unable to authenticate: %s"
 msgstr "No s'ha pogut autenticar: %s"
 
-#: src/protocols/msn/session.c:339
+#: src/protocols/msn/session.c:341
 msgid ""
 "Your MSN buddy list is temporarily unavailable. Please wait and try again."
 msgstr ""
 "La llista d'amics MSN està temporalment no disponible. Espereu i proveu-ho "
 "més tard."
 
-#: src/protocols/msn/session.c:360 src/protocols/msn/session.c:362
+#: src/protocols/msn/session.c:362 src/protocols/msn/session.c:364
 msgid "Handshaking"
 msgstr "S'stà comprovant la conformitat de connexió"
 
-#: src/protocols/msn/session.c:361
+#: src/protocols/msn/session.c:363
 msgid "Transferring"
 msgstr "S'està transferint"
 
-#: src/protocols/msn/session.c:363
+#: src/protocols/msn/session.c:365
 msgid "Starting authentication"
 msgstr "S'està iniciant l'autenticació"
 
-#: src/protocols/msn/session.c:364
+#: src/protocols/msn/session.c:366
 msgid "Getting cookie"
 msgstr "S'està obtenint la galeta"
 
-#: src/protocols/msn/session.c:366
+#: src/protocols/msn/session.c:368
 msgid "Sending cookie"
 msgstr "S'està enviant la galeta"
 
-#: src/protocols/msn/session.c:367 src/protocols/trepia/trepia.c:636
+#: src/protocols/msn/session.c:369 src/protocols/trepia/trepia.c:636
 msgid "Retrieving buddy list"
 msgstr "S'está recuperant la llista d'amics"
 
-#: src/protocols/msn/state.c:34
-msgid "Away From Computer"
-msgstr "Lluny de l'ordinador"
-
-#: src/protocols/msn/switchboard.c:377
+#: src/protocols/msn/switchboard.c:373
 msgid "Message may have not been sent because a timeout occurred:"
 msgstr ""
 "És possible que no s'hagi pogut enviar el missatge perquè el temps ha "
 "expirat:"
 
-#: src/protocols/msn/switchboard.c:385
+#: src/protocols/msn/switchboard.c:381
 msgid "Message could not be sent, not allowed while invisible:"
 msgstr ""
 "No s'ha pogut enviar el missatatge, no està permès mentre esteu invisible:"
 
-#: src/protocols/msn/switchboard.c:389
+#: src/protocols/msn/switchboard.c:385
 msgid "Message could not be sent because the user is offline:"
 msgstr "El missatge no s'ha pogut enviar perquè l'usuari està fora de línia:"
 
-#: src/protocols/msn/switchboard.c:393
+#: src/protocols/msn/switchboard.c:389
 msgid "Message could not be sent because a connection error occurred:"
 msgstr ""
 "No s'ha pogut enviar el missatge perquè s'ha produït un error en la connexió:"
 
-#: src/protocols/msn/switchboard.c:397
+#: src/protocols/msn/switchboard.c:393
 msgid ""
 "Message could not be sent because an error with the switchboard occurred:"
 msgstr ""
 "No s'ha pogut enviar el missatge perquè s'ha produït un error en la "
 "centraleta:"
 
-#: src/protocols/msn/switchboard.c:405
+#: src/protocols/msn/switchboard.c:401
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr ""
 "No s'ha pogut enviar el missatge perquè s'ha produït un error desconegut:"
 
-#: src/protocols/msn/switchboard.c:647
+#: src/protocols/msn/switchboard.c:636
+msgid "The conversation has become inactive and timed out."
+msgstr "La conversa ha esdevingut inactiva i el temps ha expirat."
+
+#: src/protocols/msn/switchboard.c:655
 #, c-format
 msgid "%s has closed the conversation window."
 msgstr "%s ha tancat la finestra de conversa."
 
-#: src/protocols/msn/userlist.c:86
+#: src/protocols/msn/userlist.c:87
 #, c-format
 msgid "The user %s (%s) wants to add %s to his or her buddy list."
 msgstr "L'usuari %s (%s) vol afegir %s a la seva llista d'amics"
 
-#: src/protocols/msn/userlist.c:95
+#: src/protocols/msn/userlist.c:96
 #, c-format
 msgid "The user %s wants to add %s to his or her buddy list."
 msgstr "L'usuari %s vol afegir %s a la seva llista d'amics."
@@ -7302,7 +7356,7 @@
 msgid "%s requested a PING"
 msgstr "%s ha sol·licitat un PING"
 
-#: src/protocols/napster/napster.c:573 src/protocols/toc/toc.c:1277
+#: src/protocols/napster/napster.c:552 src/protocols/toc/toc.c:1268
 msgid "_Group:"
 msgstr "_Grup:"
 
@@ -7316,7 +7370,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/napster/napster.c:671 src/protocols/napster/napster.c:673
+#: src/protocols/napster/napster.c:650 src/protocols/napster/napster.c:652
 msgid "NAPSTER Protocol Plugin"
 msgstr "Connector per al protocol Napster"
 
@@ -7454,43 +7508,43 @@
 msgid "Login failed (%s)."
 msgstr "Ha fallat l'entrada (%s)."
 
-#: src/protocols/novell/novell.c:232
+#: src/protocols/novell/novell.c:230
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
 msgstr ""
 "No s'ha pogut enviar el missatge. No s'han pogut obtenir detalls de l'usuari "
 "(%s)."
 
-#: src/protocols/novell/novell.c:381
+#: src/protocols/novell/novell.c:379
 #, c-format
 msgid "Unable to add %s to your buddy list (%s)."
 msgstr "No s'ha pogut afegir %s a la vostra llista d'amics (%s)."
 
 #. TODO: Improve this! message to who or for what conference?
-#: src/protocols/novell/novell.c:407
+#: src/protocols/novell/novell.c:405
 #, c-format
 msgid "Unable to send message (%s)."
 msgstr "No s'ha pogut enviar el missatge (%s)."
 
-#: src/protocols/novell/novell.c:478 src/protocols/novell/novell.c:972
+#: src/protocols/novell/novell.c:476 src/protocols/novell/novell.c:970
 #, c-format
 msgid "Unable to invite user (%s)."
 msgstr "No s'ha pogut convidar l'usuari (%s)."
 
-#: src/protocols/novell/novell.c:517
+#: src/protocols/novell/novell.c:515
 #, c-format
 msgid "Unable to send message to %s. Could not create the conference (%s)."
 msgstr ""
 "No s'ha pogut enviar el missatge a %s. No s'ha pogut crear la conferència (%"
 "s)."
 
-#: src/protocols/novell/novell.c:522
+#: src/protocols/novell/novell.c:520
 #, c-format
 msgid "Unable to send message. Could not create the conference (%s)."
 msgstr ""
 "No s'ha pogut enviar el missatge. No s'ha pogut crear la conferència (%s)."
 
-#: src/protocols/novell/novell.c:569
+#: src/protocols/novell/novell.c:567
 #, c-format
 msgid ""
 "Unable to move user %s to folder %s in the server side list. Error while "
@@ -7499,7 +7553,7 @@
 "No s'ha pogut moure l'usuari %s a la carpeta %s a la part del servidor. S'ha "
 "produït un error en crear la carpeta (%s)."
 
-#: src/protocols/novell/novell.c:617
+#: src/protocols/novell/novell.c:615
 #, c-format
 msgid ""
 "Unable to add %s to your buddy list. Error creating folder in server side "
@@ -7508,71 +7562,71 @@
 "No s'ha pogut afegir %s a la vostra llista d'amics. S'ha produït un error en "
 "crear la carpeta a la part del servidor (%s)."
 
-#: src/protocols/novell/novell.c:690
+#: src/protocols/novell/novell.c:688
 #, c-format
 msgid "Could not get details for user %s (%s)."
 msgstr "No s'han pogut obtenir detalls de l'usuari %s (%s)."
 
-#: src/protocols/novell/novell.c:736 src/protocols/novell/novell.c:882
+#: src/protocols/novell/novell.c:734 src/protocols/novell/novell.c:880
 #, c-format
 msgid "Unable to add user to privacy list (%s)."
 msgstr "No s'ha pogut afegir l'usuari a la llista de privadesa (%s)."
 
-#: src/protocols/novell/novell.c:783
+#: src/protocols/novell/novell.c:781
 #, c-format
 msgid "Unable to add %s to deny list (%s)."
 msgstr "No s'ha pogut afegir %s a la llista de denegats (%s)."
 
-#: src/protocols/novell/novell.c:836
+#: src/protocols/novell/novell.c:834
 #, c-format
 msgid "Unable to add %s to permit list (%s)."
 msgstr "No s'ha pogut afegir %s a la llista de permesos (%s)."
 
-#: src/protocols/novell/novell.c:904
+#: src/protocols/novell/novell.c:902
 #, c-format
 msgid "Unable to remove %s from privacy list (%s)."
 msgstr "No s'ha pogut suprimir %s de la llista de privadesa (%s)."
 
-#: src/protocols/novell/novell.c:927 src/protocols/novell/novell.c:1629
+#: src/protocols/novell/novell.c:925 src/protocols/novell/novell.c:1620
 #, c-format
 msgid "Unable to change server side privacy settings (%s)."
 msgstr ""
 "No s'han pogut canviar els paràmetres de privadesa en la part del servidor (%"
 "s)."
 
-#: src/protocols/novell/novell.c:999
+#: src/protocols/novell/novell.c:997
 #, c-format
 msgid "Unable to create conference (%s)."
 msgstr "No s'ha pogut crear la conferència (%s)."
 
-#: src/protocols/novell/novell.c:1110 src/protocols/novell/novell.c:1668
+#: src/protocols/novell/novell.c:1108 src/protocols/novell/novell.c:1659
 msgid "Error communicating with server. Closing connection."
 msgstr ""
 "S'ha produït un error en la comunicació amb el servidor. S'està tancant la "
 "connexió."
 
-#: src/protocols/novell/novell.c:1452
+#: src/protocols/novell/novell.c:1443
 msgid "Telephone Number"
 msgstr "Número de telèfon"
 
-#: src/protocols/novell/novell.c:1456
+#: src/protocols/novell/novell.c:1447
 msgid "Department"
 msgstr "Department"
 
-#: src/protocols/novell/novell.c:1458
+#: src/protocols/novell/novell.c:1449
 msgid "Personal Title"
 msgstr "Títol personal"
 
-#: src/protocols/novell/novell.c:1462
+#: src/protocols/novell/novell.c:1453
 msgid "Mailstop"
 msgstr "Oficina de correu electrònic"
 
-#: src/protocols/novell/novell.c:1464 src/protocols/oscar/oscar.c:5209
-#: src/protocols/oscar/oscar.c:5216
+#: src/protocols/novell/novell.c:1455 src/protocols/oscar/oscar.c:5108
+#: src/protocols/oscar/oscar.c:5115
 msgid "Email Address"
 msgstr "Adreça de correu"
 
-#: src/protocols/novell/novell.c:1480
+#: src/protocols/novell/novell.c:1471
 msgid "User ID"
 msgstr "ID de l'usuari"
 
@@ -7583,46 +7637,46 @@
 #. tag, value);
 #. }
 #.
-#: src/protocols/novell/novell.c:1494
+#: src/protocols/novell/novell.c:1485
 msgid "Full name"
 msgstr "Nom"
 
-#: src/protocols/novell/novell.c:1515
+#: src/protocols/novell/novell.c:1506
 msgid "User Properties"
 msgstr "Propietat de l'usuari"
 
-#: src/protocols/novell/novell.c:1619
+#: src/protocols/novell/novell.c:1610
 #, c-format
 msgid "GroupWise Conference %d"
 msgstr "Conferència GroupWise %d"
 
-#: src/protocols/novell/novell.c:1644
+#: src/protocols/novell/novell.c:1635
 msgid "Unable to make SSL connection to server."
 msgstr "No s'ha pogut fer una connexió SSL al servidor."
 
-#: src/protocols/novell/novell.c:1674
+#: src/protocols/novell/novell.c:1665
 #, c-format
 msgid "Error processing event or response (%s)."
 msgstr "S'ha produït un error en processar una incidència o resposta (%s)."
 
-#: src/protocols/novell/novell.c:1708
+#: src/protocols/novell/novell.c:1699
 msgid "Authenticating..."
 msgstr "S'està autenticant..."
 
-#: src/protocols/novell/novell.c:1723
+#: src/protocols/novell/novell.c:1714
 msgid "Waiting for response..."
 msgstr "S'està esperant una resposta..."
 
-#: src/protocols/novell/novell.c:1858
+#: src/protocols/novell/novell.c:1849
 #, c-format
 msgid "%s has been invited to this conversation."
 msgstr "S'ha convidat a %s a aquesta conversa."
 
-#: src/protocols/novell/novell.c:1885
+#: src/protocols/novell/novell.c:1876
 msgid "Invitation to Conversation"
 msgstr "Invitació a la conversa"
 
-#: src/protocols/novell/novell.c:1886
+#: src/protocols/novell/novell.c:1877
 #, c-format
 msgid ""
 "Invitation from: %s\n"
@@ -7633,17 +7687,17 @@
 "\n"
 "Ha enviat: %s"
 
-#: src/protocols/novell/novell.c:1888
+#: src/protocols/novell/novell.c:1879
 msgid "Would you like to join the conversation?"
 msgstr "Voleu afegir-vos a la conversa?"
 
-#: src/protocols/novell/novell.c:1994
+#: src/protocols/novell/novell.c:1985
 msgid "You have been logged out because you logged in at another workstation."
 msgstr ""
 "Se us ha desconnectat perquè us heu entrat a través d'una altra estació de "
 "treball."
 
-#: src/protocols/novell/novell.c:2050
+#: src/protocols/novell/novell.c:2039
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
@@ -7655,7 +7709,7 @@
 #. *  gaim_request_fields(gc, _("Server Address"),...);
 #.
 #. ...but for now just error out with a nice message.
-#: src/protocols/novell/novell.c:2148
+#: src/protocols/novell/novell.c:2137
 msgid ""
 "Unable to connect to server. Please enter the address of the server you wish "
 "to connect to."
@@ -7663,15 +7717,24 @@
 "No s'ha pogut connectar al servidor. Entreu l'adreça del servidor al que us "
 "vulgueu connectar."
 
-#: src/protocols/novell/novell.c:2170
+#: src/protocols/novell/novell.c:2159
 msgid "Error. SSL support is not installed."
 msgstr "Error. El suport per a SLL no està instal·lat."
 
-#: src/protocols/novell/novell.c:2474
+#: src/protocols/novell/novell.c:2463
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "S'ha tancat aquesta conferència. No s'hi poden enviar més missatges."
 
-#: src/protocols/novell/novell.c:2930 src/protocols/novell/novell.c:2986
+#: src/protocols/novell/novell.c:2809 src/protocols/oscar/oscar.c:733
+#: src/protocols/oscar/oscar.c:6701 src/protocols/yahoo/yahoo.c:2607
+msgid "Offline"
+msgstr "Fora de línia"
+
+#: src/protocols/novell/novell.c:2820
+msgid "Message"
+msgstr "Missatge"
+
+#: src/protocols/novell/novell.c:2919 src/protocols/novell/novell.c:2975
 msgid "Appear Offline"
 msgstr "Simula estar fora de línia"
 
@@ -7685,115 +7748,115 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/novell/novell.c:3479 src/protocols/novell/novell.c:3481
+#: src/protocols/novell/novell.c:3468 src/protocols/novell/novell.c:3470
 msgid "Novell GroupWise Messenger Protocol Plugin"
 msgstr "Connector per al protocol Novel GroupWise Messenger"
 
-#: src/protocols/novell/novell.c:3500
+#: src/protocols/novell/novell.c:3489
 msgid "Server address"
 msgstr "Adreça del servidor"
 
-#: src/protocols/novell/novell.c:3504
+#: src/protocols/novell/novell.c:3493
 msgid "Server port"
 msgstr "Port en el servidor"
 
-#: src/protocols/oscar/oscar.c:193
+#: src/protocols/oscar/oscar.c:184
 msgid "Invalid error"
 msgstr "Error invàlid"
 
-#: src/protocols/oscar/oscar.c:194
+#: src/protocols/oscar/oscar.c:185
 msgid "Invalid SNAC"
 msgstr "SNAC invàlid"
 
-#: src/protocols/oscar/oscar.c:195
+#: src/protocols/oscar/oscar.c:186
 msgid "Rate to host"
 msgstr "Ràtio a l'ordinador"
 
-#: src/protocols/oscar/oscar.c:196
+#: src/protocols/oscar/oscar.c:187
 msgid "Rate to client"
 msgstr "Ràtio al client"
 
-#: src/protocols/oscar/oscar.c:198
+#: src/protocols/oscar/oscar.c:189
 msgid "Service unavailable"
 msgstr "Servei no disponible"
 
-#: src/protocols/oscar/oscar.c:199
+#: src/protocols/oscar/oscar.c:190
 msgid "Service not defined"
 msgstr "Servei no definit"
 
-#: src/protocols/oscar/oscar.c:200
+#: src/protocols/oscar/oscar.c:191
 msgid "Obsolete SNAC"
 msgstr "SNAC obsolet"
 
-#: src/protocols/oscar/oscar.c:201
+#: src/protocols/oscar/oscar.c:192
 msgid "Not supported by host"
 msgstr "No està suportat pel servidor"
 
-#: src/protocols/oscar/oscar.c:202
+#: src/protocols/oscar/oscar.c:193
 msgid "Not supported by client"
 msgstr "No està suportat pel client"
 
-#: src/protocols/oscar/oscar.c:203
+#: src/protocols/oscar/oscar.c:194
 msgid "Refused by client"
 msgstr "Rebutjat pel client"
 
-#: src/protocols/oscar/oscar.c:204
+#: src/protocols/oscar/oscar.c:195
 msgid "Reply too big"
 msgstr "Resposta massa gran"
 
-#: src/protocols/oscar/oscar.c:205
+#: src/protocols/oscar/oscar.c:196
 msgid "Responses lost"
 msgstr "S'han perdut respostes"
 
-#: src/protocols/oscar/oscar.c:206
+#: src/protocols/oscar/oscar.c:197
 msgid "Request denied"
 msgstr "Petició denegada"
 
-#: src/protocols/oscar/oscar.c:207
+#: src/protocols/oscar/oscar.c:198
 msgid "Busted SNAC payload"
 msgstr "Càrrega SNAC malmesa"
 
-#: src/protocols/oscar/oscar.c:208
+#: src/protocols/oscar/oscar.c:199
 msgid "Insufficient rights"
 msgstr "Drets insuficients"
 
-#: src/protocols/oscar/oscar.c:209
+#: src/protocols/oscar/oscar.c:200
 msgid "In local permit/deny"
 msgstr "En la llista de permès/denegat local"
 
-#: src/protocols/oscar/oscar.c:210
+#: src/protocols/oscar/oscar.c:201
 msgid "Too evil (sender)"
 msgstr "Massa malvat (remitent)"
 
-#: src/protocols/oscar/oscar.c:211
+#: src/protocols/oscar/oscar.c:202
 msgid "Too evil (receiver)"
 msgstr "Massa malvat (receptor)"
 
-#: src/protocols/oscar/oscar.c:212
+#: src/protocols/oscar/oscar.c:203
 msgid "User temporarily unavailable"
 msgstr "Usuari no disponible temporalment"
 
-#: src/protocols/oscar/oscar.c:213
+#: src/protocols/oscar/oscar.c:204
 msgid "No match"
 msgstr "Cap coincidència"
 
-#: src/protocols/oscar/oscar.c:214
+#: src/protocols/oscar/oscar.c:205
 msgid "List overflow"
 msgstr "Sobreeiximent de la llista"
 
-#: src/protocols/oscar/oscar.c:215
+#: src/protocols/oscar/oscar.c:206
 msgid "Request ambiguous"
 msgstr "Petició ambigua"
 
-#: src/protocols/oscar/oscar.c:216
+#: src/protocols/oscar/oscar.c:207
 msgid "Queue full"
 msgstr "Cua plena"
 
-#: src/protocols/oscar/oscar.c:217
+#: src/protocols/oscar/oscar.c:208
 msgid "Not while on AOL"
 msgstr "No es pot fer mentre estigui a AOL"
 
-#: src/protocols/oscar/oscar.c:406 src/protocols/oscar/oscar.c:489
+#: src/protocols/oscar/oscar.c:403 src/protocols/oscar/oscar.c:486
 msgid ""
 "(There was an error receiving this message.  The buddy you are speaking to "
 "most likely has a buggy client.)"
@@ -7801,155 +7864,158 @@
 "(S'ha produït un error en rebre aquest missatge. És molt possible que l'amic "
 "amb qui parleu tingui un client defectuós)"
 
-#: src/protocols/oscar/oscar.c:600
+#: src/protocols/oscar/oscar.c:588
 msgid "Voice"
 msgstr "Veu"
 
-#: src/protocols/oscar/oscar.c:603
+#: src/protocols/oscar/oscar.c:591
 msgid "AIM Direct IM"
 msgstr "MI AIM directes"
 
-#: src/protocols/oscar/oscar.c:606 src/protocols/silc/silc.c:649
+#: src/protocols/oscar/oscar.c:594 src/protocols/silc/silc.c:646
 #: src/protocols/silc/util.c:506
 msgid "Chat"
 msgstr "Xat"
 
-#: src/protocols/oscar/oscar.c:609 src/protocols/oscar/oscar.c:7176
+#: src/protocols/oscar/oscar.c:597 src/protocols/oscar/oscar.c:7003
 msgid "Get File"
 msgstr "Obtingues fitxer"
 
-#: src/protocols/oscar/oscar.c:616
+#: src/protocols/oscar/oscar.c:604
 msgid "Games"
 msgstr "Jocs"
 
-#: src/protocols/oscar/oscar.c:619
+#: src/protocols/oscar/oscar.c:607
 msgid "Add-Ins"
 msgstr "Afegits"
 
-#: src/protocols/oscar/oscar.c:622
+#: src/protocols/oscar/oscar.c:610
 msgid "Send Buddy List"
 msgstr "Envia la llista d'amics"
 
-#: src/protocols/oscar/oscar.c:625
+#: src/protocols/oscar/oscar.c:613
 msgid "ICQ Direct Connect"
 msgstr "Connexió directa a ICQ"
 
-#: src/protocols/oscar/oscar.c:628
+#: src/protocols/oscar/oscar.c:616
 msgid "AP User"
 msgstr "Usuari AP"
 
-#: src/protocols/oscar/oscar.c:631
+#: src/protocols/oscar/oscar.c:619
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
-#: src/protocols/oscar/oscar.c:634
+#: src/protocols/oscar/oscar.c:622
 msgid "Nihilist"
 msgstr "Nihilista"
 
-#: src/protocols/oscar/oscar.c:637
+#: src/protocols/oscar/oscar.c:625
 msgid "ICQ Server Relay"
 msgstr "Servidor repetidor d'ICQ"
 
-#: src/protocols/oscar/oscar.c:640
+#: src/protocols/oscar/oscar.c:628
 msgid "Old ICQ UTF8"
 msgstr "Antic ICQ UTF8"
 
-#: src/protocols/oscar/oscar.c:643
+#: src/protocols/oscar/oscar.c:631
 msgid "Trillian Encryption"
 msgstr "Xifrat Trillian"
 
-#: src/protocols/oscar/oscar.c:646
+#: src/protocols/oscar/oscar.c:634
 msgid "ICQ UTF8"
 msgstr "ICQ UTF8"
 
-#: src/protocols/oscar/oscar.c:649
+#: src/protocols/oscar/oscar.c:637
 msgid "Hiptop"
 msgstr "Hiptop"
 
-#: src/protocols/oscar/oscar.c:652
+#: src/protocols/oscar/oscar.c:640
 msgid "Security Enabled"
 msgstr "Seguretat habilitada"
 
-#: src/protocols/oscar/oscar.c:655
+#: src/protocols/oscar/oscar.c:643
 msgid "Video Chat"
 msgstr "Xat de vídeo"
 
-#: src/protocols/oscar/oscar.c:659
+#: src/protocols/oscar/oscar.c:647
 msgid "iChat AV"
 msgstr "iChat AV"
 
-#: src/protocols/oscar/oscar.c:662
+#: src/protocols/oscar/oscar.c:650
 msgid "Live Video"
 msgstr "Vídeo en directe"
 
-#: src/protocols/oscar/oscar.c:665
+#: src/protocols/oscar/oscar.c:653
 msgid "Camera"
 msgstr "Càmera"
 
-#: src/protocols/oscar/oscar.c:683 src/protocols/oscar/oscar.c:7059
+#: src/protocols/oscar/oscar.c:671 src/protocols/oscar/oscar.c:5712
+#: src/protocols/oscar/oscar.c:6895
 msgid "Free For Chat"
 msgstr "Lliure per parlar"
 
-#: src/protocols/oscar/oscar.c:687 src/protocols/oscar/oscar.c:7074
+#: src/protocols/oscar/oscar.c:675 src/protocols/oscar/oscar.c:5706
+#: src/protocols/oscar/oscar.c:6893
 msgid "Not Available"
 msgstr "No disponible"
 
-#: src/protocols/oscar/oscar.c:689 src/protocols/oscar/oscar.c:7064
+#: src/protocols/oscar/oscar.c:677 src/protocols/oscar/oscar.c:5709
+#: src/protocols/oscar/oscar.c:6894
 msgid "Occupied"
 msgstr "Ocupat"
 
-#: src/protocols/oscar/oscar.c:693
+#: src/protocols/oscar/oscar.c:681
 msgid "Web Aware"
 msgstr "Conscient de la web"
 
-#: src/protocols/oscar/oscar.c:771
+#: src/protocols/oscar/oscar.c:749
 msgid "Capabilities"
 msgstr "Capacitats"
 
-#: src/protocols/oscar/oscar.c:780
+#: src/protocols/oscar/oscar.c:758
 msgid "Buddy Comment"
 msgstr "Comentari de l'amic"
 
-#: src/protocols/oscar/oscar.c:937
+#: src/protocols/oscar/oscar.c:893
 #, c-format
 msgid "Direct IM with %s closed"
 msgstr "S'ha tancat la conversa d'IM amb %s"
 
-#: src/protocols/oscar/oscar.c:939
+#: src/protocols/oscar/oscar.c:895
 #, c-format
 msgid "Direct IM with %s failed"
 msgstr "Ha fallat la conversa directa de MI amb %s"
 
-#: src/protocols/oscar/oscar.c:947
+#: src/protocols/oscar/oscar.c:902
 msgid "Direct Connect failed"
 msgstr "Ha fallat la connexió directa"
 
-#: src/protocols/oscar/oscar.c:1024 src/protocols/oscar/oscar.c:1155
+#: src/protocols/oscar/oscar.c:979 src/protocols/oscar/oscar.c:1110
 #, c-format
 msgid "Direct IM with %s established"
 msgstr "S'ha establert una connexió directa de MI amb %s"
 
-#: src/protocols/oscar/oscar.c:1105
+#: src/protocols/oscar/oscar.c:1060
 #, c-format
 msgid "Attempting to connect to %s at %s:%hu for Direct IM."
 msgstr "S'està intentant connectar amb %s a %s:%hu per a MI directa."
 
-#: src/protocols/oscar/oscar.c:1531
+#: src/protocols/oscar/oscar.c:1480
 #, c-format
 msgid "Asking %s to connect to us at %s:%hu for Direct IM."
 msgstr ""
 "S'està demanant a %s que es connecti a vostè a %s:%hu per a MI directa."
 
-#: src/protocols/oscar/oscar.c:1536
+#: src/protocols/oscar/oscar.c:1485
 msgid "Unable to open Direct IM"
 msgstr "No s'ha pogut obrir la communicació de MI directa"
 
-#: src/protocols/oscar/oscar.c:1571
+#: src/protocols/oscar/oscar.c:1520
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr "Heu escollit obrir una connexió directa de MI amb %s."
 
-#: src/protocols/oscar/oscar.c:1575
+#: src/protocols/oscar/oscar.c:1524
 msgid ""
 "Because this reveals your IP address, it may be considered a privacy risk.  "
 "Do you wish to continue?"
@@ -7957,24 +8023,24 @@
 "Atès que això revela la vostra adreça IP, es podria considerar com un risc "
 "de privadesa. Voleu continuar?"
 
-#: src/protocols/oscar/oscar.c:1579 src/protocols/oscar/oscar.c:3618
+#: src/protocols/oscar/oscar.c:1528 src/protocols/oscar/oscar.c:3552
 msgid "Connect"
 msgstr "Connecta"
 
-#: src/protocols/oscar/oscar.c:1643
-#, c-format
-msgid "You have lost your connection to chat room %s."
-msgstr "Heu perdut la connexió a la sala de xat %s."
-
-#: src/protocols/oscar/oscar.c:1666
+#: src/protocols/oscar/oscar.c:1595 src/protocols/toc/toc.c:874
+#, c-format
+msgid "You have been disconnected from chat room %s."
+msgstr "Se us ha desconnectat de la conversa %s."
+
+#: src/protocols/oscar/oscar.c:1614
 msgid "Chat is currently unavailable"
 msgstr "El xat no està actualment disponible"
 
-#: src/protocols/oscar/oscar.c:1747
+#: src/protocols/oscar/oscar.c:1695
 msgid "Screen name sent"
 msgstr "S'ha enviat el nom d'usuari"
 
-#: src/protocols/oscar/oscar.c:1771
+#: src/protocols/oscar/oscar.c:1709
 #, c-format
 msgid ""
 "Unable to login: Could not sign on as %s because the screen name is "
@@ -7985,47 +8051,47 @@
 "no és vàlid. Els noms d'usuari han de començar amb una lletra i contenir "
 "només lletres, nombres o espais, o només nombres."
 
-#: src/protocols/oscar/oscar.c:1801
+#: src/protocols/oscar/oscar.c:1737
 msgid "Unable to login to AIM"
 msgstr "No s'ha pogut connectar a l'AIM"
 
-#: src/protocols/oscar/oscar.c:1905 src/protocols/oscar/oscar.c:2350
+#: src/protocols/oscar/oscar.c:1839 src/protocols/oscar/oscar.c:2285
 msgid "Could Not Connect"
 msgstr "No s'ha pogut connectar"
 
-#: src/protocols/oscar/oscar.c:1913
+#: src/protocols/oscar/oscar.c:1847
 msgid "Connection established, cookie sent"
 msgstr "Connexió establerta, s'està enviant el secret"
 
-#: src/protocols/oscar/oscar.c:2026 src/protocols/yahoo/yahoo_filexfer.c:179
-#: src/protocols/yahoo/yahoo_filexfer.c:188
-#: src/protocols/yahoo/yahoo_filexfer.c:198
+#: src/protocols/oscar/oscar.c:1967 src/protocols/yahoo/yahoo_filexfer.c:175
+#: src/protocols/yahoo/yahoo_filexfer.c:184
+#: src/protocols/yahoo/yahoo_filexfer.c:193
 msgid "Unable to establish file descriptor."
 msgstr "No s'ha pogut establir un descriptor de fitxer."
 
-#: src/protocols/oscar/oscar.c:2031
+#: src/protocols/oscar/oscar.c:1972
 msgid "Unable to create new connection."
 msgstr "No s'ha pogut crear una nova connexió."
 
-#: src/protocols/oscar/oscar.c:2110
+#: src/protocols/oscar/oscar.c:2044
 msgid "Unable to establish listener socket."
 msgstr "No s'ha pogut establir un sòcol on escoltar."
 
-#: src/protocols/oscar/oscar.c:2235 src/protocols/toc/toc.c:542
+#: src/protocols/oscar/oscar.c:2169 src/protocols/toc/toc.c:541
 msgid "Incorrect nickname or password."
 msgstr "El sobrenom o la contrasenya són incorrectes"
 
-#: src/protocols/oscar/oscar.c:2240
+#: src/protocols/oscar/oscar.c:2174
 msgid "Your account is currently suspended."
 msgstr "El vostre compte està actualment suspès."
 
 #. service temporarily unavailable
-#: src/protocols/oscar/oscar.c:2244
+#: src/protocols/oscar/oscar.c:2178
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr ""
 "El servei de missatges instantanis d'AOL no està disponible temporalment."
 
-#: src/protocols/oscar/oscar.c:2249
+#: src/protocols/oscar/oscar.c:2183
 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."
@@ -8034,33 +8100,33 @@
 "deu minuts i intenteu-ho de nou. Si continueu intentant-ho, haureu d'esperar "
 "encara més temps."
 
-#: src/protocols/oscar/oscar.c:2254
+#: src/protocols/oscar/oscar.c:2188
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr "La versió del client que useu és massa antiga, actualitzeu-la a %s"
 
-#: src/protocols/oscar/oscar.c:2285
+#: src/protocols/oscar/oscar.c:2220
 msgid "Internal Error"
 msgstr "Error intern"
 
-#: src/protocols/oscar/oscar.c:2357
+#: src/protocols/oscar/oscar.c:2292
 msgid "Received authorization"
 msgstr "S'ha rebut l'autorització"
 
-#: src/protocols/oscar/oscar.c:2381
+#: src/protocols/oscar/oscar.c:2316
 msgid "The SecurID key entered is invalid."
 msgstr "La clau SecurID que heu entrat no és vàlida."
 
-#: src/protocols/oscar/oscar.c:2395
+#: src/protocols/oscar/oscar.c:2330
 msgid "Enter SecurID"
 msgstr "Entreu el SecureID"
 
-#: src/protocols/oscar/oscar.c:2396
+#: src/protocols/oscar/oscar.c:2331
 msgid "Enter the 6 digit number from the digital display."
 msgstr "Entreu el nombre de 6 dígits de la pantalla digital."
 
-#: src/protocols/oscar/oscar.c:2436 src/protocols/oscar/oscar.c:2466
-#: src/protocols/oscar/oscar.c:2555
+#: src/protocols/oscar/oscar.c:2371 src/protocols/oscar/oscar.c:2401
+#: src/protocols/oscar/oscar.c:2490
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
@@ -8069,24 +8135,24 @@
 "Se us pot desconnectar d'aquí a poc temps. Si voleu, podeu usar TOC fins que "
 "això es resolgui. Comproveu si hi ha actualitzacions a %s."
 
-#: src/protocols/oscar/oscar.c:2439 src/protocols/oscar/oscar.c:2469
+#: src/protocols/oscar/oscar.c:2374 src/protocols/oscar/oscar.c:2404
 msgid "Gaim was unable to get a valid AIM login hash."
 msgstr "El Gaim no ha pogut obtenir un hash d'AIM d'entrada vàlid."
 
-#: src/protocols/oscar/oscar.c:2558
+#: src/protocols/oscar/oscar.c:2493
 msgid "Gaim was unable to get a valid login hash."
 msgstr "El Gaim no ha pogut obtenir un hash d'entrada vàlid."
 
-#: src/protocols/oscar/oscar.c:2590
+#: src/protocols/oscar/oscar.c:2525
 msgid "Password sent"
 msgstr "S'ha enviat la contrasenya"
 
-#: src/protocols/oscar/oscar.c:3609
+#: src/protocols/oscar/oscar.c:3544
 #, c-format
 msgid "%s has just asked to directly connect to %s"
 msgstr "%s demana connectar-se directament a %s"
 
-#: src/protocols/oscar/oscar.c:3612
+#: src/protocols/oscar/oscar.c:3547
 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 "
@@ -8096,19 +8162,19 @@
 "necessari per poder enviar imatges instantànies. Atès que es revelarà la "
 "vostra adreça IP, això es pot considerar un risc de privadesa."
 
-#: src/protocols/oscar/oscar.c:3651
+#: src/protocols/oscar/oscar.c:3585
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr "Autoritzeu-me perquè pugui afegir-vos a la meva llista d'amics."
 
-#: src/protocols/oscar/oscar.c:3659
+#: src/protocols/oscar/oscar.c:3593
 msgid "Authorization Request Message:"
 msgstr "Missatge de petició d'autorització:"
 
-#: src/protocols/oscar/oscar.c:3660
+#: src/protocols/oscar/oscar.c:3594
 msgid "Please authorize me!"
 msgstr "Autoritzeu-me, si us plau."
 
-#: src/protocols/oscar/oscar.c:3690
+#: src/protocols/oscar/oscar.c:3624
 #, c-format
 msgid ""
 "The user %s requires authorization before being added to a buddy list.  Do "
@@ -8117,22 +8183,22 @@
 "L'usuari %s demana una autorització abans de ser afegit a una llista "
 "d'amics. Voleu enviar una sol·licitud d'autorització?"
 
-#: src/protocols/oscar/oscar.c:3695 src/protocols/oscar/oscar.c:3697
+#: src/protocols/oscar/oscar.c:3629 src/protocols/oscar/oscar.c:3631
 msgid "Request Authorization"
 msgstr "Sol·licitud d'autorització"
 
-#: src/protocols/oscar/oscar.c:3745 src/protocols/oscar/oscar.c:3747
-#: src/protocols/oscar/oscar.c:3754 src/protocols/oscar/oscar.c:3851
-#: src/protocols/oscar/oscar.c:3871 src/protocols/oscar/oscar.c:6471
-#: src/protocols/oscar/oscar.c:6517
+#: src/protocols/oscar/oscar.c:3679 src/protocols/oscar/oscar.c:3681
+#: src/protocols/oscar/oscar.c:3688 src/protocols/oscar/oscar.c:3785
+#: src/protocols/oscar/oscar.c:3805 src/protocols/oscar/oscar.c:6336
+#: src/protocols/oscar/oscar.c:6382
 msgid "No reason given."
 msgstr "No s'ha indicat cap motiu."
 
-#: src/protocols/oscar/oscar.c:3753
+#: src/protocols/oscar/oscar.c:3687
 msgid "Authorization Denied Message:"
 msgstr "Missatge de denegació de l'autorització:"
 
-#: src/protocols/oscar/oscar.c:3851
+#: src/protocols/oscar/oscar.c:3785
 #, c-format
 msgid ""
 "The user %u wants to add you to their buddy list for the following reason:\n"
@@ -8141,11 +8207,11 @@
 "L'usuari %u vol afegir-vos a la seva llista d'amics pels següents motius:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3859 src/protocols/oscar/oscar.c:6477
+#: src/protocols/oscar/oscar.c:3793 src/protocols/oscar/oscar.c:6342
 msgid "Authorization Request"
 msgstr "Sol·licitud d'autorització"
 
-#: src/protocols/oscar/oscar.c:3871
+#: src/protocols/oscar/oscar.c:3805
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -8156,17 +8222,17 @@
 "d'amics pel següent motiu:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3872
+#: src/protocols/oscar/oscar.c:3806
 msgid "ICQ authorization denied."
 msgstr "S'ha denegat l'autorització ICQ."
 
 #. Someone has granted you authorization
-#: src/protocols/oscar/oscar.c:3879
+#: src/protocols/oscar/oscar.c:3813
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
 msgstr "L'usuari %u us ha permès afegir-lo a la vostra llista d'amics."
 
-#: src/protocols/oscar/oscar.c:3887
+#: src/protocols/oscar/oscar.c:3821
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -8179,7 +8245,7 @@
 "De: %s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3895
+#: src/protocols/oscar/oscar.c:3829
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -8192,7 +8258,7 @@
 "De: %s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3903
+#: src/protocols/oscar/oscar.c:3837
 #, c-format
 msgid ""
 "You have received an ICQ email from %s [%s]\n"
@@ -8205,34 +8271,34 @@
 "Missatge:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3924
+#: src/protocols/oscar/oscar.c:3858
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
 msgstr "L'usuari %u d'ICQ us ha enviat un amic: %s (%s)"
 
-#: src/protocols/oscar/oscar.c:3930
+#: src/protocols/oscar/oscar.c:3864
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr "Voleu afegir aquest amic a la vostra llista d'amics?"
 
-#: src/protocols/oscar/oscar.c:3934
+#: src/protocols/oscar/oscar.c:3868
 msgid "Decline"
 msgstr "Rebutja"
 
-#: src/protocols/oscar/oscar.c:4018
+#: src/protocols/oscar/oscar.c:3952
 #, 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] "S'ha perdut %hu missatge de %s perquè era invàlid."
 msgstr[1] "S'ha perdut %hu missatges de %s perquè eren invàlids."
 
-#: src/protocols/oscar/oscar.c:4027
+#: src/protocols/oscar/oscar.c:3961
 #, 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] "S'ha perdut %hu missatge de %s perquè era massa llarg."
 msgstr[1] "S'ha perdut %hu missatges de %s perquè eren massa llargs."
 
-#: src/protocols/oscar/oscar.c:4036
+#: src/protocols/oscar/oscar.c:3970
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -8241,7 +8307,7 @@
 msgstr[0] "S'ha perdut %hu missatge de %s perquè era invàlid."
 msgstr[1] "S'han perdut %hu missatges de %s perquè eren invàlids."
 
-#: src/protocols/oscar/oscar.c:4045
+#: src/protocols/oscar/oscar.c:3979
 #, 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."
@@ -8249,75 +8315,69 @@
 msgstr[1] ""
 "S'han perdut %hu missatges de %s perquè ell/ella ere massa dolent/a."
 
-#: src/protocols/oscar/oscar.c:4054
+#: src/protocols/oscar/oscar.c:3988
 #, 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] "S'ha perdut %hu missatge de %s perquè sou massa dolents."
 msgstr[1] "S'han perdut %hu missatges de %s perquè sou massa dolents."
 
-#: src/protocols/oscar/oscar.c:4063
+#: src/protocols/oscar/oscar.c:3997
 #, 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] "S'ha perdut %hu missatge de %s per motius desconeguts."
 msgstr[1] "S'han perdut %hu missatges de %s per motius desconeguts."
 
-#: src/protocols/oscar/oscar.c:4117 src/protocols/oscar/oscar.c:4351
-#: src/protocols/silc/ops.c:1087 src/protocols/silc/ops.c:1149
+#: src/protocols/oscar/oscar.c:4051 src/protocols/oscar/oscar.c:4283
 #, c-format
 msgid "Info for %s"
 msgstr "Informació quant a %s"
 
-#: src/protocols/oscar/oscar.c:4183
+#: src/protocols/oscar/oscar.c:4117
 #, c-format
 msgid "SNAC threw error: %s\n"
 msgstr "Error SNAC: %s\n"
 
 #. Data is assumed to be the destination sn
-#: src/protocols/oscar/oscar.c:4220
+#: src/protocols/oscar/oscar.c:4153
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "No s'ha pogut enviar el missatge: %s"
 
-#: src/protocols/oscar/oscar.c:4220 src/protocols/oscar/oscar.c:4225
-#: src/protocols/oscar/oscar.c:4283 src/protocols/oscar/oscar.c:4287
+#: src/protocols/oscar/oscar.c:4153 src/protocols/oscar/oscar.c:4158
+#: src/protocols/oscar/oscar.c:4216 src/protocols/oscar/oscar.c:4220
 msgid "Unknown reason."
 msgstr "Motiu desconegut."
 
-#: src/protocols/oscar/oscar.c:4223
-#, c-format
-msgid "Unable to send message to %s:"
-msgstr "No s'ha pogut enviar el missatge a %s:"
-
-#: src/protocols/oscar/oscar.c:4283
+#: src/protocols/oscar/oscar.c:4216
 #, c-format
 msgid "User information not available: %s"
 msgstr "La informació de l'usuari no està disponible: %s"
 
-#: src/protocols/oscar/oscar.c:4286
+#: src/protocols/oscar/oscar.c:4219
 #, c-format
 msgid "User information for %s unavailable:"
 msgstr "La informació de %s no està disponible:"
 
-#: src/protocols/oscar/oscar.c:4309
+#: src/protocols/oscar/oscar.c:4241
 msgid "Warning Level"
 msgstr "Nivell d'avís"
 
-#: src/protocols/oscar/oscar.c:4313
+#: src/protocols/oscar/oscar.c:4245
 msgid "Online Since"
 msgstr "En línia des de"
 
-#: src/protocols/oscar/oscar.c:4318 src/protocols/yahoo/yahoo_profile.c:1120
+#: src/protocols/oscar/oscar.c:4250 src/protocols/yahoo/yahoo_profile.c:1118
 msgid "Member Since"
 msgstr "Membre des de"
 
-#: src/protocols/oscar/oscar.c:4402
+#: src/protocols/oscar/oscar.c:4334
 msgid "Your AIM connection may be lost."
 msgstr "La vostra connexió d'AIM es pot perdre."
 
 #. The conversion failed!
-#: src/protocols/oscar/oscar.c:4588
+#: src/protocols/oscar/oscar.c:4520
 msgid ""
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
@@ -8325,11 +8385,11 @@
 "[No s'ha pogut mostrar el missatge d'aquest usuari perquè contenia caràcters "
 "invàlids.]"
 
-#: src/protocols/oscar/oscar.c:4808
+#: src/protocols/oscar/oscar.c:4740
 msgid "Rate limiting error."
 msgstr "Error de limitació de velocitat."
 
-#: src/protocols/oscar/oscar.c:4809
+#: src/protocols/oscar/oscar.c:4741
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
@@ -8337,7 +8397,7 @@
 "No s'ha pogut realitzar la darrera acció que havíeu intentat perquè esteu "
 "per sobre del límit. Espereu 10 segons i torneu-ho a provar."
 
-#: src/protocols/oscar/oscar.c:4878
+#: src/protocols/oscar/oscar.c:4804
 msgid ""
 "You have been disconnected because you have signed on with this screen name "
 "at another location."
@@ -8345,107 +8405,109 @@
 "Se us ha desconnectat perquè us heu connectat amb el mateix nom des d'un "
 "altre lloc."
 
-#: src/protocols/oscar/oscar.c:4880
+#: src/protocols/oscar/oscar.c:4806
 msgid "You have been signed off for an unknown reason."
 msgstr "Se us ha desconnectat per motius desconeguts."
 
-#: src/protocols/oscar/oscar.c:4893 src/protocols/toc/toc.c:881
-#, c-format
-msgid "You have been disconnected from chat room %s."
-msgstr "Se us ha desconnectat de la conversa %s."
-
-#: src/protocols/oscar/oscar.c:4927
+#: src/protocols/oscar/oscar.c:4837
 msgid "Finalizing connection"
 msgstr "S'està finalitzant la connexió"
 
-#: src/protocols/oscar/oscar.c:5221 src/protocols/silc/util.c:538
+#: src/protocols/oscar/oscar.c:5120 src/protocols/silc/util.c:538
 msgid "Mobile Phone"
 msgstr "Telèfon mòbil"
 
-#: src/protocols/oscar/oscar.c:5223 src/protocols/trepia/trepia.c:282
+#: src/protocols/oscar/oscar.c:5121
+msgid "Not specified"
+msgstr "No especificat"
+
+#: src/protocols/oscar/oscar.c:5122 src/protocols/trepia/trepia.c:282
 #: src/protocols/trepia/trepia.c:408
 msgid "Female"
 msgstr "Dona"
 
-#: src/protocols/oscar/oscar.c:5223 src/protocols/trepia/trepia.c:281
+#: src/protocols/oscar/oscar.c:5122 src/protocols/trepia/trepia.c:281
 #: src/protocols/trepia/trepia.c:408
 msgid "Male"
 msgstr "Home"
 
-#: src/protocols/oscar/oscar.c:5239
+#: src/protocols/oscar/oscar.c:5138
 msgid "Personal Web Page"
 msgstr "Pàgina web personal"
 
-#: src/protocols/oscar/oscar.c:5243
+#: src/protocols/oscar/oscar.c:5142
 msgid "Additional Information"
 msgstr "Informació addicional"
 
-#: src/protocols/oscar/oscar.c:5248
+#: src/protocols/oscar/oscar.c:5147
 msgid "Home Address"
 msgstr "Adreça de casa"
 
-#: src/protocols/oscar/oscar.c:5252 src/protocols/oscar/oscar.c:5260
+#: src/protocols/oscar/oscar.c:5151 src/protocols/oscar/oscar.c:5159
 msgid "Zip Code"
 msgstr "Codi postal"
 
-#: src/protocols/oscar/oscar.c:5256
+#: src/protocols/oscar/oscar.c:5155
 msgid "Work Address"
 msgstr "Adreça de la feina"
 
-#: src/protocols/oscar/oscar.c:5264
+#: src/protocols/oscar/oscar.c:5163
 msgid "Work Information"
 msgstr "Informació de la feina"
 
-#: src/protocols/oscar/oscar.c:5265
+#: src/protocols/oscar/oscar.c:5164
 msgid "Company"
 msgstr "Empresa"
 
-#: src/protocols/oscar/oscar.c:5266
+#: src/protocols/oscar/oscar.c:5165
 msgid "Division"
 msgstr "Divisió"
 
-#: src/protocols/oscar/oscar.c:5267
+#: src/protocols/oscar/oscar.c:5166
 msgid "Position"
 msgstr "Posició"
 
-#: src/protocols/oscar/oscar.c:5269
+#: src/protocols/oscar/oscar.c:5168
 msgid "Web Page"
 msgstr "Pàgina web"
 
-#: src/protocols/oscar/oscar.c:5279
+#: src/protocols/oscar/oscar.c:5178
 #, c-format
 msgid "ICQ Info for %s"
 msgstr "Informació ICQ de %s"
 
-#: src/protocols/oscar/oscar.c:5328
+#: src/protocols/oscar/oscar.c:5227
 msgid "Pop-Up Message"
 msgstr "Missatge emergent"
 
-#. TODO: Need to use ngettext() here
-#: src/protocols/oscar/oscar.c:5350
+#: src/protocols/oscar/oscar.c:5248
 #, c-format
 msgid "The following screen names are associated with %s"
 msgstr "Els següents noms d'usuari estan associats amb %s"
 
-#: src/protocols/oscar/oscar.c:5375
+#: src/protocols/oscar/oscar.c:5252
+msgid "Search Results"
+msgstr "Resultats de la cerca"
+
+#: src/protocols/oscar/oscar.c:5269
 #, c-format
 msgid "No results found for email address %s"
 msgstr "No s'han obtingut resultats per a l'adreça de correu %s"
 
-#: src/protocols/oscar/oscar.c:5396
+#: src/protocols/oscar/oscar.c:5290
 #, c-format
 msgid "You should receive an email asking to confirm %s."
 msgstr "Hauríeu de rebre un correu demanant-vos confirmar %s."
 
-#: src/protocols/oscar/oscar.c:5398
+#: src/protocols/oscar/oscar.c:5292
 msgid "Account Confirmation Requested"
 msgstr "S'ha sol·licitat la confirmació del compte"
 
-#: src/protocols/oscar/oscar.c:5429
+#: src/protocols/oscar/oscar.c:5323
 msgid "Error Changing Account Info"
 msgstr "S'ha produït un error en canviar la informació del compte"
 
-#: src/protocols/oscar/oscar.c:5432
+#: src/protocols/oscar/oscar.c:5326
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -8454,7 +8516,7 @@
 "Error 0x%04x: no s'ha pogut formatar el nom d'usuari perquè el demanat "
 "difereix de l'original."
 
-#: src/protocols/oscar/oscar.c:5435
+#: src/protocols/oscar/oscar.c:5329
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -8463,7 +8525,7 @@
 "Error 0x%04x: no s'ha pogut formatar el nom d'usuari perquè el demanat acaba "
 "en un espai."
 
-#: src/protocols/oscar/oscar.c:5438
+#: src/protocols/oscar/oscar.c:5332
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -8472,7 +8534,7 @@
 "Error 0x%04x: no s'ha pogut formatar el nom d'usuari perquè el demanat és "
 "massa llarg."
 
-#: src/protocols/oscar/oscar.c:5441
+#: src/protocols/oscar/oscar.c:5335
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because there is already a "
@@ -8481,7 +8543,7 @@
 "Error 0x%04x: no s'ha pogut canviar l'adreça de correu electrònic perquè ja "
 "hi ha una petició pendent per a aquest nom d'usuari."
 
-#: src/protocols/oscar/oscar.c:5444
+#: src/protocols/oscar/oscar.c:5338
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address has "
@@ -8490,7 +8552,7 @@
 "Error 0x%04x: no s'ha pogut canviar l'adreça de correu electrònic perquè "
 "l'adreça donada ja té massa noms d'usuari associats."
 
-#: src/protocols/oscar/oscar.c:5447
+#: src/protocols/oscar/oscar.c:5341
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address is "
@@ -8499,12 +8561,12 @@
 "Error 0x%04x: No s'ha pogut canviar l'adreça de correu perquè l'adreça "
 "indicada no és vàlida."
 
-#: src/protocols/oscar/oscar.c:5450
+#: src/protocols/oscar/oscar.c:5344
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "Error 0x%04x: error desconegut."
 
-#: src/protocols/oscar/oscar.c:5460
+#: src/protocols/oscar/oscar.c:5354
 #, c-format
 msgid ""
 "Your screen name is currently formatted as follows:\n"
@@ -8513,27 +8575,27 @@
 "El vostre nom d'usuari té aquest format:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:5461 src/protocols/oscar/oscar.c:5468
+#: src/protocols/oscar/oscar.c:5355 src/protocols/oscar/oscar.c:5362
 msgid "Account Info"
 msgstr "Informació del compte"
 
-#: src/protocols/oscar/oscar.c:5466
+#: src/protocols/oscar/oscar.c:5360
 #, c-format
 msgid "The email address for %s is %s"
 msgstr "L'adreça de correu per a %s és %s"
 
-#: src/protocols/oscar/oscar.c:5533
+#: src/protocols/oscar/oscar.c:5425
 msgid ""
 "Your IM Image was not sent. You must be Direct Connected to send IM Images."
 msgstr ""
 "No s'ha enviat la imatge de MI. Heu d'estar directament connectat per poder "
 "enviar imatges de MI."
 
-#: src/protocols/oscar/oscar.c:5668
+#: src/protocols/oscar/oscar.c:5561
 msgid "Unable to set AIM profile."
 msgstr "No s'ha pogut establir el perfil d'AIM."
 
-#: src/protocols/oscar/oscar.c:5669
+#: src/protocols/oscar/oscar.c:5562
 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 "
@@ -8543,7 +8605,7 @@
 "procés de connexió. El vostre perfil segueix sense estar establert; intenteu "
 "establir-lo de nou quan el procés de connexió hagi finalitzat."
 
-#: src/protocols/oscar/oscar.c:5696
+#: src/protocols/oscar/oscar.c:5589
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  Gaim has truncated "
@@ -8558,15 +8620,19 @@
 "S'ha excedit el límit màxim per la mida del perfil de %d octets. El Gaim "
 "l'ha retallat."
 
-#: src/protocols/oscar/oscar.c:5701
+#: src/protocols/oscar/oscar.c:5594
 msgid "Profile too long."
 msgstr "Perfil massa llarg."
 
-#: src/protocols/oscar/oscar.c:5735
+#: src/protocols/oscar/oscar.c:5610 src/protocols/oscar/oscar.c:6900
+msgid "Visible"
+msgstr "Visible"
+
+#: src/protocols/oscar/oscar.c:5628
 msgid "Unable to set AIM away message."
 msgstr "No s'ha pogut posar el missatge s'absència per a AIM."
 
-#: src/protocols/oscar/oscar.c:5736
+#: src/protocols/oscar/oscar.c:5629
 msgid ""
 "You have probably requested to set your away message before the login "
 "procedure completed.  You remain in a \"present\" state; try setting it "
@@ -8576,7 +8642,7 @@
 "amb el procés de connexió. El vostre estat continua essent \"present\"; "
 "intenteu canviar-lo un cop hagi finalitzat el procés de connexió."
 
-#: src/protocols/oscar/oscar.c:5783
+#: src/protocols/oscar/oscar.c:5669
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  Gaim has "
@@ -8591,11 +8657,11 @@
 "S'ha superat el límit de %d octets per al missatge d'absència. El Gaim l'ha "
 "retallat."
 
-#: src/protocols/oscar/oscar.c:5788
+#: src/protocols/oscar/oscar.c:5674
 msgid "Away message too long."
 msgstr "El missatge d'absència és massa llarg."
 
-#: src/protocols/oscar/oscar.c:5879
+#: src/protocols/oscar/oscar.c:5751
 #, c-format
 msgid ""
 "Could not add the buddy %s because the screen name is invalid.  Screen names "
@@ -8606,16 +8672,16 @@
 "d'usuari han de començar amb una lletra i contenir lletres, nombres i "
 "espais, o només nombres."
 
-#: src/protocols/oscar/oscar.c:5881 src/protocols/oscar/oscar.c:6337
-#: src/protocols/oscar/oscar.c:6351
+#: src/protocols/oscar/oscar.c:5753 src/protocols/oscar/oscar.c:6202
+#: src/protocols/oscar/oscar.c:6216
 msgid "Unable To Add"
 msgstr "No s'ha pogut afegir"
 
-#: src/protocols/oscar/oscar.c:6043
+#: src/protocols/oscar/oscar.c:5914
 msgid "Unable To Retrieve Buddy List"
 msgstr "No s'ha pogut obtenir la llista d'amics"
 
-#: src/protocols/oscar/oscar.c:6044
+#: src/protocols/oscar/oscar.c:5915
 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 "
@@ -8625,13 +8691,13 @@
 "llista d'amics no s'ha perdut, i probablement tornarà a estar disponible "
 "d'aquí a poques hores."
 
-#: src/protocols/oscar/oscar.c:6228 src/protocols/oscar/oscar.c:6229
-#: src/protocols/oscar/oscar.c:6234 src/protocols/oscar/oscar.c:6395
-#: src/protocols/oscar/oscar.c:6396 src/protocols/oscar/oscar.c:6401
+#: src/protocols/oscar/oscar.c:6097 src/protocols/oscar/oscar.c:6098
+#: src/protocols/oscar/oscar.c:6103 src/protocols/oscar/oscar.c:6260
+#: src/protocols/oscar/oscar.c:6261 src/protocols/oscar/oscar.c:6266
 msgid "Orphans"
 msgstr "Orfes"
 
-#: src/protocols/oscar/oscar.c:6335
+#: src/protocols/oscar/oscar.c:6200
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -8640,11 +8706,11 @@
 "No s'ha pogut afegir l'amic %s perque hi ha massa entrades a la llista "
 "d'amics. Suprimiu-ne algun i torneu-ho a intentar."
 
-#: src/protocols/oscar/oscar.c:6335 src/protocols/oscar/oscar.c:6349
+#: src/protocols/oscar/oscar.c:6200 src/protocols/oscar/oscar.c:6214
 msgid "(no name)"
 msgstr "(sense nom)"
 
-#: src/protocols/oscar/oscar.c:6349
+#: src/protocols/oscar/oscar.c:6214
 #, c-format
 msgid ""
 "Could not add the buddy %s for an unknown reason.  The most common reason "
@@ -8654,7 +8720,7 @@
 "Per motius desconeguts no s'ha pogut afegir l'amic %s. El motiu més comú és "
 "que ja heu ocupat el número màxim d'amics a la llista d'amics."
 
-#: src/protocols/oscar/oscar.c:6432
+#: src/protocols/oscar/oscar.c:6297
 #, c-format
 msgid ""
 "The user %s has given you permission to add you to their buddy list.  Do you "
@@ -8663,11 +8729,11 @@
 "L'usuari %s us ha donat permís per afegir-vos a la seva llista d'amics. "
 "Voleu afegir-lo a la vostra?"
 
-#: src/protocols/oscar/oscar.c:6438
+#: src/protocols/oscar/oscar.c:6303
 msgid "Authorization Given"
 msgstr "S'ha donat l'autorització"
 
-#: src/protocols/oscar/oscar.c:6471
+#: src/protocols/oscar/oscar.c:6336
 #, c-format
 msgid ""
 "The user %s wants to add you to their buddy list for the following reason:\n"
@@ -8677,17 +8743,17 @@
 "%s"
 
 #. Granted
-#: src/protocols/oscar/oscar.c:6513
+#: src/protocols/oscar/oscar.c:6378
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
 msgstr "L'usuari %s us ha permès afegir-lo a la vostra llista d'amics."
 
-#: src/protocols/oscar/oscar.c:6514
+#: src/protocols/oscar/oscar.c:6379
 msgid "Authorization Granted"
 msgstr "S'ha concedit l'autorització"
 
 #. Denied
-#: src/protocols/oscar/oscar.c:6517
+#: src/protocols/oscar/oscar.c:6382
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -8698,95 +8764,79 @@
 "pels següents motius:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:6518
+#: src/protocols/oscar/oscar.c:6383
 msgid "Authorization Denied"
 msgstr "S'ha denegat l'autorització"
 
-#: src/protocols/oscar/oscar.c:6556 src/protocols/toc/toc.c:1282
+#: src/protocols/oscar/oscar.c:6420 src/protocols/toc/toc.c:1273
 msgid "_Exchange:"
 msgstr "Int_ercanvi:"
 
-#: src/protocols/oscar/oscar.c:6595
+#: src/protocols/oscar/oscar.c:6458
 msgid "Invalid chat name specified."
 msgstr "S'ha especificat un nom de xat invàlid."
 
-#: src/protocols/oscar/oscar.c:6662
+#: src/protocols/oscar/oscar.c:6547
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 msgstr ""
 "La vostra imatge MI no s'ha enviat. No podeu enviar imatges MI en xats AIM."
 
-#: src/protocols/oscar/oscar.c:6797
+#: src/protocols/oscar/oscar.c:6673
 msgid "Away Message"
 msgstr "Missatge d'absència"
 
-#: src/protocols/oscar/oscar.c:7132
+#: src/protocols/oscar/oscar.c:6959
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "Comentari sobre l'amic %s"
 
-#: src/protocols/oscar/oscar.c:7133
+#: src/protocols/oscar/oscar.c:6960
 msgid "Buddy Comment:"
 msgstr "Comentari sobre l'amic:"
 
-#: src/protocols/oscar/oscar.c:7152
+#: src/protocols/oscar/oscar.c:6979
 msgid "Edit Buddy Comment"
 msgstr "Edita el comentari sobre l'amic"
 
-#: src/protocols/oscar/oscar.c:7158
+#: src/protocols/oscar/oscar.c:6985
 msgid "Get Status Msg"
 msgstr "Obtingues el missatge d'estat"
 
-#: src/protocols/oscar/oscar.c:7170
+#: src/protocols/oscar/oscar.c:6997
 msgid "Direct IM"
 msgstr "MI directa"
 
-#: src/protocols/oscar/oscar.c:7187
+#: src/protocols/oscar/oscar.c:7014
 msgid "Re-request Authorization"
 msgstr "Torna a demanar l'autorització"
 
-#: src/protocols/oscar/oscar.c:7247
-msgid "Require authorization"
-msgstr "Requereix autorització"
-
-#: src/protocols/oscar/oscar.c:7250
-msgid "Hide IP address"
-msgstr "Ocula l'adreça IP"
-
-#: src/protocols/oscar/oscar.c:7253
-msgid "Web aware"
-msgstr "Conscient de la web"
-
-#: src/protocols/oscar/oscar.c:7258
-msgid "ICQ Privacy Options"
-msgstr "Opcions de privadesa de ICQ"
-
-#: src/protocols/oscar/oscar.c:7275
+#: src/protocols/oscar/oscar.c:7044
 msgid "The new formatting is invalid."
 msgstr "El format nou no és vàlid."
 
-#: src/protocols/oscar/oscar.c:7276
+#: src/protocols/oscar/oscar.c:7045
 msgid "Screen name formatting can change only capitalization and whitespace."
 msgstr ""
 "El format del nom d'usuari només pot canviar majúscules i minúscules, i "
 "espais en blanc."
 
-#: src/protocols/oscar/oscar.c:7283
+#: src/protocols/oscar/oscar.c:7052
 msgid "New screen name formatting:"
 msgstr "Format nou del nom d'usuari:"
 
-#: src/protocols/oscar/oscar.c:7335
+#: src/protocols/oscar/oscar.c:7104
 msgid "Change Address To:"
 msgstr "Canvia l'adreça per:"
 
-#: src/protocols/oscar/oscar.c:7380
+#: src/protocols/oscar/oscar.c:7149
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>no esteu esperant l'autorització</i>"
 
-#: src/protocols/oscar/oscar.c:7383
+#: src/protocols/oscar/oscar.c:7152
 msgid "You are awaiting authorization from the following buddies"
 msgstr "Esteu esperant l'autorització dels següents amics"
 
-#: src/protocols/oscar/oscar.c:7384
+#: src/protocols/oscar/oscar.c:7153
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
@@ -8795,80 +8845,78 @@
 "amb el botó dret del ratolí, i seleccionant \"Torna a demanar l'autorització"
 "\"."
 
-#: src/protocols/oscar/oscar.c:7401
+#: src/protocols/oscar/oscar.c:7170
 msgid "Find Buddy by E-mail"
 msgstr "Troba un amic per l'adreça de correu"
 
-#: src/protocols/oscar/oscar.c:7402
+#: src/protocols/oscar/oscar.c:7171
 msgid "Search for a buddy by e-mail address"
 msgstr "Cerca un amic per l'adreça de correu"
 
-#: src/protocols/oscar/oscar.c:7403
+#: src/protocols/oscar/oscar.c:7172
 msgid "Type the e-mail address of the buddy you are searching for."
 msgstr "Escriviu l'adreça de correu de l'amic que estigueu cercant."
 
-#: src/protocols/oscar/oscar.c:7484 src/protocols/silc/silc.c:803
+#: src/protocols/oscar/oscar.c:7189
+msgid "Available Message:"
+msgstr "Missatge de disponibilitat:"
+
+#: src/protocols/oscar/oscar.c:7190
+msgid "I'm doing work and hoping for a distraction--IM me!"
+msgstr "Estic fent feina i espero una distracció; parleu amb mi."
+
+#: src/protocols/oscar/oscar.c:7271 src/protocols/silc/silc.c:800
 msgid "Set User Info..."
 msgstr "Estableix informació d'usuari..."
 
-#: src/protocols/oscar/oscar.c:7490
+#: src/protocols/oscar/oscar.c:7276
 msgid "Set User Info (URL)..."
 msgstr "Estableix informació d'usuari (URL)..."
 
-#: src/protocols/oscar/oscar.c:7495 src/protocols/silc/silc.c:799
+#: src/protocols/oscar/oscar.c:7282
+msgid "Set Available Message..."
+msgstr "Estableix el missatge de disponibilitat..."
+
+#: src/protocols/oscar/oscar.c:7287 src/protocols/silc/silc.c:796
 msgid "Change Password..."
 msgstr "Canvia la contrasenya..."
 
-#: src/protocols/oscar/oscar.c:7501
+#: src/protocols/oscar/oscar.c:7292
 msgid "Change Password (URL)"
 msgstr "Canvia la contrasenya (URL)"
 
-#: src/protocols/oscar/oscar.c:7505
+#: src/protocols/oscar/oscar.c:7296
 msgid "Configure IM Forwarding (URL)"
 msgstr "Configura el reenviament de MI (URL)"
 
-#. ICQ actions
-#: src/protocols/oscar/oscar.c:7515
-msgid "Show privacy options..."
-msgstr "Mostra les opcions de privadesa..."
-
-#. AIM actions
-#: src/protocols/oscar/oscar.c:7522
+#: src/protocols/oscar/oscar.c:7305
 msgid "Format Screen Name..."
 msgstr "Format del nom d'usuari..."
 
-#: src/protocols/oscar/oscar.c:7526
+#: src/protocols/oscar/oscar.c:7309
 msgid "Confirm Account"
 msgstr "Confirma el compte"
 
-#: src/protocols/oscar/oscar.c:7530
+#: src/protocols/oscar/oscar.c:7313
 msgid "Display Currently Registered Address"
 msgstr "Mostra les adreces actualment registrades"
 
-#: src/protocols/oscar/oscar.c:7534
+#: src/protocols/oscar/oscar.c:7317
 msgid "Change Currently Registered Address..."
 msgstr "Canvia l'adreça actualment registrada..."
 
-#: src/protocols/oscar/oscar.c:7541
+#: src/protocols/oscar/oscar.c:7324
 msgid "Show Buddies Awaiting Authorization"
 msgstr "Mostra els amics pendents d'autorització"
 
-#: src/protocols/oscar/oscar.c:7547
+#: src/protocols/oscar/oscar.c:7330
 msgid "Search for Buddy by Email..."
 msgstr "Cerca un amic per l'adreça de correu..."
 
-#: src/protocols/oscar/oscar.c:7552
+#: src/protocols/oscar/oscar.c:7335
 msgid "Search for Buddy by Information"
 msgstr "Cerca un amic per la informació"
 
-#: src/protocols/oscar/oscar.c:7621
-msgid "Use recent buddies group"
-msgstr "Usa el grup d'amics recent"
-
-#: src/protocols/oscar/oscar.c:7624
-msgid "Show how long you have been idle"
-msgstr "Mostra quant de temps heu estat inactiu"
-
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -8879,19 +8927,19 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/oscar/oscar.c:7717 src/protocols/oscar/oscar.c:7719
+#: src/protocols/oscar/oscar.c:7456 src/protocols/oscar/oscar.c:7458
 msgid "AIM/ICQ Protocol Plugin"
 msgstr "Connector per al protocol AIM/ICQ"
 
-#: src/protocols/oscar/oscar.c:7738
+#: src/protocols/oscar/oscar.c:7477
 msgid "Auth host"
 msgstr "Ordinador d'autorització"
 
-#: src/protocols/oscar/oscar.c:7741
+#: src/protocols/oscar/oscar.c:7480
 msgid "Auth port"
 msgstr "Port d'autorització"
 
-#: src/protocols/oscar/oscar.c:7744 src/protocols/zephyr/zephyr.c:2859
+#: src/protocols/oscar/oscar.c:7483 src/protocols/zephyr/zephyr.c:2760
 msgid "Encoding"
 msgstr "Codificació"
 
@@ -8978,32 +9026,32 @@
 msgstr "Especifica la contrasenya de MI"
 
 #: src/protocols/silc/buddy.c:506 src/protocols/silc/buddy.c:541
-#: src/protocols/silc/ops.c:1274 src/protocols/silc/ops.c:1285
+#: src/protocols/silc/ops.c:1276 src/protocols/silc/ops.c:1287
 msgid "Get Public Key"
 msgstr "Obtingues la clau pública"
 
-#: src/protocols/silc/buddy.c:542 src/protocols/silc/ops.c:1275
-#: src/protocols/silc/ops.c:1286
+#: src/protocols/silc/buddy.c:542 src/protocols/silc/ops.c:1277
+#: src/protocols/silc/ops.c:1288
 msgid "Cannot fetch the public key"
 msgstr "No s'ha pogut obtenir la clau pública"
 
-#: src/protocols/silc/buddy.c:629 src/protocols/silc/buddy.c:1558
+#: src/protocols/silc/buddy.c:629 src/protocols/silc/buddy.c:1553
 msgid "Show Public Key"
 msgstr "Mostra la clau pública"
 
 #: src/protocols/silc/buddy.c:630 src/protocols/silc/buddy.c:989
-#: src/protocols/silc/chat.c:235
+#: src/protocols/silc/chat.c:234
 msgid "Could not load public key"
 msgstr "No s'ha pogut carregar la clau pública"
 
-#: src/protocols/silc/buddy.c:707 src/protocols/silc/ops.c:873
-#: src/protocols/silc/ops.c:945 src/protocols/silc/ops.c:1080
-#: src/protocols/silc/ops.c:1081 src/protocols/silc/ops.c:1101
+#: src/protocols/silc/buddy.c:707 src/protocols/silc/ops.c:871
+#: src/protocols/silc/ops.c:943 src/protocols/silc/ops.c:1078
+#: src/protocols/silc/ops.c:1079 src/protocols/silc/ops.c:1098
 msgid "User Information"
 msgstr "Informació de l'usuari"
 
-#: src/protocols/silc/buddy.c:708 src/protocols/silc/ops.c:946
-#: src/protocols/silc/ops.c:1102
+#: src/protocols/silc/buddy.c:708 src/protocols/silc/ops.c:944
+#: src/protocols/silc/ops.c:1099
 msgid "Cannot get user information"
 msgstr "No s'ha pogut obtenir informació de l'usuari"
 
@@ -9062,213 +9110,216 @@
 "S'ha trobat més d'un usuari amb el mateix nom. Seleccioneu l'usuari correcte "
 "per afegir a la llista d'amics."
 
-#: src/protocols/silc/buddy.c:1391
+#: src/protocols/silc/buddy.c:1386
 msgid "Detached"
 msgstr "Separat"
 
-#: src/protocols/silc/buddy.c:1395 src/protocols/silc/silc.c:56
+#: src/protocols/silc/buddy.c:1390 src/protocols/silc/silc.c:49
+#: src/protocols/silc/silc.c:85
 msgid "Indisposed"
 msgstr "Indisposat"
 
-#: src/protocols/silc/buddy.c:1399 src/protocols/silc/silc.c:58
+#: src/protocols/silc/buddy.c:1394 src/protocols/silc/silc.c:50
+#: src/protocols/silc/silc.c:87
 msgid "Wake Me Up"
 msgstr "Desperta'm"
 
-#: src/protocols/silc/buddy.c:1401 src/protocols/silc/silc.c:50
+#: src/protocols/silc/buddy.c:1396 src/protocols/silc/silc.c:46
+#: src/protocols/silc/silc.c:79
 msgid "Hyper Active"
 msgstr "Súperactiu"
 
-#: src/protocols/silc/buddy.c:1403
+#: src/protocols/silc/buddy.c:1398
 msgid "Robot"
 msgstr "Robot"
 
-#: src/protocols/silc/buddy.c:1410 src/protocols/silc/silc.c:624
+#: src/protocols/silc/buddy.c:1405 src/protocols/silc/silc.c:621
 #: src/protocols/silc/util.c:469
 msgid "Happy"
 msgstr "Content"
 
-#: src/protocols/silc/buddy.c:1412 src/protocols/silc/silc.c:626
+#: src/protocols/silc/buddy.c:1407 src/protocols/silc/silc.c:623
 #: src/protocols/silc/util.c:471
 msgid "Sad"
 msgstr "Trist"
 
-#: src/protocols/silc/buddy.c:1414 src/protocols/silc/silc.c:628
+#: src/protocols/silc/buddy.c:1409 src/protocols/silc/silc.c:625
 #: src/protocols/silc/util.c:473
 msgid "Angry"
 msgstr "Enfadat"
 
-#: src/protocols/silc/buddy.c:1416 src/protocols/silc/silc.c:630
+#: src/protocols/silc/buddy.c:1411 src/protocols/silc/silc.c:627
 #: src/protocols/silc/util.c:475
 msgid "Jealous"
 msgstr "Gelós"
 
-#: src/protocols/silc/buddy.c:1418 src/protocols/silc/silc.c:632
+#: src/protocols/silc/buddy.c:1413 src/protocols/silc/silc.c:629
 #: src/protocols/silc/util.c:477
 msgid "Ashamed"
 msgstr "Avergonyit"
 
-#: src/protocols/silc/buddy.c:1420 src/protocols/silc/silc.c:634
+#: src/protocols/silc/buddy.c:1415 src/protocols/silc/silc.c:631
 #: src/protocols/silc/util.c:479
 msgid "Invincible"
 msgstr "Invisible"
 
-#: src/protocols/silc/buddy.c:1422 src/protocols/silc/silc.c:636
+#: src/protocols/silc/buddy.c:1417 src/protocols/silc/silc.c:633
 #: src/protocols/silc/util.c:481
 msgid "In Love"
 msgstr "Enamorat"
 
-#: src/protocols/silc/buddy.c:1424 src/protocols/silc/silc.c:638
+#: src/protocols/silc/buddy.c:1419 src/protocols/silc/silc.c:635
 #: src/protocols/silc/util.c:483
 msgid "Sleepy"
 msgstr "Endormiscat"
 
-#: src/protocols/silc/buddy.c:1426 src/protocols/silc/silc.c:640
+#: src/protocols/silc/buddy.c:1421 src/protocols/silc/silc.c:637
 #: src/protocols/silc/util.c:485
 msgid "Bored"
 msgstr "Avorrit"
 
-#: src/protocols/silc/buddy.c:1428 src/protocols/silc/silc.c:642
+#: src/protocols/silc/buddy.c:1423 src/protocols/silc/silc.c:639
 #: src/protocols/silc/util.c:487
 msgid "Excited"
 msgstr "Excitat"
 
-#: src/protocols/silc/buddy.c:1430 src/protocols/silc/silc.c:644
+#: src/protocols/silc/buddy.c:1425 src/protocols/silc/silc.c:641
 #: src/protocols/silc/util.c:489
 msgid "Anxious"
 msgstr "Ansiós"
 
-#: src/protocols/silc/buddy.c:1462 src/protocols/silc/ops.c:982
+#: src/protocols/silc/buddy.c:1457 src/protocols/silc/ops.c:980
 msgid "User Modes"
 msgstr "Modes d'usuari"
 
-#: src/protocols/silc/buddy.c:1471 src/protocols/silc/ops.c:991
+#: src/protocols/silc/buddy.c:1466 src/protocols/silc/ops.c:989
 msgid "Mood"
 msgstr "Estat d'ànim"
 
-#: src/protocols/silc/buddy.c:1475 src/protocols/silc/ops.c:997
+#: src/protocols/silc/buddy.c:1470 src/protocols/silc/ops.c:995
 msgid "Status Text"
 msgstr "Text d'estat"
 
-#: src/protocols/silc/buddy.c:1480 src/protocols/silc/ops.c:1003
+#: src/protocols/silc/buddy.c:1475 src/protocols/silc/ops.c:1001
 msgid "Preferred Contact"
 msgstr "Contacte preferit"
 
-#: src/protocols/silc/buddy.c:1485 src/protocols/silc/ops.c:1008
+#: src/protocols/silc/buddy.c:1480 src/protocols/silc/ops.c:1006
 msgid "Preferred Language"
 msgstr "Idioma preferit"
 
-#: src/protocols/silc/buddy.c:1490 src/protocols/silc/ops.c:1013
+#: src/protocols/silc/buddy.c:1485 src/protocols/silc/ops.c:1011
 msgid "Device"
 msgstr "Dispositiu"
 
-#: src/protocols/silc/buddy.c:1495 src/protocols/silc/ops.c:1018
-#: src/protocols/silc/silc.c:692 src/protocols/silc/silc.c:694
+#: src/protocols/silc/buddy.c:1490 src/protocols/silc/ops.c:1016
+#: src/protocols/silc/silc.c:689 src/protocols/silc/silc.c:691
 msgid "Timezone"
 msgstr "Fus horari"
 
-#: src/protocols/silc/buddy.c:1500 src/protocols/silc/ops.c:1023
+#: src/protocols/silc/buddy.c:1495 src/protocols/silc/ops.c:1021
 msgid "Geolocation"
 msgstr "Ubicació geogràfica"
 
-#: src/protocols/silc/buddy.c:1543
+#: src/protocols/silc/buddy.c:1538
 msgid "Reset IM Key"
 msgstr "Reinicia la clau de MI"
 
-#: src/protocols/silc/buddy.c:1548
+#: src/protocols/silc/buddy.c:1543
 msgid "IM with Key Exchange"
 msgstr "MI amb intercanvi de clau"
 
-#: src/protocols/silc/buddy.c:1552
+#: src/protocols/silc/buddy.c:1547
 msgid "IM with Password"
 msgstr "MI amb contrasenya"
 
-#: src/protocols/silc/buddy.c:1563
+#: src/protocols/silc/buddy.c:1558
 msgid "Get Public Key..."
 msgstr "Obtingues la clau pública..."
 
-#: src/protocols/silc/buddy.c:1569 src/protocols/silc/ops.c:1407
+#: src/protocols/silc/buddy.c:1564 src/protocols/silc/ops.c:1409
 msgid "Kill User"
 msgstr "Mata l'usuari"
 
-#: src/protocols/silc/chat.c:38
+#: src/protocols/silc/chat.c:37
 msgid "_Passphrase:"
 msgstr "_Contrasenya:"
 
-#: src/protocols/silc/chat.c:79
+#: src/protocols/silc/chat.c:78
 #, c-format
 msgid "Channel %s does not exist in the network"
 msgstr "No existeix el canal %s a la xarxa"
 
-#: src/protocols/silc/chat.c:80 src/protocols/silc/chat.c:172
+#: src/protocols/silc/chat.c:79 src/protocols/silc/chat.c:171
 msgid "Channel Information"
 msgstr "Informació del canal"
 
-#: src/protocols/silc/chat.c:81
+#: src/protocols/silc/chat.c:80
 msgid "Cannot get channel information"
 msgstr "No s'ha pogut obtenir la informació del canal"
 
-#: src/protocols/silc/chat.c:118
+#: src/protocols/silc/chat.c:117
 #, c-format
 msgid "<b>Channel Name:</b> %s"
 msgstr "<b>Nom del canal:</b> %s"
 
-#: src/protocols/silc/chat.c:121
+#: src/protocols/silc/chat.c:120
 #, c-format
 msgid "<br><b>User Count:</b> %d"
 msgstr "<br><b>Nombre d'usuaris:</b> %d"
 
-#: src/protocols/silc/chat.c:128
+#: src/protocols/silc/chat.c:127
 #, c-format
 msgid "<br><b>Channel Founder:</b> %s"
 msgstr "<br><b>Fundador del canal:</b> %s"
 
-#: src/protocols/silc/chat.c:137
+#: src/protocols/silc/chat.c:136
 #, c-format
 msgid "<br><b>Channel Cipher:</b> %s"
 msgstr "<br><b>Xifrat del canal:</b> %s"
 
-#: src/protocols/silc/chat.c:140
+#: src/protocols/silc/chat.c:139
 #, c-format
 msgid "<br><b>Channel HMAC:</b> %s"
 msgstr "<br><b>HMAC del canal:</b> %s"
 
-#: src/protocols/silc/chat.c:145
+#: src/protocols/silc/chat.c:144
 #, c-format
 msgid "<br><b>Channel Topic:</b><br>%s"
 msgstr "<br><b>Tema del canal:</b><br>%s"
 
-#: src/protocols/silc/chat.c:150
+#: src/protocols/silc/chat.c:149
 msgid "<br><b>Channel Modes:</b> "
 msgstr "<br><b>Modes del canal:</b> "
 
-#: src/protocols/silc/chat.c:163
+#: src/protocols/silc/chat.c:162
 #, c-format
 msgid "<br><b>Founder Key Fingerprint:</b><br>%s"
 msgstr "<br><b>Empremta de la clau del fundador:</b><br>%s"
 
-#: src/protocols/silc/chat.c:164
+#: src/protocols/silc/chat.c:163
 #, c-format
 msgid "<br><b>Founder Key Babbleprint:</b><br>%s"
 msgstr "<br><b>Empremta babble de la clau del fundador:</b><br>%s"
 
-#: src/protocols/silc/chat.c:234
+#: src/protocols/silc/chat.c:233
 msgid "Add Channel Public Key"
 msgstr "Afegeix clau pública del canal"
 
 #. Add new public key
-#: src/protocols/silc/chat.c:289
+#: src/protocols/silc/chat.c:288
 msgid "Open Public Key..."
 msgstr "Obre una clau pública..."
 
-#: src/protocols/silc/chat.c:398
+#: src/protocols/silc/chat.c:397
 msgid "Channel Passphrase"
 msgstr "Contrasenya del canal"
 
-#: src/protocols/silc/chat.c:405
+#: src/protocols/silc/chat.c:404
 msgid "Channel Public Keys List"
 msgstr "Llista de les claus públiques del canal"
 
-#: src/protocols/silc/chat.c:410
+#: src/protocols/silc/chat.c:409
 msgid ""
 "Channel authentication is used to secure the channel from unauthorized "
 "access. The authentication may be based on passphrase and digital "
@@ -9282,125 +9333,125 @@
 "claus públiques del canal, només els usuaris que tinguin les seves claus "
 "públiques llistades al canal hi podran entrar."
 
-#: src/protocols/silc/chat.c:419 src/protocols/silc/chat.c:420
-#: src/protocols/silc/chat.c:457 src/protocols/silc/chat.c:458
-#: src/protocols/silc/chat.c:887
+#: src/protocols/silc/chat.c:418 src/protocols/silc/chat.c:419
+#: src/protocols/silc/chat.c:456 src/protocols/silc/chat.c:457
+#: src/protocols/silc/chat.c:886
 msgid "Channel Authentication"
 msgstr "Autenticació del canal"
 
-#: src/protocols/silc/chat.c:421 src/protocols/silc/chat.c:459
+#: src/protocols/silc/chat.c:420 src/protocols/silc/chat.c:458
 msgid "Add / Remove"
 msgstr "Afegeix / Suprimeix"
 
-#: src/protocols/silc/chat.c:576
+#: src/protocols/silc/chat.c:575
 msgid "Group Name"
 msgstr "Nom del grup"
 
-#: src/protocols/silc/chat.c:580 src/protocols/silc/ops.c:1687
+#: src/protocols/silc/chat.c:579 src/protocols/silc/ops.c:1689
 msgid "Passphrase"
 msgstr "Contrasenya"
 
-#: src/protocols/silc/chat.c:591
+#: src/protocols/silc/chat.c:590
 #, c-format
 msgid "Please enter the %s channel private group name and passphrase."
 msgstr "Introduïu el nom del grup privat i la frase clau per al canal %s."
 
-#: src/protocols/silc/chat.c:593
+#: src/protocols/silc/chat.c:592
 msgid "Add Channel Private Group"
 msgstr "Afegeix un grup privat al canal"
 
+#: src/protocols/silc/chat.c:719
+msgid "User Limit"
+msgstr "L'imit d'usuaris"
+
 #: src/protocols/silc/chat.c:720
-msgid "User Limit"
-msgstr "L'imit d'usuaris"
-
-#: src/protocols/silc/chat.c:721
 msgid "Set user limit on channel. Set to zero to reset user limit."
 msgstr ""
 "Estableix el límit d'usuaris del canal. Poseu-lo a zero per reiniciar el "
 "límit."
 
-#: src/protocols/silc/chat.c:863
+#: src/protocols/silc/chat.c:862
 msgid "Get Info"
 msgstr "Obtingues informació"
 
-#: src/protocols/silc/chat.c:870
+#: src/protocols/silc/chat.c:869
 msgid "Invite List"
 msgstr "Llista de convidats"
 
-#: src/protocols/silc/chat.c:874
+#: src/protocols/silc/chat.c:873
 msgid "Ban List"
 msgstr "Llista de proscrits"
 
-#: src/protocols/silc/chat.c:881
+#: src/protocols/silc/chat.c:880
 msgid "Add Private Group"
 msgstr "Afegeix un grup privat"
 
-#: src/protocols/silc/chat.c:892
+#: src/protocols/silc/chat.c:891
 msgid "Reset Permanent"
 msgstr "Reiniciació permanent"
 
-#: src/protocols/silc/chat.c:896
+#: src/protocols/silc/chat.c:895
 msgid "Set Permanent"
 msgstr "Estableix a permanent"
 
-#: src/protocols/silc/chat.c:903
+#: src/protocols/silc/chat.c:902
 msgid "Set User Limit"
 msgstr "Estableix el límit d'usuaris"
 
-#: src/protocols/silc/chat.c:908
+#: src/protocols/silc/chat.c:907
 msgid "Reset Topic Restriction"
 msgstr "Reinicia la restricció del tema"
 
-#: src/protocols/silc/chat.c:912
+#: src/protocols/silc/chat.c:911
 msgid "Set Topic Restriction"
 msgstr "Estableix restricció del tema"
 
-#: src/protocols/silc/chat.c:918
+#: src/protocols/silc/chat.c:917
 msgid "Reset Private Channel"
 msgstr "Reinicia el canal privat"
 
-#: src/protocols/silc/chat.c:922
+#: src/protocols/silc/chat.c:921
 msgid "Set Private Channel"
 msgstr "Estableix canal privat"
 
-#: src/protocols/silc/chat.c:928
+#: src/protocols/silc/chat.c:927
 msgid "Reset Secret Channel"
 msgstr "Reinicia canal secret"
 
-#: src/protocols/silc/chat.c:932
+#: src/protocols/silc/chat.c:931
 msgid "Set Secret Channel"
 msgstr "Estableix canal secret"
 
-#: src/protocols/silc/chat.c:994
+#: src/protocols/silc/chat.c:993
 #, c-format
 msgid "You are channel founder on <I>%s</I>"
 msgstr "Sou fundador del canal a <I>%s</I>"
 
-#: src/protocols/silc/chat.c:998
+#: src/protocols/silc/chat.c:997
 #, c-format
 msgid "Channel founder on <I>%s</I> is <I>%s</I>"
 msgstr "El fundador del canal a <I>%s</I> és <I>%s</I>"
 
-#: src/protocols/silc/chat.c:1057
+#: src/protocols/silc/chat.c:1056
 #, c-format
 msgid ""
 "You have to join the %s channel before you are able to join the private group"
 msgstr ""
 "Primer heu d'entrar al canal %s per després poder entrar al grup privat"
 
-#: src/protocols/silc/chat.c:1059
+#: src/protocols/silc/chat.c:1058
 msgid "Join Private Group"
 msgstr "Entra al grup privat"
 
-#: src/protocols/silc/chat.c:1060
+#: src/protocols/silc/chat.c:1059
 msgid "Cannot join private group"
 msgstr "No s'ha pogut entrar al grup privat"
 
-#: src/protocols/silc/chat.c:1253 src/protocols/silc/silc.c:903
+#: src/protocols/silc/chat.c:1252 src/protocols/silc/silc.c:899
 msgid "Cannot call command"
 msgstr "No s'ha pogut cridar l'ordre"
 
-#: src/protocols/silc/chat.c:1254 src/protocols/silc/silc.c:904
+#: src/protocols/silc/chat.c:1253 src/protocols/silc/silc.c:900
 msgid "Unknown command"
 msgstr "Ordre desconeguda"
 
@@ -9427,8 +9478,8 @@
 msgstr "Ha fallat l'acord sobre la clau"
 
 #: src/protocols/silc/ft.c:102
-msgid "File transfer session does not exist"
-msgstr "La sessió de transferència de fitxer no existeix"
+msgid "File transfer sessions does not exist"
+msgstr "Les sessions de transferència de fitxers no existeixen"
 
 #: src/protocols/silc/ft.c:206
 msgid "No file transfer session active"
@@ -9450,142 +9501,150 @@
 msgid "Cannot send file"
 msgstr "No s'ha pogut enviar el fitxer"
 
-#: src/protocols/silc/ops.c:341 src/protocols/silc/ops.c:350
-#: src/protocols/silc/ops.c:359
+#: src/protocols/silc/ops.c:339 src/protocols/silc/ops.c:348
+#: src/protocols/silc/ops.c:357
 #, c-format
 msgid "%s has changed the topic of <I>%s</I> to: %s"
 msgstr "%s ha canviat el tema de <I>%s</I> a: %s"
 
-#: src/protocols/silc/ops.c:425
+#: src/protocols/silc/ops.c:423
 #, c-format
 msgid "<I>%s</I> set channel <I>%s</I> modes to: %s"
 msgstr "<I>%s</I> ha canviat el mode del canal <I>%s</I> a: %s"
 
-#: src/protocols/silc/ops.c:429
+#: src/protocols/silc/ops.c:427
 #, c-format
 msgid "<I>%s</I> removed all channel <I>%s</I> modes"
 msgstr "<I>%s</I> ha suprimit tos els modes del canal <I>%s</I>"
 
-#: src/protocols/silc/ops.c:462
+#: src/protocols/silc/ops.c:460
 #, c-format
 msgid "<I>%s</I> set <I>%s's</I> modes to: %s"
 msgstr "<I>%s</I> ha canviat el mode de <I>%s</I> a: %s"
 
-#: src/protocols/silc/ops.c:470
+#: src/protocols/silc/ops.c:468
 #, c-format
 msgid "<I>%s</I> removed all <I>%s's</I> modes"
 msgstr "<I>%s</I> ha suprimit tots els modes de <I>%s</I>"
 
-#: src/protocols/silc/ops.c:499
+#: src/protocols/silc/ops.c:497
 #, c-format
 msgid "You have been kicked off <I>%s</I> by <I>%s</I> (%s)"
 msgstr "<I>%2$s</I> us ha fet fora de <I>%1$s</I> (%3$s)"
 
-#: src/protocols/silc/ops.c:529 src/protocols/silc/ops.c:534
-#: src/protocols/silc/ops.c:539
+#: src/protocols/silc/ops.c:527 src/protocols/silc/ops.c:532
+#: src/protocols/silc/ops.c:537
 #, c-format
 msgid "You have been killed by %s (%s)"
 msgstr "%s us ha matat (%s)"
 
-#: src/protocols/silc/ops.c:560 src/protocols/silc/ops.c:565
-#: src/protocols/silc/ops.c:570
+#: src/protocols/silc/ops.c:558 src/protocols/silc/ops.c:563
+#: src/protocols/silc/ops.c:568
 #, c-format
 msgid "Killed by %s (%s)"
 msgstr "%s us ha matat (%s)"
 
-#: src/protocols/silc/ops.c:616
+#: src/protocols/silc/ops.c:614
 msgid "Server signoff"
 msgstr "Desconnexió del servidor"
 
-#: src/protocols/silc/ops.c:803
+#: src/protocols/silc/ops.c:801
 msgid "Personal Information"
 msgstr "Informació personal"
 
-#: src/protocols/silc/ops.c:826
+#: src/protocols/silc/ops.c:824
 msgid "Birth Day"
 msgstr "Data de naixement"
 
-#: src/protocols/silc/ops.c:830
+#: src/protocols/silc/ops.c:828
 msgid "Job Title"
 msgstr "Títol de la feina"
 
-#: src/protocols/silc/ops.c:834
+#: src/protocols/silc/ops.c:832
 msgid "Job Role"
 msgstr "Rol a la feina"
 
-#: src/protocols/silc/ops.c:838
+#: src/protocols/silc/ops.c:836
 msgid "Organization"
 msgstr "Organització"
 
-#: src/protocols/silc/ops.c:842
+#: src/protocols/silc/ops.c:840
 msgid "Unit"
 msgstr "Unitat"
 
-#: src/protocols/silc/ops.c:861
+#: src/protocols/silc/ops.c:859
 msgid "EMail"
 msgstr "Correu"
 
-#: src/protocols/silc/ops.c:866
+#: src/protocols/silc/ops.c:864
 msgid "Note"
 msgstr "Nota"
 
-#: src/protocols/silc/ops.c:914
+#: src/protocols/silc/ops.c:912
 msgid "Join Chat"
 msgstr "Entrar a un xat"
 
-#: src/protocols/silc/ops.c:1070 src/protocols/silc/ops.c:1142
+#: src/protocols/silc/ops.c:1068 src/protocols/silc/ops.c:1139
 msgid "Public Key Fingerprint"
 msgstr "Emprenta de la clau pública"
 
-#: src/protocols/silc/ops.c:1071 src/protocols/silc/ops.c:1143
+#: src/protocols/silc/ops.c:1069 src/protocols/silc/ops.c:1140
 msgid "Public Key Babbleprint"
 msgstr "Empremta babble de la clau pública"
 
-#: src/protocols/silc/ops.c:1084
+#: src/protocols/silc/ops.c:1082
 msgid "More..."
 msgstr "Més..."
 
-#: src/protocols/silc/ops.c:1159 src/protocols/silc/silc.c:791
+#: src/protocols/silc/ops.c:1155 src/protocols/silc/silc.c:788
 msgid "Detach From Server"
 msgstr "Separa del servidor"
 
-#: src/protocols/silc/ops.c:1159
+#: src/protocols/silc/ops.c:1155
 msgid "Cannot detach"
 msgstr "No s'ha pogut separar"
 
-#: src/protocols/silc/ops.c:1170
+#: src/protocols/silc/ops.c:1166
 msgid "Cannot set topic"
 msgstr "No s'ha pogut establir el tema"
 
-#: src/protocols/silc/ops.c:1202
+#: src/protocols/silc/ops.c:1204
 msgid "Failed to change nickname"
 msgstr "No s'ha pogut canviar el sobrenom"
 
-#: src/protocols/silc/ops.c:1287
+#: src/protocols/silc/ops.c:1241
+msgid "Roomlist"
+msgstr "Llista de sales"
+
+#: src/protocols/silc/ops.c:1241
+msgid "Cannot get room list"
+msgstr "No s'ha pogut obtenir la llista de sales"
+
+#: src/protocols/silc/ops.c:1289
 msgid "No public key was received"
 msgstr "No s'ha rebut cap clau pública"
 
-#: src/protocols/silc/ops.c:1300 src/protocols/silc/ops.c:1314
+#: src/protocols/silc/ops.c:1302 src/protocols/silc/ops.c:1316
 msgid "Server Information"
 msgstr "Informació del servidor"
 
-#: src/protocols/silc/ops.c:1301
+#: src/protocols/silc/ops.c:1303
 msgid "Cannot get server information"
 msgstr "No s'ha pogut obtenir informació del servidor"
 
-#: src/protocols/silc/ops.c:1332 src/protocols/silc/ops.c:1341
+#: src/protocols/silc/ops.c:1334 src/protocols/silc/ops.c:1343
 msgid "Server Statistics"
 msgstr "Estadístiques del servidor"
 
-#: src/protocols/silc/ops.c:1333
+#: src/protocols/silc/ops.c:1335
 msgid "Cannot get server statistics"
 msgstr "No s'han pogut obtenir estadístiques del servidor"
 
-#: src/protocols/silc/ops.c:1342
+#: src/protocols/silc/ops.c:1344
 msgid "No server statistics available"
 msgstr "No hi ha estadístiques del servidor disponibles"
 
-#: src/protocols/silc/ops.c:1364
+#: src/protocols/silc/ops.c:1366
 #, c-format
 msgid ""
 "Local server start time: %s\n"
@@ -9620,100 +9679,100 @@
 "Total operdors del servidor: %d\n"
 "Total operadors de l'encaminador: %d\n"
 
-#: src/protocols/silc/ops.c:1387
+#: src/protocols/silc/ops.c:1389
 msgid "Network Statistics"
 msgstr "Estadístiques de xarxa"
 
-#: src/protocols/silc/ops.c:1395 src/protocols/silc/ops.c:1400
+#: src/protocols/silc/ops.c:1397 src/protocols/silc/ops.c:1402
 msgid "Ping"
 msgstr "Ping"
 
-#: src/protocols/silc/ops.c:1395
+#: src/protocols/silc/ops.c:1397
 msgid "Ping failed"
 msgstr "Ha fallat el ping"
 
-#: src/protocols/silc/ops.c:1400
+#: src/protocols/silc/ops.c:1402
 msgid "Ping reply received from server"
 msgstr "S'ha rebut la resposta al ping del servidor"
 
-#: src/protocols/silc/ops.c:1408
+#: src/protocols/silc/ops.c:1410
 msgid "Could not kill user"
 msgstr "No s'ha pogut matar l'usuari"
 
-#: src/protocols/silc/ops.c:1489
+#: src/protocols/silc/ops.c:1491
 msgid "Error during connecting to SILC Server"
 msgstr "S'ha produït un error en connectar al servidor SILC"
 
-#: src/protocols/silc/ops.c:1494
+#: src/protocols/silc/ops.c:1496
 msgid "Key Exchange failed"
 msgstr "Ha fallat l'intercanvi de claus"
 
-#: src/protocols/silc/ops.c:1503
+#: src/protocols/silc/ops.c:1505
 msgid ""
 "Resuming detached session failed. Press Reconnect to create new connection."
 msgstr ""
-"No s'ha pogut restablir la sessió anteriorment separada. Premeu Reconnecta "
-"per crear una nova connexió."
-
-#: src/protocols/silc/ops.c:1538
+"No s'ha pogut restablir la sessió anteriorment separada. Premeu «Torna a "
+"connectar» per crear una nova connexió."
+
+#: src/protocols/silc/ops.c:1540
 msgid "Disconnected by server"
 msgstr "El servidor us ha desconnectat"
 
-#: src/protocols/silc/ops.c:1598 src/protocols/silc/ops.c:1645
-#: src/protocols/silc/silc.c:192
+#: src/protocols/silc/ops.c:1600 src/protocols/silc/ops.c:1647
+#: src/protocols/silc/silc.c:178
 msgid "Resuming session"
 msgstr "S'està reprenent la sessió"
 
-#: src/protocols/silc/ops.c:1600
+#: src/protocols/silc/ops.c:1602
 msgid "Authenticating connection"
 msgstr "S'està autenticant la connexió"
 
-#: src/protocols/silc/ops.c:1647
+#: src/protocols/silc/ops.c:1649
 msgid "Verifying server public key"
 msgstr "S'està verificant la clau pública del servidor"
 
-#: src/protocols/silc/ops.c:1688
+#: src/protocols/silc/ops.c:1690
 msgid "Passphrase required"
 msgstr "Cal contrasenya"
 
-#: src/protocols/silc/ops.c:1717
+#: src/protocols/silc/ops.c:1719
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "Fallida: Les versions no coincideixen, actualitzeu el client"
 
-#: src/protocols/silc/ops.c:1720
+#: src/protocols/silc/ops.c:1722
 msgid "Failure: Remote does not trust/support your public key"
 msgstr "Fallida: El remot no es fia de o no suporta la vostra clau pública"
 
-#: src/protocols/silc/ops.c:1723
+#: src/protocols/silc/ops.c:1725
 msgid "Failure: Remote does not support proposed KE group"
 msgstr "Fallida: El remot no implementa el grup KE proposat"
 
-#: src/protocols/silc/ops.c:1726
+#: src/protocols/silc/ops.c:1728
 msgid "Failure: Remote does not support proposed cipher"
 msgstr "Fallida: El remot no implementa el xifrat proposat"
 
-#: src/protocols/silc/ops.c:1729
+#: src/protocols/silc/ops.c:1731
 msgid "Failure: Remote does not support proposed PKCS"
 msgstr "Fallida: El remot no implementa la PKCS proposada"
 
-#: src/protocols/silc/ops.c:1732
+#: src/protocols/silc/ops.c:1734
 msgid "Failure: Remote does not support proposed hash function"
 msgstr ""
 "Fallida: El remot no implementa la funció de suma de comprovació proposada"
 
-#: src/protocols/silc/ops.c:1735
+#: src/protocols/silc/ops.c:1737
 msgid "Failure: Remote does not support proposed HMAC"
 msgstr "Fallida: El remot no implementa la HMAC proposada"
 
-#: src/protocols/silc/ops.c:1737
+#: src/protocols/silc/ops.c:1739
 msgid "Failure: Incorrect signature"
 msgstr "Fallida: La signatura no és correcta"
 
-#: src/protocols/silc/ops.c:1739
+#: src/protocols/silc/ops.c:1741
 msgid "Failure: Invalid cookie"
 msgstr "Fallida: La galeta no és vàlida"
 
-#: src/protocols/silc/ops.c:1750
+#: src/protocols/silc/ops.c:1752
 msgid "Failure: Authentication failed"
 msgstr "Error: Ha fallat l'autenticació"
 
@@ -9756,36 +9815,36 @@
 msgid "Unsupported public key type"
 msgstr "El tipus de la clau pública no està suportat"
 
-#: src/protocols/silc/silc.c:152
+#: src/protocols/silc/silc.c:138
 msgid "Connection failed"
 msgstr "Ha fallat la connexió"
 
-#: src/protocols/silc/silc.c:184
+#: src/protocols/silc/silc.c:170
 msgid "Cannot initialize SILC Client connection"
 msgstr "No s'ha pogut inicialitzar la connexió per al client SILC"
 
-#: src/protocols/silc/silc.c:195
+#: src/protocols/silc/silc.c:181
 msgid "Performing key exchange"
 msgstr "S'estan intercanviant les claus"
 
-#: src/protocols/silc/silc.c:267
+#: src/protocols/silc/silc.c:253
 msgid "Out of memory"
 msgstr "Sense memòria"
 
 #. Progress
-#: src/protocols/silc/silc.c:301
+#: src/protocols/silc/silc.c:287
 msgid "Connecting to SILC Server"
 msgstr "S'està connectant al servidor SILC"
 
-#: src/protocols/silc/silc.c:620
+#: src/protocols/silc/silc.c:617
 msgid "Your Current Mood"
 msgstr "El vostre estat d'ànim actual"
 
-#: src/protocols/silc/silc.c:622
+#: src/protocols/silc/silc.c:619
 msgid "Normal"
 msgstr "Normal"
 
-#: src/protocols/silc/silc.c:647
+#: src/protocols/silc/silc.c:644
 msgid ""
 "\n"
 "Your Preferred Contact Methods"
@@ -9793,43 +9852,43 @@
 "\n"
 "El vostre mètode de contacte preferit"
 
-#: src/protocols/silc/silc.c:655 src/protocols/silc/util.c:514
+#: src/protocols/silc/silc.c:652 src/protocols/silc/util.c:514
 msgid "SMS"
 msgstr "SMS"
 
-#: src/protocols/silc/silc.c:657 src/protocols/silc/util.c:516
+#: src/protocols/silc/silc.c:654 src/protocols/silc/util.c:516
 msgid "MMS"
 msgstr "MMS"
 
-#: src/protocols/silc/silc.c:659 src/protocols/silc/util.c:518
+#: src/protocols/silc/silc.c:656 src/protocols/silc/util.c:518
 msgid "Video Conferencing"
 msgstr "Videoconferència"
 
-#: src/protocols/silc/silc.c:664
+#: src/protocols/silc/silc.c:661
 msgid "Your Current Status"
 msgstr "El vostre estat actual"
 
-#: src/protocols/silc/silc.c:671
+#: src/protocols/silc/silc.c:668
 msgid "Online Services"
 msgstr "Serveis en línia"
 
-#: src/protocols/silc/silc.c:674
+#: src/protocols/silc/silc.c:671
 msgid "Let others see what services you are using"
 msgstr "Permet que els altres vegin quins serveis feu servir"
 
-#: src/protocols/silc/silc.c:680
+#: src/protocols/silc/silc.c:677
 msgid "Let others see what computer you are using"
 msgstr "Permet que els altres vegin quin ordinador feu servir"
 
-#: src/protocols/silc/silc.c:687
+#: src/protocols/silc/silc.c:684
 msgid "Your VCard File"
 msgstr "El fitxer de la vostra VCard"
 
-#: src/protocols/silc/silc.c:700 src/protocols/silc/silc.c:701
+#: src/protocols/silc/silc.c:697 src/protocols/silc/silc.c:698
 msgid "User Online Status Attributes"
 msgstr "Atributs de l'estat de l'usuari en línia"
 
-#: src/protocols/silc/silc.c:702
+#: src/protocols/silc/silc.c:699
 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 "
@@ -9839,32 +9898,36 @@
 "línia, així com informació personal. Empleneu la informació que vulgueu que "
 "altres usuaris puguin veure."
 
-#: src/protocols/silc/silc.c:742 src/protocols/silc/silc.c:748
+#: src/protocols/silc/silc.c:739 src/protocols/silc/silc.c:745
 #: src/protocols/silc/silc.c:1148
 msgid "Message of the Day"
 msgstr "Frase del dia"
 
-#: src/protocols/silc/silc.c:742
+#: src/protocols/silc/silc.c:739
 msgid "No Message of the Day available"
 msgstr "No es disposa de frase del dia"
 
-#: src/protocols/silc/silc.c:743 src/protocols/silc/silc.c:1143
+#: src/protocols/silc/silc.c:740 src/protocols/silc/silc.c:1143
 msgid "There is no Message of the Day associated with this connection"
 msgstr "No hi ha cap frase del dia associada amb aquesta connexió"
 
-#: src/protocols/silc/silc.c:786
+#: src/protocols/silc/silc.c:783
 msgid "Online Status"
 msgstr "Estat en línia"
 
-#: src/protocols/silc/silc.c:795
+#: src/protocols/silc/silc.c:792
 msgid "View Message of the Day"
 msgstr "Mostra la frase del dia"
 
-#: src/protocols/silc/silc.c:868
+#: src/protocols/silc/silc.c:864
 #, c-format
 msgid "User <I>%s</I> is not present in the network"
 msgstr "L'usuari <I>%s</I> no està present a la xarxa"
 
+#: src/protocols/silc/silc.c:973
+msgid "Failed to leave channel"
+msgstr "Ha fallat en sortir del canal"
+
 #: src/protocols/silc/silc.c:1019
 msgid "Topic too long"
 msgstr "El tema és massa llarg"
@@ -9923,7 +9986,7 @@
 msgid "whois &lt;nick&gt;:  View nick's information"
 msgstr "whois &lt;sobrenom&gt;:  Mostra informació sobre el sobrenom"
 
-#: src/protocols/silc/silc.c:1340 src/protocols/zephyr/zephyr.c:2563
+#: src/protocols/silc/silc.c:1340 src/protocols/zephyr/zephyr.c:2478
 msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user"
 msgstr ""
 "msg &lt;sobrenom&gt; &lt;missatge&gt;:  Envia un missatge privat a l'usuari "
@@ -10204,117 +10267,117 @@
 msgid "Terminal"
 msgstr "Terminal"
 
-#: src/protocols/toc/toc.c:138
+#: src/protocols/toc/toc.c:137
 #, c-format
 msgid "Looking up %s"
 msgstr "S'està cercant %s"
 
-#: src/protocols/toc/toc.c:199
+#: src/protocols/toc/toc.c:198
 #, c-format
 msgid "Signon: %s"
 msgstr "Entrada: %s"
 
-#: src/protocols/toc/toc.c:481
+#: src/protocols/toc/toc.c:480
 #, c-format
 msgid "Unable to write file %s."
 msgstr "No s'ha pogut escriure el fitxer %s."
 
-#: src/protocols/toc/toc.c:484
+#: src/protocols/toc/toc.c:483
 #, c-format
 msgid "Unable to read file %s."
 msgstr "No s'ha pogut llegir el fitxer %s."
 
-#: src/protocols/toc/toc.c:487
+#: src/protocols/toc/toc.c:486
 #, c-format
 msgid "Message too long, last %s bytes truncated."
 msgstr "El missatge és massa llarg, s'han retallat els últims %s octets."
 
-#: src/protocols/toc/toc.c:490
+#: src/protocols/toc/toc.c:489
 #, c-format
 msgid "%s not currently logged in."
 msgstr "%s està desconnectat."
 
-#: src/protocols/toc/toc.c:493
+#: src/protocols/toc/toc.c:492
 #, c-format
 msgid "Warning of %s not allowed."
 msgstr "Avís de %s no permès."
 
-#: src/protocols/toc/toc.c:496
+#: src/protocols/toc/toc.c:495
 msgid "A message has been dropped, you are exceeding the server speed limit."
 msgstr ""
 "S'ha ignorat un missatge. Esteu excedint el límit de velocitat del servidor."
 
-#: src/protocols/toc/toc.c:499
+#: src/protocols/toc/toc.c:498
 #, c-format
 msgid "Chat in %s is not available."
 msgstr "El xat a %s no està disponible."
 
-#: src/protocols/toc/toc.c:502
+#: src/protocols/toc/toc.c:501
 #, c-format
 msgid "You are sending messages too fast to %s."
 msgstr "Esteu enviant missatges massa depressa a %s."
 
-#: src/protocols/toc/toc.c:505
+#: src/protocols/toc/toc.c:504
 #, c-format
 msgid "You missed an IM from %s because it was too big."
 msgstr "Us heu perdut un missatge instantani de %s perquè era massa gran."
 
-#: src/protocols/toc/toc.c:508
+#: src/protocols/toc/toc.c:507
 #, c-format
 msgid "You missed an IM from %s because it was sent too fast."
 msgstr ""
 "Heu perdut un missatge instantani de %s perquè s'ha enviat massa depressa."
 
-#: src/protocols/toc/toc.c:511
+#: src/protocols/toc/toc.c:510
 msgid "Failure."
 msgstr "Fallada."
 
-#: src/protocols/toc/toc.c:514
+#: src/protocols/toc/toc.c:513
 msgid "Too many matches."
 msgstr "Massa coincidències."
 
-#: src/protocols/toc/toc.c:517
+#: src/protocols/toc/toc.c:516
 msgid "Need more qualifiers."
 msgstr "Es necessiten més qualificadors."
 
-#: src/protocols/toc/toc.c:520
+#: src/protocols/toc/toc.c:519
 msgid "Dir service temporarily unavailable."
 msgstr "Servei de directori no disponible temporalment."
 
-#: src/protocols/toc/toc.c:523
+#: src/protocols/toc/toc.c:522
 msgid "Email lookup restricted."
 msgstr "Recerca per adreça de correu electrònic restringida."
 
-#: src/protocols/toc/toc.c:526
+#: src/protocols/toc/toc.c:525
 msgid "Keyword ignored."
 msgstr "S'ha ignorat la paraula clau."
 
-#: src/protocols/toc/toc.c:529
+#: src/protocols/toc/toc.c:528
 msgid "No keywords."
 msgstr "No hi ha paraules clau."
 
-#: src/protocols/toc/toc.c:532
+#: src/protocols/toc/toc.c:531
 msgid "User has no directory information."
 msgstr "L'usuari no té informació al directori."
 
-#: src/protocols/toc/toc.c:536
+#: src/protocols/toc/toc.c:535
 msgid "Country not supported."
 msgstr "País no suportat."
 
-#: src/protocols/toc/toc.c:539
+#: src/protocols/toc/toc.c:538
 #, c-format
 msgid "Failure unknown: %s."
 msgstr "Fallada desconeguda: %s."
 
-#: src/protocols/toc/toc.c:545
+#: src/protocols/toc/toc.c:544
 msgid "The service is temporarily unavailable."
 msgstr "El servei està temporalment no disponible."
 
-#: src/protocols/toc/toc.c:548
+#: src/protocols/toc/toc.c:547
 msgid "Your warning level is currently too high to log in."
 msgstr "El vostre nivell d'avisos és massa alt per a connectar-se."
 
-#: src/protocols/toc/toc.c:551
+#: src/protocols/toc/toc.c:550
 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."
@@ -10323,37 +10386,37 @@
 "minuts i torneu-ho a provar. Si continueu intentant-ho, haureu d'esperar "
 "encara més."
 
-#: src/protocols/toc/toc.c:553
+#: src/protocols/toc/toc.c:552
 #, c-format
 msgid "An unknown signon error has occurred: %s."
 msgstr "Hi ha hagut un error de connexió desconegut: %s."
 
-#: src/protocols/toc/toc.c:556
+#: src/protocols/toc/toc.c:555
 #, c-format
 msgid "An unknown error, %d, has occurred.  Info: %s"
 msgstr "Un error desconegut, %d ha succeït. Informació: %s"
 
-#: src/protocols/toc/toc.c:577
+#: src/protocols/toc/toc.c:576
 msgid "Connection Closed"
 msgstr "Connexió tancada"
 
-#: src/protocols/toc/toc.c:617
+#: src/protocols/toc/toc.c:616
 msgid "Waiting for reply..."
 msgstr "S'està esperant una resposta..."
 
-#: src/protocols/toc/toc.c:696
+#: src/protocols/toc/toc.c:695
 msgid "TOC has come back from its pause. You may now send messages again."
 msgstr "TOC ha tornat de la pausa. Ja podeu enviar missatges de nou."
 
-#: src/protocols/toc/toc.c:899
+#: src/protocols/toc/toc.c:892
 msgid "Password Change Successful"
 msgstr "S'ha canviat la contrasenya amb èxit"
 
-#: src/protocols/toc/toc.c:903
+#: src/protocols/toc/toc.c:896
 msgid "TOC has sent a PAUSE command."
 msgstr "TOC ha enviat l'ordre PAUSE."
 
-#: src/protocols/toc/toc.c:904
+#: src/protocols/toc/toc.c:897
 msgid ""
 "When this happens, TOC ignores any messages sent to it, and may kick you off "
 "if you send a message. Gaim will prevent anything from going through. This "
@@ -10363,47 +10426,47 @@
 "fora si envieu un missatge. Gaim evitarà que passi res d'això. Això és només "
 "temporalment. Si us plau, tingueu paciència."
 
-#: src/protocols/toc/toc.c:1432
+#: src/protocols/toc/toc.c:1423
 msgid "Get Dir Info"
 msgstr "Obtingues informació del directori"
 
-#: src/protocols/toc/toc.c:1572
+#: src/protocols/toc/toc.c:1559
 msgid "Set Dir Info"
 msgstr "Estableix informació del directori"
 
-#: src/protocols/toc/toc.c:1694
+#: src/protocols/toc/toc.c:1681
 #, c-format
 msgid "Could not open %s for writing!"
 msgstr "No s'ha pogut obrir %s per a escriure-hi."
 
-#: src/protocols/toc/toc.c:1730
+#: src/protocols/toc/toc.c:1717
 msgid "File transfer failed; other side probably canceled."
 msgstr ""
 "Ha fallat la transferència de fitxers. Probablement s'ha cancel·lat a "
 "l'altra banda."
 
-#: src/protocols/toc/toc.c:1775 src/protocols/toc/toc.c:1815
-#: src/protocols/toc/toc.c:1939 src/protocols/toc/toc.c:2027
+#: src/protocols/toc/toc.c:1762 src/protocols/toc/toc.c:1802
+#: src/protocols/toc/toc.c:1926 src/protocols/toc/toc.c:2014
 msgid "Could not connect for transfer."
 msgstr "No s'ha pogut connectar per realitzar la transferència."
 
-#: src/protocols/toc/toc.c:1972
+#: src/protocols/toc/toc.c:1959
 msgid "Could not write file header.  The file will not be transferred."
 msgstr ""
 "No s'ha pogut escriure la capçalera del fitxer. El fitxer no serà enviat."
 
-#: src/protocols/toc/toc.c:2072
+#: src/protocols/toc/toc.c:2059
 msgid "Gaim - Save As..."
 msgstr "Gaim - Anomena i desa..."
 
-#: src/protocols/toc/toc.c:2106
+#: src/protocols/toc/toc.c:2093
 #, c-format
 msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
 msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
 msgstr[0] "%s demana %s acceptar %d fitxer: %s (%.2f %s)%s%s"
 msgstr[1] "%s demana %s acceptar %d fitxers: %s (%.2f %s)%s%s"
 
-#: src/protocols/toc/toc.c:2113
+#: src/protocols/toc/toc.c:2100
 #, c-format
 msgid "%s requests you to send them a file"
 msgstr "%s us demana que li envieu un fitxer"
@@ -10418,15 +10481,15 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/toc/toc.c:2200 src/protocols/toc/toc.c:2202
+#: src/protocols/toc/toc.c:2187 src/protocols/toc/toc.c:2189
 msgid "TOC Protocol Plugin"
 msgstr "Connector per al protocol TOC"
 
-#: src/protocols/toc/toc.c:2221
+#: src/protocols/toc/toc.c:2208
 msgid "TOC host"
 msgstr "Servidor TOC"
 
-#: src/protocols/toc/toc.c:2225
+#: src/protocols/toc/toc.c:2212
 msgid "TOC port"
 msgstr "Port TOC"
 
@@ -10495,7 +10558,7 @@
 msgid "Local Users"
 msgstr "Usuaris locals"
 
-#: src/protocols/trepia/trepia.c:1030
+#: src/protocols/trepia/trepia.c:1028
 msgid "Logging in"
 msgstr "S'està connectant"
 
@@ -10509,11 +10572,11 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/trepia/trepia.c:1277 src/protocols/trepia/trepia.c:1279
+#: src/protocols/trepia/trepia.c:1275 src/protocols/trepia/trepia.c:1277
 msgid "Trepia Protocol Plugin"
 msgstr "Connector per al protocol Trepia"
 
-#: src/protocols/yahoo/yahoo.c:141
+#: src/protocols/yahoo/yahoo.c:339
 msgid ""
 "You have been logged off as you have logged in on a different machine or "
 "device."
@@ -10521,26 +10584,26 @@
 "Se us ha desconnectat ja que us heu connectat de d'un altre ordinador o "
 "dispositiu."
 
-#: src/protocols/yahoo/yahoo.c:626
+#: src/protocols/yahoo/yahoo.c:826
 msgid "Your Yahoo! message did not get sent."
 msgstr "No s'ha pogut enviar el vostre missatge de Yahoo!"
 
-#: src/protocols/yahoo/yahoo.c:645 src/protocols/yahoo/yahoo.c:3189
+#: src/protocols/yahoo/yahoo.c:845
 msgid "Buzz!!"
 msgstr "Buzz!!"
 
-#: src/protocols/yahoo/yahoo.c:690
+#: src/protocols/yahoo/yahoo.c:890
 #, c-format
 msgid "Yahoo! system message for %s:"
 msgstr "Missatge del sistema de yahoo! per a %s:"
 
-#: src/protocols/yahoo/yahoo.c:757
+#: src/protocols/yahoo/yahoo.c:957
 #, c-format
 msgid "%s has (retroactively) denied your request to add them to your list."
 msgstr ""
 "%s us ha denegat (retroactivament) la petició d'afegir-lo a la vostra llista."
 
-#: src/protocols/yahoo/yahoo.c:760
+#: src/protocols/yahoo/yahoo.c:960
 #, c-format
 msgid ""
 "%s has (retroactively) denied your request to add them to your list for the "
@@ -10550,11 +10613,11 @@
 "pel següent motiu:\n"
 "%s"
 
-#: src/protocols/yahoo/yahoo.c:763
+#: src/protocols/yahoo/yahoo.c:963
 msgid "Add buddy rejected"
 msgstr "S'ha rebutjat afegir l'amic"
 
-#: src/protocols/yahoo/yahoo.c:1511
+#: src/protocols/yahoo/yahoo.c:1724
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -10565,11 +10628,11 @@
 "reconegut. Aquesta versió de Gaim no podrà connectar-se correctament a "
 "Yahoo. Comproveu si hi ha actualitzacions a %s."
 
-#: src/protocols/yahoo/yahoo.c:1514
+#: src/protocols/yahoo/yahoo.c:1727
 msgid "Failed Yahoo! Authentication"
 msgstr "Ha fallat l'autenticació amb Yahoo!"
 
-#: src/protocols/yahoo/yahoo.c:1587
+#: src/protocols/yahoo/yahoo.c:1799
 #, c-format
 msgid ""
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
@@ -10578,19 +10641,19 @@
 "Heu intentat ignorar a %s, però l'usuari no és a la vostra llista d'amics. "
 "Fent clic a \"Sí\" se suprimirà i s'ignorarà l'amic."
 
-#: src/protocols/yahoo/yahoo.c:1590
+#: src/protocols/yahoo/yahoo.c:1802
 msgid "Ignore buddy?"
 msgstr "Voleu ignorar l'amic?"
 
-#: src/protocols/yahoo/yahoo.c:1624
+#: src/protocols/yahoo/yahoo.c:1836
 msgid "Invalid username."
 msgstr "El nom d'usuari no és vàlid"
 
-#: src/protocols/yahoo/yahoo.c:1635
+#: src/protocols/yahoo/yahoo.c:1847
 msgid "Normal authentication failed!"
 msgstr "Ha fallat l'autenticació normal"
 
-#: src/protocols/yahoo/yahoo.c:1636
+#: src/protocols/yahoo/yahoo.c:1848
 msgid ""
 "The normal authentication method has failed. This means either your password "
 "is incorrect, or Yahoo!'s authentication scheme has changed. Gaim will now "
@@ -10602,100 +10665,97 @@
 "El Gaim intentarà connectar fent servir l'autenticació Web Messenger, que "
 "implica que no tindreu tantes funcionalitats disponibles."
 
-#: src/protocols/yahoo/yahoo.c:1644
+#: src/protocols/yahoo/yahoo.c:1856
 msgid "Incorrect password."
 msgstr "La contrasenya no és correcta."
 
-#: src/protocols/yahoo/yahoo.c:1647
+#: src/protocols/yahoo/yahoo.c:1859
 msgid "Your account is locked, please log in to the Yahoo! website."
 msgstr "El vostre compte està blocat, entreu a la web de Yahoo!"
 
-#: src/protocols/yahoo/yahoo.c:1650
+#: src/protocols/yahoo/yahoo.c:1862
 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr ""
 "Error desconegut número %d. Això es pot sol·lucionar entrant a la web de "
 "Yahoo!"
 
-#: src/protocols/yahoo/yahoo.c:1704
+#: src/protocols/yahoo/yahoo.c:1916
 #, c-format
 msgid "Could not add buddy %s to group %s to the server list on account %s."
 msgstr ""
 "No s'ha pogut afegir l'amic %s al grup %s a la llista del servidor del "
 "compte %s."
 
-#: src/protocols/yahoo/yahoo.c:1707
+#: src/protocols/yahoo/yahoo.c:1919
 msgid "Could not add buddy to server list"
 msgstr "No s'ha pogut afegir l'amic a la llista del servidor"
 
-#: src/protocols/yahoo/yahoo.c:1941 src/protocols/yahoo/yahoo.c:2087
-#: src/protocols/yahoo/ycht.c:415
+#: src/protocols/yahoo/yahoo.c:2153 src/protocols/yahoo/yahoo.c:2301
+#: src/protocols/yahoo/ycht.c:414
 msgid "Unable to read"
 msgstr "No s'ha pogut llegir"
 
-#: src/protocols/yahoo/yahoo.c:2109 src/protocols/yahoo/yahoo.c:2219
-#: src/protocols/yahoo/yahoo.c:2301 src/protocols/yahoo/yahoo.c:2311
-#: src/protocols/yahoo/yahoochat.c:1372 src/protocols/yahoo/yahoochat.c:1433
-#: src/protocols/yahoo/ycht.c:519
+#: src/protocols/yahoo/yahoo.c:2323 src/protocols/yahoo/yahoo.c:2433
+#: src/protocols/yahoo/yahoo.c:2483 src/protocols/yahoo/yahoo.c:2493
+#: src/protocols/yahoo/yahoochat.c:1417 src/protocols/yahoo/yahoochat.c:1478
+#: src/protocols/yahoo/ycht.c:518
 msgid "Connection problem"
 msgstr "Hi ha un problema de connexió"
 
-#: src/protocols/yahoo/yahoo.c:2414 src/protocols/yahoo/yahoo.c:2925
+#: src/protocols/yahoo/yahoo.c:2589 src/protocols/yahoo/yahoo.c:2956
+#: src/protocols/yahoo/yahoo.c:3070
 msgid "Not At Home"
 msgstr "Fora de casa"
 
-#: src/protocols/yahoo/yahoo.c:2416 src/protocols/yahoo/yahoo.c:2928
+#: src/protocols/yahoo/yahoo.c:2591 src/protocols/yahoo/yahoo.c:2958
+#: src/protocols/yahoo/yahoo.c:3071
 msgid "Not At Desk"
 msgstr "Fora de l'escriptori"
 
-#: src/protocols/yahoo/yahoo.c:2418 src/protocols/yahoo/yahoo.c:2931
+#: src/protocols/yahoo/yahoo.c:2593 src/protocols/yahoo/yahoo.c:2960
+#: src/protocols/yahoo/yahoo.c:3072
 msgid "Not In Office"
 msgstr "Fora de l'oficina"
 
-#: src/protocols/yahoo/yahoo.c:2422 src/protocols/yahoo/yahoo.c:2937
+#: src/protocols/yahoo/yahoo.c:2597 src/protocols/yahoo/yahoo.c:2964
+#: src/protocols/yahoo/yahoo.c:3074
 msgid "On Vacation"
 msgstr "De vacances"
 
-#: src/protocols/yahoo/yahoo.c:2426 src/protocols/yahoo/yahoo.c:2943
+#: src/protocols/yahoo/yahoo.c:2601 src/protocols/yahoo/yahoo.c:2968
+#: src/protocols/yahoo/yahoo.c:3076
 msgid "Stepped Out"
 msgstr "Ha marxat"
 
-#: src/protocols/yahoo/yahoo.c:2507 src/protocols/yahoo/yahoo.c:2533
+#: src/protocols/yahoo/yahoo.c:2682 src/protocols/yahoo/yahoo.c:2708
 msgid "Not on server list"
 msgstr "No és a la llista del servidor"
 
-#: src/protocols/yahoo/yahoo.c:2612
+#: src/protocols/yahoo/yahoo.c:2787
 msgid "Join in Chat"
 msgstr "Entra a un xat"
 
-#: src/protocols/yahoo/yahoo.c:2617
+#: src/protocols/yahoo/yahoo.c:2792
 msgid "Initiate Conference"
 msgstr "Inicia una conferència"
 
-#: src/protocols/yahoo/yahoo.c:2668
+#: src/protocols/yahoo/yahoo.c:2844
 msgid "Active which ID?"
 msgstr "Quin ID activar?"
 
-#: src/protocols/yahoo/yahoo.c:2677
+#: src/protocols/yahoo/yahoo.c:2853
 msgid "Join who in chat?"
 msgstr "A qui us voleu unir al xat?"
 
-#: src/protocols/yahoo/yahoo.c:2687
+#: src/protocols/yahoo/yahoo.c:2863
 msgid "Activate ID..."
 msgstr "Activa l'ID..."
 
-#: src/protocols/yahoo/yahoo.c:2691
+#: src/protocols/yahoo/yahoo.c:2867
 msgid "Join user in chat..."
 msgstr "Entra a un xat d'usuari..."
 
-#: src/protocols/yahoo/yahoo.c:3233
-msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
-msgstr "join: &lt;sala&gt;:  Entra en una sala de xat de la xarxa Yahoo"
-
-#: src/protocols/yahoo/yahoo.c:3237
-msgid "buzz: Buzz a contact to get their attention"
-msgstr "buzz: Fa sonar un soroll a un contacte per tal de que us pari atenció"
-
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -10706,72 +10766,64 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/yahoo/yahoo.c:3317 src/protocols/yahoo/yahoo.c:3319
+#: src/protocols/yahoo/yahoo.c:3402 src/protocols/yahoo/yahoo.c:3404
 msgid "Yahoo Protocol Plugin"
 msgstr "Connector per al protocol Yahoo"
 
-#: src/protocols/yahoo/yahoo.c:3338
+#: src/protocols/yahoo/yahoo.c:3423
 msgid "Yahoo Japan"
 msgstr "Yahoo Japó"
 
-#: src/protocols/yahoo/yahoo.c:3341
+#: src/protocols/yahoo/yahoo.c:3426
 msgid "Pager host"
 msgstr "Ordinador del cercapersones"
 
-#: src/protocols/yahoo/yahoo.c:3344
+#: src/protocols/yahoo/yahoo.c:3429
 msgid "Japan Pager host"
 msgstr "Ordinador del cercapersones del Japó"
 
-#: src/protocols/yahoo/yahoo.c:3347
+#: src/protocols/yahoo/yahoo.c:3432
 msgid "Pager port"
 msgstr "Port per al cercapersones"
 
-#: src/protocols/yahoo/yahoo.c:3350
+#: src/protocols/yahoo/yahoo.c:3435
 msgid "File transfer host"
 msgstr "Ordinador per transferència de fitxers"
 
-#: src/protocols/yahoo/yahoo.c:3353
+#: src/protocols/yahoo/yahoo.c:3438
 msgid "Japan File transfer host"
 msgstr "Port per transferència de fitxers pel Japó"
 
-#: src/protocols/yahoo/yahoo.c:3356
+#: src/protocols/yahoo/yahoo.c:3441
 msgid "File transfer port"
 msgstr "Port per transferència de fitxers"
 
-#: src/protocols/yahoo/yahoo.c:3359
+#: src/protocols/yahoo/yahoo.c:3444
 msgid "Chat Room List Url"
 msgstr "URL de la llista de sales de xat"
 
-#: src/protocols/yahoo/yahoo.c:3362
+#: src/protocols/yahoo/yahoo.c:3447
 msgid "YCHT Host"
 msgstr "Ordinador YCHT"
 
-#: src/protocols/yahoo/yahoo.c:3365
+#: src/protocols/yahoo/yahoo.c:3450
 msgid "YCHT Port"
 msgstr "Port YCHT"
 
-#: src/protocols/yahoo/yahoo_filexfer.c:169
-msgid ""
-"Gaim cannot send files over Yahoo! that are bigger than One Megabyte "
-"(1,048,576 bytes)."
-msgstr ""
-"El Gaim no pot enviar fitxer a través de Yahoo! que siguin més grans d'un "
-"Megabyte (1.048.576 bytes)."
-
-#: src/protocols/yahoo/yahoo_profile.c:677
+#: src/protocols/yahoo/yahoo_profile.c:675
 #, c-format
 msgid "<b>IP Address:</b> %s<br>"
 msgstr "<b>Adreça IP:</b> %s<br>"
 
-#: src/protocols/yahoo/yahoo_profile.c:751
+#: src/protocols/yahoo/yahoo_profile.c:749
 msgid "Yahoo! Japan Profile"
 msgstr "Perfil Yahoo! jaopnès"
 
-#: src/protocols/yahoo/yahoo_profile.c:752
+#: src/protocols/yahoo/yahoo_profile.c:750
 msgid "Yahoo! Profile"
 msgstr "Perfil Yahoo!"
 
-#: src/protocols/yahoo/yahoo_profile.c:796
+#: src/protocols/yahoo/yahoo_profile.c:794
 msgid ""
 "Sorry, profiles marked as containing adult content are not supported at this "
 "time."
@@ -10779,7 +10831,7 @@
 "Els perfils marcats com a que contenen continguts per adults no estan "
 "implementats de moment."
 
-#: src/protocols/yahoo/yahoo_profile.c:798
+#: 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"
@@ -10787,43 +10839,43 @@
 "Si voleu veure aquest perfil, haureu de visitar aquest enllaç amb el "
 "navegador"
 
-#: src/protocols/yahoo/yahoo_profile.c:971
+#: src/protocols/yahoo/yahoo_profile.c:969
 msgid "Yahoo! ID"
 msgstr "ID de Yahoo!"
 
-#: src/protocols/yahoo/yahoo_profile.c:1045
-#: src/protocols/yahoo/yahoo_profile.c:1049
-#: src/protocols/yahoo/yahoo_profile.c:1053
+#: src/protocols/yahoo/yahoo_profile.c:1043
+#: src/protocols/yahoo/yahoo_profile.c:1047
+#: src/protocols/yahoo/yahoo_profile.c:1051
 msgid "Hobbies"
 msgstr "Aficions"
 
-#: src/protocols/yahoo/yahoo_profile.c:1063
-#: src/protocols/yahoo/yahoo_profile.c:1067
+#: src/protocols/yahoo/yahoo_profile.c:1061
+#: src/protocols/yahoo/yahoo_profile.c:1065
 msgid "Latest News"
 msgstr "Últimes notícies"
 
-#: src/protocols/yahoo/yahoo_profile.c:1088
+#: src/protocols/yahoo/yahoo_profile.c:1086
 msgid "Home Page"
 msgstr "Pàgina inicial"
 
-#: src/protocols/yahoo/yahoo_profile.c:1103
+#: src/protocols/yahoo/yahoo_profile.c:1101
 msgid "Cool Link 1"
 msgstr "Enllaç interessant 1"
 
-#: src/protocols/yahoo/yahoo_profile.c:1108
+#: src/protocols/yahoo/yahoo_profile.c:1106
 msgid "Cool Link 2"
 msgstr "Enllaç interessant 2"
 
-#: src/protocols/yahoo/yahoo_profile.c:1112
+#: src/protocols/yahoo/yahoo_profile.c:1110
 msgid "Cool Link 3"
 msgstr "Enllaç interessant 3"
 
-#: src/protocols/yahoo/yahoo_profile.c:1132
+#: src/protocols/yahoo/yahoo_profile.c:1130
 #, c-format
 msgid "User information for %s unavailable"
 msgstr "Dades de l'usuari %s no disponibles"
 
-#: src/protocols/yahoo/yahoo_profile.c:1138
+#: src/protocols/yahoo/yahoo_profile.c:1136
 msgid ""
 "Sorry, this profile seems to be in a language that is not supported at this "
 "time."
@@ -10831,7 +10883,7 @@
 "Disculpeu, aquest perfil deu estar en llengua que actualment no està "
 "suportada."
 
-#: src/protocols/yahoo/yahoo_profile.c:1154
+#: 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."
@@ -10839,7 +10891,7 @@
 "No s'ha pogut obtenir el perfil de l'usuari. Això pot ser degut a un "
 "problema temporal del servidor. Intenteu-ho de nou més tard."
 
-#: src/protocols/yahoo/yahoo_profile.c:1157
+#: 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 "
@@ -10849,67 +10901,67 @@
 "existeixi, tot i que a vegades Yahoo! no pot trobar els perfils d'usuari. Si "
 "sabeu del cert que l'usuari existeix, torneu-ho a intentar més tard."
 
-#: src/protocols/yahoo/yahoo_profile.c:1165
+#: src/protocols/yahoo/yahoo_profile.c:1163
 msgid "The user's profile is empty."
 msgstr "El perfil d'usuari està buit."
 
-#: src/protocols/yahoo/yahoochat.c:190
+#: src/protocols/yahoo/yahoochat.c:193
 #, c-format
 msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
 msgstr ""
 "%s no ha acceptat la vostra invitació a unir-se a la sala \"%s\" perquè \"%s"
 "\"."
 
-#: src/protocols/yahoo/yahoochat.c:192
+#: src/protocols/yahoo/yahoochat.c:195
 msgid "Invitation Rejected"
 msgstr "S'ha rebutjat la invitació"
 
-#: src/protocols/yahoo/yahoochat.c:344
+#: src/protocols/yahoo/yahoochat.c:347
 msgid "Failed to join chat"
 msgstr "No s'ha pogut unir al xat"
 
-#: src/protocols/yahoo/yahoochat.c:344
+#: src/protocols/yahoo/yahoochat.c:347
 msgid "Maybe the room is full?"
 msgstr "Pot ser que la sala estigui plena?"
 
-#: src/protocols/yahoo/yahoochat.c:422
+#: src/protocols/yahoo/yahoochat.c:425
 #, c-format
 msgid "You are now chatting in %s."
 msgstr "Esteu fent un xat a %s."
 
-#: src/protocols/yahoo/yahoochat.c:576
+#: src/protocols/yahoo/yahoochat.c:579
 msgid "Failed to join buddy in chat"
 msgstr "No s'ha pogut entrar al xat de l'amic."
 
-#: src/protocols/yahoo/yahoochat.c:577
+#: src/protocols/yahoo/yahoochat.c:580
 msgid "Maybe they're not in a chat?"
 msgstr "Potser no estan en cap xat?"
 
-#: src/protocols/yahoo/yahoochat.c:1312
+#: src/protocols/yahoo/yahoochat.c:1357
 msgid "Fetching the room list failed."
 msgstr "No s'ha pogut obtenir la llista de sales."
 
-#: src/protocols/yahoo/yahoochat.c:1358
+#: src/protocols/yahoo/yahoochat.c:1403
 msgid "Voices"
 msgstr "Veus"
 
-#: src/protocols/yahoo/yahoochat.c:1361
+#: src/protocols/yahoo/yahoochat.c:1406
 msgid "Webcams"
 msgstr "Càmeres web"
 
-#: src/protocols/yahoo/yahoochat.c:1372 src/protocols/yahoo/yahoochat.c:1433
+#: src/protocols/yahoo/yahoochat.c:1417 src/protocols/yahoo/yahoochat.c:1478
 msgid "Unable to fetch room list."
 msgstr "No s'ha pogut obtenir la llista de sales."
 
-#: src/protocols/yahoo/yahoochat.c:1426
+#: src/protocols/yahoo/yahoochat.c:1471
 msgid "User Rooms"
 msgstr "Sales d'usuari"
 
-#: src/protocols/yahoo/ycht.c:402
+#: src/protocols/yahoo/ycht.c:401
 msgid "Connection problem with the YCHT server."
 msgstr "Problema de connexió amb el servidor YCHT."
 
-#: src/protocols/zephyr/zephyr.c:329
+#: src/protocols/zephyr/zephyr.c:328
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
 "in the Account Editor)"
@@ -10917,85 +10969,79 @@
 "(S'ha produït un error en convertir aquest missatge. Comproveu l'opció "
 "'Codificació' en l'editor de comptes)"
 
-#: src/protocols/zephyr/zephyr.c:677
+#: src/protocols/zephyr/zephyr.c:676
 #, c-format
 msgid "Unable send to chat %s,%s,%s"
 msgstr "No s'ha pogut envir el xat %s,%s,%s"
 
-#: src/protocols/zephyr/zephyr.c:710 src/protocols/zephyr/zephyr.c:1124
+#: src/protocols/zephyr/zephyr.c:709 src/protocols/zephyr/zephyr.c:1118
 #, c-format
 msgid "<b>User:</b> %s<br>"
 msgstr "<b>Usuari:</b> %s<br>"
 
-#: src/protocols/zephyr/zephyr.c:714 src/protocols/zephyr/zephyr.c:1129
+#: src/protocols/zephyr/zephyr.c:713 src/protocols/zephyr/zephyr.c:1123
 msgid "<br>Hidden or not logged-in"
 msgstr "<br>Ocult o no connectat"
 
-#: src/protocols/zephyr/zephyr.c:719 src/protocols/zephyr/zephyr.c:1131
+#: src/protocols/zephyr/zephyr.c:718 src/protocols/zephyr/zephyr.c:1125
 #, c-format
 msgid "<br>At %s since %s"
 msgstr "<br>A %s des de %s"
 
-#: src/protocols/zephyr/zephyr.c:1420 src/protocols/zephyr/zephyr.c:1421
+#: src/protocols/zephyr/zephyr.c:1408 src/protocols/zephyr/zephyr.c:1409
 msgid "Anyone"
 msgstr "Qualsevol"
 
-#: src/protocols/zephyr/zephyr.c:2239
+#: src/protocols/zephyr/zephyr.c:2155
 msgid "_Class:"
 msgstr "_Classe:"
 
-#: src/protocols/zephyr/zephyr.c:2245
+#: src/protocols/zephyr/zephyr.c:2161
 msgid "_Instance:"
 msgstr "_Instància:"
 
-#: src/protocols/zephyr/zephyr.c:2251
+#: src/protocols/zephyr/zephyr.c:2167
 msgid "_Recipient:"
 msgstr "Destinata_ri:"
 
-#: src/protocols/zephyr/zephyr.c:2262
+#: src/protocols/zephyr/zephyr.c:2178
 #, c-format
 msgid "Attempt to subscribe to %s,%s,%s failed"
 msgstr "No s'ha pogut subscriure a %s,%s,%s"
 
-#: src/protocols/zephyr/zephyr.c:2568
+#: src/protocols/zephyr/zephyr.c:2483
 msgid "zlocate &lt;nick&gt;: Locate user"
 msgstr "zlocate &lt;nick&gt;: Localitza usuari"
 
-#: src/protocols/zephyr/zephyr.c:2573
+#: src/protocols/zephyr/zephyr.c:2488
 msgid "zl &lt;nick&gt;: Locate user"
 msgstr "zl &lt;nick&gt;: Localitza usuari"
 
-#: src/protocols/zephyr/zephyr.c:2578
+#: src/protocols/zephyr/zephyr.c:2493
 msgid "instance &lt;instance&gt;: Set the instance to be used on this class"
 msgstr ""
 "instance &lt;instància&gt;: Especifica la instància a fer servir en aquesta "
 "classe"
 
-#: src/protocols/zephyr/zephyr.c:2583
+#: src/protocols/zephyr/zephyr.c:2498
 msgid "inst &lt;instance&gt;: Set the instance to be used on this class"
 msgstr ""
 "inst &lt;instància&gt;: Especifica la instància a fer servir en aquesta "
 "classe"
 
-#: src/protocols/zephyr/zephyr.c:2588
-msgid "topic &lt;instance&gt;: Set the instance to be used on this class"
-msgstr ""
-"topic &lt;instància&gt;: Especifica la instància a fer servir en aquesta "
-"classe"
-
-#: src/protocols/zephyr/zephyr.c:2594
+#: src/protocols/zephyr/zephyr.c:2504
 msgid "sub &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Join a new chat"
 msgstr ""
 "sub &lt;classe&gt; &lt;instància&gt; &lt;destinatari&gt;: Entra a un altre "
 "xat"
 
-#: src/protocols/zephyr/zephyr.c:2599
+#: src/protocols/zephyr/zephyr.c:2509
 msgid ""
 "zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
 msgstr ""
 "zi &lt;instància&gt;: Envia el missatga a &lt;missatge,<i>instància</i>,*&gt;"
 
-#: src/protocols/zephyr/zephyr.c:2605
+#: src/protocols/zephyr/zephyr.c:2515
 msgid ""
 "zci &lt;class&gt; &lt;instance&gt;: Send a message to &lt;<i>class</i>,"
 "<i>instance</i>,*&gt;"
@@ -11003,7 +11049,7 @@
 "zci &lt;classe&gt; &lt;instància&gt;: Send un missatge a &lt;<i>classe</i>,"
 "<i>instància</i>,*&gt;"
 
-#: src/protocols/zephyr/zephyr.c:2611
+#: src/protocols/zephyr/zephyr.c:2521
 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;"
@@ -11011,7 +11057,7 @@
 "zcir &lt;classe&gt; &lt;instància&gt; &lt;destinatari&gt;: Envia un missatge "
 "a &lt;<i>classe</i>,<i>instància</i>,<i>destinatari</i>&gt;"
 
-#: src/protocols/zephyr/zephyr.c:2617
+#: src/protocols/zephyr/zephyr.c:2527
 msgid ""
 "zir &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;MESSAGE,"
 "<i>instance</i>,<i>recipient</i>&gt;"
@@ -11019,16 +11065,16 @@
 "zir &lt;instància&gt; &lt;destinatari&gt;: Envia un missatge a &lt;MISSATGE,"
 "<i>instància</i>,<i>destinatari</i>&gt;"
 
-#: src/protocols/zephyr/zephyr.c:2622
+#: src/protocols/zephyr/zephyr.c:2532
 msgid "zc &lt;class&gt;: Send a message to &lt;<i>class</i>,PERSONAL,*&gt;"
 msgstr ""
 "zc &lt;classe&gt;: Envia un missatge a &lt;<i>classe</i>,PERSONAL,*&gt;"
 
-#: src/protocols/zephyr/zephyr.c:2728
+#: src/protocols/zephyr/zephyr.c:2638
 msgid "Resubscribe"
 msgstr "Dessubscriu"
 
-#: src/protocols/zephyr/zephyr.c:2731
+#: src/protocols/zephyr/zephyr.c:2641
 msgid "Retrieve subscriptions from server"
 msgstr "Recupera les subscripcions del servidor"
 
@@ -11042,53 +11088,41 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/zephyr/zephyr.c:2814 src/protocols/zephyr/zephyr.c:2816
+#: src/protocols/zephyr/zephyr.c:2724 src/protocols/zephyr/zephyr.c:2726
 msgid "Zephyr Protocol Plugin"
 msgstr "Connector per al protocol Zephyr"
 
-#: src/protocols/zephyr/zephyr.c:2841
+#: src/protocols/zephyr/zephyr.c:2751
 msgid "Export to .anyone"
 msgstr "Exporta a .anyone"
 
-#: src/protocols/zephyr/zephyr.c:2844
+#: src/protocols/zephyr/zephyr.c:2754
 msgid "Export to .zephyr.subs"
 msgstr "Exporta a .zephyr.subs"
 
-#: src/protocols/zephyr/zephyr.c:2847
-msgid "Import from .anyone"
-msgstr "Importa de .anyone"
-
-#: src/protocols/zephyr/zephyr.c:2850
-msgid "Import from .zephyr.subs"
-msgstr "Importa de .zephyr.subs"
-
-#: src/protocols/zephyr/zephyr.c:2853
-msgid "Realm"
-msgstr "Regne"
-
-#: src/protocols/zephyr/zephyr.c:2856
+#: src/protocols/zephyr/zephyr.c:2757
 msgid "Exposure"
 msgstr "Exposició"
 
 #. XXX: why in the hell are we calling gaim_connection_error() here?
 #. Forbidden
-#: src/proxy.c:988
+#: src/proxy.c:958
 #, c-format
 msgid "Access denied: proxy server forbids port %d tunnelling."
 msgstr ""
 "S'ha denegat l'accés: el servidor intermediari prohibeix la tunelització del "
 "port %d"
 
-#: src/proxy.c:992
+#: src/proxy.c:962
 #, c-format
 msgid "Proxy connection error %d"
 msgstr "Error en la connexió al servidor intermediari %d"
 
-#: src/proxy.c:1814
+#: src/proxy.c:1784
 msgid "Invalid proxy settings"
 msgstr "Opcions del servidor intermediari invàlides"
 
-#: src/proxy.c:1814
+#: src/proxy.c:1784
 msgid ""
 "Either the host name or port number specified for your given proxy type is "
 "invalid."
@@ -11096,34 +11130,92 @@
 "O bé el nom de l'ordinador o bé el número del port especificat per al tipus "
 "de servidor intermediari indicat són invàlids."
 
+#. * Custom away message.
+#: src/prpl.h:180
+msgid "Custom"
+msgstr "Personalitzat"
+
 #. *
 #. * A wrapper for gaim_request_action() that uses Accept and Cancel buttons.
 #.
-#: src/request.h:1254
+#: src/request.h:1255
 msgid "Accept"
 msgstr "Accepta"
 
-#: src/server.c:62
+#: src/server.c:64
 msgid "Please enter your password"
 msgstr "Entreu la constrasenya"
 
-#: src/server.c:471
+#: src/server.c:533
 #, c-format
 msgid "%s is now known as %s.\n"
 msgstr "%s ara es fa dir %s\n"
 
-#: src/server.c:895
+#: src/server.c:966
 #, c-format
 msgid "(%d message)"
 msgid_plural "(%d messages)"
 msgstr[0] "(%d missatge)"
 msgstr[1] "(%d missatges)"
 
-#: src/server.c:909
+#: src/server.c:980
 msgid "(1 message)"
 msgstr "(1 missatge)"
 
-#: src/server.c:1166
+#: src/server.c:1203 src/server.c:1212
+#, c-format
+msgid "%s logged in."
+msgstr "%s ha entrat."
+
+#: src/server.c:1224
+#, c-format
+msgid "%s signed on"
+msgstr "%s s'ha connectat"
+
+#: src/server.c:1239
+#, c-format
+msgid "%s came back"
+msgstr "%s ha tornat"
+
+#: src/server.c:1241
+#, c-format
+msgid "%s went away"
+msgstr "%s ha passat a absent"
+
+#: src/server.c:1255
+#, c-format
+msgid "%s became idle"
+msgstr "%s ha passat a inactiu"
+
+#: src/server.c:1266
+#, c-format
+msgid "%s became unidle"
+msgstr "%s ja no està inactiu"
+
+#: src/server.c:1276 src/server.c:1283
+#, c-format
+msgid "%s logged out."
+msgstr "%s ha sortit."
+
+#: src/server.c:1296
+#, c-format
+msgid "%s signed off"
+msgstr "%s se n'ha anat"
+
+#: src/server.c:1358
+#, c-format
+msgid ""
+"%s has just been warned by %s.\n"
+"Your new warning level is %d%%"
+msgstr ""
+"%s acaba de ser avisat per %s.\n"
+"El seu nivell d'avisos és ara %d%%"
+
+#: src/server.c:1361
+msgid "an anonymous person"
+msgstr "una persona anònima"
+
+#: src/server.c:1473
 #, c-format
 msgid ""
 "%s has invited %s to the chat room %s:\n"
@@ -11132,488 +11224,425 @@
 "%s ha convidat a %s a la sala de xat %s:\n"
 "<b>%s</b>"
 
-#: src/server.c:1172
+#: src/server.c:1479
 #, c-format
 msgid "%s has invited %s to the chat room %s\n"
 msgstr "%s ha convidat a %s a la sala de xat %s\n"
 
-#: src/server.c:1178
+#: src/server.c:1485
 msgid "Accept chat invitation?"
 msgstr "Voleu acceptar la invitació del xat?"
 
-#: src/status.c:154
-msgid "Unset"
-msgstr "Sense especificar"
-
-#: src/status.c:614
-#, c-format
-msgid "%s came back"
-msgstr "%s ha tornat"
-
-#: src/status.c:619
-#, c-format
-msgid "%s went away"
-msgstr "%s ha passat a absent"
-
-#: src/status.c:1314
-#, c-format
-msgid "%s became idle"
-msgstr "%s ha passat a inactiu"
-
-#: src/status.c:1330
-#, c-format
-msgid "%s became unidle"
-msgstr "%s ja no està inactiu"
-
-#: src/util.c:2128
-#, c-format
-msgid "Error Reading %s"
-msgstr "Error en llegir %s"
-
-#: src/util.c:2129
-#, c-format
-msgid ""
-"An error was encountered reading your %s.  They have not been loaded, and "
-"the old file been renamed to %s~."
-msgstr ""
-"S'ha produït un error en analitzar la vostra %s. No s'han carregat, i s'ha "
-"reanomenat el fitxer antic com a %s~."
-
-#: src/util.c:2566
+#. for people like myself who are too lazy to add an away msg :)
+#. I don't know who "myself" is in this context.  The exclamation point
+#. * makes it slightly less boring ;)
+#: src/status.c:36
+msgid "Sorry, I ran out for a bit!"
+msgstr "Disculpeu-me, me n'he anat per una estona."
+
+#: src/stock.c:87
+msgid "_Alias"
+msgstr "À_lies"
+
+#: src/stock.c:89
+msgid "_Invite"
+msgstr "Conv_ida"
+
+#: src/stock.c:90
+msgid "_Modify"
+msgstr "_Modifica"
+
+#: src/stock.c:91
+msgid "_Open Mail"
+msgstr "_Obre el correu"
+
+#: src/stock.c:93
+msgid "_Warn"
+msgstr "_Avisa"
+
+#: src/util.c:2373
 msgid "Calculating..."
 msgstr "S'està calculant..."
 
-#: src/util.c:2569
+#: src/util.c:2376
 msgid "Unknown."
 msgstr "Desconegut."
 
-#: src/util.c:2599
+#: src/util.c:2406
 msgid "second"
 msgid_plural "seconds"
 msgstr[0] "segon"
 msgstr[1] "segons"
 
-#: src/util.c:2613
+#: src/util.c:2420
 msgid "day"
 msgid_plural "days"
 msgstr[0] "dia"
 msgstr[1] "dies"
 
-#: src/util.c:2621
+#: src/util.c:2428
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "hora"
 msgstr[1] "hores"
 
-#: src/util.c:2629
+#: src/util.c:2436
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minut"
 msgstr[1] "minuts"
 
-#: src/util.c:3049
+#: src/util.c:2856
 msgid "g003: Error opening connection.\n"
 msgstr "g003: Error en obrir la connexió.\n"
 
-#~ msgid "Restore Away State On Reconnect"
-#~ msgstr "Recupera l'estat d'absent en reconnectar"
-
-#~ msgid "Signoff"
+#~ msgid "Hide Reconnecting Dialog"
+#~ msgstr "Oculta el quadre de diàleg de reconnexió"
+
+#~ msgid "Log Out"
 #~ msgstr "Desconnecta"
 
-#~ msgid "GTK Signals Test"
-#~ msgstr "Comprovació de senyals GTK"
-
-#~ msgid "Test to see that all ui signals are working properly."
-#~ msgstr ""
-#~ "Prova per veure si tots els senyals de la interfície d'usuari funcionen "
-#~ "correctament."
-
-#~ msgid "Away!"
-#~ msgstr "Absent."
-
-#~ msgid "Edit This Message"
-#~ msgstr "Edita aquest missatge"
-
-#~ msgid "I'm Back!"
-#~ msgstr "He tornat."
-
-#~ msgid "Are you sure you want to remove the away message \"%s\"?"
-#~ msgstr "Esteu segur que voleu suprimir el missatge d'absència \"%s\"?"
-
-#~ msgid "Remove Away Message"
-#~ msgstr "Suprimeix el missatge d'absència"
-
-#~ msgid "Set All Away"
-#~ msgstr "Passa'ls tots a absent"
-
-#~ msgid "You cannot save an away message with a blank title"
-#~ msgstr "No es pot desar un missatge d'absència amb un títol en blanc"
+#~ msgid "Cursor Color"
+#~ msgstr "Color del cursor"
+
+#~ msgid "Secondary Cursor Color"
+#~ msgstr "Color secundari del cursor"
+
+#~ msgid "Hyperlink Color"
+#~ msgstr "Color dels hiperenllaços"
+
+#~ msgid "GtkTreeView Expander Size"
+#~ msgstr "Mida de l'expansor del GTkTreeView"
+
+#~ msgid "Conversation Entry"
+#~ msgstr "Entrada de la conversa"
+
+#~ msgid "Conversation History"
+#~ msgstr "Històric de converses"
+
+#~ msgid "Log Viewer"
+#~ msgstr "Visualitzador del registre"
+
+#~ msgid "Request Dialog"
+#~ msgstr "Diàleg de sol·licitud"
+
+#~ msgid "Notify Dialog"
+#~ msgstr "Diàleg de notificació"
+
+#~ msgid "Select Color for %s"
+#~ msgstr "Selecciona el color per a %s"
+
+#~ msgid "Select Color"
+#~ msgstr "Selecciona el color per a %s"
+
+#~ msgid "Select Font for %s"
+#~ msgstr "Selecciona el tipus de lletra per a %s"
+
+#~ msgid "Select Interface Font"
+#~ msgstr "Selecciona el tipus de lletra de la interfície"
+
+#~ msgid "Gtk interface font"
+#~ msgstr "Tipus de lletra de la interfície Gtk"
+
+#~ msgid "Gtk text shortcut theme"
+#~ msgstr "Tema de la drecera de text de Gtk"
+
+#~ msgid "Gaim GTK+ Theme Control"
+#~ msgstr "Control de temes GTK+ del Gaim"
+
+#~ msgid "Provides access to commonly used gtkrc settings."
+#~ msgstr "Proporciona accés a peràmetres del gtkrc utilitzats habitualment ."
+
+#~ msgid "R_aise conversation window"
+#~ msgstr "_Alça la finestra de conversa"
+
+#~ msgid "accounts"
+#~ msgstr "comptes"
+
+#~ msgid "buddy list"
+#~ msgstr "llista d'amics"
+
+#~ msgid "Enter Password"
+#~ msgstr "Introduïu la contrasenya"
+
+#~ msgid "Unable to send message to %s."
+#~ msgstr "No s'ha pogut enviar el missatge a %s."
+
+#~ msgid "Unable to send messge to %s."
+#~ msgstr "No s'ha pogut enviar el missatge a %s."
 
 #~ msgid ""
-#~ "Please give the message a title, or choose \"Use\" to use without saving."
+#~ "Insufficient arguments (-t, -f, -p, & -m are all required) or arguments "
+#~ "greater than 9999 chars\n"
 #~ msgstr ""
-#~ "Indiqueu un títol per al missatge, o escolliu \"Usa\" per usar-lo sense "
-#~ "desar."
-
-#~ msgid "You cannot create an empty away message"
-#~ msgstr "No es pot crear un missatge d'absència buit"
-
-#~ msgid "New away message"
-#~ msgstr "Missatge d'absència nou"
-
-#~ msgid "Away title: "
-#~ msgstr "Motiu de l'absència: "
-
-#~ msgid "_Save"
-#~ msgstr "De_sa"
-
-#~ msgid "Sa_ve & Use"
-#~ msgstr "Desa i _fes servir"
-
-#~ msgid "_Use"
-#~ msgstr "_Usa"
-
-#~ msgid "Buddy List Error"
-#~ msgstr "Error en la llista d'amics"
-
-#~ msgid "/Buddies/_Signoff"
-#~ msgstr "/Amics/_Desconnecta"
+#~ "No hi ha prou arguments (-t, -f, -p, i -m en requereixen) o els arguments "
+#~ "contenen més de 9999 caràcters\n"
 
 #~ msgid ""
 #~ "\n"
-#~ "<b>Account:</b>"
+#~ "Log out all accounts\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Desconnecta tots els comptes\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "Send instant message\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Envia missatge instantani\n"
+
+#~ msgid "Enabled"
+#~ msgstr "Habilitat"
+
+#~ msgid "/Tools/Mute Sounds"
+#~ msgstr "/Eines/Deshabilita els sons"
+
+#~ msgid "/Buddies/_Log Out"
+#~ msgstr "/Amics/_Desconnecta"
+
+#~ msgid "/Tools/_Statuses"
+#~ msgstr "/Eines/_Estats"
+
+#~ msgid "/Tools/Mute _Sounds"
+#~ msgstr "/Eines/Deshabilita els _sons"
+
+#~ msgid ""
+#~ "\n"
+#~ "<b>Idle:</b> %s"
 #~ msgstr ""
 #~ "\n"
-#~ "<b>Compte:</b>"
-
-#~ msgid "/Tools/Away"
-#~ msgstr "/Eines/Absent"
-
-#~ msgid "Send a message to the selected buddy"
-#~ msgstr "Envia un missatge a l'amic seleccionat"
-
-#~ msgid "Get information on the selected buddy"
-#~ msgstr "Obtingues dades sobre l'amic seleccionat"
-
-#~ msgid "_Chat"
-#~ msgstr "_Xat"
-
-#~ msgid "Join a chat room"
-#~ msgstr "Entra a una sala"
-
-#~ msgid "_Away"
-#~ msgstr "_Absent"
-
-#~ msgid "Set an away message"
-#~ msgstr "Estableix un missatge d'absència"
-
-#~ msgid "Done."
-#~ msgstr "Fet."
-
-#~ msgid "Signon: "
-#~ msgstr "Connexió: "
-
-#~ msgid "Signon"
-#~ msgstr "Connexió"
-
-#~ msgid "Cancel All"
-#~ msgstr "Cancel·la-ho tot"
-
-#~ msgid "Get Away Msg"
-#~ msgstr "Obtingues el missatge d'absència"
-
-#~ msgid "Warn"
-#~ msgstr "Avisa"
-
-#~ msgid "Warn the user"
-#~ msgstr "Avisa l'usuari"
-
-#~ msgid "Block the user"
-#~ msgstr "Bloca l'usuari"
-
-#~ msgid "Send a file to the user"
-#~ msgstr "Envia un fitxer a l'usuari"
-
-#~ msgid "Add the user to your buddy list"
-#~ msgstr "Afegeix l'usuari a la llista d'amics"
-
-#~ msgid "Remove the user from your buddy list"
-#~ msgstr "Suprimeix l'usuari de la llista d'amics"
-
-#~ msgid "Send"
-#~ msgstr "Envia"
-
-#~ msgid "Invite"
-#~ msgstr "Convida"
-
-#~ msgid "Invite a user"
-#~ msgstr "Convida un usuari"
-
-#~ msgid "Add the chat to your buddy list"
-#~ msgstr "Afegeix el xat a la llista d'amics"
-
-#~ msgid "Remove the chat from your buddy list"
-#~ msgstr "Suprimeix l'usuari de la llista d'amics"
-
-#~ msgid "<main>/Conversation/Close"
-#~ msgstr "<main>/Conversa/Tanca"
-
-#~ msgid "Albanian"
-#~ msgstr "Albanès"
-
-#~ msgid "Burmese"
-#~ msgstr "Birmà"
-
-#~ msgid "Turkish"
-#~ msgstr "Turc"
-
-#~ msgid "Ukrainian"
-#~ msgstr "Ucraïnès"
-
-#~ msgid "<span weight=\"bold\" size=\"larger\">Gaim v%s</span>"
-#~ msgstr "<span weight=\"bold\" size=\"larger\">Gaim v%s</span>"
-
-#~ msgid "D_isplay remote nicknames if no alias is set"
-#~ msgstr "Mostra els sobrenoms remots s_i no se'ls ha establert cap àlies"
-
-#~ msgid "Show _timestamp on messages"
-#~ msgstr "Mos_tra marques horàries en els missatges"
-
-#~ msgid "Ignore c_olors"
-#~ msgstr "Ignora _colors"
-
-#~ msgid "Ignore font _faces"
-#~ msgstr "Ignora _tipus de lletra"
-
-#~ msgid "Ignore font si_zes"
-#~ msgstr "Ignora la _mida de la lletra"
-
-#~ msgid "Send Message"
-#~ msgstr "Enviament dels missatges"
-
-#~ msgid "Enter _sends message"
-#~ msgstr "La tecla de _retorn envia el missatge"
-
-#~ msgid "C_ontrol-Enter sends message"
-#~ msgstr "La c_ombinació de tecles control-retorn envia el missatge"
-
-#~ msgid "Window Closing"
-#~ msgstr "Tancament de les finestres"
-
-#~ msgid "_Escape closes window"
-#~ msgstr "La tecla d'_escapament tanca la finestra"
-
-#~ msgid "Insertions"
-#~ msgstr "Insercions"
-
-#~ msgid "Control-{B/I/U} changes _formatting"
-#~ msgstr "Control-{B/I/U/S} canvia la _formatació"
-
-#~ msgid "Control-(number) _inserts smileys"
-#~ msgstr "Control-(nombre) _insereix emoticones"
-
-#~ msgid "Show _buttons as:"
-#~ msgstr "Mostra els _botons com a:"
-
-#~ msgid "Pictures"
-#~ msgstr "Imatges"
-
-#~ msgid "Text"
-#~ msgstr "Text"
-
-#~ msgid "Pictures and text"
-#~ msgstr "Imatges i text"
-
-#~ msgid "_Raise window on events"
-#~ msgstr "_Alça les finestres en rebre-hi esdeveniments"
-
-#~ msgid "Show _warning levels"
-#~ msgstr "Mostra nivells d'_avís"
-
-#~ msgid "Show idle _times"
-#~ msgstr "Mostra _temps inactiu"
-
-#~ msgid "Dim i_dle buddies"
-#~ msgstr "Enfosqueix els amics inactius"
-
-#~ msgid "_Automatically expand contacts"
-#~ msgstr "Expandeix _automàticament els contactes"
-
-#~ msgid "Enable \"_slash\" commands"
-#~ msgstr "Habilita les ordre_s \"barra inversa\""
-
-#~ msgid "Show _formatting toolbar"
-#~ msgstr "Mostra la barra d'eines per a la _formatació"
-
-#~ msgid "Show _aliases in tabs/titles"
-#~ msgstr "Mostr_a els àlies a les pestanyes/títols"
-
-#~ msgid "_Raise IM window on events"
-#~ msgstr "Alça les finestres de MI en _rebre-hi esdeveniments"
-
-#~ msgid "Raise chat _window on events"
-#~ msgstr "Alça les finestres de _xat en rebre-hi esdeveniments"
-
-#~ msgid "Use _multi-colored screen names in chats"
-#~ msgstr "Fes servir àlies _multicolors en els xats"
-
-#~ msgid "_Edit"
-#~ msgstr "_Edita"
-
-#~ msgid "Interface"
-#~ msgstr "Interfície"
-
-#~ msgid "Shortcuts"
-#~ msgstr "Dreceres"
-
-#~ msgid "Away Messages"
-#~ msgstr "Missatges d'absència"
-
-#~ msgid "Please create an account."
-#~ msgstr "Creeu un compte."
-
-#~ msgid "Login"
-#~ msgstr "Nom d'usuari"
-
-#~ msgid "<b>_Account:</b>"
-#~ msgstr "<b>_Compte:</b>"
-
-#~ msgid "<b>_Password:</b>"
-#~ msgstr "<b>C_ontrasenya:</b>"
-
-#~ msgid "A_ccounts"
-#~ msgstr "_Comptes"
-
-#~ msgid "P_references"
-#~ msgstr "P_referències"
-
-#~ msgid "_Sign on"
-#~ msgstr "Co_nnecta"
+#~ "<b>Inactiu:</b> %s"
+
+#~ msgid ""
+#~ "\n"
+#~ "<b>Last Seen:</b> %s ago"
+#~ msgstr ""
+#~ "\n"
+#~ "<b>Vist per darrera vegada:</b> fa %s"
+
+#~ msgid "Idle "
+#~ msgstr "Inactiu "
+
+#~ msgid "/Buddies/New Instant Message..."
+#~ msgstr "/Amics/Missatge instantani nou..."
+
+#~ msgid "/Buddies/Get User Info..."
+#~ msgstr "/Amics/Obtingues informació de l'usuari..."
+
+#~ msgid "/Buddies/Add Buddy..."
+#~ msgstr "/Amics/Afegeix un amic..."
+
+#~ msgid "/Buddies/Add Chat..."
+#~ msgstr "/Amics/Afegeix un xat..."
+
+#~ msgid "/Buddies/Add Group..."
+#~ msgstr "/Amics/Afegeix un grup..."
+
+#~ msgid "/Buddies/Log Out"
+#~ msgstr "/Amics/Desconnecta"
+
+#~ msgid "Disconnected"
+#~ msgstr "Desconnectat"
+
+#~ msgid "/Options/Show Buddy _Icon"
+#~ msgstr "/Opcions/Mostra la icona de l'amic"
+
+#~ msgid "/Options/Show Buddy Icon"
+#~ msgstr "/Options/Mostra la icona de l'amic"
 
 #~ msgid ""
 #~ "Gaim %s\n"
 #~ "Usage: %s [OPTION]...\n"
 #~ "\n"
 #~ "  -a, --acct          display account editor window\n"
-#~ "  -w, --away[=MESG]   make away on signon (optional argument MESG "
-#~ "specifies\n"
-#~ "                      name of away message to use)\n"
+#~ "  -c, --config=DIR    use DIR for config files\n"
+#~ "  -d, --debug         print debugging messages to stdout\n"
+#~ "  -h, --help          display this help and exit\n"
+#~ "  -n, --nologin       don't automatically login\n"
 #~ "  -l, --login[=NAME]  automatically login (optional argument NAME "
 #~ "specifies\n"
 #~ "                      account(s) to use, seperated by commas)\n"
-#~ "  -n, --loginwin      don't automatically login; show login window\n"
-#~ "  -u, --user=NAME     use account NAME\n"
-#~ "  -c, --config=DIR    use DIR for config files\n"
-#~ "  -d, --debug         print debugging messages to stdout\n"
 #~ "  -v, --version       display the current version and exit\n"
-#~ "  -h, --help          display this help and exit\n"
 #~ msgstr ""
 #~ "Gaim %s\n"
-#~ "Ús: %s [OPCIÓ]...\n"
+#~ "Forma d'ús: %s [OPTCIÓ]...\n"
 #~ "\n"
-#~ "  -a, --acct             mostra la finestra d'edició de comptes\n"
-#~ "  -w, --away[=MISSATGE]  entra com a absent quan es connecta\n"
-#~ "                         (l'argument opcional MISSATGE especifica el "
-#~ "missatge\n"
-#~ "                         d'absència a mostrar)\n"
-#~ "  -l, --login[=NOM]      connexió automàtica (l'argument opcional NOM\n"
-#~ "                         especifica els comptes a usar, separats per "
-#~ "comes)\n"
-#~ "  -n, --loginwin         no es connecta automàticament; mostra la "
-#~ "finestra\n"
-#~ "                         de connexió\n"
-#~ "  -u, --user=NOM         usa el compte NOM\n"
-#~ "  -c, --config=DIR       utilitza DIR per a fitxers de configuració\n"
-#~ "  -d, --debug            escriu els missatges de depuració a la sortida\n"
-#~ "                         estàndard\n"
-#~ "  -v, --version          mostra la versió i surt\n"
-#~ "  -h, --help             mostra aquesta ajuda i surt\n"
-
-#~ msgid "Gaim encountered an error communicating with the ICQ server."
-#~ msgstr "Gaim ha trobat un error en la comunicació amb el servidor ICQ."
-
-#~ msgid "The user %s (%s%s%s%s%s) wants you to authorize them."
-#~ msgstr "L'usuari %s (%s%s%s%s%s) vol que l'autoritzeu."
-
-#~ msgid "Send message through server"
-#~ msgstr "Envia el missatge a través del servidor"
-
-#~ msgid "Connecting..."
-#~ msgstr "S'està connectant..."
-
-#~ msgid "Nick:"
-#~ msgstr "Sobrenom:"
-
-#~ msgid "Gaim User"
-#~ msgstr "Usuari de Gaim"
-
-#~ msgid "Roomlist Error"
-#~ msgstr "Error en la llista de sales"
-
-#~ msgid "Hide Operating System"
-#~ msgstr "Oculta el sistema operatiu"
-
-#~ msgid "Display conversation closed notices"
-#~ msgstr "Mostra notícies tancades de la conversa"
-
-#~ msgid "Display timeout notices"
-#~ msgstr "Mostra notificacions de temps excedit"
-
-#~ msgid "The conversation has become inactive and timed out."
-#~ msgstr "La conversa ha esdevingut inactiva i el temps ha expirat."
-
-#~ msgid "Not specified"
-#~ msgstr "No especificat"
-
-#~ msgid "Visible"
-#~ msgstr "Visible"
-
-#~ msgid "Available Message:"
-#~ msgstr "Missatge de disponibilitat:"
-
-#~ msgid "I'm doing work and hoping for a distraction--IM me!"
-#~ msgstr "Estic fent feina i espero una distracció; parleu amb mi."
-
-#~ msgid "Set Available Message..."
-#~ msgstr "Estableix el missatge de disponibilitat..."
-
-#~ msgid "Roomlist"
-#~ msgstr "Llista de sales"
-
-#~ msgid "Cannot get room list"
-#~ msgstr "No s'ha pogut obtenir la llista de sales"
-
-#~ msgid "Failed to leave channel"
-#~ msgstr "Ha fallat en sortir del canal"
-
-#~ msgid "Custom"
-#~ msgstr "Personalitzat"
-
-#~ msgid "%s logged in."
-#~ msgstr "%s ha entrat."
-
-#~ msgid "%s signed on"
-#~ msgstr "%s s'ha connectat"
-
-#~ msgid "%s logged out."
-#~ msgstr "%s ha sortit."
-
-#~ msgid "%s signed off"
-#~ msgstr "%s se n'ha anat"
+#~ "  -a, --acct          mostra la finestra d'edició de comptes\n"
+#~ "  -c, --config=DIR    utilitza DIR per als fitxers de configuració\n"
+#~ "  -d, --debug         mostra missatges de depuració a la sortida "
+#~ "estàndard\n"
+#~ "  -h, --help          mostra aquesta ajuda i surt\n"
+#~ "  -n, --nologin       no entra automàticament\n"
+#~ "  -l, --login[=NOM]   entra automàticament (l'argument opcional NOM "
+#~ "indica els\n"
+#~ "                      comptes a fer servir, separats per comes)\n"
+#~ "  -v, --version       mostra la versió actual i surt\n"
+
+#~ msgid "Ignore _formatting"
+#~ msgstr "Ignora el _formatat"
+
+#~ msgid "Show more buddy details"
+#~ msgstr "Mostra mésdetalls de l'amic"
+
+#~ msgid "No sounds"
+#~ msgstr "Sense sons"
+
+#~ msgid "Type"
+#~ msgstr "Tipus"
+
+#~ msgid "Saved Statuses"
+#~ msgstr "Estats desats"
+
+#~ msgid "Title already in use.  You must choose a unique title."
+#~ msgstr "Ja s'utilitza aquest títol. Heu d'escollir un títol únic."
+
+#~ msgid "Custom status"
+#~ msgstr "Estat personalitzat"
+
+#~ msgid "_Title:"
+#~ msgstr "_Títol:"
+
+#~ msgid "Out of the office"
+#~ msgstr "Fora de l'oficina"
+
+#~ msgid "_Status:"
+#~ msgstr "E_stat:"
+
+#~ msgid "Use a different status for some accounts"
+#~ msgstr "Utilitza un estat diferent per a determinats comptes"
+
+#~ msgid "Typing"
+#~ msgstr "Teclejant"
+
+#~ msgid "New Status"
+#~ msgstr "Estat nou"
+
+#~ msgid "The following error has occurred loading %s: %s"
+#~ msgstr "S'ha produït el següent error en carregar %s: %s"
+
+#~ msgid "Failed to load image"
+#~ msgstr "No s'ha pogut carregar la imatge"
+
+#~ msgid "Cannot send folder %s."
+#~ msgstr "No s'ha pogut enviar la carpeta %s."
+
+#~ msgid ""
+#~ "Gaim cannot transfer a folder. You will need to send the files within "
+#~ "individually"
+#~ msgstr ""
+#~ "El Gaim no pot transferir una carpeta. Haureu d'enviar per separat cada "
+#~ "un dels fitxers"
+
+#~ msgid "You have dragged an image"
+#~ msgstr "Heu arrossegat una imatge"
 
 #~ msgid ""
-#~ "%s has just been warned by %s.\n"
-#~ "Your new warning level is %d%%"
+#~ "You can send this image as a file transfer, embed it into this message, "
+#~ "or use it as the buddy icon for this user."
+#~ msgstr ""
+#~ "Podeu enviar aquesta imatge com una transferència de fitxer, incrustar-la "
+#~ "en el missatge, o usar-la com a icona d'amic per a aquest usuari."
+
+#~ msgid "Set as buddy icon"
+#~ msgstr "Estableix com a icona de l'amic"
+
+#~ msgid "Send image file"
+#~ msgstr "Envia unfitxer d'imatge"
+
+#~ msgid "Insert in message"
+#~ msgstr "Insereix un el missatge"
+
+#~ msgid "Would you like to set it as the buddy icon for this user?"
+#~ msgstr "Voleu establir-la com la icona per a aquest amic?"
+
+#~ msgid ""
+#~ "You can send this image as a file transfer orembed it into this message, "
+#~ "or use it as the buddy icon for this user."
+#~ msgstr ""
+#~ "Podeu enviar aquesta imatge com a una transferència de fitxer, incrustar-"
+#~ "la en el missatge o utilitzar-la com a icona per a aquest usuari."
+
+#~ msgid ""
+#~ "You can insert this image into this message, or use it as the buddy icon "
+#~ "for this user"
+#~ msgstr ""
+#~ "Podeu incrustar aquesta imatge en el missatge o utilitzar-la com a icona "
+#~ "per a aquest usuari."
+
+#~ msgid "Cannot send launcher"
+#~ msgstr "No es pot enviar el llançador"
+
+#~ msgid ""
+#~ "You dragged a desktop launcher. Most likely you wanted to send whatever "
+#~ "this launcher points to instead of this launcher itself."
 #~ msgstr ""
-#~ "%s acaba de ser avisat per %s.\n"
-#~ "El seu nivell d'avisos és ara %d%%"
-
-#~ msgid "an anonymous person"
-#~ msgstr "una persona anònima"
-
-#~ msgid "Sorry, I ran out for a bit!"
-#~ msgstr "Disculpeu-me, me n'he anat per una estona."
+#~ "Heu arrossegat un llançador de l'escriptori. Segurament voleu enviar allò "
+#~ "al que aquest llançador apunta i no pas el llançador."
+
+#~ msgid "Use SSL"
+#~ msgstr "Usa SSL"
+
+#~ msgid "Priority"
+#~ msgstr "Prioritat"
+
+#~ msgid "You have lost your connection to chat room %s."
+#~ msgstr "Heu perdut la connexió a la sala de xat %s."
+
+#~ msgid "Require authorization"
+#~ msgstr "Requereix autorització"
+
+#~ msgid "Hide IP address"
+#~ msgstr "Ocula l'adreça IP"
+
+#~ msgid "Web aware"
+#~ msgstr "Conscient de la web"
+
+#~ msgid "ICQ Privacy Options"
+#~ msgstr "Opcions de privadesa de ICQ"
+
+#~ msgid "Show privacy options..."
+#~ msgstr "Mostra les opcions de privadesa..."
+
+#~ msgid "Use recent buddies group"
+#~ msgstr "Usa el grup d'amics recent"
+
+#~ msgid "Show how long you have been idle"
+#~ msgstr "Mostra quant de temps heu estat inactiu"
+
+#~ msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
+#~ msgstr "join: &lt;sala&gt;:  Entra en una sala de xat de la xarxa Yahoo"
+
+#~ msgid "buzz: Buzz a contact to get their attention"
+#~ msgstr ""
+#~ "buzz: Fa sonar un soroll a un contacte per tal de que us pari atenció"
+
+#~ msgid ""
+#~ "Gaim cannot send files over Yahoo! that are bigger than One Megabyte "
+#~ "(1,048,576 bytes)."
+#~ msgstr ""
+#~ "El Gaim no pot enviar fitxer a través de Yahoo! que siguin més grans d'un "
+#~ "Megabyte (1.048.576 bytes)."
+
+#~ msgid "topic &lt;instance&gt;: Set the instance to be used on this class"
+#~ msgstr ""
+#~ "topic &lt;instància&gt;: Especifica la instància a fer servir en aquesta "
+#~ "classe"
+
+#~ msgid "Import from .anyone"
+#~ msgstr "Importa de .anyone"
+
+#~ msgid "Import from .zephyr.subs"
+#~ msgstr "Importa de .zephyr.subs"
+
+#~ msgid "Realm"
+#~ msgstr "Regne"
+
+#~ msgid "Unset"
+#~ msgstr "Sense especificar"
+
+#~ msgid "Error Reading %s"
+#~ msgstr "Error en llegir %s"
 
 #~ msgid "Miscellaneous error"
 #~ msgstr "Error miscel·lani"
--- a/po/en_CA.po	Mon Mar 14 15:48:34 2005 +0000
+++ b/po/en_CA.po	Tue Mar 15 02:04:53 2005 +0000
@@ -1,5 +1,5 @@
 # Canadian English translation of gaim
-# Copyright (C) 2004 Adam Weinberger
+# Copyright (C) 2004-2005 Adam Weinberger
 # This file is distributed under the same licence as the gaim package.
 # en_CA.po Maintainer: Adam Weinberger <adamw@gnome.org>
 #
@@ -8,8 +8,8 @@
 msgstr ""
 "Project-Id-Version: gaim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-12-02 18:38-0500\n"
-"PO-Revision-Date: 2004-11-28 19:45-0400\n"
+"POT-Creation-Date: 2005-02-13 21:38-0500\n"
+"PO-Revision-Date: 2005-02-13 19:45-0400\n"
 "Last-Translator: Adam Weinberger <adamw@gnome.org>\n"
 "Language-Team: en_CA <adamw@FreeBSD.org>\n"
 "MIME-Version: 1.0\n"
@@ -17,19 +17,19 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: plugins/autorecon.c:276
+#: plugins/autorecon.c:281
 msgid "Error Message Suppression"
 msgstr "Error Message Suppression"
 
-#: plugins/autorecon.c:280
+#: plugins/autorecon.c:285
 msgid "Hide Disconnect Errors"
 msgstr "Hide Disconnect Errors"
 
-#: plugins/autorecon.c:284
+#: plugins/autorecon.c:289
 msgid "Hide Login Errors"
 msgstr "Hide Login Errors"
 
-#: plugins/autorecon.c:288
+#: plugins/autorecon.c:293
 msgid "Hide Reconnecting Dialog"
 msgstr "Hide Reconnecting Dialogue"
 
@@ -39,7 +39,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/autorecon.c:312
+#: plugins/autorecon.c:317
 msgid "Auto-Reconnect"
 msgstr "Auto-Reconnect"
 
@@ -47,24 +47,25 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/autorecon.c:315 plugins/autorecon.c:317
+#: plugins/autorecon.c:320 plugins/autorecon.c:322
 msgid "When you are kicked offline, this reconnects you."
 msgstr "When you are kicked offline, this reconnects you."
 
-#: plugins/chkmail.c:94 plugins/chkmail.c:117 plugins/chkmail.c:126
+#: plugins/chkmail.c:92 plugins/chkmail.c:114 plugins/chkmail.c:123
 msgid "Mail Server"
 msgstr "Mail Server"
 
-#: plugins/chkmail.c:136
+#. XXX - This needs to use ngettext()
+#: plugins/chkmail.c:132
 #, c-format
 msgid "%s (%d new/%d total)"
 msgstr "%s (%d new/%d total)"
 
-#: plugins/chkmail.c:199
+#: plugins/chkmail.c:194
 msgid "Check Mail"
 msgstr "Check Mail"
 
-#: plugins/chkmail.c:203
+#: plugins/chkmail.c:198
 msgid "Check email every X seconds.\n"
 msgstr "Check email every X seconds.\n"
 
@@ -166,15 +167,16 @@
 msgid "New..."
 msgstr "New..."
 
-#: plugins/docklet/docklet.c:189 src/gtkprefs.c:1760 src/protocols/gg/gg.c:52
-#: src/protocols/irc/irc.c:169 src/protocols/irc/msgs.c:189
-#: src/protocols/jabber/buddy.c:1074 src/protocols/jabber/jabber.c:987
-#: src/protocols/msn/msn.c:542 src/protocols/novell/novell.c:2811
+#: plugins/docklet/docklet.c:189 src/gtkprefs.c:1694 src/protocols/gg/gg.c:52
+#: src/protocols/irc/irc.c:179 src/protocols/irc/msgs.c:189
+#: src/protocols/jabber/buddy.c:1076 src/protocols/jabber/jabber.c:994
+#: src/protocols/msn/msn.c:539 src/protocols/novell/novell.c:2811
 #: src/protocols/novell/novell.c:2928 src/protocols/novell/novell.c:2980
-#: src/protocols/oscar/oscar.c:677 src/protocols/oscar/oscar.c:5592
-#: src/protocols/oscar/oscar.c:6662 src/protocols/oscar/oscar.c:6883
-#: src/protocols/silc/buddy.c:1384 src/protocols/silc/silc.c:52
-#: src/protocols/yahoo/yahoo.c:3167 src/protocols/zephyr/zephyr.c:2225
+#: src/protocols/oscar/oscar.c:691 src/protocols/oscar/oscar.c:5742
+#: src/protocols/oscar/oscar.c:6803 src/protocols/oscar/oscar.c:7024
+#: src/protocols/silc/buddy.c:1393 src/protocols/silc/silc.c:52
+#: src/protocols/yahoo/yahoo.c:2927 src/protocols/zephyr/zephyr.c:2225
+#: src/status.c:160
 msgid "Away"
 msgstr "Away"
 
@@ -186,15 +188,15 @@
 msgid "Mute Sounds"
 msgstr "Mute Sounds"
 
-#: plugins/docklet/docklet.c:213 src/gtkft.c:628
+#: plugins/docklet/docklet.c:213 src/gtkft.c:621
 msgid "File Transfers"
 msgstr "File Transfers"
 
-#: plugins/docklet/docklet.c:214 src/gtkaccount.c:2345
+#: plugins/docklet/docklet.c:214 src/gtkaccount.c:2244
 msgid "Accounts"
 msgstr "Accounts"
 
-#: plugins/docklet/docklet.c:215 src/gtkprefs.c:2263
+#: plugins/docklet/docklet.c:215 src/gtkprefs.c:2195
 msgid "Preferences"
 msgstr "Preferences"
 
@@ -206,11 +208,11 @@
 msgid "Quit"
 msgstr "Quit"
 
-#: plugins/docklet/docklet.c:553
+#: plugins/docklet/docklet.c:559
 msgid "Tray Icon Configuration"
 msgstr "Tray Icon Configuration"
 
-#: plugins/docklet/docklet.c:557
+#: plugins/docklet/docklet.c:563
 msgid "_Hide new messages until tray icon is clicked"
 msgstr "_Hide new messages until tray icon is clicked"
 
@@ -220,19 +222,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/docklet/docklet.c:583
+#: plugins/docklet/docklet.c:589
 msgid "System Tray Icon"
 msgstr "System Tray Icon"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/docklet/docklet.c:586
+#: plugins/docklet/docklet.c:592
 msgid "Displays an icon for Gaim in the system tray."
 msgstr "Displays an icon for Gaim in the system tray."
 
 #. *  description
-#: plugins/docklet/docklet.c:588
+#: plugins/docklet/docklet.c:594
 msgid ""
 "Displays a system tray icon (in GNOME, KDE or Windows for example) to show "
 "the current status of Gaim, allow fast access to commonly used functions, "
@@ -292,7 +294,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/filectl.c:249
+#: plugins/filectl.c:248
 msgid "Gaim File Control"
 msgstr "Gaim File Control"
 
@@ -300,7 +302,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/filectl.c:252 plugins/filectl.c:254
+#: plugins/filectl.c:251 plugins/filectl.c:253
 msgid "Allows you to control Gaim by entering commands in a file."
 msgstr "Allows you to control Gaim by entering commands in a file."
 
@@ -320,7 +322,7 @@
 msgid "Invalid AIM URI"
 msgstr "Invalid AIM URI"
 
-#: plugins/gaim-remote/remote.c:742
+#: plugins/gaim-remote/remote.c:749
 #, c-format
 msgid ""
 "Failed to assign %s to a socket:\n"
@@ -329,7 +331,7 @@
 "Failed to assign %s to a socket:\n"
 "%s"
 
-#: plugins/gaim-remote/remote.c:765
+#: plugins/gaim-remote/remote.c:773
 msgid "Unable to open socket"
 msgstr "Unable to open socket"
 
@@ -339,19 +341,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/gaim-remote/remote.c:815
+#: plugins/gaim-remote/remote.c:823
 msgid "Remote Control"
 msgstr "Remote Control"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/gaim-remote/remote.c:818
+#: plugins/gaim-remote/remote.c:826
 msgid "Provides remote control for gaim applications."
 msgstr "Provides remote control for gaim applications."
 
 #. *  description
-#: plugins/gaim-remote/remote.c:820
+#: plugins/gaim-remote/remote.c:828
 msgid ""
 "Gives Gaim the ability to be remote-controlled through third-party "
 "applications or through the gaim-remote tool."
@@ -389,6 +391,76 @@
 "- It reverses all incoming text\n"
 "- It sends a message to people on your list immediately when they sign on"
 
+#: plugins/gaimrc.c:40
+msgid "Cursor Color"
+msgstr "Cursor Colour"
+
+#: plugins/gaimrc.c:41
+msgid "Secondary Cursor Color"
+msgstr "Secondary Cursor Colour"
+
+#: plugins/gaimrc.c:42
+msgid "Hyperlink Color"
+msgstr "Hyperlink Colour"
+
+#: plugins/gaimrc.c:53
+msgid "GtkTreeView Expander Size"
+msgstr "GtkTreeView Expander Size"
+
+#: plugins/gaimrc.c:72
+msgid "Conversation Entry"
+msgstr "Conversation Entry"
+
+#: plugins/gaimrc.c:73
+msgid "Conversation History"
+msgstr "Conversation History"
+
+#: plugins/gaimrc.c:74
+msgid "Log Viewer"
+msgstr "Log Viewer"
+
+#: plugins/gaimrc.c:75
+msgid "Request Dialog"
+msgstr "Request Dialogue"
+
+#: plugins/gaimrc.c:76
+msgid "Notify Dialog"
+msgstr "Notify Dialogue"
+
+#: plugins/gaimrc.c:209
+#, c-format
+msgid "Select Color for %s"
+msgstr "Select Colour for %s"
+
+#: plugins/gaimrc.c:211
+msgid "Select Color"
+msgstr "Select Colour"
+
+#: plugins/gaimrc.c:246
+#, c-format
+msgid "Select Font for %s"
+msgstr "Select Font for %s"
+
+#: plugins/gaimrc.c:284
+msgid "Select Interface Font"
+msgstr "Select Interface Font"
+
+#: plugins/gaimrc.c:343
+msgid "Gtk interface font"
+msgstr "GTK interface font"
+
+#: plugins/gaimrc.c:362
+msgid "Gtk text shortcut theme"
+msgstr "GTK text shortcut theme"
+
+#: plugins/gaimrc.c:460
+msgid "Gaim GTK+ Theme Control"
+msgstr "Gaim GTK+ Theme Control"
+
+#: plugins/gaimrc.c:462 plugins/gaimrc.c:463
+msgid "Provides access to commonly used gtkrc settings."
+msgstr "Provides access to commonly used gtkrc settings."
+
 #. Configuration frame
 #: plugins/gestures/gestures.c:221
 msgid "Mouse Gestures Configuration"
@@ -442,9 +514,9 @@
 "Drag up and then to the right to switch to the next conversation."
 
 #: plugins/gevolution/add_buddy_dialog.c:132
-#: plugins/gevolution/assoc-buddy.c:120 src/gtkprefs.c:2080
-#: src/gtkroomlist.c:553 src/protocols/jabber/jabber.c:606
-#: src/protocols/msn/msn.c:1501 src/protocols/trepia/trepia.c:399
+#: plugins/gevolution/assoc-buddy.c:120 src/gtkprefs.c:2014
+#: src/gtkroomlist.c:553 src/protocols/jabber/jabber.c:607
+#: src/protocols/msn/msn.c:1455 src/protocols/trepia/trepia.c:399
 msgid "Name"
 msgstr "Name"
 
@@ -459,13 +531,13 @@
 
 #. "Search"
 #: plugins/gevolution/add_buddy_dialog.c:468
-#: plugins/gevolution/assoc-buddy.c:354 src/protocols/oscar/oscar.c:7189
+#: plugins/gevolution/assoc-buddy.c:354 src/protocols/oscar/oscar.c:7388
 msgid "Search"
 msgstr "Search"
 
 #: plugins/gevolution/add_buddy_dialog.c:549
-#: plugins/gevolution/new_person_dialog.c:304 src/gtkblist.c:4053
-#: src/gtkblist.c:4402
+#: plugins/gevolution/new_person_dialog.c:304 src/gtkblist.c:4281
+#: src/gtkblist.c:4659
 msgid "Group:"
 msgstr "Group:"
 
@@ -504,7 +576,7 @@
 msgstr "_Associate Buddy"
 
 #: plugins/gevolution/gevo-util.c:64 plugins/gevolution/gevolution.c:90
-#: src/blist.c:775 src/blist.c:982 src/blist.c:1933 src/gtkblist.c:3873
+#: src/blist.c:517 src/blist.c:1226 src/blist.c:1440 src/gtkblist.c:4101
 #: src/protocols/jabber/roster.c:66
 msgid "Buddies"
 msgstr "Buddies"
@@ -523,7 +595,7 @@
 msgid "Select all accounts that buddies should be auto-added to."
 msgstr "Select all accounts that buddies should be auto-added to."
 
-#: plugins/gevolution/gevolution.c:377 plugins/idle.c:52 src/gtkconn.c:626
+#: plugins/gevolution/gevolution.c:377 plugins/idle.c:52 src/gtkconn.c:416
 msgid "Account"
 msgstr "Account"
 
@@ -567,8 +639,8 @@
 msgstr "Optional information:"
 
 #. Label
-#: plugins/gevolution/new_person_dialog.c:335 src/gtkaccount.c:372
-#: src/gtkaccount.c:402 src/protocols/oscar/oscar.c:583
+#: plugins/gevolution/new_person_dialog.c:335 src/gtkaccount.c:377
+#: src/gtkaccount.c:407 src/protocols/oscar/oscar.c:597
 msgid "Buddy Icon"
 msgstr "Buddy Icon"
 
@@ -703,68 +775,68 @@
 msgstr "Adds a small box to the buddy list that shows if you have new mail."
 
 #. ---------- "Notify For" ----------
-#: plugins/notify.c:599
+#: plugins/notify.c:618
 msgid "Notify For"
 msgstr "Notify For"
 
-#: plugins/notify.c:603
+#: plugins/notify.c:622
 msgid "_IM windows"
 msgstr "_IM windows"
 
-#: plugins/notify.c:610
+#: plugins/notify.c:629
 msgid "C_hat windows"
 msgstr "C_hat windows"
 
-#: plugins/notify.c:617
+#: plugins/notify.c:636
 msgid "_Focused windows"
 msgstr "_Focused windows"
 
 #. ---------- "Notification Methods" ----------
-#: plugins/notify.c:625
+#: plugins/notify.c:644
 msgid "Notification Methods"
 msgstr "Notification Methods"
 
-#: plugins/notify.c:632
+#: plugins/notify.c:654
 msgid "Prepend _string into window title:"
 msgstr "Prepend _string into window title:"
 
 #. Count method button
-#: plugins/notify.c:651
+#: plugins/notify.c:673
 msgid "Insert c_ount of new messages into window title"
 msgstr "Insert c_ount of new messages into window title"
 
 #. Urgent method button
-#: plugins/notify.c:659
+#: plugins/notify.c:681
 msgid "Set window manager \"_URGENT\" hint"
 msgstr "Set window manager \"_URGENT\" hint"
 
 #. ---------- "Notification Removals" ----------
-#: plugins/notify.c:667
+#: plugins/notify.c:689
 msgid "Notification Removal"
 msgstr "Notification Removal"
 
 #. Remove on focus button
-#: plugins/notify.c:672
+#: plugins/notify.c:694
 msgid "Remove when conversation window _gains focus"
 msgstr "Remove when conversation window _gains focus"
 
 #. Remove on click button
-#: plugins/notify.c:679
+#: plugins/notify.c:701
 msgid "Remove when conversation window _receives click"
 msgstr "Remove when conversation window _receives click"
 
 #. Remove on type button
-#: plugins/notify.c:687
+#: plugins/notify.c:709
 msgid "Remove when _typing in conversation window"
 msgstr "Remove when _typing in conversation window"
 
 #. Remove on message send button
-#: plugins/notify.c:695
+#: plugins/notify.c:717
 msgid "Remove when a _message gets sent"
 msgstr "Remove when a _message gets sent"
 
 #. Remove on conversation switch button
-#: plugins/notify.c:704
+#: plugins/notify.c:726
 msgid "Remove on switch to conversation ta_b"
 msgstr "Remove on switch to conversation ta_b"
 
@@ -774,7 +846,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/notify.c:794
+#: plugins/notify.c:816
 msgid "Message Notification"
 msgstr "Message Notification"
 
@@ -782,7 +854,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/notify.c:797 plugins/notify.c:799
+#: plugins/notify.c:819 plugins/notify.c:821
 msgid "Provides a variety of ways of notifying you of unread messages."
 msgstr "Provides a variety of ways of notifying you of unread messages."
 
@@ -908,35 +980,35 @@
 msgid "Tests to see that most things are working."
 msgstr "Tests to see that most things are working."
 
-#: plugins/spellchk.c:415
+#: plugins/spellchk.c:417
 msgid "Text Replacements"
 msgstr "Text Replacements"
 
-#: plugins/spellchk.c:439
+#: plugins/spellchk.c:441
 msgid "You type"
 msgstr "You type"
 
-#: plugins/spellchk.c:451
+#: plugins/spellchk.c:453
 msgid "You send"
 msgstr "You send"
 
-#: plugins/spellchk.c:477
+#: plugins/spellchk.c:479
 msgid "Add a new text replacement"
 msgstr "Add a new text replacement"
 
-#: plugins/spellchk.c:484
+#: plugins/spellchk.c:486
 msgid "You _type:"
 msgstr "You _type:"
 
-#: plugins/spellchk.c:498
+#: plugins/spellchk.c:500
 msgid "You _send:"
 msgstr "You _send:"
 
-#: plugins/spellchk.c:540
+#: plugins/spellchk.c:542
 msgid "Text replacement"
 msgstr "Text replacement"
 
-#: plugins/spellchk.c:542 plugins/spellchk.c:543
+#: plugins/spellchk.c:544 plugins/spellchk.c:545
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr "Replaces text in outgoing messages according to user-defined rules."
 
@@ -1074,19 +1146,19 @@
 msgid "A horizontal scrolling version of the buddy list."
 msgstr "A horizontal scrolling version of the buddy list."
 
-#: plugins/timestamp.c:183
+#: plugins/timestamp.c:202
 msgid "iChat Timestamp"
 msgstr "iChat Timestamp"
 
-#: plugins/timestamp.c:190
+#: plugins/timestamp.c:209
 msgid "Delay"
 msgstr "Delay"
 
-#: plugins/timestamp.c:197
+#: plugins/timestamp.c:216
 msgid "minutes."
 msgstr "minutes."
 
-#: plugins/timestamp.c:203
+#: plugins/timestamp.c:222
 msgid "_Apply"
 msgstr "_Apply"
 
@@ -1096,7 +1168,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/timestamp.c:268
+#: plugins/timestamp.c:295
 msgid "Timestamp"
 msgstr "Timestamp"
 
@@ -1104,7 +1176,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/timestamp.c:271 plugins/timestamp.c:273
+#: plugins/timestamp.c:298 plugins/timestamp.c:300
 msgid "Adds iChat-style timestamps to conversations every N minutes."
 msgstr "Adds iChat-style timestamps to conversations every N minutes."
 
@@ -1166,153 +1238,163 @@
 "\n"
 "* Note: This plugin requires Win2000 or WinXP."
 
-#: plugins/win32/winprefs/winprefs.c:344
+#: plugins/win32/winprefs/winprefs.c:320
 msgid "GTK+ Runtime Version"
 msgstr "GTK+ Runtime Version"
 
 #. Autostart
-#: plugins/win32/winprefs/winprefs.c:352
+#: plugins/win32/winprefs/winprefs.c:328
 msgid "Startup"
 msgstr "Startup"
 
-#: plugins/win32/winprefs/winprefs.c:353
+#: plugins/win32/winprefs/winprefs.c:329
 msgid "_Start Gaim on Windows startup"
 msgstr "_Start Gaim on Windows startup"
 
 #. Buddy List
-#: plugins/win32/winprefs/winprefs.c:362 src/gtkblist.c:3145
-#: src/gtkprefs.c:2178
+#: plugins/win32/winprefs/winprefs.c:338 src/gtkblist.c:3377
+#: src/gtkprefs.c:2111
 msgid "Buddy List"
 msgstr "Buddy List"
 
-#: plugins/win32/winprefs/winprefs.c:363
+#: plugins/win32/winprefs/winprefs.c:339
 msgid "_Dockable Buddy List"
 msgstr "_Dockable Buddy List"
 
 #. Docked Blist On Top
-#: plugins/win32/winprefs/winprefs.c:367
+#: plugins/win32/winprefs/winprefs.c:343
 msgid "Docked _Buddy List is always on top"
 msgstr "Docked _Buddy List is always on top"
 
 #. Blist On Top
-#: plugins/win32/winprefs/winprefs.c:377
+#: plugins/win32/winprefs/winprefs.c:353
 msgid "_Keep Buddy List window on top"
 msgstr "_Keep Buddy List window on top"
 
 #. Conversations
-#: plugins/win32/winprefs/winprefs.c:382 src/gtkprefs.c:910
-#: src/gtkprefs.c:2179 src/protocols/msn/msn.c:1838
+#: plugins/win32/winprefs/winprefs.c:358 src/gtkprefs.c:867
+#: src/gtkprefs.c:2112
 msgid "Conversations"
 msgstr "Conversations"
 
+#: plugins/win32/winprefs/winprefs.c:359
+msgid "_Flash Window when messages are received"
+msgstr "_Flash Window when messages are received"
+
 #: plugins/win32/winprefs/winprefs.c:383
-msgid "_Flash Window when messages are received"
-msgstr "_Flash Window when messages are received"
-
-#: plugins/win32/winprefs/winprefs.c:407
 msgid "WinGaim Options"
 msgstr "WinGaim Options"
 
-#: plugins/win32/winprefs/winprefs.c:409 plugins/win32/winprefs/winprefs.c:410
+#: plugins/win32/winprefs/winprefs.c:385 plugins/win32/winprefs/winprefs.c:386
 msgid "Options specific to Windows Gaim."
 msgstr "Options specific to Windows Gaim."
 
-#: src/account.c:294 src/protocols/jabber/jabber.c:1043
+#: src/account.c:532
+msgid "accounts"
+msgstr "accounts"
+
+#: src/account.c:732 src/protocols/jabber/jabber.c:1050
 msgid "New passwords do not match."
 msgstr "New passwords do not match."
 
-#: src/account.c:303
+#: src/account.c:741
 msgid "Fill out all fields completely."
 msgstr "Fill out all fields completely."
 
-#: src/account.c:328
+#: src/account.c:766
 msgid "Original password"
 msgstr "Original password"
 
-#: src/account.c:335
+#: src/account.c:773
 msgid "New password"
 msgstr "New password"
 
-#: src/account.c:342
+#: src/account.c:780
 msgid "New password (again)"
 msgstr "New password (again)"
 
-#: src/account.c:348
+#: src/account.c:786
 #, c-format
 msgid "Change password for %s"
 msgstr "Change password for %s"
 
-#: src/account.c:356
+#: src/account.c:794
 msgid "Please enter your current password and your new password."
 msgstr "Please enter your current password and your new password."
 
 #. *
 #. * A wrapper for gaim_request_action() that uses OK and Cancel buttons.
 #.
-#: src/account.c:359 src/connection.c:188 src/gtkblist.c:2419
-#: src/gtkdialogs.c:375 src/gtkdialogs.c:518 src/gtkdialogs.c:574
-#: src/gtkrequest.c:259 src/protocols/jabber/jabber.c:1090
-#: src/protocols/jabber/xdata.c:337 src/protocols/msn/msn.c:228
-#: src/protocols/msn/msn.c:243 src/protocols/msn/msn.c:258
-#: src/protocols/msn/msn.c:273 src/protocols/oscar/oscar.c:3533
-#: src/protocols/oscar/oscar.c:3627 src/protocols/oscar/oscar.c:6976
-#: src/protocols/oscar/oscar.c:7068 src/protocols/oscar/oscar.c:7120
+#: src/account.c:797 src/connection.c:187 src/gtkblist.c:2605
+#: src/gtkdialogs.c:472 src/gtkdialogs.c:615 src/gtkdialogs.c:671
+#: src/gtkrequest.c:259 src/protocols/jabber/jabber.c:1097
+#: 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:2398
+#: src/protocols/oscar/oscar.c:3650 src/protocols/oscar/oscar.c:3744
+#: src/protocols/oscar/oscar.c:7117 src/protocols/oscar/oscar.c:7242
+#: src/protocols/oscar/oscar.c:7267 src/protocols/oscar/oscar.c:7319
 #: src/protocols/silc/buddy.c:460 src/protocols/silc/buddy.c:1132
-#: src/protocols/silc/chat.c:421 src/protocols/silc/chat.c:459
-#: src/protocols/silc/chat.c:722 src/protocols/silc/ops.c:1083
-#: src/protocols/silc/ops.c:1689 src/protocols/silc/silc.c:717
-#: src/protocols/yahoo/yahoo.c:2892 src/protocols/yahoo/yahoo.c:2901
+#: src/protocols/silc/chat.c:422 src/protocols/silc/chat.c:460
+#: src/protocols/silc/chat.c:723 src/protocols/silc/ops.c:1083
+#: src/protocols/silc/ops.c:1689 src/protocols/silc/silc.c:706
+#: src/protocols/yahoo/yahoo.c:2650 src/protocols/yahoo/yahoo.c:2659
 #: src/request.h:1244
 msgid "OK"
 msgstr "OK"
 
-#: src/account.c:360 src/account.c:398 src/connection.c:189
-#: src/gtkaccount.c:2014 src/gtkaccount.c:2510 src/gtkblist.c:2420
-#: src/gtkblist.c:4440 src/gtkconn.c:171 src/gtkdialogs.c:376
-#: src/gtkdialogs.c:519 src/gtkdialogs.c:575 src/gtkdialogs.c:673
-#: src/gtkdialogs.c:695 src/gtkdialogs.c:715 src/gtkdialogs.c:751
-#: src/gtkdialogs.c:813 src/gtkdialogs.c:855 src/gtkdialogs.c:893
-#: src/gtkimhtmltoolbar.c:440 src/gtkprivacy.c:588 src/gtkprivacy.c:601
-#: src/gtkprivacy.c:626 src/gtkprivacy.c:637 src/gtkrequest.c:260
-#: src/protocols/jabber/buddy.c:565 src/protocols/jabber/chat.c:772
-#: src/protocols/jabber/jabber.c:675 src/protocols/jabber/jabber.c:1091
-#: src/protocols/jabber/xdata.c:338 src/protocols/msn/msn.c:229
-#: src/protocols/msn/msn.c:244 src/protocols/msn/msn.c:259
-#: src/protocols/msn/msn.c:274 src/protocols/msn/msn.c:291
-#: src/protocols/oscar/oscar.c:1534 src/protocols/oscar/oscar.c:3491
-#: src/protocols/oscar/oscar.c:3534 src/protocols/oscar/oscar.c:3571
-#: src/protocols/oscar/oscar.c:3628 src/protocols/oscar/oscar.c:6977
-#: src/protocols/oscar/oscar.c:7069 src/protocols/oscar/oscar.c:7121
-#: src/protocols/oscar/oscar.c:7190 src/protocols/silc/buddy.c:461
+#: src/account.c:798 src/account.c:836 src/connection.c:188
+#: src/gtkaccount.c:1989 src/gtkaccount.c:2404 src/gtkblist.c:2606
+#: src/gtkblist.c:4697 src/gtkdialogs.c:473 src/gtkdialogs.c:616
+#: src/gtkdialogs.c:672 src/gtkdialogs.c:770 src/gtkdialogs.c:792
+#: src/gtkdialogs.c:812 src/gtkdialogs.c:856 src/gtkdialogs.c:918
+#: src/gtkdialogs.c:960 src/gtkdialogs.c:998 src/gtkimhtmltoolbar.c:443
+#: src/gtkprivacy.c:585 src/gtkprivacy.c:598 src/gtkprivacy.c:623
+#: src/gtkprivacy.c:634 src/gtkrequest.c:260 src/gtksavedstatuses.c:188
+#: src/protocols/jabber/buddy.c:565 src/protocols/jabber/chat.c:774
+#: src/protocols/jabber/jabber.c:676 src/protocols/jabber/jabber.c:1098
+#: 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:1580 src/protocols/oscar/oscar.c:2399
+#: src/protocols/oscar/oscar.c:3608 src/protocols/oscar/oscar.c:3651
+#: src/protocols/oscar/oscar.c:3688 src/protocols/oscar/oscar.c:3745
+#: src/protocols/oscar/oscar.c:7118 src/protocols/oscar/oscar.c:7243
+#: src/protocols/oscar/oscar.c:7268 src/protocols/oscar/oscar.c:7320
+#: src/protocols/oscar/oscar.c:7389 src/protocols/silc/buddy.c:461
 #: src/protocols/silc/buddy.c:1037 src/protocols/silc/buddy.c:1133
-#: src/protocols/silc/chat.c:594 src/protocols/silc/chat.c:723
-#: src/protocols/silc/ops.c:1690 src/protocols/silc/silc.c:718
-#: src/protocols/trepia/trepia.c:348 src/protocols/yahoo/yahoo.c:2893
-#: src/protocols/yahoo/yahoo.c:2902 src/request.h:1244 src/request.h:1254
+#: src/protocols/silc/chat.c:595 src/protocols/silc/chat.c:724
+#: src/protocols/silc/ops.c:1690 src/protocols/silc/silc.c:707
+#: src/protocols/trepia/trepia.c:348 src/protocols/yahoo/yahoo.c:2651
+#: src/protocols/yahoo/yahoo.c:2660 src/request.h:1244 src/request.h:1254
 msgid "Cancel"
 msgstr "Cancel"
 
-#: src/account.c:389
+#: src/account.c:827
 #, c-format
 msgid "Change user information for %s"
 msgstr "Change user information for %s"
 
-#: src/account.c:397 src/gtkrequest.c:266 src/protocols/jabber/buddy.c:564
+#: src/account.c:835 src/gtkrequest.c:266 src/protocols/jabber/buddy.c:564
 #: src/protocols/trepia/trepia.c:347
 msgid "Save"
 msgstr "Save"
 
-#: src/account.c:802 src/gtkft.c:158 src/protocols/jabber/buddy.c:621
-#: src/protocols/jabber/buddy.c:1064 src/protocols/jabber/buddy.c:1081
+#: src/account.c:1240 src/gtkft.c:158 src/protocols/jabber/buddy.c:623
+#: src/protocols/jabber/buddy.c:1066 src/protocols/jabber/buddy.c:1083
 #: src/protocols/novell/novell.c:2823
 msgid "Unknown"
 msgstr "Unknown"
 
-#: src/blist.c:681
+#: src/blist.c:544
+msgid "buddy list"
+msgstr "buddy list"
+
+#: src/blist.c:1132
 msgid "Chats"
 msgstr "Chats"
 
-#: src/blist.c:1352
+#: src/blist.c:1813
 #, c-format
 msgid ""
 "%d buddy from group %s was not removed because its account was not logged "
@@ -1327,40 +1409,32 @@
 "%d buddies from group %s were not removed because their accounts were not "
 "logged in.  These buddies and the group were not removed.\n"
 
-#: src/blist.c:1361
+#: src/blist.c:1822
 msgid "Group not removed"
 msgstr "Group not removed"
 
-#: src/blist.c:2064
-msgid ""
-"An error was encountered parsing your buddy list.  It has not been loaded, "
-"and the old file has moved to blist.xml~."
-msgstr ""
-"An error was encountered parsing your buddy list.  It has not been loaded, "
-"and the old file has moved to blist.xml~."
-
-#: src/blist.c:2067
-msgid "Buddy List Error"
-msgstr "Buddy List Error"
-
-#: src/connection.c:112 src/connection.c:161
+#: src/connection.c:113 src/connection.c:159
 #, c-format
 msgid "Missing protocol plugin for %s"
 msgstr "Missing protocol plugin for %s"
 
-#: src/connection.c:116
+#: src/connection.c:117
 msgid "Registration Error"
 msgstr "Registration Error"
 
-#: src/connection.c:165
+#: src/connection.c:163
 msgid "Connection Error"
 msgstr "Connection Error"
 
-#: src/connection.c:185
+#: src/connection.c:183
 #, c-format
 msgid "Enter password for %s (%s)"
 msgstr "Enter password for %s (%s)"
 
+#: src/connection.c:185
+msgid "Enter Password"
+msgstr "Enter Password"
+
 #: src/conversation.c:236
 msgid "Unable to send message: The message is too large."
 msgstr "Unable to send message: The message is too large."
@@ -1383,67 +1457,67 @@
 msgid "Unable to send messge to %s."
 msgstr "Unable to send messge to %s."
 
-#: src/conversation.c:2005
+#: src/conversation.c:2052
 #, c-format
 msgid "%s entered the room."
 msgstr "%s entered the room."
 
-#: src/conversation.c:2008
+#: src/conversation.c:2055
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>] entered the room."
 
-#: src/conversation.c:2104
+#: src/conversation.c:2151
 #, c-format
 msgid "You are now known as %s"
 msgstr "You are now known as %s"
 
-#: src/conversation.c:2107
+#: src/conversation.c:2154
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s is now known as %s"
 
-#: src/conversation.c:2148
+#: src/conversation.c:2195
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s left the room (%s)."
 
-#: src/conversation.c:2150
+#: src/conversation.c:2197
 #, c-format
 msgid "%s left the room."
 msgstr "%s left the room."
 
-#: src/conversation.c:2219
+#: src/conversation.c:2270
 #, c-format
 msgid "(+%d more)"
 msgstr "(+%d more)"
 
-#: src/conversation.c:2221
+#: src/conversation.c:2272
 #, c-format
 msgid " left the room (%s)."
 msgstr " left the room (%s)."
 
-#: src/conversation.c:2626
+#: src/conversation.c:2677
 msgid "Last created window"
 msgstr "Last created window"
 
-#: src/conversation.c:2628
+#: src/conversation.c:2679
 msgid "Separate IM and Chat windows"
 msgstr "Separate IM and Chat windows"
 
-#: src/conversation.c:2630 src/gtkprefs.c:1287
+#: src/conversation.c:2681 src/gtkprefs.c:1221
 msgid "New window"
 msgstr "New window"
 
-#: src/conversation.c:2632
+#: src/conversation.c:2683
 msgid "By group"
 msgstr "By group"
 
-#: src/conversation.c:2634
+#: src/conversation.c:2685
 msgid "By account"
 msgstr "By account"
 
-#: src/ft.c:148 src/protocols/msn/msn.c:370
+#: src/ft.c:148 src/protocols/msn/msn.c:368
 #, c-format
 msgid ""
 "Error reading %s: \n"
@@ -1483,17 +1557,22 @@
 msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
 msgstr "%s is not a regular file. Cowardly refusing to overwrite it.\n"
 
-#: src/ft.c:260
+#: src/ft.c:261
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "%s wants to send you %s (%s)"
 
-#: src/ft.c:302
+#: src/ft.c:269
+#, c-format
+msgid "%s wants to send you a file"
+msgstr "%s wants to send you a file"
+
+#: src/ft.c:308
 #, c-format
 msgid "Accept file transfer request from %s?"
 msgstr "Accept file transfer request from %s?"
 
-#: src/ft.c:306
+#: src/ft.c:312
 #, c-format
 msgid ""
 "A file is available for download from:\n"
@@ -1504,37 +1583,50 @@
 "Remote host: %s\n"
 "Remote port: %d"
 
-#: src/ft.c:359
+#: src/ft.c:365
 #, c-format
 msgid "%s is not a valid filename.\n"
 msgstr "%s is not a valid filename.\n"
 
-#: src/ft.c:377
+#: src/ft.c:383
 #, c-format
 msgid "Offering to send %s to %s"
 msgstr "Offering to send %s to %s"
 
-#: src/ft.c:870
-#, c-format
-msgid "Transfer of %s complete"
-msgstr "Transfer of %s complete"
-
-#: src/ft.c:918
+#: src/ft.c:877
+#, c-format
+msgid "Transfer of file %s complete"
+msgstr "Transfer of file %s complete"
+
+#: src/ft.c:880
+msgid "File transfer complete"
+msgstr "File transfer complete"
+
+#: src/ft.c:929
 #, c-format
 msgid "You canceled the transfer of %s"
 msgstr "You cancelled the transfer of %s"
 
-#: src/ft.c:970
+#: src/ft.c:935
+msgid "File transfer cancelled"
+msgstr "File transfer cancelled"
+
+#: src/ft.c:988
 #, c-format
 msgid "%s canceled the transfer of %s"
 msgstr "%s cancelled the transfer of %s"
 
-#: src/ft.c:1020
+#: src/ft.c:994
+#, c-format
+msgid "%s canceled the file transfer"
+msgstr "%s cancelled the file transfer"
+
+#: src/ft.c:1043
 #, c-format
 msgid "File transfer to %s aborted.\n"
 msgstr "File transfer to %s aborted.\n"
 
-#: src/ft.c:1022
+#: src/ft.c:1045
 #, c-format
 msgid "File transfer from %s aborted.\n"
 msgstr "File transfer from %s aborted.\n"
@@ -1545,11 +1637,12 @@
 "Usage: %s command [OPTIONS] [URI]\n"
 "\n"
 "    COMMANDS:\n"
+"       send                     Send message\n"
 "       uri                      Handle AIM: URI\n"
 "       away                     Popup the away dialog with the default "
 "message\n"
 "       back                     Remove the away dialog\n"
-"       send                     Send message\n"
+"       logout                   Log out all accounts\n"
 "       quit                     Close running copy of Gaim\n"
 "\n"
 "    OPTIONS:\n"
@@ -1564,11 +1657,12 @@
 "Usage: %s command [OPTIONS] [URI]\n"
 "\n"
 "    COMMANDS:\n"
+"       send                     Send message\n"
 "       uri                      Handle AIM: URI\n"
-"       away                     Pop up the away dialogue with the default "
+"       away                     Popup the away dialogue with the default "
 "message\n"
 "       back                     Remove the away dialogue\n"
-"       send                     Send message\n"
+"       logout                   Log out all accounts\n"
 "       quit                     Close running copy of Gaim\n"
 "\n"
 "    OPTIONS:\n"
@@ -1580,7 +1674,7 @@
 "       -s, --session=SESSION    Specify which Gaim session to use\n"
 "       -h, --help [command]     Show help for command\n"
 
-#: src/gaim-remote.c:193
+#: src/gaim-remote.c:195
 #, c-format
 msgid ""
 "Gaim not running (on session %d)\n"
@@ -1589,7 +1683,7 @@
 "Gaim not running (on session %d)\n"
 "Is the \"Remote Control\" plugin loaded?\n"
 
-#: src/gaim-remote.c:280
+#: src/gaim-remote.c:282
 msgid ""
 "Insufficient arguments (-t, -f, -p, & -m are all required) or arguments "
 "greater than 9999 chars\n"
@@ -1597,7 +1691,7 @@
 "Insufficient arguments (-t, -f, -p, & -m are all required) or arguments "
 "greater than 9999 chars\n"
 
-#: src/gaim-remote.c:291
+#: src/gaim-remote.c:293
 msgid ""
 "\n"
 "Using AIM: URIs:\n"
@@ -1639,7 +1733,15 @@
 "\tgaim-remote uri 'aim:addbuddy?screenname=Penguin'\n"
 "...prompts you to add 'Penguin' to your buddy list.\n"
 
-#: src/gaim-remote.c:311
+#: src/gaim-remote.c:313
+msgid ""
+"\n"
+"Log out all accounts\n"
+msgstr ""
+"\n"
+"Log out all accounts\n"
+
+#: src/gaim-remote.c:317
 msgid ""
 "\n"
 "Close running copy of Gaim\n"
@@ -1647,7 +1749,7 @@
 "\n"
 "Close running copy of Gaim\n"
 
-#: src/gaim-remote.c:315
+#: src/gaim-remote.c:321
 msgid ""
 "\n"
 "Mark all accounts as \"away\" with the default message.\n"
@@ -1655,7 +1757,7 @@
 "\n"
 "Mark all accounts as \"away\" with the default message.\n"
 
-#: src/gaim-remote.c:319
+#: src/gaim-remote.c:325
 msgid ""
 "\n"
 "Set all accounts as not away.\n"
@@ -1663,7 +1765,7 @@
 "\n"
 "Set all accounts as not away.\n"
 
-#: src/gaim-remote.c:323
+#: src/gaim-remote.c:329
 msgid ""
 "\n"
 "Send instant message\n"
@@ -1671,7 +1773,7 @@
 "\n"
 "Send instant message\n"
 
-#: src/gtkaccount.c:325
+#: src/gtkaccount.c:329
 #, c-format
 msgid ""
 "<b>File:</b> %s\n"
@@ -1683,186 +1785,161 @@
 "<b>Image size:</b> %dx%d"
 
 #. Build the login options frame.
-#: src/gtkaccount.c:625
+#: src/gtkaccount.c:652
 msgid "Login Options"
 msgstr "Login Options"
 
-#: src/gtkaccount.c:642 src/gtkft.c:555
+#: src/gtkaccount.c:669 src/gtkft.c:554
 msgid "Protocol:"
 msgstr "Protocol:"
 
-#: src/gtkaccount.c:647 src/gtkblist.c:4025
+#: src/gtkaccount.c:674 src/gtkblist.c:4253
 msgid "Screen Name:"
 msgstr "Screen Name:"
 
-#: src/gtkaccount.c:720
+#: src/gtkaccount.c:747
 msgid "Password:"
 msgstr "Password:"
 
-#: src/gtkaccount.c:725 src/gtkblist.c:4039 src/gtkblist.c:4388
+#: src/gtkaccount.c:752 src/gtkblist.c:4267 src/gtkblist.c:4644
 msgid "Alias:"
 msgstr "Alias:"
 
-#: src/gtkaccount.c:729
+#: src/gtkaccount.c:756
 msgid "Remember password"
 msgstr "Remember password"
 
-#: src/gtkaccount.c:738
-msgid "Auto log in"
-msgstr "Auto login"
-
 #. Build the user options frame.
-#: src/gtkaccount.c:785
+#: src/gtkaccount.c:801
 msgid "User Options"
 msgstr "User Options"
 
-#: src/gtkaccount.c:798
+#: src/gtkaccount.c:814
 msgid "New mail notifications"
 msgstr "New mail notifications"
 
-#: src/gtkaccount.c:807
+#: src/gtkaccount.c:823
 msgid "Buddy icon:"
 msgstr "Buddy icon:"
 
 #. Build the protocol options frame.
-#: src/gtkaccount.c:896
+#: src/gtkaccount.c:912
 #, c-format
 msgid "%s Options"
 msgstr "%s Options"
 
 #. Use Global Proxy Settings
-#: src/gtkaccount.c:1032 src/gtkaccount.c:1079
+#: src/gtkaccount.c:1048 src/gtkaccount.c:1095
 msgid "Use Global Proxy Settings"
 msgstr "Use Global Proxy Settings"
 
 #. No Proxy
-#: src/gtkaccount.c:1038 src/gtkaccount.c:1086
+#: src/gtkaccount.c:1054 src/gtkaccount.c:1102
 msgid "No Proxy"
 msgstr "No Proxy"
 
 #. HTTP
-#: src/gtkaccount.c:1044 src/gtkaccount.c:1093
+#: src/gtkaccount.c:1060 src/gtkaccount.c:1109
 msgid "HTTP"
 msgstr "HTTP"
 
 #. SOCKS 4
-#: src/gtkaccount.c:1050 src/gtkaccount.c:1100
+#: src/gtkaccount.c:1066 src/gtkaccount.c:1116
 msgid "SOCKS 4"
 msgstr "SOCKS 4"
 
 #. SOCKS 5
-#: src/gtkaccount.c:1056 src/gtkaccount.c:1107
+#: src/gtkaccount.c:1072 src/gtkaccount.c:1123
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
 #. Use Environmental Settings
-#: src/gtkaccount.c:1062 src/gtkaccount.c:1114 src/gtkprefs.c:1090
+#: src/gtkaccount.c:1078 src/gtkaccount.c:1130 src/gtkprefs.c:1024
 msgid "Use Environmental Settings"
 msgstr "Use Environmental Settings"
 
-#: src/gtkaccount.c:1153
+#: src/gtkaccount.c:1169
 msgid "you can see the butterflies mating"
 msgstr "you can see the butterflies mating"
 
-#: src/gtkaccount.c:1157
+#: src/gtkaccount.c:1173
 msgid "If you look real closely"
 msgstr "If you look real closely"
 
-#: src/gtkaccount.c:1173
+#: src/gtkaccount.c:1189
 msgid "Proxy Options"
 msgstr "Proxy Options"
 
-#: src/gtkaccount.c:1191 src/gtkprefs.c:1084
+#: src/gtkaccount.c:1207 src/gtkprefs.c:1018
 msgid "Proxy _type:"
 msgstr "Proxy _type:"
 
-#: src/gtkaccount.c:1200 src/gtkprefs.c:1111
+#: src/gtkaccount.c:1216 src/gtkprefs.c:1045
 msgid "_Host:"
 msgstr "_Host:"
 
-#: src/gtkaccount.c:1204 src/gtkprefs.c:1129
+#: src/gtkaccount.c:1220 src/gtkprefs.c:1063
 msgid "_Port:"
 msgstr "_Port:"
 
-#: src/gtkaccount.c:1212
+#: src/gtkaccount.c:1228
 msgid "_Username:"
 msgstr "_Username:"
 
-#: src/gtkaccount.c:1217 src/gtkprefs.c:1166
+#: src/gtkaccount.c:1233 src/gtkprefs.c:1100
 msgid "Pa_ssword:"
 msgstr "Pa_ssword:"
 
-#: src/gtkaccount.c:1589
+#: src/gtkaccount.c:1602
 msgid "Add Account"
 msgstr "Add Account"
 
-#: src/gtkaccount.c:1591
+#: src/gtkaccount.c:1604
 msgid "Modify Account"
 msgstr "Modify Account"
 
 #. Add the disclosure
-#: src/gtkaccount.c:1615
+#: src/gtkaccount.c:1628
 msgid "Show more options"
 msgstr "Show more options"
 
-#: src/gtkaccount.c:1616
+#: src/gtkaccount.c:1629
 msgid "Show fewer options"
 msgstr "Show fewer options"
 
 #. Register button
-#: src/gtkaccount.c:1643 src/protocols/jabber/jabber.c:674
+#: src/gtkaccount.c:1651 src/protocols/jabber/jabber.c:675
 msgid "Register"
 msgstr "Register"
 
-#: src/gtkaccount.c:2008
+#: src/gtkaccount.c:1983 src/gtksavedstatuses.c:184
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "Are you sure you want to delete %s?"
 
-#: src/gtkaccount.c:2013 src/gtkrequest.c:263
+#: src/gtkaccount.c:1988 src/gtkrequest.c:263 src/gtksavedstatuses.c:187
 msgid "Delete"
 msgstr "Delete"
 
-#: src/gtkaccount.c:2127 src/protocols/oscar/oscar.c:4179
+#: src/gtkaccount.c:2045 src/gtksavedstatuses.c:622
+#: src/protocols/oscar/oscar.c:4297
 msgid "Screen Name"
 msgstr "Screen Name"
 
-#. zephyr has several exposures
-#. NONE (where you are hidden, and zephyrs to you are in practice silently dropped -- yes this is wrong)
-#. OPSTAFF "hidden"
-#. REALM-VISIBLE visible to people in local realm
-#. REALM-ANNOUNCED REALM-VISIBLE+ plus your logins/logouts are announced to <login,username,*>
-#. NET-VISIBLE REALM-ANNOUNCED, plus visible to people in foreign realm
-#. NET-ANNOUNCED NET-VISIBLE, plus logins/logouts are announced	 to <login,username,*>
-#.
-#. Online will set the user to the exposure they have in their options (defaulting to REALM-VISIBLE),
-#. Hidden, will set the user's exposure to OPSTAFF
-#.
-#. Away won't change their exposure but will set an auto away message (for IMs only)
-#.
-#: src/gtkaccount.c:2151 src/protocols/gg/gg.c:272 src/protocols/irc/irc.c:161
-#: src/protocols/jabber/buddy.c:1070 src/protocols/jabber/jabber.c:975
-#: src/protocols/msn/msn.c:534 src/protocols/napster/napster.c:561
-#: src/protocols/oscar/oscar.c:683 src/protocols/oscar/oscar.c:6871
-#: src/protocols/silc/silc.c:48 src/protocols/yahoo/yahoo.c:2655
-#: src/protocols/yahoo/yahoo.c:3125 src/protocols/zephyr/zephyr.c:2218
-msgid "Online"
-msgstr "Online"
-
-#: src/gtkaccount.c:2164
-msgid "Auto Log In"
-msgstr "Auto Login"
-
-#: src/gtkaccount.c:2172
+#: src/gtkaccount.c:2068
+msgid "Enabled"
+msgstr "Enabled"
+
+#: src/gtkaccount.c:2076
 msgid "Protocol"
 msgstr "Protocol"
 
-#: src/gtkaccount.c:2485
+#: src/gtkaccount.c:2379
 #, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s%s"
 msgstr "%s%s%s%s has made %s his or her buddy%s%s%s"
 
-#: src/gtkaccount.c:2499
+#: src/gtkaccount.c:2393
 msgid ""
 "\n"
 "\n"
@@ -1872,26 +1949,25 @@
 "\n"
 "Do you wish to add him or her to your buddy list?"
 
-#: src/gtkaccount.c:2503
+#: src/gtkaccount.c:2397
 msgid "Information"
 msgstr "Information"
 
-#: src/gtkaccount.c:2507
+#: src/gtkaccount.c:2401
 msgid "Add buddy to your list?"
 msgstr "Add buddy to your list?"
 
-#. Add button
-#: src/gtkaccount.c:2509 src/gtkblist.c:4439 src/gtkconv.c:1476
-#: src/gtkconv.c:3790 src/gtkconv.c:3861 src/gtkrequest.c:264
-#: src/protocols/oscar/oscar.c:3805 src/protocols/silc/chat.c:593
+#: src/gtkaccount.c:2403 src/gtkblist.c:4696 src/gtkconv.c:1454
+#: src/gtkrequest.c:264 src/protocols/oscar/oscar.c:3922
+#: src/protocols/silc/chat.c:594
 msgid "Add"
 msgstr "Add"
 
-#: src/gtkblist.c:813
+#: src/gtkblist.c:840
 msgid "Join a Chat"
 msgstr "Join a Chat"
 
-#: src/gtkblist.c:834
+#: src/gtkblist.c:861
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
@@ -1899,228 +1975,228 @@
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 
-#: src/gtkblist.c:845 src/gtkpounce.c:415 src/gtkroomlist.c:354
+#: src/gtkblist.c:872 src/gtkpounce.c:415 src/gtkroomlist.c:354
 msgid "_Account:"
 msgstr "_Account:"
 
-#: src/gtkblist.c:1117
+#: src/gtkblist.c:1144
 msgid "Get _Info"
 msgstr "Get _Info"
 
-#: src/gtkblist.c:1120
+#: src/gtkblist.c:1147
 msgid "I_M"
 msgstr "I_M"
 
-#: src/gtkblist.c:1126
+#: src/gtkblist.c:1153
 msgid "_Send File"
 msgstr "_Send File"
 
-#: src/gtkblist.c:1132
+#: src/gtkblist.c:1159
 msgid "Add Buddy _Pounce"
 msgstr "Add Buddy _Pounce"
 
-#: src/gtkblist.c:1134 src/gtkblist.c:1231
+#: src/gtkblist.c:1161 src/gtkblist.c:1258
 msgid "View _Log"
 msgstr "View _Log"
 
-#: src/gtkblist.c:1144
+#: src/gtkblist.c:1171
 msgid "_Alias Buddy..."
 msgstr "_Alias Buddy..."
 
-#: src/gtkblist.c:1146
+#: src/gtkblist.c:1173
 msgid "_Remove Buddy"
 msgstr "_Remove Buddy"
 
-#: src/gtkblist.c:1148
+#: src/gtkblist.c:1175
 msgid "Alias Contact..."
 msgstr "Alias Contact..."
 
-#: src/gtkblist.c:1151 src/gtkdialogs.c:749 src/gtkdialogs.c:750
+#: src/gtkblist.c:1178 src/gtkdialogs.c:854 src/gtkdialogs.c:855
 msgid "Remove Contact"
 msgstr "Remove Contact"
 
-#: src/gtkblist.c:1155 src/gtkblist.c:1239 src/gtkblist.c:1253
+#: src/gtkblist.c:1182 src/gtkblist.c:1266 src/gtkblist.c:1280
 msgid "_Alias..."
 msgstr "_Alias..."
 
-#: src/gtkblist.c:1157 src/gtkblist.c:1241 src/gtkblist.c:1258
-#: src/gtkconn.c:367
+#: src/gtkblist.c:1184 src/gtkblist.c:1268 src/gtkblist.c:1285
+#: src/gtkconn.c:156
 msgid "_Remove"
 msgstr "_Remove"
 
-#: src/gtkblist.c:1203
+#: src/gtkblist.c:1230
 msgid "Add a _Buddy"
 msgstr "Add a _Buddy"
 
-#: src/gtkblist.c:1205
+#: src/gtkblist.c:1232
 msgid "Add a C_hat"
 msgstr "Add a C_hat"
 
-#: src/gtkblist.c:1207
+#: src/gtkblist.c:1234
 msgid "_Delete Group"
 msgstr "_Delete Group"
 
-#: src/gtkblist.c:1209
+#: src/gtkblist.c:1236
 msgid "_Rename"
 msgstr "_Rename"
 
 #. join button
-#: src/gtkblist.c:1227 src/gtkroomlist.c:264 src/gtkroomlist.c:409
+#: src/gtkblist.c:1254 src/gtkroomlist.c:264 src/gtkroomlist.c:409
 #: src/gtkstock.c:89
 msgid "_Join"
 msgstr "_Join"
 
-#: src/gtkblist.c:1229
+#: src/gtkblist.c:1256
 msgid "Auto-Join"
 msgstr "Auto-Join"
 
-#: src/gtkblist.c:1255 src/gtkblist.c:1280
+#: src/gtkblist.c:1282 src/gtkblist.c:1307
 msgid "_Collapse"
 msgstr "_Collapse"
 
-#: src/gtkblist.c:1285
+#: src/gtkblist.c:1312
 msgid "_Expand"
 msgstr "_Expand"
 
-#: src/gtkblist.c:1502 src/gtkblist.c:1512 src/gtkblist.c:3284
-#: src/gtkblist.c:3287
+#: src/gtkblist.c:1529 src/gtkblist.c:1539 src/gtkblist.c:3509
+#: src/gtkblist.c:3512
 msgid "/Tools/Mute Sounds"
 msgstr "/Tools/Mute Sounds"
 
-#: src/gtkblist.c:1953 src/gtkconv.c:4356 src/gtkpounce.c:316
+#: src/gtkblist.c:1980 src/gtkconv.c:4145 src/gtkpounce.c:314
 msgid ""
 "You are not currently signed on with an account that can add that buddy."
 msgstr ""
 "You are not currently signed on with an account that can add that buddy."
 
 #. Buddies menu
-#: src/gtkblist.c:2363
+#: src/gtkblist.c:2549
 msgid "/_Buddies"
 msgstr "/_Buddies"
 
-#: src/gtkblist.c:2364
+#: src/gtkblist.c:2550
 msgid "/Buddies/New Instant _Message..."
 msgstr "/Buddies/New Instant _Message..."
 
-#: src/gtkblist.c:2365
+#: src/gtkblist.c:2551
 msgid "/Buddies/Join a _Chat..."
 msgstr "/Buddies/Join a _Chat..."
 
-#: src/gtkblist.c:2366
+#: src/gtkblist.c:2552
 msgid "/Buddies/Get User _Info..."
 msgstr "/Buddies/Get User _Info..."
 
-#: src/gtkblist.c:2367
+#: src/gtkblist.c:2553
 msgid "/Buddies/View User _Log..."
 msgstr "/Buddies/View User _Log..."
 
-#: src/gtkblist.c:2369
+#: src/gtkblist.c:2555
 msgid "/Buddies/Show _Offline Buddies"
 msgstr "/Buddies/Show _Offline Buddies"
 
-#: src/gtkblist.c:2370
+#: src/gtkblist.c:2556
 msgid "/Buddies/Show _Empty Groups"
 msgstr "/Buddies/Show _Empty Groups"
 
-#: src/gtkblist.c:2371
+#: src/gtkblist.c:2557
 msgid "/Buddies/_Add Buddy..."
 msgstr "/Buddies/_Add Buddy..."
 
-#: src/gtkblist.c:2372
+#: src/gtkblist.c:2558
 msgid "/Buddies/Add C_hat..."
 msgstr "/Buddies/Add C_hat..."
 
-#: src/gtkblist.c:2373
+#: src/gtkblist.c:2559
 msgid "/Buddies/Add _Group..."
 msgstr "/Buddies/Add _Group..."
 
-#: src/gtkblist.c:2375
+#: src/gtkblist.c:2561
 msgid "/Buddies/_Log Out"
 msgstr "/Buddies/_Log Out"
 
-#: src/gtkblist.c:2376
+#: src/gtkblist.c:2562
 msgid "/Buddies/_Quit"
 msgstr "/Buddies/_Quit"
 
 #. Tools
-#: src/gtkblist.c:2379
+#: src/gtkblist.c:2565
 msgid "/_Tools"
 msgstr "/_Tools"
 
-#: src/gtkblist.c:2380
-msgid "/Tools/_Away"
-msgstr "/Tools/_Away"
-
-#: src/gtkblist.c:2381
+#: src/gtkblist.c:2566
 msgid "/Tools/Buddy _Pounce"
 msgstr "/Tools/Buddy _Pounce"
 
-#: src/gtkblist.c:2382
+#: src/gtkblist.c:2567
 msgid "/Tools/Account Ac_tions"
 msgstr "/Tools/Account Ac_tions"
 
-#: src/gtkblist.c:2383
+#: src/gtkblist.c:2568
 msgid "/Tools/Pl_ugin Actions"
 msgstr "/Tools/Pl_ugin Actions"
 
-#: src/gtkblist.c:2385
+#: src/gtkblist.c:2570
+msgid "/Tools/_Statuses"
+msgstr "/Tools/_Statuses"
+
+#: src/gtkblist.c:2571
 msgid "/Tools/A_ccounts"
 msgstr "/Tools/A_ccounts"
 
-#: src/gtkblist.c:2386
-msgid "/Tools/_File Transfers"
-msgstr "/Tools/_File Transfers"
-
-#: src/gtkblist.c:2387
-msgid "/Tools/R_oom List"
-msgstr "/Tools/R_oom List"
-
-#: src/gtkblist.c:2388
+#: src/gtkblist.c:2572
 msgid "/Tools/Pr_eferences"
 msgstr "/Tools/Pr_eferences"
 
-#: src/gtkblist.c:2389
+#: src/gtkblist.c:2573
 msgid "/Tools/Pr_ivacy"
 msgstr "/Tools/Pr_ivacy"
 
-#: src/gtkblist.c:2390
+#: src/gtkblist.c:2574
+msgid "/Tools/_File Transfers"
+msgstr "/Tools/_File Transfers"
+
+#: src/gtkblist.c:2575
+msgid "/Tools/R_oom List"
+msgstr "/Tools/R_oom List"
+
+#: src/gtkblist.c:2577
 msgid "/Tools/Mute _Sounds"
 msgstr "/Tools/Mute _Sounds"
 
-#: src/gtkblist.c:2392
+#: src/gtkblist.c:2578
 msgid "/Tools/View System _Log"
 msgstr "/Tools/View System _Log"
 
 #. Help
-#: src/gtkblist.c:2395
+#: src/gtkblist.c:2581
 msgid "/_Help"
 msgstr "/_Help"
 
-#: src/gtkblist.c:2396
+#: src/gtkblist.c:2582
 msgid "/Help/Online _Help"
 msgstr "/Help/Online _Help"
 
-#: src/gtkblist.c:2397
+#: src/gtkblist.c:2583
 msgid "/Help/_Debug Window"
 msgstr "/Help/_Debug Window"
 
-#: src/gtkblist.c:2398
+#: src/gtkblist.c:2584
 msgid "/Help/_About"
 msgstr "/Help/_About"
 
-#: src/gtkblist.c:2416
+#: src/gtkblist.c:2602
 msgid "Rename Group"
 msgstr "Rename Group"
 
-#: src/gtkblist.c:2416
+#: src/gtkblist.c:2602
 msgid "New group name"
 msgstr "New group name"
 
-#: src/gtkblist.c:2417
+#: src/gtkblist.c:2603
 msgid "Please enter a new name for the selected group."
 msgstr "Please enter a new name for the selected group."
 
-#: src/gtkblist.c:2446
+#: src/gtkblist.c:2634 src/gtkblist.c:2701
 #, c-format
 msgid ""
 "\n"
@@ -2129,7 +2205,83 @@
 "\n"
 "<b>Account:</b> %s"
 
-#: src/gtkblist.c:2520
+#: src/gtkblist.c:2710
+#, c-format
+msgid ""
+"\n"
+"<b>Contact Alias:</b> %s"
+msgstr ""
+"\n"
+"<b>Contact Alias:</b> %s"
+
+#: src/gtkblist.c:2718
+#, c-format
+msgid ""
+"\n"
+"<b>Alias:</b> %s"
+msgstr ""
+"\n"
+"<b>Alias:</b> %s"
+
+#: src/gtkblist.c:2726
+#, c-format
+msgid ""
+"\n"
+"<b>Nickname:</b> %s"
+msgstr ""
+"\n"
+"<b>Nickname:</b> %s"
+
+#: src/gtkblist.c:2735
+#, c-format
+msgid ""
+"\n"
+"<b>Logged In:</b> %s"
+msgstr ""
+"\n"
+"<b>Logged In:</b> %s"
+
+#: src/gtkblist.c:2747
+#, c-format
+msgid ""
+"\n"
+"<b>Idle:</b> %s"
+msgstr ""
+"\n"
+"<b>Idle:</b> %s"
+
+#: src/gtkblist.c:2751
+msgid ""
+"\n"
+"<b>Idle</b>"
+msgstr ""
+"\n"
+"<b>Idle</b>"
+
+#: src/gtkblist.c:2762
+#, c-format
+msgid ""
+"\n"
+"<b>Last Seen:</b> %s ago"
+msgstr ""
+"\n"
+"<b>Last Seen:</b> %s ago"
+
+#: src/gtkblist.c:2771
+#, c-format
+msgid "%d%%"
+msgstr "%d%%"
+
+#: src/gtkblist.c:2772
+#, c-format
+msgid ""
+"\n"
+"<b>Warned:</b> %s"
+msgstr ""
+"\n"
+"<b>Warned:</b> %s"
+
+#: src/gtkblist.c:2778
 msgid ""
 "\n"
 "<b>Status:</b> Offline"
@@ -2137,76 +2289,7 @@
 "\n"
 "<b>Status:</b> Offline"
 
-#: src/gtkblist.c:2535
-#, c-format
-msgid "%d%%"
-msgstr "%d%%"
-
-#: src/gtkblist.c:2551
-msgid ""
-"\n"
-"<b>Account:</b>"
-msgstr ""
-"\n"
-"<b>Account:</b>"
-
-#: src/gtkblist.c:2552
-msgid ""
-"\n"
-"<b>Contact Alias:</b>"
-msgstr ""
-"\n"
-"<b>Contact Alias:</b>"
-
-#: src/gtkblist.c:2553
-msgid ""
-"\n"
-"<b>Alias:</b>"
-msgstr ""
-"\n"
-"<b>Alias:</b>"
-
-#: src/gtkblist.c:2554
-msgid ""
-"\n"
-"<b>Nickname:</b>"
-msgstr ""
-"\n"
-"<b>Nickname:</b>"
-
-#: src/gtkblist.c:2555
-msgid ""
-"\n"
-"<b>Logged In:</b>"
-msgstr ""
-"\n"
-"<b>Logged In:</b>"
-
-#: src/gtkblist.c:2556
-msgid ""
-"\n"
-"<b>Idle:</b>"
-msgstr ""
-"\n"
-"<b>Idle:</b>"
-
-#: src/gtkblist.c:2556
-msgid ""
-"\n"
-"<b>Idle</b>"
-msgstr ""
-"\n"
-"<b>Idle</b>"
-
-#: src/gtkblist.c:2558
-msgid ""
-"\n"
-"<b>Warned:</b>"
-msgstr ""
-"\n"
-"<b>Warned:</b>"
-
-#: src/gtkblist.c:2560
+#: src/gtkblist.c:2799
 msgid ""
 "\n"
 "<b>Description:</b> Spooky"
@@ -2214,115 +2297,127 @@
 "\n"
 "<b>Description:</b> Spooky"
 
-#: src/gtkblist.c:2561
+#: src/gtkblist.c:2801
 msgid ""
 "\n"
-"<b>Status</b>: Awesome"
+"<b>Status:</b> Awesome"
 msgstr ""
 "\n"
-"<b>Status</b>: Awesome"
-
-#: src/gtkblist.c:2562
+"<b>Status:</b> Awesome"
+
+#: src/gtkblist.c:2803
 msgid ""
 "\n"
-"<b>Status</b>: Rockin'"
+"<b>Status:</b> Rockin'"
 msgstr ""
 "\n"
-"<b>Status</b>: Rockin'"
-
-#: src/gtkblist.c:2864
+"<b>Status:</b>: Rockin'"
+
+#: src/gtkblist.c:3045
 #, c-format
 msgid "Idle (%dh%02dm) "
 msgstr "Idle (%dh%02dm) "
 
-#: src/gtkblist.c:2866
+#: src/gtkblist.c:3047
 #, c-format
 msgid "Idle (%dm) "
 msgstr "Idle (%dm) "
 
-#: src/gtkblist.c:2869
+#: src/gtkblist.c:3050
 msgid "Idle "
 msgstr "Idle "
 
-#: src/gtkblist.c:2877
+#: src/gtkblist.c:3056
 #, c-format
 msgid "Warned (%d%%) "
 msgstr "Warned (%d%%) "
 
-#: src/gtkblist.c:2881
+#: src/gtkblist.c:3060
 msgid "Offline "
 msgstr "Offline "
 
-#. Make menu items sensitive/insensitive where appropriate
-#: src/gtkblist.c:3008
+#: src/gtkblist.c:3179
+msgid "/Buddies/New Instant Message..."
+msgstr "/Buddies/New Instant Message..."
+
+#: src/gtkblist.c:3180 src/gtkblist.c:3215
 msgid "/Buddies/Join a Chat..."
 msgstr "/Buddies/Join a Chat..."
 
-#: src/gtkblist.c:3011
+#: src/gtkblist.c:3181
+msgid "/Buddies/Get User Info..."
+msgstr "/Buddies/Get User Info..."
+
+#: src/gtkblist.c:3182
+msgid "/Buddies/Add Buddy..."
+msgstr "/Buddies/Add Buddy..."
+
+#: src/gtkblist.c:3183
+msgid "/Buddies/Add Chat..."
+msgstr "/Buddies/Add Chat..."
+
+#: src/gtkblist.c:3184
+msgid "/Buddies/Add Group..."
+msgstr "/Buddies/Add Group..."
+
+#: src/gtkblist.c:3185
+msgid "/Buddies/Log Out"
+msgstr "/Buddies/Log Out"
+
+#: src/gtkblist.c:3218
 msgid "/Tools/Room List"
 msgstr "/Tools/Room List"
 
-#: src/gtkblist.c:3014
+#: src/gtkblist.c:3221
 msgid "/Tools/Privacy"
 msgstr "/Tools/Privacy"
 
-#: src/gtkblist.c:3070 src/gtkprefs.c:917 src/gtkprefs.c:1774
-#: src/protocols/jabber/jabber.c:935
+#: src/gtkblist.c:3289 src/gtkprefs.c:1708 src/protocols/jabber/jabber.c:936
 msgid "None"
 msgstr "None"
 
-#: src/gtkblist.c:3072
+#: src/gtkblist.c:3291
 msgid "Alphabetical"
 msgstr "Alphabetical"
 
-#: src/gtkblist.c:3073
+#: src/gtkblist.c:3292
 msgid "By status"
 msgstr "By status"
 
-#: src/gtkblist.c:3074
+#: src/gtkblist.c:3293
 msgid "By log size"
 msgstr "By log size"
 
-#: src/gtkblist.c:3110
-#, fuzzy
-msgid "Statuses"
-msgstr "Status"
-
-#. FIXME: Status
-#: src/gtkblist.c:3174
-msgid "/Tools/Away"
-msgstr "/Tools/Away"
-
-#: src/gtkblist.c:3177
+#: src/gtkblist.c:3405
 msgid "/Tools/Buddy Pounce"
 msgstr "/Tools/Buddy Pounce"
 
-#: src/gtkblist.c:3180
+#: src/gtkblist.c:3406
 msgid "/Tools/Account Actions"
 msgstr "/Tools/Account Actions"
 
-#: src/gtkblist.c:3183
+#: src/gtkblist.c:3407
 msgid "/Tools/Plugin Actions"
 msgstr "/Tools/Plugin Actions"
 
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: src/gtkblist.c:3280
+#: src/gtkblist.c:3505
 msgid "/Buddies/Show Offline Buddies"
 msgstr "/Buddies/Show Offline Buddies"
 
-#: src/gtkblist.c:3282
+#: src/gtkblist.c:3507
 msgid "/Buddies/Show Empty Groups"
 msgstr "/Buddies/Show Empty Groups"
 
-#: src/gtkblist.c:3979 src/protocols/silc/buddy.c:731
+#: src/gtkblist.c:4207 src/protocols/silc/buddy.c:731
 #: src/protocols/silc/buddy.c:989 src/protocols/silc/buddy.c:1034
-#: src/protocols/silc/buddy.c:1124 src/protocols/yahoo/yahoo.c:2822
+#: src/protocols/silc/buddy.c:1124 src/protocols/yahoo/yahoo.c:2581
 msgid "Add Buddy"
 msgstr "Add Buddy"
 
-#: src/gtkblist.c:4003
+#: src/gtkblist.c:4231
 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. "
@@ -2333,15 +2428,15 @@
 "The alias will be displayed in place of the screen name whenever possible.\n"
 
 #. Set up stuff for the account box
-#: src/gtkblist.c:4063 src/gtkblist.c:4368
+#: src/gtkblist.c:4291 src/gtkblist.c:4624
 msgid "Account:"
 msgstr "Account:"
 
-#: src/gtkblist.c:4301
+#: src/gtkblist.c:4557
 msgid "This protocol does not support chat rooms."
 msgstr "This protocol does not support chat rooms."
 
-#: src/gtkblist.c:4317
+#: src/gtkblist.c:4573
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
@@ -2349,11 +2444,11 @@
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
 
-#: src/gtkblist.c:4334
+#: src/gtkblist.c:4590
 msgid "Add Chat"
 msgstr "Add Chat"
 
-#: src/gtkblist.c:4358
+#: src/gtkblist.c:4614
 msgid ""
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
@@ -2361,39 +2456,23 @@
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
 
-#: src/gtkblist.c:4436
+#: src/gtkblist.c:4693
 msgid "Add Group"
 msgstr "Add Group"
 
-#: src/gtkblist.c:4437
+#: src/gtkblist.c:4694
 msgid "Please enter the name of the group to be added."
 msgstr "Please enter the name of the group to be added."
 
-#: src/gtkblist.c:5011 src/gtkblist.c:5108
+#: src/gtkblist.c:5239 src/gtkblist.c:5335
 msgid "No actions available"
 msgstr "No actions available"
 
-#: src/gtkconn.c:81 src/gtkconn.c:254 src/gtkconn.c:267
-msgid "Done."
-msgstr "Done."
-
-#: src/gtkconn.c:160
-msgid "Logging in: "
-msgstr "Logging in: "
-
-#: src/gtkconn.c:206
-msgid "Logging In"
-msgstr "Logging In"
-
-#: src/gtkconn.c:218
-msgid "Cancel All"
-msgstr "Cancel All"
-
-#: src/gtkconn.c:367 src/gtkconn.c:599
+#: src/gtkconn.c:156 src/gtkconn.c:389
 msgid "_Reconnect"
 msgstr "_Reconnect"
 
-#: src/gtkconn.c:563
+#: src/gtkconn.c:353
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">%s has been disconnected.</span>\n"
@@ -2406,36 +2485,36 @@
 "%s\n"
 "%s"
 
-#: src/gtkconn.c:565
+#: src/gtkconn.c:355
 msgid "Reason Unknown."
 msgstr "Reason Unknown."
 
-#: src/gtkconn.c:573
+#: src/gtkconn.c:363
 msgid "Disconnected"
 msgstr "Disconnected"
 
-#: src/gtkconn.c:604
+#: src/gtkconn.c:394
 msgid "Reconnect _All"
 msgstr "Reconnect _All"
 
-#: src/gtkconn.c:634
+#: src/gtkconn.c:424
 msgid "Time"
 msgstr "Time"
 
-#: src/gtkconv.c:319
+#: src/gtkconv.c:310
 #, c-format
 msgid "me is using Gaim v%s."
 msgstr "me is using Gaim v%s."
 
-#: src/gtkconv.c:328
+#: src/gtkconv.c:319
 msgid "Supported debug options are:  version"
 msgstr "Supported debug options are:  version"
 
-#: src/gtkconv.c:352
+#: src/gtkconv.c:343
 msgid "No such command (in this context)."
 msgstr "No such command (in this context)."
 
-#: src/gtkconv.c:355
+#: src/gtkconv.c:346
 msgid ""
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
 "The following commands are available in this context:\n"
@@ -2443,47 +2522,47 @@
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
 "The following commands are available in this context:\n"
 
-#: src/gtkconv.c:427
+#: src/gtkconv.c:418
 msgid "No such command."
 msgstr "No such command."
 
-#: src/gtkconv.c:434
+#: src/gtkconv.c:425
 msgid "Syntax Error:  You typed the wrong number of arguments to that command."
 msgstr ""
 "Syntax Error:  You typed the wrong number of arguments to that command."
 
-#: src/gtkconv.c:439
+#: src/gtkconv.c:430
 msgid "Your command failed for an unknown reason."
 msgstr "Your command failed for an unknown reason."
 
-#: src/gtkconv.c:446
+#: src/gtkconv.c:437
 msgid "That command only works in Chats, not IMs."
 msgstr "That command only works in Chats, not IMs."
 
-#: src/gtkconv.c:449
+#: src/gtkconv.c:440
 msgid "That command only works in IMs, not Chats."
 msgstr "That command only works in IMs, not Chats."
 
-#: src/gtkconv.c:453
+#: src/gtkconv.c:444
 msgid "That command doesn't work on this protocol."
 msgstr "That command doesn't work on this protocol."
 
-#: src/gtkconv.c:687 src/gtkconv.c:713
+#: src/gtkconv.c:672 src/gtkconv.c:698
 msgid "That buddy is not on the same protocol as this chat"
 msgstr "That buddy is not on the same protocol as this chat"
 
-#: src/gtkconv.c:707
+#: src/gtkconv.c:692
 msgid ""
 "You are not currently signed on with an account that can invite that buddy."
 msgstr ""
 "You are not currently signed on with an account that can invite that buddy."
 
-#: src/gtkconv.c:761
+#: src/gtkconv.c:746
 msgid "Invite Buddy Into Chat Room"
 msgstr "Invite Buddy Into Chat Room"
 
 #. Put our happy label in it.
-#: src/gtkconv.c:791
+#: src/gtkconv.c:776
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
@@ -2491,344 +2570,295 @@
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
 
-#: src/gtkconv.c:812
+#: src/gtkconv.c:797
 msgid "_Buddy:"
 msgstr "_Buddy:"
 
-#: src/gtkconv.c:832
+#: src/gtkconv.c:817 src/gtksavedstatuses.c:774
 msgid "_Message:"
 msgstr "_Message:"
 
-#: src/gtkconv.c:888 src/gtkconv.c:2559 src/gtkdebug.c:179
+#: src/gtkconv.c:873 src/gtkconv.c:2524 src/gtkdebug.c:177
 msgid "Unable to open file."
 msgstr "Unable to open file."
 
-#: src/gtkconv.c:893
+#: src/gtkconv.c:878
 #, c-format
 msgid "<h1>Conversation with %s</h1>\n"
 msgstr "<h1>Conversation with %s</h1>\n"
 
-#: src/gtkconv.c:907
+#: src/gtkconv.c:892
 msgid "Save Conversation"
 msgstr "Save Conversation"
 
-#: src/gtkconv.c:992 src/gtkdebug.c:128
+#: src/gtkconv.c:977 src/gtkdebug.c:126
 msgid "Find"
 msgstr "Find"
 
-#: src/gtkconv.c:1018 src/gtkdebug.c:156
+#: src/gtkconv.c:1003 src/gtkdebug.c:154
 msgid "_Search for:"
 msgstr "_Search for:"
 
-#: src/gtkconv.c:1437
+#: src/gtkconv.c:1415
 msgid "IM"
 msgstr "IM"
 
-#. Send File button
-#: src/gtkconv.c:1443 src/gtkconv.c:3783 src/protocols/oscar/oscar.c:598
+#: src/gtkconv.c:1421 src/protocols/oscar/oscar.c:612
 msgid "Send File"
 msgstr "Send File"
 
-#: src/gtkconv.c:1450
+#: src/gtkconv.c:1428
 msgid "Un-Ignore"
 msgstr "Un-Ignore"
 
-#: src/gtkconv.c:1453 src/gtkprefs.c:781
+#: src/gtkconv.c:1431 src/gtkprefs.c:762
 msgid "Ignore"
 msgstr "Ignore"
 
-#. Info button
-#: src/gtkconv.c:1458 src/gtkconv.c:3804
+#: src/gtkconv.c:1436
 msgid "Info"
 msgstr "Info"
 
-#: src/gtkconv.c:1464
+#: src/gtkconv.c:1442
 msgid "Get Away Message"
 msgstr "Get Away Message"
 
-#. Remove button
-#: src/gtkconv.c:1473 src/gtkconv.c:3797 src/gtkconv.c:3868
-#: src/gtkrequest.c:265
+#: src/gtkconv.c:1451 src/gtkrequest.c:265
 msgid "Remove"
 msgstr "Remove"
 
-#: src/gtkconv.c:2567
+#: src/gtkconv.c:2532
 msgid "Unable to save icon file to disk."
 msgstr "Unable to save icon file to disk."
 
-#: src/gtkconv.c:2588
+#: src/gtkconv.c:2553
 msgid "Save Icon"
 msgstr "Save Icon"
 
-#: src/gtkconv.c:2618
+#: src/gtkconv.c:2583
 msgid "Animate"
 msgstr "Animate"
 
-#: src/gtkconv.c:2623
+#: src/gtkconv.c:2588
 msgid "Hide Icon"
 msgstr "Hide Icon"
 
-#: src/gtkconv.c:2629
+#: src/gtkconv.c:2594
 msgid "Save Icon As..."
 msgstr "Save Icon As..."
 
-#: src/gtkconv.c:2996
+#: src/gtkconv.c:2952
 msgid "User is typing..."
 msgstr "User is typing..."
 
-#: src/gtkconv.c:3004
+#: src/gtkconv.c:2957
 msgid "User has typed something and paused"
 msgstr "User has typed something and paused"
 
 #. Build the Send As menu
-#: src/gtkconv.c:3107
+#: src/gtkconv.c:3058
 msgid "_Send As"
 msgstr "_Send As"
 
 #. Conversation menu
-#: src/gtkconv.c:3560
+#: src/gtkconv.c:3512
 msgid "/_Conversation"
 msgstr "/_Conversation"
 
-#: src/gtkconv.c:3562
+#: src/gtkconv.c:3514
 msgid "/Conversation/New Instant _Message..."
 msgstr "/Conversation/New Instant _Message..."
 
-#: src/gtkconv.c:3567
+#: src/gtkconv.c:3519
 msgid "/Conversation/_Find..."
 msgstr "/Conversation/_Find..."
 
-#: src/gtkconv.c:3569
+#: src/gtkconv.c:3521
 msgid "/Conversation/View _Log"
 msgstr "/Conversation/View _Log"
 
-#: src/gtkconv.c:3570
+#: src/gtkconv.c:3522
 msgid "/Conversation/_Save As..."
 msgstr "/Conversation/_Save As..."
 
-#: src/gtkconv.c:3572
+#: src/gtkconv.c:3524
 msgid "/Conversation/Clear"
 msgstr "/Conversation/Clear"
 
-#: src/gtkconv.c:3576
+#: src/gtkconv.c:3528
 msgid "/Conversation/Se_nd File..."
 msgstr "/Conversation/Se_nd File..."
 
-#: src/gtkconv.c:3577
+#: src/gtkconv.c:3529
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Conversation/Add Buddy _Pounce..."
 
-#: src/gtkconv.c:3579
+#: src/gtkconv.c:3531
 msgid "/Conversation/_Get Info"
 msgstr "/Conversation/_Get Info"
 
-#: src/gtkconv.c:3581
+#: src/gtkconv.c:3533
 msgid "/Conversation/_Warn..."
 msgstr "/Conversation/_Warn..."
 
-#: src/gtkconv.c:3583
+#: src/gtkconv.c:3535
 msgid "/Conversation/In_vite..."
 msgstr "/Conversation/In_vite..."
 
-#: src/gtkconv.c:3588
+#: src/gtkconv.c:3540
 msgid "/Conversation/A_lias..."
 msgstr "/Conversation/A_lias..."
 
-#: src/gtkconv.c:3590
+#: src/gtkconv.c:3542
 msgid "/Conversation/_Block..."
 msgstr "/Conversation/_Block..."
 
-#: src/gtkconv.c:3592
+#: src/gtkconv.c:3544
 msgid "/Conversation/_Add..."
 msgstr "/Conversation/_Add..."
 
-#: src/gtkconv.c:3594
+#: src/gtkconv.c:3546
 msgid "/Conversation/_Remove..."
 msgstr "/Conversation/_Remove..."
 
-#: src/gtkconv.c:3599
+#: src/gtkconv.c:3551
 msgid "/Conversation/Insert Lin_k..."
 msgstr "/Conversation/Insert Lin_k..."
 
-#: src/gtkconv.c:3601
+#: src/gtkconv.c:3553
 msgid "/Conversation/Insert Imag_e..."
 msgstr "/Conversation/Insert Imag_e..."
 
-#: src/gtkconv.c:3606
+#: src/gtkconv.c:3558
 msgid "/Conversation/_Close"
 msgstr "/Conversation/_Close"
 
 #. Options
-#: src/gtkconv.c:3610
+#: src/gtkconv.c:3562
 msgid "/_Options"
 msgstr "/_Options"
 
-#: src/gtkconv.c:3611
+#: src/gtkconv.c:3563
 msgid "/Options/Enable _Logging"
 msgstr "/Options/Enable _Logging"
 
-#: src/gtkconv.c:3612
+#: src/gtkconv.c:3564
 msgid "/Options/Enable _Sounds"
 msgstr "/Options/Enable _Sounds"
 
-#: src/gtkconv.c:3613
-msgid "/Options/Show Formatting _Toolbar"
-msgstr "/Options/Show Formatting _Toolbar"
-
-#: src/gtkconv.c:3614
+#: src/gtkconv.c:3565
+msgid "/Options/Show Formatting _Toolbars"
+msgstr "/Options/Show Formatting _Toolbars"
+
+#: src/gtkconv.c:3566
 msgid "/Options/Show T_imestamps"
 msgstr "/Options/Show T_imestamps"
 
-#: src/gtkconv.c:3656
+#: src/gtkconv.c:3567
+msgid "/Options/Show Buddy _Icon"
+msgstr "/Options/Show Buddy _Icon"
+
+#: src/gtkconv.c:3611
 msgid "/Conversation/View Log"
 msgstr "/Conversation/View Log"
 
-#: src/gtkconv.c:3661
+#: src/gtkconv.c:3616
 msgid "/Conversation/Send File..."
 msgstr "/Conversation/Send File..."
 
-#: src/gtkconv.c:3665
+#: src/gtkconv.c:3620
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Conversation/Add Buddy Pounce..."
 
-#: src/gtkconv.c:3671
+#: src/gtkconv.c:3626
 msgid "/Conversation/Get Info"
 msgstr "/Conversation/Get Info"
 
-#: src/gtkconv.c:3675
+#: src/gtkconv.c:3630
 msgid "/Conversation/Warn..."
 msgstr "/Conversation/Warn..."
 
-#: src/gtkconv.c:3679
+#: src/gtkconv.c:3634
 msgid "/Conversation/Invite..."
 msgstr "/Conversation/Invite..."
 
-#: src/gtkconv.c:3685
+#: src/gtkconv.c:3640
 msgid "/Conversation/Alias..."
 msgstr "/Conversation/Alias..."
 
-#: src/gtkconv.c:3689
+#: src/gtkconv.c:3644
 msgid "/Conversation/Block..."
 msgstr "/Conversation/Block..."
 
-#: src/gtkconv.c:3693
+#: src/gtkconv.c:3648
 msgid "/Conversation/Add..."
 msgstr "/Conversation/Add..."
 
-#: src/gtkconv.c:3697
+#: src/gtkconv.c:3652
 msgid "/Conversation/Remove..."
 msgstr "/Conversation/Remove..."
 
-#: src/gtkconv.c:3703
+#: src/gtkconv.c:3658
 msgid "/Conversation/Insert Link..."
 msgstr "/Conversation/Insert Link..."
 
-#: src/gtkconv.c:3707
+#: src/gtkconv.c:3662
 msgid "/Conversation/Insert Image..."
 msgstr "/Conversation/Insert Image..."
 
-#: src/gtkconv.c:3713
+#: src/gtkconv.c:3668
 msgid "/Options/Enable Logging"
 msgstr "/Options/Enable Logging"
 
-#: src/gtkconv.c:3716
+#: src/gtkconv.c:3671
 msgid "/Options/Enable Sounds"
 msgstr "/Options/Enable Sounds"
 
-#: src/gtkconv.c:3719
-msgid "/Options/Show Formatting Toolbar"
-msgstr "/Options/Show Formatting Toolbar"
-
-#: src/gtkconv.c:3722
+#: src/gtkconv.c:3674
+msgid "/Options/Show Formatting Toolbars"
+msgstr "/Options/Show Formatting Toolbars"
+
+#: src/gtkconv.c:3677
 msgid "/Options/Show Timestamps"
 msgstr "/Options/Show Timestamps"
 
-#. The buttons, from left to right
-#. Block button
-#: src/gtkconv.c:3776 src/gtkprivacy.c:625 src/gtkprivacy.c:636
-msgid "Block"
-msgstr "Block"
-
-#: src/gtkconv.c:3777
-msgid "Block the user"
-msgstr "Block the user"
-
-#: src/gtkconv.c:3784
-msgid "Send a file to the user"
-msgstr "Send a file to the user"
-
-#: src/gtkconv.c:3791
-msgid "Add the user to your buddy list"
-msgstr "Add the user to your buddy list"
-
-#: src/gtkconv.c:3798
-msgid "Remove the user from your buddy list"
-msgstr "Remove the user from your buddy list"
-
-#: src/gtkconv.c:3805 src/gtkconv.c:4126
-msgid "Get the user's information"
-msgstr "Get the user's information"
-
-#. Send button
-#: src/gtkconv.c:3811 src/gtkconv.c:3875
-msgid "Send"
-msgstr "Send"
-
-#: src/gtkconv.c:3812 src/gtkconv.c:3876
-msgid "Send message"
-msgstr "Send message"
-
-#. The buttons, from left to right
-#. Invite
-#: src/gtkconv.c:3854
-msgid "Invite"
-msgstr "Invite"
-
-#: src/gtkconv.c:3855
-msgid "Invite a user"
-msgstr "Invite a user"
-
-#: src/gtkconv.c:3862
-msgid "Add the chat to your buddy list"
-msgstr "Add the chat to your buddy list"
-
-#: src/gtkconv.c:3869
-msgid "Remove the chat from your buddy list"
-msgstr "Remove the chat from your buddy list"
-
-#: src/gtkconv.c:3993
+#: src/gtkconv.c:3680
+msgid "/Options/Show Buddy Icon"
+msgstr "/Options/Show Buddy Icon"
+
+#: src/gtkconv.c:3795
 msgid "Topic:"
 msgstr "Topic:"
 
 #. Setup the label telling how many people are in the room.
-#: src/gtkconv.c:4042
+#: src/gtkconv.c:3843
 msgid "0 people in room"
 msgstr "0 people in room"
 
-#: src/gtkconv.c:4103
+#: src/gtkconv.c:3905
 msgid "IM the user"
 msgstr "IM the user"
 
-#: src/gtkconv.c:4115
+#: src/gtkconv.c:3918
 msgid "Ignore the user"
 msgstr "Ignore the user"
 
-#: src/gtkconv.c:4634
+#: src/gtkconv.c:3930
+msgid "Get the user's information"
+msgstr "Get the user's information"
+
+#: src/gtkconv.c:4431
 msgid "Close conversation"
 msgstr "Close conversation"
 
-#: src/gtkconv.c:5169 src/gtkconv.c:5198 src/gtkconv.c:5294 src/gtkconv.c:5352
+#: src/gtkconv.c:4933 src/gtkconv.c:4962 src/gtkconv.c:5058 src/gtkconv.c:5116
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "%d person in room"
 msgstr[1] "%d people in room"
 
-#: src/gtkconv.c:5925 src/gtkconv.c:5928
-msgid "<main>/Conversation/Close"
-msgstr "<main>/Conversation/Close"
-
-#: src/gtkconv.c:6249
+#: src/gtkconv.c:6021
 msgid ""
 "say &lt;message&gt;:  Send a message normally as if you weren't using a "
 "command."
@@ -2836,11 +2866,11 @@
 "say &lt;message&gt;:  Send a message normally as if you weren't using a "
 "command."
 
-#: src/gtkconv.c:6252
+#: src/gtkconv.c:6024
 msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
 msgstr "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
 
-#: src/gtkconv.c:6255
+#: src/gtkconv.c:6027
 msgid ""
 "debug &lt;option&gt;:  Send various debug information to the current "
 "conversation."
@@ -2848,23 +2878,23 @@
 "debug &lt;option&gt;:  Send various debug information to the current "
 "conversation."
 
-#: src/gtkconv.c:6259
+#: src/gtkconv.c:6031
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr "help &lt;command&gt;:  Help on a specific command."
 
-#: src/gtkdebug.c:194
+#: src/gtkdebug.c:192
 msgid "Save Debug Log"
 msgstr "Save Debug Log"
 
-#: src/gtkdebug.c:247
+#: src/gtkdebug.c:245
 msgid "Debug Window"
 msgstr "Debug Window"
 
-#: src/gtkdebug.c:285
+#: src/gtkdebug.c:283
 msgid "Pause"
 msgstr "Pause"
 
-#: src/gtkdebug.c:291
+#: src/gtkdebug.c:289
 msgid "Timestamps"
 msgstr "Timestamps"
 
@@ -2876,196 +2906,197 @@
 msgid "lead developer"
 msgstr "lead developer"
 
-#: src/gtkdialogs.c:68
+#: src/gtkdialogs.c:68 src/gtkdialogs.c:71 src/gtkdialogs.c:72
+#: src/gtkdialogs.c:73 src/gtkdialogs.c:74 src/gtkdialogs.c:75
+#: src/gtkdialogs.c:77
+msgid "developer"
+msgstr "developer"
+
+#: src/gtkdialogs.c:69
 msgid "developer & webmaster"
 msgstr "developer & webmaster"
 
-#: src/gtkdialogs.c:69
+#: src/gtkdialogs.c:70
 msgid "win32 port"
 msgstr "win32 port"
 
-#: src/gtkdialogs.c:70 src/gtkdialogs.c:71 src/gtkdialogs.c:72
-#: src/gtkdialogs.c:73 src/gtkdialogs.c:75
-msgid "developer"
-msgstr "developer"
-
-#: src/gtkdialogs.c:74
+#: src/gtkdialogs.c:76
 msgid "support"
 msgstr "support"
 
-#: src/gtkdialogs.c:80
+#: src/gtkdialogs.c:93
 msgid "former libfaim maintainer"
 msgstr "former libfaim maintainer"
 
-#: src/gtkdialogs.c:81
+#: src/gtkdialogs.c:94
 msgid "former lead developer"
 msgstr "former lead developer"
 
-#: src/gtkdialogs.c:82
+#: src/gtkdialogs.c:95
 msgid "former maintainer"
 msgstr "former maintainer"
 
-#: src/gtkdialogs.c:83
+#: src/gtkdialogs.c:96
 msgid "former Jabber developer"
 msgstr "former Jabber developer"
 
-#: src/gtkdialogs.c:84
+#: src/gtkdialogs.c:97
 msgid "original author"
 msgstr "original author"
 
-#: src/gtkdialogs.c:85
+#: src/gtkdialogs.c:98
 msgid "hacker and designated driver [lazy bum]"
 msgstr "hacker and designated driver [lazy bum]"
 
-#: src/gtkdialogs.c:90 src/gtkdialogs.c:128
+#: src/gtkdialogs.c:103 src/gtkdialogs.c:141
 msgid "Bulgarian"
 msgstr "Bulgarian"
 
-#: src/gtkdialogs.c:91 src/gtkdialogs.c:129 src/gtkdialogs.c:130
+#: src/gtkdialogs.c:104 src/gtkdialogs.c:142 src/gtkdialogs.c:143
 msgid "Catalan"
 msgstr "Catalan"
 
-#: src/gtkdialogs.c:92 src/gtkdialogs.c:131
+#: src/gtkdialogs.c:105 src/gtkdialogs.c:144
 msgid "Czech"
 msgstr "Czech"
 
-#: src/gtkdialogs.c:93
+#: src/gtkdialogs.c:106
 msgid "Danish"
 msgstr "Danish"
 
-#: src/gtkdialogs.c:94
+#: src/gtkdialogs.c:107
 msgid "Australian English"
 msgstr "Australian English"
 
-#: src/gtkdialogs.c:95
+#: src/gtkdialogs.c:108
 msgid "British English"
 msgstr "British English"
 
-#: src/gtkdialogs.c:96
+#: src/gtkdialogs.c:109
 msgid "Canadian English"
 msgstr "Canadian English"
 
-#: src/gtkdialogs.c:97 src/gtkdialogs.c:132
+#: src/gtkdialogs.c:110 src/gtkdialogs.c:145
 msgid "German"
 msgstr "German"
 
-#: src/gtkdialogs.c:98 src/gtkdialogs.c:133
+#: src/gtkdialogs.c:111 src/gtkdialogs.c:146
 msgid "Spanish"
 msgstr "Spanish"
 
-#: src/gtkdialogs.c:99 src/gtkdialogs.c:134
+#: src/gtkdialogs.c:112 src/gtkdialogs.c:147
 msgid "Finnish"
 msgstr "Finnish"
 
-#: src/gtkdialogs.c:100 src/gtkdialogs.c:135
+#: src/gtkdialogs.c:113 src/gtkdialogs.c:148
 msgid "French"
 msgstr "French"
 
-#: src/gtkdialogs.c:101
+#: src/gtkdialogs.c:114
 msgid "Hebrew"
 msgstr "Hebrew"
 
-#: src/gtkdialogs.c:102
+#: src/gtkdialogs.c:115
 msgid "Hindi"
 msgstr "Hindi"
 
-#: src/gtkdialogs.c:103
+#: src/gtkdialogs.c:116
 msgid "Hungarian"
 msgstr "Hungarian"
 
-#: src/gtkdialogs.c:104 src/gtkdialogs.c:136
+#: src/gtkdialogs.c:117 src/gtkdialogs.c:149
 msgid "Italian"
 msgstr "Italian"
 
-#: src/gtkdialogs.c:105 src/gtkdialogs.c:137
+#: src/gtkdialogs.c:118 src/gtkdialogs.c:150
 msgid "Japanese"
 msgstr "Japanese"
 
-#: src/gtkdialogs.c:106
+#: src/gtkdialogs.c:119
 msgid "Lithuanian"
 msgstr "Lithuanian"
 
-#: src/gtkdialogs.c:107 src/gtkdialogs.c:138
+#: src/gtkdialogs.c:120 src/gtkdialogs.c:151
 msgid "Korean"
 msgstr "Korean"
 
-#: src/gtkdialogs.c:108
+#: src/gtkdialogs.c:121
 msgid "Dutch; Flemish"
 msgstr "Dutch; Flemish"
 
-#: src/gtkdialogs.c:109
+#: src/gtkdialogs.c:122
 msgid "Macedonian"
 msgstr "Macedonian"
 
-#: src/gtkdialogs.c:110
+#: src/gtkdialogs.c:123
 msgid "Norwegian"
 msgstr "Norwegian"
 
-#: src/gtkdialogs.c:111 src/gtkdialogs.c:139
+#: src/gtkdialogs.c:124 src/gtkdialogs.c:152
 msgid "Polish"
 msgstr "Polish"
 
-#: src/gtkdialogs.c:112
+#: src/gtkdialogs.c:125
 msgid "Portuguese"
 msgstr "Portuguese"
 
-#: src/gtkdialogs.c:113
+#: src/gtkdialogs.c:126
 msgid "Portuguese-Brazil"
 msgstr "Portuguese-Brazil"
 
-#: src/gtkdialogs.c:114
+#: src/gtkdialogs.c:127
 msgid "Romanian"
 msgstr "Romanian"
 
-#: src/gtkdialogs.c:115 src/gtkdialogs.c:140 src/gtkdialogs.c:141
+#: src/gtkdialogs.c:128 src/gtkdialogs.c:153 src/gtkdialogs.c:154
 msgid "Russian"
 msgstr "Russian"
 
-#: src/gtkdialogs.c:116
+#: src/gtkdialogs.c:129
 msgid "Serbian"
 msgstr "Serbian"
 
-#: src/gtkdialogs.c:117
+#: src/gtkdialogs.c:130
 msgid "Slovenian"
 msgstr "Slovenian"
 
-#: src/gtkdialogs.c:118 src/gtkdialogs.c:143
+#: src/gtkdialogs.c:131 src/gtkdialogs.c:156
 msgid "Swedish"
 msgstr "Swedish"
 
-#: src/gtkdialogs.c:119
+#: src/gtkdialogs.c:132
 msgid "Vietnamese"
 msgstr "Vietnamese"
 
-#: src/gtkdialogs.c:119
+#: src/gtkdialogs.c:132
 msgid "T.M.Thanh and the Gnome-Vi Team"
 msgstr "T.M.Thanh and the Gnome-Vi Team"
 
-#: src/gtkdialogs.c:120
+#: src/gtkdialogs.c:133
 msgid "Simplified Chinese"
 msgstr "Simplified Chinese"
 
-#: src/gtkdialogs.c:121
+#: src/gtkdialogs.c:134
 msgid "Traditional Chinese"
 msgstr "Traditional Chinese"
 
-#: src/gtkdialogs.c:127
+#: src/gtkdialogs.c:140
 msgid "Amharic"
 msgstr "Amharic"
 
-#: src/gtkdialogs.c:142
+#: src/gtkdialogs.c:155
 msgid "Slovak"
 msgstr "Slovak"
 
-#: src/gtkdialogs.c:144
+#: src/gtkdialogs.c:157
 msgid "Chinese"
 msgstr "Chinese"
 
-#: src/gtkdialogs.c:185
+#: src/gtkdialogs.c:198
 msgid "About Gaim"
 msgstr "About Gaim"
 
-#: src/gtkdialogs.c:208
+#: src/gtkdialogs.c:222
 msgid ""
 "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, "
 "Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu all "
@@ -3075,71 +3106,75 @@
 "Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu all "
 "at once.  It is written using Gtk+ and is licenced under the GPL.<BR><BR>"
 
-#: src/gtkdialogs.c:217
+#: src/gtkdialogs.c:231
+msgid "<FONT SIZE=\"4\">IRC:</FONT> #wingaim on irc.freenode.net<BR><BR>"
+msgstr "<FONT SIZE=\"4\">IRC:</FONT> #wingaim on irc.freenode.net<BR><BR>"
+
+#: src/gtkdialogs.c:234
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #gaim on irc.freenode.net<BR><BR>"
 msgstr "<FONT SIZE=\"4\">IRC:</FONT> #gaim on irc.freenode.net<BR><BR>"
 
-#: src/gtkdialogs.c:222
+#: src/gtkdialogs.c:240
 msgid "Active Developers"
 msgstr "Active Developers"
 
-#: src/gtkdialogs.c:237
+#: src/gtkdialogs.c:255
 msgid "Crazy Patch Writers"
 msgstr "Crazy Patch Writers"
 
-#: src/gtkdialogs.c:252
+#: src/gtkdialogs.c:270
 msgid "Retired Developers"
 msgstr "Retired Developers"
 
-#: src/gtkdialogs.c:267
+#: src/gtkdialogs.c:285
 msgid "Current Translators"
 msgstr "Current Translators"
 
-#: src/gtkdialogs.c:287
+#: src/gtkdialogs.c:305
 msgid "Past Translators"
 msgstr "Past Translators"
 
-#: src/gtkdialogs.c:357 src/gtkdialogs.c:500 src/gtkdialogs.c:555
+#: src/gtkdialogs.c:454 src/gtkdialogs.c:597 src/gtkdialogs.c:652
 msgid "_Screen name"
 msgstr "_Screen name"
 
-#: src/gtkdialogs.c:363 src/gtkdialogs.c:506 src/gtkdialogs.c:561
+#: src/gtkdialogs.c:460 src/gtkdialogs.c:603 src/gtkdialogs.c:658
 msgid "_Account"
 msgstr "_Account"
 
-#: src/gtkdialogs.c:370
+#: src/gtkdialogs.c:467
 msgid "New Instant Message"
 msgstr "New Instant Message"
 
-#: src/gtkdialogs.c:372
+#: src/gtkdialogs.c:469
 msgid "Please enter the screen name of the person you would like to IM."
 msgstr "Please enter the screen name of the person you would like to IM."
 
-#: src/gtkdialogs.c:513
+#: src/gtkdialogs.c:610
 msgid "Get User Info"
 msgstr "Get User Info"
 
-#: src/gtkdialogs.c:515
+#: src/gtkdialogs.c:612
 msgid ""
 "Please enter the screen name of the person whose info you would like to view."
 msgstr ""
 "Please enter the screen name of the person whose info you would like to view."
 
-#: src/gtkdialogs.c:569
+#: src/gtkdialogs.c:666
 msgid "Get User Log"
 msgstr "Get User Log"
 
-#: src/gtkdialogs.c:571
+#: src/gtkdialogs.c:668
 msgid ""
 "Please enter the screen name of the person whose log you would like to view."
 msgstr ""
 "Please enter the screen name of the person whose log you would like to view."
 
-#: src/gtkdialogs.c:611
+#: src/gtkdialogs.c:708
 msgid "Warn User"
 msgstr "Warn User"
 
-#: src/gtkdialogs.c:632
+#: src/gtkdialogs.c:729
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Warn %s?</span>\n"
@@ -3152,54 +3187,60 @@
 "This will increase %s's warning level and he or she will be subject to "
 "harsher rate limiting.\n"
 
-#: src/gtkdialogs.c:641
+#: src/gtkdialogs.c:738
 msgid "Warn _anonymously?"
 msgstr "Warn _anonymously?"
 
-#: src/gtkdialogs.c:648
+#: src/gtkdialogs.c:745
 msgid "<b>Anonymous warnings are less severe.</b>"
 msgstr "<b>Anonymous warnings are less severe.</b>"
 
-#: src/gtkdialogs.c:669
+#: src/gtkdialogs.c:766
 msgid "Alias Contact"
 msgstr "Alias Contact"
 
-#: src/gtkdialogs.c:670
+#: src/gtkdialogs.c:767
 msgid "Enter an alias for this contact."
 msgstr "Enter an alias for this contact."
 
-#: src/gtkdialogs.c:672 src/gtkdialogs.c:694 src/gtkdialogs.c:714
-#: src/gtkrequest.c:267 src/protocols/silc/chat.c:584
+#: src/gtkdialogs.c:769 src/gtkdialogs.c:791 src/gtkdialogs.c:811
+#: src/gtkrequest.c:267 src/protocols/silc/chat.c:585
 msgid "Alias"
 msgstr "Alias"
 
-#: src/gtkdialogs.c:690
+#: src/gtkdialogs.c:787
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "Enter an alias for %s."
 
-#: src/gtkdialogs.c:692
+#: src/gtkdialogs.c:789
 msgid "Alias Buddy"
 msgstr "Alias Buddy"
 
-#: src/gtkdialogs.c:711
+#: src/gtkdialogs.c:808
 msgid "Alias Chat"
 msgstr "Alias Chat"
 
-#: src/gtkdialogs.c:712
+#: src/gtkdialogs.c:809
 msgid "Enter an alias for this chat."
 msgstr "Enter an alias for this chat."
 
-#: src/gtkdialogs.c:746
-#, c-format
-msgid ""
+#: src/gtkdialogs.c:846
+#, c-format
+msgid ""
+"You are about to remove the contact containing %s and %d other buddy from "
+"your buddy list.  Do you want to continue?"
+msgid_plural ""
 "You are about to remove the contact containing %s and %d other buddies from "
 "your buddy list.  Do you want to continue?"
-msgstr ""
+msgstr[0] ""
+"You are about to remove the contact containing %s and %d other buddy from "
+"your buddy list.  Do you want to continue?"
+msgstr[1] ""
 "You are about to remove the contact containing %s and %d other buddies from "
 "your buddy list.  Do you want to continue?"
 
-#: src/gtkdialogs.c:808
+#: src/gtkdialogs.c:913
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
@@ -3208,22 +3249,22 @@
 "You are about to remove the group %s and all its members from your buddy "
 "list.  Do you want to continue?"
 
-#: src/gtkdialogs.c:811 src/gtkdialogs.c:812
+#: src/gtkdialogs.c:916 src/gtkdialogs.c:917
 msgid "Remove Group"
 msgstr "Remove Group"
 
-#: src/gtkdialogs.c:850
+#: src/gtkdialogs.c:955
 #, c-format
 msgid ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
 
-#: src/gtkdialogs.c:853 src/gtkdialogs.c:854
+#: src/gtkdialogs.c:958 src/gtkdialogs.c:959
 msgid "Remove Buddy"
 msgstr "Remove Buddy"
 
-#: src/gtkdialogs.c:887
+#: src/gtkdialogs.c:992
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
@@ -3232,7 +3273,7 @@
 "You are about to remove the chat %s from your buddy list.  Do you want to "
 "continue?"
 
-#: src/gtkdialogs.c:891 src/gtkdialogs.c:892
+#: src/gtkdialogs.c:996 src/gtkdialogs.c:997
 msgid "Remove Chat"
 msgstr "Remove Chat"
 
@@ -3241,15 +3282,15 @@
 msgid "%.2f KB/s"
 msgstr "%.2f KB/s"
 
-#: src/gtkft.c:161 src/gtkft.c:978
+#: src/gtkft.c:161 src/gtkft.c:966
 msgid "Finished"
 msgstr "Finished"
 
-#: src/gtkft.c:164 src/gtkft.c:929
+#: src/gtkft.c:164 src/gtkft.c:917
 msgid "Canceled"
 msgstr "Cancelled"
 
-#: src/gtkft.c:167 src/gtkft.c:848
+#: src/gtkft.c:167 src/gtkft.c:836
 msgid "Waiting for transfer to begin"
 msgstr "Waiting for transfer to begin"
 
@@ -3293,54 +3334,54 @@
 msgid "Remaining"
 msgstr "Remaining"
 
-#: src/gtkft.c:556
+#: src/gtkft.c:555
 msgid "Filename:"
 msgstr "Filename:"
 
+#: src/gtkft.c:556
+msgid "Status:"
+msgstr "Status:"
+
 #: src/gtkft.c:557
-msgid "Status:"
-msgstr "Status:"
+msgid "Speed:"
+msgstr "Speed:"
 
 #: src/gtkft.c:558
-msgid "Speed:"
-msgstr "Speed:"
+msgid "Time Elapsed:"
+msgstr "Time Elapsed:"
 
 #: src/gtkft.c:559
-msgid "Time Elapsed:"
-msgstr "Time Elapsed:"
-
-#: src/gtkft.c:560
 msgid "Time Remaining:"
 msgstr "Time Remaining:"
 
-#: src/gtkft.c:652
+#: src/gtkft.c:645
 msgid "_Keep the dialog open"
 msgstr "_Keep the dialogue open"
 
-#: src/gtkft.c:662
+#: src/gtkft.c:655
 msgid "_Clear finished transfers"
 msgstr "_Clear finished transfers"
 
 #. "Download Details" arrow
-#: src/gtkft.c:671
+#: src/gtkft.c:664
 msgid "Show transfer details"
 msgstr "Show transfer details"
 
-#: src/gtkft.c:672
+#: src/gtkft.c:665
 msgid "Hide transfer details"
 msgstr "Hide transfer details"
 
 #. Pause button
-#: src/gtkft.c:714 src/gtkstock.c:93
+#: src/gtkft.c:702 src/gtkstock.c:93
 msgid "_Pause"
 msgstr "_Pause"
 
 #. Resume button
-#: src/gtkft.c:724
+#: src/gtkft.c:712
 msgid "_Resume"
 msgstr "_Resume"
 
-#: src/gtkft.c:931
+#: src/gtkft.c:919
 msgid "Failed"
 msgstr "Failed"
 
@@ -3356,27 +3397,27 @@
 msgid "Pa_ste As Text"
 msgstr "Pa_ste As Text"
 
-#: src/gtkimhtml.c:1019
+#: src/gtkimhtml.c:1021
 msgid "Hyperlink color"
 msgstr "Hyperlink colour"
 
-#: src/gtkimhtml.c:1020
+#: src/gtkimhtml.c:1022
 msgid "Color to draw hyperlinks."
 msgstr "Colour to draw hyperlinks."
 
-#: src/gtkimhtml.c:1237
+#: src/gtkimhtml.c:1236
 msgid "_Copy E-Mail Address"
 msgstr "_Copy E-Mail Address"
 
-#: src/gtkimhtml.c:1249
+#: src/gtkimhtml.c:1248
 msgid "_Copy Link Location"
 msgstr "_Copy Link Location"
 
-#: src/gtkimhtml.c:1259
+#: src/gtkimhtml.c:1258
 msgid "_Open Link in Browser"
 msgstr "_Open Link in Browser"
 
-#: src/gtkimhtml.c:2817
+#: src/gtkimhtml.c:2848
 msgid ""
 "Unable to guess the image type based on the file extension supplied.  "
 "Defaulting to PNG."
@@ -3384,16 +3425,16 @@
 "Unable to guess the image type based on the file extension supplied.  "
 "Defaulting to PNG."
 
-#: src/gtkimhtml.c:2825
+#: src/gtkimhtml.c:2856
 #, c-format
 msgid "Error saving image: %s"
 msgstr "Error saving image: %s"
 
-#: src/gtkimhtml.c:2902 src/gtkimhtml.c:2914
+#: src/gtkimhtml.c:2933 src/gtkimhtml.c:2945
 msgid "Save Image"
 msgstr "Save Image"
 
-#: src/gtkimhtml.c:2942
+#: src/gtkimhtml.c:2973
 msgid "_Save Image..."
 msgstr "_Save Image..."
 
@@ -3401,23 +3442,23 @@
 msgid "Select Font"
 msgstr "Select Font"
 
-#: src/gtkimhtmltoolbar.c:258
+#: src/gtkimhtmltoolbar.c:259
 msgid "Select Text Color"
 msgstr "Select Text Colour"
 
-#: src/gtkimhtmltoolbar.c:332
+#: src/gtkimhtmltoolbar.c:334
 msgid "Select Background Color"
 msgstr "Select Background Colour"
 
-#: src/gtkimhtmltoolbar.c:415
+#: src/gtkimhtmltoolbar.c:418
 msgid "_URL"
 msgstr "_URL"
 
-#: src/gtkimhtmltoolbar.c:423
+#: src/gtkimhtmltoolbar.c:426
 msgid "_Description"
 msgstr "_Description"
 
-#: src/gtkimhtmltoolbar.c:426
+#: src/gtkimhtmltoolbar.c:429
 msgid ""
 "Please enter the URL and description of the link that you want to insert. "
 "The description is optional."
@@ -3425,164 +3466,127 @@
 "Please enter the URL and description of the link that you want to insert. "
 "The description is optional."
 
-#: src/gtkimhtmltoolbar.c:430
+#: src/gtkimhtmltoolbar.c:433
 msgid "Please enter the URL of the link that you want to insert."
 msgstr "Please enter the URL of the link that you want to insert."
 
-#: src/gtkimhtmltoolbar.c:435
+#: src/gtkimhtmltoolbar.c:438
 msgid "Insert Link"
 msgstr "Insert Link"
 
-#: src/gtkimhtmltoolbar.c:439
+#: src/gtkimhtmltoolbar.c:442
 msgid "_Insert"
 msgstr "_Insert"
 
-#: src/gtkimhtmltoolbar.c:508
+#: src/gtkimhtmltoolbar.c:511
 #, c-format
 msgid "Failed to store image: %s\n"
 msgstr "Failed to store image: %s\n"
 
-#: src/gtkimhtmltoolbar.c:534 src/gtkimhtmltoolbar.c:544
+#: src/gtkimhtmltoolbar.c:537 src/gtkimhtmltoolbar.c:547
 msgid "Insert Image"
 msgstr "Insert Image"
 
-#: src/gtkimhtmltoolbar.c:703 src/gtkimhtmltoolbar.c:781
+#: src/gtkimhtmltoolbar.c:706 src/gtkimhtmltoolbar.c:784
 msgid "This theme has no available smileys."
 msgstr "This theme has no available smileys."
 
 #. show everything
-#: src/gtkimhtmltoolbar.c:795
+#: src/gtkimhtmltoolbar.c:798
 msgid "Smile!"
 msgstr "Smile!"
 
-#: src/gtkimhtmltoolbar.c:974
+#: src/gtkimhtmltoolbar.c:977
 msgid "Bold"
 msgstr "Bold"
 
-#: src/gtkimhtmltoolbar.c:985
+#: src/gtkimhtmltoolbar.c:988
 msgid "Italic"
 msgstr "Italic"
 
-#: src/gtkimhtmltoolbar.c:996
+#: src/gtkimhtmltoolbar.c:999
 msgid "Underline"
 msgstr "Underline"
 
-#: src/gtkimhtmltoolbar.c:1012
+#: src/gtkimhtmltoolbar.c:1015
 msgid "Larger font size"
 msgstr "Larger font size"
 
-#: src/gtkimhtmltoolbar.c:1024
+#: src/gtkimhtmltoolbar.c:1027
 msgid "Smaller font size"
 msgstr "Smaller font size"
 
-#: src/gtkimhtmltoolbar.c:1041
+#: src/gtkimhtmltoolbar.c:1044
 msgid "Font Face"
 msgstr "Font Face"
 
-#: src/gtkimhtmltoolbar.c:1053
+#: src/gtkimhtmltoolbar.c:1056
 msgid "Foreground font color"
 msgstr "Foreground font colour"
 
-#: src/gtkimhtmltoolbar.c:1065
+#: src/gtkimhtmltoolbar.c:1068
 msgid "Background color"
 msgstr "Background colour"
 
-#: src/gtkimhtmltoolbar.c:1080
+#: src/gtkimhtmltoolbar.c:1083
 msgid "Insert link"
 msgstr "Insert link"
 
-#: src/gtkimhtmltoolbar.c:1090
+#: src/gtkimhtmltoolbar.c:1093
 msgid "Insert image"
 msgstr "Insert image"
 
-#: src/gtkimhtmltoolbar.c:1101
+#: src/gtkimhtmltoolbar.c:1104
 msgid "Insert smiley"
 msgstr "Insert smiley"
 
-#: src/gtklog.c:303
+#: src/gtklog.c:308
 #, c-format
 msgid "Conversations with %s"
 msgstr "Conversations with %s"
 
 #. Window **********
-#: src/gtklog.c:391 src/gtklog.c:407
+#: src/gtklog.c:396 src/gtklog.c:412
 msgid "System Log"
 msgstr "System Log"
 
-#: src/gtkmain.c:151
-msgid "Please create an account."
-msgstr "Please create an account."
-
-#: src/gtkmain.c:233
-msgid "Login"
-msgstr "Login"
-
-#: src/gtkmain.c:249
-msgid "<b>_Account:</b>"
-msgstr "<b>_Account:</b>"
-
-#: src/gtkmain.c:263
-msgid "<b>_Password:</b>"
-msgstr "<b>_Password:</b>"
-
-#. And now for the buttons
-#: src/gtkmain.c:280
-msgid "A_ccounts"
-msgstr "A_ccounts"
-
-#: src/gtkmain.c:286
-msgid "P_references"
-msgstr "P_references"
-
-#: src/gtkmain.c:292
-msgid "_Log in"
-msgstr "_Log in"
-
-#. full help text
-#: src/gtkmain.c:517
+#: src/gtkmain.c:319
+#, c-format
+msgid "Gaim %s. Try `%s -h' for more information.\n"
+msgstr "Gaim %s. Try `%s -h' for more information.\n"
+
+#: src/gtkmain.c:321
 #, c-format
 msgid ""
 "Gaim %s\n"
 "Usage: %s [OPTION]...\n"
 "\n"
 "  -a, --acct          display account editor window\n"
-"  -w, --away[=MESG]   make away on signon (optional argument MESG specifies\n"
-"                      name of away message to use)\n"
+"  -c, --config=DIR    use DIR for config files\n"
+"  -d, --debug         print debugging messages to stdout\n"
+"  -h, --help          display this help and exit\n"
+"  -n, --nologin       don't automatically login\n"
 "  -l, --login[=NAME]  automatically login (optional argument NAME specifies\n"
 "                      account(s) to use, seperated by commas)\n"
-"  -n, --loginwin      don't automatically login; show login window\n"
-"  -u, --user=NAME     use account NAME\n"
-"  -c, --config=DIR    use DIR for config files\n"
-"  -d, --debug         print debugging messages to stdout\n"
 "  -v, --version       display the current version and exit\n"
-"  -h, --help          display this help and exit\n"
 msgstr ""
 "Gaim %s\n"
 "Usage: %s [OPTION]...\n"
 "\n"
 "  -a, --acct          display account editor window\n"
-"  -w, --away[=MESG]   make away on signon (optional argument MESG specifies\n"
-"                      name of away message to use)\n"
-"  -l, --login[=NAME]  automatically login (optional argument NAME specifies\n"
-"                      account(s) to use, seperated by commas)\n"
-"  -n, --loginwin      don't automatically login; show login window\n"
-"  -u, --user=NAME     use account NAME\n"
 "  -c, --config=DIR    use DIR for config files\n"
 "  -d, --debug         print debugging messages to stdout\n"
+"  -h, --help          display this help and exit\n"
+"  -n, --nologin       don't automatically log in\n"
+"  -l, --login[=NAME]  automatically log in (optional argument NAME specifies\n"
+"                      account(s) to use, separated by commas)\n"
 "  -v, --version       display the current version and exit\n"
-"  -h, --help          display this help and exit\n"
-
-#. short message
-#: src/gtkmain.c:532
-#, c-format
-msgid "Gaim %s. Try `%s -h' for more information.\n"
-msgstr "Gaim %s. Try `%s -h' for more information.\n"
-
-#: src/gtkmain.c:899
+
+#: src/gtkmain.c:633
 msgid "Unable to load preferences"
 msgstr "Unable to load preferences"
 
-#: src/gtkmain.c:899
+#: src/gtkmain.c:634
 msgid ""
 "Gaim was not able to load your preferences because they are stored in an old "
 "format that is no longer used.  Please reconfigure your settings using the "
@@ -3593,24 +3597,24 @@
 "Preferences window."
 
 #. Descriptive label
-#: src/gtknotify.c:218
+#: src/gtknotify.c:262
 #, c-format
 msgid "%s has %d new message."
 msgid_plural "%s has %d new messages."
 msgstr[0] "%s has %d new message."
 msgstr[1] "%s has %d new messages."
 
-#: src/gtknotify.c:232
+#: src/gtknotify.c:276
 #, c-format
 msgid "<span weight=\"bold\">From:</span> %s\n"
 msgstr "<span weight=\"bold\">From:</span> %s\n"
 
-#: src/gtknotify.c:241
+#: src/gtknotify.c:285
 #, c-format
 msgid "<span weight=\"bold\">Subject:</span> %s\n"
 msgstr "<span weight=\"bold\">Subject:</span> %s\n"
 
-#: src/gtknotify.c:246
+#: src/gtknotify.c:290
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
@@ -3621,7 +3625,7 @@
 "\n"
 "%s%s%s%s"
 
-#: src/gtknotify.c:262
+#: src/gtknotify.c:306
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
@@ -3632,22 +3636,26 @@
 "\n"
 "%s"
 
-#: src/gtknotify.c:419
+#: src/gtknotify.c:446
+msgid "Search Results"
+msgstr "Search Results"
+
+#: src/gtknotify.c:601
 #, c-format
 msgid "The browser command <b>%s</b> is invalid."
 msgstr "The browser command <b>%s</b> is invalid."
 
-#: src/gtknotify.c:421 src/gtknotify.c:433 src/gtknotify.c:446
-#: src/gtknotify.c:570
+#: src/gtknotify.c:603 src/gtknotify.c:615 src/gtknotify.c:628
+#: src/gtknotify.c:752
 msgid "Unable to open URL"
 msgstr "Unable to open URL"
 
-#: src/gtknotify.c:431 src/gtknotify.c:444
+#: src/gtknotify.c:613 src/gtknotify.c:626
 #, c-format
 msgid "Error launching <b>%s</b>: %s"
 msgstr "Error launching <b>%s</b>: %s"
 
-#: src/gtknotify.c:571
+#: src/gtknotify.c:753
 msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr ""
@@ -3662,7 +3670,7 @@
 msgstr "Please enter a buddy to pounce."
 
 #. "New Buddy Pounce"
-#: src/gtkpounce.c:391 src/gtkpounce.c:901
+#: src/gtkpounce.c:391 src/gtkpounce.c:898
 msgid "New Buddy Pounce"
 msgstr "New Buddy Pounce"
 
@@ -3758,63 +3766,55 @@
 msgstr "Sav_e this pounce after activation"
 
 #. "Remove Buddy Pounce"
-#: src/gtkpounce.c:908
+#: src/gtkpounce.c:906
 msgid "Remove Buddy Pounce"
 msgstr "Remove Buddy Pounce"
 
-#: src/gtkpounce.c:969
+#: src/gtkpounce.c:967
 #, c-format
 msgid "%s has started typing to you (%s)"
 msgstr "%s has started typing to you (%s)"
 
-#: src/gtkpounce.c:971
+#: src/gtkpounce.c:969
 #, c-format
 msgid "%s has signed on (%s)"
 msgstr "%s has signed on (%s)"
 
-#: src/gtkpounce.c:973
+#: src/gtkpounce.c:971
 #, c-format
 msgid "%s has returned from being idle (%s)"
 msgstr "%s has returned from being idle (%s)"
 
-#: src/gtkpounce.c:975
+#: src/gtkpounce.c:973
 #, c-format
 msgid "%s has returned from being away (%s)"
 msgstr "%s has returned from being away (%s)"
 
-#: src/gtkpounce.c:977
+#: src/gtkpounce.c:975
 #, c-format
 msgid "%s has stopped typing to you (%s)"
 msgstr "%s has stopped typing to you (%s)"
 
-#: src/gtkpounce.c:979
+#: src/gtkpounce.c:977
 #, c-format
 msgid "%s has signed off (%s)"
 msgstr "%s has signed off (%s)"
 
-#: src/gtkpounce.c:981
+#: src/gtkpounce.c:979
 #, c-format
 msgid "%s has become idle (%s)"
 msgstr "%s has become idle (%s)"
 
-#: src/gtkpounce.c:983
+#: src/gtkpounce.c:981
 #, c-format
 msgid "%s has gone away. (%s)"
 msgstr "%s has gone away. (%s)"
 
-#: src/gtkpounce.c:984
+#: src/gtkpounce.c:982
 msgid "Unknown pounce event. Please report this!"
 msgstr "Unknown pounce event. Please report this!"
 
-#: src/gtkprefs.c:398
-msgid "Interface Options"
-msgstr "Interface Options"
-
-#: src/gtkprefs.c:400
-msgid "D_isplay remote nicknames if no alias is set"
-msgstr "D_isplay remote nicknames if no alias is set"
-
-#: src/gtkprefs.c:632
+#: src/gtkprefs.c:615
 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."
@@ -3822,48 +3822,36 @@
 "Select a smiley theme that you would like to use from the list below. New "
 "themes can be installed by dragging and dropping them onto the theme list."
 
-#: src/gtkprefs.c:672
+#: src/gtkprefs.c:655
 msgid "Icon"
 msgstr "Icon"
 
-#: src/gtkprefs.c:679 src/gtkprefs.c:2117 src/protocols/jabber/buddy.c:267
-#: src/protocols/jabber/buddy.c:799 src/protocols/jabber/chat.c:761
+#: src/gtkprefs.c:662 src/gtkprefs.c:2051 src/protocols/jabber/buddy.c:267
+#: src/protocols/jabber/buddy.c:801 src/protocols/jabber/chat.c:763
 msgid "Description"
 msgstr "Description"
 
-#: src/gtkprefs.c:774
+#: src/gtkprefs.c:757
 msgid "Display"
 msgstr "Display"
 
-#: src/gtkprefs.c:775
-msgid "Show _timestamp on messages"
-msgstr "Show _timestamp on messages"
-
-#: src/gtkprefs.c:778
+#: src/gtkprefs.c:759
 msgid "_Highlight misspelled words"
 msgstr "_Highlight misspelled words"
 
-#: src/gtkprefs.c:782
-msgid "Ignore c_olors"
-msgstr "Ignore c_olours"
-
-#: src/gtkprefs.c:784
-msgid "Ignore font _faces"
-msgstr "Ignore font _faces"
-
-#: src/gtkprefs.c:786
-msgid "Ignore font si_zes"
-msgstr "Ignore font si_zes"
-
-#: src/gtkprefs.c:789
+#: src/gtkprefs.c:763
+msgid "Ignore _formatting"
+msgstr "Ignore _formatting"
+
+#: src/gtkprefs.c:766
 msgid "Default Formatting"
 msgstr "Default Formatting"
 
-#: src/gtkprefs.c:791
+#: src/gtkprefs.c:768
 msgid "_Send default formatting with outgoing messages"
 msgstr "_Send default formatting with outgoing messages"
 
-#: src/gtkprefs.c:801
+#: src/gtkprefs.c:778
 msgid ""
 "This is how your outgoing message text will appear when you use protocols "
 "that support formatting. :)"
@@ -3871,237 +3859,185 @@
 "This is how your outgoing message text will appear when you use protocols "
 "that support formatting. :)"
 
-#: src/gtkprefs.c:804
+#: src/gtkprefs.c:781
 msgid "_Clear Formatting"
 msgstr "_Clear Formatting"
 
-#: src/gtkprefs.c:841
-msgid "Window Closing"
-msgstr "Window Closing"
-
-#: src/gtkprefs.c:842
-msgid "_Escape closes window"
-msgstr "_Escape closes window"
-
-#: src/gtkprefs.c:858
+#: src/gtkprefs.c:821
 msgid "Buddy List Sorting"
 msgstr "Buddy List Sorting"
 
-#: src/gtkprefs.c:867
+#: src/gtkprefs.c:830
 msgid "_Sorting:"
 msgstr "_Sorting:"
 
+#: src/gtkprefs.c:835
+msgid "Buddy Display"
+msgstr "Buddy Display"
+
+#: src/gtkprefs.c:836
+msgid "Show more buddy details"
+msgstr "Show more buddy details"
+
+#: src/gtkprefs.c:869
+msgid "Send unknown \"_slash\" commands as messages"
+msgstr "Send unknown \"_slash\" commands as messages"
+
 #: src/gtkprefs.c:872
-msgid "Buddy Display"
-msgstr "Buddy Display"
-
-#: src/gtkprefs.c:873 src/gtkprefs.c:933
 msgid "Show buddy _icons"
 msgstr "Show buddy _icons"
 
-#: src/gtkprefs.c:875
-msgid "Show _warning levels"
-msgstr "Show _warning levels"
-
-#: src/gtkprefs.c:877
-msgid "Show idle _times"
-msgstr "Show idle _times"
-
-#: src/gtkprefs.c:879
-msgid "_Automatically expand contacts"
-msgstr "_Automatically expand contacts"
-
-#: src/gtkprefs.c:912
-msgid "Show _buttons as:"
-msgstr "Show _buttons as:"
-
-#: src/gtkprefs.c:914
-msgid "Pictures"
-msgstr "Pictures"
-
-#: src/gtkprefs.c:915
-msgid "Text"
-msgstr "Text"
-
-#: src/gtkprefs.c:916
-msgid "Pictures and text"
-msgstr "Pictures and text"
-
-#: src/gtkprefs.c:923
-msgid "Enable \"_slash\" commands"
-msgstr "Enable \"_slash\" commands"
-
-#: src/gtkprefs.c:926
-msgid "Send unknown \"_slash\" commands as messages"
-msgstr "Send unknown \"_slash\" commands as messages"
-
-#: src/gtkprefs.c:929
-msgid "Show _formatting toolbar"
-msgstr "Show _formatting toolbar"
-
-#: src/gtkprefs.c:931
-msgid "Show _aliases in tabs/titles"
-msgstr "Show _aliases in tabs/titles"
-
-#: src/gtkprefs.c:935
+#: src/gtkprefs.c:874
 msgid "Enable buddy ic_on animation"
 msgstr "Enable buddy ic_on animation"
 
-#: src/gtkprefs.c:937
+#: src/gtkprefs.c:876
 msgid "_Notify buddies that you are typing to them"
 msgstr "_Notify buddies that you are typing to them"
 
-#: src/gtkprefs.c:939
-msgid "_Raise IM window on events"
-msgstr "_Raise IM window on events"
-
-#: src/gtkprefs.c:942
-msgid "Raise chat _window on events"
-msgstr "Raise chat _window on events"
-
 #. All the tab options!
-#: src/gtkprefs.c:946
+#: src/gtkprefs.c:880
 msgid "Tab Options"
 msgstr "Tab Options"
 
-#: src/gtkprefs.c:948
+#: src/gtkprefs.c:882
 msgid "Show IMs and chats in _tabbed windows"
 msgstr "Show IMs and chats in _tabbed windows"
 
-#: src/gtkprefs.c:962
+#: src/gtkprefs.c:896
 msgid "Show close b_utton on tabs"
 msgstr "Show close b_utton on tabs"
 
-#: src/gtkprefs.c:965
+#: src/gtkprefs.c:899
 msgid "Tab p_lacement:"
 msgstr "Tab p_lacement:"
 
-#: src/gtkprefs.c:967
+#: src/gtkprefs.c:901
 msgid "Top"
 msgstr "Top"
 
-#: src/gtkprefs.c:968
+#: src/gtkprefs.c:902
 msgid "Bottom"
 msgstr "Bottom"
 
-#: src/gtkprefs.c:969
+#: src/gtkprefs.c:903
 msgid "Left"
 msgstr "Left"
 
-#: src/gtkprefs.c:970
+#: src/gtkprefs.c:904
 msgid "Right"
 msgstr "Right"
 
-#: src/gtkprefs.c:976
+#: src/gtkprefs.c:910
 msgid "New conversation _placement:"
 msgstr "New conversation _placement:"
 
-#: src/gtkprefs.c:1027 src/protocols/oscar/oscar.c:749
-#: src/protocols/oscar/oscar.c:5045
+#: src/gtkprefs.c:961 src/protocols/oscar/oscar.c:765
+#: src/protocols/oscar/oscar.c:5185
 msgid "IP Address"
 msgstr "IP Address"
 
-#: src/gtkprefs.c:1029
+#: src/gtkprefs.c:963
 msgid "_Autodetect IP Address"
 msgstr "_Autodetect IP Address"
 
-#: src/gtkprefs.c:1038
+#: src/gtkprefs.c:972
 msgid "Public _IP:"
 msgstr "Public _IP:"
 
-#: src/gtkprefs.c:1062
+#: src/gtkprefs.c:996
 msgid "Ports"
 msgstr "Ports"
 
-#: src/gtkprefs.c:1065
+#: src/gtkprefs.c:999
 msgid "_Manually specify range of ports to listen on"
 msgstr "_Manually specify range of ports to listen on"
 
-#: src/gtkprefs.c:1068
+#: src/gtkprefs.c:1002
 msgid "_Start Port:"
 msgstr "_Start Port:"
 
-#: src/gtkprefs.c:1075
+#: src/gtkprefs.c:1009
 msgid "_End Port:"
 msgstr "_End Port:"
 
-#: src/gtkprefs.c:1082
+#: src/gtkprefs.c:1016
 msgid "Proxy Server"
 msgstr "Proxy Server"
 
-#: src/gtkprefs.c:1086
+#: src/gtkprefs.c:1020
 msgid "No proxy"
 msgstr "No proxy"
 
-#: src/gtkprefs.c:1148
+#: src/gtkprefs.c:1082
 msgid "_User:"
 msgstr "_User:"
 
-#: src/gtkprefs.c:1204
+#: src/gtkprefs.c:1138
 msgid "Epiphany"
 msgstr "Epiphany"
 
-#: src/gtkprefs.c:1205
+#: src/gtkprefs.c:1139
 msgid "Firebird"
 msgstr "Firebird"
 
-#: src/gtkprefs.c:1206
+#: src/gtkprefs.c:1140
 msgid "Firefox"
 msgstr "Firefox"
 
-#: src/gtkprefs.c:1207
+#: src/gtkprefs.c:1141
 msgid "Galeon"
 msgstr "Galeon"
 
-#: src/gtkprefs.c:1208
+#: src/gtkprefs.c:1142
 msgid "Gnome Default"
 msgstr "Gnome Default"
 
-#: src/gtkprefs.c:1209
+#: src/gtkprefs.c:1143
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: src/gtkprefs.c:1210
+#: src/gtkprefs.c:1144
 msgid "Mozilla"
 msgstr "Mozilla"
 
-#: src/gtkprefs.c:1211
+#: src/gtkprefs.c:1145
 msgid "Netscape"
 msgstr "Netscape"
 
-#: src/gtkprefs.c:1212
+#: src/gtkprefs.c:1146
 msgid "Opera"
 msgstr "Opera"
 
-#: src/gtkprefs.c:1221
+#: src/gtkprefs.c:1155
 msgid "Manual"
 msgstr "Manual"
 
-#: src/gtkprefs.c:1272
+#: src/gtkprefs.c:1206
 msgid "Browser Selection"
 msgstr "Browser Selection"
 
-#: src/gtkprefs.c:1276
+#: src/gtkprefs.c:1210
 msgid "_Browser:"
 msgstr "_Browser:"
 
-#: src/gtkprefs.c:1283
+#: src/gtkprefs.c:1217
 msgid "_Open link in:"
 msgstr "_Open link in:"
 
-#: src/gtkprefs.c:1285
+#: src/gtkprefs.c:1219
 msgid "Browser default"
 msgstr "Browser default"
 
-#: src/gtkprefs.c:1286
+#: src/gtkprefs.c:1220
 msgid "Existing window"
 msgstr "Existing window"
 
-#: src/gtkprefs.c:1288
+#: src/gtkprefs.c:1222
 msgid "New tab"
 msgstr "New tab"
 
-#: src/gtkprefs.c:1302
+#: src/gtkprefs.c:1236
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -4110,75 +4046,75 @@
 "_Manual:\n"
 "(%s for URL)"
 
-#: src/gtkprefs.c:1339
+#: src/gtkprefs.c:1273
 msgid "Message Logs"
 msgstr "Message Logs"
 
-#: src/gtkprefs.c:1342
+#: src/gtkprefs.c:1276
 msgid "Log _Format:"
 msgstr "Log _Format:"
 
-#: src/gtkprefs.c:1345
+#: src/gtkprefs.c:1279
 msgid "_Log all instant messages"
 msgstr "_Log all instant messages"
 
-#: src/gtkprefs.c:1347
+#: src/gtkprefs.c:1281
 msgid "Log all c_hats"
 msgstr "Log all c_hats"
 
-#: src/gtkprefs.c:1350
+#: src/gtkprefs.c:1284
 msgid "System Logs"
 msgstr "System Logs"
 
-#: src/gtkprefs.c:1352
+#: src/gtkprefs.c:1286
 msgid "_Enable system log"
 msgstr "_Enable system log"
 
-#: src/gtkprefs.c:1355
+#: src/gtkprefs.c:1289
 msgid "Log when buddies log in/log _out"
 msgstr "Log when buddies log in/log _out"
 
-#: src/gtkprefs.c:1361
+#: src/gtkprefs.c:1295
 msgid "Log when buddies become _idle/un-idle"
 msgstr "Log when buddies become _idle/un-idle"
 
-#: src/gtkprefs.c:1367
+#: src/gtkprefs.c:1301
 msgid "Log when buddies go away/come _back"
 msgstr "Log when buddies go away/come _back"
 
-#: src/gtkprefs.c:1373
+#: src/gtkprefs.c:1307
 msgid "Log your own _signons/idleness/awayness"
 msgstr "Log your own _signons/idleness/awayness"
 
-#: src/gtkprefs.c:1509
+#: src/gtkprefs.c:1443
 msgid "Sound Selection"
 msgstr "Sound Selection"
 
-#: src/gtkprefs.c:1561
+#: src/gtkprefs.c:1495
 msgid "Sound Method"
 msgstr "Sound Method"
 
-#: src/gtkprefs.c:1562
+#: src/gtkprefs.c:1496
 msgid "_Method:"
 msgstr "_Method:"
 
-#: src/gtkprefs.c:1564
+#: src/gtkprefs.c:1498
 msgid "Console beep"
 msgstr "Console beep"
 
-#: src/gtkprefs.c:1566
+#: src/gtkprefs.c:1500
 msgid "Automatic"
 msgstr "Automatic"
 
-#: src/gtkprefs.c:1573
+#: src/gtkprefs.c:1507
 msgid "Command"
 msgstr "Command"
 
-#: src/gtkprefs.c:1574
+#: src/gtkprefs.c:1508
 msgid "No sounds"
 msgstr "No sounds"
 
-#: src/gtkprefs.c:1582
+#: src/gtkprefs.c:1516
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -4187,102 +4123,102 @@
 "Sound c_ommand:\n"
 "(%s for filename)"
 
-#: src/gtkprefs.c:1609
+#: src/gtkprefs.c:1543
 msgid "Sound Options"
 msgstr "Sound Options"
 
-#: src/gtkprefs.c:1610
+#: src/gtkprefs.c:1544
 msgid "Sounds when conversation has _focus"
 msgstr "Sounds when conversation has _focus"
 
-#: src/gtkprefs.c:1612
+#: src/gtkprefs.c:1546
 msgid "_Sounds while away"
 msgstr "_Sounds while away"
 
-#: src/gtkprefs.c:1622
+#: src/gtkprefs.c:1556
 msgid "Sound Events"
 msgstr "Sound Events"
 
-#: src/gtkprefs.c:1673
+#: src/gtkprefs.c:1607
 msgid "Play"
 msgstr "Play"
 
-#: src/gtkprefs.c:1680
+#: src/gtkprefs.c:1614
 msgid "Event"
 msgstr "Event"
 
-#: src/gtkprefs.c:1699
+#: src/gtkprefs.c:1633
 msgid "Test"
 msgstr "Test"
 
-#: src/gtkprefs.c:1703
+#: src/gtkprefs.c:1637
 msgid "Reset"
 msgstr "Reset"
 
-#: src/gtkprefs.c:1707
+#: src/gtkprefs.c:1641
 msgid "Choose..."
 msgstr "Choose..."
 
-#: src/gtkprefs.c:1761
+#: src/gtkprefs.c:1695
 msgid "_Queue new messages when away"
 msgstr "_Queue new messages when away"
 
-#: src/gtkprefs.c:1764
+#: src/gtkprefs.c:1698
 msgid "_Auto-reply:"
 msgstr "_Auto-reply:"
 
-#: src/gtkprefs.c:1766
+#: src/gtkprefs.c:1700
 msgid "Never"
 msgstr "Never"
 
-#: src/gtkprefs.c:1767
+#: src/gtkprefs.c:1701
 msgid "When away"
 msgstr "When away"
 
-#: src/gtkprefs.c:1768
+#: src/gtkprefs.c:1702
 msgid "When away and idle"
 msgstr "When away and idle"
 
-#: src/gtkprefs.c:1771 src/protocols/msn/msn.c:507
-#: src/protocols/msn/msn.c:1356 src/protocols/msn/state.c:32
-#: src/protocols/novell/novell.c:2817 src/protocols/oscar/oscar.c:4194
-#: src/protocols/yahoo/yahoo.c:2651 src/protocols/yahoo/yahoo_profile.c:665
+#: src/gtkprefs.c:1705 src/protocols/msn/msn.c:504
+#: src/protocols/msn/state.c:32 src/protocols/novell/novell.c:2817
+#: src/protocols/oscar/oscar.c:4312 src/protocols/yahoo/yahoo.c:2410
+#: src/protocols/yahoo/yahoo_profile.c:665
 msgid "Idle"
 msgstr "Idle"
 
-#: src/gtkprefs.c:1772
+#: src/gtkprefs.c:1706
 msgid "Idle _time reporting:"
 msgstr "Idle _time reporting:"
 
-#: src/gtkprefs.c:1775
+#: src/gtkprefs.c:1709
 msgid "Gaim usage"
 msgstr "Gaim usage"
 
-#: src/gtkprefs.c:1778
+#: src/gtkprefs.c:1712
 msgid "X usage"
 msgstr "X usage"
 
-#: src/gtkprefs.c:1780
+#: src/gtkprefs.c:1714
 msgid "Windows usage"
 msgstr "Windows usage"
 
-#: src/gtkprefs.c:1788
+#: src/gtkprefs.c:1722
 msgid "Auto-away"
 msgstr "Auto-away"
 
-#: src/gtkprefs.c:1789
+#: src/gtkprefs.c:1723
 msgid "Set away _when idle"
 msgstr "Set away _when idle"
 
-#: src/gtkprefs.c:1793
+#: src/gtkprefs.c:1727
 msgid "_Minutes before setting away:"
 msgstr "_Minutes before setting away:"
 
-#: src/gtkprefs.c:1801
+#: src/gtkprefs.c:1735
 msgid "Away m_essage:"
 msgstr "Away m_essage:"
 
-#: src/gtkprefs.c:1859
+#: src/gtkprefs.c:1793
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -4297,7 +4233,7 @@
 "<span weight=\"bold\">Web site:</span>\t\t%s\n"
 "<span weight=\"bold\">File name:</span>\t%s"
 
-#: src/gtkprefs.c:1864
+#: src/gtkprefs.c:1798
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -4312,55 +4248,47 @@
 "<span weight=\"bold\">URL:</span>  %s\n"
 "<span weight=\"bold\">File name:</span>  %s"
 
-#: src/gtkprefs.c:2073
+#: src/gtkprefs.c:2007
 msgid "Load"
 msgstr "Load"
 
-#: src/gtkprefs.c:2087
+#: src/gtkprefs.c:2021
 msgid "Summary"
 msgstr "Summary"
 
-#: src/gtkprefs.c:2135
+#: src/gtkprefs.c:2069
 msgid "Details"
 msgstr "Details"
 
-#: src/gtkprefs.c:2177
-msgid "Interface"
-msgstr "Interface"
-
-#: src/gtkprefs.c:2180
+#: src/gtkprefs.c:2113
 msgid "Message Text"
 msgstr "Message Text"
 
-#: src/gtkprefs.c:2181
-msgid "Shortcuts"
-msgstr "Shortcuts"
-
-#: src/gtkprefs.c:2182
+#: src/gtkprefs.c:2114
 msgid "Smiley Themes"
 msgstr "Smiley Themes"
 
-#: src/gtkprefs.c:2183
+#: src/gtkprefs.c:2115
 msgid "Sounds"
 msgstr "Sounds"
 
-#: src/gtkprefs.c:2184
+#: src/gtkprefs.c:2116
 msgid "Network"
 msgstr "Network"
 
-#: src/gtkprefs.c:2189
+#: src/gtkprefs.c:2121
 msgid "Browser"
 msgstr "Browser"
 
-#: src/gtkprefs.c:2192
+#: src/gtkprefs.c:2124
 msgid "Logging"
 msgstr "Logging"
 
-#: src/gtkprefs.c:2193
+#: src/gtkprefs.c:2125
 msgid "Away / Idle"
 msgstr "Away / Idle"
 
-#: src/gtkprefs.c:2196
+#: src/gtkprefs.c:2128
 msgid "Plugins"
 msgstr "Plugins"
 
@@ -4384,7 +4312,7 @@
 msgid "Block only the users below"
 msgstr "Block only the users below"
 
-#: src/gtkprivacy.c:388 src/protocols/jabber/jabber.c:1508
+#: src/gtkprivacy.c:388
 msgid "Privacy"
 msgstr "Privacy"
 
@@ -4397,50 +4325,54 @@
 msgid "Set privacy for:"
 msgstr "Set privacy for:"
 
-#: src/gtkprivacy.c:582 src/gtkprivacy.c:598
+#: src/gtkprivacy.c:579 src/gtkprivacy.c:595
 msgid "Permit User"
 msgstr "Permit User"
 
-#: src/gtkprivacy.c:583
+#: src/gtkprivacy.c:580
 msgid "Type a user you permit to contact you."
 msgstr "Type a user you permit to contact you."
 
-#: src/gtkprivacy.c:584
+#: src/gtkprivacy.c:581
 msgid "Please enter the name of the user you wish to be able to contact you."
 msgstr "Please enter the name of the user you wish to be able to contact you."
 
-#: src/gtkprivacy.c:587 src/gtkprivacy.c:600
+#: src/gtkprivacy.c:584 src/gtkprivacy.c:597
 msgid "Permit"
 msgstr "Permit"
 
-#: src/gtkprivacy.c:592
+#: src/gtkprivacy.c:589
 #, c-format
 msgid "Allow %s to contact you?"
 msgstr "Allow %s to contact you?"
 
-#: src/gtkprivacy.c:594
+#: src/gtkprivacy.c:591
 #, c-format
 msgid "Are you sure you wish to allow %s to contact you?"
 msgstr "Are you sure you wish to allow %s to contact you?"
 
-#: src/gtkprivacy.c:621 src/gtkprivacy.c:634
+#: src/gtkprivacy.c:618 src/gtkprivacy.c:631
 msgid "Block User"
 msgstr "Block User"
 
-#: src/gtkprivacy.c:622
+#: src/gtkprivacy.c:619
 msgid "Type a user to block."
 msgstr "Type a user to block."
 
-#: src/gtkprivacy.c:623
+#: src/gtkprivacy.c:620
 msgid "Please enter the name of the user you wish to block."
 msgstr "Please enter the name of the user you wish to block."
 
-#: src/gtkprivacy.c:630
+#: src/gtkprivacy.c:622 src/gtkprivacy.c:633
+msgid "Block"
+msgstr "Block"
+
+#: src/gtkprivacy.c:627
 #, c-format
 msgid "Block %s?"
 msgstr "Block %s?"
 
-#: src/gtkprivacy.c:632
+#: src/gtkprivacy.c:629
 #, c-format
 msgid "Are you sure you want to block %s?"
 msgstr "Are you sure you want to block %s?"
@@ -4448,15 +4380,17 @@
 #. *
 #. * A wrapper for gaim_request_action() that uses Yes and No buttons.
 #.
-#: src/gtkrequest.c:257 src/protocols/gg/gg.c:1013 src/protocols/msn/msn.c:514
-#: src/protocols/msn/msn.c:517 src/protocols/novell/novell.c:1901
+#: src/gtkrequest.c:257 src/protocols/gg/gg.c:1027
+#: src/protocols/msn/dialog.c:113 src/protocols/msn/msn.c:511
+#: src/protocols/msn/msn.c:514 src/protocols/novell/novell.c:1901
 #: src/protocols/silc/buddy.c:307 src/protocols/silc/pk.c:117
 #: src/request.h:1235
 msgid "Yes"
 msgstr "Yes"
 
-#: src/gtkrequest.c:258 src/protocols/gg/gg.c:1013 src/protocols/msn/msn.c:514
-#: src/protocols/msn/msn.c:517 src/protocols/novell/novell.c:1902
+#: src/gtkrequest.c:258 src/protocols/gg/gg.c:1027
+#: src/protocols/msn/dialog.c:114 src/protocols/msn/msn.c:511
+#: src/protocols/msn/msn.c:514 src/protocols/novell/novell.c:1902
 #: src/protocols/silc/buddy.c:308 src/protocols/silc/pk.c:118
 #: src/request.h:1235
 msgid "No"
@@ -4466,24 +4400,24 @@
 msgid "Apply"
 msgstr "Apply"
 
-#: src/gtkrequest.c:262 src/protocols/msn/msn.c:316
+#: src/gtkrequest.c:262 src/protocols/msn/msn.c:314
 #: src/protocols/silc/util.c:332
 msgid "Close"
 msgstr "Close"
 
-#: src/gtkrequest.c:1483
+#: src/gtkrequest.c:1492
 msgid "That file already exists"
 msgstr "That file already exists"
 
-#: src/gtkrequest.c:1484
+#: src/gtkrequest.c:1493
 msgid "Would you like to overwrite it?"
 msgstr "Would you like to overwrite it?"
 
-#: src/gtkrequest.c:1522 src/gtkrequest.c:1543
+#: src/gtkrequest.c:1531 src/gtkrequest.c:1556
 msgid "Save File..."
 msgstr "Save File..."
 
-#: src/gtkrequest.c:1523 src/gtkrequest.c:1544
+#: src/gtkrequest.c:1532 src/gtkrequest.c:1557
 msgid "Open File..."
 msgstr "Open File..."
 
@@ -4496,6 +4430,67 @@
 msgid "_Get List"
 msgstr "_Get List"
 
+#: src/gtksavedstatuses.c:314 src/protocols/jabber/buddy.c:264
+#: src/protocols/jabber/buddy.c:795 src/protocols/novell/novell.c:1460
+msgid "Title"
+msgstr "Title"
+
+#: src/gtksavedstatuses.c:325
+msgid "Type"
+msgstr "Type"
+
+#: src/gtksavedstatuses.c:336 src/protocols/gg/gg.c:292
+#: src/protocols/gg/gg.c:298 src/protocols/gg/gg.c:304
+#: src/protocols/gg/gg.c:310 src/protocols/gg/gg.c:316
+#: src/protocols/gg/gg.c:322 src/protocols/gg/gg.c:328
+#: src/protocols/irc/irc.c:180 src/protocols/jabber/jabber.c:971
+#: src/protocols/jabber/jabber.c:977 src/protocols/jabber/jabber.c:983
+#: src/protocols/jabber/jabber.c:989 src/protocols/jabber/jabber.c:995
+#: src/protocols/jabber/jabber.c:1001 src/protocols/jabber/jabber.c:1007
+#: src/protocols/novell/novell.c:2831 src/protocols/oscar/oscar.c:7018
+#: src/protocols/oscar/oscar.c:7025 src/protocols/yahoo/yahoo.c:2894
+#: src/protocols/yahoo/yahoo.c:2928 src/protocols/zephyr/zephyr.c:2226
+msgid "Message"
+msgstr "Message"
+
+#: src/gtksavedstatuses.c:399
+msgid "Saved Statuses"
+msgstr "Saved Statuses"
+
+#: src/gtksavedstatuses.c:520
+msgid "Title already in use.  You must choose a unique title."
+msgstr "Title already in use.  You must choose a unique title."
+
+#: src/gtksavedstatuses.c:611
+msgid "Custom status"
+msgstr "Custom status"
+
+#: src/gtksavedstatuses.c:714 src/protocols/jabber/buddy.c:616
+#: src/protocols/jabber/buddy.c:623 src/protocols/jabber/buddy.c:634
+#: src/protocols/jabber/jabber.c:950 src/protocols/msn/msn.c:502
+#: src/protocols/novell/novell.c:2830 src/protocols/novell/novell.c:2834
+#: src/protocols/oscar/oscar.c:747 src/protocols/oscar/oscar.c:753
+#: src/protocols/oscar/oscar.c:755 src/protocols/yahoo/yahoo.c:2533
+msgid "Status"
+msgstr "Status"
+
+#: src/gtksavedstatuses.c:733
+msgid "_Title:"
+msgstr "_Title:"
+
+#: src/gtksavedstatuses.c:744
+msgid "Out of the office"
+msgstr "Out of the office"
+
+#: src/gtksavedstatuses.c:755
+msgid "_Status:"
+msgstr "_Status:"
+
+#. Custom status message disclosure
+#: src/gtksavedstatuses.c:790 src/gtksavedstatuses.c:791
+msgid "Use a different status for some accounts"
+msgstr "Use a different status for some accounts"
+
 #: src/gtksound.c:65
 msgid "Buddy logs in"
 msgstr "Buddy logs in"
@@ -4536,12 +4531,12 @@
 msgid "Someone says your name in chat"
 msgstr "Someone says your name in chat"
 
-#: src/gtksound.c:180
+#: src/gtksound.c:282
 #, c-format
 msgid "Unable to play sound because the chosen file (%s) does not exist."
 msgstr "Unable to play sound because the chosen file (%s) does not exist."
 
-#: src/gtksound.c:196
+#: src/gtksound.c:298
 msgid ""
 "Unable to play sound because the 'Command' sound method has been chosen, but "
 "no command has been set."
@@ -4549,7 +4544,7 @@
 "Unable to play sound because the 'Command' sound method has been chosen, but "
 "no command has been set."
 
-#: src/gtksound.c:208
+#: src/gtksound.c:310
 #, c-format
 msgid ""
 "Unable to play sound because the configured sound command could not be "
@@ -4558,6 +4553,11 @@
 "Unable to play sound because the configured sound command could not be "
 "launched: %s"
 
+#. TODO: Add saved statuses here?
+#: src/gtkstatusselector.c:286 src/gtkstatusselector.c:659
+msgid "New Status"
+msgstr "New Status"
+
 #: src/gtkstock.c:88
 msgid "_Alias"
 msgstr "_Alias"
@@ -4578,21 +4578,21 @@
 msgid "_Warn"
 msgstr "_Warn"
 
-#: src/gtkutils.c:1399 src/gtkutils.c:1424
+#: src/gtkutils.c:1393 src/gtkutils.c:1418
 #, c-format
 msgid "The following error has occurred loading %s: %s"
 msgstr "The following error has occurred loading %s: %s"
 
-#: src/gtkutils.c:1401 src/gtkutils.c:1426
+#: src/gtkutils.c:1395 src/gtkutils.c:1420
 msgid "Failed to load image"
 msgstr "Failed to load image"
 
-#: src/gtkutils.c:1487
+#: src/gtkutils.c:1483
 #, c-format
 msgid "Cannot send folder %s."
 msgstr "Cannot send folder %s."
 
-#: src/gtkutils.c:1489
+#: src/gtkutils.c:1485
 msgid ""
 "Gaim cannot transfer a folder. You will need to send the files within "
 "individually"
@@ -4600,11 +4600,11 @@
 "Gaim cannot transfer a folder. You will need to send the files within it "
 "individually"
 
-#: src/gtkutils.c:1516 src/gtkutils.c:1525 src/gtkutils.c:1530
+#: src/gtkutils.c:1513 src/gtkutils.c:1522 src/gtkutils.c:1527
 msgid "You have dragged an image"
 msgstr "You have dragged an image"
 
-#: src/gtkutils.c:1517
+#: src/gtkutils.c:1514
 msgid ""
 "You can send this image as a file transfer, embed it into this message, or "
 "use it as the buddy icon for this user."
@@ -4612,23 +4612,23 @@
 "You can send this image as a file transfer, embed it into this message, or "
 "use it as the buddy icon for this user."
 
-#: src/gtkutils.c:1521 src/gtkutils.c:1536
+#: src/gtkutils.c:1518 src/gtkutils.c:1533
 msgid "Set as buddy icon"
 msgstr "Set as buddy icon"
 
-#: src/gtkutils.c:1522 src/gtkutils.c:1537
+#: src/gtkutils.c:1519 src/gtkutils.c:1534
 msgid "Send image file"
 msgstr "Send image file"
 
-#: src/gtkutils.c:1523 src/gtkutils.c:1537
+#: src/gtkutils.c:1520 src/gtkutils.c:1534
 msgid "Insert in message"
 msgstr "Insert in message"
 
-#: src/gtkutils.c:1526
+#: src/gtkutils.c:1523
 msgid "Would you like to set it as the buddy icon for this user?"
 msgstr "Would you like to set it as the buddy icon for this user?"
 
-#: src/gtkutils.c:1531
+#: src/gtkutils.c:1528
 msgid ""
 "You can send this image as a file transfer orembed it into this message, or "
 "use it as the buddy icon for this user."
@@ -4636,7 +4636,7 @@
 "You can send this image as a file transfer, embed it into this message, or "
 "use it as the buddy icon for this user."
 
-#: src/gtkutils.c:1533
+#: src/gtkutils.c:1530
 msgid ""
 "You can insert this image into this message, or use it as the buddy icon for "
 "this user"
@@ -4649,11 +4649,11 @@
 #. * send.  The only logical one is "Application," but do we really want to send a binary and nothing else?
 #. * Probably not.  I'll just give an error and return.
 #. The original patch sent the icon used by the launcher.  That's probably wrong
-#: src/gtkutils.c:1587
+#: src/gtkutils.c:1584
 msgid "Cannot send launcher"
 msgstr "Cannot send launcher"
 
-#: src/gtkutils.c:1587
+#: src/gtkutils.c:1584
 msgid ""
 "You dragged a desktop launcher. Most likely you wanted to send whatever this "
 "launcher points to instead of this launcher itself."
@@ -4665,11 +4665,11 @@
 msgid "<b><font color=\"red\">The logger has no read function</font></b>"
 msgstr "<b><font color=\"red\">The logger has no read function</font></b>"
 
-#: src/log.c:528
+#: src/log.c:545
 msgid "XML"
 msgstr "XML"
 
-#: src/log.c:591
+#: src/log.c:608
 #, c-format
 msgid ""
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -4678,7 +4678,7 @@
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
 "REPLY&gt;:</b></font> %s<br/>\n"
 
-#: src/log.c:593
+#: src/log.c:610
 #, c-format
 msgid ""
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -4687,29 +4687,29 @@
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
 "REPLY&gt;:</b></font> %s<br/>\n"
 
-#: src/log.c:644 src/log.c:774
+#: src/log.c:661 src/log.c:791
 msgid "<font color=\"red\"><b>Unable to find log path!</b></font>"
 msgstr "<font color=\"red\"><b>Unable to find log path!</b></font>"
 
-#: src/log.c:654 src/log.c:786
+#: src/log.c:671 src/log.c:803
 #, c-format
 msgid "<font color=\"red\"><b>Could not read file: %s</b></font>"
 msgstr "<font color=\"red\"><b>Could not read file: %s</b></font>"
 
-#: src/log.c:658
+#: src/log.c:675
 msgid "HTML"
 msgstr "HTML"
 
-#: src/log.c:719
+#: src/log.c:736
 #, c-format
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <AUTO-REPLY>: %s\n"
 
-#: src/log.c:790
+#: src/log.c:807
 msgid "Plain text"
 msgstr "Plain text"
 
-#: src/plugin.c:304
+#: src/plugin.c:287
 #, c-format
 msgid ""
 "The required plugin %s was not found. Please install this plugin and try "
@@ -4718,26 +4718,27 @@
 "The required plugin %s was not found. Please install this plugin and try "
 "again."
 
-#: src/plugin.c:309 src/plugin.c:337
+#: src/plugin.c:292 src/plugin.c:320
 msgid "Gaim was unable to load your plugin."
 msgstr "Gaim was unable to load your plugin."
 
-#: src/plugin.c:333
+#: src/plugin.c:316
 #, c-format
 msgid "The required plugin %s was unable to load."
 msgstr "The required plugin %s was unable to load."
 
-#: src/prefs.c:114
+#: src/prefs.c:1094
 msgid "Slightly less boring default"
 msgstr "Slightly less boring default"
 
-#: src/protocols/gg/gg.c:50 src/protocols/irc/irc.c:165
-#: src/protocols/msn/msn.c:538 src/protocols/msn/state.c:29
-#: src/protocols/msn/state.c:30 src/protocols/msn/state.c:37
-#: src/protocols/msn/state.c:38 src/protocols/novell/novell.c:2808
-#: src/protocols/novell/novell.c:2927 src/protocols/novell/novell.c:2978
-#: src/protocols/oscar/oscar.c:771 src/protocols/oscar/oscar.c:6876
-#: src/protocols/yahoo/yahoo.c:3128
+#: src/protocols/gg/gg.c:50 src/protocols/irc/irc.c:175
+#: src/protocols/jabber/jabber.c:982 src/protocols/msn/msn.c:535
+#: src/protocols/msn/state.c:29 src/protocols/msn/state.c:30
+#: src/protocols/msn/state.c:37 src/protocols/msn/state.c:38
+#: src/protocols/novell/novell.c:2808 src/protocols/novell/novell.c:2927
+#: src/protocols/novell/novell.c:2978 src/protocols/oscar/oscar.c:787
+#: src/protocols/oscar/oscar.c:7017 src/protocols/yahoo/yahoo.c:2888
+#: src/status.c:157
 msgid "Available"
 msgstr "Available"
 
@@ -4749,9 +4750,9 @@
 msgid "Away for friends only"
 msgstr "Away for friends only"
 
-#: src/protocols/gg/gg.c:54 src/protocols/oscar/oscar.c:681
-#: src/protocols/oscar/oscar.c:6890 src/protocols/yahoo/yahoo.c:2649
-#: src/protocols/yahoo/yahoo.c:3172
+#: src/protocols/gg/gg.c:54 src/protocols/oscar/oscar.c:695
+#: src/protocols/oscar/oscar.c:7031 src/protocols/yahoo/yahoo.c:2408
+#: src/protocols/yahoo/yahoo.c:2932
 msgid "Invisible"
 msgstr "Invisible"
 
@@ -4759,234 +4760,244 @@
 msgid "Invisible for friends only"
 msgstr "Invisible for friends only"
 
-#: src/protocols/gg/gg.c:56
+#: src/protocols/gg/gg.c:56 src/status.c:158
 msgid "Unavailable"
 msgstr "Unavailable"
 
-#: src/protocols/gg/gg.c:137
+#: src/protocols/gg/gg.c:151
 msgid "Unable to resolve hostname."
 msgstr "Unable to resolve hostname."
 
-#: src/protocols/gg/gg.c:140 src/protocols/novell/novell.c:1720
+#: src/protocols/gg/gg.c:154 src/protocols/novell/novell.c:1720
 msgid "Unable to connect to server."
 msgstr "Unable to connect to server."
 
-#: src/protocols/gg/gg.c:143 src/protocols/jabber/auth.c:130
-#: src/protocols/jabber/auth.c:204 src/protocols/jabber/auth.c:365
-#: src/protocols/jabber/auth.c:463 src/protocols/jabber/auth.c:475
+#: src/protocols/gg/gg.c:157 src/protocols/jabber/auth.c:134
+#: src/protocols/jabber/auth.c:208 src/protocols/jabber/auth.c:369
+#: src/protocols/jabber/auth.c:467 src/protocols/jabber/auth.c:479
 #: src/protocols/jabber/jabber.c:108
 msgid "Invalid response from server."
 msgstr "Invalid response from server."
 
-#: src/protocols/gg/gg.c:146
+#: src/protocols/gg/gg.c:160
 msgid "Error while reading from socket."
 msgstr "Error while reading from socket."
 
-#: src/protocols/gg/gg.c:149
+#: src/protocols/gg/gg.c:163
 msgid "Error while writing to socket."
 msgstr "Error while writing to socket."
 
-#: src/protocols/gg/gg.c:152
+#: src/protocols/gg/gg.c:166
 msgid "Authentication failed."
 msgstr "Authentication failed."
 
-#: src/protocols/gg/gg.c:155
+#: src/protocols/gg/gg.c:169
 msgid "Unknown Error Code."
 msgstr "Unknown Error Code."
 
-#: src/protocols/gg/gg.c:233 src/protocols/oscar/oscar.c:3994
+#: src/protocols/gg/gg.c:247 src/protocols/oscar/oscar.c:4111
 #, c-format
 msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<HR>%s"
 msgstr "<B>UIN:</B> %s<BR><B>Status:</B> %s<HR>%s"
 
 #. res[0] == username
-#: src/protocols/gg/gg.c:234 src/protocols/gg/gg.c:1075
-#: src/protocols/napster/napster.c:404 src/protocols/oscar/oscar.c:3998
-#: src/protocols/oscar/oscar.c:4223 src/protocols/silc/ops.c:1088
+#: src/protocols/gg/gg.c:248 src/protocols/gg/gg.c:1089
+#: src/protocols/napster/napster.c:404 src/protocols/oscar/oscar.c:4115
+#: src/protocols/oscar/oscar.c:4341 src/protocols/silc/ops.c:1088
 #: src/protocols/silc/ops.c:1151 src/protocols/toc/toc.c:469
 #: src/protocols/zephyr/zephyr.c:721 src/protocols/zephyr/zephyr.c:1136
 msgid "Buddy Information"
 msgstr "Buddy Information"
 
-#: src/protocols/gg/gg.c:268 src/protocols/irc/irc.c:157
-#: src/protocols/jabber/buddy.c:1068 src/protocols/jabber/jabber.c:970
-#: src/protocols/msn/msn.c:530 src/protocols/napster/napster.c:556
-#: src/protocols/novell/novell.c:2820 src/protocols/oscar/oscar.c:739
-#: src/protocols/oscar/oscar.c:6672 src/protocols/oscar/oscar.c:6866
-#: src/protocols/silc/silc.c:46 src/protocols/yahoo/yahoo.c:2653
-#: src/protocols/yahoo/yahoo.c:3122
+#: src/protocols/gg/gg.c:282 src/protocols/irc/irc.c:167
+#: src/protocols/jabber/buddy.c:1070 src/protocols/jabber/jabber.c:971
+#: src/protocols/msn/msn.c:527 src/protocols/napster/napster.c:556
+#: src/protocols/novell/novell.c:2820 src/protocols/oscar/oscar.c:755
+#: src/protocols/oscar/oscar.c:6813 src/protocols/oscar/oscar.c:7007
+#: src/protocols/silc/silc.c:46 src/protocols/yahoo/yahoo.c:2412
+#: src/protocols/yahoo/yahoo.c:2882 src/status.c:155
 msgid "Offline"
 msgstr "Offline"
 
-#: src/protocols/gg/gg.c:278 src/protocols/gg/gg.c:284
-#: src/protocols/gg/gg.c:290 src/protocols/gg/gg.c:296
-#: src/protocols/gg/gg.c:302 src/protocols/gg/gg.c:308
-#: src/protocols/gg/gg.c:314 src/protocols/irc/irc.c:170
-#: src/protocols/jabber/jabber.c:970 src/protocols/jabber/jabber.c:976
-#: src/protocols/jabber/jabber.c:982 src/protocols/jabber/jabber.c:988
-#: src/protocols/jabber/jabber.c:994 src/protocols/jabber/jabber.c:1000
-#: src/protocols/novell/novell.c:2831 src/protocols/oscar/oscar.c:6877
-#: src/protocols/oscar/oscar.c:6884 src/protocols/yahoo/yahoo.c:3134
-#: src/protocols/yahoo/yahoo.c:3168 src/protocols/zephyr/zephyr.c:2226
-msgid "Message"
-msgstr "Message"
-
-#: src/protocols/gg/gg.c:327
+#. zephyr has several exposures
+#. NONE (where you are hidden, and zephyrs to you are in practice silently dropped -- yes this is wrong)
+#. OPSTAFF "hidden"
+#. REALM-VISIBLE visible to people in local realm
+#. REALM-ANNOUNCED REALM-VISIBLE+ plus your logins/logouts are announced to <login,username,*>
+#. NET-VISIBLE REALM-ANNOUNCED, plus visible to people in foreign realm
+#. NET-ANNOUNCED NET-VISIBLE, plus logins/logouts are announced	 to <login,username,*>
+#.
+#. Online will set the user to the exposure they have in their options (defaulting to REALM-VISIBLE),
+#. Hidden, will set the user's exposure to OPSTAFF
+#.
+#. Away won't change their exposure but will set an auto away message (for IMs only)
+#.
+#: src/protocols/gg/gg.c:286 src/protocols/irc/irc.c:171
+#: src/protocols/jabber/buddy.c:1072 src/protocols/jabber/jabber.c:976
+#: src/protocols/msn/msn.c:531 src/protocols/napster/napster.c:561
+#: src/protocols/oscar/oscar.c:697 src/protocols/oscar/oscar.c:7012
+#: src/protocols/silc/silc.c:48 src/protocols/yahoo/yahoo.c:2414
+#: src/protocols/yahoo/yahoo.c:2885 src/protocols/zephyr/zephyr.c:2218
+#: src/status.c:156
+msgid "Online"
+msgstr "Online"
+
+#: src/protocols/gg/gg.c:341
 #, c-format
 msgid "Status: %s"
 msgstr "Status: %s"
 
-#: src/protocols/gg/gg.c:481
+#: src/protocols/gg/gg.c:495
 msgid "Could not connect"
 msgstr "Could not connect"
 
-#: src/protocols/gg/gg.c:488
+#: src/protocols/gg/gg.c:502
 msgid "Unable to read socket"
 msgstr "Unable to read socket"
 
 #. we didn't successfully connect. tdt->toc_fd is valid here
-#: src/protocols/gg/gg.c:738 src/protocols/napster/napster.c:486
+#: src/protocols/gg/gg.c:752 src/protocols/napster/napster.c:486
 #: src/protocols/napster/napster.c:517 src/protocols/toc/toc.c:171
-#: src/protocols/yahoo/yahoo.c:2280 src/protocols/yahoo/yahoo.c:2309
-#: src/protocols/yahoo/yahoo.c:2372 src/protocols/yahoo/yahoo_filexfer.c:68
-#: src/protocols/yahoo/yahoo_filexfer.c:109 src/protocols/yahoo/ycht.c:482
+#: src/protocols/yahoo/yahoo.c:2009 src/protocols/yahoo/yahoo.c:2036
+#: src/protocols/yahoo/yahoo.c:2099 src/protocols/yahoo/yahoo_filexfer.c:69
+#: src/protocols/yahoo/yahoo_filexfer.c:112 src/protocols/yahoo/ycht.c:483
 msgid "Unable to connect."
 msgstr "Unable to connect."
 
-#: src/protocols/gg/gg.c:754
+#: src/protocols/gg/gg.c:768
 msgid "Reading data"
 msgstr "Reading data"
 
-#: src/protocols/gg/gg.c:757
+#: src/protocols/gg/gg.c:771
 msgid "Balancer handshake"
 msgstr "Balancer handshake"
 
-#: src/protocols/gg/gg.c:760
+#: src/protocols/gg/gg.c:774
 msgid "Reading server key"
 msgstr "Reading server key"
 
-#: src/protocols/gg/gg.c:763
+#: src/protocols/gg/gg.c:777
 msgid "Exchanging key hash"
 msgstr "Exchanging key hash"
 
-#: src/protocols/gg/gg.c:773
+#: src/protocols/gg/gg.c:787
 msgid "Critical error in GG library\n"
 msgstr "Critical error in GG library\n"
 
-#: src/protocols/gg/gg.c:791 src/protocols/gg/gg.c:882
+#: src/protocols/gg/gg.c:805 src/protocols/gg/gg.c:896
 #: src/protocols/toc/toc.c:147
 #, c-format
 msgid "Connect to %s failed"
 msgstr "Connect to %s failed"
 
-#: src/protocols/gg/gg.c:839
+#: src/protocols/gg/gg.c:853
 msgid "Unable to ping server"
 msgstr "Unable to ping server"
 
-#: src/protocols/gg/gg.c:851
+#: src/protocols/gg/gg.c:865
 msgid "Send as message"
 msgstr "Send as message"
 
-#: src/protocols/gg/gg.c:856
+#: src/protocols/gg/gg.c:870
 msgid "Looking up GG server"
 msgstr "Looking up GG server"
 
-#: src/protocols/gg/gg.c:859
+#: src/protocols/gg/gg.c:873
 msgid "Invalid Gadu-Gadu UIN specified"
 msgstr "Invalid Gadu-Gadu UIN specified"
 
-#: src/protocols/gg/gg.c:906
+#: src/protocols/gg/gg.c:920
 msgid "You are trying to send a message to an invalid Gadu-Gadu UIN."
 msgstr "You are trying to send a message to an invalid Gadu-Gadu UIN."
 
-#: src/protocols/gg/gg.c:981
+#: src/protocols/gg/gg.c:995
 msgid "Couldn't get search results"
 msgstr "Couldn't get search results"
 
-#: src/protocols/gg/gg.c:986
+#: src/protocols/gg/gg.c:1000
 msgid "Gadu-Gadu Search Engine"
 msgstr "Gadu-Gadu Search Engine"
 
-#: src/protocols/gg/gg.c:1012
+#: src/protocols/gg/gg.c:1026
 msgid "Active"
 msgstr "Active"
 
-#: src/protocols/gg/gg.c:1017 src/protocols/oscar/oscar.c:5037
+#: src/protocols/gg/gg.c:1031 src/protocols/oscar/oscar.c:5177
 msgid "UIN"
 msgstr "UIN"
 
 #. First Name
-#: src/protocols/gg/gg.c:1021 src/protocols/jabber/jabber.c:621
-#: src/protocols/oscar/oscar.c:5048 src/protocols/silc/ops.c:810
+#: src/protocols/gg/gg.c:1035 src/protocols/jabber/jabber.c:622
+#: src/protocols/oscar/oscar.c:5188 src/protocols/silc/ops.c:810
 #: src/protocols/trepia/trepia.c:268
 msgid "First Name"
 msgstr "First Name"
 
 #. Last Name
-#: src/protocols/gg/gg.c:1026 src/protocols/jabber/jabber.c:626
-#: src/protocols/oscar/oscar.c:5049 src/protocols/trepia/trepia.c:275
+#: src/protocols/gg/gg.c:1040 src/protocols/jabber/jabber.c:627
+#: src/protocols/oscar/oscar.c:5189 src/protocols/trepia/trepia.c:275
 msgid "Last Name"
 msgstr "Last Name"
 
-#: src/protocols/gg/gg.c:1030 src/protocols/gg/gg.c:1775
-#: src/protocols/irc/msgs.c:182 src/protocols/oscar/oscar.c:5038
+#: src/protocols/gg/gg.c:1044 src/protocols/gg/gg.c:1789
+#: src/protocols/irc/msgs.c:182 src/protocols/oscar/oscar.c:5178
 #: src/protocols/silc/ops.c:1202
 msgid "Nick"
 msgstr "Nick"
 
-#: src/protocols/gg/gg.c:1037 src/protocols/gg/gg.c:1040
+#: src/protocols/gg/gg.c:1051 src/protocols/gg/gg.c:1054
 msgid "Birth Year"
 msgstr "Birth Year"
 
-#: src/protocols/gg/gg.c:1046 src/protocols/gg/gg.c:1048
-#: src/protocols/gg/gg.c:1050
+#: src/protocols/gg/gg.c:1060 src/protocols/gg/gg.c:1062
+#: src/protocols/gg/gg.c:1064
 msgid "Sex"
 msgstr "Sex"
 
 #. City
-#: src/protocols/gg/gg.c:1054 src/protocols/jabber/jabber.c:636
-#: src/protocols/oscar/oscar.c:5092 src/protocols/oscar/oscar.c:5100
+#: src/protocols/gg/gg.c:1068 src/protocols/jabber/jabber.c:637
+#: src/protocols/oscar/oscar.c:5232 src/protocols/oscar/oscar.c:5240
 #: src/protocols/trepia/trepia.c:332 src/protocols/trepia/trepia.c:411
 msgid "City"
 msgstr "City"
 
-#: src/protocols/gg/gg.c:1097
+#: src/protocols/gg/gg.c:1111
 msgid "There is no Buddy List stored on the Gadu-Gadu server."
 msgstr "There is no Buddy List stored on the Gadu-Gadu server."
 
-#: src/protocols/gg/gg.c:1105
+#: src/protocols/gg/gg.c:1119
 msgid "Couldn't Import Buddy List from Server"
 msgstr "Couldn't Import Buddy List from Server"
 
-#: src/protocols/gg/gg.c:1167
+#: src/protocols/gg/gg.c:1181
 msgid "Buddy List successfully transferred to Gadu-Gadu server"
 msgstr "Buddy List successfully transferred to Gadu-Gadu server"
 
-#: src/protocols/gg/gg.c:1175
+#: src/protocols/gg/gg.c:1189
 msgid "Couldn't transfer Buddy List to Gadu-Gadu server"
 msgstr "Couldn't transfer Buddy List to Gadu-Gadu server"
 
-#: src/protocols/gg/gg.c:1183
+#: src/protocols/gg/gg.c:1197
 msgid "Buddy List successfully deleted from Gadu-Gadu server"
 msgstr "Buddy List successfully deleted from Gadu-Gadu server"
 
-#: src/protocols/gg/gg.c:1191
+#: src/protocols/gg/gg.c:1205
 msgid "Couldn't delete Buddy List from Gadu-Gadu server"
 msgstr "Couldn't delete Buddy List from Gadu-Gadu server"
 
-#: src/protocols/gg/gg.c:1200
+#: src/protocols/gg/gg.c:1214
 msgid "Password changed successfully"
 msgstr "Password changed successfully"
 
-#: src/protocols/gg/gg.c:1207
+#: src/protocols/gg/gg.c:1221
 msgid "Password couldn't be changed"
 msgstr "Password couldn't be changed"
 
-#: src/protocols/gg/gg.c:1326
+#: src/protocols/gg/gg.c:1340
 msgid "Error communicating with Gadu-Gadu server"
 msgstr "Error communicating with Gadu-Gadu server"
 
-#: src/protocols/gg/gg.c:1327
+#: src/protocols/gg/gg.c:1341
 msgid ""
 "Gaim was unable to complete your request due to a problem communicating with "
 "the Gadu-Gadu HTTP server.  Please try again later."
@@ -4994,11 +5005,11 @@
 "Gaim was unable to complete your request due to a problem communicating with "
 "the Gadu-Gadu HTTP server.  Please try again later."
 
-#: src/protocols/gg/gg.c:1356
+#: src/protocols/gg/gg.c:1370
 msgid "Unable to import Gadu-Gadu buddy list"
 msgstr "Unable to import Gadu-Gadu buddy list"
 
-#: src/protocols/gg/gg.c:1357
+#: src/protocols/gg/gg.c:1371
 msgid ""
 "Gaim was unable to connect to the Gadu-Gadu buddy list server.  Please try "
 "again later."
@@ -5006,25 +5017,25 @@
 "Gaim was unable to connect to the Gadu-Gadu buddy list server.  Please try "
 "again later."
 
-#: src/protocols/gg/gg.c:1430
+#: src/protocols/gg/gg.c:1444
 msgid "Couldn't export buddy list"
 msgstr "Couldn't export buddy list"
 
-#: src/protocols/gg/gg.c:1431 src/protocols/gg/gg.c:1454
+#: src/protocols/gg/gg.c:1445 src/protocols/gg/gg.c:1468
 msgid ""
 "Gaim was unable to connect to the buddy list server.  Please try again later."
 msgstr ""
 "Gaim was unable to connect to the buddy list server.  Please try again later."
 
-#: src/protocols/gg/gg.c:1453
+#: src/protocols/gg/gg.c:1467
 msgid "Unable to delete Gadu-Gadu buddy list"
 msgstr "Unable to delete Gadu-Gadu buddy list"
 
-#: src/protocols/gg/gg.c:1504
+#: src/protocols/gg/gg.c:1518
 msgid "Unable to access directory"
 msgstr "Unable to access directory"
 
-#: src/protocols/gg/gg.c:1505
+#: src/protocols/gg/gg.c:1519
 msgid ""
 "Gaim was unable to search the Directory because it was unable to connect to "
 "the directory server.  Please try again later."
@@ -5032,11 +5043,11 @@
 "Gaim was unable to search the Directory because it was unable to connect to "
 "the directory server.  Please try again later."
 
-#: src/protocols/gg/gg.c:1539
+#: src/protocols/gg/gg.c:1553
 msgid "Unable to change Gadu-Gadu password"
 msgstr "Unable to change Gadu-Gadu password"
 
-#: src/protocols/gg/gg.c:1540
+#: src/protocols/gg/gg.c:1554
 msgid ""
 "Gaim was unable to change your password due to an error connecting to the "
 "Gadu-Gadu server.  Please try again later."
@@ -5044,33 +5055,33 @@
 "Gaim was unable to change your password due to an error connecting to the "
 "Gadu-Gadu server.  Please try again later."
 
-#: src/protocols/gg/gg.c:1556
+#: src/protocols/gg/gg.c:1570
 msgid "Directory Search"
 msgstr "Directory Search"
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
-#: src/protocols/gg/gg.c:1561 src/protocols/jabber/jabber.c:1104
-#: src/protocols/toc/toc.c:1571
+#: src/protocols/gg/gg.c:1575 src/protocols/jabber/jabber.c:1111
+#: src/protocols/toc/toc.c:1577
 msgid "Change Password"
 msgstr "Change Password"
 
-#: src/protocols/gg/gg.c:1565
+#: src/protocols/gg/gg.c:1579
 msgid "Import Buddy List from Server"
 msgstr "Import Buddy List from Server"
 
-#: src/protocols/gg/gg.c:1569
+#: src/protocols/gg/gg.c:1583
 msgid "Export Buddy List to Server"
 msgstr "Export Buddy List to Server"
 
-#: src/protocols/gg/gg.c:1573
+#: src/protocols/gg/gg.c:1587
 msgid "Delete Buddy List from Server"
 msgstr "Delete Buddy List from Server"
 
-#: src/protocols/gg/gg.c:1606
+#: src/protocols/gg/gg.c:1620
 msgid "Unable to access user profile."
 msgstr "Unable to access user profile."
 
-#: src/protocols/gg/gg.c:1607
+#: src/protocols/gg/gg.c:1621
 msgid ""
 "Gaim was unable to access this user's profile due to an error connecting to "
 "the directory server.  Please try again later."
@@ -5088,30 +5099,30 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/gg/gg.c:1754 src/protocols/gg/gg.c:1756
+#: src/protocols/gg/gg.c:1768 src/protocols/gg/gg.c:1770
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr "Gadu-Gadu Protocol Plugin"
 
-#: src/protocols/irc/cmds.c:43 src/protocols/silc/silc.c:1310
+#: src/protocols/irc/cmds.c:43 src/protocols/silc/silc.c:1299
 #, c-format
 msgid "Unknown command: %s"
 msgstr "Unknown command: %s"
 
-#: src/protocols/irc/cmds.c:450 src/protocols/jabber/chat.c:584
-#: src/protocols/silc/silc.c:1018
+#: src/protocols/irc/cmds.c:461 src/protocols/jabber/chat.c:586
+#: src/protocols/silc/silc.c:1007
 #, c-format
 msgid "current topic is: %s"
 msgstr "current topic is: %s"
 
-#: src/protocols/irc/cmds.c:454 src/protocols/jabber/chat.c:588
-#: src/protocols/silc/silc.c:1022
+#: src/protocols/irc/cmds.c:465 src/protocols/jabber/chat.c:590
+#: src/protocols/silc/silc.c:1011
 msgid "No topic is set"
 msgstr "No topic is set"
 
-#: src/protocols/irc/dcc_send.c:272 src/protocols/yahoo/yahoo_filexfer.c:169
-#: src/protocols/yahoo/yahoo_filexfer.c:179
-#: src/protocols/yahoo/yahoo_filexfer.c:188
-#: src/protocols/yahoo/yahoo_filexfer.c:198
+#: src/protocols/irc/dcc_send.c:272 src/protocols/yahoo/yahoo_filexfer.c:168
+#: src/protocols/yahoo/yahoo_filexfer.c:178
+#: src/protocols/yahoo/yahoo_filexfer.c:187
+#: src/protocols/yahoo/yahoo_filexfer.c:197
 msgid "File Transfer Aborted"
 msgstr "File Transfer Aborted"
 
@@ -5119,68 +5130,87 @@
 msgid "Gaim could not open a listening port."
 msgstr "Gaim could not open a listening port."
 
-#: src/protocols/irc/irc.c:75
+#: src/protocols/irc/irc.c:78
 msgid "Error displaying MOTD"
 msgstr "Error displaying MOTD"
 
-#: src/protocols/irc/irc.c:75
+#: src/protocols/irc/irc.c:78
 msgid "No MOTD available"
 msgstr "No MOTD available"
 
-#: src/protocols/irc/irc.c:76
+#: src/protocols/irc/irc.c:79
 msgid "There is no MOTD associated with this connection."
 msgstr "There is no MOTD associated with this connection."
 
-#: src/protocols/irc/irc.c:79
+#: src/protocols/irc/irc.c:82
 #, c-format
 msgid "MOTD for %s"
 msgstr "MOTD for %s"
 
-#: src/protocols/irc/irc.c:93 src/protocols/irc/irc.c:412
+#: src/protocols/irc/irc.c:102 src/protocols/irc/irc.c:516
+#: src/protocols/irc/irc.c:538
 msgid "Server has disconnected"
 msgstr "Server has disconnected"
 
-#: src/protocols/irc/irc.c:181
+#: src/protocols/irc/irc.c:191
 msgid "View MOTD"
 msgstr "View MOTD"
 
-#: src/protocols/irc/irc.c:193 src/protocols/silc/chat.c:32
+#: src/protocols/irc/irc.c:203 src/protocols/silc/chat.c:32
 msgid "_Channel:"
 msgstr "_Channel:"
 
-#: src/protocols/irc/irc.c:198 src/protocols/jabber/chat.c:56
+#: src/protocols/irc/irc.c:208 src/protocols/jabber/chat.c:56
 msgid "_Password:"
 msgstr "_Password:"
 
-#: src/protocols/irc/irc.c:230
+#: src/protocols/irc/irc.c:240
 msgid "IRC nicks may not contain whitespace"
 msgstr "IRC nicks may not contain whitespace"
 
-#: src/protocols/irc/irc.c:249
-#, c-format
-msgid "Logging in: %s"
-msgstr "Logging in: %s"
-
-#: src/protocols/irc/irc.c:258
+#. connect to the server
+#: src/protocols/irc/irc.c:259 src/protocols/jabber/jabber.c:801
+#: src/protocols/msn/session.c:338 src/protocols/napster/napster.c:510
+#: src/protocols/novell/novell.c:2163 src/protocols/oscar/oscar.c:1818
+#: src/protocols/trepia/trepia.c:1067 src/protocols/yahoo/yahoo.c:2230
+#: src/protocols/zephyr/zephyr.c:1492
+msgid "Connecting"
+msgstr "Connecting"
+
+#: src/protocols/irc/irc.c:267 src/protocols/jabber/jabber.c:407
+#: src/protocols/jabber/jabber.c:739
+msgid "SSL support unavailable"
+msgstr "SSL support unavailable"
+
+#: src/protocols/irc/irc.c:278
 msgid "Couldn't create socket"
 msgstr "Couldn't create socket"
 
-#: src/protocols/irc/irc.c:273 src/protocols/jabber/jabber.c:301
-#: src/protocols/oscar/oscar.c:1690 src/protocols/oscar/oscar.c:1757
+#: src/protocols/irc/irc.c:346 src/protocols/jabber/jabber.c:302
+#: src/protocols/oscar/oscar.c:1737 src/protocols/oscar/oscar.c:1814
 msgid "Couldn't connect to host"
 msgstr "Couldn't connect to host"
 
-#: src/protocols/irc/irc.c:409 src/protocols/trepia/trepia.c:929
+#: src/protocols/irc/irc.c:371 src/protocols/jabber/jabber.c:329
+msgid "Connection Failed"
+msgstr "Connection Failed"
+
+#: src/protocols/irc/irc.c:374 src/protocols/jabber/jabber.c:332
+msgid "SSL Handshake Failed"
+msgstr "SSL Handshake Failed"
+
+#: src/protocols/irc/irc.c:513 src/protocols/irc/irc.c:535
+#: src/protocols/trepia/trepia.c:929
 msgid "Read error"
 msgstr "Read error"
 
-#: src/protocols/irc/irc.c:564 src/protocols/silc/chat.c:1373
-#: src/protocols/yahoo/yahoochat.c:1398
+#: src/protocols/irc/irc.c:674 src/protocols/silc/chat.c:1374
+#: src/protocols/yahoo/yahoochat.c:1355
 msgid "Users"
 msgstr "Users"
 
-#: src/protocols/irc/irc.c:567 src/protocols/silc/chat.c:1376
-#: src/protocols/silc/ops.c:1170 src/protocols/yahoo/yahoochat.c:1407
+#: src/protocols/irc/irc.c:677 src/protocols/silc/chat.c:1377
+#: src/protocols/silc/ops.c:1170 src/protocols/yahoo/yahoochat.c:1364
 msgid "Topic"
 msgstr "Topic"
 
@@ -5192,42 +5222,46 @@
 #. *< id
 #. *< name
 #. *< version
-#: src/protocols/irc/irc.c:674
+#: src/protocols/irc/irc.c:784
 msgid "IRC Protocol Plugin"
 msgstr "IRC Protocol Plugin"
 
 #. *  summary
-#: src/protocols/irc/irc.c:675
+#: src/protocols/irc/irc.c:785
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "The IRC Protocol Plugin that Sucks Less"
 
-#: src/protocols/irc/irc.c:694 src/protocols/irc/msgs.c:201
-#: src/protocols/jabber/jabber.c:1621 src/protocols/napster/napster.c:691
+#: src/protocols/irc/irc.c:804 src/protocols/irc/msgs.c:201
+#: src/protocols/jabber/jabber.c:1607 src/protocols/napster/napster.c:691
 #: src/protocols/silc/ops.c:1028 src/protocols/silc/ops.c:1132
 msgid "Server"
 msgstr "Server"
 
-#: src/protocols/irc/irc.c:697 src/protocols/jabber/jabber.c:1642
-#: src/protocols/msn/msn.c:1961 src/protocols/napster/napster.c:696
-#: src/protocols/silc/silc.c:1604 src/protocols/trepia/trepia.c:1303
+#: src/protocols/irc/irc.c:807 src/protocols/jabber/jabber.c:1628
+#: src/protocols/msn/msn.c:1887 src/protocols/napster/napster.c:696
+#: src/protocols/silc/silc.c:1593 src/protocols/trepia/trepia.c:1303
 msgid "Port"
 msgstr "Port"
 
-#: src/protocols/irc/irc.c:700
+#: src/protocols/irc/irc.c:810
 msgid "Encodings"
 msgstr "Encodings"
 
-#: src/protocols/irc/irc.c:703 src/protocols/irc/msgs.c:195
-#: src/protocols/jabber/jabber.c:596 src/protocols/silc/buddy.c:1450
+#: src/protocols/irc/irc.c:813 src/protocols/irc/msgs.c:195
+#: src/protocols/jabber/jabber.c:597 src/protocols/silc/buddy.c:1459
 #: src/protocols/silc/ops.c:975 src/protocols/silc/ops.c:977
 #: src/protocols/silc/ops.c:1126 src/protocols/silc/ops.c:1128
 msgid "Username"
 msgstr "Username"
 
-#: src/protocols/irc/irc.c:706
+#: src/protocols/irc/irc.c:816
 msgid "Real name"
 msgstr "Real name"
 
+#: src/protocols/irc/irc.c:819
+msgid "Use SSL"
+msgstr "Use SSL"
+
 #: src/protocols/irc/msgs.c:97
 msgid "Bad mode"
 msgstr "Bad mode"
@@ -5257,7 +5291,7 @@
 
 #: src/protocols/irc/msgs.c:189 src/protocols/irc/msgs.c:195
 #: src/protocols/irc/msgs.c:196 src/protocols/irc/msgs.c:207
-#: src/protocols/msn/msn.c:1356 src/protocols/yahoo/yahoo_profile.c:665
+#: src/protocols/yahoo/yahoo_profile.c:665
 #, c-format
 msgid "<b>%s:</b> %s<br>"
 msgstr "<b>%s:</b> %s<br>"
@@ -5289,120 +5323,128 @@
 msgid "Buddy Information for %s"
 msgstr "Buddy Information for %s"
 
-#: src/protocols/irc/msgs.c:286
+#: src/protocols/irc/msgs.c:287
 #, c-format
 msgid "%s has changed the topic to: %s"
 msgstr "%s has changed the topic to: %s"
 
-#: src/protocols/irc/msgs.c:291
+#: src/protocols/irc/msgs.c:292
 #, c-format
 msgid "The topic for %s is: %s"
 msgstr "The topic for %s is: %s"
 
-#: src/protocols/irc/msgs.c:308
+#: src/protocols/irc/msgs.c:309
 #, c-format
 msgid "Unknown message '%s'"
 msgstr "Unknown message '%s'"
 
-#: src/protocols/irc/msgs.c:309
+#: src/protocols/irc/msgs.c:310
 msgid "Unknown message"
 msgstr "Unknown message"
 
-#: src/protocols/irc/msgs.c:309
+#: src/protocols/irc/msgs.c:310
 msgid "Gaim has sent a message the IRC server did not understand."
 msgstr "Gaim has sent a message the IRC server did not understand."
 
-#: src/protocols/irc/msgs.c:332
+#: src/protocols/irc/msgs.c:333
 #, c-format
 msgid "Users on %s: %s"
 msgstr "Users on %s: %s"
 
-#: src/protocols/irc/msgs.c:426
+#: src/protocols/irc/msgs.c:428
+msgid "Time Response"
+msgstr "Time Response"
+
+#: src/protocols/irc/msgs.c:429
+msgid "The IRC server's local time is:"
+msgstr "The IRC server's local time is:"
+
+#: src/protocols/irc/msgs.c:440
 msgid "No such channel"
 msgstr "No such channel"
 
 #. does this happen?
-#: src/protocols/irc/msgs.c:437
+#: src/protocols/irc/msgs.c:451
 msgid "no such channel"
 msgstr "no such channel"
 
-#: src/protocols/irc/msgs.c:440
+#: src/protocols/irc/msgs.c:454
 msgid "User is not logged in"
 msgstr "User is not logged in"
 
-#: src/protocols/irc/msgs.c:445
+#: src/protocols/irc/msgs.c:459
 msgid "No such nick or channel"
 msgstr "No such nick or channel"
 
-#: src/protocols/irc/msgs.c:465
+#: src/protocols/irc/msgs.c:479
 msgid "Could not send"
 msgstr "Could not send"
 
-#: src/protocols/irc/msgs.c:521
+#: src/protocols/irc/msgs.c:535
 #, c-format
 msgid "Joining %s requires an invitation."
 msgstr "Joining %s requires an invitation."
 
-#: src/protocols/irc/msgs.c:522
+#: src/protocols/irc/msgs.c:536
 msgid "Invitation only"
 msgstr "Invitation only"
 
-#: src/protocols/irc/msgs.c:623
+#: src/protocols/irc/msgs.c:637
 #, c-format
 msgid "You have been kicked by %s: (%s)"
 msgstr "You have been kicked by %s: (%s)"
 
-#: src/protocols/irc/msgs.c:628
+#: src/protocols/irc/msgs.c:642
 #, c-format
 msgid "Kicked by %s (%s)"
 msgstr "Kicked by %s (%s)"
 
-#: src/protocols/irc/msgs.c:649
+#: src/protocols/irc/msgs.c:663
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr "mode (%s %s) by %s"
 
-#: src/protocols/irc/msgs.c:758
+#: src/protocols/irc/msgs.c:773
 msgid "Could not change nick"
 msgstr "Could not change nick"
 
-#: src/protocols/irc/msgs.c:759
+#: src/protocols/irc/msgs.c:774
 msgid "Cannot change nick"
 msgstr "Cannot change nick"
 
-#: src/protocols/irc/msgs.c:780
+#: src/protocols/irc/msgs.c:795
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr "You have parted the channel%s%s"
 
-#: src/protocols/irc/msgs.c:820
+#: src/protocols/irc/msgs.c:836
 msgid "Error: invalid PONG from server"
 msgstr "Error: invalid PONG from server"
 
-#: src/protocols/irc/msgs.c:822
+#: src/protocols/irc/msgs.c:838
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr "PING reply -- Lag: %lu seconds"
 
-#: src/protocols/irc/msgs.c:897
+#: src/protocols/irc/msgs.c:913
 #, c-format
 msgid "Cannot join %s:"
 msgstr "Cannot join %s:"
 
-#: src/protocols/irc/msgs.c:898 src/protocols/silc/ops.c:914
+#: src/protocols/irc/msgs.c:914 src/protocols/silc/ops.c:914
 msgid "Cannot join channel"
 msgstr "Cannot join channel"
 
-#: src/protocols/irc/msgs.c:934
+#: src/protocols/irc/msgs.c:950
 #, c-format
 msgid "Wallops from %s"
 msgstr "Wallops from %s"
 
-#: src/protocols/irc/parse.c:110
+#: src/protocols/irc/parse.c:111
 msgid "action &lt;action to perform&gt;:  Perform an action."
 msgstr "action &lt;action to perform&gt;:  Perform an action."
 
-#: src/protocols/irc/parse.c:111
+#: src/protocols/irc/parse.c:112
 msgid ""
 "away [message]:  Set an away message, or use no message to return from being "
 "away."
@@ -5410,7 +5452,7 @@
 "away [message]:  Set an away message, or use no message to return from being "
 "away."
 
-#: src/protocols/irc/parse.c:112
+#: src/protocols/irc/parse.c:113
 msgid ""
 "deop &lt;nick1&gt; [nick2] ...:  Remove channel operator status from "
 "someone. You must be a channel operator to do this."
@@ -5418,7 +5460,7 @@
 "deop &lt;nick1&gt; [nick2] ...:  Remove channel operator status from "
 "someone. You must be a channel operator to do this."
 
-#: src/protocols/irc/parse.c:113
+#: src/protocols/irc/parse.c:114
 msgid ""
 "devoice &lt;nick1&gt; [nick2] ...:  Remove channel voice status from "
 "someone, preventing them from speaking if the channel is moderated (+m). You "
@@ -5428,7 +5470,7 @@
 "someone, preventing them from speaking if the channel is moderated (+m). You "
 "must be a channel operator to do this."
 
-#: src/protocols/irc/parse.c:114
+#: src/protocols/irc/parse.c:115
 msgid ""
 "invite &lt;nick&gt; [room]:  Invite someone to join you in the specified "
 "channel, or the current channel."
@@ -5436,7 +5478,7 @@
 "invite &lt;nick&gt; [room]:  Invite someone to join you in the specified "
 "channel, or the current channel."
 
-#: src/protocols/irc/parse.c:115
+#: src/protocols/irc/parse.c:116
 msgid ""
 "j &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
 "channels, optionally providing a channel key for each if needed."
@@ -5444,7 +5486,7 @@
 "j &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
 "channels, optionally providing a channel key for each if needed."
 
-#: src/protocols/irc/parse.c:116
+#: src/protocols/irc/parse.c:117
 msgid ""
 "join &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
 "channels, optionally providing a channel key for each if needed."
@@ -5452,7 +5494,7 @@
 "join &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
 "channels, optionally providing a channel key for each if needed."
 
-#: src/protocols/irc/parse.c:117
+#: src/protocols/irc/parse.c:118
 msgid ""
 "kick &lt;nick&gt; [message]:  Remove someone from a channel. You must be a "
 "channel operator to do this."
@@ -5460,7 +5502,7 @@
 "kick &lt;nick&gt; [message]:  Remove someone from a channel. You must be a "
 "channel operator to do this."
 
-#: src/protocols/irc/parse.c:118
+#: src/protocols/irc/parse.c:119
 msgid ""
 "list:  Display a list of chat rooms on the network. <i>Warning, some servers "
 "may disconnect you upon doing this.</i>"
@@ -5468,11 +5510,11 @@
 "list:  Display a list of chat rooms on the network. <i>Warning, some servers "
 "may disconnect you upon doing this.</i>"
 
-#: src/protocols/irc/parse.c:119
+#: src/protocols/irc/parse.c:120
 msgid "me &lt;action to perform&gt;:  Perform an action."
 msgstr "me &lt;action to perform&gt;:  Perform an action."
 
-#: src/protocols/irc/parse.c:120
+#: src/protocols/irc/parse.c:121
 msgid ""
 "mode &lt;nick|channel&gt; &lt;+|-&gt;&lt;A-Za-z&gt;:  Set or unset a channel "
 "or user mode."
@@ -5480,7 +5522,7 @@
 "mode &lt;nick|channel&gt; &lt;+|-&gt;&lt;A-Za-z&gt;:  Set or unset a channel "
 "or user mode."
 
-#: src/protocols/irc/parse.c:121
+#: src/protocols/irc/parse.c:122
 msgid ""
 "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
 "opposed to a channel)."
@@ -5488,15 +5530,15 @@
 "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
 "opposed to a channel)."
 
-#: src/protocols/irc/parse.c:122
+#: src/protocols/irc/parse.c:123
 msgid "names [channel]:  List the users currently in a channel."
 msgstr "names [channel]:  List the users currently in a channel."
 
-#: src/protocols/irc/parse.c:123 src/protocols/jabber/jabber.c:1452
+#: src/protocols/irc/parse.c:124 src/protocols/jabber/jabber.c:1459
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr "nick &lt;new nickname&gt;:  Change your nickname."
 
-#: src/protocols/irc/parse.c:124
+#: src/protocols/irc/parse.c:125
 msgid ""
 "op &lt;nick1&gt; [nick2] ...:  Grant channel operator status to someone. You "
 "must be a channel operator to do this."
@@ -5504,7 +5546,7 @@
 "op &lt;nick1&gt; [nick2] ...:  Grant channel operator status to someone. You "
 "must be a channel operator to do this."
 
-#: src/protocols/irc/parse.c:125
+#: src/protocols/irc/parse.c:126
 msgid ""
 "operwall &lt;message&gt;:  If you don't know what this is, you probably "
 "can't use it."
@@ -5512,7 +5554,7 @@
 "operwall &lt;message&gt;:  If you don't know what this is, you probably "
 "can't use it."
 
-#: src/protocols/irc/parse.c:126
+#: src/protocols/irc/parse.c:127
 msgid ""
 "part [room] [message]:  Leave the current channel, or a specified channel, "
 "with an optional message."
@@ -5520,7 +5562,7 @@
 "part [room] [message]:  Leave the current channel, or a specified channel, "
 "with an optional message."
 
-#: src/protocols/irc/parse.c:127
+#: src/protocols/irc/parse.c:128
 msgid ""
 "ping [nick]:  Asks how much lag a user (or the server if no user specified) "
 "has."
@@ -5528,7 +5570,7 @@
 "ping [nick]:  Asks how much lag a user (or the server if no user specified) "
 "has."
 
-#: src/protocols/irc/parse.c:128
+#: src/protocols/irc/parse.c:129
 msgid ""
 "query &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
 "opposed to a channel)."
@@ -5536,15 +5578,15 @@
 "query &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
 "opposed to a channel)."
 
-#: src/protocols/irc/parse.c:129
+#: src/protocols/irc/parse.c:130
 msgid "quit [message]:  Disconnect from the server, with an optional message."
 msgstr "quit [message]:  Disconnect from the server, with an optional message."
 
-#: src/protocols/irc/parse.c:130
+#: src/protocols/irc/parse.c:131
 msgid "quote [...]:  Send a raw command to the server."
 msgstr "quote [...]:  Send a raw command to the server."
 
-#: src/protocols/irc/parse.c:131
+#: src/protocols/irc/parse.c:132
 msgid ""
 "remove &lt;nick&gt; [message]:  Remove someone from a room. You must be a "
 "channel operator to do this."
@@ -5552,15 +5594,19 @@
 "remove &lt;nick&gt; [message]:  Remove someone from a room. You must be a "
 "channel operator to do this."
 
-#: src/protocols/irc/parse.c:132
+#: src/protocols/irc/parse.c:133
+msgid "time: Displays the current local time at the IRC server."
+msgstr "time: Displays the current local time at the IRC server."
+
+#: src/protocols/irc/parse.c:134
 msgid "topic [new topic]:  View or change the channel topic."
 msgstr "topic [new topic]:  View or change the channel topic."
 
-#: src/protocols/irc/parse.c:133
+#: src/protocols/irc/parse.c:135
 msgid "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Set or unset a user mode."
 msgstr "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Set or unset a user mode."
 
-#: src/protocols/irc/parse.c:134
+#: src/protocols/irc/parse.c:136
 msgid ""
 "voice &lt;nick1&gt; [nick2] ...:  Grant channel voice status to someone. You "
 "must be a channel operator to do this."
@@ -5568,7 +5614,7 @@
 "voice &lt;nick1&gt; [nick2] ...:  Grant channel voice status to someone. You "
 "must be a channel operator to do this."
 
-#: src/protocols/irc/parse.c:135
+#: src/protocols/irc/parse.c:137
 msgid ""
 "wallops &lt;message&gt;:  If you don't know what this is, you probably can't "
 "use it."
@@ -5576,44 +5622,52 @@
 "wallops &lt;message&gt;:  If you don't know what this is, you probably can't "
 "use it."
 
-#: src/protocols/irc/parse.c:136
+#: src/protocols/irc/parse.c:138
 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:414
+#: src/protocols/irc/parse.c:419
 #, c-format
 msgid "Reply time from %s: %lu seconds"
 msgstr "Reply time from %s: %lu seconds"
 
-#: src/protocols/irc/parse.c:415
+#: src/protocols/irc/parse.c:420
 msgid "PONG"
 msgstr "PONG"
 
-#: src/protocols/irc/parse.c:415
+#: src/protocols/irc/parse.c:420
 msgid "CTCP PING reply"
 msgstr "CTCP PING reply"
 
-#: src/protocols/irc/parse.c:518 src/protocols/irc/parse.c:522
-#: src/protocols/oscar/oscar.c:1587 src/protocols/toc/toc.c:189
+#: src/protocols/irc/parse.c:523 src/protocols/irc/parse.c:527
+#: src/protocols/oscar/oscar.c:1634 src/protocols/toc/toc.c:189
 #: src/protocols/toc/toc.c:597 src/protocols/toc/toc.c:613
 #: src/protocols/toc/toc.c:690
 msgid "Disconnected."
 msgstr "Disconnected."
 
-#: src/protocols/jabber/auth.c:51
-msgid "Server requires SSL for login"
-msgstr "Server requires SSL for login"
-
-#: src/protocols/jabber/auth.c:111
+#: src/protocols/jabber/auth.c:52
+msgid ""
+"Server requires TLS/SSL for login.  Select \"Use TLS if available\" in "
+"account properties"
+msgstr ""
+"Server requires TLS/SSL for login.  Select \"Use TLS if available\" in "
+"account properties"
+
+#: src/protocols/jabber/auth.c:54
+msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
+msgstr "Server requires TLS/SSL for login.  No TLS/SSL support found."
+
+#: src/protocols/jabber/auth.c:115
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr "Server requires plaintext authentication over an unencrypted stream"
 
-#: src/protocols/jabber/auth.c:160 src/protocols/jabber/auth.c:161
-#: src/protocols/jabber/auth.c:238 src/protocols/jabber/auth.c:239
+#: src/protocols/jabber/auth.c:164 src/protocols/jabber/auth.c:165
+#: src/protocols/jabber/auth.c:242 src/protocols/jabber/auth.c:243
 msgid "Plaintext Authentication"
 msgstr "Plaintext Authentication"
 
-#: src/protocols/jabber/auth.c:162 src/protocols/jabber/auth.c:240
+#: src/protocols/jabber/auth.c:166 src/protocols/jabber/auth.c:244
 msgid ""
 "This server requires plaintext authentication over an unencrypted "
 "connection.  Allow this and continue authentication?"
@@ -5621,97 +5675,92 @@
 "This server requires plaintext authentication over an unencrypted "
 "connection.  Allow this and continue authentication?"
 
-#: src/protocols/jabber/auth.c:170 src/protocols/jabber/auth.c:248
+#: src/protocols/jabber/auth.c:174 src/protocols/jabber/auth.c:252
 msgid "Server does not use any supported authentication method"
 msgstr "Server does not use any supported authentication method"
 
-#: src/protocols/jabber/auth.c:386
+#: src/protocols/jabber/auth.c:390
 msgid "Invalid challenge from server"
 msgstr "Invalid challenge from server"
 
-#: src/protocols/jabber/buddy.c:249 src/protocols/jabber/buddy.c:655
+#: src/protocols/jabber/buddy.c:249 src/protocols/jabber/buddy.c:657
 #: src/protocols/silc/ops.c:806
 msgid "Full Name"
 msgstr "Full Name"
 
-#: src/protocols/jabber/buddy.c:250 src/protocols/jabber/buddy.c:668
+#: src/protocols/jabber/buddy.c:250 src/protocols/jabber/buddy.c:670
 #: src/protocols/silc/ops.c:818
 msgid "Family Name"
 msgstr "Family Name"
 
-#: src/protocols/jabber/buddy.c:251 src/protocols/jabber/buddy.c:672
+#: src/protocols/jabber/buddy.c:251 src/protocols/jabber/buddy.c:674
 msgid "Given Name"
 msgstr "Given Name"
 
-#: src/protocols/jabber/buddy.c:252 src/protocols/jabber/buddy.c:686
-#: src/protocols/jabber/jabber.c:616 src/protocols/msn/msn.c:1346
-#: src/protocols/silc/buddy.c:1447 src/protocols/silc/ops.c:822
+#: src/protocols/jabber/buddy.c:252 src/protocols/jabber/buddy.c:688
+#: src/protocols/jabber/jabber.c:617 src/protocols/msn/msn.c:1309
+#: src/protocols/silc/buddy.c:1456 src/protocols/silc/ops.c:822
 #: src/protocols/silc/ops.c:965 src/protocols/silc/ops.c:1116
 #: src/protocols/yahoo/yahoo_profile.c:1002
 msgid "Nickname"
 msgstr "Nickname"
 
-#: src/protocols/jabber/buddy.c:253 src/protocols/jabber/jabber.c:656
+#: src/protocols/jabber/buddy.c:253 src/protocols/jabber/jabber.c:657
 msgid "URL"
 msgstr "URL"
 
-#: src/protocols/jabber/buddy.c:254 src/protocols/jabber/buddy.c:714
+#: src/protocols/jabber/buddy.c:254 src/protocols/jabber/buddy.c:716
 msgid "Street Address"
 msgstr "Street Address"
 
-#: src/protocols/jabber/buddy.c:255 src/protocols/jabber/buddy.c:710
+#: src/protocols/jabber/buddy.c:255 src/protocols/jabber/buddy.c:712
 msgid "Extended Address"
 msgstr "Extended Address"
 
-#: src/protocols/jabber/buddy.c:256 src/protocols/jabber/buddy.c:718
+#: src/protocols/jabber/buddy.c:256 src/protocols/jabber/buddy.c:720
 msgid "Locality"
 msgstr "Locality"
 
-#: src/protocols/jabber/buddy.c:257 src/protocols/jabber/buddy.c:722
+#: src/protocols/jabber/buddy.c:257 src/protocols/jabber/buddy.c:724
 msgid "Region"
 msgstr "Region"
 
-#: src/protocols/jabber/buddy.c:258 src/protocols/jabber/buddy.c:726
-#: src/protocols/jabber/jabber.c:646
+#: src/protocols/jabber/buddy.c:258 src/protocols/jabber/buddy.c:728
+#: src/protocols/jabber/jabber.c:647
 msgid "Postal Code"
 msgstr "Postal Code"
 
 #. Country
-#: src/protocols/jabber/buddy.c:259 src/protocols/jabber/buddy.c:731
+#: src/protocols/jabber/buddy.c:259 src/protocols/jabber/buddy.c:733
 #: src/protocols/trepia/trepia.c:340 src/protocols/trepia/trepia.c:417
 msgid "Country"
 msgstr "Country"
 
-#: src/protocols/jabber/buddy.c:260 src/protocols/jabber/buddy.c:742
-#: src/protocols/jabber/buddy.c:749
+#: src/protocols/jabber/buddy.c:260 src/protocols/jabber/buddy.c:744
+#: src/protocols/jabber/buddy.c:751
 msgid "Telephone"
 msgstr "Telephone"
 
-#: src/protocols/jabber/buddy.c:261 src/protocols/jabber/buddy.c:760
-#: src/protocols/jabber/buddy.c:768 src/protocols/silc/silc.c:662
+#: src/protocols/jabber/buddy.c:261 src/protocols/jabber/buddy.c:762
+#: src/protocols/jabber/buddy.c:770 src/protocols/silc/silc.c:651
 #: src/protocols/silc/util.c:508 src/protocols/yahoo/yahoo_profile.c:997
 msgid "Email"
 msgstr "Email"
 
-#: src/protocols/jabber/buddy.c:262 src/protocols/jabber/buddy.c:783
+#: src/protocols/jabber/buddy.c:262 src/protocols/jabber/buddy.c:785
 msgid "Organization Name"
 msgstr "Organization Name"
 
-#: src/protocols/jabber/buddy.c:263 src/protocols/jabber/buddy.c:787
+#: src/protocols/jabber/buddy.c:263 src/protocols/jabber/buddy.c:789
 msgid "Organization Unit"
 msgstr "Organization Unit"
 
-#: src/protocols/jabber/buddy.c:264 src/protocols/jabber/buddy.c:793
-#: src/protocols/novell/novell.c:1460
-msgid "Title"
-msgstr "Title"
-
-#: src/protocols/jabber/buddy.c:265 src/protocols/jabber/buddy.c:796
+#: src/protocols/jabber/buddy.c:265 src/protocols/jabber/buddy.c:798
 msgid "Role"
 msgstr "Role"
 
-#: src/protocols/jabber/buddy.c:266 src/protocols/jabber/buddy.c:689
-#: src/protocols/oscar/oscar.c:5073
+#: src/protocols/jabber/buddy.c:266 src/protocols/jabber/buddy.c:691
+#: src/protocols/oscar/oscar.c:5213
 msgid "Birthday"
 msgstr "Birthday"
 
@@ -5727,94 +5776,86 @@
 "All items below are optional. Enter only the information with which you feel "
 "comfortable."
 
-#: src/protocols/jabber/buddy.c:604
+#: src/protocols/jabber/buddy.c:606
 msgid "Jabber ID"
 msgstr "Jabber ID"
 
-#: src/protocols/jabber/buddy.c:614 src/protocols/jabber/buddy.c:621
-#: src/protocols/jabber/buddy.c:632 src/protocols/jabber/jabber.c:949
-#: src/protocols/msn/msn.c:505 src/protocols/novell/novell.c:2830
-#: src/protocols/novell/novell.c:2834 src/protocols/oscar/oscar.c:731
-#: src/protocols/oscar/oscar.c:737 src/protocols/oscar/oscar.c:739
-#: src/protocols/yahoo/yahoo.c:2774
-msgid "Status"
-msgstr "Status"
-
-#: src/protocols/jabber/buddy.c:630 src/protocols/jabber/jabber.c:1624
+#: src/protocols/jabber/buddy.c:632 src/protocols/jabber/jabber.c:1610
 msgid "Resource"
 msgstr "Resource"
 
-#: src/protocols/jabber/buddy.c:676 src/protocols/silc/ops.c:814
+#: src/protocols/jabber/buddy.c:678 src/protocols/silc/ops.c:814
 msgid "Middle Name"
 msgstr "Middle Name"
 
-#: src/protocols/jabber/buddy.c:694 src/protocols/jabber/jabber.c:631
-#: src/protocols/oscar/oscar.c:5091 src/protocols/oscar/oscar.c:5099
+#: src/protocols/jabber/buddy.c:696 src/protocols/jabber/jabber.c:632
+#: src/protocols/oscar/oscar.c:5231 src/protocols/oscar/oscar.c:5239
 #: src/protocols/silc/ops.c:850
 msgid "Address"
 msgstr "Address"
 
-#: src/protocols/jabber/buddy.c:706
+#: src/protocols/jabber/buddy.c:708
 msgid "P.O. Box"
 msgstr "P.O. Box"
 
-#: src/protocols/jabber/buddy.c:812
+#: src/protocols/jabber/buddy.c:814
 msgid "Photo"
 msgstr "Photo"
 
-#: src/protocols/jabber/buddy.c:812
+#: src/protocols/jabber/buddy.c:814
 msgid "Logo"
 msgstr "Logo"
 
-#: src/protocols/jabber/buddy.c:834
+#: src/protocols/jabber/buddy.c:836
 msgid "Jabber Profile"
 msgstr "Jabber Profile"
 
-#: src/protocols/jabber/buddy.c:1016
+#: src/protocols/jabber/buddy.c:1018
 msgid "Un-hide From"
 msgstr "Un-hide From"
 
-#: src/protocols/jabber/buddy.c:1019
+#: src/protocols/jabber/buddy.c:1021
 msgid "Temporarily Hide From"
 msgstr "Temporarily Hide From"
 
 #. && NOT ME
-#: src/protocols/jabber/buddy.c:1026
+#: src/protocols/jabber/buddy.c:1028
 msgid "Cancel Presence Notification"
 msgstr "Cancel Presence Notification"
 
-#: src/protocols/jabber/buddy.c:1032
+#: src/protocols/jabber/buddy.c:1034
 msgid "(Re-)Request authorization"
 msgstr "(Re-)Request authorization"
 
 #. if(NOT ME)
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
-#: src/protocols/jabber/buddy.c:1040
+#: src/protocols/jabber/buddy.c:1042
 msgid "Unsubscribe"
 msgstr "Unsubscribe"
 
-#: src/protocols/jabber/buddy.c:1066 src/protocols/jabber/chat.c:669
-#: src/protocols/jabber/chat.c:680 src/protocols/jabber/jabber.c:957
+#: src/protocols/jabber/buddy.c:1068 src/protocols/jabber/chat.c:671
+#: src/protocols/jabber/chat.c:682 src/protocols/jabber/jabber.c:958
 #: src/protocols/silc/ops.c:1239
 msgid "Error"
 msgstr "Error"
 
-#: src/protocols/jabber/buddy.c:1072 src/protocols/jabber/jabber.c:981
+#: src/protocols/jabber/buddy.c:1074 src/protocols/jabber/jabber.c:988
 msgid "Chatty"
 msgstr "Chatty"
 
-#: src/protocols/jabber/buddy.c:1076 src/protocols/jabber/jabber.c:993
+#: src/protocols/jabber/buddy.c:1078 src/protocols/jabber/jabber.c:1000
+#: src/status.c:161
 msgid "Extended Away"
 msgstr "Extended Away"
 
-#: src/protocols/jabber/buddy.c:1078 src/protocols/jabber/jabber.c:999
-#: src/protocols/oscar/oscar.c:671 src/protocols/oscar/oscar.c:6910
+#: src/protocols/jabber/buddy.c:1080 src/protocols/jabber/jabber.c:1006
+#: src/protocols/oscar/oscar.c:685 src/protocols/oscar/oscar.c:7051
 msgid "Do Not Disturb"
 msgstr "Do Not Disturb"
 
-#: src/protocols/jabber/chat.c:41 src/protocols/oscar/oscar.c:6371
-#: src/protocols/yahoo/yahoochat.c:1003
+#: src/protocols/jabber/chat.c:41 src/protocols/oscar/oscar.c:6532
+#: src/protocols/yahoo/yahoochat.c:958
 msgid "_Room:"
 msgstr "_Room:"
 
@@ -5853,48 +5894,48 @@
 msgid "Invalid Room Handle"
 msgstr "Invalid Room Handle"
 
-#: src/protocols/jabber/chat.c:387
+#: src/protocols/jabber/chat.c:389
 msgid "Configuration error"
 msgstr "Configuration error"
 
-#: src/protocols/jabber/chat.c:396 src/protocols/jabber/chat.c:541
+#: src/protocols/jabber/chat.c:398 src/protocols/jabber/chat.c:543
 msgid "Unable to configure"
 msgstr "Unable to configure"
 
-#: src/protocols/jabber/chat.c:412
+#: src/protocols/jabber/chat.c:414
 msgid "Room Configuration Error"
 msgstr "Room Configuration Error"
 
-#: src/protocols/jabber/chat.c:413
+#: src/protocols/jabber/chat.c:415
 msgid "This room is not capable of being configured"
 msgstr "This room is not capable of being configured"
 
-#: src/protocols/jabber/chat.c:463 src/protocols/jabber/chat.c:532
+#: src/protocols/jabber/chat.c:465 src/protocols/jabber/chat.c:534
 msgid "Registration error"
 msgstr "Registration error"
 
-#: src/protocols/jabber/chat.c:620
+#: src/protocols/jabber/chat.c:622
 msgid "Nick changing not supported in non-MUC chatrooms"
 msgstr "Nick changing not supported in non-MUC chatrooms"
 
-#: src/protocols/jabber/chat.c:670 src/protocols/jabber/chat.c:681
+#: src/protocols/jabber/chat.c:672 src/protocols/jabber/chat.c:683
 #: src/protocols/silc/ops.c:1239
 msgid "Error retrieving room list"
 msgstr "Error retrieving room list"
 
-#: src/protocols/jabber/chat.c:729
+#: src/protocols/jabber/chat.c:731
 msgid "Invalid Server"
 msgstr "Invalid Server"
 
-#: src/protocols/jabber/chat.c:767
+#: src/protocols/jabber/chat.c:769
 msgid "Enter a Conference Server"
 msgstr "Enter a Conference Server"
 
-#: src/protocols/jabber/chat.c:768
+#: src/protocols/jabber/chat.c:770
 msgid "Select a conference server to query"
 msgstr "Select a conference server to query"
 
-#: src/protocols/jabber/chat.c:771
+#: src/protocols/jabber/chat.c:773
 msgid "Find Rooms"
 msgstr "Find Rooms"
 
@@ -5902,427 +5943,403 @@
 msgid "Error initializing session"
 msgstr "Error initializing session"
 
-#: src/protocols/jabber/jabber.c:210 src/protocols/msn/httpmethod.c:266
-#: src/protocols/trepia/trepia.c:248 src/protocols/trepia/trepia.c:699
-#: src/protocols/trepia/trepia.c:990 src/protocols/trepia/trepia.c:1034
-#: src/protocols/trepia/trepia.c:1133 src/protocols/trepia/trepia.c:1179
+#: src/protocols/jabber/jabber.c:211 src/protocols/trepia/trepia.c:248
+#: src/protocols/trepia/trepia.c:699 src/protocols/trepia/trepia.c:990
+#: src/protocols/trepia/trepia.c:1034 src/protocols/trepia/trepia.c:1133
+#: src/protocols/trepia/trepia.c:1179
 msgid "Write error"
 msgstr "Write error"
 
-#: src/protocols/jabber/jabber.c:248 src/protocols/jabber/jabber.c:268
+#: src/protocols/jabber/jabber.c:249 src/protocols/jabber/jabber.c:269
 msgid "Read Error"
 msgstr "Read Error"
 
-#: src/protocols/jabber/jabber.c:328
-msgid "Connection Failed"
-msgstr "Connection Failed"
-
-#: src/protocols/jabber/jabber.c:331
-msgid "SSL Handshake Failed"
-msgstr "SSL Handshake Failed"
-
-#: src/protocols/jabber/jabber.c:375 src/protocols/jabber/jabber.c:708
+#: src/protocols/jabber/jabber.c:376 src/protocols/jabber/jabber.c:709
 msgid "Invalid Jabber ID"
 msgstr "Invalid Jabber ID"
 
-#: src/protocols/jabber/jabber.c:406 src/protocols/jabber/jabber.c:738
-msgid "SSL support unavailable"
-msgstr "SSL support unavailable"
-
-#: src/protocols/jabber/jabber.c:416 src/protocols/jabber/jabber.c:748
+#: src/protocols/jabber/jabber.c:417 src/protocols/jabber/jabber.c:749
 #: src/protocols/trepia/trepia.c:1073
 msgid "Unable to create socket"
 msgstr "Unable to create socket"
 
-#: src/protocols/jabber/jabber.c:441
+#: src/protocols/jabber/jabber.c:442
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "Registration of %s@%s successful"
 
-#: src/protocols/jabber/jabber.c:443 src/protocols/jabber/jabber.c:444
+#: src/protocols/jabber/jabber.c:444 src/protocols/jabber/jabber.c:445
 msgid "Registration Successful"
 msgstr "Registration Successful"
 
-#: src/protocols/jabber/jabber.c:450 src/protocols/jabber/jabber.c:1223
+#: src/protocols/jabber/jabber.c:451 src/protocols/jabber/jabber.c:1230
 msgid "Unknown Error"
 msgstr "Unknown Error"
 
-#: src/protocols/jabber/jabber.c:452 src/protocols/jabber/jabber.c:453
+#: src/protocols/jabber/jabber.c:453 src/protocols/jabber/jabber.c:454
 msgid "Registration Failed"
 msgstr "Registration Failed"
 
-#: src/protocols/jabber/jabber.c:564 src/protocols/jabber/jabber.c:565
+#: src/protocols/jabber/jabber.c:565 src/protocols/jabber/jabber.c:566
 msgid "Already Registered"
 msgstr "Already Registered"
 
-#: src/protocols/jabber/jabber.c:600 src/protocols/jabber/jabber.c:1078
+#: src/protocols/jabber/jabber.c:601 src/protocols/jabber/jabber.c:1085
 msgid "Password"
 msgstr "Password"
 
-#: src/protocols/jabber/jabber.c:611
+#: src/protocols/jabber/jabber.c:612
 msgid "E-Mail"
 msgstr "E-Mail"
 
 #. State
-#: src/protocols/jabber/jabber.c:641 src/protocols/oscar/oscar.c:5093
-#: src/protocols/oscar/oscar.c:5101 src/protocols/trepia/trepia.c:336
+#: src/protocols/jabber/jabber.c:642 src/protocols/oscar/oscar.c:5233
+#: src/protocols/oscar/oscar.c:5241 src/protocols/trepia/trepia.c:336
 #: src/protocols/trepia/trepia.c:414
 msgid "State"
 msgstr "Province/Territory"
 
-#: src/protocols/jabber/jabber.c:651 src/protocols/silc/ops.c:855
-#: src/protocols/silc/silc.c:664 src/protocols/silc/util.c:510
+#: src/protocols/jabber/jabber.c:652 src/protocols/silc/ops.c:855
+#: src/protocols/silc/silc.c:653 src/protocols/silc/util.c:510
 msgid "Phone"
 msgstr "Phone"
 
-#: src/protocols/jabber/jabber.c:661
+#: src/protocols/jabber/jabber.c:662
 msgid "Date"
 msgstr "Date"
 
-#: src/protocols/jabber/jabber.c:669
+#: src/protocols/jabber/jabber.c:670
 msgid "Please fill out the information below to register your new account."
 msgstr "Please fill out the information below to register your new account."
 
-#: src/protocols/jabber/jabber.c:672 src/protocols/jabber/jabber.c:673
+#: src/protocols/jabber/jabber.c:673 src/protocols/jabber/jabber.c:674
 msgid "Register New Jabber Account"
 msgstr "Register New Jabber Account"
 
-#. connect to the server
-#: src/protocols/jabber/jabber.c:800 src/protocols/msn/msn.c:697
-#: src/protocols/napster/napster.c:510 src/protocols/novell/novell.c:2163
-#: src/protocols/oscar/oscar.c:1761 src/protocols/trepia/trepia.c:1067
-#: src/protocols/yahoo/yahoo.c:2503 src/protocols/zephyr/zephyr.c:1492
-msgid "Connecting"
-msgstr "Connecting"
-
-#: src/protocols/jabber/jabber.c:804
+#: src/protocols/jabber/jabber.c:805
 msgid "Initializing Stream"
 msgstr "Initializing Stream"
 
-#: src/protocols/jabber/jabber.c:810
+#: src/protocols/jabber/jabber.c:811 src/protocols/msn/session.c:344
 msgid "Authenticating"
 msgstr "Authenticating"
 
-#: src/protocols/jabber/jabber.c:819
+#: src/protocols/jabber/jabber.c:820
 msgid "Re-initializing Stream"
 msgstr "Re-initializing Stream"
 
-#: src/protocols/jabber/jabber.c:891 src/protocols/jabber/jabber.c:1201
-#: src/protocols/jabber/jabber.c:1242 src/protocols/jabber/jabber.c:1275
-#: src/protocols/oscar/oscar.c:737 src/protocols/oscar/oscar.c:6670
+#: src/protocols/jabber/jabber.c:892 src/protocols/jabber/jabber.c:1208
+#: src/protocols/jabber/jabber.c:1249 src/protocols/jabber/jabber.c:1282
+#: src/protocols/oscar/oscar.c:753 src/protocols/oscar/oscar.c:6811
 msgid "Not Authorized"
 msgstr "Not Authorized"
 
-#: src/protocols/jabber/jabber.c:924
+#: src/protocols/jabber/jabber.c:925
 msgid "Both"
 msgstr "Both"
 
-#: src/protocols/jabber/jabber.c:926
+#: src/protocols/jabber/jabber.c:927
 msgid "From (To pending)"
 msgstr "From (To pending)"
 
-#: src/protocols/jabber/jabber.c:928
+#: src/protocols/jabber/jabber.c:929
 msgid "From"
 msgstr "From"
 
-#: src/protocols/jabber/jabber.c:931
+#: src/protocols/jabber/jabber.c:932
 msgid "To"
 msgstr "To"
 
-#: src/protocols/jabber/jabber.c:933
+#: src/protocols/jabber/jabber.c:934
 msgid "None (To pending)"
 msgstr "None (To pending)"
 
-#: src/protocols/jabber/jabber.c:937
+#: src/protocols/jabber/jabber.c:938
 msgid "Subscription"
 msgstr "Subscription"
 
-#: src/protocols/jabber/jabber.c:975 src/protocols/jabber/jabber.c:981
-#: src/protocols/jabber/jabber.c:987 src/protocols/jabber/jabber.c:993
-#: src/protocols/jabber/jabber.c:999
+#: src/protocols/jabber/jabber.c:976 src/protocols/jabber/jabber.c:982
+#: src/protocols/jabber/jabber.c:988 src/protocols/jabber/jabber.c:994
+#: src/protocols/jabber/jabber.c:1000 src/protocols/jabber/jabber.c:1006
 msgid "Priority"
 msgstr "Priority"
 
-#: src/protocols/jabber/jabber.c:1021
+#: src/protocols/jabber/jabber.c:1028
 msgid "Password Changed"
 msgstr "Password Changed"
 
-#: src/protocols/jabber/jabber.c:1022
+#: src/protocols/jabber/jabber.c:1029
 msgid "Your password has been changed."
 msgstr "Your password has been changed."
 
-#: src/protocols/jabber/jabber.c:1026 src/protocols/jabber/jabber.c:1027
+#: src/protocols/jabber/jabber.c:1033 src/protocols/jabber/jabber.c:1034
 msgid "Error changing password"
 msgstr "Error changing password"
 
-#: src/protocols/jabber/jabber.c:1083
+#: src/protocols/jabber/jabber.c:1090
 msgid "Password (again)"
 msgstr "Password (again)"
 
-#: src/protocols/jabber/jabber.c:1088 src/protocols/jabber/jabber.c:1089
+#: src/protocols/jabber/jabber.c:1095 src/protocols/jabber/jabber.c:1096
 msgid "Change Jabber Password"
 msgstr "Change Jabber Password"
 
-#: src/protocols/jabber/jabber.c:1089
+#: src/protocols/jabber/jabber.c:1096
 msgid "Please enter your new password"
 msgstr "Please enter your new password"
 
-#: src/protocols/jabber/jabber.c:1099 src/protocols/toc/toc.c:1561
+#: src/protocols/jabber/jabber.c:1106 src/protocols/toc/toc.c:1567
 msgid "Set User Info"
 msgstr "Set User Info"
 
-#: src/protocols/jabber/jabber.c:1181
+#: src/protocols/jabber/jabber.c:1188
 msgid "Bad Request"
 msgstr "Bad Request"
 
-#: src/protocols/jabber/jabber.c:1183
+#: src/protocols/jabber/jabber.c:1190
 msgid "Conflict"
 msgstr "Conflict"
 
-#: src/protocols/jabber/jabber.c:1185
+#: src/protocols/jabber/jabber.c:1192
 msgid "Feature Not Implemented"
 msgstr "Feature Not Implemented"
 
-#: src/protocols/jabber/jabber.c:1187
+#: src/protocols/jabber/jabber.c:1194
 msgid "Forbidden"
 msgstr "Forbidden"
 
-#: src/protocols/jabber/jabber.c:1189
+#: src/protocols/jabber/jabber.c:1196
 msgid "Gone"
 msgstr "Gone"
 
-#: src/protocols/jabber/jabber.c:1191 src/protocols/jabber/jabber.c:1265
+#: src/protocols/jabber/jabber.c:1198 src/protocols/jabber/jabber.c:1272
 msgid "Internal Server Error"
 msgstr "Internal Server Error"
 
-#: src/protocols/jabber/jabber.c:1193
+#: src/protocols/jabber/jabber.c:1200
 msgid "Item Not Found"
 msgstr "Item Not Found"
 
-#: src/protocols/jabber/jabber.c:1195
+#: src/protocols/jabber/jabber.c:1202
 msgid "Malformed Jabber ID"
 msgstr "Malformed Jabber ID"
 
-#: src/protocols/jabber/jabber.c:1197
+#: src/protocols/jabber/jabber.c:1204
 msgid "Not Acceptable"
 msgstr "Not Acceptable"
 
-#: src/protocols/jabber/jabber.c:1199
+#: src/protocols/jabber/jabber.c:1206
 msgid "Not Allowed"
 msgstr "Not Allowed"
 
-#: src/protocols/jabber/jabber.c:1203
+#: src/protocols/jabber/jabber.c:1210
 msgid "Payment Required"
 msgstr "Payment Required"
 
-#: src/protocols/jabber/jabber.c:1205
+#: src/protocols/jabber/jabber.c:1212
 msgid "Recipient Unavailable"
 msgstr "Recipient Unavailable"
 
-#: src/protocols/jabber/jabber.c:1209
+#: src/protocols/jabber/jabber.c:1216
 msgid "Registration Required"
 msgstr "Registration Required"
 
-#: src/protocols/jabber/jabber.c:1211
+#: src/protocols/jabber/jabber.c:1218
 msgid "Remote Server Not Found"
 msgstr "Remote Server Not Found"
 
-#: src/protocols/jabber/jabber.c:1213
+#: src/protocols/jabber/jabber.c:1220
 msgid "Remote Server Timeout"
 msgstr "Remote Server Timeout"
 
-#: src/protocols/jabber/jabber.c:1215
+#: src/protocols/jabber/jabber.c:1222
 msgid "Server Overloaded"
 msgstr "Server Overloaded"
 
-#: src/protocols/jabber/jabber.c:1217
+#: src/protocols/jabber/jabber.c:1224
 msgid "Service Unavailable"
 msgstr "Service Unavailable"
 
-#: src/protocols/jabber/jabber.c:1219
+#: src/protocols/jabber/jabber.c:1226
 msgid "Subscription Required"
 msgstr "Subscription Required"
 
-#: src/protocols/jabber/jabber.c:1221
+#: src/protocols/jabber/jabber.c:1228
 msgid "Unexpected Request"
 msgstr "Unexpected Request"
 
-#: src/protocols/jabber/jabber.c:1228
+#: src/protocols/jabber/jabber.c:1235
 msgid "Authorization Aborted"
 msgstr "Authorization Aborted"
 
-#: src/protocols/jabber/jabber.c:1230
+#: src/protocols/jabber/jabber.c:1237
 msgid "Incorrect encoding in authorization"
 msgstr "Incorrect encoding in authorization"
 
-#: src/protocols/jabber/jabber.c:1233
+#: src/protocols/jabber/jabber.c:1240
 msgid "Invalid authzid"
 msgstr "Invalid authzid"
 
-#: src/protocols/jabber/jabber.c:1236
+#: src/protocols/jabber/jabber.c:1243
 msgid "Invalid Authorization Mechanism"
 msgstr "Invalid Authorization Mechanism"
 
-#: src/protocols/jabber/jabber.c:1239
+#: src/protocols/jabber/jabber.c:1246
 msgid "Authorization mechanism too weak"
 msgstr "Authorization mechanism too weak"
 
-#: src/protocols/jabber/jabber.c:1244
+#: src/protocols/jabber/jabber.c:1251
 msgid "Temporary Authentication Failure"
 msgstr "Temporary Authentication Failure"
 
-#: src/protocols/jabber/jabber.c:1246
+#: src/protocols/jabber/jabber.c:1253
 msgid "Authentication Failure"
 msgstr "Authentication Failure"
 
-#: src/protocols/jabber/jabber.c:1250
+#: src/protocols/jabber/jabber.c:1257
 msgid "Bad Format"
 msgstr "Bad Format"
 
-#: src/protocols/jabber/jabber.c:1252
+#: src/protocols/jabber/jabber.c:1259
 msgid "Bad Namespace Prefix"
 msgstr "Bad Namespace Prefix"
 
-#: src/protocols/jabber/jabber.c:1255
+#: src/protocols/jabber/jabber.c:1262
 msgid "Resource Conflict"
 msgstr "Resource Conflict"
 
-#: src/protocols/jabber/jabber.c:1257 src/protocols/silc/ops.c:1509
+#: src/protocols/jabber/jabber.c:1264 src/protocols/silc/ops.c:1509
 msgid "Connection Timeout"
 msgstr "Connection Timeout"
 
-#: src/protocols/jabber/jabber.c:1259
+#: src/protocols/jabber/jabber.c:1266
 msgid "Host Gone"
 msgstr "Host Gone"
 
-#: src/protocols/jabber/jabber.c:1261
+#: src/protocols/jabber/jabber.c:1268
 msgid "Host Unknown"
 msgstr "Host Unknown"
 
-#: src/protocols/jabber/jabber.c:1263
+#: src/protocols/jabber/jabber.c:1270
 msgid "Improper Addressing"
 msgstr "Improper Addressing"
 
-#: src/protocols/jabber/jabber.c:1267
+#: src/protocols/jabber/jabber.c:1274
 msgid "Invalid ID"
 msgstr "Invalid ID"
 
-#: src/protocols/jabber/jabber.c:1269
+#: src/protocols/jabber/jabber.c:1276
 msgid "Invalid Namespace"
 msgstr "Invalid Namespace"
 
-#: src/protocols/jabber/jabber.c:1271
+#: src/protocols/jabber/jabber.c:1278
 msgid "Invalid XML"
 msgstr "Invalid XML"
 
-#: src/protocols/jabber/jabber.c:1273
+#: src/protocols/jabber/jabber.c:1280
 msgid "Non-matching Hosts"
 msgstr "Non-matching Hosts"
 
-#: src/protocols/jabber/jabber.c:1277
+#: src/protocols/jabber/jabber.c:1284
 msgid "Policy Violation"
 msgstr "Policy Violation"
 
-#: src/protocols/jabber/jabber.c:1279
+#: src/protocols/jabber/jabber.c:1286
 msgid "Remote Connection Failed"
 msgstr "Remote Connection Failed"
 
-#: src/protocols/jabber/jabber.c:1281
+#: src/protocols/jabber/jabber.c:1288
 msgid "Resource Constraint"
 msgstr "Resource Constraint"
 
-#: src/protocols/jabber/jabber.c:1283
+#: src/protocols/jabber/jabber.c:1290
 msgid "Restricted XML"
 msgstr "Restricted XML"
 
-#: src/protocols/jabber/jabber.c:1285
+#: src/protocols/jabber/jabber.c:1292
 msgid "See Other Host"
 msgstr "See Other Host"
 
-#: src/protocols/jabber/jabber.c:1287
+#: src/protocols/jabber/jabber.c:1294
 msgid "System Shutdown"
 msgstr "System Shutdown"
 
-#: src/protocols/jabber/jabber.c:1289
+#: src/protocols/jabber/jabber.c:1296
 msgid "Undefined Condition"
 msgstr "Undefined Condition"
 
-#: src/protocols/jabber/jabber.c:1291
+#: src/protocols/jabber/jabber.c:1298
 msgid "Unsupported Encoding"
 msgstr "Unsupported Encoding"
 
-#: src/protocols/jabber/jabber.c:1293
+#: src/protocols/jabber/jabber.c:1300
 msgid "Unsupported Stanza Type"
 msgstr "Unsupported Stanza Type"
 
-#: src/protocols/jabber/jabber.c:1295
+#: src/protocols/jabber/jabber.c:1302
 msgid "Unsupported Version"
 msgstr "Unsupported Version"
 
-#: src/protocols/jabber/jabber.c:1297
+#: src/protocols/jabber/jabber.c:1304
 msgid "XML Not Well Formed"
 msgstr "XML Not Well Formed"
 
-#: src/protocols/jabber/jabber.c:1299
+#: src/protocols/jabber/jabber.c:1306
 msgid "Stream Error"
 msgstr "Stream Error"
 
-#: src/protocols/jabber/jabber.c:1366
+#: src/protocols/jabber/jabber.c:1373
 #, c-format
 msgid "Unable to ban user %s"
 msgstr "Unable to ban user %s"
 
-#: src/protocols/jabber/jabber.c:1418
+#: src/protocols/jabber/jabber.c:1425
 #, c-format
 msgid "Unable to kick user %s"
 msgstr "Unable to kick user %s"
 
-#: src/protocols/jabber/jabber.c:1444
+#: src/protocols/jabber/jabber.c:1451
 msgid "config:  Configure a chat room."
 msgstr "config:  Configure a chat room."
 
-#: src/protocols/jabber/jabber.c:1448
+#: src/protocols/jabber/jabber.c:1455
 msgid "configure:  Configure a chat room."
 msgstr "configure:  Configure a chat room."
 
-#: src/protocols/jabber/jabber.c:1457
+#: src/protocols/jabber/jabber.c:1464
 msgid "part [room]:  Leave the room."
 msgstr "part [room]:  Leave the room."
 
-#: src/protocols/jabber/jabber.c:1462
+#: src/protocols/jabber/jabber.c:1469
 msgid "register:  Register with a chat room."
 msgstr "register:  Register with a chat room."
 
-#: src/protocols/jabber/jabber.c:1468
+#: src/protocols/jabber/jabber.c:1475
 msgid "topic [new topic]:  View or change the topic."
 msgstr "topic [new topic]:  View or change the topic."
 
-#: src/protocols/jabber/jabber.c:1474
+#: src/protocols/jabber/jabber.c:1481
 msgid "ban &lt;user&gt; [room]:  Ban a user from the room."
 msgstr "ban &lt;user&gt; [room]:  Ban a user from the room."
 
-#: src/protocols/jabber/jabber.c:1480
+#: src/protocols/jabber/jabber.c:1487
 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:1486
+#: src/protocols/jabber/jabber.c:1493
 msgid "join: &lt;room&gt; [server]:  Join a chat on this server."
 msgstr "join: &lt;room&gt; [server]:  Join a chat on this server."
 
-#: src/protocols/jabber/jabber.c:1492
+#: src/protocols/jabber/jabber.c:1499
 msgid "kick &lt;user&gt; [room]:  Kick a user from the room."
 msgstr "kick &lt;user&gt; [room]:  Kick a user from the room."
 
-#: src/protocols/jabber/jabber.c:1497
+#: src/protocols/jabber/jabber.c:1504
 msgid ""
 "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
 msgstr ""
 "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
 
-#: src/protocols/jabber/jabber.c:1512
-msgid "Hide Operating System"
-msgstr "Hide Operating System"
-
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -6333,52 +6350,52 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/jabber/jabber.c:1599 src/protocols/jabber/jabber.c:1601
+#: src/protocols/jabber/jabber.c:1585 src/protocols/jabber/jabber.c:1587
 msgid "Jabber Protocol Plugin"
 msgstr "Jabber Protocol Plugin"
 
-#: src/protocols/jabber/jabber.c:1627
+#: src/protocols/jabber/jabber.c:1613
 msgid "Use TLS if available"
 msgstr "Use TLS if available"
 
-#: src/protocols/jabber/jabber.c:1632
+#: src/protocols/jabber/jabber.c:1618
 msgid "Force old SSL"
 msgstr "Force old SSL"
 
-#: src/protocols/jabber/jabber.c:1637
+#: src/protocols/jabber/jabber.c:1623
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Allow plaintext auth over unencrypted streams"
 
 #. Account options
-#: src/protocols/jabber/jabber.c:1646 src/protocols/silc/silc.c:1600
+#: src/protocols/jabber/jabber.c:1632 src/protocols/silc/silc.c:1589
 msgid "Connect server"
 msgstr "Connect server"
 
-#: src/protocols/jabber/message.c:111
+#: src/protocols/jabber/message.c:114
 #, c-format
 msgid "Message from %s"
 msgstr "Message from %s"
 
-#: src/protocols/jabber/message.c:175
+#: src/protocols/jabber/message.c:178
 #, c-format
 msgid "%s has set the topic to: %s"
 msgstr "%s has set the topic to: %s"
 
-#: src/protocols/jabber/message.c:177
+#: src/protocols/jabber/message.c:180
 #, c-format
 msgid "The topic is: %s"
 msgstr "The topic is: %s"
 
-#: src/protocols/jabber/message.c:230
+#: src/protocols/jabber/message.c:233
 #, c-format
 msgid "Message delivery to %s failed: %s"
 msgstr "Message delivery to %s failed: %s"
 
-#: src/protocols/jabber/message.c:233
+#: src/protocols/jabber/message.c:236
 msgid "Jabber Message Error"
 msgstr "Jabber Message Error"
 
-#: src/protocols/jabber/message.c:297
+#: src/protocols/jabber/message.c:300
 #, c-format
 msgid " (Code %s)"
 msgstr " (Code %s)"
@@ -6387,30 +6404,30 @@
 msgid "XML Parse error"
 msgstr "XML Parse error"
 
-#: src/protocols/jabber/presence.c:255
+#: src/protocols/jabber/presence.c:264
 msgid "Unknown Error in presence"
 msgstr "Unknown Error in presence"
 
-#: src/protocols/jabber/presence.c:258
+#: src/protocols/jabber/presence.c:267
 #, c-format
 msgid "The user %s wants to add you to their buddy list."
 msgstr "The user %s wants to add you to their buddy list."
 
-#: src/protocols/jabber/presence.c:264 src/protocols/msn/userlist.c:102
-#: src/protocols/oscar/oscar.c:3733 src/protocols/oscar/oscar.c:6300
+#: src/protocols/jabber/presence.c:273 src/protocols/msn/userlist.c:102
+#: src/protocols/oscar/oscar.c:3850 src/protocols/oscar/oscar.c:6461
 msgid "Authorize"
 msgstr "Authorize"
 
-#: src/protocols/jabber/presence.c:265 src/protocols/msn/userlist.c:103
-#: src/protocols/oscar/oscar.c:3735 src/protocols/oscar/oscar.c:6301
+#: src/protocols/jabber/presence.c:274 src/protocols/msn/userlist.c:103
+#: src/protocols/oscar/oscar.c:3852 src/protocols/oscar/oscar.c:6462
 msgid "Deny"
 msgstr "Deny"
 
-#: src/protocols/jabber/presence.c:312 src/protocols/jabber/presence.c:313
+#: src/protocols/jabber/presence.c:321 src/protocols/jabber/presence.c:322
 msgid "Create New Room"
 msgstr "Create New Room"
 
-#: src/protocols/jabber/presence.c:314
+#: src/protocols/jabber/presence.c:323
 msgid ""
 "You are creating a new room.  Would you like to configure it, or accept the "
 "default settings?"
@@ -6418,20 +6435,20 @@
 "You are creating a new room.  Would you like to configure it, or accept the "
 "default settings?"
 
-#: src/protocols/jabber/presence.c:316
+#: src/protocols/jabber/presence.c:325
 msgid "Configure Room"
 msgstr "Configure Room"
 
-#: src/protocols/jabber/presence.c:318
+#: src/protocols/jabber/presence.c:327
 msgid "Accept Defaults"
 msgstr "Accept Defaults"
 
-#: src/protocols/jabber/presence.c:355
+#: src/protocols/jabber/presence.c:364
 #, c-format
 msgid "Error in chat %s"
 msgstr "Error in chat %s"
 
-#: src/protocols/jabber/presence.c:358
+#: src/protocols/jabber/presence.c:367
 #, c-format
 msgid "Error joining chat %s"
 msgstr "Error joining chat %s"
@@ -6445,17 +6462,28 @@
 msgid "File Send Failed"
 msgstr "File Send Failed"
 
-#: src/protocols/msn/cmdproc.c:358
-msgid "Miscellaneous error"
-msgstr "Miscellaneous error"
-
-#: src/protocols/msn/cmdproc.c:361
-msgid "You have signed on from another location."
-msgstr "You have signed on from another location."
-
-#: src/protocols/msn/cmdproc.c:363
-msgid "The MSN servers are going down temporarily."
-msgstr "The MSN servers are going down temporarily."
+#: src/protocols/msn/dialog.c:91
+#, c-format
+msgid "Buddy list synchronization issue in %s (%s)"
+msgstr "Buddy list synchronization issue in %s (%s)"
+
+#: src/protocols/msn/dialog.c:97
+#, c-format
+msgid ""
+"%s on the local list is inside the group \"%s\" but not on the server list. "
+"Do you want this buddy to be added?"
+msgstr ""
+"%s on the local list is inside the group \"%s\" but not on the server list. "
+"Do you want this buddy to be added?"
+
+#: src/protocols/msn/dialog.c:105
+#, c-format
+msgid ""
+"%s is on the local list but not on the server list. Do you want this buddy "
+"to be added?"
+msgstr ""
+"%s is on the local list but not on the server list. Do you want this buddy "
+"to be added?"
 
 #: src/protocols/msn/error.c:35
 msgid "Unable to parse message"
@@ -6553,7 +6581,7 @@
 msgid "Too many hits to a FND"
 msgstr "Too many hits to a FND"
 
-#: src/protocols/msn/error.c:112 src/protocols/oscar/oscar.c:194
+#: src/protocols/msn/error.c:112 src/protocols/oscar/oscar.c:197
 msgid "Not logged in"
 msgstr "Not logged in"
 
@@ -6646,7 +6674,7 @@
 msgid "Server too busy"
 msgstr "Server too busy"
 
-#: src/protocols/msn/error.c:198 src/protocols/oscar/oscar.c:2194
+#: src/protocols/msn/error.c:198 src/protocols/oscar/oscar.c:2258
 #: src/protocols/silc/ops.c:1498 src/protocols/toc/toc.c:631
 msgid "Authentication failed"
 msgstr "Authentication failed"
@@ -6681,35 +6709,35 @@
 msgid "MSN Error: %s\n"
 msgstr "MSN Error: %s\n"
 
-#: src/protocols/msn/msn.c:116
+#: src/protocols/msn/msn.c:114
 msgid "Your new MSN friendly name is too long."
 msgstr "Your new MSN friendly name is too long."
 
-#: src/protocols/msn/msn.c:224
+#: src/protocols/msn/msn.c:222
 msgid "Set your friendly name."
 msgstr "Set your friendly name."
 
-#: src/protocols/msn/msn.c:225
+#: src/protocols/msn/msn.c:223
 msgid "This is the name that other MSN buddies will see you as."
 msgstr "This is the name that other MSN buddies will see you as."
 
-#: src/protocols/msn/msn.c:241
+#: src/protocols/msn/msn.c:239
 msgid "Set your home phone number."
 msgstr "Set your home phone number."
 
-#: src/protocols/msn/msn.c:256
+#: src/protocols/msn/msn.c:254
 msgid "Set your work phone number."
 msgstr "Set your work phone number."
 
-#: src/protocols/msn/msn.c:271
+#: src/protocols/msn/msn.c:269
 msgid "Set your mobile phone number."
 msgstr "Set your mobile phone number."
 
-#: src/protocols/msn/msn.c:284
+#: src/protocols/msn/msn.c:282
 msgid "Allow MSN Mobile pages?"
 msgstr "Allow MSN Mobile pages?"
 
-#: src/protocols/msn/msn.c:285
+#: src/protocols/msn/msn.c:283
 msgid ""
 "Do you want to allow or disallow people on your buddy list to send you MSN "
 "Mobile pages to your cell phone or other mobile device?"
@@ -6717,24 +6745,24 @@
 "Do you want to allow or disallow people on your buddy list to send you MSN "
 "Mobile pages to your cell phone or other mobile device?"
 
-#: src/protocols/msn/msn.c:289
+#: src/protocols/msn/msn.c:287
 msgid "Allow"
 msgstr "Allow"
 
-#: src/protocols/msn/msn.c:290
+#: src/protocols/msn/msn.c:288
 msgid "Disallow"
 msgstr "Disallow"
 
+#: src/protocols/msn/msn.c:311
+msgid "Send a mobile message."
+msgstr "Send a mobile message."
+
 #: src/protocols/msn/msn.c:313
-msgid "Send a mobile message."
-msgstr "Send a mobile message."
-
-#: src/protocols/msn/msn.c:315
 msgid "Page"
 msgstr "Page"
 
-#: src/protocols/msn/msn.c:505 src/protocols/msn/msn.c:512
-#: src/protocols/msn/msn.c:515 src/protocols/yahoo/yahoo.c:2774
+#: src/protocols/msn/msn.c:502 src/protocols/msn/msn.c:509
+#: src/protocols/msn/msn.c:512 src/protocols/yahoo/yahoo.c:2533
 #, c-format
 msgid ""
 "\n"
@@ -6743,74 +6771,75 @@
 "\n"
 "<b>%s:</b> %s"
 
-#: src/protocols/msn/msn.c:512
+#: src/protocols/msn/msn.c:509
 msgid "Has you"
 msgstr "Has you"
 
-#: src/protocols/msn/msn.c:515
+#: src/protocols/msn/msn.c:512
 msgid "Blocked"
 msgstr "Blocked"
 
-#: src/protocols/msn/msn.c:546 src/protocols/msn/state.c:33
-#: src/protocols/yahoo/yahoo.c:2631 src/protocols/yahoo/yahoo.c:3139
+#: src/protocols/msn/msn.c:543 src/protocols/msn/state.c:33
+#: src/protocols/yahoo/yahoo.c:2390 src/protocols/yahoo/yahoo.c:2899
 msgid "Be Right Back"
 msgstr "Be Right Back"
 
-#: src/protocols/msn/msn.c:550 src/protocols/msn/state.c:31
+#: src/protocols/msn/msn.c:547 src/protocols/msn/state.c:31
 #: src/protocols/novell/novell.c:2814 src/protocols/novell/novell.c:2929
-#: src/protocols/novell/novell.c:2983 src/protocols/silc/buddy.c:1388
-#: src/protocols/silc/silc.c:54 src/protocols/yahoo/yahoo.c:2633
-#: src/protocols/yahoo/yahoo.c:3142
+#: src/protocols/novell/novell.c:2983 src/protocols/silc/buddy.c:1397
+#: src/protocols/silc/silc.c:54 src/protocols/yahoo/yahoo.c:2392
+#: src/protocols/yahoo/yahoo.c:2902
 msgid "Busy"
 msgstr "Busy"
 
-#: src/protocols/msn/msn.c:554 src/protocols/msn/state.c:35
-#: src/protocols/yahoo/yahoo.c:2641 src/protocols/yahoo/yahoo.c:3154
+#: src/protocols/msn/msn.c:551 src/protocols/msn/state.c:35
+#: src/protocols/yahoo/yahoo.c:2400 src/protocols/yahoo/yahoo.c:2914
 msgid "On The Phone"
 msgstr "On The Phone"
 
-#: src/protocols/msn/msn.c:558 src/protocols/msn/state.c:36
-#: src/protocols/yahoo/yahoo.c:2645 src/protocols/yahoo/yahoo.c:3160
+#: src/protocols/msn/msn.c:555 src/protocols/msn/state.c:36
+#: src/protocols/yahoo/yahoo.c:2404 src/protocols/yahoo/yahoo.c:2920
 msgid "Out To Lunch"
 msgstr "Out To Lunch"
 
-#: src/protocols/msn/msn.c:562 src/protocols/zephyr/zephyr.c:2221
+#: src/protocols/msn/msn.c:559 src/protocols/zephyr/zephyr.c:2221
+#: src/status.c:159
 msgid "Hidden"
 msgstr "Hidden"
 
-#: src/protocols/msn/msn.c:574
+#: src/protocols/msn/msn.c:571
 msgid "Set Friendly Name"
 msgstr "Set Friendly Name"
 
-#: src/protocols/msn/msn.c:579
+#: src/protocols/msn/msn.c:576
 msgid "Set Home Phone Number"
 msgstr "Set Home Phone Number"
 
-#: src/protocols/msn/msn.c:583
+#: src/protocols/msn/msn.c:580
 msgid "Set Work Phone Number"
 msgstr "Set Work Phone Number"
 
-#: src/protocols/msn/msn.c:587
+#: src/protocols/msn/msn.c:584
 msgid "Set Mobile Phone Number"
 msgstr "Set Mobile Phone Number"
 
-#: src/protocols/msn/msn.c:593
+#: src/protocols/msn/msn.c:590
 msgid "Enable/Disable Mobile Devices"
 msgstr "Enable/Disable Mobile Devices"
 
-#: src/protocols/msn/msn.c:598
+#: src/protocols/msn/msn.c:595
 msgid "Allow/Disallow Mobile Pages"
 msgstr "Allow/Disallow Mobile Pages"
 
-#: src/protocols/msn/msn.c:621
+#: src/protocols/msn/msn.c:618
 msgid "Send to Mobile"
 msgstr "Send to Mobile"
 
-#: src/protocols/msn/msn.c:631
-msgid "Initiate Chat"
-msgstr "Initiate Chat"
-
-#: src/protocols/msn/msn.c:667
+#: src/protocols/msn/msn.c:627 src/protocols/novell/novell.c:3380
+msgid "Initiate _Chat"
+msgstr "Initiate _Chat"
+
+#: src/protocols/msn/msn.c:663
 msgid ""
 "SSL support is needed for MSN. Please install a supported SSL library. See "
 "http://gaim.sf.net/faq-ssl.php for more information."
@@ -6818,91 +6847,95 @@
 "SSL support is needed for MSN. Please install a supported SSL library. See "
 "http://gaim.sf.net/faq-ssl.php for more information."
 
-#: src/protocols/msn/msn.c:1339 src/protocols/yahoo/yahoo_profile.c:659
+#: src/protocols/msn/msn.c:691
+msgid "Failed to connect to server."
+msgstr "Failed to connect to server."
+
+#: src/protocols/msn/msn.c:1302 src/protocols/yahoo/yahoo_profile.c:659
 #: src/protocols/zephyr/zephyr.c:712 src/protocols/zephyr/zephyr.c:1126
 #, c-format
 msgid "<b>Alias:</b> %s<br>"
 msgstr "<b>Alias:</b> %s<br>"
 
 #. put a link to the actual profile URL
-#: src/protocols/msn/msn.c:1346 src/protocols/msn/msn.c:1702
-#: src/protocols/yahoo/yahoo_profile.c:1170 src/util.c:782
+#: src/protocols/msn/msn.c:1309 src/protocols/msn/msn.c:1656
+#: src/protocols/yahoo/yahoo_profile.c:1170 src/util.c:783
 #, c-format
 msgid "<b>%s:</b> "
 msgstr "<b>%s:</b> "
 
-#: src/protocols/msn/msn.c:1432
+#: src/protocols/msn/msn.c:1386
 msgid "MSN Profile"
 msgstr "MSN Profile"
 
-#: src/protocols/msn/msn.c:1437 src/protocols/msn/msn.c:1689
+#: src/protocols/msn/msn.c:1391 src/protocols/msn/msn.c:1643
 #: src/protocols/yahoo/yahoo_profile.c:763
 msgid "Error retrieving profile"
 msgstr "Error retrieving profile"
 
 #. Age
-#: src/protocols/msn/msn.c:1508 src/protocols/oscar/oscar.c:5078
+#: src/protocols/msn/msn.c:1462 src/protocols/oscar/oscar.c:5218
 #: src/protocols/trepia/trepia.c:286 src/protocols/trepia/trepia.c:405
 #: src/protocols/yahoo/yahoo_profile.c:1017
 msgid "Age"
 msgstr "Age"
 
 #. Gender
-#: src/protocols/msn/msn.c:1515 src/protocols/oscar/oscar.c:5065
+#: src/protocols/msn/msn.c:1469 src/protocols/oscar/oscar.c:5205
 #: src/protocols/trepia/trepia.c:280 src/protocols/trepia/trepia.c:407
 #: src/protocols/yahoo/yahoo_profile.c:1027
 msgid "Gender"
 msgstr "Gender"
 
-#: src/protocols/msn/msn.c:1524 src/protocols/yahoo/yahoo_profile.c:1022
+#: src/protocols/msn/msn.c:1478 src/protocols/yahoo/yahoo_profile.c:1022
 msgid "Marital Status"
 msgstr "Marital Status"
 
-#: src/protocols/msn/msn.c:1531 src/protocols/novell/novell.c:1454
+#: src/protocols/msn/msn.c:1485 src/protocols/novell/novell.c:1454
 #: src/protocols/yahoo/yahoo_profile.c:1012
 msgid "Location"
 msgstr "Location"
 
-#: src/protocols/msn/msn.c:1539 src/protocols/yahoo/yahoo_profile.c:1032
+#: src/protocols/msn/msn.c:1493 src/protocols/yahoo/yahoo_profile.c:1032
 msgid "Occupation"
 msgstr "Occupation"
 
-#: src/protocols/msn/msn.c:1556 src/protocols/msn/msn.c:1562
-#: src/protocols/msn/msn.c:1569 src/protocols/msn/msn.c:1577
-#: src/protocols/msn/msn.c:1584
+#: src/protocols/msn/msn.c:1510 src/protocols/msn/msn.c:1516
+#: src/protocols/msn/msn.c:1523 src/protocols/msn/msn.c:1531
+#: src/protocols/msn/msn.c:1538
 msgid "A Little About Me"
 msgstr "A Little About Me"
 
-#: src/protocols/msn/msn.c:1593 src/protocols/msn/msn.c:1599
-#: src/protocols/msn/msn.c:1606 src/protocols/msn/msn.c:1613
+#: src/protocols/msn/msn.c:1547 src/protocols/msn/msn.c:1553
+#: src/protocols/msn/msn.c:1560 src/protocols/msn/msn.c:1567
 msgid "Favorite Things"
 msgstr "Favourite Things"
 
-#: src/protocols/msn/msn.c:1622 src/protocols/msn/msn.c:1628
-#: src/protocols/msn/msn.c:1635
+#: src/protocols/msn/msn.c:1576 src/protocols/msn/msn.c:1582
+#: src/protocols/msn/msn.c:1589
 msgid "Hobbies and Interests"
 msgstr "Hobbies and Interests"
 
-#: src/protocols/msn/msn.c:1644 src/protocols/msn/msn.c:1650
+#: src/protocols/msn/msn.c:1598 src/protocols/msn/msn.c:1604
 #: src/protocols/yahoo/yahoo_profile.c:1074
 msgid "Favorite Quote"
 msgstr "Favuorite Quote"
 
-#: src/protocols/msn/msn.c:1658 src/protocols/yahoo/yahoo_profile.c:1125
+#: src/protocols/msn/msn.c:1612 src/protocols/yahoo/yahoo_profile.c:1125
 msgid "Last Updated"
 msgstr "Last Updated"
 
 #. Homepage
-#: src/protocols/msn/msn.c:1669 src/protocols/silc/ops.c:846
+#: src/protocols/msn/msn.c:1623 src/protocols/silc/ops.c:846
 #: src/protocols/trepia/trepia.c:290 src/protocols/trepia/trepia.c:420
 msgid "Homepage"
 msgstr "Homepage"
 
-#: src/protocols/msn/msn.c:1691
+#: src/protocols/msn/msn.c:1645
 msgid "The user has not created a public profile."
 msgstr "The user has not created a public profile."
 
-#: src/protocols/msn/msn.c:1692
+#: src/protocols/msn/msn.c:1646
 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 "
@@ -6912,7 +6945,7 @@
 "that the user does not exist, or that the user exists but has not created a "
 "public profile."
 
-#: src/protocols/msn/msn.c:1696
+#: src/protocols/msn/msn.c:1650
 msgid ""
 "Gaim could not find any information in the user's profile. The user most "
 "likely does not exist."
@@ -6920,18 +6953,10 @@
 "Gaim could not find any information in the user's profile. The user most "
 "likely does not exist."
 
-#: src/protocols/msn/msn.c:1702 src/protocols/yahoo/yahoo_profile.c:1170
+#: src/protocols/msn/msn.c:1656 src/protocols/yahoo/yahoo_profile.c:1170
 msgid "Profile URL"
 msgstr "Profile URL"
 
-#: src/protocols/msn/msn.c:1843
-msgid "Display conversation closed notices"
-msgstr "Display conversation closed notices"
-
-#: src/protocols/msn/msn.c:1848
-msgid "Display timeout notices"
-msgstr "Display timeout notices"
-
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -6942,49 +6967,72 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/msn/msn.c:1935 src/protocols/msn/msn.c:1937
+#: src/protocols/msn/msn.c:1861 src/protocols/msn/msn.c:1863
 msgid "MSN Protocol Plugin"
 msgstr "MSN Protocol Plugin"
 
-#: src/protocols/msn/msn.c:1956 src/protocols/trepia/trepia.c:1298
+#: src/protocols/msn/msn.c:1882 src/protocols/trepia/trepia.c:1298
 msgid "Login server"
 msgstr "Login server"
 
-#: src/protocols/msn/msn.c:1965
+#: src/protocols/msn/msn.c:1891
 msgid "Use HTTP Method"
 msgstr "Use HTTP Method"
 
-#: src/protocols/msn/nexus.c:79
-msgid "Unable to connect to server"
-msgstr "Unable to connect to server"
-
-#: src/protocols/msn/nexus.c:218
-msgid "Unknown error when attempting to authorize with MSN login server."
-msgstr "Unknown error when attempting to authorize with MSN login server."
-
-#: src/protocols/msn/notification.c:85
-msgid "Requesting to send password"
-msgstr "Requesting to send password"
-
-#: src/protocols/msn/notification.c:119 src/protocols/trepia/trepia.c:636
-msgid "Retrieving buddy list"
-msgstr "Retrieving buddy list"
-
-#: src/protocols/msn/notification.c:145 src/protocols/msn/notification.c:174
-#: src/protocols/oscar/oscar.c:2483
-msgid "Password sent"
-msgstr "Password sent"
-
-#: src/protocols/msn/notification.c:732
-#, c-format
-msgid ""
-"Your MSN buddy list for %s is temporarily unavailable. Please wait and try "
-"again."
-msgstr ""
-"Your MSN buddy list for %s is temporarily unavailable. Please wait and try "
-"again."
-
-#: src/protocols/msn/notification.c:1128
+#: src/protocols/msn/nexus.c:103 src/protocols/msn/servconn.c:127
+#: src/protocols/yahoo/yahoochat.c:1312
+msgid "Unable to connect"
+msgstr "Unable to connect"
+
+#: src/protocols/msn/notification.c:178
+#, c-format
+msgid "%s is not a valid group."
+msgstr "%s is not a valid group."
+
+#: src/protocols/msn/notification.c:184 src/protocols/msn/notification.c:522
+#: src/protocols/msn/session.c:323
+msgid "Unknown error."
+msgstr "Unknown error."
+
+#: src/protocols/msn/notification.c:187
+#, c-format
+msgid "%s on %s (%s)"
+msgstr "%s on %s (%s)"
+
+#: src/protocols/msn/notification.c:492
+#, c-format
+msgid "Unable to add user on %s (%s)"
+msgstr "Unable to add user on %s (%s)"
+
+#: src/protocols/msn/notification.c:496
+#, c-format
+msgid "Unable to block user on %s (%s)"
+msgstr "Unable to block user on %s (%s)"
+
+#: src/protocols/msn/notification.c:500
+#, c-format
+msgid "Unable to permit user on %s (%s)"
+msgstr "Unable to permit user on %s (%s)"
+
+#: src/protocols/msn/notification.c:508
+#, c-format
+msgid "%s could not be added because your buddy list is full."
+msgstr "%s could not be added because your buddy list is full."
+
+#: src/protocols/msn/notification.c:517
+#, c-format
+msgid "%s is not a valid passport account."
+msgstr "%s is not a valid passport account."
+
+#: src/protocols/msn/notification.c:774
+msgid "Unable to rename group"
+msgstr "Unable to rename group"
+
+#: src/protocols/msn/notification.c:829
+msgid "Unable to delete group"
+msgstr "Unable to delete group"
+
+#: src/protocols/msn/notification.c:1232
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -7015,69 +7063,118 @@
 "After the maintenance has been completed, you will be able to successfully "
 "sign in."
 
-#: src/protocols/msn/servconn.c:93
-#, c-format
-msgid "Unable to connect to %s server"
-msgstr "Unable to connect to %s server"
-
-#: src/protocols/msn/servconn.c:97
-#, c-format
-msgid "Error writing to %s server"
-msgstr "Error writing to %s server"
-
-#: src/protocols/msn/servconn.c:101
-#, c-format
-msgid "Error reading from %s server"
-msgstr "Error reading from %s server"
-
-#: src/protocols/msn/servconn.c:105
-#, c-format
-msgid "Unknown error from %s server"
-msgstr "Unknown error from %s server"
-
-#: src/protocols/msn/servconn.c:334
-msgid "Received HTTP error. Please report this."
-msgstr "Received HTTP error. Please report this."
+#: src/protocols/msn/servconn.c:129
+msgid "Writing error"
+msgstr "Writing error"
+
+#: src/protocols/msn/servconn.c:131
+msgid "Reading error"
+msgstr "Reading error"
+
+#: src/protocols/msn/servconn.c:133 src/protocols/msn/session.c:315
+#: src/protocols/oscar/oscar.c:4173
+msgid "Unknown error"
+msgstr "Unknown error"
+
+#: src/protocols/msn/servconn.c:136
+#, c-format
+msgid ""
+"Connection error from %s server (%s):\n"
+"%s"
+msgstr ""
+"Connection error from %s server (%s):\n"
+"%s"
+
+#: src/protocols/msn/session.c:293
+msgid "Our protocol is not supported by the server."
+msgstr "Our protocol is not supported by the server."
+
+#: src/protocols/msn/session.c:297
+msgid "Error parsing HTTP."
+msgstr "Error parsing HTTP."
+
+#: src/protocols/msn/session.c:301
+msgid "You have signed on from another location."
+msgstr "You have signed on from another location."
+
+#: src/protocols/msn/session.c:304
+msgid "The MSN servers are temporarily unavailable. Please wait and try again."
+msgstr "The MSN servers are temporarily unavailable. Please wait and try again."
+
+#: src/protocols/msn/session.c:309
+msgid "The MSN servers are going down temporarily."
+msgstr "The MSN servers are going down temporarily."
+
+#: src/protocols/msn/session.c:313
+#, c-format
+msgid "Unable to authenticate: %s"
+msgstr "Unable to authenticate: %s"
+
+#: src/protocols/msn/session.c:318
+msgid ""
+"Your MSN buddy list is temporarily unavailable. Please wait and try again."
+msgstr ""
+"Your MSN buddy list is temporarily unavailable. Please wait and try again."
+
+#: src/protocols/msn/session.c:339 src/protocols/msn/session.c:341
+msgid "Handshaking"
+msgstr "Handshaking"
+
+#: src/protocols/msn/session.c:340
+msgid "Transferring"
+msgstr "Transferring"
+
+#: src/protocols/msn/session.c:342
+msgid "Starting authentication"
+msgstr "Starting authentication"
+
+#: src/protocols/msn/session.c:343
+msgid "Getting cookie"
+msgstr "Getting cookie"
+
+#: src/protocols/msn/session.c:345
+msgid "Sending cookie"
+msgstr "Sending cookie"
+
+#: src/protocols/msn/session.c:346 src/protocols/trepia/trepia.c:636
+msgid "Retrieving buddy list"
+msgstr "Retrieving buddy list"
 
 #: src/protocols/msn/state.c:34
 msgid "Away From Computer"
 msgstr "Away From Computer"
 
-#: src/protocols/msn/switchboard.c:197
-msgid "The conversation has become inactive and timed out."
-msgstr "The conversation has become inactive and timed out."
-
-#: src/protocols/msn/switchboard.c:216
+#: src/protocols/msn/switchboard.c:377
+msgid "Message may have not been sent because a timeout occurred:"
+msgstr "Message may have not been sent because a timeout occurred:"
+
+#: src/protocols/msn/switchboard.c:385
+msgid "Message could not be sent, not allowed while invisible:"
+msgstr "Message could not be sent; not allowed while invisible:"
+
+#: src/protocols/msn/switchboard.c:389
+msgid "Message could not be sent because the user is offline:"
+msgstr "Message could not be sent because the user is offline:"
+
+#: src/protocols/msn/switchboard.c:393
+msgid "Message could not be sent because a connection error occurred:"
+msgstr "Message could not be sent because a connection error occurred:"
+
+#: src/protocols/msn/switchboard.c:397
+msgid ""
+"Message could not be sent because an error with the switchboard occurred:"
+msgstr ""
+"Message could not be sent because an error with the switchboard occurred:"
+
+#: src/protocols/msn/switchboard.c:405
+msgid "Message may have not been sent because an unknown error occurred:"
+msgstr "Message may have not been sent because an unknown error occurred:"
+
+#: src/protocols/msn/switchboard.c:647
 #, c-format
 msgid "%s has closed the conversation window."
 msgstr "%s has closed the conversation window."
 
-#: src/protocols/msn/switchboard.c:485
-msgid "Message could not be sent, not allowed while invisible"
-msgstr "Message could not be sent: not allowed while invisible"
-
-#: src/protocols/msn/switchboard.c:488
-msgid "Message could not be sent because the user is offline"
-msgstr "Message could not be sent because the user is offline"
-
-#: src/protocols/msn/switchboard.c:491
-msgid "Message could not be sent because a connection error occured"
-msgstr "Message could not be sent because a connection error occurred"
-
-#: src/protocols/msn/switchboard.c:494
-#, fuzzy
-msgid "Message could not be sent for an unknown reason"
-msgstr "Message could not be sent for an unknown reason"
-
-#: src/protocols/msn/switchboard.c:499
-#, c-format
-msgid ""
-"%s:\n"
-"%s"
-msgstr ""
-"%s:\n"
-"%s"
-
 #: src/protocols/msn/userlist.c:86
 #, c-format
 msgid "The user %s (%s) wants to add %s to his or her buddy list."
@@ -7133,7 +7230,7 @@
 msgid "%s requested a PING"
 msgstr "%s requested a PING"
 
-#: src/protocols/napster/napster.c:573 src/protocols/toc/toc.c:1275
+#: src/protocols/napster/napster.c:573 src/protocols/toc/toc.c:1277
 msgid "_Group:"
 msgstr "_Group:"
 
@@ -7389,8 +7486,8 @@
 msgid "Mailstop"
 msgstr "Mailstop"
 
-#: src/protocols/novell/novell.c:1464 src/protocols/oscar/oscar.c:5051
-#: src/protocols/oscar/oscar.c:5058
+#: src/protocols/novell/novell.c:1464 src/protocols/oscar/oscar.c:5191
+#: src/protocols/oscar/oscar.c:5198
 msgid "Email Address"
 msgstr "Email Address"
 
@@ -7494,10 +7591,6 @@
 msgid "Appear Offline"
 msgstr "Appear Offline"
 
-#: src/protocols/novell/novell.c:3380
-msgid "Initiate _Chat"
-msgstr "Initiate _Chat"
-
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -7520,103 +7613,103 @@
 msgid "Server port"
 msgstr "Server port"
 
-#: src/protocols/oscar/oscar.c:190
+#: src/protocols/oscar/oscar.c:193
 msgid "Invalid error"
 msgstr "Invalid error"
 
-#: src/protocols/oscar/oscar.c:191
+#: src/protocols/oscar/oscar.c:194
 msgid "Invalid SNAC"
 msgstr "Invalid SNAC"
 
-#: src/protocols/oscar/oscar.c:192
+#: src/protocols/oscar/oscar.c:195
 msgid "Rate to host"
 msgstr "Rate to host"
 
-#: src/protocols/oscar/oscar.c:193
+#: src/protocols/oscar/oscar.c:196
 msgid "Rate to client"
 msgstr "Rate to client"
 
-#: src/protocols/oscar/oscar.c:195
+#: src/protocols/oscar/oscar.c:198
 msgid "Service unavailable"
 msgstr "Service unavailable"
 
-#: src/protocols/oscar/oscar.c:196
+#: src/protocols/oscar/oscar.c:199
 msgid "Service not defined"
 msgstr "Service not defined"
 
-#: src/protocols/oscar/oscar.c:197
+#: src/protocols/oscar/oscar.c:200
 msgid "Obsolete SNAC"
 msgstr "Obsolete SNAC"
 
-#: src/protocols/oscar/oscar.c:198
+#: src/protocols/oscar/oscar.c:201
 msgid "Not supported by host"
 msgstr "Not supported by host"
 
-#: src/protocols/oscar/oscar.c:199
+#: src/protocols/oscar/oscar.c:202
 msgid "Not supported by client"
 msgstr "Not supported by client"
 
-#: src/protocols/oscar/oscar.c:200
-msgid "Refused by client"
-msgstr "Refused by client"
-
-#: src/protocols/oscar/oscar.c:201
-msgid "Reply too big"
-msgstr "Reply too big"
-
-#: src/protocols/oscar/oscar.c:202
-msgid "Responses lost"
-msgstr "Responses lost"
-
 #: src/protocols/oscar/oscar.c:203
-msgid "Request denied"
-msgstr "Request denied"
+msgid "Refused by client"
+msgstr "Refused by client"
 
 #: src/protocols/oscar/oscar.c:204
+msgid "Reply too big"
+msgstr "Reply too big"
+
+#: src/protocols/oscar/oscar.c:205
+msgid "Responses lost"
+msgstr "Responses lost"
+
+#: src/protocols/oscar/oscar.c:206
+msgid "Request denied"
+msgstr "Request denied"
+
+#: src/protocols/oscar/oscar.c:207
 msgid "Busted SNAC payload"
 msgstr "Busted SNAC payload"
 
-#: src/protocols/oscar/oscar.c:205
+#: src/protocols/oscar/oscar.c:208
 msgid "Insufficient rights"
 msgstr "Insufficient rights"
 
-#: src/protocols/oscar/oscar.c:206
-msgid "In local permit/deny"
-msgstr "In local permit/deny"
-
-#: src/protocols/oscar/oscar.c:207
-msgid "Too evil (sender)"
-msgstr "Too evil (sender)"
-
-#: src/protocols/oscar/oscar.c:208
-msgid "Too evil (receiver)"
-msgstr "Too evil (receiver)"
-
 #: src/protocols/oscar/oscar.c:209
-msgid "User temporarily unavailable"
-msgstr "User temporarily unavailable"
+msgid "In local permit/deny"
+msgstr "In local permit/deny"
 
 #: src/protocols/oscar/oscar.c:210
-msgid "No match"
-msgstr "No match"
+msgid "Too evil (sender)"
+msgstr "Too evil (sender)"
 
 #: src/protocols/oscar/oscar.c:211
-msgid "List overflow"
-msgstr "List overflow"
+msgid "Too evil (receiver)"
+msgstr "Too evil (receiver)"
 
 #: src/protocols/oscar/oscar.c:212
+msgid "User temporarily unavailable"
+msgstr "User temporarily unavailable"
+
+#: src/protocols/oscar/oscar.c:213
+msgid "No match"
+msgstr "No match"
+
+#: src/protocols/oscar/oscar.c:214
+msgid "List overflow"
+msgstr "List overflow"
+
+#: src/protocols/oscar/oscar.c:215
 msgid "Request ambiguous"
 msgstr "Request ambiguous"
 
-#: src/protocols/oscar/oscar.c:213
+#: src/protocols/oscar/oscar.c:216
 msgid "Queue full"
 msgstr "Queue full"
 
-#: src/protocols/oscar/oscar.c:214
+#: src/protocols/oscar/oscar.c:217
 msgid "Not while on AOL"
 msgstr "Not while on AOL"
 
-#: src/protocols/oscar/oscar.c:401 src/protocols/oscar/oscar.c:484
+#: src/protocols/oscar/oscar.c:406 src/protocols/oscar/oscar.c:489
 msgid ""
 "(There was an error receiving this message.  The buddy you are speaking to "
 "most likely has a buggy client.)"
@@ -7624,154 +7717,154 @@
 "(There was an error receiving this message.  The buddy you are speaking to "
 "most likely has a buggy client.)"
 
-#: src/protocols/oscar/oscar.c:586
+#: src/protocols/oscar/oscar.c:600
 msgid "Voice"
 msgstr "Voice"
 
-#: src/protocols/oscar/oscar.c:589
+#: src/protocols/oscar/oscar.c:603
 msgid "AIM Direct IM"
 msgstr "AIM Direct IM"
 
-#: src/protocols/oscar/oscar.c:592 src/protocols/silc/silc.c:660
+#: src/protocols/oscar/oscar.c:606 src/protocols/silc/silc.c:649
 #: src/protocols/silc/util.c:506
 msgid "Chat"
 msgstr "Chat"
 
-#: src/protocols/oscar/oscar.c:595 src/protocols/oscar/oscar.c:7017
+#: src/protocols/oscar/oscar.c:609 src/protocols/oscar/oscar.c:7158
 msgid "Get File"
 msgstr "Get File"
 
-#: src/protocols/oscar/oscar.c:602
+#: src/protocols/oscar/oscar.c:616
 msgid "Games"
 msgstr "Games"
 
-#: src/protocols/oscar/oscar.c:605
+#: src/protocols/oscar/oscar.c:619
 msgid "Add-Ins"
 msgstr "Add-Ins"
 
-#: src/protocols/oscar/oscar.c:608
+#: src/protocols/oscar/oscar.c:622
 msgid "Send Buddy List"
 msgstr "Send Buddy List"
 
-#: src/protocols/oscar/oscar.c:611
+#: src/protocols/oscar/oscar.c:625
 msgid "ICQ Direct Connect"
 msgstr "ICQ Direct Connect"
 
-#: src/protocols/oscar/oscar.c:614
+#: src/protocols/oscar/oscar.c:628
 msgid "AP User"
 msgstr "AP User"
 
-#: src/protocols/oscar/oscar.c:617
+#: src/protocols/oscar/oscar.c:631
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
-#: src/protocols/oscar/oscar.c:620
+#: src/protocols/oscar/oscar.c:634
 msgid "Nihilist"
 msgstr "Nihilist"
 
-#: src/protocols/oscar/oscar.c:623
+#: src/protocols/oscar/oscar.c:637
 msgid "ICQ Server Relay"
 msgstr "ICQ Server Relay"
 
-#: src/protocols/oscar/oscar.c:626
+#: src/protocols/oscar/oscar.c:640
 msgid "Old ICQ UTF8"
 msgstr "Old ICQ UTF8"
 
-#: src/protocols/oscar/oscar.c:629
+#: src/protocols/oscar/oscar.c:643
 msgid "Trillian Encryption"
 msgstr "Trillian Encryption"
 
-#: src/protocols/oscar/oscar.c:632
+#: src/protocols/oscar/oscar.c:646
 msgid "ICQ UTF8"
 msgstr "ICQ UTF8"
 
-#: src/protocols/oscar/oscar.c:635
+#: src/protocols/oscar/oscar.c:649
 msgid "Hiptop"
 msgstr "Hiptop"
 
-#: src/protocols/oscar/oscar.c:638
+#: src/protocols/oscar/oscar.c:652
 msgid "Security Enabled"
 msgstr "Security Enabled"
 
-#: src/protocols/oscar/oscar.c:641
+#: src/protocols/oscar/oscar.c:655
 msgid "Video Chat"
 msgstr "Video Chat"
 
-#: src/protocols/oscar/oscar.c:645
+#: src/protocols/oscar/oscar.c:659
 msgid "iChat AV"
 msgstr "iChat AV"
 
-#: src/protocols/oscar/oscar.c:648
+#: src/protocols/oscar/oscar.c:662
 msgid "Live Video"
 msgstr "Live Video"
 
-#: src/protocols/oscar/oscar.c:651
+#: src/protocols/oscar/oscar.c:665
 msgid "Camera"
 msgstr "Camera"
 
-#: src/protocols/oscar/oscar.c:669 src/protocols/oscar/oscar.c:6900
+#: src/protocols/oscar/oscar.c:683 src/protocols/oscar/oscar.c:7041
 msgid "Free For Chat"
 msgstr "Free For Chat"
 
-#: src/protocols/oscar/oscar.c:673 src/protocols/oscar/oscar.c:6915
+#: src/protocols/oscar/oscar.c:687 src/protocols/oscar/oscar.c:7056
 msgid "Not Available"
 msgstr "Not Available"
 
-#: src/protocols/oscar/oscar.c:675 src/protocols/oscar/oscar.c:6905
+#: src/protocols/oscar/oscar.c:689 src/protocols/oscar/oscar.c:7046
 msgid "Occupied"
 msgstr "Occupied"
 
-#: src/protocols/oscar/oscar.c:679
+#: src/protocols/oscar/oscar.c:693
 msgid "Web Aware"
 msgstr "Web Aware"
 
-#: src/protocols/oscar/oscar.c:755
+#: src/protocols/oscar/oscar.c:771
 msgid "Capabilities"
 msgstr "Capabilities"
 
-#: src/protocols/oscar/oscar.c:764
+#: src/protocols/oscar/oscar.c:780
 msgid "Buddy Comment"
 msgstr "Buddy Comment"
 
-#: src/protocols/oscar/oscar.c:899
+#: src/protocols/oscar/oscar.c:937
 #, c-format
 msgid "Direct IM with %s closed"
 msgstr "Direct IM with %s closed"
 
-#: src/protocols/oscar/oscar.c:901
+#: src/protocols/oscar/oscar.c:939
 #, c-format
 msgid "Direct IM with %s failed"
 msgstr "Direct IM with %s failed"
 
-#: src/protocols/oscar/oscar.c:909
+#: src/protocols/oscar/oscar.c:947
 msgid "Direct Connect failed"
 msgstr "Direct Connect failed"
 
-#: src/protocols/oscar/oscar.c:986 src/protocols/oscar/oscar.c:1117
+#: src/protocols/oscar/oscar.c:1024 src/protocols/oscar/oscar.c:1155
 #, c-format
 msgid "Direct IM with %s established"
 msgstr "Direct IM with %s established"
 
-#: src/protocols/oscar/oscar.c:1067
+#: src/protocols/oscar/oscar.c:1105
 #, c-format
 msgid "Attempting to connect to %s at %s:%hu for Direct IM."
 msgstr "Attempting to connect to %s at %s:%hu for Direct IM."
 
-#: src/protocols/oscar/oscar.c:1485
+#: src/protocols/oscar/oscar.c:1531
 #, c-format
 msgid "Asking %s to connect to us at %s:%hu for Direct IM."
 msgstr "Asking %s to connect to us at %s:%hu for Direct IM."
 
-#: src/protocols/oscar/oscar.c:1490
+#: src/protocols/oscar/oscar.c:1536
 msgid "Unable to open Direct IM"
 msgstr "Unable to open Direct IM"
 
-#: src/protocols/oscar/oscar.c:1525
+#: src/protocols/oscar/oscar.c:1571
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr "You have selected to open a Direct IM connection with %s."
 
-#: src/protocols/oscar/oscar.c:1529
+#: src/protocols/oscar/oscar.c:1575
 msgid ""
 "Because this reveals your IP address, it may be considered a privacy risk.  "
 "Do you wish to continue?"
@@ -7779,24 +7872,24 @@
 "Because this reveals your IP address, it may be considered a privacy risk.  "
 "Do you wish to continue?"
 
-#: src/protocols/oscar/oscar.c:1533 src/protocols/oscar/oscar.c:3490
+#: src/protocols/oscar/oscar.c:1579 src/protocols/oscar/oscar.c:3607
 msgid "Connect"
 msgstr "Connect"
 
-#: src/protocols/oscar/oscar.c:1600 src/protocols/toc/toc.c:881
-#, c-format
-msgid "You have been disconnected from chat room %s."
-msgstr "You have been disconnected from chat room %s."
-
-#: src/protocols/oscar/oscar.c:1619
+#: src/protocols/oscar/oscar.c:1643
+#, c-format
+msgid "You have lost your connection to chat room %s."
+msgstr "You have lost your connection to chat room %s."
+
+#: src/protocols/oscar/oscar.c:1666
 msgid "Chat is currently unavailable"
 msgstr "Chat is currently unavailable"
 
-#: src/protocols/oscar/oscar.c:1700
+#: src/protocols/oscar/oscar.c:1747
 msgid "Screen name sent"
 msgstr "Screen name sent"
 
-#: src/protocols/oscar/oscar.c:1714
+#: src/protocols/oscar/oscar.c:1771
 #, c-format
 msgid ""
 "Unable to login: Could not sign on as %s because the screen name is "
@@ -7807,46 +7900,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:1745
+#: src/protocols/oscar/oscar.c:1801
 msgid "Unable to login to AIM"
 msgstr "Unable to login to AIM"
 
-#: src/protocols/oscar/oscar.c:1848 src/protocols/oscar/oscar.c:2286
+#: src/protocols/oscar/oscar.c:1905 src/protocols/oscar/oscar.c:2350
 msgid "Could Not Connect"
 msgstr "Could Not Connect"
 
-#: src/protocols/oscar/oscar.c:1856
+#: src/protocols/oscar/oscar.c:1913
 msgid "Connection established, cookie sent"
 msgstr "Connection established, cookie sent"
 
-#: src/protocols/oscar/oscar.c:1969 src/protocols/yahoo/yahoo_filexfer.c:180
-#: src/protocols/yahoo/yahoo_filexfer.c:189
-#: src/protocols/yahoo/yahoo_filexfer.c:199
+#: src/protocols/oscar/oscar.c:2026 src/protocols/yahoo/yahoo_filexfer.c:179
+#: src/protocols/yahoo/yahoo_filexfer.c:188
+#: src/protocols/yahoo/yahoo_filexfer.c:198
 msgid "Unable to establish file descriptor."
 msgstr "Unable to establish file descriptor."
 
-#: src/protocols/oscar/oscar.c:1974
+#: src/protocols/oscar/oscar.c:2031
 msgid "Unable to create new connection."
 msgstr "Unable to create new connection."
 
-#: src/protocols/oscar/oscar.c:2046
+#: src/protocols/oscar/oscar.c:2110
 msgid "Unable to establish listener socket."
 msgstr "Unable to establish listener socket."
 
-#: src/protocols/oscar/oscar.c:2171 src/protocols/toc/toc.c:542
+#: src/protocols/oscar/oscar.c:2235 src/protocols/toc/toc.c:542
 msgid "Incorrect nickname or password."
 msgstr "Incorrect nickname or password."
 
-#: src/protocols/oscar/oscar.c:2176
+#: src/protocols/oscar/oscar.c:2240
 msgid "Your account is currently suspended."
 msgstr "Your account is currently suspended."
 
 #. service temporarily unavailable
-#: src/protocols/oscar/oscar.c:2180
+#: src/protocols/oscar/oscar.c:2244
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "The AOL Instant Messenger service is temporarily unavailable."
 
-#: src/protocols/oscar/oscar.c:2185
+#: src/protocols/oscar/oscar.c:2249
 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."
@@ -7854,21 +7947,33 @@
 "You have been connecting and disconnecting too frequently. Wait ten minutes "
 "and try again. If you continue to try, you will need to wait even longer."
 
-#: src/protocols/oscar/oscar.c:2190
+#: src/protocols/oscar/oscar.c:2254
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr "The client version you are using is too old. Please upgrade at %s"
 
-#: src/protocols/oscar/oscar.c:2221
+#: src/protocols/oscar/oscar.c:2285
 msgid "Internal Error"
 msgstr "Internal Error"
 
-#: src/protocols/oscar/oscar.c:2293
+#: src/protocols/oscar/oscar.c:2357
 msgid "Received authorization"
 msgstr "Received authorization"
 
-#: src/protocols/oscar/oscar.c:2329 src/protocols/oscar/oscar.c:2359
-#: src/protocols/oscar/oscar.c:2448
+#: src/protocols/oscar/oscar.c:2381
+msgid "The SecurID key entered is invalid."
+msgstr "The SecurID key entered is invalid."
+
+#: src/protocols/oscar/oscar.c:2395
+msgid "Enter SecurID"
+msgstr "Enter SecurID"
+
+#: src/protocols/oscar/oscar.c:2396
+msgid "Enter the 6 digit number from the digital display."
+msgstr "Enter the 6 digit number from the digital display."
+
+#: src/protocols/oscar/oscar.c:2436 src/protocols/oscar/oscar.c:2466
+#: src/protocols/oscar/oscar.c:2555
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
@@ -7877,20 +7982,24 @@
 "You may be disconnected shortly.  You may want to use TOC until this is "
 "fixed.  Check %s for updates."
 
-#: src/protocols/oscar/oscar.c:2332 src/protocols/oscar/oscar.c:2362
+#: src/protocols/oscar/oscar.c:2439 src/protocols/oscar/oscar.c:2469
 msgid "Gaim was unable to get a valid AIM login hash."
 msgstr "Gaim was unable to get a valid AIM login hash."
 
-#: src/protocols/oscar/oscar.c:2451
+#: src/protocols/oscar/oscar.c:2558
 msgid "Gaim was unable to get a valid login hash."
 msgstr "Gaim was unable to get a valid login hash."
 
-#: src/protocols/oscar/oscar.c:3481
+#: src/protocols/oscar/oscar.c:2590
+msgid "Password sent"
+msgstr "Password sent"
+
+#: src/protocols/oscar/oscar.c:3598
 #, c-format
 msgid "%s has just asked to directly connect to %s"
 msgstr "%s has just asked to directly connect to %s"
 
-#: src/protocols/oscar/oscar.c:3484
+#: src/protocols/oscar/oscar.c:3601
 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 "
@@ -7900,19 +8009,19 @@
 "for IM Images.  Because your IP address will be revealed, this may be "
 "considered a privacy risk."
 
-#: src/protocols/oscar/oscar.c:3523
+#: src/protocols/oscar/oscar.c:3640
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr "Please authorize me so I can add you to my buddy list."
 
-#: src/protocols/oscar/oscar.c:3531
+#: src/protocols/oscar/oscar.c:3648
 msgid "Authorization Request Message:"
 msgstr "Authorization Request Message:"
 
-#: src/protocols/oscar/oscar.c:3532
+#: src/protocols/oscar/oscar.c:3649
 msgid "Please authorize me!"
 msgstr "Please authorize me!"
 
-#: src/protocols/oscar/oscar.c:3562
+#: src/protocols/oscar/oscar.c:3679
 #, c-format
 msgid ""
 "The user %s requires authorization before being added to a buddy list.  Do "
@@ -7921,22 +8030,22 @@
 "The user %s requires authorization before being added to a buddy list.  Do "
 "you want to send an authorization request?"
 
-#: src/protocols/oscar/oscar.c:3567 src/protocols/oscar/oscar.c:3569
+#: src/protocols/oscar/oscar.c:3684 src/protocols/oscar/oscar.c:3686
 msgid "Request Authorization"
 msgstr "Request Authorization"
 
-#: src/protocols/oscar/oscar.c:3617 src/protocols/oscar/oscar.c:3619
-#: src/protocols/oscar/oscar.c:3626 src/protocols/oscar/oscar.c:3723
-#: src/protocols/oscar/oscar.c:3743 src/protocols/oscar/oscar.c:6292
-#: src/protocols/oscar/oscar.c:6338
+#: src/protocols/oscar/oscar.c:3734 src/protocols/oscar/oscar.c:3736
+#: src/protocols/oscar/oscar.c:3743 src/protocols/oscar/oscar.c:3840
+#: src/protocols/oscar/oscar.c:3860 src/protocols/oscar/oscar.c:6453
+#: src/protocols/oscar/oscar.c:6499
 msgid "No reason given."
 msgstr "No reason given."
 
-#: src/protocols/oscar/oscar.c:3625
+#: src/protocols/oscar/oscar.c:3742
 msgid "Authorization Denied Message:"
 msgstr "Authorization Denied Message:"
 
-#: src/protocols/oscar/oscar.c:3723
+#: src/protocols/oscar/oscar.c:3840
 #, c-format
 msgid ""
 "The user %u wants to add you to their buddy list for the following reason:\n"
@@ -7945,11 +8054,11 @@
 "The user %u wants to add you to their buddy list for the following reason:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3731 src/protocols/oscar/oscar.c:6298
+#: src/protocols/oscar/oscar.c:3848 src/protocols/oscar/oscar.c:6459
 msgid "Authorization Request"
 msgstr "Authorization Request"
 
-#: src/protocols/oscar/oscar.c:3743
+#: src/protocols/oscar/oscar.c:3860
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -7960,17 +8069,17 @@
 "following reason:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3744
+#: src/protocols/oscar/oscar.c:3861
 msgid "ICQ authorization denied."
 msgstr "ICQ authorization denied."
 
 #. Someone has granted you authorization
-#: src/protocols/oscar/oscar.c:3751
+#: src/protocols/oscar/oscar.c:3868
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
 msgstr "The user %u has granted your request to add them to your buddy list."
 
-#: src/protocols/oscar/oscar.c:3759
+#: src/protocols/oscar/oscar.c:3876
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -7983,7 +8092,7 @@
 "From: %s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3767
+#: src/protocols/oscar/oscar.c:3884
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -7996,7 +8105,7 @@
 "From: %s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3775
+#: src/protocols/oscar/oscar.c:3892
 #, c-format
 msgid ""
 "You have received an ICQ email from %s [%s]\n"
@@ -8009,34 +8118,34 @@
 "Message is:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3796
+#: src/protocols/oscar/oscar.c:3913
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
 msgstr "ICQ user %u has sent you a buddy: %s (%s)"
 
-#: src/protocols/oscar/oscar.c:3802
+#: src/protocols/oscar/oscar.c:3919
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr "Do you want to add this buddy to your buddy list?"
 
-#: src/protocols/oscar/oscar.c:3806
+#: src/protocols/oscar/oscar.c:3923
 msgid "Decline"
 msgstr "Decline"
 
-#: src/protocols/oscar/oscar.c:3890
+#: src/protocols/oscar/oscar.c:4007
 #, c-format
 msgid "You missed %hu message from %s because it was invalid."
 msgid_plural "You missed %hu messages from %s because they were invalid."
 msgstr[0] "You missed %hu message from %s because it was invalid."
 msgstr[1] "You missed %hu messages from %s because they were invalid."
 
-#: src/protocols/oscar/oscar.c:3899
+#: src/protocols/oscar/oscar.c:4016
 #, c-format
 msgid "You missed %hu message from %s because it was too large."
 msgid_plural "You missed %hu messages from %s because they were too large."
 msgstr[0] "You missed %hu message from %s because it was too large."
 msgstr[1] "You missed %hu messages from %s because they were too large."
 
-#: src/protocols/oscar/oscar.c:3908
+#: src/protocols/oscar/oscar.c:4025
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -8047,86 +8156,82 @@
 msgstr[1] ""
 "You missed %hu messages from %s because the rate limit has been exceeded."
 
-#: src/protocols/oscar/oscar.c:3917
+#: src/protocols/oscar/oscar.c:4034
 #, c-format
 msgid "You missed %hu message from %s because he/she was too evil."
 msgid_plural "You missed %hu messages from %s because he/she was too evil."
 msgstr[0] "You missed %hu message from %s because he/she was too evil."
 msgstr[1] "You missed %hu messages from %s because he/she was too evil."
 
-#: src/protocols/oscar/oscar.c:3926
+#: src/protocols/oscar/oscar.c:4043
 #, c-format
 msgid "You missed %hu message from %s because you are too evil."
 msgid_plural "You missed %hu messages from %s because you are too evil."
 msgstr[0] "You missed %hu message from %s because you are too evil."
 msgstr[1] "You missed %hu messages from %s because you are too evil."
 
-#: src/protocols/oscar/oscar.c:3935
+#: src/protocols/oscar/oscar.c:4052
 #, c-format
 msgid "You missed %hu message from %s for an unknown reason."
 msgid_plural "You missed %hu messages from %s for an unknown reason."
 msgstr[0] "You missed %hu message from %s for an unknown reason."
 msgstr[1] "You missed %hu messages from %s for an unknown reason."
 
-#: src/protocols/oscar/oscar.c:3989 src/protocols/oscar/oscar.c:4222
+#: src/protocols/oscar/oscar.c:4106 src/protocols/oscar/oscar.c:4340
 #: src/protocols/silc/ops.c:1087 src/protocols/silc/ops.c:1149
 #, c-format
 msgid "Info for %s"
 msgstr "Info for %s"
 
-#: src/protocols/oscar/oscar.c:4055
+#: src/protocols/oscar/oscar.c:4172
 #, c-format
 msgid "SNAC threw error: %s\n"
 msgstr "SNAC threw error: %s\n"
 
-#: src/protocols/oscar/oscar.c:4056
-msgid "Unknown error"
-msgstr "Unknown error"
-
 #. Data is assumed to be the destination sn
-#: src/protocols/oscar/oscar.c:4092
+#: src/protocols/oscar/oscar.c:4209
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "Unable to send message: %s"
 
-#: src/protocols/oscar/oscar.c:4092 src/protocols/oscar/oscar.c:4097
-#: src/protocols/oscar/oscar.c:4155 src/protocols/oscar/oscar.c:4159
+#: src/protocols/oscar/oscar.c:4209 src/protocols/oscar/oscar.c:4214
+#: src/protocols/oscar/oscar.c:4272 src/protocols/oscar/oscar.c:4276
 msgid "Unknown reason."
 msgstr "Unknown reason."
 
-#: src/protocols/oscar/oscar.c:4095
+#: src/protocols/oscar/oscar.c:4212
 #, c-format
 msgid "Unable to send message to %s:"
 msgstr "Unable to send message to %s:"
 
-#: src/protocols/oscar/oscar.c:4155
+#: src/protocols/oscar/oscar.c:4272
 #, c-format
 msgid "User information not available: %s"
 msgstr "User information not available: %s"
 
-#: src/protocols/oscar/oscar.c:4158
+#: src/protocols/oscar/oscar.c:4275
 #, c-format
 msgid "User information for %s unavailable:"
 msgstr "User information for %s unavailable:"
 
-#: src/protocols/oscar/oscar.c:4180
+#: src/protocols/oscar/oscar.c:4298
 msgid "Warning Level"
 msgstr "Warning Level"
 
-#: src/protocols/oscar/oscar.c:4184
+#: src/protocols/oscar/oscar.c:4302
 msgid "Online Since"
 msgstr "Online Since"
 
-#: src/protocols/oscar/oscar.c:4189 src/protocols/yahoo/yahoo_profile.c:1120
+#: src/protocols/oscar/oscar.c:4307 src/protocols/yahoo/yahoo_profile.c:1120
 msgid "Member Since"
 msgstr "Member Since"
 
-#: src/protocols/oscar/oscar.c:4273
+#: src/protocols/oscar/oscar.c:4391
 msgid "Your AIM connection may be lost."
 msgstr "Your AIM connection may be lost."
 
 #. The conversion failed!
-#: src/protocols/oscar/oscar.c:4459
+#: src/protocols/oscar/oscar.c:4577
 msgid ""
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
@@ -8134,11 +8239,11 @@
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
 
-#: src/protocols/oscar/oscar.c:4679
+#: src/protocols/oscar/oscar.c:4797
 msgid "Rate limiting error."
 msgstr "Rate limiting error."
 
-#: src/protocols/oscar/oscar.c:4680
+#: src/protocols/oscar/oscar.c:4798
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
@@ -8146,7 +8251,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:4747
+#: src/protocols/oscar/oscar.c:4867
 msgid ""
 "You have been disconnected because you have signed on with this screen name "
 "at another location."
@@ -8154,105 +8259,107 @@
 "You have been disconnected because you have signed on with this screen name "
 "at another location."
 
-#: src/protocols/oscar/oscar.c:4749
+#: src/protocols/oscar/oscar.c:4869
 msgid "You have been signed off for an unknown reason."
 msgstr "You have been signed off for an unknown reason."
 
-#: src/protocols/oscar/oscar.c:4780
+#: src/protocols/oscar/oscar.c:4882 src/protocols/toc/toc.c:881
+#, 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:4916
 msgid "Finalizing connection"
 msgstr "Finalizing connection"
 
-#: src/protocols/oscar/oscar.c:5063 src/protocols/silc/util.c:538
+#: src/protocols/oscar/oscar.c:5203 src/protocols/silc/util.c:538
 msgid "Mobile Phone"
 msgstr "Mobile Phone"
 
-#: src/protocols/oscar/oscar.c:5065 src/protocols/trepia/trepia.c:282
+#: src/protocols/oscar/oscar.c:5205 src/protocols/trepia/trepia.c:282
 #: src/protocols/trepia/trepia.c:408
 msgid "Female"
 msgstr "Female"
 
-#: src/protocols/oscar/oscar.c:5065 src/protocols/trepia/trepia.c:281
+#: src/protocols/oscar/oscar.c:5205 src/protocols/trepia/trepia.c:281
 #: src/protocols/trepia/trepia.c:408
 msgid "Male"
 msgstr "Male"
 
-#: src/protocols/oscar/oscar.c:5081
+#: src/protocols/oscar/oscar.c:5221
 msgid "Personal Web Page"
 msgstr "Personal Web Page"
 
-#: src/protocols/oscar/oscar.c:5085
+#: src/protocols/oscar/oscar.c:5225
 msgid "Additional Information"
 msgstr "Additional Information"
 
-#: src/protocols/oscar/oscar.c:5090
+#: src/protocols/oscar/oscar.c:5230
 msgid "Home Address"
 msgstr "Home Address"
 
-#: src/protocols/oscar/oscar.c:5094 src/protocols/oscar/oscar.c:5102
+#: src/protocols/oscar/oscar.c:5234 src/protocols/oscar/oscar.c:5242
 msgid "Zip Code"
 msgstr "Postal Code"
 
-#: src/protocols/oscar/oscar.c:5098
+#: src/protocols/oscar/oscar.c:5238
 msgid "Work Address"
 msgstr "Work Address"
 
-#: src/protocols/oscar/oscar.c:5106
+#: src/protocols/oscar/oscar.c:5246
 msgid "Work Information"
 msgstr "Work Information"
 
-#: src/protocols/oscar/oscar.c:5107
+#: src/protocols/oscar/oscar.c:5247
 msgid "Company"
 msgstr "Company"
 
-#: src/protocols/oscar/oscar.c:5108
+#: src/protocols/oscar/oscar.c:5248
 msgid "Division"
 msgstr "Division"
 
-#: src/protocols/oscar/oscar.c:5109
+#: src/protocols/oscar/oscar.c:5249
 msgid "Position"
 msgstr "Position"
 
-#: src/protocols/oscar/oscar.c:5111
+#: src/protocols/oscar/oscar.c:5251
 msgid "Web Page"
 msgstr "Web Page"
 
-#: src/protocols/oscar/oscar.c:5121
+#: src/protocols/oscar/oscar.c:5261
 #, c-format
 msgid "ICQ Info for %s"
 msgstr "ICQ Info for %s"
 
-#: src/protocols/oscar/oscar.c:5170
+#: src/protocols/oscar/oscar.c:5310
 msgid "Pop-Up Message"
 msgstr "Pop-Up Message"
 
-#: src/protocols/oscar/oscar.c:5191
+#. TODO: Need to use ngettext() here
+#: src/protocols/oscar/oscar.c:5332
 #, c-format
 msgid "The following screen names are associated with %s"
 msgstr "The following screen names are associated with %s"
 
-#: src/protocols/oscar/oscar.c:5195
-msgid "Search Results"
-msgstr "Search Results"
-
-#: src/protocols/oscar/oscar.c:5212
+#: src/protocols/oscar/oscar.c:5357
 #, c-format
 msgid "No results found for email address %s"
 msgstr "No results found for email address %s"
 
-#: src/protocols/oscar/oscar.c:5233
+#: src/protocols/oscar/oscar.c:5378
 #, c-format
 msgid "You should receive an email asking to confirm %s."
 msgstr "You should receive an email asking to confirm %s."
 
-#: src/protocols/oscar/oscar.c:5235
+#: src/protocols/oscar/oscar.c:5380
 msgid "Account Confirmation Requested"
 msgstr "Account Confirmation Requested"
 
-#: src/protocols/oscar/oscar.c:5266
+#: src/protocols/oscar/oscar.c:5411
 msgid "Error Changing Account Info"
 msgstr "Error Changing Account Info"
 
-#: src/protocols/oscar/oscar.c:5269
+#: src/protocols/oscar/oscar.c:5414
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -8261,7 +8368,7 @@
 "Error 0x%04x: Unable to format screen name because the requested screen name "
 "differs from the original."
 
-#: src/protocols/oscar/oscar.c:5272
+#: src/protocols/oscar/oscar.c:5417
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -8270,7 +8377,7 @@
 "Error 0x%04x: Unable to format screen name because the requested screen name "
 "ends in a space."
 
-#: src/protocols/oscar/oscar.c:5275
+#: src/protocols/oscar/oscar.c:5420
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -8279,7 +8386,7 @@
 "Error 0x%04x: Unable to format screen name because the requested screen name "
 "is too long."
 
-#: src/protocols/oscar/oscar.c:5278
+#: src/protocols/oscar/oscar.c:5423
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because there is already a "
@@ -8288,7 +8395,7 @@
 "Error 0x%04x: Unable to change email address because there is already a "
 "request pending for this screen name."
 
-#: src/protocols/oscar/oscar.c:5281
+#: src/protocols/oscar/oscar.c:5426
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address has "
@@ -8297,7 +8404,7 @@
 "Error 0x%04x: Unable to change email address because the given address has "
 "too many screen names associated with it."
 
-#: src/protocols/oscar/oscar.c:5284
+#: src/protocols/oscar/oscar.c:5429
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address is "
@@ -8306,12 +8413,12 @@
 "Error 0x%04x: Unable to change email address because the given address is "
 "invalid."
 
-#: src/protocols/oscar/oscar.c:5287
+#: src/protocols/oscar/oscar.c:5432
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "Error 0x%04x: Unknown error."
 
-#: src/protocols/oscar/oscar.c:5297
+#: src/protocols/oscar/oscar.c:5442
 #, c-format
 msgid ""
 "Your screen name is currently formatted as follows:\n"
@@ -8320,26 +8427,26 @@
 "Your screen name is currently formatted as follows:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:5298 src/protocols/oscar/oscar.c:5305
+#: src/protocols/oscar/oscar.c:5443 src/protocols/oscar/oscar.c:5450
 msgid "Account Info"
 msgstr "Account Info"
 
-#: src/protocols/oscar/oscar.c:5303
+#: src/protocols/oscar/oscar.c:5448
 #, c-format
 msgid "The email address for %s is %s"
 msgstr "The email address for %s is %s"
 
-#: src/protocols/oscar/oscar.c:5370
+#: src/protocols/oscar/oscar.c:5515
 msgid ""
 "Your IM Image was not sent. You must be Direct Connected to send IM Images."
 msgstr ""
 "Your IM Image was not sent. You must be Direct Connected to send IM Images."
 
-#: src/protocols/oscar/oscar.c:5505
+#: src/protocols/oscar/oscar.c:5650
 msgid "Unable to set AIM profile."
 msgstr "Unable to set AIM profile."
 
-#: src/protocols/oscar/oscar.c:5506
+#: src/protocols/oscar/oscar.c:5651
 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 "
@@ -8349,7 +8456,7 @@
 "completed.  Your profile remains unset; try setting it again when you are "
 "fully connected."
 
-#: src/protocols/oscar/oscar.c:5533
+#: src/protocols/oscar/oscar.c:5678
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  Gaim has truncated "
@@ -8364,15 +8471,15 @@
 "The maximum profile length of %d bytes has been exceeded.  Gaim has "
 "truncated it for you."
 
-#: src/protocols/oscar/oscar.c:5538
+#: src/protocols/oscar/oscar.c:5683
 msgid "Profile too long."
 msgstr "Profile too long."
 
-#: src/protocols/oscar/oscar.c:5569
+#: src/protocols/oscar/oscar.c:5717
 msgid "Unable to set AIM away message."
 msgstr "Unable to set AIM away message."
 
-#: src/protocols/oscar/oscar.c:5570
+#: src/protocols/oscar/oscar.c:5718
 msgid ""
 "You have probably requested to set your away message before the login "
 "procedure completed.  You remain in a \"present\" state; try setting it "
@@ -8382,7 +8489,7 @@
 "procedure completed.  You remain in a \"present\" state; try setting it "
 "again when you are fully connected."
 
-#: src/protocols/oscar/oscar.c:5615
+#: src/protocols/oscar/oscar.c:5765
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  Gaim has "
@@ -8397,11 +8504,11 @@
 "The maximum away message length of %d bytes has been exceeded.  Gaim has "
 "truncated it for you."
 
-#: src/protocols/oscar/oscar.c:5620
+#: src/protocols/oscar/oscar.c:5770
 msgid "Away message too long."
 msgstr "Away message too long."
 
-#: src/protocols/oscar/oscar.c:5700
+#: src/protocols/oscar/oscar.c:5861
 #, c-format
 msgid ""
 "Could not add the buddy %s because the screen name is invalid.  Screen names "
@@ -8412,16 +8519,16 @@
 "must either start with a letter and contain only letters, numbers and "
 "spaces, or contain only numbers."
 
-#: src/protocols/oscar/oscar.c:5702 src/protocols/oscar/oscar.c:6158
-#: src/protocols/oscar/oscar.c:6172
+#: src/protocols/oscar/oscar.c:5863 src/protocols/oscar/oscar.c:6319
+#: src/protocols/oscar/oscar.c:6333
 msgid "Unable To Add"
 msgstr "Unable To Add"
 
-#: src/protocols/oscar/oscar.c:5864
+#: src/protocols/oscar/oscar.c:6025
 msgid "Unable To Retrieve Buddy List"
 msgstr "Unable To Retrieve Buddy List"
 
-#: src/protocols/oscar/oscar.c:5865
+#: src/protocols/oscar/oscar.c:6026
 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 "
@@ -8431,13 +8538,13 @@
 "servers.  Your buddy list is not lost, and will probably become available in "
 "a few hours."
 
-#: src/protocols/oscar/oscar.c:6049 src/protocols/oscar/oscar.c:6050
-#: src/protocols/oscar/oscar.c:6055 src/protocols/oscar/oscar.c:6216
-#: src/protocols/oscar/oscar.c:6217 src/protocols/oscar/oscar.c:6222
+#: src/protocols/oscar/oscar.c:6210 src/protocols/oscar/oscar.c:6211
+#: src/protocols/oscar/oscar.c:6216 src/protocols/oscar/oscar.c:6377
+#: src/protocols/oscar/oscar.c:6378 src/protocols/oscar/oscar.c:6383
 msgid "Orphans"
 msgstr "Orphans"
 
-#: src/protocols/oscar/oscar.c:6156
+#: src/protocols/oscar/oscar.c:6317
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -8446,11 +8553,11 @@
 "Could not add the buddy %s because you have too many buddies in your buddy "
 "list.  Please remove one and try again."
 
-#: src/protocols/oscar/oscar.c:6156 src/protocols/oscar/oscar.c:6170
+#: src/protocols/oscar/oscar.c:6317 src/protocols/oscar/oscar.c:6331
 msgid "(no name)"
 msgstr "(no name)"
 
-#: src/protocols/oscar/oscar.c:6170
+#: src/protocols/oscar/oscar.c:6331
 #, c-format
 msgid ""
 "Could not add the buddy %s for an unknown reason.  The most common reason "
@@ -8461,7 +8568,7 @@
 "for this is that you have the maximum number of allowed buddies in your "
 "buddy list."
 
-#: src/protocols/oscar/oscar.c:6253
+#: src/protocols/oscar/oscar.c:6414
 #, c-format
 msgid ""
 "The user %s has given you permission to add you to their buddy list.  Do you "
@@ -8470,11 +8577,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:6259
+#: src/protocols/oscar/oscar.c:6420
 msgid "Authorization Given"
 msgstr "Authorization Given"
 
-#: src/protocols/oscar/oscar.c:6292
+#: src/protocols/oscar/oscar.c:6453
 #, c-format
 msgid ""
 "The user %s wants to add you to their buddy list for the following reason:\n"
@@ -8484,17 +8591,17 @@
 "%s"
 
 #. Granted
-#: src/protocols/oscar/oscar.c:6334
+#: src/protocols/oscar/oscar.c:6495
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
 msgstr "The user %s has granted your request to add them to your buddy list."
 
-#: src/protocols/oscar/oscar.c:6335
+#: src/protocols/oscar/oscar.c:6496
 msgid "Authorization Granted"
 msgstr "Authorization Granted"
 
 #. Denied
-#: src/protocols/oscar/oscar.c:6338
+#: src/protocols/oscar/oscar.c:6499
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -8505,76 +8612,92 @@
 "following reason:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:6339
+#: src/protocols/oscar/oscar.c:6500
 msgid "Authorization Denied"
 msgstr "Authorization Denied"
 
-#: src/protocols/oscar/oscar.c:6376 src/protocols/toc/toc.c:1280
+#: src/protocols/oscar/oscar.c:6538 src/protocols/toc/toc.c:1282
 msgid "_Exchange:"
 msgstr "_Exchange:"
 
-#: src/protocols/oscar/oscar.c:6414
+#: src/protocols/oscar/oscar.c:6577
 msgid "Invalid chat name specified."
 msgstr "Invalid chat name specified."
 
-#: src/protocols/oscar/oscar.c:6503
+#: src/protocols/oscar/oscar.c:6644
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 msgstr "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 
-#: src/protocols/oscar/oscar.c:6638
+#: src/protocols/oscar/oscar.c:6779
 msgid "Away Message"
 msgstr "Away Message"
 
-#: src/protocols/oscar/oscar.c:6973
+#: src/protocols/oscar/oscar.c:7114
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "Buddy Comment for %s"
 
-#: src/protocols/oscar/oscar.c:6974
+#: src/protocols/oscar/oscar.c:7115
 msgid "Buddy Comment:"
 msgstr "Buddy Comment:"
 
-#: src/protocols/oscar/oscar.c:6993
+#: src/protocols/oscar/oscar.c:7134
 msgid "Edit Buddy Comment"
 msgstr "Edit Buddy Comment"
 
-#: src/protocols/oscar/oscar.c:6999
+#: src/protocols/oscar/oscar.c:7140
 msgid "Get Status Msg"
 msgstr "Get Status Msg"
 
-#: src/protocols/oscar/oscar.c:7011
+#: src/protocols/oscar/oscar.c:7152
 msgid "Direct IM"
 msgstr "Direct IM"
 
-#: src/protocols/oscar/oscar.c:7028
+#: src/protocols/oscar/oscar.c:7169
 msgid "Re-request Authorization"
 msgstr "Re-request Authorization"
 
-#: src/protocols/oscar/oscar.c:7058
+#: src/protocols/oscar/oscar.c:7229
+msgid "Require authorization"
+msgstr "Require authorization"
+
+#: src/protocols/oscar/oscar.c:7232
+msgid "Hide IP address"
+msgstr "Hide IP address"
+
+#: src/protocols/oscar/oscar.c:7235
+msgid "Web aware"
+msgstr "Web aware"
+
+#: src/protocols/oscar/oscar.c:7240
+msgid "ICQ Privacy Options"
+msgstr "ICQ Privacy Options"
+
+#: src/protocols/oscar/oscar.c:7257
 msgid "The new formatting is invalid."
 msgstr "The new formatting is invalid."
 
-#: src/protocols/oscar/oscar.c:7059
+#: src/protocols/oscar/oscar.c:7258
 msgid "Screen name formatting can change only capitalization and whitespace."
 msgstr "Screen name formatting can change only capitalization and whitespace."
 
-#: src/protocols/oscar/oscar.c:7066
+#: src/protocols/oscar/oscar.c:7265
 msgid "New screen name formatting:"
 msgstr "New screen name formatting:"
 
-#: src/protocols/oscar/oscar.c:7118
+#: src/protocols/oscar/oscar.c:7317
 msgid "Change Address To:"
 msgstr "Change Address To:"
 
-#: src/protocols/oscar/oscar.c:7163
+#: src/protocols/oscar/oscar.c:7362
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>you are not waiting for authorization</i>"
 
-#: src/protocols/oscar/oscar.c:7166
+#: src/protocols/oscar/oscar.c:7365
 msgid "You are awaiting authorization from the following buddies"
 msgstr "You are awaiting authorization from the following buddies"
 
-#: src/protocols/oscar/oscar.c:7167
+#: src/protocols/oscar/oscar.c:7366
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
@@ -8582,71 +8705,77 @@
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
 
-#: src/protocols/oscar/oscar.c:7184
+#: src/protocols/oscar/oscar.c:7383
 msgid "Find Buddy by E-mail"
 msgstr "Find Buddy by E-mail"
 
-#: src/protocols/oscar/oscar.c:7185
+#: src/protocols/oscar/oscar.c:7384
 msgid "Search for a buddy by e-mail address"
 msgstr "Search for a buddy by e-mail address"
 
-#: src/protocols/oscar/oscar.c:7186
+#: src/protocols/oscar/oscar.c:7385
 msgid "Type the e-mail address of the buddy you are searching for."
 msgstr "Type the e-mail address of the buddy you are searching for."
 
-#: src/protocols/oscar/oscar.c:7267 src/protocols/silc/silc.c:814
+#: src/protocols/oscar/oscar.c:7466 src/protocols/silc/silc.c:803
 msgid "Set User Info..."
 msgstr "Set User Info..."
 
-#: src/protocols/oscar/oscar.c:7272
+#: src/protocols/oscar/oscar.c:7472
 msgid "Set User Info (URL)..."
 msgstr "Set User Info (URL)..."
 
-#: src/protocols/oscar/oscar.c:7277 src/protocols/silc/silc.c:810
+#: src/protocols/oscar/oscar.c:7477 src/protocols/silc/silc.c:799
 msgid "Change Password..."
 msgstr "Change Password..."
 
-#: src/protocols/oscar/oscar.c:7282
+#: src/protocols/oscar/oscar.c:7483
 msgid "Change Password (URL)"
 msgstr "Change Password (URL)"
 
-#: src/protocols/oscar/oscar.c:7286
+#: src/protocols/oscar/oscar.c:7487
 msgid "Configure IM Forwarding (URL)"
 msgstr "Configure IM Forwarding (URL)"
 
-#: src/protocols/oscar/oscar.c:7295
+#. ICQ actions
+#: src/protocols/oscar/oscar.c:7497
+msgid "Show privacy options..."
+msgstr "Show privacy options..."
+
+#. AIM actions
+#: src/protocols/oscar/oscar.c:7504
 msgid "Format Screen Name..."
 msgstr "Format Screen Name..."
 
-#: src/protocols/oscar/oscar.c:7299
+#: src/protocols/oscar/oscar.c:7508
 msgid "Confirm Account"
 msgstr "Confirm Account"
 
-#: src/protocols/oscar/oscar.c:7303
+#: src/protocols/oscar/oscar.c:7512
 msgid "Display Currently Registered Address"
 msgstr "Display Currently Registered Address"
 
-#: src/protocols/oscar/oscar.c:7307
+#: src/protocols/oscar/oscar.c:7516
 msgid "Change Currently Registered Address..."
 msgstr "Change Currently Registered Address..."
 
-#: src/protocols/oscar/oscar.c:7314
+#: src/protocols/oscar/oscar.c:7523
 msgid "Show Buddies Awaiting Authorization"
 msgstr "Show Buddies Awaiting Authorization"
 
-#: src/protocols/oscar/oscar.c:7320
+#: src/protocols/oscar/oscar.c:7529
 msgid "Search for Buddy by Email..."
 msgstr "Search for Buddy by Email..."
 
-#: src/protocols/oscar/oscar.c:7325
+#: src/protocols/oscar/oscar.c:7534
 msgid "Search for Buddy by Information"
 msgstr "Search for Buddy by Information"
 
-#: src/protocols/oscar/oscar.c:7394
+#: src/protocols/oscar/oscar.c:7603
 msgid "Use recent buddies group"
 msgstr "Use recent buddies group"
 
-#: src/protocols/oscar/oscar.c:7397
+#: src/protocols/oscar/oscar.c:7606
 msgid "Show how long you have been idle"
 msgstr "Show how long you have been idle"
 
@@ -8660,19 +8789,19 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/oscar/oscar.c:7490 src/protocols/oscar/oscar.c:7492
+#: src/protocols/oscar/oscar.c:7699 src/protocols/oscar/oscar.c:7701
 msgid "AIM/ICQ Protocol Plugin"
 msgstr "AIM/ICQ Protocol Plugin"
 
-#: src/protocols/oscar/oscar.c:7511
+#: src/protocols/oscar/oscar.c:7720
 msgid "Auth host"
 msgstr "Auth host"
 
-#: src/protocols/oscar/oscar.c:7514
+#: src/protocols/oscar/oscar.c:7723
 msgid "Auth port"
 msgstr "Auth port"
 
-#: src/protocols/oscar/oscar.c:7517 src/protocols/zephyr/zephyr.c:2859
+#: src/protocols/oscar/oscar.c:7726 src/protocols/zephyr/zephyr.c:2859
 msgid "Encoding"
 msgstr "Encoding"
 
@@ -8770,12 +8899,12 @@
 msgid "Cannot fetch the public key"
 msgstr "Cannot fetch the public key"
 
-#: src/protocols/silc/buddy.c:629 src/protocols/silc/buddy.c:1549
+#: src/protocols/silc/buddy.c:629 src/protocols/silc/buddy.c:1558
 msgid "Show Public Key"
 msgstr "Show Public Key"
 
 #: src/protocols/silc/buddy.c:630 src/protocols/silc/buddy.c:989
-#: src/protocols/silc/chat.c:234
+#: src/protocols/silc/chat.c:235
 msgid "Could not load public key"
 msgstr "Could not load public key"
 
@@ -8845,213 +8974,213 @@
 "More than one user was found with the same name. Select the correct user "
 "from the list to add to the buddy list."
 
-#: src/protocols/silc/buddy.c:1382
+#: src/protocols/silc/buddy.c:1391
 msgid "Detached"
 msgstr "Detached"
 
-#: src/protocols/silc/buddy.c:1386 src/protocols/silc/silc.c:56
+#: src/protocols/silc/buddy.c:1395 src/protocols/silc/silc.c:56
 msgid "Indisposed"
 msgstr "Indisposed"
 
-#: src/protocols/silc/buddy.c:1390 src/protocols/silc/silc.c:58
+#: src/protocols/silc/buddy.c:1399 src/protocols/silc/silc.c:58
 msgid "Wake Me Up"
 msgstr "Wake Me Up"
 
-#: src/protocols/silc/buddy.c:1392 src/protocols/silc/silc.c:50
+#: src/protocols/silc/buddy.c:1401 src/protocols/silc/silc.c:50
 msgid "Hyper Active"
 msgstr "Hyper Active"
 
-#: src/protocols/silc/buddy.c:1394
+#: src/protocols/silc/buddy.c:1403
 msgid "Robot"
 msgstr "Robot"
 
-#: src/protocols/silc/buddy.c:1401 src/protocols/silc/silc.c:635
+#: src/protocols/silc/buddy.c:1410 src/protocols/silc/silc.c:624
 #: src/protocols/silc/util.c:469
 msgid "Happy"
 msgstr "Happy"
 
-#: src/protocols/silc/buddy.c:1403 src/protocols/silc/silc.c:637
+#: src/protocols/silc/buddy.c:1412 src/protocols/silc/silc.c:626
 #: src/protocols/silc/util.c:471
 msgid "Sad"
 msgstr "Sad"
 
-#: src/protocols/silc/buddy.c:1405 src/protocols/silc/silc.c:639
+#: src/protocols/silc/buddy.c:1414 src/protocols/silc/silc.c:628
 #: src/protocols/silc/util.c:473
 msgid "Angry"
 msgstr "Angry"
 
-#: src/protocols/silc/buddy.c:1407 src/protocols/silc/silc.c:641
+#: src/protocols/silc/buddy.c:1416 src/protocols/silc/silc.c:630
 #: src/protocols/silc/util.c:475
 msgid "Jealous"
 msgstr "Jealous"
 
-#: src/protocols/silc/buddy.c:1409 src/protocols/silc/silc.c:643
+#: src/protocols/silc/buddy.c:1418 src/protocols/silc/silc.c:632
 #: src/protocols/silc/util.c:477
 msgid "Ashamed"
 msgstr "Ashamed"
 
-#: src/protocols/silc/buddy.c:1411 src/protocols/silc/silc.c:645
+#: src/protocols/silc/buddy.c:1420 src/protocols/silc/silc.c:634
 #: src/protocols/silc/util.c:479
 msgid "Invincible"
 msgstr "Invincible"
 
-#: src/protocols/silc/buddy.c:1413 src/protocols/silc/silc.c:647
+#: src/protocols/silc/buddy.c:1422 src/protocols/silc/silc.c:636
 #: src/protocols/silc/util.c:481
 msgid "In Love"
 msgstr "In Love"
 
-#: src/protocols/silc/buddy.c:1415 src/protocols/silc/silc.c:649
+#: src/protocols/silc/buddy.c:1424 src/protocols/silc/silc.c:638
 #: src/protocols/silc/util.c:483
 msgid "Sleepy"
 msgstr "Sleepy"
 
-#: src/protocols/silc/buddy.c:1417 src/protocols/silc/silc.c:651
+#: src/protocols/silc/buddy.c:1426 src/protocols/silc/silc.c:640
 #: src/protocols/silc/util.c:485
 msgid "Bored"
 msgstr "Bored"
 
-#: src/protocols/silc/buddy.c:1419 src/protocols/silc/silc.c:653
+#: src/protocols/silc/buddy.c:1428 src/protocols/silc/silc.c:642
 #: src/protocols/silc/util.c:487
 msgid "Excited"
 msgstr "Excited"
 
-#: src/protocols/silc/buddy.c:1421 src/protocols/silc/silc.c:655
+#: src/protocols/silc/buddy.c:1430 src/protocols/silc/silc.c:644
 #: src/protocols/silc/util.c:489
 msgid "Anxious"
 msgstr "Anxious"
 
-#: src/protocols/silc/buddy.c:1453 src/protocols/silc/ops.c:982
+#: src/protocols/silc/buddy.c:1462 src/protocols/silc/ops.c:982
 msgid "User Modes"
 msgstr "User Modes"
 
-#: src/protocols/silc/buddy.c:1462 src/protocols/silc/ops.c:991
+#: src/protocols/silc/buddy.c:1471 src/protocols/silc/ops.c:991
 msgid "Mood"
 msgstr "Mood"
 
-#: src/protocols/silc/buddy.c:1466 src/protocols/silc/ops.c:997
+#: src/protocols/silc/buddy.c:1475 src/protocols/silc/ops.c:997
 msgid "Status Text"
 msgstr "Status Text"
 
-#: src/protocols/silc/buddy.c:1471 src/protocols/silc/ops.c:1003
+#: src/protocols/silc/buddy.c:1480 src/protocols/silc/ops.c:1003
 msgid "Preferred Contact"
 msgstr "Preferred Contact"
 
-#: src/protocols/silc/buddy.c:1476 src/protocols/silc/ops.c:1008
+#: src/protocols/silc/buddy.c:1485 src/protocols/silc/ops.c:1008
 msgid "Preferred Language"
 msgstr "Preferred Language"
 
-#: src/protocols/silc/buddy.c:1481 src/protocols/silc/ops.c:1013
+#: src/protocols/silc/buddy.c:1490 src/protocols/silc/ops.c:1013
 msgid "Device"
 msgstr "Device"
 
-#: src/protocols/silc/buddy.c:1486 src/protocols/silc/ops.c:1018
-#: src/protocols/silc/silc.c:703 src/protocols/silc/silc.c:705
+#: src/protocols/silc/buddy.c:1495 src/protocols/silc/ops.c:1018
+#: src/protocols/silc/silc.c:692 src/protocols/silc/silc.c:694
 msgid "Timezone"
 msgstr "Time Zone"
 
-#: src/protocols/silc/buddy.c:1491 src/protocols/silc/ops.c:1023
+#: src/protocols/silc/buddy.c:1500 src/protocols/silc/ops.c:1023
 msgid "Geolocation"
 msgstr "Geolocation"
 
-#: src/protocols/silc/buddy.c:1534
+#: src/protocols/silc/buddy.c:1543
 msgid "Reset IM Key"
 msgstr "Reset IM Key"
 
-#: src/protocols/silc/buddy.c:1539
+#: src/protocols/silc/buddy.c:1548
 msgid "IM with Key Exchange"
 msgstr "IM with Key Exchange"
 
-#: src/protocols/silc/buddy.c:1543
+#: src/protocols/silc/buddy.c:1552
 msgid "IM with Password"
 msgstr "IM with Password"
 
-#: src/protocols/silc/buddy.c:1554
+#: src/protocols/silc/buddy.c:1563
 msgid "Get Public Key..."
 msgstr "Get Public Key..."
 
-#: src/protocols/silc/buddy.c:1560 src/protocols/silc/ops.c:1407
+#: src/protocols/silc/buddy.c:1569 src/protocols/silc/ops.c:1407
 msgid "Kill User"
 msgstr "Kill User"
 
-#: src/protocols/silc/chat.c:37
+#: src/protocols/silc/chat.c:38
 msgid "_Passphrase:"
 msgstr "_Passphrase:"
 
-#: src/protocols/silc/chat.c:78
+#: src/protocols/silc/chat.c:79
 #, c-format
 msgid "Channel %s does not exist in the network"
 msgstr "Channel %s does not exist in the network"
 
-#: src/protocols/silc/chat.c:79 src/protocols/silc/chat.c:171
+#: src/protocols/silc/chat.c:80 src/protocols/silc/chat.c:172
 msgid "Channel Information"
 msgstr "Channel Information"
 
-#: src/protocols/silc/chat.c:80
+#: src/protocols/silc/chat.c:81
 msgid "Cannot get channel information"
 msgstr "Cannot get channel information"
 
-#: src/protocols/silc/chat.c:117
+#: src/protocols/silc/chat.c:118
 #, c-format
 msgid "<b>Channel Name:</b> %s"
 msgstr "<b>Channel Name:</b> %s"
 
-#: src/protocols/silc/chat.c:120
+#: src/protocols/silc/chat.c:121
 #, c-format
 msgid "<br><b>User Count:</b> %d"
 msgstr "<br><b>User Count:</b> %d"
 
-#: src/protocols/silc/chat.c:127
+#: src/protocols/silc/chat.c:128
 #, c-format
 msgid "<br><b>Channel Founder:</b> %s"
 msgstr "<br><b>Channel Founder:</b> %s"
 
-#: src/protocols/silc/chat.c:136
+#: src/protocols/silc/chat.c:137
 #, c-format
 msgid "<br><b>Channel Cipher:</b> %s"
 msgstr "<br><b>Channel Cipher:</b> %s"
 
-#: src/protocols/silc/chat.c:139
+#: src/protocols/silc/chat.c:140
 #, c-format
 msgid "<br><b>Channel HMAC:</b> %s"
 msgstr "<br><b>Channel HMAC:</b> %s"
 
-#: src/protocols/silc/chat.c:144
+#: src/protocols/silc/chat.c:145
 #, c-format
 msgid "<br><b>Channel Topic:</b><br>%s"
 msgstr "<br><b>Channel Topic:</b><br>%s"
 
-#: src/protocols/silc/chat.c:149
+#: src/protocols/silc/chat.c:150
 msgid "<br><b>Channel Modes:</b> "
 msgstr "<br><b>Channel Modes:</b> "
 
-#: src/protocols/silc/chat.c:162
+#: src/protocols/silc/chat.c:163
 #, c-format
 msgid "<br><b>Founder Key Fingerprint:</b><br>%s"
 msgstr "<br><b>Founder Key Fingerprint:</b><br>%s"
 
-#: src/protocols/silc/chat.c:163
+#: src/protocols/silc/chat.c:164
 #, c-format
 msgid "<br><b>Founder Key Babbleprint:</b><br>%s"
 msgstr "<br><b>Founder Key Babbleprint:</b><br>%s"
 
-#: src/protocols/silc/chat.c:233
+#: src/protocols/silc/chat.c:234
 msgid "Add Channel Public Key"
 msgstr "Add Channel Public Key"
 
 #. Add new public key
-#: src/protocols/silc/chat.c:288
+#: src/protocols/silc/chat.c:289
 msgid "Open Public Key..."
 msgstr "Open Public Key..."
 
-#: src/protocols/silc/chat.c:397
+#: src/protocols/silc/chat.c:398
 msgid "Channel Passphrase"
 msgstr "Channel Passphrase"
 
-#: src/protocols/silc/chat.c:404
+#: src/protocols/silc/chat.c:405
 msgid "Channel Public Keys List"
 msgstr "Channel Public Keys List"
 
-#: src/protocols/silc/chat.c:409
+#: src/protocols/silc/chat.c:410
 msgid ""
 "Channel authentication is used to secure the channel from unauthorized "
 "access. The authentication may be based on passphrase and digital "
@@ -9065,123 +9194,123 @@
 "channel public keys are set then only users whose public keys are listed are "
 "able to join."
 
-#: src/protocols/silc/chat.c:418 src/protocols/silc/chat.c:419
-#: src/protocols/silc/chat.c:456 src/protocols/silc/chat.c:457
-#: src/protocols/silc/chat.c:886
+#: src/protocols/silc/chat.c:419 src/protocols/silc/chat.c:420
+#: src/protocols/silc/chat.c:457 src/protocols/silc/chat.c:458
+#: src/protocols/silc/chat.c:887
 msgid "Channel Authentication"
 msgstr "Channel Authentication"
 
-#: src/protocols/silc/chat.c:420 src/protocols/silc/chat.c:458
+#: src/protocols/silc/chat.c:421 src/protocols/silc/chat.c:459
 msgid "Add / Remove"
 msgstr "Add / Remove"
 
-#: src/protocols/silc/chat.c:575
+#: src/protocols/silc/chat.c:576
 msgid "Group Name"
 msgstr "Group Name"
 
-#: src/protocols/silc/chat.c:579 src/protocols/silc/ops.c:1687
+#: src/protocols/silc/chat.c:580 src/protocols/silc/ops.c:1687
 msgid "Passphrase"
 msgstr "Passphrase"
 
-#: src/protocols/silc/chat.c:590
+#: src/protocols/silc/chat.c:591
 #, c-format
 msgid "Please enter the %s channel private group name and passphrase."
 msgstr "Please enter the %s channel private group name and passphrase."
 
-#: src/protocols/silc/chat.c:592
+#: src/protocols/silc/chat.c:593
 msgid "Add Channel Private Group"
 msgstr "Add Channel Private Group"
 
-#: src/protocols/silc/chat.c:719
+#: src/protocols/silc/chat.c:720
 msgid "User Limit"
 msgstr "User Limit"
 
-#: src/protocols/silc/chat.c:720
+#: src/protocols/silc/chat.c:721
 msgid "Set user limit on channel. Set to zero to reset user limit."
 msgstr "Set user limit on channel. Set to zero to reset user limit."
 
-#: src/protocols/silc/chat.c:862
+#: src/protocols/silc/chat.c:863
 msgid "Get Info"
 msgstr "Get Info"
 
-#: src/protocols/silc/chat.c:869
+#: src/protocols/silc/chat.c:870
 msgid "Invite List"
 msgstr "Invite List"
 
-#: src/protocols/silc/chat.c:873
+#: src/protocols/silc/chat.c:874
 msgid "Ban List"
 msgstr "Ban List"
 
-#: src/protocols/silc/chat.c:880
+#: src/protocols/silc/chat.c:881
 msgid "Add Private Group"
 msgstr "Add Private Group"
 
-#: src/protocols/silc/chat.c:891
+#: src/protocols/silc/chat.c:892
 msgid "Reset Permanent"
 msgstr "Reset Permanent"
 
-#: src/protocols/silc/chat.c:895
+#: src/protocols/silc/chat.c:896
 msgid "Set Permanent"
 msgstr "Set Permanent"
 
-#: src/protocols/silc/chat.c:902
+#: src/protocols/silc/chat.c:903
 msgid "Set User Limit"
 msgstr "Set User Limit"
 
-#: src/protocols/silc/chat.c:907
+#: src/protocols/silc/chat.c:908
 msgid "Reset Topic Restriction"
 msgstr "Reset Topic Restriction"
 
-#: src/protocols/silc/chat.c:911
+#: src/protocols/silc/chat.c:912
 msgid "Set Topic Restriction"
 msgstr "Set Topic Restriction"
 
-#: src/protocols/silc/chat.c:917
+#: src/protocols/silc/chat.c:918
 msgid "Reset Private Channel"
 msgstr "Reset Private Channel"
 
-#: src/protocols/silc/chat.c:921
+#: src/protocols/silc/chat.c:922
 msgid "Set Private Channel"
 msgstr "Set Private Channel"
 
-#: src/protocols/silc/chat.c:927
+#: src/protocols/silc/chat.c:928
 msgid "Reset Secret Channel"
 msgstr "Reset Secret Channel"
 
-#: src/protocols/silc/chat.c:931
+#: src/protocols/silc/chat.c:932
 msgid "Set Secret Channel"
 msgstr "Set Secret Channel"
 
-#: src/protocols/silc/chat.c:993
+#: src/protocols/silc/chat.c:994
 #, c-format
 msgid "You are channel founder on <I>%s</I>"
 msgstr "You are channel founder on <I>%s</I>"
 
-#: src/protocols/silc/chat.c:997
+#: src/protocols/silc/chat.c:998
 #, c-format
 msgid "Channel founder on <I>%s</I> is <I>%s</I>"
 msgstr "Channel founder on <I>%s</I> is <I>%s</I>"
 
-#: src/protocols/silc/chat.c:1056
+#: src/protocols/silc/chat.c:1057
 #, c-format
 msgid ""
 "You have to join the %s channel before you are able to join the private group"
 msgstr ""
 "You have to join the %s channel before you are able to join the private group"
 
-#: src/protocols/silc/chat.c:1058
+#: src/protocols/silc/chat.c:1059
 msgid "Join Private Group"
 msgstr "Join Private Group"
 
-#: src/protocols/silc/chat.c:1059
+#: src/protocols/silc/chat.c:1060
 msgid "Cannot join private group"
 msgstr "Cannot join private group"
 
-#: src/protocols/silc/chat.c:1252 src/protocols/silc/silc.c:914
+#: src/protocols/silc/chat.c:1253 src/protocols/silc/silc.c:903
 msgid "Cannot call command"
 msgstr "Cannot call command"
 
-#: src/protocols/silc/chat.c:1253 src/protocols/silc/silc.c:915
+#: src/protocols/silc/chat.c:1254 src/protocols/silc/silc.c:904
 msgid "Unknown command"
 msgstr "Unknown command"
 
@@ -9326,7 +9455,7 @@
 msgid "More..."
 msgstr "More..."
 
-#: src/protocols/silc/ops.c:1159 src/protocols/silc/silc.c:802
+#: src/protocols/silc/ops.c:1159 src/protocols/silc/silc.c:791
 msgid "Detach From Server"
 msgstr "Detach From Server"
 
@@ -9556,15 +9685,15 @@
 msgid "Connecting to SILC Server"
 msgstr "Connecting to SILC Server"
 
-#: src/protocols/silc/silc.c:631
+#: src/protocols/silc/silc.c:620
 msgid "Your Current Mood"
 msgstr "Your Current Mood"
 
-#: src/protocols/silc/silc.c:633
+#: src/protocols/silc/silc.c:622
 msgid "Normal"
 msgstr "Normal"
 
-#: src/protocols/silc/silc.c:658
+#: src/protocols/silc/silc.c:647
 msgid ""
 "\n"
 "Your Preferred Contact Methods"
@@ -9572,43 +9701,43 @@
 "\n"
 "Your Preferred Contact Methods"
 
-#: src/protocols/silc/silc.c:666 src/protocols/silc/util.c:514
+#: src/protocols/silc/silc.c:655 src/protocols/silc/util.c:514
 msgid "SMS"
 msgstr "SMS"
 
-#: src/protocols/silc/silc.c:668 src/protocols/silc/util.c:516
+#: src/protocols/silc/silc.c:657 src/protocols/silc/util.c:516
 msgid "MMS"
 msgstr "MMS"
 
-#: src/protocols/silc/silc.c:670 src/protocols/silc/util.c:518
+#: src/protocols/silc/silc.c:659 src/protocols/silc/util.c:518
 msgid "Video Conferencing"
 msgstr "Video Conferencing"
 
-#: src/protocols/silc/silc.c:675
+#: src/protocols/silc/silc.c:664
 msgid "Your Current Status"
 msgstr "Your Current Status"
 
-#: src/protocols/silc/silc.c:682
+#: src/protocols/silc/silc.c:671
 msgid "Online Services"
 msgstr "Online Services"
 
-#: src/protocols/silc/silc.c:685
+#: src/protocols/silc/silc.c:674
 msgid "Let others see what services you are using"
 msgstr "Let others see what services you are using"
 
-#: src/protocols/silc/silc.c:691
+#: src/protocols/silc/silc.c:680
 msgid "Let others see what computer you are using"
 msgstr "Let others see what computer you are using"
 
-#: src/protocols/silc/silc.c:698
+#: src/protocols/silc/silc.c:687
 msgid "Your VCard File"
 msgstr "Your VCard File"
 
-#: src/protocols/silc/silc.c:711 src/protocols/silc/silc.c:712
+#: src/protocols/silc/silc.c:700 src/protocols/silc/silc.c:701
 msgid "User Online Status Attributes"
 msgstr "User Online Status Attributes"
 
-#: src/protocols/silc/silc.c:713
+#: src/protocols/silc/silc.c:702
 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 "
@@ -9618,127 +9747,127 @@
 "information. Please fill the information you would like other users to see "
 "about yourself."
 
-#: src/protocols/silc/silc.c:753 src/protocols/silc/silc.c:759
-#: src/protocols/silc/silc.c:1159
+#: src/protocols/silc/silc.c:742 src/protocols/silc/silc.c:748
+#: src/protocols/silc/silc.c:1148
 msgid "Message of the Day"
 msgstr "Message of the Day"
 
-#: src/protocols/silc/silc.c:753
+#: src/protocols/silc/silc.c:742
 msgid "No Message of the Day available"
 msgstr "No Message of the Day available"
 
-#: src/protocols/silc/silc.c:754 src/protocols/silc/silc.c:1154
+#: src/protocols/silc/silc.c:743 src/protocols/silc/silc.c:1143
 msgid "There is no Message of the Day associated with this connection"
 msgstr "There is no Message of the Day associated with this connection"
 
-#: src/protocols/silc/silc.c:797
+#: src/protocols/silc/silc.c:786
 msgid "Online Status"
 msgstr "Online Status"
 
-#: src/protocols/silc/silc.c:806
+#: src/protocols/silc/silc.c:795
 msgid "View Message of the Day"
 msgstr "View Message of the Day"
 
-#: src/protocols/silc/silc.c:879
+#: src/protocols/silc/silc.c:868
 #, c-format
 msgid "User <I>%s</I> is not present in the network"
 msgstr "User <I>%s</I> is not present in the network"
 
-#: src/protocols/silc/silc.c:1030
+#: src/protocols/silc/silc.c:1019
 msgid "Topic too long"
 msgstr "Topic too long"
 
-#: src/protocols/silc/silc.c:1111
+#: src/protocols/silc/silc.c:1100
 msgid "You must specify a nick"
 msgstr "You must specify a nick"
 
-#: src/protocols/silc/silc.c:1213
+#: src/protocols/silc/silc.c:1202
 #, c-format
 msgid "channel %s not found"
 msgstr "channel %s not found"
 
-#: src/protocols/silc/silc.c:1218
+#: src/protocols/silc/silc.c:1207
 #, c-format
 msgid "channel modes for %s: %s"
 msgstr "channel modes for %s: %s"
 
-#: src/protocols/silc/silc.c:1220
+#: src/protocols/silc/silc.c:1209
 #, c-format
 msgid "no channel modes are set on %s"
 msgstr "no channel modes are set on %s"
 
-#: src/protocols/silc/silc.c:1233
+#: src/protocols/silc/silc.c:1222
 #, c-format
 msgid "Failed to set cmodes for %s"
 msgstr "Failed to set cmodes for %s"
 
-#: src/protocols/silc/silc.c:1263
+#: src/protocols/silc/silc.c:1252
 #, c-format
 msgid "Unknown command: %s, (may be a Gaim bug)"
 msgstr "Unknown command: %s, (may be a Gaim bug)"
 
-#: src/protocols/silc/silc.c:1326
+#: src/protocols/silc/silc.c:1315
 msgid "part [channel]:  Leave the chat"
 msgstr "part [channel]:  Leave the chat"
 
-#: src/protocols/silc/silc.c:1330
+#: src/protocols/silc/silc.c:1319
 msgid "leave [channel]:  Leave the chat"
 msgstr "leave [channel]:  Leave the chat"
 
-#: src/protocols/silc/silc.c:1334
+#: src/protocols/silc/silc.c:1323
 msgid "topic [&lt;new topic&gt;]:  View or change the topic"
 msgstr "topic [&lt;new topic&gt;]:  View or change the topic"
 
-#: src/protocols/silc/silc.c:1339
+#: src/protocols/silc/silc.c:1328
 msgid "join &lt;channel&gt; [&lt;password&gt;]:  Join a chat on this network"
 msgstr "join &lt;channel&gt; [&lt;password&gt;]:  Join a chat on this network"
 
-#: src/protocols/silc/silc.c:1343
+#: src/protocols/silc/silc.c:1332
 msgid "list:  List channels on this network"
 msgstr "list:  List channels on this network"
 
-#: src/protocols/silc/silc.c:1347
+#: src/protocols/silc/silc.c:1336
 msgid "whois &lt;nick&gt;:  View nick's information"
 msgstr "whois &lt;nick&gt;:  View nick's information"
 
-#: src/protocols/silc/silc.c:1351 src/protocols/zephyr/zephyr.c:2563
+#: src/protocols/silc/silc.c:1340 src/protocols/zephyr/zephyr.c:2563
 msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user"
 msgstr "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user"
 
-#: src/protocols/silc/silc.c:1355
+#: src/protocols/silc/silc.c:1344
 msgid "query &lt;nick&gt; [&lt;message&gt;]:  Send a private message to a user"
 msgstr ""
 "query &lt;nick&gt; [&lt;message&gt;]:  Send a private message to a user"
 
-#: src/protocols/silc/silc.c:1359
+#: src/protocols/silc/silc.c:1348
 msgid "motd:  View the server's Message Of The Day"
 msgstr "motd:  View the server's Message Of The Day"
 
-#: src/protocols/silc/silc.c:1363
+#: src/protocols/silc/silc.c:1352
 msgid "detach:  Detach this session"
 msgstr "detach:  Detach this session"
 
-#: src/protocols/silc/silc.c:1367
+#: src/protocols/silc/silc.c:1356
 msgid "quit [message]:  Disconnect from the server, with an optional message"
 msgstr "quit [message]:  Disconnect from the server, with an optional message"
 
-#: src/protocols/silc/silc.c:1371
+#: src/protocols/silc/silc.c:1360
 msgid "call &lt;command&gt;:  Call any silc client command"
 msgstr "call &lt;command&gt;:  Call any silc client command"
 
-#: src/protocols/silc/silc.c:1377
+#: src/protocols/silc/silc.c:1366
 msgid "kill &lt;nick&gt; [-pubkey|&lt;reason&gt;]:  Kill nick"
 msgstr "kill &lt;nick&gt; [-pubkey|&lt;reason&gt;]:  Kill nick"
 
-#: src/protocols/silc/silc.c:1381
+#: src/protocols/silc/silc.c:1370
 msgid "nick &lt;newnick&gt;:  Change your nickname"
 msgstr "nick &lt;newnick&gt;:  Change your nickname"
 
-#: src/protocols/silc/silc.c:1385
+#: src/protocols/silc/silc.c:1374
 msgid "whowas &lt;nick&gt;:  View nick's information"
 msgstr "whowas &lt;nick&gt;:  View nick's information"
 
-#: src/protocols/silc/silc.c:1389
+#: src/protocols/silc/silc.c:1378
 msgid ""
 "cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display "
 "channel modes"
@@ -9746,7 +9875,7 @@
 "cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display "
 "channel modes"
 
-#: src/protocols/silc/silc.c:1393
+#: src/protocols/silc/silc.c:1382
 msgid ""
 "cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes "
 "on channel"
@@ -9754,15 +9883,15 @@
 "cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes "
 "on channel"
 
-#: src/protocols/silc/silc.c:1397
+#: src/protocols/silc/silc.c:1386
 msgid "umode &lt;usermodes&gt;:  Set your modes in the network"
 msgstr "umode &lt;usermodes&gt;:  Set your modes in the network"
 
-#: src/protocols/silc/silc.c:1401
+#: src/protocols/silc/silc.c:1390
 msgid "oper &lt;nick&gt; [-pubkey]:  Get server operator privileges"
 msgstr "oper &lt;nick&gt; [-pubkey]:  Get server operator privileges"
 
-#: src/protocols/silc/silc.c:1405
+#: src/protocols/silc/silc.c:1394
 msgid ""
 "invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
 "channel invite list"
@@ -9770,35 +9899,35 @@
 "invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
 "channel invite list"
 
-#: src/protocols/silc/silc.c:1409
+#: src/protocols/silc/silc.c:1398
 msgid "kick &lt;channel&gt; &lt;nick&gt; [comment]:  Kick client from channel"
 msgstr "kick &lt;channel&gt; &lt;nick&gt; [comment]:  Kick client from channel"
 
-#: src/protocols/silc/silc.c:1413
+#: src/protocols/silc/silc.c:1402
 msgid "info [server]:  View server administrative details"
 msgstr "info [server]:  View server administrative details"
 
-#: src/protocols/silc/silc.c:1417
+#: src/protocols/silc/silc.c:1406
 msgid "ban [&lt;channel&gt; +|-&lt;nick&gt;]:  Ban client from channel"
 msgstr "ban [&lt;channel&gt; +|-&lt;nick&gt;]:  Ban client from channel"
 
-#: src/protocols/silc/silc.c:1421
+#: src/protocols/silc/silc.c:1410
 msgid "getkey &lt;nick|server&gt;:  Retrieve client's or server's public key"
 msgstr "getkey &lt;nick|server&gt;:  Retrieve client's or server's public key"
 
-#: src/protocols/silc/silc.c:1425
+#: src/protocols/silc/silc.c:1414
 msgid "stats:  View server and network statistics"
 msgstr "stats:  View server and network statistics"
 
-#: src/protocols/silc/silc.c:1429
+#: src/protocols/silc/silc.c:1418
 msgid "ping:  Send PING to the connected server"
 msgstr "ping:  Send PING to the connected server"
 
-#: src/protocols/silc/silc.c:1434
+#: src/protocols/silc/silc.c:1423
 msgid "users &lt;channel&gt;:  List users in channel"
 msgstr "users &lt;channel&gt;:  List users in channel"
 
-#: src/protocols/silc/silc.c:1438
+#: src/protocols/silc/silc.c:1427
 msgid ""
 "names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List "
 "specific users in channel(s)"
@@ -9806,39 +9935,39 @@
 "names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List "
 "specific users in channel(s)"
 
-#: src/protocols/silc/silc.c:1450
+#: src/protocols/silc/silc.c:1439
 msgid "Instant Messages"
 msgstr "Instant Messages"
 
-#: src/protocols/silc/silc.c:1455
+#: src/protocols/silc/silc.c:1444
 msgid "Digitally sign all IM messages"
 msgstr "Digitally sign all IM messages"
 
-#: src/protocols/silc/silc.c:1460
+#: src/protocols/silc/silc.c:1449
 msgid "Verify all IM message signatures"
 msgstr "Verify all IM message signatures"
 
-#: src/protocols/silc/silc.c:1463
+#: src/protocols/silc/silc.c:1452
 msgid "Channel Messages"
 msgstr "Channel Messages"
 
-#: src/protocols/silc/silc.c:1468
+#: src/protocols/silc/silc.c:1457
 msgid "Digitally sign all channel messages"
 msgstr "Digitally sign all channel messages"
 
-#: src/protocols/silc/silc.c:1473
+#: src/protocols/silc/silc.c:1462
 msgid "Verify all channel message signatures"
 msgstr "Verify all channel message signatures"
 
-#: src/protocols/silc/silc.c:1476
+#: src/protocols/silc/silc.c:1465
 msgid "Default SILC Key Pair"
 msgstr "Default SILC Key Pair"
 
-#: src/protocols/silc/silc.c:1481
+#: src/protocols/silc/silc.c:1470
 msgid "SILC Public Key"
 msgstr "SILC Public Key"
 
-#: src/protocols/silc/silc.c:1486
+#: src/protocols/silc/silc.c:1475
 msgid "SILC Private Key"
 msgstr "SILC Private Key"
 
@@ -9851,40 +9980,40 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/silc/silc.c:1575
+#: src/protocols/silc/silc.c:1564
 msgid "SILC Protocol Plugin"
 msgstr "SILC Protocol Plugin"
 
 #. *  description
-#: src/protocols/silc/silc.c:1577
+#: src/protocols/silc/silc.c:1566
 msgid "Secure Internet Live Conferencing (SILC) Protocol"
 msgstr "Secure Internet Live Conferencing (SILC) Protocol"
 
-#: src/protocols/silc/silc.c:1607
+#: src/protocols/silc/silc.c:1596
 msgid "Public key authentication"
 msgstr "Public key authentication"
 
-#: src/protocols/silc/silc.c:1613
+#: src/protocols/silc/silc.c:1602
 msgid "Public Key File"
 msgstr "Public Key File"
 
-#: src/protocols/silc/silc.c:1617
+#: src/protocols/silc/silc.c:1606
 msgid "Private Key File"
 msgstr "Private Key File"
 
-#: src/protocols/silc/silc.c:1622
+#: src/protocols/silc/silc.c:1611
 msgid "Reject watching by other users"
 msgstr "Reject watching by other users"
 
-#: src/protocols/silc/silc.c:1625
+#: src/protocols/silc/silc.c:1614
 msgid "Block invites"
 msgstr "Block invites"
 
-#: src/protocols/silc/silc.c:1628
+#: src/protocols/silc/silc.c:1617
 msgid "Block IMs without Key Exchange"
 msgstr "Block IMs without Key Exchange"
 
-#: src/protocols/silc/silc.c:1631
+#: src/protocols/silc/silc.c:1620
 msgid "Reject online status attribute requests"
 msgstr "Reject online status attribute requests"
 
@@ -10131,44 +10260,44 @@
 "if you send a message. Gaim will prevent anything from going through. This "
 "is only temporary, please be patient."
 
-#: src/protocols/toc/toc.c:1430
+#: src/protocols/toc/toc.c:1432
 msgid "Get Dir Info"
 msgstr "Get Dir Info"
 
-#: src/protocols/toc/toc.c:1566
+#: src/protocols/toc/toc.c:1572
 msgid "Set Dir Info"
 msgstr "Set Dir Info"
 
-#: src/protocols/toc/toc.c:1688
+#: src/protocols/toc/toc.c:1694
 #, c-format
 msgid "Could not open %s for writing!"
 msgstr "Could not open %s for writing!"
 
-#: src/protocols/toc/toc.c:1724
+#: src/protocols/toc/toc.c:1730
 msgid "File transfer failed; other side probably canceled."
 msgstr "File transfer failed; other side probably cancelled."
 
-#: src/protocols/toc/toc.c:1769 src/protocols/toc/toc.c:1809
-#: src/protocols/toc/toc.c:1933 src/protocols/toc/toc.c:2021
+#: src/protocols/toc/toc.c:1775 src/protocols/toc/toc.c:1815
+#: src/protocols/toc/toc.c:1939 src/protocols/toc/toc.c:2027
 msgid "Could not connect for transfer."
 msgstr "Could not connect for transfer."
 
-#: src/protocols/toc/toc.c:1966
+#: src/protocols/toc/toc.c:1972
 msgid "Could not write file header.  The file will not be transferred."
 msgstr "Could not write file header.  The file will not be transferred."
 
-#: src/protocols/toc/toc.c:2066
+#: src/protocols/toc/toc.c:2072
 msgid "Gaim - Save As..."
 msgstr "Gaim - Save As..."
 
-#: src/protocols/toc/toc.c:2100
+#: src/protocols/toc/toc.c:2106
 #, c-format
 msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
 msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
 msgstr[0] "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
 msgstr[1] "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
 
-#: src/protocols/toc/toc.c:2107
+#: src/protocols/toc/toc.c:2113
 #, c-format
 msgid "%s requests you to send them a file"
 msgstr "%s requests you to send them a file"
@@ -10183,15 +10312,15 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/toc/toc.c:2194 src/protocols/toc/toc.c:2196
+#: src/protocols/toc/toc.c:2200 src/protocols/toc/toc.c:2202
 msgid "TOC Protocol Plugin"
 msgstr "TOC Protocol Plugin"
 
-#: src/protocols/toc/toc.c:2215
+#: src/protocols/toc/toc.c:2221
 msgid "TOC host"
 msgstr "TOC host"
 
-#: src/protocols/toc/toc.c:2219
+#: src/protocols/toc/toc.c:2225
 msgid "TOC port"
 msgstr "TOC port"
 
@@ -10278,7 +10407,7 @@
 msgid "Trepia Protocol Plugin"
 msgstr "Trepia Protocol Plugin"
 
-#: src/protocols/yahoo/yahoo.c:400
+#: src/protocols/yahoo/yahoo.c:141
 msgid ""
 "You have been logged off as you have logged in on a different machine or "
 "device."
@@ -10286,25 +10415,25 @@
 "You have been logged off as you have logged in on a different machine or "
 "device."
 
-#: src/protocols/yahoo/yahoo.c:884
+#: src/protocols/yahoo/yahoo.c:626
 msgid "Your Yahoo! message did not get sent."
 msgstr "Your Yahoo! message did not get sent."
 
-#: src/protocols/yahoo/yahoo.c:903 src/protocols/yahoo/yahoo.c:3429
+#: src/protocols/yahoo/yahoo.c:645 src/protocols/yahoo/yahoo.c:3169
 msgid "Buzz!!"
 msgstr "Buzz!!"
 
-#: src/protocols/yahoo/yahoo.c:948
+#: src/protocols/yahoo/yahoo.c:690
 #, c-format
 msgid "Yahoo! system message for %s:"
 msgstr "Yahoo! system message for %s:"
 
-#: src/protocols/yahoo/yahoo.c:1015
+#: src/protocols/yahoo/yahoo.c:757
 #, c-format
 msgid "%s has (retroactively) denied your request to add them to your list."
 msgstr "%s has (retroactively) denied your request to add them to your list."
 
-#: src/protocols/yahoo/yahoo.c:1018
+#: src/protocols/yahoo/yahoo.c:760
 #, c-format
 msgid ""
 "%s has (retroactively) denied your request to add them to your list for the "
@@ -10313,11 +10442,11 @@
 "%s has (retroactively) denied your request to add them to your list for the "
 "following reason: %s."
 
-#: src/protocols/yahoo/yahoo.c:1021
+#: src/protocols/yahoo/yahoo.c:763
 msgid "Add buddy rejected"
 msgstr "Add buddy rejected"
 
-#: src/protocols/yahoo/yahoo.c:1782
+#: src/protocols/yahoo/yahoo.c:1511
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -10328,11 +10457,11 @@
 "method.  This version of Gaim will likely not be able to successfully sign "
 "on to Yahoo.  Check %s for updates."
 
-#: src/protocols/yahoo/yahoo.c:1785
+#: src/protocols/yahoo/yahoo.c:1514
 msgid "Failed Yahoo! Authentication"
 msgstr "Failed Yahoo! Authentication"
 
-#: src/protocols/yahoo/yahoo.c:1858
+#: src/protocols/yahoo/yahoo.c:1587
 #, c-format
 msgid ""
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
@@ -10341,19 +10470,19 @@
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
 "\"Yes\" will remove and ignore the buddy."
 
-#: src/protocols/yahoo/yahoo.c:1861
+#: src/protocols/yahoo/yahoo.c:1590
 msgid "Ignore buddy?"
 msgstr "Ignore buddy?"
 
-#: src/protocols/yahoo/yahoo.c:1895
+#: src/protocols/yahoo/yahoo.c:1624
 msgid "Invalid username."
 msgstr "Invalid username."
 
-#: src/protocols/yahoo/yahoo.c:1906
+#: src/protocols/yahoo/yahoo.c:1635
 msgid "Normal authentication failed!"
 msgstr "Normal authentication failed!"
 
-#: src/protocols/yahoo/yahoo.c:1907
+#: src/protocols/yahoo/yahoo.c:1636
 msgid ""
 "The normal authentication method has failed. This means either your password "
 "is incorrect, or Yahoo!'s authentication scheme has changed. Gaim will now "
@@ -10365,93 +10494,93 @@
 "attempt to log in using Web Messenger authentication, which will result in "
 "reduced functionality and features."
 
-#: src/protocols/yahoo/yahoo.c:1915
+#: src/protocols/yahoo/yahoo.c:1644
 msgid "Incorrect password."
 msgstr "Incorrect password."
 
-#: src/protocols/yahoo/yahoo.c:1918
+#: src/protocols/yahoo/yahoo.c:1647
 msgid "Your account is locked, please log in to the Yahoo! website."
 msgstr "Your account is locked. Please log in to the Yahoo! website."
 
-#: src/protocols/yahoo/yahoo.c:1921
+#: src/protocols/yahoo/yahoo.c:1650
 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr "Unknown error number %d. Logging into the Yahoo! website may fix this."
 
-#: src/protocols/yahoo/yahoo.c:1975
+#: src/protocols/yahoo/yahoo.c:1704
 #, c-format
 msgid "Could not add buddy %s to group %s to the server list on account %s."
 msgstr "Could not add buddy %s to group %s to the server list on account %s."
 
-#: src/protocols/yahoo/yahoo.c:1978
+#: src/protocols/yahoo/yahoo.c:1707
 msgid "Could not add buddy to server list"
 msgstr "Could not add buddy to server list"
 
-#: src/protocols/yahoo/yahoo.c:2212 src/protocols/yahoo/yahoo.c:2340
-#: src/protocols/yahoo/ycht.c:414
+#: src/protocols/yahoo/yahoo.c:1941 src/protocols/yahoo/yahoo.c:2067
+#: src/protocols/yahoo/ycht.c:415
 msgid "Unable to read"
 msgstr "Unable to read"
 
-#: src/protocols/yahoo/yahoo.c:2362 src/protocols/yahoo/yahoo.c:2472
-#: src/protocols/yahoo/yahoo.c:2522 src/protocols/yahoo/yahoo.c:2532
-#: src/protocols/yahoo/yahoochat.c:1415 src/protocols/yahoo/yahoochat.c:1476
-#: src/protocols/yahoo/ycht.c:518
+#: src/protocols/yahoo/yahoo.c:2089 src/protocols/yahoo/yahoo.c:2199
+#: src/protocols/yahoo/yahoo.c:2281 src/protocols/yahoo/yahoo.c:2291
+#: src/protocols/yahoo/yahoochat.c:1372 src/protocols/yahoo/yahoochat.c:1433
+#: src/protocols/yahoo/ycht.c:519
 msgid "Connection problem"
 msgstr "Connection problem"
 
-#: src/protocols/yahoo/yahoo.c:2635 src/protocols/yahoo/yahoo.c:3145
+#: src/protocols/yahoo/yahoo.c:2394 src/protocols/yahoo/yahoo.c:2905
 msgid "Not At Home"
 msgstr "Not At Home"
 
-#: src/protocols/yahoo/yahoo.c:2637 src/protocols/yahoo/yahoo.c:3148
+#: src/protocols/yahoo/yahoo.c:2396 src/protocols/yahoo/yahoo.c:2908
 msgid "Not At Desk"
 msgstr "Not At Desk"
 
-#: src/protocols/yahoo/yahoo.c:2639 src/protocols/yahoo/yahoo.c:3151
+#: src/protocols/yahoo/yahoo.c:2398 src/protocols/yahoo/yahoo.c:2911
 msgid "Not In Office"
 msgstr "Not In Office"
 
-#: src/protocols/yahoo/yahoo.c:2643 src/protocols/yahoo/yahoo.c:3157
+#: src/protocols/yahoo/yahoo.c:2402 src/protocols/yahoo/yahoo.c:2917
 msgid "On Vacation"
 msgstr "On Vacation"
 
-#: src/protocols/yahoo/yahoo.c:2647 src/protocols/yahoo/yahoo.c:3163
+#: src/protocols/yahoo/yahoo.c:2406 src/protocols/yahoo/yahoo.c:2923
 msgid "Stepped Out"
 msgstr "Stepped Out"
 
-#: src/protocols/yahoo/yahoo.c:2728 src/protocols/yahoo/yahoo.c:2754
+#: src/protocols/yahoo/yahoo.c:2487 src/protocols/yahoo/yahoo.c:2513
 msgid "Not on server list"
 msgstr "Not on server list"
 
-#: src/protocols/yahoo/yahoo.c:2833
+#: src/protocols/yahoo/yahoo.c:2592
 msgid "Join in Chat"
 msgstr "Join in Chat"
 
-#: src/protocols/yahoo/yahoo.c:2838
+#: src/protocols/yahoo/yahoo.c:2597
 msgid "Initiate Conference"
 msgstr "Initiate Conference"
 
-#: src/protocols/yahoo/yahoo.c:2890
+#: src/protocols/yahoo/yahoo.c:2648
 msgid "Active which ID?"
 msgstr "Active which ID?"
 
-#: src/protocols/yahoo/yahoo.c:2899
+#: src/protocols/yahoo/yahoo.c:2657
 msgid "Join who in chat?"
 msgstr "Join who in chat?"
 
-#: src/protocols/yahoo/yahoo.c:2909
+#: src/protocols/yahoo/yahoo.c:2667
 msgid "Activate ID..."
 msgstr "Activate ID..."
 
-#: src/protocols/yahoo/yahoo.c:2913
+#: src/protocols/yahoo/yahoo.c:2671
 msgid "Join user in chat..."
 msgstr "Join user in chat..."
 
-#: src/protocols/yahoo/yahoo.c:3473
+#: src/protocols/yahoo/yahoo.c:3213
 msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
 msgstr "join &lt;room&gt;:  Join a chat room on the Yahoo network"
 
-#: src/protocols/yahoo/yahoo.c:3477
+#: src/protocols/yahoo/yahoo.c:3217
 msgid "buzz: Buzz a contact to get their attention"
 msgstr "buzz: Buzz a contact to get their attention"
 
@@ -10465,51 +10594,51 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/yahoo/yahoo.c:3557 src/protocols/yahoo/yahoo.c:3559
+#: src/protocols/yahoo/yahoo.c:3297 src/protocols/yahoo/yahoo.c:3299
 msgid "Yahoo Protocol Plugin"
 msgstr "Yahoo Protocol Plugin"
 
-#: src/protocols/yahoo/yahoo.c:3578
+#: src/protocols/yahoo/yahoo.c:3318
 msgid "Yahoo Japan"
 msgstr "Yahoo Japan"
 
-#: src/protocols/yahoo/yahoo.c:3581
+#: src/protocols/yahoo/yahoo.c:3321
 msgid "Pager host"
 msgstr "Pager host"
 
-#: src/protocols/yahoo/yahoo.c:3584
+#: src/protocols/yahoo/yahoo.c:3324
 msgid "Japan Pager host"
 msgstr "Japan Pager host"
 
-#: src/protocols/yahoo/yahoo.c:3587
+#: src/protocols/yahoo/yahoo.c:3327
 msgid "Pager port"
 msgstr "Pager port"
 
-#: src/protocols/yahoo/yahoo.c:3590
+#: src/protocols/yahoo/yahoo.c:3330
 msgid "File transfer host"
 msgstr "File transfer host"
 
-#: src/protocols/yahoo/yahoo.c:3593
+#: src/protocols/yahoo/yahoo.c:3333
 msgid "Japan File transfer host"
 msgstr "Japan File transfer host"
 
-#: src/protocols/yahoo/yahoo.c:3596
+#: src/protocols/yahoo/yahoo.c:3336
 msgid "File transfer port"
 msgstr "File transfer port"
 
-#: src/protocols/yahoo/yahoo.c:3599
+#: src/protocols/yahoo/yahoo.c:3339
 msgid "Chat Room List Url"
 msgstr "Chat Room List Url"
 
-#: src/protocols/yahoo/yahoo.c:3602
+#: src/protocols/yahoo/yahoo.c:3342
 msgid "YCHT Host"
 msgstr "YCHT Host"
 
-#: src/protocols/yahoo/yahoo.c:3605
+#: src/protocols/yahoo/yahoo.c:3345
 msgid "YCHT Port"
 msgstr "YCHT Port"
 
-#: src/protocols/yahoo/yahoo_filexfer.c:170
+#: src/protocols/yahoo/yahoo_filexfer.c:169
 msgid ""
 "Gaim cannot send files over Yahoo! that are bigger than One Megabyte "
 "(1,048,576 bytes)."
@@ -10612,61 +10741,57 @@
 msgid "The user's profile is empty."
 msgstr "The user's profile is empty."
 
-#: src/protocols/yahoo/yahoochat.c:193
+#: src/protocols/yahoo/yahoochat.c:190
 #, c-format
 msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
 msgstr "%s declined your conference invitation to room \"%s\" because \"%s\"."
 
-#: src/protocols/yahoo/yahoochat.c:195
+#: src/protocols/yahoo/yahoochat.c:192
 msgid "Invitation Rejected"
 msgstr "Invitation Rejected"
 
-#: src/protocols/yahoo/yahoochat.c:347
+#: src/protocols/yahoo/yahoochat.c:344
 msgid "Failed to join chat"
 msgstr "Failed to join chat"
 
-#: src/protocols/yahoo/yahoochat.c:347
+#: src/protocols/yahoo/yahoochat.c:344
 msgid "Maybe the room is full?"
 msgstr "Maybe the room is full?"
 
-#: src/protocols/yahoo/yahoochat.c:425
+#: src/protocols/yahoo/yahoochat.c:422
 #, c-format
 msgid "You are now chatting in %s."
 msgstr "You are now chatting in %s."
 
-#: src/protocols/yahoo/yahoochat.c:579
+#: src/protocols/yahoo/yahoochat.c:576
 msgid "Failed to join buddy in chat"
 msgstr "Failed to join buddy in chat"
 
-#: src/protocols/yahoo/yahoochat.c:580
+#: src/protocols/yahoo/yahoochat.c:577
 msgid "Maybe they're not in a chat?"
 msgstr "Maybe they're not in a chat?"
 
-#: src/protocols/yahoo/yahoochat.c:1356
-msgid "Unable to connect"
-msgstr "Unable to connect"
-
-#: src/protocols/yahoo/yahoochat.c:1356
+#: src/protocols/yahoo/yahoochat.c:1312
 msgid "Fetching the room list failed."
 msgstr "Fetching the room list failed."
 
-#: src/protocols/yahoo/yahoochat.c:1401
+#: src/protocols/yahoo/yahoochat.c:1358
 msgid "Voices"
 msgstr "Voices"
 
-#: src/protocols/yahoo/yahoochat.c:1404
+#: src/protocols/yahoo/yahoochat.c:1361
 msgid "Webcams"
 msgstr "Webcams"
 
-#: src/protocols/yahoo/yahoochat.c:1415 src/protocols/yahoo/yahoochat.c:1476
+#: src/protocols/yahoo/yahoochat.c:1372 src/protocols/yahoo/yahoochat.c:1433
 msgid "Unable to fetch room list."
 msgstr "Unable to fetch room list."
 
-#: src/protocols/yahoo/yahoochat.c:1469
+#: src/protocols/yahoo/yahoochat.c:1426
 msgid "User Rooms"
 msgstr "User Rooms"
 
-#: src/protocols/yahoo/ycht.c:401
+#: src/protocols/yahoo/ycht.c:402
 msgid "Connection problem with the YCHT server."
 msgstr "Connection problem with the YCHT server."
 
@@ -10824,21 +10949,21 @@
 
 #. XXX: why in the hell are we calling gaim_connection_error() here?
 #. Forbidden
-#: src/proxy.c:953
+#: src/proxy.c:959
 #, c-format
 msgid "Access denied: proxy server forbids port %d tunnelling."
 msgstr "Access denied: proxy server forbids port %d tunnelling."
 
-#: src/proxy.c:957
+#: src/proxy.c:963
 #, c-format
 msgid "Proxy connection error %d"
 msgstr "Proxy connection error %d"
 
-#: src/proxy.c:1612
+#: src/proxy.c:1784
 msgid "Invalid proxy settings"
 msgstr "Invalid proxy settings"
 
-#: src/proxy.c:1612
+#: src/proxy.c:1784
 msgid ""
 "Either the host name or port number specified for your given proxy type is "
 "invalid."
@@ -10873,7 +10998,7 @@
 msgid "(1 message)"
 msgstr "(1 message)"
 
-#: src/server.c:1164
+#: src/server.c:1166
 #, c-format
 msgid ""
 "%s has invited %s to the chat room %s:\n"
@@ -10882,70 +11007,85 @@
 "%s has invited %s to the chat room %s:\n"
 "<b>%s</b>"
 
-#: src/server.c:1168
+#: src/server.c:1172
 #, c-format
 msgid "%s has invited %s to the chat room %s\n"
 msgstr "%s has invited %s to the chat room %s\n"
 
-#: src/server.c:1174
+#: src/server.c:1178
 msgid "Accept chat invitation?"
 msgstr "Accept chat invitation?"
 
-#: src/status.c:553
+#: src/status.c:154
+msgid "Unset"
+msgstr "Unset"
+
+#: src/status.c:614
 #, c-format
 msgid "%s came back"
 msgstr "%s came back"
 
-#: src/status.c:558
+#: src/status.c:619
 #, c-format
 msgid "%s went away"
 msgstr "%s went away"
 
-#: src/status.c:1269
+#: src/status.c:1314
 #, c-format
 msgid "%s became idle"
 msgstr "%s became idle"
 
-#: src/status.c:1285
+#: src/status.c:1330
 #, c-format
 msgid "%s became unidle"
 msgstr "%s became unidle"
 
-#: src/util.c:2354
+#: src/util.c:2121
+#, c-format
+msgid "Error Reading %s"
+msgstr "Error Reading %s"
+
+#: src/util.c:2122
+#, c-format
+msgid ""
+"An error was encountered reading your %s.  They have not been loaded, and "
+"the old file been renamed to %s~."
+msgstr ""
+"An error was encountered reading your %s.  They have not been loaded, and "
+"the old file been renamed to %s~."
+
+#: src/util.c:2557
 msgid "Calculating..."
 msgstr "Calculating..."
 
-#: src/util.c:2357
+#: src/util.c:2560
 msgid "Unknown."
 msgstr "Unknown."
 
-#: src/util.c:2387
+#: src/util.c:2590
 msgid "second"
 msgid_plural "seconds"
 msgstr[0] "second"
 msgstr[1] "seconds"
 
-#: src/util.c:2401
+#: src/util.c:2604
 msgid "day"
 msgid_plural "days"
 msgstr[0] "day"
 msgstr[1] "days"
 
-#: src/util.c:2409
+#: src/util.c:2612
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "hour"
 msgstr[1] "hours"
 
-#: src/util.c:2417
+#: src/util.c:2620
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minute"
 msgstr[1] "minutes"
 
-#: src/util.c:2834
+#: src/util.c:3037
 msgid "g003: Error opening connection.\n"
 msgstr "g003: Error opening connection.\n"
-
-#~ msgid "Syncing with server"
-#~ msgstr "Syncing with server"
--- a/po/zh_CN.po	Mon Mar 14 15:48:34 2005 +0000
+++ b/po/zh_CN.po	Tue Mar 15 02:04:53 2005 +0000
@@ -7,8 +7,8 @@
 msgstr ""
 "Project-Id-Version: gaim HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-02-14 12:35+0800\n"
-"PO-Revision-Date: 2005-02-14 12:43+0800\n"
+"POT-Creation-Date: 2005-03-14 16:54+0800\n"
+"PO-Revision-Date: 2005-03-14 17:02+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
 "MIME-Version: 1.0\n"
@@ -161,16 +161,16 @@
 msgid "New..."
 msgstr "新建..."
 
-#: plugins/docklet/docklet.c:189 src/gtkprefs.c:1694 src/protocols/gg/gg.c:52
-#: src/protocols/irc/irc.c:179 src/protocols/irc/msgs.c:189
-#: src/protocols/jabber/buddy.c:1076 src/protocols/jabber/jabber.c:994
-#: src/protocols/msn/msn.c:539 src/protocols/novell/novell.c:2811
-#: src/protocols/novell/novell.c:2928 src/protocols/novell/novell.c:2980
-#: src/protocols/oscar/oscar.c:691 src/protocols/oscar/oscar.c:5742
-#: src/protocols/oscar/oscar.c:6803 src/protocols/oscar/oscar.c:7024
-#: src/protocols/silc/buddy.c:1393 src/protocols/silc/silc.c:52
-#: src/protocols/yahoo/yahoo.c:2927 src/protocols/zephyr/zephyr.c:2225
-#: src/status.c:160
+#: plugins/docklet/docklet.c:189 src/gtkprefs.c:1694 src/gtkstatusbox.c:248
+#: src/protocols/gg/gg.c:52 src/protocols/irc/irc.c:179
+#: src/protocols/irc/msgs.c:212 src/protocols/jabber/buddy.c:1080
+#: src/protocols/jabber/jabber.c:994 src/protocols/msn/msn.c:539
+#: src/protocols/novell/novell.c:2811 src/protocols/novell/novell.c:2928
+#: src/protocols/novell/novell.c:2980 src/protocols/oscar/oscar.c:691
+#: src/protocols/oscar/oscar.c:5760 src/protocols/oscar/oscar.c:6826
+#: src/protocols/oscar/oscar.c:7047 src/protocols/silc/buddy.c:1393
+#: src/protocols/silc/silc.c:52 src/protocols/yahoo/yahoo.c:2959
+#: src/protocols/zephyr/zephyr.c:2225 src/status.c:160
 msgid "Away"
 msgstr "离开"
 
@@ -186,7 +186,7 @@
 msgid "File Transfers"
 msgstr "文件传送"
 
-#: plugins/docklet/docklet.c:214 src/gtkaccount.c:2244
+#: plugins/docklet/docklet.c:214 src/gtkaccount.c:2298
 msgid "Accounts"
 msgstr "账户"
 
@@ -194,19 +194,15 @@
 msgid "Preferences"
 msgstr "首选项"
 
-#: plugins/docklet/docklet.c:224
-msgid "Log Out"
-msgstr "登出"
-
-#: plugins/docklet/docklet.c:228
+#: plugins/docklet/docklet.c:219
 msgid "Quit"
 msgstr "退出"
 
-#: plugins/docklet/docklet.c:559
+#: plugins/docklet/docklet.c:550
 msgid "Tray Icon Configuration"
 msgstr "托盘图标配置"
 
-#: plugins/docklet/docklet.c:563
+#: plugins/docklet/docklet.c:554
 msgid "_Hide new messages until tray icon is clicked"
 msgstr "直到点击托盘图标才显示新消息(_H)"
 
@@ -216,19 +212,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/docklet/docklet.c:589
+#: plugins/docklet/docklet.c:580
 msgid "System Tray Icon"
 msgstr "系统托盘图标"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/docklet/docklet.c:592
+#: plugins/docklet/docklet.c:583
 msgid "Displays an icon for Gaim in the system tray."
 msgstr "在系统托盘中显示 Gaim 的图标。"
 
 #. *  description
-#: plugins/docklet/docklet.c:594
+#: plugins/docklet/docklet.c:585
 msgid ""
 "Displays a system tray icon (in GNOME, KDE or Windows for example) to show "
 "the current status of Gaim, allow fast access to commonly used functions, "
@@ -313,7 +309,7 @@
 msgid "Invalid AIM URI"
 msgstr "无效的 AIM URI"
 
-#: plugins/gaim-remote/remote.c:749
+#: plugins/gaim-remote/remote.c:751
 #, c-format
 msgid ""
 "Failed to assign %s to a socket:\n"
@@ -322,7 +318,7 @@
 "将 %s 指派给套接字失败:\n"
 "%s"
 
-#: plugins/gaim-remote/remote.c:773
+#: plugins/gaim-remote/remote.c:775
 msgid "Unable to open socket"
 msgstr "无法打开套接字"
 
@@ -332,19 +328,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/gaim-remote/remote.c:823
+#: plugins/gaim-remote/remote.c:825
 msgid "Remote Control"
 msgstr "远程控制"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/gaim-remote/remote.c:826
+#: plugins/gaim-remote/remote.c:828
 msgid "Provides remote control for gaim applications."
 msgstr "提供 gaim 程序的远程控制。"
 
 #. *  description
-#: plugins/gaim-remote/remote.c:828
+#: plugins/gaim-remote/remote.c:830
 msgid ""
 "Gives Gaim the ability to be remote-controlled through third-party "
 "applications or through the gaim-remote tool."
@@ -505,7 +501,7 @@
 #: plugins/gevolution/add_buddy_dialog.c:132
 #: plugins/gevolution/assoc-buddy.c:120 src/gtkprefs.c:2014
 #: src/gtkroomlist.c:553 src/protocols/jabber/jabber.c:607
-#: src/protocols/msn/msn.c:1455 src/protocols/trepia/trepia.c:399
+#: src/protocols/msn/msn.c:1486 src/protocols/trepia/trepia.c:399
 msgid "Name"
 msgstr "名称"
 
@@ -520,13 +516,13 @@
 
 #. "Search"
 #: plugins/gevolution/add_buddy_dialog.c:468
-#: plugins/gevolution/assoc-buddy.c:354 src/protocols/oscar/oscar.c:7388
+#: plugins/gevolution/assoc-buddy.c:354 src/protocols/oscar/oscar.c:7411
 msgid "Search"
 msgstr "搜索"
 
 #: plugins/gevolution/add_buddy_dialog.c:549
-#: plugins/gevolution/new_person_dialog.c:304 src/gtkblist.c:4281
-#: src/gtkblist.c:4659
+#: plugins/gevolution/new_person_dialog.c:304 src/gtkblist.c:4325
+#: src/gtkblist.c:4703
 msgid "Group:"
 msgstr "组:"
 
@@ -563,7 +559,7 @@
 msgstr "关联好友(_A)"
 
 #: plugins/gevolution/gevo-util.c:64 plugins/gevolution/gevolution.c:90
-#: src/blist.c:517 src/blist.c:1226 src/blist.c:1440 src/gtkblist.c:4101
+#: src/blist.c:517 src/blist.c:1226 src/blist.c:1440 src/gtkblist.c:4145
 #: src/protocols/jabber/roster.c:66
 msgid "Buddies"
 msgstr "好友"
@@ -573,16 +569,16 @@
 msgstr "添加到地址簿"
 
 #. Configuration frame
-#: plugins/gevolution/gevolution.c:344
+#: plugins/gevolution/gevolution.c:345
 msgid "Evolution Integration Configuration"
 msgstr "Evolution 集成配置"
 
 #. Label
-#: plugins/gevolution/gevolution.c:347
+#: plugins/gevolution/gevolution.c:348
 msgid "Select all accounts that buddies should be auto-added to."
 msgstr "选择要将好友自动添加到哪些账户。"
 
-#: plugins/gevolution/gevolution.c:377 plugins/idle.c:52 src/gtkconn.c:416
+#: plugins/gevolution/gevolution.c:378 plugins/idle.c:52 src/gtkconn.c:426
 msgid "Account"
 msgstr "账户"
 
@@ -592,7 +588,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/gevolution/gevolution.c:460
+#: plugins/gevolution/gevolution.c:461
 msgid "Evolution Integration"
 msgstr "Evolution 集成"
 
@@ -600,7 +596,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/gevolution/gevolution.c:463 plugins/gevolution/gevolution.c:465
+#: plugins/gevolution/gevolution.c:464 plugins/gevolution/gevolution.c:466
 msgid "Provides integration with Ximian Evolution."
 msgstr "提供与 Ximian Evolution 的集成。"
 
@@ -626,8 +622,8 @@
 msgstr "额外信息:"
 
 #. Label
-#: plugins/gevolution/new_person_dialog.c:335 src/gtkaccount.c:377
-#: src/gtkaccount.c:407 src/protocols/oscar/oscar.c:597
+#: plugins/gevolution/new_person_dialog.c:335 src/gtkaccount.c:393
+#: src/gtkaccount.c:415 src/protocols/oscar/oscar.c:597
 msgid "Buddy Icon"
 msgstr "好友图标"
 
@@ -758,68 +754,73 @@
 msgstr "在好友列表旁显示一个小方块,标明您是否有新邮件。"
 
 #. ---------- "Notify For" ----------
-#: plugins/notify.c:618
+#: plugins/notify.c:638
 msgid "Notify For"
 msgstr "提醒"
 
-#: plugins/notify.c:622
+#: plugins/notify.c:642
 msgid "_IM windows"
 msgstr "即时消息窗口(_I)"
 
-#: plugins/notify.c:629
+#: plugins/notify.c:649
 msgid "C_hat windows"
 msgstr "聊天窗口(_H)"
 
-#: plugins/notify.c:636
+#: plugins/notify.c:656
 msgid "_Focused windows"
 msgstr "聚焦窗口(_F)"
 
 #. ---------- "Notification Methods" ----------
-#: plugins/notify.c:644
+#: plugins/notify.c:664
 msgid "Notification Methods"
 msgstr "通知方式"
 
-#: plugins/notify.c:654
+#: plugins/notify.c:671
 msgid "Prepend _string into window title:"
 msgstr "在窗口标题前追加字符串(_S):"
 
 #. Count method button
-#: plugins/notify.c:673
+#: plugins/notify.c:690
 msgid "Insert c_ount of new messages into window title"
 msgstr "在窗口标题中插入新消息数(_O)"
 
 #. Urgent method button
-#: plugins/notify.c:681
+#: plugins/notify.c:698
 msgid "Set window manager \"_URGENT\" hint"
 msgstr "设置窗口管理器“紧急”提示(_U)"
 
+#. Raise window method button
+#: plugins/notify.c:706
+msgid "R_aise conversation window"
+msgstr "升起对话窗口(_A)"
+
 #. ---------- "Notification Removals" ----------
-#: plugins/notify.c:689
+#: plugins/notify.c:714
 msgid "Notification Removal"
 msgstr "通知删除"
 
 #. Remove on focus button
-#: plugins/notify.c:694
+#: plugins/notify.c:719
 msgid "Remove when conversation window _gains focus"
 msgstr "对话窗口获得焦点后即删除(_G)"
 
 #. Remove on click button
-#: plugins/notify.c:701
+#: plugins/notify.c:726
 msgid "Remove when conversation window _receives click"
 msgstr "单击对话窗口后即删除(_R)"
 
 #. Remove on type button
-#: plugins/notify.c:709
+#: plugins/notify.c:734
 msgid "Remove when _typing in conversation window"
 msgstr "在对话窗口中打字后即删除(_T)"
 
 #. Remove on message send button
-#: plugins/notify.c:717
+#: plugins/notify.c:742
 msgid "Remove when a _message gets sent"
 msgstr "消息送出后即删除(_M)"
 
 #. Remove on conversation switch button
-#: plugins/notify.c:726
+#: plugins/notify.c:751
 msgid "Remove on switch to conversation ta_b"
 msgstr "切换对话标签后即删除(_B)"
 
@@ -829,7 +830,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/notify.c:816
+#: plugins/notify.c:841
 msgid "Message Notification"
 msgstr "消息通知"
 
@@ -837,7 +838,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/notify.c:819 plugins/notify.c:821
+#: plugins/notify.c:844 plugins/notify.c:846
 msgid "Provides a variety of ways of notifying you of unread messages."
 msgstr "提供各种方法通知您有未读消息。"
 
@@ -931,7 +932,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/signals-test.c:585
+#: plugins/signals-test.c:608
 msgid "Signals Test"
 msgstr "信号测试"
 
@@ -939,7 +940,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/signals-test.c:588 plugins/signals-test.c:590
+#: plugins/signals-test.c:611 plugins/signals-test.c:613
 msgid "Test to see that all signals are working properly."
 msgstr "测试看看所有的信号是否都工作正确。"
 
@@ -1230,7 +1231,7 @@
 msgstr "Windows 启动时启动 Gaim(_S)"
 
 #. Buddy List
-#: plugins/win32/winprefs/winprefs.c:338 src/gtkblist.c:3377
+#: plugins/win32/winprefs/winprefs.c:338 src/gtkblist.c:3424
 #: src/gtkprefs.c:2111
 msgid "Buddy List"
 msgstr "好友列表"
@@ -1303,48 +1304,48 @@
 #. *
 #. * A wrapper for gaim_request_action() that uses OK and Cancel buttons.
 #.
-#: src/account.c:797 src/connection.c:187 src/gtkblist.c:2605
-#: src/gtkdialogs.c:472 src/gtkdialogs.c:615 src/gtkdialogs.c:671
+#: src/account.c:797 src/connection.c:187 src/gtkblist.c:2654
+#: src/gtkdialogs.c:472 src/gtkdialogs.c:614 src/gtkdialogs.c:669
 #: src/gtkrequest.c:259 src/protocols/jabber/jabber.c:1097
 #: 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:2398
-#: src/protocols/oscar/oscar.c:3650 src/protocols/oscar/oscar.c:3744
-#: src/protocols/oscar/oscar.c:7117 src/protocols/oscar/oscar.c:7242
-#: src/protocols/oscar/oscar.c:7267 src/protocols/oscar/oscar.c:7319
+#: src/protocols/oscar/oscar.c:3661 src/protocols/oscar/oscar.c:3755
+#: src/protocols/oscar/oscar.c:7140 src/protocols/oscar/oscar.c:7265
+#: src/protocols/oscar/oscar.c:7290 src/protocols/oscar/oscar.c:7342
 #: src/protocols/silc/buddy.c:460 src/protocols/silc/buddy.c:1132
 #: src/protocols/silc/chat.c:422 src/protocols/silc/chat.c:460
 #: src/protocols/silc/chat.c:723 src/protocols/silc/ops.c:1083
 #: src/protocols/silc/ops.c:1689 src/protocols/silc/silc.c:706
-#: src/protocols/yahoo/yahoo.c:2650 src/protocols/yahoo/yahoo.c:2659
+#: src/protocols/yahoo/yahoo.c:2682 src/protocols/yahoo/yahoo.c:2691
 #: src/request.h:1244
 msgid "OK"
 msgstr "确定"
 
 #: src/account.c:798 src/account.c:836 src/connection.c:188
-#: src/gtkaccount.c:1989 src/gtkaccount.c:2404 src/gtkblist.c:2606
-#: src/gtkblist.c:4697 src/gtkdialogs.c:473 src/gtkdialogs.c:616
-#: src/gtkdialogs.c:672 src/gtkdialogs.c:770 src/gtkdialogs.c:792
-#: src/gtkdialogs.c:812 src/gtkdialogs.c:856 src/gtkdialogs.c:918
-#: src/gtkdialogs.c:960 src/gtkdialogs.c:998 src/gtkimhtmltoolbar.c:443
+#: src/gtkaccount.c:2004 src/gtkaccount.c:2458 src/gtkblist.c:2655
+#: src/gtkblist.c:4741 src/gtkdialogs.c:473 src/gtkdialogs.c:615
+#: src/gtkdialogs.c:670 src/gtkdialogs.c:768 src/gtkdialogs.c:790
+#: src/gtkdialogs.c:810 src/gtkdialogs.c:854 src/gtkdialogs.c:916
+#: src/gtkdialogs.c:958 src/gtkdialogs.c:996 src/gtkimhtmltoolbar.c:443
 #: src/gtkprivacy.c:585 src/gtkprivacy.c:598 src/gtkprivacy.c:623
 #: src/gtkprivacy.c:634 src/gtkrequest.c:260 src/gtksavedstatuses.c:188
-#: src/protocols/jabber/buddy.c:565 src/protocols/jabber/chat.c:774
+#: src/protocols/jabber/buddy.c:568 src/protocols/jabber/chat.c:777
 #: src/protocols/jabber/jabber.c:676 src/protocols/jabber/jabber.c:1098
 #: 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:1580 src/protocols/oscar/oscar.c:2399
-#: src/protocols/oscar/oscar.c:3608 src/protocols/oscar/oscar.c:3651
-#: src/protocols/oscar/oscar.c:3688 src/protocols/oscar/oscar.c:3745
-#: src/protocols/oscar/oscar.c:7118 src/protocols/oscar/oscar.c:7243
-#: src/protocols/oscar/oscar.c:7268 src/protocols/oscar/oscar.c:7320
-#: src/protocols/oscar/oscar.c:7389 src/protocols/silc/buddy.c:461
+#: src/protocols/oscar/oscar.c:3619 src/protocols/oscar/oscar.c:3662
+#: src/protocols/oscar/oscar.c:3699 src/protocols/oscar/oscar.c:3756
+#: src/protocols/oscar/oscar.c:7141 src/protocols/oscar/oscar.c:7266
+#: src/protocols/oscar/oscar.c:7291 src/protocols/oscar/oscar.c:7343
+#: src/protocols/oscar/oscar.c:7412 src/protocols/silc/buddy.c:461
 #: src/protocols/silc/buddy.c:1037 src/protocols/silc/buddy.c:1133
 #: src/protocols/silc/chat.c:595 src/protocols/silc/chat.c:724
 #: src/protocols/silc/ops.c:1690 src/protocols/silc/silc.c:707
-#: src/protocols/trepia/trepia.c:348 src/protocols/yahoo/yahoo.c:2651
-#: src/protocols/yahoo/yahoo.c:2660 src/request.h:1244 src/request.h:1254
+#: src/protocols/trepia/trepia.c:348 src/protocols/yahoo/yahoo.c:2683
+#: src/protocols/yahoo/yahoo.c:2692 src/request.h:1244 src/request.h:1254
 msgid "Cancel"
 msgstr "取消"
 
@@ -1353,13 +1354,13 @@
 msgid "Change user information for %s"
 msgstr "更改 %s 的用户信息"
 
-#: src/account.c:835 src/gtkrequest.c:266 src/protocols/jabber/buddy.c:564
+#: src/account.c:835 src/gtkrequest.c:266 src/protocols/jabber/buddy.c:567
 #: src/protocols/trepia/trepia.c:347
 msgid "Save"
 msgstr "保存"
 
-#: src/account.c:1240 src/gtkft.c:158 src/protocols/jabber/buddy.c:623
-#: src/protocols/jabber/buddy.c:1066 src/protocols/jabber/buddy.c:1083
+#: src/account.c:1240 src/gtkft.c:158 src/protocols/jabber/buddy.c:626
+#: src/protocols/jabber/buddy.c:1070 src/protocols/jabber/buddy.c:1087
 #: src/protocols/novell/novell.c:2823
 msgid "Unknown"
 msgstr "未知"
@@ -1432,67 +1433,67 @@
 msgid "Unable to send messge to %s."
 msgstr "无法给 %s 发送消息。"
 
-#: src/conversation.c:2052
+#: src/conversation.c:2083
 #, c-format
 msgid "%s entered the room."
 msgstr "%s 进入了聊天室。"
 
-#: src/conversation.c:2055
+#: src/conversation.c:2086
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>] 进入了聊天室。"
 
-#: src/conversation.c:2151
+#: src/conversation.c:2182
 #, c-format
 msgid "You are now known as %s"
 msgstr "您现在叫做 %s"
 
-#: src/conversation.c:2154
+#: src/conversation.c:2185
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s 现在叫做 %s。"
 
-#: src/conversation.c:2195
+#: src/conversation.c:2226
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s 离开了聊天室(%s)。"
 
-#: src/conversation.c:2197
+#: src/conversation.c:2228
 #, c-format
 msgid "%s left the room."
 msgstr "%s 离开了聊天室。"
 
-#: src/conversation.c:2270
+#: src/conversation.c:2301
 #, c-format
 msgid "(+%d more)"
 msgstr "(还有 %d 人)"
 
-#: src/conversation.c:2272
+#: src/conversation.c:2303
 #, c-format
 msgid " left the room (%s)."
 msgstr "离开了聊天室(%s)。"
 
-#: src/conversation.c:2677
+#: src/conversation.c:2708
 msgid "Last created window"
 msgstr "上次创建的窗口"
 
-#: src/conversation.c:2679
+#: src/conversation.c:2710
 msgid "Separate IM and Chat windows"
 msgstr "分离即时消息和聊天窗口"
 
-#: src/conversation.c:2681 src/gtkprefs.c:1221
+#: src/conversation.c:2712 src/gtkprefs.c:1221
 msgid "New window"
 msgstr "新建窗口"
 
-#: src/conversation.c:2683
+#: src/conversation.c:2714
 msgid "By group"
 msgstr "按组"
 
-#: src/conversation.c:2685
+#: src/conversation.c:2716
 msgid "By account"
 msgstr "按账户"
 
-#: src/ft.c:148 src/protocols/msn/msn.c:368
+#: src/ft.c:149 src/protocols/msn/msn.c:368
 #, c-format
 msgid ""
 "Error reading %s: \n"
@@ -1501,7 +1502,7 @@
 "读取 %s 出错:\n"
 "%s。\n"
 
-#: src/ft.c:152
+#: src/ft.c:153
 #, c-format
 msgid ""
 "Error writing %s: \n"
@@ -1510,7 +1511,7 @@
 "写入 %s 出错:\n"
 "%s。\n"
 
-#: src/ft.c:156
+#: src/ft.c:157
 #, c-format
 msgid ""
 "Error accessing %s: \n"
@@ -1519,35 +1520,35 @@
 "访问 %s出错:\n"
 "%s。\n"
 
-#: src/ft.c:188
+#: src/ft.c:189
 msgid "Cannot send a file of 0 bytes."
 msgstr "无法发送 0 字节的文件。"
 
-#: src/ft.c:198
+#: src/ft.c:199
 msgid "Cannot send a directory."
 msgstr "无法发送目录。"
 
-#: src/ft.c:205
+#: src/ft.c:206
 #, c-format
 msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
 msgstr "%s 不是普通文件。该文件拒绝覆盖。\n"
 
-#: src/ft.c:261
+#: src/ft.c:264
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "%s 想要给您发送 %s (%s)"
 
-#: src/ft.c:269
+#: src/ft.c:272
 #, c-format
 msgid "%s wants to send you a file"
 msgstr "%s 想要给您发送文件"
 
-#: src/ft.c:308
+#: src/ft.c:313
 #, c-format
 msgid "Accept file transfer request from %s?"
 msgstr "接受来自 %s 的文件传送吗?"
 
-#: src/ft.c:312
+#: src/ft.c:317
 #, c-format
 msgid ""
 "A file is available for download from:\n"
@@ -1558,53 +1559,58 @@
 "远程主机: %s\n"
 "远程端口: %d"
 
-#: src/ft.c:365
+#: src/ft.c:374
 #, c-format
 msgid "%s is not a valid filename.\n"
 msgstr "%s 不是合法的文件名。\n"
 
-#: src/ft.c:383
+#: src/ft.c:392
 #, c-format
 msgid "Offering to send %s to %s"
 msgstr "%2$s 发送 %1$s"
 
-#: src/ft.c:877
+#: src/ft.c:401
+#, c-format
+msgid "Starting transfer of %s from %s"
+msgstr "开始来自 %2$s 的 %1$s 传送"
+
+#: src/ft.c:555
 #, c-format
 msgid "Transfer of file %s complete"
 msgstr "文件 %s 传送完成"
 
-#: src/ft.c:880
+#: src/ft.c:558
 msgid "File transfer complete"
 msgstr "文件传送完成"
 
-#: src/ft.c:929
+#: src/ft.c:943
 #, c-format
 msgid "You canceled the transfer of %s"
 msgstr "您取消了 %s 的传送"
 
-#: src/ft.c:935
+#: src/ft.c:949
 msgid "File transfer cancelled"
 msgstr "文件传送已取消"
 
-#: src/ft.c:988
+#: src/ft.c:1007
 #, c-format
 msgid "%s canceled the transfer of %s"
 msgstr "%s 取消了 %s 的传送"
 
-#: src/ft.c:994
+#: src/ft.c:1013
 #, c-format
 msgid "%s canceled the file transfer"
 msgstr "%s 取消了文件传送"
 
-#: src/ft.c:1043
-#, c-format
-msgid "File transfer to %s aborted.\n"
-msgstr "您中止了给 %s 的文件传送。\n"
-
-#: src/ft.c:1045
-#, c-format
-msgid "File transfer from %s aborted.\n"
-msgstr "%s 中止了给您的文件传送。\n"
+#: src/ft.c:1070
+#, c-format
+msgid "File transfer to %s failed.\n"
+msgstr "给 %s 传送文件失败。\n"
+
+#: src/ft.c:1072
+#, c-format
+msgid "File transfer from %s failed.\n"
+msgstr "来自 %s 的文件传送失败。\n"
 
 #: src/gaim-remote.c:104
 #, c-format
@@ -1742,7 +1748,7 @@
 "\n"
 "发送即时消息\n"
 
-#: src/gtkaccount.c:329
+#: src/gtkaccount.c:343
 #, c-format
 msgid ""
 "<b>File:</b> %s\n"
@@ -1754,161 +1760,161 @@
 "<b>图像大小:</b> %dx%d"
 
 #. Build the login options frame.
-#: src/gtkaccount.c:652
+#: src/gtkaccount.c:663
 msgid "Login Options"
 msgstr "登入选项"
 
-#: src/gtkaccount.c:669 src/gtkft.c:554
+#: src/gtkaccount.c:680 src/gtkft.c:554
 msgid "Protocol:"
 msgstr "协议:"
 
-#: src/gtkaccount.c:674 src/gtkblist.c:4253
+#: src/gtkaccount.c:685 src/gtkblist.c:4297
 msgid "Screen Name:"
 msgstr "用户名:"
 
-#: src/gtkaccount.c:747
+#: src/gtkaccount.c:758
 msgid "Password:"
 msgstr "密码:"
 
-#: src/gtkaccount.c:752 src/gtkblist.c:4267 src/gtkblist.c:4644
+#: src/gtkaccount.c:763 src/gtkblist.c:4311 src/gtkblist.c:4688
 msgid "Alias:"
 msgstr "别名:"
 
-#: src/gtkaccount.c:756
+#: src/gtkaccount.c:767
 msgid "Remember password"
 msgstr "记住密码"
 
 #. Build the user options frame.
-#: src/gtkaccount.c:801
+#: src/gtkaccount.c:812
 msgid "User Options"
 msgstr "用户选项"
 
-#: src/gtkaccount.c:814
+#: src/gtkaccount.c:825
 msgid "New mail notifications"
 msgstr "新邮件通知"
 
-#: src/gtkaccount.c:823
+#: src/gtkaccount.c:834
 msgid "Buddy icon:"
 msgstr "好友图标:"
 
 #. Build the protocol options frame.
-#: src/gtkaccount.c:912
+#: src/gtkaccount.c:923
 #, c-format
 msgid "%s Options"
 msgstr "%s 选项"
 
 #. Use Global Proxy Settings
-#: src/gtkaccount.c:1048 src/gtkaccount.c:1095
+#: src/gtkaccount.c:1061 src/gtkaccount.c:1108
 msgid "Use Global Proxy Settings"
 msgstr "使用全局代理设置"
 
 #. No Proxy
-#: src/gtkaccount.c:1054 src/gtkaccount.c:1102
+#: src/gtkaccount.c:1067 src/gtkaccount.c:1115
 msgid "No Proxy"
 msgstr "无代理"
 
 #. HTTP
-#: src/gtkaccount.c:1060 src/gtkaccount.c:1109
+#: src/gtkaccount.c:1073 src/gtkaccount.c:1122
 msgid "HTTP"
 msgstr "HTTP"
 
 #. SOCKS 4
-#: src/gtkaccount.c:1066 src/gtkaccount.c:1116
+#: src/gtkaccount.c:1079 src/gtkaccount.c:1129
 msgid "SOCKS 4"
 msgstr "SOCKS 4"
 
 #. SOCKS 5
-#: src/gtkaccount.c:1072 src/gtkaccount.c:1123
+#: src/gtkaccount.c:1085 src/gtkaccount.c:1136
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
 #. Use Environmental Settings
-#: src/gtkaccount.c:1078 src/gtkaccount.c:1130 src/gtkprefs.c:1024
+#: src/gtkaccount.c:1091 src/gtkaccount.c:1143 src/gtkprefs.c:1024
 msgid "Use Environmental Settings"
 msgstr "使用环境设置"
 
-#: src/gtkaccount.c:1169
+#: src/gtkaccount.c:1182
 msgid "you can see the butterflies mating"
 msgstr "明日复明日"
 
-#: src/gtkaccount.c:1173
+#: src/gtkaccount.c:1186
 msgid "If you look real closely"
 msgstr "万事成蹉跎"
 
-#: src/gtkaccount.c:1189
+#: src/gtkaccount.c:1202
 msgid "Proxy Options"
 msgstr "代理选项"
 
-#: src/gtkaccount.c:1207 src/gtkprefs.c:1018
+#: src/gtkaccount.c:1220 src/gtkprefs.c:1018
 msgid "Proxy _type:"
 msgstr "代理类型(_T):"
 
-#: src/gtkaccount.c:1216 src/gtkprefs.c:1045
+#: src/gtkaccount.c:1229 src/gtkprefs.c:1045
 msgid "_Host:"
 msgstr "主机(_H):"
 
-#: src/gtkaccount.c:1220 src/gtkprefs.c:1063
+#: src/gtkaccount.c:1233 src/gtkprefs.c:1063
 msgid "_Port:"
 msgstr "端口(_P):"
 
-#: src/gtkaccount.c:1228
+#: src/gtkaccount.c:1241
 msgid "_Username:"
 msgstr "用户名(_U):"
 
-#: src/gtkaccount.c:1233 src/gtkprefs.c:1100
+#: src/gtkaccount.c:1246 src/gtkprefs.c:1100
 msgid "Pa_ssword:"
 msgstr "密码(_S):"
 
-#: src/gtkaccount.c:1602
+#: src/gtkaccount.c:1617
 msgid "Add Account"
 msgstr "添加账户"
 
-#: src/gtkaccount.c:1604
+#: src/gtkaccount.c:1619
 msgid "Modify Account"
 msgstr "修改账户"
 
 #. Add the disclosure
-#: src/gtkaccount.c:1628
+#: src/gtkaccount.c:1643
 msgid "Show more options"
 msgstr "显示全部选项"
 
-#: src/gtkaccount.c:1629
+#: src/gtkaccount.c:1644
 msgid "Show fewer options"
 msgstr "显示主要选项"
 
 #. Register button
-#: src/gtkaccount.c:1651 src/protocols/jabber/jabber.c:675
+#: src/gtkaccount.c:1666 src/protocols/jabber/jabber.c:675
 msgid "Register"
 msgstr "注册"
 
-#: src/gtkaccount.c:1983 src/gtksavedstatuses.c:184
+#: src/gtkaccount.c:1998 src/gtksavedstatuses.c:184
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "您真的想要删除 %s 吗?"
 
-#: src/gtkaccount.c:1988 src/gtkrequest.c:263 src/gtksavedstatuses.c:187
+#: src/gtkaccount.c:2003 src/gtkrequest.c:263 src/gtksavedstatuses.c:187
 msgid "Delete"
 msgstr "删除"
 
-#: src/gtkaccount.c:2045 src/gtksavedstatuses.c:622
-#: src/protocols/oscar/oscar.c:4297
+#: src/gtkaccount.c:2068 src/gtksavedstatuses.c:622
+#: src/protocols/oscar/oscar.c:4308
 msgid "Screen Name"
 msgstr "用户名"
 
-#: src/gtkaccount.c:2068
+#: src/gtkaccount.c:2091
 msgid "Enabled"
 msgstr "已启用"
 
-#: src/gtkaccount.c:2076
+#: src/gtkaccount.c:2099
 msgid "Protocol"
 msgstr "协议"
 
-#: src/gtkaccount.c:2379
+#: src/gtkaccount.c:2433
 #, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s%s"
 msgstr "%s%s%s%s 已经将 %s 加为好友%s%s%s"
 
-#: src/gtkaccount.c:2393
+#: src/gtkaccount.c:2447
 msgid ""
 "\n"
 "\n"
@@ -1918,251 +1924,248 @@
 "\n"
 "您是否想要将他/她添加为您的好友?"
 
-#: src/gtkaccount.c:2397
+#: src/gtkaccount.c:2451
 msgid "Information"
 msgstr "信息"
 
-#: src/gtkaccount.c:2401
+#: src/gtkaccount.c:2455
 msgid "Add buddy to your list?"
 msgstr "将用户加为好友吗?"
 
-#: src/gtkaccount.c:2403 src/gtkblist.c:4696 src/gtkconv.c:1454
-#: src/gtkrequest.c:264 src/protocols/oscar/oscar.c:3922
+#: src/gtkaccount.c:2457 src/gtkblist.c:4740 src/gtkconv.c:1453
+#: src/gtkrequest.c:264 src/protocols/oscar/oscar.c:3933
 #: src/protocols/silc/chat.c:594
 msgid "Add"
 msgstr "添加"
 
-#: src/gtkblist.c:840
+#: src/gtkblist.c:844
 msgid "Join a Chat"
 msgstr "加入聊天"
 
-#: src/gtkblist.c:861
+#: src/gtkblist.c:865
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 msgstr "请输入您想要加入的聊天的对应信息。\n"
 
-#: src/gtkblist.c:872 src/gtkpounce.c:415 src/gtkroomlist.c:354
+#: src/gtkblist.c:876 src/gtkpounce.c:415 src/gtkroomlist.c:354
 msgid "_Account:"
 msgstr "账户(_A):"
 
-#: src/gtkblist.c:1144
+#: src/gtkblist.c:1177
 msgid "Get _Info"
 msgstr "获取信息(_I)"
 
-#: src/gtkblist.c:1147
+#: src/gtkblist.c:1180
 msgid "I_M"
 msgstr "开聊(_M)"
 
-#: src/gtkblist.c:1153
+#: src/gtkblist.c:1186
 msgid "_Send File"
 msgstr "发送文件(_S)"
 
-#: src/gtkblist.c:1159
+#: src/gtkblist.c:1192
 msgid "Add Buddy _Pounce"
 msgstr "添加好友千里眼(_P)"
 
-#: src/gtkblist.c:1161 src/gtkblist.c:1258
+#: src/gtkblist.c:1196 src/gtkblist.c:1200 src/gtkblist.c:1298
+#: src/gtkblist.c:1321
 msgid "View _Log"
 msgstr "查看日志(_L)"
 
-#: src/gtkblist.c:1171
+#: src/gtkblist.c:1211
 msgid "_Alias Buddy..."
 msgstr "好友别名(_A)..."
 
-#: src/gtkblist.c:1173
+#: src/gtkblist.c:1213
 msgid "_Remove Buddy"
 msgstr "删除好友(_R)"
 
-#: src/gtkblist.c:1175
+#: src/gtkblist.c:1215
 msgid "Alias Contact..."
 msgstr "给联系人起别名..."
 
-#: src/gtkblist.c:1178 src/gtkdialogs.c:854 src/gtkdialogs.c:855
+#: src/gtkblist.c:1218 src/gtkdialogs.c:852 src/gtkdialogs.c:853
 msgid "Remove Contact"
 msgstr "删除联系人"
 
-#: src/gtkblist.c:1182 src/gtkblist.c:1266 src/gtkblist.c:1280
+#: src/gtkblist.c:1222 src/gtkblist.c:1306 src/gtkblist.c:1327
 msgid "_Alias..."
 msgstr "别名(_A)..."
 
-#: src/gtkblist.c:1184 src/gtkblist.c:1268 src/gtkblist.c:1285
-#: src/gtkconn.c:156
+#: src/gtkblist.c:1224 src/gtkblist.c:1308 src/gtkblist.c:1329
+#: src/gtkconn.c:166
 msgid "_Remove"
 msgstr "删除(_R)"
 
-#: src/gtkblist.c:1230
+#: src/gtkblist.c:1270
 msgid "Add a _Buddy"
 msgstr "添加好友(_B)"
 
-#: src/gtkblist.c:1232
+#: src/gtkblist.c:1272
 msgid "Add a C_hat"
 msgstr "添加聊天(_H)"
 
-#: src/gtkblist.c:1234
+#: src/gtkblist.c:1274
 msgid "_Delete Group"
 msgstr "删除组(_D)"
 
-#: src/gtkblist.c:1236
+#: src/gtkblist.c:1276
 msgid "_Rename"
 msgstr "重命名(_R)"
 
 #. join button
-#: src/gtkblist.c:1254 src/gtkroomlist.c:264 src/gtkroomlist.c:409
-#: src/gtkstock.c:89
+#: src/gtkblist.c:1294 src/gtkroomlist.c:264 src/gtkroomlist.c:409
+#: src/gtkstock.c:101
 msgid "_Join"
 msgstr "加入(_J)"
 
-#: src/gtkblist.c:1256
+#: src/gtkblist.c:1296
 msgid "Auto-Join"
 msgstr "自动加入"
 
-#: src/gtkblist.c:1282 src/gtkblist.c:1307
+#: src/gtkblist.c:1334 src/gtkblist.c:1357
 msgid "_Collapse"
 msgstr "折叠(_C)"
 
-#: src/gtkblist.c:1312
+#: src/gtkblist.c:1362
 msgid "_Expand"
 msgstr "展开(_E)"
 
-#: src/gtkblist.c:1529 src/gtkblist.c:1539 src/gtkblist.c:3509
-#: src/gtkblist.c:3512
+#: src/gtkblist.c:1579 src/gtkblist.c:1589 src/gtkblist.c:3557
+#: src/gtkblist.c:3560
 msgid "/Tools/Mute Sounds"
 msgstr "/工具(T)/静音(S)"
 
-#: src/gtkblist.c:1980 src/gtkconv.c:4145 src/gtkpounce.c:314
+#: src/gtkblist.c:2030 src/gtkconv.c:4143 src/gtkpounce.c:314
 msgid ""
 "You are not currently signed on with an account that can add that buddy."
 msgstr "您目前登入的协议中没有一个可以添加好友的。"
 
 #. Buddies menu
-#: src/gtkblist.c:2549
+#: src/gtkblist.c:2599
 msgid "/_Buddies"
 msgstr "/好友(_B)"
 
-#: src/gtkblist.c:2550
+#: src/gtkblist.c:2600
 msgid "/Buddies/New Instant _Message..."
 msgstr "/好友(B)/新即时消息(_M)..."
 
-#: src/gtkblist.c:2551
+#: src/gtkblist.c:2601
 msgid "/Buddies/Join a _Chat..."
 msgstr "/好友(B)/加入聊天(_C)..."
 
-#: src/gtkblist.c:2552
+#: src/gtkblist.c:2602
 msgid "/Buddies/Get User _Info..."
 msgstr "/好友(B)/获取用户信息(_I)..."
 
-#: src/gtkblist.c:2553
+#: src/gtkblist.c:2603
 msgid "/Buddies/View User _Log..."
 msgstr "/好友(B)/查看用户日志(_L)..."
 
-#: src/gtkblist.c:2555
+#: src/gtkblist.c:2605
 msgid "/Buddies/Show _Offline Buddies"
 msgstr "/好友(B)/显示离线好友(_O)"
 
-#: src/gtkblist.c:2556
+#: src/gtkblist.c:2606
 msgid "/Buddies/Show _Empty Groups"
 msgstr "/好友(B)/显示空组(_E)"
 
-#: src/gtkblist.c:2557
+#: src/gtkblist.c:2607
 msgid "/Buddies/_Add Buddy..."
 msgstr "/好友(B)/添加好友(_A)..."
 
-#: src/gtkblist.c:2558
+#: src/gtkblist.c:2608
 msgid "/Buddies/Add C_hat..."
 msgstr "/好友(B)/添加聊天(_H)..."
 
-#: src/gtkblist.c:2559
+#: src/gtkblist.c:2609
 msgid "/Buddies/Add _Group..."
 msgstr "/好友(B)/添加组(_G)..."
 
-#: src/gtkblist.c:2561
-msgid "/Buddies/_Log Out"
-msgstr "/好友(B)/登出(_L)"
-
-#: src/gtkblist.c:2562
+#: src/gtkblist.c:2611
 msgid "/Buddies/_Quit"
 msgstr "/好友(B)/退出(_Q)"
 
 #. Tools
-#: src/gtkblist.c:2565
+#: src/gtkblist.c:2614
 msgid "/_Tools"
 msgstr "/工具(_T)"
 
-#: src/gtkblist.c:2566
+#: src/gtkblist.c:2615
 msgid "/Tools/Buddy _Pounce"
 msgstr "/工具(T)/好友千里眼(_P)"
 
-#: src/gtkblist.c:2567
+#: src/gtkblist.c:2616
 msgid "/Tools/Account Ac_tions"
 msgstr "/工具(T)/账户操作(_T)"
 
-#: src/gtkblist.c:2568
+#: src/gtkblist.c:2617
 msgid "/Tools/Pl_ugin Actions"
 msgstr "/工具(T)/插件操作(_U)"
 
-#: src/gtkblist.c:2570
+#: src/gtkblist.c:2619
 msgid "/Tools/_Statuses"
 msgstr "/工具(T)/状态(_S)"
 
-#: src/gtkblist.c:2571
+#: src/gtkblist.c:2620
 msgid "/Tools/A_ccounts"
 msgstr "/工具(T)/账户(_C)"
 
-#: src/gtkblist.c:2572
+#: src/gtkblist.c:2621
 msgid "/Tools/Pr_eferences"
 msgstr "/工具(T)/首选项(_E)"
 
-#: src/gtkblist.c:2573
+#: src/gtkblist.c:2622
 msgid "/Tools/Pr_ivacy"
 msgstr "/工具(T)/隐私(_I)"
 
-#: src/gtkblist.c:2574
+#: src/gtkblist.c:2623
 msgid "/Tools/_File Transfers"
 msgstr "/工具(T)/文件传送(_F)"
 
-#: src/gtkblist.c:2575
+#: src/gtkblist.c:2624
 msgid "/Tools/R_oom List"
 msgstr "/工具(T)/房间列表(_O)"
 
-#: src/gtkblist.c:2577
+#: src/gtkblist.c:2626
 msgid "/Tools/Mute _Sounds"
 msgstr "/工具(T)/静音(_S)"
 
-#: src/gtkblist.c:2578
+#: src/gtkblist.c:2627
 msgid "/Tools/View System _Log"
 msgstr "/工具(T)/查看系统日志(_L)"
 
 #. Help
-#: src/gtkblist.c:2581
+#: src/gtkblist.c:2630
 msgid "/_Help"
 msgstr "/帮助(_H)"
 
-#: src/gtkblist.c:2582
+#: src/gtkblist.c:2631
 msgid "/Help/Online _Help"
 msgstr "/帮助(H)/在线帮助(_H)"
 
-#: src/gtkblist.c:2583
+#: src/gtkblist.c:2632
 msgid "/Help/_Debug Window"
 msgstr "/帮助(H)/调试窗口(_D)"
 
-#: src/gtkblist.c:2584
+#: src/gtkblist.c:2633
 msgid "/Help/_About"
 msgstr "/帮助(H)/关于(_A)"
 
-#: src/gtkblist.c:2602
+#: src/gtkblist.c:2651
 msgid "Rename Group"
 msgstr "重命名组"
 
-#: src/gtkblist.c:2602
+#: src/gtkblist.c:2651
 msgid "New group name"
 msgstr "新组名称"
 
-#: src/gtkblist.c:2603
+#: src/gtkblist.c:2652
 msgid "Please enter a new name for the selected group."
 msgstr "请输入选中组的新名字。"
 
-#: src/gtkblist.c:2634 src/gtkblist.c:2701
+#: src/gtkblist.c:2683 src/gtkblist.c:2750
 #, c-format
 msgid ""
 "\n"
@@ -2171,7 +2174,7 @@
 "\n"
 "<b>账户:</b>%s"
 
-#: src/gtkblist.c:2710
+#: src/gtkblist.c:2759
 #, c-format
 msgid ""
 "\n"
@@ -2180,7 +2183,7 @@
 "\n"
 "<b>联系人别名:</b> %s"
 
-#: src/gtkblist.c:2718
+#: src/gtkblist.c:2767
 #, c-format
 msgid ""
 "\n"
@@ -2189,7 +2192,7 @@
 "\n"
 "<b>别名:</b> %s"
 
-#: src/gtkblist.c:2726
+#: src/gtkblist.c:2775
 #, c-format
 msgid ""
 "\n"
@@ -2198,7 +2201,7 @@
 "\n"
 "<b>昵称:</b> %s"
 
-#: src/gtkblist.c:2735
+#: src/gtkblist.c:2784
 #, c-format
 msgid ""
 "\n"
@@ -2207,7 +2210,7 @@
 "\n"
 "<b>登入:</b> %s"
 
-#: src/gtkblist.c:2747
+#: src/gtkblist.c:2796
 #, c-format
 msgid ""
 "\n"
@@ -2216,7 +2219,7 @@
 "\n"
 "<b>瞌睡:</b> %s"
 
-#: src/gtkblist.c:2751
+#: src/gtkblist.c:2800
 msgid ""
 "\n"
 "<b>Idle</b>"
@@ -2224,7 +2227,7 @@
 "\n"
 "<b>瞌睡</b>"
 
-#: src/gtkblist.c:2762
+#: src/gtkblist.c:2811
 #, c-format
 msgid ""
 "\n"
@@ -2233,12 +2236,12 @@
 "\n"
 "<b>上次看见:</b> %s 以前"
 
-#: src/gtkblist.c:2771
+#: src/gtkblist.c:2820
 #, c-format
 msgid "%d%%"
 msgstr "%d%%"
 
-#: src/gtkblist.c:2772
+#: src/gtkblist.c:2821
 #, c-format
 msgid ""
 "\n"
@@ -2247,7 +2250,7 @@
 "\n"
 "<b>警告:</b> %s"
 
-#: src/gtkblist.c:2778
+#: src/gtkblist.c:2827
 msgid ""
 "\n"
 "<b>Status:</b> Offline"
@@ -2255,7 +2258,7 @@
 "\n"
 "<b>状态:</b> 离线"
 
-#: src/gtkblist.c:2799
+#: src/gtkblist.c:2848
 msgid ""
 "\n"
 "<b>Description:</b> Spooky"
@@ -2263,7 +2266,7 @@
 "\n"
 "<b>描述:</b>健谈"
 
-#: src/gtkblist.c:2801
+#: src/gtkblist.c:2850
 msgid ""
 "\n"
 "<b>Status:</b> Awesome"
@@ -2271,7 +2274,7 @@
 "\n"
 "<b>状态:</b> 可怕"
 
-#: src/gtkblist.c:2803
+#: src/gtkblist.c:2852
 msgid ""
 "\n"
 "<b>Status:</b> Rockin'"
@@ -2279,111 +2282,107 @@
 "\n"
 "<b>状态:</b> 混乱"
 
-#: src/gtkblist.c:3045
+#: src/gtkblist.c:3094
 #, c-format
 msgid "Idle (%dh%02dm) "
 msgstr "瞌睡中 (%d小时%02d分) "
 
-#: src/gtkblist.c:3047
+#: src/gtkblist.c:3096
 #, c-format
 msgid "Idle (%dm) "
 msgstr "瞌睡中 (%d分) "
 
-#: src/gtkblist.c:3050
+#: src/gtkblist.c:3099
 msgid "Idle "
 msgstr "瞌睡 "
 
-#: src/gtkblist.c:3056
+#: src/gtkblist.c:3105
 #, c-format
 msgid "Warned (%d%%) "
 msgstr "警告 (%d%%) "
 
-#: src/gtkblist.c:3060
+#: src/gtkblist.c:3109
 msgid "Offline "
 msgstr "离线 "
 
-#: src/gtkblist.c:3179
+#: src/gtkblist.c:3228
 msgid "/Buddies/New Instant Message..."
 msgstr "/好友(B)/新即时消息..."
 
-#: src/gtkblist.c:3180 src/gtkblist.c:3215
+#: src/gtkblist.c:3229 src/gtkblist.c:3263
 msgid "/Buddies/Join a Chat..."
 msgstr "/好友(B)/加入聊天(C)..."
 
-#: src/gtkblist.c:3181
+#: src/gtkblist.c:3230
 msgid "/Buddies/Get User Info..."
 msgstr "/好友(B)/获取用户信息..."
 
-#: src/gtkblist.c:3182
+#: src/gtkblist.c:3231
 msgid "/Buddies/Add Buddy..."
 msgstr "/好友(B)/添加好友..."
 
-#: src/gtkblist.c:3183
+#: src/gtkblist.c:3232
 msgid "/Buddies/Add Chat..."
 msgstr "/好友(B)/添加聊天..."
 
-#: src/gtkblist.c:3184
+#: src/gtkblist.c:3233
 msgid "/Buddies/Add Group..."
 msgstr "/好友(B)/添加组..."
 
-#: src/gtkblist.c:3185
-msgid "/Buddies/Log Out"
-msgstr "/好友(B)/登出"
-
-#: src/gtkblist.c:3218
+#: src/gtkblist.c:3266
 msgid "/Tools/Room List"
 msgstr "/工具(T)/房间列表(O)"
 
-#: src/gtkblist.c:3221
+#: src/gtkblist.c:3269
 msgid "/Tools/Privacy"
 msgstr "/工具(T)/隐私(I)"
 
-#: src/gtkblist.c:3289 src/gtkprefs.c:1708 src/protocols/jabber/jabber.c:936
+#: src/gtkblist.c:3337 src/gtkprefs.c:1708 src/protocols/jabber/jabber.c:936
 msgid "None"
 msgstr "无"
 
-#: src/gtkblist.c:3291
+#: src/gtkblist.c:3339
 msgid "Alphabetical"
 msgstr "按字母序"
 
-#: src/gtkblist.c:3292
+#: src/gtkblist.c:3340
 msgid "By status"
 msgstr "按状态"
 
-#: src/gtkblist.c:3293
+#: src/gtkblist.c:3341
 msgid "By log size"
 msgstr "按日志大小"
 
-#: src/gtkblist.c:3405
+#: src/gtkblist.c:3452
 msgid "/Tools/Buddy Pounce"
 msgstr "/工具(T)/好友千里眼(P)"
 
-#: src/gtkblist.c:3406
+#: src/gtkblist.c:3453
 msgid "/Tools/Account Actions"
 msgstr "/工具(T)/账户操作(T)"
 
-#: src/gtkblist.c:3407
+#: src/gtkblist.c:3454
 msgid "/Tools/Plugin Actions"
 msgstr "/工具(T)/插件操作(U)"
 
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: src/gtkblist.c:3505
+#: src/gtkblist.c:3553
 msgid "/Buddies/Show Offline Buddies"
 msgstr "/好友(B)/显示离线好友(O)"
 
-#: src/gtkblist.c:3507
+#: src/gtkblist.c:3555
 msgid "/Buddies/Show Empty Groups"
 msgstr "/好友(B)/显示空组(E)"
 
-#: src/gtkblist.c:4207 src/protocols/silc/buddy.c:731
+#: src/gtkblist.c:4251 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:2581
+#: src/protocols/silc/buddy.c:1124 src/protocols/yahoo/yahoo.c:2613
 msgid "Add Buddy"
 msgstr "添加好友"
 
-#: src/gtkblist.c:4231
+#: src/gtkblist.c:4275
 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. "
@@ -2393,47 +2392,47 @@
 "的话,别名将会替代用户名显示。\n"
 
 #. Set up stuff for the account box
-#: src/gtkblist.c:4291 src/gtkblist.c:4624
+#: src/gtkblist.c:4335 src/gtkblist.c:4668
 msgid "Account:"
 msgstr "账户:"
 
-#: src/gtkblist.c:4557
+#: src/gtkblist.c:4601
 msgid "This protocol does not support chat rooms."
 msgstr "此协议不支持聊天室。"
 
-#: src/gtkblist.c:4573
+#: src/gtkblist.c:4617
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
 msgstr "您目前登入的协议中没有一个可以聊天的。"
 
-#: src/gtkblist.c:4590
+#: src/gtkblist.c:4634
 msgid "Add Chat"
 msgstr "添加聊天"
 
-#: src/gtkblist.c:4614
+#: src/gtkblist.c:4658
 msgid ""
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
 msgstr "您想要将聊天加入您的好友列表,请输入该聊天的别名和对应信息。\n"
 
-#: src/gtkblist.c:4693
+#: src/gtkblist.c:4737
 msgid "Add Group"
 msgstr "添加组"
 
-#: src/gtkblist.c:4694
+#: src/gtkblist.c:4738
 msgid "Please enter the name of the group to be added."
 msgstr "请输入要添加的组名称。"
 
-#: src/gtkblist.c:5239 src/gtkblist.c:5335
+#: src/gtkblist.c:5288 src/gtkblist.c:5384
 msgid "No actions available"
 msgstr "没有可用的操作"
 
-#: src/gtkconn.c:156 src/gtkconn.c:389
+#: src/gtkconn.c:166 src/gtkconn.c:399
 msgid "_Reconnect"
 msgstr "重新连接(_R)"
 
-#: src/gtkconn.c:353
+#: src/gtkconn.c:363
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">%s has been disconnected.</span>\n"
@@ -2446,36 +2445,36 @@
 "%s\n"
 "%s"
 
-#: src/gtkconn.c:355
+#: src/gtkconn.c:365
 msgid "Reason Unknown."
 msgstr "原因未知。"
 
-#: src/gtkconn.c:363
+#: src/gtkconn.c:373
 msgid "Disconnected"
 msgstr "已断开连接"
 
-#: src/gtkconn.c:394
+#: src/gtkconn.c:404
 msgid "Reconnect _All"
 msgstr "全部重新连接(_A)"
 
-#: src/gtkconn.c:424
+#: src/gtkconn.c:434
 msgid "Time"
 msgstr "时间"
 
-#: src/gtkconv.c:310
+#: src/gtkconv.c:309
 #, c-format
 msgid "me is using Gaim v%s."
 msgstr "我正在使用 Gaim v%s。"
 
-#: src/gtkconv.c:319
+#: src/gtkconv.c:318
 msgid "Supported debug options are:  version"
 msgstr "支持的调试选项有: version"
 
-#: src/gtkconv.c:343
+#: src/gtkconv.c:342
 msgid "No such command (in this context)."
 msgstr "没有这样的命令(在此环境中)。"
 
-#: src/gtkconv.c:346
+#: src/gtkconv.c:345
 msgid ""
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
 "The following commands are available in this context:\n"
@@ -2483,354 +2482,354 @@
 "使用“/help &lt;命令&gt;”可获得具体命令的帮助。\n"
 "此环境下可使用下列命令:\n"
 
-#: src/gtkconv.c:418
+#: src/gtkconv.c:417
 msgid "No such command."
 msgstr "没有这样的命令。"
 
-#: src/gtkconv.c:425
+#: src/gtkconv.c:424
 msgid "Syntax Error:  You typed the wrong number of arguments to that command."
 msgstr "系统错误: 您给命令传送的参数个数不对。"
 
-#: src/gtkconv.c:430
+#: src/gtkconv.c:429
 msgid "Your command failed for an unknown reason."
 msgstr "您的命令失败,原因未知。"
 
-#: src/gtkconv.c:437
+#: src/gtkconv.c:436
 msgid "That command only works in Chats, not IMs."
 msgstr "命令只在聊天中可用,对话中无效。"
 
-#: src/gtkconv.c:440
+#: src/gtkconv.c:439
 msgid "That command only works in IMs, not Chats."
 msgstr "命令只在对话中可用,聊天中无效。"
 
-#: src/gtkconv.c:444
+#: src/gtkconv.c:443
 msgid "That command doesn't work on this protocol."
 msgstr "命令无法在此协议下工作。"
 
-#: src/gtkconv.c:672 src/gtkconv.c:698
+#: src/gtkconv.c:671 src/gtkconv.c:697
 msgid "That buddy is not on the same protocol as this chat"
 msgstr "该好友不在此聊天的协议中"
 
-#: src/gtkconv.c:692
+#: src/gtkconv.c:691
 msgid ""
 "You are not currently signed on with an account that can invite that buddy."
 msgstr "您目前登入的协议中没有一个可以邀请好友的。"
 
-#: src/gtkconv.c:746
+#: src/gtkconv.c:745
 msgid "Invite Buddy Into Chat Room"
 msgstr "邀请好友进入聊天室"
 
 #. Put our happy label in it.
-#: src/gtkconv.c:776
+#: src/gtkconv.c:775
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
 msgstr "您想要邀请谁?请输入他/她的名字,以及可选的邀请消息。"
 
-#: src/gtkconv.c:797
+#: src/gtkconv.c:796
 msgid "_Buddy:"
 msgstr "好友(_B):"
 
-#: src/gtkconv.c:817 src/gtksavedstatuses.c:774
+#: src/gtkconv.c:816 src/gtksavedstatuses.c:774
 msgid "_Message:"
 msgstr "消息(_M):"
 
-#: src/gtkconv.c:873 src/gtkconv.c:2524 src/gtkdebug.c:177
+#: src/gtkconv.c:872 src/gtkconv.c:2521 src/gtkdebug.c:177
 msgid "Unable to open file."
 msgstr "无法打开文件。"
 
-#: src/gtkconv.c:878
+#: src/gtkconv.c:877
 #, c-format
 msgid "<h1>Conversation with %s</h1>\n"
 msgstr "<h1>与 %s 的谈话</h1>\n"
 
-#: src/gtkconv.c:892
+#: src/gtkconv.c:891
 msgid "Save Conversation"
 msgstr "保存对话"
 
-#: src/gtkconv.c:977 src/gtkdebug.c:126
+#: src/gtkconv.c:976 src/gtkdebug.c:126
 msgid "Find"
 msgstr "查找"
 
-#: src/gtkconv.c:1003 src/gtkdebug.c:154
+#: src/gtkconv.c:1002 src/gtkdebug.c:154
 msgid "_Search for:"
 msgstr "搜索文字(_S):"
 
-#: src/gtkconv.c:1415
+#: src/gtkconv.c:1414
 msgid "IM"
 msgstr "开聊"
 
-#: src/gtkconv.c:1421 src/protocols/oscar/oscar.c:612
+#: src/gtkconv.c:1420 src/protocols/oscar/oscar.c:612
 msgid "Send File"
 msgstr "发送文件"
 
-#: src/gtkconv.c:1428
+#: src/gtkconv.c:1427
 msgid "Un-Ignore"
 msgstr "取消忽略"
 
-#: src/gtkconv.c:1431 src/gtkprefs.c:762
+#: src/gtkconv.c:1430 src/gtkprefs.c:762
 msgid "Ignore"
 msgstr "忽略"
 
-#: src/gtkconv.c:1436
+#: src/gtkconv.c:1435
 msgid "Info"
 msgstr "信息"
 
-#: src/gtkconv.c:1442
+#: src/gtkconv.c:1441
 msgid "Get Away Message"
 msgstr "获得离开消息"
 
-#: src/gtkconv.c:1451 src/gtkrequest.c:265
+#: src/gtkconv.c:1450 src/gtkrequest.c:265
 msgid "Remove"
 msgstr "删除"
 
-#: src/gtkconv.c:2532
+#: src/gtkconv.c:2529
 msgid "Unable to save icon file to disk."
 msgstr "无法将图标文件保存到磁盘。"
 
-#: src/gtkconv.c:2553
+#: src/gtkconv.c:2550
 msgid "Save Icon"
 msgstr "保存图标"
 
-#: src/gtkconv.c:2583
+#: src/gtkconv.c:2580
 msgid "Animate"
 msgstr "动画"
 
-#: src/gtkconv.c:2588
+#: src/gtkconv.c:2585
 msgid "Hide Icon"
 msgstr "隐藏图标"
 
-#: src/gtkconv.c:2594
+#: src/gtkconv.c:2591
 msgid "Save Icon As..."
 msgstr "图标另存为..."
 
-#: src/gtkconv.c:2952
+#: src/gtkconv.c:2950
 msgid "User is typing..."
 msgstr "用户正在打字..."
 
-#: src/gtkconv.c:2957
+#: src/gtkconv.c:2955
 msgid "User has typed something and paused"
 msgstr "用户打了几个字,停了一下"
 
 #. Build the Send As menu
-#: src/gtkconv.c:3058
+#: src/gtkconv.c:3056
 msgid "_Send As"
 msgstr "发送身份(_S)"
 
 #. Conversation menu
-#: src/gtkconv.c:3512
+#: src/gtkconv.c:3510
 msgid "/_Conversation"
 msgstr "/对话(_C)"
 
-#: src/gtkconv.c:3514
+#: src/gtkconv.c:3512
 msgid "/Conversation/New Instant _Message..."
 msgstr "/对话(C)/新即时消息(_M)..."
 
-#: src/gtkconv.c:3519
+#: src/gtkconv.c:3517
 msgid "/Conversation/_Find..."
 msgstr "/对话(C)/查找(_F)..."
 
-#: src/gtkconv.c:3521
+#: src/gtkconv.c:3519
 msgid "/Conversation/View _Log"
 msgstr "/对话(C)/查看日志(_L)"
 
+#: src/gtkconv.c:3520
+msgid "/Conversation/_Save As..."
+msgstr "/对话(C)/另存为(_S)..."
+
 #: src/gtkconv.c:3522
-msgid "/Conversation/_Save As..."
-msgstr "/对话(C)/另存为(_S)..."
-
-#: src/gtkconv.c:3524
 msgid "/Conversation/Clear"
 msgstr "/对话(C)/清除"
 
-#: src/gtkconv.c:3528
+#: src/gtkconv.c:3526
 msgid "/Conversation/Se_nd File..."
 msgstr "/对话(C)/发送文件(_N)..."
 
+#: src/gtkconv.c:3527
+msgid "/Conversation/Add Buddy _Pounce..."
+msgstr "/对话(C)/添加好友千里眼(_P)..."
+
 #: src/gtkconv.c:3529
-msgid "/Conversation/Add Buddy _Pounce..."
-msgstr "/对话(C)/添加好友千里眼(_P)..."
-
-#: src/gtkconv.c:3531
 msgid "/Conversation/_Get Info"
 msgstr "/对话(C)/获取信息(_G)"
 
-#: src/gtkconv.c:3533
+#: src/gtkconv.c:3531
 msgid "/Conversation/_Warn..."
 msgstr "/对话(C)/警告(_W)..."
 
-#: src/gtkconv.c:3535
+#: src/gtkconv.c:3533
 msgid "/Conversation/In_vite..."
 msgstr "/对话(C)/邀请(_V)..."
 
-#: src/gtkconv.c:3540
+#: src/gtkconv.c:3538
 msgid "/Conversation/A_lias..."
 msgstr "/对话(C)/别名(_L)..."
 
-#: src/gtkconv.c:3542
+#: src/gtkconv.c:3540
 msgid "/Conversation/_Block..."
 msgstr "/对话(C)/屏蔽(_B)..."
 
+#: src/gtkconv.c:3542
+msgid "/Conversation/_Add..."
+msgstr "/对话(C)/添加(_A)..."
+
 #: src/gtkconv.c:3544
-msgid "/Conversation/_Add..."
-msgstr "/对话(C)/添加(_A)..."
-
-#: src/gtkconv.c:3546
 msgid "/Conversation/_Remove..."
 msgstr "/对话(C)/删除(_R)..."
 
+#: src/gtkconv.c:3549
+msgid "/Conversation/Insert Lin_k..."
+msgstr "/对话(C)/插入链接(_K)..."
+
 #: src/gtkconv.c:3551
-msgid "/Conversation/Insert Lin_k..."
-msgstr "/对话(C)/插入链接(_K)..."
-
-#: src/gtkconv.c:3553
 msgid "/Conversation/Insert Imag_e..."
 msgstr "/对话(C)/插入图像(_E)..."
 
-#: src/gtkconv.c:3558
+#: src/gtkconv.c:3556
 msgid "/Conversation/_Close"
 msgstr "/对话(C)/关闭(_C)"
 
 #. Options
-#: src/gtkconv.c:3562
+#: src/gtkconv.c:3560
 msgid "/_Options"
 msgstr "/选项(_O)"
 
-#: src/gtkconv.c:3563
+#: src/gtkconv.c:3561
 msgid "/Options/Enable _Logging"
 msgstr "/选项(O)/允许记录日志(_L)"
 
-#: src/gtkconv.c:3564
+#: src/gtkconv.c:3562
 msgid "/Options/Enable _Sounds"
 msgstr "/选项(O)/允许声音(_S)"
 
-#: src/gtkconv.c:3565
+#: src/gtkconv.c:3563
 msgid "/Options/Show Formatting _Toolbars"
 msgstr "/选项(O)/显示格式工具栏(_T)"
 
-#: src/gtkconv.c:3566
+#: src/gtkconv.c:3564
 msgid "/Options/Show T_imestamps"
 msgstr "/选项(O)/显示时间戳(_I)"
 
-#: src/gtkconv.c:3567
+#: src/gtkconv.c:3565
 msgid "/Options/Show Buddy _Icon"
 msgstr "/选项(O)/显示好友图标(_I)"
 
-#: src/gtkconv.c:3611
+#: src/gtkconv.c:3609
 msgid "/Conversation/View Log"
 msgstr "/对话(C)/查看日志(L)"
 
-#: src/gtkconv.c:3616
+#: src/gtkconv.c:3614
 msgid "/Conversation/Send File..."
 msgstr "/对话(C)/发送文件(N)..."
 
-#: src/gtkconv.c:3620
+#: src/gtkconv.c:3618
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/对话(C)/添加好友千里眼(P)..."
 
-#: src/gtkconv.c:3626
+#: src/gtkconv.c:3624
 msgid "/Conversation/Get Info"
 msgstr "/对话(C)/获取信息(G)"
 
-#: src/gtkconv.c:3630
+#: src/gtkconv.c:3628
 msgid "/Conversation/Warn..."
 msgstr "/对话(C)/警告(W)..."
 
-#: src/gtkconv.c:3634
+#: src/gtkconv.c:3632
 msgid "/Conversation/Invite..."
 msgstr "/对话(C)/邀请(V)..."
 
-#: src/gtkconv.c:3640
+#: src/gtkconv.c:3638
 msgid "/Conversation/Alias..."
 msgstr "/对话(C)/别名(L)..."
 
-#: src/gtkconv.c:3644
+#: src/gtkconv.c:3642
 msgid "/Conversation/Block..."
 msgstr "/对话(C)/屏蔽(B)..."
 
-#: src/gtkconv.c:3648
+#: src/gtkconv.c:3646
 msgid "/Conversation/Add..."
 msgstr "/对话(C)/添加(A)..."
 
-#: src/gtkconv.c:3652
+#: src/gtkconv.c:3650
 msgid "/Conversation/Remove..."
 msgstr "/对话(C)/删除(R)..."
 
-#: src/gtkconv.c:3658
+#: src/gtkconv.c:3656
 msgid "/Conversation/Insert Link..."
 msgstr "/对话(C)/插入链接(K)..."
 
-#: src/gtkconv.c:3662
+#: src/gtkconv.c:3660
 msgid "/Conversation/Insert Image..."
 msgstr "/对话(C)/插入图像(I)..."
 
-#: src/gtkconv.c:3668
+#: src/gtkconv.c:3666
 msgid "/Options/Enable Logging"
 msgstr "/选项(O)/允许记录(L)"
 
-#: src/gtkconv.c:3671
+#: src/gtkconv.c:3669
 msgid "/Options/Enable Sounds"
 msgstr "/选项(O)/允许声音(S)"
 
-#: src/gtkconv.c:3674
+#: src/gtkconv.c:3672
 msgid "/Options/Show Formatting Toolbars"
 msgstr "/选项(O)/显示格式工具栏(T)"
 
-#: src/gtkconv.c:3677
+#: src/gtkconv.c:3675
 msgid "/Options/Show Timestamps"
 msgstr "/选项(O)/显示时间戳(I)"
 
-#: src/gtkconv.c:3680
+#: src/gtkconv.c:3678
 msgid "/Options/Show Buddy Icon"
 msgstr "/选项(O)/显示好友图标(I)"
 
-#: src/gtkconv.c:3795
+#: src/gtkconv.c:3793
 msgid "Topic:"
 msgstr "话题:"
 
 #. Setup the label telling how many people are in the room.
-#: src/gtkconv.c:3843
+#: src/gtkconv.c:3841
 msgid "0 people in room"
 msgstr "聊天室里没有人"
 
-#: src/gtkconv.c:3905
+#: src/gtkconv.c:3903
 msgid "IM the user"
 msgstr "给用户发送即时消息"
 
-#: src/gtkconv.c:3918
+#: src/gtkconv.c:3916
 msgid "Ignore the user"
 msgstr "忽略用户"
 
-#: src/gtkconv.c:3930
+#: src/gtkconv.c:3928
 msgid "Get the user's information"
 msgstr "获取用户信息"
 
-#: src/gtkconv.c:4431
+#: src/gtkconv.c:4429
 msgid "Close conversation"
 msgstr "关闭对话"
 
-#: src/gtkconv.c:4933 src/gtkconv.c:4962 src/gtkconv.c:5058 src/gtkconv.c:5116
+#: src/gtkconv.c:4931 src/gtkconv.c:4960 src/gtkconv.c:5056 src/gtkconv.c:5114
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "聊天室里有 %d 个人"
 
-#: src/gtkconv.c:6021
+#: src/gtkconv.c:6023
 msgid ""
 "say &lt;message&gt;:  Send a message normally as if you weren't using a "
 "command."
 msgstr "say &lt;消息&gt;: 发送普通消息,就好像您未使用命令。"
 
-#: src/gtkconv.c:6024
+#: src/gtkconv.c:6026
 msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
 msgstr "me &lt;动作&gt;: 向好友或聊天发送 IRC 风格的动作。"
 
-#: src/gtkconv.c:6027
+#: src/gtkconv.c:6029
 msgid ""
 "debug &lt;option&gt;:  Send various debug information to the current "
 "conversation."
 msgstr "debug &lt;选项&gt;: 在当前对话中发送各种调试信息。"
 
-#: src/gtkconv.c:6031
+#: src/gtkconv.c:6033
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr "help &lt;命令&gt;: 关于具体命令的帮助。"
 
@@ -2851,204 +2850,204 @@
 msgstr "时间戳"
 
 #: src/gtkdialogs.c:66
-msgid "maintainer"
-msgstr "维护者"
-
-#: src/gtkdialogs.c:67
 msgid "lead developer"
 msgstr "领导开发者"
 
-#: src/gtkdialogs.c:68 src/gtkdialogs.c:71 src/gtkdialogs.c:72
-#: src/gtkdialogs.c:73 src/gtkdialogs.c:74 src/gtkdialogs.c:75
-#: src/gtkdialogs.c:77
+#: src/gtkdialogs.c:67 src/gtkdialogs.c:70 src/gtkdialogs.c:71
+#: src/gtkdialogs.c:72 src/gtkdialogs.c:73 src/gtkdialogs.c:74
+#: src/gtkdialogs.c:76
 msgid "developer"
 msgstr "开发者"
 
+#: src/gtkdialogs.c:68
+msgid "developer & webmaster"
+msgstr "开发者和网管"
+
 #: src/gtkdialogs.c:69
-msgid "developer & webmaster"
-msgstr "开发者和网管"
-
-#: src/gtkdialogs.c:70
 msgid "win32 port"
 msgstr "Win32 移植"
 
-#: src/gtkdialogs.c:76
+#: src/gtkdialogs.c:75
 msgid "support"
 msgstr "支持"
 
 #: src/gtkdialogs.c:93
+msgid "maintainer"
+msgstr "维护者"
+
+#: src/gtkdialogs.c:94
 msgid "former libfaim maintainer"
 msgstr "先前 libfaim 维护者"
 
-#: src/gtkdialogs.c:94
-msgid "former lead developer"
-msgstr "先前领导开发者"
-
 #: src/gtkdialogs.c:95
-msgid "former maintainer"
-msgstr "先前维护者"
+msgid "former lead developer"
+msgstr "先前领导开发者"
 
 #: src/gtkdialogs.c:96
+msgid "former maintainer"
+msgstr "先前维护者"
+
+#: src/gtkdialogs.c:97
 msgid "former Jabber developer"
 msgstr "先前 Jabber 开发者"
 
-#: src/gtkdialogs.c:97
-msgid "original author"
-msgstr "原作者"
-
 #: src/gtkdialogs.c:98
+msgid "original author"
+msgstr "原作者"
+
+#: src/gtkdialogs.c:99
 msgid "hacker and designated driver [lazy bum]"
 msgstr "骇客和专属驱动程序[lazy bum]"
 
-#: src/gtkdialogs.c:103 src/gtkdialogs.c:141
+#: src/gtkdialogs.c:104 src/gtkdialogs.c:142
 msgid "Bulgarian"
 msgstr "保加利亚语"
 
-#: src/gtkdialogs.c:104 src/gtkdialogs.c:142 src/gtkdialogs.c:143
+#: src/gtkdialogs.c:105 src/gtkdialogs.c:143 src/gtkdialogs.c:144
 msgid "Catalan"
 msgstr "加泰罗尼亚语"
 
-#: src/gtkdialogs.c:105 src/gtkdialogs.c:144
+#: src/gtkdialogs.c:106 src/gtkdialogs.c:145
 msgid "Czech"
 msgstr "捷克语"
 
-#: src/gtkdialogs.c:106
+#: src/gtkdialogs.c:107
 msgid "Danish"
 msgstr "丹麦语"
 
-#: src/gtkdialogs.c:107
+#: src/gtkdialogs.c:108
 msgid "Australian English"
 msgstr "澳大利亚英语"
 
-#: src/gtkdialogs.c:108
+#: src/gtkdialogs.c:109
 msgid "British English"
 msgstr "英国英语"
 
-#: src/gtkdialogs.c:109
+#: src/gtkdialogs.c:110
 msgid "Canadian English"
 msgstr "加拿大英语"
 
-#: src/gtkdialogs.c:110 src/gtkdialogs.c:145
+#: src/gtkdialogs.c:111 src/gtkdialogs.c:146
 msgid "German"
 msgstr "德语"
 
-#: src/gtkdialogs.c:111 src/gtkdialogs.c:146
+#: src/gtkdialogs.c:112 src/gtkdialogs.c:147
 msgid "Spanish"
 msgstr "西班牙语"
 
-#: src/gtkdialogs.c:112 src/gtkdialogs.c:147
-msgid "Finnish"
-msgstr "芬兰语"
-
 #: src/gtkdialogs.c:113 src/gtkdialogs.c:148
+msgid "Finnish"
+msgstr "芬兰语"
+
+#: src/gtkdialogs.c:114 src/gtkdialogs.c:149
 msgid "French"
 msgstr "法语"
 
-#: src/gtkdialogs.c:114
+#: src/gtkdialogs.c:115
 msgid "Hebrew"
 msgstr "希伯莱语"
 
-#: src/gtkdialogs.c:115
+#: src/gtkdialogs.c:116
 msgid "Hindi"
 msgstr "印地语"
 
-#: src/gtkdialogs.c:116
+#: src/gtkdialogs.c:117
 msgid "Hungarian"
 msgstr "匈牙利语"
 
-#: src/gtkdialogs.c:117 src/gtkdialogs.c:149
+#: src/gtkdialogs.c:118 src/gtkdialogs.c:150
 msgid "Italian"
 msgstr "意大利语"
 
-#: src/gtkdialogs.c:118 src/gtkdialogs.c:150
+#: src/gtkdialogs.c:119 src/gtkdialogs.c:151
 msgid "Japanese"
 msgstr "日语"
 
-#: src/gtkdialogs.c:119
+#: src/gtkdialogs.c:120
 msgid "Lithuanian"
 msgstr "立陶宛语"
 
-#: src/gtkdialogs.c:120 src/gtkdialogs.c:151
+#: src/gtkdialogs.c:121 src/gtkdialogs.c:152
 msgid "Korean"
 msgstr "朝鲜语"
 
-#: src/gtkdialogs.c:121
+#: src/gtkdialogs.c:122
 msgid "Dutch; Flemish"
 msgstr "荷兰语"
 
-#: src/gtkdialogs.c:122
+#: src/gtkdialogs.c:123
 msgid "Macedonian"
 msgstr "马其顿语"
 
-#: src/gtkdialogs.c:123
+#: src/gtkdialogs.c:124
 msgid "Norwegian"
 msgstr "挪威语"
 
-#: src/gtkdialogs.c:124 src/gtkdialogs.c:152
+#: src/gtkdialogs.c:125 src/gtkdialogs.c:153
 msgid "Polish"
 msgstr "波兰语"
 
-#: src/gtkdialogs.c:125
+#: src/gtkdialogs.c:126
 msgid "Portuguese"
 msgstr "葡萄牙语"
 
-#: src/gtkdialogs.c:126
+#: src/gtkdialogs.c:127
 msgid "Portuguese-Brazil"
 msgstr "巴西葡萄牙语"
 
-#: src/gtkdialogs.c:127
+#: src/gtkdialogs.c:128
 msgid "Romanian"
 msgstr "罗马尼亚语"
 
-#: src/gtkdialogs.c:128 src/gtkdialogs.c:153 src/gtkdialogs.c:154
+#: src/gtkdialogs.c:129 src/gtkdialogs.c:154 src/gtkdialogs.c:155
 msgid "Russian"
 msgstr "俄语"
 
-#: src/gtkdialogs.c:129
+#: src/gtkdialogs.c:130
 msgid "Serbian"
 msgstr "塞尔维亚语"
 
-#: src/gtkdialogs.c:130
+#: src/gtkdialogs.c:131
 msgid "Slovenian"
 msgstr "斯洛文尼亚语"
 
-#: src/gtkdialogs.c:131 src/gtkdialogs.c:156
+#: src/gtkdialogs.c:132 src/gtkdialogs.c:157
 msgid "Swedish"
 msgstr "瑞典语"
 
-#: src/gtkdialogs.c:132
+#: src/gtkdialogs.c:133
 msgid "Vietnamese"
 msgstr "越南语"
 
-#: src/gtkdialogs.c:132
+#: src/gtkdialogs.c:133
 msgid "T.M.Thanh and the Gnome-Vi Team"
 msgstr "T.M.Thanh 及 Gnome 越南语团队"
 
-#: src/gtkdialogs.c:133
-msgid "Simplified Chinese"
-msgstr "简体中文"
-
 #: src/gtkdialogs.c:134
+msgid "Simplified Chinese"
+msgstr "简体中文"
+
+#: src/gtkdialogs.c:135
 msgid "Traditional Chinese"
 msgstr "繁体中文"
 
-#: src/gtkdialogs.c:140
+#: src/gtkdialogs.c:141
 msgid "Amharic"
 msgstr "阿姆哈拉语"
 
-#: src/gtkdialogs.c:155
+#: src/gtkdialogs.c:156
 msgid "Slovak"
 msgstr "斯洛伐克语"
 
-#: src/gtkdialogs.c:157
+#: src/gtkdialogs.c:158
 msgid "Chinese"
 msgstr "中文"
 
-#: src/gtkdialogs.c:198
+#: src/gtkdialogs.c:199
 msgid "About Gaim"
 msgstr "关于 Gaim"
 
-#: src/gtkdialogs.c:222
+#: src/gtkdialogs.c:223
 msgid ""
 "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, "
 "Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu all "
@@ -3058,39 +3057,39 @@
 "IRC、SILC、Novell GroupWise、Napster、Zephyr 和 Gadu-Gadu。本程序用 Gtk+ 写"
 "成,并以 GPL 许可协议发行。<BR><BR>"
 
-#: src/gtkdialogs.c:231
+#: src/gtkdialogs.c:232
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #wingaim on irc.freenode.net<BR><BR>"
 msgstr "<FONT SIZE=\"4\">IRC:</FONT> irc.freenode.net 上的 #wingaim<BR><BR>"
 
-#: src/gtkdialogs.c:234
+#: src/gtkdialogs.c:235
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #gaim on irc.freenode.net<BR><BR>"
 msgstr "<FONT SIZE=\"4\">IRC:</FONT> irc.freenode.net 上的 #gaim<BR><BR>"
 
-#: src/gtkdialogs.c:240
+#: src/gtkdialogs.c:241
 msgid "Active Developers"
 msgstr "当前开发者"
 
-#: src/gtkdialogs.c:255
+#: src/gtkdialogs.c:256
 msgid "Crazy Patch Writers"
 msgstr "疯狂补丁编写者"
 
-#: src/gtkdialogs.c:270
+#: src/gtkdialogs.c:271
 msgid "Retired Developers"
 msgstr "退休开发者"
 
-#: src/gtkdialogs.c:285
+#: src/gtkdialogs.c:286
 msgid "Current Translators"
 msgstr "当前翻译者"
 
-#: src/gtkdialogs.c:305
+#: src/gtkdialogs.c:306
 msgid "Past Translators"
 msgstr "先前翻译者"
 
-#: src/gtkdialogs.c:454 src/gtkdialogs.c:597 src/gtkdialogs.c:652
-msgid "_Screen name"
-msgstr "用户名(_S)"
-
-#: src/gtkdialogs.c:460 src/gtkdialogs.c:603 src/gtkdialogs.c:658
+#: src/gtkdialogs.c:455 src/gtkdialogs.c:597 src/gtkdialogs.c:651
+msgid "_Name"
+msgstr "名称(_N)"
+
+#: src/gtkdialogs.c:460 src/gtkdialogs.c:602 src/gtkdialogs.c:656
 msgid "_Account"
 msgstr "账户(_A)"
 
@@ -3099,32 +3098,35 @@
 msgstr "新即时消息"
 
 #: src/gtkdialogs.c:469
-msgid "Please enter the screen name of the person you would like to IM."
-msgstr "您想要跟谁聊?请输入他/她的用户名。"
-
-#: src/gtkdialogs.c:610
+msgid ""
+"Please enter the screen name or alias of the person you would like to IM."
+msgstr "您想要跟谁聊?请输入他/她的用户名或别名。"
+
+#: src/gtkdialogs.c:609
 msgid "Get User Info"
 msgstr "获取用户信息"
 
-#: src/gtkdialogs.c:612
-msgid ""
-"Please enter the screen name of the person whose info you would like to view."
-msgstr "您想要查看谁的信息?请输入他/她的用户名。"
+#: src/gtkdialogs.c:611
+msgid ""
+"Please enter the screen name or alias of the person whose info you would "
+"like to view."
+msgstr "您想要查看谁的信息?请输入他/她的用户名或别名。"
+
+#: src/gtkdialogs.c:664
+msgid "Get User Log"
+msgstr "获取用户日志"
 
 #: src/gtkdialogs.c:666
-msgid "Get User Log"
-msgstr "获取用户日志"
-
-#: src/gtkdialogs.c:668
-msgid ""
-"Please enter the screen name of the person whose log you would like to view."
-msgstr "您想要查看谁的日志?请输入他/她的用户名。"
-
-#: src/gtkdialogs.c:708
+msgid ""
+"Please enter the screen name or alias of the person whose log you would like "
+"to view."
+msgstr "您想要查看谁的日志?请输入他/她的用户名或别名。"
+
+#: src/gtkdialogs.c:706
 msgid "Warn User"
 msgstr "警告用户"
 
-#: src/gtkdialogs.c:729
+#: src/gtkdialogs.c:727
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Warn %s?</span>\n"
@@ -3136,45 +3138,45 @@
 "\n"
 "这将增加 %s 的警告级别,他/她也将被迫遵守更加严格的速度限制。\n"
 
-#: src/gtkdialogs.c:738
+#: src/gtkdialogs.c:736
 msgid "Warn _anonymously?"
 msgstr "匿名警告吗(_A)?"
 
-#: src/gtkdialogs.c:745
+#: src/gtkdialogs.c:743
 msgid "<b>Anonymous warnings are less severe.</b>"
 msgstr "<b>匿名警告较不容易引起注意。</b>"
 
-#: src/gtkdialogs.c:766
+#: src/gtkdialogs.c:764
 msgid "Alias Contact"
 msgstr "给联系人起名"
 
-#: src/gtkdialogs.c:767
+#: src/gtkdialogs.c:765
 msgid "Enter an alias for this contact."
 msgstr "请输入此联系人的别名。"
 
-#: src/gtkdialogs.c:769 src/gtkdialogs.c:791 src/gtkdialogs.c:811
+#: src/gtkdialogs.c:767 src/gtkdialogs.c:789 src/gtkdialogs.c:809
 #: src/gtkrequest.c:267 src/protocols/silc/chat.c:585
 msgid "Alias"
 msgstr "别名"
 
-#: src/gtkdialogs.c:787
+#: src/gtkdialogs.c:785
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "输入 %s 的别名。"
 
-#: src/gtkdialogs.c:789
+#: src/gtkdialogs.c:787
 msgid "Alias Buddy"
 msgstr "好友别名"
 
-#: src/gtkdialogs.c:808
+#: src/gtkdialogs.c:806
 msgid "Alias Chat"
 msgstr "给聊天起名"
 
-#: src/gtkdialogs.c:809
+#: src/gtkdialogs.c:807
 msgid "Enter an alias for this chat."
 msgstr "请输入此聊天的别名。"
 
-#: src/gtkdialogs.c:846
+#: src/gtkdialogs.c:844
 #, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddy from "
@@ -3186,35 +3188,35 @@
 "您即将从您的好友列表中删除包含 %s 及 %d 个其它好友的联系人。您真的要这么做"
 "吗?"
 
-#: src/gtkdialogs.c:913
+#: src/gtkdialogs.c:911
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
 "list.  Do you want to continue?"
 msgstr "您即将从您的好友列表中删除组 %s 及其所有成员。您真的要这么做吗?"
 
-#: src/gtkdialogs.c:916 src/gtkdialogs.c:917
+#: src/gtkdialogs.c:914 src/gtkdialogs.c:915
 msgid "Remove Group"
 msgstr "删除组"
 
-#: src/gtkdialogs.c:955
+#: src/gtkdialogs.c:953
 #, c-format
 msgid ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr "您即将从您的好友列表中删除 %s。您真的要这么做吗?"
 
-#: src/gtkdialogs.c:958 src/gtkdialogs.c:959
+#: src/gtkdialogs.c:956 src/gtkdialogs.c:957
 msgid "Remove Buddy"
 msgstr "删除好友"
 
-#: src/gtkdialogs.c:992
+#: src/gtkdialogs.c:990
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
 "continue?"
 msgstr "您即将从您的好友列表中删除聊天 %s。您真的要这么做吗?"
 
-#: src/gtkdialogs.c:996 src/gtkdialogs.c:997
+#: src/gtkdialogs.c:994 src/gtkdialogs.c:995
 msgid "Remove Chat"
 msgstr "删除聊天"
 
@@ -3313,7 +3315,7 @@
 msgstr "隐藏下载细节"
 
 #. Pause button
-#: src/gtkft.c:702 src/gtkstock.c:93
+#: src/gtkft.c:702 src/gtkstock.c:105
 msgid "_Pause"
 msgstr "暂停(_P)"
 
@@ -3338,42 +3340,42 @@
 msgid "Pa_ste As Text"
 msgstr "粘贴为文本(_S)"
 
-#: src/gtkimhtml.c:1021
+#: src/gtkimhtml.c:1023
 msgid "Hyperlink color"
 msgstr "超级链接颜色"
 
-#: src/gtkimhtml.c:1022
+#: src/gtkimhtml.c:1024
 msgid "Color to draw hyperlinks."
 msgstr "绘制超级链接的颜色。"
 
-#: src/gtkimhtml.c:1236
+#: src/gtkimhtml.c:1238
 msgid "_Copy E-Mail Address"
 msgstr "复制电子邮件地址(_C)"
 
-#: src/gtkimhtml.c:1248
+#: src/gtkimhtml.c:1250
 msgid "_Copy Link Location"
 msgstr "复制链接地址(_C)"
 
-#: src/gtkimhtml.c:1258
+#: src/gtkimhtml.c:1260
 msgid "_Open Link in Browser"
 msgstr "在浏览器中打开链接(_O)"
 
-#: src/gtkimhtml.c:2848
+#: src/gtkimhtml.c:2847
 msgid ""
 "Unable to guess the image type based on the file extension supplied.  "
 "Defaulting to PNG."
 msgstr "无法根据提供的文件扩展名猜测图像类型。按默认值视为 PNG。"
 
-#: src/gtkimhtml.c:2856
+#: src/gtkimhtml.c:2855
 #, c-format
 msgid "Error saving image: %s"
 msgstr "保存图像出错: %s"
 
-#: src/gtkimhtml.c:2933 src/gtkimhtml.c:2945
+#: src/gtkimhtml.c:2932 src/gtkimhtml.c:2944
 msgid "Save Image"
 msgstr "保存图像"
 
-#: src/gtkimhtml.c:2973
+#: src/gtkimhtml.c:2972
 msgid "_Save Image..."
 msgstr "保存图像(_S)..."
 
@@ -3477,13 +3479,52 @@
 msgid "Insert smiley"
 msgstr "插入笑脸"
 
-#: src/gtklog.c:308
+#: src/gtklog.c:200
+#, c-format
+msgid "Conversation in %s on %s"
+msgstr "在 %2$s 的 %1$s 中的对话"
+
+#: src/gtklog.c:202
+#, c-format
+msgid "Conversation with %s on %s"
+msgstr "与 %s 在 %s 的对话"
+
+#: src/gtklog.c:396
+msgid ""
+"System events will only be logged if the <span style=\"italic\">Enable "
+"system log preference</span> is set."
+msgstr ""
+"仅当选择了<span style=\"italic\">启用系统日志</span>首选项时才会记录系统日志。"
+
+#: src/gtklog.c:400
+msgid ""
+"Instant messages will only be logged if the <span style=\"italic\">Log all "
+"instant messages</span> preference is enabled."
+msgstr ""
+"仅当选择了<span style=\"italic\">记录所有即时消息</span>时才会记录即时消息。"
+
+#: src/gtklog.c:403
+msgid ""
+"Chats will only be logged if the <span style=\"italic\">Log all chats "
+"preference</span> is enabled."
+msgstr ""
+"仅当选择了<span style=\"italic\">记录所有聊天</span>首选项时才会记录聊天。"
+
+#: src/gtklog.c:408
+msgid "No logs were found."
+msgstr "未找到日志。"
+
+#: src/gtklog.c:454
+#, c-format
+msgid "Conversations in %s"
+msgstr "与 %s 的对话"
+
+#: src/gtklog.c:462 src/gtklog.c:512
 #, c-format
 msgid "Conversations with %s"
 msgstr "与 %s 的对话"
 
-#. Window **********
-#: src/gtklog.c:396 src/gtklog.c:412
+#: src/gtklog.c:537
 msgid "System Log"
 msgstr "系统日志"
 
@@ -3757,8 +3798,8 @@
 msgid "Icon"
 msgstr "图标"
 
-#: src/gtkprefs.c:662 src/gtkprefs.c:2051 src/protocols/jabber/buddy.c:267
-#: src/protocols/jabber/buddy.c:801 src/protocols/jabber/chat.c:763
+#: src/gtkprefs.c:662 src/gtkprefs.c:2051 src/protocols/jabber/buddy.c:266
+#: src/protocols/jabber/buddy.c:804 src/protocols/jabber/chat.c:766
 msgid "Description"
 msgstr "描述"
 
@@ -3862,7 +3903,7 @@
 msgstr "新对话放置(_P):"
 
 #: src/gtkprefs.c:961 src/protocols/oscar/oscar.c:765
-#: src/protocols/oscar/oscar.c:5185
+#: src/protocols/oscar/oscar.c:5203
 msgid "IP Address"
 msgstr "IP 地址"
 
@@ -4105,12 +4146,12 @@
 msgstr "离开时"
 
 #: src/gtkprefs.c:1702
-msgid "When away and idle"
-msgstr "离开和瞌睡时"
+msgid "if (away && idle)"
+msgstr "如果离开且瞌睡"
 
 #: src/gtkprefs.c:1705 src/protocols/msn/msn.c:504
 #: src/protocols/msn/state.c:32 src/protocols/novell/novell.c:2817
-#: src/protocols/oscar/oscar.c:4312 src/protocols/yahoo/yahoo.c:2410
+#: src/protocols/oscar/oscar.c:4323 src/protocols/yahoo/yahoo.c:2442
 #: src/protocols/yahoo/yahoo_profile.c:665
 msgid "Idle"
 msgstr "瞌睡"
@@ -4309,7 +4350,7 @@
 #. *
 #. * A wrapper for gaim_request_action() that uses Yes and No buttons.
 #.
-#: src/gtkrequest.c:257 src/protocols/gg/gg.c:1027
+#: src/gtkrequest.c:257 src/protocols/gg/gg.c:1026
 #: src/protocols/msn/dialog.c:113 src/protocols/msn/msn.c:511
 #: src/protocols/msn/msn.c:514 src/protocols/novell/novell.c:1901
 #: src/protocols/silc/buddy.c:307 src/protocols/silc/pk.c:117
@@ -4317,7 +4358,7 @@
 msgid "Yes"
 msgstr "是"
 
-#: src/gtkrequest.c:258 src/protocols/gg/gg.c:1027
+#: src/gtkrequest.c:258 src/protocols/gg/gg.c:1026
 #: src/protocols/msn/dialog.c:114 src/protocols/msn/msn.c:511
 #: src/protocols/msn/msn.c:514 src/protocols/novell/novell.c:1902
 #: src/protocols/silc/buddy.c:308 src/protocols/silc/pk.c:118
@@ -4334,19 +4375,19 @@
 msgid "Close"
 msgstr "关闭"
 
-#: src/gtkrequest.c:1492
+#: src/gtkrequest.c:1629
 msgid "That file already exists"
 msgstr "该文件已存在"
 
-#: src/gtkrequest.c:1493
+#: src/gtkrequest.c:1630
 msgid "Would you like to overwrite it?"
 msgstr "您是否想要覆盖?"
 
-#: src/gtkrequest.c:1531 src/gtkrequest.c:1556
+#: src/gtkrequest.c:1672 src/gtkrequest.c:1713
 msgid "Save File..."
 msgstr "保存文件..."
 
-#: src/gtkrequest.c:1532 src/gtkrequest.c:1557
+#: src/gtkrequest.c:1673 src/gtkrequest.c:1714
 msgid "Open File..."
 msgstr "打开文件..."
 
@@ -4359,8 +4400,8 @@
 msgid "_Get List"
 msgstr "获取列表(_G)"
 
-#: src/gtksavedstatuses.c:314 src/protocols/jabber/buddy.c:264
-#: src/protocols/jabber/buddy.c:795 src/protocols/novell/novell.c:1460
+#: src/gtksavedstatuses.c:314 src/protocols/jabber/buddy.c:263
+#: src/protocols/jabber/buddy.c:798 src/protocols/novell/novell.c:1460
 msgid "Title"
 msgstr "标题"
 
@@ -4376,9 +4417,9 @@
 #: src/protocols/jabber/jabber.c:977 src/protocols/jabber/jabber.c:983
 #: src/protocols/jabber/jabber.c:989 src/protocols/jabber/jabber.c:995
 #: src/protocols/jabber/jabber.c:1001 src/protocols/jabber/jabber.c:1007
-#: src/protocols/novell/novell.c:2831 src/protocols/oscar/oscar.c:7018
-#: src/protocols/oscar/oscar.c:7025 src/protocols/yahoo/yahoo.c:2894
-#: src/protocols/yahoo/yahoo.c:2928 src/protocols/zephyr/zephyr.c:2226
+#: src/protocols/novell/novell.c:2831 src/protocols/oscar/oscar.c:7041
+#: src/protocols/oscar/oscar.c:7048 src/protocols/yahoo/yahoo.c:2926
+#: src/protocols/yahoo/yahoo.c:2960 src/protocols/zephyr/zephyr.c:2226
 msgid "Message"
 msgstr "消息"
 
@@ -4394,12 +4435,12 @@
 msgid "Custom status"
 msgstr "自定义状态"
 
-#: src/gtksavedstatuses.c:714 src/protocols/jabber/buddy.c:616
-#: src/protocols/jabber/buddy.c:623 src/protocols/jabber/buddy.c:634
+#: src/gtksavedstatuses.c:714 src/protocols/jabber/buddy.c:619
+#: src/protocols/jabber/buddy.c:626 src/protocols/jabber/buddy.c:637
 #: src/protocols/jabber/jabber.c:950 src/protocols/msn/msn.c:502
 #: src/protocols/novell/novell.c:2830 src/protocols/novell/novell.c:2834
 #: src/protocols/oscar/oscar.c:747 src/protocols/oscar/oscar.c:753
-#: src/protocols/oscar/oscar.c:755 src/protocols/yahoo/yahoo.c:2533
+#: src/protocols/oscar/oscar.c:755 src/protocols/yahoo/yahoo.c:2565
 msgid "Status"
 msgstr "状态"
 
@@ -4478,28 +4519,70 @@
 "launched: %s"
 msgstr "无法播放声音,原因是配置无法调用配置的声音命令: %s"
 
+#: src/gtkstatusbox.c:133
+msgid "Typing"
+msgstr "正打字"
+
+#. connect to the server
+#: src/gtkstatusbox.c:138 src/protocols/irc/irc.c:259
+#: src/protocols/jabber/jabber.c:801 src/protocols/msn/session.c:359
+#: src/protocols/napster/napster.c:510 src/protocols/novell/novell.c:2163
+#: src/protocols/oscar/oscar.c:1818 src/protocols/trepia/trepia.c:1068
+#: src/protocols/yahoo/yahoo.c:2262 src/protocols/zephyr/zephyr.c:1492
+msgid "Connecting"
+msgstr "正连接"
+
+#. hacks
+#: src/gtkstatusbox.c:247 src/protocols/gg/gg.c:50 src/protocols/irc/irc.c:175
+#: src/protocols/jabber/jabber.c:982 src/protocols/msn/msn.c:535
+#: src/protocols/msn/state.c:29 src/protocols/msn/state.c:30
+#: src/protocols/msn/state.c:37 src/protocols/msn/state.c:38
+#: src/protocols/novell/novell.c:2808 src/protocols/novell/novell.c:2927
+#: src/protocols/novell/novell.c:2978 src/protocols/oscar/oscar.c:787
+#: src/protocols/oscar/oscar.c:7040 src/protocols/yahoo/yahoo.c:2920
+#: src/status.c:157
+msgid "Available"
+msgstr "可用"
+
+#: src/gtkstatusbox.c:249 src/protocols/gg/gg.c:54
+#: src/protocols/oscar/oscar.c:695 src/protocols/oscar/oscar.c:7054
+#: src/protocols/yahoo/yahoo.c:2440 src/protocols/yahoo/yahoo.c:2964
+msgid "Invisible"
+msgstr "隐身"
+
+#: src/gtkstatusbox.c:250 src/protocols/gg/gg.c:282
+#: src/protocols/irc/irc.c:167 src/protocols/jabber/buddy.c:1074
+#: src/protocols/jabber/jabber.c:971 src/protocols/msn/msn.c:527
+#: src/protocols/napster/napster.c:556 src/protocols/novell/novell.c:2820
+#: src/protocols/oscar/oscar.c:755 src/protocols/oscar/oscar.c:6836
+#: src/protocols/oscar/oscar.c:7030 src/protocols/silc/silc.c:46
+#: src/protocols/yahoo/yahoo.c:2444 src/protocols/yahoo/yahoo.c:2914
+#: src/status.c:155
+msgid "Offline"
+msgstr "离线"
+
 #. TODO: Add saved statuses here?
 #: src/gtkstatusselector.c:286 src/gtkstatusselector.c:659
 msgid "New Status"
 msgstr "新建状态"
 
-#: src/gtkstock.c:88
+#: src/gtkstock.c:100
 msgid "_Alias"
 msgstr "别名(_A)"
 
-#: src/gtkstock.c:90
+#: src/gtkstock.c:102
 msgid "_Invite"
 msgstr "邀请(_I)"
 
-#: src/gtkstock.c:91
+#: src/gtkstock.c:103
 msgid "_Modify"
 msgstr "修改(_M)"
 
-#: src/gtkstock.c:92
+#: src/gtkstock.c:104
 msgid "_Open Mail"
 msgstr "打开邮件(_O)"
 
-#: src/gtkstock.c:94
+#: src/gtkstock.c:106
 msgid "_Warn"
 msgstr "警告(_W)"
 
@@ -4588,7 +4671,7 @@
 msgid "XML"
 msgstr "XML"
 
-#: src/log.c:608
+#: src/log.c:607
 #, c-format
 msgid ""
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -4597,7 +4680,7 @@
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;自动回复&gt;:"
 "</b></font> %s<br/>\n"
 
-#: src/log.c:610
+#: src/log.c:609
 #, c-format
 msgid ""
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -4606,40 +4689,40 @@
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;自动回复&gt;:"
 "</b></font> %s<br/>\n"
 
-#: src/log.c:661 src/log.c:791
+#: src/log.c:660 src/log.c:790
 msgid "<font color=\"red\"><b>Unable to find log path!</b></font>"
 msgstr "<font color=\"red\"><b>找不到日志路径!</b></font>"
 
-#: src/log.c:671 src/log.c:803
+#: src/log.c:670 src/log.c:802
 #, c-format
 msgid "<font color=\"red\"><b>Could not read file: %s</b></font>"
 msgstr "<font color=\"red\"><b>无法读取文件: %s</b></font>"
 
-#: src/log.c:675
+#: src/log.c:674
 msgid "HTML"
 msgstr "HTML"
 
-#: src/log.c:736
+#: src/log.c:735
 #, c-format
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <自动回复>: %s\n"
 
-#: src/log.c:807
+#: src/log.c:806
 msgid "Plain text"
 msgstr "纯文本"
 
-#: src/plugin.c:287
+#: src/plugin.c:320
 #, c-format
 msgid ""
 "The required plugin %s was not found. Please install this plugin and try "
 "again."
 msgstr "所需插件 %s 未找到。安装此插件然后再试一次。"
 
-#: src/plugin.c:292 src/plugin.c:320
+#: src/plugin.c:325 src/plugin.c:353
 msgid "Gaim was unable to load your plugin."
 msgstr "Gaim 无法装入您的插件。"
 
-#: src/plugin.c:316
+#: src/plugin.c:349
 #, c-format
 msgid "The required plugin %s was unable to load."
 msgstr "所需插件 %s 无法装入。"
@@ -4648,17 +4731,6 @@
 msgid "Slightly less boring default"
 msgstr "烦死我了"
 
-#: src/protocols/gg/gg.c:50 src/protocols/irc/irc.c:175
-#: src/protocols/jabber/jabber.c:982 src/protocols/msn/msn.c:535
-#: src/protocols/msn/state.c:29 src/protocols/msn/state.c:30
-#: src/protocols/msn/state.c:37 src/protocols/msn/state.c:38
-#: src/protocols/novell/novell.c:2808 src/protocols/novell/novell.c:2927
-#: src/protocols/novell/novell.c:2978 src/protocols/oscar/oscar.c:787
-#: src/protocols/oscar/oscar.c:7017 src/protocols/yahoo/yahoo.c:2888
-#: src/status.c:157
-msgid "Available"
-msgstr "可用"
-
 #: src/protocols/gg/gg.c:51
 msgid "Available for friends only"
 msgstr "只对好友可用"
@@ -4667,12 +4739,6 @@
 msgid "Away for friends only"
 msgstr "只对好友离开"
 
-#: src/protocols/gg/gg.c:54 src/protocols/oscar/oscar.c:695
-#: src/protocols/oscar/oscar.c:7031 src/protocols/yahoo/yahoo.c:2408
-#: src/protocols/yahoo/yahoo.c:2932
-msgid "Invisible"
-msgstr "隐身"
-
 #: src/protocols/gg/gg.c:55
 msgid "Invisible for friends only"
 msgstr "只对好友隐身"
@@ -4689,9 +4755,9 @@
 msgid "Unable to connect to server."
 msgstr "无法连接到服务器。"
 
-#: src/protocols/gg/gg.c:157 src/protocols/jabber/auth.c:134
-#: src/protocols/jabber/auth.c:208 src/protocols/jabber/auth.c:369
-#: src/protocols/jabber/auth.c:467 src/protocols/jabber/auth.c:479
+#: src/protocols/gg/gg.c:157 src/protocols/jabber/auth.c:133
+#: src/protocols/jabber/auth.c:207 src/protocols/jabber/auth.c:375
+#: src/protocols/jabber/auth.c:473 src/protocols/jabber/auth.c:485
 #: src/protocols/jabber/jabber.c:108
 msgid "Invalid response from server."
 msgstr "服务器的响应无效。"
@@ -4712,30 +4778,20 @@
 msgid "Unknown Error Code."
 msgstr "未知的错误代码。"
 
-#: src/protocols/gg/gg.c:247 src/protocols/oscar/oscar.c:4111
+#: src/protocols/gg/gg.c:247 src/protocols/oscar/oscar.c:4122
 #, c-format
 msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<HR>%s"
 msgstr "<B>UIN:</B> %s<BR><B>状态:</B> %s<HR>%s"
 
 #. res[0] == username
-#: src/protocols/gg/gg.c:248 src/protocols/gg/gg.c:1089
-#: src/protocols/napster/napster.c:404 src/protocols/oscar/oscar.c:4115
-#: src/protocols/oscar/oscar.c:4341 src/protocols/silc/ops.c:1088
+#: src/protocols/gg/gg.c:248 src/protocols/gg/gg.c:1088
+#: src/protocols/napster/napster.c:404 src/protocols/oscar/oscar.c:4126
+#: src/protocols/oscar/oscar.c:4352 src/protocols/silc/ops.c:1088
 #: src/protocols/silc/ops.c:1151 src/protocols/toc/toc.c:469
 #: src/protocols/zephyr/zephyr.c:721 src/protocols/zephyr/zephyr.c:1136
 msgid "Buddy Information"
 msgstr "好友信息"
 
-#: src/protocols/gg/gg.c:282 src/protocols/irc/irc.c:167
-#: src/protocols/jabber/buddy.c:1070 src/protocols/jabber/jabber.c:971
-#: src/protocols/msn/msn.c:527 src/protocols/napster/napster.c:556
-#: src/protocols/novell/novell.c:2820 src/protocols/oscar/oscar.c:755
-#: src/protocols/oscar/oscar.c:6813 src/protocols/oscar/oscar.c:7007
-#: src/protocols/silc/silc.c:46 src/protocols/yahoo/yahoo.c:2412
-#: src/protocols/yahoo/yahoo.c:2882 src/status.c:155
-msgid "Offline"
-msgstr "离线"
-
 #. zephyr has several exposures
 #. NONE (where you are hidden, and zephyrs to you are in practice silently dropped -- yes this is wrong)
 #. OPSTAFF "hidden"
@@ -4750,11 +4806,11 @@
 #. Away won't change their exposure but will set an auto away message (for IMs only)
 #.
 #: src/protocols/gg/gg.c:286 src/protocols/irc/irc.c:171
-#: src/protocols/jabber/buddy.c:1072 src/protocols/jabber/jabber.c:976
+#: src/protocols/jabber/buddy.c:1076 src/protocols/jabber/jabber.c:976
 #: src/protocols/msn/msn.c:531 src/protocols/napster/napster.c:561
-#: src/protocols/oscar/oscar.c:697 src/protocols/oscar/oscar.c:7012
-#: src/protocols/silc/silc.c:48 src/protocols/yahoo/yahoo.c:2414
-#: src/protocols/yahoo/yahoo.c:2885 src/protocols/zephyr/zephyr.c:2218
+#: src/protocols/oscar/oscar.c:697 src/protocols/oscar/oscar.c:7035
+#: src/protocols/silc/silc.c:48 src/protocols/yahoo/yahoo.c:2446
+#: src/protocols/yahoo/yahoo.c:2917 src/protocols/zephyr/zephyr.c:2218
 #: src/status.c:156
 msgid "Online"
 msgstr "在线"
@@ -4773,148 +4829,148 @@
 msgstr "无法读取套接字"
 
 #. we didn't successfully connect. tdt->toc_fd is valid here
-#: src/protocols/gg/gg.c:752 src/protocols/napster/napster.c:486
+#: src/protocols/gg/gg.c:751 src/protocols/napster/napster.c:486
 #: src/protocols/napster/napster.c:517 src/protocols/toc/toc.c:171
-#: src/protocols/yahoo/yahoo.c:2009 src/protocols/yahoo/yahoo.c:2036
-#: src/protocols/yahoo/yahoo.c:2099 src/protocols/yahoo/yahoo_filexfer.c:69
-#: src/protocols/yahoo/yahoo_filexfer.c:112 src/protocols/yahoo/ycht.c:483
+#: src/protocols/yahoo/yahoo.c:2032 src/protocols/yahoo/yahoo.c:2059
+#: src/protocols/yahoo/yahoo.c:2122 src/protocols/yahoo/yahoo_filexfer.c:70
+#: src/protocols/yahoo/yahoo_filexfer.c:114 src/protocols/yahoo/ycht.c:483
 msgid "Unable to connect."
 msgstr "无法连接。"
 
-#: src/protocols/gg/gg.c:768
+#: src/protocols/gg/gg.c:767
 msgid "Reading data"
 msgstr "读取数据"
 
-#: src/protocols/gg/gg.c:771
+#: src/protocols/gg/gg.c:770
 msgid "Balancer handshake"
 msgstr "平衡器握手"
 
-#: src/protocols/gg/gg.c:774
+#: src/protocols/gg/gg.c:773
 msgid "Reading server key"
 msgstr "读取服务器密钥"
 
-#: src/protocols/gg/gg.c:777
+#: src/protocols/gg/gg.c:776
 msgid "Exchanging key hash"
 msgstr "交换密钥"
 
-#: src/protocols/gg/gg.c:787
+#: src/protocols/gg/gg.c:786
 msgid "Critical error in GG library\n"
 msgstr "GG 库的关键错误\n"
 
-#: src/protocols/gg/gg.c:805 src/protocols/gg/gg.c:896
+#: src/protocols/gg/gg.c:804 src/protocols/gg/gg.c:895
 #: src/protocols/toc/toc.c:147
 #, c-format
 msgid "Connect to %s failed"
 msgstr "连接到 %s 失败"
 
-#: src/protocols/gg/gg.c:853
+#: src/protocols/gg/gg.c:852
 msgid "Unable to ping server"
 msgstr "无法连通服务器"
 
-#: src/protocols/gg/gg.c:865
+#: src/protocols/gg/gg.c:864
 msgid "Send as message"
 msgstr "发送为消息"
 
-#: src/protocols/gg/gg.c:870
+#: src/protocols/gg/gg.c:869
 msgid "Looking up GG server"
 msgstr "正在查阅 GG 服务器"
 
-#: src/protocols/gg/gg.c:873
+#: src/protocols/gg/gg.c:872
 msgid "Invalid Gadu-Gadu UIN specified"
 msgstr "指定的 Gadu-Gadu UIN 无效"
 
-#: src/protocols/gg/gg.c:920
+#: src/protocols/gg/gg.c:919
 msgid "You are trying to send a message to an invalid Gadu-Gadu UIN."
 msgstr "您试图向无效的 Gadu-Gadu UIN 发送消息。"
 
-#: src/protocols/gg/gg.c:995
+#: src/protocols/gg/gg.c:994
 msgid "Couldn't get search results"
 msgstr "无法获取搜索结果"
 
-#: src/protocols/gg/gg.c:1000
+#: src/protocols/gg/gg.c:999
 msgid "Gadu-Gadu Search Engine"
 msgstr "Gadu-Gadu 搜索引擎"
 
-#: src/protocols/gg/gg.c:1026
+#: src/protocols/gg/gg.c:1025
 msgid "Active"
 msgstr "活跃"
 
-#: src/protocols/gg/gg.c:1031 src/protocols/oscar/oscar.c:5177
+#: src/protocols/gg/gg.c:1030 src/protocols/oscar/oscar.c:5195
 msgid "UIN"
 msgstr "UIN"
 
 #. First Name
-#: src/protocols/gg/gg.c:1035 src/protocols/jabber/jabber.c:622
-#: src/protocols/oscar/oscar.c:5188 src/protocols/silc/ops.c:810
+#: src/protocols/gg/gg.c:1034 src/protocols/jabber/jabber.c:622
+#: src/protocols/oscar/oscar.c:5206 src/protocols/silc/ops.c:810
 #: src/protocols/trepia/trepia.c:268
 msgid "First Name"
 msgstr "名"
 
 #. Last Name
-#: src/protocols/gg/gg.c:1040 src/protocols/jabber/jabber.c:627
-#: src/protocols/oscar/oscar.c:5189 src/protocols/trepia/trepia.c:275
+#: src/protocols/gg/gg.c:1039 src/protocols/jabber/jabber.c:627
+#: src/protocols/oscar/oscar.c:5207 src/protocols/trepia/trepia.c:275
 msgid "Last Name"
 msgstr "姓"
 
-#: src/protocols/gg/gg.c:1044 src/protocols/gg/gg.c:1789
-#: src/protocols/irc/msgs.c:182 src/protocols/oscar/oscar.c:5178
+#: src/protocols/gg/gg.c:1043 src/protocols/gg/gg.c:1788
+#: src/protocols/irc/msgs.c:204 src/protocols/oscar/oscar.c:5196
 #: src/protocols/silc/ops.c:1202
 msgid "Nick"
 msgstr "昵称"
 
-#: src/protocols/gg/gg.c:1051 src/protocols/gg/gg.c:1054
+#: src/protocols/gg/gg.c:1050 src/protocols/gg/gg.c:1053
 msgid "Birth Year"
 msgstr "出生年份"
 
-#: src/protocols/gg/gg.c:1060 src/protocols/gg/gg.c:1062
-#: src/protocols/gg/gg.c:1064
+#: src/protocols/gg/gg.c:1059 src/protocols/gg/gg.c:1061
+#: src/protocols/gg/gg.c:1063
 msgid "Sex"
 msgstr "性别"
 
 #. City
-#: src/protocols/gg/gg.c:1068 src/protocols/jabber/jabber.c:637
-#: src/protocols/oscar/oscar.c:5232 src/protocols/oscar/oscar.c:5240
+#: src/protocols/gg/gg.c:1067 src/protocols/jabber/jabber.c:637
+#: src/protocols/oscar/oscar.c:5250 src/protocols/oscar/oscar.c:5258
 #: src/protocols/trepia/trepia.c:332 src/protocols/trepia/trepia.c:411
 msgid "City"
 msgstr "城市"
 
-#: src/protocols/gg/gg.c:1111
+#: src/protocols/gg/gg.c:1110
 msgid "There is no Buddy List stored on the Gadu-Gadu server."
 msgstr "Gadu-Gadu 服务器没有存储好友列表。"
 
-#: src/protocols/gg/gg.c:1119
+#: src/protocols/gg/gg.c:1118
 msgid "Couldn't Import Buddy List from Server"
 msgstr "无法从服务器导入好友列表"
 
-#: src/protocols/gg/gg.c:1181
+#: src/protocols/gg/gg.c:1180
 msgid "Buddy List successfully transferred to Gadu-Gadu server"
 msgstr "好友列表已经成功传送到 Gadu-Gadu 服务器了"
 
-#: src/protocols/gg/gg.c:1189
+#: src/protocols/gg/gg.c:1188
 msgid "Couldn't transfer Buddy List to Gadu-Gadu server"
 msgstr "无法将好友列表传送到 Gadu-Gadu 服务器"
 
-#: src/protocols/gg/gg.c:1197
+#: src/protocols/gg/gg.c:1196
 msgid "Buddy List successfully deleted from Gadu-Gadu server"
 msgstr "好友列表已经成功从 Gadu-Gadu 服务器删除"
 
-#: src/protocols/gg/gg.c:1205
+#: src/protocols/gg/gg.c:1204
 msgid "Couldn't delete Buddy List from Gadu-Gadu server"
 msgstr "无法从 Gadu-Gadu 服务器删除好友列表"
 
-#: src/protocols/gg/gg.c:1214
+#: src/protocols/gg/gg.c:1213
 msgid "Password changed successfully"
 msgstr "密码成功更改"
 
-#: src/protocols/gg/gg.c:1221
+#: src/protocols/gg/gg.c:1220
 msgid "Password couldn't be changed"
 msgstr "密码无法更改"
 
+#: src/protocols/gg/gg.c:1339
+msgid "Error communicating with Gadu-Gadu server"
+msgstr "与 Gadu-Gadu 服务器通讯出错"
+
 #: src/protocols/gg/gg.c:1340
-msgid "Error communicating with Gadu-Gadu server"
-msgstr "与 Gadu-Gadu 服务器通讯出错"
-
-#: src/protocols/gg/gg.c:1341
 msgid ""
 "Gaim was unable to complete your request due to a problem communicating with "
 "the Gadu-Gadu HTTP server.  Please try again later."
@@ -4922,77 +4978,77 @@
 "Gaim 无法完成您的请求,原因是与 Gadu-Gadu HTTP 服务器通讯出现问题。请稍后再试"
 "一次。"
 
-#: src/protocols/gg/gg.c:1370
+#: src/protocols/gg/gg.c:1369
 msgid "Unable to import Gadu-Gadu buddy list"
 msgstr "无法导入 Gadu-Gadu 好友列表"
 
-#: src/protocols/gg/gg.c:1371
+#: src/protocols/gg/gg.c:1370
 msgid ""
 "Gaim was unable to connect to the Gadu-Gadu buddy list server.  Please try "
 "again later."
 msgstr "Gaim 无法连接到 Gadu-Gadu 好友列表服务器。请稍后再试一次。"
 
-#: src/protocols/gg/gg.c:1444
+#: src/protocols/gg/gg.c:1443
 msgid "Couldn't export buddy list"
 msgstr "无法导出好友列表"
 
-#: src/protocols/gg/gg.c:1445 src/protocols/gg/gg.c:1468
+#: src/protocols/gg/gg.c:1444 src/protocols/gg/gg.c:1467
 msgid ""
 "Gaim was unable to connect to the buddy list server.  Please try again later."
 msgstr "Gaim 无法连接到好友列表服务器。请稍后再试一次。"
 
-#: src/protocols/gg/gg.c:1467
+#: src/protocols/gg/gg.c:1466
 msgid "Unable to delete Gadu-Gadu buddy list"
 msgstr "无法删除 Gadu-Gadu 好友列表"
 
+#: src/protocols/gg/gg.c:1517
+msgid "Unable to access directory"
+msgstr "无法访问目录"
+
 #: src/protocols/gg/gg.c:1518
-msgid "Unable to access directory"
-msgstr "无法访问目录"
-
-#: src/protocols/gg/gg.c:1519
 msgid ""
 "Gaim was unable to search the Directory because it was unable to connect to "
 "the directory server.  Please try again later."
 msgstr "Gaim 无法搜索目录,原因是无法与目录服务器连接。请稍后再试一次。"
 
-#: src/protocols/gg/gg.c:1553
+#: src/protocols/gg/gg.c:1552
 msgid "Unable to change Gadu-Gadu password"
 msgstr "无法更改 Gadu-Gadu 密码"
 
-#: src/protocols/gg/gg.c:1554
+#: src/protocols/gg/gg.c:1553
 msgid ""
 "Gaim was unable to change your password due to an error connecting to the "
 "Gadu-Gadu server.  Please try again later."
 msgstr ""
 "Gaim 无法更改您的密码,原因是与 Gadu-Gadu 服务器连接出错。请稍后再试一次。"
 
-#: src/protocols/gg/gg.c:1570
+#: src/protocols/gg/gg.c:1569
 msgid "Directory Search"
 msgstr "目录搜索"
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
-#: src/protocols/gg/gg.c:1575 src/protocols/jabber/jabber.c:1111
+#: src/protocols/gg/gg.c:1574 src/protocols/jabber/jabber.c:1111
 #: src/protocols/toc/toc.c:1577
 msgid "Change Password"
 msgstr "更改密码"
 
-#: src/protocols/gg/gg.c:1579
+#: src/protocols/gg/gg.c:1578
 msgid "Import Buddy List from Server"
 msgstr "从服务器导入好友列表"
 
-#: src/protocols/gg/gg.c:1583
+#: src/protocols/gg/gg.c:1582
 msgid "Export Buddy List to Server"
 msgstr "将好友列表导出到服务器"
 
-#: src/protocols/gg/gg.c:1587
+#: src/protocols/gg/gg.c:1586
 msgid "Delete Buddy List from Server"
 msgstr "从服务器删除好友列表"
 
+#: src/protocols/gg/gg.c:1619
+msgid "Unable to access user profile."
+msgstr "无法访问用户配置文件。"
+
 #: src/protocols/gg/gg.c:1620
-msgid "Unable to access user profile."
-msgstr "无法访问用户配置文件。"
-
-#: src/protocols/gg/gg.c:1621
 msgid ""
 "Gaim was unable to access this user's profile due to an error connecting to "
 "the directory server.  Please try again later."
@@ -5009,7 +5065,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/gg/gg.c:1768 src/protocols/gg/gg.c:1770
+#: src/protocols/gg/gg.c:1767 src/protocols/gg/gg.c:1769
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr "Gadu-Gadu 协议插件"
 
@@ -5018,23 +5074,23 @@
 msgid "Unknown command: %s"
 msgstr "未知的错误代码: %s"
 
-#: src/protocols/irc/cmds.c:461 src/protocols/jabber/chat.c:586
+#: src/protocols/irc/cmds.c:461 src/protocols/jabber/chat.c:589
 #: src/protocols/silc/silc.c:1007
 #, c-format
 msgid "current topic is: %s"
 msgstr "目前的话题为: %s"
 
-#: src/protocols/irc/cmds.c:465 src/protocols/jabber/chat.c:590
+#: src/protocols/irc/cmds.c:465 src/protocols/jabber/chat.c:593
 #: src/protocols/silc/silc.c:1011
 msgid "No topic is set"
 msgstr "未设定话题"
 
-#: src/protocols/irc/dcc_send.c:272 src/protocols/yahoo/yahoo_filexfer.c:168
-#: src/protocols/yahoo/yahoo_filexfer.c:178
-#: src/protocols/yahoo/yahoo_filexfer.c:187
-#: src/protocols/yahoo/yahoo_filexfer.c:197
-msgid "File Transfer Aborted"
-msgstr "文件传送中止"
+#: src/protocols/irc/dcc_send.c:272 src/protocols/yahoo/yahoo_filexfer.c:170
+#: src/protocols/yahoo/yahoo_filexfer.c:180
+#: src/protocols/yahoo/yahoo_filexfer.c:189
+#: src/protocols/yahoo/yahoo_filexfer.c:199
+msgid "File Transfer Failed"
+msgstr "文件传送失败"
 
 #: src/protocols/irc/dcc_send.c:273
 msgid "Gaim could not open a listening port."
@@ -5057,8 +5113,8 @@
 msgid "MOTD for %s"
 msgstr "%s 的 MOTD"
 
-#: src/protocols/irc/irc.c:102 src/protocols/irc/irc.c:516
-#: src/protocols/irc/irc.c:538
+#: src/protocols/irc/irc.c:102 src/protocols/irc/irc.c:522
+#: src/protocols/irc/irc.c:544
 msgid "Server has disconnected"
 msgstr "服务器已断开连接"
 
@@ -5078,15 +5134,6 @@
 msgid "IRC nicks may not contain whitespace"
 msgstr "IRC 昵称不能包含空格"
 
-#. connect to the server
-#: src/protocols/irc/irc.c:259 src/protocols/jabber/jabber.c:801
-#: src/protocols/msn/session.c:338 src/protocols/napster/napster.c:510
-#: src/protocols/novell/novell.c:2163 src/protocols/oscar/oscar.c:1818
-#: src/protocols/trepia/trepia.c:1067 src/protocols/yahoo/yahoo.c:2230
-#: src/protocols/zephyr/zephyr.c:1492
-msgid "Connecting"
-msgstr "正在连接"
-
 #: src/protocols/irc/irc.c:267 src/protocols/jabber/jabber.c:407
 #: src/protocols/jabber/jabber.c:739
 msgid "SSL support unavailable"
@@ -5109,17 +5156,17 @@
 msgid "SSL Handshake Failed"
 msgstr "SSL 握手失败"
 
-#: src/protocols/irc/irc.c:513 src/protocols/irc/irc.c:535
-#: src/protocols/trepia/trepia.c:929
+#: src/protocols/irc/irc.c:519 src/protocols/irc/irc.c:541
+#: src/protocols/trepia/trepia.c:930
 msgid "Read error"
 msgstr "读取错误"
 
-#: src/protocols/irc/irc.c:674 src/protocols/silc/chat.c:1374
+#: src/protocols/irc/irc.c:680 src/protocols/silc/chat.c:1388
 #: src/protocols/yahoo/yahoochat.c:1355
 msgid "Users"
 msgstr "用户"
 
-#: src/protocols/irc/irc.c:677 src/protocols/silc/chat.c:1377
+#: src/protocols/irc/irc.c:683 src/protocols/silc/chat.c:1391
 #: src/protocols/silc/ops.c:1170 src/protocols/yahoo/yahoochat.c:1364
 msgid "Topic"
 msgstr "话题"
@@ -5132,43 +5179,43 @@
 #. *< id
 #. *< name
 #. *< version
-#: src/protocols/irc/irc.c:784
+#: src/protocols/irc/irc.c:790
 msgid "IRC Protocol Plugin"
 msgstr "IRC 协议插件"
 
 #. *  summary
-#: src/protocols/irc/irc.c:785
+#: src/protocols/irc/irc.c:791
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "错误更少的 IRC 协议插件"
 
-#: src/protocols/irc/irc.c:804 src/protocols/irc/msgs.c:201
+#: src/protocols/irc/irc.c:810 src/protocols/irc/msgs.c:224
 #: src/protocols/jabber/jabber.c:1607 src/protocols/napster/napster.c:691
 #: src/protocols/silc/ops.c:1028 src/protocols/silc/ops.c:1132
 msgid "Server"
 msgstr "服务器"
 
-#: src/protocols/irc/irc.c:807 src/protocols/jabber/jabber.c:1628
-#: src/protocols/msn/msn.c:1887 src/protocols/napster/napster.c:696
-#: src/protocols/silc/silc.c:1593 src/protocols/trepia/trepia.c:1303
+#: src/protocols/irc/irc.c:813 src/protocols/jabber/jabber.c:1628
+#: src/protocols/msn/msn.c:1918 src/protocols/napster/napster.c:696
+#: src/protocols/silc/silc.c:1593 src/protocols/trepia/trepia.c:1304
 msgid "Port"
 msgstr "端口"
 
-#: src/protocols/irc/irc.c:810
+#: src/protocols/irc/irc.c:816
 msgid "Encodings"
 msgstr "编码"
 
-#: src/protocols/irc/irc.c:813 src/protocols/irc/msgs.c:195
+#: src/protocols/irc/irc.c:819 src/protocols/irc/msgs.c:218
 #: src/protocols/jabber/jabber.c:597 src/protocols/silc/buddy.c:1459
 #: src/protocols/silc/ops.c:975 src/protocols/silc/ops.c:977
 #: src/protocols/silc/ops.c:1126 src/protocols/silc/ops.c:1128
 msgid "Username"
 msgstr "用户名"
 
-#: src/protocols/irc/irc.c:816
+#: src/protocols/irc/irc.c:822
 msgid "Real name"
 msgstr "真名"
 
-#: src/protocols/irc/irc.c:819
+#: src/protocols/irc/irc.c:825
 msgid "Use SSL"
 msgstr "使用 SSL"
 
@@ -5185,189 +5232,201 @@
 msgid "Banned"
 msgstr "屏蔽"
 
-#: src/protocols/irc/msgs.c:182 src/protocols/irc/msgs.c:201
-#: src/protocols/irc/msgs.c:214
+#: src/protocols/irc/msgs.c:126
+#, c-format
+msgid "Cannot ban %s: banlist is full"
+msgstr "无法屏蔽 %s:屏蔽列表已满"
+
+#: src/protocols/irc/msgs.c:204 src/protocols/irc/msgs.c:224
+#: src/protocols/irc/msgs.c:237
 #, c-format
 msgid "<b>%s:</b> %s"
 msgstr "<b>%s:</b> %s"
 
-#: src/protocols/irc/msgs.c:184
+#: src/protocols/irc/msgs.c:207
 msgid " <i>(ircop)</i>"
 msgstr " <i>(ircop)</i>"
 
-#: src/protocols/irc/msgs.c:185
+#: src/protocols/irc/msgs.c:208
 msgid " <i>(identified)</i>"
 msgstr " <i>(identified)</i>"
 
-#: src/protocols/irc/msgs.c:189 src/protocols/irc/msgs.c:195
-#: src/protocols/irc/msgs.c:196 src/protocols/irc/msgs.c:207
+#: src/protocols/irc/msgs.c:212 src/protocols/irc/msgs.c:218
+#: src/protocols/irc/msgs.c:219 src/protocols/irc/msgs.c:230
 #: src/protocols/yahoo/yahoo_profile.c:665
 #, c-format
 msgid "<b>%s:</b> %s<br>"
 msgstr "<b>%s:</b> %s<br>"
 
-#: src/protocols/irc/msgs.c:196 src/protocols/silc/ops.c:969
+#: src/protocols/irc/msgs.c:219 src/protocols/silc/ops.c:969
 #: src/protocols/silc/ops.c:1120 src/protocols/yahoo/yahoo_profile.c:1007
 msgid "Realname"
 msgstr "真名"
 
-#: src/protocols/irc/msgs.c:207 src/protocols/silc/ops.c:1041
+#: src/protocols/irc/msgs.c:230 src/protocols/silc/ops.c:1041
 msgid "Currently on"
 msgstr "目前位于"
 
-#: src/protocols/irc/msgs.c:212
+#: src/protocols/irc/msgs.c:235
 #, c-format
 msgid "<b>Idle for:</b> %s<br>"
 msgstr "<b>瞌睡了:</b> %s<br>"
 
-#: src/protocols/irc/msgs.c:214
+#: src/protocols/irc/msgs.c:237
 msgid "Online since"
 msgstr "上线时间"
 
-#: src/protocols/irc/msgs.c:217
+#: src/protocols/irc/msgs.c:240
 msgid "<br><b>Defining adjective:</b> Glorious<br>"
 msgstr "<br><b>定义形容词:</b>显赫<br>"
 
-#: src/protocols/irc/msgs.c:224
+#: src/protocols/irc/msgs.c:247
 #, c-format
 msgid "Buddy Information for %s"
 msgstr "%s 的好友信息"
 
-#: src/protocols/irc/msgs.c:287
+#: src/protocols/irc/msgs.c:310
 #, c-format
 msgid "%s has changed the topic to: %s"
 msgstr "%s 将话题改为: %s"
 
-#: src/protocols/irc/msgs.c:292
+#: src/protocols/irc/msgs.c:315
 #, c-format
 msgid "The topic for %s is: %s"
 msgstr "%s 的话题为: %s"
 
-#: src/protocols/irc/msgs.c:309
+#: src/protocols/irc/msgs.c:332
 #, c-format
 msgid "Unknown message '%s'"
 msgstr "未知信息“%s”"
 
-#: src/protocols/irc/msgs.c:310
+#: src/protocols/irc/msgs.c:333
 msgid "Unknown message"
 msgstr "未知信息"
 
-#: src/protocols/irc/msgs.c:310
+#: src/protocols/irc/msgs.c:333
 msgid "Gaim has sent a message the IRC server did not understand."
 msgstr "Gaim 发送了 IRC 服务器无法理解的信息。"
 
-#: src/protocols/irc/msgs.c:333
+#: src/protocols/irc/msgs.c:356
 #, c-format
 msgid "Users on %s: %s"
 msgstr "%s 上的用户数: %s"
 
-#: src/protocols/irc/msgs.c:428
+#: src/protocols/irc/msgs.c:451
 msgid "Time Response"
 msgstr "时间响应"
 
-#: src/protocols/irc/msgs.c:429
+#: src/protocols/irc/msgs.c:452
 msgid "The IRC server's local time is:"
 msgstr "IRC 服务器的本地时间为:"
 
-#: src/protocols/irc/msgs.c:440
+#: src/protocols/irc/msgs.c:463
 msgid "No such channel"
 msgstr "没有这样的频道"
 
 #. does this happen?
-#: src/protocols/irc/msgs.c:451
+#: src/protocols/irc/msgs.c:475
 msgid "no such channel"
 msgstr "没有这样的频道"
 
-#: src/protocols/irc/msgs.c:454
+#: src/protocols/irc/msgs.c:478
 msgid "User is not logged in"
 msgstr "用户未登入"
 
-#: src/protocols/irc/msgs.c:459
+#: src/protocols/irc/msgs.c:484
 msgid "No such nick or channel"
 msgstr "没有这样的昵称或频道"
 
-#: src/protocols/irc/msgs.c:479
+#: src/protocols/irc/msgs.c:505
 msgid "Could not send"
 msgstr "无法发送"
 
-#: src/protocols/irc/msgs.c:535
+#: src/protocols/irc/msgs.c:561
 #, c-format
 msgid "Joining %s requires an invitation."
 msgstr "加入 %s 需要邀请。"
 
-#: src/protocols/irc/msgs.c:536
+#: src/protocols/irc/msgs.c:562
 msgid "Invitation only"
 msgstr "只邀请"
 
-#: src/protocols/irc/msgs.c:637
+#: src/protocols/irc/msgs.c:663
 #, c-format
 msgid "You have been kicked by %s: (%s)"
 msgstr "您被 %s: %s 踢出了"
 
-#: src/protocols/irc/msgs.c:642
+#: src/protocols/irc/msgs.c:668
 #, c-format
 msgid "Kicked by %s (%s)"
 msgstr "被 %s (%s) 踢出"
 
-#: src/protocols/irc/msgs.c:663
+#: src/protocols/irc/msgs.c:689
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr "由 %3$s 管理(%1$s %2$s)"
 
-#: src/protocols/irc/msgs.c:773
+#: src/protocols/irc/msgs.c:772
+msgid ""
+"Your selected account name was rejected by the server.  It probably contains "
+"invalid characters."
+msgstr ""
+"您所选的账户名称被服务器拒绝。其中可能包含无效的字符。"
+
+#: src/protocols/irc/msgs.c:812
 msgid "Could not change nick"
 msgstr "无法更改昵称"
 
-#: src/protocols/irc/msgs.c:774
+#: src/protocols/irc/msgs.c:813
 msgid "Cannot change nick"
 msgstr "无法更改昵称"
 
-#: src/protocols/irc/msgs.c:795
+#: src/protocols/irc/msgs.c:834
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr "您已经参与了频道%s%s"
 
-#: src/protocols/irc/msgs.c:836
+#: src/protocols/irc/msgs.c:875
 msgid "Error: invalid PONG from server"
 msgstr "错误: 服务器的 PONG 无效"
 
-#: src/protocols/irc/msgs.c:838
+#: src/protocols/irc/msgs.c:877
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr "PING 响应 -- 延后: %lu 秒"
 
-#: src/protocols/irc/msgs.c:913
+#: src/protocols/irc/msgs.c:952
 #, c-format
 msgid "Cannot join %s:"
 msgstr "无法加入 %s:"
 
-#: src/protocols/irc/msgs.c:914 src/protocols/silc/ops.c:914
+#: src/protocols/irc/msgs.c:953 src/protocols/silc/ops.c:914
 msgid "Cannot join channel"
 msgstr "无法加入频道"
 
-#: src/protocols/irc/msgs.c:950
+#: src/protocols/irc/msgs.c:989
 #, c-format
 msgid "Wallops from %s"
 msgstr "来自 %s 的冲击"
 
-#: src/protocols/irc/parse.c:111
+#: src/protocols/irc/parse.c:113
 msgid "action &lt;action to perform&gt;:  Perform an action."
 msgstr "action &lt;要执行的动作&gt;: 执行动作。"
 
-#: src/protocols/irc/parse.c:112
+#: src/protocols/irc/parse.c:114
 msgid ""
 "away [message]:  Set an away message, or use no message to return from being "
 "away."
 msgstr "away [消息]: 设置离开消息,不尾随消息则代表离开。"
 
-#: src/protocols/irc/parse.c:113
+#: src/protocols/irc/parse.c:115
 msgid ""
 "deop &lt;nick1&gt; [nick2] ...:  Remove channel operator status from "
 "someone. You must be a channel operator to do this."
 msgstr ""
 "deop &lt;昵称1&gt; [昵称2]……: 删除某人的管理员状态。您必须是频道管理员。"
 
-#: src/protocols/irc/parse.c:114
+#: src/protocols/irc/parse.c:116
 msgid ""
 "devoice &lt;nick1&gt; [nick2] ...:  Remove channel voice status from "
 "someone, preventing them from speaking if the channel is moderated (+m). You "
@@ -5376,13 +5435,13 @@
 "devoice &lt;昵称1&gt; [昵称2]……: 删除某人的频道语音状态,使其无法在频道被管理"
 "(+m)时说话。您必须是频道管理员。"
 
-#: src/protocols/irc/parse.c:115
+#: src/protocols/irc/parse.c:117
 msgid ""
 "invite &lt;nick&gt; [room]:  Invite someone to join you in the specified "
 "channel, or the current channel."
 msgstr "invite &lt;昵称&gt; [房间]: 邀请某人加入您指定的频道,或者当前频道。"
 
-#: src/protocols/irc/parse.c:116
+#: src/protocols/irc/parse.c:118
 msgid ""
 "j &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
 "channels, optionally providing a channel key for each if needed."
@@ -5390,7 +5449,7 @@
 "j &lt;房间1&gt;[,房间][,……] [密钥1[,密钥2][,……]]: 输入一个或多个频道,如需要"
 "的话可选提供频道密钥。"
 
-#: src/protocols/irc/parse.c:117
+#: src/protocols/irc/parse.c:119
 msgid ""
 "join &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
 "channels, optionally providing a channel key for each if needed."
@@ -5398,342 +5457,341 @@
 "join &lt;房间1&gt;[,房间][,……] [密钥1[,密钥2][,……]]: 输入一个或多个频道,如需"
 "要的话可选提供频道密钥。"
 
-#: src/protocols/irc/parse.c:118
+#: src/protocols/irc/parse.c:120
 msgid ""
 "kick &lt;nick&gt; [message]:  Remove someone from a channel. You must be a "
 "channel operator to do this."
 msgstr "kick &lt;昵称&gt; [消息]: 将某人踢出频道。您必须是频道管理员。"
 
-#: src/protocols/irc/parse.c:119
+#: src/protocols/irc/parse.c:121
 msgid ""
 "list:  Display a list of chat rooms on the network. <i>Warning, some servers "
 "may disconnect you upon doing this.</i>"
 msgstr ""
 "list: 显示网络上的聊天式列表。<i>警告,某些服务器可能因此而断开您的连接。</i>"
 
-#: src/protocols/irc/parse.c:120
+#: src/protocols/irc/parse.c:122
 msgid "me &lt;action to perform&gt;:  Perform an action."
 msgstr "me &lt;要执行的动作&gt;: 执行动作。"
 
-#: src/protocols/irc/parse.c:121
-msgid ""
-"mode &lt;nick|channel&gt; &lt;+|-&gt;&lt;A-Za-z&gt;:  Set or unset a channel "
+#: src/protocols/irc/parse.c:123
+msgid ""
+"mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;nick|channel&gt;:  Set or unset a channel "
 "or user mode."
 msgstr ""
-"mode &lt;昵称|频道&gt; &lt;+|-&gt;&lt;A-Za-z&gt;: 设置或取消频道或用户模式。"
-
-#: src/protocols/irc/parse.c:122
+"mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;昵称|频道&gt;: 设置或取消频道或用户模式。"
+
+#: src/protocols/irc/parse.c:124
 msgid ""
 "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
 "opposed to a channel)."
 msgstr "msg &lt;昵称&gt; &lt;消息&gt;: 给用户发送私下消息(与频道相对)。"
 
-#: src/protocols/irc/parse.c:123
+#: src/protocols/irc/parse.c:125
 msgid "names [channel]:  List the users currently in a channel."
 msgstr "name [频道]: 列出频道中目前的用户。"
 
-#: src/protocols/irc/parse.c:124 src/protocols/jabber/jabber.c:1459
+#: src/protocols/irc/parse.c:126 src/protocols/jabber/jabber.c:1459
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr "nick &lt;新昵称&gt;: 更改您的昵称。"
 
-#: src/protocols/irc/parse.c:125
+#: src/protocols/irc/parse.c:127
 msgid ""
 "op &lt;nick1&gt; [nick2] ...:  Grant channel operator status to someone. You "
 "must be a channel operator to do this."
 msgstr ""
 "op &lt;昵称1&gt; [昵称2]……: 为某人授予频道管理员状态。您必须是频道管理员。"
 
-#: src/protocols/irc/parse.c:126
+#: src/protocols/irc/parse.c:128
 msgid ""
 "operwall &lt;message&gt;:  If you don't know what this is, you probably "
 "can't use it."
 msgstr "operwall &lt;消息&gt;: 如果您不知道这是什么功能,请不要使用。"
 
-#: src/protocols/irc/parse.c:127
+#: src/protocols/irc/parse.c:129
 msgid ""
 "part [room] [message]:  Leave the current channel, or a specified channel, "
 "with an optional message."
 msgstr "part [房间] [消息]: 离开当前频道或指定频道,并留下可选的消息。"
 
-#: src/protocols/irc/parse.c:128
+#: src/protocols/irc/parse.c:130
 msgid ""
 "ping [nick]:  Asks how much lag a user (or the server if no user specified) "
 "has."
 msgstr "ping [昵称]: 询问用户发了多长时间呆(若未指定用户则代表服务器)。"
 
-#: src/protocols/irc/parse.c:129
+#: src/protocols/irc/parse.c:131
 msgid ""
 "query &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
 "opposed to a channel)."
 msgstr "query &lt;昵称&gt; &lt;消息&gt;: 给用户发送私下消息(与频道相对)。"
 
-#: src/protocols/irc/parse.c:130
+#: src/protocols/irc/parse.c:132
 msgid "quit [message]:  Disconnect from the server, with an optional message."
 msgstr "quit [消息]: 断开与服务器的连接,并留下可选的消息。"
 
-#: src/protocols/irc/parse.c:131
+#: src/protocols/irc/parse.c:133
 msgid "quote [...]:  Send a raw command to the server."
 msgstr "quot [……]: 向服务器发送原始命令。"
 
-#: src/protocols/irc/parse.c:132
+#: src/protocols/irc/parse.c:134
 msgid ""
 "remove &lt;nick&gt; [message]:  Remove someone from a room. You must be a "
 "channel operator to do this."
 msgstr "remove &lt;昵称&gt; [消息]: 从房间删除某人。您必须是频道管理员。"
 
-#: src/protocols/irc/parse.c:133
+#: src/protocols/irc/parse.c:135
 msgid "time: Displays the current local time at the IRC server."
 msgstr "time: 显示 IRC 服务器上当前的本地时间。"
 
-#: src/protocols/irc/parse.c:134
+#: src/protocols/irc/parse.c:136
 msgid "topic [new topic]:  View or change the channel topic."
 msgstr "topic [新话题]: 查看或更改频道话题。"
 
-#: src/protocols/irc/parse.c:135
+#: src/protocols/irc/parse.c:137
 msgid "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Set or unset a user mode."
 msgstr "umode &lt;+|-&gt;&lt;A-Za-z&gt;: 设置或取消用户模式。"
 
-#: src/protocols/irc/parse.c:136
+#: src/protocols/irc/parse.c:138
 msgid ""
 "voice &lt;nick1&gt; [nick2] ...:  Grant channel voice status to someone. You "
 "must be a channel operator to do this."
 msgstr ""
 "voice &lt;昵称1&gt; [昵称2]: 为某人授予频道语音状态。您必须是频道管理员。"
 
-#: src/protocols/irc/parse.c:137
+#: src/protocols/irc/parse.c:139
 msgid ""
 "wallops &lt;message&gt;:  If you don't know what this is, you probably can't "
 "use it."
 msgstr "wallops &lt;消息&gt;: 如果您不知道这是什么功能,请不要使用。"
 
-#: src/protocols/irc/parse.c:138
-msgid "whois &lt;nick&gt;:  Get information on a user."
-msgstr "whois &lt;昵称&gt;: 获得用户信息。"
-
-#: src/protocols/irc/parse.c:419
+#: src/protocols/irc/parse.c:140
+msgid "whois [server] &lt;nick&gt;:  Get information on a user."
+msgstr "whois [服务器] &lt;昵称&gt;: 获得用户信息。"
+
+#: src/protocols/irc/parse.c:421
 #, c-format
 msgid "Reply time from %s: %lu seconds"
 msgstr "%s 的回复时间: %lu 秒"
 
-#: src/protocols/irc/parse.c:420
+#: src/protocols/irc/parse.c:422
 msgid "PONG"
 msgstr "PONG"
 
-#: src/protocols/irc/parse.c:420
+#: src/protocols/irc/parse.c:422
 msgid "CTCP PING reply"
 msgstr "CTCP PING 响应"
 
-#: src/protocols/irc/parse.c:523 src/protocols/irc/parse.c:527
+#: src/protocols/irc/parse.c:525 src/protocols/irc/parse.c:529
 #: src/protocols/oscar/oscar.c:1634 src/protocols/toc/toc.c:189
 #: src/protocols/toc/toc.c:597 src/protocols/toc/toc.c:613
 #: src/protocols/toc/toc.c:690
 msgid "Disconnected."
 msgstr "已断开连接。"
 
-#: src/protocols/jabber/auth.c:52
+#: src/protocols/jabber/auth.c:51
 msgid ""
 "Server requires TLS/SSL for login.  Select \"Use TLS if available\" in "
 "account properties"
-msgstr ""
-"服务器需要 TLS/SSL 登录。请在账户属性中选择“若可用则使用 TLS”"
-
-#: src/protocols/jabber/auth.c:54
+msgstr "服务器需要 TLS/SSL 登录。请在账户属性中选择“若可用则使用 TLS”"
+
+#: src/protocols/jabber/auth.c:53
 msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
 msgstr "服务器需要 TLS/SSL 才能登录。没有找到 TLS/SSL 支持。"
 
-#: src/protocols/jabber/auth.c:115
+#: src/protocols/jabber/auth.c:114
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr "服务器需要在不加密流上使用纯文本验证"
 
-#: src/protocols/jabber/auth.c:164 src/protocols/jabber/auth.c:165
-#: src/protocols/jabber/auth.c:242 src/protocols/jabber/auth.c:243
+#: src/protocols/jabber/auth.c:163 src/protocols/jabber/auth.c:164
+#: src/protocols/jabber/auth.c:244 src/protocols/jabber/auth.c:245
 msgid "Plaintext Authentication"
 msgstr "纯文本认证"
 
-#: src/protocols/jabber/auth.c:166 src/protocols/jabber/auth.c:244
+#: src/protocols/jabber/auth.c:165 src/protocols/jabber/auth.c:246
 msgid ""
 "This server requires plaintext authentication over an unencrypted "
 "connection.  Allow this and continue authentication?"
 msgstr "服务器需要在不加密流上使用纯文本验证。允许这么做并继续验证吗?"
 
-#: src/protocols/jabber/auth.c:174 src/protocols/jabber/auth.c:252
+#: src/protocols/jabber/auth.c:173 src/protocols/jabber/auth.c:254
 msgid "Server does not use any supported authentication method"
 msgstr "服务器未使用任何支持的身份验证方法"
 
-#: src/protocols/jabber/auth.c:390
+#: src/protocols/jabber/auth.c:396
 msgid "Invalid challenge from server"
 msgstr "服务器的挑战无效"
 
-#: src/protocols/jabber/buddy.c:249 src/protocols/jabber/buddy.c:657
+#: src/protocols/jabber/buddy.c:248 src/protocols/jabber/buddy.c:660
 #: src/protocols/silc/ops.c:806
 msgid "Full Name"
 msgstr "全名"
 
-#: src/protocols/jabber/buddy.c:250 src/protocols/jabber/buddy.c:670
+#: src/protocols/jabber/buddy.c:249 src/protocols/jabber/buddy.c:673
 #: src/protocols/silc/ops.c:818
 msgid "Family Name"
 msgstr "姓"
 
-#: src/protocols/jabber/buddy.c:251 src/protocols/jabber/buddy.c:674
+#: src/protocols/jabber/buddy.c:250 src/protocols/jabber/buddy.c:677
 msgid "Given Name"
 msgstr "名"
 
-#: src/protocols/jabber/buddy.c:252 src/protocols/jabber/buddy.c:688
-#: src/protocols/jabber/jabber.c:617 src/protocols/msn/msn.c:1309
+#: src/protocols/jabber/buddy.c:251 src/protocols/jabber/buddy.c:691
+#: src/protocols/jabber/jabber.c:617 src/protocols/msn/msn.c:1340
 #: src/protocols/silc/buddy.c:1456 src/protocols/silc/ops.c:822
 #: src/protocols/silc/ops.c:965 src/protocols/silc/ops.c:1116
 #: src/protocols/yahoo/yahoo_profile.c:1002
 msgid "Nickname"
 msgstr "昵称"
 
-#: src/protocols/jabber/buddy.c:253 src/protocols/jabber/jabber.c:657
+#: src/protocols/jabber/buddy.c:252 src/protocols/jabber/jabber.c:657
 msgid "URL"
 msgstr "URL"
 
-#: src/protocols/jabber/buddy.c:254 src/protocols/jabber/buddy.c:716
+#: src/protocols/jabber/buddy.c:253 src/protocols/jabber/buddy.c:719
 msgid "Street Address"
 msgstr "街道地址"
 
-#: src/protocols/jabber/buddy.c:255 src/protocols/jabber/buddy.c:712
+#: src/protocols/jabber/buddy.c:254 src/protocols/jabber/buddy.c:715
 msgid "Extended Address"
 msgstr "额外地址"
 
-#: src/protocols/jabber/buddy.c:256 src/protocols/jabber/buddy.c:720
+#: src/protocols/jabber/buddy.c:255 src/protocols/jabber/buddy.c:723
 msgid "Locality"
 msgstr "地区"
 
-#: src/protocols/jabber/buddy.c:257 src/protocols/jabber/buddy.c:724
+#: src/protocols/jabber/buddy.c:256 src/protocols/jabber/buddy.c:727
 msgid "Region"
 msgstr "区域"
 
-#: src/protocols/jabber/buddy.c:258 src/protocols/jabber/buddy.c:728
+#: src/protocols/jabber/buddy.c:257 src/protocols/jabber/buddy.c:731
 #: src/protocols/jabber/jabber.c:647
 msgid "Postal Code"
 msgstr "邮政编码"
 
 #. Country
-#: src/protocols/jabber/buddy.c:259 src/protocols/jabber/buddy.c:733
+#: src/protocols/jabber/buddy.c:258 src/protocols/jabber/buddy.c:736
 #: src/protocols/trepia/trepia.c:340 src/protocols/trepia/trepia.c:417
 msgid "Country"
 msgstr "国家"
 
-#: src/protocols/jabber/buddy.c:260 src/protocols/jabber/buddy.c:744
-#: src/protocols/jabber/buddy.c:751
+#: src/protocols/jabber/buddy.c:259 src/protocols/jabber/buddy.c:747
+#: src/protocols/jabber/buddy.c:754
 msgid "Telephone"
 msgstr "电话号码"
 
-#: src/protocols/jabber/buddy.c:261 src/protocols/jabber/buddy.c:762
-#: src/protocols/jabber/buddy.c:770 src/protocols/silc/silc.c:651
+#: src/protocols/jabber/buddy.c:260 src/protocols/jabber/buddy.c:765
+#: src/protocols/jabber/buddy.c:773 src/protocols/silc/silc.c:651
 #: src/protocols/silc/util.c:508 src/protocols/yahoo/yahoo_profile.c:997
 msgid "Email"
 msgstr "电子邮件"
 
-#: src/protocols/jabber/buddy.c:262 src/protocols/jabber/buddy.c:785
+#: src/protocols/jabber/buddy.c:261 src/protocols/jabber/buddy.c:788
 msgid "Organization Name"
 msgstr "组织名称"
 
-#: src/protocols/jabber/buddy.c:263 src/protocols/jabber/buddy.c:789
+#: src/protocols/jabber/buddy.c:262 src/protocols/jabber/buddy.c:792
 msgid "Organization Unit"
 msgstr "组织单元"
 
-#: src/protocols/jabber/buddy.c:265 src/protocols/jabber/buddy.c:798
+#: src/protocols/jabber/buddy.c:264 src/protocols/jabber/buddy.c:801
 msgid "Role"
 msgstr "职务"
 
-#: src/protocols/jabber/buddy.c:266 src/protocols/jabber/buddy.c:691
-#: src/protocols/oscar/oscar.c:5213
+#: src/protocols/jabber/buddy.c:265 src/protocols/jabber/buddy.c:694
+#: src/protocols/oscar/oscar.c:5231
 msgid "Birthday"
 msgstr "生日"
 
-#: src/protocols/jabber/buddy.c:559 src/protocols/jabber/buddy.c:560
+#: src/protocols/jabber/buddy.c:562 src/protocols/jabber/buddy.c:563
 msgid "Edit Jabber vCard"
 msgstr "编辑 Jabber vCard"
 
-#: src/protocols/jabber/buddy.c:561
+#: src/protocols/jabber/buddy.c:564
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable."
 msgstr "所有下面的项目都是可选的。请只输入您愿意输入的信息。"
 
-#: src/protocols/jabber/buddy.c:606
+#: src/protocols/jabber/buddy.c:609
 msgid "Jabber ID"
 msgstr "Jabber ID"
 
-#: src/protocols/jabber/buddy.c:632 src/protocols/jabber/jabber.c:1610
+#: src/protocols/jabber/buddy.c:635 src/protocols/jabber/jabber.c:1610
 msgid "Resource"
 msgstr "资源"
 
-#: src/protocols/jabber/buddy.c:678 src/protocols/silc/ops.c:814
+#: src/protocols/jabber/buddy.c:681 src/protocols/silc/ops.c:814
 msgid "Middle Name"
 msgstr "中名"
 
-#: src/protocols/jabber/buddy.c:696 src/protocols/jabber/jabber.c:632
-#: src/protocols/oscar/oscar.c:5231 src/protocols/oscar/oscar.c:5239
+#: src/protocols/jabber/buddy.c:699 src/protocols/jabber/jabber.c:632
+#: src/protocols/oscar/oscar.c:5249 src/protocols/oscar/oscar.c:5257
 #: src/protocols/silc/ops.c:850
 msgid "Address"
 msgstr "地址"
 
-#: src/protocols/jabber/buddy.c:708
+#: src/protocols/jabber/buddy.c:711
 msgid "P.O. Box"
 msgstr "邮政信箱"
 
-#: src/protocols/jabber/buddy.c:814
+#: src/protocols/jabber/buddy.c:817
 msgid "Photo"
 msgstr "相片"
 
-#: src/protocols/jabber/buddy.c:814
+#: src/protocols/jabber/buddy.c:817
 msgid "Logo"
 msgstr "图符"
 
-#: src/protocols/jabber/buddy.c:836
+#: src/protocols/jabber/buddy.c:840
 msgid "Jabber Profile"
 msgstr "Jabber 资料"
 
-#: src/protocols/jabber/buddy.c:1018
+#: src/protocols/jabber/buddy.c:1022
 msgid "Un-hide From"
 msgstr "取消隐身"
 
-#: src/protocols/jabber/buddy.c:1021
+#: src/protocols/jabber/buddy.c:1025
 msgid "Temporarily Hide From"
 msgstr "临时隐身"
 
 #. && NOT ME
-#: src/protocols/jabber/buddy.c:1028
+#: src/protocols/jabber/buddy.c:1032
 msgid "Cancel Presence Notification"
 msgstr "取消目前的通知"
 
-#: src/protocols/jabber/buddy.c:1034
+#: src/protocols/jabber/buddy.c:1038
 msgid "(Re-)Request authorization"
 msgstr "(重新)请求认证"
 
 #. if(NOT ME)
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
-#: src/protocols/jabber/buddy.c:1042
+#: src/protocols/jabber/buddy.c:1046
 msgid "Unsubscribe"
 msgstr "退订"
 
-#: src/protocols/jabber/buddy.c:1068 src/protocols/jabber/chat.c:671
-#: src/protocols/jabber/chat.c:682 src/protocols/jabber/jabber.c:958
+#: src/protocols/jabber/buddy.c:1072 src/protocols/jabber/chat.c:674
+#: src/protocols/jabber/chat.c:685 src/protocols/jabber/jabber.c:958
 #: src/protocols/silc/ops.c:1239
 msgid "Error"
 msgstr "出错"
 
-#: src/protocols/jabber/buddy.c:1074 src/protocols/jabber/jabber.c:988
+#: src/protocols/jabber/buddy.c:1078 src/protocols/jabber/jabber.c:988
 msgid "Chatty"
 msgstr "唠叨"
 
-#: src/protocols/jabber/buddy.c:1078 src/protocols/jabber/jabber.c:1000
+#: src/protocols/jabber/buddy.c:1082 src/protocols/jabber/jabber.c:1000
 #: src/status.c:161
 msgid "Extended Away"
 msgstr "远远离开"
 
-#: src/protocols/jabber/buddy.c:1080 src/protocols/jabber/jabber.c:1006
-#: src/protocols/oscar/oscar.c:685 src/protocols/oscar/oscar.c:7051
+#: src/protocols/jabber/buddy.c:1084 src/protocols/jabber/jabber.c:1006
+#: src/protocols/oscar/oscar.c:685 src/protocols/oscar/oscar.c:7074
 msgid "Do Not Disturb"
 msgstr "请勿打扰"
 
-#: src/protocols/jabber/chat.c:41 src/protocols/oscar/oscar.c:6532
+#: src/protocols/jabber/chat.c:41 src/protocols/oscar/oscar.c:6555
 #: src/protocols/yahoo/yahoochat.c:958
 msgid "_Room:"
 msgstr "房间(_R):"
@@ -5746,75 +5804,75 @@
 msgid "_Handle:"
 msgstr "昵称(_H):"
 
-#: src/protocols/jabber/chat.c:217
+#: src/protocols/jabber/chat.c:220
 #, c-format
 msgid "%s is not a valid room name"
 msgstr "%s 不是有效的房间名"
 
-#: src/protocols/jabber/chat.c:218
+#: src/protocols/jabber/chat.c:221
 msgid "Invalid Room Name"
 msgstr "无效的房间名"
 
-#: src/protocols/jabber/chat.c:223
+#: src/protocols/jabber/chat.c:226
 #, c-format
 msgid "%s is not a valid server name"
 msgstr "%s 不是有效的服务器名"
 
-#: src/protocols/jabber/chat.c:224 src/protocols/jabber/chat.c:225
+#: src/protocols/jabber/chat.c:227 src/protocols/jabber/chat.c:228
 msgid "Invalid Server Name"
 msgstr "无效的服务器名"
 
-#: src/protocols/jabber/chat.c:229
+#: src/protocols/jabber/chat.c:232
 #, c-format
 msgid "%s is not a valid room handle"
 msgstr "%s 不是有效的房间昵称"
 
-#: src/protocols/jabber/chat.c:230 src/protocols/jabber/chat.c:231
+#: src/protocols/jabber/chat.c:233 src/protocols/jabber/chat.c:234
 msgid "Invalid Room Handle"
 msgstr "无效的房间门昵称"
 
-#: src/protocols/jabber/chat.c:389
+#: src/protocols/jabber/chat.c:392
 msgid "Configuration error"
 msgstr "配置错误"
 
-#: src/protocols/jabber/chat.c:398 src/protocols/jabber/chat.c:543
+#: src/protocols/jabber/chat.c:401 src/protocols/jabber/chat.c:546
 msgid "Unable to configure"
 msgstr "无法配置"
 
-#: src/protocols/jabber/chat.c:414
+#: src/protocols/jabber/chat.c:417
 msgid "Room Configuration Error"
 msgstr "房间配置错误"
 
-#: src/protocols/jabber/chat.c:415
+#: src/protocols/jabber/chat.c:418
 msgid "This room is not capable of being configured"
 msgstr "此房间无法进行配置"
 
-#: src/protocols/jabber/chat.c:465 src/protocols/jabber/chat.c:534
+#: src/protocols/jabber/chat.c:468 src/protocols/jabber/chat.c:537
 msgid "Registration error"
 msgstr "注册错误"
 
-#: src/protocols/jabber/chat.c:622
+#: src/protocols/jabber/chat.c:625
 msgid "Nick changing not supported in non-MUC chatrooms"
 msgstr "不支持在非 MUC 聊天室中更改昵称"
 
-#: src/protocols/jabber/chat.c:672 src/protocols/jabber/chat.c:683
+#: src/protocols/jabber/chat.c:675 src/protocols/jabber/chat.c:686
 #: src/protocols/silc/ops.c:1239
 msgid "Error retrieving room list"
 msgstr "收取房间列表时出错"
 
-#: src/protocols/jabber/chat.c:731
+#: src/protocols/jabber/chat.c:734
 msgid "Invalid Server"
 msgstr "无效的服务器"
 
-#: src/protocols/jabber/chat.c:769
+#: src/protocols/jabber/chat.c:772
 msgid "Enter a Conference Server"
 msgstr "进入会议服务器"
 
-#: src/protocols/jabber/chat.c:770
+#: src/protocols/jabber/chat.c:773
 msgid "Select a conference server to query"
 msgstr "选择要查询的会议服务器"
 
-#: src/protocols/jabber/chat.c:773
+#: src/protocols/jabber/chat.c:776
 msgid "Find Rooms"
 msgstr "查找房间"
 
@@ -5823,9 +5881,9 @@
 msgstr "初始化会话出错"
 
 #: src/protocols/jabber/jabber.c:211 src/protocols/trepia/trepia.c:248
-#: src/protocols/trepia/trepia.c:699 src/protocols/trepia/trepia.c:990
-#: src/protocols/trepia/trepia.c:1034 src/protocols/trepia/trepia.c:1133
-#: src/protocols/trepia/trepia.c:1179
+#: src/protocols/trepia/trepia.c:700 src/protocols/trepia/trepia.c:991
+#: src/protocols/trepia/trepia.c:1035 src/protocols/trepia/trepia.c:1134
+#: src/protocols/trepia/trepia.c:1180
 msgid "Write error"
 msgstr "写错误"
 
@@ -5838,7 +5896,7 @@
 msgstr "无效的 Jabber ID"
 
 #: src/protocols/jabber/jabber.c:417 src/protocols/jabber/jabber.c:749
-#: src/protocols/trepia/trepia.c:1073
+#: src/protocols/trepia/trepia.c:1074
 msgid "Unable to create socket"
 msgstr "无法创建套接字"
 
@@ -5872,8 +5930,8 @@
 msgstr "电子邮件"
 
 #. State
-#: src/protocols/jabber/jabber.c:642 src/protocols/oscar/oscar.c:5233
-#: src/protocols/oscar/oscar.c:5241 src/protocols/trepia/trepia.c:336
+#: src/protocols/jabber/jabber.c:642 src/protocols/oscar/oscar.c:5251
+#: src/protocols/oscar/oscar.c:5259 src/protocols/trepia/trepia.c:336
 #: src/protocols/trepia/trepia.c:414
 msgid "State"
 msgstr "州/省"
@@ -5899,7 +5957,7 @@
 msgid "Initializing Stream"
 msgstr "初始化流"
 
-#: src/protocols/jabber/jabber.c:811 src/protocols/msn/session.c:344
+#: src/protocols/jabber/jabber.c:811 src/protocols/msn/session.c:365
 msgid "Authenticating"
 msgstr "正在认证"
 
@@ -5909,7 +5967,7 @@
 
 #: src/protocols/jabber/jabber.c:892 src/protocols/jabber/jabber.c:1208
 #: src/protocols/jabber/jabber.c:1249 src/protocols/jabber/jabber.c:1282
-#: src/protocols/oscar/oscar.c:753 src/protocols/oscar/oscar.c:6811
+#: src/protocols/oscar/oscar.c:753 src/protocols/oscar/oscar.c:6834
 msgid "Not Authorized"
 msgstr "未认证"
 
@@ -6282,59 +6340,59 @@
 msgid "XML Parse error"
 msgstr "XML 分析错误"
 
-#: src/protocols/jabber/presence.c:264
+#: src/protocols/jabber/presence.c:268
 msgid "Unknown Error in presence"
 msgstr "出现未知错误"
 
-#: src/protocols/jabber/presence.c:267
+#: src/protocols/jabber/presence.c:271
 #, c-format
 msgid "The user %s wants to add you to their buddy list."
 msgstr "用户 %s 想要将您添加为好友。"
 
-#: src/protocols/jabber/presence.c:273 src/protocols/msn/userlist.c:102
-#: src/protocols/oscar/oscar.c:3850 src/protocols/oscar/oscar.c:6461
+#: src/protocols/jabber/presence.c:277 src/protocols/msn/userlist.c:102
+#: src/protocols/oscar/oscar.c:3861 src/protocols/oscar/oscar.c:6484
 msgid "Authorize"
 msgstr "同意"
 
-#: src/protocols/jabber/presence.c:274 src/protocols/msn/userlist.c:103
-#: src/protocols/oscar/oscar.c:3852 src/protocols/oscar/oscar.c:6462
+#: src/protocols/jabber/presence.c:278 src/protocols/msn/userlist.c:103
+#: src/protocols/oscar/oscar.c:3863 src/protocols/oscar/oscar.c:6485
 msgid "Deny"
 msgstr "拒绝"
 
-#: src/protocols/jabber/presence.c:321 src/protocols/jabber/presence.c:322
+#: src/protocols/jabber/presence.c:325 src/protocols/jabber/presence.c:326
 msgid "Create New Room"
 msgstr "创建新房间"
 
-#: src/protocols/jabber/presence.c:323
+#: src/protocols/jabber/presence.c:327
 msgid ""
 "You are creating a new room.  Would you like to configure it, or accept the "
 "default settings?"
 msgstr "您正在创建新房间。您是想要进行配置,还是想要接受默认设置?"
 
-#: src/protocols/jabber/presence.c:325
+#: src/protocols/jabber/presence.c:329
 msgid "Configure Room"
 msgstr "配置房间"
 
-#: src/protocols/jabber/presence.c:327
+#: src/protocols/jabber/presence.c:331
 msgid "Accept Defaults"
 msgstr "接受默认值"
 
-#: src/protocols/jabber/presence.c:364
+#: src/protocols/jabber/presence.c:368
 #, c-format
 msgid "Error in chat %s"
 msgstr "聊天 %s 出错"
 
-#: src/protocols/jabber/presence.c:367
+#: src/protocols/jabber/presence.c:371
 #, c-format
 msgid "Error joining chat %s"
 msgstr "加入聊天 %s 出错"
 
-#: src/protocols/jabber/si.c:582
+#: src/protocols/jabber/si.c:585
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
 msgstr "无法给 %s 发送文件,用户不支持文件传送"
 
-#: src/protocols/jabber/si.c:583 src/protocols/jabber/si.c:584
+#: src/protocols/jabber/si.c:586 src/protocols/jabber/si.c:587
 msgid "File Send Failed"
 msgstr "发送文件失败"
 
@@ -6635,7 +6693,7 @@
 msgstr "寻呼"
 
 #: src/protocols/msn/msn.c:502 src/protocols/msn/msn.c:509
-#: src/protocols/msn/msn.c:512 src/protocols/yahoo/yahoo.c:2533
+#: src/protocols/msn/msn.c:512 src/protocols/yahoo/yahoo.c:2565
 #, c-format
 msgid ""
 "\n"
@@ -6653,25 +6711,25 @@
 msgstr "被屏蔽"
 
 #: src/protocols/msn/msn.c:543 src/protocols/msn/state.c:33
-#: src/protocols/yahoo/yahoo.c:2390 src/protocols/yahoo/yahoo.c:2899
+#: src/protocols/yahoo/yahoo.c:2422 src/protocols/yahoo/yahoo.c:2931
 msgid "Be Right Back"
 msgstr "马上回来"
 
 #: src/protocols/msn/msn.c:547 src/protocols/msn/state.c:31
 #: src/protocols/novell/novell.c:2814 src/protocols/novell/novell.c:2929
 #: src/protocols/novell/novell.c:2983 src/protocols/silc/buddy.c:1397
-#: src/protocols/silc/silc.c:54 src/protocols/yahoo/yahoo.c:2392
-#: src/protocols/yahoo/yahoo.c:2902
+#: src/protocols/silc/silc.c:54 src/protocols/yahoo/yahoo.c:2424
+#: src/protocols/yahoo/yahoo.c:2934
 msgid "Busy"
 msgstr "忙碌"
 
 #: src/protocols/msn/msn.c:551 src/protocols/msn/state.c:35
-#: src/protocols/yahoo/yahoo.c:2400 src/protocols/yahoo/yahoo.c:2914
+#: src/protocols/yahoo/yahoo.c:2432 src/protocols/yahoo/yahoo.c:2946
 msgid "On The Phone"
 msgstr "接听电话"
 
 #: src/protocols/msn/msn.c:555 src/protocols/msn/state.c:36
-#: src/protocols/yahoo/yahoo.c:2404 src/protocols/yahoo/yahoo.c:2920
+#: src/protocols/yahoo/yahoo.c:2436 src/protocols/yahoo/yahoo.c:2952
 msgid "Out To Lunch"
 msgstr "外出就餐"
 
@@ -6724,91 +6782,91 @@
 msgid "Failed to connect to server."
 msgstr "连接到服务器失败。"
 
-#: src/protocols/msn/msn.c:1302 src/protocols/yahoo/yahoo_profile.c:659
+#: src/protocols/msn/msn.c:1333 src/protocols/yahoo/yahoo_profile.c:659
 #: src/protocols/zephyr/zephyr.c:712 src/protocols/zephyr/zephyr.c:1126
 #, c-format
 msgid "<b>Alias:</b> %s<br>"
 msgstr "<b>别名:</b> %s<br>"
 
 #. put a link to the actual profile URL
-#: src/protocols/msn/msn.c:1309 src/protocols/msn/msn.c:1656
-#: src/protocols/yahoo/yahoo_profile.c:1170 src/util.c:783
+#: src/protocols/msn/msn.c:1340 src/protocols/msn/msn.c:1687
+#: src/protocols/yahoo/yahoo_profile.c:1170 src/util.c:787
 #, c-format
 msgid "<b>%s:</b> "
 msgstr "<b>%s:</b>"
 
-#: src/protocols/msn/msn.c:1386
+#: src/protocols/msn/msn.c:1417
 msgid "MSN Profile"
 msgstr "MSN 个人资料"
 
-#: src/protocols/msn/msn.c:1391 src/protocols/msn/msn.c:1643
+#: src/protocols/msn/msn.c:1422 src/protocols/msn/msn.c:1674
 #: src/protocols/yahoo/yahoo_profile.c:763
 msgid "Error retrieving profile"
 msgstr "获取配置文件出错"
 
 #. Age
-#: src/protocols/msn/msn.c:1462 src/protocols/oscar/oscar.c:5218
+#: src/protocols/msn/msn.c:1493 src/protocols/oscar/oscar.c:5236
 #: src/protocols/trepia/trepia.c:286 src/protocols/trepia/trepia.c:405
 #: src/protocols/yahoo/yahoo_profile.c:1017
 msgid "Age"
 msgstr "年龄"
 
 #. Gender
-#: src/protocols/msn/msn.c:1469 src/protocols/oscar/oscar.c:5205
+#: src/protocols/msn/msn.c:1500 src/protocols/oscar/oscar.c:5223
 #: src/protocols/trepia/trepia.c:280 src/protocols/trepia/trepia.c:407
 #: src/protocols/yahoo/yahoo_profile.c:1027
 msgid "Gender"
 msgstr "性别"
 
-#: src/protocols/msn/msn.c:1478 src/protocols/yahoo/yahoo_profile.c:1022
+#: src/protocols/msn/msn.c:1509 src/protocols/yahoo/yahoo_profile.c:1022
 msgid "Marital Status"
 msgstr "婚姻状况"
 
-#: src/protocols/msn/msn.c:1485 src/protocols/novell/novell.c:1454
+#: src/protocols/msn/msn.c:1516 src/protocols/novell/novell.c:1454
 #: src/protocols/yahoo/yahoo_profile.c:1012
 msgid "Location"
 msgstr "位置"
 
-#: src/protocols/msn/msn.c:1493 src/protocols/yahoo/yahoo_profile.c:1032
+#: src/protocols/msn/msn.c:1524 src/protocols/yahoo/yahoo_profile.c:1032
 msgid "Occupation"
 msgstr "职业"
 
-#: src/protocols/msn/msn.c:1510 src/protocols/msn/msn.c:1516
-#: src/protocols/msn/msn.c:1523 src/protocols/msn/msn.c:1531
-#: src/protocols/msn/msn.c:1538
+#: src/protocols/msn/msn.c:1541 src/protocols/msn/msn.c:1547
+#: src/protocols/msn/msn.c:1554 src/protocols/msn/msn.c:1562
+#: src/protocols/msn/msn.c:1569
 msgid "A Little About Me"
 msgstr "自我介绍"
 
-#: src/protocols/msn/msn.c:1547 src/protocols/msn/msn.c:1553
-#: src/protocols/msn/msn.c:1560 src/protocols/msn/msn.c:1567
+#: src/protocols/msn/msn.c:1578 src/protocols/msn/msn.c:1584
+#: src/protocols/msn/msn.c:1591 src/protocols/msn/msn.c:1598
 msgid "Favorite Things"
 msgstr "收藏"
 
-#: src/protocols/msn/msn.c:1576 src/protocols/msn/msn.c:1582
-#: src/protocols/msn/msn.c:1589
+#: src/protocols/msn/msn.c:1607 src/protocols/msn/msn.c:1613
+#: src/protocols/msn/msn.c:1620
 msgid "Hobbies and Interests"
 msgstr "嗜好和兴趣"
 
-#: src/protocols/msn/msn.c:1598 src/protocols/msn/msn.c:1604
+#: src/protocols/msn/msn.c:1629 src/protocols/msn/msn.c:1635
 #: src/protocols/yahoo/yahoo_profile.c:1074
 msgid "Favorite Quote"
 msgstr "格言"
 
-#: src/protocols/msn/msn.c:1612 src/protocols/yahoo/yahoo_profile.c:1125
+#: src/protocols/msn/msn.c:1643 src/protocols/yahoo/yahoo_profile.c:1125
 msgid "Last Updated"
 msgstr "上次更新"
 
 #. Homepage
-#: src/protocols/msn/msn.c:1623 src/protocols/silc/ops.c:846
+#: src/protocols/msn/msn.c:1654 src/protocols/silc/ops.c:846
 #: src/protocols/trepia/trepia.c:290 src/protocols/trepia/trepia.c:420
 msgid "Homepage"
 msgstr "主页"
 
-#: src/protocols/msn/msn.c:1645
+#: src/protocols/msn/msn.c:1676
 msgid "The user has not created a public profile."
 msgstr "用户尚未创建公开的个人资料。"
 
-#: src/protocols/msn/msn.c:1646
+#: src/protocols/msn/msn.c:1677
 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 "
@@ -6817,13 +6875,13 @@
 "MSN 报告找不到用户的个人资料。这可能是因为用户不存在,或者用户没有创建公开的"
 "个人资料。"
 
-#: src/protocols/msn/msn.c:1650
+#: src/protocols/msn/msn.c:1681
 msgid ""
 "Gaim could not find any information in the user's profile. The user most "
 "likely does not exist."
 msgstr "Gaim 在用户的个人资料中找不到任何信息。用户可能不存在。"
 
-#: src/protocols/msn/msn.c:1656 src/protocols/yahoo/yahoo_profile.c:1170
+#: src/protocols/msn/msn.c:1687 src/protocols/yahoo/yahoo_profile.c:1170
 msgid "Profile URL"
 msgstr "配置文件 URL"
 
@@ -6837,15 +6895,15 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/msn/msn.c:1861 src/protocols/msn/msn.c:1863
+#: src/protocols/msn/msn.c:1892 src/protocols/msn/msn.c:1894
 msgid "MSN Protocol Plugin"
 msgstr "MSN 协议插件"
 
-#: src/protocols/msn/msn.c:1882 src/protocols/trepia/trepia.c:1298
+#: src/protocols/msn/msn.c:1913 src/protocols/trepia/trepia.c:1299
 msgid "Login server"
 msgstr "登录服务器"
 
-#: src/protocols/msn/msn.c:1891
+#: src/protocols/msn/msn.c:1922
 msgid "Use HTTP Method"
 msgstr "使用 HTTP 方式"
 
@@ -6859,8 +6917,8 @@
 msgid "%s is not a valid group."
 msgstr "%s 不是有效的组名。"
 
-#: src/protocols/msn/notification.c:184 src/protocols/msn/notification.c:522
-#: src/protocols/msn/session.c:323
+#: src/protocols/msn/notification.c:184 src/protocols/msn/notification.c:526
+#: src/protocols/msn/session.c:344
 msgid "Unknown error."
 msgstr "未知错误。"
 
@@ -6869,40 +6927,40 @@
 msgid "%s on %s (%s)"
 msgstr "%2$s(%3$s) 上的 %1$s"
 
-#: src/protocols/msn/notification.c:492
+#: src/protocols/msn/notification.c:496
 #, c-format
 msgid "Unable to add user on %s (%s)"
 msgstr "无法在 %s(%s) 上添加用户"
 
-#: src/protocols/msn/notification.c:496
+#: src/protocols/msn/notification.c:500
 #, c-format
 msgid "Unable to block user on %s (%s)"
 msgstr "无法在 %s(%s) 上屏蔽用户"
 
-#: src/protocols/msn/notification.c:500
+#: src/protocols/msn/notification.c:504
 #, c-format
 msgid "Unable to permit user on %s (%s)"
 msgstr "无法允许 %s(%s) 上的拥护"
 
-#: src/protocols/msn/notification.c:508
+#: src/protocols/msn/notification.c:512
 #, c-format
 msgid "%s could not be added because your buddy list is full."
 msgstr "无法添加 %s,原因是您的好友列表已满。"
 
-#: src/protocols/msn/notification.c:517
+#: src/protocols/msn/notification.c:521
 #, c-format
 msgid "%s is not a valid passport account."
 msgstr "%s 不是有效的通行证账户。"
 
-#: src/protocols/msn/notification.c:774
+#: src/protocols/msn/notification.c:778
 msgid "Unable to rename group"
 msgstr "无法重命名组"
 
-#: src/protocols/msn/notification.c:829
+#: src/protocols/msn/notification.c:833
 msgid "Unable to delete group"
 msgstr "无法删除组"
 
-#: src/protocols/msn/notification.c:1232
+#: src/protocols/msn/notification.c:1264
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -6932,8 +6990,8 @@
 msgid "Reading error"
 msgstr "读取错误"
 
-#: src/protocols/msn/servconn.c:133 src/protocols/msn/session.c:315
-#: src/protocols/oscar/oscar.c:4173
+#: src/protocols/msn/servconn.c:133 src/protocols/msn/session.c:336
+#: src/protocols/oscar/oscar.c:4184
 msgid "Unknown error"
 msgstr "未知错误"
 
@@ -6942,59 +7000,61 @@
 msgid ""
 "Connection error from %s server (%s):\n"
 "%s"
-msgstr "%s 服务器(%s)的连接错误:\n%s"
-
-#: src/protocols/msn/session.c:293
+msgstr ""
+"%s 服务器(%s)的连接错误:\n"
+"%s"
+
+#: src/protocols/msn/session.c:314
 msgid "Our protocol is not supported by the server."
 msgstr "服务器不支持此协议。"
 
-#: src/protocols/msn/session.c:297
+#: src/protocols/msn/session.c:318
 msgid "Error parsing HTTP."
 msgstr "分析 HTTP 出错。"
 
-#: src/protocols/msn/session.c:301
+#: src/protocols/msn/session.c:322
 msgid "You have signed on from another location."
 msgstr "您在其它位置用此用户名登入了。"
 
-#: src/protocols/msn/session.c:304
+#: src/protocols/msn/session.c:325
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr "MSN 服务器临时不可用。请稍候再试一次。"
 
-#: src/protocols/msn/session.c:309
+#: src/protocols/msn/session.c:330
 msgid "The MSN servers are going down temporarily."
 msgstr "MSN 服务器目前维护中。"
 
-#: src/protocols/msn/session.c:313
+#: src/protocols/msn/session.c:334
 #, c-format
 msgid "Unable to authenticate: %s"
 msgstr "无法通过身份验证: %s"
 
-#: src/protocols/msn/session.c:318
+#: src/protocols/msn/session.c:339
 msgid ""
 "Your MSN buddy list is temporarily unavailable. Please wait and try again."
 msgstr "您的 MSN 好友列表临时不可用。请稍候再试一次。"
 
-#: src/protocols/msn/session.c:339 src/protocols/msn/session.c:341
+#: src/protocols/msn/session.c:360 src/protocols/msn/session.c:362
 msgid "Handshaking"
 msgstr "握手"
 
-#: src/protocols/msn/session.c:340
+#: src/protocols/msn/session.c:361
 msgid "Transferring"
 msgstr "文件传送"
 
-#: src/protocols/msn/session.c:342
+#: src/protocols/msn/session.c:363
 msgid "Starting authentication"
 msgstr "开始身份验证"
 
-#: src/protocols/msn/session.c:343
+#: src/protocols/msn/session.c:364
 msgid "Getting cookie"
 msgstr "获得 cookie"
 
-#: src/protocols/msn/session.c:345
+#: src/protocols/msn/session.c:366
 msgid "Sending cookie"
 msgstr "发送 cookie"
 
-#: src/protocols/msn/session.c:346 src/protocols/trepia/trepia.c:636
+#: src/protocols/msn/session.c:367 src/protocols/trepia/trepia.c:637
 msgid "Retrieving buddy list"
 msgstr "正在获取好友列表"
 
@@ -7332,8 +7392,8 @@
 msgid "Mailstop"
 msgstr "邮箱"
 
-#: src/protocols/novell/novell.c:1464 src/protocols/oscar/oscar.c:5191
-#: src/protocols/oscar/oscar.c:5198
+#: src/protocols/novell/novell.c:1464 src/protocols/oscar/oscar.c:5209
+#: src/protocols/oscar/oscar.c:5216
 msgid "Email Address"
 msgstr "电子邮件地址"
 
@@ -7571,7 +7631,7 @@
 msgid "Chat"
 msgstr "聊天"
 
-#: src/protocols/oscar/oscar.c:609 src/protocols/oscar/oscar.c:7158
+#: src/protocols/oscar/oscar.c:609 src/protocols/oscar/oscar.c:7181
 msgid "Get File"
 msgstr "获取文件"
 
@@ -7643,15 +7703,15 @@
 msgid "Camera"
 msgstr "相机"
 
-#: src/protocols/oscar/oscar.c:683 src/protocols/oscar/oscar.c:7041
+#: src/protocols/oscar/oscar.c:683 src/protocols/oscar/oscar.c:7064
 msgid "Free For Chat"
 msgstr "无事闲聊"
 
-#: src/protocols/oscar/oscar.c:687 src/protocols/oscar/oscar.c:7056
+#: src/protocols/oscar/oscar.c:687 src/protocols/oscar/oscar.c:7079
 msgid "Not Available"
 msgstr "不可用"
 
-#: src/protocols/oscar/oscar.c:689 src/protocols/oscar/oscar.c:7046
+#: src/protocols/oscar/oscar.c:689 src/protocols/oscar/oscar.c:7069
 msgid "Occupied"
 msgstr "琐事缠身"
 
@@ -7712,7 +7772,7 @@
 msgstr ""
 "由于这样将暴露您的 IP 地址,所以可能带来潜在的隐私风险。您是否想要继续?"
 
-#: src/protocols/oscar/oscar.c:1579 src/protocols/oscar/oscar.c:3607
+#: src/protocols/oscar/oscar.c:1579 src/protocols/oscar/oscar.c:3618
 msgid "Connect"
 msgstr "连接"
 
@@ -7751,9 +7811,9 @@
 msgid "Connection established, cookie sent"
 msgstr "连接已建立,已发送 cookie"
 
-#: src/protocols/oscar/oscar.c:2026 src/protocols/yahoo/yahoo_filexfer.c:179
-#: src/protocols/yahoo/yahoo_filexfer.c:188
-#: src/protocols/yahoo/yahoo_filexfer.c:198
+#: src/protocols/oscar/oscar.c:2026 src/protocols/yahoo/yahoo_filexfer.c:181
+#: src/protocols/yahoo/yahoo_filexfer.c:190
+#: src/protocols/yahoo/yahoo_filexfer.c:200
 msgid "Unable to establish file descriptor."
 msgstr "无法建立文件描述符。"
 
@@ -7832,12 +7892,12 @@
 msgid "Password sent"
 msgstr "密码已送出"
 
-#: src/protocols/oscar/oscar.c:3598
+#: src/protocols/oscar/oscar.c:3609
 #, c-format
 msgid "%s has just asked to directly connect to %s"
 msgstr "%s 刚刚请求和 %s 二人世界"
 
-#: src/protocols/oscar/oscar.c:3601
+#: src/protocols/oscar/oscar.c:3612
 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 "
@@ -7846,41 +7906,41 @@
 "现在需要在两台计算机之间建立直接连接,这对于即时传送图像是必要的。但是这将暴"
 "露您的 IP 地址,所以可能造成潜在的隐私风险。"
 
-#: src/protocols/oscar/oscar.c:3640
+#: src/protocols/oscar/oscar.c:3651
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr "请同意我将您加入好友。"
 
-#: src/protocols/oscar/oscar.c:3648
+#: src/protocols/oscar/oscar.c:3659
 msgid "Authorization Request Message:"
 msgstr "认证请求消息:"
 
-#: src/protocols/oscar/oscar.c:3649
+#: src/protocols/oscar/oscar.c:3660
 msgid "Please authorize me!"
 msgstr "请同意我将您加入好友!"
 
-#: src/protocols/oscar/oscar.c:3679
+#: src/protocols/oscar/oscar.c:3690
 #, c-format
 msgid ""
 "The user %s requires authorization before being added to a buddy list.  Do "
 "you want to send an authorization request?"
 msgstr "用户 %s 在被加为您的好友之前需要认证。您是否想要发送认证请求?"
 
-#: src/protocols/oscar/oscar.c:3684 src/protocols/oscar/oscar.c:3686
+#: src/protocols/oscar/oscar.c:3695 src/protocols/oscar/oscar.c:3697
 msgid "Request Authorization"
 msgstr "请求认证"
 
-#: src/protocols/oscar/oscar.c:3734 src/protocols/oscar/oscar.c:3736
-#: src/protocols/oscar/oscar.c:3743 src/protocols/oscar/oscar.c:3840
-#: src/protocols/oscar/oscar.c:3860 src/protocols/oscar/oscar.c:6453
-#: src/protocols/oscar/oscar.c:6499
+#: src/protocols/oscar/oscar.c:3745 src/protocols/oscar/oscar.c:3747
+#: src/protocols/oscar/oscar.c:3754 src/protocols/oscar/oscar.c:3851
+#: src/protocols/oscar/oscar.c:3871 src/protocols/oscar/oscar.c:6476
+#: src/protocols/oscar/oscar.c:6522
 msgid "No reason given."
 msgstr "没有给出理由。"
 
-#: src/protocols/oscar/oscar.c:3742
+#: src/protocols/oscar/oscar.c:3753
 msgid "Authorization Denied Message:"
 msgstr "认证拒绝消息:"
 
-#: src/protocols/oscar/oscar.c:3840
+#: src/protocols/oscar/oscar.c:3851
 #, c-format
 msgid ""
 "The user %u wants to add you to their buddy list for the following reason:\n"
@@ -7889,11 +7949,11 @@
 "用户 %u 想要将您加为他/她的好友,理由如下:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3848 src/protocols/oscar/oscar.c:6459
+#: src/protocols/oscar/oscar.c:3859 src/protocols/oscar/oscar.c:6482
 msgid "Authorization Request"
 msgstr "认证请求"
 
-#: src/protocols/oscar/oscar.c:3860
+#: src/protocols/oscar/oscar.c:3871
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -7903,17 +7963,17 @@
 "用户 %u 拒绝了您将他/她加为好友的请求,原因如下:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3861
+#: src/protocols/oscar/oscar.c:3872
 msgid "ICQ authorization denied."
 msgstr "ICQ 请求认证被拒绝。"
 
 #. Someone has granted you authorization
-#: src/protocols/oscar/oscar.c:3868
+#: src/protocols/oscar/oscar.c:3879
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
 msgstr "用户 %u 同意您将他/她加为好友。"
 
-#: src/protocols/oscar/oscar.c:3876
+#: src/protocols/oscar/oscar.c:3887
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -7926,7 +7986,7 @@
 "发出人: %s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3884
+#: src/protocols/oscar/oscar.c:3895
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -7939,7 +7999,7 @@
 "发出人: %s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3892
+#: src/protocols/oscar/oscar.c:3903
 #, c-format
 msgid ""
 "You have received an ICQ email from %s [%s]\n"
@@ -7952,32 +8012,32 @@
 "内容是:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3913
+#: src/protocols/oscar/oscar.c:3924
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
 msgstr "ICQ 用户 %u 给您发送了一个好友: %s (%s)"
 
-#: src/protocols/oscar/oscar.c:3919
+#: src/protocols/oscar/oscar.c:3930
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr "您是否想要将此人加为好友?"
 
-#: src/protocols/oscar/oscar.c:3923
+#: src/protocols/oscar/oscar.c:3934
 msgid "Decline"
 msgstr "拒绝"
 
-#: src/protocols/oscar/oscar.c:4007
+#: src/protocols/oscar/oscar.c:4018
 #, c-format
 msgid "You missed %hu message from %s because it was invalid."
 msgid_plural "You missed %hu messages from %s because they were invalid."
 msgstr[0] "您错过了 %2$s 的 %1$hu 条消息,原因是这些消息无效。"
 
-#: src/protocols/oscar/oscar.c:4016
+#: src/protocols/oscar/oscar.c:4027
 #, c-format
 msgid "You missed %hu message from %s because it was too large."
 msgid_plural "You missed %hu messages from %s because they were too large."
 msgstr[0] "您错过了 %2$s 的 %1$hu 条消息,原因是这些消息太大。"
 
-#: src/protocols/oscar/oscar.c:4025
+#: src/protocols/oscar/oscar.c:4036
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -7985,89 +8045,89 @@
 "You missed %hu messages from %s because the rate limit has been exceeded."
 msgstr[0] "您错过了 %2$s 的 %1$hu 条消息,原因是达到了等级限制。"
 
-#: src/protocols/oscar/oscar.c:4034
+#: src/protocols/oscar/oscar.c:4045
 #, c-format
 msgid "You missed %hu message from %s because he/she was too evil."
 msgid_plural "You missed %hu messages from %s because he/she was too evil."
 msgstr[0] "您错过了 %2$s 的 %1$hu 条消息,原因是他/她太可恶了。"
 
-#: src/protocols/oscar/oscar.c:4043
+#: src/protocols/oscar/oscar.c:4054
 #, c-format
 msgid "You missed %hu message from %s because you are too evil."
 msgid_plural "You missed %hu messages from %s because you are too evil."
 msgstr[0] "您错过了 %2$s 的 %1$hu 条消息,原因是您太可恶了。"
 
-#: src/protocols/oscar/oscar.c:4052
+#: src/protocols/oscar/oscar.c:4063
 #, c-format
 msgid "You missed %hu message from %s for an unknown reason."
 msgid_plural "You missed %hu messages from %s for an unknown reason."
 msgstr[0] "您错过了 %2$s 的 %1$hu 条消息,原因未知。"
 
-#: src/protocols/oscar/oscar.c:4106 src/protocols/oscar/oscar.c:4340
+#: src/protocols/oscar/oscar.c:4117 src/protocols/oscar/oscar.c:4351
 #: src/protocols/silc/ops.c:1087 src/protocols/silc/ops.c:1149
 #, c-format
 msgid "Info for %s"
 msgstr "%s 的信息"
 
-#: src/protocols/oscar/oscar.c:4172
+#: src/protocols/oscar/oscar.c:4183
 #, c-format
 msgid "SNAC threw error: %s\n"
 msgstr "SNAC 扔出错误: %s\n"
 
 #. Data is assumed to be the destination sn
-#: src/protocols/oscar/oscar.c:4209
+#: src/protocols/oscar/oscar.c:4220
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "无法发送消息: %s"
 
-#: src/protocols/oscar/oscar.c:4209 src/protocols/oscar/oscar.c:4214
-#: src/protocols/oscar/oscar.c:4272 src/protocols/oscar/oscar.c:4276
+#: src/protocols/oscar/oscar.c:4220 src/protocols/oscar/oscar.c:4225
+#: src/protocols/oscar/oscar.c:4283 src/protocols/oscar/oscar.c:4287
 msgid "Unknown reason."
 msgstr "未知原因。"
 
-#: src/protocols/oscar/oscar.c:4212
+#: src/protocols/oscar/oscar.c:4223
 #, c-format
 msgid "Unable to send message to %s:"
 msgstr "无法给 %s 发送消息:"
 
-#: src/protocols/oscar/oscar.c:4272
+#: src/protocols/oscar/oscar.c:4283
 #, c-format
 msgid "User information not available: %s"
 msgstr "用户信息不可用: %s"
 
-#: src/protocols/oscar/oscar.c:4275
+#: src/protocols/oscar/oscar.c:4286
 #, c-format
 msgid "User information for %s unavailable:"
 msgstr "%s 的用户信息不可用:"
 
-#: src/protocols/oscar/oscar.c:4298
+#: src/protocols/oscar/oscar.c:4309
 msgid "Warning Level"
 msgstr "警告级别"
 
-#: src/protocols/oscar/oscar.c:4302
+#: src/protocols/oscar/oscar.c:4313
 msgid "Online Since"
 msgstr "上线时间"
 
-#: src/protocols/oscar/oscar.c:4307 src/protocols/yahoo/yahoo_profile.c:1120
+#: src/protocols/oscar/oscar.c:4318 src/protocols/yahoo/yahoo_profile.c:1120
 msgid "Member Since"
 msgstr "注册时间"
 
-#: src/protocols/oscar/oscar.c:4391
+#: src/protocols/oscar/oscar.c:4402
 msgid "Your AIM connection may be lost."
 msgstr "您的 AIM 连接可能已丢失。"
 
 #. The conversion failed!
-#: src/protocols/oscar/oscar.c:4577
+#: src/protocols/oscar/oscar.c:4588
 msgid ""
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
 msgstr "[无法显示来自此用户的信息,原因是其中包含了无效的字符。"
 
-#: src/protocols/oscar/oscar.c:4797
+#: src/protocols/oscar/oscar.c:4808
 msgid "Rate limiting error."
 msgstr "速度限制错误。"
 
-#: src/protocols/oscar/oscar.c:4798
+#: src/protocols/oscar/oscar.c:4809
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
@@ -8075,160 +8135,160 @@
 "您试图的最后一次操作未执行,原因是您已经得到了速度极限。请等 10 秒,然后再试"
 "一次。"
 
-#: src/protocols/oscar/oscar.c:4867
+#: src/protocols/oscar/oscar.c:4878
 msgid ""
 "You have been disconnected because you have signed on with this screen name "
 "at another location."
 msgstr "您已经断开了连接,原因是您在其它位置用此用户名登入了。"
 
-#: src/protocols/oscar/oscar.c:4869
+#: src/protocols/oscar/oscar.c:4880
 msgid "You have been signed off for an unknown reason."
 msgstr "您已经登出了,原因未知。"
 
-#: src/protocols/oscar/oscar.c:4882 src/protocols/toc/toc.c:881
+#: src/protocols/oscar/oscar.c:4893 src/protocols/toc/toc.c:881
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "您已经断开与聊天室 %s 的连接。"
 
-#: src/protocols/oscar/oscar.c:4916
+#: src/protocols/oscar/oscar.c:4927
 msgid "Finalizing connection"
 msgstr "完成连接"
 
-#: src/protocols/oscar/oscar.c:5203 src/protocols/silc/util.c:538
+#: src/protocols/oscar/oscar.c:5221 src/protocols/silc/util.c:538
 msgid "Mobile Phone"
 msgstr "移动电话"
 
-#: src/protocols/oscar/oscar.c:5205 src/protocols/trepia/trepia.c:282
+#: src/protocols/oscar/oscar.c:5223 src/protocols/trepia/trepia.c:282
 #: src/protocols/trepia/trepia.c:408
 msgid "Female"
 msgstr "女"
 
-#: src/protocols/oscar/oscar.c:5205 src/protocols/trepia/trepia.c:281
+#: src/protocols/oscar/oscar.c:5223 src/protocols/trepia/trepia.c:281
 #: src/protocols/trepia/trepia.c:408
 msgid "Male"
 msgstr "男"
 
-#: src/protocols/oscar/oscar.c:5221
+#: src/protocols/oscar/oscar.c:5239
 msgid "Personal Web Page"
 msgstr "个人主页"
 
-#: src/protocols/oscar/oscar.c:5225
+#: src/protocols/oscar/oscar.c:5243
 msgid "Additional Information"
 msgstr "额外信息"
 
-#: src/protocols/oscar/oscar.c:5230
+#: src/protocols/oscar/oscar.c:5248
 msgid "Home Address"
 msgstr "家庭住址"
 
-#: src/protocols/oscar/oscar.c:5234 src/protocols/oscar/oscar.c:5242
+#: src/protocols/oscar/oscar.c:5252 src/protocols/oscar/oscar.c:5260
 msgid "Zip Code"
 msgstr "邮政编码"
 
-#: src/protocols/oscar/oscar.c:5238
+#: src/protocols/oscar/oscar.c:5256
 msgid "Work Address"
 msgstr "办公地址"
 
-#: src/protocols/oscar/oscar.c:5246
+#: src/protocols/oscar/oscar.c:5264
 msgid "Work Information"
 msgstr "工作信息"
 
-#: src/protocols/oscar/oscar.c:5247
+#: src/protocols/oscar/oscar.c:5265
 msgid "Company"
 msgstr "公司"
 
-#: src/protocols/oscar/oscar.c:5248
+#: src/protocols/oscar/oscar.c:5266
 msgid "Division"
 msgstr "部门"
 
-#: src/protocols/oscar/oscar.c:5249
+#: src/protocols/oscar/oscar.c:5267
 msgid "Position"
 msgstr "职务"
 
-#: src/protocols/oscar/oscar.c:5251
+#: src/protocols/oscar/oscar.c:5269
 msgid "Web Page"
 msgstr "网页"
 
-#: src/protocols/oscar/oscar.c:5261
+#: src/protocols/oscar/oscar.c:5279
 #, c-format
 msgid "ICQ Info for %s"
 msgstr "%s 的 ICQ 信息"
 
-#: src/protocols/oscar/oscar.c:5310
+#: src/protocols/oscar/oscar.c:5328
 msgid "Pop-Up Message"
 msgstr "弹出消息"
 
 #. TODO: Need to use ngettext() here
-#: src/protocols/oscar/oscar.c:5332
+#: src/protocols/oscar/oscar.c:5350
 #, c-format
 msgid "The following screen names are associated with %s"
 msgstr "下列用户名已经和 %s 关联"
 
-#: src/protocols/oscar/oscar.c:5357
+#: src/protocols/oscar/oscar.c:5375
 #, c-format
 msgid "No results found for email address %s"
 msgstr "未找到与电子邮件地址 %s 匹配的结果"
 
-#: src/protocols/oscar/oscar.c:5378
+#: src/protocols/oscar/oscar.c:5396
 #, c-format
 msgid "You should receive an email asking to confirm %s."
 msgstr "您应当收到询问确认 %s 的邮件。"
 
-#: src/protocols/oscar/oscar.c:5380
+#: src/protocols/oscar/oscar.c:5398
 msgid "Account Confirmation Requested"
 msgstr "请求了账户确认"
 
-#: src/protocols/oscar/oscar.c:5411
+#: src/protocols/oscar/oscar.c:5429
 msgid "Error Changing Account Info"
 msgstr "更改账户信息出错"
 
-#: src/protocols/oscar/oscar.c:5414
+#: src/protocols/oscar/oscar.c:5432
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
 "differs from the original."
 msgstr "错误 0x%04x: 无法格式化用户名,原因是请求的用户名与原始用户名不符。"
 
-#: src/protocols/oscar/oscar.c:5417
+#: src/protocols/oscar/oscar.c:5435
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
 "ends in a space."
 msgstr "错误 0x%04x: 无法格式化用户名,原因是请求的用户名以空格结尾。"
 
-#: src/protocols/oscar/oscar.c:5420
+#: src/protocols/oscar/oscar.c:5438
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
 "is too long."
 msgstr "错误 0x%04x: 无法格式化用户名,原因是请求的用户名太长。"
 
-#: src/protocols/oscar/oscar.c:5423
+#: src/protocols/oscar/oscar.c:5441
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because there is already a "
 "request pending for this screen name."
 msgstr "错误 0x%04x: 无法更改电子邮件地址,原因是此用户名已经有被推后的请求。"
 
-#: src/protocols/oscar/oscar.c:5426
+#: src/protocols/oscar/oscar.c:5444
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address has "
 "too many screen names associated with it."
 msgstr "错误 0x%04x: 无法更改电子邮件地址,原因是给定的地址关联的用户名太多。"
 
-#: src/protocols/oscar/oscar.c:5429
+#: src/protocols/oscar/oscar.c:5447
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address is "
 "invalid."
 msgstr "错误 0x%04x: 无法更改电子邮件地址,原因是给定的地址无效。"
 
-#: src/protocols/oscar/oscar.c:5432
+#: src/protocols/oscar/oscar.c:5450
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "错误 0x%04x: 未知错误。"
 
-#: src/protocols/oscar/oscar.c:5442
+#: src/protocols/oscar/oscar.c:5460
 #, c-format
 msgid ""
 "Your screen name is currently formatted as follows:\n"
@@ -8237,25 +8297,25 @@
 "您的用户名格式化后如下:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:5443 src/protocols/oscar/oscar.c:5450
+#: src/protocols/oscar/oscar.c:5461 src/protocols/oscar/oscar.c:5468
 msgid "Account Info"
 msgstr "账户信息"
 
-#: src/protocols/oscar/oscar.c:5448
+#: src/protocols/oscar/oscar.c:5466
 #, c-format
 msgid "The email address for %s is %s"
 msgstr "%s 的电子邮件地址为 %s"
 
-#: src/protocols/oscar/oscar.c:5515
+#: src/protocols/oscar/oscar.c:5533
 msgid ""
 "Your IM Image was not sent. You must be Direct Connected to send IM Images."
 msgstr "您的聊天图像未送出。要发送聊天图像,您必须连接为二人世界。"
 
-#: src/protocols/oscar/oscar.c:5650
+#: src/protocols/oscar/oscar.c:5668
 msgid "Unable to set AIM profile."
 msgstr "无法设置 AIM 配置文件。"
 
-#: src/protocols/oscar/oscar.c:5651
+#: src/protocols/oscar/oscar.c:5669
 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 "
@@ -8264,7 +8324,7 @@
 "您在登录过程完成之前请求设定配置文件。您的配置文件尚未设定;请在您完全连接后"
 "再试一次。"
 
-#: src/protocols/oscar/oscar.c:5678
+#: src/protocols/oscar/oscar.c:5696
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  Gaim has truncated "
@@ -8274,15 +8334,15 @@
 "truncated it for you."
 msgstr[0] "已经超过了配置文件的最大长度 %d 字节。Gaim 为您自动截断了。"
 
-#: src/protocols/oscar/oscar.c:5683
+#: src/protocols/oscar/oscar.c:5701
 msgid "Profile too long."
 msgstr "配置文件太长。"
 
-#: src/protocols/oscar/oscar.c:5717
+#: src/protocols/oscar/oscar.c:5735
 msgid "Unable to set AIM away message."
 msgstr "无法设置 AIM 离开消息。"
 
-#: src/protocols/oscar/oscar.c:5718
+#: src/protocols/oscar/oscar.c:5736
 msgid ""
 "You have probably requested to set your away message before the login "
 "procedure completed.  You remain in a \"present\" state; try setting it "
@@ -8291,7 +8351,7 @@
 "您在登录过程完成之前请求设定离开消息。您仍将处于目前的状态;请在您完全连接后"
 "再试一次。"
 
-#: src/protocols/oscar/oscar.c:5765
+#: src/protocols/oscar/oscar.c:5783
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  Gaim has "
@@ -8303,11 +8363,11 @@
 "已经超过了离开消息的最大长度 %d 字节。Gaim 自动为您截断了消息,并将您设为离"
 "开。"
 
-#: src/protocols/oscar/oscar.c:5770
+#: src/protocols/oscar/oscar.c:5788
 msgid "Away message too long."
 msgstr "离开消息太长。"
 
-#: src/protocols/oscar/oscar.c:5861
+#: src/protocols/oscar/oscar.c:5884
 #, c-format
 msgid ""
 "Could not add the buddy %s because the screen name is invalid.  Screen names "
@@ -8317,16 +8377,16 @@
 "无法添加好友 %s,原因是用户名无效。用户名必须以字母开头,其中只能包含字母、数"
 "字和空格,或者只包含数字。该好友将从您的好友列表中删除。"
 
-#: src/protocols/oscar/oscar.c:5863 src/protocols/oscar/oscar.c:6319
-#: src/protocols/oscar/oscar.c:6333
+#: src/protocols/oscar/oscar.c:5886 src/protocols/oscar/oscar.c:6342
+#: src/protocols/oscar/oscar.c:6356
 msgid "Unable To Add"
 msgstr "无法添加"
 
-#: src/protocols/oscar/oscar.c:6025
+#: src/protocols/oscar/oscar.c:6048
 msgid "Unable To Retrieve Buddy List"
 msgstr "无法获取好友列表"
 
-#: src/protocols/oscar/oscar.c:6026
+#: src/protocols/oscar/oscar.c:6049
 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 "
@@ -8335,13 +8395,13 @@
 "Gaim 暂时无法从 AIM 服务器获取您的好友列表。您的好友列表没有丢失,可能稍等几"
 "小时就能用了。"
 
-#: src/protocols/oscar/oscar.c:6210 src/protocols/oscar/oscar.c:6211
-#: src/protocols/oscar/oscar.c:6216 src/protocols/oscar/oscar.c:6377
-#: src/protocols/oscar/oscar.c:6378 src/protocols/oscar/oscar.c:6383
+#: src/protocols/oscar/oscar.c:6233 src/protocols/oscar/oscar.c:6234
+#: src/protocols/oscar/oscar.c:6239 src/protocols/oscar/oscar.c:6400
+#: src/protocols/oscar/oscar.c:6401 src/protocols/oscar/oscar.c:6406
 msgid "Orphans"
 msgstr "孤儿"
 
-#: src/protocols/oscar/oscar.c:6317
+#: src/protocols/oscar/oscar.c:6340
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -8349,11 +8409,11 @@
 msgstr ""
 "无法将 %s 加为好友,原因是您的好友太多。请删除其中一个好友,然后再试一次。"
 
-#: src/protocols/oscar/oscar.c:6317 src/protocols/oscar/oscar.c:6331
+#: src/protocols/oscar/oscar.c:6340 src/protocols/oscar/oscar.c:6354
 msgid "(no name)"
 msgstr "(无名称)"
 
-#: src/protocols/oscar/oscar.c:6331
+#: src/protocols/oscar/oscar.c:6354
 #, c-format
 msgid ""
 "Could not add the buddy %s for an unknown reason.  The most common reason "
@@ -8363,18 +8423,18 @@
 "无法添加好友 %s,原因未知。最可能的原因是您的好友列表中好友的数目已经达到了所"
 "允许的最大值。"
 
-#: src/protocols/oscar/oscar.c:6414
+#: src/protocols/oscar/oscar.c:6437
 #, c-format
 msgid ""
 "The user %s has given you permission to add you to their buddy list.  Do you "
 "want to add them?"
 msgstr "用户 %s 允许您将他/她加为好友。您是否想要添加?"
 
-#: src/protocols/oscar/oscar.c:6420
+#: src/protocols/oscar/oscar.c:6443
 msgid "Authorization Given"
 msgstr "给出的认证"
 
-#: src/protocols/oscar/oscar.c:6453
+#: src/protocols/oscar/oscar.c:6476
 #, c-format
 msgid ""
 "The user %s wants to add you to their buddy list for the following reason:\n"
@@ -8384,17 +8444,17 @@
 "%s"
 
 #. Granted
-#: src/protocols/oscar/oscar.c:6495
+#: src/protocols/oscar/oscar.c:6518
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
 msgstr "用户 %s 允许您将他/她加入好友。"
 
-#: src/protocols/oscar/oscar.c:6496
+#: src/protocols/oscar/oscar.c:6519
 msgid "Authorization Granted"
 msgstr "认证被许可"
 
 #. Denied
-#: src/protocols/oscar/oscar.c:6499
+#: src/protocols/oscar/oscar.c:6522
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -8404,92 +8464,92 @@
 "用户 %s 拒绝了您将其加入好友列表的请求,原因如下:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:6500
+#: src/protocols/oscar/oscar.c:6523
 msgid "Authorization Denied"
 msgstr "认证被拒绝"
 
-#: src/protocols/oscar/oscar.c:6538 src/protocols/toc/toc.c:1282
+#: src/protocols/oscar/oscar.c:6561 src/protocols/toc/toc.c:1282
 msgid "_Exchange:"
 msgstr "交换(_E):"
 
-#: src/protocols/oscar/oscar.c:6577
+#: src/protocols/oscar/oscar.c:6600
 msgid "Invalid chat name specified."
 msgstr "指定的聊天名称无效。"
 
-#: src/protocols/oscar/oscar.c:6644
+#: src/protocols/oscar/oscar.c:6667
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 msgstr "您的聊天图像未送出。您不能再 AIM 聊天中发送聊天图像。"
 
-#: src/protocols/oscar/oscar.c:6779
+#: src/protocols/oscar/oscar.c:6802
 msgid "Away Message"
 msgstr "离开消息"
 
-#: src/protocols/oscar/oscar.c:7114
+#: src/protocols/oscar/oscar.c:7137
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "%s 的好友注释"
 
-#: src/protocols/oscar/oscar.c:7115
+#: src/protocols/oscar/oscar.c:7138
 msgid "Buddy Comment:"
 msgstr "好友注释:"
 
-#: src/protocols/oscar/oscar.c:7134
+#: src/protocols/oscar/oscar.c:7157
 msgid "Edit Buddy Comment"
 msgstr "编辑好友注释"
 
-#: src/protocols/oscar/oscar.c:7140
+#: src/protocols/oscar/oscar.c:7163
 msgid "Get Status Msg"
 msgstr "获取状态消息"
 
-#: src/protocols/oscar/oscar.c:7152
+#: src/protocols/oscar/oscar.c:7175
 msgid "Direct IM"
 msgstr "二人世界"
 
-#: src/protocols/oscar/oscar.c:7169
+#: src/protocols/oscar/oscar.c:7192
 msgid "Re-request Authorization"
 msgstr "重新请求认证"
 
-#: src/protocols/oscar/oscar.c:7229
+#: src/protocols/oscar/oscar.c:7252
 msgid "Require authorization"
 msgstr "请求认证"
 
-#: src/protocols/oscar/oscar.c:7232
+#: src/protocols/oscar/oscar.c:7255
 msgid "Hide IP address"
 msgstr "隐藏 IP 地址"
 
-#: src/protocols/oscar/oscar.c:7235
+#: src/protocols/oscar/oscar.c:7258
 msgid "Web aware"
 msgstr "Web 状态"
 
-#: src/protocols/oscar/oscar.c:7240
+#: src/protocols/oscar/oscar.c:7263
 msgid "ICQ Privacy Options"
 msgstr "ICQ 隐私选项"
 
-#: src/protocols/oscar/oscar.c:7257
+#: src/protocols/oscar/oscar.c:7280
 msgid "The new formatting is invalid."
 msgstr "新格式化无效。"
 
-#: src/protocols/oscar/oscar.c:7258
+#: src/protocols/oscar/oscar.c:7281
 msgid "Screen name formatting can change only capitalization and whitespace."
 msgstr "用户名格式化只更改大写和空格。"
 
-#: src/protocols/oscar/oscar.c:7265
+#: src/protocols/oscar/oscar.c:7288
 msgid "New screen name formatting:"
 msgstr "新的用户名格式化:"
 
-#: src/protocols/oscar/oscar.c:7317
+#: src/protocols/oscar/oscar.c:7340
 msgid "Change Address To:"
 msgstr "将地址更改为:"
 
-#: src/protocols/oscar/oscar.c:7362
+#: src/protocols/oscar/oscar.c:7385
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>您并不在等候认证</i>"
 
-#: src/protocols/oscar/oscar.c:7365
+#: src/protocols/oscar/oscar.c:7388
 msgid "You are awaiting authorization from the following buddies"
 msgstr "您正在等待下列好友的认证"
 
-#: src/protocols/oscar/oscar.c:7366
+#: src/protocols/oscar/oscar.c:7389
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
@@ -8497,77 +8557,77 @@
 "如果您想要向这些好友重新请求认证,只需用鼠标右键单击这些好友,然后单击“重新请"
 "求认证”。"
 
-#: src/protocols/oscar/oscar.c:7383
+#: src/protocols/oscar/oscar.c:7406
 msgid "Find Buddy by E-mail"
 msgstr "按电子邮件查找好友"
 
-#: src/protocols/oscar/oscar.c:7384
+#: src/protocols/oscar/oscar.c:7407
 msgid "Search for a buddy by e-mail address"
 msgstr "按电子邮件地址搜索好友"
 
-#: src/protocols/oscar/oscar.c:7385
+#: src/protocols/oscar/oscar.c:7408
 msgid "Type the e-mail address of the buddy you are searching for."
 msgstr "输入您想要搜索的好友的电子邮件地址。"
 
-#: src/protocols/oscar/oscar.c:7466 src/protocols/silc/silc.c:803
+#: src/protocols/oscar/oscar.c:7489 src/protocols/silc/silc.c:803
 msgid "Set User Info..."
 msgstr "设置用户信息..."
 
-#: src/protocols/oscar/oscar.c:7472
+#: src/protocols/oscar/oscar.c:7495
 msgid "Set User Info (URL)..."
 msgstr "设置用户信息(URL)..."
 
-#: src/protocols/oscar/oscar.c:7477 src/protocols/silc/silc.c:799
+#: src/protocols/oscar/oscar.c:7500 src/protocols/silc/silc.c:799
 msgid "Change Password..."
 msgstr "更改密码..."
 
-#: src/protocols/oscar/oscar.c:7483
+#: src/protocols/oscar/oscar.c:7506
 msgid "Change Password (URL)"
 msgstr "更改密码(URL)"
 
-#: src/protocols/oscar/oscar.c:7487
+#: src/protocols/oscar/oscar.c:7510
 msgid "Configure IM Forwarding (URL)"
 msgstr "配置 IM 转发(URL)"
 
 #. ICQ actions
-#: src/protocols/oscar/oscar.c:7497
+#: src/protocols/oscar/oscar.c:7520
 msgid "Show privacy options..."
 msgstr "显示隐藏选项..."
 
 #. AIM actions
-#: src/protocols/oscar/oscar.c:7504
+#: src/protocols/oscar/oscar.c:7527
 msgid "Format Screen Name..."
 msgstr "格式化用户名..."
 
-#: src/protocols/oscar/oscar.c:7508
+#: src/protocols/oscar/oscar.c:7531
 msgid "Confirm Account"
 msgstr "确认账户"
 
-#: src/protocols/oscar/oscar.c:7512
+#: src/protocols/oscar/oscar.c:7535
 msgid "Display Currently Registered Address"
 msgstr "显示当前注册的地址"
 
-#: src/protocols/oscar/oscar.c:7516
+#: src/protocols/oscar/oscar.c:7539
 msgid "Change Currently Registered Address..."
 msgstr "更改当前注册的地址..."
 
-#: src/protocols/oscar/oscar.c:7523
+#: src/protocols/oscar/oscar.c:7546
 msgid "Show Buddies Awaiting Authorization"
 msgstr "显示正在等候认证的好友"
 
-#: src/protocols/oscar/oscar.c:7529
+#: src/protocols/oscar/oscar.c:7552
 msgid "Search for Buddy by Email..."
 msgstr "按电子邮件搜索好友..."
 
-#: src/protocols/oscar/oscar.c:7534
+#: src/protocols/oscar/oscar.c:7557
 msgid "Search for Buddy by Information"
 msgstr "按信息搜索好友"
 
-#: src/protocols/oscar/oscar.c:7603
+#: src/protocols/oscar/oscar.c:7627
 msgid "Use recent buddies group"
 msgstr "使用最近的好友组"
 
-#: src/protocols/oscar/oscar.c:7606
+#: src/protocols/oscar/oscar.c:7630
 msgid "Show how long you have been idle"
 msgstr "显示您睡了多长时间"
 
@@ -8581,19 +8641,19 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/oscar/oscar.c:7699 src/protocols/oscar/oscar.c:7701
+#: src/protocols/oscar/oscar.c:7727 src/protocols/oscar/oscar.c:7729
 msgid "AIM/ICQ Protocol Plugin"
 msgstr "AIM/ICQ 协议插件"
 
-#: src/protocols/oscar/oscar.c:7720
+#: src/protocols/oscar/oscar.c:7752
 msgid "Auth host"
 msgstr "认证主机"
 
-#: src/protocols/oscar/oscar.c:7723
+#: src/protocols/oscar/oscar.c:7755
 msgid "Auth port"
 msgstr "认证端口"
 
-#: src/protocols/oscar/oscar.c:7726 src/protocols/zephyr/zephyr.c:2859
+#: src/protocols/oscar/oscar.c:7758 src/protocols/zephyr/zephyr.c:2859
 msgid "Encoding"
 msgstr "编码"
 
@@ -8689,7 +8749,7 @@
 msgid "Cannot fetch the public key"
 msgstr "无法获取公钥"
 
-#: src/protocols/silc/buddy.c:629 src/protocols/silc/buddy.c:1558
+#: src/protocols/silc/buddy.c:629 src/protocols/silc/buddy.c:1559
 msgid "Show Public Key"
 msgstr "显示公钥"
 
@@ -8880,11 +8940,11 @@
 msgid "IM with Password"
 msgstr "带密码开聊"
 
-#: src/protocols/silc/buddy.c:1563
+#: src/protocols/silc/buddy.c:1564
 msgid "Get Public Key..."
 msgstr "获取公钥..."
 
-#: src/protocols/silc/buddy.c:1569 src/protocols/silc/ops.c:1407
+#: src/protocols/silc/buddy.c:1571 src/protocols/silc/ops.c:1407
 msgid "Kill User"
 msgstr "杀死用户"
 
@@ -8980,7 +9040,7 @@
 
 #: src/protocols/silc/chat.c:419 src/protocols/silc/chat.c:420
 #: src/protocols/silc/chat.c:457 src/protocols/silc/chat.c:458
-#: src/protocols/silc/chat.c:887
+#: src/protocols/silc/chat.c:891
 msgid "Channel Authentication"
 msgstr "频道认证"
 
@@ -9017,83 +9077,83 @@
 msgid "Get Info"
 msgstr "信息"
 
-#: src/protocols/silc/chat.c:870
+#: src/protocols/silc/chat.c:871
 msgid "Invite List"
 msgstr "邀请列表"
 
-#: src/protocols/silc/chat.c:874
+#: src/protocols/silc/chat.c:876
 msgid "Ban List"
 msgstr "屏蔽列表"
 
-#: src/protocols/silc/chat.c:881
+#: src/protocols/silc/chat.c:884
 msgid "Add Private Group"
 msgstr "添加私有组"
 
-#: src/protocols/silc/chat.c:892
+#: src/protocols/silc/chat.c:897
 msgid "Reset Permanent"
 msgstr "重置永久"
 
-#: src/protocols/silc/chat.c:896
+#: src/protocols/silc/chat.c:902
 msgid "Set Permanent"
 msgstr "设置永久"
 
-#: src/protocols/silc/chat.c:903
+#: src/protocols/silc/chat.c:910
 msgid "Set User Limit"
 msgstr "设置用户限制"
 
-#: src/protocols/silc/chat.c:908
+#: src/protocols/silc/chat.c:916
 msgid "Reset Topic Restriction"
 msgstr "重置话题限制"
 
-#: src/protocols/silc/chat.c:912
+#: src/protocols/silc/chat.c:921
 msgid "Set Topic Restriction"
 msgstr "设定话题限制"
 
-#: src/protocols/silc/chat.c:918
+#: src/protocols/silc/chat.c:928
 msgid "Reset Private Channel"
 msgstr "重置私有频道"
 
-#: src/protocols/silc/chat.c:922
+#: src/protocols/silc/chat.c:933
 msgid "Set Private Channel"
 msgstr "设定私有频道"
 
-#: src/protocols/silc/chat.c:928
+#: src/protocols/silc/chat.c:940
 msgid "Reset Secret Channel"
 msgstr "重置绝密频道"
 
-#: src/protocols/silc/chat.c:932
+#: src/protocols/silc/chat.c:945
 msgid "Set Secret Channel"
 msgstr "设定绝密频道"
 
-#: src/protocols/silc/chat.c:994
+#: src/protocols/silc/chat.c:1008
 #, c-format
 msgid "You are channel founder on <I>%s</I>"
 msgstr "您是 <I>%s</I> 的频道建立者"
 
-#: src/protocols/silc/chat.c:998
+#: src/protocols/silc/chat.c:1012
 #, c-format
 msgid "Channel founder on <I>%s</I> is <I>%s</I>"
 msgstr "<I>%s</I> 的频道建立者是 <I>%s</I>"
 
-#: src/protocols/silc/chat.c:1057
+#: src/protocols/silc/chat.c:1071
 #, c-format
 msgid ""
 "You have to join the %s channel before you are able to join the private group"
 msgstr "在您加入私有组之前,必须先加入 %s 频道"
 
-#: src/protocols/silc/chat.c:1059
+#: src/protocols/silc/chat.c:1073
 msgid "Join Private Group"
 msgstr "加入私有组"
 
-#: src/protocols/silc/chat.c:1060
+#: src/protocols/silc/chat.c:1074
 msgid "Cannot join private group"
 msgstr "无法加入私有组"
 
-#: src/protocols/silc/chat.c:1253 src/protocols/silc/silc.c:903
+#: src/protocols/silc/chat.c:1267 src/protocols/silc/silc.c:903
 msgid "Cannot call command"
 msgstr "无法调用命令"
 
-#: src/protocols/silc/chat.c:1254 src/protocols/silc/silc.c:904
+#: src/protocols/silc/chat.c:1268 src/protocols/silc/silc.c:904
 msgid "Unknown command"
 msgstr "未知命令"
 
@@ -10158,11 +10218,11 @@
 msgid "Visit Homepage"
 msgstr "浏览主页"
 
-#: src/protocols/trepia/trepia.c:822 src/protocols/trepia/trepia.c:825
+#: src/protocols/trepia/trepia.c:823 src/protocols/trepia/trepia.c:826
 msgid "Local Users"
 msgstr "本地用户"
 
-#: src/protocols/trepia/trepia.c:1030
+#: src/protocols/trepia/trepia.c:1031
 msgid "Logging in"
 msgstr "登入"
 
@@ -10176,46 +10236,46 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/trepia/trepia.c:1277 src/protocols/trepia/trepia.c:1279
+#: src/protocols/trepia/trepia.c:1278 src/protocols/trepia/trepia.c:1280
 msgid "Trepia Protocol Plugin"
 msgstr "Trepia 协议插件"
 
-#: src/protocols/yahoo/yahoo.c:141
+#: src/protocols/yahoo/yahoo.c:140
 msgid ""
 "You have been logged off as you have logged in on a different machine or "
 "device."
 msgstr "您已被注销,因为您已从其它计算机或设备上登录。"
 
-#: src/protocols/yahoo/yahoo.c:626
+#: src/protocols/yahoo/yahoo.c:625
 msgid "Your Yahoo! message did not get sent."
 msgstr "未发送您的 Yahoo! 消息。"
 
-#: src/protocols/yahoo/yahoo.c:645 src/protocols/yahoo/yahoo.c:3169
+#: src/protocols/yahoo/yahoo.c:644 src/protocols/yahoo/yahoo.c:3201
 msgid "Buzz!!"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:690
+#: src/protocols/yahoo/yahoo.c:689
 #, c-format
 msgid "Yahoo! system message for %s:"
 msgstr "%s 的 Yahoo! 系统消息:"
 
-#: src/protocols/yahoo/yahoo.c:757
+#: src/protocols/yahoo/yahoo.c:756
 #, c-format
 msgid "%s has (retroactively) denied your request to add them to your list."
 msgstr "%s 拒绝您将他/她加入好友。"
 
-#: src/protocols/yahoo/yahoo.c:760
+#: src/protocols/yahoo/yahoo.c:759
 #, c-format
 msgid ""
 "%s has (retroactively) denied your request to add them to your list for the "
 "following reason: %s."
 msgstr "%s 拒绝了您将其加为好友的请求,原因如下:%s。"
 
-#: src/protocols/yahoo/yahoo.c:763
+#: src/protocols/yahoo/yahoo.c:762
 msgid "Add buddy rejected"
 msgstr "添加拒绝的好友"
 
-#: src/protocols/yahoo/yahoo.c:1511
+#: src/protocols/yahoo/yahoo.c:1514
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -10225,11 +10285,11 @@
 "Yahoo 服务器请求使用未识别的认证方式。此版本的 Gaim 可能无法成功登入 Yahoo。"
 "请检查 %s 上的更新。"
 
-#: src/protocols/yahoo/yahoo.c:1514
+#: src/protocols/yahoo/yahoo.c:1517
 msgid "Failed Yahoo! Authentication"
 msgstr "Yahoo! 认证失败"
 
-#: src/protocols/yahoo/yahoo.c:1587
+#: src/protocols/yahoo/yahoo.c:1590
 #, c-format
 msgid ""
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
@@ -10237,19 +10297,19 @@
 msgstr ""
 "您试图忽略 %s,但是该用户位于您的好友列表中。单击“是”将删除并忽略好友。"
 
-#: src/protocols/yahoo/yahoo.c:1590
+#: src/protocols/yahoo/yahoo.c:1593
 msgid "Ignore buddy?"
 msgstr "忽略好友?"
 
-#: src/protocols/yahoo/yahoo.c:1624
+#: src/protocols/yahoo/yahoo.c:1627
 msgid "Invalid username."
 msgstr "用户名无效。"
 
-#: src/protocols/yahoo/yahoo.c:1635
+#: src/protocols/yahoo/yahoo.c:1638
 msgid "Normal authentication failed!"
 msgstr "普通认证失败!"
 
-#: src/protocols/yahoo/yahoo.c:1636
+#: src/protocols/yahoo/yahoo.c:1639
 msgid ""
 "The normal authentication method has failed. This means either your password "
 "is incorrect, or Yahoo!'s authentication scheme has changed. Gaim will now "
@@ -10260,93 +10320,93 @@
 "法发生了变化。Gaim 将会尝试使用 Web 信使方式的身份验证,这会损失一部分功能和"
 "特性。"
 
-#: src/protocols/yahoo/yahoo.c:1644
+#: src/protocols/yahoo/yahoo.c:1647
 msgid "Incorrect password."
 msgstr "密码不对。"
 
-#: src/protocols/yahoo/yahoo.c:1647
+#: src/protocols/yahoo/yahoo.c:1650
 msgid "Your account is locked, please log in to the Yahoo! website."
 msgstr "您的账户已锁定,请登录到 Yahoo! 网站。"
 
-#: src/protocols/yahoo/yahoo.c:1650
+#: src/protocols/yahoo/yahoo.c:1653
 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr "位置错误号 %d。登录到 Yahoo! 网站可能修复。"
 
-#: src/protocols/yahoo/yahoo.c:1704
+#: src/protocols/yahoo/yahoo.c:1707
 #, c-format
 msgid "Could not add buddy %s to group %s to the server list on account %s."
 msgstr "无法将好友 %s 添加到账户 %s 位于服务器列表上的组 %s。"
 
-#: src/protocols/yahoo/yahoo.c:1707
+#: src/protocols/yahoo/yahoo.c:1710
 msgid "Could not add buddy to server list"
 msgstr "无法将好友添加到服务器列表"
 
-#: src/protocols/yahoo/yahoo.c:1941 src/protocols/yahoo/yahoo.c:2067
+#: src/protocols/yahoo/yahoo.c:1944 src/protocols/yahoo/yahoo.c:2090
 #: src/protocols/yahoo/ycht.c:415
 msgid "Unable to read"
 msgstr "无法读取"
 
-#: src/protocols/yahoo/yahoo.c:2089 src/protocols/yahoo/yahoo.c:2199
-#: src/protocols/yahoo/yahoo.c:2281 src/protocols/yahoo/yahoo.c:2291
+#: src/protocols/yahoo/yahoo.c:2112 src/protocols/yahoo/yahoo.c:2229
+#: src/protocols/yahoo/yahoo.c:2313 src/protocols/yahoo/yahoo.c:2323
 #: src/protocols/yahoo/yahoochat.c:1372 src/protocols/yahoo/yahoochat.c:1433
 #: src/protocols/yahoo/ycht.c:519
 msgid "Connection problem"
 msgstr "连接问题"
 
-#: src/protocols/yahoo/yahoo.c:2394 src/protocols/yahoo/yahoo.c:2905
+#: src/protocols/yahoo/yahoo.c:2426 src/protocols/yahoo/yahoo.c:2937
 msgid "Not At Home"
 msgstr "不在家"
 
-#: src/protocols/yahoo/yahoo.c:2396 src/protocols/yahoo/yahoo.c:2908
+#: src/protocols/yahoo/yahoo.c:2428 src/protocols/yahoo/yahoo.c:2940
 msgid "Not At Desk"
 msgstr "不在桌前"
 
-#: src/protocols/yahoo/yahoo.c:2398 src/protocols/yahoo/yahoo.c:2911
+#: src/protocols/yahoo/yahoo.c:2430 src/protocols/yahoo/yahoo.c:2943
 msgid "Not In Office"
 msgstr "不在办公室"
 
-#: src/protocols/yahoo/yahoo.c:2402 src/protocols/yahoo/yahoo.c:2917
+#: src/protocols/yahoo/yahoo.c:2434 src/protocols/yahoo/yahoo.c:2949
 msgid "On Vacation"
 msgstr "度假中"
 
-#: src/protocols/yahoo/yahoo.c:2406 src/protocols/yahoo/yahoo.c:2923
+#: src/protocols/yahoo/yahoo.c:2438 src/protocols/yahoo/yahoo.c:2955
 msgid "Stepped Out"
 msgstr "郊游"
 
-#: src/protocols/yahoo/yahoo.c:2487 src/protocols/yahoo/yahoo.c:2513
+#: src/protocols/yahoo/yahoo.c:2519 src/protocols/yahoo/yahoo.c:2545
 msgid "Not on server list"
 msgstr "不在服务器列表中"
 
-#: src/protocols/yahoo/yahoo.c:2592
+#: src/protocols/yahoo/yahoo.c:2624
 msgid "Join in Chat"
 msgstr "加入聊天"
 
-#: src/protocols/yahoo/yahoo.c:2597
+#: src/protocols/yahoo/yahoo.c:2629
 msgid "Initiate Conference"
 msgstr "发起会议"
 
-#: src/protocols/yahoo/yahoo.c:2648
+#: src/protocols/yahoo/yahoo.c:2680
 msgid "Active which ID?"
 msgstr "激活哪个 ID?"
 
-#: src/protocols/yahoo/yahoo.c:2657
+#: src/protocols/yahoo/yahoo.c:2689
 msgid "Join who in chat?"
 msgstr "将谁加入聊天?"
 
-#: src/protocols/yahoo/yahoo.c:2667
+#: src/protocols/yahoo/yahoo.c:2699
 msgid "Activate ID..."
 msgstr "激活 ID..."
 
-#: src/protocols/yahoo/yahoo.c:2671
+#: src/protocols/yahoo/yahoo.c:2703
 msgid "Join user in chat..."
 msgstr "在聊天中加入用户..."
 
-#: src/protocols/yahoo/yahoo.c:3213
+#: src/protocols/yahoo/yahoo.c:3245
 msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
 msgstr "join: &lt;房间&gt;: 加入 Yahoo 网络上的聊天室"
 
-#: src/protocols/yahoo/yahoo.c:3217
+#: src/protocols/yahoo/yahoo.c:3249
 msgid "buzz: Buzz a contact to get their attention"
 msgstr ""
 
@@ -10360,51 +10420,51 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/yahoo/yahoo.c:3297 src/protocols/yahoo/yahoo.c:3299
+#: src/protocols/yahoo/yahoo.c:3329 src/protocols/yahoo/yahoo.c:3331
 msgid "Yahoo Protocol Plugin"
 msgstr "Yahoo 协议插件"
 
-#: src/protocols/yahoo/yahoo.c:3318
+#: src/protocols/yahoo/yahoo.c:3350
 msgid "Yahoo Japan"
 msgstr "Yahoo 日本"
 
-#: src/protocols/yahoo/yahoo.c:3321
+#: src/protocols/yahoo/yahoo.c:3353
 msgid "Pager host"
 msgstr "寻呼主机"
 
-#: src/protocols/yahoo/yahoo.c:3324
+#: src/protocols/yahoo/yahoo.c:3356
 msgid "Japan Pager host"
 msgstr "日本寻呼主机"
 
-#: src/protocols/yahoo/yahoo.c:3327
+#: src/protocols/yahoo/yahoo.c:3359
 msgid "Pager port"
 msgstr "寻呼端口"
 
-#: src/protocols/yahoo/yahoo.c:3330
+#: src/protocols/yahoo/yahoo.c:3362
 msgid "File transfer host"
 msgstr "文件传送主机"
 
-#: src/protocols/yahoo/yahoo.c:3333
+#: src/protocols/yahoo/yahoo.c:3365
 msgid "Japan File transfer host"
 msgstr "日本文件传送主机"
 
-#: src/protocols/yahoo/yahoo.c:3336
+#: src/protocols/yahoo/yahoo.c:3368
 msgid "File transfer port"
 msgstr "文件传送端口"
 
-#: src/protocols/yahoo/yahoo.c:3339
+#: src/protocols/yahoo/yahoo.c:3371
 msgid "Chat Room List Url"
 msgstr "聊天房间列表 URL"
 
-#: src/protocols/yahoo/yahoo.c:3342
+#: src/protocols/yahoo/yahoo.c:3374
 msgid "YCHT Host"
 msgstr "YCHT 主机"
 
-#: src/protocols/yahoo/yahoo.c:3345
+#: src/protocols/yahoo/yahoo.c:3377
 msgid "YCHT Port"
 msgstr "YCHT 端口"
 
-#: src/protocols/yahoo/yahoo_filexfer.c:169
+#: src/protocols/yahoo/yahoo_filexfer.c:171
 msgid ""
 "Gaim cannot send files over Yahoo! that are bigger than One Megabyte "
 "(1,048,576 bytes)."
@@ -10558,7 +10618,7 @@
 
 #: src/protocols/zephyr/zephyr.c:677
 #, c-format
-msgid "Unable send to chat %s,%s,%s"
+msgid "Unable to send to chat %s,%s,%s"
 msgstr "无法发送给聊天 %s,%s,%s"
 
 #: src/protocols/zephyr/zephyr.c:710 src/protocols/zephyr/zephyr.c:1124
@@ -10700,21 +10760,21 @@
 
 #. XXX: why in the hell are we calling gaim_connection_error() here?
 #. Forbidden
-#: src/proxy.c:959
+#: src/proxy.c:988
 #, c-format
 msgid "Access denied: proxy server forbids port %d tunnelling."
 msgstr "访问被禁止: 代理服务器禁止端口 %d 流过。"
 
-#: src/proxy.c:963
+#: src/proxy.c:992
 #, c-format
 msgid "Proxy connection error %d"
 msgstr "代理服务器连接错误 %d"
 
-#: src/proxy.c:1784
+#: src/proxy.c:1820
 msgid "Invalid proxy settings"
 msgstr "无效的代理设置"
 
-#: src/proxy.c:1784
+#: src/proxy.c:1820
 msgid ""
 "Either the host name or port number specified for your given proxy type is "
 "invalid."
@@ -10788,53 +10848,65 @@
 msgid "%s became unidle"
 msgstr "%s 睡醒了"
 
-#: src/util.c:2121
+#: src/util.c:2128
 #, c-format
 msgid "Error Reading %s"
-msgstr ""
-"读取 %s 出错"
-
-#: src/util.c:2122
+msgstr "读取 %s 出错"
+
+#: src/util.c:2129
 #, c-format
 msgid ""
 "An error was encountered reading your %s.  They have not been loaded, and "
 "the old file been renamed to %s~."
-msgstr ""
-"阅读您的 %s 时遇到了错误。该文件未装入,旧文件被移动到 %s~ 中"
-"了。"
-
-#: src/util.c:2557
+msgstr "阅读您的 %s 时遇到了错误。该文件未装入,旧文件被移动到 %s~ 中了。"
+
+#: src/util.c:2566
 msgid "Calculating..."
 msgstr "正在计算..."
 
-#: src/util.c:2560
+#: src/util.c:2569
 msgid "Unknown."
 msgstr "未知。"
 
-#: src/util.c:2590
+#: src/util.c:2599
 msgid "second"
 msgid_plural "seconds"
 msgstr[0] "秒"
 
-#: src/util.c:2604
+#: src/util.c:2613
 msgid "day"
 msgid_plural "days"
 msgstr[0] "天"
 
-#: src/util.c:2612
+#: src/util.c:2621
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "小时"
 
-#: src/util.c:2620
+#: src/util.c:2629
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "分"
 
-#: src/util.c:3037
+#: src/util.c:3049
 msgid "g003: Error opening connection.\n"
 msgstr "g003: 打开连接出错。\n"
 
+#~ msgid "Log Out"
+#~ msgstr "登出"
+
+#~ msgid "/Buddies/_Log Out"
+#~ msgstr "/好友(B)/登出(_L)"
+
+#~ msgid "/Buddies/Log Out"
+#~ msgstr "/好友(B)/登出"
+
+#~ msgid "_Screen name"
+#~ msgstr "用户名(_S)"
+
+#~ msgid "File Transfer Aborted"
+#~ msgstr "文件传送中止"
+
 #~ msgid ""
 #~ "An error was encountered parsing the file containing your buddy list (%"
 #~ "s).  It has not been loaded, and the old file has been renamed to blist."