changeset 7681:9ca2cdcc6f99

[gaim-migrate @ 8325] 2 more updates, including one that got to me in a round-about manner committer: Tailor Script <tailor@pidgin.im>
author Luke Schierer <lschiere@pidgin.im>
date Mon, 01 Dec 2003 17:03:00 +0000 (2003-12-01)
parents 4995ad0ada66
children d9caaddaa56d
files ChangeLog po/pt_BR.po po/vi.po src/win32/nsis/translations/portuguese-br.nsh
diffstat 4 files changed, 1843 insertions(+), 1823 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Mon Dec 01 04:19:39 2003 +0000
+++ b/ChangeLog	Mon Dec 01 17:03:00 2003 +0000
@@ -8,6 +8,7 @@
 	* Italian translation updated (Claudio Satriano)
 	* Portuguese (Brazilian) translation updated (Mauricio de Lemos
 	  Rodrigues Collares Neto)
+	* Vietnamese translation updated (T.M.Thanh)
 
 version 0.74 (11/25/2003):
 	* Sort-by-size log sorting fix
--- a/po/pt_BR.po	Mon Dec 01 04:19:39 2003 +0000
+++ b/po/pt_BR.po	Mon Dec 01 17:03:00 2003 +0000
@@ -7,8 +7,8 @@
 msgstr ""
 "Project-Id-Version: Gaim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-11-28 21:42-0300\n"
-"PO-Revision-Date: 2003-11-28 21:42-0300\n"
+"POT-Creation-Date: 2003-12-01 10:26-0300\n"
+"PO-Revision-Date: 2003-12-01 10:27-0300\n"
 "Last-Translator: Maur鱈cio de Lemos Rodrigues Collares Neto "
 "<mauricioc@myrealbox.com>\n"
 "Language-Team: pt_BR <pt_BR@li.org>\n"
@@ -134,7 +134,7 @@
 msgid "Gaim - Away"
 msgstr "Gaim - Ausente"
 
-#: plugins/docklet/docklet.c:114 src/gtkaccount.c:482 src/gtkaccount.c:1768
+#: plugins/docklet/docklet.c:114 src/gtkaccount.c:482 src/gtkaccount.c:1769
 msgid "Auto-login"
 msgstr "Auto-conectar"
 
@@ -150,12 +150,12 @@
 msgid "New..."
 msgstr "Novo..."
 
-#: plugins/docklet/docklet.c:153 src/gtkblist.c:2369 src/gtkpounce.c:411
+#: plugins/docklet/docklet.c:153 src/gtkblist.c:2374 src/gtkpounce.c:411
 #: src/gtkprefs.c:1467 src/protocols/gg/gg.c:51 src/protocols/irc/msgs.c:187
 #: src/protocols/jabber/jabber.c:926 src/protocols/jabber/jutil.c:98
-#: src/protocols/jabber/presence.c:84 src/protocols/oscar/oscar.c:2895
-#: src/protocols/oscar/oscar.c:4642 src/protocols/oscar/oscar.c:5588
-#: src/protocols/oscar/oscar.c:6189
+#: src/protocols/jabber/presence.c:84 src/protocols/oscar/oscar.c:2844
+#: src/protocols/oscar/oscar.c:4591 src/protocols/oscar/oscar.c:5537
+#: src/protocols/oscar/oscar.c:6138
 msgid "Away"
 msgstr "Ausente"
 
@@ -172,7 +172,7 @@
 msgstr "Transfer棚ncias de arquivos"
 
 #. And now for the buttons
-#: plugins/docklet/docklet.c:173 src/gtkaccount.c:1927 src/main.c:323
+#: plugins/docklet/docklet.c:173 src/gtkaccount.c:1928 src/main.c:323
 msgid "Accounts"
 msgstr "Contas"
 
@@ -235,14 +235,14 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/filectl.c:201
+#: plugins/filectl.c:223
 msgid "Gaim File Control"
 msgstr "Controle por arquivos do Gaim"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/filectl.c:204 plugins/filectl.c:206
+#: plugins/filectl.c:226 plugins/filectl.c:228
 msgid "Allows you to control Gaim by entering commands in a file."
 msgstr "Permite que voc棚 controle o Gaim inserindo comandos em um arquivo."
 
@@ -415,11 +415,10 @@
 
 #: plugins/history.c:78
 msgid ""
-"When a new conversation is opened this plugin will insert the last XXX of "
-"the last conversation into the current conversation."
-msgstr ""
-"Quando uma nova conversa 辿 aberta este plugin ir叩 inserir as 炭ltimas XXX "
-"linhas da 炭ltima conversa na conversa atual."
+"When a new conversation is opened this plugin will insert the last "
+"conversation into the current conversation."
+msgstr ""
+"Quando uma nova conversa 辿 aberta este plugin ir叩 inserir a 炭ltima conversa na conversa atual."
 
 #. *< api_version
 #. *< type
@@ -990,7 +989,7 @@
 msgstr "_Iniciar o Gaim junto com o Windows"
 
 #. Buddy List
-#: plugins/win32/winprefs/winprefs.c:366 src/gtkblist.c:2204
+#: plugins/win32/winprefs/winprefs.c:366 src/gtkblist.c:2208
 #: src/gtkprefs.c:2264
 msgid "Buddy List"
 msgstr "Lista de amigos"
@@ -1110,11 +1109,11 @@
 msgid "Current Translators"
 msgstr "Atuais tradutores"
 
-#: src/about.c:164 src/about.c:196
+#: src/about.c:164 src/about.c:197
 msgid "Catalan"
 msgstr "Catal達o"
 
-#: src/about.c:165 src/about.c:197
+#: src/about.c:165 src/about.c:198
 msgid "Czech"
 msgstr "Tcheco"
 
@@ -1122,119 +1121,123 @@
 msgid "Danish"
 msgstr "Dinamarqu棚s"
 
-#: src/about.c:167 src/about.c:198
-msgid "German"
-msgstr "Alem達o"
+#: src/about.c:167
+msgid "Esperanto"
+msgstr "Esperanto"
 
 #: src/about.c:168 src/about.c:199
+msgid "German"
+msgstr "Alem達o"
+
+#: src/about.c:169 src/about.c:200
 msgid "Spanish"
 msgstr "Espanhol"
 
-#: src/about.c:169
+#: src/about.c:170 src/about.c:201
 msgid "Finnish"
 msgstr "Finland棚s"
 
-#: src/about.c:170 src/about.c:200
+#: src/about.c:171 src/about.c:202
 msgid "French"
 msgstr "Franc棚s"
 
-#: src/about.c:171
+#: src/about.c:172
 msgid "Hindi"
 msgstr "Hindu"
 
-#: src/about.c:172
+#: src/about.c:173
 msgid "Hungarian"
 msgstr "H炭ngaro"
 
-#: src/about.c:173 src/about.c:202
+#: src/about.c:174 src/about.c:204
 msgid "Italian"
 msgstr "Italiano"
 
-#: src/about.c:174 src/about.c:204
+#: src/about.c:175 src/about.c:206
 msgid "Korean"
 msgstr "Coreano"
 
-#: src/about.c:175
+#: src/about.c:176
 msgid "Dutch; Flemish"
 msgstr "Holand棚s; Flamengo"
 
-#: src/about.c:176
+#: src/about.c:177
 msgid "Norwegian"
 msgstr "Noruegu棚s"
 
-#: src/about.c:177 src/about.c:205
+#: src/about.c:178 src/about.c:207
 msgid "Polish"
 msgstr "Polon棚s"
 
-#: src/about.c:178
+#: src/about.c:179
 msgid "Portuguese"
 msgstr "Portugu棚s"
 
-#: src/about.c:179
+#: src/about.c:180
 msgid "Portuguese-Brazil"
 msgstr "Portugu棚s do Brasil"
 
-#: src/about.c:180
+#: src/about.c:181
 msgid "Romanian"
 msgstr "Romeno"
 
-#: src/about.c:181 src/about.c:206
+#: src/about.c:182 src/about.c:208
 msgid "Russian"
 msgstr "Russo"
 
-#: src/about.c:182
+#: src/about.c:183
 msgid "Serbian"
 msgstr "S辿rvio"
 
-#: src/about.c:183 src/about.c:208
+#: src/about.c:184 src/about.c:210
 msgid "Swedish"
 msgstr "Sueco"
 
-#: src/about.c:184
+#: src/about.c:185
 msgid "Vietnamese"
 msgstr "Vietnamita"
 
-#: src/about.c:184
+#: src/about.c:185
 msgid "Gnome Vi Team"
 msgstr "Equipe Vi do GNOME"
 
-#: src/about.c:185
+#: src/about.c:186
 msgid "Simplified Chinese"
 msgstr "Chin棚s Simplificado"
 
-#: src/about.c:186
+#: src/about.c:187
 msgid "Traditional Chinese"
 msgstr "Chin棚s Tradicional"
 
-#: src/about.c:193
+#: src/about.c:194
 msgid "Past Translators"
 msgstr "Antigos tradutores"
 
-#: src/about.c:194
+#: src/about.c:195
 msgid "Amharic"
 msgstr "Amh叩rico"
 
-#: src/about.c:195
+#: src/about.c:196
 msgid "Bulgarian"
 msgstr "B炭lgaro"
 
-#: src/about.c:201
+#: src/about.c:203
 msgid "Hebrew"
 msgstr "Hebraico"
 
-#: src/about.c:203
+#: src/about.c:205
 msgid "Japanese"
 msgstr "Japon棚s"
 
-#: src/about.c:207
+#: src/about.c:209
 msgid "Slovak"
 msgstr "Esolvaco"
 
-#: src/about.c:209
+#: src/about.c:211
 msgid "Chinese"
 msgstr "Chin棚s"
 
-#: src/about.c:222 src/dialogs.c:2180 src/gtkrequest.c:198
+#: src/about.c:224 src/dialogs.c:2180 src/gtkrequest.c:198
 #: src/protocols/msn/msn.c:247
 msgid "Close"
 msgstr "Fechar"
@@ -1272,14 +1275,14 @@
 #. * A wrapper for gaim_request_action() that uses OK and Cancel buttons.
 #.
 #: src/account.c:334 src/connection.c:193 src/dialogs.c:1720
-#: src/dialogs.c:1737 src/dialogs.c:1780 src/gtkblist.c:1570
+#: src/dialogs.c:1737 src/dialogs.c:1780 src/gtkblist.c:1574
 #: src/gtkrequest.c:195 src/protocols/jabber/jabber.c:1023
 #: src/protocols/msn/msn.c:181 src/protocols/msn/msn.c:192
 #: src/protocols/msn/msn.c:203 src/protocols/msn/msn.c:214
-#: src/protocols/oscar/oscar.c:2506 src/protocols/oscar/oscar.c:2586
-#: src/protocols/oscar/oscar.c:6239 src/protocols/oscar/oscar.c:6327
-#: src/protocols/oscar/oscar.c:6376 src/protocols/oscar/oscar.c:6458
-#: src/protocols/yahoo/yahoo.c:2230 src/request.h:852
+#: src/protocols/oscar/oscar.c:2455 src/protocols/oscar/oscar.c:2535
+#: src/protocols/oscar/oscar.c:6188 src/protocols/oscar/oscar.c:6284
+#: src/protocols/oscar/oscar.c:6333 src/protocols/oscar/oscar.c:6415
+#: src/protocols/yahoo/yahoo.c:2261 src/request.h:852
 msgid "OK"
 msgstr "OK"
 
@@ -1288,20 +1291,20 @@
 #: src/connection.c:194 src/dialogs.c:459 src/dialogs.c:471 src/dialogs.c:484
 #: src/dialogs.c:505 src/dialogs.c:890 src/dialogs.c:1554 src/dialogs.c:1721
 #: src/dialogs.c:1738 src/dialogs.c:1781 src/dialogs.c:1897
-#: src/gtkaccount.c:1622 src/gtkaccount.c:2090 src/gtkblist.c:1571
-#: src/gtkblist.c:3506 src/gtkconn.c:148 src/gtkprivacy.c:568
+#: src/gtkaccount.c:1622 src/gtkaccount.c:2091 src/gtkblist.c:1575
+#: src/gtkblist.c:3511 src/gtkconn.c:148 src/gtkprivacy.c:568
 #: src/gtkprivacy.c:581 src/gtkprivacy.c:606 src/gtkprivacy.c:617
 #: src/gtkrequest.c:196 src/protocols/icq/gaim_icq.c:277
 #: src/protocols/jabber/buddy.c:512 src/protocols/jabber/jabber.c:651
 #: src/protocols/jabber/jabber.c:1024 src/protocols/msn/msn.c:182
 #: src/protocols/msn/msn.c:193 src/protocols/msn/msn.c:204
 #: src/protocols/msn/msn.c:215 src/protocols/msn/msn.c:228
-#: src/protocols/oscar/oscar.c:2470 src/protocols/oscar/oscar.c:2507
-#: src/protocols/oscar/oscar.c:2542 src/protocols/oscar/oscar.c:2587
-#: src/protocols/oscar/oscar.c:6067 src/protocols/oscar/oscar.c:6240
-#: src/protocols/oscar/oscar.c:6328 src/protocols/oscar/oscar.c:6377
-#: src/protocols/oscar/oscar.c:6442 src/protocols/oscar/oscar.c:6459
-#: src/protocols/trepia/trepia.c:347 src/protocols/yahoo/yahoo.c:2231
+#: src/protocols/oscar/oscar.c:2419 src/protocols/oscar/oscar.c:2456
+#: src/protocols/oscar/oscar.c:2491 src/protocols/oscar/oscar.c:2536
+#: src/protocols/oscar/oscar.c:6016 src/protocols/oscar/oscar.c:6189
+#: src/protocols/oscar/oscar.c:6285 src/protocols/oscar/oscar.c:6334
+#: src/protocols/oscar/oscar.c:6399 src/protocols/oscar/oscar.c:6416
+#: src/protocols/trepia/trepia.c:347 src/protocols/yahoo/yahoo.c:2262
 #: src/request.h:852 src/request.h:862
 msgid "Cancel"
 msgstr "Cancelar"
@@ -1341,7 +1344,7 @@
 msgid "Chats"
 msgstr "Chats"
 
-#: src/blist.c:646 src/blist.c:834 src/blist.c:2042 src/gtkblist.c:2986
+#: src/blist.c:646 src/blist.c:834 src/blist.c:2042 src/gtkblist.c:2991
 #: src/protocols/jabber/roster.c:66 src/protocols/msn/notification.c:1160
 msgid "Buddies"
 msgstr "Amigos"
@@ -1385,7 +1388,7 @@
 msgid "Buddy List Error"
 msgstr "Erro da lista de amigos"
 
-#: src/buddy_chat.c:312 src/gtkblist.c:3398
+#: src/buddy_chat.c:312 src/gtkblist.c:3403
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
@@ -1597,7 +1600,7 @@
 "de ver.\n"
 
 #: src/dialogs.c:845 src/protocols/jabber/jabber.c:1034
-#: src/protocols/oscar/oscar.c:6527 src/protocols/toc/toc.c:1532
+#: src/protocols/oscar/oscar.c:6484 src/protocols/toc/toc.c:1532
 msgid "Set User Info"
 msgstr "Definir informa巽探es de usu叩rio"
 
@@ -1707,7 +1710,7 @@
 msgid "_Screenname"
 msgstr "_Nome de usu叩rio"
 
-#: src/dialogs.c:1771 src/gtkblist.c:838 src/gtkblist.c:926 src/gtkblist.c:945
+#: src/dialogs.c:1771 src/gtkblist.c:842 src/gtkblist.c:930 src/gtkblist.c:949
 msgid "_Alias"
 msgstr "_Apelido"
 
@@ -1891,15 +1894,15 @@
 msgid "boring default"
 msgstr "Padr達o chato"
 
-#: src/gaimrc.c:1259 src/gtkblist.c:2166
+#: src/gaimrc.c:1259 src/gtkblist.c:2170
 msgid "Alphabetical"
 msgstr "Alfab辿tica"
 
-#: src/gaimrc.c:1261 src/gtkblist.c:2167
+#: src/gaimrc.c:1261 src/gtkblist.c:2171
 msgid "By status"
 msgstr "Por status"
 
-#: src/gaimrc.c:1263 src/gtkblist.c:2168
+#: src/gaimrc.c:1263 src/gtkblist.c:2172
 msgid "By log size"
 msgstr "Por tamanho do log"
 
@@ -1919,7 +1922,7 @@
 "<b>Tamanho do arquivo:</b> %s\n"
 "<b>Dimens探es da imagem:</b> %dx%d"
 
-#: src/gtkaccount.c:318 src/protocols/oscar/oscar.c:3128
+#: src/gtkaccount.c:318 src/protocols/oscar/oscar.c:3077
 msgid "Buddy Icon"
 msgstr "�cone do amigo"
 
@@ -1941,7 +1944,7 @@
 msgid "Password:"
 msgstr "Senha:"
 
-#: src/gtkaccount.c:469 src/gtkblist.c:3138 src/gtkblist.c:3457
+#: src/gtkaccount.c:469 src/gtkblist.c:3143 src/gtkblist.c:3462
 msgid "Alias:"
 msgstr "Apelido:"
 
@@ -2069,27 +2072,27 @@
 msgid "Delete"
 msgstr "Remover"
 
-#: src/gtkaccount.c:1734
+#: src/gtkaccount.c:1735
 msgid "Screen Name"
 msgstr "Nome de usu叩rio"
 
-#: src/gtkaccount.c:1757 src/protocols/jabber/jabber.c:924
-#: src/protocols/oscar/oscar.c:2901 src/protocols/oscar/oscar.c:4640
-#: src/protocols/oscar/oscar.c:6188 src/protocols/yahoo/yahoo.c:2032
+#: src/gtkaccount.c:1758 src/protocols/jabber/jabber.c:924
+#: src/protocols/oscar/oscar.c:2850 src/protocols/oscar/oscar.c:4589
+#: src/protocols/oscar/oscar.c:6137 src/protocols/yahoo/yahoo.c:2056
 #: src/protocols/zephyr/zephyr.c:886 src/protocols/zephyr/zephyr.c:896
 msgid "Online"
 msgstr "Conectado"
 
-#: src/gtkaccount.c:1775
+#: src/gtkaccount.c:1776
 msgid "Protocol"
 msgstr "Protocolo"
 
-#: src/gtkaccount.c:2065
+#: src/gtkaccount.c:2066
 #, 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:2079
+#: src/gtkaccount.c:2080
 msgid ""
 "\n"
 "\n"
@@ -2099,184 +2102,184 @@
 "\n"
 "Voc棚 deseja adicionar ele(a) � sua lista de amigos?"
 
-#: src/gtkaccount.c:2083
+#: src/gtkaccount.c:2084
 msgid "Gaim - Information"
 msgstr "Gaim - Informa巽達o"
 
-#: src/gtkaccount.c:2087
+#: src/gtkaccount.c:2088
 msgid "Add buddy to your list?"
 msgstr "Adicionar amigo � sua lista?"
 
-#: src/gtkaccount.c:2089 src/gtkblist.c:3505 src/gtkconv.c:1271
-#: src/gtkconv.c:3156 src/gtkconv.c:4326 src/gtkrequest.c:200
-#: src/protocols/icq/gaim_icq.c:277 src/protocols/oscar/oscar.c:2743
+#: src/gtkaccount.c:2090 src/gtkblist.c:3510 src/gtkconv.c:1257
+#: src/gtkconv.c:3110 src/gtkconv.c:4280 src/gtkrequest.c:200
+#: src/protocols/icq/gaim_icq.c:277 src/protocols/oscar/oscar.c:2692
 msgid "Add"
 msgstr "Adicionar"
 
-#: src/gtkblist.c:811
+#: src/gtkblist.c:815
 msgid "_Get Info"
 msgstr "_Ver informa巽探es"
 
-#: src/gtkblist.c:814
+#: src/gtkblist.c:818
 msgid "_IM"
 msgstr "_Mensagem instant但nea"
 
-#: src/gtkblist.c:816
+#: src/gtkblist.c:820
 msgid "Add Buddy _Pounce"
 msgstr "Adicionar notifica巽達o de _amigo"
 
-#: src/gtkblist.c:818
+#: src/gtkblist.c:822
 msgid "View _Log"
 msgstr "Ver _log"
 
-#: src/gtkblist.c:840 src/gtkblist.c:928 src/gtkblist.c:950
+#: src/gtkblist.c:844 src/gtkblist.c:932 src/gtkblist.c:954
 msgid "_Remove"
 msgstr "_Remover"
 
-#: src/gtkblist.c:903
+#: src/gtkblist.c:907
 msgid "Add a _Buddy"
 msgstr "Adicionar um _amigo"
 
-#: src/gtkblist.c:905
-msgid "Add a C_hat"
-msgstr "Adicionar um c_hat"
-
-#: src/gtkblist.c:907
-msgid "_Delete Group"
-msgstr "_Remover grupo"
-
 #: src/gtkblist.c:909
+msgid "Add a C_hat"
+msgstr "Adicionar um c_hat"
+
+#: src/gtkblist.c:911
+msgid "_Delete Group"
+msgstr "_Remover grupo"
+
+#: src/gtkblist.c:913
 msgid "_Rename"
 msgstr "_Renomear"
 
-#: src/gtkblist.c:921
+#: src/gtkblist.c:925
 msgid "_Join"
 msgstr "_Entrar"
 
-#: src/gtkblist.c:923
+#: src/gtkblist.c:927
 msgid "Auto-Join"
 msgstr "Entrar automaticamente"
 
-#: src/gtkblist.c:947 src/gtkblist.c:982
+#: src/gtkblist.c:951 src/gtkblist.c:986
 msgid "_Collapse"
 msgstr "Re_colher"
 
-#: src/gtkblist.c:987
+#: src/gtkblist.c:991
 msgid "_Expand"
 msgstr "_Expandir"
 
 #. Buddies menu
-#: src/gtkblist.c:1520
+#: src/gtkblist.c:1524
 msgid "/_Buddies"
 msgstr "/_Amigos"
 
-#: src/gtkblist.c:1521
+#: src/gtkblist.c:1525
 msgid "/Buddies/New _Instant Message..."
 msgstr "/Amigos/Nova _mensagem instant但nea..."
 
-#: src/gtkblist.c:1522
-msgid "/Buddies/Join a _Chat..."
-msgstr "/Amigos/Entrar em um _chat..."
-
-#: src/gtkblist.c:1523
-msgid "/Buddies/Get _User Info..."
-msgstr "/Amigos/Ver informa巽探es do usu叩rio..."
-
-#: src/gtkblist.c:1525
-msgid "/Buddies/Show _Offline Buddies"
-msgstr "/Amigos/Exibir amig_os desconectados"
-
 #: src/gtkblist.c:1526
-msgid "/Buddies/Show _Empty Groups"
-msgstr "/Amigos/Exibir grupos _vazios"
+msgid "/Buddies/Join a _Chat..."
+msgstr "/Amigos/Entrar em um _chat..."
 
 #: src/gtkblist.c:1527
+msgid "/Buddies/Get _User Info..."
+msgstr "/Amigos/Ver informa巽探es do usu叩rio..."
+
+#: src/gtkblist.c:1529
+msgid "/Buddies/Show _Offline Buddies"
+msgstr "/Amigos/Exibir amig_os desconectados"
+
+#: src/gtkblist.c:1530
+msgid "/Buddies/Show _Empty Groups"
+msgstr "/Amigos/Exibir grupos _vazios"
+
+#: src/gtkblist.c:1531
 msgid "/Buddies/_Add a Buddy..."
 msgstr "/Amigos/_Adicionar um amigo..."
 
-#: src/gtkblist.c:1528
+#: src/gtkblist.c:1532
 msgid "/Buddies/Add a C_hat..."
 msgstr "/Amigos/Adicionar um c_hat..."
 
-#: src/gtkblist.c:1529
+#: src/gtkblist.c:1533
 msgid "/Buddies/Add a _Group..."
 msgstr "/Amigos/Criar _grupo..."
 
-#: src/gtkblist.c:1531
+#: src/gtkblist.c:1535
 msgid "/Buddies/_Signoff"
 msgstr "/Amigos/_Desconectar"
 
-#: src/gtkblist.c:1532
+#: src/gtkblist.c:1536
 msgid "/Buddies/_Quit"
 msgstr "/Amigos/_Sair"
 
 #. Tools
-#: src/gtkblist.c:1535
+#: src/gtkblist.c:1539
 msgid "/_Tools"
 msgstr "/_Ferramentas"
 
-#: src/gtkblist.c:1536
-msgid "/Tools/_Away"
-msgstr "/Ferrramentas/_Away"
-
-#: src/gtkblist.c:1537
-msgid "/Tools/Buddy _Pounce"
-msgstr "/Ferramentas/Notifica巽達o de amigo"
-
-#: src/gtkblist.c:1538
-msgid "/Tools/P_rotocol Actions"
-msgstr "/Ferramentas/A巽探es de p_rotocolo"
-
 #: src/gtkblist.c:1540
-msgid "/Tools/A_ccounts"
-msgstr "/Ferramentas/_Contas"
+msgid "/Tools/_Away"
+msgstr "/Ferrramentas/_Away"
 
 #: src/gtkblist.c:1541
-msgid "/Tools/_File Transfers..."
-msgstr "/Ferramentas/Transfer棚ncias de arquivo..."
+msgid "/Tools/Buddy _Pounce"
+msgstr "/Ferramentas/Notifica巽達o de amigo"
 
 #: src/gtkblist.c:1542
+msgid "/Tools/P_rotocol Actions"
+msgstr "/Ferramentas/A巽探es de p_rotocolo"
+
+#: src/gtkblist.c:1544
+msgid "/Tools/A_ccounts"
+msgstr "/Ferramentas/_Contas"
+
+#: src/gtkblist.c:1545
+msgid "/Tools/_File Transfers..."
+msgstr "/Ferramentas/Transfer棚ncias de arquivo..."
+
+#: src/gtkblist.c:1546
 msgid "/Tools/Preferences"
 msgstr "/Ferramentas/Prefer棚ncias"
 
-#: src/gtkblist.c:1543
+#: src/gtkblist.c:1547
 msgid "/Tools/Pr_ivacy"
 msgstr "/Ferramentas/Pr_ivacidade"
 
-#: src/gtkblist.c:1545
+#: src/gtkblist.c:1549
 msgid "/Tools/View System _Log"
 msgstr "/Ferramentas/Ver _log do sistema"
 
 #. Help
-#: src/gtkblist.c:1548
+#: src/gtkblist.c:1552
 msgid "/_Help"
 msgstr "/_Ajuda"
 
-#: src/gtkblist.c:1549
+#: src/gtkblist.c:1553
 msgid "/Help/Online _Help"
 msgstr "/Ajuda/_Ajuda online"
 
-#: src/gtkblist.c:1550
+#: src/gtkblist.c:1554
 msgid "/Help/_Debug Window"
 msgstr "/Ajuda/Janela de _debug"
 
-#: src/gtkblist.c:1551
+#: src/gtkblist.c:1555
 msgid "/Help/_About"
 msgstr "/Ajuda/_Sobre"
 
-#: src/gtkblist.c:1567
+#: src/gtkblist.c:1571
 msgid "Rename Group"
 msgstr "Renomear grupo"
 
-#: src/gtkblist.c:1567
+#: src/gtkblist.c:1571
 msgid "New group name"
 msgstr "Novo nome do grupo"
 
-#: src/gtkblist.c:1568
+#: src/gtkblist.c:1572
 msgid "Please enter a new name for the selected group."
 msgstr "Por favor digite um novo nome para o grupo selecionado."
 
-#: src/gtkblist.c:1596
+#: src/gtkblist.c:1600
 #, c-format
 msgid ""
 "\n"
@@ -2285,16 +2288,16 @@
 "\n"
 "<b>Conta:</b> %s"
 
-#: src/gtkblist.c:1657 src/protocols/oscar/oscar.c:5568
+#: src/gtkblist.c:1661 src/protocols/oscar/oscar.c:5517
 msgid "<b>Status:</b> Offline"
 msgstr "<b>Status:</b> Desconectado"
 
-#: src/gtkblist.c:1669
+#: src/gtkblist.c:1673
 #, c-format
 msgid "%d%%"
 msgstr "%d%%"
 
-#: src/gtkblist.c:1684
+#: src/gtkblist.c:1688
 msgid ""
 "\n"
 "<b>Account:</b>"
@@ -2302,7 +2305,7 @@
 "\n"
 "<b>Conta: </b>"
 
-#: src/gtkblist.c:1685
+#: src/gtkblist.c:1689
 msgid ""
 "\n"
 "<b>Contact Alias:</b>"
@@ -2310,7 +2313,7 @@
 "\n"
 "<b>Apelido do contato:</b>"
 
-#: src/gtkblist.c:1686
+#: src/gtkblist.c:1690
 msgid ""
 "\n"
 "<b>Alias:</b>"
@@ -2318,7 +2321,7 @@
 "\n"
 "<b>Apelido (local):</b>"
 
-#: src/gtkblist.c:1687
+#: src/gtkblist.c:1691
 msgid ""
 "\n"
 "<b>Nickname:</b>"
@@ -2326,7 +2329,7 @@
 "\n"
 "<b>Apelido (remoto):</b>"
 
-#: src/gtkblist.c:1688
+#: src/gtkblist.c:1692
 msgid ""
 "\n"
 "<b>Idle:</b>"
@@ -2334,7 +2337,7 @@
 "\n"
 "<b>Inativo por:</b>"
 
-#: src/gtkblist.c:1689
+#: src/gtkblist.c:1693
 msgid ""
 "\n"
 "<b>Warned:</b>"
@@ -2342,7 +2345,7 @@
 "\n"
 "<b>Alertado:</b>"
 
-#: src/gtkblist.c:1691
+#: src/gtkblist.c:1695
 msgid ""
 "\n"
 "<b>Description:</b> Spooky"
@@ -2350,7 +2353,7 @@
 "\n"
 "<b>Descri巽達o:</b> Assombroso"
 
-#: src/gtkblist.c:1692
+#: src/gtkblist.c:1696
 msgid ""
 "\n"
 "<b>Status</b>: Awesome"
@@ -2358,7 +2361,7 @@
 "\n"
 "<b>Status</b>: Incr鱈vel"
 
-#: src/gtkblist.c:1693
+#: src/gtkblist.c:1697
 msgid ""
 "\n"
 "<b>Status</b>: Rockin'"
@@ -2366,85 +2369,85 @@
 "\n"
 "<b>Status</b>: Botando pra quebrar"
 
-#: src/gtkblist.c:1961
+#: src/gtkblist.c:1965
 #, c-format
 msgid "Idle (%dh%02dm) "
 msgstr "Inativo (%dh%02dm) "
 
-#: src/gtkblist.c:1963
+#: src/gtkblist.c:1967
 #, c-format
 msgid "Idle (%dm) "
 msgstr "Inativo (%dm) "
 
-#: src/gtkblist.c:1968
+#: src/gtkblist.c:1972
 #, c-format
 msgid "Warned (%d%%) "
 msgstr "Alertado (%d%%) "
 
-#: src/gtkblist.c:1971
+#: src/gtkblist.c:1975
 msgid "Offline "
 msgstr "Desconectado "
 
-#: src/gtkblist.c:2164 src/gtkprefs.c:841 src/gtkprefs.c:1495
+#: src/gtkblist.c:2168 src/gtkprefs.c:841 src/gtkprefs.c:1495
 msgid "None"
 msgstr "Nenhuma"
 
-#: src/gtkblist.c:2231
+#: src/gtkblist.c:2235
 msgid "/Tools/Away"
 msgstr "/Ferramentas/Ausente"
 
-#: src/gtkblist.c:2234
+#: src/gtkblist.c:2238
 msgid "/Tools/Buddy Pounce"
 msgstr "/Ferramentas/Notifica巽達o de amigos"
 
-#: src/gtkblist.c:2237
+#: src/gtkblist.c:2241
 msgid "/Tools/Protocol Actions"
 msgstr "/Ferramentas/A巽探es de protocolo"
 
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: src/gtkblist.c:2323
+#: src/gtkblist.c:2328
 msgid "/Buddies/Show Offline Buddies"
 msgstr "/Amigos/Exibir amigos desconectados"
 
-#: src/gtkblist.c:2325
+#: src/gtkblist.c:2330
 msgid "/Buddies/Show Empty Groups"
 msgstr "/Amigos/Exibir grupos vazios"
 
-#: src/gtkblist.c:2343 src/gtkconv.c:1230
+#: src/gtkblist.c:2348 src/gtkconv.c:1216
 msgid "IM"
 msgstr "MI"
 
-#: src/gtkblist.c:2349
+#: src/gtkblist.c:2354
 msgid "Send a message to the selected buddy"
 msgstr "Enviar uma mensagem para o amigo selecionado"
 
-#: src/gtkblist.c:2352 src/protocols/napster/napster.c:529
+#: src/gtkblist.c:2357 src/protocols/napster/napster.c:529
 msgid "Get Info"
 msgstr "Ver info"
 
-#: src/gtkblist.c:2358
+#: src/gtkblist.c:2363
 msgid "Get information on the selected buddy"
 msgstr "Ver informa巽探es sobre o amigo selecionado"
 
-#: src/gtkblist.c:2361 src/protocols/oscar/oscar.c:3137
+#: src/gtkblist.c:2366 src/protocols/oscar/oscar.c:3086
 msgid "Chat"
 msgstr "Chat"
 
-#: src/gtkblist.c:2366
+#: src/gtkblist.c:2371
 msgid "Join a chat room"
 msgstr "Entrar numa sala de chat"
 
-#: src/gtkblist.c:2374
+#: src/gtkblist.c:2379
 msgid "Set an away message"
 msgstr "Definir uma mensagem de away"
 
-#: src/gtkblist.c:3080 src/protocols/yahoo/yahoo.c:2164
+#: src/gtkblist.c:3085 src/protocols/yahoo/yahoo.c:2188
 msgid "Add Buddy"
 msgstr "Adicionar amigo"
 
-#: src/gtkblist.c:3103
+#: src/gtkblist.c:3108
 msgid ""
 "Please enter the screen name of the person you would like to add to your "
 "buddy list. You may optionally enter an alias, or nickname,  for the buddy. "
@@ -2455,24 +2458,24 @@
 "amigo. O apelido ser叩 exibido no lugar do nome do usu叩rio sempre que "
 "poss鱈vel.\n"
 
-#: src/gtkblist.c:3125 src/main.c:289
+#: src/gtkblist.c:3130 src/main.c:289
 msgid "Screen Name:"
 msgstr "Nome do usu叩rio:"
 
-#: src/gtkblist.c:3151 src/gtkblist.c:3468
+#: src/gtkblist.c:3156 src/gtkblist.c:3473
 msgid "Group:"
 msgstr "Grupo:"
 
 #. Set up stuff for the account box
-#: src/gtkblist.c:3160 src/gtkblist.c:3438
+#: src/gtkblist.c:3165 src/gtkblist.c:3443
 msgid "Account:"
 msgstr "Conta:"
 
-#: src/gtkblist.c:3405
+#: src/gtkblist.c:3410
 msgid "Add Chat"
 msgstr "Adicionar chat"
 
-#: src/gtkblist.c:3428
+#: src/gtkblist.c:3433
 msgid ""
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
@@ -2480,19 +2483,19 @@
 "Por favor entre com um apelido, e as informa巽探es apropriadas sobre o chat "
 "que voc棚 gostaria de adicionar � sua lista de amigos.\n"
 
-#: src/gtkblist.c:3502
+#: src/gtkblist.c:3507
 msgid "Add Group"
 msgstr "Criar grupo"
 
-#: src/gtkblist.c:3502
+#: src/gtkblist.c:3507
 msgid "Add a new group"
 msgstr "Criar um novo grupo"
 
-#: src/gtkblist.c:3503
+#: src/gtkblist.c:3508
 msgid "Please enter the name of the group to be added."
 msgstr "Por favor digite o nome do grupo a ser criado."
 
-#: src/gtkblist.c:4004
+#: src/gtkblist.c:4009
 msgid "No actions available"
 msgstr "Nenhuma a巽達o dispon鱈vel"
 
@@ -2591,322 +2594,314 @@
 msgid "Search term: "
 msgstr "Termo de procura:  "
 
-#: src/gtkconv.c:1238
+#: src/gtkconv.c:1224
 msgid "Un-Ignore"
 msgstr "Des-ignorar"
 
-#: src/gtkconv.c:1240 src/gtkprefs.c:774
+#: src/gtkconv.c:1226 src/gtkprefs.c:774
 msgid "Ignore"
 msgstr "Ignorar"
 
 #. Info button
-#: src/gtkconv.c:1249 src/gtkconv.c:3179
+#: src/gtkconv.c:1235 src/gtkconv.c:3133
 msgid "Info"
 msgstr "Info"
 
-#: src/gtkconv.c:1258
+#: src/gtkconv.c:1244
 msgid "Get Away Msg"
 msgstr "Ver mensagem de away"
 
-#: src/gtkconv.c:1269 src/gtkconv.c:3162 src/gtkconv.c:4311
+#: src/gtkconv.c:1255 src/gtkconv.c:3116 src/gtkconv.c:4265
 #: src/gtkrequest.c:201
 msgid "Remove"
 msgstr "Remover"
 
-#: src/gtkconv.c:2404
+#: src/gtkconv.c:2372
 msgid "User is typing..."
 msgstr "O usu叩rio est叩 digitando..."
 
-#: src/gtkconv.c:2412
+#: src/gtkconv.c:2380
 msgid "User has typed something and paused"
 msgstr "O usu叩rio digitou algo e parou"
 
 #. Build the Send As menu
-#: src/gtkconv.c:2515
+#: src/gtkconv.c:2483
 msgid "_Send As"
 msgstr "_Enviar como"
 
-#: src/gtkconv.c:2937
+#: src/gtkconv.c:2905
 msgid "Gaim - Save Conversation"
 msgstr "Gaim - Salvar conversa"
 
 #. Conversation menu
-#: src/gtkconv.c:2954
+#: src/gtkconv.c:2922
 msgid "/_Conversation"
 msgstr "/_Conversa"
 
-#: src/gtkconv.c:2956
+#: src/gtkconv.c:2924
 msgid "/Conversation/_Save As..."
 msgstr "/Conversa/_Salvar como..."
 
-#: src/gtkconv.c:2958
+#: src/gtkconv.c:2926
 msgid "/Conversation/View _Log"
 msgstr "/Conversa/Ver log"
 
-#: src/gtkconv.c:2959
+#: src/gtkconv.c:2927
 msgid "/Conversation/Search..."
 msgstr "/Conversa/Procurar..."
 
-#: src/gtkconv.c:2963
+#: src/gtkconv.c:2931
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Conversa/Adicionar notifica巽達o de amigo..."
 
-#: src/gtkconv.c:2965
+#: src/gtkconv.c:2933
 msgid "/Conversation/A_lias..."
 msgstr "/Conversa/_Apelido..."
 
-#: src/gtkconv.c:2967
+#: src/gtkconv.c:2935
 msgid "/Conversation/_Get Info..."
 msgstr "/Conversa/_Ver informa巽探es..."
 
-#: src/gtkconv.c:2969
+#: src/gtkconv.c:2937
 msgid "/Conversation/In_vite..."
 msgstr "/Conversa/_Convidar..."
 
-#: src/gtkconv.c:2972 src/gtkconv.c:2975
-msgid "/Conversation/Send _File..."
-msgstr "/Conversa/_Enviar arquivo..."
-
-#: src/gtkconv.c:2980
+#: src/gtkconv.c:2942
 msgid "/Conversation/Insert _URL..."
 msgstr "/Conversa/Inserir _URL..."
 
-#: src/gtkconv.c:2982
+#: src/gtkconv.c:2944
 msgid "/Conversation/Insert _Image..."
 msgstr "/Conversa/Inserir _imagem..."
 
-#: src/gtkconv.c:2987
+#: src/gtkconv.c:2949
 msgid "/Conversation/_Warn..."
 msgstr "/Conversa/_Alertar..."
 
-#: src/gtkconv.c:2989
+#: src/gtkconv.c:2951
 msgid "/Conversation/_Block..."
 msgstr "/Conversa/_Bloquear..."
 
-#: src/gtkconv.c:2991
+#: src/gtkconv.c:2953
 msgid "/Conversation/_Add..."
 msgstr "/Conversa/A_dicionar..."
 
-#: src/gtkconv.c:2993
+#: src/gtkconv.c:2955
 msgid "/Conversation/_Remove..."
 msgstr "/Conversa/_Remover..."
 
-#: src/gtkconv.c:2998
+#: src/gtkconv.c:2960
 msgid "/Conversation/_Close"
 msgstr "/Conversa/_Fechar"
 
 #. Options
-#: src/gtkconv.c:3002
+#: src/gtkconv.c:2964
 msgid "/_Options"
 msgstr "/_Op巽探es"
 
-#: src/gtkconv.c:3003
+#: src/gtkconv.c:2965
 msgid "/Options/Enable _Logging"
 msgstr "/Op巽�es/Gravar _log"
 
-#: src/gtkconv.c:3004
+#: src/gtkconv.c:2966
 msgid "/Options/Enable _Sounds"
 msgstr "/Op巽探es/Ativar _sons"
 
-#: src/gtkconv.c:3005
+#: src/gtkconv.c:2967
 msgid "/Options/Show Formatting _Toolbar"
 msgstr "/Op巽探es/Mostrar barra de ferramen_tas de formata巽達o"
 
-#: src/gtkconv.c:3047
+#: src/gtkconv.c:3009
 msgid "/Conversation/View Log"
 msgstr "/Conversa/Ver log"
 
-#: src/gtkconv.c:3052
+#: src/gtkconv.c:3014
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Conversa/Adicionar notifica巽達o de amigo..."
 
-#: src/gtkconv.c:3056
+#: src/gtkconv.c:3018
 msgid "/Conversation/Alias..."
 msgstr "/Conversa/Apelido..."
 
-#: src/gtkconv.c:3060
+#: src/gtkconv.c:3022
 msgid "/Conversation/Get Info..."
 msgstr "/Conversa/Ver informa巽探es..."
 
-#: src/gtkconv.c:3064
+#: src/gtkconv.c:3026
 msgid "/Conversation/Invite..."
 msgstr "/Conversa/Convidar..."
 
-#: src/gtkconv.c:3068 src/gtkconv.c:3072
-msgid "/Conversation/Send File..."
-msgstr "/Conversa/Enviar arquivo..."
-
-#: src/gtkconv.c:3078
+#: src/gtkconv.c:3032
 msgid "/Conversation/Insert URL..."
 msgstr "/Conversa/Inserir URL..."
 
-#: src/gtkconv.c:3082
+#: src/gtkconv.c:3036
 msgid "/Conversation/Insert Image..."
 msgstr "/Conversa/Inserir imagem..."
 
-#: src/gtkconv.c:3088
+#: src/gtkconv.c:3042
 msgid "/Conversation/Warn..."
 msgstr "/Conversa/Alertar..."
 
-#: src/gtkconv.c:3092
+#: src/gtkconv.c:3046
 msgid "/Conversation/Block..."
 msgstr "/Conversa/Bloquear..."
 
-#: src/gtkconv.c:3096
+#: src/gtkconv.c:3050
 msgid "/Conversation/Add..."
 msgstr "/Conversa/Adicionar..."
 
-#: src/gtkconv.c:3100
+#: src/gtkconv.c:3054
 msgid "/Conversation/Remove..."
 msgstr "/Conversa/Remover..."
 
-#: src/gtkconv.c:3106
+#: src/gtkconv.c:3060
 msgid "/Options/Enable Logging"
 msgstr "/Op巽探es/Gravar log"
 
-#: src/gtkconv.c:3109
+#: src/gtkconv.c:3063
 msgid "/Options/Enable Sounds"
 msgstr "/Op巽探es/Ativar sons"
 
-#: src/gtkconv.c:3112
+#: src/gtkconv.c:3066
 msgid "/Options/Show Formatting Toolbar"
 msgstr "/Op巽探es/Mostrar barra de ferramentas de formata巽達o"
 
 #. From right to left...
 #. Send button
-#: src/gtkconv.c:3136 src/gtkconv.c:3138 src/gtkconv.c:3236 src/gtkconv.c:3238
-#: src/gtkconv.c:6021
+#: src/gtkconv.c:3090 src/gtkconv.c:3092 src/gtkconv.c:3190 src/gtkconv.c:3192
+#: src/gtkconv.c:5975
 msgid "Send"
 msgstr "Enviar"
 
-#: src/gtkconv.c:3159 src/gtkconv.c:4329
+#: src/gtkconv.c:3113 src/gtkconv.c:4283
 msgid "Add the user to your buddy list"
 msgstr "Adicionar o usu叩rio � sua lista de amigos"
 
-#: src/gtkconv.c:3165 src/gtkconv.c:4314
+#: src/gtkconv.c:3119 src/gtkconv.c:4268
 msgid "Remove the user from your buddy list"
 msgstr "Remover o usu叩rio da sua lista de amigos"
 
 #. Warn button
-#: src/gtkconv.c:3172
+#: src/gtkconv.c:3126
 msgid "Warn"
 msgstr "Alertar"
 
-#: src/gtkconv.c:3176
+#: src/gtkconv.c:3130
 msgid "Warn the user"
 msgstr "Alertar o usu叩rio"
 
-#: src/gtkconv.c:3183 src/gtkconv.c:3621
+#: src/gtkconv.c:3137 src/gtkconv.c:3575
 msgid "Get the user's information"
 msgstr "Ver informa巽探es do usu叩rio"
 
 #. Block button
-#: src/gtkconv.c:3186 src/gtkprivacy.c:605 src/gtkprivacy.c:616
+#: src/gtkconv.c:3140 src/gtkprivacy.c:605 src/gtkprivacy.c:616
 msgid "Block"
 msgstr "Bloquear"
 
-#: src/gtkconv.c:3190
+#: src/gtkconv.c:3144
 msgid "Block the user"
 msgstr "Bloquear o usu叩rio"
 
 #. Invite
-#: src/gtkconv.c:3248 src/gtkconv.c:6024
+#: src/gtkconv.c:3202 src/gtkconv.c:5978
 msgid "Invite"
 msgstr "Convidar"
 
-#: src/gtkconv.c:3251
+#: src/gtkconv.c:3205
 msgid "Invite a user"
 msgstr "Convidar um usu叩rio"
 
-#: src/gtkconv.c:3290
+#: src/gtkconv.c:3244
 msgid "Bold"
 msgstr "Negrito"
 
-#: src/gtkconv.c:3301
+#: src/gtkconv.c:3255
 msgid "Italic"
 msgstr "It叩lico"
 
-#: src/gtkconv.c:3312
+#: src/gtkconv.c:3266
 msgid "Underline"
 msgstr "Sublinhado"
 
-#: src/gtkconv.c:3328
+#: src/gtkconv.c:3282
 msgid "Larger font size"
 msgstr "Maior tamanho de fonte"
 
-#: src/gtkconv.c:3340
+#: src/gtkconv.c:3294
 msgid "Normal font size"
 msgstr "Tamanho de fonte normal"
 
-#: src/gtkconv.c:3352
+#: src/gtkconv.c:3306
 msgid "Smaller font size"
 msgstr "Menor tamanho de fonte"
 
-#: src/gtkconv.c:3369
+#: src/gtkconv.c:3323
 msgid "Font Face"
 msgstr "Fonte"
 
-#: src/gtkconv.c:3381
+#: src/gtkconv.c:3335
 msgid "Foreground font color"
 msgstr "Cor da fonte"
 
-#: src/gtkconv.c:3393
+#: src/gtkconv.c:3347
 msgid "Background color"
 msgstr "Cor do fundo"
 
-#: src/gtkconv.c:3408
+#: src/gtkconv.c:3362
 msgid "Insert image"
 msgstr "Inserir imagem"
 
-#: src/gtkconv.c:3419
+#: src/gtkconv.c:3373
 msgid "Insert link"
 msgstr "Inserir link"
 
-#: src/gtkconv.c:3430
+#: src/gtkconv.c:3384
 msgid "Insert smiley"
 msgstr "Inserir emoticon"
 
-#: src/gtkconv.c:3490
+#: src/gtkconv.c:3444
 msgid "Topic:"
 msgstr "T坦pico:"
 
 #. Setup the label telling how many people are in the room.
-#: src/gtkconv.c:3541
+#: src/gtkconv.c:3495
 msgid "0 people in room"
 msgstr "0 pessoas na sala"
 
-#: src/gtkconv.c:3598
+#: src/gtkconv.c:3552
 msgid "IM the user"
 msgstr "Mandar uma mensagem instant但nea para o usu叩rio"
 
-#: src/gtkconv.c:3610
+#: src/gtkconv.c:3564
 msgid "Ignore the user"
 msgstr "Ignorar o usu叩rio"
 
-#: src/gtkconv.c:4127
+#: src/gtkconv.c:4081
 msgid "Close conversation"
 msgstr "Fechar conversa"
 
-#: src/gtkconv.c:4714 src/gtkconv.c:4746 src/gtkconv.c:4867 src/gtkconv.c:4934
+#: src/gtkconv.c:4668 src/gtkconv.c:4700 src/gtkconv.c:4821 src/gtkconv.c:4888
 #, 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:5268
+#: src/gtkconv.c:5222
 msgid "Animate"
 msgstr "Animar"
 
-#: src/gtkconv.c:5273
+#: src/gtkconv.c:5227
 msgid "Hide Icon"
 msgstr "Ocultar 鱈cone"
 
-#: src/gtkconv.c:5279
+#: src/gtkconv.c:5233
 msgid "Save Icon As..."
 msgstr "Salvar 鱈cone como..."
 
-#: src/gtkconv.c:5758 src/gtkconv.c:5761
+#: src/gtkconv.c:5712 src/gtkconv.c:5715
 msgid "<main>/Conversation/Close"
 msgstr "<main>/Conversa/Fechar"
 
@@ -3056,7 +3051,7 @@
 msgid "_Save Image..."
 msgstr "_Salvar imagem..."
 
-#: src/gtklog.c:244
+#: src/gtklog.c:256
 msgid "Conversations with"
 msgstr "Conversas com"
 
@@ -3067,17 +3062,17 @@
 msgstr[0] "%s tem %d nova mensagem."
 msgstr[1] "%s tem %d novas mensagens."
 
-#: src/gtknotify.c:219
+#: src/gtknotify.c:220
 #, c-format
 msgid "<span weight=\"bold\">From:</span> %s\n"
 msgstr "<span weight=\"bold\">De:</span> %s\n"
 
-#: src/gtknotify.c:224
+#: src/gtknotify.c:227
 #, c-format
 msgid "<span weight=\"bold\">Subject:</span> %s\n"
 msgstr "<span weight=\"bold\">Assunto:</span> %s\n"
 
-#: src/gtknotify.c:228
+#: src/gtknotify.c:232
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
@@ -3088,7 +3083,7 @@
 "\n"
 "%s%s%s%s"
 
-#: src/gtknotify.c:243
+#: src/gtknotify.c:247
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
@@ -3099,23 +3094,23 @@
 "\n"
 "%s"
 
-#: src/gtknotify.c:428 src/gtknotify.c:448 src/gtknotify.c:456
+#: src/gtknotify.c:432 src/gtknotify.c:452 src/gtknotify.c:460
 msgid "Unable to open URL"
 msgstr "Imposs鱈vel abrir URL"
 
-#: src/gtknotify.c:429
+#: src/gtknotify.c:433
 msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr ""
 "A op巽達o de comando do browser 'Manual' foi escolhida, mas nenhum comando foi "
 "definido."
 
-#: src/gtknotify.c:446
+#: src/gtknotify.c:450
 #, c-format
 msgid "The browser \"%s\" is invalid."
 msgstr "O browser \"%s\" 辿 inv叩lido."
 
-#: src/gtknotify.c:453
+#: src/gtknotify.c:457
 #, c-format
 msgid "Error launching \"command\": %s"
 msgstr "Erro ao executar \"comando\": %s"
@@ -3164,7 +3159,7 @@
 msgstr "Voltar do 'Ausente'"
 
 #: src/gtkpounce.c:415 src/gtkprefs.c:1492 src/protocols/msn/state.c:30
-#: src/protocols/yahoo/yahoo.c:2028
+#: src/protocols/yahoo/yahoo.c:2052
 msgid "Idle"
 msgstr "Inativo"
 
@@ -3586,7 +3581,7 @@
 msgstr "_Host"
 
 #: src/gtkprefs.c:1142 src/protocols/irc/irc.c:553
-#: src/protocols/jabber/jabber.c:1155 src/protocols/msn/msn.c:1656
+#: src/protocols/jabber/jabber.c:1155 src/protocols/msn/msn.c:1660
 #: src/protocols/napster/napster.c:642 src/protocols/trepia/trepia.c:1345
 msgid "Port"
 msgstr "Porta"
@@ -3800,7 +3795,7 @@
 msgstr "Carregar"
 
 #: src/gtkprefs.c:1774 src/protocols/jabber/jabber.c:582
-#: src/protocols/msn/msn.c:1344 src/protocols/trepia/trepia.c:401
+#: src/protocols/msn/msn.c:1348 src/protocols/trepia/trepia.c:401
 msgid "Name"
 msgstr "Nome"
 
@@ -4180,8 +4175,8 @@
 #: src/protocols/gg/gg.c:49 src/protocols/jabber/jutil.c:110
 #: src/protocols/msn/msn.c:344 src/protocols/msn/state.c:27
 #: src/protocols/msn/state.c:28 src/protocols/msn/state.c:35
-#: src/protocols/msn/state.c:36 src/protocols/yahoo/yahoo.c:2302
-#: src/protocols/yahoo/yahoo.c:2403
+#: src/protocols/msn/state.c:36 src/protocols/yahoo/yahoo.c:2333
+#: src/protocols/yahoo/yahoo.c:2434
 msgid "Available"
 msgstr "Dispon鱈vel"
 
@@ -4194,10 +4189,10 @@
 msgstr "Ausente apenas para amigos"
 
 #: src/protocols/gg/gg.c:53 src/protocols/jabber/jabber.c:929
-#: src/protocols/jabber/presence.c:91 src/protocols/oscar/oscar.c:2899
-#: src/protocols/oscar/oscar.c:4630 src/protocols/oscar/oscar.c:4657
-#: src/protocols/oscar/oscar.c:6194 src/protocols/yahoo/yahoo.c:2026
-#: src/protocols/yahoo/yahoo.c:2322 src/protocols/yahoo/yahoo.c:2413
+#: src/protocols/jabber/presence.c:91 src/protocols/oscar/oscar.c:2848
+#: src/protocols/oscar/oscar.c:4579 src/protocols/oscar/oscar.c:4606
+#: src/protocols/oscar/oscar.c:6143 src/protocols/yahoo/yahoo.c:2050
+#: src/protocols/yahoo/yahoo.c:2353 src/protocols/yahoo/yahoo.c:2444
 msgid "Invisible"
 msgstr "Invis鱈vel"
 
@@ -4314,7 +4309,7 @@
 msgid "Active"
 msgstr "Ativo"
 
-#: src/protocols/gg/gg.c:664 src/protocols/oscar/oscar.c:4008
+#: src/protocols/gg/gg.c:664 src/protocols/oscar/oscar.c:3957
 msgid "UIN"
 msgstr "UIN"
 
@@ -4324,12 +4319,12 @@
 
 #. Last Name
 #: src/protocols/gg/gg.c:673 src/protocols/jabber/jabber.c:602
-#: src/protocols/oscar/oscar.c:4016 src/protocols/trepia/trepia.c:274
+#: src/protocols/oscar/oscar.c:3965 src/protocols/trepia/trepia.c:274
 msgid "Last Name"
 msgstr "Sobrenome"
 
 #: src/protocols/gg/gg.c:677 src/protocols/gg/gg.c:1389
-#: src/protocols/irc/msgs.c:183 src/protocols/oscar/oscar.c:4010
+#: src/protocols/irc/msgs.c:183 src/protocols/oscar/oscar.c:3959
 msgid "Nick"
 msgstr "Nick"
 
@@ -4344,18 +4339,18 @@
 
 #. City
 #: src/protocols/gg/gg.c:701 src/protocols/jabber/jabber.c:612
-#: src/protocols/oscar/oscar.c:4062 src/protocols/oscar/oscar.c:4078
+#: src/protocols/oscar/oscar.c:4011 src/protocols/oscar/oscar.c:4027
 #: src/protocols/trepia/trepia.c:331 src/protocols/trepia/trepia.c:430
 msgid "City"
 msgstr "Cidade"
 
 #. res[0] == username
-#: src/protocols/gg/gg.c:722 src/protocols/msn/msn.c:1282
-#: src/protocols/msn/msn.c:1524 src/protocols/napster/napster.c:387
-#: src/protocols/oscar/oscar.c:2941 src/protocols/oscar/oscar.c:3251
-#: src/protocols/toc/toc.c:498 src/protocols/yahoo/yahoo.c:2579
-#: src/protocols/yahoo/yahoo.c:2601 src/protocols/yahoo/yahoo.c:2624
-#: src/protocols/yahoo/yahoo.c:2811 src/protocols/zephyr/zephyr.c:355
+#: src/protocols/gg/gg.c:722 src/protocols/msn/msn.c:1284
+#: src/protocols/msn/msn.c:1528 src/protocols/napster/napster.c:387
+#: src/protocols/oscar/oscar.c:2890 src/protocols/oscar/oscar.c:3200
+#: src/protocols/toc/toc.c:498 src/protocols/yahoo/yahoo.c:2611
+#: src/protocols/yahoo/yahoo.c:2633 src/protocols/yahoo/yahoo.c:2656
+#: src/protocols/yahoo/yahoo.c:2814 src/protocols/zephyr/zephyr.c:355
 msgid "Buddy Information"
 msgstr "Informa巽探es do amigo"
 
@@ -4460,7 +4455,7 @@
 msgstr "Pesquisa de diret坦rio"
 
 #: src/protocols/gg/gg.c:1204 src/protocols/jabber/jabber.c:1041
-#: src/protocols/oscar/oscar.c:6541 src/protocols/toc/toc.c:1546
+#: src/protocols/oscar/oscar.c:6498 src/protocols/toc/toc.c:1546
 msgid "Change Password"
 msgstr "Alterar senha"
 
@@ -4513,15 +4508,15 @@
 
 #: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:187
 #: src/protocols/msn/notification.c:949 src/protocols/msn/notification.c:1270
-#: src/protocols/msn/notification.c:1435 src/protocols/oscar/oscar.c:2671
-#: src/protocols/oscar/oscar.c:5188
+#: src/protocols/msn/notification.c:1435 src/protocols/oscar/oscar.c:2620
+#: src/protocols/oscar/oscar.c:5137
 msgid "Authorize"
 msgstr "Autorizar"
 
 #: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:188
 #: src/protocols/msn/notification.c:950 src/protocols/msn/notification.c:1272
-#: src/protocols/msn/notification.c:1437 src/protocols/oscar/oscar.c:2673
-#: src/protocols/oscar/oscar.c:5189
+#: src/protocols/msn/notification.c:1437 src/protocols/oscar/oscar.c:2622
+#: src/protocols/oscar/oscar.c:5138
 msgid "Deny"
 msgstr "Negar"
 
@@ -4611,6 +4606,10 @@
 msgid "Couldn't create socket"
 msgstr "Imposs鱈vel criar socket"
 
+#: src/protocols/irc/irc.c:357 src/protocols/trepia/trepia.c:972
+msgid "Read error"
+msgstr "Erro de leitura"
+
 #. *< api_version
 #. *< type
 #. *< ui_requirement
@@ -4664,7 +4663,7 @@
 msgid " <i>(identified)</i>"
 msgstr " <i>(identificado)</i>"
 
-#: src/protocols/irc/msgs.c:192 src/protocols/yahoo/yahoo.c:2682
+#: src/protocols/irc/msgs.c:192 src/protocols/yahoo/yahoo.c:2714
 msgid "Realname"
 msgstr "Nome real"
 
@@ -4862,7 +4861,7 @@
 
 #: src/protocols/jabber/auth.c:433 src/protocols/jabber/jabber.c:147
 #: src/protocols/jabber/jabber.c:864 src/protocols/jabber/jabber.c:914
-#: src/protocols/oscar/oscar.c:5596
+#: src/protocols/oscar/oscar.c:5545
 msgid "Not Authorized"
 msgstr "N達o autorizado"
 
@@ -4887,7 +4886,7 @@
 msgstr "Nome"
 
 #: src/protocols/jabber/buddy.c:248 src/protocols/jabber/buddy.c:625
-#: src/protocols/jabber/jabber.c:592 src/protocols/yahoo/yahoo.c:2676
+#: src/protocols/jabber/jabber.c:592 src/protocols/yahoo/yahoo.c:2710
 msgid "Nickname"
 msgstr "Apelido"
 
@@ -4924,7 +4923,7 @@
 msgstr "Telefone"
 
 #: src/protocols/jabber/buddy.c:257 src/protocols/jabber/buddy.c:699
-#: src/protocols/jabber/buddy.c:707 src/protocols/yahoo/yahoo.c:2670
+#: src/protocols/jabber/buddy.c:707 src/protocols/yahoo/yahoo.c:2706
 msgid "Email"
 msgstr "Email"
 
@@ -4945,7 +4944,7 @@
 msgstr "Fun巽達o"
 
 #: src/protocols/jabber/buddy.c:262 src/protocols/jabber/buddy.c:628
-#: src/protocols/oscar/oscar.c:4042
+#: src/protocols/oscar/oscar.c:3991
 msgid "Birthday"
 msgstr "Data de nascimento"
 
@@ -4980,7 +4979,7 @@
 msgstr "Nome do meio"
 
 #: src/protocols/jabber/buddy.c:633 src/protocols/jabber/jabber.c:607
-#: src/protocols/oscar/oscar.c:4059 src/protocols/oscar/oscar.c:4075
+#: src/protocols/oscar/oscar.c:4008 src/protocols/oscar/oscar.c:4024
 msgid "Address"
 msgstr "Endere巽o"
 
@@ -5175,9 +5174,10 @@
 #: src/protocols/msn/msn.c:1178 src/protocols/msn/msn.c:1259
 #: src/protocols/msn/notification.c:179 src/protocols/msn/notification.c:207
 #: src/protocols/msn/notification.c:1664 src/protocols/msn/notification.c:1684
-#: src/protocols/trepia/trepia.c:248 src/protocols/trepia/trepia.c:749
-#: src/protocols/trepia/trepia.c:1033 src/protocols/trepia/trepia.c:1077
-#: src/protocols/trepia/trepia.c:1176 src/protocols/trepia/trepia.c:1232
+#: src/protocols/msn/session.c:208 src/protocols/trepia/trepia.c:248
+#: src/protocols/trepia/trepia.c:749 src/protocols/trepia/trepia.c:1033
+#: src/protocols/trepia/trepia.c:1077 src/protocols/trepia/trepia.c:1176
+#: src/protocols/trepia/trepia.c:1232
 msgid "Write error"
 msgstr "Erro ao enviar"
 
@@ -5233,14 +5233,14 @@
 msgstr "Email"
 
 #. First Name
-#: src/protocols/jabber/jabber.c:597 src/protocols/oscar/oscar.c:4013
+#: src/protocols/jabber/jabber.c:597 src/protocols/oscar/oscar.c:3962
 #: src/protocols/trepia/trepia.c:267
 msgid "First Name"
 msgstr "Nome"
 
 #. State
-#: src/protocols/jabber/jabber.c:617 src/protocols/oscar/oscar.c:4065
-#: src/protocols/oscar/oscar.c:4081 src/protocols/trepia/trepia.c:335
+#: src/protocols/jabber/jabber.c:617 src/protocols/oscar/oscar.c:4014
+#: src/protocols/oscar/oscar.c:4030 src/protocols/trepia/trepia.c:335
 #: src/protocols/trepia/trepia.c:439
 msgid "State"
 msgstr "Estado"
@@ -5261,7 +5261,7 @@
 #: src/protocols/jabber/jabber.c:767 src/protocols/msn/dispatch.c:219
 #: src/protocols/msn/msn.c:481 src/protocols/napster/napster.c:487
 #: src/protocols/oscar/oscar.c:694 src/protocols/trepia/trepia.c:1110
-#: src/protocols/yahoo/yahoo.c:1923
+#: src/protocols/yahoo/yahoo.c:1942
 msgid "Connecting"
 msgstr "Conectando"
 
@@ -5293,8 +5293,8 @@
 msgstr "Ausente (estendido)"
 
 #: src/protocols/jabber/jabber.c:928 src/protocols/jabber/jutil.c:107
-#: src/protocols/jabber/presence.c:89 src/protocols/oscar/oscar.c:2889
-#: src/protocols/oscar/oscar.c:4645 src/protocols/oscar/oscar.c:6190
+#: src/protocols/jabber/presence.c:89 src/protocols/oscar/oscar.c:2838
+#: src/protocols/oscar/oscar.c:4594 src/protocols/oscar/oscar.c:6139
 msgid "Do Not Disturb"
 msgstr "N達o perturbe"
 
@@ -5385,7 +5385,7 @@
 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:287 src/protocols/oscar/oscar.c:3000
+#: src/protocols/jabber/presence.c:287 src/protocols/oscar/oscar.c:2949
 msgid "Unknown error"
 msgstr "Erro desconhecido"
 
@@ -5445,8 +5445,8 @@
 
 #: src/protocols/msn/dispatch.c:215 src/protocols/msn/msn.c:490
 #: src/protocols/msn/notification.c:2141 src/protocols/napster/napster.c:463
-#: src/protocols/napster/napster.c:494 src/protocols/yahoo/yahoo.c:1715
-#: src/protocols/yahoo/yahoo.c:1746 src/protocols/yahoo/yahoo.c:1811
+#: src/protocols/napster/napster.c:494 src/protocols/yahoo/yahoo.c:1734
+#: src/protocols/yahoo/yahoo.c:1765 src/protocols/yahoo/yahoo.c:1830
 msgid "Unable to connect"
 msgstr "Imposs鱈vel conectar"
 
@@ -5640,7 +5640,7 @@
 msgid "Server too busy"
 msgstr "Servidor ocupado demais"
 
-#: src/protocols/msn/error.c:190 src/protocols/oscar/oscar.c:1127
+#: src/protocols/msn/error.c:190 src/protocols/oscar/oscar.c:1076
 #: src/protocols/toc/toc.c:659
 msgid "Authentication failed"
 msgstr "Autentica巽達o mal sucedida"
@@ -5718,7 +5718,7 @@
 msgid "Page"
 msgstr "Enviar"
 
-#: src/protocols/msn/msn.c:332 src/protocols/yahoo/yahoo.c:2140
+#: src/protocols/msn/msn.c:332 src/protocols/yahoo/yahoo.c:2164
 #, c-format
 msgid "<b>Status:</b> %s"
 msgstr "<b>Status:</b> %s"
@@ -5729,26 +5729,26 @@
 msgstr "Ausente"
 
 #: src/protocols/msn/msn.c:346 src/protocols/msn/msn.c:628
-#: src/protocols/msn/state.c:31 src/protocols/yahoo/yahoo.c:2008
-#: src/protocols/yahoo/yahoo.c:2304 src/protocols/yahoo/yahoo.c:2404
+#: src/protocols/msn/state.c:31 src/protocols/yahoo/yahoo.c:2032
+#: src/protocols/yahoo/yahoo.c:2335 src/protocols/yahoo/yahoo.c:2435
 msgid "Be Right Back"
 msgstr "Volto j叩"
 
 #: src/protocols/msn/msn.c:347 src/protocols/msn/msn.c:630
-#: src/protocols/msn/state.c:29 src/protocols/yahoo/yahoo.c:2010
-#: src/protocols/yahoo/yahoo.c:2306 src/protocols/yahoo/yahoo.c:2405
+#: src/protocols/msn/state.c:29 src/protocols/yahoo/yahoo.c:2034
+#: src/protocols/yahoo/yahoo.c:2337 src/protocols/yahoo/yahoo.c:2436
 msgid "Busy"
 msgstr "Ocupado"
 
 #: src/protocols/msn/msn.c:348 src/protocols/msn/msn.c:632
-#: src/protocols/msn/state.c:33 src/protocols/yahoo/yahoo.c:2018
-#: src/protocols/yahoo/yahoo.c:2314 src/protocols/yahoo/yahoo.c:2409
+#: src/protocols/msn/state.c:33 src/protocols/yahoo/yahoo.c:2042
+#: src/protocols/yahoo/yahoo.c:2345 src/protocols/yahoo/yahoo.c:2440
 msgid "On The Phone"
 msgstr "Ao telefone"
 
 #: src/protocols/msn/msn.c:349 src/protocols/msn/msn.c:634
-#: src/protocols/msn/state.c:34 src/protocols/yahoo/yahoo.c:2022
-#: src/protocols/yahoo/yahoo.c:2318 src/protocols/yahoo/yahoo.c:2411
+#: src/protocols/msn/state.c:34 src/protocols/yahoo/yahoo.c:2046
+#: src/protocols/yahoo/yahoo.c:2349 src/protocols/yahoo/yahoo.c:2442
 msgid "Out To Lunch"
 msgstr "Em hor叩rio de almo巽o"
 
@@ -5817,73 +5817,73 @@
 "voc棚 quis dizer %s@hotmail.com. Nenhuma mudan巽a foi feita na sua lista de "
 "usu叩rios bloqueados."
 
-#: src/protocols/msn/msn.c:1283 src/protocols/yahoo/yahoo.c:2580
+#: src/protocols/msn/msn.c:1285 src/protocols/yahoo/yahoo.c:2612
 msgid "<html><body><b>Error retrieving profile</b></body></html>"
 msgstr "<html><body><b>Erro ao recuperar perfil</b></body></html>"
 
 #. Age
-#: src/protocols/msn/msn.c:1351 src/protocols/oscar/oscar.c:4047
+#: src/protocols/msn/msn.c:1355 src/protocols/oscar/oscar.c:3996
 #: src/protocols/trepia/trepia.c:285 src/protocols/trepia/trepia.c:413
-#: src/protocols/yahoo/yahoo.c:2694
+#: src/protocols/yahoo/yahoo.c:2722
 msgid "Age"
 msgstr "Idade"
 
 #. Gender
-#: src/protocols/msn/msn.c:1358 src/protocols/oscar/oscar.c:4033
+#: src/protocols/msn/msn.c:1362 src/protocols/oscar/oscar.c:3982
 #: src/protocols/trepia/trepia.c:279 src/protocols/trepia/trepia.c:421
-#: src/protocols/yahoo/yahoo.c:2706
+#: src/protocols/yahoo/yahoo.c:2730
 msgid "Gender"
 msgstr "Sexo"
 
-#: src/protocols/msn/msn.c:1366 src/protocols/yahoo/yahoo.c:2700
+#: src/protocols/msn/msn.c:1370 src/protocols/yahoo/yahoo.c:2726
 msgid "Marital Status"
 msgstr "Estado civil"
 
-#: src/protocols/msn/msn.c:1373 src/protocols/yahoo/yahoo.c:2688
+#: src/protocols/msn/msn.c:1377 src/protocols/yahoo/yahoo.c:2718
 msgid "Location"
 msgstr "Localiza巽達o"
 
-#: src/protocols/msn/msn.c:1381 src/protocols/yahoo/yahoo.c:2712
+#: src/protocols/msn/msn.c:1385 src/protocols/yahoo/yahoo.c:2734
 msgid "Occupation"
 msgstr "Ocupa巽達o"
 
-#: src/protocols/msn/msn.c:1398 src/protocols/msn/msn.c:1404
-#: src/protocols/msn/msn.c:1411 src/protocols/msn/msn.c:1418
-#: src/protocols/msn/msn.c:1425
+#: src/protocols/msn/msn.c:1402 src/protocols/msn/msn.c:1408
+#: src/protocols/msn/msn.c:1415 src/protocols/msn/msn.c:1422
+#: src/protocols/msn/msn.c:1429
 msgid "A Little About Me"
 msgstr "Um pouco sobre mim"
 
-#: src/protocols/msn/msn.c:1434 src/protocols/msn/msn.c:1447
-#: src/protocols/msn/msn.c:1454
+#: src/protocols/msn/msn.c:1438 src/protocols/msn/msn.c:1451
+#: src/protocols/msn/msn.c:1458
 msgid "Favorite Things"
 msgstr "Coisas favoritas"
 
-#: src/protocols/msn/msn.c:1463 src/protocols/msn/msn.c:1469
-#: src/protocols/msn/msn.c:1476
+#: src/protocols/msn/msn.c:1467 src/protocols/msn/msn.c:1473
+#: src/protocols/msn/msn.c:1480
 msgid "Hobbies and Interests"
 msgstr "Hobbies e interesses"
 
-#: src/protocols/msn/msn.c:1485 src/protocols/msn/msn.c:1491
-#: src/protocols/yahoo/yahoo.c:2756
+#: src/protocols/msn/msn.c:1489 src/protocols/msn/msn.c:1495
+#: src/protocols/yahoo/yahoo.c:2769
 msgid "Favorite Quote"
 msgstr "Cita巽達o favorita"
 
-#: src/protocols/msn/msn.c:1499 src/protocols/yahoo/yahoo.c:2800
+#: src/protocols/msn/msn.c:1503 src/protocols/yahoo/yahoo.c:2805
 msgid "Last Updated"
 msgstr "�ltima atualiza巽達o"
 
 #. Homepage
-#: src/protocols/msn/msn.c:1510 src/protocols/trepia/trepia.c:289
+#: src/protocols/msn/msn.c:1514 src/protocols/trepia/trepia.c:289
 #: src/protocols/trepia/trepia.c:457
 msgid "Homepage"
 msgstr "P叩gina da web"
 
-#: src/protocols/msn/msn.c:1532 src/protocols/yahoo/yahoo.c:2818
+#: src/protocols/msn/msn.c:1536 src/protocols/yahoo/yahoo.c:2820
 #, c-format
 msgid "User information for %s unavailable"
 msgstr "Informa巽達o do usu叩rio %s indispon鱈vel"
 
-#: src/protocols/msn/msn.c:1534 src/protocols/yahoo/yahoo.c:2820
+#: src/protocols/msn/msn.c:1538 src/protocols/yahoo/yahoo.c:2822
 msgid "The user's profile is empty."
 msgstr "O perfil do usu叩rio est叩 vazio"
 
@@ -5897,15 +5897,15 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/msn/msn.c:1632 src/protocols/msn/msn.c:1634
+#: src/protocols/msn/msn.c:1636 src/protocols/msn/msn.c:1638
 msgid "MSN Protocol Plugin"
 msgstr "Plugin do protocolo MSN"
 
-#: src/protocols/msn/msn.c:1651 src/protocols/trepia/trepia.c:1340
+#: src/protocols/msn/msn.c:1655 src/protocols/trepia/trepia.c:1340
 msgid "Login server"
 msgstr "Servidor de login"
 
-#: src/protocols/msn/msn.c:1661
+#: src/protocols/msn/msn.c:1665
 msgid "Use HTTP Method"
 msgstr "Usar m辿todo HTTP"
 
@@ -5948,7 +5948,7 @@
 msgstr "Imposs鱈vel conectar ao servidor Passport."
 
 #: src/protocols/msn/notification.c:709 src/protocols/msn/notification.c:741
-#: src/protocols/oscar/oscar.c:1413
+#: src/protocols/oscar/oscar.c:1362
 msgid "Password sent"
 msgstr "Senha enviada"
 
@@ -6073,7 +6073,7 @@
 msgid "%s requested a PING"
 msgstr "%s requisitou um PING"
 
-#: src/protocols/napster/napster.c:543 src/protocols/oscar/oscar.c:5259
+#: src/protocols/napster/napster.c:543 src/protocols/oscar/oscar.c:5208
 #: src/protocols/toc/toc.c:1259
 msgid "Join what group:"
 msgstr "Entrar em qual grupo:"
@@ -6225,7 +6225,7 @@
 msgid "Unable to login to AIM"
 msgstr "Imposs鱈vel conectar ao AIM"
 
-#: src/protocols/oscar/oscar.c:779 src/protocols/oscar/oscar.c:1218
+#: src/protocols/oscar/oscar.c:779 src/protocols/oscar/oscar.c:1167
 msgid "Could Not Connect"
 msgstr "N達o foi poss鱈vel conectar"
 
@@ -6250,20 +6250,20 @@
 msgid "Unable to create new connection."
 msgstr "Imposs鱈vel criar nova conex達o."
 
-#: src/protocols/oscar/oscar.c:1104 src/protocols/toc/toc.c:571
+#: src/protocols/oscar/oscar.c:1053 src/protocols/toc/toc.c:571
 msgid "Incorrect nickname or password."
 msgstr "Usu叩rio ou senha incorreto(a)."
 
-#: src/protocols/oscar/oscar.c:1109
+#: src/protocols/oscar/oscar.c:1058
 msgid "Your account is currently suspended."
 msgstr "Atualmente, sua conta est叩 suspensa."
 
 #. service temporarily unavailable
-#: src/protocols/oscar/oscar.c:1113
+#: src/protocols/oscar/oscar.c:1062
 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:1118
+#: src/protocols/oscar/oscar.c:1067
 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."
@@ -6272,23 +6272,23 @@
 "minutos e tente novamente. Se voc棚 continuar tentando, vai ter que esperar "
 "ainda mais."
 
-#: src/protocols/oscar/oscar.c:1123
+#: src/protocols/oscar/oscar.c:1072
 #, 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:1155
+#: src/protocols/oscar/oscar.c:1104
 msgid "Internal Error"
 msgstr "Erro interno"
 
-#: src/protocols/oscar/oscar.c:1225
+#: src/protocols/oscar/oscar.c:1174
 msgid "Received authorization"
 msgstr "Autoriza巽達o recebida"
 
-#: src/protocols/oscar/oscar.c:1260 src/protocols/oscar/oscar.c:1290
-#: src/protocols/oscar/oscar.c:1378
+#: src/protocols/oscar/oscar.c:1209 src/protocols/oscar/oscar.c:1239
+#: src/protocols/oscar/oscar.c:1327
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
@@ -6297,29 +6297,29 @@
 "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:1263 src/protocols/oscar/oscar.c:1293
+#: src/protocols/oscar/oscar.c:1212 src/protocols/oscar/oscar.c:1242
 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:1381
+#: src/protocols/oscar/oscar.c:1330
 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:1963 src/protocols/oscar/oscar.c:5697
+#: src/protocols/oscar/oscar.c:1912 src/protocols/oscar/oscar.c:5646
 #, c-format
 msgid "Direct IM with %s established"
 msgstr "Mensagem instant但nea direta com %s estabelecida"
 
-#: src/protocols/oscar/oscar.c:2292 src/protocols/oscar/oscar.c:2314
+#: src/protocols/oscar/oscar.c:2241 src/protocols/oscar/oscar.c:2263
 msgid "(There was an error receiving this message)"
 msgstr "(Houve um erro ao receber esta mensagem)"
 
-#: src/protocols/oscar/oscar.c:2461
+#: src/protocols/oscar/oscar.c:2410
 #, 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:2464
+#: src/protocols/oscar/oscar.c:2413
 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 "
@@ -6329,24 +6329,24 @@
 "para mensagens instant但neas com imagens. Por revelar seu IP, isto pode ser "
 "considerado um risco de privacidade."
 
-#: src/protocols/oscar/oscar.c:2469 src/protocols/oscar/oscar.c:6066
+#: src/protocols/oscar/oscar.c:2418 src/protocols/oscar/oscar.c:6015
 msgid "Connect"
 msgstr "Conectar"
 
-#: src/protocols/oscar/oscar.c:2496
+#: src/protocols/oscar/oscar.c:2445
 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:2504
+#: src/protocols/oscar/oscar.c:2453
 msgid "Authorization Request Message:"
 msgstr "Mensagem para pedido de autoriza巽達o:"
 
-#: src/protocols/oscar/oscar.c:2505
+#: src/protocols/oscar/oscar.c:2454
 msgid "Please authorize me!"
 msgstr "Por favor me autorize!"
 
-#: src/protocols/oscar/oscar.c:2533
+#: src/protocols/oscar/oscar.c:2482
 #, c-format
 msgid ""
 "The user %s requires authorization before being added to a buddy list.  Do "
@@ -6355,23 +6355,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:2538 src/protocols/oscar/oscar.c:2540
+#: src/protocols/oscar/oscar.c:2487 src/protocols/oscar/oscar.c:2489
 msgid "Request Authorization"
 msgstr "Pedir autoriza巽達o"
 
-#: src/protocols/oscar/oscar.c:2576 src/protocols/oscar/oscar.c:2578
-#: src/protocols/oscar/oscar.c:2585 src/protocols/oscar/oscar.c:2661
-#: src/protocols/oscar/oscar.c:2681 src/protocols/oscar/oscar.c:3037
-#: src/protocols/oscar/oscar.c:3094 src/protocols/oscar/oscar.c:5180
-#: src/protocols/oscar/oscar.c:5226
+#: src/protocols/oscar/oscar.c:2525 src/protocols/oscar/oscar.c:2527
+#: src/protocols/oscar/oscar.c:2534 src/protocols/oscar/oscar.c:2610
+#: src/protocols/oscar/oscar.c:2630 src/protocols/oscar/oscar.c:2986
+#: src/protocols/oscar/oscar.c:3043 src/protocols/oscar/oscar.c:5129
+#: src/protocols/oscar/oscar.c:5175
 msgid "No reason given."
 msgstr "Nenhum motivo foi dado."
 
-#: src/protocols/oscar/oscar.c:2584
+#: src/protocols/oscar/oscar.c:2533
 msgid "Authorization Denied Message:"
 msgstr "Mensagem de recusa de autoriza巽達o:"
 
-#: src/protocols/oscar/oscar.c:2661
+#: src/protocols/oscar/oscar.c:2610
 #, c-format
 msgid ""
 "The user %u wants to add you to their buddy list for the following reason:\n"
@@ -6381,11 +6381,11 @@
 "motivo: \n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2669 src/protocols/oscar/oscar.c:5186
+#: src/protocols/oscar/oscar.c:2618 src/protocols/oscar/oscar.c:5135
 msgid "Authorization Request"
 msgstr "Pedido de autoriza巽達o"
 
-#: src/protocols/oscar/oscar.c:2681
+#: src/protocols/oscar/oscar.c:2630
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -6396,18 +6396,18 @@
 "seguinte motivo:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2682
+#: src/protocols/oscar/oscar.c:2631
 msgid "ICQ authorization denied."
 msgstr "Autoriza巽達o do ICQ negada."
 
 #. Someone has granted you authorization
-#: src/protocols/oscar/oscar.c:2689
+#: src/protocols/oscar/oscar.c:2638
 #, 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:2697
+#: src/protocols/oscar/oscar.c:2646
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -6420,7 +6420,7 @@
 "De: %s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2705
+#: src/protocols/oscar/oscar.c:2654
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -6433,7 +6433,7 @@
 "De: %s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2713
+#: src/protocols/oscar/oscar.c:2662
 #, c-format
 msgid ""
 "You have received an ICQ email from %s [%s]\n"
@@ -6446,34 +6446,34 @@
 "A mensagem 辿: \n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2734
+#: src/protocols/oscar/oscar.c:2683
 #, 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:2740
+#: src/protocols/oscar/oscar.c:2689
 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:2744
+#: src/protocols/oscar/oscar.c:2693
 msgid "Decline"
 msgstr "Rejeitar"
 
-#: src/protocols/oscar/oscar.c:2826
+#: src/protocols/oscar/oscar.c:2775
 #, 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:2835
+#: src/protocols/oscar/oscar.c:2784
 #, 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:2844
+#: src/protocols/oscar/oscar.c:2793
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -6484,177 +6484,178 @@
 msgstr[1] ""
 "Voc棚 perdeu %hu mensagens de %s porque o limite de frequ棚ncia foi excedido."
 
-#: src/protocols/oscar/oscar.c:2853
+#: src/protocols/oscar/oscar.c:2802
 #, 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:2862
+#: src/protocols/oscar/oscar.c:2811
 #, 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:2871
+#: src/protocols/oscar/oscar.c:2820
 #, 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:2887 src/protocols/oscar/oscar.c:4654
-#: src/protocols/oscar/oscar.c:6193
+#: src/protocols/oscar/oscar.c:2836 src/protocols/oscar/oscar.c:4603
+#: src/protocols/oscar/oscar.c:6142
 msgid "Free For Chat"
 msgstr "Livre para conversa"
 
-#: src/protocols/oscar/oscar.c:2891 src/protocols/oscar/oscar.c:4648
-#: src/protocols/oscar/oscar.c:6191
+#: src/protocols/oscar/oscar.c:2840 src/protocols/oscar/oscar.c:4597
+#: src/protocols/oscar/oscar.c:6140
 msgid "Not Available"
 msgstr "N達o dispon鱈vel"
 
-#: src/protocols/oscar/oscar.c:2893 src/protocols/oscar/oscar.c:4651
-#: src/protocols/oscar/oscar.c:6192
+#: src/protocols/oscar/oscar.c:2842 src/protocols/oscar/oscar.c:4600
+#: src/protocols/oscar/oscar.c:6141
 msgid "Occupied"
 msgstr "Ocupado"
 
-#: src/protocols/oscar/oscar.c:2897
+#: src/protocols/oscar/oscar.c:2846
 msgid "Web Aware"
 msgstr "Permitir que outros vejam seu status pela Web"
 
-#: src/protocols/oscar/oscar.c:2940
+#: src/protocols/oscar/oscar.c:2889
 #, c-format
 msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<HR>%s"
 msgstr "<B>UIN:</B> %s<BR><B>Status:</B> %s<HR>%s"
 
-#: src/protocols/oscar/oscar.c:2999
+#: src/protocols/oscar/oscar.c:2948
 #, c-format
 msgid "SNAC threw error: %s\n"
 msgstr "Erro do SNAC: %s\n"
 
 #. Data is assumed to be the destination sn
-#: src/protocols/oscar/oscar.c:3035
+#: src/protocols/oscar/oscar.c:2984
 #, 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:3092
+#: src/protocols/oscar/oscar.c:3041
 #, c-format
 msgid "User information for %s unavailable:"
 msgstr "Informa巽達o do usu叩rio %s indispon鱈vel:"
 
-#: src/protocols/oscar/oscar.c:3131
+#: src/protocols/oscar/oscar.c:3080
 msgid "Voice"
 msgstr "Voz"
 
-#: src/protocols/oscar/oscar.c:3134
+#: src/protocols/oscar/oscar.c:3083
 msgid "AIM Direct IM"
 msgstr "Mensagem instant但nea direta do AIM"
 
-#: src/protocols/oscar/oscar.c:3140 src/protocols/oscar/oscar.c:6284
+#: src/protocols/oscar/oscar.c:3089 src/protocols/oscar/oscar.c:6241
 msgid "Get File"
 msgstr "Receber arquivo"
 
-#: src/protocols/oscar/oscar.c:3143
+#: src/protocols/oscar/oscar.c:3092 src/protocols/oscar/oscar.c:6233
+#: src/protocols/yahoo/yahoo.c:2213
 msgid "Send File"
 msgstr "Enviar"
 
-#: src/protocols/oscar/oscar.c:3147
+#: src/protocols/oscar/oscar.c:3096
 msgid "Games"
 msgstr "Jogos"
 
-#: src/protocols/oscar/oscar.c:3150
+#: src/protocols/oscar/oscar.c:3099
 msgid "Add-Ins"
 msgstr "Add-Ins"
 
-#: src/protocols/oscar/oscar.c:3153
+#: src/protocols/oscar/oscar.c:3102
 msgid "Send Buddy List"
 msgstr "Enviar lista de amigos"
 
-#: src/protocols/oscar/oscar.c:3156
+#: src/protocols/oscar/oscar.c:3105
 msgid "ICQ Direct Connect"
 msgstr "Conex達o direta do ICQ"
 
-#: src/protocols/oscar/oscar.c:3159
+#: src/protocols/oscar/oscar.c:3108
 msgid "AP User"
 msgstr "Usu叩rio AP"
 
-#: src/protocols/oscar/oscar.c:3162
+#: src/protocols/oscar/oscar.c:3111
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
-#: src/protocols/oscar/oscar.c:3165
+#: src/protocols/oscar/oscar.c:3114
 msgid "Nihilist"
 msgstr "Nihilista"
 
-#: src/protocols/oscar/oscar.c:3168
+#: src/protocols/oscar/oscar.c:3117
 msgid "ICQ Server Relay"
 msgstr "Relay do servidor ICQ"
 
-#: src/protocols/oscar/oscar.c:3171
+#: src/protocols/oscar/oscar.c:3120
 msgid "Old ICQ UTF8"
 msgstr "ICQ UTF8 antigo"
 
-#: src/protocols/oscar/oscar.c:3174
+#: src/protocols/oscar/oscar.c:3123
 msgid "Trillian Encryption"
 msgstr "Criptografia do Trillian"
 
-#: src/protocols/oscar/oscar.c:3177
+#: src/protocols/oscar/oscar.c:3126
 msgid "ICQ UTF8"
 msgstr "ICQ UTF8"
 
-#: src/protocols/oscar/oscar.c:3180
+#: src/protocols/oscar/oscar.c:3129
 msgid "Hiptop"
 msgstr "Hiptop"
 
-#: src/protocols/oscar/oscar.c:3183
+#: src/protocols/oscar/oscar.c:3132
 msgid "Security Enabled"
 msgstr "Seguran巽a ativada"
 
-#: src/protocols/oscar/oscar.c:3186
+#: src/protocols/oscar/oscar.c:3135
 msgid "Video Chat"
 msgstr "Chat com v鱈deo"
 
-#: src/protocols/oscar/oscar.c:3215
+#: src/protocols/oscar/oscar.c:3164
 #, c-format
 msgid "Username: <b>%s</b><br>\n"
 msgstr "Nome de usu叩rio: <b>%s</b><br>\n"
 
-#: src/protocols/oscar/oscar.c:3216
+#: src/protocols/oscar/oscar.c:3165
 #, c-format
 msgid "Warning Level: <b>%d%%</b><br>\n"
 msgstr "N鱈vel de alerta: <b>%s</b><br>\n"
 
-#: src/protocols/oscar/oscar.c:3219
+#: src/protocols/oscar/oscar.c:3168
 #, c-format
 msgid "Online Since: <b>%s</b><br>\n"
 msgstr "Conectado desde: <b>%s</b><br>\n"
 
-#: src/protocols/oscar/oscar.c:3223
+#: src/protocols/oscar/oscar.c:3172
 #, c-format
 msgid "Member Since: <b>%s</b><br>\n"
 msgstr "Membro desde: <b>%s</b><br>\n"
 
-#: src/protocols/oscar/oscar.c:3228
+#: src/protocols/oscar/oscar.c:3177
 #, c-format
 msgid "Idle: <b>%s</b>"
 msgstr "Inativo por: <b>%s</b>"
 
-#: src/protocols/oscar/oscar.c:3231
+#: src/protocols/oscar/oscar.c:3180
 msgid "Idle: <b>Active</b>"
 msgstr "Inativo: <b>Ativo</b>"
 
-#: src/protocols/oscar/oscar.c:3270
+#: src/protocols/oscar/oscar.c:3219
 msgid "Your AIM connection may be lost."
 msgstr "Sua conex達o AIM pode ter sido perdida."
 
-#: src/protocols/oscar/oscar.c:3664
+#: src/protocols/oscar/oscar.c:3613
 msgid "Rate limiting error."
 msgstr "Erro na limita巽達o da taxa."
 
-#: src/protocols/oscar/oscar.c:3665
+#: src/protocols/oscar/oscar.c:3614
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
@@ -6662,7 +6663,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:3726
+#: src/protocols/oscar/oscar.c:3675
 msgid ""
 "You have been disconnected because you have signed on with this screen name "
 "at another location."
@@ -6670,109 +6671,109 @@
 "Voc棚 foi desconectado porque conectou-se de outro local com o mesmo nome de "
 "usu叩rio."
 
-#: src/protocols/oscar/oscar.c:3728
+#: src/protocols/oscar/oscar.c:3677
 msgid "You have been signed off for an unknown reason."
 msgstr "Voc棚 foi desconectado por um motivo desconhecido."
 
-#: src/protocols/oscar/oscar.c:3759
+#: src/protocols/oscar/oscar.c:3708
 msgid "Finalizing connection"
 msgstr "Finalizando a conex達o"
 
-#: src/protocols/oscar/oscar.c:4019 src/protocols/oscar/oscar.c:4025
+#: src/protocols/oscar/oscar.c:3968 src/protocols/oscar/oscar.c:3974
 msgid "Email Address"
 msgstr "Endere巽o de email"
 
-#: src/protocols/oscar/oscar.c:4030
+#: src/protocols/oscar/oscar.c:3979
 msgid "Mobile Phone"
 msgstr "Telefone m坦vel"
 
-#: src/protocols/oscar/oscar.c:4033 src/protocols/trepia/trepia.c:281
+#: src/protocols/oscar/oscar.c:3982 src/protocols/trepia/trepia.c:281
 #: src/protocols/trepia/trepia.c:422
 msgid "Female"
 msgstr "Feminino"
 
-#: src/protocols/oscar/oscar.c:4033 src/protocols/trepia/trepia.c:280
+#: src/protocols/oscar/oscar.c:3982 src/protocols/trepia/trepia.c:280
 #: src/protocols/trepia/trepia.c:422
 msgid "Male"
 msgstr "Masculino"
 
-#: src/protocols/oscar/oscar.c:4050
+#: src/protocols/oscar/oscar.c:3999
 msgid "Personal Web Page"
 msgstr "P叩gina da web pessoal"
 
-#: src/protocols/oscar/oscar.c:4053
+#: src/protocols/oscar/oscar.c:4002
 msgid "Additional Information"
 msgstr "Informa巽探es adicionais"
 
-#: src/protocols/oscar/oscar.c:4057
+#: src/protocols/oscar/oscar.c:4006
 msgid "Home Address"
 msgstr "Endere巽o de casa"
 
-#: src/protocols/oscar/oscar.c:4068 src/protocols/oscar/oscar.c:4084
+#: src/protocols/oscar/oscar.c:4017 src/protocols/oscar/oscar.c:4033
 msgid "Zip Code"
 msgstr "C坦digo Postal (CEP)"
 
-#: src/protocols/oscar/oscar.c:4073
+#: src/protocols/oscar/oscar.c:4022
 msgid "Work Address"
 msgstr "Endere巽o do trabalho"
 
-#: src/protocols/oscar/oscar.c:4089
+#: src/protocols/oscar/oscar.c:4038
 msgid "Work Information"
 msgstr "Informa巽探es do trabalho"
 
-#: src/protocols/oscar/oscar.c:4091
+#: src/protocols/oscar/oscar.c:4040
 msgid "Company"
 msgstr "Empresa"
 
-#: src/protocols/oscar/oscar.c:4094
+#: src/protocols/oscar/oscar.c:4043
 msgid "Division"
 msgstr "Divis達o"
 
-#: src/protocols/oscar/oscar.c:4097
+#: src/protocols/oscar/oscar.c:4046
 msgid "Position"
 msgstr "Posi巽達o"
 
-#: src/protocols/oscar/oscar.c:4100
+#: src/protocols/oscar/oscar.c:4049
 msgid "Web Page"
 msgstr "P叩gina da web"
 
-#: src/protocols/oscar/oscar.c:4106
+#: src/protocols/oscar/oscar.c:4055
 #, c-format
 msgid "ICQ Info for %s"
 msgstr "Informa巽探es do ICQ de %s:"
 
-#: src/protocols/oscar/oscar.c:4156
+#: src/protocols/oscar/oscar.c:4105
 msgid "Pop-Up Message"
 msgstr "Mensagem pop-up"
 
-#: src/protocols/oscar/oscar.c:4177
+#: src/protocols/oscar/oscar.c:4126
 #, c-format
 msgid "The following screennames are associated with %s"
 msgstr "Os seguintes nomes de usu叩rio est達o associados com %s"
 
-#: src/protocols/oscar/oscar.c:4181
+#: src/protocols/oscar/oscar.c:4130
 msgid "Search Results"
 msgstr "Resultados da procura"
 
-#: src/protocols/oscar/oscar.c:4198
+#: src/protocols/oscar/oscar.c:4147
 #, 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:4219
+#: src/protocols/oscar/oscar.c:4168
 #, 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:4221
+#: src/protocols/oscar/oscar.c:4170
 msgid "Account Confirmation Requested"
 msgstr "Confirma巽達o de conta recebida"
 
-#: src/protocols/oscar/oscar.c:4249
+#: src/protocols/oscar/oscar.c:4198
 msgid "Error Changing Account Info"
 msgstr "Erro ao mudar informa巽探es da conta"
 
-#: src/protocols/oscar/oscar.c:4252
+#: src/protocols/oscar/oscar.c:4201
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -6781,7 +6782,7 @@
 "Erro 0x%04x: Imposs鱈vel formatar nome de usu叩rio pois o nome requisitado "
 "difere do original."
 
-#: src/protocols/oscar/oscar.c:4255
+#: src/protocols/oscar/oscar.c:4204
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -6790,7 +6791,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:4258
+#: src/protocols/oscar/oscar.c:4207
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -6799,7 +6800,7 @@
 "Erro 0x%04x: Imposs鱈vel formatar nome de usu叩rio pois o nome requisitado 辿 "
 "muito extenso."
 
-#: src/protocols/oscar/oscar.c:4261
+#: src/protocols/oscar/oscar.c:4210
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because there is already a "
@@ -6808,7 +6809,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:4264
+#: src/protocols/oscar/oscar.c:4213
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address has "
@@ -6817,7 +6818,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:4267
+#: src/protocols/oscar/oscar.c:4216
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address is "
@@ -6825,12 +6826,12 @@
 msgstr ""
 "Erro 0x%04x: Imposs鱈vel mudar o endere巽o de email porque este 辿 inv叩lido."
 
-#: src/protocols/oscar/oscar.c:4270
+#: src/protocols/oscar/oscar.c:4219
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "Erro 0x%04x: Erro desconhecido."
 
-#: src/protocols/oscar/oscar.c:4280
+#: src/protocols/oscar/oscar.c:4229
 #, c-format
 msgid ""
 "Your screen name is currently formatted as follows:\n"
@@ -6839,20 +6840,20 @@
 "Atualmente, seu nome de usu叩rio est叩 formatado desta maneira:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:4281 src/protocols/oscar/oscar.c:4288
+#: src/protocols/oscar/oscar.c:4230 src/protocols/oscar/oscar.c:4237
 msgid "Account Info"
 msgstr "Informa巽探es da conta"
 
-#: src/protocols/oscar/oscar.c:4286
+#: src/protocols/oscar/oscar.c:4235
 #, c-format
 msgid "The email address for %s is %s"
 msgstr "O endere巽o de email de %s 辿 %s"
 
-#: src/protocols/oscar/oscar.c:4518
+#: src/protocols/oscar/oscar.c:4467
 msgid "Unable to set AIM profile."
 msgstr "Impossivel definir perfil AIM."
 
-#: src/protocols/oscar/oscar.c:4519
+#: src/protocols/oscar/oscar.c:4468
 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 "
@@ -6862,7 +6863,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:4546
+#: src/protocols/oscar/oscar.c:4495
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  Gaim has truncated "
@@ -6877,15 +6878,15 @@
 "O tamanho m叩ximo de %d bytes do seu perfil foi excedido. O Gaim truncou-o "
 "para voc棚."
 
-#: src/protocols/oscar/oscar.c:4551
+#: src/protocols/oscar/oscar.c:4500
 msgid "Profile too long."
 msgstr "Perfil muito extenso."
 
-#: src/protocols/oscar/oscar.c:4568
+#: src/protocols/oscar/oscar.c:4517
 msgid "Unable to set AIM away message."
 msgstr "Imposs鱈vel definir mensagem de away do AIM."
 
-#: src/protocols/oscar/oscar.c:4569
+#: src/protocols/oscar/oscar.c:4518
 msgid ""
 "You have probably requested to set your away message before the login "
 "procedure completed.  You remain in a \"present\" state; try setting it "
@@ -6896,7 +6897,7 @@
 "\"presente\"; tente defini-lo novamente quando voc棚 estiver totalmente "
 "conectado."
 
-#: src/protocols/oscar/oscar.c:4609
+#: src/protocols/oscar/oscar.c:4558
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  Gaim has "
@@ -6911,15 +6912,15 @@
 "O tamanho m叩ximo de %d bytes da mensagem de away foi excedido. O Gaim "
 "truncou-a e definiu seu status como ausente."
 
-#: src/protocols/oscar/oscar.c:4614
+#: src/protocols/oscar/oscar.c:4563
 msgid "Away message too long."
 msgstr "Mensagem de away muito extensa."
 
-#: src/protocols/oscar/oscar.c:4828
+#: src/protocols/oscar/oscar.c:4777
 msgid "Unable To Retrieve Buddy List"
 msgstr "Imposs鱈vel recuperar lista de amigos"
 
-#: src/protocols/oscar/oscar.c:4829
+#: src/protocols/oscar/oscar.c:4778
 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 "
@@ -6929,12 +6930,12 @@
 "momento. Sua lista de amigos n達o foi perdida, e provavelmente estar叩 "
 "dispon鱈vel em algumas horas."
 
-#: src/protocols/oscar/oscar.c:4921 src/protocols/oscar/oscar.c:4922
-#: src/protocols/oscar/oscar.c:4927
+#: src/protocols/oscar/oscar.c:4870 src/protocols/oscar/oscar.c:4871
+#: src/protocols/oscar/oscar.c:4876
 msgid "Orphans"
 msgstr "�rf達os"
 
-#: src/protocols/oscar/oscar.c:5093
+#: src/protocols/oscar/oscar.c:5042
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -6943,15 +6944,15 @@
 "N達o foi poss鱈vel adicionar o amigo %s porque voc棚 tem muitos amigos na ua "
 "lista de amigos. Por favor remova um e tente novamente."
 
-#: src/protocols/oscar/oscar.c:5093 src/protocols/oscar/oscar.c:5106
+#: src/protocols/oscar/oscar.c:5042 src/protocols/oscar/oscar.c:5055
 msgid "(no name)"
 msgstr "(sem nome)"
 
-#: src/protocols/oscar/oscar.c:5094 src/protocols/oscar/oscar.c:5107
+#: src/protocols/oscar/oscar.c:5043 src/protocols/oscar/oscar.c:5056
 msgid "Unable To Add"
 msgstr "Imposs鱈vel adicionar"
 
-#: src/protocols/oscar/oscar.c:5106
+#: src/protocols/oscar/oscar.c:5055
 #, c-format
 msgid ""
 "Could not add the buddy %s for an unknown reason.  The most common reason "
@@ -6962,7 +6963,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:5141
+#: src/protocols/oscar/oscar.c:5090
 #, c-format
 msgid ""
 "The user %s has given you permission to add you to their buddy list.  Do you "
@@ -6971,11 +6972,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:5147
+#: src/protocols/oscar/oscar.c:5096
 msgid "Authorization Given"
 msgstr "Autoriza巽達o concedida"
 
-#: src/protocols/oscar/oscar.c:5180
+#: src/protocols/oscar/oscar.c:5129
 #, c-format
 msgid ""
 "The user %s wants to add you to their buddy list for the following reason:\n"
@@ -6986,18 +6987,18 @@
 "%s"
 
 #. Granted
-#: src/protocols/oscar/oscar.c:5222
+#: src/protocols/oscar/oscar.c:5171
 #, 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:5223
+#: src/protocols/oscar/oscar.c:5172
 msgid "Authorization Granted"
 msgstr "Autoriza巽達o concedida"
 
 #. Denied
-#: src/protocols/oscar/oscar.c:5226
+#: src/protocols/oscar/oscar.c:5175
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -7008,56 +7009,56 @@
 "seguinte motivo: \n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:5227
+#: src/protocols/oscar/oscar.c:5176
 msgid "Authorization Denied"
 msgstr "Autoriza巽達o negada"
 
-#: src/protocols/oscar/oscar.c:5264 src/protocols/toc/toc.c:1264
+#: src/protocols/oscar/oscar.c:5213 src/protocols/toc/toc.c:1264
 msgid "Exchange:"
 msgstr "Troca:"
 
-#: src/protocols/oscar/oscar.c:5501
+#: src/protocols/oscar/oscar.c:5450
 msgid "<b>Status:</b> "
 msgstr "<b>Status:</b> "
 
-#: src/protocols/oscar/oscar.c:5510
+#: src/protocols/oscar/oscar.c:5459
 msgid "<b>Logged In:</b> "
 msgstr "<b>Conectado por:</b> "
 
-#: src/protocols/oscar/oscar.c:5522
+#: src/protocols/oscar/oscar.c:5471
 msgid "<b>IP Address:</b> "
 msgstr "<b>Endere巽o IP:</b> "
 
-#: src/protocols/oscar/oscar.c:5530
+#: src/protocols/oscar/oscar.c:5479
 msgid "<b>Capabilities:</b> "
 msgstr "<b>Recursos:</b> "
 
-#: src/protocols/oscar/oscar.c:5537
+#: src/protocols/oscar/oscar.c:5486
 msgid "<b>Available:</b> "
 msgstr "<b>Dispon鱈vel:</b> "
 
-#: src/protocols/oscar/oscar.c:5555
+#: src/protocols/oscar/oscar.c:5504
 msgid "<b>Away Message:</b> "
 msgstr "<b>Mensagem de away</b>"
 
-#: src/protocols/oscar/oscar.c:5564
+#: src/protocols/oscar/oscar.c:5513
 msgid "<b>Status:</b> Not Authorized"
 msgstr "<b>Status:</b> N達o autorizado"
 
-#: src/protocols/oscar/oscar.c:5598 src/protocols/yahoo/yahoo.c:2030
+#: src/protocols/oscar/oscar.c:5547 src/protocols/yahoo/yahoo.c:2054
 msgid "Offline"
 msgstr "Desconectado"
 
-#: src/protocols/oscar/oscar.c:6046
+#: src/protocols/oscar/oscar.c:5995
 msgid "Unable to open Direct IM"
 msgstr "Imposs鱈vel abrir mensagem instant但nea direta"
 
-#: src/protocols/oscar/oscar.c:6059
+#: src/protocols/oscar/oscar.c:6008
 #, 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:6062
+#: src/protocols/oscar/oscar.c:6011
 msgid ""
 "Because this reveals your IP address, it may be considered a privacy risk.  "
 "Do you wish to continue?"
@@ -7065,53 +7066,53 @@
 "Por revelar seu endere巽o IP, isto pode ser considerado um risco de "
 "privacidade. Deseja continuar?"
 
-#: src/protocols/oscar/oscar.c:6237
+#: src/protocols/oscar/oscar.c:6186
 msgid "Buddy Comment:"
 msgstr "Coment叩rio do amigo:"
 
-#: src/protocols/oscar/oscar.c:6253
+#: src/protocols/oscar/oscar.c:6202
 msgid "Edit Buddy Comment"
 msgstr "Editar coment叩rio do amigo"
 
-#: src/protocols/oscar/oscar.c:6261
+#: src/protocols/oscar/oscar.c:6210
 msgid "Get Status Msg"
 msgstr "Ver mensagem de status"
 
+#: src/protocols/oscar/oscar.c:6225
+msgid "Direct IM"
+msgstr "Mensagem instant但nea direta"
+
+#: src/protocols/oscar/oscar.c:6254
+msgid "Re-request Authorization"
+msgstr "Re-requisitar autoriza巽達o"
+
+#: src/protocols/oscar/oscar.c:6275
+msgid "The new formatting is invalid."
+msgstr "A nova formata巽達o 辿 inv叩lida."
+
 #: src/protocols/oscar/oscar.c:6276
-msgid "Direct IM"
-msgstr "Mensagem instant但nea direta"
-
-#: src/protocols/oscar/oscar.c:6297
-msgid "Re-request Authorization"
-msgstr "Re-requisitar autoriza巽達o"
-
-#: src/protocols/oscar/oscar.c:6318
-msgid "The new formatting is invalid."
-msgstr "A nova formata巽達o 辿 inv叩lida."
-
-#: src/protocols/oscar/oscar.c:6319
 msgid "Screenname 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:6325
+#: src/protocols/oscar/oscar.c:6282
 msgid "New screenname formatting:"
 msgstr "Nova formata巽達o do nome do usu叩rio:"
 
-#: src/protocols/oscar/oscar.c:6374
+#: src/protocols/oscar/oscar.c:6331
 msgid "Change Address To:"
 msgstr "Mudar endere巽o para:"
 
-#: src/protocols/oscar/oscar.c:6418
+#: src/protocols/oscar/oscar.c:6375
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>voc棚 n達o est叩 esperando autoriza巽達o</i>"
 
-#: src/protocols/oscar/oscar.c:6421
+#: src/protocols/oscar/oscar.c:6378
 msgid "You are awaiting authorization from the following buddies"
 msgstr "Voc棚 est叩 esperando autoriza巽達o dos seguintes amigos"
 
-#: src/protocols/oscar/oscar.c:6422
+#: src/protocols/oscar/oscar.c:6379
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
@@ -7119,63 +7120,63 @@
 "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:6436
+#: src/protocols/oscar/oscar.c:6393
 msgid "Find Buddy by E-mail"
 msgstr "Encontrar amigo por email"
 
-#: src/protocols/oscar/oscar.c:6437
+#: src/protocols/oscar/oscar.c:6394
 msgid "Search for a buddy by e-mail address"
 msgstr "Procurar por um amigo pelo endere巽o de email"
 
-#: src/protocols/oscar/oscar.c:6438
+#: src/protocols/oscar/oscar.c:6395
 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:6441
+#: src/protocols/oscar/oscar.c:6398
 msgid "Search"
 msgstr "Procurar"
 
-#: src/protocols/oscar/oscar.c:6455
+#: src/protocols/oscar/oscar.c:6412
 msgid "Available Message:"
 msgstr "Mensagem de 'Dispon鱈vel':"
 
-#: src/protocols/oscar/oscar.c:6456
+#: src/protocols/oscar/oscar.c:6413
 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:6534
+#: src/protocols/oscar/oscar.c:6491
 msgid "Set Available Message"
 msgstr "Definir mensagem de 'Dispon鱈vel'"
 
-#: src/protocols/oscar/oscar.c:6548
+#: src/protocols/oscar/oscar.c:6505
 msgid "Change Password (URL)"
 msgstr "Mudar senha (URL)"
 
-#: src/protocols/oscar/oscar.c:6556
+#: src/protocols/oscar/oscar.c:6513
 msgid "Configure IM Forwarding (URL)"
 msgstr "Configurar encaminhamento de mensagens (URL)"
 
-#: src/protocols/oscar/oscar.c:6567
+#: src/protocols/oscar/oscar.c:6524
 msgid "Format Screenname"
 msgstr "Formatar nome de usu叩rio"
 
-#: src/protocols/oscar/oscar.c:6573
+#: src/protocols/oscar/oscar.c:6530
 msgid "Confirm Account"
 msgstr "Confirmar conta"
 
-#: src/protocols/oscar/oscar.c:6579
+#: src/protocols/oscar/oscar.c:6536
 msgid "Display Current Registered Address"
 msgstr "Mostrar o endere巽o registrado atualmente"
 
-#: src/protocols/oscar/oscar.c:6585
+#: src/protocols/oscar/oscar.c:6542
 msgid "Change Current Registered Address"
 msgstr "Mudar o endere巽o registrado atualmente"
 
-#: src/protocols/oscar/oscar.c:6594
+#: src/protocols/oscar/oscar.c:6551
 msgid "Show Buddies Awaiting Authorization"
 msgstr "Mostrar amigos esperando autoriza巽達o"
 
-#: src/protocols/oscar/oscar.c:6602
+#: src/protocols/oscar/oscar.c:6559
 msgid "Search for Buddy by Email"
 msgstr "Procurar por amigos por email"
 
@@ -7189,15 +7190,15 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/oscar/oscar.c:6728 src/protocols/oscar/oscar.c:6730
+#: src/protocols/oscar/oscar.c:6680 src/protocols/oscar/oscar.c:6682
 msgid "AIM/ICQ Protocol Plugin"
 msgstr "Plugin do protocolo AIM/ICQ"
 
-#: src/protocols/oscar/oscar.c:6747
+#: src/protocols/oscar/oscar.c:6699
 msgid "Auth host"
 msgstr "Host de autoriza巽達o"
 
-#: src/protocols/oscar/oscar.c:6752
+#: src/protocols/oscar/oscar.c:6704
 msgid "Auth port"
 msgstr "Porta de autoriza巽達o"
 
@@ -7491,10 +7492,6 @@
 msgid "Local Users"
 msgstr "Usu叩rios locais"
 
-#: src/protocols/trepia/trepia.c:972
-msgid "Read error"
-msgstr "Erro de leitura"
-
 #: src/protocols/trepia/trepia.c:1073
 msgid "Logging in"
 msgstr "Conectando"
@@ -7513,18 +7510,18 @@
 msgid "Trepia Protocol Plugin"
 msgstr "Plugin do protocolo Trepia"
 
-#: src/protocols/yahoo/yahoo.c:700
+#: src/protocols/yahoo/yahoo.c:715
 msgid "Your Yahoo! message did not get sent."
 msgstr "Sua mensagem do Yahoo! n達o foi enviada."
 
-#: src/protocols/yahoo/yahoo.c:758
+#: src/protocols/yahoo/yahoo.c:773
 #, c-format
 msgid "%s has (retroactively) denied your request to add them to your list."
 msgstr ""
 "O usu叩rio %s (retroativamente) negou seu pedido para adicion叩-lo � sua lista "
 "de amigos."
 
-#: src/protocols/yahoo/yahoo.c:760
+#: src/protocols/yahoo/yahoo.c:775
 #, c-format
 msgid ""
 "%s has (retroactively) denied your request to add them to your list for the "
@@ -7533,11 +7530,11 @@
 "O usu叩rio %s (retroativamente) negou seu pedido para adicion叩-lo � sua lista "
 "de amigos com o seguinte motivo: %s."
 
-#: src/protocols/yahoo/yahoo.c:761
+#: src/protocols/yahoo/yahoo.c:776
 msgid "Add buddy rejected"
 msgstr "Pedido para adicionar amigo negado"
 
-#: src/protocols/yahoo/yahoo.c:1381
+#: src/protocols/yahoo/yahoo.c:1396
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -7548,11 +7545,11 @@
 "desconhecido. Esta vers達o do Gaim provavelmente n達o ser叩 capaz de se "
 "conectar com sucesso ao Yahoo. Verifique %s por atualiza巽探es."
 
-#: src/protocols/yahoo/yahoo.c:1384
+#: src/protocols/yahoo/yahoo.c:1399
 msgid "Failed Yahoo! Authentication"
 msgstr "Falha na autentica巽達o do Yahoo!"
 
-#: src/protocols/yahoo/yahoo.c:1457
+#: src/protocols/yahoo/yahoo.c:1472
 #, c-format
 msgid ""
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
@@ -7561,88 +7558,88 @@
 "Voc棚 tentou ignorar %s, mas o usu叩rio est叩 na sua lista de amigos. Ao clicar "
 "\"Sim\" o usu叩rio ser叩 removido e ignorado."
 
-#: src/protocols/yahoo/yahoo.c:1460
+#: src/protocols/yahoo/yahoo.c:1475
 msgid "Ignore buddy?"
 msgstr "Ignorar amigo?"
 
-#: src/protocols/yahoo/yahoo.c:1489
+#: src/protocols/yahoo/yahoo.c:1504
 msgid "Invalid username."
 msgstr "Nome de usu叩rio inv叩lido."
 
-#: src/protocols/yahoo/yahoo.c:1492
+#: src/protocols/yahoo/yahoo.c:1507
 msgid "Incorrect password."
 msgstr "Senha incorreta."
 
-#: src/protocols/yahoo/yahoo.c:1495
+#: src/protocols/yahoo/yahoo.c:1510
 msgid "Unknown error."
 msgstr "Erro desconhecido."
 
-#: src/protocols/yahoo/yahoo.c:1542
+#: src/protocols/yahoo/yahoo.c:1557
 #, c-format
 msgid "Could not add buddy %s to group %s to the server list on account %s."
 msgstr ""
 "N達o foi poss鱈vel adicionar o amigo %s ao grupo %s � lista do servidor na "
 "conta %s."
 
-#: src/protocols/yahoo/yahoo.c:1544
+#: src/protocols/yahoo/yahoo.c:1559
 msgid "Could not add buddy to server list"
 msgstr "Imposs鱈vel adicionar amigo � lista do servidor"
 
-#: src/protocols/yahoo/yahoo.c:1646 src/protocols/yahoo/yahoo.c:1776
+#: src/protocols/yahoo/yahoo.c:1665 src/protocols/yahoo/yahoo.c:1795
 msgid "Unable to read"
 msgstr "Inposs鱈vel ler"
 
-#: src/protocols/yahoo/yahoo.c:1801 src/protocols/yahoo/yahoo.c:1910
-#: src/protocols/yahoo/yahoo.c:1934
+#: src/protocols/yahoo/yahoo.c:1820 src/protocols/yahoo/yahoo.c:1929
+#: src/protocols/yahoo/yahoo.c:1953
 msgid "Connection problem"
 msgstr "Problema na conex達o"
 
-#: src/protocols/yahoo/yahoo.c:2012 src/protocols/yahoo/yahoo.c:2308
-#: src/protocols/yahoo/yahoo.c:2406
+#: src/protocols/yahoo/yahoo.c:2036 src/protocols/yahoo/yahoo.c:2339
+#: src/protocols/yahoo/yahoo.c:2437
 msgid "Not At Home"
 msgstr "Fora de casa"
 
-#: src/protocols/yahoo/yahoo.c:2014 src/protocols/yahoo/yahoo.c:2310
-#: src/protocols/yahoo/yahoo.c:2407
+#: src/protocols/yahoo/yahoo.c:2038 src/protocols/yahoo/yahoo.c:2341
+#: src/protocols/yahoo/yahoo.c:2438
 msgid "Not At Desk"
 msgstr "N達o estou por perto"
 
-#: src/protocols/yahoo/yahoo.c:2016 src/protocols/yahoo/yahoo.c:2312
-#: src/protocols/yahoo/yahoo.c:2408
+#: src/protocols/yahoo/yahoo.c:2040 src/protocols/yahoo/yahoo.c:2343
+#: src/protocols/yahoo/yahoo.c:2439
 msgid "Not In Office"
 msgstr "Fora do escrit坦rio"
 
-#: src/protocols/yahoo/yahoo.c:2020 src/protocols/yahoo/yahoo.c:2316
-#: src/protocols/yahoo/yahoo.c:2410
+#: src/protocols/yahoo/yahoo.c:2044 src/protocols/yahoo/yahoo.c:2347
+#: src/protocols/yahoo/yahoo.c:2441
 msgid "On Vacation"
 msgstr "De f辿rias"
 
-#: src/protocols/yahoo/yahoo.c:2024 src/protocols/yahoo/yahoo.c:2320
-#: src/protocols/yahoo/yahoo.c:2412
+#: src/protocols/yahoo/yahoo.c:2048 src/protocols/yahoo/yahoo.c:2351
+#: src/protocols/yahoo/yahoo.c:2443
 msgid "Stepped Out"
 msgstr "Fui embora"
 
-#: src/protocols/yahoo/yahoo.c:2088 src/protocols/yahoo/yahoo.c:2120
+#: src/protocols/yahoo/yahoo.c:2112 src/protocols/yahoo/yahoo.c:2144
 msgid "Not on server list"
 msgstr "N達o est叩 na lista do servidor"
 
-#: src/protocols/yahoo/yahoo.c:2176
+#: src/protocols/yahoo/yahoo.c:2200
 msgid "Join in Chat"
 msgstr "Entrar em um chat"
 
-#: src/protocols/yahoo/yahoo.c:2182
+#: src/protocols/yahoo/yahoo.c:2206
 msgid "Initiate Conference"
 msgstr "Iniciar confer棚ncia"
 
-#: src/protocols/yahoo/yahoo.c:2228
+#: src/protocols/yahoo/yahoo.c:2259
 msgid "Active which ID?"
 msgstr "Ativar qual ID?"
 
-#: src/protocols/yahoo/yahoo.c:2239
+#: src/protocols/yahoo/yahoo.c:2270
 msgid "Activate ID"
 msgstr "Ativar ID"
 
-#: src/protocols/yahoo/yahoo.c:2597
+#: src/protocols/yahoo/yahoo.c:2629
 msgid ""
 "<b>Sorry, profiles marked as containing adult content are not supported at "
 "this time.</b><br><br>\n"
@@ -7650,7 +7647,7 @@
 "<b>Desculpe, perfis marcados como contendo conte炭do adulto n達o s達o "
 "suportados atualmente.</b><br><br>\n"
 
-#: src/protocols/yahoo/yahoo.c:2598 src/protocols/yahoo/yahoo.c:2621
+#: src/protocols/yahoo/yahoo.c:2630 src/protocols/yahoo/yahoo.c:2653
 msgid ""
 "If you wish to view this profile, you will need to visit this link in your "
 "web browser<br>"
@@ -7658,43 +7655,43 @@
 "Se voc棚 deseja ver este perfil, ter叩 que visitar este link no seu navegador "
 "da web<br>"
 
-#: src/protocols/yahoo/yahoo.c:2620
+#: src/protocols/yahoo/yahoo.c:2652
 msgid ""
 "<b>Sorry, non-English profiles are not supported at this time.</b><br><br>\n"
 msgstr ""
 "<b>Desculpe, perfis que n達o est達o na l鱈ngua inglesa n達o s達o suportados "
 "atualmente.</b><br><br>\n"
 
-#: src/protocols/yahoo/yahoo.c:2665
+#: src/protocols/yahoo/yahoo.c:2700 src/protocols/yahoo/yahoo.c:2701
 msgid "Yahoo! ID"
 msgstr "ID do Yahoo!"
 
-#: src/protocols/yahoo/yahoo.c:2725 src/protocols/yahoo/yahoo.c:2729
-#: src/protocols/yahoo/yahoo.c:2733
+#: src/protocols/yahoo/yahoo.c:2745 src/protocols/yahoo/yahoo.c:2748
+#: src/protocols/yahoo/yahoo.c:2751
 msgid "Hobbies"
 msgstr "Hobbies"
 
-#: src/protocols/yahoo/yahoo.c:2744 src/protocols/yahoo/yahoo.c:2748
+#: src/protocols/yahoo/yahoo.c:2760 src/protocols/yahoo/yahoo.c:2763
 msgid "Latest News"
 msgstr "�ltima(s) not鱈cia(s)"
 
-#: src/protocols/yahoo/yahoo.c:2766
+#: src/protocols/yahoo/yahoo.c:2777
 msgid "Home Page"
 msgstr "P叩gina da web"
 
-#: src/protocols/yahoo/yahoo.c:2780
+#: src/protocols/yahoo/yahoo.c:2789
 msgid "Cool Link 1"
 msgstr "Link legal 1"
 
-#: src/protocols/yahoo/yahoo.c:2785
+#: src/protocols/yahoo/yahoo.c:2793
 msgid "Cool Link 2"
 msgstr "Link legal 2"
 
-#: src/protocols/yahoo/yahoo.c:2788
+#: src/protocols/yahoo/yahoo.c:2795
 msgid "Cool Link 3"
 msgstr "Link legal 3"
 
-#: src/protocols/yahoo/yahoo.c:2794
+#: src/protocols/yahoo/yahoo.c:2801
 msgid "Member Since"
 msgstr "Membro desde"
 
@@ -7708,18 +7705,26 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/yahoo/yahoo.c:2959 src/protocols/yahoo/yahoo.c:2961
+#: src/protocols/yahoo/yahoo.c:2975 src/protocols/yahoo/yahoo.c:2977
 msgid "Yahoo Protocol Plugin"
 msgstr "Plugin do protocolo Yahoo"
 
-#: src/protocols/yahoo/yahoo.c:2978
+#: src/protocols/yahoo/yahoo.c:2994
 msgid "Pager host"
 msgstr "Host do pager"
 
-#: src/protocols/yahoo/yahoo.c:2983
+#: src/protocols/yahoo/yahoo.c:2999
 msgid "Pager port"
 msgstr "Porta do pager"
 
+#: src/protocols/yahoo/yahoo.c:3004
+msgid "File transfer host"
+msgstr "Host da transfer棚ncia de arquivo"
+
+#: src/protocols/yahoo/yahoo.c:3007
+msgid "File transfer port"
+msgstr "Porta da tranfer棚ncia de arquivo"
+
 #: src/protocols/yahoo/yahoochat.c:194
 #, c-format
 msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
@@ -7811,11 +7816,11 @@
 msgid "Zephyr Protocol Plugin"
 msgstr "Plugin do protocolo Zephyr"
 
-#: src/proxy.c:1681
+#: src/proxy.c:1692
 msgid "Invalid proxy settings"
 msgstr "Configura巽探es de proxy inv叩lidas"
 
-#: src/proxy.c:1681
+#: src/proxy.c:1692
 msgid ""
 "Either the host name or port number specified for your given proxy type is "
 "invalid."
@@ -7839,28 +7844,28 @@
 msgid "Please enter your password"
 msgstr "Favor digitar sua senha"
 
-#: src/server.c:961
+#: src/server.c:948
 #, c-format
 msgid "(%d message)"
 msgid_plural "(%d messages)"
 msgstr[0] "(%d mensagem)"
 msgstr[1] "(%d mensagens)"
 
-#: src/server.c:974
+#: src/server.c:961
 msgid "(1 message)"
 msgstr "(1 mensagem)"
 
-#: src/server.c:1155 src/server.c:1165
+#: src/server.c:1142 src/server.c:1152
 #, c-format
 msgid "%s logged in."
 msgstr "%s conectou."
 
-#: src/server.c:1182 src/server.c:1190
+#: src/server.c:1169 src/server.c:1177
 #, c-format
 msgid "%s logged out."
 msgstr "%s desconectou."
 
-#: src/server.c:1237
+#: src/server.c:1224
 #, c-format
 msgid ""
 "%s has just been warned by %s.\n"
@@ -7869,11 +7874,11 @@
 "%s foi alertado por %s.\n"
 "Seu novo n鱈vel de alerta 辿 %d%%"
 
-#: src/server.c:1240
+#: src/server.c:1227
 msgid "an anonymous person"
 msgstr "uma pessoa an担nima"
 
-#: src/server.c:1343
+#: src/server.c:1330
 #, c-format
 msgid ""
 "User '%s' invites %s to buddy chat room: '%s'\n"
@@ -7882,12 +7887,12 @@
 "Usu叩rio '%s' convida %s to para sala de chat de amigo: '%s'\n"
 "%s"
 
-#: src/server.c:1347
+#: src/server.c:1334
 #, c-format
 msgid "User '%s' invites %s to buddy chat room: '%s'\n"
 msgstr "Usu叩rio '%s' convida %s to para sala de chat de amigo: '%s'\n"
 
-#: src/server.c:1353
+#: src/server.c:1340
 msgid "Accept chat invitation?"
 msgstr "Aceitar convite para chat?"
 
@@ -7906,33 +7911,33 @@
 msgid "_Open Mail"
 msgstr "_Abrir email"
 
-#: src/util.c:1657
+#: src/util.c:1790
 msgid "Calculating..."
 msgstr "Calculando..."
 
-#: src/util.c:1660
+#: src/util.c:1793
 msgid "Unknown."
 msgstr "Desconhecido."
 
-#: src/util.c:1691 src/util.c:1696 src/util.c:1701 src/util.c:1704
+#: src/util.c:1824 src/util.c:1829 src/util.c:1834 src/util.c:1837
 msgid "day"
 msgid_plural "days"
 msgstr[0] "dia"
 msgstr[1] "dias"
 
-#: src/util.c:1692 src/util.c:1696 src/util.c:1710 src/util.c:1712
+#: src/util.c:1825 src/util.c:1829 src/util.c:1843 src/util.c:1845
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "hora"
 msgstr[1] "horas"
 
-#: src/util.c:1692 src/util.c:1701 src/util.c:1710 src/util.c:1715
+#: src/util.c:1825 src/util.c:1834 src/util.c:1843 src/util.c:1848
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minuto"
 msgstr[1] "minutos"
 
-#: src/util.c:2047
+#: src/util.c:2180
 msgid "g003: Error opening connection.\n"
 msgstr "g003: Erro ao abrir conex達o.\n"
 
@@ -7947,21 +7952,3 @@
 #: src/win32/win32dep.c:259
 msgid "Notification"
 msgstr "Notifica巽達o"
-
-#~ msgid "Send _File"
-#~ msgstr "_Enviar arquivo"
-
-#~ msgid "This user can't accept files"
-#~ msgstr "Este usu叩rio n達o pode aceitar arquivos"
-
-#~ msgid "Gaim just support file:// URIS currently"
-#~ msgstr "O Gaim suporta apenas URIs file:// atualmente"
-
-#~ msgid "You are trying to send a lot of files"
-#~ msgstr "Voc棚 est叩 tentando enviar v叩rios arquivos"
-
-#~ msgid "Do you really want to send them ?"
-#~ msgstr "Voc棚 tem certeza de que deseja envi叩-los?"
-
-#~ msgid "%s (Code %s)"
-#~ msgstr "%s (C坦digo %s)"
--- a/po/vi.po	Mon Dec 01 04:19:39 2003 +0000
+++ b/po/vi.po	Mon Dec 01 17:03:00 2003 +0000
@@ -1,23 +1,25 @@
 # Vietnamese Translation for Gaim.
 # Copyright (C) 2003 Gnome i18n Project for Vietnamese
-# This file is distributed under the same license as the PACKAGE package.
+# This file is distributed under the same license as the Version package.
 # Nguy畛�n  V�n V滴 <vncasper@yahoo.com>.
 # Nguy畛�n Minh H動董ng "<parfumi@yahoo.com>.
 # Nguy畛�n Ti畉�n H畉�i B狸nh <zecoj@yahoo.com>.
 # Trinh Minh Thanh <tmthanh@yahoo.com>.
 # Nguy畛�n Th叩i Ng畛�c Duy <pclouds@users.sf.net>
-#
+# 
+# 
 msgid ""
 msgstr ""
-"Project-Id-Version: Version 0.74-vi\n"
-"POT-Creation-Date: 2003-11-26 12:27+0700\n"
-"PO-Revision-Date: 2003-11-26 13:22+0700\n"
+"Project-Id-Version: Version Gaim-vi\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2003-12-01 17:31+0700\n"
+"PO-Revision-Date: 2003-12-01 17:38+0700\n"
 "Last-Translator: Trinh Minh Thanh <tmthanh@yahoo.com>\n"
-"Language-Team: Vietnamese <gnomevi-list@lists.sourceforge.net>\n"
+"Language-Team: Vi畛�t Nam\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"Plural-Forms: nplurals=2; plural=n != 1;"
 
 #. *< api_version
 #. *< type
@@ -52,7 +54,7 @@
 
 #: plugins/chkmail.c:199
 msgid "Check email every X seconds.\n"
-msgstr "Ki畛�m tra th動 m畛�i X gi但y.\n"
+msgstr "Ki畛�m tra th動 X gi但y m畛�t l畉�n.\n"
 
 #: plugins/contact_priority.c:82
 msgid "Point values to use when..."
@@ -107,7 +109,8 @@
 #. *< version
 #. *< summary
 #: plugins/contact_priority.c:194
-msgid "Allows for controlling the values associated with different buddy states."
+msgid ""
+"Allows for controlling the values associated with different buddy states."
 msgstr ""
 "Cho ph辿p �i畛�u ch畛�nh c叩c gi叩 tr畛� li棚n quan �畉�n c叩c tr畉�ng th叩i kh叩c nhau c畛�a "
 "buddy."
@@ -130,13 +133,13 @@
 
 #: plugins/docklet/docklet-win32.c:45
 msgid "Gaim - Signed off"
-msgstr "Gaim - Th担i k畉�t n畛�i"
+msgstr "Gaim - Ng畉�t k畉�t n畛�i"
 
 #: plugins/docklet/docklet-win32.c:46
 msgid "Gaim - Away"
-msgstr "Gaim - V畉�ng m畉�t"
-
-#: plugins/docklet/docklet.c:114 src/gtkaccount.c:482 src/gtkaccount.c:1768
+msgstr "Gaim - Tr畉�ng th叩i"
+
+#: plugins/docklet/docklet.c:114 src/gtkaccount.c:482 src/gtkaccount.c:1769
 msgid "Auto-login"
 msgstr "��ng nh畉�p t畛� �畛�ng"
 
@@ -152,12 +155,12 @@
 msgid "New..."
 msgstr "M畛�i..."
 
-#: plugins/docklet/docklet.c:153 src/gtkblist.c:2453 src/gtkpounce.c:411
+#: plugins/docklet/docklet.c:153 src/gtkblist.c:2374 src/gtkpounce.c:411
 #: src/gtkprefs.c:1467 src/protocols/gg/gg.c:51 src/protocols/irc/msgs.c:187
-#: src/protocols/jabber/jabber.c:925 src/protocols/jabber/jutil.c:98
-#: src/protocols/jabber/presence.c:84 src/protocols/oscar/oscar.c:2889
-#: src/protocols/oscar/oscar.c:4636 src/protocols/oscar/oscar.c:5582
-#: src/protocols/oscar/oscar.c:6183
+#: src/protocols/jabber/jabber.c:926 src/protocols/jabber/jutil.c:98
+#: src/protocols/jabber/presence.c:84 src/protocols/oscar/oscar.c:2844
+#: src/protocols/oscar/oscar.c:4591 src/protocols/oscar/oscar.c:5537
+#: src/protocols/oscar/oscar.c:6138
 msgid "Away"
 msgstr "Tr畉�ng th叩i"
 
@@ -174,7 +177,7 @@
 msgstr "Truy畛�n t畉�p tin"
 
 #. And now for the buttons
-#: plugins/docklet/docklet.c:173 src/gtkaccount.c:1927 src/main.c:323
+#: plugins/docklet/docklet.c:173 src/gtkaccount.c:1928 src/main.c:323
 msgid "Accounts"
 msgstr "T�i kho畉�n"
 
@@ -184,7 +187,7 @@
 
 #: plugins/docklet/docklet.c:183
 msgid "Signoff"
-msgstr "Th担i k畉�t n畛�i"
+msgstr "Ng畉�t k畉�t n畛�i"
 
 #: plugins/docklet/docklet.c:187
 msgid "Quit"
@@ -196,7 +199,7 @@
 
 #: plugins/docklet/docklet.c:482
 msgid "_Hide new messages until tray icon is clicked"
-msgstr "_畉�n th担ng �i畛�p m畛�i t畛�i khi nh畉�n chu畛�t l棚n bi畛�u t動畛�ng tr棚n khay"
+msgstr "_畉�n th担ng �i畛�p m畛�i �畉�n khi nh畉�n chu畛�t l棚n bi畛�u t動畛�ng tr棚n khay"
 
 #. *< api_version
 #. *< type
@@ -207,7 +210,7 @@
 #. *< id
 #: plugins/docklet/docklet.c:506
 msgid "System Tray Icon"
-msgstr "Bi畛�u t動畛�ng tr棚n khay h畛� th畛�ng"
+msgstr "Bi畛�u t動畛�ng tr棚n khay"
 
 #. *< name
 #. *< version
@@ -237,14 +240,14 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/filectl.c:201
+#: plugins/filectl.c:223
 msgid "Gaim File Control"
-msgstr "T畉�p Tin �i畛�u Khi畛�n Gaim"
+msgstr "�i畛�u Khi畛�n T畉�p Tin Gaim"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/filectl.c:204 plugins/filectl.c:206
+#: plugins/filectl.c:226 plugins/filectl.c:228
 msgid "Allows you to control Gaim by entering commands in a file."
 msgstr "Cho ph辿p b畉�n �i畛�u khi畛�n Gaim b畉�ng c叩c l畛�nh ghi trong t畉�p tin."
 
@@ -254,11 +257,11 @@
 
 #: plugins/gaim-remote/remote.c:97 plugins/gaim-remote/remote.c:136
 msgid "No screenname given."
-msgstr "Ch動a �畉�t t棚n hi畛�n th畛�."
+msgstr "Ch動a nh畉�p t棚n hi畛�n th畛�."
 
 #: plugins/gaim-remote/remote.c:173
 msgid "No roomname given."
-msgstr "Ch動a c坦 t棚n ph嘆ng."
+msgstr "Ch動a nh畉�p t棚n ph嘆ng."
 
 #: plugins/gaim-remote/remote.c:192
 msgid "Invalid AIM URI"
@@ -273,7 +276,7 @@
 #. *< id
 #: plugins/gaim-remote/remote.c:715
 msgid "Remote Control"
-msgstr "�i畛�u khi畛�n t畛� xa"
+msgstr "�i畛�u Khi畛�n T畛� Xa"
 
 #. *< name
 #. *< version
@@ -307,7 +310,7 @@
 #. *  summary
 #: plugins/gaiminc.c:84
 msgid "An example plugin that does stuff - see the description."
-msgstr "M畛�t v鱈 d畛� c董 b畉�n v畛� Ti畛�n 鱈ch b畛� tr畛� - xem m担 t畉�."
+msgstr "M畛�t v鱈 d畛� v畛� plugin - xem m担 t畉�."
 
 #. *  description
 #: plugins/gaiminc.c:86
@@ -317,10 +320,10 @@
 "- It reverses all incoming text\n"
 "- It sends a message to people on your list immediately when they sign on"
 msgstr ""
-"�但y l� m畛�t Ti畛�n 鱈ch b畛� tr畛� h畉�p d畉�n v畛�i nhi畛�u t鱈nh n�ng:\n"
+"�但y l� m畛�t plugin tuy畛�t v畛�i v畛�i nhi畛�u t鱈nh n�ng:\n"
 "-Cho bi畉�t ai vi畉�t ch動董ng tr狸nh khi b畉�n ��ng nh畉�p\n"
 "-L動u t畉�t c畉� c叩c th担ng �i畛�p �畉�n\n"
-"-G畛�i tin cho th�nh vi棚n c坦 trong danh s叩ch c畛�a b畉�n ngay khi h畛� ��ng nh畉�p"
+"-G畛�i tin cho th�nh vi棚n c坦 trong danh s叩ch c畛�a b畉�n ngay khi h畛� k畉�t n畛�i"
 
 #. Configuration frame
 #: plugins/gestures/gestures.c:220
@@ -385,7 +388,7 @@
 
 #: plugins/gtik.c:747
 msgid "Enter symbols delimited with \"+\" in the box below."
-msgstr "Nh畉�p bi畛�u t動畛�ng ph但n c叩ch v畛�i \"+\" trong h畛�p b棚n d動畛�i."
+msgstr "Nh畉�p bi畛�u t動畛�ng ph但n c叩ch v畛�i \"+\" trong h畛�p d動畛�i �但y."
 
 #. OUTPUT FORMAT and SCROLL DIRECTION
 #: plugins/gtik.c:757
@@ -402,7 +405,7 @@
 
 #: plugins/gtik.c:995
 msgid "Change"
-msgstr "Thay �畛�i"
+msgstr "�畛�i"
 
 #: plugins/history.c:75
 msgid "History"
@@ -414,11 +417,11 @@
 
 #: plugins/history.c:78
 msgid ""
-"When a new conversation is opened this plugin will insert the last XXX of "
-"the last conversation into the current conversation."
+"When a new conversation is opened this plugin will insert the last "
+"conversation into the current conversation."
 msgstr ""
-"Khi b畉�t �畉�u cu畛�c tho畉�i m畛�i, plugin n�y s畉� ch竪n XXX g畉�n nh畉�t c畛�a cu畛�c tho畉�i "
-"g畉�n �但y nh畉�t v�o cu畛�c tho畉�i hi畛�n th畛�i."
+"Khi b畉�t �畉�u cu畛�c tho畉�i m畛�i, plugin n�y s畉� ch竪n cu畛�c tho畉�i g畉�n "
+"�但y nh畉�t v�o cu畛�c tho畉�i hi畛�n th畛�i."
 
 #. *< api_version
 #. *< type
@@ -436,7 +439,7 @@
 #. *  summary
 #: plugins/iconaway.c:83 plugins/iconaway.c:85
 msgid "Iconifies the buddy list and your conversations when you go away."
-msgstr "Bi畛�u t動畛�ng h坦a danh s叩ch buddy v� cu畛�c tho畉�i c畛�a b畉�n khi b畉�n v畉�ng m畉�t."
+msgstr "Bi畛�u t動畛�ng h坦a danh s叩ch buddy v� cu畛�c tho畉�i khi b畉�n v畉�ng m畉�t."
 
 #: plugins/idle.c:70
 msgid "Idle Time"
@@ -460,11 +463,11 @@
 
 #: plugins/idle.c:119
 msgid "I'dle Mak'er"
-msgstr ""
+msgstr "I'dle Mak'er"
 
 #: plugins/idle.c:121 plugins/idle.c:122
 msgid "Allows you to hand-configure how long you've been idle for"
-msgstr "Cho ph辿p b畉�n t畛� �畉�t ra th畛�i gian ngh畛� sau bao l但u"
+msgstr "Cho ph辿p b畉�n �畉�t ra th畛�i gian sau bao l但u s畉� b叩o tr畉�ng th叩i ngh畛�"
 
 #. *< api_version
 #. *< type
@@ -475,14 +478,14 @@
 #. *< id
 #: plugins/ipc-test-client.c:84
 msgid "IPC Test Client"
-msgstr "IPC ki畛�m tra tr狸nh kh叩ch"
+msgstr "M叩y kh叩ch ki畛�m tra IPC"
 
 #. *< name
 #. *< version
 #. *  summary
 #: plugins/ipc-test-client.c:87
 msgid "Test plugin IPC support, as a client."
-msgstr "Ki畛�m tra h畛� tr畛� IPC, nh動 m畛�t m叩y kh叩ch."
+msgstr "Ki畛�m tra h畛� tr畛� IPC plugin, l� m叩y kh叩ch."
 
 #. *  description
 #: plugins/ipc-test-client.c:89
@@ -490,8 +493,8 @@
 "Test plugin IPC support, as a client. This locates the server plugin and "
 "calls the commands registered."
 msgstr ""
-"Ki畛�m tra h畛� tr畛� IPC plugin, nh動 m畛�t m叩y kh叩ch. Vi畛�c n�y �畛�nh v畛� plugin m叩y "
-"ch畛� v� g畛�i l畛�nh �達 ��ng k箪."
+"Ki畛�m tra h畛� tr畛� IPC plugin, l� m叩y kh叩ch. Vi畛�c n�y �畛�nh v畛� plugin m叩y ch畛� v� "
+"g畛�i l畛�nh �達 ��ng k箪."
 
 #. *< api_version
 #. *< type
@@ -509,12 +512,12 @@
 #. *  summary
 #: plugins/ipc-test-server.c:74
 msgid "Test plugin IPC support, as a server."
-msgstr "Ki畛�m tra h畛� tr畛� IPC plugin, nh動 m畛�t m叩y ch畛�."
+msgstr "Ki畛�m tra h畛� tr畛� IPC plugin, l� m叩y ch畛�."
 
 #. *  description
 #: plugins/ipc-test-server.c:76
 msgid "Test plugin IPC support, as a server. This registers the IPC commands."
-msgstr "Ki畛�m tra h畛� tr畛� IPC plugin, nh動 m畛�t m叩y ch畛�. Vi畛�c n�y ��ng k箪 l畛�nh IPC."
+msgstr "Ki畛�m tra h畛� tr畛� IPC plugin, l� m叩y ch畛�. Vi畛�c n�y ��ng k箪 l畛�nh IPC."
 
 #: plugins/mailchk.c:156
 msgid "Mail Checker"
@@ -531,7 +534,7 @@
 
 #: plugins/notify.c:576
 msgid "_IM windows"
-msgstr "C畛�a s畛� _IM"
+msgstr "C畛�a s畛� _Nh畉�n Tin Nhanh"
 
 #: plugins/notify.c:583
 msgid "C_hat windows"
@@ -558,7 +561,7 @@
 #. Urgent method button
 #: plugins/notify.c:633
 msgid "Set window manager \"_URGENT\" hint"
-msgstr "L畉�p h�m 箪 \"_Kh畉�n\" c畛�a tr狸nh qu畉�n l箪 c畛�a s畛�"
+msgstr "L畉�p 畉�n 箪 \"_Kh畉�n\" c畛�a tr狸nh qu畉�n l箪 c畛�a s畛�"
 
 #. ---------- "Notification Removals" ----------
 #: plugins/notify.c:640
@@ -583,7 +586,7 @@
 #. Remove on message send button
 #: plugins/notify.c:670
 msgid "Remove when a _message gets sent"
-msgstr "B畛� khi th担ng _�i畛�p �動畛�c g畛�i"
+msgstr "B畛� khi g畛�i th担ng �_i畛�p"
 
 #. Remove on conversation switch button
 #: plugins/notify.c:679
@@ -623,7 +626,7 @@
 #. *< version
 #: plugins/perl/perl.c:526 plugins/perl/perl.c:527
 msgid "Provides support for loading perl plugins."
-msgstr "Cung c畉�p h畛� tr畛� cho vi畛�c n畉�p nh畛�ng ti畛�n 鱈ch b畛� tr畛� perl."
+msgstr "Cung c畉�p h畛� tr畛� �畛� n畉�p perl plugin."
 
 #: plugins/raw.c:154
 msgid "Raw"
@@ -631,15 +634,15 @@
 
 #: plugins/raw.c:156
 msgid "Lets you send raw input to text-based protocols."
-msgstr "Cho ph辿p b畉�n g畛�i d畛�a tr棚n v�n b畉�n."
+msgstr "�畛� b畉�n g畛�i d畛� li畛�u nh畉�p �畉�n c叩c giao th畛�c d畛�a tr棚n v�n b畉�n."
 
 #: plugins/raw.c:157
 msgid ""
 "Lets you send raw input to text-based protocols (Jabber, MSN, IRC, TOC). Hit "
 "'Enter' in the entry box to send. Watch the debug window."
 msgstr ""
-"Cho ph辿p b畉�n g畛�i d畛� li畛�u th担 �畉�n ph動董ng th畛�c d畛�a tr棚n v�n b畉�n (Jabber, MSN, "
-"IRC, TOC). Nh畉�n 'Enter' trong h畛�p nh畉�p �畛� g畛�i �i. Xem c畛�a s畛� g畛� r畛�i."
+"�畛� b畉�n g畛�i d畛� li畛�u nh畉�p �畉�n giao th畛�c d畛�a tr棚n v�n b畉�n (Jabber, MSN, IRC, "
+"TOC). Nh畉�n 'Enter' trong h畛�p nh畉�p �畛� g畛�i �i. Theo d探i c畛�a s畛� g畛� r畛�i."
 
 #: plugins/relnot.c:62
 #, c-format
@@ -704,7 +707,7 @@
 #. *< id
 #: plugins/signals-test.c:465
 msgid "Signals Test"
-msgstr "T鱈n hi畛�u ki畛�m tra"
+msgstr "Ki畛�m tra t鱈n hi畛�u"
 
 #. *< name
 #. *< version
@@ -741,7 +744,7 @@
 
 #: plugins/spellchk.c:448
 msgid "You send"
-msgstr "B畉�n g畛�i tin"
+msgstr "B畉�n g畛�i"
 
 #: plugins/spellchk.c:474
 msgid "Add a new text replacement"
@@ -753,7 +756,7 @@
 
 #: plugins/spellchk.c:495
 msgid "You _send:"
-msgstr "B畉�n g畛�_i tin:"
+msgstr "B畉�n g畛�_i:"
 
 #: plugins/spellchk.c:535
 msgid "Text replacement"
@@ -761,7 +764,8 @@
 
 #: plugins/spellchk.c:537 plugins/spellchk.c:538
 msgid "Replaces text in outgoing messages according to user-defined rules."
-msgstr "Thay th畉� v�n b畉�n trong th担ng �i畛�p g畛�i �i theo qui t畉�c ng動畛�i d湛ng �畛�nh ra."
+msgstr ""
+"Thay th畉� v�n b畉�n trong th担ng �i畛�p g畛�i �i theo qui t畉�c ng動畛�i d湛ng �畛�nh ra."
 
 #. *< api_version
 #. *< type
@@ -825,7 +829,7 @@
 #: plugins/statenotify.c:36
 #, c-format
 msgid "%s is no longer away."
-msgstr "%s l畉�i c坦 m畉�t."
+msgstr "%s th担i v畉�ng m畉�t."
 
 #: plugins/statenotify.c:42
 #, c-format
@@ -865,7 +869,7 @@
 
 #: plugins/tcl/tcl.c:346 plugins/tcl/tcl.c:347
 msgid "Provides support for loading Tcl plugins"
-msgstr "Cung c畉�p h畛� tr畛� cho vi畛�c n畉�p Tcl Plugin"
+msgstr "Cung c畉�p h畛� tr畛� �畛� n畉�p Tcl Plugin"
 
 #. *< api_version
 #. *< type
@@ -895,7 +899,7 @@
 
 #: plugins/timestamp.c:115
 msgid "_Apply"
-msgstr "_�p d畛�ng"
+msgstr "�p _d畛�ng"
 
 #. *< api_version
 #. *< type
@@ -924,15 +928,15 @@
 #. IM Convo trans options
 #: plugins/win32/transparency/win2ktrans.c:329
 msgid "IM Conversation Windows"
-msgstr "C畛�a s畛� cu畛�c tho畉�i IM"
+msgstr "C畛�a s畛� cu畛�c tho畉�i Nh畉�n Tin Nhanh"
 
 #: plugins/win32/transparency/win2ktrans.c:330
 msgid "_IM window transparency"
-msgstr "T鱈nh trong su畛�t c畛�a c畛�a s畛� _IM"
+msgstr "T鱈nh trong su畛�t c畛�a c畛�a s畛� _Nh畉�n Tin Nhanh"
 
 #: plugins/win32/transparency/win2ktrans.c:340
 msgid "_Show slider bar in IM window"
-msgstr "Hi畛�_n thanh tr動畛�t trong c畛�a s畛� IM"
+msgstr "Hi畛�_n thanh tr動畛�t trong c畛�a s畛� Nh畉�n Tin Nhanh"
 
 #. Buddy List trans options
 #: plugins/win32/transparency/win2ktrans.c:365 src/gtkprefs.c:844
@@ -966,7 +970,7 @@
 msgstr ""
 "Plugin t畉�o �畛� trong su畛�t alpha bi畉�n �畛�i tr棚n c畛�a s畛� cu畛�c tho畉�i.\n"
 "\n"
-"Ch炭 箪: Plugin n�y �嘆i h畛�i d湛ng Win2000 ho畉�c WinXP."
+"Ch炭 箪: Plugin n�y y棚u c畉�u b畉�n d湛ng Win2000 ho畉�c WinXP."
 
 #: plugins/win32/winprefs/winprefs.c:348
 msgid "GTK+ Runtime Version"
@@ -975,31 +979,31 @@
 #. Autostart
 #: plugins/win32/winprefs/winprefs.c:356
 msgid "Startup"
-msgstr "Kh畛�i �畛�ng"
+msgstr "Kh畛�i ch畉�y"
 
 #: plugins/win32/winprefs/winprefs.c:357
 msgid "_Start Gaim on Windows startup"
-msgstr "_Ch畉�y Gaim khi Windows kh畛�i �畛�ng"
+msgstr "_Ch畉�y Gaim khi Windows kh畛�i ch畉�y"
 
 #. Buddy List
-#: plugins/win32/winprefs/winprefs.c:366 src/gtkblist.c:2284
+#: plugins/win32/winprefs/winprefs.c:366 src/gtkblist.c:2208
 #: src/gtkprefs.c:2264
 msgid "Buddy List"
 msgstr "Danh s叩ch Buddy"
 
 #: plugins/win32/winprefs/winprefs.c:367
 msgid "_Dockable Buddy List"
-msgstr "_Neo danh s叩ch Buddy"
+msgstr "Danh s叩ch Buddy c坦 th畛� ne_o l畉�i"
 
 #. Docked Blist On Top
 #: plugins/win32/winprefs/winprefs.c:371
 msgid "Docked _Buddy List is always on top"
-msgstr "Danh s叩ch _Buddy �達 neo lu担n n畉�m ph鱈a tr棚n"
+msgstr "Danh s叩ch _Buddy �達 neo lu担n n畉�m ph鱈a tr動畛�c"
 
 #. Blist On Top
 #: plugins/win32/winprefs/winprefs.c:381
 msgid "_Keep Buddy List window on top"
-msgstr "_Gi畛� c畛�a s畛� danh s叩ch Buddy tr棚n c湛ng"
+msgstr "_Gi畛� c畛�a s畛� danh s叩ch Buddy ph鱈a tr動畛�c"
 
 #. Conversations
 #: plugins/win32/winprefs/winprefs.c:386 src/gtkprefs.c:880
@@ -1009,7 +1013,7 @@
 
 #: plugins/win32/winprefs/winprefs.c:387
 msgid "_Flash Window when messages are received"
-msgstr "_Nh畉�p nh叩y c畛�a s畛� khi nh畉�n tin"
+msgstr "N_h畉�p nh叩y c畛�a s畛� khi c坦 tin nh畉�n"
 
 #: plugins/win32/winprefs/winprefs.c:409
 msgid "WinGaim Options"
@@ -1100,13 +1104,13 @@
 
 #: src/about.c:163
 msgid "Current Translators"
-msgstr "Nh畛�ng ng動畛�i d畛�ch hi畛�n th畛�i"
-
-#: src/about.c:164 src/about.c:196
+msgstr "Ng動畛�i d畛�ch hi畛�n th畛�i"
+
+#: src/about.c:164 src/about.c:197
 msgid "Catalan"
 msgstr "Ti畉�ng Catalan"
 
-#: src/about.c:165 src/about.c:197
+#: src/about.c:165 src/about.c:198
 msgid "Czech"
 msgstr "Ti畉�ng Czech"
 
@@ -1114,124 +1118,128 @@
 msgid "Danish"
 msgstr "Ti畉�ng �an M畉�ch"
 
-#: src/about.c:167 src/about.c:198
-msgid "German"
-msgstr "Ti畉�ng �畛�c"
+#: src/about.c:167
+msgid "Esperanto"
+msgstr "Esperanto"
 
 #: src/about.c:168 src/about.c:199
+msgid "German"
+msgstr "Ti畉�ng �畛�c"
+
+#: src/about.c:169 src/about.c:200
 msgid "Spanish"
 msgstr "Ti畉�ng T但y Ban Nha"
 
-#: src/about.c:169
+#: src/about.c:170 src/about.c:201
 msgid "Finnish"
 msgstr "Ti畉�ng Ph畉�n Lan"
 
-#: src/about.c:170 src/about.c:200
+#: src/about.c:171 src/about.c:202
 msgid "French"
 msgstr "Ti畉�ng Ph叩p"
 
-#: src/about.c:171
+#: src/about.c:172
 msgid "Hindi"
 msgstr "Ti畉�ng Hin-�i"
 
-#: src/about.c:172
+#: src/about.c:173
 msgid "Hungarian"
 msgstr "Ti畉�ng Hung-ga-ri"
 
-#: src/about.c:173 src/about.c:202
+#: src/about.c:174 src/about.c:204
 msgid "Italian"
 msgstr "Ti畉�ng �"
 
-#: src/about.c:174 src/about.c:204
+#: src/about.c:175 src/about.c:206
 msgid "Korean"
 msgstr "Ti畉�ng H�n Qu畛�c"
 
-#: src/about.c:175
+#: src/about.c:176
 msgid "Dutch; Flemish"
 msgstr "Ti畉�ng �an M畉�ch"
 
-#: src/about.c:176
+#: src/about.c:177
 msgid "Norwegian"
 msgstr "Ti畉�ng Na-uy"
 
-#: src/about.c:177 src/about.c:205
+#: src/about.c:178 src/about.c:207
 msgid "Polish"
 msgstr "Ti畉�ng Ba Lan"
 
-#: src/about.c:178
+#: src/about.c:179
 msgid "Portuguese"
 msgstr "Ti畉�ng Th畛� Nh挑 K畛�"
 
-#: src/about.c:179
+#: src/about.c:180
 msgid "Portuguese-Brazil"
 msgstr "Ti畉�ng Th畛� Nh挑 K畛�-Brazil"
 
-#: src/about.c:180
+#: src/about.c:181
 msgid "Romanian"
 msgstr "Ti畉�ng Ru-ma-ni"
 
-#: src/about.c:181 src/about.c:206
+#: src/about.c:182 src/about.c:208
 msgid "Russian"
 msgstr "Ti畉�ng Nga"
 
-#: src/about.c:182
+#: src/about.c:183
 msgid "Serbian"
 msgstr "Ti畉�ng S辿c-bi"
 
-#: src/about.c:183 src/about.c:208
+#: src/about.c:184 src/about.c:210
 msgid "Swedish"
 msgstr "Ti畉�ng Th畛�y �i畛�n"
 
-#: src/about.c:184
+#: src/about.c:185
 msgid "Vietnamese"
 msgstr "Ti畉�ng Vi畛�t"
 
-#: src/about.c:184
+#: src/about.c:185
 msgid "Gnome Vi Team"
 msgstr "Gnome Vi Team"
 
-#: src/about.c:185
+#: src/about.c:186
 msgid "Simplified Chinese"
 msgstr "Ti畉�ng Trung Qu畛�c ph畛� th担ng"
 
-#: src/about.c:186
+#: src/about.c:187
 msgid "Traditional Chinese"
 msgstr "Ti畉�ng Trung Qu畛�c truy畛�n th畛�ng"
 
-#: src/about.c:193
+#: src/about.c:194
 msgid "Past Translators"
 msgstr "Ng動畛�i d畛�ch tr動畛�c �但y"
 
-#: src/about.c:194
+#: src/about.c:195
 msgid "Amharic"
 msgstr "Ti畉�ng Amharic"
 
-#: src/about.c:195
+#: src/about.c:196
 msgid "Bulgarian"
 msgstr "Ti畉�ng Bun-ga-ri"
 
-#: src/about.c:201
+#: src/about.c:203
 msgid "Hebrew"
 msgstr "Ti畉�ng Hebrew"
 
-#: src/about.c:203
+#: src/about.c:205
 msgid "Japanese"
 msgstr "Ti畉�ng Nh畉�t"
 
-#: src/about.c:207
+#: src/about.c:209
 msgid "Slovak"
 msgstr "Ti畉�ng Slovak"
 
-#: src/about.c:209
+#: src/about.c:211
 msgid "Chinese"
 msgstr "Ti畉�ng Trung Qu畛�c"
 
-#: src/about.c:222 src/dialogs.c:2180 src/gtkrequest.c:198
+#: src/about.c:224 src/dialogs.c:2180 src/gtkrequest.c:198
 #: src/protocols/msn/msn.c:247
 msgid "Close"
 msgstr "�坦ng"
 
-#: src/account.c:275 src/protocols/jabber/jabber.c:977
+#: src/account.c:275 src/protocols/jabber/jabber.c:978
 msgid "New passwords do not match."
 msgstr "M畉�t kh畉�u m畛�i kh担ng kh畛�p."
 
@@ -1264,15 +1272,14 @@
 #. * A wrapper for gaim_request_action() that uses OK and Cancel buttons.
 #.
 #: src/account.c:334 src/connection.c:193 src/dialogs.c:1720
-#: src/dialogs.c:1737 src/dialogs.c:1780 src/gtkblist.c:1188
-#: src/gtkblist.c:1204 src/gtkblist.c:1647 src/gtkrequest.c:195
-#: src/protocols/jabber/jabber.c:1022 src/protocols/msn/msn.c:181
-#: src/protocols/msn/msn.c:192 src/protocols/msn/msn.c:203
-#: src/protocols/msn/msn.c:214 src/protocols/oscar/oscar.c:2500
-#: src/protocols/oscar/oscar.c:2580 src/protocols/oscar/oscar.c:6233
-#: src/protocols/oscar/oscar.c:6321 src/protocols/oscar/oscar.c:6370
-#: src/protocols/oscar/oscar.c:6452 src/protocols/yahoo/yahoo.c:2230
-#: src/request.h:852
+#: src/dialogs.c:1737 src/dialogs.c:1780 src/gtkblist.c:1574
+#: src/gtkrequest.c:195 src/protocols/jabber/jabber.c:1023
+#: src/protocols/msn/msn.c:181 src/protocols/msn/msn.c:192
+#: src/protocols/msn/msn.c:203 src/protocols/msn/msn.c:214
+#: src/protocols/oscar/oscar.c:2455 src/protocols/oscar/oscar.c:2535
+#: src/protocols/oscar/oscar.c:6188 src/protocols/oscar/oscar.c:6284
+#: src/protocols/oscar/oscar.c:6333 src/protocols/oscar/oscar.c:6415
+#: src/protocols/yahoo/yahoo.c:2261 src/request.h:852
 msgid "OK"
 msgstr "�畛�ng 箪"
 
@@ -1281,23 +1288,23 @@
 #: src/connection.c:194 src/dialogs.c:459 src/dialogs.c:471 src/dialogs.c:484
 #: src/dialogs.c:505 src/dialogs.c:890 src/dialogs.c:1554 src/dialogs.c:1721
 #: src/dialogs.c:1738 src/dialogs.c:1781 src/dialogs.c:1897
-#: src/gtkaccount.c:1622 src/gtkaccount.c:2090 src/gtkblist.c:1648
-#: src/gtkblist.c:3590 src/gtkconn.c:148 src/gtkprivacy.c:568
+#: src/gtkaccount.c:1622 src/gtkaccount.c:2091 src/gtkblist.c:1575
+#: src/gtkblist.c:3511 src/gtkconn.c:148 src/gtkprivacy.c:568
 #: src/gtkprivacy.c:581 src/gtkprivacy.c:606 src/gtkprivacy.c:617
 #: src/gtkrequest.c:196 src/protocols/icq/gaim_icq.c:277
-#: src/protocols/jabber/buddy.c:512 src/protocols/jabber/jabber.c:650
-#: src/protocols/jabber/jabber.c:1023 src/protocols/msn/msn.c:182
+#: src/protocols/jabber/buddy.c:512 src/protocols/jabber/jabber.c:651
+#: src/protocols/jabber/jabber.c:1024 src/protocols/msn/msn.c:182
 #: src/protocols/msn/msn.c:193 src/protocols/msn/msn.c:204
 #: src/protocols/msn/msn.c:215 src/protocols/msn/msn.c:228
-#: src/protocols/oscar/oscar.c:2464 src/protocols/oscar/oscar.c:2501
-#: src/protocols/oscar/oscar.c:2536 src/protocols/oscar/oscar.c:2581
-#: src/protocols/oscar/oscar.c:6061 src/protocols/oscar/oscar.c:6234
-#: src/protocols/oscar/oscar.c:6322 src/protocols/oscar/oscar.c:6371
-#: src/protocols/oscar/oscar.c:6436 src/protocols/oscar/oscar.c:6453
-#: src/protocols/trepia/trepia.c:347 src/protocols/yahoo/yahoo.c:2231
+#: src/protocols/oscar/oscar.c:2419 src/protocols/oscar/oscar.c:2456
+#: src/protocols/oscar/oscar.c:2491 src/protocols/oscar/oscar.c:2536
+#: src/protocols/oscar/oscar.c:6016 src/protocols/oscar/oscar.c:6189
+#: src/protocols/oscar/oscar.c:6285 src/protocols/oscar/oscar.c:6334
+#: src/protocols/oscar/oscar.c:6399 src/protocols/oscar/oscar.c:6416
+#: src/protocols/trepia/trepia.c:347 src/protocols/yahoo/yahoo.c:2262
 #: src/request.h:852 src/request.h:862
 msgid "Cancel"
-msgstr "H畛�y b畛�"
+msgstr "B畛� qua"
 
 #: src/account.c:361
 #, c-format
@@ -1320,21 +1327,21 @@
 
 #: src/away.c:368
 msgid "New Away Message"
-msgstr "Th担ng b叩o v畉�ng m畉�t m畛�i"
+msgstr "Th担ng b叩o tr畉�ng th叩i m畛�i"
 
 #: src/away.c:388
 msgid "Remove Away Message"
-msgstr "B畛� th担ng b叩o v畉�ng m畉�t"
+msgstr "B畛� th担ng b叩o tr畉�ng th叩i"
 
 #: src/away.c:583
 msgid "Set All Away"
-msgstr "B叩o v畉�ng m畉�t cho t畉�t c畉�"
+msgstr "�畉�t th担ng b叩o tr畉�ng th叩i cho t畉�t c畉�"
 
 #: src/blist.c:551 src/gtkprefs.c:2267
 msgid "Chats"
 msgstr "Cu畛�c Chat"
 
-#: src/blist.c:646 src/blist.c:834 src/blist.c:2042 src/gtkblist.c:3070
+#: src/blist.c:646 src/blist.c:834 src/blist.c:2042 src/gtkblist.c:2991
 #: src/protocols/jabber/roster.c:66 src/protocols/msn/notification.c:1160
 msgid "Buddies"
 msgstr "Buddy"
@@ -1344,13 +1351,11 @@
 msgid ""
 "%d buddy from group %s was not removed because its account was not logged "
 "in.  This buddy and the group were not removed.\n"
-msgid_plural ""
 "%d buddies from group %s were not removed because their accounts were not "
 "logged in.  These buddies and the group were not removed.\n"
-msgstr[0] ""
+msgstr ""
 "Kh担ng x坦a �動畛�c %d buddy t畛� nh坦m %s v狸 t�i kho畉�n c畛�a n坦 �達 ch動a ��ng nh畉�p. "
 "Kh担ng x坦a �動畛�c buddy v� nh坦m n�y.\n"
-msgstr[1] ""
 "Kh担ng x坦a �動畛�c %d buddy t畛� nh坦m %s v狸 t�i kho畉�n c畛�a ch炭ng �達 ch動a ��ng nh畉�p. "
 "Kh担ng x坦a �動畛�c c叩c buddy v� nh坦m n�y.\n"
 
@@ -1359,7 +1364,7 @@
 msgstr "Nh坦m kh担ng x坦a �動畛�c"
 
 #: src/blist.c:1193 src/gtkaccount.c:159 src/gtkutils.c:844
-#: src/protocols/jabber/auth.c:111 src/protocols/jabber/buddy.c:563
+#: src/protocols/jabber/auth.c:117 src/protocols/jabber/buddy.c:563
 msgid "Unknown"
 msgstr "Kh担ng x叩c �畛�nh"
 
@@ -1368,20 +1373,21 @@
 msgstr "T棚n nh坦m kh担ng h畛�p l畛�"
 
 #: src/blist.c:2159
-msgid "An error was encountered parsing your buddy list.  It has not been loaded."
-msgstr "L畛�i �達 x畉�y ra khi ph但n t鱈ch danh s叩ch buddy. Danh s叩ch �達 kh担ng �動畛�c n畉�p."
+msgid ""
+"An error was encountered parsing your buddy list.  It has not been loaded."
+msgstr ""
+"L畛�i �達 x畉�y ra khi ph但n t鱈ch danh s叩ch buddy. Danh s叩ch �達 kh担ng �動畛�c n畉�p."
 
 #: src/blist.c:2161
 msgid "Buddy List Error"
-msgstr "L畛�i Danh s叩ch Buddy"
-
-#: src/buddy_chat.c:312 src/gtkblist.c:3482
+msgstr "L畛�i danh s叩ch Buddy"
+
+#: src/buddy_chat.c:312 src/gtkblist.c:3403
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
 msgstr ""
-"Hi畛�n t畉�i b畉�n kh担ng k畉�t n畛�i �動畛�c b畉�ng b畉�t k畛� ph動董ng th畛�c n�o �畛� c坦 kh畉� n�ng "
-"Chat."
+"Hi畛�n th畛�i b畉�n kh担ng k畉�t n畛�i b畉�ng b畉�t k畛� giao th畛�c n�o �畛� c坦 kh畉� n�ng Chat."
 
 #: src/buddy_chat.c:326
 msgid "Join Chat"
@@ -1393,7 +1399,7 @@
 
 #: src/buddy_chat.c:342
 msgid "Join Chat As:"
-msgstr "Tham gia Chat l�:"
+msgstr "Tham gia Chat b畉�ng:"
 
 #. Join button.
 #: src/buddy_chat.c:365
@@ -1424,32 +1430,32 @@
 
 #: src/conversation.c:335
 msgid "Unable to send message."
-msgstr "Kh担ng th畛� g畛�i tin."
+msgstr "Kh担ng th畛� g畛�i th担ng �i畛�p."
 
 #: src/conversation.c:1915
 #, c-format
 msgid "%s entered the room."
-msgstr "%s �達 v�o ph嘆ng."
+msgstr "%s v�o ph嘆ng."
 
 #: src/conversation.c:1918
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
-msgstr "%s [<I>%s</I>] �達 v�o ph嘆ng."
+msgstr "%s [<I>%s</I>] v�o ph嘆ng."
 
 #: src/conversation.c:2003
 #, c-format
 msgid "%s is now known as %s"
-msgstr "%s �畛�i t棚n th�nh %s"
+msgstr "%s b但y gi畛� �畛�i l� %s"
 
 #: src/conversation.c:2045
 #, c-format
 msgid "%s left the room (%s)."
-msgstr "%s r畛�i kh畛�i ph嘆ng (%s)."
+msgstr "%s r畛�i ph嘆ng (%s)."
 
 #: src/conversation.c:2047
 #, c-format
 msgid "%s left the room."
-msgstr "%s r畛�i kh畛�i ph嘆ng."
+msgstr "%s r畛�i ph嘆ng."
 
 #: src/conversation.c:2120
 #, c-format
@@ -1459,7 +1465,7 @@
 #: src/conversation.c:2122
 #, c-format
 msgid " left the room (%s)."
-msgstr "r畛�i kh畛�i ph嘆ng(%s)."
+msgstr "r畛�i ph嘆ng(%s)."
 
 #: src/conversation.c:2404
 msgid "Last created window"
@@ -1495,8 +1501,8 @@
 msgstr ""
 "<span weight=\"bold\" size=\"larger\">C畉�nh b叩o %s?</span>\n"
 "\n"
-"�i畛�u n�y s畉� t�ng m畛�c �畛� c畉�nh b叩o cho %s v� anh ho畉�c ch畛� s畉� b畛� gi畛�i h畉�n m畛�c "
-"ch畛� �畛�.\n"
+"�i畛�u n�y s畉� t�ng m畛�c �畛� c畉�nh b叩o c畛�a %s v� h畛� s畉� l� �畛�i t動畛�ng b畛� h畉�n ch畉� "
+"kh畉�t khe.\n"
 
 #: src/dialogs.c:335
 msgid "Warn _anonymously?"
@@ -1508,12 +1514,13 @@
 
 #: src/dialogs.c:455
 #, c-format
-msgid "You are about to remove %s from your buddy list.  Do you want to continue?"
+msgid ""
+"You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr "B畉�n s畉�p x坦a %s kh畛�i danh s叩ch buddy c畛�a b畉�n. B畉�n mu畛�n th畛�c hi畛�n kh担ng?"
 
 #: src/dialogs.c:457 src/dialogs.c:458
 msgid "Remove Buddy"
-msgstr "X坦a Buddy"
+msgstr "X坦a b畛� Buddy"
 
 #: src/dialogs.c:467
 #, c-format
@@ -1558,19 +1565,20 @@
 
 #: src/dialogs.c:670
 msgid "Please enter the screenname of the person you would like to IM.\n"
-msgstr "H達y nh畉�p t棚n hi畛�n th畛� c畛�a ng動畛�i m� b畉�n mu畛�n tr嘆 chuy畛�n b畉�ng IM.\n"
+msgstr ""
+"H達y nh畉�p t棚n hi畛�n th畛� c畛�a ng動畛�i m� b畉�n mu畛�n tr嘆 chuy畛�n b畉�ng Nh畉�n Tin Nhanh.\n"
 
 #: src/dialogs.c:686 src/dialogs.c:763
 msgid "_Screenname:"
-msgstr "_T棚n Hi畛�n Th畛�:"
+msgstr "T棚n Hi畛�_n Th畛�:"
 
 #: src/dialogs.c:701 src/dialogs.c:779 src/gtkpounce.c:358
 msgid "_Account:"
-msgstr "_T�i kho畉�n:"
+msgstr "T�i _kho畉�n:"
 
 #: src/dialogs.c:732
 msgid "Get User Info"
-msgstr "L畉�y th担ng tin ng動畛�i d湛ng"
+msgstr "Th担ng tin buddy"
 
 #: src/dialogs.c:751
 msgid ""
@@ -1578,15 +1586,15 @@
 "view.\n"
 msgstr "H達y nh畉�p t棚n hi畛�n th畛� c畛�a ng動畛�i m� b畉�n mu畛�n xem th担ng tin v畛� h畛�.\n"
 
-#: src/dialogs.c:845 src/protocols/jabber/jabber.c:1033
-#: src/protocols/oscar/oscar.c:6521 src/protocols/toc/toc.c:1532
+#: src/dialogs.c:845 src/protocols/jabber/jabber.c:1034
+#: src/protocols/oscar/oscar.c:6484 src/protocols/toc/toc.c:1532
 msgid "Set User Info"
 msgstr "L畉�p th担ng tin ng動畛�i d湛ng"
 
 #: src/dialogs.c:854
 #, c-format
 msgid "Changing info for %s:"
-msgstr "Thay �畛�i th担ng tin cho %s:"
+msgstr "�畛�i th担ng tin cho %s:"
 
 #: src/dialogs.c:969
 msgid "Insert Link"
@@ -1600,10 +1608,11 @@
 msgid ""
 "Please enter the URL and description of the link that you want to insert.  "
 "The description is optional.\n"
-msgstr "H達y nh畉�p URL v� m担 t畉� li棚n k畉�t m� b畉�n mu畛�n ch竪n. M担 t畉� l� t湛y ch畛�n th棚m.\n"
+msgstr ""
+"H達y nh畉�p URL v� m担 t畉� li棚n k畉�t m� b畉�n mu畛�n ch竪n. M担 t畉� l� t湛y ch畛�n th棚m.\n"
 
 #: src/dialogs.c:1011 src/protocols/jabber/buddy.c:249
-#: src/protocols/jabber/jabber.c:631
+#: src/protocols/jabber/jabber.c:632
 msgid "URL"
 msgstr "URL"
 
@@ -1626,19 +1635,21 @@
 
 #: src/dialogs.c:1403
 msgid "You cannot save an away message with a blank title"
-msgstr "B畉�n kh担ng th畛� l動u th担ng b叩o v畉�ng m畉�t m� kh担ng c坦 ti棚u �畛�"
+msgstr "B畉�n kh担ng th畛� l動u th担ng b叩o tr畉�ng th叩i m� kh担ng c坦 ti棚u �畛�"
 
 #: src/dialogs.c:1405
-msgid "Please give the message a title, or choose \"Use\" to use without saving."
-msgstr "H達y nh畉�p ti棚u �畛� cho th担ng �i畛�p, ho畉�c ch畛�n \"S畛� d畛�ng\" �畛� d湛ng m� kh担ng l動u."
+msgid ""
+"Please give the message a title, or choose \"Use\" to use without saving."
+msgstr ""
+"H達y nh畉�p ti棚u �畛� th担ng b叩o, ho畉�c ch畛�n \"D湛ng\" �畛� s畛� d畛�ng m� kh担ng l動u."
 
 #: src/dialogs.c:1415
 msgid "You cannot create an empty away message"
-msgstr "Kh担ng th畛� t畉�o th担ng b叩o v畉�ng m畉�t m� kh担ng c坦 n畛�i dung"
+msgstr "Kh担ng th畛� t畉�o th担ng b叩o tr畉�ng th叩i m� kh担ng c坦 n畛�i dung"
 
 #: src/dialogs.c:1480 src/dialogs.c:1488
 msgid "New away message"
-msgstr "Th担ng b叩o tr畉�ng th叩i v畉�ng m畉�t m畛�i"
+msgstr "Th担ng b叩o tr畉�ng th叩i m畛�i"
 
 #: src/dialogs.c:1498
 msgid "Away title: "
@@ -1650,7 +1661,7 @@
 
 #: src/dialogs.c:1550
 msgid "Use"
-msgstr "S畛� d畛�ng"
+msgstr "D湛ng"
 
 #. show everything
 #: src/dialogs.c:1699
@@ -1667,7 +1678,7 @@
 
 #: src/dialogs.c:1718
 msgid "Please enter an aliased name for this chat."
-msgstr "Vui l嘆ng nh畉�p b鱈 danh cho Chat n�y."
+msgstr "H達y nh畉�p b鱈 danh cho cu畛�c Chat n�y."
 
 #: src/dialogs.c:1734
 msgid "Alias Contact"
@@ -1679,13 +1690,13 @@
 
 #: src/dialogs.c:1735
 msgid "Please enter an aliased name for this contact."
-msgstr "H達y nh畉�p b鱈 danh cho li棚n l畉�c n�y."
+msgstr "H達y nh畉�p t棚n b鱈 danh cho li棚n l畉�c n�y."
 
 #: src/dialogs.c:1766
 msgid "_Screenname"
-msgstr "_T棚n hi畛�n th畛�"
-
-#: src/dialogs.c:1771 src/gtkblist.c:848 src/gtkblist.c:936 src/gtkblist.c:955
+msgstr "T棚n _hi畛�n th畛�"
+
+#: src/dialogs.c:1771 src/gtkblist.c:842 src/gtkblist.c:930 src/gtkblist.c:949
 msgid "_Alias"
 msgstr "_B鱈 danh"
 
@@ -1742,7 +1753,7 @@
 msgid "Conversations with %s"
 msgstr "H畛�i tho畉�i v畛�i %s"
 
-#: src/dialogs.c:2104 src/protocols/jabber/jabber.c:636
+#: src/dialogs.c:2104 src/protocols/jabber/jabber.c:637
 msgid "Date"
 msgstr "Ng�y th叩ng"
 
@@ -1762,21 +1773,21 @@
 #: src/ft.c:137
 #, c-format
 msgid "%s was not found.\n"
-msgstr "kh担ng t狸m th畉メ撒 %s .\n"
+msgstr "kh担ng t狸m th畉�y %s .\n"
 
 #: src/ft.c:693
 #, c-format
 msgid "File transfer to %s aborted.\n"
-msgstr "Qu叩 tr狸nh g畛�i t畉�p tin t畛�i %s b畛� h畛�y.\n"
+msgstr "Vi畛�c g畛�i t畉�p tin t畛�i %s b畛� h畛�y.\n"
 
 #: src/ft.c:695
 #, c-format
 msgid "File transfer from %s aborted.\n"
-msgstr "Qu叩 tr狸nh g畛�i t畉�p tin t畛� %s b畛� h畛�y.\n"
+msgstr "Vi畛�c g畛�i t畉�p tin t畛� %s b畛� h畛�y.\n"
 
 #: src/gaim-disclosure.c:253
 msgid "Expander Size"
-msgstr "Thanh m畛� r畛�ng k鱈ch th動畛�c"
+msgstr "L鱈ch th動畛�c thanh m畛� r畛�ng"
 
 #: src/gaim-disclosure.c:254
 msgid "Size of the expander arrow"
@@ -1833,8 +1844,8 @@
 "S畛� d畛�ng AIM: URIs:\n"
 "G畛�i tin nh畉�n cho m畛�t t棚n hi畛�n th畛� n�o �坦:\n"
 "\tgaim-remote uri 'aim:goim?screenname=Penguin&message=hello+world'\n"
-"Trong tr動畛�ng h畛�p n�y, 'Penguin' l� t棚n hi畛�n th畛� m� ch炭ng ta mu畛�n chat, v� 'hello "
-"world'\n"
+"Trong tr動畛�ng h畛�p n�y, 'Penguin' l� t棚n hi畛�n th畛� m� ch炭ng ta mu畛�n chat, v� "
+"'hello world'\n"
 "l� tin s畉� g畛�i.  '+' ph畉�i �動畛�c d湛ng cho kho畉�ng tr畉�ng.\n"
 "Vui l嘆ng ch炭 箪 nh畛�ng d畉�u nh叩y �動畛�c s畛� d畛�ng b棚n tr棚n - n畉�u b畉�n th畛�c thi l畛�nh "
 "n�y t畛� shell '&'\n"
@@ -1862,21 +1873,21 @@
 #. for people like myself, who are too lazy to add an away msg :)
 #: src/gaimrc.c:44
 msgid "sorry, i ran out for a while. bbl"
-msgstr "xin l畛�i, t担i ra ngo�i m畛�t l叩t. bbl"
+msgstr "xin l畛�i, t担i ra ngo�i m畛�t l炭c. bbl"
 
 #: src/gaimrc.c:373 src/gaimrc.c:1450
 msgid "boring default"
-msgstr "tr畉�ng th叩i ngh畛� m畉�c �畛�nh"
-
-#: src/gaimrc.c:1259 src/gtkblist.c:2245
+msgstr "tr畉�ng th叩i m畉�c �畛�nh"
+
+#: src/gaimrc.c:1259 src/gtkblist.c:2170
 msgid "Alphabetical"
-msgstr "Theo b畉�ng ch畛� c叩i"
-
-#: src/gaimrc.c:1261 src/gtkblist.c:2246
+msgstr "Theo v畉�n"
+
+#: src/gaimrc.c:1261 src/gtkblist.c:2171
 msgid "By status"
 msgstr "Theo tr畉�ng th叩i"
 
-#: src/gaimrc.c:1263 src/gtkblist.c:2247
+#: src/gaimrc.c:1263 src/gtkblist.c:2172
 msgid "By log size"
 msgstr "Theo k鱈ch th動畛�c b畉�n ghi"
 
@@ -1896,7 +1907,7 @@
 "<b>K鱈ch th動畛�c t畉�p tin:</b> %s\n"
 "<b>K鱈ch th動畛�c 畉�nh:</b> %dx%d"
 
-#: src/gtkaccount.c:318 src/protocols/oscar/oscar.c:3122
+#: src/gtkaccount.c:318 src/protocols/oscar/oscar.c:3077
 msgid "Buddy Icon"
 msgstr "Bi畛�u t動畛�ng Buddy"
 
@@ -1918,7 +1929,7 @@
 msgid "Password:"
 msgstr "M畉�t kh畉�u:"
 
-#: src/gtkaccount.c:469 src/gtkblist.c:3222 src/gtkblist.c:3541
+#: src/gtkaccount.c:469 src/gtkblist.c:3143 src/gtkblist.c:3462
 msgid "Alias:"
 msgstr "B鱈 danh:"
 
@@ -1989,7 +2000,7 @@
 
 #: src/gtkaccount.c:819
 msgid "If you look real closely"
-msgstr "N畉�u b畉�n th畉�t s畛� g畉�n"
+msgstr "N畉�u b畉�n th畉�y �炭ng l� g畉�n"
 
 #: src/gtkaccount.c:835
 msgid "Proxy Options"
@@ -2033,40 +2044,40 @@
 msgstr "Hi畛�n th畛� 鱈t t湛y ch畛�n"
 
 #. Register button
-#: src/gtkaccount.c:1272 src/protocols/jabber/jabber.c:649
+#: src/gtkaccount.c:1272 src/protocols/jabber/jabber.c:650
 msgid "Register"
 msgstr "��ng k箪"
 
 #: src/gtkaccount.c:1617
 #, c-format
 msgid "Are you sure you want to delete %s?"
-msgstr "B畉�n ch畉�c ch畉�n mu畛�n x坦a %s?"
+msgstr "B畉�n ch畉�c ch畉�n mu畛�n x坦a %s kh担ng?"
 
 #: src/gtkaccount.c:1621 src/gtkrequest.c:199
 msgid "Delete"
 msgstr "X坦a"
 
-#: src/gtkaccount.c:1734
+#: src/gtkaccount.c:1735
 msgid "Screen Name"
 msgstr "T棚n Hi畛�n Th畛�"
 
-#: src/gtkaccount.c:1757 src/protocols/jabber/jabber.c:923
-#: src/protocols/oscar/oscar.c:2895 src/protocols/oscar/oscar.c:4634
-#: src/protocols/oscar/oscar.c:6182 src/protocols/yahoo/yahoo.c:2032
+#: src/gtkaccount.c:1758 src/protocols/jabber/jabber.c:924
+#: src/protocols/oscar/oscar.c:2850 src/protocols/oscar/oscar.c:4589
+#: src/protocols/oscar/oscar.c:6137 src/protocols/yahoo/yahoo.c:2056
 #: src/protocols/zephyr/zephyr.c:886 src/protocols/zephyr/zephyr.c:896
 msgid "Online"
 msgstr "K畉�t n畛�i"
 
-#: src/gtkaccount.c:1775
+#: src/gtkaccount.c:1776
 msgid "Protocol"
 msgstr "Giao th畛�c"
 
-#: src/gtkaccount.c:2065
+#: src/gtkaccount.c:2066
 #, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s%s"
 msgstr "%s%s%s%s �達 t畉�o %s buddy c畛�a ng動畛�i d湛ng %s%s%s"
 
-#: src/gtkaccount.c:2079
+#: src/gtkaccount.c:2080
 msgid ""
 "\n"
 "\n"
@@ -2074,212 +2085,186 @@
 msgstr ""
 "\n"
 "\n"
-"B畉�n c坦 mu畛�n th棚m ng動畛�i n�y v�o danh s叩ch buddy kh担ng?"
-
-#: src/gtkaccount.c:2083
+"B畉�n mu畛�n th棚m ng動畛�i n�y v�o danh s叩ch buddy kh担ng?"
+
+#: src/gtkaccount.c:2084
 msgid "Gaim - Information"
 msgstr "Gaim - Th担ng tin"
 
-#: src/gtkaccount.c:2087
+#: src/gtkaccount.c:2088
 msgid "Add buddy to your list?"
-msgstr "Th棚m buddy v�o danh s叩ch?"
-
-#: src/gtkaccount.c:2089 src/gtkblist.c:3589 src/gtkconv.c:1271
-#: src/gtkconv.c:3156 src/gtkconv.c:4326 src/gtkrequest.c:200
-#: src/protocols/icq/gaim_icq.c:277 src/protocols/oscar/oscar.c:2737
+msgstr "C坦 th棚m buddy v�o danh s叩ch kh担ng?"
+
+#: src/gtkaccount.c:2090 src/gtkblist.c:3510 src/gtkconv.c:1257
+#: src/gtkconv.c:3110 src/gtkconv.c:4280 src/gtkrequest.c:200
+#: src/protocols/icq/gaim_icq.c:277 src/protocols/oscar/oscar.c:2692
 msgid "Add"
 msgstr "Th棚m"
 
-#: src/gtkblist.c:816
+#: src/gtkblist.c:815
 msgid "_Get Info"
 msgstr "_L畉�y th担ng tin"
 
-#: src/gtkblist.c:819
+#: src/gtkblist.c:818
 msgid "_IM"
-msgstr "_IM"
-
-#: src/gtkblist.c:821
+msgstr "_Nh畉�n tin nhanh"
+
+#: src/gtkblist.c:820
 msgid "Add Buddy _Pounce"
-msgstr "Th棚m Buddy _Pounce"
-
-#: src/gtkblist.c:823
+msgstr "Th棚m th担ng b叩o Buddy"
+
+#: src/gtkblist.c:822
 msgid "View _Log"
-msgstr "Xem _B畉�n ghi"
-
-#: src/gtkblist.c:840
-msgid "Send _File"
-msgstr "G畛�i t畉�p t_in"
-
-#: src/gtkblist.c:850 src/gtkblist.c:938 src/gtkblist.c:960
+msgstr "Xem _b畉�n ghi"
+
+#: src/gtkblist.c:844 src/gtkblist.c:932 src/gtkblist.c:954
 msgid "_Remove"
-msgstr "_B畛�"
-
-#: src/gtkblist.c:913
+msgstr "_X坦a b畛�"
+
+#: src/gtkblist.c:907
 msgid "Add a _Buddy"
 msgstr "Th棚m _Buddy"
 
-#: src/gtkblist.c:915
+#: src/gtkblist.c:909
 msgid "Add a C_hat"
 msgstr "Th棚m C_hat"
 
-#: src/gtkblist.c:917
+#: src/gtkblist.c:911
 msgid "_Delete Group"
-msgstr "_X坦a Nh坦m"
-
-#: src/gtkblist.c:919
+msgstr "_X坦a nh坦m"
+
+#: src/gtkblist.c:913
 msgid "_Rename"
 msgstr "_�畛�i t棚n"
 
-#: src/gtkblist.c:931
+#: src/gtkblist.c:925
 msgid "_Join"
-msgstr "Tham _Gia"
-
-#: src/gtkblist.c:933
+msgstr "Tham gi_a"
+
+#: src/gtkblist.c:927
 msgid "Auto-Join"
 msgstr "T畛� �畛�ng tham gia"
 
-#: src/gtkblist.c:957 src/gtkblist.c:992
+#: src/gtkblist.c:951 src/gtkblist.c:986
 msgid "_Collapse"
 msgstr "_Co l畉�i"
 
-#: src/gtkblist.c:997
+#: src/gtkblist.c:991
 msgid "_Expand"
-msgstr "_M畛� r畛�ng"
-
-#: src/gtkblist.c:1186 src/gtkblist.c:1187 src/gtkblist.c:1202
-#: src/gtkblist.c:1203 src/protocols/jabber/jabber.c:908
-#: src/protocols/jabber/jabber.c:961 src/protocols/jabber/presence.c:294
-msgid "Error"
-msgstr "L畛�i"
-
-#: src/gtkblist.c:1187
-msgid "This user can't accept files"
-msgstr "Ng動畛�i d湛ng n�y kh担ng th畛� nh畉�n c叩c t畉�p tin"
-
-#: src/gtkblist.c:1203
-msgid "Gaim just support file:// URIS currently"
-msgstr "Hi畛�n t畉�i Gaim �達 h畛� tr畛� file:// URIS"
-
-#: src/gtkblist.c:1216
-msgid "You are trying to send a lot of files"
-msgstr "B畉�n �ang c畛� g畛�i r畉�t nhi畛�u t畉�p tin"
-
-#: src/gtkblist.c:1216
-msgid "Do you really want to send them ?"
-msgstr "B畉�n th畉�t s畛� mu畛�n g畛�i ch炭ng kh担ng ?"
+msgstr "M畛� _r畛�ng"
 
 #. Buddies menu
-#: src/gtkblist.c:1597
+#: src/gtkblist.c:1524
 msgid "/_Buddies"
-msgstr "/_Buddies"
-
-#: src/gtkblist.c:1598
+msgstr "/_Buddy"
+
+#: src/gtkblist.c:1525
 msgid "/Buddies/New _Instant Message..."
-msgstr "/Buddies/Th担ng _�i畛�p m畛�i..."
-
-#: src/gtkblist.c:1599
+msgstr "/Buddy/T_h担ng �i畛�p m畛�i..."
+
+#: src/gtkblist.c:1526
 msgid "/Buddies/Join a _Chat..."
-msgstr "/Buddies/Tham Gia _Chat..."
-
-#: src/gtkblist.c:1600
+msgstr "/Buddy/Tham gia _Chat..."
+
+#: src/gtkblist.c:1527
 msgid "/Buddies/Get _User Info..."
-msgstr "/Buddies/L畉�y th担ng tin _ng動畛�i d湛ng..."
-
-#: src/gtkblist.c:1602
+msgstr "/Buddy/L畉�y th担ng tin _ng動畛�i d湛ng..."
+
+#: src/gtkblist.c:1529
 msgid "/Buddies/Show _Offline Buddies"
-msgstr "/Buddies/Hi畛�n th畛� Buddy _Ngo畉�i tuy畉�n"
-
-#: src/gtkblist.c:1603
+msgstr "/Buddy/Hi畛�n th畛� buddy _kh担ng k畉�t n畛�i"
+
+#: src/gtkblist.c:1530
 msgid "/Buddies/Show _Empty Groups"
-msgstr "/Buddies/Hi畛�n th畛� Nh坦m _R畛�ng"
-
-#: src/gtkblist.c:1604
+msgstr "/Buddy/Hi畛�n th畛� nh坦m r畛�_ng"
+
+#: src/gtkblist.c:1531
 msgid "/Buddies/_Add a Buddy..."
-msgstr "/Buddies/_Th棚m Buddy..."
-
-#: src/gtkblist.c:1605
+msgstr "/Buddy/_Th棚m Buddy..."
+
+#: src/gtkblist.c:1532
 msgid "/Buddies/Add a C_hat..."
-msgstr "/Buddies/Th棚m C_hat..."
-
-#: src/gtkblist.c:1606
+msgstr "/Buddy/Th棚m Ch_at..."
+
+#: src/gtkblist.c:1533
 msgid "/Buddies/Add a _Group..."
-msgstr "/Buddies/Th棚m _Nh坦m..."
-
-#: src/gtkblist.c:1608
+msgstr "/Buddy/Th棚m _nh坦m..."
+
+#: src/gtkblist.c:1535
 msgid "/Buddies/_Signoff"
-msgstr "/Buddies/_Ng畉�t k畉�t n畛�i"
-
-#: src/gtkblist.c:1609
+msgstr "/Buddy/N_g畉�t k畉�t n畛�i"
+
+#: src/gtkblist.c:1536
 msgid "/Buddies/_Quit"
-msgstr "/Buddies/_Tho叩t"
+msgstr "/Buddy/Th_o叩t"
 
 #. Tools
-#: src/gtkblist.c:1612
+#: src/gtkblist.c:1539
 msgid "/_Tools"
 msgstr "/_C担ng c畛�"
 
-#: src/gtkblist.c:1613
+#: src/gtkblist.c:1540
 msgid "/Tools/_Away"
-msgstr "/C担ng c畛�/_V畉�ng m畉�t"
-
-#: src/gtkblist.c:1614
+msgstr "/C担ng c畛�/T_r畉�ng th叩i"
+
+#: src/gtkblist.c:1541
 msgid "/Tools/Buddy _Pounce"
-msgstr "/C担ng c畛�/Buddy _Pounce"
-
-#: src/gtkblist.c:1615
+msgstr "/C担ng c畛�/Th担ng _b叩o buddy"
+
+#: src/gtkblist.c:1542
 msgid "/Tools/P_rotocol Actions"
-msgstr "/C担ng c畛�/Ho畉�t �畛�ng c畛�a _Giao th畛�c"
-
-#: src/gtkblist.c:1617
+msgstr "/C担ng c畛�/Ho畉�t �畛�ng c畛�a _giao th畛�c"
+
+#: src/gtkblist.c:1544
 msgid "/Tools/A_ccounts"
-msgstr "/C担ng c畛�/T�i kho畉�n"
-
-#: src/gtkblist.c:1618
+msgstr "/C担ng c畛�/T�i _kho畉�n"
+
+#: src/gtkblist.c:1545
 msgid "/Tools/_File Transfers..."
 msgstr "/C担ng c畛�/Truy畛�n t畉�p t_in..."
 
-#: src/gtkblist.c:1619
+#: src/gtkblist.c:1546
 msgid "/Tools/Preferences"
 msgstr "/C担ng c畛�/T湛y ch畛�nh"
 
-#: src/gtkblist.c:1620
+#: src/gtkblist.c:1547
 msgid "/Tools/Pr_ivacy"
 msgstr "/C担ng c畛�/Ch鱈nh _s叩ch"
 
-#: src/gtkblist.c:1622
+#: src/gtkblist.c:1549
 msgid "/Tools/View System _Log"
-msgstr "/C担ng c畛�/Xem _B畉�n Ghi H畛� Th畛�ng"
+msgstr "/C担ng c畛�/Xem _b畉�n ghi h畛� th畛�ng"
 
 #. Help
-#: src/gtkblist.c:1625
+#: src/gtkblist.c:1552
 msgid "/_Help"
 msgstr "/Tr畛� _gi炭p"
 
-#: src/gtkblist.c:1626
+#: src/gtkblist.c:1553
 msgid "/Help/Online _Help"
-msgstr "/Tr畛� gi炭p/Tr畛� gi炭p tr畛�c t_uy畉�n"
-
-#: src/gtkblist.c:1627
+msgstr "/Tr畛� gi炭p/Tr畛� gi炭p tr畛�c tu_y畉�n"
+
+#: src/gtkblist.c:1554
 msgid "/Help/_Debug Window"
 msgstr "/Tr畛� gi炭p/C畛�a s畛� g畛� _r畛�i"
 
-#: src/gtkblist.c:1628
+#: src/gtkblist.c:1555
 msgid "/Help/_About"
-msgstr "/Tr畛� gi炭p/_Gi畛�i thi畛�u"
-
-#: src/gtkblist.c:1644
+msgstr "/Tr畛� gi炭p/Gi畛�i thi畛�_u"
+
+#: src/gtkblist.c:1571
 msgid "Rename Group"
 msgstr "�畛�i t棚n nh坦m"
 
-#: src/gtkblist.c:1644
+#: src/gtkblist.c:1571
 msgid "New group name"
 msgstr "T棚n nh坦m m畛�i"
 
-#: src/gtkblist.c:1645
+#: src/gtkblist.c:1572
 msgid "Please enter a new name for the selected group."
-msgstr "Vui l嘆ng nh畉�p t棚n m畛�i cho nh坦m �達 ch畛�n."
-
-#: src/gtkblist.c:1674
+msgstr "H達y nh畉�p t棚n m畛�i cho nh坦m �達 ch畛�n."
+
+#: src/gtkblist.c:1600
 #, c-format
 msgid ""
 "\n"
@@ -2288,16 +2273,16 @@
 "\n"
 "<b>T�i kho畉�n:</b> %s"
 
-#: src/gtkblist.c:1737 src/protocols/oscar/oscar.c:5562
+#: src/gtkblist.c:1661 src/protocols/oscar/oscar.c:5517
 msgid "<b>Status:</b> Offline"
 msgstr "<b>Tr畉�ng th叩i:</b> Ngo畉�i tuy畉�n"
 
-#: src/gtkblist.c:1749
+#: src/gtkblist.c:1673
 #, c-format
 msgid "%d%%"
 msgstr "%d%%"
 
-#: src/gtkblist.c:1764
+#: src/gtkblist.c:1688
 msgid ""
 "\n"
 "<b>Account:</b>"
@@ -2305,15 +2290,15 @@
 "\n"
 "<b>T�i kho畉�n:</b>"
 
-#: src/gtkblist.c:1765
+#: src/gtkblist.c:1689
 msgid ""
 "\n"
 "<b>Contact Alias:</b>"
 msgstr ""
 "\n"
-"<b>B鱈 danh Li棚n L畉�c:</b>"
-
-#: src/gtkblist.c:1766
+"<b>B鱈 danh li棚n l畉�c:</b>"
+
+#: src/gtkblist.c:1690
 msgid ""
 "\n"
 "<b>Alias:</b>"
@@ -2321,15 +2306,15 @@
 "\n"
 "<b>B鱈 danh:</b>"
 
-#: src/gtkblist.c:1767
+#: src/gtkblist.c:1691
 msgid ""
 "\n"
 "<b>Nickname:</b>"
 msgstr ""
 "\n"
-"<b>Nickname:</b>"
-
-#: src/gtkblist.c:1768
+"<b>Bi畛�t danh:</b>"
+
+#: src/gtkblist.c:1692
 msgid ""
 "\n"
 "<b>Idle:</b>"
@@ -2337,7 +2322,7 @@
 "\n"
 "<b>Ngh畛�:</b>"
 
-#: src/gtkblist.c:1769
+#: src/gtkblist.c:1693
 msgid ""
 "\n"
 "<b>Warned:</b>"
@@ -2345,7 +2330,7 @@
 "\n"
 "<b>C畉�nh b叩o:</b>"
 
-#: src/gtkblist.c:1771
+#: src/gtkblist.c:1695
 msgid ""
 "\n"
 "<b>Description:</b> Spooky"
@@ -2353,148 +2338,148 @@
 "\n"
 "<b>M担 t畉�:</b> Ho畉�ng s畛�"
 
-#: src/gtkblist.c:1772
+#: src/gtkblist.c:1696
 msgid ""
 "\n"
 "<b>Status</b>: Awesome"
 msgstr ""
 "\n"
-"<b>T狸nh tr畉�ng</b>: Awesome"
-
-#: src/gtkblist.c:1773
+"<b>Tr畉�ng th叩i</b>: Kinh ho�ng"
+
+#: src/gtkblist.c:1697
 msgid ""
 "\n"
 "<b>Status</b>: Rockin'"
 msgstr ""
 "\n"
-"<b>T狸nh tr畉�ng</b>: Rockin'"
-
-#: src/gtkblist.c:2041
+"<b>Tr畉�ng th叩i</b>: S畛�ng s畛�t'"
+
+#: src/gtkblist.c:1965
 #, c-format
 msgid "Idle (%dh%02dm) "
 msgstr "Ngh畛� (%dh%02dm) "
 
-#: src/gtkblist.c:2043
+#: src/gtkblist.c:1967
 #, c-format
 msgid "Idle (%dm) "
 msgstr "Ngh畛� (%dm) "
 
-#: src/gtkblist.c:2048
+#: src/gtkblist.c:1972
 #, c-format
 msgid "Warned (%d%%) "
 msgstr "C畉�nh b叩o (%d%%) "
 
-#: src/gtkblist.c:2051
+#: src/gtkblist.c:1975
 msgid "Offline "
 msgstr "Ngo畉�i tuy畉�n"
 
-#: src/gtkblist.c:2243 src/gtkprefs.c:841 src/gtkprefs.c:1495
+#: src/gtkblist.c:2168 src/gtkprefs.c:841 src/gtkprefs.c:1495
 msgid "None"
 msgstr "Kh担ng"
 
-#: src/gtkblist.c:2311
+#: src/gtkblist.c:2235
 msgid "/Tools/Away"
-msgstr "/C担ng c畛�/V畉�ng M畉�t"
-
-#: src/gtkblist.c:2314
+msgstr "/C担ng c畛�/Tr畉�ng th叩i"
+
+#: src/gtkblist.c:2238
 msgid "/Tools/Buddy Pounce"
-msgstr "/C担ng c畛�/Buddy Pounce"
-
-#: src/gtkblist.c:2317
+msgstr "/C担ng c畛�/Th担ng b叩o Buddy"
+
+#: src/gtkblist.c:2241
 msgid "/Tools/Protocol Actions"
-msgstr "/C担ng c畛�/Giao th畛�c ho畉�t �畛�ng"
+msgstr "/C担ng c畛�/Ho畉�t �畛�ng giao th畛�c"
 
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: src/gtkblist.c:2407
+#: src/gtkblist.c:2328
 msgid "/Buddies/Show Offline Buddies"
-msgstr "/Buddies/Hi畛�n th畛� Buddy ngo畉�i tuy畉�n"
-
-#: src/gtkblist.c:2409
+msgstr "/Buddy/Hi畛�n th畛� buddy ngo畉�i tuy畉�n"
+
+#: src/gtkblist.c:2330
 msgid "/Buddies/Show Empty Groups"
-msgstr "/Buddies/Hi畛�n th畛� nh坦m r畛�ng"
-
-#: src/gtkblist.c:2427 src/gtkconv.c:1230
+msgstr "/Buddy/Hi畛�n th畛� nh坦m r畛�ng"
+
+#: src/gtkblist.c:2348 src/gtkconv.c:1216
 msgid "IM"
-msgstr "IM"
-
-#: src/gtkblist.c:2433
+msgstr "Tin nh畉�n nhanh"
+
+#: src/gtkblist.c:2354
 msgid "Send a message to the selected buddy"
-msgstr "G畛�i tin nh畉�n �畉�n buddy �動畛�c ch畛�n"
-
-#: src/gtkblist.c:2436 src/protocols/napster/napster.c:529
+msgstr "G畛�i th担ng �i畛�p �畉�n buddy �動畛�c ch畛�n"
+
+#: src/gtkblist.c:2357 src/protocols/napster/napster.c:529
 msgid "Get Info"
 msgstr "L畉�y th担ng tin"
 
-#: src/gtkblist.c:2442
+#: src/gtkblist.c:2363
 msgid "Get information on the selected buddy"
 msgstr "L畉�y th担ng tinh buddy �動畛�c ch畛�n"
 
-#: src/gtkblist.c:2445 src/protocols/oscar/oscar.c:3131
+#: src/gtkblist.c:2366 src/protocols/oscar/oscar.c:3086
 msgid "Chat"
 msgstr "Chat"
 
-#: src/gtkblist.c:2450
+#: src/gtkblist.c:2371
 msgid "Join a chat room"
 msgstr "V�o ph嘆ng Chat"
 
-#: src/gtkblist.c:2458
+#: src/gtkblist.c:2379
 msgid "Set an away message"
 msgstr "L畉�p th担ng b叩o v畉�ng m畉�t"
 
-#: src/gtkblist.c:3164 src/protocols/yahoo/yahoo.c:2164
+#: src/gtkblist.c:3085 src/protocols/yahoo/yahoo.c:2188
 msgid "Add Buddy"
 msgstr "Th棚m Buddy"
 
-#: src/gtkblist.c:3187
+#: src/gtkblist.c:3108
 msgid ""
 "Please enter the screen name of the person you would like to add to your "
 "buddy list. You may optionally enter an alias, or nickname,  for the buddy. "
 "The alias will be displayed in place of the screen name whenever possible.\n"
 msgstr ""
 "H達y nh畉�p t棚n hi畛�n th畛� c畛�a ng動畛�i m� b畉�n mu畛�n th棚m v�o danh s叩ch buddy. B畉�n c坦 "
-"th畛� nh畉�p b鱈 danh, ho畉�c bi畛�t hi畛�u cho buddy. B鱈 danh n�y s畉� hi畛�n l棚n b畉�t c畛� "
-"khi n�o c坦 th畛�.\n"
-
-#: src/gtkblist.c:3209 src/main.c:289
+"th畛� nh畉�p b鱈 danh ho畉�c bi畛�t danh cho buddy. B鱈 danh n�y s畉� hi畛�n l棚n thay cho "
+"t棚n hi畛�n th畛� b畉�t k畛� khi n�o c坦 th畛�.\n"
+
+#: src/gtkblist.c:3130 src/main.c:289
 msgid "Screen Name:"
 msgstr "T棚n Hi畛�n Th畛�:"
 
-#: src/gtkblist.c:3235 src/gtkblist.c:3552
+#: src/gtkblist.c:3156 src/gtkblist.c:3473
 msgid "Group:"
 msgstr "Nh坦m:"
 
 #. Set up stuff for the account box
-#: src/gtkblist.c:3244 src/gtkblist.c:3522
+#: src/gtkblist.c:3165 src/gtkblist.c:3443
 msgid "Account:"
 msgstr "T�i kho畉�n:"
 
-#: src/gtkblist.c:3489
+#: src/gtkblist.c:3410
 msgid "Add Chat"
 msgstr "Th棚m Chat"
 
-#: src/gtkblist.c:3512
+#: src/gtkblist.c:3433
 msgid ""
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
 msgstr ""
-"H達y nh畉�p b鱈 danh v� th担ng tin th鱈ch h畛�p cho cu畛�c Chat m� b畉�n mu畛�n th棚m danh "
-"s叩ch buddy.\n"
-
-#: src/gtkblist.c:3586
+"H達y nh畉�p b鱈 danh v� th担ng tin th鱈ch h畛�p cho cu畛�c Chat m� b畉�n mu畛�n th棚m v�o "
+"danh s叩ch buddy.\n"
+
+#: src/gtkblist.c:3507
 msgid "Add Group"
-msgstr "Th棚m Nh坦m"
-
-#: src/gtkblist.c:3586
+msgstr "Th棚m nh坦m"
+
+#: src/gtkblist.c:3507
 msgid "Add a new group"
 msgstr "Th棚m nh坦m m畛�i"
 
-#: src/gtkblist.c:3587
+#: src/gtkblist.c:3508
 msgid "Please enter the name of the group to be added."
 msgstr "H達y nh畉�p t棚n nh坦m �動畛�c th棚m v�o."
 
-#: src/gtkblist.c:4088
+#: src/gtkblist.c:4009
 msgid "No actions available"
 msgstr "Hi畛�n kh担ng c坦 h�nh �畛�ng n�o"
 
@@ -2504,29 +2489,42 @@
 
 #: src/gtkconn.c:137
 msgid "Signon: "
-msgstr "��ng nh畉�p:"
+msgstr "K畉�t n畛�i:"
 
 #: src/gtkconn.c:195
 msgid "Signon"
-msgstr "��ng nh畉�p"
+msgstr "K畉�t n畛�i"
 
 #: src/gtkconn.c:208
 msgid "Cancel All"
 msgstr "H畛�y b畛� t畉�t c畉�"
 
-#: src/gtkconn.c:388
+#: src/gtkconn.c:409
+#, c-format
+msgid ""
+"<span weight=\"bold\" size=\"larger\">%s has been disconnected.</span>\n"
+"\n"
+"%s\n"
+"%s"
+msgstr ""
+"<span weight=\"bold\" size=\"larger\">%s �達 ng畉�t k畉�t n畛�i.</span>\n"
+"\n"
+"%s\n"
+"%s"
+
+#: src/gtkconn.c:411
 msgid "Reason Unknown."
-msgstr "Kh担ng r探 l箪 do."
-
-#: src/gtkconn.c:397
+msgstr "Nguy棚n nh但n kh担ng x叩c �畛�nh."
+
+#: src/gtkconn.c:420
 msgid "Reconnect"
 msgstr "K畉�t n畛�i l畉�i"
 
-#: src/gtkconn.c:436
+#: src/gtkconn.c:459
 msgid "Account"
 msgstr "T�i kho畉�n"
 
-#: src/gtkconn.c:444
+#: src/gtkconn.c:467
 msgid "Time"
 msgstr "Th畛�i gian"
 
@@ -2536,12 +2534,12 @@
 
 #: src/gtkconv.c:186 src/gtkft.c:1034
 msgid "Would you like to overwrite it?"
-msgstr "B畉�n c坦 mu畛�n ghi �竪 l棚n n坦 kh担ng?"
+msgstr "B畉�n mu畛�n ghi �竪 l棚n n坦 kh担ng?"
 
 #: src/gtkconv.c:241
 #, c-format
 msgid "Failed to store image: %s\n"
-msgstr "L畛�i khi l動u 畉�nh: %s\n"
+msgstr "Kh担ng l動u �動畛�c 畉�nh: %s\n"
 
 #: src/gtkconv.c:311
 msgid "Gaim - Insert Image"
@@ -2578,322 +2576,314 @@
 msgid "Search term: "
 msgstr "T狸m t畛�:"
 
-#: src/gtkconv.c:1238
+#: src/gtkconv.c:1224
 msgid "Un-Ignore"
-msgstr "Kh担ng-B畛� qua"
-
-#: src/gtkconv.c:1240 src/gtkprefs.c:774
+msgstr "Kh担ng-b畛� qua"
+
+#: src/gtkconv.c:1226 src/gtkprefs.c:774
 msgid "Ignore"
 msgstr "B畛� qua"
 
 #. Info button
-#: src/gtkconv.c:1249 src/gtkconv.c:3179
+#: src/gtkconv.c:1235 src/gtkconv.c:3133
 msgid "Info"
 msgstr "Th担ng tin"
 
-#: src/gtkconv.c:1258
+#: src/gtkconv.c:1244
 msgid "Get Away Msg"
 msgstr "Nh畉�n th担ng b叩o v畉�ng m畉�t"
 
-#: src/gtkconv.c:1269 src/gtkconv.c:3162 src/gtkconv.c:4311
+#: src/gtkconv.c:1255 src/gtkconv.c:3116 src/gtkconv.c:4265
 #: src/gtkrequest.c:201
 msgid "Remove"
 msgstr "X坦a b畛�"
 
-#: src/gtkconv.c:2404
+#: src/gtkconv.c:2372
 msgid "User is typing..."
 msgstr "Ng動畛�i d湛ng �ang g探 ph鱈m..."
 
-#: src/gtkconv.c:2412
+#: src/gtkconv.c:2380
 msgid "User has typed something and paused"
 msgstr "Ng動畛�i d湛ng �達 g探 c叩i g狸 �坦 v� d畛�ng"
 
 #. Build the Send As menu
-#: src/gtkconv.c:2515
+#: src/gtkconv.c:2483
 msgid "_Send As"
-msgstr "_G畛�i theo"
-
-#: src/gtkconv.c:2937
+msgstr "_G畛�i b畉�ng"
+
+#: src/gtkconv.c:2905
 msgid "Gaim - Save Conversation"
 msgstr "Gaim - L動u cu畛�c tho畉�i"
 
 #. Conversation menu
-#: src/gtkconv.c:2954
+#: src/gtkconv.c:2922
 msgid "/_Conversation"
 msgstr "/_Cu畛�c tho畉�i"
 
-#: src/gtkconv.c:2956
+#: src/gtkconv.c:2924
 msgid "/Conversation/_Save As..."
 msgstr "/Cu畛�c tho畉�i/_L動u l�..."
 
-#: src/gtkconv.c:2958
+#: src/gtkconv.c:2926
 msgid "/Conversation/View _Log"
-msgstr "/Cu畛�c tho畉�i/Xem _B畉�n ghi"
-
-#: src/gtkconv.c:2959
+msgstr "/Cu畛�c tho畉�i/Xem _b畉�n ghi"
+
+#: src/gtkconv.c:2927
 msgid "/Conversation/Search..."
 msgstr "/Cu畛�c tho畉�i/T狸m ki畉�m..."
 
-#: src/gtkconv.c:2963
+#: src/gtkconv.c:2931
 msgid "/Conversation/Add Buddy _Pounce..."
-msgstr "/Cu畛�c tho畉�i/Th棚m Buddy _Pounce..."
-
-#: src/gtkconv.c:2965
+msgstr "/Cu畛�c tho畉�i/Th棚m th担ng b叩_o buddy..."
+
+#: src/gtkconv.c:2933
 msgid "/Conversation/A_lias..."
-msgstr "/Cu畛�c tho畉�i/_B鱈 danh..."
-
-#: src/gtkconv.c:2967
+msgstr "/Cu畛�c tho畉�i/B鱈 _danh..."
+
+#: src/gtkconv.c:2935
 msgid "/Conversation/_Get Info..."
 msgstr "/Cu畛�c tho畉�i/_L畉�y th担ng tin..."
 
-#: src/gtkconv.c:2969
+#: src/gtkconv.c:2937
 msgid "/Conversation/In_vite..."
 msgstr "/Cu畛�c tho畉�i/_M畛�i..."
 
-#: src/gtkconv.c:2972 src/gtkconv.c:2975
-msgid "/Conversation/Send _File..."
-msgstr "/Cu畛�c tho畉�i/G畛�i t畉�p t_in..."
-
-#: src/gtkconv.c:2980
+#: src/gtkconv.c:2942
 msgid "/Conversation/Insert _URL..."
 msgstr "/Cu畛�c tho畉�i/Ch竪n _URL..."
 
-#: src/gtkconv.c:2982
+#: src/gtkconv.c:2944
 msgid "/Conversation/Insert _Image..."
-msgstr "/Cu畛�c tho畉�i/Ch竪n _畉�nh..."
-
-#: src/gtkconv.c:2987
+msgstr "/Cu畛�c tho畉�i/Ch竪n 畉�n_h..."
+
+#: src/gtkconv.c:2949
 msgid "/Conversation/_Warn..."
 msgstr "/Cu畛�c tho畉�i/_C畉�nh b叩o..."
 
-#: src/gtkconv.c:2989
+#: src/gtkconv.c:2951
 msgid "/Conversation/_Block..."
-msgstr "/Cu畛�c tho畉�i/_Ch畉�n..."
-
-#: src/gtkconv.c:2991
+msgstr "/Cu畛�c tho畉�i/C_h畉�n..."
+
+#: src/gtkconv.c:2953
 msgid "/Conversation/_Add..."
 msgstr "/Cu畛�c tho畉�i/_Th棚m..."
 
-#: src/gtkconv.c:2993
+#: src/gtkconv.c:2955
 msgid "/Conversation/_Remove..."
 msgstr "/Cu畛�c tho畉�i/_X坦a b畛�..."
 
-#: src/gtkconv.c:2998
+#: src/gtkconv.c:2960
 msgid "/Conversation/_Close"
 msgstr "/Cu畛�c tho畉�i/_�坦ng"
 
 #. Options
-#: src/gtkconv.c:3002
+#: src/gtkconv.c:2964
 msgid "/_Options"
 msgstr "/T湛y _ch畛�n"
 
-#: src/gtkconv.c:3003
+#: src/gtkconv.c:2965
 msgid "/Options/Enable _Logging"
-msgstr "/T湛y ch畛�n/Cho ph辿p _��ng nh畉�p"
-
-#: src/gtkconv.c:3004
+msgstr "/T湛y ch畛�n/Cho ph辿p ��ng _nh畉�p"
+
+#: src/gtkconv.c:2966
 msgid "/Options/Enable _Sounds"
-msgstr "/T湛y ch畛�n/B畉�t _但m thanh"
-
-#: src/gtkconv.c:3005
+msgstr "/T湛y ch畛�n/B畉�t 但m th_anh"
+
+#: src/gtkconv.c:2967
 msgid "/Options/Show Formatting _Toolbar"
 msgstr "/T湛y ch畛�n/Hi畛�n th畛� thanh �畛�nh _d畉�ng"
 
-#: src/gtkconv.c:3047
+#: src/gtkconv.c:3009
 msgid "/Conversation/View Log"
 msgstr "/Cu畛�c tho畉�i/Xem b畉�n ghi"
 
-#: src/gtkconv.c:3052
+#: src/gtkconv.c:3014
 msgid "/Conversation/Add Buddy Pounce..."
-msgstr "/Cu畛�c tho畉�i/Th棚m Buddy Pounce..."
-
-#: src/gtkconv.c:3056
+msgstr "/Cu畛�c tho畉�i/Th棚m th担ng b叩o buddy..."
+
+#: src/gtkconv.c:3018
 msgid "/Conversation/Alias..."
 msgstr "/Cu畛�c tho畉�i/B鱈 danh..."
 
-#: src/gtkconv.c:3060
+#: src/gtkconv.c:3022
 msgid "/Conversation/Get Info..."
 msgstr "/Cu畛�c tho畉�i/L畉�y th担ng tin..."
 
-#: src/gtkconv.c:3064
+#: src/gtkconv.c:3026
 msgid "/Conversation/Invite..."
 msgstr "/Cu畛�c tho畉�i/M畛�i..."
 
-#: src/gtkconv.c:3068 src/gtkconv.c:3072
-msgid "/Conversation/Send File..."
-msgstr "/Cu畛�c tho畉�i/G畛�i t畉�p tin..."
-
-#: src/gtkconv.c:3078
+#: src/gtkconv.c:3032
 msgid "/Conversation/Insert URL..."
 msgstr "/H畛�i tho畉�i/Ch竪n URL..."
 
-#: src/gtkconv.c:3082
+#: src/gtkconv.c:3036
 msgid "/Conversation/Insert Image..."
 msgstr "/H畛�i tho畉�i/Ch竪n 畉�nh..."
 
-#: src/gtkconv.c:3088
+#: src/gtkconv.c:3042
 msgid "/Conversation/Warn..."
 msgstr "/Cu畛�c tho畉�i/C畉�nh b叩o..."
 
-#: src/gtkconv.c:3092
+#: src/gtkconv.c:3046
 msgid "/Conversation/Block..."
 msgstr "/Cu畛�c tho畉�i/Ch畉�n..."
 
-#: src/gtkconv.c:3096
+#: src/gtkconv.c:3050
 msgid "/Conversation/Add..."
 msgstr "/Cu畛�c tho畉�i/Th棚m..."
 
-#: src/gtkconv.c:3100
+#: src/gtkconv.c:3054
 msgid "/Conversation/Remove..."
 msgstr "/Cu畛�c tho畉�i/X坦a b畛�..."
 
-#: src/gtkconv.c:3106
+#: src/gtkconv.c:3060
 msgid "/Options/Enable Logging"
 msgstr "/T湛y ch畛�n/Cho ph辿p ��ng nh畉�p"
 
-#: src/gtkconv.c:3109
+#: src/gtkconv.c:3063
 msgid "/Options/Enable Sounds"
 msgstr "/T湛y ch畛�n/B畉�t 但m thanh"
 
-#: src/gtkconv.c:3112
+#: src/gtkconv.c:3066
 msgid "/Options/Show Formatting Toolbar"
 msgstr "/T湛y ch畛�n/Hi畛�n th畛� thanh �畛�nh d畉�ng"
 
 #. From right to left...
 #. Send button
-#: src/gtkconv.c:3136 src/gtkconv.c:3138 src/gtkconv.c:3236 src/gtkconv.c:3238
-#: src/gtkconv.c:6021
+#: src/gtkconv.c:3090 src/gtkconv.c:3092 src/gtkconv.c:3190 src/gtkconv.c:3192
+#: src/gtkconv.c:5975
 msgid "Send"
-msgstr "�達 g畛�i"
-
-#: src/gtkconv.c:3159 src/gtkconv.c:4329
+msgstr "G畛�i"
+
+#: src/gtkconv.c:3113 src/gtkconv.c:4283
 msgid "Add the user to your buddy list"
 msgstr "Th棚m ng動畛�i d湛ng v�o danh s叩ch buddy"
 
-#: src/gtkconv.c:3165 src/gtkconv.c:4314
+#: src/gtkconv.c:3119 src/gtkconv.c:4268
 msgid "Remove the user from your buddy list"
-msgstr "X坦a ng動畛�i d湛ng ra kh畛�i danh s叩ch buddy"
+msgstr "X坦a ng動畛�i d湛ng kh畛�i danh s叩ch buddy"
 
 #. Warn button
-#: src/gtkconv.c:3172
+#: src/gtkconv.c:3126
 msgid "Warn"
 msgstr "C畉�nh b叩o"
 
-#: src/gtkconv.c:3176
+#: src/gtkconv.c:3130
 msgid "Warn the user"
 msgstr "C畉�nh b叩o ng動畛�i d湛ng"
 
-#: src/gtkconv.c:3183 src/gtkconv.c:3621
+#: src/gtkconv.c:3137 src/gtkconv.c:3575
 msgid "Get the user's information"
 msgstr "L畉�y th担ng tin ng動畛�i d湛ng"
 
 #. Block button
-#: src/gtkconv.c:3186 src/gtkprivacy.c:605 src/gtkprivacy.c:616
+#: src/gtkconv.c:3140 src/gtkprivacy.c:605 src/gtkprivacy.c:616
 msgid "Block"
 msgstr "Ch畉�n"
 
-#: src/gtkconv.c:3190
+#: src/gtkconv.c:3144
 msgid "Block the user"
 msgstr "Ch畉�n ng動畛�i d湛ng"
 
 #. Invite
-#: src/gtkconv.c:3248 src/gtkconv.c:6024
+#: src/gtkconv.c:3202 src/gtkconv.c:5978
 msgid "Invite"
 msgstr "M畛�i"
 
-#: src/gtkconv.c:3251
+#: src/gtkconv.c:3205
 msgid "Invite a user"
 msgstr "M畛�i ng動畛�i d湛ng"
 
-#: src/gtkconv.c:3290
+#: src/gtkconv.c:3244
 msgid "Bold"
 msgstr "�畉�m"
 
-#: src/gtkconv.c:3301
+#: src/gtkconv.c:3255
 msgid "Italic"
 msgstr "Nghi棚ng"
 
-#: src/gtkconv.c:3312
+#: src/gtkconv.c:3266
 msgid "Underline"
 msgstr "G畉�ch ch但n"
 
-#: src/gtkconv.c:3328
+#: src/gtkconv.c:3282
 msgid "Larger font size"
-msgstr "C畛� ch畛� l畛�n h董n"
-
-#: src/gtkconv.c:3340
+msgstr "Ch畛� l畛�n h董n"
+
+#: src/gtkconv.c:3294
 msgid "Normal font size"
-msgstr "C畛� ch畛� b狸nh th動畛�ng"
-
-#: src/gtkconv.c:3352
+msgstr "Ch畛� b狸nh th動畛�ng"
+
+#: src/gtkconv.c:3306
 msgid "Smaller font size"
-msgstr "C畛� ch畛� nh畛� h董n"
-
-#: src/gtkconv.c:3369
+msgstr "Ch畛� nh畛� h董n"
+
+#: src/gtkconv.c:3323
 msgid "Font Face"
 msgstr "M畉�t ch畛�"
 
-#: src/gtkconv.c:3381
+#: src/gtkconv.c:3335
 msgid "Foreground font color"
 msgstr "M�u ch畛�"
 
-#: src/gtkconv.c:3393
+#: src/gtkconv.c:3347
 msgid "Background color"
 msgstr "M�u n畛�n"
 
-#: src/gtkconv.c:3408
+#: src/gtkconv.c:3362
 msgid "Insert image"
 msgstr "Ch竪n 畉�nh"
 
-#: src/gtkconv.c:3419
+#: src/gtkconv.c:3373
 msgid "Insert link"
 msgstr "Ch竪n li棚n k畉�t"
 
-#: src/gtkconv.c:3430
+#: src/gtkconv.c:3384
 msgid "Insert smiley"
 msgstr "Ch竪n bi畛�u t動畛�ng"
 
-#: src/gtkconv.c:3490
+#: src/gtkconv.c:3444
 msgid "Topic:"
 msgstr "Ch畛� �畛�:"
 
 #. Setup the label telling how many people are in the room.
-#: src/gtkconv.c:3541
+#: src/gtkconv.c:3495
 msgid "0 people in room"
-msgstr "0 ng動董狸 trong ph嘆ng"
-
-#: src/gtkconv.c:3598
+msgstr "0 ng動畛�i trong ph嘆ng"
+
+#: src/gtkconv.c:3552
 msgid "IM the user"
-msgstr "IM ng動畛�i d湛ng"
-
-#: src/gtkconv.c:3610
+msgstr "Nh畉�n tin nhanh ng動畛�i d湛ng"
+
+#: src/gtkconv.c:3564
 msgid "Ignore the user"
 msgstr "B畛� qua ng動畛�i d湛ng"
 
-#: src/gtkconv.c:4127
+#: src/gtkconv.c:4081
 msgid "Close conversation"
 msgstr "�坦ng cu畛�c tho畉�i"
 
-#: src/gtkconv.c:4714 src/gtkconv.c:4746 src/gtkconv.c:4867 src/gtkconv.c:4934
+#: src/gtkconv.c:4668 src/gtkconv.c:4700 src/gtkconv.c:4821 src/gtkconv.c:4888
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "%d ng動畛�i trong ph嘆ng"
-msgstr[1] "%d ng動董狸 trong ph嘆ng"
-
-#: src/gtkconv.c:5268
+msgstr[1] "%d ng動畛�i trong ph嘆ng"
+
+#: src/gtkconv.c:5222
 msgid "Animate"
 msgstr "Ho畉�t c畉�nh"
 
-#: src/gtkconv.c:5273
+#: src/gtkconv.c:5227
 msgid "Hide Icon"
 msgstr "畉�n bi畛�u t動畛�ng"
 
-#: src/gtkconv.c:5279
+#: src/gtkconv.c:5233
 msgid "Save Icon As..."
 msgstr "L動u bi畛�u t動畛�ng l�..."
 
-#: src/gtkconv.c:5758 src/gtkconv.c:5761
+#: src/gtkconv.c:5712 src/gtkconv.c:5715
 msgid "<main>/Conversation/Close"
 msgstr "<main>/Cu畛�c tho畉�i/�坦ng"
 
@@ -2903,7 +2893,7 @@
 
 #: src/gtkdebug.c:173
 msgid "Pause"
-msgstr "T畉�m D畛�ng"
+msgstr "T畉�m d畛�ng"
 
 #: src/gtkdebug.c:179
 msgid "Timestamps"
@@ -2916,11 +2906,11 @@
 
 #: src/gtkft.c:200
 msgid "<b>Receiving From:</b>"
-msgstr "<b>�ang nh畉�n t畛�:</b>"
+msgstr "<b>Nh畉�n t畛�:</b>"
 
 #: src/gtkft.c:203
 msgid "<b>Sending To:</b>"
-msgstr "<b>�ang g畛�i �畉�n:</b>"
+msgstr "<b>G畛�i �畉�n:</b>"
 
 #: src/gtkft.c:436
 msgid "Progress"
@@ -2932,7 +2922,7 @@
 
 #: src/gtkft.c:450
 msgid "Size"
-msgstr "K鱈ch th動畛�c"
+msgstr "C畛�"
 
 #: src/gtkft.c:457
 msgid "Remaining"
@@ -2978,12 +2968,12 @@
 #. Pause button
 #: src/gtkft.c:650 src/stock.c:86
 msgid "_Pause"
-msgstr "T畉�m _D畛�ng"
+msgstr "T畉�m _d畛�ng"
 
 #. Resume button
 #: src/gtkft.c:660
 msgid "_Resume"
-msgstr "_Ti畉�p t畛�c"
+msgstr "Ti畉�p t畛�_c"
 
 #: src/gtkft.c:1011
 msgid "That file does not exist."
@@ -2991,7 +2981,7 @@
 
 #: src/gtkft.c:1020
 msgid "Cannot send a file of 0 bytes."
-msgstr "Kh担ng th畛� g畛�i t畉�p tin v畛�i 0 byte."
+msgstr "Kh担ng th畛� g畛�i t畉�p tin c坦 0 byte."
 
 #: src/gtkft.c:1033
 msgid "That file already exists."
@@ -3008,7 +2998,7 @@
 #: src/gtkft.c:1107
 #, c-format
 msgid "%s wants to send you %s (%s)"
-msgstr "%s mu畛�n g畛�i cho b畉�n %s (%s)"
+msgstr "%s mu畛�n g畛�i cho b畉�n %s (%s)"
 
 #: src/gtkimhtml.c:614
 msgid "_Copy E-Mail Address"
@@ -3026,7 +3016,7 @@
 msgid ""
 "Unable to guess the image type based on the file extension supplied.  "
 "Defaulting to PNG."
-msgstr "Kh担ng �o叩n �動畛�c lo畉�i 畉�nh b畉�ng t棚n m畛�i r畛�ng �動畛�c cung c畉�p. M畉�c �畛�nh l� PNG."
+msgstr "Kh担ng �o叩n �動畛�c lo畉�i 畉�nh b畉�ng t棚n m畛�i r畛�ng. M畉�c �畛�nh l� PNG."
 
 #: src/gtkimhtml.c:1752
 #, c-format
@@ -3041,7 +3031,7 @@
 msgid "_Save Image..."
 msgstr "_L動u 畉�nh"
 
-#: src/gtklog.c:244
+#: src/gtklog.c:256
 msgid "Conversations with"
 msgstr "C叩c cu畛�c tho畉�i v畛�i"
 
@@ -3052,17 +3042,17 @@
 msgstr[0] "%s c坦 %d th担ng �i畛�p m畛�i."
 msgstr[1] "%s c坦 %d th担ng �i畛�p m畛�i."
 
-#: src/gtknotify.c:219
+#: src/gtknotify.c:220
 #, c-format
 msgid "<span weight=\"bold\">From:</span> %s\n"
 msgstr "<span weight=\"bold\">T畛�:</span> %s\n"
 
-#: src/gtknotify.c:224
+#: src/gtknotify.c:227
 #, c-format
 msgid "<span weight=\"bold\">Subject:</span> %s\n"
 msgstr "<span weight=\"bold\">Ch畛� �畛�:</span> %s\n"
 
-#: src/gtknotify.c:228
+#: src/gtknotify.c:232
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
@@ -3073,7 +3063,7 @@
 "\n"
 "%s%s%s%s"
 
-#: src/gtknotify.c:243
+#: src/gtknotify.c:247
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
@@ -3084,20 +3074,22 @@
 "\n"
 "%s"
 
-#: src/gtknotify.c:428 src/gtknotify.c:448 src/gtknotify.c:456
+#: src/gtknotify.c:432 src/gtknotify.c:452 src/gtknotify.c:460
 msgid "Unable to open URL"
 msgstr "Kh担ng th畛� m畛� URL"
 
-#: src/gtknotify.c:429
-msgid "The 'Manual' browser command has been chosen, but no command has been set."
-msgstr "Ph畉�n l畛�nh ch畉�y tr狸nh duy畛�t 'T畛� ch畛�n' �動畛�c ch畛�n, nh動ng kh担ng cho l畛�nh n�o."
-
-#: src/gtknotify.c:446
+#: src/gtknotify.c:433
+msgid ""
+"The 'Manual' browser command has been chosen, but no command has been set."
+msgstr ""
+"�達 ch畛�n l畛�nh ch畉�y tr狸nh duy畛�t 'T畛� ch畛�n', nh動ng kh担ng cung c畉�p l畛�nh n�o."
+
+#: src/gtknotify.c:450
 #, c-format
 msgid "The browser \"%s\" is invalid."
 msgstr "Tr狸nh duy畛�t \"%s\" kh担ng h畛�p l畛�."
 
-#: src/gtknotify.c:453
+#: src/gtknotify.c:457
 #, c-format
 msgid "Error launching \"command\": %s"
 msgstr "L畛�i ch畉�y \"l畛�nh\" : %s"
@@ -3108,34 +3100,34 @@
 
 #: src/gtkpounce.c:189
 msgid "Please enter a buddy to pounce."
-msgstr "H達y nh畉�p m畛�t buddy �畛� pounce."
+msgstr "H達y nh畉�p m畛�t buddy �畛� th担ng b叩o."
 
 #. "New Buddy Pounce"
 #: src/gtkpounce.c:333 src/gtkpounce.c:738
 msgid "New Buddy Pounce"
-msgstr "Buddy Pounce m畛�i"
+msgstr "Th担ng b叩o buddy m畛�i"
 
 #: src/gtkpounce.c:333
 msgid "Edit Buddy Pounce"
-msgstr "Hi畛�u ch畛�nh Buddy Pounce"
+msgstr "Bi棚n so畉�n th担ng b叩o buddy"
 
 #. Create the "Pounce Who" frame.
 #: src/gtkpounce.c:351
 msgid "Pounce Who"
-msgstr "Pounce Who"
+msgstr "Th担ng b叩o cho ai"
 
 #: src/gtkpounce.c:377
 msgid "_Buddy Name:"
-msgstr "T棚n _Buddy:"
+msgstr "T棚n _buddy:"
 
 #. Create the "Pounce When" frame.
 #: src/gtkpounce.c:399
 msgid "Pounce When"
-msgstr "Pounce Khi N�o"
+msgstr "Th担ng b叩o khi n�o"
 
 #: src/gtkpounce.c:407 src/main.c:339
 msgid "Sign on"
-msgstr "��ng nh畉�p"
+msgstr "K畉�t n畛�i"
 
 #: src/gtkpounce.c:409
 msgid "Sign off"
@@ -3143,10 +3135,10 @@
 
 #: src/gtkpounce.c:413
 msgid "Return from away"
-msgstr "Th担i kh担ng v畉�ng m畉�t"
+msgstr "C坦 m畉�t tr畛� l畉�i"
 
 #: src/gtkpounce.c:415 src/gtkprefs.c:1492 src/protocols/msn/state.c:30
-#: src/protocols/yahoo/yahoo.c:2028
+#: src/protocols/yahoo/yahoo.c:2052
 msgid "Idle"
 msgstr "Ngh畛�"
 
@@ -3165,11 +3157,11 @@
 #. Create the "Pounce Action" frame.
 #: src/gtkpounce.c:450
 msgid "Pounce Action"
-msgstr "H�nh �畛�ng Pounce"
+msgstr "Vi畛�c th担ng b叩o"
 
 #: src/gtkpounce.c:457
 msgid "Open an IM window"
-msgstr "M畛� c畛�a s畛� IM"
+msgstr "M畛� c畛�a s畛� Nh畉�n Tin Nhanh"
 
 #: src/gtkpounce.c:458
 msgid "Popup notification"
@@ -3177,7 +3169,7 @@
 
 #: src/gtkpounce.c:459
 msgid "Send a message"
-msgstr "G畛�i th担ng �i畛�p"
+msgstr "G畛�i th担ng �i畛�p"
 
 #: src/gtkpounce.c:460
 msgid "Execute a command"
@@ -3197,12 +3189,12 @@
 
 #: src/gtkpounce.c:551
 msgid "_Save this pounce after activation"
-msgstr "_L動u pounce n�y sau khi k鱈ch ho畉�t"
+msgstr "_L動u th担ng b叩o n�y sau khi k鱈ch ho畉�t"
 
 #. "Remove Buddy Pounce"
 #: src/gtkpounce.c:745
 msgid "Remove Buddy Pounce"
-msgstr "B畛�  Buddy Pounce"
+msgstr "B畛� th担ng b叩o buddy"
 
 #: src/gtkpounce.c:786
 #, c-format
@@ -3222,7 +3214,7 @@
 #: src/gtkpounce.c:789
 #, c-format
 msgid "%s has returned from being away"
-msgstr "%s c坦 m畉�t tr畛� l畉�i"
+msgstr "%s �達 c坦 m畉�t tr畛� l畉�i"
 
 #: src/gtkpounce.c:790
 #, c-format
@@ -3241,7 +3233,7 @@
 
 #: src/gtkpounce.c:794
 msgid "Unknown pounce event. Please report this!"
-msgstr "S畛� ki畛�n pounce kh担ng x叩c �畛�nh. H達y th担ng b叩o n坦!"
+msgstr "S畛� ki畛�n th担ng b叩o kh担ng x叩c �畛�nh. H達y ghi b叩o c叩o vi畛�c n�y!"
 
 #: src/gtkprefs.c:373
 msgid "Interface Options"
@@ -3249,7 +3241,7 @@
 
 #: src/gtkprefs.c:375
 msgid "D_isplay remote nicknames if no alias is set"
-msgstr "Hi畛�n _th畛� nickname 畛� xa n畉�u b鱈 danh kh担ng c坦"
+msgstr "Hi畛�n _th畛� bi畛�t danh (nick) 畛� xa n畉�u kh担ng �畉�t b鱈 danh (alias)"
 
 #: src/gtkprefs.c:561
 msgid ""
@@ -3285,23 +3277,23 @@
 
 #: src/gtkprefs.c:678
 msgid "Face"
-msgstr "V畉� m畉�t"
+msgstr "M畉�t ch畛�"
 
 #: src/gtkprefs.c:681
 msgid "Use custo_m face"
-msgstr "D湛ng v畉� m畉�t t_湛y ch畛�n"
+msgstr "D湛ng m畉�t ch畛� t湛_y ch畛�n"
 
 #: src/gtkprefs.c:698
 msgid "Use custom si_ze"
-msgstr "D湛ng c_畛� t湛y ch畛�n"
+msgstr "D湛ng _c畛� ch畛� t湛y ch畛�n"
 
 #: src/gtkprefs.c:711
 msgid "Color"
-msgstr "M�u"
+msgstr "M�u ch畛�"
 
 #: src/gtkprefs.c:715
 msgid "_Text color"
-msgstr "M�u _ch畛�"
+msgstr "M�_u ch畛�"
 
 #: src/gtkprefs.c:734
 msgid "Bac_kground color"
@@ -3317,7 +3309,7 @@
 
 #: src/gtkprefs.c:765
 msgid "Show _timestamp on messages"
-msgstr "Hi畛�n nh達n th畛�i gian tr棚n th担ng �i畛�p"
+msgstr "Hi畛�n th畛� nh達n _th畛�i gian tr棚n th担ng �i畛�p"
 
 #: src/gtkprefs.c:767
 msgid "Show _URLs as links"
@@ -3325,11 +3317,11 @@
 
 #: src/gtkprefs.c:771
 msgid "_Highlight misspelled words"
-msgstr "_�叩nh d畉�u t畛� sai ch鱈nh t畉�"
+msgstr "�叩nh _d畉�u t畛� sai ch鱈nh t畉�"
 
 #: src/gtkprefs.c:775
 msgid "Ignore c_olors"
-msgstr "B畛� qua _m�u"
+msgstr "B畛� qua m�_u"
 
 #: src/gtkprefs.c:777
 msgid "Ignore font _faces"
@@ -3349,11 +3341,11 @@
 
 #: src/gtkprefs.c:795
 msgid "C_ontrol-Enter sends message"
-msgstr "Nh畉�n C_ontrol-Enter g畛�i th担ng �i畛�p"
+msgstr "Nh畉�n C_ontrol-Enter �畛� g畛�i th担ng �i畛�p"
 
 #: src/gtkprefs.c:798
 msgid "Window Closing"
-msgstr "Vi畛�c �坦ng C畛�a s畛�"
+msgstr "�坦ng c畛�a s畛�"
 
 #: src/gtkprefs.c:799
 msgid "_Escape closes window"
@@ -3381,11 +3373,11 @@
 
 #: src/gtkprefs.c:835
 msgid "Buddy List Toolbar"
-msgstr "Thanh c担ng c畛� Danh s叩ch Buddy"
+msgstr "Thanh c担ng c畛� danh s叩ch buddy"
 
 #: src/gtkprefs.c:836 src/gtkprefs.c:962 src/gtkprefs.c:1018
 msgid "Show _buttons as:"
-msgstr "Ki畛�u hi畛�n th畛� _n炭t nh畉�n:"
+msgstr "Hi畛�n th畛� _n炭t theo:"
 
 #: src/gtkprefs.c:838 src/gtkprefs.c:964 src/gtkprefs.c:1020
 msgid "Pictures"
@@ -3413,15 +3405,15 @@
 
 #: src/gtkprefs.c:852
 msgid "Buddy Display"
-msgstr "Hi畛�n Th畛� Buddy"
+msgstr "Hi畛�n th畛� buddy"
 
 #: src/gtkprefs.c:853 src/gtkprefs.c:987
 msgid "Show buddy _icons"
-msgstr "Hi畛�n _bi畛�u t動畛�ng buddy"
+msgstr "Hi畛�n th畛� _bi畛�u t動畛�ng buddy"
 
 #: src/gtkprefs.c:855
 msgid "Show _warning levels"
-msgstr "Hi畛�n c叩c m畛�c _c畉�nh b叩o"
+msgstr "Hi畛�n th畛� m畛�c _c畉�nh b叩o"
 
 #: src/gtkprefs.c:857
 msgid "Show idle _times"
@@ -3429,7 +3421,7 @@
 
 #: src/gtkprefs.c:859
 msgid "Dim i_dle buddies"
-msgstr "畉�n Buddy ngh_畛�"
+msgstr "Kh担ng hi畛�n th畛� buddy _ngh畛�"
 
 #: src/gtkprefs.c:884
 msgid "_Placement:"
@@ -3437,15 +3429,15 @@
 
 #: src/gtkprefs.c:891
 msgid "Send _URLs as Links"
-msgstr "G畛�i _URL theo ki畛�u Li棚n k畉�t"
+msgstr "G畛�i _URL theo d畉�ng li棚n k畉�t"
 
 #: src/gtkprefs.c:894
 msgid "Show Formatting Toolbar"
-msgstr "Hi畛�n thanh �畛�nh d畉�ng"
+msgstr "Hi畛�n th畛� thanh �畛�nh d畉�ng"
 
 #: src/gtkprefs.c:897
 msgid "Tab Options"
-msgstr "T湛y Ch畛�n Tab"
+msgstr "T湛y ch畛�n Tab"
 
 #: src/gtkprefs.c:899
 msgid "_Tab Placement:"
@@ -3469,19 +3461,19 @@
 
 #: src/gtkprefs.c:910
 msgid "Show IMs and chats in _tabbed windows"
-msgstr "Hi畛�n th畛� IM v� Chat trong c畛�a s畛� c坦 d畉�ng _tab"
+msgstr "Hi畛�n th畛� Tin Nh畉�n Nhanh v� Chat trong c畛�a s畛� c坦 d畉�ng _tab"
 
 #: src/gtkprefs.c:913
 msgid "Show IMs and chats in _same tabbed window"
-msgstr "Hi畛�n th畛� IM v� Chat trong c湛ng c畛�a s畛� tab"
+msgstr "Hi畛�n th畛� Tin Nh畉�n Nhanh v� Chat trong c湛ng c畛�a s畛� tab"
 
 #: src/gtkprefs.c:923
 msgid "Show _close button on tabs"
-msgstr "Hi畛�n n炭t _�坦ng tr棚n tab"
+msgstr "Hi畛�n th畛� n炭t �坦n_g tr棚n tab"
 
 #: src/gtkprefs.c:934
 msgid "Show status _icons on tabs"
-msgstr "Hi畛�n _bi畛�u t動畛�ng tr畉�ng th叩i tr棚n tab"
+msgstr "Hi畛�n th畛� bi畛�_u t動畛�ng tr畉�ng th叩i tr棚n tab"
 
 #: src/gtkprefs.c:961 src/gtkprefs.c:1017
 msgid "Window"
@@ -3505,23 +3497,23 @@
 
 #: src/gtkprefs.c:986
 msgid "Buddy Icons"
-msgstr "Bi畛�u t動畛�ng Buddy"
+msgstr "Bi畛�u t動畛�ng buddy"
 
 #: src/gtkprefs.c:989
 msgid "Enable buddy icon a_nimation"
-msgstr "Th畛� hi畛�n bi畛�u t動畛�ng buddy _�畛�ng"
+msgstr "Cho ph辿p _ho畉�t c畉�nh bi畛�u t動畛�ng buddy"
 
 #: src/gtkprefs.c:993
 msgid "Show _logins in window"
-msgstr "Hi畛�n th畛� _��ng nh畉�p trong c畛�a s畛�"
+msgstr "Hi畛�n th畛� ��ng nh畉�_p trong c畛�a s畛�"
 
 #: src/gtkprefs.c:995
 msgid "Show a_liases in tabs/titles"
-msgstr "Hi畛�n th畛� _b鱈 danh trong tab/ti棚u �畛�"
+msgstr "Hi畛�n th畛� b鱈 _danh trong tab/ti棚u �畛�"
 
 #: src/gtkprefs.c:998
 msgid "Typing Notification"
-msgstr "Th担ng b叩o G探 ph鱈m"
+msgstr "Th担ng b叩o g探 ph鱈m"
 
 #: src/gtkprefs.c:999
 msgid "Notify buddies that you are _typing to them"
@@ -3533,7 +3525,7 @@
 
 #: src/gtkprefs.c:1040
 msgid "_Tab-complete nicks"
-msgstr "Ho�n ch畛�nh b鱈 danh d湛ng _tab"
+msgstr "Bi畛�t danh d湛ng t_ab ho�n ch畛�nh"
 
 #: src/gtkprefs.c:1042
 msgid "_Old-style tab completion"
@@ -3545,7 +3537,7 @@
 
 #: src/gtkprefs.c:1048
 msgid "_Show people leaving in window"
-msgstr "_Hi畛�n th畛� ng動畛�i r畛�i b畛� trong c畛�a s畛�"
+msgstr "_Hi畛�n th畛� ng動畛�i r畛�i ph嘆ng trong c畛�a s畛�"
 
 #: src/gtkprefs.c:1050
 msgid "Co_lorize screennames"
@@ -3568,7 +3560,7 @@
 msgstr "_M叩y ch畛�"
 
 #: src/gtkprefs.c:1142 src/protocols/irc/irc.c:553
-#: src/protocols/jabber/jabber.c:1154 src/protocols/msn/msn.c:1656
+#: src/protocols/jabber/jabber.c:1155 src/protocols/msn/msn.c:1660
 #: src/protocols/napster/napster.c:642 src/protocols/trepia/trepia.c:1345
 msgid "Port"
 msgstr "C畛�ng"
@@ -3603,15 +3595,15 @@
 
 #: src/gtkprefs.c:1227
 msgid "Manual"
-msgstr "T畛� l�m"
+msgstr "T畛� ch畛� �畛�nh"
 
 #: src/gtkprefs.c:1268
 msgid "Browser Selection"
-msgstr "L畛�a ch畛�n tr狸nh duy畛�t"
+msgstr "Ch畛�n d湛ng tr狸nh duy畛�t"
 
 #: src/gtkprefs.c:1272
 msgid "_Browser:"
-msgstr "_Tr狸nh duy畛�t:"
+msgstr "Tr狸nh _duy畛�t:"
 
 #: src/gtkprefs.c:1282
 #, c-format
@@ -3619,16 +3611,16 @@
 "_Manual:\n"
 "(%s for URL)"
 msgstr ""
-"_T畛� l�m:\n"
+"_T畛� ch畛� �畛�nh:\n"
 "(%s cho URL)"
 
 #: src/gtkprefs.c:1303
 msgid "Browser Options"
-msgstr "T湛y ch畛�n c畛�a tr狸nh duy畛�t"
+msgstr "T湛y ch畛�n cho tr狸nh duy畛�t"
 
 #: src/gtkprefs.c:1304
 msgid "Open new _window by default"
-msgstr "M畛� c_畛�a s畛� m畛�i theo m畉�c �畛�nh"
+msgstr "M畛� c畛�a _s畛� m畛�i theo m畉�c �畛�nh"
 
 #: src/gtkprefs.c:1320
 msgid "Message Logs"
@@ -3640,11 +3632,11 @@
 
 #: src/gtkprefs.c:1327
 msgid "_Log all instant messages"
-msgstr "_T畉�o b畉�n ghi m畛�i IM"
+msgstr "_Ghi l畉�i m畛�i th担ng �i畛�p"
 
 #: src/gtkprefs.c:1329
 msgid "Log all c_hats"
-msgstr "T畉�o b畉�n ghi m畛�i c_hat"
+msgstr "Ghi l畉�i m畛�i cu畛�c c_hat"
 
 #: src/gtkprefs.c:1384
 msgid "Sound Options"
@@ -3656,7 +3648,7 @@
 
 #: src/gtkprefs.c:1387
 msgid "_Sounds while away"
-msgstr "Ph叩t t_i畉�ng khi v畉�ng m畉�t"
+msgstr "_Ph叩t ti畉�ng khi v畉�ng m畉�t"
 
 #: src/gtkprefs.c:1391
 msgid "Sound Method"
@@ -3664,7 +3656,7 @@
 
 #: src/gtkprefs.c:1392
 msgid "_Method:"
-msgstr "_C叩ch ph叩t:"
+msgstr "C叩_ch ph叩t:"
 
 #: src/gtkprefs.c:1394
 msgid "Console beep"
@@ -3693,7 +3685,7 @@
 
 #: src/gtkprefs.c:1470
 msgid "_Queue new messages when away"
-msgstr "_X畉�p h�ng th担ng �i畛�p m畛�i khi v畉�ng m畉�t"
+msgstr "_X畉�p h�ng th担ng �i畛�p m畛�i khi v畉�ng m畉�t"
 
 #: src/gtkprefs.c:1473
 msgid "Auto-response"
@@ -3701,7 +3693,7 @@
 
 #: src/gtkprefs.c:1476
 msgid "Seconds before _resending:"
-msgstr "Th畛�i gian theo gi但y tr動畛�c khi _g畛�i l畉�i:"
+msgstr "Th畛�i gian theo gi但y tr動畛�c khi g畛�i _l畉�i:"
 
 #: src/gtkprefs.c:1479
 msgid "_Send auto-response"
@@ -3709,11 +3701,11 @@
 
 #: src/gtkprefs.c:1481
 msgid "_Only send auto-response when idle"
-msgstr "_Ch畛� tr畉� l畛�i t畛� �畛�ng khi r董i v�o tr畉�ng th叩i ngh畛�"
+msgstr "_Ch畛� tr畉� l畛�i t畛� �畛�ng khi chuy畛�n sang tr畉�ng th叩i ngh畛�"
 
 #: src/gtkprefs.c:1483
 msgid "Send auto-response in _active conversations"
-msgstr "G畛�i tr畉� l畛�i t畛� �畛�ng trong cu畛�c tho畉�i ho畉�t _�畛�ng"
+msgstr "G畛�i tr畉� l畛�i t畛� �畛�ng trong cu畛�c tho畉�i h_o畉�t �畛�ng"
 
 #: src/gtkprefs.c:1493
 msgid "Idle _time reporting:"
@@ -3733,7 +3725,7 @@
 
 #: src/gtkprefs.c:1509
 msgid "Auto-away"
-msgstr "T畛� �畛�ng b叩o v畉�ng m畉�t"
+msgstr "T畛� �畛�ng b叩o tr畉�ng th叩i"
 
 #: src/gtkprefs.c:1510
 msgid "Set away _when idle"
@@ -3741,11 +3733,11 @@
 
 #: src/gtkprefs.c:1512
 msgid "_Minutes before setting away:"
-msgstr "S畛� _ph炭t tr動畛�c khi b叩o tr畉�ng th叩i v畉�ng m畉�t:"
+msgstr "S畛� _ph炭t tr動畛�c khi b叩o tr畉�ng th叩i:"
 
 #: src/gtkprefs.c:1519
 msgid "Away m_essage:"
-msgstr "Th担ng _b叩o v畉�ng m畉�t:"
+msgstr "Th担ng _b叩o tr畉�ng th叩i:"
 
 #: src/gtkprefs.c:1581
 #, c-format
@@ -3781,8 +3773,8 @@
 msgid "Load"
 msgstr "N畉�p"
 
-#: src/gtkprefs.c:1774 src/protocols/jabber/jabber.c:581
-#: src/protocols/msn/msn.c:1344 src/protocols/trepia/trepia.c:401
+#: src/gtkprefs.c:1774 src/protocols/jabber/jabber.c:582
+#: src/protocols/msn/msn.c:1348 src/protocols/trepia/trepia.c:401
 msgid "Name"
 msgstr "T棚n"
 
@@ -3836,7 +3828,7 @@
 
 #: src/gtkprefs.c:2266
 msgid "IMs"
-msgstr "IM"
+msgstr "Tin nh畉�n nhanh"
 
 #: src/gtkprefs.c:2268
 msgid "Proxy"
@@ -3865,11 +3857,11 @@
 
 #: src/gtkprefs.c:2277
 msgid "Away Messages"
-msgstr "Th担ng b叩o v畉�ng m畉�t"
+msgstr "Th担ng b叩o tr畉�ng th叩i"
 
 #: src/gtkprefs.c:2280
 msgid "Plugins"
-msgstr "Plugins"
+msgstr "Plugin"
 
 #: src/gtkprivacy.c:86
 msgid "Allow all users to contact me"
@@ -3897,7 +3889,7 @@
 
 #: src/gtkprivacy.c:383
 msgid "Changes to privacy settings take effect immediately."
-msgstr "Thay �畛�i thi畉�t l畉�p t鱈nh ri棚ng t動 �畛� c坦 t叩c d畛�ng ngay."
+msgstr "Thay �畛�i thi畉�t l畉�p t鱈nh ri棚ng t動 c坦 t叩c d畛�ng ngay."
 
 #. "Set privacy for:" label
 #: src/gtkprivacy.c:395
@@ -3923,7 +3915,7 @@
 #: src/gtkprivacy.c:572
 #, c-format
 msgid "Allow %s to contact you?"
-msgstr "Cho ph辿p %s li棚n l畉�c v畛�i b畉�n kh担ng?"
+msgstr "C坦 cho ph辿p %s li棚n l畉�c v畛�i b畉�n kh担ng?"
 
 #: src/gtkprivacy.c:574
 #, c-format
@@ -4017,8 +4009,8 @@
 "Unable to play sound because the 'Command' sound method has been chosen, but "
 "no command has been set."
 msgstr ""
-"Kh担ng th畛� ph叩t 但m thanh v狸 c叩ch ph叩t 但m thanh theo 'L畛�nh' �達 �動畛�c ch畛�n, "
-"nh動ng kh担ng c坦 l畛�nh n�o �動畛�c thi畉�t l畉�p."
+"Kh担ng th畛� ph叩t 但m thanh v狸 c叩ch ph叩t 但m thanh theo 'L畛�nh' �達 �動畛�c ch畛�n nh動ng "
+"ch動a cung c畉�p l畛�nh n�o."
 
 #: src/gtksound.c:184
 #, c-format
@@ -4046,16 +4038,19 @@
 #: src/log.c:484
 #, c-format
 msgid "<font color=\"#16569E\">(%s) <b>%s <AUTO-REPLY>:</b></font> %s<br/>\n"
-msgstr "<font color=\"#16569E\">(%s) <b>%s <Tr畉� L畛�i-T畛� �畛�ng>:</b></font> %s<br/>\n"
+msgstr ""
+"<font color=\"#16569E\">(%s) <b>%s <Tr畉� L畛�i-T畛� �畛�ng>:</b></font> %s<br/>\n"
 
 #: src/log.c:486
 #, c-format
 msgid "<font color=\"#A82F2F\">(%s) <b>%s <AUTO-REPLY>:</b></font> %s<br/>\n"
-msgstr "<font color=\"#A82F2F\">(%s) <b>%s <Tr畉� L畛�i-T畛� �畛�ng>:</b></font> %s<br/>\n"
+msgstr ""
+"<font color=\"#A82F2F\">(%s) <b>%s <Tr畉� L畛�i-T畛� �畛�ng>:</b></font> %s<br/>\n"
 
 #: src/log.c:532 src/log.c:666
 msgid "<font color=\"red\"><b>Unable to find log path!</b></font>"
-msgstr "<font color=\"red\"><b>Kh担ng t狸m �動畛�c �動畛�ng d畉�n t畛�i b畉�n ghi (log)!</b></font>"
+msgstr ""
+"<font color=\"red\"><b>Kh担ng t狸m �動畛�c �動畛�ng d畉�n t畛�i b畉�n ghi (log)!</b></font>"
 
 #: src/log.c:542 src/log.c:676
 #, c-format
@@ -4126,7 +4121,7 @@
 #: src/main.c:566
 #, c-format
 msgid "Gaim %s. Try `%s -h' for more information.\n"
-msgstr "Gaim %s. Th畛� '%s -h' �畛� c坦 th棚m th担ng tin.\n"
+msgstr "Gaim %s. Ch畉�y '%s -h' �畛� bi畉�t th棚m th担ng tin.\n"
 
 #: src/plugin.c:260
 #, c-format
@@ -4151,8 +4146,8 @@
 #: src/protocols/gg/gg.c:49 src/protocols/jabber/jutil.c:110
 #: src/protocols/msn/msn.c:344 src/protocols/msn/state.c:27
 #: src/protocols/msn/state.c:28 src/protocols/msn/state.c:35
-#: src/protocols/msn/state.c:36 src/protocols/yahoo/yahoo.c:2302
-#: src/protocols/yahoo/yahoo.c:2403
+#: src/protocols/msn/state.c:36 src/protocols/yahoo/yahoo.c:2333
+#: src/protocols/yahoo/yahoo.c:2434
 msgid "Available"
 msgstr "C坦 m畉�t"
 
@@ -4164,17 +4159,17 @@
 msgid "Away for friends only"
 msgstr "Ch畛� b叩o v畉�ng m畉�t cho b畉�n b竪"
 
-#: src/protocols/gg/gg.c:53 src/protocols/jabber/jabber.c:928
-#: src/protocols/jabber/presence.c:91 src/protocols/oscar/oscar.c:2893
-#: src/protocols/oscar/oscar.c:4624 src/protocols/oscar/oscar.c:4651
-#: src/protocols/oscar/oscar.c:6188 src/protocols/yahoo/yahoo.c:2026
-#: src/protocols/yahoo/yahoo.c:2322 src/protocols/yahoo/yahoo.c:2413
+#: src/protocols/gg/gg.c:53 src/protocols/jabber/jabber.c:929
+#: src/protocols/jabber/presence.c:91 src/protocols/oscar/oscar.c:2848
+#: src/protocols/oscar/oscar.c:4579 src/protocols/oscar/oscar.c:4606
+#: src/protocols/oscar/oscar.c:6143 src/protocols/yahoo/yahoo.c:2050
+#: src/protocols/yahoo/yahoo.c:2353 src/protocols/yahoo/yahoo.c:2444
 msgid "Invisible"
 msgstr "Gi畉�u m畉�t"
 
 #: src/protocols/gg/gg.c:54
 msgid "Invisible for friends only"
-msgstr "Ch畛� 畉�n m畉�t �畛�i v畛�i b畉�n b竪"
+msgstr "Ch畛� gi畉�u m畉�t �畛�i v畛�i b畉�n b竪"
 
 #: src/protocols/gg/gg.c:55
 msgid "Unavailable"
@@ -4186,7 +4181,7 @@
 
 #: src/protocols/gg/gg.c:139
 msgid "Unable to connect to server."
-msgstr "Kh担ng k畉�t n畛�i �動畛�c �畉�n m叩y ch畛�."
+msgstr "Kh担ng k畉�t n畛�i �動畛�c v畛�i m叩y ch畛�."
 
 #: src/protocols/gg/gg.c:142
 msgid "Invalid response from server."
@@ -4194,11 +4189,11 @@
 
 #: src/protocols/gg/gg.c:145
 msgid "Error while reading from socket."
-msgstr "L畛�i khi �畛�c t畛� socket."
+msgstr "L畛�i �畛�c t畛� socket."
 
 #: src/protocols/gg/gg.c:148
 msgid "Error while writing to socket."
-msgstr "L畛�i khi ghi v�o socket."
+msgstr "L畛�i ghi v�o socket."
 
 #: src/protocols/gg/gg.c:151
 msgid "Authentication failed."
@@ -4206,7 +4201,7 @@
 
 #: src/protocols/gg/gg.c:154
 msgid "Unknown Error Code."
-msgstr "Kh担ng bi畉�t m達 l畛�i."
+msgstr "M達 l畛�i kh担ng x叩c �畛�nh."
 
 #: src/protocols/gg/gg.c:259
 #, c-format
@@ -4259,7 +4254,7 @@
 
 #: src/protocols/gg/gg.c:512
 msgid "Send as message"
-msgstr "G畛�i d畉�ng th担ng �i畛�p"
+msgstr "G畛�i theo d畉�ng th担ng �i畛�p"
 
 #: src/protocols/gg/gg.c:517
 msgid "Looking up GG server"
@@ -4271,7 +4266,7 @@
 
 #: src/protocols/gg/gg.c:567
 msgid "You are trying to send a message to an invalid Gadu-Gadu UIN."
-msgstr "B畉�n �ang c畛� g畉�ng g畛�i th担ng �i畛�p �畉�n m畛�t Gadu-Gadu UIN kh担ng h畛�p l畛�."
+msgstr "B畉�n �ang c畛� g畛�i th担ng �i畛�p �畉�n m畛�t Gadu-Gadu UIN kh担ng h畛�p l畛�."
 
 #: src/protocols/gg/gg.c:629
 msgid "Couldn't get search results"
@@ -4285,7 +4280,7 @@
 msgid "Active"
 msgstr "K鱈ch ho畉�t"
 
-#: src/protocols/gg/gg.c:664 src/protocols/oscar/oscar.c:4002
+#: src/protocols/gg/gg.c:664 src/protocols/oscar/oscar.c:3957
 msgid "UIN"
 msgstr "UIN"
 
@@ -4294,15 +4289,15 @@
 msgstr "T棚n"
 
 #. Last Name
-#: src/protocols/gg/gg.c:673 src/protocols/jabber/jabber.c:601
-#: src/protocols/oscar/oscar.c:4010 src/protocols/trepia/trepia.c:274
+#: src/protocols/gg/gg.c:673 src/protocols/jabber/jabber.c:602
+#: src/protocols/oscar/oscar.c:3965 src/protocols/trepia/trepia.c:274
 msgid "Last Name"
 msgstr "H畛�"
 
 #: src/protocols/gg/gg.c:677 src/protocols/gg/gg.c:1389
-#: src/protocols/irc/msgs.c:183 src/protocols/oscar/oscar.c:4004
+#: src/protocols/irc/msgs.c:183 src/protocols/oscar/oscar.c:3959
 msgid "Nick"
-msgstr "Nick"
+msgstr "Bi畛�t danh (nick)"
 
 #: src/protocols/gg/gg.c:684 src/protocols/gg/gg.c:687
 msgid "Birth year"
@@ -4314,21 +4309,21 @@
 msgstr "Gi畛�i t鱈nh"
 
 #. City
-#: src/protocols/gg/gg.c:701 src/protocols/jabber/jabber.c:611
-#: src/protocols/oscar/oscar.c:4056 src/protocols/oscar/oscar.c:4072
+#: src/protocols/gg/gg.c:701 src/protocols/jabber/jabber.c:612
+#: src/protocols/oscar/oscar.c:4011 src/protocols/oscar/oscar.c:4027
 #: src/protocols/trepia/trepia.c:331 src/protocols/trepia/trepia.c:430
 msgid "City"
 msgstr "Th�nh ph畛�"
 
 #. res[0] == username
-#: src/protocols/gg/gg.c:722 src/protocols/msn/msn.c:1282
-#: src/protocols/msn/msn.c:1524 src/protocols/napster/napster.c:387
-#: src/protocols/oscar/oscar.c:2935 src/protocols/oscar/oscar.c:3245
-#: src/protocols/toc/toc.c:498 src/protocols/yahoo/yahoo.c:2579
-#: src/protocols/yahoo/yahoo.c:2601 src/protocols/yahoo/yahoo.c:2624
-#: src/protocols/yahoo/yahoo.c:2811 src/protocols/zephyr/zephyr.c:355
+#: src/protocols/gg/gg.c:722 src/protocols/msn/msn.c:1284
+#: src/protocols/msn/msn.c:1528 src/protocols/napster/napster.c:387
+#: src/protocols/oscar/oscar.c:2890 src/protocols/oscar/oscar.c:3200
+#: src/protocols/toc/toc.c:498 src/protocols/yahoo/yahoo.c:2611
+#: src/protocols/yahoo/yahoo.c:2633 src/protocols/yahoo/yahoo.c:2656
+#: src/protocols/yahoo/yahoo.c:2814 src/protocols/zephyr/zephyr.c:355
 msgid "Buddy Information"
-msgstr "Th担ng tin v畛� Buddy"
+msgstr "Th担ng tin buddy"
 
 #: src/protocols/gg/gg.c:741
 msgid "There is no Buddy List stored on the Gadu-Gadu server."
@@ -4360,7 +4355,7 @@
 
 #: src/protocols/gg/gg.c:851
 msgid "Password couldn't be changed"
-msgstr "M畉�t kh畉�u �達 kh担ng th畛� �畛�i �動畛�c"
+msgstr "�達 kh担ng �畛�i �動畛�c m畉�t kh畉�u"
 
 #: src/protocols/gg/gg.c:968
 msgid "Error communicating with Gadu-Gadu server"
@@ -4383,16 +4378,17 @@
 "Gaim was unable to connect to the Gadu-Gadu buddy list server.  Please try "
 "again later."
 msgstr ""
-"Gaim kh担ng th畛� k畉�t n畛�i �畉�n m叩y ch畛� danh s叩ch buddy Gadu-Gadu. Vui l嘆ng th畛� "
-"l畉�i sau."
+"Gaim kh担ng th畛� k畉�t n畛�i �畉�n m叩y ch畛� danh s叩ch buddy Gadu-Gadu. H達y th畛� l畉�i "
+"sau."
 
 #: src/protocols/gg/gg.c:1071
 msgid "Couldn't export buddy list"
 msgstr "Kh担ng th畛� xu畉�t danh s叩ch buddy"
 
 #: src/protocols/gg/gg.c:1072 src/protocols/gg/gg.c:1095
-msgid "Gaim was unable to connect to the buddy list server.  Please try again later."
-msgstr "Gaim kh担ng th畛� k畉�t n畛�i v�o m叩y ch畛� danh s叩ch buddy. Vui l嘆ng th畛� l畉�i sau."
+msgid ""
+"Gaim was unable to connect to the buddy list server.  Please try again later."
+msgstr "Gaim kh担ng th畛� k畉�t n畛�i v�o m叩y ch畛� danh s叩ch buddy. H達y th畛� l畉�i sau."
 
 #: src/protocols/gg/gg.c:1094
 msgid "Unable to delete Gadu-Gadu buddy list"
@@ -4408,7 +4404,7 @@
 "the directory server.  Please try again later."
 msgstr ""
 "Gaim kh担ng th畛� t狸m ki畉�m th動 m畛�c b畛�i n坦 kh担ng th畛� k畉�t n畛�i �動畛�c �畉�n m叩y ch畛� "
-"th動 m畛�c. Vui l嘆ng th畛� l畉�i sau."
+"th動 m畛�c. H達y th畛� l畉�i sau."
 
 #: src/protocols/gg/gg.c:1177
 msgid "Unable to change Gadu-Gadu password"
@@ -4420,20 +4416,20 @@
 "Gadu-Gadu server.  Please try again later."
 msgstr ""
 "Gaim kh担ng th畛� �畛�i m畉�t kh畉�u c畛�a b畉�n do c坦 l畛�i x畉�y ra khi k畉�t n畛�i �畉�n m叩y ch畛� "
-"Gadu-Gadu. Vui l嘆ng th畛� l畉�i sau."
+"Gadu-Gadu. H達y th畛� l畉�i sau."
 
 #: src/protocols/gg/gg.c:1195
 msgid "Directory Search"
-msgstr "T狸m ki畉�m Th動 m畛�c"
-
-#: src/protocols/gg/gg.c:1204 src/protocols/jabber/jabber.c:1040
-#: src/protocols/oscar/oscar.c:6535 src/protocols/toc/toc.c:1546
+msgstr "T狸m ki畉�m th動 m畛�c"
+
+#: src/protocols/gg/gg.c:1204 src/protocols/jabber/jabber.c:1041
+#: src/protocols/oscar/oscar.c:6498 src/protocols/toc/toc.c:1546
 msgid "Change Password"
 msgstr "�畛�i m畉�t kh畉�u"
 
 #: src/protocols/gg/gg.c:1212
 msgid "Import Buddy List from Server"
-msgstr "Nh畉�p v畛� danh s叩ch Buddy t畛� M叩y ch畛�"
+msgstr "Nh畉�p v畛� danh s叩ch Buddy t畛� m叩y ch畛�"
 
 #: src/protocols/gg/gg.c:1218
 msgid "Export Buddy List to Server"
@@ -4453,7 +4449,7 @@
 "the directory server.  Please try again later."
 msgstr ""
 "Gaim kh担ng th畛� truy c畉�p l箪 l畛�ch c畛�a ng動畛�i d湛ng n�y do c坦 l畛�i k畉�t n畛�i �畉�n m叩y "
-"ch畛� th動 m畛�c. Vui l嘆ng th畛� l畉�i sau."
+"ch畛� th動 m畛�c. H達y th畛� l畉�i sau."
 
 #. *< api_version
 #. *< type
@@ -4471,30 +4467,30 @@
 
 #: src/protocols/icq/gaim_icq.c:224
 msgid "Gaim encountered an error communicating with the ICQ server."
-msgstr "Gaim g畉�p l畛�i truy畛�n th担ng v畛�i m叩y ch畛� ICQ."
+msgstr "Gaim b叩o l畛�i truy畛�n th担ng v畛�i m叩y ch畛� ICQ."
 
 #: src/protocols/icq/gaim_icq.c:294
 #, c-format
 msgid "The user %s (%s%s%s%s%s) wants you to authorize them."
 msgstr "Ng動畛�i d湛ng %s (%s%s%s%s%s) mu畛�n b畉�n th畉�m tra h畛�."
 
-#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:184
+#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:187
 #: src/protocols/msn/notification.c:949 src/protocols/msn/notification.c:1270
-#: src/protocols/msn/notification.c:1435 src/protocols/oscar/oscar.c:2665
-#: src/protocols/oscar/oscar.c:5182
+#: src/protocols/msn/notification.c:1435 src/protocols/oscar/oscar.c:2620
+#: src/protocols/oscar/oscar.c:5137
 msgid "Authorize"
 msgstr "Th畉�m tra"
 
-#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:185
+#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:188
 #: src/protocols/msn/notification.c:950 src/protocols/msn/notification.c:1272
-#: src/protocols/msn/notification.c:1437 src/protocols/oscar/oscar.c:2667
-#: src/protocols/oscar/oscar.c:5183
+#: src/protocols/msn/notification.c:1437 src/protocols/oscar/oscar.c:2622
+#: src/protocols/oscar/oscar.c:5138
 msgid "Deny"
 msgstr "T畛� ch畛�i"
 
 #: src/protocols/icq/gaim_icq.c:310
 msgid "Send message through server"
-msgstr "G畛�i th担ng �i畛�p qua m叩y ch畛�"
+msgstr "G畛�i th担ng �i畛�p qua m叩y ch畛�"
 
 #: src/protocols/icq/gaim_icq.c:352
 msgid "Connecting..."
@@ -4502,7 +4498,7 @@
 
 #: src/protocols/icq/gaim_icq.c:497
 msgid "Nick:"
-msgstr "Nick:"
+msgstr "Bi畛�t danh (nick):"
 
 #: src/protocols/icq/gaim_icq.c:498
 msgid "Gaim User"
@@ -4519,7 +4515,7 @@
 "NAMES<BR>NICK OP DEOP OPERWALL<BR>PART PING QUERY QUIT<BR>QUOTE REMOVE TOPIC "
 "UMODE<BR>VOICE DEVOICE WALLOPS WHOIS<BR>"
 msgstr ""
-"<B>C叩c l畛�nh IRC �動畛�c h畛� tr畛�:</B><BR>AWAY INVITE JOIN KICK<BR>ME MODE MSG "
+"<B>H畛� tr畛� c叩c l畛�nh IRC sau:</B><BR>AWAY INVITE JOIN KICK<BR>ME MODE MSG "
 "NAMES<BR>NICK OP DEOP OPERWALL<BR>PART PING QUERY QUIT<BR>QUOTE REMOVE TOPIC "
 "UMODE<BR>VOICE DEVOICE WALLOPS WHOIS<BR>"
 
@@ -4528,7 +4524,7 @@
 "<B>Supported IRC Commands:</B><BR>AWAY JOIN ME MODE<BR>MSG NICK OPERWALL "
 "PING<BR>QUERY QUIT QUOTE UMODE<BR>WALLOPS WHOIS"
 msgstr ""
-"<B>C叩c l畛�nh IRC �動畛�c h畛� tr畛�:</B><BR>AWAY JOIN ME MODE<BR>MSG NICK OPERWALL "
+"<B>H畛� tr畛�c c叩c l畛�nh IRC sau:</B><BR>AWAY JOIN ME MODE<BR>MSG NICK OPERWALL "
 "PING<BR>QUERY QUIT QUOTE UMODE<BR>WALLOPS WHOIS"
 
 #: src/protocols/irc/cmds.c:459
@@ -4538,7 +4534,7 @@
 
 #: src/protocols/irc/cmds.c:461
 msgid "No topic is set"
-msgstr "Ch畛� �畛� kh担ng �動畛�c �畉�t"
+msgstr "Ch動a c坦 ch畛� �畛�"
 
 #: src/protocols/irc/irc.c:64
 msgid "Error displaying MOTD"
@@ -4563,21 +4559,25 @@
 
 #: src/protocols/irc/irc.c:156
 msgid "Channel:"
-msgstr "K棚nh:"
+msgstr "K棚nh (channel):"
 
 #: src/protocols/irc/irc.c:180
 msgid "IRC nicks may not contain whitespace"
-msgstr "IRC nick kh担ng �動畛�c ch畛�a d畉�u c叩ch"
+msgstr "Bi畛�t danh (nick) cho IRC kh担ng �動畛�c ch畛�a d畉�u c叩ch"
 
 #: src/protocols/irc/irc.c:199 src/protocols/toc/toc.c:228
 #, c-format
 msgid "Signon: %s"
-msgstr "��ng nh畉�p: %s"
+msgstr "K畉�t n畛�i: %s"
 
 #: src/protocols/irc/irc.c:208
 msgid "Couldn't create socket"
 msgstr "Kh担ng t畉�o �動畛�c socket"
 
+#: src/protocols/irc/irc.c:357 src/protocols/trepia/trepia.c:972
+msgid "Read error"
+msgstr "L畛�i �畛�c"
+
 #. *< api_version
 #. *< type
 #. *< ui_requirement
@@ -4594,10 +4594,10 @@
 #. *  summary
 #: src/protocols/irc/irc.c:533
 msgid "The IRC Protocol Plugin that Sucks Less"
-msgstr "Plugin giao th畛�c IRC 鱈t phi畛�n ph畛�c"
+msgstr "Plugin giao th畛�c IRC 鱈t r畉�c r畛�i"
 
 #: src/protocols/irc/irc.c:550 src/protocols/irc/msgs.c:197
-#: src/protocols/jabber/jabber.c:1139 src/protocols/napster/napster.c:637
+#: src/protocols/jabber/jabber.c:1140 src/protocols/napster/napster.c:637
 msgid "Server"
 msgstr "M叩y ch畛�"
 
@@ -4606,7 +4606,7 @@
 msgstr "M達 h坦a"
 
 #: src/protocols/irc/irc.c:559 src/protocols/irc/msgs.c:191
-#: src/protocols/jabber/jabber.c:571
+#: src/protocols/jabber/jabber.c:572
 msgid "Username"
 msgstr "T棚n ��ng nh畉�p"
 
@@ -4631,7 +4631,7 @@
 msgid " <i>(identified)</i>"
 msgstr " <i>(identified)</i>"
 
-#: src/protocols/irc/msgs.c:192 src/protocols/yahoo/yahoo.c:2682
+#: src/protocols/irc/msgs.c:192 src/protocols/yahoo/yahoo.c:2714
 msgid "Realname"
 msgstr "T棚n th畉�t"
 
@@ -4642,11 +4642,11 @@
 #: src/protocols/irc/msgs.c:207
 #, c-format
 msgid "<b>Idle for:</b> %s<br>"
-msgstr "<b>Tr畉�ng th叩i ngh畛� cho:</b> %s<br>"
+msgstr "<b>�達 ngh畛� �動畛�c:</b> %s<br>"
 
 #: src/protocols/irc/msgs.c:209
 msgid "Online since"
-msgstr "K畉�t n畛�i t畛�"
+msgstr "�達 k畉�t n畛�i t畛�"
 
 #: src/protocols/irc/msgs.c:212
 msgid "<br><b>Defining adjective:</b> Glorious<br>"
@@ -4683,7 +4683,7 @@
 #. does this happen?
 #: src/protocols/irc/msgs.c:371
 msgid "no such channel"
-msgstr "Kh担ng c坦 k棚nh"
+msgstr "Kh担ng c坦 k棚nh n�o"
 
 #: src/protocols/irc/msgs.c:374
 msgid "User is not logged in"
@@ -4691,7 +4691,7 @@
 
 #: src/protocols/irc/msgs.c:379
 msgid "No such nick or channel"
-msgstr "Kh担ng c坦 nick ho畉�c k棚nh"
+msgstr "Ch動a c坦 bi畛�t danh (nick) ho畉�c k棚nh (channel)"
 
 #: src/protocols/irc/msgs.c:399
 msgid "Could not send"
@@ -4700,7 +4700,7 @@
 #: src/protocols/irc/msgs.c:455
 #, c-format
 msgid "Joining %s requires an invitation."
-msgstr "Tham gia v�o %s c畉�n c坦 l畛�i m畛�i."
+msgstr "Vi畛�c tham gia v�o %s c畉�n c坦 l畛�i m畛�i."
 
 #: src/protocols/irc/msgs.c:456
 msgid "Invitation only"
@@ -4719,20 +4719,20 @@
 #: src/protocols/irc/msgs.c:581
 #, c-format
 msgid "mode (%s %s) by %s"
-msgstr "%s �畛�i c叩ch th畛�c th�nh (%s %s)"
+msgstr "mode (%s %s) b畛�i %s"
 
 #: src/protocols/irc/msgs.c:660
 msgid "Could not change nick"
-msgstr "Kh担ng th畛� �畛�i nick"
+msgstr "Kh担ng th畛� �畛�i bi畛�t danh (nick)"
 
 #: src/protocols/irc/msgs.c:661
 msgid "Cannot change nick"
-msgstr "Kh担ng th畛� �畛�i nick"
+msgstr "Kh担ng th畛� �畛�i bi畛�t danh (nick)"
 
 #: src/protocols/irc/msgs.c:682
 #, c-format
 msgid "You have parted the channel%s%s"
-msgstr "B畉�n �達 r畛�i kh畛�i k棚nh %s%s"
+msgstr "B畉�n r畛�i kh畛�i k棚nh %s%s"
 
 #: src/protocols/irc/msgs.c:720
 msgid "Error: invalid PONG from server"
@@ -4741,16 +4741,16 @@
 #: src/protocols/irc/msgs.c:722
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
-msgstr "Tr畉� l畛�i PING -- M畉�t: %lu gi但y"
+msgstr "�叩p l畉�i PING -- H畉�t: %lu gi但y"
 
 #: src/protocols/irc/msgs.c:792
 #, c-format
 msgid "Cannot join %s:"
-msgstr "Kh担ng th畛� tham gia %s:"
+msgstr "Kh担ng th畛� v�o %s:"
 
 #: src/protocols/irc/msgs.c:793
 msgid "Cannot join channel"
-msgstr "Kh担ng th畛� tham gia k棚nh"
+msgstr "Kh担ng th畛� v�o k棚nh"
 
 #: src/protocols/irc/msgs.c:823
 #, c-format
@@ -4763,12 +4763,12 @@
 "the Account Editor)"
 msgstr ""
 "(C坦 l畛�i khi chuy畛�n �畛�i th担ng �i畛�p n�y. �叩nh d畉�u v�o t湛y ch畛�n 'M達 h坦a' trong "
-"Tr狸nh hi畛�u ch畛�nh T�i kho畉�n)"
+"tr狸nh hi畛�u ch畛�nh t�i kho畉�n)"
 
 #: src/protocols/irc/parse.c:291
 #, c-format
 msgid "Reply time from %s: %lu seconds"
-msgstr "Th畛�i gian tr畉� l畛�i t畛� %s: %lu gi但y"
+msgstr "Th畛�i gian �叩p l畉�i t畛� %s: %lu gi但y"
 
 #: src/protocols/irc/parse.c:292
 msgid "PONG"
@@ -4786,56 +4786,60 @@
 msgid "Server requires SSL for login"
 msgstr "M叩y ch畛� y棚u c畉�u SSL �畛� ��ng nh畉�p"
 
-#: src/protocols/jabber/auth.c:60 src/protocols/jabber/auth.c:282
-#: src/protocols/jabber/auth.c:381 src/protocols/jabber/auth.c:393
+#: src/protocols/jabber/auth.c:60 src/protocols/jabber/auth.c:301
+#: src/protocols/jabber/auth.c:401 src/protocols/jabber/auth.c:413
 msgid "Invalid response from server"
 msgstr "M叩y ch畛� tr畉� l畛�i kh担ng h畛�p l畛�."
 
-#: src/protocols/jabber/auth.c:87 src/protocols/jabber/auth.c:144
+#: src/protocols/jabber/auth.c:93 src/protocols/jabber/auth.c:163
 msgid "Server does not use any supported authentication method"
 msgstr "M叩y ch畛� kh担ng s畛� d畛�ng b畉�t k畛� ph動董ng th畛�c x叩c th畛�c �動畛�c h畛� tr畛� n�o"
 
-#: src/protocols/jabber/auth.c:302
+#: src/protocols/jabber/auth.c:152 src/protocols/jabber/jabber.c:458
+msgid "Unknown Error"
+msgstr "L畛�i kh担ng x叩c �畛�nh"
+
+#: src/protocols/jabber/auth.c:322
 msgid "Invalid challenge from server"
 msgstr "Ki棚m tra t畛� m叩y ch畛� kh担ng h畛�p l畛�."
 
-#: src/protocols/jabber/auth.c:396
+#: src/protocols/jabber/auth.c:416
 msgid "Bad Protocol"
 msgstr "Giao th畛�c sai"
 
-#: src/protocols/jabber/auth.c:399
+#: src/protocols/jabber/auth.c:419
 msgid "Encryption Required"
 msgstr "Y棚u c畉�u m達 h坦a"
 
-#: src/protocols/jabber/auth.c:402
+#: src/protocols/jabber/auth.c:422
 msgid "Invalid authzid"
 msgstr "�畛�nh danh ch畛�ng th畛�c kh担ng h畛�p l畛�"
 
-#: src/protocols/jabber/auth.c:405
+#: src/protocols/jabber/auth.c:425
 msgid "Invalid Mechanism"
 msgstr "C董 ch畉� kh担ng h畛�p l畛�"
 
-#: src/protocols/jabber/auth.c:407
+#: src/protocols/jabber/auth.c:427
 msgid "Invalid Realm"
 msgstr "Realm kh担ng h畛�p l畛�"
 
-#: src/protocols/jabber/auth.c:410
+#: src/protocols/jabber/auth.c:430
 msgid "Mechanism Too Weak"
 msgstr "C董 ch畉� qu叩 y畉�u"
 
-#: src/protocols/jabber/auth.c:413 src/protocols/jabber/jabber.c:147
-#: src/protocols/jabber/jabber.c:863 src/protocols/jabber/jabber.c:913
-#: src/protocols/oscar/oscar.c:5590
+#: src/protocols/jabber/auth.c:433 src/protocols/jabber/jabber.c:147
+#: src/protocols/jabber/jabber.c:864 src/protocols/jabber/jabber.c:914
+#: src/protocols/oscar/oscar.c:5545
 msgid "Not Authorized"
 msgstr "Kh担ng x叩c th畛�c �動畛�c"
 
-#: src/protocols/jabber/auth.c:416
+#: src/protocols/jabber/auth.c:436
 msgid "Temporary Authentication Failure"
-msgstr "X叩c Th畛�c T畉�m Th畛�i L畛�i"
-
-#: src/protocols/jabber/auth.c:418
+msgstr "L畛�i x叩c th畛�c t畉�m th畛�i"
+
+#: src/protocols/jabber/auth.c:438
 msgid "Authentication Failure"
-msgstr "L畛�i X叩c Th畛�c"
+msgstr "L畛�i x叩c th畛�c"
 
 #: src/protocols/jabber/buddy.c:245 src/protocols/jabber/buddy.c:597
 msgid "Full Name"
@@ -4850,9 +4854,9 @@
 msgstr "T棚n hay g畛�i"
 
 #: src/protocols/jabber/buddy.c:248 src/protocols/jabber/buddy.c:625
-#: src/protocols/jabber/jabber.c:591 src/protocols/yahoo/yahoo.c:2676
+#: src/protocols/jabber/jabber.c:592 src/protocols/yahoo/yahoo.c:2710
 msgid "Nickname"
-msgstr "Nick"
+msgstr "Bi畛�t danh"
 
 #: src/protocols/jabber/buddy.c:250 src/protocols/jabber/buddy.c:653
 msgid "Street Address"
@@ -4871,7 +4875,7 @@
 msgstr "V湛ng"
 
 #: src/protocols/jabber/buddy.c:254 src/protocols/jabber/buddy.c:665
-#: src/protocols/jabber/jabber.c:621
+#: src/protocols/jabber/jabber.c:622
 msgid "Postal Code"
 msgstr "M達 v湛ng"
 
@@ -4887,7 +4891,7 @@
 msgstr "�i畛�n tho畉�i"
 
 #: src/protocols/jabber/buddy.c:257 src/protocols/jabber/buddy.c:699
-#: src/protocols/jabber/buddy.c:707 src/protocols/yahoo/yahoo.c:2670
+#: src/protocols/jabber/buddy.c:707 src/protocols/yahoo/yahoo.c:2706
 msgid "Email"
 msgstr "Th動 �i畛�n t畛�"
 
@@ -4908,7 +4912,7 @@
 msgstr "V畛� tr鱈"
 
 #: src/protocols/jabber/buddy.c:262 src/protocols/jabber/buddy.c:628
-#: src/protocols/oscar/oscar.c:4036
+#: src/protocols/oscar/oscar.c:3991
 msgid "Birthday"
 msgstr "Ng�y sinh"
 
@@ -4927,12 +4931,12 @@
 msgstr "Jabber ID"
 
 #: src/protocols/jabber/buddy.c:556 src/protocols/jabber/buddy.c:563
-#: src/protocols/jabber/buddy.c:574 src/protocols/jabber/jabber.c:900
-#: src/protocols/jabber/jabber.c:913
+#: src/protocols/jabber/buddy.c:574 src/protocols/jabber/jabber.c:901
+#: src/protocols/jabber/jabber.c:914
 msgid "Status"
 msgstr "Tr畉�ng th叩i"
 
-#: src/protocols/jabber/buddy.c:572 src/protocols/jabber/jabber.c:1142
+#: src/protocols/jabber/buddy.c:572 src/protocols/jabber/jabber.c:1143
 msgid "Resource"
 msgstr "T�i nguy棚n"
 
@@ -4940,8 +4944,8 @@
 msgid "Middle Name"
 msgstr "T棚n �畛�m"
 
-#: src/protocols/jabber/buddy.c:633 src/protocols/jabber/jabber.c:606
-#: src/protocols/oscar/oscar.c:4053 src/protocols/oscar/oscar.c:4069
+#: src/protocols/jabber/buddy.c:633 src/protocols/jabber/jabber.c:607
+#: src/protocols/oscar/oscar.c:4008 src/protocols/oscar/oscar.c:4024
 msgid "Address"
 msgstr "�畛�a ch畛�"
 
@@ -5022,7 +5026,7 @@
 
 #: src/protocols/jabber/jabber.c:71
 msgid "Error initializing session"
-msgstr "L畛�i kh畛�i t畉�o phi棚n tr嘆 chuy畛�n"
+msgstr "L畛�i kh畛�i t畉�o phi棚n l�m vi畛�c"
 
 #: src/protocols/jabber/jabber.c:122
 msgid "Bad Format"
@@ -5042,7 +5046,7 @@
 
 #: src/protocols/jabber/jabber.c:131
 msgid "Host Gone"
-msgstr ""
+msgstr "M叩y ch畛� kh担ng c嘆n n畛�a"
 
 #: src/protocols/jabber/jabber.c:133
 msgid "Host Unknown"
@@ -5078,7 +5082,7 @@
 
 #: src/protocols/jabber/jabber.c:151
 msgid "Remote Connection Failed"
-msgstr "K畉�t n畛�i t畛� xa kh担ng �動畛�c"
+msgstr "L畛�i k畉�t n畛�i t畛� xa"
 
 #: src/protocols/jabber/jabber.c:153
 msgid "Resource Constraint"
@@ -5136,153 +5140,155 @@
 #: src/protocols/msn/msn.c:1178 src/protocols/msn/msn.c:1259
 #: src/protocols/msn/notification.c:179 src/protocols/msn/notification.c:207
 #: src/protocols/msn/notification.c:1664 src/protocols/msn/notification.c:1684
-#: src/protocols/trepia/trepia.c:248 src/protocols/trepia/trepia.c:749
-#: src/protocols/trepia/trepia.c:1033 src/protocols/trepia/trepia.c:1077
-#: src/protocols/trepia/trepia.c:1176 src/protocols/trepia/trepia.c:1232
+#: src/protocols/msn/session.c:208 src/protocols/trepia/trepia.c:248
+#: src/protocols/trepia/trepia.c:749 src/protocols/trepia/trepia.c:1033
+#: src/protocols/trepia/trepia.c:1077 src/protocols/trepia/trepia.c:1176
+#: src/protocols/trepia/trepia.c:1232
 msgid "Write error"
 msgstr "L畛�i ghi"
 
-#: src/protocols/jabber/jabber.c:271 src/protocols/jabber/jabber.c:291
+#: src/protocols/jabber/jabber.c:272 src/protocols/jabber/jabber.c:292
 msgid "Read Error"
 msgstr "L畛�i �畛�c"
 
-#: src/protocols/jabber/jabber.c:345
+#: src/protocols/jabber/jabber.c:346
 msgid "SSL Handshake Failed"
 msgstr "SSL Handshake l畛�i"
 
-#: src/protocols/jabber/jabber.c:382 src/protocols/jabber/jabber.c:680
+#: src/protocols/jabber/jabber.c:383 src/protocols/jabber/jabber.c:681
 msgid "Invalid Jabber ID"
 msgstr "ID Jabber kh担ng h畛�p l畛�"
 
-#: src/protocols/jabber/jabber.c:410 src/protocols/jabber/jabber.c:707
+#: src/protocols/jabber/jabber.c:411 src/protocols/jabber/jabber.c:708
 msgid "SSL support unavailable"
 msgstr "Hi畛�n kh担ng c坦 h畛� tr畛� SSL"
 
-#: src/protocols/jabber/jabber.c:420 src/protocols/jabber/jabber.c:717
+#: src/protocols/jabber/jabber.c:421 src/protocols/jabber/jabber.c:718
 #: src/protocols/trepia/trepia.c:1116
 msgid "Unable to create socket"
 msgstr "Kh担ng t畉�o �動畛�c socket"
 
-#: src/protocols/jabber/jabber.c:445
+#: src/protocols/jabber/jabber.c:446
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "%s@%s ��ng k箪 th�nh c担ng"
 
-#: src/protocols/jabber/jabber.c:447 src/protocols/jabber/jabber.c:448
+#: src/protocols/jabber/jabber.c:448 src/protocols/jabber/jabber.c:449
 msgid "Registration Successful"
 msgstr "��ng k箪 th�nh c担ng"
 
-#: src/protocols/jabber/jabber.c:457
-msgid "Unknown Error"
-msgstr "L畛�i kh担ng x叩c �畛�nh"
-
-#: src/protocols/jabber/jabber.c:460
+#: src/protocols/jabber/jabber.c:461
 #, c-format
 msgid "Registration of %s@%s failed: %s"
 msgstr "%s@%s ��ng k箪 kh担ng �動畛�c: %s"
 
-#: src/protocols/jabber/jabber.c:462 src/protocols/jabber/jabber.c:463
+#: src/protocols/jabber/jabber.c:463 src/protocols/jabber/jabber.c:464
 msgid "Registration Failed"
 msgstr "��ng k箪 kh担ng �動畛�c"
 
-#: src/protocols/jabber/jabber.c:561 src/protocols/jabber/jabber.c:562
+#: src/protocols/jabber/jabber.c:562 src/protocols/jabber/jabber.c:563
 msgid "Already Registered"
 msgstr "�達 ��ng k箪 r畛�i"
 
-#: src/protocols/jabber/jabber.c:575 src/protocols/jabber/jabber.c:1010
+#: src/protocols/jabber/jabber.c:576 src/protocols/jabber/jabber.c:1011
 msgid "Password"
 msgstr "M畉�t kh畉�u"
 
-#: src/protocols/jabber/jabber.c:586
+#: src/protocols/jabber/jabber.c:587
 msgid "E-Mail"
 msgstr "Email"
 
 #. First Name
-#: src/protocols/jabber/jabber.c:596 src/protocols/oscar/oscar.c:4007
+#: src/protocols/jabber/jabber.c:597 src/protocols/oscar/oscar.c:3962
 #: src/protocols/trepia/trepia.c:267
 msgid "First Name"
 msgstr "T棚n"
 
 #. State
-#: src/protocols/jabber/jabber.c:616 src/protocols/oscar/oscar.c:4059
-#: src/protocols/oscar/oscar.c:4075 src/protocols/trepia/trepia.c:335
+#: src/protocols/jabber/jabber.c:617 src/protocols/oscar/oscar.c:4014
+#: src/protocols/oscar/oscar.c:4030 src/protocols/trepia/trepia.c:335
 #: src/protocols/trepia/trepia.c:439
 msgid "State"
 msgstr "Bang"
 
-#: src/protocols/jabber/jabber.c:626
+#: src/protocols/jabber/jabber.c:627
 msgid "Phone"
 msgstr "�i畛�n tho畉�i"
 
-#: src/protocols/jabber/jabber.c:644
+#: src/protocols/jabber/jabber.c:645
 msgid "Please fill out the information below to register your new account."
 msgstr "H達y �i畛�n th担ng tin b棚n d動畛�i �畛� ��ng k箪 t�i kho畉�n m畛�i cho b畉�n."
 
-#: src/protocols/jabber/jabber.c:647 src/protocols/jabber/jabber.c:648
+#: src/protocols/jabber/jabber.c:648 src/protocols/jabber/jabber.c:649
 msgid "Register New Jabber Account"
 msgstr "��ng k箪 t�i kho畉�n Jabber m畛�i"
 
-#: src/protocols/jabber/jabber.c:766 src/protocols/msn/dispatch.c:219
+#: src/protocols/jabber/jabber.c:767 src/protocols/msn/dispatch.c:219
 #: src/protocols/msn/msn.c:481 src/protocols/napster/napster.c:487
 #: src/protocols/oscar/oscar.c:694 src/protocols/trepia/trepia.c:1110
-#: src/protocols/yahoo/yahoo.c:1923
+#: src/protocols/yahoo/yahoo.c:1942
 msgid "Connecting"
 msgstr "K畉�t n畛�i"
 
-#: src/protocols/jabber/jabber.c:770
+#: src/protocols/jabber/jabber.c:771
 msgid "Initializing Stream"
 msgstr "Kh畛�i t畉�o Stream"
 
-#: src/protocols/jabber/jabber.c:776
+#: src/protocols/jabber/jabber.c:777
 msgid "Authenticating"
 msgstr "X叩c th畛�c"
 
-#: src/protocols/jabber/jabber.c:784
+#: src/protocols/jabber/jabber.c:785
 msgid "Re-initializing Stream"
 msgstr "Kh畛�i t畉�o l畉�i Stream"
 
-#: src/protocols/jabber/jabber.c:924 src/protocols/jabber/jutil.c:101
+#: src/protocols/jabber/jabber.c:909 src/protocols/jabber/jabber.c:962
+#: src/protocols/jabber/presence.c:297
+msgid "Error"
+msgstr "L畛�i"
+
+#: src/protocols/jabber/jabber.c:925 src/protocols/jabber/jutil.c:101
 #: src/protocols/jabber/presence.c:82
 msgid "Chatty"
-msgstr "Hay chat"
-
-#: src/protocols/jabber/jabber.c:926 src/protocols/jabber/jutil.c:104
+msgstr "Th鱈ch chat"
+
+#: src/protocols/jabber/jabber.c:927 src/protocols/jabber/jutil.c:104
 #: src/protocols/jabber/presence.c:87
 msgid "Extended Away"
-msgstr "M畛� r畛�ng Tr畉�ng th叩i"
-
-#: src/protocols/jabber/jabber.c:927 src/protocols/jabber/jutil.c:107
-#: src/protocols/jabber/presence.c:89 src/protocols/oscar/oscar.c:2883
-#: src/protocols/oscar/oscar.c:4639 src/protocols/oscar/oscar.c:6184
+msgstr "Tr畉�ng th叩i m畛� r畛�ng"
+
+#: src/protocols/jabber/jabber.c:928 src/protocols/jabber/jutil.c:107
+#: src/protocols/jabber/presence.c:89 src/protocols/oscar/oscar.c:2838
+#: src/protocols/oscar/oscar.c:4594 src/protocols/oscar/oscar.c:6139
 msgid "Do Not Disturb"
 msgstr "Xin �畛�ng qu畉�y r畉�y"
 
-#: src/protocols/jabber/jabber.c:943
+#: src/protocols/jabber/jabber.c:944
 msgid "Password Changed"
 msgstr "M畉�t kh畉�u �達 �動畛�c �畛�i"
 
-#: src/protocols/jabber/jabber.c:944
+#: src/protocols/jabber/jabber.c:945
 msgid "Your password has been changed."
 msgstr "M畉�t kh畉�u c畛�a b畉�n �達 �動畛�c �畛�i."
 
-#: src/protocols/jabber/jabber.c:954
+#: src/protocols/jabber/jabber.c:955
 #, c-format
 msgid "Error changing password: %s"
 msgstr "L畛�i khi �畛�i m畉�t kh畉�u: %s:"
 
-#: src/protocols/jabber/jabber.c:958
+#: src/protocols/jabber/jabber.c:959
 msgid "Unknown error occurred changing password"
 msgstr "L畛�i kh担ng x叩c �畛�nh x畉�y ra khi �畛�i m畉�t kh畉�u"
 
-#: src/protocols/jabber/jabber.c:1015
+#: src/protocols/jabber/jabber.c:1016
 msgid "Password (again)"
-msgstr "Nh畉�p L畉�i M畉�t kh畉�u"
-
-#: src/protocols/jabber/jabber.c:1020 src/protocols/jabber/jabber.c:1021
+msgstr "Nh畉�p l畉�i m畉�t kh畉�u"
+
+#: src/protocols/jabber/jabber.c:1021 src/protocols/jabber/jabber.c:1022
 msgid "Change Jabber Password"
 msgstr "�畛�i m畉�t kh畉�u Jabber"
 
-#: src/protocols/jabber/jabber.c:1021
+#: src/protocols/jabber/jabber.c:1022
 msgid "Please enter your new password"
 msgstr "H達y nh畉�p m畉�t kh畉�u m畛�i"
 
@@ -5296,19 +5302,19 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/jabber/jabber.c:1119 src/protocols/jabber/jabber.c:1121
+#: src/protocols/jabber/jabber.c:1120 src/protocols/jabber/jabber.c:1122
 msgid "Jabber Protocol Plugin"
-msgstr "Plugin Giao Th畛�c Jabber"
-
-#: src/protocols/jabber/jabber.c:1145
+msgstr "Plugin giao th畛�c Jabber"
+
+#: src/protocols/jabber/jabber.c:1146
 msgid "Use TLS if available"
 msgstr "D湛ng TLS n畉�u c坦"
 
-#: src/protocols/jabber/jabber.c:1150
+#: src/protocols/jabber/jabber.c:1151
 msgid "Force old SSL"
 msgstr "�p d湛ng SSL c滴"
 
-#: src/protocols/jabber/jabber.c:1158
+#: src/protocols/jabber/jabber.c:1159
 msgid "Connect server"
 msgstr "K畉�t n畛�i m叩y ch畛�"
 
@@ -5335,25 +5341,20 @@
 msgid "XML Parse error"
 msgstr "L畛�i ph但n t鱈ch XML"
 
-#: src/protocols/jabber/presence.c:170
-#, c-format
-msgid "%s (Code %s)"
-msgstr "%s (M達 %s)"
-
-#: src/protocols/jabber/presence.c:175
+#: src/protocols/jabber/presence.c:177
 msgid "Unknown Error in presence"
 msgstr "Hi畛�n t畉�i kh担ng x叩c �畛�nh �動畛�c l畛�i g狸"
 
-#: src/protocols/jabber/presence.c:179
+#: src/protocols/jabber/presence.c:182
 #, c-format
 msgid "The user %s wants to add you to their buddy list."
 msgstr "Ng動畛�i d湛ng %s mu畛�n th棚m b畉�n v�o danh s叩ch buddy c畛�a h畛�."
 
-#: src/protocols/jabber/presence.c:284 src/protocols/oscar/oscar.c:2994
+#: src/protocols/jabber/presence.c:287 src/protocols/oscar/oscar.c:2949
 msgid "Unknown error"
 msgstr "L畛�i kh担ng x叩c �畛�nh"
 
-#: src/protocols/jabber/presence.c:290
+#: src/protocols/jabber/presence.c:293
 msgid "Unable to join chat"
 msgstr "Kh担ng th畛� tham gia Chat"
 
@@ -5381,7 +5382,7 @@
 
 #: src/protocols/msn/dispatch.c:73 src/protocols/msn/notification.c:309
 msgid "Requesting to send password"
-msgstr "Y棚u c畉�u  g畛�i m畉�t kh畉�u"
+msgstr "Y棚u c畉�u g畛�i m畉�t kh畉�u"
 
 #: src/protocols/msn/dispatch.c:104
 msgid "Protocol version not supported"
@@ -5397,7 +5398,7 @@
 
 #: src/protocols/msn/dispatch.c:147 src/protocols/msn/notification.c:1911
 msgid "Got invalid XFR"
-msgstr "Nh畉�n XFR kh担ng h畛�p l畛�"
+msgstr "C坦 XFR kh担ng h畛�p l畛�"
 
 #: src/protocols/msn/dispatch.c:178
 msgid "Unable to transfer"
@@ -5409,8 +5410,8 @@
 
 #: src/protocols/msn/dispatch.c:215 src/protocols/msn/msn.c:490
 #: src/protocols/msn/notification.c:2141 src/protocols/napster/napster.c:463
-#: src/protocols/napster/napster.c:494 src/protocols/yahoo/yahoo.c:1715
-#: src/protocols/yahoo/yahoo.c:1746 src/protocols/yahoo/yahoo.c:1811
+#: src/protocols/napster/napster.c:494 src/protocols/yahoo/yahoo.c:1734
+#: src/protocols/yahoo/yahoo.c:1765 src/protocols/yahoo/yahoo.c:1830
 msgid "Unable to connect"
 msgstr "Kh担ng th畛� k畉�t n畛�i"
 
@@ -5469,7 +5470,7 @@
 
 #: src/protocols/msn/error.c:65
 msgid "User is offline"
-msgstr "Ng動畛�i d湛ng �ang ngo畉�i tuy畉�n"
+msgstr "Ng動畛�i d湛ng ch動a k畉�t n畛�i"
 
 #: src/protocols/msn/error.c:68
 msgid "Already in the mode"
@@ -5509,7 +5510,7 @@
 
 #: src/protocols/msn/error.c:97
 msgid "Notify Transfer failed"
-msgstr "Truy畛�n Th担ng B叩o Kh担ng �動畛�c"
+msgstr "L畛�i truy畛�n th担ng b叩o"
 
 #: src/protocols/msn/error.c:101
 msgid "Required fields missing"
@@ -5550,11 +5551,11 @@
 #: src/protocols/msn/error.c:130 src/protocols/msn/error.c:143
 #: src/protocols/msn/error.c:198
 msgid "Server unavailable"
-msgstr "M叩y ch畛� hi畛�n kh担ng ho畉�t �畛�ng"
+msgstr "M叩y ch畛� hi畛�n kh担ng c坦"
 
 #: src/protocols/msn/error.c:133
 msgid "Peer Notification server down"
-msgstr "Th担ng b叩o m叩y ch畛� ng動ng"
+msgstr "M叩y ch畛� th担ng b叩o ngang h�ng ng畛�ng ho畉�t �畛�ng"
 
 #: src/protocols/msn/error.c:136
 msgid "Database connect error"
@@ -5562,7 +5563,7 @@
 
 #: src/protocols/msn/error.c:140
 msgid "Server is going down (abandon ship)"
-msgstr "M叩y ch畛� ng畛�ng  (abandon ship)"
+msgstr "M叩y ch畛� �ang ng畛�ng  (abandon ship)"
 
 #: src/protocols/msn/error.c:147
 msgid "Error creating connection"
@@ -5604,14 +5605,14 @@
 msgid "Server too busy"
 msgstr "M叩y ch畛� b畉�n"
 
-#: src/protocols/msn/error.c:190 src/protocols/oscar/oscar.c:1121
+#: src/protocols/msn/error.c:190 src/protocols/oscar/oscar.c:1076
 #: src/protocols/toc/toc.c:659
 msgid "Authentication failed"
 msgstr "Kh担ng x叩c th畛�c �動畛�c"
 
 #: src/protocols/msn/error.c:193
 msgid "Not allowed when offline"
-msgstr "Kh担ng �動畛�c ph辿p khi ch動a ��ng nh畉�p"
+msgstr "Kh担ng �動畛�c ph辿p khi ch動a k畉�t n畛�i"
 
 #: src/protocols/msn/error.c:201
 msgid "Not accepting new users"
@@ -5672,17 +5673,17 @@
 
 #: src/protocols/msn/msn.c:227
 msgid "Disallow"
-msgstr "Kh担ng cho ph辿p"
+msgstr "C畉�m"
 
 #: src/protocols/msn/msn.c:244
 msgid "Send a mobile message."
-msgstr "G畛�i tin nh畉�n t畛�i di �畛�ng"
+msgstr "G畛�i tin nh畉�n t畛�i di �畛�ng."
 
 #: src/protocols/msn/msn.c:246
 msgid "Page"
 msgstr "Nh畉�n tin"
 
-#: src/protocols/msn/msn.c:332 src/protocols/yahoo/yahoo.c:2140
+#: src/protocols/msn/msn.c:332 src/protocols/yahoo/yahoo.c:2164
 #, c-format
 msgid "<b>Status:</b> %s"
 msgstr "<b>Tr畉�ng th叩i:</b> %s"
@@ -5693,26 +5694,26 @@
 msgstr "R畛�i kh畛�i m叩y t鱈nh"
 
 #: src/protocols/msn/msn.c:346 src/protocols/msn/msn.c:628
-#: src/protocols/msn/state.c:31 src/protocols/yahoo/yahoo.c:2008
-#: src/protocols/yahoo/yahoo.c:2304 src/protocols/yahoo/yahoo.c:2404
+#: src/protocols/msn/state.c:31 src/protocols/yahoo/yahoo.c:2032
+#: src/protocols/yahoo/yahoo.c:2335 src/protocols/yahoo/yahoo.c:2435
 msgid "Be Right Back"
 msgstr "S畉� quay l畉�i ngay"
 
 #: src/protocols/msn/msn.c:347 src/protocols/msn/msn.c:630
-#: src/protocols/msn/state.c:29 src/protocols/yahoo/yahoo.c:2010
-#: src/protocols/yahoo/yahoo.c:2306 src/protocols/yahoo/yahoo.c:2405
+#: src/protocols/msn/state.c:29 src/protocols/yahoo/yahoo.c:2034
+#: src/protocols/yahoo/yahoo.c:2337 src/protocols/yahoo/yahoo.c:2436
 msgid "Busy"
 msgstr "�ang b畉�n"
 
 #: src/protocols/msn/msn.c:348 src/protocols/msn/msn.c:632
-#: src/protocols/msn/state.c:33 src/protocols/yahoo/yahoo.c:2018
-#: src/protocols/yahoo/yahoo.c:2314 src/protocols/yahoo/yahoo.c:2409
+#: src/protocols/msn/state.c:33 src/protocols/yahoo/yahoo.c:2042
+#: src/protocols/yahoo/yahoo.c:2345 src/protocols/yahoo/yahoo.c:2440
 msgid "On The Phone"
 msgstr "�ang b畉�n n坦i �i畛�n tho畉�i"
 
 #: src/protocols/msn/msn.c:349 src/protocols/msn/msn.c:634
-#: src/protocols/msn/state.c:34 src/protocols/yahoo/yahoo.c:2022
-#: src/protocols/yahoo/yahoo.c:2318 src/protocols/yahoo/yahoo.c:2411
+#: src/protocols/msn/state.c:34 src/protocols/yahoo/yahoo.c:2046
+#: src/protocols/yahoo/yahoo.c:2349 src/protocols/yahoo/yahoo.c:2442
 msgid "Out To Lunch"
 msgstr "�i �n tr動a"
 
@@ -5779,73 +5780,73 @@
 "T棚n hi畛�n th畛� MSN ph畉�i c坦 d畉�ng \"user@server.com\". C坦 th畛� 箪 c畛�a b畉�n l� %"
 "s@hotmail.com. Danh s叩ch b畛� ch畉�n kh担ng c坦 g狸 thay �畛�i."
 
-#: src/protocols/msn/msn.c:1283 src/protocols/yahoo/yahoo.c:2580
+#: src/protocols/msn/msn.c:1285 src/protocols/yahoo/yahoo.c:2612
 msgid "<html><body><b>Error retrieving profile</b></body></html>"
 msgstr "<html><body><b>L畛�i x畉�y ra khi l畉�y th担ng tin l箪 l畛�ch</b></body></html>"
 
 #. Age
-#: src/protocols/msn/msn.c:1351 src/protocols/oscar/oscar.c:4041
+#: src/protocols/msn/msn.c:1355 src/protocols/oscar/oscar.c:3996
 #: src/protocols/trepia/trepia.c:285 src/protocols/trepia/trepia.c:413
-#: src/protocols/yahoo/yahoo.c:2694
+#: src/protocols/yahoo/yahoo.c:2722
 msgid "Age"
 msgstr "Tu畛�i"
 
 #. Gender
-#: src/protocols/msn/msn.c:1358 src/protocols/oscar/oscar.c:4027
+#: src/protocols/msn/msn.c:1362 src/protocols/oscar/oscar.c:3982
 #: src/protocols/trepia/trepia.c:279 src/protocols/trepia/trepia.c:421
-#: src/protocols/yahoo/yahoo.c:2706
+#: src/protocols/yahoo/yahoo.c:2730
 msgid "Gender"
 msgstr "Gi畛�i t鱈nh"
 
-#: src/protocols/msn/msn.c:1366 src/protocols/yahoo/yahoo.c:2700
+#: src/protocols/msn/msn.c:1370 src/protocols/yahoo/yahoo.c:2726
 msgid "Marital Status"
 msgstr "T狸nh tr畉�ng h担n nh但n"
 
-#: src/protocols/msn/msn.c:1373 src/protocols/yahoo/yahoo.c:2688
+#: src/protocols/msn/msn.c:1377 src/protocols/yahoo/yahoo.c:2718
 msgid "Location"
 msgstr "N董i 畛�"
 
-#: src/protocols/msn/msn.c:1381 src/protocols/yahoo/yahoo.c:2712
+#: src/protocols/msn/msn.c:1385 src/protocols/yahoo/yahoo.c:2734
 msgid "Occupation"
 msgstr "Ngh畛� nghi畛�p"
 
-#: src/protocols/msn/msn.c:1398 src/protocols/msn/msn.c:1404
-#: src/protocols/msn/msn.c:1411 src/protocols/msn/msn.c:1418
-#: src/protocols/msn/msn.c:1425
+#: src/protocols/msn/msn.c:1402 src/protocols/msn/msn.c:1408
+#: src/protocols/msn/msn.c:1415 src/protocols/msn/msn.c:1422
+#: src/protocols/msn/msn.c:1429
 msgid "A Little About Me"
 msgstr "�担i ch炭t v畛� b畉�n th但n"
 
-#: src/protocols/msn/msn.c:1434 src/protocols/msn/msn.c:1447
-#: src/protocols/msn/msn.c:1454
+#: src/protocols/msn/msn.c:1438 src/protocols/msn/msn.c:1451
+#: src/protocols/msn/msn.c:1458
 msgid "Favorite Things"
 msgstr "Nh畛�ng th畛� y棚u th鱈ch"
 
-#: src/protocols/msn/msn.c:1463 src/protocols/msn/msn.c:1469
-#: src/protocols/msn/msn.c:1476
+#: src/protocols/msn/msn.c:1467 src/protocols/msn/msn.c:1473
+#: src/protocols/msn/msn.c:1480
 msgid "Hobbies and Interests"
 msgstr "S畛� th鱈ch"
 
-#: src/protocols/msn/msn.c:1485 src/protocols/msn/msn.c:1491
-#: src/protocols/yahoo/yahoo.c:2756
+#: src/protocols/msn/msn.c:1489 src/protocols/msn/msn.c:1495
+#: src/protocols/yahoo/yahoo.c:2769
 msgid "Favorite Quote"
 msgstr "C但u tr鱈ch d畉�n 動a th鱈ch"
 
-#: src/protocols/msn/msn.c:1499 src/protocols/yahoo/yahoo.c:2800
+#: src/protocols/msn/msn.c:1503 src/protocols/yahoo/yahoo.c:2805
 msgid "Last Updated"
 msgstr "C畉�p nh畉�t l畉�n cu畛�i"
 
 #. Homepage
-#: src/protocols/msn/msn.c:1510 src/protocols/trepia/trepia.c:289
+#: src/protocols/msn/msn.c:1514 src/protocols/trepia/trepia.c:289
 #: src/protocols/trepia/trepia.c:457
 msgid "Homepage"
 msgstr "Trang ch畛�"
 
-#: src/protocols/msn/msn.c:1532 src/protocols/yahoo/yahoo.c:2818
+#: src/protocols/msn/msn.c:1536 src/protocols/yahoo/yahoo.c:2820
 #, c-format
 msgid "User information for %s unavailable"
 msgstr "Hi畛�n kh担ng c坦 th担ng tin v畛� %s"
 
-#: src/protocols/msn/msn.c:1534 src/protocols/yahoo/yahoo.c:2820
+#: src/protocols/msn/msn.c:1538 src/protocols/yahoo/yahoo.c:2822
 msgid "The user's profile is empty."
 msgstr "L箪 l畛�ch ng動畛�i d湛ng n�y tr畛�ng."
 
@@ -5859,15 +5860,15 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/msn/msn.c:1632 src/protocols/msn/msn.c:1634
+#: src/protocols/msn/msn.c:1636 src/protocols/msn/msn.c:1638
 msgid "MSN Protocol Plugin"
 msgstr "Plugin Giao Th畛�c MSN"
 
-#: src/protocols/msn/msn.c:1651 src/protocols/trepia/trepia.c:1340
+#: src/protocols/msn/msn.c:1655 src/protocols/trepia/trepia.c:1340
 msgid "Login server"
 msgstr "��ng Nh畉�p M叩y Ch畛�"
 
-#: src/protocols/msn/msn.c:1661
+#: src/protocols/msn/msn.c:1665
 msgid "Use HTTP Method"
 msgstr "D湛ng giao th畛�c HTTP"
 
@@ -5909,7 +5910,7 @@
 msgstr "Kh担ng th畛� k畉�t n畛�i t畛�i m叩y ch畛� passport"
 
 #: src/protocols/msn/notification.c:709 src/protocols/msn/notification.c:741
-#: src/protocols/oscar/oscar.c:1407
+#: src/protocols/oscar/oscar.c:1362
 msgid "Password sent"
 msgstr "�達 g畛�i m畉�t kh畉�u"
 
@@ -5952,19 +5953,17 @@
 "\n"
 "After the maintenance has been completed, you will be able to successfully "
 "sign in."
-msgid_plural ""
 "The MSN server will shut down for maintenance in %d minutes. You will "
 "automatically be signed out at that time.  Please finish any conversations "
 "in progress.\n"
 "\n"
 "After the maintenance has been completed, you will be able to successfully "
 "sign in."
-msgstr[0] ""
+msgstr ""
 "M叩y ch畛� MSN s畉� t畉�t trong v嘆ng %d ph炭t �畛� b畉�o tr狸. B畉�n s畉� �動畛�c t畛� �畛�ng ng畉�t "
 "k畉�t n畛�i v�o l炭c �坦. H達y k畉�t th炭c m畛�i cu畛�c tho畉�i �ang di畛�n ra.\n"
 "\n"
 "Sau khi ho�n t畉�t vi畛�c b畉�o tr狸, b畉�n c坦 th畛� k畉�t n畛�i tr畛� l畉�i nh動 b狸nh th動畛�ng."
-msgstr[1] ""
 "M叩y ch畛� MSN s畉� t畉�t trong v嘆ng %d ph炭t �畛� b畉�o tr狸. B畉�n s畉� �動畛�c t畛� �畛�ng ng畉�t "
 "k畉�t n畛�i v�o l炭c �坦. H達y k畉�t th炭c m畛�i cu畛�c tho畉�i �ang di畛�n ra.\n"
 "\n"
@@ -6021,7 +6020,8 @@
 msgid ""
 "You were disconnected from the server, because you logged on from a "
 "different location"
-msgstr "B畉�n b畛� ng畉�t k畉�t n畛�i kh畛�i m叩y ch畛� v狸 b畉�n �達 ��ng nh畉�p t畛� m畛�t v畛� tr鱈 kh叩c"
+msgstr ""
+"B畉�n b畛� ng畉�t k畉�t n畛�i kh畛�i m叩y ch畛� v狸 b畉�n �達 ��ng nh畉�p t畛� m畛�t v畛� tr鱈 kh叩c"
 
 #. MSG_CLIENT_PING
 #: src/protocols/napster/napster.c:416
@@ -6029,7 +6029,7 @@
 msgid "%s requested a PING"
 msgstr "%s y棚u c畉�u PING"
 
-#: src/protocols/napster/napster.c:543 src/protocols/oscar/oscar.c:5253
+#: src/protocols/napster/napster.c:543 src/protocols/oscar/oscar.c:5208
 #: src/protocols/toc/toc.c:1259
 msgid "Join what group:"
 msgstr "Tham gia nh坦m n�o:"
@@ -6066,7 +6066,7 @@
 
 #: src/protocols/oscar/oscar.c:184
 msgid "Service unavailable"
-msgstr "Hi畛�n kh担ng c坦 D畛�ch v畛�"
+msgstr "Hi畛�n kh担ng c坦 d畛�ch v畛�"
 
 #: src/protocols/oscar/oscar.c:185
 msgid "Service not defined"
@@ -6138,7 +6138,7 @@
 
 #: src/protocols/oscar/oscar.c:202
 msgid "Queue full"
-msgstr "Danh s叩ch x畉�p h�ng �達 �畉�y"
+msgstr "H�ng x畉�p �達 �畉�y"
 
 #: src/protocols/oscar/oscar.c:203
 msgid "Not while on AOL"
@@ -6147,12 +6147,12 @@
 #: src/protocols/oscar/oscar.c:475
 #, c-format
 msgid "Direct IM with %s closed"
-msgstr "Nh畉�n tin tr畛�c ti畉�p v畛�i %s b畛� �坦ng"
+msgstr "Nh畉�n tin nhanh tr畛�c ti畉�p v畛�i %s b畛� �坦ng"
 
 #: src/protocols/oscar/oscar.c:477
 #, c-format
 msgid "Direct IM with %s failed"
-msgstr "Kh担ng nh畉�n tin tr畛�c ti畉�p �動畛�c v畛�i %s"
+msgstr "Kh担ng nh畉�n tin nhanh tr畛�c ti畉�p �動畛�c v畛�i %s"
 
 #: src/protocols/oscar/oscar.c:535 src/protocols/toc/toc.c:218
 #: src/protocols/toc/toc.c:625 src/protocols/toc/toc.c:641
@@ -6181,7 +6181,7 @@
 msgid "Unable to login to AIM"
 msgstr "Kh担ng ��ng nh畉�p AIM �動畛�c"
 
-#: src/protocols/oscar/oscar.c:779 src/protocols/oscar/oscar.c:1212
+#: src/protocols/oscar/oscar.c:779 src/protocols/oscar/oscar.c:1167
 msgid "Could Not Connect"
 msgstr "Kh担ng k畉�t n畛�i �動畛�c"
 
@@ -6192,34 +6192,34 @@
 #: src/protocols/oscar/oscar.c:854 src/protocols/oscar/oscar.c:867
 #: src/protocols/oscar/oscar.c:872
 msgid "File Transfer Aborted"
-msgstr "H畛�y b畛� vi畛�c truy畛�n t畉�p tin"
+msgstr "B畛� vi畛�c truy畛�n t畉�p tin"
 
 #: src/protocols/oscar/oscar.c:855
 msgid "Unable to establish listener socket."
-msgstr "Kh担ng th畛� thi畉�t l畉�p socket b畛� nghe."
+msgstr "Kh担ng th畛� thi畉�t l畉�p listener socket."
 
 #: src/protocols/oscar/oscar.c:868
 msgid "Unable to establish file descriptor."
-msgstr "Kh担ng th畛� thi畉�t l畉�p t畉�p tin b畛� m担 t畉�."
+msgstr "Kh担ng th畛� thi畉�t l畉�p b畛� m担 t畉� t畉�p tin."
 
 #: src/protocols/oscar/oscar.c:873
 msgid "Unable to create new connection."
 msgstr "Kh担ng t畉�o �動畛�c k畉�t n畛�i m畛�i."
 
-#: src/protocols/oscar/oscar.c:1098 src/protocols/toc/toc.c:571
+#: src/protocols/oscar/oscar.c:1053 src/protocols/toc/toc.c:571
 msgid "Incorrect nickname or password."
-msgstr "T棚n ho畉�c m畉�t kh畉�u sai."
-
-#: src/protocols/oscar/oscar.c:1103
+msgstr "Bi畛�t danh ho畉�c m畉�t kh畉�u sai."
+
+#: src/protocols/oscar/oscar.c:1058
 msgid "Your account is currently suspended."
-msgstr "T�i kho畉�n c畛�a b畉�n t畉�m th畛�i b畛� ng動ng."
+msgstr "T�i kho畉�n c畛�a b畉�n t畉�m th畛�i b畛� �狸nh ch畛�."
 
 #. service temporarily unavailable
-#: src/protocols/oscar/oscar.c:1107
+#: src/protocols/oscar/oscar.c:1062
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "T畉�m th畛�i kh担ng d湛ng �動畛�c D畛�ch v畛� tin nh畉�n t畛�c th畛�i AOL."
 
-#: src/protocols/oscar/oscar.c:1112
+#: src/protocols/oscar/oscar.c:1067
 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."
@@ -6227,21 +6227,21 @@
 "B畉�n �達 li棚n t畛�c k畉�t n畛�i v� ng畉�t k畉�t n畛�i qu叩 nhi畛�u. Xin ch畛� 10 ph炭t r畛�i th畛� "
 "l畉�i. N畉�u b畉�n c畛� k畉�t n畛�i, b畉�n c坦 th畛� s畉� ph畉�i �畛�i l但u h董n."
 
-#: src/protocols/oscar/oscar.c:1117
+#: src/protocols/oscar/oscar.c:1072
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr "B畉�n �ang d湛ng phi棚n b畉�n qu叩 c滴. H達y n但ng c畉�p t畉�i %s"
 
-#: src/protocols/oscar/oscar.c:1149
+#: src/protocols/oscar/oscar.c:1104
 msgid "Internal Error"
 msgstr "L畛�i b棚n trong"
 
-#: src/protocols/oscar/oscar.c:1219
+#: src/protocols/oscar/oscar.c:1174
 msgid "Received authorization"
-msgstr "X叩c th畛�c �達 nh畉�n"
-
-#: src/protocols/oscar/oscar.c:1254 src/protocols/oscar/oscar.c:1284
-#: src/protocols/oscar/oscar.c:1372
+msgstr "Nh畉�n x叩c th畛�c"
+
+#: src/protocols/oscar/oscar.c:1209 src/protocols/oscar/oscar.c:1239
+#: src/protocols/oscar/oscar.c:1327
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
@@ -6250,55 +6250,55 @@
 "B畉�n c坦 th畛� b畛� ng畉�t k畉�t n畛�i m畛�t th畛�i gian ng畉�n. Trong l炭c ch畛� �畛�i l畛�i �動畛�c "
 "s畛�a, b畉�n c坦 th畛� s畛� d畛�ng TOC. H達y ki畛�m tra %s �畛� c畉�p nh畉�t."
 
-#: src/protocols/oscar/oscar.c:1257 src/protocols/oscar/oscar.c:1287
+#: src/protocols/oscar/oscar.c:1212 src/protocols/oscar/oscar.c:1242
 msgid "Gaim was unable to get a valid AIM login hash."
 msgstr "Gaim kh担ng th畛� nh畉�n m達 ��ng nh畉�p AIM h畛�p l畛�."
 
-#: src/protocols/oscar/oscar.c:1375
+#: src/protocols/oscar/oscar.c:1330
 msgid "Gaim was unable to get a valid login hash."
 msgstr "Gaim kh担ng th畛� nh畉�n m達 ��ng nh畉�p h畛�p l畛�."
 
-#: src/protocols/oscar/oscar.c:1957 src/protocols/oscar/oscar.c:5691
+#: src/protocols/oscar/oscar.c:1912 src/protocols/oscar/oscar.c:5646
 #, c-format
 msgid "Direct IM with %s established"
-msgstr "�達 thi畉�t l畉�p IM tr畛�c ti畉�p v畛�i %s"
-
-#: src/protocols/oscar/oscar.c:2286 src/protocols/oscar/oscar.c:2308
+msgstr "�達 thi畉�t l畉�p nh畉�n tin nhanh tr畛�c ti畉�p v畛�i %s"
+
+#: src/protocols/oscar/oscar.c:2241 src/protocols/oscar/oscar.c:2263
 msgid "(There was an error receiving this message)"
 msgstr "(C坦 l畛�i khi nh畉�n th担ng �i畛�p n�y)"
 
-#: src/protocols/oscar/oscar.c:2455
+#: src/protocols/oscar/oscar.c:2410
 #, c-format
 msgid "%s has just asked to directly connect to %s"
 msgstr "%s �畛� ngh畛� k畉�t n畛�i tr畛�c ti畉�p v畛�i %s"
 
-#: src/protocols/oscar/oscar.c:2458
+#: src/protocols/oscar/oscar.c:2413
 msgid ""
 "This requires a direct connection between the two computers and is necessary "
 "for IM Images.  Because your IP address will be revealed, this may be "
 "considered a privacy risk."
 msgstr ""
 "�i畛�u n�y �嘆i h畛�i m畛�t k畉�t n畛�i tr畛�c ti畉�p gi畛�a hai m叩y t鱈nh v� l� c畉�n thi畉�t �畛� "
-"trao �畛�i tin nh畉�nc坦 h狸nh 畉�nh. Tuy nhi棚n, ng動畛�i ta s畉� th畉�y �畛�a ch畛� IP c畛�a "
-"b畉�n, m畛�t nguy c董 s畉� l�m 畉�nh h動畛�ng �畉�n quy畛�n ri棚ng t動."
-
-#: src/protocols/oscar/oscar.c:2463 src/protocols/oscar/oscar.c:6060
+"d湛ng nh畉�n tin nhanh c坦 h狸nh 畉�nh. Tuy nhi棚n, ng動畛�i ta s畉� th畉�y �畛�a ch畛� IP c畛�a "
+"b畉�n, l� nguy c董 畉�nh h動畛�ng �畉�n quy畛�n ri棚ng t動."
+
+#: src/protocols/oscar/oscar.c:2418 src/protocols/oscar/oscar.c:6015
 msgid "Connect"
 msgstr "K畉�t n畛�i"
 
-#: src/protocols/oscar/oscar.c:2490
+#: src/protocols/oscar/oscar.c:2445
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr "H達y x叩c th畛�c t担i �畛� t担i c坦 th畛� th棚m b畉�n v�o danh s叩ch buddy."
 
-#: src/protocols/oscar/oscar.c:2498
+#: src/protocols/oscar/oscar.c:2453
 msgid "Authorization Request Message:"
 msgstr "Th担ng �i畛�p y棚u c畉�u x叩c th畛�c:"
 
-#: src/protocols/oscar/oscar.c:2499
+#: src/protocols/oscar/oscar.c:2454
 msgid "Please authorize me!"
 msgstr "H達y x叩c th畛�c t担i!"
 
-#: src/protocols/oscar/oscar.c:2527
+#: src/protocols/oscar/oscar.c:2482
 #, c-format
 msgid ""
 "The user %s requires authorization before being added to a buddy list.  Do "
@@ -6307,23 +6307,23 @@
 "Ng動畛�i d湛ng %s y棚u c畉�u x叩c th畛�c tr動畛�c khi th棚m h畛� v�o danh s叩ch buddy. B畉�n "
 "mu畛�n g畛�i m畛�t y棚u c畉�u x叩c th畛�c kh担ng ?"
 
-#: src/protocols/oscar/oscar.c:2532 src/protocols/oscar/oscar.c:2534
+#: src/protocols/oscar/oscar.c:2487 src/protocols/oscar/oscar.c:2489
 msgid "Request Authorization"
 msgstr "Y棚u c畉�u x叩c th畛�c"
 
-#: src/protocols/oscar/oscar.c:2570 src/protocols/oscar/oscar.c:2572
-#: src/protocols/oscar/oscar.c:2579 src/protocols/oscar/oscar.c:2655
-#: src/protocols/oscar/oscar.c:2675 src/protocols/oscar/oscar.c:3031
-#: src/protocols/oscar/oscar.c:3088 src/protocols/oscar/oscar.c:5174
-#: src/protocols/oscar/oscar.c:5220
+#: src/protocols/oscar/oscar.c:2525 src/protocols/oscar/oscar.c:2527
+#: src/protocols/oscar/oscar.c:2534 src/protocols/oscar/oscar.c:2610
+#: src/protocols/oscar/oscar.c:2630 src/protocols/oscar/oscar.c:2986
+#: src/protocols/oscar/oscar.c:3043 src/protocols/oscar/oscar.c:5129
+#: src/protocols/oscar/oscar.c:5175
 msgid "No reason given."
 msgstr "Kh担ng n棚u l箪 do."
 
-#: src/protocols/oscar/oscar.c:2578
+#: src/protocols/oscar/oscar.c:2533
 msgid "Authorization Denied Message:"
 msgstr "Th担ng �i畛�p t畛� ch畛�i x叩c th畛�c:"
 
-#: src/protocols/oscar/oscar.c:2655
+#: src/protocols/oscar/oscar.c:2610
 #, c-format
 msgid ""
 "The user %u wants to add you to their buddy list for the following reason:\n"
@@ -6332,11 +6332,11 @@
 "Ng動畛�i d湛ng %u mu畛�n th棚m b畉�n v�o danh s叩ch buddy c畛�a h畛� v畛�i l箪 do sau:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2663 src/protocols/oscar/oscar.c:5180
+#: src/protocols/oscar/oscar.c:2618 src/protocols/oscar/oscar.c:5135
 msgid "Authorization Request"
 msgstr "Y棚u c畉�u x叩c th畛�c"
 
-#: src/protocols/oscar/oscar.c:2675
+#: src/protocols/oscar/oscar.c:2630
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -6347,17 +6347,17 @@
 "sau:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2676
+#: src/protocols/oscar/oscar.c:2631
 msgid "ICQ authorization denied."
 msgstr "X叩c th畛�c ICQ b畛� t畛� ch畛�i."
 
 #. Someone has granted you authorization
-#: src/protocols/oscar/oscar.c:2683
+#: src/protocols/oscar/oscar.c:2638
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
 msgstr "Ng動畛�i d湛ng %u �達 cho ph辿p b畉�n th棚m h畛� v�o danh s叩ch buddy c畛�a b畉�n."
 
-#: src/protocols/oscar/oscar.c:2691
+#: src/protocols/oscar/oscar.c:2646
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -6370,7 +6370,7 @@
 "T畛�: %s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2699
+#: src/protocols/oscar/oscar.c:2654
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -6383,7 +6383,7 @@
 "T畛�: %s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2707
+#: src/protocols/oscar/oscar.c:2662
 #, c-format
 msgid ""
 "You have received an ICQ email from %s [%s]\n"
@@ -6396,211 +6396,214 @@
 "Th担ng �i畛�p:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2728
+#: src/protocols/oscar/oscar.c:2683
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
 msgstr "Ng動畛�i d湛ng ICQ %u g畛�i t畛�i b畉�n m畛�t buddy: %s (%s)"
 
-#: src/protocols/oscar/oscar.c:2734
+#: src/protocols/oscar/oscar.c:2689
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr "B畉�n mu畛�n th棚m ng動畛�i n�y v�o danh s叩ch buddy c畛�a b畉�n kh担ng?"
 
-#: src/protocols/oscar/oscar.c:2738
+#: src/protocols/oscar/oscar.c:2693
 msgid "Decline"
 msgstr "T畛� ch畛�i"
 
-#: src/protocols/oscar/oscar.c:2820
+#: src/protocols/oscar/oscar.c:2775
 #, 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] "B畉�n kh担ng nh畉�n �動畛�c %hu th担ng �i畛�p t畛� %s v狸 n坦 kh担ng h畛�p l畛�."
 msgstr[1] "B畉�n kh担ng nh畉�n �動畛�c %hu th担ng �i畛�p t畛� %s v狸 ch炭ng kh担ng h畛�p l畛�."
 
-#: src/protocols/oscar/oscar.c:2829
+#: src/protocols/oscar/oscar.c:2784
 #, 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] "B畉�n kh担ng nh畉�n �動畛�c %hu th担ng �i畛�p t畛� %s v狸 n坦 qu叩 l畛�n."
 msgstr[1] "B畉�n kh担ng nh畉�n �動畛�c %hu th担ng �i畛�p t畛� %s v狸 ch炭ng qu叩 l畛�n."
 
-#: src/protocols/oscar/oscar.c:2838
-#, c-format
-msgid "You missed %hu message from %s because the rate limit has been exceeded."
-msgid_plural "You missed %hu messages from %s because the rate limit has been exceeded."
-msgstr[0] "B畉�n kh担ng nh畉�n �動畛�c %hu th担ng �i畛�p t畛� %s v狸 �達 v動畛�t qu叩 m畛�c gi畛�i h畉�n."
-msgstr[1] "B畉�n kh担ng nh畉�n �動畛�c %hu th担ng �i畛�p t畛� %s v狸 �達 v動畛�t qu叩 m畛�c gi畛�i h畉�n."
-
-#: src/protocols/oscar/oscar.c:2847
+#: src/protocols/oscar/oscar.c:2793
+#, c-format
+msgid ""
+"You missed %hu message from %s because the rate limit has been exceeded."
+"You missed %hu messages from %s because the rate limit has been exceeded."
+msgstr ""
+"B畉�n kh担ng nh畉�n �動畛�c %hu th担ng �i畛�p t畛� %s v狸 �達 v動畛�t qu叩 m畛�c gi畛�i h畉�n."
+"B畉�n kh担ng nh畉�n �動畛�c %hu th担ng �i畛�p t畛� %s v狸 �達 v動畛�t qu叩 m畛�c gi畛�i h畉�n."
+
+#: src/protocols/oscar/oscar.c:2802
 #, 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] "B畉�n kh担ng nh畉�n �動畛�c %hu th担ng �i畛�p t畛� %s v狸 h畛� qu叩 b畉�o m畉�t."
 msgstr[1] "B畉�n kh担ng nh畉�n �動畛�c %hu th担ng �i畛�p t畛� %s v狸 h畛� qu叩 b畉�o m畉�t."
 
-#: src/protocols/oscar/oscar.c:2856
+#: src/protocols/oscar/oscar.c:2811
 #, 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] "B畉�n kh担ng nh畉�n �動畛�c %hu th担ng �i畛�p t畛� %s v狸 b畉�n qu叩 b畉�o m畉�t."
 msgstr[1] "B畉�n kh担ng nh畉�n �動畛�c %hu th担ng �i畛�p t畛� %s v狸 b畉�n qu叩 b畉�o m畉�t."
 
-#: src/protocols/oscar/oscar.c:2865
+#: src/protocols/oscar/oscar.c:2820
 #, 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] "B畉�n kh担ng nh畉�n �動畛�c %hu th担ng �i畛�p t畛� %s do l畛�i ch動a x叩c �畛�nh."
 msgstr[1] "B畉�n kh担ng nh畉�n �動畛�c %hu th担ng �i畛�p t畛� %s do l畛�i ch動a x叩c �畛�nh."
 
-#: src/protocols/oscar/oscar.c:2881 src/protocols/oscar/oscar.c:4648
-#: src/protocols/oscar/oscar.c:6187
+#: src/protocols/oscar/oscar.c:2836 src/protocols/oscar/oscar.c:4603
+#: src/protocols/oscar/oscar.c:6142
 msgid "Free For Chat"
 msgstr "R畉�nh r畛�i �畛� Chat"
 
-#: src/protocols/oscar/oscar.c:2885 src/protocols/oscar/oscar.c:4642
-#: src/protocols/oscar/oscar.c:6185
+#: src/protocols/oscar/oscar.c:2840 src/protocols/oscar/oscar.c:4597
+#: src/protocols/oscar/oscar.c:6140
 msgid "Not Available"
 msgstr "Kh担ng c坦 m畉�t"
 
-#: src/protocols/oscar/oscar.c:2887 src/protocols/oscar/oscar.c:4645
-#: src/protocols/oscar/oscar.c:6186
+#: src/protocols/oscar/oscar.c:2842 src/protocols/oscar/oscar.c:4600
+#: src/protocols/oscar/oscar.c:6141
 msgid "Occupied"
 msgstr "�ang b畉�n"
 
-#: src/protocols/oscar/oscar.c:2891
+#: src/protocols/oscar/oscar.c:2846
 msgid "Web Aware"
 msgstr "Ki畉�n th畛�c Web"
 
-#: src/protocols/oscar/oscar.c:2934
+#: src/protocols/oscar/oscar.c:2889
 #, c-format
 msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<HR>%s"
 msgstr "<B>UIN:</B> %s<BR><B>Tr畉�ng th叩i:</B> %s<HR>%s"
 
-#: src/protocols/oscar/oscar.c:2993
+#: src/protocols/oscar/oscar.c:2948
 #, c-format
 msgid "SNAC threw error: %s\n"
 msgstr "SNAC b叩o l畛�i: %s\n"
 
 #. Data is assumed to be the destination sn
-#: src/protocols/oscar/oscar.c:3029
+#: src/protocols/oscar/oscar.c:2984
 #, c-format
 msgid "Your message to %s did not get sent:"
 msgstr "Kh担ng g畛�i �動畛�c th担ng �i畛�p c畛�a b畉�n t畛�i %s:"
 
-#: src/protocols/oscar/oscar.c:3086
+#: src/protocols/oscar/oscar.c:3041
 #, c-format
 msgid "User information for %s unavailable:"
 msgstr "Kh担ng c坦 th担ng tin v畛� %s:"
 
-#: src/protocols/oscar/oscar.c:3125
+#: src/protocols/oscar/oscar.c:3080
 msgid "Voice"
 msgstr "Ti畉�ng"
 
-#: src/protocols/oscar/oscar.c:3128
+#: src/protocols/oscar/oscar.c:3083
 msgid "AIM Direct IM"
-msgstr "Nh畉�n tin tr畛�c ti畉�p AIM"
-
-#: src/protocols/oscar/oscar.c:3134 src/protocols/oscar/oscar.c:6278
+msgstr "Nh畉�n tin nhanh tr畛�c ti畉�p AIM"
+
+#: src/protocols/oscar/oscar.c:3089 src/protocols/oscar/oscar.c:6241
 msgid "Get File"
 msgstr "Nh畉�n t畉�p tin"
 
-#: src/protocols/oscar/oscar.c:3137
+#: src/protocols/oscar/oscar.c:3092 src/protocols/oscar/oscar.c:6233
+#: src/protocols/yahoo/yahoo.c:2213
 msgid "Send File"
 msgstr "G畛�i t畉�p tin"
 
-#: src/protocols/oscar/oscar.c:3141
+#: src/protocols/oscar/oscar.c:3096
 msgid "Games"
 msgstr "Tr嘆 ch董i"
 
-#: src/protocols/oscar/oscar.c:3144
+#: src/protocols/oscar/oscar.c:3099
 msgid "Add-Ins"
 msgstr "Add-Ins"
 
-#: src/protocols/oscar/oscar.c:3147
+#: src/protocols/oscar/oscar.c:3102
 msgid "Send Buddy List"
 msgstr "G畛�i danh s叩ch Buddy"
 
-#: src/protocols/oscar/oscar.c:3150
+#: src/protocols/oscar/oscar.c:3105
 msgid "ICQ Direct Connect"
 msgstr "K畉�t n畛�i tr畛�c ti畉�p ICQ"
 
-#: src/protocols/oscar/oscar.c:3153
+#: src/protocols/oscar/oscar.c:3108
 msgid "AP User"
 msgstr "Ng動畛�i d湛ng AP"
 
-#: src/protocols/oscar/oscar.c:3156
+#: src/protocols/oscar/oscar.c:3111
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
-#: src/protocols/oscar/oscar.c:3159
+#: src/protocols/oscar/oscar.c:3114
 msgid "Nihilist"
 msgstr "Nihilist"
 
-#: src/protocols/oscar/oscar.c:3162
+#: src/protocols/oscar/oscar.c:3117
 msgid "ICQ Server Relay"
 msgstr "ICQ Server Relay"
 
-#: src/protocols/oscar/oscar.c:3165
+#: src/protocols/oscar/oscar.c:3120
 msgid "Old ICQ UTF8"
 msgstr "ICQ UTF8 C滴"
 
-#: src/protocols/oscar/oscar.c:3168
+#: src/protocols/oscar/oscar.c:3123
 msgid "Trillian Encryption"
 msgstr "M達 h坦a Trillian"
 
-#: src/protocols/oscar/oscar.c:3171
+#: src/protocols/oscar/oscar.c:3126
 msgid "ICQ UTF8"
 msgstr "ICQ UTF8"
 
-#: src/protocols/oscar/oscar.c:3174
+#: src/protocols/oscar/oscar.c:3129
 msgid "Hiptop"
 msgstr "Hiptop"
 
-#: src/protocols/oscar/oscar.c:3177
+#: src/protocols/oscar/oscar.c:3132
 msgid "Security Enabled"
 msgstr "B畉�t b畉�o m畉�t"
 
-#: src/protocols/oscar/oscar.c:3180
+#: src/protocols/oscar/oscar.c:3135
 msgid "Video Chat"
 msgstr "Video Chat"
 
-#: src/protocols/oscar/oscar.c:3209
+#: src/protocols/oscar/oscar.c:3164
 #, c-format
 msgid "Username: <b>%s</b><br>\n"
 msgstr "T棚n ng動畛�i d湛ng: <b>%s</b><br>\n"
 
-#: src/protocols/oscar/oscar.c:3210
+#: src/protocols/oscar/oscar.c:3165
 #, c-format
 msgid "Warning Level: <b>%d%%</b><br>\n"
 msgstr "M畛�c c畉�nh b叩o: <b>%d%%</b><br>\n"
 
-#: src/protocols/oscar/oscar.c:3213
+#: src/protocols/oscar/oscar.c:3168
 #, c-format
 msgid "Online Since: <b>%s</b><br>\n"
 msgstr "��ng nh畉�p t畛� l炭c : <b>%s</b><br>\n"
 
-#: src/protocols/oscar/oscar.c:3217
+#: src/protocols/oscar/oscar.c:3172
 #, c-format
 msgid "Member Since: <b>%s</b><br>\n"
 msgstr "��ng k箪 th�nh vi棚n t畛�: <b>%s</b><br>\n"
 
-#: src/protocols/oscar/oscar.c:3222
+#: src/protocols/oscar/oscar.c:3177
 #, c-format
 msgid "Idle: <b>%s</b>"
 msgstr "Ngh畛�: <b>%s</b>"
 
-#: src/protocols/oscar/oscar.c:3225
+#: src/protocols/oscar/oscar.c:3180
 msgid "Idle: <b>Active</b>"
 msgstr "Ngh畛�: <b>Ho畉�t �畛�ng</b>"
 
-#: src/protocols/oscar/oscar.c:3264
+#: src/protocols/oscar/oscar.c:3219
 msgid "Your AIM connection may be lost."
 msgstr "B畉�n c坦 th畛� �達 b畛� ng畉�t k畉�t n畛�i v畛�i AIM"
 
-#: src/protocols/oscar/oscar.c:3658
+#: src/protocols/oscar/oscar.c:3613
 msgid "Rate limiting error."
 msgstr "M畛�c gi畛�i h畉�n b畛� l畛�i."
 
-#: src/protocols/oscar/oscar.c:3659
+#: src/protocols/oscar/oscar.c:3614
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
@@ -6608,7 +6611,7 @@
 "H�nh �畛�ng l畉�n cu畛�i m� b畉�n th畛� kh担ng �動畛�c th畛�c hi畛�n v狸 b畉�n �達 v動畛�t qu叩 m畛�c "
 "gi畛�i h畉�n. H達y ch畛� 10 gi但y r畛�i th畛� l畉�i."
 
-#: src/protocols/oscar/oscar.c:3720
+#: src/protocols/oscar/oscar.c:3675
 msgid ""
 "You have been disconnected because you have signed on with this screen name "
 "at another location."
@@ -6616,109 +6619,109 @@
 "B畉�n b畛� ng畉�t k畉�t n畛�i v狸 b畉�n �達 ��ng nh畉�p v畛�i t棚n hi畛�n th畛� n�y t畉�i m畛�t v畛� tr鱈 "
 "kh叩c."
 
-#: src/protocols/oscar/oscar.c:3722
+#: src/protocols/oscar/oscar.c:3677
 msgid "You have been signed off for an unknown reason."
 msgstr "B畉�n b畛� ng畉�t k畉�t n畛�i do m畛�t nguy棚n nh但n ch動a x叩c �畛�nh."
 
-#: src/protocols/oscar/oscar.c:3753
+#: src/protocols/oscar/oscar.c:3708
 msgid "Finalizing connection"
 msgstr "Ho�n t畉�t k畉�t n畛�i"
 
-#: src/protocols/oscar/oscar.c:4013 src/protocols/oscar/oscar.c:4019
+#: src/protocols/oscar/oscar.c:3968 src/protocols/oscar/oscar.c:3974
 msgid "Email Address"
 msgstr "�畛�a ch畛� email"
 
-#: src/protocols/oscar/oscar.c:4024
+#: src/protocols/oscar/oscar.c:3979
 msgid "Mobile Phone"
 msgstr "S畛� �i畛�n tho畉�i �i �畛�ng"
 
-#: src/protocols/oscar/oscar.c:4027 src/protocols/trepia/trepia.c:281
+#: src/protocols/oscar/oscar.c:3982 src/protocols/trepia/trepia.c:281
 #: src/protocols/trepia/trepia.c:422
 msgid "Female"
 msgstr "N畛�"
 
-#: src/protocols/oscar/oscar.c:4027 src/protocols/trepia/trepia.c:280
+#: src/protocols/oscar/oscar.c:3982 src/protocols/trepia/trepia.c:280
 #: src/protocols/trepia/trepia.c:422
 msgid "Male"
 msgstr "Nam"
 
-#: src/protocols/oscar/oscar.c:4044
+#: src/protocols/oscar/oscar.c:3999
 msgid "Personal Web Page"
 msgstr "Trang web c叩 nh但n"
 
-#: src/protocols/oscar/oscar.c:4047
+#: src/protocols/oscar/oscar.c:4002
 msgid "Additional Information"
 msgstr "Th担ng tin th棚m"
 
-#: src/protocols/oscar/oscar.c:4051
+#: src/protocols/oscar/oscar.c:4006
 msgid "Home Address"
 msgstr "�畛�a ch畛� nh�"
 
-#: src/protocols/oscar/oscar.c:4062 src/protocols/oscar/oscar.c:4078
+#: src/protocols/oscar/oscar.c:4017 src/protocols/oscar/oscar.c:4033
 msgid "Zip Code"
 msgstr "M達 b動u �i畛�n"
 
-#: src/protocols/oscar/oscar.c:4067
+#: src/protocols/oscar/oscar.c:4022
 msgid "Work Address"
 msgstr "�畛�a ch畛� c担ng t叩c"
 
-#: src/protocols/oscar/oscar.c:4083
+#: src/protocols/oscar/oscar.c:4038
 msgid "Work Information"
 msgstr "Th担ng tin v畛� c担ng vi畛�c"
 
-#: src/protocols/oscar/oscar.c:4085
+#: src/protocols/oscar/oscar.c:4040
 msgid "Company"
 msgstr "C担ng ty"
 
-#: src/protocols/oscar/oscar.c:4088
+#: src/protocols/oscar/oscar.c:4043
 msgid "Division"
 msgstr "B畛� ph畉�n"
 
-#: src/protocols/oscar/oscar.c:4091
+#: src/protocols/oscar/oscar.c:4046
 msgid "Position"
 msgstr "Ch畛�c v畛�"
 
-#: src/protocols/oscar/oscar.c:4094
+#: src/protocols/oscar/oscar.c:4049
 msgid "Web Page"
 msgstr "Trang Web"
 
-#: src/protocols/oscar/oscar.c:4100
+#: src/protocols/oscar/oscar.c:4055
 #, c-format
 msgid "ICQ Info for %s"
 msgstr "Th担ng tin ICQ cho %s"
 
-#: src/protocols/oscar/oscar.c:4150
+#: src/protocols/oscar/oscar.c:4105
 msgid "Pop-Up Message"
 msgstr "Th担ng �i畛�p b畉�t l棚n"
 
-#: src/protocols/oscar/oscar.c:4171
+#: src/protocols/oscar/oscar.c:4126
 #, c-format
 msgid "The following screennames are associated with %s"
 msgstr "T棚n hi畛�n th畛� sau �但y l� li棚n quan v畛�i %s"
 
-#: src/protocols/oscar/oscar.c:4175
+#: src/protocols/oscar/oscar.c:4130
 msgid "Search Results"
 msgstr "K畉�t qu畉� t狸m ki畉�m"
 
-#: src/protocols/oscar/oscar.c:4192
+#: src/protocols/oscar/oscar.c:4147
 #, c-format
 msgid "No results found for email address %s"
 msgstr "Kh担ng t狸m th畉�y ng動畛�i n�o c坦 �i畉� ch畛� email %s"
 
-#: src/protocols/oscar/oscar.c:4213
+#: src/protocols/oscar/oscar.c:4168
 #, c-format
 msgid "You should receive an email asking to confirm %s."
 msgstr "B畉�n s畉� nh畉�n �動畛�c m畛�t email y棚u c畉�u x叩c nh畉�n %s."
 
-#: src/protocols/oscar/oscar.c:4215
+#: src/protocols/oscar/oscar.c:4170
 msgid "Account Confirmation Requested"
 msgstr "Y棚u c畉�u x叩c nh畉�n t�i kho畉�n"
 
-#: src/protocols/oscar/oscar.c:4243
+#: src/protocols/oscar/oscar.c:4198
 msgid "Error Changing Account Info"
 msgstr "C坦 l畛�i khi thay �畛�i th担ng tin t�i kho畉�n"
 
-#: src/protocols/oscar/oscar.c:4246
+#: src/protocols/oscar/oscar.c:4201
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -6727,7 +6730,7 @@
 "L畛�i 0x%04x: kh担ng th畛� �畛�nh d畉�ng t棚n hi畛�n th畛� v狸 n坦 kh叩c v畛�i t棚n ban �畉�u "
 "(g畛�c)."
 
-#: src/protocols/oscar/oscar.c:4249
+#: src/protocols/oscar/oscar.c:4204
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -6736,14 +6739,14 @@
 "L畛�i 0x%04x: Kh担ng th畛� �畛�nh d畉�ng t棚n hi畛�n th畛� v狸 n坦 k畉�t th炭c b畉�ng m畛�t kho畉�ng "
 "tr畉�ng."
 
-#: src/protocols/oscar/oscar.c:4252
+#: src/protocols/oscar/oscar.c:4207
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
 "is too long."
 msgstr "L畛�i 0x%04x: Kh担ng th畛� �畛�nh d畉�ng t棚n hi畛�n th畛� b畛�i v狸 n坦 qu叩 d�i."
 
-#: src/protocols/oscar/oscar.c:4255
+#: src/protocols/oscar/oscar.c:4210
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because there is already a "
@@ -6752,7 +6755,7 @@
 "L畛�i 0x%04x: Kh担ng �畛�i �動畛�c �畛�a ch畛� email v狸 �達 c坦 m畛�t y棚u c畉�u �動畛�c x畛� l箪 cho "
 "t棚n hi畛�n th畛� n�y."
 
-#: src/protocols/oscar/oscar.c:4258
+#: src/protocols/oscar/oscar.c:4213
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address has "
@@ -6761,19 +6764,20 @@
 "L畛�i 0x%04x: Kh担ng �畛�i �動畛�c �畛�a ch畛� email v狸 c坦 qu叩 nhi畛�u t棚n hi畛�n th畛� c坦 "
 "li棚n quan v畛�i �畛�a ch畛� n�y."
 
-#: src/protocols/oscar/oscar.c:4261
+#: src/protocols/oscar/oscar.c:4216
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address is "
 "invalid."
-msgstr "L畛�i 0x%04x: Kh担ng thay �畛�i �動畛�c �畛�a ch畛� email v狸 �畛�a ch畛� �動a ra kh担ng h畛�p l畛�."
-
-#: src/protocols/oscar/oscar.c:4264
+msgstr ""
+"L畛�i 0x%04x: Kh担ng thay �畛�i �動畛�c �畛�a ch畛� email v狸 �畛�a ch畛� �動a ra kh担ng h畛�p l畛�."
+
+#: src/protocols/oscar/oscar.c:4219
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "L畛�i 0x%04x: l畛�i kh担ng x叩c �畛�nh."
 
-#: src/protocols/oscar/oscar.c:4274
+#: src/protocols/oscar/oscar.c:4229
 #, c-format
 msgid ""
 "Your screen name is currently formatted as follows:\n"
@@ -6782,20 +6786,20 @@
 "T棚n hi畛�n th畛� hi畛�n th畛�i c畛�a b畉�n �動畛�c �畛�nh d畉�ng nh動 sau:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:4275 src/protocols/oscar/oscar.c:4282
+#: src/protocols/oscar/oscar.c:4230 src/protocols/oscar/oscar.c:4237
 msgid "Account Info"
 msgstr "Th担ng tin t�i kho畉�n"
 
-#: src/protocols/oscar/oscar.c:4280
+#: src/protocols/oscar/oscar.c:4235
 #, c-format
 msgid "The email address for %s is %s"
 msgstr "�畛�a ch畛� email c畛�a %s l� %s"
 
-#: src/protocols/oscar/oscar.c:4512
+#: src/protocols/oscar/oscar.c:4467
 msgid "Unable to set AIM profile."
 msgstr "Kh担ng th畛� l畉�p l箪 l畛�ch AIM."
 
-#: src/protocols/oscar/oscar.c:4513
+#: src/protocols/oscar/oscar.c:4468
 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 "
@@ -6804,59 +6808,57 @@
 "B畉�n c坦 th畛� �達 y棚u c畉�u l畉�p l箪 l畛�ch tr動畛�c khi ho�n th�nh th畛� t畛�c ��ng nh畉�p. V狸 "
 "v畉�y l箪 l畛�ch c畛�a b畉�n v畉�n ch動a �動畛�c l畉�p; h達y th畛� l畉�i sau khi b畉�n k畉�t n畛�i xong."
 
-#: src/protocols/oscar/oscar.c:4540
+#: src/protocols/oscar/oscar.c:4495
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  Gaim has truncated "
 "it for you."
-msgid_plural ""
 "The maximum profile length of %d bytes has been exceeded.  Gaim has "
 "truncated it for you."
-msgstr[0] "�達 v動畛�t qu叩 �畛� d�i l箪 l畛�ch t畛�i �a %d byte. Gaim s畉� l動畛�c b畛� n坦 gi炭p b畉�n."
-msgstr[1] "�達 v動畛�t qu叩 �畛� d�i l箪 l畛�ch t畛�i �a %d byte. Gaim s畉� l動畛�c b畛� n坦 gi炭p b畉�n."
-
-#: src/protocols/oscar/oscar.c:4545
+msgstr ""
+"�達 v動畛�t qu叩 �畛� d�i l箪 l畛�ch t畛�i �a %d byte. Gaim s畉� l動畛�c b畛� n坦 gi炭p b畉�n."
+"�達 v動畛�t qu叩 �畛� d�i l箪 l畛�ch t畛�i �a %d byte. Gaim s畉� l動畛�c b畛� n坦 gi炭p b畉�n."
+
+#: src/protocols/oscar/oscar.c:4500
 msgid "Profile too long."
 msgstr "L箪 l畛�ch qu叩 d�i."
 
-#: src/protocols/oscar/oscar.c:4562
+#: src/protocols/oscar/oscar.c:4517
 msgid "Unable to set AIM away message."
 msgstr "Kh担ng l畉�p �動畛�c th担ng �i畛�p v畉�ng m畉�t cho AIM."
 
-#: src/protocols/oscar/oscar.c:4563
+#: src/protocols/oscar/oscar.c:4518
 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 ""
-"C坦 l畉� b畉�n �達 �畉�t th担ng �i畛�p v畉�ng m畉�t tr動畛�c khi ho�n th�nh ��ng nh畉�p. B畉�n "
-"v畉�n trong tr畉�ngth叩i \"hi畛�n t畉�i\"; h達y th畛� �畉�t l畉�i th担ng �i畛�p v畉�ng m畉�t sau "
-"khi k畉�t n畛�i xong."
-
-#: src/protocols/oscar/oscar.c:4603
+"C坦 l畉� b畉�n �達 �畉�t th担ng �i畛�p v畉�ng m畉�t tr動畛�c khi ho�n th�nh ��ng nh畉�p. B畉�n v畉�n "
+"trong tr畉�ngth叩i \"hi畛�n t畉�i\"; h達y th畛� �畉�t l畉�i th担ng �i畛�p v畉�ng m畉�t sau khi "
+"k畉�t n畛�i xong."
+
+#: src/protocols/oscar/oscar.c:4558
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  Gaim has "
 "truncated it for you."
-msgid_plural ""
 "The maximum away message length of %d bytes has been exceeded.  Gaim has "
 "truncated it for you."
-msgstr[0] ""
+msgstr ""
 "�達 v動畛�t qu叩 �畛� d�i t畛�i �a %d byte c畛�a th担ng b叩o v畉�ng m畉�t.  Gaim s畉� l動畛�c b畛� "
 "gi炭p b畉�n."
-msgstr[1] ""
 "�達 v動畛�t qu叩 �畛� d�i t畛�i �a %d byte c畛�a th担ng b叩o v畉�ng m畉�t.  Gaim s畉� l動畛�c b畛� "
 "gi炭p b畉�n."
 
-#: src/protocols/oscar/oscar.c:4608
+#: src/protocols/oscar/oscar.c:4563
 msgid "Away message too long."
 msgstr "Th担ng b叩o v畉�ng m畉�t qu叩 d�i."
 
-#: src/protocols/oscar/oscar.c:4822
+#: src/protocols/oscar/oscar.c:4777
 msgid "Unable To Retrieve Buddy List"
 msgstr "Kh担ng th畛� nh畉�n danh s叩ch Buddy"
 
-#: src/protocols/oscar/oscar.c:4823
+#: src/protocols/oscar/oscar.c:4778
 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 "
@@ -6865,12 +6867,12 @@
 "Gaim t畉�m th畛�i kh担ng nh畉�n �動畛�c danh s叩ch buddy c畛�a b畉�n t畛� m叩y ch畛� AIM. Danh "
 "s叩ch n�y kh担ng m畉�t v� c坦 th畛� nh畉�n �動畛�c sau v�i gi畛� n畛�a."
 
-#: src/protocols/oscar/oscar.c:4915 src/protocols/oscar/oscar.c:4916
-#: src/protocols/oscar/oscar.c:4921
+#: src/protocols/oscar/oscar.c:4870 src/protocols/oscar/oscar.c:4871
+#: src/protocols/oscar/oscar.c:4876
 msgid "Orphans"
 msgstr "M畛�t m狸nh"
 
-#: src/protocols/oscar/oscar.c:5087
+#: src/protocols/oscar/oscar.c:5042
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -6879,15 +6881,15 @@
 "Kh担ng th畛� th棚m buddy %s v狸 danh s叩ch c畛�a b畉�n c坦 qu叩 nhi畛�u buddy. H達y b畛� b畛�t "
 "1 buddy v� th畛� l畉�i."
 
-#: src/protocols/oscar/oscar.c:5087 src/protocols/oscar/oscar.c:5100
+#: src/protocols/oscar/oscar.c:5042 src/protocols/oscar/oscar.c:5055
 msgid "(no name)"
 msgstr "(kh担ng t棚n)"
 
-#: src/protocols/oscar/oscar.c:5088 src/protocols/oscar/oscar.c:5101
+#: src/protocols/oscar/oscar.c:5043 src/protocols/oscar/oscar.c:5056
 msgid "Unable To Add"
 msgstr "Kh担ng th畛� th棚m"
 
-#: src/protocols/oscar/oscar.c:5100
+#: src/protocols/oscar/oscar.c:5055
 #, c-format
 msgid ""
 "Could not add the buddy %s for an unknown reason.  The most common reason "
@@ -6897,7 +6899,7 @@
 "Kh担ng th畛� th棚m buddy %s v狸 nguy棚n nh但n kh担ng x叩c �畛�nh. L箪 do th動畛�ng g畉�p l� "
 "b畉�n �畉�t s畛� l動畛�ng buddy t畛�i �a trong danh s叩ch buddy c畛�a b畉�n."
 
-#: src/protocols/oscar/oscar.c:5135
+#: src/protocols/oscar/oscar.c:5090
 #, c-format
 msgid ""
 "The user %s has given you permission to add you to their buddy list.  Do you "
@@ -6906,11 +6908,11 @@
 "Ng動畛�i d湛ng %s �達 xin ph辿p b畉�n �畛� h畛� th棚m b畉�n v�o danh s叩ch buddy c畛�a h畛�. B畉�n "
 "c坦 mu畛�n th棚m h畛� v�o danh s叩ch c畛�a b畉�n kh担ng?"
 
-#: src/protocols/oscar/oscar.c:5141
+#: src/protocols/oscar/oscar.c:5096
 msgid "Authorization Given"
 msgstr "X叩c th畛�c �動畛�c trao"
 
-#: src/protocols/oscar/oscar.c:5174
+#: src/protocols/oscar/oscar.c:5129
 #, c-format
 msgid ""
 "The user %s wants to add you to their buddy list for the following reason:\n"
@@ -6920,17 +6922,17 @@
 "%s"
 
 #. Granted
-#: src/protocols/oscar/oscar.c:5216
+#: src/protocols/oscar/oscar.c:5171
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
 msgstr "Ng動畛�i d湛ng %s �達 cho ph辿p b畉�n th棚m h畛� v�o danh s叩ch buddy c畛�a b畉�n."
 
-#: src/protocols/oscar/oscar.c:5217
+#: src/protocols/oscar/oscar.c:5172
 msgid "Authorization Granted"
 msgstr "X叩c th畛�c �動畛�c ch畉�p thu畉�n"
 
 #. Denied
-#: src/protocols/oscar/oscar.c:5220
+#: src/protocols/oscar/oscar.c:5175
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -6941,56 +6943,56 @@
 "v畛�i l箪 do sau:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:5221
+#: src/protocols/oscar/oscar.c:5176
 msgid "Authorization Denied"
 msgstr "X叩c th畛�c b畛� t畛� ch畛�i"
 
-#: src/protocols/oscar/oscar.c:5258 src/protocols/toc/toc.c:1264
+#: src/protocols/oscar/oscar.c:5213 src/protocols/toc/toc.c:1264
 msgid "Exchange:"
 msgstr "Trao �畛�i:"
 
-#: src/protocols/oscar/oscar.c:5495
+#: src/protocols/oscar/oscar.c:5450
 msgid "<b>Status:</b> "
 msgstr "<b>Tr畉�ng th叩i:</b> "
 
-#: src/protocols/oscar/oscar.c:5504
+#: src/protocols/oscar/oscar.c:5459
 msgid "<b>Logged In:</b> "
 msgstr "<b>��ng nh畉�p:</b> "
 
-#: src/protocols/oscar/oscar.c:5516
+#: src/protocols/oscar/oscar.c:5471
 msgid "<b>IP Address:</b> "
 msgstr "<b>�畛�a Ch畛� IP:</b> "
 
-#: src/protocols/oscar/oscar.c:5524
+#: src/protocols/oscar/oscar.c:5479
 msgid "<b>Capabilities:</b> "
 msgstr "<b> Kh畉� n�ng:</b> "
 
-#: src/protocols/oscar/oscar.c:5531
+#: src/protocols/oscar/oscar.c:5486
 msgid "<b>Available:</b> "
 msgstr "<b>Hi畛�n c坦:</b> "
 
-#: src/protocols/oscar/oscar.c:5549
+#: src/protocols/oscar/oscar.c:5504
 msgid "<b>Away Message:</b> "
-msgstr "<b>Th担ng b叩o v畉�ng m畉�t:</b> "
-
-#: src/protocols/oscar/oscar.c:5558
+msgstr "<b>Th担ng b叩o tr畉�ng th叩i:</b> "
+
+#: src/protocols/oscar/oscar.c:5513
 msgid "<b>Status:</b> Not Authorized"
 msgstr "<b>Tr畉�ng th叩i:</b> Kh担ng �動畛�c x叩c th畛�c"
 
-#: src/protocols/oscar/oscar.c:5592 src/protocols/yahoo/yahoo.c:2030
+#: src/protocols/oscar/oscar.c:5547 src/protocols/yahoo/yahoo.c:2054
 msgid "Offline"
 msgstr "Ngo畉�i tuy畉�n"
 
-#: src/protocols/oscar/oscar.c:6040
+#: src/protocols/oscar/oscar.c:5995
 msgid "Unable to open Direct IM"
-msgstr "Kh担ng th畛� m畛� Nh畉�n Tin Tr畛�c Ti畉�p"
-
-#: src/protocols/oscar/oscar.c:6053
+msgstr "Kh担ng th畛� m畛� Nh畉�n Tin Nhanh Tr畛�c Ti畉�p"
+
+#: src/protocols/oscar/oscar.c:6008
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
-msgstr "B畉�n �達 ch畛�n m畛� k畉�t n畛�i Nh畉�n tin Tr畛�c ti畉�p v畛�i %s."
-
-#: src/protocols/oscar/oscar.c:6056
+msgstr "B畉�n �達 ch畛�n m畛� k畉�t n畛�i Nh畉�n Tin Nhanh tr畛�c ti畉�p v畛�i %s."
+
+#: src/protocols/oscar/oscar.c:6011
 msgid ""
 "Because this reveals your IP address, it may be considered a privacy risk.  "
 "Do you wish to continue?"
@@ -6998,51 +7000,51 @@
 "�i畛�u n�y cho ph辿p ng動畛�i kh叩c th畉�y �動畛�c �畛�a ch畛� IP m叩y b畉�n, c坦 th畛� b畛� h動畛�ng "
 "�畉�n s畛� ri棚ng t動 c畛�a b畉�n. B畉�n c坦 mu畛�n ti畉�p t畛�c kh担ng?"
 
-#: src/protocols/oscar/oscar.c:6231
+#: src/protocols/oscar/oscar.c:6186
 msgid "Buddy Comment:"
 msgstr "Ch炭 th鱈ch Buddy:"
 
-#: src/protocols/oscar/oscar.c:6247
+#: src/protocols/oscar/oscar.c:6202
 msgid "Edit Buddy Comment"
-msgstr "Hi畛�u ch畛�nh Ch炭 Th鱈ch Buddy"
-
-#: src/protocols/oscar/oscar.c:6255
+msgstr "Hi畛�u ch畛�nh ch炭 th鱈ch Buddy"
+
+#: src/protocols/oscar/oscar.c:6210
 msgid "Get Status Msg"
 msgstr "Xem hi畛�n th畛� tr畉�ng th叩i"
 
-#: src/protocols/oscar/oscar.c:6270
+#: src/protocols/oscar/oscar.c:6225
 msgid "Direct IM"
-msgstr "Nh畉�n Tin Tr畛�c Ti畉�p"
-
-#: src/protocols/oscar/oscar.c:6291
+msgstr "Nh畉�n Tin Nhanh Tr畛�c Ti畉�p"
+
+#: src/protocols/oscar/oscar.c:6254
 msgid "Re-request Authorization"
 msgstr "Y棚u c畉�u l畉�i x叩c th畛�c"
 
-#: src/protocols/oscar/oscar.c:6312
+#: src/protocols/oscar/oscar.c:6275
 msgid "The new formatting is invalid."
 msgstr "�畛�nh d畉�ng m畛�i kh担ng h畛�p l畛�."
 
-#: src/protocols/oscar/oscar.c:6313
+#: src/protocols/oscar/oscar.c:6276
 msgid "Screenname formatting can change only capitalization and whitespace."
 msgstr "�畛�nh d畉�ng cho t棚n hi畛�n th畛� ch畛� �畛�i ch畛� vi畉�t hoa v� kho畉�ng tr畛�ng."
 
-#: src/protocols/oscar/oscar.c:6319
+#: src/protocols/oscar/oscar.c:6282
 msgid "New screenname formatting:"
 msgstr "�畛�nh d畉�ng t棚n hi畛�n th畛� m畛�i:"
 
-#: src/protocols/oscar/oscar.c:6368
+#: src/protocols/oscar/oscar.c:6331
 msgid "Change Address To:"
 msgstr "�畛�i �畛�a ch畛� th�nh:"
 
-#: src/protocols/oscar/oscar.c:6412
+#: src/protocols/oscar/oscar.c:6375
 msgid "<i>you are not waiting for authorization</i>"
-msgstr "<i>b畉�n kh担ng ch畛� x叩c th畛�c</i>"
-
-#: src/protocols/oscar/oscar.c:6415
+msgstr "<i>b畉�n kh担ng �ang ch畛� x叩c th畛�c</i>"
+
+#: src/protocols/oscar/oscar.c:6378
 msgid "You are awaiting authorization from the following buddies"
 msgstr "B畉�n �ang ch畛� x叩c th畛�c c畛�a c叩c buddy sau �但y"
 
-#: src/protocols/oscar/oscar.c:6416
+#: src/protocols/oscar/oscar.c:6379
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
@@ -7050,63 +7052,63 @@
 "B畉�n c坦 th畛� g畛�i l畉�i y棚u c畉�u x叩c th畛�c c畛�a ng動畛�i kh叩c b畉�ng c叩ch nh畉�n chu畛�t ph畉�i "
 "v�o t棚n ng動畛�i �坦 v� ch畛�n \"G畛�i l畉�i y棚u c畉�u x叩c th畛�c.\""
 
-#: src/protocols/oscar/oscar.c:6430
+#: src/protocols/oscar/oscar.c:6393
 msgid "Find Buddy by E-mail"
 msgstr "T狸m Buddy d畛�a theo �畛�a ch畛� email"
 
-#: src/protocols/oscar/oscar.c:6431
+#: src/protocols/oscar/oscar.c:6394
 msgid "Search for a buddy by e-mail address"
 msgstr "T狸m ki畉�m buddy b畉�ng �畛�a ch畛� email"
 
-#: src/protocols/oscar/oscar.c:6432
+#: src/protocols/oscar/oscar.c:6395
 msgid "Type the e-mail address of the buddy you are searching for."
 msgstr "H達y nh畉�p �畛�a ch畛� email c畛�a buddy m� b畉�n c畉�n t狸m."
 
-#: src/protocols/oscar/oscar.c:6435
+#: src/protocols/oscar/oscar.c:6398
 msgid "Search"
 msgstr "T狸m ki畉�m"
 
-#: src/protocols/oscar/oscar.c:6449
+#: src/protocols/oscar/oscar.c:6412
 msgid "Available Message:"
-msgstr "Th担ng �i畛�p hi畛�n c坦:"
-
-#: src/protocols/oscar/oscar.c:6450
+msgstr "Th担ng b叩o c坦 m畉�t:"
+
+#: src/protocols/oscar/oscar.c:6413
 msgid "I'm doing work and hoping for a distraction--IM me!"
-msgstr "T担i �ang l�m vi畛�c v� c畉�n ch炭t th動 gi達n--H達y d湛ng tin nh畉�n nhanh v畛�i t担i!"
-
-#: src/protocols/oscar/oscar.c:6528
+msgstr "T担i �ang l�m vi畛�c v� c畉�n ch炭t th動 gi達n--D湛ng nh畉�n tin nhanh v畛�i t担i!"
+
+#: src/protocols/oscar/oscar.c:6491
 msgid "Set Available Message"
-msgstr "L畉�p th担ng �i畛�p C坦 M畉�t"
+msgstr "L畉�p th担ng b叩o c坦 m畉�t"
+
+#: src/protocols/oscar/oscar.c:6505
+msgid "Change Password (URL)"
+msgstr "�畛�i m畉�t kh畉�u (URL)"
+
+#: src/protocols/oscar/oscar.c:6513
+msgid "Configure IM Forwarding (URL)"
+msgstr "C畉�u h狸nh chuy畛�n ti畉�p Nh畉�n Tin Nhanh (URL)"
+
+#: src/protocols/oscar/oscar.c:6524
+msgid "Format Screenname"
+msgstr "�畛�nh D畉�ng T棚n Hi畛�n Th畛�"
+
+#: src/protocols/oscar/oscar.c:6530
+msgid "Confirm Account"
+msgstr "X叩c nh畉�n t�i kho畉�n"
+
+#: src/protocols/oscar/oscar.c:6536
+msgid "Display Current Registered Address"
+msgstr "Hi畛�n th畛� �畛�a ch畛� ��ng k箪 Hi畛�n th畛�i "
 
 #: src/protocols/oscar/oscar.c:6542
-msgid "Change Password (URL)"
-msgstr "�畛�i m畉�t kh畉�u (URL)"
-
-#: src/protocols/oscar/oscar.c:6550
-msgid "Configure IM Forwarding (URL)"
-msgstr "C畉�u h狸nh chuy畛�n ti畉�p th担ng �i畛�p t畛�c th畛�i (URL)"
-
-#: src/protocols/oscar/oscar.c:6561
-msgid "Format Screenname"
-msgstr "�畛�nh D畉�ng T棚n Hi畛�n Th畛�"
-
-#: src/protocols/oscar/oscar.c:6567
-msgid "Confirm Account"
-msgstr "X叩c nh畉�n T�i kho畉�n"
-
-#: src/protocols/oscar/oscar.c:6573
-msgid "Display Current Registered Address"
-msgstr "Hi畛�n th畛� �畛�a ch畛� ��ng k箪 Hi畛�n th畛�i "
-
-#: src/protocols/oscar/oscar.c:6579
 msgid "Change Current Registered Address"
-msgstr "�畛�i �畛�a ch畛� ��ng k箪 Hi畛�n th畛�i"
-
-#: src/protocols/oscar/oscar.c:6588
+msgstr "�畛�i �畛�a ch畛� ��ng k箪 hi畛�n th畛�i"
+
+#: src/protocols/oscar/oscar.c:6551
 msgid "Show Buddies Awaiting Authorization"
 msgstr "Hi畛�n th畛� c叩c buddy ch畛� x叩c th畛�c"
 
-#: src/protocols/oscar/oscar.c:6596
+#: src/protocols/oscar/oscar.c:6559
 msgid "Search for Buddy by Email"
 msgstr "T狸m ki畉�m buddy b畉�ng email"
 
@@ -7120,15 +7122,15 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/oscar/oscar.c:6722 src/protocols/oscar/oscar.c:6724
+#: src/protocols/oscar/oscar.c:6680 src/protocols/oscar/oscar.c:6682
 msgid "AIM/ICQ Protocol Plugin"
 msgstr "Plugin giao th畛�c AIM/ICQ"
 
-#: src/protocols/oscar/oscar.c:6741
+#: src/protocols/oscar/oscar.c:6699
 msgid "Auth host"
 msgstr "M叩y ch畛� x叩c th畛�c"
 
-#: src/protocols/oscar/oscar.c:6746
+#: src/protocols/oscar/oscar.c:6704
 msgid "Auth port"
 msgstr "C畛�ng x叩c th畛�c"
 
@@ -7181,20 +7183,20 @@
 #: src/protocols/toc/toc.c:534
 #, c-format
 msgid "You missed an IM from %s because it was too big."
-msgstr "B畉�n kh担ng nh畉�n �動畛�c tin nh畉�n t畛� %s v狸 n坦 qu叩 l畛�n."
+msgstr "B畉�n kh担ng nh畉�n �動畛�c tin nh畉�n nhanh t畛� %s v狸 n坦 qu叩 l畛�n."
 
 #: src/protocols/toc/toc.c:537
 #, c-format
 msgid "You missed an IM from %s because it was sent too fast."
-msgstr "B畉�n kh担ng nh畉�n �動畛�c tin nh畉�n t畛� %s v狸 n坦 �動畛�c g畛�i qu叩 nhanh."
+msgstr "B畉�n kh担ng nh畉�n �動畛�c tin nh畉�n nhanh t畛� %s v狸 n坦 �動畛�c g畛�i qu叩 nhanh."
 
 #: src/protocols/toc/toc.c:540
 msgid "Failure."
-msgstr "Kh担ng �動畛�c."
+msgstr "L畛�i."
 
 #: src/protocols/toc/toc.c:543
 msgid "Too many matches."
-msgstr "Qu叩 nhi畛�u k畉�t qu畉� so kh畛�p."
+msgstr "Qu叩 nhi畛�u k畉�t qu畉� tr湛ng kh畛�p."
 
 #: src/protocols/toc/toc.c:546
 msgid "Need more qualifiers."
@@ -7265,7 +7267,8 @@
 
 #: src/protocols/toc/toc.c:715
 msgid "TOC has come back from its pause. You may now send messages again."
-msgstr "TOC th担i tr畉�ng th叩i t畉�m ng畛�ng. B但y gi畛� b畉�n c坦 th畛� g畛�i tin nh畉�n tr畛� l畉�i."
+msgstr ""
+"TOC th担i tr畉�ng th叩i t畉�m ng畛�ng. B但y gi畛� b畉�n c坦 th畛� g畛�i tin nh畉�n tr畛� l畉�i."
 
 #: src/protocols/toc/toc.c:903
 msgid "Password Change Successful"
@@ -7357,11 +7360,11 @@
 #. E-Mail Address
 #: src/protocols/trepia/trepia.c:294
 msgid "E-Mail Address"
-msgstr "�畛�a ch畛� Th動 �i畛�n t畛�"
+msgstr "�畛�a ch畛� e-mail"
 
 #: src/protocols/trepia/trepia.c:300
 msgid "Profile Information"
-msgstr "Th担ng tin L箪 l畛�ch"
+msgstr "Th担ng tin l箪 l畛�ch"
 
 #. Instant Messagers
 #: src/protocols/trepia/trepia.c:306
@@ -7414,10 +7417,6 @@
 msgid "Local Users"
 msgstr "Ng動畛�i d湛ng C畛�c b畛�"
 
-#: src/protocols/trepia/trepia.c:972
-msgid "Read error"
-msgstr "L畛�i �畛�c"
-
 #: src/protocols/trepia/trepia.c:1073
 msgid "Logging in"
 msgstr "��ng nh畉�p"
@@ -7436,27 +7435,28 @@
 msgid "Trepia Protocol Plugin"
 msgstr "Plugin giao th畛�c Trepia"
 
-#: src/protocols/yahoo/yahoo.c:700
+#: src/protocols/yahoo/yahoo.c:715
 msgid "Your Yahoo! message did not get sent."
 msgstr "Th担ng �i畛�p Yahoo! c畛�a b畉�n �達 kh担ng �動畛�c g畛�i."
 
-#: src/protocols/yahoo/yahoo.c:758
+#: src/protocols/yahoo/yahoo.c:773
 #, c-format
 msgid "%s has (retroactively) denied your request to add them to your list."
 msgstr "%s kh担ng ch畉�p nh畉�n �畛� ngh畛� th棚m h畛� v�o danh s叩ch c畛�a b畉�n."
 
-#: src/protocols/yahoo/yahoo.c:760
+#: src/protocols/yahoo/yahoo.c:775
 #, c-format
 msgid ""
 "%s has (retroactively) denied your request to add them to your list for the "
 "following reason: %s."
-msgstr "%s kh担ng ch畉�p nh畉�n �畛� ngh畛� th棚m h畛� v�o danh s叩ch c畛�a b畉�n v畛�i l箪 do sau: %s."
-
-#: src/protocols/yahoo/yahoo.c:761
+msgstr ""
+"%s kh担ng ch畉�p nh畉�n �畛� ngh畛� th棚m h畛� v�o danh s叩ch c畛�a b畉�n v畛�i l箪 do sau: %s."
+
+#: src/protocols/yahoo/yahoo.c:776
 msgid "Add buddy rejected"
 msgstr "Th棚m buddy b畛� t畛� ch畛�i"
 
-#: src/protocols/yahoo/yahoo.c:1381
+#: src/protocols/yahoo/yahoo.c:1396
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -7466,11 +7466,11 @@
 "M叩y ch畛� Yahoo y棚u c畉�u d湛ng ph動董ng th畛�c x叩c th畛�c kh担ng x叩c �畛�nh. Phi棚n b畉�n "
 "Gaim n�y s畉� c坦 th畛� kh担ng ��ng nh畉�p v�o Yahoo �動畛�c. H達y xem %s �畛� c畉�p nh畉�t."
 
-#: src/protocols/yahoo/yahoo.c:1384
+#: src/protocols/yahoo/yahoo.c:1399
 msgid "Failed Yahoo! Authentication"
-msgstr "Ch畛�ng th畛�c Yahooo! kh担ng �動畛�c"
-
-#: src/protocols/yahoo/yahoo.c:1457
+msgstr "Ch畛�ng th畛�c Yahooo! l畛�i"
+
+#: src/protocols/yahoo/yahoo.c:1472
 #, c-format
 msgid ""
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
@@ -7479,88 +7479,88 @@
 "B畉�n �ang c畛� l畛� b畛� %s nh動ng ng動畛�i �坦 c坦 trong danh s叩ch c畛�a b畉�n. Nh畉�n \"C坦\" "
 "s畉� x坦a b畛� v� l畛� �i buddy n�y."
 
-#: src/protocols/yahoo/yahoo.c:1460
+#: src/protocols/yahoo/yahoo.c:1475
 msgid "Ignore buddy?"
 msgstr "L畛� b畛� buddy?"
 
-#: src/protocols/yahoo/yahoo.c:1489
+#: src/protocols/yahoo/yahoo.c:1504
 msgid "Invalid username."
 msgstr "T棚n ng動畛�i d湛ng kh担ng h畛�p l畛�"
 
-#: src/protocols/yahoo/yahoo.c:1492
+#: src/protocols/yahoo/yahoo.c:1507
 msgid "Incorrect password."
 msgstr "M畉�t kh畉�u sai."
 
-#: src/protocols/yahoo/yahoo.c:1495
+#: src/protocols/yahoo/yahoo.c:1510
 msgid "Unknown error."
 msgstr "L畛�i kh担ng x叩c �畛�nh."
 
-#: src/protocols/yahoo/yahoo.c:1542
+#: src/protocols/yahoo/yahoo.c:1557
 #, c-format
 msgid "Could not add buddy %s to group %s to the server list on account %s."
 msgstr ""
 "Kh担ng th畛� th棚m budddy %s v�o nh坦m %s trong danh sach m叩y ch畛� c畛�a t�i kho畉�n %"
 "s."
 
-#: src/protocols/yahoo/yahoo.c:1544
+#: src/protocols/yahoo/yahoo.c:1559
 msgid "Could not add buddy to server list"
 msgstr "Kh担ng th畛� th棚m buddy v�o danh s叩ch m叩y ch畛�"
 
-#: src/protocols/yahoo/yahoo.c:1646 src/protocols/yahoo/yahoo.c:1776
+#: src/protocols/yahoo/yahoo.c:1665 src/protocols/yahoo/yahoo.c:1795
 msgid "Unable to read"
 msgstr "Kh担ng th畛� �畛�c"
 
-#: src/protocols/yahoo/yahoo.c:1801 src/protocols/yahoo/yahoo.c:1910
-#: src/protocols/yahoo/yahoo.c:1934
+#: src/protocols/yahoo/yahoo.c:1820 src/protocols/yahoo/yahoo.c:1929
+#: src/protocols/yahoo/yahoo.c:1953
 msgid "Connection problem"
 msgstr "K畉�t n畛�i c坦 v畉�n �畛�"
 
-#: src/protocols/yahoo/yahoo.c:2012 src/protocols/yahoo/yahoo.c:2308
-#: src/protocols/yahoo/yahoo.c:2406
+#: src/protocols/yahoo/yahoo.c:2036 src/protocols/yahoo/yahoo.c:2339
+#: src/protocols/yahoo/yahoo.c:2437
 msgid "Not At Home"
-msgstr "Kh担ng c坦 畛� nh�"
-
-#: src/protocols/yahoo/yahoo.c:2014 src/protocols/yahoo/yahoo.c:2310
-#: src/protocols/yahoo/yahoo.c:2407
+msgstr "Kh担ng c坦 nh�"
+
+#: src/protocols/yahoo/yahoo.c:2038 src/protocols/yahoo/yahoo.c:2341
+#: src/protocols/yahoo/yahoo.c:2438
 msgid "Not At Desk"
 msgstr "Kh担ng c坦 t畉�i b�n l�m vi畛�c"
 
-#: src/protocols/yahoo/yahoo.c:2016 src/protocols/yahoo/yahoo.c:2312
-#: src/protocols/yahoo/yahoo.c:2408
+#: src/protocols/yahoo/yahoo.c:2040 src/protocols/yahoo/yahoo.c:2343
+#: src/protocols/yahoo/yahoo.c:2439
 msgid "Not In Office"
-msgstr "Kh担ng c坦 畛� V�n ph嘆ng"
-
-#: src/protocols/yahoo/yahoo.c:2020 src/protocols/yahoo/yahoo.c:2316
-#: src/protocols/yahoo/yahoo.c:2410
+msgstr "Kh担ng c坦 畛� v�n ph嘆ng"
+
+#: src/protocols/yahoo/yahoo.c:2044 src/protocols/yahoo/yahoo.c:2347
+#: src/protocols/yahoo/yahoo.c:2441
 msgid "On Vacation"
 msgstr "Ngh畛� ph辿p"
 
-#: src/protocols/yahoo/yahoo.c:2024 src/protocols/yahoo/yahoo.c:2320
-#: src/protocols/yahoo/yahoo.c:2412
+#: src/protocols/yahoo/yahoo.c:2048 src/protocols/yahoo/yahoo.c:2351
+#: src/protocols/yahoo/yahoo.c:2443
 msgid "Stepped Out"
 msgstr "�i ra ngo�i"
 
-#: src/protocols/yahoo/yahoo.c:2088 src/protocols/yahoo/yahoo.c:2120
+#: src/protocols/yahoo/yahoo.c:2112 src/protocols/yahoo/yahoo.c:2144
 msgid "Not on server list"
 msgstr "Kh担ng c坦 trong danh s叩ch m叩y ch畛�"
 
-#: src/protocols/yahoo/yahoo.c:2176
+#: src/protocols/yahoo/yahoo.c:2200
 msgid "Join in Chat"
 msgstr "Tham gia Chat"
 
-#: src/protocols/yahoo/yahoo.c:2182
+#: src/protocols/yahoo/yahoo.c:2206
 msgid "Initiate Conference"
 msgstr "Kh畛�i t畉�o h畛�i th畉�o"
 
-#: src/protocols/yahoo/yahoo.c:2228
+#: src/protocols/yahoo/yahoo.c:2259
 msgid "Active which ID?"
 msgstr "K鱈ch ho畉�t ID n�o ?"
 
-#: src/protocols/yahoo/yahoo.c:2239
+#: src/protocols/yahoo/yahoo.c:2270
 msgid "Activate ID"
 msgstr "K鱈ch ho畉�t ID"
 
-#: src/protocols/yahoo/yahoo.c:2597
+#: src/protocols/yahoo/yahoo.c:2629
 msgid ""
 "<b>Sorry, profiles marked as containing adult content are not supported at "
 "this time.</b><br><br>\n"
@@ -7568,7 +7568,7 @@
 "<b>Xin l畛�i, l箪 l畛�ch �動畛�c �叩nh d畉�u c坦 n畛�i dung ng動畛�i l畛�n ch動a �動畛�c h畛� tr畛� v�o "
 "th畛�i �i畛�m n�y.</b><br><br>\n"
 
-#: src/protocols/yahoo/yahoo.c:2598 src/protocols/yahoo/yahoo.c:2621
+#: src/protocols/yahoo/yahoo.c:2630 src/protocols/yahoo/yahoo.c:2653
 msgid ""
 "If you wish to view this profile, you will need to visit this link in your "
 "web browser<br>"
@@ -7576,42 +7576,43 @@
 "N畉�u b畉�n mu畛�n xem l箪 l畛�ch n�y, b畉�n c畉�n th�m li棚n k畉�t n�y b畉�ng tr狸nh duy畛�t "
 "web<br>"
 
-#: src/protocols/yahoo/yahoo.c:2620
-msgid "<b>Sorry, non-English profiles are not supported at this time.</b><br><br>\n"
+#: src/protocols/yahoo/yahoo.c:2652
+msgid ""
+"<b>Sorry, non-English profiles are not supported at this time.</b><br><br>\n"
 msgstr ""
 "<b>Xin l畛�i, l鱈 l畛�ch vi畉�t b畉�ng ng担n ng畛� kh叩c ti畉�ng Anh ch動a �動畛�c h畛� tr畛�.</"
 "b><br><br>\n"
 
-#: src/protocols/yahoo/yahoo.c:2665
+#: src/protocols/yahoo/yahoo.c:2700 src/protocols/yahoo/yahoo.c:2701
 msgid "Yahoo! ID"
 msgstr "Yahoo! ID"
 
-#: src/protocols/yahoo/yahoo.c:2725 src/protocols/yahoo/yahoo.c:2729
-#: src/protocols/yahoo/yahoo.c:2733
+#: src/protocols/yahoo/yahoo.c:2745 src/protocols/yahoo/yahoo.c:2748
+#: src/protocols/yahoo/yahoo.c:2751
 msgid "Hobbies"
 msgstr "S畛� th鱈ch"
 
-#: src/protocols/yahoo/yahoo.c:2744 src/protocols/yahoo/yahoo.c:2748
+#: src/protocols/yahoo/yahoo.c:2760 src/protocols/yahoo/yahoo.c:2763
 msgid "Latest News"
-msgstr "Tin m畛�i nh畉�t"
-
-#: src/protocols/yahoo/yahoo.c:2766
+msgstr "Tin t畛�c m畛�i nh畉�t"
+
+#: src/protocols/yahoo/yahoo.c:2777
 msgid "Home Page"
 msgstr "Trang ch畛�"
 
-#: src/protocols/yahoo/yahoo.c:2780
+#: src/protocols/yahoo/yahoo.c:2789
 msgid "Cool Link 1"
 msgstr "Li棚n k畉�t 動a th鱈ch 1"
 
-#: src/protocols/yahoo/yahoo.c:2785
+#: src/protocols/yahoo/yahoo.c:2793
 msgid "Cool Link 2"
 msgstr "Li棚n k畉�t 動a th鱈ch 2"
 
-#: src/protocols/yahoo/yahoo.c:2788
+#: src/protocols/yahoo/yahoo.c:2795
 msgid "Cool Link 3"
 msgstr "Li棚n k畉�t 動a th鱈ch 3"
 
-#: src/protocols/yahoo/yahoo.c:2794
+#: src/protocols/yahoo/yahoo.c:2801
 msgid "Member Since"
 msgstr "L� th�nh vi棚n t畛� "
 
@@ -7625,17 +7626,25 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/yahoo/yahoo.c:2959 src/protocols/yahoo/yahoo.c:2961
+#: src/protocols/yahoo/yahoo.c:2975 src/protocols/yahoo/yahoo.c:2977
 msgid "Yahoo Protocol Plugin"
 msgstr "Plugin giao th畛�c Yahoo"
 
-#: src/protocols/yahoo/yahoo.c:2978
+#: src/protocols/yahoo/yahoo.c:2994
 msgid "Pager host"
-msgstr "M叩y ch畛� nh畉�n tin"
-
-#: src/protocols/yahoo/yahoo.c:2983
+msgstr "M叩y ch畛� pager"
+
+#: src/protocols/yahoo/yahoo.c:2999
 msgid "Pager port"
-msgstr "C畛�ng nh畉�n tin"
+msgstr "C畛�ng pager"
+
+#: src/protocols/yahoo/yahoo.c:3004
+msgid "File transfer host"
+msgstr "M叩y ch畛� truy畛�n t畉�p tin"
+
+#: src/protocols/yahoo/yahoo.c:3007
+msgid "File transfer port"
+msgstr "C畛�ng truy畛�n t畉�p tin"
 
 #: src/protocols/yahoo/yahoochat.c:194
 #, c-format
@@ -7644,7 +7653,7 @@
 
 #: src/protocols/yahoo/yahoochat.c:196
 msgid "Invitation Rejected"
-msgstr "L畛�i m畛�i b畛� �畉�y ra"
+msgstr "L畛�i m畛�i kh担ng �動畛�c ch畉�p nh畉�n"
 
 #: src/protocols/yahoo/yahoochat.c:333
 msgid "Failed to join chat"
@@ -7652,7 +7661,7 @@
 
 #: src/protocols/yahoo/yahoochat.c:333
 msgid "Maybe the room is full?"
-msgstr "C坦 th畛� ph嘆ng Chat h畉�t ch畛�?"
+msgstr "C坦 th畛� ph嘆ng Chat h畉�t ch畛� ?"
 
 #: src/protocols/yahoo/yahoochat.c:531
 msgid "Failed to join buddy in chat"
@@ -7674,7 +7683,7 @@
 
 #: src/protocols/zephyr/zephyr.c:348
 msgid "<br>Hidden or not logged-in"
-msgstr "<br>畉�n m畉�t hay ch動a ��ng nh畉�p"
+msgstr "<br>畉�n m畉�t ho畉�c ch動a ��ng nh畉�p"
 
 #: src/protocols/zephyr/zephyr.c:352
 #, c-format
@@ -7727,11 +7736,11 @@
 msgid "Zephyr Protocol Plugin"
 msgstr "Plugin giao th畛�c Zephyr"
 
-#: src/proxy.c:1681
+#: src/proxy.c:1692
 msgid "Invalid proxy settings"
 msgstr "Thi畉�t l畉�p proxy sai"
 
-#: src/proxy.c:1681
+#: src/proxy.c:1692
 msgid ""
 "Either the host name or port number specified for your given proxy type is "
 "invalid."
@@ -7753,28 +7762,28 @@
 msgid "Please enter your password"
 msgstr "H達y nh畉�p m畉�t kh畉�u c畛�a b畉�n"
 
-#: src/server.c:961
+#: src/server.c:948
 #, c-format
 msgid "(%d message)"
 msgid_plural "(%d messages)"
 msgstr[0] "(%d th担ng �i畛�p)"
 msgstr[1] "(%d th担ng �i畛�p)"
 
-#: src/server.c:974
+#: src/server.c:961
 msgid "(1 message)"
 msgstr "(1 th担ng �i畛�p)"
 
-#: src/server.c:1155 src/server.c:1165
+#: src/server.c:1142 src/server.c:1152
 #, c-format
 msgid "%s logged in."
-msgstr "%s �達 ��ng nh畉�p"
-
-#: src/server.c:1182 src/server.c:1190
+msgstr "%s ��ng nh畉�p"
+
+#: src/server.c:1169 src/server.c:1177
 #, c-format
 msgid "%s logged out."
-msgstr "%s �達 r畛�i kh畛�i."
-
-#: src/server.c:1237
+msgstr "%s ��ng xu畉�t."
+
+#: src/server.c:1224
 #, c-format
 msgid ""
 "%s has just been warned by %s.\n"
@@ -7783,11 +7792,11 @@
 "%s v畛�a �動畛�c %s c畉�nh b叩o.\n"
 "M畛�c c畉�nh b叩o m畛�i c畛�a b畉�n l� %d%%"
 
-#: src/server.c:1240
+#: src/server.c:1227
 msgid "an anonymous person"
 msgstr "m畛�t ng動畛�i 畉�n danh"
 
-#: src/server.c:1343
+#: src/server.c:1330
 #, c-format
 msgid ""
 "User '%s' invites %s to buddy chat room: '%s'\n"
@@ -7796,12 +7805,12 @@
 "Ng動畛�i d湛ng '%s' m畛�i %s v�o ph嘆ng Chat:  '%s'\n"
 "%s"
 
-#: src/server.c:1347
+#: src/server.c:1334
 #, c-format
 msgid "User '%s' invites %s to buddy chat room: '%s'\n"
 msgstr "Ng動畛�i d湛ng '%s' m畛�i %s v�o ph嘆ng Chat: '%s'\n"
 
-#: src/server.c:1353
+#: src/server.c:1340
 msgid "Accept chat invitation?"
 msgstr "C坦 nh畉�n l畛�i m畛�i Chat kh担ng?"
 
@@ -7820,33 +7829,33 @@
 msgid "_Open Mail"
 msgstr "_M畛� th動"
 
-#: src/util.c:1657
+#: src/util.c:1790
 msgid "Calculating..."
 msgstr "�ang t鱈nh to叩n..."
 
-#: src/util.c:1660
+#: src/util.c:1793
 msgid "Unknown."
 msgstr "Kh担ng x叩c �畛�nh."
 
-#: src/util.c:1691 src/util.c:1696 src/util.c:1701 src/util.c:1704
+#: src/util.c:1824 src/util.c:1829 src/util.c:1834 src/util.c:1837
 msgid "day"
 msgid_plural "days"
 msgstr[0] "ng�y"
 msgstr[1] "ng�y"
 
-#: src/util.c:1692 src/util.c:1696 src/util.c:1710 src/util.c:1712
+#: src/util.c:1825 src/util.c:1829 src/util.c:1843 src/util.c:1845
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "gi畛�"
 msgstr[1] "gi畛�"
 
-#: src/util.c:1692 src/util.c:1701 src/util.c:1710 src/util.c:1715
+#: src/util.c:1825 src/util.c:1834 src/util.c:1843 src/util.c:1848
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "ph炭t"
 msgstr[1] "ph炭t."
 
-#: src/util.c:2047
+#: src/util.c:2180
 msgid "g003: Error opening connection.\n"
 msgstr "g003: L畛�i m畛� k畉�t n畛�i.\n"
 
@@ -7862,6 +7871,29 @@
 msgid "Notification"
 msgstr "Th担ng b叩o"
 
+#~ msgid "/Conversation/Send _File..."
+#~ msgstr "/Cu畛�c tho畉�i/G畛�i t畉�_p tin..."
+
+#~ msgid "/Conversation/Send File..."
+#~ msgstr "/Cu畛�c tho畉�i/G畛�i t畉�p tin..."
+
+#~ msgid "Send _File"
+#~ msgstr "G畛�i t畉�p t_in"
+
+#~ msgid "This user can't accept files"
+#~ msgstr "Ng動畛�i d湛ng n�y kh担ng th畛� nh畉�n c叩c t畉�p tin"
+
+#~ msgid "Gaim just support file:// URIS currently"
+#~ msgstr "Hi畛�n t畉�i Gaim �達 h畛� tr畛� file:// URIS"
+
+#~ msgid "You are trying to send a lot of files"
+#~ msgstr "B畉�n �ang c畛� g畛�i r畉�t nhi畛�u t畉�p tin"
+
+#~ msgid "Do you really want to send them ?"
+#~ msgstr "B畉�n th畉�t s畛� mu畛�n g畛�i ch炭ng kh担ng ?"
+
+#~ msgid "%s (Code %s)"
+#~ msgstr "%s (M達 %s)"
+
 #~ msgid "<font color=\"red\"><b>log->logger_data was NULL!</b></font>"
 #~ msgstr "<font color=\"red\"><b>log->logger_data l� NULL!</b></font>"
-
--- a/src/win32/nsis/translations/portuguese-br.nsh	Mon Dec 01 04:19:39 2003 +0000
+++ b/src/win32/nsis/translations/portuguese-br.nsh	Mon Dec 01 17:03:00 2003 +0000
@@ -11,7 +11,7 @@
 !define GTK_INSTALLER_NEEDED			"O ambiente de tempo de execu艫o do GTK+ est� ausente ou precisa ser atualizado.$\rFavor instalar a vers�o v${GTK_VERSION} ou superior do ambiente de tempo de execu艫o do GTK+."
 
 ; License Page
-!define GAIM_LICENSE_BUTTON                      "Pr�ximo >"
+!define GAIM_LICENSE_BUTTON                      "Avan�ar >"
 !define GAIM_LICENSE_BOTTOM_TEXT         "$(^Name) � distribu�do sob a licen�a GPL. Esta licen�a � disponibilizada aqui apenas para fins informativos. $_CLICK" 
 
 ; Components Page