changeset 7907:84f6040ab60f

[gaim-migrate @ 8567] vi.po committer: Tailor Script <tailor@pidgin.im>
author Luke Schierer <lschiere@pidgin.im>
date Sun, 21 Dec 2003 19:54:35 +0000 (2003-12-21)
parents d3f2aa8de5bf
children ad4841411ada
files po/vi.po
diffstat 1 files changed, 817 insertions(+), 747 deletions(-) [+]
line wrap: on
line diff
--- a/po/vi.po	Sun Dec 21 19:52:25 2003 +0000
+++ b/po/vi.po	Sun Dec 21 19:54:35 2003 +0000
@@ -13,8 +13,8 @@
 msgstr ""
 "Project-Id-Version: CVS Version of Gaim-vi \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-12-13 06:34+0700\n"
-"PO-Revision-Date: 2003-12-13 06:50+0700\n"
+"POT-Creation-Date: 2003-12-19 10:03+0700\n"
+"PO-Revision-Date: 2003-12-19 10:41+0700\n"
 "Last-Translator: Trinh Minh Thanh <tmthanh@yahoo.com>\n"
 "Language-Team: Gnome-Vi Team <gnomevi-list@lists.sourceforge.net> \n"
 "MIME-Version: 1.0\n"
@@ -156,12 +156,12 @@
 msgid "New..."
 msgstr "M畛�i..."
 
-#: plugins/docklet/docklet.c:153 src/gtkblist.c:2530 src/gtkpounce.c:411
+#: plugins/docklet/docklet.c:153 src/gtkblist.c:2532 src/gtkpounce.c:411
 #: src/gtkprefs.c:1469 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:2845
-#: src/protocols/oscar/oscar.c:4594 src/protocols/oscar/oscar.c:5552
-#: src/protocols/oscar/oscar.c:6153
+#: src/protocols/oscar/oscar.c:4596 src/protocols/oscar/oscar.c:5562
+#: src/protocols/oscar/oscar.c:6163
 msgid "Away"
 msgstr "Tr畉�ng th叩i"
 
@@ -379,35 +379,6 @@
 "K辿o l棚n v� sau �坦 b畉�m tr叩i chu畛�t �畛� sang c畛�a s畛� cu畛�c tho畉�i tr動畛�c.\n"
 "K辿o l棚n v� sau �坦 b畉�m ph畉�i chu畛�t �畛� sang c畛�a s畛� cu畛�c tho畉�i ti畉�p theo."
 
-#: plugins/gtik.c:719
-msgid "Gnome Stock Ticker Properties"
-msgstr "Thu畛�c T鱈nh Tr狸nh �i畛�m Tin Th畛� Tr動畛�ng Gnome"
-
-#: plugins/gtik.c:731
-msgid "Update Frequency in min"
-msgstr "T畉�n s畛� c畉�p nh畉�t theo ph炭t"
-
-#: 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 d動畛�i �但y."
-
-#. OUTPUT FORMAT and SCROLL DIRECTION
-#: plugins/gtik.c:757
-msgid "Check this box to display only symbols and price:"
-msgstr "�叩nh d畉�u ch畛�n h畛�p n�y �畛� ch畛� hi畛�n th畛� bi畛�u t動畛�ng v� gi叩:"
-
-#: plugins/gtik.c:758
-msgid "Check this box to scroll left to right:"
-msgstr "�叩nh d畉�u ch畛�n h畛�p n�y �畛� cu畛�n t畛� tr叩i sang ph畉�i:"
-
-#: plugins/gtik.c:994
-msgid "(No"
-msgstr "(Kh担ng"
-
-#: plugins/gtik.c:995
-msgid "Change"
-msgstr "�畛�i"
-
 #: plugins/history.c:74
 msgid "History"
 msgstr "L動畛�c s畛�"
@@ -775,14 +746,14 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/ssl/ssl-gnutls.c:208
+#: plugins/ssl/ssl-gnutls.c:218
 msgid "GNUTLS"
 msgstr "GNUTLS"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/ssl/ssl-gnutls.c:211 plugins/ssl/ssl-gnutls.c:213
+#: plugins/ssl/ssl-gnutls.c:221 plugins/ssl/ssl-gnutls.c:223
 msgid "Provides SSL support through GNUTLS."
 msgstr "Cung c畉�p h畛� tr畛� SSL th担ng qua GNUTLS."
 
@@ -793,14 +764,14 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/ssl/ssl-nss.c:296
+#: plugins/ssl/ssl-nss.c:306
 msgid "NSS"
 msgstr "NSS"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/ssl/ssl-nss.c:299 plugins/ssl/ssl-nss.c:301
+#: plugins/ssl/ssl-nss.c:309 plugins/ssl/ssl-nss.c:311
 msgid "Provides SSL support through Mozilla NSS."
 msgstr "Cung c畉�p h畛� tr畛� SSL th担ng qua Mozilla NSS."
 
@@ -987,7 +958,7 @@
 msgstr "_Ch畉�y Gaim khi Windows kh畛�i ch畉�y"
 
 #. Buddy List
-#: plugins/win32/winprefs/winprefs.c:366 src/gtkblist.c:2364
+#: plugins/win32/winprefs/winprefs.c:366 src/gtkblist.c:2366
 #: src/gtkprefs.c:2266
 msgid "Buddy List"
 msgstr "Danh s叩ch Buddy"
@@ -1075,167 +1046,167 @@
 msgid "Crazy Patch Writers"
 msgstr "L畉�p tr狸nh vi棚n t鱈ch c畛�c vi畉�t s畛�a l畛�i"
 
-#: src/about.c:146
+#: src/about.c:138
 msgid "Retired Developers"
 msgstr "L畉�p tr狸nh vi棚n c滴"
 
-#: src/about.c:147
+#: src/about.c:139
 msgid "former libfaim maintainer"
 msgstr "ng動畛�i b畉�o tr狸 th動 vi畛�n tr動畛�c �但y"
 
-#: src/about.c:148
+#: src/about.c:140
 msgid "former lead developer"
 msgstr "ng動畛�i l達nh �畉�o l畉�p tr狸nh tr動畛�c �但y"
 
-#: src/about.c:151
+#: src/about.c:143
 msgid "former maintainer"
 msgstr "ng動畛�i b畉�o tr狸 tr動畛�c �但y"
 
-#: src/about.c:152
+#: src/about.c:144
 msgid "former Jabber developer"
 msgstr "ng動畛�i l畉�p tr狸nh Jabber tr動畛�c �但y"
 
-#: src/about.c:153
+#: src/about.c:145
 msgid "original author"
 msgstr "t叩c gi畉� �畉�u ti棚n"
 
-#: src/about.c:156
+#: src/about.c:148
 msgid "hacker and designated driver [lazy bum]"
 msgstr "hacker v� designated driver [lazy bum]"
 
-#: src/about.c:164
+#: src/about.c:156
 msgid "Current Translators"
 msgstr "Ng動畛�i d畛�ch hi畛�n th畛�i"
 
-#: src/about.c:165 src/about.c:198
+#: src/about.c:157 src/about.c:190
 msgid "Catalan"
 msgstr "Ti畉�ng Catalan"
 
-#: src/about.c:166 src/about.c:199
+#: src/about.c:158 src/about.c:191
 msgid "Czech"
 msgstr "Ti畉�ng Czech"
 
-#: src/about.c:167
+#: src/about.c:159
 msgid "Danish"
 msgstr "Ti畉�ng �an M畉�ch"
 
-#: src/about.c:168
-msgid "Esperanto"
-msgstr "Esperanto"
-
-#: src/about.c:169 src/about.c:200
+#: src/about.c:160
+msgid "British English"
+msgstr "Ti畉�ng Anh - Anh"
+
+#: src/about.c:161 src/about.c:192
 msgid "German"
 msgstr "Ti畉�ng �畛�c"
 
-#: src/about.c:170 src/about.c:201
+#: src/about.c:162 src/about.c:193
 msgid "Spanish"
 msgstr "Ti畉�ng T但y Ban Nha"
 
-#: src/about.c:171 src/about.c:202
+#: src/about.c:163 src/about.c:194
 msgid "Finnish"
 msgstr "Ti畉�ng Ph畉�n Lan"
 
-#: src/about.c:172 src/about.c:203
+#: src/about.c:164 src/about.c:195
 msgid "French"
 msgstr "Ti畉�ng Ph叩p"
 
-#: src/about.c:173
+#: src/about.c:165
 msgid "Hindi"
 msgstr "Ti畉�ng Hin-�i"
 
-#: src/about.c:174
+#: src/about.c:166
 msgid "Hungarian"
 msgstr "Ti畉�ng Hung-ga-ri"
 
-#: src/about.c:175 src/about.c:205
+#: src/about.c:167 src/about.c:197
 msgid "Italian"
 msgstr "Ti畉�ng �"
 
-#: src/about.c:176 src/about.c:207
+#: src/about.c:168 src/about.c:199
 msgid "Korean"
 msgstr "Ti畉�ng H�n Qu畛�c"
 
-#: src/about.c:177
+#: src/about.c:169
 msgid "Dutch; Flemish"
 msgstr "Ti畉�ng �an M畉�ch"
 
-#: src/about.c:178
+#: src/about.c:170
 msgid "Norwegian"
 msgstr "Ti畉�ng Na-uy"
 
-#: src/about.c:179 src/about.c:208
+#: src/about.c:171 src/about.c:200
 msgid "Polish"
 msgstr "Ti畉�ng Ba Lan"
 
-#: src/about.c:180
+#: src/about.c:172
 msgid "Portuguese"
 msgstr "Ti畉�ng Th畛� Nh挑 K畛�"
 
-#: src/about.c:181
+#: src/about.c:173
 msgid "Portuguese-Brazil"
 msgstr "Ti畉�ng Th畛� Nh挑 K畛�-Brazil"
 
-#: src/about.c:182
+#: src/about.c:174
 msgid "Romanian"
 msgstr "Ti畉�ng Ru-ma-ni"
 
-#: src/about.c:183 src/about.c:209
+#: src/about.c:175 src/about.c:201
 msgid "Russian"
 msgstr "Ti畉�ng Nga"
 
-#: src/about.c:184
+#: src/about.c:176
 msgid "Serbian"
 msgstr "Ti畉�ng S辿c-bi"
 
-#: src/about.c:185 src/about.c:211
+#: src/about.c:177 src/about.c:203
 msgid "Swedish"
 msgstr "Ti畉�ng Th畛�y �i畛�n"
 
-#: src/about.c:186
+#: src/about.c:178
 msgid "Vietnamese"
 msgstr "Ti畉�ng Vi畛�t"
 
-#: src/about.c:186
+#: src/about.c:178
 msgid "Gnome Vi Team"
 msgstr "Gnome Vi Team"
 
-#: src/about.c:187
+#: src/about.c:179
 msgid "Simplified Chinese"
 msgstr "Ti畉�ng Trung Qu畛�c ph畛� th担ng"
 
+#: src/about.c:180
+msgid "Traditional Chinese"
+msgstr "Ti畉�ng Trung Qu畛�c truy畛�n th畛�ng"
+
+#: src/about.c:187
+msgid "Past Translators"
+msgstr "Ng動畛�i d畛�ch tr動畛�c �但y"
+
 #: src/about.c:188
-msgid "Traditional Chinese"
-msgstr "Ti畉�ng Trung Qu畛�c truy畛�n th畛�ng"
-
-#: src/about.c:195
-msgid "Past Translators"
-msgstr "Ng動畛�i d畛�ch tr動畛�c �但y"
-
-#: src/about.c:196
 msgid "Amharic"
 msgstr "Ti畉�ng Amharic"
 
-#: src/about.c:197
+#: src/about.c:189
 msgid "Bulgarian"
 msgstr "Ti畉�ng Bun-ga-ri"
 
-#: src/about.c:204
+#: src/about.c:196
 msgid "Hebrew"
 msgstr "Ti畉�ng Hebrew"
 
-#: src/about.c:206
+#: src/about.c:198
 msgid "Japanese"
 msgstr "Ti畉�ng Nh畉�t"
 
-#: src/about.c:210
+#: src/about.c:202
 msgid "Slovak"
 msgstr "Ti畉�ng Slovak"
 
-#: src/about.c:212
+#: src/about.c:204
 msgid "Chinese"
 msgstr "Ti畉�ng Trung Qu畛�c"
 
-#: src/about.c:225 src/gtkrequest.c:198 src/protocols/msn/msn.c:247
+#: src/about.c:217 src/gtkrequest.c:198 src/protocols/msn/msn.c:247
 msgid "Close"
 msgstr "�坦ng"
 
@@ -1271,23 +1242,24 @@
 #. *
 #. * A wrapper for gaim_request_action() that uses OK and Cancel buttons.
 #.
-#: src/account.c:336 src/connection.c:193 src/dialogs.c:1489
-#: src/dialogs.c:1506 src/dialogs.c:1549 src/gtkblist.c:1730
+#: src/account.c:336 src/connection.c:193 src/dialogs.c:1492
+#: src/dialogs.c:1509 src/dialogs.c:1528 src/gtkblist.c:1730
 #: 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:2456 src/protocols/oscar/oscar.c:2536
-#: src/protocols/oscar/oscar.c:6203 src/protocols/oscar/oscar.c:6299
-#: src/protocols/oscar/oscar.c:6348 src/protocols/oscar/oscar.c:6430
-#: src/protocols/yahoo/yahoo.c:2337 src/request.h:852
+#: src/protocols/oscar/oscar.c:6213 src/protocols/oscar/oscar.c:6309
+#: src/protocols/oscar/oscar.c:6358 src/protocols/oscar/oscar.c:6440
+#: src/protocols/yahoo/yahoo.c:2398 src/protocols/yahoo/yahoo.c:2406
+#: src/request.h:852
 msgid "OK"
 msgstr "�畛�ng 箪"
 
-#: src/account.c:337 src/account.c:371 src/connection.c:194 src/dialogs.c:352
-#: src/dialogs.c:364 src/dialogs.c:377 src/dialogs.c:398 src/dialogs.c:1331
-#: src/dialogs.c:1490 src/dialogs.c:1507 src/dialogs.c:1550
+#: src/account.c:337 src/account.c:371 src/connection.c:194 src/dialogs.c:353
+#: src/dialogs.c:365 src/dialogs.c:378 src/dialogs.c:399 src/dialogs.c:1334
+#: src/dialogs.c:1493 src/dialogs.c:1510 src/dialogs.c:1529
 #: src/gtkaccount.c:1622 src/gtkaccount.c:2091 src/gtkblist.c:1731
-#: src/gtkblist.c:3666 src/gtkconn.c:148 src/gtkprivacy.c:568
+#: src/gtkblist.c:3681 src/gtkconn.c:149 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
@@ -1296,11 +1268,11 @@
 #: src/protocols/msn/msn.c:215 src/protocols/msn/msn.c:228
 #: src/protocols/oscar/oscar.c:2420 src/protocols/oscar/oscar.c:2457
 #: src/protocols/oscar/oscar.c:2492 src/protocols/oscar/oscar.c:2537
-#: src/protocols/oscar/oscar.c:6031 src/protocols/oscar/oscar.c:6204
-#: src/protocols/oscar/oscar.c:6300 src/protocols/oscar/oscar.c:6349
-#: src/protocols/oscar/oscar.c:6414 src/protocols/oscar/oscar.c:6431
-#: src/protocols/trepia/trepia.c:347 src/protocols/yahoo/yahoo.c:2338
-#: src/request.h:852 src/request.h:862
+#: src/protocols/oscar/oscar.c:6041 src/protocols/oscar/oscar.c:6214
+#: src/protocols/oscar/oscar.c:6310 src/protocols/oscar/oscar.c:6359
+#: src/protocols/oscar/oscar.c:6424 src/protocols/oscar/oscar.c:6441
+#: src/protocols/trepia/trepia.c:347 src/protocols/yahoo/yahoo.c:2399
+#: src/protocols/yahoo/yahoo.c:2407 src/request.h:852 src/request.h:862
 msgid "Cancel"
 msgstr "B畛� qua"
 
@@ -1309,14 +1281,14 @@
 msgid "Change user information for %s"
 msgstr "�畛�i th担ng tin ng動畛�i d湛ng cho %s"
 
-#: src/account.c:370 src/dialogs.c:1319 src/gtkrequest.c:202
+#: src/account.c:370 src/dialogs.c:1322 src/gtkrequest.c:202
 #: src/protocols/jabber/buddy.c:511 src/protocols/trepia/trepia.c:346
 msgid "Save"
 msgstr "L動u"
 
 #: src/away.c:208
-msgid "Gaim - Away!"
-msgstr "Gaim - V畉�ng m畉�t!"
+msgid "Away!"
+msgstr "V畉�ng m畉�t!"
 
 #: src/away.c:269
 msgid "I'm Back!"
@@ -1338,7 +1310,7 @@
 msgid "Chats"
 msgstr "Cu畛�c Chat"
 
-#: src/blist.c:661 src/blist.c:848 src/blist.c:2063 src/gtkblist.c:3146
+#: src/blist.c:661 src/blist.c:848 src/blist.c:2063 src/gtkblist.c:3148
 #: src/protocols/jabber/roster.c:66 src/protocols/msn/notification.c:1160
 msgid "Buddies"
 msgstr "Buddy"
@@ -1362,7 +1334,7 @@
 msgid "Group not removed"
 msgstr "Nh坦m kh担ng x坦a �動畛�c"
 
