diff po/vi.po @ 20263:15ad77c653ad

I ran stats.pl to get updated po files. This was necessary to pull some old strings back into use, now that we've gone back in time.
author Richard Laager <rlaager@wiktel.com>
date Fri, 28 Sep 2007 18:19:24 +0000
parents 60485bc8ff7f
children e4719768af06
line wrap: on
line diff
--- a/po/vi.po	Fri Sep 28 17:11:39 2007 +0000
+++ b/po/vi.po	Fri Sep 28 18:19:24 2007 +0000
@@ -14,7 +14,7 @@
 msgstr ""
 "Project-Id-Version: CVS Version of Gaim-vi \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-25 01:15-0700\n"
+"POT-Creation-Date: 2007-09-28 13:16-0500\n"
 "PO-Revision-Date: 2004-01-09 15:05+0700\n"
 "Last-Translator: Trinh Minh Thanh <tmthanh@yahoo.com>\n"
 "Language-Team: Gnome-Vi Team <gnomevi-list@lists.sourceforge.net> \n"
@@ -47,7 +47,7 @@
 "  -v, --version       display the current version and exit\n"
 msgstr ""
 
-#: ../finch/finch.c:328 ../pidgin/gtkmain.c:718
+#: ../finch/finch.c:328 ../pidgin/gtkmain.c:711
 #, c-format
 msgid ""
 "%s encountered errors migrating your settings from %s to %s. Please "
@@ -60,7 +60,7 @@
 #: ../finch/gntplugin.c:234 ../finch/gntstatus.c:301 ../finch/gntstatus.c:310
 #: ../finch/plugins/gntclipboard.c:115 ../finch/plugins/gntclipboard.c:121
 #: ../finch/plugins/gntclipboard.c:128
-#: ../libpurple/protocols/jabber/buddy.c:2032
+#: ../libpurple/protocols/jabber/buddy.c:2029
 #: ../libpurple/protocols/jabber/chat.c:677
 #: ../libpurple/protocols/jabber/chat.c:688
 #: ../libpurple/protocols/jabber/jabber.c:1515
@@ -96,8 +96,8 @@
 msgid "(You probably forgot to 'make install'.)"
 msgstr ""
 
-#: ../finch/gntaccount.c:496 ../finch/gntconn.c:137
-#: ../pidgin/gtkaccount.c:1473 ../pidgin/gtkblist.c:4322
+#: ../finch/gntaccount.c:496 ../finch/gntconn.c:136
+#: ../pidgin/gtkaccount.c:1473 ../pidgin/gtkblist.c:4040
 msgid "Modify Account"
 msgstr "Hiệu chỉnh tài khoản"
 
@@ -129,7 +129,7 @@
 #: ../finch/gntaccount.c:575 ../finch/gntaccount.c:638
 #: ../finch/gntaccount.c:889 ../finch/gntblist.c:344 ../finch/gntblist.c:421
 #: ../finch/gntblist.c:456 ../finch/gntblist.c:803 ../finch/gntblist.c:1005
-#: ../finch/gntblist.c:1101 ../finch/gntblist.c:2224 ../finch/gntcertmgr.c:91
+#: ../finch/gntblist.c:1101 ../finch/gntblist.c:2222 ../finch/gntcertmgr.c:91
 #: ../finch/gntplugin.c:379 ../finch/gntpounce.c:459 ../finch/gntpounce.c:667
 #: ../finch/gntprefs.c:265 ../finch/gntsound.c:1058 ../finch/gntstatus.c:145
 #: ../finch/gntstatus.c:485 ../finch/gntstatus.c:610
@@ -139,8 +139,8 @@
 #: ../libpurple/protocols/gg/gg.c:666 ../libpurple/protocols/gg/gg.c:803
 #: ../libpurple/protocols/gg/gg.c:884
 #: ../libpurple/protocols/jabber/buddy.c:728
-#: ../libpurple/protocols/jabber/buddy.c:2416
-#: ../libpurple/protocols/jabber/buddy.c:2452
+#: ../libpurple/protocols/jabber/buddy.c:2413
+#: ../libpurple/protocols/jabber/buddy.c:2449
 #: ../libpurple/protocols/jabber/chat.c:786
 #: ../libpurple/protocols/jabber/jabber.c:1008
 #: ../libpurple/protocols/jabber/jabber.c:1017
@@ -149,10 +149,10 @@
 #: ../libpurple/protocols/jabber/usermood.c:184
 #: ../libpurple/protocols/jabber/usernick.c:78
 #: ../libpurple/protocols/jabber/xdata.c:400
-#: ../libpurple/protocols/msn/msn.c:290 ../libpurple/protocols/msn/msn.c:307
-#: ../libpurple/protocols/msn/msn.c:324 ../libpurple/protocols/msn/msn.c:341
-#: ../libpurple/protocols/msn/msn.c:362
-#: ../libpurple/protocols/oscar/oscar.c:6092
+#: ../libpurple/protocols/msn/msn.c:287 ../libpurple/protocols/msn/msn.c:304
+#: ../libpurple/protocols/msn/msn.c:321 ../libpurple/protocols/msn/msn.c:338
+#: ../libpurple/protocols/msn/msn.c:359
+#: ../libpurple/protocols/oscar/oscar.c:6094
 #: ../libpurple/protocols/oscar/peer.c:1046
 #: ../libpurple/protocols/qq/buddy_info.c:484
 #: ../libpurple/protocols/qq/buddy_opt.c:214
@@ -187,16 +187,16 @@
 #: ../libpurple/protocols/silc10/ops.c:1904
 #: ../libpurple/protocols/silc10/silc.c:736
 #: ../libpurple/protocols/silc10/silc.c:942
-#: ../libpurple/protocols/yahoo/yahoo.c:1031
-#: ../libpurple/protocols/yahoo/yahoo.c:3497
-#: ../libpurple/protocols/yahoo/yahoo.c:3508 ../pidgin/gtkaccount.c:1908
-#: ../pidgin/gtkaccount.c:2495 ../pidgin/gtkblist.c:6267
-#: ../pidgin/gtkcertmgr.c:197 ../pidgin/gtkdialogs.c:767
-#: ../pidgin/gtkdialogs.c:906 ../pidgin/gtkdialogs.c:998
-#: ../pidgin/gtkdialogs.c:1018 ../pidgin/gtkdialogs.c:1042
-#: ../pidgin/gtkdialogs.c:1064 ../pidgin/gtkdialogs.c:1112
-#: ../pidgin/gtkdialogs.c:1153 ../pidgin/gtkdialogs.c:1209
-#: ../pidgin/gtkdialogs.c:1248 ../pidgin/gtkdialogs.c:1275
+#: ../libpurple/protocols/yahoo/yahoo.c:1032
+#: ../libpurple/protocols/yahoo/yahoo.c:3498
+#: ../libpurple/protocols/yahoo/yahoo.c:3509 ../pidgin/gtkaccount.c:1908
+#: ../pidgin/gtkaccount.c:2495 ../pidgin/gtkblist.c:5967
+#: ../pidgin/gtkcertmgr.c:197 ../pidgin/gtkdialogs.c:769
+#: ../pidgin/gtkdialogs.c:908 ../pidgin/gtkdialogs.c:1000
+#: ../pidgin/gtkdialogs.c:1020 ../pidgin/gtkdialogs.c:1044
+#: ../pidgin/gtkdialogs.c:1066 ../pidgin/gtkdialogs.c:1114
+#: ../pidgin/gtkdialogs.c:1155 ../pidgin/gtkdialogs.c:1211
+#: ../pidgin/gtkdialogs.c:1250 ../pidgin/gtkdialogs.c:1277
 #: ../pidgin/gtkimhtmltoolbar.c:435 ../pidgin/gtklog.c:328
 #: ../pidgin/gtkplugin.c:289 ../pidgin/gtkpounce.c:1101
 #: ../pidgin/gtkprivacy.c:563 ../pidgin/gtkprivacy.c:579
@@ -238,7 +238,7 @@
 msgid "Delete"
 msgstr "Xóa"
 
-#: ../finch/gntaccount.c:669 ../finch/gntblist.c:2121 ../finch/gntui.c:82
+#: ../finch/gntaccount.c:669 ../finch/gntblist.c:2119 ../finch/gntui.c:82
 #: ../pidgin/gtkaccount.c:2325 ../pidgin/gtkdocklet.c:522
 msgid "Accounts"
 msgstr "Tài khoản"
@@ -250,16 +250,15 @@
 
 #. Add button
 #: ../finch/gntaccount.c:698 ../finch/gntaccount.c:888 ../finch/gntblist.c:343
-#: ../finch/gntblist.c:421 ../finch/gntblist.c:456 ../finch/gntblist.c:2305
-#: ../finch/gntcertmgr.c:306 ../finch/gntnotify.c:383 ../finch/gntpounce.c:713
-#: ../finch/gntstatus.c:199 ../libpurple/protocols/gg/gg.c:883
-#: ../libpurple/protocols/qq/sys_msg.c:114
+#: ../finch/gntblist.c:421 ../finch/gntblist.c:456 ../finch/gntcertmgr.c:306
+#: ../finch/gntnotify.c:380 ../finch/gntpounce.c:713 ../finch/gntstatus.c:199
+#: ../libpurple/protocols/gg/gg.c:883 ../libpurple/protocols/qq/sys_msg.c:114
 #: ../libpurple/protocols/qq/sys_msg.c:173
 #: ../libpurple/protocols/qq/sys_msg.c:267
 #: ../libpurple/protocols/sametime/sametime.c:5486
 #: ../libpurple/protocols/silc/chat.c:615
 #: ../libpurple/protocols/silc10/chat.c:599 ../pidgin/gtkaccount.c:2494
-#: ../pidgin/gtkblist.c:6266 ../pidgin/gtkconv.c:1712
+#: ../pidgin/gtkblist.c:5966 ../pidgin/gtkconv.c:1659
 #: ../pidgin/gtkrequest.c:275
 msgid "Add"
 msgstr "Thêm"
@@ -323,19 +322,19 @@
 msgid "Error adding buddy"
 msgstr "Lỗi chạy \"lệnh\" : %s"
 
-#: ../finch/gntblist.c:325 ../libpurple/protocols/oscar/oscar.c:2884
+#: ../finch/gntblist.c:325 ../libpurple/protocols/oscar/oscar.c:2888
 #: ../pidgin/gtkaccount.c:1981 ../pidgin/gtksavedstatuses.c:980
 msgid "Screen Name"
 msgstr "Tên hiển thị"
 
 #: ../finch/gntblist.c:328 ../finch/gntblist.c:410 ../finch/gntblist.c:1250
-#: ../libpurple/protocols/msn/msn.c:1507
+#: ../libpurple/protocols/msn/msn.c:1395
 #: ../libpurple/protocols/silc/chat.c:606
 #: ../libpurple/protocols/silc10/chat.c:590
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:704
 #: ../libpurple/protocols/zephyr/zephyr.c:788
-#: ../libpurple/protocols/zephyr/zephyr.c:1207 ../pidgin/gtkdialogs.c:1017
-#: ../pidgin/gtkdialogs.c:1041 ../pidgin/gtkdialogs.c:1063
+#: ../libpurple/protocols/zephyr/zephyr.c:1207 ../pidgin/gtkdialogs.c:1019
+#: ../pidgin/gtkdialogs.c:1043 ../pidgin/gtkdialogs.c:1065
 #: ../pidgin/gtkrequest.c:278
 #, fuzzy
 msgid "Alias"
@@ -349,7 +348,7 @@
 #: ../finch/gntblist.c:335 ../finch/gntblist.c:401 ../finch/gntblist.c:1305
 #: ../finch/gntnotify.c:174 ../finch/gntstatus.c:576
 #: ../libpurple/plugins/idle.c:153 ../libpurple/plugins/idle.c:190
-#: ../pidgin/gtkblist.c:3206 ../pidgin/gtknotify.c:503
+#: ../pidgin/gtkblist.c:3008 ../pidgin/gtknotify.c:506
 #: ../pidgin/gtkpounce.c:1268 ../pidgin/plugins/gevolution/gevolution.c:445
 msgid "Account"
 msgstr "Tài khoản"
@@ -363,7 +362,7 @@
 #: ../libpurple/protocols/silc10/buddy.c:1033
 #: ../libpurple/protocols/silc10/buddy.c:1080
 #: ../libpurple/protocols/silc10/buddy.c:1180
-#: ../libpurple/protocols/yahoo/yahoo.c:3342 ../pidgin/gtkblist.c:5772
+#: ../libpurple/protocols/yahoo/yahoo.c:3343 ../pidgin/gtkblist.c:5483
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:445
 msgid "Add Buddy"
 msgstr "Thêm Buddy"
@@ -373,15 +372,15 @@
 msgid "Please enter buddy information."
 msgstr "Hãy nhập một buddy để thông báo."
 
-#: ../finch/gntblist.c:370 ../libpurple/blist.c:1210
+#: ../finch/gntblist.c:370 ../libpurple/blist.c:1209
 msgid "Chats"
 msgstr "Cuộc Chat"
 
 #. Extract their Name and put it in
 #: ../finch/gntblist.c:407 ../libpurple/protocols/jabber/jabber.c:924
 #: ../libpurple/protocols/jabber/jabber.c:927
-#: ../libpurple/protocols/msn/msn.c:1694 ../libpurple/protocols/msn/msn.c:1759
-#: ../libpurple/protocols/msn/msn.c:1786
+#: ../libpurple/protocols/msn/msn.c:1584 ../libpurple/protocols/msn/msn.c:1649
+#: ../libpurple/protocols/msn/msn.c:1676
 #: ../libpurple/protocols/qq/buddy_info.c:44 ../pidgin/gtkplugin.c:582
 #: ../pidgin/gtkroomlist.c:618
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:132
@@ -394,7 +393,7 @@
 msgid "Auto-join"
 msgstr "Tự động tham gia"
 
-#: ../finch/gntblist.c:419 ../finch/gntblist.c:854 ../pidgin/gtkblist.c:6154
+#: ../finch/gntblist.c:419 ../finch/gntblist.c:854 ../pidgin/gtkblist.c:5859
 msgid "Add Chat"
 msgstr "Thêm Chat"
 
@@ -419,7 +418,7 @@
 
 #: ../finch/gntblist.c:454 ../finch/gntblist.c:856
 #: ../libpurple/protocols/sametime/sametime.c:5396
-#: ../libpurple/protocols/sametime/sametime.c:5484 ../pidgin/gtkblist.c:6263
+#: ../libpurple/protocols/sametime/sametime.c:5484 ../pidgin/gtkblist.c:5963
 msgid "Add Group"
 msgstr "Thêm nhóm"
 
@@ -456,7 +455,7 @@
 msgid "Retrieving..."
 msgstr "Đang kết nối..."
 
-#: ../finch/gntblist.c:904 ../finch/gntconv.c:534
+#: ../finch/gntblist.c:904 ../finch/gntconv.c:507
 #: ../libpurple/protocols/silc/chat.c:899
 #: ../libpurple/protocols/silc10/chat.c:883
 msgid "Get Info"
@@ -468,10 +467,10 @@
 msgstr "Thêm thông _báo Buddy"
 
 #. if (q_bud && is_online(q_bud->status)) {
-#: ../finch/gntblist.c:915 ../finch/gntconv.c:546
+#: ../finch/gntblist.c:915 ../finch/gntconv.c:519
 #: ../libpurple/protocols/jabber/si.c:874
 #: ../libpurple/protocols/oscar/oscar.c:654 ../libpurple/protocols/qq/qq.c:587
-#: ../pidgin/gtkconv.c:1660
+#: ../pidgin/gtkconv.c:1607
 msgid "Send File"
 msgstr "Gửi tập tin"
 
@@ -519,14 +518,14 @@
 msgstr "Xác nhận tài khoản"
 
 #: ../finch/gntblist.c:1100 ../finch/gntblist.c:1252 ../finch/gntft.c:227
-#: ../pidgin/gtkconv.c:1709 ../pidgin/gtkrequest.c:276
+#: ../pidgin/gtkconv.c:1656 ../pidgin/gtkrequest.c:276
 #: ../pidgin/gtkstatusbox.c:264
 msgid "Remove"
 msgstr "Xóa bỏ"
 
 #. Buddy List
-#: ../finch/gntblist.c:1226 ../finch/gntblist.c:2355 ../finch/gntprefs.c:258
-#: ../finch/gntui.c:83 ../pidgin/gtkblist.c:2886 ../pidgin/gtkblist.c:4566
+#: ../finch/gntblist.c:1226 ../finch/gntblist.c:2307 ../finch/gntprefs.c:258
+#: ../finch/gntui.c:83 ../pidgin/gtkblist.c:2688 ../pidgin/gtkblist.c:4284
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:326
 msgid "Buddy List"
 msgstr "Danh sách Buddy"
@@ -545,15 +544,15 @@
 #: ../libpurple/protocols/gg/gg.c:2207
 #: ../libpurple/protocols/jabber/buddy.c:286
 #: ../libpurple/protocols/jabber/buddy.c:1247
-#: ../libpurple/protocols/jabber/buddy.c:2217
-#: ../libpurple/protocols/jabber/buddy.c:2399
+#: ../libpurple/protocols/jabber/buddy.c:2214
+#: ../libpurple/protocols/jabber/buddy.c:2396
 #: ../libpurple/protocols/jabber/jabber.c:937
 #: ../libpurple/protocols/jabber/jabber.c:1544
 #: ../libpurple/protocols/jabber/jabber.c:1567
 #: ../libpurple/protocols/jabber/jabber.c:1590
 #: ../libpurple/protocols/jabber/jabber.c:1613
 #: ../libpurple/protocols/jabber/jabber.c:1636
-#: ../libpurple/protocols/msn/msn.c:1515 ../libpurple/protocols/msn/msn.c:1697
+#: ../libpurple/protocols/msn/msn.c:1403 ../libpurple/protocols/msn/msn.c:1587
 #: ../libpurple/protocols/qq/buddy_info.c:43
 #: ../libpurple/protocols/silc/buddy.c:1535
 #: ../libpurple/protocols/silc/ops.c:1002
@@ -563,7 +562,7 @@
 #: ../libpurple/protocols/silc10/ops.c:1036
 #: ../libpurple/protocols/silc10/ops.c:1179
 #: ../libpurple/protocols/silc10/ops.c:1328
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1066 ../pidgin/gtkblist.c:3230
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1066 ../pidgin/gtkblist.c:3032
 msgid "Nickname"
 msgstr "Biệt danh"
 
@@ -572,12 +571,12 @@
 #: ../libpurple/protocols/bonjour/bonjour.c:340
 #: ../libpurple/protocols/jabber/buddy.c:787
 #: ../libpurple/protocols/jabber/buddy.c:951
-#: ../libpurple/protocols/msn/state.c:32
-#: ../libpurple/protocols/novell/novell.c:2830
-#: ../libpurple/protocols/oscar/oscar.c:2908
-#: ../libpurple/protocols/yahoo/yahoo.c:3096
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:710 ../pidgin/gtkblist.c:3258
-#: ../pidgin/gtkblist.c:3664 ../pidgin/gtkprefs.c:1927
+#: ../libpurple/protocols/msn/msn.c:544 ../libpurple/protocols/msn/state.c:32
+#: ../libpurple/protocols/novell/novell.c:2825
+#: ../libpurple/protocols/oscar/oscar.c:2912
+#: ../libpurple/protocols/yahoo/yahoo.c:3097
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:710 ../pidgin/gtkblist.c:3060
+#: ../pidgin/gtkblist.c:3460 ../pidgin/gtkprefs.c:1925
 msgid "Idle"
 msgstr "Nghỉ"
 
@@ -605,39 +604,39 @@
 "Last Seen: %s ago"
 msgstr "<b>Trạng thái:</b> %s"
 
-#: ../finch/gntblist.c:1704 ../pidgin/gtkdocklet.c:470
+#: ../finch/gntblist.c:1702 ../pidgin/gtkdocklet.c:470
 #: ../pidgin/gtkstatusbox.c:1072
 msgid "New..."
 msgstr "Mới..."
 
-#: ../finch/gntblist.c:1711 ../pidgin/gtkdocklet.c:471
+#: ../finch/gntblist.c:1709 ../pidgin/gtkdocklet.c:471
 #: ../pidgin/gtkstatusbox.c:1073
 #, fuzzy
 msgid "Saved..."
 msgstr "Lưu là..."
 
-#: ../finch/gntblist.c:2089 ../finch/gntplugin.c:255 ../finch/gntui.c:88
+#: ../finch/gntblist.c:2087 ../finch/gntplugin.c:255 ../finch/gntui.c:88
 #: ../pidgin/gtkdocklet.c:523 ../pidgin/gtkplugin.c:531
 msgid "Plugins"
 msgstr "Plugin"
 
-#: ../finch/gntblist.c:2205 ../pidgin/gtkdialogs.c:748
-#: ../pidgin/gtkdialogs.c:887 ../pidgin/gtkdialogs.c:968
+#: ../finch/gntblist.c:2203 ../pidgin/gtkdialogs.c:750
+#: ../pidgin/gtkdialogs.c:889 ../pidgin/gtkdialogs.c:970
 #, fuzzy
 msgid "_Name"
 msgstr "Tên"
 
-#: ../finch/gntblist.c:2210 ../pidgin/gtkdialogs.c:753
-#: ../pidgin/gtkdialogs.c:892 ../pidgin/gtkdialogs.c:973
+#: ../finch/gntblist.c:2208 ../pidgin/gtkdialogs.c:755
+#: ../pidgin/gtkdialogs.c:894 ../pidgin/gtkdialogs.c:975
 #, fuzzy
 msgid "_Account"
 msgstr "Tài _khoản:"
 
-#: ../finch/gntblist.c:2218 ../pidgin/gtkdialogs.c:761
+#: ../finch/gntblist.c:2216 ../pidgin/gtkdialogs.c:763
 msgid "New Instant Message"
 msgstr "Tin nhắn nhanh mới"
 
-#: ../finch/gntblist.c:2220 ../pidgin/gtkdialogs.c:763
+#: ../finch/gntblist.c:2218 ../pidgin/gtkdialogs.c:765
 #, fuzzy
 msgid ""
 "Please enter the screen name or alias of the person you would like to IM."
@@ -647,15 +646,15 @@
 #. Not multiline
 #. Not masked?
 #. No hints?
-#: ../finch/gntblist.c:2223 ../finch/gntcertmgr.c:90 ../finch/gntconn.c:136
+#: ../finch/gntblist.c:2221 ../finch/gntcertmgr.c:90 ../finch/gntconn.c:135
 #: ../finch/gntnotify.c:80 ../libpurple/account.c:1012
 #: ../libpurple/account.c:1262 ../libpurple/protocols/gg/gg.c:506
 #: ../libpurple/protocols/gg/gg.c:665 ../libpurple/protocols/gg/gg.c:802
 #: ../libpurple/protocols/jabber/jabber.c:1736
 #: ../libpurple/protocols/jabber/xdata.c:399
-#: ../libpurple/protocols/msn/msn.c:289 ../libpurple/protocols/msn/msn.c:306
-#: ../libpurple/protocols/msn/msn.c:323 ../libpurple/protocols/msn/msn.c:340
-#: ../libpurple/protocols/oscar/oscar.c:6091
+#: ../libpurple/protocols/msn/msn.c:286 ../libpurple/protocols/msn/msn.c:303
+#: ../libpurple/protocols/msn/msn.c:320 ../libpurple/protocols/msn/msn.c:337
+#: ../libpurple/protocols/oscar/oscar.c:6093
 #: ../libpurple/protocols/silc/buddy.c:454
 #: ../libpurple/protocols/silc/buddy.c:1190
 #: ../libpurple/protocols/silc/chat.c:447
@@ -672,58 +671,49 @@
 #: ../libpurple/protocols/silc10/ops.c:1297
 #: ../libpurple/protocols/silc10/ops.c:1903
 #: ../libpurple/protocols/silc10/silc.c:735
-#: ../libpurple/protocols/yahoo/yahoo.c:1030
-#: ../libpurple/protocols/yahoo/yahoo.c:3496
-#: ../libpurple/protocols/yahoo/yahoo.c:3507 ../pidgin/gtkblist.c:4321
-#: ../pidgin/gtkcertmgr.c:195 ../pidgin/gtkdialogs.c:766
-#: ../pidgin/gtkdialogs.c:905 ../pidgin/gtkdialogs.c:997
+#: ../libpurple/protocols/yahoo/yahoo.c:1031
+#: ../libpurple/protocols/yahoo/yahoo.c:3497
+#: ../libpurple/protocols/yahoo/yahoo.c:3508 ../pidgin/gtkblist.c:4039
+#: ../pidgin/gtkcertmgr.c:195 ../pidgin/gtkdialogs.c:768
+#: ../pidgin/gtkdialogs.c:907 ../pidgin/gtkdialogs.c:999
 #: ../pidgin/gtkrequest.c:270
 msgid "OK"
 msgstr "Đồng ý"
 
 #. Create the "Options" frame.
-#: ../finch/gntblist.c:2261 ../finch/gntpounce.c:447 ../pidgin/gtkpounce.c:790
+#: ../finch/gntblist.c:2241 ../finch/gntpounce.c:447 ../pidgin/gtkpounce.c:790
 #, fuzzy
 msgid "Options"
 msgstr "/_Tùy chọn"
 
-#: ../finch/gntblist.c:2267
+#: ../finch/gntblist.c:2247
 #, fuzzy
 msgid "Send IM..."
 msgstr "Lưu là..."
 
-#: ../finch/gntblist.c:2271
-msgid "Show"
-msgstr ""
-
-#: ../finch/gntblist.c:2276
-#, fuzzy
-msgid "Empty groups"
+#: ../finch/gntblist.c:2251
+#, fuzzy
+msgid "Show empty groups"
 msgstr "Theo nhóm"
 
-#: ../finch/gntblist.c:2282
-#, fuzzy
-msgid "Offline buddies"
-msgstr "Không hiển thị buddy _nghỉ"
-
-#: ../finch/gntblist.c:2288
-#, fuzzy
-msgid "Sort"
-msgstr "Cổng"
-
-#: ../finch/gntblist.c:2293
-#, fuzzy
-msgid "By Status"
-msgstr "Theo trạng thái"
-
-#: ../finch/gntblist.c:2297 ../pidgin/gtkblist.c:4106
-#, fuzzy
-msgid "Alphabetically"
+#: ../finch/gntblist.c:2257
+#, fuzzy
+msgid "Show offline buddies"
+msgstr "/Buddy/Hiển thị buddy ngoại tuyến"
+
+#: ../finch/gntblist.c:2263
+#, fuzzy
+msgid "Sort by status"
+msgstr "Trạng thái"
+
+#: ../finch/gntblist.c:2267
+#, fuzzy
+msgid "Sort alphabetically"
 msgstr "Theo vần"
 
-#: ../finch/gntblist.c:2301
-#, fuzzy
-msgid "By Log Size"
+#: ../finch/gntblist.c:2271
+#, fuzzy
+msgid "Sort by log size"
 msgstr "Theo kích thước bản ghi"
 
 #: ../finch/gntcertmgr.c:86 ../pidgin/gtkcertmgr.c:188
@@ -817,7 +807,7 @@
 msgid "Hostname"
 msgstr "Họ"
 
-#: ../finch/gntcertmgr.c:315 ../finch/gntnotify.c:386 ../pidgin/gtkconv.c:1688
+#: ../finch/gntcertmgr.c:315 ../finch/gntnotify.c:383 ../pidgin/gtkconv.c:1635
 #: ../pidgin/gtkdebug.c:835
 msgid "Info"
 msgstr "Thông tin"
@@ -825,24 +815,24 @@
 #. Close button
 #: ../finch/gntcertmgr.c:324 ../finch/gntft.c:237 ../finch/gntnotify.c:182
 #: ../finch/gntplugin.c:210 ../finch/gntplugin.c:310 ../finch/gntpounce.c:738
-#: ../finch/gntstatus.c:216 ../libpurple/protocols/msn/msn.c:406
+#: ../finch/gntstatus.c:216 ../libpurple/protocols/msn/msn.c:403
 #: ../libpurple/protocols/silc/util.c:382
 #: ../libpurple/protocols/silc10/util.c:377 ../pidgin/gtkaccount.c:2468
 #: ../pidgin/gtkrequest.c:273
 msgid "Close"
 msgstr "Đóng"
 
-#: ../finch/gntconn.c:125
+#: ../finch/gntconn.c:124
 #, fuzzy, c-format
 msgid "%s (%s)"
 msgstr "%s (Mã %s)"
 
-#: ../finch/gntconn.c:128
+#: ../finch/gntconn.c:127
 #, fuzzy, c-format
 msgid "%s disconnected."
 msgstr "Đã ngắt kết nối."
 
-#: ../finch/gntconn.c:129
+#: ../finch/gntconn.c:128
 #, c-format
 msgid ""
 "%s\n"
@@ -851,7 +841,7 @@
 "and re-enable the account."
 msgstr ""
 
-#: ../finch/gntconn.c:138 ../pidgin/gtkblist.c:4323
+#: ../finch/gntconn.c:137 ../pidgin/gtkblist.c:4041
 #, fuzzy
 msgid "Re-enable Account"
 msgstr "Đăng ký tài khoản Jabber mới"
@@ -861,24 +851,24 @@
 msgid "No such command."
 msgstr "Không có kênh như vậy"
 
-#: ../finch/gntconv.c:143 ../pidgin/gtkconv.c:530
+#: ../finch/gntconv.c:143 ../pidgin/gtkconv.c:489
 msgid "Syntax Error:  You typed the wrong number of arguments to that command."
 msgstr ""
 
-#: ../finch/gntconv.c:148 ../pidgin/gtkconv.c:536
+#: ../finch/gntconv.c:148 ../pidgin/gtkconv.c:495
 #, fuzzy
 msgid "Your command failed 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."
 
-#: ../finch/gntconv.c:153 ../pidgin/gtkconv.c:543
+#: ../finch/gntconv.c:153 ../pidgin/gtkconv.c:502
 msgid "That command only works in chats, not IMs."
 msgstr ""
 
-#: ../finch/gntconv.c:156 ../pidgin/gtkconv.c:546
+#: ../finch/gntconv.c:156 ../pidgin/gtkconv.c:505
 msgid "That command only works in IMs, not chats."
 msgstr ""
 
-#: ../finch/gntconv.c:160 ../pidgin/gtkconv.c:551
+#: ../finch/gntconv.c:160 ../pidgin/gtkconv.c:510
 msgid "That command doesn't work on this protocol."
 msgstr ""
 
@@ -896,7 +886,7 @@
 msgid "%s [%s]"
 msgstr ""
 
-#: ../finch/gntconv.c:279 ../finch/gntconv.c:801
+#: ../finch/gntconv.c:279 ../finch/gntconv.c:773
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -908,124 +898,124 @@
 msgid "You have left this chat."
 msgstr "Bạn nói trong Chat"
 
-#: ../finch/gntconv.c:414 ../pidgin/gtkconv.c:1415
+#: ../finch/gntconv.c:387 ../pidgin/gtkconv.c:1362
 msgid "Logging started. Future messages in this conversation will be logged."
 msgstr ""
 
-#: ../finch/gntconv.c:420 ../pidgin/gtkconv.c:1423
+#: ../finch/gntconv.c:393 ../pidgin/gtkconv.c:1370
 msgid ""
 "Logging stopped. Future messages in this conversation will not be logged."
 msgstr ""
 
-#: ../finch/gntconv.c:469
+#: ../finch/gntconv.c:442
 #, fuzzy
 msgid "Send To"
 msgstr "_Gửi bằng"
 
-#: ../finch/gntconv.c:513
+#: ../finch/gntconv.c:486
 #, fuzzy
 msgid "Conversation"
 msgstr "Cuộc thoại"
 
-#: ../finch/gntconv.c:519
+#: ../finch/gntconv.c:492
 msgid "Clear Scrollback"
 msgstr ""
 
-#: ../finch/gntconv.c:523 ../finch/gntprefs.c:191
+#: ../finch/gntconv.c:496 ../finch/gntprefs.c:191
 #, fuzzy
 msgid "Show Timestamps"
 msgstr "Nhãn thời gian"
 
-#: ../finch/gntconv.c:539
+#: ../finch/gntconv.c:512
 #, fuzzy
 msgid "Add Buddy Pounce..."
 msgstr "Thêm thông _báo Buddy"
 
-#: ../finch/gntconv.c:554
+#: ../finch/gntconv.c:527
 #, fuzzy
 msgid "Enable Logging"
 msgstr "/Tùy chọn/Cho phép đăng nhập"
 
-#: ../finch/gntconv.c:560
+#: ../finch/gntconv.c:533
 #, fuzzy
 msgid "Enable Sounds"
 msgstr "/Tùy chọn/Bật âm thanh"
 
-#: ../finch/gntconv.c:766
+#: ../finch/gntconv.c:739
 #, fuzzy
 msgid "<AUTO-REPLY> "
 msgstr "(%s) %s <Trả Lời-Tự Động>: %s\n"
 
 #. Print the list of users in the room
-#: ../finch/gntconv.c:889
+#: ../finch/gntconv.c:861
 msgid "List of users:\n"
 msgstr ""
 
-#: ../finch/gntconv.c:1051 ../pidgin/gtkconv.c:370
+#: ../finch/gntconv.c:1023 ../pidgin/gtkconv.c:331
 msgid "Supported debug options are:  version"
 msgstr ""
 
-#: ../finch/gntconv.c:1087 ../pidgin/gtkconv.c:422
+#: ../finch/gntconv.c:1059 ../pidgin/gtkconv.c:381
 msgid "No such command (in this context)."
 msgstr ""
 
-#: ../finch/gntconv.c:1090 ../pidgin/gtkconv.c:425
+#: ../finch/gntconv.c:1062 ../pidgin/gtkconv.c:384
 msgid ""
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
 "The following commands are available in this context:\n"
 msgstr ""
 
-#: ../finch/gntconv.c:1148 ../pidgin/gtkconv.c:7642
+#: ../finch/gntconv.c:1120 ../pidgin/gtkconv.c:7560
 msgid ""
 "say &lt;message&gt;:  Send a message normally as if you weren't using a "
 "command."
 msgstr ""
 
-#: ../finch/gntconv.c:1151 ../pidgin/gtkconv.c:7645
+#: ../finch/gntconv.c:1123 ../pidgin/gtkconv.c:7563
 msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
 msgstr ""
 
-#: ../finch/gntconv.c:1154 ../pidgin/gtkconv.c:7648
+#: ../finch/gntconv.c:1126 ../pidgin/gtkconv.c:7566
 msgid ""
 "debug &lt;option&gt;:  Send various debug information to the current "
 "conversation."
 msgstr ""
 
-#: ../finch/gntconv.c:1157 ../pidgin/gtkconv.c:7651
+#: ../finch/gntconv.c:1129 ../pidgin/gtkconv.c:7569
 #, fuzzy
 msgid "clear: Clears the conversation scrollback."
 msgstr "%s đã đóng cửa sổ cuộc thoại."
 
-#: ../finch/gntconv.c:1160 ../pidgin/gtkconv.c:7657
+#: ../finch/gntconv.c:1132 ../pidgin/gtkconv.c:7575
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr ""
 
-#: ../finch/gntconv.c:1163
+#: ../finch/gntconv.c:1135
 msgid "users:  Show the list of users in the chat."
 msgstr ""
 
-#: ../finch/gntconv.c:1168
+#: ../finch/gntconv.c:1140
 #, fuzzy
 msgid "plugins: Show the plugins window."
 msgstr "Hiển thị đăng nhậ_p trong cửa sổ"
 
-#: ../finch/gntconv.c:1171
+#: ../finch/gntconv.c:1143
 msgid "buddylist: Show the buddylist."
 msgstr ""
 
-#: ../finch/gntconv.c:1174
+#: ../finch/gntconv.c:1146
 msgid "accounts: Show the accounts window."
 msgstr ""
 
-#: ../finch/gntconv.c:1177
+#: ../finch/gntconv.c:1149
 msgid "debugwin: Show the debug window."
 msgstr ""
 
-#: ../finch/gntconv.c:1180
+#: ../finch/gntconv.c:1152
 msgid "prefs: Show the preference window."
 msgstr ""
 
-#: ../finch/gntconv.c:1183
+#: ../finch/gntconv.c:1155
 msgid "statuses: Show the savedstatuses window."
 msgstr ""
 
@@ -1091,17 +1081,17 @@
 #: ../libpurple/protocols/jabber/buddy.c:782
 #: ../libpurple/protocols/jabber/buddy.c:941
 #: ../libpurple/protocols/jabber/jabber.c:1500
-#: ../libpurple/protocols/msn/msn.c:596 ../libpurple/protocols/msn/msn.c:603
-#: ../libpurple/protocols/novell/novell.c:2840
+#: ../libpurple/protocols/msn/msn.c:543
+#: ../libpurple/protocols/novell/novell.c:2835
 #: ../libpurple/protocols/oscar/oscar.c:821
 #: ../libpurple/protocols/oscar/oscar.c:826
 #: ../libpurple/protocols/oscar/oscar.c:828
-#: ../libpurple/protocols/oscar/oscar.c:2696
-#: ../libpurple/protocols/oscar/oscar.c:3776
+#: ../libpurple/protocols/oscar/oscar.c:2700
+#: ../libpurple/protocols/oscar/oscar.c:3780
 #: ../libpurple/protocols/sametime/sametime.c:3263
 #: ../libpurple/protocols/sametime/sametime.c:4150
-#: ../libpurple/protocols/yahoo/yahoo.c:3247 ../pidgin/gtkblist.c:3302
-#: ../pidgin/gtkblist.c:3316 ../pidgin/gtkblist.c:3318
+#: ../libpurple/protocols/yahoo/yahoo.c:3248 ../pidgin/gtkblist.c:3104
+#: ../pidgin/gtkblist.c:3118 ../pidgin/gtkblist.c:3120
 #: ../pidgin/gtksavedstatuses.c:999 ../pidgin/gtksavedstatuses.c:1144
 msgid "Status"
 msgstr "Trạng thái"
@@ -1149,7 +1139,7 @@
 msgid "Finished"
 msgstr "Tiếng Phần Lan"
 
-#: ../finch/gntft.c:437 ../libpurple/protocols/msn/session.c:386
+#: ../finch/gntft.c:437 ../libpurple/protocols/msn/session.c:347
 #, fuzzy
 msgid "Transferring"
 msgstr "Truyền tập tin"
@@ -1163,12 +1153,12 @@
 msgid "You have mail!"
 msgstr ""
 
-#: ../finch/gntnotify.c:174 ../pidgin/gtknotify.c:510
+#: ../finch/gntnotify.c:174 ../pidgin/gtknotify.c:513
 #, fuzzy
 msgid "Sender"
 msgstr "Giới tính"
 
-#: ../finch/gntnotify.c:174 ../pidgin/gtknotify.c:517
+#: ../finch/gntnotify.c:174 ../pidgin/gtknotify.c:520
 #, fuzzy
 msgid "Subject"
 msgstr "Thiết lập"
@@ -1195,24 +1185,24 @@
 msgid "Buddy Information"
 msgstr "Thông tin buddy"
 
-#: ../finch/gntnotify.c:380 ../libpurple/protocols/qq/group_join.c:367
+#: ../finch/gntnotify.c:377 ../libpurple/protocols/qq/group_join.c:367
 #, fuzzy
 msgid "Continue"
 msgstr "Kết nối"
 
-#: ../finch/gntnotify.c:389 ../pidgin/gtkconv.c:1649
+#: ../finch/gntnotify.c:386 ../pidgin/gtkconv.c:1596
 msgid "IM"
 msgstr "Tin nhắn nhanh"
 
-#: ../finch/gntnotify.c:392
+#: ../finch/gntnotify.c:389
 msgid "Join"
 msgstr "Tham gia"
 
-#: ../finch/gntnotify.c:395 ../libpurple/protocols/sametime/sametime.c:3473
+#: ../finch/gntnotify.c:392 ../libpurple/protocols/sametime/sametime.c:3473
 msgid "Invite"
 msgstr "Mời"
 
-#: ../finch/gntnotify.c:398
+#: ../finch/gntnotify.c:395
 #, fuzzy
 msgid "(none)"
 msgstr "(không tên)"
@@ -1264,7 +1254,7 @@
 #. Back to instant-apply! I win!  BU-HAHAHA!
 #. Create the window
 #: ../finch/gntplugin.c:371 ../finch/gntplugin.c:378 ../finch/gntprefs.c:264
-#: ../finch/gntui.c:90 ../pidgin/gtkdocklet.c:524 ../pidgin/gtkprefs.c:2069
+#: ../finch/gntui.c:90 ../pidgin/gtkdocklet.c:524 ../pidgin/gtkprefs.c:2067
 msgid "Preferences"
 msgstr "Tùy chỉnh"
 
@@ -1463,6 +1453,7 @@
 msgstr "%s muốn gửi cho bạn %s (%s)"
 
 #: ../finch/gntpounce.c:829 ../pidgin/gtkpounce.c:1471
+#, c-format
 msgid "Unknown pounce event. Please report this!"
 msgstr "Sự kiện thông báo không xác định. Hãy ghi báo cáo việc này!"
 
@@ -1470,13 +1461,13 @@
 msgid "Based on keyboard use"
 msgstr ""
 
-#: ../finch/gntprefs.c:94 ../pidgin/gtkprefs.c:1932
+#: ../finch/gntprefs.c:94 ../pidgin/gtkprefs.c:1930
 #, fuzzy
 msgid "From last sent message"
 msgstr "Nhấn C_ontrol-Enter để gửi thông điệp"
 
 #: ../finch/gntprefs.c:96 ../pidgin/gtkprefs.c:898 ../pidgin/gtkprefs.c:907
-#: ../pidgin/gtkprefs.c:1931 ../pidgin/gtkprefs.c:1945
+#: ../pidgin/gtkprefs.c:1929 ../pidgin/gtkprefs.c:1943
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:333
 #, fuzzy
 msgid "Never"
@@ -1538,12 +1529,12 @@
 msgstr "Đổi địa chỉ thành:"
 
 #. Conversations
-#: ../finch/gntprefs.c:259 ../pidgin/gtkprefs.c:993 ../pidgin/gtkprefs.c:2035
+#: ../finch/gntprefs.c:259 ../pidgin/gtkprefs.c:993 ../pidgin/gtkprefs.c:2033
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:340
 msgid "Conversations"
 msgstr "Cuộc thoại"
 
-#: ../finch/gntprefs.c:260 ../pidgin/gtkprefs.c:1469 ../pidgin/gtkprefs.c:2046
+#: ../finch/gntprefs.c:260 ../pidgin/gtkprefs.c:1467 ../pidgin/gtkprefs.c:2044
 msgid "Logging"
 msgstr "Tạo bản ghi"
 
@@ -1612,8 +1603,8 @@
 msgid "GStreamer failed to initialize."
 msgstr ""
 
-#: ../finch/gntsound.c:716 ../finch/gntsound.c:802 ../pidgin/gtkprefs.c:1589
-#: ../pidgin/gtkprefs.c:1678 ../pidgin/gtkprefs.c:1874
+#: ../finch/gntsound.c:716 ../finch/gntsound.c:802 ../pidgin/gtkprefs.c:1587
+#: ../pidgin/gtkprefs.c:1676 ../pidgin/gtkprefs.c:1872
 #, fuzzy
 msgid "(default)"
 msgstr "Chấp nhận mặc định"
@@ -1633,7 +1624,7 @@
 msgid "Profiles"
 msgstr "Lý lịch"
 
-#: ../finch/gntsound.c:954 ../pidgin/gtkprefs.c:1719
+#: ../finch/gntsound.c:954 ../pidgin/gtkprefs.c:1717
 msgid "Automatic"
 msgstr "Tự động"
 
@@ -1642,7 +1633,7 @@
 msgid "Console Beep"
 msgstr "Tiếng bíp console"
 
-#: ../finch/gntsound.c:958 ../pidgin/gtkprefs.c:1723
+#: ../finch/gntsound.c:958 ../pidgin/gtkprefs.c:1721
 msgid "Command"
 msgstr "Lệnh"
 
@@ -1651,7 +1642,7 @@
 msgid "No Sound"
 msgstr "Âm thanh"
 
-#: ../finch/gntsound.c:961 ../pidgin/gtkprefs.c:1714
+#: ../finch/gntsound.c:961 ../pidgin/gtkprefs.c:1712
 msgid "Sound Method"
 msgstr "Cách phát tiếng"
 
@@ -1670,7 +1661,7 @@
 "(%s cho tên tập tin)"
 
 #. Sound options
-#: ../finch/gntsound.c:981 ../pidgin/gtkprefs.c:1758
+#: ../finch/gntsound.c:981 ../pidgin/gtkprefs.c:1756
 msgid "Sound Options"
 msgstr "Tùy chọn âm thanh"
 
@@ -1680,19 +1671,19 @@
 msgstr "Bỏ khi cửa sổ cuộc thoại _được chú ý"
 
 #: ../finch/gntsound.c:990 ../pidgin/gtkprefs.c:897 ../pidgin/gtkprefs.c:909
-#: ../pidgin/gtkprefs.c:1765 ../pidgin/plugins/timestamp_format.c:42
+#: ../pidgin/gtkprefs.c:1763 ../pidgin/plugins/timestamp_format.c:42
 #: ../pidgin/plugins/timestamp_format.c:51
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:334
 #, fuzzy
 msgid "Always"
 msgstr "Trạng thái"
 
-#: ../finch/gntsound.c:991 ../pidgin/gtkprefs.c:1763
+#: ../finch/gntsound.c:991 ../pidgin/gtkprefs.c:1761
 #, fuzzy
 msgid "Only when available"
 msgstr "Không có mặt"
 
-#: ../finch/gntsound.c:992 ../pidgin/gtkprefs.c:1764
+#: ../finch/gntsound.c:992 ../pidgin/gtkprefs.c:1762
 #, fuzzy
 msgid "Only when not available"
 msgstr "Hiện không có Chat trong %s."
@@ -1702,11 +1693,11 @@
 msgstr ""
 
 #. Sound events
-#: ../finch/gntsound.c:1018 ../pidgin/gtkprefs.c:1800
+#: ../finch/gntsound.c:1018 ../pidgin/gtkprefs.c:1798
 msgid "Sound Events"
 msgstr "Âm thanh Sự kiện"
 
-#: ../finch/gntsound.c:1020 ../pidgin/gtkprefs.c:1859
+#: ../finch/gntsound.c:1020 ../pidgin/gtkprefs.c:1857
 msgid "Event"
 msgstr "Sự kiện"
 
@@ -1715,15 +1706,15 @@
 msgid "File"
 msgstr "Lỗi"
 
-#: ../finch/gntsound.c:1039 ../pidgin/gtkprefs.c:1878
+#: ../finch/gntsound.c:1039 ../pidgin/gtkprefs.c:1876
 msgid "Test"
 msgstr "Thử"
 
-#: ../finch/gntsound.c:1042 ../pidgin/gtkprefs.c:1882
+#: ../finch/gntsound.c:1042 ../pidgin/gtkprefs.c:1880
 msgid "Reset"
 msgstr "Thiết lập lại"
 
-#: ../finch/gntsound.c:1045 ../pidgin/gtkprefs.c:1886
+#: ../finch/gntsound.c:1045 ../pidgin/gtkprefs.c:1884
 msgid "Choose..."
 msgstr "Chọn..."
 
@@ -1745,7 +1736,7 @@
 #: ../finch/gntstatus.c:183 ../finch/gntstatus.c:539
 #: ../libpurple/protocols/jabber/buddy.c:298
 #: ../libpurple/protocols/jabber/buddy.c:1359
-#: ../libpurple/protocols/novell/novell.c:1486
+#: ../libpurple/protocols/novell/novell.c:1484
 #: ../pidgin/gtksavedstatuses.c:500
 msgid "Title"
 msgstr "Chức danh"
@@ -1776,20 +1767,17 @@
 #: ../libpurple/protocols/jabber/jabber.c:1601
 #: ../libpurple/protocols/jabber/jabber.c:1624
 #: ../libpurple/protocols/jabber/jabber.c:1649
-#: ../libpurple/protocols/msn/msn.c:634 ../libpurple/protocols/msn/msn.c:641
-#: ../libpurple/protocols/msn/msn.c:648 ../libpurple/protocols/msn/msn.c:655
-#: ../libpurple/protocols/msn/msn.c:661 ../libpurple/protocols/msn/msn.c:667
 #: ../libpurple/protocols/myspace/myspace.c:148
-#: ../libpurple/protocols/novell/novell.c:2843
-#: ../libpurple/protocols/novell/novell.c:2946
-#: ../libpurple/protocols/novell/novell.c:2952
-#: ../libpurple/protocols/novell/novell.c:2958
-#: ../libpurple/protocols/oscar/oscar.c:5552
-#: ../libpurple/protocols/oscar/oscar.c:5770
-#: ../libpurple/protocols/oscar/oscar.c:5784
-#: ../libpurple/protocols/oscar/oscar.c:5800
-#: ../libpurple/protocols/oscar/oscar.c:5807
-#: ../libpurple/protocols/oscar/oscar.c:5814
+#: ../libpurple/protocols/novell/novell.c:2838
+#: ../libpurple/protocols/novell/novell.c:2941
+#: ../libpurple/protocols/novell/novell.c:2947
+#: ../libpurple/protocols/novell/novell.c:2953
+#: ../libpurple/protocols/oscar/oscar.c:5554
+#: ../libpurple/protocols/oscar/oscar.c:5772
+#: ../libpurple/protocols/oscar/oscar.c:5786
+#: ../libpurple/protocols/oscar/oscar.c:5802
+#: ../libpurple/protocols/oscar/oscar.c:5809
+#: ../libpurple/protocols/oscar/oscar.c:5816
 #: ../libpurple/protocols/sametime/sametime.c:3286
 #: ../libpurple/protocols/sametime/sametime.c:3292
 #: ../libpurple/protocols/sametime/sametime.c:3298
@@ -1797,8 +1785,8 @@
 #: ../libpurple/protocols/silc/buddy.c:1551
 #: ../libpurple/protocols/silc10/buddy.c:1551
 #: ../libpurple/protocols/simple/simple.c:246
-#: ../libpurple/protocols/yahoo/yahoo.c:3750
-#: ../libpurple/protocols/yahoo/yahoo.c:3756
+#: ../libpurple/protocols/yahoo/yahoo.c:3751
+#: ../libpurple/protocols/yahoo/yahoo.c:3757
 #: ../libpurple/protocols/zephyr/zephyr.c:2337
 #: ../pidgin/gtksavedstatuses.c:526 ../pidgin/gtksavedstatuses.c:1010
 #, fuzzy
@@ -1864,7 +1852,7 @@
 msgid "Certificates"
 msgstr ""
 
-#: ../finch/gntui.c:89 ../pidgin/gtkprefs.c:2037
+#: ../finch/gntui.c:89 ../pidgin/gtkprefs.c:2035
 msgid "Sounds"
 msgstr "Âm thanh"
 
@@ -1971,16 +1959,16 @@
 msgid "Toaster plugin"
 msgstr ""
 
-#: ../finch/plugins/gnthistory.c:116 ../pidgin/plugins/history.c:123
+#: ../finch/plugins/gnthistory.c:116 ../pidgin/plugins/history.c:120
 #, fuzzy, c-format
 msgid "<b>Conversation with %s on %s:</b><br>"
 msgstr "Các cuộc thoại với"
 
-#: ../finch/plugins/gnthistory.c:138 ../pidgin/plugins/history.c:150
+#: ../finch/plugins/gnthistory.c:138 ../pidgin/plugins/history.c:147
 msgid "History Plugin Requires Logging"
 msgstr ""
 
-#: ../finch/plugins/gnthistory.c:139 ../pidgin/plugins/history.c:151
+#: ../finch/plugins/gnthistory.c:139 ../pidgin/plugins/history.c:148
 msgid ""
 "Logging can be enabled from Tools -> Preferences -> Logging.\n"
 "\n"
@@ -1993,11 +1981,11 @@
 msgid "GntHistory"
 msgstr "Lược sử"
 
-#: ../finch/plugins/gnthistory.c:181 ../pidgin/plugins/history.c:194
+#: ../finch/plugins/gnthistory.c:181 ../pidgin/plugins/history.c:190
 msgid "Shows recently logged conversations in new conversations."
 msgstr "Hiển thị cuộc thoại được ghi lại gần đây trong cuộc thoại mới."
 
-#: ../finch/plugins/gnthistory.c:182 ../pidgin/plugins/history.c:195
+#: ../finch/plugins/gnthistory.c:182 ../pidgin/plugins/history.c:191
 msgid ""
 "When a new conversation is opened this plugin will insert the last "
 "conversation into the current conversation."
@@ -2010,15 +1998,16 @@
 msgid "Lastlog"
 msgstr "Bản Ghi"
 
-#: ../finch/plugins/lastlog.c:99
+#. Translator Note: The "backlog" is the conversation buffer/history.
+#: ../finch/plugins/lastlog.c:100
 msgid "lastlog: Searches for a substring in the backlog."
 msgstr ""
 
-#: ../finch/plugins/lastlog.c:121
+#: ../finch/plugins/lastlog.c:122
 msgid "GntLastlog"
 msgstr ""
 
-#: ../finch/plugins/lastlog.c:123 ../finch/plugins/lastlog.c:124
+#: ../finch/plugins/lastlog.c:124 ../finch/plugins/lastlog.c:125
 msgid "Lastlog plugin."
 msgstr ""
 
@@ -2054,7 +2043,7 @@
 msgstr "Thiếu plugin giao thức cho %s"
 
 #: ../libpurple/account.c:1041 ../libpurple/connection.c:108
-#: ../pidgin/gtkblist.c:4318
+#: ../pidgin/gtkblist.c:4036
 msgid "Connection Error"
 msgstr "Lỗi kết nối"
 
@@ -2099,16 +2088,16 @@
 
 #: ../libpurple/account.c:1764 ../libpurple/protocols/gg/gg.c:1017
 #: ../libpurple/protocols/jabber/buddy.c:782
-#: ../libpurple/protocols/jabber/buddy.c:2030
-#: ../libpurple/protocols/jabber/buddy.c:2047
-#: ../libpurple/protocols/novell/novell.c:2836
+#: ../libpurple/protocols/jabber/buddy.c:2027
+#: ../libpurple/protocols/jabber/buddy.c:2044
+#: ../libpurple/protocols/novell/novell.c:2831
 #: ../libpurple/protocols/qq/qq.c:232 ../pidgin/gtkft.c:160
 msgid "Unknown"
 msgstr "Không xác định"
 
-#: ../libpurple/blist.c:521 ../libpurple/blist.c:1321
-#: ../libpurple/blist.c:1531 ../libpurple/protocols/jabber/roster.c:69
-#: ../libpurple/protocols/myspace/myspace.c:3242 ../pidgin/gtkblist.c:5662
+#: ../libpurple/blist.c:521 ../libpurple/blist.c:1320
+#: ../libpurple/blist.c:1552 ../libpurple/protocols/jabber/roster.c:69
+#: ../libpurple/protocols/myspace/myspace.c:3244 ../pidgin/gtkblist.c:5373
 #: ../pidgin/plugins/gevolution/gevo-util.c:67
 #: ../pidgin/plugins/gevolution/gevolution.c:96
 msgid "Buddies"
@@ -2247,7 +2236,7 @@
 msgstr ""
 
 #. Make messages
-#: ../libpurple/certificate.c:1882
+#: ../libpurple/certificate.c:1881
 #, c-format
 msgid ""
 "Common name: %s\n"
@@ -2259,7 +2248,7 @@
 msgstr ""
 
 #. TODO: Find what the handle ought to be
-#: ../libpurple/certificate.c:1891
+#: ../libpurple/certificate.c:1890
 #, fuzzy
 msgid "Certificate Information"
 msgstr "Thông tin lý lịch"
@@ -2284,9 +2273,9 @@
 msgstr "%s đã ngắt kết nối"
 
 #: ../libpurple/connection.c:497 ../libpurple/plugin.c:282
-#: ../libpurple/protocols/jabber/buddy.c:2340
+#: ../libpurple/protocols/jabber/buddy.c:2337
 #: ../libpurple/protocols/msn/servconn.c:141
-#: ../libpurple/protocols/msn/session.c:361
+#: ../libpurple/protocols/msn/session.c:322
 msgid "Unknown error"
 msgstr "Lỗi không xác định"
 
@@ -2404,7 +2393,7 @@
 msgstr "Lỗi đọc từ máy chủ"
 
 #: ../libpurple/dnsquery.c:578
-#, fuzzy
+#, fuzzy, c-format
 msgid "EOF while reading from resolver process"
 msgstr "Lỗi đọc từ socket."
 
@@ -2506,7 +2495,7 @@
 msgstr ""
 
 #: ../libpurple/ft.c:685
-#, fuzzy
+#, fuzzy, c-format
 msgid "File transfer complete"
 msgstr "Máy chủ truyền tập tin"
 
@@ -2516,7 +2505,7 @@
 msgstr "%s đã đổi chủ đề thành: %s"
 
 #: ../libpurple/ft.c:1108
-#, fuzzy
+#, fuzzy, c-format
 msgid "File transfer cancelled"
 msgstr "Việc gửi tập tin từ %s bị hủy.\n"
 
@@ -2755,6 +2744,7 @@
 msgstr ""
 
 #: ../libpurple/plugin.c:380
+#, c-format
 msgid "This plugin has not defined an ID."
 msgstr ""
 
@@ -2839,13 +2829,13 @@
 #: ../libpurple/plugins/autoaccept.c:165 ../libpurple/plugins/idle.c:170
 #: ../libpurple/plugins/idle.c:204 ../libpurple/plugins/idle.c:230
 #: ../libpurple/protocols/oscar/oscar.c:1453
-#: ../libpurple/protocols/oscar/oscar.c:2229
-#: ../libpurple/protocols/oscar/oscar.c:2278
-#: ../libpurple/protocols/oscar/oscar.c:5884
-#: ../libpurple/protocols/oscar/oscar.c:5939
-#: ../libpurple/protocols/oscar/oscar.c:6165
-#: ../libpurple/protocols/oscar/oscar.c:6235 ../libpurple/request.h:1388
-#: ../libpurple/request.h:1398 ../pidgin/gtkblist.c:527
+#: ../libpurple/protocols/oscar/oscar.c:2233
+#: ../libpurple/protocols/oscar/oscar.c:2282
+#: ../libpurple/protocols/oscar/oscar.c:5886
+#: ../libpurple/protocols/oscar/oscar.c:5941
+#: ../libpurple/protocols/oscar/oscar.c:6167
+#: ../libpurple/protocols/oscar/oscar.c:6237 ../libpurple/request.h:1388
+#: ../libpurple/request.h:1398
 #, fuzzy
 msgid "_Cancel"
 msgstr "Bỏ qua"
@@ -2887,8 +2877,8 @@
 "(only when there's no conversation with the sender)"
 msgstr ""
 
-#: ../libpurple/plugins/buddynote.c:46 ../libpurple/protocols/msn/msn.c:1770
-#: ../libpurple/protocols/msn/msn.c:1800
+#: ../libpurple/plugins/buddynote.c:46 ../libpurple/protocols/msn/msn.c:1660
+#: ../libpurple/protocols/msn/msn.c:1690
 #, fuzzy
 msgid "Notes"
 msgstr "Không"
@@ -3333,9 +3323,9 @@
 msgstr ""
 
 #: ../libpurple/plugins/offlinemsg.c:165
-#: ../libpurple/protocols/msn/dialog.c:141
-#: ../libpurple/protocols/msn/msn.c:622
-#: ../libpurple/protocols/novell/novell.c:1919
+#: ../libpurple/protocols/msn/dialog.c:133
+#: ../libpurple/protocols/msn/msn.c:550 ../libpurple/protocols/msn/msn.c:560
+#: ../libpurple/protocols/novell/novell.c:1917
 #: ../libpurple/protocols/silc/buddy.c:317
 #: ../libpurple/protocols/silc/pk.c:113 ../libpurple/protocols/silc/wb.c:304
 #: ../libpurple/protocols/silc10/buddy.c:314
@@ -3345,9 +3335,9 @@
 msgstr "Có"
 
 #: ../libpurple/plugins/offlinemsg.c:166
-#: ../libpurple/protocols/msn/dialog.c:142
-#: ../libpurple/protocols/msn/msn.c:622
-#: ../libpurple/protocols/novell/novell.c:1920
+#: ../libpurple/protocols/msn/dialog.c:134
+#: ../libpurple/protocols/msn/msn.c:550 ../libpurple/protocols/msn/msn.c:560
+#: ../libpurple/protocols/novell/novell.c:1918
 #: ../libpurple/protocols/silc/buddy.c:318
 #: ../libpurple/protocols/silc/pk.c:114 ../libpurple/protocols/silc/wb.c:305
 #: ../libpurple/protocols/silc10/buddy.c:315
@@ -3456,7 +3446,7 @@
 msgstr "Kiểm tra để biết mọi thứ đang hoạt động."
 
 #. Scheme name
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:903
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:902
 #: ../libpurple/plugins/ssl/ssl-nss.c:725
 msgid "X.509 Certificates"
 msgstr ""
@@ -3467,7 +3457,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:987
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:986
 msgid "GNUTLS"
 msgstr "GNUTLS"
 
@@ -3475,8 +3465,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:990
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:992
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:989
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:991
 msgid "Provides SSL support through GNUTLS."
 msgstr "Cung cấp hỗ trợ SSL thông qua GNUTLS."
 
@@ -3585,15 +3575,15 @@
 "Thông báo trong cửa sổ cuộc thoại trạng thái vắng mặt, có mặt, hay nghỉ của "
 "buddy."
 
-#: ../libpurple/plugins/tcl/tcl.c:423
+#: ../libpurple/plugins/tcl/tcl.c:421
 msgid "Tcl Plugin Loader"
 msgstr "Trình nạp Tcl Plugin"
 
-#: ../libpurple/plugins/tcl/tcl.c:425 ../libpurple/plugins/tcl/tcl.c:426
+#: ../libpurple/plugins/tcl/tcl.c:423 ../libpurple/plugins/tcl/tcl.c:424
 msgid "Provides support for loading Tcl plugins"
 msgstr "Cung cấp hỗ trợ để nạp Tcl Plugin"
 
-#: ../libpurple/plugins/tcl/tcl.c:509
+#: ../libpurple/plugins/tcl/tcl.c:507
 msgid ""
 "Unable to detect ActiveTCL installation. If you wish to use TCL plugins, "
 "install ActiveTCL from http://www.activestate.com\n"
@@ -3631,7 +3621,7 @@
 #: ../libpurple/protocols/jabber/buddy.c:295
 #: ../libpurple/protocols/jabber/buddy.c:1325
 #: ../libpurple/protocols/jabber/buddy.c:1335
-#: ../libpurple/protocols/jabber/buddy.c:2219
+#: ../libpurple/protocols/jabber/buddy.c:2216
 #: ../libpurple/protocols/silc/ops.c:1041
 #: ../libpurple/protocols/silc/util.c:555
 #: ../libpurple/protocols/silc10/ops.c:1075
@@ -3838,8 +3828,8 @@
 #: ../libpurple/protocols/gg/gg.c:642 ../libpurple/protocols/gg/gg.c:1054
 #: ../libpurple/protocols/gg/gg.c:1126
 #: ../libpurple/protocols/jabber/jabber.c:957
-#: ../libpurple/protocols/oscar/oscar.c:3785
-#: ../libpurple/protocols/oscar/oscar.c:3798
+#: ../libpurple/protocols/oscar/oscar.c:3789
+#: ../libpurple/protocols/oscar/oscar.c:3802
 #: ../libpurple/protocols/qq/buddy_info.c:49
 msgid "City"
 msgstr "Thành phố"
@@ -3848,9 +3838,9 @@
 msgid "Year of birth"
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:650 ../libpurple/protocols/msn/msn.c:1699
+#: ../libpurple/protocols/gg/gg.c:650 ../libpurple/protocols/msn/msn.c:1589
 #: ../libpurple/protocols/myspace/user.c:115
-#: ../libpurple/protocols/oscar/oscar.c:3728
+#: ../libpurple/protocols/oscar/oscar.c:3732
 #: ../libpurple/protocols/qq/buddy_info.c:46
 #: ../libpurple/protocols/qq/qq.c:226 ../libpurple/protocols/qq/qq.c:229
 #: ../libpurple/protocols/qq/qq.c:232 ../libpurple/protocols/qq/qq.c:236
@@ -3863,14 +3853,14 @@
 msgstr ""
 
 #: ../libpurple/protocols/gg/gg.c:652
-#: ../libpurple/protocols/oscar/oscar.c:3728
+#: ../libpurple/protocols/oscar/oscar.c:3732
 #: ../libpurple/protocols/qq/buddy_info.c:83
 #: ../libpurple/protocols/qq/qq.c:226
 msgid "Male"
 msgstr "Nam"
 
 #: ../libpurple/protocols/gg/gg.c:653
-#: ../libpurple/protocols/oscar/oscar.c:3728
+#: ../libpurple/protocols/oscar/oscar.c:3732
 #: ../libpurple/protocols/qq/buddy_info.c:84
 #: ../libpurple/protocols/qq/qq.c:229
 msgid "Female"
@@ -3940,25 +3930,25 @@
 msgstr "Thêm C_hat"
 
 #: ../libpurple/protocols/gg/gg.c:1008
-#: ../libpurple/protocols/jabber/buddy.c:2034
-#: ../libpurple/protocols/novell/novell.c:2833
+#: ../libpurple/protocols/jabber/buddy.c:2031
+#: ../libpurple/protocols/novell/novell.c:2828
 #: ../libpurple/protocols/oscar/oscar.c:828
-#: ../libpurple/protocols/oscar/oscar.c:5602
+#: ../libpurple/protocols/oscar/oscar.c:5604
 #: ../libpurple/protocols/qq/qq.c:170 ../libpurple/protocols/qq/qq.c:177
 #: ../libpurple/protocols/qq/qq.c:292
-#: ../libpurple/protocols/yahoo/yahoo.c:3098 ../libpurple/status.c:154
-#: ../pidgin/gtkblist.c:3302 ../pidgin/gtkblist.c:3640
+#: ../libpurple/protocols/yahoo/yahoo.c:3099 ../libpurple/status.c:154
+#: ../pidgin/gtkblist.c:3104 ../pidgin/gtkblist.c:3436
 #: ../pidgin/gtkdocklet.c:450 ../pidgin/gtkstatusbox.c:1061
 msgid "Offline"
 msgstr "Ngoại tuyến"
 
 #: ../libpurple/protocols/gg/gg.c:1011
-#: ../libpurple/protocols/jabber/buddy.c:2036
+#: ../libpurple/protocols/jabber/buddy.c:2033
 #: ../libpurple/protocols/msn/state.c:29 ../libpurple/protocols/msn/state.c:30
 #: ../libpurple/protocols/msn/state.c:37 ../libpurple/protocols/msn/state.c:38
-#: ../libpurple/protocols/novell/novell.c:2821
+#: ../libpurple/protocols/novell/novell.c:2816
 #: ../libpurple/protocols/qq/qq.c:280
-#: ../libpurple/protocols/yahoo/yahoo.c:3100 ../libpurple/status.c:155
+#: ../libpurple/protocols/yahoo/yahoo.c:3101 ../libpurple/status.c:155
 #: ../pidgin/gtkdocklet.c:438 ../pidgin/gtkstatusbox.c:1057
 msgid "Available"
 msgstr "Có mặt"
@@ -3968,31 +3958,32 @@
 #. Away stuff
 #: ../libpurple/protocols/gg/gg.c:1014 ../libpurple/protocols/irc/irc.c:528
 #: ../libpurple/protocols/irc/msgs.c:310
-#: ../libpurple/protocols/jabber/buddy.c:2040
-#: ../libpurple/protocols/novell/novell.c:2824
+#: ../libpurple/protocols/jabber/buddy.c:2037
+#: ../libpurple/protocols/novell/novell.c:2819
 #: ../libpurple/protocols/oscar/oscar.c:733
-#: ../libpurple/protocols/oscar/oscar.c:4543
-#: ../libpurple/protocols/oscar/oscar.c:5630
+#: ../libpurple/protocols/oscar/oscar.c:4547
+#: ../libpurple/protocols/oscar/oscar.c:5632
 #: ../libpurple/protocols/qq/qq.c:180 ../libpurple/protocols/qq/qq.c:284
 #: ../libpurple/protocols/silc/buddy.c:1476
 #: ../libpurple/protocols/silc10/buddy.c:1476
-#: ../libpurple/protocols/yahoo/yahoo.c:3652
-#: ../libpurple/protocols/yahoo/yahoo.c:3726 ../libpurple/status.c:158
-#: ../pidgin/gtkdocklet.c:442 ../pidgin/gtkprefs.c:1941
+#: ../libpurple/protocols/yahoo/yahoo.c:3653
+#: ../libpurple/protocols/yahoo/yahoo.c:3727 ../libpurple/status.c:158
+#: ../pidgin/gtkdocklet.c:442 ../pidgin/gtkprefs.c:1939
 #: ../pidgin/gtkstatusbox.c:1058
+#, c-format
 msgid "Away"
 msgstr "Trạng thái"
 
 #: ../libpurple/protocols/gg/gg.c:1043 ../libpurple/protocols/gg/gg.c:1117
-#: ../libpurple/protocols/oscar/oscar.c:2695
-#: ../libpurple/protocols/oscar/oscar.c:3695
+#: ../libpurple/protocols/oscar/oscar.c:2699
+#: ../libpurple/protocols/oscar/oscar.c:3699
 msgid "UIN"
 msgstr "UIN"
 
 #: ../libpurple/protocols/gg/gg.c:1046 ../libpurple/protocols/gg/gg.c:1120
-#: ../libpurple/protocols/jabber/buddy.c:2213
-#: ../libpurple/protocols/jabber/buddy.c:2389
-#: ../libpurple/protocols/oscar/oscar.c:3706
+#: ../libpurple/protocols/jabber/buddy.c:2210
+#: ../libpurple/protocols/jabber/buddy.c:2386
+#: ../libpurple/protocols/oscar/oscar.c:3710
 #: ../libpurple/protocols/silc/ops.c:990
 #: ../libpurple/protocols/silc10/ops.c:1024
 msgid "First Name"
@@ -4004,7 +3995,7 @@
 msgstr "Năm sinh"
 
 #: ../libpurple/protocols/gg/gg.c:1111 ../libpurple/protocols/gg/gg.c:1180
-#: ../libpurple/protocols/oscar/oscar.c:3907
+#: ../libpurple/protocols/oscar/oscar.c:3911
 #, fuzzy
 msgid "Unable to display the search results."
 msgstr "Không ghi được tập tin %s."
@@ -4057,7 +4048,7 @@
 msgid "Connection failed."
 msgstr "Lỗi kết nối từ xa"
 
-#: ../libpurple/protocols/gg/gg.c:1621 ../libpurple/protocols/msn/msn.c:621
+#: ../libpurple/protocols/gg/gg.c:1621 ../libpurple/protocols/msn/msn.c:559
 #, fuzzy
 msgid "Blocked"
 msgstr "Chặn"
@@ -4212,7 +4203,7 @@
 
 #: ../libpurple/protocols/irc/irc.c:127 ../libpurple/protocols/irc/irc.c:165
 #: ../libpurple/protocols/irc/irc.c:612 ../libpurple/protocols/irc/irc.c:637
-#: ../libpurple/protocols/myspace/myspace.c:2354
+#: ../libpurple/protocols/myspace/myspace.c:2356
 #, fuzzy
 msgid "Server has disconnected"
 msgstr "Mất kết nối"
@@ -4239,14 +4230,14 @@
 #. connect to the server
 #: ../libpurple/protocols/irc/irc.c:319
 #: ../libpurple/protocols/jabber/jabber.c:1280
-#: ../libpurple/protocols/msn/session.c:384
-#: ../libpurple/protocols/myspace/myspace.c:302
-#: ../libpurple/protocols/novell/novell.c:2187
+#: ../libpurple/protocols/msn/session.c:345
+#: ../libpurple/protocols/myspace/myspace.c:301
+#: ../libpurple/protocols/novell/novell.c:2182
 #: ../libpurple/protocols/oscar/oscar.c:1287
 #: ../libpurple/protocols/qq/qq.c:136
 #: ../libpurple/protocols/sametime/sametime.c:3723
-#: ../libpurple/protocols/simple/simple.c:1718
-#: ../libpurple/protocols/yahoo/yahoo.c:2938
+#: ../libpurple/protocols/simple/simple.c:1716
+#: ../libpurple/protocols/yahoo/yahoo.c:2939
 #: ../libpurple/protocols/zephyr/zephyr.c:1621 ../pidgin/gtkstatusbox.c:662
 msgid "Connecting"
 msgstr "Kết nối"
@@ -4260,20 +4251,20 @@
 #. TODO: try other ports if in auto mode, then save
 #. * working port and try that first next time.
 #: ../libpurple/protocols/irc/irc.c:338
-#: ../libpurple/protocols/myspace/myspace.c:318
+#: ../libpurple/protocols/myspace/myspace.c:317
 #: ../libpurple/protocols/simple/simple.c:464
-#: ../libpurple/protocols/simple/simple.c:1633
+#: ../libpurple/protocols/simple/simple.c:1631
 msgid "Couldn't create socket"
 msgstr "Không tạo được socket"
 
 #: ../libpurple/protocols/irc/irc.c:421
-#: ../libpurple/protocols/myspace/myspace.c:2467
+#: ../libpurple/protocols/myspace/myspace.c:2469
 #: ../libpurple/protocols/oscar/oscar.c:1283
 msgid "Couldn't connect to host"
 msgstr "Không kết nối được với máy chủ"
 
 #: ../libpurple/protocols/irc/irc.c:609 ../libpurple/protocols/irc/irc.c:634
-#: ../libpurple/protocols/myspace/myspace.c:2350
+#: ../libpurple/protocols/myspace/myspace.c:2352
 msgid "Read error"
 msgstr "Lỗi đọc"
 
@@ -4315,22 +4306,22 @@
 
 #. host to connect to
 #: ../libpurple/protocols/irc/irc.c:940 ../libpurple/protocols/irc/msgs.c:323
-#: ../libpurple/protocols/msn/msn.c:2297
-#: ../libpurple/protocols/oscar/oscar.c:6669
+#: ../libpurple/protocols/msn/msn.c:2185
+#: ../libpurple/protocols/oscar/oscar.c:6671
 #: ../libpurple/protocols/qq/qq.c:755
 #: ../libpurple/protocols/sametime/sametime.c:5727
 #: ../libpurple/protocols/silc/ops.c:1249
 #: ../libpurple/protocols/silc/ops.c:1341
 #: ../libpurple/protocols/silc10/ops.c:1244
 #: ../libpurple/protocols/silc10/ops.c:1347
-#: ../libpurple/protocols/simple/simple.c:1898
+#: ../libpurple/protocols/simple/simple.c:1896
 #: ../libpurple/protocols/toc/toc.c:2327
 msgid "Server"
 msgstr "Máy chủ"
 
 #. port to connect to
-#: ../libpurple/protocols/irc/irc.c:943 ../libpurple/protocols/msn/msn.c:2302
-#: ../libpurple/protocols/oscar/oscar.c:6672
+#: ../libpurple/protocols/irc/irc.c:943 ../libpurple/protocols/msn/msn.c:2190
+#: ../libpurple/protocols/oscar/oscar.c:6674
 #: ../libpurple/protocols/qq/qq.c:758
 #: ../libpurple/protocols/sametime/sametime.c:5732
 #: ../libpurple/protocols/silc/silc.c:1918
@@ -4405,7 +4396,7 @@
 msgstr " <i>(identified)</i>"
 
 #: ../libpurple/protocols/irc/msgs.c:303
-#: ../libpurple/protocols/oscar/oscar.c:3696
+#: ../libpurple/protocols/oscar/oscar.c:3700
 #: ../libpurple/protocols/silc/ops.c:1418
 #: ../libpurple/protocols/silc10/ops.c:1414
 msgid "Nick"
@@ -4667,7 +4658,7 @@
 msgstr ""
 
 #: ../libpurple/protocols/irc/parse.c:137
-#: ../libpurple/protocols/jabber/jabber.c:2299
+#: ../libpurple/protocols/jabber/jabber.c:2261
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr ""
 
@@ -4792,7 +4783,7 @@
 msgid "Ad-Hoc Command Failed"
 msgstr "Lệnh"
 
-#: ../libpurple/protocols/jabber/adhoccommands.c:176
+#: ../libpurple/protocols/jabber/adhoccommands.c:173
 #, fuzzy
 msgid "execute"
 msgstr "Không mong đợi"
@@ -4937,15 +4928,15 @@
 
 #: ../libpurple/protocols/jabber/buddy.c:300
 #: ../libpurple/protocols/jabber/buddy.c:1250
-#: ../libpurple/protocols/msn/msn.c:1768
-#: ../libpurple/protocols/oscar/oscar.c:3745
+#: ../libpurple/protocols/msn/msn.c:1658
+#: ../libpurple/protocols/oscar/oscar.c:3749
 msgid "Birthday"
 msgstr "Ngày sinh"
 
 #: ../libpurple/protocols/jabber/buddy.c:301
 #: ../libpurple/protocols/jabber/buddy.c:1365
 #: ../libpurple/protocols/jabber/chat.c:775
-#: ../libpurple/protocols/jabber/usermood.c:175 ../pidgin/gtkblist.c:3314
+#: ../libpurple/protocols/jabber/usermood.c:175 ../pidgin/gtkblist.c:3116
 #: ../pidgin/gtkprefs.c:739
 msgid "Description"
 msgstr "Mô tả"
@@ -5257,7 +5248,7 @@
 
 #: ../libpurple/protocols/jabber/buddy.c:921
 #: ../libpurple/protocols/jabber/buddy.c:1081
-#: ../libpurple/protocols/oscar/oscar.c:2902
+#: ../libpurple/protocols/oscar/oscar.c:2906
 #, fuzzy
 msgid "Capabilities"
 msgstr "<b> Khả năng:</b> "
@@ -5286,8 +5277,8 @@
 
 #: ../libpurple/protocols/jabber/buddy.c:1270
 #: ../libpurple/protocols/jabber/jabber.c:952
-#: ../libpurple/protocols/oscar/oscar.c:3784
-#: ../libpurple/protocols/oscar/oscar.c:3797
+#: ../libpurple/protocols/oscar/oscar.c:3788
+#: ../libpurple/protocols/oscar/oscar.c:3801
 #: ../libpurple/protocols/qq/buddy_info.c:56
 #: ../libpurple/protocols/silc/ops.c:1030
 #: ../libpurple/protocols/silc10/ops.c:1064
@@ -5306,114 +5297,115 @@
 msgid "Logo"
 msgstr "Logo"
 
-#: ../libpurple/protocols/jabber/buddy.c:1945
+#: ../libpurple/protocols/jabber/buddy.c:1942
 msgid "Un-hide From"
 msgstr "Không-ẩn từ"
 
-#: ../libpurple/protocols/jabber/buddy.c:1949
+#: ../libpurple/protocols/jabber/buddy.c:1946
 msgid "Temporarily Hide From"
 msgstr "Ản tạm thời từ"
 
 #. && NOT ME
-#: ../libpurple/protocols/jabber/buddy.c:1957
+#: ../libpurple/protocols/jabber/buddy.c:1954
 msgid "Cancel Presence Notification"
 msgstr "Bỏ qua thông báo hiện thời"
 
-#: ../libpurple/protocols/jabber/buddy.c:1964
+#: ../libpurple/protocols/jabber/buddy.c:1961
 msgid "(Re-)Request authorization"
 msgstr "Yêu cầu xác thực"
 
 #. if(NOT ME)
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
-#: ../libpurple/protocols/jabber/buddy.c:1973
+#: ../libpurple/protocols/jabber/buddy.c:1970
 msgid "Unsubscribe"
 msgstr "Không đăng ký"
 
-#: ../libpurple/protocols/jabber/buddy.c:1988
+#: ../libpurple/protocols/jabber/buddy.c:1985
 #, fuzzy
 msgid "Log In"
 msgstr "Đăng nhập"
 
-#: ../libpurple/protocols/jabber/buddy.c:1992
+#: ../libpurple/protocols/jabber/buddy.c:1989
 #, fuzzy
 msgid "Log Out"
 msgstr "%s đăng xuất."
 
-#: ../libpurple/protocols/jabber/buddy.c:2038
+#: ../libpurple/protocols/jabber/buddy.c:2035
 #: ../libpurple/protocols/jabber/jabber.c:1553
 msgid "Chatty"
 msgstr "Thích chat"
 
-#: ../libpurple/protocols/jabber/buddy.c:2042
+#: ../libpurple/protocols/jabber/buddy.c:2039
 msgid "Extended Away"
 msgstr "Trạng thái mở rộng"
 
-#: ../libpurple/protocols/jabber/buddy.c:2044
+#: ../libpurple/protocols/jabber/buddy.c:2041
 #: ../libpurple/protocols/jabber/jabber.c:1622
 #: ../libpurple/protocols/oscar/oscar.c:727
-#: ../libpurple/protocols/oscar/oscar.c:5806
+#: ../libpurple/protocols/oscar/oscar.c:5808
 #: ../libpurple/protocols/sametime/sametime.c:3297
+#, c-format
 msgid "Do Not Disturb"
 msgstr "Xin đừng quấy rầy"
 
-#: ../libpurple/protocols/jabber/buddy.c:2211
+#: ../libpurple/protocols/jabber/buddy.c:2208
 msgid "JID"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:2215
-#: ../libpurple/protocols/jabber/buddy.c:2394
-#: ../libpurple/protocols/oscar/oscar.c:3707
+#: ../libpurple/protocols/jabber/buddy.c:2212
+#: ../libpurple/protocols/jabber/buddy.c:2391
+#: ../libpurple/protocols/oscar/oscar.c:3711
 msgid "Last Name"
 msgstr "Họ"
 
-#: ../libpurple/protocols/jabber/buddy.c:2247
+#: ../libpurple/protocols/jabber/buddy.c:2244
 msgid "The following are the results of your search"
 msgstr ""
 
 #. current comment from Jabber User Directory users.jabber.org
-#: ../libpurple/protocols/jabber/buddy.c:2322
+#: ../libpurple/protocols/jabber/buddy.c:2319
 msgid ""
 "Find a contact by entering the search criteria in the given fields. Note: "
 "Each field supports wild card searches (%)"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:2342
+#: ../libpurple/protocols/jabber/buddy.c:2339
 #, fuzzy
 msgid "Directory Query Failed"
 msgstr "Kết nối trực tiếp ICQ"
 
-#: ../libpurple/protocols/jabber/buddy.c:2343
+#: ../libpurple/protocols/jabber/buddy.c:2340
 #, fuzzy
 msgid "Could not query the directory server."
 msgstr "Không thể kết nối để truyền đi"
 
 #. Try to translate the message (see static message
 #. list in jabber_user_dir_comments[])
-#: ../libpurple/protocols/jabber/buddy.c:2377
+#: ../libpurple/protocols/jabber/buddy.c:2374
 #, fuzzy, c-format
 msgid "Server Instructions: %s"
 msgstr "Thông tin về công việc"
 
-#: ../libpurple/protocols/jabber/buddy.c:2384
+#: ../libpurple/protocols/jabber/buddy.c:2381
 msgid "Fill in one or more fields to search for any matching XMPP users."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:2404
-#: ../libpurple/protocols/novell/novell.c:1490
-#: ../libpurple/protocols/oscar/oscar.c:3710
-#: ../libpurple/protocols/oscar/oscar.c:3719
+#: ../libpurple/protocols/jabber/buddy.c:2401
+#: ../libpurple/protocols/novell/novell.c:1488
+#: ../libpurple/protocols/oscar/oscar.c:3714
+#: ../libpurple/protocols/oscar/oscar.c:3723
 msgid "E-Mail Address"
 msgstr "Địa chỉ e-mail"
 
-#: ../libpurple/protocols/jabber/buddy.c:2413
-#: ../libpurple/protocols/jabber/buddy.c:2414
+#: ../libpurple/protocols/jabber/buddy.c:2410
+#: ../libpurple/protocols/jabber/buddy.c:2411
 #, fuzzy
 msgid "Search for XMPP users"
 msgstr "Tìm _kiếm:"
 
 #. "Search"
-#: ../libpurple/protocols/jabber/buddy.c:2415
+#: ../libpurple/protocols/jabber/buddy.c:2412
 #: ../libpurple/protocols/qq/group.c:123
 #: ../libpurple/protocols/qq/group_im.c:147
 #: ../libpurple/protocols/qq/sys_msg.c:174
@@ -5425,28 +5417,28 @@
 msgid "Search"
 msgstr "Tìm kiếm"
 
-#: ../libpurple/protocols/jabber/buddy.c:2430
+#: ../libpurple/protocols/jabber/buddy.c:2427
 #, fuzzy
 msgid "Invalid Directory"
 msgstr "Lỗi không hợp lệ"
 
-#: ../libpurple/protocols/jabber/buddy.c:2447
+#: ../libpurple/protocols/jabber/buddy.c:2444
 #, fuzzy
 msgid "Enter a User Directory"
 msgstr "Không thể gửi tập tin có 0 byte."
 
-#: ../libpurple/protocols/jabber/buddy.c:2448
+#: ../libpurple/protocols/jabber/buddy.c:2445
 #, fuzzy
 msgid "Select a user directory to search"
 msgstr "Chọn màu chữ"
 
-#: ../libpurple/protocols/jabber/buddy.c:2451
+#: ../libpurple/protocols/jabber/buddy.c:2448
 #, fuzzy
 msgid "Search Directory"
 msgstr "Tìm _kiếm:"
 
 #: ../libpurple/protocols/jabber/chat.c:41
-#: ../libpurple/protocols/oscar/oscar.c:5290
+#: ../libpurple/protocols/oscar/oscar.c:5294
 #: ../libpurple/protocols/yahoo/yahoochat.c:1048
 msgid "_Room:"
 msgstr "_Phòng:"
@@ -5561,9 +5553,9 @@
 msgstr "Lỗi đọc"
 
 #: ../libpurple/protocols/jabber/jabber.c:482
-#: ../libpurple/protocols/oscar/flap_connection.c:396
-#: ../libpurple/protocols/yahoo/yahoo.c:2557
-#: ../libpurple/protocols/yahoo/yahoo.c:2589
+#: ../libpurple/protocols/oscar/flap_connection.c:394
+#: ../libpurple/protocols/yahoo/yahoo.c:2558
+#: ../libpurple/protocols/yahoo/yahoo.c:2590
 #, c-format
 msgid ""
 "Could not establish a connection with the server:\n"
@@ -5627,8 +5619,8 @@
 msgstr "Đã đăng ký rồi"
 
 #: ../libpurple/protocols/jabber/jabber.c:962
-#: ../libpurple/protocols/oscar/oscar.c:3786
-#: ../libpurple/protocols/oscar/oscar.c:3799
+#: ../libpurple/protocols/oscar/oscar.c:3790
+#: ../libpurple/protocols/oscar/oscar.c:3803
 msgid "State"
 msgstr "Bang"
 
@@ -5713,7 +5705,7 @@
 msgstr "Khởi tạo Stream"
 
 #: ../libpurple/protocols/jabber/jabber.c:1293
-#: ../libpurple/protocols/msn/session.c:390
+#: ../libpurple/protocols/msn/session.c:351
 msgid "Authenticating"
 msgstr "Xác thực"
 
@@ -5726,7 +5718,7 @@
 #: ../libpurple/protocols/jabber/jabber.c:1909
 #: ../libpurple/protocols/jabber/jabber.c:1945
 #: ../libpurple/protocols/oscar/oscar.c:826
-#: ../libpurple/protocols/oscar/oscar.c:5600
+#: ../libpurple/protocols/oscar/oscar.c:5602
 msgid "Not Authorized"
 msgstr "Không xác thực được"
 
@@ -5901,7 +5893,7 @@
 msgstr "Hãy nhập mật khẩu mới"
 
 #: ../libpurple/protocols/jabber/jabber.c:1749
-#: ../libpurple/protocols/oscar/oscar.c:6386
+#: ../libpurple/protocols/oscar/oscar.c:6388
 #: ../libpurple/protocols/silc/silc.c:1093
 #: ../libpurple/protocols/silc10/silc.c:1004
 msgid "Set User Info..."
@@ -5909,7 +5901,7 @@
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
 #: ../libpurple/protocols/jabber/jabber.c:1754
-#: ../libpurple/protocols/oscar/oscar.c:6397
+#: ../libpurple/protocols/oscar/oscar.c:6399
 #: ../libpurple/protocols/silc/silc.c:1089
 #: ../libpurple/protocols/silc10/silc.c:1000
 msgid "Change Password..."
@@ -6187,85 +6179,67 @@
 msgid "Unable to buzz, because the user %s does not support it."
 msgstr "Không thể phát âm thanh vì tập tin được chọn (%s) không tồn tại."
 
-#: ../libpurple/protocols/jabber/jabber.c:2250
-#: ../libpurple/protocols/yahoo/yahoo.c:4118
-msgid "Buzz"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/jabber.c:2251
-#: ../libpurple/protocols/jabber/message.c:307
-#: ../libpurple/protocols/yahoo/yahoo.c:4119
-#, fuzzy, c-format
-msgid "%s has buzzed you!"
-msgstr "Nhập người dùng muốn chặn."
-
-#: ../libpurple/protocols/jabber/jabber.c:2252
-#: ../libpurple/protocols/yahoo/yahoo.c:4120
-#, c-format
-msgid "Buzzing %s..."
-msgstr ""
-
-#: ../libpurple/protocols/jabber/jabber.c:2291
+#: ../libpurple/protocols/jabber/jabber.c:2253
 #, fuzzy
 msgid "config:  Configure a chat room."
 msgstr "Vào phòng Chat"
 
-#: ../libpurple/protocols/jabber/jabber.c:2295
+#: ../libpurple/protocols/jabber/jabber.c:2257
 #, fuzzy
 msgid "configure:  Configure a chat room."
 msgstr "Vào phòng Chat"
 
-#: ../libpurple/protocols/jabber/jabber.c:2304
+#: ../libpurple/protocols/jabber/jabber.c:2266
 msgid "part [room]:  Leave the room."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2309
+#: ../libpurple/protocols/jabber/jabber.c:2271
 msgid "register:  Register with a chat room."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2315
+#: ../libpurple/protocols/jabber/jabber.c:2277
 msgid "topic [new topic]:  View or change the topic."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2321
+#: ../libpurple/protocols/jabber/jabber.c:2283
 msgid "ban &lt;user&gt; [room]:  Ban a user from the room."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2327
+#: ../libpurple/protocols/jabber/jabber.c:2289
 msgid ""
 "affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
 "affiliation with the room."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2333
+#: ../libpurple/protocols/jabber/jabber.c:2295
 msgid ""
 "role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
 "role in the room."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2339
+#: ../libpurple/protocols/jabber/jabber.c:2301
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2345
+#: ../libpurple/protocols/jabber/jabber.c:2307
 msgid "join: &lt;room&gt; [server]:  Join a chat on this server."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2351
+#: ../libpurple/protocols/jabber/jabber.c:2313
 msgid "kick &lt;user&gt; [room]:  Kick a user from the room."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2356
+#: ../libpurple/protocols/jabber/jabber.c:2318
 msgid ""
 "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2362
+#: ../libpurple/protocols/jabber/jabber.c:2324
 msgid "ping &lt;jid&gt;:\tPing a user/component/server."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2367
-#: ../libpurple/protocols/yahoo/yahoo.c:4144
+#: ../libpurple/protocols/jabber/jabber.c:2329
+#: ../libpurple/protocols/yahoo/yahoo.c:4145
 msgid "buzz: Buzz a user to get their attention"
 msgstr ""
 
@@ -6305,8 +6279,8 @@
 msgstr ""
 
 #: ../libpurple/protocols/jabber/libxmpp.c:224
-#: ../libpurple/protocols/myspace/myspace.c:3275
-#: ../libpurple/protocols/simple/simple.c:1904
+#: ../libpurple/protocols/myspace/myspace.c:3277
+#: ../libpurple/protocols/simple/simple.c:1902
 #, fuzzy
 msgid "Connect port"
 msgstr "Kết nối"
@@ -6315,7 +6289,7 @@
 #. * able to set the first port to try (like LastConnectedPort in Windows client).
 #. Account options
 #: ../libpurple/protocols/jabber/libxmpp.c:228
-#: ../libpurple/protocols/myspace/myspace.c:3272
+#: ../libpurple/protocols/myspace/myspace.c:3274
 #: ../libpurple/protocols/silc/silc.c:1914
 #: ../libpurple/protocols/silc10/silc.c:1857 ../pidgin/gtkaccount.c:837
 msgid "Connect server"
@@ -6351,6 +6325,12 @@
 msgid "XMPP Message Error"
 msgstr "Lỗi Thông Điệp Jabber"
 
+#: ../libpurple/protocols/jabber/message.c:307
+#: ../libpurple/protocols/yahoo/yahoo.c:4120
+#, fuzzy, c-format
+msgid "%s has buzzed you!"
+msgstr "Nhập người dùng muốn chặn."
+
 #: ../libpurple/protocols/jabber/message.c:407
 #, c-format
 msgid " (Code %s)"
@@ -6360,16 +6340,16 @@
 msgid "XML Parse error"
 msgstr "Lỗi phân tích XML"
 
-#: ../libpurple/protocols/jabber/presence.c:422
+#: ../libpurple/protocols/jabber/presence.c:427
 msgid "Unknown Error in presence"
 msgstr "Hiện tại không xác định được lỗi gì"
 
-#: ../libpurple/protocols/jabber/presence.c:503
-#: ../libpurple/protocols/jabber/presence.c:504
+#: ../libpurple/protocols/jabber/presence.c:508
+#: ../libpurple/protocols/jabber/presence.c:509
 msgid "Create New Room"
 msgstr "Tạo phòng mới"
 
-#: ../libpurple/protocols/jabber/presence.c:505
+#: ../libpurple/protocols/jabber/presence.c:510
 msgid ""
 "You are creating a new room.  Would you like to configure it, or accept the "
 "default settings?"
@@ -6377,22 +6357,22 @@
 "Bạn đang tạo phòng mới. Bạn muốn cấu hình nó không hoặc chấp nhận các thiết "
 "lập mặc định?"
 
-#: ../libpurple/protocols/jabber/presence.c:511
+#: ../libpurple/protocols/jabber/presence.c:516
 #, fuzzy
 msgid "_Configure Room"
 msgstr "Cấu hình phòng"
 
-#: ../libpurple/protocols/jabber/presence.c:512
+#: ../libpurple/protocols/jabber/presence.c:517
 #, fuzzy
 msgid "_Accept Defaults"
 msgstr "Chấp nhận mặc định"
 
-#: ../libpurple/protocols/jabber/presence.c:554
+#: ../libpurple/protocols/jabber/presence.c:559
 #, fuzzy, c-format
 msgid "Error in chat %s"
 msgstr "Lỗi lưu ảnh: %s"
 
-#: ../libpurple/protocols/jabber/presence.c:558
+#: ../libpurple/protocols/jabber/presence.c:563
 #, fuzzy, c-format
 msgid "Error joining chat %s"
 msgstr "Lỗi lưu ảnh: %s"
@@ -6469,7 +6449,7 @@
 "something appropriate."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/usernick.c:100
+#: ../libpurple/protocols/jabber/usernick.c:99
 #, fuzzy
 msgid "Set Nickname..."
 msgstr "Biệt danh"
@@ -6484,29 +6464,19 @@
 msgid "Select an action"
 msgstr "Chọn tập tin"
 
-#: ../libpurple/protocols/msn/contact.c:207
-#, fuzzy
-msgid "Unable to connect to contact server"
-msgstr "Không thể kết nối đến máy chủ"
-
-#: ../libpurple/protocols/msn/contact.c:954
-#, fuzzy
-msgid "Unable to retrieve MSN Address Book"
-msgstr "Không thể nhận danh sách Buddy"
-
-#: ../libpurple/protocols/msn/dialog.c:118
+#: ../libpurple/protocols/msn/dialog.c:110
 #, c-format
 msgid "Buddy list synchronization issue in %s (%s)"
 msgstr ""
 
-#: ../libpurple/protocols/msn/dialog.c:124
+#: ../libpurple/protocols/msn/dialog.c:116
 #, c-format
 msgid ""
 "%s on the local list is inside the group \"%s\" but not on the server list. "
 "Do you want this buddy to be added?"
 msgstr ""
 
-#: ../libpurple/protocols/msn/dialog.c:132
+#: ../libpurple/protocols/msn/dialog.c:124
 #, c-format
 msgid ""
 "%s is on the local list but not on the server list. Do you want this buddy "
@@ -6514,209 +6484,241 @@
 msgstr ""
 
 #: ../libpurple/protocols/msn/error.c:36
-#, fuzzy
+#, fuzzy, c-format
 msgid "Unable to parse message"
 msgstr "Không thể phân tích thông điệp."
 
 #: ../libpurple/protocols/msn/error.c:41
-#, fuzzy
+#, fuzzy, c-format
 msgid "Syntax Error (probably a client bug)"
 msgstr "Lỗi cú pháp (có thể Gaim có lỗi)"
 
 #: ../libpurple/protocols/msn/error.c:46
-#, fuzzy
+#, fuzzy, c-format
 msgid "Invalid e-mail address"
 msgstr "Xử lý phòng không hợp lệ"
 
 #: ../libpurple/protocols/msn/error.c:49
-#, fuzzy
+#, fuzzy, c-format
 msgid "User does not exist"
 msgstr "Tập tin đó không tồn tại."
 
 #: ../libpurple/protocols/msn/error.c:53
-#, fuzzy
+#, fuzzy, c-format
 msgid "Fully qualified domain name missing"
 msgstr "Thiếu tên miền đăng ký hoàn chỉnh"
 
 #: ../libpurple/protocols/msn/error.c:56
-#, fuzzy
+#, fuzzy, c-format
 msgid "Already logged in"
 msgstr "Đã đăng nhập rồi"
 
 #: ../libpurple/protocols/msn/error.c:59
-#, fuzzy
+#, fuzzy, c-format
 msgid "Invalid screen name"
 msgstr "Tên hiển thị MSN không hợp lệ"
 
 #: ../libpurple/protocols/msn/error.c:62
-#, fuzzy
+#, fuzzy, c-format
 msgid "Invalid friendly name"
 msgstr "Tên thân thiện không hợp lệ"
 
 #: ../libpurple/protocols/msn/error.c:65
-#, fuzzy
+#, fuzzy, c-format
 msgid "List full"
 msgstr "Danh sách đã đầy"
 
 #: ../libpurple/protocols/msn/error.c:68
+#, c-format
 msgid "Already there"
 msgstr "Đã ở đó rồi"
 
 #: ../libpurple/protocols/msn/error.c:72
+#, c-format
 msgid "Not on list"
 msgstr "Không trong danh sách"
 
 #: ../libpurple/protocols/msn/error.c:75
 #: ../libpurple/protocols/zephyr/zephyr.c:756
+#, c-format
 msgid "User is offline"
 msgstr "Người dùng chưa kết nối"
 
 #: ../libpurple/protocols/msn/error.c:78
+#, c-format
 msgid "Already in the mode"
 msgstr "Đã trong cách thức này rồi"
 
 #: ../libpurple/protocols/msn/error.c:82
+#, c-format
 msgid "Already in opposite list"
 msgstr "Đã trong danh sách đối diện rồi"
 
 #: ../libpurple/protocols/msn/error.c:86
+#, c-format
 msgid "Too many groups"
 msgstr "Có quá nhiều nhóm"
 
 #: ../libpurple/protocols/msn/error.c:89
+#, c-format
 msgid "Invalid group"
 msgstr "Nhóm không hợp lệ"
 
 #: ../libpurple/protocols/msn/error.c:92
+#, c-format
 msgid "User not in group"
 msgstr "Người dùng không có trong nhóm"
 
 #: ../libpurple/protocols/msn/error.c:95
+#, c-format
 msgid "Group name too long"
 msgstr "Tên nhóm quá dài"
 
 #: ../libpurple/protocols/msn/error.c:98
+#, c-format
 msgid "Cannot remove group zero"
 msgstr "Không thể xóa bỏ nhóm rỗng"
 
 #: ../libpurple/protocols/msn/error.c:103
-#, fuzzy
+#, fuzzy, c-format
 msgid "Tried to add a user to a group that doesn't exist"
 msgstr "Cố thêm một địa chỉ vào một nhóm không tồn tại"
 
 #: ../libpurple/protocols/msn/error.c:107
+#, c-format
 msgid "Switchboard failed"
 msgstr "Bảng chuyển đổi bị lỗi"
 
 #: ../libpurple/protocols/msn/error.c:111
-#, fuzzy
+#, fuzzy, c-format
 msgid "Notify transfer failed"
 msgstr "Lỗi truyền thông báo"
 
 #: ../libpurple/protocols/msn/error.c:116
+#, c-format
 msgid "Required fields missing"
 msgstr "Thiếu các trường được yêu cầu"
 
 #: ../libpurple/protocols/msn/error.c:120
+#, c-format
 msgid "Too many hits to a FND"
 msgstr "Có quá kết nối tới FND"
 
 #: ../libpurple/protocols/msn/error.c:124
 #: ../libpurple/protocols/oscar/oscar.c:120
+#, c-format
 msgid "Not logged in"
 msgstr "Chưa đăng nhập"
 
 #: ../libpurple/protocols/msn/error.c:128
-#, fuzzy
+#, fuzzy, c-format
 msgid "Service temporarily unavailable"
 msgstr "Tạm thời không có dịch vụ thư mục."
 
 #: ../libpurple/protocols/msn/error.c:131
+#, c-format
 msgid "Database server error"
 msgstr "Có lỗi tại máy chủ cơ sở dữ liệu"
 
 #: ../libpurple/protocols/msn/error.c:135
-#, fuzzy
+#, fuzzy, c-format
 msgid "Command disabled"
 msgstr "Lệnh"
 
 #: ../libpurple/protocols/msn/error.c:139
+#, c-format
 msgid "File operation error"
 msgstr "Lỗi thực thi tập tin"
 
 #: ../libpurple/protocols/msn/error.c:143
+#, c-format
 msgid "Memory allocation error"
 msgstr "Lỗi cấp phát bộ nhớ"
 
 #: ../libpurple/protocols/msn/error.c:147
+#, c-format
 msgid "Wrong CHL value sent to server"
 msgstr "Giá trị CHL gửi tới máy chủ bị sai"
 
 #: ../libpurple/protocols/msn/error.c:152
+#, c-format
 msgid "Server busy"
 msgstr "Máy chủ bận"
 
 #: ../libpurple/protocols/msn/error.c:155
 #: ../libpurple/protocols/msn/error.c:170
 #: ../libpurple/protocols/msn/error.c:230
+#, c-format
 msgid "Server unavailable"
 msgstr "Máy chủ hiện không có"
 
 #: ../libpurple/protocols/msn/error.c:158
-#, fuzzy
+#, fuzzy, c-format
 msgid "Peer notification server down"
 msgstr "Máy chủ thông báo ngang hàng ngừng hoạt động"
 
 #: ../libpurple/protocols/msn/error.c:162
+#, c-format
 msgid "Database connect error"
 msgstr "Có lỗi khi kết nối tới cơ sở dữ liệu"
 
 #: ../libpurple/protocols/msn/error.c:167
+#, c-format
 msgid "Server is going down (abandon ship)"
 msgstr "Máy chủ đang ngừng  (abandon ship)"
 
 #: ../libpurple/protocols/msn/error.c:174
+#, c-format
 msgid "Error creating connection"
 msgstr "Lỗi khi tạo kết nối"
 
 #: ../libpurple/protocols/msn/error.c:179
+#, c-format
 msgid "CVR parameters are either unknown or not allowed"
 msgstr "Tham số CVR hoặc không xác định được hoặc không được phép dùng"
 
 #: ../libpurple/protocols/msn/error.c:183
+#, c-format
 msgid "Unable to write"
 msgstr "Không ghi được"
 
 #: ../libpurple/protocols/msn/error.c:186
+#, c-format
 msgid "Session overload"
 msgstr "Phiên kết nối quá tải"
 
 #: ../libpurple/protocols/msn/error.c:190
+#, c-format
 msgid "User is too active"
 msgstr "Người dùng quá hoạt náo"
 
 #: ../libpurple/protocols/msn/error.c:193
+#, c-format
 msgid "Too many sessions"
 msgstr "Quá nhiều phiên kết nối"
 
 #: ../libpurple/protocols/msn/error.c:196
-#, fuzzy
+#, fuzzy, c-format
 msgid "Passport not verified"
 msgstr "Tài khoản Passport chưa được thẩm định"
 
 #: ../libpurple/protocols/msn/error.c:199
+#, c-format
 msgid "Bad friend file"
 msgstr "Tập tin bạn bè hỏng"
 
 #: ../libpurple/protocols/msn/error.c:203
+#, c-format
 msgid "Not expected"
 msgstr "Không mong đợi"
 
 #: ../libpurple/protocols/msn/error.c:209
+#, c-format
 msgid "Friendly name changes too rapidly"
 msgstr "Tên thân thiện thay đổi quá nhanh"
 
 #: ../libpurple/protocols/msn/error.c:218
+#, c-format
 msgid "Server too busy"
 msgstr "Máy chủ bận"
 
@@ -6725,27 +6727,32 @@
 #: ../libpurple/protocols/silc/silc.c:233
 #: ../libpurple/protocols/silc10/ops.c:1709
 #: ../libpurple/protocols/toc/toc.c:728 ../libpurple/proxy.c:1380
+#, c-format
 msgid "Authentication failed"
 msgstr "Không xác thực được"
 
 #: ../libpurple/protocols/msn/error.c:225
+#, c-format
 msgid "Not allowed when offline"
 msgstr "Không được phép khi chưa kết nối"
 
 #: ../libpurple/protocols/msn/error.c:233
+#, c-format
 msgid "Not accepting new users"
 msgstr "Không chấp nhận người dùng mới"
 
 #: ../libpurple/protocols/msn/error.c:237
+#, c-format
 msgid "Kids Passport without parental consent"
 msgstr "Mật khẩu của trẻ không có sự đồng ý của cha mẹ"
 
 #: ../libpurple/protocols/msn/error.c:241
+#, c-format
 msgid "Passport account not yet verified"
 msgstr "Tài khoản Passport chưa được thẩm định"
 
 #: ../libpurple/protocols/msn/error.c:244
-#, fuzzy
+#, fuzzy, c-format
 msgid "Bad ticket"
 msgstr "Đánh Dấu Buddy"
 
@@ -6777,31 +6784,31 @@
 msgid "Your new MSN friendly name is too long."
 msgstr "Tên thân mật MSN bạn đặt quá dài."
 
-#: ../libpurple/protocols/msn/msn.c:285
+#: ../libpurple/protocols/msn/msn.c:282
 msgid "Set your friendly name."
 msgstr "Đặt tên thân mật của bạn"
 
-#: ../libpurple/protocols/msn/msn.c:286
+#: ../libpurple/protocols/msn/msn.c:283
 msgid "This is the name that other MSN buddies will see you as."
 msgstr "Người dùng MSN khác sẽ nhìn thấy bạn với tên này."
 
-#: ../libpurple/protocols/msn/msn.c:304
+#: ../libpurple/protocols/msn/msn.c:301
 msgid "Set your home phone number."
 msgstr "Nhập số điện thoại nhà."
 
-#: ../libpurple/protocols/msn/msn.c:321
+#: ../libpurple/protocols/msn/msn.c:318
 msgid "Set your work phone number."
 msgstr "Nhập số điện thoại chỗ làm."
 
-#: ../libpurple/protocols/msn/msn.c:338
+#: ../libpurple/protocols/msn/msn.c:335
 msgid "Set your mobile phone number."
 msgstr "Nhập số điện thoại di động của bạn."
 
-#: ../libpurple/protocols/msn/msn.c:353
+#: ../libpurple/protocols/msn/msn.c:350
 msgid "Allow MSN Mobile pages?"
 msgstr "Cho phép nhắn tin vào di động MSN?"
 
-#: ../libpurple/protocols/msn/msn.c:354
+#: ../libpurple/protocols/msn/msn.c:351
 msgid ""
 "Do you want to allow or disallow people on your buddy list to send you MSN "
 "Mobile pages to your cell phone or other mobile device?"
@@ -6809,372 +6816,368 @@
 "Bạn muốn cho phép hoặc cấm người khác gửi tin nhắn MSN vào điện thoại di "
 "động hay thiết bị di động nào khác của bạn hay không?"
 
-#: ../libpurple/protocols/msn/msn.c:360
+#: ../libpurple/protocols/msn/msn.c:357
 msgid "Allow"
 msgstr "Cho phép"
 
-#: ../libpurple/protocols/msn/msn.c:361
+#: ../libpurple/protocols/msn/msn.c:358
 msgid "Disallow"
 msgstr "Cấm"
 
-#: ../libpurple/protocols/msn/msn.c:377
+#: ../libpurple/protocols/msn/msn.c:374
 msgid "This Hotmail account may not be active."
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:403
+#: ../libpurple/protocols/msn/msn.c:400
 msgid "Send a mobile message."
 msgstr "Gửi tin nhắn tới di động."
 
-#: ../libpurple/protocols/msn/msn.c:405
+#: ../libpurple/protocols/msn/msn.c:402
 msgid "Page"
 msgstr "Nhắn tin"
 
-#: ../libpurple/protocols/msn/msn.c:610 ../libpurple/protocols/msn/msn.c:635
-#: ../libpurple/protocols/msn/msn.c:642 ../libpurple/protocols/msn/msn.c:649
-#: ../libpurple/protocols/msn/msn.c:656 ../libpurple/protocols/msn/msn.c:662
-#: ../libpurple/protocols/msn/msn.c:668
-#, fuzzy
-msgid "Current media"
-msgstr "Hiện thời trên"
-
-#: ../libpurple/protocols/msn/msn.c:647 ../libpurple/protocols/msn/state.c:33
-#: ../libpurple/protocols/yahoo/yahoo.c:3076
-#: ../libpurple/protocols/yahoo/yahoo.c:3760
+#: ../libpurple/protocols/msn/msn.c:549
+msgid "Has you"
+msgstr ""
+
+#: ../libpurple/protocols/msn/msn.c:579 ../libpurple/protocols/msn/state.c:33
+#: ../libpurple/protocols/yahoo/yahoo.c:3077
+#: ../libpurple/protocols/yahoo/yahoo.c:3761
 msgid "Be Right Back"
 msgstr "Sẽ quay lại ngay"
 
-#: ../libpurple/protocols/msn/msn.c:654 ../libpurple/protocols/msn/state.c:31
-#: ../libpurple/protocols/novell/novell.c:2827
-#: ../libpurple/protocols/novell/novell.c:2957
+#: ../libpurple/protocols/msn/msn.c:583 ../libpurple/protocols/msn/state.c:31
+#: ../libpurple/protocols/novell/novell.c:2822
+#: ../libpurple/protocols/novell/novell.c:2952
 #: ../libpurple/protocols/silc/buddy.c:1480
 #: ../libpurple/protocols/silc/silc.c:56
 #: ../libpurple/protocols/silc10/buddy.c:1480
 #: ../libpurple/protocols/silc10/silc.c:47
-#: ../libpurple/protocols/yahoo/yahoo.c:3078
-#: ../libpurple/protocols/yahoo/yahoo.c:3763
+#: ../libpurple/protocols/yahoo/yahoo.c:3079
+#: ../libpurple/protocols/yahoo/yahoo.c:3764
 msgid "Busy"
 msgstr "Đang bận"
 
-#: ../libpurple/protocols/msn/msn.c:660
-#: ../libpurple/protocols/yahoo/yahoo.c:3086
-#: ../libpurple/protocols/yahoo/yahoo.c:3775
+#: ../libpurple/protocols/msn/msn.c:587
+#: ../libpurple/protocols/yahoo/yahoo.c:3087
+#: ../libpurple/protocols/yahoo/yahoo.c:3776
 #, fuzzy
 msgid "On the Phone"
 msgstr "Đang bận nói điện thoại"
 
-#: ../libpurple/protocols/msn/msn.c:666
-#: ../libpurple/protocols/yahoo/yahoo.c:3090
-#: ../libpurple/protocols/yahoo/yahoo.c:3781
+#: ../libpurple/protocols/msn/msn.c:591
+#: ../libpurple/protocols/yahoo/yahoo.c:3091
+#: ../libpurple/protocols/yahoo/yahoo.c:3782
 #, fuzzy
 msgid "Out to Lunch"
 msgstr "Đi ăn trưa"
 
-#: ../libpurple/protocols/msn/msn.c:697
+#: ../libpurple/protocols/msn/msn.c:619
 #, fuzzy
 msgid "Set Friendly Name..."
 msgstr "Đặt tên thân mật"
 
-#: ../libpurple/protocols/msn/msn.c:702
+#: ../libpurple/protocols/msn/msn.c:624
 #, fuzzy
 msgid "Set Home Phone Number..."
 msgstr "Nhập số điện thoại nhà"
 
-#: ../libpurple/protocols/msn/msn.c:706
+#: ../libpurple/protocols/msn/msn.c:628
 #, fuzzy
 msgid "Set Work Phone Number..."
 msgstr "Nhập số điện thoại cơ quan"
 
-#: ../libpurple/protocols/msn/msn.c:710
+#: ../libpurple/protocols/msn/msn.c:632
 #, fuzzy
 msgid "Set Mobile Phone Number..."
 msgstr "Nhập số điện thoại di động"
 
-#: ../libpurple/protocols/msn/msn.c:716
+#: ../libpurple/protocols/msn/msn.c:638
 #, fuzzy
 msgid "Enable/Disable Mobile Devices..."
 msgstr "Cho phép/Không cho phép thiết bị di động"
 
-#: ../libpurple/protocols/msn/msn.c:721
+#: ../libpurple/protocols/msn/msn.c:643
 #, fuzzy
 msgid "Allow/Disallow Mobile Pages..."
 msgstr "Cho phép/Không cho phép tin nhắn tới thiết bị di động"
 
-#: ../libpurple/protocols/msn/msn.c:732
+#: ../libpurple/protocols/msn/msn.c:654
 msgid "Open Hotmail Inbox"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:756
+#: ../libpurple/protocols/msn/msn.c:678
 msgid "Send to Mobile"
 msgstr "Gửi tới thiết bị di động"
 
-#: ../libpurple/protocols/msn/msn.c:766
-#: ../libpurple/protocols/novell/novell.c:3413
+#: ../libpurple/protocols/msn/msn.c:688
+#: ../libpurple/protocols/novell/novell.c:3408
 #, fuzzy
 msgid "Initiate _Chat"
 msgstr "Khởi tạo Chat"
 
-#: ../libpurple/protocols/msn/msn.c:804
+#: ../libpurple/protocols/msn/msn.c:726
 #, fuzzy
 msgid "SSL support is needed for MSN. Please install a supported SSL library."
 msgstr ""
 "MSN yêu cầu có hỗ trợ SSL. Hãy cài đặt thư viện SSL. Để biết thêm thông tin, "
 "hãy xem http://gaim.sf.net/faq-ssl.php "
 
-#: ../libpurple/protocols/msn/msn.c:832
+#: ../libpurple/protocols/msn/msn.c:754
 #, fuzzy
 msgid "Failed to connect to server."
 msgstr "Không kết nối được với máy chủ."
 
-#: ../libpurple/protocols/msn/msn.c:1620 ../libpurple/protocols/msn/msn.c:1968
+#: ../libpurple/protocols/msn/msn.c:1510 ../libpurple/protocols/msn/msn.c:1858
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:808
 #, fuzzy
 msgid "Error retrieving profile"
 msgstr "Lỗi đọc từ máy chủ"
 
-#: ../libpurple/protocols/msn/msn.c:1691 ../pidgin/plugins/convcolors.c:309
-#: ../pidgin/plugins/pidginrc.c:360
+#: ../libpurple/protocols/msn/msn.c:1581 ../pidgin/plugins/convcolors.c:309
+#: ../pidgin/plugins/pidginrc.c:366
 #, fuzzy
 msgid "General"
 msgstr "Giới tính"
 
-#: ../libpurple/protocols/msn/msn.c:1698
+#: ../libpurple/protocols/msn/msn.c:1588
 #: ../libpurple/protocols/myspace/user.c:110
-#: ../libpurple/protocols/oscar/oscar.c:3751
+#: ../libpurple/protocols/oscar/oscar.c:3755
 #: ../libpurple/protocols/qq/buddy_info.c:45
 #: ../libpurple/protocols/qq/qq.c:221
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1081
 msgid "Age"
 msgstr "Tuổi"
 
-#: ../libpurple/protocols/msn/msn.c:1700
+#: ../libpurple/protocols/msn/msn.c:1590
 #: ../libpurple/protocols/qq/buddy_info.c:51
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1096
 msgid "Occupation"
 msgstr "Nghề nghiệp"
 
-#: ../libpurple/protocols/msn/msn.c:1701
+#: ../libpurple/protocols/msn/msn.c:1591
 #: ../libpurple/protocols/myspace/user.c:119
-#: ../libpurple/protocols/novell/novell.c:1480
+#: ../libpurple/protocols/novell/novell.c:1478
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1076
 #: ../libpurple/protocols/zephyr/zephyr.c:798
 #: ../libpurple/protocols/zephyr/zephyr.c:1215
 msgid "Location"
 msgstr "Nơi ở"
 
-#: ../libpurple/protocols/msn/msn.c:1706 ../libpurple/protocols/msn/msn.c:1898
-#: ../libpurple/protocols/msn/msn.c:1904 ../libpurple/protocols/msn/msn.c:1911
+#: ../libpurple/protocols/msn/msn.c:1596 ../libpurple/protocols/msn/msn.c:1788
+#: ../libpurple/protocols/msn/msn.c:1794 ../libpurple/protocols/msn/msn.c:1801
 msgid "Hobbies and Interests"
 msgstr "Sở thích"
 
-#: ../libpurple/protocols/msn/msn.c:1712 ../libpurple/protocols/msn/msn.c:1832
-#: ../libpurple/protocols/msn/msn.c:1838 ../libpurple/protocols/msn/msn.c:1845
-#: ../libpurple/protocols/msn/msn.c:1853 ../libpurple/protocols/msn/msn.c:1860
+#: ../libpurple/protocols/msn/msn.c:1602 ../libpurple/protocols/msn/msn.c:1722
+#: ../libpurple/protocols/msn/msn.c:1728 ../libpurple/protocols/msn/msn.c:1735
+#: ../libpurple/protocols/msn/msn.c:1743 ../libpurple/protocols/msn/msn.c:1750
 msgid "A Little About Me"
 msgstr "Đôi chút về bản thân"
 
-#: ../libpurple/protocols/msn/msn.c:1729
+#: ../libpurple/protocols/msn/msn.c:1619
 msgid "Social"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:1731
+#: ../libpurple/protocols/msn/msn.c:1621
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1086
 msgid "Marital Status"
 msgstr "Tình trạng hôn nhân"
 
-#: ../libpurple/protocols/msn/msn.c:1732
+#: ../libpurple/protocols/msn/msn.c:1622
 #, fuzzy
 msgid "Interests"
 msgstr "C_hèn"
 
-#: ../libpurple/protocols/msn/msn.c:1733
+#: ../libpurple/protocols/msn/msn.c:1623
 #, fuzzy
 msgid "Pets"
 msgstr "Cổng"
 
-#: ../libpurple/protocols/msn/msn.c:1734
+#: ../libpurple/protocols/msn/msn.c:1624
 #, fuzzy
 msgid "Hometown"
 msgstr "Máy chủ không xác định"
 
-#: ../libpurple/protocols/msn/msn.c:1735
+#: ../libpurple/protocols/msn/msn.c:1625
 msgid "Places Lived"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:1736
+#: ../libpurple/protocols/msn/msn.c:1626
 msgid "Fashion"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:1737
+#: ../libpurple/protocols/msn/msn.c:1627
 msgid "Humor"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:1738
+#: ../libpurple/protocols/msn/msn.c:1628
 msgid "Music"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:1739 ../libpurple/protocols/msn/msn.c:1920
-#: ../libpurple/protocols/msn/msn.c:1926
+#: ../libpurple/protocols/msn/msn.c:1629 ../libpurple/protocols/msn/msn.c:1810
+#: ../libpurple/protocols/msn/msn.c:1816
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1138
 msgid "Favorite Quote"
 msgstr "Câu trích dẫn ưa thích"
 
-#: ../libpurple/protocols/msn/msn.c:1756
+#: ../libpurple/protocols/msn/msn.c:1646
 #, fuzzy
 msgid "Contact Info"
 msgstr "Thông tin tài khoản"
 
-#: ../libpurple/protocols/msn/msn.c:1757
+#: ../libpurple/protocols/msn/msn.c:1647
 #, fuzzy
 msgid "Personal"
 msgstr "Trang web cá nhân"
 
-#: ../libpurple/protocols/msn/msn.c:1760
+#: ../libpurple/protocols/msn/msn.c:1650
 msgid "Significant Other"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:1761
+#: ../libpurple/protocols/msn/msn.c:1651
 #, fuzzy
 msgid "Home Phone"
 msgstr "Trang chủ"
 
-#: ../libpurple/protocols/msn/msn.c:1762
+#: ../libpurple/protocols/msn/msn.c:1652
 #, fuzzy
 msgid "Home Phone 2"
 msgstr "Nhập số điện thoại nhà"
 
-#: ../libpurple/protocols/msn/msn.c:1763
-#: ../libpurple/protocols/oscar/oscar.c:3789
+#: ../libpurple/protocols/msn/msn.c:1653
+#: ../libpurple/protocols/oscar/oscar.c:3793
 msgid "Home Address"
 msgstr "Địa chỉ nhà"
 
-#: ../libpurple/protocols/msn/msn.c:1764
+#: ../libpurple/protocols/msn/msn.c:1654
 #, fuzzy
 msgid "Personal Mobile"
 msgstr "Trang web cá nhân"
 
-#: ../libpurple/protocols/msn/msn.c:1765
+#: ../libpurple/protocols/msn/msn.c:1655
 #, fuzzy
 msgid "Home Fax"
 msgstr "Trang chủ"
 
-#: ../libpurple/protocols/msn/msn.c:1766
+#: ../libpurple/protocols/msn/msn.c:1656
 #, fuzzy
 msgid "Personal E-Mail"
 msgstr "Trang web cá nhân"
 
-#: ../libpurple/protocols/msn/msn.c:1767
+#: ../libpurple/protocols/msn/msn.c:1657
 #, fuzzy
 msgid "Personal IM"
 msgstr "Trang web cá nhân"
 
-#: ../libpurple/protocols/msn/msn.c:1769
+#: ../libpurple/protocols/msn/msn.c:1659
 msgid "Anniversary"
 msgstr ""
 
 #. Business
-#: ../libpurple/protocols/msn/msn.c:1785
+#: ../libpurple/protocols/msn/msn.c:1675
 msgid "Work"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:1787
+#: ../libpurple/protocols/msn/msn.c:1677
 #: ../libpurple/protocols/silc/ops.c:1010
 #: ../libpurple/protocols/silc10/ops.c:1044
 #, fuzzy
 msgid "Job Title"
 msgstr "Chức danh"
 
-#: ../libpurple/protocols/msn/msn.c:1788
-#: ../libpurple/protocols/oscar/oscar.c:3810
+#: ../libpurple/protocols/msn/msn.c:1678
+#: ../libpurple/protocols/oscar/oscar.c:3814
 msgid "Company"
 msgstr "Công ty"
 
-#: ../libpurple/protocols/msn/msn.c:1789
-#: ../libpurple/protocols/novell/novell.c:1482
+#: ../libpurple/protocols/msn/msn.c:1679
+#: ../libpurple/protocols/novell/novell.c:1480
 msgid "Department"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:1790
+#: ../libpurple/protocols/msn/msn.c:1680
 #, fuzzy
 msgid "Profession"
 msgstr "Tiến trình"
 
-#: ../libpurple/protocols/msn/msn.c:1791
+#: ../libpurple/protocols/msn/msn.c:1681
 #, fuzzy
 msgid "Work Phone"
 msgstr "Điện thoại"
 
-#: ../libpurple/protocols/msn/msn.c:1792
+#: ../libpurple/protocols/msn/msn.c:1682
 #, fuzzy
 msgid "Work Phone 2"
 msgstr "Nhập số điện thoại cơ quan"
 
-#: ../libpurple/protocols/msn/msn.c:1793
-#: ../libpurple/protocols/oscar/oscar.c:3802
+#: ../libpurple/protocols/msn/msn.c:1683
+#: ../libpurple/protocols/oscar/oscar.c:3806
 msgid "Work Address"
 msgstr "Địa chỉ công tác"
 
-#: ../libpurple/protocols/msn/msn.c:1794
+#: ../libpurple/protocols/msn/msn.c:1684
 #, fuzzy
 msgid "Work Mobile"
 msgstr "Gửi tới thiết bị di động"
 
-#: ../libpurple/protocols/msn/msn.c:1795
+#: ../libpurple/protocols/msn/msn.c:1685
 #, fuzzy
 msgid "Work Pager"
 msgstr "Trang Web"
 
-#: ../libpurple/protocols/msn/msn.c:1796
+#: ../libpurple/protocols/msn/msn.c:1686
 msgid "Work Fax"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:1797
+#: ../libpurple/protocols/msn/msn.c:1687
 #, fuzzy
 msgid "Work E-Mail"
 msgstr "Email"
 
-#: ../libpurple/protocols/msn/msn.c:1798
+#: ../libpurple/protocols/msn/msn.c:1688
 msgid "Work IM"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:1799
+#: ../libpurple/protocols/msn/msn.c:1689
 #, fuzzy
 msgid "Start Date"
 msgstr "Bang"
 
-#: ../libpurple/protocols/msn/msn.c:1869 ../libpurple/protocols/msn/msn.c:1875
-#: ../libpurple/protocols/msn/msn.c:1882 ../libpurple/protocols/msn/msn.c:1889
+#: ../libpurple/protocols/msn/msn.c:1759 ../libpurple/protocols/msn/msn.c:1765
+#: ../libpurple/protocols/msn/msn.c:1772 ../libpurple/protocols/msn/msn.c:1779
 msgid "Favorite Things"
 msgstr "Những thứ yêu thích"
 
-#: ../libpurple/protocols/msn/msn.c:1934
+#: ../libpurple/protocols/msn/msn.c:1824
 msgid "Last Updated"
 msgstr "Cập nhật lần cuối"
 
-#: ../libpurple/protocols/msn/msn.c:1945
+#: ../libpurple/protocols/msn/msn.c:1835
 #: ../libpurple/protocols/qq/buddy_info.c:60
 #: ../libpurple/protocols/silc/ops.c:1026
 #: ../libpurple/protocols/silc10/ops.c:1060
 msgid "Homepage"
 msgstr "Trang chủ"
 
-#: ../libpurple/protocols/msn/msn.c:1969
+#: ../libpurple/protocols/msn/msn.c:1859
 msgid "The user has not created a public profile."
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:1970
+#: ../libpurple/protocols/msn/msn.c:1860
 msgid ""
 "MSN reported not being able to find the user's profile. This either means "
 "that the user does not exist, or that the user exists but has not created a "
 "public profile."
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:1974
+#: ../libpurple/protocols/msn/msn.c:1864
 msgid ""
 "Could not find any information in the user's profile. The user most likely "
 "does not exist."
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:1982
+#: ../libpurple/protocols/msn/msn.c:1872
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1240
 #, fuzzy
 msgid "Profile URL"
@@ -7190,112 +7193,107 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/msn/msn.c:2269 ../libpurple/protocols/msn/msn.c:2271
-#, fuzzy
-msgid "Windows Live Messenger Protocol Plugin"
-msgstr "Plugin giao thức Yahoo"
-
-#: ../libpurple/protocols/msn/msn.c:2306
+#: ../libpurple/protocols/msn/msn.c:2158 ../libpurple/protocols/msn/msn.c:2160
+#, fuzzy
+msgid "MSN Protocol Plugin"
+msgstr "Plugin giao thức AIM/ICQ"
+
+#: ../libpurple/protocols/msn/msn.c:2194
 msgid "Use HTTP Method"
 msgstr "Dùng giao thức HTTP"
 
-#: ../libpurple/protocols/msn/msn.c:2311
+#: ../libpurple/protocols/msn/msn.c:2199
 #, fuzzy
 msgid "HTTP Method Server"
 msgstr "Máy chủ kiểm tra IPC"
 
-#: ../libpurple/protocols/msn/msn.c:2316
+#: ../libpurple/protocols/msn/msn.c:2204
 #, fuzzy
 msgid "Show custom smileys"
 msgstr "Hiển thị hình _cười"
 
-#: ../libpurple/protocols/msn/msn.c:2324
+#: ../libpurple/protocols/msn/msn.c:2212
 msgid "nudge: nudge a user to get their attention"
 msgstr ""
 
-#: ../libpurple/protocols/msn/nexus.c:137
-msgid "Windows Live ID authentication:Unable to connect"
-msgstr ""
-
-#: ../libpurple/protocols/msn/nexus.c:275
-#, fuzzy
-msgid "Windows Live ID authentication Failed"
-msgstr "Không xác thực được"
-
-#: ../libpurple/protocols/msn/notification.c:191
+#: ../libpurple/protocols/msn/nexus.c:146
+#: ../libpurple/protocols/msn/servconn.c:135
+#: ../libpurple/protocols/qq/qq_proxy.c:242
+#: ../libpurple/protocols/qq/qq_proxy.c:321
+#: ../libpurple/protocols/qq/qq_proxy.c:366
+#: ../libpurple/protocols/qq/qq_proxy.c:399
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:63
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:163
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:187
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:200
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:229
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:243
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:268
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:302
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:332
+#: ../libpurple/protocols/yahoo/yahoochat.c:1416
+#: ../libpurple/protocols/yahoo/yahoochat.c:1442
+msgid "Unable to connect"
+msgstr "Không thể kết nối"
+
+#: ../libpurple/protocols/msn/notification.c:178
 #, fuzzy, c-format
 msgid "%s is not a valid group."
 msgstr "%s không phải là tên phòng hợp lệ."
 
-#: ../libpurple/protocols/msn/notification.c:197
-#: ../libpurple/protocols/msn/notification.c:938
-#: ../libpurple/protocols/msn/session.c:369
+#: ../libpurple/protocols/msn/notification.c:184
+#: ../libpurple/protocols/msn/notification.c:532
+#: ../libpurple/protocols/msn/session.c:330
 #, fuzzy
 msgid "Unknown error."
 msgstr "Lỗi không xác định"
 
-#: ../libpurple/protocols/msn/notification.c:200
+#: ../libpurple/protocols/msn/notification.c:187
 #, fuzzy, c-format
 msgid "%s on %s (%s)"
 msgstr "%s (Mã %s)"
 
-#: ../libpurple/protocols/msn/notification.c:518
-#, fuzzy, c-format
-msgid "%s just sent you a Nudge!"
-msgstr "%s muốn gửi cho bạn %s (%s)"
-
-#: ../libpurple/protocols/msn/notification.c:843
-#, fuzzy, c-format
-msgid "Unknown error (%d)"
-msgstr "Lỗi không xác định"
-
-#: ../libpurple/protocols/msn/notification.c:844
-#: ../libpurple/protocols/sametime/sametime.c:4425
-#, fuzzy
-msgid "Unable to add user"
-msgstr "Không thể truyền"
-
-#: ../libpurple/protocols/msn/notification.c:904
+#: ../libpurple/protocols/msn/notification.c:498
 #, fuzzy, c-format
 msgid "Unable to add user on %s (%s)"
 msgstr "Không thể thêm \"%s\" vào danh sách nóng Napster của bạn"
 
-#: ../libpurple/protocols/msn/notification.c:908
+#: ../libpurple/protocols/msn/notification.c:502
 #, fuzzy, c-format
 msgid "Unable to block user on %s (%s)"
 msgstr "Không thể ping máy chủ"
 
-#: ../libpurple/protocols/msn/notification.c:912
+#: ../libpurple/protocols/msn/notification.c:506
 #, fuzzy, c-format
 msgid "Unable to permit user on %s (%s)"
 msgstr "Không ghi được tập tin %s."
 
-#: ../libpurple/protocols/msn/notification.c:920
+#: ../libpurple/protocols/msn/notification.c:514
 #, c-format
 msgid "%s could not be added because your buddy list is full."
 msgstr ""
 
-#: ../libpurple/protocols/msn/notification.c:929
+#: ../libpurple/protocols/msn/notification.c:523
 #, fuzzy, c-format
 msgid "%s is not a valid passport account."
 msgstr "%s không phải tên máy chủ hợp lệ"
 
-#: ../libpurple/protocols/msn/notification.c:934
+#: ../libpurple/protocols/msn/notification.c:528
 #, fuzzy
 msgid "Service Temporarily Unavailable."
 msgstr "Tạm thời không có dịch vụ thư mục."
 
-#: ../libpurple/protocols/msn/notification.c:1272
+#: ../libpurple/protocols/msn/notification.c:851
 #, fuzzy
 msgid "Unable to rename group"
 msgstr "Không thể đọc"
 
-#: ../libpurple/protocols/msn/notification.c:1327
+#: ../libpurple/protocols/msn/notification.c:906
 #, fuzzy
 msgid "Unable to delete group"
 msgstr "Không tạo được socket"
 
-#: ../libpurple/protocols/msn/notification.c:1943
+#: ../libpurple/protocols/msn/notification.c:1325
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -7322,30 +7320,6 @@
 "\n"
 "Sau khi hoàn tất việc bảo trì, bạn có thể kết nối trở lại như bình thường."
 
-#: ../libpurple/protocols/msn/oim.c:141
-#, fuzzy
-msgid "Unable to connect to OIM server"
-msgstr "Không thể kết nối đến máy chủ"
-
-#: ../libpurple/protocols/msn/servconn.c:135
-#: ../libpurple/protocols/qq/qq_proxy.c:242
-#: ../libpurple/protocols/qq/qq_proxy.c:321
-#: ../libpurple/protocols/qq/qq_proxy.c:366
-#: ../libpurple/protocols/qq/qq_proxy.c:399
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:63
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:163
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:187
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:200
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:229
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:243
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:268
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:302
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:332
-#: ../libpurple/protocols/yahoo/yahoochat.c:1416
-#: ../libpurple/protocols/yahoo/yahoochat.c:1442
-msgid "Unable to connect"
-msgstr "Không thể kết nối"
-
 #: ../libpurple/protocols/msn/servconn.c:137
 #, fuzzy
 msgid "Writing error"
@@ -7363,63 +7337,63 @@
 "%s"
 msgstr "Số hiệu lỗi không xác định %d."
 
-#: ../libpurple/protocols/msn/session.c:336
+#: ../libpurple/protocols/msn/session.c:299
 #, fuzzy
 msgid "Our protocol is not supported by the server."
 msgstr "Phiên bản giao thức không được hỗ trợ"
 
-#: ../libpurple/protocols/msn/session.c:340
+#: ../libpurple/protocols/msn/session.c:303
 #, fuzzy
 msgid "Error parsing HTTP."
 msgstr "Lỗi hiển thị MOTD"
 
-#: ../libpurple/protocols/msn/session.c:344
+#: ../libpurple/protocols/msn/session.c:307
 #: ../libpurple/protocols/oscar/flap_connection.c:384
-#: ../libpurple/protocols/yahoo/yahoo.c:207
+#: ../libpurple/protocols/yahoo/yahoo.c:205
 #, fuzzy
 msgid "You have signed on from another location."
 msgstr "Bạn bị ngắt kết nối. Bạn đã đăng nhập từ một vị trí khác."
 
-#: ../libpurple/protocols/msn/session.c:349
+#: ../libpurple/protocols/msn/session.c:310
 #, fuzzy
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr "Tạm thời không có dịch vụ."
 
-#: ../libpurple/protocols/msn/session.c:354
+#: ../libpurple/protocols/msn/session.c:315
 #, fuzzy
 msgid "The MSN servers are going down temporarily."
 msgstr "Bạn bị ngắt kết nối. Máy chủ MSN tạm thời bị ngừng."
 
-#: ../libpurple/protocols/msn/session.c:359
+#: ../libpurple/protocols/msn/session.c:320
 #, fuzzy, c-format
 msgid "Unable to authenticate: %s"
 msgstr "Không thể gửi thông điệp."
 
-#: ../libpurple/protocols/msn/session.c:364
+#: ../libpurple/protocols/msn/session.c:325
 msgid ""
 "Your MSN buddy list is temporarily unavailable. Please wait and try again."
 msgstr ""
 
-#: ../libpurple/protocols/msn/session.c:385
-#: ../libpurple/protocols/msn/session.c:387
+#: ../libpurple/protocols/msn/session.c:346
+#: ../libpurple/protocols/msn/session.c:348
 msgid "Handshaking"
 msgstr ""
 
-#: ../libpurple/protocols/msn/session.c:388
+#: ../libpurple/protocols/msn/session.c:349
 #, fuzzy
 msgid "Starting authentication"
 msgstr "Chứng thực Yahooo! lỗi"
 
-#: ../libpurple/protocols/msn/session.c:389
+#: ../libpurple/protocols/msn/session.c:350
 msgid "Getting cookie"
 msgstr ""
 
-#: ../libpurple/protocols/msn/session.c:391
+#: ../libpurple/protocols/msn/session.c:352
 #, fuzzy
 msgid "Sending cookie"
 msgstr "Gửi tới thiết bị di động"
 
-#: ../libpurple/protocols/msn/session.c:392
+#: ../libpurple/protocols/msn/session.c:353
 msgid "Retrieving buddy list"
 msgstr "Lấy danh sách buddy"
 
@@ -7470,25 +7444,22 @@
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr ""
 
-#: ../libpurple/protocols/msn/userlist.c:243
+#: ../libpurple/protocols/msn/userlist.c:252
 #, fuzzy, c-format
 msgid "%s has added you to his or her buddy list."
 msgstr "Người dùng %s (%s) muốn thêm %s vào danh sách buddy của họ."
 
-#: ../libpurple/protocols/msn/userlist.c:312
+#: ../libpurple/protocols/msn/userlist.c:321
 #, fuzzy, c-format
 msgid "%s has removed you from his or her buddy list."
 msgstr "Người dùng %s (%s) muốn thêm %s vào danh sách buddy của họ."
 
-#. only notify the user about problems adding to the friends list
-#. * maybe we should do something else for other lists, but it probably
-#. * won't cause too many problems if we just ignore it
-#: ../libpurple/protocols/msn/userlist.c:693
+#: ../libpurple/protocols/msn/userlist.c:643
 #, fuzzy, c-format
 msgid "Unable to add \"%s\"."
 msgstr "Không đọc được tập tin %s."
 
-#: ../libpurple/protocols/msn/userlist.c:696
+#: ../libpurple/protocols/msn/userlist.c:645
 #, fuzzy
 msgid "The screen name specified is invalid."
 msgstr "Định dạng mới không hợp lệ."
@@ -7516,7 +7487,7 @@
 
 #. Notify an error message also, because this is important!
 #: ../libpurple/protocols/myspace/myspace.c:292
-#: ../libpurple/protocols/myspace/myspace.c:1798
+#: ../libpurple/protocols/myspace/myspace.c:1801
 msgid "MySpaceIM Error"
 msgstr ""
 
@@ -7535,197 +7506,197 @@
 msgid "Logging in"
 msgstr "Tạo bản ghi"
 
-#: ../libpurple/protocols/myspace/myspace.c:1278
+#: ../libpurple/protocols/myspace/myspace.c:1286
 #, c-format
 msgid "Connection to server lost (no data received within %d seconds)"
 msgstr ""
 
 #. Can't write _()'d strings in array initializers. Workaround.
-#: ../libpurple/protocols/myspace/myspace.c:1321
+#: ../libpurple/protocols/myspace/myspace.c:1328
 #, fuzzy
 msgid "New mail messages"
 msgstr "Thông báo trạng thái mới"
 
-#: ../libpurple/protocols/myspace/myspace.c:1322
+#: ../libpurple/protocols/myspace/myspace.c:1329
 msgid "New blog comments"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:1323
+#: ../libpurple/protocols/myspace/myspace.c:1330
 msgid "New profile comments"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:1324
+#: ../libpurple/protocols/myspace/myspace.c:1331
 msgid "New friend requests!"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:1325
+#: ../libpurple/protocols/myspace/myspace.c:1332
 msgid "New picture comments"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:1355
+#: ../libpurple/protocols/myspace/myspace.c:1360
 msgid "MySpace"
 msgstr ""
 
 #. The session is now set up, ready to be connected. This emits the
 #. * signedOn signal, so clients can now do anything with msimprpl, and
 #. * we're ready for it (session key, userid, username all setup).
-#: ../libpurple/protocols/myspace/myspace.c:1538
+#: ../libpurple/protocols/myspace/myspace.c:1543
 #: ../libpurple/protocols/sametime/sametime.c:1544
 #, fuzzy
 msgid "Connected"
 msgstr "Kết nối"
 
-#: ../libpurple/protocols/myspace/myspace.c:1549
-#: ../libpurple/protocols/myspace/myspace.c:1551
+#: ../libpurple/protocols/myspace/myspace.c:1554
+#: ../libpurple/protocols/myspace/myspace.c:1556
 #, fuzzy
 msgid "No username set"
 msgstr "Chưa nhập tên hiển thị."
 
-#: ../libpurple/protocols/myspace/myspace.c:1550
+#: ../libpurple/protocols/myspace/myspace.c:1555
 msgid ""
 "Please go to http://editprofile.myspace.com/index.cfm?fuseaction=profile."
 "username and choose a username and try to login again."
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:1777
+#: ../libpurple/protocols/myspace/myspace.c:1782
 #, c-format
 msgid "Protocol error, code %d: %s"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:1970
-#: ../libpurple/protocols/myspace/myspace.c:2004
+#: ../libpurple/protocols/myspace/myspace.c:1972
+#: ../libpurple/protocols/myspace/myspace.c:2006
 #, fuzzy
 msgid "Failed to add buddy"
 msgstr "Buddy không tham gia Chat được"
 
-#: ../libpurple/protocols/myspace/myspace.c:1970
+#: ../libpurple/protocols/myspace/myspace.c:1972
 #, fuzzy
 msgid "'addbuddy' command failed."
 msgstr "Tập tin biểu tượng buddy:"
 
-#: ../libpurple/protocols/myspace/myspace.c:2004
-#: ../libpurple/protocols/myspace/myspace.c:2245
+#: ../libpurple/protocols/myspace/myspace.c:2006
+#: ../libpurple/protocols/myspace/myspace.c:2247
 #, fuzzy
 msgid "persist command failed"
 msgstr "Bảng chuyển đổi bị lỗi"
 
-#: ../libpurple/protocols/myspace/myspace.c:2113
+#: ../libpurple/protocols/myspace/myspace.c:2115
 #, c-format
 msgid "No such user: %s"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:2114
+#: ../libpurple/protocols/myspace/myspace.c:2116
 #, fuzzy
 msgid "User lookup"
 msgstr "Tùy chọn người dùng"
 
-#: ../libpurple/protocols/myspace/myspace.c:2226
-#: ../libpurple/protocols/myspace/myspace.c:2245
-#: ../libpurple/protocols/myspace/myspace.c:2267
+#: ../libpurple/protocols/myspace/myspace.c:2228
+#: ../libpurple/protocols/myspace/myspace.c:2247
+#: ../libpurple/protocols/myspace/myspace.c:2269
 #, fuzzy
 msgid "Failed to remove buddy"
 msgstr "Buddy không tham gia Chat được"
 
-#: ../libpurple/protocols/myspace/myspace.c:2226
+#: ../libpurple/protocols/myspace/myspace.c:2228
 #, fuzzy
 msgid "'delbuddy' command failed"
 msgstr "Tập tin biểu tượng buddy:"
 
-#: ../libpurple/protocols/myspace/myspace.c:2267
+#: ../libpurple/protocols/myspace/myspace.c:2269
 #, fuzzy
 msgid "blocklist command failed"
 msgstr "Bảng chuyển đổi bị lỗi"
 
-#: ../libpurple/protocols/myspace/myspace.c:2313
+#: ../libpurple/protocols/myspace/myspace.c:2315
 #, fuzzy
 msgid "Invalid input condition"
 msgstr "Hoàn tất kết nối"
 
 #. TODO: g_realloc like msn, yahoo, irc, jabber?
-#: ../libpurple/protocols/myspace/myspace.c:2331
-#: ../libpurple/protocols/myspace/myspace.c:2362
+#: ../libpurple/protocols/myspace/myspace.c:2333
+#: ../libpurple/protocols/myspace/myspace.c:2364
 #, fuzzy
 msgid "Read buffer full"
 msgstr "Hàng xếp đã đầy"
 
-#: ../libpurple/protocols/myspace/myspace.c:2400
+#: ../libpurple/protocols/myspace/myspace.c:2402
 #, fuzzy
 msgid "Unparseable message"
 msgstr "Không thể phân tích thông điệp."
 
-#: ../libpurple/protocols/myspace/myspace.c:2469
+#: ../libpurple/protocols/myspace/myspace.c:2471
 #, fuzzy, c-format
 msgid "Couldn't connect to host: %s (%d)"
 msgstr "Không kết nối được với máy chủ"
 
-#: ../libpurple/protocols/myspace/myspace.c:2640
+#: ../libpurple/protocols/myspace/myspace.c:2642
 #, fuzzy
 msgid "IM Friends"
 msgstr "Cửa sổ _Nhắn Tin Nhanh"
 
-#: ../libpurple/protocols/myspace/myspace.c:2739
+#: ../libpurple/protocols/myspace/myspace.c:2741
 #, c-format
 msgid ""
 "%d buddies were added or updated from the server (including buddies already "
 "on the server-side list)"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:2740
+#: ../libpurple/protocols/myspace/myspace.c:2742
 #, fuzzy
 msgid "Add contacts from server"
 msgstr "Máy chủ trả lời không hợp lệ."
 
-#: ../libpurple/protocols/myspace/myspace.c:2792
-#: ../libpurple/protocols/myspace/myspace.c:2857
+#: ../libpurple/protocols/myspace/myspace.c:2794
+#: ../libpurple/protocols/myspace/myspace.c:2859
 msgid "Add friends from MySpace.com"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:2793
+#: ../libpurple/protocols/myspace/myspace.c:2795
 #, fuzzy
 msgid "Importing friends failed"
 msgstr "Tập tin bạn bè hỏng"
 
 #. TODO: find out how
-#: ../libpurple/protocols/myspace/myspace.c:2849
+#: ../libpurple/protocols/myspace/myspace.c:2851
 msgid "Find people..."
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:2852
+#: ../libpurple/protocols/myspace/myspace.c:2854
 #, fuzzy
 msgid "Change IM name..."
 msgstr "Đổi mật khẩu..."
 
-#: ../libpurple/protocols/myspace/myspace.c:3154
+#: ../libpurple/protocols/myspace/myspace.c:3156
 msgid "myim URL handler"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:3155
+#: ../libpurple/protocols/myspace/myspace.c:3157
 msgid "No suitable MySpaceIM account could be found to open this myim URL."
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:3156
+#: ../libpurple/protocols/myspace/myspace.c:3158
 msgid "Enable the proper MySpaceIM account and try again."
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:3279
+#: ../libpurple/protocols/myspace/myspace.c:3281
 msgid "Show display name in status text"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:3282
+#: ../libpurple/protocols/myspace/myspace.c:3284
 #, fuzzy
 msgid "Show headline in status text"
 msgstr "Hiển thị bí _danh trong tab/tiêu đề"
 
-#: ../libpurple/protocols/myspace/myspace.c:3287
+#: ../libpurple/protocols/myspace/myspace.c:3289
 #, fuzzy
 msgid "Send emoticons"
 msgstr "Tùy chọn âm thanh"
 
-#: ../libpurple/protocols/myspace/myspace.c:3292
+#: ../libpurple/protocols/myspace/myspace.c:3294
 msgid "Screen resolution (dots per inch)"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:3295
+#: ../libpurple/protocols/myspace/myspace.c:3297
 #, fuzzy
 msgid "Base font size (points)"
 msgstr "Chữ lớn hơn"
@@ -7739,7 +7710,7 @@
 
 #. TODO: link to username, if available
 #: ../libpurple/protocols/myspace/user.c:102
-#: ../libpurple/protocols/oscar/oscar.c:2960
+#: ../libpurple/protocols/oscar/oscar.c:2964
 msgid "Profile"
 msgstr "Lý lịch"
 
@@ -8053,111 +8024,111 @@
 msgid "Login failed (%s)."
 msgstr ""
 
-#: ../libpurple/protocols/novell/novell.c:249
+#: ../libpurple/protocols/novell/novell.c:247
 #, fuzzy, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
 msgstr "Không thể gửi tin. Thông điệp quá lớn."
 
-#: ../libpurple/protocols/novell/novell.c:398
+#: ../libpurple/protocols/novell/novell.c:396
 #, fuzzy, c-format
 msgid "Unable to add %s to your buddy list (%s)."
 msgstr "Không thể thêm \"%s\" vào danh sách nóng Napster của bạn"
 
 #. TODO: Improve this! message to who or for what conference?
-#: ../libpurple/protocols/novell/novell.c:424
+#: ../libpurple/protocols/novell/novell.c:422
 #, fuzzy, c-format
 msgid "Unable to send message (%s)."
 msgstr "Không thể gửi thông điệp."
 
-#: ../libpurple/protocols/novell/novell.c:495
-#: ../libpurple/protocols/novell/novell.c:987
+#: ../libpurple/protocols/novell/novell.c:493
+#: ../libpurple/protocols/novell/novell.c:985
 #, fuzzy, c-format
 msgid "Unable to invite user (%s)."
 msgstr "Không ghi được tập tin %s."
 
-#: ../libpurple/protocols/novell/novell.c:534
+#: ../libpurple/protocols/novell/novell.c:532
 #, fuzzy, c-format
 msgid "Unable to send message to %s. Could not create the conference (%s)."
 msgstr "Không thể gửi tin. Thông điệp quá lớn."
 
-#: ../libpurple/protocols/novell/novell.c:539
+#: ../libpurple/protocols/novell/novell.c:537
 #, fuzzy, c-format
 msgid "Unable to send message. Could not create the conference (%s)."
 msgstr "Không thể gửi tin. Thông điệp quá lớn."
 
-#: ../libpurple/protocols/novell/novell.c:586
+#: ../libpurple/protocols/novell/novell.c:584
 #, c-format
 msgid ""
 "Unable to move user %s to folder %s in the server side list. Error while "
 "creating folder (%s)."
 msgstr ""
 
-#: ../libpurple/protocols/novell/novell.c:634
+#: ../libpurple/protocols/novell/novell.c:632
 #, fuzzy, c-format
 msgid ""
 "Unable to add %s to your buddy list. Error creating folder in server side "
 "list (%s)."
 msgstr "Không thể thêm \"%s\" vào danh sách nóng Napster của bạn"
 
-#: ../libpurple/protocols/novell/novell.c:707
+#: ../libpurple/protocols/novell/novell.c:705
 #, fuzzy, c-format
 msgid "Could not get details for user %s (%s)."
 msgstr "Không thể gửi tin. Thông điệp quá lớn."
 
-#: ../libpurple/protocols/novell/novell.c:753
-#: ../libpurple/protocols/novell/novell.c:899
+#: ../libpurple/protocols/novell/novell.c:751
+#: ../libpurple/protocols/novell/novell.c:897
 #, fuzzy, c-format
 msgid "Unable to add user to privacy list (%s)."
 msgstr "Không thể thêm \"%s\" vào danh sách nóng Napster của bạn"
 
-#: ../libpurple/protocols/novell/novell.c:800
+#: ../libpurple/protocols/novell/novell.c:798
 #, fuzzy, c-format
 msgid "Unable to add %s to deny list (%s)."
 msgstr "Không thể thêm \"%s\" vào danh sách nóng Napster của bạn"
 
-#: ../libpurple/protocols/novell/novell.c:853
+#: ../libpurple/protocols/novell/novell.c:851
 #, fuzzy, c-format
 msgid "Unable to add %s to permit list (%s)."
 msgstr "Không thể thêm \"%s\" vào danh sách nóng Napster của bạn"
 
-#: ../libpurple/protocols/novell/novell.c:921
+#: ../libpurple/protocols/novell/novell.c:919
 #, fuzzy, c-format
 msgid "Unable to remove %s from privacy list (%s)."
 msgstr "Không thể thêm \"%s\" vào danh sách nóng Napster của bạn"
 
-#: ../libpurple/protocols/novell/novell.c:944
-#: ../libpurple/protocols/novell/novell.c:1649
+#: ../libpurple/protocols/novell/novell.c:942
+#: ../libpurple/protocols/novell/novell.c:1647
 #, c-format
 msgid "Unable to change server side privacy settings (%s)."
 msgstr ""
 
-#: ../libpurple/protocols/novell/novell.c:1014
+#: ../libpurple/protocols/novell/novell.c:1012
 #, fuzzy, c-format
 msgid "Unable to create conference (%s)."
 msgstr "Không tạo được socket"
 
-#: ../libpurple/protocols/novell/novell.c:1123
-#: ../libpurple/protocols/novell/novell.c:1694
+#: ../libpurple/protocols/novell/novell.c:1121
+#: ../libpurple/protocols/novell/novell.c:1692
 #, fuzzy
 msgid "Error communicating with server. Closing connection."
 msgstr "Lỗi liên lạc với máy chủ Gadu-Gadu"
 
-#: ../libpurple/protocols/novell/novell.c:1478
+#: ../libpurple/protocols/novell/novell.c:1476
 #, fuzzy
 msgid "Telephone Number"
 msgstr "Điện thoại"
 
-#: ../libpurple/protocols/novell/novell.c:1484
+#: ../libpurple/protocols/novell/novell.c:1482
 #, fuzzy
 msgid "Personal Title"
 msgstr "Trang web cá nhân"
 
-#: ../libpurple/protocols/novell/novell.c:1488
+#: ../libpurple/protocols/novell/novell.c:1486
 #, fuzzy
 msgid "Mailstop"
 msgstr "Email"
 
-#: ../libpurple/protocols/novell/novell.c:1504
+#: ../libpurple/protocols/novell/novell.c:1502
 #: ../libpurple/protocols/sametime/sametime.c:4122
 #, fuzzy
 msgid "User ID"
@@ -8169,46 +8140,46 @@
 #. purple_notify_user_info_add_pair(user_info, tag, value);
 #. }
 #.
-#: ../libpurple/protocols/novell/novell.c:1517
+#: ../libpurple/protocols/novell/novell.c:1515
 #, fuzzy
 msgid "Full name"
 msgstr "Tên đầy đủ"
 
-#: ../libpurple/protocols/novell/novell.c:1639
+#: ../libpurple/protocols/novell/novell.c:1637
 #, fuzzy, c-format
 msgid "GroupWise Conference %d"
 msgstr "Khởi tạo hội thảo"
 
-#: ../libpurple/protocols/novell/novell.c:1670
+#: ../libpurple/protocols/novell/novell.c:1668
 #, fuzzy
 msgid "Unable to make SSL connection to server."
 msgstr "Không kết nối được với máy chủ."
 
-#: ../libpurple/protocols/novell/novell.c:1722
+#: ../libpurple/protocols/novell/novell.c:1720
 #, fuzzy
 msgid "Authenticating..."
 msgstr "Xác thực"
 
-#: ../libpurple/protocols/novell/novell.c:1734
+#: ../libpurple/protocols/novell/novell.c:1732
 msgid "Unable to connect to server."
 msgstr "Không kết nối được với máy chủ."
 
-#: ../libpurple/protocols/novell/novell.c:1737
+#: ../libpurple/protocols/novell/novell.c:1735
 #, fuzzy
 msgid "Waiting for response..."
 msgstr "Đợi hồi âm..."
 
-#: ../libpurple/protocols/novell/novell.c:1872
+#: ../libpurple/protocols/novell/novell.c:1870
 #, fuzzy, c-format
 msgid "%s has been invited to this conversation."
 msgstr "%s đã đóng cửa sổ cuộc thoại."
 
-#: ../libpurple/protocols/novell/novell.c:1900
+#: ../libpurple/protocols/novell/novell.c:1898
 #, fuzzy
 msgid "Invitation to Conversation"
 msgstr "/Cuộc thoại/Cuộc thoại _mới..."
 
-#: ../libpurple/protocols/novell/novell.c:1901
+#: ../libpurple/protocols/novell/novell.c:1899
 #, c-format
 msgid ""
 "Invitation from: %s\n"
@@ -8216,17 +8187,18 @@
 "Sent: %s"
 msgstr ""
 
-#: ../libpurple/protocols/novell/novell.c:1903
+#: ../libpurple/protocols/novell/novell.c:1901
 #, fuzzy
 msgid "Would you like to join the conversation?"
 msgstr "Bạn muốn ghi đè lên nó không?"
 
-#: ../libpurple/protocols/novell/novell.c:2017
+#. we don't want to reconnect in this case
+#: ../libpurple/protocols/novell/novell.c:2012
 #, fuzzy
 msgid "You have been logged out because you logged in at another workstation."
 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."
 
-#: ../libpurple/protocols/novell/novell.c:2074
+#: ../libpurple/protocols/novell/novell.c:2069
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
@@ -8236,19 +8208,20 @@
 #. *  purple_request_fields(gc, _("Server Address"),...);
 #.
 #. ...but for now just error out with a nice message.
-#: ../libpurple/protocols/novell/novell.c:2172
+#: ../libpurple/protocols/novell/novell.c:2167
 #, fuzzy
 msgid ""
 "Unable to connect to server. Please enter the address of the server you wish "
 "to connect to."
 msgstr "Hãy nhập tên người dùng mà bạn muốn chặn."
 
-#: ../libpurple/protocols/novell/novell.c:2200
+#: ../libpurple/protocols/novell/novell.c:2195
 #, fuzzy
 msgid "Error. SSL support is not installed."
 msgstr "MSN đòi hỏi hỗ trợ SSL. Hãy cài đặt nó."
 
-#: ../libpurple/protocols/novell/novell.c:2509
+#: ../libpurple/protocols/novell/novell.c:2504
+#, c-format
 msgid "This conference has been closed. No more messages can be sent."
 msgstr ""
 
@@ -8262,24 +8235,24 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/novell/novell.c:3523
-#: ../libpurple/protocols/novell/novell.c:3525
+#: ../libpurple/protocols/novell/novell.c:3518
+#: ../libpurple/protocols/novell/novell.c:3520
 msgid "Novell GroupWise Messenger Protocol Plugin"
 msgstr ""
 
-#: ../libpurple/protocols/novell/novell.c:3550
+#: ../libpurple/protocols/novell/novell.c:3545
 #, fuzzy
 msgid "Server address"
 msgstr "Địa chỉ nhà"
 
-#: ../libpurple/protocols/novell/novell.c:3554
+#: ../libpurple/protocols/novell/novell.c:3549
 #, fuzzy
 msgid "Server port"
 msgstr "Máy chủ"
 
-#: ../libpurple/protocols/oscar/flap_connection.c:389
-#: ../libpurple/protocols/yahoo/yahoo.c:2468
-#: ../libpurple/protocols/yahoo/yahoo.c:2635
+#: ../libpurple/protocols/oscar/flap_connection.c:387
+#: ../libpurple/protocols/yahoo/yahoo.c:2469
+#: ../libpurple/protocols/yahoo/yahoo.c:2636
 #: ../libpurple/protocols/yahoo/ycht.c:481 ../libpurple/proxy.c:581
 #: ../libpurple/proxy.c:1116 ../libpurple/proxy.c:1225
 #: ../libpurple/proxy.c:1325 ../libpurple/proxy.c:1453
@@ -8287,9 +8260,9 @@
 msgid "Server closed the connection."
 msgstr "Lỗi khi tạo kết nối"
 
-#: ../libpurple/protocols/oscar/flap_connection.c:391
-#: ../libpurple/protocols/yahoo/yahoo.c:2462
-#: ../libpurple/protocols/yahoo/yahoo.c:2629 ../libpurple/proxy.c:593
+#: ../libpurple/protocols/oscar/flap_connection.c:389
+#: ../libpurple/protocols/yahoo/yahoo.c:2463
+#: ../libpurple/protocols/yahoo/yahoo.c:2630 ../libpurple/proxy.c:593
 #: ../libpurple/proxy.c:1128 ../libpurple/proxy.c:1237
 #: ../libpurple/proxy.c:1337 ../libpurple/proxy.c:1465
 #, fuzzy, c-format
@@ -8298,7 +8271,7 @@
 "%s"
 msgstr "Bạn đã bị ngắt kết nối khỏi máy chủ."
 
-#: ../libpurple/protocols/oscar/flap_connection.c:394
+#: ../libpurple/protocols/oscar/flap_connection.c:392
 #: ../libpurple/proxy.c:1145 ../libpurple/proxy.c:1250
 #: ../libpurple/proxy.c:1349 ../libpurple/proxy.c:1421
 #: ../libpurple/proxy.c:1478
@@ -8339,7 +8312,7 @@
 msgstr "Plugin giao thức IRC"
 
 #: ../libpurple/protocols/oscar/libicq.c:147
-#: ../libpurple/protocols/yahoo/yahoo.c:4409
+#: ../libpurple/protocols/yahoo/yahoo.c:4410
 #: ../libpurple/protocols/zephyr/zephyr.c:2997
 msgid "Encoding"
 msgstr "Mã hóa"
@@ -8514,7 +8487,7 @@
 msgstr "Chat"
 
 #: ../libpurple/protocols/oscar/oscar.c:651
-#: ../libpurple/protocols/oscar/oscar.c:6008
+#: ../libpurple/protocols/oscar/oscar.c:6010
 msgid "Get File"
 msgstr "Nhận tập tin"
 
@@ -8588,44 +8561,50 @@
 msgstr "Tên"
 
 #: ../libpurple/protocols/oscar/oscar.c:725
-#: ../libpurple/protocols/oscar/oscar.c:5778
+#: ../libpurple/protocols/oscar/oscar.c:5780
+#, c-format
 msgid "Free For Chat"
 msgstr "Rảnh rỗi để Chat"
 
 #: ../libpurple/protocols/oscar/oscar.c:729
-#: ../libpurple/protocols/oscar/oscar.c:5813
+#: ../libpurple/protocols/oscar/oscar.c:5815
+#, c-format
 msgid "Not Available"
 msgstr "Không có mặt"
 
 #: ../libpurple/protocols/oscar/oscar.c:731
-#: ../libpurple/protocols/oscar/oscar.c:5799
+#: ../libpurple/protocols/oscar/oscar.c:5801
+#, c-format
 msgid "Occupied"
 msgstr "Đang bận"
 
 #: ../libpurple/protocols/oscar/oscar.c:735
+#, c-format
 msgid "Web Aware"
 msgstr "Kiến thức Web"
 
 #: ../libpurple/protocols/oscar/oscar.c:737 ../libpurple/protocols/qq/qq.c:183
 #: ../libpurple/protocols/qq/qq.c:288
-#: ../libpurple/protocols/yahoo/yahoo.c:3094 ../libpurple/status.c:157
+#: ../libpurple/protocols/yahoo/yahoo.c:3095 ../libpurple/status.c:157
 #: ../pidgin/gtkdocklet.c:446 ../pidgin/gtkstatusbox.c:1060
+#, c-format
 msgid "Invisible"
 msgstr "Giấu mặt"
 
 #: ../libpurple/protocols/oscar/oscar.c:739
+#, c-format
 msgid "Online"
 msgstr "Kết nối"
 
 #: ../libpurple/protocols/oscar/oscar.c:838
-#: ../libpurple/protocols/oscar/oscar.c:3703
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:721 ../pidgin/gtkprefs.c:1128
+#: ../libpurple/protocols/oscar/oscar.c:3707
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:721 ../pidgin/gtkprefs.c:1126
 #, fuzzy
 msgid "IP Address"
 msgstr "Địa chỉ"
 
 #: ../libpurple/protocols/oscar/oscar.c:845
-#: ../libpurple/protocols/oscar/oscar.c:2887
+#: ../libpurple/protocols/oscar/oscar.c:2891
 #, fuzzy
 msgid "Warning Level"
 msgstr "Hiển thị mức _cảnh báo"
@@ -8671,15 +8650,15 @@
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:1345
-#: ../libpurple/protocols/yahoo/yahoo.c:2104
+#: ../libpurple/protocols/yahoo/yahoo.c:2105
 #, fuzzy
 msgid "Invalid screen name."
 msgstr "Tên hiển thị MSN không hợp lệ"
 
 #: ../libpurple/protocols/oscar/oscar.c:1352
-#: ../libpurple/protocols/qq/login_logout.c:485
-#: ../libpurple/protocols/simple/simple.c:1047
-#: ../libpurple/protocols/yahoo/yahoo.c:2125
+#: ../libpurple/protocols/qq/login_logout.c:483
+#: ../libpurple/protocols/simple/simple.c:1045
+#: ../libpurple/protocols/yahoo/yahoo.c:2126
 msgid "Incorrect password."
 msgstr "Mật khẩu sai."
 
@@ -8730,10 +8709,10 @@
 #. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
 #.
 #: ../libpurple/protocols/oscar/oscar.c:1452
-#: ../libpurple/protocols/oscar/oscar.c:2228
-#: ../libpurple/protocols/oscar/oscar.c:2277
-#: ../libpurple/protocols/oscar/oscar.c:5883
-#: ../libpurple/protocols/oscar/oscar.c:6164 ../libpurple/request.h:1388
+#: ../libpurple/protocols/oscar/oscar.c:2232
+#: ../libpurple/protocols/oscar/oscar.c:2281
+#: ../libpurple/protocols/oscar/oscar.c:5885
+#: ../libpurple/protocols/oscar/oscar.c:6166 ../libpurple/request.h:1388
 #, fuzzy
 msgid "_OK"
 msgstr "Đồng ý"
@@ -8775,31 +8754,31 @@
 msgid "Unable to initialize connection"
 msgstr "Không tạo được kết nối mới."
 
-#: ../libpurple/protocols/oscar/oscar.c:2198
+#: ../libpurple/protocols/oscar/oscar.c:2202
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr "Hãy xác thực tôi để tôi có thể thêm bạn vào danh sách buddy."
 
-#: ../libpurple/protocols/oscar/oscar.c:2226
+#: ../libpurple/protocols/oscar/oscar.c:2230
 msgid "Authorization Request Message:"
 msgstr "Thông điệp yêu cầu xác thực:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2227
+#: ../libpurple/protocols/oscar/oscar.c:2231
 msgid "Please authorize me!"
 msgstr "Hãy xác thực tôi!"
 
-#: ../libpurple/protocols/oscar/oscar.c:2268
-#: ../libpurple/protocols/oscar/oscar.c:2276
-#: ../libpurple/protocols/oscar/oscar.c:2403
-#: ../libpurple/protocols/oscar/oscar.c:5259
-#: ../libpurple/protocols/yahoo/yahoo.c:1029
+#: ../libpurple/protocols/oscar/oscar.c:2272
+#: ../libpurple/protocols/oscar/oscar.c:2280
+#: ../libpurple/protocols/oscar/oscar.c:2407
+#: ../libpurple/protocols/oscar/oscar.c:5263
+#: ../libpurple/protocols/yahoo/yahoo.c:1030
 msgid "No reason given."
 msgstr "Không nêu lý do."
 
-#: ../libpurple/protocols/oscar/oscar.c:2275
+#: ../libpurple/protocols/oscar/oscar.c:2279
 msgid "Authorization Denied Message:"
 msgstr "Thông điệp từ chối xác thực:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2403
+#: ../libpurple/protocols/oscar/oscar.c:2407
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -8810,17 +8789,17 @@
 "sau:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2404
+#: ../libpurple/protocols/oscar/oscar.c:2408
 msgid "ICQ authorization denied."
 msgstr "Xác thực ICQ bị từ chối."
 
 #. Someone has granted you authorization
-#: ../libpurple/protocols/oscar/oscar.c:2411
+#: ../libpurple/protocols/oscar/oscar.c:2415
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
 msgstr "Người dùng %u đã cho phép bạn thêm họ vào danh sách buddy của bạn."
 
-#: ../libpurple/protocols/oscar/oscar.c:2419
+#: ../libpurple/protocols/oscar/oscar.c:2423
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -8833,7 +8812,7 @@
 "Từ: %s [%s]\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2427
+#: ../libpurple/protocols/oscar/oscar.c:2431
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -8846,7 +8825,7 @@
 "Từ: %s [%s]\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2435
+#: ../libpurple/protocols/oscar/oscar.c:2439
 #, c-format
 msgid ""
 "You have received an ICQ e-mail from %s [%s]\n"
@@ -8859,40 +8838,40 @@
 "Thông điệp:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2456
+#: ../libpurple/protocols/oscar/oscar.c:2460
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
 msgstr "Người dùng ICQ %u gửi tới bạn một buddy: %s (%s)"
 
-#: ../libpurple/protocols/oscar/oscar.c:2462
+#: ../libpurple/protocols/oscar/oscar.c:2466
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr "Bạn muốn thêm người này vào danh sách buddy của bạn không?"
 
-#: ../libpurple/protocols/oscar/oscar.c:2467 ../pidgin/gtkroomlist.c:309
+#: ../libpurple/protocols/oscar/oscar.c:2471 ../pidgin/gtkroomlist.c:309
 #, fuzzy
 msgid "_Add"
 msgstr "Thêm"
 
-#: ../libpurple/protocols/oscar/oscar.c:2468
+#: ../libpurple/protocols/oscar/oscar.c:2472
 #, fuzzy
 msgid "_Decline"
 msgstr "Từ chối"
 
-#: ../libpurple/protocols/oscar/oscar.c:2592
+#: ../libpurple/protocols/oscar/oscar.c:2596
 #, c-format
 msgid "You missed %hu message from %s because it was invalid."
 msgid_plural "You missed %hu messages from %s because they were invalid."
 msgstr[0] "Bạn không nhận được %hu thông điệp từ %s vì nó không hợp lệ."
 msgstr[1] "Bạn không nhận được %hu thông điệp từ %s vì chúng không hợp lệ."
 
-#: ../libpurple/protocols/oscar/oscar.c:2601
+#: ../libpurple/protocols/oscar/oscar.c:2605
 #, c-format
 msgid "You missed %hu message from %s because it was too large."
 msgid_plural "You missed %hu messages from %s because they were too large."
 msgstr[0] "Bạn không nhận được %hu thông điệp từ %s vì nó quá lớn."
 msgstr[1] "Bạn không nhận được %hu thông điệp từ %s vì chúng quá lớn."
 
-#: ../libpurple/protocols/oscar/oscar.c:2610
+#: ../libpurple/protocols/oscar/oscar.c:2614
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -8903,21 +8882,21 @@
 msgstr[1] ""
 "Bạn không nhận được %hu thông điệp từ %s vì đã vược quá mức giới hạn."
 
-#: ../libpurple/protocols/oscar/oscar.c:2619
+#: ../libpurple/protocols/oscar/oscar.c:2623
 #, c-format
 msgid "You missed %hu message from %s because he/she was too evil."
 msgid_plural "You missed %hu messages from %s because he/she was too evil."
 msgstr[0] "Bạn không nhận được %hu thông điệp từ %s vì họ quá bảo mật."
 msgstr[1] "Bạn không nhận được %hu thông điệp từ %s vì họ quá bảo mật."
 
-#: ../libpurple/protocols/oscar/oscar.c:2628
+#: ../libpurple/protocols/oscar/oscar.c:2632
 #, c-format
 msgid "You missed %hu message from %s because you are too evil."
 msgid_plural "You missed %hu messages from %s because you are too evil."
 msgstr[0] "Bạn không nhận được %hu thông điệp từ %s vì bạn quá bảo mật."
 msgstr[1] "Bạn không nhận được %hu thông điệp từ %s vì bạn quá bảo mật."
 
-#: ../libpurple/protocols/oscar/oscar.c:2637
+#: ../libpurple/protocols/oscar/oscar.c:2641
 #, c-format
 msgid "You missed %hu message from %s for an unknown reason."
 msgid_plural "You missed %hu messages from %s for an unknown reason."
@@ -8925,57 +8904,57 @@
 msgstr[1] "Bạn không nhận được %hu thông điệp từ %s do lỗi chưa xác định."
 
 #. Data is assumed to be the destination sn
-#: ../libpurple/protocols/oscar/oscar.c:2792
+#: ../libpurple/protocols/oscar/oscar.c:2796
 #, fuzzy, c-format
 msgid "Unable to send message: %s"
 msgstr "Không thể gửi thông điệp."
 
-#: ../libpurple/protocols/oscar/oscar.c:2792
-#: ../libpurple/protocols/oscar/oscar.c:2797
-#: ../libpurple/protocols/oscar/oscar.c:2861
+#: ../libpurple/protocols/oscar/oscar.c:2796
+#: ../libpurple/protocols/oscar/oscar.c:2801
+#: ../libpurple/protocols/oscar/oscar.c:2865
 #, fuzzy
 msgid "Unknown reason."
 msgstr "Lỗi không xác định."
 
-#: ../libpurple/protocols/oscar/oscar.c:2795
+#: ../libpurple/protocols/oscar/oscar.c:2799
 #: ../libpurple/protocols/sametime/sametime.c:2409
 #, fuzzy, c-format
 msgid "Unable to send message to %s:"
 msgstr "Không thể gửi thông điệp."
 
-#: ../libpurple/protocols/oscar/oscar.c:2861
+#: ../libpurple/protocols/oscar/oscar.c:2865
 #, fuzzy, c-format
 msgid "User information not available: %s"
 msgstr "Không có thông tin về %s:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2892
+#: ../libpurple/protocols/oscar/oscar.c:2896
 #, fuzzy
 msgid "Online Since"
 msgstr "Đã kết nối từ"
 
-#: ../libpurple/protocols/oscar/oscar.c:2897
+#: ../libpurple/protocols/oscar/oscar.c:2901
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1185
 msgid "Member Since"
 msgstr "Là thành viên từ "
 
-#: ../libpurple/protocols/oscar/oscar.c:2932
+#: ../libpurple/protocols/oscar/oscar.c:2936
 #, fuzzy
 msgid "Available Message"
 msgstr "Thông báo có mặt:"
 
-#: ../libpurple/protocols/oscar/oscar.c:3040
+#: ../libpurple/protocols/oscar/oscar.c:3044
 msgid "Your AIM connection may be lost."
 msgstr "Bạn có thể đã bị ngắt kết nối với AIM"
 
 #. The conversion failed!
-#: ../libpurple/protocols/oscar/oscar.c:3228
+#: ../libpurple/protocols/oscar/oscar.c:3232
 #, fuzzy
 msgid ""
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
 msgstr "Bạn không nhận được %hu thông điệp từ %s vì nó không hợp lệ."
 
-#: ../libpurple/protocols/oscar/oscar.c:3392
+#: ../libpurple/protocols/oscar/oscar.c:3396
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
@@ -8983,83 +8962,84 @@
 "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."
 
-#: ../libpurple/protocols/oscar/oscar.c:3475
+#: ../libpurple/protocols/oscar/oscar.c:3479
 #: ../libpurple/protocols/toc/toc.c:977
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "Bạn đã bị ngắt kết nối với phòng Chat %s."
 
-#: ../libpurple/protocols/oscar/oscar.c:3725
+#: ../libpurple/protocols/oscar/oscar.c:3729
 #: ../libpurple/protocols/silc/util.c:585
 #: ../libpurple/protocols/silc10/util.c:581
 msgid "Mobile Phone"
 msgstr "Số điện thoại đi động"
 
-#: ../libpurple/protocols/oscar/oscar.c:3755
+#: ../libpurple/protocols/oscar/oscar.c:3759
 msgid "Personal Web Page"
 msgstr "Trang web cá nhân"
 
-#: ../libpurple/protocols/oscar/oscar.c:3779
+#: ../libpurple/protocols/oscar/oscar.c:3783
 #: ../libpurple/protocols/qq/buddy_info.c:40
 msgid "Additional Information"
 msgstr "Thông tin thêm"
 
-#: ../libpurple/protocols/oscar/oscar.c:3787
-#: ../libpurple/protocols/oscar/oscar.c:3800
+#: ../libpurple/protocols/oscar/oscar.c:3791
+#: ../libpurple/protocols/oscar/oscar.c:3804
 msgid "Zip Code"
 msgstr "Mã bưu điện"
 
-#: ../libpurple/protocols/oscar/oscar.c:3811
+#: ../libpurple/protocols/oscar/oscar.c:3815
 msgid "Division"
 msgstr "Bộ phận"
 
-#: ../libpurple/protocols/oscar/oscar.c:3812
+#: ../libpurple/protocols/oscar/oscar.c:3816
 msgid "Position"
 msgstr "Chức vụ"
 
-#: ../libpurple/protocols/oscar/oscar.c:3814
+#: ../libpurple/protocols/oscar/oscar.c:3818
 msgid "Web Page"
 msgstr "Trang Web"
 
-#: ../libpurple/protocols/oscar/oscar.c:3817
+#: ../libpurple/protocols/oscar/oscar.c:3821
 msgid "Work Information"
 msgstr "Thông tin về công việc"
 
-#: ../libpurple/protocols/oscar/oscar.c:3873
+#: ../libpurple/protocols/oscar/oscar.c:3877
 msgid "Pop-Up Message"
 msgstr "Thông điệp bật lên"
 
-#: ../libpurple/protocols/oscar/oscar.c:3913
+#: ../libpurple/protocols/oscar/oscar.c:3917
 #, fuzzy, c-format
 msgid "The following screen name is associated with %s"
 msgid_plural "The following screen names are associated with %s"
 msgstr[0] "Tên hiển thị sau đây là liên quan với %s"
 msgstr[1] "Tên hiển thị sau đây là liên quan với %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:3918
+#: ../libpurple/protocols/oscar/oscar.c:3922
 #, fuzzy
 msgid "Screen name"
 msgstr "Tên _hiển thị"
 
-#: ../libpurple/protocols/oscar/oscar.c:3944
+#: ../libpurple/protocols/oscar/oscar.c:3948
 #, c-format
 msgid "No results found for e-mail address %s"
 msgstr "Không tìm thấy người nào có điạ chỉ e-mail %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:3965
+#: ../libpurple/protocols/oscar/oscar.c:3969
 #, c-format
 msgid "You should receive an e-mail asking to confirm %s."
 msgstr "Bạn sẽ nhận được một e-mail yêu cầu xác nhận %s."
 
-#: ../libpurple/protocols/oscar/oscar.c:3967
+#: ../libpurple/protocols/oscar/oscar.c:3971
 msgid "Account Confirmation Requested"
 msgstr "Yêu cầu xác nhận tài khoản"
 
-#: ../libpurple/protocols/oscar/oscar.c:3998
+#: ../libpurple/protocols/oscar/oscar.c:4002
+#, c-format
 msgid "Error Changing Account Info"
 msgstr "Có lỗi khi thay đổi thông tin tài khoản"
 
-#: ../libpurple/protocols/oscar/oscar.c:4001
+#: ../libpurple/protocols/oscar/oscar.c:4005
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -9068,19 +9048,19 @@
 "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)."
 
-#: ../libpurple/protocols/oscar/oscar.c:4004
+#: ../libpurple/protocols/oscar/oscar.c:4008
 #, fuzzy, c-format
 msgid "Error 0x%04x: Unable to format screen name because it is invalid."
 msgstr "Lỗi 0x%04x: Không thể định dạng tên hiển thị bởi vì nó quá dài."
 
-#: ../libpurple/protocols/oscar/oscar.c:4007
+#: ../libpurple/protocols/oscar/oscar.c:4011
 #, 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."
 
-#: ../libpurple/protocols/oscar/oscar.c:4010
+#: ../libpurple/protocols/oscar/oscar.c:4014
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because there is already a "
@@ -9089,7 +9069,7 @@
 "Lỗi 0x%04x: Không đổi được địa chỉ e-mail vì đã có một yêu cầu được xử lý "
 "cho tên hiển thị này."
 
-#: ../libpurple/protocols/oscar/oscar.c:4013
+#: ../libpurple/protocols/oscar/oscar.c:4017
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address has "
@@ -9098,7 +9078,7 @@
 "Lỗi 0x%04x: Không đổi được địa chỉ e-mail vì có quá nhiều tên hiển thị có "
 "liên quan với địa chỉ này."
 
-#: ../libpurple/protocols/oscar/oscar.c:4016
+#: ../libpurple/protocols/oscar/oscar.c:4020
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address is "
@@ -9107,30 +9087,30 @@
 "Lỗi 0x%04x: Không thay đổi được địa chỉ e-mail vì địa chỉ đưa ra không hợp "
 "lệ."
 
-#: ../libpurple/protocols/oscar/oscar.c:4019
+#: ../libpurple/protocols/oscar/oscar.c:4023
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "Lỗi 0x%04x: lỗi không xác định."
 
-#: ../libpurple/protocols/oscar/oscar.c:4029
+#: ../libpurple/protocols/oscar/oscar.c:4033
 #, c-format
 msgid "The e-mail address for %s is %s"
 msgstr "Địa chỉ e-mail của %s là %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:4031
+#: ../libpurple/protocols/oscar/oscar.c:4035
 msgid "Account Info"
 msgstr "Thông tin tài khoản"
 
-#: ../libpurple/protocols/oscar/oscar.c:4214
+#: ../libpurple/protocols/oscar/oscar.c:4218
 msgid ""
 "Your IM Image was not sent. You must be Direct Connected to send IM Images."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:4485
+#: ../libpurple/protocols/oscar/oscar.c:4489
 msgid "Unable to set AIM profile."
 msgstr "Không thể lập lý lịch AIM."
 
-#: ../libpurple/protocols/oscar/oscar.c:4486
+#: ../libpurple/protocols/oscar/oscar.c:4490
 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 "
@@ -9139,7 +9119,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."
 
-#: ../libpurple/protocols/oscar/oscar.c:4500
+#: ../libpurple/protocols/oscar/oscar.c:4504
 #, fuzzy, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  It has been "
@@ -9152,11 +9132,11 @@
 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."
 
-#: ../libpurple/protocols/oscar/oscar.c:4505
+#: ../libpurple/protocols/oscar/oscar.c:4509
 msgid "Profile too long."
 msgstr "Lý lịch quá dài."
 
-#: ../libpurple/protocols/oscar/oscar.c:4550
+#: ../libpurple/protocols/oscar/oscar.c:4554
 #, fuzzy, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  It has been "
@@ -9171,11 +9151,11 @@
 "Đã 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."
 
-#: ../libpurple/protocols/oscar/oscar.c:4555
+#: ../libpurple/protocols/oscar/oscar.c:4559
 msgid "Away message too long."
 msgstr "Thông báo trạng thái quá dài."
 
-#: ../libpurple/protocols/oscar/oscar.c:4624
+#: ../libpurple/protocols/oscar/oscar.c:4628
 #, c-format
 msgid ""
 "Could not add the buddy %s because the screen name is invalid.  Screen names "
@@ -9183,17 +9163,17 @@
 "letters, numbers and spaces, or contain only numbers."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:4626
-#: ../libpurple/protocols/oscar/oscar.c:5056
-#: ../libpurple/protocols/oscar/oscar.c:5071
+#: ../libpurple/protocols/oscar/oscar.c:4630
+#: ../libpurple/protocols/oscar/oscar.c:5060
+#: ../libpurple/protocols/oscar/oscar.c:5075
 msgid "Unable To Add"
 msgstr "Không thể thêm"
 
-#: ../libpurple/protocols/oscar/oscar.c:4735
+#: ../libpurple/protocols/oscar/oscar.c:4739
 msgid "Unable To Retrieve Buddy List"
 msgstr "Không thể nhận danh sách Buddy"
 
-#: ../libpurple/protocols/oscar/oscar.c:4736
+#: ../libpurple/protocols/oscar/oscar.c:4740
 #, fuzzy
 msgid ""
 "The AIM servers were temporarily unable to send your buddy list.  Your buddy "
@@ -9202,15 +9182,15 @@
 "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."
 
-#: ../libpurple/protocols/oscar/oscar.c:4918
-#: ../libpurple/protocols/oscar/oscar.c:4920
-#: ../libpurple/protocols/oscar/oscar.c:5136
-#: ../libpurple/protocols/oscar/oscar.c:5137
-#: ../libpurple/protocols/oscar/oscar.c:5142
+#: ../libpurple/protocols/oscar/oscar.c:4922
+#: ../libpurple/protocols/oscar/oscar.c:4924
+#: ../libpurple/protocols/oscar/oscar.c:5140
+#: ../libpurple/protocols/oscar/oscar.c:5141
+#: ../libpurple/protocols/oscar/oscar.c:5146
 msgid "Orphans"
 msgstr "Một mình"
 
-#: ../libpurple/protocols/oscar/oscar.c:5054
+#: ../libpurple/protocols/oscar/oscar.c:5058
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -9219,17 +9199,17 @@
 "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."
 
-#: ../libpurple/protocols/oscar/oscar.c:5054
-#: ../libpurple/protocols/oscar/oscar.c:5069
+#: ../libpurple/protocols/oscar/oscar.c:5058
+#: ../libpurple/protocols/oscar/oscar.c:5073
 msgid "(no name)"
 msgstr "(không tên)"
 
-#: ../libpurple/protocols/oscar/oscar.c:5068
+#: ../libpurple/protocols/oscar/oscar.c:5072
 #, fuzzy, c-format
 msgid "Could not add the buddy %s 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."
 
-#: ../libpurple/protocols/oscar/oscar.c:5174
+#: ../libpurple/protocols/oscar/oscar.c:5178
 #, c-format
 msgid ""
 "The user %s has given you permission to add you to their buddy list.  Do you "
@@ -9238,22 +9218,22 @@
 "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?"
 
-#: ../libpurple/protocols/oscar/oscar.c:5182
+#: ../libpurple/protocols/oscar/oscar.c:5186
 msgid "Authorization Given"
 msgstr "Xác thực được trao"
 
 #. Granted
-#: ../libpurple/protocols/oscar/oscar.c:5255
+#: ../libpurple/protocols/oscar/oscar.c:5259
 #, 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."
 
-#: ../libpurple/protocols/oscar/oscar.c:5256
+#: ../libpurple/protocols/oscar/oscar.c:5260
 msgid "Authorization Granted"
 msgstr "Xác thực được chấp thuận"
 
 #. Denied
-#: ../libpurple/protocols/oscar/oscar.c:5259
+#: ../libpurple/protocols/oscar/oscar.c:5263
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -9264,54 +9244,54 @@
 "với lý do sau:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:5260
+#: ../libpurple/protocols/oscar/oscar.c:5264
 msgid "Authorization Denied"
 msgstr "Xác thực bị từ chối"
 
-#: ../libpurple/protocols/oscar/oscar.c:5296
+#: ../libpurple/protocols/oscar/oscar.c:5300
 #: ../libpurple/protocols/toc/toc.c:1371
 msgid "_Exchange:"
 msgstr "_Trao đổi:"
 
-#: ../libpurple/protocols/oscar/oscar.c:5336
+#: ../libpurple/protocols/oscar/oscar.c:5340
 #, fuzzy
 msgid "Invalid chat name specified."
 msgstr "Đặc tả Gadu-Gadu UIN không hợp lệ"
 
-#: ../libpurple/protocols/oscar/oscar.c:5405
+#: ../libpurple/protocols/oscar/oscar.c:5409
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:5567
-#: ../libpurple/protocols/oscar/oscar.c:5572
+#: ../libpurple/protocols/oscar/oscar.c:5569
+#: ../libpurple/protocols/oscar/oscar.c:5574
 #, fuzzy
 msgid "Away Message"
 msgstr "Thông báo trạng thái"
 
-#: ../libpurple/protocols/oscar/oscar.c:5572
+#: ../libpurple/protocols/oscar/oscar.c:5574
 #, fuzzy
 msgid "<i>(retrieving)</i>"
 msgstr " <i>(identified)</i>"
 
-#: ../libpurple/protocols/oscar/oscar.c:5772
+#: ../libpurple/protocols/oscar/oscar.c:5774
 msgid "iTunes Music Store Link"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:5880
+#: ../libpurple/protocols/oscar/oscar.c:5882
 #, fuzzy, c-format
 msgid "Buddy Comment for %s"
 msgstr "Chú thích Buddy:"
 
-#: ../libpurple/protocols/oscar/oscar.c:5881
+#: ../libpurple/protocols/oscar/oscar.c:5883
 msgid "Buddy Comment:"
 msgstr "Chú thích Buddy:"
 
-#: ../libpurple/protocols/oscar/oscar.c:5928
+#: ../libpurple/protocols/oscar/oscar.c:5930
 #, 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."
 
-#: ../libpurple/protocols/oscar/oscar.c:5932
+#: ../libpurple/protocols/oscar/oscar.c:5934
 #, fuzzy
 msgid ""
 "Because this reveals your IP address, it may be considered a security risk.  "
@@ -9320,69 +9300,69 @@
 "Đ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?"
 
-#: ../libpurple/protocols/oscar/oscar.c:5938
+#: ../libpurple/protocols/oscar/oscar.c:5940
 #: ../libpurple/protocols/oscar/peer.c:1045
 #, fuzzy
 msgid "C_onnect"
 msgstr "Kết nối"
 
-#: ../libpurple/protocols/oscar/oscar.c:5973
+#: ../libpurple/protocols/oscar/oscar.c:5975
 #, fuzzy
 msgid "Get AIM Info"
 msgstr "Lấy thông tin"
 
-#: ../libpurple/protocols/oscar/oscar.c:5979
+#: ../libpurple/protocols/oscar/oscar.c:5981
 msgid "Edit Buddy Comment"
 msgstr "Hiệu chỉnh chú thích Buddy"
 
-#: ../libpurple/protocols/oscar/oscar.c:5987
+#: ../libpurple/protocols/oscar/oscar.c:5989
 msgid "Get Status Msg"
 msgstr "Xem hiển thị trạng thái"
 
-#: ../libpurple/protocols/oscar/oscar.c:6000
+#: ../libpurple/protocols/oscar/oscar.c:6002
 msgid "Direct IM"
 msgstr "Nhắn Tin Nhanh Trực Tiếp"
 
-#: ../libpurple/protocols/oscar/oscar.c:6022
+#: ../libpurple/protocols/oscar/oscar.c:6024
 msgid "Re-request Authorization"
 msgstr "Yêu cầu lại xác thực"
 
-#: ../libpurple/protocols/oscar/oscar.c:6081
+#: ../libpurple/protocols/oscar/oscar.c:6083
 #, fuzzy
 msgid "Require authorization"
 msgstr "Yêu cầu xác thực"
 
-#: ../libpurple/protocols/oscar/oscar.c:6084
+#: ../libpurple/protocols/oscar/oscar.c:6086
 msgid "Web aware (enabling this will cause you to receive SPAM!)"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:6089
+#: ../libpurple/protocols/oscar/oscar.c:6091
 #, fuzzy
 msgid "ICQ Privacy Options"
 msgstr "Tùy chọn Proxy"
 
-#: ../libpurple/protocols/oscar/oscar.c:6108
+#: ../libpurple/protocols/oscar/oscar.c:6110
 msgid "The new formatting is invalid."
 msgstr "Định dạng mới không hợp lệ."
 
-#: ../libpurple/protocols/oscar/oscar.c:6109
+#: ../libpurple/protocols/oscar/oscar.c:6111
 #, fuzzy
 msgid "Screen name 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."
 
-#: ../libpurple/protocols/oscar/oscar.c:6162
+#: ../libpurple/protocols/oscar/oscar.c:6164
 msgid "Change Address To:"
 msgstr "Đổi địa chỉ thành:"
 
-#: ../libpurple/protocols/oscar/oscar.c:6208
+#: ../libpurple/protocols/oscar/oscar.c:6210
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>bạn không đang chờ xác thực</i>"
 
-#: ../libpurple/protocols/oscar/oscar.c:6211
+#: ../libpurple/protocols/oscar/oscar.c:6213
 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"
 
-#: ../libpurple/protocols/oscar/oscar.c:6212
+#: ../libpurple/protocols/oscar/oscar.c:6214
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
@@ -9390,82 +9370,82 @@
 "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.\""
 
-#: ../libpurple/protocols/oscar/oscar.c:6229
+#: ../libpurple/protocols/oscar/oscar.c:6231
 msgid "Find Buddy by E-Mail"
 msgstr "Tìm Buddy dựa theo địa chỉ e-mail"
 
-#: ../libpurple/protocols/oscar/oscar.c:6230
+#: ../libpurple/protocols/oscar/oscar.c:6232
 msgid "Search for a buddy by e-mail address"
 msgstr "Tìm kiếm buddy bằng địa chỉ e-mail"
 
-#: ../libpurple/protocols/oscar/oscar.c:6231
+#: ../libpurple/protocols/oscar/oscar.c:6233
 msgid "Type the e-mail address of the buddy you are searching for."
 msgstr "Hãy nhập địa chỉ e-mail của buddy mà bạn cần tìm."
 
-#: ../libpurple/protocols/oscar/oscar.c:6234
+#: ../libpurple/protocols/oscar/oscar.c:6236
 #, fuzzy
 msgid "_Search"
 msgstr "Tìm kiếm"
 
-#: ../libpurple/protocols/oscar/oscar.c:6392
+#: ../libpurple/protocols/oscar/oscar.c:6394
 #, fuzzy
 msgid "Set User Info (URL)..."
 msgstr "Lập thông tin người dùng..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6403
+#: ../libpurple/protocols/oscar/oscar.c:6405
 msgid "Change Password (URL)"
 msgstr "Đổi mật khẩu (URL)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6407
+#: ../libpurple/protocols/oscar/oscar.c:6409
 msgid "Configure IM Forwarding (URL)"
 msgstr "Cấu hình chuyển tiếp Nhắn Tin Nhanh (URL)"
 
 #. ICQ actions
-#: ../libpurple/protocols/oscar/oscar.c:6417
+#: ../libpurple/protocols/oscar/oscar.c:6419
 #, fuzzy
 msgid "Set Privacy Options..."
 msgstr "Hiển thị nhiều tùy chọn"
 
 #. AIM actions
-#: ../libpurple/protocols/oscar/oscar.c:6424
+#: ../libpurple/protocols/oscar/oscar.c:6426
 msgid "Confirm Account"
 msgstr "Xác nhận tài khoản"
 
-#: ../libpurple/protocols/oscar/oscar.c:6428
+#: ../libpurple/protocols/oscar/oscar.c:6430
 #, fuzzy
 msgid "Display Currently Registered E-Mail Address"
 msgstr "Hiển thị địa chỉ đăng ký hiện thời"
 
-#: ../libpurple/protocols/oscar/oscar.c:6432
+#: ../libpurple/protocols/oscar/oscar.c:6434
 #, fuzzy
 msgid "Change Currently Registered E-Mail Address..."
 msgstr "Đổi địa chỉ đăng ký hiện thời..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6439
+#: ../libpurple/protocols/oscar/oscar.c:6441
 msgid "Show Buddies Awaiting Authorization"
 msgstr "Hiển thị các buddy chờ xác thực"
 
-#: ../libpurple/protocols/oscar/oscar.c:6445
+#: ../libpurple/protocols/oscar/oscar.c:6447
 #, fuzzy
 msgid "Search for Buddy by E-Mail Address..."
 msgstr "Tìm kiếm buddy theo e-mail..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6450
+#: ../libpurple/protocols/oscar/oscar.c:6452
 #, fuzzy
 msgid "Search for Buddy by Information"
 msgstr "Tìm kiếm buddy theo e-mail..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6518
+#: ../libpurple/protocols/oscar/oscar.c:6520
 #, fuzzy
 msgid "Use recent buddies group"
 msgstr "Người dùng không có trong nhóm"
 
-#: ../libpurple/protocols/oscar/oscar.c:6521
+#: ../libpurple/protocols/oscar/oscar.c:6523
 #, fuzzy
 msgid "Show how long you have been idle"
 msgstr "Cho phép bạn đặt ra thời gian sau bao lâu sẽ báo trạng thái nghỉ"
 
-#: ../libpurple/protocols/oscar/oscar.c:6676
+#: ../libpurple/protocols/oscar/oscar.c:6678
 msgid ""
 "Always use ICQ proxy server for file transfers\n"
 "(slower, but does not reveal your IP address)"
@@ -9482,7 +9462,7 @@
 msgstr "Xác thực"
 
 #: ../libpurple/protocols/oscar/peer.c:856
-#, fuzzy
+#, fuzzy, c-format
 msgid "Attempting to connect via proxy server."
 msgstr "Xác thực"
 
@@ -9992,7 +9972,7 @@
 msgid "Error requesting login token"
 msgstr "Lỗi khi tạo kết nối"
 
-#: ../libpurple/protocols/qq/login_logout.c:488
+#: ../libpurple/protocols/qq/login_logout.c:486
 #, fuzzy
 msgid "Unable to login, check debug log"
 msgstr "Không thể đăng nhập bằng MD5"
@@ -10404,7 +10384,7 @@
 msgid "Send TEST Announcement"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:3586 ../pidgin/gtkconv.c:4417
+#: ../libpurple/protocols/sametime/sametime.c:3586 ../pidgin/gtkconv.c:4354
 msgid "Topic:"
 msgstr "Chủ đề:"
 
@@ -10430,7 +10410,7 @@
 msgid "No Sametime Community Server Specified"
 msgstr "Kết nối máy chủ"
 
-#: ../libpurple/protocols/sametime/sametime.c:3644 ../pidgin/gtkblist.c:4323
+#: ../libpurple/protocols/sametime/sametime.c:3644 ../pidgin/gtkblist.c:4041
 msgid "Connect"
 msgstr "Kết nối"
 
@@ -10483,6 +10463,11 @@
 "entry has been removed from your buddy list."
 msgstr ""
 
+#: ../libpurple/protocols/sametime/sametime.c:4425
+#, fuzzy
+msgid "Unable to add user"
+msgstr "Không thể truyền"
+
 #: ../libpurple/protocols/sametime/sametime.c:5011
 #, fuzzy, c-format
 msgid ""
@@ -10602,7 +10587,7 @@
 "buttons below."
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5538 ../pidgin/gtknotify.c:755
+#: ../libpurple/protocols/sametime/sametime.c:5538 ../pidgin/gtknotify.c:756
 msgid "Search Results"
 msgstr "Kết quả tìm kiếm"
 
@@ -11194,6 +11179,7 @@
 
 #: ../libpurple/protocols/silc/chat.c:153
 #: ../libpurple/protocols/silc10/chat.c:152
+#, c-format
 msgid "<br><b>Channel Modes:</b> "
 msgstr ""
 
@@ -11233,6 +11219,7 @@
 
 #: ../libpurple/protocols/silc/chat.c:435
 #: ../libpurple/protocols/silc10/chat.c:413
+#, c-format
 msgid ""
 "Channel authentication is used to secure the channel from unauthorized "
 "access. The authentication may be based on passphrase and digital "
@@ -11883,7 +11870,7 @@
 msgstr "Kết nối máy chủ"
 
 #: ../libpurple/protocols/silc/silc.c:352
-#, fuzzy
+#, fuzzy, c-format
 msgid "Could not load SILC key pair"
 msgstr "Không thể đổi biệt danh (nick)"
 
@@ -11915,7 +11902,8 @@
 msgstr "Hiện thời trên"
 
 #: ../libpurple/protocols/silc/silc.c:741
-#: ../libpurple/protocols/silc10/silc.c:652 ../pidgin/gtkprefs.c:1643
+#: ../libpurple/protocols/silc10/silc.c:652 ../pidgin/gtkprefs.c:1641
+#, c-format
 msgid "Normal"
 msgstr ""
 
@@ -12310,7 +12298,7 @@
 msgstr ""
 
 #: ../libpurple/protocols/silc/silc.c:1910
-#: ../libpurple/protocols/silc10/silc.c:1853 ../pidgin/gtkprefs.c:2038
+#: ../libpurple/protocols/silc10/silc.c:1853 ../pidgin/gtkprefs.c:2036
 msgid "Network"
 msgstr ""
 
@@ -12510,43 +12498,52 @@
 msgstr "Hiện không có hành động nào"
 
 #: ../libpurple/protocols/silc10/ops.c:1931
+#, c-format
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr ""
 
 #: ../libpurple/protocols/silc10/ops.c:1934
+#, c-format
 msgid "Failure: Remote does not trust/support your public key"
 msgstr ""
 
 #: ../libpurple/protocols/silc10/ops.c:1937
+#, c-format
 msgid "Failure: Remote does not support proposed KE group"
 msgstr ""
 
 #: ../libpurple/protocols/silc10/ops.c:1940
+#, c-format
 msgid "Failure: Remote does not support proposed cipher"
 msgstr ""
 
 #: ../libpurple/protocols/silc10/ops.c:1943
+#, c-format
 msgid "Failure: Remote does not support proposed PKCS"
 msgstr ""
 
 #: ../libpurple/protocols/silc10/ops.c:1946
+#, c-format
 msgid "Failure: Remote does not support proposed hash function"
 msgstr ""
 
 #: ../libpurple/protocols/silc10/ops.c:1949
+#, c-format
 msgid "Failure: Remote does not support proposed HMAC"
 msgstr ""
 
 #: ../libpurple/protocols/silc10/ops.c:1951
+#, c-format
 msgid "Failure: Incorrect signature"
 msgstr ""
 
 #: ../libpurple/protocols/silc10/ops.c:1953
+#, c-format
 msgid "Failure: Invalid cookie"
 msgstr ""
 
 #: ../libpurple/protocols/silc10/ops.c:1964
-#, fuzzy
+#, fuzzy, c-format
 msgid "Failure: Authentication failed"
 msgstr "Không xác thực được"
 
@@ -12577,34 +12574,34 @@
 msgstr "Không thể gửi"
 
 #: ../libpurple/protocols/simple/simple.c:438
-#: ../libpurple/protocols/simple/simple.c:1531
+#: ../libpurple/protocols/simple/simple.c:1529
 msgid "Could not connect"
 msgstr "Không thể kết nối"
 
-#: ../libpurple/protocols/simple/simple.c:1061
+#: ../libpurple/protocols/simple/simple.c:1059
 #, fuzzy
 msgid "Unknown server response."
 msgstr "Lỗi không xác định"
 
-#: ../libpurple/protocols/simple/simple.c:1565
-#: ../libpurple/protocols/simple/simple.c:1607
-#: ../libpurple/protocols/simple/simple.c:1620
-#: ../libpurple/protocols/simple/simple.c:1671
+#: ../libpurple/protocols/simple/simple.c:1563
+#: ../libpurple/protocols/simple/simple.c:1605
+#: ../libpurple/protocols/simple/simple.c:1618
+#: ../libpurple/protocols/simple/simple.c:1669
 #, fuzzy
 msgid "Could not create listen socket"
 msgstr "Không tạo được socket"
 
-#: ../libpurple/protocols/simple/simple.c:1588
+#: ../libpurple/protocols/simple/simple.c:1586
 #, fuzzy
 msgid "Couldn't resolve host"
 msgstr "Không kết nối được với máy chủ"
 
-#: ../libpurple/protocols/simple/simple.c:1679
+#: ../libpurple/protocols/simple/simple.c:1677
 #, fuzzy
 msgid "Could not resolve hostname"
 msgstr "Không xử lý được tên máy chủ."
 
-#: ../libpurple/protocols/simple/simple.c:1696
+#: ../libpurple/protocols/simple/simple.c:1694
 #, fuzzy
 msgid "SIP screen names may not contain whitespaces or @ symbols"
 msgstr "Biệt danh (nick) cho IRC không được chứa dấu cách"
@@ -12617,41 +12614,41 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../libpurple/protocols/simple/simple.c:1872
+#: ../libpurple/protocols/simple/simple.c:1870
 #, fuzzy
 msgid "SIP/SIMPLE Protocol Plugin"
 msgstr "Plugin giao thức IRC"
 
 #. *  summary
-#: ../libpurple/protocols/simple/simple.c:1873
+#: ../libpurple/protocols/simple/simple.c:1871
 #, fuzzy
 msgid "The SIP/SIMPLE Protocol Plugin"
 msgstr "Plugin giao thức IRC"
 
-#: ../libpurple/protocols/simple/simple.c:1901
+#: ../libpurple/protocols/simple/simple.c:1899
 msgid "Publish status (note: everyone may watch you)"
 msgstr ""
 
-#: ../libpurple/protocols/simple/simple.c:1907
+#: ../libpurple/protocols/simple/simple.c:1905
 #, fuzzy
 msgid "Use UDP"
 msgstr "Dùng"
 
-#: ../libpurple/protocols/simple/simple.c:1909
+#: ../libpurple/protocols/simple/simple.c:1907
 #, fuzzy
 msgid "Use proxy"
 msgstr "Proxy"
 
+#: ../libpurple/protocols/simple/simple.c:1909
+msgid "Proxy"
+msgstr "Proxy"
+
 #: ../libpurple/protocols/simple/simple.c:1911
-msgid "Proxy"
-msgstr "Proxy"
-
-#: ../libpurple/protocols/simple/simple.c:1913
 #, fuzzy
 msgid "Auth User"
 msgstr "Người dùng AP"
 
-#: ../libpurple/protocols/simple/simple.c:1915
+#: ../libpurple/protocols/simple/simple.c:1913
 #, fuzzy
 msgid "Auth Domain"
 msgstr "Tự động"
@@ -12697,6 +12694,7 @@
 msgstr "Cảnh báo cho %s không được phép."
 
 #: ../libpurple/protocols/toc/toc.c:503
+#, c-format
 msgid "A message has been dropped, you are exceeding the server speed limit."
 msgstr ""
 "Một tin nhắn không gửi đi được, bạn đang vượt quá tốc độ cho phép của máy "
@@ -12723,38 +12721,47 @@
 msgstr "Bạn không nhận được tin nhắn nhanh từ %s vì nó được gửi quá nhanh."
 
 #: ../libpurple/protocols/toc/toc.c:518
+#, c-format
 msgid "Failure."
 msgstr "Lỗi."
 
 #: ../libpurple/protocols/toc/toc.c:521
+#, c-format
 msgid "Too many matches."
 msgstr "Quá nhiều kết quả trùng khớp."
 
 #: ../libpurple/protocols/toc/toc.c:524
+#, c-format
 msgid "Need more qualifiers."
 msgstr "Cần thêm từ hạn định"
 
 #: ../libpurple/protocols/toc/toc.c:527
+#, c-format
 msgid "Dir service temporarily unavailable."
 msgstr "Tạm thời không có dịch vụ thư mục."
 
 #: ../libpurple/protocols/toc/toc.c:530
+#, c-format
 msgid "E-mail lookup restricted."
 msgstr "Không cho phép tìm kiếm e-mail."
 
 #: ../libpurple/protocols/toc/toc.c:533
+#, c-format
 msgid "Keyword ignored."
 msgstr "Không xét từ khóa."
 
 #: ../libpurple/protocols/toc/toc.c:536
+#, c-format
 msgid "No keywords."
 msgstr "Không có từ khóa."
 
 #: ../libpurple/protocols/toc/toc.c:539
+#, c-format
 msgid "User has no directory information."
 msgstr "Người dùng không có thông tin thư mục."
 
 #: ../libpurple/protocols/toc/toc.c:543
+#, c-format
 msgid "Country not supported."
 msgstr "Quốc gia chưa được hỗ trợ."
 
@@ -12764,19 +12771,22 @@
 msgstr "Lỗi không xác định: %s."
 
 #: ../libpurple/protocols/toc/toc.c:549
-#, fuzzy
+#, fuzzy, c-format
 msgid "Incorrect screen name or password."
 msgstr "Biệt danh hoặc mật khẩu sai."
 
 #: ../libpurple/protocols/toc/toc.c:552
+#, c-format
 msgid "The service is temporarily unavailable."
 msgstr "Tạm thời không có dịch vụ."
 
 #: ../libpurple/protocols/toc/toc.c:555
+#, c-format
 msgid "Your warning level is currently too high to log in."
 msgstr "Mức cảnh báo của bạn quá cao nên không đăng nhập được."
 
 #: ../libpurple/protocols/toc/toc.c:558
+#, c-format
 msgid ""
 "You have been connecting and disconnecting too frequently.  Wait ten minutes "
 "and try again.  If you continue to try, you will need to wait even longer."
@@ -12815,8 +12825,8 @@
 msgid "Password Change Successful"
 msgstr "Đổi mật khẩu thành công"
 
-#: ../libpurple/protocols/toc/toc.c:1366 ../pidgin/gtkblist.c:5871
-#: ../pidgin/gtkblist.c:6227
+#: ../libpurple/protocols/toc/toc.c:1366 ../pidgin/gtkblist.c:5582
+#: ../pidgin/gtkblist.c:5932
 msgid "_Group:"
 msgstr "_Nhóm:"
 
@@ -12877,26 +12887,26 @@
 msgid "TOC Protocol Plugin"
 msgstr "Plugin giao thức TOC"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:784
+#: ../libpurple/protocols/yahoo/yahoo.c:782
 #, c-format
 msgid "%s has sent you a webcam invite, which is not yet supported."
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:840
+#: ../libpurple/protocols/yahoo/yahoo.c:838
 msgid "Your Yahoo! message did not get sent."
 msgstr "Thông điệp Yahoo! của bạn đã không được gửi."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:959
+#: ../libpurple/protocols/yahoo/yahoo.c:960
 #, c-format
 msgid "Yahoo! system message for %s:"
 msgstr "Thông điệp hệ thống Yahoo! cho %s:"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1028
+#: ../libpurple/protocols/yahoo/yahoo.c:1029
 #, fuzzy
 msgid "Authorization denied message:"
 msgstr "Thông điệp từ chối xác thực:"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1046
+#: ../libpurple/protocols/yahoo/yahoo.c:1047
 #, c-format
 msgid ""
 "%s has (retroactively) denied your request to add them to your list for the "
@@ -12904,16 +12914,16 @@
 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."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1049
+#: ../libpurple/protocols/yahoo/yahoo.c:1050
 #, 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."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1051
+#: ../libpurple/protocols/yahoo/yahoo.c:1052
 msgid "Add buddy rejected"
 msgstr "Thêm buddy bị từ chối"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1993
+#: ../libpurple/protocols/yahoo/yahoo.c:1994
 #, fuzzy, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -12923,11 +12933,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."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1996
+#: ../libpurple/protocols/yahoo/yahoo.c:1997
 msgid "Failed Yahoo! Authentication"
 msgstr "Chứng thực Yahooo! lỗi"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2062
+#: ../libpurple/protocols/yahoo/yahoo.c:2063
 #, c-format
 msgid ""
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
@@ -12936,173 +12946,182 @@
 "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."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2065
+#: ../libpurple/protocols/yahoo/yahoo.c:2066
 msgid "Ignore buddy?"
 msgstr "Lờ bỏ buddy?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2128
+#: ../libpurple/protocols/yahoo/yahoo.c:2129
 #, fuzzy
 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."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2131
+#: ../libpurple/protocols/yahoo/yahoo.c:2132
 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2185
+#: ../libpurple/protocols/yahoo/yahoo.c:2186
 #, 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."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2188
+#: ../libpurple/protocols/yahoo/yahoo.c:2189
 msgid "Could not add buddy to server list"
 msgstr "Không thể thêm buddy vào danh sách máy chủ"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2307
+#: ../libpurple/protocols/yahoo/yahoo.c:2308
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2650
+#: ../libpurple/protocols/yahoo/yahoo.c:2651
 #, fuzzy
 msgid "Received unexpected HTTP response from server."
 msgstr "Máy chủ trả lời không hợp lệ."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2674
-#: ../libpurple/protocols/yahoo/yahoo.c:2860
-#: ../libpurple/protocols/yahoo/yahoo.c:2963
-#: ../libpurple/protocols/yahoo/yahoo.c:2973
+#: ../libpurple/protocols/yahoo/yahoo.c:2675
+#: ../libpurple/protocols/yahoo/yahoo.c:2861
+#: ../libpurple/protocols/yahoo/yahoo.c:2964
+#: ../libpurple/protocols/yahoo/yahoo.c:2974
 #: ../libpurple/protocols/yahoo/yahoochat.c:1514
 #: ../libpurple/protocols/yahoo/yahoochat.c:1584
 #: ../libpurple/protocols/yahoo/ycht.c:585
 msgid "Connection problem"
 msgstr "Kết nối có vấn đề"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2700
+#: ../libpurple/protocols/yahoo/yahoo.c:2701
 #, fuzzy, c-format
 msgid ""
 "Lost connection with %s:\n"
 "%s"
 msgstr "Các cuộc thoại với"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2725
+#: ../libpurple/protocols/yahoo/yahoo.c:2726
 #, c-format
 msgid ""
 "Could not establish a connection with %s:\n"
 "%s"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3080
-#: ../libpurple/protocols/yahoo/yahoo.c:3766
+#: ../libpurple/protocols/yahoo/yahoo.c:3081
+#: ../libpurple/protocols/yahoo/yahoo.c:3767
 #, fuzzy
 msgid "Not at Home"
 msgstr "Không có nhà"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3082
-#: ../libpurple/protocols/yahoo/yahoo.c:3769
+#: ../libpurple/protocols/yahoo/yahoo.c:3083
+#: ../libpurple/protocols/yahoo/yahoo.c:3770
 #, fuzzy
 msgid "Not at Desk"
 msgstr "Không có tại bàn làm việc"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3084
-#: ../libpurple/protocols/yahoo/yahoo.c:3772
+#: ../libpurple/protocols/yahoo/yahoo.c:3085
+#: ../libpurple/protocols/yahoo/yahoo.c:3773
 #, fuzzy
 msgid "Not in Office"
 msgstr "Không có ở văn phòng"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3088
-#: ../libpurple/protocols/yahoo/yahoo.c:3778
+#: ../libpurple/protocols/yahoo/yahoo.c:3089
+#: ../libpurple/protocols/yahoo/yahoo.c:3779
 msgid "On Vacation"
 msgstr "Nghỉ phép"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3092
-#: ../libpurple/protocols/yahoo/yahoo.c:3784
+#: ../libpurple/protocols/yahoo/yahoo.c:3093
+#: ../libpurple/protocols/yahoo/yahoo.c:3785
 msgid "Stepped Out"
 msgstr "Đi ra ngoài"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3185
-#: ../libpurple/protocols/yahoo/yahoo.c:3215
+#: ../libpurple/protocols/yahoo/yahoo.c:3186
+#: ../libpurple/protocols/yahoo/yahoo.c:3216
 msgid "Not on server list"
 msgstr "Không có trong danh sách máy chủ"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3232
-#: ../libpurple/protocols/yahoo/yahoo.c:3290
+#: ../libpurple/protocols/yahoo/yahoo.c:3233
+#: ../libpurple/protocols/yahoo/yahoo.c:3291
 #, fuzzy
 msgid "Appear Online"
 msgstr "Ngoại tuyến"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3235
-#: ../libpurple/protocols/yahoo/yahoo.c:3311
+#: ../libpurple/protocols/yahoo/yahoo.c:3236
+#: ../libpurple/protocols/yahoo/yahoo.c:3312
 #, fuzzy
 msgid "Appear Permanently Offline"
 msgstr "Ngoại tuyến"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3253
+#: ../libpurple/protocols/yahoo/yahoo.c:3254
 #, fuzzy
 msgid "Presence"
 msgstr "Tùy chỉnh"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3296
+#: ../libpurple/protocols/yahoo/yahoo.c:3297
 #, fuzzy
 msgid "Appear Offline"
 msgstr "Ngoại tuyến"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3305
+#: ../libpurple/protocols/yahoo/yahoo.c:3306
 #, fuzzy
 msgid "Don't Appear Permanently Offline"
 msgstr "Ngoại tuyến"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3353
+#: ../libpurple/protocols/yahoo/yahoo.c:3354
 msgid "Join in Chat"
 msgstr "Tham gia Chat"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3359
+#: ../libpurple/protocols/yahoo/yahoo.c:3360
 msgid "Initiate Conference"
 msgstr "Khởi tạo hội thảo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3387
+#: ../libpurple/protocols/yahoo/yahoo.c:3388
 #, fuzzy
 msgid "Presence Settings"
 msgstr "Dùng thiết lập môi trường"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3393
+#: ../libpurple/protocols/yahoo/yahoo.c:3394
 msgid "Start Doodling"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3494
+#: ../libpurple/protocols/yahoo/yahoo.c:3495
 #, fuzzy
 msgid "Activate which ID?"
 msgstr "Kích hoạt ID nào ?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3505
+#: ../libpurple/protocols/yahoo/yahoo.c:3506
 msgid "Join whom in chat?"
 msgstr "Tham gia với ai trong Chat?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3517
+#: ../libpurple/protocols/yahoo/yahoo.c:3518
 msgid "Activate ID..."
 msgstr "Kích hoạt ID..."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3521
+#: ../libpurple/protocols/yahoo/yahoo.c:3522
 #, fuzzy
 msgid "Join User in Chat..."
 msgstr "Tham gia với người dùng trong Chat..."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3526
+#: ../libpurple/protocols/yahoo/yahoo.c:3527
 msgid "Open Inbox"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4135
+#: ../libpurple/protocols/yahoo/yahoo.c:4119
+msgid "Buzz"
+msgstr ""
+
+#: ../libpurple/protocols/yahoo/yahoo.c:4121
+#, c-format
+msgid "Buzzing %s..."
+msgstr ""
+
+#: ../libpurple/protocols/yahoo/yahoo.c:4136
 msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4140
+#: ../libpurple/protocols/yahoo/yahoo.c:4141
 msgid "list: List rooms on the Yahoo network"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4148
+#: ../libpurple/protocols/yahoo/yahoo.c:4149
 msgid "doodle: Request user to start a Doodle session"
 msgstr ""
 
@@ -13116,62 +13135,62 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/yahoo/yahoo.c:4357
-#: ../libpurple/protocols/yahoo/yahoo.c:4359
+#: ../libpurple/protocols/yahoo/yahoo.c:4358
+#: ../libpurple/protocols/yahoo/yahoo.c:4360
 msgid "Yahoo Protocol Plugin"
 msgstr "Plugin giao thức Yahoo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4382
+#: ../libpurple/protocols/yahoo/yahoo.c:4383
 #, fuzzy
 msgid "Yahoo Japan"
 msgstr "Yahoo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4385
+#: ../libpurple/protocols/yahoo/yahoo.c:4386
 #, fuzzy
 msgid "Pager server"
 msgstr "Máy chủ Proxy"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4388
+#: ../libpurple/protocols/yahoo/yahoo.c:4389
 #, fuzzy
 msgid "Japan Pager server"
 msgstr "Máy chủ pager"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4391
+#: ../libpurple/protocols/yahoo/yahoo.c:4392
 msgid "Pager port"
 msgstr "Cổng pager"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4394
+#: ../libpurple/protocols/yahoo/yahoo.c:4395
 #, fuzzy
 msgid "File transfer server"
 msgstr "Máy chủ truyền tập tin"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4397
+#: ../libpurple/protocols/yahoo/yahoo.c:4398
 #, fuzzy
 msgid "Japan file transfer server"
 msgstr "Máy chủ truyền tập tin"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4400
+#: ../libpurple/protocols/yahoo/yahoo.c:4401
 msgid "File transfer port"
 msgstr "Cổng truyền tập tin"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4403
+#: ../libpurple/protocols/yahoo/yahoo.c:4404
 msgid "Chat room locale"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4406
+#: ../libpurple/protocols/yahoo/yahoo.c:4407
 msgid "Ignore conference and chatroom invitations"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4414
+#: ../libpurple/protocols/yahoo/yahoo.c:4415
 #, fuzzy
 msgid "Chat room list URL"
 msgstr "Không thể lập lý lịch AIM."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4417
+#: ../libpurple/protocols/yahoo/yahoo.c:4418
 msgid "Yahoo Chat server"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4420
+#: ../libpurple/protocols/yahoo/yahoo.c:4421
 #, fuzzy
 msgid "Yahoo Chat port"
 msgstr "Yahoo"
@@ -13618,19 +13637,19 @@
 msgid "%s has requested your attention!"
 msgstr "%s yêu cầu thông tin của bạn"
 
-#: ../libpurple/server.c:793
+#: ../libpurple/server.c:796
 #, fuzzy, c-format
 msgid ""
 "%s has invited %s to the chat room %s:\n"
 "%s"
 msgstr "Người dùng '%s' mời %s vào phòng Chat: '%s'\n"
 
-#: ../libpurple/server.c:798
+#: ../libpurple/server.c:801
 #, fuzzy, c-format
 msgid "%s has invited %s to the chat room %s\n"
 msgstr "Người dùng '%s' mời %s vào phòng Chat: '%s'\n"
 
-#: ../libpurple/server.c:802
+#: ../libpurple/server.c:805
 msgid "Accept chat invitation?"
 msgstr "Có nhận lời mời Chat không?"
 
@@ -13678,62 +13697,47 @@
 msgid "%s changed status from %s to %s"
 msgstr "%s đã đổi chủ đề thành: %s"
 
-#: ../libpurple/status.c:612
-#, fuzzy, c-format
-msgid "%s (%s) changed status from %s to %s"
-msgstr "%s đã đổi chủ đề thành: %s"
-
-#: ../libpurple/status.c:623
+#: ../libpurple/status.c:619
 #, fuzzy, c-format
 msgid "%s is now %s"
 msgstr "%s bây giờ đổi là %s"
 
-#: ../libpurple/status.c:625
-#, fuzzy, c-format
-msgid "%s (%s) is now %s"
-msgstr "%s bây giờ đổi là %s"
-
-#: ../libpurple/status.c:631
+#: ../libpurple/status.c:624
 #, fuzzy, c-format
 msgid "%s is no longer %s"
 msgstr "%s thôi vắng mặt."
 
-#: ../libpurple/status.c:633
-#, fuzzy, c-format
-msgid "%s (%s) is no longer %s"
-msgstr "%s thôi vắng mặt."
-
-#: ../libpurple/status.c:1244
+#: ../libpurple/status.c:1234
 #, fuzzy, c-format
 msgid "%s became idle"
 msgstr "%s đã rơi vào trạng thái nghỉ"
 
-#: ../libpurple/status.c:1261
+#: ../libpurple/status.c:1251
 #, fuzzy, c-format
 msgid "%s became unidle"
 msgstr "%s đã rơi vào trạng thái nghỉ"
 
-#: ../libpurple/status.c:1324
+#: ../libpurple/status.c:1314
 #, fuzzy, c-format
 msgid "+++ %s became idle"
 msgstr "%s đã rơi vào trạng thái nghỉ"
 
-#: ../libpurple/status.c:1326
+#: ../libpurple/status.c:1316
 #, fuzzy, c-format
 msgid "+++ %s became unidle"
 msgstr "%s đã rơi vào trạng thái nghỉ"
 
-#: ../libpurple/util.c:701
+#: ../libpurple/util.c:718
 #, c-format
 msgid "%x %X"
 msgstr ""
 
-#: ../libpurple/util.c:2705
+#: ../libpurple/util.c:2722
 #, fuzzy, c-format
 msgid "Error Reading %s"
 msgstr "Lỗi chạy \"lệnh\" : %s"
 
-#: ../libpurple/util.c:2706
+#: ../libpurple/util.c:2723
 #, fuzzy, c-format
 msgid ""
 "An error was encountered reading your %s.  They have not been loaded, and "
@@ -13741,84 +13745,84 @@
 msgstr ""
 "Lỗi đã xảy ra khi phân tích danh sách buddy. Danh sách đã không được nạp."
 
-#: ../libpurple/util.c:3206
+#: ../libpurple/util.c:3223
 msgid "Calculating..."
 msgstr "Đang tính toán..."
 
-#: ../libpurple/util.c:3209
+#: ../libpurple/util.c:3226
 msgid "Unknown."
 msgstr "Không xác định."
 
-#: ../libpurple/util.c:3235
+#: ../libpurple/util.c:3252
 #, fuzzy, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "Biểu tượng"
 msgstr[1] "Biểu tượng"
 
-#: ../libpurple/util.c:3247
+#: ../libpurple/util.c:3264
 #, fuzzy, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "ngày"
 msgstr[1] "ngày"
 
-#: ../libpurple/util.c:3255
+#: ../libpurple/util.c:3272
 #, c-format
 msgid "%s, %d hour"
 msgid_plural "%s, %d hours"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../libpurple/util.c:3261
+#: ../libpurple/util.c:3278
 #, fuzzy, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "giờ"
 msgstr[1] "giờ"
 
-#: ../libpurple/util.c:3269
+#: ../libpurple/util.c:3286
 #, fuzzy, c-format
 msgid "%s, %d minute"
 msgid_plural "%s, %d minutes"
 msgstr[0] "phút"
 msgstr[1] "phút."
 
-#: ../libpurple/util.c:3275
+#: ../libpurple/util.c:3292
 #, fuzzy, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "phút"
 msgstr[1] "phút."
 
-#: ../libpurple/util.c:3535
+#: ../libpurple/util.c:3552
 #, c-format
 msgid "Could not open %s: Redirected too many times"
 msgstr ""
 
-#: ../libpurple/util.c:3572 ../libpurple/util.c:3868
+#: ../libpurple/util.c:3589 ../libpurple/util.c:3885
 #, fuzzy, c-format
 msgid "Unable to connect to %s"
 msgstr "Không thể kết nối đến máy chủ"
 
-#: ../libpurple/util.c:3695
+#: ../libpurple/util.c:3712
 #, c-format
 msgid ""
 "Unable to allocate enough memory to hold the contents from %s.  The web "
 "server may be trying something malicious."
 msgstr ""
 
-#: ../libpurple/util.c:3730
+#: ../libpurple/util.c:3747
 #, fuzzy, c-format
 msgid "Error reading from %s: %s"
 msgstr "Lỗi đọc từ máy chủ"
 
-#: ../libpurple/util.c:3761
+#: ../libpurple/util.c:3778
 #, fuzzy, c-format
 msgid "Error writing to %s: %s"
 msgstr "Lỗi đọc từ máy chủ"
 
-#: ../libpurple/util.c:3786
+#: ../libpurple/util.c:3803
 #, fuzzy, c-format
 msgid "Unable to connect to %s: %s"
 msgstr "Không thể kết nối đến máy chủ"
@@ -13917,7 +13921,7 @@
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
-#: ../pidgin/gtkaccount.c:967 ../pidgin/gtkprefs.c:1213
+#: ../pidgin/gtkaccount.c:967 ../pidgin/gtkprefs.c:1211
 msgid "Use Environmental Settings"
 msgstr "Dùng thiết lập môi trường"
 
@@ -13939,15 +13943,15 @@
 msgid "Proxy Options"
 msgstr "Tùy chọn Proxy"
 
-#: ../pidgin/gtkaccount.c:1044 ../pidgin/gtkprefs.c:1207
+#: ../pidgin/gtkaccount.c:1044 ../pidgin/gtkprefs.c:1205
 msgid "Proxy _type:"
 msgstr "_Loại Proxy:"
 
-#: ../pidgin/gtkaccount.c:1053 ../pidgin/gtkprefs.c:1228
+#: ../pidgin/gtkaccount.c:1053 ../pidgin/gtkprefs.c:1226
 msgid "_Host:"
 msgstr "_Máy chủ:"
 
-#: ../pidgin/gtkaccount.c:1057 ../pidgin/gtkprefs.c:1246
+#: ../pidgin/gtkaccount.c:1057 ../pidgin/gtkprefs.c:1244
 msgid "_Port:"
 msgstr "_Cổng:"
 
@@ -13955,7 +13959,7 @@
 msgid "_Username:"
 msgstr "_Tên đăng nhập:"
 
-#: ../pidgin/gtkaccount.c:1072 ../pidgin/gtkprefs.c:1283
+#: ../pidgin/gtkaccount.c:1072 ../pidgin/gtkprefs.c:1281
 msgid "Pa_ssword:"
 msgstr "_Mật khẩu:"
 
@@ -14009,149 +14013,110 @@
 "<b>Accounts->Add/Edit</b> in the Buddy List window"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:524
-#, c-format
-msgid "You have %d contact named %s. Would you like to merge them?"
-msgid_plural ""
-"You currently have %d contacts named %s. Would you like to merge them?"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../pidgin/gtkblist.c:525
-msgid ""
-"Merging these contacts will cause them to share a single entry on the buddy "
-"list and use a single conversation window. You can separate them again by "
-"choosing 'Expand' from the contact's context menu"
-msgstr ""
-
-#: ../pidgin/gtkblist.c:527
-#, fuzzy
-msgid "_Merge"
-msgstr "_Thông điệp:"
-
-#: ../pidgin/gtkblist.c:924
+#: ../pidgin/gtkblist.c:767
 msgid "Join a Chat"
 msgstr "Tham gia Chat"
 
-#: ../pidgin/gtkblist.c:945
+#: ../pidgin/gtkblist.c:788
 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"
 
-#: ../pidgin/gtkblist.c:956 ../pidgin/gtkblist.c:6188
-#: ../pidgin/gtkpounce.c:539 ../pidgin/gtkroomlist.c:396
+#. Set up stuff for the account box
+#: ../pidgin/gtkblist.c:799 ../pidgin/gtkblist.c:5530
+#: ../pidgin/gtkblist.c:5893 ../pidgin/gtkpounce.c:539
+#: ../pidgin/gtkroomlist.c:396
 msgid "_Account:"
 msgstr "Tài _khoản:"
 
-#: ../pidgin/gtkblist.c:1245 ../pidgin/gtkprivacy.c:603
+#: ../pidgin/gtkblist.c:1088 ../pidgin/gtkprivacy.c:603
 #: ../pidgin/gtkprivacy.c:617
 #, fuzzy
 msgid "_Block"
 msgstr "Chặn"
 
-#: ../pidgin/gtkblist.c:1245
+#: ../pidgin/gtkblist.c:1088
 #, fuzzy
 msgid "Un_block"
 msgstr "Chặn"
 
-#: ../pidgin/gtkblist.c:1288
-msgid "Move to"
-msgstr ""
-
-#: ../pidgin/gtkblist.c:1328
+#: ../pidgin/gtkblist.c:1139
 #, fuzzy
 msgid "Get _Info"
 msgstr "Lấy thông tin"
 
-#: ../pidgin/gtkblist.c:1331 ../pidgin/pidginstock.c:90
+#: ../pidgin/gtkblist.c:1142 ../pidgin/pidginstock.c:90
 #, fuzzy
 msgid "I_M"
 msgstr "Tin nhắn nhanh"
 
-#: ../pidgin/gtkblist.c:1337
-#, fuzzy
-msgid "_Send File..."
+#: ../pidgin/gtkblist.c:1148
+#, fuzzy
+msgid "_Send File"
 msgstr "Gửi tập tin"
 
-#: ../pidgin/gtkblist.c:1344
-#, fuzzy
-msgid "Add Buddy _Pounce..."
+#: ../pidgin/gtkblist.c:1155
+#, fuzzy
+msgid "Add Buddy _Pounce"
 msgstr "Thêm thông _báo Buddy"
 
-#: ../pidgin/gtkblist.c:1349 ../pidgin/gtkblist.c:1353
-#: ../pidgin/gtkblist.c:1468 ../pidgin/gtkblist.c:1491
+#: ../pidgin/gtkblist.c:1160 ../pidgin/gtkblist.c:1164
+#: ../pidgin/gtkblist.c:1269 ../pidgin/gtkblist.c:1292
 msgid "View _Log"
 msgstr "Xem _bản ghi"
 
-#: ../pidgin/gtkblist.c:1359
-#, fuzzy
-msgid "Hide when offline"
-msgstr "Không được phép khi chưa kết nối"
-
-#: ../pidgin/gtkblist.c:1359
-#, fuzzy
-msgid "Show when offline"
-msgstr "Không được phép khi chưa kết nối"
-
-#: ../pidgin/gtkblist.c:1373 ../pidgin/gtkblist.c:1382
-#: ../pidgin/gtkblist.c:1476 ../pidgin/gtkblist.c:1497
+#: ../pidgin/gtkblist.c:1177 ../pidgin/gtkblist.c:1186
+#: ../pidgin/gtkblist.c:1277 ../pidgin/gtkblist.c:1298
 msgid "_Alias..."
 msgstr "_Bí danh..."
 
-#: ../pidgin/gtkblist.c:1376 ../pidgin/gtkblist.c:1384
-#: ../pidgin/gtkblist.c:1478 ../pidgin/gtkblist.c:1499
+#: ../pidgin/gtkblist.c:1180 ../pidgin/gtkblist.c:1188
+#: ../pidgin/gtkblist.c:1279 ../pidgin/gtkblist.c:1300
 msgid "_Remove"
 msgstr "_Xóa bỏ"
 
-#: ../pidgin/gtkblist.c:1434
-#, fuzzy
-msgid "Add _Buddy..."
-msgstr "Thêm Buddy"
-
-#: ../pidgin/gtkblist.c:1437
-#, fuzzy
-msgid "Add C_hat..."
-msgstr "Thêm Chat"
-
-#: ../pidgin/gtkblist.c:1440
+#: ../pidgin/gtkblist.c:1238
+msgid "Add a _Buddy"
+msgstr "Thêm _Buddy"
+
+#: ../pidgin/gtkblist.c:1241
+msgid "Add a C_hat"
+msgstr "Thêm C_hat"
+
+#: ../pidgin/gtkblist.c:1244
 msgid "_Delete Group"
 msgstr "_Xóa nhóm"
 
-#: ../pidgin/gtkblist.c:1442
+#: ../pidgin/gtkblist.c:1246
 msgid "_Rename"
 msgstr "_Đổi tên"
 
 #. join button
-#: ../pidgin/gtkblist.c:1462 ../pidgin/gtkroomlist.c:307
+#: ../pidgin/gtkblist.c:1265 ../pidgin/gtkroomlist.c:307
 #: ../pidgin/gtkroomlist.c:460 ../pidgin/pidginstock.c:88
 msgid "_Join"
 msgstr "Tham gi_a"
 
-#: ../pidgin/gtkblist.c:1464
+#: ../pidgin/gtkblist.c:1267
 msgid "Auto-Join"
 msgstr "Tự động tham gia"
 
-#: ../pidgin/gtkblist.c:1466
-#, fuzzy
-msgid "Persistent"
-msgstr "Cho phép"
-
-#: ../pidgin/gtkblist.c:1504 ../pidgin/gtkblist.c:1527
+#: ../pidgin/gtkblist.c:1305 ../pidgin/gtkblist.c:1329
 msgid "_Collapse"
 msgstr "_Co lại"
 
-#: ../pidgin/gtkblist.c:1532
+#: ../pidgin/gtkblist.c:1334
 msgid "_Expand"
 msgstr "Mở _rộng"
 
-#: ../pidgin/gtkblist.c:1783 ../pidgin/gtkblist.c:1795
-#: ../pidgin/gtkblist.c:4885 ../pidgin/gtkblist.c:4898
+#: ../pidgin/gtkblist.c:1585 ../pidgin/gtkblist.c:1597
+#: ../pidgin/gtkblist.c:4603 ../pidgin/gtkblist.c:4616
 #, fuzzy
 msgid "/Tools/Mute Sounds"
 msgstr "Tắt âm thanh"
 
-#: ../pidgin/gtkblist.c:2255 ../pidgin/gtkconv.c:4903
+#: ../pidgin/gtkblist.c:2057 ../pidgin/gtkconv.c:4840
 #: ../pidgin/gtkpounce.c:430
 msgid ""
 "You are not currently signed on with an account that can add that buddy."
@@ -14159,155 +14124,155 @@
 "Hiện thời bạn chưa kết nối bằng một tài khoản nào để thêm được buddy đó."
 
 #. Buddies menu
-#: ../pidgin/gtkblist.c:3067
+#: ../pidgin/gtkblist.c:2869
 msgid "/_Buddies"
 msgstr "/_Buddy"
 
-#: ../pidgin/gtkblist.c:3068
+#: ../pidgin/gtkblist.c:2870
 msgid "/Buddies/New Instant _Message..."
 msgstr "/Buddy/T_in nhắn nhanh mới..."
 
-#: ../pidgin/gtkblist.c:3069
+#: ../pidgin/gtkblist.c:2871
 msgid "/Buddies/Join a _Chat..."
 msgstr "/Buddy/Tham gia _Chat..."
 
-#: ../pidgin/gtkblist.c:3070
+#: ../pidgin/gtkblist.c:2872
 #, fuzzy
 msgid "/Buddies/Get User _Info..."
 msgstr "/Buddy/Lấy thông tin người _dùng..."
 
-#: ../pidgin/gtkblist.c:3071
+#: ../pidgin/gtkblist.c:2873
 #, fuzzy
 msgid "/Buddies/View User _Log..."
 msgstr "/Buddy/Lấy thông tin người _dùng..."
 
-#: ../pidgin/gtkblist.c:3073
+#: ../pidgin/gtkblist.c:2875
 #, fuzzy
 msgid "/Buddies/Show"
 msgstr "/Buddy/N_gắt kết nối"
 
-#: ../pidgin/gtkblist.c:3074
+#: ../pidgin/gtkblist.c:2876
 #, fuzzy
 msgid "/Buddies/Show/_Offline Buddies"
 msgstr "/Buddy/Hiển thị buddy _không kết nối"
 
-#: ../pidgin/gtkblist.c:3075
+#: ../pidgin/gtkblist.c:2877
 #, fuzzy
 msgid "/Buddies/Show/_Empty Groups"
 msgstr "/Buddy/Hiển thị nhóm _rỗng"
 
-#: ../pidgin/gtkblist.c:3076
+#: ../pidgin/gtkblist.c:2878
 #, fuzzy
 msgid "/Buddies/Show/Buddy _Details"
 msgstr "/Buddy/Hiển thị buddy ngoại tuyến"
 
-#: ../pidgin/gtkblist.c:3077
+#: ../pidgin/gtkblist.c:2879
 #, fuzzy
 msgid "/Buddies/Show/Idle _Times"
 msgstr "/Buddy/Hiển thị buddy ngoại tuyến"
 
-#: ../pidgin/gtkblist.c:3078
+#: ../pidgin/gtkblist.c:2880
 #, fuzzy
 msgid "/Buddies/Show/_Protocol Icons"
 msgstr "/Buddy/Hiển thị nhóm _rỗng"
 
-#: ../pidgin/gtkblist.c:3079
+#: ../pidgin/gtkblist.c:2881
 #, fuzzy
 msgid "/Buddies/_Sort Buddies"
 msgstr "/Buddy/Hiển thị buddy ngoại tuyến"
 
-#: ../pidgin/gtkblist.c:3081
+#: ../pidgin/gtkblist.c:2883
 msgid "/Buddies/_Add Buddy..."
 msgstr "/Buddy/_Thêm Buddy..."
 
-#: ../pidgin/gtkblist.c:3082
+#: ../pidgin/gtkblist.c:2884
 msgid "/Buddies/Add C_hat..."
 msgstr "/Buddy/Thêm Ch_at..."
 
-#: ../pidgin/gtkblist.c:3083
+#: ../pidgin/gtkblist.c:2885
 msgid "/Buddies/Add _Group..."
 msgstr "/Buddy/Thêm Nhó_m..."
 
-#: ../pidgin/gtkblist.c:3085
+#: ../pidgin/gtkblist.c:2887
 msgid "/Buddies/_Quit"
 msgstr "/Buddy/Th_oát"
 
 #. Accounts menu
-#: ../pidgin/gtkblist.c:3088
+#: ../pidgin/gtkblist.c:2890
 #, fuzzy
 msgid "/_Accounts"
 msgstr "Tài _khoản:"
 
-#: ../pidgin/gtkblist.c:3089 ../pidgin/gtkblist.c:6889
-#, fuzzy
-msgid "/Accounts/Manage"
+#: ../pidgin/gtkblist.c:2891 ../pidgin/gtkblist.c:6589
+#, fuzzy
+msgid "/Accounts/Add\\/Edit"
 msgstr "Tài khoản"
 
 #. Tools
-#: ../pidgin/gtkblist.c:3092
+#: ../pidgin/gtkblist.c:2894
 msgid "/_Tools"
 msgstr "/_Công cụ"
 
-#: ../pidgin/gtkblist.c:3093
+#: ../pidgin/gtkblist.c:2895
 #, fuzzy
 msgid "/Tools/Buddy _Pounces"
 msgstr "/Công cụ/Thông _báo buddy"
 
-#: ../pidgin/gtkblist.c:3094
+#: ../pidgin/gtkblist.c:2896
 #, fuzzy
 msgid "/Tools/_Certificates"
 msgstr "/Công cụ/Tùy _chỉnh"
 
-#: ../pidgin/gtkblist.c:3095
+#: ../pidgin/gtkblist.c:2897
 #, fuzzy
 msgid "/Tools/Plu_gins"
 msgstr "/Công cụ/Hoạt động giao thức"
 
-#: ../pidgin/gtkblist.c:3096
+#: ../pidgin/gtkblist.c:2898
 msgid "/Tools/Pr_eferences"
 msgstr "/Công cụ/Tùy _chỉnh"
 
-#: ../pidgin/gtkblist.c:3097
+#: ../pidgin/gtkblist.c:2899
 msgid "/Tools/Pr_ivacy"
 msgstr "/Công cụ/Chính _sách"
 
-#: ../pidgin/gtkblist.c:3099
+#: ../pidgin/gtkblist.c:2901
 msgid "/Tools/_File Transfers"
 msgstr "/Công cụ/Truyền tập t_in"
 
-#: ../pidgin/gtkblist.c:3100
+#: ../pidgin/gtkblist.c:2902
 #, fuzzy
 msgid "/Tools/R_oom List"
 msgstr "/Công cụ/Hoạt động của _giao thức"
 
-#: ../pidgin/gtkblist.c:3101
+#: ../pidgin/gtkblist.c:2903
 #, fuzzy
 msgid "/Tools/System _Log"
 msgstr "/Công cụ/_Xem bản ghi hệ thống"
 
-#: ../pidgin/gtkblist.c:3103
+#: ../pidgin/gtkblist.c:2905
 #, fuzzy
 msgid "/Tools/Mute _Sounds"
 msgstr "Tắt âm thanh"
 
 #. Help
-#: ../pidgin/gtkblist.c:3105
+#: ../pidgin/gtkblist.c:2907
 msgid "/_Help"
 msgstr "/Trợ _giúp"
 
-#: ../pidgin/gtkblist.c:3106
+#: ../pidgin/gtkblist.c:2908
 msgid "/Help/Online _Help"
 msgstr "/Trợ giúp/Trợ giúp trực tu_yến"
 
-#: ../pidgin/gtkblist.c:3107
+#: ../pidgin/gtkblist.c:2909
 msgid "/Help/_Debug Window"
 msgstr "/Trợ giúp/Cửa sổ gỡ _rối"
 
-#: ../pidgin/gtkblist.c:3109 ../pidgin/gtkblist.c:3111
+#: ../pidgin/gtkblist.c:2911 ../pidgin/gtkblist.c:2913
 msgid "/Help/_About"
 msgstr "/Trợ giúp/Giới thiệ_u"
 
-#: ../pidgin/gtkblist.c:3140
+#: ../pidgin/gtkblist.c:2942
 #, c-format
 msgid ""
 "\n"
@@ -14316,114 +14281,119 @@
 "\n"
 "<b>Tài khoản:</b> %s"
 
-#: ../pidgin/gtkblist.c:3218
+#: ../pidgin/gtkblist.c:3020
 #, fuzzy
 msgid "Buddy Alias"
 msgstr "Danh sách Buddy"
 
-#: ../pidgin/gtkblist.c:3247
+#: ../pidgin/gtkblist.c:3049
 #, fuzzy
 msgid "Logged In"
 msgstr "%s đăng xuất."
 
-#: ../pidgin/gtkblist.c:3293
+#: ../pidgin/gtkblist.c:3095
 #, fuzzy
 msgid "Last Seen"
 msgstr "Họ"
 
-#: ../pidgin/gtkblist.c:3314
+#: ../pidgin/gtkblist.c:3116
 msgid "Spooky"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:3316
+#: ../pidgin/gtkblist.c:3118
 msgid "Awesome"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:3318
+#: ../pidgin/gtkblist.c:3120
 msgid "Rockin'"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:3657
+#: ../pidgin/gtkblist.c:3453
 #, fuzzy, c-format
 msgid "Idle %dd %dh %02dm"
 msgstr "Nghỉ (%dh%02dm) "
 
-#: ../pidgin/gtkblist.c:3659
+#: ../pidgin/gtkblist.c:3455
 #, fuzzy, c-format
 msgid "Idle %dh %02dm"
 msgstr "Nghỉ (%dh%02dm) "
 
-#: ../pidgin/gtkblist.c:3661
+#: ../pidgin/gtkblist.c:3457
 #, fuzzy, c-format
 msgid "Idle %dm"
 msgstr "Nghỉ (%dm) "
 
-#: ../pidgin/gtkblist.c:3806
+#: ../pidgin/gtkblist.c:3602
 #, fuzzy
 msgid "/Buddies/New Instant Message..."
 msgstr "/Buddy/T_in nhắn nhanh mới..."
 
-#: ../pidgin/gtkblist.c:3807 ../pidgin/gtkblist.c:3840
+#: ../pidgin/gtkblist.c:3603 ../pidgin/gtkblist.c:3636
 #, fuzzy
 msgid "/Buddies/Join a Chat..."
 msgstr "/Buddy/Tham gia _Chat..."
 
-#: ../pidgin/gtkblist.c:3808
+#: ../pidgin/gtkblist.c:3604
 #, fuzzy
 msgid "/Buddies/Get User Info..."
 msgstr "/Buddy/Lấy thông tin người _dùng..."
 
-#: ../pidgin/gtkblist.c:3809
+#: ../pidgin/gtkblist.c:3605
 #, fuzzy
 msgid "/Buddies/Add Buddy..."
 msgstr "/Buddy/_Thêm Buddy..."
 
-#: ../pidgin/gtkblist.c:3810 ../pidgin/gtkblist.c:3843
+#: ../pidgin/gtkblist.c:3606 ../pidgin/gtkblist.c:3639
 #, fuzzy
 msgid "/Buddies/Add Chat..."
 msgstr "/Buddy/Thêm Ch_at..."
 
-#: ../pidgin/gtkblist.c:3811
+#: ../pidgin/gtkblist.c:3607
 #, fuzzy
 msgid "/Buddies/Add Group..."
 msgstr "/Buddy/Thêm Nhó_m..."
 
-#: ../pidgin/gtkblist.c:3846
+#: ../pidgin/gtkblist.c:3642
 #, fuzzy
 msgid "/Tools/Privacy"
 msgstr "/Công cụ/Chính _sách"
 
-#: ../pidgin/gtkblist.c:3849
+#: ../pidgin/gtkblist.c:3645
 #, fuzzy
 msgid "/Tools/Room List"
 msgstr "/Công cụ/Hoạt động của _giao thức"
 
-#: ../pidgin/gtkblist.c:3944 ../pidgin/gtkdocklet.c:153
+#: ../pidgin/gtkblist.c:3742 ../pidgin/gtkdocklet.c:153
 #, fuzzy, c-format
 msgid "%d unread message from %s\n"
 msgid_plural "%d unread messages from %s\n"
 msgstr[0] "Thông điệp từ %s"
 msgstr[1] "Thông điệp từ %s"
 
-#: ../pidgin/gtkblist.c:4104
+#: ../pidgin/gtkblist.c:3822
 #, fuzzy
 msgid "Manually"
 msgstr "Tự chỉ định"
 
-#: ../pidgin/gtkblist.c:4107
+#: ../pidgin/gtkblist.c:3824
+#, fuzzy
+msgid "Alphabetically"
+msgstr "Theo vần"
+
+#: ../pidgin/gtkblist.c:3825
 msgid "By status"
 msgstr "Theo trạng thái"
 
-#: ../pidgin/gtkblist.c:4108
+#: ../pidgin/gtkblist.c:3826
 msgid "By log size"
 msgstr "Theo kích thước bản ghi"
 
-#: ../pidgin/gtkblist.c:4313 ../pidgin/gtkconn.c:180
+#: ../pidgin/gtkblist.c:4031 ../pidgin/gtkconn.c:179
 #, fuzzy, c-format
 msgid "%s disconnected"
 msgstr "Đã ngắt kết nối."
 
-#: ../pidgin/gtkblist.c:4349
+#: ../pidgin/gtkblist.c:4067
 #, fuzzy, c-format
 msgid "<span color=\"red\">%s disconnected: %s</span>"
 msgstr ""
@@ -14432,68 +14402,68 @@
 "%s\n"
 "%s"
 
-#: ../pidgin/gtkblist.c:4501
+#: ../pidgin/gtkblist.c:4219
 #, fuzzy
 msgid "<b>Username:</b>"
 msgstr ""
 "\n"
 "<b>Cảnh báo:</b>"
 
-#: ../pidgin/gtkblist.c:4508
+#: ../pidgin/gtkblist.c:4226
 #, fuzzy
 msgid "<b>Password:</b>"
 msgstr "Mật khẩu:"
 
-#: ../pidgin/gtkblist.c:4519
+#: ../pidgin/gtkblist.c:4237
 #, fuzzy
 msgid "_Login"
 msgstr "Đăng nhập"
 
-#: ../pidgin/gtkblist.c:4602
+#: ../pidgin/gtkblist.c:4320
 #, fuzzy
 msgid "/Accounts"
 msgstr "Tài khoản"
 
 #. Translators: Please maintain the use of -> and <- to refer to menu heirarchy
-#: ../pidgin/gtkblist.c:4616
+#: ../pidgin/gtkblist.c:4334
 #, c-format
 msgid ""
 "<span weight='bold' size='larger'>Welcome to %s!</span>\n"
 "\n"
 "You have no accounts enabled. Enable your IM accounts from the <b>Accounts</"
-"b> window at <b>Accounts->Manage</b>. Once you enable accounts, you'll be "
+"b> window at <b>Accounts->Add/Edit</b>. Once you enable accounts, you'll be "
 "able to sign on, set your status, and talk to your friends."
 msgstr ""
 
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: ../pidgin/gtkblist.c:4879
+#: ../pidgin/gtkblist.c:4597
 #, fuzzy
 msgid "/Buddies/Show/Offline Buddies"
 msgstr "/Buddy/Hiển thị buddy ngoại tuyến"
 
-#: ../pidgin/gtkblist.c:4882
+#: ../pidgin/gtkblist.c:4600
 #, fuzzy
 msgid "/Buddies/Show/Empty Groups"
 msgstr "/Buddy/Hiển thị nhóm rỗng"
 
-#: ../pidgin/gtkblist.c:4888
+#: ../pidgin/gtkblist.c:4606
 #, fuzzy
 msgid "/Buddies/Show/Buddy Details"
 msgstr "/Buddy/Hiển thị buddy ngoại tuyến"
 
-#: ../pidgin/gtkblist.c:4891
+#: ../pidgin/gtkblist.c:4609
 #, fuzzy
 msgid "/Buddies/Show/Idle Times"
 msgstr "/Buddy/Hiển thị buddy ngoại tuyến"
 
-#: ../pidgin/gtkblist.c:4894
+#: ../pidgin/gtkblist.c:4612
 #, fuzzy
 msgid "/Buddies/Show/Protocol Icons"
 msgstr "/Buddy/Hiển thị nhóm rỗng"
 
-#: ../pidgin/gtkblist.c:5796
+#: ../pidgin/gtkblist.c:5507
 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. "
@@ -14503,36 +14473,30 @@
 "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"
 
-#. Set up stuff for the account box
-#: ../pidgin/gtkblist.c:5819
-#, fuzzy
-msgid "A_ccount:"
-msgstr "Tài khoản:"
-
 #. End of account box
-#: ../pidgin/gtkblist.c:5831
+#: ../pidgin/gtkblist.c:5542
 #, fuzzy
 msgid "_Screen name:"
 msgstr "Tên _hiển thị"
 
-#: ../pidgin/gtkblist.c:5853 ../pidgin/gtkblist.c:6209
+#: ../pidgin/gtkblist.c:5564 ../pidgin/gtkblist.c:5914
 #, fuzzy
 msgid "A_lias:"
 msgstr "Bí danh:"
 
-#: ../pidgin/gtkblist.c:6121
+#: ../pidgin/gtkblist.c:5826
 #, fuzzy
 msgid "This protocol does not support chat rooms."
 msgstr "Phiên bản giao thức không được hỗ trợ"
 
-#: ../pidgin/gtkblist.c:6137
+#: ../pidgin/gtkblist.c:5842
 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."
 
-#: ../pidgin/gtkblist.c:6178
+#: ../pidgin/gtkblist.c:5883
 msgid ""
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
@@ -14540,51 +14504,43 @@
 "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"
 
-#: ../pidgin/gtkblist.c:6237
-msgid "Autojoin when account becomes online."
-msgstr ""
-
-#: ../pidgin/gtkblist.c:6238
-msgid "Hide chat when the window is closed."
-msgstr ""
-
-#: ../pidgin/gtkblist.c:6264
+#: ../pidgin/gtkblist.c:5964
 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."
 
-#: ../pidgin/gtkblist.c:6909
+#: ../pidgin/gtkblist.c:6609
 msgid "<PurpleMain>/Accounts/"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:6933
+#: ../pidgin/gtkblist.c:6633
 #, fuzzy
 msgid "_Edit Account"
 msgstr "Tài _khoản:"
 
-#: ../pidgin/gtkblist.c:6946 ../pidgin/gtkconv.c:3136
+#: ../pidgin/gtkblist.c:6646 ../pidgin/gtkconv.c:3073
 msgid "No actions available"
 msgstr "Hiện không có hành động nào"
 
-#: ../pidgin/gtkblist.c:6954
+#: ../pidgin/gtkblist.c:6654
 #, fuzzy
 msgid "_Disable"
 msgstr "Giấu mặt"
 
-#: ../pidgin/gtkblist.c:6966
+#: ../pidgin/gtkblist.c:6666
 #, fuzzy
 msgid "Enable Account"
 msgstr "Tài khoản"
 
-#: ../pidgin/gtkblist.c:6972
+#: ../pidgin/gtkblist.c:6672
 msgid "<PurpleMain>/Accounts/Enable Account"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:7021
+#: ../pidgin/gtkblist.c:6721
 #, fuzzy
 msgid "/Tools"
 msgstr "/_Công cụ"
 
-#: ../pidgin/gtkblist.c:7091
+#: ../pidgin/gtkblist.c:6791
 #, fuzzy
 msgid "/Buddies/Sort Buddies"
 msgstr "/Buddy/Hiển thị buddy ngoại tuyến"
@@ -14595,7 +14551,7 @@
 msgid "SSL Servers"
 msgstr "Máy chủ"
 
-#: ../pidgin/gtkconn.c:181
+#: ../pidgin/gtkconn.c:180
 #, c-format
 msgid ""
 "%s\n"
@@ -14604,229 +14560,229 @@
 "re-enable the account."
 msgstr ""
 
-#: ../pidgin/gtkconv.c:523
+#: ../pidgin/gtkconv.c:482
 #, fuzzy
 msgid "Unknown command."
 msgstr "Lệnh không xác định: %s"
 
-#: ../pidgin/gtkconv.c:795 ../pidgin/gtkconv.c:821
+#: ../pidgin/gtkconv.c:754 ../pidgin/gtkconv.c:780
 msgid "That buddy is not on the same protocol as this chat."
 msgstr ""
 
-#: ../pidgin/gtkconv.c:815
+#: ../pidgin/gtkconv.c:774
 #, fuzzy
 msgid ""
 "You are not currently signed on with an account that can invite that buddy."
 msgstr ""
 "Hiện thời bạn chưa kết nối bằng một tài khoản nào để thêm được buddy đó."
 
-#: ../pidgin/gtkconv.c:868
+#: ../pidgin/gtkconv.c:827
 msgid "Invite Buddy Into Chat Room"
 msgstr "Mời Buddy vào phòng Chat"
 
 #. Put our happy label in it.
-#: ../pidgin/gtkconv.c:898
+#: ../pidgin/gtkconv.c:857
 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."
 
-#: ../pidgin/gtkconv.c:919
+#: ../pidgin/gtkconv.c:878
 msgid "_Buddy:"
 msgstr "_Buddy:"
 
-#: ../pidgin/gtkconv.c:930 ../pidgin/gtksavedstatuses.c:1194
+#: ../pidgin/gtkconv.c:889 ../pidgin/gtksavedstatuses.c:1194
 #: ../pidgin/gtksavedstatuses.c:1528
 msgid "_Message:"
 msgstr "_Thông điệp:"
 
-#: ../pidgin/gtkconv.c:988 ../pidgin/gtkconv.c:2657 ../pidgin/gtkdebug.c:219
+#: ../pidgin/gtkconv.c:947 ../pidgin/gtkconv.c:2598 ../pidgin/gtkdebug.c:219
 #: ../pidgin/gtkft.c:543
 #, fuzzy
 msgid "Unable to open file."
 msgstr "Không đọc được tập tin %s."
 
-#: ../pidgin/gtkconv.c:994
+#: ../pidgin/gtkconv.c:953
 #, fuzzy, c-format
 msgid "<h1>Conversation with %s</h1>\n"
 msgstr "Hội thoại với %s"
 
-#: ../pidgin/gtkconv.c:1032
+#: ../pidgin/gtkconv.c:991
 msgid "Save Conversation"
 msgstr "Lưu lại cuộc thoại"
 
-#: ../pidgin/gtkconv.c:1178 ../pidgin/gtkdebug.c:167 ../pidgin/gtkdebug.c:743
+#: ../pidgin/gtkconv.c:1140 ../pidgin/gtkdebug.c:167 ../pidgin/gtkdebug.c:743
 msgid "Find"
 msgstr "Tìm"
 
-#: ../pidgin/gtkconv.c:1204 ../pidgin/gtkdebug.c:195
+#: ../pidgin/gtkconv.c:1166 ../pidgin/gtkdebug.c:195
 msgid "_Search for:"
 msgstr "Tìm _kiếm:"
 
-#: ../pidgin/gtkconv.c:1675
+#: ../pidgin/gtkconv.c:1622
 msgid "Un-Ignore"
 msgstr "Không-bỏ qua"
 
-#: ../pidgin/gtkconv.c:1678
+#: ../pidgin/gtkconv.c:1625
 msgid "Ignore"
 msgstr "Bỏ qua"
 
-#: ../pidgin/gtkconv.c:1698
+#: ../pidgin/gtkconv.c:1645
 #, fuzzy
 msgid "Get Away Message"
 msgstr "Thông báo trạng thái mới"
 
-#: ../pidgin/gtkconv.c:1721
+#: ../pidgin/gtkconv.c:1668
 #, fuzzy
 msgid "Last said"
 msgstr "Họ"
 
-#: ../pidgin/gtkconv.c:2665
+#: ../pidgin/gtkconv.c:2606
 #, fuzzy
 msgid "Unable to save icon file to disk."
 msgstr "Không thể lưu tập tin biểu tượng vào đĩa."
 
-#: ../pidgin/gtkconv.c:2716
+#: ../pidgin/gtkconv.c:2657
 msgid "Save Icon"
 msgstr "Lưu biểu tượng"
 
-#: ../pidgin/gtkconv.c:2768
+#: ../pidgin/gtkconv.c:2709
 msgid "Animate"
 msgstr "Hoạt cảnh"
 
-#: ../pidgin/gtkconv.c:2773
+#: ../pidgin/gtkconv.c:2714
 msgid "Hide Icon"
 msgstr "Ẩn biểu tượng"
 
-#: ../pidgin/gtkconv.c:2776
+#: ../pidgin/gtkconv.c:2717
 msgid "Save Icon As..."
 msgstr "Lưu biểu tượng là..."
 
-#: ../pidgin/gtkconv.c:2780
+#: ../pidgin/gtkconv.c:2721
 #, fuzzy
 msgid "Set Custom Icon..."
 msgstr "Tùy chỉnh"
 
-#: ../pidgin/gtkconv.c:2793
+#: ../pidgin/gtkconv.c:2734
 #, fuzzy
 msgid "Remove Custom Icon"
 msgstr "Xóa Liên Lạc"
 
-#: ../pidgin/gtkconv.c:2924
+#: ../pidgin/gtkconv.c:2861
 msgid "Show All"
 msgstr ""
 
 #. Conversation menu
-#: ../pidgin/gtkconv.c:2943
+#: ../pidgin/gtkconv.c:2880
 msgid "/_Conversation"
 msgstr "/_Cuộc thoại"
 
-#: ../pidgin/gtkconv.c:2945
+#: ../pidgin/gtkconv.c:2882
 msgid "/Conversation/New Instant _Message..."
 msgstr "/Cuộc thoại/T_in nhắn nhanh mới..."
 
-#: ../pidgin/gtkconv.c:2950
+#: ../pidgin/gtkconv.c:2887
 msgid "/Conversation/_Find..."
 msgstr "/Cuộc thoại/_Tìm..."
 
-#: ../pidgin/gtkconv.c:2952
+#: ../pidgin/gtkconv.c:2889
 msgid "/Conversation/View _Log"
 msgstr "/Cuộc thoại/Xem _bản ghi"
 
-#: ../pidgin/gtkconv.c:2953
+#: ../pidgin/gtkconv.c:2890
 msgid "/Conversation/_Save As..."
 msgstr "/Cuộc thoại/_Lưu là..."
 
-#: ../pidgin/gtkconv.c:2955
+#: ../pidgin/gtkconv.c:2892
 #, fuzzy
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/Cuộc thoại/Đón_g"
 
-#: ../pidgin/gtkconv.c:2959
+#: ../pidgin/gtkconv.c:2896
 #, fuzzy
 msgid "/Conversation/Se_nd File..."
 msgstr "/Cuộc thoại/Gửi tập tin..."
 
-#: ../pidgin/gtkconv.c:2960
+#: ../pidgin/gtkconv.c:2897
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Cuộc thoại/Thêm thông bá_o buddy..."
 
-#: ../pidgin/gtkconv.c:2962
+#: ../pidgin/gtkconv.c:2899
 msgid "/Conversation/_Get Info"
 msgstr "/Cuộc thoại/Lấ_y thông tin"
 
-#: ../pidgin/gtkconv.c:2964
+#: ../pidgin/gtkconv.c:2901
 msgid "/Conversation/In_vite..."
 msgstr "/Cuộc thoại/_Mời..."
 
-#: ../pidgin/gtkconv.c:2966
+#: ../pidgin/gtkconv.c:2903
 #, fuzzy
 msgid "/Conversation/M_ore"
 msgstr "/Cuộc thoại/Đón_g"
 
-#: ../pidgin/gtkconv.c:2970
+#: ../pidgin/gtkconv.c:2907
 #, fuzzy
 msgid "/Conversation/Al_ias..."
 msgstr "/Cuộc thoại/Bí danh..."
 
-#: ../pidgin/gtkconv.c:2972
+#: ../pidgin/gtkconv.c:2909
 msgid "/Conversation/_Block..."
 msgstr "/Cuộc thoại/C_hặn..."
 
-#: ../pidgin/gtkconv.c:2974
+#: ../pidgin/gtkconv.c:2911
 #, fuzzy
 msgid "/Conversation/_Unblock..."
 msgstr "/Cuộc thoại/C_hặn..."
 
-#: ../pidgin/gtkconv.c:2976
+#: ../pidgin/gtkconv.c:2913
 msgid "/Conversation/_Add..."
 msgstr "/Cuộc thoại/_Thêm..."
 
-#: ../pidgin/gtkconv.c:2978
+#: ../pidgin/gtkconv.c:2915
 msgid "/Conversation/_Remove..."
 msgstr "/Cuộc thoại/_Xóa bỏ..."
 
-#: ../pidgin/gtkconv.c:2983
+#: ../pidgin/gtkconv.c:2920
 msgid "/Conversation/Insert Lin_k..."
 msgstr "/Cuộc thoại/Chèn liên _kết..."
 
-#: ../pidgin/gtkconv.c:2985
+#: ../pidgin/gtkconv.c:2922
 msgid "/Conversation/Insert Imag_e..."
 msgstr "/Cuộc thoại/Chèn ả_nh..."
 
-#: ../pidgin/gtkconv.c:2991
+#: ../pidgin/gtkconv.c:2928
 msgid "/Conversation/_Close"
 msgstr "/Cuộc thoại/Đón_g"
 
 #. Options
-#: ../pidgin/gtkconv.c:2995
+#: ../pidgin/gtkconv.c:2932
 msgid "/_Options"
 msgstr "/_Tùy chọn"
 
-#: ../pidgin/gtkconv.c:2996
+#: ../pidgin/gtkconv.c:2933
 msgid "/Options/Enable _Logging"
 msgstr "/Tùy chọn/Cho phép đăng _nhập"
 
-#: ../pidgin/gtkconv.c:2997
+#: ../pidgin/gtkconv.c:2934
 msgid "/Options/Enable _Sounds"
 msgstr "/Tùy chọn/Bật âm th_anh"
 
-#: ../pidgin/gtkconv.c:2999
+#: ../pidgin/gtkconv.c:2936
 #, fuzzy
 msgid "/Options/Show Formatting _Toolbars"
 msgstr "/Tùy chọn/Hiển thị thanh định _dạng"
 
-#: ../pidgin/gtkconv.c:3000
+#: ../pidgin/gtkconv.c:2937
 #, fuzzy
 msgid "/Options/Show Ti_mestamps"
 msgstr "Nhãn thời gian iChat"
 
-#: ../pidgin/gtkconv.c:3124
+#: ../pidgin/gtkconv.c:3061
 #, fuzzy
 msgid "/Conversation/More"
 msgstr "/Cuộc thoại/Đón_g"
 
-#: ../pidgin/gtkconv.c:3180
+#: ../pidgin/gtkconv.c:3117
 #, fuzzy
 msgid "/Options"
 msgstr "/_Tùy chọn"
@@ -14836,186 +14792,186 @@
 #. Make sure the 'Conversation -> More' menuitems are regenerated whenever
 #. * the 'Conversation' menu pops up because the entries can change after the
 #. * conversation is created.
-#: ../pidgin/gtkconv.c:3215 ../pidgin/gtkconv.c:3247
+#: ../pidgin/gtkconv.c:3152 ../pidgin/gtkconv.c:3184
 #, fuzzy
 msgid "/Conversation"
 msgstr "/_Cuộc thoại"
 
-#: ../pidgin/gtkconv.c:3255
+#: ../pidgin/gtkconv.c:3192
 msgid "/Conversation/View Log"
 msgstr "/Cuộc thoại/Xem bản ghi"
 
-#: ../pidgin/gtkconv.c:3261
+#: ../pidgin/gtkconv.c:3198
 msgid "/Conversation/Send File..."
 msgstr "/Cuộc thoại/Gửi tập tin..."
 
-#: ../pidgin/gtkconv.c:3265
+#: ../pidgin/gtkconv.c:3202
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Cuộc thoại/Thêm thông báo buddy..."
 
-#: ../pidgin/gtkconv.c:3271
+#: ../pidgin/gtkconv.c:3208
 msgid "/Conversation/Get Info"
 msgstr "/Cuộc thoại/Lấy thông tin"
 
-#: ../pidgin/gtkconv.c:3275
+#: ../pidgin/gtkconv.c:3212
 msgid "/Conversation/Invite..."
 msgstr "/Cuộc thoại/Mời..."
 
-#: ../pidgin/gtkconv.c:3281
+#: ../pidgin/gtkconv.c:3218
 msgid "/Conversation/Alias..."
 msgstr "/Cuộc thoại/Bí danh..."
 
-#: ../pidgin/gtkconv.c:3285
+#: ../pidgin/gtkconv.c:3222
 msgid "/Conversation/Block..."
 msgstr "/Cuộc thoại/Chặn..."
 
-#: ../pidgin/gtkconv.c:3289
+#: ../pidgin/gtkconv.c:3226
 #, fuzzy
 msgid "/Conversation/Unblock..."
 msgstr "/Cuộc thoại/Chặn..."
 
-#: ../pidgin/gtkconv.c:3293
+#: ../pidgin/gtkconv.c:3230
 msgid "/Conversation/Add..."
 msgstr "/Cuộc thoại/Thêm..."
 
-#: ../pidgin/gtkconv.c:3297
+#: ../pidgin/gtkconv.c:3234
 msgid "/Conversation/Remove..."
 msgstr "/Cuộc thoại/Xóa bỏ..."
 
-#: ../pidgin/gtkconv.c:3303
+#: ../pidgin/gtkconv.c:3240
 msgid "/Conversation/Insert Link..."
 msgstr "/Cuộc thoại/Chèn liên kết..."
 
-#: ../pidgin/gtkconv.c:3307
+#: ../pidgin/gtkconv.c:3244
 msgid "/Conversation/Insert Image..."
 msgstr "/Cuộc thoại/Chèn ảnh..."
 
-#: ../pidgin/gtkconv.c:3313
+#: ../pidgin/gtkconv.c:3250
 msgid "/Options/Enable Logging"
 msgstr "/Tùy chọn/Cho phép đăng nhập"
 
-#: ../pidgin/gtkconv.c:3316
+#: ../pidgin/gtkconv.c:3253
 msgid "/Options/Enable Sounds"
 msgstr "/Tùy chọn/Bật âm thanh"
 
-#: ../pidgin/gtkconv.c:3329
+#: ../pidgin/gtkconv.c:3266
 #, fuzzy
 msgid "/Options/Show Formatting Toolbars"
 msgstr "/Tùy chọn/Hiển thị thanh định dạng"
 
-#: ../pidgin/gtkconv.c:3332
+#: ../pidgin/gtkconv.c:3269
 #, fuzzy
 msgid "/Options/Show Timestamps"
 msgstr "Nhãn thời gian iChat"
 
-#: ../pidgin/gtkconv.c:3409 ../pidgin/gtkconv.c:3451
+#: ../pidgin/gtkconv.c:3346 ../pidgin/gtkconv.c:3388
 msgid "User is typing..."
 msgstr "Người dùng đang gõ phím..."
 
-#: ../pidgin/gtkconv.c:3454
+#: ../pidgin/gtkconv.c:3391
 #, fuzzy
 msgid "User has typed something and stopped"
 msgstr "Người dùng đã gõ cái gì đó và dừng"
 
 #. Build the Send To menu
-#: ../pidgin/gtkconv.c:3637 ../pidgin/gtkconv.c:8103
-#, fuzzy
-msgid "S_end To"
+#: ../pidgin/gtkconv.c:3574 ../pidgin/gtkconv.c:8022
+#, fuzzy
+msgid "_Send To"
 msgstr "_Gửi bằng"
 
-#: ../pidgin/gtkconv.c:4349
+#: ../pidgin/gtkconv.c:4286
 #, fuzzy
 msgid "_Send"
 msgstr "Gửi"
 
 #. Setup the label telling how many people are in the room.
-#: ../pidgin/gtkconv.c:4453
+#: ../pidgin/gtkconv.c:4390
 msgid "0 people in room"
 msgstr "0 người trong phòng"
 
-#: ../pidgin/gtkconv.c:5823 ../pidgin/gtkconv.c:5944
+#: ../pidgin/gtkconv.c:5759 ../pidgin/gtkconv.c:5880
 #, 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"
 
-#: ../pidgin/gtkconv.c:6550 ../pidgin/gtkstatusbox.c:660
+#: ../pidgin/gtkconv.c:6486 ../pidgin/gtkstatusbox.c:660
 msgid "Typing"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:6554
+#: ../pidgin/gtkconv.c:6490
 msgid "Stopped Typing"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:6557
+#: ../pidgin/gtkconv.c:6493
 #, fuzzy
 msgid "Nick Said"
 msgstr "Biệt danh (nick)"
 
-#: ../pidgin/gtkconv.c:6560 ../pidgin/gtkdocklet.c:492
+#: ../pidgin/gtkconv.c:6496 ../pidgin/gtkdocklet.c:492
 #, fuzzy
 msgid "Unread Messages"
 msgstr "Gửi thông điệp"
 
-#: ../pidgin/gtkconv.c:6563
+#: ../pidgin/gtkconv.c:6499
 #, fuzzy
 msgid "New Event"
 msgstr "Sự kiện"
 
-#: ../pidgin/gtkconv.c:7654
+#: ../pidgin/gtkconv.c:7572
 #, fuzzy
 msgid "clear: Clears all conversation scrollbacks."
 msgstr "%s đã đóng cửa sổ cuộc thoại."
 
-#: ../pidgin/gtkconv.c:7817
+#: ../pidgin/gtkconv.c:7736
 #, fuzzy
 msgid "Confirm close"
 msgstr "Xác nhận tài khoản"
 
-#: ../pidgin/gtkconv.c:7849
+#: ../pidgin/gtkconv.c:7768
 #, fuzzy
 msgid "You have unread messages. Are you sure you want to close the window?"
 msgstr "Bạn chắc chắn muốn xóa %s không?"
 
-#: ../pidgin/gtkconv.c:8436
+#: ../pidgin/gtkconv.c:8355
 msgid "Close other tabs"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:8442
+#: ../pidgin/gtkconv.c:8361
 msgid "Close all tabs"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:8450
+#: ../pidgin/gtkconv.c:8369
 msgid "Detach this tab"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:8456
+#: ../pidgin/gtkconv.c:8375
 msgid "Close this tab"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:8951
+#: ../pidgin/gtkconv.c:8875
 msgid "Close conversation"
 msgstr "Đóng cuộc thoại"
 
-#: ../pidgin/gtkconv.c:9553
+#: ../pidgin/gtkconv.c:9477
 msgid "Last created window"
 msgstr "Cửa sổ được tạo lần cuối"
 
-#: ../pidgin/gtkconv.c:9555
+#: ../pidgin/gtkconv.c:9479
 #, fuzzy
 msgid "Separate IM and Chat windows"
 msgstr "Hiển thị Tin Nhắn Nhanh và Chat trong cửa sổ có dạng _tab"
 
-#: ../pidgin/gtkconv.c:9557 ../pidgin/gtkprefs.c:1417
+#: ../pidgin/gtkconv.c:9481 ../pidgin/gtkprefs.c:1415
 msgid "New window"
 msgstr "Cửa sổ mới"
 
-#: ../pidgin/gtkconv.c:9559
+#: ../pidgin/gtkconv.c:9483
 msgid "By group"
 msgstr "Theo nhóm"
 
-#: ../pidgin/gtkconv.c:9561
+#: ../pidgin/gtkconv.c:9485
 msgid "By account"
 msgstr "Theo tài khoản"
 
@@ -15396,11 +15352,12 @@
 msgstr "Tiếng Ru-ma-ni"
 
 #: ../pidgin/gtkdialogs.c:204 ../pidgin/gtkdialogs.c:205
+#: ../pidgin/gtkdialogs.c:260 ../pidgin/gtkdialogs.c:261
 msgid "Serbian"
 msgstr "Tiếng Séc-bi"
 
-#: ../pidgin/gtkdialogs.c:206 ../pidgin/gtkdialogs.c:260
-#: ../pidgin/gtkdialogs.c:261
+#: ../pidgin/gtkdialogs.c:206 ../pidgin/gtkdialogs.c:262
+#: ../pidgin/gtkdialogs.c:263
 msgid "Swedish"
 msgstr "Tiếng Thụy Điển"
 
@@ -15417,7 +15374,7 @@
 msgid "Thai"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:210 ../pidgin/gtkdialogs.c:262
+#: ../pidgin/gtkdialogs.c:210 ../pidgin/gtkdialogs.c:264
 msgid "Turkish"
 msgstr ""
 
@@ -15430,7 +15387,7 @@
 msgid "T.M.Thanh and the Gnome-Vi Team"
 msgstr "Gnome Vi Team"
 
-#: ../pidgin/gtkdialogs.c:212 ../pidgin/gtkdialogs.c:263
+#: ../pidgin/gtkdialogs.c:212 ../pidgin/gtkdialogs.c:265
 msgid "Simplified Chinese"
 msgstr "Tiếng Trung Quốc phổ thông"
 
@@ -15440,7 +15397,7 @@
 msgstr ""
 
 #: ../pidgin/gtkdialogs.c:216 ../pidgin/gtkdialogs.c:217
-#: ../pidgin/gtkdialogs.c:264
+#: ../pidgin/gtkdialogs.c:266
 msgid "Traditional Chinese"
 msgstr "Tiếng Trung Quốc truyền thống"
 
@@ -15448,12 +15405,12 @@
 msgid "Amharic"
 msgstr "Tiếng Amharic"
 
-#: ../pidgin/gtkdialogs.c:351
+#: ../pidgin/gtkdialogs.c:353
 #, fuzzy, c-format
 msgid "About %s"
 msgstr "Giới thiệu Gaim"
 
-#: ../pidgin/gtkdialogs.c:394
+#: ../pidgin/gtkdialogs.c:396
 #, c-format
 msgid ""
 "%s is a graphical modular messaging client based on libpurple which is "
@@ -15467,95 +15424,95 @@
 "<BR><BR>"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:412
-#, fuzzy
+#: ../pidgin/gtkdialogs.c:414
+#, fuzzy, c-format
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin on irc.freenode.net<BR><BR>"
 msgstr "<FONT SIZE=\"3\">IRC:</FONT> #gaim trên irc.freenode.net<BR><BR>"
 
-#: ../pidgin/gtkdialogs.c:417
+#: ../pidgin/gtkdialogs.c:419
 #, fuzzy
 msgid "Current Developers"
 msgstr "Lập trình viên cũ"
 
-#: ../pidgin/gtkdialogs.c:432
+#: ../pidgin/gtkdialogs.c:434
 msgid "Crazy Patch Writers"
 msgstr "Lập trình viên tích cực viết sửa lỗi"
 
-#: ../pidgin/gtkdialogs.c:447
+#: ../pidgin/gtkdialogs.c:449
 msgid "Retired Developers"
 msgstr "Lập trình viên cũ"
 
-#: ../pidgin/gtkdialogs.c:462
+#: ../pidgin/gtkdialogs.c:464
 #, fuzzy
 msgid "Retired Crazy Patch Writers"
 msgstr "Lập trình viên tích cực viết sửa lỗi"
 
-#: ../pidgin/gtkdialogs.c:477
+#: ../pidgin/gtkdialogs.c:479
 msgid "Artists"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:492
+#: ../pidgin/gtkdialogs.c:494
 msgid "Current Translators"
 msgstr "Người dịch hiện thời"
 
-#: ../pidgin/gtkdialogs.c:512
+#: ../pidgin/gtkdialogs.c:514
 msgid "Past Translators"
 msgstr "Người dịch trước đây"
 
-#: ../pidgin/gtkdialogs.c:530
+#: ../pidgin/gtkdialogs.c:532
 #, fuzzy
 msgid "Debugging Information"
 msgstr "Thông tin"
 
-#: ../pidgin/gtkdialogs.c:900
+#: ../pidgin/gtkdialogs.c:902
 msgid "Get User Info"
 msgstr "Thông tin buddy"
 
-#: ../pidgin/gtkdialogs.c:902
+#: ../pidgin/gtkdialogs.c:904
 #, fuzzy
 msgid ""
 "Please enter the screen name or alias of the person whose info you would "
 "like to view."
 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"
 
-#: ../pidgin/gtkdialogs.c:992
+#: ../pidgin/gtkdialogs.c:994
 #, fuzzy
 msgid "View User Log"
 msgstr "Thông tin buddy"
 
-#: ../pidgin/gtkdialogs.c:994
+#: ../pidgin/gtkdialogs.c:996
 #, fuzzy
 msgid ""
 "Please enter the screen name or alias of the person whose log you would like "
 "to view."
 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"
 
-#: ../pidgin/gtkdialogs.c:1014
+#: ../pidgin/gtkdialogs.c:1016
 msgid "Alias Contact"
 msgstr "Bí danh liên lạc"
 
-#: ../pidgin/gtkdialogs.c:1015
+#: ../pidgin/gtkdialogs.c:1017
 msgid "Enter an alias for this contact."
 msgstr "Hãy nhập bí danh cho liên lạc này."
 
-#: ../pidgin/gtkdialogs.c:1037
+#: ../pidgin/gtkdialogs.c:1039
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "Nhập bí danh cho %s."
 
-#: ../pidgin/gtkdialogs.c:1039
+#: ../pidgin/gtkdialogs.c:1041
 msgid "Alias Buddy"
 msgstr "Bí danh Buddy"
 
-#: ../pidgin/gtkdialogs.c:1060
+#: ../pidgin/gtkdialogs.c:1062
 msgid "Alias Chat"
 msgstr "Bí danh Chat"
 
-#: ../pidgin/gtkdialogs.c:1061
+#: ../pidgin/gtkdialogs.c:1063
 msgid "Enter an alias for this chat."
 msgstr "Nhập bí danh cho cuộc Chat này."
 
-#: ../pidgin/gtkdialogs.c:1100
+#: ../pidgin/gtkdialogs.c:1102
 #, fuzzy, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddy from "
@@ -15570,33 +15527,33 @@
 "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?"
 
-#: ../pidgin/gtkdialogs.c:1108
+#: ../pidgin/gtkdialogs.c:1110
 msgid "Remove Contact"
 msgstr "Xóa Liên Lạc"
 
-#: ../pidgin/gtkdialogs.c:1111
+#: ../pidgin/gtkdialogs.c:1113
 #, fuzzy
 msgid "_Remove Contact"
 msgstr "Xóa Liên Lạc"
 
-#: ../pidgin/gtkdialogs.c:1142
+#: ../pidgin/gtkdialogs.c:1144
 #, fuzzy, c-format
 msgid ""
 "You are about to merge the group called %s into the group called %s. Do you "
 "want to continue?"
 msgstr "Bạn sắp xóa tập tin bản ghi cho %s. Bạn muốn thực hiện không?"
 
-#: ../pidgin/gtkdialogs.c:1149
+#: ../pidgin/gtkdialogs.c:1151
 #, fuzzy
 msgid "Merge Groups"
 msgstr "Xóa nhóm"
 
-#: ../pidgin/gtkdialogs.c:1152
+#: ../pidgin/gtkdialogs.c:1154
 #, fuzzy
 msgid "_Merge Groups"
 msgstr "_Xóa nhóm"
 
-#: ../pidgin/gtkdialogs.c:1202
+#: ../pidgin/gtkdialogs.c:1204
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
@@ -15605,42 +15562,42 @@
 "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?"
 
-#: ../pidgin/gtkdialogs.c:1205
+#: ../pidgin/gtkdialogs.c:1207
 msgid "Remove Group"
 msgstr "Xóa nhóm"
 
-#: ../pidgin/gtkdialogs.c:1208
+#: ../pidgin/gtkdialogs.c:1210
 #, fuzzy
 msgid "_Remove Group"
 msgstr "Xóa nhóm"
 
-#: ../pidgin/gtkdialogs.c:1241
+#: ../pidgin/gtkdialogs.c:1243
 #, 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?"
 
-#: ../pidgin/gtkdialogs.c:1244
+#: ../pidgin/gtkdialogs.c:1246
 msgid "Remove Buddy"
 msgstr "Xóa bỏ Buddy"
 
-#: ../pidgin/gtkdialogs.c:1247
+#: ../pidgin/gtkdialogs.c:1249
 #, fuzzy
 msgid "_Remove Buddy"
 msgstr "Xóa bỏ Buddy"
 
-#: ../pidgin/gtkdialogs.c:1268
+#: ../pidgin/gtkdialogs.c:1270
 #, 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?"
 
-#: ../pidgin/gtkdialogs.c:1271
+#: ../pidgin/gtkdialogs.c:1273
 msgid "Remove Chat"
 msgstr "Xóa Chat"
 
-#: ../pidgin/gtkdialogs.c:1274
+#: ../pidgin/gtkdialogs.c:1276
 #, fuzzy
 msgid "_Remove Chat"
 msgstr "Xóa Chat"
@@ -15670,7 +15627,7 @@
 
 #: ../pidgin/gtkdocklet.c:535
 #, fuzzy
-msgid "Blink on New Message"
+msgid "Blink on new message"
 msgstr "Thông Điệp Mới"
 
 #: ../pidgin/gtkdocklet.c:542
@@ -15774,7 +15731,7 @@
 msgid "Paste as Plain _Text"
 msgstr "Văn bản đơn thuần"
 
-#: ../pidgin/gtkimhtml.c:833 ../pidgin/gtkimhtmltoolbar.c:1192
+#: ../pidgin/gtkimhtml.c:833 ../pidgin/gtkimhtmltoolbar.c:1194
 #, fuzzy
 msgid "_Reset formatting"
 msgstr "Thông tin"
@@ -15845,6 +15802,7 @@
 msgstr "Lưu ảnh"
 
 #: ../pidgin/gtkimhtml.c:3522
+#, c-format
 msgid "_Save Image..."
 msgstr "_Lưu ảnh"
 
@@ -15884,11 +15842,11 @@
 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"
 
-#: ../pidgin/gtkimhtmltoolbar.c:430 ../pidgin/gtkimhtmltoolbar.c:1099
+#: ../pidgin/gtkimhtmltoolbar.c:430 ../pidgin/gtkimhtmltoolbar.c:1102
 msgid "Insert Link"
 msgstr "Chèn liên kết"
 
-#: ../pidgin/gtkimhtmltoolbar.c:434 ../pidgin/gtkimhtmltoolbar.c:1260
+#: ../pidgin/gtkimhtmltoolbar.c:434 ../pidgin/gtkimhtmltoolbar.c:1262
 msgid "_Insert"
 msgstr "C_hèn"
 
@@ -15910,143 +15868,143 @@
 msgid "Smile!"
 msgstr "Cười!"
 
-#: ../pidgin/gtkimhtmltoolbar.c:843 ../pidgin/gtkimhtmltoolbar.c:1217
+#: ../pidgin/gtkimhtmltoolbar.c:846 ../pidgin/gtkimhtmltoolbar.c:1219
 #, fuzzy
 msgid "_Font"
 msgstr "Phông chữ"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1051
+#: ../pidgin/gtkimhtmltoolbar.c:1054
 #, fuzzy
 msgid "Group Items"
 msgstr "Tên nhóm mới"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1051
+#: ../pidgin/gtkimhtmltoolbar.c:1054
 msgid "Ungroup Items"
 msgstr ""
 
-#: ../pidgin/gtkimhtmltoolbar.c:1085 ../pidgin/plugins/convcolors.c:287
+#: ../pidgin/gtkimhtmltoolbar.c:1088 ../pidgin/plugins/convcolors.c:287
 msgid "Bold"
 msgstr "Đậm"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1086 ../pidgin/plugins/convcolors.c:294
+#: ../pidgin/gtkimhtmltoolbar.c:1089 ../pidgin/plugins/convcolors.c:294
 msgid "Italic"
 msgstr "Nghiêng"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1087 ../pidgin/plugins/convcolors.c:301
+#: ../pidgin/gtkimhtmltoolbar.c:1090 ../pidgin/plugins/convcolors.c:301
 msgid "Underline"
 msgstr "Gạch chân"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1088
+#: ../pidgin/gtkimhtmltoolbar.c:1091
 #, fuzzy
 msgid "Strikethrough"
 msgstr "Gạch _ngang"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1090
+#: ../pidgin/gtkimhtmltoolbar.c:1093
 #, fuzzy
 msgid "Increase Font Size"
 msgstr "Bỏ qua _cỡ chữ"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1091
+#: ../pidgin/gtkimhtmltoolbar.c:1094
 msgid "Decrease Font Size"
 msgstr ""
 
-#: ../pidgin/gtkimhtmltoolbar.c:1093
+#: ../pidgin/gtkimhtmltoolbar.c:1096
 msgid "Font Face"
 msgstr "Mặt chữ"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1094
+#: ../pidgin/gtkimhtmltoolbar.c:1097
 #, fuzzy
 msgid "Background Color"
 msgstr "Màu nền"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1095
+#: ../pidgin/gtkimhtmltoolbar.c:1098
 #, fuzzy
 msgid "Foreground Color"
 msgstr "Màu chữ"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1097
+#: ../pidgin/gtkimhtmltoolbar.c:1100
 #, fuzzy
 msgid "Reset Formatting"
 msgstr "Thông tin"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1100
+#: ../pidgin/gtkimhtmltoolbar.c:1103
 #, fuzzy
 msgid "Insert IM Image"
 msgstr "Chèn ảnh"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1101
+#: ../pidgin/gtkimhtmltoolbar.c:1104
 #, fuzzy
 msgid "Insert Smiley"
 msgstr "Chèn biểu tượng"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1177
+#: ../pidgin/gtkimhtmltoolbar.c:1179
 #, fuzzy
 msgid "<b>_Bold</b>"
 msgstr "Mật khẩu:"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1178
+#: ../pidgin/gtkimhtmltoolbar.c:1180
 #, fuzzy
 msgid "<i>_Italic</i>"
 msgstr "_Nghiêng"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1179
+#: ../pidgin/gtkimhtmltoolbar.c:1181
 #, fuzzy
 msgid "<u>_Underline</u>"
 msgstr "Gạch _dưới"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1180
+#: ../pidgin/gtkimhtmltoolbar.c:1182
 msgid "<span strikethrough='true'>Strikethrough</span>"
 msgstr ""
 
-#: ../pidgin/gtkimhtmltoolbar.c:1181
+#: ../pidgin/gtkimhtmltoolbar.c:1183
 #, fuzzy
 msgid "<span size='larger'>_Larger</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">Gaim v%s</span>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1183
+#: ../pidgin/gtkimhtmltoolbar.c:1185
 msgid "_Normal"
 msgstr ""
 
-#: ../pidgin/gtkimhtmltoolbar.c:1185
+#: ../pidgin/gtkimhtmltoolbar.c:1187
 msgid "<span size='smaller'>_Smaller</span>"
 msgstr ""
 
 #. If we want to show the formatting for the following items, we would
 #. * need to update them when formatting changes. The above items don't need
 #. * no updating nor nothin'
-#: ../pidgin/gtkimhtmltoolbar.c:1189
+#: ../pidgin/gtkimhtmltoolbar.c:1191
 #, fuzzy
 msgid "_Font face"
 msgstr "Mặt chữ"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1190
+#: ../pidgin/gtkimhtmltoolbar.c:1192
 #, fuzzy
 msgid "Foreground _color"
 msgstr "Màu chữ"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1191
+#: ../pidgin/gtkimhtmltoolbar.c:1193
 msgid "Bac_kground color"
 msgstr "Màu _nền"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1268
+#: ../pidgin/gtkimhtmltoolbar.c:1270
+#, fuzzy
+msgid "_Smiley"
+msgstr "Cười!"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1276
 #, fuzzy
 msgid "_Image"
 msgstr "Lưu ảnh"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1274
+#: ../pidgin/gtkimhtmltoolbar.c:1282
 #, fuzzy
 msgid "_Link"
 msgstr "Tham gi_a"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1280
+#: ../pidgin/gtkimhtmltoolbar.c:1288
 msgid "_Horizontal rule"
 msgstr ""
 
-#: ../pidgin/gtkimhtmltoolbar.c:1302
-#, fuzzy
-msgid "_Smile!"
-msgstr "Cười!"
-
 #: ../pidgin/gtklog.c:293
 #, c-format
 msgid ""
@@ -16151,14 +16109,13 @@
 "  -n, --nologin       don't automatically login\n"
 "  -l, --login[=NAME]  automatically login (optional argument NAME specifies\n"
 "                      account(s) to use, separated by commas)\n"
-"  --display=DISPLAY   X display to use\n"
 "  -v, --version       display the current version and exit\n"
 msgstr ""
 
-#: ../pidgin/gtkmain.c:516
-#, c-format
-msgid ""
-"%s %s has segfaulted and attempted to dump a core file.\n"
+#: ../pidgin/gtkmain.c:512
+#, c-format
+msgid ""
+"%s has segfaulted and attempted to dump a core file.\n"
 "This is a bug in the software and has happened through\n"
 "no fault of your own.\n"
 "\n"
@@ -16179,7 +16136,7 @@
 
 #. Translators may want to transliterate the name.
 #. It is not to be translated.
-#: ../pidgin/gtkmain.c:706 ../pidgin/pidgin.h:51
+#: ../pidgin/gtkmain.c:699 ../pidgin/pidgin.h:51
 #, fuzzy
 msgid "Pidgin"
 msgstr "Tạo bản ghi"
@@ -16197,17 +16154,17 @@
 "\n"
 "%s"
 
-#: ../pidgin/gtknotify.c:537
+#: ../pidgin/gtknotify.c:540
 #, c-format
 msgid "%s has %d new message."
 msgid_plural "%s has %d new messages."
 msgstr[0] "%s có %d thông điệp mới."
 msgstr[1] "%s có %d thông điệp mới."
 
-#: ../pidgin/gtknotify.c:562
-#, c-format
-msgid "<b>%d new e-mail.</b>"
-msgid_plural "<b>%d new e-mails.</b>"
+#: ../pidgin/gtknotify.c:564
+#, c-format
+msgid "<b>You have %d new e-mail.</b>"
+msgid_plural "<b>You have %d new e-mails.</b>"
 msgstr[0] ""
 msgstr[1] ""
 
@@ -16441,7 +16398,7 @@
 msgid "_Hide new IM conversations:"
 msgstr "Đóng cuộc thoại"
 
-#: ../pidgin/gtkprefs.c:908 ../pidgin/gtkprefs.c:1946
+#: ../pidgin/gtkprefs.c:908 ../pidgin/gtkprefs.c:1944
 #, fuzzy
 msgid "When away"
 msgstr "%s đã đi vắng."
@@ -16499,194 +16456,190 @@
 msgid "Show _formatting on incoming messages"
 msgstr "Hiển thị thanh định dạng"
 
-#: ../pidgin/gtkprefs.c:997
-msgid "Close IMs immediately when the tab is closed"
-msgstr ""
-
-#: ../pidgin/gtkprefs.c:1000
+#: ../pidgin/gtkprefs.c:998
 #, fuzzy
 msgid "Show _detailed information"
 msgstr "Thông tin lý lịch"
 
-#: ../pidgin/gtkprefs.c:1002
+#: ../pidgin/gtkprefs.c:1000
 #, fuzzy
 msgid "Enable buddy ic_on animation"
 msgstr "Cho phép _hoạt cảnh biểu tượng buddy"
 
-#: ../pidgin/gtkprefs.c:1009
+#: ../pidgin/gtkprefs.c:1007
 #, fuzzy
 msgid "_Notify buddies that you are typing to them"
 msgstr "Thông báo buddy mà bạn đang _gõ thông điệp cho họ"
 
-#: ../pidgin/gtkprefs.c:1012
+#: ../pidgin/gtkprefs.c:1010
 #, fuzzy
 msgid "Highlight _misspelled words"
 msgstr "Đánh _dấu từ sai chính tả"
 
-#: ../pidgin/gtkprefs.c:1016
+#: ../pidgin/gtkprefs.c:1014
 msgid "Use smooth-scrolling"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1019
+#: ../pidgin/gtkprefs.c:1017
 #, fuzzy
 msgid "F_lash window when IMs are received"
 msgstr "N_hấp nháy cửa sổ khi có tin nhắn"
 
-#: ../pidgin/gtkprefs.c:1021
+#: ../pidgin/gtkprefs.c:1019
 #, fuzzy
 msgid "Minimi_ze new conversation windows"
 msgstr "Cửa sổ cuộc thoại Nhắn Tin Nhanh"
 
-#: ../pidgin/gtkprefs.c:1025
+#: ../pidgin/gtkprefs.c:1023
 #, fuzzy
 msgid "Font"
 msgstr "Phông chữ"
 
+#: ../pidgin/gtkprefs.c:1025
+msgid "Use document font from _theme"
+msgstr ""
+
 #: ../pidgin/gtkprefs.c:1027
-msgid "Use document font from _theme"
+msgid "Use font from _theme"
 msgstr ""
 
 #: ../pidgin/gtkprefs.c:1029
-msgid "Use font from _theme"
-msgstr ""
-
-#: ../pidgin/gtkprefs.c:1031
 #, fuzzy
 msgid "Conversation _font:"
 msgstr "Cuộc thoại"
 
-#: ../pidgin/gtkprefs.c:1045
+#: ../pidgin/gtkprefs.c:1043
 #, fuzzy
 msgid "Default Formatting"
 msgstr "Thông tin"
 
-#: ../pidgin/gtkprefs.c:1064
+#: ../pidgin/gtkprefs.c:1062
 msgid ""
 "This is how your outgoing message text will appear when you use protocols "
 "that support formatting."
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1130
+#: ../pidgin/gtkprefs.c:1128
 #, fuzzy
 msgid "ST_UN server:"
 msgstr "_Máy chủ:"
 
-#: ../pidgin/gtkprefs.c:1142
+#: ../pidgin/gtkprefs.c:1140
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1146
+#: ../pidgin/gtkprefs.c:1144
 #, fuzzy
 msgid "_Autodetect IP address"
 msgstr "Địa chỉ nhà"
 
-#: ../pidgin/gtkprefs.c:1155
+#: ../pidgin/gtkprefs.c:1153
 msgid "Public _IP:"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1184
+#: ../pidgin/gtkprefs.c:1182
 #, fuzzy
 msgid "Ports"
 msgstr "Cổng"
 
-#: ../pidgin/gtkprefs.c:1187
+#: ../pidgin/gtkprefs.c:1185
 msgid "_Manually specify range of ports to listen on"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1190
+#: ../pidgin/gtkprefs.c:1188
 #, fuzzy
 msgid "_Start port:"
 msgstr "Tìm _kiếm:"
 
-#: ../pidgin/gtkprefs.c:1197
+#: ../pidgin/gtkprefs.c:1195
 #, fuzzy
 msgid "_End port:"
 msgstr "_Cổng:"
 
-#: ../pidgin/gtkprefs.c:1205
+#: ../pidgin/gtkprefs.c:1203
 msgid "Proxy Server"
 msgstr "Máy chủ Proxy"
 
-#: ../pidgin/gtkprefs.c:1209
+#: ../pidgin/gtkprefs.c:1207
 msgid "No proxy"
 msgstr "Không proxy"
 
-#: ../pidgin/gtkprefs.c:1265
+#: ../pidgin/gtkprefs.c:1263
 msgid "_User:"
 msgstr "_Người dùng:"
 
-#: ../pidgin/gtkprefs.c:1330
+#: ../pidgin/gtkprefs.c:1328
 msgid "Seamonkey"
 msgstr ""
 
+#: ../pidgin/gtkprefs.c:1329
+msgid "Opera"
+msgstr "Opera"
+
+#: ../pidgin/gtkprefs.c:1330
+msgid "Netscape"
+msgstr "Netscape"
+
 #: ../pidgin/gtkprefs.c:1331
-msgid "Opera"
-msgstr "Opera"
+msgid "Mozilla"
+msgstr "Mozilla"
 
 #: ../pidgin/gtkprefs.c:1332
-msgid "Netscape"
-msgstr "Netscape"
+msgid "Konqueror"
+msgstr "Konqueror"
 
 #: ../pidgin/gtkprefs.c:1333
-msgid "Mozilla"
-msgstr "Mozilla"
-
-#: ../pidgin/gtkprefs.c:1334
-msgid "Konqueror"
-msgstr "Konqueror"
-
-#: ../pidgin/gtkprefs.c:1335
 #, fuzzy
 msgid "GNOME Default"
 msgstr "Chấp nhận mặc định"
 
-#: ../pidgin/gtkprefs.c:1336
+#: ../pidgin/gtkprefs.c:1334
 msgid "Galeon"
 msgstr "Galeon"
 
-#: ../pidgin/gtkprefs.c:1337
+#: ../pidgin/gtkprefs.c:1335
 msgid "Firefox"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1338
+#: ../pidgin/gtkprefs.c:1336
 msgid "Firebird"
 msgstr "Firebird"
 
-#: ../pidgin/gtkprefs.c:1339
+#: ../pidgin/gtkprefs.c:1337
 msgid "Epiphany"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1348
+#: ../pidgin/gtkprefs.c:1346
 msgid "Manual"
 msgstr "Tự chỉ định"
 
-#: ../pidgin/gtkprefs.c:1401
+#: ../pidgin/gtkprefs.c:1399
 msgid "Browser Selection"
 msgstr "Chọn dùng trình duyệt"
 
-#: ../pidgin/gtkprefs.c:1405
+#: ../pidgin/gtkprefs.c:1403
 msgid "_Browser:"
 msgstr "Trình _duyệt:"
 
-#: ../pidgin/gtkprefs.c:1413
+#: ../pidgin/gtkprefs.c:1411
 #, fuzzy
 msgid "_Open link in:"
 msgstr "_Mở liên kết trong trình duyệt"
 
-#: ../pidgin/gtkprefs.c:1415
+#: ../pidgin/gtkprefs.c:1413
 #, fuzzy
 msgid "Browser default"
 msgstr "trạng thái mặc định"
 
-#: ../pidgin/gtkprefs.c:1416
+#: ../pidgin/gtkprefs.c:1414
 msgid "Existing window"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1418
+#: ../pidgin/gtkprefs.c:1416
 msgid "New tab"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1432
+#: ../pidgin/gtkprefs.c:1430
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -16695,72 +16648,72 @@
 "_Tự chỉ định:\n"
 "(%s cho URL)"
 
-#: ../pidgin/gtkprefs.c:1472
+#: ../pidgin/gtkprefs.c:1470
 #, fuzzy
 msgid "Log _format:"
 msgstr "Định dạng bản ghi (log):"
 
-#: ../pidgin/gtkprefs.c:1477
+#: ../pidgin/gtkprefs.c:1475
 #, fuzzy
 msgid "Log all _instant messages"
 msgstr "_Ghi lại mọi thông điệp"
 
-#: ../pidgin/gtkprefs.c:1479
+#: ../pidgin/gtkprefs.c:1477
 msgid "Log all c_hats"
 msgstr "Ghi lại mọi cuộc c_hat"
 
-#: ../pidgin/gtkprefs.c:1481
+#: ../pidgin/gtkprefs.c:1479
 msgid "Log all _status changes to system log"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1627
+#: ../pidgin/gtkprefs.c:1625
 msgid "Sound Selection"
 msgstr "Chọn Âm thanh"
 
+#: ../pidgin/gtkprefs.c:1635
+#, fuzzy, c-format
+msgid "Quietest"
+msgstr "Thoát"
+
 #: ../pidgin/gtkprefs.c:1637
-#, fuzzy
-msgid "Quietest"
+#, fuzzy, c-format
+msgid "Quieter"
 msgstr "Thoát"
 
 #: ../pidgin/gtkprefs.c:1639
-#, fuzzy
-msgid "Quieter"
-msgstr "Thoát"
-
-#: ../pidgin/gtkprefs.c:1641
-#, fuzzy
+#, fuzzy, c-format
 msgid "Quiet"
 msgstr "Thoát"
 
-#: ../pidgin/gtkprefs.c:1645
-#, fuzzy
+#: ../pidgin/gtkprefs.c:1643
+#, fuzzy, c-format
 msgid "Loud"
 msgstr "Nạp"
 
+#: ../pidgin/gtkprefs.c:1645
+#, fuzzy, c-format
+msgid "Louder"
+msgstr "giờ"
+
 #: ../pidgin/gtkprefs.c:1647
-#, fuzzy
-msgid "Louder"
-msgstr "giờ"
-
-#: ../pidgin/gtkprefs.c:1649
-#, fuzzy
+#, fuzzy, c-format
 msgid "Loudest"
 msgstr "Âm thanh"
 
-#: ../pidgin/gtkprefs.c:1715
+#: ../pidgin/gtkprefs.c:1713
 msgid "_Method:"
 msgstr "Cá_ch phát:"
 
-#: ../pidgin/gtkprefs.c:1717
+#: ../pidgin/gtkprefs.c:1715
 msgid "Console beep"
 msgstr "Tiếng bíp console"
 
-#: ../pidgin/gtkprefs.c:1724
+#: ../pidgin/gtkprefs.c:1722
 #, fuzzy
 msgid "No sounds"
 msgstr "Âm thanh"
 
-#: ../pidgin/gtkprefs.c:1732
+#: ../pidgin/gtkprefs.c:1730
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -16769,89 +16722,89 @@
 "_Lệnh âm thanh:\n"
 "(%s cho tên tập tin)"
 
-#: ../pidgin/gtkprefs.c:1759
+#: ../pidgin/gtkprefs.c:1757
 #, fuzzy
 msgid "Sounds when conversation has _focus"
 msgstr "Bỏ khi cửa sổ cuộc thoại _được chú ý"
 
-#: ../pidgin/gtkprefs.c:1761
+#: ../pidgin/gtkprefs.c:1759
 #, fuzzy
 msgid "Enable sounds:"
 msgstr "Lỗi"
 
-#: ../pidgin/gtkprefs.c:1772
+#: ../pidgin/gtkprefs.c:1770
 msgid "Volume:"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1852
+#: ../pidgin/gtkprefs.c:1850
 msgid "Play"
 msgstr "Chơi"
 
-#: ../pidgin/gtkprefs.c:1929
+#: ../pidgin/gtkprefs.c:1927
 #, fuzzy
 msgid "_Report idle time:"
 msgstr "Hiển thị thời gi_an nghỉ"
 
-#: ../pidgin/gtkprefs.c:1934
+#: ../pidgin/gtkprefs.c:1932
 msgid "Based on keyboard or mouse use"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1943
+#: ../pidgin/gtkprefs.c:1941
 #, fuzzy
 msgid "_Auto-reply:"
 msgstr "Trả lời tự động"
 
-#: ../pidgin/gtkprefs.c:1947
+#: ../pidgin/gtkprefs.c:1945
 #, fuzzy
 msgid "When both away and idle"
 msgstr "Đặt trạng thái _khi nghỉ"
 
 #. Auto-away stuff
-#: ../pidgin/gtkprefs.c:1953
+#: ../pidgin/gtkprefs.c:1951
 msgid "Auto-away"
 msgstr "Tự động báo trạng thái"
 
-#: ../pidgin/gtkprefs.c:1955
+#: ../pidgin/gtkprefs.c:1953
 #, fuzzy
 msgid "Change status when _idle"
 msgstr "Đặt trạng thái _khi nghỉ"
 
-#: ../pidgin/gtkprefs.c:1959
+#: ../pidgin/gtkprefs.c:1957
 #, fuzzy
 msgid "_Minutes before becoming idle:"
 msgstr "Số _phút trước khi báo trạng thái:"
 
-#: ../pidgin/gtkprefs.c:1967
+#: ../pidgin/gtkprefs.c:1965
 #, fuzzy
 msgid "Change _status to:"
 msgstr "Đổi địa chỉ thành:"
 
 #. Signon status stuff
-#: ../pidgin/gtkprefs.c:1988
+#: ../pidgin/gtkprefs.c:1986
 msgid "Status at Startup"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1990
+#: ../pidgin/gtkprefs.c:1988
 msgid "Use status from last _exit at startup"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1996
+#: ../pidgin/gtkprefs.c:1994
 msgid "Status to a_pply at startup:"
 msgstr ""
 
+#: ../pidgin/gtkprefs.c:2032
+msgid "Interface"
+msgstr "Giao diện"
+
 #: ../pidgin/gtkprefs.c:2034
-msgid "Interface"
-msgstr "Giao diện"
-
-#: ../pidgin/gtkprefs.c:2036
 msgid "Smiley Themes"
 msgstr "Biểu tượng cười"
 
-#: ../pidgin/gtkprefs.c:2043
+#: ../pidgin/gtkprefs.c:2041
 msgid "Browser"
 msgstr "Trình duyệt"
 
-#: ../pidgin/gtkprefs.c:2047
+#: ../pidgin/gtkprefs.c:2045
 #, fuzzy
 msgid "Status / Idle"
 msgstr "Vắng mặt / Nghỉ"
@@ -17377,7 +17330,7 @@
 msgid "Received Messages"
 msgstr "Gửi thông điệp"
 
-#: ../pidgin/plugins/convcolors.c:210 ../pidgin/plugins/pidginrc.c:245
+#: ../pidgin/plugins/convcolors.c:210 ../pidgin/plugins/pidginrc.c:251
 #, fuzzy, c-format
 msgid "Select Color for %s"
 msgstr "Chọn màu chữ"
@@ -17664,7 +17617,7 @@
 "<b>Buddy Note</b>: %s"
 msgstr "<b>Chú thích Buddy:</b>"
 
-#: ../pidgin/plugins/history.c:192
+#: ../pidgin/plugins/history.c:188
 msgid "History"
 msgstr "Lược sử"
 
@@ -17921,42 +17874,52 @@
 msgid "GtkTreeView Horizontal Separation"
 msgstr ""
 
-#: ../pidgin/plugins/pidginrc.c:69
+#: ../pidgin/plugins/pidginrc.c:73
 #, fuzzy
 msgid "Conversation Entry"
 msgstr "Cuộc thoại"
 
-#: ../pidgin/plugins/pidginrc.c:70
+#: ../pidgin/plugins/pidginrc.c:74
+#, fuzzy
+msgid "Conversation History"
+msgstr "Cuộc thoại"
+
+#: ../pidgin/plugins/pidginrc.c:75
+#, fuzzy
+msgid "Log Viewer"
+msgstr "Đăng Nhập Máy Chủ"
+
+#: ../pidgin/plugins/pidginrc.c:76
 #, fuzzy
 msgid "Request Dialog"
 msgstr "Yêu cầu không rõ ràng"
 
-#: ../pidgin/plugins/pidginrc.c:71
+#: ../pidgin/plugins/pidginrc.c:77
 #, fuzzy
 msgid "Notify Dialog"
 msgstr "Thông báo cho"
 
-#: ../pidgin/plugins/pidginrc.c:247
+#: ../pidgin/plugins/pidginrc.c:253
 #, fuzzy
 msgid "Select Color"
 msgstr "Chọn màu chữ"
 
-#: ../pidgin/plugins/pidginrc.c:294
-#, fuzzy
+#: ../pidgin/plugins/pidginrc.c:300
+#, fuzzy, c-format
 msgid "Select Interface Font"
 msgstr "Chọn phông chữ"
 
-#: ../pidgin/plugins/pidginrc.c:297
+#: ../pidgin/plugins/pidginrc.c:303
 #, fuzzy, c-format
 msgid "Select Font for %s"
 msgstr "Chọn phông chữ"
 
-#: ../pidgin/plugins/pidginrc.c:365
+#: ../pidgin/plugins/pidginrc.c:371
 #, fuzzy
 msgid "GTK+ Interface Font"
 msgstr "Tùy chọn giao diện"
 
-#: ../pidgin/plugins/pidginrc.c:385
+#: ../pidgin/plugins/pidginrc.c:391
 msgid "GTK+ Text Shortcut Theme"
 msgstr ""
 
@@ -17980,39 +17943,39 @@
 #. widget_bool_widgets[i]);
 #. }
 #.
-#: ../pidgin/plugins/pidginrc.c:422
+#: ../pidgin/plugins/pidginrc.c:428
 #, fuzzy
 msgid "Interface colors"
 msgstr "Bỏ qua mà_u"
 
-#: ../pidgin/plugins/pidginrc.c:446
+#: ../pidgin/plugins/pidginrc.c:452
 msgid "Widget Sizes"
 msgstr ""
 
-#: ../pidgin/plugins/pidginrc.c:467
+#: ../pidgin/plugins/pidginrc.c:473
 msgid "Fonts"
 msgstr "Phông chữ"
 
-#: ../pidgin/plugins/pidginrc.c:491
+#: ../pidgin/plugins/pidginrc.c:497
 #, fuzzy
 msgid "Gtkrc File Tools"
 msgstr "Điều Khiển Tập Tin Gaim"
 
-#: ../pidgin/plugins/pidginrc.c:496
+#: ../pidgin/plugins/pidginrc.c:502
 #, c-format
 msgid "Write settings to %s%sgtkrc-2.0"
 msgstr ""
 
-#: ../pidgin/plugins/pidginrc.c:505
+#: ../pidgin/plugins/pidginrc.c:511
 msgid "Re-read gtkrc files"
 msgstr ""
 
-#: ../pidgin/plugins/pidginrc.c:538
+#: ../pidgin/plugins/pidginrc.c:544
 #, fuzzy
 msgid "Pidgin GTK+ Theme Control"
 msgstr "Điều Khiển Tập Tin Gaim"
 
-#: ../pidgin/plugins/pidginrc.c:540 ../pidgin/plugins/pidginrc.c:541
+#: ../pidgin/plugins/pidginrc.c:546 ../pidgin/plugins/pidginrc.c:547
 msgid "Provides access to commonly used gtkrc settings."
 msgstr ""
 
@@ -18196,6 +18159,7 @@
 msgstr ""
 
 #: ../pidgin/plugins/timestamp_format.c:26
+#, c-format
 msgid "_Force 24-hour time format"
 msgstr ""
 
@@ -18422,6 +18386,110 @@
 msgstr ""
 
 #, fuzzy
+#~ msgid "Offline buddies"
+#~ msgstr "Không hiển thị buddy _nghỉ"
+
+#, fuzzy
+#~ msgid "Sort"
+#~ msgstr "Cổng"
+
+#, fuzzy
+#~ msgid "By Status"
+#~ msgstr "Theo trạng thái"
+
+#, fuzzy
+#~ msgid "By Log Size"
+#~ msgstr "Theo kích thước bản ghi"
+
+#, fuzzy
+#~ msgid "Unable to connect to contact server"
+#~ msgstr "Không thể kết nối đến máy chủ"
+
+#, fuzzy
+#~ msgid "Unable to retrieve MSN Address Book"
+#~ msgstr "Không thể nhận danh sách Buddy"
+
+#, fuzzy
+#~ msgid "Current media"
+#~ msgstr "Hiện thời trên"
+
+#, fuzzy
+#~ msgid "Windows Live Messenger Protocol Plugin"
+#~ msgstr "Plugin giao thức Yahoo"
+
+#, fuzzy
+#~ msgid "Windows Live ID authentication Failed"
+#~ msgstr "Không xác thực được"
+
+#, fuzzy
+#~ msgid "%s just sent you a Nudge!"
+#~ msgstr "%s muốn gửi cho bạn %s (%s)"
+
+#, fuzzy
+#~ msgid "Unknown error (%d)"
+#~ msgstr "Lỗi không xác định"
+
+#, fuzzy
+#~ msgid "Unable to connect to OIM server"
+#~ msgstr "Không thể kết nối đến máy chủ"
+
+#, fuzzy
+#~ msgid "%s (%s) changed status from %s to %s"
+#~ msgstr "%s đã đổi chủ đề thành: %s"
+
+#, fuzzy
+#~ msgid "%s (%s) is now %s"
+#~ msgstr "%s bây giờ đổi là %s"
+
+#, fuzzy
+#~ msgid "%s (%s) is no longer %s"
+#~ msgstr "%s thôi vắng mặt."
+
+#, fuzzy
+#~ msgid "_Merge"
+#~ msgstr "_Thông điệp:"
+
+#, fuzzy
+#~ msgid "_Send File..."
+#~ msgstr "Gửi tập tin"
+
+#, fuzzy
+#~ msgid "Add Buddy _Pounce..."
+#~ msgstr "Thêm thông _báo Buddy"
+
+#, fuzzy
+#~ msgid "Hide when offline"
+#~ msgstr "Không được phép khi chưa kết nối"
+
+#, fuzzy
+#~ msgid "Show when offline"
+#~ msgstr "Không được phép khi chưa kết nối"
+
+#, fuzzy
+#~ msgid "Add _Buddy..."
+#~ msgstr "Thêm Buddy"
+
+#, fuzzy
+#~ msgid "Add C_hat..."
+#~ msgstr "Thêm Chat"
+
+#, fuzzy
+#~ msgid "Persistent"
+#~ msgstr "Cho phép"
+
+#, fuzzy
+#~ msgid "/Accounts/Manage"
+#~ msgstr "Tài khoản"
+
+#, fuzzy
+#~ msgid "A_ccount:"
+#~ msgstr "Tài khoản:"
+
+#, fuzzy
+#~ msgid "S_end To"
+#~ msgstr "_Gửi bằng"
+
+#, fuzzy
 #~ msgid "Hide Disconnect Errors"
 #~ msgstr "Có lỗi khi kết nối tới cơ sở dữ liệu"
 
@@ -18483,10 +18551,6 @@
 #~ msgid "GtkTreeView Expander Size"
 #~ msgstr "Lích thước thanh mở rộng"
 
-#, fuzzy
-#~ msgid "Conversation History"
-#~ msgstr "Cuộc thoại"
-
 #~ msgid ""
 #~ "You can get version %s from:<br><a href=\"http://gaim.sourceforge.net/"
 #~ "\">http://gaim.sourceforge.net</a>."
@@ -18546,12 +18610,6 @@
 #~ msgid "Alias Contact..."
 #~ msgstr "Bí danh liên lạc"
 
-#~ msgid "Add a _Buddy"
-#~ msgstr "Thêm _Buddy"
-
-#~ msgid "Add a C_hat"
-#~ msgstr "Thêm C_hat"
-
 #, fuzzy
 #~ msgid "/Tools/Account Ac_tions"
 #~ msgstr "/Công cụ/Tài _khoản"