changeset 9668:c6687793767f

[gaim-migrate @ 10520] updated committer: Tailor Script <tailor@pidgin.im>
author Luke Schierer <lschiere@pidgin.im>
date Thu, 05 Aug 2004 03:52:07 +0000 (2004-08-05)
parents 22928adecb84
children 287d900e2c03
files po/ChangeLog po/pt_BR.po po/ru.po
diffstat 3 files changed, 3161 insertions(+), 3040 deletions(-) [+]
line wrap: on
line diff
--- a/po/ChangeLog	Thu Aug 05 01:32:00 2004 +0000
+++ b/po/ChangeLog	Thu Aug 05 03:52:07 2004 +0000
@@ -12,7 +12,10 @@
 	* Japanese translation updated (Takeshi Aihana)
 	* Polish translation updated (Emil Nowak)
 	* Portuguese translation updated (Duarte Serrano Goncalves Henriques)
+	* Portuguese (Brazilian) translation updated (Mauricio de Lemos
+	  Rodrigues Collares Neto)
 	* Romanian translation updated (Misu Moldovan)
+	* Russian translation updated (Dmitry Beloglazov)
 	* Slovenian translation updated (Martin Srebotnjak)
 	* Spanish translation updated (Javier Fernandez-Sanguino Pena)
 
--- a/po/pt_BR.po	Thu Aug 05 01:32:00 2004 +0000
+++ b/po/pt_BR.po	Thu Aug 05 03:52:07 2004 +0000
@@ -7,8 +7,8 @@
 msgstr ""
 "Project-Id-Version: Gaim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-07-16 00:15-0400\n"
-"PO-Revision-Date: 2004-07-14 17:06-0300\n"
+"POT-Creation-Date: 2004-08-04 21:10-0300\n"
+"PO-Revision-Date: 2004-08-04 21:11-0300\n"
 "Last-Translator: Maur鱈cio de Lemos Rodrigues Collares Neto <mauricioc@gmail."
 "com>\n"
 "Language-Team: Maur鱈cio de Lemos Rodrigues Collares Neto <mauricioc@gmail."
@@ -18,18 +18,22 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: plugins/autorecon.c:174
+#: plugins/autorecon.c:233
 msgid "Error Message Suppression"
 msgstr "Supress達o de mensagens de erro"
 
-#: plugins/autorecon.c:178
+#: plugins/autorecon.c:237
 msgid "Hide Disconnect Errors"
 msgstr "Ocultar mensagens de desconex達o"
 
-#: plugins/autorecon.c:182
+#: plugins/autorecon.c:241
 msgid "Hide Login Errors"
 msgstr "Esconder erros de conex達o"
 
+#: plugins/autorecon.c:245
+msgid "Restore Away State On Reconnent"
+msgstr "Restaurar estado de ausente ao reconectar"
+
 #. *< api_version
 #. *< type
 #. *< ui_requirement
@@ -37,7 +41,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/autorecon.c:204
+#: plugins/autorecon.c:267
 msgid "Auto-Reconnect"
 msgstr "Auto-reconectar"
 
@@ -45,7 +49,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/autorecon.c:207 plugins/autorecon.c:209
+#: plugins/autorecon.c:270 plugins/autorecon.c:272
 msgid "When you are kicked offline, this reconnects you."
 msgstr "Quando voc棚 辿 desconectado, este plugin te reconecta."
 
@@ -148,7 +152,7 @@
 msgid "Gaim - Away"
 msgstr "Gaim - Ausente"
 
-#: plugins/docklet/docklet.c:114 src/gtkaccount.c:727 src/gtkaccount.c:2152
+#: plugins/docklet/docklet.c:114 src/gtkaccount.c:734 src/gtkaccount.c:2155
 msgid "Auto-login"
 msgstr "Auto-conectar"
 
@@ -164,21 +168,21 @@
 msgid "New..."
 msgstr "Novo..."
 
-#: plugins/docklet/docklet.c:153 src/gtkprefs.c:1809 src/protocols/gg/gg.c:51
-#: src/protocols/irc/msgs.c:187 src/protocols/jabber/jabber.c:960
+#: plugins/docklet/docklet.c:153 src/gtkprefs.c:1802 src/protocols/gg/gg.c:51
+#: src/protocols/irc/msgs.c:189 src/protocols/jabber/jabber.c:960
 #: src/protocols/jabber/jutil.c:32 src/protocols/jabber/presence.c:63
-#: src/protocols/jabber/presence.c:119 src/protocols/novell/novell.c:2724
-#: src/protocols/novell/novell.c:2841 src/protocols/novell/novell.c:2893
-#: src/protocols/oscar/oscar.c:532 src/protocols/oscar/oscar.c:5484
-#: src/protocols/oscar/oscar.c:6489 src/protocols/oscar/oscar.c:6689
+#: src/protocols/jabber/presence.c:121 src/protocols/novell/novell.c:2771
+#: src/protocols/novell/novell.c:2888 src/protocols/novell/novell.c:2940
+#: src/protocols/oscar/oscar.c:516 src/protocols/oscar/oscar.c:5486
+#: src/protocols/oscar/oscar.c:6492 src/protocols/oscar/oscar.c:6692
 #: src/protocols/silc/buddy.c:1379 src/protocols/silc/silc.c:46
 #: src/protocols/silc/silc.c:76
 msgid "Away"
 msgstr "Ausente"
 
 #. else...
-#: plugins/docklet/docklet.c:159 src/away.c:550
-#: src/protocols/oscar/oscar.c:5402 src/protocols/oscar/oscar.c:6697
+#: plugins/docklet/docklet.c:159 src/away.c:565
+#: src/protocols/oscar/oscar.c:5404 src/protocols/oscar/oscar.c:6700
 msgid "Back"
 msgstr "De volta"
 
@@ -190,11 +194,11 @@
 msgid "File Transfers"
 msgstr "Transfer棚ncias de arquivos"
 
-#: plugins/docklet/docklet.c:173 src/gtkaccount.c:2333
+#: plugins/docklet/docklet.c:173 src/gtkaccount.c:2336
 msgid "Accounts"
 msgstr "Contas"
 
-#: plugins/docklet/docklet.c:174 src/gtkprefs.c:2503
+#: plugins/docklet/docklet.c:174 src/gtkprefs.c:2484
 msgid "Preferences"
 msgstr "Prefer棚ncias"
 
@@ -310,23 +314,23 @@
 msgid "Allows you to control Gaim by entering commands in a file."
 msgstr "Permite que voc棚 controle o Gaim inserindo comandos em um arquivo."
 
-#: plugins/gaim-remote/remote.c:89
+#: plugins/gaim-remote/remote.c:90
 msgid "Not connected to AIM"
 msgstr "N達o conectado ao AIM"
 
-#: plugins/gaim-remote/remote.c:98 plugins/gaim-remote/remote.c:137
+#: plugins/gaim-remote/remote.c:99 plugins/gaim-remote/remote.c:138
 msgid "No screenname given."
 msgstr "Nenhum nome de usu叩rio fornecido."
 
-#: plugins/gaim-remote/remote.c:174
+#: plugins/gaim-remote/remote.c:175
 msgid "No roomname given."
 msgstr "Nenhum nome de sala fornecido."
 
-#: plugins/gaim-remote/remote.c:193
+#: plugins/gaim-remote/remote.c:194
 msgid "Invalid AIM URI"
 msgstr "URI do AIM inv叩lida"
 
-#: plugins/gaim-remote/remote.c:651
+#: plugins/gaim-remote/remote.c:668
 #, c-format
 msgid ""
 "Failed to assign %s to a socket:\n"
@@ -335,7 +339,7 @@
 "Imposs鱈vel associar %s a um socket:\n"
 "%s"
 
-#: plugins/gaim-remote/remote.c:674
+#: plugins/gaim-remote/remote.c:691
 msgid "Unable to open socket"
 msgstr "Imposs鱈vel abrir socket"
 
@@ -346,19 +350,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/gaim-remote/remote.c:722
+#: plugins/gaim-remote/remote.c:739
 msgid "Remote Control"
 msgstr "Controle remoto"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/gaim-remote/remote.c:725
+#: plugins/gaim-remote/remote.c:742
 msgid "Provides remote control for gaim applications."
 msgstr "Permite que as aplica巽探es Gaim sejam controladas remotamente."
 
 #. *  description
-#: plugins/gaim-remote/remote.c:727
+#: plugins/gaim-remote/remote.c:744
 msgid ""
 "Gives Gaim the ability to be remote-controlled through third-party "
 "applications or through the gaim-remote tool."
@@ -461,14 +465,14 @@
 #: plugins/gevolution/add_buddy_dialog.c:143
 #: plugins/gevolution/add_buddy_dialog.c:154
 #: plugins/gevolution/assoc-buddy.c:81 plugins/gevolution/assoc-buddy.c:92
-#: src/gtkblist.c:3015 src/gtkprefs.c:961 src/gtkprefs.c:1014
-#: src/gtkprefs.c:1822 src/protocols/jabber/jabber.c:924
+#: src/gtkblist.c:3006 src/gtkprefs.c:956 src/gtkprefs.c:1008
+#: src/gtkprefs.c:1816 src/protocols/jabber/jabber.c:924
 msgid "None"
 msgstr "Nenhuma"
 
 #: plugins/gevolution/add_buddy_dialog.c:187
-#: plugins/gevolution/assoc-buddy.c:175 src/gtkprefs.c:2175
-#: src/gtkroomlist.c:553 src/protocols/jabber/jabber.c:598
+#: plugins/gevolution/assoc-buddy.c:175 src/gtkprefs.c:2157
+#: src/gtkroomlist.c:552 src/protocols/jabber/jabber.c:598
 #: src/protocols/msn/msn.c:1311 src/protocols/trepia/trepia.c:398
 msgid "Name"
 msgstr "Nome"
@@ -486,7 +490,7 @@
 
 #. "Search"
 #: plugins/gevolution/add_buddy_dialog.c:492
-#: plugins/gevolution/assoc-buddy.c:380 src/protocols/oscar/oscar.c:6975
+#: plugins/gevolution/assoc-buddy.c:380 src/protocols/oscar/oscar.c:6976
 msgid "Search"
 msgstr "Procurar"
 
@@ -531,7 +535,7 @@
 msgstr "_Associar amigo"
 
 #: plugins/gevolution/gevo-util.c:64 plugins/gevolution/gevolution.c:89
-#: src/blist.c:775 src/blist.c:963 src/blist.c:1870 src/gtkblist.c:3867
+#: src/blist.c:775 src/blist.c:963 src/blist.c:1899 src/gtkblist.c:3865
 #: src/protocols/jabber/roster.c:66
 msgid "Buddies"
 msgstr "Amigos"
@@ -551,7 +555,7 @@
 msgstr ""
 "Selecionar todas as contas onde amigos devem ser adicionados automaticamente."
 
-#: plugins/gevolution/gevolution.c:384 plugins/idle.c:51 src/gtkconn.c:620
+#: plugins/gevolution/gevolution.c:384 plugins/idle.c:51 src/gtkconn.c:619
 msgid "Account"
 msgstr "Conta"
 
@@ -596,8 +600,8 @@
 msgstr "Informa巽探es opcionais:"
 
 #. Label
-#: plugins/gevolution/new_person_dialog.c:338 src/gtkaccount.c:378
-#: src/gtkaccount.c:408 src/protocols/oscar/oscar.c:438
+#: plugins/gevolution/new_person_dialog.c:338 src/gtkaccount.c:380
+#: src/gtkaccount.c:410 src/protocols/oscar/oscar.c:422
 msgid "Buddy Icon"
 msgstr "�cone do amigo"
 
@@ -664,7 +668,7 @@
 msgid "_Set"
 msgstr "_Definir"
 
-#: plugins/idle.c:67 src/dialogs.c:786
+#: plugins/idle.c:67 src/dialogs.c:808
 msgid "_Cancel"
 msgstr "_Cancelar"
 
@@ -831,14 +835,14 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/perl/perl.c:531
+#: plugins/perl/perl.c:532
 msgid "Perl Plugin Loader"
 msgstr "Carregador de plugins Perl"
 
 #. *< name
 #. *< version
 #. *< summary
-#: plugins/perl/perl.c:533 plugins/perl/perl.c:534
+#: plugins/perl/perl.c:534 plugins/perl/perl.c:535
 msgid "Provides support for loading perl plugins."
 msgstr "Fornece suporte ao carregamento de plugins Perl."
 
@@ -920,7 +924,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/signals-test.c:566
+#: plugins/signals-test.c:582
 msgid "Signals Test"
 msgstr "Teste dos sinais"
 
@@ -928,7 +932,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/signals-test.c:569 plugins/signals-test.c:571
+#: plugins/signals-test.c:585 plugins/signals-test.c:587
 msgid "Test to see that all signals are working properly."
 msgstr "Teste para ver se todos os sinais est達o funcionando corretamente."
 
@@ -1011,7 +1015,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/ssl/ssl-nss.c:312
+#: plugins/ssl/ssl-nss.c:314
 msgid "NSS"
 msgstr "NSS"
 
@@ -1019,7 +1023,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/ssl/ssl-nss.c:315 plugins/ssl/ssl-nss.c:317
+#: plugins/ssl/ssl-nss.c:317 plugins/ssl/ssl-nss.c:319
 msgid "Provides SSL support through Mozilla NSS."
 msgstr "Fornece suporte a SSL atrav辿s do Mozilla NSS."
 
@@ -1042,26 +1046,38 @@
 msgid "Provides a wrapper around SSL support libraries."
 msgstr "Fornece um envolt坦rio para as bibliotecas de suporte � SSL."
 
-#: plugins/statenotify.c:30
+#: plugins/statenotify.c:37
 #, c-format
 msgid "%s has gone away."
 msgstr "%s est叩 ausente."
 
-#: plugins/statenotify.c:36
+#: plugins/statenotify.c:44
 #, c-format
 msgid "%s is no longer away."
 msgstr "%s n達o est叩 mais ausente."
 
-#: plugins/statenotify.c:42
+#: plugins/statenotify.c:51
 #, c-format
 msgid "%s has become idle."
 msgstr "%s se tornou inativo."
 
-#: plugins/statenotify.c:48
+#: plugins/statenotify.c:58
 #, c-format
 msgid "%s is no longer idle."
 msgstr "%s n達o est叩 mais inativo."
 
+#: plugins/statenotify.c:69
+msgid "Notify When"
+msgstr "Notificar quando"
+
+#: plugins/statenotify.c:72
+msgid "Buddy Goes _Away"
+msgstr "O amigo ficar _ausente"
+
+#: plugins/statenotify.c:75
+msgid "Buddy Goes _Idle"
+msgstr "O amigo ficar _inativo"
+
 #. *< api_version
 #. *< type
 #. *< ui_requirement
@@ -1069,7 +1085,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/statenotify.c:78
+#: plugins/statenotify.c:113
 msgid "Buddy State Notification"
 msgstr "Notifica巽達o do status do amigo"
 
@@ -1077,7 +1093,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/statenotify.c:81 plugins/statenotify.c:84
+#: plugins/statenotify.c:116 plugins/statenotify.c:119
 msgid ""
 "Notifies in a conversation window when a buddy goes or returns from away or "
 "idle."
@@ -1168,7 +1184,7 @@
 msgstr "_Mostrar slider na janela de mensagem instant但nea"
 
 #. Buddy List trans options
-#: plugins/win32/transparency/win2ktrans.c:405 src/gtkprefs.c:955
+#: plugins/win32/transparency/win2ktrans.c:405 src/gtkprefs.c:950
 msgid "Buddy List Window"
 msgstr "Janela da lista de amigos"
 
@@ -1221,8 +1237,8 @@
 msgstr "_Iniciar o Gaim junto com o Windows"
 
 #. Buddy List
-#: plugins/win32/winprefs/winprefs.c:362 src/gtkblist.c:3058
-#: src/gtkprefs.c:2412
+#: plugins/win32/winprefs/winprefs.c:362 src/gtkblist.c:3051
+#: src/gtkprefs.c:2394
 msgid "Buddy List"
 msgstr "Lista de amigos"
 
@@ -1241,8 +1257,8 @@
 msgstr "_Manter a janela da lista de amigos no topo"
 
 #. Conversations
-#: plugins/win32/winprefs/winprefs.c:382 src/gtkprefs.c:1006
-#: src/gtkprefs.c:2413 src/protocols/msn/msn.c:1638
+#: plugins/win32/winprefs/winprefs.c:382 src/gtkprefs.c:1001
+#: src/gtkprefs.c:2395 src/protocols/msn/msn.c:1639
 msgid "Conversations"
 msgstr "Conversas"
 
@@ -1262,12 +1278,12 @@
 msgid "About Gaim"
 msgstr "Sobre o Gaim"
 
-#: src/about.c:75
+#: src/about.c:74
 #, c-format
 msgid "<span weight=\"bold\" size=\"larger\">Gaim v%s</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">Gaim v%s</span>"
 
-#: src/about.c:95
+#: src/about.c:94
 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 "
@@ -1278,215 +1294,215 @@
 "Gadu-Gadu ao mesmo tempo. Ele 辿 escrito usando o Gtk+ e 辿 licenciado sob a "
 "GPL.<BR><BR>"
 
-#: src/about.c:106
+#: src/about.c:105
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #gaim on irc.freenode.net<BR><BR>"
 msgstr "<FONT SIZE=\"4\">IRC:</FONT> #Gaim no irc.freenode.net<BR><BR>"
 
+#: src/about.c:110
+msgid "Active Developers"
+msgstr "Desenvolvedores ativos"
+
 #: src/about.c:111
-msgid "Active Developers"
-msgstr "Desenvolvedores ativos"
-
-#: src/about.c:112
 msgid "maintainer"
 msgstr "mantenedor"
 
-#: src/about.c:114
+#: src/about.c:113
 msgid "lead developer"
 msgstr "desenvolvedor principal"
 
+#: src/about.c:116
+msgid "developer & webmaster"
+msgstr "desenvolvedor & webmaster"
+
 #: src/about.c:117
-msgid "developer & webmaster"
-msgstr "desenvolvedor & webmaster"
-
-#: src/about.c:118
 msgid "win32 port"
 msgstr "port para Win32"
 
-#: src/about.c:121 src/about.c:122 src/about.c:123 src/about.c:124
+#: src/about.c:120 src/about.c:121 src/about.c:122 src/about.c:123
 msgid "developer"
 msgstr "desenvolvedor"
 
-#: src/about.c:125
+#: src/about.c:124
 msgid "support"
 msgstr "suporte"
 
-#: src/about.c:132
+#: src/about.c:131
 msgid "Crazy Patch Writers"
 msgstr "Escritores de patch malucos"
 
+#: src/about.c:147
+msgid "Retired Developers"
+msgstr "Desenvolvedores aposentados"
+
 #: src/about.c:148
-msgid "Retired Developers"
-msgstr "Desenvolvedores aposentados"
-
-#: src/about.c:149
 msgid "former libfaim maintainer"
 msgstr "antigo mantenedor da libfaim"
 
-#: src/about.c:150
+#: src/about.c:149
 msgid "former lead developer"
 msgstr "antigo desenvolvedor principal"
 
-#: src/about.c:153
+#: src/about.c:152
 msgid "former maintainer"
 msgstr "antigo mantenedor"
 
-#: src/about.c:154
+#: src/about.c:153
 msgid "former Jabber developer"
 msgstr "antigo desenvolvedor do Jabber"
 
-#: src/about.c:155
+#: src/about.c:154
 msgid "original author"
 msgstr "autor original"
 
-#: src/about.c:158
+#: src/about.c:157
 msgid "hacker and designated driver [lazy bum]"
 msgstr "hacker e dirigente designado [vagabundo pregui巽oso]"
 
-#: src/about.c:166
+#: src/about.c:165
 msgid "Current Translators"
 msgstr "Atuais tradutores"
 
+#: src/about.c:166 src/about.c:205
+msgid "Bulgarian"
+msgstr "B炭lgaro"
+
 #: src/about.c:167 src/about.c:206
-msgid "Bulgarian"
-msgstr "B炭lgaro"
-
-#: src/about.c:168 src/about.c:207
 msgid "Catalan"
 msgstr "Catal達o"
 
-#: src/about.c:169 src/about.c:208
+#: src/about.c:168 src/about.c:207
 msgid "Czech"
 msgstr "Tcheco"
 
+#: src/about.c:169
+msgid "Danish"
+msgstr "Dinamarqu棚s"
+
 #: src/about.c:170
-msgid "Danish"
-msgstr "Dinamarqu棚s"
-
-#: src/about.c:171
 msgid "British English"
 msgstr "Ingl棚s brit但nico"
 
-#: src/about.c:172
+#: src/about.c:171
 msgid "Canadian English"
 msgstr "Ingl棚s do Canad叩"
 
-#: src/about.c:173 src/about.c:209
+#: src/about.c:172 src/about.c:208
 msgid "German"
 msgstr "Alem達o"
 
-#: src/about.c:174 src/about.c:210
+#: src/about.c:173 src/about.c:209
 msgid "Spanish"
 msgstr "Espanhol"
 
-#: src/about.c:175 src/about.c:211
+#: src/about.c:174 src/about.c:210
 msgid "Finnish"
 msgstr "Finland棚s"
 
-#: src/about.c:176 src/about.c:212
+#: src/about.c:175 src/about.c:211
 msgid "French"
 msgstr "Franc棚s"
 
+#: src/about.c:176
+msgid "Hebrew"
+msgstr "Hebraico"
+
 #: src/about.c:177
-msgid "Hebrew"
-msgstr "Hebraico"
-
-#: src/about.c:178
 msgid "Hindi"
 msgstr "Hindu"
 
-#: src/about.c:179
+#: src/about.c:178
 msgid "Hungarian"
 msgstr "H炭ngaro"
 
+#: src/about.c:179 src/about.c:212
+msgid "Italian"
+msgstr "Italiano"
+
 #: src/about.c:180 src/about.c:213
-msgid "Italian"
-msgstr "Italiano"
-
-#: src/about.c:181 src/about.c:214
 msgid "Japanese"
 msgstr "Japon棚s"
 
-#: src/about.c:182
+#: src/about.c:181
 msgid "Lithuanian"
 msgstr "Lituano"
 
-#: src/about.c:183 src/about.c:215
+#: src/about.c:182 src/about.c:214
 msgid "Korean"
 msgstr "Coreano"
 
-#: src/about.c:184
+#: src/about.c:183
 msgid "Dutch; Flemish"
 msgstr "Holand棚s; Flamengo"
 
+#: src/about.c:184
+msgid "Macedonian"
+msgstr "Maced担nio"
+
 #: src/about.c:185
-msgid "Macedonian"
-msgstr "Maced担nio"
-
-#: src/about.c:186
 msgid "Norwegian"
 msgstr "Noruegu棚s"
 
-#: src/about.c:187 src/about.c:216
+#: src/about.c:186 src/about.c:215
 msgid "Polish"
 msgstr "Polon棚s"
 
-#: src/about.c:188
+#: src/about.c:187
 msgid "Portuguese"
 msgstr "Portugu棚s"
 
+#: src/about.c:188
+msgid "Portuguese-Brazil"
+msgstr "Portugu棚s do Brasil"
+
 #: src/about.c:189
-msgid "Portuguese-Brazil"
-msgstr "Portugu棚s do Brasil"
-
-#: src/about.c:190
 msgid "Romanian"
 msgstr "Romeno"
 
-#: src/about.c:191 src/about.c:217 src/about.c:218
+#: src/about.c:190 src/about.c:216 src/about.c:217
 msgid "Russian"
 msgstr "Russo"
 
+#: src/about.c:191
+msgid "Serbian"
+msgstr "S辿rvio"
+
 #: src/about.c:192
-msgid "Serbian"
-msgstr "S辿rvio"
-
-#: src/about.c:193
 msgid "Slovenian"
 msgstr "Esloveno"
 
-#: src/about.c:194 src/about.c:220
+#: src/about.c:193 src/about.c:219
 msgid "Swedish"
 msgstr "Sueco"
 
-#: src/about.c:195
+#: src/about.c:194
 msgid "Vietnamese"
 msgstr "Vietnamita"
 
-#: src/about.c:195
+#: src/about.c:194
 msgid "and the Gnome-Vi Team"
 msgstr "e o time do Gnome-Vi"
 
+#: src/about.c:195
+msgid "Simplified Chinese"
+msgstr "Chin棚s Simplificado"
+
 #: src/about.c:196
-msgid "Simplified Chinese"
-msgstr "Chin棚s Simplificado"
-
-#: src/about.c:197
 msgid "Traditional Chinese"
 msgstr "Chin棚s Tradicional"
 
+#: src/about.c:203
+msgid "Past Translators"
+msgstr "Antigos tradutores"
+
 #: src/about.c:204
-msgid "Past Translators"
-msgstr "Antigos tradutores"
-
-#: src/about.c:205
 msgid "Amharic"
 msgstr "Amh叩rico"
 
-#: src/about.c:219
+#: src/about.c:218
 msgid "Slovak"
 msgstr "Eslovaco"
 
-#: src/about.c:221
+#: src/about.c:220
 msgid "Chinese"
 msgstr "Chin棚s"
 
@@ -1522,46 +1538,46 @@
 #. *
 #. * A wrapper for gaim_request_action() that uses OK and Cancel buttons.
 #.
-#: src/account.c:342 src/connection.c:197 src/dialogs.c:462 src/dialogs.c:518
-#: src/dialogs.c:571 src/gtkblist.c:2391 src/gtkrequest.c:242
+#: src/account.c:342 src/connection.c:197 src/dialogs.c:473 src/dialogs.c:529
+#: src/dialogs.c:582 src/gtkblist.c:2380 src/gtkrequest.c:242
 #: src/protocols/jabber/jabber.c:1048 src/protocols/jabber/xdata.c:337
 #: src/protocols/msn/msn.c:226 src/protocols/msn/msn.c:241
 #: src/protocols/msn/msn.c:256 src/protocols/msn/msn.c:271
-#: src/protocols/oscar/oscar.c:3370 src/protocols/oscar/oscar.c:3464
-#: src/protocols/oscar/oscar.c:6758 src/protocols/oscar/oscar.c:6854
-#: src/protocols/oscar/oscar.c:6906 src/protocols/oscar/oscar.c:6992
+#: src/protocols/oscar/oscar.c:3361 src/protocols/oscar/oscar.c:3455
+#: src/protocols/oscar/oscar.c:6763 src/protocols/oscar/oscar.c:6855
+#: src/protocols/oscar/oscar.c:6907 src/protocols/oscar/oscar.c:6993
 #: src/protocols/silc/buddy.c:460 src/protocols/silc/buddy.c:1132
 #: src/protocols/silc/chat.c:409 src/protocols/silc/chat.c:447
-#: src/protocols/silc/chat.c:710 src/protocols/silc/ops.c:1063
-#: src/protocols/silc/ops.c:1671 src/protocols/silc/silc.c:692
-#: src/protocols/yahoo/yahoo.c:2752 src/protocols/yahoo/yahoo.c:2761
+#: src/protocols/silc/chat.c:710 src/protocols/silc/ops.c:1072
+#: src/protocols/silc/ops.c:1680 src/protocols/silc/silc.c:692
+#: src/protocols/yahoo/yahoo.c:2795 src/protocols/yahoo/yahoo.c:2804
 #: src/request.h:1243
 msgid "OK"
 msgstr "OK"
 
-#: src/account.c:343 src/account.c:381 src/away.c:334 src/connection.c:198
+#: src/account.c:343 src/account.c:381 src/away.c:349 src/connection.c:198
 #: src/dialogs.c:299 src/dialogs.c:311 src/dialogs.c:324 src/dialogs.c:345
-#: src/dialogs.c:463 src/dialogs.c:519 src/dialogs.c:572 src/dialogs.c:808
-#: src/dialogs.c:824 src/dialogs.c:842 src/gtkaccount.c:2002
-#: src/gtkaccount.c:2498 src/gtkblist.c:2392 src/gtkblist.c:4412
-#: src/gtkconn.c:168 src/gtkimhtmltoolbar.c:414 src/gtkprivacy.c:587
-#: src/gtkprivacy.c:600 src/gtkprivacy.c:625 src/gtkprivacy.c:636
+#: src/dialogs.c:474 src/dialogs.c:530 src/dialogs.c:583 src/dialogs.c:830
+#: src/dialogs.c:846 src/dialogs.c:864 src/gtkaccount.c:2005
+#: src/gtkaccount.c:2501 src/gtkblist.c:2381 src/gtkblist.c:4412
+#: src/gtkconn.c:168 src/gtkimhtmltoolbar.c:419 src/gtkprivacy.c:585
+#: src/gtkprivacy.c:598 src/gtkprivacy.c:623 src/gtkprivacy.c:634
 #: src/gtkrequest.c:243 src/protocols/icq/gaim_icq.c:277
-#: src/protocols/jabber/buddy.c:515 src/protocols/jabber/chat.c:710
+#: src/protocols/jabber/buddy.c:515 src/protocols/jabber/chat.c:702
 #: src/protocols/jabber/jabber.c:667 src/protocols/jabber/jabber.c:1049
 #: src/protocols/jabber/xdata.c:338 src/protocols/msn/msn.c:227
 #: src/protocols/msn/msn.c:242 src/protocols/msn/msn.c:257
 #: src/protocols/msn/msn.c:272 src/protocols/msn/msn.c:289
-#: src/protocols/oscar/oscar.c:1377 src/protocols/oscar/oscar.c:3330
-#: src/protocols/oscar/oscar.c:3371 src/protocols/oscar/oscar.c:3408
-#: src/protocols/oscar/oscar.c:3465 src/protocols/oscar/oscar.c:6759
-#: src/protocols/oscar/oscar.c:6855 src/protocols/oscar/oscar.c:6907
-#: src/protocols/oscar/oscar.c:6976 src/protocols/oscar/oscar.c:6993
+#: src/protocols/oscar/oscar.c:1363 src/protocols/oscar/oscar.c:3321
+#: src/protocols/oscar/oscar.c:3362 src/protocols/oscar/oscar.c:3399
+#: src/protocols/oscar/oscar.c:3456 src/protocols/oscar/oscar.c:6764
+#: src/protocols/oscar/oscar.c:6856 src/protocols/oscar/oscar.c:6908
+#: src/protocols/oscar/oscar.c:6977 src/protocols/oscar/oscar.c:6994
 #: src/protocols/silc/buddy.c:461 src/protocols/silc/buddy.c:1037
 #: src/protocols/silc/buddy.c:1133 src/protocols/silc/chat.c:582
-#: src/protocols/silc/chat.c:711 src/protocols/silc/ops.c:1672
+#: src/protocols/silc/chat.c:711 src/protocols/silc/ops.c:1681
 #: src/protocols/silc/silc.c:693 src/protocols/trepia/trepia.c:347
-#: src/protocols/yahoo/yahoo.c:2753 src/protocols/yahoo/yahoo.c:2762
+#: src/protocols/yahoo/yahoo.c:2796 src/protocols/yahoo/yahoo.c:2805
 #: src/request.h:1243 src/request.h:1253
 msgid "Cancel"
 msgstr "Cancelar"
@@ -1576,34 +1592,34 @@
 msgid "Save"
 msgstr "Salvar"
 
-#: src/away.c:211
+#: src/away.c:227
 msgid "Away!"
 msgstr "Ausente!"
 
-#: src/away.c:276
+#: src/away.c:291
 msgid "I'm Back!"
 msgstr "Estou de volta!"
 
-#: src/away.c:330
+#: src/away.c:345
 #, c-format
 msgid "Are you sure you want to remove the away message \"%s\"?"
 msgstr "Voc棚 tem certeza de que deseja remover a mensagem de aus棚ncia \"%s\"?"
 
-#: src/away.c:332 src/away.c:423
+#: src/away.c:347 src/away.c:438
 msgid "Remove Away Message"
 msgstr "Remover mensagem de aus棚ncia"
 
 #. Remove button
-#: src/away.c:333 src/gtkconv.c:1388 src/gtkconv.c:3680 src/gtkconv.c:3784
+#: src/away.c:348 src/gtkconv.c:1378 src/gtkconv.c:3718 src/gtkconv.c:3822
 #: src/gtkrequest.c:248
 msgid "Remove"
 msgstr "Remover"
 
-#: src/away.c:403
+#: src/away.c:418
 msgid "New Away Message"
 msgstr "Nova mensagem de aus棚ncia"
 
-#: src/away.c:618
+#: src/away.c:633
 msgid "Set All Away"
 msgstr "Definir todos como ausente"
 
@@ -1611,7 +1627,7 @@
 msgid "Chats"
 msgstr "Bate-papos"
 
-#: src/blist.c:1321
+#: src/blist.c:1318
 #, c-format
 msgid ""
 "%d buddy from group %s was not removed because its account was not logged "
@@ -1626,16 +1642,11 @@
 "%d amigos do grupo %s n達o foram removidos porque suas contas n達o estavam "
 "conectadas. Estes amigos e o grupo n達o foram removidos.\n"
 
-#: src/blist.c:1330
+#: src/blist.c:1327
 msgid "Group not removed"
 msgstr "Grupo n達o removido"
 
-#: src/blist.c:1393 src/gtkaccount.c:167 src/gtkft.c:154 src/gtkutils.c:627
-#: src/protocols/jabber/buddy.c:570 src/protocols/novell/novell.c:2736
-msgid "Unknown"
-msgstr "Desconhecido"
-
-#: src/blist.c:2001
+#: src/blist.c:2030
 msgid ""
 "An error was encountered parsing your buddy list.  It has not been loaded, "
 "and the old file has moved to blist.xml~."
@@ -1643,7 +1654,7 @@
 "Um erro foi encontrado ao processar sua lista de amigos. Ela n達o foi "
 "carregada, e o antigo arquivo foi movido para blist.xml~."
 
-#: src/blist.c:2004
+#: src/blist.c:2033
 msgid "Buddy List Error"
 msgstr "Erro da lista de amigos"
 
@@ -1665,71 +1676,71 @@
 msgid "Enter password for %s"
 msgstr "Digite a senha para %s"
 
-#: src/conversation.c:261
+#: src/conversation.c:229
 msgid "Unable to send message. The message is too large."
 msgstr "Imposs鱈vel enviar mensagem. A mensagem 辿 muito extensa."
 
-#: src/conversation.c:269
+#: src/conversation.c:237
 msgid "Unable to send message."
 msgstr "Imposs鱈vel enviar mensagem."
 
-#: src/conversation.c:1953
+#: src/conversation.c:1950
 #, c-format
 msgid "%s entered the room."
 msgstr "%s entrou na sala."
 
-#: src/conversation.c:1956
+#: src/conversation.c:1953
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>] entrou na sala."
 
-#: src/conversation.c:2047
+#: src/conversation.c:2049
 #, c-format
 msgid "You are now known as %s"
 msgstr "Voc棚 mudou seu apelido para %s"
 
-#: src/conversation.c:2050
+#: src/conversation.c:2052
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s mudou seu apelido para %s"
 
-#: src/conversation.c:2092
+#: src/conversation.c:2093
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s saiu da sala (%s)."
 
-#: src/conversation.c:2094
+#: src/conversation.c:2095
 #, c-format
 msgid "%s left the room."
 msgstr "%s saiu da sala."
 
-#: src/conversation.c:2165
+#: src/conversation.c:2164
 #, c-format
 msgid "(+%d more)"
 msgstr "(+%d mais)"
 
-#: src/conversation.c:2167
+#: src/conversation.c:2166
 #, c-format
 msgid " left the room (%s)."
 msgstr " saiu da sala (%s)."
 
-#: src/conversation.c:2457
+#: src/conversation.c:2571
 msgid "Last created window"
 msgstr "�ltima janela criada"
 
-#: src/conversation.c:2459
+#: src/conversation.c:2573
 msgid "Separate IM and Chat windows"
 msgstr "Janelas separadas de mensagens instant但neas e bate-papos"
 
-#: src/conversation.c:2461 src/gtkprefs.c:1384
+#: src/conversation.c:2575 src/gtkprefs.c:1377
 msgid "New window"
 msgstr "Nova janela"
 
-#: src/conversation.c:2463
+#: src/conversation.c:2577
 msgid "By group"
 msgstr "Por grupo"
 
-#: src/conversation.c:2465
+#: src/conversation.c:2579
 msgid "By account"
 msgstr "Por conta"
 
@@ -1808,106 +1819,106 @@
 msgid "Remove Contact"
 msgstr "Remover contato"
 
-#: src/dialogs.c:444 src/dialogs.c:500 src/dialogs.c:552
+#: src/dialogs.c:455 src/dialogs.c:511 src/dialogs.c:563
 msgid "_Screen name"
 msgstr "_Nome de usu叩rio"
 
-#: src/dialogs.c:450 src/dialogs.c:506 src/dialogs.c:558
+#: src/dialogs.c:461 src/dialogs.c:517 src/dialogs.c:569
 msgid "_Account"
 msgstr "_Conta"
 
-#: src/dialogs.c:457
+#: src/dialogs.c:468
 msgid "New Instant Message"
 msgstr "Nova mensagem instant但nea"
 
-#: src/dialogs.c:459
+#: src/dialogs.c:470
 msgid "Please enter the screen name of the person you would like to IM."
 msgstr ""
 "Por favor digite o nome de usu叩rio da pessoa com quem voc棚 deseja trocar "
 "mensagens instant但neas."
 
-#: src/dialogs.c:513
+#: src/dialogs.c:524
 msgid "Get User Info"
 msgstr "Ver informa巽探es do usu叩rio"
 
-#: src/dialogs.c:515
+#: src/dialogs.c:526
 msgid ""
 "Please enter the screen name of the person whose info you would like to view."
 msgstr ""
 "Por favor digite o nome de usu叩rio da pessoa cuja informa巽達o voc棚 gostaria "
 "de ver."
 
-#: src/dialogs.c:566
+#: src/dialogs.c:577
 msgid "Get User Log"
 msgstr "Ver log do usu叩rio"
 
-#: src/dialogs.c:568
+#: src/dialogs.c:579
 msgid ""
 "Please enter the screen name of the person whose log you would like to view."
 msgstr ""
 "Por favor digite o nome de usu叩rio da pessoa cujo log voc棚 gostaria de ver."
 
-#: src/dialogs.c:623
+#: src/dialogs.c:645
 msgid "You cannot save an away message with a blank title"
 msgstr "Voc棚 n達o pode salvar uma mensagem de aus棚ncia com um t鱈tulo em branco"
 
-#: src/dialogs.c:625
+#: src/dialogs.c:647
 msgid ""
 "Please give the message a title, or choose \"Use\" to use without saving."
 msgstr ""
 "Por favor d棚 um t鱈tulo � mensagem, ou escolha \"Usar\" para usar sem salvar."
 
-#: src/dialogs.c:635
+#: src/dialogs.c:657
 msgid "You cannot create an empty away message"
 msgstr "Voc棚 n達o pode criar uma mensagem de aus棚ncia vazia"
 
-#: src/dialogs.c:697
+#: src/dialogs.c:719
 msgid "New away message"
 msgstr "Nova mensagem de aus棚ncia"
 
-#: src/dialogs.c:718
+#: src/dialogs.c:740
 msgid "Away title: "
 msgstr "T鱈tulo da mensagem de aus棚ncia: "
 
-#: src/dialogs.c:774
+#: src/dialogs.c:796
 msgid "_Save"
 msgstr "_Salvar"
 
-#: src/dialogs.c:778
+#: src/dialogs.c:800
 msgid "Sa_ve & Use"
 msgstr "Sal_var e usar"
 
-#: src/dialogs.c:782
-msgid "_Use"
-msgstr "_Usar"
-
 #: src/dialogs.c:804
+msgid "_Use"
+msgstr "_Usar"
+
+#: src/dialogs.c:826
 msgid "Alias Chat"
 msgstr "Apelidar bate-papo"
 
-#: src/dialogs.c:805
+#: src/dialogs.c:827
 msgid "Enter an alias for this chat."
 msgstr "Digite um apelido para este bate-papo."
 
-#: src/dialogs.c:807 src/dialogs.c:823 src/dialogs.c:841 src/gtkrequest.c:250
+#: src/dialogs.c:829 src/dialogs.c:845 src/dialogs.c:863 src/gtkrequest.c:250
 #: src/protocols/silc/chat.c:572
 msgid "Alias"
 msgstr "Apelido:"
 
-#: src/dialogs.c:820
+#: src/dialogs.c:842
 msgid "Alias Contact"
 msgstr "Apelidar contato"
 
-#: src/dialogs.c:821
+#: src/dialogs.c:843
 msgid "Enter an alias for this contact."
 msgstr "Digite um apelido para este contato."
 
-#: src/dialogs.c:837
+#: src/dialogs.c:859
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "Digite um apelido para %s."
 
-#: src/dialogs.c:839
+#: src/dialogs.c:861
 msgid "Alias Buddy"
 msgstr "Apelidar amigo"
 
@@ -1975,6 +1986,9 @@
 "\n"
 "    COMMANDS:\n"
 "       uri                      Handle AIM: URI\n"
+"       away                     Popup the away dialog with the default "
+"message\n"
+"       back                     Remove the away dialog\n"
 "       quit                     Close running copy of Gaim\n"
 "\n"
 "    OPTIONS:\n"
@@ -1984,16 +1998,20 @@
 "\n"
 "    COMANDOS:\n"
 "       uri                       Lida com URIs AIM:\n"
+"       away                      Exibe a caixa de di叩logo de aus棚ncia com a "
+"mensagem padr達o\n"
+"       back                      Fecha a caixa de di叩logo de aus棚ncia\n"
 "       quit                      Fecha a c坦pia em execu巽達o do Gaim\n"
 "\n"
 "    OP��ES:\n"
 "       -h, --help [comando]      Mostra a ajuda do comando\n"
 
-#: src/gaim-remote.c:174 src/gaim-remote.c:190
+#: src/gaim-remote.c:176 src/gaim-remote.c:192 src/gaim-remote.c:208
+#: src/gaim-remote.c:224
 msgid "Gaim not running (on session 0)\n"
 msgstr "O Gaim n達o est叩 rodando (na sess達o 0)\n"
 
-#: src/gaim-remote.c:203
+#: src/gaim-remote.c:238
 msgid ""
 "\n"
 "Using AIM: URIs:\n"
@@ -2036,7 +2054,7 @@
 "\tgaim-remote uri 'aim:addbuddy?screenname=Penguin'\n"
 "...pergunta a voc棚 se deseja adicionar 'Penguin' � sua lista de amigos.\n"
 
-#: src/gaim-remote.c:222
+#: src/gaim-remote.c:257
 msgid ""
 "\n"
 "Close running copy of Gaim\n"
@@ -2044,28 +2062,12 @@
 "\n"
 "Fechar c坦pia em execu巽達o do Gaim\n"
 
-#. for people like myself, who are too lazy to add an away msg :)
-#: src/gaimrc.c:46
-msgid "sorry, i ran out for a while. bbl"
-msgstr "Desculpe, eu sa鱈 um pouco. Volto depois"
-
-#: src/gaimrc.c:372 src/gaimrc.c:1417
-msgid "boring default"
-msgstr "Padr達o chato"
-
-#: src/gaimrc.c:1227 src/gtkblist.c:3017
-msgid "Alphabetical"
-msgstr "Alfab辿tica"
-
-#: src/gaimrc.c:1229 src/gtkblist.c:3018
-msgid "By status"
-msgstr "Por status"
-
-#: src/gaimrc.c:1231 src/gtkblist.c:3019
-msgid "By log size"
-msgstr "Por tamanho do log"
-
-#: src/gtkaccount.c:331
+#: src/gtkaccount.c:169 src/gtkft.c:154 src/gtkutils.c:627
+#: src/protocols/jabber/buddy.c:570 src/protocols/novell/novell.c:2783
+msgid "Unknown"
+msgstr "Desconhecido"
+
+#: src/gtkaccount.c:333
 #, c-format
 msgid ""
 "<b>File:</b> %s\n"
@@ -2077,164 +2079,164 @@
 "<b>Dimens探es da imagem:</b> %dx%d"
 
 #. Build the login options frame.
-#: src/gtkaccount.c:614
+#: src/gtkaccount.c:621
 msgid "Login Options"
 msgstr "Op巽探es de conex達o"
 
-#: src/gtkaccount.c:631
+#: src/gtkaccount.c:638
 msgid "Protocol:"
 msgstr "Protocolo:"
 
-#: src/gtkaccount.c:636 src/gtkblist.c:4018
+#: src/gtkaccount.c:643 src/gtkblist.c:4018
 msgid "Screen Name:"
 msgstr "Nome do usu叩rio:"
 
-#: src/gtkaccount.c:709
+#: src/gtkaccount.c:716
 msgid "Password:"
 msgstr "Senha:"
 
-#: src/gtkaccount.c:714 src/gtkblist.c:4032 src/gtkblist.c:4360
+#: src/gtkaccount.c:721 src/gtkblist.c:4032 src/gtkblist.c:4360
 msgid "Alias:"
 msgstr "Apelido:"
 
-#: src/gtkaccount.c:718
+#: src/gtkaccount.c:725
 msgid "Remember password"
 msgstr "Lembrar senha"
 
 #. Build the user options frame.
-#: src/gtkaccount.c:774
+#: src/gtkaccount.c:781
 msgid "User Options"
 msgstr "Op巽探es do usu叩rio"
 
-#: src/gtkaccount.c:787
+#: src/gtkaccount.c:794
 msgid "New mail notifications"
 msgstr "Novas notifica巽探es de email"
 
-#: src/gtkaccount.c:796
+#: src/gtkaccount.c:803
 msgid "Buddy icon:"
 msgstr "�cone do amigo:"
 
 #. Build the protocol options frame.
-#: src/gtkaccount.c:885
+#: src/gtkaccount.c:892
 #, c-format
 msgid "%s Options"
 msgstr "Op巽探es de %s"
 
 #. Use Global Proxy Settings
-#: src/gtkaccount.c:1021 src/gtkaccount.c:1068
+#: src/gtkaccount.c:1028 src/gtkaccount.c:1075
 msgid "Use Global Proxy Settings"
 msgstr "Usar configura巽達o global de proxy"
 
 #. No Proxy
-#: src/gtkaccount.c:1027 src/gtkaccount.c:1075
+#: src/gtkaccount.c:1034 src/gtkaccount.c:1082
 msgid "No Proxy"
 msgstr "Nenhum proxy"
 
 #. HTTP
-#: src/gtkaccount.c:1033 src/gtkaccount.c:1082
+#: src/gtkaccount.c:1040 src/gtkaccount.c:1089
 msgid "HTTP"
 msgstr "HTTP"
 
 #. SOCKS 4
-#: src/gtkaccount.c:1039 src/gtkaccount.c:1089
+#: src/gtkaccount.c:1046 src/gtkaccount.c:1096
 msgid "SOCKS 4"
 msgstr "SOCKS 4"
 
 #. SOCKS 5
-#: src/gtkaccount.c:1045 src/gtkaccount.c:1096
+#: src/gtkaccount.c:1052 src/gtkaccount.c:1103
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
 #. Use Environmental Settings
-#: src/gtkaccount.c:1051 src/gtkaccount.c:1103 src/gtkprefs.c:1187
+#: src/gtkaccount.c:1058 src/gtkaccount.c:1110 src/gtkprefs.c:1180
 msgid "Use Environmental Settings"
 msgstr "Usar configura巽探es do ambiente"
 
-#: src/gtkaccount.c:1142
+#: src/gtkaccount.c:1149
 msgid "you can see the butterflies mating"
 msgstr "voc棚 pode ver as borboletas acasalando-se"
 
-#: src/gtkaccount.c:1146
+#: src/gtkaccount.c:1153
 msgid "If you look real closely"
 msgstr "Se voc棚 olhar bem de perto"
 
-#: src/gtkaccount.c:1162
+#: src/gtkaccount.c:1169
 msgid "Proxy Options"
 msgstr "Op巽探es de proxy"
 
-#: src/gtkaccount.c:1180 src/gtkprefs.c:1181
+#: src/gtkaccount.c:1187 src/gtkprefs.c:1174
 msgid "Proxy _type:"
 msgstr "_Tipo de proxy:"
 
-#: src/gtkaccount.c:1189 src/gtkprefs.c:1208
+#: src/gtkaccount.c:1196 src/gtkprefs.c:1201
 msgid "_Host:"
 msgstr "_Host:"
 
-#: src/gtkaccount.c:1193 src/gtkprefs.c:1226
+#: src/gtkaccount.c:1200 src/gtkprefs.c:1219
 msgid "_Port:"
 msgstr "_Porta:"
 
-#: src/gtkaccount.c:1201
+#: src/gtkaccount.c:1208
 msgid "_Username:"
 msgstr "_Nome de usu叩rio:"
 
-#: src/gtkaccount.c:1206 src/gtkprefs.c:1263
+#: src/gtkaccount.c:1213 src/gtkprefs.c:1256
 msgid "Pa_ssword:"
 msgstr "_Senha:"
 
-#: src/gtkaccount.c:1578
+#: src/gtkaccount.c:1581
 msgid "Add Account"
 msgstr "Adicionar conta"
 
-#: src/gtkaccount.c:1580
+#: src/gtkaccount.c:1583
 msgid "Modify Account"
 msgstr "Modificar conta"
 
 #. Add the disclosure
-#: src/gtkaccount.c:1604
+#: src/gtkaccount.c:1607
 msgid "Show more options"
 msgstr "Mostrar mais op巽探es"
 
-#: src/gtkaccount.c:1605
+#: src/gtkaccount.c:1608
 msgid "Show fewer options"
 msgstr "Mostrar menos op巽探es"
 
 #. Register button
-#: src/gtkaccount.c:1632 src/protocols/jabber/jabber.c:666
+#: src/gtkaccount.c:1635 src/protocols/jabber/jabber.c:666
 msgid "Register"
 msgstr "Registrar"
 
-#: src/gtkaccount.c:1997
+#: src/gtkaccount.c:2000
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "Voc棚 tem certeza de que deseja remover %s?"
 
-#: src/gtkaccount.c:2001 src/gtkrequest.c:246
+#: src/gtkaccount.c:2004 src/gtkrequest.c:246
 msgid "Delete"
 msgstr "Remover"
 
-#: src/gtkaccount.c:2115 src/protocols/oscar/oscar.c:3998
+#: src/gtkaccount.c:2118 src/protocols/oscar/oscar.c:3990
 msgid "Screen Name"
 msgstr "Nome de usu叩rio"
 
-#: src/gtkaccount.c:2139 src/protocols/jabber/jabber.c:958
-#: src/protocols/oscar/oscar.c:538 src/protocols/oscar/oscar.c:5482
-#: src/protocols/oscar/oscar.c:6688 src/protocols/silc/silc.c:44
-#: src/protocols/yahoo/yahoo.c:2515 src/protocols/zephyr/zephyr.c:1360
-#: src/protocols/zephyr/zephyr.c:1372
+#: src/gtkaccount.c:2142 src/protocols/jabber/jabber.c:958
+#: src/protocols/oscar/oscar.c:522 src/protocols/oscar/oscar.c:5484
+#: src/protocols/oscar/oscar.c:6691 src/protocols/silc/silc.c:44
+#: src/protocols/yahoo/yahoo.c:2558 src/protocols/zephyr/zephyr.c:1363
+#: src/protocols/zephyr/zephyr.c:1375
 msgid "Online"
 msgstr "Conectado"
 
-#: src/gtkaccount.c:2160
+#: src/gtkaccount.c:2163
 msgid "Protocol"
 msgstr "Protocolo"
 
-#: src/gtkaccount.c:2473
+#: src/gtkaccount.c:2476
 #, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s%s"
 msgstr "%s%s%s%s fez %s seu amigo%s%s%s"
 
-#: src/gtkaccount.c:2487
+#: src/gtkaccount.c:2490
 msgid ""
 "\n"
 "\n"
@@ -2244,27 +2246,27 @@
 "\n"
 "Voc棚 deseja adicionar ele(a) � sua lista de amigos?"
 
-#: src/gtkaccount.c:2491
+#: src/gtkaccount.c:2494
 msgid "Information"
 msgstr "Informa巽探es"
 
-#: src/gtkaccount.c:2495
+#: src/gtkaccount.c:2498
 msgid "Add buddy to your list?"
 msgstr "Adicionar amigo � sua lista?"
 
 #. Add button
-#: src/gtkaccount.c:2497 src/gtkblist.c:4411 src/gtkconv.c:1390
-#: src/gtkconv.c:3673 src/gtkconv.c:3777 src/gtkrequest.c:247
-#: src/protocols/icq/gaim_icq.c:277 src/protocols/oscar/oscar.c:3627
+#: src/gtkaccount.c:2500 src/gtkblist.c:4411 src/gtkconv.c:1380
+#: src/gtkconv.c:3711 src/gtkconv.c:3815 src/gtkrequest.c:247
+#: src/protocols/icq/gaim_icq.c:277 src/protocols/oscar/oscar.c:3618
 #: src/protocols/silc/chat.c:581
 msgid "Add"
 msgstr "Adicionar"
 
-#: src/gtkblist.c:815
+#: src/gtkblist.c:802
 msgid "Join a Chat"
 msgstr "Entrar em um bate-papo"
 
-#: src/gtkblist.c:836
+#: src/gtkblist.c:823
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
@@ -2272,203 +2274,203 @@
 "Por favor digite as informa巽探es apropriadas sobre o bate-papo em que voc棚 "
 "gostaria de entrar.\n"
 
-#: src/gtkblist.c:847 src/gtkpounce.c:412 src/gtkroomlist.c:354
+#: src/gtkblist.c:834 src/gtkpounce.c:411 src/gtkroomlist.c:353
 msgid "_Account:"
 msgstr "_Conta:"
 
-#: src/gtkblist.c:1133 src/gtkblist.c:3212
+#: src/gtkblist.c:1122 src/gtkblist.c:3204
 msgid "Get _Info"
 msgstr "Ver _info"
 
-#: src/gtkblist.c:1136 src/gtkblist.c:3203
+#: src/gtkblist.c:1125 src/gtkblist.c:3194
 msgid "I_M"
 msgstr "_MI"
 
-#: src/gtkblist.c:1141
+#: src/gtkblist.c:1130
 msgid "_Send File"
 msgstr "_Enviar arquivo"
 
-#: src/gtkblist.c:1145
+#: src/gtkblist.c:1134
 msgid "Add Buddy _Pounce"
 msgstr "Adicionar notifica巽達o de _amigo"
 
-#: src/gtkblist.c:1147
+#: src/gtkblist.c:1136
 msgid "View _Log"
 msgstr "Ver _log"
 
-#: src/gtkblist.c:1155 src/gtkblist.c:1241 src/gtkblist.c:1255
+#: src/gtkblist.c:1144 src/gtkblist.c:1230 src/gtkblist.c:1244
 msgid "_Alias..."
 msgstr "_Apelido..."
 
-#: src/gtkblist.c:1157 src/gtkblist.c:1243 src/gtkblist.c:1260
-#: src/gtkconn.c:361
+#: src/gtkblist.c:1146 src/gtkblist.c:1232 src/gtkblist.c:1249
+#: src/gtkconn.c:360
 msgid "_Remove"
 msgstr "_Remover"
 
-#: src/gtkblist.c:1203
+#: src/gtkblist.c:1192
 msgid "Add a _Buddy"
 msgstr "Adicionar um _amigo"
 
-#: src/gtkblist.c:1205
+#: src/gtkblist.c:1194
 msgid "Add a C_hat"
 msgstr "Adicionar um c_hat"
 
-#: src/gtkblist.c:1207
+#: src/gtkblist.c:1196
 msgid "_Delete Group"
 msgstr "_Remover grupo"
 
-#: src/gtkblist.c:1209
+#: src/gtkblist.c:1198
 msgid "_Rename"
 msgstr "_Renomear"
 
 #. join button
-#: src/gtkblist.c:1231 src/gtkroomlist.c:263 src/gtkroomlist.c:409
+#: src/gtkblist.c:1220 src/gtkroomlist.c:263 src/gtkroomlist.c:408
 #: src/stock.c:87
 msgid "_Join"
 msgstr "_Entrar"
 
-#: src/gtkblist.c:1233
+#: src/gtkblist.c:1222
 msgid "Auto-Join"
 msgstr "Entrar automaticamente"
 
-#: src/gtkblist.c:1257 src/gtkblist.c:1286
+#: src/gtkblist.c:1246 src/gtkblist.c:1275
 msgid "_Collapse"
 msgstr "Re_colher"
 
-#: src/gtkblist.c:1291
+#: src/gtkblist.c:1280
 msgid "_Expand"
 msgstr "_Expandir"
 
-#: src/gtkblist.c:1949 src/gtkconv.c:4315 src/gtkpounce.c:314
+#: src/gtkblist.c:1938 src/gtkconv.c:4405 src/gtkpounce.c:314
 msgid ""
 "You are not currently signed on with an account that can add that buddy."
 msgstr ""
 "Voc棚 n達o est叩 conectado com uma conta que permita adicionar este amigo."
 
 #. Buddies menu
-#: src/gtkblist.c:2336
+#: src/gtkblist.c:2325
 msgid "/_Buddies"
 msgstr "/_Amigos"
 
-#: src/gtkblist.c:2337
+#: src/gtkblist.c:2326
 msgid "/Buddies/New Instant _Message..."
 msgstr "/Amigos/Nova _mensagem instant但nea..."
 
-#: src/gtkblist.c:2338
+#: src/gtkblist.c:2327
 msgid "/Buddies/Join a _Chat..."
 msgstr "/Amigos/Entrar em um _bate-papo..."
 
-#: src/gtkblist.c:2339
+#: src/gtkblist.c:2328
 msgid "/Buddies/Get User _Info..."
 msgstr "/Amigos/Ver _informa巽探es do usu叩rio..."
 
-#: src/gtkblist.c:2340
+#: src/gtkblist.c:2329
 msgid "/Buddies/View User _Log..."
 msgstr "/Amigos/Ver _log do usu叩rio..."
 
-#: src/gtkblist.c:2342
+#: src/gtkblist.c:2331
 msgid "/Buddies/Show _Offline Buddies"
 msgstr "/Amigos/Exibir amig_os desconectados"
 
-#: src/gtkblist.c:2343
+#: src/gtkblist.c:2332
 msgid "/Buddies/Show _Empty Groups"
 msgstr "/Amigos/Exibir grupos _vazios"
 
-#: src/gtkblist.c:2344
+#: src/gtkblist.c:2333
 msgid "/Buddies/_Add Buddy..."
 msgstr "/Amigos/_Adicionar amigo..."
 
-#: src/gtkblist.c:2345
+#: src/gtkblist.c:2334
 msgid "/Buddies/Add C_hat..."
 msgstr "/Amigos/Adicionar bate-_papo..."
 
-#: src/gtkblist.c:2346
+#: src/gtkblist.c:2335
 msgid "/Buddies/Add _Group..."
 msgstr "/Amigos/Adicionar _grupo..."
 
-#: src/gtkblist.c:2348
+#: src/gtkblist.c:2337
 msgid "/Buddies/_Signoff"
 msgstr "/Amigos/_Desconectar"
 
-#: src/gtkblist.c:2349
+#: src/gtkblist.c:2338
 msgid "/Buddies/_Quit"
 msgstr "/Amigos/_Sair"
 
 #. Tools
-#: src/gtkblist.c:2352
+#: src/gtkblist.c:2341
 msgid "/_Tools"
 msgstr "/_Ferramentas"
 
-#: src/gtkblist.c:2353
+#: src/gtkblist.c:2342
 msgid "/Tools/_Away"
 msgstr "/Ferrramentas/_Aus棚ncia"
 
-#: src/gtkblist.c:2354
+#: src/gtkblist.c:2343
 msgid "/Tools/Buddy _Pounce"
 msgstr "/Ferramentas/Notifica巽達o de amigo"
 
-#: src/gtkblist.c:2355
+#: src/gtkblist.c:2344
 msgid "/Tools/Account Ac_tions"
 msgstr "/Ferramentas/A巽探es de con_tas"
 
-#: src/gtkblist.c:2356
+#: src/gtkblist.c:2345
 msgid "/Tools/Pl_ugin Actions"
 msgstr "/Ferramentas/A巽探es de pl_ugins"
 
-#: src/gtkblist.c:2358
+#: src/gtkblist.c:2347
 msgid "/Tools/A_ccounts"
 msgstr "/Ferramentas/_Contas"
 
-#: src/gtkblist.c:2359
+#: src/gtkblist.c:2348
 msgid "/Tools/_File Transfers"
 msgstr "/Ferramentas/Transfer棚ncias de arquivo"
 
-#: src/gtkblist.c:2360
+#: src/gtkblist.c:2349
 msgid "/Tools/R_oom List"
 msgstr "/Ferramentas/_Lista de salas"
 
-#: src/gtkblist.c:2361
+#: src/gtkblist.c:2350
 msgid "/Tools/Pr_eferences"
 msgstr "/Ferramentas/Pr_efer棚ncias"
 
-#: src/gtkblist.c:2362
+#: src/gtkblist.c:2351
 msgid "/Tools/Pr_ivacy"
 msgstr "/Ferramentas/Pr_ivacidade"
 
-#: src/gtkblist.c:2364
+#: src/gtkblist.c:2353
 msgid "/Tools/View System _Log"
 msgstr "/Ferramentas/Ver log do _sistema"
 
 #. Help
-#: src/gtkblist.c:2367
+#: src/gtkblist.c:2356
 msgid "/_Help"
 msgstr "/_Ajuda"
 
-#: src/gtkblist.c:2368
+#: src/gtkblist.c:2357
 msgid "/Help/Online _Help"
 msgstr "/Ajuda/_Ajuda online"
 
-#: src/gtkblist.c:2369
+#: src/gtkblist.c:2358
 msgid "/Help/_Debug Window"
 msgstr "/Ajuda/Janela de _debug"
 
-#: src/gtkblist.c:2370
+#: src/gtkblist.c:2359
 msgid "/Help/_About"
 msgstr "/Ajuda/_Sobre"
 
-#: src/gtkblist.c:2388
+#: src/gtkblist.c:2377
 msgid "Rename Group"
 msgstr "Renomear grupo"
 
-#: src/gtkblist.c:2388
+#: src/gtkblist.c:2377
 msgid "New group name"
 msgstr "Novo nome do grupo"
 
-#: src/gtkblist.c:2389
+#: src/gtkblist.c:2378
 msgid "Please enter a new name for the selected group."
 msgstr "Por favor digite um novo nome para o grupo selecionado."
 
-#: src/gtkblist.c:2417
+#: src/gtkblist.c:2406
 #, c-format
 msgid ""
 "\n"
@@ -2477,7 +2479,7 @@
 "\n"
 "<b>Conta:</b> %s"
 
-#: src/gtkblist.c:2481
+#: src/gtkblist.c:2470
 msgid ""
 "\n"
 "<b>Status:</b> Offline"
@@ -2485,12 +2487,12 @@
 "\n"
 "<b>Status:</b> Desconectado"
 
-#: src/gtkblist.c:2496
+#: src/gtkblist.c:2485
 #, c-format
 msgid "%d%%"
 msgstr "%d%%"
 
-#: src/gtkblist.c:2512
+#: src/gtkblist.c:2501
 msgid ""
 "\n"
 "<b>Account:</b>"
@@ -2498,7 +2500,7 @@
 "\n"
 "<b>Conta: </b>"
 
-#: src/gtkblist.c:2513
+#: src/gtkblist.c:2502
 msgid ""
 "\n"
 "<b>Contact Alias:</b>"
@@ -2506,7 +2508,7 @@
 "\n"
 "<b>Apelido do contato:</b>"
 
-#: src/gtkblist.c:2514
+#: src/gtkblist.c:2503
 msgid ""
 "\n"
 "<b>Alias:</b>"
@@ -2514,7 +2516,7 @@
 "\n"
 "<b>Apelido (local):</b>"
 
-#: src/gtkblist.c:2515
+#: src/gtkblist.c:2504
 msgid ""
 "\n"
 "<b>Nickname:</b>"
@@ -2522,7 +2524,7 @@
 "\n"
 "<b>Apelido (remoto):</b>"
 
-#: src/gtkblist.c:2516
+#: src/gtkblist.c:2505
 msgid ""
 "\n"
 "<b>Logged In:</b>"
@@ -2530,7 +2532,7 @@
 "\n"
 "<b>Conectado por:</b>"
 
-#: src/gtkblist.c:2517
+#: src/gtkblist.c:2506
 msgid ""
 "\n"
 "<b>Idle:</b>"
@@ -2538,7 +2540,7 @@
 "\n"
 "<b>Inativo por:</b>"
 
-#: src/gtkblist.c:2518
+#: src/gtkblist.c:2507
 msgid ""
 "\n"
 "<b>Warned:</b>"
@@ -2546,7 +2548,7 @@
 "\n"
 "<b>Alertado:</b>"
 
-#: src/gtkblist.c:2520
+#: src/gtkblist.c:2509
 msgid ""
 "\n"
 "<b>Description:</b> Spooky"
@@ -2554,7 +2556,7 @@
 "\n"
 "<b>Descri巽達o:</b> Assombroso"
 
-#: src/gtkblist.c:2521
+#: src/gtkblist.c:2510
 msgid ""
 "\n"
 "<b>Status</b>: Awesome"
@@ -2562,7 +2564,7 @@
 "\n"
 "<b>Status</b>: Incr鱈vel"
 
-#: src/gtkblist.c:2522
+#: src/gtkblist.c:2511
 msgid ""
 "\n"
 "<b>Status</b>: Rockin'"
@@ -2570,92 +2572,104 @@
 "\n"
 "<b>Status</b>: Botando pra quebrar"
 
-#: src/gtkblist.c:2804
+#: src/gtkblist.c:2793
 #, c-format
 msgid "Idle (%dh%02dm) "
 msgstr "Inativo (%dh%02dm) "
 
-#: src/gtkblist.c:2806
+#: src/gtkblist.c:2795
 #, c-format
 msgid "Idle (%dm) "
 msgstr "Inativo (%dm) "
 
-#: src/gtkblist.c:2811
+#: src/gtkblist.c:2800
 #, c-format
 msgid "Warned (%d%%) "
 msgstr "Alertado (%d%%) "
 
-#: src/gtkblist.c:2814
+#: src/gtkblist.c:2803
 msgid "Offline "
 msgstr "Desconectado "
 
 #. Make menu items sensitive/insensitive where appropriate
-#: src/gtkblist.c:2932
+#: src/gtkblist.c:2921
 msgid "/Buddies/Join a Chat..."
 msgstr "/Amigos/Entrar em um bate-papo..."
 
-#: src/gtkblist.c:2935
+#: src/gtkblist.c:2924
 msgid "/Tools/Room List"
 msgstr "/Ferramentas/Lista de salas"
 
-#: src/gtkblist.c:2938
+#: src/gtkblist.c:2927
 msgid "/Tools/Privacy"
 msgstr "/Ferramentas/Privacidade"
 
+#: src/gtkblist.c:3008
+msgid "Alphabetical"
+msgstr "Alfab辿tica"
+
+#: src/gtkblist.c:3009
+msgid "By status"
+msgstr "Por status"
+
+#: src/gtkblist.c:3010
+msgid "By log size"
+msgstr "Por tamanho do log"
+
+#: src/gtkblist.c:3076
+msgid "/Tools/Away"
+msgstr "/Ferramentas/Aus棚ncia"
+
+#: src/gtkblist.c:3079
+msgid "/Tools/Buddy Pounce"
+msgstr "/Ferramentas/Notifica巽達o de amigos"
+
+#: src/gtkblist.c:3082
+msgid "/Tools/Account Actions"
+msgstr "/Ferramentas/A巽探es de contas"
+
 #: src/gtkblist.c:3085
-msgid "/Tools/Away"
-msgstr "/Ferramentas/Aus棚ncia"
-
-#: src/gtkblist.c:3088
-msgid "/Tools/Buddy Pounce"
-msgstr "/Ferramentas/Notifica巽達o de amigos"
-
-#: src/gtkblist.c:3091
-msgid "/Tools/Account Actions"
-msgstr "/Ferramentas/A巽探es de contas"
-
-#: src/gtkblist.c:3094
 msgid "/Tools/Plugin Actions"
 msgstr "/Ferramentas/A巽探es de plugins"
 
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: src/gtkblist.c:3183
+#: src/gtkblist.c:3174
 msgid "/Buddies/Show Offline Buddies"
 msgstr "/Amigos/Exibir amigos desconectados"
 
-#: src/gtkblist.c:3185
+#: src/gtkblist.c:3176
 msgid "/Buddies/Show Empty Groups"
 msgstr "/Amigos/Exibir grupos vazios"
 
-#: src/gtkblist.c:3209
+#: src/gtkblist.c:3200
 msgid "Send a message to the selected buddy"
 msgstr "Enviar uma mensagem para o amigo selecionado"
 
-#: src/gtkblist.c:3218
+#: src/gtkblist.c:3210
 msgid "Get information on the selected buddy"
 msgstr "Ver informa巽探es sobre o amigo selecionado"
 
-#: src/gtkblist.c:3221
+#: src/gtkblist.c:3214
 msgid "_Chat"
 msgstr "_Bate-papo"
 
-#: src/gtkblist.c:3226
+#: src/gtkblist.c:3219
 msgid "Join a chat room"
 msgstr "Entrar numa sala de bate-papo"
 
-#: src/gtkblist.c:3229
+#: src/gtkblist.c:3224
 msgid "_Away"
 msgstr "_Ausente"
 
-#: src/gtkblist.c:3234
+#: src/gtkblist.c:3229
 msgid "Set an away message"
 msgstr "Definir uma mensagem de aus棚ncia"
 
 #: src/gtkblist.c:3972 src/protocols/silc/buddy.c:731
 #: src/protocols/silc/buddy.c:989 src/protocols/silc/buddy.c:1034
-#: src/protocols/silc/buddy.c:1124 src/protocols/yahoo/yahoo.c:2682
+#: src/protocols/silc/buddy.c:1124 src/protocols/yahoo/yahoo.c:2725
 msgid "Add Buddy"
 msgstr "Adicionar amigo"
 
@@ -2707,7 +2721,7 @@
 msgid "No actions available"
 msgstr "Nenhuma a巽達o dispon鱈vel"
 
-#: src/gtkconn.c:78 src/gtkconn.c:250 src/gtkconn.c:261
+#: src/gtkconn.c:78 src/gtkconn.c:249 src/gtkconn.c:260
 msgid "Done."
 msgstr "Pronto."
 
@@ -2719,15 +2733,15 @@
 msgid "Signon"
 msgstr "Conectando"
 
-#: src/gtkconn.c:216
+#: src/gtkconn.c:215
 msgid "Cancel All"
 msgstr "Cancelar todos"
 
-#: src/gtkconn.c:361 src/gtkconn.c:593
+#: src/gtkconn.c:360 src/gtkconn.c:592
 msgid "_Reconnect"
 msgstr "_Reconectar"
 
-#: src/gtkconn.c:557
+#: src/gtkconn.c:556
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">%s has been disconnected.</span>\n"
@@ -2740,15 +2754,15 @@
 "%s\n"
 "%s"
 
-#: src/gtkconn.c:559
+#: src/gtkconn.c:558
 msgid "Reason Unknown."
 msgstr "Raz達o desconhecida."
 
-#: src/gtkconn.c:598
+#: src/gtkconn.c:597
 msgid "Reconnect _All"
 msgstr "Reconectar tod_as"
 
-#: src/gtkconn.c:628
+#: src/gtkconn.c:627
 msgid "Time"
 msgstr "Hora"
 
@@ -2761,7 +2775,11 @@
 msgid "Supported debug options are:  version"
 msgstr "As op巽探es de depura巽達o suportadas s達o:  version"
 
-#: src/gtkconv.c:336
+#: src/gtkconv.c:347
+msgid "No such command (in this context)."
+msgstr "Comando inexistente (neste contexto)."
+
+#: src/gtkconv.c:350
 msgid ""
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
 "The following commands are available in this context:\n"
@@ -2769,11 +2787,7 @@
 "Use \"/help &lt;comando&gt;\" para ajuda com um comando espec鱈fico.\n"
 "Os seguintes comandos est達o dispon鱈veis neste contexto:\n"
 
-#: src/gtkconv.c:370
-msgid "No such command (in this context)."
-msgstr "Comando inexistente (neste contexto)."
-
-#: src/gtkconv.c:443
+#: src/gtkconv.c:434
 msgid ""
 "No such command. If you didn't mean to type a command, you can turn commands "
 "off from Tools->Preferences->Interface->Conversation->Enable \"slash\" "
@@ -2783,7 +2797,7 @@
 "pode deslig叩-los em Ferramentas->Prefer棚ncias->Interface->Conversas->Ativar "
 "comandos iniciados por barra."
 
-#: src/gtkconv.c:451
+#: src/gtkconv.c:442
 msgid ""
 "Syntax Error:  You typed the wrong number of arguments to that command. If "
 "you didn't mean to type a command, you can turn commands off from Tools-"
@@ -2794,28 +2808,28 @@
 "los em Ferramentas->Prefer棚ncias->Interface->Conversas->Ativar comandos "
 "iniciados por barra."
 
-#: src/gtkconv.c:458
+#: src/gtkconv.c:449
 msgid "Your command failed for an unknown reason."
 msgstr "Seu comando falhou por um motivo desconhecido."
 
-#: src/gtkconv.c:465
+#: src/gtkconv.c:456
 msgid "That command only works in Chats, not IMs."
 msgstr "Este comando s坦 funciona em bate-papos, n達o em conversas."
 
-#: src/gtkconv.c:468
+#: src/gtkconv.c:459
 msgid "That command only works in IMs, not Chats."
 msgstr "Este comando s坦 funciona em conversas, n達o em bate-papos."
 
-#: src/gtkconv.c:472
+#: src/gtkconv.c:463
 msgid "That command doesn't work on this protocol."
 msgstr "Este comando n達o funciona neste protocolo."
 
-#: src/gtkconv.c:693
+#: src/gtkconv.c:685
 msgid "Invite Buddy Into Chat Room"
 msgstr "Convidar amigo para sala de bate-papo"
 
 #. Put our happy label in it.
-#: src/gtkconv.c:721
+#: src/gtkconv.c:713
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
@@ -2823,349 +2837,348 @@
 "Favor digitar o nome do usu叩rio que voc棚 gostaria de convidar, junto com uma "
 "mensagem de convite opcional."
 
-#: src/gtkconv.c:742
+#: src/gtkconv.c:734
 msgid "_Buddy:"
 msgstr "_Amigo:"
 
-#: src/gtkconv.c:762
+#: src/gtkconv.c:754
 msgid "_Message:"
 msgstr "_Mensagem:"
 
-#: src/gtkconv.c:799 src/gtkconv.c:2489 src/gtkdebug.c:182
+#: src/gtkconv.c:791 src/gtkconv.c:2476 src/gtkdebug.c:182
 msgid "Unable to open file."
 msgstr "Imposs鱈vel abrir arquivo."
 
-#: src/gtkconv.c:804
+#: src/gtkconv.c:796
 #, c-format
 msgid "<h1>Conversation with %s</h1>\n"
 msgstr "<h1>Conversas com %s</h1>\n"
 
-#: src/gtkconv.c:818
+#: src/gtkconv.c:810
 msgid "Save Conversation"
 msgstr "Salvar conversa"
 
-#: src/gtkconv.c:895 src/gtkdebug.c:131
+#: src/gtkconv.c:887 src/gtkdebug.c:131
 msgid "Find"
 msgstr "Procurar"
 
-#: src/gtkconv.c:921 src/gtkdebug.c:159
+#: src/gtkconv.c:913 src/gtkdebug.c:159
 msgid "_Search for:"
 msgstr "_Procurar por:"
 
-#: src/gtkconv.c:1338
+#: src/gtkconv.c:1328
 msgid "IM"
 msgstr "MI"
 
-#. Block button
-#: src/gtkconv.c:1347 src/gtkconv.c:3666 src/protocols/oscar/oscar.c:453
-#: src/protocols/oscar/oscar.c:6798
+#. Send File button
+#: src/gtkconv.c:1337 src/gtkconv.c:3704 src/protocols/oscar/oscar.c:437
 msgid "Send File"
 msgstr "Enviar arquivo"
 
-#: src/gtkconv.c:1356
+#: src/gtkconv.c:1346
 msgid "Un-Ignore"
 msgstr "Des-ignorar"
 
-#: src/gtkconv.c:1358 src/gtkprefs.c:826
+#: src/gtkconv.c:1348 src/gtkprefs.c:825
 msgid "Ignore"
 msgstr "Ignorar"
 
 #. Info button
-#: src/gtkconv.c:1367 src/gtkconv.c:3687
+#: src/gtkconv.c:1357 src/gtkconv.c:3725
 msgid "Info"
 msgstr "Info"
 
-#: src/gtkconv.c:1376
+#: src/gtkconv.c:1366
 msgid "Get Away Msg"
 msgstr "Ver mensagem de aus棚ncia"
 
-#: src/gtkconv.c:2497
+#: src/gtkconv.c:2484
 msgid "Unable to save icon file to disk."
 msgstr "Imposs鱈vel salvar arquivo de 鱈cone no disco."
 
-#: src/gtkconv.c:2514
+#: src/gtkconv.c:2501
 msgid "Save Icon"
 msgstr "Salvar 鱈cone"
 
-#: src/gtkconv.c:2544
+#: src/gtkconv.c:2531
 msgid "Animate"
 msgstr "Animar"
 
-#: src/gtkconv.c:2549
+#: src/gtkconv.c:2536
 msgid "Hide Icon"
 msgstr "Ocultar 鱈cone"
 
-#: src/gtkconv.c:2555
+#: src/gtkconv.c:2542
 msgid "Save Icon As..."
 msgstr "Salvar 鱈cone como..."
 
-#: src/gtkconv.c:2939
+#: src/gtkconv.c:2926
 msgid "User is typing..."
 msgstr "O usu叩rio est叩 digitando..."
 
-#: src/gtkconv.c:2947
+#: src/gtkconv.c:2934
 msgid "User has typed something and paused"
 msgstr "O usu叩rio digitou algo e parou"
 
 #. Build the Send As menu
-#: src/gtkconv.c:3050
+#: src/gtkconv.c:3037
 msgid "_Send As"
 msgstr "_Enviar como"
 
 #. Conversation menu
-#: src/gtkconv.c:3450
+#: src/gtkconv.c:3488
 msgid "/_Conversation"
 msgstr "/_Conversa"
 
-#: src/gtkconv.c:3452
+#: src/gtkconv.c:3490
 msgid "/Conversation/New Instant _Message..."
 msgstr "/Conversa/Nova _mensagem instant但nea..."
 
-#: src/gtkconv.c:3457
+#: src/gtkconv.c:3495
 msgid "/Conversation/_Find..."
 msgstr "/Conversa/_Procurar..."
 
-#: src/gtkconv.c:3459
+#: src/gtkconv.c:3497
 msgid "/Conversation/View _Log"
 msgstr "/Conversa/Ver _log"
 
-#: src/gtkconv.c:3460
+#: src/gtkconv.c:3498
 msgid "/Conversation/_Save As..."
 msgstr "/Conversa/_Salvar como..."
 
-#: src/gtkconv.c:3462
+#: src/gtkconv.c:3500
 msgid "/Conversation/Clear"
 msgstr "/Conversa/Limpar"
 
-#: src/gtkconv.c:3466
+#: src/gtkconv.c:3504
 msgid "/Conversation/Se_nd File..."
 msgstr "/Conversa/E_nviar arquivo..."
 
-#: src/gtkconv.c:3467
+#: src/gtkconv.c:3505
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Conversa/Adicionar notifica巽達o de a_migo..."
 
-#: src/gtkconv.c:3469
+#: src/gtkconv.c:3507
 msgid "/Conversation/_Get Info"
 msgstr "/Conversa/_Ver informa巽探es"
 
-#: src/gtkconv.c:3471
+#: src/gtkconv.c:3509
 msgid "/Conversation/_Warn..."
 msgstr "/Conversa/_Alertar..."
 
-#: src/gtkconv.c:3473
+#: src/gtkconv.c:3511
 msgid "/Conversation/In_vite..."
 msgstr "/Conversa/_Convidar..."
 
-#: src/gtkconv.c:3478
+#: src/gtkconv.c:3516
 msgid "/Conversation/A_lias..."
 msgstr "/Conversa/A_pelidar..."
 
-#: src/gtkconv.c:3480
+#: src/gtkconv.c:3518
 msgid "/Conversation/_Block..."
 msgstr "/Conversa/_Bloquear..."
 
-#: src/gtkconv.c:3482
+#: src/gtkconv.c:3520
 msgid "/Conversation/_Add..."
 msgstr "/Conversa/A_dicionar..."
 
-#: src/gtkconv.c:3484
+#: src/gtkconv.c:3522
 msgid "/Conversation/_Remove..."
 msgstr "/Conversa/_Remover..."
 
-#: src/gtkconv.c:3489
+#: src/gtkconv.c:3527
 msgid "/Conversation/Insert Lin_k..."
 msgstr "/Conversa/Inserir lin_k..."
 
-#: src/gtkconv.c:3491
+#: src/gtkconv.c:3529
 msgid "/Conversation/Insert Imag_e..."
 msgstr "/Conversa/Inserir imag_em..."
 
-#: src/gtkconv.c:3496
+#: src/gtkconv.c:3534
 msgid "/Conversation/_Close"
 msgstr "/Conversa/_Fechar"
 
 #. Options
-#: src/gtkconv.c:3500
+#: src/gtkconv.c:3538
 msgid "/_Options"
 msgstr "/_Op巽探es"
 
-#: src/gtkconv.c:3501
+#: src/gtkconv.c:3539
 msgid "/Options/Enable _Logging"
 msgstr "/Op巽探es/Gravar _log"
 
-#: src/gtkconv.c:3502
+#: src/gtkconv.c:3540
 msgid "/Options/Enable _Sounds"
 msgstr "/Op巽探es/Ativar _sons"
 
-#: src/gtkconv.c:3503
+#: src/gtkconv.c:3541
 msgid "/Options/Show Formatting _Toolbar"
 msgstr "/Op巽探es/Mostrar barra de ferramen_tas de formata巽達o"
 
-#: src/gtkconv.c:3504
+#: src/gtkconv.c:3542
 msgid "/Options/Show T_imestamps"
 msgstr "/Op巽探es/Mostrar marca巽探es de t_empo"
 
-#: src/gtkconv.c:3546
+#: src/gtkconv.c:3584
 msgid "/Conversation/View Log"
 msgstr "/Conversa/Ver log"
 
-#: src/gtkconv.c:3551
+#: src/gtkconv.c:3589
 msgid "/Conversation/Send File..."
 msgstr "/Conversa/Enviar arquivo..."
 
-#: src/gtkconv.c:3555
+#: src/gtkconv.c:3593
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Conversa/Adicionar notifica巽達o de amigo..."
 
-#: src/gtkconv.c:3561
+#: src/gtkconv.c:3599
 msgid "/Conversation/Get Info"
 msgstr "/Conversa/Ver informa巽探es"
 
-#: src/gtkconv.c:3565
+#: src/gtkconv.c:3603
 msgid "/Conversation/Warn..."
 msgstr "/Conversa/Alertar..."
 
-#: src/gtkconv.c:3569
+#: src/gtkconv.c:3607
 msgid "/Conversation/Invite..."
 msgstr "/Conversa/Convidar..."
 
-#: src/gtkconv.c:3575
+#: src/gtkconv.c:3613
 msgid "/Conversation/Alias..."
 msgstr "/Conversa/Apelido..."
 
-#: src/gtkconv.c:3579
+#: src/gtkconv.c:3617
 msgid "/Conversation/Block..."
 msgstr "/Conversa/Bloquear..."
 
-#: src/gtkconv.c:3583
+#: src/gtkconv.c:3621
 msgid "/Conversation/Add..."
 msgstr "/Conversa/Adicionar..."
 
-#: src/gtkconv.c:3587
+#: src/gtkconv.c:3625
 msgid "/Conversation/Remove..."
 msgstr "/Conversa/Remover..."
 
-#: src/gtkconv.c:3593
+#: src/gtkconv.c:3631
 msgid "/Conversation/Insert Link..."
 msgstr "/Conversa/Inserir link..."
 
-#: src/gtkconv.c:3597
+#: src/gtkconv.c:3635
 msgid "/Conversation/Insert Image..."
 msgstr "/Conversa/Inserir imagem..."
 
-#: src/gtkconv.c:3603
+#: src/gtkconv.c:3641
 msgid "/Options/Enable Logging"
 msgstr "/Op巽探es/Gravar log"
 
-#: src/gtkconv.c:3606
+#: src/gtkconv.c:3644
 msgid "/Options/Enable Sounds"
 msgstr "/Op巽探es/Ativar sons"
 
-#: src/gtkconv.c:3609
+#: src/gtkconv.c:3647
 msgid "/Options/Show Formatting Toolbar"
 msgstr "/Op巽探es/Mostrar barra de ferramentas de formata巽達o"
 
-#: src/gtkconv.c:3612
+#: src/gtkconv.c:3650
 msgid "/Options/Show Timestamps"
 msgstr "/Op巽探es/Mostrar marca巽探es de tempo"
 
 #. From right to left...
 #. Send button
-#: src/gtkconv.c:3636 src/gtkconv.c:3638 src/gtkconv.c:3756 src/gtkconv.c:3758
+#: src/gtkconv.c:3674 src/gtkconv.c:3676 src/gtkconv.c:3794 src/gtkconv.c:3796
 msgid "Send"
 msgstr "Enviar"
 
 #. Now, um, just kind of all over the place. Huh?
 #. Warn button
-#: src/gtkconv.c:3652
+#: src/gtkconv.c:3690
 msgid "Warn"
 msgstr "Alertar"
 
-#: src/gtkconv.c:3655
+#: src/gtkconv.c:3693
 msgid "Warn the user"
 msgstr "Alertar o usu叩rio"
 
 #. Block button
-#: src/gtkconv.c:3659 src/gtkprivacy.c:624 src/gtkprivacy.c:635
+#: src/gtkconv.c:3697 src/gtkprivacy.c:622 src/gtkprivacy.c:633
 msgid "Block"
 msgstr "Bloquear"
 
-#: src/gtkconv.c:3662
+#: src/gtkconv.c:3700
 msgid "Block the user"
 msgstr "Bloquear o usu叩rio"
 
-#: src/gtkconv.c:3669
+#: src/gtkconv.c:3707
 msgid "Send a file to the user"
 msgstr "Enviar um arquivo para o usu叩rio"
 
-#: src/gtkconv.c:3676
+#: src/gtkconv.c:3714
 msgid "Add the user to your buddy list"
 msgstr "Adicionar o usu叩rio � sua lista de amigos"
 
-#: src/gtkconv.c:3683
+#: src/gtkconv.c:3721
 msgid "Remove the user from your buddy list"
 msgstr "Remover o usu叩rio da sua lista de amigos"
 
-#: src/gtkconv.c:3690 src/gtkconv.c:4039
+#: src/gtkconv.c:3728 src/gtkconv.c:4108
 msgid "Get the user's information"
 msgstr "Ver informa巽探es do usu叩rio"
 
 #. Invite
-#: src/gtkconv.c:3770
+#: src/gtkconv.c:3808
 msgid "Invite"
 msgstr "Convidar"
 
-#: src/gtkconv.c:3773
+#: src/gtkconv.c:3811
 msgid "Invite a user"
 msgstr "Convidar um usu叩rio"
 
-#: src/gtkconv.c:3780
+#: src/gtkconv.c:3818
 msgid "Add the chat to your buddy list"
 msgstr "Adicionar o bate-papo � sua lista de amigos"
 
-#: src/gtkconv.c:3787
+#: src/gtkconv.c:3825
 msgid "Remove the chat from your buddy list"
 msgstr "Remover o bate-papo da sua lista de amigos"
 
-#: src/gtkconv.c:3897
+#: src/gtkconv.c:3961
 msgid "Topic:"
 msgstr "T坦pico:"
 
 #. Setup the label telling how many people are in the room.
-#: src/gtkconv.c:3960
+#: src/gtkconv.c:4024
 msgid "0 people in room"
 msgstr "0 pessoas na sala"
 
-#: src/gtkconv.c:4016
+#: src/gtkconv.c:4085
 msgid "IM the user"
 msgstr "Mandar uma mensagem instant但nea para o usu叩rio"
 
-#: src/gtkconv.c:4028
+#: src/gtkconv.c:4097
 msgid "Ignore the user"
 msgstr "Ignorar o usu叩rio"
 
-#: src/gtkconv.c:4627
+#: src/gtkconv.c:4695
 msgid "Close conversation"
 msgstr "Fechar conversa"
 
-#: src/gtkconv.c:5169 src/gtkconv.c:5201 src/gtkconv.c:5322 src/gtkconv.c:5389
+#: src/gtkconv.c:5227 src/gtkconv.c:5256 src/gtkconv.c:5352 src/gtkconv.c:5404
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "%d pessoa na sala"
 msgstr[1] "%d pessoas na sala"
 
-#: src/gtkconv.c:5901 src/gtkconv.c:5904
+#: src/gtkconv.c:5958 src/gtkconv.c:5961
 msgid "<main>/Conversation/Close"
 msgstr "<main>/Conversa/Fechar"
 
-#: src/gtkconv.c:6276
+#: src/gtkconv.c:6333
 msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
 msgstr ""
 "me &lt;a巽達o&gt;:  Envia uma a巽達o do tipo do IRC para um amigo ou bate-papo."
 
-#: src/gtkconv.c:6279
+#: src/gtkconv.c:6336
 msgid ""
 "debug &lt;option&gt;:  Send various debug information to the current "
 "conversation."
@@ -3173,11 +3186,7 @@
 "debug &lt;op巽達o&gt;:  Envia v叩rias informa巽探es de depura巽達o para a conversa "
 "atual."
 
-#: src/gtkconv.c:6283
-msgid "help:  List available commands."
-msgstr "help:  Lista os comandos dispon鱈veis."
-
-#: src/gtkconv.c:6287
+#: src/gtkconv.c:6340
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr "help &lt;comando&gt;:  Ajuda num comando espec鱈fico."
 
@@ -3202,11 +3211,11 @@
 msgid "%.2f KB/s"
 msgstr "%.2f KB/s"
 
-#: src/gtkft.c:157 src/gtkft.c:967
+#: src/gtkft.c:157 src/gtkft.c:962
 msgid "Finished"
 msgstr "Conclu鱈da"
 
-#: src/gtkft.c:160 src/gtkft.c:918
+#: src/gtkft.c:160 src/gtkft.c:913
 msgid "Canceled"
 msgstr "Cancelada"
 
@@ -3266,34 +3275,34 @@
 msgid "Time Remaining:"
 msgstr "Tempo restante:"
 
-#: src/gtkft.c:641
+#: src/gtkft.c:636
 msgid "_Keep the dialog open"
 msgstr "_Manter a janela aberta"
 
-#: src/gtkft.c:651
+#: src/gtkft.c:646
 msgid "_Clear finished transfers"
 msgstr "_Limpar transfer棚ncias conclu鱈das"
 
 #. "Download Details" arrow
-#: src/gtkft.c:660
+#: src/gtkft.c:655
 msgid "Show transfer details"
 msgstr "Mostrar detalhes da transfer棚ncia"
 
-#: src/gtkft.c:661
+#: src/gtkft.c:656
 msgid "Hide transfer details"
 msgstr "Ocultar detalhes da transfer棚ncia"
 
 #. Pause button
-#: src/gtkft.c:703 src/stock.c:90
+#: src/gtkft.c:698 src/stock.c:90
 msgid "_Pause"
 msgstr "_Pausar"
 
 #. Resume button
-#: src/gtkft.c:713
+#: src/gtkft.c:708
 msgid "_Resume"
 msgstr "_Continuar"
 
-#: src/gtkft.c:920
+#: src/gtkft.c:915
 msgid "Failed"
 msgstr "Falhou"
 
@@ -3321,7 +3330,7 @@
 msgid "_Open Link in Browser"
 msgstr "_Abrir link no navegador"
 
-#: src/gtkimhtml.c:2797
+#: src/gtkimhtml.c:2803
 msgid ""
 "Unable to guess the image type based on the file extension supplied.  "
 "Defaulting to PNG."
@@ -3329,16 +3338,16 @@
 "N達o foi poss鱈vel descobrir o tipo de imagem baseando-se na extens達o "
 "fornecida.  O padr達o (PNG) vai ser usado."
 
-#: src/gtkimhtml.c:2805
+#: src/gtkimhtml.c:2811
 #, c-format
 msgid "Error saving image: %s"
 msgstr "Erro ao salvar imagem: %s"
 
-#: src/gtkimhtml.c:2814
+#: src/gtkimhtml.c:2888 src/gtkimhtml.c:2900
 msgid "Save Image"
 msgstr "Salvar imagem"
 
-#: src/gtkimhtml.c:2837
+#: src/gtkimhtml.c:2921
 msgid "_Save Image..."
 msgstr "_Salvar imagem..."
 
@@ -3354,15 +3363,15 @@
 msgid "Select Background Color"
 msgstr "Selecionar cor de fundo"
 
-#: src/gtkimhtmltoolbar.c:392
+#: src/gtkimhtmltoolbar.c:394
 msgid "_URL"
 msgstr "_URL"
 
-#: src/gtkimhtmltoolbar.c:397
+#: src/gtkimhtmltoolbar.c:402
 msgid "_Description"
 msgstr "_Descri巽達o"
 
-#: src/gtkimhtmltoolbar.c:400
+#: src/gtkimhtmltoolbar.c:405
 msgid ""
 "Please enter the URL and description of the link that you want to insert. "
 "The description is optional."
@@ -3370,86 +3379,87 @@
 "Por favor digite a URL e a descri巽達o do link que voc棚 gostaria de inserir.  "
 "A descri巽達o 辿 opcional."
 
-#: src/gtkimhtmltoolbar.c:404
+#: src/gtkimhtmltoolbar.c:409
 msgid "Please enter the URL of the link that you want to insert."
 msgstr "Por favor digite a URL do link que voc棚 gostaria de inserir."
 
-#: src/gtkimhtmltoolbar.c:409
+#: src/gtkimhtmltoolbar.c:414
 msgid "Insert Link"
 msgstr "Inserir link"
 
-#: src/gtkimhtmltoolbar.c:413
+#: src/gtkimhtmltoolbar.c:418
 msgid "_Insert"
 msgstr "_Inserir"
 
-#: src/gtkimhtmltoolbar.c:481
+#: src/gtkimhtmltoolbar.c:487
 #, c-format
 msgid "Failed to store image: %s\n"
 msgstr "Imposs鱈vel armazenar imagem: %s\n"
 
-#: src/gtkimhtmltoolbar.c:507 src/gtkimhtmltoolbar.c:517
+#: src/gtkimhtmltoolbar.c:513 src/gtkimhtmltoolbar.c:523
 msgid "Insert Image"
 msgstr "Inserir imagem"
 
-#: src/gtkimhtmltoolbar.c:655
+#: src/gtkimhtmltoolbar.c:661
 msgid "This theme has no available smileys."
 msgstr "Este tema n達o possui emoticons dispon鱈veis."
 
 #. show everything
-#: src/gtkimhtmltoolbar.c:670
+#: src/gtkimhtmltoolbar.c:676
 msgid "Smile!"
 msgstr "Emoticon!"
 
-#: src/gtkimhtmltoolbar.c:888
+#: src/gtkimhtmltoolbar.c:894
 msgid "Bold"
 msgstr "Negrito"
 
-#: src/gtkimhtmltoolbar.c:899
+#: src/gtkimhtmltoolbar.c:905
 msgid "Italic"
 msgstr "It叩lico"
 
-#: src/gtkimhtmltoolbar.c:910
+#: src/gtkimhtmltoolbar.c:916
 msgid "Underline"
 msgstr "Sublinhado"
 
-#: src/gtkimhtmltoolbar.c:926
+#: src/gtkimhtmltoolbar.c:932
 msgid "Larger font size"
 msgstr "Maior tamanho de fonte"
 
-#: src/gtkimhtmltoolbar.c:938
+#: src/gtkimhtmltoolbar.c:944
 msgid "Smaller font size"
 msgstr "Menor tamanho de fonte"
 
-#: src/gtkimhtmltoolbar.c:955
+#: src/gtkimhtmltoolbar.c:961
 msgid "Font Face"
 msgstr "Fonte"
 
-#: src/gtkimhtmltoolbar.c:967
+#: src/gtkimhtmltoolbar.c:973
 msgid "Foreground font color"
 msgstr "Cor da fonte"
 
-#: src/gtkimhtmltoolbar.c:979
+#: src/gtkimhtmltoolbar.c:985
 msgid "Background color"
 msgstr "Cor do fundo"
 
-#: src/gtkimhtmltoolbar.c:994
+#: src/gtkimhtmltoolbar.c:1000
 msgid "Insert link"
 msgstr "Inserir link"
 
-#: src/gtkimhtmltoolbar.c:1004
+#: src/gtkimhtmltoolbar.c:1010
 msgid "Insert image"
 msgstr "Inserir imagem"
 
-#: src/gtkimhtmltoolbar.c:1015
+#: src/gtkimhtmltoolbar.c:1021
 msgid "Insert smiley"
 msgstr "Inserir emoticon"
 
 #: src/gtklog.c:302
-msgid "Conversations with"
-msgstr "Conversas com"
+#, c-format
+msgid "Conversations with %s"
+msgstr "Conversas com %s"
 
 #. Window **********
-#: src/gtklog.c:392 src/gtklog.c:408
+#: src/gtklog.c:395 src/gtklog.c:411
 msgid "System Log"
 msgstr "Log do sistema"
 
@@ -3493,22 +3503,22 @@
 "\n"
 "%s"
 
-#: src/gtknotify.c:429
+#: src/gtknotify.c:421
 #, c-format
 msgid "The browser command \"%s\" is invalid."
 msgstr "O comando de navegador \"%s\" 辿 inv叩lido."
 
-#: src/gtknotify.c:432 src/gtknotify.c:446 src/gtknotify.c:461
-#: src/gtknotify.c:579
+#: src/gtknotify.c:424 src/gtknotify.c:438 src/gtknotify.c:453
+#: src/gtknotify.c:571
 msgid "Unable to open URL"
 msgstr "Imposs鱈vel abrir URL"
 
-#: src/gtknotify.c:443 src/gtknotify.c:458
+#: src/gtknotify.c:435 src/gtknotify.c:450
 #, c-format
 msgid "Error launching \"%s\": %s"
 msgstr "Erro ao executar \"%s\": %s"
 
-#: src/gtknotify.c:580
+#: src/gtknotify.c:572
 msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr ""
@@ -3524,7 +3534,7 @@
 msgstr "Favor digitar o amigo que ter叩 a notifica巽達o."
 
 #. "New Buddy Pounce"
-#: src/gtkpounce.c:387 src/gtkpounce.c:890
+#: src/gtkpounce.c:387 src/gtkpounce.c:889
 msgid "New Buddy Pounce"
 msgstr "Nova notifica巽達o de amigo"
 
@@ -3533,138 +3543,138 @@
 msgstr "Editar notifica巽達o de amigo"
 
 #. Create the "Pounce Who" frame.
-#: src/gtkpounce.c:405
+#: src/gtkpounce.c:404
 msgid "Pounce Who"
 msgstr "Quem ter叩 a notifica巽達o"
 
-#: src/gtkpounce.c:432
+#: src/gtkpounce.c:431
 msgid "_Buddy name:"
 msgstr "_Nome do amigo:"
 
 #. Create the "Pounce When" frame.
-#: src/gtkpounce.c:456
+#: src/gtkpounce.c:455
 msgid "Pounce When"
 msgstr "Quando notificar"
 
-#: src/gtkpounce.c:464 src/main.c:296
-msgid "_Sign on"
+#: src/gtkpounce.c:463
+msgid "Si_gn on"
 msgstr "_Conectar"
 
-#: src/gtkpounce.c:466
+#: src/gtkpounce.c:465
 msgid "Sign _off"
 msgstr "_Desconectar"
 
-#: src/gtkpounce.c:468
+#: src/gtkpounce.c:467
 msgid "A_way"
 msgstr "_Ausente"
 
-#: src/gtkpounce.c:470
-msgid "Re_turn from away"
-msgstr "Vol_tar do 'Ausente'"
-
-#: src/gtkpounce.c:472
+#: src/gtkpounce.c:469
+msgid "_Return from away"
+msgstr "Volta_r da aus棚ncia"
+
+#: src/gtkpounce.c:471
 msgid "_Idle"
 msgstr "_Inativo"
 
-#: src/gtkpounce.c:474
+#: src/gtkpounce.c:473
 msgid "Retur_n from idle"
 msgstr "Voltar do 'I_nativo'"
 
-#: src/gtkpounce.c:476
+#: src/gtkpounce.c:475
 msgid "Buddy starts _typing"
 msgstr "A_migo come巽ar a digitar"
 
-#: src/gtkpounce.c:478
+#: src/gtkpounce.c:477
 msgid "Buddy stops t_yping"
 msgstr "Amigo parar de di_gitar"
 
 #. Create the "Pounce Action" frame.
-#: src/gtkpounce.c:507
+#: src/gtkpounce.c:506
 msgid "Pounce Action"
 msgstr "A巽達o usada para notificar"
 
-#: src/gtkpounce.c:515
+#: src/gtkpounce.c:514
 msgid "Op_en an IM window"
 msgstr "Abrir uma jan_ela de mensagem instant但nea"
 
-#: src/gtkpounce.c:517
+#: src/gtkpounce.c:516
 msgid "_Popup notification"
 msgstr "Exibir notifica巽達o _popup"
 
-#: src/gtkpounce.c:519
+#: src/gtkpounce.c:518
 msgid "Send a _message"
 msgstr "En_viar uma mensagem"
 
-#: src/gtkpounce.c:521
+#: src/gtkpounce.c:520
 msgid "E_xecute a command"
 msgstr "E_xecutar um comando"
 
-#: src/gtkpounce.c:523
+#: src/gtkpounce.c:522
 msgid "P_lay a sound"
 msgstr "Tocar um _som"
 
-#: src/gtkpounce.c:527
+#: src/gtkpounce.c:526
 msgid "B_rowse..."
 msgstr "_Procurar..."
 
+#: src/gtkpounce.c:528
+msgid "Bro_wse..."
+msgstr "Pro_curar..."
+
 #: src/gtkpounce.c:529
-msgid "Bro_wse..."
-msgstr "Pro_curar..."
-
-#: src/gtkpounce.c:530
 msgid "Pre_view"
 msgstr "Pr辿-_visualizar"
 
-#: src/gtkpounce.c:613
+#: src/gtkpounce.c:612
 msgid "Sav_e this pounce after activation"
 msgstr "_Salvar esta notifica巽達o ap坦s ativa巽達o"
 
 #. "Remove Buddy Pounce"
-#: src/gtkpounce.c:897
+#: src/gtkpounce.c:896
 msgid "Remove Buddy Pounce"
 msgstr "Remover notifica巽達o de amigo"
 
-#: src/gtkpounce.c:961
+#: src/gtkpounce.c:960
 #, c-format
 msgid "%s has started typing to you (%s)"
 msgstr "%s come巽ou a digitar para voc棚 (%s)"
 
-#: src/gtkpounce.c:963
+#: src/gtkpounce.c:962
 #, c-format
 msgid "%s has signed on (%s)"
 msgstr "%s conectou (%s)"
 
-#: src/gtkpounce.c:965
+#: src/gtkpounce.c:964
 #, c-format
 msgid "%s has returned from being idle (%s)"
 msgstr "%s voltou do estado 'Inativo' (%s)"
 
-#: src/gtkpounce.c:967
+#: src/gtkpounce.c:966
 #, c-format
 msgid "%s has returned from being away (%s)"
 msgstr "%s voltou do estado 'Ausente' (%s)"
 
-#: src/gtkpounce.c:969
+#: src/gtkpounce.c:968
 #, c-format
 msgid "%s has stopped typing to you (%s)"
 msgstr "%s parou de digitar para voc棚 (%s)"
 
-#: src/gtkpounce.c:971
+#: src/gtkpounce.c:970
 #, c-format
 msgid "%s has signed off (%s)"
 msgstr "%s desconectou (%s)"
 
-#: src/gtkpounce.c:973
+#: src/gtkpounce.c:972
 #, c-format
 msgid "%s has become idle (%s)"
 msgstr "%s se tornou inativo (%s)"
 
-#: src/gtkpounce.c:975
+#: src/gtkpounce.c:974
 #, c-format
 msgid "%s has gone away. (%s)"
 msgstr "%s se tornou ausente. (%s)"
 
-#: src/gtkpounce.c:976
+#: src/gtkpounce.c:975
 msgid "Unknown pounce event. Please report this!"
 msgstr "Evento de notifica巽達o desconhecido. Por favor reporte isso!"
 
@@ -3688,8 +3698,8 @@
 msgid "Icon"
 msgstr "�cone"
 
-#: src/gtkprefs.c:722 src/gtkprefs.c:2212 src/protocols/jabber/buddy.c:264
-#: src/protocols/jabber/buddy.c:748 src/protocols/jabber/chat.c:701
+#: src/gtkprefs.c:722 src/gtkprefs.c:2194 src/protocols/jabber/buddy.c:264
+#: src/protocols/jabber/buddy.c:748 src/protocols/jabber/chat.c:693
 msgid "Description"
 msgstr "Descri巽達o"
 
@@ -3705,31 +3715,27 @@
 msgid "_Highlight misspelled words"
 msgstr "Destacar palavras mal grafadas"
 
-#: src/gtkprefs.c:827
+#: src/gtkprefs.c:826
 msgid "Ignore c_olors"
 msgstr "Ignorar c_ores"
 
-#: src/gtkprefs.c:829
+#: src/gtkprefs.c:828
 msgid "Ignore font _faces"
 msgstr "Ignorar _fontes"
 
-#: src/gtkprefs.c:831
+#: src/gtkprefs.c:830
 msgid "Ignore font si_zes"
 msgstr "Ignorar _tamanhos de fonte"
 
-#: src/gtkprefs.c:834
-msgid "_Ignore formatting on incoming messages"
-msgstr "_Ignorar formata巽達o nas mensagens que chegam"
-
-#: src/gtkprefs.c:838
+#: src/gtkprefs.c:833
 msgid "Default Formatting"
 msgstr "Formata巽達o padr達o"
 
-#: src/gtkprefs.c:840
+#: src/gtkprefs.c:835
 msgid "_Send default formatting with outgoing messages"
 msgstr "Mandar formata巽達o padr達o nas mensagen_s enviadas"
 
-#: src/gtkprefs.c:872
+#: src/gtkprefs.c:867
 msgid ""
 "This is how your outgoing message text will appear when you use protocols "
 "that support formatting. :)"
@@ -3737,270 +3743,270 @@
 "Sua mensagem enviada aparecer叩 assim quando voc棚 usar protocolos que "
 "suportem formata巽達o. :)"
 
-#: src/gtkprefs.c:875
+#: src/gtkprefs.c:870
 msgid "_Clear Formatting"
 msgstr "_Limpar formata巽達o"
 
-#: src/gtkprefs.c:912
+#: src/gtkprefs.c:907
 msgid "Send Message"
 msgstr "Enviar mensagem"
 
-#: src/gtkprefs.c:913
+#: src/gtkprefs.c:908
 msgid "Enter _sends message"
 msgstr "Enter _envia mensagem"
 
-#: src/gtkprefs.c:915
+#: src/gtkprefs.c:910
 msgid "C_ontrol-Enter sends message"
 msgstr "C_ontrol-Enter envia mensagem"
 
-#: src/gtkprefs.c:918
+#: src/gtkprefs.c:913
 msgid "Window Closing"
 msgstr "Fechar janelas"
 
-#: src/gtkprefs.c:919
+#: src/gtkprefs.c:914
 msgid "_Escape closes window"
 msgstr "_ESC fecha janela"
 
-#: src/gtkprefs.c:922
+#: src/gtkprefs.c:917
 msgid "Insertions"
 msgstr "Inser巽探es"
 
-#: src/gtkprefs.c:923
+#: src/gtkprefs.c:918
 msgid "Control-{B/I/U} changes _formatting"
 msgstr "Control-{B/I/U} muda _formata巽達o"
 
-#: src/gtkprefs.c:925
+#: src/gtkprefs.c:920
 msgid "Control-(number) _inserts smileys"
 msgstr "Control-(n炭mero) _insere emoticons"
 
-#: src/gtkprefs.c:941
+#: src/gtkprefs.c:936
 msgid "Buddy List Sorting"
 msgstr "Ordena巽達o da lista de amigos"
 
-#: src/gtkprefs.c:950
+#: src/gtkprefs.c:945
 msgid "_Sorting:"
 msgstr "_Ordena巽達o:"
 
-#: src/gtkprefs.c:956 src/gtkprefs.c:1009
+#: src/gtkprefs.c:951 src/gtkprefs.c:1003
 msgid "Show _buttons as:"
 msgstr "Mostrar _bot探es como:"
 
-#: src/gtkprefs.c:958 src/gtkprefs.c:1011
+#: src/gtkprefs.c:953 src/gtkprefs.c:1005
 msgid "Pictures"
 msgstr "Figuras"
 
-#: src/gtkprefs.c:959 src/gtkprefs.c:1012
+#: src/gtkprefs.c:954 src/gtkprefs.c:1006
 msgid "Text"
 msgstr "Texto"
 
-#: src/gtkprefs.c:960 src/gtkprefs.c:1013
+#: src/gtkprefs.c:955 src/gtkprefs.c:1007
 msgid "Pictures and text"
 msgstr "Figuras e texto"
 
-#: src/gtkprefs.c:963
+#: src/gtkprefs.c:958
 msgid "_Raise window on events"
 msgstr "_Colocar janela no topo quando ocorrerem eventos"
 
-#: src/gtkprefs.c:966
+#: src/gtkprefs.c:961
 msgid "Buddy Display"
 msgstr "Exibi巽達o de amigos"
 
-#: src/gtkprefs.c:967 src/gtkprefs.c:1027
+#: src/gtkprefs.c:962 src/gtkprefs.c:1020
 msgid "Show buddy _icons"
 msgstr "Mostrar 鱈_cones de amigos"
 
-#: src/gtkprefs.c:969
+#: src/gtkprefs.c:964
 msgid "Show _warning levels"
 msgstr "Mostrar _n鱈veis de alerta"
 
-#: src/gtkprefs.c:971
+#: src/gtkprefs.c:966
 msgid "Show idle _times"
 msgstr "Mostrar _tempo de inatividade"
 
-#: src/gtkprefs.c:973
+#: src/gtkprefs.c:968
 msgid "Dim i_dle buddies"
 msgstr "Turvar amigos in_ativos"
 
-#: src/gtkprefs.c:975
+#: src/gtkprefs.c:970
 msgid "_Automatically expand contacts"
 msgstr "Expandir contatos _automaticamente"
 
-#: src/gtkprefs.c:1020
+#: src/gtkprefs.c:1013
 msgid "Enable \"_slash\" commands"
 msgstr "Ativar comando_s iniciados por barra"
 
-#: src/gtkprefs.c:1023
+#: src/gtkprefs.c:1016
 msgid "Show _formatting toolbar"
 msgstr "Mostrar barra de _ferramentas de formata巽達o"
 
-#: src/gtkprefs.c:1025
+#: src/gtkprefs.c:1018
 msgid "Show _aliases in tabs/titles"
 msgstr "Mostrar _apelidos em abas/t鱈tulos"
 
-#: src/gtkprefs.c:1029
+#: src/gtkprefs.c:1022
 msgid "Enable buddy ic_on animation"
 msgstr "Ativar anima巽達o nos 鱈c_ones de amigos"
 
-#: src/gtkprefs.c:1031
+#: src/gtkprefs.c:1024
 msgid "_Notify buddies that you are typing to them"
 msgstr "_Notificar amigos de que voc棚 est叩 digitando para eles"
 
-#: src/gtkprefs.c:1033
+#: src/gtkprefs.c:1026
 msgid "_Raise IM window on events"
 msgstr ""
 "Coloca_r janela de mensagem instant但nea no topo quando ocorrerem eventos"
 
-#: src/gtkprefs.c:1036
+#: src/gtkprefs.c:1029
 msgid "Raise chat _window on events"
 msgstr "Colocar janela de bate-papo no topo quando ocorrerem e_ventos"
 
-#: src/gtkprefs.c:1038
+#: src/gtkprefs.c:1031
 msgid "Use _multi-colored screen names in chats"
 msgstr "Usar nomes de usu叩rio _multi-coloridos nos bate-papos"
 
 #. All the tab options!
-#: src/gtkprefs.c:1042
+#: src/gtkprefs.c:1035
 msgid "Tab Options"
 msgstr "Op巽探es de abas"
 
-#: src/gtkprefs.c:1044
+#: src/gtkprefs.c:1037
 msgid "Show IMs and chats in _tabbed windows"
 msgstr "Mostrar mensagens instant但neas e bate-papos em janelas com _abas"
 
-#: src/gtkprefs.c:1059
+#: src/gtkprefs.c:1052
 msgid "Show _close button on tabs"
 msgstr "Mostrar o bot達o de _fechar nas abas"
 
-#: src/gtkprefs.c:1062
+#: src/gtkprefs.c:1055
 msgid "Tab p_lacement:"
 msgstr "Po_si巽達o das abas:"
 
-#: src/gtkprefs.c:1064
+#: src/gtkprefs.c:1057
 msgid "Top"
 msgstr "Cima"
 
-#: src/gtkprefs.c:1065
+#: src/gtkprefs.c:1058
 msgid "Bottom"
 msgstr "Baixo"
 
-#: src/gtkprefs.c:1066
+#: src/gtkprefs.c:1059
 msgid "Left"
 msgstr "Esquerda"
 
-#: src/gtkprefs.c:1067
+#: src/gtkprefs.c:1060
 msgid "Right"
 msgstr "Direita"
 
-#: src/gtkprefs.c:1073
+#: src/gtkprefs.c:1066
 msgid "New conversation _placement:"
 msgstr "Nova _posi巽達o das conversas:"
 
-#: src/gtkprefs.c:1124 src/protocols/oscar/oscar.c:596
-#: src/protocols/oscar/oscar.c:4855
+#: src/gtkprefs.c:1117 src/protocols/oscar/oscar.c:580
+#: src/protocols/oscar/oscar.c:4850
 msgid "IP Address"
 msgstr "Endere巽o IP"
 
-#: src/gtkprefs.c:1126
+#: src/gtkprefs.c:1119
 msgid "_Autodetect IP Address"
 msgstr "Detectar endere巽o IP _automaticamente"
 
-#: src/gtkprefs.c:1135
+#: src/gtkprefs.c:1128
 msgid "Public _IP:"
 msgstr "_IP p炭blico:"
 
-#: src/gtkprefs.c:1159
+#: src/gtkprefs.c:1152
 msgid "Ports"
 msgstr "Portas"
 
-#: src/gtkprefs.c:1162
+#: src/gtkprefs.c:1155
 msgid "_Manually specify range of ports to listen on"
 msgstr "Especificar _manualmente as portas a escutar"
 
+#: src/gtkprefs.c:1158
+msgid "_Start Port:"
+msgstr "_Porta inicial:"
+
 #: src/gtkprefs.c:1165
-msgid "_Start Port:"
-msgstr "_Porta inicial:"
+msgid "_End Port:"
+msgstr "_Porta final:"
 
 #: src/gtkprefs.c:1172
-msgid "_End Port:"
-msgstr "_Porta final:"
-
-#: src/gtkprefs.c:1179
 msgid "Proxy Server"
 msgstr "Servidor proxy"
 
-#: src/gtkprefs.c:1183
+#: src/gtkprefs.c:1176
 msgid "No proxy"
 msgstr "Nenhum proxy"
 
-#: src/gtkprefs.c:1245
+#: src/gtkprefs.c:1238
 msgid "_User:"
 msgstr "_Usu叩rio:"
 
-#: src/gtkprefs.c:1301
+#: src/gtkprefs.c:1294
 msgid "Epiphany"
 msgstr "Epiphany"
 
-#: src/gtkprefs.c:1302
+#: src/gtkprefs.c:1295
 msgid "Firebird"
 msgstr "Firebird"
 
-#: src/gtkprefs.c:1303
+#: src/gtkprefs.c:1296
 msgid "Firefox"
 msgstr "Firefox"
 
-#: src/gtkprefs.c:1304
+#: src/gtkprefs.c:1297
 msgid "Galeon"
 msgstr "Galeon"
 
-#: src/gtkprefs.c:1305
+#: src/gtkprefs.c:1298
 msgid "Gnome Default"
 msgstr "Padr達o do Gnome"
 
-#: src/gtkprefs.c:1306
+#: src/gtkprefs.c:1299
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: src/gtkprefs.c:1307
+#: src/gtkprefs.c:1300
 msgid "Mozilla"
 msgstr "Mozilla"
 
-#: src/gtkprefs.c:1308
+#: src/gtkprefs.c:1301
 msgid "Netscape"
 msgstr "Netscape"
 
-#: src/gtkprefs.c:1309
+#: src/gtkprefs.c:1302
 msgid "Opera"
 msgstr "Opera"
 
-#: src/gtkprefs.c:1318
+#: src/gtkprefs.c:1311
 msgid "Manual"
 msgstr "Manual"
 
-#: src/gtkprefs.c:1369
+#: src/gtkprefs.c:1362
 msgid "Browser Selection"
 msgstr "Sele巽達o do navegador"
 
-#: src/gtkprefs.c:1373
+#: src/gtkprefs.c:1366
 msgid "_Browser:"
 msgstr "_Navegador:"
 
-#: src/gtkprefs.c:1380
+#: src/gtkprefs.c:1373
 msgid "_Open link in:"
 msgstr "_Abrir link no:"
 
-#: src/gtkprefs.c:1382
+#: src/gtkprefs.c:1375
 msgid "Browser default"
 msgstr "Navegador padr達o"
 
-#: src/gtkprefs.c:1383
+#: src/gtkprefs.c:1376
 msgid "Existing window"
 msgstr "Janela existente"
 
-#: src/gtkprefs.c:1385
+#: src/gtkprefs.c:1378
 msgid "New tab"
 msgstr "Nova aba"
 
-#: src/gtkprefs.c:1399
+#: src/gtkprefs.c:1392
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -4009,83 +4015,83 @@
 "_Manual:\n"
 "(%s para URL)"
 
-#: src/gtkprefs.c:1436
+#: src/gtkprefs.c:1429
 msgid "Message Logs"
 msgstr "Logs de conversas"
 
-#: src/gtkprefs.c:1439
+#: src/gtkprefs.c:1432
 msgid "Log _Format:"
 msgstr "_Formato do log:"
 
-#: src/gtkprefs.c:1442
+#: src/gtkprefs.c:1435
 msgid "_Log all instant messages"
 msgstr "_Gravar todas as mensagens instant但neas"
 
-#: src/gtkprefs.c:1444
+#: src/gtkprefs.c:1437
 msgid "Log all c_hats"
 msgstr "Gravar todos os _bate-papos"
 
-#: src/gtkprefs.c:1447
+#: src/gtkprefs.c:1440
 msgid "System Logs"
 msgstr "Logs do sistema"
 
-#: src/gtkprefs.c:1449
+#: src/gtkprefs.c:1442
 msgid "_Enable system log"
 msgstr "Ativar logs do sist_ema"
 
-#: src/gtkprefs.c:1452
+#: src/gtkprefs.c:1445
 msgid "Log when buddies _sign on/sign off"
 msgstr "Gravar quando amigos conectarem ou de_sconectarem"
 
-#: src/gtkprefs.c:1458
+#: src/gtkprefs.c:1451
 msgid "Log when buddies become _idle/un-idle"
 msgstr "Gravar quando amigos ficarem inativos ou voltarem da inatividade"
 
-#: src/gtkprefs.c:1464
+#: src/gtkprefs.c:1457
 msgid "Log when buddies go away/come _back"
 msgstr "Gravar quando amigos ficarem ausentes ou voltarem da aus棚ncia"
 
-#: src/gtkprefs.c:1470
+#: src/gtkprefs.c:1463
 msgid "Log your _own signons/idleness/awayness"
 msgstr "Gravar suas pr坦prias conex探es/inatividades/aus棚ncias"
 
-#: src/gtkprefs.c:1596
+#: src/gtkprefs.c:1589
 msgid "Sound Selection"
 msgstr "Sele巽達o de som"
 
-#: src/gtkprefs.c:1647
+#: src/gtkprefs.c:1640
 msgid "Sound Options"
 msgstr "Op巽探es de som"
 
-#: src/gtkprefs.c:1648
+#: src/gtkprefs.c:1641
 msgid "Sounds when conversation has _focus"
 msgstr "Sons quando a janela da conversa _ganhar foco"
 
-#: src/gtkprefs.c:1650
+#: src/gtkprefs.c:1643
 msgid "_Sounds while away"
 msgstr "_Sons enquanto ausente"
 
-#: src/gtkprefs.c:1654
+#: src/gtkprefs.c:1647
 msgid "Sound Method"
 msgstr "M辿todo para reproduzir o som"
 
-#: src/gtkprefs.c:1655
+#: src/gtkprefs.c:1648
 msgid "_Method:"
 msgstr "_M辿todo:"
 
-#: src/gtkprefs.c:1657
+#: src/gtkprefs.c:1650
 msgid "Console beep"
 msgstr "Bipe do console"
 
+#: src/gtkprefs.c:1652
+msgid "Automatic"
+msgstr "Autom叩tico"
+
 #: src/gtkprefs.c:1659
-msgid "Automatic"
-msgstr "Autom叩tico"
-
-#: src/gtkprefs.c:1666
 msgid "Command"
 msgstr "Comando"
 
-#: src/gtkprefs.c:1674
+#: src/gtkprefs.c:1667
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -4094,86 +4100,90 @@
 "C_omando do som:\n"
 "(%s para nome do arquivo)"
 
-#: src/gtkprefs.c:1701
+#: src/gtkprefs.c:1694
 msgid "Sound Events"
 msgstr "Eventos de som"
 
-#: src/gtkprefs.c:1752
+#: src/gtkprefs.c:1745
 msgid "Play"
 msgstr "Tocar"
 
-#: src/gtkprefs.c:1759
+#: src/gtkprefs.c:1752
 msgid "Event"
 msgstr "Evento"
 
-#: src/gtkprefs.c:1778
+#: src/gtkprefs.c:1771
 msgid "Test"
 msgstr "Testar"
 
-#: src/gtkprefs.c:1782
+#: src/gtkprefs.c:1775
 msgid "Reset"
 msgstr "Redefinir"
 
-#: src/gtkprefs.c:1786
+#: src/gtkprefs.c:1779
 msgid "Choose..."
 msgstr "Escolher..."
 
-#: src/gtkprefs.c:1810
+#: src/gtkprefs.c:1803
 msgid "_Queue new messages when away"
 msgstr "_Ocultar novas mensagens quando ausente"
 
-#: src/gtkprefs.c:1813
-msgid "Auto-response"
-msgstr "Auto-resposta"
-
-#: src/gtkprefs.c:1814
-msgid "_Send auto-response"
-msgstr "_Enviar auto-resposta"
-
-#: src/gtkprefs.c:1816
-msgid "_Only send auto-response when idle"
-msgstr "_Apenas enviar auto-resposta quando inativo"
-
-#: src/gtkprefs.c:1819 src/protocols/msn/msn.c:1179
-#: src/protocols/msn/state.c:32 src/protocols/novell/novell.c:2730
-#: src/protocols/oscar/oscar.c:4011 src/protocols/yahoo/yahoo.c:2511
+#: src/gtkprefs.c:1806
+msgid "_Auto-reply:"
+msgstr "_Auto-resposta:"
+
+#: src/gtkprefs.c:1808
+msgid "Never"
+msgstr "Nunca"
+
+#: src/gtkprefs.c:1809
+msgid "Only when away"
+msgstr "Apenas quando ausente"
+
+#: src/gtkprefs.c:1810
+msgid "Only when away and idle"
+msgstr "Apenas quando ausente e inativo"
+
+#: src/gtkprefs.c:1813 src/protocols/msn/msn.c:1179
+#: src/protocols/msn/state.c:32 src/protocols/novell/novell.c:2777
+#: src/protocols/oscar/oscar.c:4003 src/protocols/yahoo/yahoo.c:2554
 #: src/protocols/yahoo/yahoo_profile.c:664
 msgid "Idle"
 msgstr "Inativo"
 
-#: src/gtkprefs.c:1820
+#: src/gtkprefs.c:1814
 msgid "Idle _time reporting:"
 msgstr "Inatividade reportada em rela巽達o a:"
 
-#: src/gtkprefs.c:1823
+#: src/gtkprefs.c:1817
 msgid "Gaim usage"
 msgstr "Utiliza巽達o do Gaim"
 
-#: src/gtkprefs.c:1826
+#: src/gtkprefs.c:1820
 msgid "X usage"
 msgstr "Utiliza巽達o do X"
 
-#: src/gtkprefs.c:1828
+#: src/gtkprefs.c:1822
 msgid "Windows usage"
 msgstr "Utiliza巽達o do Windows"
 
-#: src/gtkprefs.c:1836
+#: src/gtkprefs.c:1830
 msgid "Auto-away"
 msgstr "Auto-away"
 
-#: src/gtkprefs.c:1837
+#: src/gtkprefs.c:1831
 msgid "Set away _when idle"
 msgstr "Definir status de 'Ausente' _quanto inativo"
 
-#: src/gtkprefs.c:1841
+#: src/gtkprefs.c:1835
 msgid "_Minutes before setting away:"
 msgstr "_Minutos antes de definir o status de 'Ausente':"
 
-#: src/gtkprefs.c:1849
+#: src/gtkprefs.c:1843
 msgid "Away m_essage:"
 msgstr "M_ensagem de aus棚ncia:"
 
-#: src/gtkprefs.c:1930
+#: src/gtkprefs.c:1912
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -4188,7 +4198,7 @@
 "<span weight=\"bold\">P叩gina da web:</span>\t\t%s\n"
 "<span weight=\"bold\">Nome do arquivo:</span>\t%s"
 
-#: src/gtkprefs.c:1935
+#: src/gtkprefs.c:1917
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -4203,64 +4213,64 @@
 "<span weight=\"bold\">URL:</span>  %s\n"
 "<span weight=\"bold\">Nome do arquivo:</span>  %s"
 
-#: src/gtkprefs.c:2168
+#: src/gtkprefs.c:2150
 msgid "Load"
 msgstr "Carregar"
 
-#: src/gtkprefs.c:2182
+#: src/gtkprefs.c:2164
 msgid "Summary"
 msgstr "Sum叩rio"
 
-#: src/gtkprefs.c:2230
+#: src/gtkprefs.c:2212
 msgid "Details"
 msgstr "Detalhes"
 
-#: src/gtkprefs.c:2375
+#: src/gtkprefs.c:2357
 msgid "_Edit"
 msgstr "_Editar"
 
-#: src/gtkprefs.c:2411
+#: src/gtkprefs.c:2393
 msgid "Interface"
 msgstr "Interface"
 
-#: src/gtkprefs.c:2414
+#: src/gtkprefs.c:2396
 msgid "Message Text"
 msgstr "Texto das mensagens"
 
-#: src/gtkprefs.c:2415
+#: src/gtkprefs.c:2397
 msgid "Shortcuts"
 msgstr "Atalhos"
 
-#: src/gtkprefs.c:2416
+#: src/gtkprefs.c:2398
 msgid "Smiley Themes"
 msgstr "Temas de emoticons"
 
-#: src/gtkprefs.c:2417
+#: src/gtkprefs.c:2399
 msgid "Sounds"
 msgstr "Sons"
 
-#: src/gtkprefs.c:2418
+#: src/gtkprefs.c:2400
 msgid "Network"
 msgstr "Rede"
 
 #. We use the registered default browser in windows
-#: src/gtkprefs.c:2421
+#: src/gtkprefs.c:2403
 msgid "Browser"
 msgstr "Navegador"
 
-#: src/gtkprefs.c:2423
+#: src/gtkprefs.c:2405
 msgid "Logging"
 msgstr "Gravando"
 
-#: src/gtkprefs.c:2424
+#: src/gtkprefs.c:2406
 msgid "Away / Idle"
 msgstr "Ausente / Inativo"
 
-#: src/gtkprefs.c:2425
+#: src/gtkprefs.c:2407
 msgid "Away Messages"
 msgstr "Mensagens de away"
 
-#: src/gtkprefs.c:2428
+#: src/gtkprefs.c:2410
 msgid "Plugins"
 msgstr "Plugins"
 
@@ -4284,65 +4294,65 @@
 msgid "Block only the users below"
 msgstr "Bloquear apenas os usu叩rios abaixo"
 
-#: src/gtkprivacy.c:385 src/protocols/jabber/jabber.c:1449
+#: src/gtkprivacy.c:385 src/protocols/jabber/jabber.c:1466
 msgid "Privacy"
 msgstr "Privacidade"
 
-#: src/gtkprivacy.c:400
+#: src/gtkprivacy.c:398
 msgid "Changes to privacy settings take effect immediately."
 msgstr ""
 "Mudan巽as nas configura巽探es de privacidade entram em efeito imediatamente."
 
 #. "Set privacy for:" label
-#: src/gtkprivacy.c:412
+#: src/gtkprivacy.c:410
 msgid "Set privacy for:"
 msgstr "Definir privacidade para:"
 
-#: src/gtkprivacy.c:581 src/gtkprivacy.c:597
+#: src/gtkprivacy.c:579 src/gtkprivacy.c:595
 msgid "Permit User"
 msgstr "Permitir usu叩rio"
 
-#: src/gtkprivacy.c:582
+#: src/gtkprivacy.c:580
 msgid "Type a user you permit to contact you."
 msgstr "Digite um usu叩rio que voc棚 permite que o contate."
 
-#: src/gtkprivacy.c:583
+#: src/gtkprivacy.c:581
 msgid "Please enter the name of the user you wish to be able to contact you."
 msgstr ""
 "Favor digitar o nome do usu叩rio que voc棚 gostaria que pudesse contatar voc棚."
 
-#: src/gtkprivacy.c:586 src/gtkprivacy.c:599
+#: src/gtkprivacy.c:584 src/gtkprivacy.c:597
 msgid "Permit"
 msgstr "Permitir"
 
-#: src/gtkprivacy.c:591
+#: src/gtkprivacy.c:589
 #, c-format
 msgid "Allow %s to contact you?"
 msgstr "Permitir que %s te contate?"
 
-#: src/gtkprivacy.c:593
+#: src/gtkprivacy.c:591
 #, c-format
 msgid "Are you sure you wish to allow %s to contact you?"
 msgstr "Voc棚 tem certeza de que deseja permitir que %s te contate?"
 
-#: src/gtkprivacy.c:620 src/gtkprivacy.c:633
+#: src/gtkprivacy.c:618 src/gtkprivacy.c:631
 msgid "Block User"
 msgstr "Bloquear o usu叩rio"
 
-#: src/gtkprivacy.c:621
+#: src/gtkprivacy.c:619
 msgid "Type a user to block."
 msgstr "Digite um usu叩rio para bloquear."
 
-#: src/gtkprivacy.c:622
+#: src/gtkprivacy.c:620
 msgid "Please enter the name of the user you wish to block."
 msgstr "Por favor digite o nome do usu叩rio que voc棚 deseja bloquear."
 
-#: src/gtkprivacy.c:629
+#: src/gtkprivacy.c:627
 #, c-format
 msgid "Block %s?"
 msgstr "Bloquear %s?"
 
-#: src/gtkprivacy.c:631
+#: src/gtkprivacy.c:629
 #, c-format
 msgid "Are you sure you want to block %s?"
 msgstr "Voc棚 tem certeza de que deseja bloquear %s?"
@@ -4351,13 +4361,13 @@
 #. * A wrapper for gaim_request_action() that uses Yes and No buttons.
 #.
 #: src/gtkrequest.c:240 src/protocols/gg/gg.c:949
-#: src/protocols/novell/novell.c:1845 src/protocols/silc/buddy.c:307
+#: src/protocols/novell/novell.c:1865 src/protocols/silc/buddy.c:307
 #: src/protocols/silc/pk.c:116 src/request.h:1234
 msgid "Yes"
 msgstr "Sim"
 
 #: src/gtkrequest.c:241 src/protocols/gg/gg.c:949
-#: src/protocols/novell/novell.c:1846 src/protocols/silc/buddy.c:308
+#: src/protocols/novell/novell.c:1866 src/protocols/silc/buddy.c:308
 #: src/protocols/silc/pk.c:117 src/request.h:1234
 msgid "No"
 msgstr "N達o"
@@ -4371,19 +4381,19 @@
 msgid "Close"
 msgstr "Fechar"
 
-#: src/gtkrequest.c:1391
+#: src/gtkrequest.c:1392
 msgid "That file already exists"
 msgstr "Este arquivo j叩 existe"
 
-#: src/gtkrequest.c:1392
+#: src/gtkrequest.c:1393
 msgid "Would you like to overwrite it?"
 msgstr "Voc棚 deseja sobrescrev棚-lo?"
 
-#: src/gtkrequest.c:1430 src/gtkrequest.c:1451
+#: src/gtkrequest.c:1431 src/gtkrequest.c:1452
 msgid "Save File..."
 msgstr "Salvar arquivo..."
 
-#: src/gtkrequest.c:1431 src/gtkrequest.c:1452
+#: src/gtkrequest.c:1432 src/gtkrequest.c:1453
 msgid "Open File..."
 msgstr "Abrir arquivo..."
 
@@ -4392,7 +4402,7 @@
 msgstr "Lista de salas"
 
 #. list button
-#: src/gtkroomlist.c:402
+#: src/gtkroomlist.c:401
 msgid "_Get List"
 msgstr "Ob_ter lista"
 
@@ -4467,7 +4477,7 @@
 msgid "XML"
 msgstr "XML"
 
-#: src/log.c:574
+#: src/log.c:575
 #, c-format
 msgid ""
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -4476,7 +4486,7 @@
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
 "RESPOSTA&gt;:</b></font> %s<br/>\n"
 
-#: src/log.c:576
+#: src/log.c:577
 #, c-format
 msgid ""
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -4485,56 +4495,60 @@
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
 "RESPOSTA&gt;:</b></font> %s<br/>\n"
 
-#: src/log.c:627 src/log.c:814
+#: src/log.c:628 src/log.c:815
 msgid "<font color=\"red\"><b>Unable to find log path!</b></font>"
 msgstr ""
 "<font color=\"red\"><b>Imposs鱈vel encontrar o caminho do log!</b></font>"
 
-#: src/log.c:637 src/log.c:826
+#: src/log.c:638 src/log.c:827
 #, c-format
 msgid "<font color=\"red\"><b>Could not read file: %s</b></font>"
 msgstr "<font color=\"red\"><b>N達o foi poss鱈vel ler o arquivo: %s</b></font>"
 
-#: src/log.c:674
+#: src/log.c:675
 msgid "HTML"
 msgstr "HTML"
 
-#: src/log.c:759
+#: src/log.c:760
 #, c-format
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <AUTO-RESPOSTA>: %s\n"
 
-#: src/log.c:859
+#: src/log.c:860
 msgid "Plain text"
 msgstr "Texto puro"
 
-#: src/main.c:153
+#: src/main.c:150
 msgid "Please create an account."
 msgstr "Favor criar uma conta."
 
-#: src/main.c:235
+#: src/main.c:232
 msgid "Login"
 msgstr "Conectar"
 
-#: src/main.c:253
+#: src/main.c:248
 msgid "<b>_Account:</b>"
 msgstr "<b>Cont_a: </b>"
 
-#: src/main.c:267
+#: src/main.c:262
 msgid "<b>_Password:</b>"
 msgstr "<b>_Senha:</b>"
 
 #. And now for the buttons
-#: src/main.c:284
+#: src/main.c:279
 msgid "_Accounts"
 msgstr "Cont_as"
 
-#: src/main.c:290
+#: src/main.c:285
 msgid "_Preferences"
 msgstr "_Prefer棚ncias"
 
+#: src/main.c:291
+msgid "_Sign on"
+msgstr "_Conectar"
+
 #. full help text
-#: src/main.c:520
+#: src/main.c:517
 #, c-format
 msgid ""
 "Gaim %s\n"
@@ -4571,11 +4585,25 @@
 "  -h, --help          mostrar esta ajuda e sair\n"
 
 #. short message
-#: src/main.c:535
+#: src/main.c:532
 #, c-format
 msgid "Gaim %s. Try `%s -h' for more information.\n"
 msgstr "Gaim %s. Tente `%s -h' para mais informa巽探es.\n"
 
+#: src/main.c:845
+msgid "Unable to load preferences"
+msgstr "Imposs鱈vel carregar prefer棚ncias"
+
+#: src/main.c:845
+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 ""
+"O Gaim n達o p担de carregar suas prefer棚ncias porque elas est達o guardadas num "
+"formato que n達o 辿 mais usado. Por favor refa巽a suas configura巽探es usando a "
+"janela de Prefer棚ncias."
+
 #: src/plugin.c:286
 #, c-format
 msgid ""
@@ -4601,10 +4629,10 @@
 #: src/protocols/gg/gg.c:49 src/protocols/jabber/jutil.c:44
 #: src/protocols/msn/msn.c:462 src/protocols/msn/state.c:29
 #: src/protocols/msn/state.c:30 src/protocols/msn/state.c:37
-#: src/protocols/msn/state.c:38 src/protocols/novell/novell.c:2721
-#: src/protocols/novell/novell.c:2840 src/protocols/novell/novell.c:2891
-#: src/protocols/oscar/oscar.c:616 src/protocols/yahoo/yahoo.c:2851
-#: src/protocols/yahoo/yahoo.c:2967
+#: src/protocols/msn/state.c:38 src/protocols/novell/novell.c:2768
+#: src/protocols/novell/novell.c:2887 src/protocols/novell/novell.c:2938
+#: src/protocols/oscar/oscar.c:602 src/protocols/yahoo/yahoo.c:2894
+#: src/protocols/yahoo/yahoo.c:3010
 msgid "Available"
 msgstr "Dispon鱈vel"
 
@@ -4617,11 +4645,11 @@
 msgstr "Ausente apenas para amigos"
 
 #: src/protocols/gg/gg.c:53 src/protocols/jabber/jabber.c:964
-#: src/protocols/jabber/presence.c:126 src/protocols/oscar/oscar.c:536
-#: src/protocols/oscar/oscar.c:5397 src/protocols/oscar/oscar.c:5475
-#: src/protocols/oscar/oscar.c:5499 src/protocols/oscar/oscar.c:6694
-#: src/protocols/oscar/oscar.c:6699 src/protocols/yahoo/yahoo.c:2509
-#: src/protocols/yahoo/yahoo.c:2871 src/protocols/yahoo/yahoo.c:2979
+#: src/protocols/jabber/presence.c:128 src/protocols/oscar/oscar.c:520
+#: src/protocols/oscar/oscar.c:5399 src/protocols/oscar/oscar.c:5477
+#: src/protocols/oscar/oscar.c:5501 src/protocols/oscar/oscar.c:6697
+#: src/protocols/oscar/oscar.c:6702 src/protocols/yahoo/yahoo.c:2552
+#: src/protocols/yahoo/yahoo.c:2914 src/protocols/yahoo/yahoo.c:3022
 msgid "Invisible"
 msgstr "Invis鱈vel"
 
@@ -4637,7 +4665,7 @@
 msgid "Unable to resolve hostname."
 msgstr "Imposs鱈vel resolver endere巽o."
 
-#: src/protocols/gg/gg.c:139 src/protocols/novell/novell.c:1665
+#: src/protocols/gg/gg.c:139 src/protocols/novell/novell.c:1685
 msgid "Unable to connect to server."
 msgstr "Imposs鱈vel conectar ao servidor."
 
@@ -4664,17 +4692,17 @@
 msgid "Unknown Error Code."
 msgstr "C坦digo de erro desconhecido."
 
-#: src/protocols/gg/gg.c:242 src/protocols/oscar/oscar.c:3820
+#: src/protocols/gg/gg.c:242 src/protocols/oscar/oscar.c:3807
 #, c-format
 msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<HR>%s"
 msgstr "<B>UIN:</B> %s<BR><B>Status:</B> %s<HR>%s"
 
 #. res[0] == username
 #: src/protocols/gg/gg.c:243 src/protocols/gg/gg.c:1011
-#: src/protocols/napster/napster.c:393 src/protocols/oscar/oscar.c:3824
-#: src/protocols/oscar/oscar.c:4040 src/protocols/silc/ops.c:1067
-#: src/protocols/silc/ops.c:1128 src/protocols/toc/toc.c:468
-#: src/protocols/zephyr/zephyr.c:635
+#: src/protocols/napster/napster.c:393 src/protocols/oscar/oscar.c:3811
+#: src/protocols/oscar/oscar.c:4032 src/protocols/silc/ops.c:1076
+#: src/protocols/silc/ops.c:1137 src/protocols/toc/toc.c:468
+#: src/protocols/zephyr/zephyr.c:644
 msgid "Buddy Information"
 msgstr "Informa巽探es do amigo"
 
@@ -4694,10 +4722,10 @@
 #. we didn't successfully connect. tdt->toc_fd is valid here
 #: src/protocols/gg/gg.c:674 src/protocols/icq/gaim_icq.c:344
 #: src/protocols/napster/napster.c:475 src/protocols/napster/napster.c:506
-#: src/protocols/toc/toc.c:170 src/protocols/yahoo/yahoo.c:2156
-#: src/protocols/yahoo/yahoo.c:2185 src/protocols/yahoo/yahoo.c:2248
+#: src/protocols/toc/toc.c:170 src/protocols/yahoo/yahoo.c:2199
+#: src/protocols/yahoo/yahoo.c:2228 src/protocols/yahoo/yahoo.c:2291
 #: src/protocols/yahoo/yahoo_filexfer.c:68
-#: src/protocols/yahoo/yahoo_filexfer.c:109
+#: src/protocols/yahoo/yahoo_filexfer.c:109 src/protocols/yahoo/ycht.c:482
 msgid "Unable to connect."
 msgstr "Imposs鱈vel conectar."
 
@@ -4759,26 +4787,26 @@
 msgid "Active"
 msgstr "Ativo"
 
-#: src/protocols/gg/gg.c:953 src/protocols/oscar/oscar.c:4847
+#: src/protocols/gg/gg.c:953 src/protocols/oscar/oscar.c:4842
 msgid "UIN"
 msgstr "UIN"
 
 #. First Name
 #: src/protocols/gg/gg.c:957 src/protocols/jabber/jabber.c:613
-#: src/protocols/oscar/oscar.c:4858 src/protocols/silc/ops.c:790
+#: src/protocols/oscar/oscar.c:4853 src/protocols/silc/ops.c:799
 #: src/protocols/trepia/trepia.c:267
 msgid "First Name"
 msgstr "Nome"
 
 #. Last Name
 #: src/protocols/gg/gg.c:962 src/protocols/jabber/jabber.c:618
-#: src/protocols/oscar/oscar.c:4859 src/protocols/trepia/trepia.c:274
+#: src/protocols/oscar/oscar.c:4854 src/protocols/trepia/trepia.c:274
 msgid "Last Name"
 msgstr "Sobrenome"
 
 #: src/protocols/gg/gg.c:966 src/protocols/gg/gg.c:1707
-#: src/protocols/irc/msgs.c:183 src/protocols/oscar/oscar.c:4848
-#: src/protocols/silc/ops.c:1184
+#: src/protocols/irc/msgs.c:182 src/protocols/oscar/oscar.c:4843
+#: src/protocols/silc/ops.c:1193
 msgid "Nick"
 msgstr "Apelido"
 
@@ -4793,7 +4821,7 @@
 
 #. City
 #: src/protocols/gg/gg.c:990 src/protocols/jabber/jabber.c:628
-#: src/protocols/oscar/oscar.c:4902 src/protocols/oscar/oscar.c:4910
+#: src/protocols/oscar/oscar.c:4897 src/protocols/oscar/oscar.c:4905
 #: src/protocols/trepia/trepia.c:331 src/protocols/trepia/trepia.c:410
 msgid "City"
 msgstr "Cidade"
@@ -4900,7 +4928,7 @@
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
 #: src/protocols/gg/gg.c:1497 src/protocols/jabber/jabber.c:1062
-#: src/protocols/toc/toc.c:1550
+#: src/protocols/toc/toc.c:1551
 msgid "Change Password"
 msgstr "Alterar senha"
 
@@ -4952,15 +4980,15 @@
 msgid "The user %s (%s%s%s%s%s) wants you to authorize them."
 msgstr "O usu叩rio %s (%s%s%s%s%s) quer que voc棚 autorize-o."
 
-#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:232
-#: src/protocols/msn/userlist.c:100 src/protocols/oscar/oscar.c:3555
-#: src/protocols/oscar/oscar.c:6126
+#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:235
+#: src/protocols/msn/userlist.c:100 src/protocols/oscar/oscar.c:3546
+#: src/protocols/oscar/oscar.c:6131
 msgid "Authorize"
 msgstr "Autorizar"
 
-#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:233
-#: src/protocols/msn/userlist.c:101 src/protocols/oscar/oscar.c:3557
-#: src/protocols/oscar/oscar.c:6127
+#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:236
+#: src/protocols/msn/userlist.c:101 src/protocols/oscar/oscar.c:3548
+#: src/protocols/oscar/oscar.c:6132
 msgid "Deny"
 msgstr "Negar"
 
@@ -4985,13 +5013,13 @@
 msgid "Unknown command: %s"
 msgstr "Comando desconhecido: %s"
 
-#: src/protocols/irc/cmds.c:448 src/protocols/jabber/chat.c:544
+#: src/protocols/irc/cmds.c:448 src/protocols/jabber/chat.c:536
 #: src/protocols/silc/silc.c:995
 #, c-format
 msgid "current topic is: %s"
 msgstr "O t坦pico atual 辿: %s"
 
-#: src/protocols/irc/cmds.c:451 src/protocols/jabber/chat.c:546
+#: src/protocols/irc/cmds.c:451 src/protocols/jabber/chat.c:538
 #: src/protocols/silc/silc.c:998
 msgid "No topic is set"
 msgstr "Nenhum t坦pico foi definido"
@@ -5024,51 +5052,51 @@
 msgid "MOTD for %s"
 msgstr "Mensagem do dia (MOTD) para %s"
 
-#: src/protocols/irc/irc.c:93 src/protocols/irc/irc.c:373
+#: src/protocols/irc/irc.c:93 src/protocols/irc/irc.c:388
 msgid "Server has disconnected"
 msgstr "O servidor desconectou"
 
-#: src/protocols/irc/irc.c:147
+#: src/protocols/irc/irc.c:158
 msgid "View MOTD"
 msgstr "Ver mensagem do dia (MOTD)"
 
-#: src/protocols/irc/irc.c:169 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:174 src/protocols/jabber/chat.c:59
+#: src/protocols/irc/irc.c:185 src/protocols/jabber/chat.c:59
 msgid "_Password:"
 msgstr "_Senha:"
 
-#: src/protocols/irc/irc.c:194
+#: src/protocols/irc/irc.c:205
 msgid "IRC nicks may not contain whitespace"
 msgstr "Apelidos do IRC n達o podem conter espa巽os"
 
-#: src/protocols/irc/irc.c:213 src/protocols/toc/toc.c:198
+#: src/protocols/irc/irc.c:224 src/protocols/toc/toc.c:198
 #, c-format
 msgid "Signon: %s"
 msgstr "Conectando: %s"
 
-#: src/protocols/irc/irc.c:222
+#: src/protocols/irc/irc.c:233
 msgid "Couldn't create socket"
 msgstr "Imposs鱈vel criar socket"
 
-#: src/protocols/irc/irc.c:237 src/protocols/jabber/jabber.c:297
-#: src/protocols/oscar/oscar.c:1529 src/protocols/oscar/oscar.c:1593
+#: src/protocols/irc/irc.c:248 src/protocols/jabber/jabber.c:297
+#: src/protocols/oscar/oscar.c:1519 src/protocols/oscar/oscar.c:1583
 msgid "Couldn't connect to host"
 msgstr "N達o foi poss鱈vel conectar ao host"
 
-#: src/protocols/irc/irc.c:370 src/protocols/trepia/trepia.c:926
+#: src/protocols/irc/irc.c:385 src/protocols/trepia/trepia.c:926
 msgid "Read error"
 msgstr "Erro de leitura"
 
-#: src/protocols/irc/irc.c:521 src/protocols/silc/chat.c:1363
+#: src/protocols/irc/irc.c:536 src/protocols/silc/chat.c:1356
 #: src/protocols/yahoo/yahoochat.c:1380
 msgid "Users"
 msgstr "Usu叩rios"
 
-#: src/protocols/irc/irc.c:524 src/protocols/silc/chat.c:1366
-#: src/protocols/silc/ops.c:1146 src/protocols/yahoo/yahoochat.c:1389
+#: src/protocols/irc/irc.c:539 src/protocols/silc/chat.c:1359
+#: src/protocols/silc/ops.c:1155 src/protocols/yahoo/yahoochat.c:1389
 msgid "Topic"
 msgstr "T坦pico"
 
@@ -5081,51 +5109,57 @@
 #. *< id
 #. *< name
 #. *< version
-#: src/protocols/irc/irc.c:628
+#: src/protocols/irc/irc.c:643
 msgid "IRC Protocol Plugin"
 msgstr "Plugin do protocolo IRC"
 
 #. *  summary
-#: src/protocols/irc/irc.c:629
+#: src/protocols/irc/irc.c:644
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "O plugin do protocolo IRC que 辿 menos ruim"
 
-#: src/protocols/irc/irc.c:648 src/protocols/irc/msgs.c:197
-#: src/protocols/jabber/jabber.c:1559 src/protocols/napster/napster.c:644
-#: src/protocols/silc/ops.c:1008 src/protocols/silc/ops.c:1110
+#: src/protocols/irc/irc.c:663 src/protocols/irc/msgs.c:201
+#: src/protocols/jabber/jabber.c:1576 src/protocols/napster/napster.c:644
+#: src/protocols/silc/ops.c:1017 src/protocols/silc/ops.c:1119
 msgid "Server"
 msgstr "Servidor"
 
-#: src/protocols/irc/irc.c:651 src/protocols/jabber/jabber.c:1580
-#: src/protocols/msn/msn.c:1758 src/protocols/napster/napster.c:649
-#: src/protocols/silc/silc.c:1576 src/protocols/trepia/trepia.c:1297
+#: src/protocols/irc/irc.c:666 src/protocols/jabber/jabber.c:1597
+#: src/protocols/msn/msn.c:1759 src/protocols/napster/napster.c:649
+#: src/protocols/silc/silc.c:1577 src/protocols/trepia/trepia.c:1297
 msgid "Port"
 msgstr "Porta"
 
-#: src/protocols/irc/irc.c:654 src/protocols/zephyr/zephyr.c:1915
+#: src/protocols/irc/irc.c:669 src/protocols/zephyr/zephyr.c:1919
 msgid "Encoding"
 msgstr "Codifica巽達o"
 
-#: src/protocols/irc/irc.c:657 src/protocols/irc/msgs.c:191
+#: src/protocols/irc/irc.c:672 src/protocols/irc/msgs.c:195
 #: src/protocols/jabber/jabber.c:588 src/protocols/silc/buddy.c:1445
-#: src/protocols/silc/ops.c:955 src/protocols/silc/ops.c:957
-#: src/protocols/silc/ops.c:1104 src/protocols/silc/ops.c:1106
+#: src/protocols/silc/ops.c:964 src/protocols/silc/ops.c:966
+#: src/protocols/silc/ops.c:1113 src/protocols/silc/ops.c:1115
 msgid "Username"
 msgstr "Nome do usu叩rio"
 
-#: src/protocols/irc/msgs.c:98
+#: src/protocols/irc/msgs.c:97
 msgid "Bad mode"
 msgstr "Modo inv叩lido"
 
-#: src/protocols/irc/msgs.c:109
+#: src/protocols/irc/msgs.c:108
 #, c-format
 msgid "You are banned from %s."
 msgstr "Voc棚 foi banido do %s."
 
-#: src/protocols/irc/msgs.c:110
+#: src/protocols/irc/msgs.c:109
 msgid "Banned"
 msgstr "Banido"
 
+#: src/protocols/irc/msgs.c:182 src/protocols/irc/msgs.c:201
+#: src/protocols/irc/msgs.c:214
+#, c-format
+msgid "<b>%s:</b> %s"
+msgstr "<b>%s:</b> %s"
+
 #: src/protocols/irc/msgs.c:184
 msgid " <i>(ircop)</i>"
 msgstr " <i>(ircop)</i>"
@@ -5134,138 +5168,145 @@
 msgid " <i>(identified)</i>"
 msgstr " <i>(identificado)</i>"
 
-#: src/protocols/irc/msgs.c:192 src/protocols/silc/ops.c:949
-#: src/protocols/silc/ops.c:1098 src/protocols/yahoo/yahoo_profile.c:1005
+#: 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:1179 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:196 src/protocols/silc/ops.c:958
+#: src/protocols/silc/ops.c:1107 src/protocols/yahoo/yahoo_profile.c:1005
 msgid "Realname"
 msgstr "Nome real"
 
-#: src/protocols/irc/msgs.c:202 src/protocols/silc/ops.c:1021
+#: src/protocols/irc/msgs.c:207 src/protocols/silc/ops.c:1030
 msgid "Currently on"
 msgstr "Atualmente em"
 
-#: src/protocols/irc/msgs.c:207
+#: src/protocols/irc/msgs.c:212
 #, c-format
 msgid "<b>Idle for:</b> %s<br>"
 msgstr "<b>Inativo por:</b> %s<br>"
 
-#: src/protocols/irc/msgs.c:209
+#: src/protocols/irc/msgs.c:214
 msgid "Online since"
 msgstr "Conectado desde"
 
-#: src/protocols/irc/msgs.c:212
+#: src/protocols/irc/msgs.c:217
 msgid "<br><b>Defining adjective:</b> Glorious<br>"
 msgstr "<br><b>Adjetivo definidor:</b> Glorioso<br>"
 
-#: src/protocols/irc/msgs.c:219
+#: src/protocols/irc/msgs.c:224
 #, c-format
 msgid "Buddy Information for %s"
 msgstr "Informa巽探es adicionais para %s"
 
-#: src/protocols/irc/msgs.c:279
+#: src/protocols/irc/msgs.c:284
 #, c-format
 msgid "%s has changed the topic to: %s"
 msgstr "%s mudou o t坦pico para: %s"
 
-#: src/protocols/irc/msgs.c:284
+#: src/protocols/irc/msgs.c:289
 #, c-format
 msgid "The topic for %s is: %s"
 msgstr "O t坦pico do %s 辿: %s"
 
-#: src/protocols/irc/msgs.c:301
+#: src/protocols/irc/msgs.c:306
 #, c-format
 msgid "Unknown message '%s'"
 msgstr "Mensagem desconhecida '%s'"
 
-#: src/protocols/irc/msgs.c:302
+#: src/protocols/irc/msgs.c:307
 msgid "Unknown message"
 msgstr "Mensagem desconhecida"
 
-#: src/protocols/irc/msgs.c:302
+#: src/protocols/irc/msgs.c:307
 msgid "Gaim has sent a message the IRC server did not understand."
 msgstr "O Gaim enviou uma mensagem que n達o foi entendida pelo servidor de IRC."
 
-#: src/protocols/irc/msgs.c:325
+#: src/protocols/irc/msgs.c:330
 #, c-format
 msgid "Users on %s: %s"
 msgstr "Usu叩rios em %s: %s"
 
-#: src/protocols/irc/msgs.c:407
+#: src/protocols/irc/msgs.c:424
 msgid "No such channel"
 msgstr "Canal inexistente"
 
 #. does this happen?
-#: src/protocols/irc/msgs.c:418
+#: src/protocols/irc/msgs.c:435
 msgid "no such channel"
 msgstr "Canal inexistente"
 
-#: src/protocols/irc/msgs.c:421
+#: src/protocols/irc/msgs.c:438
 msgid "User is not logged in"
 msgstr "O usu叩rio est叩 desconectado"
 
-#: src/protocols/irc/msgs.c:426
+#: src/protocols/irc/msgs.c:443
 msgid "No such nick or channel"
 msgstr "Apelido ou canal inexistente"
 
-#: src/protocols/irc/msgs.c:446
+#: src/protocols/irc/msgs.c:463
 msgid "Could not send"
 msgstr "N達o foi poss鱈vel enviar"
 
-#: src/protocols/irc/msgs.c:502
+#: src/protocols/irc/msgs.c:519
 #, c-format
 msgid "Joining %s requires an invitation."
 msgstr "� necess叩rio um convite para entrar em %s."
 
-#: src/protocols/irc/msgs.c:503
+#: src/protocols/irc/msgs.c:520
 msgid "Invitation only"
 msgstr "Apenas convidados"
 
-#: src/protocols/irc/msgs.c:606
+#: src/protocols/irc/msgs.c:623
 #, c-format
 msgid "You have been kicked by %s: (%s)"
 msgstr "Voc棚 foi expulso por %s: (%s)"
 
-#: src/protocols/irc/msgs.c:611
+#: src/protocols/irc/msgs.c:628
 #, c-format
 msgid "Kicked by %s (%s)"
 msgstr "Chutado por %s (%s)"
 
-#: src/protocols/irc/msgs.c:632
+#: src/protocols/irc/msgs.c:649
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr "Modo (%s %s) por %s"
 
-#: src/protocols/irc/msgs.c:711
+#: src/protocols/irc/msgs.c:758
 msgid "Could not change nick"
 msgstr "N達o foi poss鱈vel mudar apelido"
 
-#: src/protocols/irc/msgs.c:712
+#: src/protocols/irc/msgs.c:759
 msgid "Cannot change nick"
 msgstr "Imposs鱈vel mudar apelido"
 
-#: src/protocols/irc/msgs.c:733
+#: src/protocols/irc/msgs.c:780
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr "Voc棚 saiu do canal%s%s"
 
-#: src/protocols/irc/msgs.c:773
+#: src/protocols/irc/msgs.c:820
 msgid "Error: invalid PONG from server"
 msgstr "Erro: PONG inv叩lido do servidor"
 
-#: src/protocols/irc/msgs.c:775
+#: src/protocols/irc/msgs.c:822
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr "Resposta do PING -- Lat棚ncia: %lu segundos"
 
-#: src/protocols/irc/msgs.c:850
+#: src/protocols/irc/msgs.c:897
 #, c-format
 msgid "Cannot join %s:"
 msgstr "Imposs鱈vel entrar no %s:"
 
-#: src/protocols/irc/msgs.c:851 src/protocols/silc/ops.c:894
+#: src/protocols/irc/msgs.c:898 src/protocols/silc/ops.c:903
 msgid "Cannot join channel"
 msgstr "Imposs鱈vel entrar no canal"
 
-#: src/protocols/irc/msgs.c:887
+#: src/protocols/irc/msgs.c:934
 #, c-format
 msgid "Wallops from %s"
 msgstr "Wallops de %s"
@@ -5366,7 +5407,7 @@
 msgid "names [channel]:  List the users currently in a channel."
 msgstr "names [canal]:  Lista os usu叩rios que est達o no canal atualmente."
 
-#: src/protocols/irc/parse.c:122 src/protocols/jabber/jabber.c:1407
+#: src/protocols/irc/parse.c:122 src/protocols/jabber/jabber.c:1410
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr "nick &lt;novo apelido&gt;:  Muda seu apelido."
 
@@ -5454,7 +5495,7 @@
 msgid "whois &lt;nick&gt;:  Get information on a user."
 msgstr "whois &lt;usu叩rio&gt;:  Exibe informa巽探es do usu叩rio."
 
-#: src/protocols/irc/parse.c:228 src/protocols/zephyr/zephyr.c:256
+#: src/protocols/irc/parse.c:242 src/protocols/zephyr/zephyr.c:265
 msgid ""
 "(There was an error converting this message.  Check the 'Encoding' option in "
 "the Account Editor)"
@@ -5462,20 +5503,20 @@
 "(Houve um erro ao converter esta mensagem. Verifique a op巽達o 'Codifica巽達o' "
 "no editor de contas)"
 
-#: src/protocols/irc/parse.c:382
+#: src/protocols/irc/parse.c:394
 #, c-format
 msgid "Reply time from %s: %lu seconds"
 msgstr "Tempo de resposta de %s: %lu segundos"
 
-#: src/protocols/irc/parse.c:383
+#: src/protocols/irc/parse.c:395
 msgid "PONG"
 msgstr "PONG"
 
-#: src/protocols/irc/parse.c:383
+#: src/protocols/irc/parse.c:395
 msgid "CTCP PING reply"
 msgstr "Resposta do CTCP PING"
 
-#: src/protocols/irc/parse.c:485 src/protocols/oscar/oscar.c:1430
+#: src/protocols/irc/parse.c:497 src/protocols/oscar/oscar.c:1416
 #: 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."
@@ -5512,12 +5553,12 @@
 msgstr "O servidor retornou uma identifica巽達o inv叩lida"
 
 #: src/protocols/jabber/buddy.c:246 src/protocols/jabber/buddy.c:604
-#: src/protocols/silc/ops.c:786
+#: src/protocols/silc/ops.c:795
 msgid "Full Name"
 msgstr "Nome completo"
 
 #: src/protocols/jabber/buddy.c:247 src/protocols/jabber/buddy.c:617
-#: src/protocols/silc/ops.c:798
+#: src/protocols/silc/ops.c:807
 msgid "Family Name"
 msgstr "Sobrenome"
 
@@ -5527,8 +5568,8 @@
 
 #: src/protocols/jabber/buddy.c:249 src/protocols/jabber/buddy.c:635
 #: src/protocols/jabber/jabber.c:608 src/protocols/msn/msn.c:1172
-#: src/protocols/silc/buddy.c:1442 src/protocols/silc/ops.c:802
-#: src/protocols/silc/ops.c:945 src/protocols/silc/ops.c:1094
+#: src/protocols/silc/buddy.c:1442 src/protocols/silc/ops.c:811
+#: src/protocols/silc/ops.c:954 src/protocols/silc/ops.c:1103
 #: src/protocols/yahoo/yahoo_profile.c:1000
 msgid "Nickname"
 msgstr "Apelido"
@@ -5592,7 +5633,7 @@
 msgstr "Fun巽達o"
 
 #: src/protocols/jabber/buddy.c:263 src/protocols/jabber/buddy.c:638
-#: src/protocols/oscar/oscar.c:4883
+#: src/protocols/oscar/oscar.c:4878
 msgid "Birthday"
 msgstr "Data de nascimento"
 
@@ -5614,24 +5655,24 @@
 
 #: src/protocols/jabber/buddy.c:563 src/protocols/jabber/buddy.c:570
 #: src/protocols/jabber/buddy.c:581 src/protocols/jabber/jabber.c:938
-#: src/protocols/msn/msn.c:450 src/protocols/novell/novell.c:2743
-#: src/protocols/novell/novell.c:2747 src/protocols/oscar/oscar.c:578
-#: src/protocols/oscar/oscar.c:584 src/protocols/oscar/oscar.c:586
-#: src/protocols/yahoo/yahoo.c:2634
+#: src/protocols/msn/msn.c:450 src/protocols/novell/novell.c:2790
+#: src/protocols/novell/novell.c:2794 src/protocols/oscar/oscar.c:562
+#: src/protocols/oscar/oscar.c:568 src/protocols/oscar/oscar.c:570
+#: src/protocols/yahoo/yahoo.c:2677
 msgid "Status"
 msgstr "Status"
 
-#: src/protocols/jabber/buddy.c:579 src/protocols/jabber/jabber.c:1562
+#: src/protocols/jabber/buddy.c:579 src/protocols/jabber/jabber.c:1579
 msgid "Resource"
 msgstr "Recurso"
 
-#: src/protocols/jabber/buddy.c:625 src/protocols/silc/ops.c:794
+#: src/protocols/jabber/buddy.c:625 src/protocols/silc/ops.c:803
 msgid "Middle Name"
 msgstr "Nome do meio"
 
 #: src/protocols/jabber/buddy.c:643 src/protocols/jabber/jabber.c:623
-#: src/protocols/oscar/oscar.c:4901 src/protocols/oscar/oscar.c:4909
-#: src/protocols/silc/ops.c:830
+#: src/protocols/oscar/oscar.c:4896 src/protocols/oscar/oscar.c:4904
+#: src/protocols/silc/ops.c:839
 msgid "Address"
 msgstr "Endere巽o"
 
@@ -5714,51 +5755,51 @@
 msgid "Invalid Room Handle"
 msgstr "Apelido de sala inv叩lido"
 
-#: src/protocols/jabber/chat.c:349
+#: src/protocols/jabber/chat.c:341
 msgid "Configuration error"
 msgstr "Erro de configura巽達o"
 
-#: src/protocols/jabber/chat.c:358 src/protocols/jabber/chat.c:503
+#: src/protocols/jabber/chat.c:350 src/protocols/jabber/chat.c:495
 msgid "Unable to configure"
 msgstr "Imposs鱈vel configurar"
 
-#: src/protocols/jabber/chat.c:374
+#: src/protocols/jabber/chat.c:366
 msgid "Room Configuration Error"
 msgstr "Erro de configura巽達o de sala"
 
-#: src/protocols/jabber/chat.c:375
+#: src/protocols/jabber/chat.c:367
 msgid "This room is not capable of being configured"
 msgstr "Esta sala n達o 辿 capaz de ser configurada"
 
-#: src/protocols/jabber/chat.c:425 src/protocols/jabber/chat.c:494
+#: src/protocols/jabber/chat.c:417 src/protocols/jabber/chat.c:486
 msgid "Registration error"
 msgstr "Erro ao registrar"
 
-#: src/protocols/jabber/chat.c:573
+#: src/protocols/jabber/chat.c:565
 msgid "Nick changing not supported in non-MUC chatrooms"
 msgstr "N達o 辿 poss鱈vel mudar o apelido em salas de bate-papo n達o-MUC"
 
-#: src/protocols/jabber/chat.c:617 src/protocols/jabber/chat.c:628
+#: src/protocols/jabber/chat.c:609 src/protocols/jabber/chat.c:620
 msgid "Roomlist Error"
 msgstr "Erro na lista de salas"
 
-#: src/protocols/jabber/chat.c:618 src/protocols/jabber/chat.c:629
+#: src/protocols/jabber/chat.c:610 src/protocols/jabber/chat.c:621
 msgid "Error retreiving roomlist"
 msgstr "Erro ao obter lista de salas"
 
-#: src/protocols/jabber/chat.c:669
+#: src/protocols/jabber/chat.c:661
 msgid "Invalid Server"
 msgstr "Servidor inv叩lido"
 
-#: src/protocols/jabber/chat.c:706
+#: src/protocols/jabber/chat.c:698
 msgid "Enter a Conference Server"
 msgstr "Entrar num servidor de confer棚ncia"
 
-#: src/protocols/jabber/chat.c:707
+#: src/protocols/jabber/chat.c:699
 msgid "Select a conference server to query"
 msgstr "Selecione um servidor de confer棚ncia a ser consultado"
 
-#: src/protocols/jabber/chat.c:710
+#: src/protocols/jabber/chat.c:702
 msgid "Find Rooms"
 msgstr "Encontrar salas"
 
@@ -5828,13 +5869,13 @@
 msgstr "Email"
 
 #. State
-#: src/protocols/jabber/jabber.c:633 src/protocols/oscar/oscar.c:4903
-#: src/protocols/oscar/oscar.c:4911 src/protocols/trepia/trepia.c:335
+#: src/protocols/jabber/jabber.c:633 src/protocols/oscar/oscar.c:4898
+#: src/protocols/oscar/oscar.c:4906 src/protocols/trepia/trepia.c:335
 #: src/protocols/trepia/trepia.c:413
 msgid "State"
 msgstr "Estado"
 
-#: src/protocols/jabber/jabber.c:643 src/protocols/silc/ops.c:835
+#: src/protocols/jabber/jabber.c:643 src/protocols/silc/ops.c:844
 #: src/protocols/silc/silc.c:639 src/protocols/silc/util.c:510
 msgid "Phone"
 msgstr "Telefone"
@@ -5858,9 +5899,9 @@
 
 #. connect to the server
 #: src/protocols/jabber/jabber.c:783 src/protocols/msn/msn.c:608
-#: src/protocols/napster/napster.c:499 src/protocols/novell/novell.c:2105
-#: src/protocols/oscar/oscar.c:1597 src/protocols/trepia/trepia.c:1064
-#: src/protocols/yahoo/yahoo.c:2379 src/protocols/zephyr/zephyr.c:1017
+#: src/protocols/napster/napster.c:499 src/protocols/novell/novell.c:2123
+#: src/protocols/oscar/oscar.c:1587 src/protocols/trepia/trepia.c:1064
+#: src/protocols/yahoo/yahoo.c:2422 src/protocols/zephyr/zephyr.c:1018
 msgid "Connecting"
 msgstr "Conectando"
 
@@ -5878,7 +5919,7 @@
 
 #: src/protocols/jabber/jabber.c:882 src/protocols/jabber/jabber.c:1159
 #: src/protocols/jabber/jabber.c:1200 src/protocols/jabber/jabber.c:1233
-#: src/protocols/oscar/oscar.c:584 src/protocols/oscar/oscar.c:6497
+#: src/protocols/oscar/oscar.c:568 src/protocols/oscar/oscar.c:6500
 msgid "Not Authorized"
 msgstr "N達o autorizado"
 
@@ -5911,19 +5952,19 @@
 msgstr "Erro"
 
 #: src/protocols/jabber/jabber.c:959 src/protocols/jabber/jutil.c:35
-#: src/protocols/jabber/presence.c:66 src/protocols/jabber/presence.c:117
+#: src/protocols/jabber/presence.c:66 src/protocols/jabber/presence.c:119
 msgid "Chatty"
 msgstr "Dispon鱈vel para bate-papo"
 
 #: src/protocols/jabber/jabber.c:961 src/protocols/jabber/jutil.c:38
-#: src/protocols/jabber/presence.c:68 src/protocols/jabber/presence.c:122
+#: src/protocols/jabber/presence.c:68 src/protocols/jabber/presence.c:124
 msgid "Extended Away"
 msgstr "Ausente (estendido)"
 
 #: src/protocols/jabber/jabber.c:962 src/protocols/jabber/jutil.c:41
-#: src/protocols/jabber/presence.c:70 src/protocols/jabber/presence.c:124
-#: src/protocols/oscar/oscar.c:526 src/protocols/oscar/oscar.c:5487
-#: src/protocols/oscar/oscar.c:6690
+#: src/protocols/jabber/presence.c:70 src/protocols/jabber/presence.c:126
+#: src/protocols/oscar/oscar.c:510 src/protocols/oscar/oscar.c:5489
+#: src/protocols/oscar/oscar.c:6693
 msgid "Do Not Disturb"
 msgstr "N達o perturbe"
 
@@ -5951,7 +5992,7 @@
 msgid "Please enter your new password"
 msgstr "Favor digitar sua nova senha"
 
-#: src/protocols/jabber/jabber.c:1057 src/protocols/toc/toc.c:1540
+#: src/protocols/jabber/jabber.c:1057 src/protocols/toc/toc.c:1541
 msgid "Set User Info"
 msgstr "Definir informa巽探es de usu叩rio"
 
@@ -6071,7 +6112,7 @@
 msgid "Resource Conflict"
 msgstr "Conflito de recursos"
 
-#: src/protocols/jabber/jabber.c:1215 src/protocols/silc/ops.c:1491
+#: src/protocols/jabber/jabber.c:1215 src/protocols/silc/ops.c:1500
 msgid "Connection Timeout"
 msgstr "Tempo limite de conex達o esgotado"
 
@@ -6161,50 +6202,50 @@
 msgid "Unable to kick user %s"
 msgstr "Imposs鱈vel convidar usu叩rio (%s)."
 
-#: src/protocols/jabber/jabber.c:1401
+#: src/protocols/jabber/jabber.c:1402
 msgid "config:  Configure a chat room."
 msgstr "config:  Configura uma sala de bate-papo."
 
-#: src/protocols/jabber/jabber.c:1404
+#: src/protocols/jabber/jabber.c:1406
 msgid "configure:  Configure a chat room."
 msgstr "configure:  Configura uma sala de bate-papo."
 
-#: src/protocols/jabber/jabber.c:1411
+#: src/protocols/jabber/jabber.c:1415
 msgid "part [room]:  Leave the room."
 msgstr "part [sala]:  Sai da sala."
 
-#: src/protocols/jabber/jabber.c:1414
+#: src/protocols/jabber/jabber.c:1420
 msgid "register:  Register with a chat room."
 msgstr "register:  Registra com uma sala de bate-papo."
 
-#: src/protocols/jabber/jabber.c:1419
+#: src/protocols/jabber/jabber.c:1426
 msgid "topic [new topic]:  View or change the topic."
 msgstr "topic [novo t坦pico]:  Ver ou mudar o t坦pico."
 
-#: src/protocols/jabber/jabber.c:1423
+#: src/protocols/jabber/jabber.c:1432
 msgid "ban &lt;user&gt; [room]:  Ban a user from the room."
 msgstr "ban &lt;usu叩rio&gt; [sala]: Bane o usu叩rio da sala."
 
-#: src/protocols/jabber/jabber.c:1427
+#: src/protocols/jabber/jabber.c:1438
 msgid "invite &lt;user&gt; [room]:  Invite a user to the room."
 msgstr "invite &lt;usu叩rio&gt; [sala]:  Convida o usu叩rio para a sala."
 
-#: src/protocols/jabber/jabber.c:1431
+#: src/protocols/jabber/jabber.c:1444
 msgid "join: &lt;room&gt; [server]:  Join a chat on this server."
 msgstr "join:  &lt;sala&gt; [servidor]: Entra num bate-papo neste servidor."
 
-#: src/protocols/jabber/jabber.c:1435
+#: src/protocols/jabber/jabber.c:1450
 msgid "kick &lt;user&gt; [room]:  Kick a user from the room."
 msgstr "kick &lt;usu叩rio&gt; [sala]:  Expulsa um usu叩rio da sala."
 
-#: src/protocols/jabber/jabber.c:1439
+#: src/protocols/jabber/jabber.c:1455
 msgid ""
 "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
 msgstr ""
 "msg &lt;usu叩rio&gt; &lt;mensagem&gt;:  Envia uma mensagem particular para "
 "outro usu叩rio."
 
-#: src/protocols/jabber/jabber.c:1453
+#: src/protocols/jabber/jabber.c:1470
 msgid "Hide Operating System"
 msgstr "Esconder sistema operacional"
 
@@ -6219,24 +6260,24 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/jabber/jabber.c:1537 src/protocols/jabber/jabber.c:1539
+#: src/protocols/jabber/jabber.c:1554 src/protocols/jabber/jabber.c:1556
 msgid "Jabber Protocol Plugin"
 msgstr "Plugin do protocolo Jabber"
 
-#: src/protocols/jabber/jabber.c:1565
+#: src/protocols/jabber/jabber.c:1582
 msgid "Use TLS if available"
 msgstr "Usar TLS se dispon鱈vel"
 
-#: src/protocols/jabber/jabber.c:1570
+#: src/protocols/jabber/jabber.c:1587
 msgid "Force old SSL"
 msgstr "For巽ar SSL antigo"
 
-#: src/protocols/jabber/jabber.c:1575
+#: src/protocols/jabber/jabber.c:1592
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Permitir autentica巽達o em texto puro sobre fluxos n達o-encriptados"
 
 #. Account options
-#: src/protocols/jabber/jabber.c:1584 src/protocols/silc/silc.c:1572
+#: src/protocols/jabber/jabber.c:1601 src/protocols/silc/silc.c:1573
 msgid "Connect server"
 msgstr "Conectar ao servidor"
 
@@ -6255,16 +6296,16 @@
 msgid "The topic is: %s"
 msgstr "O t坦pico 辿: %s"
 
-#: src/protocols/jabber/message.c:225
+#: src/protocols/jabber/message.c:226
 #, c-format
 msgid "Message delivery to %s failed: %s"
 msgstr "A entrega de mensagens para %s falhou: %s"
 
-#: src/protocols/jabber/message.c:228
+#: src/protocols/jabber/message.c:229
 msgid "Jabber Message Error"
 msgstr "Erro de mensagem do Jabber"
 
-#: src/protocols/jabber/message.c:291
+#: src/protocols/jabber/message.c:293
 #, c-format
 msgid " (Code %s)"
 msgstr " (C坦digo %s)"
@@ -6273,20 +6314,20 @@
 msgid "XML Parse error"
 msgstr "Erro ao processar XML"
 
-#: src/protocols/jabber/presence.c:224
+#: src/protocols/jabber/presence.c:227
 msgid "Unknown Error in presence"
 msgstr "Erro desconhecido na presen巽a"
 
-#: src/protocols/jabber/presence.c:227
+#: src/protocols/jabber/presence.c:230
 #, c-format
 msgid "The user %s wants to add you to their buddy list."
 msgstr "O usu叩rio %s quer adicionar voc棚 a lista de amigos dele."
 
-#: src/protocols/jabber/presence.c:280 src/protocols/jabber/presence.c:281
+#: src/protocols/jabber/presence.c:283 src/protocols/jabber/presence.c:284
 msgid "Create New Room"
 msgstr "Criar nova sala"
 
-#: src/protocols/jabber/presence.c:282
+#: src/protocols/jabber/presence.c:285
 msgid ""
 "You are creating a new room.  Would you like to configure it, or accept the "
 "default settings?"
@@ -6294,20 +6335,20 @@
 "Voc棚 est叩 criando uma nova sala. Voc棚 deseja configur叩-la, ou aceitar as "
 "configura巽探es padr達o?"
 
-#: src/protocols/jabber/presence.c:284
+#: src/protocols/jabber/presence.c:287
 msgid "Configure Room"
 msgstr "Configurar sala"
 
-#: src/protocols/jabber/presence.c:286
+#: src/protocols/jabber/presence.c:289
 msgid "Accept Defaults"
 msgstr "Aceitar padr探es"
 
-#: src/protocols/jabber/presence.c:308
+#: src/protocols/jabber/presence.c:311
 #, c-format
 msgid "Error in chat %s"
 msgstr "Erro no bate-papo %s"
 
-#: src/protocols/jabber/presence.c:311
+#: src/protocols/jabber/presence.c:314
 #, c-format
 msgid "Error joining chat %s"
 msgstr "Erro ao entrar no bate-papo %s"
@@ -6327,11 +6368,11 @@
 msgid "Miscellaneous error"
 msgstr "Erro miscel但neo"
 
-#: src/protocols/msn/cmdproc.c:338
+#: src/protocols/msn/cmdproc.c:339
 msgid "You have signed on from another location."
 msgstr "Voc棚 conectou de outro local."
 
-#: src/protocols/msn/cmdproc.c:340
+#: src/protocols/msn/cmdproc.c:341
 msgid "The MSN servers are going down temporarily."
 msgstr "Os servidores MSN v達o sair do ar temporariamente."
 
@@ -6379,7 +6420,7 @@
 msgid "Not on list"
 msgstr "N達o est叩 na lista"
 
-#: src/protocols/msn/error.c:70 src/protocols/zephyr/zephyr.c:593
+#: src/protocols/msn/error.c:70 src/protocols/zephyr/zephyr.c:602
 msgid "User is offline"
 msgstr "Usu叩rio est叩 desconectado"
 
@@ -6524,8 +6565,8 @@
 msgid "Server too busy"
 msgstr "Servidor ocupado demais"
 
-#: src/protocols/msn/error.c:198 src/protocols/oscar/oscar.c:2026
-#: src/protocols/silc/ops.c:1480 src/protocols/toc/toc.c:630
+#: src/protocols/msn/error.c:198 src/protocols/oscar/oscar.c:2016
+#: src/protocols/silc/ops.c:1489 src/protocols/toc/toc.c:630
 msgid "Authentication failed"
 msgstr "Autentica巽達o mal sucedida"
 
@@ -6611,40 +6652,49 @@
 msgid "Page"
 msgstr "Enviar"
 
+#: src/protocols/msn/msn.c:450 src/protocols/yahoo/yahoo.c:2677
+#, c-format
+msgid ""
+"\n"
+"<b>%s:</b> %s"
+msgstr ""
+"\n"
+"<b>%s:</b> %s"
+
 #: src/protocols/msn/msn.c:463 src/protocols/msn/msn.c:756
 #: src/protocols/msn/state.c:34
 msgid "Away From Computer"
 msgstr "Ausente"
 
 #: src/protocols/msn/msn.c:464 src/protocols/msn/msn.c:758
-#: src/protocols/msn/state.c:33 src/protocols/yahoo/yahoo.c:2491
-#: src/protocols/yahoo/yahoo.c:2853 src/protocols/yahoo/yahoo.c:2969
+#: src/protocols/msn/state.c:33 src/protocols/yahoo/yahoo.c:2534
+#: src/protocols/yahoo/yahoo.c:2896 src/protocols/yahoo/yahoo.c:3012
 msgid "Be Right Back"
 msgstr "Volto j叩"
 
 #: src/protocols/msn/msn.c:465 src/protocols/msn/msn.c:760
-#: src/protocols/msn/state.c:31 src/protocols/novell/novell.c:2727
-#: src/protocols/novell/novell.c:2842 src/protocols/novell/novell.c:2896
+#: src/protocols/msn/state.c:31 src/protocols/novell/novell.c:2774
+#: src/protocols/novell/novell.c:2889 src/protocols/novell/novell.c:2943
 #: src/protocols/silc/buddy.c:1383 src/protocols/silc/silc.c:47
-#: src/protocols/silc/silc.c:78 src/protocols/yahoo/yahoo.c:2493
-#: src/protocols/yahoo/yahoo.c:2855 src/protocols/yahoo/yahoo.c:2970
+#: src/protocols/silc/silc.c:78 src/protocols/yahoo/yahoo.c:2536
+#: src/protocols/yahoo/yahoo.c:2898 src/protocols/yahoo/yahoo.c:3013
 msgid "Busy"
 msgstr "Ocupado"
 
 #: src/protocols/msn/msn.c:466 src/protocols/msn/msn.c:762
-#: src/protocols/msn/state.c:35 src/protocols/yahoo/yahoo.c:2501
-#: src/protocols/yahoo/yahoo.c:2863 src/protocols/yahoo/yahoo.c:2974
+#: src/protocols/msn/state.c:35 src/protocols/yahoo/yahoo.c:2544
+#: src/protocols/yahoo/yahoo.c:2906 src/protocols/yahoo/yahoo.c:3017
 msgid "On The Phone"
 msgstr "Ao telefone"
 
 #: src/protocols/msn/msn.c:467 src/protocols/msn/msn.c:764
-#: src/protocols/msn/state.c:36 src/protocols/yahoo/yahoo.c:2505
-#: src/protocols/yahoo/yahoo.c:2867 src/protocols/yahoo/yahoo.c:2976
+#: src/protocols/msn/state.c:36 src/protocols/yahoo/yahoo.c:2548
+#: src/protocols/yahoo/yahoo.c:2910 src/protocols/yahoo/yahoo.c:3019
 msgid "Out To Lunch"
 msgstr "Em hor叩rio de almo巽o"
 
 #: src/protocols/msn/msn.c:468 src/protocols/msn/msn.c:766
-#: src/protocols/zephyr/zephyr.c:1355 src/protocols/zephyr/zephyr.c:1374
+#: src/protocols/zephyr/zephyr.c:1358 src/protocols/zephyr/zephyr.c:1377
 msgid "Hidden"
 msgstr "Invis鱈vel"
 
@@ -6693,7 +6743,7 @@
 "SSL suportada. Veja http://gaim.sf.net/faq-ssl.php para mais informa巽探es."
 
 #: src/protocols/msn/msn.c:1167 src/protocols/yahoo/yahoo_profile.c:659
-#: src/protocols/zephyr/zephyr.c:626
+#: src/protocols/zephyr/zephyr.c:635
 #, c-format
 msgid "<b>Alias:</b> %s<br>"
 msgstr "<b>Apelido:</b> %s<br>"
@@ -6710,11 +6760,6 @@
 msgid "<font sml=\"msn\">%s</font><br>"
 msgstr "<font sml=\"msn\">%s</font><br>"
 
-#: src/protocols/msn/msn.c:1179 src/protocols/yahoo/yahoo_profile.c:664
-#, c-format
-msgid "<b>%s:</b> %s<br>"
-msgstr "<b>%s:</b> %s<br>"
-
 #: src/protocols/msn/msn.c:1242
 msgid "MSN Profile"
 msgstr "Perfil do MSN"
@@ -6725,14 +6770,14 @@
 msgstr "Erro ao obter perfil"
 
 #. Age
-#: src/protocols/msn/msn.c:1318 src/protocols/oscar/oscar.c:4888
+#: src/protocols/msn/msn.c:1318 src/protocols/oscar/oscar.c:4883
 #: src/protocols/trepia/trepia.c:285 src/protocols/trepia/trepia.c:404
 #: src/protocols/yahoo/yahoo_profile.c:1015
 msgid "Age"
 msgstr "Idade"
 
 #. Gender
-#: src/protocols/msn/msn.c:1325 src/protocols/oscar/oscar.c:4874
+#: src/protocols/msn/msn.c:1325 src/protocols/oscar/oscar.c:4869
 #: src/protocols/trepia/trepia.c:279 src/protocols/trepia/trepia.c:406
 #: src/protocols/yahoo/yahoo_profile.c:1025
 msgid "Gender"
@@ -6776,7 +6821,7 @@
 msgstr "�ltima atualiza巽達o"
 
 #. Homepage
-#: src/protocols/msn/msn.c:1479 src/protocols/silc/ops.c:826
+#: src/protocols/msn/msn.c:1479 src/protocols/silc/ops.c:835
 #: src/protocols/trepia/trepia.c:289 src/protocols/trepia/trepia.c:419
 msgid "Homepage"
 msgstr "P叩gina da web"
@@ -6807,11 +6852,11 @@
 msgid "Profile URL"
 msgstr "URL do Perfil"
 
-#: src/protocols/msn/msn.c:1643
+#: src/protocols/msn/msn.c:1644
 msgid "Display conversation closed notices"
 msgstr "Mostrar notifica巽探es de 'conversa fechada'"
 
-#: src/protocols/msn/msn.c:1648
+#: src/protocols/msn/msn.c:1649
 msgid "Display timeout notices"
 msgstr "Mostrar notifica巽探es de 'tempo limite esgotado'"
 
@@ -6826,15 +6871,15 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/msn/msn.c:1732 src/protocols/msn/msn.c:1734
+#: src/protocols/msn/msn.c:1733 src/protocols/msn/msn.c:1735
 msgid "MSN Protocol Plugin"
 msgstr "Plugin do protocolo MSN"
 
-#: src/protocols/msn/msn.c:1753 src/protocols/trepia/trepia.c:1292
+#: src/protocols/msn/msn.c:1754 src/protocols/trepia/trepia.c:1292
 msgid "Login server"
 msgstr "Servidor de login"
 
-#: src/protocols/msn/msn.c:1762
+#: src/protocols/msn/msn.c:1763
 msgid "Use HTTP Method"
 msgstr "Usar m辿todo HTTP"
 
@@ -6855,7 +6900,7 @@
 msgstr "Recuperando lista de amigos"
 
 #: src/protocols/msn/notification.c:144 src/protocols/msn/notification.c:173
-#: src/protocols/oscar/oscar.c:2315
+#: src/protocols/oscar/oscar.c:2306
 msgid "Password sent"
 msgstr "Senha enviada"
 
@@ -6984,8 +7029,8 @@
 msgid "%s requested a PING"
 msgstr "%s requisitou um PING"
 
-#: src/protocols/napster/napster.c:541 src/protocols/oscar/oscar.c:6197
-#: src/protocols/toc/toc.c:1266
+#: src/protocols/napster/napster.c:541 src/protocols/oscar/oscar.c:6202
+#: src/protocols/toc/toc.c:1267
 msgid "_Group:"
 msgstr "_Grupo:"
 
@@ -7132,46 +7177,46 @@
 msgid "Unknown error: 0x%X"
 msgstr "Erro desconhecido: 0x%X"
 
-#: src/protocols/novell/novell.c:116
+#: src/protocols/novell/novell.c:117
 #, c-format
 msgid "Login failed (%s)."
 msgstr "A conex達o falhou (%s)."
 
-#: src/protocols/novell/novell.c:229
+#: src/protocols/novell/novell.c:230
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
 msgstr ""
 "Imposs鱈vel enviar mensagem. N達o foi poss鱈vel obter detalhes do usu叩rio (%s)."
 
-#: src/protocols/novell/novell.c:375
+#: src/protocols/novell/novell.c:379
 #, c-format
 msgid "Unable to add %s to your buddy list (%s)."
 msgstr "Imposs鱈vel adicionar %s a sua lista de amigos (%s)."
 
 #. TODO: Improve this! message to who or for what conference?
-#: src/protocols/novell/novell.c:401
+#: src/protocols/novell/novell.c:405
 #, c-format
 msgid "Unable to send message (%s)."
 msgstr "Imposs鱈vel enviar mensagem (%s)."
 
-#: src/protocols/novell/novell.c:472 src/protocols/novell/novell.c:965
+#: src/protocols/novell/novell.c:476 src/protocols/novell/novell.c:969
 #, c-format
 msgid "Unable to invite user (%s)."
 msgstr "Imposs鱈vel convidar usu叩rio (%s)."
 
-#: src/protocols/novell/novell.c:511
+#: src/protocols/novell/novell.c:515
 #, c-format
 msgid "Unable to send message to %s. Could not create the conference (%s)."
 msgstr ""
 "Imposs鱈vel enviar mensagem para %s. N達o foi poss鱈vel criar a confer棚ncia (%"
 "s)."
 
-#: src/protocols/novell/novell.c:516
+#: src/protocols/novell/novell.c:520
 #, c-format
 msgid "Unable to send message. Could not create the conference (%s)."
 msgstr "Imposs鱈vel enviar mensagem. N達o foi poss鱈vel criar a confer棚ncia (%s)."
 
-#: src/protocols/novell/novell.c:563
+#: src/protocols/novell/novell.c:567
 #, c-format
 msgid ""
 "Unable to move user %s to folder %s in the server side list. Error while "
@@ -7180,7 +7225,7 @@
 "Imposs鱈vel mover usu叩rio %s para a pasta %s na lista do servidor. Erro ao "
 "criar a pasta (%s)."
 
-#: src/protocols/novell/novell.c:611
+#: src/protocols/novell/novell.c:615
 #, c-format
 msgid ""
 "Unable to add %s to your buddy list. Error creating folder in server side "
@@ -7189,46 +7234,46 @@
 "Imposs鱈vel adicionar %s � sua lista de amigos. Erro ao criar pasta na lista "
 "do servidor (%s)."
 
-#: src/protocols/novell/novell.c:683
+#: src/protocols/novell/novell.c:687
 #, c-format
 msgid "Could not get details for user %s (%s)."
 msgstr "N達o foi poss鱈vel obter detalhes do usu叩rio %s (%s)."
 
-#: src/protocols/novell/novell.c:729 src/protocols/novell/novell.c:875
+#: src/protocols/novell/novell.c:733 src/protocols/novell/novell.c:879
 #, c-format
 msgid "Unable to add user to privacy list (%s)."
 msgstr "Imposs鱈vel adicionar usu叩rio a sua lista de privacidade (%s)."
 
-#: src/protocols/novell/novell.c:776
+#: src/protocols/novell/novell.c:780
 #, c-format
 msgid "Unable to add %s to deny list (%s)."
 msgstr "Imposs鱈vel adicionar %s a sua lista de usu叩rios bloqueados (%s)."
 
-#: src/protocols/novell/novell.c:829
+#: src/protocols/novell/novell.c:833
 #, c-format
 msgid "Unable to add %s to permit list (%s)."
 msgstr "Imposs鱈vel adicionar %s a sua lista de amigos (%s)."
 
-#: src/protocols/novell/novell.c:897
+#: src/protocols/novell/novell.c:901
 #, c-format
 msgid "Unable to remove %s from privacy list (%s)."
 msgstr "Imposs鱈vel remover %s da sua lista de privacidade (%s)."
 
-#: src/protocols/novell/novell.c:920 src/protocols/novell/novell.c:1574
+#: src/protocols/novell/novell.c:924 src/protocols/novell/novell.c:1594
 #, c-format
 msgid "Unable to change server side privacy settings (%s)."
 msgstr "Imposs鱈vel mudar configura巽探es de privacidade no servidor (%s)."
 
-#: src/protocols/novell/novell.c:992
+#: src/protocols/novell/novell.c:996
 #, c-format
 msgid "Unable to create conference (%s)."
 msgstr "Imposs鱈vel criar confer棚ncia (%s)."
 
-#: src/protocols/novell/novell.c:1103 src/protocols/novell/novell.c:1613
+#: src/protocols/novell/novell.c:1107 src/protocols/novell/novell.c:1633
 msgid "Error communicating with server. Closing connection."
 msgstr "Erro na comunica巽達o com o servidor. Fechando a conex達o."
 
-#: src/protocols/novell/novell.c:1426
+#: src/protocols/novell/novell.c:1446
 msgid "Userid"
 msgstr "ID do usu叩rio"
 
@@ -7239,46 +7284,46 @@
 #. tag, value);
 #. }
 #.
-#: src/protocols/novell/novell.c:1440
+#: src/protocols/novell/novell.c:1460
 msgid "Full name"
 msgstr "Nome completo"
 
-#: src/protocols/novell/novell.c:1460
+#: src/protocols/novell/novell.c:1480
 msgid "User Properties"
 msgstr "Propriedades do usu叩rio"
 
-#: src/protocols/novell/novell.c:1564
+#: src/protocols/novell/novell.c:1584
 #, c-format
 msgid "GroupWise Conference %d"
 msgstr "Confer棚ncia GroupWise %d"
 
-#: src/protocols/novell/novell.c:1589
+#: src/protocols/novell/novell.c:1609
 msgid "Unable to make SSL connection to server."
 msgstr "Imposs鱈vel criar conex達o SSL com o servidor."
 
-#: src/protocols/novell/novell.c:1619
+#: src/protocols/novell/novell.c:1639
 #, c-format
 msgid "Error processing event or response (%s)."
 msgstr "Erro ao processar evento ou resposta (%s)."
 
-#: src/protocols/novell/novell.c:1653
+#: src/protocols/novell/novell.c:1673
 msgid "Authenticating..."
 msgstr "Autenticando..."
 
-#: src/protocols/novell/novell.c:1668
+#: src/protocols/novell/novell.c:1688
 msgid "Waiting for response..."
 msgstr "Esperando resposta..."
 
-#: src/protocols/novell/novell.c:1803
+#: src/protocols/novell/novell.c:1823
 #, c-format
 msgid "%s has been invited to this conversation."
 msgstr "%s foi convidado para esta conversa."
 
-#: src/protocols/novell/novell.c:1830
+#: src/protocols/novell/novell.c:1850
 msgid "Invitation to Conversation"
 msgstr "Convite para conversa"
 
-#: src/protocols/novell/novell.c:1831
+#: src/protocols/novell/novell.c:1851
 #, c-format
 msgid ""
 "Invitation from: %s\n"
@@ -7289,15 +7334,15 @@
 "\n"
 "Enviado: %s"
 
-#: src/protocols/novell/novell.c:1833
+#: src/protocols/novell/novell.c:1853
 msgid "Would you like to join the conversation?"
 msgstr "Voc棚 deseja entrar na conversa?"
 
-#: src/protocols/novell/novell.c:1938
+#: src/protocols/novell/novell.c:1956
 msgid "You have been logged out because you logged in at another workstation."
 msgstr "Voc棚 foi desconectado porque conectou em outra esta巽達o de trabalho."
 
-#: src/protocols/novell/novell.c:1992
+#: src/protocols/novell/novell.c:2010
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
@@ -7309,7 +7354,7 @@
 #. *  gaim_request_fields(gc, _("Server Address"),...);
 #.
 #. ...but for now just error out with a nice message.
-#: src/protocols/novell/novell.c:2090
+#: src/protocols/novell/novell.c:2108
 msgid ""
 "Unable to connect to server. Please enter the address of the server you wish "
 "to connect to."
@@ -7317,28 +7362,28 @@
 "Imposs鱈vel conectar ao servidor. Por favor digite o endere巽o do servidor em "
 "que voc棚 deseja conectar."
 
-#: src/protocols/novell/novell.c:2112
+#: src/protocols/novell/novell.c:2130
 msgid "Error. SSL support is not installed."
 msgstr "Erro. O suporte a SSL n達o est叩 instalado."
 
-#: src/protocols/novell/novell.c:2421
+#: src/protocols/novell/novell.c:2434
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "Esta confer棚ncia foi fechada. N達o 辿 poss鱈vel enviar mais mensagens."
 
-#: src/protocols/novell/novell.c:2733 src/protocols/oscar/oscar.c:586
-#: src/protocols/oscar/oscar.c:6499 src/protocols/yahoo/yahoo.c:2513
+#: src/protocols/novell/novell.c:2780 src/protocols/oscar/oscar.c:570
+#: src/protocols/oscar/oscar.c:6502 src/protocols/yahoo/yahoo.c:2556
 msgid "Offline"
 msgstr "Desconectado"
 
-#: src/protocols/novell/novell.c:2744
+#: src/protocols/novell/novell.c:2791
 msgid "Message"
 msgstr "Mensagem:"
 
-#: src/protocols/novell/novell.c:2843 src/protocols/novell/novell.c:2899
+#: src/protocols/novell/novell.c:2890 src/protocols/novell/novell.c:2946
 msgid "Appear Offline"
 msgstr "Parecer desconectado"
 
-#: src/protocols/novell/novell.c:3293
+#: src/protocols/novell/novell.c:3340
 msgid "Initiate _Chat"
 msgstr "Iniciar _bate-papo"
 
@@ -7353,15 +7398,15 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/novell/novell.c:3389 src/protocols/novell/novell.c:3391
+#: src/protocols/novell/novell.c:3436 src/protocols/novell/novell.c:3438
 msgid "Novell GroupWise Messenger Protocol Plugin"
 msgstr "Plugin de protocolo do mensageiro do Novell GroupWise"
 
-#: src/protocols/novell/novell.c:3410
+#: src/protocols/novell/novell.c:3457
 msgid "Server address"
 msgstr "Endere巽o do servidor"
 
-#: src/protocols/novell/novell.c:3414
+#: src/protocols/novell/novell.c:3461
 msgid "Server port"
 msgstr "Porta do servidor"
 
@@ -7461,7 +7506,7 @@
 msgid "Not while on AOL"
 msgstr "N達o enquanto estiver na AOL"
 
-#: src/protocols/oscar/oscar.c:403
+#: src/protocols/oscar/oscar.c:400
 msgid ""
 "(There was an error converting this message.  The buddy you are speaking to "
 "most likely has a buggy client.)"
@@ -7469,158 +7514,158 @@
 "(Houve um erro ao converter esta mensagem. O amigo com quem voc棚 est叩 "
 "falando provavelmente usa um cliente com defeito.)"
 
-#: src/protocols/oscar/oscar.c:441
+#: src/protocols/oscar/oscar.c:425
 msgid "Voice"
 msgstr "Voz"
 
-#: src/protocols/oscar/oscar.c:444
+#: src/protocols/oscar/oscar.c:428
 msgid "AIM Direct IM"
 msgstr "Mensagem instant但nea direta do AIM"
 
-#: src/protocols/oscar/oscar.c:447 src/protocols/silc/silc.c:635
+#: src/protocols/oscar/oscar.c:431 src/protocols/silc/silc.c:635
 #: src/protocols/silc/util.c:506
 msgid "Chat"
 msgstr "Bate-papo"
 
-#: src/protocols/oscar/oscar.c:450 src/protocols/oscar/oscar.c:6803
+#: src/protocols/oscar/oscar.c:434 src/protocols/oscar/oscar.c:6804
 msgid "Get File"
 msgstr "Receber arquivo"
 
-#: src/protocols/oscar/oscar.c:457
+#: src/protocols/oscar/oscar.c:441
 msgid "Games"
 msgstr "Jogos"
 
-#: src/protocols/oscar/oscar.c:460
+#: src/protocols/oscar/oscar.c:444
 msgid "Add-Ins"
 msgstr "Add-Ins"
 
-#: src/protocols/oscar/oscar.c:463
+#: src/protocols/oscar/oscar.c:447
 msgid "Send Buddy List"
 msgstr "Enviar lista de amigos"
 
-#: src/protocols/oscar/oscar.c:466
+#: src/protocols/oscar/oscar.c:450
 msgid "ICQ Direct Connect"
 msgstr "Conex達o direta do ICQ"
 
-#: src/protocols/oscar/oscar.c:469
+#: src/protocols/oscar/oscar.c:453
 msgid "AP User"
 msgstr "Usu叩rio AP"
 
-#: src/protocols/oscar/oscar.c:472
+#: src/protocols/oscar/oscar.c:456
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
-#: src/protocols/oscar/oscar.c:475
+#: src/protocols/oscar/oscar.c:459
 msgid "Nihilist"
 msgstr "Niilista"
 
-#: src/protocols/oscar/oscar.c:478
+#: src/protocols/oscar/oscar.c:462
 msgid "ICQ Server Relay"
 msgstr "Relay do servidor ICQ"
 
-#: src/protocols/oscar/oscar.c:481
+#: src/protocols/oscar/oscar.c:465
 msgid "Old ICQ UTF8"
 msgstr "ICQ UTF8 antigo"
 
+#: src/protocols/oscar/oscar.c:468
+msgid "Trillian Encryption"
+msgstr "Criptografia do Trillian"
+
+#: src/protocols/oscar/oscar.c:471
+msgid "ICQ UTF8"
+msgstr "ICQ UTF8"
+
+#: src/protocols/oscar/oscar.c:474
+msgid "Hiptop"
+msgstr "Hiptop"
+
+#: src/protocols/oscar/oscar.c:477
+msgid "Security Enabled"
+msgstr "Seguran巽a ativada"
+
+#: src/protocols/oscar/oscar.c:480
+msgid "Video Chat"
+msgstr "Bate-papo com v鱈deo"
+
 #: src/protocols/oscar/oscar.c:484
-msgid "Trillian Encryption"
-msgstr "Criptografia do Trillian"
+msgid "iChat AV"
+msgstr "AV do iChat"
 
 #: src/protocols/oscar/oscar.c:487
-msgid "ICQ UTF8"
-msgstr "ICQ UTF8"
+msgid "Live Video"
+msgstr "V鱈deo ao vivo"
 
 #: src/protocols/oscar/oscar.c:490
-msgid "Hiptop"
-msgstr "Hiptop"
-
-#: src/protocols/oscar/oscar.c:493
-msgid "Security Enabled"
-msgstr "Seguran巽a ativada"
-
-#: src/protocols/oscar/oscar.c:496
-msgid "Video Chat"
-msgstr "Bate-papo com v鱈deo"
-
-#: src/protocols/oscar/oscar.c:500
-msgid "iChat AV"
-msgstr "AV do iChat"
-
-#: src/protocols/oscar/oscar.c:503
-msgid "Live Video"
-msgstr "V鱈deo ao vivo"
-
-#: src/protocols/oscar/oscar.c:506
 msgid "Camera"
 msgstr "C但mera"
 
-#: src/protocols/oscar/oscar.c:524 src/protocols/oscar/oscar.c:5496
-#: src/protocols/oscar/oscar.c:6693
+#: src/protocols/oscar/oscar.c:508 src/protocols/oscar/oscar.c:5498
+#: src/protocols/oscar/oscar.c:6696
 msgid "Free For Chat"
 msgstr "Livre para conversa"
 
-#: src/protocols/oscar/oscar.c:528 src/protocols/oscar/oscar.c:5490
-#: src/protocols/oscar/oscar.c:6691
+#: src/protocols/oscar/oscar.c:512 src/protocols/oscar/oscar.c:5492
+#: src/protocols/oscar/oscar.c:6694
 msgid "Not Available"
 msgstr "N達o dispon鱈vel"
 
-#: src/protocols/oscar/oscar.c:530 src/protocols/oscar/oscar.c:5493
-#: src/protocols/oscar/oscar.c:6692
+#: src/protocols/oscar/oscar.c:514 src/protocols/oscar/oscar.c:5495
+#: src/protocols/oscar/oscar.c:6695
 msgid "Occupied"
 msgstr "Ocupado"
 
-#: src/protocols/oscar/oscar.c:534
+#: src/protocols/oscar/oscar.c:518
 msgid "Web Aware"
 msgstr "Permitir que outros vejam seu status pela Web"
 
-#: src/protocols/oscar/oscar.c:602
+#: src/protocols/oscar/oscar.c:586
 msgid "Capabilities"
 msgstr "Recursos"
 
-#: src/protocols/oscar/oscar.c:609
+#: src/protocols/oscar/oscar.c:595
 msgid "Buddy Comment"
 msgstr "Coment叩rio do amigo"
 
-#: src/protocols/oscar/oscar.c:744
+#: src/protocols/oscar/oscar.c:730
 #, c-format
 msgid "Direct IM with %s closed"
 msgstr "Mensagem instant但nea direta com %s fechada"
 
-#: src/protocols/oscar/oscar.c:746
+#: src/protocols/oscar/oscar.c:732
 #, c-format
 msgid "Direct IM with %s failed"
 msgstr "Mensagem instant但nea direta com %s falhou"
 
-#: src/protocols/oscar/oscar.c:753
+#: src/protocols/oscar/oscar.c:739
 msgid "Direct Connect failed"
 msgstr "Conex達o direta falhou"
 
-#: src/protocols/oscar/oscar.c:830 src/protocols/oscar/oscar.c:961
+#: src/protocols/oscar/oscar.c:816 src/protocols/oscar/oscar.c:947
 #, c-format
 msgid "Direct IM with %s established"
 msgstr "Mensagem instant但nea direta com %s estabelecida"
 
-#: src/protocols/oscar/oscar.c:911
+#: src/protocols/oscar/oscar.c:897
 #, c-format
 msgid "Attempting to connect to %s at %s:%hu for Direct IM."
 msgstr "Tentando conectar a %s em %s:%hu para mensagem instant但nea direta."
 
-#: src/protocols/oscar/oscar.c:1328
+#: src/protocols/oscar/oscar.c:1314
 #, c-format
 msgid "Asking %s to connect to us at %s:%hu for Direct IM."
 msgstr ""
 "Pedindo para %s conectar a n坦s em %s:%hu para mensagem instant但nea direta."
 
-#: src/protocols/oscar/oscar.c:1333
+#: src/protocols/oscar/oscar.c:1319
 msgid "Unable to open Direct IM"
 msgstr "Imposs鱈vel abrir mensagem instant但nea direta"
 
-#: src/protocols/oscar/oscar.c:1368
+#: src/protocols/oscar/oscar.c:1354
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr "Voc棚 selecionou abrir uma mensagem instant但nea direta com %s."
 
-#: src/protocols/oscar/oscar.c:1372
+#: src/protocols/oscar/oscar.c:1358
 msgid ""
 "Because this reveals your IP address, it may be considered a privacy risk.  "
 "Do you wish to continue?"
@@ -7628,24 +7673,24 @@
 "Por revelar seu endere巽o IP, isto pode ser considerado um risco de "
 "privacidade. Deseja continuar?"
 
-#: src/protocols/oscar/oscar.c:1376 src/protocols/oscar/oscar.c:3329
+#: src/protocols/oscar/oscar.c:1362 src/protocols/oscar/oscar.c:3320
 msgid "Connect"
 msgstr "Conectar"
 
-#: src/protocols/oscar/oscar.c:1442 src/protocols/toc/toc.c:872
+#: src/protocols/oscar/oscar.c:1429 src/protocols/toc/toc.c:873
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "Voc棚 foi desconectado da sala %s."
 
-#: src/protocols/oscar/oscar.c:1458
+#: src/protocols/oscar/oscar.c:1448
 msgid "Chat is currently unavailable"
 msgstr "O recurso de bate-papo est叩 indispon鱈vel no momento"
 
-#: src/protocols/oscar/oscar.c:1539
+#: src/protocols/oscar/oscar.c:1529
 msgid "Screen name sent"
 msgstr "Nome de usu叩rio enviado"
 
-#: src/protocols/oscar/oscar.c:1553
+#: src/protocols/oscar/oscar.c:1543
 #, c-format
 msgid ""
 "Unable to login: Could not sign on as %s because the screen name is "
@@ -7656,46 +7701,46 @@
 "de usu叩rio t棚m que come巽ar com uma letra e conter apenas letras, n炭meros e "
 "espa巽os, ou conter apenas n炭meros."
 
-#: src/protocols/oscar/oscar.c:1581
+#: src/protocols/oscar/oscar.c:1571
 msgid "Unable to login to AIM"
 msgstr "Imposs鱈vel conectar ao AIM"
 
-#: src/protocols/oscar/oscar.c:1682 src/protocols/oscar/oscar.c:2119
+#: src/protocols/oscar/oscar.c:1672 src/protocols/oscar/oscar.c:2109
 msgid "Could Not Connect"
 msgstr "N達o foi poss鱈vel conectar"
 
-#: src/protocols/oscar/oscar.c:1690
+#: src/protocols/oscar/oscar.c:1680
 msgid "Connection established, cookie sent"
 msgstr "Conex達o estabelecida, cookie enviado"
 
-#: src/protocols/oscar/oscar.c:1803 src/protocols/yahoo/yahoo_filexfer.c:180
+#: src/protocols/oscar/oscar.c:1793 src/protocols/yahoo/yahoo_filexfer.c:180
 #: src/protocols/yahoo/yahoo_filexfer.c:189
 #: src/protocols/yahoo/yahoo_filexfer.c:199
 msgid "Unable to establish file descriptor."
 msgstr "Imposs鱈vel estabelecer descritor de arquivo."
 
-#: src/protocols/oscar/oscar.c:1808
+#: src/protocols/oscar/oscar.c:1798
 msgid "Unable to create new connection."
 msgstr "Imposs鱈vel criar nova conex達o."
 
-#: src/protocols/oscar/oscar.c:1879
+#: src/protocols/oscar/oscar.c:1869
 msgid "Unable to establish listener socket."
 msgstr "Imposs鱈vel estabelecer socket de escuta."
 
-#: src/protocols/oscar/oscar.c:2003 src/protocols/toc/toc.c:541
+#: src/protocols/oscar/oscar.c:1993 src/protocols/toc/toc.c:541
 msgid "Incorrect nickname or password."
 msgstr "Usu叩rio ou senha incorreto(a)."
 
-#: src/protocols/oscar/oscar.c:2008
+#: src/protocols/oscar/oscar.c:1998
 msgid "Your account is currently suspended."
 msgstr "Atualmente, sua conta est叩 suspensa."
 
 #. service temporarily unavailable
-#: src/protocols/oscar/oscar.c:2012
+#: src/protocols/oscar/oscar.c:2002
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "O servi巽o AOL Instant Messenger est叩 temporariamente indispon鱈vel."
 
-#: src/protocols/oscar/oscar.c:2017
+#: src/protocols/oscar/oscar.c:2007
 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."
@@ -7704,23 +7749,23 @@
 "minutos e tente novamente. Se voc棚 continuar tentando, vai ter que esperar "
 "ainda mais."
 
-#: src/protocols/oscar/oscar.c:2022
+#: src/protocols/oscar/oscar.c:2012
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr ""
 "A vers達o do cliente que voc棚 est叩 usando 辿 velha demais. Favor atualizar em %"
 "s"
 
-#: src/protocols/oscar/oscar.c:2054
+#: src/protocols/oscar/oscar.c:2044
 msgid "Internal Error"
 msgstr "Erro interno"
 
-#: src/protocols/oscar/oscar.c:2126
+#: src/protocols/oscar/oscar.c:2116
 msgid "Received authorization"
 msgstr "Autoriza巽達o recebida"
 
-#: src/protocols/oscar/oscar.c:2162 src/protocols/oscar/oscar.c:2192
-#: src/protocols/oscar/oscar.c:2280
+#: src/protocols/oscar/oscar.c:2152 src/protocols/oscar/oscar.c:2182
+#: src/protocols/oscar/oscar.c:2271
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
@@ -7729,24 +7774,24 @@
 "Voc棚 pode ser desconectado num curto per鱈odo de tempo. Voc棚 pode querer usar "
 "o TOC at辿 que isso esteja corrigido. Verifique por atualiza巽探es em %s."
 
-#: src/protocols/oscar/oscar.c:2165 src/protocols/oscar/oscar.c:2195
+#: src/protocols/oscar/oscar.c:2155 src/protocols/oscar/oscar.c:2185
 msgid "Gaim was unable to get a valid AIM login hash."
 msgstr "O Gaim n達o p担de conseguir um hash de conex達o AIM v叩lido."
 
-#: src/protocols/oscar/oscar.c:2283
+#: src/protocols/oscar/oscar.c:2274
 msgid "Gaim was unable to get a valid login hash."
 msgstr "O Gaim n達o p担de conseguir um hash de conex達o v叩lido."
 
-#: src/protocols/oscar/oscar.c:3113 src/protocols/oscar/oscar.c:3135
+#: src/protocols/oscar/oscar.c:3104 src/protocols/oscar/oscar.c:3126
 msgid "(There was an error receiving this message)"
 msgstr "(Houve um erro ao receber esta mensagem)"
 
-#: src/protocols/oscar/oscar.c:3321
+#: src/protocols/oscar/oscar.c:3312
 #, c-format
 msgid "%s has just asked to directly connect to %s"
 msgstr "%s acabou de pedir para fazer uma conex達o direta com %s"
 
-#: src/protocols/oscar/oscar.c:3324
+#: src/protocols/oscar/oscar.c:3315
 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 "
@@ -7756,20 +7801,20 @@
 "para mensagens instant但neas com imagens. Por revelar seu IP, isto pode ser "
 "considerado um risco de privacidade."
 
-#: src/protocols/oscar/oscar.c:3360
+#: src/protocols/oscar/oscar.c:3351
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr ""
 "Por favor me autorize para que eu possa adicion叩-lo � minha lista de amigos."
 
-#: src/protocols/oscar/oscar.c:3368
+#: src/protocols/oscar/oscar.c:3359
 msgid "Authorization Request Message:"
 msgstr "Mensagem para pedido de autoriza巽達o:"
 
-#: src/protocols/oscar/oscar.c:3369
+#: src/protocols/oscar/oscar.c:3360
 msgid "Please authorize me!"
 msgstr "Por favor me autorize!"
 
-#: src/protocols/oscar/oscar.c:3399
+#: src/protocols/oscar/oscar.c:3390
 #, c-format
 msgid ""
 "The user %s requires authorization before being added to a buddy list.  Do "
@@ -7778,23 +7823,23 @@
 "O usu叩rio %s requer autoriza巽達o antes de ser adicionado a uma lista de "
 "amigos. Voc棚 deseja enviar um pedido de autoriza巽達o?"
 
-#: src/protocols/oscar/oscar.c:3404 src/protocols/oscar/oscar.c:3406
+#: src/protocols/oscar/oscar.c:3395 src/protocols/oscar/oscar.c:3397
 msgid "Request Authorization"
 msgstr "Pedir autoriza巽達o"
 
-#: src/protocols/oscar/oscar.c:3454 src/protocols/oscar/oscar.c:3456
-#: src/protocols/oscar/oscar.c:3463 src/protocols/oscar/oscar.c:3545
-#: src/protocols/oscar/oscar.c:3565 src/protocols/oscar/oscar.c:3919
-#: src/protocols/oscar/oscar.c:3979 src/protocols/oscar/oscar.c:6118
-#: src/protocols/oscar/oscar.c:6164
+#: src/protocols/oscar/oscar.c:3445 src/protocols/oscar/oscar.c:3447
+#: src/protocols/oscar/oscar.c:3454 src/protocols/oscar/oscar.c:3536
+#: src/protocols/oscar/oscar.c:3556 src/protocols/oscar/oscar.c:3908
+#: src/protocols/oscar/oscar.c:3965 src/protocols/oscar/oscar.c:3969
+#: src/protocols/oscar/oscar.c:6123 src/protocols/oscar/oscar.c:6169
 msgid "No reason given."
 msgstr "Nenhum motivo foi dado."
 
-#: src/protocols/oscar/oscar.c:3462
+#: src/protocols/oscar/oscar.c:3453
 msgid "Authorization Denied Message:"
 msgstr "Mensagem de recusa de autoriza巽達o:"
 
-#: src/protocols/oscar/oscar.c:3545
+#: src/protocols/oscar/oscar.c:3536
 #, c-format
 msgid ""
 "The user %u wants to add you to their buddy list for the following reason:\n"
@@ -7804,11 +7849,11 @@
 "motivo: \n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3553 src/protocols/oscar/oscar.c:6124
+#: src/protocols/oscar/oscar.c:3544 src/protocols/oscar/oscar.c:6129
 msgid "Authorization Request"
 msgstr "Pedido de autoriza巽達o"
 
-#: src/protocols/oscar/oscar.c:3565
+#: src/protocols/oscar/oscar.c:3556
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -7819,18 +7864,18 @@
 "seguinte motivo:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3566
+#: src/protocols/oscar/oscar.c:3557
 msgid "ICQ authorization denied."
 msgstr "Autoriza巽達o do ICQ negada."
 
 #. Someone has granted you authorization
-#: src/protocols/oscar/oscar.c:3573
+#: src/protocols/oscar/oscar.c:3564
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
 msgstr ""
 "O usu叩rio %u aceitou seu pedido para adicion叩-lo � sua lista de amigos."
 
-#: src/protocols/oscar/oscar.c:3581
+#: src/protocols/oscar/oscar.c:3572
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -7843,7 +7888,7 @@
 "De: %s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3589
+#: src/protocols/oscar/oscar.c:3580
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -7856,7 +7901,7 @@
 "De: %s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3597
+#: src/protocols/oscar/oscar.c:3588
 #, c-format
 msgid ""
 "You have received an ICQ email from %s [%s]\n"
@@ -7869,34 +7914,34 @@
 "A mensagem 辿: \n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3618
+#: src/protocols/oscar/oscar.c:3609
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
 msgstr "O usu叩rio de ICQ %u lhe mandou um amigo: %s (%s)"
 
-#: src/protocols/oscar/oscar.c:3624
+#: src/protocols/oscar/oscar.c:3615
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr "Voc棚 quer adicionar este amigo � sua lista de amigos?"
 
-#: src/protocols/oscar/oscar.c:3628
+#: src/protocols/oscar/oscar.c:3619
 msgid "Decline"
 msgstr "Rejeitar"
 
-#: src/protocols/oscar/oscar.c:3713
+#: src/protocols/oscar/oscar.c:3703
 #, 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] "Voc棚 perdeu %hu mensagem de %s por que ela era inv叩lida."
 msgstr[1] "Voc棚 perdeu %hu mensagens de %s por que elas eram inv叩lidas."
 
-#: src/protocols/oscar/oscar.c:3722
+#: src/protocols/oscar/oscar.c:3712
 #, 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] "Voc棚 perdeu %hu mensagem de %s porque ela era muito extensa."
 msgstr[1] "Voc棚 perdeu %hu mensagens de %s porque elas eram muito extensas."
 
-#: src/protocols/oscar/oscar.c:3731
+#: src/protocols/oscar/oscar.c:3721
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -7907,70 +7952,78 @@
 msgstr[1] ""
 "Voc棚 perdeu %hu mensagens de %s porque o limite de freq端棚ncia foi excedido."
 
-#: src/protocols/oscar/oscar.c:3740
+#: src/protocols/oscar/oscar.c:3730
 #, 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] "Voc棚 perdeu %hu mensagem de %s porque ele(a) foi muito malvado(a)."
 msgstr[1] "Voc棚 perdeu %hu mensagens de %s porque ele(a) foi muito malvado(a)."
 
-#: src/protocols/oscar/oscar.c:3749
+#: src/protocols/oscar/oscar.c:3739
 #, 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] "Voc棚 perdeu %hu mensagem de %s porque voc棚 辿 muito malvado(a)."
 msgstr[1] "Voc棚 perdeu %hu mensagens de %s porque voc棚 辿 muito malvado(a)."
 
-#: src/protocols/oscar/oscar.c:3758
+#: src/protocols/oscar/oscar.c:3748
 #, 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] "Voc棚 perdeu %hu mensagem de %s por um motivo desconhecido."
 msgstr[1] "Voc棚 perdeu %hu mensagens de %s por um motivo desconhecido."
 
-#: src/protocols/oscar/oscar.c:3815 src/protocols/oscar/oscar.c:4039
+#: src/protocols/oscar/oscar.c:3802 src/protocols/oscar/oscar.c:4031
 #, c-format
 msgid "Info for %s"
 msgstr "Informa巽探es de %s:"
 
-#: src/protocols/oscar/oscar.c:3881
+#: src/protocols/oscar/oscar.c:3868
 #, c-format
 msgid "SNAC threw error: %s\n"
 msgstr "Erro do SNAC: %s\n"
 
-#: src/protocols/oscar/oscar.c:3882
+#: src/protocols/oscar/oscar.c:3869
 msgid "Unknown error"
 msgstr "Erro desconhecido"
 
-#. Data is assumed to be the destination sn
-#: src/protocols/oscar/oscar.c:3917
+#: src/protocols/oscar/oscar.c:3905
+msgid "Your message did not get sent."
+msgstr "Sua mensagem n達o foi enviada."
+
+#: src/protocols/oscar/oscar.c:3906
 #, c-format
 msgid "Your message to %s did not get sent:"
 msgstr "Sua mensagem para %s n達o foi enviada:"
 
-#: src/protocols/oscar/oscar.c:3976
+#: src/protocols/oscar/oscar.c:3965
+#, c-format
+msgid "User information not available: %s"
+msgstr "Informa巽達o do usu叩rio indispon鱈vel: %s"
+
+#: src/protocols/oscar/oscar.c:3967
 #, c-format
 msgid "User information for %s unavailable:"
 msgstr "Informa巽達o do usu叩rio %s indispon鱈vel:"
 
-#: src/protocols/oscar/oscar.c:3999
+#: src/protocols/oscar/oscar.c:3991
 msgid "Warning Level"
 msgstr "N鱈vel de alerta"
 
-#: src/protocols/oscar/oscar.c:4002
+#: src/protocols/oscar/oscar.c:3994
 msgid "Online Since"
 msgstr "Conectado desde"
 
-#: src/protocols/oscar/oscar.c:4006 src/protocols/yahoo/yahoo_profile.c:1118
+#: src/protocols/oscar/oscar.c:3998 src/protocols/yahoo/yahoo_profile.c:1118
 msgid "Member Since"
 msgstr "Membro desde"
 
-#: src/protocols/oscar/oscar.c:4090
+#: src/protocols/oscar/oscar.c:4082
 msgid "Your AIM connection may be lost."
 msgstr "Sua conex達o AIM pode ter sido perdida."
 
 #. The conversion failed!
-#: src/protocols/oscar/oscar.c:4276
+#: src/protocols/oscar/oscar.c:4268
 msgid ""
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
@@ -7978,11 +8031,11 @@
 "[N達o foi poss鱈vel exibir uma mensagem deste usu叩rio porque ela continha "
 "caracteres inv叩lidos.]"
 
-#: src/protocols/oscar/oscar.c:4494
+#: src/protocols/oscar/oscar.c:4488
 msgid "Rate limiting error."
 msgstr "Erro na limita巽達o da taxa."
 
-#: src/protocols/oscar/oscar.c:4495
+#: src/protocols/oscar/oscar.c:4489
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
@@ -7990,7 +8043,7 @@
 "A 炭ltima a巽達o que voc棚 tentou n達o p担de ser executada porque voc棚 excedeu a "
 "taxa limite. Por favor espere 10 segundos e tente novamente."
 
-#: src/protocols/oscar/oscar.c:4558
+#: src/protocols/oscar/oscar.c:4552
 msgid ""
 "You have been disconnected because you have signed on with this screen name "
 "at another location."
@@ -7998,113 +8051,113 @@
 "Voc棚 foi desconectado porque conectou-se de outro local com o mesmo nome de "
 "usu叩rio."
 
-#: src/protocols/oscar/oscar.c:4560
+#: src/protocols/oscar/oscar.c:4554
 msgid "You have been signed off for an unknown reason."
 msgstr "Voc棚 foi desconectado por um motivo desconhecido."
 
-#: src/protocols/oscar/oscar.c:4591
+#: src/protocols/oscar/oscar.c:4585
 msgid "Finalizing connection"
 msgstr "Finalizando a conex達o"
 
-#: src/protocols/oscar/oscar.c:4861 src/protocols/oscar/oscar.c:4868
+#: src/protocols/oscar/oscar.c:4856 src/protocols/oscar/oscar.c:4863
 msgid "Email Address"
 msgstr "Endere巽o de email"
 
-#: src/protocols/oscar/oscar.c:4873 src/protocols/silc/util.c:538
+#: src/protocols/oscar/oscar.c:4868 src/protocols/silc/util.c:538
 msgid "Mobile Phone"
 msgstr "Telefone m坦vel"
 
-#: src/protocols/oscar/oscar.c:4874
+#: src/protocols/oscar/oscar.c:4869
 msgid "Not specified"
 msgstr "N達o especificado"
 
-#: src/protocols/oscar/oscar.c:4875 src/protocols/trepia/trepia.c:281
+#: src/protocols/oscar/oscar.c:4870 src/protocols/trepia/trepia.c:281
 #: src/protocols/trepia/trepia.c:407
 msgid "Female"
 msgstr "Feminino"
 
-#: src/protocols/oscar/oscar.c:4875 src/protocols/trepia/trepia.c:280
+#: src/protocols/oscar/oscar.c:4870 src/protocols/trepia/trepia.c:280
 #: src/protocols/trepia/trepia.c:407
 msgid "Male"
 msgstr "Masculino"
 
-#: src/protocols/oscar/oscar.c:4891
+#: src/protocols/oscar/oscar.c:4886
 msgid "Personal Web Page"
 msgstr "P叩gina da web pessoal"
 
-#: src/protocols/oscar/oscar.c:4895
+#: src/protocols/oscar/oscar.c:4890
 msgid "Additional Information"
 msgstr "Informa巽探es adicionais"
 
-#: src/protocols/oscar/oscar.c:4900
+#: src/protocols/oscar/oscar.c:4895
 msgid "Home Address"
 msgstr "Endere巽o de casa"
 
-#: src/protocols/oscar/oscar.c:4904 src/protocols/oscar/oscar.c:4912
+#: src/protocols/oscar/oscar.c:4899 src/protocols/oscar/oscar.c:4907
 msgid "Zip Code"
 msgstr "C坦digo Postal (CEP)"
 
-#: src/protocols/oscar/oscar.c:4908
+#: src/protocols/oscar/oscar.c:4903
 msgid "Work Address"
 msgstr "Endere巽o do trabalho"
 
+#: src/protocols/oscar/oscar.c:4911
+msgid "Work Information"
+msgstr "Informa巽探es do trabalho"
+
+#: src/protocols/oscar/oscar.c:4912
+msgid "Company"
+msgstr "Empresa"
+
+#: src/protocols/oscar/oscar.c:4913
+msgid "Division"
+msgstr "Divis達o"
+
+#: src/protocols/oscar/oscar.c:4914
+msgid "Position"
+msgstr "Posi巽達o"
+
 #: src/protocols/oscar/oscar.c:4916
-msgid "Work Information"
-msgstr "Informa巽探es do trabalho"
-
-#: src/protocols/oscar/oscar.c:4917
-msgid "Company"
-msgstr "Empresa"
-
-#: src/protocols/oscar/oscar.c:4918
-msgid "Division"
-msgstr "Divis達o"
-
-#: src/protocols/oscar/oscar.c:4919
-msgid "Position"
-msgstr "Posi巽達o"
-
-#: src/protocols/oscar/oscar.c:4921
 msgid "Web Page"
 msgstr "P叩gina da web"
 
-#: src/protocols/oscar/oscar.c:4927
+#: src/protocols/oscar/oscar.c:4926
 #, c-format
 msgid "ICQ Info for %s"
 msgstr "Informa巽探es do ICQ de %s:"
 
-#: src/protocols/oscar/oscar.c:4976
+#: src/protocols/oscar/oscar.c:4975
 msgid "Pop-Up Message"
 msgstr "Mensagem pop-up"
 
-#: src/protocols/oscar/oscar.c:4997
+#: src/protocols/oscar/oscar.c:4996
 #, c-format
 msgid "The following screen names are associated with %s"
 msgstr "Os seguintes nomes de usu叩rio est達o associados com %s"
 
-#: src/protocols/oscar/oscar.c:5001
+#: src/protocols/oscar/oscar.c:5000
 msgid "Search Results"
 msgstr "Resultados da procura"
 
-#: src/protocols/oscar/oscar.c:5018
+#: src/protocols/oscar/oscar.c:5017
 #, c-format
 msgid "No results found for email address %s"
 msgstr "Nenhum resultado encontrado para o endere巽o de email %s"
 
-#: src/protocols/oscar/oscar.c:5039
+#: src/protocols/oscar/oscar.c:5038
 #, c-format
 msgid "You should receive an email asking to confirm %s."
 msgstr "Voc棚 deve receber um email pedindo para confirmar %s."
 
-#: src/protocols/oscar/oscar.c:5041
+#: src/protocols/oscar/oscar.c:5040
 msgid "Account Confirmation Requested"
 msgstr "Confirma巽達o de conta recebida"
 
-#: src/protocols/oscar/oscar.c:5069
+#: src/protocols/oscar/oscar.c:5071
 msgid "Error Changing Account Info"
 msgstr "Erro ao mudar informa巽探es da conta"
 
-#: src/protocols/oscar/oscar.c:5072
+#: src/protocols/oscar/oscar.c:5074
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -8113,7 +8166,7 @@
 "Erro 0x%04x: Imposs鱈vel formatar nome de usu叩rio pois o nome requisitado "
 "difere do original."
 
-#: src/protocols/oscar/oscar.c:5075
+#: src/protocols/oscar/oscar.c:5077
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -8122,7 +8175,7 @@
 "Erro 0x%04x: Imposs鱈vel formatar nome de usu叩rio pois o nome requisitado "
 "termina com um espa巽o."
 
-#: src/protocols/oscar/oscar.c:5078
+#: src/protocols/oscar/oscar.c:5080
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -8131,7 +8184,7 @@
 "Erro 0x%04x: Imposs鱈vel formatar nome de usu叩rio pois o nome requisitado 辿 "
 "muito extenso."
 
-#: src/protocols/oscar/oscar.c:5081
+#: src/protocols/oscar/oscar.c:5083
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because there is already a "
@@ -8140,7 +8193,7 @@
 "Erro 0x%04x: Imposs鱈vel mudar endere巽o de email porque j叩 existe um pedido "
 "pendente para esse nome de usu叩rio."
 
-#: src/protocols/oscar/oscar.c:5084
+#: src/protocols/oscar/oscar.c:5086
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address has "
@@ -8149,7 +8202,7 @@
 "Erro 0x%04x: Imposs鱈vel mudar o endere巽o de email porque este j叩 possui "
 "muitos nomes de usu叩rio associados a ele."
 
-#: src/protocols/oscar/oscar.c:5087
+#: src/protocols/oscar/oscar.c:5089
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address is "
@@ -8157,12 +8210,12 @@
 msgstr ""
 "Erro 0x%04x: Imposs鱈vel mudar o endere巽o de email porque este 辿 inv叩lido."
 
-#: src/protocols/oscar/oscar.c:5090
+#: src/protocols/oscar/oscar.c:5092
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "Erro 0x%04x: Erro desconhecido."
 
-#: src/protocols/oscar/oscar.c:5100
+#: src/protocols/oscar/oscar.c:5102
 #, c-format
 msgid ""
 "Your screen name is currently formatted as follows:\n"
@@ -8171,27 +8224,27 @@
 "Atualmente, seu nome de usu叩rio est叩 formatado desta maneira:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:5101 src/protocols/oscar/oscar.c:5108
+#: src/protocols/oscar/oscar.c:5103 src/protocols/oscar/oscar.c:5110
 msgid "Account Info"
 msgstr "Informa巽探es da conta"
 
-#: src/protocols/oscar/oscar.c:5106
+#: src/protocols/oscar/oscar.c:5108
 #, c-format
 msgid "The email address for %s is %s"
 msgstr "O endere巽o de email de %s 辿 %s"
 
-#: src/protocols/oscar/oscar.c:5171
+#: src/protocols/oscar/oscar.c:5173
 msgid ""
 "Your IM Image was not sent. You must be Direct Connected to send IM Images."
 msgstr ""
 "Sua imagem da mensagem instant但nea n達o foi enviada. Voc棚 precisa estar "
 "conectado diretamente para enviar imagens por mensagens instant但neas."
 
-#: src/protocols/oscar/oscar.c:5345
+#: src/protocols/oscar/oscar.c:5347
 msgid "Unable to set AIM profile."
 msgstr "Imposs鱈vel definir perfil AIM."
 
-#: src/protocols/oscar/oscar.c:5346
+#: src/protocols/oscar/oscar.c:5348
 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 "
@@ -8201,7 +8254,7 @@
 "procedimento de conex達o ser conclu鱈do. Seu perfil continua o mesmo; tente "
 "defini-lo novamente quando voc棚 estiver totalmente conectado."
 
-#: src/protocols/oscar/oscar.c:5373
+#: src/protocols/oscar/oscar.c:5375
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  Gaim has truncated "
@@ -8216,19 +8269,19 @@
 "O tamanho m叩ximo de %d bytes do seu perfil foi excedido. O Gaim truncou-o "
 "para voc棚."
 
-#: src/protocols/oscar/oscar.c:5378
+#: src/protocols/oscar/oscar.c:5380
 msgid "Profile too long."
 msgstr "Perfil muito extenso."
 
-#: src/protocols/oscar/oscar.c:5394 src/protocols/oscar/oscar.c:6698
+#: src/protocols/oscar/oscar.c:5396 src/protocols/oscar/oscar.c:6701
 msgid "Visible"
 msgstr "Vis鱈vel"
 
-#: src/protocols/oscar/oscar.c:5412
+#: src/protocols/oscar/oscar.c:5414
 msgid "Unable to set AIM away message."
 msgstr "Imposs鱈vel definir mensagem de aus棚ncia do AIM."
 
-#: src/protocols/oscar/oscar.c:5413
+#: src/protocols/oscar/oscar.c:5415
 msgid ""
 "You have probably requested to set your away message before the login "
 "procedure completed.  You remain in a \"present\" state; try setting it "
@@ -8239,7 +8292,7 @@
 "\"presente\"; tente defini-lo novamente quando voc棚 estiver totalmente "
 "conectado."
 
-#: src/protocols/oscar/oscar.c:5453
+#: src/protocols/oscar/oscar.c:5455
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  Gaim has "
@@ -8254,11 +8307,11 @@
 "O tamanho m叩ximo de %d bytes da mensagem de aus棚ncia foi excedido. O Gaim "
 "truncou-a e definiu seu status como ausente."
 
-#: src/protocols/oscar/oscar.c:5458
+#: src/protocols/oscar/oscar.c:5460
 msgid "Away message too long."
 msgstr "Mensagem de aus棚ncia muito extensa."
 
-#: src/protocols/oscar/oscar.c:5536
+#: src/protocols/oscar/oscar.c:5538
 #, c-format
 msgid ""
 "Could not add the buddy %s because the screen name is invalid.  Screen names "
@@ -8269,16 +8322,16 @@
 "Nomes de usu叩rio t棚m que come巽ar com uma letra e conter apenas letras, "
 "n炭meros e espa巽os, ou conter apenas n炭meros."
 
-#: src/protocols/oscar/oscar.c:5537 src/protocols/oscar/oscar.c:5985
-#: src/protocols/oscar/oscar.c:5998
+#: src/protocols/oscar/oscar.c:5540 src/protocols/oscar/oscar.c:5989
+#: src/protocols/oscar/oscar.c:6003
 msgid "Unable To Add"
 msgstr "Imposs鱈vel adicionar"
 
-#: src/protocols/oscar/oscar.c:5698
+#: src/protocols/oscar/oscar.c:5701
 msgid "Unable To Retrieve Buddy List"
 msgstr "Imposs鱈vel recuperar lista de amigos"
 
-#: src/protocols/oscar/oscar.c:5699
+#: src/protocols/oscar/oscar.c:5702
 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 "
@@ -8288,13 +8341,13 @@
 "momento. Sua lista de amigos n達o foi perdida, e provavelmente estar叩 "
 "dispon鱈vel em algumas horas."
 
-#: src/protocols/oscar/oscar.c:5881 src/protocols/oscar/oscar.c:5882
-#: src/protocols/oscar/oscar.c:5887 src/protocols/oscar/oscar.c:6042
-#: src/protocols/oscar/oscar.c:6043 src/protocols/oscar/oscar.c:6048
+#: src/protocols/oscar/oscar.c:5884 src/protocols/oscar/oscar.c:5885
+#: src/protocols/oscar/oscar.c:5890 src/protocols/oscar/oscar.c:6047
+#: src/protocols/oscar/oscar.c:6048 src/protocols/oscar/oscar.c:6053
 msgid "Orphans"
 msgstr "�rf達os"
 
-#: src/protocols/oscar/oscar.c:5984
+#: src/protocols/oscar/oscar.c:5987
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -8303,11 +8356,11 @@
 "N達o foi poss鱈vel adicionar o amigo %s porque voc棚 tem muitos amigos na sua "
 "lista de amigos. Por favor remova um e tente novamente."
 
-#: src/protocols/oscar/oscar.c:5984 src/protocols/oscar/oscar.c:5997
+#: src/protocols/oscar/oscar.c:5987 src/protocols/oscar/oscar.c:6001
 msgid "(no name)"
 msgstr "(sem nome)"
 
-#: src/protocols/oscar/oscar.c:5997
+#: src/protocols/oscar/oscar.c:6001
 #, c-format
 msgid ""
 "Could not add the buddy %s for an unknown reason.  The most common reason "
@@ -8318,7 +8371,7 @@
 "mais comum para isso 辿 que voc棚 tem o n炭mero m叩ximo de amigos permitido na "
 "sua lista de amigos."
 
-#: src/protocols/oscar/oscar.c:6079
+#: src/protocols/oscar/oscar.c:6084
 #, c-format
 msgid ""
 "The user %s has given you permission to add you to their buddy list.  Do you "
@@ -8327,11 +8380,11 @@
 "O usu叩rio %s lhe deu permiss達o para adicion叩-lo � sua lista de amigos. Voc棚 "
 "deseja adicion叩-lo?"
 
-#: src/protocols/oscar/oscar.c:6085
+#: src/protocols/oscar/oscar.c:6090
 msgid "Authorization Given"
 msgstr "Autoriza巽達o concedida"
 
-#: src/protocols/oscar/oscar.c:6118
+#: src/protocols/oscar/oscar.c:6123
 #, c-format
 msgid ""
 "The user %s wants to add you to their buddy list for the following reason:\n"
@@ -8342,18 +8395,18 @@
 "%s"
 
 #. Granted
-#: src/protocols/oscar/oscar.c:6160
+#: src/protocols/oscar/oscar.c:6165
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
 msgstr ""
 "O usu叩rio %s aceitou seu pedido para adicion叩-lo � sua lista de amigos."
 
-#: src/protocols/oscar/oscar.c:6161
+#: src/protocols/oscar/oscar.c:6166
 msgid "Authorization Granted"
 msgstr "Autoriza巽達o concedida"
 
 #. Denied
-#: src/protocols/oscar/oscar.c:6164
+#: src/protocols/oscar/oscar.c:6169
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -8364,75 +8417,80 @@
 "seguinte motivo: \n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:6165
+#: src/protocols/oscar/oscar.c:6170
 msgid "Authorization Denied"
 msgstr "Autoriza巽達o negada"
 
-#: src/protocols/oscar/oscar.c:6202 src/protocols/toc/toc.c:1271
+#: src/protocols/oscar/oscar.c:6207 src/protocols/toc/toc.c:1272
 msgid "_Exchange:"
 msgstr "_Troca:"
 
-#: src/protocols/oscar/oscar.c:6224
+#: src/protocols/oscar/oscar.c:6229
 msgid "Invalid chat name specified."
 msgstr "Nome de bate-papo inv叩lido especificado."
 
-#: src/protocols/oscar/oscar.c:6314
+#: src/protocols/oscar/oscar.c:6319
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 msgstr ""
 "Sua imagem da mensagem instant但nea n達o foi enviada. Voc棚 n達o pode enviar "
 "imagens por mensagens instant但neas em bate-papos do AIM."
 
-#: src/protocols/oscar/oscar.c:6471
+#: src/protocols/oscar/oscar.c:6474
 msgid "Away Message"
 msgstr "Mensagem de away"
 
-#: src/protocols/oscar/oscar.c:6756
+#: src/protocols/oscar/oscar.c:6760
+#, c-format
+msgid "Buddy Comment for %s"
+msgstr "Coment叩rio do amigo %s"
+
+#: src/protocols/oscar/oscar.c:6761
 msgid "Buddy Comment:"
 msgstr "Coment叩rio do amigo:"
 
-#: src/protocols/oscar/oscar.c:6774
+#: src/protocols/oscar/oscar.c:6780
 msgid "Edit Buddy Comment"
 msgstr "Editar coment叩rio do amigo"
 
-#: src/protocols/oscar/oscar.c:6780
+#: src/protocols/oscar/oscar.c:6786
 msgid "Get Status Msg"
 msgstr "Ver mensagem de status"
 
-#: src/protocols/oscar/oscar.c:6792
+#: src/protocols/oscar/oscar.c:6798
 msgid "Direct IM"
 msgstr "Mensagem instant但nea direta"
 
-#: src/protocols/oscar/oscar.c:6814
+#: src/protocols/oscar/oscar.c:6815
 msgid "Re-request Authorization"
 msgstr "Re-requisitar autoriza巽達o"
 
-#: src/protocols/oscar/oscar.c:6844
+#: src/protocols/oscar/oscar.c:6845
 msgid "The new formatting is invalid."
 msgstr "A nova formata巽達o 辿 inv叩lida."
 
-#: src/protocols/oscar/oscar.c:6845
+#: src/protocols/oscar/oscar.c:6846
 msgid "Screen name formatting can change only capitalization and whitespace."
 msgstr ""
 "A formata巽達o do nome do usu叩rio pode mudar apenas a capitaliza巽達o e os "
 "espa巽os."
 
-#: src/protocols/oscar/oscar.c:6852
+#: src/protocols/oscar/oscar.c:6853
 msgid "New screen name formatting:"
 msgstr "Nova formata巽達o do nome do usu叩rio:"
 
-#: src/protocols/oscar/oscar.c:6904
+#: src/protocols/oscar/oscar.c:6905
 msgid "Change Address To:"
 msgstr "Mudar endere巽o para:"
 
-#: src/protocols/oscar/oscar.c:6949
+#: src/protocols/oscar/oscar.c:6950
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>voc棚 n達o est叩 esperando autoriza巽達o</i>"
 
-#: src/protocols/oscar/oscar.c:6952
+#: src/protocols/oscar/oscar.c:6953
 msgid "You are awaiting authorization from the following buddies"
 msgstr "Voc棚 est叩 esperando autoriza巽達o dos seguintes amigos"
 
-#: src/protocols/oscar/oscar.c:6953
+#: src/protocols/oscar/oscar.c:6954
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
@@ -8440,75 +8498,75 @@
 "Voc棚 pode re-requisitar autoriza巽達o destes amigos clicando com o bot達o "
 "direito neles e selecionando \"Re-requisitar autoriza巽達o.\""
 
-#: src/protocols/oscar/oscar.c:6970
+#: src/protocols/oscar/oscar.c:6971
 msgid "Find Buddy by E-mail"
 msgstr "Encontrar amigo por email"
 
-#: src/protocols/oscar/oscar.c:6971
+#: src/protocols/oscar/oscar.c:6972
 msgid "Search for a buddy by e-mail address"
 msgstr "Procurar por um amigo pelo endere巽o de email"
 
-#: src/protocols/oscar/oscar.c:6972
+#: src/protocols/oscar/oscar.c:6973
 msgid "Type the e-mail address of the buddy you are searching for."
 msgstr "Digite o endere巽o de email do amigo que voc棚 est叩 procurando."
 
-#: src/protocols/oscar/oscar.c:6989
-msgid "Available Message:"
-msgstr "Mensagem de 'Dispon鱈vel':"
-
 #: src/protocols/oscar/oscar.c:6990
+msgid "Available Message:"
+msgstr "Mensagem de 'Dispon鱈vel':"
+
+#: src/protocols/oscar/oscar.c:6991
 msgid "I'm doing work and hoping for a distraction--IM me!"
 msgstr "Eu estou trabalhando e esperando uma distra巽達o--me mande uma mensagem!"
 
-#: src/protocols/oscar/oscar.c:7072 src/protocols/silc/silc.c:789
+#: src/protocols/oscar/oscar.c:7073 src/protocols/silc/silc.c:789
 msgid "Set User Info..."
 msgstr "Definir informa巽探es de usu叩rio..."
 
-#: src/protocols/oscar/oscar.c:7077
+#: src/protocols/oscar/oscar.c:7078
 msgid "Set User Info (URL)..."
 msgstr "Definir informa巽探es de usu叩rio (URL)..."
 
-#: src/protocols/oscar/oscar.c:7083
+#: src/protocols/oscar/oscar.c:7084
 msgid "Set Available Message..."
 msgstr "Definir mensagem de disponibilidade..."
 
-#: src/protocols/oscar/oscar.c:7088 src/protocols/silc/silc.c:785
+#: src/protocols/oscar/oscar.c:7089 src/protocols/silc/silc.c:785
 msgid "Change Password..."
 msgstr "Alterar senha..."
 
-#: src/protocols/oscar/oscar.c:7093
+#: src/protocols/oscar/oscar.c:7094
 msgid "Change Password (URL)"
 msgstr "Mudar senha (URL)"
 
-#: src/protocols/oscar/oscar.c:7097
+#: src/protocols/oscar/oscar.c:7098
 msgid "Configure IM Forwarding (URL)"
 msgstr "Configurar encaminhamento de mensagens (URL)"
 
-#: src/protocols/oscar/oscar.c:7106
+#: src/protocols/oscar/oscar.c:7107
 msgid "Format Screen Name..."
 msgstr "Formatar nome de usu叩rio..."
 
-#: src/protocols/oscar/oscar.c:7110
+#: src/protocols/oscar/oscar.c:7111
 msgid "Confirm Account"
 msgstr "Confirmar conta"
 
-#: src/protocols/oscar/oscar.c:7114
+#: src/protocols/oscar/oscar.c:7115
 msgid "Display Currently Registered Address"
 msgstr "Mostrar o endere巽o registrado atualmente"
 
-#: src/protocols/oscar/oscar.c:7118
+#: src/protocols/oscar/oscar.c:7119
 msgid "Change Currently Registered Address..."
 msgstr "Mudar o endere巽o registrado atualmente..."
 
-#: src/protocols/oscar/oscar.c:7125
+#: src/protocols/oscar/oscar.c:7126
 msgid "Show Buddies Awaiting Authorization"
 msgstr "Mostrar amigos esperando autoriza巽達o"
 
-#: src/protocols/oscar/oscar.c:7131
+#: src/protocols/oscar/oscar.c:7132
 msgid "Search for Buddy by Email..."
 msgstr "Procurar por amigos por email..."
 
-#: src/protocols/oscar/oscar.c:7136
+#: src/protocols/oscar/oscar.c:7137
 msgid "Search for Buddy by Information"
 msgstr "Procurar por amigos por informa巽探es"
 
@@ -8523,15 +8581,15 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/oscar/oscar.c:7254 src/protocols/oscar/oscar.c:7256
+#: src/protocols/oscar/oscar.c:7255 src/protocols/oscar/oscar.c:7257
 msgid "AIM/ICQ Protocol Plugin"
 msgstr "Plugin do protocolo AIM/ICQ"
 
-#: src/protocols/oscar/oscar.c:7275
+#: src/protocols/oscar/oscar.c:7276
 msgid "Auth host"
 msgstr "Host de autoriza巽達o"
 
-#: src/protocols/oscar/oscar.c:7280
+#: src/protocols/oscar/oscar.c:7281
 msgid "Auth port"
 msgstr "Porta de autoriza巽達o"
 
@@ -8620,12 +8678,12 @@
 msgstr "Definir senha de mensagens instant但neas"
 
 #: src/protocols/silc/buddy.c:506 src/protocols/silc/buddy.c:541
-#: src/protocols/silc/ops.c:1256 src/protocols/silc/ops.c:1267
+#: src/protocols/silc/ops.c:1265 src/protocols/silc/ops.c:1276
 msgid "Get Public Key"
 msgstr "Obter chave p炭blica"
 
-#: src/protocols/silc/buddy.c:542 src/protocols/silc/ops.c:1257
-#: src/protocols/silc/ops.c:1268
+#: src/protocols/silc/buddy.c:542 src/protocols/silc/ops.c:1266
+#: src/protocols/silc/ops.c:1277
 msgid "Cannot fetch the public key"
 msgstr "Imposs鱈vel obter chave p炭blica"
 
@@ -8638,14 +8696,14 @@
 msgid "Could not load public key"
 msgstr "N達o foi poss鱈vel carregar chave p炭blica"
 
-#: src/protocols/silc/buddy.c:707 src/protocols/silc/ops.c:853
-#: src/protocols/silc/ops.c:925 src/protocols/silc/ops.c:1060
-#: src/protocols/silc/ops.c:1061 src/protocols/silc/ops.c:1079
+#: src/protocols/silc/buddy.c:707 src/protocols/silc/ops.c:862
+#: src/protocols/silc/ops.c:934 src/protocols/silc/ops.c:1069
+#: src/protocols/silc/ops.c:1070 src/protocols/silc/ops.c:1088
 msgid "User Information"
 msgstr "Informa巽探es do usu叩rio"
 
-#: src/protocols/silc/buddy.c:708 src/protocols/silc/ops.c:926
-#: src/protocols/silc/ops.c:1080
+#: src/protocols/silc/buddy.c:708 src/protocols/silc/ops.c:935
+#: src/protocols/silc/ops.c:1089
 msgid "Cannot get user information"
 msgstr "Imposs鱈vel obter informa巽探es do usu叩rio"
 
@@ -8782,36 +8840,36 @@
 msgid "Anxious"
 msgstr "Ansioso"
 
-#: src/protocols/silc/buddy.c:1448 src/protocols/silc/ops.c:962
+#: src/protocols/silc/buddy.c:1448 src/protocols/silc/ops.c:971
 msgid "User Modes"
 msgstr "Modos do usu叩rio"
 
-#: src/protocols/silc/buddy.c:1457 src/protocols/silc/ops.c:971
+#: src/protocols/silc/buddy.c:1457 src/protocols/silc/ops.c:980
 msgid "Mood"
 msgstr "Humor"
 
-#: src/protocols/silc/buddy.c:1461 src/protocols/silc/ops.c:977
+#: src/protocols/silc/buddy.c:1461 src/protocols/silc/ops.c:986
 msgid "Status Text"
 msgstr "Texto de status"
 
-#: src/protocols/silc/buddy.c:1466 src/protocols/silc/ops.c:983
+#: src/protocols/silc/buddy.c:1466 src/protocols/silc/ops.c:992
 msgid "Preferred Contact"
 msgstr "Remover contato"
 
-#: src/protocols/silc/buddy.c:1471 src/protocols/silc/ops.c:988
+#: src/protocols/silc/buddy.c:1471 src/protocols/silc/ops.c:997
 msgid "Preferred Language"
 msgstr "Linguagem preferida"
 
-#: src/protocols/silc/buddy.c:1476 src/protocols/silc/ops.c:993
+#: src/protocols/silc/buddy.c:1476 src/protocols/silc/ops.c:1002
 msgid "Device"
 msgstr "Dispositivo"
 
-#: src/protocols/silc/buddy.c:1481 src/protocols/silc/ops.c:998
+#: src/protocols/silc/buddy.c:1481 src/protocols/silc/ops.c:1007
 #: src/protocols/silc/silc.c:678 src/protocols/silc/silc.c:680
 msgid "Timezone"
 msgstr "Fuso hor叩rio"
 
-#: src/protocols/silc/buddy.c:1486 src/protocols/silc/ops.c:1003
+#: src/protocols/silc/buddy.c:1486 src/protocols/silc/ops.c:1012
 msgid "Geolocation"
 msgstr "Localiza巽達o geogr叩fica"
 
@@ -8831,7 +8889,7 @@
 msgid "Get Public Key..."
 msgstr "Obter chave p炭blica..."
 
-#: src/protocols/silc/buddy.c:1555 src/protocols/silc/ops.c:1389
+#: src/protocols/silc/buddy.c:1555 src/protocols/silc/ops.c:1398
 msgid "Kill User"
 msgstr "Expulsar usu叩rio do servidor"
 
@@ -8942,7 +9000,7 @@
 msgid "Group Name"
 msgstr "nome do grupo"
 
-#: src/protocols/silc/chat.c:567 src/protocols/silc/ops.c:1669
+#: src/protocols/silc/chat.c:567 src/protocols/silc/ops.c:1678
 msgid "Passphrase"
 msgstr "Frase-senha"
 
@@ -9017,35 +9075,35 @@
 msgid "Set Secret Channel"
 msgstr "Definir canal secreto"
 
-#: src/protocols/silc/chat.c:989
+#: src/protocols/silc/chat.c:981
 #, c-format
 msgid "You are channel founder on <I>%s</I>"
 msgstr "Voc棚 辿 o fundador do canal em <I>%s</I>"
 
-#: src/protocols/silc/chat.c:993
+#: src/protocols/silc/chat.c:985
 #, c-format
 msgid "Channel founder on <I>%s</I> is <I>%s</I>"
 msgstr "O fundador do canal em <I>%s</I> 辿 <I>%s</I>"
 
-#: src/protocols/silc/chat.c:1046
+#: src/protocols/silc/chat.c:1039
 #, c-format
 msgid ""
 "You have to join the %s channel before you are able to join the private group"
 msgstr "Voc棚 tem que entrar no canal %s antes de poder entrar no grupo privado"
 
-#: src/protocols/silc/chat.c:1048
+#: src/protocols/silc/chat.c:1041
 msgid "Join Private Group"
 msgstr "Entrar em grupo privado"
 
-#: src/protocols/silc/chat.c:1049
+#: src/protocols/silc/chat.c:1042
 msgid "Cannot join private group"
 msgstr "Imposs鱈vel entrar em grupo privado"
 
-#: src/protocols/silc/chat.c:1242 src/protocols/silc/silc.c:888
+#: src/protocols/silc/chat.c:1235 src/protocols/silc/silc.c:888
 msgid "Cannot call command"
 msgstr "N達o foi poss鱈vel chamar comando"
 
-#: src/protocols/silc/chat.c:1243 src/protocols/silc/silc.c:889
+#: src/protocols/silc/chat.c:1236 src/protocols/silc/silc.c:889
 msgid "Unknown command"
 msgstr "Comando desconhecido"
 
@@ -9101,144 +9159,144 @@
 msgid "%s has changed the topic of <I>%s</I> to: %s"
 msgstr "%s mudou o t坦pico de <I>%s</I> para: %s"
 
-#: src/protocols/silc/ops.c:413
+#: src/protocols/silc/ops.c:414
 #, c-format
 msgid "<I>%s</I> set channel <I>%s</I> modes to: %s"
 msgstr "<I>%s</I> definiu os modos do canal <I>%s</I> para: %s"
 
-#: src/protocols/silc/ops.c:417
+#: src/protocols/silc/ops.c:418
 #, c-format
 msgid "<I>%s</I> removed all channel <I>%s</I> modes"
 msgstr "<I>%s</I> removeu todos os modos do canal <I>%s</I>"
 
-#: src/protocols/silc/ops.c:448
+#: src/protocols/silc/ops.c:451
 #, c-format
 msgid "<I>%s</I> set <I>%s's</I> modes to: %s"
 msgstr "<I>%s</I> definiu os modos de <I>%s</I> para: %s"
 
-#: src/protocols/silc/ops.c:452
+#: src/protocols/silc/ops.c:459
 #, c-format
 msgid "<I>%s</I> removed all <I>%s's</I> modes"
 msgstr "<I>%s</I> removeu todos os modos de <I>%s</I>"
 
-#: src/protocols/silc/ops.c:479
+#: src/protocols/silc/ops.c:488
 #, c-format
 msgid "You have been kicked off <I>%s</I> by <I>%s</I> (%s)"
 msgstr "Voc棚 foi expulso de <I>%s</I> por <I>%s</I>: (%s)"
 
-#: src/protocols/silc/ops.c:509 src/protocols/silc/ops.c:514
-#: src/protocols/silc/ops.c:519
+#: src/protocols/silc/ops.c:518 src/protocols/silc/ops.c:523
+#: src/protocols/silc/ops.c:528
 #, c-format
 msgid "You have been killed by %s (%s)"
 msgstr "Voc棚 foi 'killado' por %s: (%s)"
 
-#: src/protocols/silc/ops.c:540 src/protocols/silc/ops.c:545
-#: src/protocols/silc/ops.c:550
+#: src/protocols/silc/ops.c:549 src/protocols/silc/ops.c:554
+#: src/protocols/silc/ops.c:559
 #, c-format
 msgid "Killed by %s (%s)"
 msgstr "'Killado' por %s (%s)"
 
-#: src/protocols/silc/ops.c:596
+#: src/protocols/silc/ops.c:605
 msgid "Server signoff"
 msgstr "Desconex達o do servidor"
 
-#: src/protocols/silc/ops.c:783
+#: src/protocols/silc/ops.c:792
 msgid "Personal Information"
 msgstr "Informa巽達o pessoal"
 
-#: src/protocols/silc/ops.c:806
+#: src/protocols/silc/ops.c:815
 msgid "Birth Day"
 msgstr "Data de nascimento"
 
-#: src/protocols/silc/ops.c:810
+#: src/protocols/silc/ops.c:819
 msgid "Job Title"
 msgstr "T鱈tulo de trabalho"
 
-#: src/protocols/silc/ops.c:814
+#: src/protocols/silc/ops.c:823
 msgid "Job Role"
 msgstr "Fun巽達o de trabalho"
 
-#: src/protocols/silc/ops.c:818
+#: src/protocols/silc/ops.c:827
 msgid "Organization"
 msgstr "Organiza巽達o"
 
-#: src/protocols/silc/ops.c:822
+#: src/protocols/silc/ops.c:831
 msgid "Unit"
 msgstr "Unidade"
 
-#: src/protocols/silc/ops.c:841
+#: src/protocols/silc/ops.c:850
 msgid "EMail"
 msgstr "Email"
 
-#: src/protocols/silc/ops.c:846
+#: src/protocols/silc/ops.c:855
 msgid "Note"
 msgstr "Nota"
 
-#: src/protocols/silc/ops.c:894
+#: src/protocols/silc/ops.c:903
 msgid "Join Chat"
 msgstr "Entrar em um bate-papo"
 
-#: src/protocols/silc/ops.c:1050 src/protocols/silc/ops.c:1120
+#: src/protocols/silc/ops.c:1059 src/protocols/silc/ops.c:1129
 msgid "Public Key Fingerprint"
 msgstr "Impress達o digital da chave p炭blica"
 
-#: src/protocols/silc/ops.c:1051 src/protocols/silc/ops.c:1121
+#: src/protocols/silc/ops.c:1060 src/protocols/silc/ops.c:1130
 msgid "Public Key Babbleprint"
 msgstr "Impress達o digital leg鱈vel da chave p炭blica"
 
-#: src/protocols/silc/ops.c:1064
+#: src/protocols/silc/ops.c:1073
 msgid "More..."
 msgstr "Mais..."
 
-#: src/protocols/silc/ops.c:1135 src/protocols/silc/silc.c:777
+#: src/protocols/silc/ops.c:1144 src/protocols/silc/silc.c:777
 msgid "Detach From Server"
 msgstr "Desconectar do servidor sem sair"
 
-#: src/protocols/silc/ops.c:1135
+#: src/protocols/silc/ops.c:1144
 msgid "Cannot detach"
 msgstr "Imposs鱈vel desconectar sem sair"
 
-#: src/protocols/silc/ops.c:1146
+#: src/protocols/silc/ops.c:1155
 msgid "Cannot set topic"
 msgstr "Imposs鱈vel definir t坦pico"
 
-#: src/protocols/silc/ops.c:1184
+#: src/protocols/silc/ops.c:1193
 msgid "Failed to change nickname"
 msgstr "Falha ao mudar apelido"
 
-#: src/protocols/silc/ops.c:1221
+#: src/protocols/silc/ops.c:1230
 msgid "Roomlist"
 msgstr "Lista de salas"
 
-#: src/protocols/silc/ops.c:1221
+#: src/protocols/silc/ops.c:1230
 msgid "Cannot get room list"
 msgstr "Imposs鱈vel obter lista de salas"
 
-#: src/protocols/silc/ops.c:1269
+#: src/protocols/silc/ops.c:1278
 msgid "No public key was received"
 msgstr "Nenhuma chave p炭blica foi recebida"
 
-#: src/protocols/silc/ops.c:1282 src/protocols/silc/ops.c:1296
+#: src/protocols/silc/ops.c:1291 src/protocols/silc/ops.c:1305
 msgid "Server Information"
 msgstr "Informa巽探es do servidor"
 
-#: src/protocols/silc/ops.c:1283
+#: src/protocols/silc/ops.c:1292
 msgid "Cannot get server information"
 msgstr "Imposs鱈vel obter informa巽探es do servidor"
 
-#: src/protocols/silc/ops.c:1314 src/protocols/silc/ops.c:1323
+#: src/protocols/silc/ops.c:1323 src/protocols/silc/ops.c:1332
 msgid "Server Statistics"
 msgstr "Estat鱈sticas do servidor"
 
-#: src/protocols/silc/ops.c:1315
+#: src/protocols/silc/ops.c:1324
 msgid "Cannot get server statistics"
 msgstr "Imposs鱈vel obter estat鱈sticas do servidor"
 
-#: src/protocols/silc/ops.c:1324
-msgid "No server statisitics available"
+#: src/protocols/silc/ops.c:1333
+msgid "No server statistics available"
 msgstr "Estat鱈sticas do servidor indispon鱈veis"
 
-#: src/protocols/silc/ops.c:1346
+#: src/protocols/silc/ops.c:1355
 #, c-format
 msgid ""
 "Local server start time: %s\n"
@@ -9273,99 +9331,99 @@
 "Total de operadores de servidor: %d\n"
 "Total de servidores de roteador: %d\n"
 
-#: src/protocols/silc/ops.c:1369
+#: src/protocols/silc/ops.c:1378
 msgid "Network Statistics"
 msgstr "Estat鱈sticas da rede"
 
-#: src/protocols/silc/ops.c:1377 src/protocols/silc/ops.c:1382
+#: src/protocols/silc/ops.c:1386 src/protocols/silc/ops.c:1391
 msgid "Ping"
 msgstr "Ping"
 
-#: src/protocols/silc/ops.c:1377
+#: src/protocols/silc/ops.c:1386
 msgid "Ping failed"
 msgstr "Falha no ping"
 
-#: src/protocols/silc/ops.c:1382
+#: src/protocols/silc/ops.c:1391
 msgid "Ping reply received from server"
 msgstr "O servidor retornou a resposta do ping"
 
-#: src/protocols/silc/ops.c:1390
+#: src/protocols/silc/ops.c:1399
 msgid "Could not kill user"
 msgstr "N達o foi poss鱈vel 'killar' usu叩rio"
 
-#: src/protocols/silc/ops.c:1471
+#: src/protocols/silc/ops.c:1480
 msgid "Error during connecting to SILC Server"
 msgstr "Erro ao conectar no servidor SILC"
 
-#: src/protocols/silc/ops.c:1476
+#: src/protocols/silc/ops.c:1485
 msgid "Key Exchange failed"
 msgstr "Falha na troca de chaves"
 
-#: src/protocols/silc/ops.c:1485
+#: src/protocols/silc/ops.c:1494
 msgid ""
 "Resuming detached session failed. Press Reconnect to create new connection."
 msgstr ""
 "Falha ao tentar recuperar sess達o desconectada, mas n達o sa鱈da. Pressione "
 "Reconectar para criar uma nova sess達o."
 
-#: src/protocols/silc/ops.c:1520
+#: src/protocols/silc/ops.c:1529
 msgid "Disconnected by server"
 msgstr "Desconectado pelo servidor"
 
-#: src/protocols/silc/ops.c:1580 src/protocols/silc/ops.c:1627
+#: src/protocols/silc/ops.c:1589 src/protocols/silc/ops.c:1636
 #: src/protocols/silc/silc.c:167
 msgid "Resuming session"
 msgstr "Recuperando sess達o"
 
-#: src/protocols/silc/ops.c:1582
+#: src/protocols/silc/ops.c:1591
 msgid "Authenticating connection"
 msgstr "Autenticando conex達o"
 
-#: src/protocols/silc/ops.c:1629
+#: src/protocols/silc/ops.c:1638
 msgid "Verifying server public key"
 msgstr "Verificando a chave p炭blica do servidor"
 
-#: src/protocols/silc/ops.c:1670
+#: src/protocols/silc/ops.c:1679
 msgid "Passphrase required"
 msgstr "Frase-senha requerida"
 
-#: src/protocols/silc/ops.c:1699
-msgid "Failure: Version mismatch, upgrade your client"
-msgstr "Falha: Vers探es incompat鱈veis, atualize seu cliente"
-
-#: src/protocols/silc/ops.c:1702
-msgid "Failure: Remote does not trust/support your public key"
-msgstr "Falha: O usu叩rio remoto n達o confia/suporta sua chave p炭blica."
-
-#: src/protocols/silc/ops.c:1705
-msgid "Failure: Remote does not support proposed KE group"
-msgstr "Falha: O usu叩rio remoto n達o suporta o grupo KE proposto."
-
 #: src/protocols/silc/ops.c:1708
-msgid "Failure: Remote does not support proposed cipher"
-msgstr "Falha: O usu叩rio remoto n達o suporta a cifra proposta"
+msgid "Failure: Version mismatch, upgrade your client"
+msgstr "Falha: Vers探es incompat鱈veis, atualize seu cliente"
 
 #: src/protocols/silc/ops.c:1711
-msgid "Failure: Remote does not support proposed PKCS"
-msgstr "Falha: O usu叩rio remoto n達o suporta o PKCS proposto"
+msgid "Failure: Remote does not trust/support your public key"
+msgstr "Falha: O usu叩rio remoto n達o confia/suporta sua chave p炭blica."
 
 #: src/protocols/silc/ops.c:1714
-msgid "Failure: Remote does not support proposed hash function"
-msgstr "Falha: O usu叩rio remoto n達o suporta a fun巽達o de hash proposta"
+msgid "Failure: Remote does not support proposed KE group"
+msgstr "Falha: O usu叩rio remoto n達o suporta o grupo KE proposto."
 
 #: src/protocols/silc/ops.c:1717
+msgid "Failure: Remote does not support proposed cipher"
+msgstr "Falha: O usu叩rio remoto n達o suporta a cifra proposta"
+
+#: src/protocols/silc/ops.c:1720
+msgid "Failure: Remote does not support proposed PKCS"
+msgstr "Falha: O usu叩rio remoto n達o suporta o PKCS proposto"
+
+#: src/protocols/silc/ops.c:1723
+msgid "Failure: Remote does not support proposed hash function"
+msgstr "Falha: O usu叩rio remoto n達o suporta a fun巽達o de hash proposta"
+
+#: src/protocols/silc/ops.c:1726
 msgid "Failure: Remote does not support proposed HMAC"
 msgstr "Falha: O usu叩rio remoto n達o suporta o HMAC proposto"
 
-#: src/protocols/silc/ops.c:1719
+#: src/protocols/silc/ops.c:1728
 msgid "Failure: Incorrect signature"
 msgstr "Falha: Assinatura incorreta"
 
-#: src/protocols/silc/ops.c:1721
+#: src/protocols/silc/ops.c:1730
 msgid "Failure: Invalid cookie"
 msgstr "Falha: Cookie inv叩lido"
 
-#: src/protocols/silc/ops.c:1732
+#: src/protocols/silc/ops.c:1741
 msgid "Failure: Authentication failed"
 msgstr "Falha: Autentica巽達o mal sucedida"
 
@@ -9578,7 +9636,7 @@
 msgid "whois &lt;nick&gt;:  View nick's information"
 msgstr "whois &lt;usu叩rio&gt;:  Exibe informa巽探es do usu叩rio"
 
-#: src/protocols/silc/silc.c:1327 src/protocols/zephyr/zephyr.c:1673
+#: src/protocols/silc/silc.c:1327 src/protocols/zephyr/zephyr.c:1676
 msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user"
 msgstr ""
 "msg &lt;usu叩rio&gt; &lt;mensagem&gt;:  Manda uma mensagem privada para um "
@@ -9606,28 +9664,28 @@
 msgid "call &lt;command&gt;:  Call any silc client command"
 msgstr "call &lt;comando&gt;:  Chama qualquer comando de cliente do SILC"
 
-#: src/protocols/silc/silc.c:1352
+#: src/protocols/silc/silc.c:1353
 msgid "kill &lt;nick&gt; [-pubkey|&lt;reason&gt;]:  Kill nick"
 msgstr ""
 "kill &lt;usu叩rio&gt; [-pubkey|&lt;motivo&gt;]: Expulsa o usu叩rio do servidor"
 
-#: src/protocols/silc/silc.c:1356
+#: src/protocols/silc/silc.c:1357
 msgid "nick &lt;newnick&gt;:  Change your nickname"
 msgstr "nick &lt;novo apelido&gt;:  Muda seu apelido"
 
-#: src/protocols/silc/silc.c:1360
+#: src/protocols/silc/silc.c:1361
 msgid "whowas &lt;nick&gt;:  View nick's information"
 msgstr "whowas &lt;usu叩rio&gt;:  Exibe informa巽探es do usu叩rio"
 
-#: src/protocols/silc/silc.c:1364
-msgid ""
-"cmode &lt;channel&gt; [+|-&lt;modes&gt]; [arguments]:  Change or display "
+#: src/protocols/silc/silc.c:1365
+msgid ""
+"cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display "
 "channel modes"
 msgstr ""
-"cmode &lt;usu叩rio|canal&gt; [+|-&lt;modos&gt]; [argumentos]: Define ou exibe "
-"os modos do canal."
-
-#: src/protocols/silc/silc.c:1368
+"cmode &lt;canal&gt; [+|-&lt;modos&gt]; [argumentos]: Define ou exibe os "
+"modos do canal."
+
+#: src/protocols/silc/silc.c:1369
 msgid ""
 "cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes "
 "on channel"
@@ -9635,16 +9693,16 @@
 "cumode &lt;usu叩rio|canal&gt; +|-&lt;modos&gt; &lt;usu叩rio&gt;: Muda os modos "
 "do usu叩rio no canal"
 
-#: src/protocols/silc/silc.c:1372
+#: src/protocols/silc/silc.c:1373
 msgid "umode &lt;usermodes&gt;:  Set your modes in the network"
 msgstr "umode &lt;modos de usu叩rio&gt;: Define seus modos na rede"
 
-#: src/protocols/silc/silc.c:1376
+#: src/protocols/silc/silc.c:1377
 msgid "oper &lt;nick&gt; [-pubkey]:  Get server operator privileges"
 msgstr ""
 "oper &lt;usu叩rio&gt; [-pubkey]: Obt辿m privil辿gios de operador do servidor"
 
-#: src/protocols/silc/silc.c:1380
+#: src/protocols/silc/silc.c:1381
 msgid ""
 "invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
 "channel invite list"
@@ -9652,38 +9710,38 @@
 "invite &lt;canal&gt; [-|+]&lt;usu叩rio&gt;:  convida um usu叩rio ou adiciona/"
 "remove-o da lista de convites do canal"
 
-#: src/protocols/silc/silc.c:1384
+#: src/protocols/silc/silc.c:1385
 msgid "kick &lt;channel&gt; &lt;nick&gt; [comment]:  Kick client from channel"
 msgstr ""
 "kick &lt;canal&gt; &ltusu叩rio&gt; [coment叩rio]:  Expulsa o usu叩rio do canal"
 
-#: src/protocols/silc/silc.c:1388
+#: src/protocols/silc/silc.c:1389
 msgid "info [server]:  View server administrative details"
 msgstr "info [servidor]: Exibe detalhes administrativos do servidor"
 
-#: src/protocols/silc/silc.c:1392
+#: src/protocols/silc/silc.c:1393
 msgid "ban [&lt;channel&gt; +|-&lt;nick&gt;]:  Ban client from channel"
 msgstr "ban [&lt;canal&gt; +|-&lt;usu叩rio&gt;]:  Bane o usu叩rio do canal"
 
-#: src/protocols/silc/silc.c:1396
+#: src/protocols/silc/silc.c:1397
 msgid "getkey &lt;nick|server&gt;:  Retrieve client's or server's public key"
 msgstr ""
 "getkey &lt;usu叩rio|servidor&gt;:  Obt辿m a chave p炭blica do servidor ou do "
 "usu叩rio"
 
-#: src/protocols/silc/silc.c:1400
+#: src/protocols/silc/silc.c:1401
 msgid "stats:  View server and network statistics"
 msgstr "stats:  Exibe as estat鱈sticas do servidor e da rede"
 
-#: src/protocols/silc/silc.c:1404
+#: src/protocols/silc/silc.c:1405
 msgid "ping:  Send PING to the connected server"
 msgstr "ping:  Envia um PING para o servidor conectado"
 
-#: src/protocols/silc/silc.c:1409
+#: src/protocols/silc/silc.c:1410
 msgid "users &lt;channel&gt;:  List users in channel"
 msgstr "users &lt;canal&gt;:  Lista os usu叩rios no canal"
 
-#: src/protocols/silc/silc.c:1413
+#: src/protocols/silc/silc.c:1414
 msgid ""
 "names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List "
 "specific users in channel(s)"
@@ -9691,39 +9749,39 @@
 "names [-count|-ops|-halfops|-voices|-normal] &lt;canal(ais) &gt;:  Lista "
 "usu叩rios espec鱈ficos no(s) canal(ais)"
 
-#: src/protocols/silc/silc.c:1425
+#: src/protocols/silc/silc.c:1426
 msgid "Instant Messages"
 msgstr "Mensagens instant但neas"
 
-#: src/protocols/silc/silc.c:1430
+#: src/protocols/silc/silc.c:1431
 msgid "Digitally sign all IM messages"
 msgstr "Assinar digitalmente todas as mensagens instant但neas"
 
-#: src/protocols/silc/silc.c:1435
+#: src/protocols/silc/silc.c:1436
 msgid "Verify all IM message signatures"
 msgstr "Verificar todas as assinaturas de mensagens instant但neas"
 
-#: src/protocols/silc/silc.c:1438
+#: src/protocols/silc/silc.c:1439
 msgid "Channel Messages"
 msgstr "Mensagens do canal"
 
-#: src/protocols/silc/silc.c:1443
+#: src/protocols/silc/silc.c:1444
 msgid "Digitally sign all channel messages"
 msgstr "Assinar digitalmente todas as mensagens do canal"
 
-#: src/protocols/silc/silc.c:1448
+#: src/protocols/silc/silc.c:1449
 msgid "Verify all channel message signatures"
 msgstr "Verificar todas as assinaturas de mensagens dos canais"
 
-#: src/protocols/silc/silc.c:1451
+#: src/protocols/silc/silc.c:1452
 msgid "Default SILC Key Pair"
 msgstr "Par de chaves padr達o do SILC"
 
-#: src/protocols/silc/silc.c:1456
+#: src/protocols/silc/silc.c:1457
 msgid "SILC Public Key"
 msgstr "Chave p炭blica do SILC"
 
-#: src/protocols/silc/silc.c:1461
+#: src/protocols/silc/silc.c:1462
 msgid "SILC Private Key"
 msgstr "Chave privada do SILC"
 
@@ -9737,42 +9795,42 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/silc/silc.c:1547
+#: src/protocols/silc/silc.c:1548
 msgid "SILC Protocol Plugin"
 msgstr "Plugin do protocolo SILC"
 
 #. *  description
-#: src/protocols/silc/silc.c:1549
+#: src/protocols/silc/silc.c:1550
 msgid "Secure Internet Live Conferencing (SILC) Protocol"
 msgstr ""
 "Plugin do protocolo de confer棚ncia segura em tempo-real na internet (Secure "
 "Internet Live Conferencing - SILC)"
 
-#: src/protocols/silc/silc.c:1579
+#: src/protocols/silc/silc.c:1580
 msgid "Public key authentication"
 msgstr "Autentica巽達o via chave p炭blica"
 
-#: src/protocols/silc/silc.c:1585
+#: src/protocols/silc/silc.c:1586
 msgid "Public Key File"
 msgstr "Arquivo da chave p炭blica"
 
-#: src/protocols/silc/silc.c:1589
+#: src/protocols/silc/silc.c:1590
 msgid "Private Key File"
 msgstr "Arquivo da chave privada"
 
-#: src/protocols/silc/silc.c:1594
+#: src/protocols/silc/silc.c:1595
 msgid "Reject watching by other users"
 msgstr "Rejeitar ser monitorado por outros usu叩rios"
 
-#: src/protocols/silc/silc.c:1597
+#: src/protocols/silc/silc.c:1598
 msgid "Block invites"
 msgstr "Bloquear convites"
 
-#: src/protocols/silc/silc.c:1600
+#: src/protocols/silc/silc.c:1601
 msgid "Block IMs without Key Exchange"
 msgstr "Bloquear mensagens instant但neas sem troca de chaves"
 
-#: src/protocols/silc/silc.c:1603
+#: src/protocols/silc/silc.c:1604
 msgid "Reject online status attribute requests"
 msgstr "Rejeitar pedidos de atributos de status online"
 
@@ -10003,15 +10061,15 @@
 msgid "TOC has come back from its pause. You may now send messages again."
 msgstr "O TOC voltou de sua pausa. Agora voc棚 pode mandar mensagens novamente."
 
-#: src/protocols/toc/toc.c:890
+#: src/protocols/toc/toc.c:891
 msgid "Password Change Successful"
 msgstr "Mudan巽a de senha efetuada com sucesso"
 
-#: src/protocols/toc/toc.c:894
+#: src/protocols/toc/toc.c:895
 msgid "TOC has sent a PAUSE command."
 msgstr "O TOC enviou um comando PAUSE."
 
-#: src/protocols/toc/toc.c:895
+#: src/protocols/toc/toc.c:896
 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 "
@@ -10022,47 +10080,47 @@
 "qualquer mensagem seja enviada. Isto 辿 apenas tempor叩rio, por favor seja "
 "paciente."
 
-#: src/protocols/toc/toc.c:1409
+#: src/protocols/toc/toc.c:1410
 msgid "Get Dir Info"
 msgstr "Ver informa巽探es de diret坦rio"
 
-#: src/protocols/toc/toc.c:1545
+#: src/protocols/toc/toc.c:1546
 msgid "Set Dir Info"
 msgstr "Definir informa巽探es de diret坦rio"
 
-#: src/protocols/toc/toc.c:1667
+#: src/protocols/toc/toc.c:1668
 #, c-format
 msgid "Could not open %s for writing!"
 msgstr "N達o foi poss鱈vel abrir %s para escrita!"
 
-#: src/protocols/toc/toc.c:1703
+#: src/protocols/toc/toc.c:1704
 msgid "File transfer failed; other side probably canceled."
 msgstr ""
 "Transfer棚ncia de arquivo falhou; o outro lado provavelmente cancelou-a."
 
-#: src/protocols/toc/toc.c:1748 src/protocols/toc/toc.c:1788
-#: src/protocols/toc/toc.c:1912 src/protocols/toc/toc.c:2000
+#: src/protocols/toc/toc.c:1749 src/protocols/toc/toc.c:1789
+#: src/protocols/toc/toc.c:1913 src/protocols/toc/toc.c:2001
 msgid "Could not connect for transfer."
 msgstr "N達o foi poss鱈vel conectar para transfer棚ncia."
 
-#: src/protocols/toc/toc.c:1945
+#: src/protocols/toc/toc.c:1946
 msgid "Could not write file header.  The file will not be transferred."
 msgstr ""
 "N達o foi poss鱈vel escrever cabe巽alho de arquivo. O arquivo n達o ser叩 "
 "transferido."
 
-#: src/protocols/toc/toc.c:2045
+#: src/protocols/toc/toc.c:2046
 msgid "Gaim - Save As..."
 msgstr "Gaim - Salvar como..."
 
-#: src/protocols/toc/toc.c:2079
+#: src/protocols/toc/toc.c:2080
 #, 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 pede a %s para aceitar %d arquivo: %s (%.2f %s)%s%s"
 msgstr[1] "%s pede a %s para aceitar %d arquivos: %s (%.2f %s)%s%s"
 
-#: src/protocols/toc/toc.c:2086
+#: src/protocols/toc/toc.c:2087
 #, c-format
 msgid "%s requests you to send them a file"
 msgstr "%s pede a voc棚 para enviar um arquivo a ele"
@@ -10078,15 +10136,15 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/toc/toc.c:2169 src/protocols/toc/toc.c:2171
+#: src/protocols/toc/toc.c:2170 src/protocols/toc/toc.c:2172
 msgid "TOC Protocol Plugin"
 msgstr "Plugin do protocolo TOC"
 
-#: src/protocols/toc/toc.c:2190
+#: src/protocols/toc/toc.c:2191
 msgid "TOC host"
 msgstr "Host TOC"
 
-#: src/protocols/toc/toc.c:2194
+#: src/protocols/toc/toc.c:2195
 msgid "TOC port"
 msgstr "Porta TOC"
 
@@ -10283,79 +10341,72 @@
 "N達o foi poss鱈vel adicionar o amigo %s ao grupo %s � lista do servidor na "
 "conta %s."
 
-#: src/protocols/yahoo/yahoo.c:1896
+#: src/protocols/yahoo/yahoo.c:1897
 msgid "Could not add buddy to server list"
 msgstr "Imposs鱈vel adicionar amigo � lista do servidor"
 
-#: src/protocols/yahoo/yahoo.c:2088 src/protocols/yahoo/yahoo.c:2216
+#: src/protocols/yahoo/yahoo.c:2131 src/protocols/yahoo/yahoo.c:2259
+#: src/protocols/yahoo/ycht.c:414
 msgid "Unable to read"
 msgstr "Imposs鱈vel ler"
 
-#: src/protocols/yahoo/yahoo.c:2238 src/protocols/yahoo/yahoo.c:2348
-#: src/protocols/yahoo/yahoo.c:2398 src/protocols/yahoo/yahoo.c:2408
+#: src/protocols/yahoo/yahoo.c:2281 src/protocols/yahoo/yahoo.c:2391
+#: src/protocols/yahoo/yahoo.c:2441 src/protocols/yahoo/yahoo.c:2451
 #: src/protocols/yahoo/yahoochat.c:1397 src/protocols/yahoo/yahoochat.c:1458
+#: src/protocols/yahoo/ycht.c:518
 msgid "Connection problem"
 msgstr "Problema na conex達o"
 
-#: src/protocols/yahoo/yahoo.c:2495 src/protocols/yahoo/yahoo.c:2857
-#: src/protocols/yahoo/yahoo.c:2971
+#: src/protocols/yahoo/yahoo.c:2538 src/protocols/yahoo/yahoo.c:2900
+#: src/protocols/yahoo/yahoo.c:3014
 msgid "Not At Home"
 msgstr "Fora de casa"
 
-#: src/protocols/yahoo/yahoo.c:2497 src/protocols/yahoo/yahoo.c:2859
-#: src/protocols/yahoo/yahoo.c:2972
+#: src/protocols/yahoo/yahoo.c:2540 src/protocols/yahoo/yahoo.c:2902
+#: src/protocols/yahoo/yahoo.c:3015
 msgid "Not At Desk"
 msgstr "N達o estou por perto"
 
-#: src/protocols/yahoo/yahoo.c:2499 src/protocols/yahoo/yahoo.c:2861
-#: src/protocols/yahoo/yahoo.c:2973
+#: src/protocols/yahoo/yahoo.c:2542 src/protocols/yahoo/yahoo.c:2904
+#: src/protocols/yahoo/yahoo.c:3016
 msgid "Not In Office"
 msgstr "Fora do escrit坦rio"
 
-#: src/protocols/yahoo/yahoo.c:2503 src/protocols/yahoo/yahoo.c:2865
-#: src/protocols/yahoo/yahoo.c:2975
+#: src/protocols/yahoo/yahoo.c:2546 src/protocols/yahoo/yahoo.c:2908
+#: src/protocols/yahoo/yahoo.c:3018
 msgid "On Vacation"
 msgstr "De f辿rias"
 
-#: src/protocols/yahoo/yahoo.c:2507 src/protocols/yahoo/yahoo.c:2869
-#: src/protocols/yahoo/yahoo.c:2977
+#: src/protocols/yahoo/yahoo.c:2550 src/protocols/yahoo/yahoo.c:2912
+#: src/protocols/yahoo/yahoo.c:3020
 msgid "Stepped Out"
 msgstr "Fui embora"
 
-#: src/protocols/yahoo/yahoo.c:2588 src/protocols/yahoo/yahoo.c:2614
+#: src/protocols/yahoo/yahoo.c:2631 src/protocols/yahoo/yahoo.c:2657
 msgid "Not on server list"
 msgstr "N達o est叩 na lista do servidor"
 
-#: src/protocols/yahoo/yahoo.c:2634
-#, c-format
-msgid ""
-"\n"
-"<b>%s:</b> %s"
-msgstr ""
-"\n"
-"<b>%s:</b> %s"
-
-#: src/protocols/yahoo/yahoo.c:2693
+#: src/protocols/yahoo/yahoo.c:2736
 msgid "Join in Chat"
 msgstr "Entrar em um bate-papo"
 
-#: src/protocols/yahoo/yahoo.c:2698
+#: src/protocols/yahoo/yahoo.c:2741
 msgid "Initiate Conference"
 msgstr "Iniciar confer棚ncia"
 
-#: src/protocols/yahoo/yahoo.c:2750
+#: src/protocols/yahoo/yahoo.c:2793
 msgid "Active which ID?"
 msgstr "Ativar qual ID?"
 
-#: src/protocols/yahoo/yahoo.c:2759
+#: src/protocols/yahoo/yahoo.c:2802
 msgid "Join who in chat?"
 msgstr "Juntar-se a quem no bate-papo?"
 
-#: src/protocols/yahoo/yahoo.c:2769
+#: src/protocols/yahoo/yahoo.c:2812
 msgid "Activate ID..."
 msgstr "Ativar ID..."
 
-#: src/protocols/yahoo/yahoo.c:2773
+#: src/protocols/yahoo/yahoo.c:2816
 msgid "Join user in chat..."
 msgstr "Juntar-se a algu辿m no bate-papo..."
 
@@ -10370,47 +10421,47 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/yahoo/yahoo.c:3292 src/protocols/yahoo/yahoo.c:3294
+#: src/protocols/yahoo/yahoo.c:3335 src/protocols/yahoo/yahoo.c:3337
 msgid "Yahoo Protocol Plugin"
 msgstr "Plugin do protocolo Yahoo"
 
-#: src/protocols/yahoo/yahoo.c:3313
+#: src/protocols/yahoo/yahoo.c:3356
 msgid "Yahoo Japan"
 msgstr "Yahoo Jap達o"
 
-#: src/protocols/yahoo/yahoo.c:3316
+#: src/protocols/yahoo/yahoo.c:3359
 msgid "Pager host"
 msgstr "Host do pager"
 
-#: src/protocols/yahoo/yahoo.c:3319
+#: src/protocols/yahoo/yahoo.c:3362
 msgid "Japan Pager host"
 msgstr "Host japon棚s do pager"
 
-#: src/protocols/yahoo/yahoo.c:3322
+#: src/protocols/yahoo/yahoo.c:3365
 msgid "Pager port"
 msgstr "Porta do pager"
 
-#: src/protocols/yahoo/yahoo.c:3325
+#: src/protocols/yahoo/yahoo.c:3368
 msgid "File transfer host"
 msgstr "Host da transfer棚ncia de arquivo"
 
-#: src/protocols/yahoo/yahoo.c:3328
+#: src/protocols/yahoo/yahoo.c:3371
 msgid "Japan File transfer host"
 msgstr "Host japon棚s da transfer棚ncia de arquivo"
 
-#: src/protocols/yahoo/yahoo.c:3331
+#: src/protocols/yahoo/yahoo.c:3374
 msgid "File transfer port"
 msgstr "Porta da transfer棚ncia de arquivo"
 
-#: src/protocols/yahoo/yahoo.c:3334
+#: src/protocols/yahoo/yahoo.c:3377
 msgid "Chat Room List Url"
 msgstr "URL da lista de salas de bate-papo"
 
-#: src/protocols/yahoo/yahoo.c:3337
+#: src/protocols/yahoo/yahoo.c:3380
 msgid "YCHT Host"
 msgstr "Host do YCHT"
 
-#: src/protocols/yahoo/yahoo.c:3340
+#: src/protocols/yahoo/yahoo.c:3383
 msgid "YCHT Port"
 msgstr "Porta do YCHT"
 
@@ -10518,34 +10569,34 @@
 msgid "The user's profile is empty."
 msgstr "O perfil do usu叩rio est叩 vazio."
 
-#: src/protocols/yahoo/yahoochat.c:203
+#: src/protocols/yahoo/yahoochat.c:193
 #, c-format
 msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
 msgstr ""
 "%s rejeitou seu convite para uma confer棚ncia na sala \"%s\" porque \"%s\"."
 
-#: src/protocols/yahoo/yahoochat.c:205
+#: src/protocols/yahoo/yahoochat.c:195
 msgid "Invitation Rejected"
 msgstr "Convite rejeitado"
 
-#: src/protocols/yahoo/yahoochat.c:355
+#: src/protocols/yahoo/yahoochat.c:347
 msgid "Failed to join chat"
 msgstr "Falha ao entrar no bate-papo"
 
-#: src/protocols/yahoo/yahoochat.c:355
+#: src/protocols/yahoo/yahoochat.c:347
 msgid "Maybe the room is full?"
 msgstr "Talvez a sala esteja cheia?"
 
-#: src/protocols/yahoo/yahoochat.c:429
+#: src/protocols/yahoo/yahoochat.c:425
 #, c-format
 msgid "You are now chatting in %s."
 msgstr "Voc棚 est叩 conversando em %s."
 
-#: src/protocols/yahoo/yahoochat.c:583
+#: src/protocols/yahoo/yahoochat.c:579
 msgid "Failed to join buddy in chat"
 msgstr "Falha ao ingressar amigo no bate-papo"
 
-#: src/protocols/yahoo/yahoochat.c:584
+#: src/protocols/yahoo/yahoochat.c:580
 msgid "Maybe they're not in a chat?"
 msgstr "Talvez eles n達o estejam em um bate-papo?"
 
@@ -10573,89 +10624,81 @@
 msgid "User Rooms"
 msgstr "Salas de usu叩rio"
 
-#: src/protocols/zephyr/zephyr.c:589
+#: src/protocols/yahoo/ycht.c:401
+msgid "Connection problem with the YCHT server."
+msgstr "Problema na conex達o ao servidor YCHT."
+
+#: src/protocols/zephyr/zephyr.c:598
 #, c-format
 msgid "Unable send to chat %s,%s,%s"
 msgstr "Imposs鱈vel enviar para o bate-pap %s,%s,%s"
 
-#: src/protocols/zephyr/zephyr.c:624
+#: src/protocols/zephyr/zephyr.c:633
 #, c-format
 msgid "<b>User:</b> %s<br>"
 msgstr "<b>Usu叩rio:</b> %s<br>"
 
-#: src/protocols/zephyr/zephyr.c:628
+#: src/protocols/zephyr/zephyr.c:637
 msgid "<br>Hidden or not logged-in"
 msgstr "<br>Invis鱈vel ou desconectado"
 
-#: src/protocols/zephyr/zephyr.c:633
+#: src/protocols/zephyr/zephyr.c:642
 #, c-format
 msgid "<br>At %s since %s"
 msgstr "<br>Em %s desde %s"
 
-#: src/protocols/zephyr/zephyr.c:983 src/protocols/zephyr/zephyr.c:984
+#: src/protocols/zephyr/zephyr.c:987 src/protocols/zephyr/zephyr.c:988
 msgid "Anyone"
 msgstr "Qualquer um"
 
-#: src/protocols/zephyr/zephyr.c:1011
-msgid "Already logged in with Zephyr"
-msgstr "J叩 conectado ao Zepyhr"
-
-#: src/protocols/zephyr/zephyr.c:1011
-msgid ""
-"Because Zephyr uses your system username, you are unable to have multiple "
-"accounts on it when logged in as the same user."
-msgstr ""
-"Por o Zephyr usar o seu nome do usu叩rio do sistema, voc棚 n達o pode ter "
-"m炭ltiplas contas nele enquanto estiver logado com o mesmo usu叩rio."
-
-#: src/protocols/zephyr/zephyr.c:1386
+#: src/protocols/zephyr/zephyr.c:1389
 msgid "_Class:"
 msgstr "_Classe:"
 
-#: src/protocols/zephyr/zephyr.c:1392
+#: src/protocols/zephyr/zephyr.c:1395
 msgid "_Instance:"
 msgstr "_Inst但ncia:"
 
-#: src/protocols/zephyr/zephyr.c:1398
+#: src/protocols/zephyr/zephyr.c:1401
 msgid "_Recipient:"
 msgstr "Destinat叩_rio:"
 
-#: src/protocols/zephyr/zephyr.c:1409
+#: src/protocols/zephyr/zephyr.c:1412
 #, c-format
 msgid "Attempt to subscribe to %s,%s,%s failed"
 msgstr "Tentativa de se inscrever em  %s,%s,%s falhou"
 
-#: src/protocols/zephyr/zephyr.c:1678
+#: src/protocols/zephyr/zephyr.c:1681
 msgid "zlocate &lt;nick&gt;: Locate user"
 msgstr "zlocate &lt;usu叩rio&gt;: Localiza o usu叩rio"
 
-#: src/protocols/zephyr/zephyr.c:1683
+#: src/protocols/zephyr/zephyr.c:1686
 msgid "zl &lt;nick&gt;: Locate user"
 msgstr "zl &lt;usu叩rio&gt;:  Localiza o usu叩rio"
 
-#: src/protocols/zephyr/zephyr.c:1688
+#: src/protocols/zephyr/zephyr.c:1691
 msgid "instance &lt;instance&gt;: Set the instance to be used on this class"
 msgstr ""
 "instance &lt;inst但ncia&gt;: Define a inst但ncia a ser usada nesta classe"
 
-#: src/protocols/zephyr/zephyr.c:1693
+#: src/protocols/zephyr/zephyr.c:1696
 msgid "inst &lt;instance&gt;: Set the instance to be used on this class"
 msgstr "inst &lt;inst但ncia&gt;: Define a inst但ncia a ser usada nesta classe"
 
-#: src/protocols/zephyr/zephyr.c:1699
+#: src/protocols/zephyr/zephyr.c:1702
 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;destinat叩rio&gt;: Entra em um novo "
 "bate-papo"
 
-#: src/protocols/zephyr/zephyr.c:1704
+#: src/protocols/zephyr/zephyr.c:1707
 msgid ""
 "zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
 msgstr ""
 "zi &lt;inst但ncia&gt;: Envia uma mensagem para &lt;mensagem,<i>inst但ncia</i>,"
 "*&gt;"
 
-#: src/protocols/zephyr/zephyr.c:1710
+#: src/protocols/zephyr/zephyr.c:1713
 msgid ""
 "zci &lt;class&gt; &lt;instance&gt;: Send a message to &lt;<i>class</i>,"
 "<i>instance</i>,*&gt;"
@@ -10663,7 +10706,7 @@
 "zci &lt;classe&gt; &lt;inst但ncia&gt;: Envia uma mensagem para &lt;<i>classe</"
 "i>,<i>inst但ncia</i>,*&gt;"
 
-#: src/protocols/zephyr/zephyr.c:1716
+#: src/protocols/zephyr/zephyr.c:1719
 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;"
@@ -10671,7 +10714,7 @@
 "zci &lt;classe&gt; &lt;inst但ncia&gt; &lt;destinat叩rio&gt;: Envia uma "
 "mensagem para &lt;<i>classe</i>,<i>inst但ncia</i>,<i>destinat叩rio</i>&gt;"
 
-#: src/protocols/zephyr/zephyr.c:1722
+#: src/protocols/zephyr/zephyr.c:1725
 msgid ""
 "zir &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;MESSAGE,"
 "<i>instance</i>,<i>recipient</i>&gt;"
@@ -10679,16 +10722,16 @@
 "zir &lt;inst但ncia&gt; &lt;destinat叩rio&gt;: Envia uma mensagem para &lt;"
 "MENSAGEM,<i>inst但ncia</i>,<i>destinat叩rio</i>&gt;"
 
-#: src/protocols/zephyr/zephyr.c:1727
+#: src/protocols/zephyr/zephyr.c:1730
 msgid "zc &lt;class&gt;: Send a message to &lt;<i>class</i>,PERSONAL,*&gt;"
 msgstr ""
 "zc &lt;classe&gt;: Envia uma mensagem para &lt;<i>classe</i>,PESSOAL,*&gt;"
 
-#: src/protocols/zephyr/zephyr.c:1802
+#: src/protocols/zephyr/zephyr.c:1806
 msgid "Resubscribe"
 msgstr "Reinscrever"
 
-#: src/protocols/zephyr/zephyr.c:1805
+#: src/protocols/zephyr/zephyr.c:1809
 msgid "Retrieve subscriptions from server"
 msgstr "Obter inscri巽探es do servidor"
 
@@ -10703,39 +10746,39 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/zephyr/zephyr.c:1885 src/protocols/zephyr/zephyr.c:1887
+#: src/protocols/zephyr/zephyr.c:1889 src/protocols/zephyr/zephyr.c:1891
 msgid "Zephyr Protocol Plugin"
 msgstr "Plugin do protocolo Zephyr"
 
-#: src/protocols/zephyr/zephyr.c:1906
+#: src/protocols/zephyr/zephyr.c:1910
 msgid "Export to .anyone"
 msgstr "Exportar para .anyone"
 
-#: src/protocols/zephyr/zephyr.c:1909
+#: src/protocols/zephyr/zephyr.c:1913
 msgid "Export to .zephyr.subs"
 msgstr "Exportar para .zepyhr.subs"
 
-#: src/protocols/zephyr/zephyr.c:1912
+#: src/protocols/zephyr/zephyr.c:1916
 msgid "Exposure"
 msgstr "Exposi巽達o"
 
 #. XXX: why in the hell are we calling gaim_connection_error() here?
 #. Forbidden
-#: src/proxy.c:845
+#: src/proxy.c:870
 #, c-format
 msgid "Access denied: proxy server forbids port %d tunnelling."
 msgstr "Acesso negado: o servidor proxy n達o permite o tunelamento da porta %d."
 
-#: src/proxy.c:849
+#: src/proxy.c:874
 #, c-format
 msgid "Proxy connection error %d"
 msgstr "Erro de conex達o do proxy %d"
 
-#: src/proxy.c:1495
+#: src/proxy.c:1520
 msgid "Invalid proxy settings"
 msgstr "Configura巽探es de proxy inv叩lidas"
 
-#: src/proxy.c:1495
+#: src/proxy.c:1520
 msgid ""
 "Either the host name or port number specified for your given proxy type is "
 "invalid."
@@ -10744,7 +10787,7 @@
 "fornecido 辿 inv叩lido."
 
 #. * Custom away message.
-#: src/prpl.h:165
+#: src/prpl.h:171
 msgid "Custom"
 msgstr "Customizar"
 
@@ -10759,63 +10802,63 @@
 msgid "Please enter your password"
 msgstr "Favor digitar sua senha"
 
-#: src/server.c:528
+#: src/server.c:534
 #, c-format
 msgid "%s is now known as %s.\n"
 msgstr "%s mudou seu apelido para %s.\n"
 
-#: src/server.c:938
+#: src/server.c:945
 #, c-format
 msgid "(%d message)"
 msgid_plural "(%d messages)"
 msgstr[0] "(%d mensagem)"
 msgstr[1] "(%d mensagens)"
 
-#: src/server.c:952
+#: src/server.c:959
 msgid "(1 message)"
 msgstr "(1 mensagem)"
 
-#: src/server.c:1180 src/server.c:1189
+#: src/server.c:1188 src/server.c:1197
 #, c-format
 msgid "%s logged in."
 msgstr "%s conectou."
 
-#: src/server.c:1201
+#: src/server.c:1209
 #, c-format
 msgid "%s signed on"
 msgstr "%s conectou"
 
-#: src/server.c:1216
+#: src/server.c:1224
 #, c-format
 msgid "%s came back"
 msgstr "%s voltou"
 
-#: src/server.c:1218
+#: src/server.c:1226
 #, c-format
 msgid "%s went away"
 msgstr "%s ficou ausente."
 
-#: src/server.c:1232
+#: src/server.c:1240
 #, c-format
 msgid "%s became idle"
 msgstr "%s tornou-se inativo"
 
-#: src/server.c:1243
+#: src/server.c:1251
 #, c-format
 msgid "%s became unidle"
 msgstr "%s voltou da inatividade"
 
-#: src/server.c:1253 src/server.c:1260
+#: src/server.c:1261 src/server.c:1268
 #, c-format
 msgid "%s logged out."
 msgstr "%s desconectou."
 
-#: src/server.c:1273
+#: src/server.c:1281
 #, c-format
 msgid "%s signed off"
 msgstr "%s desconectou"
 
-#: src/server.c:1335
+#: src/server.c:1343
 #, c-format
 msgid ""
 "%s has just been warned by %s.\n"
@@ -10824,11 +10867,11 @@
 "%s foi alertado por %s.\n"
 "Seu novo n鱈vel de alerta 辿 %d%%"
 
-#: src/server.c:1338
+#: src/server.c:1346
 msgid "an anonymous person"
 msgstr "uma pessoa an担nima"
 
-#: src/server.c:1448
+#: src/server.c:1456
 #, c-format
 msgid ""
 "User '%s' invites %s to buddy chat room: '%s'\n"
@@ -10837,12 +10880,12 @@
 "Usu叩rio '%s' convida %s para sala de bate-papo de amigo: '%s'\n"
 "%s"
 
-#: src/server.c:1452
+#: src/server.c:1460
 #, c-format
 msgid "User '%s' invites %s to buddy chat room: '%s'\n"
 msgstr "Usu叩rio '%s' convida %s para sala de bate-papo de amigo: '%s'\n"
 
-#: src/server.c:1458
+#: src/server.c:1466
 msgid "Accept chat invitation?"
 msgstr "Aceitar convite para bate-papo?"
 
@@ -10916,3 +10959,31 @@
 #: src/win32/win32dep.c:278
 msgid "Notification"
 msgstr "Notifica巽達o"
+
+#~ msgid "sorry, i ran out for a while. bbl"
+#~ msgstr "Desculpe, eu sa鱈 um pouco. Volto depois"
+
+#~ msgid "boring default"
+#~ msgstr "Padr達o chato"
+
+#~ msgid "help:  List available commands."
+#~ msgstr "help:  Lista os comandos dispon鱈veis."
+
+#~ msgid "_Ignore formatting on incoming messages"
+#~ msgstr "_Ignorar formata巽達o nas mensagens que chegam"
+
+#~ msgid "_Send auto-response"
+#~ msgstr "_Enviar auto-resposta"
+
+#~ msgid "_Only send auto-response when idle"
+#~ msgstr "_Apenas enviar auto-resposta quando inativo"
+
+#~ msgid "Already logged in with Zephyr"
+#~ msgstr "J叩 conectado ao Zepyhr"
+
+#~ msgid ""
+#~ "Because Zephyr uses your system username, you are unable to have multiple "
+#~ "accounts on it when logged in as the same user."
+#~ msgstr ""
+#~ "Por o Zephyr usar o seu nome do usu叩rio do sistema, voc棚 n達o pode ter "
+#~ "m炭ltiplas contas nele enquanto estiver logado com o mesmo usu叩rio."
--- a/po/ru.po	Thu Aug 05 01:32:00 2004 +0000
+++ b/po/ru.po	Thu Aug 05 03:52:07 2004 +0000
@@ -9,8 +9,8 @@
 msgstr ""
 "Project-Id-Version: ru\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-07-16 00:15-0400\n"
-"PO-Revision-Date: 2004-07-14 20:30+0400\n"
+"POT-Creation-Date: 2004-08-05 06:10+0400\n"
+"PO-Revision-Date: 2004-08-05 06:30+0400\n"
 "Last-Translator: Dmitry Beloglazov <dmaa@lipetsk.ru>\n"
 "Language-Team: Russian <ru@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -18,18 +18,23 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#: plugins/autorecon.c:174
+#: plugins/autorecon.c:233
 msgid "Error Message Suppression"
 msgstr "�仂亟舒于仍亠仆亳亠 �仂仂弍�亠仆亳亶 仂弍 仂�亳弍从舒�"
 
-#: plugins/autorecon.c:178
+#: plugins/autorecon.c:237
 msgid "Hide Disconnect Errors"
 msgstr "弌从���� 仂�亳弍从亳 �舒亰��于舒 �仂亠亟亳仆亠仆亳�"
 
-#: plugins/autorecon.c:182
+#: plugins/autorecon.c:241
 msgid "Hide Login Errors"
 msgstr "弌从���� 仂�亳弍从亳 于�仂亟舒"
 
+#: plugins/autorecon.c:245
+#, fuzzy
+msgid "Restore Away State On Reconnect"
+msgstr "�仂���舒仆舒于仍亳于舒�� ��舒��� 仗�亳 仗亠�亠�仂亠亟亳仆亠仆亳亳"
+
 #. *< api_version
 #. *< type
 #. *< ui_requirement
@@ -37,7 +42,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/autorecon.c:204
+#: plugins/autorecon.c:267
 msgid "Auto-Reconnect"
 msgstr "�于�仂仄舒�亳�亠�从仂亠 仗亠�亠�仂亠亟亳仆亠仆亳亠"
 
@@ -45,7 +50,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/autorecon.c:207 plugins/autorecon.c:209
+#: plugins/autorecon.c:270 plugins/autorecon.c:272
 msgid "When you are kicked offline, this reconnects you."
 msgstr "�亠�亠�仂亠亟亳仆亠仆亳亠 仗�亳 �舒亰��于亠 �仂亠亟亳仆亠仆亳�."
 
@@ -141,7 +146,7 @@
 msgid "Gaim - Away"
 msgstr "Gaim - ��仂��仍"
 
-#: plugins/docklet/docklet.c:114 src/gtkaccount.c:727 src/gtkaccount.c:2152
+#: plugins/docklet/docklet.c:114 src/gtkaccount.c:734 src/gtkaccount.c:2155
 msgid "Auto-login"
 msgstr "��仂亟亳�� 舒于�仂仄舒�亳�亠�从亳"
 
@@ -157,21 +162,21 @@
 msgid "New..."
 msgstr "�仂于仂亠..."
 
-#: plugins/docklet/docklet.c:153 src/gtkprefs.c:1809 src/protocols/gg/gg.c:51
-#: src/protocols/irc/msgs.c:187 src/protocols/jabber/jabber.c:960
+#: plugins/docklet/docklet.c:153 src/gtkprefs.c:1802 src/protocols/gg/gg.c:51
+#: src/protocols/irc/msgs.c:189 src/protocols/jabber/jabber.c:960
 #: src/protocols/jabber/jutil.c:32 src/protocols/jabber/presence.c:63
-#: src/protocols/jabber/presence.c:119 src/protocols/novell/novell.c:2724
-#: src/protocols/novell/novell.c:2841 src/protocols/novell/novell.c:2893
-#: src/protocols/oscar/oscar.c:532 src/protocols/oscar/oscar.c:5484
-#: src/protocols/oscar/oscar.c:6489 src/protocols/oscar/oscar.c:6689
+#: src/protocols/jabber/presence.c:121 src/protocols/novell/novell.c:2771
+#: src/protocols/novell/novell.c:2888 src/protocols/novell/novell.c:2940
+#: src/protocols/oscar/oscar.c:516 src/protocols/oscar/oscar.c:5486
+#: src/protocols/oscar/oscar.c:6492 src/protocols/oscar/oscar.c:6692
 #: src/protocols/silc/buddy.c:1379 src/protocols/silc/silc.c:46
 #: src/protocols/silc/silc.c:76
 msgid "Away"
 msgstr "��仂��仍"
 
 #. else...
-#: plugins/docklet/docklet.c:159 src/away.c:550
-#: src/protocols/oscar/oscar.c:5402 src/protocols/oscar/oscar.c:6697
+#: plugins/docklet/docklet.c:159 src/away.c:565
+#: src/protocols/oscar/oscar.c:5404 src/protocols/oscar/oscar.c:6700
 msgid "Back"
 msgstr "�亠�仆�仍��"
 
@@ -183,11 +188,11 @@
 msgid "File Transfers"
 msgstr "�亠�亠亟舒�舒 �舒亶仍仂于"
 
-#: plugins/docklet/docklet.c:173 src/gtkaccount.c:2333
+#: plugins/docklet/docklet.c:173 src/gtkaccount.c:2336
 msgid "Accounts"
 msgstr "丕���仆�亠 亰舒仗亳�亳"
 
-#: plugins/docklet/docklet.c:174 src/gtkprefs.c:2503
+#: plugins/docklet/docklet.c:174 src/gtkprefs.c:2484
 msgid "Preferences"
 msgstr "�舒���仂亶从亳"
 
@@ -301,23 +306,23 @@
 msgid "Allows you to control Gaim by entering commands in a file."
 msgstr "�仂亰于仂仍�亠� �仗�舒于仍��� Gaim � 仗仂仄仂��� 于于仂亟舒 从仂仄舒仆亟 于 �舒亶仍."
 
-#: plugins/gaim-remote/remote.c:89
+#: plugins/gaim-remote/remote.c:90
 msgid "Not connected to AIM"
 msgstr "�亠� �仂亠亟亳仆亠仆亳� � AIM"
 
-#: plugins/gaim-remote/remote.c:98 plugins/gaim-remote/remote.c:137
+#: plugins/gaim-remote/remote.c:99 plugins/gaim-remote/remote.c:138
 msgid "No screenname given."
 msgstr "�亠 亰舒亟舒仆 亳亟亠仆�亳�亳从舒�仂� 仗仂仍�亰仂于舒�亠仍�."
 
-#: plugins/gaim-remote/remote.c:174
+#: plugins/gaim-remote/remote.c:175
 msgid "No roomname given."
 msgstr "�亠 亰舒亟舒仆仂 亳仄� 从仂仄仆舒��."
 
-#: plugins/gaim-remote/remote.c:193
+#: plugins/gaim-remote/remote.c:194
 msgid "Invalid AIM URI"
 msgstr "�亠于亠�仆�亶 AIM URI"
 
-#: plugins/gaim-remote/remote.c:651
+#: plugins/gaim-remote/remote.c:668
 #, c-format
 msgid ""
 "Failed to assign %s to a socket:\n"
@@ -326,7 +331,7 @@
 "�亠 �亟舒仍仂�� 仆舒亰仆舒�亳�� %s �仂从亠��:\n"
 "%s"
 
-#: plugins/gaim-remote/remote.c:674
+#: plugins/gaim-remote/remote.c:691
 msgid "Unable to open socket"
 msgstr "�亠 �亟舒���� 仂�从���� �仂从亠�"
 
@@ -337,19 +342,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/gaim-remote/remote.c:722
+#: plugins/gaim-remote/remote.c:739
 msgid "Remote Control"
 msgstr "�亳��舒仆�亳仂仆仆仂亠 �仗�舒于仍亠仆亳亠"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/gaim-remote/remote.c:725
+#: plugins/gaim-remote/remote.c:742
 msgid "Provides remote control for gaim applications."
 msgstr "��亠亟仂��舒于仍�亠� 于仂亰仄仂亢仆仂��� 亟亳��舒仆�亳仂仆仆仂亞仂 �仗�舒于仍亠仆亳� Gaim."
 
 #. *  description
-#: plugins/gaim-remote/remote.c:727
+#: plugins/gaim-remote/remote.c:744
 msgid ""
 "Gives Gaim the ability to be remote-controlled through third-party "
 "applications or through the gaim-remote tool."
@@ -451,14 +456,14 @@
 #: plugins/gevolution/add_buddy_dialog.c:143
 #: plugins/gevolution/add_buddy_dialog.c:154
 #: plugins/gevolution/assoc-buddy.c:81 plugins/gevolution/assoc-buddy.c:92
-#: src/gtkblist.c:3015 src/gtkprefs.c:961 src/gtkprefs.c:1014
-#: src/gtkprefs.c:1822 src/protocols/jabber/jabber.c:924
+#: src/gtkblist.c:3006 src/gtkprefs.c:956 src/gtkprefs.c:1008
+#: src/gtkprefs.c:1816 src/protocols/jabber/jabber.c:924
 msgid "None"
 msgstr "�亠�"
 
 #: plugins/gevolution/add_buddy_dialog.c:187
-#: plugins/gevolution/assoc-buddy.c:175 src/gtkprefs.c:2175
-#: src/gtkroomlist.c:553 src/protocols/jabber/jabber.c:598
+#: plugins/gevolution/assoc-buddy.c:175 src/gtkprefs.c:2157
+#: src/gtkroomlist.c:552 src/protocols/jabber/jabber.c:598
 #: src/protocols/msn/msn.c:1311 src/protocols/trepia/trepia.c:398
 msgid "Name"
 msgstr "�仄�"
@@ -474,7 +479,7 @@
 
 #. "Search"
 #: plugins/gevolution/add_buddy_dialog.c:492
-#: plugins/gevolution/assoc-buddy.c:380 src/protocols/oscar/oscar.c:6975
+#: plugins/gevolution/assoc-buddy.c:380 src/protocols/oscar/oscar.c:6976
 msgid "Search"
 msgstr "��从舒��"
 
@@ -519,7 +524,7 @@
 msgstr "弌仂仂�仆亠��亳 仗仂仍�亰仂于舒�亠仍�"
 
 #: plugins/gevolution/gevo-util.c:64 plugins/gevolution/gevolution.c:89
-#: src/blist.c:775 src/blist.c:963 src/blist.c:1870 src/gtkblist.c:3867
+#: src/blist.c:775 src/blist.c:963 src/blist.c:1899 src/gtkblist.c:3865
 #: src/protocols/jabber/roster.c:66
 msgid "Buddies"
 msgstr "�仂仍�亰仂于舒�亠仍亳"
@@ -540,7 +545,7 @@
 "��弍亠�亳�亠 于�亠 ����仆�亠 亰舒仗亳�亳, 仗仂仍�亰仂于舒�亠仍亳 从仂�仂��� 亟仂仍亢仆� 弍��� 亟仂弍舒于仍亠仆� "
 "舒于�仂仄舒�亳�亠�从亳."
 
-#: plugins/gevolution/gevolution.c:384 plugins/idle.c:51 src/gtkconn.c:620
+#: plugins/gevolution/gevolution.c:384 plugins/idle.c:51 src/gtkconn.c:619
 msgid "Account"
 msgstr "丕���仆舒� 亰舒仗亳��"
 
@@ -586,8 +591,8 @@
 msgstr "�亠仂弍�亰舒�亠仍�仆舒� 亳仆�仂�仄舒�亳�:"
 
 #. Label
-#: plugins/gevolution/new_person_dialog.c:338 src/gtkaccount.c:378
-#: src/gtkaccount.c:408 src/protocols/oscar/oscar.c:438
+#: plugins/gevolution/new_person_dialog.c:338 src/gtkaccount.c:380
+#: src/gtkaccount.c:410 src/protocols/oscar/oscar.c:422
 msgid "Buddy Icon"
 msgstr "�仆舒�仂从 仗仂仍�亰仂于舒�亠仍�"
 
@@ -654,9 +659,9 @@
 msgid "_Set"
 msgstr "丕��舒仆仂于亳��"
 
-#: plugins/idle.c:67 src/dialogs.c:786
+#: plugins/idle.c:67 src/dialogs.c:808
 msgid "_Cancel"
-msgstr "��仄亠仆舒"
+msgstr "�_�仄亠仆亳��"
 
 #: plugins/idle.c:97 plugins/idle.c:98
 msgid "Allows you to hand-configure how long you've been idle for"
@@ -820,14 +825,14 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/perl/perl.c:531
+#: plugins/perl/perl.c:532
 msgid "Perl Plugin Loader"
 msgstr "�舒亞��亰�亳从 仄仂亟�仍亠亶 Perl"
 
 #. *< name
 #. *< version
 #. *< summary
-#: plugins/perl/perl.c:533 plugins/perl/perl.c:534
+#: plugins/perl/perl.c:534 plugins/perl/perl.c:535
 msgid "Provides support for loading perl plugins."
 msgstr "��亠亟仂��舒于仍�亠� 仗仂亟亟亠�亢从� 亰舒亞��亰从亳 仄仂亟�仍亠亶 perl."
 
@@ -911,7 +916,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/signals-test.c:566
+#: plugins/signals-test.c:582
 msgid "Signals Test"
 msgstr "��仂于亠�从舒 �亳亞仆舒仍仂于"
 
@@ -919,7 +924,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/signals-test.c:569 plugins/signals-test.c:571
+#: plugins/signals-test.c:585 plugins/signals-test.c:587
 msgid "Test to see that all signals are working properly."
 msgstr "��仂于亠��亠�, 于�亠 仍亳 �亳亞仆舒仍� �舒弍仂�舒�� 亳�仗�舒于仆仂."
 
@@ -1002,7 +1007,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/ssl/ssl-nss.c:312
+#: plugins/ssl/ssl-nss.c:314
 msgid "NSS"
 msgstr "NSS"
 
@@ -1010,7 +1015,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/ssl/ssl-nss.c:315 plugins/ssl/ssl-nss.c:317
+#: plugins/ssl/ssl-nss.c:317 plugins/ssl/ssl-nss.c:319
 msgid "Provides SSL support through Mozilla NSS."
 msgstr "��亠亟仂��舒于仍�亠� 仗仂亟亟亠�亢从� SSL �亠�亠亰 Mozilla NSS."
 
@@ -1033,26 +1038,41 @@
 msgid "Provides a wrapper around SSL support libraries."
 msgstr "��亠亟仂��舒于仍�亠� 仂弍���从� 于仂从��亞 弍亳弍仍亳仂�亠从 仗仂亟亟亠�亢从亳 SSL."
 
-#: plugins/statenotify.c:30
+#: plugins/statenotify.c:37
 #, c-format
 msgid "%s has gone away."
 msgstr "%s 仂�仂��仍."
 
-#: plugins/statenotify.c:36
+#: plugins/statenotify.c:44
 #, c-format
 msgid "%s is no longer away."
 msgstr "%s 于亠�仆�仍��."
 
-#: plugins/statenotify.c:42
+#: plugins/statenotify.c:51
 #, c-format
 msgid "%s has become idle."
 msgstr "%s 仆舒�舒仍 弍亠亰亟亠亶��于仂于舒��."
 
-#: plugins/statenotify.c:48
+#: plugins/statenotify.c:58
 #, c-format
 msgid "%s is no longer idle."
 msgstr "%s 仗亠�亠��舒仍 弍亠亰亟亠亶��于仂于舒��."
 
+#: plugins/statenotify.c:69
+#, fuzzy
+msgid "Notify When"
+msgstr "丕于亠亟仂仄仍亠仆亳亠 亟仍�"
+
+#: plugins/statenotify.c:72
+#, fuzzy
+msgid "Buddy Goes _Away"
+msgstr "�仂仍�亰仂于舒�亠仍� 仂�仂��仍:"
+
+#: plugins/statenotify.c:75
+#, fuzzy
+msgid "Buddy Goes _Idle"
+msgstr "�仂仍�亰仂于舒�亠仍� 弍亠亰亟亠亶��于�亠�:"
+
 #. *< api_version
 #. *< type
 #. *< ui_requirement
@@ -1060,7 +1080,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/statenotify.c:78
+#: plugins/statenotify.c:113
 msgid "Buddy State Notification"
 msgstr "丕于亠亟仂仄仍亠仆亳亠 仂 ��舒���亠 仗仂仍�亰仂于舒�亠仍�"
 
@@ -1068,7 +1088,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/statenotify.c:81 plugins/statenotify.c:84
+#: plugins/statenotify.c:116 plugins/statenotify.c:119
 msgid ""
 "Notifies in a conversation window when a buddy goes or returns from away or "
 "idle."
@@ -1158,7 +1178,7 @@
 msgstr "�仂从舒亰�于舒�� 仗仂仍仂�� 仗�仂从���从亳 于 仂从仆舒� 弍亠�亠亟"
 
 #. Buddy List trans options
-#: plugins/win32/transparency/win2ktrans.c:405 src/gtkprefs.c:955
+#: plugins/win32/transparency/win2ktrans.c:405 src/gtkprefs.c:950
 msgid "Buddy List Window"
 msgstr "�从仆仂 �仗亳�从舒 从仂仆�舒从�仂于"
 
@@ -1211,8 +1231,8 @@
 msgstr "�舒仗��从舒�� Gaim 仗�亳 亰舒亞��亰从亠 Windows"
 
 #. Buddy List
-#: plugins/win32/winprefs/winprefs.c:362 src/gtkblist.c:3058
-#: src/gtkprefs.c:2412
+#: plugins/win32/winprefs/winprefs.c:362 src/gtkblist.c:3051
+#: src/gtkprefs.c:2394
 msgid "Buddy List"
 msgstr "弌仗亳�仂从 从仂仆�舒从�仂于"
 
@@ -1231,8 +1251,8 @@
 msgstr "�亠�亢舒�� 仂从仆仂 �仗亳�从舒 从仂仆�舒从�仂于 仆舒于亠���"
 
 #. Conversations
-#: plugins/win32/winprefs/winprefs.c:382 src/gtkprefs.c:1006
-#: src/gtkprefs.c:2413 src/protocols/msn/msn.c:1638
+#: plugins/win32/winprefs/winprefs.c:382 src/gtkprefs.c:1001
+#: src/gtkprefs.c:2395 src/protocols/msn/msn.c:1639
 msgid "Conversations"
 msgstr "�亠�亠亟�"
 
@@ -1252,12 +1272,12 @@
 msgid "About Gaim"
 msgstr "� Gaim"
 
-#: src/about.c:75
+#: src/about.c:74
 #, c-format
 msgid "<span weight=\"bold\" size=\"larger\">Gaim v%s</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">Gaim v%s</span>"
 
-#: src/about.c:95
+#: src/about.c:94
 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 "
@@ -1268,215 +1288,215 @@
 "亳 Gadu-Gadu 仂亟仆仂于�亠仄亠仆仆仂. �仆 仆舒仗亳�舒仆 � 亳�仗仂仍�亰仂于舒仆亳亠仄 Gtk+ 亳 "
 "�舒�仗�仂���舒仆�亠��� 仗仂亟 仍亳�亠仆亰亳亠亶 GPL.<BR><BR>"
 
-#: src/about.c:106
+#: src/about.c:105
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #gaim on irc.freenode.net<BR><BR>"
 msgstr "<FONT SIZE=\"4\">IRC:</FONT> #gaim 仆舒 irc.freenode.net<BR><BR>"
 
+#: src/about.c:110
+msgid "Active Developers"
+msgstr "�从�亳于仆�亠 �舒亰�舒弍仂��亳从亳"
+
 #: src/about.c:111
-msgid "Active Developers"
-msgstr "�从�亳于仆�亠 �舒亰�舒弍仂��亳从亳"
-
-#: src/about.c:112
 msgid "maintainer"
 msgstr "�仂仗�仂于仂亢亟舒��亳亶"
 
-#: src/about.c:114
+#: src/about.c:113
 msgid "lead developer"
 msgstr "于亠亟��亳亶 �舒亰�舒弍仂��亳从"
 
+#: src/about.c:116
+msgid "developer & webmaster"
+msgstr "�舒亰�舒弍仂��亳从 亳 于亠弍-仄舒��亠�"
+
 #: src/about.c:117
-msgid "developer & webmaster"
-msgstr "�舒亰�舒弍仂��亳从 亳 于亠弍-仄舒��亠�"
-
-#: src/about.c:118
 msgid "win32 port"
 msgstr "仗仂�� win32"
 
-#: src/about.c:121 src/about.c:122 src/about.c:123 src/about.c:124
+#: src/about.c:120 src/about.c:121 src/about.c:122 src/about.c:123
 msgid "developer"
 msgstr "�舒亰�舒弍仂��亳从"
 
-#: src/about.c:125
+#: src/about.c:124
 msgid "support"
 msgstr "仗仂亟亟亠�亢从舒"
 
-#: src/about.c:132
+#: src/about.c:131
 msgid "Crazy Patch Writers"
 msgstr "�亟亠�亢亳仄�亠 舒于�仂�� 亰舒仗仍舒�仂从"
 
+#: src/about.c:147
+msgid "Retired Developers"
+msgstr "�舒亰�舒弍仂��亳从亳, 仂�仂�亠亟�亳亠 仂� 亟亠仍"
+
 #: src/about.c:148
-msgid "Retired Developers"
-msgstr "�舒亰�舒弍仂��亳从亳, 仂�仂�亠亟�亳亠 仂� 亟亠仍"
-
-#: src/about.c:149
 msgid "former libfaim maintainer"
 msgstr "仗�亠亟�亟��亳亶 �仂仗�仂于仂亢亟舒��亳亶 libfaim"
 
-#: src/about.c:150
+#: src/about.c:149
 msgid "former lead developer"
 msgstr "仗�亠亟�亟��亳亶 于亠亟��亳亶 �舒亰�舒弍仂��亳从"
 
-#: src/about.c:153
+#: src/about.c:152
 msgid "former maintainer"
 msgstr "仗�亠亟�亟��亳亶 �仂仗�仂于仂亢亟舒��亳亶"
 
-#: src/about.c:154
+#: src/about.c:153
 msgid "former Jabber developer"
 msgstr "仗�亠亟�亟��亳亶 �舒亰�舒弍仂��亳从 Jabber"
 
-#: src/about.c:155
+#: src/about.c:154
 msgid "original author"
 msgstr "亳��仂亟仆�亶 舒于�仂�"
 
-#: src/about.c:158
+#: src/about.c:157
 msgid "hacker and designated driver [lazy bum]"
 msgstr ""
 
-#: src/about.c:166
+#: src/about.c:165
 msgid "Current Translators"
 msgstr "丐亠从��亳亠 仗亠�亠于仂亟�亳从亳"
 
-#: src/about.c:167 src/about.c:206
+#: src/about.c:166 src/about.c:205
 msgid "Bulgarian"
 msgstr "�仂仍亞舒��从亳亶"
 
-#: src/about.c:168 src/about.c:207
+#: src/about.c:167 src/about.c:206
 msgid "Catalan"
 msgstr "�舒�舒仍仂仆�从亳亶"
 
-#: src/about.c:169 src/about.c:208
+#: src/about.c:168 src/about.c:207
 msgid "Czech"
 msgstr "丼亠��从亳亶"
 
+#: src/about.c:169
+msgid "Danish"
+msgstr "�舒��从亳亶"
+
 #: src/about.c:170
-msgid "Danish"
-msgstr "�舒��从亳亶"
-
-#: src/about.c:171
 msgid "British English"
 msgstr "��亳�舒仆�从亳亶 舒仆亞仍亳亶�从亳亶"
 
-#: src/about.c:172
+#: src/about.c:171
 msgid "Canadian English"
 msgstr "�舒仆舒亟�从亳亶 舒仆亞仍亳亶�从亳亶"
 
-#: src/about.c:173 src/about.c:209
+#: src/about.c:172 src/about.c:208
 msgid "German"
 msgstr "�亠仄亠�从亳亶"
 
-#: src/about.c:174 src/about.c:210
+#: src/about.c:173 src/about.c:209
 msgid "Spanish"
 msgstr "��仗舒仆�从亳亶"
 
-#: src/about.c:175 src/about.c:211
+#: src/about.c:174 src/about.c:210
 msgid "Finnish"
 msgstr "个亳仆�从亳亶"
 
-#: src/about.c:176 src/about.c:212
+#: src/about.c:175 src/about.c:211
 msgid "French"
 msgstr "个�舒仆��亰�从亳亶"
 
+#: src/about.c:176
+msgid "Hebrew"
+msgstr "�于�亳�"
+
 #: src/about.c:177
-msgid "Hebrew"
-msgstr "�于�亳�"
-
-#: src/about.c:178
 msgid "Hindi"
 msgstr "丱亳仆亟亳"
 
-#: src/about.c:179
+#: src/about.c:178
 msgid "Hungarian"
 msgstr "�亠仆亞亠��从亳亶"
 
+#: src/about.c:179 src/about.c:212
+msgid "Italian"
+msgstr "��舒仍��仆�从亳亶"
+
 #: src/about.c:180 src/about.c:213
-msgid "Italian"
-msgstr "��舒仍��仆�从亳亶"
-
-#: src/about.c:181 src/about.c:214
 msgid "Japanese"
 msgstr "亊仗仂仆�从亳亶"
 
-#: src/about.c:182
+#: src/about.c:181
 msgid "Lithuanian"
 msgstr "�亳�仂于�从亳亶"
 
-#: src/about.c:183 src/about.c:215
+#: src/about.c:182 src/about.c:214
 msgid "Korean"
 msgstr "�仂�亠亶�从亳亶"
 
-#: src/about.c:184
+#: src/about.c:183
 msgid "Dutch; Flemish"
 msgstr "�舒��从亳亶; �仍舒仄舒仆亟�从亳亶"
 
+#: src/about.c:184
+msgid "Macedonian"
+msgstr "�舒从亠亟仂仆�从亳亶"
+
 #: src/about.c:185
-msgid "Macedonian"
-msgstr "�舒从亠亟仂仆�从亳亶"
-
-#: src/about.c:186
 msgid "Norwegian"
 msgstr "�仂�于亠亢�从亳亶"
 
-#: src/about.c:187 src/about.c:216
+#: src/about.c:186 src/about.c:215
 msgid "Polish"
 msgstr "�仂仍��从亳亶"
 
-#: src/about.c:188
+#: src/about.c:187
 msgid "Portuguese"
 msgstr "�仂���亞舒仍��从亳亶"
 
+#: src/about.c:188
+msgid "Portuguese-Brazil"
+msgstr "�仂���亞舒仍��从亳亶-弍�舒亰亳仍��从亳亶"
+
 #: src/about.c:189
-msgid "Portuguese-Brazil"
-msgstr "�仂���亞舒仍��从亳亶-弍�舒亰亳仍��从亳亶"
-
-#: src/about.c:190
 msgid "Romanian"
 msgstr "��仄�仆�从亳亶"
 
-#: src/about.c:191 src/about.c:217 src/about.c:218
+#: src/about.c:190 src/about.c:216 src/about.c:217
 msgid "Russian"
 msgstr "����从亳亶"
 
+#: src/about.c:191
+msgid "Serbian"
+msgstr "弌亠�弍�从亳亶"
+
 #: src/about.c:192
-msgid "Serbian"
-msgstr "弌亠�弍�从亳亶"
-
-#: src/about.c:193
 msgid "Slovenian"
 msgstr "弌仍仂于亠仆�从亳亶"
 
-#: src/about.c:194 src/about.c:220
+#: src/about.c:193 src/about.c:219
 msgid "Swedish"
 msgstr "丿于亠亟�从亳亶"
 
-#: src/about.c:195
+#: src/about.c:194
 msgid "Vietnamese"
 msgstr "��亠�仆舒仄�从亳亶"
 
-#: src/about.c:195
+#: src/about.c:194
 msgid "and the Gnome-Vi Team"
 msgstr "亳 从仂仄舒仆亟舒 Gnome-Vi"
 
+#: src/about.c:195
+msgid "Simplified Chinese"
+msgstr "丕仗�仂��仆仆�亶 从亳�舒亶�从亳亶"
+
 #: src/about.c:196
-msgid "Simplified Chinese"
-msgstr "丕仗�仂��仆仆�亶 从亳�舒亶�从亳亶"
-
-#: src/about.c:197
 msgid "Traditional Chinese"
 msgstr "丐�舒亟亳�亳仂仆仆�亶 从亳�舒亶�从亳亶"
 
+#: src/about.c:203
+msgid "Past Translators"
+msgstr "��亠亟�亟��亳亠 仗亠�亠于仂亟�亳从亳"
+
 #: src/about.c:204
-msgid "Past Translators"
-msgstr "��亠亟�亟��亳亠 仗亠�亠于仂亟�亳从亳"
-
-#: src/about.c:205
 msgid "Amharic"
 msgstr "�仄�舒��从亳亶"
 
-#: src/about.c:219
+#: src/about.c:218
 msgid "Slovak"
 msgstr "弌仍仂于舒�从亳亶"
 
-#: src/about.c:221
+#: src/about.c:220
 msgid "Chinese"
 msgstr "�亳�舒亶�从亳亶"
 
@@ -1512,49 +1532,49 @@
 #. *
 #. * A wrapper for gaim_request_action() that uses OK and Cancel buttons.
 #.
-#: src/account.c:342 src/connection.c:197 src/dialogs.c:462 src/dialogs.c:518
-#: src/dialogs.c:571 src/gtkblist.c:2391 src/gtkrequest.c:242
+#: src/account.c:342 src/connection.c:197 src/dialogs.c:473 src/dialogs.c:529
+#: src/dialogs.c:582 src/gtkblist.c:2380 src/gtkrequest.c:242
 #: src/protocols/jabber/jabber.c:1048 src/protocols/jabber/xdata.c:337
 #: src/protocols/msn/msn.c:226 src/protocols/msn/msn.c:241
 #: src/protocols/msn/msn.c:256 src/protocols/msn/msn.c:271
-#: src/protocols/oscar/oscar.c:3370 src/protocols/oscar/oscar.c:3464
-#: src/protocols/oscar/oscar.c:6758 src/protocols/oscar/oscar.c:6854
-#: src/protocols/oscar/oscar.c:6906 src/protocols/oscar/oscar.c:6992
+#: src/protocols/oscar/oscar.c:3361 src/protocols/oscar/oscar.c:3455
+#: src/protocols/oscar/oscar.c:6763 src/protocols/oscar/oscar.c:6855
+#: src/protocols/oscar/oscar.c:6907 src/protocols/oscar/oscar.c:6993
 #: src/protocols/silc/buddy.c:460 src/protocols/silc/buddy.c:1132
 #: src/protocols/silc/chat.c:409 src/protocols/silc/chat.c:447
-#: src/protocols/silc/chat.c:710 src/protocols/silc/ops.c:1063
-#: src/protocols/silc/ops.c:1671 src/protocols/silc/silc.c:692
-#: src/protocols/yahoo/yahoo.c:2752 src/protocols/yahoo/yahoo.c:2761
+#: src/protocols/silc/chat.c:710 src/protocols/silc/ops.c:1072
+#: src/protocols/silc/ops.c:1680 src/protocols/silc/silc.c:692
+#: src/protocols/yahoo/yahoo.c:2795 src/protocols/yahoo/yahoo.c:2804
 #: src/request.h:1243
 msgid "OK"
 msgstr "OK"
 
-#: src/account.c:343 src/account.c:381 src/away.c:334 src/connection.c:198
+#: src/account.c:343 src/account.c:381 src/away.c:349 src/connection.c:198
 #: src/dialogs.c:299 src/dialogs.c:311 src/dialogs.c:324 src/dialogs.c:345
-#: src/dialogs.c:463 src/dialogs.c:519 src/dialogs.c:572 src/dialogs.c:808
-#: src/dialogs.c:824 src/dialogs.c:842 src/gtkaccount.c:2002
-#: src/gtkaccount.c:2498 src/gtkblist.c:2392 src/gtkblist.c:4412
-#: src/gtkconn.c:168 src/gtkimhtmltoolbar.c:414 src/gtkprivacy.c:587
-#: src/gtkprivacy.c:600 src/gtkprivacy.c:625 src/gtkprivacy.c:636
+#: src/dialogs.c:474 src/dialogs.c:530 src/dialogs.c:583 src/dialogs.c:830
+#: src/dialogs.c:846 src/dialogs.c:864 src/gtkaccount.c:2005
+#: src/gtkaccount.c:2501 src/gtkblist.c:2381 src/gtkblist.c:4412
+#: src/gtkconn.c:168 src/gtkimhtmltoolbar.c:419 src/gtkprivacy.c:585
+#: src/gtkprivacy.c:598 src/gtkprivacy.c:623 src/gtkprivacy.c:634
 #: src/gtkrequest.c:243 src/protocols/icq/gaim_icq.c:277
-#: src/protocols/jabber/buddy.c:515 src/protocols/jabber/chat.c:710
+#: src/protocols/jabber/buddy.c:515 src/protocols/jabber/chat.c:702
 #: src/protocols/jabber/jabber.c:667 src/protocols/jabber/jabber.c:1049
 #: src/protocols/jabber/xdata.c:338 src/protocols/msn/msn.c:227
 #: src/protocols/msn/msn.c:242 src/protocols/msn/msn.c:257
 #: src/protocols/msn/msn.c:272 src/protocols/msn/msn.c:289
-#: src/protocols/oscar/oscar.c:1377 src/protocols/oscar/oscar.c:3330
-#: src/protocols/oscar/oscar.c:3371 src/protocols/oscar/oscar.c:3408
-#: src/protocols/oscar/oscar.c:3465 src/protocols/oscar/oscar.c:6759
-#: src/protocols/oscar/oscar.c:6855 src/protocols/oscar/oscar.c:6907
-#: src/protocols/oscar/oscar.c:6976 src/protocols/oscar/oscar.c:6993
+#: src/protocols/oscar/oscar.c:1363 src/protocols/oscar/oscar.c:3321
+#: src/protocols/oscar/oscar.c:3362 src/protocols/oscar/oscar.c:3399
+#: src/protocols/oscar/oscar.c:3456 src/protocols/oscar/oscar.c:6764
+#: src/protocols/oscar/oscar.c:6856 src/protocols/oscar/oscar.c:6908
+#: src/protocols/oscar/oscar.c:6977 src/protocols/oscar/oscar.c:6994
 #: src/protocols/silc/buddy.c:461 src/protocols/silc/buddy.c:1037
 #: src/protocols/silc/buddy.c:1133 src/protocols/silc/chat.c:582
-#: src/protocols/silc/chat.c:711 src/protocols/silc/ops.c:1672
+#: src/protocols/silc/chat.c:711 src/protocols/silc/ops.c:1681
 #: src/protocols/silc/silc.c:693 src/protocols/trepia/trepia.c:347
-#: src/protocols/yahoo/yahoo.c:2753 src/protocols/yahoo/yahoo.c:2762
+#: src/protocols/yahoo/yahoo.c:2796 src/protocols/yahoo/yahoo.c:2805
 #: src/request.h:1243 src/request.h:1253
 msgid "Cancel"
-msgstr "��仄亠仆舒"
+msgstr "��仄亠仆亳��"
 
 #: src/account.c:372
 #, c-format
@@ -1566,34 +1586,34 @@
 msgid "Save"
 msgstr "弌仂��舒仆亳��"
 
-#: src/away.c:211
+#: src/away.c:227
 msgid "Away!"
 msgstr "��仂��仍!"
 
-#: src/away.c:276
+#: src/away.c:291
 msgid "I'm Back!"
 msgstr "亊 于亠�仆�仍��!"
 
-#: src/away.c:330
+#: src/away.c:345
 #, c-format
 msgid "Are you sure you want to remove the away message \"%s\"?"
 msgstr "�� 亟亠亶��于亳�亠仍�仆仂 �仂�亳�亠 �亟舒仍亳�� �仂仂弍�亠仆亳亠 仂弍 仂������于亳亳 \"%s\"?"
 
-#: src/away.c:332 src/away.c:423
+#: src/away.c:347 src/away.c:438
 msgid "Remove Away Message"
 msgstr "丕亟舒仍亳�� �仂仂弍�亠仆亳亠 仂弍 仂������于亳亳"
 
 #. Remove button
-#: src/away.c:333 src/gtkconv.c:1388 src/gtkconv.c:3680 src/gtkconv.c:3784
+#: src/away.c:348 src/gtkconv.c:1378 src/gtkconv.c:3718 src/gtkconv.c:3822
 #: src/gtkrequest.c:248
 msgid "Remove"
 msgstr "丕亟舒仍亳��"
 
-#: src/away.c:403
+#: src/away.c:418
 msgid "New Away Message"
 msgstr "�仂于仂亠 �仂仂弍�亠仆亳亠 仂弍 仂������于亳亳"
 
-#: src/away.c:618
+#: src/away.c:633
 msgid "Set All Away"
 msgstr "丕��舒仆仂于亳�� 于亠亰亟亠 \"��仂��仍\""
 
@@ -1601,7 +1621,7 @@
 msgid "Chats"
 msgstr "丼舒��"
 
-#: src/blist.c:1321
+#: src/blist.c:1318
 #, c-format
 msgid ""
 "%d buddy from group %s was not removed because its account was not logged "
@@ -1618,16 +1638,11 @@
 "于�仂亟 � �仂仂�于亠���于���亠亶 亳仄 ����仆仂亶 亰舒仗亳���. 亅�亳 仗仂仍�亰仂于舒�亠仍亳 亳 亞��仗仗舒 仆亠 弍�仍亳 "
 "�亟舒仍亠仆�.\n"
 
-#: src/blist.c:1330
+#: src/blist.c:1327
 msgid "Group not removed"
 msgstr "���仗仗舒 仆亠 �亟舒仍亠仆舒"
 
-#: src/blist.c:1393 src/gtkaccount.c:167 src/gtkft.c:154 src/gtkutils.c:627
-#: src/protocols/jabber/buddy.c:570 src/protocols/novell/novell.c:2736
-msgid "Unknown"
-msgstr "�亠亳亰于亠��仆仂"
-
-#: src/blist.c:2001
+#: src/blist.c:2030
 msgid ""
 "An error was encountered parsing your buddy list.  It has not been loaded, "
 "and the old file has moved to blist.xml~."
@@ -1635,7 +1650,7 @@
 "��仂亳亰仂�仍舒 仂�亳弍从舒 仗�亳 �舒亰弍仂�亠 �仗亳�从舒 从仂仆�舒从�仂于. 弌仗亳�仂从 仆亠 弍�仍 亰舒亞��亢亠仆, 舒 "
 "��舒��亶 �舒亶仍 弍�仍 仗亠�亠亳仄亠仆仂于舒仆 于 blist.xml~."
 
-#: src/blist.c:2004
+#: src/blist.c:2033
 msgid "Buddy List Error"
 msgstr "��亳弍从舒 c仗亳�从舒 从仂仆�舒从�仂于"
 
@@ -1657,71 +1672,71 @@
 msgid "Enter password for %s"
 msgstr "�于亠亟亳�亠 仗舒�仂仍� 亟仍� %s"
 
-#: src/conversation.c:261
+#: src/conversation.c:229
 msgid "Unable to send message. The message is too large."
 msgstr "�亠 �亟舒���� 仂�仗�舒于亳�� �仂仂弍�亠仆亳亠. 弌仂仂弍�亠仆亳亠 �仍亳�从仂仄 于亠仍亳从仂."
 
-#: src/conversation.c:269
+#: src/conversation.c:237
 msgid "Unable to send message."
 msgstr "�亠 �亟舒���� 仂�仗�舒于亳�� �仂仂弍�亠仆亳亠."
 
-#: src/conversation.c:1953
+#: src/conversation.c:1950
 #, c-format
 msgid "%s entered the room."
 msgstr "%s 于仂��仍 于 从仂仄仆舒��."
 
-#: src/conversation.c:1956
+#: src/conversation.c:1953
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>] 于仂��仍 于 从仂仄仆舒��."
 
-#: src/conversation.c:2047
+#: src/conversation.c:2049
 #, c-format
 msgid "You are now known as %s"
 msgstr "�� �亠仗亠�� 亳亰于亠��仆� 从舒从 %s"
 
-#: src/conversation.c:2050
+#: src/conversation.c:2052
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s �亠仗亠�� 亳亰于亠��亠仆 从舒从 %s"
 
-#: src/conversation.c:2092
+#: src/conversation.c:2093
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s 于��亠仍 亳亰 从仂仄仆舒�� (%s)."
 
-#: src/conversation.c:2094
+#: src/conversation.c:2095
 #, c-format
 msgid "%s left the room."
 msgstr "%s 于��亠仍 亳亰 从仂仄仆舒��."
 
-#: src/conversation.c:2165
+#: src/conversation.c:2164
 #, c-format
 msgid "(+%d more)"
 msgstr "(+%d 亠��)"
 
-#: src/conversation.c:2167
+#: src/conversation.c:2166
 #, c-format
 msgid " left the room (%s)."
 msgstr " 于��亠仍 亳亰 从仂仄仆舒�� (%s)."
 
-#: src/conversation.c:2457
+#: src/conversation.c:2571
 msgid "Last created window"
 msgstr "�仂�仍亠亟仆亠亠 �仂亰亟舒仆仆仂亠 仂从仆仂"
 
-#: src/conversation.c:2459
+#: src/conversation.c:2573
 msgid "Separate IM and Chat windows"
 msgstr "��亟亠仍�仆�亠 仂从仆舒 弍亠�亠亟 亳 �舒�仂于"
 
-#: src/conversation.c:2461 src/gtkprefs.c:1384
+#: src/conversation.c:2575 src/gtkprefs.c:1377
 msgid "New window"
 msgstr "�仂于仂亠 仂从仆仂"
 
-#: src/conversation.c:2463
+#: src/conversation.c:2577
 msgid "By group"
 msgstr "�仂 亞��仗仗亠"
 
-#: src/conversation.c:2465
+#: src/conversation.c:2579
 msgid "By account"
 msgstr "�仂 ����仆仂亶 亰舒仗亳�亳"
 
@@ -1796,108 +1811,108 @@
 msgid "Remove Contact"
 msgstr "丕亟舒仍亳�� 从仂仆�舒从�"
 
-#: src/dialogs.c:444 src/dialogs.c:500 src/dialogs.c:552
+#: src/dialogs.c:455 src/dialogs.c:511 src/dialogs.c:563
 msgid "_Screen name"
 msgstr "�亟亠仆�亳�亳从舒�仂� 仗仂仍�亰仂于舒�亠仍�"
 
-#: src/dialogs.c:450 src/dialogs.c:506 src/dialogs.c:558
+#: src/dialogs.c:461 src/dialogs.c:517 src/dialogs.c:569
 msgid "_Account"
 msgstr "丕���仆a� 亰舒仗亳��"
 
-#: src/dialogs.c:457
+#: src/dialogs.c:468
 msgid "New Instant Message"
 msgstr "�仂于仂亠 �仂仂弍�亠仆亳亠"
 
-#: src/dialogs.c:459
+#: src/dialogs.c:470
 msgid "Please enter the screen name of the person you would like to IM."
 msgstr ""
 "�于亠亟亳�亠 亳亟亠仆�亳�亳从舒�仂� 仗仂仍�亰仂于舒�亠仍� 仗亠��仂仆�, 从仂�仂�仂亶 于� �仂�亠仍亳 弍� 仂�仗�舒于亳�� "
 "�仂仂弍�亠仆亳亠."
 
-#: src/dialogs.c:513
+#: src/dialogs.c:524
 msgid "Get User Info"
 msgstr "�仂仍��亳�� 亳仆�仂�仄舒�亳� 仂 仗仂仍�亰仂于舒�亠仍亠"
 
-#: src/dialogs.c:515
+#: src/dialogs.c:526
 msgid ""
 "Please enter the screen name of the person whose info you would like to view."
 msgstr ""
 "�于亠亟亳�亠 亳亟亠仆�亳�亳从舒�仂� 仗仂仍�亰仂于舒�亠仍� 仗亠��仂仆�, 亳仆�仂�仄舒�亳� 仂 从仂�仂�仂亶 于� �仂�亠仍亳 "
 "弍� 仗�仂�仄仂��亠��."
 
-#: src/dialogs.c:566
+#: src/dialogs.c:577
 msgid "Get User Log"
 msgstr "�仂仍��亳�� 亢��仆舒仍 仗仂仍�亰仂于舒�亠仍�"
 
-#: src/dialogs.c:568
+#: src/dialogs.c:579
 msgid ""
 "Please enter the screen name of the person whose log you would like to view."
 msgstr ""
 "�于亠亟亳�亠 亳亟亠仆�亳�亳从舒�仂� 仗仂仍�亰仂于舒�亠仍� 仗亠��仂仆�, 亢��仆舒仍 从仂�仂�仂亶 于� �仂�亠仍亳 弍� "
 "仗�仂�仄仂��亠��."
 
-#: src/dialogs.c:623
+#: src/dialogs.c:645
 msgid "You cannot save an away message with a blank title"
 msgstr "�� 仆亠 仄仂亢亠�亠 �仂��舒仆亳�� �仂仂弍�亠仆亳亠 仂弍 仂������于亳亳 弍亠亰 仆舒亰于舒仆亳�"
 
-#: src/dialogs.c:625
+#: src/dialogs.c:647
 msgid ""
 "Please give the message a title, or choose \"Use\" to use without saving."
 msgstr ""
 "�舒亶�亠 �仂仂弍�亠仆亳� 仆舒亰于舒仆亳亠 亳仍亳 于�弍亠�亳�亠 \"��亳仄亠仆亳��\" 亟仍� 亳�仗仂仍�亰仂于舒仆亳� 弍亠亰 "
 "�仂��舒仆亠仆亳�."
 
-#: src/dialogs.c:635
+#: src/dialogs.c:657
 msgid "You cannot create an empty away message"
 msgstr "�� 仆亠 仄仂亢亠�亠 �仂亰亟舒�� 仗���仂亠 �仂仂弍�亠仆亳亠 仂弍 仂������于亳亳"
 
-#: src/dialogs.c:697
+#: src/dialogs.c:719
 msgid "New away message"
 msgstr "�仂于仂亠 �仂仂弍�亠仆亳亠 仂弍 仂������于亳亳"
 
-#: src/dialogs.c:718
+#: src/dialogs.c:740
 msgid "Away title: "
 msgstr "�舒亰于舒仆亳亠 �仂仂弍�亠仆亳� 仂弍 仂������于亳亳: "
 
-#: src/dialogs.c:774
+#: src/dialogs.c:796
 msgid "_Save"
 msgstr "弌仂��舒仆亳��"
 
-#: src/dialogs.c:778
+#: src/dialogs.c:800
 msgid "Sa_ve & Use"
 msgstr "弌仂��舒仆亳�� 亳 仗�亳仄亠仆亳��"
 
-#: src/dialogs.c:782
-msgid "_Use"
-msgstr "��亳仄亠仆亳��"
-
 #: src/dialogs.c:804
+msgid "_Use"
+msgstr "��亳仄亠仆亳��"
+
+#: src/dialogs.c:826
 msgid "Alias Chat"
 msgstr "��亠于亟仂仆亳仄 �舒�舒"
 
-#: src/dialogs.c:805
+#: src/dialogs.c:827
 msgid "Enter an alias for this chat."
 msgstr "�于亠亟亳�亠 仗�亠于亟仂仆亳仄 亟仍� ��仂亞仂 �舒�舒."
 
-#: src/dialogs.c:807 src/dialogs.c:823 src/dialogs.c:841 src/gtkrequest.c:250
+#: src/dialogs.c:829 src/dialogs.c:845 src/dialogs.c:863 src/gtkrequest.c:250
 #: src/protocols/silc/chat.c:572
 msgid "Alias"
 msgstr "��亠于亟仂仆亳仄"
 
-#: src/dialogs.c:820
+#: src/dialogs.c:842
 msgid "Alias Contact"
 msgstr "��亠于亟仂仆亳仄 从仂仆�舒从�舒"
 
-#: src/dialogs.c:821
+#: src/dialogs.c:843
 msgid "Enter an alias for this contact."
 msgstr "�于亠亟亳�亠 仗�亠于亟仂仆亳仄 亟仍� ��仂亞仂 从仂仆�舒从�舒."
 
-#: src/dialogs.c:837
+#: src/dialogs.c:859
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "�于亠亟亳�亠 仗�亠于亟仂仆亳仄 亟仍� %s."
 
-#: src/dialogs.c:839
+#: src/dialogs.c:861
 msgid "Alias Buddy"
 msgstr "��亠于亟仂仆亳仄 仗仂仍�亰仂于舒�亠仍�"
 
@@ -1959,12 +1974,15 @@
 msgstr "�舒亰仄亠� �从舒亰舒�亠仍� �舒��亳�亳�亠仍�"
 
 #: src/gaim-remote.c:65
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Usage: %s command [OPTIONS] [URI]\n"
 "\n"
 "    COMMANDS:\n"
 "       uri                      Handle AIM: URI\n"
+"       away                     Popup the away dialog with the default "
+"message\n"
+"       back                     Remove the away dialog\n"
 "       quit                     Close running copy of Gaim\n"
 "\n"
 "    OPTIONS:\n"
@@ -1979,11 +1997,12 @@
 "    ������丐�乘:\n"
 "       -h, --help [从仂仄舒仆亟舒]     �仂从舒亰舒�� 仗仂仄仂�� 亟仍� 从仂仄舒仆亟�\n"
 
-#: src/gaim-remote.c:174 src/gaim-remote.c:190
+#: src/gaim-remote.c:176 src/gaim-remote.c:192 src/gaim-remote.c:208
+#: src/gaim-remote.c:224
 msgid "Gaim not running (on session 0)\n"
 msgstr "Gaim 仆亠 亰舒仗��亠仆 (于 �亠��亳亳 0)\n"
 
-#: src/gaim-remote.c:203
+#: src/gaim-remote.c:238
 msgid ""
 "\n"
 "Using AIM: URIs:\n"
@@ -2006,7 +2025,7 @@
 "...prompts you to add 'Penguin' to your buddy list.\n"
 msgstr ""
 
-#: src/gaim-remote.c:222
+#: src/gaim-remote.c:257
 msgid ""
 "\n"
 "Close running copy of Gaim\n"
@@ -2014,28 +2033,12 @@
 "\n"
 "�舒从���� 亰舒仗��亠仆仆�� 从仂仗亳� Gaim\n"
 
-#. for people like myself, who are too lazy to add an away msg :)
-#: src/gaimrc.c:46
-msgid "sorry, i ran out for a while. bbl"
-msgstr ""
-
-#: src/gaimrc.c:372 src/gaimrc.c:1417
-msgid "boring default"
-msgstr ""
-
-#: src/gaimrc.c:1227 src/gtkblist.c:3017
-msgid "Alphabetical"
-msgstr "�仂 舒仍�舒于亳��"
-
-#: src/gaimrc.c:1229 src/gtkblist.c:3018
-msgid "By status"
-msgstr "�仂 ��舒����"
-
-#: src/gaimrc.c:1231 src/gtkblist.c:3019
-msgid "By log size"
-msgstr "�仂 �舒亰仄亠�� 亢��仆舒仍舒"
-
-#: src/gtkaccount.c:331
+#: src/gtkaccount.c:169 src/gtkft.c:154 src/gtkutils.c:627
+#: src/protocols/jabber/buddy.c:570 src/protocols/novell/novell.c:2783
+msgid "Unknown"
+msgstr "�亠亳亰于亠��仆仂"
+
+#: src/gtkaccount.c:333
 #, c-format
 msgid ""
 "<b>File:</b> %s\n"
@@ -2047,164 +2050,164 @@
 "<b>�舒亰仄亠� 亳亰仂弍�舒亢亠仆亳�:</b> %dx%d"
 
 #. Build the login options frame.
-#: src/gtkaccount.c:614
+#: src/gtkaccount.c:621
 msgid "Login Options"
 msgstr "�舒�舒仄亠��� 于�仂亟舒"
 
-#: src/gtkaccount.c:631
+#: src/gtkaccount.c:638
 msgid "Protocol:"
 msgstr "��仂�仂从仂仍:"
 
-#: src/gtkaccount.c:636 src/gtkblist.c:4018
+#: src/gtkaccount.c:643 src/gtkblist.c:4018
 msgid "Screen Name:"
 msgstr "�亟亠仆�亳�亳从舒�仂� 仗仂仍�亰仂于舒�亠仍�:"
 
-#: src/gtkaccount.c:709
+#: src/gtkaccount.c:716
 msgid "Password:"
 msgstr "�舒�仂仍�:"
 
-#: src/gtkaccount.c:714 src/gtkblist.c:4032 src/gtkblist.c:4360
+#: src/gtkaccount.c:721 src/gtkblist.c:4032 src/gtkblist.c:4360
 msgid "Alias:"
 msgstr "��亠于亟仂仆亳仄:"
 
-#: src/gtkaccount.c:718
+#: src/gtkaccount.c:725
 msgid "Remember password"
 msgstr "�舒仗仂仄仆亳�� 仗舒�仂仍�"
 
 #. Build the user options frame.
-#: src/gtkaccount.c:774
+#: src/gtkaccount.c:781
 msgid "User Options"
 msgstr "�舒�舒仄亠��� 仗仂仍�亰仂于舒�亠仍�"
 
-#: src/gtkaccount.c:787
+#: src/gtkaccount.c:794
 msgid "New mail notifications"
 msgstr "�亰于亠�亠仆亳� 仂 仆仂于仂亶 仗仂��亠"
 
-#: src/gtkaccount.c:796
+#: src/gtkaccount.c:803
 msgid "Buddy icon:"
 msgstr "�仆舒�仂从 仗仂仍�亰仂于舒�亠仍�:"
 
 #. Build the protocol options frame.
-#: src/gtkaccount.c:885
+#: src/gtkaccount.c:892
 #, c-format
 msgid "%s Options"
 msgstr "�舒�舒仄亠��� %s"
 
 #. Use Global Proxy Settings
-#: src/gtkaccount.c:1021 src/gtkaccount.c:1068
+#: src/gtkaccount.c:1028 src/gtkaccount.c:1075
 msgid "Use Global Proxy Settings"
 msgstr "��仗仂仍�亰仂于舒�� 亞仍仂弍舒仍�仆�亠 仆舒���仂亶从亳 仗�仂从�亳"
 
 #. No Proxy
-#: src/gtkaccount.c:1027 src/gtkaccount.c:1075
+#: src/gtkaccount.c:1034 src/gtkaccount.c:1082
 msgid "No Proxy"
 msgstr "�亠� 仗�仂从�亳"
 
 #. HTTP
-#: src/gtkaccount.c:1033 src/gtkaccount.c:1082
+#: src/gtkaccount.c:1040 src/gtkaccount.c:1089
 msgid "HTTP"
 msgstr "HTTP"
 
 #. SOCKS 4
-#: src/gtkaccount.c:1039 src/gtkaccount.c:1089
+#: src/gtkaccount.c:1046 src/gtkaccount.c:1096
 msgid "SOCKS 4"
 msgstr "SOCKS 4"
 
 #. SOCKS 5
-#: src/gtkaccount.c:1045 src/gtkaccount.c:1096
+#: src/gtkaccount.c:1052 src/gtkaccount.c:1103
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
 #. Use Environmental Settings
-#: src/gtkaccount.c:1051 src/gtkaccount.c:1103 src/gtkprefs.c:1187
+#: src/gtkaccount.c:1058 src/gtkaccount.c:1110 src/gtkprefs.c:1180
 msgid "Use Environmental Settings"
 msgstr "��仗仂仍�亰仂于舒�� 仆舒���仂亶从亳 仂从��亢亠仆亳�"
 
-#: src/gtkaccount.c:1142
+#: src/gtkaccount.c:1149
 msgid "you can see the butterflies mating"
 msgstr "于� 仄仂亢亠�亠 �于亳亟亠�� �仗舒�亳于舒��亳��� 弍舒弍仂�亠从"
 
-#: src/gtkaccount.c:1146
+#: src/gtkaccount.c:1153
 msgid "If you look real closely"
 msgstr "��仍亳 仗�亳亞仍�亟亳�亠��"
 
-#: src/gtkaccount.c:1162
+#: src/gtkaccount.c:1169
 msgid "Proxy Options"
 msgstr "�舒�舒仄亠��� 仗�仂从�亳"
 
-#: src/gtkaccount.c:1180 src/gtkprefs.c:1181
+#: src/gtkaccount.c:1187 src/gtkprefs.c:1174
 msgid "Proxy _type:"
 msgstr "丐亳仗 仗�仂从�亳:"
 
-#: src/gtkaccount.c:1189 src/gtkprefs.c:1208
+#: src/gtkaccount.c:1196 src/gtkprefs.c:1201
 msgid "_Host:"
 msgstr "丕亰亠仍:"
 
-#: src/gtkaccount.c:1193 src/gtkprefs.c:1226
+#: src/gtkaccount.c:1200 src/gtkprefs.c:1219
 msgid "_Port:"
 msgstr "�仂��:"
 
-#: src/gtkaccount.c:1201
+#: src/gtkaccount.c:1208
 msgid "_Username:"
 msgstr "�仄� 仗仂仍�亰仂于舒�亠仍�:"
 
-#: src/gtkaccount.c:1206 src/gtkprefs.c:1263
+#: src/gtkaccount.c:1213 src/gtkprefs.c:1256
 msgid "Pa_ssword:"
 msgstr "�舒�仂仍�:"
 
-#: src/gtkaccount.c:1578
+#: src/gtkaccount.c:1581
 msgid "Add Account"
 msgstr "�仂弍舒于亳�� ����仆�� 亰舒仗亳��"
 
-#: src/gtkaccount.c:1580
+#: src/gtkaccount.c:1583
 msgid "Modify Account"
 msgstr "�亰仄亠仆亳�� ����仆�� 亰舒仗亳��"
 
 #. Add the disclosure
-#: src/gtkaccount.c:1604
+#: src/gtkaccount.c:1607
 msgid "Show more options"
 msgstr "�仂从舒亰舒�� 弍仂仍��亠 仗舒�舒仄亠��仂于"
 
-#: src/gtkaccount.c:1605
+#: src/gtkaccount.c:1608
 msgid "Show fewer options"
 msgstr "�仂从舒亰舒�� 仄亠仆��亠 仗舒�舒仄亠��仂于"
 
 #. Register button
-#: src/gtkaccount.c:1632 src/protocols/jabber/jabber.c:666
+#: src/gtkaccount.c:1635 src/protocols/jabber/jabber.c:666
 msgid "Register"
 msgstr "�舒�亠亞亳���亳�仂于舒��"
 
-#: src/gtkaccount.c:1997
+#: src/gtkaccount.c:2000
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "�� 亟亠亶��于亳�亠仍�仆仂 �仂�亳�亠 �亟舒仍亳�� %s?"
 
-#: src/gtkaccount.c:2001 src/gtkrequest.c:246
+#: src/gtkaccount.c:2004 src/gtkrequest.c:246
 msgid "Delete"
 msgstr "丕亟舒仍亳��"
 
-#: src/gtkaccount.c:2115 src/protocols/oscar/oscar.c:3998
+#: src/gtkaccount.c:2118 src/protocols/oscar/oscar.c:3990
 msgid "Screen Name"
 msgstr "�亟亠仆�亳�亳从舒�仂� 仗仂仍�亰仂于舒�亠仍�"
 
-#: src/gtkaccount.c:2139 src/protocols/jabber/jabber.c:958
-#: src/protocols/oscar/oscar.c:538 src/protocols/oscar/oscar.c:5482
-#: src/protocols/oscar/oscar.c:6688 src/protocols/silc/silc.c:44
-#: src/protocols/yahoo/yahoo.c:2515 src/protocols/zephyr/zephyr.c:1360
-#: src/protocols/zephyr/zephyr.c:1372
+#: src/gtkaccount.c:2142 src/protocols/jabber/jabber.c:958
+#: src/protocols/oscar/oscar.c:522 src/protocols/oscar/oscar.c:5484
+#: src/protocols/oscar/oscar.c:6691 src/protocols/silc/silc.c:44
+#: src/protocols/yahoo/yahoo.c:2558 src/protocols/zephyr/zephyr.c:1363
+#: src/protocols/zephyr/zephyr.c:1375
 msgid "Online"
 msgstr "� �亠�亳"
 
-#: src/gtkaccount.c:2160
+#: src/gtkaccount.c:2163
 msgid "Protocol"
 msgstr "��仂�仂从仂仍"
 
-#: src/gtkaccount.c:2473
+#: src/gtkaccount.c:2476
 #, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s%s"
 msgstr ""
 
-#: src/gtkaccount.c:2487
+#: src/gtkaccount.c:2490
 msgid ""
 "\n"
 "\n"
@@ -2214,27 +2217,27 @@
 "\n"
 "丱仂�亳�亠 亟仂弍舒于亳�� 亠亞仂 于 �于仂亶 �仗亳�仂从 从仂仆�舒从�仂于?"
 
-#: src/gtkaccount.c:2491
+#: src/gtkaccount.c:2494
 msgid "Information"
 msgstr "�仆�仂�仄舒�亳�"
 
-#: src/gtkaccount.c:2495
+#: src/gtkaccount.c:2498
 msgid "Add buddy to your list?"
 msgstr "�仂弍舒于亳�� 仗仂仍�亰仂于舒�亠仍� 于 �仗亳�仂从?"
 
 #. Add button
-#: src/gtkaccount.c:2497 src/gtkblist.c:4411 src/gtkconv.c:1390
-#: src/gtkconv.c:3673 src/gtkconv.c:3777 src/gtkrequest.c:247
-#: src/protocols/icq/gaim_icq.c:277 src/protocols/oscar/oscar.c:3627
+#: src/gtkaccount.c:2500 src/gtkblist.c:4411 src/gtkconv.c:1380
+#: src/gtkconv.c:3711 src/gtkconv.c:3815 src/gtkrequest.c:247
+#: src/protocols/icq/gaim_icq.c:277 src/protocols/oscar/oscar.c:3618
 #: src/protocols/silc/chat.c:581
 msgid "Add"
 msgstr "�仂弍舒于亳��"
 
-#: src/gtkblist.c:815
+#: src/gtkblist.c:802
 msgid "Join a Chat"
 msgstr "��亳�仂亠亟亳仆亳���� 从 �舒��"
 
-#: src/gtkblist.c:836
+#: src/gtkblist.c:823
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
@@ -2242,203 +2245,203 @@
 "�于亠亟亳�亠 �仂仂�于亠���于����� 亳仆�仂�仄舒�亳� 仂 �舒�亠, 从 从仂�仂�仂仄� 于� �仂�亠仍亳 弍� "
 "仗�亳�仂亠亟亳仆亳����.\n"
 
-#: src/gtkblist.c:847 src/gtkpounce.c:412 src/gtkroomlist.c:354
+#: src/gtkblist.c:834 src/gtkpounce.c:411 src/gtkroomlist.c:353
 msgid "_Account:"
 msgstr "丕���仆a� 亰舒仗亳��:"
 
-#: src/gtkblist.c:1133 src/gtkblist.c:3212
+#: src/gtkblist.c:1122 src/gtkblist.c:3204
 msgid "Get _Info"
 msgstr "�仆�仂�仄舒�亳�"
 
-#: src/gtkblist.c:1136 src/gtkblist.c:3203
+#: src/gtkblist.c:1125 src/gtkblist.c:3194
 msgid "I_M"
 msgstr "弌仂仂弍�亠仆亳亠"
 
-#: src/gtkblist.c:1141
+#: src/gtkblist.c:1130
 msgid "_Send File"
 msgstr "��仗�舒于亳�� �舒亶仍"
 
-#: src/gtkblist.c:1145
+#: src/gtkblist.c:1134
 msgid "Add Buddy _Pounce"
 msgstr "�仂弍舒于亳�� 仗�舒于亳仍仂"
 
-#: src/gtkblist.c:1147
+#: src/gtkblist.c:1136
 msgid "View _Log"
 msgstr "��仂�仄仂��亠�� _亢��仆舒仍"
 
-#: src/gtkblist.c:1155 src/gtkblist.c:1241 src/gtkblist.c:1255
+#: src/gtkblist.c:1144 src/gtkblist.c:1230 src/gtkblist.c:1244
 msgid "_Alias..."
 msgstr "��亠于亟仂仆亳仄..."
 
-#: src/gtkblist.c:1157 src/gtkblist.c:1243 src/gtkblist.c:1260
-#: src/gtkconn.c:361
+#: src/gtkblist.c:1146 src/gtkblist.c:1232 src/gtkblist.c:1249
+#: src/gtkconn.c:360
 msgid "_Remove"
 msgstr "丕亟舒仍亳��"
 
-#: src/gtkblist.c:1203
+#: src/gtkblist.c:1192
 msgid "Add a _Buddy"
 msgstr "�仂弍舒于亳�� 仗仂仍�亰仂于舒�亠仍�"
 
-#: src/gtkblist.c:1205
+#: src/gtkblist.c:1194
 msgid "Add a C_hat"
 msgstr "�仂弍舒于亳�� �舒�"
 
-#: src/gtkblist.c:1207
+#: src/gtkblist.c:1196
 msgid "_Delete Group"
 msgstr "丕亟舒仍亳�� 亞��仗仗�"
 
-#: src/gtkblist.c:1209
+#: src/gtkblist.c:1198
 msgid "_Rename"
 msgstr "�亠�亠亳仄亠仆仂于舒��"
 
 #. join button
-#: src/gtkblist.c:1231 src/gtkroomlist.c:263 src/gtkroomlist.c:409
+#: src/gtkblist.c:1220 src/gtkroomlist.c:263 src/gtkroomlist.c:408
 #: src/stock.c:87
 msgid "_Join"
 msgstr "��亳�仂亠亟亳仆亳����"
 
-#: src/gtkblist.c:1233
+#: src/gtkblist.c:1222
 msgid "Auto-Join"
 msgstr "��亳�仂亠亟亳仆����� 舒于�仂仄舒�亳�亠�从亳"
 
-#: src/gtkblist.c:1257 src/gtkblist.c:1286
+#: src/gtkblist.c:1246 src/gtkblist.c:1275
 msgid "_Collapse"
 msgstr "弌于亠�仆���"
 
-#: src/gtkblist.c:1291
+#: src/gtkblist.c:1280
 msgid "_Expand"
 msgstr "�舒亰于亠�仆���"
 
-#: src/gtkblist.c:1949 src/gtkconv.c:4315 src/gtkpounce.c:314
+#: src/gtkblist.c:1938 src/gtkconv.c:4405 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:2336
+#: src/gtkblist.c:2325
 msgid "/_Buddies"
 msgstr "/_�仂仆�舒从��"
 
-#: src/gtkblist.c:2337
+#: src/gtkblist.c:2326
 msgid "/Buddies/New Instant _Message..."
-msgstr "/�仂仆�舒从��/�仂于仂亠 �仂仂弍�亠仆亳亠..."
+msgstr "/�仂仆�舒从��/�仂于仂亠 _�仂仂弍�亠仆亳亠..."
+
+#: src/gtkblist.c:2327
+msgid "/Buddies/Join a _Chat..."
+msgstr "/�仂仆�舒从��/��亳�仂亠亟亳仆亳���� 从 _�舒��..."
+
+#: src/gtkblist.c:2328
+msgid "/Buddies/Get User _Info..."
+msgstr "/�仂仆�舒从��/�仂仍��亳�� _亳仆�仂�仄舒�亳� 仂 仗仂仍�亰仂于舒�亠仍亠..."
+
+#: src/gtkblist.c:2329
+msgid "/Buddies/View User _Log..."
+msgstr "/�仂仆�舒从��/��仂�仄仂��亠�� _亢��仆舒仍 仗仂仍�亰仂于舒�亠仍�..."
+
+#: src/gtkblist.c:2331
+msgid "/Buddies/Show _Offline Buddies"
+msgstr "/�仂仆�舒从��/�仂从舒亰�于舒�� 仂_������于���亳� 仗仂仍�亰仂于舒�亠仍亠亶"
+
+#: src/gtkblist.c:2332
+msgid "/Buddies/Show _Empty Groups"
+msgstr "/�仂仆�舒从��/�仂从舒亰�于舒�� 仗_����亠 亞��仗仗�"
+
+#: src/gtkblist.c:2333
+msgid "/Buddies/_Add Buddy..."
+msgstr "/�仂仆�舒从��/�仂弍舒于亳�� _仗仂仍�亰仂于舒�亠仍�..."
+
+#: src/gtkblist.c:2334
+msgid "/Buddies/Add C_hat..."
+msgstr "/�仂仆�舒从��/�仂弍舒于亳�� �_舒�..."
+
+#: src/gtkblist.c:2335
+msgid "/Buddies/Add _Group..."
+msgstr "/�仂仆�舒从��/�仂弍舒于亳�� _亞��仗仗�..."
+
+#: src/gtkblist.c:2337
+msgid "/Buddies/_Signoff"
+msgstr "/�仂仆�舒从��/_��从仍��亳����"
 
 #: src/gtkblist.c:2338
-msgid "/Buddies/Join a _Chat..."
-msgstr "/�仂仆�舒从��/��亳�仂亠亟亳仆亳���� 从 �舒��..."
-
-#: src/gtkblist.c:2339
-msgid "/Buddies/Get User _Info..."
-msgstr "/�仂仆�舒从��/�仂仍��亳�� 亳仆�仂�仄舒�亳� 仂 仗仂仍�亰仂于舒�亠仍亠..."
-
-#: src/gtkblist.c:2340
-msgid "/Buddies/View User _Log..."
-msgstr "/�仂仆�舒从��/��仂�仄仂��亠�� 亢��仆舒仍 仗仂仍�亰仂于舒�亠仍�..."
+msgid "/Buddies/_Quit"
+msgstr "/�仂仆�舒从��/_��亶�亳"
+
+#. Tools
+#: src/gtkblist.c:2341
+msgid "/_Tools"
+msgstr "/_弌亠�于亳�"
 
 #: src/gtkblist.c:2342
-msgid "/Buddies/Show _Offline Buddies"
-msgstr "/�仂仆�舒从��/�仂从舒亰�于舒�� 仂������于���亳� 仗仂仍�亰仂于舒�亠仍亠亶"
+msgid "/Tools/_Away"
+msgstr "/弌亠�于亳�/_弌�舒���"
 
 #: src/gtkblist.c:2343
-msgid "/Buddies/Show _Empty Groups"
-msgstr "/�仂仆�舒从��/�仂从舒亰�于舒�� 仗����亠 亞��仗仗�"
+msgid "/Tools/Buddy _Pounce"
+msgstr "/弌亠�于亳�/弌仍亠亢亠仆亳亠 亰舒 _仗仂仍�亰仂于舒�亠仍�仄亳"
 
 #: src/gtkblist.c:2344
-msgid "/Buddies/_Add Buddy..."
-msgstr "/�仂仆�舒从��/�仂弍舒于亳�� 仗仂仍�亰仂于舒�亠仍�..."
+msgid "/Tools/Account Ac_tions"
+msgstr "/弌亠�于亳�/�亠亶��于亳� � _����仆�仄亳 亰舒仗亳��仄亳"
 
 #: src/gtkblist.c:2345
-msgid "/Buddies/Add C_hat..."
-msgstr "/�仂仆�舒从��/�仂弍舒于亳�� �舒�..."
-
-#: src/gtkblist.c:2346
-msgid "/Buddies/Add _Group..."
-msgstr "/�仂仆�舒从��/�仂弍舒于亳�� 亞��仗仗�..."
+msgid "/Tools/Pl_ugin Actions"
+msgstr "/弌亠�于亳�/�亠亶��于亳� � _仄仂亟�仍�仄亳"
+
+#: src/gtkblist.c:2347
+msgid "/Tools/A_ccounts"
+msgstr "/弌亠�于亳�/丕���仆�亠 _亰舒仗亳�亳"
 
 #: src/gtkblist.c:2348
-msgid "/Buddies/_Signoff"
-msgstr "/�仂仆�舒从��/��从仍��亳����"
+msgid "/Tools/_File Transfers"
+msgstr "/弌亠�于亳�/�亠�亠亟舒�舒 _�舒亶仍仂于"
 
 #: src/gtkblist.c:2349
-msgid "/Buddies/_Quit"
-msgstr "/�仂仆�舒从��/��亶�亳"
-
-#. Tools
-#: src/gtkblist.c:2352
-msgid "/_Tools"
-msgstr "/_弌亠�于亳�"
+msgid "/Tools/R_oom List"
+msgstr "/弌亠�于亳�/弌仗亳�仂从 _从仂仄仆舒�"
+
+#: src/gtkblist.c:2350
+msgid "/Tools/Pr_eferences"
+msgstr "/弌亠�于亳�/_�舒���仂亶从亳"
+
+#: src/gtkblist.c:2351
+msgid "/Tools/Pr_ivacy"
+msgstr "/弌亠�于亳�/�_仂仆�亳亟亠仆�亳舒仍�仆仂���"
 
 #: src/gtkblist.c:2353
-msgid "/Tools/_Away"
-msgstr "/弌亠�于亳�/弌�舒���"
-
-#: src/gtkblist.c:2354
-msgid "/Tools/Buddy _Pounce"
-msgstr "/弌亠�于亳�/弌仍亠亢亠仆亳亠 亰舒 仗仂仍�亰仂于舒�亠仍�仄亳"
-
-#: src/gtkblist.c:2355
-msgid "/Tools/Account Ac_tions"
-msgstr "/弌亠�于亳�/�亠亶��于亳� � ����仆�仄亳 亰舒仗亳��仄亳"
-
+msgid "/Tools/View System _Log"
+msgstr "/弌亠�于亳�/��仂�仄仂��亠�� �亳��亠仄仆�亶 _亢��仆舒仍"
+
+#. Help
 #: src/gtkblist.c:2356
-msgid "/Tools/Pl_ugin Actions"
-msgstr "/弌亠�于亳�/�亠亶��于亳� � 仄仂亟�仍�仄亳"
+msgid "/_Help"
+msgstr "/_�仂仄仂��"
+
+#: src/gtkblist.c:2357
+msgid "/Help/Online _Help"
+msgstr "/�仂仄仂��/�仂仄仂�� 于 _�亠�亳"
 
 #: src/gtkblist.c:2358
-msgid "/Tools/A_ccounts"
-msgstr "/弌亠�于亳�/丕���仆�亠 亰舒仗亳�亳"
+msgid "/Help/_Debug Window"
+msgstr "/�仂仄仂��/�从仆仂 _仂�仍舒亟从亳"
 
 #: src/gtkblist.c:2359
-msgid "/Tools/_File Transfers"
-msgstr "/弌亠�于亳�/�亠�亠亟舒�舒 �舒亶仍仂于"
-
-#: src/gtkblist.c:2360
-msgid "/Tools/R_oom List"
-msgstr "/弌亠�于亳�/弌仗亳�仂从 从仂仄仆舒�"
-
-#: src/gtkblist.c:2361
-msgid "/Tools/Pr_eferences"
-msgstr "/弌亠�于亳�/_�舒���仂亶从亳"
-
-#: src/gtkblist.c:2362
-msgid "/Tools/Pr_ivacy"
-msgstr "/弌亠�于亳�/�仂仆�亳亟亠仆�亳舒仍�仆仂���"
-
-#: src/gtkblist.c:2364
-msgid "/Tools/View System _Log"
-msgstr "/弌亠�于亳�/��仂�仄仂��亠�� �亳��亠仄仆�亶 亢��仆舒仍"
-
-#. Help
-#: src/gtkblist.c:2367
-msgid "/_Help"
-msgstr "/_�仂仄仂��"
-
-#: src/gtkblist.c:2368
-msgid "/Help/Online _Help"
-msgstr "/�仂仄仂��/�仂仄仂�� 于 �亠�亳"
-
-#: src/gtkblist.c:2369
-msgid "/Help/_Debug Window"
-msgstr "/�仂仄仂��/�从仆仂 仂�仍舒亟从亳"
-
-#: src/gtkblist.c:2370
 msgid "/Help/_About"
-msgstr "/�仂仄仂��/� 仗�仂亞�舒仄仄亠"
-
-#: src/gtkblist.c:2388
+msgstr "/�仂仄仂��/� _仗�仂亞�舒仄仄亠"
+
+#: src/gtkblist.c:2377
 msgid "Rename Group"
 msgstr "�亠�亠亳仄亠仆仂于舒�� 亞��仗仗�"
 
-#: src/gtkblist.c:2388
+#: src/gtkblist.c:2377
 msgid "New group name"
 msgstr "�仂于仂亠 亳仄� 亞��仗仗�"
 
-#: src/gtkblist.c:2389
+#: src/gtkblist.c:2378
 msgid "Please enter a new name for the selected group."
 msgstr "�于亠亟亳�亠 仆仂于仂亠 亳仄� 亟仍� 于�弍�舒仆仆仂亶 亞��仗仗�."
 
-#: src/gtkblist.c:2417
+#: src/gtkblist.c:2406
 #, c-format
 msgid ""
 "\n"
@@ -2447,7 +2450,7 @@
 "\n"
 "<b>丕���仆舒� 亰舒仗亳��:</b> %s"
 
-#: src/gtkblist.c:2481
+#: src/gtkblist.c:2470
 msgid ""
 "\n"
 "<b>Status:</b> Offline"
@@ -2455,12 +2458,12 @@
 "\n"
 "<b>弌�舒���:</b> �亠 于 �亠�亳"
 
-#: src/gtkblist.c:2496
+#: src/gtkblist.c:2485
 #, c-format
 msgid "%d%%"
 msgstr "%d%%"
 
-#: src/gtkblist.c:2512
+#: src/gtkblist.c:2501
 msgid ""
 "\n"
 "<b>Account:</b>"
@@ -2468,7 +2471,7 @@
 "\n"
 "<b>丕���仆舒� 亰舒仗亳��:</b>"
 
-#: src/gtkblist.c:2513
+#: src/gtkblist.c:2502
 msgid ""
 "\n"
 "<b>Contact Alias:</b>"
@@ -2476,7 +2479,7 @@
 "\n"
 "<b>��亠于亟仂仆亳仄 从仂仆�舒从�舒:</b>"
 
-#: src/gtkblist.c:2514
+#: src/gtkblist.c:2503
 msgid ""
 "\n"
 "<b>Alias:</b>"
@@ -2484,7 +2487,7 @@
 "\n"
 "<b>��亠于亟仂仆亳仄:</b>"
 
-#: src/gtkblist.c:2515
+#: src/gtkblist.c:2504
 msgid ""
 "\n"
 "<b>Nickname:</b>"
@@ -2492,7 +2495,7 @@
 "\n"
 "<b>��亳亞亳仆舒仍�仆�亶 仗�亠于亟仂仆亳仄:</b>"
 
-#: src/gtkblist.c:2516
+#: src/gtkblist.c:2505
 msgid ""
 "\n"
 "<b>Logged In:</b>"
@@ -2500,7 +2503,7 @@
 "\n"
 "<b>� �亠�亳:</b>"
 
-#: src/gtkblist.c:2517
+#: src/gtkblist.c:2506
 msgid ""
 "\n"
 "<b>Idle:</b>"
@@ -2508,7 +2511,7 @@
 "\n"
 "<b>�亠亰亟亠亶��于�亠�:</b>"
 
-#: src/gtkblist.c:2518
+#: src/gtkblist.c:2507
 msgid ""
 "\n"
 "<b>Warned:</b>"
@@ -2516,110 +2519,122 @@
 "\n"
 "<b>��亠亟�仗�亠亢亟�仆:</b>"
 
-#: src/gtkblist.c:2520
+#: src/gtkblist.c:2509
 msgid ""
 "\n"
 "<b>Description:</b> Spooky"
 msgstr ""
 
-#: src/gtkblist.c:2521
+#: src/gtkblist.c:2510
 msgid ""
 "\n"
 "<b>Status</b>: Awesome"
 msgstr ""
 
-#: src/gtkblist.c:2522
+#: src/gtkblist.c:2511
 msgid ""
 "\n"
 "<b>Status</b>: Rockin'"
 msgstr ""
 
-#: src/gtkblist.c:2804
+#: src/gtkblist.c:2793
 #, c-format
 msgid "Idle (%dh%02dm) "
 msgstr "�亠亰亟亠亶��于�亠� (%dh%02dm) "
 
-#: src/gtkblist.c:2806
+#: src/gtkblist.c:2795
 #, c-format
 msgid "Idle (%dm) "
 msgstr "�亠亰亟亠亶��于�亠� (%dm) "
 
-#: src/gtkblist.c:2811
+#: src/gtkblist.c:2800
 #, c-format
 msgid "Warned (%d%%) "
 msgstr "��亠亟�仗�亠亢亟�仆 (%d%%) "
 
-#: src/gtkblist.c:2814
+#: src/gtkblist.c:2803
 msgid "Offline "
 msgstr "�亠 于 �亠�亳 "
 
 #. Make menu items sensitive/insensitive where appropriate
-#: src/gtkblist.c:2932
+#: src/gtkblist.c:2921
 msgid "/Buddies/Join a Chat..."
 msgstr "/�仂仆�舒从��/��亳�仂亠亟亳仆亳���� 从 �舒��..."
 
-#: src/gtkblist.c:2935
+#: src/gtkblist.c:2924
 msgid "/Tools/Room List"
 msgstr "/弌亠�于亳�/弌仗亳�仂从 从仂仄仆舒�"
 
-#: src/gtkblist.c:2938
+#: src/gtkblist.c:2927
 msgid "/Tools/Privacy"
 msgstr "/弌亠�于亳�/�仂仆�亳亟亠仆�亳舒仍�仆仂���"
 
+#: src/gtkblist.c:3008
+msgid "Alphabetical"
+msgstr "�仂 舒仍�舒于亳��"
+
+#: src/gtkblist.c:3009
+msgid "By status"
+msgstr "�仂 ��舒����"
+
+#: src/gtkblist.c:3010
+msgid "By log size"
+msgstr "�仂 �舒亰仄亠�� 亢��仆舒仍舒"
+
+#: src/gtkblist.c:3076
+msgid "/Tools/Away"
+msgstr "/弌亠�于亳�/弌�舒���"
+
+#: src/gtkblist.c:3079
+msgid "/Tools/Buddy Pounce"
+msgstr "/弌亠�于亳�/弌仍亠亢亠仆亳亠 亰舒 仗仂仍�亰仂于舒�亠仍�仄亳"
+
+#: src/gtkblist.c:3082
+msgid "/Tools/Account Actions"
+msgstr "/弌亠�于亳�/�亠亶��于亳� � ����仆�仄亳 亰舒仗亳��仄亳"
+
 #: src/gtkblist.c:3085
-msgid "/Tools/Away"
-msgstr "/弌亠�于亳�/弌�舒���"
-
-#: src/gtkblist.c:3088
-msgid "/Tools/Buddy Pounce"
-msgstr "/弌亠�于亳�/弌仍亠亢亠仆亳亠 亰舒 仗仂仍�亰仂于舒�亠仍�仄亳"
-
-#: src/gtkblist.c:3091
-msgid "/Tools/Account Actions"
-msgstr "/弌亠�于亳�/�亠亶��于亳� � ����仆�仄亳 亰舒仗亳��仄亳"
-
-#: src/gtkblist.c:3094
 msgid "/Tools/Plugin Actions"
 msgstr "/弌亠�于亳�/�亠亶��于亳� � 仄仂亟�仍�仄亳"
 
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: src/gtkblist.c:3183
+#: src/gtkblist.c:3174
 msgid "/Buddies/Show Offline Buddies"
 msgstr "/�仂仆�舒从��/�仂从舒亰�于舒�� 仂������于���亳� 仗仂仍�亰仂于舒�亠仍亠亶"
 
-#: src/gtkblist.c:3185
+#: src/gtkblist.c:3176
 msgid "/Buddies/Show Empty Groups"
 msgstr "/�仂仆�舒从��/�仂从舒亰�于舒�� 仗����亠 亞��仗仗�"
 
-#: src/gtkblist.c:3209
+#: src/gtkblist.c:3200
 msgid "Send a message to the selected buddy"
 msgstr "��仗�舒于亳�� �仂仂弍�亠仆亳亠 于�弍�舒仆仆仂仄� 仗仂仍�亰仂于舒�亠仍�"
 
-#: src/gtkblist.c:3218
+#: src/gtkblist.c:3210
 msgid "Get information on the selected buddy"
 msgstr "�仂仍��亳�� 亳仆�仂�仄舒�亳� 仂 于�弍�舒仆仆仂仄 仗仂仍�亰仂于舒�亠仍亠"
 
-#: src/gtkblist.c:3221
+#: src/gtkblist.c:3214
 msgid "_Chat"
 msgstr "丼舒�"
 
-#: src/gtkblist.c:3226
+#: src/gtkblist.c:3219
 msgid "Join a chat room"
 msgstr "��亳�仂亠亟亳仆亳���� 从 �舒��"
 
-#: src/gtkblist.c:3229
+#: src/gtkblist.c:3224
 msgid "_Away"
 msgstr "弌�舒���"
 
-#: src/gtkblist.c:3234
+#: src/gtkblist.c:3229
 msgid "Set an away message"
 msgstr "丕��舒仆仂于亳�� �仂仂弍�亠仆亳亠 仂弍 仂������于亳亳"
 
 #: src/gtkblist.c:3972 src/protocols/silc/buddy.c:731
 #: src/protocols/silc/buddy.c:989 src/protocols/silc/buddy.c:1034
-#: src/protocols/silc/buddy.c:1124 src/protocols/yahoo/yahoo.c:2682
+#: src/protocols/silc/buddy.c:1124 src/protocols/yahoo/yahoo.c:2725
 msgid "Add Buddy"
 msgstr "�仂弍舒于亳�� 仗仂仍�亰仂于舒�亠仍�"
 
@@ -2669,7 +2684,7 @@
 msgid "No actions available"
 msgstr "�亠� 亟仂���仗仆�� 亟亠亶��于亳亶"
 
-#: src/gtkconn.c:78 src/gtkconn.c:250 src/gtkconn.c:261
+#: src/gtkconn.c:78 src/gtkconn.c:249 src/gtkconn.c:260
 msgid "Done."
 msgstr "�仂�仂于仂."
 
@@ -2681,15 +2696,15 @@
 msgid "Signon"
 msgstr "�仂亟从仍��亠仆亳亠"
 
-#: src/gtkconn.c:216
+#: src/gtkconn.c:215
 msgid "Cancel All"
 msgstr "��仄亠仆亳�� 于�亠"
 
-#: src/gtkconn.c:361 src/gtkconn.c:593
+#: src/gtkconn.c:360 src/gtkconn.c:592
 msgid "_Reconnect"
 msgstr "�亠�亠�仂亠亟亳仆亠仆亳亠"
 
-#: src/gtkconn.c:557
+#: src/gtkconn.c:556
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">%s has been disconnected.</span>\n"
@@ -2702,15 +2717,15 @@
 "%s\n"
 "%s"
 
-#: src/gtkconn.c:559
+#: src/gtkconn.c:558
 msgid "Reason Unknown."
 msgstr "��亳�亳仆舒 仆亠亳亰于亠��仆舒."
 
-#: src/gtkconn.c:598
+#: src/gtkconn.c:597
 msgid "Reconnect _All"
 msgstr "�亠�亠�仂亠亟亳仆亳�� 于�亠"
 
-#: src/gtkconn.c:628
+#: src/gtkconn.c:627
 msgid "Time"
 msgstr "��亠仄�"
 
@@ -2723,7 +2738,11 @@
 msgid "Supported debug options are:  version"
 msgstr "�仂亟亟亠�亢亳于舒亠仄�亠 仗舒�舒仄亠��� 仂�仍舒亟从亳:  version"
 
-#: src/gtkconv.c:336
+#: src/gtkconv.c:347
+msgid "No such command (in this context)."
+msgstr "�亠� �舒从仂亶 从仂仄舒仆亟� (于 ��仂仄 从仂仆�亠从��亠)."
+
+#: src/gtkconv.c:350
 msgid ""
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
 "The following commands are available in this context:\n"
@@ -2731,46 +2750,42 @@
 "��仗仂仍�亰�亶�亠 \"/help &lt;从仂仄舒仆亟舒&gt;\" 亟仍� 仗仂仄仂�亳 仗仂 从仂仆从�亠�仆仂亶 从仂仄舒仆亟亠.\n"
 "弌仍亠亟���亳亠 从仂仄舒仆亟� 亟仂���仗仆� 于 ��仂仄 从仂仆�亠从��亠:\n"
 
-#: src/gtkconv.c:370
-msgid "No such command (in this context)."
-msgstr "�亠� �舒从仂亶 从仂仄舒仆亟� (于 ��仂仄 从仂仆�亠从��亠)."
-
-#: src/gtkconv.c:443
+#: src/gtkconv.c:434
 msgid ""
 "No such command. If you didn't mean to type a command, you can turn commands "
 "off from Tools->Preferences->Interface->Conversation->Enable \"slash\" "
 "commands."
 msgstr ""
 
-#: src/gtkconv.c:451
+#: src/gtkconv.c:442
 msgid ""
 "Syntax Error:  You typed the wrong number of arguments to that command. If "
 "you didn't mean to type a command, you can turn commands off from Tools-"
 ">Preferences->Interface->Conversation->Enable \"slash\" commands."
 msgstr ""
 
-#: src/gtkconv.c:458
+#: src/gtkconv.c:449
 msgid "Your command failed for an unknown reason."
 msgstr "�舒�舒 从仂仄舒仆亟舒 仆亠 弍�仍舒 于�仗仂仍仆亠仆舒 仗仂 仆亠亳亰于亠��仆仂亶 仗�亳�亳仆亠."
 
-#: src/gtkconv.c:465
+#: src/gtkconv.c:456
 msgid "That command only works in Chats, not IMs."
 msgstr "亅�舒 从仂仄舒仆亟舒 �舒弍仂�舒亠� �仂仍�从仂 于 �舒�舒�, 仆亠 于 弍亠�亠亟舒�."
 
-#: src/gtkconv.c:468
+#: src/gtkconv.c:459
 msgid "That command only works in IMs, not Chats."
 msgstr "亅�舒 从仂仄舒仆亟舒 �舒弍仂�舒亠� �仂仍�从仂 于 弍亠�亠亟舒�, 仆亠 于 �舒�舒�."
 
-#: src/gtkconv.c:472
+#: src/gtkconv.c:463
 msgid "That command doesn't work on this protocol."
 msgstr "亅�舒 从仂仄舒仆亟舒 仆亠 �舒弍仂�舒亠� � ��亳仄 仗�仂�仂从仂仍仂仄."
 
-#: src/gtkconv.c:693
+#: src/gtkconv.c:685
 msgid "Invite Buddy Into Chat Room"
 msgstr "��亳亞仍舒�亳�� 仗仂仍�亰仂于舒�亠仍� 于 �舒�"
 
 #. Put our happy label in it.
-#: src/gtkconv.c:721
+#: src/gtkconv.c:713
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
@@ -2778,349 +2793,348 @@
 "�于亠亟亳�亠 亳仄� 仗仂仍�亰仂于舒�亠仍�, 从仂�仂�仂亞仂 于� �仂�亳�亠 仗�亳亞仍舒�亳��, 于仄亠��亠 � "
 "仆亠仂弍�亰舒�亠仍�仆�仄 �亠从��仂仄 仗�亳亞仍舒�亠仆亳�."
 
-#: src/gtkconv.c:742
+#: src/gtkconv.c:734
 msgid "_Buddy:"
 msgstr "�仂仍�亰仂于舒�亠仍�:"
 
-#: src/gtkconv.c:762
+#: src/gtkconv.c:754
 msgid "_Message:"
 msgstr "弌仂仂弍�亠仆亳亠:"
 
-#: src/gtkconv.c:799 src/gtkconv.c:2489 src/gtkdebug.c:182
+#: src/gtkconv.c:791 src/gtkconv.c:2476 src/gtkdebug.c:182
 msgid "Unable to open file."
 msgstr "�亠 �亟舒���� 仂�从���� �舒亶仍."
 
-#: src/gtkconv.c:804
+#: src/gtkconv.c:796
 #, c-format
 msgid "<h1>Conversation with %s</h1>\n"
 msgstr "<h1>�亠�亠亟舒 � %s</h1>\n"
 
-#: src/gtkconv.c:818
+#: src/gtkconv.c:810
 msgid "Save Conversation"
 msgstr "弌仂��舒仆亳�� 弍亠�亠亟�"
 
-#: src/gtkconv.c:895 src/gtkdebug.c:131
+#: src/gtkconv.c:887 src/gtkdebug.c:131
 msgid "Find"
 msgstr "�舒亶�亳"
 
-#: src/gtkconv.c:921 src/gtkdebug.c:159
+#: src/gtkconv.c:913 src/gtkdebug.c:159
 msgid "_Search for:"
 msgstr "��从舒��:"
 
-#: src/gtkconv.c:1338
+#: src/gtkconv.c:1328
 msgid "IM"
 msgstr "弌仂仂弍�亠仆亳亠"
 
-#. Block button
-#: src/gtkconv.c:1347 src/gtkconv.c:3666 src/protocols/oscar/oscar.c:453
-#: src/protocols/oscar/oscar.c:6798
+#. Send File button
+#: src/gtkconv.c:1337 src/gtkconv.c:3704 src/protocols/oscar/oscar.c:437
 msgid "Send File"
 msgstr "��仗�舒于亳�� �舒亶仍"
 
-#: src/gtkconv.c:1356
+#: src/gtkconv.c:1346
 msgid "Un-Ignore"
 msgstr "�亠 亳亞仆仂�亳�仂于舒��"
 
-#: src/gtkconv.c:1358 src/gtkprefs.c:826
+#: src/gtkconv.c:1348 src/gtkprefs.c:825
 msgid "Ignore"
 msgstr "�亞仆仂�亳�仂于舒��"
 
 #. Info button
-#: src/gtkconv.c:1367 src/gtkconv.c:3687
+#: src/gtkconv.c:1357 src/gtkconv.c:3725
 msgid "Info"
 msgstr "�仆�仂�仄舒�亳�"
 
-#: src/gtkconv.c:1376
+#: src/gtkconv.c:1366
 msgid "Get Away Msg"
 msgstr "�仂仍��亳�� �仂仂弍�亠仆亳亠 仂弍 仂������于亳亳"
 
-#: src/gtkconv.c:2497
+#: src/gtkconv.c:2484
 msgid "Unable to save icon file to disk."
 msgstr "�亠 �亟舒���� �仂��舒仆亳�� �舒亶仍 亰仆舒�从舒 仆舒 亟亳�从."
 
-#: src/gtkconv.c:2514
+#: src/gtkconv.c:2501
 msgid "Save Icon"
 msgstr "弌仂��舒仆亳�� 亰仆舒�仂从"
 
-#: src/gtkconv.c:2544
+#: src/gtkconv.c:2531
 msgid "Animate"
 msgstr "�仆亳仄亳�仂于舒��"
 
-#: src/gtkconv.c:2549
+#: src/gtkconv.c:2536
 msgid "Hide Icon"
 msgstr "弌从���� 亰仆舒�仂从"
 
-#: src/gtkconv.c:2555
+#: src/gtkconv.c:2542
 msgid "Save Icon As..."
 msgstr "弌仂��舒仆亳�� 亰仆舒�仂从 从舒从..."
 
-#: src/gtkconv.c:2939
+#: src/gtkconv.c:2926
 msgid "User is typing..."
 msgstr "�仂仍�亰仂于舒�亠仍� 仗亳�亠�..."
 
-#: src/gtkconv.c:2947
+#: src/gtkconv.c:2934
 msgid "User has typed something and paused"
 msgstr "�仂仍�亰仂于舒�亠仍� ��仂-�仂 仆舒仗亳�舒仍 亳 仂��舒仆仂于亳仍��"
 
 #. Build the Send As menu
-#: src/gtkconv.c:3050
+#: src/gtkconv.c:3037
 msgid "_Send As"
 msgstr "��仗�舒于亳�� 从舒从"
 
 #. Conversation menu
-#: src/gtkconv.c:3450
+#: src/gtkconv.c:3488
 msgid "/_Conversation"
 msgstr "/_�亠�亠亟舒"
 
-#: src/gtkconv.c:3452
+#: src/gtkconv.c:3490
 msgid "/Conversation/New Instant _Message..."
 msgstr "/�亠�亠亟舒/�仂于仂亠 �仂仂弍�亠仆亳亠..."
 
-#: src/gtkconv.c:3457
+#: src/gtkconv.c:3495
 msgid "/Conversation/_Find..."
 msgstr "/�亠�亠亟舒/�舒亶�亳..."
 
-#: src/gtkconv.c:3459
+#: src/gtkconv.c:3497
 msgid "/Conversation/View _Log"
 msgstr "/�亠�亠亟舒/��仂�仄仂��亠�� 亢��仆舒仍"
 
-#: src/gtkconv.c:3460
+#: src/gtkconv.c:3498
 msgid "/Conversation/_Save As..."
 msgstr "/�亠�亠亟舒/弌仂��舒仆亳�� 从舒从..."
 
-#: src/gtkconv.c:3462
+#: src/gtkconv.c:3500
 msgid "/Conversation/Clear"
 msgstr "/�亠�亠亟舒/��亳��亳��"
 
-#: src/gtkconv.c:3466
+#: src/gtkconv.c:3504
 msgid "/Conversation/Se_nd File..."
 msgstr "/�亠�亠亟舒/��仗�舒于亳�� �舒亶仍..."
 
-#: src/gtkconv.c:3467
+#: src/gtkconv.c:3505
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/�亠�亠亟舒/�仂弍舒于亳�� 仗�舒于亳仍仂..."
 
-#: src/gtkconv.c:3469
+#: src/gtkconv.c:3507
 msgid "/Conversation/_Get Info"
 msgstr "/�亠�亠亟舒/�仂仍��亳�� 亳仆�仂�仄舒�亳�"
 
-#: src/gtkconv.c:3471
+#: src/gtkconv.c:3509
 msgid "/Conversation/_Warn..."
 msgstr "/�亠�亠亟舒/弌亟亠仍舒�� 仗�亠亟�仗�亠亢亟亠仆亳亠..."
 
-#: src/gtkconv.c:3473
+#: src/gtkconv.c:3511
 msgid "/Conversation/In_vite..."
 msgstr "/�亠�亠亟舒/��亳亞仍舒�亳��..."
 
-#: src/gtkconv.c:3478
+#: src/gtkconv.c:3516
 msgid "/Conversation/A_lias..."
 msgstr "/�亠�亠亟舒/��亠于亟仂仆亳仄..."
 
-#: src/gtkconv.c:3480
+#: src/gtkconv.c:3518
 msgid "/Conversation/_Block..."
 msgstr "/�亠�亠亟舒/�仍仂从亳�仂于舒��..."
 
-#: src/gtkconv.c:3482
+#: src/gtkconv.c:3520
 msgid "/Conversation/_Add..."
 msgstr "/�亠�亠亟舒/�仂弍舒于亳��..."
 
-#: src/gtkconv.c:3484
+#: src/gtkconv.c:3522
 msgid "/Conversation/_Remove..."
 msgstr "/�亠�亠亟舒/丕亟舒仍亳��..."
 
-#: src/gtkconv.c:3489
+#: src/gtkconv.c:3527
 msgid "/Conversation/Insert Lin_k..."
 msgstr "/�亠�亠亟舒/���舒于亳�� ���仍从�..."
 
-#: src/gtkconv.c:3491
+#: src/gtkconv.c:3529
 msgid "/Conversation/Insert Imag_e..."
 msgstr "/�亠�亠亟舒/���舒于亳�� 亳亰仂弍�舒亢亠仆亳亠..."
 
-#: src/gtkconv.c:3496
+#: src/gtkconv.c:3534
 msgid "/Conversation/_Close"
 msgstr "/�亠�亠亟舒/�舒从����"
 
 #. Options
-#: src/gtkconv.c:3500
+#: src/gtkconv.c:3538
 msgid "/_Options"
 msgstr "/_�舒�舒仄亠���"
 
-#: src/gtkconv.c:3501
+#: src/gtkconv.c:3539
 msgid "/Options/Enable _Logging"
 msgstr "/�舒�舒仄亠���/�亠��亳 亢��仆舒仍"
 
-#: src/gtkconv.c:3502
+#: src/gtkconv.c:3540
 msgid "/Options/Enable _Sounds"
 msgstr "/�舒�舒仄亠���/�仂�仗�仂亳亰于仂亟亳�� 亰于�从亳"
 
-#: src/gtkconv.c:3503
+#: src/gtkconv.c:3541
 msgid "/Options/Show Formatting _Toolbar"
 msgstr "/�舒�舒仄亠���/�仂从舒亰�于舒�� 仗舒仆亠仍� 亳仆����仄亠仆�仂于 �仂�仄舒�亳�仂于舒仆亳�"
 
-#: src/gtkconv.c:3504
+#: src/gtkconv.c:3542
 msgid "/Options/Show T_imestamps"
 msgstr "/�舒�舒仄亠���/�仂从舒亰�于舒�� 于�亠仄� �仂仂弍�亠仆亳亶"
 
-#: src/gtkconv.c:3546
+#: src/gtkconv.c:3584
 msgid "/Conversation/View Log"
 msgstr "/�亠�亠亟舒/��仂�仄仂��亠�� 亢��仆舒仍"
 
-#: src/gtkconv.c:3551
+#: src/gtkconv.c:3589
 msgid "/Conversation/Send File..."
 msgstr "/�亠�亠亟舒/��仗�舒于亳�� �舒亶仍..."
 
-#: src/gtkconv.c:3555
+#: src/gtkconv.c:3593
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/�亠�亠亟舒/�仂弍舒于亳�� 仗�舒于亳仍仂..."
 
-#: src/gtkconv.c:3561
+#: src/gtkconv.c:3599
 msgid "/Conversation/Get Info"
 msgstr "/�亠�亠亟舒/�仂仍��亳�� 亳仆�仂�仄舒�亳�"
 
-#: src/gtkconv.c:3565
+#: src/gtkconv.c:3603
 msgid "/Conversation/Warn..."
 msgstr "/�亠�亠亟舒/弌亟亠仍舒�� 仗�亠亟�仗�亠亢亟亠仆亳亠..."
 
-#: src/gtkconv.c:3569
+#: src/gtkconv.c:3607
 msgid "/Conversation/Invite..."
 msgstr "/�亠�亠亟舒/��亳亞仍舒�亳��..."
 
-#: src/gtkconv.c:3575
+#: src/gtkconv.c:3613
 msgid "/Conversation/Alias..."
 msgstr "/�亠�亠亟舒/��亠于亟仂仆亳仄..."
 
-#: src/gtkconv.c:3579
+#: src/gtkconv.c:3617
 msgid "/Conversation/Block..."
 msgstr "/�亠�亠亟舒/�仍仂从亳�仂于舒��..."
 
-#: src/gtkconv.c:3583
+#: src/gtkconv.c:3621
 msgid "/Conversation/Add..."
 msgstr "/�亠�亠亟舒/�仂弍舒于亳��..."
 
-#: src/gtkconv.c:3587
+#: src/gtkconv.c:3625
 msgid "/Conversation/Remove..."
 msgstr "/�亠�亠亟舒/丕亟舒仍亳��..."
 
-#: src/gtkconv.c:3593
+#: src/gtkconv.c:3631
 msgid "/Conversation/Insert Link..."
 msgstr "/�亠�亠亟舒/���舒于亳�� ���仍从�..."
 
-#: src/gtkconv.c:3597
+#: src/gtkconv.c:3635
 msgid "/Conversation/Insert Image..."
 msgstr "/�亠�亠亟舒/���舒于亳�� 亳亰仂弍�舒亢亠仆亳亠..."
 
-#: src/gtkconv.c:3603
+#: src/gtkconv.c:3641
 msgid "/Options/Enable Logging"
 msgstr "/�舒�舒仄亠���/�亠��亳 亢��仆舒仍"
 
-#: src/gtkconv.c:3606
+#: src/gtkconv.c:3644
 msgid "/Options/Enable Sounds"
 msgstr "/�舒�舒仄亠���/�仂�仗�仂亳亰于仂亟亳�� 亰于�从亳"
 
-#: src/gtkconv.c:3609
+#: src/gtkconv.c:3647
 msgid "/Options/Show Formatting Toolbar"
 msgstr "/�舒�舒仄亠���/�仂从舒亰�于舒�� 仗舒仆亠仍� 亳仆����仄亠仆�仂于 �仂�仄舒�亳�仂于舒仆亳�"
 
-#: src/gtkconv.c:3612
+#: src/gtkconv.c:3650
 msgid "/Options/Show Timestamps"
 msgstr "/�舒�舒仄亠���/�仂从舒亰�于舒�� 于�亠仄� �仂仂弍�亠仆亳亶"
 
 #. From right to left...
 #. Send button
-#: src/gtkconv.c:3636 src/gtkconv.c:3638 src/gtkconv.c:3756 src/gtkconv.c:3758
+#: src/gtkconv.c:3674 src/gtkconv.c:3676 src/gtkconv.c:3794 src/gtkconv.c:3796
 msgid "Send"
 msgstr "��仗�舒于亳��"
 
 #. Now, um, just kind of all over the place. Huh?
 #. Warn button
-#: src/gtkconv.c:3652
+#: src/gtkconv.c:3690
 msgid "Warn"
 msgstr "弌亟亠仍舒�� 仗�亠亟�仗�亠亢亟亠仆亳亠"
 
-#: src/gtkconv.c:3655
+#: src/gtkconv.c:3693
 msgid "Warn the user"
 msgstr "弌亟亠仍舒�� 仗仂仍�亰仂于舒�亠仍� 仗�亠亟�仗�亠亢亟亠仆亳亠"
 
 #. Block button
-#: src/gtkconv.c:3659 src/gtkprivacy.c:624 src/gtkprivacy.c:635
+#: src/gtkconv.c:3697 src/gtkprivacy.c:622 src/gtkprivacy.c:633
 msgid "Block"
 msgstr "�仍仂从亳�仂于舒��"
 
-#: src/gtkconv.c:3662
+#: src/gtkconv.c:3700
 msgid "Block the user"
 msgstr "�仍仂从亳�仂于舒�� 仗仂仍�亰仂于舒�亠仍�"
 
-#: src/gtkconv.c:3669
+#: src/gtkconv.c:3707
 msgid "Send a file to the user"
 msgstr "��仗�舒于亳�� 仗仂仍�亰仂于舒�亠仍� �舒亶仍"
 
-#: src/gtkconv.c:3676
+#: src/gtkconv.c:3714
 msgid "Add the user to your buddy list"
 msgstr "�仂弍舒于亳�� 仗仂仍�亰仂于舒�亠仍� 于 �仗亳�仂从 从仂仆�舒从�仂于"
 
-#: src/gtkconv.c:3683
+#: src/gtkconv.c:3721
 msgid "Remove the user from your buddy list"
 msgstr "丕亟舒仍亳�� 仗仂仍�亰仂于舒�亠仍� 亳亰 �仗亳�从舒 从仂仆�舒从�仂于"
 
-#: src/gtkconv.c:3690 src/gtkconv.c:4039
+#: src/gtkconv.c:3728 src/gtkconv.c:4108
 msgid "Get the user's information"
 msgstr "�仂仍��亳�� 亳仆�仂�仄舒�亳� 仂 仗仂仍�亰仂于舒�亠仍亠"
 
 #. Invite
-#: src/gtkconv.c:3770
+#: src/gtkconv.c:3808
 msgid "Invite"
 msgstr "��亳亞仍舒�亳��"
 
-#: src/gtkconv.c:3773
+#: src/gtkconv.c:3811
 msgid "Invite a user"
 msgstr "��亳亞仍舒�亳�� 仗仂仍�亰仂于舒�亠仍�"
 
-#: src/gtkconv.c:3780
+#: src/gtkconv.c:3818
 msgid "Add the chat to your buddy list"
 msgstr "�仂弍舒于亳�� �舒� 于 �仗亳�仂从 从仂仆�舒从�仂于"
 
-#: src/gtkconv.c:3787
+#: src/gtkconv.c:3825
 msgid "Remove the chat from your buddy list"
 msgstr "丕亟舒仍亳�� �舒� 亳亰 �仗亳�从舒 从仂仆�舒从�仂于"
 
-#: src/gtkconv.c:3897
+#: src/gtkconv.c:3961
 msgid "Topic:"
 msgstr "丐亠仄舒:"
 
 #. Setup the label telling how many people are in the room.
-#: src/gtkconv.c:3960
+#: src/gtkconv.c:4024
 msgid "0 people in room"
 msgstr "0 仗仂仍�亰仂于舒�亠仍亠亶 于 从仂仄仆舒�亠"
 
-#: src/gtkconv.c:4016
+#: src/gtkconv.c:4085
 msgid "IM the user"
 msgstr "��仗�舒于亳�� 仗仂仍�亰仂于舒�亠仍� �仂仂弍�亠仆亳亠"
 
-#: src/gtkconv.c:4028
+#: src/gtkconv.c:4097
 msgid "Ignore the user"
 msgstr "�亞仆仂�亳�仂于舒�� 仗仂仍�亰仂于舒�亠仍�"
 
-#: src/gtkconv.c:4627
+#: src/gtkconv.c:4695
 msgid "Close conversation"
 msgstr "�舒从���� 弍亠�亠亟�"
 
-#: src/gtkconv.c:5169 src/gtkconv.c:5201 src/gtkconv.c:5322 src/gtkconv.c:5389
+#: src/gtkconv.c:5227 src/gtkconv.c:5256 src/gtkconv.c:5352 src/gtkconv.c:5404
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "%d 仗仂仍�亰仂于舒�亠仍� 于 从仂仄仆舒�亠"
 msgstr[1] "%d 仗仂仍�亰仂于舒�亠仍亠亶 于 从仂仄仆舒�亠"
 
-#: src/gtkconv.c:5901 src/gtkconv.c:5904
+#: src/gtkconv.c:5958 src/gtkconv.c:5961
 msgid "<main>/Conversation/Close"
 msgstr "<main>/�亠�亠亟舒/�舒从����"
 
-#: src/gtkconv.c:6276
+#: src/gtkconv.c:6333
 msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
 msgstr ""
 "me &lt;亟亠亶��于亳亠&gt;:  ��仗�舒于亳�� 亟亠亶��于亳亠 于 ��亳仍亠 IRC 仗仂仍�亰仂于舒�亠仍� 亳仍亳 于 �舒�."
 
-#: src/gtkconv.c:6279
+#: src/gtkconv.c:6336
 msgid ""
 "debug &lt;option&gt;:  Send various debug information to the current "
 "conversation."
@@ -3128,11 +3142,7 @@
 "debug &lt;仗舒�舒仄亠��&gt;:  ��仗�舒于亳�� �舒亰仍亳�仆�� 仂�仍舒亟仂�仆�� 亳仆�仂�仄舒�亳� 于 �亠从���� "
 "弍亠�亠亟�."
 
-#: src/gtkconv.c:6283
-msgid "help:  List available commands."
-msgstr "help:  ��于亠��亳 �仗亳�仂从 亟仂���仗仆�� 从仂仄舒仆亟."
-
-#: src/gtkconv.c:6287
+#: src/gtkconv.c:6340
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr "help &lt;从仂仄舒仆亟舒&gt;:  �仂仍��亳�� 仗仂仄仂�� 仗仂 从仂仆从�亠�仆仂亶 从仂仄舒仆亟亠."
 
@@ -3157,11 +3167,11 @@
 msgid "%.2f KB/s"
 msgstr "%.2f KB/s"
 
-#: src/gtkft.c:157 src/gtkft.c:967
+#: src/gtkft.c:157 src/gtkft.c:962
 msgid "Finished"
 msgstr "�舒于亠��亠仆仂"
 
-#: src/gtkft.c:160 src/gtkft.c:918
+#: src/gtkft.c:160 src/gtkft.c:913
 msgid "Canceled"
 msgstr "��仄亠仆亠仆仂"
 
@@ -3221,34 +3231,34 @@
 msgid "Time Remaining:"
 msgstr "���舒仍仂�� 于�亠仄亠仆亳:"
 
-#: src/gtkft.c:641
+#: src/gtkft.c:636
 msgid "_Keep the dialog open"
 msgstr "�亠�亢舒�� 亟亳舒仍仂亞 仂�从����仄"
 
-#: src/gtkft.c:651
+#: src/gtkft.c:646
 msgid "_Clear finished transfers"
 msgstr "��亳�舒�� 亰舒于亠���仆仆�亠 仗亠�亠亟舒�亳 �舒亶仍仂于"
 
 #. "Download Details" arrow
-#: src/gtkft.c:660
+#: src/gtkft.c:655
 msgid "Show transfer details"
 msgstr "�仂从舒亰舒�� 仗仂亟�仂弍仆仂��亳 仂 仗亠�亠亟舒�亠 �舒亶仍仂于"
 
-#: src/gtkft.c:661
+#: src/gtkft.c:656
 msgid "Hide transfer details"
 msgstr "弌从���� 仗仂亟�仂弍仆仂��亳 仂 仗亠�亠亟舒�亠 �舒亶仍仂于"
 
 #. Pause button
-#: src/gtkft.c:703 src/stock.c:90
+#: src/gtkft.c:698 src/stock.c:90
 msgid "_Pause"
-msgstr "�舒�亰舒"
+msgstr "_�舒�亰舒"
 
 #. Resume button
-#: src/gtkft.c:713
+#: src/gtkft.c:708
 msgid "_Resume"
-msgstr "�仂亰仂弍仆仂于亳��"
-
-#: src/gtkft.c:920
+msgstr "_�仂亰仂弍仆仂于亳��"
+
+#: src/gtkft.c:915
 msgid "Failed"
 msgstr "�亠 �亟舒仍仂��"
 
@@ -3276,22 +3286,22 @@
 msgid "_Open Link in Browser"
 msgstr "��从���� ���仍从� 于 弍�舒�亰亠�亠"
 
-#: src/gtkimhtml.c:2797
+#: src/gtkimhtml.c:2803
 msgid ""
 "Unable to guess the image type based on the file extension supplied.  "
 "Defaulting to PNG."
 msgstr ""
 
-#: src/gtkimhtml.c:2805
+#: src/gtkimhtml.c:2811
 #, c-format
 msgid "Error saving image: %s"
 msgstr "��亳弍从舒 �仂��舒仆亠仆亳� 亳亰仂弍�舒亢亠仆亳�: %s"
 
-#: src/gtkimhtml.c:2814
+#: src/gtkimhtml.c:2888 src/gtkimhtml.c:2900
 msgid "Save Image"
 msgstr "弌仂��舒仆亳�� 亳亰仂弍�舒亢亠仆亳亠"
 
-#: src/gtkimhtml.c:2837
+#: src/gtkimhtml.c:2921
 msgid "_Save Image..."
 msgstr "弌仂��舒仆亳�� 亳亰仂弍�舒亢亠仆亳亠..."
 
@@ -3307,15 +3317,15 @@
 msgid "Select Background Color"
 msgstr "��弍�舒�� �于亠� �仂仆舒"
 
-#: src/gtkimhtmltoolbar.c:392
+#: src/gtkimhtmltoolbar.c:394
 msgid "_URL"
 msgstr "_URL"
 
-#: src/gtkimhtmltoolbar.c:397
+#: src/gtkimhtmltoolbar.c:402
 msgid "_Description"
 msgstr "�仗亳�舒仆亳亠"
 
-#: src/gtkimhtmltoolbar.c:400
+#: src/gtkimhtmltoolbar.c:405
 msgid ""
 "Please enter the URL and description of the link that you want to insert. "
 "The description is optional."
@@ -3323,86 +3333,87 @@
 "�于亠亟亳�亠 URL 亳 仂仗亳�舒仆亳亠 ���仍从亳, 从仂�仂��� 于� �仂�亳�亠 于��舒于亳��. �仗亳�舒仆亳亠 "
 "仆亠仂弍�亰舒�亠仍�仆仂."
 
-#: src/gtkimhtmltoolbar.c:404
+#: src/gtkimhtmltoolbar.c:409
 msgid "Please enter the URL of the link that you want to insert."
 msgstr "�于亠亟亳�亠 URL ���仍从亳, 从仂�仂��� 于� �仂�亳�亠 于��舒于亳��."
 
-#: src/gtkimhtmltoolbar.c:409
+#: src/gtkimhtmltoolbar.c:414
 msgid "Insert Link"
 msgstr "���舒于亳�� ���仍从�"
 
-#: src/gtkimhtmltoolbar.c:413
+#: src/gtkimhtmltoolbar.c:418
 msgid "_Insert"
 msgstr "���舒于亳��"
 
-#: src/gtkimhtmltoolbar.c:481
+#: src/gtkimhtmltoolbar.c:487
 #, c-format
 msgid "Failed to store image: %s\n"
 msgstr "�亠 �亟舒仍仂�� �仂��舒仆亳�� 亳亰仂弍�舒亢亠仆亳亠: %s\n"
 
-#: src/gtkimhtmltoolbar.c:507 src/gtkimhtmltoolbar.c:517
+#: src/gtkimhtmltoolbar.c:513 src/gtkimhtmltoolbar.c:523
 msgid "Insert Image"
 msgstr "���舒于亳�� 亳亰仂弍�舒亢亠仆亳亠"
 
-#: src/gtkimhtmltoolbar.c:655
+#: src/gtkimhtmltoolbar.c:661
 msgid "This theme has no available smileys."
 msgstr "亅�舒 �亠仄舒 仆亠 亳仄亠亠� 亟仂���仗仆�� �仄舒亶仍亳从仂于."
 
 #. show everything
-#: src/gtkimhtmltoolbar.c:670
+#: src/gtkimhtmltoolbar.c:676
 msgid "Smile!"
 msgstr "弌仄舒亶仍!"
 
-#: src/gtkimhtmltoolbar.c:888
+#: src/gtkimhtmltoolbar.c:894
 msgid "Bold"
 msgstr "�亳�仆�亶"
 
-#: src/gtkimhtmltoolbar.c:899
+#: src/gtkimhtmltoolbar.c:905
 msgid "Italic"
 msgstr "�舒从仍仂仆仆�亶"
 
-#: src/gtkimhtmltoolbar.c:910
+#: src/gtkimhtmltoolbar.c:916
 msgid "Underline"
 msgstr "�仂亟���从仆���亶"
 
-#: src/gtkimhtmltoolbar.c:926
+#: src/gtkimhtmltoolbar.c:932
 msgid "Larger font size"
 msgstr "�仂仍��亳亶 �舒亰仄亠� ��亳��舒"
 
-#: src/gtkimhtmltoolbar.c:938
+#: src/gtkimhtmltoolbar.c:944
 msgid "Smaller font size"
 msgstr "�亠仆��亳亶 �舒亰仄亠� ��亳��舒 "
 
-#: src/gtkimhtmltoolbar.c:955
+#: src/gtkimhtmltoolbar.c:961
 msgid "Font Face"
 msgstr "�弍仍亳从 ��亳��舒"
 
-#: src/gtkimhtmltoolbar.c:967
+#: src/gtkimhtmltoolbar.c:973
 msgid "Foreground font color"
 msgstr "丶于亠� ��亳��舒"
 
-#: src/gtkimhtmltoolbar.c:979
+#: src/gtkimhtmltoolbar.c:985
 msgid "Background color"
 msgstr "丶于亠� �仂仆舒"
 
-#: src/gtkimhtmltoolbar.c:994
+#: src/gtkimhtmltoolbar.c:1000
 msgid "Insert link"
 msgstr "���舒于亳�� ���仍从�"
 
-#: src/gtkimhtmltoolbar.c:1004
+#: src/gtkimhtmltoolbar.c:1010
 msgid "Insert image"
 msgstr "���舒于亳�� 亳亰仂弍�舒亢亠仆亳亠"
 
-#: src/gtkimhtmltoolbar.c:1015
+#: src/gtkimhtmltoolbar.c:1021
 msgid "Insert smiley"
 msgstr "���舒于亳�� �仄舒亶仍亳从"
 
 #: src/gtklog.c:302
-msgid "Conversations with"
-msgstr "�亠�亠亟� �"
+#, c-format
+msgid "Conversations with %s"
+msgstr "�亠�亠亟� � %s"
 
 #. Window **********
-#: src/gtklog.c:392 src/gtklog.c:408
+#: src/gtklog.c:395 src/gtklog.c:411
 msgid "System Log"
 msgstr "弌亳��亠仄仆�亶 亢��仆舒仍"
 
@@ -3446,22 +3457,22 @@
 "\n"
 "%s"
 
-#: src/gtknotify.c:429
+#: src/gtknotify.c:421
 #, c-format
 msgid "The browser command \"%s\" is invalid."
 msgstr "�仂仄舒仆亟舒 亰舒仗��从舒 弍�舒�亰亠�舒 \"%s\" 仆亠从仂��亠从�仆舒."
 
-#: src/gtknotify.c:432 src/gtknotify.c:446 src/gtknotify.c:461
-#: src/gtknotify.c:579
+#: src/gtknotify.c:424 src/gtknotify.c:438 src/gtknotify.c:453
+#: src/gtknotify.c:571
 msgid "Unable to open URL"
 msgstr "�亠 �亟舒���� 仂�从���� URL"
 
-#: src/gtknotify.c:443 src/gtknotify.c:458
+#: src/gtknotify.c:435 src/gtknotify.c:450
 #, c-format
 msgid "Error launching \"%s\": %s"
 msgstr "��亳弍从舒 亰舒仗��从舒 \"%s\": %s"
 
-#: src/gtknotify.c:580
+#: src/gtknotify.c:572
 msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr "��仍 于�弍�舒仆 弍�舒�亰亠� \"���亞仂亶\", 仆仂 从仂仄舒仆亟舒 仆亠 弍�仍舒 亰舒亟舒仆舒."
@@ -3475,7 +3486,7 @@
 msgstr "�于亠亟亳�亠 仗仂仍�亰仂于舒�亠仍� 亟仍� �仍亠亢亠仆亳�."
 
 #. "New Buddy Pounce"
-#: src/gtkpounce.c:387 src/gtkpounce.c:890
+#: src/gtkpounce.c:387 src/gtkpounce.c:889
 msgid "New Buddy Pounce"
 msgstr "�仂于仂亠 仗�舒于亳仍仂"
 
@@ -3484,138 +3495,138 @@
 msgstr "�亰仄亠仆亳�� 仗�舒于亳仍仂"
 
 #. Create the "Pounce Who" frame.
-#: src/gtkpounce.c:405
+#: src/gtkpounce.c:404
 msgid "Pounce Who"
 msgstr "�舒 从亠仄 �仍亠亟亳��"
 
-#: src/gtkpounce.c:432
+#: src/gtkpounce.c:431
 msgid "_Buddy name:"
 msgstr "�仄� 仗仂仍�亰仂于舒�亠仍�:"
 
 #. Create the "Pounce When" frame.
-#: src/gtkpounce.c:456
+#: src/gtkpounce.c:455
 msgid "Pounce When"
 msgstr "�仂亞亟舒 �亠舒亞亳�仂于舒��"
 
-#: src/gtkpounce.c:464 src/main.c:296
-msgid "_Sign on"
+#: src/gtkpounce.c:463
+msgid "Si_gn on"
 msgstr "��仂亟"
 
-#: src/gtkpounce.c:466
+#: src/gtkpounce.c:465
 msgid "Sign _off"
 msgstr "���仂亟"
 
-#: src/gtkpounce.c:468
+#: src/gtkpounce.c:467
 msgid "A_way"
 msgstr "��仂��仍"
 
-#: src/gtkpounce.c:470
-msgid "Re_turn from away"
+#: src/gtkpounce.c:469
+msgid "_Return from away"
 msgstr "�亠�仆�仍��"
 
-#: src/gtkpounce.c:472
+#: src/gtkpounce.c:471
 msgid "_Idle"
 msgstr "�亠亰亟亠亶��于�亠�"
 
-#: src/gtkpounce.c:474
+#: src/gtkpounce.c:473
 msgid "Retur_n from idle"
 msgstr "�亠�亠��舒仍 弍亠亰亟亠亶��于仂于舒��"
 
-#: src/gtkpounce.c:476
+#: src/gtkpounce.c:475
 msgid "Buddy starts _typing"
 msgstr "�仂仍�亰仂于舒�亠仍� 仆舒�舒仍 仗亳�舒��"
 
-#: src/gtkpounce.c:478
+#: src/gtkpounce.c:477
 msgid "Buddy stops t_yping"
 msgstr "�仂仍�亰仂于舒�亠仍� 仗亠�亠��舒仍 仗亳�舒��"
 
 #. Create the "Pounce Action" frame.
-#: src/gtkpounce.c:507
+#: src/gtkpounce.c:506
 msgid "Pounce Action"
 msgstr "丼�仂 亟亠仍舒��"
 
-#: src/gtkpounce.c:515
+#: src/gtkpounce.c:514
 msgid "Op_en an IM window"
 msgstr "��从���� 仂从仆仂 弍亠�亠亟�"
 
-#: src/gtkpounce.c:517
+#: src/gtkpounce.c:516
 msgid "_Popup notification"
 msgstr "�仂从舒亰舒�� �于亠亟仂仄仍亠仆亳亠"
 
-#: src/gtkpounce.c:519
+#: src/gtkpounce.c:518
 msgid "Send a _message"
 msgstr "��仗�舒于亳�� �仂仂弍�亠仆亳亠"
 
-#: src/gtkpounce.c:521
+#: src/gtkpounce.c:520
 msgid "E_xecute a command"
 msgstr "��仗仂仍仆亳�� 从仂仄舒仆亟�"
 
-#: src/gtkpounce.c:523
+#: src/gtkpounce.c:522
 msgid "P_lay a sound"
 msgstr "�仂�仗�仂亳亰于亠��亳 亰于�从"
 
-#: src/gtkpounce.c:527
+#: src/gtkpounce.c:526
 msgid "B_rowse..."
 msgstr "��从����..."
 
+#: src/gtkpounce.c:528
+msgid "Bro_wse..."
+msgstr "��从����..."
+
 #: src/gtkpounce.c:529
-msgid "Bro_wse..."
-msgstr "��从����..."
-
-#: src/gtkpounce.c:530
 msgid "Pre_view"
 msgstr "丐亠��"
 
-#: src/gtkpounce.c:613
+#: src/gtkpounce.c:612
 msgid "Sav_e this pounce after activation"
 msgstr "弌仂��舒仆亳�� ��仂 仗�舒于亳仍仂 仗仂�仍亠 舒从�亳于舒�亳亳"
 
 #. "Remove Buddy Pounce"
-#: src/gtkpounce.c:897
+#: src/gtkpounce.c:896
 msgid "Remove Buddy Pounce"
 msgstr "丕亟舒仍亳�� 仗�舒于亳仍仂"
 
-#: src/gtkpounce.c:961
+#: src/gtkpounce.c:960
 #, c-format
 msgid "%s has started typing to you (%s)"
 msgstr "%s 仆舒�舒仍 仗亳�舒�� 于舒仄 (%s)"
 
-#: src/gtkpounce.c:963
+#: src/gtkpounce.c:962
 #, c-format
 msgid "%s has signed on (%s)"
 msgstr "%s 于仂��仍 (%s)"
 
-#: src/gtkpounce.c:965
+#: src/gtkpounce.c:964
 #, c-format
 msgid "%s has returned from being idle (%s)"
 msgstr "%s 仗亠�亠��舒仍 弍亠亰亟亠亶��于仂于舒�� (%s)"
 
-#: src/gtkpounce.c:967
+#: src/gtkpounce.c:966
 #, c-format
 msgid "%s has returned from being away (%s)"
 msgstr "%s 于亠�仆�仍�� (%s)"
 
-#: src/gtkpounce.c:969
+#: src/gtkpounce.c:968
 #, c-format
 msgid "%s has stopped typing to you (%s)"
 msgstr "%s 仗亠�亠��舒仍 仗亳�舒�� 于舒仄 (%s)"
 
-#: src/gtkpounce.c:971
+#: src/gtkpounce.c:970
 #, c-format
 msgid "%s has signed off (%s)"
 msgstr "%s 于��亠仍 (%s)"
 
-#: src/gtkpounce.c:973
+#: src/gtkpounce.c:972
 #, c-format
 msgid "%s has become idle (%s)"
 msgstr "%s 仆舒�舒仍 弍亠亰亟亠亶��于仂于舒�� (%s)"
 
-#: src/gtkpounce.c:975
+#: src/gtkpounce.c:974
 #, c-format
 msgid "%s has gone away. (%s)"
 msgstr "%s 仂�仂��仍 (%s)"
 
-#: src/gtkpounce.c:976
+#: src/gtkpounce.c:975
 msgid "Unknown pounce event. Please report this!"
 msgstr "�亠亳亰于亠��仆仂亠 �仂弍��亳亠 �仍亠亢亠仆亳�. 弌仂仂弍�亳�亠 仂弍 ��仂仄!"
 
@@ -3639,8 +3650,8 @@
 msgid "Icon"
 msgstr "�仆舒�仂从"
 
-#: src/gtkprefs.c:722 src/gtkprefs.c:2212 src/protocols/jabber/buddy.c:264
-#: src/protocols/jabber/buddy.c:748 src/protocols/jabber/chat.c:701
+#: src/gtkprefs.c:722 src/gtkprefs.c:2194 src/protocols/jabber/buddy.c:264
+#: src/protocols/jabber/buddy.c:748 src/protocols/jabber/chat.c:693
 msgid "Description"
 msgstr "�仗亳�舒仆亳亠"
 
@@ -3656,31 +3667,27 @@
 msgid "_Highlight misspelled words"
 msgstr "�仂亟�于亠�亳于舒�� �仍仂于舒 � 仂�亳弍从舒仄亳"
 
-#: src/gtkprefs.c:827
+#: src/gtkprefs.c:826
 msgid "Ignore c_olors"
 msgstr "�亞仆仂�亳�仂于舒�� �于亠�舒"
 
-#: src/gtkprefs.c:829
+#: src/gtkprefs.c:828
 msgid "Ignore font _faces"
 msgstr "�亞仆仂�亳�仂于舒�� 仂弍仍亳从 ��亳��舒"
 
-#: src/gtkprefs.c:831
+#: src/gtkprefs.c:830
 msgid "Ignore font si_zes"
 msgstr "�亞仆仂�亳�仂于舒�� �舒亰仄亠� ��亳��舒"
 
-#: src/gtkprefs.c:834
-msgid "_Ignore formatting on incoming messages"
-msgstr "�亞仆仂�亳�仂于舒�� �仂�仄舒�亳�仂于舒仆亳亠 于�仂亟��亳� �仂仂弍�亠仆亳亶"
-
-#: src/gtkprefs.c:838
+#: src/gtkprefs.c:833
 msgid "Default Formatting"
 msgstr "个仂�仄舒�亳�仂于舒仆亳亠 仗仂 �仄仂仍�舒仆亳�"
 
-#: src/gtkprefs.c:840
+#: src/gtkprefs.c:835
 msgid "_Send default formatting with outgoing messages"
 msgstr "��仗�舒于仍��� 亳��仂亟��亳亠 �仂仂弍�亠仆亳� 仂��仂�仄舒�亳�仂于舒仆仆�仄亳 仗仂 �仄仂仍�舒仆亳�"
 
-#: src/gtkprefs.c:872
+#: src/gtkprefs.c:867
 msgid ""
 "This is how your outgoing message text will appear when you use protocols "
 "that support formatting. :)"
@@ -3688,269 +3695,269 @@
 "丐舒从 弍�亟亠� 于�亞仍�亟亠�� �亠从�� 于舒�亳� �仂仂弍�亠仆亳亶 � 亳�仗仂仍�亰仂于舒仆亳亠仄 仗�仂�仂从仂仍仂于, "
 "仗仂亟亟亠�亢亳于舒��亳� �仂�仄舒�亳�仂于舒仆亳亠. :)"
 
-#: src/gtkprefs.c:875
+#: src/gtkprefs.c:870
 msgid "_Clear Formatting"
 msgstr "��亳��亳�� �仂�仄舒�亳�仂于舒仆亳亠"
 
-#: src/gtkprefs.c:912
+#: src/gtkprefs.c:907
 msgid "Send Message"
 msgstr "��仗�舒于从舒 �仂仂弍�亠仆亳�"
 
-#: src/gtkprefs.c:913
+#: src/gtkprefs.c:908
 msgid "Enter _sends message"
 msgstr "Enter 仂�仗�舒于仍�亠� �仂仂弍�亠仆亳亠"
 
-#: src/gtkprefs.c:915
+#: src/gtkprefs.c:910
 msgid "C_ontrol-Enter sends message"
 msgstr "Control-Enter 仂�仗�舒于仍�亠� �仂仂弍�亠仆亳亠"
 
-#: src/gtkprefs.c:918
+#: src/gtkprefs.c:913
 msgid "Window Closing"
 msgstr "�舒从���亳亠 仂从仆舒"
 
-#: src/gtkprefs.c:919
+#: src/gtkprefs.c:914
 msgid "_Escape closes window"
 msgstr "Escape 亰舒从��于舒亠� 仂从仆仂"
 
-#: src/gtkprefs.c:922
+#: src/gtkprefs.c:917
 msgid "Insertions"
 msgstr "���舒于从舒"
 
-#: src/gtkprefs.c:923
+#: src/gtkprefs.c:918
 msgid "Control-{B/I/U} changes _formatting"
 msgstr "Control-{B/I/U} 仄亠仆�亠� �仂�仄舒�亳�仂于舒仆亳亠"
 
-#: src/gtkprefs.c:925
+#: src/gtkprefs.c:920
 msgid "Control-(number) _inserts smileys"
 msgstr "Control-(�亳��舒) 于��舒于仍�亠� �仄舒亶仍亳从亳"
 
-#: src/gtkprefs.c:941
+#: src/gtkprefs.c:936
 msgid "Buddy List Sorting"
 msgstr "弌仂��亳�仂于从舒 �仗亳�从舒 从仂仆�舒从�仂于"
 
-#: src/gtkprefs.c:950
+#: src/gtkprefs.c:945
 msgid "_Sorting:"
 msgstr "弌仂��亳�仂于舒��:"
 
-#: src/gtkprefs.c:956 src/gtkprefs.c:1009
+#: src/gtkprefs.c:951 src/gtkprefs.c:1003
 msgid "Show _buttons as:"
 msgstr "�仂从舒亰�于舒�� 从仆仂仗从亳 从舒从:"
 
-#: src/gtkprefs.c:958 src/gtkprefs.c:1011
+#: src/gtkprefs.c:953 src/gtkprefs.c:1005
 msgid "Pictures"
 msgstr "�仆舒�从亳"
 
-#: src/gtkprefs.c:959 src/gtkprefs.c:1012
+#: src/gtkprefs.c:954 src/gtkprefs.c:1006
 msgid "Text"
 msgstr "丐亠从��"
 
-#: src/gtkprefs.c:960 src/gtkprefs.c:1013
+#: src/gtkprefs.c:955 src/gtkprefs.c:1007
 msgid "Pictures and text"
 msgstr "�仆舒�从亳 亳 �亠从��"
 
-#: src/gtkprefs.c:963
+#: src/gtkprefs.c:958
 msgid "_Raise window on events"
 msgstr "�仂亟仆亳仄舒�� 仂从仆仂 仗�亳 �仂弍��亳��"
 
-#: src/gtkprefs.c:966
+#: src/gtkprefs.c:961
 msgid "Buddy Display"
 msgstr "��仂弍�舒亢亠仆亳亠 仗仂仍�亰仂于舒�亠仍亠亶"
 
-#: src/gtkprefs.c:967 src/gtkprefs.c:1027
+#: src/gtkprefs.c:962 src/gtkprefs.c:1020
 msgid "Show buddy _icons"
 msgstr "�仂从舒亰�于舒�� 亰仆舒�从亳 仗仂仍�亰仂于舒�亠仍亠亶"
 
-#: src/gtkprefs.c:969
+#: src/gtkprefs.c:964
 msgid "Show _warning levels"
 msgstr "�仂从舒亰�于舒�� ��仂于亠仆� 仗�亠亟�仗�亠亢亟亠仆亳�"
 
-#: src/gtkprefs.c:971
+#: src/gtkprefs.c:966
 msgid "Show idle _times"
 msgstr "�仂从舒亰�于舒�� 于�亠仄� 弍亠亰亟亠亶��于亳�"
 
-#: src/gtkprefs.c:973
+#: src/gtkprefs.c:968
 msgid "Dim i_dle buddies"
 msgstr "�舒�亠仆��� 弍亠亰亟亠亶��于���亳� 仗仂仍�亰仂于舒�亠仍亠亶"
 
-#: src/gtkprefs.c:975
+#: src/gtkprefs.c:970
 msgid "_Automatically expand contacts"
-msgstr "�于�仂仄舒�亳�亠�从亳 �舒�从��于舒�� 从仂仆�舒从��"
-
-#: src/gtkprefs.c:1020
+msgstr "�舒�从��于舒�� 从仂仆�舒从�� 舒于�仂仄舒�亳�亠�从亳"
+
+#: src/gtkprefs.c:1013
 msgid "Enable \"_slash\" commands"
 msgstr "�舒亰�亠�亳�� \"�仍��\"-从仂仄舒仆亟�"
 
-#: src/gtkprefs.c:1023
+#: src/gtkprefs.c:1016
 msgid "Show _formatting toolbar"
 msgstr "�仂从舒亰�于舒�� 仗舒仆亠仍� 亳仆����仄亠仆�仂于 �仂�仄舒�亳�仂于舒仆亳�"
 
-#: src/gtkprefs.c:1025
+#: src/gtkprefs.c:1018
 msgid "Show _aliases in tabs/titles"
 msgstr "�仂从舒亰�于舒�� 仗�亠于亟仂仆亳仄� 于仂 于从仍舒亟从舒�/亰舒亞仂仍仂于从舒�"
 
+#: src/gtkprefs.c:1022
+msgid "Enable buddy ic_on animation"
+msgstr "�舒亰�亠�亳�� 舒仆亳仄舒�亳� 亰仆舒�从仂于 仗仂仍�亰仂于舒�亠仍亠亶"
+
+#: src/gtkprefs.c:1024
+msgid "_Notify buddies that you are typing to them"
+msgstr "丕于亠亟仂仄仍��� 仗仂仍�亰仂于舒�亠仍亠亶, ��仂 于� 仗亳�亠�亠 亳仄"
+
+#: src/gtkprefs.c:1026
+msgid "_Raise IM window on events"
+msgstr "�仂亟仆亳仄舒�� 仂从仆仂 弍亠�亠亟� 仗�亳 �仂弍��亳��"
+
 #: src/gtkprefs.c:1029
-msgid "Enable buddy ic_on animation"
-msgstr "�舒亰�亠�亳�� 舒仆亳仄舒�亳� 亰仆舒�从仂于 仗仂仍�亰仂于舒�亠仍亠亶"
+msgid "Raise chat _window on events"
+msgstr "�仂亟仆亳仄舒�� 仂从仆仂 �舒�舒 仗�亳 �仂弍��亳��"
 
 #: src/gtkprefs.c:1031
-msgid "_Notify buddies that you are typing to them"
-msgstr "丕于亠亟仂仄仍��� 仗仂仍�亰仂于舒�亠仍亠亶, ��仂 于� 仗亳�亠�亠 亳仄"
-
-#: src/gtkprefs.c:1033
-msgid "_Raise IM window on events"
-msgstr "�仂亟仆亳仄舒�� 仂从仆仂 弍亠�亠亟� 仗�亳 �仂弍��亳��"
-
-#: src/gtkprefs.c:1036
-msgid "Raise chat _window on events"
-msgstr "�仂亟仆亳仄舒�� 仂从仆仂 �舒�舒 仗�亳 �仂弍��亳��"
-
-#: src/gtkprefs.c:1038
 msgid "Use _multi-colored screen names in chats"
 msgstr "�舒��于亠�亳于舒�� 亳仄亠仆舒 于 �舒�舒�"
 
 #. All the tab options!
-#: src/gtkprefs.c:1042
+#: src/gtkprefs.c:1035
 msgid "Tab Options"
 msgstr "�舒�舒仄亠��� 于从仍舒亟仂从"
 
-#: src/gtkprefs.c:1044
+#: src/gtkprefs.c:1037
 msgid "Show IMs and chats in _tabbed windows"
 msgstr "�仂从舒亰�于舒�� 弍亠�亠亟� 亳 �舒�� 于 仂从仆舒� �仂 于从仍舒亟从舒仄亳"
 
-#: src/gtkprefs.c:1059
+#: src/gtkprefs.c:1052
 msgid "Show _close button on tabs"
 msgstr "�仂从舒亰�于舒�� 从仆仂仗从� 亰舒从���亳� 仆舒 于从仍舒亟从舒�"
 
-#: src/gtkprefs.c:1062
+#: src/gtkprefs.c:1055
 msgid "Tab p_lacement:"
 msgstr "�舒�仗仂仍仂亢亠仆亳亠 于从仍舒亟仂从:"
 
-#: src/gtkprefs.c:1064
+#: src/gtkprefs.c:1057
 msgid "Top"
 msgstr "�于亠���"
 
-#: src/gtkprefs.c:1065
+#: src/gtkprefs.c:1058
 msgid "Bottom"
 msgstr "�仆亳亰�"
 
-#: src/gtkprefs.c:1066
+#: src/gtkprefs.c:1059
 msgid "Left"
 msgstr "弌仍亠于舒"
 
-#: src/gtkprefs.c:1067
+#: src/gtkprefs.c:1060
 msgid "Right"
 msgstr "弌仗�舒于舒"
 
-#: src/gtkprefs.c:1073
+#: src/gtkprefs.c:1066
 msgid "New conversation _placement:"
 msgstr "�舒�仗仂仍仂亢亠仆亳亠 仆仂于仂亶 弍亠�亠亟�:"
 
-#: src/gtkprefs.c:1124 src/protocols/oscar/oscar.c:596
-#: src/protocols/oscar/oscar.c:4855
+#: src/gtkprefs.c:1117 src/protocols/oscar/oscar.c:580
+#: src/protocols/oscar/oscar.c:4850
 msgid "IP Address"
 msgstr "IP-舒亟�亠�"
 
-#: src/gtkprefs.c:1126
+#: src/gtkprefs.c:1119
 msgid "_Autodetect IP Address"
 msgstr "�仗�亠亟亠仍��� IP-舒亟�亠� 舒于�仂仄舒�亳�亠�从亳"
 
-#: src/gtkprefs.c:1135
+#: src/gtkprefs.c:1128
 msgid "Public _IP:"
 msgstr "��弍仍亳�仆�亶 IP:"
 
-#: src/gtkprefs.c:1159
+#: src/gtkprefs.c:1152
 msgid "Ports"
 msgstr "�仂���"
 
-#: src/gtkprefs.c:1162
+#: src/gtkprefs.c:1155
 msgid "_Manually specify range of ports to listen on"
 msgstr "丕从舒亰舒�� 亟亳舒仗舒亰仂仆 �仍��舒亠仄�� 仗仂��仂于 于���仆��"
 
+#: src/gtkprefs.c:1158
+msgid "_Start Port:"
+msgstr "_�舒�舒仍�仆�亶 仗仂��:"
+
 #: src/gtkprefs.c:1165
-msgid "_Start Port:"
-msgstr "_�舒�舒仍�仆�亶 仗仂��:"
+msgid "_End Port:"
+msgstr "_�仂仆亠�仆�亶 仗仂��:"
 
 #: src/gtkprefs.c:1172
-msgid "_End Port:"
-msgstr "_�仂仆亠�仆�亶 仗仂��:"
-
-#: src/gtkprefs.c:1179
 msgid "Proxy Server"
 msgstr "��仂从�亳-�亠�于亠�"
 
-#: src/gtkprefs.c:1183
+#: src/gtkprefs.c:1176
 msgid "No proxy"
 msgstr "�亠� 仗�仂从�亳"
 
-#: src/gtkprefs.c:1245
+#: src/gtkprefs.c:1238
 msgid "_User:"
 msgstr "�仂仍�亰仂于舒�亠仍�:"
 
-#: src/gtkprefs.c:1301
+#: src/gtkprefs.c:1294
 msgid "Epiphany"
 msgstr "Epiphany"
 
-#: src/gtkprefs.c:1302
+#: src/gtkprefs.c:1295
 msgid "Firebird"
 msgstr "Firebird"
 
-#: src/gtkprefs.c:1303
+#: src/gtkprefs.c:1296
 msgid "Firefox"
 msgstr "Firefox"
 
-#: src/gtkprefs.c:1304
+#: src/gtkprefs.c:1297
 msgid "Galeon"
 msgstr "Galeon"
 
-#: src/gtkprefs.c:1305
+#: src/gtkprefs.c:1298
 msgid "Gnome Default"
 msgstr "��舒�亰亠� Gnome 仗仂 �仄仂仍�舒仆亳�"
 
-#: src/gtkprefs.c:1306
+#: src/gtkprefs.c:1299
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: src/gtkprefs.c:1307
+#: src/gtkprefs.c:1300
 msgid "Mozilla"
 msgstr "Mozilla"
 
-#: src/gtkprefs.c:1308
+#: src/gtkprefs.c:1301
 msgid "Netscape"
 msgstr "Netscape"
 
-#: src/gtkprefs.c:1309
+#: src/gtkprefs.c:1302
 msgid "Opera"
 msgstr "Opera"
 
-#: src/gtkprefs.c:1318
+#: src/gtkprefs.c:1311
 msgid "Manual"
 msgstr "���亞仂亶"
 
-#: src/gtkprefs.c:1369
+#: src/gtkprefs.c:1362
 msgid "Browser Selection"
 msgstr "��弍仂� 弍�舒�亰亠�舒"
 
-#: src/gtkprefs.c:1373
+#: src/gtkprefs.c:1366
 msgid "_Browser:"
 msgstr "��舒�亰亠�:"
 
-#: src/gtkprefs.c:1380
+#: src/gtkprefs.c:1373
 msgid "_Open link in:"
 msgstr "��从��于舒�� ���仍从� 于:"
 
-#: src/gtkprefs.c:1382
+#: src/gtkprefs.c:1375
 msgid "Browser default"
 msgstr "�仂 �仄仂仍�舒仆亳�"
 
-#: src/gtkprefs.c:1383
+#: src/gtkprefs.c:1376
 msgid "Existing window"
 msgstr "弌��亠��于���亠亠 仂从仆仂"
 
-#: src/gtkprefs.c:1385
+#: src/gtkprefs.c:1378
 msgid "New tab"
 msgstr "�仂于舒� 于从仍舒亟从舒"
 
-#: src/gtkprefs.c:1399
+#: src/gtkprefs.c:1392
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -3959,83 +3966,83 @@
 "����仆��:\n"
 "(%s 亟仍� URL)"
 
-#: src/gtkprefs.c:1436
+#: src/gtkprefs.c:1429
 msgid "Message Logs"
 msgstr "���仆舒仍� �仂仂弍�亠仆亳亶"
 
-#: src/gtkprefs.c:1439
+#: src/gtkprefs.c:1432
 msgid "Log _Format:"
 msgstr "个仂�仄舒� 亢��仆舒仍舒:"
 
-#: src/gtkprefs.c:1442
+#: src/gtkprefs.c:1435
 msgid "_Log all instant messages"
 msgstr "�舒仗亳��于舒�� 于�亠 �仂仂弍�亠仆亳�"
 
-#: src/gtkprefs.c:1444
+#: src/gtkprefs.c:1437
 msgid "Log all c_hats"
 msgstr "�舒仗亳��于舒�� 于�亠 �舒��"
 
-#: src/gtkprefs.c:1447
+#: src/gtkprefs.c:1440
 msgid "System Logs"
 msgstr "弌亳��亠仄仆�亠 亢��仆舒仍�"
 
-#: src/gtkprefs.c:1449
+#: src/gtkprefs.c:1442
 msgid "_Enable system log"
 msgstr "�亠��亳 �亳��亠仄仆�亶 亢��仆舒仍"
 
-#: src/gtkprefs.c:1452
+#: src/gtkprefs.c:1445
 msgid "Log when buddies _sign on/sign off"
 msgstr "�舒仗亳��于舒��, 从仂亞亟舒 仗仂仍�亰仂于舒�亠仍亳 仗仂亟从仍��舒����/仂�从仍��舒����"
 
-#: src/gtkprefs.c:1458
+#: src/gtkprefs.c:1451
 msgid "Log when buddies become _idle/un-idle"
 msgstr "�舒仗亳��于舒��, 从仂亞亟舒 仗仂仍�亰仂于舒�亠仍亳 仆舒�亳仆舒��/仗亠�亠��舒�� 弍亠亰亟亠亶��于仂于舒��"
 
-#: src/gtkprefs.c:1464
+#: src/gtkprefs.c:1457
 msgid "Log when buddies go away/come _back"
 msgstr "�舒仗亳��于舒��, 从仂亞亟舒 仗仂仍�亰仂于舒�亠仍亳 仂��仂亟��/于仂亰于�舒�舒����"
 
-#: src/gtkprefs.c:1470
+#: src/gtkprefs.c:1463
 msgid "Log your _own signons/idleness/awayness"
 msgstr "�舒仗亳��于舒�� �仂弍��于亠仆仆�亠 仗仂亟从仍��亠仆亳�/弍亠亰亟亠亶��于亳�/仂������于亳�"
 
-#: src/gtkprefs.c:1596
+#: src/gtkprefs.c:1589
 msgid "Sound Selection"
 msgstr "��弍仂� 亰于�从舒"
 
-#: src/gtkprefs.c:1647
+#: src/gtkprefs.c:1640
 msgid "Sound Options"
 msgstr "�舒���仂亶从亳 亰于�从舒"
 
-#: src/gtkprefs.c:1648
+#: src/gtkprefs.c:1641
 msgid "Sounds when conversation has _focus"
 msgstr "�于�从亳, 从仂亞亟舒 仂从仆仂 弍亠�亠亟� 于 �仂从��亠"
 
-#: src/gtkprefs.c:1650
+#: src/gtkprefs.c:1643
 msgid "_Sounds while away"
 msgstr "�于�从亳 于仂 于�亠仄� 仂������于亳�"
 
-#: src/gtkprefs.c:1654
+#: src/gtkprefs.c:1647
 msgid "Sound Method"
 msgstr "�亠�仂亟 于仂�仗�仂亳亰于亠亟亠仆亳� 亰于�从舒"
 
-#: src/gtkprefs.c:1655
+#: src/gtkprefs.c:1648
 msgid "_Method:"
 msgstr "�亠�仂亟:"
 
-#: src/gtkprefs.c:1657
+#: src/gtkprefs.c:1650
 msgid "Console beep"
 msgstr "弌亳亞仆舒仍 亟亳仆舒仄亳从仂仄"
 
+#: src/gtkprefs.c:1652
+msgid "Automatic"
+msgstr "�于�仂仄舒�亳�亠�从亳"
+
 #: src/gtkprefs.c:1659
-msgid "Automatic"
-msgstr "�于�仂仄舒�亳�亠�从亳"
-
-#: src/gtkprefs.c:1666
 msgid "Command"
 msgstr "�仂仄舒仆亟舒"
 
-#: src/gtkprefs.c:1674
+#: src/gtkprefs.c:1667
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -4044,86 +4051,90 @@
 "�仂仄舒仆亟舒 于仂�仗�仂亳亰于亠亟亠仆亳� 亰于�从舒:\n"
 "(%s 亟仍� 亳仄亠仆亳 �舒亶仍舒)"
 
-#: src/gtkprefs.c:1701
+#: src/gtkprefs.c:1694
 msgid "Sound Events"
 msgstr "�于�从仂于�亠 �仂弍��亳�"
 
-#: src/gtkprefs.c:1752
+#: src/gtkprefs.c:1745
 msgid "Play"
 msgstr "�仂�仗�仂亳亰于亠��亳"
 
-#: src/gtkprefs.c:1759
+#: src/gtkprefs.c:1752
 msgid "Event"
 msgstr "弌仂弍��亳亠"
 
-#: src/gtkprefs.c:1778
+#: src/gtkprefs.c:1771
 msgid "Test"
 msgstr "丐亠��"
 
-#: src/gtkprefs.c:1782
+#: src/gtkprefs.c:1775
 msgid "Reset"
 msgstr "弌弍�仂�"
 
-#: src/gtkprefs.c:1786
+#: src/gtkprefs.c:1779
 msgid "Choose..."
 msgstr "��弍�舒��..."
 
-#: src/gtkprefs.c:1810
+#: src/gtkprefs.c:1803
 msgid "_Queue new messages when away"
 msgstr "�仂仄亠�舒�� 仆仂于�亠 �仂仂弍�亠仆亳� 于 仂�亠�亠亟� 于仂 于�亠仄� 仂������于亳�"
 
-#: src/gtkprefs.c:1813
-msgid "Auto-response"
-msgstr "�于�仂仂�于亠��亳从"
-
-#: src/gtkprefs.c:1814
-msgid "_Send auto-response"
-msgstr "��仗�舒于仍��� 舒于�仂仄舒�亳�亠�从亳亶 仂�于亠�"
-
-#: src/gtkprefs.c:1816
-msgid "_Only send auto-response when idle"
-msgstr "��仗�舒于仍��� 舒于�仂仄舒�亳�亠�从亳亶 仂�于亠� �仂仍�从仂 于仂 于�亠仄� 弍亠亰亟亠亶��于亳�"
-
-#: src/gtkprefs.c:1819 src/protocols/msn/msn.c:1179
-#: src/protocols/msn/state.c:32 src/protocols/novell/novell.c:2730
-#: src/protocols/oscar/oscar.c:4011 src/protocols/yahoo/yahoo.c:2511
+#: src/gtkprefs.c:1806
+msgid "_Auto-reply:"
+msgstr "�于�仂仄舒�亳�亠�从亳亶 仂�于亠�:"
+
+#: src/gtkprefs.c:1808
+msgid "Never"
+msgstr "�亳从仂亞亟舒"
+
+#: src/gtkprefs.c:1809
+msgid "Only when away"
+msgstr "丐仂仍�从仂 于仂 于�亠仄� 仂������于亳�"
+
+#: src/gtkprefs.c:1810
+msgid "Only when away and idle"
+msgstr "丐仂仍�从仂 于仂 于�亠仄� 仂������于亳� 亳 弍亠亰亟亠亶��于亳�"
+
+#: src/gtkprefs.c:1813 src/protocols/msn/msn.c:1179
+#: src/protocols/msn/state.c:32 src/protocols/novell/novell.c:2777
+#: src/protocols/oscar/oscar.c:4003 src/protocols/yahoo/yahoo.c:2554
 #: src/protocols/yahoo/yahoo_profile.c:664
 msgid "Idle"
 msgstr "�亠亰亟亠亶��于亳亠"
 
-#: src/gtkprefs.c:1820
+#: src/gtkprefs.c:1814
 msgid "Idle _time reporting:"
 msgstr "弌仂仂弍�亠仆亳亠 于�亠仄亠仆亳 弍亠亰亟亠亶��于亳�:"
 
-#: src/gtkprefs.c:1823
+#: src/gtkprefs.c:1817
 msgid "Gaim usage"
 msgstr "��仗仂仍�亰仂于舒仆亳亠 Gaim"
 
-#: src/gtkprefs.c:1826
+#: src/gtkprefs.c:1820
 msgid "X usage"
 msgstr "��仗仂仍�亰仂于舒仆亳亠 X"
 
-#: src/gtkprefs.c:1828
+#: src/gtkprefs.c:1822
 msgid "Windows usage"
 msgstr "��仗仂仍�亰仂于舒仆亳亠 仂从仂仆"
 
-#: src/gtkprefs.c:1836
+#: src/gtkprefs.c:1830
 msgid "Auto-away"
 msgstr "�于�仂-\"��仂��仍\""
 
-#: src/gtkprefs.c:1837
+#: src/gtkprefs.c:1831
 msgid "Set away _when idle"
 msgstr "丕��舒仆舒于仍亳于舒�� ��舒��� \"��仂��仍\" 舒于�仂仄舒�亳�亠�从亳"
 
-#: src/gtkprefs.c:1841
+#: src/gtkprefs.c:1835
 msgid "_Minutes before setting away:"
 msgstr "�亳仆�� 亟仂 ���舒仆仂于仍亠仆亳� ��舒���舒 \"��仂��仍\":"
 
-#: src/gtkprefs.c:1849
+#: src/gtkprefs.c:1843
 msgid "Away m_essage:"
 msgstr "弌仂仂弍�亠仆亳亠 仂弍 仂������于亳亳:"
 
-#: src/gtkprefs.c:1930
+#: src/gtkprefs.c:1912
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -4138,7 +4149,7 @@
 "<span weight=\"bold\">�亠弍-�舒亶�:</span>\t\t%s\n"
 "<span weight=\"bold\">�仄� �舒亶仍舒:</span>\t%s"
 
-#: src/gtkprefs.c:1935
+#: src/gtkprefs.c:1917
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -4153,64 +4164,64 @@
 "<span weight=\"bold\">URL:</span>  %s\n"
 "<span weight=\"bold\">�仄� �舒亶仍舒:</span>  %s"
 
-#: src/gtkprefs.c:2168
+#: src/gtkprefs.c:2150
 msgid "Load"
 msgstr "�舒亞��亰亳��"
 
-#: src/gtkprefs.c:2182
+#: src/gtkprefs.c:2164
 msgid "Summary"
 msgstr "��舒�从仂亠 仂仗亳�舒仆亳亠"
 
-#: src/gtkprefs.c:2230
+#: src/gtkprefs.c:2212
 msgid "Details"
 msgstr "�仂亟�仂弍仆仂��亳"
 
-#: src/gtkprefs.c:2375
+#: src/gtkprefs.c:2357
 msgid "_Edit"
-msgstr "�亰仄亠仆亳��"
-
-#: src/gtkprefs.c:2411
+msgstr "_�亰仄亠仆亳��"
+
+#: src/gtkprefs.c:2393
 msgid "Interface"
 msgstr "�仆亠�仆亳亶 于亳亟"
 
-#: src/gtkprefs.c:2414
+#: src/gtkprefs.c:2396
 msgid "Message Text"
 msgstr "丐亠从�� �仂仂弍�亠仆亳�"
 
-#: src/gtkprefs.c:2415
+#: src/gtkprefs.c:2397
 msgid "Shortcuts"
 msgstr "�仂���亳亠 从仍舒于亳�亳"
 
-#: src/gtkprefs.c:2416
+#: src/gtkprefs.c:2398
 msgid "Smiley Themes"
 msgstr "丐亠仄� �仄舒亶仍亳从仂于"
 
-#: src/gtkprefs.c:2417
+#: src/gtkprefs.c:2399
 msgid "Sounds"
 msgstr "�于�从亳"
 
-#: src/gtkprefs.c:2418
+#: src/gtkprefs.c:2400
 msgid "Network"
 msgstr "弌亠��"
 
 #. We use the registered default browser in windows
-#: src/gtkprefs.c:2421
+#: src/gtkprefs.c:2403
 msgid "Browser"
 msgstr "��舒�亰亠�"
 
-#: src/gtkprefs.c:2423
+#: src/gtkprefs.c:2405
 msgid "Logging"
 msgstr "���仆舒仍�"
 
-#: src/gtkprefs.c:2424
+#: src/gtkprefs.c:2406
 msgid "Away / Idle"
 msgstr "�������于亳亠 / �亠亰亟亠亶��于亳亠"
 
-#: src/gtkprefs.c:2425
+#: src/gtkprefs.c:2407
 msgid "Away Messages"
 msgstr "弌仂仂弍�亠仆亳� 仂弍 仂������于亳亳"
 
-#: src/gtkprefs.c:2428
+#: src/gtkprefs.c:2410
 msgid "Plugins"
 msgstr "�仂亟�仍亳"
 
@@ -4234,64 +4245,64 @@
 msgid "Block only the users below"
 msgstr "�仍仂从亳�仂于舒�� �仂仍�从仂 仗仂仍�亰仂于舒�亠仍亠亶, �从舒亰舒仆仆�� 仆亳亢亠"
 
-#: src/gtkprivacy.c:385 src/protocols/jabber/jabber.c:1449
+#: src/gtkprivacy.c:385 src/protocols/jabber/jabber.c:1466
 msgid "Privacy"
 msgstr "�仂仆�亳亟亠仆�亳舒仍�仆仂���"
 
-#: src/gtkprivacy.c:400
+#: src/gtkprivacy.c:398
 msgid "Changes to privacy settings take effect immediately."
 msgstr "�亰仄亠仆亠仆亳� 仆舒���仂亠从 从仂仆�亳亟亠仆�亳舒仍�仆仂��亳 于���仗舒�� 于 �亳仍� 仆亠仄亠亟仍亠仆仆仂."
 
 #. "Set privacy for:" label
-#: src/gtkprivacy.c:412
+#: src/gtkprivacy.c:410
 msgid "Set privacy for:"
 msgstr "�舒���仂亳�� 从仂仆�亳亟亠仆�亳舒仍�仆仂��� 亟仍�:"
 
-#: src/gtkprivacy.c:581 src/gtkprivacy.c:597
+#: src/gtkprivacy.c:579 src/gtkprivacy.c:595
 msgid "Permit User"
 msgstr "�仂仗���亳�� 仗仂仍�亰仂于舒�亠仍�"
 
-#: src/gtkprivacy.c:582
+#: src/gtkprivacy.c:580
 msgid "Type a user you permit to contact you."
 msgstr "丕从舒亢亳�亠 仗仂仍�亰仂于舒�亠仍�, 从仂�仂�仂亞仂 于� 亟仂仗��从舒亠�亠 从 仂弍�亠仆亳� � 于舒仄亳."
 
-#: src/gtkprivacy.c:583
+#: src/gtkprivacy.c:581
 msgid "Please enter the name of the user you wish to be able to contact you."
 msgstr ""
 "�于亠亟亳�亠 亳仄� 仗仂仍�亰仂于舒�亠仍�, 从仂�仂�仂亞仂 于� �仂�亳�亠 亟仂仗���亳�� 从 仂弍�亠仆亳� � 于舒仄亳."
 
-#: src/gtkprivacy.c:586 src/gtkprivacy.c:599
+#: src/gtkprivacy.c:584 src/gtkprivacy.c:597
 msgid "Permit"
 msgstr "�仂仗���亳��"
 
-#: src/gtkprivacy.c:591
+#: src/gtkprivacy.c:589
 #, c-format
 msgid "Allow %s to contact you?"
 msgstr "�仂亰于仂仍亳�� %s 仂弍�舒���� � 于舒仄亳?"
 
-#: src/gtkprivacy.c:593
+#: src/gtkprivacy.c:591
 #, c-format
 msgid "Are you sure you wish to allow %s to contact you?"
 msgstr "�� 亟亠亶��于亳�亠仍�仆仂 �仂�亳�亠 仗仂亰于仂仍亳�� %s 仂弍�舒���� � 于舒仄亳?"
 
-#: src/gtkprivacy.c:620 src/gtkprivacy.c:633
+#: src/gtkprivacy.c:618 src/gtkprivacy.c:631
 msgid "Block User"
 msgstr "�仍仂从亳�仂于舒�� 仗仂仍�亰仂于舒�亠仍�"
 
-#: src/gtkprivacy.c:621
+#: src/gtkprivacy.c:619
 msgid "Type a user to block."
 msgstr "丕从舒亢亳�亠 弍仍仂从亳��亠仄仂亞仂 仗仂仍�亰仂于舒�亠仍�."
 
-#: src/gtkprivacy.c:622
+#: src/gtkprivacy.c:620
 msgid "Please enter the name of the user you wish to block."
 msgstr "�于亠亟亳�亠 亳仄� 仗仂仍�亰仂于舒�亠仍�, 从仂�仂�仂亞仂 于� �仂�亳�亠 弍仍仂从亳�仂于舒��."
 
-#: src/gtkprivacy.c:629
+#: src/gtkprivacy.c:627
 #, c-format
 msgid "Block %s?"
 msgstr "�仍仂从亳�仂于舒�� %s?"
 
-#: src/gtkprivacy.c:631
+#: src/gtkprivacy.c:629
 #, c-format
 msgid "Are you sure you want to block %s?"
 msgstr "�� 亟亠亶��于亳�亠仍�仆仂 �仂�亳�亠 弍仍仂从亳�仂于舒�� %s?"
@@ -4300,13 +4311,13 @@
 #. * A wrapper for gaim_request_action() that uses Yes and No buttons.
 #.
 #: src/gtkrequest.c:240 src/protocols/gg/gg.c:949
-#: src/protocols/novell/novell.c:1845 src/protocols/silc/buddy.c:307
+#: src/protocols/novell/novell.c:1865 src/protocols/silc/buddy.c:307
 #: src/protocols/silc/pk.c:116 src/request.h:1234
 msgid "Yes"
 msgstr "�舒"
 
 #: src/gtkrequest.c:241 src/protocols/gg/gg.c:949
-#: src/protocols/novell/novell.c:1846 src/protocols/silc/buddy.c:308
+#: src/protocols/novell/novell.c:1866 src/protocols/silc/buddy.c:308
 #: src/protocols/silc/pk.c:117 src/request.h:1234
 msgid "No"
 msgstr "�亠�"
@@ -4320,19 +4331,19 @@
 msgid "Close"
 msgstr "�舒从����"
 
-#: src/gtkrequest.c:1391
+#: src/gtkrequest.c:1392
 msgid "That file already exists"
 msgstr "丐舒从仂亶 �舒亶仍 �亢亠 ���亠��于�亠�"
 
-#: src/gtkrequest.c:1392
+#: src/gtkrequest.c:1393
 msgid "Would you like to overwrite it?"
 msgstr "�� �仂�亠仍亳 弍� 仗亠�亠亰舒仗亳�舒�� 亠亞仂?"
 
-#: src/gtkrequest.c:1430 src/gtkrequest.c:1451
+#: src/gtkrequest.c:1431 src/gtkrequest.c:1452
 msgid "Save File..."
 msgstr "弌仂��舒仆亳�� �舒亶仍..."
 
-#: src/gtkrequest.c:1431 src/gtkrequest.c:1452
+#: src/gtkrequest.c:1432 src/gtkrequest.c:1453
 msgid "Open File..."
 msgstr "��从���� �舒亶仍..."
 
@@ -4341,7 +4352,7 @@
 msgstr "弌仗亳�仂从 从仂仄仆舒�"
 
 #. list button
-#: src/gtkroomlist.c:402
+#: src/gtkroomlist.c:401
 msgid "_Get List"
 msgstr "�仂仍��亳�� �仗亳�仂从"
 
@@ -4418,69 +4429,73 @@
 msgid "XML"
 msgstr "XML"
 
-#: src/log.c:574
+#: src/log.c:575
 #, c-format
 msgid ""
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
 "REPLY&gt;:</b></font> %s<br/>\n"
 msgstr ""
 
-#: src/log.c:576
+#: src/log.c:577
 #, c-format
 msgid ""
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
 "REPLY&gt;:</b></font> %s<br/>\n"
 msgstr ""
 
-#: src/log.c:627 src/log.c:814
+#: src/log.c:628 src/log.c:815
 msgid "<font color=\"red\"><b>Unable to find log path!</b></font>"
 msgstr "<font color=\"red\"><b>�亠 �亟舒���� 仆舒亶�亳 仗��� 从 亢��仆舒仍�!</b></font>"
 
-#: src/log.c:637 src/log.c:826
+#: src/log.c:638 src/log.c:827
 #, 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:674
+#: src/log.c:675
 msgid "HTML"
 msgstr "HTML"
 
-#: src/log.c:759
+#: src/log.c:760
 #, c-format
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr ""
 
-#: src/log.c:859
+#: src/log.c:860
 msgid "Plain text"
 msgstr "��仂��仂亶 �亠从��"
 
-#: src/main.c:153
+#: src/main.c:150
 msgid "Please create an account."
 msgstr "弌仂亰亟舒亶�亠 ����仆�� 亰舒仗亳��."
 
-#: src/main.c:235
+#: src/main.c:232
 msgid "Login"
 msgstr "��仂亟"
 
-#: src/main.c:253
+#: src/main.c:248
 msgid "<b>_Account:</b>"
 msgstr "<b>丕���仆舒� 亰舒仗亳��:</b>"
 
-#: src/main.c:267
+#: src/main.c:262
 msgid "<b>_Password:</b>"
 msgstr "<b>�舒�仂仍�:</b>"
 
 #. And now for the buttons
-#: src/main.c:284
+#: src/main.c:279
 msgid "_Accounts"
 msgstr "丕���仆�亠 亰舒仗亳�亳"
 
-#: src/main.c:290
+#: src/main.c:285
 msgid "_Preferences"
 msgstr "�舒���仂亶从亳"
 
+#: src/main.c:291
+msgid "_Sign on"
+msgstr "��仂亟"
+
 #. full help text
-#: src/main.c:520
+#: src/main.c:517
 #, c-format
 msgid ""
 "Gaim %s\n"
@@ -4516,10 +4531,24 @@
 "  -h, --help          仗仂从舒亰舒�� ��� �仗�舒于从� 亳 于�亶�亳\n"
 
 #. short message
-#: src/main.c:535
+#: src/main.c:532
 #, c-format
 msgid "Gaim %s. Try `%s -h' for more information.\n"
-msgstr "Gaim %s. �舒弍亠�亳�亠 `%s -h' 亟仍� 仗仂仍��亠仆亳� 弍仂仍亠亠 仗仂仍仆仂亶 亳仆�仂�仄舒�亳亳.\n"
+msgstr "Gaim %s. �舒弍亠�亳�亠 `%s -h' 亟仍� 仗仂仍��亠仆亳� 亟仂仗仂仍仆亳�亠仍�仆仂亶 亳仆�仂�仄舒�亳亳.\n"
+
+#: src/main.c:845
+msgid "Unable to load preferences"
+msgstr "�亠 �亟舒���� 亰舒亞��亰亳�� 仆舒���仂亶从亳"
+
+#: src/main.c:845
+msgid ""
+"Gaim was not able to load your preferences because they are stored in an old "
+"format that is no longer used.  Please reconfigure your settings using the "
+"Preferences window."
+msgstr ""
+"Gaim 仆亠 �亟舒仍仂�� 亰舒亞��亰亳�� 仆舒���仂亶从亳, �舒从 从舒从 仂仆亳 �仂��舒仆亠仆� 于 ��舒�仂仄 �仂�仄舒�亠, "
+"从仂�仂��亶 弍仂仍��亠 仆亠 亳�仗仂仍�亰�亠���. ��仂亳亰于亠亟亳�亠 仆舒���仂亶从� 仗舒�舒仄亠��仂于 亠�� �舒亰, "
+"于仂�仗仂仍�亰仂于舒于�亳�� 仂从仆仂仄 仆舒���仂亠从."
 
 #: src/plugin.c:286
 #, c-format
@@ -4545,10 +4574,10 @@
 #: src/protocols/gg/gg.c:49 src/protocols/jabber/jutil.c:44
 #: src/protocols/msn/msn.c:462 src/protocols/msn/state.c:29
 #: src/protocols/msn/state.c:30 src/protocols/msn/state.c:37
-#: src/protocols/msn/state.c:38 src/protocols/novell/novell.c:2721
-#: src/protocols/novell/novell.c:2840 src/protocols/novell/novell.c:2891
-#: src/protocols/oscar/oscar.c:616 src/protocols/yahoo/yahoo.c:2851
-#: src/protocols/yahoo/yahoo.c:2967
+#: src/protocols/msn/state.c:38 src/protocols/novell/novell.c:2768
+#: src/protocols/novell/novell.c:2887 src/protocols/novell/novell.c:2938
+#: src/protocols/oscar/oscar.c:602 src/protocols/yahoo/yahoo.c:2894
+#: src/protocols/yahoo/yahoo.c:3010
 msgid "Available"
 msgstr "�仂���仗亠仆"
 
@@ -4561,11 +4590,11 @@
 msgstr "��仂��仍 �仂仍�从仂 亟仍� 亟��亰亠亶"
 
 #: src/protocols/gg/gg.c:53 src/protocols/jabber/jabber.c:964
-#: src/protocols/jabber/presence.c:126 src/protocols/oscar/oscar.c:536
-#: src/protocols/oscar/oscar.c:5397 src/protocols/oscar/oscar.c:5475
-#: src/protocols/oscar/oscar.c:5499 src/protocols/oscar/oscar.c:6694
-#: src/protocols/oscar/oscar.c:6699 src/protocols/yahoo/yahoo.c:2509
-#: src/protocols/yahoo/yahoo.c:2871 src/protocols/yahoo/yahoo.c:2979
+#: src/protocols/jabber/presence.c:128 src/protocols/oscar/oscar.c:520
+#: src/protocols/oscar/oscar.c:5399 src/protocols/oscar/oscar.c:5477
+#: src/protocols/oscar/oscar.c:5501 src/protocols/oscar/oscar.c:6697
+#: src/protocols/oscar/oscar.c:6702 src/protocols/yahoo/yahoo.c:2552
+#: src/protocols/yahoo/yahoo.c:2914 src/protocols/yahoo/yahoo.c:3022
 msgid "Invisible"
 msgstr "�亠于亳亟亳仄�亶"
 
@@ -4581,7 +4610,7 @@
 msgid "Unable to resolve hostname."
 msgstr "�亠 �亟舒���� �舒亰�亠�亳�� 亳仄� �亰仍舒."
 
-#: src/protocols/gg/gg.c:139 src/protocols/novell/novell.c:1665
+#: src/protocols/gg/gg.c:139 src/protocols/novell/novell.c:1685
 msgid "Unable to connect to server."
 msgstr "�亠 �亟舒���� �仂亠亟亳仆亳���� � �亠�于亠�仂仄."
 
@@ -4608,17 +4637,17 @@
 msgid "Unknown Error Code."
 msgstr "�亠亳亰于亠��仆�亶 从仂亟 仂�亳弍从亳."
 
-#: src/protocols/gg/gg.c:242 src/protocols/oscar/oscar.c:3820
+#: src/protocols/gg/gg.c:242 src/protocols/oscar/oscar.c:3807
 #, 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:243 src/protocols/gg/gg.c:1011
-#: src/protocols/napster/napster.c:393 src/protocols/oscar/oscar.c:3824
-#: src/protocols/oscar/oscar.c:4040 src/protocols/silc/ops.c:1067
-#: src/protocols/silc/ops.c:1128 src/protocols/toc/toc.c:468
-#: src/protocols/zephyr/zephyr.c:635
+#: src/protocols/napster/napster.c:393 src/protocols/oscar/oscar.c:3811
+#: src/protocols/oscar/oscar.c:4032 src/protocols/silc/ops.c:1076
+#: src/protocols/silc/ops.c:1137 src/protocols/toc/toc.c:468
+#: src/protocols/zephyr/zephyr.c:644
 msgid "Buddy Information"
 msgstr "�仆�仂�仄舒�亳� 仂 仗仂仍�亰仂于舒�亠仍亠"
 
@@ -4638,10 +4667,10 @@
 #. we didn't successfully connect. tdt->toc_fd is valid here
 #: src/protocols/gg/gg.c:674 src/protocols/icq/gaim_icq.c:344
 #: src/protocols/napster/napster.c:475 src/protocols/napster/napster.c:506
-#: src/protocols/toc/toc.c:170 src/protocols/yahoo/yahoo.c:2156
-#: src/protocols/yahoo/yahoo.c:2185 src/protocols/yahoo/yahoo.c:2248
+#: src/protocols/toc/toc.c:170 src/protocols/yahoo/yahoo.c:2199
+#: src/protocols/yahoo/yahoo.c:2228 src/protocols/yahoo/yahoo.c:2291
 #: src/protocols/yahoo/yahoo_filexfer.c:68
-#: src/protocols/yahoo/yahoo_filexfer.c:109
+#: src/protocols/yahoo/yahoo_filexfer.c:109 src/protocols/yahoo/ycht.c:482
 msgid "Unable to connect."
 msgstr "�亠 �亟舒���� ���舒仆仂于亳�� �仂亠亟亳仆亠仆亳亠."
 
@@ -4703,26 +4732,26 @@
 msgid "Active"
 msgstr "�从�亳于亠仆"
 
-#: src/protocols/gg/gg.c:953 src/protocols/oscar/oscar.c:4847
+#: src/protocols/gg/gg.c:953 src/protocols/oscar/oscar.c:4842
 msgid "UIN"
 msgstr "UIN"
 
 #. First Name
 #: src/protocols/gg/gg.c:957 src/protocols/jabber/jabber.c:613
-#: src/protocols/oscar/oscar.c:4858 src/protocols/silc/ops.c:790
+#: src/protocols/oscar/oscar.c:4853 src/protocols/silc/ops.c:799
 #: src/protocols/trepia/trepia.c:267
 msgid "First Name"
 msgstr "�仄�"
 
 #. Last Name
 #: src/protocols/gg/gg.c:962 src/protocols/jabber/jabber.c:618
-#: src/protocols/oscar/oscar.c:4859 src/protocols/trepia/trepia.c:274
+#: src/protocols/oscar/oscar.c:4854 src/protocols/trepia/trepia.c:274
 msgid "Last Name"
 msgstr "个舒仄亳仍亳�"
 
 #: src/protocols/gg/gg.c:966 src/protocols/gg/gg.c:1707
-#: src/protocols/irc/msgs.c:183 src/protocols/oscar/oscar.c:4848
-#: src/protocols/silc/ops.c:1184
+#: src/protocols/irc/msgs.c:182 src/protocols/oscar/oscar.c:4843
+#: src/protocols/silc/ops.c:1193
 msgid "Nick"
 msgstr "��亠于亟仂仆亳仄"
 
@@ -4737,7 +4766,7 @@
 
 #. City
 #: src/protocols/gg/gg.c:990 src/protocols/jabber/jabber.c:628
-#: src/protocols/oscar/oscar.c:4902 src/protocols/oscar/oscar.c:4910
+#: src/protocols/oscar/oscar.c:4897 src/protocols/oscar/oscar.c:4905
 #: src/protocols/trepia/trepia.c:331 src/protocols/trepia/trepia.c:410
 msgid "City"
 msgstr "�仂�仂亟"
@@ -4843,7 +4872,7 @@
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
 #: src/protocols/gg/gg.c:1497 src/protocols/jabber/jabber.c:1062
-#: src/protocols/toc/toc.c:1550
+#: src/protocols/toc/toc.c:1551
 msgid "Change Password"
 msgstr "�亰仄亠仆亳�� 仗舒�仂仍�"
 
@@ -4895,15 +4924,15 @@
 msgid "The user %s (%s%s%s%s%s) wants you to authorize them."
 msgstr "�仂仍�亰仂于舒�亠仍� %s (%s%s%s%s%s) �仂�亠�, ��仂弍� 于� 舒于�仂�亳亰仂于舒仍亳 亠亞仂."
 
-#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:232
-#: src/protocols/msn/userlist.c:100 src/protocols/oscar/oscar.c:3555
-#: src/protocols/oscar/oscar.c:6126
+#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:235
+#: src/protocols/msn/userlist.c:100 src/protocols/oscar/oscar.c:3546
+#: src/protocols/oscar/oscar.c:6131
 msgid "Authorize"
 msgstr "�于�仂�亳亰仂于舒��"
 
-#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:233
-#: src/protocols/msn/userlist.c:101 src/protocols/oscar/oscar.c:3557
-#: src/protocols/oscar/oscar.c:6127
+#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:236
+#: src/protocols/msn/userlist.c:101 src/protocols/oscar/oscar.c:3548
+#: src/protocols/oscar/oscar.c:6132
 msgid "Deny"
 msgstr "��从舒亰舒��"
 
@@ -4928,13 +4957,13 @@
 msgid "Unknown command: %s"
 msgstr "�亠亳亰于亠��仆舒� 从仂仄舒仆亟舒: %s"
 
-#: src/protocols/irc/cmds.c:448 src/protocols/jabber/chat.c:544
+#: src/protocols/irc/cmds.c:448 src/protocols/jabber/chat.c:536
 #: src/protocols/silc/silc.c:995
 #, c-format
 msgid "current topic is: %s"
 msgstr "�亠从��舒� �亠仄舒: %s"
 
-#: src/protocols/irc/cmds.c:451 src/protocols/jabber/chat.c:546
+#: src/protocols/irc/cmds.c:451 src/protocols/jabber/chat.c:538
 #: src/protocols/silc/silc.c:998
 msgid "No topic is set"
 msgstr "丐亠仄舒 仆亠 ���舒仆仂于仍亠仆舒"
@@ -4967,51 +4996,51 @@
 msgid "MOTD for %s"
 msgstr "MOTD 亟仍� %s"
 
-#: src/protocols/irc/irc.c:93 src/protocols/irc/irc.c:373
+#: src/protocols/irc/irc.c:93 src/protocols/irc/irc.c:388
 msgid "Server has disconnected"
 msgstr "弌亠�于亠� �舒亰仂�于舒仍 �仂亠亟亳仆亠仆亳亠"
 
-#: src/protocols/irc/irc.c:147
+#: src/protocols/irc/irc.c:158
 msgid "View MOTD"
 msgstr "��仂�仄仂��亠�� MOTD"
 
-#: src/protocols/irc/irc.c:169 src/protocols/silc/chat.c:32
+#: src/protocols/irc/irc.c:180 src/protocols/silc/chat.c:32
 msgid "_Channel:"
 msgstr "�舒仆舒仍:"
 
-#: src/protocols/irc/irc.c:174 src/protocols/jabber/chat.c:59
+#: src/protocols/irc/irc.c:185 src/protocols/jabber/chat.c:59
 msgid "_Password:"
 msgstr "�舒�仂仍�:"
 
-#: src/protocols/irc/irc.c:194
+#: src/protocols/irc/irc.c:205
 msgid "IRC nicks may not contain whitespace"
 msgstr "��亠于亟仂仆亳仄� IRC 仆亠 仄仂亞�� �仂亟亠�亢舒�� 仗�仂弍亠仍�"
 
-#: src/protocols/irc/irc.c:213 src/protocols/toc/toc.c:198
+#: src/protocols/irc/irc.c:224 src/protocols/toc/toc.c:198
 #, c-format
 msgid "Signon: %s"
 msgstr "�仂亟从仍��亠仆亳亠: %s"
 
-#: src/protocols/irc/irc.c:222
+#: src/protocols/irc/irc.c:233
 msgid "Couldn't create socket"
 msgstr "�亠 �亟舒仍仂�� �仂亰亟舒�� �仂从亠�"
 
-#: src/protocols/irc/irc.c:237 src/protocols/jabber/jabber.c:297
-#: src/protocols/oscar/oscar.c:1529 src/protocols/oscar/oscar.c:1593
+#: src/protocols/irc/irc.c:248 src/protocols/jabber/jabber.c:297
+#: src/protocols/oscar/oscar.c:1519 src/protocols/oscar/oscar.c:1583
 msgid "Couldn't connect to host"
 msgstr "�亠 �亟舒仍仂�� �仂亠亟亳仆亳���� � �亰仍仂仄"
 
-#: src/protocols/irc/irc.c:370 src/protocols/trepia/trepia.c:926
+#: src/protocols/irc/irc.c:385 src/protocols/trepia/trepia.c:926
 msgid "Read error"
 msgstr "��亳弍从舒 ��亠仆亳�"
 
-#: src/protocols/irc/irc.c:521 src/protocols/silc/chat.c:1363
+#: src/protocols/irc/irc.c:536 src/protocols/silc/chat.c:1356
 #: src/protocols/yahoo/yahoochat.c:1380
 msgid "Users"
 msgstr "�仂仍�亰仂于舒�亠仍亳"
 
-#: src/protocols/irc/irc.c:524 src/protocols/silc/chat.c:1366
-#: src/protocols/silc/ops.c:1146 src/protocols/yahoo/yahoochat.c:1389
+#: src/protocols/irc/irc.c:539 src/protocols/silc/chat.c:1359
+#: src/protocols/silc/ops.c:1155 src/protocols/yahoo/yahoochat.c:1389
 msgid "Topic"
 msgstr "丐亠仄舒"
 
@@ -5024,192 +5053,205 @@
 #. *< id
 #. *< name
 #. *< version
-#: src/protocols/irc/irc.c:628
+#: src/protocols/irc/irc.c:643
 msgid "IRC Protocol Plugin"
 msgstr "�仂亟�仍� 仗�仂�仂从仂仍舒 IRC"
 
 #. *  summary
-#: src/protocols/irc/irc.c:629
+#: src/protocols/irc/irc.c:644
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "�舒亳仄亠仆亠亠 仗仍仂�仂亶 仄仂亟�仍� 仗�仂�仂从仂仍舒 IRC"
 
-#: src/protocols/irc/irc.c:648 src/protocols/irc/msgs.c:197
-#: src/protocols/jabber/jabber.c:1559 src/protocols/napster/napster.c:644
-#: src/protocols/silc/ops.c:1008 src/protocols/silc/ops.c:1110
+#: src/protocols/irc/irc.c:663 src/protocols/irc/msgs.c:201
+#: src/protocols/jabber/jabber.c:1576 src/protocols/napster/napster.c:644
+#: src/protocols/silc/ops.c:1017 src/protocols/silc/ops.c:1119
 msgid "Server"
 msgstr "弌亠�于亠�"
 
-#: src/protocols/irc/irc.c:651 src/protocols/jabber/jabber.c:1580
-#: src/protocols/msn/msn.c:1758 src/protocols/napster/napster.c:649
-#: src/protocols/silc/silc.c:1576 src/protocols/trepia/trepia.c:1297
+#: src/protocols/irc/irc.c:666 src/protocols/jabber/jabber.c:1597
+#: src/protocols/msn/msn.c:1759 src/protocols/napster/napster.c:649
+#: src/protocols/silc/silc.c:1577 src/protocols/trepia/trepia.c:1297
 msgid "Port"
 msgstr "�仂��"
 
-#: src/protocols/irc/irc.c:654 src/protocols/zephyr/zephyr.c:1915
+#: src/protocols/irc/irc.c:669 src/protocols/zephyr/zephyr.c:1919
 msgid "Encoding"
 msgstr "�仂亟亳�仂于从舒"
 
-#: src/protocols/irc/irc.c:657 src/protocols/irc/msgs.c:191
+#: src/protocols/irc/irc.c:672 src/protocols/irc/msgs.c:195
 #: src/protocols/jabber/jabber.c:588 src/protocols/silc/buddy.c:1445
-#: src/protocols/silc/ops.c:955 src/protocols/silc/ops.c:957
-#: src/protocols/silc/ops.c:1104 src/protocols/silc/ops.c:1106
+#: src/protocols/silc/ops.c:964 src/protocols/silc/ops.c:966
+#: src/protocols/silc/ops.c:1113 src/protocols/silc/ops.c:1115
 msgid "Username"
 msgstr "�仄� 仗仂仍�亰仂于舒�亠仍�"
 
-#: src/protocols/irc/msgs.c:98
+#: src/protocols/irc/msgs.c:97
 msgid "Bad mode"
 msgstr "�亠于亠�仆�亶 �亠亢亳仄"
 
-#: src/protocols/irc/msgs.c:109
+#: src/protocols/irc/msgs.c:108
 #, fuzzy, c-format
 msgid "You are banned from %s."
 msgstr "�舒� 于�亞仆舒仍亳 亳亰 %s."
 
-#: src/protocols/irc/msgs.c:110
+#: src/protocols/irc/msgs.c:109
 #, fuzzy
 msgid "Banned"
 msgstr "��亞仆舒仆"
 
+#: src/protocols/irc/msgs.c:182 src/protocols/irc/msgs.c:201
+#: src/protocols/irc/msgs.c:214
+#, c-format
+msgid "<b>%s:</b> %s"
+msgstr "<b>%s:</b> %s"
+
 #: src/protocols/irc/msgs.c:184
 msgid " <i>(ircop)</i>"
-msgstr ""
+msgstr " <i>(仂仗亠�舒�仂� IRC)</i>"
 
 #: src/protocols/irc/msgs.c:185
 msgid " <i>(identified)</i>"
 msgstr " <i>(亳亟亠仆�亳�亳�亳�仂于舒仆)</i>"
 
-#: src/protocols/irc/msgs.c:192 src/protocols/silc/ops.c:949
-#: src/protocols/silc/ops.c:1098 src/protocols/yahoo/yahoo_profile.c:1005
+#: 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:1179 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:196 src/protocols/silc/ops.c:958
+#: src/protocols/silc/ops.c:1107 src/protocols/yahoo/yahoo_profile.c:1005
 msgid "Realname"
 msgstr "�舒��仂��亠亠 亳仄�"
 
-#: src/protocols/irc/msgs.c:202 src/protocols/silc/ops.c:1021
+#: src/protocols/irc/msgs.c:207 src/protocols/silc/ops.c:1030
 msgid "Currently on"
 msgstr "弌亠亶�舒� 仆舒"
 
-#: src/protocols/irc/msgs.c:207
+#: src/protocols/irc/msgs.c:212
 #, c-format
 msgid "<b>Idle for:</b> %s<br>"
 msgstr "<b>�亠亰亟亠亶��于�亠�:</b> %s<br>"
 
-#: src/protocols/irc/msgs.c:209
+#: src/protocols/irc/msgs.c:214
 msgid "Online since"
 msgstr "� �亠�亳 �"
 
-#: src/protocols/irc/msgs.c:212
+#: src/protocols/irc/msgs.c:217
 msgid "<br><b>Defining adjective:</b> Glorious<br>"
 msgstr ""
 
-#: src/protocols/irc/msgs.c:219
+#: src/protocols/irc/msgs.c:224
 #, c-format
 msgid "Buddy Information for %s"
 msgstr "�仆�仂�仄舒�亳� 仂 仗仂仍�亰仂于舒�亠仍亠 %s"
 
-#: src/protocols/irc/msgs.c:279
+#: src/protocols/irc/msgs.c:284
 #, c-format
 msgid "%s has changed the topic to: %s"
 msgstr "%s �仄亠仆亳仍 �亠仄� 仆舒: %s"
 
-#: src/protocols/irc/msgs.c:284
+#: src/protocols/irc/msgs.c:289
 #, c-format
 msgid "The topic for %s is: %s"
 msgstr "丐亠仄舒 亟仍� %s: %s"
 
-#: src/protocols/irc/msgs.c:301
+#: src/protocols/irc/msgs.c:306
 #, c-format
 msgid "Unknown message '%s'"
 msgstr "�亠亳亰于亠��仆仂亠 �仂仂弍�亠仆亳亠 '%s'"
 
-#: src/protocols/irc/msgs.c:302
+#: src/protocols/irc/msgs.c:307
 msgid "Unknown message"
 msgstr "�亠亳亰于亠��仆仂亠 �仂仂弍�亠仆亳亠"
 
-#: src/protocols/irc/msgs.c:302
+#: src/protocols/irc/msgs.c:307
 msgid "Gaim has sent a message the IRC server did not understand."
 msgstr "Gaim 仂�仗�舒于亳仍 �仂仂弍�亠仆亳亠, 从仂�仂�仂亠 仆亠 仗仂仆�仍 �亠�于亠� IRC."
 
-#: src/protocols/irc/msgs.c:325
+#: src/protocols/irc/msgs.c:330
 #, c-format
 msgid "Users on %s: %s"
 msgstr "�仂仍�亰仂于舒�亠仍亳 仆舒 %s: %s"
 
-#: src/protocols/irc/msgs.c:407
+#: src/protocols/irc/msgs.c:424
 msgid "No such channel"
 msgstr "�亠� �舒从仂亞仂 从舒仆舒仍舒"
 
 #. does this happen?
-#: src/protocols/irc/msgs.c:418
+#: src/protocols/irc/msgs.c:435
 msgid "no such channel"
 msgstr "仆亠� �舒从仂亞仂 从舒仆舒仍舒"
 
-#: src/protocols/irc/msgs.c:421
+#: src/protocols/irc/msgs.c:438
 msgid "User is not logged in"
 msgstr "�仂仍�亰仂于舒�亠仍� 仆亠 于 �亠�亳"
 
-#: src/protocols/irc/msgs.c:426
+#: src/protocols/irc/msgs.c:443
 msgid "No such nick or channel"
 msgstr "�亠� �舒从仂亞仂 仗�亠于亟仂仆亳仄舒 亳仍亳 从舒仆舒仍舒"
 
-#: src/protocols/irc/msgs.c:446
+#: src/protocols/irc/msgs.c:463
 msgid "Could not send"
 msgstr "�亠 �亟舒仍仂�� 仂�仗�舒于亳��"
 
-#: src/protocols/irc/msgs.c:502
+#: src/protocols/irc/msgs.c:519
 #, c-format
 msgid "Joining %s requires an invitation."
 msgstr "��亳�仂亠亟亳仆亠仆亳亠 从 %s ��亠弍�亠� 仗�亳亞仍舒�亠仆亳�."
 
-#: src/protocols/irc/msgs.c:503
+#: src/protocols/irc/msgs.c:520
 msgid "Invitation only"
 msgstr "丐仂仍�从仂 仗仂 仗�亳亞仍舒�亠仆亳�"
 
-#: src/protocols/irc/msgs.c:606
+#: src/protocols/irc/msgs.c:623
 #, c-format
 msgid "You have been kicked by %s: (%s)"
 msgstr "�� 弍�仍亳 �亟舒仍亠仆� 仂仗亠�舒�仂�仂仄 %s: (%s)"
 
-#: src/protocols/irc/msgs.c:611
+#: src/protocols/irc/msgs.c:628
 #, c-format
 msgid "Kicked by %s (%s)"
 msgstr "丕亟舒仍�仆 仂仗亠�舒�仂�仂仄 %s (%s)"
 
-#: src/protocols/irc/msgs.c:632
+#: src/protocols/irc/msgs.c:649
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr "�亠亢亳仄 (%s %s) ���舒仆仂于仍亠仆 %s"
 
-#: src/protocols/irc/msgs.c:711
+#: src/protocols/irc/msgs.c:758
 msgid "Could not change nick"
 msgstr "�亠 �亟舒仍仂�� 亳亰仄亠仆亳�� 仗�亠于亟仂仆亳仄"
 
-#: src/protocols/irc/msgs.c:712
+#: src/protocols/irc/msgs.c:759
 msgid "Cannot change nick"
 msgstr "�亠 �亟舒���� 亳亰仄亠仆亳�� 仗�亠于亟仂仆亳仄"
 
-#: src/protocols/irc/msgs.c:733
+#: src/protocols/irc/msgs.c:780
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr "�� 仂��仂亠亟亳仆亳仍亳�� 仂� 从舒仆舒仍舒 %s%s"
 
-#: src/protocols/irc/msgs.c:773
+#: src/protocols/irc/msgs.c:820
 msgid "Error: invalid PONG from server"
 msgstr "��亳弍从舒: 仆亠于亠�仆�亶 PONG � �亠�于亠�舒"
 
-#: src/protocols/irc/msgs.c:775
+#: src/protocols/irc/msgs.c:822
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr "��于亠� PING -- 亰舒亟亠�亢从舒: %lu �亠从�仆亟"
 
-#: src/protocols/irc/msgs.c:850
+#: src/protocols/irc/msgs.c:897
 #, c-format
 msgid "Cannot join %s:"
 msgstr "�亠 �亟舒���� 仗�亳�仂亠亟亳仆亳���� 从 %s:"
 
-#: src/protocols/irc/msgs.c:851 src/protocols/silc/ops.c:894
+#: src/protocols/irc/msgs.c:898 src/protocols/silc/ops.c:903
 msgid "Cannot join channel"
 msgstr "�亠 �亟舒���� 仗�亳�仂亠亟亳仆亳���� 从 从舒仆舒仍�"
 
-#: src/protocols/irc/msgs.c:887
+#: src/protocols/irc/msgs.c:934
 #, c-format
 msgid "Wallops from %s"
 msgstr ""
@@ -5304,7 +5346,7 @@
 "names [从舒仆舒仍]:  ��于亠��亳 �仗亳�仂从 仗仂仍�亰仂于舒�亠仍亠亶, 仗�亳�����于���亳� �亠亶�舒� 仆舒 "
 "从舒仆舒仍亠."
 
-#: src/protocols/irc/parse.c:122 src/protocols/jabber/jabber.c:1407
+#: src/protocols/irc/parse.c:122 src/protocols/jabber/jabber.c:1410
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr "nick &lt;仆仂于�亶 仗�亠于亟仂仆亳仄&gt;:  �亰仄亠仆亳�� �于仂亶 仗�亠于亟仂仆亳仄."
 
@@ -5388,7 +5430,7 @@
 msgid "whois &lt;nick&gt;:  Get information on a user."
 msgstr "whois &lt;仗�亠于亟仂仆亳仄&gt;:  �仂仍��亳�� 亳仆�仂�仄舒�亳� 仂 仗仂仍�亰仂于舒�亠仍亠."
 
-#: src/protocols/irc/parse.c:228 src/protocols/zephyr/zephyr.c:256
+#: src/protocols/irc/parse.c:242 src/protocols/zephyr/zephyr.c:265
 msgid ""
 "(There was an error converting this message.  Check the 'Encoding' option in "
 "the Account Editor)"
@@ -5396,20 +5438,20 @@
 "(��亳弍从舒 仗�亠仂弍�舒亰仂于舒仆亳� ��仂亞仂 �仂仂弍�亠仆亳�. ��仂于亠���亠 仗舒�舒仄亠�� \"�仂亟亳�仂于从舒\" 于 "
 "�亠亟舒从�仂�亠 ����仆�� 亰舒仗亳�亠亶)"
 
-#: src/protocols/irc/parse.c:382
+#: src/protocols/irc/parse.c:394
 #, c-format
 msgid "Reply time from %s: %lu seconds"
 msgstr "��亠仄� 仂�于亠�舒 仂� %s: %lu �亠从�仆亟"
 
-#: src/protocols/irc/parse.c:383
+#: src/protocols/irc/parse.c:395
 msgid "PONG"
 msgstr "PONG"
 
-#: src/protocols/irc/parse.c:383
+#: src/protocols/irc/parse.c:395
 msgid "CTCP PING reply"
 msgstr "��于亠� CTCP PING"
 
-#: src/protocols/irc/parse.c:485 src/protocols/oscar/oscar.c:1430
+#: src/protocols/irc/parse.c:497 src/protocols/oscar/oscar.c:1416
 #: 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."
@@ -5445,23 +5487,23 @@
 msgstr "�亠于亠�仆�亶 亰舒仗�仂� � �亠�于亠�舒"
 
 #: src/protocols/jabber/buddy.c:246 src/protocols/jabber/buddy.c:604
-#: src/protocols/silc/ops.c:786
+#: src/protocols/silc/ops.c:795
 msgid "Full Name"
-msgstr "�仂仍仆仂亠 �仄�"
+msgstr "�仂仍仆仂亠 亳仄�"
 
 #: src/protocols/jabber/buddy.c:247 src/protocols/jabber/buddy.c:617
-#: src/protocols/silc/ops.c:798
+#: src/protocols/silc/ops.c:807
 msgid "Family Name"
 msgstr "个舒仄亳仍亳�"
 
 #: src/protocols/jabber/buddy.c:248 src/protocols/jabber/buddy.c:621
 msgid "Given Name"
-msgstr "�亠于亳��� �舒仄亳仍亳�"
+msgstr "�仄�"
 
 #: src/protocols/jabber/buddy.c:249 src/protocols/jabber/buddy.c:635
 #: src/protocols/jabber/jabber.c:608 src/protocols/msn/msn.c:1172
-#: src/protocols/silc/buddy.c:1442 src/protocols/silc/ops.c:802
-#: src/protocols/silc/ops.c:945 src/protocols/silc/ops.c:1094
+#: src/protocols/silc/buddy.c:1442 src/protocols/silc/ops.c:811
+#: src/protocols/silc/ops.c:954 src/protocols/silc/ops.c:1103
 #: src/protocols/yahoo/yahoo_profile.c:1000
 msgid "Nickname"
 msgstr "��亠于亟仂仆亳仄"
@@ -5525,7 +5567,7 @@
 msgstr "�仂仍亢仆仂���"
 
 #: src/protocols/jabber/buddy.c:263 src/protocols/jabber/buddy.c:638
-#: src/protocols/oscar/oscar.c:4883
+#: src/protocols/oscar/oscar.c:4878
 msgid "Birthday"
 msgstr "�舒�舒 �仂亢亟亠仆亳�"
 
@@ -5546,24 +5588,24 @@
 
 #: src/protocols/jabber/buddy.c:563 src/protocols/jabber/buddy.c:570
 #: src/protocols/jabber/buddy.c:581 src/protocols/jabber/jabber.c:938
-#: src/protocols/msn/msn.c:450 src/protocols/novell/novell.c:2743
-#: src/protocols/novell/novell.c:2747 src/protocols/oscar/oscar.c:578
-#: src/protocols/oscar/oscar.c:584 src/protocols/oscar/oscar.c:586
-#: src/protocols/yahoo/yahoo.c:2634
+#: src/protocols/msn/msn.c:450 src/protocols/novell/novell.c:2790
+#: src/protocols/novell/novell.c:2794 src/protocols/oscar/oscar.c:562
+#: src/protocols/oscar/oscar.c:568 src/protocols/oscar/oscar.c:570
+#: src/protocols/yahoo/yahoo.c:2677
 msgid "Status"
 msgstr "弌�舒���"
 
-#: src/protocols/jabber/buddy.c:579 src/protocols/jabber/jabber.c:1562
+#: src/protocols/jabber/buddy.c:579 src/protocols/jabber/jabber.c:1579
 msgid "Resource"
 msgstr "�亠����"
 
-#: src/protocols/jabber/buddy.c:625 src/protocols/silc/ops.c:794
+#: src/protocols/jabber/buddy.c:625 src/protocols/silc/ops.c:803
 msgid "Middle Name"
 msgstr "���亠��于仂"
 
 #: src/protocols/jabber/buddy.c:643 src/protocols/jabber/jabber.c:623
-#: src/protocols/oscar/oscar.c:4901 src/protocols/oscar/oscar.c:4909
-#: src/protocols/silc/ops.c:830
+#: src/protocols/oscar/oscar.c:4896 src/protocols/oscar/oscar.c:4904
+#: src/protocols/silc/ops.c:839
 msgid "Address"
 msgstr "�亟�亠�"
 
@@ -5646,51 +5688,51 @@
 msgid "Invalid Room Handle"
 msgstr "�亠于亠�仆仂亠 亳仄� 从仂仄仆舒��"
 
-#: src/protocols/jabber/chat.c:349
+#: src/protocols/jabber/chat.c:341
 msgid "Configuration error"
 msgstr "��亳弍从舒 从仂仆�亳亞��舒�亳亳"
 
-#: src/protocols/jabber/chat.c:358 src/protocols/jabber/chat.c:503
+#: src/protocols/jabber/chat.c:350 src/protocols/jabber/chat.c:495
 msgid "Unable to configure"
 msgstr "�亠 �亟舒���� 仆舒���仂亳��"
 
-#: src/protocols/jabber/chat.c:374
+#: src/protocols/jabber/chat.c:366
 msgid "Room Configuration Error"
 msgstr "��亳弍从舒 从仂仆�亳亞��舒�亳亳 从仂仄仆舒��"
 
-#: src/protocols/jabber/chat.c:375
+#: src/protocols/jabber/chat.c:367
 msgid "This room is not capable of being configured"
 msgstr "亅�舒 从仂仄仆舒�舒 仆亠 亳仄亠亠� 于仂亰仄仂亢仆仂��亳 仆舒���仂亶从亳"
 
-#: src/protocols/jabber/chat.c:425 src/protocols/jabber/chat.c:494
+#: src/protocols/jabber/chat.c:417 src/protocols/jabber/chat.c:486
 msgid "Registration error"
 msgstr "��亳弍从舒 �亠亞亳���舒�亳亳"
 
-#: src/protocols/jabber/chat.c:573
+#: src/protocols/jabber/chat.c:565
 msgid "Nick changing not supported in non-MUC chatrooms"
 msgstr "�亰仄亠仆亠仆亳亠 仗�亠于亟仂仆亳仄舒 仆亠 仗仂亟亟亠�亢亳于舒亠��� 于 �舒�舒� 仆亠-MUC"
 
-#: src/protocols/jabber/chat.c:617 src/protocols/jabber/chat.c:628
+#: src/protocols/jabber/chat.c:609 src/protocols/jabber/chat.c:620
 msgid "Roomlist Error"
 msgstr "��亳弍从舒 �仗亳�从舒 从仂仄仆舒�"
 
-#: src/protocols/jabber/chat.c:618 src/protocols/jabber/chat.c:629
+#: src/protocols/jabber/chat.c:610 src/protocols/jabber/chat.c:621
 msgid "Error retreiving roomlist"
 msgstr "��亳弍从舒 亰舒亞��亰从亳 �仗亳�从舒 从仂仄仆舒�"
 
-#: src/protocols/jabber/chat.c:669
+#: src/protocols/jabber/chat.c:661
 msgid "Invalid Server"
 msgstr "�亠于亠�仆�亶 �亠�于亠�"
 
-#: src/protocols/jabber/chat.c:706
+#: src/protocols/jabber/chat.c:698
 msgid "Enter a Conference Server"
 msgstr "�仂亶�亳 仆舒 �亠�于亠� 从仂仆�亠�亠仆�亳亶"
 
-#: src/protocols/jabber/chat.c:707
+#: src/protocols/jabber/chat.c:699
 msgid "Select a conference server to query"
 msgstr "��弍亠�亳�亠 �亠�于亠� 从仂仆�亠�亠仆�亳亶 亟仍� 仂仗�仂�舒"
 
-#: src/protocols/jabber/chat.c:710
+#: src/protocols/jabber/chat.c:702
 msgid "Find Rooms"
 msgstr "��从舒�� 从仂仄仆舒��"
 
@@ -5760,13 +5802,13 @@
 msgstr "E-mail"
 
 #. State
-#: src/protocols/jabber/jabber.c:633 src/protocols/oscar/oscar.c:4903
-#: src/protocols/oscar/oscar.c:4911 src/protocols/trepia/trepia.c:335
+#: src/protocols/jabber/jabber.c:633 src/protocols/oscar/oscar.c:4898
+#: src/protocols/oscar/oscar.c:4906 src/protocols/trepia/trepia.c:335
 #: src/protocols/trepia/trepia.c:413
 msgid "State"
 msgstr "�弍仍舒���"
 
-#: src/protocols/jabber/jabber.c:643 src/protocols/silc/ops.c:835
+#: src/protocols/jabber/jabber.c:643 src/protocols/silc/ops.c:844
 #: src/protocols/silc/silc.c:639 src/protocols/silc/util.c:510
 msgid "Phone"
 msgstr "丐亠仍亠�仂仆"
@@ -5789,9 +5831,9 @@
 
 #. connect to the server
 #: src/protocols/jabber/jabber.c:783 src/protocols/msn/msn.c:608
-#: src/protocols/napster/napster.c:499 src/protocols/novell/novell.c:2105
-#: src/protocols/oscar/oscar.c:1597 src/protocols/trepia/trepia.c:1064
-#: src/protocols/yahoo/yahoo.c:2379 src/protocols/zephyr/zephyr.c:1017
+#: src/protocols/napster/napster.c:499 src/protocols/novell/novell.c:2123
+#: src/protocols/oscar/oscar.c:1587 src/protocols/trepia/trepia.c:1064
+#: src/protocols/yahoo/yahoo.c:2422 src/protocols/zephyr/zephyr.c:1018
 msgid "Connecting"
 msgstr "弌仂亠亟亳仆亠仆亳亠"
 
@@ -5809,13 +5851,13 @@
 
 #: src/protocols/jabber/jabber.c:882 src/protocols/jabber/jabber.c:1159
 #: src/protocols/jabber/jabber.c:1200 src/protocols/jabber/jabber.c:1233
-#: src/protocols/oscar/oscar.c:584 src/protocols/oscar/oscar.c:6497
+#: src/protocols/oscar/oscar.c:568 src/protocols/oscar/oscar.c:6500
 msgid "Not Authorized"
 msgstr "�亠 舒于�仂�亳亰仂于舒仆"
 
 #: src/protocols/jabber/jabber.c:913
 msgid "Both"
-msgstr "�弍舒"
+msgstr "�弍亠"
 
 #: src/protocols/jabber/jabber.c:915
 msgid "From (To pending)"
@@ -5835,26 +5877,26 @@
 
 #: src/protocols/jabber/jabber.c:926
 msgid "Subscription"
-msgstr "�仂亟仗亳��"
+msgstr "�仂亟仗亳�从舒"
 
 #: src/protocols/jabber/jabber.c:946
 msgid "Error"
 msgstr "��亳弍从舒"
 
 #: src/protocols/jabber/jabber.c:959 src/protocols/jabber/jutil.c:35
-#: src/protocols/jabber/presence.c:66 src/protocols/jabber/presence.c:117
+#: src/protocols/jabber/presence.c:66 src/protocols/jabber/presence.c:119
 msgid "Chatty"
 msgstr "�仂�仂于 仗仂仂弍�舒����"
 
 #: src/protocols/jabber/jabber.c:961 src/protocols/jabber/jutil.c:38
-#: src/protocols/jabber/presence.c:68 src/protocols/jabber/presence.c:122
+#: src/protocols/jabber/presence.c:68 src/protocols/jabber/presence.c:124
 msgid "Extended Away"
 msgstr "�舒��亳�亠仆仆�亶 \"��仂��仍\""
 
 #: src/protocols/jabber/jabber.c:962 src/protocols/jabber/jutil.c:41
-#: src/protocols/jabber/presence.c:70 src/protocols/jabber/presence.c:124
-#: src/protocols/oscar/oscar.c:526 src/protocols/oscar/oscar.c:5487
-#: src/protocols/oscar/oscar.c:6690
+#: src/protocols/jabber/presence.c:70 src/protocols/jabber/presence.c:126
+#: src/protocols/oscar/oscar.c:510 src/protocols/oscar/oscar.c:5489
+#: src/protocols/oscar/oscar.c:6693
 msgid "Do Not Disturb"
 msgstr "�亠 弍亠�仗仂从仂亳��"
 
@@ -5882,7 +5924,7 @@
 msgid "Please enter your new password"
 msgstr "�于亠亟亳�亠 仆仂于�亶 仗舒�仂仍�"
 
-#: src/protocols/jabber/jabber.c:1057 src/protocols/toc/toc.c:1540
+#: src/protocols/jabber/jabber.c:1057 src/protocols/toc/toc.c:1541
 msgid "Set User Info"
 msgstr "丕��舒仆仂于亳�� 亳仆�仂�仄舒�亳� 仂 仗仂仍�亰仂于舒�亠仍亠"
 
@@ -5956,7 +5998,7 @@
 
 #: src/protocols/jabber/jabber.c:1177
 msgid "Subscription Required"
-msgstr "丐�亠弍�亠��� 仗仂亟仗亳��"
+msgstr "丐�亠弍�亠��� 仗仂亟仗亳�从舒"
 
 #: src/protocols/jabber/jabber.c:1179
 msgid "Unexpected Request"
@@ -6002,7 +6044,7 @@
 msgid "Resource Conflict"
 msgstr "�仂仆�仍亳从� �亠����仂于"
 
-#: src/protocols/jabber/jabber.c:1215 src/protocols/silc/ops.c:1491
+#: src/protocols/jabber/jabber.c:1215 src/protocols/silc/ops.c:1500
 msgid "Connection Timeout"
 msgstr "���亠从仍仂 于�亠仄� 仂亢亳亟舒仆亳� �仂亠亟亳仆亠仆亳�"
 
@@ -6092,52 +6134,52 @@
 msgid "Unable to kick user %s"
 msgstr "�亠 �亟舒���� �亟舒仍亳�� 仗仂仍�亰仂于舒�亠仍� %s"
 
-#: src/protocols/jabber/jabber.c:1401
+#: src/protocols/jabber/jabber.c:1402
 msgid "config:  Configure a chat room."
 msgstr "config:  �舒���仂亳�� 从仂仄仆舒��."
 
-#: src/protocols/jabber/jabber.c:1404
+#: src/protocols/jabber/jabber.c:1406
 msgid "configure:  Configure a chat room."
 msgstr "configure:  �舒���仂亳�� 从仂仄仆舒��."
 
-#: src/protocols/jabber/jabber.c:1411
+#: src/protocols/jabber/jabber.c:1415
 msgid "part [room]:  Leave the room."
 msgstr "part [从仂仄仆舒�舒]:  �仂从亳仆��� 从仂仄仆舒��."
 
-#: src/protocols/jabber/jabber.c:1414
+#: src/protocols/jabber/jabber.c:1420
 msgid "register:  Register with a chat room."
 msgstr "register:  �舒�亠亞亳���亳�仂于舒�� 从仂仄仆舒��."
 
-#: src/protocols/jabber/jabber.c:1419
+#: src/protocols/jabber/jabber.c:1426
 msgid "topic [new topic]:  View or change the topic."
 msgstr "topic [仆仂于舒� �亠仄舒]:  ��仂�仄仂��亠�� 亳仍亳 亳亰仄亠仆亳�� �亠仄�."
 
-#: src/protocols/jabber/jabber.c:1423
+#: src/protocols/jabber/jabber.c:1432
 msgid "ban &lt;user&gt; [room]:  Ban a user from the room."
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1427
+#: src/protocols/jabber/jabber.c:1438
 msgid "invite &lt;user&gt; [room]:  Invite a user to the room."
 msgstr ""
 "invite &lt;仗仂仍�亰仂于舒�亠仍�&gt; [从仂仄仆舒�舒]:  ��亳亞仍舒�亳�� 仗仂仍�亰仂于舒�亠仍� 于 从仂仄仆舒��."
 
-#: src/protocols/jabber/jabber.c:1431
+#: src/protocols/jabber/jabber.c:1444
 msgid "join: &lt;room&gt; [server]:  Join a chat on this server."
 msgstr ""
 "join: &lt;从仂仄仆舒�舒&gt; [�亠�于亠�]:  ��亳�仂亠亟亳仆亳���� 从 �舒�� 仆舒 ��仂仄 �亠�于亠�亠."
 
-#: src/protocols/jabber/jabber.c:1435
+#: src/protocols/jabber/jabber.c:1450
 msgid "kick &lt;user&gt; [room]:  Kick a user from the room."
 msgstr "kick &lt;仗仂仍�亰仂于舒�亠仍�&gt; [从仂仄仆舒�舒]:  丕亟舒仍亳�� 仗仂仍�亰仂于舒�亠仍� 亳亰 从仂仄仆舒��."
 
-#: src/protocols/jabber/jabber.c:1439
+#: src/protocols/jabber/jabber.c:1455
 msgid ""
 "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
 msgstr ""
 "msg &lt;仗仂仍�亰仂于舒�亠仍�&gt; &lt;�仂仂弍�亠仆亳亠&gt;:  ��仗�舒于亳�� 仗仂仍�亰仂于舒�亠仍� 仍亳�仆仂亠 "
 "�仂仂弍�亠仆亳亠."
 
-#: src/protocols/jabber/jabber.c:1453
+#: src/protocols/jabber/jabber.c:1470
 msgid "Hide Operating System"
 msgstr "弌从��于舒�� 仂仗亠�舒�亳仂仆仆�� �亳��亠仄�"
 
@@ -6152,24 +6194,24 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/jabber/jabber.c:1537 src/protocols/jabber/jabber.c:1539
+#: src/protocols/jabber/jabber.c:1554 src/protocols/jabber/jabber.c:1556
 msgid "Jabber Protocol Plugin"
 msgstr "�仂亟�仍� 仗�仂�仂从仂仍舒 Jabber"
 
-#: src/protocols/jabber/jabber.c:1565
+#: src/protocols/jabber/jabber.c:1582
 msgid "Use TLS if available"
 msgstr "��仗仂仍�亰仂于舒�� TLS, 亠�仍亳 亟仂���仗仆仂"
 
-#: src/protocols/jabber/jabber.c:1570
+#: src/protocols/jabber/jabber.c:1587
 msgid "Force old SSL"
 msgstr "��亳仆�亟亳�亠仍�仆仂 亳�仗仂仍�亰仂于舒�� ��舒��亶 SSL"
 
-#: src/protocols/jabber/jabber.c:1575
+#: src/protocols/jabber/jabber.c:1592
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "�舒亰�亠�亳�� 亳亟亠仆�亳�亳从舒�亳� 仗�仂���仄 �亠从��仂仄 �亠�亠亰 仆亠�亳��仂于舒仆仆�亠 仗仂�仂从亳"
 
 #. Account options
-#: src/protocols/jabber/jabber.c:1584 src/protocols/silc/silc.c:1572
+#: src/protocols/jabber/jabber.c:1601 src/protocols/silc/silc.c:1573
 msgid "Connect server"
 msgstr "弌仂亠亟亳仆亳���� � �亠�于亠�仂仄"
 
@@ -6188,16 +6230,16 @@
 msgid "The topic is: %s"
 msgstr "丐亠仄舒: %s"
 
-#: src/protocols/jabber/message.c:225
+#: src/protocols/jabber/message.c:226
 #, c-format
 msgid "Message delivery to %s failed: %s"
 msgstr "�亠 �亟舒仍仂�� 亟仂��舒于亳�� �仂仂弍�亠仆亳亠 亟仍� %s: %s"
 
-#: src/protocols/jabber/message.c:228
+#: src/protocols/jabber/message.c:229
 msgid "Jabber Message Error"
 msgstr "��亳弍从舒 �仂仂弍�亠仆亳� Jabber"
 
-#: src/protocols/jabber/message.c:291
+#: src/protocols/jabber/message.c:293
 #, c-format
 msgid " (Code %s)"
 msgstr " (�仂亟 %s)"
@@ -6206,21 +6248,21 @@
 msgid "XML Parse error"
 msgstr "��亳弍从舒 �舒亰弍仂�舒 XML"
 
-#: src/protocols/jabber/presence.c:224
+#: src/protocols/jabber/presence.c:227
 #, fuzzy
 msgid "Unknown Error in presence"
 msgstr "�亠亳亰于亠��仆舒� 仂�亳弍从舒 ��舒���舒 仗�亳�����于亳�"
 
-#: src/protocols/jabber/presence.c:227
+#: src/protocols/jabber/presence.c:230
 #, c-format
 msgid "The user %s wants to add you to their buddy list."
 msgstr "�仂仍�亰仂于舒�亠仍� %s �仂�亠� 亟仂弍舒于亳�� 于舒� 于 �于仂亶 �仗亳�仂从 从仂仆�舒从�仂于."
 
-#: src/protocols/jabber/presence.c:280 src/protocols/jabber/presence.c:281
+#: src/protocols/jabber/presence.c:283 src/protocols/jabber/presence.c:284
 msgid "Create New Room"
 msgstr "弌仂亰亟舒�� 仆仂于�� 从仂仄仆舒��"
 
-#: src/protocols/jabber/presence.c:282
+#: src/protocols/jabber/presence.c:285
 msgid ""
 "You are creating a new room.  Would you like to configure it, or accept the "
 "default settings?"
@@ -6228,20 +6270,20 @@
 "�� �仂亰亟舒��亠 仆仂于�� 从仂仄仆舒��. �� �仂�亠仍亳 弍� 仆舒���仂亳�� 亠� 亳仍亳 仗�亳仆��� ���舒仆仂于从亳 "
 "仗仂 �仄仂仍�舒仆亳�?"
 
-#: src/protocols/jabber/presence.c:284
+#: src/protocols/jabber/presence.c:287
 msgid "Configure Room"
 msgstr "�舒���仂亳�� 从仂仄仆舒��"
 
-#: src/protocols/jabber/presence.c:286
+#: src/protocols/jabber/presence.c:289
 msgid "Accept Defaults"
 msgstr "��亳仆��� ���舒仆仂于从亳 仗仂 �仄仂仍�舒仆亳�"
 
-#: src/protocols/jabber/presence.c:308
+#: src/protocols/jabber/presence.c:311
 #, c-format
 msgid "Error in chat %s"
 msgstr "��亳弍从舒 于 �舒�亠 %s"
 
-#: src/protocols/jabber/presence.c:311
+#: src/protocols/jabber/presence.c:314
 #, c-format
 msgid "Error joining chat %s"
 msgstr "��亳弍从舒 仗�亳�仂亠亟亳仆亠仆亳� 从 �舒�� %s"
@@ -6260,11 +6302,11 @@
 msgid "Miscellaneous error"
 msgstr "�亠仂仗�亠亟亠仍�仆仆舒� 仂�亳弍从舒"
 
-#: src/protocols/msn/cmdproc.c:338
+#: src/protocols/msn/cmdproc.c:339
 msgid "You have signed on from another location."
 msgstr "�� 仗仂亟从仍��亠仆� 亳亰 亟��亞仂亞仂 仄亠��舒."
 
-#: src/protocols/msn/cmdproc.c:340
+#: src/protocols/msn/cmdproc.c:341
 msgid "The MSN servers are going down temporarily."
 msgstr "弌亠�于亠�� MSN 于�亠仄亠仆仆仂 于�从仍��舒����."
 
@@ -6312,7 +6354,7 @@
 msgid "Not on list"
 msgstr "�������于�亠� 于 �仗亳�从亠"
 
-#: src/protocols/msn/error.c:70 src/protocols/zephyr/zephyr.c:593
+#: src/protocols/msn/error.c:70 src/protocols/zephyr/zephyr.c:602
 msgid "User is offline"
 msgstr "�仂仍�亰仂于舒�亠仍� 仆亠 于 �亠�亳"
 
@@ -6457,8 +6499,8 @@
 msgid "Server too busy"
 msgstr "弌亠�于亠� �仍亳�从仂仄 亰舒仆��"
 
-#: src/protocols/msn/error.c:198 src/protocols/oscar/oscar.c:2026
-#: src/protocols/silc/ops.c:1480 src/protocols/toc/toc.c:630
+#: src/protocols/msn/error.c:198 src/protocols/oscar/oscar.c:2016
+#: src/protocols/silc/ops.c:1489 src/protocols/toc/toc.c:630
 msgid "Authentication failed"
 msgstr "�亟亠仆�亳�亳从舒�亳� 亰舒于亠��亳仍舒�� 仆亠�亟舒�仆仂"
 
@@ -6542,40 +6584,49 @@
 msgid "Page"
 msgstr "弌��舒仆亳�舒"
 
+#: src/protocols/msn/msn.c:450 src/protocols/yahoo/yahoo.c:2677
+#, c-format
+msgid ""
+"\n"
+"<b>%s:</b> %s"
+msgstr ""
+"\n"
+"<b>%s:</b> %s"
+
 #: src/protocols/msn/msn.c:463 src/protocols/msn/msn.c:756
 #: src/protocols/msn/state.c:34
 msgid "Away From Computer"
 msgstr "��仂��仍 仂� 从仂仄仗���亠�舒"
 
 #: src/protocols/msn/msn.c:464 src/protocols/msn/msn.c:758
-#: src/protocols/msn/state.c:33 src/protocols/yahoo/yahoo.c:2491
-#: src/protocols/yahoo/yahoo.c:2853 src/protocols/yahoo/yahoo.c:2969
+#: src/protocols/msn/state.c:33 src/protocols/yahoo/yahoo.c:2534
+#: src/protocols/yahoo/yahoo.c:2896 src/protocols/yahoo/yahoo.c:3012
 msgid "Be Right Back"
 msgstr "弌从仂�仂 于亠�仆���"
 
 #: src/protocols/msn/msn.c:465 src/protocols/msn/msn.c:760
-#: src/protocols/msn/state.c:31 src/protocols/novell/novell.c:2727
-#: src/protocols/novell/novell.c:2842 src/protocols/novell/novell.c:2896
+#: src/protocols/msn/state.c:31 src/protocols/novell/novell.c:2774
+#: src/protocols/novell/novell.c:2889 src/protocols/novell/novell.c:2943
 #: src/protocols/silc/buddy.c:1383 src/protocols/silc/silc.c:47
-#: src/protocols/silc/silc.c:78 src/protocols/yahoo/yahoo.c:2493
-#: src/protocols/yahoo/yahoo.c:2855 src/protocols/yahoo/yahoo.c:2970
+#: src/protocols/silc/silc.c:78 src/protocols/yahoo/yahoo.c:2536
+#: src/protocols/yahoo/yahoo.c:2898 src/protocols/yahoo/yahoo.c:3013
 msgid "Busy"
 msgstr "�舒仆��"
 
 #: src/protocols/msn/msn.c:466 src/protocols/msn/msn.c:762
-#: src/protocols/msn/state.c:35 src/protocols/yahoo/yahoo.c:2501
-#: src/protocols/yahoo/yahoo.c:2863 src/protocols/yahoo/yahoo.c:2974
+#: src/protocols/msn/state.c:35 src/protocols/yahoo/yahoo.c:2544
+#: src/protocols/yahoo/yahoo.c:2906 src/protocols/yahoo/yahoo.c:3017
 msgid "On The Phone"
 msgstr "�舒亰亞仂于舒�亳于舒� 仗仂 �亠仍亠�仂仆�"
 
 #: src/protocols/msn/msn.c:467 src/protocols/msn/msn.c:764
-#: src/protocols/msn/state.c:36 src/protocols/yahoo/yahoo.c:2505
-#: src/protocols/yahoo/yahoo.c:2867 src/protocols/yahoo/yahoo.c:2976
+#: src/protocols/msn/state.c:36 src/protocols/yahoo/yahoo.c:2548
+#: src/protocols/yahoo/yahoo.c:2910 src/protocols/yahoo/yahoo.c:3019
 msgid "Out To Lunch"
 msgstr "�仂��仍 仗亠�亠从��亳��"
 
 #: src/protocols/msn/msn.c:468 src/protocols/msn/msn.c:766
-#: src/protocols/zephyr/zephyr.c:1355 src/protocols/zephyr/zephyr.c:1374
+#: src/protocols/zephyr/zephyr.c:1358 src/protocols/zephyr/zephyr.c:1377
 msgid "Hidden"
 msgstr "弌从���"
 
@@ -6624,7 +6675,7 @@
 "�舒 亟仂仗仂仍仆亳�亠仍�仆仂亶 亳仆�仂�仄舒�亳亠亶 仂弍�舒�舒亶�亠�� 仆舒 http://gaim.sf.net/faq-ssl.php."
 
 #: src/protocols/msn/msn.c:1167 src/protocols/yahoo/yahoo_profile.c:659
-#: src/protocols/zephyr/zephyr.c:626
+#: src/protocols/zephyr/zephyr.c:635
 #, c-format
 msgid "<b>Alias:</b> %s<br>"
 msgstr "<b>��亠于亟仂仆亳仄:</b> %s<br>"
@@ -6641,11 +6692,6 @@
 msgid "<font sml=\"msn\">%s</font><br>"
 msgstr "<font sml=\"msn\">%s</font><br>"
 
-#: src/protocols/msn/msn.c:1179 src/protocols/yahoo/yahoo_profile.c:664
-#, c-format
-msgid "<b>%s:</b> %s<br>"
-msgstr "<b>%s:</b> %s<br>"
-
 #: src/protocols/msn/msn.c:1242
 msgid "MSN Profile"
 msgstr "��仂�亳仍� MSN"
@@ -6656,14 +6702,14 @@
 msgstr "��亳弍从舒 亰舒亞��亰从亳 仗�仂�亳仍�"
 
 #. Age
-#: src/protocols/msn/msn.c:1318 src/protocols/oscar/oscar.c:4888
+#: src/protocols/msn/msn.c:1318 src/protocols/oscar/oscar.c:4883
 #: src/protocols/trepia/trepia.c:285 src/protocols/trepia/trepia.c:404
 #: src/protocols/yahoo/yahoo_profile.c:1015
 msgid "Age"
 msgstr "�仂亰�舒��"
 
 #. Gender
-#: src/protocols/msn/msn.c:1325 src/protocols/oscar/oscar.c:4874
+#: src/protocols/msn/msn.c:1325 src/protocols/oscar/oscar.c:4869
 #: src/protocols/trepia/trepia.c:279 src/protocols/trepia/trepia.c:406
 #: src/protocols/yahoo/yahoo_profile.c:1025
 msgid "Gender"
@@ -6707,7 +6753,7 @@
 msgstr "�仂�仍亠亟仆亠亠 仂弍仆仂于仍亠仆亳亠"
 
 #. Homepage
-#: src/protocols/msn/msn.c:1479 src/protocols/silc/ops.c:826
+#: src/protocols/msn/msn.c:1479 src/protocols/silc/ops.c:835
 #: src/protocols/trepia/trepia.c:289 src/protocols/trepia/trepia.c:419
 msgid "Homepage"
 msgstr "�仂仄舒�仆�� ���舒仆亳�舒"
@@ -6733,11 +6779,11 @@
 msgid "Profile URL"
 msgstr "URL 仗�仂�亳仍�"
 
-#: src/protocols/msn/msn.c:1643
+#: src/protocols/msn/msn.c:1644
 msgid "Display conversation closed notices"
 msgstr "�仂从舒亰�于舒�� �于亠亟仂仄仍亠仆亳� 仂 亰舒从���亳亳 弍亠�亠亟�"
 
-#: src/protocols/msn/msn.c:1648
+#: src/protocols/msn/msn.c:1649
 msgid "Display timeout notices"
 msgstr "�仂从舒亰�于舒�� �于亠亟仂仄仍亠仆亳� 仂弍 亳��亠�亠仆亳亳 于�亠仄亠仆亳 仂亢亳亟舒仆亳�"
 
@@ -6752,15 +6798,15 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/msn/msn.c:1732 src/protocols/msn/msn.c:1734
+#: src/protocols/msn/msn.c:1733 src/protocols/msn/msn.c:1735
 msgid "MSN Protocol Plugin"
 msgstr "�仂亟�仍� 仗�仂�仂从仂仍舒 MSN"
 
-#: src/protocols/msn/msn.c:1753 src/protocols/trepia/trepia.c:1292
+#: src/protocols/msn/msn.c:1754 src/protocols/trepia/trepia.c:1292
 msgid "Login server"
 msgstr "弌亠�于亠� 于�仂亟舒 于 �亠��:"
 
-#: src/protocols/msn/msn.c:1762
+#: src/protocols/msn/msn.c:1763
 msgid "Use HTTP Method"
 msgstr "��仗仂仍�亰仂于舒�� 仄亠�仂亟 HTTP"
 
@@ -6782,7 +6828,7 @@
 msgstr "�舒亞��亰从舒 �仗亳�从舒 从仂仆�舒从�仂于"
 
 #: src/protocols/msn/notification.c:144 src/protocols/msn/notification.c:173
-#: src/protocols/oscar/oscar.c:2315
+#: src/protocols/oscar/oscar.c:2306
 msgid "Password sent"
 msgstr "�舒�仂仍� 仂�仗�舒于仍亠仆"
 
@@ -6900,8 +6946,8 @@
 msgid "%s requested a PING"
 msgstr "%s 亰舒仗�仂�亳仍 PING"
 
-#: src/protocols/napster/napster.c:541 src/protocols/oscar/oscar.c:6197
-#: src/protocols/toc/toc.c:1266
+#: src/protocols/napster/napster.c:541 src/protocols/oscar/oscar.c:6202
+#: src/protocols/toc/toc.c:1267
 msgid "_Group:"
 msgstr "���仗仗舒:"
 
@@ -7047,46 +7093,46 @@
 msgid "Unknown error: 0x%X"
 msgstr "�亠亳亰于亠��仆舒� 仂�亳弍从舒: 0x%X"
 
-#: src/protocols/novell/novell.c:116
+#: src/protocols/novell/novell.c:117
 #, c-format
 msgid "Login failed (%s)."
 msgstr "�亠 �亟舒仍仂�� 于仂亶�亳 于 �亠�� (%s)."
 
-#: src/protocols/novell/novell.c:229
+#: src/protocols/novell/novell.c:230
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
 msgstr ""
 "�亠 �亟舒���� 仂�仗�舒于亳�� �仂仂弍�亠仆亳亠. �亠 �亟舒仍仂�� 仗仂仍��亳�� 仗仂亟�仂弍仆仂��亳 亟仍� "
 "仗仂仍�亰仂于舒�亠仍� (%s)."
 
-#: src/protocols/novell/novell.c:375
+#: src/protocols/novell/novell.c:379
 #, c-format
 msgid "Unable to add %s to your buddy list (%s)."
 msgstr "�亠 �亟舒���� 亟仂弍舒于亳�� %s 于 �仗亳�仂从 从仂仆�舒从�仂于 (%s)."
 
 #. TODO: Improve this! message to who or for what conference?
-#: src/protocols/novell/novell.c:401
+#: src/protocols/novell/novell.c:405
 #, c-format
 msgid "Unable to send message (%s)."
 msgstr "�亠 �亟舒���� 仂�仗�舒于亳�� �仂仂弍�亠仆亳亠 (%s)."
 
-#: src/protocols/novell/novell.c:472 src/protocols/novell/novell.c:965
+#: src/protocols/novell/novell.c:476 src/protocols/novell/novell.c:969
 #, c-format
 msgid "Unable to invite user (%s)."
 msgstr "�亠 �亟舒���� 仗�亳亞仍舒�亳�� 仗仂仍�亰仂于舒�亠仍� (%s)."
 
-#: src/protocols/novell/novell.c:511
+#: src/protocols/novell/novell.c:515
 #, c-format
 msgid "Unable to send message to %s. Could not create the conference (%s)."
 msgstr ""
 "�亠 �亟舒���� 仂�仗�舒于亳�� �仂仂弍�亠仆亳亠 亟仍� %s. �亠 �亟舒仍仂�� �仂亰亟舒�� 从仂仆�亠�亠仆�亳� (%s)."
 
-#: src/protocols/novell/novell.c:516
+#: src/protocols/novell/novell.c:520
 #, c-format
 msgid "Unable to send message. Could not create the conference (%s)."
 msgstr "�亠 �亟舒���� 仂�仗�舒于亳�� �仂仂弍�亠仆亳亠. �亠 �亟舒仍仂�� �仂亰亟舒�� 从仂仆�亠�亠仆�亳� (%s)."
 
-#: src/protocols/novell/novell.c:563
+#: src/protocols/novell/novell.c:567
 #, c-format
 msgid ""
 "Unable to move user %s to folder %s in the server side list. Error while "
@@ -7095,7 +7141,7 @@
 "�亠 �亟舒���� 仗亠�亠仄亠��亳�� 仗仂仍�亰仂于舒�亠仍� %s 于 仗舒仗从� %s 于 �仗亳�从亠 仆舒 ��仂�仂仆亠 "
 "�亠�于亠�舒. ��亳弍从舒 仗�亳 �仂亰亟舒仆亳亳 仗舒仗从亳 (%s)."
 
-#: src/protocols/novell/novell.c:611
+#: src/protocols/novell/novell.c:615
 #, c-format
 msgid ""
 "Unable to add %s to your buddy list. Error creating folder in server side "
@@ -7104,47 +7150,47 @@
 "�亠 �亟舒���� 亟仂弍舒于亳�� %s 于 �仗亳�仂从 从仂仆�舒从�仂于. ��亳弍从舒 �仂亰亟舒仆亳� 仗舒仗从亳 于 �仗亳�从亠 仆舒 "
 "��仂�仂仆亠 �亠�于亠�舒 (%s)."
 
-#: src/protocols/novell/novell.c:683
+#: src/protocols/novell/novell.c:687
 #, c-format
 msgid "Could not get details for user %s (%s)."
 msgstr "�亠 �亟舒仍仂�� 仗仂仍��亳�� 仗仂亟�仂弍仆仂��亳 亟仍� 仗仂仍�亰仂于舒�亠仍� %s (%s)."
 
-#: src/protocols/novell/novell.c:729 src/protocols/novell/novell.c:875
+#: src/protocols/novell/novell.c:733 src/protocols/novell/novell.c:879
 #, c-format
 msgid "Unable to add user to privacy list (%s)."
 msgstr "�亠 �亟舒���� 亟仂弍舒于亳�� 仗仂仍�亰仂于舒�亠仍� 于 �仗亳�仂从 从仂仆�亳亟亠仆�亳舒仍�仆仂��亳 (%s)."
 
-#: src/protocols/novell/novell.c:776
+#: src/protocols/novell/novell.c:780
 #, c-format
 msgid "Unable to add %s to deny list (%s)."
 msgstr "�亠 �亟舒���� 亟仂弍舒于亳�� %s 于 �仗亳�仂从 亰舒仗�亠�舒 (%s)."
 
-#: src/protocols/novell/novell.c:829
+#: src/protocols/novell/novell.c:833
 #, c-format
 msgid "Unable to add %s to permit list (%s)."
 msgstr "�亠 �亟舒���� 亟仂弍舒于亳�� %s 于 �仗亳�仂从 亟仂仗��从舒 (%s)."
 
-#: src/protocols/novell/novell.c:897
+#: src/protocols/novell/novell.c:901
 #, c-format
 msgid "Unable to remove %s from privacy list (%s)."
 msgstr "�亠 �亟舒���� �亟舒仍亳�� %s 亳亰 �仗亳�从舒 从仂仆�亳亟亠仆�亳舒仍�仆仂��亳 (%s)."
 
-#: src/protocols/novell/novell.c:920 src/protocols/novell/novell.c:1574
+#: src/protocols/novell/novell.c:924 src/protocols/novell/novell.c:1594
 #, c-format
 msgid "Unable to change server side privacy settings (%s)."
 msgstr ""
 "�亠 �亟舒���� 亳亰仄亠仆亳�� ���舒仆仂于从亳 从仂仆�亳亟亠仆�亳舒仍�仆仂��亳 仆舒 ��仂�仂仆亠 �亠�于亠�舒 (%s)."
 
-#: src/protocols/novell/novell.c:992
+#: src/protocols/novell/novell.c:996
 #, c-format
 msgid "Unable to create conference (%s)."
 msgstr "�亠 �亟舒���� �仂亰亟舒�� 从仂仆�亠�亠仆�亳� (%s)."
 
-#: src/protocols/novell/novell.c:1103 src/protocols/novell/novell.c:1613
+#: src/protocols/novell/novell.c:1107 src/protocols/novell/novell.c:1633
 msgid "Error communicating with server. Closing connection."
 msgstr "��亳弍从舒 �于�亰亳 � �亠�于亠�仂仄. �舒从���亳亠 �仂亠亟亳仆亠仆亳�."
 
-#: src/protocols/novell/novell.c:1426
+#: src/protocols/novell/novell.c:1446
 msgid "Userid"
 msgstr "�亟亠仆�亳�亳从舒�仂� 仗仂仍�亰仂于舒�亠仍�"
 
@@ -7155,46 +7201,46 @@
 #. tag, value);
 #. }
 #.
-#: src/protocols/novell/novell.c:1440
+#: src/protocols/novell/novell.c:1460
 msgid "Full name"
 msgstr "�仂仍仆仂亠 �仄�"
 
-#: src/protocols/novell/novell.c:1460
+#: src/protocols/novell/novell.c:1480
 msgid "User Properties"
 msgstr "弌于仂亶��于舒 仗仂仍�亰仂于舒�亠仍�"
 
-#: src/protocols/novell/novell.c:1564
+#: src/protocols/novell/novell.c:1584
 #, c-format
 msgid "GroupWise Conference %d"
 msgstr "�仂仆�亠�亠仆�亳� GroupWise %d"
 
-#: src/protocols/novell/novell.c:1589
+#: src/protocols/novell/novell.c:1609
 msgid "Unable to make SSL connection to server."
 msgstr "�亠 �亟舒���� ���舒仆仂于亳�� SSL-�仂亠亟亳仆亠仆亳亠 � �亠�于亠�仂仄."
 
-#: src/protocols/novell/novell.c:1619
+#: src/protocols/novell/novell.c:1639
 #, c-format
 msgid "Error processing event or response (%s)."
 msgstr "��亳弍从舒 仂弍�舒弍仂�从亳 �仂弍��亳� 亳仍亳 仂�于亠�舒 (%s)."
 
-#: src/protocols/novell/novell.c:1653
+#: src/protocols/novell/novell.c:1673
 msgid "Authenticating..."
 msgstr "�亟亠仆�亳�亳从舒�亳�..."
 
-#: src/protocols/novell/novell.c:1668
+#: src/protocols/novell/novell.c:1688
 msgid "Waiting for response..."
 msgstr "�亢亳亟舒仆亳亠 仂�于亠�舒..."
 
-#: src/protocols/novell/novell.c:1803
+#: src/protocols/novell/novell.c:1823
 #, c-format
 msgid "%s has been invited to this conversation."
 msgstr "%s 弍�仍 仗�亳亞仍舒��仆 从 ��仂亶 弍亠�亠亟亠."
 
-#: src/protocols/novell/novell.c:1830
+#: src/protocols/novell/novell.c:1850
 msgid "Invitation to Conversation"
 msgstr "��亳亞仍舒�亠仆亳亠 从 弍亠�亠亟亠"
 
-#: src/protocols/novell/novell.c:1831
+#: src/protocols/novell/novell.c:1851
 #, c-format
 msgid ""
 "Invitation from: %s\n"
@@ -7205,15 +7251,15 @@
 "\n"
 "��仗�舒于仍亠仆仂: %s"
 
-#: src/protocols/novell/novell.c:1833
+#: src/protocols/novell/novell.c:1853
 msgid "Would you like to join the conversation?"
 msgstr "�� �仂�亠仍亳 弍� 仗�亳�仂亠亟亳仆亳���� 从 弍亠�亠亟亠?"
 
-#: src/protocols/novell/novell.c:1938
+#: src/protocols/novell/novell.c:1956
 msgid "You have been logged out because you logged in at another workstation."
 msgstr "�� 弍�仍亳 仂�从仍��亠仆�, �舒从 从舒从 于仂�仍亳 � 亟��亞仂亶 仄舒�亳仆�."
 
-#: src/protocols/novell/novell.c:1992
+#: src/protocols/novell/novell.c:2010
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
@@ -7225,7 +7271,7 @@
 #. *  gaim_request_fields(gc, _("Server Address"),...);
 #.
 #. ...but for now just error out with a nice message.
-#: src/protocols/novell/novell.c:2090
+#: src/protocols/novell/novell.c:2108
 msgid ""
 "Unable to connect to server. Please enter the address of the server you wish "
 "to connect to."
@@ -7233,30 +7279,30 @@
 "�亠 �亟舒���� �仂亠亟亳仆亳���� � �亠�于亠�仂仄. �于亠亟亳�亠 舒亟�亠� �亠�于亠�舒, � 从仂�仂��仄 于� "
 "�仂�亳�亠 �仂亠亟亳仆亳����."
 
-#: src/protocols/novell/novell.c:2112
+#: src/protocols/novell/novell.c:2130
 msgid "Error. SSL support is not installed."
 msgstr "��亳弍从舒. �仂亟亟亠�亢从舒 SSL 仆亠 ���舒仆仂于仍亠仆舒."
 
-#: src/protocols/novell/novell.c:2421
+#: src/protocols/novell/novell.c:2434
 msgid "This conference has been closed. No more messages can be sent."
 msgstr ""
 "亅�舒 从仂仆�亠�亠仆�亳� 弍�仍舒 亰舒从���舒. �仂仍��亠 仆亠 仄仂亢亠� 弍��� 仂�仗�舒于仍亠仆仂 仆亳 仂亟仆仂亞仂 "
 "�仂仂弍�亠仆亳�."
 
-#: src/protocols/novell/novell.c:2733 src/protocols/oscar/oscar.c:586
-#: src/protocols/oscar/oscar.c:6499 src/protocols/yahoo/yahoo.c:2513
+#: src/protocols/novell/novell.c:2780 src/protocols/oscar/oscar.c:570
+#: src/protocols/oscar/oscar.c:6502 src/protocols/yahoo/yahoo.c:2556
 msgid "Offline"
 msgstr "�亠 于 �亠�亳"
 
-#: src/protocols/novell/novell.c:2744
+#: src/protocols/novell/novell.c:2791
 msgid "Message"
 msgstr "弌仂仂弍�亠仆亳亠:"
 
-#: src/protocols/novell/novell.c:2843 src/protocols/novell/novell.c:2899
+#: src/protocols/novell/novell.c:2890 src/protocols/novell/novell.c:2946
 msgid "Appear Offline"
 msgstr "�亠�仂��仆仂 仆亠 于 �亠�亳"
 
-#: src/protocols/novell/novell.c:3293
+#: src/protocols/novell/novell.c:3340
 msgid "Initiate _Chat"
 msgstr "�舒�舒�� �舒亰亞仂于仂�"
 
@@ -7271,15 +7317,15 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/novell/novell.c:3389 src/protocols/novell/novell.c:3391
+#: src/protocols/novell/novell.c:3436 src/protocols/novell/novell.c:3438
 msgid "Novell GroupWise Messenger Protocol Plugin"
 msgstr "�仂亟�仍� 仗�仂�仂从仂仍舒 Novell GroupWise Messenger"
 
-#: src/protocols/novell/novell.c:3410
+#: src/protocols/novell/novell.c:3457
 msgid "Server address"
 msgstr "�亟�亠� �亠�于亠�舒"
 
-#: src/protocols/novell/novell.c:3414
+#: src/protocols/novell/novell.c:3461
 msgid "Server port"
 msgstr "�仂�� �亠�于亠�舒"
 
@@ -7379,7 +7425,7 @@
 msgid "Not while on AOL"
 msgstr "�亠 于 AOL"
 
-#: src/protocols/oscar/oscar.c:403
+#: src/protocols/oscar/oscar.c:400
 #, fuzzy
 msgid ""
 "(There was an error converting this message.  The buddy you are speaking to "
@@ -7388,157 +7434,157 @@
 "(��亳弍从舒 仗�亠仂弍�舒亰仂于舒仆亳� ��仂亞仂 �仂仂弍�亠仆亳�. ��仂于亠���亠 仗舒�舒仄亠�� \"�仂亟亳�仂于从舒\" 于 "
 "�亠亟舒从�仂�亠 ����仆�� 亰舒仗亳�亠亶)"
 
-#: src/protocols/oscar/oscar.c:441
+#: src/protocols/oscar/oscar.c:425
 msgid "Voice"
 msgstr "�仂仍仂�"
 
-#: src/protocols/oscar/oscar.c:444
+#: src/protocols/oscar/oscar.c:428
 msgid "AIM Direct IM"
 msgstr "���仄仂亠 �仂亠亟亳仆亠仆亳亠 AIM"
 
-#: src/protocols/oscar/oscar.c:447 src/protocols/silc/silc.c:635
+#: src/protocols/oscar/oscar.c:431 src/protocols/silc/silc.c:635
 #: src/protocols/silc/util.c:506
 msgid "Chat"
 msgstr "丼舒�"
 
-#: src/protocols/oscar/oscar.c:450 src/protocols/oscar/oscar.c:6803
+#: src/protocols/oscar/oscar.c:434 src/protocols/oscar/oscar.c:6804
 msgid "Get File"
 msgstr "�仂仍��亳�� �舒亶仍"
 
-#: src/protocols/oscar/oscar.c:457
+#: src/protocols/oscar/oscar.c:441
 msgid "Games"
 msgstr "�亞��"
 
-#: src/protocols/oscar/oscar.c:460
+#: src/protocols/oscar/oscar.c:444
 msgid "Add-Ins"
 msgstr "�仂仗仂仍仆亠仆亳�"
 
-#: src/protocols/oscar/oscar.c:463
+#: src/protocols/oscar/oscar.c:447
 msgid "Send Buddy List"
 msgstr "��仗�舒于亳�� �仗亳�仂从 从仂仆�舒从�仂于"
 
-#: src/protocols/oscar/oscar.c:466
+#: src/protocols/oscar/oscar.c:450
 msgid "ICQ Direct Connect"
 msgstr "���仄仂亠 �仂亠亟亳仆亠仆亳亠 ICQ"
 
-#: src/protocols/oscar/oscar.c:469
+#: src/protocols/oscar/oscar.c:453
 msgid "AP User"
 msgstr "�仂仍�亰仂于舒�亠仍� AP"
 
-#: src/protocols/oscar/oscar.c:472
+#: src/protocols/oscar/oscar.c:456
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
-#: src/protocols/oscar/oscar.c:475
+#: src/protocols/oscar/oscar.c:459
 msgid "Nihilist"
 msgstr "�亳亞亳仍亳��"
 
-#: src/protocols/oscar/oscar.c:478
+#: src/protocols/oscar/oscar.c:462
 msgid "ICQ Server Relay"
 msgstr "�亠仍亠亶仆�亶 �亠�于亠� ICQ"
 
-#: src/protocols/oscar/oscar.c:481
+#: src/protocols/oscar/oscar.c:465
 msgid "Old ICQ UTF8"
 msgstr "弌�舒��亶 ICQ UTF8"
 
+#: src/protocols/oscar/oscar.c:468
+msgid "Trillian Encryption"
+msgstr "�仂亟亳�仂于舒仆亳亠 Trillian"
+
+#: src/protocols/oscar/oscar.c:471
+msgid "ICQ UTF8"
+msgstr "ICQ UTF8"
+
+#: src/protocols/oscar/oscar.c:474
+msgid "Hiptop"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:477
+msgid "Security Enabled"
+msgstr "�亠亰仂仗舒�仆仂��� 于从仍��亠仆舒"
+
+#: src/protocols/oscar/oscar.c:480
+msgid "Video Chat"
+msgstr "�亳亟亠仂�舒�"
+
 #: src/protocols/oscar/oscar.c:484
-msgid "Trillian Encryption"
-msgstr "�仂亟亳�仂于舒仆亳亠 Trillian"
+msgid "iChat AV"
+msgstr "iChat AV"
 
 #: src/protocols/oscar/oscar.c:487
-msgid "ICQ UTF8"
-msgstr "ICQ UTF8"
+msgid "Live Video"
+msgstr "�亳于仂亠 于亳亟亠仂"
 
 #: src/protocols/oscar/oscar.c:490
-msgid "Hiptop"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:493
-msgid "Security Enabled"
-msgstr "�亠亰仂仗舒�仆仂��� 于从仍��亠仆舒"
-
-#: src/protocols/oscar/oscar.c:496
-msgid "Video Chat"
-msgstr "�亳亟亠仂�舒�"
-
-#: src/protocols/oscar/oscar.c:500
-msgid "iChat AV"
-msgstr "iChat AV"
-
-#: src/protocols/oscar/oscar.c:503
-msgid "Live Video"
-msgstr "�亳于仂亠 于亳亟亠仂"
-
-#: src/protocols/oscar/oscar.c:506
 msgid "Camera"
 msgstr "�舒仄亠�舒"
 
-#: src/protocols/oscar/oscar.c:524 src/protocols/oscar/oscar.c:5496
-#: src/protocols/oscar/oscar.c:6693
+#: src/protocols/oscar/oscar.c:508 src/protocols/oscar/oscar.c:5498
+#: src/protocols/oscar/oscar.c:6696
 msgid "Free For Chat"
 msgstr "�仂�仂于 仗仂仂弍�舒����"
 
-#: src/protocols/oscar/oscar.c:528 src/protocols/oscar/oscar.c:5490
-#: src/protocols/oscar/oscar.c:6691
+#: src/protocols/oscar/oscar.c:512 src/protocols/oscar/oscar.c:5492
+#: src/protocols/oscar/oscar.c:6694
 msgid "Not Available"
 msgstr "�亠亟仂���仗亠仆"
 
-#: src/protocols/oscar/oscar.c:530 src/protocols/oscar/oscar.c:5493
-#: src/protocols/oscar/oscar.c:6692
+#: src/protocols/oscar/oscar.c:514 src/protocols/oscar/oscar.c:5495
+#: src/protocols/oscar/oscar.c:6695
 msgid "Occupied"
 msgstr "�舒仆��"
 
-#: src/protocols/oscar/oscar.c:534
+#: src/protocols/oscar/oscar.c:518
 msgid "Web Aware"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:602
+#: src/protocols/oscar/oscar.c:586
 msgid "Capabilities"
 msgstr "�仂亰仄仂亢仆仂��亳"
 
-#: src/protocols/oscar/oscar.c:609
+#: src/protocols/oscar/oscar.c:595
 msgid "Buddy Comment"
 msgstr "�仂仄仄亠仆�舒�亳亶 仗仂仍�亰仂于舒�亠仍�"
 
-#: src/protocols/oscar/oscar.c:744
+#: src/protocols/oscar/oscar.c:730
 #, c-format
 msgid "Direct IM with %s closed"
 msgstr "���仄仂亠 �仂亠亟亳仆亠仆亳亠 � %s 亰舒从���仂"
 
-#: src/protocols/oscar/oscar.c:746
+#: src/protocols/oscar/oscar.c:732
 #, c-format
 msgid "Direct IM with %s failed"
 msgstr "�亠 �亟舒仍仂�� �仂亰亟舒�� 仗��仄仂亠 �仂亠亟亳仆亠仆亳亠 � %s"
 
-#: src/protocols/oscar/oscar.c:753
+#: src/protocols/oscar/oscar.c:739
 msgid "Direct Connect failed"
 msgstr "�亠 �亟舒仍仂�� �仂亰亟舒�� 仗��仄仂亠 �仂亠亟亳仆亠仆亳亠"
 
-#: src/protocols/oscar/oscar.c:830 src/protocols/oscar/oscar.c:961
+#: src/protocols/oscar/oscar.c:816 src/protocols/oscar/oscar.c:947
 #, c-format
 msgid "Direct IM with %s established"
 msgstr "���仄仂亠 �仂亠亟亳仆亠仆亳亠 � %s ���舒仆仂于仍亠仆仂"
 
-#: src/protocols/oscar/oscar.c:911
+#: src/protocols/oscar/oscar.c:897
 #, c-format
 msgid "Attempting to connect to %s at %s:%hu for Direct IM."
 msgstr "�仂仗��从舒 �仂亰亟舒仆亳� 仗��仄仂亞仂 �仂亠亟亳仆亠仆亳� � %s 于 %s:%hu."
 
-#: src/protocols/oscar/oscar.c:1328
+#: src/protocols/oscar/oscar.c:1314
 #, c-format
 msgid "Asking %s to connect to us at %s:%hu for Direct IM."
 msgstr "�舒仗�仂� �仂亰亟舒仆亳� 仗��仄仂亞仂 �仂亠亟亳仆亠仆亳� %s � 仆舒仄亳 于 %s:%hu."
 
-#: src/protocols/oscar/oscar.c:1333
+#: src/protocols/oscar/oscar.c:1319
 msgid "Unable to open Direct IM"
 msgstr "�亠 �亟舒���� 仂�从���� 仗��仄仂亠 �仂亠亟亳仆亠仆亳亠"
 
-#: src/protocols/oscar/oscar.c:1368
+#: src/protocols/oscar/oscar.c:1354
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr "�� 于�弍�舒仍亳 仂�从���亳亠 仗��仄仂亞仂 �仂亠亟亳仆亠仆亳� � %s."
 
-#: src/protocols/oscar/oscar.c:1372
+#: src/protocols/oscar/oscar.c:1358
 msgid ""
 "Because this reveals your IP address, it may be considered a privacy risk.  "
 "Do you wish to continue?"
@@ -7546,24 +7592,24 @@
 "丐舒从 从舒从 ��仂 仂弍仆舒��亢亳� 于舒� IP-舒亟�亠�, ��仂 仄仂亢仆仂 ��亳�舒�� �亞�仂亰仂亶 "
 "从仂仆�亳亟亠仆�亳舒仍�仆仂��亳. 丱仂�亳�亠 仗�仂亟仂仍亢亳��?"
 
-#: src/protocols/oscar/oscar.c:1376 src/protocols/oscar/oscar.c:3329
+#: src/protocols/oscar/oscar.c:1362 src/protocols/oscar/oscar.c:3320
 msgid "Connect"
 msgstr "弌仂亠亟亳仆亳����"
 
-#: src/protocols/oscar/oscar.c:1442 src/protocols/toc/toc.c:872
+#: src/protocols/oscar/oscar.c:1429 src/protocols/toc/toc.c:873
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "�� 弍�仍亳 仂��仂亠亟亳仆亠仆� 仂� �舒�舒 %s."
 
-#: src/protocols/oscar/oscar.c:1458
+#: src/protocols/oscar/oscar.c:1448
 msgid "Chat is currently unavailable"
 msgstr "丼舒� �亠亶�舒� 仆亠亟仂���仗亠仆"
 
-#: src/protocols/oscar/oscar.c:1539
+#: src/protocols/oscar/oscar.c:1529
 msgid "Screen name sent"
 msgstr "�亟亠仆�亳�亳从舒�仂� 仗仂仍�亰仂于舒�亠仍� 仂�仗�舒于仍亠仆"
 
-#: src/protocols/oscar/oscar.c:1553
+#: src/protocols/oscar/oscar.c:1543
 #, c-format
 msgid ""
 "Unable to login: Could not sign on as %s because the screen name is "
@@ -7571,46 +7617,46 @@
 "letters, numbers and spaces, or contain only numbers."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1581
+#: src/protocols/oscar/oscar.c:1571
 msgid "Unable to login to AIM"
 msgstr "�亠 �亟舒���� 于仂亶�亳 于 �亠�� AIM"
 
-#: src/protocols/oscar/oscar.c:1682 src/protocols/oscar/oscar.c:2119
+#: src/protocols/oscar/oscar.c:1672 src/protocols/oscar/oscar.c:2109
 msgid "Could Not Connect"
 msgstr "�亠 �亟舒仍仂�� ���舒仆仂于亳�� �仂亠亟亳仆亠仆亳亠"
 
-#: src/protocols/oscar/oscar.c:1690
+#: src/protocols/oscar/oscar.c:1680
 msgid "Connection established, cookie sent"
 msgstr "弌仂亠亟亳仆亠仆亳亠 ���舒仆仂于仍亠仆仂, 亟舒仆仆�亠 仂�仗�舒于仍亠仆�"
 
-#: src/protocols/oscar/oscar.c:1803 src/protocols/yahoo/yahoo_filexfer.c:180
+#: src/protocols/oscar/oscar.c:1793 src/protocols/yahoo/yahoo_filexfer.c:180
 #: src/protocols/yahoo/yahoo_filexfer.c:189
 #: src/protocols/yahoo/yahoo_filexfer.c:199
 msgid "Unable to establish file descriptor."
 msgstr "�亠 �亟舒���� ���舒仆仂于亳�� 亟亠�从�亳仗�仂� �舒亶仍舒."
 
-#: src/protocols/oscar/oscar.c:1808
+#: src/protocols/oscar/oscar.c:1798
 msgid "Unable to create new connection."
 msgstr "�亠 �亟舒���� �仂亰亟舒�� 仆仂于仂亠 �仂亠亟亳仆亠仆亳亠."
 
-#: src/protocols/oscar/oscar.c:1879
+#: src/protocols/oscar/oscar.c:1869
 msgid "Unable to establish listener socket."
 msgstr "�亠 �亟舒���� ���舒仆仂于亳�� �仂从亠� 亟仍� 仗�仂�仍��亳于舒仆亳�."
 
-#: src/protocols/oscar/oscar.c:2003 src/protocols/toc/toc.c:541
+#: src/protocols/oscar/oscar.c:1993 src/protocols/toc/toc.c:541
 msgid "Incorrect nickname or password."
 msgstr "�亠从仂��亠从�仆�亶 仗�亠于亟仂仆亳仄 亳仍亳 仗舒�仂仍�."
 
-#: src/protocols/oscar/oscar.c:2008
+#: src/protocols/oscar/oscar.c:1998
 msgid "Your account is currently suspended."
 msgstr "�舒�舒 ����仆舒� 亰舒仗亳�� �亠亶�舒� 亰舒弍仍仂从亳�仂于舒仆舒."
 
 #. service temporarily unavailable
-#: src/protocols/oscar/oscar.c:2012
+#: src/protocols/oscar/oscar.c:2002
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "弌仍�亢弍舒 AOL Instant Messenger 于�亠仄亠仆仆仂 仆亠亟仂���仗仆舒."
 
-#: src/protocols/oscar/oscar.c:2017
+#: src/protocols/oscar/oscar.c:2007
 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."
@@ -7618,21 +7664,21 @@
 "�� �仂亠亟亳仆�仍亳�� 亳 仂��仂亠亟亳仆�仍亳�� �仍亳�从仂仄 �舒��仂. �仂亟仂亢亟亳�亠 10 仄亳仆�� 亳 "
 "仗仂仗��舒亶�亠�� �仆仂于舒. ��仍亳 于� 仗�仂亟仂仍亢亳�亠 仗仂仗��从亳, 于舒仄 仗�亳亟���� 亢亟舒�� 亠�� 亟仂仍��亠."
 
-#: src/protocols/oscar/oscar.c:2022
+#: src/protocols/oscar/oscar.c:2012
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr "�亠��亳� 从仍亳亠仆�舒, 从仂�仂�仂亶 于� 仗仂仍�亰�亠�亠��, �仍亳�从仂仄 ��舒�舒. �弍仆仂于亳�亠 亟仂 %s"
 
-#: src/protocols/oscar/oscar.c:2054
+#: src/protocols/oscar/oscar.c:2044
 msgid "Internal Error"
 msgstr "�仆���亠仆仆�� 仂�亳弍从舒"
 
-#: src/protocols/oscar/oscar.c:2126
+#: src/protocols/oscar/oscar.c:2116
 msgid "Received authorization"
 msgstr "��亳仆��舒 舒于�仂�亳亰舒�亳�"
 
-#: src/protocols/oscar/oscar.c:2162 src/protocols/oscar/oscar.c:2192
-#: src/protocols/oscar/oscar.c:2280
+#: src/protocols/oscar/oscar.c:2152 src/protocols/oscar/oscar.c:2182
+#: src/protocols/oscar/oscar.c:2271
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
@@ -7641,24 +7687,24 @@
 "�� 仄仂亢亠�亠 弍��� �从仂�仂 仂��仂亠亟亳仆亠仆�. �仂亰仄仂亢仆仂, 于� 亰舒�仂�亳�亠 亳�仗仂仍�亰仂于舒�� TOC, "
 "仗仂从舒 ��仂 仆亠 弍�亟亠� 亳�仗�舒于仍亠仆仂. 弌仄仂��亳�亠 仂弍仆仂于仍亠仆亳� 仆舒 %s."
 
-#: src/protocols/oscar/oscar.c:2165 src/protocols/oscar/oscar.c:2195
+#: src/protocols/oscar/oscar.c:2155 src/protocols/oscar/oscar.c:2185
 msgid "Gaim was unable to get a valid AIM login hash."
 msgstr "Gaim 仆亠 �亟舒仍仂�� 仗仂仍��亳�� 亟仂仗���亳仄�亶 ��� 于�仂亟舒 AIM."
 
-#: src/protocols/oscar/oscar.c:2283
+#: src/protocols/oscar/oscar.c:2274
 msgid "Gaim was unable to get a valid login hash."
 msgstr "Gaim 仆亠 �亟舒仍仂�� 仗仂仍��亳�� 亟仂仗���亳仄�亶 ��� 于�仂亟舒."
 
-#: src/protocols/oscar/oscar.c:3113 src/protocols/oscar/oscar.c:3135
+#: src/protocols/oscar/oscar.c:3104 src/protocols/oscar/oscar.c:3126
 msgid "(There was an error receiving this message)"
 msgstr "(��亳 仗�亳�仄亠 ��仂亞仂 �仂仂弍�亠仆亳� 弍�仍舒 仂�亳弍从舒)"
 
-#: src/protocols/oscar/oscar.c:3321
+#: src/protocols/oscar/oscar.c:3312
 #, c-format
 msgid "%s has just asked to directly connect to %s"
 msgstr "%s 亰舒仗�仂�亳仍 仗��仄仂亠 �仂亠亟亳仆亠仆亳亠 � %s"
 
-#: src/protocols/oscar/oscar.c:3324
+#: src/protocols/oscar/oscar.c:3315
 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 "
@@ -7668,19 +7714,19 @@
 "仆亠仂弍�仂亟亳仄�仄 亟仍� 亳亰仂弍�舒亢亠仆亳亶. 丐舒从 从舒从 于舒� IP-舒亟�亠� 弍�亟亠� 仂弍仆舒��亢亠仆, ��仂 仄仂亢仆仂 "
 "��亳�舒�� �亞�仂亰仂亶 从仂仆�亳亟亠仆�亳舒仍�仆仂��亳."
 
-#: src/protocols/oscar/oscar.c:3360
+#: src/protocols/oscar/oscar.c:3351
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3368
+#: src/protocols/oscar/oscar.c:3359
 msgid "Authorization Request Message:"
 msgstr "弌仂仂弍�亠仆亳亠 亰舒仗�仂�舒 舒于�仂�亳亰舒�亳亳:"
 
-#: src/protocols/oscar/oscar.c:3369
+#: src/protocols/oscar/oscar.c:3360
 msgid "Please authorize me!"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3399
+#: src/protocols/oscar/oscar.c:3390
 #, c-format
 msgid ""
 "The user %s requires authorization before being added to a buddy list.  Do "
@@ -7689,23 +7735,23 @@
 "�仂仍�亰仂于舒�亠仍� %s ��亠弍�亠� 舒于�仂�亳亰舒�亳� 仗亠�亠亟 亟仂弍舒于仍亠仆亳亠仄 亠亞仂 于 �仗亳�仂从 "
 "从仂仆�舒从�仂于. 丱仂�亳�亠 仂�仗�舒于亳�� 亰舒仗�仂� 舒于�仂�亳亰舒�亳亳?"
 
-#: src/protocols/oscar/oscar.c:3404 src/protocols/oscar/oscar.c:3406
+#: src/protocols/oscar/oscar.c:3395 src/protocols/oscar/oscar.c:3397
 msgid "Request Authorization"
 msgstr "�舒仗�仂�亳�� 舒于�仂�亳亰舒�亳�"
 
-#: src/protocols/oscar/oscar.c:3454 src/protocols/oscar/oscar.c:3456
-#: src/protocols/oscar/oscar.c:3463 src/protocols/oscar/oscar.c:3545
-#: src/protocols/oscar/oscar.c:3565 src/protocols/oscar/oscar.c:3919
-#: src/protocols/oscar/oscar.c:3979 src/protocols/oscar/oscar.c:6118
-#: src/protocols/oscar/oscar.c:6164
+#: src/protocols/oscar/oscar.c:3445 src/protocols/oscar/oscar.c:3447
+#: src/protocols/oscar/oscar.c:3454 src/protocols/oscar/oscar.c:3536
+#: src/protocols/oscar/oscar.c:3556 src/protocols/oscar/oscar.c:3908
+#: src/protocols/oscar/oscar.c:3965 src/protocols/oscar/oscar.c:3969
+#: src/protocols/oscar/oscar.c:6123 src/protocols/oscar/oscar.c:6169
 msgid "No reason given."
 msgstr "��亳�亳仆舒 仆亠 �从舒亰舒仆舒."
 
-#: src/protocols/oscar/oscar.c:3462
+#: src/protocols/oscar/oscar.c:3453
 msgid "Authorization Denied Message:"
 msgstr "弌仂仂弍�亠仆亳亠 仂�从舒亰舒 于 舒于�仂�亳亰舒�亳亳:"
 
-#: src/protocols/oscar/oscar.c:3545
+#: src/protocols/oscar/oscar.c:3536
 #, c-format
 msgid ""
 "The user %u wants to add you to their buddy list for the following reason:\n"
@@ -7715,11 +7761,11 @@
 "仗�亳�亳仆亠:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3553 src/protocols/oscar/oscar.c:6124
+#: src/protocols/oscar/oscar.c:3544 src/protocols/oscar/oscar.c:6129
 msgid "Authorization Request"
 msgstr "�舒仗�仂� 舒于�仂�亳亰舒�亳亳"
 
-#: src/protocols/oscar/oscar.c:3565
+#: src/protocols/oscar/oscar.c:3556
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -7730,17 +7776,17 @@
 "仗�亳�亳仆亠:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3566
+#: src/protocols/oscar/oscar.c:3557
 msgid "ICQ authorization denied."
 msgstr "� 舒于�仂�亳亰舒�亳亳 ICQ 仂�从舒亰舒仆仂."
 
 #. Someone has granted you authorization
-#: src/protocols/oscar/oscar.c:3573
+#: src/protocols/oscar/oscar.c:3564
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
 msgstr "�仂仍�亰仂于舒�亠仍� %u 亟舒仍 �于仂� �仂亞仍舒�亳亠 亟仂弍舒于亳�� 亠亞仂 于 于舒� �仗亳�仂从 从仂仆�舒从�仂于."
 
-#: src/protocols/oscar/oscar.c:3581
+#: src/protocols/oscar/oscar.c:3572
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -7753,7 +7799,7 @@
 "��: %s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3589
+#: src/protocols/oscar/oscar.c:3580
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -7766,7 +7812,7 @@
 "��: %s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3597
+#: src/protocols/oscar/oscar.c:3588
 #, c-format
 msgid ""
 "You have received an ICQ email from %s [%s]\n"
@@ -7779,27 +7825,27 @@
 "弌仂仂弍�亠仆亳亠:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3618
+#: src/protocols/oscar/oscar.c:3609
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
 msgstr "�仂仍�亰仂于舒�亠仍� ICQ %u 仂�仗�舒于亳仍 于舒仄 从仂仆�舒从�: %s (%s)"
 
-#: src/protocols/oscar/oscar.c:3624
+#: src/protocols/oscar/oscar.c:3615
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr "丱仂�亳�亠 亟仂弍舒于亳�� ��仂亞仂 仗仂仍�亰仂于舒�亠仍� 于 �仗亳�仂从 从仂仆�舒从�仂于?"
 
-#: src/protocols/oscar/oscar.c:3628
+#: src/protocols/oscar/oscar.c:3619
 msgid "Decline"
 msgstr "��从仍仂仆亳��"
 
-#: src/protocols/oscar/oscar.c:3713
+#: src/protocols/oscar/oscar.c:3703
 #, c-format
 msgid "You missed %hu message from %s because it was invalid."
 msgid_plural "You missed %hu messages from %s because they were invalid."
 msgstr[0] "�� 仆亠 仗仂仍��亳仍亳 %hu �仂仂弍�亠仆亳亠 仂� %s, �舒从 从舒从 仂仆仂 弍�仍仂 仆亠从仂��亠从�仆仂."
 msgstr[1] "�� 仆亠 仗仂仍��亳仍亳 %hu �仂仂弍�亠仆亳亶 仂� %s, �舒从 从舒从 仂仆亳 弍�仍亳 仆亠从仂��亠从�仆�."
 
-#: src/protocols/oscar/oscar.c:3722
+#: src/protocols/oscar/oscar.c:3712
 #, 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."
@@ -7808,7 +7854,7 @@
 msgstr[1] ""
 "�� 仆亠 仗仂仍��亳仍亳 %hu �仂仂弍�亠仆亳亶 仂� %s, �舒从 从舒从 仂仆亳 弍�仍亳 �仍亳�从仂仄 于亠仍亳从亳."
 
-#: src/protocols/oscar/oscar.c:3731
+#: src/protocols/oscar/oscar.c:3721
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -7819,7 +7865,7 @@
 msgstr[1] ""
 "�� 仆亠 仗仂仍��亳仍亳 %hu �仂仂弍�亠仆亳亶 仂� %s, �舒从 从舒从 弍�仍 仗�亠于��亠仆 仗�亠亟亠仍 仂�亠仆从亳."
 
-#: src/protocols/oscar/oscar.c:3740
+#: src/protocols/oscar/oscar.c:3730
 #, 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."
@@ -7828,7 +7874,7 @@
 msgstr[1] ""
 "�� 仆亠 仗仂仍��亳仍亳 %hu �仂仂弍�亠仆亳亶 仂� %s, 仗仂�仂仄� ��仂 仂仆 �仍亳�从仂仄 仆舒亟仂亠亟仍亳于."
 
-#: src/protocols/oscar/oscar.c:3749
+#: src/protocols/oscar/oscar.c:3739
 #, 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."
@@ -7837,56 +7883,64 @@
 msgstr[1] ""
 "�� 仆亠 仗仂仍��亳仍亳 %hu �仂仂弍�亠仆亳亶 仂� %s, 仗仂�仂仄� ��仂 于� �仍亳�从仂仄 仆舒亟仂亠亟仍亳于�."
 
-#: src/protocols/oscar/oscar.c:3758
+#: src/protocols/oscar/oscar.c:3748
 #, c-format
 msgid "You missed %hu message from %s for an unknown reason."
 msgid_plural "You missed %hu messages from %s for an unknown reason."
 msgstr[0] "�� 仆亠 仗仂仍��亳仍亳 %hu �仂仂弍�亠仆亳亠 仂� %s 仗仂 仆亠亳亰于亠��仆仂亶 仗�亳�亳仆亠."
 msgstr[1] "�� 仆亠 仗仂仍��亳仍亳 %hu �仂仂弍�亠仆亳亶 仂� %s 仗仂 仆亠亳亰于亠��仆仂亶 仗�亳�亳仆亠."
 
-#: src/protocols/oscar/oscar.c:3815 src/protocols/oscar/oscar.c:4039
+#: src/protocols/oscar/oscar.c:3802 src/protocols/oscar/oscar.c:4031
 #, c-format
 msgid "Info for %s"
 msgstr "�仆�仂�仄舒�亳� 亟仍� %s"
 
-#: src/protocols/oscar/oscar.c:3881
+#: src/protocols/oscar/oscar.c:3868
 #, c-format
 msgid "SNAC threw error: %s\n"
 msgstr "SNAC 于�亰于舒仍 仂�亳弍从�: %s\n"
 
-#: src/protocols/oscar/oscar.c:3882
+#: src/protocols/oscar/oscar.c:3869
 msgid "Unknown error"
 msgstr "�亠亳亰于亠��仆舒� 仂�亳弍从舒"
 
-#. Data is assumed to be the destination sn
-#: src/protocols/oscar/oscar.c:3917
+#: src/protocols/oscar/oscar.c:3905
+msgid "Your message did not get sent."
+msgstr "�舒�亠 �仂仂弍�亠仆亳亠 仆亠 仂�仗�舒于仍亠仆仂."
+
+#: src/protocols/oscar/oscar.c:3906
 #, c-format
 msgid "Your message to %s did not get sent:"
-msgstr "�舒�亠 �仂仂弍�亠仆亳亠 亟仍� %s 仆亠 弍�仍仂 仂�仗�舒于仍亠仆仂:"
-
-#: src/protocols/oscar/oscar.c:3976
+msgstr "�舒�亠 �仂仂弍�亠仆亳亠 亟仍� %s 仆亠 仂�仗�舒于仍亠仆仂:"
+
+#: src/protocols/oscar/oscar.c:3965
+#, c-format
+msgid "User information not available: %s"
+msgstr "�仆�仂�仄舒�亳� 仂 仗仂仍�亰仂于舒�亠仍亠 仆亠亟仂���仗仆舒: %s"
+
+#: src/protocols/oscar/oscar.c:3967
 #, c-format
 msgid "User information for %s unavailable:"
 msgstr "�仆�仂�仄舒�亳� 仂 仗仂仍�亰仂于舒�亠仍亠 %s 仆亠亟仂���仗仆舒:"
 
-#: src/protocols/oscar/oscar.c:3999
+#: src/protocols/oscar/oscar.c:3991
 msgid "Warning Level"
 msgstr "丕�仂于亠仆� 仗�亠亟�仗�亠亢亟亠仆亳�"
 
-#: src/protocols/oscar/oscar.c:4002
+#: src/protocols/oscar/oscar.c:3994
 msgid "Online Since"
 msgstr "� �亠�亳 �"
 
-#: src/protocols/oscar/oscar.c:4006 src/protocols/yahoo/yahoo_profile.c:1118
+#: src/protocols/oscar/oscar.c:3998 src/protocols/yahoo/yahoo_profile.c:1118
 msgid "Member Since"
 msgstr "丼仍亠仆 �"
 
-#: src/protocols/oscar/oscar.c:4090
+#: src/protocols/oscar/oscar.c:4082
 msgid "Your AIM connection may be lost."
 msgstr "�舒�亠 �仂亠亟亳仆亠仆亳亠 AIM 仄仂亢亠� 弍��� �舒亰仂�于舒仆仂."
 
 #. The conversion failed!
-#: src/protocols/oscar/oscar.c:4276
+#: src/protocols/oscar/oscar.c:4268
 msgid ""
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
@@ -7894,11 +7948,11 @@
 "[�亠 �亟舒���� 仂�仂弍�舒亰亳�� �仂仂弍�亠仆亳亠 仂� ��仂亞仂 仗仂仍�亰仂于舒�亠仍�, �舒从 从舒从 仂仆仂 �仂亟亠�亢亳� "
 "仆亠亟仂仗���亳仄�亠 �亳仄于仂仍�.]"
 
-#: src/protocols/oscar/oscar.c:4494
+#: src/protocols/oscar/oscar.c:4488
 msgid "Rate limiting error."
 msgstr "��亳弍从舒 仂亞�舒仆亳�亠仆亳� 仗�亠亟亠仍舒."
 
-#: src/protocols/oscar/oscar.c:4495
+#: src/protocols/oscar/oscar.c:4489
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
@@ -7906,7 +7960,7 @@
 "�亠 �亟舒仍仂�� 于�仗仂仍仆亳�� 仗仂�仍亠亟仆亠亠 亟亠亶��于亳亠, �舒从 从舒从 于� 仗�亠于��亳仍亳 仗�亠亟亠仍. "
 "�仂亟仂亢亟亳�亠 10 �亠从�仆亟 亳 仗仂仗��舒亶�亠�� �仆仂于舒."
 
-#: src/protocols/oscar/oscar.c:4558
+#: src/protocols/oscar/oscar.c:4552
 msgid ""
 "You have been disconnected because you have signed on with this screen name "
 "at another location."
@@ -7914,113 +7968,113 @@
 "�� 弍�仍亳 仂��仂亠亟亳仆亠仆�, �舒从 从舒从 于仂�仍亳 � ��亳仄 亳亟亠仆�亳�亳从舒�仂�仂仄 仗仂仍�亰仂于舒�亠仍� 亳亰 "
 "亟��亞仂亞仂 仄亠��舒."
 
-#: src/protocols/oscar/oscar.c:4560
+#: src/protocols/oscar/oscar.c:4554
 msgid "You have been signed off for an unknown reason."
 msgstr "�� 弍�仍亳 仂�从仍��亠仆� 仗仂 仆亠亳亰于亠��仆仂亶 仗�亳�亳仆亠."
 
-#: src/protocols/oscar/oscar.c:4591
+#: src/protocols/oscar/oscar.c:4585
 msgid "Finalizing connection"
 msgstr "�舒于亠��亠仆亳亠 ���舒仆仂于仍亠仆亳� �仂亠亟亳仆亠仆亳�"
 
-#: src/protocols/oscar/oscar.c:4861 src/protocols/oscar/oscar.c:4868
+#: src/protocols/oscar/oscar.c:4856 src/protocols/oscar/oscar.c:4863
 msgid "Email Address"
 msgstr "�亟�亠� Email"
 
-#: src/protocols/oscar/oscar.c:4873 src/protocols/silc/util.c:538
+#: src/protocols/oscar/oscar.c:4868 src/protocols/silc/util.c:538
 msgid "Mobile Phone"
 msgstr "�仂弍亳仍�仆�亶 �亠仍亠�仂仆"
 
-#: src/protocols/oscar/oscar.c:4874
+#: src/protocols/oscar/oscar.c:4869
 msgid "Not specified"
 msgstr "�亠 �从舒亰舒仆仂"
 
-#: src/protocols/oscar/oscar.c:4875 src/protocols/trepia/trepia.c:281
+#: src/protocols/oscar/oscar.c:4870 src/protocols/trepia/trepia.c:281
 #: src/protocols/trepia/trepia.c:407
 msgid "Female"
 msgstr "�亠仆�亳仆舒"
 
-#: src/protocols/oscar/oscar.c:4875 src/protocols/trepia/trepia.c:280
+#: src/protocols/oscar/oscar.c:4870 src/protocols/trepia/trepia.c:280
 #: src/protocols/trepia/trepia.c:407
 msgid "Male"
 msgstr "��亢�亳仆舒"
 
-#: src/protocols/oscar/oscar.c:4891
+#: src/protocols/oscar/oscar.c:4886
 msgid "Personal Web Page"
 msgstr "�亠��仂仆舒仍�仆舒� Web-���舒仆亳�舒"
 
-#: src/protocols/oscar/oscar.c:4895
+#: src/protocols/oscar/oscar.c:4890
 msgid "Additional Information"
 msgstr "�仂仗仂仍仆亳�亠仍�仆舒� 亳仆�仂�仄舒�亳�"
 
-#: src/protocols/oscar/oscar.c:4900
+#: src/protocols/oscar/oscar.c:4895
 msgid "Home Address"
 msgstr "�仂仄舒�仆亳亶 舒亟�亠�"
 
-#: src/protocols/oscar/oscar.c:4904 src/protocols/oscar/oscar.c:4912
+#: src/protocols/oscar/oscar.c:4899 src/protocols/oscar/oscar.c:4907
 msgid "Zip Code"
 msgstr "�仆亟亠从�"
 
-#: src/protocols/oscar/oscar.c:4908
+#: src/protocols/oscar/oscar.c:4903
 msgid "Work Address"
 msgstr "�舒弍仂�亳亶 舒亟�亠�"
 
+#: src/protocols/oscar/oscar.c:4911
+msgid "Work Information"
+msgstr "�仆�仂�仄舒�亳� 仂 �舒弍仂�亠"
+
+#: src/protocols/oscar/oscar.c:4912
+msgid "Company"
+msgstr "�仂仄仗舒仆亳�"
+
+#: src/protocols/oscar/oscar.c:4913
+msgid "Division"
+msgstr "��亟亠仍"
+
+#: src/protocols/oscar/oscar.c:4914
+msgid "Position"
+msgstr "�仂仍亢仆仂���"
+
 #: src/protocols/oscar/oscar.c:4916
-msgid "Work Information"
-msgstr "�仆�仂�仄舒�亳� 仂 �舒弍仂�亠"
-
-#: src/protocols/oscar/oscar.c:4917
-msgid "Company"
-msgstr "�仂仄仗舒仆亳�"
-
-#: src/protocols/oscar/oscar.c:4918
-msgid "Division"
-msgstr "��亟亠仍"
-
-#: src/protocols/oscar/oscar.c:4919
-msgid "Position"
-msgstr "�仂仍亢仆仂���"
-
-#: src/protocols/oscar/oscar.c:4921
 msgid "Web Page"
 msgstr "Web-���舒仆亳�舒"
 
-#: src/protocols/oscar/oscar.c:4927
+#: src/protocols/oscar/oscar.c:4926
 #, c-format
 msgid "ICQ Info for %s"
 msgstr "ICQ-亳仆�仂�仄舒�亳� 亟仍� %s"
 
-#: src/protocols/oscar/oscar.c:4976
+#: src/protocols/oscar/oscar.c:4975
 msgid "Pop-Up Message"
 msgstr "��仗仍�于舒��亠亠 �仂仂弍�亠仆亳亠"
 
-#: src/protocols/oscar/oscar.c:4997
+#: src/protocols/oscar/oscar.c:4996
 #, c-format
 msgid "The following screen names are associated with %s"
 msgstr "弌仍亠亟���亳亠 亳亟亠仆�亳�亳从舒�仂�� 仗仂仍�亰仂于舒�亠仍� �仂仂�仆亠�亠仆� � %s"
 
-#: src/protocols/oscar/oscar.c:5001
+#: src/protocols/oscar/oscar.c:5000
 msgid "Search Results"
 msgstr "�亠亰�仍��舒�� 仗仂亳�从舒"
 
-#: src/protocols/oscar/oscar.c:5018
+#: src/protocols/oscar/oscar.c:5017
 #, c-format
 msgid "No results found for email address %s"
 msgstr "�亳�亠亞仂 仆亠 仆舒亶亟亠仆仂 亟仍� 舒亟�亠�舒 email %s"
 
-#: src/protocols/oscar/oscar.c:5039
+#: src/protocols/oscar/oscar.c:5038
 #, c-format
 msgid "You should receive an email asking to confirm %s."
 msgstr "�� 亟仂仍亢仆� 仗仂仍��亳�� email � 仗�仂��弍仂亶 仗仂亟�于亠�亢亟亳�� %s."
 
-#: src/protocols/oscar/oscar.c:5041
+#: src/protocols/oscar/oscar.c:5040
 msgid "Account Confirmation Requested"
 msgstr "�舒仗�仂�亠仆仂 仗仂亟�于亠�亢亟亠仆亳亠 ����仆仂亶 亰舒仗亳�亳"
 
-#: src/protocols/oscar/oscar.c:5069
+#: src/protocols/oscar/oscar.c:5071
 msgid "Error Changing Account Info"
 msgstr "��亳弍从舒 亳亰仄亠仆亠仆亳� 亳仆�仂�仄舒�亳亳 仂弍 ����仆仂亶 亰舒仗亳�亳"
 
-#: src/protocols/oscar/oscar.c:5072
+#: src/protocols/oscar/oscar.c:5074
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -8029,7 +8083,7 @@
 "��亳弍从舒 0x%04x: �亠 �亟舒���� 仂��仂�仄舒�亳�仂于舒�� 亳亟亠仆�亳�亳从舒�仂� 仗仂仍�亰仂于舒�亠仍�, �舒从 "
 "从舒从 亰舒仗�仂�亠仆仆�亶 亳亟亠仆�亳�亳从舒�仂� 仗仂仍�亰仂于舒�亠仍� 仂�仍亳�舒亠��� 仂� 仂�亳亞亳仆舒仍�仆仂亞仂."
 
-#: src/protocols/oscar/oscar.c:5075
+#: src/protocols/oscar/oscar.c:5077
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -8038,7 +8092,7 @@
 "��亳弍从舒 0x%04x: �亠 �亟舒���� 仂��仂�仄舒�亳�仂于舒�� 亳亟亠仆�亳�亳从舒�仂� 仗仂仍�亰仂于舒�亠仍�, �舒从 "
 "从舒从 亰舒仗�仂�亠仆仆�亶 亳亟亠仆�亳�亳从舒�仂� 仗仂仍�亰仂于舒�亠仍� 仂从舒仆�亳于舒亠��� 仗�仂弍亠仍仂仄."
 
-#: src/protocols/oscar/oscar.c:5078
+#: src/protocols/oscar/oscar.c:5080
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -8047,14 +8101,14 @@
 "��亳弍从舒 0x%04x: �亠 �亟舒���� 仂��仂�仄舒�亳�仂于舒�� 亳亟亠仆�亳�亳从舒�仂� 仗仂仍�亰仂于舒�亠仍�, �舒从 "
 "从舒从 亰舒仗�仂�亠仆仆�亶 亳亟亠仆�亳�亳从舒�仂� 仗仂仍�亰仂于舒�亠仍� �仍亳�从仂仄 于亠仍亳从."
 
-#: src/protocols/oscar/oscar.c:5081
+#: src/protocols/oscar/oscar.c:5083
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because there is already a "
 "request pending for this screen name."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:5084
+#: src/protocols/oscar/oscar.c:5086
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address has "
@@ -8063,7 +8117,7 @@
 "��亳弍从舒 0x%04x: �亠 �亟舒���� 亳亰仄亠仆亳�� 舒亟�亠� email, �舒从 从舒从 � 亰舒亟舒仆仆�仄 舒亟�亠�仂仄 "
 "�仂仂�仆亠�亠仆仂 �仍亳�从仂仄 仄仆仂亞仂 亳亟亠仆�亳�亳从舒�仂�仂于 仗仂仍�亰仂于舒�亠仍�."
 
-#: src/protocols/oscar/oscar.c:5087
+#: src/protocols/oscar/oscar.c:5089
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address is "
@@ -8072,12 +8126,12 @@
 "��亳弍从舒 0x%04x: �亠 �亟舒���� 亳亰仄亠仆亳�� 舒亟�亠� email, �舒从 从舒从 亰舒亟舒仆仆�亶 舒亟�亠� "
 "仆亠于亠�亠仆."
 
-#: src/protocols/oscar/oscar.c:5090
+#: src/protocols/oscar/oscar.c:5092
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "��亳弍从舒 0x%04x: �亠亳亰于亠��仆舒� 仂�亳弍从舒."
 
-#: src/protocols/oscar/oscar.c:5100
+#: src/protocols/oscar/oscar.c:5102
 #, c-format
 msgid ""
 "Your screen name is currently formatted as follows:\n"
@@ -8086,34 +8140,34 @@
 "弌亠亶�舒� 于舒� 亳亟亠仆�亳�亳从舒�仂� 仗仂仍�亰仂于舒�亠仍� 仂��仂�仄舒�亳�仂于舒仆 �仍亠亟���亳仄 仂弍�舒亰仂仄:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:5101 src/protocols/oscar/oscar.c:5108
+#: src/protocols/oscar/oscar.c:5103 src/protocols/oscar/oscar.c:5110
 msgid "Account Info"
 msgstr "�仆�仂�仄舒�亳� 仂弍 ����仆仂亶 亰舒仗亳�亳"
 
-#: src/protocols/oscar/oscar.c:5106
+#: src/protocols/oscar/oscar.c:5108
 #, c-format
 msgid "The email address for %s is %s"
 msgstr "�亟�亠� email 亟仍� %s: %s"
 
-#: src/protocols/oscar/oscar.c:5171
+#: src/protocols/oscar/oscar.c:5173
 msgid ""
 "Your IM Image was not sent. You must be Direct Connected to send IM Images."
 msgstr ""
 "�舒�亠 亳亰仂弍�舒亢亠仆亳亠 仆亠 弍�仍仂 仂�仗�舒于仍亠仆仂. �� 亟仂仍亢仆� 亳仄亠�� 仗��仄仂亠 �仂亠亟亳仆亠仆亳亠 亟仍� "
 "仂�仗�舒于从亳 亳亰仂弍�舒亢亠仆亳亶."
 
-#: src/protocols/oscar/oscar.c:5345
+#: src/protocols/oscar/oscar.c:5347
 msgid "Unable to set AIM profile."
 msgstr "�亠 �亟舒���� ���舒仆仂于亳�� 仗�仂�亳仍� AIM."
 
-#: src/protocols/oscar/oscar.c:5346
+#: src/protocols/oscar/oscar.c:5348
 msgid ""
 "You have probably requested to set your profile before the login procedure "
 "completed.  Your profile remains unset; try setting it again when you are "
 "fully connected."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:5373
+#: src/protocols/oscar/oscar.c:5375
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  Gaim has truncated "
@@ -8124,26 +8178,26 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/protocols/oscar/oscar.c:5378
+#: src/protocols/oscar/oscar.c:5380
 msgid "Profile too long."
 msgstr "��仂�亳仍� �仍亳�从仂仄 于亠仍亳从."
 
-#: src/protocols/oscar/oscar.c:5394 src/protocols/oscar/oscar.c:6698
+#: src/protocols/oscar/oscar.c:5396 src/protocols/oscar/oscar.c:6701
 msgid "Visible"
 msgstr "�亳亟亳仄�亶"
 
-#: src/protocols/oscar/oscar.c:5412
+#: src/protocols/oscar/oscar.c:5414
 msgid "Unable to set AIM away message."
 msgstr "�亠 �亟舒���� ���舒仆仂于亳�� �仂仂弍�亠仆亳亠 仂弍 仂������于亳亳 亟仍� AIM."
 
-#: src/protocols/oscar/oscar.c:5413
+#: src/protocols/oscar/oscar.c:5415
 msgid ""
 "You have probably requested to set your away message before the login "
 "procedure completed.  You remain in a \"present\" state; try setting it "
 "again when you are fully connected."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:5453
+#: src/protocols/oscar/oscar.c:5455
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  Gaim has "
@@ -8154,11 +8208,11 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/protocols/oscar/oscar.c:5458
+#: src/protocols/oscar/oscar.c:5460
 msgid "Away message too long."
 msgstr "弌仂仂弍�亠仆亳亠 仂弍 仂������于亳亳 �仍亳�从仂仄 于亠仍亳从仂."
 
-#: src/protocols/oscar/oscar.c:5536
+#: src/protocols/oscar/oscar.c:5538
 #, c-format
 msgid ""
 "Could not add the buddy %s because the screen name is invalid.  Screen names "
@@ -8166,16 +8220,16 @@
 "spaces, or contain only numbers."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:5537 src/protocols/oscar/oscar.c:5985
-#: src/protocols/oscar/oscar.c:5998
+#: src/protocols/oscar/oscar.c:5540 src/protocols/oscar/oscar.c:5989
+#: src/protocols/oscar/oscar.c:6003
 msgid "Unable To Add"
 msgstr "�亠 �亟舒���� 亟仂弍舒于亳��"
 
-#: src/protocols/oscar/oscar.c:5698
+#: src/protocols/oscar/oscar.c:5701
 msgid "Unable To Retrieve Buddy List"
 msgstr "�亠 �亟舒���� 亰舒亞��亰亳�� �仗亳�仂从 从仂仆�舒从�仂于"
 
-#: src/protocols/oscar/oscar.c:5699
+#: src/protocols/oscar/oscar.c:5702
 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 "
@@ -8185,13 +8239,13 @@
 "弌仗亳�仂从 从仂仆�舒从�仂于 仆亠 仗仂�亠��仆 亳, 于亠�仂��仆仂, ��舒仆亠� 亟仂���仗亠仆 于 �亠�亠仆亳亠 "
 "仆亠�从仂仍�从亳� �舒�仂于."
 
-#: src/protocols/oscar/oscar.c:5881 src/protocols/oscar/oscar.c:5882
-#: src/protocols/oscar/oscar.c:5887 src/protocols/oscar/oscar.c:6042
-#: src/protocols/oscar/oscar.c:6043 src/protocols/oscar/oscar.c:6048
+#: src/protocols/oscar/oscar.c:5884 src/protocols/oscar/oscar.c:5885
+#: src/protocols/oscar/oscar.c:5890 src/protocols/oscar/oscar.c:6047
+#: src/protocols/oscar/oscar.c:6048 src/protocols/oscar/oscar.c:6053
 msgid "Orphans"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:5984
+#: src/protocols/oscar/oscar.c:5987
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -8200,11 +8254,11 @@
 "�亠 �亟舒仍仂�� 亟仂弍舒于亳�� 仗仂仍�亰仂于舒�亠仍� %s, �舒从 从舒从 于 �仗亳�从亠 从仂仆�舒从�仂于 �仍亳�从仂仄 "
 "仄仆仂亞仂 仗仂仍�亰仂于舒�亠仍亠亶.丕亟舒仍亳�亠 仂亟仆仂亞仂 亳 仗仂仗��舒亶�亠�� �仆仂于舒."
 
-#: src/protocols/oscar/oscar.c:5984 src/protocols/oscar/oscar.c:5997
+#: src/protocols/oscar/oscar.c:5987 src/protocols/oscar/oscar.c:6001
 msgid "(no name)"
 msgstr "(仆亠� 亳仄亠仆亳)"
 
-#: src/protocols/oscar/oscar.c:5997
+#: src/protocols/oscar/oscar.c:6001
 #, c-format
 msgid ""
 "Could not add the buddy %s for an unknown reason.  The most common reason "
@@ -8212,7 +8266,7 @@
 "buddy list."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:6079
+#: src/protocols/oscar/oscar.c:6084
 #, c-format
 msgid ""
 "The user %s has given you permission to add you to their buddy list.  Do you "
@@ -8221,11 +8275,11 @@
 "�仂仍�亰仂于舒�亠仍� %s �舒亰�亠�亳仍 亟仂弍舒于亳�� 亠亞仂 于 于舒� �仗亳�仂从 从仂仆�舒从�仂于. 丱仂�亳�亠 "
 "亟仂弍舒于亳�� 亠亞仂?"
 
-#: src/protocols/oscar/oscar.c:6085
+#: src/protocols/oscar/oscar.c:6090
 msgid "Authorization Given"
 msgstr "�于�仂�亳亰舒�亳� 亟舒仆舒"
 
-#: src/protocols/oscar/oscar.c:6118
+#: src/protocols/oscar/oscar.c:6123
 #, c-format
 msgid ""
 "The user %s wants to add you to their buddy list for the following reason:\n"
@@ -8236,17 +8290,17 @@
 "%s"
 
 #. Granted
-#: src/protocols/oscar/oscar.c:6160
+#: src/protocols/oscar/oscar.c:6165
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
 msgstr "�仂仍�亰仂于舒�亠仍� %s �舒亰�亠�亳仍 亟仂弍舒于亳�� 亠亞仂 于 于舒� �仗亳�仂从 从仂仆�舒从�仂于."
 
-#: src/protocols/oscar/oscar.c:6161
+#: src/protocols/oscar/oscar.c:6166
 msgid "Authorization Granted"
 msgstr "�于�仂�亳亰舒�亳� 亟舒仆舒"
 
 #. Denied
-#: src/protocols/oscar/oscar.c:6164
+#: src/protocols/oscar/oscar.c:6169
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -8257,75 +8311,80 @@
 "仗�亳�亳仆亠:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:6165
+#: src/protocols/oscar/oscar.c:6170
 msgid "Authorization Denied"
 msgstr "� 舒于�仂�亳亰舒�亳亳 仂�从舒亰舒仆仂"
 
-#: src/protocols/oscar/oscar.c:6202 src/protocols/toc/toc.c:1271
+#: src/protocols/oscar/oscar.c:6207 src/protocols/toc/toc.c:1272
 msgid "_Exchange:"
 msgstr "�弍仄亠仆:"
 
-#: src/protocols/oscar/oscar.c:6224
+#: src/protocols/oscar/oscar.c:6229
 msgid "Invalid chat name specified."
 msgstr "丕从舒亰舒仆仂 仆亠于亠�仆仂亠 亳仄� �舒�舒."
 
-#: src/protocols/oscar/oscar.c:6314
+#: src/protocols/oscar/oscar.c:6319
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 msgstr ""
 "�亰仂弍�舒亢亠仆亳亠 仆亠 弍�仍仂 仂�仗�舒于仍亠仆仂. �� 仆亠 仄仂亢亠�亠 仂�仗�舒于仍��� 亳亰仂弍�舒亢亠仆亳� 于 �舒�舒� "
 "AIM."
 
-#: src/protocols/oscar/oscar.c:6471
+#: src/protocols/oscar/oscar.c:6474
 msgid "Away Message"
 msgstr "弌仂仂弍�亠仆亳亠 仂弍 仂������于亳亳"
 
-#: src/protocols/oscar/oscar.c:6756
+#: src/protocols/oscar/oscar.c:6760
+#, c-format
+msgid "Buddy Comment for %s"
+msgstr "�仂仄仄亠仆�舒�亳亶 仗仂仍�亰仂于舒�亠仍� 亟仍� %s"
+
+#: src/protocols/oscar/oscar.c:6761
 msgid "Buddy Comment:"
 msgstr "�仂仄仄亠仆�舒�亳亶 仗仂仍�亰仂于舒�亠仍�:"
 
-#: src/protocols/oscar/oscar.c:6774
+#: src/protocols/oscar/oscar.c:6780
 msgid "Edit Buddy Comment"
 msgstr "�亰仄亠仆亳�� 从仂仄仄亠仆�舒�亳亶 仗仂仍�亰仂于舒�亠仍�"
 
-#: src/protocols/oscar/oscar.c:6780
+#: src/protocols/oscar/oscar.c:6786
 msgid "Get Status Msg"
 msgstr "�仂仍��亳�� �仂仂弍�亠仆亳亠 仂 ��舒���亠"
 
-#: src/protocols/oscar/oscar.c:6792
+#: src/protocols/oscar/oscar.c:6798
 msgid "Direct IM"
 msgstr "���仄仂亠 �仂亠亟亳仆亠仆亳亠"
 
-#: src/protocols/oscar/oscar.c:6814
+#: src/protocols/oscar/oscar.c:6815
 msgid "Re-request Authorization"
 msgstr "�仂于�仂�仆�亶 亰舒仗�仂� 舒于�仂�亳亰舒�亳亳"
 
-#: src/protocols/oscar/oscar.c:6844
+#: src/protocols/oscar/oscar.c:6845
 msgid "The new formatting is invalid."
 msgstr "�仂于仂亠 �仂�仄舒�亳�仂于舒仆亳亠 仆亠亟仂仗���亳仄仂."
 
-#: src/protocols/oscar/oscar.c:6845
+#: src/protocols/oscar/oscar.c:6846
 msgid "Screen name formatting can change only capitalization and whitespace."
 msgstr ""
 "个仂�仄舒�亳�仂于舒仆亳亠 亳亟亠仆�亳�亳从舒�仂�舒 仗仂仍�亰仂于舒�亠仍� 仄仂亢亠� 于仍亳��� �仂仍�从仂 仆舒 �亠亞亳��� "
 "弍�从于 亳 仗�仂弍亠仍�."
 
-#: src/protocols/oscar/oscar.c:6852
+#: src/protocols/oscar/oscar.c:6853
 msgid "New screen name formatting:"
 msgstr "�仂于仂亠 �仂�仄舒�亳�仂于舒仆亳亠 亳亟亠仆�亳�亳从舒�仂�舒 仗仂仍�亰仂于舒�亠仍�:"
 
-#: src/protocols/oscar/oscar.c:6904
+#: src/protocols/oscar/oscar.c:6905
 msgid "Change Address To:"
 msgstr "�亰仄亠仆亳�� 舒亟�亠� 仆舒:"
 
-#: src/protocols/oscar/oscar.c:6949
+#: src/protocols/oscar/oscar.c:6950
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>于� 仆亠 仂亢亳亟舒亠�亠 舒于�仂�亳亰舒�亳�</i>"
 
-#: src/protocols/oscar/oscar.c:6952
+#: src/protocols/oscar/oscar.c:6953
 msgid "You are awaiting authorization from the following buddies"
 msgstr "�� 仂亢亳亟舒亠�亠 舒于�仂�亳亰舒�亳� 仂� �仍亠亟���亳� 仗仂仍�亰仂于舒�亠仍亠亶"
 
-#: src/protocols/oscar/oscar.c:6953
+#: src/protocols/oscar/oscar.c:6954
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
@@ -8333,75 +8392,75 @@
 "�� 仄仂亢亠�亠 亰舒仗�仂�亳�� 舒于�仂�亳亰舒�亳� 仂� ��亳� 仗仂仍�亰仂于舒�亠仍亠亶 仗仂于�仂�仆仂, ��仍从仆�于 仆舒 "
 "仆亳� 仗�舒于仂亶 从仆仂仗从仂亶 仄��亳 亳 于�弍�舒于 \"�仂于�仂�仆�亶 亰舒仗�仂� 舒于�仂�亳亰舒�亳亳\"."
 
-#: src/protocols/oscar/oscar.c:6970
+#: src/protocols/oscar/oscar.c:6971
 msgid "Find Buddy by E-mail"
 msgstr "�舒亶�亳 仗仂仍�亰仂于舒�亠仍� 仗仂 E-mail"
 
-#: src/protocols/oscar/oscar.c:6971
+#: src/protocols/oscar/oscar.c:6972
 msgid "Search for a buddy by e-mail address"
 msgstr "��从舒�� 仗仂仍�亰仂于舒�亠仍� 仗仂 舒亟�亠�� e-mail"
 
-#: src/protocols/oscar/oscar.c:6972
+#: src/protocols/oscar/oscar.c:6973
 msgid "Type the e-mail address of the buddy you are searching for."
 msgstr "�于亠亟亳�亠 舒亟�亠� e-mail 仗仂仍�亰仂于舒�亠仍�, 从仂�仂�仂亞仂 于� 亳�亠�亠."
 
-#: src/protocols/oscar/oscar.c:6989
-msgid "Available Message:"
-msgstr "弌�舒���仆仂亠 �仂仂弍�亠仆亳亠:"
-
 #: src/protocols/oscar/oscar.c:6990
+msgid "Available Message:"
+msgstr "弌�舒���仆仂亠 �仂仂弍�亠仆亳亠:"
+
+#: src/protocols/oscar/oscar.c:6991
 msgid "I'm doing work and hoping for a distraction--IM me!"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:7072 src/protocols/silc/silc.c:789
+#: src/protocols/oscar/oscar.c:7073 src/protocols/silc/silc.c:789
 msgid "Set User Info..."
 msgstr "丕��舒仆仂于亳�� 亳仆�仂�仄舒�亳� 仂 仗仂仍�亰仂于舒�亠仍亠..."
 
-#: src/protocols/oscar/oscar.c:7077
+#: src/protocols/oscar/oscar.c:7078
 msgid "Set User Info (URL)..."
 msgstr "丕��舒仆仂于亳�� 亳仆�仂�仄舒�亳� 仂 仗仂仍�亰仂于舒�亠仍亠 (URL)..."
 
-#: src/protocols/oscar/oscar.c:7083
+#: src/protocols/oscar/oscar.c:7084
 msgid "Set Available Message..."
 msgstr "丕��舒仆仂于亳�� ��舒���仆仂亠 �仂仂弍�亠仆亳亠..."
 
-#: src/protocols/oscar/oscar.c:7088 src/protocols/silc/silc.c:785
+#: src/protocols/oscar/oscar.c:7089 src/protocols/silc/silc.c:785
 msgid "Change Password..."
 msgstr "�亰仄亠仆亳�� 仗舒�仂仍�..."
 
-#: src/protocols/oscar/oscar.c:7093
+#: src/protocols/oscar/oscar.c:7094
 msgid "Change Password (URL)"
 msgstr "�亰仄亠仆亳�� 仗舒�仂仍� (URL)"
 
-#: src/protocols/oscar/oscar.c:7097
+#: src/protocols/oscar/oscar.c:7098
 msgid "Configure IM Forwarding (URL)"
 msgstr "�舒���仂亳�� 仗亠�亠仆舒仗�舒于仍亠仆亳亠 �仂仂弍�亠仆亳亶 (URL)"
 
-#: src/protocols/oscar/oscar.c:7106
+#: src/protocols/oscar/oscar.c:7107
 msgid "Format Screen Name..."
 msgstr "个仂�仄舒�亳�仂于舒�� 亳亟亠仆�亳�亳从舒�仂� 仗仂仍�亰仂于舒�亠仍�..."
 
-#: src/protocols/oscar/oscar.c:7110
+#: src/protocols/oscar/oscar.c:7111
 msgid "Confirm Account"
 msgstr "�仂亟�于亠�亟亳�� ����仆�� 亰舒仗亳��"
 
-#: src/protocols/oscar/oscar.c:7114
+#: src/protocols/oscar/oscar.c:7115
 msgid "Display Currently Registered Address"
 msgstr "�仂从舒亰舒�� �亠从��亳亶 亰舒�亠亞亳���亳�仂于舒仆仆�亶 舒亟�亠�"
 
-#: src/protocols/oscar/oscar.c:7118
+#: src/protocols/oscar/oscar.c:7119
 msgid "Change Currently Registered Address..."
 msgstr "�亰仄亠仆亳�� �亠从��亳亶 亰舒�亠亞亳���亳�仂于舒仆仆�亶 舒亟�亠�..."
 
-#: src/protocols/oscar/oscar.c:7125
+#: src/protocols/oscar/oscar.c:7126
 msgid "Show Buddies Awaiting Authorization"
 msgstr "�仂从舒亰舒�� 仗仂仍�亰仂于舒�亠仍亠亶, 仂亢亳亟舒��亳� 舒于�仂�亳亰舒�亳�"
 
-#: src/protocols/oscar/oscar.c:7131
+#: src/protocols/oscar/oscar.c:7132
 msgid "Search for Buddy by Email..."
 msgstr "��从舒�� 仗仂仍�亰仂于舒�亠仍� 仗仂 Email..."
 
-#: src/protocols/oscar/oscar.c:7136
+#: src/protocols/oscar/oscar.c:7137
 msgid "Search for Buddy by Information"
 msgstr "��从舒�� 仗仂仍�亰仂于舒�亠仍� 仗仂 亳仆�仂�仄舒�亳亳"
 
@@ -8416,15 +8475,15 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/oscar/oscar.c:7254 src/protocols/oscar/oscar.c:7256
+#: src/protocols/oscar/oscar.c:7255 src/protocols/oscar/oscar.c:7257
 msgid "AIM/ICQ Protocol Plugin"
 msgstr "�仂亟�仍� 仗�仂�仂从仂仍舒 AIM/ICQ"
 
-#: src/protocols/oscar/oscar.c:7275
+#: src/protocols/oscar/oscar.c:7276
 msgid "Auth host"
 msgstr "丕亰亠仍 亳亟亠仆�亳�亳从舒�亳亳"
 
-#: src/protocols/oscar/oscar.c:7280
+#: src/protocols/oscar/oscar.c:7281
 msgid "Auth port"
 msgstr "�仂�� 亳亟亠仆�亳�亳从舒�亳亳"
 
@@ -8513,12 +8572,12 @@
 msgstr ""
 
 #: src/protocols/silc/buddy.c:506 src/protocols/silc/buddy.c:541
-#: src/protocols/silc/ops.c:1256 src/protocols/silc/ops.c:1267
+#: src/protocols/silc/ops.c:1265 src/protocols/silc/ops.c:1276
 msgid "Get Public Key"
 msgstr "�仂仍��亳�� 仗�弍仍亳�仆�亶 从仍��"
 
-#: src/protocols/silc/buddy.c:542 src/protocols/silc/ops.c:1257
-#: src/protocols/silc/ops.c:1268
+#: src/protocols/silc/buddy.c:542 src/protocols/silc/ops.c:1266
+#: src/protocols/silc/ops.c:1277
 msgid "Cannot fetch the public key"
 msgstr "�亠 �亟舒���� 亰舒亞��亰亳�� 仗�弍仍亳�仆�亶 从仍��"
 
@@ -8531,14 +8590,14 @@
 msgid "Could not load public key"
 msgstr "�亠 �亟舒仍仂�� 亰舒亞��亰亳�� 仗�弍仍亳�仆�亶 从仍��"
 
-#: src/protocols/silc/buddy.c:707 src/protocols/silc/ops.c:853
-#: src/protocols/silc/ops.c:925 src/protocols/silc/ops.c:1060
-#: src/protocols/silc/ops.c:1061 src/protocols/silc/ops.c:1079
+#: src/protocols/silc/buddy.c:707 src/protocols/silc/ops.c:862
+#: src/protocols/silc/ops.c:934 src/protocols/silc/ops.c:1069
+#: src/protocols/silc/ops.c:1070 src/protocols/silc/ops.c:1088
 msgid "User Information"
 msgstr "�仆�仂�仄舒�亳� 仂 仗仂仍�亰仂于舒�亠仍亠"
 
-#: src/protocols/silc/buddy.c:708 src/protocols/silc/ops.c:926
-#: src/protocols/silc/ops.c:1080
+#: src/protocols/silc/buddy.c:708 src/protocols/silc/ops.c:935
+#: src/protocols/silc/ops.c:1089
 msgid "Cannot get user information"
 msgstr "�亠 �亟舒���� 仗仂仍��亳�� 亳仆�仂�仄舒�亳� 仂 仗仂仍�亰仂于舒�亠仍亠"
 
@@ -8671,36 +8730,36 @@
 msgid "Anxious"
 msgstr "�亰舒弍仂�亠仆仆�亶"
 
-#: src/protocols/silc/buddy.c:1448 src/protocols/silc/ops.c:962
+#: src/protocols/silc/buddy.c:1448 src/protocols/silc/ops.c:971
 msgid "User Modes"
 msgstr "�亠亢亳仄� 仗仂仍�亰仂于舒�亠仍�"
 
-#: src/protocols/silc/buddy.c:1457 src/protocols/silc/ops.c:971
+#: src/protocols/silc/buddy.c:1457 src/protocols/silc/ops.c:980
 msgid "Mood"
 msgstr "�舒���仂亠仆亳亠"
 
-#: src/protocols/silc/buddy.c:1461 src/protocols/silc/ops.c:977
+#: src/protocols/silc/buddy.c:1461 src/protocols/silc/ops.c:986
 msgid "Status Text"
 msgstr "丐亠从�� ��舒���舒"
 
-#: src/protocols/silc/buddy.c:1466 src/protocols/silc/ops.c:983
+#: src/protocols/silc/buddy.c:1466 src/protocols/silc/ops.c:992
 msgid "Preferred Contact"
 msgstr "��亠亟仗仂�亳�舒亠仄�亶 从仂仆�舒从�"
 
-#: src/protocols/silc/buddy.c:1471 src/protocols/silc/ops.c:988
+#: src/protocols/silc/buddy.c:1471 src/protocols/silc/ops.c:997
 msgid "Preferred Language"
 msgstr "��亠亟仗仂�亳�舒亠仄�亶 �亰�从"
 
-#: src/protocols/silc/buddy.c:1476 src/protocols/silc/ops.c:993
+#: src/protocols/silc/buddy.c:1476 src/protocols/silc/ops.c:1002
 msgid "Device"
 msgstr "丕���仂亶��于仂"
 
-#: src/protocols/silc/buddy.c:1481 src/protocols/silc/ops.c:998
+#: src/protocols/silc/buddy.c:1481 src/protocols/silc/ops.c:1007
 #: src/protocols/silc/silc.c:678 src/protocols/silc/silc.c:680
 msgid "Timezone"
 msgstr "丼舒�仂于仂亶 仗仂��"
 
-#: src/protocols/silc/buddy.c:1486 src/protocols/silc/ops.c:1003
+#: src/protocols/silc/buddy.c:1486 src/protocols/silc/ops.c:1012
 msgid "Geolocation"
 msgstr "�亠仂亞�舒�亳�亠�从仂亠 仗仂仍仂亢亠仆亳亠"
 
@@ -8720,7 +8779,7 @@
 msgid "Get Public Key..."
 msgstr "�仂仍��亳�� 仗�弍仍亳�仆�亶 从仍��..."
 
-#: src/protocols/silc/buddy.c:1555 src/protocols/silc/ops.c:1389
+#: src/protocols/silc/buddy.c:1555 src/protocols/silc/ops.c:1398
 msgid "Kill User"
 msgstr "丕弍亳�� 仗仂仍�亰仂于舒�亠仍�"
 
@@ -8825,7 +8884,7 @@
 msgid "Group Name"
 msgstr "�仄� 亞��仗仗�"
 
-#: src/protocols/silc/chat.c:567 src/protocols/silc/ops.c:1669
+#: src/protocols/silc/chat.c:567 src/protocols/silc/ops.c:1678
 msgid "Passphrase"
 msgstr "�舒�仂仍�仆舒� ��舒亰舒"
 
@@ -8901,35 +8960,35 @@
 msgid "Set Secret Channel"
 msgstr "丕��舒仆仂于亳�� �亠从�亠�仆�亶 从舒仆舒仍"
 
-#: src/protocols/silc/chat.c:989
+#: src/protocols/silc/chat.c:981
 #, c-format
 msgid "You are channel founder on <I>%s</I>"
 msgstr "�� �于仍�亠�亠�� 仂�仆仂于舒�亠仍亠仄 从舒仆舒仍舒 仆舒 <I>%s</I>"
 
-#: src/protocols/silc/chat.c:993
+#: src/protocols/silc/chat.c:985
 #, 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:1046
+#: src/protocols/silc/chat.c:1039
 #, 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:1048
+#: src/protocols/silc/chat.c:1041
 msgid "Join Private Group"
 msgstr "��亳�仂亠亟亳仆亳���� 从 仍亳�仆仂亶 亞��仗仗亠"
 
-#: src/protocols/silc/chat.c:1049
+#: src/protocols/silc/chat.c:1042
 msgid "Cannot join private group"
 msgstr "�亠 �亟舒���� 仗�亳�仂亠亟亳仆亳���� 从 仍亳�仆仂亶 亞��仗仗亠"
 
-#: src/protocols/silc/chat.c:1242 src/protocols/silc/silc.c:888
+#: src/protocols/silc/chat.c:1235 src/protocols/silc/silc.c:888
 msgid "Cannot call command"
 msgstr "�亠 �亟舒���� 于�亰于舒�� 从仂仄舒仆亟�"
 
-#: src/protocols/silc/chat.c:1243 src/protocols/silc/silc.c:889
+#: src/protocols/silc/chat.c:1236 src/protocols/silc/silc.c:889
 msgid "Unknown command"
 msgstr "�亠亳亰于亠��仆舒� 从仂仄舒仆亟舒"
 
@@ -8985,147 +9044,147 @@
 msgid "%s has changed the topic of <I>%s</I> to: %s"
 msgstr "%s 亳亰仄亠仆亳仍 �亠仄� <I>%s</I> 仆舒: %s"
 
-#: src/protocols/silc/ops.c:413
+#: src/protocols/silc/ops.c:414
 #, c-format
 msgid "<I>%s</I> set channel <I>%s</I> modes to: %s"
 msgstr "<I>%s</I> ���舒仆仂于亳仍 �亠亢亳仄 从舒仆舒仍舒 <I>%s</I> 于: %s"
 
-#: src/protocols/silc/ops.c:417
+#: src/protocols/silc/ops.c:418
 #, c-format
 msgid "<I>%s</I> removed all channel <I>%s</I> modes"
 msgstr "<I>%s</I> �仆�仍 于�亠 �亠亢亳仄� 从舒仆舒仍舒 <I>%s</I>"
 
-#: src/protocols/silc/ops.c:448
+#: src/protocols/silc/ops.c:451
 #, c-format
 msgid "<I>%s</I> set <I>%s's</I> modes to: %s"
 msgstr "<I>%s</I> ���舒仆仂于亳仍 �亠亢亳仄� <I>%s</I> 于: %s"
 
-#: src/protocols/silc/ops.c:452
+#: src/protocols/silc/ops.c:459
 #, c-format
 msgid "<I>%s</I> removed all <I>%s's</I> modes"
 msgstr "<I>%s</I> �仆�仍 于�亠 �亠亢亳仄� <I>%s</I>"
 
-#: src/protocols/silc/ops.c:479
+#: src/protocols/silc/ops.c:488
 #, c-format
 msgid "You have been kicked off <I>%s</I> by <I>%s</I> (%s)"
 msgstr "�� 弍�仍亳 �亟舒仍亠仆� 亳亰 <I>%s</I> 仂仗亠�舒�仂�仂仄 <I>%s</I> (%s)"
 
-#: src/protocols/silc/ops.c:509 src/protocols/silc/ops.c:514
-#: src/protocols/silc/ops.c:519
+#: src/protocols/silc/ops.c:518 src/protocols/silc/ops.c:523
+#: src/protocols/silc/ops.c:528
 #, c-format
 msgid "You have been killed by %s (%s)"
 msgstr "�� 弍�仍亳 �弍亳�� 仂仗亠�舒�仂�仂仄 %s (%s)"
 
-#: src/protocols/silc/ops.c:540 src/protocols/silc/ops.c:545
-#: src/protocols/silc/ops.c:550
+#: src/protocols/silc/ops.c:549 src/protocols/silc/ops.c:554
+#: src/protocols/silc/ops.c:559
 #, c-format
 msgid "Killed by %s (%s)"
 msgstr "丕弍亳� 仂仗亠�舒�仂�仂仄 %s (%s)"
 
-#: src/protocols/silc/ops.c:596
+#: src/protocols/silc/ops.c:605
 msgid "Server signoff"
 msgstr "��从仍��亳���� 仂� �亠�于亠�舒"
 
-#: src/protocols/silc/ops.c:783
+#: src/protocols/silc/ops.c:792
 msgid "Personal Information"
 msgstr "�亠��仂仆舒仍�仆舒� 亳仆�仂�仄舒�亳�"
 
-#: src/protocols/silc/ops.c:806
+#: src/protocols/silc/ops.c:815
 msgid "Birth Day"
 msgstr "�亠仆� �仂亢亟亠仆亳�"
 
-#: src/protocols/silc/ops.c:810
+#: src/protocols/silc/ops.c:819
 msgid "Job Title"
 msgstr "�舒亰于舒仆亳亠 �舒弍仂��"
 
-#: src/protocols/silc/ops.c:814
+#: src/protocols/silc/ops.c:823
 msgid "Job Role"
 msgstr "�仂仍亢仆仂���"
 
-#: src/protocols/silc/ops.c:818
+#: src/protocols/silc/ops.c:827
 msgid "Organization"
 msgstr "��亞舒仆亳亰舒�亳�"
 
-#: src/protocols/silc/ops.c:822
+#: src/protocols/silc/ops.c:831
 msgid "Unit"
 msgstr "��亟亠仍"
 
-#: src/protocols/silc/ops.c:841
+#: src/protocols/silc/ops.c:850
 msgid "EMail"
 msgstr "EMail"
 
-#: src/protocols/silc/ops.c:846
+#: src/protocols/silc/ops.c:855
 msgid "Note"
 msgstr "�舒仄亠�从亳"
 
-#: src/protocols/silc/ops.c:894
+#: src/protocols/silc/ops.c:903
 msgid "Join Chat"
 msgstr "��亳�仂亠亟亳仆亳���� 从 �舒��"
 
-#: src/protocols/silc/ops.c:1050 src/protocols/silc/ops.c:1120
+#: src/protocols/silc/ops.c:1059 src/protocols/silc/ops.c:1129
 msgid "Public Key Fingerprint"
 msgstr ""
 
-#: src/protocols/silc/ops.c:1051 src/protocols/silc/ops.c:1121
+#: src/protocols/silc/ops.c:1060 src/protocols/silc/ops.c:1130
 msgid "Public Key Babbleprint"
 msgstr ""
 
-#: src/protocols/silc/ops.c:1064
+#: src/protocols/silc/ops.c:1073
 msgid "More..."
 msgstr "���..."
 
-#: src/protocols/silc/ops.c:1135 src/protocols/silc/silc.c:777
+#: src/protocols/silc/ops.c:1144 src/protocols/silc/silc.c:777
 msgid "Detach From Server"
 msgstr "�舒亰仂�于舒�� �仂亠亟亳仆亠仆亳亠 � �亠�于亠�仂仄"
 
-#: src/protocols/silc/ops.c:1135
+#: src/protocols/silc/ops.c:1144
 msgid "Cannot detach"
 msgstr "�亠 �亟舒���� �舒亰仂�于舒�� �仂亠亟亳仆亠仆亳亠"
 
-#: src/protocols/silc/ops.c:1146
+#: src/protocols/silc/ops.c:1155
 msgid "Cannot set topic"
 msgstr "�亠 �亟舒���� ���舒仆仂于亳�� �亠仄�"
 
-#: src/protocols/silc/ops.c:1184
+#: src/protocols/silc/ops.c:1193
 msgid "Failed to change nickname"
 msgstr "�亠 �亟舒仍仂�� 亳亰仄亠仆亳�� 仗�亠于亟仂仆亳仄"
 
-#: src/protocols/silc/ops.c:1221
+#: src/protocols/silc/ops.c:1230
 msgid "Roomlist"
 msgstr "弌仗亳�仂从 从仂仄仆舒�"
 
-#: src/protocols/silc/ops.c:1221
+#: src/protocols/silc/ops.c:1230
 msgid "Cannot get room list"
 msgstr "�亠 �亟舒���� 仗仂仍��亳�� �仗亳�仂从 从仂仄仆舒�"
 
-#: src/protocols/silc/ops.c:1269
+#: src/protocols/silc/ops.c:1278
 msgid "No public key was received"
 msgstr "�亠 弍�仍仂 仗�亳仆��仂 仗�弍仍亳�仆�� 从仍��亠亶"
 
-#: src/protocols/silc/ops.c:1282 src/protocols/silc/ops.c:1296
+#: src/protocols/silc/ops.c:1291 src/protocols/silc/ops.c:1305
 msgid "Server Information"
 msgstr "�仆�仂�仄舒�亳� 仂 �亠�于亠�亠"
 
-#: src/protocols/silc/ops.c:1283
+#: src/protocols/silc/ops.c:1292
 msgid "Cannot get server information"
 msgstr "�亠 �亟舒���� 仗仂仍��亳�� 亳仆�仂�仄舒�亳� 仂 �亠�于亠�亠"
 
-#: src/protocols/silc/ops.c:1314 src/protocols/silc/ops.c:1323
+#: src/protocols/silc/ops.c:1323 src/protocols/silc/ops.c:1332
 #, fuzzy
 msgid "Server Statistics"
 msgstr "�亟�亠� �亠�于亠�舒"
 
-#: src/protocols/silc/ops.c:1315
+#: src/protocols/silc/ops.c:1324
 #, fuzzy
 msgid "Cannot get server statistics"
 msgstr "�亠 �亟舒���� 仗仂仍��亳�� 亳仆�仂�仄舒�亳� 仂 �亠�于亠�亠"
 
-#: src/protocols/silc/ops.c:1324
+#: src/protocols/silc/ops.c:1333
 #, fuzzy
-msgid "No server statisitics available"
+msgid "No server statistics available"
 msgstr "�亠� 亟仂���仗仆�� 亟亠亶��于亳亶"
 
-#: src/protocols/silc/ops.c:1346
+#: src/protocols/silc/ops.c:1355
 #, c-format
 msgid ""
 "Local server start time: %s\n"
@@ -9145,101 +9204,101 @@
 "Total router operators: %d\n"
 msgstr ""
 
-#: src/protocols/silc/ops.c:1369
+#: src/protocols/silc/ops.c:1378
 msgid "Network Statistics"
 msgstr ""
 
-#: src/protocols/silc/ops.c:1377 src/protocols/silc/ops.c:1382
+#: src/protocols/silc/ops.c:1386 src/protocols/silc/ops.c:1391
 msgid "Ping"
 msgstr ""
 
-#: src/protocols/silc/ops.c:1377
+#: src/protocols/silc/ops.c:1386
 #, fuzzy
 msgid "Ping failed"
 msgstr "�亠 �亟舒仍仂�� ���舒仆仂于亳�� �仂亠亟亳仆亠仆亳亠"
 
-#: src/protocols/silc/ops.c:1382
+#: src/protocols/silc/ops.c:1391
 #, fuzzy
 msgid "Ping reply received from server"
 msgstr "�亠于亠�仆�亶 亰舒仗�仂� � �亠�于亠�舒"
 
-#: src/protocols/silc/ops.c:1390
+#: src/protocols/silc/ops.c:1399
 msgid "Could not kill user"
 msgstr "�亠 �亟舒仍仂�� �弍亳�� 仗仂仍�亰仂于舒�亠仍�"
 
-#: src/protocols/silc/ops.c:1471
+#: src/protocols/silc/ops.c:1480
 msgid "Error during connecting to SILC Server"
 msgstr "��亳弍从舒 于仂 于�亠仄� �仂亠亟亳仆亠仆亳� � �亠�于亠�仂仄 SILC"
 
-#: src/protocols/silc/ops.c:1476
+#: src/protocols/silc/ops.c:1485
 msgid "Key Exchange failed"
 msgstr "�亠 �亟舒仍仂�� 于�仗仂仍仆亳�� 仂弍仄亠仆 从仍��舒仄亳"
 
-#: src/protocols/silc/ops.c:1485
+#: src/protocols/silc/ops.c:1494
 msgid ""
 "Resuming detached session failed. Press Reconnect to create new connection."
 msgstr ""
 "�亠 �亟舒仍仂�� 于仂亰仂弍仆仂于亳�� 仗�亠�于舒仆仆�� �亠��亳�. �舒亢仄亳�亠 \"�亠�亠�仂亠亟亳仆亠仆亳亠\" 亟仍� "
 "�仂亰亟舒仆亳� 仆仂于仂亞仂 �仂亠亟亳仆亠仆亳�."
 
-#: src/protocols/silc/ops.c:1520
+#: src/protocols/silc/ops.c:1529
 msgid "Disconnected by server"
 msgstr "弌仂亠亟亳仆亠仆亳亠 �舒亰仂�于舒仆仂 �亠�于亠�仂仄"
 
-#: src/protocols/silc/ops.c:1580 src/protocols/silc/ops.c:1627
+#: src/protocols/silc/ops.c:1589 src/protocols/silc/ops.c:1636
 #: src/protocols/silc/silc.c:167
 msgid "Resuming session"
 msgstr "�仂亰仂弍仆仂于仍亠仆亳亠 �亠��亳亳"
 
-#: src/protocols/silc/ops.c:1582
+#: src/protocols/silc/ops.c:1591
 msgid "Authenticating connection"
 msgstr "�亟亠仆�亳�亳从舒�亳� �仂亠亟亳仆亠仆亳�"
 
-#: src/protocols/silc/ops.c:1629
+#: src/protocols/silc/ops.c:1638
 msgid "Verifying server public key"
 msgstr "��仂于亠�从舒 仗�弍仍亳�仆仂亞仂 从仍��舒 �亠�于亠�舒"
 
-#: src/protocols/silc/ops.c:1670
+#: src/protocols/silc/ops.c:1679
 msgid "Passphrase required"
 msgstr "丐�亠弍�亠��� 仗舒�仂仍�仆舒� ��舒亰舒"
 
-#: src/protocols/silc/ops.c:1699
-msgid "Failure: Version mismatch, upgrade your client"
-msgstr "��亳弍从舒: �亠�仂仂�于亠���于亳亠 于亠��亳亶, 仂弍仆仂于亳�亠 �于仂亠亞仂 从仍亳亠仆�舒"
-
-#: src/protocols/silc/ops.c:1702
-msgid "Failure: Remote does not trust/support your public key"
-msgstr "��亳弍从舒: 丕亟舒仍�仆仆舒� �亳��亠仄舒 仆亠 亟仂于亠��亠�/仗仂亟亟亠�亢亳于舒亠� 于舒� 仗�弍仍亳�仆�亶 从仍��"
-
-#: src/protocols/silc/ops.c:1705
-msgid "Failure: Remote does not support proposed KE group"
-msgstr "��亳弍从舒: 丕亟舒仍�仆仆舒� �亳��亠仄舒 仆亠 仗仂亟亟亠�亢亳于舒亠� 仗�亠亟仍仂亢亠仆仆�� 亞��仗仗� KE"
-
 #: src/protocols/silc/ops.c:1708
-msgid "Failure: Remote does not support proposed cipher"
-msgstr "��亳弍从舒: 丕亟舒仍�仆仆舒� �亳��亠仄舒 仆亠 仗仂亟亟亠�亢亳于舒亠� 仗�亠亟仍仂亢亠仆仆�亶 �亳��"
+msgid "Failure: Version mismatch, upgrade your client"
+msgstr "��亳弍从舒: �亠�仂仂�于亠���于亳亠 于亠��亳亶, 仂弍仆仂于亳�亠 �于仂亠亞仂 从仍亳亠仆�舒"
 
 #: src/protocols/silc/ops.c:1711
-msgid "Failure: Remote does not support proposed PKCS"
-msgstr "��亳弍从舒: 丕亟舒仍�仆仆舒� �亳��亠仄舒 仆亠 仗仂亟亟亠�亢亳于舒亠� 仗�亠亟仍仂亢亠仆仆�亶 PKCS"
+msgid "Failure: Remote does not trust/support your public key"
+msgstr "��亳弍从舒: 丕亟舒仍�仆仆舒� �亳��亠仄舒 仆亠 亟仂于亠��亠�/仗仂亟亟亠�亢亳于舒亠� 于舒� 仗�弍仍亳�仆�亶 从仍��"
 
 #: src/protocols/silc/ops.c:1714
-msgid "Failure: Remote does not support proposed hash function"
-msgstr "��亳弍从舒: 丕亟舒仍�仆仆舒� �亳��亠仄舒 仆亠 仗仂亟亟亠�亢亳于舒亠� 仗�亠亟仍仂亢亠仆仆�� ���-��仆从�亳�"
+msgid "Failure: Remote does not support proposed KE group"
+msgstr "��亳弍从舒: 丕亟舒仍�仆仆舒� �亳��亠仄舒 仆亠 仗仂亟亟亠�亢亳于舒亠� 仗�亠亟仍仂亢亠仆仆�� 亞��仗仗� KE"
 
 #: src/protocols/silc/ops.c:1717
+msgid "Failure: Remote does not support proposed cipher"
+msgstr "��亳弍从舒: 丕亟舒仍�仆仆舒� �亳��亠仄舒 仆亠 仗仂亟亟亠�亢亳于舒亠� 仗�亠亟仍仂亢亠仆仆�亶 �亳��"
+
+#: src/protocols/silc/ops.c:1720
+msgid "Failure: Remote does not support proposed PKCS"
+msgstr "��亳弍从舒: 丕亟舒仍�仆仆舒� �亳��亠仄舒 仆亠 仗仂亟亟亠�亢亳于舒亠� 仗�亠亟仍仂亢亠仆仆�亶 PKCS"
+
+#: src/protocols/silc/ops.c:1723
+msgid "Failure: Remote does not support proposed hash function"
+msgstr "��亳弍从舒: 丕亟舒仍�仆仆舒� �亳��亠仄舒 仆亠 仗仂亟亟亠�亢亳于舒亠� 仗�亠亟仍仂亢亠仆仆�� ���-��仆从�亳�"
+
+#: src/protocols/silc/ops.c:1726
 msgid "Failure: Remote does not support proposed HMAC"
 msgstr "��亳弍从舒: 丕亟舒仍�仆仆舒� �亳��亠仄舒 仆亠 仗仂亟亟亠�亢亳于舒亠� 仗�亠亟仍仂亢亠仆仆�亶 HMAC"
 
-#: src/protocols/silc/ops.c:1719
+#: src/protocols/silc/ops.c:1728
 msgid "Failure: Incorrect signature"
 msgstr "��亳弍从舒: �亠从仂��亠从�仆舒� 仗仂亟仗亳��"
 
-#: src/protocols/silc/ops.c:1721
+#: src/protocols/silc/ops.c:1730
 msgid "Failure: Invalid cookie"
 msgstr ""
 
-#: src/protocols/silc/ops.c:1732
+#: src/protocols/silc/ops.c:1741
 msgid "Failure: Authentication failed"
 msgstr "��亳弍从舒: �亟亠仆�亳�亳从舒�亳� 亰舒于亠��亳仍舒�� 仆亠�亟舒�仆仂"
 
@@ -9447,7 +9506,7 @@
 msgid "whois &lt;nick&gt;:  View nick's information"
 msgstr ""
 
-#: src/protocols/silc/silc.c:1327 src/protocols/zephyr/zephyr.c:1673
+#: src/protocols/silc/silc.c:1327 src/protocols/zephyr/zephyr.c:1676
 msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user"
 msgstr ""
 
@@ -9472,29 +9531,29 @@
 msgid "call &lt;command&gt;:  Call any silc client command"
 msgstr "call &lt;从仂仄舒仆亟舒&gt;:  ��亰于舒�� 仍�弍�� 从仂仄舒仆亟� 从仍亳亠仆�舒 silc"
 
-#: src/protocols/silc/silc.c:1352
+#: src/protocols/silc/silc.c:1353
 msgid "kill &lt;nick&gt; [-pubkey|&lt;reason&gt;]:  Kill nick"
 msgstr ""
 
-#: src/protocols/silc/silc.c:1356
+#: src/protocols/silc/silc.c:1357
 msgid "nick &lt;newnick&gt;:  Change your nickname"
 msgstr "nick &lt;仆仂于�亶 仗�亠于亟仂仆亳仄&gt;:  �亰仄亠仆亳�� �于仂亶 仗�亠于亟仂仆亳仄"
 
-#: src/protocols/silc/silc.c:1360
+#: src/protocols/silc/silc.c:1361
 #, fuzzy
 msgid "whowas &lt;nick&gt;:  View nick's information"
 msgstr "whois &lt;仗�亠于亟仂仆亳仄&gt;:  �仂仍��亳�� 亳仆�仂�仄舒�亳� 仂 仗仂仍�亰仂于舒�亠仍亠."
 
-#: src/protocols/silc/silc.c:1364
+#: src/protocols/silc/silc.c:1365
 #, fuzzy
 msgid ""
-"cmode &lt;channel&gt; [+|-&lt;modes&gt]; [arguments]:  Change or display "
+"cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display "
 "channel modes"
 msgstr ""
 "mode &lt;仗�亠于亟仂仆亳仄|从舒仆舒仍&gt; &lt;+|-&gt;&lt;A-Za-z&gt;:  丕��舒仆仂于亳�� 亳仍亳 "
 "�仆��� �亠亢亳仄 仗仂仍�亰仂于舒�亠仍� 亳仍亳 从舒仆舒仍舒."
 
-#: src/protocols/silc/silc.c:1368
+#: src/protocols/silc/silc.c:1369
 #, fuzzy
 msgid ""
 "cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes "
@@ -9503,88 +9562,88 @@
 "mode &lt;仗�亠于亟仂仆亳仄|从舒仆舒仍&gt; &lt;+|-&gt;&lt;A-Za-z&gt;:  丕��舒仆仂于亳�� 亳仍亳 "
 "�仆��� �亠亢亳仄 仗仂仍�亰仂于舒�亠仍� 亳仍亳 从舒仆舒仍舒."
 
-#: src/protocols/silc/silc.c:1372
+#: src/protocols/silc/silc.c:1373
 msgid "umode &lt;usermodes&gt;:  Set your modes in the network"
 msgstr "umode &lt;�亠亢亳仄� 仗仂仍�亰仂于舒�亠仍�&gt;:  丕��舒仆仂于亳�� �于仂亳 �亠亢亳仄� 于 �亠�亳"
 
-#: src/protocols/silc/silc.c:1376
+#: src/protocols/silc/silc.c:1377
 msgid "oper &lt;nick&gt; [-pubkey]:  Get server operator privileges"
 msgstr ""
 
-#: src/protocols/silc/silc.c:1380
+#: src/protocols/silc/silc.c:1381
 msgid ""
 "invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
 "channel invite list"
 msgstr ""
 
-#: src/protocols/silc/silc.c:1384
+#: src/protocols/silc/silc.c:1385
 msgid "kick &lt;channel&gt; &lt;nick&gt; [comment]:  Kick client from channel"
 msgstr ""
 
-#: src/protocols/silc/silc.c:1388
+#: src/protocols/silc/silc.c:1389
 msgid "info [server]:  View server administrative details"
 msgstr ""
 
-#: src/protocols/silc/silc.c:1392
+#: src/protocols/silc/silc.c:1393
 msgid "ban [&lt;channel&gt; +|-&lt;nick&gt;]:  Ban client from channel"
 msgstr ""
 
-#: src/protocols/silc/silc.c:1396
+#: src/protocols/silc/silc.c:1397
 msgid "getkey &lt;nick|server&gt;:  Retrieve client's or server's public key"
 msgstr ""
 
-#: src/protocols/silc/silc.c:1400
+#: src/protocols/silc/silc.c:1401
 msgid "stats:  View server and network statistics"
 msgstr ""
 
-#: src/protocols/silc/silc.c:1404
+#: src/protocols/silc/silc.c:1405
 msgid "ping:  Send PING to the connected server"
 msgstr ""
 
-#: src/protocols/silc/silc.c:1409
+#: src/protocols/silc/silc.c:1410
 msgid "users &lt;channel&gt;:  List users in channel"
 msgstr ""
 "users &lt;从舒仆舒仍&gt;:  ��于亠��亳 �仗亳�仂从 仗仂仍�亰仂于舒�亠仍亠亶, 仗�亳�����于���亳� 仆舒 从舒仆舒仍亠"
 
-#: src/protocols/silc/silc.c:1413
+#: src/protocols/silc/silc.c:1414
 msgid ""
 "names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List "
 "specific users in channel(s)"
 msgstr ""
 
-#: src/protocols/silc/silc.c:1425
+#: src/protocols/silc/silc.c:1426
 msgid "Instant Messages"
 msgstr "弌仂仂弍�亠仆亳�"
 
-#: src/protocols/silc/silc.c:1430
+#: src/protocols/silc/silc.c:1431
 msgid "Digitally sign all IM messages"
 msgstr "�亠仍舒�� �亳��仂于�� 仗仂亟仗亳�� 于�亠� �仂仂弍�亠仆亳亶"
 
-#: src/protocols/silc/silc.c:1435
+#: src/protocols/silc/silc.c:1436
 msgid "Verify all IM message signatures"
 msgstr "��仂于亠���� 仗仂亟仗亳�亳 于�亠� �仂仂弍�亠仆亳亶"
 
-#: src/protocols/silc/silc.c:1438
+#: src/protocols/silc/silc.c:1439
 msgid "Channel Messages"
 msgstr "弌仂仂弍�亠仆亳� 从舒仆舒仍舒"
 
-#: src/protocols/silc/silc.c:1443
+#: src/protocols/silc/silc.c:1444
 msgid "Digitally sign all channel messages"
 msgstr "�亠仍舒�� �亳��仂于�� 仗仂亟仗亳�� 于�亠� �仂仂弍�亠仆亳亶 从舒仆舒仍舒"
 
-#: src/protocols/silc/silc.c:1448
+#: src/protocols/silc/silc.c:1449
 msgid "Verify all channel message signatures"
 msgstr "��仂于亠���� 仗仂亟仗亳�亳 于�亠� �仂仂弍�亠仆亳亶 从舒仆舒仍舒"
 
-#: src/protocols/silc/silc.c:1451
+#: src/protocols/silc/silc.c:1452
 msgid "Default SILC Key Pair"
 msgstr ""
 
-#: src/protocols/silc/silc.c:1456
+#: src/protocols/silc/silc.c:1457
 msgid "SILC Public Key"
 msgstr "��弍仍亳�仆�亶 从仍�� SILC"
 
-#: src/protocols/silc/silc.c:1461
+#: src/protocols/silc/silc.c:1462
 msgid "SILC Private Key"
 msgstr "�亳�仆�亶 从仍�� SILC"
 
@@ -9598,40 +9657,40 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/silc/silc.c:1547
+#: src/protocols/silc/silc.c:1548
 msgid "SILC Protocol Plugin"
 msgstr "�仂亟�仍� 仗�仂�仂从仂仍舒 SILC"
 
 #. *  description
-#: src/protocols/silc/silc.c:1549
+#: src/protocols/silc/silc.c:1550
 msgid "Secure Internet Live Conferencing (SILC) Protocol"
 msgstr "��仂�仂从仂仍 Secure Internet Live Conferencing (SILC)"
 
-#: src/protocols/silc/silc.c:1579
+#: src/protocols/silc/silc.c:1580
 msgid "Public key authentication"
 msgstr "�亟亠仆�亳�亳从舒�亳� 仗�弍仍亳�仆仂亞仂 从仍��舒"
 
-#: src/protocols/silc/silc.c:1585
+#: src/protocols/silc/silc.c:1586
 msgid "Public Key File"
 msgstr "个舒亶仍 仗�弍仍亳�仆仂亞仂 从仍��舒"
 
-#: src/protocols/silc/silc.c:1589
+#: src/protocols/silc/silc.c:1590
 msgid "Private Key File"
 msgstr "个舒亶仍 仍亳�仆仂亞仂 从仍��舒"
 
-#: src/protocols/silc/silc.c:1594
+#: src/protocols/silc/silc.c:1595
 msgid "Reject watching by other users"
 msgstr "�舒仗�亠�亳�� 仗�仂�仄仂�� 亟��亞亳仄亳 仗仂仍�亰仂于舒�亠仍�仄亳"
 
-#: src/protocols/silc/silc.c:1597
+#: src/protocols/silc/silc.c:1598
 msgid "Block invites"
 msgstr "�仍仂从亳�仂于舒�� 仗�亳亞仍舒�亠仆亳�"
 
-#: src/protocols/silc/silc.c:1600
+#: src/protocols/silc/silc.c:1601
 msgid "Block IMs without Key Exchange"
 msgstr "�仍仂从亳�仂于舒�� �仂仂弍�亠仆亳� 弍亠亰 仂弍仄亠仆舒 从仍��舒仄亳"
 
-#: src/protocols/silc/silc.c:1603
+#: src/protocols/silc/silc.c:1604
 msgid "Reject online status attribute requests"
 msgstr "��从仍仂仆��� 亰舒仗�仂�� 舒��亳弍��舒 �亠�亠于仂亞仂 ��舒���舒"
 
@@ -9853,15 +9912,15 @@
 msgid "TOC has come back from its pause. You may now send messages again."
 msgstr "TOC �于�亰� 于仂���舒仆仂于仍亠仆舒. �� 仄仂亢亠�亠 仂�仗�舒于仍��� �仂仂弍�亠仆亳亠 "
 
-#: src/protocols/toc/toc.c:890
+#: src/protocols/toc/toc.c:891
 msgid "Password Change Successful"
 msgstr "�舒�仂仍� 亳亰仄亠仆�仆 ��仗亠�仆仂"
 
-#: src/protocols/toc/toc.c:894
+#: src/protocols/toc/toc.c:895
 msgid "TOC has sent a PAUSE command."
 msgstr ""
 
-#: src/protocols/toc/toc.c:895
+#: src/protocols/toc/toc.c:896
 #, fuzzy
 msgid ""
 "When this happens, TOC ignores any messages sent to it, and may kick you off "
@@ -9873,45 +9932,45 @@
 "�仂仂弍�亠仆亳亠. Gaim 仆亠 仗仂亰于仂仍亳� 于舒仄 ��仂亞仂 �亟亠仍舒��. 亅�仂 于�亠仄亠仆仆�亠 仆亠亟仂弍��于舒 - "
 "弍�亟��亠 �亠�仗亠仍亳于�."
 
-#: src/protocols/toc/toc.c:1409
+#: src/protocols/toc/toc.c:1410
 msgid "Get Dir Info"
 msgstr "�仂仍��亳�� 亳仆�仂�仄舒�亳� 从舒�舒仍仂亞舒"
 
-#: src/protocols/toc/toc.c:1545
+#: src/protocols/toc/toc.c:1546
 msgid "Set Dir Info"
 msgstr "丕��舒仆仂于亳�� 亳仆�仂�仄舒�亳� 从舒�舒仍仂亞舒"
 
-#: src/protocols/toc/toc.c:1667
+#: src/protocols/toc/toc.c:1668
 #, c-format
 msgid "Could not open %s for writing!"
 msgstr "�亠 �亟舒仍仂�� 仂�从���� %s 亟仍� 亰舒仗亳�亳!"
 
-#: src/protocols/toc/toc.c:1703
+#: src/protocols/toc/toc.c:1704
 msgid "File transfer failed; other side probably canceled."
 msgstr ""
 "�亠 �亟舒仍仂�� 仗�仂亳亰于亠��亳 仗亠�亠亟舒�� �舒亶仍舒; 于亠�仂��仆仂, 仂�仄亠仆亳仍亳 仆舒 �仂亶 ��仂�仂仆亠."
 
-#: src/protocols/toc/toc.c:1748 src/protocols/toc/toc.c:1788
-#: src/protocols/toc/toc.c:1912 src/protocols/toc/toc.c:2000
+#: src/protocols/toc/toc.c:1749 src/protocols/toc/toc.c:1789
+#: src/protocols/toc/toc.c:1913 src/protocols/toc/toc.c:2001
 msgid "Could not connect for transfer."
 msgstr "�亠 �亟舒仍仂�� �仂亠亟亳仆亳���� 亟仍� 仗亠�亠亟舒�亳 �舒亶仍舒."
 
-#: src/protocols/toc/toc.c:1945
+#: src/protocols/toc/toc.c:1946
 msgid "Could not write file header.  The file will not be transferred."
 msgstr "�亠 �亟舒仍仂�� 亰舒仗亳�舒�� 亰舒亞仂仍仂于仂从 �舒亶仍舒. 个舒亶仍 仆亠 弍�亟亠� 仗亠�亠亟舒仆."
 
-#: src/protocols/toc/toc.c:2045
+#: src/protocols/toc/toc.c:2046
 msgid "Gaim - Save As..."
 msgstr "Gaim - 弌仂��舒仆亳�� 从舒从..."
 
-#: src/protocols/toc/toc.c:2079
+#: src/protocols/toc/toc.c:2080
 #, c-format
 msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
 msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/protocols/toc/toc.c:2086
+#: src/protocols/toc/toc.c:2087
 #, c-format
 msgid "%s requests you to send them a file"
 msgstr "%s 亰舒仗�仂�亳仍 仗亠�亠亟舒�� �舒亶仍舒 亠仄�"
@@ -9927,15 +9986,15 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/toc/toc.c:2169 src/protocols/toc/toc.c:2171
+#: src/protocols/toc/toc.c:2170 src/protocols/toc/toc.c:2172
 msgid "TOC Protocol Plugin"
 msgstr "�仂亟�仍� 仗�仂�仂从仂仍舒 TOC"
 
-#: src/protocols/toc/toc.c:2190
+#: src/protocols/toc/toc.c:2191
 msgid "TOC host"
 msgstr "丕亰亠仍 TOC"
 
-#: src/protocols/toc/toc.c:2194
+#: src/protocols/toc/toc.c:2195
 msgid "TOC port"
 msgstr "�仂�� TOC"
 
@@ -10069,7 +10128,7 @@
 
 #: src/protocols/yahoo/yahoo.c:1705
 msgid "Failed Yahoo! Authentication"
-msgstr "�亟亠仆�亳�亳从舒�亳� Yahoo! 仆亠 仗�仂�仍舒"
+msgstr "�亟亠仆�亳�亳从舒�亳� Yahoo! 亰舒于亠��亳仍舒�� 仆亠�亟舒�仆仂"
 
 #: src/protocols/yahoo/yahoo.c:1777
 #, c-format
@@ -10087,9 +10146,8 @@
 msgstr "�亠于亠�仆仂亠 亳仄� 仗仂仍�亰仂于舒�亠仍�."
 
 #: src/protocols/yahoo/yahoo.c:1825
-#, fuzzy
 msgid "Normal authencation failed!"
-msgstr "�亟亠仆�亳�亳从舒�亳� 亰舒于亠��亳仍舒�� 仆亠�亟舒�仆仂"
+msgstr "�弍��仆舒� 亳亟亠仆�亳�亳从舒�亳� 亰舒于亠��亳仍舒�� 仆亠�亟舒�仆仂!"
 
 #: src/protocols/yahoo/yahoo.c:1826
 msgid ""
@@ -10104,8 +10162,9 @@
 msgstr "�亠于亠�仆�亶 仗舒�仂仍�."
 
 #: src/protocols/yahoo/yahoo.c:1837
+#, fuzzy
 msgid "Your account is locked, please log in to the Yahoo! website."
-msgstr "�舒�舒 ����仆舒� 亰舒仗亳�� 亰舒弍仍仂从亳�仂于舒仆舒, 于仂亶亟亳�亠 仆舒 于亠弍-�舒亶� Yahoo!."
+msgstr "*stop* �舒�舒 ����仆舒� 亰舒仗亳�� 亰舒弍仍仂从亳�仂于舒仆舒, 于仂亶亟亳�亠 仆舒 于亠弍-�舒亶� Yahoo!."
 
 #: src/protocols/yahoo/yahoo.c:1840
 #, c-format
@@ -10121,79 +10180,72 @@
 "�亠 �亟舒仍仂�� 亟仂弍舒于亳�� 仗仂仍�亰仂于舒�亠仍� %s 于 亞��仗仗� %s 于 �仗亳�从亠 仆舒 �亠�于亠�亠 ����仆仂亶 "
 "亰舒仗亳�亳 %s."
 
-#: src/protocols/yahoo/yahoo.c:1896
+#: src/protocols/yahoo/yahoo.c:1897
 msgid "Could not add buddy to server list"
 msgstr "�亠 �亟舒仍仂�� 亟仂弍舒于亳�� 仗仂仍�亰仂于舒�亠仍� 于 �仗亳�仂从 仆舒 �亠�于亠�亠"
 
-#: src/protocols/yahoo/yahoo.c:2088 src/protocols/yahoo/yahoo.c:2216
+#: src/protocols/yahoo/yahoo.c:2131 src/protocols/yahoo/yahoo.c:2259
+#: src/protocols/yahoo/ycht.c:414
 msgid "Unable to read"
 msgstr "�亠 �亟舒���� 仗�仂�亳�舒��"
 
-#: src/protocols/yahoo/yahoo.c:2238 src/protocols/yahoo/yahoo.c:2348
-#: src/protocols/yahoo/yahoo.c:2398 src/protocols/yahoo/yahoo.c:2408
+#: src/protocols/yahoo/yahoo.c:2281 src/protocols/yahoo/yahoo.c:2391
+#: src/protocols/yahoo/yahoo.c:2441 src/protocols/yahoo/yahoo.c:2451
 #: src/protocols/yahoo/yahoochat.c:1397 src/protocols/yahoo/yahoochat.c:1458
+#: src/protocols/yahoo/ycht.c:518
 msgid "Connection problem"
 msgstr "��仂弍仍亠仄舒 � �仂亠亟亳仆亠仆亳亠仄"
 
-#: src/protocols/yahoo/yahoo.c:2495 src/protocols/yahoo/yahoo.c:2857
-#: src/protocols/yahoo/yahoo.c:2971
+#: src/protocols/yahoo/yahoo.c:2538 src/protocols/yahoo/yahoo.c:2900
+#: src/protocols/yahoo/yahoo.c:3014
 msgid "Not At Home"
 msgstr "�亠 亟仂仄舒"
 
-#: src/protocols/yahoo/yahoo.c:2497 src/protocols/yahoo/yahoo.c:2859
-#: src/protocols/yahoo/yahoo.c:2972
+#: src/protocols/yahoo/yahoo.c:2540 src/protocols/yahoo/yahoo.c:2902
+#: src/protocols/yahoo/yahoo.c:3015
 msgid "Not At Desk"
 msgstr "�亠 亰舒 ��仂仍仂仄"
 
-#: src/protocols/yahoo/yahoo.c:2499 src/protocols/yahoo/yahoo.c:2861
-#: src/protocols/yahoo/yahoo.c:2973
+#: src/protocols/yahoo/yahoo.c:2542 src/protocols/yahoo/yahoo.c:2904
+#: src/protocols/yahoo/yahoo.c:3016
 msgid "Not In Office"
 msgstr "�亠 于 仂�亳�亠"
 
-#: src/protocols/yahoo/yahoo.c:2503 src/protocols/yahoo/yahoo.c:2865
-#: src/protocols/yahoo/yahoo.c:2975
+#: src/protocols/yahoo/yahoo.c:2546 src/protocols/yahoo/yahoo.c:2908
+#: src/protocols/yahoo/yahoo.c:3018
 msgid "On Vacation"
 msgstr "� 仂�仗��从亠"
 
-#: src/protocols/yahoo/yahoo.c:2507 src/protocols/yahoo/yahoo.c:2869
-#: src/protocols/yahoo/yahoo.c:2977
+#: src/protocols/yahoo/yahoo.c:2550 src/protocols/yahoo/yahoo.c:2912
+#: src/protocols/yahoo/yahoo.c:3020
 msgid "Stepped Out"
 msgstr "���亠仍"
 
-#: src/protocols/yahoo/yahoo.c:2588 src/protocols/yahoo/yahoo.c:2614
+#: src/protocols/yahoo/yahoo.c:2631 src/protocols/yahoo/yahoo.c:2657
 msgid "Not on server list"
 msgstr "�亠 于 �仗亳�从亠 仆舒 �亠�于亠�亠"
 
-#: src/protocols/yahoo/yahoo.c:2634
-#, c-format
-msgid ""
-"\n"
-"<b>%s:</b> %s"
-msgstr ""
-"\n"
-"<b>%s:</b> %s"
-
-#: src/protocols/yahoo/yahoo.c:2693
+#: src/protocols/yahoo/yahoo.c:2736
 msgid "Join in Chat"
 msgstr "��亳�仂亠亟亳仆亳���� 从 �舒��"
 
-#: src/protocols/yahoo/yahoo.c:2698
+#: src/protocols/yahoo/yahoo.c:2741
 msgid "Initiate Conference"
 msgstr "弌仂亰亟舒�� 从仂仆�亠�亠仆�亳�"
 
-#: src/protocols/yahoo/yahoo.c:2750
+#: src/protocols/yahoo/yahoo.c:2793
 msgid "Active which ID?"
 msgstr "�从�亳于亳�仂于舒�� 从舒从仂亶 ID?"
 
-#: src/protocols/yahoo/yahoo.c:2759
+#: src/protocols/yahoo/yahoo.c:2802
 msgid "Join who in chat?"
 msgstr "� 从仂仄� 仗�亳�仂亠亟亳仆亳���� 于 �舒�亠?"
 
-#: src/protocols/yahoo/yahoo.c:2769
+#: src/protocols/yahoo/yahoo.c:2812
 msgid "Activate ID..."
 msgstr "�从�亳于亳�仂于舒�� ID..."
 
-#: src/protocols/yahoo/yahoo.c:2773
+#: src/protocols/yahoo/yahoo.c:2816
 msgid "Join user in chat..."
 msgstr "��亳�仂亠亟亳仆亳���� 从 仗仂仍�亰仂于舒�亠仍� 于 �舒�亠..."
 
@@ -10208,47 +10260,47 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/yahoo/yahoo.c:3292 src/protocols/yahoo/yahoo.c:3294
+#: src/protocols/yahoo/yahoo.c:3335 src/protocols/yahoo/yahoo.c:3337
 msgid "Yahoo Protocol Plugin"
 msgstr "�仂亟�仍� 仗�仂�仂从仂仍舒 Yahoo"
 
-#: src/protocols/yahoo/yahoo.c:3313
+#: src/protocols/yahoo/yahoo.c:3356
 msgid "Yahoo Japan"
 msgstr "Yahoo Japan"
 
-#: src/protocols/yahoo/yahoo.c:3316
+#: src/protocols/yahoo/yahoo.c:3359
 msgid "Pager host"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:3319
+#: src/protocols/yahoo/yahoo.c:3362
 msgid "Japan Pager host"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:3322
+#: src/protocols/yahoo/yahoo.c:3365
 msgid "Pager port"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:3325
+#: src/protocols/yahoo/yahoo.c:3368
 msgid "File transfer host"
 msgstr "丕亰亠仍 仗亠�亠亟舒�亳 �舒亶仍仂于"
 
-#: src/protocols/yahoo/yahoo.c:3328
+#: src/protocols/yahoo/yahoo.c:3371
 msgid "Japan File transfer host"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:3331
+#: src/protocols/yahoo/yahoo.c:3374
 msgid "File transfer port"
 msgstr "�仂�� 仗亠�亠亟舒�亳 �舒亶仍仂于"
 
-#: src/protocols/yahoo/yahoo.c:3334
+#: src/protocols/yahoo/yahoo.c:3377
 msgid "Chat Room List Url"
 msgstr "Url �仗亳�从舒 �舒�仂于"
 
-#: src/protocols/yahoo/yahoo.c:3337
+#: src/protocols/yahoo/yahoo.c:3380
 msgid "YCHT Host"
 msgstr "丕亰亠仍 YCHT"
 
-#: src/protocols/yahoo/yahoo.c:3340
+#: src/protocols/yahoo/yahoo.c:3383
 msgid "YCHT Port"
 msgstr "�仂�� YCHT"
 
@@ -10342,33 +10394,33 @@
 msgid "The user's profile is empty."
 msgstr "��仂�亳仍� 仗仂仍�亰仂于舒�亠仍� 仗���."
 
-#: src/protocols/yahoo/yahoochat.c:203
+#: src/protocols/yahoo/yahoochat.c:193
 #, c-format
 msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
 msgstr ""
 
-#: src/protocols/yahoo/yahoochat.c:205
+#: src/protocols/yahoo/yahoochat.c:195
 msgid "Invitation Rejected"
 msgstr "� 仗�亳亞仍舒�亠仆亳亳 仂�从舒亰舒仆仂"
 
-#: src/protocols/yahoo/yahoochat.c:355
+#: src/protocols/yahoo/yahoochat.c:347
 msgid "Failed to join chat"
 msgstr "�亠 �亟舒仍仂�� 仗�亳�仂亠亟亳仆亳���� 从 �舒��"
 
-#: src/protocols/yahoo/yahoochat.c:355
+#: src/protocols/yahoo/yahoochat.c:347
 msgid "Maybe the room is full?"
 msgstr "�仂亢亠� 弍���, 从仂仄仆舒�舒 仗仂仍仆舒?"
 
-#: src/protocols/yahoo/yahoochat.c:429
+#: src/protocols/yahoo/yahoochat.c:425
 #, c-format
 msgid "You are now chatting in %s."
 msgstr "�� �舒亰亞仂于舒�亳于舒亠�亠 于 %s."
 
-#: src/protocols/yahoo/yahoochat.c:583
+#: src/protocols/yahoo/yahoochat.c:579
 msgid "Failed to join buddy in chat"
 msgstr "�亠 �亟舒仍仂�� 仗�亳�仂亠亟亳仆亳���� 从 仗仂仍�亰仂于舒�亠仍� 于 �舒�亠"
 
-#: src/protocols/yahoo/yahoochat.c:584
+#: src/protocols/yahoo/yahoochat.c:580
 msgid "Maybe they're not in a chat?"
 msgstr "�仂亢亠� 弍���, 仂仆 仆亠 于 �舒�亠?"
 
@@ -10396,108 +10448,103 @@
 msgid "User Rooms"
 msgstr "�仂仄仆舒�� 仗仂仍�亰仂于舒�亠仍�"
 
-#: src/protocols/zephyr/zephyr.c:589
+#: src/protocols/yahoo/ycht.c:401
+#, fuzzy
+msgid "Connection problem with the YCHT server."
+msgstr "��仂弍仍亠仄舒 � �仂亠亟亳仆亠仆亳亠仄"
+
+#: src/protocols/zephyr/zephyr.c:598
 #, c-format
 msgid "Unable send to chat %s,%s,%s"
 msgstr "�亠 �亟舒���� 仂�仗�舒于亳�� 于 �舒� %s,%s,%s"
 
-#: src/protocols/zephyr/zephyr.c:624
+#: src/protocols/zephyr/zephyr.c:633
 #, c-format
 msgid "<b>User:</b> %s<br>"
 msgstr "<b>�仂仍�亰仂于舒�亠仍�:</b> %s<br>"
 
-#: src/protocols/zephyr/zephyr.c:628
+#: src/protocols/zephyr/zephyr.c:637
 msgid "<br>Hidden or not logged-in"
 msgstr "<br>弌�从��� 亳仍亳 仆亠 于 �亠�亳"
 
-#: src/protocols/zephyr/zephyr.c:633
+#: src/protocols/zephyr/zephyr.c:642
 #, c-format
 msgid "<br>At %s since %s"
 msgstr "<br>� %s � %s"
 
-#: src/protocols/zephyr/zephyr.c:983 src/protocols/zephyr/zephyr.c:984
+#: src/protocols/zephyr/zephyr.c:987 src/protocols/zephyr/zephyr.c:988
 msgid "Anyone"
 msgstr "��弍仂亶"
 
-#: src/protocols/zephyr/zephyr.c:1011
-msgid "Already logged in with Zephyr"
-msgstr "丕亢亠 于 �亠�亳 Zephyr"
-
-#: src/protocols/zephyr/zephyr.c:1011
-msgid ""
-"Because Zephyr uses your system username, you are unable to have multiple "
-"accounts on it when logged in as the same user."
-msgstr ""
-
-#: src/protocols/zephyr/zephyr.c:1386
+#: src/protocols/zephyr/zephyr.c:1389
 msgid "_Class:"
 msgstr "�仍舒��:"
 
-#: src/protocols/zephyr/zephyr.c:1392
+#: src/protocols/zephyr/zephyr.c:1395
 msgid "_Instance:"
 msgstr "�仂仗亳�:"
 
-#: src/protocols/zephyr/zephyr.c:1398
+#: src/protocols/zephyr/zephyr.c:1401
 msgid "_Recipient:"
 msgstr "�仂仍��舒�亠仍�:"
 
-#: src/protocols/zephyr/zephyr.c:1409
+#: src/protocols/zephyr/zephyr.c:1412
 #, c-format
 msgid "Attempt to subscribe to %s,%s,%s failed"
 msgstr ""
 
-#: src/protocols/zephyr/zephyr.c:1678
+#: src/protocols/zephyr/zephyr.c:1681
 msgid "zlocate &lt;nick&gt;: Locate user"
 msgstr ""
 
-#: src/protocols/zephyr/zephyr.c:1683
+#: src/protocols/zephyr/zephyr.c:1686
 msgid "zl &lt;nick&gt;: Locate user"
 msgstr ""
 
-#: src/protocols/zephyr/zephyr.c:1688
+#: src/protocols/zephyr/zephyr.c:1691
 msgid "instance &lt;instance&gt;: Set the instance to be used on this class"
 msgstr ""
 
-#: src/protocols/zephyr/zephyr.c:1693
+#: src/protocols/zephyr/zephyr.c:1696
 msgid "inst &lt;instance&gt;: Set the instance to be used on this class"
 msgstr ""
 
-#: src/protocols/zephyr/zephyr.c:1699
+#: src/protocols/zephyr/zephyr.c:1702
 msgid "sub &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Join a new chat"
 msgstr ""
 
-#: src/protocols/zephyr/zephyr.c:1704
+#: src/protocols/zephyr/zephyr.c:1707
 msgid ""
 "zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
 msgstr ""
 
-#: src/protocols/zephyr/zephyr.c:1710
+#: src/protocols/zephyr/zephyr.c:1713
 msgid ""
 "zci &lt;class&gt; &lt;instance&gt;: Send a message to &lt;<i>class</i>,"
 "<i>instance</i>,*&gt;"
 msgstr ""
 
-#: src/protocols/zephyr/zephyr.c:1716
+#: src/protocols/zephyr/zephyr.c:1719
 msgid ""
 "zcir &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;"
 "<i>class</i>,<i>instance</i>,<i>recipient</i>&gt;"
 msgstr ""
 
-#: src/protocols/zephyr/zephyr.c:1722
+#: src/protocols/zephyr/zephyr.c:1725
 msgid ""
 "zir &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;MESSAGE,"
 "<i>instance</i>,<i>recipient</i>&gt;"
 msgstr ""
 
-#: src/protocols/zephyr/zephyr.c:1727
+#: src/protocols/zephyr/zephyr.c:1730
 msgid "zc &lt;class&gt;: Send a message to &lt;<i>class</i>,PERSONAL,*&gt;"
 msgstr ""
 
-#: src/protocols/zephyr/zephyr.c:1802
+#: src/protocols/zephyr/zephyr.c:1806
 msgid "Resubscribe"
 msgstr "�仂亟仗亳�舒���� 仗仂于�仂�仆仂"
 
-#: src/protocols/zephyr/zephyr.c:1805
+#: src/protocols/zephyr/zephyr.c:1809
 msgid "Retrieve subscriptions from server"
 msgstr ""
 
@@ -10512,46 +10559,46 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/zephyr/zephyr.c:1885 src/protocols/zephyr/zephyr.c:1887
+#: src/protocols/zephyr/zephyr.c:1889 src/protocols/zephyr/zephyr.c:1891
 msgid "Zephyr Protocol Plugin"
 msgstr "�仂亟�仍� 仗�仂�仂从仂仍舒 Zephyr"
 
-#: src/protocols/zephyr/zephyr.c:1906
+#: src/protocols/zephyr/zephyr.c:1910
 msgid "Export to .anyone"
 msgstr ""
 
-#: src/protocols/zephyr/zephyr.c:1909
+#: src/protocols/zephyr/zephyr.c:1913
 msgid "Export to .zephyr.subs"
 msgstr ""
 
-#: src/protocols/zephyr/zephyr.c:1912
+#: src/protocols/zephyr/zephyr.c:1916
 msgid "Exposure"
 msgstr ""
 
 #. XXX: why in the hell are we calling gaim_connection_error() here?
 #. Forbidden
-#: src/proxy.c:845
+#: src/proxy.c:870
 #, c-format
 msgid "Access denied: proxy server forbids port %d tunnelling."
 msgstr "�仂���仗 亰舒仗�亠��仆: 仗�仂从�亳-�亠�于亠� 亰舒仗�亠�舒亠� ��仆仆亠仍亳�仂于舒仆亳亠 仗仂��舒 %d."
 
-#: src/proxy.c:849
+#: src/proxy.c:874
 #, c-format
 msgid "Proxy connection error %d"
 msgstr "��亳弍从舒 �仂亠亟亳仆亠仆亳� � 仗�仂从�亳 %d"
 
-#: src/proxy.c:1495
+#: src/proxy.c:1520
 msgid "Invalid proxy settings"
 msgstr "�亠于亠�仆�亠 仆舒���仂亶从亳 仗�仂从�亳"
 
-#: src/proxy.c:1495
+#: src/proxy.c:1520
 msgid ""
 "Either the host name or port number specified for your given proxy type is "
 "invalid."
 msgstr "�仄� �亰仍舒 亳仍亳 仆仂仄亠� 仗仂��舒, �从舒亰舒仆仆�亠 亟仍� 亟舒仆仆仂亞仂 �亳仗舒 仗�仂从�亳, 仆亠于亠�仆�."
 
 #. * Custom away message.
-#: src/prpl.h:165
+#: src/prpl.h:171
 msgid "Custom"
 msgstr "���亞仂亠"
 
@@ -10566,74 +10613,74 @@
 msgid "Please enter your password"
 msgstr "�于亠亟亳�亠 仗舒�仂仍�"
 
-#: src/server.c:528
+#: src/server.c:534
 #, c-format
 msgid "%s is now known as %s.\n"
 msgstr "%s �亠仗亠�� 亳亰于亠��亠仆 从舒从 %s.\n"
 
-#: src/server.c:938
+#: src/server.c:945
 #, c-format
 msgid "(%d message)"
 msgid_plural "(%d messages)"
 msgstr[0] "(%d �仂仂弍�亠仆亳亠)"
 msgstr[1] "(%d �仂仂弍�亠仆亳亶)"
 
-#: src/server.c:952
+#: src/server.c:959
 msgid "(1 message)"
 msgstr "(1 �仂仂弍�亠仆亳亠)"
 
-#: src/server.c:1180 src/server.c:1189
+#: src/server.c:1188 src/server.c:1197
 #, c-format
 msgid "%s logged in."
 msgstr "%s 于 �亠�亳."
 
-#: src/server.c:1201
+#: src/server.c:1209
 #, c-format
 msgid "%s signed on"
 msgstr "%s 于仂��仍"
 
-#: src/server.c:1216
+#: src/server.c:1224
 #, c-format
 msgid "%s came back"
 msgstr "%s 于亠�仆�仍��"
 
-#: src/server.c:1218
+#: src/server.c:1226
 #, c-format
 msgid "%s went away"
 msgstr "%s 仂�仂��仍"
 
-#: src/server.c:1232
+#: src/server.c:1240
 #, c-format
 msgid "%s became idle"
 msgstr "%s 仆舒�舒仍 弍亠亰亟亠亶��于仂于舒��"
 
-#: src/server.c:1243
+#: src/server.c:1251
 #, c-format
 msgid "%s became unidle"
 msgstr "%s 仗亠�亠��舒仍 弍亠亰亟亠亶��于仂于舒��"
 
-#: src/server.c:1253 src/server.c:1260
+#: src/server.c:1261 src/server.c:1268
 #, c-format
 msgid "%s logged out."
 msgstr "%s 仆亠 于 �亠�亳."
 
-#: src/server.c:1273
+#: src/server.c:1281
 #, c-format
 msgid "%s signed off"
 msgstr "%s 于��亠仍"
 
-#: src/server.c:1335
+#: src/server.c:1343
 #, c-format
 msgid ""
 "%s has just been warned by %s.\n"
 "Your new warning level is %d%%"
 msgstr ""
 
-#: src/server.c:1338
+#: src/server.c:1346
 msgid "an anonymous person"
 msgstr "舒仆仂仆亳仄仆舒� 仗亠��仂仆舒"
 
-#: src/server.c:1448
+#: src/server.c:1456
 #, c-format
 msgid ""
 "User '%s' invites %s to buddy chat room: '%s'\n"
@@ -10642,12 +10689,12 @@
 "�仂仍�亰仂于舒�亠仍� '%s' 仗�亳亞仍舒�舒亠� %s 于 �舒�: '%s'\n"
 "%s"
 
-#: src/server.c:1452
+#: src/server.c:1460
 #, c-format
 msgid "User '%s' invites %s to buddy chat room: '%s'\n"
 msgstr "�仂仍�亰仂于舒�亠仍� '%s' 仗�亳亞仍舒�亠� %s 于 �舒�: '%s'\n"
 
-#: src/server.c:1458
+#: src/server.c:1466
 msgid "Accept chat invitation?"
 msgstr "��亳仆��� 仗�亳亞仍舒�亠仆亳亠 于 �舒�?"
 
@@ -10664,7 +10711,7 @@
 
 #: src/stock.c:88
 msgid "_Modify"
-msgstr "�亰仄亠仆亳��"
+msgstr "_�亰仄亠仆亳��"
 
 #: src/stock.c:89
 msgid "_Open Mail"