-#: src/blist.c:1207 src/gtkaccount.c:159 src/gtkutils.c:849
+#: src/blist.c:1207 src/gtkaccount.c:159 src/gtkutils.c:847
 #: src/protocols/jabber/auth.c:130 src/protocols/jabber/buddy.c:563
 msgid "Unknown"
 msgstr "Kh担ng x叩c �畛�nh"
@@ -1381,27 +1353,31 @@
 msgid "Buddy List Error"
 msgstr "L畛�i danh s叩ch Buddy"
 
-#: src/buddy_chat.c:210 src/gtkblist.c:3558
+#: src/buddy_chat.c:212 src/gtkblist.c:3571
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
 msgstr ""
 "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:221
-msgid "Join Chat"
+#: src/buddy_chat.c:223
+msgid "Join a Chat"
 msgstr "Tham gia Chat"
 
-#: src/buddy_chat.c:240
+#: src/buddy_chat.c:225 src/gtkblist.c:924
+msgid "_Join"
+msgstr "Tham gi_a"
+
+#: src/buddy_chat.c:242
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
-msgstr ""
-"H達y nh畉�p th担ng tin th鱈ch h畛�p v畛� cu畛�c Chat m� b畉�n mu畛�n tham gia.\n"
-
-#: src/buddy_chat.c:251
-msgid "Join Chat As:"
-msgstr "Tham gia Chat b畉�ng:"
+msgstr "H達y nh畉�p th担ng tin th鱈ch h畛�p v畛� cu畛�c Chat m� b畉�n mu畛�n tham gia.\n"
+
+#: src/buddy_chat.c:253 src/dialogs.c:589 src/dialogs.c:664
+#: src/gtkpounce.c:358
+msgid "_Account:"
+msgstr "T�i _kho畉�n:"
 
 #: src/connection.c:117 src/connection.c:165
 #, c-format
@@ -1480,15 +1456,15 @@
 msgid "By account"
 msgstr "Theo t�i kho畉�n"
 
-#: src/dialogs.c:200
+#: src/dialogs.c:201
 msgid "Warn User"
 msgstr "C畉�nh b叩o ng動畛�i d湛ng"
 
-#: src/dialogs.c:203
+#: src/dialogs.c:204
 msgid "_Warn"
 msgstr "_C畉�nh b叩o"
 
-#: src/dialogs.c:219
+#: src/dialogs.c:220
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Warn %s?</span>\n"
@@ -1501,36 +1477,36 @@
 "�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:228
+#: src/dialogs.c:229
 msgid "Warn _anonymously?"
 msgstr "C畉�nh b叩o _n畉�c danh?"
 
-#: src/dialogs.c:235
+#: src/dialogs.c:236
 msgid "<b>Anonymous warnings are less severe.</b>"
 msgstr "<b>C畉�nh b叩o n畉�c danh l� 鱈t nghi棚m tr畛�ng.</b>"
 
-#: src/dialogs.c:348
+#: src/dialogs.c:349
 #, c-format
 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:350 src/dialogs.c:351
+#: src/dialogs.c:351 src/dialogs.c:352
 msgid "Remove Buddy"
 msgstr "X坦a b畛� Buddy"
 
-#: src/dialogs.c:360
+#: src/dialogs.c:361
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
 "continue?"
 msgstr "B畉�n s畉�p x坦a Chat %s kh畛�i danh s叩ch buddy. B畉�n mu畛�n th畛�c hi畛�n kh担ng?"
 
-#: src/dialogs.c:362 src/dialogs.c:363
+#: src/dialogs.c:363 src/dialogs.c:364
 msgid "Remove Chat"
 msgstr "X坦a Chat"
 
-#: src/dialogs.c:372
+#: src/dialogs.c:373
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
@@ -1539,11 +1515,11 @@
 "B畉�n s畉�p x坦a nh坦m %s v� m畛�i th�nh vi棚n ra kh畛�i danh s叩ch buddy c畛�a b畉�n. B畉�n "
 "mu畛�n th畛�c hi畛�n kh担ng?"
 
-#: src/dialogs.c:375 src/dialogs.c:376
+#: src/dialogs.c:376 src/dialogs.c:377
 msgid "Remove Group"
 msgstr "X坦a nh坦m"
 
-#: src/dialogs.c:393
+#: src/dialogs.c:394
 #, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddies from "
@@ -1552,157 +1528,128 @@
 "B畉�n s畉�p x坦a li棚n l畉�c c坦 ch畛�a %s v� %d c叩c buddy kh叩c ra kh畛�i danh s叩ch buddy "
 "c畛�a b畉�n. B畉�n mu畛�n th畛�c hi畛�n kh担ng?"
 
-#: src/dialogs.c:396 src/dialogs.c:397
+#: src/dialogs.c:397 src/dialogs.c:398
 msgid "Remove Contact"
 msgstr "X坦a Li棚n L畉�c"
 
-#: src/dialogs.c:542
-msgid "New Message"
-msgstr "Th担ng �i畛�p M畛�i"
-
-#: src/dialogs.c:560
+#: src/dialogs.c:543
+msgid "New Instant Message"
+msgstr "Tin nh畉�n nhanh m畛�i"
+
+#: src/dialogs.c:561
 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 Nh畉�n Tin Nhanh.\n"
 
-#: src/dialogs.c:572 src/dialogs.c:647
+#: src/dialogs.c:573 src/dialogs.c:648
 msgid "_Screenname:"
 msgstr "T棚n hi畛�_n th畛�:"
 
-#: src/dialogs.c:588 src/dialogs.c:663 src/gtkpounce.c:358
-msgid "_Account:"
-msgstr "T�i _kho畉�n:"
-
-#: src/dialogs.c:617
+#: src/dialogs.c:618
 msgid "Get User Info"
 msgstr "Th担ng tin buddy"
 
-#: src/dialogs.c:635
+#: src/dialogs.c:636
 msgid ""
 "Please enter the screenname of the person whose info you would like to "
 "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:756
+#: src/dialogs.c:757
 msgid "Insert Link"
 msgstr "Ch竪n li棚n k畉�t"
 
-#: src/dialogs.c:758
-msgid "Insert"
-msgstr "Ch竪n"
-
-#: src/dialogs.c:780
+#: src/dialogs.c:759
+msgid "_Insert"
+msgstr "C_h竪n"
+
+#: src/dialogs.c:782
 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"
 
-#: src/dialogs.c:796 src/protocols/jabber/buddy.c:249
-#: src/protocols/jabber/jabber.c:632
-msgid "URL"
-msgstr "URL"
-
-#: src/dialogs.c:806 src/gtkprefs.c:601 src/gtkprefs.c:1805
-#: src/protocols/jabber/buddy.c:263 src/protocols/jabber/buddy.c:738
-msgid "Description"
-msgstr "M担 t畉�"
-
-#: src/dialogs.c:934 src/dialogs.c:951
+#: src/dialogs.c:795
+msgid "_URL:"
+msgstr "_URL:"
+
+#: src/dialogs.c:808
+msgid "_Description:"
+msgstr "_M担 t畉�:"
+
+#: src/dialogs.c:937 src/dialogs.c:954
 msgid "Select Text Color"
 msgstr "Ch畛�n m�u ch畛�"
 
-#: src/dialogs.c:986 src/dialogs.c:1003
+#: src/dialogs.c:989 src/dialogs.c:1006
 msgid "Select Background Color"
 msgstr "Ch畛�n m�u n畛�n"
 
-#: src/dialogs.c:1088 src/dialogs.c:1114
+#: src/dialogs.c:1091 src/dialogs.c:1117
 msgid "Select Font"
 msgstr "Ch畛�n ph担ng ch畛�"
 
-#: src/dialogs.c:1180
+#: src/dialogs.c:1183
 msgid "You cannot save an away message with a blank title"
 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:1182
+#: src/dialogs.c:1185
 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:1192
+#: src/dialogs.c:1195
 msgid "You cannot create an empty away message"
 msgstr "Kh担ng th畛� t畉�o th担ng b叩o tr畉�ng th叩i m� kh担ng c坦 n畛�i dung"
 
-#: src/dialogs.c:1257 src/dialogs.c:1265
+#: src/dialogs.c:1260 src/dialogs.c:1268
 msgid "New away message"
 msgstr "Th担ng b叩o tr畉�ng th叩i m畛�i"
 
-#: src/dialogs.c:1275
+#: src/dialogs.c:1278
 msgid "Away title: "
 msgstr "Ti棚u �畛�:"
 
-#: src/dialogs.c:1323
+#: src/dialogs.c:1326
 msgid "Save & Use"
 msgstr "L動u L畉�i & D湛ng"
 
-#: src/dialogs.c:1327
+#: src/dialogs.c:1330
 msgid "Use"
 msgstr "D湛ng"
 
 #. show everything
-#: src/dialogs.c:1468
+#: src/dialogs.c:1471
 msgid "Smile!"
 msgstr "C動畛�i!"
 
-#: src/dialogs.c:1486
+#: src/dialogs.c:1489
 msgid "Alias Chat"
 msgstr "B鱈 danh Chat"
 
-#: src/dialogs.c:1486
-msgid "Alias chat"
-msgstr "B鱈 danh Chat"
-
-#: src/dialogs.c:1487
-msgid "Please enter an aliased name for this chat."
-msgstr "H達y nh畉�p b鱈 danh cho cu畛�c Chat n�y."
-
-#: src/dialogs.c:1503
+#: src/dialogs.c:1490
+msgid "Enter an alias for this chat."
+msgstr "Nh畉�p b鱈 danh cho cu畛�c Chat n�y."
+
+#: src/dialogs.c:1506
 msgid "Alias Contact"
-msgstr "Li棚n L畉�c B鱈 danh"
-
-#: src/dialogs.c:1503
-msgid "Alias contact"
-msgstr "Li棚n l畉�c b鱈 danh"
-
-#: src/dialogs.c:1504
-msgid "Please enter an aliased name for this contact."
-msgstr "H達y nh畉�p t棚n b鱈 danh cho li棚n l畉�c n�y."
-
-#: src/dialogs.c:1535
-msgid "_Screenname"
-msgstr "T棚n _hi畛�n th畛�"
-
-#: src/dialogs.c:1540 src/gtkblist.c:840 src/gtkblist.c:929 src/gtkblist.c:948
-msgid "_Alias"
-msgstr "_B鱈 danh"
-
-#: src/dialogs.c:1544
+msgstr "B鱈 danh li棚n l畉�c"
+
+#: src/dialogs.c:1507
+msgid "Enter an alias for this contact."
+msgstr "H達y nh畉�p b鱈 danh cho li棚n l畉�c n�y."
+
+#: src/dialogs.c:1524
+#, c-format
+msgid "Enter an alias for %s."
+msgstr "Nh畉�p b鱈 danh cho %s."
+
+#: src/dialogs.c:1526
 msgid "Alias Buddy"
 msgstr "B鱈 danh Buddy"
 
-#: src/dialogs.c:1545
-msgid "Alias buddy"
-msgstr "B鱈 danh buddy"
-
-#: src/dialogs.c:1546
-msgid ""
-"Please enter an aliased name for the person below, or rename this contact in "
-"your buddy list."
-msgstr ""
-"H達y nh畉�p b鱈 danh cho ng動畛�i b棚n d動畛�i, ho畉�c �畛�i t棚n cho ng動嘆i n�y trong danh "
-"s叩ch buddy c畛�a b畉�n."
-
 #: src/ft.c:139
 #, c-format
 msgid "%s is not a valid filename.\n"
@@ -1815,15 +1762,15 @@
 msgid "boring default"
 msgstr "tr畉�ng th叩i m畉�c �畛�nh"
 
-#: src/gaimrc.c:1259 src/gtkblist.c:2326
+#: src/gaimrc.c:1259 src/gtkblist.c:2328
 msgid "Alphabetical"
 msgstr "Theo v畉�n"
 
-#: src/gaimrc.c:1261 src/gtkblist.c:2327
+#: src/gaimrc.c:1261 src/gtkblist.c:2329
 msgid "By status"
 msgstr "Theo tr畉�ng th叩i"
 
-#: src/gaimrc.c:1263 src/gtkblist.c:2328
+#: src/gaimrc.c:1263 src/gtkblist.c:2330
 msgid "By log size"
 msgstr "Theo k鱈ch th動畛�c b畉�n ghi"
 
@@ -1860,12 +1807,11 @@
 msgid "Screenname:"
 msgstr "T棚n hi畛�n th畛�:"
 
-#: src/gtkaccount.c:464 src/main.c:307 src/protocols/irc/irc.c:163
-#: src/protocols/jabber/chat.c:56
+#: src/gtkaccount.c:464 src/main.c:307
 msgid "Password:"
 msgstr "M畉�t kh畉�u:"
 
-#: src/gtkaccount.c:469 src/gtkblist.c:3298 src/gtkblist.c:3617
+#: src/gtkaccount.c:469 src/gtkblist.c:3308 src/gtkblist.c:3630
 msgid "Alias:"
 msgstr "B鱈 danh:"
 
@@ -1950,7 +1896,7 @@
 msgid "_Host:"
 msgstr "_M叩y ch畛�:"
 
-#: src/gtkaccount.c:864
+#: src/gtkaccount.c:864 src/gtkprefs.c:1144
 msgid "_Port:"
 msgstr "_C畛�ng:"
 
@@ -1998,8 +1944,8 @@
 msgstr "T棚n hi畛�n th畛�"
 
 #: src/gtkaccount.c:1758 src/protocols/jabber/jabber.c:924
-#: src/protocols/oscar/oscar.c:2851 src/protocols/oscar/oscar.c:4592
-#: src/protocols/oscar/oscar.c:6152 src/protocols/yahoo/yahoo.c:2132
+#: src/protocols/oscar/oscar.c:2851 src/protocols/oscar/oscar.c:4594
+#: src/protocols/oscar/oscar.c:6162 src/protocols/yahoo/yahoo.c:2193
 #: src/protocols/zephyr/zephyr.c:886 src/protocols/zephyr/zephyr.c:896
 msgid "Online"
 msgstr "K畉�t n畛�i"
@@ -2024,15 +1970,15 @@
 "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"
+msgid "Information"
+msgstr "Th担ng tin"
 
 #: src/gtkaccount.c:2088
 msgid "Add buddy to your list?"
 msgstr "C坦 th棚m buddy v�o danh s叩ch kh担ng?"
 
-#: src/gtkaccount.c:2090 src/gtkblist.c:3665 src/gtkconv.c:1253
-#: src/gtkconv.c:3071 src/gtkconv.c:4276 src/gtkrequest.c:200
+#: src/gtkaccount.c:2090 src/gtkblist.c:3680 src/gtkconv.c:1272
+#: src/gtkconv.c:3197 src/gtkconv.c:4402 src/gtkrequest.c:200
 #: src/protocols/icq/gaim_icq.c:277 src/protocols/oscar/oscar.c:2693
 msgid "Add"
 msgstr "Th棚m"
@@ -2047,14 +1993,18 @@
 
 #: src/gtkblist.c:818
 msgid "Add Buddy _Pounce"
-msgstr "Th棚m th担ng b叩o Buddy"
+msgstr "Th棚m th担ng _b叩o Buddy"
 
 #: src/gtkblist.c:820
 msgid "View _Log"
 msgstr "Xem _b畉�n ghi"
 
-#: src/gtkblist.c:842 src/gtkblist.c:931 src/gtkblist.c:953 src/gtkconn.c:424
-#: src/gtkconn.c:460
+#: src/gtkblist.c:840 src/gtkblist.c:929 src/gtkblist.c:948
+msgid "_Alias..."
+msgstr "_B鱈 danh..."
+
+#: src/gtkblist.c:842 src/gtkblist.c:931 src/gtkblist.c:953 src/gtkconn.c:425
+#: src/gtkconn.c:461
 msgid "_Remove"
 msgstr "_X坦a b畛�"
 
@@ -2074,10 +2024,6 @@
 msgid "_Rename"
 msgstr "_�畛�i t棚n"
 
-#: src/gtkblist.c:924
-msgid "_Join"
-msgstr "Tham gi_a"
-
 #: src/gtkblist.c:926
 msgid "Auto-Join"
 msgstr "T畛� �畛�ng tham gia"
@@ -2090,7 +2036,7 @@
 msgid "_Expand"
 msgstr "M畛� _r畛�ng"
 
-#: src/gtkblist.c:1389 src/gtkconv.c:3792
+#: src/gtkblist.c:1389 src/gtkconv.c:3918
 msgid ""
 "You are not currently signed on with an account that can add that buddy."
 msgstr ""
@@ -2102,8 +2048,8 @@
 msgstr "/_Buddy"
 
 #: src/gtkblist.c:1681
-msgid "/Buddies/New _Instant Message..."
-msgstr "/Buddy/T_h担ng �i畛�p m畛�i..."
+msgid "/Buddies/New Instant _Message..."
+msgstr "/Buddy/T_in nh畉�n nhanh m畛�i..."
 
 #: src/gtkblist.c:1682
 msgid "/Buddies/Join a _Chat..."
@@ -2122,16 +2068,16 @@
 msgstr "/Buddy/Hi畛�n th畛� nh坦m _r畛�ng"
 
 #: src/gtkblist.c:1687
-msgid "/Buddies/_Add a Buddy..."
+msgid "/Buddies/_Add Buddy..."
 msgstr "/Buddy/_Th棚m Buddy..."
 
 #: src/gtkblist.c:1688
-msgid "/Buddies/Add a C_hat..."
+msgid "/Buddies/Add C_hat..."
 msgstr "/Buddy/Th棚m Ch_at..."
 
 #: src/gtkblist.c:1689
-msgid "/Buddies/Add a _Group..."
-msgstr "/Buddy/Th棚m nh坦_m..."
+msgid "/Buddies/Add _Group..."
+msgstr "/Buddy/Th棚m Nh坦_m..."
 
 #: src/gtkblist.c:1691
 msgid "/Buddies/_Signoff"
@@ -2167,8 +2113,8 @@
 msgstr "/C担ng c畛�/Truy畛�n t畉�p t_in"
 
 #: src/gtkblist.c:1702
-msgid "/Tools/Preferences"
-msgstr "/C担ng c畛�/T湛y ch畛�nh"
+msgid "/Tools/Pr_eferences"
+msgstr "/C担ng c畛�/T湛y _ch畛�nh"
 
 #: src/gtkblist.c:1703
 msgid "/Tools/Pr_ivacy"
@@ -2216,16 +2162,16 @@
 "\n"
 "<b>T�i kho畉�n:</b> %s"
 
-#: src/gtkblist.c:1817 src/protocols/oscar/oscar.c:5532
+#: src/gtkblist.c:1819 src/protocols/oscar/oscar.c:5542
 msgid "<b>Status:</b> Offline"
 msgstr "<b>Tr畉�ng th叩i:</b> Ngo畉�i tuy畉�n"
 
-#: src/gtkblist.c:1829
+#: src/gtkblist.c:1831
 #, c-format
 msgid "%d%%"
 msgstr "%d%%"
 
-#: src/gtkblist.c:1844
+#: src/gtkblist.c:1846
 msgid ""
 "\n"
 "<b>Account:</b>"
@@ -2233,7 +2179,7 @@
 "\n"
 "<b>T�i kho畉�n:</b>"
 
-#: src/gtkblist.c:1845
+#: src/gtkblist.c:1847
 msgid ""
 "\n"
 "<b>Contact Alias:</b>"
@@ -2241,7 +2187,7 @@
 "\n"
 "<b>B鱈 danh li棚n l畉�c:</b>"
 
-#: src/gtkblist.c:1846
+#: src/gtkblist.c:1848
 msgid ""
 "\n"
 "<b>Alias:</b>"
@@ -2249,7 +2195,7 @@
 "\n"
 "<b>B鱈 danh:</b>"
 
-#: src/gtkblist.c:1847
+#: src/gtkblist.c:1849
 msgid ""
 "\n"
 "<b>Nickname:</b>"
@@ -2257,7 +2203,7 @@
 "\n"
 "<b>Bi畛�t danh:</b>"
 
-#: src/gtkblist.c:1848
+#: src/gtkblist.c:1850
 msgid ""
 "\n"
 "<b>Idle:</b>"
@@ -2265,7 +2211,7 @@
 "\n"
 "<b>Ngh畛�:</b>"
 
-#: src/gtkblist.c:1849
+#: src/gtkblist.c:1851
 msgid ""
 "\n"
 "<b>Warned:</b>"
@@ -2273,7 +2219,7 @@
 "\n"
 "<b>C畉�nh b叩o:</b>"
 
-#: src/gtkblist.c:1851
+#: src/gtkblist.c:1853
 msgid ""
 "\n"
 "<b>Description:</b> Spooky"
@@ -2281,7 +2227,7 @@
 "\n"
 "<b>M担 t畉�:</b> Ho畉�ng s畛�"
 
-#: src/gtkblist.c:1852
+#: src/gtkblist.c:1854
 msgid ""
 "\n"
 "<b>Status</b>: Awesome"
@@ -2289,7 +2235,7 @@
 "\n"
 "<b>Tr畉�ng th叩i</b>: Kinh ho�ng"
 
-#: src/gtkblist.c:1853
+#: src/gtkblist.c:1855
 msgid ""
 "\n"
 "<b>Status</b>: Rockin'"
@@ -2297,85 +2243,85 @@
 "\n"
 "<b>Tr畉�ng th叩i</b>: S畛�ng s畛�t'"
 
-#: src/gtkblist.c:2121
+#: src/gtkblist.c:2123
 #, c-format
 msgid "Idle (%dh%02dm) "
 msgstr "Ngh畛� (%dh%02dm) "
 
-#: src/gtkblist.c:2123
+#: src/gtkblist.c:2125
 #, c-format
 msgid "Idle (%dm) "
 msgstr "Ngh畛� (%dm) "
 
-#: src/gtkblist.c:2128
+#: src/gtkblist.c:2130
 #, c-format
 msgid "Warned (%d%%) "
 msgstr "C畉�nh b叩o (%d%%) "
 
-#: src/gtkblist.c:2131
+#: src/gtkblist.c:2133
 msgid "Offline "
 msgstr "Ngo畉�i tuy畉�n"
 
-#: src/gtkblist.c:2324 src/gtkprefs.c:841 src/gtkprefs.c:1497
+#: src/gtkblist.c:2326 src/gtkprefs.c:841 src/gtkprefs.c:1497
 msgid "None"
 msgstr "Kh担ng"
 
-#: src/gtkblist.c:2391
+#: src/gtkblist.c:2393
 msgid "/Tools/Away"
 msgstr "/C担ng c畛�/Tr畉�ng th叩i"
 
-#: src/gtkblist.c:2394
+#: src/gtkblist.c:2396
 msgid "/Tools/Buddy Pounce"
 msgstr "/C担ng c畛�/Th担ng b叩o Buddy"
 
-#: src/gtkblist.c:2397
+#: src/gtkblist.c:2399
 msgid "/Tools/Protocol Actions"
 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:2484
+#: src/gtkblist.c:2486
 msgid "/Buddies/Show Offline Buddies"
 msgstr "/Buddy/Hi畛�n th畛� buddy ngo畉�i tuy畉�n"
 
-#: src/gtkblist.c:2486
+#: src/gtkblist.c:2488
 msgid "/Buddies/Show Empty Groups"
 msgstr "/Buddy/Hi畛�n th畛� nh坦m r畛�ng"
 
-#: src/gtkblist.c:2504 src/gtkconv.c:1212
+#: src/gtkblist.c:2506 src/gtkconv.c:1231
 msgid "IM"
 msgstr "Tin nh畉�n nhanh"
 
-#: src/gtkblist.c:2510
+#: src/gtkblist.c:2512
 msgid "Send a message to the selected buddy"
 msgstr "G畛�i th担ng �i畛�p �畉�n buddy �動畛�c ch畛�n"
 
-#: src/gtkblist.c:2513 src/protocols/napster/napster.c:529
+#: src/gtkblist.c:2515 src/protocols/napster/napster.c:529
 msgid "Get Info"
 msgstr "L畉�y th担ng tin"
 
-#: src/gtkblist.c:2519
+#: src/gtkblist.c:2521
 msgid "Get information on the selected buddy"
 msgstr "L畉�y th担ng tin buddy �動畛�c ch畛�n"
 
-#: src/gtkblist.c:2522 src/protocols/oscar/oscar.c:3089
+#: src/gtkblist.c:2524 src/protocols/oscar/oscar.c:3089
 msgid "Chat"
 msgstr "Chat"
 
-#: src/gtkblist.c:2527
+#: src/gtkblist.c:2529
 msgid "Join a chat room"
 msgstr "V�o ph嘆ng Chat"
 
-#: src/gtkblist.c:2535
+#: src/gtkblist.c:2537
 msgid "Set an away message"
 msgstr "L畉�p th担ng b叩o v畉�ng m畉�t"
 
-#: src/gtkblist.c:3240 src/protocols/yahoo/yahoo.c:2264
+#: src/gtkblist.c:3250 src/protocols/yahoo/yahoo.c:2325
 msgid "Add Buddy"
 msgstr "Th棚m Buddy"
 
-#: src/gtkblist.c:3263
+#: src/gtkblist.c:3273
 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. "
@@ -2385,24 +2331,24 @@
 "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:3285 src/main.c:289
+#: src/gtkblist.c:3295 src/main.c:289
 msgid "Screen Name:"
 msgstr "T棚n hi畛�n th畛�:"
 
-#: src/gtkblist.c:3311 src/gtkblist.c:3628
+#: src/gtkblist.c:3321 src/gtkblist.c:3643
 msgid "Group:"
 msgstr "Nh坦m:"
 
 #. Set up stuff for the account box
-#: src/gtkblist.c:3320 src/gtkblist.c:3598
+#: src/gtkblist.c:3330 src/gtkblist.c:3611
 msgid "Account:"
 msgstr "T�i kho畉�n:"
 
-#: src/gtkblist.c:3565
+#: src/gtkblist.c:3578
 msgid "Add Chat"
 msgstr "Th棚m Chat"
 
-#: src/gtkblist.c:3588
+#: src/gtkblist.c:3601
 msgid ""
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
@@ -2410,43 +2356,39 @@
 "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:3662
+#: src/gtkblist.c:3677
 msgid "Add Group"
 msgstr "Th棚m nh坦m"
 
-#: src/gtkblist.c:3662
-msgid "Add a new group"
-msgstr "Th棚m nh坦m m畛�i"
-
-#: src/gtkblist.c:3663
+#: src/gtkblist.c:3678
 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:4180
+#: src/gtkblist.c:4195
 msgid "No actions available"
 msgstr "Hi畛�n kh担ng c坦 h�nh �畛�ng n�o"
 
-#: src/gtkconn.c:58 src/gtkconn.c:242 src/gtkconn.c:253
+#: src/gtkconn.c:58 src/gtkconn.c:243 src/gtkconn.c:254
 msgid "Done."
 msgstr "Ho�n th�nh."
 
-#: src/gtkconn.c:137
+#: src/gtkconn.c:138
 msgid "Signon: "
 msgstr "K畉�t n畛�i:"
 
-#: src/gtkconn.c:195
+#: src/gtkconn.c:196
 msgid "Signon"
 msgstr "K畉�t n畛�i"
 
-#: src/gtkconn.c:208
+#: src/gtkconn.c:209
 msgid "Cancel All"
 msgstr "H畛�y b畛� t畉�t c畉�"
 
-#: src/gtkconn.c:425 src/gtkconn.c:460 src/gtkconn.c:527
+#: src/gtkconn.c:426 src/gtkconn.c:461 src/gtkconn.c:527
 msgid "_Reconnect"
 msgstr "K畉�t n畛�i _l畉�i"
 
-#: src/gtkconn.c:490
+#: src/gtkconn.c:491
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">%s has been disconnected.</span>\n"
@@ -2459,7 +2401,7 @@
 "%s\n"
 "%s"
 
-#: src/gtkconn.c:492
+#: src/gtkconn.c:493
 msgid "Reason Unknown."
 msgstr "Nguy棚n nh但n kh担ng x叩c �畛�nh."
 
@@ -2467,366 +2409,366 @@
 msgid "Reconnect _All"
 msgstr "K畉�t n畛�i l畉�i to�n _b畛�"
 
-#: src/gtkconn.c:550
+#: src/gtkconn.c:555
 msgid "Account"
 msgstr "T�i kho畉�n"
 
-#: src/gtkconn.c:558
+#: src/gtkconn.c:563
 msgid "Time"
 msgstr "Th畛�i gian"
 
-#: src/gtkconv.c:184
+#: src/gtkconv.c:187
 msgid "That file already exists"
 msgstr "T畉�p tin n�y �達 t畛�n t畉�i r畛�i"
 
-#: src/gtkconv.c:185 src/gtkft.c:1076
+#: src/gtkconv.c:188 src/gtkft.c:1076
 msgid "Would you like to overwrite it?"
 msgstr "B畉�n mu畛�n ghi �竪 l棚n n坦 kh担ng?"
 
-#: src/gtkconv.c:240
+#: src/gtkconv.c:243
 #, c-format
 msgid "Failed to store image: %s\n"
 msgstr "Kh担ng l動u �動畛�c 畉�nh: %s\n"
 
-#: src/gtkconv.c:310
-msgid "Gaim - Insert Image"
-msgstr "Gaim - Ch竪n 畉�nh"
-
-#: src/gtkconv.c:606
-msgid "Gaim - Invite Buddy Into Chat Room"
-msgstr "Gaim - M畛�i Buddy v�o ph嘆ng chat"
+#: src/gtkconv.c:313
+msgid "Insert Image"
+msgstr "Ch竪n 畉�nh"
+
+#: src/gtkconv.c:620
+msgid "Invite Buddy Into Chat Room"
+msgstr "M畛�i Buddy v�o ph嘆ng Chat"
 
 #. Put our happy label in it.
-#: src/gtkconv.c:634
+#: src/gtkconv.c:648
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
 msgstr "H達y nh畉�p t棚n ng動畛�i d湛ng m� b畉�n mu畛�n m畛�i, k竪m theo l畛�i m畛�i."
 
-#: src/gtkconv.c:655
+#: src/gtkconv.c:669
 msgid "_Buddy:"
 msgstr "_Buddy:"
 
-#: src/gtkconv.c:675
+#: src/gtkconv.c:689
 msgid "_Message:"
 msgstr "_Th担ng �i畛�p:"
 
-#: src/gtkconv.c:761
+#: src/gtkconv.c:775
 msgid "Find"
 msgstr "T狸m"
 
-#: src/gtkconv.c:779
+#: src/gtkconv.c:793
 msgid "_Search for:"
 msgstr "T狸m _ki畉�m:"
 
-#: src/gtkconv.c:1220
+#: src/gtkconv.c:1239
 msgid "Un-Ignore"
 msgstr "Kh担ng-b畛� qua"
 
-#: src/gtkconv.c:1222 src/gtkprefs.c:774
+#: src/gtkconv.c:1241 src/gtkprefs.c:774
 msgid "Ignore"
 msgstr "B畛� qua"
 
 #. Info button
-#: src/gtkconv.c:1231 src/gtkconv.c:3094
+#: src/gtkconv.c:1250 src/gtkconv.c:3220
 msgid "Info"
 msgstr "Th担ng tin"
 
-#: src/gtkconv.c:1240
+#: src/gtkconv.c:1259
 msgid "Get Away Msg"
 msgstr "Nh畉�n th担ng b叩o v畉�ng m畉�t"
 
-#: src/gtkconv.c:1251 src/gtkconv.c:3077 src/gtkconv.c:4261
+#: src/gtkconv.c:1270 src/gtkconv.c:3203 src/gtkconv.c:4387
 #: src/gtkrequest.c:201
 msgid "Remove"
 msgstr "X坦a b畛�"
 
-#: src/gtkconv.c:2328
+#: src/gtkconv.c:2453
 msgid "User is typing..."
 msgstr "Ng動畛�i d湛ng �ang g探 ph鱈m..."
 
-#: src/gtkconv.c:2336
+#: src/gtkconv.c:2461
 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:2439
+#: src/gtkconv.c:2564
 msgid "_Send As"
 msgstr "_G畛�i b畉�ng"
 
-#: src/gtkconv.c:2861
-msgid "Gaim - Save Conversation"
-msgstr "Gaim - L動u cu畛�c tho畉�i"
+#: src/gtkconv.c:2985
+msgid "Save Conversation"
+msgstr "L動u l畉�i cu畛�c tho畉�i"
 
 #. Conversation menu
-#: src/gtkconv.c:2878
+#: src/gtkconv.c:3002
 msgid "/_Conversation"
 msgstr "/_Cu畛�c tho畉�i"
 
-#: src/gtkconv.c:2880
-msgid "/Conversation/_New Conversation..."
-msgstr "/Cu畛�c tho畉�i/Cu畛�c tho畉�i _m畛�i..."
-
-#: src/gtkconv.c:2885
+#: src/gtkconv.c:3004
+msgid "/Conversation/New Instant _Message..."
+msgstr "/Cu畛�c tho畉�i/T_in nh畉�n nhanh m畛�i..."
+
+#: src/gtkconv.c:3009
+msgid "/Conversation/_Find..."
+msgstr "/Cu畛�c tho畉�i/_T狸m..."
+
+#: src/gtkconv.c:3010
+msgid "/Conversation/View _Log"
+msgstr "/Cu畛�c tho畉�i/Xem _b畉�n ghi"
+
+#: src/gtkconv.c:3011
 msgid "/Conversation/_Save As..."
 msgstr "/Cu畛�c tho畉�i/_L動u l�..."
 
-#: src/gtkconv.c:2887
-msgid "/Conversation/View _Log"
-msgstr "/Cu畛�c tho畉�i/Xem _b畉�n ghi"
-
-#: src/gtkconv.c:2888
-msgid "/Conversation/Find..."
-msgstr "/Cu畛�c tho畉�i/T狸m..."
-
-#: src/gtkconv.c:2892
+#: src/gtkconv.c:3016
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Cu畛�c tho畉�i/Th棚m th担ng b叩_o buddy..."
 
-#: src/gtkconv.c:2894
-msgid "/Conversation/A_lias..."
-msgstr "/Cu畛�c tho畉�i/B鱈 _danh..."
-
-#: src/gtkconv.c:2896
-msgid "/Conversation/_Get Info..."
-msgstr "/Cu畛�c tho畉�i/_L畉�y th担ng tin..."
-
-#: src/gtkconv.c:2898
+#: src/gtkconv.c:3018
+msgid "/Conversation/_Get Info"
+msgstr "/Cu畛�c tho畉�i/L畉�_y th担ng tin"
+
+#: src/gtkconv.c:3020
+msgid "/Conversation/_Warn..."
+msgstr "/Cu畛�c tho畉�i/_C畉�nh b叩o..."
+
+#: src/gtkconv.c:3022
 msgid "/Conversation/In_vite..."
 msgstr "/Cu畛�c tho畉�i/_M畛�i..."
 
-#: src/gtkconv.c:2903
-msgid "/Conversation/Insert _URL..."
-msgstr "/Cu畛�c tho畉�i/Ch竪n _URL..."
-
-#: src/gtkconv.c:2905
-msgid "/Conversation/Insert _Image..."
-msgstr "/Cu畛�c tho畉�i/Ch竪n 畉�n_h..."
-
-#: src/gtkconv.c:2910
-msgid "/Conversation/_Warn..."
-msgstr "/Cu畛�c tho畉�i/_C畉�nh b叩o..."
-
-#: src/gtkconv.c:2912
+#: src/gtkconv.c:3027
+msgid "/Conversation/A_lias..."
+msgstr "/Cu畛�c tho畉�i/B鱈 _danh..."
+
+#: src/gtkconv.c:3029
 msgid "/Conversation/_Block..."
 msgstr "/Cu畛�c tho畉�i/C_h畉�n..."
 
-#: src/gtkconv.c:2914
+#: src/gtkconv.c:3031
 msgid "/Conversation/_Add..."
 msgstr "/Cu畛�c tho畉�i/_Th棚m..."
 
-#: src/gtkconv.c:2916
+#: src/gtkconv.c:3033
 msgid "/Conversation/_Remove..."
 msgstr "/Cu畛�c tho畉�i/_X坦a b畛�..."
 
-#: src/gtkconv.c:2921
+#: src/gtkconv.c:3038
+msgid "/Conversation/Insert Lin_k..."
+msgstr "/Cu畛�c tho畉�i/Ch竪n li棚n _k畉�t..."
+
+#: src/gtkconv.c:3040
+msgid "/Conversation/Insert Imag_e..."
+msgstr "/Cu畛�c tho畉�i/Ch竪n 畉�_nh..."
+
+#: src/gtkconv.c:3045
 msgid "/Conversation/_Close"
 msgstr "/Cu畛�c tho畉�i/�坦n_g"
 
 #. Options
-#: src/gtkconv.c:2925
+#: src/gtkconv.c:3049
 msgid "/_Options"
 msgstr "/_T湛y ch畛�n"
 
-#: src/gtkconv.c:2926
+#: src/gtkconv.c:3050
 msgid "/Options/Enable _Logging"
 msgstr "/T湛y ch畛�n/Cho ph辿p ��ng _nh畉�p"
 
-#: src/gtkconv.c:2927
+#: src/gtkconv.c:3051
 msgid "/Options/Enable _Sounds"
 msgstr "/T湛y ch畛�n/B畉�t 但m th_anh"
 
-#: src/gtkconv.c:2928
+#: src/gtkconv.c:3052
 msgid "/Options/Show Formatting _Toolbar"
 msgstr "/T湛y ch畛�n/Hi畛�n th畛� thanh �畛�nh _d畉�ng"
 
-#: src/gtkconv.c:2970
+#: src/gtkconv.c:3094
 msgid "/Conversation/View Log"
 msgstr "/Cu畛�c tho畉�i/Xem b畉�n ghi"
 
-#: src/gtkconv.c:2975
+#: src/gtkconv.c:3099
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Cu畛�c tho畉�i/Th棚m th担ng b叩o buddy..."
 
-#: src/gtkconv.c:2979
-msgid "/Conversation/Alias..."
-msgstr "/Cu畛�c tho畉�i/B鱈 danh..."
-
-#: src/gtkconv.c:2983
-msgid "/Conversation/Get Info..."
-msgstr "/Cu畛�c tho畉�i/L畉�y th担ng tin..."
-
-#: src/gtkconv.c:2987
+#: src/gtkconv.c:3105
+msgid "/Conversation/Get Info"
+msgstr "/Cu畛�c tho畉�i/L畉�y th担ng tin"
+
+#: src/gtkconv.c:3109
+msgid "/Conversation/Warn..."
+msgstr "/Cu畛�c tho畉�i/C畉�nh b叩o..."
+
+#: src/gtkconv.c:3113
 msgid "/Conversation/Invite..."
 msgstr "/Cu畛�c tho畉�i/M畛�i..."
 
-#: src/gtkconv.c:2993
-msgid "/Conversation/Insert URL..."
-msgstr "/H畛�i tho畉�i/Ch竪n URL..."
-
-#: src/gtkconv.c:2997
-msgid "/Conversation/Insert Image..."
-msgstr "/H畛�i tho畉�i/Ch竪n 畉�nh..."
-
-#: src/gtkconv.c:3003
-msgid "/Conversation/Warn..."
-msgstr "/Cu畛�c tho畉�i/C畉�nh b叩o..."
-
-#: src/gtkconv.c:3007
+#: src/gtkconv.c:3119
+msgid "/Conversation/Alias..."
+msgstr "/Cu畛�c tho畉�i/B鱈 danh..."
+
+#: src/gtkconv.c:3123
 msgid "/Conversation/Block..."
 msgstr "/Cu畛�c tho畉�i/Ch畉�n..."
 
-#: src/gtkconv.c:3011
+#: src/gtkconv.c:3127
 msgid "/Conversation/Add..."
 msgstr "/Cu畛�c tho畉�i/Th棚m..."
 
-#: src/gtkconv.c:3015
+#: src/gtkconv.c:3131
 msgid "/Conversation/Remove..."
 msgstr "/Cu畛�c tho畉�i/X坦a b畛�..."
 
-#: src/gtkconv.c:3021
+#: src/gtkconv.c:3137
+msgid "/Conversation/Insert Link..."
+msgstr "/Cu畛�c tho畉�i/Ch竪n li棚n k畉�t..."
+
+#: src/gtkconv.c:3141
+msgid "/Conversation/Insert Image..."
+msgstr "/Cu畛�c tho畉�i/Ch竪n 畉�nh..."
+
+#: src/gtkconv.c:3147
 msgid "/Options/Enable Logging"
 msgstr "/T湛y ch畛�n/Cho ph辿p ��ng nh畉�p"
 
-#: src/gtkconv.c:3024
+#: src/gtkconv.c:3150
 msgid "/Options/Enable Sounds"
 msgstr "/T湛y ch畛�n/B畉�t 但m thanh"
 
-#: src/gtkconv.c:3027
+#: src/gtkconv.c:3153
 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:3051 src/gtkconv.c:3053 src/gtkconv.c:3151 src/gtkconv.c:3153
-#: src/gtkconv.c:5971
+#: src/gtkconv.c:3177 src/gtkconv.c:3179 src/gtkconv.c:3277 src/gtkconv.c:3279
+#: src/gtkconv.c:6014
 msgid "Send"
 msgstr "G畛�i"
 
-#: src/gtkconv.c:3074 src/gtkconv.c:4279
+#: src/gtkconv.c:3200 src/gtkconv.c:4405
 msgid "Add the user to your buddy list"
 msgstr "Th棚m ng動畛�i d湛ng v�o danh s叩ch buddy"
 
-#: src/gtkconv.c:3080 src/gtkconv.c:4264
+#: src/gtkconv.c:3206 src/gtkconv.c:4390
 msgid "Remove the user from your buddy list"
 msgstr "X坦a ng動畛�i d湛ng kh畛�i danh s叩ch buddy"
 
 #. Warn button
-#: src/gtkconv.c:3087
+#: src/gtkconv.c:3213
 msgid "Warn"
 msgstr "C畉�nh b叩o"
 
-#: src/gtkconv.c:3091
+#: src/gtkconv.c:3217
 msgid "Warn the user"
 msgstr "C畉�nh b叩o ng動畛�i d湛ng"
 
-#: src/gtkconv.c:3098 src/gtkconv.c:3537
+#: src/gtkconv.c:3224 src/gtkconv.c:3663
 msgid "Get the user's information"
 msgstr "L畉�y th担ng tin ng動畛�i d湛ng"
 
 #. Block button
-#: src/gtkconv.c:3101 src/gtkprivacy.c:605 src/gtkprivacy.c:616
+#: src/gtkconv.c:3227 src/gtkprivacy.c:605 src/gtkprivacy.c:616
 msgid "Block"
 msgstr "Ch畉�n"
 
-#: src/gtkconv.c:3105
+#: src/gtkconv.c:3231
 msgid "Block the user"
 msgstr "Ch畉�n ng動畛�i d湛ng"
 
 #. Invite
-#: src/gtkconv.c:3163 src/gtkconv.c:5974
+#: src/gtkconv.c:3289 src/gtkconv.c:6017
 msgid "Invite"
 msgstr "M畛�i"
 
-#: src/gtkconv.c:3166
+#: src/gtkconv.c:3292
 msgid "Invite a user"
 msgstr "M畛�i ng動畛�i d湛ng"
 
-#: src/gtkconv.c:3205
+#: src/gtkconv.c:3331
 msgid "Bold"
 msgstr "�畉�m"
 
-#: src/gtkconv.c:3216
+#: src/gtkconv.c:3342
 msgid "Italic"
 msgstr "Nghi棚ng"
 
-#: src/gtkconv.c:3227
+#: src/gtkconv.c:3353
 msgid "Underline"
 msgstr "G畉�ch ch但n"
 
-#: src/gtkconv.c:3243
+#: src/gtkconv.c:3369
 msgid "Larger font size"
 msgstr "Ch畛� l畛�n h董n"
 
-#: src/gtkconv.c:3268
+#: src/gtkconv.c:3394
 msgid "Smaller font size"
 msgstr "Ch畛� nh畛� h董n"
 
-#: src/gtkconv.c:3285
+#: src/gtkconv.c:3411
 msgid "Font Face"
 msgstr "M畉�t ch畛�"
 
-#: src/gtkconv.c:3297
+#: src/gtkconv.c:3423
 msgid "Foreground font color"
 msgstr "M�u ch畛�"
 
-#: src/gtkconv.c:3309
+#: src/gtkconv.c:3435
 msgid "Background color"
 msgstr "M�u n畛�n"
 
-#: src/gtkconv.c:3324
+#: src/gtkconv.c:3450
 msgid "Insert image"
 msgstr "Ch竪n 畉�nh"
 
-#: src/gtkconv.c:3335
+#: src/gtkconv.c:3461
 msgid "Insert link"
 msgstr "Ch竪n li棚n k畉�t"
 
-#: src/gtkconv.c:3346
+#: src/gtkconv.c:3472
 msgid "Insert smiley"
 msgstr "Ch竪n bi畛�u t動畛�ng"
 
-#: src/gtkconv.c:3406
+#: src/gtkconv.c:3532
 msgid "Topic:"
 msgstr "Ch畛� �畛�:"
 
 #. Setup the label telling how many people are in the room.
-#: src/gtkconv.c:3457
+#: src/gtkconv.c:3583
 msgid "0 people in room"
 msgstr "0 ng動畛�i trong ph嘆ng"
 
-#: src/gtkconv.c:3514
+#: src/gtkconv.c:3640
 msgid "IM the user"
 msgstr "Nh畉�n tin nhanh ng動畛�i d湛ng"
 
-#: src/gtkconv.c:3526
+#: src/gtkconv.c:3652
 msgid "Ignore the user"
 msgstr "B畛� qua ng動畛�i d湛ng"
 
-#: src/gtkconv.c:4077
+#: src/gtkconv.c:4203
 msgid "Close conversation"
 msgstr "�坦ng cu畛�c tho畉�i"
 
-#: src/gtkconv.c:4664 src/gtkconv.c:4696 src/gtkconv.c:4817 src/gtkconv.c:4884
+#: src/gtkconv.c:4790 src/gtkconv.c:4822 src/gtkconv.c:4943 src/gtkconv.c:5010
 #, 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動畛�i trong ph嘆ng"
 
-#: src/gtkconv.c:5218
+#: src/gtkconv.c:5344
 msgid "Animate"
 msgstr "Ho畉�t c畉�nh"
 
-#: src/gtkconv.c:5223
+#: src/gtkconv.c:5349
 msgid "Hide Icon"
 msgstr "畉�n bi畛�u t動畛�ng"
 
-#: src/gtkconv.c:5229
+#: src/gtkconv.c:5355
 msgid "Save Icon As..."
 msgstr "L動u bi畛�u t動畛�ng l�..."
 
-#: src/gtkconv.c:5708 src/gtkconv.c:5711
+#: src/gtkconv.c:5751 src/gtkconv.c:5754
 msgid "<main>/Conversation/Close"
 msgstr "<main>/Cu畛�c tho畉�i/�坦ng"
 
@@ -2909,7 +2851,7 @@
 msgstr "Kh担ng hi畛�n th畛� th担ng tin truy畛�n t畉�p tin"
 
 #. Pause button
-#: src/gtkft.c:672 src/stock.c:86
+#: src/gtkft.c:672 src/stock.c:85
 msgid "_Pause"
 msgstr "T畉�m _d畛�ng"
 
@@ -2939,12 +2881,12 @@
 msgstr "T畉�p tin �達 t畛�n t畉�i r畛�i."
 
 #: src/gtkft.c:1100
-msgid "Gaim - Open..."
-msgstr "Gaim - M畛�..."
-
-#: src/gtkft.c:1102 src/protocols/toc/toc.c:2042
-msgid "Gaim - Save As..."
-msgstr "Gaim - L動u l�..."
+msgid "Open..."
+msgstr "M畛�..."
+
+#: src/gtkft.c:1102
+msgid "Save As..."
+msgstr "L動u l�..."
 
 #: src/gtkft.c:1149
 #, c-format
@@ -2963,22 +2905,22 @@
 msgid "_Open Link in Browser"
 msgstr "_M畛� li棚n k畉�t trong tr狸nh duy畛�t"
 
-#: src/gtkimhtml.c:1910
+#: src/gtkimhtml.c:1849
 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. M畉�c �畛�nh l� PNG."
 
-#: src/gtkimhtml.c:1918
+#: src/gtkimhtml.c:1857
 #, c-format
 msgid "Error saving image: %s"
 msgstr "L畛�i l動u 畉�nh: %s"
 
-#: src/gtkimhtml.c:1927
+#: src/gtkimhtml.c:1866
 msgid "Save Image"
 msgstr "L動u 畉�nh"
 
-#: src/gtkimhtml.c:1950
+#: src/gtkimhtml.c:1889
 msgid "_Save Image..."
 msgstr "_L動u 畉�nh"
 
@@ -3089,7 +3031,7 @@
 msgstr "C坦 m畉�t tr畛� l畉�i"
 
 #: src/gtkpounce.c:415 src/gtkprefs.c:1494 src/protocols/msn/state.c:30
-#: src/protocols/yahoo/yahoo.c:2128
+#: src/protocols/yahoo/yahoo.c:2189
 msgid "Idle"
 msgstr "Ngh畛�"
 
@@ -3206,6 +3148,11 @@
 msgid "Icon"
 msgstr "Bi畛�u t動畛�ng"
 
+#: src/gtkprefs.c:601 src/gtkprefs.c:1805 src/protocols/jabber/buddy.c:263
+#: src/protocols/jabber/buddy.c:738
+msgid "Description"
+msgstr "M担 t畉�"
+
 #: src/gtkprefs.c:668
 msgid "Style"
 msgstr "Ki畛�u d叩ng"
@@ -3510,10 +3457,6 @@
 msgid "Proxy Server"
 msgstr "M叩y ch畛� Proxy"
 
-#: src/gtkprefs.c:1144
-msgid "Port:"
-msgstr "C畛�ng:"
-
 #: src/gtkprefs.c:1162
 msgid "_User:"
 msgstr "_Ng動畛�i d湛ng:"
@@ -3964,13 +3907,13 @@
 "launched: %s"
 msgstr "Kh担ng th畛� ph叩t 但m thanh v狸 kh担ng th畛� ch畉�y l畛�nh ph叩t 但m thanh: %s"
 
-#: src/gtkutils.c:296
+#: src/gtkutils.c:294
 msgid "Can't save icon file to disk."
 msgstr "Kh担ng th畛� l動u t畉�p tin bi畛�u t動畛�ng v�o �挑a."
 
-#: src/gtkutils.c:331
-msgid "Gaim - Save Icon"
-msgstr "Gaim - L動u bi畛�u t動畛�ng"
+#: src/gtkutils.c:329
+msgid "Save Icon"
+msgstr "L動u bi畛�u t動畛�ng"
 
 #: src/log.c:83
 msgid "<b><font color=\"red\">The logger has no read function</font></b>"
@@ -3980,17 +3923,17 @@
 msgid "XML"
 msgstr "XML"
 
-#: src/log.c:484
+#: src/log.c:487
 #, 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"
-
-#: src/log.c:486
+"<font color=\"#16569E\">(%s) <b>%s <Tr畉�-L畛�i-T畛�-�畛�ng>:</b></font> %s<br/>\n"
+
+#: src/log.c:489
 #, 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"
+"<font color=\"#A82F2F\">(%s) <b>%s <Tr畉�-L畛�i-T畛�-�畛�ng>:</b></font> %s<br/>\n"
 
 #: src/log.c:533 src/log.c:668
 msgid "<font color=\"red\"><b>Unable to find log path!</b></font>"
@@ -4091,8 +4034,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:2417
-#: src/protocols/yahoo/yahoo.c:2526
+#: src/protocols/msn/state.c:36 src/protocols/yahoo/yahoo.c:2492
+#: src/protocols/yahoo/yahoo.c:2601
 msgid "Available"
 msgstr "C坦 m畉�t"
 
@@ -4106,9 +4049,9 @@
 
 #: src/protocols/gg/gg.c:53 src/protocols/jabber/jabber.c:929
 #: src/protocols/jabber/presence.c:91 src/protocols/oscar/oscar.c:2849
-#: src/protocols/oscar/oscar.c:4582 src/protocols/oscar/oscar.c:4609
-#: src/protocols/oscar/oscar.c:6158 src/protocols/yahoo/yahoo.c:2126
-#: src/protocols/yahoo/yahoo.c:2437 src/protocols/yahoo/yahoo.c:2536
+#: src/protocols/oscar/oscar.c:4584 src/protocols/oscar/oscar.c:4611
+#: src/protocols/oscar/oscar.c:6168 src/protocols/yahoo/yahoo.c:2187
+#: src/protocols/yahoo/yahoo.c:2512 src/protocols/yahoo/yahoo.c:2611
 msgid "Invisible"
 msgstr "Gi畉�u m畉�t"
 
@@ -4226,7 +4169,7 @@
 msgid "Active"
 msgstr "K鱈ch ho畉�t"
 
-#: src/protocols/gg/gg.c:664 src/protocols/oscar/oscar.c:3960
+#: src/protocols/gg/gg.c:664 src/protocols/oscar/oscar.c:3962
 msgid "UIN"
 msgstr "UIN"
 
@@ -4236,12 +4179,12 @@
 
 #. Last Name
 #: src/protocols/gg/gg.c:673 src/protocols/jabber/jabber.c:602
-#: src/protocols/oscar/oscar.c:3968 src/protocols/trepia/trepia.c:274
+#: src/protocols/oscar/oscar.c:3970 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:3962
+#: src/protocols/irc/msgs.c:183 src/protocols/oscar/oscar.c:3964
 msgid "Nick"
 msgstr "Bi畛�t danh (nick)"
 
@@ -4256,7 +4199,7 @@
 
 #. City
 #: src/protocols/gg/gg.c:701 src/protocols/jabber/jabber.c:612
-#: src/protocols/oscar/oscar.c:4014 src/protocols/oscar/oscar.c:4030
+#: src/protocols/oscar/oscar.c:4016 src/protocols/oscar/oscar.c:4032
 #: src/protocols/trepia/trepia.c:331 src/protocols/trepia/trepia.c:430
 msgid "City"
 msgstr "Th�nh ph畛�"
@@ -4265,9 +4208,9 @@
 #: src/protocols/gg/gg.c:722 src/protocols/msn/msn.c:1286
 #: src/protocols/msn/msn.c:1530 src/protocols/napster/napster.c:387
 #: src/protocols/oscar/oscar.c:2891 src/protocols/oscar/oscar.c:3203
-#: src/protocols/toc/toc.c:498 src/protocols/yahoo/yahoo.c:2709
-#: src/protocols/yahoo/yahoo.c:2731 src/protocols/yahoo/yahoo.c:2754
-#: src/protocols/yahoo/yahoo.c:2912 src/protocols/zephyr/zephyr.c:355
+#: src/protocols/toc/toc.c:498 src/protocols/yahoo/yahoo.c:2784
+#: src/protocols/yahoo/yahoo.c:2806 src/protocols/yahoo/yahoo.c:2829
+#: src/protocols/yahoo/yahoo.c:2987 src/protocols/zephyr/zephyr.c:355
 msgid "Buddy Information"
 msgstr "Th担ng tin buddy"
 
@@ -4369,7 +4312,7 @@
 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:6513 src/protocols/toc/toc.c:1546
+#: src/protocols/toc/toc.c:1546
 msgid "Change Password"
 msgstr "�畛�i m畉�t kh畉�u"
 
@@ -4423,14 +4366,14 @@
 #: 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:2621
-#: src/protocols/oscar/oscar.c:5140
+#: src/protocols/oscar/oscar.c:5142
 msgid "Authorize"
 msgstr "Th畉�m tra"
 
 #: 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:2623
-#: src/protocols/oscar/oscar.c:5141
+#: src/protocols/oscar/oscar.c:5143
 msgid "Deny"
 msgstr "T畛� ch畛�i"
 
@@ -4504,8 +4447,12 @@
 msgstr "Xem MOTD"
 
 #: src/protocols/irc/irc.c:158
-msgid "Channel:"
-msgstr "K棚nh (channel):"
+msgid "_Channel:"
+msgstr "_K棚nh (channel):"
+
+#: src/protocols/irc/irc.c:163 src/protocols/jabber/chat.c:57
+msgid "_Password:"
+msgstr "_M畉�t kh畉�u:"
 
 #: src/protocols/irc/irc.c:182
 msgid "IRC nicks may not contain whitespace"
@@ -4583,7 +4530,7 @@
 msgid " <i>(identified)</i>"
 msgstr " <i>(identified)</i>"
 
-#: src/protocols/irc/msgs.c:192 src/protocols/yahoo/yahoo.c:2812
+#: src/protocols/irc/msgs.c:192 src/protocols/yahoo/yahoo.c:2887
 msgid "Realname"
 msgstr "T棚n th畉�t"
 
@@ -4632,84 +4579,88 @@
 msgid "Gaim has sent a message the IRC server did not understand."
 msgstr "Gaim �達 g畛�i m畛�t th担ng �i畛�p m� m叩y ch畛� IRC kh担ng hi畛�u."
 
+#: src/protocols/irc/msgs.c:370
+msgid "No such channel"
+msgstr "Kh担ng c坦 k棚nh nh動 v畉�y"
+
 #. does this happen?
-#: src/protocols/irc/msgs.c:371
+#: src/protocols/irc/msgs.c:381
 msgid "no such channel"
-msgstr "Kh担ng c坦 k棚nh n�o"
-
-#: src/protocols/irc/msgs.c:374
+msgstr "Kh担ng c坦 k棚nh nh動 v畉�y"
+
+#: src/protocols/irc/msgs.c:384
 msgid "User is not logged in"
 msgstr "Ng動畛�i d湛ng kh担ng �動畛�c ��ng nh畉�p"
 
-#: src/protocols/irc/msgs.c:379
+#: src/protocols/irc/msgs.c:389
 msgid "No such nick or channel"
 msgstr "Ch動a c坦 bi畛�t danh (nick) ho畉�c k棚nh (channel)"
 
-#: src/protocols/irc/msgs.c:399
+#: src/protocols/irc/msgs.c:409
 msgid "Could not send"
 msgstr "Kh担ng th畛� g畛�i"
 
-#: src/protocols/irc/msgs.c:455
+#: src/protocols/irc/msgs.c:465
 #, c-format
 msgid "Joining %s requires an invitation."
 msgstr "Vi畛�c tham gia v�o %s c畉�n c坦 l畛�i m畛�i."
 
-#: src/protocols/irc/msgs.c:456
+#: src/protocols/irc/msgs.c:466
 msgid "Invitation only"
 msgstr "Ch畛� ng動畛�i �動畛�c m畛�i"
 
-#: src/protocols/irc/msgs.c:552
+#: src/protocols/irc/msgs.c:562
 #, c-format
 msgid "You have been kicked by %s: (%s)"
 msgstr "B畉�n b畛� %s �叩: (%s)"
 
-#: src/protocols/irc/msgs.c:560
+#: src/protocols/irc/msgs.c:570
 #, c-format
 msgid "Kicked by %s (%s)"
 msgstr "B畛� %s �叩 (%s)"
 
-#: src/protocols/irc/msgs.c:581
+#: src/protocols/irc/msgs.c:591
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr "mode (%s %s) b畛�i %s"
 
-#: src/protocols/irc/msgs.c:660
+#: src/protocols/irc/msgs.c:670
 msgid "Could not change nick"
 msgstr "Kh担ng th畛� �畛�i bi畛�t danh (nick)"
 
-#: src/protocols/irc/msgs.c:661
+#: src/protocols/irc/msgs.c:671
 msgid "Cannot change nick"
 msgstr "Kh担ng th畛� �畛�i bi畛�t danh (nick)"
 
-#: src/protocols/irc/msgs.c:682
+#: src/protocols/irc/msgs.c:692
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr "B畉�n r畛�i kh畛�i k棚nh %s%s"
 
-#: src/protocols/irc/msgs.c:720
+#: src/protocols/irc/msgs.c:730
 msgid "Error: invalid PONG from server"
 msgstr "L畛�i: PONG t畛� m叩y ch畛� kh担ng h畛�p l畛�"
 
-#: src/protocols/irc/msgs.c:722
+#: src/protocols/irc/msgs.c:732
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr "�叩p l畉�i PING -- H畉�t: %lu gi但y"
 
-#: src/protocols/irc/msgs.c:792
+#: src/protocols/irc/msgs.c:802
 #, c-format
 msgid "Cannot join %s:"
 msgstr "Kh担ng th畛� v�o %s:"
 
-#: src/protocols/irc/msgs.c:793
+#: src/protocols/irc/msgs.c:803
 msgid "Cannot join channel"
 msgstr "Kh担ng th畛� v�o k棚nh"
 
-#: src/protocols/irc/msgs.c:823
+#: src/protocols/irc/msgs.c:833
 #, c-format
 msgid "Wallops from %s"
 msgstr "C炭 �叩nh t畛� %s"
 
-#: src/protocols/irc/parse.c:160
+#: src/protocols/irc/parse.c:161
 msgid ""
 "(There was an error converting this message.  Check the 'Encoding' option in "
 "the Account Editor)"
@@ -4717,20 +4668,20 @@
 "(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)"
 
-#: src/protocols/irc/parse.c:291
+#: src/protocols/irc/parse.c:292
 #, c-format
 msgid "Reply time from %s: %lu seconds"
 msgstr "Th畛�i gian �叩p l畉�i t畛� %s: %lu gi但y"
 
-#: src/protocols/irc/parse.c:292
+#: src/protocols/irc/parse.c:293
 msgid "PONG"
 msgstr "PONG"
 
-#: src/protocols/irc/parse.c:292
+#: src/protocols/irc/parse.c:293
 msgid "CTCP PING reply"
 msgstr " Tr畉� l畛�i PING CTCP"
 
-#: src/protocols/irc/parse.c:391
+#: src/protocols/irc/parse.c:392
 msgid "Disconnected"
 msgstr "M畉�t k畉�t n畛�i"
 
@@ -4782,7 +4733,7 @@
 
 #: src/protocols/jabber/auth.c:444 src/protocols/jabber/jabber.c:147
 #: src/protocols/jabber/jabber.c:864 src/protocols/jabber/jabber.c:914
-#: src/protocols/oscar/oscar.c:5560
+#: src/protocols/oscar/oscar.c:5570
 msgid "Not Authorized"
 msgstr "Kh担ng x叩c th畛�c �動畛�c"
 
@@ -4807,10 +4758,14 @@
 msgstr "T棚n hay g畛�i"
 
 #: src/protocols/jabber/buddy.c:248 src/protocols/jabber/buddy.c:625
-#: src/protocols/jabber/jabber.c:592 src/protocols/yahoo/yahoo.c:2808
+#: src/protocols/jabber/jabber.c:592 src/protocols/yahoo/yahoo.c:2883
 msgid "Nickname"
 msgstr "Bi畛�t danh"
 
+#: src/protocols/jabber/buddy.c:249 src/protocols/jabber/jabber.c:632
+msgid "URL"
+msgstr "URL"
+
 #: src/protocols/jabber/buddy.c:250 src/protocols/jabber/buddy.c:653
 msgid "Street Address"
 msgstr "�畛�a ch畛� nh�"
@@ -4844,7 +4799,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:2804
+#: src/protocols/jabber/buddy.c:707 src/protocols/yahoo/yahoo.c:2879
 msgid "Email"
 msgstr "Th動 �i畛�n t畛�"
 
@@ -4865,7 +4820,7 @@
 msgstr "V畛� tr鱈"
 
 #: src/protocols/jabber/buddy.c:262 src/protocols/jabber/buddy.c:628
-#: src/protocols/oscar/oscar.c:3994
+#: src/protocols/oscar/oscar.c:3996
 msgid "Birthday"
 msgstr "Ng�y sinh"
 
@@ -4898,7 +4853,7 @@
 msgstr "T棚n �畛�m"
 
 #: src/protocols/jabber/buddy.c:633 src/protocols/jabber/jabber.c:607
-#: src/protocols/oscar/oscar.c:4011 src/protocols/oscar/oscar.c:4027
+#: src/protocols/oscar/oscar.c:4013 src/protocols/oscar/oscar.c:4029
 msgid "Address"
 msgstr "�畛�a ch畛�"
 
@@ -4938,42 +4893,42 @@
 msgid "Unsubscribe"
 msgstr "Kh担ng ��ng k箪"
 
-#: src/protocols/jabber/chat.c:37 src/protocols/yahoo/yahoochat.c:937
-msgid "Room:"
-msgstr "Ph嘆ng:"
-
-#: src/protocols/jabber/chat.c:44
-msgid "Server:"
-msgstr "M叩y ch畛�:"
-
-#: src/protocols/jabber/chat.c:50
-msgid "Handle:"
-msgstr "X畛� l箪:"
-
-#: src/protocols/jabber/chat.c:158
+#: src/protocols/jabber/chat.c:38 src/protocols/yahoo/yahoochat.c:938
+msgid "_Room:"
+msgstr "_Ph嘆ng:"
+
+#: src/protocols/jabber/chat.c:45
+msgid "_Server:"
+msgstr "_M叩y ch畛�:"
+
+#: src/protocols/jabber/chat.c:51
+msgid "_Handle:"
+msgstr "_X畛� l箪:"
+
+#: src/protocols/jabber/chat.c:159
 #, c-format
 msgid "%s is not a valid room name"
 msgstr "%s kh担ng ph畉�i l� t棚n ph嘆ng h畛�p l畛�."
 
-#: src/protocols/jabber/chat.c:159
+#: src/protocols/jabber/chat.c:160
 msgid "Invalid Room Name"
 msgstr "T棚n ph嘆ng kh担ng h畛�p l畛�"
 
-#: src/protocols/jabber/chat.c:164
+#: src/protocols/jabber/chat.c:165
 #, c-format
 msgid "%s is not a valid server name"
 msgstr "%s kh担ng ph畉�i t棚n m叩y ch畛� h畛�p l畛�"
 
-#: src/protocols/jabber/chat.c:165 src/protocols/jabber/chat.c:166
+#: src/protocols/jabber/chat.c:166 src/protocols/jabber/chat.c:167
 msgid "Invalid Server Name"
 msgstr "T棚n m叩y ch畛� kh担ng h畛�p l畛�"
 
-#: src/protocols/jabber/chat.c:170
+#: src/protocols/jabber/chat.c:171
 #, c-format
 msgid "%s is not a valid room handle"
 msgstr "%s kh担ng ph畉�i m畛�t x畛� l箪 ph嘆ng h畛�p l畛�"
 
-#: src/protocols/jabber/chat.c:171 src/protocols/jabber/chat.c:172
+#: src/protocols/jabber/chat.c:172 src/protocols/jabber/chat.c:173
 msgid "Invalid Room Handle"
 msgstr "X畛� l箪 ph嘆ng kh担ng h畛�p l畛�"
 
@@ -5152,14 +5107,14 @@
 msgstr "Email"
 
 #. First Name
-#: src/protocols/jabber/jabber.c:597 src/protocols/oscar/oscar.c:3965
+#: src/protocols/jabber/jabber.c:597 src/protocols/oscar/oscar.c:3967
 #: src/protocols/trepia/trepia.c:267
 msgid "First Name"
 msgstr "T棚n"
 
 #. State
-#: src/protocols/jabber/jabber.c:617 src/protocols/oscar/oscar.c:4017
-#: src/protocols/oscar/oscar.c:4033 src/protocols/trepia/trepia.c:335
+#: src/protocols/jabber/jabber.c:617 src/protocols/oscar/oscar.c:4019
+#: src/protocols/oscar/oscar.c:4035 src/protocols/trepia/trepia.c:335
 #: src/protocols/trepia/trepia.c:439
 msgid "State"
 msgstr "Bang"
@@ -5183,7 +5138,7 @@
 #: src/protocols/jabber/jabber.c:767 src/protocols/msn/dispatch.c:219
 #: src/protocols/msn/msn.c:483 src/protocols/napster/napster.c:487
 #: src/protocols/oscar/oscar.c:694 src/protocols/trepia/trepia.c:1110
-#: src/protocols/yahoo/yahoo.c:2014
+#: src/protocols/yahoo/yahoo.c:2073
 msgid "Connecting"
 msgstr "K畉�t n畛�i"
 
@@ -5200,7 +5155,7 @@
 msgstr "Kh畛�i t畉�o l畉�i Stream"
 
 #: src/protocols/jabber/jabber.c:909 src/protocols/jabber/jabber.c:962
-#: src/protocols/jabber/presence.c:296
+#: src/protocols/jabber/presence.c:292
 msgid "Error"
 msgstr "L畛�i"
 
@@ -5216,7 +5171,7 @@
 
 #: src/protocols/jabber/jabber.c:928 src/protocols/jabber/jutil.c:107
 #: src/protocols/jabber/presence.c:89 src/protocols/oscar/oscar.c:2839
-#: src/protocols/oscar/oscar.c:4597 src/protocols/oscar/oscar.c:6154
+#: src/protocols/oscar/oscar.c:4599 src/protocols/oscar/oscar.c:6164
 msgid "Do Not Disturb"
 msgstr "Xin �畛�ng qu畉�y r畉�y"
 
@@ -5249,8 +5204,7 @@
 msgid "Please enter your new password"
 msgstr "H達y nh畉�p m畉�t kh畉�u m畛�i"
 
-#: src/protocols/jabber/jabber.c:1034 src/protocols/oscar/oscar.c:6499
-#: src/protocols/toc/toc.c:1532
+#: src/protocols/jabber/jabber.c:1034 src/protocols/toc/toc.c:1532
 msgid "Set User Info"
 msgstr "L畉�p th担ng tin ng動畛�i d湛ng"
 
@@ -5312,11 +5266,11 @@
 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:286 src/protocols/oscar/oscar.c:2950
+#: src/protocols/jabber/presence.c:282 src/protocols/oscar/oscar.c:2950
 msgid "Unknown error"
 msgstr "L畛�i kh担ng x叩c �畛�nh"
 
-#: src/protocols/jabber/presence.c:292
+#: src/protocols/jabber/presence.c:288
 msgid "Unable to join chat"
 msgstr "Kh担ng th畛� tham gia Chat"
 
@@ -5372,8 +5326,8 @@
 
 #: src/protocols/msn/dispatch.c:215 src/protocols/msn/msn.c:492
 #: src/protocols/msn/notification.c:2149 src/protocols/napster/napster.c:463
-#: src/protocols/napster/napster.c:494 src/protocols/yahoo/yahoo.c:1806
-#: src/protocols/yahoo/yahoo.c:1837 src/protocols/yahoo/yahoo.c:1902
+#: src/protocols/napster/napster.c:494 src/protocols/yahoo/yahoo.c:1853
+#: src/protocols/yahoo/yahoo.c:1884 src/protocols/yahoo/yahoo.c:1949
 msgid "Unable to connect"
 msgstr "Kh担ng th畛� k畉�t n畛�i"
 
@@ -5645,7 +5599,7 @@
 msgid "Page"
 msgstr "Nh畉�n tin"
 
-#: src/protocols/msn/msn.c:332 src/protocols/yahoo/yahoo.c:2240
+#: src/protocols/msn/msn.c:332 src/protocols/yahoo/yahoo.c:2301
 #, c-format
 msgid "<b>Status:</b> %s"
 msgstr "<b>Tr畉�ng th叩i:</b> %s"
@@ -5656,26 +5610,26 @@
 msgstr "R畛�i kh畛�i m叩y t鱈nh"
 
 #: src/protocols/msn/msn.c:346 src/protocols/msn/msn.c:630
-#: src/protocols/msn/state.c:31 src/protocols/yahoo/yahoo.c:2108
-#: src/protocols/yahoo/yahoo.c:2419 src/protocols/yahoo/yahoo.c:2527
+#: src/protocols/msn/state.c:31 src/protocols/yahoo/yahoo.c:2169
+#: src/protocols/yahoo/yahoo.c:2494 src/protocols/yahoo/yahoo.c:2602
 msgid "Be Right Back"
 msgstr "S畉� quay l畉�i ngay"
 
 #: src/protocols/msn/msn.c:347 src/protocols/msn/msn.c:632
-#: src/protocols/msn/state.c:29 src/protocols/yahoo/yahoo.c:2110
-#: src/protocols/yahoo/yahoo.c:2421 src/protocols/yahoo/yahoo.c:2528
+#: src/protocols/msn/state.c:29 src/protocols/yahoo/yahoo.c:2171
+#: src/protocols/yahoo/yahoo.c:2496 src/protocols/yahoo/yahoo.c:2603
 msgid "Busy"
 msgstr "�ang b畉�n"
 
 #: src/protocols/msn/msn.c:348 src/protocols/msn/msn.c:634
-#: src/protocols/msn/state.c:33 src/protocols/yahoo/yahoo.c:2118
-#: src/protocols/yahoo/yahoo.c:2429 src/protocols/yahoo/yahoo.c:2532
+#: src/protocols/msn/state.c:33 src/protocols/yahoo/yahoo.c:2179
+#: src/protocols/yahoo/yahoo.c:2504 src/protocols/yahoo/yahoo.c:2607
 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:636
-#: src/protocols/msn/state.c:34 src/protocols/yahoo/yahoo.c:2122
-#: src/protocols/yahoo/yahoo.c:2433 src/protocols/yahoo/yahoo.c:2534
+#: src/protocols/msn/state.c:34 src/protocols/yahoo/yahoo.c:2183
+#: src/protocols/yahoo/yahoo.c:2508 src/protocols/yahoo/yahoo.c:2609
 msgid "Out To Lunch"
 msgstr "�i �n tr動a"
 
@@ -5742,33 +5696,33 @@
 "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:1287 src/protocols/yahoo/yahoo.c:2710
+#: src/protocols/msn/msn.c:1287 src/protocols/yahoo/yahoo.c:2785
 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:1357 src/protocols/oscar/oscar.c:3999
+#: src/protocols/msn/msn.c:1357 src/protocols/oscar/oscar.c:4001
 #: src/protocols/trepia/trepia.c:285 src/protocols/trepia/trepia.c:413
-#: src/protocols/yahoo/yahoo.c:2820
+#: src/protocols/yahoo/yahoo.c:2895
 msgid "Age"
 msgstr "Tu畛�i"
 
 #. Gender
-#: src/protocols/msn/msn.c:1364 src/protocols/oscar/oscar.c:3985
+#: src/protocols/msn/msn.c:1364 src/protocols/oscar/oscar.c:3987
 #: src/protocols/trepia/trepia.c:279 src/protocols/trepia/trepia.c:421
-#: src/protocols/yahoo/yahoo.c:2828
+#: src/protocols/yahoo/yahoo.c:2903
 msgid "Gender"
 msgstr "Gi畛�i t鱈nh"
 
-#: src/protocols/msn/msn.c:1372 src/protocols/yahoo/yahoo.c:2824
+#: src/protocols/msn/msn.c:1372 src/protocols/yahoo/yahoo.c:2899
 msgid "Marital Status"
 msgstr "T狸nh tr畉�ng h担n nh但n"
 
-#: src/protocols/msn/msn.c:1379 src/protocols/yahoo/yahoo.c:2816
+#: src/protocols/msn/msn.c:1379 src/protocols/yahoo/yahoo.c:2891
 msgid "Location"
 msgstr "N董i 畛�"
 
-#: src/protocols/msn/msn.c:1387 src/protocols/yahoo/yahoo.c:2832
+#: src/protocols/msn/msn.c:1387 src/protocols/yahoo/yahoo.c:2907
 msgid "Occupation"
 msgstr "Ngh畛� nghi畛�p"
 
@@ -5789,11 +5743,11 @@
 msgstr "S畛� th鱈ch"
 
 #: src/protocols/msn/msn.c:1491 src/protocols/msn/msn.c:1497
-#: src/protocols/yahoo/yahoo.c:2867
+#: src/protocols/yahoo/yahoo.c:2942
 msgid "Favorite Quote"
 msgstr "C但u tr鱈ch d畉�n 動a th鱈ch"
 
-#: src/protocols/msn/msn.c:1505 src/protocols/yahoo/yahoo.c:2903
+#: src/protocols/msn/msn.c:1505 src/protocols/yahoo/yahoo.c:2978
 msgid "Last Updated"
 msgstr "C畉�p nh畉�t l畉�n cu畛�i"
 
@@ -5803,12 +5757,12 @@
 msgid "Homepage"
 msgstr "Trang ch畛�"
 
-#: src/protocols/msn/msn.c:1538 src/protocols/yahoo/yahoo.c:2918
+#: src/protocols/msn/msn.c:1538 src/protocols/yahoo/yahoo.c:2993
 #, c-format
 msgid "User information for %s unavailable"
 msgstr "Hi畛�n kh担ng c坦 th担ng tin v畛� %s"
 
-#: src/protocols/msn/msn.c:1540 src/protocols/yahoo/yahoo.c:2920
+#: src/protocols/msn/msn.c:1540 src/protocols/yahoo/yahoo.c:2995
 msgid "The user's profile is empty."
 msgstr "L箪 l畛�ch ng動畛�i d湛ng n�y tr畛�ng."
 
@@ -5993,10 +5947,10 @@
 msgid "%s requested a PING"
 msgstr "%s y棚u c畉�u PING"
 
-#: src/protocols/napster/napster.c:543 src/protocols/oscar/oscar.c:5211
+#: src/protocols/napster/napster.c:543 src/protocols/oscar/oscar.c:5213
 #: src/protocols/toc/toc.c:1259
-msgid "Join what group:"
-msgstr "Tham gia nh坦m n�o:"
+msgid "_Group:"
+msgstr "_Nh坦m:"
 
 #. *< api_version
 #. *< type
@@ -6224,7 +6178,7 @@
 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:1913 src/protocols/oscar/oscar.c:5661
+#: src/protocols/oscar/oscar.c:1913 src/protocols/oscar/oscar.c:5671
 #, c-format
 msgid "Direct IM with %s established"
 msgstr "�達 thi畉�t l畉�p nh畉�n tin nhanh tr畛�c ti畉�p v畛�i %s"
@@ -6248,7 +6202,7 @@
 "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:2419 src/protocols/oscar/oscar.c:6030
+#: src/protocols/oscar/oscar.c:2419 src/protocols/oscar/oscar.c:6040
 msgid "Connect"
 msgstr "K畉�t n畛�i"
 
@@ -6280,8 +6234,8 @@
 #: src/protocols/oscar/oscar.c:2526 src/protocols/oscar/oscar.c:2528
 #: src/protocols/oscar/oscar.c:2535 src/protocols/oscar/oscar.c:2611
 #: src/protocols/oscar/oscar.c:2631 src/protocols/oscar/oscar.c:2987
-#: src/protocols/oscar/oscar.c:3047 src/protocols/oscar/oscar.c:5132
-#: src/protocols/oscar/oscar.c:5178
+#: src/protocols/oscar/oscar.c:3047 src/protocols/oscar/oscar.c:5134
+#: src/protocols/oscar/oscar.c:5180
 msgid "No reason given."
 msgstr "Kh担ng n棚u l箪 do."
 
@@ -6298,7 +6252,7 @@
 "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:2619 src/protocols/oscar/oscar.c:5138
+#: src/protocols/oscar/oscar.c:2619 src/protocols/oscar/oscar.c:5140
 msgid "Authorization Request"
 msgstr "Y棚u c畉�u x叩c th畛�c"
 
@@ -6421,18 +6375,18 @@
 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:2837 src/protocols/oscar/oscar.c:4606
-#: src/protocols/oscar/oscar.c:6157
+#: src/protocols/oscar/oscar.c:2837 src/protocols/oscar/oscar.c:4608
+#: src/protocols/oscar/oscar.c:6167
 msgid "Free For Chat"
 msgstr "R畉�nh r畛�i �畛� Chat"
 
-#: src/protocols/oscar/oscar.c:2841 src/protocols/oscar/oscar.c:4600
-#: src/protocols/oscar/oscar.c:6155
+#: src/protocols/oscar/oscar.c:2841 src/protocols/oscar/oscar.c:4602
+#: src/protocols/oscar/oscar.c:6165
 msgid "Not Available"
 msgstr "Kh担ng c坦 m畉�t"
 
-#: src/protocols/oscar/oscar.c:2843 src/protocols/oscar/oscar.c:4603
-#: src/protocols/oscar/oscar.c:6156
+#: src/protocols/oscar/oscar.c:2843 src/protocols/oscar/oscar.c:4605
+#: src/protocols/oscar/oscar.c:6166
 msgid "Occupied"
 msgstr "�ang b畉�n"
 
@@ -6469,12 +6423,12 @@
 msgid "AIM Direct IM"
 msgstr "Nh畉�n tin nhanh tr畛�c ti畉�p AIM"
 
-#: src/protocols/oscar/oscar.c:3092 src/protocols/oscar/oscar.c:6256
+#: src/protocols/oscar/oscar.c:3092 src/protocols/oscar/oscar.c:6266
 msgid "Get File"
 msgstr "Nh畉�n t畉�p tin"
 
-#: src/protocols/oscar/oscar.c:3095 src/protocols/oscar/oscar.c:6248
-#: src/protocols/yahoo/yahoo.c:2289
+#: src/protocols/oscar/oscar.c:3095 src/protocols/oscar/oscar.c:6258
+#: src/protocols/yahoo/yahoo.c:2350
 msgid "Send File"
 msgstr "G畛�i t畉�p tin"
 
@@ -6579,7 +6533,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:3678
+#: src/protocols/oscar/oscar.c:3680
 msgid ""
 "You have been disconnected because you have signed on with this screen name "
 "at another location."
@@ -6587,109 +6541,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:3680
+#: src/protocols/oscar/oscar.c:3682
 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:3711
+#: src/protocols/oscar/oscar.c:3713
 msgid "Finalizing connection"
 msgstr "Ho�n t畉�t k畉�t n畛�i"
 
-#: src/protocols/oscar/oscar.c:3971 src/protocols/oscar/oscar.c:3977
+#: src/protocols/oscar/oscar.c:3973 src/protocols/oscar/oscar.c:3979
 msgid "Email Address"
 msgstr "�畛�a ch畛� email"
 
-#: src/protocols/oscar/oscar.c:3982
+#: src/protocols/oscar/oscar.c:3984
 msgid "Mobile Phone"
 msgstr "S畛� �i畛�n tho畉�i �i �畛�ng"
 
-#: src/protocols/oscar/oscar.c:3985 src/protocols/trepia/trepia.c:281
+#: src/protocols/oscar/oscar.c:3987 src/protocols/trepia/trepia.c:281
 #: src/protocols/trepia/trepia.c:422
 msgid "Female"
 msgstr "N畛�"
 
-#: src/protocols/oscar/oscar.c:3985 src/protocols/trepia/trepia.c:280
+#: src/protocols/oscar/oscar.c:3987 src/protocols/trepia/trepia.c:280
 #: src/protocols/trepia/trepia.c:422
 msgid "Male"
 msgstr "Nam"
 
-#: src/protocols/oscar/oscar.c:4002
+#: src/protocols/oscar/oscar.c:4004
 msgid "Personal Web Page"
 msgstr "Trang web c叩 nh但n"
 
-#: src/protocols/oscar/oscar.c:4005
+#: src/protocols/oscar/oscar.c:4007
 msgid "Additional Information"
 msgstr "Th担ng tin th棚m"
 
-#: src/protocols/oscar/oscar.c:4009
+#: src/protocols/oscar/oscar.c:4011
 msgid "Home Address"
 msgstr "�畛�a ch畛� nh�"
 
-#: src/protocols/oscar/oscar.c:4020 src/protocols/oscar/oscar.c:4036
+#: src/protocols/oscar/oscar.c:4022 src/protocols/oscar/oscar.c:4038
 msgid "Zip Code"
 msgstr "M達 b動u �i畛�n"
 
-#: src/protocols/oscar/oscar.c:4025
+#: src/protocols/oscar/oscar.c:4027
 msgid "Work Address"
 msgstr "�畛�a ch畛� c担ng t叩c"
 
-#: src/protocols/oscar/oscar.c:4041
+#: src/protocols/oscar/oscar.c:4043
 msgid "Work Information"
 msgstr "Th担ng tin v畛� c担ng vi畛�c"
 
-#: src/protocols/oscar/oscar.c:4043
+#: src/protocols/oscar/oscar.c:4045
 msgid "Company"
 msgstr "C担ng ty"
 
-#: src/protocols/oscar/oscar.c:4046
+#: src/protocols/oscar/oscar.c:4048
 msgid "Division"
 msgstr "B畛� ph畉�n"
 
-#: src/protocols/oscar/oscar.c:4049
+#: src/protocols/oscar/oscar.c:4051
 msgid "Position"
 msgstr "Ch畛�c v畛�"
 
-#: src/protocols/oscar/oscar.c:4052
+#: src/protocols/oscar/oscar.c:4054
 msgid "Web Page"
 msgstr "Trang Web"
 
-#: src/protocols/oscar/oscar.c:4058
+#: src/protocols/oscar/oscar.c:4060
 #, c-format
 msgid "ICQ Info for %s"
 msgstr "Th担ng tin ICQ cho %s"
 
-#: src/protocols/oscar/oscar.c:4108
+#: src/protocols/oscar/oscar.c:4110
 msgid "Pop-Up Message"
 msgstr "Th担ng �i畛�p b畉�t l棚n"
 
-#: src/protocols/oscar/oscar.c:4129
+#: src/protocols/oscar/oscar.c:4131
 #, 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:4133
+#: src/protocols/oscar/oscar.c:4135
 msgid "Search Results"
 msgstr "K畉�t qu畉� t狸m ki畉�m"
 
-#: src/protocols/oscar/oscar.c:4150
+#: src/protocols/oscar/oscar.c:4152
 #, 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:4171
+#: src/protocols/oscar/oscar.c:4173
 #, 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:4173
+#: src/protocols/oscar/oscar.c:4175
 msgid "Account Confirmation Requested"
 msgstr "Y棚u c畉�u x叩c nh畉�n t�i kho畉�n"
 
-#: src/protocols/oscar/oscar.c:4201
+#: src/protocols/oscar/oscar.c:4203
 msgid "Error Changing Account Info"
 msgstr "C坦 l畛�i khi thay �畛�i th担ng tin t�i kho畉�n"
 
-#: src/protocols/oscar/oscar.c:4204
+#: src/protocols/oscar/oscar.c:4206
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -6698,7 +6652,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:4207
+#: src/protocols/oscar/oscar.c:4209
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -6707,14 +6661,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:4210
+#: src/protocols/oscar/oscar.c:4212
 #, 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:4213
+#: src/protocols/oscar/oscar.c:4215
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because there is already a "
@@ -6723,7 +6677,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:4216
+#: src/protocols/oscar/oscar.c:4218
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address has "
@@ -6732,7 +6686,7 @@
 "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:4219
+#: src/protocols/oscar/oscar.c:4221
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address is "
@@ -6740,12 +6694,12 @@
 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:4222
+#: src/protocols/oscar/oscar.c:4224
 #, 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:4232
+#: src/protocols/oscar/oscar.c:4234
 #, c-format
 msgid ""
 "Your screen name is currently formatted as follows:\n"
@@ -6754,20 +6708,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:4233 src/protocols/oscar/oscar.c:4240
+#: src/protocols/oscar/oscar.c:4235 src/protocols/oscar/oscar.c:4242
 msgid "Account Info"
 msgstr "Th担ng tin t�i kho畉�n"
 
-#: src/protocols/oscar/oscar.c:4238
+#: src/protocols/oscar/oscar.c:4240
 #, c-format
 msgid "The email address for %s is %s"
 msgstr "�畛�a ch畛� email c畛�a %s l� %s"
 
-#: src/protocols/oscar/oscar.c:4470
+#: src/protocols/oscar/oscar.c:4472
 msgid "Unable to set AIM profile."
 msgstr "Kh担ng th畛� l畉�p l箪 l畛�ch AIM."
 
-#: src/protocols/oscar/oscar.c:4471
+#: src/protocols/oscar/oscar.c:4473
 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 "
@@ -6776,7 +6730,7 @@
 "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:4498
+#: src/protocols/oscar/oscar.c:4500
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  Gaim has truncated "
@@ -6789,15 +6743,15 @@
 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:4503
+#: src/protocols/oscar/oscar.c:4505
 msgid "Profile too long."
 msgstr "L箪 l畛�ch qu叩 d�i."
 
-#: src/protocols/oscar/oscar.c:4520
+#: src/protocols/oscar/oscar.c:4522
 msgid "Unable to set AIM away message."
 msgstr "Kh担ng l畉�p �動畛�c th担ng b叩o tr畉�ng th叩i cho AIM."
 
-#: src/protocols/oscar/oscar.c:4521
+#: src/protocols/oscar/oscar.c:4523
 msgid ""
 "You have probably requested to set your away message before the login "
 "procedure completed.  You remain in a \"present\" state; try setting it "
@@ -6807,7 +6761,7 @@
 "trong tr畉�ngth叩i \"hi畛�n t畉�i\"; h達y th畛� �畉�t l畉�i th担ng b叩o tr畉�ng th叩i sau khi "
 "k畉�t n畛�i �動畛�c."
 
-#: src/protocols/oscar/oscar.c:4561
+#: src/protocols/oscar/oscar.c:4563
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  Gaim has "
@@ -6822,15 +6776,15 @@
 "�達 v動畛�t qu叩 �畛� d�i t畛�i �a %d byte c畛�a th担ng b叩o tr畉�ng th叩i.  Gaim �達 l動畛�c b畛� "
 "gi炭p b畉�n."
 
-#: src/protocols/oscar/oscar.c:4566
+#: src/protocols/oscar/oscar.c:4568
 msgid "Away message too long."
 msgstr "Th担ng b叩o tr畉�ng th叩i qu叩 d�i."
 
-#: src/protocols/oscar/oscar.c:4780
+#: src/protocols/oscar/oscar.c:4782
 msgid "Unable To Retrieve Buddy List"
 msgstr "Kh担ng th畛� nh畉�n danh s叩ch Buddy"
 
-#: src/protocols/oscar/oscar.c:4781
+#: src/protocols/oscar/oscar.c:4783
 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 "
@@ -6839,12 +6793,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:4873 src/protocols/oscar/oscar.c:4874
-#: src/protocols/oscar/oscar.c:4879
+#: src/protocols/oscar/oscar.c:4875 src/protocols/oscar/oscar.c:4876
+#: src/protocols/oscar/oscar.c:4881
 msgid "Orphans"
 msgstr "M畛�t m狸nh"
 
-#: src/protocols/oscar/oscar.c:5045
+#: src/protocols/oscar/oscar.c:5047
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -6853,15 +6807,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:5045 src/protocols/oscar/oscar.c:5058
+#: src/protocols/oscar/oscar.c:5047 src/protocols/oscar/oscar.c:5060
 msgid "(no name)"
 msgstr "(kh担ng t棚n)"
 
-#: src/protocols/oscar/oscar.c:5046 src/protocols/oscar/oscar.c:5059
+#: src/protocols/oscar/oscar.c:5048 src/protocols/oscar/oscar.c:5061
 msgid "Unable To Add"
 msgstr "Kh担ng th畛� th棚m"
 
-#: src/protocols/oscar/oscar.c:5058
+#: src/protocols/oscar/oscar.c:5060
 #, c-format
 msgid ""
 "Could not add the buddy %s for an unknown reason.  The most common reason "
@@ -6871,7 +6825,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:5093
+#: src/protocols/oscar/oscar.c:5095
 #, c-format
 msgid ""
 "The user %s has given you permission to add you to their buddy list.  Do you "
@@ -6880,11 +6834,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:5099
+#: src/protocols/oscar/oscar.c:5101
 msgid "Authorization Given"
 msgstr "X叩c th畛�c �動畛�c trao"
 
-#: src/protocols/oscar/oscar.c:5132
+#: src/protocols/oscar/oscar.c:5134
 #, c-format
 msgid ""
 "The user %s wants to add you to their buddy list for the following reason:\n"
@@ -6894,17 +6848,17 @@
 "%s"
 
 #. Granted
-#: src/protocols/oscar/oscar.c:5174
+#: src/protocols/oscar/oscar.c:5176
 #, 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:5175
+#: src/protocols/oscar/oscar.c:5177
 msgid "Authorization Granted"
 msgstr "X叩c th畛�c �動畛�c ch畉�p thu畉�n"
 
 #. Denied
-#: src/protocols/oscar/oscar.c:5178
+#: src/protocols/oscar/oscar.c:5180
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -6915,60 +6869,60 @@
 "v畛�i l箪 do sau:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:5179
+#: src/protocols/oscar/oscar.c:5181
 msgid "Authorization Denied"
 msgstr "X叩c th畛�c b畛� t畛� ch畛�i"
 
-#: src/protocols/oscar/oscar.c:5216 src/protocols/toc/toc.c:1264
-msgid "Exchange:"
-msgstr "Trao �畛�i:"
-
-#: src/protocols/oscar/oscar.c:5454
+#: src/protocols/oscar/oscar.c:5218 src/protocols/toc/toc.c:1264
+msgid "_Exchange:"
+msgstr "_Trao �畛�i:"
+
+#: src/protocols/oscar/oscar.c:5456
 msgid "<b>Status:</b> "
 msgstr "<b>Tr畉�ng th叩i:</b> "
 
-#: src/protocols/oscar/oscar.c:5463
+#: src/protocols/oscar/oscar.c:5473
 msgid "<b>Logged In:</b> "
 msgstr "<b>��ng nh畉�p:</b> "
 
-#: src/protocols/oscar/oscar.c:5475
+#: src/protocols/oscar/oscar.c:5485
 msgid "<b>IP Address:</b> "
 msgstr "<b>�畛�a Ch畛� IP:</b> "
 
-#: src/protocols/oscar/oscar.c:5483
+#: src/protocols/oscar/oscar.c:5493
 msgid "<b>Capabilities:</b> "
 msgstr "<b> Kh畉� n�ng:</b> "
 
-#: src/protocols/oscar/oscar.c:5492
+#: src/protocols/oscar/oscar.c:5502
 msgid "<b>Buddy Comment:</b> "
 msgstr "<b>Ch炭 th鱈ch Buddy:</b>"
 
-#: src/protocols/oscar/oscar.c:5501
+#: src/protocols/oscar/oscar.c:5511
 msgid "<b>Available:</b> "
 msgstr "<b>Hi畛�n c坦:</b> "
 
-#: src/protocols/oscar/oscar.c:5519
+#: src/protocols/oscar/oscar.c:5529
 msgid "<b>Away Message:</b> "
 msgstr "<b>Th担ng b叩o tr畉�ng th叩i:</b> "
 
-#: src/protocols/oscar/oscar.c:5528
+#: src/protocols/oscar/oscar.c:5538
 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:5562 src/protocols/yahoo/yahoo.c:2130
+#: src/protocols/oscar/oscar.c:5572 src/protocols/yahoo/yahoo.c:2191
 msgid "Offline"
 msgstr "Ngo畉�i tuy畉�n"
 
-#: src/protocols/oscar/oscar.c:6010
+#: src/protocols/oscar/oscar.c:6020
 msgid "Unable to open Direct IM"
 msgstr "Kh担ng th畛� m畛� Nh畉�n Tin Nhanh Tr畛�c Ti畉�p"
 
-#: src/protocols/oscar/oscar.c:6023
+#: src/protocols/oscar/oscar.c:6033
 #, 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 Nhanh tr畛�c ti畉�p v畛�i %s."
 
-#: src/protocols/oscar/oscar.c:6026
+#: src/protocols/oscar/oscar.c:6036
 msgid ""
 "Because this reveals your IP address, it may be considered a privacy risk.  "
 "Do you wish to continue?"
@@ -6976,51 +6930,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:6201
+#: src/protocols/oscar/oscar.c:6211
 msgid "Buddy Comment:"
 msgstr "Ch炭 th鱈ch Buddy:"
 
-#: src/protocols/oscar/oscar.c:6217
+#: src/protocols/oscar/oscar.c:6227
 msgid "Edit Buddy Comment"
 msgstr "Hi畛�u ch畛�nh ch炭 th鱈ch Buddy"
 
-#: src/protocols/oscar/oscar.c:6225
+#: src/protocols/oscar/oscar.c:6235
 msgid "Get Status Msg"
 msgstr "Xem hi畛�n th畛� tr畉�ng th叩i"
 
-#: src/protocols/oscar/oscar.c:6240
+#: src/protocols/oscar/oscar.c:6250
 msgid "Direct IM"
 msgstr "Nh畉�n Tin Nhanh Tr畛�c Ti畉�p"
 
-#: src/protocols/oscar/oscar.c:6269
+#: src/protocols/oscar/oscar.c:6279
 msgid "Re-request Authorization"
 msgstr "Y棚u c畉�u l畉�i x叩c th畛�c"
 
-#: src/protocols/oscar/oscar.c:6290
+#: src/protocols/oscar/oscar.c:6300
 msgid "The new formatting is invalid."
 msgstr "�畛�nh d畉�ng m畛�i kh担ng h畛�p l畛�."
 
-#: src/protocols/oscar/oscar.c:6291
+#: src/protocols/oscar/oscar.c:6301
 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:6297
+#: src/protocols/oscar/oscar.c:6307
 msgid "New screenname formatting:"
 msgstr "�畛�nh d畉�ng t棚n hi畛�n th畛� m畛�i:"
 
-#: src/protocols/oscar/oscar.c:6346
+#: src/protocols/oscar/oscar.c:6356
 msgid "Change Address To:"
 msgstr "�畛�i �畛�a ch畛� th�nh:"
 
-#: src/protocols/oscar/oscar.c:6390
+#: src/protocols/oscar/oscar.c:6400
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>b畉�n kh担ng �ang ch畛� x叩c th畛�c</i>"
 
-#: src/protocols/oscar/oscar.c:6393
+#: src/protocols/oscar/oscar.c:6403
 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:6394
+#: src/protocols/oscar/oscar.c:6404
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
@@ -7028,65 +6982,73 @@
 "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:6408
+#: src/protocols/oscar/oscar.c:6418
 msgid "Find Buddy by E-mail"
 msgstr "T狸m Buddy d畛�a theo �畛�a ch畛� email"
 
-#: src/protocols/oscar/oscar.c:6409
+#: src/protocols/oscar/oscar.c:6419
 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:6410
+#: src/protocols/oscar/oscar.c:6420
 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:6413
+#: src/protocols/oscar/oscar.c:6423
 msgid "Search"
 msgstr "T狸m ki畉�m"
 
-#: src/protocols/oscar/oscar.c:6427
+#: src/protocols/oscar/oscar.c:6437
 msgid "Available Message:"
 msgstr "Th担ng b叩o c坦 m畉�t:"
 
-#: src/protocols/oscar/oscar.c:6428
+#: src/protocols/oscar/oscar.c:6438
 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--D湛ng nh畉�n tin nhanh v畛�i t担i!"
 
-#: src/protocols/oscar/oscar.c:6506
-msgid "Set Available Message"
-msgstr "L畉�p th担ng b叩o c坦 m畉�t"
-
-#: src/protocols/oscar/oscar.c:6520
+#: src/protocols/oscar/oscar.c:6509
+msgid "Set User Info..."
+msgstr "L畉�p th担ng tin ng動畛�i d湛ng..."
+
+#: src/protocols/oscar/oscar.c:6516
+msgid "Set Available Message..."
+msgstr "L畉�p th担ng b叩o c坦 m畉�t..."
+
+#: src/protocols/oscar/oscar.c:6523
+msgid "Change Password..."
+msgstr "�畛�i m畉�t kh畉�u..."
+
+#: src/protocols/oscar/oscar.c:6530
 msgid "Change Password (URL)"
 msgstr "�畛�i m畉�t kh畉�u (URL)"
 
-#: src/protocols/oscar/oscar.c:6528
+#: src/protocols/oscar/oscar.c:6538
 msgid "Configure IM Forwarding (URL)"
 msgstr "C畉�u h狸nh chuy畛�n ti畉�p Nh畉�n Tin Nhanh (URL)"
 
-#: src/protocols/oscar/oscar.c:6539
-msgid "Format Screenname"
-msgstr "�畛�nh d畉�ng t棚n hi畛�n th畛�"
-
-#: src/protocols/oscar/oscar.c:6545
+#: src/protocols/oscar/oscar.c:6549
+msgid "Format Screenname..."
+msgstr "�畛�nh d畉�ng t棚n hi畛�n th畛�..."
+
+#: src/protocols/oscar/oscar.c:6555
 msgid "Confirm Account"
 msgstr "X叩c nh畉�n t�i kho畉�n"
 
-#: src/protocols/oscar/oscar.c:6551
-msgid "Display Current Registered Address"
-msgstr "Hi畛�n th畛� �畛�a ch畛� ��ng k箪 hi畛�n th畛�i "
-
-#: src/protocols/oscar/oscar.c:6557
-msgid "Change Current Registered Address"
-msgstr "�畛�i �畛�a ch畛� ��ng k箪 hi畛�n th畛�i"
-
-#: src/protocols/oscar/oscar.c:6566
+#: src/protocols/oscar/oscar.c:6561
+msgid "Display Currently Registered Address"
+msgstr "Hi畛�n th畛� �畛�a ch畛� ��ng k箪 hi畛�n th畛�i"
+
+#: src/protocols/oscar/oscar.c:6567
+msgid "Change Currently Registered Address..."
+msgstr "�畛�i �畛�a ch畛� ��ng k箪 hi畛�n th畛�i..."
+
+#: src/protocols/oscar/oscar.c:6576
 msgid "Show Buddies Awaiting Authorization"
 msgstr "Hi畛�n th畛� c叩c buddy ch畛� x叩c th畛�c"
 
-#: src/protocols/oscar/oscar.c:6574
-msgid "Search for Buddy by Email"
-msgstr "T狸m ki畉�m buddy b畉�ng email"
+#: src/protocols/oscar/oscar.c:6584
+msgid "Search for Buddy by Email..."
+msgstr "T狸m ki畉�m buddy theo email..."
 
 #. *< api_version
 #. *< type
@@ -7098,15 +7060,15 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/oscar/oscar.c:6695 src/protocols/oscar/oscar.c:6697
+#: src/protocols/oscar/oscar.c:6705 src/protocols/oscar/oscar.c:6707
 msgid "AIM/ICQ Protocol Plugin"
 msgstr "Plugin giao th畛�c AIM/ICQ"
 
-#: src/protocols/oscar/oscar.c:6714
+#: src/protocols/oscar/oscar.c:6724
 msgid "Auth host"
 msgstr "M叩y ch畛� x叩c th畛�c"
 
-#: src/protocols/oscar/oscar.c:6719
+#: src/protocols/oscar/oscar.c:6729
 msgid "Auth port"
 msgstr "C畛�ng x叩c th畛�c"
 
@@ -7294,6 +7256,10 @@
 msgid "Could not write file header.  The file will not be transferred."
 msgstr "Kh担ng th畛� ghi header t畉�p tin. T畉�p tin s畉� kh担ng �動畛�c truy畛�n."
 
+#: src/protocols/toc/toc.c:2042
+msgid "Gaim - Save As..."
+msgstr "Gaim - L動u l�..."
+
 #: src/protocols/toc/toc.c:2076
 #, c-format
 msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
@@ -7411,16 +7377,28 @@
 msgid "Trepia Protocol Plugin"
 msgstr "Plugin giao th畛�c Trepia"
 
-#: src/protocols/yahoo/yahoo.c:726
+#: src/protocols/yahoo/yahoo.c:297
+msgid ""
+"You have been logged off as you have logged in on a different machine or "
+"device."
+msgstr ""
+"B畉�n �達 ��ng xu畉�t v狸 b畉�n ��ng nh畉�p b畉�ng m畛�t m叩y hay m畛�t thi畉�t b畛� kh叩c."
+
+#: src/protocols/yahoo/yahoo.c:730
 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:809
+#: src/protocols/yahoo/yahoo.c:772
+#, c-format
+msgid "Yahoo! system message for %s:"
+msgstr "Th担ng �i畛�p h畛� th畛�ng Yahoo! cho %s:"
+
+#: src/protocols/yahoo/yahoo.c:838
 #, 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:812
+#: src/protocols/yahoo/yahoo.c:841
 #, c-format
 msgid ""
 "%s has (retroactively) denied your request to add them to your list for the "
@@ -7428,11 +7406,11 @@
 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:815
+#: src/protocols/yahoo/yahoo.c:844
 msgid "Add buddy rejected"
 msgstr "Th棚m buddy b畛� t畛� ch畛�i"
 
-#: src/protocols/yahoo/yahoo.c:1465
+#: src/protocols/yahoo/yahoo.c:1494
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -7442,11 +7420,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:1468
+#: src/protocols/yahoo/yahoo.c:1497
 msgid "Failed Yahoo! Authentication"
 msgstr "Ch畛�ng th畛�c Yahooo! l畛�i"
 
-#: src/protocols/yahoo/yahoo.c:1541
+#: src/protocols/yahoo/yahoo.c:1570
 #, c-format
 msgid ""
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
@@ -7455,88 +7433,101 @@
 "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:1544
+#: src/protocols/yahoo/yahoo.c:1573
 msgid "Ignore buddy?"
 msgstr "L畛� b畛� buddy?"
 
-#: src/protocols/yahoo/yahoo.c:1573
+#: src/protocols/yahoo/yahoo.c:1606
 msgid "Invalid username."
 msgstr "T棚n ng動畛�i d湛ng kh担ng h畛�p l畛�"
 
-#: src/protocols/yahoo/yahoo.c:1576
+#: src/protocols/yahoo/yahoo.c:1609
 msgid "Incorrect password."
 msgstr "M畉�t kh畉�u sai."
 
-#: src/protocols/yahoo/yahoo.c:1579
-msgid "Unknown error."
-msgstr "L畛�i kh担ng x叩c �畛�nh."
-
-#: src/protocols/yahoo/yahoo.c:1628
+#: src/protocols/yahoo/yahoo.c:1612
+msgid "Your account is locked, please log in to the yahoo website."
+msgstr "T�i kho畉�n c畛�a b畉�n �達 b畛� kh坦a, h達y ��ng nh畉�p v�o website c畛�a Yahoo."
+
+#: src/protocols/yahoo/yahoo.c:1615
+#, c-format
+msgid "Unknown error number %d."
+msgstr "S畛� hi畛�u l畛�i kh担ng x叩c �畛�nh %d."
+
+#: src/protocols/yahoo/yahoo.c:1672
 #, 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:1630
+#: src/protocols/yahoo/yahoo.c:1674
 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:1737 src/protocols/yahoo/yahoo.c:1867
+#: src/protocols/yahoo/yahoo.c:1784 src/protocols/yahoo/yahoo.c:1914
 msgid "Unable to read"
 msgstr "Kh担ng th畛� �畛�c"
 
-#: src/protocols/yahoo/yahoo.c:1892 src/protocols/yahoo/yahoo.c:2001
-#: src/protocols/yahoo/yahoo.c:2028
+#: src/protocols/yahoo/yahoo.c:1939 src/protocols/yahoo/yahoo.c:2048
+#: src/protocols/yahoo/yahoo.c:2089
 msgid "Connection problem"
 msgstr "K畉�t n畛�i c坦 v畉�n �畛�"
 
-#: src/protocols/yahoo/yahoo.c:2112 src/protocols/yahoo/yahoo.c:2423
-#: src/protocols/yahoo/yahoo.c:2529
+#: src/protocols/yahoo/yahoo.c:2173 src/protocols/yahoo/yahoo.c:2498
+#: src/protocols/yahoo/yahoo.c:2604
 msgid "Not At Home"
 msgstr "Kh担ng c坦 nh�"
 
-#: src/protocols/yahoo/yahoo.c:2114 src/protocols/yahoo/yahoo.c:2425
-#: src/protocols/yahoo/yahoo.c:2530
+#: src/protocols/yahoo/yahoo.c:2175 src/protocols/yahoo/yahoo.c:2500
+#: src/protocols/yahoo/yahoo.c:2605
 msgid "Not At Desk"
 msgstr "Kh担ng c坦 t畉�i b�n l�m vi畛�c"
 
-#: src/protocols/yahoo/yahoo.c:2116 src/protocols/yahoo/yahoo.c:2427
-#: src/protocols/yahoo/yahoo.c:2531
+#: src/protocols/yahoo/yahoo.c:2177 src/protocols/yahoo/yahoo.c:2502
+#: src/protocols/yahoo/yahoo.c:2606
 msgid "Not In Office"
 msgstr "Kh担ng c坦 畛� v�n ph嘆ng"
 
-#: src/protocols/yahoo/yahoo.c:2120 src/protocols/yahoo/yahoo.c:2431
-#: src/protocols/yahoo/yahoo.c:2533
+#: src/protocols/yahoo/yahoo.c:2181 src/protocols/yahoo/yahoo.c:2506
+#: src/protocols/yahoo/yahoo.c:2608
 msgid "On Vacation"
 msgstr "Ngh畛� ph辿p"
 
-#: src/protocols/yahoo/yahoo.c:2124 src/protocols/yahoo/yahoo.c:2435
-#: src/protocols/yahoo/yahoo.c:2535
+#: src/protocols/yahoo/yahoo.c:2185 src/protocols/yahoo/yahoo.c:2510
+#: src/protocols/yahoo/yahoo.c:2610
 msgid "Stepped Out"
 msgstr "�i ra ngo�i"
 
-#: src/protocols/yahoo/yahoo.c:2188 src/protocols/yahoo/yahoo.c:2220
+#: src/protocols/yahoo/yahoo.c:2249 src/protocols/yahoo/yahoo.c:2281
 msgid "Not on server list"
 msgstr "Kh担ng c坦 trong danh s叩ch m叩y ch畛�"
 
-#: src/protocols/yahoo/yahoo.c:2276
+#: src/protocols/yahoo/yahoo.c:2337
 msgid "Join in Chat"
 msgstr "Tham gia Chat"
 
-#: src/protocols/yahoo/yahoo.c:2282
+#: src/protocols/yahoo/yahoo.c:2343
 msgid "Initiate Conference"
 msgstr "Kh畛�i t畉�o h畛�i th畉�o"
 
-#: src/protocols/yahoo/yahoo.c:2335
+#: src/protocols/yahoo/yahoo.c:2396
 msgid "Active which ID?"
 msgstr "K鱈ch ho畉�t ID n�o ?"
 
-#: src/protocols/yahoo/yahoo.c:2346
-msgid "Activate ID"
-msgstr "K鱈ch ho畉�t ID"
-
-#: src/protocols/yahoo/yahoo.c:2727
+#: src/protocols/yahoo/yahoo.c:2404
+msgid "Join who in chat?"
+msgstr "Tham gia v畛�i ai trong Chat?"
+
+#: src/protocols/yahoo/yahoo.c:2415
+msgid "Activate ID..."
+msgstr "K鱈ch ho畉�t ID..."
+
+#: src/protocols/yahoo/yahoo.c:2421
+msgid "Join user in chat..."
+msgstr "Tham gia v畛�i ng動畛�i d湛ng trong Chat..."
+
+#: src/protocols/yahoo/yahoo.c:2802
 msgid ""
 "<b>Sorry, profiles marked as containing adult content are not supported at "
 "this time.</b><br><br>\n"
@@ -7544,7 +7535,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:2728 src/protocols/yahoo/yahoo.c:2751
+#: src/protocols/yahoo/yahoo.c:2803 src/protocols/yahoo/yahoo.c:2826
 msgid ""
 "If you wish to view this profile, you will need to visit this link in your "
 "web browser<br>"
@@ -7552,43 +7543,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:2750
+#: src/protocols/yahoo/yahoo.c:2825
 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:2798 src/protocols/yahoo/yahoo.c:2799
+#: src/protocols/yahoo/yahoo.c:2873 src/protocols/yahoo/yahoo.c:2874
 msgid "Yahoo! ID"
 msgstr "Yahoo! ID"
 
-#: src/protocols/yahoo/yahoo.c:2843 src/protocols/yahoo/yahoo.c:2846
-#: src/protocols/yahoo/yahoo.c:2849
+#: src/protocols/yahoo/yahoo.c:2918 src/protocols/yahoo/yahoo.c:2921
+#: src/protocols/yahoo/yahoo.c:2924
 msgid "Hobbies"
 msgstr "S畛� th鱈ch"
 
-#: src/protocols/yahoo/yahoo.c:2858 src/protocols/yahoo/yahoo.c:2861
+#: src/protocols/yahoo/yahoo.c:2933 src/protocols/yahoo/yahoo.c:2936
 msgid "Latest News"
 msgstr "Tin t畛�c m畛�i nh畉�t"
 
-#: src/protocols/yahoo/yahoo.c:2875
+#: src/protocols/yahoo/yahoo.c:2950
 msgid "Home Page"
 msgstr "Trang ch畛�"
 
-#: src/protocols/yahoo/yahoo.c:2887
+#: src/protocols/yahoo/yahoo.c:2962
 msgid "Cool Link 1"
 msgstr "Li棚n k畉�t 動a th鱈ch 1"
 
-#: src/protocols/yahoo/yahoo.c:2891
+#: src/protocols/yahoo/yahoo.c:2966
 msgid "Cool Link 2"
 msgstr "Li棚n k畉�t 動a th鱈ch 2"
 
-#: src/protocols/yahoo/yahoo.c:2893
+#: src/protocols/yahoo/yahoo.c:2968
 msgid "Cool Link 3"
 msgstr "Li棚n k畉�t 動a th鱈ch 3"
 
-#: src/protocols/yahoo/yahoo.c:2899
+#: src/protocols/yahoo/yahoo.c:2974
 msgid "Member Since"
 msgstr "L� th�nh vi棚n t畛� "
 
@@ -7602,23 +7593,23 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/yahoo/yahoo.c:3100 src/protocols/yahoo/yahoo.c:3102
+#: src/protocols/yahoo/yahoo.c:3175 src/protocols/yahoo/yahoo.c:3177
 msgid "Yahoo Protocol Plugin"
 msgstr "Plugin giao th畛�c Yahoo"
 
-#: src/protocols/yahoo/yahoo.c:3119
+#: src/protocols/yahoo/yahoo.c:3194
 msgid "Pager host"
 msgstr "M叩y ch畛� pager"
 
-#: src/protocols/yahoo/yahoo.c:3122
+#: src/protocols/yahoo/yahoo.c:3197
 msgid "Pager port"
 msgstr "C畛�ng pager"
 
-#: src/protocols/yahoo/yahoo.c:3125
+#: src/protocols/yahoo/yahoo.c:3200
 msgid "File transfer host"
 msgstr "M叩y ch畛� truy畛�n t畉�p tin"
 
-#: src/protocols/yahoo/yahoo.c:3128
+#: src/protocols/yahoo/yahoo.c:3203
 msgid "File transfer port"
 msgstr "C畛�ng truy畛�n t畉�p tin"
 
@@ -7687,16 +7678,16 @@
 msgstr "ZLocate"
 
 #: src/protocols/zephyr/zephyr.c:908
-msgid "Class:"
-msgstr "Class:"
+msgid "_Class:"
+msgstr ""
 
 #: src/protocols/zephyr/zephyr.c:913
-msgid "Instance:"
-msgstr "Instance:"
+msgid "_Instance:"
+msgstr ""
 
 #: src/protocols/zephyr/zephyr.c:918
-msgid "Recipient:"
-msgstr "Ng動畛�i nh畉�n:"
+msgid "_Recipient:"
+msgstr "_Ng動畛�i nh畉�n:"
 
 #. *< api_version
 #. *< type
@@ -7807,41 +7798,41 @@
 msgid "Sorry, I ran out for a bit!"
 msgstr "Xin l畛�i, t担i ra ngo�i m畛�t l炭c !"
 
-#: src/stock.c:84
+#: src/stock.c:83
 msgid "_Modify"
 msgstr "_Hi畛�u ch畛�nh"
 
-#: src/stock.c:85
+#: src/stock.c:84
 msgid "_Open Mail"
 msgstr "_M畛� th動"
 
-#: src/util.c:1790
+#: src/util.c:1893
 msgid "Calculating..."
 msgstr "�ang t鱈nh to叩n..."
 
-#: src/util.c:1793
+#: src/util.c:1896
 msgid "Unknown."
 msgstr "Kh担ng x叩c �畛�nh."
 
-#: src/util.c:1824 src/util.c:1829 src/util.c:1834 src/util.c:1837
+#: src/util.c:1927 src/util.c:1932 src/util.c:1937 src/util.c:1940
 msgid "day"
 msgid_plural "days"
 msgstr[0] "ng�y"
 msgstr[1] "ng�y"
 
-#: src/util.c:1825 src/util.c:1829 src/util.c:1843 src/util.c:1845
+#: src/util.c:1928 src/util.c:1932 src/util.c:1946 src/util.c:1948
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "gi畛�"
 msgstr[1] "gi畛�"
 
-#: src/util.c:1825 src/util.c:1834 src/util.c:1843 src/util.c:1848
+#: src/util.c:1928 src/util.c:1937 src/util.c:1946 src/util.c:1951
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "ph炭t"
 msgstr[1] "ph炭t."
 
-#: src/util.c:2180
+#: src/util.c:2283
 msgid "g003: Error opening connection.\n"
 msgstr "g003: L畛�i m畛� k畉�t n畛�i.\n"
 
@@ -7857,6 +7848,85 @@
 msgid "Notification"
 msgstr "Th担ng b叩o"
 
+#~ msgid "Gnome Stock Ticker Properties"
+#~ msgstr "Thu畛�c T鱈nh Tr狸nh �i畛�m Tin Th畛� Tr動畛�ng Gnome"
+
+#~ msgid "Update Frequency in min"
+#~ msgstr "T畉�n s畛� c畉�p nh畉�t theo ph炭t"
+
+#~ 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 d動畛�i �但y."
+
+#~ msgid "Check this box to display only symbols and price:"
+#~ msgstr "�叩nh d畉�u ch畛�n h畛�p n�y �畛� ch畛� hi畛�n th畛� bi畛�u t動畛�ng v� gi叩:"
+
+#~ msgid "Check this box to scroll left to right:"
+#~ msgstr "�叩nh d畉�u ch畛�n h畛�p n�y �畛� cu畛�n t畛� tr叩i sang ph畉�i:"
+
+#~ msgid "(No"
+#~ msgstr "(Kh担ng"
+
+#~ msgid "Change"
+#~ msgstr "�畛�i"
+
+#~ msgid "Esperanto"
+#~ msgstr "Esperanto"
+
+#~ msgid "Gaim - Away!"
+#~ msgstr "Gaim - V畉�ng m畉�t!"
+
+#~ msgid "Join Chat As:"
+#~ msgstr "Tham gia Chat b畉�ng:"
+
+#~ msgid "New Message"
+#~ msgstr "Th担ng �i畛�p M畛�i"
+
+#~ msgid "Alias chat"
+#~ msgstr "B鱈 danh Chat"
+
+#~ msgid "Alias contact"
+#~ msgstr "Li棚n l畉�c b鱈 danh"
+
+#~ msgid "_Screenname"
+#~ msgstr "T棚n _hi畛�n th畛�"
+
+#~ msgid "Alias buddy"
+#~ msgstr "B鱈 danh buddy"
+
+#~ msgid ""
+#~ "Please enter an aliased name for the person below, or rename this contact "
+#~ "in your buddy list."
+#~ msgstr ""
+#~ "H達y nh畉�p b鱈 danh cho ng動畛�i b棚n d動畛�i, ho畉�c �畛�i t棚n cho ng動嘆i n�y trong "
+#~ "danh s叩ch buddy c畛�a b畉�n."
+
+#~ msgid "Gaim - Information"
+#~ msgstr "Gaim - Th担ng tin"
+
+#~ msgid "Add a new group"
+#~ msgstr "Th棚m nh坦m m畛�i"
+
+#~ msgid "Gaim - Insert Image"
+#~ msgstr "Gaim - Ch竪n 畉�nh"
+
+#~ msgid "/Conversation/_New Conversation..."
+#~ msgstr "/Cu畛�c tho畉�i/Cu畛�c tho畉�i _m畛�i..."
+
+#~ msgid "/Conversation/Insert _URL..."
+#~ msgstr "/Cu畛�c tho畉�i/Ch竪n _URL..."
+
+#~ msgid "Port:"
+#~ msgstr "C畛�ng:"
+
+#~ msgid "Gaim - Save Icon"
+#~ msgstr "Gaim - L動u bi畛�u t動畛�ng"
+
+#~ msgid "Join what group:"
+#~ msgstr "Tham gia nh坦m n�o:"
+
+#~ msgid "Unknown error."
+#~ msgstr "L畛�i kh担ng x叩c �畛�nh."
+
 #~ msgid "Buddy Chat"
 #~ msgstr "Buddy Chat"