changeset 17188:76c7f1eb69f8

* Chinese (Hong Kong) translation added (Ambrose C. Li) * Chinese (Traditional) translation updated (Ambrose C. Li) * Chinese (Traditional) win32 translation updated (Ambrose C. Li) committer: Luke Schierer <lschiere@pidgin.im>
author Ambrose C. Li <acli@ada.dhs.org>
date Tue, 22 May 2007 12:45:40 +0000
parents 1d306b38ba82
children 2d66f429fdfa
files pidgin/win32/nsis/translations/trad-chinese.nsh po/ChangeLog po/zh_HK.po po/zh_TW.po
diffstat 4 files changed, 5179 insertions(+), 4765 deletions(-) [+]
line wrap: on
line diff
--- a/pidgin/win32/nsis/translations/trad-chinese.nsh	Tue May 22 12:30:12 2007 +0000
+++ b/pidgin/win32/nsis/translations/trad-chinese.nsh	Tue May 22 12:45:40 2007 +0000
@@ -7,13 +7,13 @@
 ;;  Author: Paladin R. Liu <paladin@ms1.hinet.net>
 ;;  Minor updates: Ambrose C. Li <acli@ada.dhs.org>
 ;;
-;;  Last Updated: July 5, 2005
+;;  Last Updated: May 21, 2007
 ;;
 
 ; Startup Checks
 !define INSTALLER_IS_RUNNING			"安裝程式正在執行中。"
 !define PIDGIN_IS_RUNNING				"Pidgin 正在執行中,請先結束這個程式後再行安裝。"
-!define GTK_INSTALLER_NEEDED			"找不到符合的 GTK+ 執行環境或是需要被更新。$\r請安裝 v${GTK_MIN_VERSION} 以上版本的 GTK+ 執行環境。"
+!define GTK_INSTALLER_NEEDED			"找不到符合的 GTK+ 執行環境或是需要被更新。$\r請安裝 v${GTK_MIN_VERSION} 或以上版本的 GTK+ 執行環境。"
 
 ; License Page
 !define PIDGIN_LICENSE_BUTTON			"下一步 >"
@@ -34,17 +34,52 @@
 
 ; GTK+ Directory Page
 !define GTK_UPGRADE_PROMPT			"發現一個舊版的 GTK+ 執行環境。您要將它升級嗎?$\r請注意:如果您不升級, $(^Name) 可能無法正確的被執行。"
+!define GTK_WINDOWS_INCOMPATIBLE		"自版本 2.8.0 開始,GTK+ 與 Windows 95/98/Me 已不再相容,GTK+ ${GTK_INSTALL_VERSION} 因此將不會被安裝。$\r如果系統內未有已經安裝的 GTK+ ${GTK_MIN_VERSION} 或更新的版本,安裝程式將隨即結束。"
 
 ; Installer Finish Page
 !define PIDGIN_FINISH_VISIT_WEB_SITE		"拜訪 Windows Pidgin 網頁"
 
 ; Pidgin Section Prompts and Texts
 !define PIDGIN_UNINSTALL_DESC			"$(^Name) (只供移除)"
+!define PIDGIN_PROMPT_CONTINUE_WITHOUT_UNINSTALL	"無法移除目前已安裝的 Pidgin,新版本將在未經移除舊版本的情況下進行安裝。"
 
 ; GTK+ Section Prompts
 !define GTK_INSTALL_ERROR			"安裝 GTK+ 執行環境時發生錯誤。"
 !define GTK_BAD_INSTALL_PATH			"您所輸入的安裝目錄無法存取或建立。"
 
+; URL Handler section
+!define URI_HANDLERS_SECTION_TITLE		"URI 處理程式"
+
 ; Uninstall Section Prompts
 !define un.PIDGIN_UNINSTALL_ERROR_1		"移除程式無法找到 Pidgin 的安裝資訊。$\r這應該是有其他的使用者重新安裝了這個程式。"
-!define un.PIDGIN_UNINSTALL_ERROR_2		"您目前的權限無法移除 Pidgin 。"
+!define un.PIDGIN_UNINSTALL_ERROR_2		"您目前的權限無法移除 Pidgin。"
+
+; Spellcheck Section Prompts
+!define PIDGIN_SPELLCHECK_SECTION_TITLE		"拼字檢查功能"
+!define PIDGIN_SPELLCHECK_ERROR			"安裝拼字檢查途中發生錯誤"
+!define PIDGIN_SPELLCHECK_DICT_ERROR		"安裝拼字檢查用的詞典途中發生錯誤"
+!define PIDGIN_SPELLCHECK_SECTION_DESCRIPTION	"拼字檢查支援(安裝須有網際網路連線)。"
+!define ASPELL_INSTALL_FAILED			"安裝失敗"
+!define PIDGIN_SPELLCHECK_BRETON		"布里多尼文"
+!define PIDGIN_SPELLCHECK_CATALAN		"加泰隆文"
+!define PIDGIN_SPELLCHECK_CZECH			"捷克文"
+!define PIDGIN_SPELLCHECK_WELSH			"威爾斯文"
+!define PIDGIN_SPELLCHECK_DANISH		"丹麥文"
+!define PIDGIN_SPELLCHECK_GERMAN		"德文"
+!define PIDGIN_SPELLCHECK_GREEK			"希臘文"
+!define PIDGIN_SPELLCHECK_ENGLISH		"英文"
+!define PIDGIN_SPELLCHECK_ESPERANTO		"世界語"
+!define PIDGIN_SPELLCHECK_SPANISH		"西班牙文"
+!define PIDGIN_SPELLCHECK_FAROESE		"法羅群島文"
+!define PIDGIN_SPELLCHECK_FRENCH		"法文"
+!define PIDGIN_SPELLCHECK_ITALIAN		"意大利文"
+!define PIDGIN_SPELLCHECK_DUTCH			"荷蘭文"
+!define PIDGIN_SPELLCHECK_NORWEGIAN		"挪威文"
+!define PIDGIN_SPELLCHECK_POLISH		"波蘭文"
+!define PIDGIN_SPELLCHECK_PORTUGUESE		"萄文"
+!define PIDGIN_SPELLCHECK_ROMANIAN		"羅馬尼亞文"
+!define PIDGIN_SPELLCHECK_RUSSIAN		"俄文"
+!define PIDGIN_SPELLCHECK_SLOVAK		"斯洛伐克文"
+!define PIDGIN_SPELLCHECK_SWEDISH		"瑞典文"
+!define PIDGIN_SPELLCHECK_UKRAINIAN		"烏克蘭文"
+
--- a/po/ChangeLog	Tue May 22 12:30:12 2007 +0000
+++ b/po/ChangeLog	Tue May 22 12:45:40 2007 +0000
@@ -1,7 +1,10 @@
 Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
 
 version 2.0.1
+	* Chinese (Hong Kong) translation added (Ambrose C. Li)
 	* Chinese (Simplified) translation updated (Funda Wang)
+	* Chinese (Traditional) translation updated (Ambrose C. Li)
+	* Chinese (Traditional) win32 translation updated (Ambrose C. Li)
 	* Finnish translation updated (Timo Jyrinki)
 	* Hebrew translation updated (Shalom Craimer)
 	* Hebrew win32 translation updated (Shalom Craimer)
--- a/po/zh_HK.po	Tue May 22 12:30:12 2007 +0000
+++ b/po/zh_HK.po	Tue May 22 12:45:40 2007 +0000
@@ -1,9 +1,11 @@
+# NOTE: This file is generated from zh_TW.po by mkzhhk.pl,v 1.10 2007/05/22 04:39:31 acli Exp
+# ---
 # Pidgin's Traditional Chinese translation
 # Copyright (C) 2002-2007, Paladin R. Liu <paladin@ms1.hinet.net>
 # Copyright (C) 2003-2007, Ambrose C. Li <acli@ada.dhs.org>
 #
 # This file is distributed under the same license as the "Pidgin" package.
-# $InternalId: zh_TW.po,v 1.445 2007/04/16 03:20:24 acli Exp $
+# $InternalId: zh_TW.po,v 1.468 2007/05/21 21:53:48 acli Exp $
 #
 # ----------------------------------------------------------
 # For internal use only:
@@ -23,7 +25,6 @@
 # - Key 怨陌撖啜嚗嚗Key ExchangeX霅舀箝鈭斗撖啜
 # - Public Key 怨陌祇啜
 # - Private Key 怨陌蝘啜
-# - Key Pair 怎∟陌 (TODO)
 # - Key Agreement  Key Exchange 隡潔蝢抬霅胯鈭斗撖啜
 # - Passphrase 霅胯撖蝣潦
 # (臬行 Mozilla 霅舀 <http://ccca.nctu.edu.tw/~hlb/tavi/MozillaGlossary>?)
@@ -50,8 +51,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Pidgin 2.0.0\n"
-"POT-Creation-Date: 2007-04-09 08:32-0400\n"
-"PO-Revision-Date: 2007-04-14 22:00-0400\n"
+"POT-Creation-Date: 2007-05-21 00:01-0400\n"
+"PO-Revision-Date: 2007-05-20 01:57-0400\n"
 "Last-Translator: Ambrose Li <acli@ada.dhs.org>\n"
 "Language-Team: Chinese (Traditional) <zh-l10n@linux.org.tw>\n"
 "MIME-Version: 1.0\n"
@@ -60,12 +61,12 @@
 "Report-Msgid-Bugs-To: \n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: ../finch/finch.c:229
+#: ../finch/finch.c:180
 #, c-format
 msgid "%s. Try `%s -h' for more information.\n"
 msgstr "%s瑁%s -h隞亦脣湧脖甇亦鞈閮\n"
 
-#: ../finch/finch.c:231
+#: ../finch/finch.c:182
 #, c-format
 msgid ""
 "%s\n"
@@ -86,14 +87,32 @@
 "  -n, --nologin       銝芸餃功n"
 "  -v, --version       憿舐內祈臭蒂a\n"
 
-#: ../finch/gntaccount.c:119 ../finch/gntblist.c:274 ../finch/gntblist.c:393
-#: ../finch/gntblist.c:406 ../finch/gntplugin.c:154 ../finch/gntplugin.c:199
-#: ../finch/gntstatus.c:291 ../finch/gntstatus.c:299
-#: ../libpurple/protocols/jabber/buddy.c:1406
-#: ../libpurple/protocols/jabber/chat.c:679
-#: ../libpurple/protocols/jabber/chat.c:690
-#: ../libpurple/protocols/jabber/jabber.c:1216
-#: ../libpurple/protocols/qq/group_join.c:324
+#  NOTE Untranslated
+#. Translators may want to transliterate the name.
+#. It is not to be translated.
+#: ../finch/finch.c:274 ../finch/finch.c:303
+msgid "Finch"
+msgstr "Finch"
+
+#  NOTE 蝚砌銝 %s 靽桅蝔梧銝舐撘嚗
+#: ../finch/finch.c:301 ../pidgin/gtkmain.c:685
+#, c-format
+msgid ""
+"%s encountered errors migrating your settings from %s to %s. Please "
+"investigate and complete the migration by hand. Please report this error at "
+"http://developer.pidgin.im"
+msgstr ""
+"%s 撠閮剖梁桅 %s 頧蝘餉喟桅 %s 銝剔潛航炊嚗隢隤踵亙嫣誑鈭箸摰頧蝘餌摨嚗"
+"銝阡 http://developer.pidgin.im 梢航炊"
+
+#: ../finch/gntaccount.c:119 ../finch/gntblist.c:288 ../finch/gntblist.c:413
+#: ../finch/gntblist.c:426 ../finch/gntplugin.c:181 ../finch/gntplugin.c:225
+#: ../finch/gntstatus.c:294 ../finch/gntstatus.c:302
+#: ../libpurple/protocols/jabber/buddy.c:1426
+#: ../libpurple/protocols/jabber/chat.c:677
+#: ../libpurple/protocols/jabber/chat.c:688
+#: ../libpurple/protocols/jabber/jabber.c:1229
+#: ../libpurple/protocols/qq/group_join.c:326
 #: ../libpurple/protocols/silc/ops.c:1451
 msgid "Error"
 msgstr "航炊"
@@ -107,16 +126,16 @@
 msgid "Screenname of an account must be non-empty."
 msgstr "撣唾銝舐蝛箝"
 
-#: ../finch/gntaccount.c:423 ../pidgin/gtkaccount.c:567
+#: ../finch/gntaccount.c:423 ../pidgin/gtkaccount.c:590
 msgid "New mail notifications"
 msgstr "圈萎辣"
 
-#: ../finch/gntaccount.c:433 ../pidgin/gtkaccount.c:496
+#: ../finch/gntaccount.c:433 ../pidgin/gtkaccount.c:519
 msgid "Remember password"
 msgstr "閮雿撖蝣"
 
-#: ../finch/gntaccount.c:474 ../pidgin/gtkaccount.c:1430
-#: ../pidgin/gtkblist.c:3891
+#: ../finch/gntaccount.c:474 ../pidgin/gtkaccount.c:1456
+#: ../pidgin/gtkblist.c:3965
 msgid "Modify Account"
 msgstr "靽格孵董"
 
@@ -125,103 +144,103 @@
 msgid "New Account"
 msgstr "啣董"
 
-#: ../finch/gntaccount.c:500 ../pidgin/gtkaccount.c:407 ../pidgin/gtkft.c:695
+#: ../finch/gntaccount.c:500 ../pidgin/gtkaccount.c:427 ../pidgin/gtkft.c:695
 msgid "Protocol:"
 msgstr "閮摰嚗"
 
-#: ../finch/gntaccount.c:508 ../pidgin/gtkaccount.c:412
-#: ../pidgin/gtkblist.c:5293
+#: ../finch/gntaccount.c:508 ../pidgin/gtkaccount.c:435
+#: ../pidgin/gtkblist.c:5389
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:295
 msgid "Screen name:"
 msgstr "撣唾嚗"
 
-#: ../finch/gntaccount.c:521 ../pidgin/gtkaccount.c:487
+#: ../finch/gntaccount.c:521 ../pidgin/gtkaccount.c:510
 msgid "Password:"
 msgstr "撖蝣潘"
 
-#: ../finch/gntaccount.c:531 ../pidgin/gtkblist.c:5314
-#: ../pidgin/gtkblist.c:5677
+#: ../finch/gntaccount.c:531 ../pidgin/gtkblist.c:5410
+#: ../pidgin/gtkblist.c:5773
 msgid "Alias:"
 msgstr "亙嚗"
 
 #. Cancel button
 #. Cancel
-#: ../finch/gntaccount.c:554 ../finch/gntaccount.c:615
-#: ../finch/gntaccount.c:834 ../finch/gntblist.c:316 ../finch/gntblist.c:383
-#: ../finch/gntblist.c:416 ../finch/gntblist.c:740 ../finch/gntblist.c:926
-#: ../finch/gntblist.c:1017 ../finch/gntblist.c:2049 ../finch/gntpounce.c:456
-#: ../finch/gntpounce.c:652 ../finch/gntprefs.c:284 ../finch/gntstatus.c:139
-#: ../finch/gntstatus.c:472 ../finch/gntstatus.c:597
-#: ../libpurple/account.c:969 ../libpurple/account.c:1218
-#: ../libpurple/account.c:1252 ../libpurple/conversation.c:1164
-#: ../libpurple/plugins/buddynote.c:51 ../libpurple/protocols/gg/gg.c:498
-#: ../libpurple/protocols/gg/gg.c:656 ../libpurple/protocols/gg/gg.c:792
-#: ../libpurple/protocols/gg/gg.c:871
-#: ../libpurple/protocols/jabber/buddy.c:588
-#: ../libpurple/protocols/jabber/buddy.c:1768
-#: ../libpurple/protocols/jabber/buddy.c:1802
-#: ../libpurple/protocols/jabber/chat.c:788
-#: ../libpurple/protocols/jabber/jabber.c:876
-#: ../libpurple/protocols/jabber/jabber.c:1371
-#: ../libpurple/protocols/jabber/xdata.c:338
-#: ../libpurple/protocols/msn/msn.c:250 ../libpurple/protocols/msn/msn.c:265
-#: ../libpurple/protocols/msn/msn.c:280 ../libpurple/protocols/msn/msn.c:295
-#: ../libpurple/protocols/msn/msn.c:312
-#: ../libpurple/protocols/oscar/oscar.c:6039
-#: ../libpurple/protocols/oscar/peer.c:1021
+#: ../finch/gntaccount.c:554 ../finch/gntaccount.c:617
+#: ../finch/gntaccount.c:838 ../finch/gntblist.c:332 ../finch/gntblist.c:401
+#: ../finch/gntblist.c:436 ../finch/gntblist.c:768 ../finch/gntblist.c:965
+#: ../finch/gntblist.c:1061 ../finch/gntblist.c:2155 ../finch/gntplugin.c:360
+#: ../finch/gntpounce.c:456 ../finch/gntpounce.c:654 ../finch/gntprefs.c:246
+#: ../finch/gntstatus.c:142 ../finch/gntstatus.c:475 ../finch/gntstatus.c:600
+#: ../libpurple/account.c:984 ../libpurple/account.c:1234
+#: ../libpurple/account.c:1269 ../libpurple/conversation.c:1168
+#: ../libpurple/plugins/buddynote.c:51 ../libpurple/protocols/gg/gg.c:502
+#: ../libpurple/protocols/gg/gg.c:661 ../libpurple/protocols/gg/gg.c:798
+#: ../libpurple/protocols/gg/gg.c:879
+#: ../libpurple/protocols/jabber/buddy.c:584
+#: ../libpurple/protocols/jabber/buddy.c:1788
+#: ../libpurple/protocols/jabber/buddy.c:1824
+#: ../libpurple/protocols/jabber/chat.c:786
+#: ../libpurple/protocols/jabber/jabber.c:878
+#: ../libpurple/protocols/jabber/jabber.c:1384
+#: ../libpurple/protocols/jabber/xdata.c:337
+#: ../libpurple/protocols/msn/msn.c:259 ../libpurple/protocols/msn/msn.c:276
+#: ../libpurple/protocols/msn/msn.c:293 ../libpurple/protocols/msn/msn.c:310
+#: ../libpurple/protocols/msn/msn.c:331
+#: ../libpurple/protocols/oscar/oscar.c:6004
+#: ../libpurple/protocols/oscar/peer.c:1023
 #: ../libpurple/protocols/qq/buddy_info.c:484
-#: ../libpurple/protocols/qq/buddy_opt.c:212
-#: ../libpurple/protocols/qq/buddy_opt.c:402
+#: ../libpurple/protocols/qq/buddy_opt.c:214
+#: ../libpurple/protocols/qq/buddy_opt.c:409
 #: ../libpurple/protocols/qq/group.c:124
 #: ../libpurple/protocols/qq/group_join.c:138
-#: ../libpurple/protocols/qq/group_join.c:359
-#: ../libpurple/protocols/qq/group_opt.c:142
-#: ../libpurple/protocols/qq/group_opt.c:392
-#: ../libpurple/protocols/qq/sys_msg.c:104
-#: ../libpurple/protocols/qq/sys_msg.c:159
-#: ../libpurple/protocols/qq/sys_msg.c:247
-#: ../libpurple/protocols/sametime/sametime.c:3389
+#: ../libpurple/protocols/qq/group_join.c:363
+#: ../libpurple/protocols/qq/group_opt.c:143
+#: ../libpurple/protocols/qq/group_opt.c:398
+#: ../libpurple/protocols/qq/sys_msg.c:115
+#: ../libpurple/protocols/qq/sys_msg.c:174
+#: ../libpurple/protocols/qq/sys_msg.c:269
+#: ../libpurple/protocols/sametime/sametime.c:3388
 #: ../libpurple/protocols/sametime/sametime.c:3474
-#: ../libpurple/protocols/sametime/sametime.c:3644
-#: ../libpurple/protocols/sametime/sametime.c:5388
-#: ../libpurple/protocols/sametime/sametime.c:5477
-#: ../libpurple/protocols/sametime/sametime.c:5601
-#: ../libpurple/protocols/silc/buddy.c:467
-#: ../libpurple/protocols/silc/buddy.c:1078
-#: ../libpurple/protocols/silc/buddy.c:1183
-#: ../libpurple/protocols/silc/chat.c:597
-#: ../libpurple/protocols/silc/chat.c:726
-#: ../libpurple/protocols/silc/ops.c:1912
+#: ../libpurple/protocols/sametime/sametime.c:3645
+#: ../libpurple/protocols/sametime/sametime.c:5397
+#: ../libpurple/protocols/sametime/sametime.c:5487
+#: ../libpurple/protocols/sametime/sametime.c:5612
+#: ../libpurple/protocols/silc/buddy.c:468
+#: ../libpurple/protocols/silc/buddy.c:1084
+#: ../libpurple/protocols/silc/buddy.c:1189
+#: ../libpurple/protocols/silc/chat.c:600
+#: ../libpurple/protocols/silc/chat.c:730
+#: ../libpurple/protocols/silc/ops.c:1913
 #: ../libpurple/protocols/silc/silc.c:744
-#: ../libpurple/protocols/silc/silc.c:949
-#: ../libpurple/protocols/yahoo/yahoo.c:988
-#: ../libpurple/protocols/yahoo/yahoo.c:3228
-#: ../libpurple/protocols/yahoo/yahoo.c:3237 ../pidgin/gtkaccount.c:1866
-#: ../pidgin/gtkaccount.c:2446 ../pidgin/gtkblist.c:5733
-#: ../pidgin/gtkdialogs.c:724 ../pidgin/gtkdialogs.c:861
-#: ../pidgin/gtkdialogs.c:952 ../pidgin/gtkdialogs.c:971
-#: ../pidgin/gtkdialogs.c:993 ../pidgin/gtkdialogs.c:1013
-#: ../pidgin/gtkdialogs.c:1057 ../pidgin/gtkdialogs.c:1095
-#: ../pidgin/gtkdialogs.c:1149 ../pidgin/gtkdialogs.c:1186
-#: ../pidgin/gtkdialogs.c:1211 ../pidgin/gtkimhtmltoolbar.c:419
-#: ../pidgin/gtklog.c:294 ../pidgin/gtkplugin.c:286 ../pidgin/gtkpounce.c:1098
-#: ../pidgin/gtkprivacy.c:566 ../pidgin/gtkprivacy.c:579
-#: ../pidgin/gtkprivacy.c:604 ../pidgin/gtkprivacy.c:615
-#: ../pidgin/gtkrequest.c:270 ../pidgin/gtksavedstatuses.c:336
+#: ../libpurple/protocols/silc/silc.c:950
+#: ../libpurple/protocols/yahoo/yahoo.c:987
+#: ../libpurple/protocols/yahoo/yahoo.c:3231
+#: ../libpurple/protocols/yahoo/yahoo.c:3242 ../pidgin/gtkaccount.c:1894
+#: ../pidgin/gtkaccount.c:2485 ../pidgin/gtkblist.c:5829
+#: ../pidgin/gtkdialogs.c:725 ../pidgin/gtkdialogs.c:863
+#: ../pidgin/gtkdialogs.c:955 ../pidgin/gtkdialogs.c:975
+#: ../pidgin/gtkdialogs.c:999 ../pidgin/gtkdialogs.c:1021
+#: ../pidgin/gtkdialogs.c:1069 ../pidgin/gtkdialogs.c:1110
+#: ../pidgin/gtkdialogs.c:1166 ../pidgin/gtkdialogs.c:1205
+#: ../pidgin/gtkdialogs.c:1232 ../pidgin/gtkimhtmltoolbar.c:419
+#: ../pidgin/gtklog.c:302 ../pidgin/gtkplugin.c:288 ../pidgin/gtkpounce.c:1102
+#: ../pidgin/gtkprivacy.c:566 ../pidgin/gtkprivacy.c:582
+#: ../pidgin/gtkprivacy.c:607 ../pidgin/gtkprivacy.c:621
+#: ../pidgin/gtkrequest.c:270 ../pidgin/gtksavedstatuses.c:337
 msgid "Cancel"
 msgstr "瘨"
 
 #. Save button
 #. Save
-#: ../finch/gntaccount.c:558 ../finch/gntpounce.c:462 ../finch/gntprefs.c:284
-#: ../finch/gntstatus.c:475 ../finch/gntstatus.c:585
-#: ../libpurple/account.c:1251 ../libpurple/plugins/buddynote.c:50
-#: ../libpurple/protocols/jabber/buddy.c:587 ../pidgin/gtkdebug.c:762
+#: ../finch/gntaccount.c:558 ../finch/gntplugin.c:360 ../finch/gntpounce.c:462
+#: ../finch/gntprefs.c:246 ../finch/gntstatus.c:478 ../finch/gntstatus.c:588
+#: ../libpurple/account.c:1268 ../libpurple/plugins/buddynote.c:50
+#: ../libpurple/protocols/jabber/buddy.c:583 ../pidgin/gtkdebug.c:747
 #: ../pidgin/gtkrequest.c:276
 msgid "Save"
 msgstr "脣"
 
-#: ../finch/gntaccount.c:611 ../pidgin/gtkaccount.c:1860
+#: ../finch/gntaccount.c:611 ../pidgin/gtkaccount.c:1886
 #: ../pidgin/gtksavedstatuses.c:328
 #, c-format
 msgid "Are you sure you want to delete %s?"
@@ -232,309 +251,331 @@
 msgstr "芷文董"
 
 #. Delete button
-#: ../finch/gntaccount.c:615 ../finch/gntaccount.c:681
-#: ../finch/gntpounce.c:651 ../finch/gntpounce.c:712 ../finch/gntstatus.c:139
-#: ../finch/gntstatus.c:201 ../pidgin/gtkaccount.c:1865 ../pidgin/gtklog.c:294
-#: ../pidgin/gtkpounce.c:1097 ../pidgin/gtkrequest.c:273
-#: ../pidgin/gtksavedstatuses.c:335
+#: ../finch/gntaccount.c:616 ../finch/gntaccount.c:683
+#: ../finch/gntpounce.c:653 ../finch/gntpounce.c:714 ../finch/gntstatus.c:141
+#: ../finch/gntstatus.c:204 ../pidgin/gtkaccount.c:1893 ../pidgin/gtklog.c:301
+#: ../pidgin/gtkpounce.c:1101 ../pidgin/gtkrequest.c:273
+#: ../pidgin/gtksavedstatuses.c:336
 msgid "Delete"
 msgstr "芷"
 
-#: ../finch/gntaccount.c:644 ../finch/gntblist.c:1955 ../finch/gntui.c:76
-#: ../pidgin/gtkaccount.c:2272 ../pidgin/gtkdocklet.c:530
+#: ../finch/gntaccount.c:646 ../finch/gntblist.c:2060 ../finch/gntui.c:76
+#: ../pidgin/gtkaccount.c:2311 ../pidgin/gtkdocklet.c:522
 msgid "Accounts"
 msgstr "撣唾皜"
 
-#: ../finch/gntaccount.c:650
+#: ../finch/gntaccount.c:652
 msgid "You can enable/disable accounts from the following list."
 msgstr "隞乩銵函撣唾舫冽具具"
 
 #. Add button
-#: ../finch/gntaccount.c:673 ../finch/gntaccount.c:833 ../finch/gntblist.c:316
-#: ../finch/gntblist.c:383 ../finch/gntblist.c:416 ../finch/gntnotify.c:309
-#: ../finch/gntpounce.c:697 ../finch/gntstatus.c:191
-#: ../libpurple/protocols/gg/gg.c:870 ../libpurple/protocols/qq/sys_msg.c:104
-#: ../libpurple/protocols/qq/sys_msg.c:159
-#: ../libpurple/protocols/qq/sys_msg.c:247
-#: ../libpurple/protocols/sametime/sametime.c:5476
-#: ../libpurple/protocols/silc/chat.c:596 ../pidgin/gtkaccount.c:2445
-#: ../pidgin/gtkblist.c:5732 ../pidgin/gtkconv.c:1651
+#: ../finch/gntaccount.c:675 ../finch/gntaccount.c:837 ../finch/gntblist.c:331
+#: ../finch/gntblist.c:401 ../finch/gntblist.c:436 ../finch/gntnotify.c:369
+#: ../finch/gntpounce.c:699 ../finch/gntstatus.c:194
+#: ../libpurple/protocols/gg/gg.c:878 ../libpurple/protocols/qq/sys_msg.c:116
+#: ../libpurple/protocols/qq/sys_msg.c:175
+#: ../libpurple/protocols/qq/sys_msg.c:270
+#: ../libpurple/protocols/sametime/sametime.c:5486
+#: ../libpurple/protocols/silc/chat.c:599 ../pidgin/gtkaccount.c:2484
+#: ../pidgin/gtkblist.c:5828 ../pidgin/gtkconv.c:1651
 #: ../pidgin/gtkrequest.c:274
 msgid "Add"
 msgstr ""
 
 #. Modify button
-#: ../finch/gntaccount.c:677 ../finch/gntpounce.c:704
+#: ../finch/gntaccount.c:679 ../finch/gntpounce.c:706
 msgid "Modify"
 msgstr "靽格"
 
-#: ../finch/gntaccount.c:758 ../pidgin/gtkaccount.c:2392
+#: ../finch/gntaccount.c:760 ../pidgin/gtkaccount.c:2431
 #, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s"
 msgstr "%s%s%s%s 乩 %s 箔嚗憟對憟賢 %s%s"
 
-#: ../finch/gntaccount.c:831 ../pidgin/gtkaccount.c:2444
+#: ../finch/gntaccount.c:833 ../pidgin/gtkaccount.c:2483
 msgid "Add buddy to your list?"
 msgstr "撠雿輻刻交函憟賢皜殷"
 
 #  NOTE: 剔 %s%s%s%s 臬孵董嚗撣唾砍憫亙嚗蝚砌 %s 舀砍憫嚗
 #  NOTE: 撠曄 %s%s 舐征賣: 閮胯嚗箸砌臭誑銝嚗銋銝賣璅嚗
-#: ../finch/gntaccount.c:883 ../pidgin/gtkaccount.c:2496
+#: ../finch/gntaccount.c:887 ../pidgin/gtkaccount.c:2535
 #, c-format
 msgid "%s%s%s%s wants to add %s to his or her buddy list%s%s"
 msgstr "雿輻刻 %s%s%s%s 唾撠 %s 乩嚗憟對憟賢皜%s%s"
 
-#: ../finch/gntaccount.c:903 ../finch/gntaccount.c:908
-#: ../pidgin/gtkaccount.c:2519 ../pidgin/gtkaccount.c:2525
+#: ../finch/gntaccount.c:907 ../finch/gntaccount.c:914
+#: ../pidgin/gtkaccount.c:2558 ../pidgin/gtkaccount.c:2564
 msgid "Authorize buddy?"
 msgstr "蝯虫隤霅嚗"
 
-#: ../finch/gntaccount.c:905 ../finch/gntaccount.c:910
-#: ../pidgin/gtkaccount.c:2520 ../pidgin/gtkaccount.c:2526
+#: ../finch/gntaccount.c:911 ../finch/gntaccount.c:918
+#: ../pidgin/gtkaccount.c:2559 ../pidgin/gtkaccount.c:2565
 msgid "Authorize"
 msgstr "蝯虫隤霅"
 
-#: ../finch/gntaccount.c:906 ../finch/gntaccount.c:911
-#: ../pidgin/gtkaccount.c:2521 ../pidgin/gtkaccount.c:2527
+#: ../finch/gntaccount.c:912 ../finch/gntaccount.c:919
+#: ../pidgin/gtkaccount.c:2560 ../pidgin/gtkaccount.c:2566
 msgid "Deny"
 msgstr "蝯"
 
-#: ../finch/gntblist.c:266
+#: ../finch/gntblist.c:278
 msgid "You must provide a screename for the buddy."
 msgstr "敹箏末摰撣唾"
 
-#: ../finch/gntblist.c:268
+#: ../finch/gntblist.c:280
 msgid "You must provide a group."
 msgstr "敹箏末摰蝢斤"
 
-#: ../finch/gntblist.c:270
+#: ../finch/gntblist.c:282
 msgid "You must select an account."
 msgstr "敹摰撣唾"
 
-#: ../finch/gntblist.c:274
+#: ../finch/gntblist.c:284
+msgid "The selected account is not online."
+msgstr "摰撣唾桀瘝蝺"
+
+#: ../finch/gntblist.c:288
 msgid "Error adding buddy"
 msgstr "啣憟賢銝剔潛鈭航炊"
 
-#: ../finch/gntblist.c:299 ../libpurple/protocols/oscar/oscar.c:2851
-#: ../pidgin/gtkaccount.c:1941 ../pidgin/gtksavedstatuses.c:923
+#: ../finch/gntblist.c:313 ../libpurple/protocols/oscar/oscar.c:2843
+#: ../pidgin/gtkaccount.c:1969 ../pidgin/gtksavedstatuses.c:924
 msgid "Screen Name"
 msgstr "撣唾"
 
-#: ../finch/gntblist.c:302 ../finch/gntblist.c:375
-#: ../libpurple/protocols/msn/msn.c:1340
-#: ../libpurple/protocols/silc/chat.c:587
+#: ../finch/gntblist.c:316 ../finch/gntblist.c:393 ../finch/gntblist.c:1209
+#: ../libpurple/protocols/msn/msn.c:1359
+#: ../libpurple/protocols/silc/chat.c:590
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:680
 #: ../libpurple/protocols/zephyr/zephyr.c:788
-#: ../libpurple/protocols/zephyr/zephyr.c:1206 ../pidgin/gtkdialogs.c:970
-#: ../pidgin/gtkdialogs.c:992 ../pidgin/gtkdialogs.c:1012
+#: ../libpurple/protocols/zephyr/zephyr.c:1207 ../pidgin/gtkdialogs.c:974
+#: ../pidgin/gtkdialogs.c:998 ../pidgin/gtkdialogs.c:1020
 #: ../pidgin/gtkrequest.c:277
 msgid "Alias"
 msgstr "亙"
 
-#: ../finch/gntblist.c:305 ../finch/gntblist.c:378
+#: ../finch/gntblist.c:319 ../finch/gntblist.c:396
 msgid "Group"
 msgstr "蝢斤"
 
-#: ../finch/gntblist.c:309 ../finch/gntblist.c:366 ../finch/gntblist.c:1186
-#: ../finch/gntnotify.c:155 ../finch/gntstatus.c:563
-#: ../libpurple/plugins/idle.c:153 ../libpurple/plugins/idle.c:189
-#: ../pidgin/gtkblist.c:2890 ../pidgin/gtknotify.c:476
-#: ../pidgin/gtkpounce.c:1265 ../pidgin/plugins/gevolution/gevolution.c:444
+#: ../finch/gntblist.c:323 ../finch/gntblist.c:384 ../finch/gntblist.c:1259
+#: ../finch/gntnotify.c:171 ../finch/gntstatus.c:566
+#: ../libpurple/plugins/idle.c:153 ../libpurple/plugins/idle.c:190
+#: ../pidgin/gtkblist.c:2965 ../pidgin/gtknotify.c:476
+#: ../pidgin/gtkpounce.c:1269 ../pidgin/plugins/gevolution/gevolution.c:444
 msgid "Account"
 msgstr "撣唾"
 
-#: ../finch/gntblist.c:315 ../finch/gntblist.c:787
-#: ../libpurple/protocols/silc/buddy.c:736
-#: ../libpurple/protocols/silc/buddy.c:1030
-#: ../libpurple/protocols/silc/buddy.c:1075
-#: ../libpurple/protocols/silc/buddy.c:1174
-#: ../libpurple/protocols/yahoo/yahoo.c:3142 ../pidgin/gtkblist.c:5247
+#: ../finch/gntblist.c:329 ../finch/gntblist.c:817
+#: ../libpurple/protocols/silc/buddy.c:737
+#: ../libpurple/protocols/silc/buddy.c:1033
+#: ../libpurple/protocols/silc/buddy.c:1080
+#: ../libpurple/protocols/silc/buddy.c:1180
+#: ../libpurple/protocols/yahoo/yahoo.c:3144 ../pidgin/gtkblist.c:5343
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:447
 msgid "Add Buddy"
 msgstr "啣憟賢"
 
 # TODO 閬閬 - 20061025
-#: ../finch/gntblist.c:315
+#: ../finch/gntblist.c:329
 msgid "Please enter buddy information."
 msgstr "隢頛詨亙末鞈閮"
 
-#: ../finch/gntblist.c:338 ../libpurple/blist.c:1197
+#: ../finch/gntblist.c:356 ../libpurple/blist.c:1192
 msgid "Chats"
 msgstr "憭"
 
 # NOTE 芾質陌蝔晞嚗箏閫雿鈭箏璅∠蝔晞
 #. Extract their Name and put it in
-#: ../finch/gntblist.c:372 ../libpurple/protocols/jabber/jabber.c:807
-#: ../libpurple/protocols/msn/msn.c:1513 ../libpurple/protocols/msn/msn.c:1578
-#: ../libpurple/protocols/msn/msn.c:1605
-#: ../libpurple/protocols/qq/buddy_info.c:44 ../pidgin/gtkplugin.c:579
+#: ../finch/gntblist.c:390 ../libpurple/protocols/jabber/jabber.c:809
+#: ../libpurple/protocols/msn/msn.c:1532 ../libpurple/protocols/msn/msn.c:1597
+#: ../libpurple/protocols/msn/msn.c:1624
+#: ../libpurple/protocols/qq/buddy_info.c:44 ../pidgin/gtkplugin.c:581
 #: ../pidgin/gtkroomlist.c:621
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:132
 #: ../pidgin/plugins/gevolution/assoc-buddy.c:123
 msgid "Name"
 msgstr "蝔"
 
-#: ../finch/gntblist.c:381 ../finch/gntblist.c:789 ../pidgin/gtkblist.c:5623
+#: ../finch/gntblist.c:399 ../finch/gntblist.c:819 ../pidgin/gtkblist.c:5719
 msgid "Add Chat"
 msgstr "啣憭拙恕"
 
-#: ../finch/gntblist.c:382
+#: ../finch/gntblist.c:400
 msgid "You can edit more information from the context menu later."
 msgstr "憒閬蝜潛靽格孵嗡蝝啁嚗隢典翰憿舫詨柴"
 
-#: ../finch/gntblist.c:393 ../finch/gntblist.c:406
+#: ../finch/gntblist.c:413 ../finch/gntblist.c:426
 msgid "Error adding group"
 msgstr "啣蝢斤銝剔潛鈭航炊"
 
-#: ../finch/gntblist.c:394
+#: ../finch/gntblist.c:414
 msgid "You must give a name for the group to add."
 msgstr "隢蝯行冽啣蝢斤頛詨亙蝔晞"
 
-#: ../finch/gntblist.c:407
+#: ../finch/gntblist.c:427
 msgid "A group with the name already exists."
 msgstr "蝢斤撌脩摮"
 
 # TODO 隢閬交詨祕嚗胯乓啣?
-#: ../finch/gntblist.c:414 ../finch/gntblist.c:791
-#: ../libpurple/protocols/sametime/sametime.c:5387
-#: ../libpurple/protocols/sametime/sametime.c:5474 ../pidgin/gtkblist.c:5729
+#: ../finch/gntblist.c:434 ../finch/gntblist.c:821
+#: ../libpurple/protocols/sametime/sametime.c:5396
+#: ../libpurple/protocols/sametime/sametime.c:5484 ../pidgin/gtkblist.c:5825
 msgid "Add Group"
 msgstr "亦黎蝯"
 
 # TODO 閬閬 - 20061026
-#: ../finch/gntblist.c:414
+#: ../finch/gntblist.c:434
 msgid "Enter the name of the group"
 msgstr "隢蝯衣黎蝯頛詨亙蝔晞"
 
-#: ../finch/gntblist.c:739
+#: ../finch/gntblist.c:767
 msgid "Edit Chat"
 msgstr "靽格寡憭拙恕"
 
-#: ../finch/gntblist.c:739
+#: ../finch/gntblist.c:767
 msgid "Please Update the necessary fields."
 msgstr "隢閬湔唳雿抒鞈閮"
 
 # TODO 閬閬 - 20061025
-#: ../finch/gntblist.c:740 ../finch/gntstatus.c:196
+#: ../finch/gntblist.c:768 ../finch/gntstatus.c:199
 msgid "Edit"
 msgstr "靽格"
 
-#: ../finch/gntblist.c:754
+#: ../finch/gntblist.c:784
 msgid "Auto-join"
 msgstr "芸"
 
 # XXX 胯靽格寥賊嚗
-#: ../finch/gntblist.c:763
+#: ../finch/gntblist.c:793
 msgid "Edit Settings"
 msgstr "靽格寡身摰"
 
-#: ../finch/gntblist.c:827 ../libpurple/protocols/silc/chat.c:878
+# XXX 20070518
+#: ../finch/gntblist.c:831 ../finch/gntconv.c:317 ../pidgin/gtkblist.c:278
+#: ../pidgin/gtkconv.c:677
+msgid "Information"
+msgstr "鞈閮"
+
+#: ../finch/gntblist.c:831 ../finch/gntconv.c:317 ../pidgin/gtkblist.c:278
+#: ../pidgin/gtkconv.c:677
+msgid "Retrieving..."
+msgstr "霈銝..."
+
+#: ../finch/gntblist.c:864 ../finch/gntconv.c:418
+#: ../libpurple/protocols/silc/chat.c:883
 msgid "Get Info"
 msgstr "敺鞈閮"
 
-#: ../finch/gntblist.c:831
+#: ../finch/gntblist.c:868
 msgid "Add Buddy Pounce"
 msgstr "亙末"
 
-#: ../finch/gntblist.c:838 ../libpurple/protocols/oscar/oscar.c:635
+#. if (q_bud && is_online(q_bud->status)) {
+#: ../finch/gntblist.c:875 ../finch/gntconv.c:430
+#: ../libpurple/protocols/oscar/oscar.c:636 ../libpurple/protocols/qq/qq.c:585
 #: ../pidgin/gtkconv.c:1599
 msgid "Send File"
 msgstr "喲瑼獢"
 
-#: ../finch/gntblist.c:842
+#: ../finch/gntblist.c:879
 msgid "View Log"
 msgstr "閫亥"
 
-#: ../finch/gntblist.c:922
+#: ../finch/gntblist.c:960
 #, c-format
 msgid "Please enter the new name for %s"
 msgstr "隢頛詨 %s 啣蝣"
 
-#: ../finch/gntblist.c:924 ../finch/gntblist.c:925 ../finch/gntblist.c:1136
+#: ../finch/gntblist.c:962 ../finch/gntblist.c:1209
 msgid "Rename"
 msgstr "賢"
 
+#: ../finch/gntblist.c:962
+msgid "Set Alias"
+msgstr "閮剖亙"
+
 # FIXME 霅舀敺寥 - 20061029
-#: ../finch/gntblist.c:924
+#: ../finch/gntblist.c:963
 msgid "Enter empty string to reset the name."
 msgstr "憒閬蝵桀蝔梧隢頛詨亦征賢銝脯"
 
-#: ../finch/gntblist.c:997
+#: ../finch/gntblist.c:1039
 msgid "Removing this contact will also remove all the buddies in the contact"
 msgstr "蝘駁日蝯憟賢蝘駁方Y憟賢"
 
-#: ../finch/gntblist.c:1005
+#: ../finch/gntblist.c:1047
 msgid "Removing this group will also remove all the buddies in the group"
 msgstr "蝘駁日蝢斤蝘駁方Y憟賢"
 
-#: ../finch/gntblist.c:1010
+#: ../finch/gntblist.c:1052
 #, c-format
 msgid "Are you sure you want to remove %s?"
 msgstr "函Ⅱ摰閬芷 %s嚗"
 
 #. XXX: anything to do with the returned ui-handle?
-#: ../finch/gntblist.c:1013
+#: ../finch/gntblist.c:1055
 msgid "Confirm Remove"
 msgstr "蝣箄蝘駁"
 
-#: ../finch/gntblist.c:1016 ../finch/gntblist.c:1138 ../finch/gntft.c:223
-#: ../pidgin/gtkblist.c:1100 ../pidgin/gtkconv.c:1648
-#: ../pidgin/gtkrequest.c:275 ../pidgin/gtkstatusbox.c:249
+#: ../finch/gntblist.c:1060 ../finch/gntblist.c:1211 ../finch/gntft.c:223
+#: ../pidgin/gtkblist.c:1135 ../pidgin/gtkconv.c:1648
+#: ../pidgin/gtkrequest.c:275 ../pidgin/gtkstatusbox.c:261
 msgid "Remove"
 msgstr "蝘駁"
 
 #. Buddy List
-#: ../finch/gntblist.c:1113 ../finch/gntblist.c:2118 ../finch/gntprefs.c:278
-#: ../finch/gntui.c:77 ../pidgin/gtkblist.c:4133
+#: ../finch/gntblist.c:1185 ../finch/gntblist.c:2232 ../finch/gntprefs.c:240
+#: ../finch/gntui.c:77 ../pidgin/gtkblist.c:4209
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:330
 msgid "Buddy List"
 msgstr "憟賢皜"
 
 # XXX - 20061122
 # NOTE (013537蝘) wabz: Anyway, I think the concept is more important than the literal translation - you use "Toggle Tag" on the currently selected buddy, then select a group/contact and hit "Place Tagged", and the buddy is moved
-#: ../finch/gntblist.c:1143
+#: ../finch/gntblist.c:1216
 msgid "Place tagged"
 msgstr "蝘餃撌脫閮"
 
 # FIXME - 20061122
-#: ../finch/gntblist.c:1148
+#: ../finch/gntblist.c:1221
 msgid "Toggle Tag"
 msgstr "璅閮"
 
 #. General
-#: ../finch/gntblist.c:1181 ../libpurple/protocols/gg/gg.c:627
-#: ../libpurple/protocols/gg/gg.c:1035 ../libpurple/protocols/gg/gg.c:1110
-#: ../libpurple/protocols/gg/gg.c:2182
+#: ../finch/gntblist.c:1254 ../libpurple/protocols/gg/gg.c:632
+#: ../libpurple/protocols/gg/gg.c:1045 ../libpurple/protocols/gg/gg.c:1120
+#: ../libpurple/protocols/gg/gg.c:2204
 #: ../libpurple/protocols/jabber/buddy.c:274
-#: ../libpurple/protocols/jabber/buddy.c:821
-#: ../libpurple/protocols/jabber/buddy.c:1569
-#: ../libpurple/protocols/jabber/buddy.c:1751
-#: ../libpurple/protocols/jabber/jabber.c:817
-#: ../libpurple/protocols/msn/msn.c:1348 ../libpurple/protocols/msn/msn.c:1516
+#: ../libpurple/protocols/jabber/buddy.c:818
+#: ../libpurple/protocols/jabber/buddy.c:1589
+#: ../libpurple/protocols/jabber/buddy.c:1771
+#: ../libpurple/protocols/jabber/jabber.c:819
+#: ../libpurple/protocols/msn/msn.c:1367 ../libpurple/protocols/msn/msn.c:1535
 #: ../libpurple/protocols/qq/buddy_info.c:43
-#: ../libpurple/protocols/silc/buddy.c:1528
+#: ../libpurple/protocols/silc/buddy.c:1535
 #: ../libpurple/protocols/silc/ops.c:1036
 #: ../libpurple/protocols/silc/ops.c:1179
 #: ../libpurple/protocols/silc/ops.c:1328
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1042 ../pidgin/gtkblist.c:2914
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1042 ../pidgin/gtkblist.c:2989
 msgid "Nickname"
 msgstr "梁迂"
 
 #. Idle stuff
-#: ../finch/gntblist.c:1201 ../finch/gntprefs.c:281
+#: ../finch/gntblist.c:1274 ../finch/gntprefs.c:243
 #: ../libpurple/protocols/bonjour/bonjour.c:322
-#: ../libpurple/protocols/jabber/buddy.c:646
-#: ../libpurple/protocols/jabber/buddy.c:686
-#: ../libpurple/protocols/msn/msn.c:513 ../libpurple/protocols/msn/state.c:32
-#: ../libpurple/protocols/novell/novell.c:2826
-#: ../libpurple/protocols/oscar/oscar.c:2875
-#: ../libpurple/protocols/yahoo/yahoo.c:2896
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:686 ../pidgin/gtkblist.c:2934
-#: ../pidgin/gtkblist.c:3323 ../pidgin/gtkprefs.c:1807
+#: ../libpurple/protocols/jabber/buddy.c:643
+#: ../libpurple/protocols/jabber/buddy.c:683
+#: ../libpurple/protocols/msn/msn.c:516 ../libpurple/protocols/msn/state.c:32
+#: ../libpurple/protocols/novell/novell.c:2825
+#: ../libpurple/protocols/oscar/oscar.c:2867
+#: ../libpurple/protocols/yahoo/yahoo.c:2898
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:686 ../pidgin/gtkblist.c:3009
+#: ../pidgin/gtkblist.c:3399 ../pidgin/gtkprefs.c:1809
 msgid "Idle"
 msgstr "蝵"
 
-#: ../finch/gntblist.c:1290
+#: ../finch/gntblist.c:1363
 #, c-format
 msgid ""
 "Online: %d\n"
@@ -543,12 +584,12 @@
 "銝蝺嚗%d 鈭暝n"
 "蝮賣賂%d 鈭"
 
-#: ../finch/gntblist.c:1299
+#: ../finch/gntblist.c:1372
 #, c-format
 msgid "Account: %s (%s)"
 msgstr "撣唾嚗%s (%s)"
 
-#: ../finch/gntblist.c:1311
+#: ../finch/gntblist.c:1384
 #, c-format
 msgid ""
 "\n"
@@ -558,91 +599,90 @@
 "<b>敺閬堆</b>%s"
 
 # XXX check
-#: ../finch/gntblist.c:1560 ../pidgin/gtkdocklet.c:478
-#: ../pidgin/gtkstatusbox.c:1102
+#: ../finch/gntblist.c:1649 ../pidgin/gtkdocklet.c:470
+#: ../pidgin/gtkstatusbox.c:1064
 msgid "New..."
 msgstr "啣..."
 
 # NOTE 臬撌桃嚗撌脣脣(Saved) :P
 # NOTE 銝銝銝鈭撣貊(?)啣嚗啣銝嚗嚗敶箇閬蝒銋啣嚗航賣閰脣怒銝閬賬皜柴銝憿色
-#: ../finch/gntblist.c:1567 ../pidgin/gtkdocklet.c:479
-#: ../pidgin/gtkstatusbox.c:1103
+#: ../finch/gntblist.c:1656 ../pidgin/gtkdocklet.c:471
+#: ../pidgin/gtkstatusbox.c:1065
 msgid "Saved..."
 msgstr "皜..."
 
-#: ../finch/gntblist.c:1923 ../finch/gntplugin.c:216 ../finch/gntui.c:81
-#: ../pidgin/gtkdocklet.c:531 ../pidgin/gtkplugin.c:528
+#: ../finch/gntblist.c:2028 ../finch/gntplugin.c:244 ../finch/gntui.c:81
+#: ../pidgin/gtkdocklet.c:523 ../pidgin/gtkplugin.c:530
 msgid "Plugins"
 msgstr "璅∠皜"
 
 # NOTE 芾質陌蝔晞嚗箏閫雿鈭箏璅∠蝔晞
-#: ../finch/gntblist.c:2030 ../pidgin/gtkdialogs.c:705
-#: ../pidgin/gtkdialogs.c:842 ../pidgin/gtkdialogs.c:922
+#: ../finch/gntblist.c:2136 ../pidgin/gtkdialogs.c:706
+#: ../pidgin/gtkdialogs.c:844 ../pidgin/gtkdialogs.c:925
 msgid "_Name"
 msgstr "蝔(_N)"
 
-#: ../finch/gntblist.c:2035 ../pidgin/gtkdialogs.c:710
-#: ../pidgin/gtkdialogs.c:847 ../pidgin/gtkdialogs.c:927
+#: ../finch/gntblist.c:2141 ../pidgin/gtkdialogs.c:711
+#: ../pidgin/gtkdialogs.c:849 ../pidgin/gtkdialogs.c:930
 msgid "_Account"
 msgstr "撣唾(_A)"
 
-#: ../finch/gntblist.c:2043 ../pidgin/gtkdialogs.c:718
+#: ../finch/gntblist.c:2149 ../pidgin/gtkdialogs.c:719
 msgid "New Instant Message"
 msgstr "啣單閮"
 
-#: ../finch/gntblist.c:2045 ../pidgin/gtkdialogs.c:720
+#: ../finch/gntblist.c:2151 ../pidgin/gtkdialogs.c:721
 msgid ""
 "Please enter the screen name or alias of the person you would like to IM."
 msgstr "隢頛詨交冽唾潮單閮臬鞊∠撣唾"
 
-#: ../finch/gntblist.c:2048 ../finch/gntconn.c:47 ../finch/gntnotify.c:79
-#: ../libpurple/account.c:968 ../libpurple/account.c:1217
-#: ../libpurple/protocols/gg/gg.c:497 ../libpurple/protocols/gg/gg.c:655
-#: ../libpurple/protocols/gg/gg.c:791
-#: ../libpurple/protocols/jabber/jabber.c:1370
-#: ../libpurple/protocols/jabber/xdata.c:337
-#: ../libpurple/protocols/msn/msn.c:249 ../libpurple/protocols/msn/msn.c:264
-#: ../libpurple/protocols/msn/msn.c:279 ../libpurple/protocols/msn/msn.c:294
-#: ../libpurple/protocols/oscar/oscar.c:6038
-#: ../libpurple/protocols/silc/buddy.c:466
-#: ../libpurple/protocols/silc/buddy.c:1182
-#: ../libpurple/protocols/silc/chat.c:424
-#: ../libpurple/protocols/silc/chat.c:462
-#: ../libpurple/protocols/silc/chat.c:725
+#: ../finch/gntblist.c:2154 ../finch/gntconn.c:48 ../finch/gntnotify.c:77
+#: ../libpurple/account.c:983 ../libpurple/account.c:1233
+#: ../libpurple/protocols/gg/gg.c:501 ../libpurple/protocols/gg/gg.c:660
+#: ../libpurple/protocols/gg/gg.c:797
+#: ../libpurple/protocols/jabber/jabber.c:1383
+#: ../libpurple/protocols/jabber/xdata.c:336
+#: ../libpurple/protocols/msn/msn.c:258 ../libpurple/protocols/msn/msn.c:275
+#: ../libpurple/protocols/msn/msn.c:292 ../libpurple/protocols/msn/msn.c:309
+#: ../libpurple/protocols/oscar/oscar.c:6003
+#: ../libpurple/protocols/silc/buddy.c:467
+#: ../libpurple/protocols/silc/buddy.c:1188
+#: ../libpurple/protocols/silc/chat.c:425
+#: ../libpurple/protocols/silc/chat.c:464
+#: ../libpurple/protocols/silc/chat.c:729
 #: ../libpurple/protocols/silc/ops.c:1297
-#: ../libpurple/protocols/silc/ops.c:1911
+#: ../libpurple/protocols/silc/ops.c:1912
 #: ../libpurple/protocols/silc/silc.c:743
-#: ../libpurple/protocols/yahoo/yahoo.c:987
-#: ../libpurple/protocols/yahoo/yahoo.c:3227
-#: ../libpurple/protocols/yahoo/yahoo.c:3236 ../pidgin/gtkblist.c:3890
-#: ../pidgin/gtkdialogs.c:723 ../pidgin/gtkdialogs.c:860
-#: ../pidgin/gtkdialogs.c:951 ../pidgin/gtkrequest.c:269
+#: ../libpurple/protocols/yahoo/yahoo.c:986
+#: ../libpurple/protocols/yahoo/yahoo.c:3230
+#: ../libpurple/protocols/yahoo/yahoo.c:3241 ../pidgin/gtkblist.c:3964
+#: ../pidgin/gtkdialogs.c:724 ../pidgin/gtkdialogs.c:862
+#: ../pidgin/gtkdialogs.c:954 ../pidgin/gtkrequest.c:269
 msgid "OK"
 msgstr "蝣箏"
 
 #. Create the "Options" frame.
-#: ../finch/gntblist.c:2067 ../finch/gntpounce.c:444 ../pidgin/gtkpounce.c:776
+#: ../finch/gntblist.c:2174 ../finch/gntpounce.c:444 ../pidgin/gtkpounce.c:778
 msgid "Options"
 msgstr "賊"
 
-#: ../finch/gntblist.c:2073
+#: ../finch/gntblist.c:2180
 msgid "Send IM..."
 msgstr "箏單閮..."
 
-# FIXME 霅舀敺寥 - 20061028
-#: ../finch/gntblist.c:2077
-msgid "Toggle offline buddies"
-msgstr "憿舐內嚗銝憿舐內Y憟賢"
-
-#: ../finch/gntblist.c:2083
+#: ../finch/gntblist.c:2184
+msgid "Show offline buddies"
+msgstr "憿舐內Y憟賢"
+
+#: ../finch/gntblist.c:2190
 msgid "Sort by status"
 msgstr "靘抒"
 
-#: ../finch/gntblist.c:2087
+#: ../finch/gntblist.c:2194
 msgid "Sort alphabetically"
 msgstr "靘批瘥"
 
-#: ../finch/gntblist.c:2091
+#: ../finch/gntblist.c:2198
 msgid "Sort by log size"
 msgstr "靘扳亥憭批"
 
@@ -665,57 +705,57 @@
 "%s 銝航炊蝯鈭蝺嚗\n"
 "%s"
 
-#: ../finch/gntconn.c:45 ../libpurple/account.c:996
-#: ../libpurple/connection.c:107 ../pidgin/gtkblist.c:3888
+#: ../finch/gntconn.c:45 ../libpurple/account.c:1012
+#: ../libpurple/connection.c:107 ../pidgin/gtkblist.c:3961
 msgid "Connection Error"
 msgstr "蝺航炊"
 
-#: ../finch/gntconn.c:48 ../libpurple/protocols/sametime/sametime.c:3643
-#: ../pidgin/gtkblist.c:3892
+#: ../finch/gntconn.c:49 ../libpurple/protocols/sametime/sametime.c:3644
+#: ../pidgin/gtkblist.c:3966
 msgid "Connect"
 msgstr "蝺"
 
-#: ../finch/gntconv.c:103
+#: ../finch/gntconv.c:116
 msgid "No such command."
 msgstr "⊥迨隞扎"
 
-#: ../finch/gntconv.c:107 ../pidgin/gtkconv.c:507
+#: ../finch/gntconv.c:120 ../pidgin/gtkconv.c:508
 msgid "Syntax Error:  You typed the wrong number of arguments to that command."
 msgstr "隤瘜航炊嚗頛詨亦詨潭隞斗豢賊"
 
-#: ../finch/gntconv.c:112 ../pidgin/gtkconv.c:512
+#: ../finch/gntconv.c:125 ../pidgin/gtkconv.c:513
 msgid "Your command failed for an unknown reason."
 msgstr "隞文瑁憭望嚗銝"
 
-#: ../finch/gntconv.c:117 ../pidgin/gtkconv.c:518
+#: ../finch/gntconv.c:130 ../pidgin/gtkconv.c:519
 msgid "That command only works in chats, not IMs."
 msgstr "隞文芸刻憭拙恕扳嚗典單閮臭葉⊥"
 
-#: ../finch/gntconv.c:120 ../pidgin/gtkconv.c:521
+#: ../finch/gntconv.c:133 ../pidgin/gtkconv.c:522
 msgid "That command only works in IMs, not chats."
 msgstr "隞文芸典單閮臭葉嚗刻憭拙恕抒⊥"
 
-#: ../finch/gntconv.c:124 ../pidgin/gtkconv.c:525
+#: ../finch/gntconv.c:137 ../pidgin/gtkconv.c:526
 msgid "That command doesn't work on this protocol."
 msgstr "隞文券閮摰抒⊥"
 
 # NOTE 瘝颲行嚗其啁嚗瘝瘜寞摮色
-#: ../finch/gntconv.c:131
+#: ../finch/gntconv.c:144
 msgid "Commands are not supported yet. Message was NOT sent."
 msgstr "撠芣舀湔隞歹閮臬甇斗鋡恍箝"
 
 # XXX 臭暻潘
-#: ../finch/gntconv.c:234
+#: ../finch/gntconv.c:230
 #, c-format
 msgid "%s (%s -- %s)"
 msgstr "%s (%s -- %s)"
 
-#: ../finch/gntconv.c:257
+#: ../finch/gntconv.c:253
 #, c-format
 msgid "%s [%s]"
 msgstr "%s [%s]"
 
-#: ../finch/gntconv.c:262 ../finch/gntconv.c:436
+#: ../finch/gntconv.c:258 ../finch/gntconv.c:619
 #, c-format
 msgid ""
 "\n"
@@ -724,24 +764,48 @@
 "\n"
 "%s 甇刻撓..."
 
+#: ../finch/gntconv.c:277
+msgid "You have left this chat."
+msgstr "券a鈭憭拙恕"
+
+#: ../finch/gntconv.c:353
+msgid "Send To"
+msgstr "喲"
+
+#: ../finch/gntconv.c:397
+msgid "Conversation"
+msgstr "鈭方"
+
 #: ../finch/gntconv.c:403
+msgid "Clear Scrollback"
+msgstr "皜蝛箔漱隢批捆"
+
+#: ../finch/gntconv.c:407 ../finch/gntprefs.c:178
+msgid "Show Timestamps"
+msgstr "憿舐內唾"
+
+#: ../finch/gntconv.c:423
+msgid "Add Buddy Pounce..."
+msgstr "亙末..."
+
+#: ../finch/gntconv.c:586
 msgid "<AUTO-REPLY> "
 msgstr "<芸> "
 
 #. Print the list of users in the room
-#: ../finch/gntconv.c:505
+#: ../finch/gntconv.c:702
 msgid "List of users:\n"
 msgstr "雿輻刻銵剁\n"
 
-#: ../finch/gntconv.c:629 ../pidgin/gtkconv.c:388
+#: ../finch/gntconv.c:847 ../pidgin/gtkconv.c:389
 msgid "Supported debug options are:  version"
 msgstr "舀渡日舫賊嚗version"
 
-#: ../finch/gntconv.c:664 ../pidgin/gtkconv.c:424
+#: ../finch/gntconv.c:882 ../pidgin/gtkconv.c:425
 msgid "No such command (in this context)."
 msgstr "瘝隞歹臬券鋆雿輻剁"
 
-#: ../finch/gntconv.c:667 ../pidgin/gtkconv.c:427
+#: ../finch/gntconv.c:885 ../pidgin/gtkconv.c:428
 msgid ""
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
 "The following commands are available in this context:\n"
@@ -749,57 +813,60 @@
 "閬脣銝隞斤隤芣嚗頛詨乓/help &lt;隞&gt;喳胯\n"
 "券鋆嚗舐函隞斗嚗\n"
 
-#: ../finch/gntconv.c:706 ../pidgin/gtkconv.c:6949
+#: ../finch/gntconv.c:943 ../pidgin/gtkconv.c:7085
 msgid ""
 "say &lt;message&gt;:  Send a message normally as if you weren't using a "
 "command."
 msgstr "say &lt;閮&gt;嚗撠摰閮舐嗆銝祈舀迤撣賊綽嗥箸隞方"
 
-#: ../finch/gntconv.c:709 ../pidgin/gtkconv.c:6952
+#: ../finch/gntconv.c:946 ../pidgin/gtkconv.c:7088
 msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
 msgstr "me &lt;閬瑁雿&gt;嚗璅∩遛IRC嚗瑁銝雿"
 
-#: ../finch/gntconv.c:712 ../pidgin/gtkconv.c:6955
+#: ../finch/gntconv.c:949 ../pidgin/gtkconv.c:7091
 msgid ""
 "debug &lt;option&gt;:  Send various debug information to the current "
 "conversation."
 msgstr "debug &lt;賊&gt;嚗桀鈭方箔鈭日航閮"
 
 # XXX
-#: ../finch/gntconv.c:715 ../pidgin/gtkconv.c:6958
+#: ../finch/gntconv.c:952 ../pidgin/gtkconv.c:7094
 msgid "clear: Clears the conversation scrollback."
 msgstr "clear嚗皜蝛箔漱隢脩楨銵"
 
-#: ../finch/gntconv.c:718 ../pidgin/gtkconv.c:6961
+#: ../finch/gntconv.c:955 ../pidgin/gtkconv.c:7097
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr "help &lt;隞&gt;嚗憿舐內銝隞斤隤芣"
 
-#: ../finch/gntconv.c:723
+#: ../finch/gntconv.c:958
+msgid "users:  Show the list of users in the chat."
+msgstr "users嚗憿舐內憭拙恕抒雿輻刻"
+
+#: ../finch/gntconv.c:963
 msgid "plugins: Show the plugins window."
 msgstr "plugins嚗憿舐內璅∠閬蝒"
 
-#: ../finch/gntconv.c:726
+#: ../finch/gntconv.c:966
 msgid "buddylist: Show the buddylist."
 msgstr "buddylist嚗憿舐內憟賢皜柴"
 
-#: ../finch/gntconv.c:729
+#: ../finch/gntconv.c:969
 msgid "accounts: Show the accounts window."
 msgstr "accounts嚗憿舐內撣唾皜柴"
 
-#: ../finch/gntconv.c:732
+#: ../finch/gntconv.c:972
 msgid "debugwin: Show the debug window."
 msgstr "debugwin嚗憿舐內日航蝒"
 
-#: ../finch/gntconv.c:735
+#: ../finch/gntconv.c:975
 msgid "prefs: Show the preference window."
 msgstr "prefs嚗憿舐內憟質身摰閬蝒"
 
-# FIXME - 20061028
-#: ../finch/gntconv.c:738
+#: ../finch/gntconv.c:978
 msgid "statuses: Show the savedstatuses window."
-msgstr "statuses嚗撌脣脣閬蝒"
-
-#: ../finch/gntdebug.c:225 ../finch/gntui.c:79 ../pidgin/gtkdebug.c:708
+msgstr "statuses嚗皜柴閬蝒"
+
+#: ../finch/gntdebug.c:230 ../finch/gntui.c:79 ../pidgin/gtkdebug.c:693
 msgid "Debug Window"
 msgstr "日航蝒"
 
@@ -807,18 +874,18 @@
 #. * it's necessary to make the width of the debug window resizable ... like I said,
 #. * it doesn't make sense. The bug is likely in the packing in gntbox.c.
 #.
-#: ../finch/gntdebug.c:246 ../pidgin/gtkdebug.c:767
+#: ../finch/gntdebug.c:251 ../pidgin/gtkdebug.c:752
 msgid "Clear"
 msgstr "皜"
 
-#: ../finch/gntdebug.c:251 ../pidgin/gtkdebug.c:776
+#: ../finch/gntdebug.c:257
+msgid "Filter: "
+msgstr "瞈曉剁"
+
+#: ../finch/gntdebug.c:261 ../pidgin/gtkdebug.c:761
 msgid "Pause"
 msgstr "怠"
 
-#: ../finch/gntdebug.c:256 ../pidgin/gtkdebug.c:783 ../pidgin/gtkdebug.c:784
-msgid "Timestamps"
-msgstr "唾"
-
 #: ../finch/gntft.c:117 ../pidgin/gtkft.c:228
 #, c-format
 msgid "File Transfers - %d%% of %d files"
@@ -850,26 +917,26 @@
 msgstr "拚"
 
 #. XXX: Use of ggp_str_to_uin() is an ugly hack!
-#: ../finch/gntft.c:197 ../finch/gntstatus.c:534 ../finch/gntstatus.c:563
+#: ../finch/gntft.c:197 ../finch/gntstatus.c:537 ../finch/gntstatus.c:566
 #: ../libpurple/protocols/bonjour/bonjour.c:326
-#: ../libpurple/protocols/gg/gg.c:1024 ../libpurple/protocols/gg/gg.c:1563
-#: ../libpurple/protocols/gg/gg.c:1571
-#: ../libpurple/protocols/jabber/buddy.c:637
-#: ../libpurple/protocols/jabber/buddy.c:641
-#: ../libpurple/protocols/jabber/buddy.c:676
-#: ../libpurple/protocols/jabber/jabber.c:1201
-#: ../libpurple/protocols/msn/msn.c:512
-#: ../libpurple/protocols/novell/novell.c:2836
-#: ../libpurple/protocols/oscar/oscar.c:802
-#: ../libpurple/protocols/oscar/oscar.c:807
-#: ../libpurple/protocols/oscar/oscar.c:809
-#: ../libpurple/protocols/oscar/oscar.c:2664
-#: ../libpurple/protocols/oscar/oscar.c:3782
-#: ../libpurple/protocols/sametime/sametime.c:3264
-#: ../libpurple/protocols/sametime/sametime.c:4149
-#: ../libpurple/protocols/yahoo/yahoo.c:3047 ../pidgin/gtkblist.c:2978
-#: ../pidgin/gtkblist.c:2991 ../pidgin/gtkblist.c:2993
-#: ../pidgin/gtksavedstatuses.c:942 ../pidgin/gtksavedstatuses.c:1089
+#: ../libpurple/protocols/gg/gg.c:1034 ../libpurple/protocols/gg/gg.c:1573
+#: ../libpurple/protocols/gg/gg.c:1581
+#: ../libpurple/protocols/jabber/buddy.c:634
+#: ../libpurple/protocols/jabber/buddy.c:638
+#: ../libpurple/protocols/jabber/buddy.c:673
+#: ../libpurple/protocols/jabber/jabber.c:1214
+#: ../libpurple/protocols/msn/msn.c:515
+#: ../libpurple/protocols/novell/novell.c:2835
+#: ../libpurple/protocols/oscar/oscar.c:803
+#: ../libpurple/protocols/oscar/oscar.c:808
+#: ../libpurple/protocols/oscar/oscar.c:810
+#: ../libpurple/protocols/oscar/oscar.c:2656
+#: ../libpurple/protocols/oscar/oscar.c:3767
+#: ../libpurple/protocols/sametime/sametime.c:3263
+#: ../libpurple/protocols/sametime/sametime.c:4150
+#: ../libpurple/protocols/yahoo/yahoo.c:3049 ../pidgin/gtkblist.c:3053
+#: ../pidgin/gtkblist.c:3066 ../pidgin/gtkblist.c:3068
+#: ../pidgin/gtksavedstatuses.c:943 ../pidgin/gtksavedstatuses.c:1090
 msgid "Status"
 msgstr ""
 
@@ -886,10 +953,10 @@
 msgstr "銝剜迫"
 
 #. Close button
-#: ../finch/gntft.c:233 ../finch/gntnotify.c:163 ../finch/gntplugin.c:178
-#: ../finch/gntplugin.c:259 ../finch/gntpounce.c:720 ../finch/gntstatus.c:206
-#: ../libpurple/protocols/msn/msn.c:356 ../libpurple/protocols/silc/util.c:377
-#: ../pidgin/gtkaccount.c:2419 ../pidgin/gtkrequest.c:272
+#: ../finch/gntft.c:233 ../finch/gntnotify.c:179 ../finch/gntplugin.c:205
+#: ../finch/gntplugin.c:291 ../finch/gntpounce.c:722 ../finch/gntstatus.c:209
+#: ../libpurple/protocols/msn/msn.c:375 ../libpurple/protocols/silc/util.c:377
+#: ../pidgin/gtkaccount.c:2458 ../pidgin/gtkrequest.c:272
 msgid "Close"
 msgstr ""
 
@@ -920,75 +987,88 @@
 msgid "Transferring"
 msgstr "唾撓銝"
 
-#: ../finch/gntnotify.c:146
+#: ../finch/gntnotify.c:162
 msgid "Emails"
 msgstr "餃萎辣"
 
 # XXX 閬閬
-#: ../finch/gntnotify.c:152 ../finch/gntnotify.c:206
+#: ../finch/gntnotify.c:168 ../finch/gntnotify.c:222
 msgid "You have mail!"
 msgstr "冽嗅圈萎辣嚗"
 
-# FIXME check - 20061025
-#  NOTE Jabber 銵隤嚗閬銝
-#: ../finch/gntnotify.c:155 ../libpurple/protocols/jabber/jabber.c:1161
+# FIXME 銝閰拍儔嚗寞祉⊥蝧餉陌
+#  NOTE gntnotify 摮蝢拍箝潔縑鈭箝
+#  NOTE Jabber 銵隤摮蝢抵Both璇
+#: ../finch/gntnotify.c:171 ../libpurple/protocols/jabber/jabber.c:1174
 msgid "From"
 msgstr "撌脰霅撠"
 
-#: ../finch/gntnotify.c:155 ../pidgin/gtknotify.c:490
+#: ../finch/gntnotify.c:171 ../pidgin/gtknotify.c:490
 msgid "Subject"
 msgstr "銝駁"
 
-#: ../finch/gntnotify.c:182
+#: ../finch/gntnotify.c:198
 #, c-format
 msgid "%s (%s) has %d new message."
 msgid_plural "%s (%s) has %d new messages."
 msgstr[0] "%s (%s)  %d 撠圈萎辣"
 msgstr[1] "%s (%s)  %d 撠圈萎辣"
 
-#: ../finch/gntnotify.c:206 ../pidgin/gtknotify.c:329
+#: ../finch/gntnotify.c:222 ../pidgin/gtknotify.c:329
 msgid "New Mail"
 msgstr "圈萎辣"
 
-#: ../finch/gntnotify.c:230 ../pidgin/gtknotify.c:866
+#: ../finch/gntnotify.c:287 ../pidgin/gtknotify.c:906
 #, c-format
 msgid "Info for %s"
 msgstr "%s 鞈閮"
 
-#: ../finch/gntnotify.c:232 ../libpurple/protocols/toc/toc.c:476
-#: ../pidgin/gtknotify.c:868
+#: ../finch/gntnotify.c:288 ../libpurple/protocols/toc/toc.c:476
+#: ../pidgin/gtknotify.c:907
 msgid "Buddy Information"
 msgstr "憟賢鞈閮"
 
-#: ../finch/gntnotify.c:306
+#: ../finch/gntnotify.c:366
 msgid "Continue"
 msgstr "蝜潛"
 
 # XXXInfo雿其撮銋靽敺雿輻刻鞈閮嚗雿銝臬嚗鈭嗡po瑼隞臭臬臭暻
 # XXX javajsp (Ka-Hing CHEUNG) 閬Info蝝券賣胯敺雿輻刻鞈閮
 # XXX 瘜剁曉 (2.0.0b4) 銝臭嚗日航蝒瞈曄摨艾蝡Info嚗鞈閮嚗蝝乒色
-#: ../finch/gntnotify.c:312 ../pidgin/gtkconv.c:1627 ../pidgin/gtkdebug.c:862
+#: ../finch/gntnotify.c:372 ../pidgin/gtkconv.c:1627 ../pidgin/gtkdebug.c:833
 msgid "Info"
 msgstr "鞈閮"
 
-#: ../finch/gntnotify.c:315 ../pidgin/gtkconv.c:1588
+#: ../finch/gntnotify.c:375 ../pidgin/gtkconv.c:1588
 msgid "IM"
 msgstr "單閮"
 
-#: ../finch/gntnotify.c:318
+#: ../finch/gntnotify.c:378
 msgid "Join"
 msgstr ""
 
-#: ../finch/gntnotify.c:321 ../libpurple/protocols/sametime/sametime.c:3473
+#: ../finch/gntnotify.c:381 ../libpurple/protocols/sametime/sametime.c:3473
 msgid "Invite"
 msgstr "隢"
 
 # TODO 閬閬 - 20061028
-#: ../finch/gntnotify.c:324
+#: ../finch/gntnotify.c:384
 msgid "(none)"
 msgstr "(瘝摮)"
 
-#: ../finch/gntplugin.c:102
+#: ../finch/gntplugin.c:73 ../finch/gntplugin.c:82
+msgid "ERROR"
+msgstr "航炊"
+
+#: ../finch/gntplugin.c:73
+msgid "loading plugin failed"
+msgstr "璅∠頛亙仃"
+
+#: ../finch/gntplugin.c:82
+msgid "unloading plugin failed"
+msgstr "璅∠貉憭望"
+
+#: ../finch/gntplugin.c:124
 #, c-format
 msgid ""
 "Name: %s\n"
@@ -999,46 +1079,42 @@
 "Filename: %s\n"
 msgstr ""
 "蝔梧%s\n"
-"踵穿%s\n"
+"穿%s\n"
 "蝪∩嚗%s\n"
 "雿嚗%s\n"
 "蝬脩嚗%s\n"
 "瑼嚗%s\n"
 
-#: ../finch/gntplugin.c:155
+#: ../finch/gntplugin.c:182
 msgid "Plugin need to be loaded before you can configure it."
 msgstr "閮剖璅∠嚗隢頛交芋蝯"
 
-#: ../finch/gntplugin.c:193
-msgid "..."
-msgstr "..."
-
-#  XXX 舀璅∠X閮剖隞颱賊嚗銋瘝芸楛舀賊
-#: ../finch/gntplugin.c:194
-msgid "Still need to do something about this."
-msgstr "甇斗芋蝯撠芸"
-
-#: ../finch/gntplugin.c:200
+#: ../finch/gntplugin.c:226
 msgid "No configuration options for this plugin."
 msgstr "甇斗芋蝯銝衣⊿賊臭閮剖"
 
-#: ../finch/gntplugin.c:221
+#: ../finch/gntplugin.c:249
 msgid "You can (un)load plugins from the following list."
 msgstr "典舫隞乩銵刻交貉璅∠"
 
-#: ../finch/gntplugin.c:264
+#: ../finch/gntplugin.c:296
 msgid "Configure Plugin"
 msgstr "閮剖璅∠"
 
-#: ../finch/gntpounce.c:180 ../pidgin/gtkpounce.c:251
+#: ../finch/gntplugin.c:352 ../finch/gntplugin.c:359 ../finch/gntprefs.c:245
+#: ../finch/gntui.c:82 ../pidgin/gtkdocklet.c:524 ../pidgin/gtkprefs.c:1953
+msgid "Preferences"
+msgstr "憟質身摰"
+
+#: ../finch/gntpounce.c:180 ../pidgin/gtkpounce.c:253
 msgid "Please enter a buddy to pounce."
 msgstr "隢頛詨乩憟賢隞仿脰"
 
-#: ../finch/gntpounce.c:325 ../pidgin/gtkpounce.c:505
+#: ../finch/gntpounce.c:325 ../pidgin/gtkpounce.c:507
 msgid "New Buddy Pounce"
 msgstr "啣憟賢"
 
-#: ../finch/gntpounce.c:325 ../pidgin/gtkpounce.c:505
+#: ../finch/gntpounce.c:325 ../pidgin/gtkpounce.c:507
 msgid "Edit Buddy Pounce"
 msgstr "蝺刻摩憟賢"
 
@@ -1048,8 +1124,8 @@
 
 #. Account:
 #. Set up stuff for the account box
-#: ../finch/gntpounce.c:333 ../finch/gntstatus.c:443 ../pidgin/gtkblist.c:5341
-#: ../pidgin/gtkblist.c:5657
+#: ../finch/gntpounce.c:333 ../finch/gntstatus.c:446 ../pidgin/gtkblist.c:5437
+#: ../pidgin/gtkblist.c:5753
 msgid "Account:"
 msgstr "撣唾嚗"
 
@@ -1058,52 +1134,52 @@
 msgstr "憟賢蝔梧"
 
 #. Create the "Pounce When Buddy..." frame.
-#: ../finch/gntpounce.c:370 ../pidgin/gtkpounce.c:575
+#: ../finch/gntpounce.c:371 ../pidgin/gtkpounce.c:577
 msgid "Pounce When Buddy..."
 msgstr "..."
 
-#: ../finch/gntpounce.c:372
-msgid "Signs on"
-msgstr "餃"
-
 #: ../finch/gntpounce.c:373
-msgid "Signs off"
-msgstr "餃"
+msgid "Signs on"
+msgstr "餃"
 
 #: ../finch/gntpounce.c:374
+msgid "Signs off"
+msgstr "餃"
+
+#: ../finch/gntpounce.c:375
 msgid "Goes away"
 msgstr "a"
 
-#: ../finch/gntpounce.c:375
-msgid "Returns from away"
-msgstr "餈"
-
 #: ../finch/gntpounce.c:376
-msgid "Becomes idle"
-msgstr "蝵"
+msgid "Returns from away"
+msgstr "餈"
 
 #: ../finch/gntpounce.c:377
+msgid "Becomes idle"
+msgstr "蝵"
+
+#: ../finch/gntpounce.c:378
 msgid "Is no longer idle"
 msgstr "銝蝵"
 
-#: ../finch/gntpounce.c:378
+#: ../finch/gntpounce.c:379
 msgid "Starts typing"
 msgstr "憪頛詨"
 
-#: ../finch/gntpounce.c:379
+#: ../finch/gntpounce.c:380
 msgid "Pauses while typing"
 msgstr "怠頛詨"
 
-#: ../finch/gntpounce.c:380
+#: ../finch/gntpounce.c:381
 msgid "Stops typing"
 msgstr "甇Z撓"
 
-#: ../finch/gntpounce.c:381
+#: ../finch/gntpounce.c:382
 msgid "Sends a message"
 msgstr "箔閮"
 
 #. Create the "Action" frame.
-#: ../finch/gntpounce.c:411 ../pidgin/gtkpounce.c:636
+#: ../finch/gntpounce.c:411 ../pidgin/gtkpounce.c:638
 msgid "Action"
 msgstr "瑁雿"
 
@@ -1131,143 +1207,138 @@
 msgid "Pounce only when my status is not available"
 msgstr "芸冽銝箝銝蝺"
 
-#: ../finch/gntpounce.c:447 ../pidgin/gtkpounce.c:1278
+#: ../finch/gntpounce.c:447 ../pidgin/gtkpounce.c:1282
 msgid "Recurring"
 msgstr "閬潛"
 
-#: ../finch/gntpounce.c:649 ../pidgin/gtkpounce.c:1095
+#: ../finch/gntpounce.c:649 ../pidgin/gtkpounce.c:1097
 #, c-format
 msgid "Are you sure you want to delete the pounce on %s for %s?"
 msgstr "函Ⅱ摰刻芷文 %2$s  %1$s 嚗"
 
-#: ../finch/gntpounce.c:680 ../finch/gntui.c:78 ../pidgin/gtkpounce.c:1325
+#: ../finch/gntpounce.c:682 ../finch/gntui.c:78 ../pidgin/gtkpounce.c:1329
 msgid "Buddy Pounces"
 msgstr "憟賢"
 
-#: ../finch/gntpounce.c:792 ../pidgin/gtkpounce.c:1452
+#: ../finch/gntpounce.c:794 ../pidgin/gtkpounce.c:1456
 #, c-format
 msgid "%s has started typing to you (%s)"
 msgstr "%s 憪頛詨亥舐策 (%s)"
 
-#: ../finch/gntpounce.c:794 ../pidgin/gtkpounce.c:1454
+#: ../finch/gntpounce.c:796 ../pidgin/gtkpounce.c:1458
 #, c-format
 msgid "%s has paused while typing to you (%s)"
 msgstr "%s 怠頛詨亥舐策 (%s)"
 
-#: ../finch/gntpounce.c:796 ../pidgin/gtkpounce.c:1456
+#: ../finch/gntpounce.c:798 ../pidgin/gtkpounce.c:1460
 #, c-format
 msgid "%s has signed on (%s)"
 msgstr "%s 撌脩餃 (%s)"
 
-#: ../finch/gntpounce.c:798 ../pidgin/gtkpounce.c:1458
+#: ../finch/gntpounce.c:800 ../pidgin/gtkpounce.c:1462
 #, c-format
 msgid "%s has returned from being idle (%s)"
 msgstr "%s 梢蝵株 (%s)"
 
-#: ../finch/gntpounce.c:800 ../pidgin/gtkpounce.c:1460
+#: ../finch/gntpounce.c:802 ../pidgin/gtkpounce.c:1464
 #, c-format
 msgid "%s has returned from being away (%s)"
 msgstr "%s 梢a餈 (%s)"
 
-#: ../finch/gntpounce.c:802 ../pidgin/gtkpounce.c:1462
+#: ../finch/gntpounce.c:804 ../pidgin/gtkpounce.c:1466
 #, c-format
 msgid "%s has stopped typing to you (%s)"
 msgstr "%s 甇Z撓亥舐策 (%s)"
 
-#: ../finch/gntpounce.c:804 ../pidgin/gtkpounce.c:1464
+#: ../finch/gntpounce.c:806 ../pidgin/gtkpounce.c:1468
 #, c-format
 msgid "%s has signed off (%s)"
 msgstr "%s 撌脩餃 (%s)"
 
-#: ../finch/gntpounce.c:806 ../pidgin/gtkpounce.c:1466
+#: ../finch/gntpounce.c:808 ../pidgin/gtkpounce.c:1470
 #, c-format
 msgid "%s has become idle (%s)"
 msgstr "%s 霈渡粹蝵 (%s)"
 
 # XXX This string is very problematic. The other person might have changed to any non-available
 # XXX status like "Busy" (not necessarily "Away"), and "撌脩a" seems misleading. - 20061123
-#: ../finch/gntpounce.c:808 ../pidgin/gtkpounce.c:1468
+#: ../finch/gntpounce.c:810 ../pidgin/gtkpounce.c:1472
 #, c-format
 msgid "%s has gone away. (%s)"
 msgstr "%s 撌脩a (%s)"
 
-#: ../finch/gntpounce.c:810 ../pidgin/gtkpounce.c:1470
+#: ../finch/gntpounce.c:812 ../pidgin/gtkpounce.c:1474
 #, c-format
 msgid "%s has sent you a message. (%s)"
 msgstr "%s 箔閮舐策具 (%s)"
 
-#: ../finch/gntpounce.c:811 ../pidgin/gtkpounce.c:1471
+#: ../finch/gntpounce.c:813 ../pidgin/gtkpounce.c:1475
 msgid "Unknown pounce event. Please report this!"
 msgstr "芰亦鈭隞嗚隢梢憿嚗"
 
-#: ../finch/gntprefs.c:69 ../pidgin/gtkprefs.c:1812
+#: ../finch/gntprefs.c:79
+msgid "Based on keyboard use"
+msgstr "隞仿萇斤雿輻函箏箸"
+
+#: ../finch/gntprefs.c:81 ../pidgin/gtkprefs.c:1814
 msgid "From last sent message"
 msgstr "敺銝甈⊿箄舀箏箸"
 
-#: ../finch/gntprefs.c:71 ../libpurple/plugins/autoreply.c:360
-#: ../pidgin/gtkprefs.c:820 ../pidgin/gtkprefs.c:829 ../pidgin/gtkprefs.c:1811
-#: ../pidgin/gtkprefs.c:1825 ../pidgin/plugins/win32/winprefs/winprefs.c:337
+#: ../finch/gntprefs.c:83 ../pidgin/gtkprefs.c:820 ../pidgin/gtkprefs.c:829
+#: ../pidgin/gtkprefs.c:1813 ../pidgin/gtkprefs.c:1827
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:337
 msgid "Never"
 msgstr "敺銝"
 
-#: ../finch/gntprefs.c:159
+#: ../finch/gntprefs.c:171
 msgid "Show Idle Time"
 msgstr "憿舐內蝵格"
 
-#: ../finch/gntprefs.c:160
+#: ../finch/gntprefs.c:172
 msgid "Show Offline Buddies"
 msgstr "憿舐內Y憟賢"
 
-#: ../finch/gntprefs.c:166
-msgid "Show Timestamps"
-msgstr "憿舐內唾"
-
-#: ../finch/gntprefs.c:167
+#: ../finch/gntprefs.c:179
 msgid "Notify buddies when you are typing"
 msgstr "交函憟賢冽迤函潸舐策隞"
 
-#: ../finch/gntprefs.c:173
+#: ../finch/gntprefs.c:185
 msgid "Log format"
 msgstr "亥澆"
 
-#: ../finch/gntprefs.c:174
+#: ../finch/gntprefs.c:186
 msgid "Log IMs"
 msgstr "閮單閮臬批捆"
 
-#: ../finch/gntprefs.c:175
+#: ../finch/gntprefs.c:187
 msgid "Log chats"
 msgstr "閮憭拙批捆"
 
-#: ../finch/gntprefs.c:176
+#: ../finch/gntprefs.c:188
 msgid "Log status change events"
 msgstr "閮寡"
 
 #. Conversations
-#: ../finch/gntprefs.c:279 ../pidgin/gtkprefs.c:898 ../pidgin/gtkprefs.c:1915
+#: ../finch/gntprefs.c:241 ../pidgin/gtkprefs.c:898 ../pidgin/gtkprefs.c:1917
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:344
 msgid "Conversations"
 msgstr "鈭方"
 
-#: ../finch/gntprefs.c:280 ../pidgin/gtkprefs.c:1355 ../pidgin/gtkprefs.c:1926
+#: ../finch/gntprefs.c:242 ../pidgin/gtkprefs.c:1355 ../pidgin/gtkprefs.c:1928
 msgid "Logging"
 msgstr "亥"
 
-#: ../finch/gntprefs.c:283 ../finch/gntui.c:82 ../pidgin/gtkdocklet.c:532
-#: ../pidgin/gtkprefs.c:1951
-msgid "Preferences"
-msgstr "憟質身摰"
-
-#: ../finch/gntrequest.c:521
+#: ../finch/gntrequest.c:532
 msgid "Not implemented yet."
 msgstr "閰脣賢芸祕雿"
 
-#: ../finch/gntrequest.c:583 ../pidgin/gtkrequest.c:1514
-#: ../pidgin/gtkrequest.c:1559
+#: ../finch/gntrequest.c:597 ../pidgin/gtkrequest.c:1529
+#: ../pidgin/gtkrequest.c:1575
 msgid "Save File..."
 msgstr "脣瑼獢..."
 
-#: ../finch/gntrequest.c:583 ../pidgin/gtkrequest.c:1515
-#: ../pidgin/gtkrequest.c:1560
+#: ../finch/gntrequest.c:597 ../pidgin/gtkrequest.c:1530
+#: ../pidgin/gtkrequest.c:1576
 msgid "Open File..."
 msgstr "瑼獢..."
 
@@ -1281,104 +1352,104 @@
 msgstr "蝘駁斤"
 
 # FIXME 霅臬憭芸榆鈭
-#: ../finch/gntstatus.c:167 ../pidgin/gtksavedstatuses.c:556
+#: ../finch/gntstatus.c:170 ../pidgin/gtksavedstatuses.c:557
 msgid "Saved Statuses"
 msgstr "皜"
 
 # FIXME 銝閰拍儔嚗寞祉⊥蝧餉陌
-#: ../finch/gntstatus.c:174 ../finch/gntstatus.c:526
+#: ../finch/gntstatus.c:177 ../finch/gntstatus.c:529
 #: ../libpurple/protocols/jabber/buddy.c:286
-#: ../libpurple/protocols/jabber/buddy.c:938
+#: ../libpurple/protocols/jabber/buddy.c:935
 #: ../libpurple/protocols/novell/novell.c:1484
-#: ../pidgin/gtksavedstatuses.c:463
+#: ../pidgin/gtksavedstatuses.c:464
 msgid "Title"
 msgstr "琿"
 
 # NOTE 脣澆
-#: ../finch/gntstatus.c:174 ../pidgin/gtksavedstatuses.c:478
+#: ../finch/gntstatus.c:177 ../pidgin/gtksavedstatuses.c:479
 msgid "Type"
 msgstr "澆"
 
-#: ../finch/gntstatus.c:174 ../finch/gntstatus.c:551 ../finch/gntstatus.c:563
+#: ../finch/gntstatus.c:177 ../finch/gntstatus.c:554 ../finch/gntstatus.c:566
 #: ../libpurple/protocols/bonjour/bonjour.c:258
 #: ../libpurple/protocols/bonjour/bonjour.c:265
 #: ../libpurple/protocols/bonjour/bonjour.c:328
-#: ../libpurple/protocols/gg/gg.c:1062 ../libpurple/protocols/gg/gg.c:1566
-#: ../libpurple/protocols/gg/gg.c:1584 ../libpurple/protocols/gg/gg.c:1594
-#: ../libpurple/protocols/gg/gg.c:1600 ../libpurple/protocols/gg/gg.c:1609
-#: ../libpurple/protocols/gg/gg.c:1614 ../libpurple/protocols/irc/irc.c:234
-#: ../libpurple/protocols/jabber/jabber.c:1233
-#: ../libpurple/protocols/jabber/jabber.c:1243
-#: ../libpurple/protocols/jabber/jabber.c:1253
-#: ../libpurple/protocols/jabber/jabber.c:1263
-#: ../libpurple/protocols/jabber/jabber.c:1273
-#: ../libpurple/protocols/jabber/jabber.c:1285
-#: ../libpurple/protocols/novell/novell.c:2839
-#: ../libpurple/protocols/novell/novell.c:2942
-#: ../libpurple/protocols/novell/novell.c:2948
-#: ../libpurple/protocols/novell/novell.c:2954
-#: ../libpurple/protocols/oscar/oscar.c:5492
-#: ../libpurple/protocols/oscar/oscar.c:5720
-#: ../libpurple/protocols/oscar/oscar.c:5734
-#: ../libpurple/protocols/oscar/oscar.c:5750
-#: ../libpurple/protocols/oscar/oscar.c:5757
-#: ../libpurple/protocols/oscar/oscar.c:5764
-#: ../libpurple/protocols/sametime/sametime.c:3287
-#: ../libpurple/protocols/sametime/sametime.c:3293
-#: ../libpurple/protocols/sametime/sametime.c:3299
-#: ../libpurple/protocols/sametime/sametime.c:3378
-#: ../libpurple/protocols/silc/buddy.c:1544
+#: ../libpurple/protocols/gg/gg.c:1072 ../libpurple/protocols/gg/gg.c:1576
+#: ../libpurple/protocols/gg/gg.c:1594 ../libpurple/protocols/gg/gg.c:1604
+#: ../libpurple/protocols/gg/gg.c:1610 ../libpurple/protocols/gg/gg.c:1619
+#: ../libpurple/protocols/gg/gg.c:1624 ../libpurple/protocols/irc/irc.c:234
+#: ../libpurple/protocols/jabber/jabber.c:1246
+#: ../libpurple/protocols/jabber/jabber.c:1256
+#: ../libpurple/protocols/jabber/jabber.c:1266
+#: ../libpurple/protocols/jabber/jabber.c:1276
+#: ../libpurple/protocols/jabber/jabber.c:1286
+#: ../libpurple/protocols/jabber/jabber.c:1298
+#: ../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:5464
+#: ../libpurple/protocols/oscar/oscar.c:5682
+#: ../libpurple/protocols/oscar/oscar.c:5696
+#: ../libpurple/protocols/oscar/oscar.c:5712
+#: ../libpurple/protocols/oscar/oscar.c:5719
+#: ../libpurple/protocols/oscar/oscar.c:5726
+#: ../libpurple/protocols/sametime/sametime.c:3286
+#: ../libpurple/protocols/sametime/sametime.c:3292
+#: ../libpurple/protocols/sametime/sametime.c:3298
+#: ../libpurple/protocols/sametime/sametime.c:3377
+#: ../libpurple/protocols/silc/buddy.c:1551
 #: ../libpurple/protocols/simple/simple.c:246
-#: ../libpurple/protocols/yahoo/yahoo.c:3470
-#: ../libpurple/protocols/yahoo/yahoo.c:3476
-#: ../libpurple/protocols/zephyr/zephyr.c:2336
-#: ../pidgin/gtksavedstatuses.c:489 ../pidgin/gtksavedstatuses.c:953
+#: ../libpurple/protocols/yahoo/yahoo.c:3477
+#: ../libpurple/protocols/yahoo/yahoo.c:3483
+#: ../libpurple/protocols/zephyr/zephyr.c:2337
+#: ../pidgin/gtksavedstatuses.c:490 ../pidgin/gtksavedstatuses.c:954
 msgid "Message"
 msgstr "閮"
 
 #. Use
-#: ../finch/gntstatus.c:186 ../finch/gntstatus.c:580
+#: ../finch/gntstatus.c:189 ../finch/gntstatus.c:583
 msgid "Use"
 msgstr "雿輻"
 
-#: ../finch/gntstatus.c:291
+#: ../finch/gntstatus.c:294
 msgid "Invalid title"
-msgstr "⊥璅憿"
-
-#: ../finch/gntstatus.c:292
+msgstr "璅憿⊥"
+
+#: ../finch/gntstatus.c:295
 msgid "Please enter a non-empty title for the status."
 msgstr "隢粹頛詨乩蝛箇賜璅憿"
 
-#: ../finch/gntstatus.c:299
+#: ../finch/gntstatus.c:302
 msgid "Duplicate title"
 msgstr "璅憿閬"
 
-#: ../finch/gntstatus.c:300
+#: ../finch/gntstatus.c:303
 msgid "Please enter a different title for the status."
 msgstr "箇策頛詨亙虫璅憿"
 
-#: ../finch/gntstatus.c:440
+#: ../finch/gntstatus.c:443
 msgid "Substatus"
 msgstr "摮"
 
-#: ../finch/gntstatus.c:451 ../pidgin/gtkft.c:698
+#: ../finch/gntstatus.c:454 ../pidgin/gtkft.c:698
 msgid "Status:"
 msgstr "嚗"
 
-#: ../finch/gntstatus.c:466
+#: ../finch/gntstatus.c:469
 msgid "Message:"
 msgstr "閮荔"
 
-#: ../finch/gntstatus.c:515
+#: ../finch/gntstatus.c:518
 msgid "Edit Status"
 msgstr "靽格寧"
 
-#: ../finch/gntstatus.c:557
+#: ../finch/gntstatus.c:560
 msgid "Use different status for following accounts"
 msgstr "粹其遢撣唾閮剖銝"
 
 #. Save & Use
-#: ../finch/gntstatus.c:591
+#: ../finch/gntstatus.c:594
 msgid "Save & Use"
 msgstr "脣銝虫蝙"
 
@@ -1401,66 +1472,66 @@
 "X, if possible."
 msgstr " gnt 芸批捆霈湔嚗航賣啁批捆皛箄 X 閬蝒蝟餌絞"
 
-#: ../finch/plugins/gntgf.c:209
+#: ../finch/plugins/gntgf.c:231
 #, c-format
 msgid "%s just signed on"
 msgstr "%s 餃"
 
-#: ../finch/plugins/gntgf.c:216
+#: ../finch/plugins/gntgf.c:238
 #, c-format
 msgid "%s just signed off"
 msgstr "%s 餃"
 
-#: ../finch/plugins/gntgf.c:224
+#: ../finch/plugins/gntgf.c:246
 #, c-format
 msgid "%s sent you a message"
 msgstr "%s 箔閮舐策"
 
-#: ../finch/plugins/gntgf.c:243
+#: ../finch/plugins/gntgf.c:265
 #, c-format
 msgid "%s said your nick in %s"
 msgstr "%s  %s 唳函梁迂"
 
-#: ../finch/plugins/gntgf.c:245
+#: ../finch/plugins/gntgf.c:267
 #, c-format
 msgid "%s sent a message in %s"
 msgstr "%s  %s 箔閮舐策具"
 
-#: ../finch/plugins/gntgf.c:283
+#: ../finch/plugins/gntgf.c:305
 msgid "Buddy signs on/off"
 msgstr "憟賢餃伐餃"
 
-#: ../finch/plugins/gntgf.c:284
+#: ../finch/plugins/gntgf.c:306
 msgid "You receive an IM"
 msgstr "冽嗅啣單閮"
 
-#: ../finch/plugins/gntgf.c:285
+#: ../finch/plugins/gntgf.c:307
 msgid "Someone speaks in a chat"
 msgstr "鈭箏刻憭拙恕隢閰"
 
-#: ../finch/plugins/gntgf.c:286
+#: ../finch/plugins/gntgf.c:308
 msgid "Someone says your name in a chat"
 msgstr "鈭箏刻憭拙恕銝剜唳函摮"
 
 #  NOTEGntGf箝Gnt  Guifications嚗Toaster MSN 憸冽潛敶箏亙末憭憯怎敶箇憟賜暻萄銝璅
-#: ../finch/plugins/gntgf.c:314
+#: ../finch/plugins/gntgf.c:336
 msgid "Notify with a toaster when"
 msgstr "隞乩瘜銝雿輻典憯怎撘敶粹"
 
-#: ../finch/plugins/gntgf.c:329
+#: ../finch/plugins/gntgf.c:351
 msgid "Beep too!"
 msgstr "銋閬嗚莎"
 
-#: ../finch/plugins/gntgf.c:335
+#: ../finch/plugins/gntgf.c:357
 msgid "Set URGENT for the terminal window."
 msgstr "蝯衣蝡舀閬蝒閮剖URGENT嚗蝺亥閮嚗蝷"
 
-#: ../finch/plugins/gntgf.c:355
+#: ../finch/plugins/gntgf.c:377
 msgid "GntGf"
 msgstr "GntGf"
 
 #  NOTEGntGf箝Gnt  Guifications嚗Toaster MSN 憸冽潛敶箏亙末憭憯怎敶箇憟賜暻芸銝璅
-#: ../finch/plugins/gntgf.c:357 ../finch/plugins/gntgf.c:358
+#: ../finch/plugins/gntgf.c:379 ../finch/plugins/gntgf.c:380
 msgid "Toaster plugin"
 msgstr "憭憯怎撘敶粹交芋蝯"
 
@@ -1514,69 +1585,70 @@
 msgid "Lastlog plugin."
 msgstr ""
 
-#: ../libpurple/account.c:777
+#: ../libpurple/account.c:790
 msgid "accounts"
 msgstr "撣唾皜"
 
-#: ../libpurple/account.c:923
+#: ../libpurple/account.c:937 ../libpurple/protocols/jabber/auth.c:194
+#: ../libpurple/protocols/jabber/auth.c:233
 msgid "Password is required to sign on."
 msgstr "餃交閬撖蝣潦"
 
-#: ../libpurple/account.c:948
+#: ../libpurple/account.c:963
 #, c-format
 msgid "Enter password for %s (%s)"
 msgstr "頛詨 %s (%s) 撖蝣"
 
-#: ../libpurple/account.c:955
+#: ../libpurple/account.c:970
 msgid "Enter Password"
 msgstr "頛詨亙蝣"
 
-#: ../libpurple/account.c:960
+#: ../libpurple/account.c:975
 msgid "Save password"
 msgstr "脣撖蝣"
 
-#: ../libpurple/account.c:994 ../libpurple/connection.c:104
+#: ../libpurple/account.c:1010 ../libpurple/connection.c:104
 #, c-format
 msgid "Missing protocol plugin for %s"
 msgstr "曆 %s 摰璅∠"
 
-#: ../libpurple/account.c:1154 ../libpurple/protocols/gg/gg.c:696
-#: ../libpurple/protocols/jabber/jabber.c:1323
+#: ../libpurple/account.c:1170 ../libpurple/protocols/gg/gg.c:702
+#: ../libpurple/protocols/jabber/jabber.c:1336
 msgid "New passwords do not match."
 msgstr "啣蝣潔蒂銝貊泵"
 
 # NOTE 霅舀游 by Ambrose
-#: ../libpurple/account.c:1163
+#: ../libpurple/account.c:1179
 msgid "Fill out all fields completely."
 msgstr "隢憛怠戎港遢銵冽潭甈雿"
 
-#: ../libpurple/account.c:1186
+#: ../libpurple/account.c:1202
 msgid "Original password"
 msgstr "撖蝣"
 
-#: ../libpurple/account.c:1193
+#: ../libpurple/account.c:1209
 msgid "New password"
 msgstr "啣蝣"
 
-#: ../libpurple/account.c:1200
+#: ../libpurple/account.c:1216
 msgid "New password (again)"
 msgstr "啣蝣潘甈∠Ⅱ隤嚗"
 
-#: ../libpurple/account.c:1206
+#: ../libpurple/account.c:1222
 #, c-format
 msgid "Change password for %s"
 msgstr "靽格 %s 撖蝣"
 
-#: ../libpurple/account.c:1214
+#: ../libpurple/account.c:1230
 msgid "Please enter your current password and your new password."
 msgstr "隢頛詨交函桀撖蝣潔誑撣雿輻函啣蝣潦"
 
-#: ../libpurple/account.c:1244
+#: ../libpurple/account.c:1261
 #, c-format
 msgid "Change user information for %s"
 msgstr "湔 %s 鈭箄閮"
 
-#: ../libpurple/account.c:1247 ../libpurple/protocols/toc/toc.c:1670
+#: ../libpurple/account.c:1264 ../libpurple/protocols/toc/toc.c:1670
 msgid "Set User Info"
 msgstr "閮剖雿輻刻鞈閮"
 
@@ -1587,18 +1659,18 @@
 # XXX libgaim/protocols/* - Unknown銝憟賢嚗航賣舀銝嚗閮蝟餌絞梁胯銝嚗
 # XXX                       芰乓嚗箇曆 Pidgin 芾隞嚗
 # XXX - Ambrose 20061123
-#: ../libpurple/account.c:1783 ../libpurple/protocols/gg/gg.c:1002
-#: ../libpurple/protocols/jabber/buddy.c:641
-#: ../libpurple/protocols/jabber/buddy.c:1404
-#: ../libpurple/protocols/jabber/buddy.c:1421
-#: ../libpurple/protocols/novell/novell.c:2832
+#: ../libpurple/account.c:1744 ../libpurple/protocols/gg/gg.c:1012
+#: ../libpurple/protocols/jabber/buddy.c:638
+#: ../libpurple/protocols/jabber/buddy.c:1424
+#: ../libpurple/protocols/jabber/buddy.c:1441
+#: ../libpurple/protocols/novell/novell.c:2831
 #: ../libpurple/protocols/qq/qq.c:230 ../pidgin/gtkft.c:159
 msgid "Unknown"
 msgstr "芰"
 
-#: ../libpurple/blist.c:523 ../libpurple/blist.c:1296
-#: ../libpurple/blist.c:1525 ../libpurple/protocols/jabber/roster.c:68
-#: ../pidgin/gtkblist.c:5137 ../pidgin/plugins/gevolution/gevolution.c:97
+#: ../libpurple/blist.c:523 ../libpurple/blist.c:1291
+#: ../libpurple/blist.c:1520 ../libpurple/protocols/jabber/roster.c:68
+#: ../pidgin/gtkblist.c:5233 ../pidgin/plugins/gevolution/gevolution.c:97
 #: ../pidgin/plugins/gevolution/gevo-util.c:64
 msgid "Buddies"
 msgstr "憟賢"
@@ -1622,7 +1694,7 @@
 msgstr "+++ %s 餃"
 
 #: ../libpurple/connection.c:440 ../libpurple/plugin.c:282
-#: ../libpurple/protocols/jabber/buddy.c:1692
+#: ../libpurple/protocols/jabber/buddy.c:1712
 #: ../libpurple/protocols/msn/servconn.c:139
 #: ../libpurple/protocols/msn/session.c:321
 msgid "Unknown error"
@@ -1645,40 +1717,40 @@
 msgid "Unable to send message."
 msgstr "⊥箄胯"
 
-#: ../libpurple/conversation.c:1162
+#: ../libpurple/conversation.c:1164
 msgid "Send Message"
 msgstr "箄"
 
-#: ../libpurple/conversation.c:1163
+#: ../libpurple/conversation.c:1167
 msgid "_Send Message"
 msgstr "箄(_S)"
 
-#: ../libpurple/conversation.c:1566
+#: ../libpurple/conversation.c:1570
 #, c-format
 msgid "%s entered the room."
 msgstr "%s 脣亥憭拙恕"
 
-#: ../libpurple/conversation.c:1569
+#: ../libpurple/conversation.c:1573
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>] 脣亥憭拙恕"
 
-#: ../libpurple/conversation.c:1674
+#: ../libpurple/conversation.c:1678
 #, c-format
 msgid "You are now known as %s"
 msgstr "雿寡梁迂 %s"
 
-#: ../libpurple/conversation.c:1694
+#: ../libpurple/conversation.c:1698
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s 寡梁迂 %s"
 
-#: ../libpurple/conversation.c:1767
+#: ../libpurple/conversation.c:1771
 #, c-format
 msgid "%s left the room."
 msgstr "%s a憭拙恕"
 
-#: ../libpurple/conversation.c:1770
+#: ../libpurple/conversation.c:1774
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s a憭拙恕 (%s)"
@@ -1700,6 +1772,10 @@
 msgid "Failed to get serv name: %s"
 msgstr "⊥敺隡箸典蝔梧%s"
 
+#: ../libpurple/dbus-server.h:83
+msgid "Purple's D-BUS server is not running for the reason listed below"
+msgstr "銝嚗Purple  D-BUS 隡箸冽芣瑁"
+
 # NOTE 怨陌嚗閮望嗡蝢
 #: ../libpurple/desktopitem.c:286 ../libpurple/desktopitem.c:877
 msgid "No name"
@@ -1750,7 +1826,7 @@
 msgid "Unknown reason"
 msgstr "銝"
 
-#: ../libpurple/ft.c:204 ../libpurple/protocols/msn/msn.c:409
+#: ../libpurple/ft.c:204
 #, c-format
 msgid ""
 "Error reading %s: \n"
@@ -1794,23 +1870,23 @@
 msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
 msgstr "%s 銝臭祆獢嚗甇支閬摰\n"
 
-#: ../libpurple/ft.c:340
+#: ../libpurple/ft.c:342
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "%s 唾 %s (%s) 蝯行"
 
-#: ../libpurple/ft.c:347
+#: ../libpurple/ft.c:349
 #, c-format
 msgid "%s wants to send you a file"
 msgstr "%s 唾喲瑼獢蝯行"
 
-#: ../libpurple/ft.c:388
+#: ../libpurple/ft.c:392
 #, c-format
 msgid "Accept file transfer request from %s?"
 msgstr "亙靘芣潦%s瑼獢唾撓閬瘙嚗"
 
 #  XXX 怨陌
-#: ../libpurple/ft.c:392
+#: ../libpurple/ft.c:396
 #, c-format
 msgid ""
 "A file is available for download from:\n"
@@ -1821,60 +1897,60 @@
 "蝡臭蜓璈嚗%s\n"
 "蝡舫閮嚗%d"
 
-#: ../libpurple/ft.c:425
+#: ../libpurple/ft.c:431
 #, c-format
 msgid "%s is offering to send file %s"
 msgstr "%s 箏喲瑼獢%s"
 
-#: ../libpurple/ft.c:477
+#: ../libpurple/ft.c:483
 #, c-format
 msgid "%s is not a valid filename.\n"
 msgstr "%s銝臭瑼獢蝔晞\n"
 
-#: ../libpurple/ft.c:498
+#: ../libpurple/ft.c:504
 #, c-format
 msgid "Offering to send %s to %s"
 msgstr " %2$s 箏喲 %1$s 銝"
 
-#: ../libpurple/ft.c:510
+#: ../libpurple/ft.c:516
 #, c-format
 msgid "Starting transfer of %s from %s"
 msgstr "憪 %2$s 喲 %1$s"
 
-#: ../libpurple/ft.c:664
+#: ../libpurple/ft.c:670
 #, c-format
 msgid "Transfer of file %s complete"
 msgstr "瑼獢 %s 喲摰"
 
-#: ../libpurple/ft.c:667
+#: ../libpurple/ft.c:673
 msgid "File transfer complete"
 msgstr "瑼獢唾撓摰"
 
-#: ../libpurple/ft.c:1084
+#: ../libpurple/ft.c:1091
 #, c-format
 msgid "You canceled the transfer of %s"
 msgstr "雿瘨鈭 %s 喲"
 
-#: ../libpurple/ft.c:1089
+#: ../libpurple/ft.c:1096
 msgid "File transfer cancelled"
 msgstr "瑼獢唾撓撌脣瘨"
 
-#: ../libpurple/ft.c:1147
+#: ../libpurple/ft.c:1154
 #, c-format
 msgid "%s canceled the transfer of %s"
 msgstr "%s 瘨鈭 %s 喲"
 
-#: ../libpurple/ft.c:1152
+#: ../libpurple/ft.c:1159
 #, c-format
 msgid "%s canceled the file transfer"
 msgstr "%s 瘨鈭瑼獢唾撓"
 
-#: ../libpurple/ft.c:1209
+#: ../libpurple/ft.c:1216
 #, c-format
 msgid "File transfer to %s failed."
 msgstr "喲瑼獢 %s 憭望"
 
-#: ../libpurple/ft.c:1211
+#: ../libpurple/ft.c:1218
 #, c-format
 msgid "File transfer from %s failed."
 msgstr " %s 喲瑼獢憭望"
@@ -2170,29 +2246,29 @@
 msgid "Set Autoaccept Setting"
 msgstr "閮剖芸亙賊"
 
-#: ../libpurple/plugins/autoaccept.c:164 ../libpurple/plugins/autoreply.c:225
+#: ../libpurple/plugins/autoaccept.c:164
 msgid "_Save"
 msgstr "脣(_S)"
 
-#: ../libpurple/plugins/autoaccept.c:165 ../libpurple/plugins/autoreply.c:226
-#: ../libpurple/plugins/idle.c:170 ../libpurple/plugins/idle.c:203
-#: ../libpurple/plugins/idle.c:228 ../libpurple/protocols/oscar/oscar.c:1434
-#: ../libpurple/protocols/oscar/oscar.c:2243
-#: ../libpurple/protocols/oscar/oscar.c:2289
-#: ../libpurple/protocols/oscar/oscar.c:5834
-#: ../libpurple/protocols/oscar/oscar.c:5886
-#: ../libpurple/protocols/oscar/oscar.c:6110
-#: ../libpurple/protocols/oscar/oscar.c:6179 ../libpurple/request.h:1350
-#: ../libpurple/request.h:1360
+#: ../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:1440
+#: ../libpurple/protocols/oscar/oscar.c:2231
+#: ../libpurple/protocols/oscar/oscar.c:2278
+#: ../libpurple/protocols/oscar/oscar.c:5796
+#: ../libpurple/protocols/oscar/oscar.c:5851
+#: ../libpurple/protocols/oscar/oscar.c:6077
+#: ../libpurple/protocols/oscar/oscar.c:6147 ../libpurple/request.h:1387
+#: ../libpurple/request.h:1397
 msgid "_Cancel"
 msgstr "瘨(_C)"
 
 #  TODO: 銝 - 20070414
-#: ../libpurple/plugins/autoaccept.c:166
+#: ../libpurple/plugins/autoaccept.c:168
 msgid "Ask"
 msgstr "銝"
 
-#: ../libpurple/plugins/autoaccept.c:167
+#: ../libpurple/plugins/autoaccept.c:169
 msgid "Auto Accept"
 msgstr "芸亙"
 
@@ -2210,17 +2286,17 @@
 #  *< dependencies
 #  *< priority
 #  *< id
-#: ../libpurple/plugins/autoaccept.c:168
+#: ../libpurple/plugins/autoaccept.c:170
 msgid "Auto Reject"
 msgstr "芸蝯"
 
 #  NOTE 鈭賣航蝒璅憿
-#: ../libpurple/plugins/autoaccept.c:181
+#: ../libpurple/plugins/autoaccept.c:184
 msgid "Autoaccept File Transfers..."
 msgstr "芸亙瑼獢唾撓..."
 
 #. XXX: Is there a better way than this? There really should be.
-#: ../libpurple/plugins/autoaccept.c:211
+#: ../libpurple/plugins/autoaccept.c:214
 msgid ""
 "Path to save the files in\n"
 "(Please provide the full path)"
@@ -2228,11 +2304,11 @@
 "瑼獢脣頝臬\n"
 "嚗隢靘摰渲楝敺嚗"
 
-#: ../libpurple/plugins/autoaccept.c:216
+#: ../libpurple/plugins/autoaccept.c:219
 msgid "Automatically reject from users not in buddy list"
 msgstr "芸蝯靘芸末皜桐葉雿輻刻"
 
-#: ../libpurple/plugins/autoaccept.c:220
+#: ../libpurple/plugins/autoaccept.c:223
 msgid ""
 "Notify with a popup when an autoaccepted file transfer is complete\n"
 "(only when there's no conversation with the sender)"
@@ -2240,108 +2316,8 @@
 "嗅芸亙瑼獢唾撓頝喳箄蝒功n"
 "嚗芰潛冽芾喲脰鈭方瘜銝嚗"
 
-#: ../libpurple/plugins/autoreply.c:23
-msgid "Autoreply"
-msgstr "芸閬"
-
-#: ../libpurple/plugins/autoreply.c:25
-msgid "Autoreply for all the protocols"
-msgstr "拍冽潭閮摰芸閬"
-
-#: ../libpurple/plugins/autoreply.c:26
-msgid ""
-"This plugin lets you set autoreply message for any protocol. You can set the "
-"global autoreply message from the Plugin-options dialog. To set some "
-"specific autoreply message for a particular buddy, right click on the buddy "
-"in the buddy-list window. To set autoreply messages for some account, go to "
-"the `Advanced' tab of the Account-edit dialog."
-msgstr ""
-"璅∠箏券券閮摰靘芸閬賬閮剖典拍函芸閬嚗芷券璅"
-"蝯賊閬蝒閮剖喳荔箏亙末閮剖芸閬嚗隢典末皜桐葉隞交曌喲菟閰"
-"憟賢嚗箸函亙董嗉身摰芸閬嚗隢券璅∠賊閬蝒脤蝝"
-
-#. XXX: There should be a way to reset to the default/account-default autoreply
-#: ../libpurple/plugins/autoreply.c:218
-#, c-format
-msgid "Set autoreply message for %s"
-msgstr "閮剖芸閬蝯 %s 閮"
-
-#: ../libpurple/plugins/autoreply.c:220
-msgid "Set Autoreply Message"
-msgstr "閮剖芸閬閮"
-
-#: ../libpurple/plugins/autoreply.c:221
-msgid ""
-"The following message will be sent to the buddy when the buddy sends you a "
-"message and autoreply is enabled."
-msgstr "嗉芸閬賢敺嚗瘥嗅末蝯行券箄舀嚗銝閮臬鋡怨芸綽"
-
-#: ../libpurple/plugins/autoreply.c:238
-msgid "Set _Autoreply Message"
-msgstr "閮剖芸閬閮(_A)"
-
-#: ../libpurple/plugins/autoreply.c:249
-msgid "Autoreply message"
-msgstr "芸閬閮"
-
-#: ../libpurple/plugins/autoreply.c:336
-msgid "Send autoreply messages when"
-msgstr "雿澆箄芸閬"
-
-#: ../libpurple/plugins/autoreply.c:340
-msgid "When my account is _away"
-msgstr "嗆撣唾臬具a(_A)"
-
-#: ../libpurple/plugins/autoreply.c:344
-msgid "When my account is _idle"
-msgstr "嗆撣唾臬具蝵柴(_I)"
-
-#: ../libpurple/plugins/autoreply.c:348
-msgid "_Default reply"
-msgstr "閮剖閬閮(_D)"
-
-#: ../libpurple/plugins/autoreply.c:354
-msgid "Status message"
-msgstr "閮"
-
-#: ../libpurple/plugins/autoreply.c:358
-msgid "Autoreply with status message"
-msgstr "隞亦閮臭箄芸閬"
-
-#: ../libpurple/plugins/autoreply.c:362
-msgid "Always when there is a status message"
-msgstr "瘥嗉身摰鈭閮舀"
-
-#: ../libpurple/plugins/autoreply.c:364
-msgid "Only when there's no autoreply message"
-msgstr "芸冽閮剖芸閬閮舀"
-
-#  NOTE: (23:38:07) wing: in the autoreply plugin, does "delay between autoreplies" mean really a delay, or would it rather be an interval during which no autoreplies will be sent to the same buddy?
-#  NOTE: (23:41:12) elb: wing: it is the latter
-#: ../libpurple/plugins/autoreply.c:369
-msgid "Delay between autoreplies"
-msgstr "芸閬銋賊"
-
-#: ../libpurple/plugins/autoreply.c:373
-msgid "_Minimum delay (mins)"
-msgstr "賊銝嚗嚗(_M)"
-
-#: ../libpurple/plugins/autoreply.c:377
-msgid "Times to send autoreplies"
-msgstr "箄芸閬閮舐甈⊥"
-
-#: ../libpurple/plugins/autoreply.c:381
-msgid "Ma_ximum count"
-msgstr "甈⊥訾 (_X)"
-
-#: ../libpurple/plugins/autoreply.c:428
-msgid ""
-"I am currently not available. Please leave your message, and I will get back "
-"to you as soon as possible."
-msgstr "曉其其摮銝隢函銝函閮荔嗆靘嚗撠敹怎策典閬"
-
-#: ../libpurple/plugins/buddynote.c:46 ../libpurple/protocols/msn/msn.c:1589
-#: ../libpurple/protocols/msn/msn.c:1619
+#: ../libpurple/plugins/buddynote.c:46 ../libpurple/protocols/msn/msn.c:1608
+#: ../libpurple/protocols/msn/msn.c:1638
 msgid "Notes"
 msgstr "閮"
 
@@ -2349,10 +2325,12 @@
 msgid "Enter your notes below..."
 msgstr "隢其Y蝛箔頛詨亙閮"
 
-#: ../libpurple/plugins/buddynote.c:61
+#: ../libpurple/plugins/buddynote.c:62
 msgid "Edit Notes..."
 msgstr "蝺刻摩閮..."
 
+#. *< major version
+#. *< minor version
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -2369,7 +2347,7 @@
 msgid "Store notes on particular buddies."
 msgstr "蝯血亙末銝閮颯"
 
-#. *  summary
+#. *< summary
 #: ../libpurple/plugins/buddynote.c:90
 msgid "Adds the option to store notes for buddies on your buddy list."
 msgstr "靘蝯血末皜桐憟賢銝閮餌賬"
@@ -2431,46 +2409,46 @@
 
 #  NOTE 舀航撓交雿撌阡璅蝐歹撟曉詻
 #  FIXME 霅舀敺寥
-#: ../libpurple/plugins/idle.c:158 ../libpurple/plugins/idle.c:216
+#: ../libpurple/plugins/idle.c:158 ../libpurple/plugins/idle.c:218
 msgid "Minutes"
 msgstr ""
 
 #. This is a cultural reference.  Dy'er Mak'er is a song by Led Zeppelin.
 #. If that doesn't translate well into your language, drop the 's before translating.
-#: ../libpurple/plugins/idle.c:165 ../libpurple/plugins/idle.c:198
-#: ../libpurple/plugins/idle.c:223 ../libpurple/plugins/idle.c:315
+#: ../libpurple/plugins/idle.c:165 ../libpurple/plugins/idle.c:199
+#: ../libpurple/plugins/idle.c:225 ../libpurple/plugins/idle.c:318
 msgid "I'dle Mak'er"
 msgstr "I'dle Mak'er"
 
-#: ../libpurple/plugins/idle.c:166 ../libpurple/plugins/idle.c:255
+#: ../libpurple/plugins/idle.c:166 ../libpurple/plugins/idle.c:258
 msgid "Set Account Idle Time"
 msgstr "芸亙董蝵格"
 
-#: ../libpurple/plugins/idle.c:169 ../libpurple/plugins/idle.c:227
+#: ../libpurple/plugins/idle.c:169 ../libpurple/plugins/idle.c:229
 msgid "_Set"
 msgstr "閮剖(_S)"
 
-#: ../libpurple/plugins/idle.c:183
+#: ../libpurple/plugins/idle.c:184
 msgid "None of your accounts are idle."
 msgstr "函撣唾賭舫蝵桃"
 
-#: ../libpurple/plugins/idle.c:199 ../libpurple/plugins/idle.c:259
+#: ../libpurple/plugins/idle.c:200 ../libpurple/plugins/idle.c:262
 msgid "Unset Account Idle Time"
 msgstr "瘨撣唾蝵格閮剖"
 
-#: ../libpurple/plugins/idle.c:202
+#: ../libpurple/plugins/idle.c:203
 msgid "_Unset"
 msgstr "瘨閮剖(_U)"
 
-#: ../libpurple/plugins/idle.c:224 ../libpurple/plugins/idle.c:263
+#: ../libpurple/plugins/idle.c:226 ../libpurple/plugins/idle.c:266
 msgid "Set Idle Time for All Accounts"
 msgstr "閮剖撣唾蝵格"
 
-#: ../libpurple/plugins/idle.c:268
+#: ../libpurple/plugins/idle.c:271
 msgid "Unset Idle Time for All Idled Accounts"
 msgstr "瘨撌脤蝵桀董蝵格"
 
-#: ../libpurple/plugins/idle.c:317 ../libpurple/plugins/idle.c:318
+#: ../libpurple/plugins/idle.c:320 ../libpurple/plugins/idle.c:321
 msgid "Allows you to hand-configure how long you've been idle"
 msgstr "閮望冽閮剖典歇蝵桐憭銋"
 
@@ -2547,7 +2525,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/joinpart.c:264
+#: ../libpurple/plugins/joinpart.c:270
 msgid "Join/Part Hiding"
 msgstr "梯/a憭拙恕閮"
 
@@ -2555,12 +2533,12 @@
 #. *< name
 #. *< version
 #. *  summary
-#: ../libpurple/plugins/joinpart.c:267
+#: ../libpurple/plugins/joinpart.c:273
 msgid "Hides extraneous join/part messages."
 msgstr "銝憿舐內憭擗/a憭拙恕閮"
 
 #. *  description
-#: ../libpurple/plugins/joinpart.c:269
+#: ../libpurple/plugins/joinpart.c:275
 msgid ""
 "This plugin hides join/part messages in large rooms, except for those users "
 "actively taking part in a conversation."
@@ -2682,20 +2660,20 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/log_reader.c:2126
+#: ../libpurple/plugins/log_reader.c:2132
 msgid "Log Reader"
 msgstr "亥瑼Z"
 
 #. *< name
 #. *< version
 #. * summary
-#: ../libpurple/plugins/log_reader.c:2130
+#: ../libpurple/plugins/log_reader.c:2136
 msgid "Includes other IM clients' logs in the log viewer."
 msgstr "冽亥閬賢其葉怠嗡單閮舐冽嗥垢亥"
 
 # XXX 霅舀敺寥莎蝚砌畾蛛 - 20061025
 #. * description
-#: ../libpurple/plugins/log_reader.c:2134
+#: ../libpurple/plugins/log_reader.c:2140
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
 "Currently, this includes Adium, MSN Messenger, and Trillian.\n"
@@ -2708,12 +2686,12 @@
 "\n"
 "瘜冽嚗璅∠隞潮澆嚗甇文航賜撣貊嗆憒雿輻剁敺芾嚗"
 
-#: ../libpurple/plugins/mono/loader/mono.c:211
+#: ../libpurple/plugins/mono/loader/mono.c:217
 msgid "Mono Plugin Loader"
 msgstr "Mono 璅∠頛亙"
 
-#: ../libpurple/plugins/mono/loader/mono.c:213
-#: ../libpurple/plugins/mono/loader/mono.c:214
+#: ../libpurple/plugins/mono/loader/mono.c:219
+#: ../libpurple/plugins/mono/loader/mono.c:220
 msgid "Loads .NET plugins with Mono."
 msgstr "雿輻決ono霈.NET璅∠"
 
@@ -2736,7 +2714,7 @@
 msgid "Prepends a newline to displayed message."
 msgstr "憿舐內閮臬啗"
 
-#. *  summary
+#. *< summary
 #: ../libpurple/plugins/newline.c:71
 msgid ""
 "Prepends a newline to messages so that the rest of the message appears below "
@@ -2776,31 +2754,31 @@
 msgid "You can edit/delete the pounce from the `Buddy Pounces' dialog"
 msgstr "典臭誑具憟賢撠閰梯蝒銝剔楊頛舀芷斤"
 
-#: ../libpurple/plugins/offlinemsg.c:159
-#: ../libpurple/protocols/msn/dialog.c:132
-#: ../libpurple/protocols/msn/msn.c:519 ../libpurple/protocols/msn/msn.c:529
-#: ../libpurple/protocols/novell/novell.c:1918
-#: ../libpurple/protocols/silc/buddy.c:313
-#: ../libpurple/protocols/silc/pk.c:117 ../libpurple/protocols/silc/wb.c:303
+#: ../libpurple/plugins/offlinemsg.c:161
+#: ../libpurple/protocols/msn/dialog.c:133
+#: ../libpurple/protocols/msn/msn.c:522 ../libpurple/protocols/msn/msn.c:532
+#: ../libpurple/protocols/novell/novell.c:1917
+#: ../libpurple/protocols/silc/buddy.c:314
+#: ../libpurple/protocols/silc/pk.c:119 ../libpurple/protocols/silc/wb.c:304
 #: ../pidgin/gtkrequest.c:267
 msgid "Yes"
 msgstr ""
 
-#: ../libpurple/plugins/offlinemsg.c:160
-#: ../libpurple/protocols/msn/dialog.c:133
-#: ../libpurple/protocols/msn/msn.c:519 ../libpurple/protocols/msn/msn.c:529
-#: ../libpurple/protocols/novell/novell.c:1919
-#: ../libpurple/protocols/silc/buddy.c:314
-#: ../libpurple/protocols/silc/pk.c:118 ../libpurple/protocols/silc/wb.c:304
+#: ../libpurple/plugins/offlinemsg.c:162
+#: ../libpurple/protocols/msn/dialog.c:134
+#: ../libpurple/protocols/msn/msn.c:522 ../libpurple/protocols/msn/msn.c:532
+#: ../libpurple/protocols/novell/novell.c:1918
+#: ../libpurple/protocols/silc/buddy.c:315
+#: ../libpurple/protocols/silc/pk.c:120 ../libpurple/protocols/silc/wb.c:305
 #: ../pidgin/gtkrequest.c:268
 msgid "No"
 msgstr ""
 
-#: ../libpurple/plugins/offlinemsg.c:187
+#: ../libpurple/plugins/offlinemsg.c:189
 msgid "Save offline messages in pounce"
 msgstr "雿輻具憟賢脣Y閮"
 
-#: ../libpurple/plugins/offlinemsg.c:191
+#: ../libpurple/plugins/offlinemsg.c:193
 msgid "Do not ask. Always save in pounce."
 msgstr "瘥嚗敹雿輻具憟賢脣Y閮胯"
 
@@ -2810,51 +2788,51 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/perl/perl.c:588
+#: ../libpurple/plugins/perl/perl.c:601
 msgid "Perl Plugin Loader"
 msgstr "Perl 璅∠頛亙"
 
 #. *< name
 #. *< version
 #. *< summary
-#: ../libpurple/plugins/perl/perl.c:590 ../libpurple/plugins/perl/perl.c:591
+#: ../libpurple/plugins/perl/perl.c:603 ../libpurple/plugins/perl/perl.c:604
 msgid "Provides support for loading perl plugins."
 msgstr "靘霈 Perl 璅∠舀氬"
 
-#: ../libpurple/plugins/psychic.c:19
+#: ../libpurple/plugins/psychic.c:20
 msgid "Psychic Mode"
 msgstr "芸"
 
-#: ../libpurple/plugins/psychic.c:20
+#: ../libpurple/plugins/psychic.c:21
 msgid "Psychic mode for incoming conversation"
 msgstr "芸乓撠閬憪鈭方"
 
-#: ../libpurple/plugins/psychic.c:21
+#: ../libpurple/plugins/psychic.c:22
 msgid ""
 "Causes conversation windows to appear as other users begin to message you.  "
-"This works for AIM, ICQ, Jabber, Sametime, and Yahoo!"
-msgstr ""
-"撠嫣憪其漱隢嚗撠梁單鈭方閬蝒拍冽 AIMICQJabberSametime  "
+"This works for AIM, ICQ, XMPP, Sametime, and Yahoo!"
+msgstr ""
+"撠嫣憪其漱隢嚗撠梁單鈭方閬蝒拍冽 AIMICQXMPPSametime  "
 "Yahoo"
 
-#: ../libpurple/plugins/psychic.c:66
+#: ../libpurple/plugins/psychic.c:72
 msgid "You feel a disturbance in the force..."
 msgstr "冽唬曉..."
 
-#: ../libpurple/plugins/psychic.c:85
+#: ../libpurple/plugins/psychic.c:91
 msgid "Only enable for users on the buddy list"
 msgstr "芰冽澆末皜桐葉雿輻刻"
 
-#: ../libpurple/plugins/psychic.c:90
+#: ../libpurple/plugins/psychic.c:96
 msgid "Disable when away"
 msgstr "a"
 
 # FIXME 霅舀敺寥 - 20061027
-#: ../libpurple/plugins/psychic.c:94
+#: ../libpurple/plugins/psychic.c:100
 msgid "Display notification message in conversations"
 msgstr "其漱隢折*蝷粹亥"
 
-#: ../libpurple/plugins/psychic.c:99
+#: ../libpurple/plugins/psychic.c:105
 msgid "Raise psychic conversations"
 msgstr "瘚桃整芸乓鈭方"
 
@@ -2919,7 +2897,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:257
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:263
 msgid "GNUTLS"
 msgstr "GNUTLS"
 
@@ -2927,8 +2905,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:260
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:262
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:266
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:268
 msgid "Provides SSL support through GNUTLS."
 msgstr " GNUTLS 靘 SSL 舀氬"
 
@@ -2938,7 +2916,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ssl/ssl-nss.c:409
+#: ../libpurple/plugins/ssl/ssl-nss.c:415
 msgid "NSS"
 msgstr "NSS"
 
@@ -2946,8 +2924,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ssl/ssl-nss.c:412
-#: ../libpurple/plugins/ssl/ssl-nss.c:414
+#: ../libpurple/plugins/ssl/ssl-nss.c:418
+#: ../libpurple/plugins/ssl/ssl-nss.c:420
 msgid "Provides SSL support through Mozilla NSS."
 msgstr " Mozilla  NSS 靘 SSL 舀氬"
 
@@ -2998,7 +2976,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/statenotify.c:142
+#: ../libpurple/plugins/statenotify.c:148
 msgid "Buddy State Notification"
 msgstr "憟賢"
 
@@ -3006,22 +2984,22 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/statenotify.c:145
-#: ../libpurple/plugins/statenotify.c:148
+#: ../libpurple/plugins/statenotify.c:151
+#: ../libpurple/plugins/statenotify.c:154
 msgid ""
 "Notifies in a conversation window when a buddy goes or returns from away or "
 "idle."
 msgstr "其漱隢閬蝒銝剝*蝷箏末a舐梢a嚗蝵殷餈亥胯"
 
-#: ../libpurple/plugins/tcl/tcl.c:415
+#: ../libpurple/plugins/tcl/tcl.c:421
 msgid "Tcl Plugin Loader"
 msgstr "Tcl 璅∠頛亙"
 
-#: ../libpurple/plugins/tcl/tcl.c:417 ../libpurple/plugins/tcl/tcl.c:418
+#: ../libpurple/plugins/tcl/tcl.c:423 ../libpurple/plugins/tcl/tcl.c:424
 msgid "Provides support for loading Tcl plugins"
 msgstr "靘霈 Tcl 璅∠舀"
 
-#: ../libpurple/plugins/tcl/tcl.c:483
+#: ../libpurple/plugins/tcl/tcl.c:495
 msgid ""
 "Unable to detect ActiveTCL installation. If you wish to use TCL plugins, "
 "install ActiveTCL from http://www.activestate.com\n"
@@ -3043,18 +3021,18 @@
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
 #. Away stuff
 #: ../libpurple/protocols/bonjour/bonjour.c:302
-#: ../libpurple/protocols/gg/gg.c:999 ../libpurple/protocols/irc/irc.c:514
-#: ../libpurple/protocols/irc/msgs.c:299
-#: ../libpurple/protocols/jabber/buddy.c:1414
-#: ../libpurple/protocols/novell/novell.c:2820
-#: ../libpurple/protocols/oscar/oscar.c:714
-#: ../libpurple/protocols/oscar/oscar.c:4520
-#: ../libpurple/protocols/oscar/oscar.c:5570
-#: ../libpurple/protocols/qq/qq.c:180 ../libpurple/protocols/silc/buddy.c:1469
-#: ../libpurple/protocols/yahoo/yahoo.c:3373
-#: ../libpurple/protocols/yahoo/yahoo.c:3446 ../libpurple/status.c:158
-#: ../pidgin/gtkdocklet.c:450 ../pidgin/gtkprefs.c:1821
-#: ../pidgin/gtkstatusbox.c:1090
+#: ../libpurple/protocols/gg/gg.c:1009 ../libpurple/protocols/irc/irc.c:530
+#: ../libpurple/protocols/irc/msgs.c:310
+#: ../libpurple/protocols/jabber/buddy.c:1434
+#: ../libpurple/protocols/novell/novell.c:2819
+#: ../libpurple/protocols/oscar/oscar.c:715
+#: ../libpurple/protocols/oscar/oscar.c:4497
+#: ../libpurple/protocols/oscar/oscar.c:5542
+#: ../libpurple/protocols/qq/qq.c:180 ../libpurple/protocols/silc/buddy.c:1476
+#: ../libpurple/protocols/yahoo/yahoo.c:3380
+#: ../libpurple/protocols/yahoo/yahoo.c:3453 ../libpurple/status.c:157
+#: ../pidgin/gtkdocklet.c:442 ../pidgin/gtkprefs.c:1823
+#: ../pidgin/gtkstatusbox.c:1052
 msgid "Away"
 msgstr "a"
 
@@ -3068,53 +3046,53 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/bonjour/bonjour.c:425
-#: ../libpurple/protocols/bonjour/bonjour.c:427
+#: ../libpurple/protocols/bonjour/bonjour.c:431
+#: ../libpurple/protocols/bonjour/bonjour.c:433
 msgid "Bonjour Protocol Plugin"
 msgstr "Bonjour 摰璅∠"
 
 #  XXX 敺憟 - ambrose 20070414
 #  NOTE 撠 evolution PO 瑼銋霅舀嚗閰唾銝ULocal Addressbook璇
-#: ../libpurple/protocols/bonjour/bonjour.c:463
-#: ../libpurple/protocols/bonjour/bonjour.c:470
-#: ../libpurple/protocols/bonjour/bonjour.c:528
+#: ../libpurple/protocols/bonjour/bonjour.c:476
+#: ../libpurple/protocols/bonjour/bonjour.c:483
+#: ../libpurple/protocols/bonjour/bonjour.c:541
 msgid "Purple Person"
 msgstr "蝯∩犖"
 
 #. Creating the user splits
-#: ../libpurple/protocols/bonjour/bonjour.c:567
-#: ../libpurple/protocols/silc/silc.c:925
+#: ../libpurple/protocols/bonjour/bonjour.c:589
+#: ../libpurple/protocols/silc/silc.c:926
 msgid "Hostname"
 msgstr "銝餅蝔"
 
 #. Creating the options for the protocol
-#: ../libpurple/protocols/bonjour/bonjour.c:571
-#: ../libpurple/protocols/gg/gg.c:622
-#: ../libpurple/protocols/jabber/jabber.c:822
+#: ../libpurple/protocols/bonjour/bonjour.c:593
+#: ../libpurple/protocols/gg/gg.c:627
+#: ../libpurple/protocols/jabber/jabber.c:824
 msgid "First name"
 msgstr ""
 
-#: ../libpurple/protocols/bonjour/bonjour.c:574
-#: ../libpurple/protocols/gg/gg.c:617
-#: ../libpurple/protocols/jabber/jabber.c:827
+#: ../libpurple/protocols/bonjour/bonjour.c:596
+#: ../libpurple/protocols/gg/gg.c:622
+#: ../libpurple/protocols/jabber/jabber.c:829
 msgid "Last name"
 msgstr "憪"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:577
-#: ../libpurple/protocols/gg/gg.c:468
-#: ../libpurple/protocols/jabber/jabber.c:812
+#: ../libpurple/protocols/bonjour/bonjour.c:599
+#: ../libpurple/protocols/gg/gg.c:472
+#: ../libpurple/protocols/jabber/jabber.c:814
 #: ../libpurple/protocols/silc/silc.c:689
-#: ../libpurple/protocols/silc/silc.c:929
+#: ../libpurple/protocols/silc/silc.c:930
 msgid "E-mail"
 msgstr "餃萎辣"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:580
+#: ../libpurple/protocols/bonjour/bonjour.c:602
 msgid "AIM Account"
 msgstr "AIM 撣唾"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:583
-msgid "Jabber Account"
-msgstr "Jabber 撣唾"
+#: ../libpurple/protocols/bonjour/bonjour.c:605
+msgid "XMPP Account"
+msgstr "XMPP 撣唾"
 
 # NOTE 舫閮摰蝔梧銝臬隤
 #: ../libpurple/protocols/bonjour/bonjour.h:35
@@ -3155,7 +3133,7 @@
 "Either the host name or port number specified for your given proxy type is "
 "invalid."
 msgstr ""
-"撠潭函桀閮剖隞隡箸典靘隤迎冽蝯血隡箸典蝔勗閮舐⊥"
+"撠潭函桀閮剖隞隡箸典靘隤迎冽摰隡箸典蝔勗閮舐⊥"
 
 #: ../libpurple/protocols/gg/gg.c:115 ../libpurple/protocols/gg/gg.c:137
 #: ../libpurple/protocols/gg/gg.c:180
@@ -3199,67 +3177,67 @@
 msgid "Save buddylist..."
 msgstr "脣憟賢皜..."
 
-#: ../libpurple/protocols/gg/gg.c:380
+#: ../libpurple/protocols/gg/gg.c:384
 msgid "Fill in the registration fields."
 msgstr "憛怠神閮餃鞈甈雿"
 
-#: ../libpurple/protocols/gg/gg.c:385
+#: ../libpurple/protocols/gg/gg.c:389
 msgid "Passwords do not match."
 msgstr "啣蝣潔蒂銝貊泵"
 
-#: ../libpurple/protocols/gg/gg.c:394
+#: ../libpurple/protocols/gg/gg.c:398
 msgid "Unable to register new account. Error occurred.\n"
 msgstr "⊥閮餃啣董航炊潛\n"
 
-#: ../libpurple/protocols/gg/gg.c:407
+#: ../libpurple/protocols/gg/gg.c:411
 msgid "New Gadu-Gadu Account Registered"
 msgstr "啁 Gadu-Gadu 撣唾撌脰酉"
 
-#: ../libpurple/protocols/gg/gg.c:408
+#: ../libpurple/protocols/gg/gg.c:412
 msgid "Registration completed successfully!"
 msgstr "閮餃嚗"
 
-#: ../libpurple/protocols/gg/gg.c:473 ../libpurple/protocols/gg/gg.c:764
-#: ../libpurple/protocols/jabber/jabber.c:801
-#: ../libpurple/protocols/jabber/jabber.c:1358
+#: ../libpurple/protocols/gg/gg.c:477 ../libpurple/protocols/gg/gg.c:770
+#: ../libpurple/protocols/jabber/jabber.c:803
+#: ../libpurple/protocols/jabber/jabber.c:1371
 msgid "Password"
 msgstr "撖蝣"
 
-#: ../libpurple/protocols/gg/gg.c:478 ../libpurple/protocols/gg/gg.c:769
+#: ../libpurple/protocols/gg/gg.c:482 ../libpurple/protocols/gg/gg.c:775
 msgid "Password (retype)"
 msgstr "撖蝣潘甈∟撓伐"
 
-#: ../libpurple/protocols/gg/gg.c:483 ../libpurple/protocols/gg/gg.c:774
+#: ../libpurple/protocols/gg/gg.c:487 ../libpurple/protocols/gg/gg.c:780
 msgid "Enter current token"
 msgstr "頛詨亦桀撖蝣"
 
-#: ../libpurple/protocols/gg/gg.c:489 ../libpurple/protocols/gg/gg.c:780
+#: ../libpurple/protocols/gg/gg.c:493 ../libpurple/protocols/gg/gg.c:786
 msgid "Current token"
 msgstr "桀撖蝣"
 
-#: ../libpurple/protocols/gg/gg.c:493 ../libpurple/protocols/gg/gg.c:494
+#: ../libpurple/protocols/gg/gg.c:497 ../libpurple/protocols/gg/gg.c:498
 msgid "Register New Gadu-Gadu Account"
 msgstr "閮餃啁 Gadu-Gadu 撣唾"
 
-#: ../libpurple/protocols/gg/gg.c:495
+#: ../libpurple/protocols/gg/gg.c:499
 msgid "Please, fill in the following fields"
 msgstr "隢頛詨乩誑銝甈雿"
 
-#: ../libpurple/protocols/gg/gg.c:632 ../libpurple/protocols/gg/gg.c:1039
-#: ../libpurple/protocols/gg/gg.c:1113
-#: ../libpurple/protocols/jabber/jabber.c:837
-#: ../libpurple/protocols/oscar/oscar.c:3791
-#: ../libpurple/protocols/oscar/oscar.c:3804
+#: ../libpurple/protocols/gg/gg.c:637 ../libpurple/protocols/gg/gg.c:1049
+#: ../libpurple/protocols/gg/gg.c:1123
+#: ../libpurple/protocols/jabber/jabber.c:839
+#: ../libpurple/protocols/oscar/oscar.c:3776
+#: ../libpurple/protocols/oscar/oscar.c:3789
 #: ../libpurple/protocols/qq/buddy_info.c:49
 msgid "City"
 msgstr "撣"
 
-#: ../libpurple/protocols/gg/gg.c:637
+#: ../libpurple/protocols/gg/gg.c:642
 msgid "Year of birth"
 msgstr "箇撟"
 
-#: ../libpurple/protocols/gg/gg.c:640 ../libpurple/protocols/msn/msn.c:1518
-#: ../libpurple/protocols/oscar/oscar.c:3734
+#: ../libpurple/protocols/gg/gg.c:645 ../libpurple/protocols/msn/msn.c:1537
+#: ../libpurple/protocols/oscar/oscar.c:3719
 #: ../libpurple/protocols/qq/buddy_info.c:46
 #: ../libpurple/protocols/qq/qq.c:224 ../libpurple/protocols/qq/qq.c:227
 #: ../libpurple/protocols/qq/qq.c:230 ../libpurple/protocols/qq/qq.c:234
@@ -3267,220 +3245,220 @@
 msgid "Gender"
 msgstr "批"
 
-#: ../libpurple/protocols/gg/gg.c:641
+#: ../libpurple/protocols/gg/gg.c:646
 msgid "Male or female"
 msgstr "瑟扳憟單"
 
-#: ../libpurple/protocols/gg/gg.c:642
-#: ../libpurple/protocols/oscar/oscar.c:3734
+#: ../libpurple/protocols/gg/gg.c:647
+#: ../libpurple/protocols/oscar/oscar.c:3719
 #: ../libpurple/protocols/qq/buddy_info.c:83
 #: ../libpurple/protocols/qq/qq.c:224
 msgid "Male"
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:643
-#: ../libpurple/protocols/oscar/oscar.c:3734
+#: ../libpurple/protocols/gg/gg.c:648
+#: ../libpurple/protocols/oscar/oscar.c:3719
 #: ../libpurple/protocols/qq/buddy_info.c:84
 #: ../libpurple/protocols/qq/qq.c:227
 msgid "Female"
 msgstr "憟"
 
-#: ../libpurple/protocols/gg/gg.c:647
+#: ../libpurple/protocols/gg/gg.c:652
 msgid "Only online"
 msgstr "芣銝蝺"
 
-#: ../libpurple/protocols/gg/gg.c:651 ../libpurple/protocols/gg/gg.c:652
+#: ../libpurple/protocols/gg/gg.c:656 ../libpurple/protocols/gg/gg.c:657
 msgid "Find buddies"
 msgstr "撠憟賢"
 
-#: ../libpurple/protocols/gg/gg.c:653
+#: ../libpurple/protocols/gg/gg.c:658
 msgid "Please, enter your search criteria below"
 msgstr "隢其寡撓交函撠璇隞"
 
-#: ../libpurple/protocols/gg/gg.c:690
+#: ../libpurple/protocols/gg/gg.c:696
 msgid "Fill in the fields."
 msgstr "憛怠唳雿銝准"
 
-#: ../libpurple/protocols/gg/gg.c:702
+#: ../libpurple/protocols/gg/gg.c:708
 msgid "Your current password is different from the one that you specified."
 msgstr "函桀靘撖蝣潸摰撣唾銝蝚艾"
 
-#: ../libpurple/protocols/gg/gg.c:716
+#: ../libpurple/protocols/gg/gg.c:722
 msgid "Unable to change password. Error occurred.\n"
 msgstr "⊥靽格孵蝣潦航炊潛\n"
 
-#: ../libpurple/protocols/gg/gg.c:725
+#: ../libpurple/protocols/gg/gg.c:731
 msgid "Change password for the Gadu-Gadu account"
 msgstr "霈 Gadu-Gadu 撣唾撖蝣"
 
-#: ../libpurple/protocols/gg/gg.c:726
+#: ../libpurple/protocols/gg/gg.c:732
 msgid "Password was changed successfully!"
 msgstr "撖蝣潔耨寞嚗"
 
-#: ../libpurple/protocols/gg/gg.c:759
+#: ../libpurple/protocols/gg/gg.c:765
 msgid "Current password"
 msgstr "撖蝣"
 
-#: ../libpurple/protocols/gg/gg.c:784
+#: ../libpurple/protocols/gg/gg.c:790
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr "隢頛豢函撖蝣澆雿啣蝣潘"
 
-#: ../libpurple/protocols/gg/gg.c:788 ../libpurple/protocols/gg/gg.c:789
+#: ../libpurple/protocols/gg/gg.c:794 ../libpurple/protocols/gg/gg.c:795
 msgid "Change Gadu-Gadu Password"
 msgstr "霈 Gadu-Gadu 撖蝣"
 
-#: ../libpurple/protocols/gg/gg.c:863
+#: ../libpurple/protocols/gg/gg.c:871
 #, c-format
 msgid "Select a chat for buddy: %s"
 msgstr "詨銝憭拙恕蝯血末嚗%s"
 
-#: ../libpurple/protocols/gg/gg.c:866 ../libpurple/protocols/gg/gg.c:867
+#: ../libpurple/protocols/gg/gg.c:874 ../libpurple/protocols/gg/gg.c:875
 msgid "Add to chat..."
 msgstr "啣啗憭拙恕..."
 
-#: ../libpurple/protocols/gg/gg.c:993
-#: ../libpurple/protocols/jabber/buddy.c:1408
-#: ../libpurple/protocols/novell/novell.c:2829
-#: ../libpurple/protocols/oscar/oscar.c:809
-#: ../libpurple/protocols/oscar/oscar.c:5542
+#: ../libpurple/protocols/gg/gg.c:1003
+#: ../libpurple/protocols/jabber/buddy.c:1428
+#: ../libpurple/protocols/novell/novell.c:2828
+#: ../libpurple/protocols/oscar/oscar.c:810
+#: ../libpurple/protocols/oscar/oscar.c:5514
 #: ../libpurple/protocols/qq/qq.c:170 ../libpurple/protocols/qq/qq.c:177
-#: ../libpurple/protocols/yahoo/yahoo.c:2898 ../libpurple/status.c:154
-#: ../pidgin/gtkblist.c:2978 ../pidgin/gtkblist.c:3302
-#: ../pidgin/gtkdocklet.c:458 ../pidgin/gtkstatusbox.c:1092
+#: ../libpurple/protocols/yahoo/yahoo.c:2900 ../libpurple/status.c:153
+#: ../pidgin/gtkblist.c:3053 ../pidgin/gtkblist.c:3378
+#: ../pidgin/gtkdocklet.c:450 ../pidgin/gtkstatusbox.c:1054
 msgid "Offline"
 msgstr "Y"
 
-#: ../libpurple/protocols/gg/gg.c:996
-#: ../libpurple/protocols/jabber/buddy.c:1410
+#: ../libpurple/protocols/gg/gg.c:1006
+#: ../libpurple/protocols/jabber/buddy.c:1430
 #: ../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:2817
-#: ../libpurple/protocols/yahoo/yahoo.c:2900 ../libpurple/status.c:155
-#: ../pidgin/gtkdocklet.c:446 ../pidgin/gtkstatusbox.c:1089
+#: ../libpurple/protocols/novell/novell.c:2816
+#: ../libpurple/protocols/yahoo/yahoo.c:2902 ../libpurple/status.c:154
+#: ../pidgin/gtkdocklet.c:438 ../pidgin/gtkstatusbox.c:1051
 msgid "Available"
 msgstr "銝蝺"
 
-#: ../libpurple/protocols/gg/gg.c:1028 ../libpurple/protocols/gg/gg.c:1104
-#: ../libpurple/protocols/oscar/oscar.c:2663
-#: ../libpurple/protocols/oscar/oscar.c:3701
+#: ../libpurple/protocols/gg/gg.c:1038 ../libpurple/protocols/gg/gg.c:1114
+#: ../libpurple/protocols/oscar/oscar.c:2655
+#: ../libpurple/protocols/oscar/oscar.c:3686
 msgid "UIN"
 msgstr "撣唾"
 
-#: ../libpurple/protocols/gg/gg.c:1031 ../libpurple/protocols/gg/gg.c:1107
-#: ../libpurple/protocols/jabber/buddy.c:1565
-#: ../libpurple/protocols/jabber/buddy.c:1741
-#: ../libpurple/protocols/oscar/oscar.c:3712
+#: ../libpurple/protocols/gg/gg.c:1041 ../libpurple/protocols/gg/gg.c:1117
+#: ../libpurple/protocols/jabber/buddy.c:1585
+#: ../libpurple/protocols/jabber/buddy.c:1761
+#: ../libpurple/protocols/oscar/oscar.c:3697
 #: ../libpurple/protocols/silc/ops.c:1024
 msgid "First Name"
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:1044 ../libpurple/protocols/gg/gg.c:1116
+#: ../libpurple/protocols/gg/gg.c:1054 ../libpurple/protocols/gg/gg.c:1126
 msgid "Birth Year"
 msgstr "箇撟"
 
-#: ../libpurple/protocols/gg/gg.c:1098 ../libpurple/protocols/gg/gg.c:1167
-#: ../libpurple/protocols/oscar/oscar.c:3913
+#: ../libpurple/protocols/gg/gg.c:1108 ../libpurple/protocols/gg/gg.c:1177
+#: ../libpurple/protocols/oscar/oscar.c:3898
 msgid "Unable to display the search results."
 msgstr "⊥憿舐內撠蝯"
 
 # FIXME 銝撠嚗閬閬 - 20061028
-#: ../libpurple/protocols/gg/gg.c:1158
+#: ../libpurple/protocols/gg/gg.c:1168
 msgid "Gadu-Gadu Public Directory"
 msgstr "Gadu-Gadu 砍勗"
 
-#: ../libpurple/protocols/gg/gg.c:1159
+#: ../libpurple/protocols/gg/gg.c:1169
 msgid "Search results"
 msgstr "撠蝯"
 
-#: ../libpurple/protocols/gg/gg.c:1202
+#: ../libpurple/protocols/gg/gg.c:1212
 msgid "No matching users found"
 msgstr "曆啁泵雿輻刻"
 
-#: ../libpurple/protocols/gg/gg.c:1203
+#: ../libpurple/protocols/gg/gg.c:1213
 msgid "There are no users matching your search criteria."
 msgstr "⊥靘扳撠璇隞嗆曉啁貊泵雿輻刻"
 
-#: ../libpurple/protocols/gg/gg.c:1297 ../libpurple/protocols/gg/gg.c:1450
+#: ../libpurple/protocols/gg/gg.c:1307 ../libpurple/protocols/gg/gg.c:1460
 msgid "Unable to read socket"
 msgstr "⊥霈 Socket"
 
-#: ../libpurple/protocols/gg/gg.c:1382
+#: ../libpurple/protocols/gg/gg.c:1392
 msgid "Buddy list downloaded"
 msgstr "銝頛憟賢皜"
 
-#: ../libpurple/protocols/gg/gg.c:1383
+#: ../libpurple/protocols/gg/gg.c:1393
 msgid "Your buddy list was downloaded from the server."
 msgstr "典歇敺隡箸其頛憟賢皜柴"
 
-#: ../libpurple/protocols/gg/gg.c:1390
+#: ../libpurple/protocols/gg/gg.c:1400
 msgid "Buddy list uploaded"
 msgstr "銝喳末皜"
 
-#: ../libpurple/protocols/gg/gg.c:1391
+#: ../libpurple/protocols/gg/gg.c:1401
 msgid "Your buddy list was stored on the server."
 msgstr "函憟賢皜桀歇鋡怠暹潔撩其"
 
-#: ../libpurple/protocols/gg/gg.c:1496 ../libpurple/protocols/gg/gg.c:1702
+#: ../libpurple/protocols/gg/gg.c:1506 ../libpurple/protocols/gg/gg.c:1712
 msgid "Connection failed."
 msgstr "蝺憭望"
 
-#: ../libpurple/protocols/gg/gg.c:1608 ../libpurple/protocols/msn/msn.c:528
+#: ../libpurple/protocols/gg/gg.c:1618 ../libpurple/protocols/msn/msn.c:531
 msgid "Blocked"
 msgstr "撠"
 
-#: ../libpurple/protocols/gg/gg.c:1631
+#: ../libpurple/protocols/gg/gg.c:1641
 msgid "Add to chat"
 msgstr "啣啗憭拙恕"
 
-#: ../libpurple/protocols/gg/gg.c:1640
+#: ../libpurple/protocols/gg/gg.c:1650
 msgid "Unblock"
 msgstr "閫文"
 
-#: ../libpurple/protocols/gg/gg.c:1644
+#: ../libpurple/protocols/gg/gg.c:1654
 msgid "Block"
 msgstr "撠"
 
-#: ../libpurple/protocols/gg/gg.c:1661
+#: ../libpurple/protocols/gg/gg.c:1671
 msgid "Chat _name:"
 msgstr "憭拙恕蝔(_N)嚗"
 
-#: ../libpurple/protocols/gg/gg.c:1901
+#: ../libpurple/protocols/gg/gg.c:1911
 msgid "Chat error"
 msgstr "憭拚航炊"
 
-#: ../libpurple/protocols/gg/gg.c:1902
+#: ../libpurple/protocols/gg/gg.c:1912
 msgid "This chat name is already in use"
 msgstr "憭拙恕蝔望迤其蝙其葉"
 
-#: ../libpurple/protocols/gg/gg.c:1985
+#: ../libpurple/protocols/gg/gg.c:1995
 msgid "Not connected to the server."
 msgstr "撠芷蝺唬撩具"
 
-#: ../libpurple/protocols/gg/gg.c:2008
+#: ../libpurple/protocols/gg/gg.c:2018
 msgid "Find buddies..."
 msgstr "撠曉末..."
 
-#: ../libpurple/protocols/gg/gg.c:2014
-msgid "Change password..."
-msgstr "靽格孵蝣..."
-
-#: ../libpurple/protocols/gg/gg.c:2020
-msgid "Upload buddylist to Server"
-msgstr "銝喳末皜桀唬撩"
-
 #: ../libpurple/protocols/gg/gg.c:2024
+msgid "Change password..."
+msgstr "靽格孵蝣..."
+
+#: ../libpurple/protocols/gg/gg.c:2030
+msgid "Upload buddylist to Server"
+msgstr "銝喳末皜桀唬撩"
+
+#: ../libpurple/protocols/gg/gg.c:2034
 msgid "Download buddylist from Server"
 msgstr "芯撩其頛憟賢皜"
 
-#: ../libpurple/protocols/gg/gg.c:2028
+#: ../libpurple/protocols/gg/gg.c:2038
 msgid "Delete buddylist from Server"
 msgstr "撠隡箸其憟賢皜桀芷"
 
-#: ../libpurple/protocols/gg/gg.c:2032
+#: ../libpurple/protocols/gg/gg.c:2042
 msgid "Save buddylist to file..."
 msgstr "脣憟賢皜桀唳獢銝..."
 
-#: ../libpurple/protocols/gg/gg.c:2036
+#: ../libpurple/protocols/gg/gg.c:2046
 msgid "Load buddylist from file..."
 msgstr "芣獢霈憟賢皜..."
 
@@ -3495,35 +3473,35 @@
 #. id
 #. name
 #. version
-#: ../libpurple/protocols/gg/gg.c:2134
+#: ../libpurple/protocols/gg/gg.c:2150
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr "Gadu-Gadu 摰璅∠"
 
 #. summary
-#: ../libpurple/protocols/gg/gg.c:2135
+#: ../libpurple/protocols/gg/gg.c:2151
 msgid "Polish popular IM"
 msgstr "瘜Z剖誨甇∟單閮蝔撘"
 
-#: ../libpurple/protocols/gg/gg.c:2183
+#: ../libpurple/protocols/gg/gg.c:2205
 msgid "Gadu-Gadu User"
 msgstr "Gadu-Gadu 雿輻刻"
 
 #: ../libpurple/protocols/irc/cmds.c:43
-#: ../libpurple/protocols/silc/silc.c:1575
+#: ../libpurple/protocols/silc/silc.c:1577
 #, c-format
 msgid "Unknown command: %s"
 msgstr "芰亦隞歹%s"
 
 #: ../libpurple/protocols/irc/cmds.c:503
-#: ../libpurple/protocols/jabber/chat.c:593
-#: ../libpurple/protocols/silc/silc.c:1283
+#: ../libpurple/protocols/jabber/chat.c:591
+#: ../libpurple/protocols/silc/silc.c:1285
 #, c-format
 msgid "current topic is: %s"
 msgstr "曉函銝駁綽%s"
 
 #: ../libpurple/protocols/irc/cmds.c:507
-#: ../libpurple/protocols/jabber/chat.c:597
-#: ../libpurple/protocols/silc/silc.c:1287
+#: ../libpurple/protocols/jabber/chat.c:595
+#: ../libpurple/protocols/silc/silc.c:1289
 msgid "No topic is set"
 msgstr "瘝閮剖銝駁"
 
@@ -3558,7 +3536,7 @@
 msgstr "%s 舀亥"
 
 #: ../libpurple/protocols/irc/irc.c:127 ../libpurple/protocols/irc/irc.c:165
-#: ../libpurple/protocols/irc/irc.c:598 ../libpurple/protocols/irc/irc.c:623
+#: ../libpurple/protocols/irc/irc.c:614 ../libpurple/protocols/irc/irc.c:639
 msgid "Server has disconnected"
 msgstr "隡箸典歇甇a蝺"
 
@@ -3581,34 +3559,34 @@
 
 #. connect to the server
 #: ../libpurple/protocols/irc/irc.c:319
-#: ../libpurple/protocols/jabber/jabber.c:1038
+#: ../libpurple/protocols/jabber/jabber.c:1044
 #: ../libpurple/protocols/msn/session.c:344
-#: ../libpurple/protocols/novell/novell.c:2183
-#: ../libpurple/protocols/oscar/oscar.c:1269
+#: ../libpurple/protocols/novell/novell.c:2182
+#: ../libpurple/protocols/oscar/oscar.c:1270
 #: ../libpurple/protocols/qq/qq.c:136
-#: ../libpurple/protocols/sametime/sametime.c:3721
-#: ../libpurple/protocols/simple/simple.c:1669
-#: ../libpurple/protocols/yahoo/yahoo.c:2743
-#: ../libpurple/protocols/zephyr/zephyr.c:1620 ../pidgin/gtkstatusbox.c:609
+#: ../libpurple/protocols/sametime/sametime.c:3723
+#: ../libpurple/protocols/simple/simple.c:1671
+#: ../libpurple/protocols/yahoo/yahoo.c:2745
+#: ../libpurple/protocols/zephyr/zephyr.c:1621 ../pidgin/gtkstatusbox.c:659
 msgid "Connecting"
 msgstr "蝺銝"
 
 # XXX 怨陌
 #: ../libpurple/protocols/irc/irc.c:327
-#: ../libpurple/protocols/jabber/jabber.c:597
-#: ../libpurple/protocols/jabber/jabber.c:942
+#: ../libpurple/protocols/jabber/jabber.c:599
+#: ../libpurple/protocols/jabber/jabber.c:946
 msgid "SSL support unavailable"
 msgstr "瘝 SSL 舀"
 
 #: ../libpurple/protocols/irc/irc.c:338
 #: ../libpurple/protocols/simple/simple.c:464
-#: ../libpurple/protocols/simple/simple.c:1584
+#: ../libpurple/protocols/simple/simple.c:1586
 msgid "Couldn't create socket"
 msgstr "⊥撱箇 Socket"
 
-#: ../libpurple/protocols/irc/irc.c:402
+#: ../libpurple/protocols/irc/irc.c:416
 #: ../libpurple/protocols/jabber/jabber.c:466
-#: ../libpurple/protocols/oscar/oscar.c:1265
+#: ../libpurple/protocols/oscar/oscar.c:1266
 msgid "Couldn't connect to host"
 msgstr "⊥唬撩"
 
@@ -3616,30 +3594,30 @@
 # NOTE Jabber 摰 Stream Error 銝蝔殷 <remote-connection-failed/>
 # NOTE 閬 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
 # XXX 甇胯⊥蝺唾霅蝡航皞嚗銝胯蝺憭望嚗閬銝蝡嚗
-#: ../libpurple/protocols/irc/irc.c:424
+#: ../libpurple/protocols/irc/irc.c:438
 #: ../libpurple/protocols/jabber/jabber.c:495
 msgid "Connection Failed"
 msgstr "⊥蝺唾霅蝡航皞"
 
-#: ../libpurple/protocols/irc/irc.c:427
+#: ../libpurple/protocols/irc/irc.c:441
 #: ../libpurple/protocols/jabber/jabber.c:498
 msgid "SSL Handshake Failed"
 msgstr "SSL 鈭方憭望"
 
 # NOTE OSCAR 航炊閮舀臬 http://aimdoc.sourceforge.net/OSCARdoc/嚗雿刻府蝡敺暹梯正
-#: ../libpurple/protocols/irc/irc.c:595 ../libpurple/protocols/irc/irc.c:620
+#: ../libpurple/protocols/irc/irc.c:611 ../libpurple/protocols/irc/irc.c:636
 msgid "Read error"
 msgstr "霈航炊"
 
-#: ../libpurple/protocols/irc/irc.c:759
-#: ../libpurple/protocols/silc/chat.c:1421
+#: ../libpurple/protocols/irc/irc.c:775
+#: ../libpurple/protocols/silc/chat.c:1426
 #: ../libpurple/protocols/yahoo/yahoochat.c:1438
 msgid "Users"
 msgstr "雿輻刻"
 
-#: ../libpurple/protocols/irc/irc.c:762
-#: ../libpurple/protocols/sametime/sametime.c:3375
-#: ../libpurple/protocols/silc/chat.c:1424
+#: ../libpurple/protocols/irc/irc.c:778
+#: ../libpurple/protocols/sametime/sametime.c:3374
+#: ../libpurple/protocols/silc/chat.c:1429
 #: ../libpurple/protocols/silc/ops.c:1382
 #: ../libpurple/protocols/yahoo/yahoochat.c:1447
 msgid "Topic"
@@ -3653,56 +3631,55 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../libpurple/protocols/irc/irc.c:893
+#: ../libpurple/protocols/irc/irc.c:915
 msgid "IRC Protocol Plugin"
 msgstr "IRC 摰璅∠"
 
 #. *  summary
-#: ../libpurple/protocols/irc/irc.c:894
+#: ../libpurple/protocols/irc/irc.c:916
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "頛憟賜 IRC 摰璅∠"
 
 #. host to connect to
-#: ../libpurple/protocols/irc/irc.c:913 ../libpurple/protocols/irc/msgs.c:312
-#: ../libpurple/protocols/jabber/jabber.c:1994
-#: ../libpurple/protocols/msn/msn.c:2099
-#: ../libpurple/protocols/oscar/oscar.c:6621
-#: ../libpurple/protocols/qq/qq.c:746
-#: ../libpurple/protocols/sametime/sametime.c:5706
+#: ../libpurple/protocols/irc/irc.c:941 ../libpurple/protocols/irc/msgs.c:323
+#: ../libpurple/protocols/msn/msn.c:2130
+#: ../libpurple/protocols/oscar/oscar.c:6581
+#: ../libpurple/protocols/qq/qq.c:756
+#: ../libpurple/protocols/sametime/sametime.c:5727
 #: ../libpurple/protocols/silc/ops.c:1244
 #: ../libpurple/protocols/silc/ops.c:1347
-#: ../libpurple/protocols/simple/simple.c:1836
+#: ../libpurple/protocols/simple/simple.c:1850
 #: ../libpurple/protocols/toc/toc.c:2327
 msgid "Server"
 msgstr "隡箸"
 
 #. port to connect to
-#: ../libpurple/protocols/irc/irc.c:916 ../libpurple/protocols/msn/msn.c:2104
-#: ../libpurple/protocols/oscar/oscar.c:6624
-#: ../libpurple/protocols/qq/qq.c:749
-#: ../libpurple/protocols/sametime/sametime.c:5711
-#: ../libpurple/protocols/silc/silc.c:1850
+#: ../libpurple/protocols/irc/irc.c:944 ../libpurple/protocols/msn/msn.c:2135
+#: ../libpurple/protocols/oscar/oscar.c:6584
+#: ../libpurple/protocols/qq/qq.c:759
+#: ../libpurple/protocols/sametime/sametime.c:5732
+#: ../libpurple/protocols/silc/silc.c:1870
 #: ../libpurple/protocols/toc/toc.c:2331
 msgid "Port"
 msgstr "閮"
 
-#: ../libpurple/protocols/irc/irc.c:919
+#: ../libpurple/protocols/irc/irc.c:947
 msgid "Encodings"
 msgstr "蝺函Ⅳ"
 
-#: ../libpurple/protocols/irc/irc.c:922 ../libpurple/protocols/irc/msgs.c:305
-#: ../libpurple/protocols/jabber/jabber.c:797
-#: ../libpurple/protocols/silc/buddy.c:1532
+#: ../libpurple/protocols/irc/irc.c:950 ../libpurple/protocols/irc/msgs.c:316
+#: ../libpurple/protocols/jabber/jabber.c:799
+#: ../libpurple/protocols/silc/buddy.c:1539
 #: ../libpurple/protocols/silc/ops.c:1191
 #: ../libpurple/protocols/silc/ops.c:1194
 #: ../libpurple/protocols/silc/ops.c:1340
 #: ../libpurple/protocols/silc/ops.c:1343
-#: ../libpurple/protocols/silc/silc.c:923
+#: ../libpurple/protocols/silc/silc.c:924
 msgid "Username"
 msgstr "雿輻刻"
 
-#: ../libpurple/protocols/irc/irc.c:925 ../libpurple/protocols/irc/msgs.c:306
-#: ../libpurple/protocols/silc/silc.c:927
+#: ../libpurple/protocols/irc/irc.c:953 ../libpurple/protocols/irc/msgs.c:317
+#: ../libpurple/protocols/silc/silc.c:928
 msgid "Real name"
 msgstr "憪"
 
@@ -3710,232 +3687,232 @@
 #. option = purple_account_option_string_new(_("Quit message"), "quitmsg", IRC_DEFAULT_QUIT);
 #. prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
 #.
-#: ../libpurple/protocols/irc/irc.c:933
+#: ../libpurple/protocols/irc/irc.c:961
 msgid "Use SSL"
 msgstr "雿輻 SSL"
 
-#: ../libpurple/protocols/irc/msgs.c:180
+#: ../libpurple/protocols/irc/msgs.c:187
 msgid "Bad mode"
 msgstr "璅∪⊥"
 
 # FIXME 舀怨陌
-#: ../libpurple/protocols/irc/msgs.c:191
+#: ../libpurple/protocols/irc/msgs.c:198
 #, c-format
 msgid "You are banned from %s."
 msgstr "刻◤蝳 %s 鈭"
 
 # FIXME 舀怨陌
 # NOTE 霅舀游 by Paladin
-#: ../libpurple/protocols/irc/msgs.c:192
+#: ../libpurple/protocols/irc/msgs.c:199
 msgid "Banned"
 msgstr "鋡怎甇"
 
-#: ../libpurple/protocols/irc/msgs.c:209
+#: ../libpurple/protocols/irc/msgs.c:216
 #, c-format
 msgid "Cannot ban %s: banlist is full"
 msgstr "⊥蝳甇 %s嚗蝳甇X桀歇皛"
 
-#: ../libpurple/protocols/irc/msgs.c:290
+#: ../libpurple/protocols/irc/msgs.c:301
 msgid " <i>(ircop)</i>"
 msgstr " <i>(IRC 雿)</i>"
 
-#: ../libpurple/protocols/irc/msgs.c:291
+#: ../libpurple/protocols/irc/msgs.c:302
 msgid " <i>(identified)</i>"
 msgstr " <i>(撌脤霅)</i>"
 
-#: ../libpurple/protocols/irc/msgs.c:292
-#: ../libpurple/protocols/oscar/oscar.c:3702
+#: ../libpurple/protocols/irc/msgs.c:303
+#: ../libpurple/protocols/oscar/oscar.c:3687
 #: ../libpurple/protocols/silc/ops.c:1414
 msgid "Nick"
 msgstr "梁迂"
 
-#: ../libpurple/protocols/irc/msgs.c:318
+#: ../libpurple/protocols/irc/msgs.c:329
 #: ../libpurple/protocols/silc/ops.c:1272
 msgid "Currently on"
 msgstr "券駁"
 
-#: ../libpurple/protocols/irc/msgs.c:323
+#: ../libpurple/protocols/irc/msgs.c:334
 msgid "Idle for"
 msgstr "蝵格"
 
-#: ../libpurple/protocols/irc/msgs.c:326
+#: ../libpurple/protocols/irc/msgs.c:337
 msgid "Online since"
 msgstr "銝蝺"
 
 #  XXX 嗅祕霅臬銝憭芸嚗臭誑寥脖暺
-#: ../libpurple/protocols/irc/msgs.c:330
+#: ../libpurple/protocols/irc/msgs.c:341
 msgid "<b>Defining adjective:</b>"
 msgstr "<b>餈堆</b>"
 
-#: ../libpurple/protocols/irc/msgs.c:330
+#: ../libpurple/protocols/irc/msgs.c:341
 msgid "Glorious"
 msgstr "摰蟡"
 
 # NOTE 啁IRC prpl韏瑕銝憿舐內嚗渲陌靽格嫘瘝憿
-#: ../libpurple/protocols/irc/msgs.c:406
+#: ../libpurple/protocols/irc/msgs.c:417
 #, c-format
 msgid "%s has changed the topic to: %s"
 msgstr "%s 憭拐蜓憿靽格寧綽%s"
 
 # NOTE 啁IRC prpl韏瑕銝憿舐內嚗渲陌靽格嫘瘝憿
-#: ../libpurple/protocols/irc/msgs.c:408
+#: ../libpurple/protocols/irc/msgs.c:419
 #, c-format
 msgid "%s has cleared the topic."
 msgstr "%s 撌脩銝駁皜扎"
 
-#: ../libpurple/protocols/irc/msgs.c:416
+#: ../libpurple/protocols/irc/msgs.c:427
 #, c-format
 msgid "The topic for %s is: %s"
 msgstr "%s 銝駁綽%s"
 
-#: ../libpurple/protocols/irc/msgs.c:434
+#: ../libpurple/protocols/irc/msgs.c:445
 #, c-format
 msgid "Unknown message '%s'"
 msgstr "銝閮胯%s"
 
-#: ../libpurple/protocols/irc/msgs.c:435
+#: ../libpurple/protocols/irc/msgs.c:446
 msgid "Unknown message"
 msgstr "銝閮"
 
-#: ../libpurple/protocols/irc/msgs.c:435
+#: ../libpurple/protocols/irc/msgs.c:446
 msgid "The IRC server received a message it did not understand."
 msgstr "IRC 隡箸冽嗅唬摰銝賜閮胯"
 
-#: ../libpurple/protocols/irc/msgs.c:456
+#: ../libpurple/protocols/irc/msgs.c:467
 #, c-format
 msgid "Users on %s: %s"
 msgstr " %s 抒雿輻刻嚗%s"
 
 #  XXX
-#: ../libpurple/protocols/irc/msgs.c:553
+#: ../libpurple/protocols/irc/msgs.c:572
 msgid "Time Response"
 msgstr ""
 
 #  XXX
-#: ../libpurple/protocols/irc/msgs.c:554
+#: ../libpurple/protocols/irc/msgs.c:573
 msgid "The IRC server's local time is:"
 msgstr "IRC 隡箸函垢銋綽"
 
-#: ../libpurple/protocols/irc/msgs.c:565
+#: ../libpurple/protocols/irc/msgs.c:584
 msgid "No such channel"
 msgstr "瘝駁"
 
 #. does this happen?
-#: ../libpurple/protocols/irc/msgs.c:576
+#: ../libpurple/protocols/irc/msgs.c:595
 msgid "no such channel"
 msgstr "瘝駁"
 
-#: ../libpurple/protocols/irc/msgs.c:579
+#: ../libpurple/protocols/irc/msgs.c:598
 msgid "User is not logged in"
 msgstr "雿輻刻瘝餃"
 
-#: ../libpurple/protocols/irc/msgs.c:584
+#: ../libpurple/protocols/irc/msgs.c:603
 msgid "No such nick or channel"
 msgstr "瘝梁迂駁"
 
-#: ../libpurple/protocols/irc/msgs.c:604
+#: ../libpurple/protocols/irc/msgs.c:623
 msgid "Could not send"
 msgstr "⊥"
 
-#: ../libpurple/protocols/irc/msgs.c:660
+#: ../libpurple/protocols/irc/msgs.c:679
 #, c-format
 msgid "Joining %s requires an invitation."
 msgstr "芣鋡恍隢臬 %s"
 
-#: ../libpurple/protocols/irc/msgs.c:661
+#: ../libpurple/protocols/irc/msgs.c:680
 msgid "Invitation only"
 msgstr "芷鋡恍隢"
 
-#: ../libpurple/protocols/irc/msgs.c:773
+#: ../libpurple/protocols/irc/msgs.c:792
 #, c-format
 msgid "You have been kicked by %s: (%s)"
 msgstr "刻◤ %s 頦W綽(%s)"
 
 #. Remove user from channel
-#: ../libpurple/protocols/irc/msgs.c:778 ../libpurple/protocols/silc/ops.c:720
+#: ../libpurple/protocols/irc/msgs.c:797 ../libpurple/protocols/silc/ops.c:720
 #, c-format
 msgid "Kicked by %s (%s)"
 msgstr "鋡 %s 頦W (%s)"
 
-#: ../libpurple/protocols/irc/msgs.c:801
+#: ../libpurple/protocols/irc/msgs.c:820
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr "璅∪ (%s %s) 鋡 %s 閮剖"
 
-#: ../libpurple/protocols/irc/msgs.c:886 ../libpurple/protocols/irc/msgs.c:887
+#: ../libpurple/protocols/irc/msgs.c:905 ../libpurple/protocols/irc/msgs.c:906
 msgid "Invalid nickname"
-msgstr "⊥梁迂"
-
-#: ../libpurple/protocols/irc/msgs.c:888
+msgstr "梁迂⊥"
+
+#: ../libpurple/protocols/irc/msgs.c:907
 msgid ""
 "Your selected nickname was rejected by the server.  It probably contains "
 "invalid characters."
 msgstr "隡箸冽蝯鈭冽摰梁迂嚗梁迂銝剖之璁急⊥摮"
 
-#: ../libpurple/protocols/irc/msgs.c:893
+#: ../libpurple/protocols/irc/msgs.c:912
 msgid ""
 "Your selected account name was rejected by the server.  It probably contains "
 "invalid characters."
 msgstr "隡箸冽蝯鈭冽摰撣唾蝔梧蝔曹葉憭扳急⊥摮"
 
-#: ../libpurple/protocols/irc/msgs.c:932
+#: ../libpurple/protocols/irc/msgs.c:951
 msgid "Cannot change nick"
 msgstr "⊥湔寞梁迂"
 
-#: ../libpurple/protocols/irc/msgs.c:932
+#: ../libpurple/protocols/irc/msgs.c:951
 msgid "Could not change nick"
 msgstr "⊥湔寞梁迂"
 
-#: ../libpurple/protocols/irc/msgs.c:953
+#: ../libpurple/protocols/irc/msgs.c:972
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr "券a鈭駁%s%s"
 
-#: ../libpurple/protocols/irc/msgs.c:995
+#: ../libpurple/protocols/irc/msgs.c:1014
 msgid "Error: invalid PONG from server"
 msgstr "航炊嚗靘芯撩函 PONG ⊥"
 
-#: ../libpurple/protocols/irc/msgs.c:997
+#: ../libpurple/protocols/irc/msgs.c:1016
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr "PING 蝑撱園莎%lu蝘"
 
-#: ../libpurple/protocols/irc/msgs.c:1078
-#, c-format
-msgid "Cannot join %s:"
-msgstr "⊥ %s嚗"
-
-#: ../libpurple/protocols/irc/msgs.c:1079
+#: ../libpurple/protocols/irc/msgs.c:1097
+#, c-format
+msgid "Cannot join %s: Registration is required."
+msgstr "⊥ %s嚗敹閮餃"
+
+#: ../libpurple/protocols/irc/msgs.c:1098
 #: ../libpurple/protocols/silc/ops.c:1128
 msgid "Cannot join channel"
 msgstr "⊥仿駁"
 
 #  NOTE急⊥雿輻具閰脫急銝摮具
-#: ../libpurple/protocols/irc/msgs.c:1113
+#: ../libpurple/protocols/irc/msgs.c:1132
 msgid "Nick or channel is temporarily unavailable."
 msgstr "急⊥雿輻刻府梁迂駁"
 
-#: ../libpurple/protocols/irc/msgs.c:1125
+#: ../libpurple/protocols/irc/msgs.c:1144
 #, c-format
 msgid "Wallops from %s"
 msgstr "靘 %s  Wallops"
 
-#: ../libpurple/protocols/irc/parse.c:118
+#: ../libpurple/protocols/irc/parse.c:122
 msgid "action &lt;action to perform&gt;:  Perform an action."
 msgstr "action &lt;閬瑁雿&gt;嚗瑁銝雿"
 
-#: ../libpurple/protocols/irc/parse.c:119
+#: ../libpurple/protocols/irc/parse.c:123
 msgid ""
 "away [message]:  Set an away message, or use no message to return from being "
 "away."
 msgstr "away [閮珠嚗閮剖銝a閮荔券a銝摰隞颱閮胯"
 
-#: ../libpurple/protocols/irc/parse.c:120
+#: ../libpurple/protocols/irc/parse.c:124
 msgid "chanserv: Send a command to chanserv"
 msgstr "chanserv嚗箔隞文 chanserv"
 
 # XXX 怨陌
-#: ../libpurple/protocols/irc/parse.c:121
+#: ../libpurple/protocols/irc/parse.c:125
 msgid ""
 "deop &lt;nick1&gt; [nick2] ...:  Remove channel operator status from "
 "someone. You must be a channel operator to do this."
@@ -3943,7 +3920,7 @@
 "deop &lt;梁迂1&gt; [梁迂2] ...嚗蝘駁斗鈭箇駁蝞∠甈典瑟"
 "駁蝞∠甈賢瑁雿"
 
-#: ../libpurple/protocols/irc/parse.c:122
+#: ../libpurple/protocols/irc/parse.c:126
 msgid ""
 "devoice &lt;nick1&gt; [nick2] ...:  Remove channel voice status from "
 "someone, preventing them from speaking if the channel is moderated (+m). You "
@@ -3952,7 +3929,7 @@
 "devoice &lt;梁迂1&gt; [梁迂2] ...嚗蝘駁斗鈭箇潸甈蝳甇X鈭鈭箏券駁"
 "銝剔潸”銝嗥閮隢典瑟駁蝞∠甈賢瑁雿"
 
-#: ../libpurple/protocols/irc/parse.c:123
+#: ../libpurple/protocols/irc/parse.c:127
 msgid ""
 "invite &lt;nick&gt; [room]:  Invite someone to join you in the specified "
 "channel, or the current channel."
@@ -3960,23 +3937,23 @@
 "invite &lt梁迂&gt; [憭拙恕]嚗隢鈭箔交冽摰駁嚗舐桀冽函"
 "駁"
 
-#: ../libpurple/protocols/irc/parse.c:124
+#: ../libpurple/protocols/irc/parse.c:128
 msgid ""
 "j &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
 "channels, optionally providing a channel key for each if needed."
 msgstr ""
-"j &lt;憭拙恕1&gt;[,憭拙恕2][,...] [撖1[,撖2][,...]]嚗隞交摰撖堆憒蝯"
-"鈭銝行閬嚗交摰憭拙恕"
-
-#: ../libpurple/protocols/irc/parse.c:125
+"j &lt;憭拙恕1&gt;[,憭拙恕2][,...] [撖蝣澆1[,撖蝣澆2][,...]]嚗隞交摰撖蝣澆"
+"嚗憒蝯虫銝行閬嚗交摰憭拙恕"
+
+#: ../libpurple/protocols/irc/parse.c:129
 msgid ""
 "join &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
 "channels, optionally providing a channel key for each if needed."
 msgstr ""
-"join &lt;憭拙恕1&gt;[,憭拙恕2][,...] [撖1[,撖2][,...]]嚗隞交摰撖堆憒"
-"蝯虫銝行閬嚗交摰憭拙恕"
-
-#: ../libpurple/protocols/irc/parse.c:126
+"join &lt;憭拙恕1&gt;[,憭拙恕2][,...] [撖蝣澆1[,撖蝣澆2][,...]]嚗隞交摰撖蝣"
+"嚗憒蝯虫銝行閬嚗交摰憭拙恕"
+
+#: ../libpurple/protocols/irc/parse.c:130
 msgid ""
 "kick &lt;nick&gt; [message]:  Remove someone from a channel. You must be a "
 "channel operator to do this."
@@ -3984,7 +3961,7 @@
 "kick &lt;梁迂&gt; [閮珠嚗撠雿輻刻頦W粹駁典瑟駁蝞∠甈"
 "賢瑁雿"
 
-#: ../libpurple/protocols/irc/parse.c:127
+#: ../libpurple/protocols/irc/parse.c:131
 msgid ""
 "list:  Display a list of chat rooms on the network. <i>Warning, some servers "
 "may disconnect you upon doing this.</i>"
@@ -3992,22 +3969,22 @@
 "list嚗箇桀函雯蝯∩憭拙恕皜柴<i>隢瘜冽嚗鈭隡箸冽冽典瑁鈭雿"
 "銋敺嚗撘瑁銝剜迫函蝺</i>"
 
-#: ../libpurple/protocols/irc/parse.c:128
+#: ../libpurple/protocols/irc/parse.c:132
 msgid "me &lt;action to perform&gt;:  Perform an action."
 msgstr "me &lt;閬瑁雿&gt;嚗瑁銝雿"
 
-#: ../libpurple/protocols/irc/parse.c:129
+#: ../libpurple/protocols/irc/parse.c:133
 msgid "memoserv: Send a command to memoserv"
 msgstr "memoserv嚗箔隞文 memoserv"
 
-#: ../libpurple/protocols/irc/parse.c:130
+#: ../libpurple/protocols/irc/parse.c:134
 msgid ""
 "mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;nick|channel&gt;:  Set or unset a channel "
 "or user mode."
 msgstr ""
 "mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;梁迂|駁&gt;嚗閮剖閫日駁曹蝙刻璅∪"
 
-#: ../libpurple/protocols/irc/parse.c:131
+#: ../libpurple/protocols/irc/parse.c:135
 msgid ""
 "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
 "opposed to a channel)."
@@ -4015,20 +3992,20 @@
 "msg &lt;梁迂&gt; &lt;閮&gt;嚗箔蝘鈭箄舐策摰雿輻刻嚗踹喲啣祉"
 "駁銝哨"
 
-#: ../libpurple/protocols/irc/parse.c:132
+#: ../libpurple/protocols/irc/parse.c:136
 msgid "names [channel]:  List the users currently in a channel."
 msgstr "names [駁]嚗箇桀券駁銝剔雿輻刻皜柴"
 
-#: ../libpurple/protocols/irc/parse.c:133
-#: ../libpurple/protocols/jabber/jabber.c:1798
+#: ../libpurple/protocols/irc/parse.c:137
+#: ../libpurple/protocols/jabber/jabber.c:1813
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr "nick &lt;唳梁迂&gt;嚗寡函梁迂"
 
-#: ../libpurple/protocols/irc/parse.c:134
+#: ../libpurple/protocols/irc/parse.c:138
 msgid "nickserv: Send a command to nickserv"
 msgstr "nickserv嚗箔隞文 nickserv"
 
-#: ../libpurple/protocols/irc/parse.c:135
+#: ../libpurple/protocols/irc/parse.c:139
 msgid ""
 "op &lt;nick1&gt; [nick2] ...:  Grant channel operator status to someone. You "
 "must be a channel operator to do this."
@@ -4036,7 +4013,7 @@
 "op &lt;梁迂&gt; [梁迂] ...嚗鞈西雿輻刻駁蝞∠甈典瑟"
 "蝞∠甈賢瑁雿"
 
-#: ../libpurple/protocols/irc/parse.c:136
+#: ../libpurple/protocols/irc/parse.c:140
 msgid ""
 "operwall &lt;message&gt;:  If you don't know what this is, you probably "
 "can't use it."
@@ -4044,11 +4021,11 @@
 "operwall &lt;閮&gt;嚗憒其仿臬凳隞暻潛函嚗典航賣颲行雿輻券"
 "隞扎"
 
-#: ../libpurple/protocols/irc/parse.c:137
+#: ../libpurple/protocols/irc/parse.c:141
 msgid "operserv: Send a command to operserv"
 msgstr "operserv嚗箔隞文 operserv"
 
-#: ../libpurple/protocols/irc/parse.c:138
+#: ../libpurple/protocols/irc/parse.c:142
 msgid ""
 "part [room] [message]:  Leave the current channel, or a specified channel, "
 "with an optional message."
@@ -4056,7 +4033,7 @@
 "part [駁] [閮珠嚗a桀駁摰駁摰駁臬摰箇閮"
 "胯"
 
-#: ../libpurple/protocols/irc/parse.c:139
+#: ../libpurple/protocols/irc/parse.c:143
 msgid ""
 "ping [nick]:  Asks how much lag a user (or the server if no user specified) "
 "has."
@@ -4064,7 +4041,7 @@
 "ping [梁迂]嚗亥岷銝雿輻刻蝬脰楝摨佗冽摰雿輻刻嚗亥岷隡箸"
 "摨佗"
 
-#: ../libpurple/protocols/irc/parse.c:140
+#: ../libpurple/protocols/irc/parse.c:144
 msgid ""
 "query &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
 "opposed to a channel)."
@@ -4072,16 +4049,16 @@
 "query &lt;梁迂&gt; &lt;閮&gt;嚗箔蝘鈭箄舐策摰雿輻刻嚗踹潮啣"
 "暸駁嚗"
 
-#: ../libpurple/protocols/irc/parse.c:141
+#: ../libpurple/protocols/irc/parse.c:145
 msgid "quit [message]:  Disconnect from the server, with an optional message."
 msgstr "quit [閮珠嚗芯撩券Y嚗銝阡箸摰閮胯"
 
 # XXX 怨陌
-#: ../libpurple/protocols/irc/parse.c:142
+#: ../libpurple/protocols/irc/parse.c:146
 msgid "quote [...]:  Send a raw command to the server."
 msgstr "quote [...]嚗箔 RAW 隞文唬撩具"
 
-#: ../libpurple/protocols/irc/parse.c:143
+#: ../libpurple/protocols/irc/parse.c:147
 msgid ""
 "remove &lt;nick&gt; [message]:  Remove someone from a room. You must be a "
 "channel operator to do this."
@@ -4089,23 +4066,23 @@
 "remove &lt;梁迂&gt; [閮珠嚗撠雿輻刻頦W粹駁典瑟駁蝞∠"
 "甈賢瑁雿"
 
-#: ../libpurple/protocols/irc/parse.c:144
+#: ../libpurple/protocols/irc/parse.c:148
 msgid "time: Displays the current local time at the IRC server."
 msgstr "time嚗憿舐內 IRC 隡箸冽典唬砍唳"
 
-#: ../libpurple/protocols/irc/parse.c:145
+#: ../libpurple/protocols/irc/parse.c:149
 msgid "topic [new topic]:  View or change the channel topic."
 msgstr "topic [唬蜓憿]嚗瑼Z靽格寥駁銝駁"
 
-#: ../libpurple/protocols/irc/parse.c:146
+#: ../libpurple/protocols/irc/parse.c:150
 msgid "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Set or unset a user mode."
 msgstr "umode &lt;+|-&gt;&lt;A-Za-z&gt;嚗閮剖閫支蝙刻璅∪"
 
-#: ../libpurple/protocols/irc/parse.c:147
+#: ../libpurple/protocols/irc/parse.c:151
 msgid "version [nick]: send CTCP VERSION request to a user"
-msgstr "version [梁迂]嚗 CTCP VERSION 閬瘙蝯虫蝙刻"
-
-#: ../libpurple/protocols/irc/parse.c:148
+msgstr "version [梁迂]嚗蝯虫蝙刻 CTCP VERSION 閬瘙"
+
+#: ../libpurple/protocols/irc/parse.c:152
 msgid ""
 "voice &lt;nick1&gt; [nick2] ...:  Grant channel voice status to someone. You "
 "must be a channel operator to do this."
@@ -4113,7 +4090,7 @@
 "voice &lt;梁迂&gt; [梁迂] ...嚗鞈西雿輻刻潸甈典瑟駁蝞∠"
 "甈賢瑁雿"
 
-#: ../libpurple/protocols/irc/parse.c:149
+#: ../libpurple/protocols/irc/parse.c:153
 msgid ""
 "wallops &lt;message&gt;:  If you don't know what this is, you probably can't "
 "use it."
@@ -4121,150 +4098,156 @@
 "wallops &lt;message&gt;嚗憒其仿臬凳隞暻潛函嚗典航賢停瘝颲行雿輻典"
 "鈭"
 
-#: ../libpurple/protocols/irc/parse.c:150
+#: ../libpurple/protocols/irc/parse.c:154
 msgid "whois [server] &lt;nick&gt;:  Get information on a user."
 msgstr "whois [隡箸典蝔崧 &lt;梁迂&gt;嚗敺雿輻刻鞈閮"
 
-#: ../libpurple/protocols/irc/parse.c:444
+#: ../libpurple/protocols/irc/parse.c:155
+msgid "whowas &lt;nick&gt;: Get information on a user that has logged off."
+msgstr "whowas &lt;梁迂&gt;嚗敺撌脤Y雿輻刻鞈閮"
+
+#: ../libpurple/protocols/irc/parse.c:449
 #, c-format
 msgid "Reply time from %s: %lu seconds"
 msgstr "%s 蝑嚗%lu 蝘"
 
-#: ../libpurple/protocols/irc/parse.c:445
+#: ../libpurple/protocols/irc/parse.c:450
 msgid "PONG"
 msgstr "PONG"
 
-#: ../libpurple/protocols/irc/parse.c:445
+#: ../libpurple/protocols/irc/parse.c:450
 msgid "CTCP PING reply"
 msgstr "CTCP PING 蝑"
 
-#: ../libpurple/protocols/irc/parse.c:556
-#: ../libpurple/protocols/irc/parse.c:560 ../libpurple/protocols/toc/toc.c:191
+#: ../libpurple/protocols/irc/parse.c:561
+#: ../libpurple/protocols/irc/parse.c:565 ../libpurple/protocols/toc/toc.c:191
 #: ../libpurple/protocols/toc/toc.c:694 ../libpurple/protocols/toc/toc.c:710
 #: ../libpurple/protocols/toc/toc.c:786
 msgid "Disconnected."
 msgstr "甇a蝺"
 
-#: ../libpurple/protocols/jabber/auth.c:51
+#: ../libpurple/protocols/jabber/auth.c:52
 msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
 msgstr "餃仿隡箸券閬雿輻 TLS/SSL嚗雿曆 TLS/SSL 舀氬"
 
-#: ../libpurple/protocols/jabber/auth.c:114
+#: ../libpurple/protocols/jabber/auth.c:115
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr "隡箸券閬蝬望芰撖銝脫脰隤霅"
 
-#: ../libpurple/protocols/jabber/auth.c:229
-msgid "Server couldn't authenticate you without a password"
-msgstr "瘝靘撖蝣潘隡箸函⊥箔脰隤霅"
-
-#: ../libpurple/protocols/jabber/auth.c:232
-#: ../libpurple/protocols/jabber/auth.c:233
-#: ../libpurple/protocols/jabber/auth.c:407
-#: ../libpurple/protocols/jabber/auth.c:408
-#: ../libpurple/protocols/jabber/auth.c:489
-#: ../libpurple/protocols/jabber/auth.c:490
+#: ../libpurple/protocols/jabber/auth.c:294
+#: ../libpurple/protocols/jabber/auth.c:483
+#, c-format
+msgid ""
+"%s requires plaintext authentication over an unencrypted connection.  Allow "
+"this and continue authentication?"
+msgstr "%s 閬蝬望芰撖銝脫脰隤霅閮曹蒂蝜潛脰隤霅嚗"
+
+#: ../libpurple/protocols/jabber/auth.c:296
+#: ../libpurple/protocols/jabber/auth.c:297
+#: ../libpurple/protocols/jabber/auth.c:485
+#: ../libpurple/protocols/jabber/auth.c:486
+#: ../libpurple/protocols/jabber/auth.c:570
+#: ../libpurple/protocols/jabber/auth.c:571
 msgid "Plaintext Authentication"
 msgstr "隤霅"
 
-#: ../libpurple/protocols/jabber/auth.c:234
-#: ../libpurple/protocols/jabber/auth.c:409
-#: ../libpurple/protocols/jabber/auth.c:491
+#: ../libpurple/protocols/jabber/auth.c:309
+#: ../libpurple/protocols/jabber/auth.c:498
+#: ../libpurple/protocols/jabber/auth.c:582
+msgid "Server does not use any supported authentication method"
+msgstr "隡箸其蒂銝靘隞颱銝蝔株◤舀渡隤霅孵"
+
+#. This should never happen!
+#: ../libpurple/protocols/jabber/auth.c:437
+#: ../libpurple/protocols/jabber/auth.c:533
+#: ../libpurple/protocols/jabber/auth.c:714
+#: ../libpurple/protocols/jabber/auth.c:848
+#: ../libpurple/protocols/jabber/auth.c:873
+#: ../libpurple/protocols/jabber/auth.c:892
+#: ../libpurple/protocols/jabber/jabber.c:115
+msgid "Invalid response from server."
+msgstr "隡箸券靘鈭⊥"
+
+#: ../libpurple/protocols/jabber/auth.c:572
 msgid ""
 "This server requires plaintext authentication over an unencrypted "
 "connection.  Allow this and continue authentication?"
 msgstr "隡箸券閬蝬望芰撖銝脫脰隤霅閮曹蒂蝜潛脰隤霅嚗"
 
-#: ../libpurple/protocols/jabber/auth.c:240
-#: ../libpurple/protocols/jabber/auth.c:417
-#: ../libpurple/protocols/jabber/auth.c:499
-msgid "Server does not use any supported authentication method"
-msgstr "隡箸其蒂銝靘隞颱銝蝔株◤舀渡隤霅孵"
-
-#. This should never happen!
-#: ../libpurple/protocols/jabber/auth.c:330
-#: ../libpurple/protocols/jabber/auth.c:452
-#: ../libpurple/protocols/jabber/auth.c:620
-#: ../libpurple/protocols/jabber/auth.c:754
-#: ../libpurple/protocols/jabber/auth.c:779
-#: ../libpurple/protocols/jabber/auth.c:798
-#: ../libpurple/protocols/jabber/jabber.c:115
-msgid "Invalid response from server."
-msgstr "⊥隡箸典"
-
 # XXX 憟賢鈭迎霅舀敺寥
-#: ../libpurple/protocols/jabber/auth.c:641
+#: ../libpurple/protocols/jabber/auth.c:735
 msgid "Invalid challenge from server"
 msgstr "隡箸券靘鈭⊥撽霅"
 
 # NOTE OSCAR 航炊閮舀臬 http://aimdoc.sourceforge.net/OSCARdoc/嚗雿刻府蝡敺暹梯正
-#: ../libpurple/protocols/jabber/auth.c:729
+#: ../libpurple/protocols/jabber/auth.c:823
 msgid "SASL error"
 msgstr "SASL 航炊"
 
 #: ../libpurple/protocols/jabber/buddy.c:271
-#: ../libpurple/protocols/jabber/buddy.c:790
-#: ../libpurple/protocols/sametime/sametime.c:4127
+#: ../libpurple/protocols/jabber/buddy.c:787
+#: ../libpurple/protocols/sametime/sametime.c:4128
 #: ../libpurple/protocols/silc/ops.c:1020
 msgid "Full Name"
 msgstr "典"
 
 #: ../libpurple/protocols/jabber/buddy.c:272
-#: ../libpurple/protocols/jabber/buddy.c:803
+#: ../libpurple/protocols/jabber/buddy.c:800
 #: ../libpurple/protocols/silc/ops.c:1032
 msgid "Family Name"
 msgstr "憪"
 
 #: ../libpurple/protocols/jabber/buddy.c:273
-#: ../libpurple/protocols/jabber/buddy.c:807
+#: ../libpurple/protocols/jabber/buddy.c:804
 msgid "Given Name"
 msgstr ""
 
 #: ../libpurple/protocols/jabber/buddy.c:275
-#: ../libpurple/protocols/jabber/jabber.c:857
+#: ../libpurple/protocols/jabber/jabber.c:859
 msgid "URL"
 msgstr "URL"
 
 #: ../libpurple/protocols/jabber/buddy.c:276
-#: ../libpurple/protocols/jabber/buddy.c:859
+#: ../libpurple/protocols/jabber/buddy.c:856
 msgid "Street Address"
 msgstr "銵啣"
 
 #: ../libpurple/protocols/jabber/buddy.c:277
-#: ../libpurple/protocols/jabber/buddy.c:855
+#: ../libpurple/protocols/jabber/buddy.c:852
 msgid "Extended Address"
 msgstr "啣(蝥)"
 
 #: ../libpurple/protocols/jabber/buddy.c:278
-#: ../libpurple/protocols/jabber/buddy.c:863
+#: ../libpurple/protocols/jabber/buddy.c:860
 msgid "Locality"
 msgstr "撣嚗"
 
 #: ../libpurple/protocols/jabber/buddy.c:279
-#: ../libpurple/protocols/jabber/buddy.c:867
+#: ../libpurple/protocols/jabber/buddy.c:864
 msgid "Region"
 msgstr "嚗撌"
 
 #: ../libpurple/protocols/jabber/buddy.c:280
-#: ../libpurple/protocols/jabber/buddy.c:871
+#: ../libpurple/protocols/jabber/buddy.c:868
 msgid "Postal Code"
 msgstr "菟"
 
 #: ../libpurple/protocols/jabber/buddy.c:281
-#: ../libpurple/protocols/jabber/buddy.c:876
-#: ../libpurple/protocols/silc/silc.c:933
+#: ../libpurple/protocols/jabber/buddy.c:873
+#: ../libpurple/protocols/silc/silc.c:934
 msgid "Country"
 msgstr "摰"
 
 #: ../libpurple/protocols/jabber/buddy.c:282
-#: ../libpurple/protocols/jabber/buddy.c:887
-#: ../libpurple/protocols/jabber/buddy.c:894
+#: ../libpurple/protocols/jabber/buddy.c:884
+#: ../libpurple/protocols/jabber/buddy.c:891
 msgid "Telephone"
 msgstr "餉店"
 
 #: ../libpurple/protocols/jabber/buddy.c:283
-#: ../libpurple/protocols/jabber/buddy.c:905
-#: ../libpurple/protocols/jabber/buddy.c:913
-#: ../libpurple/protocols/jabber/buddy.c:1571
+#: ../libpurple/protocols/jabber/buddy.c:902
+#: ../libpurple/protocols/jabber/buddy.c:910
+#: ../libpurple/protocols/jabber/buddy.c:1591
 #: ../libpurple/protocols/silc/ops.c:1075
 #: ../libpurple/protocols/silc/util.c:551
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1037
@@ -4272,53 +4255,53 @@
 msgstr "餃萎辣"
 
 #: ../libpurple/protocols/jabber/buddy.c:284
-#: ../libpurple/protocols/jabber/buddy.c:928
+#: ../libpurple/protocols/jabber/buddy.c:925
 msgid "Organization Name"
 msgstr "撅祆瑽"
 
 #: ../libpurple/protocols/jabber/buddy.c:285
-#: ../libpurple/protocols/jabber/buddy.c:932
+#: ../libpurple/protocols/jabber/buddy.c:929
 msgid "Organization Unit"
 msgstr "撅祇券"
 
 #: ../libpurple/protocols/jabber/buddy.c:287
-#: ../libpurple/protocols/jabber/buddy.c:941
+#: ../libpurple/protocols/jabber/buddy.c:938
 msgid "Role"
 msgstr "瑁痊"
 
 #: ../libpurple/protocols/jabber/buddy.c:288
-#: ../libpurple/protocols/jabber/buddy.c:824
-#: ../libpurple/protocols/msn/msn.c:1587
-#: ../libpurple/protocols/oscar/oscar.c:3751
+#: ../libpurple/protocols/jabber/buddy.c:821
+#: ../libpurple/protocols/msn/msn.c:1606
+#: ../libpurple/protocols/oscar/oscar.c:3736
 msgid "Birthday"
 msgstr ""
 
 #: ../libpurple/protocols/jabber/buddy.c:289
-#: ../libpurple/protocols/jabber/buddy.c:944
-#: ../libpurple/protocols/jabber/chat.c:777 ../pidgin/gtkblist.c:2989
+#: ../libpurple/protocols/jabber/buddy.c:941
+#: ../libpurple/protocols/jabber/chat.c:775 ../pidgin/gtkblist.c:3064
 #: ../pidgin/gtkprefs.c:680
 msgid "Description"
 msgstr "餈"
 
-#: ../libpurple/protocols/jabber/buddy.c:582
-#: ../libpurple/protocols/jabber/buddy.c:583
-msgid "Edit Jabber vCard"
-msgstr "蝺刻摩 Jabber vCard"
-
-#: ../libpurple/protocols/jabber/buddy.c:584
+#: ../libpurple/protocols/jabber/buddy.c:578
+#: ../libpurple/protocols/jabber/buddy.c:579
+msgid "Edit XMPP vCard"
+msgstr "蝺刻摩 XMPP vCard"
+
+#: ../libpurple/protocols/jabber/buddy.c:580
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable."
 msgstr "隞乩甈雿賣舫豢抒典芾頛詨交冽唾撓交冽喳‵亦閮臬喳胯"
 
 # NOTEClient舀閰脖蝙刻雿輻券銝冽嗥垢閮舐撘嚗靘嚗gaim嚗
-#: ../libpurple/protocols/jabber/buddy.c:654
-#: ../libpurple/protocols/jabber/buddy.c:695
+#: ../libpurple/protocols/jabber/buddy.c:651
+#: ../libpurple/protocols/jabber/buddy.c:692
 msgid "Client"
 msgstr "冽嗥垢"
 
-#: ../libpurple/protocols/jabber/buddy.c:658
-#: ../libpurple/protocols/jabber/buddy.c:699
+#: ../libpurple/protocols/jabber/buddy.c:655
+#: ../libpurple/protocols/jabber/buddy.c:696
 msgid "Operating System"
 msgstr "雿璆剔頂蝯"
 
@@ -4327,63 +4310,63 @@
 # NOTE Jabber 摰Resource銝閰撣訾銝蝔桐蝙刻芸摮銝莎
 # NOTE 其誑銵函內典唳孵餃乩敶V嚗桀撖血其蝵
 # NOTE 閬 http://www.jabber.org/user/userguide.html
-#: ../libpurple/protocols/jabber/buddy.c:668
-#: ../libpurple/protocols/jabber/jabber.c:1997
+#: ../libpurple/protocols/jabber/buddy.c:665
+#: ../libpurple/protocols/jabber/libxmpp.c:198
 msgid "Resource"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:670
-#: ../libpurple/protocols/jabber/jabber.c:1232
-#: ../libpurple/protocols/jabber/jabber.c:1242
-#: ../libpurple/protocols/jabber/jabber.c:1252
-#: ../libpurple/protocols/jabber/jabber.c:1262
-#: ../libpurple/protocols/jabber/jabber.c:1272
+#: ../libpurple/protocols/jabber/buddy.c:667
+#: ../libpurple/protocols/jabber/jabber.c:1245
+#: ../libpurple/protocols/jabber/jabber.c:1255
+#: ../libpurple/protocols/jabber/jabber.c:1265
+#: ../libpurple/protocols/jabber/jabber.c:1275
+#: ../libpurple/protocols/jabber/jabber.c:1285
 msgid "Priority"
 msgstr "芸甈∪"
 
 # NOTE: 瘜敺瑟霅胯蝚砌嚗祈剜霅胯嗡嚗交唾陌鈭鈭
 # NOTE: 函雯銝撟暸啁憭批飛撖怒望亙嚗曉剁銋頝祈剜PO瑼瘜詨
-#: ../libpurple/protocols/jabber/buddy.c:811
+#: ../libpurple/protocols/jabber/buddy.c:808
 #: ../libpurple/protocols/silc/ops.c:1028
 msgid "Middle Name"
 msgstr "望亙"
 
-#: ../libpurple/protocols/jabber/buddy.c:844
-#: ../libpurple/protocols/jabber/jabber.c:832
-#: ../libpurple/protocols/oscar/oscar.c:3790
-#: ../libpurple/protocols/oscar/oscar.c:3803
+#: ../libpurple/protocols/jabber/buddy.c:841
+#: ../libpurple/protocols/jabber/jabber.c:834
+#: ../libpurple/protocols/oscar/oscar.c:3775
+#: ../libpurple/protocols/oscar/oscar.c:3788
 #: ../libpurple/protocols/qq/buddy_info.c:56
 #: ../libpurple/protocols/silc/ops.c:1064
 msgid "Address"
 msgstr "啣"
 
-#: ../libpurple/protocols/jabber/buddy.c:851
+#: ../libpurple/protocols/jabber/buddy.c:848
 msgid "P.O. Box"
 msgstr "菜蹂縑蝞"
 
-#: ../libpurple/protocols/jabber/buddy.c:965
+#: ../libpurple/protocols/jabber/buddy.c:962
 msgid "Photo"
 msgstr "抒"
 
 # NOTE 閬 http://www.jabber.org/jeps/jep-0054.html
-#: ../libpurple/protocols/jabber/buddy.c:965
+#: ../libpurple/protocols/jabber/buddy.c:962
 msgid "Logo"
 msgstr "璅隤"
 
-#: ../libpurple/protocols/jabber/buddy.c:1351
+#: ../libpurple/protocols/jabber/buddy.c:1371
 msgid "Un-hide From"
 msgstr "曇澈蝯"
 
-#: ../libpurple/protocols/jabber/buddy.c:1355
+#: ../libpurple/protocols/jabber/buddy.c:1375
 msgid "Temporarily Hide From"
 msgstr "急梯澈"
 
 #. && NOT ME
-#: ../libpurple/protocols/jabber/buddy.c:1363
+#: ../libpurple/protocols/jabber/buddy.c:1383
 msgid "Cancel Presence Notification"
 msgstr "瘨銝蝺"
 
-#: ../libpurple/protocols/jabber/buddy.c:1370
+#: ../libpurple/protocols/jabber/buddy.c:1390
 msgid "(Re-)Request authorization"
 msgstr "閬瘙啗瘙隤霅"
 
@@ -4392,43 +4375,43 @@
 #. if(NOT ME)
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
-#: ../libpurple/protocols/jabber/buddy.c:1379
+#: ../libpurple/protocols/jabber/buddy.c:1399
 msgid "Unsubscribe"
 msgstr "敺憟賢桐葉蝘駁"
 
-#: ../libpurple/protocols/jabber/buddy.c:1412
-#: ../libpurple/protocols/jabber/jabber.c:1241
+#: ../libpurple/protocols/jabber/buddy.c:1432
+#: ../libpurple/protocols/jabber/jabber.c:1254
 msgid "Chatty"
 msgstr "唾憭"
 
-#: ../libpurple/protocols/jabber/buddy.c:1416 ../libpurple/status.c:159
+#: ../libpurple/protocols/jabber/buddy.c:1436 ../libpurple/status.c:158
 msgid "Extended Away"
 msgstr "瑟a"
 
-#: ../libpurple/protocols/jabber/buddy.c:1418
-#: ../libpurple/protocols/jabber/jabber.c:1271
-#: ../libpurple/protocols/oscar/oscar.c:708
-#: ../libpurple/protocols/oscar/oscar.c:5756
-#: ../libpurple/protocols/sametime/sametime.c:3298
+#: ../libpurple/protocols/jabber/buddy.c:1438
+#: ../libpurple/protocols/jabber/jabber.c:1284
+#: ../libpurple/protocols/oscar/oscar.c:709
+#: ../libpurple/protocols/oscar/oscar.c:5718
+#: ../libpurple/protocols/sametime/sametime.c:3297
 msgid "Do Not Disturb"
 msgstr "隢踵"
 
-#: ../libpurple/protocols/jabber/buddy.c:1563
+#: ../libpurple/protocols/jabber/buddy.c:1583
 msgid "JID"
 msgstr "JID"
 
-#: ../libpurple/protocols/jabber/buddy.c:1567
-#: ../libpurple/protocols/jabber/buddy.c:1746
-#: ../libpurple/protocols/oscar/oscar.c:3713
+#: ../libpurple/protocols/jabber/buddy.c:1587
+#: ../libpurple/protocols/jabber/buddy.c:1766
+#: ../libpurple/protocols/oscar/oscar.c:3698
 msgid "Last Name"
 msgstr "憪"
 
-#: ../libpurple/protocols/jabber/buddy.c:1599
+#: ../libpurple/protocols/jabber/buddy.c:1619
 msgid "The following are the results of your search"
 msgstr "隞乩箸撠蝯"
 
 #. current comment from Jabber User Directory users.jabber.org
-#: ../libpurple/protocols/jabber/buddy.c:1674
+#: ../libpurple/protocols/jabber/buddy.c:1694
 msgid ""
 "Find a contact by entering the search criteria in the given fields. Note: "
 "Each field supports wild card searches (%)"
@@ -4436,69 +4419,69 @@
 "隢券拍冽雿憛怠神撠璇隞塚隞乩噶撠單曄舐窗鈭箝瘜冽嚗甈雿舀港誑祉典"
 " (%) 撠"
 
-#: ../libpurple/protocols/jabber/buddy.c:1694
+#: ../libpurple/protocols/jabber/buddy.c:1714
 msgid "Directory Query Failed"
 msgstr "亥岷桅隡箸典仃"
 
-#: ../libpurple/protocols/jabber/buddy.c:1695
+#: ../libpurple/protocols/jabber/buddy.c:1715
 msgid "Could not query the directory server."
 msgstr "⊥亥岷桅隡箸"
 
 #. Try to translate the message (see static message
 #. list in jabber_user_dir_comments[])
-#: ../libpurple/protocols/jabber/buddy.c:1729
+#: ../libpurple/protocols/jabber/buddy.c:1749
 #, c-format
 msgid "Server Instructions: %s"
 msgstr "隡箸冽隞歹%s"
 
-#: ../libpurple/protocols/jabber/buddy.c:1736
-msgid "Fill in one or more fields to search for any matching Jabber users."
-msgstr "憛怠乩憭甈雿嚗隞交撠Jabber雿輻刻"
-
 #: ../libpurple/protocols/jabber/buddy.c:1756
+msgid "Fill in one or more fields to search for any matching XMPP users."
+msgstr "憛怠乩憭甈雿嚗隞交撠XMPP雿輻刻"
+
+#: ../libpurple/protocols/jabber/buddy.c:1776
 #: ../libpurple/protocols/novell/novell.c:1488
-#: ../libpurple/protocols/oscar/oscar.c:3716
-#: ../libpurple/protocols/oscar/oscar.c:3725
+#: ../libpurple/protocols/oscar/oscar.c:3701
+#: ../libpurple/protocols/oscar/oscar.c:3710
 msgid "E-Mail Address"
 msgstr "餃萎辣"
 
-#: ../libpurple/protocols/jabber/buddy.c:1765
-#: ../libpurple/protocols/jabber/buddy.c:1766
-msgid "Search for Jabber users"
-msgstr "撠Jabber雿輻刻"
+#: ../libpurple/protocols/jabber/buddy.c:1785
+#: ../libpurple/protocols/jabber/buddy.c:1786
+msgid "Search for XMPP users"
+msgstr "撠XMPP雿輻刻"
 
 #. "Search"
-#: ../libpurple/protocols/jabber/buddy.c:1767
+#: ../libpurple/protocols/jabber/buddy.c:1787
 #: ../libpurple/protocols/qq/group.c:123
-#: ../libpurple/protocols/qq/group_im.c:139
-#: ../libpurple/protocols/qq/sys_msg.c:162
-#: ../libpurple/protocols/qq/sys_msg.c:232
-#: ../libpurple/protocols/qq/sys_msg.c:250
-#: ../libpurple/protocols/sametime/sametime.c:5600
+#: ../libpurple/protocols/qq/group_im.c:145
+#: ../libpurple/protocols/qq/sys_msg.c:176
+#: ../libpurple/protocols/qq/sys_msg.c:253
+#: ../libpurple/protocols/qq/sys_msg.c:271
+#: ../libpurple/protocols/sametime/sametime.c:5611
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:473
 #: ../pidgin/plugins/gevolution/assoc-buddy.c:358
 msgid "Search"
 msgstr "撠"
 
 # NOTE OSCAR 航炊閮舀臬 http://aimdoc.sourceforge.net/OSCARdoc/嚗雿刻府蝡敺暹梯正
-#: ../libpurple/protocols/jabber/buddy.c:1780
+#: ../libpurple/protocols/jabber/buddy.c:1802
 msgid "Invalid Directory"
 msgstr "⊥桅"
 
-#: ../libpurple/protocols/jabber/buddy.c:1797
+#: ../libpurple/protocols/jabber/buddy.c:1819
 msgid "Enter a User Directory"
 msgstr "脣乩蝙刻桅"
 
-#: ../libpurple/protocols/jabber/buddy.c:1798
+#: ../libpurple/protocols/jabber/buddy.c:1820
 msgid "Select a user directory to search"
 msgstr "豢銝雿輻刻桅隞仿脰撠"
 
-#: ../libpurple/protocols/jabber/buddy.c:1801
+#: ../libpurple/protocols/jabber/buddy.c:1823
 msgid "Search Directory"
 msgstr "撠桅"
 
 #: ../libpurple/protocols/jabber/chat.c:41
-#: ../libpurple/protocols/oscar/oscar.c:5252
+#: ../libpurple/protocols/oscar/oscar.c:5224
 #: ../libpurple/protocols/yahoo/yahoochat.c:999
 msgid "_Room:"
 msgstr "憭拙恕(_R)嚗"
@@ -4511,88 +4494,88 @@
 msgid "_Handle:"
 msgstr "梁迂(_H)嚗"
 
-#: ../libpurple/protocols/jabber/chat.c:225
+#: ../libpurple/protocols/jabber/chat.c:223
 #, c-format
 msgid "%s is not a valid room name"
 msgstr "%s 銝臭憭拙恕蝔"
 
-#: ../libpurple/protocols/jabber/chat.c:226
+#: ../libpurple/protocols/jabber/chat.c:224
 msgid "Invalid Room Name"
 msgstr "憭拙恕蝔梁⊥"
 
-#: ../libpurple/protocols/jabber/chat.c:231
+#: ../libpurple/protocols/jabber/chat.c:229
 #, c-format
 msgid "%s is not a valid server name"
 msgstr "%s 銝臭隡箸典蝔"
 
-#: ../libpurple/protocols/jabber/chat.c:232
-#: ../libpurple/protocols/jabber/chat.c:233
+#: ../libpurple/protocols/jabber/chat.c:230
+#: ../libpurple/protocols/jabber/chat.c:231
 msgid "Invalid Server Name"
 msgstr "隡箸典蝔梁⊥"
 
 # NOTE Arto Alakulju 潛整room handle單航憭拙恕找蝙刻函梁迂撌
-#: ../libpurple/protocols/jabber/chat.c:237
+#: ../libpurple/protocols/jabber/chat.c:235
 #, c-format
 msgid "%s is not a valid room handle"
 msgstr "%s 銝臭梁迂"
 
 # NOTE Arto Alakulju 潛整room handle單航憭拙恕找蝙刻函梁迂撌
-#: ../libpurple/protocols/jabber/chat.c:238
-#: ../libpurple/protocols/jabber/chat.c:239
+#: ../libpurple/protocols/jabber/chat.c:236
+#: ../libpurple/protocols/jabber/chat.c:237
 msgid "Invalid Room Handle"
 msgstr "梁迂⊥"
 
-#: ../libpurple/protocols/jabber/chat.c:398
+#: ../libpurple/protocols/jabber/chat.c:396
 msgid "Configuration error"
 msgstr "閮剖航炊"
 
-#: ../libpurple/protocols/jabber/chat.c:407
-#: ../libpurple/protocols/jabber/chat.c:550
+#: ../libpurple/protocols/jabber/chat.c:405
+#: ../libpurple/protocols/jabber/chat.c:548
 msgid "Unable to configure"
 msgstr "⊥閮剖"
 
-#: ../libpurple/protocols/jabber/chat.c:422
+#: ../libpurple/protocols/jabber/chat.c:420
 msgid "Room Configuration Error"
 msgstr "憭拙恕閮剖航炊"
 
 # XXX 怨陌嚗霅舀憿嚗閬孵
-#: ../libpurple/protocols/jabber/chat.c:423
+#: ../libpurple/protocols/jabber/chat.c:421
 msgid "This room is not capable of being configured"
 msgstr "憭拙恕銝舀渲身摰"
 
-#: ../libpurple/protocols/jabber/chat.c:472
-#: ../libpurple/protocols/jabber/chat.c:541
+#: ../libpurple/protocols/jabber/chat.c:470
+#: ../libpurple/protocols/jabber/chat.c:539
 msgid "Registration error"
 msgstr "閮餃航炊"
 
 # XXX 怨陌
 # NOTE  faceprint (璅∠雿) 蝔梧MUC 臭蝔格啁憭拙恕摰嚗
 # NOTE 頛撘Group Chat游
-#: ../libpurple/protocols/jabber/chat.c:629
+#: ../libpurple/protocols/jabber/chat.c:627
 msgid "Nick changing not supported in non-MUC chatrooms"
 msgstr "券 MUC 璅∪憭拙恕找舀港耨寞梁迂"
 
-#: ../libpurple/protocols/jabber/chat.c:680
-#: ../libpurple/protocols/jabber/chat.c:691
+#: ../libpurple/protocols/jabber/chat.c:678
+#: ../libpurple/protocols/jabber/chat.c:689
 #: ../libpurple/protocols/silc/ops.c:1451
 msgid "Error retrieving room list"
 msgstr "霈憭拙恕皜格潛航炊"
 
-#: ../libpurple/protocols/jabber/chat.c:739
+#: ../libpurple/protocols/jabber/chat.c:737
 msgid "Invalid Server"
 msgstr "⊥隡箸典"
 
 # NOTE霅啣恕舀急霅胯Yahoo! 憟賢瘝箝Conference靘甇撘銝剛陌
 # XXX
-#: ../libpurple/protocols/jabber/chat.c:783
+#: ../libpurple/protocols/jabber/chat.c:781
 msgid "Enter a Conference Server"
 msgstr "餃交霅唬撩"
 
-#: ../libpurple/protocols/jabber/chat.c:784
+#: ../libpurple/protocols/jabber/chat.c:782
 msgid "Select a conference server to query"
 msgstr "豢亥岷霅唬撩"
 
-#: ../libpurple/protocols/jabber/chat.c:787
+#: ../libpurple/protocols/jabber/chat.c:785
 msgid "Find Rooms"
 msgstr "撠曇憭拙恕"
 
@@ -4616,174 +4599,178 @@
 msgid "Unable to create socket"
 msgstr "⊥撱箇 Socket"
 
-#: ../libpurple/protocols/jabber/jabber.c:567
-#: ../libpurple/protocols/jabber/jabber.c:910
-msgid "Invalid Jabber ID"
-msgstr "Jabber 撣唾⊥"
-
-#: ../libpurple/protocols/jabber/jabber.c:638
+#: ../libpurple/protocols/jabber/jabber.c:564
+#: ../libpurple/protocols/jabber/jabber.c:914
+msgid "Invalid XMPP ID"
+msgstr "XMPP 撣唾⊥"
+
+#: ../libpurple/protocols/jabber/jabber.c:569
+msgid "Invalid XMPP ID. Domain must be set."
+msgstr "XMPP 撣唾⊥嚗臬閮剖"
+
+#: ../libpurple/protocols/jabber/jabber.c:640
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "閮餃 %s@%s"
 
-#: ../libpurple/protocols/jabber/jabber.c:640
-#: ../libpurple/protocols/jabber/jabber.c:641
+#: ../libpurple/protocols/jabber/jabber.c:642
+#: ../libpurple/protocols/jabber/jabber.c:643
 msgid "Registration Successful"
 msgstr "閮餃"
 
-#: ../libpurple/protocols/jabber/jabber.c:647
-#: ../libpurple/protocols/jabber/jabber.c:1509
+#: ../libpurple/protocols/jabber/jabber.c:649
+#: ../libpurple/protocols/jabber/jabber.c:1524
 msgid "Unknown Error"
 msgstr "芰仿航炊"
 
-#: ../libpurple/protocols/jabber/jabber.c:649
-#: ../libpurple/protocols/jabber/jabber.c:650
+#: ../libpurple/protocols/jabber/jabber.c:651
+#: ../libpurple/protocols/jabber/jabber.c:652
 msgid "Registration Failed"
 msgstr "閮餃憭望"
 
-#: ../libpurple/protocols/jabber/jabber.c:765
-#: ../libpurple/protocols/jabber/jabber.c:766
+#: ../libpurple/protocols/jabber/jabber.c:767
+#: ../libpurple/protocols/jabber/jabber.c:768
 msgid "Already Registered"
 msgstr "撌脩閮餃"
 
-#: ../libpurple/protocols/jabber/jabber.c:842
-#: ../libpurple/protocols/oscar/oscar.c:3792
-#: ../libpurple/protocols/oscar/oscar.c:3805
+#: ../libpurple/protocols/jabber/jabber.c:844
+#: ../libpurple/protocols/oscar/oscar.c:3777
+#: ../libpurple/protocols/oscar/oscar.c:3790
 msgid "State"
 msgstr "嚗撌"
 
-#: ../libpurple/protocols/jabber/jabber.c:847
+#: ../libpurple/protocols/jabber/jabber.c:849
 msgid "Postal code"
 msgstr "菟"
 
-#: ../libpurple/protocols/jabber/jabber.c:852
+#: ../libpurple/protocols/jabber/jabber.c:854
 #: ../libpurple/protocols/silc/ops.c:1069
 #: ../libpurple/protocols/silc/silc.c:691
 #: ../libpurple/protocols/silc/util.c:553
 msgid "Phone"
 msgstr "餉店"
 
-#: ../libpurple/protocols/jabber/jabber.c:862
+#: ../libpurple/protocols/jabber/jabber.c:864
 msgid "Date"
 msgstr "交"
 
-#: ../libpurple/protocols/jabber/jabber.c:870
+#: ../libpurple/protocols/jabber/jabber.c:872
 msgid "Please fill out the information below to register your new account."
 msgstr "箸函啣董嗉酉嚗隢憛怠神銝鞈嚗"
 
-#: ../libpurple/protocols/jabber/jabber.c:873
-#: ../libpurple/protocols/jabber/jabber.c:874
-msgid "Register New Jabber Account"
-msgstr "閮餃啁 Jabber 撣單"
+#: ../libpurple/protocols/jabber/jabber.c:875
+#: ../libpurple/protocols/jabber/jabber.c:876
+msgid "Register New XMPP Account"
+msgstr "閮餃啁 XMPP 撣單"
 
 #. Register button
-#: ../libpurple/protocols/jabber/jabber.c:875 ../pidgin/gtkaccount.c:1478
+#: ../libpurple/protocols/jabber/jabber.c:877 ../pidgin/gtkaccount.c:1504
 msgid "Register"
 msgstr "閮餃"
 
-#: ../libpurple/protocols/jabber/jabber.c:1042
+#: ../libpurple/protocols/jabber/jabber.c:1048
 msgid "Initializing Stream"
 msgstr "銝脫憪銝"
 
-#: ../libpurple/protocols/jabber/jabber.c:1047
+#: ../libpurple/protocols/jabber/jabber.c:1053
 #: ../libpurple/protocols/msn/session.c:350
 msgid "Authenticating"
 msgstr "隤霅銝"
 
-#: ../libpurple/protocols/jabber/jabber.c:1056
+#: ../libpurple/protocols/jabber/jabber.c:1062
 msgid "Re-initializing Stream"
 msgstr "銝脫啣憪銝"
 
-#: ../libpurple/protocols/jabber/jabber.c:1115
-#: ../libpurple/protocols/jabber/jabber.c:1487
-#: ../libpurple/protocols/jabber/jabber.c:1528
-#: ../libpurple/protocols/jabber/jabber.c:1564
-#: ../libpurple/protocols/oscar/oscar.c:807
-#: ../libpurple/protocols/oscar/oscar.c:5540
+#: ../libpurple/protocols/jabber/jabber.c:1128
+#: ../libpurple/protocols/jabber/jabber.c:1502
+#: ../libpurple/protocols/jabber/jabber.c:1543
+#: ../libpurple/protocols/jabber/jabber.c:1579
+#: ../libpurple/protocols/oscar/oscar.c:808
+#: ../libpurple/protocols/oscar/oscar.c:5512
 msgid "Not Authorized"
 msgstr "芾霅"
 
-# NOTE 鈭憟芾隤嚗喋Subscription璇嚗閫 faceprint 靘
+# NOTE 鈭憟 Jabber 銵隤嚗喋Subscription璇嚗閫 faceprint 靘
 # NOTE LSchiere2 鋆憒銝嚗
 # NOTE in jabber each user has control over both who is in his/her buddy list and who has him/her in that other person's buddy list
 # NOTE ie each "subscription" represents the fact that either you send status notifications to someone, or that you recieve them, or both
 # NOTE thus "from" means you only recieve status notification, "to" means you only send status notification and "both" is thus obviously that you both send and recieve status notification
-#: ../libpurple/protocols/jabber/jabber.c:1157
+#: ../libpurple/protocols/jabber/jabber.c:1170
 msgid "Both"
 msgstr "撌脖貉霅"
 
-#  NOTE Jabber 銵隤嚗閬銝
-#: ../libpurple/protocols/jabber/jabber.c:1159
+#  NOTE Jabber 銵隤嚗閬Both璇
+#: ../libpurple/protocols/jabber/jabber.c:1172
 msgid "From (To pending)"
 msgstr "撌脰霅撠對雿隞蝑敺撠寡霅剁"
 
-#  NOTE Jabber 銵隤嚗閬銝
-#: ../libpurple/protocols/jabber/jabber.c:1164
+#  NOTE Jabber 銵隤嚗閬Both璇
+#: ../libpurple/protocols/jabber/jabber.c:1177
 msgid "To"
 msgstr "撌脩脣寡霅"
 
-#  NOTE Jabber 銵隤嚗閬銝
-#: ../libpurple/protocols/jabber/jabber.c:1166
+#  NOTE Jabber 銵隤嚗閬Both璇
+#: ../libpurple/protocols/jabber/jabber.c:1179
 msgid "None (To pending)"
 msgstr "∴雿甇蝑敺撠寡霅剁"
 
-#: ../libpurple/protocols/jabber/jabber.c:1168
+#: ../libpurple/protocols/jabber/jabber.c:1181
 #: ../pidgin/plugins/gevolution/eds-utils.c:73
 #: ../pidgin/plugins/gevolution/eds-utils.c:86
 msgid "None"
 msgstr ""
 
-#  NOTE Jabber 銵隤嚗閬銝
-#: ../libpurple/protocols/jabber/jabber.c:1171
+#  NOTE Jabber 銵隤嚗閬Both璇
+#: ../libpurple/protocols/jabber/jabber.c:1184
 msgid "Subscription"
 msgstr "隤霅"
 
-#: ../libpurple/protocols/jabber/jabber.c:1301
+#: ../libpurple/protocols/jabber/jabber.c:1314
 msgid "Password Changed"
 msgstr "撖蝣潔耨寞"
 
-#: ../libpurple/protocols/jabber/jabber.c:1302
+#: ../libpurple/protocols/jabber/jabber.c:1315
 msgid "Your password has been changed."
 msgstr "靽格嫣函撖蝣潦"
 
-#: ../libpurple/protocols/jabber/jabber.c:1306
-#: ../libpurple/protocols/jabber/jabber.c:1307
+#: ../libpurple/protocols/jabber/jabber.c:1319
+#: ../libpurple/protocols/jabber/jabber.c:1320
 msgid "Error changing password"
 msgstr "靽格孵蝣潭箇暸航炊"
 
-#: ../libpurple/protocols/jabber/jabber.c:1363
+#: ../libpurple/protocols/jabber/jabber.c:1376
 msgid "Password (again)"
 msgstr "撖蝣潘甈∠Ⅱ隤嚗"
 
-#: ../libpurple/protocols/jabber/jabber.c:1368
-#: ../libpurple/protocols/jabber/jabber.c:1369
-msgid "Change Jabber Password"
-msgstr "靽格 Jabber 撖蝣"
-
-#: ../libpurple/protocols/jabber/jabber.c:1369
+#: ../libpurple/protocols/jabber/jabber.c:1381
+#: ../libpurple/protocols/jabber/jabber.c:1382
+msgid "Change XMPP Password"
+msgstr "靽格 XMPP 撖蝣"
+
+#: ../libpurple/protocols/jabber/jabber.c:1382
 msgid "Please enter your new password"
 msgstr "隢頛詨交函啣蝣"
 
-#: ../libpurple/protocols/jabber/jabber.c:1379
-#: ../libpurple/protocols/oscar/oscar.c:6341
-#: ../libpurple/protocols/silc/silc.c:1013
+#: ../libpurple/protocols/jabber/jabber.c:1394
+#: ../libpurple/protocols/oscar/oscar.c:6298
+#: ../libpurple/protocols/silc/silc.c:1015
 msgid "Set User Info..."
 msgstr "閮剖雿輻刻鞈閮..."
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
-#: ../libpurple/protocols/jabber/jabber.c:1384
-#: ../libpurple/protocols/oscar/oscar.c:6352
-#: ../libpurple/protocols/silc/silc.c:1009
+#: ../libpurple/protocols/jabber/jabber.c:1399
+#: ../libpurple/protocols/oscar/oscar.c:6309
+#: ../libpurple/protocols/silc/silc.c:1011
 msgid "Change Password..."
 msgstr "靽格孵蝣..."
 
 #. }
-#: ../libpurple/protocols/jabber/jabber.c:1389
+#: ../libpurple/protocols/jabber/jabber.c:1404
 msgid "Search for Users..."
 msgstr "撠雿輻刻..."
 
 # NOTE 閬 http://www.jabber.org/jeps/jep-0103.html
-#: ../libpurple/protocols/jabber/jabber.c:1467
+#: ../libpurple/protocols/jabber/jabber.c:1482
 msgid "Bad Request"
 msgstr "喲蝬脣潛鈭銝航炊"
 
@@ -4791,51 +4778,52 @@
 #  NOTE嚗憭扳靽餃亦函雿輻刻芸摮銝莎撌乩畾萇餃伐隞亥渡⊥摮
 #  NOTE 閰唾 http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt
 #  NOTE 霅舀游 by Ambrose
-#: ../libpurple/protocols/jabber/jabber.c:1469
+#: ../libpurple/protocols/jabber/jabber.c:1484
 msgid "Conflict"
 msgstr "蝔望雿銵蝒"
 
-#: ../libpurple/protocols/jabber/jabber.c:1471
+#: ../libpurple/protocols/jabber/jabber.c:1486
 msgid "Feature Not Implemented"
 msgstr "閰脣賢芸祕雿"
 
 #  NOTE Jabber 航炊 <forbidden/>嚗甇撣賂銵函內甈銝憭嚗
 #  NOTE 閰唾 http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt
-#: ../libpurple/protocols/jabber/jabber.c:1473
+#: ../libpurple/protocols/jabber/jabber.c:1488
 msgid "Forbidden"
 msgstr "甈銝憭"
 
 #  NOTE Jabber 航炊 <gone/>嚗銵函內雿輻刻隡箸冽曄銝蝺嚗敺靘V蝺
 #  NOTE 閰唾 http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt
-#: ../libpurple/protocols/jabber/jabber.c:1475
+#: ../libpurple/protocols/jabber/jabber.c:1490
 msgid "Gone"
 msgstr "撌脤Y"
 
-#: ../libpurple/protocols/jabber/jabber.c:1477
-#: ../libpurple/protocols/jabber/jabber.c:1554
+#: ../libpurple/protocols/jabber/jabber.c:1492
+#: ../libpurple/protocols/jabber/jabber.c:1569
 msgid "Internal Server Error"
 msgstr "隡箸典折券航炊"
 
-#: ../libpurple/protocols/jabber/jabber.c:1479
+#: ../libpurple/protocols/jabber/jabber.c:1494
 msgid "Item Not Found"
 msgstr "格芣曉"
 
-#: ../libpurple/protocols/jabber/jabber.c:1481
-msgid "Malformed Jabber ID"
-msgstr "詨 Jabber ID"
+# FIXME 霅舀賭憟賢暺 20070518 acli
+#: ../libpurple/protocols/jabber/jabber.c:1496
+msgid "Malformed XMPP ID"
+msgstr "詨 XMPP 撣唾"
 
 #  NOTE Jabber 航炊 <not-acceptable/>嚗銵函內箇閬瘙芾賡唬撩冽嗡辣鈭箸閮銝
 #  NOTE 璇隞塚靘憒閮臭葉急蝳摮嚗嚗隞亥渡⊥摮
 #  NOTE 閰唾 http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt
-#: ../libpurple/protocols/jabber/jabber.c:1483
+#: ../libpurple/protocols/jabber/jabber.c:1498
 msgid "Not Acceptable"
 msgstr "⊥亙"
 
-#: ../libpurple/protocols/jabber/jabber.c:1485
+#: ../libpurple/protocols/jabber/jabber.c:1500
 msgid "Not Allowed"
 msgstr "銝鋡怠閮"
 
-#: ../libpurple/protocols/jabber/jabber.c:1489
+#: ../libpurple/protocols/jabber/jabber.c:1504
 msgid "Payment Required"
 msgstr "敹隞甈"
 
@@ -4843,78 +4831,78 @@
 #  NOTE 閰唾 http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt
 #  NOTE急⊥舐窗閰脫銝摮具
 #  NOTE 霅舀游 by Ambrose
-#: ../libpurple/protocols/jabber/jabber.c:1491
+#: ../libpurple/protocols/jabber/jabber.c:1506
 msgid "Recipient Unavailable"
 msgstr "急⊥舐窗交嗉"
 
-#: ../libpurple/protocols/jabber/jabber.c:1495
+#: ../libpurple/protocols/jabber/jabber.c:1510
 msgid "Registration Required"
 msgstr "敹閮餃"
 
-#: ../libpurple/protocols/jabber/jabber.c:1497
+#: ../libpurple/protocols/jabber/jabber.c:1512
 msgid "Remote Server Not Found"
 msgstr "蝡臭撩冽芣曉"
 
-#: ../libpurple/protocols/jabber/jabber.c:1499
+#: ../libpurple/protocols/jabber/jabber.c:1514
 msgid "Remote Server Timeout"
 msgstr "蝡臭撩券暹"
 
-#: ../libpurple/protocols/jabber/jabber.c:1501
+#: ../libpurple/protocols/jabber/jabber.c:1516
 msgid "Server Overloaded"
 msgstr "隡箸刻頛"
 
 #  NOTE Jabber 航炊 <service-unavailable/>嚗銵函內隡箸冽嗅唬蝢拐隞
 #  NOTE 閰唾 http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt
 #  NOTE 霅舀游 by Ambrose
-#: ../libpurple/protocols/jabber/jabber.c:1503
+#: ../libpurple/protocols/jabber/jabber.c:1518
 msgid "Service Unavailable"
 msgstr "銝靘閰脤"
 
 #  NOTE Jabber 航炊 <subscription-required/>嚗銵函內雿輻具
 #  NOTE 敹鈭敺Subscription嚗隤霅嚗
 #  NOTE 閰唾 http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt
-#: ../libpurple/protocols/jabber/jabber.c:1505
+#: ../libpurple/protocols/jabber/jabber.c:1520
 msgid "Subscription Required"
 msgstr "敹隤霅"
 
-#: ../libpurple/protocols/jabber/jabber.c:1507
+#: ../libpurple/protocols/jabber/jabber.c:1522
 msgid "Unexpected Request"
 msgstr "芷閬瘙"
 
-#: ../libpurple/protocols/jabber/jabber.c:1514
+#: ../libpurple/protocols/jabber/jabber.c:1529
 msgid "Authorization Aborted"
 msgstr "隤霅瘨"
 
-#: ../libpurple/protocols/jabber/jabber.c:1516
+#: ../libpurple/protocols/jabber/jabber.c:1531
 msgid "Incorrect encoding in authorization"
 msgstr "隤霅恍航炊蝺函Ⅳ"
 
-#: ../libpurple/protocols/jabber/jabber.c:1519
+#: ../libpurple/protocols/jabber/jabber.c:1534
 msgid "Invalid authzid"
 msgstr "⊥ authzid"
 
 # XXX 閬閬亥陌
-#: ../libpurple/protocols/jabber/jabber.c:1522
+#: ../libpurple/protocols/jabber/jabber.c:1537
 msgid "Invalid Authorization Mechanism"
 msgstr "⊥隤霅璈"
 
-#: ../libpurple/protocols/jabber/jabber.c:1525
+#: ../libpurple/protocols/jabber/jabber.c:1540
 msgid "Authorization mechanism too weak"
 msgstr "隤霅璈嗅云撘曹"
 
-#: ../libpurple/protocols/jabber/jabber.c:1530
+#: ../libpurple/protocols/jabber/jabber.c:1545
 msgid "Temporary Authentication Failure"
 msgstr "隤霅急憭望"
 
-#: ../libpurple/protocols/jabber/jabber.c:1533
+#: ../libpurple/protocols/jabber/jabber.c:1548
 msgid "Authentication Failure"
 msgstr "隤霅憭望"
 
-#: ../libpurple/protocols/jabber/jabber.c:1539
+#: ../libpurple/protocols/jabber/jabber.c:1554
 msgid "Bad Format"
 msgstr "⊥澆"
 
-#: ../libpurple/protocols/jabber/jabber.c:1541
+#: ../libpurple/protocols/jabber/jabber.c:1556
 msgid "Bad Namespace Prefix"
 msgstr "⊥ Namespace Prefix"
 
@@ -4924,181 +4912,181 @@
 # NOTE 閬 http://www.jabber.org/user/userguide.html
 # NOTE Jabber 摰銝 Stanza Error 銝蝔殷 <conflict/>
 # NOTE 閬 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
-#: ../libpurple/protocols/jabber/jabber.c:1544
+#: ../libpurple/protocols/jabber/jabber.c:1559
 msgid "Resource Conflict"
 msgstr "撌脩隞交摰 Resource 典嗡唳寧餃"
 
-#: ../libpurple/protocols/jabber/jabber.c:1546
+#: ../libpurple/protocols/jabber/jabber.c:1561
 #: ../libpurple/protocols/silc/ops.c:1729
 msgid "Connection Timeout"
 msgstr "蝺撌脤暹"
 
 # NOTE Jabber 摰銝 Stream Error 銝蝔殷 <host-gone/>
 # NOTE 閬 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
-#: ../libpurple/protocols/jabber/jabber.c:1548
+#: ../libpurple/protocols/jabber/jabber.c:1563
 msgid "Host Gone"
-msgstr "隡箸典歇銝舀湔蝯血隡箸典蝔"
+msgstr "隡箸典歇銝舀湔摰隡箸典蝔"
 
 # NOTE Jabber 摰銝 Stream Error 銝蝔殷 <host-unknown/>
 # NOTE 閬 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
-#: ../libpurple/protocols/jabber/jabber.c:1550
+#: ../libpurple/protocols/jabber/jabber.c:1565
 msgid "Host Unknown"
 msgstr "銝隡箸典蝔"
 
-#: ../libpurple/protocols/jabber/jabber.c:1552
+#: ../libpurple/protocols/jabber/jabber.c:1567
 msgid "Improper Addressing"
 msgstr "航炊摰"
 
-#: ../libpurple/protocols/jabber/jabber.c:1556
+#: ../libpurple/protocols/jabber/jabber.c:1571
 msgid "Invalid ID"
 msgstr "撣唾⊥"
 
 # FIXME 敹閬亥陌
-#: ../libpurple/protocols/jabber/jabber.c:1558
+#: ../libpurple/protocols/jabber/jabber.c:1573
 msgid "Invalid Namespace"
 msgstr "賢蝛粹⊥"
 
-#: ../libpurple/protocols/jabber/jabber.c:1560
+#: ../libpurple/protocols/jabber/jabber.c:1575
 msgid "Invalid XML"
 msgstr "⊥ XML"
 
 # XXX 舀怨陌嚗霅舀敺寥
 # NOTE Jabber 摰銝剔nonmatching-hosts
 # NOTE 閬 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
-#: ../libpurple/protocols/jabber/jabber.c:1562
+#: ../libpurple/protocols/jabber/jabber.c:1577
 msgid "Non-matching Hosts"
 msgstr "銝餅蝔曹訾"
 
 # XXX 舀怨陌嚗霅舀敺寥脯銝憟賢鈭粹璅撖恬憭扳瘝憭芸之憿
 # NOTE Jabber 摰 xmpp-core 銝 Stream Error 銝蝔殷 <policy-violation/>
 # NOTE 閬 http://www.jabber.org/ietf/draft-ietf-xmpp-core-19.html
-#: ../libpurple/protocols/jabber/jabber.c:1566
+#: ../libpurple/protocols/jabber/jabber.c:1581
 msgid "Policy Violation"
 msgstr "鈭輻"
 
 # NOTE Jabber 摰 Stream Error 銝蝔殷 <remote-connection-failed/>
 # NOTE 閬 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
-#: ../libpurple/protocols/jabber/jabber.c:1568
+#: ../libpurple/protocols/jabber/jabber.c:1583
 msgid "Remote Connection Failed"
 msgstr "⊥蝺唾霅蝡航皞"
 
 # NOTE Jabber 摰 Stream Error 銝蝔殷 <resource-constraint/>
 # NOTE 券鋆 Resource 銝閰餃交雿輻刻函 Resource 銝閰蝢拐蒂銝詨
 # NOTE 閬 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
-#: ../libpurple/protocols/jabber/jabber.c:1570
+#: ../libpurple/protocols/jabber/jabber.c:1585
 msgid "Resource Constraint"
 msgstr "隡箸刻皞剔撩"
 
 # NOTE Jabber 摰 xmpp-core 銝 Stream Error 銝蝔殷 <restricted-xml/>
 # NOTE 閬 http://www.jabber.org/ietf/draft-ietf-xmpp-core-18.html
-#: ../libpurple/protocols/jabber/jabber.c:1572
+#: ../libpurple/protocols/jabber/jabber.c:1587
 msgid "Restricted XML"
 msgstr "XML 銝剖冽 Jabber 摰銝摰寡迂 XML 蝝"
 
 # NOTE Jabber 摰銝 Stream Error 銝蝔殷 <see-other-host/>
 # NOTE 閬 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
-#: ../libpurple/protocols/jabber/jabber.c:1574
+#: ../libpurple/protocols/jabber/jabber.c:1589
 msgid "See Other Host"
 msgstr "隡箸典刻霅閬瘙鈭啣喳虫隡箸"
 
 # NOTE Jabber 摰銝 Stream Error 銝蝔殷 <system-shutdown/>
 # NOTE 閬 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
-#: ../libpurple/protocols/jabber/jabber.c:1576
+#: ../libpurple/protocols/jabber/jabber.c:1591
 msgid "System Shutdown"
 msgstr "隡箸函桀券璈銝"
 
 # NOTE 閬 http://www.jabber.org/jeps/jep-0103.html
-#: ../libpurple/protocols/jabber/jabber.c:1578
+#: ../libpurple/protocols/jabber/jabber.c:1593
 msgid "Undefined Condition"
 msgstr "喲蝬脣潛鈭銝航炊"
 
 # NOTE 閬 http://www.jabber.org/pipermail/xmppwg/2003-August/001431.html
-#: ../libpurple/protocols/jabber/jabber.c:1580
+#: ../libpurple/protocols/jabber/jabber.c:1595
 msgid "Unsupported Encoding"
-msgstr "隡箸其舀渡策摰摮蝺函Ⅳ"
+msgstr "隡箸其舀湔摰摮蝺函Ⅳ"
 
 # NOTE Jabber 摰銝 Stream Error 銝蝔殷 <unsupported-stanza-type/>
 # NOTE 閬 http://www.jabber.org/pipermail/xmppwg/2003-March/000752.html
-#: ../libpurple/protocols/jabber/jabber.c:1582
+#: ../libpurple/protocols/jabber/jabber.c:1597
 msgid "Unsupported Stanza Type"
-msgstr "隡箸其舀渡策摰畾菔賡 (Stanza Type)"
+msgstr "隡箸其舀湔摰畾菔賡 (Stanza Type)"
 
 # NOTE Jabber 摰銝 Stream Error 銝蝔殷 <unsupported-version/>
 # NOTE 閬 http://www.jabber.org/pipermail/xmppwg/2003-March/000752.html
-#: ../libpurple/protocols/jabber/jabber.c:1584
+#: ../libpurple/protocols/jabber/jabber.c:1599
 msgid "Unsupported Version"
-msgstr "銝舀渡策摰 XMPP "
-
-#: ../libpurple/protocols/jabber/jabber.c:1586
+msgstr "銝舀湔摰 XMPP "
+
+#: ../libpurple/protocols/jabber/jabber.c:1601
 msgid "XML Not Well Formed"
 msgstr "XML 隞嗆澆憿"
 
-#: ../libpurple/protocols/jabber/jabber.c:1588
+#: ../libpurple/protocols/jabber/jabber.c:1603
 msgid "Stream Error"
 msgstr "銝脫航炊"
 
-#: ../libpurple/protocols/jabber/jabber.c:1655
+#: ../libpurple/protocols/jabber/jabber.c:1670
 #, c-format
 msgid "Unable to ban user %s"
 msgstr "⊥蝳甇V蝙刻 %s"
 
 #  XXX 怨陌嚗∴蝑蝝 - ambrose 20070415
 #  NOTE: Unknown affiliation  owneradminmemberoutcastnone 鈭蝔桐誑憭嗡銝詨
-#: ../libpurple/protocols/jabber/jabber.c:1675
+#: ../libpurple/protocols/jabber/jabber.c:1690
 #, c-format
 msgid "Unknown affiliation: \"%s\""
 msgstr "銝蝑蝝嚗%s"
 
 #  XXX 怨陌 - ambrose 20070415
-#: ../libpurple/protocols/jabber/jabber.c:1680
+#: ../libpurple/protocols/jabber/jabber.c:1695
 #, c-format
 msgid "Unable to affiliate user %s as \"%s\""
 msgstr "⊥撠雿輻刻 %s 蝑蝝閮剖箝%s"
 
 #  XXX 怨陌 - ambrose 20070415
 #  NOTE: Unknown role  moderatorparticipantvisitornone 蝔桐誑憭嗡銝詨
-#: ../libpurple/protocols/jabber/jabber.c:1699
+#: ../libpurple/protocols/jabber/jabber.c:1714
 #, c-format
 msgid "Unknown role: \"%s\""
 msgstr "銝頨思遢嚗%s"
 
 #  XXX 怨陌 - ambrose 20070415
-#: ../libpurple/protocols/jabber/jabber.c:1706
+#: ../libpurple/protocols/jabber/jabber.c:1721
 #, c-format
 msgid "Unable to set role \"%s\" for user: %s"
 msgstr "⊥撠雿輻刻 %2$s 頨思遢閮剖箝%1$s"
 
-#: ../libpurple/protocols/jabber/jabber.c:1759
+#: ../libpurple/protocols/jabber/jabber.c:1774
 #, c-format
 msgid "Unable to kick user %s"
 msgstr "⊥頦W箔蝙刻 %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:1790
+#: ../libpurple/protocols/jabber/jabber.c:1805
 msgid "config:  Configure a chat room."
 msgstr "config嚗閮剖銝憭拙恕"
 
-#: ../libpurple/protocols/jabber/jabber.c:1794
+#: ../libpurple/protocols/jabber/jabber.c:1809
 msgid "configure:  Configure a chat room."
 msgstr "configure嚗閮剖銝憭拙恕"
 
-#: ../libpurple/protocols/jabber/jabber.c:1803
+#: ../libpurple/protocols/jabber/jabber.c:1818
 msgid "part [room]:  Leave the room."
 msgstr "part [憭拙恕]嚗a憭拙恕"
 
-#: ../libpurple/protocols/jabber/jabber.c:1808
+#: ../libpurple/protocols/jabber/jabber.c:1823
 msgid "register:  Register with a chat room."
 msgstr "register嚗乩憭拙恕"
 
-#: ../libpurple/protocols/jabber/jabber.c:1814
+#: ../libpurple/protocols/jabber/jabber.c:1829
 msgid "topic [new topic]:  View or change the topic."
 msgstr "topic [唬蜓憿]嚗瑼Z靽格寡憭拐蜓憿"
 
-#: ../libpurple/protocols/jabber/jabber.c:1820
+#: ../libpurple/protocols/jabber/jabber.c:1835
 msgid "ban &lt;user&gt; [room]:  Ban a user from the room."
 msgstr "ban &lt;雿輻刻&gt; [憭拙恕]嚗蝳甇X雿輻刻脣亥憭拙恕"
 
 #  XXX 怨陌嚗∴蝑蝝 - ambrose 20070415
-#: ../libpurple/protocols/jabber/jabber.c:1826
+#: ../libpurple/protocols/jabber/jabber.c:1841
 msgid ""
 "affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
 "affiliation with the room."
@@ -5107,7 +5095,7 @@
 "券憭拙恕抒蝑蝝"
 
 #  NOTE 霅舀孵 by ambrose
-#: ../libpurple/protocols/jabber/jabber.c:1832
+#: ../libpurple/protocols/jabber/jabber.c:1847
 msgid ""
 "role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
 "role in the room."
@@ -5115,19 +5103,19 @@
 "role &lt;雿輻刻&gt; &lt;moderator|participant|visitor|none&gt;: 閮剖雿輻刻"
 "憭拙恕抒頨思遢"
 
-#: ../libpurple/protocols/jabber/jabber.c:1838
+#: ../libpurple/protocols/jabber/jabber.c:1853
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
 msgstr "invite &lt;雿輻刻&gt; [閮珠嚗隢雿輻刻脣亥憭拙恕"
 
-#: ../libpurple/protocols/jabber/jabber.c:1844
+#: ../libpurple/protocols/jabber/jabber.c:1859
 msgid "join: &lt;room&gt; [server]:  Join a chat on this server."
 msgstr "join: &lt;憭拙恕&gt; [隡箸沘嚗乩潮隡箸函銝憭拙恕"
 
-#: ../libpurple/protocols/jabber/jabber.c:1850
+#: ../libpurple/protocols/jabber/jabber.c:1865
 msgid "kick &lt;user&gt; [room]:  Kick a user from the room."
 msgstr "kick &lt;雿輻刻&gt; [憭拙恕]嚗撠雿輻刻敺憭拙恕銝剛腺箝"
 
-#: ../libpurple/protocols/jabber/jabber.c:1855
+#: ../libpurple/protocols/jabber/jabber.c:1870
 msgid ""
 "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
 msgstr "msg &lt;雿輻刻&gt; &lt;閮&gt;嚗喲蝘鈭箄舐策虫雿輻刻"
@@ -5142,56 +5130,66 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/jabber/jabber.c:1972
-#: ../libpurple/protocols/jabber/jabber.c:1974
-msgid "Jabber Protocol Plugin"
-msgstr "Jabber 摰璅∠"
-
-#: ../libpurple/protocols/jabber/jabber.c:2000
+#: ../libpurple/protocols/jabber/libxmpp.c:166
+#: ../libpurple/protocols/jabber/libxmpp.c:168
+msgid "XMPP Protocol Plugin"
+msgstr "XMPP 摰璅∠"
+
+#. Translators: 'domain' is used here in the context of Internet domains, e.g. pidgin.im
+#: ../libpurple/protocols/jabber/libxmpp.c:195
+msgid "Domain"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/libxmpp.c:201
 msgid "Force old (port 5223) SSL"
 msgstr "撘瑁翰雿輻刻撘 SSL (port 5223)"
 
 #  NOTE 霅舀游 by Ambrose
-#: ../libpurple/protocols/jabber/jabber.c:2005
+#: ../libpurple/protocols/jabber/libxmpp.c:206
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "閮曹蝙冽嚗冽芰撖銝脫銝脰隤霅"
 
-#: ../libpurple/protocols/jabber/jabber.c:2010
-#: ../libpurple/protocols/simple/simple.c:1842
+#: ../libpurple/protocols/jabber/libxmpp.c:211
+#: ../libpurple/protocols/simple/simple.c:1856
 msgid "Connect port"
 msgstr "蝺"
 
 #. Account options
-#: ../libpurple/protocols/jabber/jabber.c:2014
-#: ../libpurple/protocols/silc/silc.c:1846
+#: ../libpurple/protocols/jabber/libxmpp.c:215
+#: ../libpurple/protocols/silc/silc.c:1866
 msgid "Connect server"
 msgstr "蝯隡箸"
 
-#: ../libpurple/protocols/jabber/message.c:155
+#: ../libpurple/protocols/jabber/message.c:102
+#, c-format
+msgid "%s has left the conversation."
+msgstr "%s 撌脩a鈭方"
+
+#: ../libpurple/protocols/jabber/message.c:153
 #, c-format
 msgid "Message from %s"
 msgstr " %s 澆箇閮"
 
-#: ../libpurple/protocols/jabber/message.c:219
+#: ../libpurple/protocols/jabber/message.c:217
 #, c-format
 msgid "%s has set the topic to: %s"
 msgstr "%s 憭拐蜓憿閮剖綽%s"
 
-#: ../libpurple/protocols/jabber/message.c:221
+#: ../libpurple/protocols/jabber/message.c:219
 #, c-format
 msgid "The topic is: %s"
 msgstr "銝駁嚗%s"
 
-#: ../libpurple/protocols/jabber/message.c:269
+#: ../libpurple/protocols/jabber/message.c:267
 #, c-format
 msgid "Message delivery to %s failed: %s"
 msgstr "⊥喲閮臬 %s嚗%s"
 
-#: ../libpurple/protocols/jabber/message.c:272
-msgid "Jabber Message Error"
-msgstr "Jabber 閮舫航炊"
-
-#: ../libpurple/protocols/jabber/message.c:352
+#: ../libpurple/protocols/jabber/message.c:270
+msgid "XMPP Message Error"
+msgstr "XMPP 閮舫航炊"
+
+#: ../libpurple/protocols/jabber/message.c:350
 #, c-format
 msgid " (Code %s)"
 msgstr " (隞蝣 %s)"
@@ -5200,35 +5198,35 @@
 msgid "XML Parse error"
 msgstr "XML 航炊"
 
-#: ../libpurple/protocols/jabber/presence.c:282
+#: ../libpurple/protocols/jabber/presence.c:278
 msgid "Unknown Error in presence"
 msgstr "銝銝蝺航炊"
 
-#: ../libpurple/protocols/jabber/presence.c:356
-#: ../libpurple/protocols/jabber/presence.c:357
+#: ../libpurple/protocols/jabber/presence.c:352
+#: ../libpurple/protocols/jabber/presence.c:353
 msgid "Create New Room"
 msgstr "撱箇啗憭拙恕"
 
-#: ../libpurple/protocols/jabber/presence.c:358
+#: ../libpurple/protocols/jabber/presence.c:354
 msgid ""
 "You are creating a new room.  Would you like to configure it, or accept the "
 "default settings?"
 msgstr "冽迤閬撱箇銝啁憭拙恕嚗刻閮剖摰嚗臭蝙券閮剖潘"
 
-#: ../libpurple/protocols/jabber/presence.c:361
+#: ../libpurple/protocols/jabber/presence.c:360
 msgid "_Configure Room"
 msgstr "閮剖憭拙恕(_C)"
 
-#: ../libpurple/protocols/jabber/presence.c:363
+#: ../libpurple/protocols/jabber/presence.c:361
 msgid "_Accept Defaults"
 msgstr "雿輻券閮剖(_A)"
 
-#: ../libpurple/protocols/jabber/presence.c:401
+#: ../libpurple/protocols/jabber/presence.c:398
 #, c-format
 msgid "Error in chat %s"
 msgstr "憭拙恕 %s 潛航炊"
 
-#: ../libpurple/protocols/jabber/presence.c:404
+#: ../libpurple/protocols/jabber/presence.c:401
 #, c-format
 msgid "Error joining chat %s"
 msgstr "亥憭拙恕 %s 潛航炊"
@@ -5348,7 +5346,7 @@
 
 #: ../libpurple/protocols/msn/error.c:103
 msgid "Tried to add a user to a group that doesn't exist"
-msgstr "閰血銝雿輻刻乩摮函蝢斤"
+msgstr "閰血銝雿輻刻乩摮函蝢斤"
 
 #: ../libpurple/protocols/msn/error.c:107
 msgid "Switchboard failed"
@@ -5466,7 +5464,7 @@
 msgstr "隡箸典云敹蝣"
 
 #: ../libpurple/protocols/msn/error.c:222
-#: ../libpurple/protocols/oscar/oscar.c:1357
+#: ../libpurple/protocols/oscar/oscar.c:1363
 #: ../libpurple/protocols/silc/ops.c:1718 ../libpurple/protocols/toc/toc.c:728
 #: ../libpurple/proxy.c:1351
 msgid "Authentication failed"
@@ -5505,360 +5503,360 @@
 msgid "MSN Error: %s\n"
 msgstr "MSN 航炊嚗%s\n"
 
-#: ../libpurple/protocols/msn/msn.c:112
+#: ../libpurple/protocols/msn/msn.c:121
 msgid "You have just sent a Nudge!"
 msgstr "典箔銝澆恬"
 
-#: ../libpurple/protocols/msn/msn.c:137
+#: ../libpurple/protocols/msn/msn.c:146
 msgid "Your new MSN friendly name is too long."
 msgstr "函 MSN 梁迂憭芷瑯"
 
-#: ../libpurple/protocols/msn/msn.c:245
+#: ../libpurple/protocols/msn/msn.c:254
 msgid "Set your friendly name."
 msgstr "閮剖函梁迂"
 
 # NOTE MSN梁迂銝Yahoo嚗雿輻刻臭誑頛詨乩遙雿唳梁迂嚗
 # NOTE 喃蝙雿輻刻撣唾瘥怎⊿靽嚗隡潔銋舀
 # XXX 靘臭餈啣伐鈭撖虫臬雿輻刻澆箇隢瘙嚗憿
-#: ../libpurple/protocols/msn/msn.c:246
+#: ../libpurple/protocols/msn/msn.c:255
 msgid "This is the name that other MSN buddies will see you as."
 msgstr "乩犖 MSN 仿望函鈭箄憿舐內梁迂"
 
-#: ../libpurple/protocols/msn/msn.c:262
+#: ../libpurple/protocols/msn/msn.c:273
 msgid "Set your home phone number."
 msgstr "閮剖函雿摰園餉店蝣潦"
 
-#: ../libpurple/protocols/msn/msn.c:277
+#: ../libpurple/protocols/msn/msn.c:290
 msgid "Set your work phone number."
 msgstr "閮剖函颲血砍恕餉店蝣潦"
 
-#: ../libpurple/protocols/msn/msn.c:292
+#: ../libpurple/protocols/msn/msn.c:307
 msgid "Set your mobile phone number."
-msgstr "閮剖函銵餉店蝣潦"
-
-#: ../libpurple/protocols/msn/msn.c:305
+msgstr "閮剖函瘚餉店蝣潦"
+
+#: ../libpurple/protocols/msn/msn.c:322
 msgid "Allow MSN Mobile pages?"
 msgstr "閮 MSN 喳潘"
 
-#: ../libpurple/protocols/msn/msn.c:306
+#: ../libpurple/protocols/msn/msn.c:323
 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?"
 msgstr ""
-"冽臬血閮勗冽典末皜桐葉憟賢喲 Mobile Page 唳函銵餉店嚗臬嗡銵"
-"鋆蝵桐g"
-
-#: ../libpurple/protocols/msn/msn.c:310
+"冽臬血閮勗冽典末皜桐葉憟賢喲 Mobile Page 唳函瘚餉店嚗臬嗡瘚"
+"閮冽銝g"
+
+#: ../libpurple/protocols/msn/msn.c:329
 msgid "Allow"
 msgstr "閮"
 
-#: ../libpurple/protocols/msn/msn.c:311
+#: ../libpurple/protocols/msn/msn.c:330
 msgid "Disallow"
 msgstr "銝閮"
 
-#: ../libpurple/protocols/msn/msn.c:327
+#: ../libpurple/protocols/msn/msn.c:346
 msgid "This Hotmail account may not be active."
 msgstr "Hotmail撣唾航賢芾◤"
 
-#: ../libpurple/protocols/msn/msn.c:353
+#: ../libpurple/protocols/msn/msn.c:372
 msgid "Send a mobile message."
 msgstr "箄閮胯"
 
-#: ../libpurple/protocols/msn/msn.c:355
+#: ../libpurple/protocols/msn/msn.c:374
 msgid "Page"
 msgstr "喳"
 
-#: ../libpurple/protocols/msn/msn.c:518
+#: ../libpurple/protocols/msn/msn.c:521
 msgid "Has you"
 msgstr "雿其嚗憟對憟賢皜株"
 
-#: ../libpurple/protocols/msn/msn.c:548 ../libpurple/protocols/msn/state.c:33
-#: ../libpurple/protocols/yahoo/yahoo.c:2876
-#: ../libpurple/protocols/yahoo/yahoo.c:3480
+#: ../libpurple/protocols/msn/msn.c:551 ../libpurple/protocols/msn/state.c:33
+#: ../libpurple/protocols/yahoo/yahoo.c:2878
+#: ../libpurple/protocols/yahoo/yahoo.c:3487
 msgid "Be Right Back"
 msgstr "擐砌靘"
 
-#: ../libpurple/protocols/msn/msn.c:552 ../libpurple/protocols/msn/state.c:31
-#: ../libpurple/protocols/novell/novell.c:2823
-#: ../libpurple/protocols/novell/novell.c:2953
-#: ../libpurple/protocols/silc/buddy.c:1473
+#: ../libpurple/protocols/msn/msn.c:555 ../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:47
-#: ../libpurple/protocols/yahoo/yahoo.c:2878
-#: ../libpurple/protocols/yahoo/yahoo.c:3483
+#: ../libpurple/protocols/yahoo/yahoo.c:2880
+#: ../libpurple/protocols/yahoo/yahoo.c:3490
 msgid "Busy"
 msgstr "敹蝣"
 
-#: ../libpurple/protocols/msn/msn.c:556
-#: ../libpurple/protocols/yahoo/yahoo.c:2886
-#: ../libpurple/protocols/yahoo/yahoo.c:3495
+#: ../libpurple/protocols/msn/msn.c:559
+#: ../libpurple/protocols/yahoo/yahoo.c:2888
+#: ../libpurple/protocols/yahoo/yahoo.c:3502
 msgid "On the Phone"
 msgstr "餉店銝"
 
-#: ../libpurple/protocols/msn/msn.c:560
-#: ../libpurple/protocols/yahoo/yahoo.c:2890
-#: ../libpurple/protocols/yahoo/yahoo.c:3501
+#: ../libpurple/protocols/msn/msn.c:563
+#: ../libpurple/protocols/yahoo/yahoo.c:2892
+#: ../libpurple/protocols/yahoo/yahoo.c:3508
 msgid "Out to Lunch"
 msgstr "憭箇券"
 
-#: ../libpurple/protocols/msn/msn.c:588
+#: ../libpurple/protocols/msn/msn.c:591
 msgid "Set Friendly Name..."
 msgstr "閮剖梁迂..."
 
-#: ../libpurple/protocols/msn/msn.c:593
+#: ../libpurple/protocols/msn/msn.c:596
 msgid "Set Home Phone Number..."
 msgstr "閮剖雿摰園餉店蝣..."
 
-#: ../libpurple/protocols/msn/msn.c:597
+#: ../libpurple/protocols/msn/msn.c:600
 msgid "Set Work Phone Number..."
 msgstr "閮剖撌乩餉店蝣..."
 
-#: ../libpurple/protocols/msn/msn.c:601
+#: ../libpurple/protocols/msn/msn.c:604
 msgid "Set Mobile Phone Number..."
-msgstr "閮剖銵餉店蝣..."
-
-#: ../libpurple/protocols/msn/msn.c:607
+msgstr "閮剖瘚餉店蝣..."
+
+#: ../libpurple/protocols/msn/msn.c:610
 msgid "Enable/Disable Mobile Devices..."
-msgstr " / 銵鋆蝵..."
-
-#: ../libpurple/protocols/msn/msn.c:612
+msgstr " / 瘚閮冽..."
+
+#: ../libpurple/protocols/msn/msn.c:615
 msgid "Allow/Disallow Mobile Pages..."
 msgstr "閮 / 銝閮 Mobile Page..."
 
-#: ../libpurple/protocols/msn/msn.c:622
+#: ../libpurple/protocols/msn/msn.c:626
 msgid "Open Hotmail Inbox"
 msgstr "Hotmail嗡辣"
 
-#: ../libpurple/protocols/msn/msn.c:646
+#: ../libpurple/protocols/msn/msn.c:650
 msgid "Send to Mobile"
-msgstr "喲唾餉店"
-
-#: ../libpurple/protocols/msn/msn.c:656
-#: ../libpurple/protocols/novell/novell.c:3409
+msgstr "喲單餉店"
+
+#: ../libpurple/protocols/msn/msn.c:660
+#: ../libpurple/protocols/novell/novell.c:3408
 msgid "Initiate _Chat"
 msgstr "憭拙恕(_C)"
 
 # XXX 怨陌
-#: ../libpurple/protocols/msn/msn.c:694
+#: ../libpurple/protocols/msn/msn.c:698
 msgid "SSL support is needed for MSN. Please install a supported SSL library."
 msgstr "MSN 閬 SSL 蝔撘摨怎舀湛隢摰鋆銝舀渡 SSL 蝔撘摨怒"
 
-#: ../libpurple/protocols/msn/msn.c:719
+#: ../libpurple/protocols/msn/msn.c:723
 msgid "Failed to connect to server."
 msgstr "⊥蝺唬撩具"
 
-#: ../libpurple/protocols/msn/msn.c:1439 ../libpurple/protocols/msn/msn.c:1784
+#: ../libpurple/protocols/msn/msn.c:1458 ../libpurple/protocols/msn/msn.c:1803
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:784
 msgid "Error retrieving profile"
 msgstr "敺鈭箄閮潛航炊"
 
-#: ../libpurple/protocols/msn/msn.c:1510 ../pidgin/plugins/convcolors.c:309
+#: ../libpurple/protocols/msn/msn.c:1529 ../pidgin/plugins/convcolors.c:309
 #: ../pidgin/plugins/pidginrc.c:448
 msgid "General"
 msgstr "銝"
 
-#: ../libpurple/protocols/msn/msn.c:1517
-#: ../libpurple/protocols/oscar/oscar.c:3757
+#: ../libpurple/protocols/msn/msn.c:1536
+#: ../libpurple/protocols/oscar/oscar.c:3742
 #: ../libpurple/protocols/qq/buddy_info.c:45
 #: ../libpurple/protocols/qq/qq.c:219
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1057
 msgid "Age"
 msgstr "撟湧翩"
 
-#: ../libpurple/protocols/msn/msn.c:1519
+#: ../libpurple/protocols/msn/msn.c:1538
 #: ../libpurple/protocols/qq/buddy_info.c:51
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1072
 msgid "Occupation"
 msgstr "瑟平"
 
-#: ../libpurple/protocols/msn/msn.c:1520
+#: ../libpurple/protocols/msn/msn.c:1539
 #: ../libpurple/protocols/novell/novell.c:1478
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1052
 #: ../libpurple/protocols/zephyr/zephyr.c:798
-#: ../libpurple/protocols/zephyr/zephyr.c:1214
+#: ../libpurple/protocols/zephyr/zephyr.c:1215
 msgid "Location"
 msgstr "其蝵"
 
-#: ../libpurple/protocols/msn/msn.c:1525 ../libpurple/protocols/msn/msn.c:1717
-#: ../libpurple/protocols/msn/msn.c:1723 ../libpurple/protocols/msn/msn.c:1730
+#: ../libpurple/protocols/msn/msn.c:1544 ../libpurple/protocols/msn/msn.c:1736
+#: ../libpurple/protocols/msn/msn.c:1742 ../libpurple/protocols/msn/msn.c:1749
 msgid "Hobbies and Interests"
 msgstr "憟/頞"
 
-#: ../libpurple/protocols/msn/msn.c:1531 ../libpurple/protocols/msn/msn.c:1651
-#: ../libpurple/protocols/msn/msn.c:1657 ../libpurple/protocols/msn/msn.c:1664
-#: ../libpurple/protocols/msn/msn.c:1672 ../libpurple/protocols/msn/msn.c:1679
+#: ../libpurple/protocols/msn/msn.c:1550 ../libpurple/protocols/msn/msn.c:1670
+#: ../libpurple/protocols/msn/msn.c:1676 ../libpurple/protocols/msn/msn.c:1683
+#: ../libpurple/protocols/msn/msn.c:1691 ../libpurple/protocols/msn/msn.c:1698
 msgid "A Little About Me"
 msgstr "芣蝪∩"
 
-#: ../libpurple/protocols/msn/msn.c:1548
+#: ../libpurple/protocols/msn/msn.c:1567
 msgid "Social"
 msgstr "蝷曆漱"
 
-#: ../libpurple/protocols/msn/msn.c:1550
+#: ../libpurple/protocols/msn/msn.c:1569
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1062
 msgid "Marital Status"
 msgstr "憍憪餌瘜"
 
-#: ../libpurple/protocols/msn/msn.c:1551
+#: ../libpurple/protocols/msn/msn.c:1570
 msgid "Interests"
 msgstr "頞"
 
-#: ../libpurple/protocols/msn/msn.c:1552
+#: ../libpurple/protocols/msn/msn.c:1571
 msgid "Pets"
 msgstr "撖萇"
 
-#: ../libpurple/protocols/msn/msn.c:1553
+#: ../libpurple/protocols/msn/msn.c:1572
 msgid "Hometown"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:1554
+#: ../libpurple/protocols/msn/msn.c:1573
 msgid "Places Lived"
 msgstr "撅雿唳"
 
-#: ../libpurple/protocols/msn/msn.c:1555
+#: ../libpurple/protocols/msn/msn.c:1574
 msgid "Fashion"
 msgstr "撠"
 
-#: ../libpurple/protocols/msn/msn.c:1556
+#: ../libpurple/protocols/msn/msn.c:1575
 msgid "Humor"
 msgstr "撟賡"
 
-#: ../libpurple/protocols/msn/msn.c:1557
+#: ../libpurple/protocols/msn/msn.c:1576
 msgid "Music"
 msgstr "單"
 
 # NOTE 交po瑼MSN祈澈霅胯摨批喲
-#: ../libpurple/protocols/msn/msn.c:1558 ../libpurple/protocols/msn/msn.c:1739
-#: ../libpurple/protocols/msn/msn.c:1745
+#: ../libpurple/protocols/msn/msn.c:1577 ../libpurple/protocols/msn/msn.c:1758
+#: ../libpurple/protocols/msn/msn.c:1764
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1114
 msgid "Favorite Quote"
 msgstr "摨批喲"
 
-#: ../libpurple/protocols/msn/msn.c:1575
+#: ../libpurple/protocols/msn/msn.c:1594
 msgid "Contact Info"
 msgstr "舐窗鞈閮"
 
-#: ../libpurple/protocols/msn/msn.c:1576
+#: ../libpurple/protocols/msn/msn.c:1595
 msgid "Personal"
 msgstr "鈭箄"
 
-#: ../libpurple/protocols/msn/msn.c:1579
+#: ../libpurple/protocols/msn/msn.c:1598
 msgid "Significant Other"
 msgstr "虫"
 
-#: ../libpurple/protocols/msn/msn.c:1580
+#: ../libpurple/protocols/msn/msn.c:1599
 msgid "Home Phone"
 msgstr "雿摰園餉店"
 
-#: ../libpurple/protocols/msn/msn.c:1581
+#: ../libpurple/protocols/msn/msn.c:1600
 msgid "Home Phone 2"
 msgstr "雿摰園餉店2"
 
-#: ../libpurple/protocols/msn/msn.c:1582
-#: ../libpurple/protocols/oscar/oscar.c:3795
+#: ../libpurple/protocols/msn/msn.c:1601
+#: ../libpurple/protocols/oscar/oscar.c:3780
 msgid "Home Address"
 msgstr "雿摰嗅啣"
 
-#: ../libpurple/protocols/msn/msn.c:1583
+#: ../libpurple/protocols/msn/msn.c:1602
 msgid "Personal Mobile"
-msgstr "鈭箄餉店"
-
-#: ../libpurple/protocols/msn/msn.c:1584
+msgstr "鈭箸餉店"
+
+#: ../libpurple/protocols/msn/msn.c:1603
 msgid "Home Fax"
 msgstr "雿摰嗅喟"
 
-#: ../libpurple/protocols/msn/msn.c:1585
+#: ../libpurple/protocols/msn/msn.c:1604
 msgid "Personal E-Mail"
 msgstr "鈭粹餃萎辣"
 
-#: ../libpurple/protocols/msn/msn.c:1586
+#: ../libpurple/protocols/msn/msn.c:1605
 msgid "Personal IM"
 msgstr "鈭箏單閮臬董"
 
-#: ../libpurple/protocols/msn/msn.c:1588
+#: ../libpurple/protocols/msn/msn.c:1607
 msgid "Anniversary"
 msgstr "勗僑蝝敹菜"
 
 #. Business
-#: ../libpurple/protocols/msn/msn.c:1604
+#: ../libpurple/protocols/msn/msn.c:1623
 msgid "Work"
 msgstr "撌乩鞈"
 
-#: ../libpurple/protocols/msn/msn.c:1606
+#: ../libpurple/protocols/msn/msn.c:1625
 #: ../libpurple/protocols/silc/ops.c:1044
 msgid "Job Title"
 msgstr "琿"
 
-#: ../libpurple/protocols/msn/msn.c:1607
-#: ../libpurple/protocols/oscar/oscar.c:3816
+#: ../libpurple/protocols/msn/msn.c:1626
+#: ../libpurple/protocols/oscar/oscar.c:3801
 msgid "Company"
 msgstr "砍詨蝔"
 
-#: ../libpurple/protocols/msn/msn.c:1608
+#: ../libpurple/protocols/msn/msn.c:1627
 #: ../libpurple/protocols/novell/novell.c:1480
 msgid "Department"
 msgstr "撅祇券"
 
-#: ../libpurple/protocols/msn/msn.c:1609
+#: ../libpurple/protocols/msn/msn.c:1628
 msgid "Profession"
 msgstr "撠璆"
 
-#: ../libpurple/protocols/msn/msn.c:1610
+#: ../libpurple/protocols/msn/msn.c:1629
 msgid "Work Phone"
 msgstr "餉店"
 
-#: ../libpurple/protocols/msn/msn.c:1611
+#: ../libpurple/protocols/msn/msn.c:1630
 msgid "Work Phone 2"
 msgstr "餉店2"
 
-#: ../libpurple/protocols/msn/msn.c:1612
-#: ../libpurple/protocols/oscar/oscar.c:3808
+#: ../libpurple/protocols/msn/msn.c:1631
+#: ../libpurple/protocols/oscar/oscar.c:3793
 msgid "Work Address"
 msgstr "撌乩啣"
 
-#: ../libpurple/protocols/msn/msn.c:1613
+#: ../libpurple/protocols/msn/msn.c:1632
 msgid "Work Mobile"
-msgstr "銵餉店"
-
-#: ../libpurple/protocols/msn/msn.c:1614
+msgstr "瘚餉店"
+
+#: ../libpurple/protocols/msn/msn.c:1633
 msgid "Work Pager"
-msgstr "澆怠"
-
-#: ../libpurple/protocols/msn/msn.c:1615
+msgstr "喳潭"
+
+#: ../libpurple/protocols/msn/msn.c:1634
 msgid "Work Fax"
 msgstr "喟"
 
-#: ../libpurple/protocols/msn/msn.c:1616
+#: ../libpurple/protocols/msn/msn.c:1635
 msgid "Work E-Mail"
 msgstr "餃萎辣"
 
-#: ../libpurple/protocols/msn/msn.c:1617
+#: ../libpurple/protocols/msn/msn.c:1636
 msgid "Work IM"
 msgstr "單閮臬董"
 
-#: ../libpurple/protocols/msn/msn.c:1618
+#: ../libpurple/protocols/msn/msn.c:1637
 msgid "Start Date"
 msgstr "憪交"
 
-#: ../libpurple/protocols/msn/msn.c:1688 ../libpurple/protocols/msn/msn.c:1694
-#: ../libpurple/protocols/msn/msn.c:1701 ../libpurple/protocols/msn/msn.c:1708
+#: ../libpurple/protocols/msn/msn.c:1707 ../libpurple/protocols/msn/msn.c:1713
+#: ../libpurple/protocols/msn/msn.c:1720 ../libpurple/protocols/msn/msn.c:1727
 msgid "Favorite Things"
 msgstr "鈭"
 
-#: ../libpurple/protocols/msn/msn.c:1753
+#: ../libpurple/protocols/msn/msn.c:1772
 msgid "Last Updated"
 msgstr "湔唳交"
 
-#: ../libpurple/protocols/msn/msn.c:1764
+#: ../libpurple/protocols/msn/msn.c:1783
 #: ../libpurple/protocols/qq/buddy_info.c:60
 #: ../libpurple/protocols/silc/ops.c:1060
 msgid "Homepage"
 msgstr "蝬脤"
 
-#: ../libpurple/protocols/msn/msn.c:1785
+#: ../libpurple/protocols/msn/msn.c:1804
 msgid "The user has not created a public profile."
 msgstr "雿輻刻芣撱箇祇鈭箄"
 
-#: ../libpurple/protocols/msn/msn.c:1786
+#: ../libpurple/protocols/msn/msn.c:1805
 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 "
@@ -5867,14 +5865,14 @@
 "MSN 梯牧曆圈雿輻刻鈭箄銵函內雿輻刻航賭摮剁鈭行航賭蝙"
 "刻摮剁雿瘝撱箇祇鈭箄"
 
-#: ../libpurple/protocols/msn/msn.c:1790
+#: ../libpurple/protocols/msn/msn.c:1809
 msgid ""
 "Could not find any information in the user's profile. The user most likely "
 "does not exist."
 msgstr ""
 "券雿輻刻鈭箄蝬脤曆唬遙雿舐函鞈雿輻刻璆菜航賭蒂銝摮具"
 
-#: ../libpurple/protocols/msn/msn.c:1798
+#: ../libpurple/protocols/msn/msn.c:1817
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1216
 msgid "Profile URL"
 msgstr "鈭箄蝬脣"
@@ -5889,19 +5887,19 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/msn/msn.c:2078 ../libpurple/protocols/msn/msn.c:2080
+#: ../libpurple/protocols/msn/msn.c:2103 ../libpurple/protocols/msn/msn.c:2105
 msgid "MSN Protocol Plugin"
 msgstr "MSN 摰璅∠"
 
-#: ../libpurple/protocols/msn/msn.c:2108
+#: ../libpurple/protocols/msn/msn.c:2139
 msgid "Use HTTP Method"
 msgstr "雿輻 HTTP 孵"
 
-#: ../libpurple/protocols/msn/msn.c:2113
+#: ../libpurple/protocols/msn/msn.c:2144
 msgid "Show custom smileys"
 msgstr "憿舐內雿輻刻蝷"
 
-#: ../libpurple/protocols/msn/msn.c:2121
+#: ../libpurple/protocols/msn/msn.c:2152
 msgid "nudge: nudge a user to get their attention"
 msgstr "nudge嚗澆思蝙刻嚗撘韏瑚瘜冽"
 
@@ -5977,17 +5975,17 @@
 msgid "Service Temporarily Unavailable."
 msgstr "急⊥靘"
 
-#: ../libpurple/protocols/msn/notification.c:823
+#: ../libpurple/protocols/msn/notification.c:840
 msgid "Unable to rename group"
 msgstr "⊥湔寧黎蝯蝔"
 
-#: ../libpurple/protocols/msn/notification.c:878
+#: ../libpurple/protocols/msn/notification.c:895
 msgid "Unable to delete group"
 msgstr "⊥蝘駁斤黎蝯"
 
 # NOTE "in %d minutes" 箝 %d 銋扼
 # NOTE 霅舀游 by Ambrose
-#: ../libpurple/protocols/msn/notification.c:1314
+#: ../libpurple/protocols/msn/notification.c:1321
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -6042,8 +6040,8 @@
 msgstr "閫 HTTP 銝剔潛航炊"
 
 #: ../libpurple/protocols/msn/session.c:307
-#: ../libpurple/protocols/oscar/oscar.c:3469
-#: ../libpurple/protocols/yahoo/yahoo.c:201
+#: ../libpurple/protocols/oscar/oscar.c:3454
+#: ../libpurple/protocols/yahoo/yahoo.c:202
 msgid "You have signed on from another location."
 msgstr "函勗嗡唳寧餃乓"
 
@@ -6152,130 +6150,130 @@
 msgid "The screen name specified is invalid."
 msgstr "冽頛詨亦撣唾⊥"
 
-#: ../libpurple/protocols/novell/nmuser.c:1878
+#: ../libpurple/protocols/novell/nmuser.c:1864
 msgid "Required parameters not passed in"
 msgstr "瘝靘"
 
-#: ../libpurple/protocols/novell/nmuser.c:1881
+#: ../libpurple/protocols/novell/nmuser.c:1867
 msgid "Unable to write to network"
 msgstr "⊥撖怠亦雯頝"
 
-#: ../libpurple/protocols/novell/nmuser.c:1884
+#: ../libpurple/protocols/novell/nmuser.c:1870
 msgid "Unable to read from network"
 msgstr "⊥梁雯頝航"
 
-#: ../libpurple/protocols/novell/nmuser.c:1887
+#: ../libpurple/protocols/novell/nmuser.c:1873
 msgid "Error communicating with server"
 msgstr "隡箸冽潛航炊"
 
-#: ../libpurple/protocols/novell/nmuser.c:1891
+#: ../libpurple/protocols/novell/nmuser.c:1877
 msgid "Conference not found"
 msgstr "曆啗府霅"
 
-#: ../libpurple/protocols/novell/nmuser.c:1894
+#: ../libpurple/protocols/novell/nmuser.c:1880
 msgid "Conference does not exist"
 msgstr "閰脫霅唬蒂銝摮"
 
-#: ../libpurple/protocols/novell/nmuser.c:1898
+#: ../libpurple/protocols/novell/nmuser.c:1884
 msgid "A folder with that name already exists"
 msgstr "桅撌脩摮"
 
 #  XXX 憭芸芯 (^^;)
-#: ../libpurple/protocols/novell/nmuser.c:1901
+#: ../libpurple/protocols/novell/nmuser.c:1887
 msgid "Not supported"
 msgstr "銝舀"
 
-#: ../libpurple/protocols/novell/nmuser.c:1905
+#: ../libpurple/protocols/novell/nmuser.c:1891
 msgid "Password has expired"
 msgstr "撖蝣澆歇"
 
-#: ../libpurple/protocols/novell/nmuser.c:1908
+#: ../libpurple/protocols/novell/nmuser.c:1894
 msgid "Incorrect password"
 msgstr "撖蝣潮航炊"
 
-#: ../libpurple/protocols/novell/nmuser.c:1911
+#: ../libpurple/protocols/novell/nmuser.c:1897
 msgid "User not found"
 msgstr "曆啗府雿輻刻"
 
-#: ../libpurple/protocols/novell/nmuser.c:1914
+#: ../libpurple/protocols/novell/nmuser.c:1900
 msgid "Account has been disabled"
 msgstr "撣唾撌脰◤"
 
-#: ../libpurple/protocols/novell/nmuser.c:1917
+#: ../libpurple/protocols/novell/nmuser.c:1903
 msgid "The server could not access the directory"
 msgstr "隡箸函⊥摮桅"
 
 #  XXX 閬閬亥陌
-#: ../libpurple/protocols/novell/nmuser.c:1920
+#: ../libpurple/protocols/novell/nmuser.c:1906
 msgid "Your system administrator has disabled this operation"
 msgstr "函蝟餌絞蝞∠∩摰寡迂雿"
 
-#: ../libpurple/protocols/novell/nmuser.c:1923
+#: ../libpurple/protocols/novell/nmuser.c:1909
 msgid "The server is unavailable; try again later"
 msgstr "急⊥雿輻其撩剁隢蝔敺閰"
 
-#: ../libpurple/protocols/novell/nmuser.c:1926
+#: ../libpurple/protocols/novell/nmuser.c:1912
 msgid "Cannot add a contact to the same folder twice"
 msgstr "⊥典銝鞈憭曉扳啣銝憟賢拇活"
 
-#: ../libpurple/protocols/novell/nmuser.c:1929
+#: ../libpurple/protocols/novell/nmuser.c:1915
 msgid "Cannot add yourself"
 msgstr "⊥啣刻芸楛喳末皜"
 
 #  TODO 銝乓Master archive⊥迤撘霅舀嚗銋銝交憒雿霅
-#: ../libpurple/protocols/novell/nmuser.c:1932
+#: ../libpurple/protocols/novell/nmuser.c:1918
 msgid "Master archive is misconfigured"
 msgstr "Master archive 閮剖航炊"
 
-#: ../libpurple/protocols/novell/nmuser.c:1936
+#: ../libpurple/protocols/novell/nmuser.c:1922
 msgid "Incorrect screen name or password"
 msgstr "航炊撣唾撖蝣"
 
-#: ../libpurple/protocols/novell/nmuser.c:1939
+#: ../libpurple/protocols/novell/nmuser.c:1925
 msgid "Could not recognize the host of the screen name you entered"
 msgstr "⊥颲西冽頛詨亦撣唾抒銝餅蝔"
 
-#: ../libpurple/protocols/novell/nmuser.c:1942
+#: ../libpurple/protocols/novell/nmuser.c:1928
 msgid ""
 "Your account has been disabled because too many incorrect passwords were "
 "entered"
 msgstr "函撣唾撌脰◤剁箄撓乩憭芸⊥撖蝣"
 
-#: ../libpurple/protocols/novell/nmuser.c:1945
+#: ../libpurple/protocols/novell/nmuser.c:1931
 msgid "You cannot add the same person twice to a conversation"
 msgstr "其賢典銝鈭方扳啣銝鈭箏拇活"
 
-#: ../libpurple/protocols/novell/nmuser.c:1949
+#: ../libpurple/protocols/novell/nmuser.c:1935
 msgid "You have reached your limit for the number of contacts allowed"
 msgstr "函憟賢鈭箸詨歇銝"
 
-#: ../libpurple/protocols/novell/nmuser.c:1952
+#: ../libpurple/protocols/novell/nmuser.c:1938
 msgid "You have entered an incorrect screen name"
 msgstr "刻撓乩⊥撣唾"
 
-#: ../libpurple/protocols/novell/nmuser.c:1955
+#: ../libpurple/protocols/novell/nmuser.c:1941
 msgid "An error occurred while updating the directory"
 msgstr "湔啁桅銝剔潛航炊"
 
-#: ../libpurple/protocols/novell/nmuser.c:1958
+#: ../libpurple/protocols/novell/nmuser.c:1944
 msgid "Incompatible protocol version"
 msgstr "摰砌詨捆"
 
-#: ../libpurple/protocols/novell/nmuser.c:1961
+#: ../libpurple/protocols/novell/nmuser.c:1947
 msgid "The user has blocked you"
 msgstr "閰脖蝙刻蝯鈭"
 
-#: ../libpurple/protocols/novell/nmuser.c:1964
+#: ../libpurple/protocols/novell/nmuser.c:1950
 msgid ""
 "This evaluation version does not allow more than ten users to log in at one "
 "time"
 msgstr "閰衣函憭芸捆閮勗雿輻刻餃"
 
-#: ../libpurple/protocols/novell/nmuser.c:1967
+#: ../libpurple/protocols/novell/nmuser.c:1953
 msgid "The user is either offline or you are blocked"
 msgstr "閰脖蝙刻航賣舫Y嚗典歇鋡思嚗憟對蝯"
 
-#: ../libpurple/protocols/novell/nmuser.c:1970
+#: ../libpurple/protocols/novell/nmuser.c:1956
 #, c-format
 msgid "Unknown error: 0x%X"
 msgstr "芰仿航炊嚗0x%X"
@@ -6360,7 +6358,7 @@
 msgstr "⊥ %s 蝘駁方芣函梁皜 (%s)"
 
 #: ../libpurple/protocols/novell/novell.c:942
-#: ../libpurple/protocols/novell/novell.c:1650
+#: ../libpurple/protocols/novell/novell.c:1647
 #, c-format
 msgid "Unable to change server side privacy settings (%s)."
 msgstr "⊥其撩函垢靽格寥梁閮剖 (%s)"
@@ -6371,7 +6369,7 @@
 msgstr "⊥撱箇霅 (%s)"
 
 #: ../libpurple/protocols/novell/novell.c:1121
-#: ../libpurple/protocols/novell/novell.c:1695
+#: ../libpurple/protocols/novell/novell.c:1692
 msgid "Error communicating with server. Closing connection."
 msgstr "隡箸券閮潛航炊蝺"
 
@@ -6388,8 +6386,8 @@
 msgid "Mailstop"
 msgstr "Mail Stop"
 
-#: ../libpurple/protocols/novell/novell.c:1505
-#: ../libpurple/protocols/sametime/sametime.c:4121
+#: ../libpurple/protocols/novell/novell.c:1502
+#: ../libpurple/protocols/sametime/sametime.c:4122
 msgid "User ID"
 msgstr "雿輻刻ID"
 
@@ -6399,43 +6397,43 @@
 #. purple_notify_user_info_add_pair(user_info, tag, value);
 #. }
 #.
-#: ../libpurple/protocols/novell/novell.c:1518
+#: ../libpurple/protocols/novell/novell.c:1515
 msgid "Full name"
 msgstr "典"
 
 #  NOTEGroupWise航隞嗅蝔梧甇撘銝剜憭扳銝胯蝢斤...
-#: ../libpurple/protocols/novell/novell.c:1640
+#: ../libpurple/protocols/novell/novell.c:1637
 #, c-format
 msgid "GroupWise Conference %d"
 msgstr "GroupWise 霅 %d"
 
-#: ../libpurple/protocols/novell/novell.c:1671
+#: ../libpurple/protocols/novell/novell.c:1668
 msgid "Unable to make SSL connection to server."
 msgstr "⊥雿輻 SSL 摰蝺唬撩具"
 
-#: ../libpurple/protocols/novell/novell.c:1723
+#: ../libpurple/protocols/novell/novell.c:1720
 msgid "Authenticating..."
 msgstr "隤霅銝..."
 
+#: ../libpurple/protocols/novell/novell.c:1732
+msgid "Unable to connect to server."
+msgstr "⊥蝺唬撩具"
+
 #: ../libpurple/protocols/novell/novell.c:1735
-msgid "Unable to connect to server."
-msgstr "⊥蝺唬撩具"
-
-#: ../libpurple/protocols/novell/novell.c:1738
 msgid "Waiting for response..."
 msgstr "蝑敺閬銝..."
 
-#: ../libpurple/protocols/novell/novell.c:1873
+#: ../libpurple/protocols/novell/novell.c:1870
 #, c-format
 msgid "%s has been invited to this conversation."
 msgstr "隢鈭 %s 仿鈭方"
 
-#: ../libpurple/protocols/novell/novell.c:1901
+#: ../libpurple/protocols/novell/novell.c:1898
 msgid "Invitation to Conversation"
 msgstr "隢乩漱隢"
 
 #  NOTESent靽澆粹隢
-#: ../libpurple/protocols/novell/novell.c:1902
+#: ../libpurple/protocols/novell/novell.c:1899
 #, c-format
 msgid ""
 "Invitation from: %s\n"
@@ -6446,17 +6444,17 @@
 "\n"
 "嚗%s"
 
-#: ../libpurple/protocols/novell/novell.c:1904
+#: ../libpurple/protocols/novell/novell.c:1901
 msgid "Would you like to join the conversation?"
 msgstr "刻亙鈭方嚗"
 
 # XXX 怨陌
 #. we don't want to reconnect in this case
-#: ../libpurple/protocols/novell/novell.c:2013
+#: ../libpurple/protocols/novell/novell.c:2012
 msgid "You have been logged out because you logged in at another workstation."
 msgstr "典歇蝬鋡怎餃綽箸典歇典嗡餉虫餃乓"
 
-#: ../libpurple/protocols/novell/novell.c:2070
+#: ../libpurple/protocols/novell/novell.c:2069
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
@@ -6466,17 +6464,17 @@
 #. *  purple_request_fields(gc, _("Server Address"),...);
 #.
 #. ...but for now just error out with a nice message.
-#: ../libpurple/protocols/novell/novell.c:2168
+#: ../libpurple/protocols/novell/novell.c:2167
 msgid ""
 "Unable to connect to server. Please enter the address of the server you wish "
 "to connect to."
 msgstr "⊥蝺喃撩具隢頛詨交典蝺喟隡箸函雿"
 
-#: ../libpurple/protocols/novell/novell.c:2196
+#: ../libpurple/protocols/novell/novell.c:2195
 msgid "Error. SSL support is not installed."
 msgstr "航炊嚗瘝摰鋆 SSL 舀氬"
 
-#: ../libpurple/protocols/novell/novell.c:2505
+#: ../libpurple/protocols/novell/novell.c:2504
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "霅啣歇蝬⊥蝜潛箔遙雿閮胯"
 
@@ -6490,22 +6488,22 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/novell/novell.c:3514
-#: ../libpurple/protocols/novell/novell.c:3516
+#: ../libpurple/protocols/novell/novell.c:3518
+#: ../libpurple/protocols/novell/novell.c:3520
 msgid "Novell GroupWise Messenger Protocol Plugin"
 msgstr "Novell GroupWise Messenger 摰璅∠"
 
-#: ../libpurple/protocols/novell/novell.c:3535
+#: ../libpurple/protocols/novell/novell.c:3545
 msgid "Server address"
 msgstr "隡箸其"
 
-#: ../libpurple/protocols/novell/novell.c:3539
+#: ../libpurple/protocols/novell/novell.c:3549
 msgid "Server port"
 msgstr "隡箸券閮"
 
 #: ../libpurple/protocols/oscar/flap_connection.c:379
-#: ../libpurple/protocols/yahoo/yahoo.c:2287
-#: ../libpurple/protocols/yahoo/yahoo.c:2446
+#: ../libpurple/protocols/yahoo/yahoo.c:2290
+#: ../libpurple/protocols/yahoo/yahoo.c:2449
 #: ../libpurple/protocols/yahoo/ycht.c:481 ../libpurple/proxy.c:580
 #: ../libpurple/proxy.c:1085 ../libpurple/proxy.c:1196
 #: ../libpurple/proxy.c:1296 ../libpurple/proxy.c:1424
@@ -6513,8 +6511,8 @@
 msgstr "隡箸券蝺"
 
 #: ../libpurple/protocols/oscar/flap_connection.c:381
-#: ../libpurple/protocols/yahoo/yahoo.c:2281
-#: ../libpurple/protocols/yahoo/yahoo.c:2440 ../libpurple/proxy.c:592
+#: ../libpurple/protocols/yahoo/yahoo.c:2284
+#: ../libpurple/protocols/yahoo/yahoo.c:2443 ../libpurple/proxy.c:592
 #: ../libpurple/proxy.c:1097 ../libpurple/proxy.c:1208
 #: ../libpurple/proxy.c:1308 ../libpurple/proxy.c:1436
 #, c-format
@@ -6551,8 +6549,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/oscar/libaim.c:112
-#: ../libpurple/protocols/oscar/libaim.c:114
+#: ../libpurple/protocols/oscar/libaim.c:118
+#: ../libpurple/protocols/oscar/libaim.c:120
 msgid "AIM Protocol Plugin"
 msgstr "AIM 摰璅∠"
 
@@ -6566,14 +6564,14 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/oscar/libicq.c:112
-#: ../libpurple/protocols/oscar/libicq.c:114
+#: ../libpurple/protocols/oscar/libicq.c:118
+#: ../libpurple/protocols/oscar/libicq.c:120
 msgid "ICQ Protocol Plugin"
 msgstr "ICQ 摰璅∠"
 
-#: ../libpurple/protocols/oscar/libicq.c:135
-#: ../libpurple/protocols/yahoo/yahoo.c:4069
-#: ../libpurple/protocols/zephyr/zephyr.c:2984
+#: ../libpurple/protocols/oscar/libicq.c:147
+#: ../libpurple/protocols/yahoo/yahoo.c:4094
+#: ../libpurple/protocols/zephyr/zephyr.c:2997
 msgid "Encoding"
 msgstr "蝺函Ⅳ"
 
@@ -6708,7 +6706,7 @@
 msgid "Not while on AOL"
 msgstr " AOL 銝閮"
 
-#: ../libpurple/protocols/oscar/oscar.c:329
+#: ../libpurple/protocols/oscar/oscar.c:330
 msgid ""
 "(There was an error receiving this message.  The buddy you are speaking with "
 "is probably using a different encoding than expected.  If you know what "
@@ -6719,7 +6717,7 @@
 "蝺函Ⅳ嚗憒函仿臭暻潛楊蝣潘隢冽函 AIM/ICQ 撣唾脤閮剖銝剔蝺函Ⅳ"
 "甈雿摰嚗"
 
-#: ../libpurple/protocols/oscar/oscar.c:438
+#: ../libpurple/protocols/oscar/oscar.c:439
 #, c-format
 msgid ""
 "(There was an error receiving this message.  Either you and %s have "
@@ -6729,53 +6727,54 @@
 "冽憿冽嗥垢蝔撘嚗"
 
 #. Label
-#: ../libpurple/protocols/oscar/oscar.c:620 ../pidgin/gtkutils.c:2335
-#: ../pidgin/gtkutils.c:2357
+#: ../libpurple/protocols/oscar/oscar.c:621 ../pidgin/gtkutils.c:2386
+#: ../pidgin/gtkutils.c:2416
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:338
 msgid "Buddy Icon"
 msgstr "憟賢蝷"
 
-#: ../libpurple/protocols/oscar/oscar.c:623
+#: ../libpurple/protocols/oscar/oscar.c:624
 msgid "Voice"
 msgstr "脤"
 
 # NOTE 撠湔交胯寡陌箝單閮胯
-#: ../libpurple/protocols/oscar/oscar.c:626
+#: ../libpurple/protocols/oscar/oscar.c:627
 msgid "AIM Direct IM"
 msgstr "AIM 撘單閮"
 
-#: ../libpurple/protocols/oscar/oscar.c:629
+#: ../libpurple/protocols/oscar/oscar.c:630
 #: ../libpurple/protocols/silc/silc.c:687
 #: ../libpurple/protocols/silc/util.c:549
 msgid "Chat"
 msgstr "憭"
 
-#: ../libpurple/protocols/oscar/oscar.c:632
-#: ../libpurple/protocols/oscar/oscar.c:5955
+#: ../libpurple/protocols/oscar/oscar.c:633
+#: ../libpurple/protocols/oscar/oscar.c:5920
 msgid "Get File"
 msgstr "交嗆獢"
 
-#: ../libpurple/protocols/oscar/oscar.c:639
+#: ../libpurple/protocols/oscar/oscar.c:640
 msgid "Games"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:642
+#: ../libpurple/protocols/oscar/oscar.c:643
 msgid "Add-Ins"
 msgstr "璅∠"
 
-#: ../libpurple/protocols/oscar/oscar.c:645
+#: ../libpurple/protocols/oscar/oscar.c:646
 msgid "Send Buddy List"
 msgstr "箏末皜"
 
-#: ../libpurple/protocols/oscar/oscar.c:648
+#: ../libpurple/protocols/oscar/oscar.c:649
 msgid "ICQ Direct Connect"
 msgstr "ICQ 撘湔仿蝺"
 
-#: ../libpurple/protocols/oscar/oscar.c:651
+# NOTE 嗡PO瑼霅舀嚗AP閰脖胯函撘
+#: ../libpurple/protocols/oscar/oscar.c:652
 msgid "AP User"
-msgstr "函撘雿輻刻"
-
-#: ../libpurple/protocols/oscar/oscar.c:654
+msgstr "AP 雿輻刻"
+
+#: ../libpurple/protocols/oscar/oscar.c:655
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
@@ -6786,100 +6785,100 @@
 # NOTE (18:17:29) KingAnt: Right...
 # NOTE (18:17:36) wing: what does that mean though?
 # NOTE (18:17:48) KingAnt: I have no idea--probably nothing
-#: ../libpurple/protocols/oscar/oscar.c:657
+#: ../libpurple/protocols/oscar/oscar.c:658
 msgid "Nihilist"
 msgstr "Nihilist"
 
-#: ../libpurple/protocols/oscar/oscar.c:660
+#: ../libpurple/protocols/oscar/oscar.c:661
 msgid "ICQ Server Relay"
 msgstr "ICQ 隡箸刻"
 
-#: ../libpurple/protocols/oscar/oscar.c:663
+#: ../libpurple/protocols/oscar/oscar.c:664
 msgid "Old ICQ UTF8"
 msgstr "撘 ICQ UTF8"
 
-#: ../libpurple/protocols/oscar/oscar.c:666
+#: ../libpurple/protocols/oscar/oscar.c:667
 msgid "Trillian Encryption"
 msgstr "Trillian 撖"
 
-#: ../libpurple/protocols/oscar/oscar.c:669
+#: ../libpurple/protocols/oscar/oscar.c:670
 msgid "ICQ UTF8"
 msgstr "ICQ UTF8"
 
 # NOTE 隡潔臭蝔格銝餉衣摮
-#: ../libpurple/protocols/oscar/oscar.c:672
+#: ../libpurple/protocols/oscar/oscar.c:673
 msgid "Hiptop"
 msgstr "Hiptop"
 
-#: ../libpurple/protocols/oscar/oscar.c:675
+#: ../libpurple/protocols/oscar/oscar.c:676
 msgid "Security Enabled"
 msgstr "靽摰"
 
 # XXX 怨陌
-#: ../libpurple/protocols/oscar/oscar.c:678
+#: ../libpurple/protocols/oscar/oscar.c:679
 msgid "Video Chat"
 msgstr "閬憭"
 
 # XXX 怨陌
-#: ../libpurple/protocols/oscar/oscar.c:682
+#: ../libpurple/protocols/oscar/oscar.c:683
 msgid "iChat AV"
 msgstr "iChat 閬憭"
 
-#: ../libpurple/protocols/oscar/oscar.c:685
+#: ../libpurple/protocols/oscar/oscar.c:686
 msgid "Live Video"
 msgstr "閬閮"
 
 #  NOTE AIM_CAPS_CAMERA嚗單臭暻澆(^^;)
-#: ../libpurple/protocols/oscar/oscar.c:688
+#: ../libpurple/protocols/oscar/oscar.c:689
 msgid "Camera"
 msgstr "抒豢"
 
-#: ../libpurple/protocols/oscar/oscar.c:706
-#: ../libpurple/protocols/oscar/oscar.c:5728
+#: ../libpurple/protocols/oscar/oscar.c:707
+#: ../libpurple/protocols/oscar/oscar.c:5690
 msgid "Free For Chat"
 msgstr "蝛箄憭"
 
-#: ../libpurple/protocols/oscar/oscar.c:710
-#: ../libpurple/protocols/oscar/oscar.c:5763
+#: ../libpurple/protocols/oscar/oscar.c:711
+#: ../libpurple/protocols/oscar/oscar.c:5725
 msgid "Not Available"
 msgstr "瑟a"
 
-#: ../libpurple/protocols/oscar/oscar.c:712
-#: ../libpurple/protocols/oscar/oscar.c:5749
+#: ../libpurple/protocols/oscar/oscar.c:713
+#: ../libpurple/protocols/oscar/oscar.c:5711
 msgid "Occupied"
 msgstr "敹蝣"
 
 # NOTE  http://www.geocities.com/Athens/Delphi/6470/icq99.html
-#: ../libpurple/protocols/oscar/oscar.c:716
+#: ../libpurple/protocols/oscar/oscar.c:717
 msgid "Web Aware"
 msgstr "閮勗嗡雿輻刻函雯頝臭亦函桀"
 
-#: ../libpurple/protocols/oscar/oscar.c:718 ../libpurple/protocols/qq/qq.c:183
-#: ../libpurple/protocols/yahoo/yahoo.c:2894 ../libpurple/status.c:157
-#: ../pidgin/gtkdocklet.c:454 ../pidgin/gtkstatusbox.c:1091
+#: ../libpurple/protocols/oscar/oscar.c:719 ../libpurple/protocols/qq/qq.c:183
+#: ../libpurple/protocols/yahoo/yahoo.c:2896 ../libpurple/status.c:156
+#: ../pidgin/gtkdocklet.c:446 ../pidgin/gtkstatusbox.c:1053
 msgid "Invisible"
 msgstr "梯澈"
 
-#: ../libpurple/protocols/oscar/oscar.c:720
+#: ../libpurple/protocols/oscar/oscar.c:721
 msgid "Online"
 msgstr "銝蝺"
 
-#: ../libpurple/protocols/oscar/oscar.c:819
-#: ../libpurple/protocols/oscar/oscar.c:3709
+#: ../libpurple/protocols/oscar/oscar.c:820
+#: ../libpurple/protocols/oscar/oscar.c:3694
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:697 ../pidgin/gtkprefs.c:1015
 msgid "IP Address"
 msgstr "IP 雿"
 
-#: ../libpurple/protocols/oscar/oscar.c:826
-#: ../libpurple/protocols/oscar/oscar.c:2854
+#: ../libpurple/protocols/oscar/oscar.c:827
+#: ../libpurple/protocols/oscar/oscar.c:2846
 msgid "Warning Level"
 msgstr "霅血蝑蝝"
 
-#: ../libpurple/protocols/oscar/oscar.c:836
+#: ../libpurple/protocols/oscar/oscar.c:837
 msgid "Buddy Comment"
 msgstr "憟賢隤芣"
 
-#: ../libpurple/protocols/oscar/oscar.c:976
+#: ../libpurple/protocols/oscar/oscar.c:977
 #, c-format
 msgid ""
 "Could not connect to authentication server:\n"
@@ -6888,7 +6887,7 @@
 "⊥蝺唾霅隡箸剁\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:984
+#: ../libpurple/protocols/oscar/oscar.c:985
 #, c-format
 msgid ""
 "Could not connect to BOS server:\n"
@@ -6897,20 +6896,20 @@
 "⊥蝺 BOS 隡箸剁\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:1024
+#: ../libpurple/protocols/oscar/oscar.c:1025
 msgid "Screen name sent"
 msgstr "箏董"
 
-#: ../libpurple/protocols/oscar/oscar.c:1029
+#: ../libpurple/protocols/oscar/oscar.c:1030
 msgid "Connection established, cookie sent"
 msgstr "蝺撌脣遣蝡嚗銝血歇 Cookie"
 
 #. TODO: Don't call this with ssi
-#: ../libpurple/protocols/oscar/oscar.c:1058
+#: ../libpurple/protocols/oscar/oscar.c:1059
 msgid "Finalizing connection"
 msgstr "摰蝺"
 
-#: ../libpurple/protocols/oscar/oscar.c:1242
+#: ../libpurple/protocols/oscar/oscar.c:1243
 #, c-format
 msgid ""
 "Unable to login: Could not sign on as %s because the screen name is "
@@ -6920,75 +6919,76 @@
 "⊥餃伐⊥隞 %s 頨思遢餃伐粹撣唾舐⊥撣唾敹隞亥望摮瘥韏瑕嚗"
 "銝血芸怨望摮瘥詨蝛箇踝芰望詨蝯"
 
-#: ../libpurple/protocols/oscar/oscar.c:1327
-#: ../libpurple/protocols/yahoo/yahoo.c:1929
+#: ../libpurple/protocols/oscar/oscar.c:1328
+#: ../libpurple/protocols/yahoo/yahoo.c:1932
 msgid "Invalid screen name."
 msgstr "撣唾⊥"
 
-#: ../libpurple/protocols/oscar/oscar.c:1334
+#: ../libpurple/protocols/oscar/oscar.c:1335
 #: ../libpurple/protocols/qq/login_logout.c:483
-#: ../libpurple/protocols/simple/simple.c:1035
-#: ../libpurple/protocols/yahoo/yahoo.c:1947
+#: ../libpurple/protocols/simple/simple.c:1037
+#: ../libpurple/protocols/yahoo/yahoo.c:1950
 msgid "Incorrect password."
 msgstr "航炊撖蝣潦"
 
-#: ../libpurple/protocols/oscar/oscar.c:1339
+#: ../libpurple/protocols/oscar/oscar.c:1340
 msgid "Your account is currently suspended."
 msgstr "函撣唾桀其葉"
 
 #  NOTE急⊥雿輻具閰脫急銝摮具
 #  NOTE 霅舀游 by Ambrose
 #. service temporarily unavailable
-#: ../libpurple/protocols/oscar/oscar.c:1343
+#: ../libpurple/protocols/oscar/oscar.c:1344
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "急⊥雿輻 AOL 單閮舀"
 
-#: ../libpurple/protocols/oscar/oscar.c:1348
+#: ../libpurple/protocols/oscar/oscar.c:1349
+#: ../libpurple/protocols/oscar/oscar.c:1360
 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."
 msgstr ""
-"函蝺嚗瑞雿憭芷餌隢蝑敺敺銵閰艾憒其嗥匱蝥閰西"
-"蝺嚗暻潭函蝑敺撠游撱園瑯"
-
-#: ../libpurple/protocols/oscar/oscar.c:1353
+"函蝺嚗瑞雿憭芷餌隢蝑敺敺銵閰艾憒其嗥匱蝥閰阡蝺嚗"
+"暻潭函蝑敺撠游撱園瑯"
+
+#: ../libpurple/protocols/oscar/oscar.c:1354
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr "冽雿輻函冽嗥垢蝔撘憭芷隢 %s 湔"
 
-#: ../libpurple/protocols/oscar/oscar.c:1388
+#: ../libpurple/protocols/oscar/oscar.c:1394
 msgid "Could Not Connect"
 msgstr "⊥蝺"
 
-#: ../libpurple/protocols/oscar/oscar.c:1393
+#: ../libpurple/protocols/oscar/oscar.c:1399
 msgid "Received authorization"
 msgstr "嗅啗霅"
 
-#: ../libpurple/protocols/oscar/oscar.c:1416
+#: ../libpurple/protocols/oscar/oscar.c:1422
 msgid "The SecurID key entered is invalid."
 msgstr "冽頛詨亦 SecurID 蝣潛⊥"
 
-#: ../libpurple/protocols/oscar/oscar.c:1430
+#: ../libpurple/protocols/oscar/oscar.c:1436
 msgid "Enter SecurID"
 msgstr "隢頛詨 SecurID"
 
-#: ../libpurple/protocols/oscar/oscar.c:1431
+#: ../libpurple/protocols/oscar/oscar.c:1437
 msgid "Enter the 6 digit number from the digital display."
 msgstr "隢頛詨交貊Ⅳ憿舐內冽憿舐內凋詨"
 
 #. *
 #. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
 #.
-#: ../libpurple/protocols/oscar/oscar.c:1433
-#: ../libpurple/protocols/oscar/oscar.c:2242
-#: ../libpurple/protocols/oscar/oscar.c:2288
-#: ../libpurple/protocols/oscar/oscar.c:5833
-#: ../libpurple/protocols/oscar/oscar.c:6109 ../libpurple/request.h:1350
+#: ../libpurple/protocols/oscar/oscar.c:1439
+#: ../libpurple/protocols/oscar/oscar.c:2230
+#: ../libpurple/protocols/oscar/oscar.c:2277
+#: ../libpurple/protocols/oscar/oscar.c:5795
+#: ../libpurple/protocols/oscar/oscar.c:6076 ../libpurple/request.h:1387
 msgid "_OK"
 msgstr "蝣箏(_O)"
 
-#: ../libpurple/protocols/oscar/oscar.c:1471
-#: ../libpurple/protocols/oscar/oscar.c:1514
+#: ../libpurple/protocols/oscar/oscar.c:1478
+#: ../libpurple/protocols/oscar/oscar.c:1521
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
@@ -6997,53 +6997,53 @@
 "典航賣剜銝剜琿蝺典航賣喳券憿鋡思耨甇敺雿輻 TOC隢 %s "
 "瘝湔啜"
 
-#: ../libpurple/protocols/oscar/oscar.c:1474
-#: ../libpurple/protocols/oscar/oscar.c:1517
+#: ../libpurple/protocols/oscar/oscar.c:1481
+#: ../libpurple/protocols/oscar/oscar.c:1524
 msgid "Unable to get a valid AIM login hash."
 msgstr "⊥敺 AIM 餃亦Ⅳ"
 
-#: ../libpurple/protocols/oscar/oscar.c:1603
+#: ../libpurple/protocols/oscar/oscar.c:1610
 #, c-format
 msgid "You may be disconnected shortly.  Check %s for updates."
 msgstr "典航賣剜銝剜琿蝺隢 %s 瘝湔啜"
 
-#: ../libpurple/protocols/oscar/oscar.c:1606
+#: ../libpurple/protocols/oscar/oscar.c:1613
 msgid "Unable to get a valid login hash."
 msgstr "⊥敺餃亦Ⅳ"
 
-#: ../libpurple/protocols/oscar/oscar.c:1632
+#: ../libpurple/protocols/oscar/oscar.c:1639
 msgid "Password sent"
 msgstr "撖蝣潮"
 
-#: ../libpurple/protocols/oscar/oscar.c:1688
+#: ../libpurple/protocols/oscar/oscar.c:1695
 msgid "Unable to initialize connection"
 msgstr "⊥憪蝯"
 
-#: ../libpurple/protocols/oscar/oscar.c:2212
+#: ../libpurple/protocols/oscar/oscar.c:2200
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr "隢隤霅閬瘙嚗憟質臭誑撠典交憟賢皜桐葉"
 
-#: ../libpurple/protocols/oscar/oscar.c:2240
+#: ../libpurple/protocols/oscar/oscar.c:2228
 msgid "Authorization Request Message:"
 msgstr "隤霅閬瘙閮荔"
 
-#: ../libpurple/protocols/oscar/oscar.c:2241
+#: ../libpurple/protocols/oscar/oscar.c:2229
 msgid "Please authorize me!"
 msgstr "隢隤霅嚗"
 
-#: ../libpurple/protocols/oscar/oscar.c:2280
-#: ../libpurple/protocols/oscar/oscar.c:2287
-#: ../libpurple/protocols/oscar/oscar.c:2413
-#: ../libpurple/protocols/oscar/oscar.c:5221
-#: ../libpurple/protocols/yahoo/yahoo.c:986
+#: ../libpurple/protocols/oscar/oscar.c:2269
+#: ../libpurple/protocols/oscar/oscar.c:2276
+#: ../libpurple/protocols/oscar/oscar.c:2403
+#: ../libpurple/protocols/oscar/oscar.c:5193
+#: ../libpurple/protocols/yahoo/yahoo.c:985
 msgid "No reason given."
 msgstr "瘝蝯虫"
 
-#: ../libpurple/protocols/oscar/oscar.c:2286
+#: ../libpurple/protocols/oscar/oscar.c:2275
 msgid "Authorization Denied Message:"
 msgstr "蝯隤霅閮荔"
 
-#: ../libpurple/protocols/oscar/oscar.c:2413
+#: ../libpurple/protocols/oscar/oscar.c:2403
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -7053,17 +7053,17 @@
 "雿輻刻 %u 箔嚗蝯鈭典嗅亙末皜桃閬瘙嚗\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2414
+#: ../libpurple/protocols/oscar/oscar.c:2404
 msgid "ICQ authorization denied."
 msgstr "ICQ 隤霅蝯"
 
 #. Someone has granted you authorization
-#: ../libpurple/protocols/oscar/oscar.c:2421
+#: ../libpurple/protocols/oscar/oscar.c:2411
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
 msgstr "雿輻刻 %u 鈭典嗅亙末皜桃閬瘙"
 
-#: ../libpurple/protocols/oscar/oscar.c:2429
+#: ../libpurple/protocols/oscar/oscar.c:2419
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -7076,7 +7076,7 @@
 "靘迎%s [%s]\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2437
+#: ../libpurple/protocols/oscar/oscar.c:2427
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -7089,7 +7089,7 @@
 "靘迎%s [%s]\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2445
+#: ../libpurple/protocols/oscar/oscar.c:2435
 #, c-format
 msgid ""
 "You have received an ICQ e-mail from %s [%s]\n"
@@ -7102,38 +7102,38 @@
 "閮舐綽\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2466
+#: ../libpurple/protocols/oscar/oscar.c:2456
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
 msgstr "ICQ 雿輻刻 %u 靘銝憟賢鞈閮嚗%s (%s)"
 
-#: ../libpurple/protocols/oscar/oscar.c:2472
+#: ../libpurple/protocols/oscar/oscar.c:2462
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr "冽喳隞嚗憟對亙唳函憟賢桐葉嚗"
 
-#: ../libpurple/protocols/oscar/oscar.c:2475 ../pidgin/gtkroomlist.c:308
+#: ../libpurple/protocols/oscar/oscar.c:2467 ../pidgin/gtkroomlist.c:308
 msgid "_Add"
 msgstr "(_A)"
 
-#: ../libpurple/protocols/oscar/oscar.c:2476
+#: ../libpurple/protocols/oscar/oscar.c:2468
 msgid "_Decline"
 msgstr "憍(_D)"
 
-#: ../libpurple/protocols/oscar/oscar.c:2560
+#: ../libpurple/protocols/oscar/oscar.c:2552
 #, c-format
 msgid "You missed %hu message from %s because it was invalid."
 msgid_plural "You missed %hu messages from %s because they were invalid."
 msgstr[0] "券箏仃鈭 %hu  %s 靘閮荔箏舐⊥"
 msgstr[1] "券箏仃鈭 %hu  %s 靘閮荔箏舐⊥"
 
-#: ../libpurple/protocols/oscar/oscar.c:2569
+#: ../libpurple/protocols/oscar/oscar.c:2561
 #, 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] "券箏仃鈭 %hu  %s 靘閮荔箏憭芸之鈭"
 msgstr[1] "券箏仃鈭 %hu  %s 靘閮荔箏憭芸之鈭"
 
-#: ../libpurple/protocols/oscar/oscar.c:2578
+#: ../libpurple/protocols/oscar/oscar.c:2570
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -7143,21 +7143,21 @@
 msgstr[1] "券箏仃鈭 %hu  %s 靘閮荔箏喲摨血云敹怒"
 
 # XXX 頝祈剜霅航 (Arto) 嚗渲陌芣∼憟賢銵銝嚗銝
-#: ../libpurple/protocols/oscar/oscar.c:2587
+#: ../libpurple/protocols/oscar/oscar.c:2579
 #, 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] "券箏仃鈭 %hu  %s 靘閮荔箔嚗憟對憭芷芣∩"
 msgstr[1] "券箏仃鈭 %hu  %s 靘閮荔箔嚗憟對憭芷芣∩"
 
-#: ../libpurple/protocols/oscar/oscar.c:2596
+#: ../libpurple/protocols/oscar/oscar.c:2588
 #, 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] "券箏仃鈭 %hu  %s 靘閮荔箸典云芣∩"
 msgstr[1] "券箏仃鈭 %hu  %s 靘閮荔箸典云芣∩"
 
-#: ../libpurple/protocols/oscar/oscar.c:2605
+#: ../libpurple/protocols/oscar/oscar.c:2597
 #, 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."
@@ -7165,74 +7165,70 @@
 msgstr[1] "券箏仃鈭 %hu  %s 靘閮荔銝"
 
 #. Data is assumed to be the destination sn
-#: ../libpurple/protocols/oscar/oscar.c:2760
+#: ../libpurple/protocols/oscar/oscar.c:2752
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "⊥箄荔%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2760
-#: ../libpurple/protocols/oscar/oscar.c:2765
-#: ../libpurple/protocols/oscar/oscar.c:2827
-#: ../libpurple/protocols/oscar/oscar.c:2831
+#: ../libpurple/protocols/oscar/oscar.c:2752
+#: ../libpurple/protocols/oscar/oscar.c:2757
+#: ../libpurple/protocols/oscar/oscar.c:2819
+#: ../libpurple/protocols/oscar/oscar.c:2823
 msgid "Unknown reason."
 msgstr "銝"
 
-#: ../libpurple/protocols/oscar/oscar.c:2763
+#: ../libpurple/protocols/oscar/oscar.c:2755
 #: ../libpurple/protocols/sametime/sametime.c:2409
 #, c-format
 msgid "Unable to send message to %s:"
 msgstr "⊥箄航 %s嚗"
 
-#: ../libpurple/protocols/oscar/oscar.c:2827
+#: ../libpurple/protocols/oscar/oscar.c:2819
 #, c-format
 msgid "User information not available: %s"
 msgstr "⊥敺鈭箄閮嚗%s"
 
 # NOTE 霅舀游 by Ambrose
-#: ../libpurple/protocols/oscar/oscar.c:2830
+#: ../libpurple/protocols/oscar/oscar.c:2822
 #, c-format
 msgid "User information for %s unavailable:"
 msgstr "⊥敺雿輻刻 %s 鈭箄閮嚗"
 
-#: ../libpurple/protocols/oscar/oscar.c:2859
+#: ../libpurple/protocols/oscar/oscar.c:2851
 msgid "Online Since"
 msgstr "銝蝺"
 
 # XXX 寡陌閮餃交行頛嚗
-#: ../libpurple/protocols/oscar/oscar.c:2864
+#: ../libpurple/protocols/oscar/oscar.c:2856
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1161
 msgid "Member Since"
 msgstr "箸∠"
 
-#: ../libpurple/protocols/oscar/oscar.c:2869
+#: ../libpurple/protocols/oscar/oscar.c:2861
 msgid "Capabilities"
 msgstr "詨捆"
 
-#: ../libpurple/protocols/oscar/oscar.c:2887
+#: ../libpurple/protocols/oscar/oscar.c:2891
 msgid "Available Message"
 msgstr "撠閮"
 
-#: ../libpurple/protocols/oscar/oscar.c:2913
+#: ../libpurple/protocols/oscar/oscar.c:2917
 msgid "Profile"
 msgstr "鈭箄"
 
-#: ../libpurple/protocols/oscar/oscar.c:2990
+#: ../libpurple/protocols/oscar/oscar.c:2994
 msgid "Your AIM connection may be lost."
 msgstr "函 AIM 航賣瑞鈭"
 
 #  The conversion failed!
 #. The conversion failed!
-#: ../libpurple/protocols/oscar/oscar.c:3177
+#: ../libpurple/protocols/oscar/oscar.c:3181
 msgid ""
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
 msgstr "⊥憿舐內靘芷雿輻刻閮荔箏思⊥摮"
 
-#: ../libpurple/protocols/oscar/oscar.c:3398
-msgid "Rate limiting error."
-msgstr "園航炊"
-
-#: ../libpurple/protocols/oscar/oscar.c:3399
+#: ../libpurple/protocols/oscar/oscar.c:3384
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
@@ -7240,113 +7236,113 @@
 "冽餈銝雿⊥摰嚗箸典歇蝬啁潮閮舫銝隢蝑敺蝘敺"
 "閰虫甈∼"
 
-#: ../libpurple/protocols/oscar/oscar.c:3471
+#: ../libpurple/protocols/oscar/oscar.c:3456
 msgid "You have been signed off for an unknown reason."
 msgstr "典箔餃箝"
 
-#: ../libpurple/protocols/oscar/oscar.c:3484
+#: ../libpurple/protocols/oscar/oscar.c:3469
 #: ../libpurple/protocols/toc/toc.c:977
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "典歇蝬梯憭拙恕 %s 甇a蝺"
 
-#: ../libpurple/protocols/oscar/oscar.c:3731
+#: ../libpurple/protocols/oscar/oscar.c:3716
 #: ../libpurple/protocols/silc/util.c:581
 msgid "Mobile Phone"
-msgstr "銵餉店"
-
-#: ../libpurple/protocols/oscar/oscar.c:3761
+msgstr "瘚餉店"
+
+#: ../libpurple/protocols/oscar/oscar.c:3746
 msgid "Personal Web Page"
 msgstr "鈭箇雯"
 
-#: ../libpurple/protocols/oscar/oscar.c:3785
+#: ../libpurple/protocols/oscar/oscar.c:3770
 #: ../libpurple/protocols/qq/buddy_info.c:40
 msgid "Additional Information"
 msgstr "嗡鞈閮"
 
-#: ../libpurple/protocols/oscar/oscar.c:3793
-#: ../libpurple/protocols/oscar/oscar.c:3806
+#: ../libpurple/protocols/oscar/oscar.c:3778
+#: ../libpurple/protocols/oscar/oscar.c:3791
 msgid "Zip Code"
 msgstr "菟"
 
-#: ../libpurple/protocols/oscar/oscar.c:3817
+#: ../libpurple/protocols/oscar/oscar.c:3802
 msgid "Division"
 msgstr "券"
 
-#: ../libpurple/protocols/oscar/oscar.c:3818
+#: ../libpurple/protocols/oscar/oscar.c:3803
 msgid "Position"
 msgstr "瑚"
 
-#: ../libpurple/protocols/oscar/oscar.c:3820
+#: ../libpurple/protocols/oscar/oscar.c:3805
 msgid "Web Page"
 msgstr "蝬脤"
 
-#: ../libpurple/protocols/oscar/oscar.c:3823
+#: ../libpurple/protocols/oscar/oscar.c:3808
 msgid "Work Information"
 msgstr "撌乩鞈閮"
 
 # XXX 臭暻 (敶V箇曄)嚗 (憟賢臭誑霅胯閮胯??)
-#: ../libpurple/protocols/oscar/oscar.c:3879
+#: ../libpurple/protocols/oscar/oscar.c:3864
 msgid "Pop-Up Message"
 msgstr "敶箄"
 
 # Patch by Kevin Leung
-#: ../libpurple/protocols/oscar/oscar.c:3919
+#: ../libpurple/protocols/oscar/oscar.c:3904
 #, c-format
 msgid "The following screen name is associated with %s"
 msgid_plural "The following screen names are associated with %s"
 msgstr[0] "銝 %s 撣唾"
 msgstr[1] "銝 %s 撣唾"
 
-#: ../libpurple/protocols/oscar/oscar.c:3924
+#: ../libpurple/protocols/oscar/oscar.c:3909
 msgid "Screen name"
 msgstr "撣唾"
 
-#: ../libpurple/protocols/oscar/oscar.c:3950
+#: ../libpurple/protocols/oscar/oscar.c:3935
 #, c-format
 msgid "No results found for e-mail address %s"
 msgstr "曆啣餃萎辣啣 %s 賊蝯"
 
-#: ../libpurple/protocols/oscar/oscar.c:3971
+#: ../libpurple/protocols/oscar/oscar.c:3956
 #, c-format
 msgid "You should receive an e-mail asking to confirm %s."
 msgstr "冽閰脫嗅唬撠閬瘙撠 %s 脰隤霅餃萎辣"
 
-#: ../libpurple/protocols/oscar/oscar.c:3973
+#: ../libpurple/protocols/oscar/oscar.c:3958
 msgid "Account Confirmation Requested"
 msgstr "撣唾蝣箄"
 
-#: ../libpurple/protocols/oscar/oscar.c:4004
+#: ../libpurple/protocols/oscar/oscar.c:3989
 msgid "Error Changing Account Info"
 msgstr "湔孵董鞈閮航炊"
 
-#: ../libpurple/protocols/oscar/oscar.c:4007
+#: ../libpurple/protocols/oscar/oscar.c:3992
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
 "differs from the original."
 msgstr "航炊 0x%04x嚗⊥澆撣唾嚗箄瘙撣唾祉銝"
 
-#: ../libpurple/protocols/oscar/oscar.c:4010
+#: ../libpurple/protocols/oscar/oscar.c:3995
 #, c-format
 msgid "Error 0x%04x: Unable to format screen name because it is invalid."
 msgstr "航炊 0x%04x嚗⊥澆撣唾嚗箏舐⊥"
 
-#: ../libpurple/protocols/oscar/oscar.c:4013
+#: ../libpurple/protocols/oscar/oscar.c:3998
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
 "is too long."
 msgstr "航炊 0x%04x嚗⊥澆撣唾嚗箄瘙撣唾憭芷瑯"
 
-#: ../libpurple/protocols/oscar/oscar.c:4016
+#: ../libpurple/protocols/oscar/oscar.c:4001
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because there is already a "
 "request pending for this screen name."
 msgstr "航炊 0x%04x嚗⊥寡餃萎辣啣嚗粹撣唾撠閬瘙蝑敺"
 
-#: ../libpurple/protocols/oscar/oscar.c:4019
+#: ../libpurple/protocols/oscar/oscar.c:4004
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address has "
@@ -7354,37 +7350,37 @@
 msgstr ""
 "航炊 0x%04x嚗⊥寡餃萎辣啣嚗粹餃萎辣啣憭芸撣唾Y"
 
-#: ../libpurple/protocols/oscar/oscar.c:4022
+#: ../libpurple/protocols/oscar/oscar.c:4007
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address is "
 "invalid."
 msgstr "航炊 0x%04x嚗⊥寡餃萎辣啣嚗粹餃萎辣啣舐⊥"
 
-#: ../libpurple/protocols/oscar/oscar.c:4025
+#: ../libpurple/protocols/oscar/oscar.c:4010
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "航炊 0x%04x嚗芰仿航炊"
 
-#: ../libpurple/protocols/oscar/oscar.c:4035
+#: ../libpurple/protocols/oscar/oscar.c:4020
 #, c-format
 msgid "The e-mail address for %s is %s"
 msgstr "%s 餃萎辣啣 %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:4037
+#: ../libpurple/protocols/oscar/oscar.c:4022
 msgid "Account Info"
 msgstr "撣唾鞈閮"
 
-#: ../libpurple/protocols/oscar/oscar.c:4210
+#: ../libpurple/protocols/oscar/oscar.c:4194
 msgid ""
 "Your IM Image was not sent. You must be Direct Connected to send IM Images."
 msgstr "⊥喲單閮臬蔣嚗閬喲單閮臬蔣嚗敹撠寧湔仿蝺"
 
-#: ../libpurple/protocols/oscar/oscar.c:4462
+#: ../libpurple/protocols/oscar/oscar.c:4439
 msgid "Unable to set AIM profile."
 msgstr "⊥閮剖 AIM 鈭箄"
 
-#: ../libpurple/protocols/oscar/oscar.c:4463
+#: ../libpurple/protocols/oscar/oscar.c:4440
 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 "
@@ -7393,22 +7389,22 @@
 "典冽芰餃亙閬瘙靽格寞函鈭箄閮嚗隞仿鈭鞈閮銝行芾◤靽格嫘隢典餃亙"
 "圈脰閮剖"
 
-#: ../libpurple/protocols/oscar/oscar.c:4477
+#: ../libpurple/protocols/oscar/oscar.c:4454
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  It has been "
-"truncated it for you."
+"truncated for you."
 msgid_plural ""
 "The maximum profile length of %d bytes has been exceeded.  It has been "
-"truncated it for you."
+"truncated for you."
 msgstr[0] "鈭箄閮瑕漲頞箔 %d 雿蝯銝嚗琿典撌脰◤芸颯"
 msgstr[1] "鈭箄閮瑕漲頞箔 %d 雿蝯銝嚗琿典撌脰◤芸颯"
 
-#: ../libpurple/protocols/oscar/oscar.c:4482
+#: ../libpurple/protocols/oscar/oscar.c:4459
 msgid "Profile too long."
 msgstr "鈭箄閮瑯"
 
-#: ../libpurple/protocols/oscar/oscar.c:4527
+#: ../libpurple/protocols/oscar/oscar.c:4504
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  It has been "
@@ -7419,11 +7415,11 @@
 msgstr[0] "a閮舐瑕漲頞箔 %d 雿蝯銝嚗琿典撌脰◤芸颯"
 msgstr[1] "a閮舐瑕漲頞箔 %d 雿蝯銝嚗琿典撌脰◤芸颯"
 
-#: ../libpurple/protocols/oscar/oscar.c:4532
+#: ../libpurple/protocols/oscar/oscar.c:4509
 msgid "Away message too long."
 msgstr "a閮舫瑯"
 
-#: ../libpurple/protocols/oscar/oscar.c:4601
+#: ../libpurple/protocols/oscar/oscar.c:4578
 #, c-format
 msgid ""
 "Could not add the buddy %s because the screen name is invalid.  Screen names "
@@ -7434,17 +7430,17 @@
 "摮瘥粹哨晞望摮瘥詨蝛箇賬蝯嚗桃隞乓"
 "摮蝯"
 
-#: ../libpurple/protocols/oscar/oscar.c:4603
-#: ../libpurple/protocols/oscar/oscar.c:5028
-#: ../libpurple/protocols/oscar/oscar.c:5042
+#: ../libpurple/protocols/oscar/oscar.c:4580
+#: ../libpurple/protocols/oscar/oscar.c:5003
+#: ../libpurple/protocols/oscar/oscar.c:5017
 msgid "Unable To Add"
 msgstr "⊥"
 
-#: ../libpurple/protocols/oscar/oscar.c:4707
+#: ../libpurple/protocols/oscar/oscar.c:4684
 msgid "Unable To Retrieve Buddy List"
 msgstr "⊥霈憟賢皜"
 
-#: ../libpurple/protocols/oscar/oscar.c:4708
+#: ../libpurple/protocols/oscar/oscar.c:4685
 msgid ""
 "The AIM servers were temporarily unable to send your buddy list.  Your buddy "
 "list is not lost, and will probably become available in a few hours."
@@ -7452,16 +7448,16 @@
 "AIM 隡箸冽急⊥箸函憟賢皜柴銝憟賢皜桐蒂瘝箏仃嚗航賢臭誑典嗾"
 "撠敺敺"
 
-#: ../libpurple/protocols/oscar/oscar.c:4913
-#: ../libpurple/protocols/oscar/oscar.c:4914
-#: ../libpurple/protocols/oscar/oscar.c:4919
-#: ../libpurple/protocols/oscar/oscar.c:5096
-#: ../libpurple/protocols/oscar/oscar.c:5097
-#: ../libpurple/protocols/oscar/oscar.c:5102
+#: ../libpurple/protocols/oscar/oscar.c:4889
+#: ../libpurple/protocols/oscar/oscar.c:4890
+#: ../libpurple/protocols/oscar/oscar.c:4895
+#: ../libpurple/protocols/oscar/oscar.c:5071
+#: ../libpurple/protocols/oscar/oscar.c:5072
+#: ../libpurple/protocols/oscar/oscar.c:5077
 msgid "Orphans"
 msgstr "摮文"
 
-#: ../libpurple/protocols/oscar/oscar.c:5026
+#: ../libpurple/protocols/oscar/oscar.c:5001
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -7470,12 +7466,12 @@
 "箸函憟賢瘜桐葉憭芸憟賢嚗隞交颲行亙末 %s隢函宏日其遢憟賢敺"
 "閰艾"
 
-#: ../libpurple/protocols/oscar/oscar.c:5026
-#: ../libpurple/protocols/oscar/oscar.c:5040
+#: ../libpurple/protocols/oscar/oscar.c:5001
+#: ../libpurple/protocols/oscar/oscar.c:5015
 msgid "(no name)"
 msgstr "(瘝摮)"
 
-#: ../libpurple/protocols/oscar/oscar.c:5040
+#: ../libpurple/protocols/oscar/oscar.c:5015
 #, c-format
 msgid ""
 "Could not add the buddy %s for an unknown reason.  The most common reason "
@@ -7485,7 +7481,7 @@
 "箔⊥撠憟賢 %s 乓銝祉臬箸函憟賢皜桐葉憟賢貊株"
 "蝟餌絞閮梁銝"
 
-#: ../libpurple/protocols/oscar/oscar.c:5133
+#: ../libpurple/protocols/oscar/oscar.c:5108
 #, c-format
 msgid ""
 "The user %s has given you permission to add you to their buddy list.  Do you "
@@ -7495,23 +7491,23 @@
 "g"
 
 # NOTE 舀閮勗乩犖澆箇隤霅閬瘙敺憿舐內蝯行芸楛
-#: ../libpurple/protocols/oscar/oscar.c:5139
+#: ../libpurple/protocols/oscar/oscar.c:5116
 msgid "Authorization Given"
 msgstr "蝯虫隤霅"
 
 #. Granted
-#: ../libpurple/protocols/oscar/oscar.c:5217
+#: ../libpurple/protocols/oscar/oscar.c:5189
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
 msgstr "雿輻刻 %s 閮曹典隞嚗憟對亙末皜桃閬瘙"
 
 # NOTE 舀澆箇隤霅閬瘙鋡怠孵閮望憿舐內
-#: ../libpurple/protocols/oscar/oscar.c:5218
+#: ../libpurple/protocols/oscar/oscar.c:5190
 msgid "Authorization Granted"
 msgstr "隤霅脣"
 
 #. Denied
-#: ../libpurple/protocols/oscar/oscar.c:5221
+#: ../libpurple/protocols/oscar/oscar.c:5193
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -7521,32 +7517,32 @@
 "雿輻刻 %s 箔嚗蝯鈭典隞嚗憟對亙末皜桃閬瘙嚗\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:5222
+#: ../libpurple/protocols/oscar/oscar.c:5194
 msgid "Authorization Denied"
 msgstr "隤霅鋡急"
 
 # NOTE: 鋆∠摮蝢拐 #gaim  MrHappy  deryni 靘
 # NOTE: KingAnt 靘摮蝢拇鈭銝嚗急銝鈭
-#: ../libpurple/protocols/oscar/oscar.c:5258
+#: ../libpurple/protocols/oscar/oscar.c:5230
 #: ../libpurple/protocols/toc/toc.c:1371
 msgid "_Exchange:"
 msgstr "駁蝣(_E)嚗"
 
-#: ../libpurple/protocols/oscar/oscar.c:5298
+#: ../libpurple/protocols/oscar/oscar.c:5270
 msgid "Invalid chat name specified."
 msgstr "蝯虫鈭⊥憭拙恕蝔晞"
 
-#: ../libpurple/protocols/oscar/oscar.c:5368
+#: ../libpurple/protocols/oscar/oscar.c:5340
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 msgstr "⊥喲單閮臬蔣嚗AIM 憭拐蒂銝舀游單閮臬蔣喲"
 
-#: ../libpurple/protocols/oscar/oscar.c:5507
-#: ../libpurple/protocols/oscar/oscar.c:5512
+#: ../libpurple/protocols/oscar/oscar.c:5479
+#: ../libpurple/protocols/oscar/oscar.c:5484
 msgid "Away Message"
 msgstr "a閮"
 
 # XXX 憟賢銝撠嚗憟賢瘝憿
-#: ../libpurple/protocols/oscar/oscar.c:5512
+#: ../libpurple/protocols/oscar/oscar.c:5484
 msgid "<i>(retrieving)</i>"
 msgstr " <i>(撠銝)</i>"
 
@@ -7554,89 +7550,89 @@
 #  NOTE (21:24:59) wing: what is the "iTunes Music Store Link" in the AIM status message?
 #  NOTE (21:29:48) KingAnt: wing: The AIM protocol allows people to advertise the song their currently listening to as part of their status
 #  XXX 隞仿閰脫舀憿霅舀嚗雿急喃唳璅孵 - ambrose 20070415
-#: ../libpurple/protocols/oscar/oscar.c:5722
+#: ../libpurple/protocols/oscar/oscar.c:5684
 msgid "iTunes Music Store Link"
 msgstr "iTunes Store 蝬脩蝯"
 
-#: ../libpurple/protocols/oscar/oscar.c:5830
+#: ../libpurple/protocols/oscar/oscar.c:5792
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "%s 憟賢隤芣"
 
-#: ../libpurple/protocols/oscar/oscar.c:5831
+#: ../libpurple/protocols/oscar/oscar.c:5793
 msgid "Buddy Comment:"
 msgstr "憟賢隤芣嚗"
 
-#: ../libpurple/protocols/oscar/oscar.c:5877
+#: ../libpurple/protocols/oscar/oscar.c:5840
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr "券豢鈭 %s 銝湔亙單閮胯"
 
-#: ../libpurple/protocols/oscar/oscar.c:5881
+#: ../libpurple/protocols/oscar/oscar.c:5844
 msgid ""
 "Because this reveals your IP address, it may be considered a security risk.  "
 "Do you wish to continue?"
 msgstr "璅撠脣箸函 IP 雿嚗甇文航賣梁銝憸券芥冽唾蝜潛嚗"
 
-#: ../libpurple/protocols/oscar/oscar.c:5885
+#: ../libpurple/protocols/oscar/oscar.c:5850
 msgid "C_onnect"
 msgstr "蝺(_O)"
 
-#: ../libpurple/protocols/oscar/oscar.c:5920
+#: ../libpurple/protocols/oscar/oscar.c:5885
 msgid "Get AIM Info"
 msgstr "敺 AIM 鞈閮"
 
-#: ../libpurple/protocols/oscar/oscar.c:5926
+#: ../libpurple/protocols/oscar/oscar.c:5891
 msgid "Edit Buddy Comment"
 msgstr "蝺刻摩憟賢隤芣"
 
-#: ../libpurple/protocols/oscar/oscar.c:5934
+#: ../libpurple/protocols/oscar/oscar.c:5899
 msgid "Get Status Msg"
 msgstr "敺閮"
 
 # NOTE 撠湔交胯寡陌箝單閮胯
-#: ../libpurple/protocols/oscar/oscar.c:5947
+#: ../libpurple/protocols/oscar/oscar.c:5912
 msgid "Direct IM"
 msgstr "單閮"
 
-#: ../libpurple/protocols/oscar/oscar.c:5969
+#: ../libpurple/protocols/oscar/oscar.c:5934
 msgid "Re-request Authorization"
 msgstr "啗瘙隤霅"
 
 # NOTE Require箝閬嚗銝胯閬瘙
-#: ../libpurple/protocols/oscar/oscar.c:6028
+#: ../libpurple/protocols/oscar/oscar.c:5993
 msgid "Require authorization"
 msgstr "閬隤霅"
 
-#: ../libpurple/protocols/oscar/oscar.c:6031
+#: ../libpurple/protocols/oscar/oscar.c:5996
 msgid "Web aware (enabling this will cause you to receive SPAM!)"
 msgstr "閮勗嗡雿輻刻函雯頝臭亦函桀嚗撠湔冽嗅啣曇荔嚗"
 
-#: ../libpurple/protocols/oscar/oscar.c:6036
+#: ../libpurple/protocols/oscar/oscar.c:6001
 msgid "ICQ Privacy Options"
 msgstr "ICQ 梁賊"
 
-#: ../libpurple/protocols/oscar/oscar.c:6053
+#: ../libpurple/protocols/oscar/oscar.c:6020
 msgid "The new formatting is invalid."
 msgstr "啁澆舐⊥"
 
-#: ../libpurple/protocols/oscar/oscar.c:6054
+#: ../libpurple/protocols/oscar/oscar.c:6021
 msgid "Screen name formatting can change only capitalization and whitespace."
 msgstr "撣唾澆芾賣寡憭批神隞亙蝛箇賬"
 
-#: ../libpurple/protocols/oscar/oscar.c:6107
+#: ../libpurple/protocols/oscar/oscar.c:6074
 msgid "Change Address To:"
 msgstr "霈游啣綽"
 
-#: ../libpurple/protocols/oscar/oscar.c:6152
+#: ../libpurple/protocols/oscar/oscar.c:6120
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>其蒂瘝函敺撽霅</i>"
 
-#: ../libpurple/protocols/oscar/oscar.c:6155
+#: ../libpurple/protocols/oscar/oscar.c:6123
 msgid "You are awaiting authorization from the following buddies"
 msgstr "函桀甇函敺銝憟賢隤霅"
 
-#: ../libpurple/protocols/oscar/oscar.c:6156
+#: ../libpurple/protocols/oscar/oscar.c:6124
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
@@ -7644,74 +7640,74 @@
 "典臭誑啗瘙鈭憟賢隤霅嚗芾典末皜桐葉隞交曌喲菟隞嚗嗅豢"
 "閬瘙啗霅"
 
-#: ../libpurple/protocols/oscar/oscar.c:6173
+#: ../libpurple/protocols/oscar/oscar.c:6141
 msgid "Find Buddy by E-Mail"
 msgstr "隞仿餃萎辣啣靘曉憟賢"
 
-#: ../libpurple/protocols/oscar/oscar.c:6174
+#: ../libpurple/protocols/oscar/oscar.c:6142
 msgid "Search for a buddy by e-mail address"
 msgstr "雿輻券餃萎辣啣撠憟賢"
 
-#: ../libpurple/protocols/oscar/oscar.c:6175
+#: ../libpurple/protocols/oscar/oscar.c:6143
 msgid "Type the e-mail address of the buddy you are searching for."
 msgstr "隢頛詨亙寧餃萎辣啣"
 
-#: ../libpurple/protocols/oscar/oscar.c:6178
+#: ../libpurple/protocols/oscar/oscar.c:6146
 msgid "_Search"
 msgstr "撠(_S)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6347
+#: ../libpurple/protocols/oscar/oscar.c:6304
 msgid "Set User Info (URL)..."
 msgstr "閮剖雿輻刻鞈閮 (蝬脤)..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6358
+#: ../libpurple/protocols/oscar/oscar.c:6315
 msgid "Change Password (URL)"
 msgstr "靽格孵蝣 (蝬脤)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6362
+#: ../libpurple/protocols/oscar/oscar.c:6319
 msgid "Configure IM Forwarding (URL)"
 msgstr "閮剖單閮舐頧 (蝬脤)"
 
 #  NOTE 霅舀游 by Ambrose
 #. ICQ actions
-#: ../libpurple/protocols/oscar/oscar.c:6372
+#: ../libpurple/protocols/oscar/oscar.c:6329
 msgid "Set Privacy Options..."
 msgstr "閮剖梁賊..."
 
 #. AIM actions
-#: ../libpurple/protocols/oscar/oscar.c:6379
+#: ../libpurple/protocols/oscar/oscar.c:6336
 msgid "Confirm Account"
 msgstr "蝣箄撣唾"
 
-#: ../libpurple/protocols/oscar/oscar.c:6383
+#: ../libpurple/protocols/oscar/oscar.c:6340
 msgid "Display Currently Registered E-Mail Address"
 msgstr "憿舐內桀閮餃餃萎辣雿"
 
-#: ../libpurple/protocols/oscar/oscar.c:6387
+#: ../libpurple/protocols/oscar/oscar.c:6344
 msgid "Change Currently Registered E-Mail Address..."
 msgstr "靽格寧桀閮餃餃萎辣雿..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6394
+#: ../libpurple/protocols/oscar/oscar.c:6351
 msgid "Show Buddies Awaiting Authorization"
 msgstr "憿舐內蝑敺隤霅憟賢"
 
-#: ../libpurple/protocols/oscar/oscar.c:6400
+#: ../libpurple/protocols/oscar/oscar.c:6357
 msgid "Search for Buddy by E-Mail Address..."
 msgstr "雿輻券餃萎辣啣撠憟賢..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6405
+#: ../libpurple/protocols/oscar/oscar.c:6362
 msgid "Search for Buddy by Information"
 msgstr "靘扯閮撠曉末"
 
-#: ../libpurple/protocols/oscar/oscar.c:6473
+#: ../libpurple/protocols/oscar/oscar.c:6430
 msgid "Use recent buddies group"
 msgstr "雿輻具Recent Buddies蝢斤"
 
-#: ../libpurple/protocols/oscar/oscar.c:6476
+#: ../libpurple/protocols/oscar/oscar.c:6433
 msgid "Show how long you have been idle"
 msgstr "憿舐內雿蝵桀銋"
 
-#: ../libpurple/protocols/oscar/oscar.c:6628
+#: ../libpurple/protocols/oscar/oscar.c:6588
 msgid ""
 "Always use ICQ proxy server for file transfers\n"
 "(slower, but does not reveal your IP address)"
@@ -7747,7 +7743,7 @@
 "閬瘙撠典拚券餉阡撱箇韏瑞湔仿蝺嚗臬典喲單閮臬蔣敹"
 "璅撠脫函 IP 雿嚗甇文航賣梁寥Y憸券芥"
 
-#: ../libpurple/protocols/oscar/peer.c:1020
+#: ../libpurple/protocols/oscar/peer.c:1022
 msgid "_Connect"
 msgstr "蝺(_C)"
 
@@ -7799,7 +7795,7 @@
 
 #: ../libpurple/protocols/qq/buddy_info.c:58
 msgid "Cellphone Number"
-msgstr "銵餉店蝣"
+msgstr "瘚餉店蝣"
 
 #: ../libpurple/protocols/qq/buddy_info.c:59
 msgid "Phone Number"
@@ -7914,93 +7910,99 @@
 msgid "Update my information"
 msgstr "湔啣末鞈閮"
 
-#: ../libpurple/protocols/qq/buddy_info.c:506
+#: ../libpurple/protocols/qq/buddy_info.c:507
 msgid "Your information has been updated"
 msgstr "靽格嫣函憟賢鞈閮"
 
-#  FIXME 臬憯霅舀嚗∪臬 :P
-#: ../libpurple/protocols/qq/buddy_info.c:565
+#: ../libpurple/protocols/qq/buddy_info.c:560
+#, c-format
 msgid ""
 "Setting custom faces is not currently supported. Please choose an image from "
-msgstr "芾銵冽獢急芰脫舀湛隢芯桅詨獢嚗"
-
-#: ../libpurple/protocols/qq/buddy_info.c:582
-#: ../libpurple/protocols/qq/buddy_info.c:595
+"%s."
+msgstr "芾銵冽獢急芰脫舀湛隢 %s 詨獢"
+
+#: ../libpurple/protocols/qq/buddy_info.c:577
+#: ../libpurple/protocols/qq/buddy_info.c:590
 msgid "Invalid QQ Face"
 msgstr "⊥ QQ 銵冽"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:207
+#: ../libpurple/protocols/qq/buddy_opt.c:208
 #: ../libpurple/protocols/qq/group_opt.c:135
 #, c-format
 msgid "You rejected %d's request"
 msgstr "冽蝯鈭 %d 閬瘙"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:208
+#: ../libpurple/protocols/qq/buddy_opt.c:209
 #: ../libpurple/protocols/qq/group_opt.c:136
 msgid "Input your reason:"
 msgstr "隢頛詨亙嚗"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:210
+#: ../libpurple/protocols/qq/buddy_opt.c:212
 msgid "Reject request"
 msgstr "蝯"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:211
-#: ../libpurple/protocols/qq/group_opt.c:139
+#. title
+#: ../libpurple/protocols/qq/buddy_opt.c:213
+#: ../libpurple/protocols/qq/group_opt.c:140
 msgid "Sorry, you are not my type..."
 msgstr "撠銝韏瘀雿銝靘色"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:212
-#: ../libpurple/protocols/qq/group_im.c:136
-#: ../libpurple/protocols/qq/group_opt.c:125
-#: ../libpurple/protocols/qq/sys_msg.c:85
-#: ../libpurple/protocols/qq/sys_msg.c:228
+#: ../libpurple/protocols/qq/buddy_opt.c:214
+#: ../libpurple/protocols/qq/group_im.c:142
+#: ../libpurple/protocols/qq/group_opt.c:126
+#: ../libpurple/protocols/qq/sys_msg.c:91
+#: ../libpurple/protocols/qq/sys_msg.c:249
 msgid "Reject"
 msgstr "蝯"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:272
+#: ../libpurple/protocols/qq/buddy_opt.c:277
 msgid "Add buddy with auth request fails"
 msgstr "隤霅閬瘙啣憟賢憭望"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:303
+#: ../libpurple/protocols/qq/buddy_opt.c:308
 msgid "You have successfully removed a buddy"
 msgstr "冽蝘駁支銝憟賢"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:331
+#: ../libpurple/protocols/qq/buddy_opt.c:336
 msgid "You have successfully removed yourself from a buddy"
 msgstr "冽敺銝憟賢憟賢皜桐葉蝘駁支刻芸楛"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:395
+#: ../libpurple/protocols/qq/buddy_opt.c:402
 #, c-format
 msgid "User %d needs authentication"
 msgstr "雿輻刻 %d 閬隤霅"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:397
+#: ../libpurple/protocols/qq/buddy_opt.c:404
 #: ../libpurple/protocols/qq/group_join.c:134
 msgid "Input request here"
 msgstr "隢頛詨亥瘙"
 
 # XXX - 20061026
-#: ../libpurple/protocols/qq/buddy_opt.c:398
+#. TODO: Awkward string to fix post string freeze - standardize auth dialogues? -evands
+#: ../libpurple/protocols/qq/buddy_opt.c:405
 #: ../libpurple/protocols/qq/group_join.c:135
 msgid "Would you be my friend?"
 msgstr "喳鈭文嚗"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:399
+#. multiline
+#. masked
+#. hint
+#: ../libpurple/protocols/qq/buddy_opt.c:406
 #: ../libpurple/protocols/qq/group_join.c:136
-#: ../libpurple/protocols/qq/group_opt.c:140
+#: ../libpurple/protocols/qq/group_opt.c:142
 msgid "Send"
 msgstr ""
 
-#: ../libpurple/protocols/qq/buddy_opt.c:406
+#: ../libpurple/protocols/qq/buddy_opt.c:416
 #, c-format
 msgid "You have added %d in buddy list"
 msgstr "撠 %d 亙末皜"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:503
+#: ../libpurple/protocols/qq/buddy_opt.c:513
 msgid "QQid Error"
 msgstr "QQid 航炊"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:504
+#: ../libpurple/protocols/qq/buddy_opt.c:514
 msgid "Invalid QQid"
 msgstr "⊥ QQid"
 
@@ -8037,59 +8039,59 @@
 msgid "You can only search for permanent QQ groups\n"
 msgstr "典芸舀撠瘞訾蝢斤\n"
 
-#: ../libpurple/protocols/qq/group_im.c:122
+#: ../libpurple/protocols/qq/group_im.c:124
 #, c-format
 msgid "User %d applied to join group %d"
 msgstr "雿輻刻 %d 閬瘙亦黎蝯 %d"
 
-#: ../libpurple/protocols/qq/group_im.c:123
-#: ../libpurple/protocols/qq/group_im.c:172
-#: ../libpurple/protocols/qq/sys_msg.c:180
+#: ../libpurple/protocols/qq/group_im.c:125
+#: ../libpurple/protocols/qq/group_im.c:179
+#: ../libpurple/protocols/qq/sys_msg.c:195
 #, c-format
 msgid "Reason: %s"
 msgstr "嚗%s"
 
-#: ../libpurple/protocols/qq/group_im.c:130
-#: ../libpurple/protocols/qq/group_im.c:174
-#: ../libpurple/protocols/qq/group_im.c:214
-#: ../libpurple/protocols/qq/group_im.c:249
-#: ../libpurple/protocols/qq/group_im.c:283
-#: ../libpurple/protocols/qq/group_join.c:229
-#: ../libpurple/protocols/qq/group_join.c:355
-#: ../libpurple/protocols/qq/group_opt.c:230
-#: ../libpurple/protocols/qq/group_opt.c:300
-#: ../libpurple/protocols/qq/group_opt.c:386
+#: ../libpurple/protocols/qq/group_im.c:134
+#: ../libpurple/protocols/qq/group_im.c:181
+#: ../libpurple/protocols/qq/group_im.c:221
+#: ../libpurple/protocols/qq/group_im.c:256
+#: ../libpurple/protocols/qq/group_im.c:290
+#: ../libpurple/protocols/qq/group_join.c:231
+#: ../libpurple/protocols/qq/group_join.c:357
+#: ../libpurple/protocols/qq/group_opt.c:234
+#: ../libpurple/protocols/qq/group_opt.c:304
+#: ../libpurple/protocols/qq/group_opt.c:390
 msgid "QQ Qun Operation"
 msgstr "QQ 蝢斤雿"
 
-#: ../libpurple/protocols/qq/group_im.c:133
+#: ../libpurple/protocols/qq/group_im.c:139
 #: ../libpurple/protocols/qq/group_opt.c:127
-#: ../libpurple/protocols/qq/sys_msg.c:87
-#: ../libpurple/protocols/qq/sys_msg.c:230
+#: ../libpurple/protocols/qq/sys_msg.c:92
+#: ../libpurple/protocols/qq/sys_msg.c:251
 msgid "Approve"
 msgstr "閮"
 
-#: ../libpurple/protocols/qq/group_im.c:171
+#: ../libpurple/protocols/qq/group_im.c:178
 #, c-format
 msgid "You request to join group %d has been rejected by admin %d"
 msgstr "蝞∠鈭 %d 蝯鈭典亦黎蝯 %d"
 
-#: ../libpurple/protocols/qq/group_im.c:212
+#: ../libpurple/protocols/qq/group_im.c:219
 #, c-format
 msgid "You request to join group %d has been approved by admin %d"
 msgstr "蝞∠鈭 %d 閮曹典亦黎蝯 %d"
 
-#: ../libpurple/protocols/qq/group_im.c:248
+#: ../libpurple/protocols/qq/group_im.c:255
 #, c-format
 msgid "You [%d] has exit group \"%d\""
 msgstr " [%d] 箔蝢斤%d"
 
-#: ../libpurple/protocols/qq/group_im.c:282
+#: ../libpurple/protocols/qq/group_im.c:289
 #, c-format
 msgid "You [%d] has been added by group \"%d\""
 msgstr "蝢斤%2$d啣鈭 [%1$d]"
 
-#: ../libpurple/protocols/qq/group_im.c:283
+#: ../libpurple/protocols/qq/group_im.c:290
 msgid "This group has been added to your buddy list"
 msgstr "蝢斤撌脫啣喳末皜柴"
 
@@ -8117,33 +8119,33 @@
 msgid "This group does not allow others to join"
 msgstr "蝢斤銝摰寡迂憭鈭箏"
 
-#: ../libpurple/protocols/qq/group_join.c:229
+#: ../libpurple/protocols/qq/group_join.c:231
 msgid "You have successfully exited the group"
 msgstr "冽a蝢斤"
 
-#: ../libpurple/protocols/qq/group_join.c:253
+#: ../libpurple/protocols/qq/group_join.c:255
 msgid "QQ Group Auth"
 msgstr "QQ 蝢斤隤霅"
 
-#: ../libpurple/protocols/qq/group_join.c:254
+#: ../libpurple/protocols/qq/group_join.c:256
 msgid "Your authorization operation has been accepted by the QQ server"
 msgstr "QQ 隡箸冽亙鈭函隤霅"
 
-#: ../libpurple/protocols/qq/group_join.c:325
+#: ../libpurple/protocols/qq/group_join.c:327
 msgid "You inputted a group id outside the acceptable range"
 msgstr "摰蝢斤 ID 冽蝭銋憭"
 
-#: ../libpurple/protocols/qq/group_join.c:356
+#: ../libpurple/protocols/qq/group_join.c:358
 msgid "Are you sure to exit this Qun?"
 msgstr "函Ⅱ摰閬a蝢 (Qun) 嚗"
 
-#: ../libpurple/protocols/qq/group_join.c:358
+#: ../libpurple/protocols/qq/group_join.c:360
 msgid ""
 "Note, if you are the creator, \n"
 "this operation will eventually remove this Qun."
 msgstr "隢瘜冽嚗憒冽臬萇嚗蝯蝢 (Qun) 蝘駁扎"
 
-#: ../libpurple/protocols/qq/group_join.c:361
+#: ../libpurple/protocols/qq/group_join.c:365
 msgid "Go ahead"
 msgstr "蝣箏"
 
@@ -8156,42 +8158,43 @@
 msgid "Group Operation Error"
 msgstr "蝢斤雿航炊"
 
-#: ../libpurple/protocols/qq/group_opt.c:124
-#: ../libpurple/protocols/qq/sys_msg.c:84
+#. we wanna see window
+#: ../libpurple/protocols/qq/group_opt.c:123
+#: ../libpurple/protocols/qq/sys_msg.c:88
 msgid "Do you wanna approve the request?"
 msgstr "閮梢閬瘙嚗"
 
 #  NOTE QQmember胯∼
-#: ../libpurple/protocols/qq/group_opt.c:230
+#: ../libpurple/protocols/qq/group_opt.c:234
 msgid "You have successfully modify Qun member"
 msgstr "湔嫣蝢斤銝"
 
 # FIXME 怨陌 ambrose 20070415
-#: ../libpurple/protocols/qq/group_opt.c:300
+#: ../libpurple/protocols/qq/group_opt.c:304
 msgid "You have successfully modify Qun information"
 msgstr "湔嫣蝢斤鞈閮"
 
-#: ../libpurple/protocols/qq/group_opt.c:387
+#: ../libpurple/protocols/qq/group_opt.c:391
 msgid "You have successfully created a Qun"
 msgstr "撱箇鈭銝蝢 (Qun)"
 
-#: ../libpurple/protocols/qq/group_opt.c:389
+#: ../libpurple/protocols/qq/group_opt.c:393
 msgid "Would you like to set up the Qun details now?"
 msgstr "閬蝡餉身摰閰脩黎 (Qun) 閰單嚗"
 
-#: ../libpurple/protocols/qq/group_opt.c:390
+#: ../libpurple/protocols/qq/group_opt.c:397
 msgid "Setup"
 msgstr "閮剖"
 
-#: ../libpurple/protocols/qq/im.c:423
+#: ../libpurple/protocols/qq/im.c:430
 msgid "System Message"
 msgstr "蝟餌絞閮"
 
-#: ../libpurple/protocols/qq/im.c:567
+#: ../libpurple/protocols/qq/im.c:574
 msgid "Server ACK"
 msgstr "隡箸典"
 
-#: ../libpurple/protocols/qq/im.c:567
+#: ../libpurple/protocols/qq/im.c:574
 msgid "Send IM fail\n"
 msgstr "箏單閮臬仃\n"
 
@@ -8201,7 +8204,7 @@
 
 #: ../libpurple/protocols/qq/login_logout.c:408
 msgid "Request login token error!"
-msgstr ""
+msgstr "餃亥瘙Token 箇暸航炊"
 
 #: ../libpurple/protocols/qq/login_logout.c:486
 msgid "Unable to login, check debug log"
@@ -8210,11 +8213,11 @@
 #. we didn't successfully connect. tdt->toc_fd is valid here
 #. TODO: Include error_message in the message below
 #: ../libpurple/protocols/qq/qq.c:139 ../libpurple/protocols/toc/toc.c:173
-#: ../libpurple/protocols/yahoo/yahoo.c:2375
-#: ../libpurple/protocols/yahoo/yahoo.c:2403
-#: ../libpurple/protocols/yahoo/yahoo.c:2510
-#: ../libpurple/protocols/yahoo/yahoo.c:2531
-#: ../libpurple/protocols/yahoo/yahoo.c:2615
+#: ../libpurple/protocols/yahoo/yahoo.c:2378
+#: ../libpurple/protocols/yahoo/yahoo.c:2406
+#: ../libpurple/protocols/yahoo/yahoo.c:2513
+#: ../libpurple/protocols/yahoo/yahoo.c:2534
+#: ../libpurple/protocols/yahoo/yahoo.c:2618
 #: ../libpurple/protocols/yahoo/yahoo_filexfer.c:108
 #: ../libpurple/protocols/yahoo/yahoo_filexfer.c:188
 #: ../libpurple/protocols/yahoo/ycht.c:549
@@ -8265,49 +8268,49 @@
 msgstr "蝔梁⊥"
 
 #  NOTE 閬 qq.h
-#: ../libpurple/protocols/qq/qq.c:438
+#: ../libpurple/protocols/qq/qq.c:437
 #, c-format
 msgid "<b>Current Online</b>: %d<br>\n"
 msgstr "<b>桀銝蝺憟賢</b>: %d 鈭<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:439
+#: ../libpurple/protocols/qq/qq.c:438
 #, c-format
 msgid "<b>Last Refresh</b>: %s<br>\n"
 msgstr "<b>餈湔唳嚗</b>%s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:443
+#: ../libpurple/protocols/qq/qq.c:442
 #, c-format
 msgid "<b>Connection Mode</b>: %s<br>\n"
 msgstr "<b>蝺璅∪</b>嚗%s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:444
+#: ../libpurple/protocols/qq/qq.c:443
 #, c-format
 msgid "<b>Server IP</b>: %s: %d<br>\n"
 msgstr "<b>隡箸其嚗</b>%s嚗%d<br>\n"
 
 # XXX - 20061027
-#: ../libpurple/protocols/qq/qq.c:445
+#: ../libpurple/protocols/qq/qq.c:444
 #, c-format
 msgid "<b>My Public IP</b>: %s<br>\n"
 msgstr "<b>芸楛雿嚗</b>%s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:450
+#: ../libpurple/protocols/qq/qq.c:449
 #, c-format
 msgid "<b>Login Time</b>: %s<br>\n"
 msgstr "<b>餃交嚗</b>%s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:451
+#: ../libpurple/protocols/qq/qq.c:450
 #, c-format
 msgid "<b>Last Login IP</b>: %s<br>\n"
 msgstr "<b>銝甈∠餃乩嚗</b>%s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:452
+#: ../libpurple/protocols/qq/qq.c:451
 #, c-format
 msgid "<b>Last Login Time</b>: %s\n"
 msgstr "<b>銝甈∠餃交嚗</b>%s\n"
 
 # XXX - 20061027
-#: ../libpurple/protocols/qq/qq.c:456
+#: ../libpurple/protocols/qq/qq.c:455
 msgid "Login Information"
 msgstr "餃亥閮"
 
@@ -8327,6 +8330,10 @@
 msgid "Exit this QQ Qun"
 msgstr "a QQ 蝢 (Qun)"
 
+#: ../libpurple/protocols/qq/qq.c:582
+msgid "Block this buddy"
+msgstr "撠憟賢"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -8337,15 +8344,15 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/qq/qq.c:719 ../libpurple/protocols/qq/qq.c:721
+#: ../libpurple/protocols/qq/qq.c:723 ../libpurple/protocols/qq/qq.c:725
 msgid "QQ Protocol\tPlugin"
 msgstr "QQ 摰璅∠"
 
-#: ../libpurple/protocols/qq/qq.c:740
+#: ../libpurple/protocols/qq/qq.c:750
 msgid "Login in TCP"
 msgstr "隞 TCP 餃"
 
-#: ../libpurple/protocols/qq/qq.c:743
+#: ../libpurple/protocols/qq/qq.c:753
 msgid "Login Hidden"
 msgstr "隞仿梯餃"
 
@@ -8390,52 +8397,54 @@
 msgid "Login failed, no reply"
 msgstr "餃亙仃嚗瘝"
 
-#: ../libpurple/protocols/qq/sys_msg.c:103
+#: ../libpurple/protocols/qq/sys_msg.c:112
 msgid "Do you wanna add this buddy?"
 msgstr "冽喳雿輻刻亙唳函憟賢桐葉嚗"
 
 #. only need to get value
-#: ../libpurple/protocols/qq/sys_msg.c:155
+#: ../libpurple/protocols/qq/sys_msg.c:168
 #, c-format
 msgid "You have been added by %s"
 msgstr "%s 撌脣典亙唬嚗憟對憟賢皜"
 
-#: ../libpurple/protocols/qq/sys_msg.c:158
+#: ../libpurple/protocols/qq/sys_msg.c:171
 msgid "Would like to add him?"
 msgstr "冽喳隞嚗憟對亙唳函憟賢皜桀嚗"
 
-#: ../libpurple/protocols/qq/sys_msg.c:164
+#: ../libpurple/protocols/qq/sys_msg.c:178
 #, c-format
 msgid "%s has added you [%s]"
 msgstr "%s 撌脣 [%s] 亙唬嚗憟對憟賢皜"
 
-#: ../libpurple/protocols/qq/sys_msg.c:179
+#: ../libpurple/protocols/qq/sys_msg.c:194
 #, c-format
 msgid "User %s rejected your request"
 msgstr "雿輻刻%s蝯鈭函閬瘙"
 
-#: ../libpurple/protocols/qq/sys_msg.c:199
+#: ../libpurple/protocols/qq/sys_msg.c:214
 #, c-format
 msgid "User %s has approved your request"
 msgstr "雿輻刻%s閮曹函閬瘙"
 
-#: ../libpurple/protocols/qq/sys_msg.c:222
+#. TODO: 'wanna' is not an appropriate word for this string. Fix after string freeze
+#. TODO: this should go through purple_account_request_authorization()
+#: ../libpurple/protocols/qq/sys_msg.c:241
 #, c-format
 msgid "%s wanna add you [%s] as friends"
 msgstr "%s 唾撠剁%s嚗乩嚗憟對憟賢皜"
 
-#: ../libpurple/protocols/qq/sys_msg.c:223
+#: ../libpurple/protocols/qq/sys_msg.c:242
 #, c-format
 msgid "Message: %s"
 msgstr "閮荔%s"
 
-#: ../libpurple/protocols/qq/sys_msg.c:244
+#: ../libpurple/protocols/qq/sys_msg.c:264
 #, c-format
 msgid "%s is not in your buddy list"
 msgstr "%s 銝冽函憟賢皜桀"
 
 # FIXME fix the original string :P
-#: ../libpurple/protocols/qq/sys_msg.c:246
+#: ../libpurple/protocols/qq/sys_msg.c:266
 msgid "Would you like to add him?"
 msgstr "刻撠隞嚗憟對交函憟賢皜桀嚗"
 
@@ -8530,7 +8539,7 @@
 
 #. this is a regular connect, error out
 #: ../libpurple/protocols/sametime/sametime.c:1732
-#: ../libpurple/protocols/sametime/sametime.c:3724
+#: ../libpurple/protocols/sametime/sametime.c:3726
 msgid "Unable to connect to host"
 msgstr "⊥蝺唬蜓璈"
 
@@ -8547,54 +8556,54 @@
 msgid "Unable to send message: "
 msgstr "⊥箄荔"
 
-#: ../libpurple/protocols/sametime/sametime.c:2960
+#: ../libpurple/protocols/sametime/sametime.c:2959
 msgid "Place Closed"
 msgstr "Place 撌脤"
 
+#: ../libpurple/protocols/sametime/sametime.c:3229
+msgid "Microphone"
+msgstr "暻亙憸"
+
 #: ../libpurple/protocols/sametime/sametime.c:3230
-msgid "Microphone"
-msgstr "暻亙憸"
-
-#: ../libpurple/protocols/sametime/sametime.c:3231
 msgid "Speakers"
 msgstr ""
 
 # XXX 怨陌
-#: ../libpurple/protocols/sametime/sametime.c:3232
+#: ../libpurple/protocols/sametime/sametime.c:3231
 msgid "Video Camera"
 msgstr "閬閮"
 
-#: ../libpurple/protocols/sametime/sametime.c:3236
+#: ../libpurple/protocols/sametime/sametime.c:3235
 msgid "File Transfer"
 msgstr "瑼獢唾撓"
 
-#: ../libpurple/protocols/sametime/sametime.c:3270
-#: ../libpurple/protocols/sametime/sametime.c:4144
+#: ../libpurple/protocols/sametime/sametime.c:3269
+#: ../libpurple/protocols/sametime/sametime.c:4145
 msgid "Supports"
 msgstr "舀"
 
 #  XXX 
-#: ../libpurple/protocols/sametime/sametime.c:3275
-#: ../libpurple/protocols/sametime/sametime.c:4118
+#: ../libpurple/protocols/sametime/sametime.c:3274
+#: ../libpurple/protocols/sametime/sametime.c:4119
 msgid "External User"
 msgstr "憭其蝙刻"
 
-#: ../libpurple/protocols/sametime/sametime.c:3381
+#: ../libpurple/protocols/sametime/sametime.c:3380
 msgid "Create conference with user"
 msgstr "雿輻刻撱箇霅啣恕"
 
-#: ../libpurple/protocols/sametime/sametime.c:3382
+#: ../libpurple/protocols/sametime/sametime.c:3381
 #, c-format
 msgid ""
 "Please enter a topic for the new conference, and an invitation message to be "
 "sent to %s"
 msgstr "隢箸啁霅啣恕頛詨乩銝駁嚗澆箔隢閮舐策%s"
 
-#: ../libpurple/protocols/sametime/sametime.c:3386
+#: ../libpurple/protocols/sametime/sametime.c:3385
 msgid "New Conference"
 msgstr "唳霅啣恕"
 
-#: ../libpurple/protocols/sametime/sametime.c:3388
+#: ../libpurple/protocols/sametime/sametime.c:3387
 msgid "Create"
 msgstr "撱箇"
 
@@ -8626,25 +8635,25 @@
 msgid "Invite to Conference"
 msgstr "隢脣交霅啣恕"
 
-#: ../libpurple/protocols/sametime/sametime.c:3561
+#: ../libpurple/protocols/sametime/sametime.c:3562
 msgid "Invite to Conference..."
 msgstr "隢脣交霅啣恕"
 
 #  XXX 閬閬 - 20061029
-#: ../libpurple/protocols/sametime/sametime.c:3566
+#: ../libpurple/protocols/sametime/sametime.c:3567
 msgid "Send TEST Announcement"
 msgstr "箸葫閰阡"
 
-#: ../libpurple/protocols/sametime/sametime.c:3585 ../pidgin/gtkconv.c:4161
+#: ../libpurple/protocols/sametime/sametime.c:3586 ../pidgin/gtkconv.c:4177
 msgid "Topic:"
 msgstr "銝駁嚗"
 
-#: ../libpurple/protocols/sametime/sametime.c:3613
+#: ../libpurple/protocols/sametime/sametime.c:3614
 msgid "No Sametime Community Server specified"
 msgstr "芣摰 Sametime 蝷曄黎隡箸"
 
 # NOTEMeanwhile撖虫Sametime摰銝頠擃嚗銝舫亥
-#: ../libpurple/protocols/sametime/sametime.c:3635
+#: ../libpurple/protocols/sametime/sametime.c:3636
 #, c-format
 msgid ""
 "No host or IP address has been configured for the Meanwhile account %s. "
@@ -8654,39 +8663,39 @@
 "乓"
 
 # NOTEMeanwhile撖虫Sametime摰銝頠擃嚗銝舫亥
-#: ../libpurple/protocols/sametime/sametime.c:3640
+#: ../libpurple/protocols/sametime/sametime.c:3641
 msgid "Meanwhile Connection Setup"
 msgstr "Meanwhile 蝺閮剖"
 
-#: ../libpurple/protocols/sametime/sametime.c:3641
+#: ../libpurple/protocols/sametime/sametime.c:3642
 msgid "No Sametime Community Server Specified"
 msgstr "芣摰 Sametime 蝷曄黎隡箸"
 
-#: ../libpurple/protocols/sametime/sametime.c:4134
+#: ../libpurple/protocols/sametime/sametime.c:4135
 #, c-format
 msgid "Unknown (0x%04x)<br>"
 msgstr "芰伐0x%04x嚗<br>"
 
 #  XXX 閬閬
-#: ../libpurple/protocols/sametime/sametime.c:4136
+#: ../libpurple/protocols/sametime/sametime.c:4137
 msgid "Last Known Client"
 msgstr "銝甈∩蝙函冽嗥垢蝔撘嚗憒撌脩伐"
 
-#: ../libpurple/protocols/sametime/sametime.c:4300
-#: ../libpurple/protocols/sametime/sametime.c:5495
+#: ../libpurple/protocols/sametime/sametime.c:4301
+#: ../libpurple/protocols/sametime/sametime.c:5506
 msgid "User Name"
 msgstr "雿輻刻蝔"
 
-#: ../libpurple/protocols/sametime/sametime.c:4303
-#: ../libpurple/protocols/sametime/sametime.c:5498
+#: ../libpurple/protocols/sametime/sametime.c:4304
+#: ../libpurple/protocols/sametime/sametime.c:5509
 msgid "Sametime ID"
 msgstr "Sametime ID"
 
-#: ../libpurple/protocols/sametime/sametime.c:4327
+#: ../libpurple/protocols/sametime/sametime.c:4328
 msgid "An ambiguous user ID was entered"
-msgstr "頛詨乩銝銝雿輻刻 ID"
-
-#: ../libpurple/protocols/sametime/sametime.c:4328
+msgstr "頛詨乩銝銝蝣箇雿輻刻 ID"
+
+#: ../libpurple/protocols/sametime/sametime.c:4329
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following users. Please "
@@ -8695,16 +8704,16 @@
 "%s航賣銝隞颱銝雿輻刻隢敺皜桅豢甇蝣箇雿輻刻嚗隞乩噶啣喳末皜"
 "扼"
 
-#: ../libpurple/protocols/sametime/sametime.c:4333
+#: ../libpurple/protocols/sametime/sametime.c:4334
 msgid "Select User"
 msgstr "豢雿輻刻"
 
 #  TODO 隢閬伐霅舀敺寥
-#: ../libpurple/protocols/sametime/sametime.c:4417
+#: ../libpurple/protocols/sametime/sametime.c:4418
 msgid "Unable to add user: user not found"
 msgstr "⊥啣雿輻刻嚗曆唬蝙刻"
 
-#: ../libpurple/protocols/sametime/sametime.c:4419
+#: ../libpurple/protocols/sametime/sametime.c:4420
 #, c-format
 msgid ""
 "The identifier '%s' did not match any users in your Sametime community. This "
@@ -8713,11 +8722,11 @@
 "%s典 Sametime 蝷曄黎銝剔隞颱雿輻刻撣唾銝蝚艾摰撠敺函憟賢皜桐葉鋡怎宏"
 "扎"
 
-#: ../libpurple/protocols/sametime/sametime.c:4424
+#: ../libpurple/protocols/sametime/sametime.c:4425
 msgid "Unable to add user"
 msgstr "⊥啣雿輻刻"
 
-#: ../libpurple/protocols/sametime/sametime.c:5010
+#: ../libpurple/protocols/sametime/sametime.c:5011
 #, c-format
 msgid ""
 "Error reading file %s: \n"
@@ -8726,63 +8735,63 @@
 "霈瑼獢 %s 潛航炊嚗\n"
 "%s\n"
 
-#: ../libpurple/protocols/sametime/sametime.c:5145
+#: ../libpurple/protocols/sametime/sametime.c:5146
 msgid "Remotely Stored Buddy List"
 msgstr "憟賢皜桀暹潮蝡"
 
-#: ../libpurple/protocols/sametime/sametime.c:5150
+#: ../libpurple/protocols/sametime/sametime.c:5151
 msgid "Buddy List Storage Mode"
 msgstr "憟賢皜桀脣璅∪"
 
-#: ../libpurple/protocols/sametime/sametime.c:5153
+#: ../libpurple/protocols/sametime/sametime.c:5154
 msgid "Local Buddy List Only"
 msgstr "憟賢皜桀芸暹潭祆"
 
-#: ../libpurple/protocols/sametime/sametime.c:5155
+#: ../libpurple/protocols/sametime/sametime.c:5156
 msgid "Merge List from Server"
 msgstr "雿萎撩其憟賢皜株單祆"
 
-#: ../libpurple/protocols/sametime/sametime.c:5157
+#: ../libpurple/protocols/sametime/sametime.c:5158
 msgid "Merge and Save List to Server"
 msgstr "雿萎蒂摮曉末皜株喃撩"
 
-#: ../libpurple/protocols/sametime/sametime.c:5159
+#: ../libpurple/protocols/sametime/sametime.c:5160
 msgid "Synchronize List with Server"
 msgstr "隡箸典甇交"
 
-#: ../libpurple/protocols/sametime/sametime.c:5208
+#: ../libpurple/protocols/sametime/sametime.c:5215
 #, c-format
 msgid "Import Sametime List for Account %s"
 msgstr "臬 Sametime 皜桃策撣唾%s"
 
-#: ../libpurple/protocols/sametime/sametime.c:5247
+#: ../libpurple/protocols/sametime/sametime.c:5255
 #, c-format
 msgid "Export Sametime List for Account %s"
 msgstr "臬 Sametime 皜桃策撣唾%s"
 
-#: ../libpurple/protocols/sametime/sametime.c:5300
+#: ../libpurple/protocols/sametime/sametime.c:5309
 msgid "Unable to add group: group exists"
 msgstr "⊥啣蝢斤嚗蝢斤撌脣"
 
-#: ../libpurple/protocols/sametime/sametime.c:5301
+#: ../libpurple/protocols/sametime/sametime.c:5310
 #, c-format
 msgid "A group named '%s' already exists in your buddy list."
 msgstr "蝢斤蝔晞%s撌脩摮冽潭函憟賢皜桐葉"
 
-#: ../libpurple/protocols/sametime/sametime.c:5304
-#: ../libpurple/protocols/sametime/sametime.c:5433
+#: ../libpurple/protocols/sametime/sametime.c:5313
+#: ../libpurple/protocols/sametime/sametime.c:5443
 msgid "Unable to add group"
 msgstr "⊥啣蝢斤"
 
-#: ../libpurple/protocols/sametime/sametime.c:5363
+#: ../libpurple/protocols/sametime/sametime.c:5372
 msgid "Possible Matches"
 msgstr "航賜貊泵"
 
-#: ../libpurple/protocols/sametime/sametime.c:5379
+#: ../libpurple/protocols/sametime/sametime.c:5388
 msgid "Notes Address Book group results"
 msgstr "Notes 閮蝯"
 
-#: ../libpurple/protocols/sametime/sametime.c:5380
+#: ../libpurple/protocols/sametime/sametime.c:5389
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following Notes Address "
@@ -8792,26 +8801,26 @@
 "%s航賢唬 Notes 閮蝢斤隢芯寥詨甇蝣箇蝢斤嚗隞亙交函憟"
 "皜柴"
 
-#: ../libpurple/protocols/sametime/sametime.c:5385
+#: ../libpurple/protocols/sametime/sametime.c:5394
 msgid "Select Notes Address Book"
 msgstr "豢 Notes 閮"
 
-#: ../libpurple/protocols/sametime/sametime.c:5427
+#: ../libpurple/protocols/sametime/sametime.c:5437
 msgid "Unable to add group: group not found"
 msgstr "⊥啣蝢斤嚗曆啁黎蝯"
 
-#: ../libpurple/protocols/sametime/sametime.c:5429
+#: ../libpurple/protocols/sametime/sametime.c:5439
 #, c-format
 msgid ""
 "The identifier '%s' did not match any Notes Address Book groups in your "
 "Sametime community."
 msgstr "冽函 Sametime 蝷曄黎銝哨銝行隞颱%s貊泵 Notes 閮蝢斤"
 
-#: ../libpurple/protocols/sametime/sametime.c:5470
+#: ../libpurple/protocols/sametime/sametime.c:5480
 msgid "Notes Address Book Group"
 msgstr "Notes 閮蝢斤"
 
-#: ../libpurple/protocols/sametime/sametime.c:5471
+#: ../libpurple/protocols/sametime/sametime.c:5481
 msgid ""
 "Enter the name of a Notes Address Book group in the field below to add the "
 "group and its members to your buddy list."
@@ -8819,12 +8828,12 @@
 "頛詨 Notes 閮蝢斤蝔望潭雿銝哨隞交啣蝢斤摰撅祉∪唳函憟賢皜"
 "銝准"
 
-#: ../libpurple/protocols/sametime/sametime.c:5519
+#: ../libpurple/protocols/sametime/sametime.c:5530
 #, c-format
 msgid "Search results for '%s'"
 msgstr "撠%s撠蝯"
 
-#: ../libpurple/protocols/sametime/sametime.c:5520
+#: ../libpurple/protocols/sametime/sametime.c:5531
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following users. You "
@@ -8834,66 +8843,66 @@
 "%s航賣銝隞颱銝雿輻刻典臭蝙其Y蝝嚗隞嚗憟對啣喳末皜"
 "桀改隞嚗憟對澆箄胯"
 
-#: ../libpurple/protocols/sametime/sametime.c:5527 ../pidgin/gtknotify.c:709
+#: ../libpurple/protocols/sametime/sametime.c:5538 ../pidgin/gtknotify.c:716
 msgid "Search Results"
 msgstr "撠蝯"
 
-#: ../libpurple/protocols/sametime/sametime.c:5552
+#: ../libpurple/protocols/sametime/sametime.c:5563
 msgid "No matches"
 msgstr "瘝貊泵"
 
-#: ../libpurple/protocols/sametime/sametime.c:5553
+#: ../libpurple/protocols/sametime/sametime.c:5564
 #, c-format
 msgid "The identifier '%s' did not match any users in your Sametime community."
 msgstr "%s典 Sametime 蝷曄黎銝剔隞颱雿輻刻撣唾銝蝚艾"
 
-#: ../libpurple/protocols/sametime/sametime.c:5557
+#: ../libpurple/protocols/sametime/sametime.c:5568
 msgid "No Matches"
 msgstr "瘝貊泵"
 
-#: ../libpurple/protocols/sametime/sametime.c:5594
+#: ../libpurple/protocols/sametime/sametime.c:5605
 msgid "Search for a user"
 msgstr "撠銝雿輻刻"
 
-#: ../libpurple/protocols/sametime/sametime.c:5595
+#: ../libpurple/protocols/sametime/sametime.c:5606
 msgid ""
 "Enter a name or partial ID in the field below to search for matching users "
 "in your Sametime community."
 msgstr "頛詨亙其遢 ID 潔寧甈雿嚗靘亥岷 Sametime 蝷曄黎銝剔泵雿輻刻"
 
-#: ../libpurple/protocols/sametime/sametime.c:5598
+#: ../libpurple/protocols/sametime/sametime.c:5609
 msgid "User Search"
 msgstr "雿輻刻撠"
 
-#: ../libpurple/protocols/sametime/sametime.c:5610
+#: ../libpurple/protocols/sametime/sametime.c:5622
 msgid "Import Sametime List..."
 msgstr "臬 Sametime 皜..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5614
+#: ../libpurple/protocols/sametime/sametime.c:5626
 msgid "Export Sametime List..."
 msgstr "臬 Sametime 皜..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5618
+#: ../libpurple/protocols/sametime/sametime.c:5630
 msgid "Add Notes Address Book Group..."
 msgstr "啣 Notes 閮蝢斤"
 
-#: ../libpurple/protocols/sametime/sametime.c:5622
+#: ../libpurple/protocols/sametime/sametime.c:5634
 msgid "User Search..."
 msgstr "雿輻刻撠..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5719
+#: ../libpurple/protocols/sametime/sametime.c:5740
 msgid "Force login (ignore server redirects)"
 msgstr "撘瑁餃伐敹賜乩撩券啣嚗"
 
 #. pretend to be Sametime Connect
-#: ../libpurple/protocols/sametime/sametime.c:5729
+#: ../libpurple/protocols/sametime/sametime.c:5750
 msgid "Hide client identity"
 msgstr "梯摰X嗥垢霅"
 
 #: ../libpurple/protocols/silc/buddy.c:52
-#: ../libpurple/protocols/silc/buddy.c:420
-#: ../libpurple/protocols/silc/buddy.c:545
-#: ../libpurple/protocols/silc/buddy.c:711
+#: ../libpurple/protocols/silc/buddy.c:421
+#: ../libpurple/protocols/silc/buddy.c:546
+#: ../libpurple/protocols/silc/buddy.c:712
 #: ../libpurple/protocols/silc/ft.c:338
 #, c-format
 msgid "User %s is not present in the network"
@@ -8908,103 +8917,103 @@
 #: ../libpurple/protocols/silc/buddy.c:139
 #: ../libpurple/protocols/silc/buddy.c:257
 msgid "Key Agreement"
-msgstr "鈭斗撖"
+msgstr "鈭斗撖蝣澆"
 
 #: ../libpurple/protocols/silc/buddy.c:54
 msgid "Cannot perform the key agreement"
-msgstr "⊥鈭斗撖"
+msgstr "⊥鈭斗撖蝣澆"
 
 #: ../libpurple/protocols/silc/buddy.c:116
 msgid "Error occurred during key agreement"
-msgstr "鈭斗撖唬葉箇暸航炊"
+msgstr "鈭斗撖蝣澆銝剖箇暸航炊"
 
 #: ../libpurple/protocols/silc/buddy.c:120
 msgid "Key Agreement failed"
-msgstr "鈭斗撖啣仃"
+msgstr "鈭斗撖蝣澆憭望"
 
 #: ../libpurple/protocols/silc/buddy.c:125
 msgid "Timeout during key agreement"
-msgstr "鈭斗撖圈暹"
+msgstr "鈭斗撖蝣澆暹"
 
 #: ../libpurple/protocols/silc/buddy.c:130
 msgid "Key agreement was aborted"
-msgstr "鈭斗撖啗◤銝剜迫"
+msgstr "鈭斗撖蝣澆鋡思葉甇"
 
 #: ../libpurple/protocols/silc/buddy.c:135
 msgid "Key agreement is already started"
-msgstr "鈭斗撖啣楛憪"
+msgstr "鈭斗撖蝣澆撌梢憪"
 
 #: ../libpurple/protocols/silc/buddy.c:140
 msgid "Key agreement cannot be started with yourself"
-msgstr "銝航芸楛鈭斗撖"
+msgstr "銝航芸楛鈭斗撖蝣澆"
 
 #: ../libpurple/protocols/silc/buddy.c:258
-#: ../libpurple/protocols/silc/buddy.c:388
-#: ../libpurple/protocols/silc/buddy.c:513
+#: ../libpurple/protocols/silc/buddy.c:389
+#: ../libpurple/protocols/silc/buddy.c:514
 msgid "The remote user is not present in the network any more"
 msgstr "蝡臭蝙刻撌脖函雯頝臭"
 
-#: ../libpurple/protocols/silc/buddy.c:294
+#: ../libpurple/protocols/silc/buddy.c:295
 #, c-format
 msgid ""
 "Key agreement request received from %s. Would you like to perform the key "
 "agreement?"
-msgstr " %s 嗅唬鈭斗撖啗瘙嚗冽喃漱撖啣嚗"
-
-#: ../libpurple/protocols/silc/buddy.c:298
+msgstr " %s 嗅唬鈭斗撖蝣澆閬瘙嚗冽喃漱撖蝣澆嚗"
+
+#: ../libpurple/protocols/silc/buddy.c:299
 #, c-format
 msgid ""
 "The remote user is waiting key agreement on:\n"
 "Remote host: %s\n"
 "Remote port: %d"
 msgstr ""
-"蝡舐雿輻刻甇函鈭斗撖堆\n"
+"蝡舐雿輻刻甇函鈭斗撖蝣澆嚗\n"
 "蝡臭蜓璈嚗%s\n"
 "蝡舫閮嚗%d"
 
-#: ../libpurple/protocols/silc/buddy.c:311
+#: ../libpurple/protocols/silc/buddy.c:312
 msgid "Key Agreement Request"
-msgstr "鈭斗撖啗瘙"
-
-#: ../libpurple/protocols/silc/buddy.c:387
-#: ../libpurple/protocols/silc/buddy.c:422
-#: ../libpurple/protocols/silc/buddy.c:464
+msgstr "鈭斗撖蝣澆閬瘙"
+
+#: ../libpurple/protocols/silc/buddy.c:388
+#: ../libpurple/protocols/silc/buddy.c:423
+#: ../libpurple/protocols/silc/buddy.c:465
 msgid "IM With Password"
 msgstr "撖蝣潔單閮"
 
-#: ../libpurple/protocols/silc/buddy.c:423
+#: ../libpurple/protocols/silc/buddy.c:424
 msgid "Cannot set IM key"
-msgstr "⊥閮剖單閮臬"
-
-#: ../libpurple/protocols/silc/buddy.c:465
+msgstr "⊥閮剖單閮臬蝣澆"
+
+#: ../libpurple/protocols/silc/buddy.c:466
 msgid "Set IM Password"
 msgstr "閮剖單閮臬蝣"
 
-#: ../libpurple/protocols/silc/buddy.c:512
-#: ../libpurple/protocols/silc/buddy.c:547
+#: ../libpurple/protocols/silc/buddy.c:513
+#: ../libpurple/protocols/silc/buddy.c:548
 #: ../libpurple/protocols/silc/ops.c:1494
 #: ../libpurple/protocols/silc/ops.c:1505
 msgid "Get Public Key"
-msgstr "敺祇"
-
-#: ../libpurple/protocols/silc/buddy.c:548
+msgstr "敺祇撖蝣澆"
+
+#: ../libpurple/protocols/silc/buddy.c:549
 #: ../libpurple/protocols/silc/ops.c:1495
 #: ../libpurple/protocols/silc/ops.c:1506
 msgid "Cannot fetch the public key"
-msgstr "⊥敺祇"
-
-#: ../libpurple/protocols/silc/buddy.c:634
-#: ../libpurple/protocols/silc/buddy.c:1647
-msgid "Show Public Key"
-msgstr "憿舐內祇"
+msgstr "⊥敺祇撖蝣澆"
 
 #: ../libpurple/protocols/silc/buddy.c:635
-#: ../libpurple/protocols/silc/buddy.c:1030
+#: ../libpurple/protocols/silc/buddy.c:1654
+msgid "Show Public Key"
+msgstr "憿舐內祇撖蝣澆"
+
+#: ../libpurple/protocols/silc/buddy.c:636
+#: ../libpurple/protocols/silc/buddy.c:1033
 #: ../libpurple/protocols/silc/chat.c:237
 msgid "Could not load public key"
-msgstr "⊥頛亙祇"
-
-#: ../libpurple/protocols/silc/buddy.c:712
+msgstr "⊥頛亙祇撖蝣澆"
+
+#: ../libpurple/protocols/silc/buddy.c:713
 #: ../libpurple/protocols/silc/ops.c:1087
 #: ../libpurple/protocols/silc/ops.c:1159
 #: ../libpurple/protocols/silc/ops.c:1294
@@ -9013,216 +9022,218 @@
 msgid "User Information"
 msgstr "雿輻刻鞈閮"
 
-#: ../libpurple/protocols/silc/buddy.c:713
+#: ../libpurple/protocols/silc/buddy.c:714
 #: ../libpurple/protocols/silc/ops.c:1160
 #: ../libpurple/protocols/silc/ops.c:1314
 msgid "Cannot get user information"
 msgstr "⊥霈雿輻刻鞈閮"
 
-#: ../libpurple/protocols/silc/buddy.c:734
+#: ../libpurple/protocols/silc/buddy.c:735
 #, c-format
 msgid "The %s buddy is not trusted"
 msgstr "憟賢 %s 銝鋡思縑隞"
 
-#: ../libpurple/protocols/silc/buddy.c:737
+#: ../libpurple/protocols/silc/buddy.c:738
 msgid ""
 "You cannot receive buddy notifications until you import his/her public key.  "
 "You can use the Get Public Key command to get the public key."
 msgstr ""
-"渲單典臬亙末祇堆典⊥嗅啗府憟賢憟賢乓閬敺祇堆具敺"
-"啜隞文喳胯"
+"渲單典臬亙末祇撖蝣澆嚗典⊥嗅啗府憟賢憟賢乓閬敺祇撖蝣澆嚗"
+"具敺祇撖蝣澆隞文喳胯"
 
 #. Open file selector to select the public key.
-#: ../libpurple/protocols/silc/buddy.c:1064
+#: ../libpurple/protocols/silc/buddy.c:1067
 msgid "Open..."
 msgstr "..."
 
-#: ../libpurple/protocols/silc/buddy.c:1073
+#: ../libpurple/protocols/silc/buddy.c:1078
 #, c-format
 msgid "The %s buddy is not present in the network"
 msgstr "憟賢 %s 銝函雯頝臭"
 
-#: ../libpurple/protocols/silc/buddy.c:1076
+#: ../libpurple/protocols/silc/buddy.c:1081
 msgid ""
 "To add the buddy you must import his/her public key. Press Import to import "
 "a public key."
-msgstr "閬啣憟賢嚗敹臬乩嚗憟對祇啜閬臬亙祇堆隢臬乓"
-
-#: ../libpurple/protocols/silc/buddy.c:1079
+msgstr ""
+"閬啣憟賢嚗敹臬乩嚗憟對祇撖蝣澆閬臬亙祇撖蝣澆嚗隢臬乓"
+
+#: ../libpurple/protocols/silc/buddy.c:1085
 msgid "_Import..."
 msgstr "臬(_I)..."
 
-#: ../libpurple/protocols/silc/buddy.c:1175
+#: ../libpurple/protocols/silc/buddy.c:1181
 msgid "Select correct user"
 msgstr "豢甇蝣箇雿輻刻"
 
-#: ../libpurple/protocols/silc/buddy.c:1177
+#: ../libpurple/protocols/silc/buddy.c:1183
 msgid ""
 "More than one user was found with the same public key. Select the correct "
 "user from the list to add to the buddy list."
 msgstr ""
-"頞銝雿輻刻雿輻典銝祇啜隢敺皜桅豢甇蝣箇雿輻刻嚗隞乩噶啣喳末皜桀扼"
-
-#: ../libpurple/protocols/silc/buddy.c:1179
+"頞銝雿輻刻雿輻典銝祇撖蝣澆隢敺皜桅豢甇蝣箇雿輻刻嚗隞乩噶啣喳末皜"
+"桀扼"
+
+#: ../libpurple/protocols/silc/buddy.c:1185
 msgid ""
 "More than one user was found with the same name. Select the correct user "
 "from the list to add to the buddy list."
 msgstr ""
 "頞銝雿輻刻雿輻典銝蝔晞隢敺皜桅豢甇蝣箇雿輻刻嚗隞乩噶啣喳末皜桀扼"
 
-#: ../libpurple/protocols/silc/buddy.c:1467
+#: ../libpurple/protocols/silc/buddy.c:1474
 msgid "Detached"
 msgstr "怠蝺"
 
 #  NOTE (01:24:07) wing: what is a status of "indisposed"?
 #  NOTE (01:25:44) LSchiere: if you take the dictionary definition, its more or less the same as "sick"
 #  NOTE (01:25:51) LSchiere: or "not feeling well"
-#: ../libpurple/protocols/silc/buddy.c:1471
+#: ../libpurple/protocols/silc/buddy.c:1478
 #: ../libpurple/protocols/silc/silc.c:49
 msgid "Indisposed"
 msgstr "銝"
 
 #  XXX
-#: ../libpurple/protocols/silc/buddy.c:1475
+#: ../libpurple/protocols/silc/buddy.c:1482
 #: ../libpurple/protocols/silc/silc.c:51
 msgid "Wake Me Up"
 msgstr "恍嚗"
 
 #  XXX
-#: ../libpurple/protocols/silc/buddy.c:1477
+#: ../libpurple/protocols/silc/buddy.c:1484
 #: ../libpurple/protocols/silc/silc.c:43
 msgid "Hyper Active"
 msgstr "璆萄漲瘣餉"
 
-#: ../libpurple/protocols/silc/buddy.c:1479
+#: ../libpurple/protocols/silc/buddy.c:1486
 msgid "Robot"
 msgstr "璈璇唬犖"
 
-#: ../libpurple/protocols/silc/buddy.c:1486
+#: ../libpurple/protocols/silc/buddy.c:1493
 #: ../libpurple/protocols/silc/silc.c:662
 #: ../libpurple/protocols/silc/util.c:512
 msgid "Happy"
 msgstr "敹"
 
-#: ../libpurple/protocols/silc/buddy.c:1488
+#: ../libpurple/protocols/silc/buddy.c:1495
 #: ../libpurple/protocols/silc/silc.c:664
 #: ../libpurple/protocols/silc/util.c:514
 msgid "Sad"
 msgstr ""
 
-#: ../libpurple/protocols/silc/buddy.c:1490
+#: ../libpurple/protocols/silc/buddy.c:1497
 #: ../libpurple/protocols/silc/silc.c:666
 #: ../libpurple/protocols/silc/util.c:516
 msgid "Angry"
 msgstr "斗"
 
-#: ../libpurple/protocols/silc/buddy.c:1492
+#: ../libpurple/protocols/silc/buddy.c:1499
 #: ../libpurple/protocols/silc/silc.c:668
 #: ../libpurple/protocols/silc/util.c:518
 msgid "Jealous"
 msgstr "憳憒"
 
-#: ../libpurple/protocols/silc/buddy.c:1494
+#: ../libpurple/protocols/silc/buddy.c:1501
 #: ../libpurple/protocols/silc/silc.c:670
 #: ../libpurple/protocols/silc/util.c:520
 msgid "Ashamed"
 msgstr ""
 
-#: ../libpurple/protocols/silc/buddy.c:1496
+#: ../libpurple/protocols/silc/buddy.c:1503
 #: ../libpurple/protocols/silc/silc.c:672
 #: ../libpurple/protocols/silc/util.c:522
 msgid "Invincible"
 msgstr "⊥"
 
-#: ../libpurple/protocols/silc/buddy.c:1498
+#: ../libpurple/protocols/silc/buddy.c:1505
 #: ../libpurple/protocols/silc/util.c:524
 msgid "In Love"
 msgstr "銝"
 
-#: ../libpurple/protocols/silc/buddy.c:1500
+#: ../libpurple/protocols/silc/buddy.c:1507
 #: ../libpurple/protocols/silc/silc.c:676
 #: ../libpurple/protocols/silc/util.c:526
 msgid "Sleepy"
 msgstr "喟"
 
-#: ../libpurple/protocols/silc/buddy.c:1502
+#: ../libpurple/protocols/silc/buddy.c:1509
 #: ../libpurple/protocols/silc/silc.c:678
 #: ../libpurple/protocols/silc/util.c:528
 msgid "Bored"
 msgstr "潭"
 
-#: ../libpurple/protocols/silc/buddy.c:1504
+#: ../libpurple/protocols/silc/buddy.c:1511
 #: ../libpurple/protocols/silc/silc.c:680
 #: ../libpurple/protocols/silc/util.c:530
 msgid "Excited"
 msgstr "憟"
 
-#: ../libpurple/protocols/silc/buddy.c:1506
+#: ../libpurple/protocols/silc/buddy.c:1513
 #: ../libpurple/protocols/silc/silc.c:682
 #: ../libpurple/protocols/silc/util.c:532
 msgid "Anxious"
 msgstr ""
 
-#: ../libpurple/protocols/silc/buddy.c:1538
+#: ../libpurple/protocols/silc/buddy.c:1545
 #: ../libpurple/protocols/silc/ops.c:1202
 msgid "User Modes"
 msgstr "雿輻刻璅∪"
 
-#: ../libpurple/protocols/silc/buddy.c:1550
+#: ../libpurple/protocols/silc/buddy.c:1557
 #: ../libpurple/protocols/silc/ops.c:1207
 msgid "Mood"
 msgstr "敹"
 
-#: ../libpurple/protocols/silc/buddy.c:1555
+#: ../libpurple/protocols/silc/buddy.c:1562
 #: ../libpurple/protocols/silc/ops.c:1219
 msgid "Preferred Contact"
 msgstr "舐窗寞"
 
-#: ../libpurple/protocols/silc/buddy.c:1560
+#: ../libpurple/protocols/silc/buddy.c:1567
 #: ../libpurple/protocols/silc/ops.c:1224
 msgid "Preferred Language"
 msgstr "貊刻"
 
-#: ../libpurple/protocols/silc/buddy.c:1565
+#: ../libpurple/protocols/silc/buddy.c:1572
 #: ../libpurple/protocols/silc/ops.c:1229
 msgid "Device"
 msgstr "刻蝵"
 
-#: ../libpurple/protocols/silc/buddy.c:1570
+#: ../libpurple/protocols/silc/buddy.c:1577
 #: ../libpurple/protocols/silc/ops.c:1234
 #: ../libpurple/protocols/silc/silc.c:730
 #: ../libpurple/protocols/silc/silc.c:732
 msgid "Timezone"
 msgstr ""
 
-#: ../libpurple/protocols/silc/buddy.c:1575
+#: ../libpurple/protocols/silc/buddy.c:1582
 #: ../libpurple/protocols/silc/ops.c:1239
 msgid "Geolocation"
 msgstr "其蝵"
 
-#: ../libpurple/protocols/silc/buddy.c:1629
+#: ../libpurple/protocols/silc/buddy.c:1636
 msgid "Reset IM Key"
-msgstr "皜文單閮臬"
-
-#: ../libpurple/protocols/silc/buddy.c:1635
+msgstr "皜文單閮臬蝣澆"
+
+#: ../libpurple/protocols/silc/buddy.c:1642
 msgid "IM with Key Exchange"
-msgstr "閬鈭斗撖唬單閮"
-
-#: ../libpurple/protocols/silc/buddy.c:1640
+msgstr "閬鈭斗撖蝣澆銋單閮"
+
+#: ../libpurple/protocols/silc/buddy.c:1647
 msgid "IM with Password"
 msgstr "撖蝣潔單閮"
 
-#: ../libpurple/protocols/silc/buddy.c:1653
+#: ../libpurple/protocols/silc/buddy.c:1660
 msgid "Get Public Key..."
-msgstr "敺祇..."
-
-#: ../libpurple/protocols/silc/buddy.c:1660
+msgstr "敺祇撖蝣澆..."
+
+#: ../libpurple/protocols/silc/buddy.c:1667
 #: ../libpurple/protocols/silc/ops.c:1624
 msgid "Kill User"
 msgstr "敺蝬脰楝銝蝘駁支蝙刻"
 
-#: ../libpurple/protocols/silc/buddy.c:1670
-#: ../libpurple/protocols/silc/chat.c:972
+#: ../libpurple/protocols/silc/buddy.c:1677
+#: ../libpurple/protocols/silc/chat.c:977
 msgid "Draw On Whiteboard"
 msgstr "函賣蹂蝜芸"
 
@@ -9282,31 +9293,31 @@
 #: ../libpurple/protocols/silc/chat.c:165
 #, c-format
 msgid "<br><b>Founder Key Fingerprint:</b><br>%s"
-msgstr "<br><b>萇銋祇唳蝝嚗</b><br>%s"
+msgstr "<br><b>萇銋祇撖蝣澆蝝嚗</b><br>%s"
 
 #: ../libpurple/protocols/silc/chat.c:166
 #, c-format
 msgid "<br><b>Founder Key Babbleprint:</b><br>%s"
-msgstr "<br><b>萇銋祇唳蝝航 (Babbleprint)嚗</b><br>%s"
+msgstr "<br><b>萇銋祇撖蝣澆蝝航 (Babbleprint)嚗</b><br>%s"
 
 #: ../libpurple/protocols/silc/chat.c:236
 msgid "Add Channel Public Key"
-msgstr "啣駁祇"
+msgstr "啣駁祇撖蝣澆"
 
 #. Add new public key
 #: ../libpurple/protocols/silc/chat.c:291
 msgid "Open Public Key..."
-msgstr "祇..."
-
-#: ../libpurple/protocols/silc/chat.c:400
+msgstr "祇撖蝣澆..."
+
+#: ../libpurple/protocols/silc/chat.c:401
 msgid "Channel Passphrase"
 msgstr "駁撖蝣"
 
-#: ../libpurple/protocols/silc/chat.c:407
+#: ../libpurple/protocols/silc/chat.c:408
 msgid "Channel Public Keys List"
-msgstr "駁祇唳"
-
-#: ../libpurple/protocols/silc/chat.c:412
+msgstr "駁祇撖蝣澆皜"
+
+#: ../libpurple/protocols/silc/chat.c:413
 msgid ""
 "Channel authentication is used to secure the channel from unauthorized "
 "access. The authentication may be based on passphrase and digital "
@@ -9314,140 +9325,140 @@
 "channel public keys are set then only users whose public keys are listed are "
 "able to join."
 msgstr ""
-"駁隤霅舐其脫迫駁芰甈鋡怠嚗隤霅寞臭誑舫撖蝣潭訾"
-"蝪賜憒閮剖鈭撖蝣潘仿駁撠勗鈭頛詨亙蝣潘憒閮剖鈭駁祇堆仿"
-"撠勗祇啣找嗡"
+"駁隤霅舐其脫迫駁芰甈鋡怠嚗隤霅寞臭誑舫撖蝣潭貊Ⅳ"
+"蝪賜蔡憒閮剖鈭撖蝣潘仿駁撠勗鈭頛詨亙蝣潘憒閮剖鈭駁祇撖蝣澆嚗"
+"仿駁撠勗祇撖蝣澆找嗡"
 
 #  XXX 怨陌
-#: ../libpurple/protocols/silc/chat.c:421
 #: ../libpurple/protocols/silc/chat.c:422
-#: ../libpurple/protocols/silc/chat.c:459
-#: ../libpurple/protocols/silc/chat.c:460
-#: ../libpurple/protocols/silc/chat.c:906
+#: ../libpurple/protocols/silc/chat.c:423
+#: ../libpurple/protocols/silc/chat.c:461
+#: ../libpurple/protocols/silc/chat.c:462
+#: ../libpurple/protocols/silc/chat.c:911
 msgid "Channel Authentication"
 msgstr "駁隤霅"
 
-#: ../libpurple/protocols/silc/chat.c:423
-#: ../libpurple/protocols/silc/chat.c:461
+#: ../libpurple/protocols/silc/chat.c:424
+#: ../libpurple/protocols/silc/chat.c:463
 msgid "Add / Remove"
 msgstr "啣嚗蝘駁"
 
 # XXX may be wrong
-#: ../libpurple/protocols/silc/chat.c:578
+#: ../libpurple/protocols/silc/chat.c:581
 msgid "Group Name"
 msgstr "憭拙恕蝔"
 
-#: ../libpurple/protocols/silc/chat.c:582
-#: ../libpurple/protocols/silc/ops.c:1909
-#: ../libpurple/protocols/silc/silc.c:938
+#: ../libpurple/protocols/silc/chat.c:585
+#: ../libpurple/protocols/silc/ops.c:1910
+#: ../libpurple/protocols/silc/silc.c:939
 msgid "Passphrase"
 msgstr "撖蝣"
 
-#: ../libpurple/protocols/silc/chat.c:593
+#: ../libpurple/protocols/silc/chat.c:596
 #, c-format
 msgid "Please enter the %s channel private group name and passphrase."
 msgstr "隢函策駁 %s 抒撠摮頛詨亙蝔勗撖蝣潦"
 
-#: ../libpurple/protocols/silc/chat.c:595
+#: ../libpurple/protocols/silc/chat.c:598
 msgid "Add Channel Private Group"
 msgstr "啣駁撠摮"
 
 # XXX may be wrong
-#: ../libpurple/protocols/silc/chat.c:722
+#: ../libpurple/protocols/silc/chat.c:726
 msgid "User Limit"
 msgstr "雿輻刻貊桐"
 
-#: ../libpurple/protocols/silc/chat.c:723
+#: ../libpurple/protocols/silc/chat.c:727
 msgid "Set user limit on channel. Set to zero to reset user limit."
 msgstr "閮剖雿輻刻貊桐嚗閬皜支蝙刻貊桐嚗頛詨仿嗅喳胯"
 
-#: ../libpurple/protocols/silc/chat.c:886
+#: ../libpurple/protocols/silc/chat.c:891
 msgid "Invite List"
 msgstr "隢皜"
 
 #  XXX 怨陌
-#: ../libpurple/protocols/silc/chat.c:891
+#: ../libpurple/protocols/silc/chat.c:896
 msgid "Ban List"
 msgstr "蝳甇X"
 
-#: ../libpurple/protocols/silc/chat.c:899
+#: ../libpurple/protocols/silc/chat.c:904
 msgid "Add Private Group"
 msgstr "啣撠摮"
 
-#: ../libpurple/protocols/silc/chat.c:912
+#: ../libpurple/protocols/silc/chat.c:917
 msgid "Reset Permanent"
 msgstr "皜斗偶銋折駁璅∪"
 
-#: ../libpurple/protocols/silc/chat.c:917
+#: ../libpurple/protocols/silc/chat.c:922
 msgid "Set Permanent"
 msgstr "閮剖瘞訾折駁璅∪"
 
 #  XXX may be wrong
-#: ../libpurple/protocols/silc/chat.c:925
+#: ../libpurple/protocols/silc/chat.c:930
 msgid "Set User Limit"
 msgstr "閮剖雿輻刻貊桐"
 
-#: ../libpurple/protocols/silc/chat.c:931
+#: ../libpurple/protocols/silc/chat.c:936
 msgid "Reset Topic Restriction"
 msgstr "皜支蜓憿"
 
-#: ../libpurple/protocols/silc/chat.c:936
+#: ../libpurple/protocols/silc/chat.c:941
 msgid "Set Topic Restriction"
 msgstr "閮剖銝駁"
 
-#: ../libpurple/protocols/silc/chat.c:943
+#: ../libpurple/protocols/silc/chat.c:948
 msgid "Reset Private Channel"
 msgstr "皜斤券駁璅∪"
 
-#: ../libpurple/protocols/silc/chat.c:948
+#: ../libpurple/protocols/silc/chat.c:953
 msgid "Set Private Channel"
 msgstr "閮剖蝘券駁璅∪"
 
-#: ../libpurple/protocols/silc/chat.c:955
+#: ../libpurple/protocols/silc/chat.c:960
 msgid "Reset Secret Channel"
 msgstr "皜斤撖駁璅∪"
 
-#: ../libpurple/protocols/silc/chat.c:960
+#: ../libpurple/protocols/silc/chat.c:965
 msgid "Set Secret Channel"
 msgstr "閮剖蝘撖駁璅∪"
 
 #  XXX 怨陌
-#: ../libpurple/protocols/silc/chat.c:1034
+#: ../libpurple/protocols/silc/chat.c:1039
 #, c-format
 msgid "You are channel founder on <I>%s</I>"
 msgstr "冽 <I>%s</I> 駁萇"
 
-#: ../libpurple/protocols/silc/chat.c:1038
+#: ../libpurple/protocols/silc/chat.c:1043
 #, c-format
 msgid "Channel founder on <I>%s</I> is <I>%s</I>"
 msgstr "<I>%s</I> 駁萇 <I>%s</I>"
 
-#: ../libpurple/protocols/silc/chat.c:1097
+#: ../libpurple/protocols/silc/chat.c:1102
 #, c-format
 msgid ""
 "You have to join the %s channel before you are able to join the private group"
 msgstr "亙摮嚗典擐仿駁 %s"
 
-#: ../libpurple/protocols/silc/chat.c:1099
+#: ../libpurple/protocols/silc/chat.c:1104
 msgid "Join Private Group"
 msgstr "亙摮"
 
-#: ../libpurple/protocols/silc/chat.c:1100
+#: ../libpurple/protocols/silc/chat.c:1105
 msgid "Cannot join private group"
 msgstr "⊥亙摮"
 
-#: ../libpurple/protocols/silc/chat.c:1294
-#: ../libpurple/protocols/silc/silc.c:1146
+#: ../libpurple/protocols/silc/chat.c:1299
+#: ../libpurple/protocols/silc/silc.c:1148
 msgid "Call Command"
 msgstr "澆急隞"
 
-#: ../libpurple/protocols/silc/chat.c:1294
-#: ../libpurple/protocols/silc/silc.c:1146
+#: ../libpurple/protocols/silc/chat.c:1299
+#: ../libpurple/protocols/silc/silc.c:1148
 msgid "Cannot call command"
 msgstr "⊥瑁隞"
 
-#: ../libpurple/protocols/silc/chat.c:1295
-#: ../libpurple/protocols/silc/silc.c:1147
+#: ../libpurple/protocols/silc/chat.c:1300
+#: ../libpurple/protocols/silc/silc.c:1149
 msgid "Unknown command"
 msgstr "芰亦隞"
 
@@ -9472,7 +9483,7 @@
 
 #: ../libpurple/protocols/silc/ft.c:98
 msgid "Key agreement failed"
-msgstr "鈭斗撖啣仃"
+msgstr "鈭斗撖蝣澆憭望"
 
 #: ../libpurple/protocols/silc/ft.c:102
 msgid "File transfer session does not exist"
@@ -9488,7 +9499,7 @@
 
 #: ../libpurple/protocols/silc/ft.c:216
 msgid "Could not perform key agreement for file transfer"
-msgstr "⊥鈭斗撖唬誑靘唾撓"
+msgstr "⊥鈭斗撖蝣澆隞乩唾撓"
 
 #: ../libpurple/protocols/silc/ft.c:222
 msgid "Could not start the file transfer"
@@ -9559,7 +9570,7 @@
 msgstr "瑁痊"
 
 #: ../libpurple/protocols/silc/ops.c:1052
-#: ../libpurple/protocols/silc/silc.c:931
+#: ../libpurple/protocols/silc/silc.c:932
 msgid "Organization"
 msgstr "撅祆瑽"
 
@@ -9588,19 +9599,19 @@
 #: ../libpurple/protocols/silc/ops.c:1285
 #: ../libpurple/protocols/silc/ops.c:1357
 msgid "Public Key Fingerprint"
-msgstr "祇唳蝝"
+msgstr "祇撖蝣澆蝝"
 
 #: ../libpurple/protocols/silc/ops.c:1286
 #: ../libpurple/protocols/silc/ops.c:1358
 msgid "Public Key Babbleprint"
-msgstr "祇唳蝝航 (Babbleprint)"
+msgstr "祇撖蝣澆蝝航 (Babbleprint)"
 
 #: ../libpurple/protocols/silc/ops.c:1298
 msgid "_More..."
 msgstr "游(_M)..."
 
 #: ../libpurple/protocols/silc/ops.c:1371
-#: ../libpurple/protocols/silc/silc.c:997
+#: ../libpurple/protocols/silc/silc.c:999
 msgid "Detach From Server"
 msgstr "隡箸冽怠蝺"
 
@@ -9626,7 +9637,7 @@
 
 #: ../libpurple/protocols/silc/ops.c:1507
 msgid "No public key was received"
-msgstr "瘝嗅啣祇"
+msgstr "瘝嗅啣祇撖蝣澆"
 
 #: ../libpurple/protocols/silc/ops.c:1519
 #: ../libpurple/protocols/silc/ops.c:1532
@@ -9712,7 +9723,7 @@
 
 #: ../libpurple/protocols/silc/ops.c:1714
 msgid "Key Exchange failed"
-msgstr "撖唬漱憭望"
+msgstr "撖蝣澆鈭斗憭望"
 
 #: ../libpurple/protocols/silc/ops.c:1723
 msgid ""
@@ -9735,67 +9746,69 @@
 
 #: ../libpurple/protocols/silc/ops.c:1869
 msgid "Verifying server public key"
-msgstr "詨祕隡箸函祇唬葉"
-
-#: ../libpurple/protocols/silc/ops.c:1910
+msgstr "詨祕隡箸函祇撖蝣澆銝"
+
+#: ../libpurple/protocols/silc/ops.c:1911
 msgid "Passphrase required"
 msgstr "敹頛詨亙蝣"
 
-#: ../libpurple/protocols/silc/ops.c:1939
+#: ../libpurple/protocols/silc/ops.c:1940
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "憭望嚗砌蝚佗隢湔唳函冽嗥垢蝔撘"
 
-#: ../libpurple/protocols/silc/ops.c:1942
+#: ../libpurple/protocols/silc/ops.c:1943
 msgid "Failure: Remote does not trust/support your public key"
-msgstr "憭望嚗蝡臭靽∩遙嚗銝舀湔函祇"
-
-#: ../libpurple/protocols/silc/ops.c:1945
+msgstr "憭望嚗蝡臭靽∩遙嚗銝舀湔函祇撖蝣澆"
+
+#: ../libpurple/protocols/silc/ops.c:1946
 msgid "Failure: Remote does not support proposed KE group"
-msgstr "憭望嚗蝡臭舀游遣霅唬葉撖唬漱蝢斤 (KE group)"
-
-#: ../libpurple/protocols/silc/ops.c:1948
+msgstr "憭望嚗蝡臭舀游遣霅唬葉撖蝣澆鈭斗蝢斤 (KE group)"
+
+#: ../libpurple/protocols/silc/ops.c:1949
 msgid "Failure: Remote does not support proposed cipher"
 msgstr "憭望嚗蝡臭舀游遣霅唬葉撖孵 (cipher)"
 
 #  NOTE 霅舀皞 http://www.nii.org.tw/cnt/info/Report/19980906.htm
-#: ../libpurple/protocols/silc/ops.c:1951
+#: ../libpurple/protocols/silc/ops.c:1952
 msgid "Failure: Remote does not support proposed PKCS"
-msgstr "憭望嚗蝡臭舀游遣霅唬葉祇啣霅豢皞 (PKCS)"
-
-#: ../libpurple/protocols/silc/ops.c:1954
+msgstr "憭望嚗蝡臭舀游遣霅唬葉祇撖蝣澆撖璅皞"
+
+#: ../libpurple/protocols/silc/ops.c:1955
 msgid "Failure: Remote does not support proposed hash function"
 msgstr "憭望嚗蝡臭舀游遣霅唬葉皝賣 (hash function)"
 
 #  NOTE 霅舀皞 http://www.cert.org.tw/document/column/show.php?key=28
-#: ../libpurple/protocols/silc/ops.c:1957
+#: ../libpurple/protocols/silc/ops.c:1958
 msgid "Failure: Remote does not support proposed HMAC"
 msgstr "憭望嚗蝡臭舀游遣霅唬葉頨思遢撽霅隞蝣 (HMAC)"
 
-#: ../libpurple/protocols/silc/ops.c:1959
+#: ../libpurple/protocols/silc/ops.c:1960
 msgid "Failure: Incorrect signature"
 msgstr "憭望嚗航炊蝪賜"
 
-#: ../libpurple/protocols/silc/ops.c:1961
+#: ../libpurple/protocols/silc/ops.c:1962
 msgid "Failure: Invalid cookie"
 msgstr "憭望嚗⊥ Cookie"
 
-#: ../libpurple/protocols/silc/ops.c:1972
+#: ../libpurple/protocols/silc/ops.c:1973
 msgid "Failure: Authentication failed"
 msgstr "憭望嚗隤霅憭望"
 
-#: ../libpurple/protocols/silc/pk.c:103
+#: ../libpurple/protocols/silc/pk.c:104
 #, c-format
 msgid ""
 "Received %s's public key. Your local copy does not match this key. Would you "
 "still like to accept this public key?"
-msgstr "嗅 %s 祇堆雿嗅啁祇啗函暹銝隞嗆亙祇啣嚗"
-
-#: ../libpurple/protocols/silc/pk.c:108
+msgstr ""
+"嗅 %s 祇撖蝣澆嚗雿嗅啁祇撖蝣澆頝函暹銝隞嗆亙祇撖蝣"
+"嚗"
+
+#: ../libpurple/protocols/silc/pk.c:109
 #, c-format
 msgid "Received %s's public key. Would you like to accept this public key?"
-msgstr "嗅 %s 祇堆亙祇啣嚗"
-
-#: ../libpurple/protocols/silc/pk.c:112
+msgstr "嗅 %s 祇撖蝣澆嚗亙祇撖蝣澆嚗"
+
+#: ../libpurple/protocols/silc/pk.c:113
 #, c-format
 msgid ""
 "Fingerprint and babbleprint for the %s key are:\n"
@@ -9803,22 +9816,22 @@
 "%s\n"
 "%s\n"
 msgstr ""
-"%s 祇啁蝝嗅航 (babbleprint) 綽\n"
+"%s 祇撖蝣澆蝝嗅航 (babbleprint) 綽\n"
 "\n"
 "%s\n"
 "%s\n"
 
-#: ../libpurple/protocols/silc/pk.c:115 ../libpurple/protocols/silc/pk.c:140
+#: ../libpurple/protocols/silc/pk.c:116 ../libpurple/protocols/silc/pk.c:142
 msgid "Verify Public Key"
-msgstr "詨祕祇"
-
-#: ../libpurple/protocols/silc/pk.c:119
+msgstr "詨祕祇撖蝣澆"
+
+#: ../libpurple/protocols/silc/pk.c:121
 msgid "_View..."
 msgstr "瑼Z(_V)..."
 
-#: ../libpurple/protocols/silc/pk.c:141
+#: ../libpurple/protocols/silc/pk.c:143
 msgid "Unsupported public key type"
-msgstr "銝舀渡祇圈"
+msgstr "銝舀渡祇撖蝣澆憿"
 
 #: ../libpurple/protocols/silc/silc.c:153
 msgid "Connection failed"
@@ -9830,7 +9843,7 @@
 
 #: ../libpurple/protocols/silc/silc.c:185
 msgid "Performing key exchange"
-msgstr "鈭斗撖唬葉"
+msgstr "鈭斗撖蝣澆銝"
 
 #: ../libpurple/protocols/silc/silc.c:271
 msgid "Out of memory"
@@ -9857,7 +9870,7 @@
 #: ../libpurple/protocols/silc/silc.c:338
 #, c-format
 msgid "Could not load SILC key pair: %s"
-msgstr "⊥霈 SILC 撖啣嚗%s"
+msgstr "⊥霈 SILC 撠撖蝣澆嚗%s"
 
 #: ../libpurple/protocols/silc/silc.c:359
 msgid "Unable to create connection"
@@ -9867,7 +9880,7 @@
 msgid "Your Current Mood"
 msgstr "函桀敹"
 
-#: ../libpurple/protocols/silc/silc.c:660 ../pidgin/gtkprefs.c:1527
+#: ../libpurple/protocols/silc/silc.c:660 ../pidgin/gtkprefs.c:1529
 msgid "Normal"
 msgstr "甇撣"
 
@@ -9934,174 +9947,174 @@
 "典臭誑蝯血嗡雿輻刻閬函銝蝺鈭箄閮函鞈閮嚗芷頛詨交典"
 "鈭箇敺閬"
 
-#: ../libpurple/protocols/silc/silc.c:779
-#: ../libpurple/protocols/silc/silc.c:785
-#: ../libpurple/protocols/silc/silc.c:1424
+#: ../libpurple/protocols/silc/silc.c:780
+#: ../libpurple/protocols/silc/silc.c:786
+#: ../libpurple/protocols/silc/silc.c:1426
 msgid "Message of the Day"
 msgstr "舀亥"
 
-#: ../libpurple/protocols/silc/silc.c:779
-msgid "No Message of the Day available"
-msgstr "瘝舀亥"
-
 #: ../libpurple/protocols/silc/silc.c:780
-#: ../libpurple/protocols/silc/silc.c:1419
+msgid "No Message of the Day available"
+msgstr "瘝舀亥"
+
+#: ../libpurple/protocols/silc/silc.c:781
+#: ../libpurple/protocols/silc/silc.c:1421
 msgid "There is no Message of the Day associated with this connection"
 msgstr "蝯瘝賊舀亥"
 
-#: ../libpurple/protocols/silc/silc.c:831
-#: ../libpurple/protocols/silc/silc.c:875
-#: ../libpurple/protocols/silc/silc.c:946
+#: ../libpurple/protocols/silc/silc.c:832
+#: ../libpurple/protocols/silc/silc.c:876
 #: ../libpurple/protocols/silc/silc.c:947
+#: ../libpurple/protocols/silc/silc.c:948
 msgid "Create New SILC Key Pair"
 msgstr "Y啁 SILC 撖撠"
 
-#: ../libpurple/protocols/silc/silc.c:831
+#: ../libpurple/protocols/silc/silc.c:832
 msgid "Passphrases do not match"
 msgstr "撖蝣潔蝚"
 
-#: ../libpurple/protocols/silc/silc.c:875
+#: ../libpurple/protocols/silc/silc.c:876
 msgid "Key Pair Generation failed"
-msgstr "撖啣Y憭望"
-
-#: ../libpurple/protocols/silc/silc.c:914
+msgstr "撠撖蝣澆Y憭望"
+
+#: ../libpurple/protocols/silc/silc.c:915
 msgid "Key length"
-msgstr "撖圈瑕漲"
-
-#: ../libpurple/protocols/silc/silc.c:916
+msgstr "撖蝣澆瑕漲"
+
+#: ../libpurple/protocols/silc/silc.c:917
 msgid "Public key file"
-msgstr "祇唳獢"
-
-#: ../libpurple/protocols/silc/silc.c:918
+msgstr "祇撖蝣澆瑼獢"
+
+#: ../libpurple/protocols/silc/silc.c:919
 msgid "Private key file"
-msgstr "蝘唳獢"
-
-#: ../libpurple/protocols/silc/silc.c:941
+msgstr "蝘鈭箏蝣澆瑼獢"
+
+#: ../libpurple/protocols/silc/silc.c:942
 msgid "Passphrase (retype)"
 msgstr "撖蝣潘甈∟撓伐"
 
-#: ../libpurple/protocols/silc/silc.c:948
+#: ../libpurple/protocols/silc/silc.c:949
 msgid "Generate Key Pair"
-msgstr "Y撖啣"
-
-#: ../libpurple/protocols/silc/silc.c:992
+msgstr "Y撠撖蝣澆"
+
+#: ../libpurple/protocols/silc/silc.c:994
 msgid "Online Status"
 msgstr "銝蝺"
 
-#: ../libpurple/protocols/silc/silc.c:1001
+#: ../libpurple/protocols/silc/silc.c:1003
 msgid "View Message of the Day"
 msgstr "憿舐內舀亥 (MOTD)"
 
-#: ../libpurple/protocols/silc/silc.c:1005
+#: ../libpurple/protocols/silc/silc.c:1007
 msgid "Create SILC Key Pair..."
-msgstr "Y SILC 撖啣..."
-
-#: ../libpurple/protocols/silc/silc.c:1104
+msgstr "Y SILC 撠撖蝣澆..."
+
+#: ../libpurple/protocols/silc/silc.c:1106
 #, c-format
 msgid "User <I>%s</I> is not present in the network"
 msgstr "雿輻刻 <I>%s</I> 銝函雯頝臭"
 
-#: ../libpurple/protocols/silc/silc.c:1295
+#: ../libpurple/protocols/silc/silc.c:1297
 msgid "Topic too long"
 msgstr "憭拐蜓憿"
 
-#: ../libpurple/protocols/silc/silc.c:1376
+#: ../libpurple/protocols/silc/silc.c:1378
 msgid "You must specify a nick"
 msgstr "敹摰梁迂"
 
-#: ../libpurple/protocols/silc/silc.c:1478
+#: ../libpurple/protocols/silc/silc.c:1480
 #, c-format
 msgid "channel %s not found"
 msgstr "曆唳霅 %s"
 
-#: ../libpurple/protocols/silc/silc.c:1483
+#: ../libpurple/protocols/silc/silc.c:1485
 #, c-format
 msgid "channel modes for %s: %s"
 msgstr "%s 駁璅∪綽%s"
 
-#: ../libpurple/protocols/silc/silc.c:1485
+#: ../libpurple/protocols/silc/silc.c:1487
 #, c-format
 msgid "no channel modes are set on %s"
 msgstr "%s 瘝閮剖駁璅∪"
 
-#: ../libpurple/protocols/silc/silc.c:1498
+#: ../libpurple/protocols/silc/silc.c:1500
 #, c-format
 msgid "Failed to set cmodes for %s"
 msgstr "⊥ %s 閮剖駁璅∪"
 
-#: ../libpurple/protocols/silc/silc.c:1528
+#: ../libpurple/protocols/silc/silc.c:1530
 #, c-format
 msgid "Unknown command: %s, (may be a client bug)"
 msgstr "芰亦隞歹%s嚗航賣臬恥嗥垢航炊嚗"
 
-#: ../libpurple/protocols/silc/silc.c:1591
+#: ../libpurple/protocols/silc/silc.c:1593
 msgid "part [channel]:  Leave the chat"
 msgstr "part [駁]嚗a憭拙恕"
 
-#: ../libpurple/protocols/silc/silc.c:1595
+#: ../libpurple/protocols/silc/silc.c:1597
 msgid "leave [channel]:  Leave the chat"
 msgstr "leave [駁]嚗a憭拙恕"
 
-#: ../libpurple/protocols/silc/silc.c:1599
+#: ../libpurple/protocols/silc/silc.c:1601
 msgid "topic [&lt;new topic&gt;]:  View or change the topic"
 msgstr "topic [&lt;唬蜓憿&gt;]嚗瑼Z靽格寡憭拐蜓憿"
 
-#: ../libpurple/protocols/silc/silc.c:1604
+#: ../libpurple/protocols/silc/silc.c:1606
 msgid "join &lt;channel&gt; [&lt;password&gt;]:  Join a chat on this network"
 msgstr "join &lt;駁&gt; [&lt;撖蝣&gt;]嚗乩函雯頝臭憭拙恕"
 
-#: ../libpurple/protocols/silc/silc.c:1608
+#: ../libpurple/protocols/silc/silc.c:1610
 msgid "list:  List channels on this network"
 msgstr "list嚗箇桀函雯蝯∩憭拙恕皜"
 
-#: ../libpurple/protocols/silc/silc.c:1612
+#: ../libpurple/protocols/silc/silc.c:1614
 msgid "whois &lt;nick&gt;:  View nick's information"
 msgstr "whois &lt;梁迂&gt;嚗亦梁迂賊鞈閮"
 
-#: ../libpurple/protocols/silc/silc.c:1616
-#: ../libpurple/protocols/zephyr/zephyr.c:2684
+#: ../libpurple/protocols/silc/silc.c:1618
+#: ../libpurple/protocols/zephyr/zephyr.c:2685
 msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user"
 msgstr "msg &lt;梁迂&gt; &lt;閮&gt;嚗箔蝘鈭箄舐策摰雿輻刻"
 
-#: ../libpurple/protocols/silc/silc.c:1620
+#: ../libpurple/protocols/silc/silc.c:1622
 msgid "query &lt;nick&gt; [&lt;message&gt;]:  Send a private message to a user"
 msgstr "query &lt;梁迂&gt; [&lt;閮&gt;]嚗箔蝘鈭箄舐策摰雿輻刻"
 
-#: ../libpurple/protocols/silc/silc.c:1624
+#: ../libpurple/protocols/silc/silc.c:1626
 msgid "motd:  View the server's Message Of The Day"
 msgstr "motd嚗憿舐內隡箸函舀亥 (MOTD)"
 
-#: ../libpurple/protocols/silc/silc.c:1628
+#: ../libpurple/protocols/silc/silc.c:1630
 msgid "detach:  Detach this session"
 msgstr "detach嚗怠蝺撌乩畾"
 
-#: ../libpurple/protocols/silc/silc.c:1632
+#: ../libpurple/protocols/silc/silc.c:1634
 msgid "quit [message]:  Disconnect from the server, with an optional message"
 msgstr "quit [閮珠嚗芯撩券Y嚗銝血舫豢箸摰閮"
 
-#: ../libpurple/protocols/silc/silc.c:1636
+#: ../libpurple/protocols/silc/silc.c:1638
 msgid "call &lt;command&gt;:  Call any silc client command"
 msgstr "call &lt;隞&gt;嚗瑁 SILC 摰冽嗥垢隞"
 
-#: ../libpurple/protocols/silc/silc.c:1642
+#: ../libpurple/protocols/silc/silc.c:1644
 msgid "kill &lt;nick&gt; [-pubkey|&lt;reason&gt;]:  Kill nick"
 msgstr "kill &lt;梁迂&gt; [-pubkey|&lt;&gt;]嚗敺蝬脰楝銝蝘駁斗梁迂"
 
-#: ../libpurple/protocols/silc/silc.c:1646
+#: ../libpurple/protocols/silc/silc.c:1648
 msgid "nick &lt;newnick&gt;:  Change your nickname"
 msgstr "nick &lt;唳梁迂&gt;嚗寡函梁迂"
 
-#: ../libpurple/protocols/silc/silc.c:1650
+#: ../libpurple/protocols/silc/silc.c:1652
 msgid "whowas &lt;nick&gt;:  View nick's information"
 msgstr "whois &lt;梁迂&gt;嚗亦梁迂賊鞈閮"
 
-#: ../libpurple/protocols/silc/silc.c:1654
+#: ../libpurple/protocols/silc/silc.c:1656
 msgid ""
 "cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display "
 "channel modes"
 msgstr "cmode &lt;駁&gt; [+|-&lt;璅∪&gt;]; [窟嚗閮剖憿舐內駁璅∪"
 
-#: ../libpurple/protocols/silc/silc.c:1658
+#: ../libpurple/protocols/silc/silc.c:1660
 msgid ""
 "cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes "
 "on channel"
@@ -10109,15 +10122,15 @@
 "cumode &lt;駁&gt; +|-&lt;璅∪&gt; &lt;梁迂&gt;嚗冽摰駁靽格寞摰梁迂"
 "璅∪"
 
-#: ../libpurple/protocols/silc/silc.c:1662
+#: ../libpurple/protocols/silc/silc.c:1664
 msgid "umode &lt;usermodes&gt;:  Set your modes in the network"
 msgstr "umode &lt;雿輻刻璅∪&gt;嚗閮剖典函雯頝臭璅∪"
 
-#: ../libpurple/protocols/silc/silc.c:1666
+#: ../libpurple/protocols/silc/silc.c:1668
 msgid "oper &lt;nick&gt; [-pubkey]:  Get server operator privileges"
 msgstr "oper &lt;梁迂&gt; [-pubkey]嚗敺隡箸函恣甈"
 
-#: ../libpurple/protocols/silc/silc.c:1670
+#: ../libpurple/protocols/silc/silc.c:1672
 msgid ""
 "invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
 "channel invite list"
@@ -10125,37 +10138,37 @@
 "invite &lt;駁&gt; [-|+]&lt;梁迂&gt;嚗隢摰梁迂啣摰梁迂圈駁"
 "鋡恍銵具摰梁迂敺駁鋡恍銵其葉蝘駁"
 
-#: ../libpurple/protocols/silc/silc.c:1674
+#: ../libpurple/protocols/silc/silc.c:1676
 msgid "kick &lt;channel&gt; &lt;nick&gt; [comment]:  Kick client from channel"
 msgstr "kick &lt;駁&gt; &lt;梁迂&gt; [閮蒸嚗摰梁迂敺駁銝剛腺"
 
 #  XXX 怨陌
-#: ../libpurple/protocols/silc/silc.c:1678
+#: ../libpurple/protocols/silc/silc.c:1680
 msgid "info [server]:  View server administrative details"
 msgstr "info [隡箸沘嚗閫隡箸函蝞∠蝝啁"
 
 #  XXX 怨陌
-#: ../libpurple/protocols/silc/silc.c:1682
+#: ../libpurple/protocols/silc/silc.c:1684
 msgid "ban [&lt;channel&gt; +|-&lt;nick&gt;]:  Ban client from channel"
 msgstr "ban [&lt;駁&gt; +|-&lt;梁迂&gt;]嚗潭摰駁蝳甇X摰冽嗥垢"
 
-#: ../libpurple/protocols/silc/silc.c:1686
+#: ../libpurple/protocols/silc/silc.c:1688
 msgid "getkey &lt;nick|server&gt;:  Retrieve client's or server's public key"
-msgstr "getkey &lt;梁迂|隡箸&gt;嚗敺冽嗥垢隡箸函祇"
-
-#: ../libpurple/protocols/silc/silc.c:1690
+msgstr "getkey &lt;梁迂|隡箸&gt;嚗敺冽嗥垢隡箸函祇撖蝣澆"
+
+#: ../libpurple/protocols/silc/silc.c:1692
 msgid "stats:  View server and network statistics"
 msgstr "stats嚗閫隡箸典蝬脰楝蝯梯鞈"
 
-#: ../libpurple/protocols/silc/silc.c:1694
+#: ../libpurple/protocols/silc/silc.c:1696
 msgid "ping:  Send PING to the connected server"
 msgstr "ping嚗蝯隡箸券 PING"
 
-#: ../libpurple/protocols/silc/silc.c:1699
+#: ../libpurple/protocols/silc/silc.c:1701
 msgid "users &lt;channel&gt;:  List users in channel"
 msgstr "users &lt;駁&gt;嚗粹駁銝剔雿輻刻"
 
-#: ../libpurple/protocols/silc/silc.c:1703
+#: ../libpurple/protocols/silc/silc.c:1705
 msgid ""
 "names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List "
 "specific users in channel(s)"
@@ -10172,71 +10185,71 @@
 #. *< name
 #. *< version
 #. *  summary
-#: ../libpurple/protocols/silc/silc.c:1814
+#: ../libpurple/protocols/silc/silc.c:1828
 msgid "SILC Protocol Plugin"
 msgstr "SILC 摰璅∠"
 
 #. *  description
-#: ../libpurple/protocols/silc/silc.c:1816
+#: ../libpurple/protocols/silc/silc.c:1830
 msgid "Secure Internet Live Conferencing (SILC) Protocol"
 msgstr "摰冽抒雯蝬脰楝單霅 (SILC) 摰"
 
-#: ../libpurple/protocols/silc/silc.c:1842 ../pidgin/gtkprefs.c:1918
+#: ../libpurple/protocols/silc/silc.c:1862 ../pidgin/gtkprefs.c:1920
 msgid "Network"
 msgstr "蝬脰楝"
 
-#: ../libpurple/protocols/silc/silc.c:1853
+#: ../libpurple/protocols/silc/silc.c:1873
 msgid "Public Key file"
-msgstr "祇唳獢"
-
-#: ../libpurple/protocols/silc/silc.c:1857
+msgstr "祇撖蝣澆瑼獢"
+
+#: ../libpurple/protocols/silc/silc.c:1877
 msgid "Private Key file"
-msgstr "蝘唳獢"
+msgstr "蝘鈭箏蝣澆瑼獢"
 
 # XXX 怨陌 - 20061025
-#: ../libpurple/protocols/silc/silc.c:1867
+#: ../libpurple/protocols/silc/silc.c:1887
 msgid "Cipher"
 msgstr "撖寞"
 
-#: ../libpurple/protocols/silc/silc.c:1877
+#: ../libpurple/protocols/silc/silc.c:1897
 msgid "HMAC"
 msgstr "HMAC"
 
 #  XXX
-#: ../libpurple/protocols/silc/silc.c:1880
+#: ../libpurple/protocols/silc/silc.c:1900
 msgid "Public key authentication"
-msgstr "雿輻典祇啗霅"
+msgstr "雿輻典祇撖蝣澆隤霅"
 
 #  TODO 霅舀敺寥莎舀霅
-#: ../libpurple/protocols/silc/silc.c:1883
+#: ../libpurple/protocols/silc/silc.c:1903
 msgid "Reject watching by other users"
 msgstr "蝯隡箸函垢憟賢"
 
-#: ../libpurple/protocols/silc/silc.c:1886
+#: ../libpurple/protocols/silc/silc.c:1906
 msgid "Block invites"
 msgstr "蝯隢"
 
 #  XXX 憟賢賭敺
-#: ../libpurple/protocols/silc/silc.c:1889
+#: ../libpurple/protocols/silc/silc.c:1909
 msgid "Block IMs without Key Exchange"
-msgstr "蝯瘝鈭斗撖啁單閮"
-
-#: ../libpurple/protocols/silc/silc.c:1892
+msgstr "蝯瘝鈭斗撖蝣澆單閮"
+
+#: ../libpurple/protocols/silc/silc.c:1912
 msgid "Reject online status attribute requests"
 msgstr "蝯銝蝺撅祆扯瘙"
 
-#: ../libpurple/protocols/silc/silc.c:1895
+#: ../libpurple/protocols/silc/silc.c:1915
 msgid "Block messages to whiteboard"
 msgstr "蝳甇W喲閮航喟賣"
 
 # XXX 怨陌
-#: ../libpurple/protocols/silc/silc.c:1898
+#: ../libpurple/protocols/silc/silc.c:1918
 msgid "Automatically open whiteboard"
 msgstr "芸賣"
 
-#: ../libpurple/protocols/silc/silc.c:1901
+#: ../libpurple/protocols/silc/silc.c:1921
 msgid "Digitally sign and verify all messages"
-msgstr "訾蝪賜蔡單閮"
+msgstr "貊Ⅳ蝪賜蔡單閮"
 
 #: ../libpurple/protocols/silc/util.c:207
 #: ../libpurple/protocols/silc/util.c:247
@@ -10284,7 +10297,7 @@
 #: ../libpurple/protocols/silc/util.c:367
 #, c-format
 msgid "Key Length: \t%d bits\n"
-msgstr "撖圈瑕漲嚗\t%d 雿\n"
+msgstr "撖蝣澆瑕漲嚗\t%d 雿\n"
 
 #: ../libpurple/protocols/silc/util.c:369
 #, c-format
@@ -10293,7 +10306,7 @@
 "%s\n"
 "\n"
 msgstr ""
-"祇唳蝝嚗\n"
+"祇撖蝣澆蝝嚗\n"
 "%s\n"
 "\n"
 
@@ -10303,13 +10316,13 @@
 "Public Key Babbleprint:\n"
 "%s"
 msgstr ""
-"祇唳蝝航 (Babbleprint)嚗\n"
+"祇撖蝣澆蝝航 (Babbleprint)嚗\n"
 "%s"
 
 #: ../libpurple/protocols/silc/util.c:374
 #: ../libpurple/protocols/silc/util.c:375
 msgid "Public Key Information"
-msgstr "祇啗閮"
+msgstr "祇撖蝣澆鞈閮"
 
 #: ../libpurple/protocols/silc/util.c:555
 msgid "Paging"
@@ -10353,26 +10366,26 @@
 msgstr "⊥撖怠"
 
 #: ../libpurple/protocols/simple/simple.c:438
-#: ../libpurple/protocols/simple/simple.c:1482
+#: ../libpurple/protocols/simple/simple.c:1484
 msgid "Could not connect"
 msgstr "⊥蝯"
 
-#: ../libpurple/protocols/simple/simple.c:1516
-#: ../libpurple/protocols/simple/simple.c:1558
-#: ../libpurple/protocols/simple/simple.c:1571
-#: ../libpurple/protocols/simple/simple.c:1622
+#: ../libpurple/protocols/simple/simple.c:1518
+#: ../libpurple/protocols/simple/simple.c:1560
+#: ../libpurple/protocols/simple/simple.c:1573
+#: ../libpurple/protocols/simple/simple.c:1624
 msgid "Could not create listen socket"
 msgstr "⊥撱箇 Socket "
 
-#: ../libpurple/protocols/simple/simple.c:1539
+#: ../libpurple/protocols/simple/simple.c:1541
 msgid "Couldn't resolve host"
 msgstr "⊥閫銝餅"
 
-#: ../libpurple/protocols/simple/simple.c:1630
+#: ../libpurple/protocols/simple/simple.c:1632
 msgid "Could not resolve hostname"
 msgstr "⊥閫銝餅"
 
-#: ../libpurple/protocols/simple/simple.c:1647
+#: ../libpurple/protocols/simple/simple.c:1649
 msgid "SIP screen names may not contain whitespaces or @ symbols"
 msgstr "SIP 撣唾銝臬急蝛箇賢@蝚西"
 
@@ -10384,36 +10397,36 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../libpurple/protocols/simple/simple.c:1816
+#: ../libpurple/protocols/simple/simple.c:1824
 msgid "SIP/SIMPLE Protocol Plugin"
 msgstr "SIP/SIMPLE 閮摰璅∠"
 
 #. *  summary
-#: ../libpurple/protocols/simple/simple.c:1817
+#: ../libpurple/protocols/simple/simple.c:1825
 msgid "The SIP/SIMPLE Protocol Plugin"
 msgstr "SIP/SIMPLE 閮摰璅∠"
 
-#: ../libpurple/protocols/simple/simple.c:1839
+#: ../libpurple/protocols/simple/simple.c:1853
 msgid "Publish status (note: everyone may watch you)"
 msgstr "餌嚗隢瘜冽嚗隞颱鈭粹質賜唳剁"
 
-#: ../libpurple/protocols/simple/simple.c:1845
+#: ../libpurple/protocols/simple/simple.c:1859
 msgid "Use UDP"
 msgstr "雿輻 UDP"
 
-#: ../libpurple/protocols/simple/simple.c:1847
+#: ../libpurple/protocols/simple/simple.c:1861
 msgid "Use proxy"
 msgstr "雿輻 Proxy"
 
-#: ../libpurple/protocols/simple/simple.c:1849
+#: ../libpurple/protocols/simple/simple.c:1863
 msgid "Proxy"
 msgstr "隞隡箸"
 
-#: ../libpurple/protocols/simple/simple.c:1851
+#: ../libpurple/protocols/simple/simple.c:1865
 msgid "Auth User"
 msgstr "隤霅雿輻刻"
 
-#: ../libpurple/protocols/simple/simple.c:1853
+#: ../libpurple/protocols/simple/simple.c:1867
 msgid "Auth Domain"
 msgstr "隤霅"
 
@@ -10544,8 +10557,8 @@
 "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."
 msgstr ""
-"函蝺嚗瑞雿憭芷餌隢蝑敺敺銵閰艾憒其嗥匱蝥閰西"
-"蝺嚗暻潭函蝑敺撠游撱園瑯"
+"函蝺嚗瑞雿憭芷餌隢蝑敺敺銵閰艾憒其嗥匱蝥閰阡蝺嚗"
+"暻潭函蝑敺撠游撱園瑯"
 
 #: ../libpurple/protocols/toc/toc.c:560
 #, c-format
@@ -10638,12 +10651,12 @@
 msgstr "TOC 摰璅∠"
 
 # NOTE 霅舀游 by Ambrose
-#: ../libpurple/protocols/yahoo/yahoo.c:805
+#: ../libpurple/protocols/yahoo/yahoo.c:808
 msgid "Your Yahoo! message did not get sent."
 msgstr "⊥箸函 Yahoo! 閮胯"
 
 #  XXX 航賢臭誑霅臬銝暺
-#: ../libpurple/protocols/yahoo/yahoo.c:875
+#: ../libpurple/protocols/yahoo/yahoo.c:878
 #, c-format
 msgid "%s just sent you a Buzz!"
 msgstr "%s 典澆急剁"
@@ -10654,16 +10667,16 @@
 msgid "Yahoo! system message for %s:"
 msgstr "%s  Yahoo! 蝟餌絞閮荔"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:985
+#: ../libpurple/protocols/yahoo/yahoo.c:984
 msgid "Authorization denied message:"
 msgstr "蝯隤霅閮荔"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1064
+#: ../libpurple/protocols/yahoo/yahoo.c:1065
 #, c-format
 msgid "%s has (retroactively) denied your request to add them to your list."
 msgstr "雿輻刻 %s 蝯鈭典撠隞嚗憟對啣單函憟賢皜桃閬瘙"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1067
+#: ../libpurple/protocols/yahoo/yahoo.c:1068
 #, c-format
 msgid ""
 "%s has (retroactively) denied your request to add them to your list for the "
@@ -10672,11 +10685,11 @@
 "雿輻刻 %s 箔嚗蝯鈭典撠隞嚗憟對啣單函憟賢皜桃閬瘙嚗%"
 "s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1070
+#: ../libpurple/protocols/yahoo/yahoo.c:1071
 msgid "Add buddy rejected"
 msgstr "啣憟賢鋡急"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1821
+#: ../libpurple/protocols/yahoo/yahoo.c:1822
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -10686,11 +10699,11 @@
 "Yahoo 隡箸刻瘙鈭雿輻其蝔桐隤霅孵嚗甇文航賭餃 Yahoo隢 "
 "%s 瑼X交瘝湔啁研"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1824
+#: ../libpurple/protocols/yahoo/yahoo.c:1825
 msgid "Failed Yahoo! Authentication"
 msgstr "Yahoo! 隤霅憭望"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1890
+#: ../libpurple/protocols/yahoo/yahoo.c:1891
 #, c-format
 msgid ""
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
@@ -10699,70 +10712,70 @@
 "典閰血蕭亙冽函憟賢桀抒 %s憒冽蝞隞嚗憟對敺函憟賢皜桐葉蝘駁歹銝"
 "典喳蕭乩嚗憟對嚗隢銝銝胯"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1893
+#: ../libpurple/protocols/yahoo/yahoo.c:1894
 msgid "Ignore buddy?"
 msgstr "敹賜乩蝙刻嚗"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1950
+#: ../libpurple/protocols/yahoo/yahoo.c:1953
 msgid "Your account is locked, please log in to the Yahoo! website."
 msgstr "雿撣單嗥桀鋡急急隢函餃 Yahoo! 蝬脩"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1953
+#: ../libpurple/protocols/yahoo/yahoo.c:1956
 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr "芰亦航炊隞蝣 %d撌脩餃亙 Yahoo!嚗摰寧雯蝡銝航賢歇蝬靽格迤航炊"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2007
+#: ../libpurple/protocols/yahoo/yahoo.c:2010
 #, c-format
 msgid "Could not add buddy %s to group %s to the server list on account %s."
 msgstr "⊥撠憟賢%1$s啣喳董%3$s其撩其皜桀抒蝢斤%2$s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2010
+#: ../libpurple/protocols/yahoo/yahoo.c:2013
 msgid "Could not add buddy to server list"
 msgstr "⊥撠憟賢啣喃撩其皜桀"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2129
+#: ../libpurple/protocols/yahoo/yahoo.c:2132
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ 單瑼 %s/%s/%s.swf ] %s"
 
 # XXX 怨陌 - 20061025
-#: ../libpurple/protocols/yahoo/yahoo.c:2461
+#: ../libpurple/protocols/yahoo/yahoo.c:2464
 msgid "Received unexpected HTTP response from server."
 msgstr "隡箸函澆箔憟芰 HTTP "
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2485
-#: ../libpurple/protocols/yahoo/yahoo.c:2664
-#: ../libpurple/protocols/yahoo/yahoo.c:2768
-#: ../libpurple/protocols/yahoo/yahoo.c:2778
+#: ../libpurple/protocols/yahoo/yahoo.c:2488
+#: ../libpurple/protocols/yahoo/yahoo.c:2667
+#: ../libpurple/protocols/yahoo/yahoo.c:2770
+#: ../libpurple/protocols/yahoo/yahoo.c:2780
 #: ../libpurple/protocols/yahoo/yahoochat.c:1455
 #: ../libpurple/protocols/yahoo/yahoochat.c:1525
 #: ../libpurple/protocols/yahoo/ycht.c:585
 msgid "Connection problem"
 msgstr "蝺航炊"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2880
-#: ../libpurple/protocols/yahoo/yahoo.c:3486
+#: ../libpurple/protocols/yahoo/yahoo.c:2882
+#: ../libpurple/protocols/yahoo/yahoo.c:3493
 msgid "Not at Home"
 msgstr "銝典振"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2882
-#: ../libpurple/protocols/yahoo/yahoo.c:3489
-msgid "Not at Desk"
-msgstr "銝典漣雿"
-
 #: ../libpurple/protocols/yahoo/yahoo.c:2884
-#: ../libpurple/protocols/yahoo/yahoo.c:3492
+#: ../libpurple/protocols/yahoo/yahoo.c:3496
+msgid "Not at Desk"
+msgstr "銝典漣雿"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:2886
+#: ../libpurple/protocols/yahoo/yahoo.c:3499
 msgid "Not in Office"
 msgstr "銝刻齒砍恕"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2888
-#: ../libpurple/protocols/yahoo/yahoo.c:3498
+#: ../libpurple/protocols/yahoo/yahoo.c:2890
+#: ../libpurple/protocols/yahoo/yahoo.c:3505
 msgid "On Vacation"
 msgstr "皜∪颱"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2892
-#: ../libpurple/protocols/yahoo/yahoo.c:3504
+#: ../libpurple/protocols/yahoo/yahoo.c:2894
+#: ../libpurple/protocols/yahoo/yahoo.c:3511
 msgid "Stepped Out"
 msgstr "韏啣箏颱"
 
@@ -10770,91 +10783,92 @@
 # NOTE 銋銵函內雿銝閬憟賢餃亦蝑(yeah, it mean the buddy
 # NOTE isn't on the server's buddy list/ which also means you won't
 # NOTE be able to see when they log on, etc)
-#: ../libpurple/protocols/yahoo/yahoo.c:2985
-#: ../libpurple/protocols/yahoo/yahoo.c:3015
+#: ../libpurple/protocols/yahoo/yahoo.c:2987
+#: ../libpurple/protocols/yahoo/yahoo.c:3017
 msgid "Not on server list"
 msgstr "銝其撩其皜桐葉"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3032
-#: ../libpurple/protocols/yahoo/yahoo.c:3090
+#: ../libpurple/protocols/yahoo/yahoo.c:3034
+#: ../libpurple/protocols/yahoo/yahoo.c:3092
 msgid "Appear Online"
 msgstr "梁迂銝蝺"
 
 # NOTE Yahoo 摰寡陌瘞賊憿舐內Y嚗隤芰賭暺嗅祕單荔撠鈭綽瑟頨怒
-#: ../libpurple/protocols/yahoo/yahoo.c:3035
-#: ../libpurple/protocols/yahoo/yahoo.c:3111
+#: ../libpurple/protocols/yahoo/yahoo.c:3037
+#: ../libpurple/protocols/yahoo/yahoo.c:3113
 msgid "Appear Permanently Offline"
 msgstr "瑟梁迂Y"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3053
+#: ../libpurple/protocols/yahoo/yahoo.c:3055
 msgid "Presence"
 msgstr "銝蝺"
 
 # NOTE 銝甈∠餃交銝梁迂Y嚗隞亙急摮
-#: ../libpurple/protocols/yahoo/yahoo.c:3096
+#: ../libpurple/protocols/yahoo/yahoo.c:3098
 msgid "Appear Offline"
 msgstr "急梁迂Y"
 
 #  NOTE 舀桀抒銝隞
-#: ../libpurple/protocols/yahoo/yahoo.c:3105
+#: ../libpurple/protocols/yahoo/yahoo.c:3107
 msgid "Don't Appear Permanently Offline"
 msgstr "甇a瑟梁迂Y"
 
 # NOTE #gaim  Vann  LSchiere 閫嚗憒詨鈭憟賢桀潔憭抬靘踹亥府憭
 # NOTE Yahoo Chat甇撘霅舀箝航盲啜
-#: ../libpurple/protocols/yahoo/yahoo.c:3153
+#: ../libpurple/protocols/yahoo/yahoo.c:3155
 msgid "Join in Chat"
 msgstr "亙末桀函憭拙恕"
 
 # NOTE霅啣恕舀急霅胯Yahoo! 憟賢瘝箝Conference靘甇撘銝剛陌
-#: ../libpurple/protocols/yahoo/yahoo.c:3159
+#: ../libpurple/protocols/yahoo/yahoo.c:3161
 msgid "Initiate Conference"
 msgstr "霅啣恕"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3187
+#: ../libpurple/protocols/yahoo/yahoo.c:3189
 msgid "Presence Settings"
 msgstr "銝蝺閮剖"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3193
+#: ../libpurple/protocols/yahoo/yahoo.c:3195
 msgid "Start Doodling"
 msgstr "憪 Doodle"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3225
+#. XXX Typo: This should be _("Activate which ID?") - fix after string freeze is over
+#: ../libpurple/protocols/yahoo/yahoo.c:3228
 msgid "Active which ID?"
 msgstr "芯 ID嚗"
 
 # NOTE #gaim  Vann  LSchiere 閫嚗憒詨鈭憟賢桀潔憭抬靘踹亥府憭
 # NOTE Yahoo Chat甇撘霅舀箝航盲啜
-#: ../libpurple/protocols/yahoo/yahoo.c:3234
+#: ../libpurple/protocols/yahoo/yahoo.c:3239
 msgid "Join who in chat?"
 msgstr "亙芸憟賢桀函憭拙恕嚗"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3244
+#: ../libpurple/protocols/yahoo/yahoo.c:3251
 msgid "Activate ID..."
 msgstr " ID..."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3248
+#: ../libpurple/protocols/yahoo/yahoo.c:3255
 msgid "Join User in Chat..."
 msgstr "亙末桀函憭拙恕..."
 
 #  XXX 航賢臭誑霅臬銝暺
-#: ../libpurple/protocols/yahoo/yahoo.c:3755
+#: ../libpurple/protocols/yahoo/yahoo.c:3762
 msgid "You have just sent a Buzz!"
 msgstr "典箔銝澆恬"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3814
+#: ../libpurple/protocols/yahoo/yahoo.c:3821
 msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
 msgstr "join: &lt憭拙恕&gt;嚗乩 Yahoo! 蝬脰楝銝憭拙恕"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3819
+#: ../libpurple/protocols/yahoo/yahoo.c:3826
 msgid "list: List rooms on the Yahoo network"
 msgstr "list嚗旖ahoo蝬脰楝銝憭拙恕皜"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3823
+#: ../libpurple/protocols/yahoo/yahoo.c:3830
 msgid "buzz: Buzz a user to get their attention"
 msgstr "buzz: 蝯血末銝嗚撘隞嚗憟對瘜冽"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3827
+#: ../libpurple/protocols/yahoo/yahoo.c:3834
 msgid "doodle: Request user to start a Doodle session"
 msgstr "doodle: 閬瘙雿輻刻憪 Doodle Session"
 
@@ -10868,57 +10882,57 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/yahoo/yahoo.c:4023
-#: ../libpurple/protocols/yahoo/yahoo.c:4025
+#: ../libpurple/protocols/yahoo/yahoo.c:4042
+#: ../libpurple/protocols/yahoo/yahoo.c:4044
 msgid "Yahoo Protocol Plugin"
 msgstr "Yahoo 摰璅∠"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4042
+#: ../libpurple/protocols/yahoo/yahoo.c:4067
 msgid "Yahoo Japan"
 msgstr "Yahoo Japan"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4045
+#: ../libpurple/protocols/yahoo/yahoo.c:4070
 msgid "Pager server"
 msgstr "喳潔撩"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4048
+#: ../libpurple/protocols/yahoo/yahoo.c:4073
 msgid "Japan Pager server"
 msgstr "喳潔撩剁交砍啣嚗"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4051
+#: ../libpurple/protocols/yahoo/yahoo.c:4076
 msgid "Pager port"
 msgstr "喳潛頂蝯梢閮"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4054
+#: ../libpurple/protocols/yahoo/yahoo.c:4079
 msgid "File transfer server"
 msgstr "瑼獢唾撓隡箸"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4057
+#: ../libpurple/protocols/yahoo/yahoo.c:4082
 msgid "Japan file transfer server"
 msgstr "瑼獢唾撓隡箸剁交砍啣嚗"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4060
+#: ../libpurple/protocols/yahoo/yahoo.c:4085
 msgid "File transfer port"
 msgstr "瑼獢唾撓閮"
 
 #  XXX ∪銝霅舀嚗霅胯啣喋湔(?!)
-#: ../libpurple/protocols/yahoo/yahoo.c:4063
+#: ../libpurple/protocols/yahoo/yahoo.c:4088
 msgid "Chat room locale"
 msgstr "憭拙恕 (Locale)"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4066
+#: ../libpurple/protocols/yahoo/yahoo.c:4091
 msgid "Ignore conference and chatroom invitations"
 msgstr "敹賜交霅啣恕憭拙恕隢"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4074
+#: ../libpurple/protocols/yahoo/yahoo.c:4099
 msgid "Chat room list URL"
 msgstr "憭拙恕皜格函雯"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4077
+#: ../libpurple/protocols/yahoo/yahoo.c:4102
 msgid "Yahoo Chat server"
 msgstr "Yahoo 憭拐撩"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4080
+#: ../libpurple/protocols/yahoo/yahoo.c:4105
 msgid "Yahoo Chat port"
 msgstr "Yahoo 憭拙恕閮"
 
@@ -11128,23 +11142,23 @@
 msgstr "⊥喲唾憭拙恕 %s,%s,%s"
 
 #: ../libpurple/protocols/zephyr/zephyr.c:786
-#: ../libpurple/protocols/zephyr/zephyr.c:1203
+#: ../libpurple/protocols/zephyr/zephyr.c:1204
 msgid "User"
 msgstr "雿輻刻"
 
 #: ../libpurple/protocols/zephyr/zephyr.c:791
-#: ../libpurple/protocols/zephyr/zephyr.c:1209
+#: ../libpurple/protocols/zephyr/zephyr.c:1210
 msgid "Hidden or not logged-in"
 msgstr "梯芰餃"
 
 #: ../libpurple/protocols/zephyr/zephyr.c:797
-#: ../libpurple/protocols/zephyr/zephyr.c:1211
+#: ../libpurple/protocols/zephyr/zephyr.c:1212
 #, c-format
 msgid "<br>At %s since %s"
 msgstr "<br>敺 %2$s 韏瑕歇 %1$s"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:1545
 #: ../libpurple/protocols/zephyr/zephyr.c:1546
+#: ../libpurple/protocols/zephyr/zephyr.c:1547
 msgid "Anyone"
 msgstr "隞颱鈭"
 
@@ -11155,65 +11169,65 @@
 # NOTE  http://consult.stanford.edu/pub/communications/zephyr-guide
 # NOTE (15:05:28) aatharuv: wing: A class is basically a high level chat. Any message sent to a class will also have "instance", and "recipient" parameters, which control who gets it. If someone "subscribes" to only a particular instance of the class, they'll only get messages sent to the specific class and instance, whereas someone who subs to all the instances of the class, instance "*", will get any message to the class.
 # NOTE (15:11:31) aatharuv: The "recipient" field also controls who gets a message. if the recipient is "", then anyone subbed to said class and instance will get the message, otherwise it will only be received by the person with that "username". This allows IM's in zephyr to be a special case of chats
-#: ../libpurple/protocols/zephyr/zephyr.c:2353
+#: ../libpurple/protocols/zephyr/zephyr.c:2354
 msgid "_Class:"
 msgstr "憿伐憭拙恕(_C)嚗"
 
 # XXX 怨陌
 # NOTE  http://www.mit.edu/afs/sipb/project/doc/izephyr/html/node19.html 園蝯
 # NOTE  http://consult.stanford.edu/pub/communications/zephyr-guide
-#: ../libpurple/protocols/zephyr/zephyr.c:2359
+#: ../libpurple/protocols/zephyr/zephyr.c:2360
 msgid "_Instance:"
 msgstr "撖阡嚗駁(_I)嚗"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2365
+#: ../libpurple/protocols/zephyr/zephyr.c:2366
 msgid "_Recipient:"
 msgstr "亙(_R)嚗"
 
 #  FIXME 怨陌
-#: ../libpurple/protocols/zephyr/zephyr.c:2376
+#: ../libpurple/protocols/zephyr/zephyr.c:2377
 #, c-format
 msgid "Attempt to subscribe to %s,%s,%s failed"
 msgstr "鈭箄憭拙恕嚗鈭方嚗 %s,%s,%s 憭望"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2689
+#: ../libpurple/protocols/zephyr/zephyr.c:2690
 msgid "zlocate &lt;nick&gt;: Locate user"
 msgstr "zlocate &lt;梁迂&gt;嚗撠曆蝙刻"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2694
+#: ../libpurple/protocols/zephyr/zephyr.c:2695
 msgid "zl &lt;nick&gt;: Locate user"
 msgstr "zl &lt;梁迂&gt;嚗撠曆蝙刻"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2699
+#: ../libpurple/protocols/zephyr/zephyr.c:2700
 msgid "instance &lt;instance&gt;: Set the instance to be used on this class"
 msgstr "instance &lt;撖阡&gt;嚗閮剖憿乓嚗憭拙恕嚗撖阡嚗駁嚗"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2704
+#: ../libpurple/protocols/zephyr/zephyr.c:2705
 msgid "inst &lt;instance&gt;: Set the instance to be used on this class"
 msgstr "inst &lt;撖阡&gt;嚗閮剖憿乓嚗憭拙恕嚗撖阡嚗駁嚗"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2709
+#: ../libpurple/protocols/zephyr/zephyr.c:2710
 msgid "topic &lt;instance&gt;: Set the instance to be used on this class"
 msgstr "topic &lt;撖阡&gt;嚗閮剖憿乓嚗憭拙恕嚗撖阡嚗駁嚗"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2715
+#: ../libpurple/protocols/zephyr/zephyr.c:2716
 msgid "sub &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Join a new chat"
 msgstr "sub &lt;憿&gt; &lt;撖阡&gt; &lt;亙&gt;嚗亥憭拙恕"
 
 #  NOTE (14:46:12) aatharuv: wing: So all zephyrs get sent to a triplet <class,instance,recipient>   . "message" is the default class that zephyrs go to, and "personal" is the default instance.
-#: ../libpurple/protocols/zephyr/zephyr.c:2720
+#: ../libpurple/protocols/zephyr/zephyr.c:2721
 msgid ""
 "zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
 msgstr "zi &lt;撖阡&gt;嚗箄航&lt;閮,<i>撖阡</i>,*&gt;"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2726
+#: ../libpurple/protocols/zephyr/zephyr.c:2727
 msgid ""
 "zci &lt;class&gt; &lt;instance&gt;: Send a message to &lt;<i>class</i>,"
 "<i>instance</i>,*&gt;"
 msgstr ""
 "zi &lt;憿&gt; &lt;撖阡&gt嚗箄航&lt;<i>憿</i>,<i>撖阡</i>,*&gt;"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2732
+#: ../libpurple/protocols/zephyr/zephyr.c:2733
 msgid ""
 "zcir &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;"
 "<i>class</i>,<i>instance</i>,<i>recipient</i>&gt;"
@@ -11221,7 +11235,7 @@
 "zcir &lt;憿&gt; &lt;撖阡&gt; &lt;亙&gt;嚗箄航 &lt;<i>憿</i>,<i>"
 "撖阡</i>,<i>亙</i>&gt;"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2738
+#: ../libpurple/protocols/zephyr/zephyr.c:2739
 msgid ""
 "zir &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;MESSAGE,"
 "<i>instance</i>,<i>recipient</i>&gt;"
@@ -11229,18 +11243,18 @@
 "zir &lt;撖阡&gt; &lt;亙&gt;嚗箄航 &lt;MESSAGE,<i>撖阡</i>,<i>亙"
 "</i>&gt;"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2743
+#: ../libpurple/protocols/zephyr/zephyr.c:2744
 msgid "zc &lt;class&gt;: Send a message to &lt;<i>class</i>,PERSONAL,*&gt;"
 msgstr "zc &lt;憿&gt;嚗箄航 &lt;<i>憿</i>,PERSONAL,*&gt;"
 
 #  NOTE (14:46:42) aatharuv: wing: resubscribe is basically "rejoin chat"
 #  NOTE (14:47:50) aatharuv: wing: err, "rejoin all chats"
-#: ../libpurple/protocols/zephyr/zephyr.c:2849
+#: ../libpurple/protocols/zephyr/zephyr.c:2850
 msgid "Resubscribe"
 msgstr "啣交憭拙恕"
 
 #  FIXME 閬閬亥陌
-#: ../libpurple/protocols/zephyr/zephyr.c:2852
+#: ../libpurple/protocols/zephyr/zephyr.c:2853
 msgid "Retrieve subscriptions from server"
 msgstr "曹撩典敺桀刻憭拙恕皜"
 
@@ -11254,16 +11268,16 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/zephyr/zephyr.c:2939
-#: ../libpurple/protocols/zephyr/zephyr.c:2941
+#: ../libpurple/protocols/zephyr/zephyr.c:2946
+#: ../libpurple/protocols/zephyr/zephyr.c:2948
 msgid "Zephyr Protocol Plugin"
 msgstr "Zephyr 摰璅∠"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2960
+#: ../libpurple/protocols/zephyr/zephyr.c:2973
 msgid "Use tzc"
 msgstr "雿輻 TZC"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2963
+#: ../libpurple/protocols/zephyr/zephyr.c:2976
 msgid "tzc command"
 msgstr "TZC 隞"
 
@@ -11273,11 +11287,11 @@
 # NOTE: gaim to write to .anyone upon logout. Some people use multiple
 # NOTE: clients and prefer to have separate buddylists for separate clients.
 # NOTE: Similarly, .zephyr.subs controls the chats that a person subs.
-#: ../libpurple/protocols/zephyr/zephyr.c:2966
+#: ../libpurple/protocols/zephyr/zephyr.c:2979
 msgid "Export to .anyone"
 msgstr "臬箄 .anyone 瑼"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2969
+#: ../libpurple/protocols/zephyr/zephyr.c:2982
 msgid "Export to .zephyr.subs"
 msgstr "臬箄 .zephyr.subs 瑼"
 
@@ -11287,22 +11301,22 @@
 # NOTE: gaim to write to .anyone upon logout. Some people use multiple
 # NOTE: clients and prefer to have separate buddylists for separate clients.
 # NOTE: Similarly, .zephyr.subs controls the chats that a person subs.
-#: ../libpurple/protocols/zephyr/zephyr.c:2972
+#: ../libpurple/protocols/zephyr/zephyr.c:2985
 msgid "Import from .anyone"
 msgstr " .anyone 瑼獢銝剖臬"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2975
+#: ../libpurple/protocols/zephyr/zephyr.c:2988
 msgid "Import from .zephyr.subs"
 msgstr " .zephyr.subs 瑼銝剖臬"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2978
+#: ../libpurple/protocols/zephyr/zephyr.c:2991
 msgid "Realm"
 msgstr ""
 
 # FIXME 怨陌嚗霅臬敺撌殷敺寥
 # NOTE: Zephyr Exposure梯澈喟曇澈銋蝔桃
 # NOTE: aatharuv: exposure in zephyr controls your visibility.
-#: ../libpurple/protocols/zephyr/zephyr.c:2981
+#: ../libpurple/protocols/zephyr/zephyr.c:2994
 msgid "Exposure"
 msgstr "曇澈蝔摨"
 
@@ -11344,18 +11358,18 @@
 #. *
 #. * A wrapper for purple_request_action() that uses @c Yes and @c No buttons.
 #.
-#: ../libpurple/request.h:1341
+#: ../libpurple/request.h:1377
 msgid "_Yes"
 msgstr "(_Y)"
 
-#: ../libpurple/request.h:1341
+#: ../libpurple/request.h:1377
 msgid "_No"
 msgstr "(_N)"
 
 #. *
 #. * A wrapper for purple_request_action() that uses Accept and Cancel buttons.
 #.
-#: ../libpurple/request.h:1360
+#: ../libpurple/request.h:1397
 msgid "_Accept"
 msgstr "亙(_A)"
 
@@ -11367,16 +11381,16 @@
 msgstr "曉其其摮銝"
 
 # FIXME 敺憿舀航炊霅荔雿喃唳璅撖急撠 - 20061025
-#: ../libpurple/savedstatuses.c:526
+#: ../libpurple/savedstatuses.c:532
 msgid "saved statuses"
 msgstr "脣"
 
-#: ../libpurple/server.c:228
+#: ../libpurple/server.c:233
 #, c-format
 msgid "%s is now known as %s.\n"
 msgstr "%s 寡梁迂 %s\n"
 
-#: ../libpurple/server.c:670
+#: ../libpurple/server.c:679
 #, c-format
 msgid ""
 "%s has invited %s to the chat room %s:\n"
@@ -11385,58 +11399,58 @@
 "%s 隢 %s 啗憭拙恕%s嚗\n"
 "%s"
 
-#: ../libpurple/server.c:675
+#: ../libpurple/server.c:684
 #, c-format
 msgid "%s has invited %s to the chat room %s\n"
 msgstr "%s 隢鈭 %s 啗憭拙恕%s嚗\n"
 
-#: ../libpurple/server.c:679
+#: ../libpurple/server.c:688
 msgid "Accept chat invitation?"
 msgstr "亙隢嚗"
 
-#: ../libpurple/status.c:153
+#: ../libpurple/status.c:152
 msgid "Unset"
 msgstr "瘨閮剖"
 
-#: ../libpurple/status.c:156
+#: ../libpurple/status.c:155
 msgid "Unavailable"
 msgstr "Y"
 
-#: ../libpurple/status.c:160
+#: ../libpurple/status.c:159
 msgid "Mobile"
-msgstr "雿輻刻鋆蝵"
-
-#: ../libpurple/status.c:611
+msgstr "雿輻冽閮冽"
+
+#: ../libpurple/status.c:608
 #, c-format
 msgid "%s changed status from %s to %s"
 msgstr "%s 敺%s寡箝%s"
 
-#: ../libpurple/status.c:621
+#: ../libpurple/status.c:618
 #, c-format
 msgid "%s is now %s"
 msgstr "%s 桀%s"
 
-#: ../libpurple/status.c:626
+#: ../libpurple/status.c:623
 #, c-format
 msgid "%s is no longer %s"
 msgstr "%s 銝%s"
 
-#: ../libpurple/status.c:1293
+#: ../libpurple/status.c:1233
 #, c-format
 msgid "%s became idle"
 msgstr "%s 霈渡粹蝵"
 
-#: ../libpurple/status.c:1310
+#: ../libpurple/status.c:1250
 #, c-format
 msgid "%s became unidle"
 msgstr "%s 銝蝵"
 
-#: ../libpurple/status.c:1376
+#: ../libpurple/status.c:1312
 #, c-format
 msgid "+++ %s became idle"
 msgstr "+++ %s 霈渡粹蝵"
 
-#: ../libpurple/status.c:1378
+#: ../libpurple/status.c:1314
 #, c-format
 msgid "+++ %s became unidle"
 msgstr "+++ %s 銝蝵"
@@ -11446,13 +11460,13 @@
 msgid "%x %X"
 msgstr "%x %X"
 
-#: ../libpurple/util.c:2442
+#: ../libpurple/util.c:2553
 #, c-format
 msgid "Error Reading %s"
 msgstr "霈 %s 銝剔潛鈭航炊"
 
 # NOTE They臭暻澆g霅舀摰閰梧摰臭暻澆g撖恍瑚暺憟賭
-#: ../libpurple/util.c:2443
+#: ../libpurple/util.c:2554
 #, c-format
 msgid ""
 "An error was encountered reading your %s.  They have not been loaded, and "
@@ -11460,79 +11474,79 @@
 msgstr ""
 "刻圾函%s潛航炊瑼獢抒鞈銝行鋡怨伐瑼獢撌脩宏 %s~"
 
-#: ../libpurple/util.c:2906
+#: ../libpurple/util.c:3024
 msgid "Calculating..."
 msgstr "閮蝞銝..."
 
-#: ../libpurple/util.c:2909
+#: ../libpurple/util.c:3027
 msgid "Unknown."
 msgstr "芰乓"
 
-#: ../libpurple/util.c:2935
+#: ../libpurple/util.c:3053
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d 蝘"
 msgstr[1] "%d 蝘"
 
-#: ../libpurple/util.c:2947
+#: ../libpurple/util.c:3065
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d "
 msgstr[1] "%d "
 
-#: ../libpurple/util.c:2955
+#: ../libpurple/util.c:3073
 #, c-format
 msgid "%s, %d hour"
 msgid_plural "%s, %d hours"
 msgstr[0] "%s %d 撠"
 msgstr[1] "%s %d 撠"
 
-#: ../libpurple/util.c:2961
+#: ../libpurple/util.c:3079
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d 撠"
 msgstr[1] "%d 撠"
 
-#: ../libpurple/util.c:2969
+#: ../libpurple/util.c:3087
 #, c-format
 msgid "%s, %d minute"
 msgid_plural "%s, %d minutes"
 msgstr[0] "%s %d "
 msgstr[1] "%s %d "
 
-#: ../libpurple/util.c:2975
+#: ../libpurple/util.c:3093
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d "
 msgstr[1] "%d "
 
-#: ../libpurple/util.c:3242 ../libpurple/util.c:3540
+#: ../libpurple/util.c:3362 ../libpurple/util.c:3660
 #, c-format
 msgid "Unable to connect to %s"
 msgstr "⊥蝺啜%s"
 
-#: ../libpurple/util.c:3368
+#: ../libpurple/util.c:3488
 #, c-format
 msgid ""
 "Unable to allocate enough memory to hold the contents from %s.  The web "
 "server may be trying something malicious."
 msgstr "⊥箄乓%s敺頞喳閮園嚗蝬脩隡箸典航賣瑟⊥"
 
-#: ../libpurple/util.c:3403
+#: ../libpurple/util.c:3523
 #, c-format
 msgid "Error reading from %s: %s"
 msgstr "霈 %s 銝剔潛航炊嚗%s"
 
-#: ../libpurple/util.c:3434
+#: ../libpurple/util.c:3554
 #, c-format
 msgid "Error writing to %s: %s"
 msgstr "撖怠 %s 銝剔潛鈭航炊嚗%s"
 
-#: ../libpurple/util.c:3459
+#: ../libpurple/util.c:3579
 #, c-format
 msgid "Unable to connect to %s: %s"
 msgstr "⊥蝺 %s嚗%s"
@@ -11559,59 +11573,59 @@
 msgstr "蝟餌絞孵"
 
 #. Build the login options frame.
-#: ../pidgin/gtkaccount.c:390
+#: ../pidgin/gtkaccount.c:406
 msgid "Login Options"
 msgstr "餃仿賊"
 
 # NOTE Debian 霅胯local箝砍啁垢嚗祆狸indows霅舀嚗雿券鋆憟賢瘥頛憒亦
 # XXX
-#: ../pidgin/gtkaccount.c:492
+#: ../pidgin/gtkaccount.c:515
 msgid "Local alias:"
 msgstr "撣唾亙嚗芸冽祆嚗嚗"
 
 #. Build the user options frame.
-#: ../pidgin/gtkaccount.c:554
+#: ../pidgin/gtkaccount.c:577
 msgid "User Options"
 msgstr "雿輻刻芸賊"
 
 #. Buddy icon
-#: ../pidgin/gtkaccount.c:572
+#: ../pidgin/gtkaccount.c:595
 msgid "Use this buddy icon for this account:"
 msgstr "雿輻其憟賢蝷綽"
 
 #. Build the protocol options frame.
-#: ../pidgin/gtkaccount.c:684
+#: ../pidgin/gtkaccount.c:715
 #, c-format
 msgid "%s Options"
 msgstr "%s 賊"
 
-#: ../pidgin/gtkaccount.c:881
+#: ../pidgin/gtkaccount.c:912
 msgid "Use GNOME Proxy Settings"
 msgstr "雿輻 GNOME 隞隡箸刻身摰"
 
-#: ../pidgin/gtkaccount.c:882
+#: ../pidgin/gtkaccount.c:913
 msgid "Use Global Proxy Settings"
 msgstr "雿輻典典隞隡箸刻身摰"
 
 # NOTE 臭誑隞隡箸其瘥
 # NOTE 擐皜舀桅具瘥嚗雿雓隤瘥銝嚗銝雿輻具頛憟
-#: ../pidgin/gtkaccount.c:888
+#: ../pidgin/gtkaccount.c:919
 msgid "No Proxy"
 msgstr "銝雿輻其誨隡箸"
 
-#: ../pidgin/gtkaccount.c:894
+#: ../pidgin/gtkaccount.c:925
 msgid "HTTP"
 msgstr "HTTP"
 
-#: ../pidgin/gtkaccount.c:900
+#: ../pidgin/gtkaccount.c:931
 msgid "SOCKS 4"
 msgstr "SOCKS 4"
 
-#: ../pidgin/gtkaccount.c:906
+#: ../pidgin/gtkaccount.c:937
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
-#: ../pidgin/gtkaccount.c:912 ../pidgin/gtkprefs.c:1100
+#: ../pidgin/gtkaccount.c:943 ../pidgin/gtkprefs.c:1100
 msgid "Use Environmental Settings"
 msgstr "雿輻函啣霈貉身摰"
 
@@ -11620,60 +11634,60 @@
 #. A) your network is really slow and you have nothing better to do than
 #. look at butterflies.
 #. B)You are looking really closely at something that shouldn't matter.
-#: ../pidgin/gtkaccount.c:951
+#: ../pidgin/gtkaccount.c:982
 msgid "If you look real closely"
 msgstr "憒函敺憭隞蝝"
 
 #. This is an easter egg. See the comment on the previous line in the source.
-#: ../pidgin/gtkaccount.c:954
+#: ../pidgin/gtkaccount.c:985
 msgid "you can see the butterflies mating"
 msgstr "暾暾西渲嗡敺閬"
 
-#: ../pidgin/gtkaccount.c:975
+#: ../pidgin/gtkaccount.c:1006
 msgid "Proxy Options"
 msgstr "隞隡箸券賊"
 
-#: ../pidgin/gtkaccount.c:989 ../pidgin/gtkprefs.c:1094
+#: ../pidgin/gtkaccount.c:1020 ../pidgin/gtkprefs.c:1094
 msgid "Proxy _type:"
 msgstr "隞隡箸典(_T)嚗"
 
-#: ../pidgin/gtkaccount.c:998 ../pidgin/gtkprefs.c:1115
+#: ../pidgin/gtkaccount.c:1029 ../pidgin/gtkprefs.c:1115
 msgid "_Host:"
 msgstr "銝餅雿(_H)嚗"
 
-#: ../pidgin/gtkaccount.c:1002 ../pidgin/gtkprefs.c:1133
+#: ../pidgin/gtkaccount.c:1033 ../pidgin/gtkprefs.c:1133
 msgid "_Port:"
 msgstr "閮(_P)嚗"
 
-#: ../pidgin/gtkaccount.c:1010
+#: ../pidgin/gtkaccount.c:1041
 msgid "_Username:"
 msgstr "雿輻刻(_U)嚗"
 
-#: ../pidgin/gtkaccount.c:1017 ../pidgin/gtkprefs.c:1170
+#: ../pidgin/gtkaccount.c:1048 ../pidgin/gtkprefs.c:1170
 msgid "Pa_ssword:"
 msgstr "撖蝣(_S)嚗"
 
-#: ../pidgin/gtkaccount.c:1428
+#: ../pidgin/gtkaccount.c:1454
 msgid "Add Account"
 msgstr "啣撣唾"
 
-#: ../pidgin/gtkaccount.c:1452
+#: ../pidgin/gtkaccount.c:1478
 msgid "_Basic"
 msgstr "箸祈身摰(_B)"
 
-#: ../pidgin/gtkaccount.c:1463
+#: ../pidgin/gtkaccount.c:1489
 msgid "_Advanced"
 msgstr "脤閮剖(_A)"
 
-#: ../pidgin/gtkaccount.c:1933 ../pidgin/gtkplugin.c:566
+#: ../pidgin/gtkaccount.c:1961 ../pidgin/gtkplugin.c:568
 msgid "Enabled"
 msgstr ""
 
-#: ../pidgin/gtkaccount.c:1961
+#: ../pidgin/gtkaccount.c:1989
 msgid "Protocol"
 msgstr "閮摰"
 
-#: ../pidgin/gtkaccount.c:2144
+#: ../pidgin/gtkaccount.c:2183
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Welcome to %s!</span>\n"
@@ -11697,233 +11711,233 @@
 
 # TODO 韏瑚閰脩箏銝啁憭拙恕嚗銝行憭拙恕甇賊唳蝢斤
 # NOTE 霅舀游 by Paladin
-#: ../pidgin/gtkblist.c:704
+#: ../pidgin/gtkblist.c:724
 msgid "Join a Chat"
 msgstr "亥憭拙恕"
 
-#: ../pidgin/gtkblist.c:725
+#: ../pidgin/gtkblist.c:745
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 msgstr "隢頛詨仿潭冽喳亙末皜桃憭拙恕拍嗉閮\n"
 
-#: ../pidgin/gtkblist.c:736 ../pidgin/gtkpounce.c:529
+#: ../pidgin/gtkblist.c:756 ../pidgin/gtkpounce.c:531
 #: ../pidgin/gtkroomlist.c:399
 msgid "_Account:"
 msgstr "撣唾(_A)嚗"
 
-#: ../pidgin/gtkblist.c:1010 ../pidgin/gtkprivacy.c:603
-#: ../pidgin/gtkprivacy.c:614
+#: ../pidgin/gtkblist.c:1045 ../pidgin/gtkprivacy.c:606
+#: ../pidgin/gtkprivacy.c:620
 msgid "_Block"
 msgstr "撠(_B)"
 
-#: ../pidgin/gtkblist.c:1010
+#: ../pidgin/gtkblist.c:1045
 msgid "Un_block"
 msgstr "閫文(_B)"
 
-#: ../pidgin/gtkblist.c:1061
+#: ../pidgin/gtkblist.c:1096
 msgid "Get _Info"
 msgstr "敺鞈閮(_I)"
 
-#: ../pidgin/gtkblist.c:1064 ../pidgin/pidginstock.c:91
+#: ../pidgin/gtkblist.c:1099 ../pidgin/pidginstock.c:84
 msgid "I_M"
 msgstr "單閮(_M)"
 
-#: ../pidgin/gtkblist.c:1070
+#: ../pidgin/gtkblist.c:1105
 msgid "_Send File"
 msgstr "喲瑼獢(_S)"
 
-#: ../pidgin/gtkblist.c:1077
+#: ../pidgin/gtkblist.c:1112
 msgid "Add Buddy _Pounce"
 msgstr "亙末(_P)"
 
-#: ../pidgin/gtkblist.c:1081 ../pidgin/gtkblist.c:1085
-#: ../pidgin/gtkblist.c:1184 ../pidgin/gtkblist.c:1207
+#: ../pidgin/gtkblist.c:1116 ../pidgin/gtkblist.c:1120
+#: ../pidgin/gtkblist.c:1222 ../pidgin/gtkblist.c:1245
 msgid "View _Log"
 msgstr "閫亥(_L)"
 
-#: ../pidgin/gtkblist.c:1097
+#: ../pidgin/gtkblist.c:1132
 msgid "Alias..."
 msgstr "亙..."
 
-#: ../pidgin/gtkblist.c:1106 ../pidgin/gtkblist.c:1192
-#: ../pidgin/gtkblist.c:1213
+#: ../pidgin/gtkblist.c:1141 ../pidgin/gtkblist.c:1230
+#: ../pidgin/gtkblist.c:1251
 msgid "_Alias..."
 msgstr "亙(_A)..."
 
-#: ../pidgin/gtkblist.c:1108 ../pidgin/gtkblist.c:1194
-#: ../pidgin/gtkblist.c:1215
+#: ../pidgin/gtkblist.c:1143 ../pidgin/gtkblist.c:1232
+#: ../pidgin/gtkblist.c:1253
 msgid "_Remove"
 msgstr "蝘駁(_R)"
 
-#: ../pidgin/gtkblist.c:1155
+#: ../pidgin/gtkblist.c:1192
 msgid "Add a _Buddy"
 msgstr "啣銝憟賢(_B)"
 
-#: ../pidgin/gtkblist.c:1157
+#: ../pidgin/gtkblist.c:1195
 msgid "Add a C_hat"
 msgstr "啣銝憭拙恕(_H)"
 
-#: ../pidgin/gtkblist.c:1160
+#: ../pidgin/gtkblist.c:1198
 msgid "_Delete Group"
 msgstr "芷斤黎蝯(_D)"
 
-#: ../pidgin/gtkblist.c:1162
+#: ../pidgin/gtkblist.c:1200
 msgid "_Rename"
 msgstr "賢(_R)"
 
 #. join button
-#: ../pidgin/gtkblist.c:1180 ../pidgin/gtkroomlist.c:306
-#: ../pidgin/gtkroomlist.c:463 ../pidgin/pidginstock.c:89
+#: ../pidgin/gtkblist.c:1218 ../pidgin/gtkroomlist.c:306
+#: ../pidgin/gtkroomlist.c:463 ../pidgin/pidginstock.c:82
 msgid "_Join"
 msgstr "(_J)"
 
-#: ../pidgin/gtkblist.c:1182
+#: ../pidgin/gtkblist.c:1220
 msgid "Auto-Join"
 msgstr "芸"
 
-#: ../pidgin/gtkblist.c:1220 ../pidgin/gtkblist.c:1243
+#: ../pidgin/gtkblist.c:1258 ../pidgin/gtkblist.c:1281
 msgid "_Collapse"
 msgstr "嗉絲(_C)"
 
-#: ../pidgin/gtkblist.c:1248
+#: ../pidgin/gtkblist.c:1286
 msgid "_Expand"
 msgstr "撅(_E)"
 
-#: ../pidgin/gtkblist.c:1493 ../pidgin/gtkblist.c:1505
-#: ../pidgin/gtkblist.c:4431 ../pidgin/gtkblist.c:4441
+#: ../pidgin/gtkblist.c:1531 ../pidgin/gtkblist.c:1543
+#: ../pidgin/gtkblist.c:4511 ../pidgin/gtkblist.c:4521
 msgid "/Tools/Mute Sounds"
 msgstr "/撌亙/"
 
 # XXX 怨陌
-#: ../pidgin/gtkblist.c:1965 ../pidgin/gtkconv.c:4514
-#: ../pidgin/gtkpounce.c:421
+#: ../pidgin/gtkblist.c:2003 ../pidgin/gtkconv.c:4535
+#: ../pidgin/gtkpounce.c:423
 msgid ""
 "You are not currently signed on with an account that can add that buddy."
 msgstr "其蒂芰餃乩遙雿銝臭冽啣芸憟賢閮摰"
 
 #. Buddies menu
-#: ../pidgin/gtkblist.c:2757
+#: ../pidgin/gtkblist.c:2832
 msgid "/_Buddies"
 msgstr "/憟賢(_B)"
 
-#: ../pidgin/gtkblist.c:2758
+#: ../pidgin/gtkblist.c:2833
 msgid "/Buddies/New Instant _Message..."
 msgstr "/憟賢/啣單閮(_M)"
 
-#: ../pidgin/gtkblist.c:2759
+#: ../pidgin/gtkblist.c:2834
 msgid "/Buddies/Join a _Chat..."
 msgstr "/憟賢/亥憭拙恕(_C)"
 
-#: ../pidgin/gtkblist.c:2760
+#: ../pidgin/gtkblist.c:2835
 msgid "/Buddies/Get User _Info..."
 msgstr "/憟賢/敺雿輻刻鞈閮(_I)..."
 
 #  NOTE 甇方霅胯霈隡潔頛敺憟賭暺
-#: ../pidgin/gtkblist.c:2761
+#: ../pidgin/gtkblist.c:2836
 msgid "/Buddies/View User _Log..."
 msgstr "/憟賢/霈雿輻刻亥(_L)..."
 
-#: ../pidgin/gtkblist.c:2763
+#: ../pidgin/gtkblist.c:2838
 msgid "/Buddies/Show _Offline Buddies"
 msgstr "/憟賢/憿舐內Y憟賢(_O)"
 
-#: ../pidgin/gtkblist.c:2764
+#: ../pidgin/gtkblist.c:2839
 msgid "/Buddies/Show _Empty Groups"
 msgstr "/憟賢/憿舐內蝛箇賜蝢斤(_E)"
 
-#: ../pidgin/gtkblist.c:2765
+#: ../pidgin/gtkblist.c:2840
 msgid "/Buddies/Show Buddy _Details"
 msgstr "/憟賢/憿舐內憟賢蝝啁(_D)"
 
-#: ../pidgin/gtkblist.c:2766
+#: ../pidgin/gtkblist.c:2841
 msgid "/Buddies/Show Idle _Times"
 msgstr "/憟賢/憿舐內蝵格(_T)"
 
-#: ../pidgin/gtkblist.c:2767
+#: ../pidgin/gtkblist.c:2842
 msgid "/Buddies/_Sort Buddies"
 msgstr "/憟賢/憟賢皜格摨(_S)"
 
-#: ../pidgin/gtkblist.c:2769
+#: ../pidgin/gtkblist.c:2844
 msgid "/Buddies/_Add Buddy..."
 msgstr "/憟賢/啣憟賢(_A)..."
 
-#: ../pidgin/gtkblist.c:2770
+#: ../pidgin/gtkblist.c:2845
 msgid "/Buddies/Add C_hat..."
 msgstr "/憟賢/啣憭拙恕(_H)..."
 
-#: ../pidgin/gtkblist.c:2771
+#: ../pidgin/gtkblist.c:2846
 msgid "/Buddies/Add _Group..."
 msgstr "/憟賢/啣蝢斤(_G)..."
 
-#: ../pidgin/gtkblist.c:2773
+#: ../pidgin/gtkblist.c:2848
 msgid "/Buddies/_Quit"
 msgstr "/憟賢/蝯蝔撘(_Q)"
 
 #. Accounts menu
-#: ../pidgin/gtkblist.c:2776
+#: ../pidgin/gtkblist.c:2851
 msgid "/_Accounts"
 msgstr "/撣唾(_A)"
 
-#: ../pidgin/gtkblist.c:2777 ../pidgin/gtkblist.c:6344
+#: ../pidgin/gtkblist.c:2852 ../pidgin/gtkblist.c:6446
 msgid "/Accounts/Add\\/Edit"
 msgstr "/撣唾(_A)/啣\\/蝺刻摩"
 
 #. Tools
-#: ../pidgin/gtkblist.c:2780
+#: ../pidgin/gtkblist.c:2855
 msgid "/_Tools"
 msgstr "撌亙(_T)"
 
-#: ../pidgin/gtkblist.c:2781
+#: ../pidgin/gtkblist.c:2856
 msgid "/Tools/Buddy _Pounces"
 msgstr "/撌亙/憟賢(_P)"
 
-#: ../pidgin/gtkblist.c:2782
+#: ../pidgin/gtkblist.c:2857
 msgid "/Tools/Plu_gins"
 msgstr "/撌亙/璅∠(_G)"
 
-#: ../pidgin/gtkblist.c:2783
+#: ../pidgin/gtkblist.c:2858
 msgid "/Tools/Pr_eferences"
 msgstr "/撌亙/憟質身摰(_E)"
 
-#: ../pidgin/gtkblist.c:2784
+#: ../pidgin/gtkblist.c:2859
 msgid "/Tools/Pr_ivacy"
 msgstr "/撌亙/梁閮剖(_I)"
 
-#: ../pidgin/gtkblist.c:2786
+#: ../pidgin/gtkblist.c:2861
 msgid "/Tools/_File Transfers"
 msgstr "/撌亙/瑼獢唾撓(_F)"
 
-#: ../pidgin/gtkblist.c:2787
+#: ../pidgin/gtkblist.c:2862
 msgid "/Tools/R_oom List"
 msgstr "/撌亙/憭拙恕皜(_O)"
 
-#: ../pidgin/gtkblist.c:2788
+#: ../pidgin/gtkblist.c:2863
 msgid "/Tools/System _Log"
 msgstr "/撌亙/蝟餌絞亥(_L)"
 
-#: ../pidgin/gtkblist.c:2790
+#: ../pidgin/gtkblist.c:2865
 msgid "/Tools/Mute _Sounds"
 msgstr "/撌亙/(_S)"
 
 #. Help
-#: ../pidgin/gtkblist.c:2793
+#: ../pidgin/gtkblist.c:2868
 msgid "/_Help"
 msgstr "隤芣(_H)"
 
-#: ../pidgin/gtkblist.c:2794
+#: ../pidgin/gtkblist.c:2869
 msgid "/Help/Online _Help"
 msgstr "蝺銝隤芣(_H)"
 
-#: ../pidgin/gtkblist.c:2795
+#: ../pidgin/gtkblist.c:2870
 msgid "/Help/_Debug Window"
 msgstr "/隤芣/日航蝒(_D)"
 
-#: ../pidgin/gtkblist.c:2796
+#: ../pidgin/gtkblist.c:2871
 msgid "/Help/_About"
 msgstr "/隤芣/(_A)"
 
-#: ../pidgin/gtkblist.c:2824
+#: ../pidgin/gtkblist.c:2899
 #, c-format
 msgid ""
 "\n"
@@ -11932,132 +11946,128 @@
 "\n"
 "<b>撣唾嚗</b>%s"
 
-#: ../pidgin/gtkblist.c:2902
+#: ../pidgin/gtkblist.c:2977
 msgid "Buddy Alias"
 msgstr "憟賢亙"
 
-#: ../pidgin/gtkblist.c:2923
+#: ../pidgin/gtkblist.c:2998
 msgid "Logged In"
 msgstr "撌脩餃"
 
-#: ../pidgin/gtkblist.c:2969
+#: ../pidgin/gtkblist.c:3044
 msgid "Last Seen"
 msgstr "銝甈∠餃"
 
 # XXX
-#: ../pidgin/gtkblist.c:2989
+#: ../pidgin/gtkblist.c:3064
 msgid "Spooky"
 msgstr "撟賡隡潛"
 
-#: ../pidgin/gtkblist.c:2991
+#: ../pidgin/gtkblist.c:3066
 msgid "Awesome"
 msgstr "勗"
 
-#: ../pidgin/gtkblist.c:2993
+#: ../pidgin/gtkblist.c:3068
 msgid "Rockin'"
 msgstr "勗"
 
-#: ../pidgin/gtkblist.c:3318
+#: ../pidgin/gtkblist.c:3394
 #, c-format
 msgid "Idle %dh %02dm"
 msgstr "蝵 %d 撠 %02d "
 
-#: ../pidgin/gtkblist.c:3320
+#: ../pidgin/gtkblist.c:3396
 #, c-format
 msgid "Idle %dm"
 msgstr "蝵 %d "
 
-#: ../pidgin/gtkblist.c:3457
+#: ../pidgin/gtkblist.c:3533
 msgid "/Buddies/New Instant Message..."
 msgstr "/憟賢/啣單閮..."
 
-#: ../pidgin/gtkblist.c:3458 ../pidgin/gtkblist.c:3491
+#: ../pidgin/gtkblist.c:3534 ../pidgin/gtkblist.c:3567
 msgid "/Buddies/Join a Chat..."
 msgstr "/憟賢/亥憭拙恕(_C)..."
 
-#: ../pidgin/gtkblist.c:3459
+#: ../pidgin/gtkblist.c:3535
 msgid "/Buddies/Get User Info..."
 msgstr "/憟賢/敺雿輻刻鞈閮..."
 
-#: ../pidgin/gtkblist.c:3460
+#: ../pidgin/gtkblist.c:3536
 msgid "/Buddies/Add Buddy..."
 msgstr "/憟賢/啣憟賢..."
 
-#: ../pidgin/gtkblist.c:3461 ../pidgin/gtkblist.c:3494
+#: ../pidgin/gtkblist.c:3537 ../pidgin/gtkblist.c:3570
 msgid "/Buddies/Add Chat..."
 msgstr "/憟賢/啣憭拙恕..."
 
-#: ../pidgin/gtkblist.c:3462
+#: ../pidgin/gtkblist.c:3538
 msgid "/Buddies/Add Group..."
 msgstr "/憟賢/啣蝢斤..."
 
-#: ../pidgin/gtkblist.c:3497
-msgid "/Tools/Buddy Pounces"
-msgstr "/撌亙/憟賢"
-
-#: ../pidgin/gtkblist.c:3500
+#: ../pidgin/gtkblist.c:3573
 msgid "/Tools/Privacy"
 msgstr "/撌亙/梁閮剖"
 
-#: ../pidgin/gtkblist.c:3503
+#: ../pidgin/gtkblist.c:3576
 msgid "/Tools/Room List"
 msgstr "/撌亙/憭拙恕皜"
 
-#: ../pidgin/gtkblist.c:3600 ../pidgin/gtkdocklet.c:153
+#: ../pidgin/gtkblist.c:3673 ../pidgin/gtkdocklet.c:153
 #, c-format
 msgid "%d unread message from %s\n"
 msgid_plural "%d unread messages from %s\n"
 msgstr[0] "%d  %s 澆箇芾閮珮n"
 msgstr[1] "%d  %s 澆箇芾閮珮n"
 
-#: ../pidgin/gtkblist.c:3677
+#: ../pidgin/gtkblist.c:3750
 msgid "Manually"
 msgstr "雿輻刻芸"
 
-#: ../pidgin/gtkblist.c:3679
+#: ../pidgin/gtkblist.c:3752
 msgid "Alphabetically"
 msgstr "靘批瘥"
 
-#: ../pidgin/gtkblist.c:3680
+#: ../pidgin/gtkblist.c:3753
 msgid "By status"
 msgstr "靘抒"
 
-#: ../pidgin/gtkblist.c:3681
+#: ../pidgin/gtkblist.c:3754
 msgid "By log size"
 msgstr "靘扳亥憭批"
 
-#: ../pidgin/gtkblist.c:3883 ../pidgin/gtkconn.c:178
+#: ../pidgin/gtkblist.c:3956 ../pidgin/gtkconn.c:178
 #, c-format
 msgid "%s disconnected"
 msgstr "%s 蝯蝺"
 
-#: ../pidgin/gtkblist.c:3892
+#: ../pidgin/gtkblist.c:3966
 msgid "Re-enable Account"
 msgstr "啣撣唾"
 
-#: ../pidgin/gtkblist.c:3913
+#: ../pidgin/gtkblist.c:3990
 #, c-format
 msgid "<span color=\"red\">%s disconnected: %s</span>"
 msgstr "<span color=\"red\">%s 蝯蝺嚗%s</span>"
 
-#: ../pidgin/gtkblist.c:4066
+#: ../pidgin/gtkblist.c:4142
 msgid "<b>Username:</b>"
 msgstr "<b>雿輻刻蝔梧</b>"
 
-#: ../pidgin/gtkblist.c:4073
+#: ../pidgin/gtkblist.c:4149
 msgid "<b>Password:</b>"
 msgstr "<b>撖蝣潘</b>"
 
-#: ../pidgin/gtkblist.c:4084
+#: ../pidgin/gtkblist.c:4160
 msgid "_Login"
 msgstr "餃(_L)"
 
-#: ../pidgin/gtkblist.c:4169
+#: ../pidgin/gtkblist.c:4245
 msgid "/Accounts"
 msgstr "/撣唾"
 
 #. Translators: Please maintain the use of -> and <- to refer to menu heirarchy
-#: ../pidgin/gtkblist.c:4183
+#: ../pidgin/gtkblist.c:4259
 #, c-format
 msgid ""
 "<span weight='bold' size='larger'>Welcome to %s!</span>\n"
@@ -12075,23 +12085,23 @@
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: ../pidgin/gtkblist.c:4425
+#: ../pidgin/gtkblist.c:4505
 msgid "/Buddies/Show Offline Buddies"
 msgstr "/憟賢/憿舐內Y憟賢"
 
-#: ../pidgin/gtkblist.c:4428
+#: ../pidgin/gtkblist.c:4508
 msgid "/Buddies/Show Empty Groups"
 msgstr "/憟賢/憿舐內蝛箇憟賜蝢斤"
 
-#: ../pidgin/gtkblist.c:4434
+#: ../pidgin/gtkblist.c:4514
 msgid "/Buddies/Show Buddy Details"
 msgstr "/憟賢/憿舐內憟賢蝝啁"
 
-#: ../pidgin/gtkblist.c:4437
+#: ../pidgin/gtkblist.c:4517
 msgid "/Buddies/Show Idle Times"
 msgstr "/憟賢/憿舐內蝵格"
 
-#: ../pidgin/gtkblist.c:5271
+#: ../pidgin/gtkblist.c:5367
 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. "
@@ -12100,66 +12110,66 @@
 "隢頛詨交冽唾亙末撣唾典臭誑粹憟賢閮剖亙梁迂嚗閮剖撠"
 "典末皜桐葉憿舐內\n"
 
-#: ../pidgin/gtkblist.c:5331 ../pidgin/gtkblist.c:5692
+#: ../pidgin/gtkblist.c:5427 ../pidgin/gtkblist.c:5788
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:554
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:307
 msgid "Group:"
 msgstr "蝢斤嚗"
 
-#: ../pidgin/gtkblist.c:5590
+#: ../pidgin/gtkblist.c:5686
 msgid "This protocol does not support chat rooms."
 msgstr "閮摰銝舀渲憭拙恕"
 
-#: ../pidgin/gtkblist.c:5606
+#: ../pidgin/gtkblist.c:5702
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
 msgstr "其蒂芰餃乩遙雿銝臭典亥憭拙恕閮摰"
 
-#: ../pidgin/gtkblist.c:5647
+#: ../pidgin/gtkblist.c:5743
 msgid ""
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
 msgstr "隢頛詨亙亙嚗潭冽喳亙末皜桃憭拙恕拍嗉閮\n"
 
-#: ../pidgin/gtkblist.c:5730
+#: ../pidgin/gtkblist.c:5826
 msgid "Please enter the name of the group to be added."
 msgstr "隢蝯行冽啣蝢斤頛詨亙蝔晞"
 
 # XXX
-#: ../pidgin/gtkblist.c:6364
+#: ../pidgin/gtkblist.c:6466
 msgid "<PurpleMain>/Accounts/"
 msgstr "<PurpleMain>/撣唾/"
 
-#: ../pidgin/gtkblist.c:6388
+#: ../pidgin/gtkblist.c:6490
 msgid "_Edit Account"
 msgstr "蝺刻摩撣唾(_E)"
 
 #  NOTE 銝胯銝閮晞胯瘝嚗撠文嗆臬冽啁璅∠賊隞扎皜殷
 #  NOTE 霅舀銝閮晞撣豢
-#: ../pidgin/gtkblist.c:6401 ../pidgin/gtkconv.c:2920
+#: ../pidgin/gtkblist.c:6503 ../pidgin/gtkconv.c:2923
 msgid "No actions available"
 msgstr "瘝賊隞"
 
 # #NOTE 銝銝Enable Account撠
-#: ../pidgin/gtkblist.c:6409
+#: ../pidgin/gtkblist.c:6511
 msgid "_Disable"
 msgstr "典董(_D)"
 
-#: ../pidgin/gtkblist.c:6421
+#: ../pidgin/gtkblist.c:6523
 msgid "Enable Account"
 msgstr "撣唾"
 
 # XXX
-#: ../pidgin/gtkblist.c:6427
+#: ../pidgin/gtkblist.c:6529
 msgid "<PurpleMain>/Accounts/Enable Account"
 msgstr "<PurpleMain>/撣唾/撣唾"
 
-#: ../pidgin/gtkblist.c:6476
+#: ../pidgin/gtkblist.c:6578
 msgid "/Tools"
 msgstr "/撌亙"
 
-#: ../pidgin/gtkblist.c:6546
+#: ../pidgin/gtkblist.c:6648
 msgid "/Buddies/Sort Buddies"
 msgstr "/憟賢/憟賢皜格摨"
 
@@ -12172,65 +12182,65 @@
 "re-enable the account."
 msgstr ""
 "%s\n"
-"冽冽湔迤航炊銝阡啣撣唾嚗%s 撠銝閰西圈蝺"
-
-#: ../pidgin/gtkconv.c:782 ../pidgin/gtkconv.c:808
+"冽冽湔迤航炊銝阡啣撣唾嚗%s 撠銝閰阡圈蝺"
+
+#: ../pidgin/gtkconv.c:788 ../pidgin/gtkconv.c:814
 msgid "That buddy is not on the same protocol as this chat."
 msgstr "閰脣憟賢憭拐蒂雿輻典銝蝔桃閮摰"
 
 # XXX 怨陌
-#: ../pidgin/gtkconv.c:802
+#: ../pidgin/gtkconv.c:808
 msgid ""
 "You are not currently signed on with an account that can invite that buddy."
 msgstr "其蒂芰餃乩遙雿銝臭券隢芸憟賢閮摰"
 
-#: ../pidgin/gtkconv.c:855
+#: ../pidgin/gtkconv.c:861
 msgid "Invite Buddy Into Chat Room"
 msgstr "隢憟賢脣亥憭拙恕"
 
 #. Put our happy label in it.
-#: ../pidgin/gtkconv.c:885
+#: ../pidgin/gtkconv.c:891
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
 msgstr "隢頛詨交冽喲隢雿輻刻蝔梧隞亙隢閮胯"
 
-#: ../pidgin/gtkconv.c:906
+#: ../pidgin/gtkconv.c:912
 msgid "_Buddy:"
 msgstr "憟賢(_B)嚗"
 
-#: ../pidgin/gtkconv.c:926 ../pidgin/gtksavedstatuses.c:1141
-#: ../pidgin/gtksavedstatuses.c:1477
+#: ../pidgin/gtkconv.c:932 ../pidgin/gtksavedstatuses.c:1142
+#: ../pidgin/gtksavedstatuses.c:1478
 msgid "_Message:"
 msgstr "閮(_M)嚗"
 
-#: ../pidgin/gtkconv.c:983 ../pidgin/gtkconv.c:2487 ../pidgin/gtkdebug.c:218
+#: ../pidgin/gtkconv.c:989 ../pidgin/gtkconv.c:2499 ../pidgin/gtkdebug.c:217
 #: ../pidgin/gtkft.c:542
 msgid "Unable to open file."
 msgstr "⊥瑼獢"
 
-#: ../pidgin/gtkconv.c:989
+#: ../pidgin/gtkconv.c:995
 #, c-format
 msgid "<h1>Conversation with %s</h1>\n"
 msgstr "<h1> %s 鈭方</h1>\n"
 
-#: ../pidgin/gtkconv.c:1013
+#: ../pidgin/gtkconv.c:1031
 msgid "Save Conversation"
 msgstr "脣憭拙批捆"
 
-#: ../pidgin/gtkconv.c:1160 ../pidgin/gtkdebug.c:166 ../pidgin/gtkdebug.c:756
+#: ../pidgin/gtkconv.c:1180 ../pidgin/gtkdebug.c:165 ../pidgin/gtkdebug.c:741
 msgid "Find"
 msgstr "撠"
 
-#: ../pidgin/gtkconv.c:1186 ../pidgin/gtkdebug.c:194
+#: ../pidgin/gtkconv.c:1206 ../pidgin/gtkdebug.c:193
 msgid "_Search for:"
 msgstr "撠(_S)嚗"
 
-#: ../pidgin/gtkconv.c:1338
+#: ../pidgin/gtkconv.c:1358
 msgid "Logging started. Future messages in this conversation will be logged."
 msgstr "亥蝟餌絞芯券鈭方銝剔閮舫賢鋡怨潭亥銝准"
 
-#: ../pidgin/gtkconv.c:1346
+#: ../pidgin/gtkconv.c:1366
 msgid ""
 "Logging stopped. Future messages in this conversation will not be logged."
 msgstr "亥蝟餌絞芯券鈭方銝剔閮舫賢銝鋡怨潭亥銝准"
@@ -12253,130 +12263,130 @@
 msgid "Last said"
 msgstr "銝甈⊥"
 
-#: ../pidgin/gtkconv.c:2495
+#: ../pidgin/gtkconv.c:2507
 msgid "Unable to save icon file to disk."
 msgstr "⊥脣蝷箸獢喟蝣銝"
 
-#: ../pidgin/gtkconv.c:2565
+#: ../pidgin/gtkconv.c:2558
 msgid "Save Icon"
 msgstr "脣蝷"
 
-#: ../pidgin/gtkconv.c:2614
+#: ../pidgin/gtkconv.c:2610
 msgid "Animate"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:2619
+#: ../pidgin/gtkconv.c:2615
 msgid "Hide Icon"
 msgstr "梯蝷"
 
 #  NOTE 爹ight-Click蝷箸憿舐內隞歹霅胯As箝箝敺憟
-#: ../pidgin/gtkconv.c:2622
+#: ../pidgin/gtkconv.c:2618
 msgid "Save Icon As..."
 msgstr "脣蝷..."
 
-#: ../pidgin/gtkconv.c:2626
+#: ../pidgin/gtkconv.c:2622
 msgid "Set Custom Icon..."
 msgstr "芸蝷..."
 
-#: ../pidgin/gtkconv.c:2633
+#: ../pidgin/gtkconv.c:2635
 msgid "Remove Custom Icon"
 msgstr "蝘駁方芸蝷"
 
 #. Conversation menu
-#: ../pidgin/gtkconv.c:2774
+#: ../pidgin/gtkconv.c:2777
 msgid "/_Conversation"
 msgstr "/鈭方(_C)"
 
-#: ../pidgin/gtkconv.c:2776
+#: ../pidgin/gtkconv.c:2779
 msgid "/Conversation/New Instant _Message..."
 msgstr "/憟賢/啣單閮(_M)..."
 
-#: ../pidgin/gtkconv.c:2781
+#: ../pidgin/gtkconv.c:2784
 msgid "/Conversation/_Find..."
 msgstr "/鈭方/撠(_F)..."
 
-#: ../pidgin/gtkconv.c:2783
+#: ../pidgin/gtkconv.c:2786
 msgid "/Conversation/View _Log"
 msgstr "/鈭方/閫甇瑕脰(_L)"
 
-#: ../pidgin/gtkconv.c:2784
+#: ../pidgin/gtkconv.c:2787
 msgid "/Conversation/_Save As..."
 msgstr "/鈭方/血唳(_S)..."
 
-#: ../pidgin/gtkconv.c:2786
+#: ../pidgin/gtkconv.c:2789
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/鈭方/皜蝛箔漱隢批捆(_R)"
 
-#: ../pidgin/gtkconv.c:2790
-msgid "/Conversation/Se_nd File..."
-msgstr "/鈭方/喲瑼獢(_N)..."
-
-#: ../pidgin/gtkconv.c:2791
-msgid "/Conversation/Add Buddy _Pounce..."
-msgstr "/鈭方/啣憟賢(_P)..."
-
 #: ../pidgin/gtkconv.c:2793
+msgid "/Conversation/Se_nd File..."
+msgstr "/鈭方/喲瑼獢(_N)..."
+
+#: ../pidgin/gtkconv.c:2794
+msgid "/Conversation/Add Buddy _Pounce..."
+msgstr "/鈭方/啣憟賢(_P)..."
+
+#: ../pidgin/gtkconv.c:2796
 msgid "/Conversation/_Get Info"
 msgstr "/鈭方/敺鞈閮(_G)"
 
-#: ../pidgin/gtkconv.c:2795
+#: ../pidgin/gtkconv.c:2798
 msgid "/Conversation/In_vite..."
 msgstr "/鈭方/隢(_V)..."
 
-#: ../pidgin/gtkconv.c:2797
+#: ../pidgin/gtkconv.c:2800
 msgid "/Conversation/M_ore"
 msgstr "/鈭方/游(_O)"
 
-#: ../pidgin/gtkconv.c:2801
+#: ../pidgin/gtkconv.c:2804
 msgid "/Conversation/Al_ias..."
 msgstr "/鈭方/亙(_I)..."
 
-#: ../pidgin/gtkconv.c:2803
+#: ../pidgin/gtkconv.c:2806
 msgid "/Conversation/_Block..."
 msgstr "/鈭方/撠(_B)..."
 
-#: ../pidgin/gtkconv.c:2805
+#: ../pidgin/gtkconv.c:2808
 msgid "/Conversation/_Unblock..."
 msgstr "/鈭方/閫文(_B)..."
 
-#: ../pidgin/gtkconv.c:2807
+#: ../pidgin/gtkconv.c:2810
 msgid "/Conversation/_Add..."
 msgstr "/鈭方/啣(_A)..."
 
-#: ../pidgin/gtkconv.c:2809
+#: ../pidgin/gtkconv.c:2812
 msgid "/Conversation/_Remove..."
 msgstr "/鈭方/蝘駁(_R)..."
 
-#: ../pidgin/gtkconv.c:2814
+#: ../pidgin/gtkconv.c:2817
 msgid "/Conversation/_Close"
 msgstr "/鈭方/(_C)"
 
 #. Options
-#: ../pidgin/gtkconv.c:2818
+#: ../pidgin/gtkconv.c:2821
 msgid "/_Options"
 msgstr "/賊(_O)"
 
-#: ../pidgin/gtkconv.c:2819
+#: ../pidgin/gtkconv.c:2822
 msgid "/Options/Enable _Logging"
 msgstr "/賊/憪閮亥(_L)"
 
-#: ../pidgin/gtkconv.c:2820
+#: ../pidgin/gtkconv.c:2823
 msgid "/Options/Enable _Sounds"
 msgstr "/賊/單(_S)"
 
-#: ../pidgin/gtkconv.c:2821
+#: ../pidgin/gtkconv.c:2824
 msgid "/Options/Show Buddy _Icon"
 msgstr "/賊/憿舐內憟賢蝷(_I)"
 
-#: ../pidgin/gtkconv.c:2823
+#: ../pidgin/gtkconv.c:2826
 msgid "/Options/Show Formatting _Toolbars"
 msgstr "/賊/憿舐內澆撌亙瑕(_T)"
 
-#: ../pidgin/gtkconv.c:2824
+#: ../pidgin/gtkconv.c:2827
 msgid "/Options/Show Ti_mestamps"
 msgstr "/賊/憿舐內唾(_M)"
 
-#: ../pidgin/gtkconv.c:2899
+#: ../pidgin/gtkconv.c:2902
 msgid "/Conversation/More"
 msgstr "/鈭方/游"
 
@@ -12385,238 +12395,238 @@
 #. 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:2944 ../pidgin/gtkconv.c:2976
+#: ../pidgin/gtkconv.c:2947 ../pidgin/gtkconv.c:2979
 msgid "/Conversation"
 msgstr "/鈭方"
 
-#: ../pidgin/gtkconv.c:2984
+#: ../pidgin/gtkconv.c:2987
 msgid "/Conversation/View Log"
 msgstr "/鈭方/閫甇瑕脰"
 
-#: ../pidgin/gtkconv.c:2990
+#: ../pidgin/gtkconv.c:2993
 msgid "/Conversation/Send File..."
 msgstr "/鈭方/喲瑼獢..."
 
-#: ../pidgin/gtkconv.c:2994
+#: ../pidgin/gtkconv.c:2997
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/鈭方/啣憟賢..."
 
-#: ../pidgin/gtkconv.c:3000
+#: ../pidgin/gtkconv.c:3003
 msgid "/Conversation/Get Info"
 msgstr "/鈭方/敺鞈閮"
 
-#: ../pidgin/gtkconv.c:3004
+#: ../pidgin/gtkconv.c:3007
 msgid "/Conversation/Invite..."
 msgstr "/鈭方/隢..."
 
-#: ../pidgin/gtkconv.c:3010
+#: ../pidgin/gtkconv.c:3013
 msgid "/Conversation/Alias..."
 msgstr "/鈭方/亙..."
 
-#: ../pidgin/gtkconv.c:3014
+#: ../pidgin/gtkconv.c:3017
 msgid "/Conversation/Block..."
 msgstr "/鈭方/撠..."
 
-#: ../pidgin/gtkconv.c:3018
+#: ../pidgin/gtkconv.c:3021
 msgid "/Conversation/Unblock..."
 msgstr "/鈭方/閫文..."
 
-#: ../pidgin/gtkconv.c:3022
+#: ../pidgin/gtkconv.c:3025
 msgid "/Conversation/Add..."
 msgstr "/鈭方/啣..."
 
-#: ../pidgin/gtkconv.c:3026
+#: ../pidgin/gtkconv.c:3029
 msgid "/Conversation/Remove..."
 msgstr "/鈭方/蝘駁..."
 
-#: ../pidgin/gtkconv.c:3030
-msgid "/Options/Enable Logging"
-msgstr "/賊/憪閮亥"
-
 #: ../pidgin/gtkconv.c:3033
+msgid "/Options/Enable Logging"
+msgstr "/賊/憪閮亥"
+
+#: ../pidgin/gtkconv.c:3036
 msgid "/Options/Enable Sounds"
 msgstr "/賊/單"
 
-#: ../pidgin/gtkconv.c:3046
+#: ../pidgin/gtkconv.c:3049
 msgid "/Options/Show Formatting Toolbars"
 msgstr "/賊/憿舐內澆撌亙瑕"
 
-#: ../pidgin/gtkconv.c:3049
+#: ../pidgin/gtkconv.c:3052
 msgid "/Options/Show Timestamps"
 msgstr "/賊/憿舐內唾"
 
-#: ../pidgin/gtkconv.c:3052
+#: ../pidgin/gtkconv.c:3055
 msgid "/Options/Show Buddy Icon"
 msgstr "/賊/憿舐內憟賢蝷"
 
-#: ../pidgin/gtkconv.c:3136 ../pidgin/gtkconv.c:3173
+#: ../pidgin/gtkconv.c:3139 ../pidgin/gtkconv.c:3181
 msgid "User is typing..."
-msgstr "雿輻刻甇刻撓..."
-
-#: ../pidgin/gtkconv.c:3176
+msgstr "撠寞迤刻撓..."
+
+#: ../pidgin/gtkconv.c:3184
 msgid "User has typed something and stopped"
-msgstr "雿輻刻頛詨乩銝鈭梯正嚗銝怠鈭"
+msgstr "撠寡撓乩銝鈭梯正嚗銝怠鈭"
 
 #. Build the Send To menu
-#: ../pidgin/gtkconv.c:3358
+#: ../pidgin/gtkconv.c:3366
 msgid "_Send To"
 msgstr "喲(_S)"
 
-#: ../pidgin/gtkconv.c:4065
+#: ../pidgin/gtkconv.c:4080
 msgid "_Send"
 msgstr "喲(_S)"
 
 #. Setup the label telling how many people are in the room.
-#: ../pidgin/gtkconv.c:4213
+#: ../pidgin/gtkconv.c:4229
 msgid "0 people in room"
 msgstr "瘝鈭箏券輸"
 
-#: ../pidgin/gtkconv.c:5303 ../pidgin/gtkconv.c:5424
+#: ../pidgin/gtkconv.c:5421 ../pidgin/gtkconv.c:5542
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "%d 鈭箏券輸"
 msgstr[1] "%d 鈭箏券輸"
 
-#: ../pidgin/gtkconv.c:5980 ../pidgin/gtkstatusbox.c:607
+#: ../pidgin/gtkconv.c:6108 ../pidgin/gtkstatusbox.c:657
 msgid "Typing"
 msgstr "頛詨乩葉"
 
-#: ../pidgin/gtkconv.c:5986
+#: ../pidgin/gtkconv.c:6114
 msgid "Stopped Typing"
 msgstr "甇Z撓"
 
-#: ../pidgin/gtkconv.c:5991
+#: ../pidgin/gtkconv.c:6119
 msgid "Nick Said"
 msgstr "梁迂鋡急"
 
-#: ../pidgin/gtkconv.c:5996 ../pidgin/gtkdocklet.c:500
+#: ../pidgin/gtkconv.c:6124 ../pidgin/gtkdocklet.c:492
 msgid "Unread Messages"
 msgstr "芾閮"
 
-#: ../pidgin/gtkconv.c:6001
+#: ../pidgin/gtkconv.c:6129
 msgid "New Event"
 msgstr "唬隞"
 
-#: ../pidgin/gtkconv.c:7122
+#: ../pidgin/gtkconv.c:7258
 msgid "Confirm close"
 msgstr "蝣箄"
 
-#: ../pidgin/gtkconv.c:7154
+#: ../pidgin/gtkconv.c:7290
 msgid "You have unread messages. Are you sure you want to close the window?"
 msgstr "券芾閮胯函Ⅱ摰閬閬蝒嚗"
 
-#: ../pidgin/gtkconv.c:7689
+#: ../pidgin/gtkconv.c:7807
 msgid "Close other tabs"
 msgstr "嗡"
 
-#: ../pidgin/gtkconv.c:7695
+#: ../pidgin/gtkconv.c:7813
 msgid "Close all tabs"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:7703
+#: ../pidgin/gtkconv.c:7821
 msgid "Detach this tab"
 msgstr "a"
 
-#: ../pidgin/gtkconv.c:7709
+#: ../pidgin/gtkconv.c:7827
 msgid "Close this tab"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:8012
+#: ../pidgin/gtkconv.c:8211
 msgid "Close conversation"
 msgstr "鈭方"
 
-#: ../pidgin/gtkconv.c:8476
+#: ../pidgin/gtkconv.c:8732
 msgid "Last created window"
 msgstr "銝銝閬蝒"
 
-#: ../pidgin/gtkconv.c:8478
+#: ../pidgin/gtkconv.c:8734
 msgid "Separate IM and Chat windows"
 msgstr "隞乩閬蝒憿舐內單閮臬憭"
 
-#: ../pidgin/gtkconv.c:8480 ../pidgin/gtkprefs.c:1303
+#: ../pidgin/gtkconv.c:8736 ../pidgin/gtkprefs.c:1303
 msgid "New window"
 msgstr "啗蝒"
 
-#: ../pidgin/gtkconv.c:8482
+#: ../pidgin/gtkconv.c:8738
 msgid "By group"
 msgstr "靘蝢斤"
 
-#: ../pidgin/gtkconv.c:8484
+#: ../pidgin/gtkconv.c:8740
 msgid "By account"
 msgstr "靘撣唾"
 
 #  NOTE日舀亥敺迎日舐頛嚗銝撌脩鈭箇
-#: ../pidgin/gtkdebug.c:233
+#: ../pidgin/gtkdebug.c:232
 msgid "Save Debug Log"
 msgstr "脣日舐"
 
 # NOTE 航賣舀詨
-#: ../pidgin/gtkdebug.c:594
+#: ../pidgin/gtkdebug.c:580
 msgid "Invert"
 msgstr ""
 
 # XXX TODO 撣貉剜Highlight霅舀擃鈭桀漲嚗雿霅舀臭誑寥 - Ambrose 20061029
-#: ../pidgin/gtkdebug.c:597
+#: ../pidgin/gtkdebug.c:583
 msgid "Highlight matches"
 msgstr "璅蝷箏寥摮銝"
 
 #  NOTE 日航蝒撌亙瑕敹怠詨桃隞歹撌亙瑕蝝隞亙蝷箸蝷箝嚗銝鈭
-#: ../pidgin/gtkdebug.c:664
+#: ../pidgin/gtkdebug.c:650
 msgid "_Icon Only"
 msgstr "憿舐內蝷(_I)"
 
-#: ../pidgin/gtkdebug.c:665
+#: ../pidgin/gtkdebug.c:651
 msgid "_Text Only"
 msgstr "憿舐內摮(_T)"
 
-#: ../pidgin/gtkdebug.c:666
+#: ../pidgin/gtkdebug.c:652
 msgid "_Both Icon & Text"
 msgstr "憿舐內蝷箏摮(_B)"
 
-#: ../pidgin/gtkdebug.c:802
+#: ../pidgin/gtkdebug.c:773
 msgid "Filter"
 msgstr "瞈曉"
 
-#: ../pidgin/gtkdebug.c:821
+#: ../pidgin/gtkdebug.c:792
 msgid "Right click for more options."
 msgstr "喲萎誑憿舐內游賊"
 
 # TODO 閬閬 - 20061025
-#: ../pidgin/gtkdebug.c:851
+#: ../pidgin/gtkdebug.c:822
 msgid "Level "
 msgstr "瞈曄摨 "
 
-#: ../pidgin/gtkdebug.c:852 ../pidgin/gtkdebug.c:858
+#: ../pidgin/gtkdebug.c:823 ../pidgin/gtkdebug.c:829
 msgid "Select the debug filter level."
 msgstr "豢日航舐瞈曄摨艾"
 
 # TODO 閬閬 - 20061025
-#: ../pidgin/gtkdebug.c:860
+#: ../pidgin/gtkdebug.c:831
 msgid "All"
 msgstr "券刻"
 
 # NOTE 銝舀Info嚗箏歇蝬Info銝嚗嚗臭蝔格Info閬雿撅斗活日航荔舀Debug
-#: ../pidgin/gtkdebug.c:861
+#: ../pidgin/gtkdebug.c:832
 msgid "Misc"
 msgstr "閮"
 
 # TODO 閬閬 - 20061025
-#: ../pidgin/gtkdebug.c:863
+#: ../pidgin/gtkdebug.c:834
 msgid "Warning"
 msgstr "霅血閮"
 
 # TODO 閬閬 - 20061025
-#: ../pidgin/gtkdebug.c:864
+#: ../pidgin/gtkdebug.c:835
 msgid "Error "
 msgstr "航炊閮"
 
 # TODO 閬閬 - 20061025
-#: ../pidgin/gtkdebug.c:865
+#: ../pidgin/gtkdebug.c:836
 msgid "Fatal Error"
 msgstr "湧航炊閮"
 
-#: ../pidgin/gtkdialogs.c:71 ../pidgin/gtkdialogs.c:115
+#: ../pidgin/gtkdialogs.c:71 ../pidgin/gtkdialogs.c:117
 msgid "lead developer"
 msgstr "銝餉潸"
 
@@ -12625,8 +12635,9 @@
 #: ../pidgin/gtkdialogs.c:76 ../pidgin/gtkdialogs.c:78
 #: ../pidgin/gtkdialogs.c:79 ../pidgin/gtkdialogs.c:80
 #: ../pidgin/gtkdialogs.c:81 ../pidgin/gtkdialogs.c:82
-#: ../pidgin/gtkdialogs.c:83 ../pidgin/gtkdialogs.c:86
+#: ../pidgin/gtkdialogs.c:83 ../pidgin/gtkdialogs.c:84
 #: ../pidgin/gtkdialogs.c:87 ../pidgin/gtkdialogs.c:88
+#: ../pidgin/gtkdialogs.c:89
 msgid "developer"
 msgstr "潸"
 
@@ -12634,160 +12645,170 @@
 msgid "developer & webmaster"
 msgstr "潸潛雯蝡蝞∠"
 
-#: ../pidgin/gtkdialogs.c:84
+#: ../pidgin/gtkdialogs.c:85
 msgid "support"
 msgstr "舀"
 
-#: ../pidgin/gtkdialogs.c:85
+#: ../pidgin/gtkdialogs.c:86
 msgid "support/QA"
 msgstr "舀游澆蝞"
 
-#: ../pidgin/gtkdialogs.c:107
+#: ../pidgin/gtkdialogs.c:109
 msgid "win32 port"
 msgstr "Windows 祉宏璊"
 
-#: ../pidgin/gtkdialogs.c:108 ../pidgin/gtkdialogs.c:109
+#: ../pidgin/gtkdialogs.c:110 ../pidgin/gtkdialogs.c:111
 msgid "maintainer"
 msgstr "蝬剛風"
 
-#: ../pidgin/gtkdialogs.c:110
+#: ../pidgin/gtkdialogs.c:112
 msgid "libfaim maintainer"
 msgstr "libfaim 蝬剛風"
 
 #. If "lazy bum" translates literally into a serious insult, use something else or omit it.
-#: ../pidgin/gtkdialogs.c:112
+#: ../pidgin/gtkdialogs.c:114
 msgid "hacker and designated driver [lazy bum]"
 msgstr "蝔撘蝺典神潭摰豢 [甇餅園狩]"
 
-#: ../pidgin/gtkdialogs.c:113
-msgid "Jabber developer"
-msgstr "Jabber 潸"
-
-#: ../pidgin/gtkdialogs.c:114
+#: ../pidgin/gtkdialogs.c:115
+msgid "XMPP developer"
+msgstr "XMPP 潸"
+
+#: ../pidgin/gtkdialogs.c:116
 msgid "original author"
 msgstr "雿"
 
-#  NOTE 霅舀摰其蝯曹嚗靘嗡 open source project靘嚗芣拐嚗霅舀瑁剜
-#: ../pidgin/gtkdialogs.c:121
+#  NOTE 閬 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=A
+#: ../pidgin/gtkdialogs.c:123
 msgid "Afrikaans"
 msgstr "瑁剜"
 
-#: ../pidgin/gtkdialogs.c:122
+#: ../pidgin/gtkdialogs.c:124
 msgid "Arabic"
 msgstr "踵隡舀"
 
-#: ../pidgin/gtkdialogs.c:123 ../pidgin/gtkdialogs.c:124
-#: ../pidgin/gtkdialogs.c:205
-msgid "Bulgarian"
-msgstr "靽拐"
-
 #: ../pidgin/gtkdialogs.c:125 ../pidgin/gtkdialogs.c:126
+#: ../pidgin/gtkdialogs.c:209
+msgid "Bulgarian"
+msgstr "靽拐"
+
 #: ../pidgin/gtkdialogs.c:127 ../pidgin/gtkdialogs.c:128
+#: ../pidgin/gtkdialogs.c:129 ../pidgin/gtkdialogs.c:130
 msgid "Bengali"
 msgstr "摮"
 
-# NOTE 皜航陌瘜X臬側鈭
-#: ../pidgin/gtkdialogs.c:129
+# NOTE 閬 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=B&page=2
+# NOTE 皜航陌瘜X臬側鈭嚗唬祈陌瘜Wㄚ撠潔
+#: ../pidgin/gtkdialogs.c:131
 msgid "Bosnian"
-msgstr "瘜Wㄚ撠潔"
-
-#: ../pidgin/gtkdialogs.c:130 ../pidgin/gtkdialogs.c:206
-#: ../pidgin/gtkdialogs.c:207
+msgstr "瘜X臬側鈭"
+
+#  NOTE 閬 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=C
+#: ../pidgin/gtkdialogs.c:132 ../pidgin/gtkdialogs.c:210
+#: ../pidgin/gtkdialogs.c:211
 msgid "Catalan"
 msgstr "瘜圈"
 
 # NOTE 渲陌胯血怨正鈭撘瘜圈嚗雿甇撣貊急舐湔亙神血怨正鈭隤(Valencian)
-#: ../pidgin/gtkdialogs.c:131 ../pidgin/gtkdialogs.c:132
+#: ../pidgin/gtkdialogs.c:133 ../pidgin/gtkdialogs.c:134
 msgid "Valencian-Catalan"
 msgstr "血怨正鈭"
 
-#: ../pidgin/gtkdialogs.c:133 ../pidgin/gtkdialogs.c:208
+#: ../pidgin/gtkdialogs.c:135 ../pidgin/gtkdialogs.c:212
 msgid "Czech"
 msgstr "瑕"
 
-#: ../pidgin/gtkdialogs.c:134 ../pidgin/gtkdialogs.c:135
+#: ../pidgin/gtkdialogs.c:136 ../pidgin/gtkdialogs.c:137
 msgid "Danish"
 msgstr "銝寥漸"
 
-#: ../pidgin/gtkdialogs.c:136 ../pidgin/gtkdialogs.c:137
-#: ../pidgin/gtkdialogs.c:209
+#: ../pidgin/gtkdialogs.c:138 ../pidgin/gtkdialogs.c:139
+#: ../pidgin/gtkdialogs.c:213
 msgid "German"
 msgstr "敺瑟"
 
 # NOTE 胯銝銝嫘嚗銝剛陌靘銝靘隤
-#: ../pidgin/gtkdialogs.c:138 ../pidgin/gtkdialogs.c:139
-#: ../pidgin/gtkdialogs.c:140
+# NOTE 閬 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=D
+#: ../pidgin/gtkdialogs.c:140 ../pidgin/gtkdialogs.c:141
+#: ../pidgin/gtkdialogs.c:142
 msgid "Dzongkha"
 msgstr "銝銝寞"
 
-#: ../pidgin/gtkdialogs.c:141 ../pidgin/gtkdialogs.c:142
+#: ../pidgin/gtkdialogs.c:143 ../pidgin/gtkdialogs.c:144
 msgid "Greek"
 msgstr "撣"
 
-#: ../pidgin/gtkdialogs.c:143
+#: ../pidgin/gtkdialogs.c:145
 msgid "Australian English"
 msgstr "瞉單散撘望"
 
-#: ../pidgin/gtkdialogs.c:144
+#: ../pidgin/gtkdialogs.c:146
 msgid "Canadian English"
 msgstr "踹之撘望"
 
-#: ../pidgin/gtkdialogs.c:145
+#: ../pidgin/gtkdialogs.c:147
 msgid "British English"
 msgstr "勗望"
 
 #  XXX 撖思舀嚗銝航嚗雿撖血函臬末瘝鈭箏神銝 - Ambrose
-#: ../pidgin/gtkdialogs.c:146
+#: ../pidgin/gtkdialogs.c:148
 msgid "Esperanto"
 msgstr "銝隤"
 
-#: ../pidgin/gtkdialogs.c:147 ../pidgin/gtkdialogs.c:210
-#: ../pidgin/gtkdialogs.c:211 ../pidgin/gtkdialogs.c:212
-#: ../pidgin/gtkdialogs.c:213
+#: ../pidgin/gtkdialogs.c:149 ../pidgin/gtkdialogs.c:214
+#: ../pidgin/gtkdialogs.c:215 ../pidgin/gtkdialogs.c:216
+#: ../pidgin/gtkdialogs.c:217
 msgid "Spanish"
 msgstr "镼輻剔"
 
-#: ../pidgin/gtkdialogs.c:148 ../pidgin/gtkdialogs.c:149
+#: ../pidgin/gtkdialogs.c:150 ../pidgin/gtkdialogs.c:151
 msgid "Euskera(Basque)"
 msgstr "撌湔臬"
 
-#: ../pidgin/gtkdialogs.c:150 ../pidgin/gtkdialogs.c:151
-#: ../pidgin/gtkdialogs.c:152
+#: ../pidgin/gtkdialogs.c:152 ../pidgin/gtkdialogs.c:153
+#: ../pidgin/gtkdialogs.c:154
 msgid "Persian"
 msgstr "瘜X舀"
 
-#: ../pidgin/gtkdialogs.c:153 ../pidgin/gtkdialogs.c:214
-#: ../pidgin/gtkdialogs.c:215
+#: ../pidgin/gtkdialogs.c:155 ../pidgin/gtkdialogs.c:218
+#: ../pidgin/gtkdialogs.c:219
 msgid "Finnish"
 msgstr "祈剜"
 
-#: ../pidgin/gtkdialogs.c:154 ../pidgin/gtkdialogs.c:216
-#: ../pidgin/gtkdialogs.c:217 ../pidgin/gtkdialogs.c:218
-#: ../pidgin/gtkdialogs.c:219
+#: ../pidgin/gtkdialogs.c:156 ../pidgin/gtkdialogs.c:220
+#: ../pidgin/gtkdialogs.c:221 ../pidgin/gtkdialogs.c:222
+#: ../pidgin/gtkdialogs.c:223
 msgid "French"
 msgstr "瘜"
 
-#: ../pidgin/gtkdialogs.c:155
+#  NOTE 閬 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=G&page=1
+#: ../pidgin/gtkdialogs.c:157
 msgid "Galician"
 msgstr "镼蹂"
 
-#: ../pidgin/gtkdialogs.c:156 ../pidgin/gtkdialogs.c:157
+#  NOTE 閬 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=G&page=2
+#: ../pidgin/gtkdialogs.c:158 ../pidgin/gtkdialogs.c:159
 msgid "Gujarati"
 msgstr "文寞"
 
-#: ../pidgin/gtkdialogs.c:158 ../pidgin/gtkdialogs.c:220
+#: ../pidgin/gtkdialogs.c:159
+msgid "Gujarati Language Team"
+msgstr "文寞蝧餉陌撠蝯"
+
+#: ../pidgin/gtkdialogs.c:160 ../pidgin/gtkdialogs.c:224
 msgid "Hebrew"
 msgstr "撣隡臭"
 
-#: ../pidgin/gtkdialogs.c:159
+#  NOTE 閬 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=H
+#: ../pidgin/gtkdialogs.c:161
 msgid "Hindi"
-msgstr "啣漲"
-
-#: ../pidgin/gtkdialogs.c:160
+msgstr "啣漲"
+
+#: ../pidgin/gtkdialogs.c:162
 msgid "Hungarian"
 msgstr "拇"
 
-#: ../pidgin/gtkdialogs.c:161
+#: ../pidgin/gtkdialogs.c:163
 msgid "Indonesian"
 msgstr "啣側"
 
@@ -12795,41 +12816,53 @@
 #  NOTE 隤餉脖圈踝撱梯店抵脣餌詨榆箇蝬脩撖怒憭批押嚗
 #  NOTE 箇銝剖詨憿瘜鈭行憭批押璇嚗霅胯憭批押閰脫頛憟賬
 #  NOTE閬Slovenian
-#: ../pidgin/gtkdialogs.c:162 ../pidgin/gtkdialogs.c:221
+#  NOTE 閮鳴 zh_TW  zh_HK 甇撘摰塚啣霅舀蝢拙之押
+#: ../pidgin/gtkdialogs.c:164 ../pidgin/gtkdialogs.c:225
 msgid "Italian"
 msgstr "憭批拇"
 
-#: ../pidgin/gtkdialogs.c:163 ../pidgin/gtkdialogs.c:222
-#: ../pidgin/gtkdialogs.c:223 ../pidgin/gtkdialogs.c:224
+#: ../pidgin/gtkdialogs.c:165 ../pidgin/gtkdialogs.c:226
+#: ../pidgin/gtkdialogs.c:227 ../pidgin/gtkdialogs.c:228
 msgid "Japanese"
 msgstr "交"
 
-#: ../pidgin/gtkdialogs.c:164 ../pidgin/gtkdialogs.c:225
+#: ../pidgin/gtkdialogs.c:166 ../pidgin/gtkdialogs.c:229
 msgid "Georgian"
 msgstr "祆祥鈭"
 
-# NOTE: 涔DE霅舀嚗銋閬澆啁憭批飛蝬脩 :P
-#: ../pidgin/gtkdialogs.c:165
+# FIXME 臭誑霅臬末銝暺 20070520 acli
+#: ../pidgin/gtkdialogs.c:166
+msgid "Ubuntu Georgian Translators"
+msgstr "Ubuntu 銝祆祥鈭蝧餉陌鈭箏"
+
+# NOTE 閬 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=K
+# NOTE 閮鳴KDE 霅胯蝝
+#: ../pidgin/gtkdialogs.c:167
 msgid "Kannada"
-msgstr "蝝"
-
-#: ../pidgin/gtkdialogs.c:166 ../pidgin/gtkdialogs.c:226
+msgstr "摨瑞"
+
+#: ../pidgin/gtkdialogs.c:167
+msgid "Kannada Translation team"
+msgstr "摨瑞蝧餉陌撠蝯"
+
+#: ../pidgin/gtkdialogs.c:168 ../pidgin/gtkdialogs.c:230
 msgid "Korean"
 msgstr ""
 
-# NOTE 啗陌摨怠噸嚗皜航陌摨怎曉噸嚗雿啁踹銋具摨怎曉噸嚗摨怎曉噸頛憟
-#: ../pidgin/gtkdialogs.c:167 ../pidgin/gtkdialogs.c:168
-#: ../pidgin/gtkdialogs.c:169
+#  NOTE 皜航陌芣摨怎曉噸嚗啗陌摨怠噸嚗璅皞霅舀嚗靘鈭西撣貉嚗摨怎曉噸
+#  NOTE 閮鳴 zh_TW  zh_HK 甇撘摰塚靽啣霅舀摨怠噸
+#: ../pidgin/gtkdialogs.c:169 ../pidgin/gtkdialogs.c:170
+#: ../pidgin/gtkdialogs.c:171
 msgid "Kurdish"
-msgstr "摨怎曉噸"
-
-#: ../pidgin/gtkdialogs.c:170 ../pidgin/gtkdialogs.c:227
-#: ../pidgin/gtkdialogs.c:228
+msgstr "摨怠噸"
+
+#: ../pidgin/gtkdialogs.c:172 ../pidgin/gtkdialogs.c:231
+#: ../pidgin/gtkdialogs.c:232
 msgid "Lithuanian"
 msgstr "蝡嗅"
 
 #  NOTE擐砍園臭蝔格望隤嚗頝撣擐砍園銝衣⊿靽
-#: ../pidgin/gtkdialogs.c:171
+#: ../pidgin/gtkdialogs.c:173
 msgid "Macedonian"
 msgstr "擐砍園"
 
@@ -12837,234 +12870,242 @@
 #  NOTE 唾陌穿擐祉整瘜W暺整撣怎整撌游
 #  NOTE 嗡霅舀穿銝寥漸嚗芸嚗憭扯梁曄嚗銝寥漸撘芸嚗蝬剖箇曄嚗望芸璅皞芸嚗找舀皞嚗憭 :P嚗
 #  NOTE 霅舫喃祆曉具芸敺砍憫改銋銝冽砍憫霅舫單曉具芸銋
-#  XXX 急霅舀芸撣怎暹
-#: ../pidgin/gtkdialogs.c:172
+#  NOTE ∠具璅皞銝閰嚗閬 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=N&page=2
+#: ../pidgin/gtkdialogs.c:174
 msgid "Bokm疇l Norwegian"
-msgstr "芸撣怎暹"
-
-#: ../pidgin/gtkdialogs.c:173
+msgstr "璅皞芸"
+
+#: ../pidgin/gtkdialogs.c:175
 msgid "Nepali"
 msgstr "撠潭暹"
 
 # NOTE Flemish 霅舀航鈭http://www.ee.tku.edu.tw/~rexchen/cdict/
 # XXX Dutch  Flemish 臬銝蝔株閮嚗臬行閰脣芸神瑁剜嚗芸颯瘜剖噸舀嚗
-#: ../pidgin/gtkdialogs.c:174
+#: ../pidgin/gtkdialogs.c:176
 msgid "Dutch, Flemish"
 msgstr "瑁剜嚗瘜剖噸舀"
 
-#: ../pidgin/gtkdialogs.c:175
+#  NOTE 胯nn蝣潘喋Nynorsk Norwegian嚗隞亦渲陌芸銝虫啁
+#: ../pidgin/gtkdialogs.c:177
 msgid "Norwegian"
-msgstr "芸"
-
-#: ../pidgin/gtkdialogs.c:176 ../pidgin/gtkdialogs.c:177
-#: ../pidgin/gtkdialogs.c:178 ../pidgin/gtkdialogs.c:229
+msgstr "唳芸"
+
+#: ../pidgin/gtkdialogs.c:178 ../pidgin/gtkdialogs.c:179
+#: ../pidgin/gtkdialogs.c:180 ../pidgin/gtkdialogs.c:233
 msgid "Polish"
 msgstr "瘜Z剜"
 
-#: ../pidgin/gtkdialogs.c:179
+#: ../pidgin/gtkdialogs.c:181
 msgid "Portuguese"
 msgstr "璅皞"
 
-#: ../pidgin/gtkdialogs.c:180
+#: ../pidgin/gtkdialogs.c:182
 msgid "Portuguese-Brazil"
 msgstr "撌渲正"
 
-#  XXX 憭批飛隢霅舀
-#: ../pidgin/gtkdialogs.c:181
+#  NOTE桐其圈賜靘航甇撣貊霅舀
+#  NOTE 閬 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=P&page=2
+#: ../pidgin/gtkdialogs.c:183
 msgid "Pashto"
-msgstr "撌湔臬 (Pashto)"
-
-#: ../pidgin/gtkdialogs.c:182
+msgstr "桐"
+
+#: ../pidgin/gtkdialogs.c:184
 msgid "Romanian"
 msgstr "蝢擐砍側鈭"
 
-#: ../pidgin/gtkdialogs.c:183 ../pidgin/gtkdialogs.c:230
-#: ../pidgin/gtkdialogs.c:231
+#: ../pidgin/gtkdialogs.c:185 ../pidgin/gtkdialogs.c:234
+#: ../pidgin/gtkdialogs.c:235
 msgid "Russian"
 msgstr "靽"
 
-#: ../pidgin/gtkdialogs.c:184 ../pidgin/gtkdialogs.c:232
-#: ../pidgin/gtkdialogs.c:233 ../pidgin/gtkdialogs.c:234
+#: ../pidgin/gtkdialogs.c:186 ../pidgin/gtkdialogs.c:187
+#: ../pidgin/gtkdialogs.c:236 ../pidgin/gtkdialogs.c:237
+#: ../pidgin/gtkdialogs.c:238
 msgid "Slovak"
 msgstr "舀隡"
 
-#: ../pidgin/gtkdialogs.c:185
-msgid "Slovack"
-msgstr "舀隡"
-
 #  NOTE 皜航陌舀撠潔嚗箄陌舀蝬剖側鈭蝎菔摮綽憮韏琿喉
 #  NOTE 隞亦眶隤潮喉頝箄陌潮唾皞嚗瘜銝嚗喳蝢拐銋砧h_TW嚗
 #  NOTE 隞乩頝皜航陌嚗嗅祕臬之貉陌瘜嚗嚗頝箄陌
 #  NOTE閬Italian
-#: ../pidgin/gtkdialogs.c:186 ../pidgin/gtkdialogs.c:235
+#: ../pidgin/gtkdialogs.c:188 ../pidgin/gtkdialogs.c:239
 msgid "Slovenian"
-msgstr "舀蝬剖側鈭"
-
-#: ../pidgin/gtkdialogs.c:187
+msgstr "舀撠潔"
+
+#: ../pidgin/gtkdialogs.c:189
 msgid "Albanian"
 msgstr "輻曉毀撠潔"
 
-#: ../pidgin/gtkdialogs.c:188 ../pidgin/gtkdialogs.c:189
+#: ../pidgin/gtkdialogs.c:190 ../pidgin/gtkdialogs.c:191
 msgid "Serbian"
 msgstr "憛曄雁鈭"
 
-#: ../pidgin/gtkdialogs.c:190 ../pidgin/gtkdialogs.c:236
+#: ../pidgin/gtkdialogs.c:192 ../pidgin/gtkdialogs.c:240
 msgid "Swedish"
 msgstr "豢"
 
-# NOTE 皜航陌瘜啁掖整
-#: ../pidgin/gtkdialogs.c:191
+# NOTE 閬 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=T
+# NOTE 皜臭祈陌瘜啁掖整嚗唬祈陌憛蝐喟整嚗靘頛撣貉嚗瘜啁掖整
+#: ../pidgin/gtkdialogs.c:193
 msgid "Tamil"
-msgstr "憛蝐喟暹"
-
-#: ../pidgin/gtkdialogs.c:192
+msgstr "瘜啁掖暹"
+
+# NOTE 閬 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=T
+#: ../pidgin/gtkdialogs.c:194
 msgid "Telugu"
-msgstr "寥陌箸"
-
-#: ../pidgin/gtkdialogs.c:193
+msgstr "敺瑟憡"
+
+#: ../pidgin/gtkdialogs.c:195
 msgid "Thai"
 msgstr "瘜唳"
 
-#: ../pidgin/gtkdialogs.c:194
+#: ../pidgin/gtkdialogs.c:196
 msgid "Turkish"
 msgstr "喳嗆"
 
-#: ../pidgin/gtkdialogs.c:195
+#: ../pidgin/gtkdialogs.c:197
 msgid "Vietnamese"
 msgstr "頞"
 
-#: ../pidgin/gtkdialogs.c:195
+#: ../pidgin/gtkdialogs.c:197
 msgid "T.M.Thanh and the Gnome-Vi Team"
 msgstr "T.M.Thanh  Gnome 頞蝧餉陌撠蝯銋嗡蝯"
 
-#: ../pidgin/gtkdialogs.c:196 ../pidgin/gtkdialogs.c:237
+#: ../pidgin/gtkdialogs.c:198 ../pidgin/gtkdialogs.c:241
 msgid "Simplified Chinese"
 msgstr "蝪⊿銝剜"
 
-#: ../pidgin/gtkdialogs.c:197 ../pidgin/gtkdialogs.c:198
-#: ../pidgin/gtkdialogs.c:238
+#: ../pidgin/gtkdialogs.c:199 ../pidgin/gtkdialogs.c:200
+msgid "Hong Kong Chinese"
+msgstr "皜臬銝剜"
+
+#: ../pidgin/gtkdialogs.c:201 ../pidgin/gtkdialogs.c:202
+#: ../pidgin/gtkdialogs.c:242
 msgid "Traditional Chinese"
 msgstr "甇擃銝剜"
 
-# XXX Yahoo霅舀
-#: ../pidgin/gtkdialogs.c:204
+# NOTE 閬 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=A
+#: ../pidgin/gtkdialogs.c:208
 msgid "Amharic"
 msgstr "踹"
 
-#: ../pidgin/gtkdialogs.c:323
+#: ../pidgin/gtkdialogs.c:327
 #, c-format
 msgid "About %s"
 msgstr " %s"
 
-#: ../pidgin/gtkdialogs.c:359
-#, c-format
-msgid ""
-"%s is a modular messaging client capable of using AIM, MSN, Yahoo!, Jabber, "
-"ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, Bonjour, "
-"Zephyr, Gadu-Gadu, and QQ all at once.  It is written using GTK+.<BR><BR>You "
-"may modify and redistribute the program under the terms of the GPL (version "
-"2 or later).  A copy of the GPL is contained in the 'COPYING' file "
-"distributed with %s.  %s is copyrighted by its contributors.  See the "
-"'COPYRIGHT' file for the complete list of contributors.  We provide no "
-"warranty for this program.<BR><BR>"
-msgstr ""
-"%s 靽銝隞 GTK+ 潛璅∠閮舐撘嚗靘 AIMMSNYahoo!Jabber"
-"ICQIRCSILCSIP/SIMPLENovell GroupWiseLotus SametimeBonjour"
-"ZephyrGadu-Gadu  QQ 蝑賬<BR><BR>交典靽格寞潔蝔撘嚗芷"
-" GPL嚗蝚砌隞颱隞亙穿璇甈曉喳荔%s 批歇銝隞 GPL, 園典"
-"COPYING瑼獢銋扼%s 靽甈雿嚗甈甇詨券刻甜餉勗嚗鞎Y餉"
-"閰喳典箝COPYRIGHT瑼獢扼祉撘銝靘隞颱靽具<BR><BR>"
-
-#: ../pidgin/gtkdialogs.c:374
+#: ../pidgin/gtkdialogs.c:365
+#, c-format
+msgid ""
+"%s is a graphical modular messaging client based on libpurple which is "
+"capable of connecting to AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, "
+"Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, Gadu-Gadu, and QQ all at "
+"once.  It is written using GTK+.<BR><BR>You may modify and redistribute the "
+"program under the terms of the GPL (version 2 or later).  A copy of the GPL "
+"is contained in the 'COPYING' file distributed with %s.  %s is copyrighted "
+"by its contributors.  See the 'COPYRIGHT' file for the complete list of "
+"contributors.  We provide no warranty for this program.<BR><BR>"
+msgstr ""
+"%s 靽銝隞 GTK+ 潘敶VW璅∠閮舐撘嚗隞 libpurple 箏箇嚗"
+"靘 AIMMSNYahoo!XMPPICQIRCSILCSIP/SIMPLENovell GroupWise"
+"Lotus SametimeBonjourZephyrGadu-Gadu  QQ 蝑賬<BR><BR>交典靽"
+"寞潔蝔撘嚗芷 GPL嚗隞餅蝚砌頛啁嗡穿璇甈曉喳荔%s "
+"撌脤銝隞 GPL, 園典箝COPYING瑼獢銋扼%s 靽甈雿嚗甈甇詨"
+"刻甜餉勗嚗鞎Y餉喳閰喳典箝COPYRIGHT瑼獢扼祉撘銝靘隞"
+"雿靽具<BR><BR>"
+
+#: ../pidgin/gtkdialogs.c:381
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin-win32 on irc.freenode.net<BR><BR>"
 msgstr ""
 "<FONT SIZE=\"4\">IRC:</FONT> irc.freenode.net 銝 #pidgin-win32 駁<BR><BR>"
 
-#: ../pidgin/gtkdialogs.c:377
+#: ../pidgin/gtkdialogs.c:384
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin on irc.freenode.net<BR><BR>"
 msgstr ""
 "<FONT SIZE=\"4\">IRC:</FONT> irc.freenode.net 銝 #pidgin 駁<BR><BR>"
 
-#: ../pidgin/gtkdialogs.c:383
+#: ../pidgin/gtkdialogs.c:390
 msgid "Current Developers"
 msgstr "曆遙潸"
 
 # NOTE LSchiere2: wing: it means they must be crazy or they wouldn't work on gaim ;-)
 # NOTE Luke Schierer 隤:鈭鈭箔舐鈭嚗血銝 gaim 鞈
-# NOTE 銝嚗蝧餅梁璅∠雿瘥頛憟
-#: ../pidgin/gtkdialogs.c:398
+# NOTE 隞交迤蝣箇霅舀胯脩璅∠雿璅∠脖銋憿色
+# NOTE 銝璅憟賢暺隞踝隞亦蕃梁璅∠雿瘥頛憟 :P
+#: ../pidgin/gtkdialogs.c:405
 msgid "Crazy Patch Writers"
 msgstr "梁璅∠雿"
 
-#: ../pidgin/gtkdialogs.c:413
+#: ../pidgin/gtkdialogs.c:420
 msgid "Retired Developers"
 msgstr "隞駁潸"
 
-#: ../pidgin/gtkdialogs.c:428
+#  NOTE 航陌蝢撌乩犖∼嚗雿臬靽摰霅舀嚗Pidgin  Artist 臬閮剛蝷箝唳渡隞Y蝑鈭敺撌乩鈭綽隞亙憿舀胯閮剛∼
+#: ../pidgin/gtkdialogs.c:435
 msgid "Artists"
-msgstr "蝢撌乩犖"
-
-#: ../pidgin/gtkdialogs.c:443
+msgstr "撟喲Z身閮"
+
+#: ../pidgin/gtkdialogs.c:450
 msgid "Current Translators"
 msgstr "曆遙霅航"
 
-#: ../pidgin/gtkdialogs.c:463
+#: ../pidgin/gtkdialogs.c:470
 msgid "Past Translators"
 msgstr "隞餉陌"
 
 # NOTE 胯 Pidgin閬蝒銝哨敺箇橘其雿日舐函蝔株閮嚗銝質陌閮胯
-#: ../pidgin/gtkdialogs.c:481
+#: ../pidgin/gtkdialogs.c:488
 msgid "Debugging Information"
 msgstr "日臬刻閮"
 
-#: ../pidgin/gtkdialogs.c:855
+#: ../pidgin/gtkdialogs.c:857
 msgid "Get User Info"
 msgstr "敺雿輻刻鞈閮"
 
-#: ../pidgin/gtkdialogs.c:857
+#: ../pidgin/gtkdialogs.c:859
 msgid ""
 "Please enter the screen name or alias of the person whose info you would "
 "like to view."
 msgstr "隢頛詨交冽唾亥岷撠鞊∠撣唾"
 
-#: ../pidgin/gtkdialogs.c:946
+#: ../pidgin/gtkdialogs.c:949
 msgid "View User Log"
 msgstr "閫雿輻刻亥"
 
-#: ../pidgin/gtkdialogs.c:948
+#: ../pidgin/gtkdialogs.c:951
 msgid ""
 "Please enter the screen name or alias of the person whose log you would like "
 "to view."
 msgstr "隢頛詨交冽唾霈亥雿輻刻撣唾亙"
 
 # XXX 銝剜霅舀⊥亙箝Alias BuddyAlias Contact
-#: ../pidgin/gtkdialogs.c:967
+#: ../pidgin/gtkdialogs.c:971
 msgid "Alias Contact"
 msgstr "粹蝯憟賢銝亙"
 
 # XXX 銝剜霅舀⊥亙箝Alias BuddyAlias Contact
-#: ../pidgin/gtkdialogs.c:968
+#: ../pidgin/gtkdialogs.c:972
 msgid "Enter an alias for this contact."
 msgstr "隢粹蝯憟賢頛詨乩亙"
 
-#: ../pidgin/gtkdialogs.c:988
+#: ../pidgin/gtkdialogs.c:994
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "隢 %s 頛詨乩亙"
 
-#: ../pidgin/gtkdialogs.c:990
+#: ../pidgin/gtkdialogs.c:996
 msgid "Alias Buddy"
 msgstr "粹憟賢銝亙"
 
-#: ../pidgin/gtkdialogs.c:1009
+#: ../pidgin/gtkdialogs.c:1017
 msgid "Alias Chat"
 msgstr "蝯西憭拙恕孵亙"
 
-#: ../pidgin/gtkdialogs.c:1010
+#: ../pidgin/gtkdialogs.c:1018
 msgid "Enter an alias for this chat."
 msgstr "隢粹憭拙恕頛詨乩亙"
 
-#: ../pidgin/gtkdialogs.c:1047
+#: ../pidgin/gtkdialogs.c:1057
 #, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddy from "
@@ -13073,82 +13114,82 @@
 "You are about to remove the contact containing %s and %d other buddies from "
 "your buddy list.  Do you want to continue?"
 msgstr[0] ""
-"冽迤閰西撠憟賢 %s 賊嗡 %d 憟賢敺函憟賢皜桐葉蝘駁扎刻蝜潛"
-"雿嚗"
+"冽迤典閰血憟賢 %s 賊嗡 %d 憟賢敺函憟賢皜桐葉蝘駁扎刻蝜潛"
+"雿嚗"
 msgstr[1] ""
-"冽迤閰西撠憟賢 %s 賊嗡 %d 憟賢敺函憟賢皜桐葉蝘駁扎刻蝜潛"
-"雿嚗"
+"冽迤典閰血憟賢 %s 賊嗡 %d 憟賢敺函憟賢皜桐葉蝘駁扎刻蝜潛"
+"雿嚗"
 
 # XXXRemove BuddyRemove Contact其葉Pidgin⊥伐航賣寥脩蝛粹
-#: ../pidgin/gtkdialogs.c:1055
+#: ../pidgin/gtkdialogs.c:1065
 msgid "Remove Contact"
 msgstr "蝘駁日蝯憟賢"
 
 # XXXRemove BuddyRemove Contact其葉Pidgin⊥伐航賣寥脩蝛粹
-#: ../pidgin/gtkdialogs.c:1056
+#: ../pidgin/gtkdialogs.c:1068
 msgid "_Remove Contact"
 msgstr "蝘駁方舐窗鈭(_R)"
 
 # TODO 霅舀敺寥 - 20061025
-#: ../pidgin/gtkdialogs.c:1086
+#: ../pidgin/gtkdialogs.c:1099
 #, c-format
 msgid ""
 "You are about to merge the group called %s into the group called %s. Do you "
 "want to continue?"
-msgstr "冽迤閰西撠蝢斤 %s  %s 雿蛛啁黎蝯隞亙賢刻蝜潛雿嚗"
-
-#: ../pidgin/gtkdialogs.c:1093
+msgstr "冽迤典閰血蝢斤 %s  %s 雿蛛啁黎蝯隞亙賢刻蝜潛雿嚗"
+
+#: ../pidgin/gtkdialogs.c:1106
 msgid "Merge Groups"
 msgstr "雿萇黎蝯"
 
-#: ../pidgin/gtkdialogs.c:1094
+#: ../pidgin/gtkdialogs.c:1109
 msgid "_Merge Groups"
 msgstr "雿萇黎蝯(_M)"
 
-#: ../pidgin/gtkdialogs.c:1144
+#: ../pidgin/gtkdialogs.c:1159
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
 "list.  Do you want to continue?"
 msgstr ""
-"冽迤閰西撠蝢斤 %s 賊∪函憟賢皜桐葉蝘駁扎刻蝜潛雿嚗"
-
-#: ../pidgin/gtkdialogs.c:1147
+"冽迤典閰血蝢斤 %s 賊∪函憟賢皜桐葉蝘駁扎刻蝜潛雿嚗"
+
+#: ../pidgin/gtkdialogs.c:1162
 msgid "Remove Group"
 msgstr "蝘駁斤黎蝯"
 
-#: ../pidgin/gtkdialogs.c:1148
+#: ../pidgin/gtkdialogs.c:1165
 msgid "_Remove Group"
 msgstr "蝘駁斤黎蝯(_R)"
 
-#: ../pidgin/gtkdialogs.c:1181
+#: ../pidgin/gtkdialogs.c:1198
 #, c-format
 msgid ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
-msgstr "冽迤閰西撠 %s  敺函憟賢皜桐葉蝘駁扎刻蝜潛雿嚗"
+msgstr "冽迤典閰血 %s  敺函憟賢皜桐葉蝘駁扎刻蝜潛雿嚗"
 
 # XXXRemove BuddyRemove Contact其葉Pidgin⊥伐航賣寥脩蝛粹
-#: ../pidgin/gtkdialogs.c:1184
+#: ../pidgin/gtkdialogs.c:1201
 msgid "Remove Buddy"
 msgstr "蝘駁日憟賢"
 
 # XXXRemove BuddyRemove Contact其葉Pidgin⊥伐航賣寥脩蝛粹
-#: ../pidgin/gtkdialogs.c:1185
+#: ../pidgin/gtkdialogs.c:1204
 msgid "_Remove Buddy"
 msgstr "蝘駁日憟賢(_R)"
 
-#: ../pidgin/gtkdialogs.c:1206
+#: ../pidgin/gtkdialogs.c:1225
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
 "continue?"
-msgstr "冽迤閰西撠 %s 敺函憟賢皜桐葉蝘駁扎刻蝜潛雿嚗"
-
-#: ../pidgin/gtkdialogs.c:1209
+msgstr "冽迤典閰血 %s 敺函憟賢皜桐葉蝘駁扎刻蝜潛雿嚗"
+
+#: ../pidgin/gtkdialogs.c:1228
 msgid "Remove Chat"
 msgstr "蝘駁方憭拙恕"
 
-#: ../pidgin/gtkdialogs.c:1210
+#: ../pidgin/gtkdialogs.c:1231
 msgid "_Remove Chat"
 msgstr "蝘駁方憭拙恕(_R)"
 
@@ -13157,37 +13198,34 @@
 msgid "Right-click for more unread messages...\n"
 msgstr "喲萎誑霈芾閮...\n"
 
-#: ../pidgin/gtkdocklet.c:443
+#: ../pidgin/gtkdocklet.c:435
 msgid "Change Status"
 msgstr "霈渡"
 
-#: ../pidgin/gtkdocklet.c:495
+#: ../pidgin/gtkdocklet.c:487
 msgid "Show Buddy List"
 msgstr "憿舐內憟賢皜"
 
-#: ../pidgin/gtkdocklet.c:521
+#: ../pidgin/gtkdocklet.c:513
 msgid "New Message..."
 msgstr "啗..."
 
-#: ../pidgin/gtkdocklet.c:536
+#: ../pidgin/gtkdocklet.c:528
 msgid "Mute Sounds"
 msgstr ""
 
-#: ../pidgin/gtkdocklet.c:543
+#: ../pidgin/gtkdocklet.c:535
 msgid "Blink on new message"
 msgstr "啗舀"
 
-#. TODO: need a submenu to change status, this needs to "link"
-#. * to the status in the buddy list gtkstatusbox
-#.
-#: ../pidgin/gtkdocklet.c:554
+#: ../pidgin/gtkdocklet.c:542
 msgid "Quit"
 msgstr "蝯蝔撘"
 
-#  XXX 憭芸芯 (^^;)
+#  NOTE 舀芷憪唾撓瑼獢嚗銝胯芸
 #: ../pidgin/gtkft.c:153
 msgid "Not started"
-msgstr "芸"
+msgstr "芷憪"
 
 # XXX 怨陌
 #: ../pidgin/gtkft.c:273
@@ -13267,7 +13305,7 @@
 msgstr "瑼獢唾撓蝝啁(_D)"
 
 #. Pause button
-#: ../pidgin/gtkft.c:835 ../pidgin/pidginstock.c:96
+#: ../pidgin/gtkft.c:835 ../pidgin/pidginstock.c:89
 msgid "_Pause"
 msgstr "怠(_P)"
 
@@ -13277,11 +13315,11 @@
 msgstr "W儔(_R)"
 
 #  NOTE Nautilus霅胯鞎潔研嚗Abiword霅胯芣澆鞎潔嚗賭賣鈭
-#: ../pidgin/gtkimhtml.c:793
+#: ../pidgin/gtkimhtml.c:792
 msgid "Paste as Plain _Text"
 msgstr "鞎潔蝝摮(_T)"
 
-#: ../pidgin/gtkimhtml.c:810
+#: ../pidgin/gtkimhtml.c:809
 msgid "_Reset formatting"
 msgstr "皜斗澆(_R)"
 
@@ -13314,7 +13352,7 @@
 msgstr "銴鋆賡蝯雿(_C)"
 
 # NOTE "Defaulting to PNG" 舀 gaim 函∟舀賜瘜銝脩敶勗 PNG 澆
-#: ../pidgin/gtkimhtml.c:3271
+#: ../pidgin/gtkimhtml.c:3211
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -13325,7 +13363,7 @@
 "思嗆 PNG 瑼"
 
 # NOTE "Defaulting to PNG" 舀 gaim 函∟舀賜瘜銝脩敶勗 PNG 澆
-#: ../pidgin/gtkimhtml.c:3274
+#: ../pidgin/gtkimhtml.c:3214
 msgid ""
 "Unrecognized file type\n"
 "\n"
@@ -13335,7 +13373,7 @@
 "\n"
 "思嗆 PNG 瑼"
 
-#: ../pidgin/gtkimhtml.c:3287
+#: ../pidgin/gtkimhtml.c:3227
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -13346,7 +13384,7 @@
 "\n"
 "%s"
 
-#: ../pidgin/gtkimhtml.c:3290
+#: ../pidgin/gtkimhtml.c:3230
 #, c-format
 msgid ""
 "Error saving image\n"
@@ -13357,11 +13395,11 @@
 "\n"
 "%s"
 
-#: ../pidgin/gtkimhtml.c:3370 ../pidgin/gtkimhtml.c:3382
+#: ../pidgin/gtkimhtml.c:3310 ../pidgin/gtkimhtml.c:3322
 msgid "Save Image"
 msgstr "脣敶勗"
 
-#: ../pidgin/gtkimhtml.c:3410
+#: ../pidgin/gtkimhtml.c:3350
 msgid "_Save Image..."
 msgstr "脣敶勗(_S)..."
 
@@ -13472,21 +13510,21 @@
 msgstr "亥”"
 
 #  XXX 銝 - ambrose 20070415
-#: ../pidgin/gtklog.c:262
+#: ../pidgin/gtklog.c:267
 #, c-format
 msgid ""
 "Are you sure you want to permanently delete the log of the conversation with "
 "%s which started at %s?"
 msgstr "函Ⅱ摰刻芷斤%2$s憪閮嚗 %1$s 鈭方亥嚗"
 
-#: ../pidgin/gtklog.c:273
+#: ../pidgin/gtklog.c:278
 #, c-format
 msgid ""
 "Are you sure you want to permanently delete the log of the conversation in %"
 "s which started at %s?"
 msgstr "函Ⅱ摰刻芷斤%2$s憪閮嚗刻憭拙恕%1$s鈭方亥嚗"
 
-#: ../pidgin/gtklog.c:278
+#: ../pidgin/gtklog.c:283
 #, c-format
 msgid ""
 "Are you sure you want to permanently delete the system log which started at %"
@@ -13494,22 +13532,22 @@
 msgstr "函Ⅱ摰刻芷斤%s憪閮蝟餌絞亥嚗"
 
 #  NOTE 蝚砌 %s 航憭拙恕蝔梧蝚砌 %s 舀
-#: ../pidgin/gtklog.c:419
+#: ../pidgin/gtklog.c:427
 #, c-format
 msgid "<span size='larger' weight='bold'>Conversation in %s on %s</span>"
 msgstr "<span size='larger' weight='bold'>%s %s 鈭方</span>"
 
 #  NOTE 蝚砌 %s 航舐窗鈭箏蝔梧蝚砌 %s 舀
-#: ../pidgin/gtklog.c:422
+#: ../pidgin/gtklog.c:430
 #, c-format
 msgid "<span size='larger' weight='bold'>Conversation with %s on %s</span>"
 msgstr "<span size='larger' weight='bold'>%s %s 鈭方</span>"
 
-#: ../pidgin/gtklog.c:469
+#: ../pidgin/gtklog.c:477
 msgid "%B %Y"
 msgstr "%Y撟%m"
 
-#: ../pidgin/gtklog.c:516
+#: ../pidgin/gtklog.c:524
 msgid ""
 "System events will only be logged if the \"Log all status changes to system "
 "log\" preference is enabled."
@@ -13517,51 +13555,51 @@
 "芣具閮寡喟頂蝯望亥賊鋡怠嚗蝟餌絞鈭隞嗆鋡怨啁頂蝯望"
 "隤銝准"
 
-#: ../pidgin/gtklog.c:520
+#: ../pidgin/gtklog.c:528
 msgid ""
 "Instant messages will only be logged if the \"Log all instant messages\" "
 "preference is enabled."
 msgstr "單閮臬芣具閮單閮胯賊鋡恍鋡怨"
 
-#: ../pidgin/gtklog.c:523
+#: ../pidgin/gtklog.c:531
 msgid ""
 "Chats will only be logged if the \"Log all chats\" preference is enabled."
 msgstr "憭拙恕批捆撠芣具閮憭拙恕賊鋡怠鋡怨"
 
-#: ../pidgin/gtklog.c:527
+#: ../pidgin/gtklog.c:535
 msgid "No logs were found"
 msgstr "曆唳亥"
 
 #. Steal the "HELP" response and use it to trigger browsing to the logs folder
-#: ../pidgin/gtklog.c:542
+#: ../pidgin/gtklog.c:550
 msgid "_Browse logs folder"
 msgstr "閬賣亥桅(_B)"
 
-#: ../pidgin/gtklog.c:606
+#: ../pidgin/gtklog.c:614
 msgid "Total log size:"
 msgstr "券冽亥憭批嚗"
 
-#: ../pidgin/gtklog.c:675
+#: ../pidgin/gtklog.c:683
 #, c-format
 msgid "Conversations in %s"
 msgstr " %s 鈭方"
 
-#: ../pidgin/gtklog.c:683 ../pidgin/gtklog.c:735
+#: ../pidgin/gtklog.c:691 ../pidgin/gtklog.c:753
 #, c-format
 msgid "Conversations with %s"
 msgstr " %s 鈭方"
 
-#: ../pidgin/gtklog.c:760
+#: ../pidgin/gtklog.c:778
 msgid "System Log"
 msgstr "蝟餌絞亥"
 
-#: ../pidgin/gtkmain.c:364
+#: ../pidgin/gtkmain.c:373
 #, c-format
 msgid "%s %s. Try `%s -h' for more information.\n"
 msgstr "%s %s瑁%s -h隞亦脣湧脖甇亦鞈閮\n"
 
 #  FIXME
-#: ../pidgin/gtkmain.c:366
+#: ../pidgin/gtkmain.c:375
 #, c-format
 msgid ""
 "%s %s\n"
@@ -13586,26 +13624,26 @@
 "芯撣唾嚗銝虫蝙券) \n"
 "  -v, --version       憿舐內祈臭蒂a\n"
 
-#: ../pidgin/gtkmain.c:550
+#: ../pidgin/gtkmain.c:493
 #, 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"
-"If you can reproduce the crash, please notify the Pidgin\n"
-"developers by reporting a bug at\n"
-"%sbug.php\n"
+"If you can reproduce the crash, please notify the developers\n"
+"by reporting a bug at:\n"
+"%snewticket/\n"
 "\n"
 "Please make sure to specify what you were doing at the time\n"
 "and post the backtrace from the core file.  If you do not know\n"
 "how to get the backtrace, please read the instructions at\n"
-"%sgdb.php\n"
+"%swiki/GetABacktrace\n"
 "\n"
 "If you need further assistance, please IM either SeanEgn or \n"
 "LSchiere (via AIM).  Contact information for Sean and Luke \n"
 "on other protocols is at\n"
-"%scontactinfo.php\n"
+"%swiki/DeveloperPages\n"
 msgstr ""
 
 #: ../pidgin/gtknotify.c:337
@@ -13634,22 +13672,22 @@
 msgstr[0] "<b>冽 %d 撠圈萎辣</b>"
 msgstr[1] "<b>冽 %d 撠圈萎辣</b>"
 
-#: ../pidgin/gtknotify.c:909
+#: ../pidgin/gtknotify.c:951
 #, c-format
 msgid "The browser command \"%s\" is invalid."
 msgstr "閬賢冽隞扎%s舐⊥"
 
-#: ../pidgin/gtknotify.c:911 ../pidgin/gtknotify.c:923
-#: ../pidgin/gtknotify.c:936 ../pidgin/gtknotify.c:1064
+#: ../pidgin/gtknotify.c:953 ../pidgin/gtknotify.c:965
+#: ../pidgin/gtknotify.c:978 ../pidgin/gtknotify.c:1106
 msgid "Unable to open URL"
 msgstr "⊥蝬脤"
 
-#: ../pidgin/gtknotify.c:921 ../pidgin/gtknotify.c:934
+#: ../pidgin/gtknotify.c:963 ../pidgin/gtknotify.c:976
 #, c-format
 msgid "Error launching \"%s\": %s"
 msgstr " \"%s\" 潛航炊嚗%s"
 
-#: ../pidgin/gtknotify.c:1065
+#: ../pidgin/gtknotify.c:1107
 msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr "券貊其雿輻刻芸閬賢具嚗餅芣閮剖隞扎"
@@ -13662,11 +13700,11 @@
 msgid "Multiple plugins will be unloaded."
 msgstr "憭璅∠撠鋡怠貉"
 
-#: ../pidgin/gtkplugin.c:285
+#: ../pidgin/gtkplugin.c:287
 msgid "Unload Plugins"
 msgstr "貉璅∠"
 
-#: ../pidgin/gtkplugin.c:397
+#: ../pidgin/gtkplugin.c:399
 #, c-format
 msgid ""
 "%s%s<span weight=\"bold\">Written by:</span>\t%s\n"
@@ -13677,7 +13715,7 @@
 "<span weight=\"bold\">蝬脩嚗</span>\t\t%s\n"
 "<span weight=\"bold\">瑼嚗</span>\t%s"
 
-#: ../pidgin/gtkplugin.c:407
+#: ../pidgin/gtkplugin.c:409
 #, c-format
 msgid ""
 "%s\n"
@@ -13688,11 +13726,11 @@
 "<span foreground=\"#ff0000\" weight=\"bold\">航炊: %s\n"
 "瑼X交芋蝯蝬脩隞亦脣湔啜</span>"
 
-#: ../pidgin/gtkplugin.c:533
+#: ../pidgin/gtkplugin.c:535
 msgid "Configure Pl_ugin"
 msgstr "閮剖璅∠(_U)"
 
-#: ../pidgin/gtkplugin.c:596
+#: ../pidgin/gtkplugin.c:598
 msgid "<b>Plugin Details</b>"
 msgstr "<b>璅∠蝝</b>"
 
@@ -13701,95 +13739,95 @@
 msgstr "豢瑼獢"
 
 #. Create the "Pounce on Whom" frame.
-#: ../pidgin/gtkpounce.c:522
+#: ../pidgin/gtkpounce.c:524
 msgid "Pounce on Whom"
 msgstr "隤啁"
 
-#: ../pidgin/gtkpounce.c:549
+#: ../pidgin/gtkpounce.c:551
 msgid "_Buddy name:"
 msgstr "憟賢蝔(_B)嚗"
 
-#: ../pidgin/gtkpounce.c:583
+#: ../pidgin/gtkpounce.c:585
 msgid "Si_gns on"
 msgstr "餃(_G)"
 
-#: ../pidgin/gtkpounce.c:585
+#: ../pidgin/gtkpounce.c:587
 msgid "Signs o_ff"
 msgstr "餃(_F)"
 
-#: ../pidgin/gtkpounce.c:587
-msgid "Goes a_way"
-msgstr "a(_W)"
-
 #: ../pidgin/gtkpounce.c:589
-msgid "Ret_urns from away"
-msgstr "餈(_U)"
+msgid "Goes a_way"
+msgstr "a(_W)"
 
 #: ../pidgin/gtkpounce.c:591
+msgid "Ret_urns from away"
+msgstr "餈(_U)"
+
+#: ../pidgin/gtkpounce.c:593
 msgid "Becomes _idle"
 msgstr "蝵(_I)"
 
-#: ../pidgin/gtkpounce.c:593
+#: ../pidgin/gtkpounce.c:595
 msgid "Is no longer i_dle"
 msgstr "銝蝵(_D)"
 
-#: ../pidgin/gtkpounce.c:595
+#: ../pidgin/gtkpounce.c:597
 msgid "Starts _typing"
 msgstr "憪頛詨(_T)"
 
-#: ../pidgin/gtkpounce.c:597
+#: ../pidgin/gtkpounce.c:599
 msgid "P_auses while typing"
 msgstr "怠頛詨(_A)"
 
-#: ../pidgin/gtkpounce.c:599
-msgid "Stops t_yping"
-msgstr "甇Z撓(_Y)"
-
 #: ../pidgin/gtkpounce.c:601
+msgid "Stops t_yping"
+msgstr "甇Z撓(_Y)"
+
+#: ../pidgin/gtkpounce.c:603
 msgid "Sends a _message"
 msgstr "箔閮(_M)"
 
-#: ../pidgin/gtkpounce.c:644
+#: ../pidgin/gtkpounce.c:646
 msgid "Ope_n an IM window"
 msgstr "單閮航蝒(_N)"
 
-#: ../pidgin/gtkpounce.c:646
+#: ../pidgin/gtkpounce.c:648
 msgid "_Pop up a notification"
 msgstr "敶粹(_P)"
 
-#: ../pidgin/gtkpounce.c:648
+#: ../pidgin/gtkpounce.c:650
 msgid "Send a _message"
 msgstr "箄(_M)"
 
-#: ../pidgin/gtkpounce.c:650
+#: ../pidgin/gtkpounce.c:652
 msgid "E_xecute a command"
 msgstr "瑁隞(_X)"
 
-#: ../pidgin/gtkpounce.c:652
+#: ../pidgin/gtkpounce.c:654
 msgid "P_lay a sound"
 msgstr "剜暸單(_L)"
 
-#: ../pidgin/gtkpounce.c:657
+#: ../pidgin/gtkpounce.c:659
 msgid "Brows_e..."
 msgstr "閬(_E)..."
 
-#: ../pidgin/gtkpounce.c:659
+#: ../pidgin/gtkpounce.c:661
 msgid "Br_owse..."
 msgstr "閬(_O)..."
 
-#: ../pidgin/gtkpounce.c:660
+#: ../pidgin/gtkpounce.c:662
 msgid "Pre_view"
 msgstr "閬(_V)"
 
-#: ../pidgin/gtkpounce.c:784
+#: ../pidgin/gtkpounce.c:786
 msgid "P_ounce only when my status is not available"
 msgstr "芸冽銝箝銝蝺(_O)"
 
-#: ../pidgin/gtkpounce.c:789
+#: ../pidgin/gtkpounce.c:791
 msgid "_Recurring"
 msgstr "閬潛(_R)"
 
-#: ../pidgin/gtkpounce.c:1243
+#: ../pidgin/gtkpounce.c:1247
 msgid "Pounce Target"
 msgstr "格"
 
@@ -13818,7 +13856,7 @@
 msgid "_Show system tray icon:"
 msgstr "憿舐內蝟餌絞撌乩蝷(_S)嚗"
 
-#: ../pidgin/gtkprefs.c:819 ../pidgin/gtkprefs.c:831 ../pidgin/gtkprefs.c:1646
+#: ../pidgin/gtkprefs.c:819 ../pidgin/gtkprefs.c:831 ../pidgin/gtkprefs.c:1648
 #: ../pidgin/plugins/timestamp_format.c:42
 #: ../pidgin/plugins/timestamp_format.c:51
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:338
@@ -13837,7 +13875,7 @@
 msgid "_Hide new IM conversations:"
 msgstr "梯啁單閮臭漱隢(_H)嚗"
 
-#: ../pidgin/gtkprefs.c:830 ../pidgin/gtkprefs.c:1826
+#: ../pidgin/gtkprefs.c:830 ../pidgin/gtkprefs.c:1828
 msgid "When away"
 msgstr "a"
 
@@ -14064,59 +14102,64 @@
 msgid "Log all _status changes to system log"
 msgstr "閮寡喟頂蝯望亥(_S)"
 
+#: ../pidgin/gtkprefs.c:1475 ../pidgin/gtkprefs.c:1564
+#: ../pidgin/gtkprefs.c:1756
+msgid "(default)"
+msgstr "(閮)"
+
 #: ../pidgin/gtkprefs.c:1513
 msgid "Sound Selection"
 msgstr "詨單"
 
-#: ../pidgin/gtkprefs.c:1521
+#: ../pidgin/gtkprefs.c:1523
 msgid "Quietest"
 msgstr "撠"
 
-#: ../pidgin/gtkprefs.c:1523
+#: ../pidgin/gtkprefs.c:1525
 msgid "Quieter"
 msgstr "撠"
 
-#: ../pidgin/gtkprefs.c:1525
+#: ../pidgin/gtkprefs.c:1527
 msgid "Quiet"
 msgstr "撠"
 
-#: ../pidgin/gtkprefs.c:1529
+#: ../pidgin/gtkprefs.c:1531
 msgid "Loud"
 msgstr "憭扯"
 
-#: ../pidgin/gtkprefs.c:1531
+#: ../pidgin/gtkprefs.c:1533
 msgid "Louder"
 msgstr "憭扯"
 
-#: ../pidgin/gtkprefs.c:1533
+#: ../pidgin/gtkprefs.c:1535
 msgid "Loudest"
 msgstr "憭扯"
 
-#: ../pidgin/gtkprefs.c:1596
+#: ../pidgin/gtkprefs.c:1598
 msgid "Sound Method"
 msgstr "單剜暹孵"
 
-#: ../pidgin/gtkprefs.c:1597
+#: ../pidgin/gtkprefs.c:1599
 msgid "_Method:"
 msgstr "剜暹孵(_M)嚗"
 
-#: ../pidgin/gtkprefs.c:1599
-msgid "Console beep"
-msgstr "嗡"
-
 #: ../pidgin/gtkprefs.c:1601
+msgid "Console beep"
+msgstr "嗡"
+
+#: ../pidgin/gtkprefs.c:1603
 msgid "Automatic"
 msgstr "芸"
 
-#: ../pidgin/gtkprefs.c:1604
+#: ../pidgin/gtkprefs.c:1606
 msgid "Command"
 msgstr "隞"
 
-#: ../pidgin/gtkprefs.c:1605
+#: ../pidgin/gtkprefs.c:1607
 msgid "No sounds"
 msgstr "⊿單"
 
-#: ../pidgin/gtkprefs.c:1613
+#: ../pidgin/gtkprefs.c:1615
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -14125,118 +14168,118 @@
 "單隞(_C)嚗\n"
 "(隢隞 %s 隞銵冽)"
 
-#: ../pidgin/gtkprefs.c:1639
+#: ../pidgin/gtkprefs.c:1641
 msgid "Sound Options"
 msgstr "單賊"
 
-#: ../pidgin/gtkprefs.c:1640
+#: ../pidgin/gtkprefs.c:1642
 msgid "Sounds when conversation has _focus"
 msgstr "嗡漱隢敺頛詨亦阡澆粹單(_F)"
 
-#: ../pidgin/gtkprefs.c:1642
+#: ../pidgin/gtkprefs.c:1644
 msgid "Enable sounds:"
 msgstr "單嚗"
 
-#: ../pidgin/gtkprefs.c:1644
+#: ../pidgin/gtkprefs.c:1646
 msgid "Only when available"
 msgstr "銝蝺a"
 
-#: ../pidgin/gtkprefs.c:1645
+#: ../pidgin/gtkprefs.c:1647
 msgid "Only when not available"
 msgstr "a"
 
-#: ../pidgin/gtkprefs.c:1653
+#: ../pidgin/gtkprefs.c:1655
 msgid "Volume:"
 msgstr "喲嚗"
 
-#: ../pidgin/gtkprefs.c:1681
+#: ../pidgin/gtkprefs.c:1683
 msgid "Sound Events"
 msgstr "鈭隞園單"
 
-#: ../pidgin/gtkprefs.c:1732
+#: ../pidgin/gtkprefs.c:1734
 msgid "Play"
 msgstr "剜"
 
-#: ../pidgin/gtkprefs.c:1739
+#: ../pidgin/gtkprefs.c:1741
 msgid "Event"
 msgstr "鈭隞"
 
-#: ../pidgin/gtkprefs.c:1758
+#: ../pidgin/gtkprefs.c:1760
 msgid "Test"
 msgstr "皜祈岫"
 
-#: ../pidgin/gtkprefs.c:1762
+#: ../pidgin/gtkprefs.c:1764
 msgid "Reset"
 msgstr "蝵"
 
-#: ../pidgin/gtkprefs.c:1766
+#: ../pidgin/gtkprefs.c:1768
 msgid "Choose..."
 msgstr "豢..."
 
-#: ../pidgin/gtkprefs.c:1809
+#: ../pidgin/gtkprefs.c:1811
 msgid "_Report idle time:"
 msgstr "蝵格箸(_R)"
 
-#: ../pidgin/gtkprefs.c:1814
+#: ../pidgin/gtkprefs.c:1816
 msgid "Based on keyboard or mouse use"
 msgstr "隞仿萇文皛曌雿輻函箏箸"
 
-#: ../pidgin/gtkprefs.c:1823
+#: ../pidgin/gtkprefs.c:1825
 msgid "_Auto-reply:"
 msgstr "雿箄芸嚗"
 
-#: ../pidgin/gtkprefs.c:1827
+#: ../pidgin/gtkprefs.c:1829
 msgid "When both away and idle"
 msgstr "園a銝血蝵格"
 
 #. Auto-away stuff
-#: ../pidgin/gtkprefs.c:1833
+#: ../pidgin/gtkprefs.c:1835
 msgid "Auto-away"
 msgstr "芸a"
 
-#: ../pidgin/gtkprefs.c:1835
+#: ../pidgin/gtkprefs.c:1837
 msgid "Change status when _idle"
 msgstr "蝵格湔寧(_I)"
 
 # NOTE 霅舀游 by Ambrose
-#: ../pidgin/gtkprefs.c:1839
+#: ../pidgin/gtkprefs.c:1841
 msgid "_Minutes before changing status:"
 msgstr "蝵桀撠閮剔粹a(_M)嚗"
 
-#: ../pidgin/gtkprefs.c:1847
+#: ../pidgin/gtkprefs.c:1849
 msgid "Change _status to:"
 msgstr "湔寧(_S)嚗"
 
 #. Signon status stuff
-#: ../pidgin/gtkprefs.c:1868
+#: ../pidgin/gtkprefs.c:1870
 msgid "Status at Startup"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1870
+#: ../pidgin/gtkprefs.c:1872
 msgid "Use status from last _exit at startup"
 msgstr "雿輻其甈∠"
 
-#: ../pidgin/gtkprefs.c:1876
+#: ../pidgin/gtkprefs.c:1878
 msgid "Status to a_pply at startup:"
 msgstr "憟函嚗"
 
-#: ../pidgin/gtkprefs.c:1914
+#: ../pidgin/gtkprefs.c:1916
 msgid "Interface"
 msgstr "隞"
 
-#: ../pidgin/gtkprefs.c:1916
+#: ../pidgin/gtkprefs.c:1918
 msgid "Smiley Themes"
 msgstr "銵冽銝駁"
 
-#: ../pidgin/gtkprefs.c:1917
+#: ../pidgin/gtkprefs.c:1919
 msgid "Sounds"
 msgstr "單"
 
-#: ../pidgin/gtkprefs.c:1923
+#: ../pidgin/gtkprefs.c:1925
 msgid "Browser"
 msgstr "閬賢"
 
-#: ../pidgin/gtkprefs.c:1927
+#: ../pidgin/gtkprefs.c:1929
 msgid "Status / Idle"
 msgstr "嚗蝵"
 
@@ -14273,7 +14316,7 @@
 msgid "Set privacy for:"
 msgstr "撣唾嚗"
 
-#: ../pidgin/gtkprivacy.c:560 ../pidgin/gtkprivacy.c:576
+#: ../pidgin/gtkprivacy.c:560 ../pidgin/gtkprivacy.c:577
 msgid "Permit User"
 msgstr "閮勗臭蝙刻"
 
@@ -14285,38 +14328,38 @@
 msgid "Please enter the name of the user you wish to be able to contact you."
 msgstr "隢頛詨交冽閮勗航舐窗函雿輻刻蝔晞"
 
-#: ../pidgin/gtkprivacy.c:565 ../pidgin/gtkprivacy.c:578
+#: ../pidgin/gtkprivacy.c:565 ../pidgin/gtkprivacy.c:581
 msgid "_Permit"
 msgstr "閮勗(_P)"
 
-#: ../pidgin/gtkprivacy.c:570
+#: ../pidgin/gtkprivacy.c:571
 #, c-format
 msgid "Allow %s to contact you?"
 msgstr "閮勗 %s 舐窗剁"
 
-#: ../pidgin/gtkprivacy.c:572
+#: ../pidgin/gtkprivacy.c:573
 #, c-format
 msgid "Are you sure you wish to allow %s to contact you?"
 msgstr "函Ⅱ摰閮勗 %s 舐窗典嚗"
 
-#: ../pidgin/gtkprivacy.c:599 ../pidgin/gtkprivacy.c:612
+#: ../pidgin/gtkprivacy.c:602 ../pidgin/gtkprivacy.c:616
 msgid "Block User"
 msgstr "蝯雿輻刻"
 
-#: ../pidgin/gtkprivacy.c:600
+#: ../pidgin/gtkprivacy.c:603
 msgid "Type a user to block."
 msgstr "頛詨亥◤蝯雿輻刻"
 
-#: ../pidgin/gtkprivacy.c:601
+#: ../pidgin/gtkprivacy.c:604
 msgid "Please enter the name of the user you wish to block."
 msgstr "隢頛詨亥◤冽蝯雿輻刻蝔晞"
 
-#: ../pidgin/gtkprivacy.c:608
+#: ../pidgin/gtkprivacy.c:612
 #, c-format
 msgid "Block %s?"
 msgstr "蝯 %s嚗"
 
-#: ../pidgin/gtkprivacy.c:610
+#: ../pidgin/gtkprivacy.c:614
 #, c-format
 msgid "Are you sure you want to block %s?"
 msgstr "函Ⅱ摰閬蝯 %s嚗"
@@ -14325,23 +14368,23 @@
 msgid "Apply"
 msgstr "憟"
 
-#: ../pidgin/gtkrequest.c:1469
+#: ../pidgin/gtkrequest.c:1481
 msgid "That file already exists"
 msgstr "瑼獢撌脩摮"
 
-#: ../pidgin/gtkrequest.c:1470
+#: ../pidgin/gtkrequest.c:1482
 msgid "Would you like to overwrite it?"
 msgstr "刻閬摰嚗"
 
-#: ../pidgin/gtkrequest.c:1471
+#: ../pidgin/gtkrequest.c:1485
 msgid "Overwrite"
 msgstr "閬撖"
 
-#: ../pidgin/gtkrequest.c:1472
+#: ../pidgin/gtkrequest.c:1486
 msgid "Choose New Name"
 msgstr "詨啣蝔"
 
-#: ../pidgin/gtkrequest.c:1607 ../pidgin/gtkrequest.c:1621
+#: ../pidgin/gtkrequest.c:1624 ../pidgin/gtkrequest.c:1638
 msgid "Select Folder..."
 msgstr "豢鞈..."
 
@@ -14365,38 +14408,38 @@
 msgstr "函Ⅱ摰刻芷方◤詨嚗"
 
 #. Use button
-#: ../pidgin/gtksavedstatuses.c:579 ../pidgin/gtksavedstatuses.c:1213
+#: ../pidgin/gtksavedstatuses.c:580 ../pidgin/gtksavedstatuses.c:1214
 msgid "_Use"
 msgstr "雿輻(_U)"
 
-#: ../pidgin/gtksavedstatuses.c:725
+#: ../pidgin/gtksavedstatuses.c:726
 msgid "Title already in use.  You must choose a unique title."
 msgstr "桀璅憿甇其蝙其葉典詨銝臭璅憿"
 
 # TODO - 暺銝憒伐雿喃唳游末 - 20061123
-#: ../pidgin/gtksavedstatuses.c:913
+#: ../pidgin/gtksavedstatuses.c:914
 msgid "Different"
 msgstr "撌桃"
 
-#: ../pidgin/gtksavedstatuses.c:1106
+#: ../pidgin/gtksavedstatuses.c:1107
 msgid "_Title:"
 msgstr "璅憿(_T)嚗"
 
-#: ../pidgin/gtksavedstatuses.c:1125 ../pidgin/gtksavedstatuses.c:1446
+#: ../pidgin/gtksavedstatuses.c:1126 ../pidgin/gtksavedstatuses.c:1447
 msgid "_Status:"
 msgstr "(_S)嚗"
 
 #. Different status message expander
-#: ../pidgin/gtksavedstatuses.c:1157
+#: ../pidgin/gtksavedstatuses.c:1158
 msgid "Use a _different status for some accounts"
 msgstr "粹其遢撣唾閮剖銝(_D)"
 
 #. Save & Use button
-#: ../pidgin/gtksavedstatuses.c:1221
+#: ../pidgin/gtksavedstatuses.c:1222
 msgid "Sa_ve & Use"
 msgstr "脣銝虫蝙(_V)"
 
-#: ../pidgin/gtksavedstatuses.c:1427
+#: ../pidgin/gtksavedstatuses.c:1428
 #, c-format
 msgid "Status for %s"
 msgstr "嚗%s"
@@ -14449,37 +14492,41 @@
 msgid "GStreamer failed to initialize."
 msgstr "GStreamer 憪憭望"
 
-#: ../pidgin/gtkstatusbox.c:611
+#: ../pidgin/gtkstatusbox.c:661
 msgid "Waiting for network connection"
 msgstr "蝑敺蝬脰楝蝺..."
 
-#: ../pidgin/gtkutils.c:1320 ../pidgin/gtkutils.c:1343
+#: ../pidgin/gtkutils.c:516
+msgid "Google Talk"
+msgstr "Google Talk"
+
+#: ../pidgin/gtkutils.c:1372 ../pidgin/gtkutils.c:1395
 #, c-format
 msgid "The following error has occurred loading %s: %s"
 msgstr "頛 %s 潛隞乩航炊嚗%s"
 
-#: ../pidgin/gtkutils.c:1323 ../pidgin/gtkutils.c:1345
+#: ../pidgin/gtkutils.c:1375 ../pidgin/gtkutils.c:1397
 msgid "Failed to load image"
 msgstr "霈敶勗憭望"
 
-#: ../pidgin/gtkutils.c:1420
+#: ../pidgin/gtkutils.c:1471
 #, c-format
 msgid "Cannot send folder %s."
 msgstr "⊥喲桅 %s"
 
-#: ../pidgin/gtkutils.c:1421
+#: ../pidgin/gtkutils.c:1472
 #, c-format
 msgid ""
 "%s cannot transfer a folder. You will need to send the files within "
-"individually"
-msgstr "%s 瘝颲行喲桅券閬亙喲瑼獢"
-
-#: ../pidgin/gtkutils.c:1453 ../pidgin/gtkutils.c:1462
-#: ../pidgin/gtkutils.c:1467
+"individually."
+msgstr "%s 瘝颲行喲桅嚗券閬亙喲桅抒瑼獢"
+
+#: ../pidgin/gtkutils.c:1504 ../pidgin/gtkutils.c:1516
+#: ../pidgin/gtkutils.c:1523
 msgid "You have dragged an image"
 msgstr "冽喃銝敶勗"
 
-#: ../pidgin/gtkutils.c:1454
+#: ../pidgin/gtkutils.c:1505
 msgid ""
 "You can send this image as a file transfer, embed it into this message, or "
 "use it as the buddy icon for this user."
@@ -14487,23 +14534,23 @@
 "典臭誑瑼獢唾撓亥荔摰嗆臭憟賢蝷箇孵嚗靘喲敶勗瑼"
 "蝯阡雿輻刻"
 
-#: ../pidgin/gtkutils.c:1458 ../pidgin/gtkutils.c:1473
+#: ../pidgin/gtkutils.c:1511 ../pidgin/gtkutils.c:1532
 msgid "Set as buddy icon"
 msgstr "閮剔箏末蝷"
 
-#: ../pidgin/gtkutils.c:1459 ../pidgin/gtkutils.c:1474
+#: ../pidgin/gtkutils.c:1512 ../pidgin/gtkutils.c:1533
 msgid "Send image file"
 msgstr "喲敶勗瑼"
 
-#: ../pidgin/gtkutils.c:1460 ../pidgin/gtkutils.c:1474
+#: ../pidgin/gtkutils.c:1513 ../pidgin/gtkutils.c:1533
 msgid "Insert in message"
 msgstr "亙啗"
 
-#: ../pidgin/gtkutils.c:1463
+#: ../pidgin/gtkutils.c:1517
 msgid "Would you like to set it as the buddy icon for this user?"
 msgstr "刻摰閮剔粹雿輻刻憟賢蝷箏嚗"
 
-#: ../pidgin/gtkutils.c:1468
+#: ../pidgin/gtkutils.c:1524
 msgid ""
 "You can send this image as a file transfer or embed it into this message, or "
 "use it as the buddy icon for this user."
@@ -14511,7 +14558,7 @@
 "典臭誑瑼獢唾撓亥荔摰嗆臭憟賢蝷箇孵嚗靘喲敶勗瑼"
 "蝯阡雿輻刻"
 
-#: ../pidgin/gtkutils.c:1470
+#: ../pidgin/gtkutils.c:1526
 msgid ""
 "You can insert this image into this message, or use it as the buddy icon for "
 "this user"
@@ -14524,17 +14571,17 @@
 #. * send.  The only logical one is "Application," but do we really want to send a binary and nothing else?
 #. * Probably not.  I'll just give an error and return.
 #. The original patch sent the icon used by the launcher.  That's probably wrong
-#: ../pidgin/gtkutils.c:1524
+#: ../pidgin/gtkutils.c:1584
 msgid "Cannot send launcher"
 msgstr "⊥喲"
 
-#: ../pidgin/gtkutils.c:1524
+#: ../pidgin/gtkutils.c:1584
 msgid ""
 "You dragged a desktop launcher. Most likely you wanted to send whatever this "
 "launcher points to instead of this launcher itself."
 msgstr "冽喃銝剁典之璁喳喲刻瑼獢嚗銝臬冽祈澈"
 
-#: ../pidgin/gtkutils.c:2291
+#: ../pidgin/gtkutils.c:2344
 #, c-format
 msgid ""
 "<b>File:</b> %s\n"
@@ -14545,59 +14592,66 @@
 "<b>瑼獢憭批嚗</b> %s\n"
 "<b>撠箏站嚗</b> %d%d"
 
-#: ../pidgin/gtkutils.c:2611
+#: ../pidgin/gtkutils.c:2640
 #, c-format
 msgid "The file '%s' is too large for %s.  Please try a smaller image.\n"
 msgstr "'%s' 撠 %s 靘隤芸云憭找隢閰西岫撠銝暺敶梯情\n"
 
-#: ../pidgin/gtkutils.c:2613
+#: ../pidgin/gtkutils.c:2642
 msgid "Icon Error"
 msgstr "航炊"
 
-#: ../pidgin/gtkutils.c:2614
+#: ../pidgin/gtkutils.c:2643
 msgid "Could not set icon"
 msgstr "⊥閮剖"
 
-#: ../pidgin/gtkutils.c:2715
+#: ../pidgin/gtkutils.c:2743
 #, c-format
 msgid "Failed to open file '%s': %s"
 msgstr "⊥瑼獢%s嚗%s"
 
-#: ../pidgin/gtkutils.c:2764
+#: ../pidgin/gtkutils.c:2792
 #, c-format
 msgid ""
 "Failed to load image '%s': reason not known, probably a corrupt image file"
 msgstr "⊥頛亙蔣%s嚗銝嚗憭扳臬蔣瑼撌脫憯"
 
-#: ../pidgin/gtkwhiteboard.c:756 ../pidgin/gtkwhiteboard.c:775
+#: ../pidgin/gtkwhiteboard.c:760 ../pidgin/gtkwhiteboard.c:779
 msgid "Save File"
 msgstr "脣瑼獢"
 
-#: ../pidgin/gtkwhiteboard.c:863
+#: ../pidgin/gtkwhiteboard.c:867
 msgid "Select color"
 msgstr "豢憿"
 
-#: ../pidgin/pidginstock.c:88
+#  TODO Untranslated - This will need to be translated (NOT transliterated) for Chinese, but that'd be too much work
+#. Translators may want to transliterate the name.
+#. It is not to be translated.
+#: ../pidgin/pidgin.h:50
+msgid "Pidgin"
+msgstr "Pidgin"
+
+#: ../pidgin/pidginstock.c:81
 msgid "_Alias"
 msgstr "亙(_A)"
 
-#: ../pidgin/pidginstock.c:90
+#: ../pidgin/pidginstock.c:83
 msgid "Close _tabs"
 msgstr "(_T)"
 
-#: ../pidgin/pidginstock.c:92
+#: ../pidgin/pidginstock.c:85
 msgid "_Get Info"
 msgstr "敺鞈閮(_G)"
 
-#: ../pidgin/pidginstock.c:93
+#: ../pidgin/pidginstock.c:86
 msgid "_Invite"
 msgstr "隢(_I)"
 
-#: ../pidgin/pidginstock.c:94
+#: ../pidgin/pidginstock.c:87
 msgid "_Modify"
 msgstr "靽格(_M)"
 
-#: ../pidgin/pidginstock.c:95
+#: ../pidgin/pidginstock.c:88
 msgid "_Open Mail"
 msgstr "萎辣(_O)"
 
@@ -14620,7 +14674,7 @@
 msgstr "憟賢雿箏閬銝嚗"
 
 #: ../pidgin/plugins/cap/cap.c:816 ../pidgin/plugins/cap/cap.c:823
-#: ../pidgin/plugins/cap/cap.c:830 ../pidgin/plugins/timestamp.c:149
+#: ../pidgin/plugins/cap/cap.c:830 ../pidgin/plugins/timestamp.c:150
 msgid "minutes"
 msgstr ""
 
@@ -14671,12 +14725,12 @@
 
 #: ../pidgin/plugins/contact_priority.c:63
 msgid "Buddy is \"extended\" away"
-msgstr "憟賢a"
+msgstr "憟賢瑟a"
 
 #. Not used yet.
 #: ../pidgin/plugins/contact_priority.c:66
 msgid "Buddy is mobile"
-msgstr "憟賢雿輻刻鋆蝵"
+msgstr "憟賢雿輻冽閮冽"
 
 #: ../pidgin/plugins/contact_priority.c:68
 msgid "Buddy is offline"
@@ -14693,7 +14747,7 @@
 "in the contact.\n"
 msgstr ""
 "交銝憟賢嗅祕璁砌憟賢嗾憟賢撣唾嚗閮靘踵寞鋆\n"
-"蝯血敺潸嚗蝛憭箝芸嚗箇嗆撖阡\n"
+"摰敺潸嚗蝛憭箝芸嚗箇嗆撖阡\n"
 "雿輻函憟賢撣唾\n"
 
 # NOTE  (1.x) Pidgin 銝剜迨霅舀蝬 Etan Reisner (潸銋銝) 詨祕嚗啁 (2.0) Pidgin 霅舀閬唳詨祕
@@ -14712,20 +14766,20 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/contact_priority.c:182
+#: ../pidgin/plugins/contact_priority.c:187
 msgid "Contact Priority"
 msgstr "憟賢芸甈∪"
 
 #. *< name
 #. *< version
 #. *< summary
-#: ../pidgin/plugins/contact_priority.c:185
+#: ../pidgin/plugins/contact_priority.c:190
 msgid ""
 "Allows for controlling the values associated with different buddy states."
 msgstr "霈雿芸憟賢敺潦"
 
 #. *< description
-#: ../pidgin/plugins/contact_priority.c:187
+#: ../pidgin/plugins/contact_priority.c:192
 msgid ""
 "Allows for changing the point values of idle/away/offline states for buddies "
 "in contact priority computations."
@@ -14787,12 +14841,19 @@
 msgid "Conversation Placement"
 msgstr "鈭方雿蝵"
 
-#: ../pidgin/plugins/extplacement.c:106
+#. Translators: "New conversations" should match the text in the preferences dialog and "By conversation count" should be the same text used above
+#: ../pidgin/plugins/extplacement.c:105
+msgid ""
+"Note: The preference for \"New conversations\" must be set to \"By "
+"conversation count\"."
+msgstr "瘜冽嚗唬漱隢賊敹閮剖箝靘鈭方詻"
+
+#: ../pidgin/plugins/extplacement.c:111
 msgid "Number of conversations per window"
 msgstr "閬蝒找鈭方訾"
 
 #  XXX 閬詨祕霅舀嚗
-#: ../pidgin/plugins/extplacement.c:112
+#: ../pidgin/plugins/extplacement.c:117
 msgid "Separate IM and Chat windows when placing by number"
 msgstr "靘鈭方豢曄蔭唬漱隢嚗隞乩閬蝒憿舐內單閮臬憭"
 
@@ -14802,56 +14863,25 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/extplacement.c:135
+#: ../pidgin/plugins/extplacement.c:146
 msgid "ExtPlacement"
 msgstr "閬蝒雿蝵桅憭賊"
 
 #. *< name
 #. *< version
-#: ../pidgin/plugins/extplacement.c:137
+#: ../pidgin/plugins/extplacement.c:148
 msgid "Extra conversation placement options."
 msgstr "鈭方閬蝒雿蝵桅憭賊"
 
 #  XXX 霅臬敺撌殷隢寡 :-(
 #. *< summary
 #. *  description
-#: ../pidgin/plugins/extplacement.c:139
+#: ../pidgin/plugins/extplacement.c:150
 msgid ""
 "Restrict the number of conversations per windows, optionally separating IMs "
 "and Chats"
 msgstr "嗉蝒臬捆銋鈭方貊殷鈭血舫豢隞乩閬蝒憿舐內單閮臬憭"
 
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../pidgin/plugins/gaiminc.c:91
-msgid "Pidgin Demonstration Plugin"
-msgstr "Pidgin 蝭靘璅∠"
-
-#. *< name
-#. *< version
-#. *  summary
-#: ../pidgin/plugins/gaiminc.c:94
-msgid "An example plugin that does stuff - see the description."
-msgstr "蝭靘璅∠隢隞蝝嫘"
-
-# NOTE 霅舀游 by Ambrose
-#. *  description
-#: ../pidgin/plugins/gaiminc.c:96
-msgid ""
-"This is a really cool plugin that does a lot of stuff:\n"
-"- It tells you who wrote the program when you log in\n"
-"- It reverses all incoming text\n"
-"- It sends a message to people on your list immediately when they sign on"
-msgstr ""
-"臭敺頞璅∠嚗摰瑟銝踝\n"
-"- 摰臭誑冽函餃亦嚗閮湔冽航狐撖思蝔撘\n"
-"- 摰撠嗅啁閮臬椰單頧\n"
-"- 摰冽函憟賢餃交嚗蝡駁箔閮舐策隞"
-
 #. Configuration frame
 #: ../pidgin/plugins/gestures/gestures.c:235
 msgid "Mouse Gestures Configuration"
@@ -14876,19 +14906,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/gestures/gestures.c:289
+#: ../pidgin/plugins/gestures/gestures.c:295
 msgid "Mouse Gestures"
 msgstr "皛曌雿"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/gestures/gestures.c:292
+#: ../pidgin/plugins/gestures/gestures.c:298
 msgid "Provides support for mouse gestures"
 msgstr "靘皛曌雿舀"
 
 #. *  description
-#: ../pidgin/plugins/gestures/gestures.c:294
+#: ../pidgin/plugins/gestures/gestures.c:300
 msgid ""
 "Allows support for mouse gestures in conversation windows.\n"
 "Drag the middle mouse button to perform certain actions:\n"
@@ -14991,7 +15021,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/gevolution/gevolution.c:521
+#: ../pidgin/plugins/gevolution/gevolution.c:526
 msgid "Evolution Integration"
 msgstr "Evolution 游"
 
@@ -15002,8 +15032,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/gevolution/gevolution.c:524
-#: ../pidgin/plugins/gevolution/gevolution.c:526
+#: ../pidgin/plugins/gevolution/gevolution.c:529
+#: ../pidgin/plugins/gevolution/gevolution.c:531
 msgid "Provides integration with Evolution."
 msgstr "靘 Evolution 游"
 
@@ -15162,12 +15192,12 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:668
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:674
 msgid "Music Messaging Plugin for collaborative composition."
 msgstr "擃雿脩函單閮舀芋蝯"
 
 #. *  summary
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:670
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:676
 msgid ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
 "on a piece of music by editting a common score in real-time."
@@ -15256,7 +15286,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/notify.c:895
+#: ../pidgin/plugins/notify.c:901
 msgid "Message Notification"
 msgstr "閮舫"
 
@@ -15264,10 +15294,41 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/notify.c:898 ../pidgin/plugins/notify.c:900
+#: ../pidgin/plugins/notify.c:904 ../pidgin/plugins/notify.c:906
 msgid "Provides a variety of ways of notifying you of unread messages."
 msgstr "靘憭蝔格孵靘交冽芾閮胯"
 
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../pidgin/plugins/pidgininc.c:91
+msgid "Pidgin Demonstration Plugin"
+msgstr "Pidgin 蝭靘璅∠"
+
+#. *< name
+#. *< version
+#. *  summary
+#: ../pidgin/plugins/pidgininc.c:94
+msgid "An example plugin that does stuff - see the description."
+msgstr "蝭靘璅∠隢隞蝝嫘"
+
+# NOTE 霅舀游 by Ambrose
+#. *  description
+#: ../pidgin/plugins/pidgininc.c:96
+msgid ""
+"This is a really cool plugin that does a lot of stuff:\n"
+"- It tells you who wrote the program when you log in\n"
+"- It reverses all incoming text\n"
+"- It sends a message to people on your list immediately when they sign on"
+msgstr ""
+"臭敺頞璅∠嚗摰瑟銝踝\n"
+"- 摰臭誑冽函餃亦嚗閮湔冽航狐撖思蝔撘\n"
+"- 摰撠嗅啁閮臬椰單頧\n"
+"- 摰冽函憟賢餃交嚗蝡駁箔閮舐策隞"
+
 #: ../pidgin/plugins/pidginrc.c:41
 msgid "Cursor Color"
 msgstr "皜豢憿"
@@ -15281,39 +15342,31 @@
 msgid "Hyperlink Color"
 msgstr "頞蝯憿"
 
-#: ../pidgin/plugins/pidginrc.c:56
-msgid "GtkTreeView Expander Size"
-msgstr "GtkTreeView 撅典之撠"
-
-#: ../pidgin/plugins/pidginrc.c:57
+#: ../pidgin/plugins/pidginrc.c:54
 msgid "GtkTreeView Horizontal Separation"
 msgstr "GtkTreeView 瘞游像頝"
 
-#: ../pidgin/plugins/pidginrc.c:76
+#: ../pidgin/plugins/pidginrc.c:73
 msgid "Conversation Entry"
 msgstr "鈭方閬蝒頛詨交雿"
 
-#: ../pidgin/plugins/pidginrc.c:77
+#: ../pidgin/plugins/pidginrc.c:74
 msgid "Conversation History"
 msgstr "鈭方甇瑕"
 
-#: ../pidgin/plugins/pidginrc.c:78
+#: ../pidgin/plugins/pidginrc.c:75
 msgid "Log Viewer"
 msgstr "亥瑼Z"
 
 #  XXX 霅舀蝯嗅憿嚗雿喃唳璅霅航憟 - ambrose 20070415
-#: ../pidgin/plugins/pidginrc.c:79
+#: ../pidgin/plugins/pidginrc.c:76
 msgid "Request Dialog"
 msgstr "撠閰梯蝒 (Request Dialog)"
 
-#: ../pidgin/plugins/pidginrc.c:80
+#: ../pidgin/plugins/pidginrc.c:77
 msgid "Notify Dialog"
 msgstr "亥蝒 (Notify Dialog)"
 
-#: ../pidgin/plugins/pidginrc.c:91
-msgid "GtkTreeView Indent Expanders"
-msgstr "GtkTreeView撅"
-
 #: ../pidgin/plugins/pidginrc.c:322
 msgid "Select Color"
 msgstr "豢憿"
@@ -15335,36 +15388,56 @@
 msgid "GTK+ Text Shortcut Theme"
 msgstr ""
 
-#: ../pidgin/plugins/pidginrc.c:508
+#.
+#. for (i = 0; i < G_N_ELEMENTS(widget_bool_prefs); i++) {
+#. hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
+#. gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
+#.
+#. check = pidgin_prefs_checkbox(_(widget_bool_names[i]),
+#. widget_bool_prefs_set[i], hbox);
+#. gtk_size_group_add_widget(labelsg, check);
+#.
+#. widget_bool_widgets[i] = pidgin_prefs_checkbox("", widget_bool_prefs[i], hbox);
+#. *
+#. gtk_size_group_add_widget(widgetsb, widget_bool_widgets[i]);
+#. *
+#. gtk_widget_set_sensitive(widget_bool_widgets[i],
+#. purple_prefs_get_bool(widget_bool_prefs_set[i]));
+#. g_signal_connect(G_OBJECT(check), "toggled",
+#. G_CALLBACK(pidgin_toggle_sensitive),
+#. widget_bool_widgets[i]);
+#. }
+#.
+#: ../pidgin/plugins/pidginrc.c:510
 msgid "Interface colors"
 msgstr "隞a"
 
-#: ../pidgin/plugins/pidginrc.c:532
+#: ../pidgin/plugins/pidginrc.c:534
 msgid "Widget Sizes"
 msgstr "Widget 憭批"
 
-#: ../pidgin/plugins/pidginrc.c:553
+#: ../pidgin/plugins/pidginrc.c:555
 msgid "Fonts"
 msgstr "摮"
 
-#: ../pidgin/plugins/pidginrc.c:576
+#: ../pidgin/plugins/pidginrc.c:578
 msgid "Tools"
 msgstr "撌亙"
 
-#: ../pidgin/plugins/pidginrc.c:581
+#: ../pidgin/plugins/pidginrc.c:583
 #, c-format
 msgid "Write settings to %s%sgtkrc-2.0"
 msgstr "撠閮剖撖怠%s%sgtkrc-2.0"
 
-#: ../pidgin/plugins/pidginrc.c:589
+#: ../pidgin/plugins/pidginrc.c:591
 msgid "Re-read gtkrc files"
 msgstr "啗gtkrc瑼獢"
 
-#: ../pidgin/plugins/pidginrc.c:616
+#: ../pidgin/plugins/pidginrc.c:624
 msgid "Pidgin GTK+ Theme Control"
 msgstr "Pidgin GTK+ 雿臭蜓憿閮剖"
 
-#: ../pidgin/plugins/pidginrc.c:618 ../pidgin/plugins/pidginrc.c:619
+#: ../pidgin/plugins/pidginrc.c:626 ../pidgin/plugins/pidginrc.c:627
 msgid "Provides access to commonly used gtkrc settings."
 msgstr "靘銝 gtkrc 閮剖摮"
 
@@ -15381,11 +15454,11 @@
 
 #: ../pidgin/plugins/raw.c:178
 msgid ""
-"Lets you send raw input to text-based protocols (Jabber, MSN, IRC, TOC). Hit "
+"Lets you send raw input to text-based protocols (XMPP, MSN, IRC, TOC). Hit "
 "'Enter' in the entry box to send. Watch the debug window."
 msgstr ""
-"霈函湔亥撓交隞文蝔格摮璅∪閮摰嚗靘憒 JabberMSNIRC  TOC嚗脰"
-"雿刻撓交雿頛詨交隞歹 Enter 敺菟綽賊鞈閮券日航蝒憿舐內"
+"霈函湔亥撓交隞文蝔格摮璅∪閮摰嚗靘憒 XMPPMSNIRC  TOC嚗脰"
+"雿刻撓交雿頛詨交隞歹 Enter 敺菟綽賊鞈閮券日航蝒憿舐內"
 
 # XXX 怨陌
 #: ../pidgin/plugins/relnot.c:71
@@ -15501,11 +15574,11 @@
 msgid "Enable replacement of last word on send"
 msgstr "敺頛詨亦銝摮銋脰摮隞"
 
-#: ../pidgin/plugins/spellchk.c:2367
+#: ../pidgin/plugins/spellchk.c:2373
 msgid "Text replacement"
 msgstr "摮隞"
 
-#: ../pidgin/plugins/spellchk.c:2369 ../pidgin/plugins/spellchk.c:2370
+#: ../pidgin/plugins/spellchk.c:2375 ../pidgin/plugins/spellchk.c:2376
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr "靘找蝙刻摰蝢拍閬靘隞箄臭葉摮"
 
@@ -15527,7 +15600,7 @@
 msgid "A horizontal scrolling version of the buddy list."
 msgstr "憟賢皜桃瘞游像脣"
 
-#: ../pidgin/plugins/timestamp.c:136
+#: ../pidgin/plugins/timestamp.c:137
 msgid "Display Timestamps Every"
 msgstr "唾憿舐內餌"
 
@@ -15537,19 +15610,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/timestamp.c:195
+#: ../pidgin/plugins/timestamp.c:202
 msgid "Timestamp"
 msgstr "唾"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/timestamp.c:198
+#: ../pidgin/plugins/timestamp.c:205
 msgid "Display iChat-style timestamps"
 msgstr "憿舐內 iChat 撘唾"
 
 #. *  description
-#: ../pidgin/plugins/timestamp.c:200
+#: ../pidgin/plugins/timestamp.c:207
 msgid "Display iChat-style timestamps every N minutes."
 msgstr "瘥 N 憿舐內 iChat 憸冽潛唾"
 
@@ -15558,9 +15631,8 @@
 msgstr "唾澆賊"
 
 #: ../pidgin/plugins/timestamp_format.c:26
-#, c-format
-msgid "_Force (traditional %s) 24-hour time format"
-msgstr "撘瑕嗡蝙剁%s 喟絞雿輻函嚗24撠嗆澆(_F)"
+msgid "_Force 24-hour time format"
+msgstr "撘瑕嗡蝙24撠嗆澆(_F)"
 
 #: ../pidgin/plugins/timestamp_format.c:33
 msgid "Show dates in..."
@@ -15591,19 +15663,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/timestamp_format.c:144
+#: ../pidgin/plugins/timestamp_format.c:151
 msgid "Message Timestamp Formats"
 msgstr "閮舀唾澆"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/timestamp_format.c:147
+#: ../pidgin/plugins/timestamp_format.c:154
 msgid "Customizes the message timestamp formats."
 msgstr "雿輻刻芸閮舀唾澆"
 
 #. *  description
-#: ../pidgin/plugins/timestamp_format.c:149
+#: ../pidgin/plugins/timestamp_format.c:156
 msgid ""
 "This plugin allows the user to customize conversation and logging message "
 "timestamp formats."
@@ -15657,19 +15729,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:658
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:664
 msgid "Transparency"
 msgstr "摨"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:661
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:667
 msgid "Variable Transparency for the buddy list and conversations."
 msgstr "鈭方閬蝒憟賢皜桃Y"
 
 #. *  description
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:663
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:669
 msgid ""
 "This plugin enables variable alpha transparency on conversation windows and "
 "the buddy list.\n"
@@ -15712,18 +15784,18 @@
 msgid "_Flash window when chat messages are received"
 msgstr "嗅啗憭抵臬閬蝒(_F)"
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:369
-msgid "Pidgwin Options"
-msgstr "Pidgwin 賊"
-
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:371
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:375
+msgid "Windows Pidgin Options"
+msgstr "Windows  Pidgin 賊"
+
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:377
 msgid "Options specific to Pidgin for Windows."
-msgstr "Windows Pidgin 賊賊"
-
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:372
+msgstr "Windows  Pidgin 賊賊"
+
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:378
 msgid ""
 "Provides options specific to Pidgin for Windows , such as buddy list docking."
-msgstr "靘 Windows Pidgin 賊賊嚗靘憒憟賢皜桃擏賬"
+msgstr "靘 Windows  Pidgin 賊賊嚗靘憒憟賢皜桃擏賬"
 
 #: ../pidgin/plugins/xmppconsole.c:665
 msgid "<font color='#777777'>Logged out.</font>"
@@ -15774,6 +15846,139 @@
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr "撟怠拍 XMPP 隡箸冽摰X嗥垢脰日胯"
 
+#~ msgid "GtkTreeView Expander Size"
+#~ msgstr "GtkTreeView 撅典之撠"
+
+#~ msgid "GtkTreeView Indent Expanders"
+#~ msgstr "GtkTreeView撅"
+
+# FIXME 霅舀敺寥 - 20061028
+#~ msgid "Toggle offline buddies"
+#~ msgstr "憿舐內嚗銝憿舐內Y憟賢"
+
+#~ msgid "Timestamps"
+#~ msgstr "唾"
+
+#~ msgid "Jabber Account"
+#~ msgstr "Jabber 撣唾"
+
+#~ msgid "Cannot join %s:"
+#~ msgstr "⊥ %s嚗"
+
+#~ msgid "Search for Jabber users"
+#~ msgstr "撠Jabber雿輻刻"
+
+#~ msgid "Invalid Jabber ID"
+#~ msgstr "Jabber 撣唾⊥"
+
+#~ msgid "Change Jabber Password"
+#~ msgstr "靽格 Jabber 撖蝣"
+
+#~ msgid "Jabber Protocol Plugin"
+#~ msgstr "Jabber 摰璅∠"
+
+#~ msgid "Jabber developer"
+#~ msgstr "Jabber 潸"
+
+#~ msgid "..."
+#~ msgstr "..."
+
+#  XXX 舀璅∠X閮剖隞颱賊嚗銋瘝芸楛舀賊
+#~ msgid "Still need to do something about this."
+#~ msgstr "甇斗芋蝯撠芸"
+
+#~ msgid "Autoreply"
+#~ msgstr "芸閬"
+
+#~ msgid "Autoreply for all the protocols"
+#~ msgstr "拍冽潭閮摰芸閬"
+
+#~ msgid ""
+#~ "This plugin lets you set autoreply message for any protocol. You can set "
+#~ "the global autoreply message from the Plugin-options dialog. To set some "
+#~ "specific autoreply message for a particular buddy, right click on the "
+#~ "buddy in the buddy-list window. To set autoreply messages for some "
+#~ "account, go to the `Advanced' tab of the Account-edit dialog."
+#~ msgstr ""
+#~ "璅∠箏券券閮摰靘芸閬賬閮剖典拍函芸閬嚗芷券"
+#~ "璅∠賊閬蝒閮剖喳荔箏亙末閮剖芸閬嚗隢典末皜桐葉隞交曌喲菟"
+#~ "閰脣憟賢嚗箸函亙董嗉身摰芸閬嚗隢券璅∠賊閬蝒脤"
+#~ "蝝"
+
+#~ msgid "Set autoreply message for %s"
+#~ msgstr "閮剖芸閬蝯 %s 閮"
+
+#~ msgid "Set Autoreply Message"
+#~ msgstr "閮剖芸閬閮"
+
+#~ msgid ""
+#~ "The following message will be sent to the buddy when the buddy sends you "
+#~ "a message and autoreply is enabled."
+#~ msgstr ""
+#~ "嗉芸閬賢敺嚗瘥嗅末蝯行券箄舀嚗銝閮臬鋡怨芸綽"
+
+#~ msgid "Set _Autoreply Message"
+#~ msgstr "閮剖芸閬閮(_A)"
+
+#~ msgid "Autoreply message"
+#~ msgstr "芸閬閮"
+
+#~ msgid "Send autoreply messages when"
+#~ msgstr "雿澆箄芸閬"
+
+#~ msgid "When my account is _away"
+#~ msgstr "嗆撣唾臬具a(_A)"
+
+#~ msgid "When my account is _idle"
+#~ msgstr "嗆撣唾臬具蝵柴(_I)"
+
+#~ msgid "_Default reply"
+#~ msgstr "閮剖閬閮(_D)"
+
+#~ msgid "Status message"
+#~ msgstr "閮"
+
+#~ msgid "Autoreply with status message"
+#~ msgstr "隞亦閮臭箄芸閬"
+
+#~ msgid "Always when there is a status message"
+#~ msgstr "瘥嗉身摰鈭閮舀"
+
+#~ msgid "Only when there's no autoreply message"
+#~ msgstr "芸冽閮剖芸閬閮舀"
+
+#  NOTE: (23:38:07) wing: in the autoreply plugin, does "delay between autoreplies" mean really a delay, or would it rather be an interval during which no autoreplies will be sent to the same buddy?
+#  NOTE: (23:41:12) elb: wing: it is the latter
+#~ msgid "Delay between autoreplies"
+#~ msgstr "芸閬銋賊"
+
+#~ msgid "_Minimum delay (mins)"
+#~ msgstr "賊銝嚗嚗(_M)"
+
+#~ msgid "Times to send autoreplies"
+#~ msgstr "箄芸閬閮舐甈⊥"
+
+#~ msgid "Ma_ximum count"
+#~ msgstr "甈⊥訾 (_X)"
+
+#~ msgid ""
+#~ "I am currently not available. Please leave your message, and I will get "
+#~ "back to you as soon as possible."
+#~ msgstr ""
+#~ "曉其其摮銝隢函銝函閮荔嗆靘嚗撠敹怎策典閬"
+
+#~ msgid "Server couldn't authenticate you without a password"
+#~ msgstr "瘝靘撖蝣潘隡箸函⊥箔脰隤霅"
+
+#~ msgid "Rate limiting error."
+#~ msgstr "園航炊"
+
+#~ msgid "/Tools/Buddy Pounces"
+#~ msgstr "/撌亙/憟賢"
+
+#~ msgid "Slovack"
+#~ msgstr "舀隡"
+
 #~ msgid "Gaim Internet Messenger"
 #~ msgstr "Gaim 蝬脰楝單"
 
@@ -16493,9 +16698,6 @@
 #~ msgid "Offline "
 #~ msgstr "Y"
 
-#~ msgid "Default"
-#~ msgstr "閮"
-
 #~ msgid "<span weight=\"bold\">From:</span> %s\n"
 #~ msgstr "<span weight=\"bold\">靘迎</span> %s\n"
 
--- a/po/zh_TW.po	Tue May 22 12:30:12 2007 +0000
+++ b/po/zh_TW.po	Tue May 22 12:45:40 2007 +0000
@@ -3,7 +3,7 @@
 # Copyright (C) 2003-2007, Ambrose C. Li <acli@ada.dhs.org>
 #
 # This file is distributed under the same license as the "Pidgin" package.
-# $InternalId: zh_TW.po,v 1.447 2007/05/02 06:33:40 acli Exp $
+# $InternalId: zh_TW.po,v 1.468 2007/05/21 21:53:48 acli Exp $
 #
 # ----------------------------------------------------------
 # For internal use only:
@@ -23,7 +23,6 @@
 # - Key 怨陌撖啜嚗嚗Key ExchangeX霅舀箝鈭斗撖啜
 # - Public Key 怨陌祇啜
 # - Private Key 怨陌蝘啜
-# - Key Pair 怎∟陌 (TODO)
 # - Key Agreement  Key Exchange 隡潔蝢抬霅胯鈭斗撖啜
 # - Passphrase 霅胯撖蝣潦
 # (臬行 Mozilla 霅舀 <http://ccca.nctu.edu.tw/~hlb/tavi/MozillaGlossary>?)
@@ -50,8 +49,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Pidgin 2.0.0\n"
-"POT-Creation-Date: 2007-05-02 00:00-0400\n"
-"PO-Revision-Date: 2007-05-02 02:00-0400\n"
+"POT-Creation-Date: 2007-05-21 00:01-0400\n"
+"PO-Revision-Date: 2007-05-20 01:57-0400\n"
 "Last-Translator: Ambrose Li <acli@ada.dhs.org>\n"
 "Language-Team: Chinese (Traditional) <zh-l10n@linux.org.tw>\n"
 "MIME-Version: 1.0\n"
@@ -86,8 +85,15 @@
 "  -n, --nologin       銝芸餃功n"
 "  -v, --version       憿舐內祈臭蒂a\n"
 
+#  NOTE Untranslated
+#. Translators may want to transliterate the name.
+#. It is not to be translated.
+#: ../finch/finch.c:274 ../finch/finch.c:303
+msgid "Finch"
+msgstr "Finch"
+
 #  NOTE 蝚砌銝 %s 靽桅蝔梧銝舐撘嚗
-#: ../finch/finch.c:304 ../pidgin/gtkmain.c:690
+#: ../finch/finch.c:301 ../pidgin/gtkmain.c:685
 #, c-format
 msgid ""
 "%s encountered errors migrating your settings from %s to %s. Please "
@@ -97,18 +103,13 @@
 "%s 撠閮剖梁桅 %s 頧蝘餉喟桅 %s 銝剔潛航炊嚗隢隤踵亙嫣誑鈭箸摰頧蝘餌摨嚗"
 "銝阡 http://developer.pidgin.im 梢航炊"
 
-#  NOTE Untranslated
-#: ../finch/finch.c:306
-msgid "Finch"
-msgstr "Finch"
-
-#: ../finch/gntaccount.c:119 ../finch/gntblist.c:286 ../finch/gntblist.c:411
-#: ../finch/gntblist.c:424 ../finch/gntplugin.c:163 ../finch/gntplugin.c:207
+#: ../finch/gntaccount.c:119 ../finch/gntblist.c:288 ../finch/gntblist.c:413
+#: ../finch/gntblist.c:426 ../finch/gntplugin.c:181 ../finch/gntplugin.c:225
 #: ../finch/gntstatus.c:294 ../finch/gntstatus.c:302
-#: ../libpurple/protocols/jabber/buddy.c:1401
-#: ../libpurple/protocols/jabber/chat.c:679
-#: ../libpurple/protocols/jabber/chat.c:690
-#: ../libpurple/protocols/jabber/jabber.c:1216
+#: ../libpurple/protocols/jabber/buddy.c:1426
+#: ../libpurple/protocols/jabber/chat.c:677
+#: ../libpurple/protocols/jabber/chat.c:688
+#: ../libpurple/protocols/jabber/jabber.c:1229
 #: ../libpurple/protocols/qq/group_join.c:326
 #: ../libpurple/protocols/silc/ops.c:1451
 msgid "Error"
@@ -123,16 +124,16 @@
 msgid "Screenname of an account must be non-empty."
 msgstr "撣唾銝舐蝛箝"
 
-#: ../finch/gntaccount.c:423 ../pidgin/gtkaccount.c:575
+#: ../finch/gntaccount.c:423 ../pidgin/gtkaccount.c:590
 msgid "New mail notifications"
 msgstr "圈萎辣"
 
-#: ../finch/gntaccount.c:433 ../pidgin/gtkaccount.c:504
+#: ../finch/gntaccount.c:433 ../pidgin/gtkaccount.c:519
 msgid "Remember password"
 msgstr "閮雿撖蝣"
 
-#: ../finch/gntaccount.c:474 ../pidgin/gtkaccount.c:1442
-#: ../pidgin/gtkblist.c:3946
+#: ../finch/gntaccount.c:474 ../pidgin/gtkaccount.c:1456
+#: ../pidgin/gtkblist.c:3965
 msgid "Modify Account"
 msgstr "靽格孵董"
 
@@ -141,49 +142,49 @@
 msgid "New Account"
 msgstr "啣董"
 
-#: ../finch/gntaccount.c:500 ../pidgin/gtkaccount.c:415 ../pidgin/gtkft.c:695
+#: ../finch/gntaccount.c:500 ../pidgin/gtkaccount.c:427 ../pidgin/gtkft.c:695
 msgid "Protocol:"
 msgstr "閮摰嚗"
 
-#: ../finch/gntaccount.c:508 ../pidgin/gtkaccount.c:420
-#: ../pidgin/gtkblist.c:5355
+#: ../finch/gntaccount.c:508 ../pidgin/gtkaccount.c:435
+#: ../pidgin/gtkblist.c:5389
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:295
 msgid "Screen name:"
 msgstr "撣唾嚗"
 
-#: ../finch/gntaccount.c:521 ../pidgin/gtkaccount.c:495
+#: ../finch/gntaccount.c:521 ../pidgin/gtkaccount.c:510
 msgid "Password:"
 msgstr "撖蝣潘"
 
-#: ../finch/gntaccount.c:531 ../pidgin/gtkblist.c:5376
-#: ../pidgin/gtkblist.c:5739
+#: ../finch/gntaccount.c:531 ../pidgin/gtkblist.c:5410
+#: ../pidgin/gtkblist.c:5773
 msgid "Alias:"
 msgstr "亙嚗"
 
 #. Cancel button
 #. Cancel
 #: ../finch/gntaccount.c:554 ../finch/gntaccount.c:617
-#: ../finch/gntaccount.c:838 ../finch/gntblist.c:330 ../finch/gntblist.c:399
-#: ../finch/gntblist.c:434 ../finch/gntblist.c:762 ../finch/gntblist.c:952
-#: ../finch/gntblist.c:1048 ../finch/gntblist.c:2137 ../finch/gntplugin.c:336
-#: ../finch/gntpounce.c:456 ../finch/gntpounce.c:654 ../finch/gntprefs.c:245
+#: ../finch/gntaccount.c:838 ../finch/gntblist.c:332 ../finch/gntblist.c:401
+#: ../finch/gntblist.c:436 ../finch/gntblist.c:768 ../finch/gntblist.c:965
+#: ../finch/gntblist.c:1061 ../finch/gntblist.c:2155 ../finch/gntplugin.c:360
+#: ../finch/gntpounce.c:456 ../finch/gntpounce.c:654 ../finch/gntprefs.c:246
 #: ../finch/gntstatus.c:142 ../finch/gntstatus.c:475 ../finch/gntstatus.c:600
 #: ../libpurple/account.c:984 ../libpurple/account.c:1234
-#: ../libpurple/account.c:1269 ../libpurple/conversation.c:1164
+#: ../libpurple/account.c:1269 ../libpurple/conversation.c:1168
 #: ../libpurple/plugins/buddynote.c:51 ../libpurple/protocols/gg/gg.c:502
 #: ../libpurple/protocols/gg/gg.c:661 ../libpurple/protocols/gg/gg.c:798
 #: ../libpurple/protocols/gg/gg.c:879
 #: ../libpurple/protocols/jabber/buddy.c:584
-#: ../libpurple/protocols/jabber/buddy.c:1763
-#: ../libpurple/protocols/jabber/buddy.c:1799
-#: ../libpurple/protocols/jabber/chat.c:788
-#: ../libpurple/protocols/jabber/jabber.c:874
-#: ../libpurple/protocols/jabber/jabber.c:1371
+#: ../libpurple/protocols/jabber/buddy.c:1788
+#: ../libpurple/protocols/jabber/buddy.c:1824
+#: ../libpurple/protocols/jabber/chat.c:786
+#: ../libpurple/protocols/jabber/jabber.c:878
+#: ../libpurple/protocols/jabber/jabber.c:1384
 #: ../libpurple/protocols/jabber/xdata.c:337
-#: ../libpurple/protocols/msn/msn.c:250 ../libpurple/protocols/msn/msn.c:267
-#: ../libpurple/protocols/msn/msn.c:284 ../libpurple/protocols/msn/msn.c:301
-#: ../libpurple/protocols/msn/msn.c:322
-#: ../libpurple/protocols/oscar/oscar.c:6003
+#: ../libpurple/protocols/msn/msn.c:259 ../libpurple/protocols/msn/msn.c:276
+#: ../libpurple/protocols/msn/msn.c:293 ../libpurple/protocols/msn/msn.c:310
+#: ../libpurple/protocols/msn/msn.c:331
+#: ../libpurple/protocols/oscar/oscar.c:6004
 #: ../libpurple/protocols/oscar/peer.c:1023
 #: ../libpurple/protocols/qq/buddy_info.c:484
 #: ../libpurple/protocols/qq/buddy_opt.c:214
@@ -199,9 +200,9 @@
 #: ../libpurple/protocols/sametime/sametime.c:3388
 #: ../libpurple/protocols/sametime/sametime.c:3474
 #: ../libpurple/protocols/sametime/sametime.c:3645
-#: ../libpurple/protocols/sametime/sametime.c:5391
-#: ../libpurple/protocols/sametime/sametime.c:5481
-#: ../libpurple/protocols/sametime/sametime.c:5606
+#: ../libpurple/protocols/sametime/sametime.c:5397
+#: ../libpurple/protocols/sametime/sametime.c:5487
+#: ../libpurple/protocols/sametime/sametime.c:5612
 #: ../libpurple/protocols/silc/buddy.c:468
 #: ../libpurple/protocols/silc/buddy.c:1084
 #: ../libpurple/protocols/silc/buddy.c:1189
@@ -210,16 +211,16 @@
 #: ../libpurple/protocols/silc/ops.c:1913
 #: ../libpurple/protocols/silc/silc.c:744
 #: ../libpurple/protocols/silc/silc.c:950
-#: ../libpurple/protocols/yahoo/yahoo.c:991
-#: ../libpurple/protocols/yahoo/yahoo.c:3235
-#: ../libpurple/protocols/yahoo/yahoo.c:3246 ../pidgin/gtkaccount.c:1880
-#: ../pidgin/gtkaccount.c:2471 ../pidgin/gtkblist.c:5795
-#: ../pidgin/gtkdialogs.c:722 ../pidgin/gtkdialogs.c:860
-#: ../pidgin/gtkdialogs.c:952 ../pidgin/gtkdialogs.c:972
-#: ../pidgin/gtkdialogs.c:996 ../pidgin/gtkdialogs.c:1018
-#: ../pidgin/gtkdialogs.c:1066 ../pidgin/gtkdialogs.c:1107
-#: ../pidgin/gtkdialogs.c:1163 ../pidgin/gtkdialogs.c:1202
-#: ../pidgin/gtkdialogs.c:1229 ../pidgin/gtkimhtmltoolbar.c:419
+#: ../libpurple/protocols/yahoo/yahoo.c:987
+#: ../libpurple/protocols/yahoo/yahoo.c:3231
+#: ../libpurple/protocols/yahoo/yahoo.c:3242 ../pidgin/gtkaccount.c:1894
+#: ../pidgin/gtkaccount.c:2485 ../pidgin/gtkblist.c:5829
+#: ../pidgin/gtkdialogs.c:725 ../pidgin/gtkdialogs.c:863
+#: ../pidgin/gtkdialogs.c:955 ../pidgin/gtkdialogs.c:975
+#: ../pidgin/gtkdialogs.c:999 ../pidgin/gtkdialogs.c:1021
+#: ../pidgin/gtkdialogs.c:1069 ../pidgin/gtkdialogs.c:1110
+#: ../pidgin/gtkdialogs.c:1166 ../pidgin/gtkdialogs.c:1205
+#: ../pidgin/gtkdialogs.c:1232 ../pidgin/gtkimhtmltoolbar.c:419
 #: ../pidgin/gtklog.c:302 ../pidgin/gtkplugin.c:288 ../pidgin/gtkpounce.c:1102
 #: ../pidgin/gtkprivacy.c:566 ../pidgin/gtkprivacy.c:582
 #: ../pidgin/gtkprivacy.c:607 ../pidgin/gtkprivacy.c:621
@@ -229,15 +230,15 @@
 
 #. Save button
 #. Save
-#: ../finch/gntaccount.c:558 ../finch/gntplugin.c:336 ../finch/gntpounce.c:462
-#: ../finch/gntprefs.c:245 ../finch/gntstatus.c:478 ../finch/gntstatus.c:588
+#: ../finch/gntaccount.c:558 ../finch/gntplugin.c:360 ../finch/gntpounce.c:462
+#: ../finch/gntprefs.c:246 ../finch/gntstatus.c:478 ../finch/gntstatus.c:588
 #: ../libpurple/account.c:1268 ../libpurple/plugins/buddynote.c:50
-#: ../libpurple/protocols/jabber/buddy.c:583 ../pidgin/gtkdebug.c:764
+#: ../libpurple/protocols/jabber/buddy.c:583 ../pidgin/gtkdebug.c:747
 #: ../pidgin/gtkrequest.c:276
 msgid "Save"
 msgstr "脣"
 
-#: ../finch/gntaccount.c:611 ../pidgin/gtkaccount.c:1872
+#: ../finch/gntaccount.c:611 ../pidgin/gtkaccount.c:1886
 #: ../pidgin/gtksavedstatuses.c:328
 #, c-format
 msgid "Are you sure you want to delete %s?"
@@ -250,14 +251,14 @@
 #. Delete button
 #: ../finch/gntaccount.c:616 ../finch/gntaccount.c:683
 #: ../finch/gntpounce.c:653 ../finch/gntpounce.c:714 ../finch/gntstatus.c:141
-#: ../finch/gntstatus.c:204 ../pidgin/gtkaccount.c:1879 ../pidgin/gtklog.c:301
+#: ../finch/gntstatus.c:204 ../pidgin/gtkaccount.c:1893 ../pidgin/gtklog.c:301
 #: ../pidgin/gtkpounce.c:1101 ../pidgin/gtkrequest.c:273
 #: ../pidgin/gtksavedstatuses.c:336
 msgid "Delete"
 msgstr "芷"
 
-#: ../finch/gntaccount.c:646 ../finch/gntblist.c:2043 ../finch/gntui.c:76
-#: ../pidgin/gtkaccount.c:2297 ../pidgin/gtkdocklet.c:541
+#: ../finch/gntaccount.c:646 ../finch/gntblist.c:2060 ../finch/gntui.c:76
+#: ../pidgin/gtkaccount.c:2311 ../pidgin/gtkdocklet.c:522
 msgid "Accounts"
 msgstr "撣唾皜"
 
@@ -266,15 +267,15 @@
 msgstr "隞乩銵函撣唾舫冽具具"
 
 #. Add button
-#: ../finch/gntaccount.c:675 ../finch/gntaccount.c:837 ../finch/gntblist.c:329
-#: ../finch/gntblist.c:399 ../finch/gntblist.c:434 ../finch/gntnotify.c:309
+#: ../finch/gntaccount.c:675 ../finch/gntaccount.c:837 ../finch/gntblist.c:331
+#: ../finch/gntblist.c:401 ../finch/gntblist.c:436 ../finch/gntnotify.c:369
 #: ../finch/gntpounce.c:699 ../finch/gntstatus.c:194
 #: ../libpurple/protocols/gg/gg.c:878 ../libpurple/protocols/qq/sys_msg.c:116
 #: ../libpurple/protocols/qq/sys_msg.c:175
 #: ../libpurple/protocols/qq/sys_msg.c:270
-#: ../libpurple/protocols/sametime/sametime.c:5480
-#: ../libpurple/protocols/silc/chat.c:599 ../pidgin/gtkaccount.c:2470
-#: ../pidgin/gtkblist.c:5794 ../pidgin/gtkconv.c:1633
+#: ../libpurple/protocols/sametime/sametime.c:5486
+#: ../libpurple/protocols/silc/chat.c:599 ../pidgin/gtkaccount.c:2484
+#: ../pidgin/gtkblist.c:5828 ../pidgin/gtkconv.c:1651
 #: ../pidgin/gtkrequest.c:274
 msgid "Add"
 msgstr ""
@@ -284,34 +285,34 @@
 msgid "Modify"
 msgstr "靽格"
 
-#: ../finch/gntaccount.c:760 ../pidgin/gtkaccount.c:2417
+#: ../finch/gntaccount.c:760 ../pidgin/gtkaccount.c:2431
 #, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s"
 msgstr "%s%s%s%s 乩 %s 箔嚗憟對憟賢 %s%s"
 
-#: ../finch/gntaccount.c:833 ../pidgin/gtkaccount.c:2469
+#: ../finch/gntaccount.c:833 ../pidgin/gtkaccount.c:2483
 msgid "Add buddy to your list?"
 msgstr "撠雿輻刻交函憟賢皜殷"
 
 #  NOTE: 剔 %s%s%s%s 臬孵董嚗撣唾砍憫亙嚗蝚砌 %s 舀砍憫嚗
 #  NOTE: 撠曄 %s%s 舐征賣: 閮胯嚗箸砌臭誑銝嚗銋銝賣璅嚗
-#: ../finch/gntaccount.c:887 ../pidgin/gtkaccount.c:2521
+#: ../finch/gntaccount.c:887 ../pidgin/gtkaccount.c:2535
 #, c-format
 msgid "%s%s%s%s wants to add %s to his or her buddy list%s%s"
 msgstr "雿輻刻 %s%s%s%s 唾撠 %s 乩嚗憟對憟賢皜%s%s"
 
 #: ../finch/gntaccount.c:907 ../finch/gntaccount.c:914
-#: ../pidgin/gtkaccount.c:2544 ../pidgin/gtkaccount.c:2550
+#: ../pidgin/gtkaccount.c:2558 ../pidgin/gtkaccount.c:2564
 msgid "Authorize buddy?"
 msgstr "蝯虫隤霅嚗"
 
 #: ../finch/gntaccount.c:911 ../finch/gntaccount.c:918
-#: ../pidgin/gtkaccount.c:2545 ../pidgin/gtkaccount.c:2551
+#: ../pidgin/gtkaccount.c:2559 ../pidgin/gtkaccount.c:2565
 msgid "Authorize"
 msgstr "蝯虫隤霅"
 
 #: ../finch/gntaccount.c:912 ../finch/gntaccount.c:919
-#: ../pidgin/gtkaccount.c:2546 ../pidgin/gtkaccount.c:2552
+#: ../pidgin/gtkaccount.c:2560 ../pidgin/gtkaccount.c:2566
 msgid "Deny"
 msgstr "蝯"
 
@@ -327,62 +328,66 @@
 msgid "You must select an account."
 msgstr "敹摰撣唾"
 
-#: ../finch/gntblist.c:286
+#: ../finch/gntblist.c:284
+msgid "The selected account is not online."
+msgstr "摰撣唾桀瘝蝺"
+
+#: ../finch/gntblist.c:288
 msgid "Error adding buddy"
 msgstr "啣憟賢銝剔潛鈭航炊"
 
-#: ../finch/gntblist.c:311 ../libpurple/protocols/oscar/oscar.c:2837
-#: ../pidgin/gtkaccount.c:1955 ../pidgin/gtksavedstatuses.c:924
+#: ../finch/gntblist.c:313 ../libpurple/protocols/oscar/oscar.c:2843
+#: ../pidgin/gtkaccount.c:1969 ../pidgin/gtksavedstatuses.c:924
 msgid "Screen Name"
 msgstr "撣唾"
 
-#: ../finch/gntblist.c:314 ../finch/gntblist.c:391 ../finch/gntblist.c:949
-#: ../finch/gntblist.c:1193 ../libpurple/protocols/msn/msn.c:1351
+#: ../finch/gntblist.c:316 ../finch/gntblist.c:393 ../finch/gntblist.c:1209
+#: ../libpurple/protocols/msn/msn.c:1359
 #: ../libpurple/protocols/silc/chat.c:590
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:680
 #: ../libpurple/protocols/zephyr/zephyr.c:788
-#: ../libpurple/protocols/zephyr/zephyr.c:1206 ../pidgin/gtkdialogs.c:971
-#: ../pidgin/gtkdialogs.c:995 ../pidgin/gtkdialogs.c:1017
+#: ../libpurple/protocols/zephyr/zephyr.c:1207 ../pidgin/gtkdialogs.c:974
+#: ../pidgin/gtkdialogs.c:998 ../pidgin/gtkdialogs.c:1020
 #: ../pidgin/gtkrequest.c:277
 msgid "Alias"
 msgstr "亙"
 
-#: ../finch/gntblist.c:317 ../finch/gntblist.c:394
+#: ../finch/gntblist.c:319 ../finch/gntblist.c:396
 msgid "Group"
 msgstr "蝢斤"
 
-#: ../finch/gntblist.c:321 ../finch/gntblist.c:382 ../finch/gntblist.c:1243
-#: ../finch/gntnotify.c:155 ../finch/gntstatus.c:566
+#: ../finch/gntblist.c:323 ../finch/gntblist.c:384 ../finch/gntblist.c:1259
+#: ../finch/gntnotify.c:171 ../finch/gntstatus.c:566
 #: ../libpurple/plugins/idle.c:153 ../libpurple/plugins/idle.c:190
-#: ../pidgin/gtkblist.c:2947 ../pidgin/gtknotify.c:476
+#: ../pidgin/gtkblist.c:2965 ../pidgin/gtknotify.c:476
 #: ../pidgin/gtkpounce.c:1269 ../pidgin/plugins/gevolution/gevolution.c:444
 msgid "Account"
 msgstr "撣唾"
 
-#: ../finch/gntblist.c:327 ../finch/gntblist.c:811
+#: ../finch/gntblist.c:329 ../finch/gntblist.c:817
 #: ../libpurple/protocols/silc/buddy.c:737
 #: ../libpurple/protocols/silc/buddy.c:1033
 #: ../libpurple/protocols/silc/buddy.c:1080
 #: ../libpurple/protocols/silc/buddy.c:1180
-#: ../libpurple/protocols/yahoo/yahoo.c:3148 ../pidgin/gtkblist.c:5309
+#: ../libpurple/protocols/yahoo/yahoo.c:3144 ../pidgin/gtkblist.c:5343
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:447
 msgid "Add Buddy"
 msgstr "啣憟賢"
 
 # TODO 閬閬 - 20061025
-#: ../finch/gntblist.c:327
+#: ../finch/gntblist.c:329
 msgid "Please enter buddy information."
 msgstr "隢頛詨亙末鞈閮"
 
-#: ../finch/gntblist.c:354 ../libpurple/blist.c:1192
+#: ../finch/gntblist.c:356 ../libpurple/blist.c:1192
 msgid "Chats"
 msgstr "憭"
 
 # NOTE 芾質陌蝔晞嚗箏閫雿鈭箏璅∠蝔晞
 #. Extract their Name and put it in
-#: ../finch/gntblist.c:388 ../libpurple/protocols/jabber/jabber.c:805
-#: ../libpurple/protocols/msn/msn.c:1524 ../libpurple/protocols/msn/msn.c:1589
-#: ../libpurple/protocols/msn/msn.c:1616
+#: ../finch/gntblist.c:390 ../libpurple/protocols/jabber/jabber.c:809
+#: ../libpurple/protocols/msn/msn.c:1532 ../libpurple/protocols/msn/msn.c:1597
+#: ../libpurple/protocols/msn/msn.c:1624
 #: ../libpurple/protocols/qq/buddy_info.c:44 ../pidgin/gtkplugin.c:581
 #: ../pidgin/gtkroomlist.c:621
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:132
@@ -390,168 +395,185 @@
 msgid "Name"
 msgstr "蝔"
 
-#: ../finch/gntblist.c:397 ../finch/gntblist.c:813 ../pidgin/gtkblist.c:5685
+#: ../finch/gntblist.c:399 ../finch/gntblist.c:819 ../pidgin/gtkblist.c:5719
 msgid "Add Chat"
 msgstr "啣憭拙恕"
 
-#: ../finch/gntblist.c:398
+#: ../finch/gntblist.c:400
 msgid "You can edit more information from the context menu later."
 msgstr "憒閬蝜潛靽格孵嗡蝝啁嚗隢典翰憿舫詨柴"
 
-#: ../finch/gntblist.c:411 ../finch/gntblist.c:424
+#: ../finch/gntblist.c:413 ../finch/gntblist.c:426
 msgid "Error adding group"
 msgstr "啣蝢斤銝剔潛鈭航炊"
 
-#: ../finch/gntblist.c:412
+#: ../finch/gntblist.c:414
 msgid "You must give a name for the group to add."
 msgstr "隢蝯行冽啣蝢斤頛詨亙蝔晞"
 
-#: ../finch/gntblist.c:425
+#: ../finch/gntblist.c:427
 msgid "A group with the name already exists."
 msgstr "蝢斤撌脩摮"
 
 # TODO 隢閬交詨祕嚗胯乓啣?
-#: ../finch/gntblist.c:432 ../finch/gntblist.c:815
-#: ../libpurple/protocols/sametime/sametime.c:5390
-#: ../libpurple/protocols/sametime/sametime.c:5478 ../pidgin/gtkblist.c:5791
+#: ../finch/gntblist.c:434 ../finch/gntblist.c:821
+#: ../libpurple/protocols/sametime/sametime.c:5396
+#: ../libpurple/protocols/sametime/sametime.c:5484 ../pidgin/gtkblist.c:5825
 msgid "Add Group"
 msgstr "亦黎蝯"
 
 # TODO 閬閬 - 20061026
-#: ../finch/gntblist.c:432
+#: ../finch/gntblist.c:434
 msgid "Enter the name of the group"
 msgstr "隢蝯衣黎蝯頛詨亙蝔晞"
 
-#: ../finch/gntblist.c:761
+#: ../finch/gntblist.c:767
 msgid "Edit Chat"
 msgstr "靽格寡憭拙恕"
 
-#: ../finch/gntblist.c:761
+#: ../finch/gntblist.c:767
 msgid "Please Update the necessary fields."
 msgstr "隢閬湔唳雿抒鞈閮"
 
 # TODO 閬閬 - 20061025
-#: ../finch/gntblist.c:762 ../finch/gntstatus.c:199
+#: ../finch/gntblist.c:768 ../finch/gntstatus.c:199
 msgid "Edit"
 msgstr "靽格"
 
-#: ../finch/gntblist.c:778
+#: ../finch/gntblist.c:784
 msgid "Auto-join"
 msgstr "芸"
 
 # XXX 胯靽格寥賊嚗
-#: ../finch/gntblist.c:787
+#: ../finch/gntblist.c:793
 msgid "Edit Settings"
 msgstr "靽格寡身摰"
 
-#: ../finch/gntblist.c:851 ../libpurple/protocols/silc/chat.c:883
+# XXX 20070518
+#: ../finch/gntblist.c:831 ../finch/gntconv.c:317 ../pidgin/gtkblist.c:278
+#: ../pidgin/gtkconv.c:677
+msgid "Information"
+msgstr "鞈閮"
+
+#: ../finch/gntblist.c:831 ../finch/gntconv.c:317 ../pidgin/gtkblist.c:278
+#: ../pidgin/gtkconv.c:677
+msgid "Retrieving..."
+msgstr "霈銝..."
+
+#: ../finch/gntblist.c:864 ../finch/gntconv.c:418
+#: ../libpurple/protocols/silc/chat.c:883
 msgid "Get Info"
 msgstr "敺鞈閮"
 
-#: ../finch/gntblist.c:855
+#: ../finch/gntblist.c:868
 msgid "Add Buddy Pounce"
 msgstr "亙末"
 
 #. if (q_bud && is_online(q_bud->status)) {
-#: ../finch/gntblist.c:862 ../libpurple/protocols/oscar/oscar.c:635
-#: ../libpurple/protocols/qq/qq.c:585 ../pidgin/gtkconv.c:1581
+#: ../finch/gntblist.c:875 ../finch/gntconv.c:430
+#: ../libpurple/protocols/oscar/oscar.c:636 ../libpurple/protocols/qq/qq.c:585
+#: ../pidgin/gtkconv.c:1599
 msgid "Send File"
 msgstr "喲瑼獢"
 
-#: ../finch/gntblist.c:866
+#: ../finch/gntblist.c:879
 msgid "View Log"
 msgstr "閫亥"
 
-#: ../finch/gntblist.c:947
+#: ../finch/gntblist.c:960
 #, c-format
 msgid "Please enter the new name for %s"
 msgstr "隢頛詨 %s 啣蝣"
 
-#: ../finch/gntblist.c:949 ../finch/gntblist.c:1193
+#: ../finch/gntblist.c:962 ../finch/gntblist.c:1209
 msgid "Rename"
 msgstr "賢"
 
+#: ../finch/gntblist.c:962
+msgid "Set Alias"
+msgstr "閮剖亙"
+
 # FIXME 霅舀敺寥 - 20061029
-#: ../finch/gntblist.c:950
+#: ../finch/gntblist.c:963
 msgid "Enter empty string to reset the name."
 msgstr "憒閬蝵桀蝔梧隢頛詨亦征賢銝脯"
 
-#: ../finch/gntblist.c:1026
+#: ../finch/gntblist.c:1039
 msgid "Removing this contact will also remove all the buddies in the contact"
 msgstr "蝘駁日蝯憟賢蝘駁方Y憟賢"
 
-#: ../finch/gntblist.c:1034
+#: ../finch/gntblist.c:1047
 msgid "Removing this group will also remove all the buddies in the group"
 msgstr "蝘駁日蝢斤蝘駁方Y憟賢"
 
-#: ../finch/gntblist.c:1039
+#: ../finch/gntblist.c:1052
 #, c-format
 msgid "Are you sure you want to remove %s?"
 msgstr "函Ⅱ摰閬芷 %s嚗"
 
 #. XXX: anything to do with the returned ui-handle?
-#: ../finch/gntblist.c:1042
+#: ../finch/gntblist.c:1055
 msgid "Confirm Remove"
 msgstr "蝣箄蝘駁"
 
-#: ../finch/gntblist.c:1047 ../finch/gntblist.c:1195 ../finch/gntft.c:223
-#: ../pidgin/gtkblist.c:1118 ../pidgin/gtkconv.c:1630
+#: ../finch/gntblist.c:1060 ../finch/gntblist.c:1211 ../finch/gntft.c:223
+#: ../pidgin/gtkblist.c:1135 ../pidgin/gtkconv.c:1648
 #: ../pidgin/gtkrequest.c:275 ../pidgin/gtkstatusbox.c:261
 msgid "Remove"
 msgstr "蝘駁"
 
 #. Buddy List
-#: ../finch/gntblist.c:1169 ../finch/gntblist.c:2214 ../finch/gntprefs.c:239
-#: ../finch/gntui.c:77 ../pidgin/gtkblist.c:4188
+#: ../finch/gntblist.c:1185 ../finch/gntblist.c:2232 ../finch/gntprefs.c:240
+#: ../finch/gntui.c:77 ../pidgin/gtkblist.c:4209
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:330
 msgid "Buddy List"
 msgstr "憟賢皜"
 
 # XXX - 20061122
 # NOTE (013537蝘) wabz: Anyway, I think the concept is more important than the literal translation - you use "Toggle Tag" on the currently selected buddy, then select a group/contact and hit "Place Tagged", and the buddy is moved
-#: ../finch/gntblist.c:1200
+#: ../finch/gntblist.c:1216
 msgid "Place tagged"
 msgstr "蝘餃撌脫閮"
 
 # FIXME - 20061122
-#: ../finch/gntblist.c:1205
+#: ../finch/gntblist.c:1221
 msgid "Toggle Tag"
 msgstr "璅閮"
 
 #. General
-#: ../finch/gntblist.c:1238 ../libpurple/protocols/gg/gg.c:632
+#: ../finch/gntblist.c:1254 ../libpurple/protocols/gg/gg.c:632
 #: ../libpurple/protocols/gg/gg.c:1045 ../libpurple/protocols/gg/gg.c:1120
 #: ../libpurple/protocols/gg/gg.c:2204
 #: ../libpurple/protocols/jabber/buddy.c:274
 #: ../libpurple/protocols/jabber/buddy.c:818
-#: ../libpurple/protocols/jabber/buddy.c:1564
-#: ../libpurple/protocols/jabber/buddy.c:1746
-#: ../libpurple/protocols/jabber/jabber.c:815
-#: ../libpurple/protocols/msn/msn.c:1359 ../libpurple/protocols/msn/msn.c:1527
+#: ../libpurple/protocols/jabber/buddy.c:1589
+#: ../libpurple/protocols/jabber/buddy.c:1771
+#: ../libpurple/protocols/jabber/jabber.c:819
+#: ../libpurple/protocols/msn/msn.c:1367 ../libpurple/protocols/msn/msn.c:1535
 #: ../libpurple/protocols/qq/buddy_info.c:43
 #: ../libpurple/protocols/silc/buddy.c:1535
 #: ../libpurple/protocols/silc/ops.c:1036
 #: ../libpurple/protocols/silc/ops.c:1179
 #: ../libpurple/protocols/silc/ops.c:1328
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1042 ../pidgin/gtkblist.c:2971
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1042 ../pidgin/gtkblist.c:2989
 msgid "Nickname"
 msgstr "梁迂"
 
 #. Idle stuff
-#: ../finch/gntblist.c:1258 ../finch/gntprefs.c:242
+#: ../finch/gntblist.c:1274 ../finch/gntprefs.c:243
 #: ../libpurple/protocols/bonjour/bonjour.c:322
 #: ../libpurple/protocols/jabber/buddy.c:643
 #: ../libpurple/protocols/jabber/buddy.c:683
-#: ../libpurple/protocols/msn/msn.c:524 ../libpurple/protocols/msn/state.c:32
+#: ../libpurple/protocols/msn/msn.c:516 ../libpurple/protocols/msn/state.c:32
 #: ../libpurple/protocols/novell/novell.c:2825
-#: ../libpurple/protocols/oscar/oscar.c:2861
-#: ../libpurple/protocols/yahoo/yahoo.c:2902
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:686 ../pidgin/gtkblist.c:2991
-#: ../pidgin/gtkblist.c:3380 ../pidgin/gtkprefs.c:1809
+#: ../libpurple/protocols/oscar/oscar.c:2867
+#: ../libpurple/protocols/yahoo/yahoo.c:2898
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:686 ../pidgin/gtkblist.c:3009
+#: ../pidgin/gtkblist.c:3399 ../pidgin/gtkprefs.c:1809
 msgid "Idle"
 msgstr "蝵"
 
-#: ../finch/gntblist.c:1347
+#: ../finch/gntblist.c:1363
 #, c-format
 msgid ""
 "Online: %d\n"
@@ -560,12 +582,12 @@
 "銝蝺嚗%d 鈭暝n"
 "蝮賣賂%d 鈭"
 
-#: ../finch/gntblist.c:1356
+#: ../finch/gntblist.c:1372
 #, c-format
 msgid "Account: %s (%s)"
 msgstr "撣唾嚗%s (%s)"
 
-#: ../finch/gntblist.c:1368
+#: ../finch/gntblist.c:1384
 #, c-format
 msgid ""
 "\n"
@@ -575,52 +597,52 @@
 "<b>敺閬堆</b>%s"
 
 # XXX check
-#: ../finch/gntblist.c:1632 ../pidgin/gtkdocklet.c:489
+#: ../finch/gntblist.c:1649 ../pidgin/gtkdocklet.c:470
 #: ../pidgin/gtkstatusbox.c:1064
 msgid "New..."
 msgstr "啣..."
 
 # NOTE 臬撌桃嚗撌脣脣(Saved) :P
 # NOTE 銝銝銝鈭撣貊(?)啣嚗啣銝嚗嚗敶箇閬蝒銋啣嚗航賣閰脣怒銝閬賬皜柴銝憿色
-#: ../finch/gntblist.c:1639 ../pidgin/gtkdocklet.c:490
+#: ../finch/gntblist.c:1656 ../pidgin/gtkdocklet.c:471
 #: ../pidgin/gtkstatusbox.c:1065
 msgid "Saved..."
 msgstr "皜..."
 
-#: ../finch/gntblist.c:2011 ../finch/gntplugin.c:224 ../finch/gntui.c:81
-#: ../pidgin/gtkdocklet.c:542 ../pidgin/gtkplugin.c:530
+#: ../finch/gntblist.c:2028 ../finch/gntplugin.c:244 ../finch/gntui.c:81
+#: ../pidgin/gtkdocklet.c:523 ../pidgin/gtkplugin.c:530
 msgid "Plugins"
 msgstr "璅∠皜"
 
 # NOTE 芾質陌蝔晞嚗箏閫雿鈭箏璅∠蝔晞
-#: ../finch/gntblist.c:2118 ../pidgin/gtkdialogs.c:703
-#: ../pidgin/gtkdialogs.c:841 ../pidgin/gtkdialogs.c:922
+#: ../finch/gntblist.c:2136 ../pidgin/gtkdialogs.c:706
+#: ../pidgin/gtkdialogs.c:844 ../pidgin/gtkdialogs.c:925
 msgid "_Name"
 msgstr "蝔(_N)"
 
-#: ../finch/gntblist.c:2123 ../pidgin/gtkdialogs.c:708
-#: ../pidgin/gtkdialogs.c:846 ../pidgin/gtkdialogs.c:927
+#: ../finch/gntblist.c:2141 ../pidgin/gtkdialogs.c:711
+#: ../pidgin/gtkdialogs.c:849 ../pidgin/gtkdialogs.c:930
 msgid "_Account"
 msgstr "撣唾(_A)"
 
-#: ../finch/gntblist.c:2131 ../pidgin/gtkdialogs.c:716
+#: ../finch/gntblist.c:2149 ../pidgin/gtkdialogs.c:719
 msgid "New Instant Message"
 msgstr "啣單閮"
 
-#: ../finch/gntblist.c:2133 ../pidgin/gtkdialogs.c:718
+#: ../finch/gntblist.c:2151 ../pidgin/gtkdialogs.c:721
 msgid ""
 "Please enter the screen name or alias of the person you would like to IM."
 msgstr "隢頛詨交冽唾潮單閮臬鞊∠撣唾"
 
-#: ../finch/gntblist.c:2136 ../finch/gntconn.c:48 ../finch/gntnotify.c:79
+#: ../finch/gntblist.c:2154 ../finch/gntconn.c:48 ../finch/gntnotify.c:77
 #: ../libpurple/account.c:983 ../libpurple/account.c:1233
 #: ../libpurple/protocols/gg/gg.c:501 ../libpurple/protocols/gg/gg.c:660
 #: ../libpurple/protocols/gg/gg.c:797
-#: ../libpurple/protocols/jabber/jabber.c:1370
+#: ../libpurple/protocols/jabber/jabber.c:1383
 #: ../libpurple/protocols/jabber/xdata.c:336
-#: ../libpurple/protocols/msn/msn.c:249 ../libpurple/protocols/msn/msn.c:266
-#: ../libpurple/protocols/msn/msn.c:283 ../libpurple/protocols/msn/msn.c:300
-#: ../libpurple/protocols/oscar/oscar.c:6002
+#: ../libpurple/protocols/msn/msn.c:258 ../libpurple/protocols/msn/msn.c:275
+#: ../libpurple/protocols/msn/msn.c:292 ../libpurple/protocols/msn/msn.c:309
+#: ../libpurple/protocols/oscar/oscar.c:6003
 #: ../libpurple/protocols/silc/buddy.c:467
 #: ../libpurple/protocols/silc/buddy.c:1188
 #: ../libpurple/protocols/silc/chat.c:425
@@ -629,37 +651,36 @@
 #: ../libpurple/protocols/silc/ops.c:1297
 #: ../libpurple/protocols/silc/ops.c:1912
 #: ../libpurple/protocols/silc/silc.c:743
-#: ../libpurple/protocols/yahoo/yahoo.c:990
-#: ../libpurple/protocols/yahoo/yahoo.c:3234
-#: ../libpurple/protocols/yahoo/yahoo.c:3245 ../pidgin/gtkblist.c:3945
-#: ../pidgin/gtkdialogs.c:721 ../pidgin/gtkdialogs.c:859
-#: ../pidgin/gtkdialogs.c:951 ../pidgin/gtkrequest.c:269
+#: ../libpurple/protocols/yahoo/yahoo.c:986
+#: ../libpurple/protocols/yahoo/yahoo.c:3230
+#: ../libpurple/protocols/yahoo/yahoo.c:3241 ../pidgin/gtkblist.c:3964
+#: ../pidgin/gtkdialogs.c:724 ../pidgin/gtkdialogs.c:862
+#: ../pidgin/gtkdialogs.c:954 ../pidgin/gtkrequest.c:269
 msgid "OK"
 msgstr "蝣箏"
 
 #. Create the "Options" frame.
-#: ../finch/gntblist.c:2156 ../finch/gntpounce.c:444 ../pidgin/gtkpounce.c:778
+#: ../finch/gntblist.c:2174 ../finch/gntpounce.c:444 ../pidgin/gtkpounce.c:778
 msgid "Options"
 msgstr "賊"
 
-#: ../finch/gntblist.c:2162
+#: ../finch/gntblist.c:2180
 msgid "Send IM..."
 msgstr "箏單閮..."
 
-# FIXME 霅舀敺寥 - 20061028
-#: ../finch/gntblist.c:2166
-msgid "Toggle offline buddies"
-msgstr "憿舐內嚗銝憿舐內Y憟賢"
-
-#: ../finch/gntblist.c:2172
+#: ../finch/gntblist.c:2184
+msgid "Show offline buddies"
+msgstr "憿舐內Y憟賢"
+
+#: ../finch/gntblist.c:2190
 msgid "Sort by status"
 msgstr "靘抒"
 
-#: ../finch/gntblist.c:2176
+#: ../finch/gntblist.c:2194
 msgid "Sort alphabetically"
 msgstr "靘批瘥"
 
-#: ../finch/gntblist.c:2180
+#: ../finch/gntblist.c:2198
 msgid "Sort by log size"
 msgstr "靘扳亥憭批"
 
@@ -683,56 +704,56 @@
 "%s"
 
 #: ../finch/gntconn.c:45 ../libpurple/account.c:1012
-#: ../libpurple/connection.c:107 ../pidgin/gtkblist.c:3942
+#: ../libpurple/connection.c:107 ../pidgin/gtkblist.c:3961
 msgid "Connection Error"
 msgstr "蝺航炊"
 
 #: ../finch/gntconn.c:49 ../libpurple/protocols/sametime/sametime.c:3644
-#: ../pidgin/gtkblist.c:3947
+#: ../pidgin/gtkblist.c:3966
 msgid "Connect"
 msgstr "蝺"
 
-#: ../finch/gntconv.c:103
+#: ../finch/gntconv.c:116
 msgid "No such command."
 msgstr "⊥迨隞扎"
 
-#: ../finch/gntconv.c:107 ../pidgin/gtkconv.c:507
+#: ../finch/gntconv.c:120 ../pidgin/gtkconv.c:508
 msgid "Syntax Error:  You typed the wrong number of arguments to that command."
 msgstr "隤瘜航炊嚗頛詨亦詨潭隞斗豢賊"
 
-#: ../finch/gntconv.c:112 ../pidgin/gtkconv.c:512
+#: ../finch/gntconv.c:125 ../pidgin/gtkconv.c:513
 msgid "Your command failed for an unknown reason."
 msgstr "隞文瑁憭望嚗銝"
 
-#: ../finch/gntconv.c:117 ../pidgin/gtkconv.c:518
+#: ../finch/gntconv.c:130 ../pidgin/gtkconv.c:519
 msgid "That command only works in chats, not IMs."
 msgstr "隞文芸刻憭拙恕扳嚗典單閮臭葉⊥"
 
-#: ../finch/gntconv.c:120 ../pidgin/gtkconv.c:521
+#: ../finch/gntconv.c:133 ../pidgin/gtkconv.c:522
 msgid "That command only works in IMs, not chats."
 msgstr "隞文芸典單閮臭葉嚗刻憭拙恕抒⊥"
 
-#: ../finch/gntconv.c:124 ../pidgin/gtkconv.c:525
+#: ../finch/gntconv.c:137 ../pidgin/gtkconv.c:526
 msgid "That command doesn't work on this protocol."
 msgstr "隞文券閮摰抒⊥"
 
 # NOTE 瘝颲行嚗其啁嚗瘝瘜寞摮色
-#: ../finch/gntconv.c:131
+#: ../finch/gntconv.c:144
 msgid "Commands are not supported yet. Message was NOT sent."
 msgstr "撠芣舀湔隞歹閮臬甇斗鋡恍箝"
 
 # XXX 臭暻潘
-#: ../finch/gntconv.c:217
+#: ../finch/gntconv.c:230
 #, c-format
 msgid "%s (%s -- %s)"
 msgstr "%s (%s -- %s)"
 
-#: ../finch/gntconv.c:240
+#: ../finch/gntconv.c:253
 #, c-format
 msgid "%s [%s]"
 msgstr "%s [%s]"
 
-#: ../finch/gntconv.c:245 ../finch/gntconv.c:423
+#: ../finch/gntconv.c:258 ../finch/gntconv.c:619
 #, c-format
 msgid ""
 "\n"
@@ -741,24 +762,48 @@
 "\n"
 "%s 甇刻撓..."
 
-#: ../finch/gntconv.c:390
+#: ../finch/gntconv.c:277
+msgid "You have left this chat."
+msgstr "券a鈭憭拙恕"
+
+#: ../finch/gntconv.c:353
+msgid "Send To"
+msgstr "喲"
+
+#: ../finch/gntconv.c:397
+msgid "Conversation"
+msgstr "鈭方"
+
+#: ../finch/gntconv.c:403
+msgid "Clear Scrollback"
+msgstr "皜蝛箔漱隢批捆"
+
+#: ../finch/gntconv.c:407 ../finch/gntprefs.c:178
+msgid "Show Timestamps"
+msgstr "憿舐內唾"
+
+#: ../finch/gntconv.c:423
+msgid "Add Buddy Pounce..."
+msgstr "亙末..."
+
+#: ../finch/gntconv.c:586
 msgid "<AUTO-REPLY> "
 msgstr "<芸> "
 
 #. Print the list of users in the room
-#: ../finch/gntconv.c:492
+#: ../finch/gntconv.c:702
 msgid "List of users:\n"
 msgstr "雿輻刻銵剁\n"
 
-#: ../finch/gntconv.c:616 ../pidgin/gtkconv.c:388
+#: ../finch/gntconv.c:847 ../pidgin/gtkconv.c:389
 msgid "Supported debug options are:  version"
 msgstr "舀渡日舫賊嚗version"
 
-#: ../finch/gntconv.c:651 ../pidgin/gtkconv.c:424
+#: ../finch/gntconv.c:882 ../pidgin/gtkconv.c:425
 msgid "No such command (in this context)."
 msgstr "瘝隞歹臬券鋆雿輻剁"
 
-#: ../finch/gntconv.c:654 ../pidgin/gtkconv.c:427
+#: ../finch/gntconv.c:885 ../pidgin/gtkconv.c:428
 msgid ""
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
 "The following commands are available in this context:\n"
@@ -766,57 +811,60 @@
 "閬脣銝隞斤隤芣嚗頛詨乓/help &lt;隞&gt;喳胯\n"
 "券鋆嚗舐函隞斗嚗\n"
 
-#: ../finch/gntconv.c:693 ../pidgin/gtkconv.c:7023
+#: ../finch/gntconv.c:943 ../pidgin/gtkconv.c:7085
 msgid ""
 "say &lt;message&gt;:  Send a message normally as if you weren't using a "
 "command."
 msgstr "say &lt;閮&gt;嚗撠摰閮舐嗆銝祈舀迤撣賊綽嗥箸隞方"
 
-#: ../finch/gntconv.c:696 ../pidgin/gtkconv.c:7026
+#: ../finch/gntconv.c:946 ../pidgin/gtkconv.c:7088
 msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
 msgstr "me &lt;閬瑁雿&gt;嚗璅∩遛IRC嚗瑁銝雿"
 
-#: ../finch/gntconv.c:699 ../pidgin/gtkconv.c:7029
+#: ../finch/gntconv.c:949 ../pidgin/gtkconv.c:7091
 msgid ""
 "debug &lt;option&gt;:  Send various debug information to the current "
 "conversation."
 msgstr "debug &lt;賊&gt;嚗桀鈭方箔鈭日航閮"
 
 # XXX
-#: ../finch/gntconv.c:702 ../pidgin/gtkconv.c:7032
+#: ../finch/gntconv.c:952 ../pidgin/gtkconv.c:7094
 msgid "clear: Clears the conversation scrollback."
 msgstr "clear嚗皜蝛箔漱隢脩楨銵"
 
-#: ../finch/gntconv.c:705 ../pidgin/gtkconv.c:7035
+#: ../finch/gntconv.c:955 ../pidgin/gtkconv.c:7097
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr "help &lt;隞&gt;嚗憿舐內銝隞斤隤芣"
 
-#: ../finch/gntconv.c:710
+#: ../finch/gntconv.c:958
+msgid "users:  Show the list of users in the chat."
+msgstr "users嚗憿舐內憭拙恕抒雿輻刻"
+
+#: ../finch/gntconv.c:963
 msgid "plugins: Show the plugins window."
 msgstr "plugins嚗憿舐內璅∠閬蝒"
 
-#: ../finch/gntconv.c:713
+#: ../finch/gntconv.c:966
 msgid "buddylist: Show the buddylist."
 msgstr "buddylist嚗憿舐內憟賢皜柴"
 
-#: ../finch/gntconv.c:716
+#: ../finch/gntconv.c:969
 msgid "accounts: Show the accounts window."
 msgstr "accounts嚗憿舐內撣唾皜柴"
 
-#: ../finch/gntconv.c:719
+#: ../finch/gntconv.c:972
 msgid "debugwin: Show the debug window."
 msgstr "debugwin嚗憿舐內日航蝒"
 
-#: ../finch/gntconv.c:722
+#: ../finch/gntconv.c:975
 msgid "prefs: Show the preference window."
 msgstr "prefs嚗憿舐內憟質身摰閬蝒"
 
-# FIXME - 20061028
-#: ../finch/gntconv.c:725
+#: ../finch/gntconv.c:978
 msgid "statuses: Show the savedstatuses window."
-msgstr "statuses嚗撌脣脣閬蝒"
-
-#: ../finch/gntdebug.c:211 ../finch/gntui.c:79 ../pidgin/gtkdebug.c:710
+msgstr "statuses嚗皜柴閬蝒"
+
+#: ../finch/gntdebug.c:230 ../finch/gntui.c:79 ../pidgin/gtkdebug.c:693
 msgid "Debug Window"
 msgstr "日航蝒"
 
@@ -824,18 +872,18 @@
 #. * it's necessary to make the width of the debug window resizable ... like I said,
 #. * it doesn't make sense. The bug is likely in the packing in gntbox.c.
 #.
-#: ../finch/gntdebug.c:232 ../pidgin/gtkdebug.c:769
+#: ../finch/gntdebug.c:251 ../pidgin/gtkdebug.c:752
 msgid "Clear"
 msgstr "皜"
 
-#: ../finch/gntdebug.c:237 ../pidgin/gtkdebug.c:778
+#: ../finch/gntdebug.c:257
+msgid "Filter: "
+msgstr "瞈曉剁"
+
+#: ../finch/gntdebug.c:261 ../pidgin/gtkdebug.c:761
 msgid "Pause"
 msgstr "怠"
 
-#: ../finch/gntdebug.c:242 ../pidgin/gtkdebug.c:785 ../pidgin/gtkdebug.c:786
-msgid "Timestamps"
-msgstr "唾"
-
 #: ../finch/gntft.c:117 ../pidgin/gtkft.c:228
 #, c-format
 msgid "File Transfers - %d%% of %d files"
@@ -874,18 +922,18 @@
 #: ../libpurple/protocols/jabber/buddy.c:634
 #: ../libpurple/protocols/jabber/buddy.c:638
 #: ../libpurple/protocols/jabber/buddy.c:673
-#: ../libpurple/protocols/jabber/jabber.c:1201
-#: ../libpurple/protocols/msn/msn.c:523
+#: ../libpurple/protocols/jabber/jabber.c:1214
+#: ../libpurple/protocols/msn/msn.c:515
 #: ../libpurple/protocols/novell/novell.c:2835
-#: ../libpurple/protocols/oscar/oscar.c:802
-#: ../libpurple/protocols/oscar/oscar.c:807
-#: ../libpurple/protocols/oscar/oscar.c:809
-#: ../libpurple/protocols/oscar/oscar.c:2650
-#: ../libpurple/protocols/oscar/oscar.c:3761
+#: ../libpurple/protocols/oscar/oscar.c:803
+#: ../libpurple/protocols/oscar/oscar.c:808
+#: ../libpurple/protocols/oscar/oscar.c:810
+#: ../libpurple/protocols/oscar/oscar.c:2656
+#: ../libpurple/protocols/oscar/oscar.c:3767
 #: ../libpurple/protocols/sametime/sametime.c:3263
 #: ../libpurple/protocols/sametime/sametime.c:4150
-#: ../libpurple/protocols/yahoo/yahoo.c:3053 ../pidgin/gtkblist.c:3035
-#: ../pidgin/gtkblist.c:3048 ../pidgin/gtkblist.c:3050
+#: ../libpurple/protocols/yahoo/yahoo.c:3049 ../pidgin/gtkblist.c:3053
+#: ../pidgin/gtkblist.c:3066 ../pidgin/gtkblist.c:3068
 #: ../pidgin/gtksavedstatuses.c:943 ../pidgin/gtksavedstatuses.c:1090
 msgid "Status"
 msgstr ""
@@ -903,10 +951,10 @@
 msgstr "銝剜迫"
 
 #. Close button
-#: ../finch/gntft.c:233 ../finch/gntnotify.c:163 ../finch/gntplugin.c:187
-#: ../finch/gntplugin.c:267 ../finch/gntpounce.c:722 ../finch/gntstatus.c:209
-#: ../libpurple/protocols/msn/msn.c:366 ../libpurple/protocols/silc/util.c:377
-#: ../pidgin/gtkaccount.c:2444 ../pidgin/gtkrequest.c:272
+#: ../finch/gntft.c:233 ../finch/gntnotify.c:179 ../finch/gntplugin.c:205
+#: ../finch/gntplugin.c:291 ../finch/gntpounce.c:722 ../finch/gntstatus.c:209
+#: ../libpurple/protocols/msn/msn.c:375 ../libpurple/protocols/silc/util.c:377
+#: ../pidgin/gtkaccount.c:2458 ../pidgin/gtkrequest.c:272
 msgid "Close"
 msgstr ""
 
@@ -937,75 +985,88 @@
 msgid "Transferring"
 msgstr "唾撓銝"
 
-#: ../finch/gntnotify.c:146
+#: ../finch/gntnotify.c:162
 msgid "Emails"
 msgstr "餃萎辣"
 
 # XXX 閬閬
-#: ../finch/gntnotify.c:152 ../finch/gntnotify.c:206
+#: ../finch/gntnotify.c:168 ../finch/gntnotify.c:222
 msgid "You have mail!"
 msgstr "冽嗅圈萎辣嚗"
 
-# FIXME check - 20061025
-#  NOTE Jabber 銵隤嚗閬銝
-#: ../finch/gntnotify.c:155 ../libpurple/protocols/jabber/jabber.c:1161
+# FIXME 銝閰拍儔嚗寞祉⊥蝧餉陌
+#  NOTE gntnotify 摮蝢拍箝潔縑鈭箝
+#  NOTE Jabber 銵隤摮蝢抵Both璇
+#: ../finch/gntnotify.c:171 ../libpurple/protocols/jabber/jabber.c:1174
 msgid "From"
 msgstr "撌脰霅撠"
 
-#: ../finch/gntnotify.c:155 ../pidgin/gtknotify.c:490
+#: ../finch/gntnotify.c:171 ../pidgin/gtknotify.c:490
 msgid "Subject"
 msgstr "銝駁"
 
-#: ../finch/gntnotify.c:182
+#: ../finch/gntnotify.c:198
 #, c-format
 msgid "%s (%s) has %d new message."
 msgid_plural "%s (%s) has %d new messages."
 msgstr[0] "%s (%s)  %d 撠圈萎辣"
 msgstr[1] "%s (%s)  %d 撠圈萎辣"
 
-#: ../finch/gntnotify.c:206 ../pidgin/gtknotify.c:329
+#: ../finch/gntnotify.c:222 ../pidgin/gtknotify.c:329
 msgid "New Mail"
 msgstr "圈萎辣"
 
-#: ../finch/gntnotify.c:230 ../pidgin/gtknotify.c:866
+#: ../finch/gntnotify.c:287 ../pidgin/gtknotify.c:906
 #, c-format
 msgid "Info for %s"
 msgstr "%s 鞈閮"
 
-#: ../finch/gntnotify.c:232 ../libpurple/protocols/toc/toc.c:476
-#: ../pidgin/gtknotify.c:868
+#: ../finch/gntnotify.c:288 ../libpurple/protocols/toc/toc.c:476
+#: ../pidgin/gtknotify.c:907
 msgid "Buddy Information"
 msgstr "憟賢鞈閮"
 
-#: ../finch/gntnotify.c:306
+#: ../finch/gntnotify.c:366
 msgid "Continue"
 msgstr "蝜潛"
 
 # XXXInfo雿其撮銋靽敺雿輻刻鞈閮嚗雿銝臬嚗鈭嗡po瑼隞臭臬臭暻
 # XXX javajsp (Ka-Hing CHEUNG) 閬Info蝝券賣胯敺雿輻刻鞈閮
 # XXX 瘜剁曉 (2.0.0b4) 銝臭嚗日航蝒瞈曄摨艾蝡Info嚗鞈閮嚗蝝乒色
-#: ../finch/gntnotify.c:312 ../pidgin/gtkconv.c:1609 ../pidgin/gtkdebug.c:864
+#: ../finch/gntnotify.c:372 ../pidgin/gtkconv.c:1627 ../pidgin/gtkdebug.c:833
 msgid "Info"
 msgstr "鞈閮"
 
-#: ../finch/gntnotify.c:315 ../pidgin/gtkconv.c:1570
+#: ../finch/gntnotify.c:375 ../pidgin/gtkconv.c:1588
 msgid "IM"
 msgstr "單閮"
 
-#: ../finch/gntnotify.c:318
+#: ../finch/gntnotify.c:378
 msgid "Join"
 msgstr ""
 
-#: ../finch/gntnotify.c:321 ../libpurple/protocols/sametime/sametime.c:3473
+#: ../finch/gntnotify.c:381 ../libpurple/protocols/sametime/sametime.c:3473
 msgid "Invite"
 msgstr "隢"
 
 # TODO 閬閬 - 20061028
-#: ../finch/gntnotify.c:324
+#: ../finch/gntnotify.c:384
 msgid "(none)"
 msgstr "(瘝摮)"
 
-#: ../finch/gntplugin.c:111
+#: ../finch/gntplugin.c:73 ../finch/gntplugin.c:82
+msgid "ERROR"
+msgstr "航炊"
+
+#: ../finch/gntplugin.c:73
+msgid "loading plugin failed"
+msgstr "璅∠頛亙仃"
+
+#: ../finch/gntplugin.c:82
+msgid "unloading plugin failed"
+msgstr "璅∠貉憭望"
+
+#: ../finch/gntplugin.c:124
 #, c-format
 msgid ""
 "Name: %s\n"
@@ -1016,30 +1077,30 @@
 "Filename: %s\n"
 msgstr ""
 "蝔梧%s\n"
-"踵穿%s\n"
+"穿%s\n"
 "蝪∩嚗%s\n"
 "雿嚗%s\n"
 "蝬脩嚗%s\n"
 "瑼嚗%s\n"
 
-#: ../finch/gntplugin.c:164
+#: ../finch/gntplugin.c:182
 msgid "Plugin need to be loaded before you can configure it."
 msgstr "閮剖璅∠嚗隢頛交芋蝯"
 
-#: ../finch/gntplugin.c:208
+#: ../finch/gntplugin.c:226
 msgid "No configuration options for this plugin."
 msgstr "甇斗芋蝯銝衣⊿賊臭閮剖"
 
-#: ../finch/gntplugin.c:229
+#: ../finch/gntplugin.c:249
 msgid "You can (un)load plugins from the following list."
 msgstr "典舫隞乩銵刻交貉璅∠"
 
-#: ../finch/gntplugin.c:272
+#: ../finch/gntplugin.c:296
 msgid "Configure Plugin"
 msgstr "閮剖璅∠"
 
-#: ../finch/gntplugin.c:328 ../finch/gntplugin.c:335 ../finch/gntprefs.c:244
-#: ../finch/gntui.c:82 ../pidgin/gtkdocklet.c:543 ../pidgin/gtkprefs.c:1953
+#: ../finch/gntplugin.c:352 ../finch/gntplugin.c:359 ../finch/gntprefs.c:245
+#: ../finch/gntui.c:82 ../pidgin/gtkdocklet.c:524 ../pidgin/gtkprefs.c:1953
 msgid "Preferences"
 msgstr "憟質身摰"
 
@@ -1061,8 +1122,8 @@
 
 #. Account:
 #. Set up stuff for the account box
-#: ../finch/gntpounce.c:333 ../finch/gntstatus.c:446 ../pidgin/gtkblist.c:5403
-#: ../pidgin/gtkblist.c:5719
+#: ../finch/gntpounce.c:333 ../finch/gntstatus.c:446 ../pidgin/gtkblist.c:5437
+#: ../pidgin/gtkblist.c:5753
 msgid "Account:"
 msgstr "撣唾嚗"
 
@@ -1213,68 +1274,68 @@
 msgid "Unknown pounce event. Please report this!"
 msgstr "芰亦鈭隞嗚隢梢憿嚗"
 
-#: ../finch/gntprefs.c:80 ../pidgin/gtkprefs.c:1814
+#: ../finch/gntprefs.c:79
+msgid "Based on keyboard use"
+msgstr "隞仿萇斤雿輻函箏箸"
+
+#: ../finch/gntprefs.c:81 ../pidgin/gtkprefs.c:1814
 msgid "From last sent message"
 msgstr "敺銝甈⊿箄舀箏箸"
 
-#: ../finch/gntprefs.c:82 ../pidgin/gtkprefs.c:820 ../pidgin/gtkprefs.c:829
+#: ../finch/gntprefs.c:83 ../pidgin/gtkprefs.c:820 ../pidgin/gtkprefs.c:829
 #: ../pidgin/gtkprefs.c:1813 ../pidgin/gtkprefs.c:1827
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:337
 msgid "Never"
 msgstr "敺銝"
 
-#: ../finch/gntprefs.c:170
+#: ../finch/gntprefs.c:171
 msgid "Show Idle Time"
 msgstr "憿舐內蝵格"
 
-#: ../finch/gntprefs.c:171
+#: ../finch/gntprefs.c:172
 msgid "Show Offline Buddies"
 msgstr "憿舐內Y憟賢"
 
-#: ../finch/gntprefs.c:177
-msgid "Show Timestamps"
-msgstr "憿舐內唾"
-
-#: ../finch/gntprefs.c:178
+#: ../finch/gntprefs.c:179
 msgid "Notify buddies when you are typing"
 msgstr "交函憟賢冽迤函潸舐策隞"
 
-#: ../finch/gntprefs.c:184
+#: ../finch/gntprefs.c:185
 msgid "Log format"
 msgstr "亥澆"
 
-#: ../finch/gntprefs.c:185
+#: ../finch/gntprefs.c:186
 msgid "Log IMs"
 msgstr "閮單閮臬批捆"
 
-#: ../finch/gntprefs.c:186
+#: ../finch/gntprefs.c:187
 msgid "Log chats"
 msgstr "閮憭拙批捆"
 
-#: ../finch/gntprefs.c:187
+#: ../finch/gntprefs.c:188
 msgid "Log status change events"
 msgstr "閮寡"
 
 #. Conversations
-#: ../finch/gntprefs.c:240 ../pidgin/gtkprefs.c:898 ../pidgin/gtkprefs.c:1917
+#: ../finch/gntprefs.c:241 ../pidgin/gtkprefs.c:898 ../pidgin/gtkprefs.c:1917
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:344
 msgid "Conversations"
 msgstr "鈭方"
 
-#: ../finch/gntprefs.c:241 ../pidgin/gtkprefs.c:1355 ../pidgin/gtkprefs.c:1928
+#: ../finch/gntprefs.c:242 ../pidgin/gtkprefs.c:1355 ../pidgin/gtkprefs.c:1928
 msgid "Logging"
 msgstr "亥"
 
-#: ../finch/gntrequest.c:530
+#: ../finch/gntrequest.c:532
 msgid "Not implemented yet."
 msgstr "閰脣賢芸祕雿"
 
-#: ../finch/gntrequest.c:595 ../pidgin/gtkrequest.c:1529
+#: ../finch/gntrequest.c:597 ../pidgin/gtkrequest.c:1529
 #: ../pidgin/gtkrequest.c:1575
 msgid "Save File..."
 msgstr "脣瑼獢..."
 
-#: ../finch/gntrequest.c:595 ../pidgin/gtkrequest.c:1530
+#: ../finch/gntrequest.c:597 ../pidgin/gtkrequest.c:1530
 #: ../pidgin/gtkrequest.c:1576
 msgid "Open File..."
 msgstr "瑼獢..."
@@ -1315,31 +1376,31 @@
 #: ../libpurple/protocols/gg/gg.c:1594 ../libpurple/protocols/gg/gg.c:1604
 #: ../libpurple/protocols/gg/gg.c:1610 ../libpurple/protocols/gg/gg.c:1619
 #: ../libpurple/protocols/gg/gg.c:1624 ../libpurple/protocols/irc/irc.c:234
-#: ../libpurple/protocols/jabber/jabber.c:1233
-#: ../libpurple/protocols/jabber/jabber.c:1243
-#: ../libpurple/protocols/jabber/jabber.c:1253
-#: ../libpurple/protocols/jabber/jabber.c:1263
-#: ../libpurple/protocols/jabber/jabber.c:1273
-#: ../libpurple/protocols/jabber/jabber.c:1285
+#: ../libpurple/protocols/jabber/jabber.c:1246
+#: ../libpurple/protocols/jabber/jabber.c:1256
+#: ../libpurple/protocols/jabber/jabber.c:1266
+#: ../libpurple/protocols/jabber/jabber.c:1276
+#: ../libpurple/protocols/jabber/jabber.c:1286
+#: ../libpurple/protocols/jabber/jabber.c:1298
 #: ../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:5463
-#: ../libpurple/protocols/oscar/oscar.c:5681
-#: ../libpurple/protocols/oscar/oscar.c:5695
-#: ../libpurple/protocols/oscar/oscar.c:5711
-#: ../libpurple/protocols/oscar/oscar.c:5718
-#: ../libpurple/protocols/oscar/oscar.c:5725
+#: ../libpurple/protocols/oscar/oscar.c:5464
+#: ../libpurple/protocols/oscar/oscar.c:5682
+#: ../libpurple/protocols/oscar/oscar.c:5696
+#: ../libpurple/protocols/oscar/oscar.c:5712
+#: ../libpurple/protocols/oscar/oscar.c:5719
+#: ../libpurple/protocols/oscar/oscar.c:5726
 #: ../libpurple/protocols/sametime/sametime.c:3286
 #: ../libpurple/protocols/sametime/sametime.c:3292
 #: ../libpurple/protocols/sametime/sametime.c:3298
 #: ../libpurple/protocols/sametime/sametime.c:3377
 #: ../libpurple/protocols/silc/buddy.c:1551
 #: ../libpurple/protocols/simple/simple.c:246
-#: ../libpurple/protocols/yahoo/yahoo.c:3481
-#: ../libpurple/protocols/yahoo/yahoo.c:3487
-#: ../libpurple/protocols/zephyr/zephyr.c:2336
+#: ../libpurple/protocols/yahoo/yahoo.c:3477
+#: ../libpurple/protocols/yahoo/yahoo.c:3483
+#: ../libpurple/protocols/zephyr/zephyr.c:2337
 #: ../pidgin/gtksavedstatuses.c:490 ../pidgin/gtksavedstatuses.c:954
 msgid "Message"
 msgstr "閮"
@@ -1351,7 +1412,7 @@
 
 #: ../finch/gntstatus.c:294
 msgid "Invalid title"
-msgstr "⊥璅憿"
+msgstr "璅憿⊥"
 
 #: ../finch/gntstatus.c:295
 msgid "Please enter a non-empty title for the status."
@@ -1409,66 +1470,66 @@
 "X, if possible."
 msgstr " gnt 芸批捆霈湔嚗航賣啁批捆皛箄 X 閬蝒蝟餌絞"
 
-#: ../finch/plugins/gntgf.c:223
+#: ../finch/plugins/gntgf.c:231
 #, c-format
 msgid "%s just signed on"
 msgstr "%s 餃"
 
-#: ../finch/plugins/gntgf.c:230
+#: ../finch/plugins/gntgf.c:238
 #, c-format
 msgid "%s just signed off"
 msgstr "%s 餃"
 
-#: ../finch/plugins/gntgf.c:238
+#: ../finch/plugins/gntgf.c:246
 #, c-format
 msgid "%s sent you a message"
 msgstr "%s 箔閮舐策"
 
-#: ../finch/plugins/gntgf.c:257
+#: ../finch/plugins/gntgf.c:265
 #, c-format
 msgid "%s said your nick in %s"
 msgstr "%s  %s 唳函梁迂"
 
-#: ../finch/plugins/gntgf.c:259
+#: ../finch/plugins/gntgf.c:267
 #, c-format
 msgid "%s sent a message in %s"
 msgstr "%s  %s 箔閮舐策具"
 
-#: ../finch/plugins/gntgf.c:297
+#: ../finch/plugins/gntgf.c:305
 msgid "Buddy signs on/off"
 msgstr "憟賢餃伐餃"
 
-#: ../finch/plugins/gntgf.c:298
+#: ../finch/plugins/gntgf.c:306
 msgid "You receive an IM"
 msgstr "冽嗅啣單閮"
 
-#: ../finch/plugins/gntgf.c:299
+#: ../finch/plugins/gntgf.c:307
 msgid "Someone speaks in a chat"
 msgstr "鈭箏刻憭拙恕隢閰"
 
-#: ../finch/plugins/gntgf.c:300
+#: ../finch/plugins/gntgf.c:308
 msgid "Someone says your name in a chat"
 msgstr "鈭箏刻憭拙恕銝剜唳函摮"
 
 #  NOTEGntGf箝Gnt  Guifications嚗Toaster MSN 憸冽潛敶箏亙末憭憯怎敶箇憟賜暻萄銝璅
-#: ../finch/plugins/gntgf.c:328
+#: ../finch/plugins/gntgf.c:336
 msgid "Notify with a toaster when"
 msgstr "隞乩瘜銝雿輻典憯怎撘敶粹"
 
-#: ../finch/plugins/gntgf.c:343
+#: ../finch/plugins/gntgf.c:351
 msgid "Beep too!"
 msgstr "銋閬嗚莎"
 
-#: ../finch/plugins/gntgf.c:349
+#: ../finch/plugins/gntgf.c:357
 msgid "Set URGENT for the terminal window."
 msgstr "蝯衣蝡舀閬蝒閮剖URGENT嚗蝺亥閮嚗蝷"
 
-#: ../finch/plugins/gntgf.c:369
+#: ../finch/plugins/gntgf.c:377
 msgid "GntGf"
 msgstr "GntGf"
 
 #  NOTEGntGf箝Gnt  Guifications嚗Toaster MSN 憸冽潛敶箏亙末憭憯怎敶箇憟賜暻芸銝璅
-#: ../finch/plugins/gntgf.c:371 ../finch/plugins/gntgf.c:372
+#: ../finch/plugins/gntgf.c:379 ../finch/plugins/gntgf.c:380
 msgid "Toaster plugin"
 msgstr "憭憯怎撘敶粹交芋蝯"
 
@@ -1550,7 +1611,7 @@
 msgstr "曆 %s 摰璅∠"
 
 #: ../libpurple/account.c:1170 ../libpurple/protocols/gg/gg.c:702
-#: ../libpurple/protocols/jabber/jabber.c:1323
+#: ../libpurple/protocols/jabber/jabber.c:1336
 msgid "New passwords do not match."
 msgstr "啣蝣潔蒂銝貊泵"
 
@@ -1598,8 +1659,8 @@
 # XXX - Ambrose 20061123
 #: ../libpurple/account.c:1744 ../libpurple/protocols/gg/gg.c:1012
 #: ../libpurple/protocols/jabber/buddy.c:638
-#: ../libpurple/protocols/jabber/buddy.c:1399
-#: ../libpurple/protocols/jabber/buddy.c:1416
+#: ../libpurple/protocols/jabber/buddy.c:1424
+#: ../libpurple/protocols/jabber/buddy.c:1441
 #: ../libpurple/protocols/novell/novell.c:2831
 #: ../libpurple/protocols/qq/qq.c:230 ../pidgin/gtkft.c:159
 msgid "Unknown"
@@ -1607,7 +1668,7 @@
 
 #: ../libpurple/blist.c:523 ../libpurple/blist.c:1291
 #: ../libpurple/blist.c:1520 ../libpurple/protocols/jabber/roster.c:68
-#: ../pidgin/gtkblist.c:5199 ../pidgin/plugins/gevolution/gevolution.c:97
+#: ../pidgin/gtkblist.c:5233 ../pidgin/plugins/gevolution/gevolution.c:97
 #: ../pidgin/plugins/gevolution/gevo-util.c:64
 msgid "Buddies"
 msgstr "憟賢"
@@ -1631,7 +1692,7 @@
 msgstr "+++ %s 餃"
 
 #: ../libpurple/connection.c:440 ../libpurple/plugin.c:282
-#: ../libpurple/protocols/jabber/buddy.c:1687
+#: ../libpurple/protocols/jabber/buddy.c:1712
 #: ../libpurple/protocols/msn/servconn.c:139
 #: ../libpurple/protocols/msn/session.c:321
 msgid "Unknown error"
@@ -1654,40 +1715,40 @@
 msgid "Unable to send message."
 msgstr "⊥箄胯"
 
-#: ../libpurple/conversation.c:1160
+#: ../libpurple/conversation.c:1164
 msgid "Send Message"
 msgstr "箄"
 
-#: ../libpurple/conversation.c:1163
+#: ../libpurple/conversation.c:1167
 msgid "_Send Message"
 msgstr "箄(_S)"
 
-#: ../libpurple/conversation.c:1566
+#: ../libpurple/conversation.c:1570
 #, c-format
 msgid "%s entered the room."
 msgstr "%s 脣亥憭拙恕"
 
-#: ../libpurple/conversation.c:1569
+#: ../libpurple/conversation.c:1573
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>] 脣亥憭拙恕"
 
-#: ../libpurple/conversation.c:1674
+#: ../libpurple/conversation.c:1678
 #, c-format
 msgid "You are now known as %s"
 msgstr "雿寡梁迂 %s"
 
-#: ../libpurple/conversation.c:1694
+#: ../libpurple/conversation.c:1698
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s 寡梁迂 %s"
 
-#: ../libpurple/conversation.c:1767
+#: ../libpurple/conversation.c:1771
 #, c-format
 msgid "%s left the room."
 msgstr "%s a憭拙恕"
 
-#: ../libpurple/conversation.c:1770
+#: ../libpurple/conversation.c:1774
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s a憭拙恕 (%s)"
@@ -1763,7 +1824,7 @@
 msgid "Unknown reason"
 msgstr "銝"
 
-#: ../libpurple/ft.c:204 ../libpurple/protocols/msn/msn.c:420
+#: ../libpurple/ft.c:204
 #, c-format
 msgid ""
 "Error reading %s: \n"
@@ -1863,31 +1924,31 @@
 msgid "File transfer complete"
 msgstr "瑼獢唾撓摰"
 
-#: ../libpurple/ft.c:1090
+#: ../libpurple/ft.c:1091
 #, c-format
 msgid "You canceled the transfer of %s"
 msgstr "雿瘨鈭 %s 喲"
 
-#: ../libpurple/ft.c:1095
+#: ../libpurple/ft.c:1096
 msgid "File transfer cancelled"
 msgstr "瑼獢唾撓撌脣瘨"
 
-#: ../libpurple/ft.c:1153
+#: ../libpurple/ft.c:1154
 #, c-format
 msgid "%s canceled the transfer of %s"
 msgstr "%s 瘨鈭 %s 喲"
 
-#: ../libpurple/ft.c:1158
+#: ../libpurple/ft.c:1159
 #, c-format
 msgid "%s canceled the file transfer"
 msgstr "%s 瘨鈭瑼獢唾撓"
 
-#: ../libpurple/ft.c:1215
+#: ../libpurple/ft.c:1216
 #, c-format
 msgid "File transfer to %s failed."
 msgstr "喲瑼獢 %s 憭望"
 
-#: ../libpurple/ft.c:1217
+#: ../libpurple/ft.c:1218
 #, c-format
 msgid "File transfer from %s failed."
 msgstr " %s 喲瑼獢憭望"
@@ -2189,13 +2250,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:1434
-#: ../libpurple/protocols/oscar/oscar.c:2225
-#: ../libpurple/protocols/oscar/oscar.c:2272
-#: ../libpurple/protocols/oscar/oscar.c:5795
-#: ../libpurple/protocols/oscar/oscar.c:5850
-#: ../libpurple/protocols/oscar/oscar.c:6076
-#: ../libpurple/protocols/oscar/oscar.c:6146 ../libpurple/request.h:1387
+#: ../libpurple/protocols/oscar/oscar.c:1440
+#: ../libpurple/protocols/oscar/oscar.c:2231
+#: ../libpurple/protocols/oscar/oscar.c:2278
+#: ../libpurple/protocols/oscar/oscar.c:5796
+#: ../libpurple/protocols/oscar/oscar.c:5851
+#: ../libpurple/protocols/oscar/oscar.c:6077
+#: ../libpurple/protocols/oscar/oscar.c:6147 ../libpurple/request.h:1387
 #: ../libpurple/request.h:1397
 msgid "_Cancel"
 msgstr "瘨(_C)"
@@ -2253,8 +2314,8 @@
 "嗅芸亙瑼獢唾撓頝喳箄蝒功n"
 "嚗芰潛冽芾喲脰鈭方瘜銝嚗"
 
-#: ../libpurple/plugins/buddynote.c:46 ../libpurple/protocols/msn/msn.c:1600
-#: ../libpurple/protocols/msn/msn.c:1630
+#: ../libpurple/plugins/buddynote.c:46 ../libpurple/protocols/msn/msn.c:1608
+#: ../libpurple/protocols/msn/msn.c:1638
 msgid "Notes"
 msgstr "閮"
 
@@ -2693,7 +2754,7 @@
 
 #: ../libpurple/plugins/offlinemsg.c:161
 #: ../libpurple/protocols/msn/dialog.c:133
-#: ../libpurple/protocols/msn/msn.c:530 ../libpurple/protocols/msn/msn.c:540
+#: ../libpurple/protocols/msn/msn.c:522 ../libpurple/protocols/msn/msn.c:532
 #: ../libpurple/protocols/novell/novell.c:1917
 #: ../libpurple/protocols/silc/buddy.c:314
 #: ../libpurple/protocols/silc/pk.c:119 ../libpurple/protocols/silc/wb.c:304
@@ -2703,7 +2764,7 @@
 
 #: ../libpurple/plugins/offlinemsg.c:162
 #: ../libpurple/protocols/msn/dialog.c:134
-#: ../libpurple/protocols/msn/msn.c:530 ../libpurple/protocols/msn/msn.c:540
+#: ../libpurple/protocols/msn/msn.c:522 ../libpurple/protocols/msn/msn.c:532
 #: ../libpurple/protocols/novell/novell.c:1918
 #: ../libpurple/protocols/silc/buddy.c:315
 #: ../libpurple/protocols/silc/pk.c:120 ../libpurple/protocols/silc/wb.c:305
@@ -2747,9 +2808,9 @@
 #: ../libpurple/plugins/psychic.c:22
 msgid ""
 "Causes conversation windows to appear as other users begin to message you.  "
-"This works for AIM, ICQ, Jabber, Sametime, and Yahoo!"
-msgstr ""
-"撠嫣憪其漱隢嚗撠梁單鈭方閬蝒拍冽 AIMICQJabberSametime  "
+"This works for AIM, ICQ, XMPP, Sametime, and Yahoo!"
+msgstr ""
+"撠嫣憪其漱隢嚗撠梁單鈭方閬蝒拍冽 AIMICQXMPPSametime  "
 "Yahoo"
 
 #: ../libpurple/plugins/psychic.c:72
@@ -2958,17 +3019,17 @@
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
 #. Away stuff
 #: ../libpurple/protocols/bonjour/bonjour.c:302
-#: ../libpurple/protocols/gg/gg.c:1009 ../libpurple/protocols/irc/irc.c:516
-#: ../libpurple/protocols/irc/msgs.c:301
-#: ../libpurple/protocols/jabber/buddy.c:1409
+#: ../libpurple/protocols/gg/gg.c:1009 ../libpurple/protocols/irc/irc.c:530
+#: ../libpurple/protocols/irc/msgs.c:310
+#: ../libpurple/protocols/jabber/buddy.c:1434
 #: ../libpurple/protocols/novell/novell.c:2819
-#: ../libpurple/protocols/oscar/oscar.c:714
-#: ../libpurple/protocols/oscar/oscar.c:4490
-#: ../libpurple/protocols/oscar/oscar.c:5541
+#: ../libpurple/protocols/oscar/oscar.c:715
+#: ../libpurple/protocols/oscar/oscar.c:4497
+#: ../libpurple/protocols/oscar/oscar.c:5542
 #: ../libpurple/protocols/qq/qq.c:180 ../libpurple/protocols/silc/buddy.c:1476
-#: ../libpurple/protocols/yahoo/yahoo.c:3384
-#: ../libpurple/protocols/yahoo/yahoo.c:3457 ../libpurple/status.c:158
-#: ../pidgin/gtkdocklet.c:461 ../pidgin/gtkprefs.c:1823
+#: ../libpurple/protocols/yahoo/yahoo.c:3380
+#: ../libpurple/protocols/yahoo/yahoo.c:3453 ../libpurple/status.c:157
+#: ../pidgin/gtkdocklet.c:442 ../pidgin/gtkprefs.c:1823
 #: ../pidgin/gtkstatusbox.c:1052
 msgid "Away"
 msgstr "a"
@@ -2990,46 +3051,46 @@
 
 #  XXX 敺憟 - ambrose 20070414
 #  NOTE 撠 evolution PO 瑼銋霅舀嚗閰唾銝ULocal Addressbook璇
-#: ../libpurple/protocols/bonjour/bonjour.c:475
-#: ../libpurple/protocols/bonjour/bonjour.c:482
-#: ../libpurple/protocols/bonjour/bonjour.c:540
+#: ../libpurple/protocols/bonjour/bonjour.c:476
+#: ../libpurple/protocols/bonjour/bonjour.c:483
+#: ../libpurple/protocols/bonjour/bonjour.c:541
 msgid "Purple Person"
 msgstr "蝯∩犖"
 
 #. Creating the user splits
-#: ../libpurple/protocols/bonjour/bonjour.c:579
+#: ../libpurple/protocols/bonjour/bonjour.c:589
 #: ../libpurple/protocols/silc/silc.c:926
 msgid "Hostname"
 msgstr "銝餅蝔"
 
 #. Creating the options for the protocol
-#: ../libpurple/protocols/bonjour/bonjour.c:583
+#: ../libpurple/protocols/bonjour/bonjour.c:593
 #: ../libpurple/protocols/gg/gg.c:627
-#: ../libpurple/protocols/jabber/jabber.c:820
+#: ../libpurple/protocols/jabber/jabber.c:824
 msgid "First name"
 msgstr ""
 
-#: ../libpurple/protocols/bonjour/bonjour.c:586
+#: ../libpurple/protocols/bonjour/bonjour.c:596
 #: ../libpurple/protocols/gg/gg.c:622
-#: ../libpurple/protocols/jabber/jabber.c:825
+#: ../libpurple/protocols/jabber/jabber.c:829
 msgid "Last name"
 msgstr "憪"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:589
+#: ../libpurple/protocols/bonjour/bonjour.c:599
 #: ../libpurple/protocols/gg/gg.c:472
-#: ../libpurple/protocols/jabber/jabber.c:810
+#: ../libpurple/protocols/jabber/jabber.c:814
 #: ../libpurple/protocols/silc/silc.c:689
 #: ../libpurple/protocols/silc/silc.c:930
 msgid "E-mail"
 msgstr "餃萎辣"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:592
+#: ../libpurple/protocols/bonjour/bonjour.c:602
 msgid "AIM Account"
 msgstr "AIM 撣唾"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:595
-msgid "Jabber Account"
-msgstr "Jabber 撣唾"
+#: ../libpurple/protocols/bonjour/bonjour.c:605
+msgid "XMPP Account"
+msgstr "XMPP 撣唾"
 
 # NOTE 舫閮摰蝔梧銝臬隤
 #: ../libpurple/protocols/bonjour/bonjour.h:35
@@ -3135,8 +3196,8 @@
 msgstr "閮餃嚗"
 
 #: ../libpurple/protocols/gg/gg.c:477 ../libpurple/protocols/gg/gg.c:770
-#: ../libpurple/protocols/jabber/jabber.c:799
-#: ../libpurple/protocols/jabber/jabber.c:1358
+#: ../libpurple/protocols/jabber/jabber.c:803
+#: ../libpurple/protocols/jabber/jabber.c:1371
 msgid "Password"
 msgstr "撖蝣"
 
@@ -3162,9 +3223,9 @@
 
 #: ../libpurple/protocols/gg/gg.c:637 ../libpurple/protocols/gg/gg.c:1049
 #: ../libpurple/protocols/gg/gg.c:1123
-#: ../libpurple/protocols/jabber/jabber.c:835
-#: ../libpurple/protocols/oscar/oscar.c:3770
-#: ../libpurple/protocols/oscar/oscar.c:3783
+#: ../libpurple/protocols/jabber/jabber.c:839
+#: ../libpurple/protocols/oscar/oscar.c:3776
+#: ../libpurple/protocols/oscar/oscar.c:3789
 #: ../libpurple/protocols/qq/buddy_info.c:49
 msgid "City"
 msgstr "撣"
@@ -3173,8 +3234,8 @@
 msgid "Year of birth"
 msgstr "箇撟"
 
-#: ../libpurple/protocols/gg/gg.c:645 ../libpurple/protocols/msn/msn.c:1529
-#: ../libpurple/protocols/oscar/oscar.c:3713
+#: ../libpurple/protocols/gg/gg.c:645 ../libpurple/protocols/msn/msn.c:1537
+#: ../libpurple/protocols/oscar/oscar.c:3719
 #: ../libpurple/protocols/qq/buddy_info.c:46
 #: ../libpurple/protocols/qq/qq.c:224 ../libpurple/protocols/qq/qq.c:227
 #: ../libpurple/protocols/qq/qq.c:230 ../libpurple/protocols/qq/qq.c:234
@@ -3187,14 +3248,14 @@
 msgstr "瑟扳憟單"
 
 #: ../libpurple/protocols/gg/gg.c:647
-#: ../libpurple/protocols/oscar/oscar.c:3713
+#: ../libpurple/protocols/oscar/oscar.c:3719
 #: ../libpurple/protocols/qq/buddy_info.c:83
 #: ../libpurple/protocols/qq/qq.c:224
 msgid "Male"
 msgstr ""
 
 #: ../libpurple/protocols/gg/gg.c:648
-#: ../libpurple/protocols/oscar/oscar.c:3713
+#: ../libpurple/protocols/oscar/oscar.c:3719
 #: ../libpurple/protocols/qq/buddy_info.c:84
 #: ../libpurple/protocols/qq/qq.c:227
 msgid "Female"
@@ -3254,37 +3315,37 @@
 msgstr "啣啗憭拙恕..."
 
 #: ../libpurple/protocols/gg/gg.c:1003
-#: ../libpurple/protocols/jabber/buddy.c:1403
+#: ../libpurple/protocols/jabber/buddy.c:1428
 #: ../libpurple/protocols/novell/novell.c:2828
-#: ../libpurple/protocols/oscar/oscar.c:809
-#: ../libpurple/protocols/oscar/oscar.c:5513
+#: ../libpurple/protocols/oscar/oscar.c:810
+#: ../libpurple/protocols/oscar/oscar.c:5514
 #: ../libpurple/protocols/qq/qq.c:170 ../libpurple/protocols/qq/qq.c:177
-#: ../libpurple/protocols/yahoo/yahoo.c:2904 ../libpurple/status.c:154
-#: ../pidgin/gtkblist.c:3035 ../pidgin/gtkblist.c:3359
-#: ../pidgin/gtkdocklet.c:469 ../pidgin/gtkstatusbox.c:1054
+#: ../libpurple/protocols/yahoo/yahoo.c:2900 ../libpurple/status.c:153
+#: ../pidgin/gtkblist.c:3053 ../pidgin/gtkblist.c:3378
+#: ../pidgin/gtkdocklet.c:450 ../pidgin/gtkstatusbox.c:1054
 msgid "Offline"
 msgstr "Y"
 
 #: ../libpurple/protocols/gg/gg.c:1006
-#: ../libpurple/protocols/jabber/buddy.c:1405
+#: ../libpurple/protocols/jabber/buddy.c:1430
 #: ../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:2816
-#: ../libpurple/protocols/yahoo/yahoo.c:2906 ../libpurple/status.c:155
-#: ../pidgin/gtkdocklet.c:457 ../pidgin/gtkstatusbox.c:1051
+#: ../libpurple/protocols/yahoo/yahoo.c:2902 ../libpurple/status.c:154
+#: ../pidgin/gtkdocklet.c:438 ../pidgin/gtkstatusbox.c:1051
 msgid "Available"
 msgstr "銝蝺"
 
 #: ../libpurple/protocols/gg/gg.c:1038 ../libpurple/protocols/gg/gg.c:1114
-#: ../libpurple/protocols/oscar/oscar.c:2649
-#: ../libpurple/protocols/oscar/oscar.c:3680
+#: ../libpurple/protocols/oscar/oscar.c:2655
+#: ../libpurple/protocols/oscar/oscar.c:3686
 msgid "UIN"
 msgstr "撣唾"
 
 #: ../libpurple/protocols/gg/gg.c:1041 ../libpurple/protocols/gg/gg.c:1117
-#: ../libpurple/protocols/jabber/buddy.c:1560
-#: ../libpurple/protocols/jabber/buddy.c:1736
-#: ../libpurple/protocols/oscar/oscar.c:3691
+#: ../libpurple/protocols/jabber/buddy.c:1585
+#: ../libpurple/protocols/jabber/buddy.c:1761
+#: ../libpurple/protocols/oscar/oscar.c:3697
 #: ../libpurple/protocols/silc/ops.c:1024
 msgid "First Name"
 msgstr ""
@@ -3294,7 +3355,7 @@
 msgstr "箇撟"
 
 #: ../libpurple/protocols/gg/gg.c:1108 ../libpurple/protocols/gg/gg.c:1177
-#: ../libpurple/protocols/oscar/oscar.c:3892
+#: ../libpurple/protocols/oscar/oscar.c:3898
 msgid "Unable to display the search results."
 msgstr "⊥憿舐內撠蝯"
 
@@ -3339,7 +3400,7 @@
 msgid "Connection failed."
 msgstr "蝺憭望"
 
-#: ../libpurple/protocols/gg/gg.c:1618 ../libpurple/protocols/msn/msn.c:539
+#: ../libpurple/protocols/gg/gg.c:1618 ../libpurple/protocols/msn/msn.c:531
 msgid "Blocked"
 msgstr "撠"
 
@@ -3430,14 +3491,14 @@
 msgstr "芰亦隞歹%s"
 
 #: ../libpurple/protocols/irc/cmds.c:503
-#: ../libpurple/protocols/jabber/chat.c:593
+#: ../libpurple/protocols/jabber/chat.c:591
 #: ../libpurple/protocols/silc/silc.c:1285
 #, c-format
 msgid "current topic is: %s"
 msgstr "曉函銝駁綽%s"
 
 #: ../libpurple/protocols/irc/cmds.c:507
-#: ../libpurple/protocols/jabber/chat.c:597
+#: ../libpurple/protocols/jabber/chat.c:595
 #: ../libpurple/protocols/silc/silc.c:1289
 msgid "No topic is set"
 msgstr "瘝閮剖銝駁"
@@ -3473,7 +3534,7 @@
 msgstr "%s 舀亥"
 
 #: ../libpurple/protocols/irc/irc.c:127 ../libpurple/protocols/irc/irc.c:165
-#: ../libpurple/protocols/irc/irc.c:600 ../libpurple/protocols/irc/irc.c:625
+#: ../libpurple/protocols/irc/irc.c:614 ../libpurple/protocols/irc/irc.c:639
 msgid "Server has disconnected"
 msgstr "隡箸典歇甇a蝺"
 
@@ -3496,34 +3557,34 @@
 
 #. connect to the server
 #: ../libpurple/protocols/irc/irc.c:319
-#: ../libpurple/protocols/jabber/jabber.c:1038
+#: ../libpurple/protocols/jabber/jabber.c:1044
 #: ../libpurple/protocols/msn/session.c:344
 #: ../libpurple/protocols/novell/novell.c:2182
-#: ../libpurple/protocols/oscar/oscar.c:1269
+#: ../libpurple/protocols/oscar/oscar.c:1270
 #: ../libpurple/protocols/qq/qq.c:136
 #: ../libpurple/protocols/sametime/sametime.c:3723
-#: ../libpurple/protocols/simple/simple.c:1673
-#: ../libpurple/protocols/yahoo/yahoo.c:2749
-#: ../libpurple/protocols/zephyr/zephyr.c:1620 ../pidgin/gtkstatusbox.c:659
+#: ../libpurple/protocols/simple/simple.c:1671
+#: ../libpurple/protocols/yahoo/yahoo.c:2745
+#: ../libpurple/protocols/zephyr/zephyr.c:1621 ../pidgin/gtkstatusbox.c:659
 msgid "Connecting"
 msgstr "蝺銝"
 
 # XXX 怨陌
 #: ../libpurple/protocols/irc/irc.c:327
-#: ../libpurple/protocols/jabber/jabber.c:595
-#: ../libpurple/protocols/jabber/jabber.c:942
+#: ../libpurple/protocols/jabber/jabber.c:599
+#: ../libpurple/protocols/jabber/jabber.c:946
 msgid "SSL support unavailable"
 msgstr "瘝 SSL 舀"
 
 #: ../libpurple/protocols/irc/irc.c:338
 #: ../libpurple/protocols/simple/simple.c:464
-#: ../libpurple/protocols/simple/simple.c:1588
+#: ../libpurple/protocols/simple/simple.c:1586
 msgid "Couldn't create socket"
 msgstr "⊥撱箇 Socket"
 
-#: ../libpurple/protocols/irc/irc.c:402
+#: ../libpurple/protocols/irc/irc.c:416
 #: ../libpurple/protocols/jabber/jabber.c:466
-#: ../libpurple/protocols/oscar/oscar.c:1265
+#: ../libpurple/protocols/oscar/oscar.c:1266
 msgid "Couldn't connect to host"
 msgstr "⊥唬撩"
 
@@ -3531,28 +3592,28 @@
 # NOTE Jabber 摰 Stream Error 銝蝔殷 <remote-connection-failed/>
 # NOTE 閬 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
 # XXX 甇胯⊥蝺唾霅蝡航皞嚗銝胯蝺憭望嚗閬銝蝡嚗
-#: ../libpurple/protocols/irc/irc.c:424
+#: ../libpurple/protocols/irc/irc.c:438
 #: ../libpurple/protocols/jabber/jabber.c:495
 msgid "Connection Failed"
 msgstr "⊥蝺唾霅蝡航皞"
 
-#: ../libpurple/protocols/irc/irc.c:427
+#: ../libpurple/protocols/irc/irc.c:441
 #: ../libpurple/protocols/jabber/jabber.c:498
 msgid "SSL Handshake Failed"
 msgstr "SSL 鈭方憭望"
 
 # NOTE OSCAR 航炊閮舀臬 http://aimdoc.sourceforge.net/OSCARdoc/嚗雿刻府蝡敺暹梯正
-#: ../libpurple/protocols/irc/irc.c:597 ../libpurple/protocols/irc/irc.c:622
+#: ../libpurple/protocols/irc/irc.c:611 ../libpurple/protocols/irc/irc.c:636
 msgid "Read error"
 msgstr "霈航炊"
 
-#: ../libpurple/protocols/irc/irc.c:761
+#: ../libpurple/protocols/irc/irc.c:775
 #: ../libpurple/protocols/silc/chat.c:1426
 #: ../libpurple/protocols/yahoo/yahoochat.c:1438
 msgid "Users"
 msgstr "雿輻刻"
 
-#: ../libpurple/protocols/irc/irc.c:764
+#: ../libpurple/protocols/irc/irc.c:778
 #: ../libpurple/protocols/sametime/sametime.c:3374
 #: ../libpurple/protocols/silc/chat.c:1429
 #: ../libpurple/protocols/silc/ops.c:1382
@@ -3568,45 +3629,44 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../libpurple/protocols/irc/irc.c:901
+#: ../libpurple/protocols/irc/irc.c:915
 msgid "IRC Protocol Plugin"
 msgstr "IRC 摰璅∠"
 
 #. *  summary
-#: ../libpurple/protocols/irc/irc.c:902
+#: ../libpurple/protocols/irc/irc.c:916
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "頛憟賜 IRC 摰璅∠"
 
 #. host to connect to
-#: ../libpurple/protocols/irc/irc.c:927 ../libpurple/protocols/irc/msgs.c:314
-#: ../libpurple/protocols/jabber/libxmpp.c:194
-#: ../libpurple/protocols/msn/msn.c:2122
-#: ../libpurple/protocols/oscar/oscar.c:6577
+#: ../libpurple/protocols/irc/irc.c:941 ../libpurple/protocols/irc/msgs.c:323
+#: ../libpurple/protocols/msn/msn.c:2130
+#: ../libpurple/protocols/oscar/oscar.c:6581
 #: ../libpurple/protocols/qq/qq.c:756
-#: ../libpurple/protocols/sametime/sametime.c:5712
+#: ../libpurple/protocols/sametime/sametime.c:5727
 #: ../libpurple/protocols/silc/ops.c:1244
 #: ../libpurple/protocols/silc/ops.c:1347
-#: ../libpurple/protocols/simple/simple.c:1852
+#: ../libpurple/protocols/simple/simple.c:1850
 #: ../libpurple/protocols/toc/toc.c:2327
 msgid "Server"
 msgstr "隡箸"
 
 #. port to connect to
-#: ../libpurple/protocols/irc/irc.c:930 ../libpurple/protocols/msn/msn.c:2127
-#: ../libpurple/protocols/oscar/oscar.c:6580
+#: ../libpurple/protocols/irc/irc.c:944 ../libpurple/protocols/msn/msn.c:2135
+#: ../libpurple/protocols/oscar/oscar.c:6584
 #: ../libpurple/protocols/qq/qq.c:759
-#: ../libpurple/protocols/sametime/sametime.c:5717
+#: ../libpurple/protocols/sametime/sametime.c:5732
 #: ../libpurple/protocols/silc/silc.c:1870
 #: ../libpurple/protocols/toc/toc.c:2331
 msgid "Port"
 msgstr "閮"
 
-#: ../libpurple/protocols/irc/irc.c:933
+#: ../libpurple/protocols/irc/irc.c:947
 msgid "Encodings"
 msgstr "蝺函Ⅳ"
 
-#: ../libpurple/protocols/irc/irc.c:936 ../libpurple/protocols/irc/msgs.c:307
-#: ../libpurple/protocols/jabber/jabber.c:795
+#: ../libpurple/protocols/irc/irc.c:950 ../libpurple/protocols/irc/msgs.c:316
+#: ../libpurple/protocols/jabber/jabber.c:799
 #: ../libpurple/protocols/silc/buddy.c:1539
 #: ../libpurple/protocols/silc/ops.c:1191
 #: ../libpurple/protocols/silc/ops.c:1194
@@ -3616,7 +3676,7 @@
 msgid "Username"
 msgstr "雿輻刻"
 
-#: ../libpurple/protocols/irc/irc.c:939 ../libpurple/protocols/irc/msgs.c:308
+#: ../libpurple/protocols/irc/irc.c:953 ../libpurple/protocols/irc/msgs.c:317
 #: ../libpurple/protocols/silc/silc.c:928
 msgid "Real name"
 msgstr "憪"
@@ -3625,232 +3685,232 @@
 #. option = purple_account_option_string_new(_("Quit message"), "quitmsg", IRC_DEFAULT_QUIT);
 #. prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
 #.
-#: ../libpurple/protocols/irc/irc.c:947
+#: ../libpurple/protocols/irc/irc.c:961
 msgid "Use SSL"
 msgstr "雿輻 SSL"
 
-#: ../libpurple/protocols/irc/msgs.c:178
+#: ../libpurple/protocols/irc/msgs.c:187
 msgid "Bad mode"
 msgstr "璅∪⊥"
 
 # FIXME 舀怨陌
-#: ../libpurple/protocols/irc/msgs.c:189
+#: ../libpurple/protocols/irc/msgs.c:198
 #, c-format
 msgid "You are banned from %s."
 msgstr "刻◤蝳 %s 鈭"
 
 # FIXME 舀怨陌
 # NOTE 霅舀游 by Paladin
-#: ../libpurple/protocols/irc/msgs.c:190
+#: ../libpurple/protocols/irc/msgs.c:199
 msgid "Banned"
 msgstr "鋡怎甇"
 
-#: ../libpurple/protocols/irc/msgs.c:207
+#: ../libpurple/protocols/irc/msgs.c:216
 #, c-format
 msgid "Cannot ban %s: banlist is full"
 msgstr "⊥蝳甇 %s嚗蝳甇X桀歇皛"
 
-#: ../libpurple/protocols/irc/msgs.c:292
+#: ../libpurple/protocols/irc/msgs.c:301
 msgid " <i>(ircop)</i>"
 msgstr " <i>(IRC 雿)</i>"
 
-#: ../libpurple/protocols/irc/msgs.c:293
+#: ../libpurple/protocols/irc/msgs.c:302
 msgid " <i>(identified)</i>"
 msgstr " <i>(撌脤霅)</i>"
 
-#: ../libpurple/protocols/irc/msgs.c:294
-#: ../libpurple/protocols/oscar/oscar.c:3681
+#: ../libpurple/protocols/irc/msgs.c:303
+#: ../libpurple/protocols/oscar/oscar.c:3687
 #: ../libpurple/protocols/silc/ops.c:1414
 msgid "Nick"
 msgstr "梁迂"
 
-#: ../libpurple/protocols/irc/msgs.c:320
+#: ../libpurple/protocols/irc/msgs.c:329
 #: ../libpurple/protocols/silc/ops.c:1272
 msgid "Currently on"
 msgstr "券駁"
 
-#: ../libpurple/protocols/irc/msgs.c:325
+#: ../libpurple/protocols/irc/msgs.c:334
 msgid "Idle for"
 msgstr "蝵格"
 
-#: ../libpurple/protocols/irc/msgs.c:328
+#: ../libpurple/protocols/irc/msgs.c:337
 msgid "Online since"
 msgstr "銝蝺"
 
 #  XXX 嗅祕霅臬銝憭芸嚗臭誑寥脖暺
-#: ../libpurple/protocols/irc/msgs.c:332
+#: ../libpurple/protocols/irc/msgs.c:341
 msgid "<b>Defining adjective:</b>"
 msgstr "<b>餈堆</b>"
 
-#: ../libpurple/protocols/irc/msgs.c:332
+#: ../libpurple/protocols/irc/msgs.c:341
 msgid "Glorious"
 msgstr "摰蟡"
 
 # NOTE 啁IRC prpl韏瑕銝憿舐內嚗渲陌靽格嫘瘝憿
-#: ../libpurple/protocols/irc/msgs.c:408
+#: ../libpurple/protocols/irc/msgs.c:417
 #, c-format
 msgid "%s has changed the topic to: %s"
 msgstr "%s 憭拐蜓憿靽格寧綽%s"
 
 # NOTE 啁IRC prpl韏瑕銝憿舐內嚗渲陌靽格嫘瘝憿
-#: ../libpurple/protocols/irc/msgs.c:410
+#: ../libpurple/protocols/irc/msgs.c:419
 #, c-format
 msgid "%s has cleared the topic."
 msgstr "%s 撌脩銝駁皜扎"
 
-#: ../libpurple/protocols/irc/msgs.c:418
+#: ../libpurple/protocols/irc/msgs.c:427
 #, c-format
 msgid "The topic for %s is: %s"
 msgstr "%s 銝駁綽%s"
 
-#: ../libpurple/protocols/irc/msgs.c:436
+#: ../libpurple/protocols/irc/msgs.c:445
 #, c-format
 msgid "Unknown message '%s'"
 msgstr "銝閮胯%s"
 
-#: ../libpurple/protocols/irc/msgs.c:437
+#: ../libpurple/protocols/irc/msgs.c:446
 msgid "Unknown message"
 msgstr "銝閮"
 
-#: ../libpurple/protocols/irc/msgs.c:437
+#: ../libpurple/protocols/irc/msgs.c:446
 msgid "The IRC server received a message it did not understand."
 msgstr "IRC 隡箸冽嗅唬摰銝賜閮胯"
 
-#: ../libpurple/protocols/irc/msgs.c:458
+#: ../libpurple/protocols/irc/msgs.c:467
 #, c-format
 msgid "Users on %s: %s"
 msgstr " %s 抒雿輻刻嚗%s"
 
 #  XXX
-#: ../libpurple/protocols/irc/msgs.c:555
+#: ../libpurple/protocols/irc/msgs.c:572
 msgid "Time Response"
 msgstr ""
 
 #  XXX
-#: ../libpurple/protocols/irc/msgs.c:556
+#: ../libpurple/protocols/irc/msgs.c:573
 msgid "The IRC server's local time is:"
 msgstr "IRC 隡箸函垢銋綽"
 
-#: ../libpurple/protocols/irc/msgs.c:567
+#: ../libpurple/protocols/irc/msgs.c:584
 msgid "No such channel"
 msgstr "瘝駁"
 
 #. does this happen?
-#: ../libpurple/protocols/irc/msgs.c:578
+#: ../libpurple/protocols/irc/msgs.c:595
 msgid "no such channel"
 msgstr "瘝駁"
 
-#: ../libpurple/protocols/irc/msgs.c:581
+#: ../libpurple/protocols/irc/msgs.c:598
 msgid "User is not logged in"
 msgstr "雿輻刻瘝餃"
 
-#: ../libpurple/protocols/irc/msgs.c:586
+#: ../libpurple/protocols/irc/msgs.c:603
 msgid "No such nick or channel"
 msgstr "瘝梁迂駁"
 
-#: ../libpurple/protocols/irc/msgs.c:606
+#: ../libpurple/protocols/irc/msgs.c:623
 msgid "Could not send"
 msgstr "⊥"
 
-#: ../libpurple/protocols/irc/msgs.c:662
+#: ../libpurple/protocols/irc/msgs.c:679
 #, c-format
 msgid "Joining %s requires an invitation."
 msgstr "芣鋡恍隢臬 %s"
 
-#: ../libpurple/protocols/irc/msgs.c:663
+#: ../libpurple/protocols/irc/msgs.c:680
 msgid "Invitation only"
 msgstr "芷鋡恍隢"
 
-#: ../libpurple/protocols/irc/msgs.c:775
+#: ../libpurple/protocols/irc/msgs.c:792
 #, c-format
 msgid "You have been kicked by %s: (%s)"
 msgstr "刻◤ %s 頦W綽(%s)"
 
 #. Remove user from channel
-#: ../libpurple/protocols/irc/msgs.c:780 ../libpurple/protocols/silc/ops.c:720
+#: ../libpurple/protocols/irc/msgs.c:797 ../libpurple/protocols/silc/ops.c:720
 #, c-format
 msgid "Kicked by %s (%s)"
 msgstr "鋡 %s 頦W (%s)"
 
-#: ../libpurple/protocols/irc/msgs.c:803
+#: ../libpurple/protocols/irc/msgs.c:820
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr "璅∪ (%s %s) 鋡 %s 閮剖"
 
-#: ../libpurple/protocols/irc/msgs.c:888 ../libpurple/protocols/irc/msgs.c:889
+#: ../libpurple/protocols/irc/msgs.c:905 ../libpurple/protocols/irc/msgs.c:906
 msgid "Invalid nickname"
-msgstr "⊥梁迂"
-
-#: ../libpurple/protocols/irc/msgs.c:890
+msgstr "梁迂⊥"
+
+#: ../libpurple/protocols/irc/msgs.c:907
 msgid ""
 "Your selected nickname was rejected by the server.  It probably contains "
 "invalid characters."
 msgstr "隡箸冽蝯鈭冽摰梁迂嚗梁迂銝剖之璁急⊥摮"
 
-#: ../libpurple/protocols/irc/msgs.c:895
+#: ../libpurple/protocols/irc/msgs.c:912
 msgid ""
 "Your selected account name was rejected by the server.  It probably contains "
 "invalid characters."
 msgstr "隡箸冽蝯鈭冽摰撣唾蝔梧蝔曹葉憭扳急⊥摮"
 
-#: ../libpurple/protocols/irc/msgs.c:934
+#: ../libpurple/protocols/irc/msgs.c:951
 msgid "Cannot change nick"
 msgstr "⊥湔寞梁迂"
 
-#: ../libpurple/protocols/irc/msgs.c:934
+#: ../libpurple/protocols/irc/msgs.c:951
 msgid "Could not change nick"
 msgstr "⊥湔寞梁迂"
 
-#: ../libpurple/protocols/irc/msgs.c:955
+#: ../libpurple/protocols/irc/msgs.c:972
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr "券a鈭駁%s%s"
 
-#: ../libpurple/protocols/irc/msgs.c:997
+#: ../libpurple/protocols/irc/msgs.c:1014
 msgid "Error: invalid PONG from server"
 msgstr "航炊嚗靘芯撩函 PONG ⊥"
 
-#: ../libpurple/protocols/irc/msgs.c:999
+#: ../libpurple/protocols/irc/msgs.c:1016
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr "PING 蝑撱園莎%lu蝘"
 
-#: ../libpurple/protocols/irc/msgs.c:1080
-#, c-format
-msgid "Cannot join %s:"
-msgstr "⊥ %s嚗"
-
-#: ../libpurple/protocols/irc/msgs.c:1081
+#: ../libpurple/protocols/irc/msgs.c:1097
+#, c-format
+msgid "Cannot join %s: Registration is required."
+msgstr "⊥ %s嚗敹閮餃"
+
+#: ../libpurple/protocols/irc/msgs.c:1098
 #: ../libpurple/protocols/silc/ops.c:1128
 msgid "Cannot join channel"
 msgstr "⊥仿駁"
 
 #  NOTE急⊥雿輻具閰脫急銝摮具
-#: ../libpurple/protocols/irc/msgs.c:1115
+#: ../libpurple/protocols/irc/msgs.c:1132
 msgid "Nick or channel is temporarily unavailable."
 msgstr "急⊥雿輻刻府梁迂駁"
 
-#: ../libpurple/protocols/irc/msgs.c:1127
+#: ../libpurple/protocols/irc/msgs.c:1144
 #, c-format
 msgid "Wallops from %s"
 msgstr "靘 %s  Wallops"
 
-#: ../libpurple/protocols/irc/parse.c:121
+#: ../libpurple/protocols/irc/parse.c:122
 msgid "action &lt;action to perform&gt;:  Perform an action."
 msgstr "action &lt;閬瑁雿&gt;嚗瑁銝雿"
 
-#: ../libpurple/protocols/irc/parse.c:122
+#: ../libpurple/protocols/irc/parse.c:123
 msgid ""
 "away [message]:  Set an away message, or use no message to return from being "
 "away."
 msgstr "away [閮珠嚗閮剖銝a閮荔券a銝摰隞颱閮胯"
 
-#: ../libpurple/protocols/irc/parse.c:123
+#: ../libpurple/protocols/irc/parse.c:124
 msgid "chanserv: Send a command to chanserv"
 msgstr "chanserv嚗箔隞文 chanserv"
 
 # XXX 怨陌
-#: ../libpurple/protocols/irc/parse.c:124
+#: ../libpurple/protocols/irc/parse.c:125
 msgid ""
 "deop &lt;nick1&gt; [nick2] ...:  Remove channel operator status from "
 "someone. You must be a channel operator to do this."
@@ -3858,7 +3918,7 @@
 "deop &lt;梁迂1&gt; [梁迂2] ...嚗蝘駁斗鈭箇駁蝞∠甈典瑟"
 "駁蝞∠甈賢瑁雿"
 
-#: ../libpurple/protocols/irc/parse.c:125
+#: ../libpurple/protocols/irc/parse.c:126
 msgid ""
 "devoice &lt;nick1&gt; [nick2] ...:  Remove channel voice status from "
 "someone, preventing them from speaking if the channel is moderated (+m). You "
@@ -3867,7 +3927,7 @@
 "devoice &lt;梁迂1&gt; [梁迂2] ...嚗蝘駁斗鈭箇潸甈蝳甇X鈭鈭箏券駁"
 "銝剔潸”銝嗥閮隢典瑟駁蝞∠甈賢瑁雿"
 
-#: ../libpurple/protocols/irc/parse.c:126
+#: ../libpurple/protocols/irc/parse.c:127
 msgid ""
 "invite &lt;nick&gt; [room]:  Invite someone to join you in the specified "
 "channel, or the current channel."
@@ -3875,7 +3935,7 @@
 "invite &lt梁迂&gt; [憭拙恕]嚗隢鈭箔交冽摰駁嚗舐桀冽函"
 "駁"
 
-#: ../libpurple/protocols/irc/parse.c:127
+#: ../libpurple/protocols/irc/parse.c:128
 msgid ""
 "j &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
 "channels, optionally providing a channel key for each if needed."
@@ -3883,7 +3943,7 @@
 "j &lt;憭拙恕1&gt;[,憭拙恕2][,...] [撖1[,撖2][,...]]嚗隞交摰撖堆憒蝯"
 "鈭銝行閬嚗交摰憭拙恕"
 
-#: ../libpurple/protocols/irc/parse.c:128
+#: ../libpurple/protocols/irc/parse.c:129
 msgid ""
 "join &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
 "channels, optionally providing a channel key for each if needed."
@@ -3891,7 +3951,7 @@
 "join &lt;憭拙恕1&gt;[,憭拙恕2][,...] [撖1[,撖2][,...]]嚗隞交摰撖堆憒"
 "蝯虫銝行閬嚗交摰憭拙恕"
 
-#: ../libpurple/protocols/irc/parse.c:129
+#: ../libpurple/protocols/irc/parse.c:130
 msgid ""
 "kick &lt;nick&gt; [message]:  Remove someone from a channel. You must be a "
 "channel operator to do this."
@@ -3899,7 +3959,7 @@
 "kick &lt;梁迂&gt; [閮珠嚗撠雿輻刻頦W粹駁典瑟駁蝞∠甈"
 "賢瑁雿"
 
-#: ../libpurple/protocols/irc/parse.c:130
+#: ../libpurple/protocols/irc/parse.c:131
 msgid ""
 "list:  Display a list of chat rooms on the network. <i>Warning, some servers "
 "may disconnect you upon doing this.</i>"
@@ -3907,22 +3967,22 @@
 "list嚗箇桀函雯蝯∩憭拙恕皜柴<i>隢瘜冽嚗鈭隡箸冽冽典瑁鈭雿"
 "銋敺嚗撘瑁銝剜迫函蝺</i>"
 
-#: ../libpurple/protocols/irc/parse.c:131
+#: ../libpurple/protocols/irc/parse.c:132
 msgid "me &lt;action to perform&gt;:  Perform an action."
 msgstr "me &lt;閬瑁雿&gt;嚗瑁銝雿"
 
-#: ../libpurple/protocols/irc/parse.c:132
+#: ../libpurple/protocols/irc/parse.c:133
 msgid "memoserv: Send a command to memoserv"
 msgstr "memoserv嚗箔隞文 memoserv"
 
-#: ../libpurple/protocols/irc/parse.c:133
+#: ../libpurple/protocols/irc/parse.c:134
 msgid ""
 "mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;nick|channel&gt;:  Set or unset a channel "
 "or user mode."
 msgstr ""
 "mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;梁迂|駁&gt;嚗閮剖閫日駁曹蝙刻璅∪"
 
-#: ../libpurple/protocols/irc/parse.c:134
+#: ../libpurple/protocols/irc/parse.c:135
 msgid ""
 "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
 "opposed to a channel)."
@@ -3930,20 +3990,20 @@
 "msg &lt;梁迂&gt; &lt;閮&gt;嚗箔蝘鈭箄舐策摰雿輻刻嚗踹喲啣祉"
 "駁銝哨"
 
-#: ../libpurple/protocols/irc/parse.c:135
+#: ../libpurple/protocols/irc/parse.c:136
 msgid "names [channel]:  List the users currently in a channel."
 msgstr "names [駁]嚗箇桀券駁銝剔雿輻刻皜柴"
 
-#: ../libpurple/protocols/irc/parse.c:136
-#: ../libpurple/protocols/jabber/jabber.c:1800
+#: ../libpurple/protocols/irc/parse.c:137
+#: ../libpurple/protocols/jabber/jabber.c:1813
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr "nick &lt;唳梁迂&gt;嚗寡函梁迂"
 
-#: ../libpurple/protocols/irc/parse.c:137
+#: ../libpurple/protocols/irc/parse.c:138
 msgid "nickserv: Send a command to nickserv"
 msgstr "nickserv嚗箔隞文 nickserv"
 
-#: ../libpurple/protocols/irc/parse.c:138
+#: ../libpurple/protocols/irc/parse.c:139
 msgid ""
 "op &lt;nick1&gt; [nick2] ...:  Grant channel operator status to someone. You "
 "must be a channel operator to do this."
@@ -3951,7 +4011,7 @@
 "op &lt;梁迂&gt; [梁迂] ...嚗鞈西雿輻刻駁蝞∠甈典瑟"
 "蝞∠甈賢瑁雿"
 
-#: ../libpurple/protocols/irc/parse.c:139
+#: ../libpurple/protocols/irc/parse.c:140
 msgid ""
 "operwall &lt;message&gt;:  If you don't know what this is, you probably "
 "can't use it."
@@ -3959,11 +4019,11 @@
 "operwall &lt;閮&gt;嚗憒其仿臬凳隞暻潛函嚗典航賣颲行雿輻券"
 "隞扎"
 
-#: ../libpurple/protocols/irc/parse.c:140
+#: ../libpurple/protocols/irc/parse.c:141
 msgid "operserv: Send a command to operserv"
 msgstr "operserv嚗箔隞文 operserv"
 
-#: ../libpurple/protocols/irc/parse.c:141
+#: ../libpurple/protocols/irc/parse.c:142
 msgid ""
 "part [room] [message]:  Leave the current channel, or a specified channel, "
 "with an optional message."
@@ -3971,7 +4031,7 @@
 "part [駁] [閮珠嚗a桀駁摰駁摰駁臬摰箇閮"
 "胯"
 
-#: ../libpurple/protocols/irc/parse.c:142
+#: ../libpurple/protocols/irc/parse.c:143
 msgid ""
 "ping [nick]:  Asks how much lag a user (or the server if no user specified) "
 "has."
@@ -3979,7 +4039,7 @@
 "ping [梁迂]嚗亥岷銝雿輻刻蝬脰楝摨佗冽摰雿輻刻嚗亥岷隡箸"
 "摨佗"
 
-#: ../libpurple/protocols/irc/parse.c:143
+#: ../libpurple/protocols/irc/parse.c:144
 msgid ""
 "query &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
 "opposed to a channel)."
@@ -3987,16 +4047,16 @@
 "query &lt;梁迂&gt; &lt;閮&gt;嚗箔蝘鈭箄舐策摰雿輻刻嚗踹潮啣"
 "暸駁嚗"
 
-#: ../libpurple/protocols/irc/parse.c:144
+#: ../libpurple/protocols/irc/parse.c:145
 msgid "quit [message]:  Disconnect from the server, with an optional message."
 msgstr "quit [閮珠嚗芯撩券Y嚗銝阡箸摰閮胯"
 
 # XXX 怨陌
-#: ../libpurple/protocols/irc/parse.c:145
+#: ../libpurple/protocols/irc/parse.c:146
 msgid "quote [...]:  Send a raw command to the server."
 msgstr "quote [...]嚗箔 RAW 隞文唬撩具"
 
-#: ../libpurple/protocols/irc/parse.c:146
+#: ../libpurple/protocols/irc/parse.c:147
 msgid ""
 "remove &lt;nick&gt; [message]:  Remove someone from a room. You must be a "
 "channel operator to do this."
@@ -4004,23 +4064,23 @@
 "remove &lt;梁迂&gt; [閮珠嚗撠雿輻刻頦W粹駁典瑟駁蝞∠"
 "甈賢瑁雿"
 
-#: ../libpurple/protocols/irc/parse.c:147
+#: ../libpurple/protocols/irc/parse.c:148
 msgid "time: Displays the current local time at the IRC server."
 msgstr "time嚗憿舐內 IRC 隡箸冽典唬砍唳"
 
-#: ../libpurple/protocols/irc/parse.c:148
-msgid "topic [new topic]:  View or change the channel topic."
-msgstr "topic [唬蜓憿]嚗瑼Z靽格寥駁銝駁"
-
 #: ../libpurple/protocols/irc/parse.c:149
-msgid "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Set or unset a user mode."
-msgstr "umode &lt;+|-&gt;&lt;A-Za-z&gt;嚗閮剖閫支蝙刻璅∪"
+msgid "topic [new topic]:  View or change the channel topic."
+msgstr "topic [唬蜓憿]嚗瑼Z靽格寥駁銝駁"
 
 #: ../libpurple/protocols/irc/parse.c:150
-msgid "version [nick]: send CTCP VERSION request to a user"
-msgstr "version [梁迂]嚗 CTCP VERSION 閬瘙蝯虫蝙刻"
+msgid "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Set or unset a user mode."
+msgstr "umode &lt;+|-&gt;&lt;A-Za-z&gt;嚗閮剖閫支蝙刻璅∪"
 
 #: ../libpurple/protocols/irc/parse.c:151
+msgid "version [nick]: send CTCP VERSION request to a user"
+msgstr "version [梁迂]嚗蝯虫蝙刻 CTCP VERSION 閬瘙"
+
+#: ../libpurple/protocols/irc/parse.c:152
 msgid ""
 "voice &lt;nick1&gt; [nick2] ...:  Grant channel voice status to someone. You "
 "must be a channel operator to do this."
@@ -4028,7 +4088,7 @@
 "voice &lt;梁迂&gt; [梁迂] ...嚗鞈西雿輻刻潸甈典瑟駁蝞∠"
 "甈賢瑁雿"
 
-#: ../libpurple/protocols/irc/parse.c:152
+#: ../libpurple/protocols/irc/parse.c:153
 msgid ""
 "wallops &lt;message&gt;:  If you don't know what this is, you probably can't "
 "use it."
@@ -4036,29 +4096,29 @@
 "wallops &lt;message&gt;嚗憒其仿臬凳隞暻潛函嚗典航賢停瘝颲行雿輻典"
 "鈭"
 
-#: ../libpurple/protocols/irc/parse.c:153
+#: ../libpurple/protocols/irc/parse.c:154
 msgid "whois [server] &lt;nick&gt;:  Get information on a user."
 msgstr "whois [隡箸典蝔崧 &lt;梁迂&gt;嚗敺雿輻刻鞈閮"
 
-#: ../libpurple/protocols/irc/parse.c:154
+#: ../libpurple/protocols/irc/parse.c:155
 msgid "whowas &lt;nick&gt;: Get information on a user that has logged off."
 msgstr "whowas &lt;梁迂&gt;嚗敺撌脤Y雿輻刻鞈閮"
 
-#: ../libpurple/protocols/irc/parse.c:448
+#: ../libpurple/protocols/irc/parse.c:449
 #, c-format
 msgid "Reply time from %s: %lu seconds"
 msgstr "%s 蝑嚗%lu 蝘"
 
-#: ../libpurple/protocols/irc/parse.c:449
+#: ../libpurple/protocols/irc/parse.c:450
 msgid "PONG"
 msgstr "PONG"
 
-#: ../libpurple/protocols/irc/parse.c:449
+#: ../libpurple/protocols/irc/parse.c:450
 msgid "CTCP PING reply"
 msgstr "CTCP PING 蝑"
 
-#: ../libpurple/protocols/irc/parse.c:560
-#: ../libpurple/protocols/irc/parse.c:564 ../libpurple/protocols/toc/toc.c:191
+#: ../libpurple/protocols/irc/parse.c:561
+#: ../libpurple/protocols/irc/parse.c:565 ../libpurple/protocols/toc/toc.c:191
 #: ../libpurple/protocols/toc/toc.c:694 ../libpurple/protocols/toc/toc.c:710
 #: ../libpurple/protocols/toc/toc.c:786
 msgid "Disconnected."
@@ -4073,46 +4133,52 @@
 msgstr "隡箸券閬蝬望芰撖銝脫脰隤霅"
 
 #: ../libpurple/protocols/jabber/auth.c:294
-#: ../libpurple/protocols/jabber/auth.c:295
-#: ../libpurple/protocols/jabber/auth.c:480
-#: ../libpurple/protocols/jabber/auth.c:481
-#: ../libpurple/protocols/jabber/auth.c:564
-#: ../libpurple/protocols/jabber/auth.c:565
+#: ../libpurple/protocols/jabber/auth.c:483
+#, c-format
+msgid ""
+"%s requires plaintext authentication over an unencrypted connection.  Allow "
+"this and continue authentication?"
+msgstr "%s 閬蝬望芰撖銝脫脰隤霅閮曹蒂蝜潛脰隤霅嚗"
+
+#: ../libpurple/protocols/jabber/auth.c:296
+#: ../libpurple/protocols/jabber/auth.c:297
+#: ../libpurple/protocols/jabber/auth.c:485
+#: ../libpurple/protocols/jabber/auth.c:486
+#: ../libpurple/protocols/jabber/auth.c:570
+#: ../libpurple/protocols/jabber/auth.c:571
 msgid "Plaintext Authentication"
 msgstr "隤霅"
 
-#: ../libpurple/protocols/jabber/auth.c:296
-#: ../libpurple/protocols/jabber/auth.c:482
-#: ../libpurple/protocols/jabber/auth.c:566
+#: ../libpurple/protocols/jabber/auth.c:309
+#: ../libpurple/protocols/jabber/auth.c:498
+#: ../libpurple/protocols/jabber/auth.c:582
+msgid "Server does not use any supported authentication method"
+msgstr "隡箸其蒂銝靘隞颱銝蝔株◤舀渡隤霅孵"
+
+#. This should never happen!
+#: ../libpurple/protocols/jabber/auth.c:437
+#: ../libpurple/protocols/jabber/auth.c:533
+#: ../libpurple/protocols/jabber/auth.c:714
+#: ../libpurple/protocols/jabber/auth.c:848
+#: ../libpurple/protocols/jabber/auth.c:873
+#: ../libpurple/protocols/jabber/auth.c:892
+#: ../libpurple/protocols/jabber/jabber.c:115
+msgid "Invalid response from server."
+msgstr "隡箸券靘鈭⊥"
+
+#: ../libpurple/protocols/jabber/auth.c:572
 msgid ""
 "This server requires plaintext authentication over an unencrypted "
 "connection.  Allow this and continue authentication?"
 msgstr "隡箸券閬蝬望芰撖銝脫脰隤霅閮曹蒂蝜潛脰隤霅嚗"
 
-#: ../libpurple/protocols/jabber/auth.c:306
-#: ../libpurple/protocols/jabber/auth.c:492
-#: ../libpurple/protocols/jabber/auth.c:576
-msgid "Server does not use any supported authentication method"
-msgstr "隡箸其蒂銝靘隞颱銝蝔株◤舀渡隤霅孵"
-
-#. This should never happen!
-#: ../libpurple/protocols/jabber/auth.c:434
-#: ../libpurple/protocols/jabber/auth.c:527
-#: ../libpurple/protocols/jabber/auth.c:708
-#: ../libpurple/protocols/jabber/auth.c:842
-#: ../libpurple/protocols/jabber/auth.c:867
-#: ../libpurple/protocols/jabber/auth.c:886
-#: ../libpurple/protocols/jabber/jabber.c:115
-msgid "Invalid response from server."
-msgstr "⊥隡箸典"
-
 # XXX 憟賢鈭迎霅舀敺寥
-#: ../libpurple/protocols/jabber/auth.c:729
+#: ../libpurple/protocols/jabber/auth.c:735
 msgid "Invalid challenge from server"
 msgstr "隡箸券靘鈭⊥撽霅"
 
 # NOTE OSCAR 航炊閮舀臬 http://aimdoc.sourceforge.net/OSCARdoc/嚗雿刻府蝡敺暹梯正
-#: ../libpurple/protocols/jabber/auth.c:817
+#: ../libpurple/protocols/jabber/auth.c:823
 msgid "SASL error"
 msgstr "SASL 航炊"
 
@@ -4135,7 +4201,7 @@
 msgstr ""
 
 #: ../libpurple/protocols/jabber/buddy.c:275
-#: ../libpurple/protocols/jabber/jabber.c:855
+#: ../libpurple/protocols/jabber/jabber.c:859
 msgid "URL"
 msgstr "URL"
 
@@ -4179,7 +4245,7 @@
 #: ../libpurple/protocols/jabber/buddy.c:283
 #: ../libpurple/protocols/jabber/buddy.c:902
 #: ../libpurple/protocols/jabber/buddy.c:910
-#: ../libpurple/protocols/jabber/buddy.c:1566
+#: ../libpurple/protocols/jabber/buddy.c:1591
 #: ../libpurple/protocols/silc/ops.c:1075
 #: ../libpurple/protocols/silc/util.c:551
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1037
@@ -4203,22 +4269,22 @@
 
 #: ../libpurple/protocols/jabber/buddy.c:288
 #: ../libpurple/protocols/jabber/buddy.c:821
-#: ../libpurple/protocols/msn/msn.c:1598
-#: ../libpurple/protocols/oscar/oscar.c:3730
+#: ../libpurple/protocols/msn/msn.c:1606
+#: ../libpurple/protocols/oscar/oscar.c:3736
 msgid "Birthday"
 msgstr ""
 
 #: ../libpurple/protocols/jabber/buddy.c:289
 #: ../libpurple/protocols/jabber/buddy.c:941
-#: ../libpurple/protocols/jabber/chat.c:777 ../pidgin/gtkblist.c:3046
+#: ../libpurple/protocols/jabber/chat.c:775 ../pidgin/gtkblist.c:3064
 #: ../pidgin/gtkprefs.c:680
 msgid "Description"
 msgstr "餈"
 
 #: ../libpurple/protocols/jabber/buddy.c:578
 #: ../libpurple/protocols/jabber/buddy.c:579
-msgid "Edit Jabber vCard"
-msgstr "蝺刻摩 Jabber vCard"
+msgid "Edit XMPP vCard"
+msgstr "蝺刻摩 XMPP vCard"
 
 #: ../libpurple/protocols/jabber/buddy.c:580
 msgid ""
@@ -4243,16 +4309,16 @@
 # NOTE 其誑銵函內典唳孵餃乩敶V嚗桀撖血其蝵
 # NOTE 閬 http://www.jabber.org/user/userguide.html
 #: ../libpurple/protocols/jabber/buddy.c:665
-#: ../libpurple/protocols/jabber/libxmpp.c:197
+#: ../libpurple/protocols/jabber/libxmpp.c:198
 msgid "Resource"
 msgstr ""
 
 #: ../libpurple/protocols/jabber/buddy.c:667
-#: ../libpurple/protocols/jabber/jabber.c:1232
-#: ../libpurple/protocols/jabber/jabber.c:1242
-#: ../libpurple/protocols/jabber/jabber.c:1252
-#: ../libpurple/protocols/jabber/jabber.c:1262
-#: ../libpurple/protocols/jabber/jabber.c:1272
+#: ../libpurple/protocols/jabber/jabber.c:1245
+#: ../libpurple/protocols/jabber/jabber.c:1255
+#: ../libpurple/protocols/jabber/jabber.c:1265
+#: ../libpurple/protocols/jabber/jabber.c:1275
+#: ../libpurple/protocols/jabber/jabber.c:1285
 msgid "Priority"
 msgstr "芸甈∪"
 
@@ -4264,9 +4330,9 @@
 msgstr "望亙"
 
 #: ../libpurple/protocols/jabber/buddy.c:841
-#: ../libpurple/protocols/jabber/jabber.c:830
-#: ../libpurple/protocols/oscar/oscar.c:3769
-#: ../libpurple/protocols/oscar/oscar.c:3782
+#: ../libpurple/protocols/jabber/jabber.c:834
+#: ../libpurple/protocols/oscar/oscar.c:3775
+#: ../libpurple/protocols/oscar/oscar.c:3788
 #: ../libpurple/protocols/qq/buddy_info.c:56
 #: ../libpurple/protocols/silc/ops.c:1064
 msgid "Address"
@@ -4285,20 +4351,20 @@
 msgid "Logo"
 msgstr "璅隤"
 
-#: ../libpurple/protocols/jabber/buddy.c:1346
+#: ../libpurple/protocols/jabber/buddy.c:1371
 msgid "Un-hide From"
 msgstr "曇澈蝯"
 
-#: ../libpurple/protocols/jabber/buddy.c:1350
+#: ../libpurple/protocols/jabber/buddy.c:1375
 msgid "Temporarily Hide From"
 msgstr "急梯澈"
 
 #. && NOT ME
-#: ../libpurple/protocols/jabber/buddy.c:1358
+#: ../libpurple/protocols/jabber/buddy.c:1383
 msgid "Cancel Presence Notification"
 msgstr "瘨銝蝺"
 
-#: ../libpurple/protocols/jabber/buddy.c:1365
+#: ../libpurple/protocols/jabber/buddy.c:1390
 msgid "(Re-)Request authorization"
 msgstr "閬瘙啗瘙隤霅"
 
@@ -4307,43 +4373,43 @@
 #. if(NOT ME)
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
-#: ../libpurple/protocols/jabber/buddy.c:1374
+#: ../libpurple/protocols/jabber/buddy.c:1399
 msgid "Unsubscribe"
 msgstr "敺憟賢桐葉蝘駁"
 
-#: ../libpurple/protocols/jabber/buddy.c:1407
-#: ../libpurple/protocols/jabber/jabber.c:1241
+#: ../libpurple/protocols/jabber/buddy.c:1432
+#: ../libpurple/protocols/jabber/jabber.c:1254
 msgid "Chatty"
 msgstr "唾憭"
 
-#: ../libpurple/protocols/jabber/buddy.c:1411 ../libpurple/status.c:159
+#: ../libpurple/protocols/jabber/buddy.c:1436 ../libpurple/status.c:158
 msgid "Extended Away"
 msgstr "瑟a"
 
-#: ../libpurple/protocols/jabber/buddy.c:1413
-#: ../libpurple/protocols/jabber/jabber.c:1271
-#: ../libpurple/protocols/oscar/oscar.c:708
-#: ../libpurple/protocols/oscar/oscar.c:5717
+#: ../libpurple/protocols/jabber/buddy.c:1438
+#: ../libpurple/protocols/jabber/jabber.c:1284
+#: ../libpurple/protocols/oscar/oscar.c:709
+#: ../libpurple/protocols/oscar/oscar.c:5718
 #: ../libpurple/protocols/sametime/sametime.c:3297
 msgid "Do Not Disturb"
 msgstr "隢踵"
 
-#: ../libpurple/protocols/jabber/buddy.c:1558
+#: ../libpurple/protocols/jabber/buddy.c:1583
 msgid "JID"
 msgstr "JID"
 
-#: ../libpurple/protocols/jabber/buddy.c:1562
-#: ../libpurple/protocols/jabber/buddy.c:1741
-#: ../libpurple/protocols/oscar/oscar.c:3692
+#: ../libpurple/protocols/jabber/buddy.c:1587
+#: ../libpurple/protocols/jabber/buddy.c:1766
+#: ../libpurple/protocols/oscar/oscar.c:3698
 msgid "Last Name"
 msgstr "憪"
 
-#: ../libpurple/protocols/jabber/buddy.c:1594
+#: ../libpurple/protocols/jabber/buddy.c:1619
 msgid "The following are the results of your search"
 msgstr "隞乩箸撠蝯"
 
 #. current comment from Jabber User Directory users.jabber.org
-#: ../libpurple/protocols/jabber/buddy.c:1669
+#: ../libpurple/protocols/jabber/buddy.c:1694
 msgid ""
 "Find a contact by entering the search criteria in the given fields. Note: "
 "Each field supports wild card searches (%)"
@@ -4351,69 +4417,69 @@
 "隢券拍冽雿憛怠神撠璇隞塚隞乩噶撠單曄舐窗鈭箝瘜冽嚗甈雿舀港誑祉典"
 " (%) 撠"
 
-#: ../libpurple/protocols/jabber/buddy.c:1689
+#: ../libpurple/protocols/jabber/buddy.c:1714
 msgid "Directory Query Failed"
 msgstr "亥岷桅隡箸典仃"
 
-#: ../libpurple/protocols/jabber/buddy.c:1690
+#: ../libpurple/protocols/jabber/buddy.c:1715
 msgid "Could not query the directory server."
 msgstr "⊥亥岷桅隡箸"
 
 #. Try to translate the message (see static message
 #. list in jabber_user_dir_comments[])
-#: ../libpurple/protocols/jabber/buddy.c:1724
+#: ../libpurple/protocols/jabber/buddy.c:1749
 #, c-format
 msgid "Server Instructions: %s"
 msgstr "隡箸冽隞歹%s"
 
-#: ../libpurple/protocols/jabber/buddy.c:1731
-msgid "Fill in one or more fields to search for any matching Jabber users."
-msgstr "憛怠乩憭甈雿嚗隞交撠Jabber雿輻刻"
-
-#: ../libpurple/protocols/jabber/buddy.c:1751
+#: ../libpurple/protocols/jabber/buddy.c:1756
+msgid "Fill in one or more fields to search for any matching XMPP users."
+msgstr "憛怠乩憭甈雿嚗隞交撠XMPP雿輻刻"
+
+#: ../libpurple/protocols/jabber/buddy.c:1776
 #: ../libpurple/protocols/novell/novell.c:1488
-#: ../libpurple/protocols/oscar/oscar.c:3695
-#: ../libpurple/protocols/oscar/oscar.c:3704
+#: ../libpurple/protocols/oscar/oscar.c:3701
+#: ../libpurple/protocols/oscar/oscar.c:3710
 msgid "E-Mail Address"
 msgstr "餃萎辣"
 
-#: ../libpurple/protocols/jabber/buddy.c:1760
-#: ../libpurple/protocols/jabber/buddy.c:1761
-msgid "Search for Jabber users"
-msgstr "撠Jabber雿輻刻"
+#: ../libpurple/protocols/jabber/buddy.c:1785
+#: ../libpurple/protocols/jabber/buddy.c:1786
+msgid "Search for XMPP users"
+msgstr "撠XMPP雿輻刻"
 
 #. "Search"
-#: ../libpurple/protocols/jabber/buddy.c:1762
+#: ../libpurple/protocols/jabber/buddy.c:1787
 #: ../libpurple/protocols/qq/group.c:123
 #: ../libpurple/protocols/qq/group_im.c:145
 #: ../libpurple/protocols/qq/sys_msg.c:176
 #: ../libpurple/protocols/qq/sys_msg.c:253
 #: ../libpurple/protocols/qq/sys_msg.c:271
-#: ../libpurple/protocols/sametime/sametime.c:5605
+#: ../libpurple/protocols/sametime/sametime.c:5611
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:473
 #: ../pidgin/plugins/gevolution/assoc-buddy.c:358
 msgid "Search"
 msgstr "撠"
 
 # NOTE OSCAR 航炊閮舀臬 http://aimdoc.sourceforge.net/OSCARdoc/嚗雿刻府蝡敺暹梯正
-#: ../libpurple/protocols/jabber/buddy.c:1777
+#: ../libpurple/protocols/jabber/buddy.c:1802
 msgid "Invalid Directory"
 msgstr "⊥桅"
 
-#: ../libpurple/protocols/jabber/buddy.c:1794
+#: ../libpurple/protocols/jabber/buddy.c:1819
 msgid "Enter a User Directory"
 msgstr "脣乩蝙刻桅"
 
-#: ../libpurple/protocols/jabber/buddy.c:1795
+#: ../libpurple/protocols/jabber/buddy.c:1820
 msgid "Select a user directory to search"
 msgstr "豢銝雿輻刻桅隞仿脰撠"
 
-#: ../libpurple/protocols/jabber/buddy.c:1798
+#: ../libpurple/protocols/jabber/buddy.c:1823
 msgid "Search Directory"
 msgstr "撠桅"
 
 #: ../libpurple/protocols/jabber/chat.c:41
-#: ../libpurple/protocols/oscar/oscar.c:5223
+#: ../libpurple/protocols/oscar/oscar.c:5224
 #: ../libpurple/protocols/yahoo/yahoochat.c:999
 msgid "_Room:"
 msgstr "憭拙恕(_R)嚗"
@@ -4426,88 +4492,88 @@
 msgid "_Handle:"
 msgstr "梁迂(_H)嚗"
 
-#: ../libpurple/protocols/jabber/chat.c:225
+#: ../libpurple/protocols/jabber/chat.c:223
 #, c-format
 msgid "%s is not a valid room name"
 msgstr "%s 銝臭憭拙恕蝔"
 
-#: ../libpurple/protocols/jabber/chat.c:226
+#: ../libpurple/protocols/jabber/chat.c:224
 msgid "Invalid Room Name"
 msgstr "憭拙恕蝔梁⊥"
 
-#: ../libpurple/protocols/jabber/chat.c:231
+#: ../libpurple/protocols/jabber/chat.c:229
 #, c-format
 msgid "%s is not a valid server name"
 msgstr "%s 銝臭隡箸典蝔"
 
-#: ../libpurple/protocols/jabber/chat.c:232
-#: ../libpurple/protocols/jabber/chat.c:233
+#: ../libpurple/protocols/jabber/chat.c:230
+#: ../libpurple/protocols/jabber/chat.c:231
 msgid "Invalid Server Name"
 msgstr "隡箸典蝔梁⊥"
 
 # NOTE Arto Alakulju 潛整room handle單航憭拙恕找蝙刻函梁迂撌
-#: ../libpurple/protocols/jabber/chat.c:237
+#: ../libpurple/protocols/jabber/chat.c:235
 #, c-format
 msgid "%s is not a valid room handle"
 msgstr "%s 銝臭梁迂"
 
 # NOTE Arto Alakulju 潛整room handle單航憭拙恕找蝙刻函梁迂撌
-#: ../libpurple/protocols/jabber/chat.c:238
-#: ../libpurple/protocols/jabber/chat.c:239
+#: ../libpurple/protocols/jabber/chat.c:236
+#: ../libpurple/protocols/jabber/chat.c:237
 msgid "Invalid Room Handle"
 msgstr "梁迂⊥"
 
-#: ../libpurple/protocols/jabber/chat.c:398
+#: ../libpurple/protocols/jabber/chat.c:396
 msgid "Configuration error"
 msgstr "閮剖航炊"
 
-#: ../libpurple/protocols/jabber/chat.c:407
-#: ../libpurple/protocols/jabber/chat.c:550
+#: ../libpurple/protocols/jabber/chat.c:405
+#: ../libpurple/protocols/jabber/chat.c:548
 msgid "Unable to configure"
 msgstr "⊥閮剖"
 
-#: ../libpurple/protocols/jabber/chat.c:422
+#: ../libpurple/protocols/jabber/chat.c:420
 msgid "Room Configuration Error"
 msgstr "憭拙恕閮剖航炊"
 
 # XXX 怨陌嚗霅舀憿嚗閬孵
-#: ../libpurple/protocols/jabber/chat.c:423
+#: ../libpurple/protocols/jabber/chat.c:421
 msgid "This room is not capable of being configured"
 msgstr "憭拙恕銝舀渲身摰"
 
-#: ../libpurple/protocols/jabber/chat.c:472
-#: ../libpurple/protocols/jabber/chat.c:541
+#: ../libpurple/protocols/jabber/chat.c:470
+#: ../libpurple/protocols/jabber/chat.c:539
 msgid "Registration error"
 msgstr "閮餃航炊"
 
 # XXX 怨陌
 # NOTE  faceprint (璅∠雿) 蝔梧MUC 臭蝔格啁憭拙恕摰嚗
 # NOTE 頛撘Group Chat游
-#: ../libpurple/protocols/jabber/chat.c:629
+#: ../libpurple/protocols/jabber/chat.c:627
 msgid "Nick changing not supported in non-MUC chatrooms"
 msgstr "券 MUC 璅∪憭拙恕找舀港耨寞梁迂"
 
-#: ../libpurple/protocols/jabber/chat.c:680
-#: ../libpurple/protocols/jabber/chat.c:691
+#: ../libpurple/protocols/jabber/chat.c:678
+#: ../libpurple/protocols/jabber/chat.c:689
 #: ../libpurple/protocols/silc/ops.c:1451
 msgid "Error retrieving room list"
 msgstr "霈憭拙恕皜格潛航炊"
 
-#: ../libpurple/protocols/jabber/chat.c:739
+#: ../libpurple/protocols/jabber/chat.c:737
 msgid "Invalid Server"
 msgstr "⊥隡箸典"
 
 # NOTE霅啣恕舀急霅胯Yahoo! 憟賢瘝箝Conference靘甇撘銝剛陌
 # XXX
-#: ../libpurple/protocols/jabber/chat.c:783
+#: ../libpurple/protocols/jabber/chat.c:781
 msgid "Enter a Conference Server"
 msgstr "餃交霅唬撩"
 
-#: ../libpurple/protocols/jabber/chat.c:784
+#: ../libpurple/protocols/jabber/chat.c:782
 msgid "Select a conference server to query"
 msgstr "豢亥岷霅唬撩"
 
-#: ../libpurple/protocols/jabber/chat.c:787
+#: ../libpurple/protocols/jabber/chat.c:785
 msgid "Find Rooms"
 msgstr "撠曇憭拙恕"
 
@@ -4531,174 +4597,178 @@
 msgid "Unable to create socket"
 msgstr "⊥撱箇 Socket"
 
-#: ../libpurple/protocols/jabber/jabber.c:565
-#: ../libpurple/protocols/jabber/jabber.c:910
-msgid "Invalid Jabber ID"
-msgstr "Jabber 撣唾⊥"
-
-#: ../libpurple/protocols/jabber/jabber.c:636
+#: ../libpurple/protocols/jabber/jabber.c:564
+#: ../libpurple/protocols/jabber/jabber.c:914
+msgid "Invalid XMPP ID"
+msgstr "XMPP 撣唾⊥"
+
+#: ../libpurple/protocols/jabber/jabber.c:569
+msgid "Invalid XMPP ID. Domain must be set."
+msgstr "XMPP 撣唾⊥嚗臬閮剖"
+
+#: ../libpurple/protocols/jabber/jabber.c:640
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "閮餃 %s@%s"
 
-#: ../libpurple/protocols/jabber/jabber.c:638
-#: ../libpurple/protocols/jabber/jabber.c:639
+#: ../libpurple/protocols/jabber/jabber.c:642
+#: ../libpurple/protocols/jabber/jabber.c:643
 msgid "Registration Successful"
 msgstr "閮餃"
 
-#: ../libpurple/protocols/jabber/jabber.c:645
-#: ../libpurple/protocols/jabber/jabber.c:1511
+#: ../libpurple/protocols/jabber/jabber.c:649
+#: ../libpurple/protocols/jabber/jabber.c:1524
 msgid "Unknown Error"
 msgstr "芰仿航炊"
 
-#: ../libpurple/protocols/jabber/jabber.c:647
-#: ../libpurple/protocols/jabber/jabber.c:648
+#: ../libpurple/protocols/jabber/jabber.c:651
+#: ../libpurple/protocols/jabber/jabber.c:652
 msgid "Registration Failed"
 msgstr "閮餃憭望"
 
-#: ../libpurple/protocols/jabber/jabber.c:763
-#: ../libpurple/protocols/jabber/jabber.c:764
+#: ../libpurple/protocols/jabber/jabber.c:767
+#: ../libpurple/protocols/jabber/jabber.c:768
 msgid "Already Registered"
 msgstr "撌脩閮餃"
 
-#: ../libpurple/protocols/jabber/jabber.c:840
-#: ../libpurple/protocols/oscar/oscar.c:3771
-#: ../libpurple/protocols/oscar/oscar.c:3784
+#: ../libpurple/protocols/jabber/jabber.c:844
+#: ../libpurple/protocols/oscar/oscar.c:3777
+#: ../libpurple/protocols/oscar/oscar.c:3790
 msgid "State"
 msgstr "嚗撌"
 
-#: ../libpurple/protocols/jabber/jabber.c:845
+#: ../libpurple/protocols/jabber/jabber.c:849
 msgid "Postal code"
 msgstr "菟"
 
-#: ../libpurple/protocols/jabber/jabber.c:850
+#: ../libpurple/protocols/jabber/jabber.c:854
 #: ../libpurple/protocols/silc/ops.c:1069
 #: ../libpurple/protocols/silc/silc.c:691
 #: ../libpurple/protocols/silc/util.c:553
 msgid "Phone"
 msgstr "餉店"
 
-#: ../libpurple/protocols/jabber/jabber.c:860
+#: ../libpurple/protocols/jabber/jabber.c:864
 msgid "Date"
 msgstr "交"
 
-#: ../libpurple/protocols/jabber/jabber.c:868
+#: ../libpurple/protocols/jabber/jabber.c:872
 msgid "Please fill out the information below to register your new account."
 msgstr "箸函啣董嗉酉嚗隢憛怠神銝鞈嚗"
 
-#: ../libpurple/protocols/jabber/jabber.c:871
-#: ../libpurple/protocols/jabber/jabber.c:872
-msgid "Register New Jabber Account"
-msgstr "閮餃啁 Jabber 撣單"
+#: ../libpurple/protocols/jabber/jabber.c:875
+#: ../libpurple/protocols/jabber/jabber.c:876
+msgid "Register New XMPP Account"
+msgstr "閮餃啁 XMPP 撣單"
 
 #. Register button
-#: ../libpurple/protocols/jabber/jabber.c:873 ../pidgin/gtkaccount.c:1490
+#: ../libpurple/protocols/jabber/jabber.c:877 ../pidgin/gtkaccount.c:1504
 msgid "Register"
 msgstr "閮餃"
 
-#: ../libpurple/protocols/jabber/jabber.c:1042
+#: ../libpurple/protocols/jabber/jabber.c:1048
 msgid "Initializing Stream"
 msgstr "銝脫憪銝"
 
-#: ../libpurple/protocols/jabber/jabber.c:1047
+#: ../libpurple/protocols/jabber/jabber.c:1053
 #: ../libpurple/protocols/msn/session.c:350
 msgid "Authenticating"
 msgstr "隤霅銝"
 
-#: ../libpurple/protocols/jabber/jabber.c:1056
+#: ../libpurple/protocols/jabber/jabber.c:1062
 msgid "Re-initializing Stream"
 msgstr "銝脫啣憪銝"
 
-#: ../libpurple/protocols/jabber/jabber.c:1115
-#: ../libpurple/protocols/jabber/jabber.c:1489
-#: ../libpurple/protocols/jabber/jabber.c:1530
-#: ../libpurple/protocols/jabber/jabber.c:1566
-#: ../libpurple/protocols/oscar/oscar.c:807
-#: ../libpurple/protocols/oscar/oscar.c:5511
+#: ../libpurple/protocols/jabber/jabber.c:1128
+#: ../libpurple/protocols/jabber/jabber.c:1502
+#: ../libpurple/protocols/jabber/jabber.c:1543
+#: ../libpurple/protocols/jabber/jabber.c:1579
+#: ../libpurple/protocols/oscar/oscar.c:808
+#: ../libpurple/protocols/oscar/oscar.c:5512
 msgid "Not Authorized"
 msgstr "芾霅"
 
-# NOTE 鈭憟芾隤嚗喋Subscription璇嚗閫 faceprint 靘
+# NOTE 鈭憟 Jabber 銵隤嚗喋Subscription璇嚗閫 faceprint 靘
 # NOTE LSchiere2 鋆憒銝嚗
 # NOTE in jabber each user has control over both who is in his/her buddy list and who has him/her in that other person's buddy list
 # NOTE ie each "subscription" represents the fact that either you send status notifications to someone, or that you recieve them, or both
 # NOTE thus "from" means you only recieve status notification, "to" means you only send status notification and "both" is thus obviously that you both send and recieve status notification
-#: ../libpurple/protocols/jabber/jabber.c:1157
+#: ../libpurple/protocols/jabber/jabber.c:1170
 msgid "Both"
 msgstr "撌脖貉霅"
 
-#  NOTE Jabber 銵隤嚗閬銝
-#: ../libpurple/protocols/jabber/jabber.c:1159
+#  NOTE Jabber 銵隤嚗閬Both璇
+#: ../libpurple/protocols/jabber/jabber.c:1172
 msgid "From (To pending)"
 msgstr "撌脰霅撠對雿隞蝑敺撠寡霅剁"
 
-#  NOTE Jabber 銵隤嚗閬銝
-#: ../libpurple/protocols/jabber/jabber.c:1164
+#  NOTE Jabber 銵隤嚗閬Both璇
+#: ../libpurple/protocols/jabber/jabber.c:1177
 msgid "To"
 msgstr "撌脩脣寡霅"
 
-#  NOTE Jabber 銵隤嚗閬銝
-#: ../libpurple/protocols/jabber/jabber.c:1166
+#  NOTE Jabber 銵隤嚗閬Both璇
+#: ../libpurple/protocols/jabber/jabber.c:1179
 msgid "None (To pending)"
 msgstr "∴雿甇蝑敺撠寡霅剁"
 
-#: ../libpurple/protocols/jabber/jabber.c:1168
+#: ../libpurple/protocols/jabber/jabber.c:1181
 #: ../pidgin/plugins/gevolution/eds-utils.c:73
 #: ../pidgin/plugins/gevolution/eds-utils.c:86
 msgid "None"
 msgstr ""
 
-#  NOTE Jabber 銵隤嚗閬銝
-#: ../libpurple/protocols/jabber/jabber.c:1171
+#  NOTE Jabber 銵隤嚗閬Both璇
+#: ../libpurple/protocols/jabber/jabber.c:1184
 msgid "Subscription"
 msgstr "隤霅"
 
-#: ../libpurple/protocols/jabber/jabber.c:1301
+#: ../libpurple/protocols/jabber/jabber.c:1314
 msgid "Password Changed"
 msgstr "撖蝣潔耨寞"
 
-#: ../libpurple/protocols/jabber/jabber.c:1302
+#: ../libpurple/protocols/jabber/jabber.c:1315
 msgid "Your password has been changed."
 msgstr "靽格嫣函撖蝣潦"
 
-#: ../libpurple/protocols/jabber/jabber.c:1306
-#: ../libpurple/protocols/jabber/jabber.c:1307
+#: ../libpurple/protocols/jabber/jabber.c:1319
+#: ../libpurple/protocols/jabber/jabber.c:1320
 msgid "Error changing password"
 msgstr "靽格孵蝣潭箇暸航炊"
 
-#: ../libpurple/protocols/jabber/jabber.c:1363
+#: ../libpurple/protocols/jabber/jabber.c:1376
 msgid "Password (again)"
 msgstr "撖蝣潘甈∠Ⅱ隤嚗"
 
-#: ../libpurple/protocols/jabber/jabber.c:1368
-#: ../libpurple/protocols/jabber/jabber.c:1369
-msgid "Change Jabber Password"
-msgstr "靽格 Jabber 撖蝣"
-
-#: ../libpurple/protocols/jabber/jabber.c:1369
+#: ../libpurple/protocols/jabber/jabber.c:1381
+#: ../libpurple/protocols/jabber/jabber.c:1382
+msgid "Change XMPP Password"
+msgstr "靽格 XMPP 撖蝣"
+
+#: ../libpurple/protocols/jabber/jabber.c:1382
 msgid "Please enter your new password"
 msgstr "隢頛詨交函啣蝣"
 
-#: ../libpurple/protocols/jabber/jabber.c:1381
-#: ../libpurple/protocols/oscar/oscar.c:6297
+#: ../libpurple/protocols/jabber/jabber.c:1394
+#: ../libpurple/protocols/oscar/oscar.c:6298
 #: ../libpurple/protocols/silc/silc.c:1015
 msgid "Set User Info..."
 msgstr "閮剖雿輻刻鞈閮..."
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
-#: ../libpurple/protocols/jabber/jabber.c:1386
-#: ../libpurple/protocols/oscar/oscar.c:6308
+#: ../libpurple/protocols/jabber/jabber.c:1399
+#: ../libpurple/protocols/oscar/oscar.c:6309
 #: ../libpurple/protocols/silc/silc.c:1011
 msgid "Change Password..."
 msgstr "靽格孵蝣..."
 
 #. }
-#: ../libpurple/protocols/jabber/jabber.c:1391
+#: ../libpurple/protocols/jabber/jabber.c:1404
 msgid "Search for Users..."
 msgstr "撠雿輻刻..."
 
 # NOTE 閬 http://www.jabber.org/jeps/jep-0103.html
-#: ../libpurple/protocols/jabber/jabber.c:1469
+#: ../libpurple/protocols/jabber/jabber.c:1482
 msgid "Bad Request"
 msgstr "喲蝬脣潛鈭銝航炊"
 
@@ -4706,51 +4776,52 @@
 #  NOTE嚗憭扳靽餃亦函雿輻刻芸摮銝莎撌乩畾萇餃伐隞亥渡⊥摮
 #  NOTE 閰唾 http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt
 #  NOTE 霅舀游 by Ambrose
-#: ../libpurple/protocols/jabber/jabber.c:1471
+#: ../libpurple/protocols/jabber/jabber.c:1484
 msgid "Conflict"
 msgstr "蝔望雿銵蝒"
 
-#: ../libpurple/protocols/jabber/jabber.c:1473
+#: ../libpurple/protocols/jabber/jabber.c:1486
 msgid "Feature Not Implemented"
 msgstr "閰脣賢芸祕雿"
 
 #  NOTE Jabber 航炊 <forbidden/>嚗甇撣賂銵函內甈銝憭嚗
 #  NOTE 閰唾 http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt
-#: ../libpurple/protocols/jabber/jabber.c:1475
+#: ../libpurple/protocols/jabber/jabber.c:1488
 msgid "Forbidden"
 msgstr "甈銝憭"
 
 #  NOTE Jabber 航炊 <gone/>嚗銵函內雿輻刻隡箸冽曄銝蝺嚗敺靘V蝺
 #  NOTE 閰唾 http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt
-#: ../libpurple/protocols/jabber/jabber.c:1477
+#: ../libpurple/protocols/jabber/jabber.c:1490
 msgid "Gone"
 msgstr "撌脤Y"
 
-#: ../libpurple/protocols/jabber/jabber.c:1479
-#: ../libpurple/protocols/jabber/jabber.c:1556
+#: ../libpurple/protocols/jabber/jabber.c:1492
+#: ../libpurple/protocols/jabber/jabber.c:1569
 msgid "Internal Server Error"
 msgstr "隡箸典折券航炊"
 
-#: ../libpurple/protocols/jabber/jabber.c:1481
+#: ../libpurple/protocols/jabber/jabber.c:1494
 msgid "Item Not Found"
 msgstr "格芣曉"
 
-#: ../libpurple/protocols/jabber/jabber.c:1483
-msgid "Malformed Jabber ID"
-msgstr "詨 Jabber ID"
+# FIXME 霅舀賭憟賢暺 20070518 acli
+#: ../libpurple/protocols/jabber/jabber.c:1496
+msgid "Malformed XMPP ID"
+msgstr "詨 XMPP 撣唾"
 
 #  NOTE Jabber 航炊 <not-acceptable/>嚗銵函內箇閬瘙芾賡唬撩冽嗡辣鈭箸閮銝
 #  NOTE 璇隞塚靘憒閮臭葉急蝳摮嚗嚗隞亥渡⊥摮
 #  NOTE 閰唾 http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt
-#: ../libpurple/protocols/jabber/jabber.c:1485
+#: ../libpurple/protocols/jabber/jabber.c:1498
 msgid "Not Acceptable"
 msgstr "⊥亙"
 
-#: ../libpurple/protocols/jabber/jabber.c:1487
+#: ../libpurple/protocols/jabber/jabber.c:1500
 msgid "Not Allowed"
 msgstr "銝鋡怠閮"
 
-#: ../libpurple/protocols/jabber/jabber.c:1491
+#: ../libpurple/protocols/jabber/jabber.c:1504
 msgid "Payment Required"
 msgstr "敹隞甈"
 
@@ -4758,78 +4829,78 @@
 #  NOTE 閰唾 http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt
 #  NOTE急⊥舐窗閰脫銝摮具
 #  NOTE 霅舀游 by Ambrose
-#: ../libpurple/protocols/jabber/jabber.c:1493
+#: ../libpurple/protocols/jabber/jabber.c:1506
 msgid "Recipient Unavailable"
 msgstr "急⊥舐窗交嗉"
 
-#: ../libpurple/protocols/jabber/jabber.c:1497
+#: ../libpurple/protocols/jabber/jabber.c:1510
 msgid "Registration Required"
 msgstr "敹閮餃"
 
-#: ../libpurple/protocols/jabber/jabber.c:1499
+#: ../libpurple/protocols/jabber/jabber.c:1512
 msgid "Remote Server Not Found"
 msgstr "蝡臭撩冽芣曉"
 
-#: ../libpurple/protocols/jabber/jabber.c:1501
+#: ../libpurple/protocols/jabber/jabber.c:1514
 msgid "Remote Server Timeout"
 msgstr "蝡臭撩券暹"
 
-#: ../libpurple/protocols/jabber/jabber.c:1503
+#: ../libpurple/protocols/jabber/jabber.c:1516
 msgid "Server Overloaded"
 msgstr "隡箸刻頛"
 
 #  NOTE Jabber 航炊 <service-unavailable/>嚗銵函內隡箸冽嗅唬蝢拐隞
 #  NOTE 閰唾 http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt
 #  NOTE 霅舀游 by Ambrose
-#: ../libpurple/protocols/jabber/jabber.c:1505
+#: ../libpurple/protocols/jabber/jabber.c:1518
 msgid "Service Unavailable"
 msgstr "銝靘閰脤"
 
 #  NOTE Jabber 航炊 <subscription-required/>嚗銵函內雿輻具
 #  NOTE 敹鈭敺Subscription嚗隤霅嚗
 #  NOTE 閰唾 http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt
-#: ../libpurple/protocols/jabber/jabber.c:1507
+#: ../libpurple/protocols/jabber/jabber.c:1520
 msgid "Subscription Required"
 msgstr "敹隤霅"
 
-#: ../libpurple/protocols/jabber/jabber.c:1509
+#: ../libpurple/protocols/jabber/jabber.c:1522
 msgid "Unexpected Request"
 msgstr "芷閬瘙"
 
-#: ../libpurple/protocols/jabber/jabber.c:1516
+#: ../libpurple/protocols/jabber/jabber.c:1529
 msgid "Authorization Aborted"
 msgstr "隤霅瘨"
 
-#: ../libpurple/protocols/jabber/jabber.c:1518
+#: ../libpurple/protocols/jabber/jabber.c:1531
 msgid "Incorrect encoding in authorization"
 msgstr "隤霅恍航炊蝺函Ⅳ"
 
-#: ../libpurple/protocols/jabber/jabber.c:1521
+#: ../libpurple/protocols/jabber/jabber.c:1534
 msgid "Invalid authzid"
 msgstr "⊥ authzid"
 
 # XXX 閬閬亥陌
-#: ../libpurple/protocols/jabber/jabber.c:1524
+#: ../libpurple/protocols/jabber/jabber.c:1537
 msgid "Invalid Authorization Mechanism"
 msgstr "⊥隤霅璈"
 
-#: ../libpurple/protocols/jabber/jabber.c:1527
+#: ../libpurple/protocols/jabber/jabber.c:1540
 msgid "Authorization mechanism too weak"
 msgstr "隤霅璈嗅云撘曹"
 
-#: ../libpurple/protocols/jabber/jabber.c:1532
+#: ../libpurple/protocols/jabber/jabber.c:1545
 msgid "Temporary Authentication Failure"
 msgstr "隤霅急憭望"
 
-#: ../libpurple/protocols/jabber/jabber.c:1535
+#: ../libpurple/protocols/jabber/jabber.c:1548
 msgid "Authentication Failure"
 msgstr "隤霅憭望"
 
-#: ../libpurple/protocols/jabber/jabber.c:1541
+#: ../libpurple/protocols/jabber/jabber.c:1554
 msgid "Bad Format"
 msgstr "⊥澆"
 
-#: ../libpurple/protocols/jabber/jabber.c:1543
+#: ../libpurple/protocols/jabber/jabber.c:1556
 msgid "Bad Namespace Prefix"
 msgstr "⊥ Namespace Prefix"
 
@@ -4839,181 +4910,181 @@
 # NOTE 閬 http://www.jabber.org/user/userguide.html
 # NOTE Jabber 摰銝 Stanza Error 銝蝔殷 <conflict/>
 # NOTE 閬 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
-#: ../libpurple/protocols/jabber/jabber.c:1546
+#: ../libpurple/protocols/jabber/jabber.c:1559
 msgid "Resource Conflict"
 msgstr "撌脩隞交摰 Resource 典嗡唳寧餃"
 
-#: ../libpurple/protocols/jabber/jabber.c:1548
+#: ../libpurple/protocols/jabber/jabber.c:1561
 #: ../libpurple/protocols/silc/ops.c:1729
 msgid "Connection Timeout"
 msgstr "蝺撌脤暹"
 
 # NOTE Jabber 摰銝 Stream Error 銝蝔殷 <host-gone/>
 # NOTE 閬 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
-#: ../libpurple/protocols/jabber/jabber.c:1550
+#: ../libpurple/protocols/jabber/jabber.c:1563
 msgid "Host Gone"
 msgstr "隡箸典歇銝舀湔蝯血隡箸典蝔"
 
 # NOTE Jabber 摰銝 Stream Error 銝蝔殷 <host-unknown/>
 # NOTE 閬 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
-#: ../libpurple/protocols/jabber/jabber.c:1552
+#: ../libpurple/protocols/jabber/jabber.c:1565
 msgid "Host Unknown"
 msgstr "銝隡箸典蝔"
 
-#: ../libpurple/protocols/jabber/jabber.c:1554
+#: ../libpurple/protocols/jabber/jabber.c:1567
 msgid "Improper Addressing"
 msgstr "航炊摰"
 
-#: ../libpurple/protocols/jabber/jabber.c:1558
+#: ../libpurple/protocols/jabber/jabber.c:1571
 msgid "Invalid ID"
 msgstr "撣唾⊥"
 
 # FIXME 敹閬亥陌
-#: ../libpurple/protocols/jabber/jabber.c:1560
+#: ../libpurple/protocols/jabber/jabber.c:1573
 msgid "Invalid Namespace"
 msgstr "賢蝛粹⊥"
 
-#: ../libpurple/protocols/jabber/jabber.c:1562
+#: ../libpurple/protocols/jabber/jabber.c:1575
 msgid "Invalid XML"
 msgstr "⊥ XML"
 
 # XXX 舀怨陌嚗霅舀敺寥
 # NOTE Jabber 摰銝剔nonmatching-hosts
 # NOTE 閬 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
-#: ../libpurple/protocols/jabber/jabber.c:1564
+#: ../libpurple/protocols/jabber/jabber.c:1577
 msgid "Non-matching Hosts"
 msgstr "銝餅蝔曹訾"
 
 # XXX 舀怨陌嚗霅舀敺寥脯銝憟賢鈭粹璅撖恬憭扳瘝憭芸之憿
 # NOTE Jabber 摰 xmpp-core 銝 Stream Error 銝蝔殷 <policy-violation/>
 # NOTE 閬 http://www.jabber.org/ietf/draft-ietf-xmpp-core-19.html
-#: ../libpurple/protocols/jabber/jabber.c:1568
+#: ../libpurple/protocols/jabber/jabber.c:1581
 msgid "Policy Violation"
 msgstr "鈭輻"
 
 # NOTE Jabber 摰 Stream Error 銝蝔殷 <remote-connection-failed/>
 # NOTE 閬 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
-#: ../libpurple/protocols/jabber/jabber.c:1570
+#: ../libpurple/protocols/jabber/jabber.c:1583
 msgid "Remote Connection Failed"
 msgstr "⊥蝺唾霅蝡航皞"
 
 # NOTE Jabber 摰 Stream Error 銝蝔殷 <resource-constraint/>
 # NOTE 券鋆 Resource 銝閰餃交雿輻刻函 Resource 銝閰蝢拐蒂銝詨
 # NOTE 閬 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
-#: ../libpurple/protocols/jabber/jabber.c:1572
+#: ../libpurple/protocols/jabber/jabber.c:1585
 msgid "Resource Constraint"
 msgstr "隡箸刻皞剔撩"
 
 # NOTE Jabber 摰 xmpp-core 銝 Stream Error 銝蝔殷 <restricted-xml/>
 # NOTE 閬 http://www.jabber.org/ietf/draft-ietf-xmpp-core-18.html
-#: ../libpurple/protocols/jabber/jabber.c:1574
+#: ../libpurple/protocols/jabber/jabber.c:1587
 msgid "Restricted XML"
 msgstr "XML 銝剖冽 Jabber 摰銝摰寡迂 XML 蝝"
 
 # NOTE Jabber 摰銝 Stream Error 銝蝔殷 <see-other-host/>
 # NOTE 閬 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
-#: ../libpurple/protocols/jabber/jabber.c:1576
+#: ../libpurple/protocols/jabber/jabber.c:1589
 msgid "See Other Host"
 msgstr "隡箸典刻霅閬瘙鈭啣喳虫隡箸"
 
 # NOTE Jabber 摰銝 Stream Error 銝蝔殷 <system-shutdown/>
 # NOTE 閬 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
-#: ../libpurple/protocols/jabber/jabber.c:1578
+#: ../libpurple/protocols/jabber/jabber.c:1591
 msgid "System Shutdown"
 msgstr "隡箸函桀券璈銝"
 
 # NOTE 閬 http://www.jabber.org/jeps/jep-0103.html
-#: ../libpurple/protocols/jabber/jabber.c:1580
+#: ../libpurple/protocols/jabber/jabber.c:1593
 msgid "Undefined Condition"
 msgstr "喲蝬脣潛鈭銝航炊"
 
 # NOTE 閬 http://www.jabber.org/pipermail/xmppwg/2003-August/001431.html
-#: ../libpurple/protocols/jabber/jabber.c:1582
+#: ../libpurple/protocols/jabber/jabber.c:1595
 msgid "Unsupported Encoding"
 msgstr "隡箸其舀渡策摰摮蝺函Ⅳ"
 
 # NOTE Jabber 摰銝 Stream Error 銝蝔殷 <unsupported-stanza-type/>
 # NOTE 閬 http://www.jabber.org/pipermail/xmppwg/2003-March/000752.html
-#: ../libpurple/protocols/jabber/jabber.c:1584
+#: ../libpurple/protocols/jabber/jabber.c:1597
 msgid "Unsupported Stanza Type"
 msgstr "隡箸其舀渡策摰畾菔賡 (Stanza Type)"
 
 # NOTE Jabber 摰銝 Stream Error 銝蝔殷 <unsupported-version/>
 # NOTE 閬 http://www.jabber.org/pipermail/xmppwg/2003-March/000752.html
-#: ../libpurple/protocols/jabber/jabber.c:1586
+#: ../libpurple/protocols/jabber/jabber.c:1599
 msgid "Unsupported Version"
 msgstr "銝舀渡策摰 XMPP "
 
-#: ../libpurple/protocols/jabber/jabber.c:1588
+#: ../libpurple/protocols/jabber/jabber.c:1601
 msgid "XML Not Well Formed"
 msgstr "XML 隞嗆澆憿"
 
-#: ../libpurple/protocols/jabber/jabber.c:1590
+#: ../libpurple/protocols/jabber/jabber.c:1603
 msgid "Stream Error"
 msgstr "銝脫航炊"
 
-#: ../libpurple/protocols/jabber/jabber.c:1657
+#: ../libpurple/protocols/jabber/jabber.c:1670
 #, c-format
 msgid "Unable to ban user %s"
 msgstr "⊥蝳甇V蝙刻 %s"
 
 #  XXX 怨陌嚗∴蝑蝝 - ambrose 20070415
 #  NOTE: Unknown affiliation  owneradminmemberoutcastnone 鈭蝔桐誑憭嗡銝詨
-#: ../libpurple/protocols/jabber/jabber.c:1677
+#: ../libpurple/protocols/jabber/jabber.c:1690
 #, c-format
 msgid "Unknown affiliation: \"%s\""
 msgstr "銝蝑蝝嚗%s"
 
 #  XXX 怨陌 - ambrose 20070415
-#: ../libpurple/protocols/jabber/jabber.c:1682
+#: ../libpurple/protocols/jabber/jabber.c:1695
 #, c-format
 msgid "Unable to affiliate user %s as \"%s\""
 msgstr "⊥撠雿輻刻 %s 蝑蝝閮剖箝%s"
 
 #  XXX 怨陌 - ambrose 20070415
 #  NOTE: Unknown role  moderatorparticipantvisitornone 蝔桐誑憭嗡銝詨
-#: ../libpurple/protocols/jabber/jabber.c:1701
+#: ../libpurple/protocols/jabber/jabber.c:1714
 #, c-format
 msgid "Unknown role: \"%s\""
 msgstr "銝頨思遢嚗%s"
 
 #  XXX 怨陌 - ambrose 20070415
-#: ../libpurple/protocols/jabber/jabber.c:1708
+#: ../libpurple/protocols/jabber/jabber.c:1721
 #, c-format
 msgid "Unable to set role \"%s\" for user: %s"
 msgstr "⊥撠雿輻刻 %2$s 頨思遢閮剖箝%1$s"
 
-#: ../libpurple/protocols/jabber/jabber.c:1761
+#: ../libpurple/protocols/jabber/jabber.c:1774
 #, c-format
 msgid "Unable to kick user %s"
 msgstr "⊥頦W箔蝙刻 %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:1792
+#: ../libpurple/protocols/jabber/jabber.c:1805
 msgid "config:  Configure a chat room."
 msgstr "config嚗閮剖銝憭拙恕"
 
-#: ../libpurple/protocols/jabber/jabber.c:1796
+#: ../libpurple/protocols/jabber/jabber.c:1809
 msgid "configure:  Configure a chat room."
 msgstr "configure嚗閮剖銝憭拙恕"
 
-#: ../libpurple/protocols/jabber/jabber.c:1805
+#: ../libpurple/protocols/jabber/jabber.c:1818
 msgid "part [room]:  Leave the room."
 msgstr "part [憭拙恕]嚗a憭拙恕"
 
-#: ../libpurple/protocols/jabber/jabber.c:1810
+#: ../libpurple/protocols/jabber/jabber.c:1823
 msgid "register:  Register with a chat room."
 msgstr "register嚗乩憭拙恕"
 
-#: ../libpurple/protocols/jabber/jabber.c:1816
+#: ../libpurple/protocols/jabber/jabber.c:1829
 msgid "topic [new topic]:  View or change the topic."
 msgstr "topic [唬蜓憿]嚗瑼Z靽格寡憭拐蜓憿"
 
-#: ../libpurple/protocols/jabber/jabber.c:1822
+#: ../libpurple/protocols/jabber/jabber.c:1835
 msgid "ban &lt;user&gt; [room]:  Ban a user from the room."
 msgstr "ban &lt;雿輻刻&gt; [憭拙恕]嚗蝳甇X雿輻刻脣亥憭拙恕"
 
 #  XXX 怨陌嚗∴蝑蝝 - ambrose 20070415
-#: ../libpurple/protocols/jabber/jabber.c:1828
+#: ../libpurple/protocols/jabber/jabber.c:1841
 msgid ""
 "affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
 "affiliation with the room."
@@ -5022,7 +5093,7 @@
 "券憭拙恕抒蝑蝝"
 
 #  NOTE 霅舀孵 by ambrose
-#: ../libpurple/protocols/jabber/jabber.c:1834
+#: ../libpurple/protocols/jabber/jabber.c:1847
 msgid ""
 "role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
 "role in the room."
@@ -5030,19 +5101,19 @@
 "role &lt;雿輻刻&gt; &lt;moderator|participant|visitor|none&gt;: 閮剖雿輻刻"
 "憭拙恕抒頨思遢"
 
-#: ../libpurple/protocols/jabber/jabber.c:1840
+#: ../libpurple/protocols/jabber/jabber.c:1853
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
 msgstr "invite &lt;雿輻刻&gt; [閮珠嚗隢雿輻刻脣亥憭拙恕"
 
-#: ../libpurple/protocols/jabber/jabber.c:1846
+#: ../libpurple/protocols/jabber/jabber.c:1859
 msgid "join: &lt;room&gt; [server]:  Join a chat on this server."
 msgstr "join: &lt;憭拙恕&gt; [隡箸沘嚗乩潮隡箸函銝憭拙恕"
 
-#: ../libpurple/protocols/jabber/jabber.c:1852
+#: ../libpurple/protocols/jabber/jabber.c:1865
 msgid "kick &lt;user&gt; [room]:  Kick a user from the room."
 msgstr "kick &lt;雿輻刻&gt; [憭拙恕]嚗撠雿輻刻敺憭拙恕銝剛腺箝"
 
-#: ../libpurple/protocols/jabber/jabber.c:1857
+#: ../libpurple/protocols/jabber/jabber.c:1870
 msgid ""
 "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
 msgstr "msg &lt;雿輻刻&gt; &lt;閮&gt;嚗喲蝘鈭箄舐策虫雿輻刻"
@@ -5059,54 +5130,64 @@
 #. *  description
 #: ../libpurple/protocols/jabber/libxmpp.c:166
 #: ../libpurple/protocols/jabber/libxmpp.c:168
-msgid "Jabber Protocol Plugin"
-msgstr "Jabber 摰璅∠"
-
-#: ../libpurple/protocols/jabber/libxmpp.c:200
+msgid "XMPP Protocol Plugin"
+msgstr "XMPP 摰璅∠"
+
+#. Translators: 'domain' is used here in the context of Internet domains, e.g. pidgin.im
+#: ../libpurple/protocols/jabber/libxmpp.c:195
+msgid "Domain"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/libxmpp.c:201
 msgid "Force old (port 5223) SSL"
 msgstr "撘瑁翰雿輻刻撘 SSL (port 5223)"
 
 #  NOTE 霅舀游 by Ambrose
-#: ../libpurple/protocols/jabber/libxmpp.c:205
+#: ../libpurple/protocols/jabber/libxmpp.c:206
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "閮曹蝙冽嚗冽芰撖銝脫銝脰隤霅"
 
-#: ../libpurple/protocols/jabber/libxmpp.c:210
-#: ../libpurple/protocols/simple/simple.c:1858
+#: ../libpurple/protocols/jabber/libxmpp.c:211
+#: ../libpurple/protocols/simple/simple.c:1856
 msgid "Connect port"
 msgstr "蝺"
 
 #. Account options
-#: ../libpurple/protocols/jabber/libxmpp.c:214
+#: ../libpurple/protocols/jabber/libxmpp.c:215
 #: ../libpurple/protocols/silc/silc.c:1866
 msgid "Connect server"
 msgstr "蝯隡箸"
 
-#: ../libpurple/protocols/jabber/message.c:155
+#: ../libpurple/protocols/jabber/message.c:102
+#, c-format
+msgid "%s has left the conversation."
+msgstr "%s 撌脩a鈭方"
+
+#: ../libpurple/protocols/jabber/message.c:153
 #, c-format
 msgid "Message from %s"
 msgstr " %s 澆箇閮"
 
-#: ../libpurple/protocols/jabber/message.c:219
+#: ../libpurple/protocols/jabber/message.c:217
 #, c-format
 msgid "%s has set the topic to: %s"
 msgstr "%s 憭拐蜓憿閮剖綽%s"
 
-#: ../libpurple/protocols/jabber/message.c:221
+#: ../libpurple/protocols/jabber/message.c:219
 #, c-format
 msgid "The topic is: %s"
 msgstr "銝駁嚗%s"
 
-#: ../libpurple/protocols/jabber/message.c:269
+#: ../libpurple/protocols/jabber/message.c:267
 #, c-format
 msgid "Message delivery to %s failed: %s"
 msgstr "⊥喲閮臬 %s嚗%s"
 
-#: ../libpurple/protocols/jabber/message.c:272
-msgid "Jabber Message Error"
-msgstr "Jabber 閮舫航炊"
-
-#: ../libpurple/protocols/jabber/message.c:352
+#: ../libpurple/protocols/jabber/message.c:270
+msgid "XMPP Message Error"
+msgstr "XMPP 閮舫航炊"
+
+#: ../libpurple/protocols/jabber/message.c:350
 #, c-format
 msgid " (Code %s)"
 msgstr " (隞蝣 %s)"
@@ -5263,7 +5344,7 @@
 
 #: ../libpurple/protocols/msn/error.c:103
 msgid "Tried to add a user to a group that doesn't exist"
-msgstr "閰血銝雿輻刻乩摮函蝢斤"
+msgstr "閰血銝雿輻刻乩摮函蝢斤"
 
 #: ../libpurple/protocols/msn/error.c:107
 msgid "Switchboard failed"
@@ -5381,7 +5462,7 @@
 msgstr "隡箸典云敹蝣"
 
 #: ../libpurple/protocols/msn/error.c:222
-#: ../libpurple/protocols/oscar/oscar.c:1357
+#: ../libpurple/protocols/oscar/oscar.c:1363
 #: ../libpurple/protocols/silc/ops.c:1718 ../libpurple/protocols/toc/toc.c:728
 #: ../libpurple/proxy.c:1351
 msgid "Authentication failed"
@@ -5420,42 +5501,42 @@
 msgid "MSN Error: %s\n"
 msgstr "MSN 航炊嚗%s\n"
 
-#: ../libpurple/protocols/msn/msn.c:112
+#: ../libpurple/protocols/msn/msn.c:121
 msgid "You have just sent a Nudge!"
 msgstr "典箔銝澆恬"
 
-#: ../libpurple/protocols/msn/msn.c:137
+#: ../libpurple/protocols/msn/msn.c:146
 msgid "Your new MSN friendly name is too long."
 msgstr "函 MSN 梁迂憭芷瑯"
 
-#: ../libpurple/protocols/msn/msn.c:245
+#: ../libpurple/protocols/msn/msn.c:254
 msgid "Set your friendly name."
 msgstr "閮剖函梁迂"
 
 # NOTE MSN梁迂銝Yahoo嚗雿輻刻臭誑頛詨乩遙雿唳梁迂嚗
 # NOTE 喃蝙雿輻刻撣唾瘥怎⊿靽嚗隡潔銋舀
 # XXX 靘臭餈啣伐鈭撖虫臬雿輻刻澆箇隢瘙嚗憿
-#: ../libpurple/protocols/msn/msn.c:246
+#: ../libpurple/protocols/msn/msn.c:255
 msgid "This is the name that other MSN buddies will see you as."
 msgstr "乩犖 MSN 仿望函鈭箄憿舐內梁迂"
 
-#: ../libpurple/protocols/msn/msn.c:264
+#: ../libpurple/protocols/msn/msn.c:273
 msgid "Set your home phone number."
 msgstr "閮剖函雿摰園餉店蝣潦"
 
-#: ../libpurple/protocols/msn/msn.c:281
+#: ../libpurple/protocols/msn/msn.c:290
 msgid "Set your work phone number."
 msgstr "閮剖函颲血砍恕餉店蝣潦"
 
-#: ../libpurple/protocols/msn/msn.c:298
+#: ../libpurple/protocols/msn/msn.c:307
 msgid "Set your mobile phone number."
 msgstr "閮剖函銵餉店蝣潦"
 
-#: ../libpurple/protocols/msn/msn.c:313
+#: ../libpurple/protocols/msn/msn.c:322
 msgid "Allow MSN Mobile pages?"
 msgstr "閮 MSN 喳潘"
 
-#: ../libpurple/protocols/msn/msn.c:314
+#: ../libpurple/protocols/msn/msn.c:323
 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?"
@@ -5463,317 +5544,317 @@
 "冽臬血閮勗冽典末皜桐葉憟賢喲 Mobile Page 唳函銵餉店嚗臬嗡銵"
 "鋆蝵桐g"
 
-#: ../libpurple/protocols/msn/msn.c:320
+#: ../libpurple/protocols/msn/msn.c:329
 msgid "Allow"
 msgstr "閮"
 
-#: ../libpurple/protocols/msn/msn.c:321
+#: ../libpurple/protocols/msn/msn.c:330
 msgid "Disallow"
 msgstr "銝閮"
 
-#: ../libpurple/protocols/msn/msn.c:337
+#: ../libpurple/protocols/msn/msn.c:346
 msgid "This Hotmail account may not be active."
 msgstr "Hotmail撣唾航賢芾◤"
 
-#: ../libpurple/protocols/msn/msn.c:363
+#: ../libpurple/protocols/msn/msn.c:372
 msgid "Send a mobile message."
 msgstr "箄閮胯"
 
-#: ../libpurple/protocols/msn/msn.c:365
+#: ../libpurple/protocols/msn/msn.c:374
 msgid "Page"
 msgstr "喳"
 
-#: ../libpurple/protocols/msn/msn.c:529
+#: ../libpurple/protocols/msn/msn.c:521
 msgid "Has you"
 msgstr "雿其嚗憟對憟賢皜株"
 
-#: ../libpurple/protocols/msn/msn.c:559 ../libpurple/protocols/msn/state.c:33
-#: ../libpurple/protocols/yahoo/yahoo.c:2882
-#: ../libpurple/protocols/yahoo/yahoo.c:3491
+#: ../libpurple/protocols/msn/msn.c:551 ../libpurple/protocols/msn/state.c:33
+#: ../libpurple/protocols/yahoo/yahoo.c:2878
+#: ../libpurple/protocols/yahoo/yahoo.c:3487
 msgid "Be Right Back"
 msgstr "擐砌靘"
 
-#: ../libpurple/protocols/msn/msn.c:563 ../libpurple/protocols/msn/state.c:31
+#: ../libpurple/protocols/msn/msn.c:555 ../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:47
-#: ../libpurple/protocols/yahoo/yahoo.c:2884
-#: ../libpurple/protocols/yahoo/yahoo.c:3494
+#: ../libpurple/protocols/yahoo/yahoo.c:2880
+#: ../libpurple/protocols/yahoo/yahoo.c:3490
 msgid "Busy"
 msgstr "敹蝣"
 
-#: ../libpurple/protocols/msn/msn.c:567
-#: ../libpurple/protocols/yahoo/yahoo.c:2892
-#: ../libpurple/protocols/yahoo/yahoo.c:3506
+#: ../libpurple/protocols/msn/msn.c:559
+#: ../libpurple/protocols/yahoo/yahoo.c:2888
+#: ../libpurple/protocols/yahoo/yahoo.c:3502
 msgid "On the Phone"
 msgstr "餉店銝"
 
-#: ../libpurple/protocols/msn/msn.c:571
-#: ../libpurple/protocols/yahoo/yahoo.c:2896
-#: ../libpurple/protocols/yahoo/yahoo.c:3512
+#: ../libpurple/protocols/msn/msn.c:563
+#: ../libpurple/protocols/yahoo/yahoo.c:2892
+#: ../libpurple/protocols/yahoo/yahoo.c:3508
 msgid "Out to Lunch"
 msgstr "憭箇券"
 
-#: ../libpurple/protocols/msn/msn.c:599
+#: ../libpurple/protocols/msn/msn.c:591
 msgid "Set Friendly Name..."
 msgstr "閮剖梁迂..."
 
-#: ../libpurple/protocols/msn/msn.c:604
+#: ../libpurple/protocols/msn/msn.c:596
 msgid "Set Home Phone Number..."
 msgstr "閮剖雿摰園餉店蝣..."
 
-#: ../libpurple/protocols/msn/msn.c:608
+#: ../libpurple/protocols/msn/msn.c:600
 msgid "Set Work Phone Number..."
 msgstr "閮剖撌乩餉店蝣..."
 
-#: ../libpurple/protocols/msn/msn.c:612
+#: ../libpurple/protocols/msn/msn.c:604
 msgid "Set Mobile Phone Number..."
 msgstr "閮剖銵餉店蝣..."
 
-#: ../libpurple/protocols/msn/msn.c:618
+#: ../libpurple/protocols/msn/msn.c:610
 msgid "Enable/Disable Mobile Devices..."
 msgstr " / 銵鋆蝵..."
 
-#: ../libpurple/protocols/msn/msn.c:623
+#: ../libpurple/protocols/msn/msn.c:615
 msgid "Allow/Disallow Mobile Pages..."
 msgstr "閮 / 銝閮 Mobile Page..."
 
-#: ../libpurple/protocols/msn/msn.c:633
+#: ../libpurple/protocols/msn/msn.c:626
 msgid "Open Hotmail Inbox"
 msgstr "Hotmail嗡辣"
 
-#: ../libpurple/protocols/msn/msn.c:657
+#: ../libpurple/protocols/msn/msn.c:650
 msgid "Send to Mobile"
 msgstr "喲唾餉店"
 
-#: ../libpurple/protocols/msn/msn.c:667
+#: ../libpurple/protocols/msn/msn.c:660
 #: ../libpurple/protocols/novell/novell.c:3408
 msgid "Initiate _Chat"
 msgstr "憭拙恕(_C)"
 
 # XXX 怨陌
-#: ../libpurple/protocols/msn/msn.c:705
+#: ../libpurple/protocols/msn/msn.c:698
 msgid "SSL support is needed for MSN. Please install a supported SSL library."
 msgstr "MSN 閬 SSL 蝔撘摨怎舀湛隢摰鋆銝舀渡 SSL 蝔撘摨怒"
 
-#: ../libpurple/protocols/msn/msn.c:730
+#: ../libpurple/protocols/msn/msn.c:723
 msgid "Failed to connect to server."
 msgstr "⊥蝺唬撩具"
 
-#: ../libpurple/protocols/msn/msn.c:1450 ../libpurple/protocols/msn/msn.c:1795
+#: ../libpurple/protocols/msn/msn.c:1458 ../libpurple/protocols/msn/msn.c:1803
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:784
 msgid "Error retrieving profile"
 msgstr "敺鈭箄閮潛航炊"
 
-#: ../libpurple/protocols/msn/msn.c:1521 ../pidgin/plugins/convcolors.c:309
+#: ../libpurple/protocols/msn/msn.c:1529 ../pidgin/plugins/convcolors.c:309
 #: ../pidgin/plugins/pidginrc.c:448
 msgid "General"
 msgstr "銝"
 
-#: ../libpurple/protocols/msn/msn.c:1528
-#: ../libpurple/protocols/oscar/oscar.c:3736
+#: ../libpurple/protocols/msn/msn.c:1536
+#: ../libpurple/protocols/oscar/oscar.c:3742
 #: ../libpurple/protocols/qq/buddy_info.c:45
 #: ../libpurple/protocols/qq/qq.c:219
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1057
 msgid "Age"
 msgstr "撟湧翩"
 
-#: ../libpurple/protocols/msn/msn.c:1530
+#: ../libpurple/protocols/msn/msn.c:1538
 #: ../libpurple/protocols/qq/buddy_info.c:51
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1072
 msgid "Occupation"
 msgstr "瑟平"
 
-#: ../libpurple/protocols/msn/msn.c:1531
+#: ../libpurple/protocols/msn/msn.c:1539
 #: ../libpurple/protocols/novell/novell.c:1478
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1052
 #: ../libpurple/protocols/zephyr/zephyr.c:798
-#: ../libpurple/protocols/zephyr/zephyr.c:1214
+#: ../libpurple/protocols/zephyr/zephyr.c:1215
 msgid "Location"
 msgstr "其蝵"
 
-#: ../libpurple/protocols/msn/msn.c:1536 ../libpurple/protocols/msn/msn.c:1728
-#: ../libpurple/protocols/msn/msn.c:1734 ../libpurple/protocols/msn/msn.c:1741
+#: ../libpurple/protocols/msn/msn.c:1544 ../libpurple/protocols/msn/msn.c:1736
+#: ../libpurple/protocols/msn/msn.c:1742 ../libpurple/protocols/msn/msn.c:1749
 msgid "Hobbies and Interests"
 msgstr "憟/頞"
 
-#: ../libpurple/protocols/msn/msn.c:1542 ../libpurple/protocols/msn/msn.c:1662
-#: ../libpurple/protocols/msn/msn.c:1668 ../libpurple/protocols/msn/msn.c:1675
-#: ../libpurple/protocols/msn/msn.c:1683 ../libpurple/protocols/msn/msn.c:1690
+#: ../libpurple/protocols/msn/msn.c:1550 ../libpurple/protocols/msn/msn.c:1670
+#: ../libpurple/protocols/msn/msn.c:1676 ../libpurple/protocols/msn/msn.c:1683
+#: ../libpurple/protocols/msn/msn.c:1691 ../libpurple/protocols/msn/msn.c:1698
 msgid "A Little About Me"
 msgstr "芣蝪∩"
 
-#: ../libpurple/protocols/msn/msn.c:1559
+#: ../libpurple/protocols/msn/msn.c:1567
 msgid "Social"
 msgstr "蝷曆漱"
 
-#: ../libpurple/protocols/msn/msn.c:1561
+#: ../libpurple/protocols/msn/msn.c:1569
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1062
 msgid "Marital Status"
 msgstr "憍憪餌瘜"
 
-#: ../libpurple/protocols/msn/msn.c:1562
+#: ../libpurple/protocols/msn/msn.c:1570
 msgid "Interests"
 msgstr "頞"
 
-#: ../libpurple/protocols/msn/msn.c:1563
+#: ../libpurple/protocols/msn/msn.c:1571
 msgid "Pets"
 msgstr "撖萇"
 
-#: ../libpurple/protocols/msn/msn.c:1564
+#: ../libpurple/protocols/msn/msn.c:1572
 msgid "Hometown"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:1565
+#: ../libpurple/protocols/msn/msn.c:1573
 msgid "Places Lived"
 msgstr "撅雿唳"
 
-#: ../libpurple/protocols/msn/msn.c:1566
+#: ../libpurple/protocols/msn/msn.c:1574
 msgid "Fashion"
 msgstr "撠"
 
-#: ../libpurple/protocols/msn/msn.c:1567
+#: ../libpurple/protocols/msn/msn.c:1575
 msgid "Humor"
 msgstr "撟賡"
 
-#: ../libpurple/protocols/msn/msn.c:1568
+#: ../libpurple/protocols/msn/msn.c:1576
 msgid "Music"
 msgstr "單"
 
 # NOTE 交po瑼MSN祈澈霅胯摨批喲
-#: ../libpurple/protocols/msn/msn.c:1569 ../libpurple/protocols/msn/msn.c:1750
-#: ../libpurple/protocols/msn/msn.c:1756
+#: ../libpurple/protocols/msn/msn.c:1577 ../libpurple/protocols/msn/msn.c:1758
+#: ../libpurple/protocols/msn/msn.c:1764
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1114
 msgid "Favorite Quote"
 msgstr "摨批喲"
 
-#: ../libpurple/protocols/msn/msn.c:1586
+#: ../libpurple/protocols/msn/msn.c:1594
 msgid "Contact Info"
 msgstr "舐窗鞈閮"
 
-#: ../libpurple/protocols/msn/msn.c:1587
+#: ../libpurple/protocols/msn/msn.c:1595
 msgid "Personal"
 msgstr "鈭箄"
 
-#: ../libpurple/protocols/msn/msn.c:1590
+#: ../libpurple/protocols/msn/msn.c:1598
 msgid "Significant Other"
 msgstr "虫"
 
-#: ../libpurple/protocols/msn/msn.c:1591
+#: ../libpurple/protocols/msn/msn.c:1599
 msgid "Home Phone"
 msgstr "雿摰園餉店"
 
-#: ../libpurple/protocols/msn/msn.c:1592
+#: ../libpurple/protocols/msn/msn.c:1600
 msgid "Home Phone 2"
 msgstr "雿摰園餉店2"
 
-#: ../libpurple/protocols/msn/msn.c:1593
-#: ../libpurple/protocols/oscar/oscar.c:3774
+#: ../libpurple/protocols/msn/msn.c:1601
+#: ../libpurple/protocols/oscar/oscar.c:3780
 msgid "Home Address"
 msgstr "雿摰嗅啣"
 
-#: ../libpurple/protocols/msn/msn.c:1594
+#: ../libpurple/protocols/msn/msn.c:1602
 msgid "Personal Mobile"
 msgstr "鈭箄餉店"
 
-#: ../libpurple/protocols/msn/msn.c:1595
+#: ../libpurple/protocols/msn/msn.c:1603
 msgid "Home Fax"
 msgstr "雿摰嗅喟"
 
-#: ../libpurple/protocols/msn/msn.c:1596
+#: ../libpurple/protocols/msn/msn.c:1604
 msgid "Personal E-Mail"
 msgstr "鈭粹餃萎辣"
 
-#: ../libpurple/protocols/msn/msn.c:1597
+#: ../libpurple/protocols/msn/msn.c:1605
 msgid "Personal IM"
 msgstr "鈭箏單閮臬董"
 
-#: ../libpurple/protocols/msn/msn.c:1599
+#: ../libpurple/protocols/msn/msn.c:1607
 msgid "Anniversary"
 msgstr "勗僑蝝敹菜"
 
 #. Business
-#: ../libpurple/protocols/msn/msn.c:1615
+#: ../libpurple/protocols/msn/msn.c:1623
 msgid "Work"
 msgstr "撌乩鞈"
 
-#: ../libpurple/protocols/msn/msn.c:1617
+#: ../libpurple/protocols/msn/msn.c:1625
 #: ../libpurple/protocols/silc/ops.c:1044
 msgid "Job Title"
 msgstr "琿"
 
-#: ../libpurple/protocols/msn/msn.c:1618
-#: ../libpurple/protocols/oscar/oscar.c:3795
+#: ../libpurple/protocols/msn/msn.c:1626
+#: ../libpurple/protocols/oscar/oscar.c:3801
 msgid "Company"
 msgstr "砍詨蝔"
 
-#: ../libpurple/protocols/msn/msn.c:1619
+#: ../libpurple/protocols/msn/msn.c:1627
 #: ../libpurple/protocols/novell/novell.c:1480
 msgid "Department"
 msgstr "撅祇券"
 
-#: ../libpurple/protocols/msn/msn.c:1620
+#: ../libpurple/protocols/msn/msn.c:1628
 msgid "Profession"
 msgstr "撠璆"
 
-#: ../libpurple/protocols/msn/msn.c:1621
+#: ../libpurple/protocols/msn/msn.c:1629
 msgid "Work Phone"
 msgstr "餉店"
 
-#: ../libpurple/protocols/msn/msn.c:1622
+#: ../libpurple/protocols/msn/msn.c:1630
 msgid "Work Phone 2"
 msgstr "餉店2"
 
-#: ../libpurple/protocols/msn/msn.c:1623
-#: ../libpurple/protocols/oscar/oscar.c:3787
+#: ../libpurple/protocols/msn/msn.c:1631
+#: ../libpurple/protocols/oscar/oscar.c:3793
 msgid "Work Address"
 msgstr "撌乩啣"
 
-#: ../libpurple/protocols/msn/msn.c:1624
+#: ../libpurple/protocols/msn/msn.c:1632
 msgid "Work Mobile"
 msgstr "銵餉店"
 
-#: ../libpurple/protocols/msn/msn.c:1625
+#: ../libpurple/protocols/msn/msn.c:1633
 msgid "Work Pager"
 msgstr "澆怠"
 
-#: ../libpurple/protocols/msn/msn.c:1626
+#: ../libpurple/protocols/msn/msn.c:1634
 msgid "Work Fax"
 msgstr "喟"
 
-#: ../libpurple/protocols/msn/msn.c:1627
+#: ../libpurple/protocols/msn/msn.c:1635
 msgid "Work E-Mail"
 msgstr "餃萎辣"
 
-#: ../libpurple/protocols/msn/msn.c:1628
+#: ../libpurple/protocols/msn/msn.c:1636
 msgid "Work IM"
 msgstr "單閮臬董"
 
-#: ../libpurple/protocols/msn/msn.c:1629
+#: ../libpurple/protocols/msn/msn.c:1637
 msgid "Start Date"
 msgstr "憪交"
 
-#: ../libpurple/protocols/msn/msn.c:1699 ../libpurple/protocols/msn/msn.c:1705
-#: ../libpurple/protocols/msn/msn.c:1712 ../libpurple/protocols/msn/msn.c:1719
+#: ../libpurple/protocols/msn/msn.c:1707 ../libpurple/protocols/msn/msn.c:1713
+#: ../libpurple/protocols/msn/msn.c:1720 ../libpurple/protocols/msn/msn.c:1727
 msgid "Favorite Things"
 msgstr "鈭"
 
-#: ../libpurple/protocols/msn/msn.c:1764
+#: ../libpurple/protocols/msn/msn.c:1772
 msgid "Last Updated"
 msgstr "湔唳交"
 
-#: ../libpurple/protocols/msn/msn.c:1775
+#: ../libpurple/protocols/msn/msn.c:1783
 #: ../libpurple/protocols/qq/buddy_info.c:60
 #: ../libpurple/protocols/silc/ops.c:1060
 msgid "Homepage"
 msgstr "蝬脤"
 
-#: ../libpurple/protocols/msn/msn.c:1796
+#: ../libpurple/protocols/msn/msn.c:1804
 msgid "The user has not created a public profile."
 msgstr "雿輻刻芣撱箇祇鈭箄"
 
-#: ../libpurple/protocols/msn/msn.c:1797
+#: ../libpurple/protocols/msn/msn.c:1805
 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 "
@@ -5782,14 +5863,14 @@
 "MSN 梯牧曆圈雿輻刻鈭箄銵函內雿輻刻航賭摮剁鈭行航賭蝙"
 "刻摮剁雿瘝撱箇祇鈭箄"
 
-#: ../libpurple/protocols/msn/msn.c:1801
+#: ../libpurple/protocols/msn/msn.c:1809
 msgid ""
 "Could not find any information in the user's profile. The user most likely "
 "does not exist."
 msgstr ""
 "券雿輻刻鈭箄蝬脤曆唬遙雿舐函鞈雿輻刻璆菜航賭蒂銝摮具"
 
-#: ../libpurple/protocols/msn/msn.c:1809
+#: ../libpurple/protocols/msn/msn.c:1817
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1216
 msgid "Profile URL"
 msgstr "鈭箄蝬脣"
@@ -5804,19 +5885,19 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/msn/msn.c:2095 ../libpurple/protocols/msn/msn.c:2097
+#: ../libpurple/protocols/msn/msn.c:2103 ../libpurple/protocols/msn/msn.c:2105
 msgid "MSN Protocol Plugin"
 msgstr "MSN 摰璅∠"
 
-#: ../libpurple/protocols/msn/msn.c:2131
+#: ../libpurple/protocols/msn/msn.c:2139
 msgid "Use HTTP Method"
 msgstr "雿輻 HTTP 孵"
 
-#: ../libpurple/protocols/msn/msn.c:2136
+#: ../libpurple/protocols/msn/msn.c:2144
 msgid "Show custom smileys"
 msgstr "憿舐內雿輻刻蝷"
 
-#: ../libpurple/protocols/msn/msn.c:2144
+#: ../libpurple/protocols/msn/msn.c:2152
 msgid "nudge: nudge a user to get their attention"
 msgstr "nudge嚗澆思蝙刻嚗撘韏瑚瘜冽"
 
@@ -5892,17 +5973,17 @@
 msgid "Service Temporarily Unavailable."
 msgstr "急⊥靘"
 
-#: ../libpurple/protocols/msn/notification.c:823
+#: ../libpurple/protocols/msn/notification.c:840
 msgid "Unable to rename group"
 msgstr "⊥湔寧黎蝯蝔"
 
-#: ../libpurple/protocols/msn/notification.c:878
+#: ../libpurple/protocols/msn/notification.c:895
 msgid "Unable to delete group"
 msgstr "⊥蝘駁斤黎蝯"
 
 # NOTE "in %d minutes" 箝 %d 銋扼
 # NOTE 霅舀游 by Ambrose
-#: ../libpurple/protocols/msn/notification.c:1314
+#: ../libpurple/protocols/msn/notification.c:1321
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -5957,7 +6038,7 @@
 msgstr "閫 HTTP 銝剔潛航炊"
 
 #: ../libpurple/protocols/msn/session.c:307
-#: ../libpurple/protocols/oscar/oscar.c:3448
+#: ../libpurple/protocols/oscar/oscar.c:3454
 #: ../libpurple/protocols/yahoo/yahoo.c:202
 msgid "You have signed on from another location."
 msgstr "函勗嗡唳寧餃乓"
@@ -6067,130 +6148,130 @@
 msgid "The screen name specified is invalid."
 msgstr "冽頛詨亦撣唾⊥"
 
-#: ../libpurple/protocols/novell/nmuser.c:1878
+#: ../libpurple/protocols/novell/nmuser.c:1864
 msgid "Required parameters not passed in"
 msgstr "瘝靘"
 
-#: ../libpurple/protocols/novell/nmuser.c:1881
+#: ../libpurple/protocols/novell/nmuser.c:1867
 msgid "Unable to write to network"
 msgstr "⊥撖怠亦雯頝"
 
-#: ../libpurple/protocols/novell/nmuser.c:1884
+#: ../libpurple/protocols/novell/nmuser.c:1870
 msgid "Unable to read from network"
 msgstr "⊥梁雯頝航"
 
-#: ../libpurple/protocols/novell/nmuser.c:1887
+#: ../libpurple/protocols/novell/nmuser.c:1873
 msgid "Error communicating with server"
 msgstr "隡箸冽潛航炊"
 
-#: ../libpurple/protocols/novell/nmuser.c:1891
+#: ../libpurple/protocols/novell/nmuser.c:1877
 msgid "Conference not found"
 msgstr "曆啗府霅"
 
-#: ../libpurple/protocols/novell/nmuser.c:1894
+#: ../libpurple/protocols/novell/nmuser.c:1880
 msgid "Conference does not exist"
 msgstr "閰脫霅唬蒂銝摮"
 
-#: ../libpurple/protocols/novell/nmuser.c:1898
+#: ../libpurple/protocols/novell/nmuser.c:1884
 msgid "A folder with that name already exists"
 msgstr "桅撌脩摮"
 
 #  XXX 憭芸芯 (^^;)
-#: ../libpurple/protocols/novell/nmuser.c:1901
+#: ../libpurple/protocols/novell/nmuser.c:1887
 msgid "Not supported"
 msgstr "銝舀"
 
-#: ../libpurple/protocols/novell/nmuser.c:1905
+#: ../libpurple/protocols/novell/nmuser.c:1891
 msgid "Password has expired"
 msgstr "撖蝣澆歇"
 
-#: ../libpurple/protocols/novell/nmuser.c:1908
+#: ../libpurple/protocols/novell/nmuser.c:1894
 msgid "Incorrect password"
 msgstr "撖蝣潮航炊"
 
-#: ../libpurple/protocols/novell/nmuser.c:1911
+#: ../libpurple/protocols/novell/nmuser.c:1897
 msgid "User not found"
 msgstr "曆啗府雿輻刻"
 
-#: ../libpurple/protocols/novell/nmuser.c:1914
+#: ../libpurple/protocols/novell/nmuser.c:1900
 msgid "Account has been disabled"
 msgstr "撣唾撌脰◤"
 
-#: ../libpurple/protocols/novell/nmuser.c:1917
+#: ../libpurple/protocols/novell/nmuser.c:1903
 msgid "The server could not access the directory"
 msgstr "隡箸函⊥摮桅"
 
 #  XXX 閬閬亥陌
-#: ../libpurple/protocols/novell/nmuser.c:1920
+#: ../libpurple/protocols/novell/nmuser.c:1906
 msgid "Your system administrator has disabled this operation"
 msgstr "函蝟餌絞蝞∠∩摰寡迂雿"
 
-#: ../libpurple/protocols/novell/nmuser.c:1923
+#: ../libpurple/protocols/novell/nmuser.c:1909
 msgid "The server is unavailable; try again later"
 msgstr "急⊥雿輻其撩剁隢蝔敺閰"
 
-#: ../libpurple/protocols/novell/nmuser.c:1926
+#: ../libpurple/protocols/novell/nmuser.c:1912
 msgid "Cannot add a contact to the same folder twice"
 msgstr "⊥典銝鞈憭曉扳啣銝憟賢拇活"
 
-#: ../libpurple/protocols/novell/nmuser.c:1929
+#: ../libpurple/protocols/novell/nmuser.c:1915
 msgid "Cannot add yourself"
 msgstr "⊥啣刻芸楛喳末皜"
 
 #  TODO 銝乓Master archive⊥迤撘霅舀嚗銋銝交憒雿霅
-#: ../libpurple/protocols/novell/nmuser.c:1932
+#: ../libpurple/protocols/novell/nmuser.c:1918
 msgid "Master archive is misconfigured"
 msgstr "Master archive 閮剖航炊"
 
-#: ../libpurple/protocols/novell/nmuser.c:1936
+#: ../libpurple/protocols/novell/nmuser.c:1922
 msgid "Incorrect screen name or password"
 msgstr "航炊撣唾撖蝣"
 
-#: ../libpurple/protocols/novell/nmuser.c:1939
+#: ../libpurple/protocols/novell/nmuser.c:1925
 msgid "Could not recognize the host of the screen name you entered"
 msgstr "⊥颲西冽頛詨亦撣唾抒銝餅蝔"
 
-#: ../libpurple/protocols/novell/nmuser.c:1942
+#: ../libpurple/protocols/novell/nmuser.c:1928
 msgid ""
 "Your account has been disabled because too many incorrect passwords were "
 "entered"
 msgstr "函撣唾撌脰◤剁箄撓乩憭芸⊥撖蝣"
 
-#: ../libpurple/protocols/novell/nmuser.c:1945
+#: ../libpurple/protocols/novell/nmuser.c:1931
 msgid "You cannot add the same person twice to a conversation"
 msgstr "其賢典銝鈭方扳啣銝鈭箏拇活"
 
-#: ../libpurple/protocols/novell/nmuser.c:1949
+#: ../libpurple/protocols/novell/nmuser.c:1935
 msgid "You have reached your limit for the number of contacts allowed"
 msgstr "函憟賢鈭箸詨歇銝"
 
-#: ../libpurple/protocols/novell/nmuser.c:1952
+#: ../libpurple/protocols/novell/nmuser.c:1938
 msgid "You have entered an incorrect screen name"
 msgstr "刻撓乩⊥撣唾"
 
-#: ../libpurple/protocols/novell/nmuser.c:1955
+#: ../libpurple/protocols/novell/nmuser.c:1941
 msgid "An error occurred while updating the directory"
 msgstr "湔啁桅銝剔潛航炊"
 
-#: ../libpurple/protocols/novell/nmuser.c:1958
+#: ../libpurple/protocols/novell/nmuser.c:1944
 msgid "Incompatible protocol version"
 msgstr "摰砌詨捆"
 
-#: ../libpurple/protocols/novell/nmuser.c:1961
+#: ../libpurple/protocols/novell/nmuser.c:1947
 msgid "The user has blocked you"
 msgstr "閰脖蝙刻蝯鈭"
 
-#: ../libpurple/protocols/novell/nmuser.c:1964
+#: ../libpurple/protocols/novell/nmuser.c:1950
 msgid ""
 "This evaluation version does not allow more than ten users to log in at one "
 "time"
 msgstr "閰衣函憭芸捆閮勗雿輻刻餃"
 
-#: ../libpurple/protocols/novell/nmuser.c:1967
+#: ../libpurple/protocols/novell/nmuser.c:1953
 msgid "The user is either offline or you are blocked"
 msgstr "閰脖蝙刻航賣舫Y嚗典歇鋡思嚗憟對蝯"
 
-#: ../libpurple/protocols/novell/nmuser.c:1970
+#: ../libpurple/protocols/novell/nmuser.c:1956
 #, c-format
 msgid "Unknown error: 0x%X"
 msgstr "芰仿航炊嚗0x%X"
@@ -6419,8 +6500,8 @@
 msgstr "隡箸券閮"
 
 #: ../libpurple/protocols/oscar/flap_connection.c:379
-#: ../libpurple/protocols/yahoo/yahoo.c:2294
-#: ../libpurple/protocols/yahoo/yahoo.c:2453
+#: ../libpurple/protocols/yahoo/yahoo.c:2290
+#: ../libpurple/protocols/yahoo/yahoo.c:2449
 #: ../libpurple/protocols/yahoo/ycht.c:481 ../libpurple/proxy.c:580
 #: ../libpurple/proxy.c:1085 ../libpurple/proxy.c:1196
 #: ../libpurple/proxy.c:1296 ../libpurple/proxy.c:1424
@@ -6428,8 +6509,8 @@
 msgstr "隡箸券蝺"
 
 #: ../libpurple/protocols/oscar/flap_connection.c:381
-#: ../libpurple/protocols/yahoo/yahoo.c:2288
-#: ../libpurple/protocols/yahoo/yahoo.c:2447 ../libpurple/proxy.c:592
+#: ../libpurple/protocols/yahoo/yahoo.c:2284
+#: ../libpurple/protocols/yahoo/yahoo.c:2443 ../libpurple/proxy.c:592
 #: ../libpurple/proxy.c:1097 ../libpurple/proxy.c:1208
 #: ../libpurple/proxy.c:1308 ../libpurple/proxy.c:1436
 #, c-format
@@ -6487,8 +6568,8 @@
 msgstr "ICQ 摰璅∠"
 
 #: ../libpurple/protocols/oscar/libicq.c:147
-#: ../libpurple/protocols/yahoo/yahoo.c:4098
-#: ../libpurple/protocols/zephyr/zephyr.c:2996
+#: ../libpurple/protocols/yahoo/yahoo.c:4094
+#: ../libpurple/protocols/zephyr/zephyr.c:2997
 msgid "Encoding"
 msgstr "蝺函Ⅳ"
 
@@ -6623,7 +6704,7 @@
 msgid "Not while on AOL"
 msgstr " AOL 銝閮"
 
-#: ../libpurple/protocols/oscar/oscar.c:329
+#: ../libpurple/protocols/oscar/oscar.c:330
 msgid ""
 "(There was an error receiving this message.  The buddy you are speaking with "
 "is probably using a different encoding than expected.  If you know what "
@@ -6634,7 +6715,7 @@
 "蝺函Ⅳ嚗憒函仿臭暻潛楊蝣潘隢冽函 AIM/ICQ 撣唾脤閮剖銝剔蝺函Ⅳ"
 "甈雿摰嚗"
 
-#: ../libpurple/protocols/oscar/oscar.c:438
+#: ../libpurple/protocols/oscar/oscar.c:439
 #, c-format
 msgid ""
 "(There was an error receiving this message.  Either you and %s have "
@@ -6644,53 +6725,54 @@
 "冽憿冽嗥垢蝔撘嚗"
 
 #. Label
-#: ../libpurple/protocols/oscar/oscar.c:620 ../pidgin/gtkutils.c:2346
-#: ../pidgin/gtkutils.c:2368
+#: ../libpurple/protocols/oscar/oscar.c:621 ../pidgin/gtkutils.c:2386
+#: ../pidgin/gtkutils.c:2416
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:338
 msgid "Buddy Icon"
 msgstr "憟賢蝷"
 
-#: ../libpurple/protocols/oscar/oscar.c:623
+#: ../libpurple/protocols/oscar/oscar.c:624
 msgid "Voice"
 msgstr "脤"
 
 # NOTE 撠湔交胯寡陌箝單閮胯
-#: ../libpurple/protocols/oscar/oscar.c:626
+#: ../libpurple/protocols/oscar/oscar.c:627
 msgid "AIM Direct IM"
 msgstr "AIM 撘單閮"
 
-#: ../libpurple/protocols/oscar/oscar.c:629
+#: ../libpurple/protocols/oscar/oscar.c:630
 #: ../libpurple/protocols/silc/silc.c:687
 #: ../libpurple/protocols/silc/util.c:549
 msgid "Chat"
 msgstr "憭"
 
-#: ../libpurple/protocols/oscar/oscar.c:632
-#: ../libpurple/protocols/oscar/oscar.c:5919
+#: ../libpurple/protocols/oscar/oscar.c:633
+#: ../libpurple/protocols/oscar/oscar.c:5920
 msgid "Get File"
 msgstr "交嗆獢"
 
-#: ../libpurple/protocols/oscar/oscar.c:639
+#: ../libpurple/protocols/oscar/oscar.c:640
 msgid "Games"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:642
+#: ../libpurple/protocols/oscar/oscar.c:643
 msgid "Add-Ins"
 msgstr "璅∠"
 
-#: ../libpurple/protocols/oscar/oscar.c:645
+#: ../libpurple/protocols/oscar/oscar.c:646
 msgid "Send Buddy List"
 msgstr "箏末皜"
 
-#: ../libpurple/protocols/oscar/oscar.c:648
+#: ../libpurple/protocols/oscar/oscar.c:649
 msgid "ICQ Direct Connect"
 msgstr "ICQ 撘湔仿蝺"
 
-#: ../libpurple/protocols/oscar/oscar.c:651
+# NOTE 嗡PO瑼霅舀嚗AP閰脖胯函撘
+#: ../libpurple/protocols/oscar/oscar.c:652
 msgid "AP User"
-msgstr "函撘雿輻刻"
-
-#: ../libpurple/protocols/oscar/oscar.c:654
+msgstr "AP 雿輻刻"
+
+#: ../libpurple/protocols/oscar/oscar.c:655
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
@@ -6701,100 +6783,100 @@
 # NOTE (18:17:29) KingAnt: Right...
 # NOTE (18:17:36) wing: what does that mean though?
 # NOTE (18:17:48) KingAnt: I have no idea--probably nothing
-#: ../libpurple/protocols/oscar/oscar.c:657
+#: ../libpurple/protocols/oscar/oscar.c:658
 msgid "Nihilist"
 msgstr "Nihilist"
 
-#: ../libpurple/protocols/oscar/oscar.c:660
+#: ../libpurple/protocols/oscar/oscar.c:661
 msgid "ICQ Server Relay"
 msgstr "ICQ 隡箸刻"
 
-#: ../libpurple/protocols/oscar/oscar.c:663
+#: ../libpurple/protocols/oscar/oscar.c:664
 msgid "Old ICQ UTF8"
 msgstr "撘 ICQ UTF8"
 
-#: ../libpurple/protocols/oscar/oscar.c:666
+#: ../libpurple/protocols/oscar/oscar.c:667
 msgid "Trillian Encryption"
 msgstr "Trillian 撖"
 
-#: ../libpurple/protocols/oscar/oscar.c:669
+#: ../libpurple/protocols/oscar/oscar.c:670
 msgid "ICQ UTF8"
 msgstr "ICQ UTF8"
 
 # NOTE 隡潔臭蝔格銝餉衣摮
-#: ../libpurple/protocols/oscar/oscar.c:672
+#: ../libpurple/protocols/oscar/oscar.c:673
 msgid "Hiptop"
 msgstr "Hiptop"
 
-#: ../libpurple/protocols/oscar/oscar.c:675
+#: ../libpurple/protocols/oscar/oscar.c:676
 msgid "Security Enabled"
 msgstr "靽摰"
 
 # XXX 怨陌
-#: ../libpurple/protocols/oscar/oscar.c:678
+#: ../libpurple/protocols/oscar/oscar.c:679
 msgid "Video Chat"
 msgstr "閬憭"
 
 # XXX 怨陌
-#: ../libpurple/protocols/oscar/oscar.c:682
+#: ../libpurple/protocols/oscar/oscar.c:683
 msgid "iChat AV"
 msgstr "iChat 閬憭"
 
-#: ../libpurple/protocols/oscar/oscar.c:685
+#: ../libpurple/protocols/oscar/oscar.c:686
 msgid "Live Video"
 msgstr "閬閮"
 
 #  NOTE AIM_CAPS_CAMERA嚗單臭暻澆(^^;)
-#: ../libpurple/protocols/oscar/oscar.c:688
+#: ../libpurple/protocols/oscar/oscar.c:689
 msgid "Camera"
 msgstr "抒豢"
 
-#: ../libpurple/protocols/oscar/oscar.c:706
-#: ../libpurple/protocols/oscar/oscar.c:5689
+#: ../libpurple/protocols/oscar/oscar.c:707
+#: ../libpurple/protocols/oscar/oscar.c:5690
 msgid "Free For Chat"
 msgstr "蝛箄憭"
 
-#: ../libpurple/protocols/oscar/oscar.c:710
-#: ../libpurple/protocols/oscar/oscar.c:5724
+#: ../libpurple/protocols/oscar/oscar.c:711
+#: ../libpurple/protocols/oscar/oscar.c:5725
 msgid "Not Available"
 msgstr "瑟a"
 
-#: ../libpurple/protocols/oscar/oscar.c:712
-#: ../libpurple/protocols/oscar/oscar.c:5710
+#: ../libpurple/protocols/oscar/oscar.c:713
+#: ../libpurple/protocols/oscar/oscar.c:5711
 msgid "Occupied"
 msgstr "敹蝣"
 
 # NOTE  http://www.geocities.com/Athens/Delphi/6470/icq99.html
-#: ../libpurple/protocols/oscar/oscar.c:716
+#: ../libpurple/protocols/oscar/oscar.c:717
 msgid "Web Aware"
 msgstr "閮勗嗡雿輻刻函雯頝臭亦函桀"
 
-#: ../libpurple/protocols/oscar/oscar.c:718 ../libpurple/protocols/qq/qq.c:183
-#: ../libpurple/protocols/yahoo/yahoo.c:2900 ../libpurple/status.c:157
-#: ../pidgin/gtkdocklet.c:465 ../pidgin/gtkstatusbox.c:1053
+#: ../libpurple/protocols/oscar/oscar.c:719 ../libpurple/protocols/qq/qq.c:183
+#: ../libpurple/protocols/yahoo/yahoo.c:2896 ../libpurple/status.c:156
+#: ../pidgin/gtkdocklet.c:446 ../pidgin/gtkstatusbox.c:1053
 msgid "Invisible"
 msgstr "梯澈"
 
-#: ../libpurple/protocols/oscar/oscar.c:720
+#: ../libpurple/protocols/oscar/oscar.c:721
 msgid "Online"
 msgstr "銝蝺"
 
-#: ../libpurple/protocols/oscar/oscar.c:819
-#: ../libpurple/protocols/oscar/oscar.c:3688
+#: ../libpurple/protocols/oscar/oscar.c:820
+#: ../libpurple/protocols/oscar/oscar.c:3694
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:697 ../pidgin/gtkprefs.c:1015
 msgid "IP Address"
 msgstr "IP 雿"
 
-#: ../libpurple/protocols/oscar/oscar.c:826
-#: ../libpurple/protocols/oscar/oscar.c:2840
+#: ../libpurple/protocols/oscar/oscar.c:827
+#: ../libpurple/protocols/oscar/oscar.c:2846
 msgid "Warning Level"
 msgstr "霅血蝑蝝"
 
-#: ../libpurple/protocols/oscar/oscar.c:836
+#: ../libpurple/protocols/oscar/oscar.c:837
 msgid "Buddy Comment"
 msgstr "憟賢隤芣"
 
-#: ../libpurple/protocols/oscar/oscar.c:976
+#: ../libpurple/protocols/oscar/oscar.c:977
 #, c-format
 msgid ""
 "Could not connect to authentication server:\n"
@@ -6803,7 +6885,7 @@
 "⊥蝺唾霅隡箸剁\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:984
+#: ../libpurple/protocols/oscar/oscar.c:985
 #, c-format
 msgid ""
 "Could not connect to BOS server:\n"
@@ -6812,20 +6894,20 @@
 "⊥蝺 BOS 隡箸剁\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:1024
+#: ../libpurple/protocols/oscar/oscar.c:1025
 msgid "Screen name sent"
 msgstr "箏董"
 
-#: ../libpurple/protocols/oscar/oscar.c:1029
+#: ../libpurple/protocols/oscar/oscar.c:1030
 msgid "Connection established, cookie sent"
 msgstr "蝺撌脣遣蝡嚗銝血歇 Cookie"
 
 #. TODO: Don't call this with ssi
-#: ../libpurple/protocols/oscar/oscar.c:1058
+#: ../libpurple/protocols/oscar/oscar.c:1059
 msgid "Finalizing connection"
 msgstr "摰蝺"
 
-#: ../libpurple/protocols/oscar/oscar.c:1242
+#: ../libpurple/protocols/oscar/oscar.c:1243
 #, c-format
 msgid ""
 "Unable to login: Could not sign on as %s because the screen name is "
@@ -6835,30 +6917,31 @@
 "⊥餃伐⊥隞 %s 頨思遢餃伐粹撣唾舐⊥撣唾敹隞亥望摮瘥韏瑕嚗"
 "銝血芸怨望摮瘥詨蝛箇踝芰望詨蝯"
 
-#: ../libpurple/protocols/oscar/oscar.c:1327
-#: ../libpurple/protocols/yahoo/yahoo.c:1936
+#: ../libpurple/protocols/oscar/oscar.c:1328
+#: ../libpurple/protocols/yahoo/yahoo.c:1932
 msgid "Invalid screen name."
 msgstr "撣唾⊥"
 
-#: ../libpurple/protocols/oscar/oscar.c:1334
+#: ../libpurple/protocols/oscar/oscar.c:1335
 #: ../libpurple/protocols/qq/login_logout.c:483
-#: ../libpurple/protocols/simple/simple.c:1039
-#: ../libpurple/protocols/yahoo/yahoo.c:1954
+#: ../libpurple/protocols/simple/simple.c:1037
+#: ../libpurple/protocols/yahoo/yahoo.c:1950
 msgid "Incorrect password."
 msgstr "航炊撖蝣潦"
 
-#: ../libpurple/protocols/oscar/oscar.c:1339
+#: ../libpurple/protocols/oscar/oscar.c:1340
 msgid "Your account is currently suspended."
 msgstr "函撣唾桀其葉"
 
 #  NOTE急⊥雿輻具閰脫急銝摮具
 #  NOTE 霅舀游 by Ambrose
 #. service temporarily unavailable
-#: ../libpurple/protocols/oscar/oscar.c:1343
+#: ../libpurple/protocols/oscar/oscar.c:1344
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "急⊥雿輻 AOL 單閮舀"
 
-#: ../libpurple/protocols/oscar/oscar.c:1348
+#: ../libpurple/protocols/oscar/oscar.c:1349
+#: ../libpurple/protocols/oscar/oscar.c:1360
 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."
@@ -6866,44 +6949,44 @@
 "函蝺嚗瑞雿憭芷餌隢蝑敺敺銵閰艾憒其嗥匱蝥閰西"
 "蝺嚗暻潭函蝑敺撠游撱園瑯"
 
-#: ../libpurple/protocols/oscar/oscar.c:1353
+#: ../libpurple/protocols/oscar/oscar.c:1354
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr "冽雿輻函冽嗥垢蝔撘憭芷隢 %s 湔"
 
-#: ../libpurple/protocols/oscar/oscar.c:1388
+#: ../libpurple/protocols/oscar/oscar.c:1394
 msgid "Could Not Connect"
 msgstr "⊥蝺"
 
-#: ../libpurple/protocols/oscar/oscar.c:1393
+#: ../libpurple/protocols/oscar/oscar.c:1399
 msgid "Received authorization"
 msgstr "嗅啗霅"
 
-#: ../libpurple/protocols/oscar/oscar.c:1416
+#: ../libpurple/protocols/oscar/oscar.c:1422
 msgid "The SecurID key entered is invalid."
 msgstr "冽頛詨亦 SecurID 蝣潛⊥"
 
-#: ../libpurple/protocols/oscar/oscar.c:1430
+#: ../libpurple/protocols/oscar/oscar.c:1436
 msgid "Enter SecurID"
 msgstr "隢頛詨 SecurID"
 
-#: ../libpurple/protocols/oscar/oscar.c:1431
+#: ../libpurple/protocols/oscar/oscar.c:1437
 msgid "Enter the 6 digit number from the digital display."
 msgstr "隢頛詨交貊Ⅳ憿舐內冽憿舐內凋詨"
 
 #. *
 #. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
 #.
-#: ../libpurple/protocols/oscar/oscar.c:1433
-#: ../libpurple/protocols/oscar/oscar.c:2224
-#: ../libpurple/protocols/oscar/oscar.c:2271
-#: ../libpurple/protocols/oscar/oscar.c:5794
-#: ../libpurple/protocols/oscar/oscar.c:6075 ../libpurple/request.h:1387
+#: ../libpurple/protocols/oscar/oscar.c:1439
+#: ../libpurple/protocols/oscar/oscar.c:2230
+#: ../libpurple/protocols/oscar/oscar.c:2277
+#: ../libpurple/protocols/oscar/oscar.c:5795
+#: ../libpurple/protocols/oscar/oscar.c:6076 ../libpurple/request.h:1387
 msgid "_OK"
 msgstr "蝣箏(_O)"
 
-#: ../libpurple/protocols/oscar/oscar.c:1472
-#: ../libpurple/protocols/oscar/oscar.c:1515
+#: ../libpurple/protocols/oscar/oscar.c:1478
+#: ../libpurple/protocols/oscar/oscar.c:1521
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
@@ -6912,53 +6995,53 @@
 "典航賣剜銝剜琿蝺典航賣喳券憿鋡思耨甇敺雿輻 TOC隢 %s "
 "瘝湔啜"
 
-#: ../libpurple/protocols/oscar/oscar.c:1475
-#: ../libpurple/protocols/oscar/oscar.c:1518
+#: ../libpurple/protocols/oscar/oscar.c:1481
+#: ../libpurple/protocols/oscar/oscar.c:1524
 msgid "Unable to get a valid AIM login hash."
 msgstr "⊥敺 AIM 餃亦Ⅳ"
 
-#: ../libpurple/protocols/oscar/oscar.c:1604
+#: ../libpurple/protocols/oscar/oscar.c:1610
 #, c-format
 msgid "You may be disconnected shortly.  Check %s for updates."
 msgstr "典航賣剜銝剜琿蝺隢 %s 瘝湔啜"
 
-#: ../libpurple/protocols/oscar/oscar.c:1607
+#: ../libpurple/protocols/oscar/oscar.c:1613
 msgid "Unable to get a valid login hash."
 msgstr "⊥敺餃亦Ⅳ"
 
-#: ../libpurple/protocols/oscar/oscar.c:1633
+#: ../libpurple/protocols/oscar/oscar.c:1639
 msgid "Password sent"
 msgstr "撖蝣潮"
 
-#: ../libpurple/protocols/oscar/oscar.c:1689
+#: ../libpurple/protocols/oscar/oscar.c:1695
 msgid "Unable to initialize connection"
 msgstr "⊥憪蝯"
 
-#: ../libpurple/protocols/oscar/oscar.c:2194
+#: ../libpurple/protocols/oscar/oscar.c:2200
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr "隢隤霅閬瘙嚗憟質臭誑撠典交憟賢皜桐葉"
 
-#: ../libpurple/protocols/oscar/oscar.c:2222
+#: ../libpurple/protocols/oscar/oscar.c:2228
 msgid "Authorization Request Message:"
 msgstr "隤霅閬瘙閮荔"
 
-#: ../libpurple/protocols/oscar/oscar.c:2223
+#: ../libpurple/protocols/oscar/oscar.c:2229
 msgid "Please authorize me!"
 msgstr "隢隤霅嚗"
 
-#: ../libpurple/protocols/oscar/oscar.c:2263
-#: ../libpurple/protocols/oscar/oscar.c:2270
-#: ../libpurple/protocols/oscar/oscar.c:2397
-#: ../libpurple/protocols/oscar/oscar.c:5192
-#: ../libpurple/protocols/yahoo/yahoo.c:989
+#: ../libpurple/protocols/oscar/oscar.c:2269
+#: ../libpurple/protocols/oscar/oscar.c:2276
+#: ../libpurple/protocols/oscar/oscar.c:2403
+#: ../libpurple/protocols/oscar/oscar.c:5193
+#: ../libpurple/protocols/yahoo/yahoo.c:985
 msgid "No reason given."
 msgstr "瘝蝯虫"
 
-#: ../libpurple/protocols/oscar/oscar.c:2269
+#: ../libpurple/protocols/oscar/oscar.c:2275
 msgid "Authorization Denied Message:"
 msgstr "蝯隤霅閮荔"
 
-#: ../libpurple/protocols/oscar/oscar.c:2397
+#: ../libpurple/protocols/oscar/oscar.c:2403
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -6968,17 +7051,17 @@
 "雿輻刻 %u 箔嚗蝯鈭典嗅亙末皜桃閬瘙嚗\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2398
+#: ../libpurple/protocols/oscar/oscar.c:2404
 msgid "ICQ authorization denied."
 msgstr "ICQ 隤霅蝯"
 
 #. Someone has granted you authorization
-#: ../libpurple/protocols/oscar/oscar.c:2405
+#: ../libpurple/protocols/oscar/oscar.c:2411
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
 msgstr "雿輻刻 %u 鈭典嗅亙末皜桃閬瘙"
 
-#: ../libpurple/protocols/oscar/oscar.c:2413
+#: ../libpurple/protocols/oscar/oscar.c:2419
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -6991,7 +7074,7 @@
 "靘迎%s [%s]\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2421
+#: ../libpurple/protocols/oscar/oscar.c:2427
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -7004,7 +7087,7 @@
 "靘迎%s [%s]\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2429
+#: ../libpurple/protocols/oscar/oscar.c:2435
 #, c-format
 msgid ""
 "You have received an ICQ e-mail from %s [%s]\n"
@@ -7017,38 +7100,38 @@
 "閮舐綽\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2450
+#: ../libpurple/protocols/oscar/oscar.c:2456
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
 msgstr "ICQ 雿輻刻 %u 靘銝憟賢鞈閮嚗%s (%s)"
 
-#: ../libpurple/protocols/oscar/oscar.c:2456
+#: ../libpurple/protocols/oscar/oscar.c:2462
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr "冽喳隞嚗憟對亙唳函憟賢桐葉嚗"
 
-#: ../libpurple/protocols/oscar/oscar.c:2461 ../pidgin/gtkroomlist.c:308
+#: ../libpurple/protocols/oscar/oscar.c:2467 ../pidgin/gtkroomlist.c:308
 msgid "_Add"
 msgstr "(_A)"
 
-#: ../libpurple/protocols/oscar/oscar.c:2462
+#: ../libpurple/protocols/oscar/oscar.c:2468
 msgid "_Decline"
 msgstr "憍(_D)"
 
-#: ../libpurple/protocols/oscar/oscar.c:2546
+#: ../libpurple/protocols/oscar/oscar.c:2552
 #, c-format
 msgid "You missed %hu message from %s because it was invalid."
 msgid_plural "You missed %hu messages from %s because they were invalid."
 msgstr[0] "券箏仃鈭 %hu  %s 靘閮荔箏舐⊥"
 msgstr[1] "券箏仃鈭 %hu  %s 靘閮荔箏舐⊥"
 
-#: ../libpurple/protocols/oscar/oscar.c:2555
+#: ../libpurple/protocols/oscar/oscar.c:2561
 #, 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] "券箏仃鈭 %hu  %s 靘閮荔箏憭芸之鈭"
 msgstr[1] "券箏仃鈭 %hu  %s 靘閮荔箏憭芸之鈭"
 
-#: ../libpurple/protocols/oscar/oscar.c:2564
+#: ../libpurple/protocols/oscar/oscar.c:2570
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -7058,21 +7141,21 @@
 msgstr[1] "券箏仃鈭 %hu  %s 靘閮荔箏喲摨血云敹怒"
 
 # XXX 頝祈剜霅航 (Arto) 嚗渲陌芣∼憟賢銵銝嚗銝
-#: ../libpurple/protocols/oscar/oscar.c:2573
+#: ../libpurple/protocols/oscar/oscar.c:2579
 #, 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] "券箏仃鈭 %hu  %s 靘閮荔箔嚗憟對憭芷芣∩"
 msgstr[1] "券箏仃鈭 %hu  %s 靘閮荔箔嚗憟對憭芷芣∩"
 
-#: ../libpurple/protocols/oscar/oscar.c:2582
+#: ../libpurple/protocols/oscar/oscar.c:2588
 #, 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] "券箏仃鈭 %hu  %s 靘閮荔箸典云芣∩"
 msgstr[1] "券箏仃鈭 %hu  %s 靘閮荔箸典云芣∩"
 
-#: ../libpurple/protocols/oscar/oscar.c:2591
+#: ../libpurple/protocols/oscar/oscar.c:2597
 #, 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."
@@ -7080,70 +7163,70 @@
 msgstr[1] "券箏仃鈭 %hu  %s 靘閮荔銝"
 
 #. Data is assumed to be the destination sn
-#: ../libpurple/protocols/oscar/oscar.c:2746
+#: ../libpurple/protocols/oscar/oscar.c:2752
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "⊥箄荔%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2746
-#: ../libpurple/protocols/oscar/oscar.c:2751
-#: ../libpurple/protocols/oscar/oscar.c:2813
-#: ../libpurple/protocols/oscar/oscar.c:2817
+#: ../libpurple/protocols/oscar/oscar.c:2752
+#: ../libpurple/protocols/oscar/oscar.c:2757
+#: ../libpurple/protocols/oscar/oscar.c:2819
+#: ../libpurple/protocols/oscar/oscar.c:2823
 msgid "Unknown reason."
 msgstr "銝"
 
-#: ../libpurple/protocols/oscar/oscar.c:2749
+#: ../libpurple/protocols/oscar/oscar.c:2755
 #: ../libpurple/protocols/sametime/sametime.c:2409
 #, c-format
 msgid "Unable to send message to %s:"
 msgstr "⊥箄航 %s嚗"
 
-#: ../libpurple/protocols/oscar/oscar.c:2813
+#: ../libpurple/protocols/oscar/oscar.c:2819
 #, c-format
 msgid "User information not available: %s"
 msgstr "⊥敺鈭箄閮嚗%s"
 
 # NOTE 霅舀游 by Ambrose
-#: ../libpurple/protocols/oscar/oscar.c:2816
+#: ../libpurple/protocols/oscar/oscar.c:2822
 #, c-format
 msgid "User information for %s unavailable:"
 msgstr "⊥敺雿輻刻 %s 鈭箄閮嚗"
 
-#: ../libpurple/protocols/oscar/oscar.c:2845
+#: ../libpurple/protocols/oscar/oscar.c:2851
 msgid "Online Since"
 msgstr "銝蝺"
 
 # XXX 寡陌閮餃交行頛嚗
-#: ../libpurple/protocols/oscar/oscar.c:2850
+#: ../libpurple/protocols/oscar/oscar.c:2856
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1161
 msgid "Member Since"
 msgstr "箸∠"
 
-#: ../libpurple/protocols/oscar/oscar.c:2855
+#: ../libpurple/protocols/oscar/oscar.c:2861
 msgid "Capabilities"
 msgstr "詨捆"
 
-#: ../libpurple/protocols/oscar/oscar.c:2885
+#: ../libpurple/protocols/oscar/oscar.c:2891
 msgid "Available Message"
 msgstr "撠閮"
 
-#: ../libpurple/protocols/oscar/oscar.c:2911
+#: ../libpurple/protocols/oscar/oscar.c:2917
 msgid "Profile"
 msgstr "鈭箄"
 
-#: ../libpurple/protocols/oscar/oscar.c:2988
+#: ../libpurple/protocols/oscar/oscar.c:2994
 msgid "Your AIM connection may be lost."
 msgstr "函 AIM 航賣瑞鈭"
 
 #  The conversion failed!
 #. The conversion failed!
-#: ../libpurple/protocols/oscar/oscar.c:3175
+#: ../libpurple/protocols/oscar/oscar.c:3181
 msgid ""
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
 msgstr "⊥憿舐內靘芷雿輻刻閮荔箏思⊥摮"
 
-#: ../libpurple/protocols/oscar/oscar.c:3378
+#: ../libpurple/protocols/oscar/oscar.c:3384
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
@@ -7151,113 +7234,113 @@
 "冽餈銝雿⊥摰嚗箸典歇蝬啁潮閮舫銝隢蝑敺蝘敺"
 "閰虫甈∼"
 
-#: ../libpurple/protocols/oscar/oscar.c:3450
+#: ../libpurple/protocols/oscar/oscar.c:3456
 msgid "You have been signed off for an unknown reason."
 msgstr "典箔餃箝"
 
-#: ../libpurple/protocols/oscar/oscar.c:3463
+#: ../libpurple/protocols/oscar/oscar.c:3469
 #: ../libpurple/protocols/toc/toc.c:977
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "典歇蝬梯憭拙恕 %s 甇a蝺"
 
-#: ../libpurple/protocols/oscar/oscar.c:3710
+#: ../libpurple/protocols/oscar/oscar.c:3716
 #: ../libpurple/protocols/silc/util.c:581
 msgid "Mobile Phone"
 msgstr "銵餉店"
 
-#: ../libpurple/protocols/oscar/oscar.c:3740
+#: ../libpurple/protocols/oscar/oscar.c:3746
 msgid "Personal Web Page"
 msgstr "鈭箇雯"
 
-#: ../libpurple/protocols/oscar/oscar.c:3764
+#: ../libpurple/protocols/oscar/oscar.c:3770
 #: ../libpurple/protocols/qq/buddy_info.c:40
 msgid "Additional Information"
 msgstr "嗡鞈閮"
 
-#: ../libpurple/protocols/oscar/oscar.c:3772
-#: ../libpurple/protocols/oscar/oscar.c:3785
+#: ../libpurple/protocols/oscar/oscar.c:3778
+#: ../libpurple/protocols/oscar/oscar.c:3791
 msgid "Zip Code"
 msgstr "菟"
 
-#: ../libpurple/protocols/oscar/oscar.c:3796
+#: ../libpurple/protocols/oscar/oscar.c:3802
 msgid "Division"
 msgstr "券"
 
-#: ../libpurple/protocols/oscar/oscar.c:3797
+#: ../libpurple/protocols/oscar/oscar.c:3803
 msgid "Position"
 msgstr "瑚"
 
-#: ../libpurple/protocols/oscar/oscar.c:3799
+#: ../libpurple/protocols/oscar/oscar.c:3805
 msgid "Web Page"
 msgstr "蝬脤"
 
-#: ../libpurple/protocols/oscar/oscar.c:3802
+#: ../libpurple/protocols/oscar/oscar.c:3808
 msgid "Work Information"
 msgstr "撌乩鞈閮"
 
 # XXX 臭暻 (敶V箇曄)嚗 (憟賢臭誑霅胯閮胯??)
-#: ../libpurple/protocols/oscar/oscar.c:3858
+#: ../libpurple/protocols/oscar/oscar.c:3864
 msgid "Pop-Up Message"
 msgstr "敶箄"
 
 # Patch by Kevin Leung
-#: ../libpurple/protocols/oscar/oscar.c:3898
+#: ../libpurple/protocols/oscar/oscar.c:3904
 #, c-format
 msgid "The following screen name is associated with %s"
 msgid_plural "The following screen names are associated with %s"
 msgstr[0] "銝 %s 撣唾"
 msgstr[1] "銝 %s 撣唾"
 
-#: ../libpurple/protocols/oscar/oscar.c:3903
+#: ../libpurple/protocols/oscar/oscar.c:3909
 msgid "Screen name"
 msgstr "撣唾"
 
-#: ../libpurple/protocols/oscar/oscar.c:3929
+#: ../libpurple/protocols/oscar/oscar.c:3935
 #, c-format
 msgid "No results found for e-mail address %s"
 msgstr "曆啣餃萎辣啣 %s 賊蝯"
 
-#: ../libpurple/protocols/oscar/oscar.c:3950
+#: ../libpurple/protocols/oscar/oscar.c:3956
 #, c-format
 msgid "You should receive an e-mail asking to confirm %s."
 msgstr "冽閰脫嗅唬撠閬瘙撠 %s 脰隤霅餃萎辣"
 
-#: ../libpurple/protocols/oscar/oscar.c:3952
+#: ../libpurple/protocols/oscar/oscar.c:3958
 msgid "Account Confirmation Requested"
 msgstr "撣唾蝣箄"
 
-#: ../libpurple/protocols/oscar/oscar.c:3983
+#: ../libpurple/protocols/oscar/oscar.c:3989
 msgid "Error Changing Account Info"
 msgstr "湔孵董鞈閮航炊"
 
-#: ../libpurple/protocols/oscar/oscar.c:3986
+#: ../libpurple/protocols/oscar/oscar.c:3992
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
 "differs from the original."
 msgstr "航炊 0x%04x嚗⊥澆撣唾嚗箄瘙撣唾祉銝"
 
-#: ../libpurple/protocols/oscar/oscar.c:3989
+#: ../libpurple/protocols/oscar/oscar.c:3995
 #, c-format
 msgid "Error 0x%04x: Unable to format screen name because it is invalid."
 msgstr "航炊 0x%04x嚗⊥澆撣唾嚗箏舐⊥"
 
-#: ../libpurple/protocols/oscar/oscar.c:3992
+#: ../libpurple/protocols/oscar/oscar.c:3998
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
 "is too long."
 msgstr "航炊 0x%04x嚗⊥澆撣唾嚗箄瘙撣唾憭芷瑯"
 
-#: ../libpurple/protocols/oscar/oscar.c:3995
+#: ../libpurple/protocols/oscar/oscar.c:4001
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because there is already a "
 "request pending for this screen name."
 msgstr "航炊 0x%04x嚗⊥寡餃萎辣啣嚗粹撣唾撠閬瘙蝑敺"
 
-#: ../libpurple/protocols/oscar/oscar.c:3998
+#: ../libpurple/protocols/oscar/oscar.c:4004
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address has "
@@ -7265,37 +7348,37 @@
 msgstr ""
 "航炊 0x%04x嚗⊥寡餃萎辣啣嚗粹餃萎辣啣憭芸撣唾Y"
 
-#: ../libpurple/protocols/oscar/oscar.c:4001
+#: ../libpurple/protocols/oscar/oscar.c:4007
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address is "
 "invalid."
 msgstr "航炊 0x%04x嚗⊥寡餃萎辣啣嚗粹餃萎辣啣舐⊥"
 
-#: ../libpurple/protocols/oscar/oscar.c:4004
+#: ../libpurple/protocols/oscar/oscar.c:4010
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "航炊 0x%04x嚗芰仿航炊"
 
-#: ../libpurple/protocols/oscar/oscar.c:4014
+#: ../libpurple/protocols/oscar/oscar.c:4020
 #, c-format
 msgid "The e-mail address for %s is %s"
 msgstr "%s 餃萎辣啣 %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:4016
+#: ../libpurple/protocols/oscar/oscar.c:4022
 msgid "Account Info"
 msgstr "撣唾鞈閮"
 
-#: ../libpurple/protocols/oscar/oscar.c:4187
+#: ../libpurple/protocols/oscar/oscar.c:4194
 msgid ""
 "Your IM Image was not sent. You must be Direct Connected to send IM Images."
 msgstr "⊥喲單閮臬蔣嚗閬喲單閮臬蔣嚗敹撠寧湔仿蝺"
 
-#: ../libpurple/protocols/oscar/oscar.c:4432
+#: ../libpurple/protocols/oscar/oscar.c:4439
 msgid "Unable to set AIM profile."
 msgstr "⊥閮剖 AIM 鈭箄"
 
-#: ../libpurple/protocols/oscar/oscar.c:4433
+#: ../libpurple/protocols/oscar/oscar.c:4440
 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 "
@@ -7304,7 +7387,7 @@
 "典冽芰餃亙閬瘙靽格寞函鈭箄閮嚗隞仿鈭鞈閮銝行芾◤靽格嫘隢典餃亙"
 "圈脰閮剖"
 
-#: ../libpurple/protocols/oscar/oscar.c:4447
+#: ../libpurple/protocols/oscar/oscar.c:4454
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  It has been "
@@ -7315,11 +7398,11 @@
 msgstr[0] "鈭箄閮瑕漲頞箔 %d 雿蝯銝嚗琿典撌脰◤芸颯"
 msgstr[1] "鈭箄閮瑕漲頞箔 %d 雿蝯銝嚗琿典撌脰◤芸颯"
 
-#: ../libpurple/protocols/oscar/oscar.c:4452
+#: ../libpurple/protocols/oscar/oscar.c:4459
 msgid "Profile too long."
 msgstr "鈭箄閮瑯"
 
-#: ../libpurple/protocols/oscar/oscar.c:4497
+#: ../libpurple/protocols/oscar/oscar.c:4504
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  It has been "
@@ -7330,11 +7413,11 @@
 msgstr[0] "a閮舐瑕漲頞箔 %d 雿蝯銝嚗琿典撌脰◤芸颯"
 msgstr[1] "a閮舐瑕漲頞箔 %d 雿蝯銝嚗琿典撌脰◤芸颯"
 
-#: ../libpurple/protocols/oscar/oscar.c:4502
+#: ../libpurple/protocols/oscar/oscar.c:4509
 msgid "Away message too long."
 msgstr "a閮舫瑯"
 
-#: ../libpurple/protocols/oscar/oscar.c:4571
+#: ../libpurple/protocols/oscar/oscar.c:4578
 #, c-format
 msgid ""
 "Could not add the buddy %s because the screen name is invalid.  Screen names "
@@ -7345,17 +7428,17 @@
 "摮瘥粹哨晞望摮瘥詨蝛箇賬蝯嚗桃隞乓"
 "摮蝯"
 
-#: ../libpurple/protocols/oscar/oscar.c:4573
-#: ../libpurple/protocols/oscar/oscar.c:4996
-#: ../libpurple/protocols/oscar/oscar.c:5010
+#: ../libpurple/protocols/oscar/oscar.c:4580
+#: ../libpurple/protocols/oscar/oscar.c:5003
+#: ../libpurple/protocols/oscar/oscar.c:5017
 msgid "Unable To Add"
 msgstr "⊥"
 
-#: ../libpurple/protocols/oscar/oscar.c:4677
+#: ../libpurple/protocols/oscar/oscar.c:4684
 msgid "Unable To Retrieve Buddy List"
 msgstr "⊥霈憟賢皜"
 
-#: ../libpurple/protocols/oscar/oscar.c:4678
+#: ../libpurple/protocols/oscar/oscar.c:4685
 msgid ""
 "The AIM servers were temporarily unable to send your buddy list.  Your buddy "
 "list is not lost, and will probably become available in a few hours."
@@ -7363,16 +7446,16 @@
 "AIM 隡箸冽急⊥箸函憟賢皜柴銝憟賢皜桐蒂瘝箏仃嚗航賢臭誑典嗾"
 "撠敺敺"
 
-#: ../libpurple/protocols/oscar/oscar.c:4882
-#: ../libpurple/protocols/oscar/oscar.c:4883
-#: ../libpurple/protocols/oscar/oscar.c:4888
-#: ../libpurple/protocols/oscar/oscar.c:5064
-#: ../libpurple/protocols/oscar/oscar.c:5065
-#: ../libpurple/protocols/oscar/oscar.c:5070
+#: ../libpurple/protocols/oscar/oscar.c:4889
+#: ../libpurple/protocols/oscar/oscar.c:4890
+#: ../libpurple/protocols/oscar/oscar.c:4895
+#: ../libpurple/protocols/oscar/oscar.c:5071
+#: ../libpurple/protocols/oscar/oscar.c:5072
+#: ../libpurple/protocols/oscar/oscar.c:5077
 msgid "Orphans"
 msgstr "摮文"
 
-#: ../libpurple/protocols/oscar/oscar.c:4994
+#: ../libpurple/protocols/oscar/oscar.c:5001
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -7381,12 +7464,12 @@
 "箸函憟賢瘜桐葉憭芸憟賢嚗隞交颲行亙末 %s隢函宏日其遢憟賢敺"
 "閰艾"
 
-#: ../libpurple/protocols/oscar/oscar.c:4994
-#: ../libpurple/protocols/oscar/oscar.c:5008
+#: ../libpurple/protocols/oscar/oscar.c:5001
+#: ../libpurple/protocols/oscar/oscar.c:5015
 msgid "(no name)"
 msgstr "(瘝摮)"
 
-#: ../libpurple/protocols/oscar/oscar.c:5008
+#: ../libpurple/protocols/oscar/oscar.c:5015
 #, c-format
 msgid ""
 "Could not add the buddy %s for an unknown reason.  The most common reason "
@@ -7396,7 +7479,7 @@
 "箔⊥撠憟賢 %s 乓銝祉臬箸函憟賢皜桐葉憟賢貊株"
 "蝟餌絞閮梁銝"
 
-#: ../libpurple/protocols/oscar/oscar.c:5102
+#: ../libpurple/protocols/oscar/oscar.c:5108
 #, c-format
 msgid ""
 "The user %s has given you permission to add you to their buddy list.  Do you "
@@ -7406,23 +7489,23 @@
 "g"
 
 # NOTE 舀閮勗乩犖澆箇隤霅閬瘙敺憿舐內蝯行芸楛
-#: ../libpurple/protocols/oscar/oscar.c:5108
+#: ../libpurple/protocols/oscar/oscar.c:5116
 msgid "Authorization Given"
 msgstr "蝯虫隤霅"
 
 #. Granted
-#: ../libpurple/protocols/oscar/oscar.c:5188
+#: ../libpurple/protocols/oscar/oscar.c:5189
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
 msgstr "雿輻刻 %s 閮曹典隞嚗憟對亙末皜桃閬瘙"
 
 # NOTE 舀澆箇隤霅閬瘙鋡怠孵閮望憿舐內
-#: ../libpurple/protocols/oscar/oscar.c:5189
+#: ../libpurple/protocols/oscar/oscar.c:5190
 msgid "Authorization Granted"
 msgstr "隤霅脣"
 
 #. Denied
-#: ../libpurple/protocols/oscar/oscar.c:5192
+#: ../libpurple/protocols/oscar/oscar.c:5193
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -7432,32 +7515,32 @@
 "雿輻刻 %s 箔嚗蝯鈭典隞嚗憟對亙末皜桃閬瘙嚗\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:5193
+#: ../libpurple/protocols/oscar/oscar.c:5194
 msgid "Authorization Denied"
 msgstr "隤霅鋡急"
 
 # NOTE: 鋆∠摮蝢拐 #gaim  MrHappy  deryni 靘
 # NOTE: KingAnt 靘摮蝢拇鈭銝嚗急銝鈭
-#: ../libpurple/protocols/oscar/oscar.c:5229
+#: ../libpurple/protocols/oscar/oscar.c:5230
 #: ../libpurple/protocols/toc/toc.c:1371
 msgid "_Exchange:"
 msgstr "駁蝣(_E)嚗"
 
-#: ../libpurple/protocols/oscar/oscar.c:5269
+#: ../libpurple/protocols/oscar/oscar.c:5270
 msgid "Invalid chat name specified."
 msgstr "蝯虫鈭⊥憭拙恕蝔晞"
 
-#: ../libpurple/protocols/oscar/oscar.c:5339
+#: ../libpurple/protocols/oscar/oscar.c:5340
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 msgstr "⊥喲單閮臬蔣嚗AIM 憭拐蒂銝舀游單閮臬蔣喲"
 
-#: ../libpurple/protocols/oscar/oscar.c:5478
-#: ../libpurple/protocols/oscar/oscar.c:5483
+#: ../libpurple/protocols/oscar/oscar.c:5479
+#: ../libpurple/protocols/oscar/oscar.c:5484
 msgid "Away Message"
 msgstr "a閮"
 
 # XXX 憟賢銝撠嚗憟賢瘝憿
-#: ../libpurple/protocols/oscar/oscar.c:5483
+#: ../libpurple/protocols/oscar/oscar.c:5484
 msgid "<i>(retrieving)</i>"
 msgstr " <i>(撠銝)</i>"
 
@@ -7465,89 +7548,89 @@
 #  NOTE (21:24:59) wing: what is the "iTunes Music Store Link" in the AIM status message?
 #  NOTE (21:29:48) KingAnt: wing: The AIM protocol allows people to advertise the song their currently listening to as part of their status
 #  XXX 隞仿閰脫舀憿霅舀嚗雿急喃唳璅孵 - ambrose 20070415
-#: ../libpurple/protocols/oscar/oscar.c:5683
+#: ../libpurple/protocols/oscar/oscar.c:5684
 msgid "iTunes Music Store Link"
 msgstr "iTunes Store 蝬脩蝯"
 
-#: ../libpurple/protocols/oscar/oscar.c:5791
+#: ../libpurple/protocols/oscar/oscar.c:5792
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "%s 憟賢隤芣"
 
-#: ../libpurple/protocols/oscar/oscar.c:5792
+#: ../libpurple/protocols/oscar/oscar.c:5793
 msgid "Buddy Comment:"
 msgstr "憟賢隤芣嚗"
 
-#: ../libpurple/protocols/oscar/oscar.c:5839
+#: ../libpurple/protocols/oscar/oscar.c:5840
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr "券豢鈭 %s 銝湔亙單閮胯"
 
-#: ../libpurple/protocols/oscar/oscar.c:5843
+#: ../libpurple/protocols/oscar/oscar.c:5844
 msgid ""
 "Because this reveals your IP address, it may be considered a security risk.  "
 "Do you wish to continue?"
 msgstr "璅撠脣箸函 IP 雿嚗甇文航賣梁銝憸券芥冽唾蝜潛嚗"
 
-#: ../libpurple/protocols/oscar/oscar.c:5849
+#: ../libpurple/protocols/oscar/oscar.c:5850
 msgid "C_onnect"
 msgstr "蝺(_O)"
 
-#: ../libpurple/protocols/oscar/oscar.c:5884
+#: ../libpurple/protocols/oscar/oscar.c:5885
 msgid "Get AIM Info"
 msgstr "敺 AIM 鞈閮"
 
-#: ../libpurple/protocols/oscar/oscar.c:5890
+#: ../libpurple/protocols/oscar/oscar.c:5891
 msgid "Edit Buddy Comment"
 msgstr "蝺刻摩憟賢隤芣"
 
-#: ../libpurple/protocols/oscar/oscar.c:5898
+#: ../libpurple/protocols/oscar/oscar.c:5899
 msgid "Get Status Msg"
 msgstr "敺閮"
 
 # NOTE 撠湔交胯寡陌箝單閮胯
-#: ../libpurple/protocols/oscar/oscar.c:5911
+#: ../libpurple/protocols/oscar/oscar.c:5912
 msgid "Direct IM"
 msgstr "單閮"
 
-#: ../libpurple/protocols/oscar/oscar.c:5933
+#: ../libpurple/protocols/oscar/oscar.c:5934
 msgid "Re-request Authorization"
 msgstr "啗瘙隤霅"
 
 # NOTE Require箝閬嚗銝胯閬瘙
-#: ../libpurple/protocols/oscar/oscar.c:5992
+#: ../libpurple/protocols/oscar/oscar.c:5993
 msgid "Require authorization"
 msgstr "閬隤霅"
 
-#: ../libpurple/protocols/oscar/oscar.c:5995
+#: ../libpurple/protocols/oscar/oscar.c:5996
 msgid "Web aware (enabling this will cause you to receive SPAM!)"
 msgstr "閮勗嗡雿輻刻函雯頝臭亦函桀嚗撠湔冽嗅啣曇荔嚗"
 
-#: ../libpurple/protocols/oscar/oscar.c:6000
+#: ../libpurple/protocols/oscar/oscar.c:6001
 msgid "ICQ Privacy Options"
 msgstr "ICQ 梁賊"
 
-#: ../libpurple/protocols/oscar/oscar.c:6019
-msgid "The new formatting is invalid."
-msgstr "啁澆舐⊥"
-
 #: ../libpurple/protocols/oscar/oscar.c:6020
+msgid "The new formatting is invalid."
+msgstr "啁澆舐⊥"
+
+#: ../libpurple/protocols/oscar/oscar.c:6021
 msgid "Screen name formatting can change only capitalization and whitespace."
 msgstr "撣唾澆芾賣寡憭批神隞亙蝛箇賬"
 
-#: ../libpurple/protocols/oscar/oscar.c:6073
+#: ../libpurple/protocols/oscar/oscar.c:6074
 msgid "Change Address To:"
 msgstr "霈游啣綽"
 
-#: ../libpurple/protocols/oscar/oscar.c:6119
+#: ../libpurple/protocols/oscar/oscar.c:6120
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>其蒂瘝函敺撽霅</i>"
 
-#: ../libpurple/protocols/oscar/oscar.c:6122
+#: ../libpurple/protocols/oscar/oscar.c:6123
 msgid "You are awaiting authorization from the following buddies"
 msgstr "函桀甇函敺銝憟賢隤霅"
 
-#: ../libpurple/protocols/oscar/oscar.c:6123
+#: ../libpurple/protocols/oscar/oscar.c:6124
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
@@ -7555,74 +7638,74 @@
 "典臭誑啗瘙鈭憟賢隤霅嚗芾典末皜桐葉隞交曌喲菟隞嚗嗅豢"
 "閬瘙啗霅"
 
-#: ../libpurple/protocols/oscar/oscar.c:6140
+#: ../libpurple/protocols/oscar/oscar.c:6141
 msgid "Find Buddy by E-Mail"
 msgstr "隞仿餃萎辣啣靘曉憟賢"
 
-#: ../libpurple/protocols/oscar/oscar.c:6141
+#: ../libpurple/protocols/oscar/oscar.c:6142
 msgid "Search for a buddy by e-mail address"
 msgstr "雿輻券餃萎辣啣撠憟賢"
 
-#: ../libpurple/protocols/oscar/oscar.c:6142
+#: ../libpurple/protocols/oscar/oscar.c:6143
 msgid "Type the e-mail address of the buddy you are searching for."
 msgstr "隢頛詨亙寧餃萎辣啣"
 
-#: ../libpurple/protocols/oscar/oscar.c:6145
+#: ../libpurple/protocols/oscar/oscar.c:6146
 msgid "_Search"
 msgstr "撠(_S)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6303
+#: ../libpurple/protocols/oscar/oscar.c:6304
 msgid "Set User Info (URL)..."
 msgstr "閮剖雿輻刻鞈閮 (蝬脤)..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6314
+#: ../libpurple/protocols/oscar/oscar.c:6315
 msgid "Change Password (URL)"
 msgstr "靽格孵蝣 (蝬脤)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6318
+#: ../libpurple/protocols/oscar/oscar.c:6319
 msgid "Configure IM Forwarding (URL)"
 msgstr "閮剖單閮舐頧 (蝬脤)"
 
 #  NOTE 霅舀游 by Ambrose
 #. ICQ actions
-#: ../libpurple/protocols/oscar/oscar.c:6328
+#: ../libpurple/protocols/oscar/oscar.c:6329
 msgid "Set Privacy Options..."
 msgstr "閮剖梁賊..."
 
 #. AIM actions
-#: ../libpurple/protocols/oscar/oscar.c:6335
+#: ../libpurple/protocols/oscar/oscar.c:6336
 msgid "Confirm Account"
 msgstr "蝣箄撣唾"
 
-#: ../libpurple/protocols/oscar/oscar.c:6339
+#: ../libpurple/protocols/oscar/oscar.c:6340
 msgid "Display Currently Registered E-Mail Address"
 msgstr "憿舐內桀閮餃餃萎辣雿"
 
-#: ../libpurple/protocols/oscar/oscar.c:6343
+#: ../libpurple/protocols/oscar/oscar.c:6344
 msgid "Change Currently Registered E-Mail Address..."
 msgstr "靽格寧桀閮餃餃萎辣雿..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6350
+#: ../libpurple/protocols/oscar/oscar.c:6351
 msgid "Show Buddies Awaiting Authorization"
 msgstr "憿舐內蝑敺隤霅憟賢"
 
-#: ../libpurple/protocols/oscar/oscar.c:6356
+#: ../libpurple/protocols/oscar/oscar.c:6357
 msgid "Search for Buddy by E-Mail Address..."
 msgstr "雿輻券餃萎辣啣撠憟賢..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6361
+#: ../libpurple/protocols/oscar/oscar.c:6362
 msgid "Search for Buddy by Information"
 msgstr "靘扯閮撠曉末"
 
-#: ../libpurple/protocols/oscar/oscar.c:6429
+#: ../libpurple/protocols/oscar/oscar.c:6430
 msgid "Use recent buddies group"
 msgstr "雿輻具Recent Buddies蝢斤"
 
-#: ../libpurple/protocols/oscar/oscar.c:6432
+#: ../libpurple/protocols/oscar/oscar.c:6433
 msgid "Show how long you have been idle"
 msgstr "憿舐內雿蝵桀銋"
 
-#: ../libpurple/protocols/oscar/oscar.c:6584
+#: ../libpurple/protocols/oscar/oscar.c:6588
 msgid ""
 "Always use ICQ proxy server for file transfers\n"
 "(slower, but does not reveal your IP address)"
@@ -8119,7 +8202,7 @@
 
 #: ../libpurple/protocols/qq/login_logout.c:408
 msgid "Request login token error!"
-msgstr ""
+msgstr "餃亥瘙Token 箇暸航炊"
 
 #: ../libpurple/protocols/qq/login_logout.c:486
 msgid "Unable to login, check debug log"
@@ -8128,11 +8211,11 @@
 #. we didn't successfully connect. tdt->toc_fd is valid here
 #. TODO: Include error_message in the message below
 #: ../libpurple/protocols/qq/qq.c:139 ../libpurple/protocols/toc/toc.c:173
-#: ../libpurple/protocols/yahoo/yahoo.c:2382
-#: ../libpurple/protocols/yahoo/yahoo.c:2410
-#: ../libpurple/protocols/yahoo/yahoo.c:2517
-#: ../libpurple/protocols/yahoo/yahoo.c:2538
-#: ../libpurple/protocols/yahoo/yahoo.c:2622
+#: ../libpurple/protocols/yahoo/yahoo.c:2378
+#: ../libpurple/protocols/yahoo/yahoo.c:2406
+#: ../libpurple/protocols/yahoo/yahoo.c:2513
+#: ../libpurple/protocols/yahoo/yahoo.c:2534
+#: ../libpurple/protocols/yahoo/yahoo.c:2618
 #: ../libpurple/protocols/yahoo/yahoo_filexfer.c:108
 #: ../libpurple/protocols/yahoo/yahoo_filexfer.c:188
 #: ../libpurple/protocols/yahoo/ycht.c:549
@@ -8559,7 +8642,7 @@
 msgid "Send TEST Announcement"
 msgstr "箸葫閰阡"
 
-#: ../libpurple/protocols/sametime/sametime.c:3586 ../pidgin/gtkconv.c:4145
+#: ../libpurple/protocols/sametime/sametime.c:3586 ../pidgin/gtkconv.c:4177
 msgid "Topic:"
 msgstr "銝駁嚗"
 
@@ -8597,18 +8680,18 @@
 msgstr "銝甈∩蝙函冽嗥垢蝔撘嚗憒撌脩伐"
 
 #: ../libpurple/protocols/sametime/sametime.c:4301
-#: ../libpurple/protocols/sametime/sametime.c:5500
+#: ../libpurple/protocols/sametime/sametime.c:5506
 msgid "User Name"
 msgstr "雿輻刻蝔"
 
 #: ../libpurple/protocols/sametime/sametime.c:4304
-#: ../libpurple/protocols/sametime/sametime.c:5503
+#: ../libpurple/protocols/sametime/sametime.c:5509
 msgid "Sametime ID"
 msgstr "Sametime ID"
 
 #: ../libpurple/protocols/sametime/sametime.c:4328
 msgid "An ambiguous user ID was entered"
-msgstr "頛詨乩銝銝雿輻刻 ID"
+msgstr "頛詨乩銝銝蝣箇雿輻刻 ID"
 
 #: ../libpurple/protocols/sametime/sametime.c:4329
 #, c-format
@@ -8674,39 +8757,39 @@
 msgid "Synchronize List with Server"
 msgstr "隡箸典甇交"
 
-#: ../libpurple/protocols/sametime/sametime.c:5209
+#: ../libpurple/protocols/sametime/sametime.c:5215
 #, c-format
 msgid "Import Sametime List for Account %s"
 msgstr "臬 Sametime 皜桃策撣唾%s"
 
-#: ../libpurple/protocols/sametime/sametime.c:5249
+#: ../libpurple/protocols/sametime/sametime.c:5255
 #, c-format
 msgid "Export Sametime List for Account %s"
 msgstr "臬 Sametime 皜桃策撣唾%s"
 
-#: ../libpurple/protocols/sametime/sametime.c:5303
+#: ../libpurple/protocols/sametime/sametime.c:5309
 msgid "Unable to add group: group exists"
 msgstr "⊥啣蝢斤嚗蝢斤撌脣"
 
-#: ../libpurple/protocols/sametime/sametime.c:5304
+#: ../libpurple/protocols/sametime/sametime.c:5310
 #, c-format
 msgid "A group named '%s' already exists in your buddy list."
 msgstr "蝢斤蝔晞%s撌脩摮冽潭函憟賢皜桐葉"
 
-#: ../libpurple/protocols/sametime/sametime.c:5307
-#: ../libpurple/protocols/sametime/sametime.c:5437
+#: ../libpurple/protocols/sametime/sametime.c:5313
+#: ../libpurple/protocols/sametime/sametime.c:5443
 msgid "Unable to add group"
 msgstr "⊥啣蝢斤"
 
-#: ../libpurple/protocols/sametime/sametime.c:5366
+#: ../libpurple/protocols/sametime/sametime.c:5372
 msgid "Possible Matches"
 msgstr "航賜貊泵"
 
-#: ../libpurple/protocols/sametime/sametime.c:5382
+#: ../libpurple/protocols/sametime/sametime.c:5388
 msgid "Notes Address Book group results"
 msgstr "Notes 閮蝯"
 
-#: ../libpurple/protocols/sametime/sametime.c:5383
+#: ../libpurple/protocols/sametime/sametime.c:5389
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following Notes Address "
@@ -8716,26 +8799,26 @@
 "%s航賢唬 Notes 閮蝢斤隢芯寥詨甇蝣箇蝢斤嚗隞亙交函憟"
 "皜柴"
 
-#: ../libpurple/protocols/sametime/sametime.c:5388
+#: ../libpurple/protocols/sametime/sametime.c:5394
 msgid "Select Notes Address Book"
 msgstr "豢 Notes 閮"
 
-#: ../libpurple/protocols/sametime/sametime.c:5431
+#: ../libpurple/protocols/sametime/sametime.c:5437
 msgid "Unable to add group: group not found"
 msgstr "⊥啣蝢斤嚗曆啁黎蝯"
 
-#: ../libpurple/protocols/sametime/sametime.c:5433
+#: ../libpurple/protocols/sametime/sametime.c:5439
 #, c-format
 msgid ""
 "The identifier '%s' did not match any Notes Address Book groups in your "
 "Sametime community."
 msgstr "冽函 Sametime 蝷曄黎銝哨銝行隞颱%s貊泵 Notes 閮蝢斤"
 
-#: ../libpurple/protocols/sametime/sametime.c:5474
+#: ../libpurple/protocols/sametime/sametime.c:5480
 msgid "Notes Address Book Group"
 msgstr "Notes 閮蝢斤"
 
-#: ../libpurple/protocols/sametime/sametime.c:5475
+#: ../libpurple/protocols/sametime/sametime.c:5481
 msgid ""
 "Enter the name of a Notes Address Book group in the field below to add the "
 "group and its members to your buddy list."
@@ -8743,12 +8826,12 @@
 "頛詨 Notes 閮蝢斤蝔望潭雿銝哨隞交啣蝢斤摰撅祉∪唳函憟賢皜"
 "銝准"
 
-#: ../libpurple/protocols/sametime/sametime.c:5524
+#: ../libpurple/protocols/sametime/sametime.c:5530
 #, c-format
 msgid "Search results for '%s'"
 msgstr "撠%s撠蝯"
 
-#: ../libpurple/protocols/sametime/sametime.c:5525
+#: ../libpurple/protocols/sametime/sametime.c:5531
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following users. You "
@@ -8758,59 +8841,59 @@
 "%s航賣銝隞颱銝雿輻刻典臭蝙其Y蝝嚗隞嚗憟對啣喳末皜"
 "桀改隞嚗憟對澆箄胯"
 
-#: ../libpurple/protocols/sametime/sametime.c:5532 ../pidgin/gtknotify.c:709
+#: ../libpurple/protocols/sametime/sametime.c:5538 ../pidgin/gtknotify.c:716
 msgid "Search Results"
 msgstr "撠蝯"
 
-#: ../libpurple/protocols/sametime/sametime.c:5557
+#: ../libpurple/protocols/sametime/sametime.c:5563
 msgid "No matches"
 msgstr "瘝貊泵"
 
-#: ../libpurple/protocols/sametime/sametime.c:5558
+#: ../libpurple/protocols/sametime/sametime.c:5564
 #, c-format
 msgid "The identifier '%s' did not match any users in your Sametime community."
 msgstr "%s典 Sametime 蝷曄黎銝剔隞颱雿輻刻撣唾銝蝚艾"
 
-#: ../libpurple/protocols/sametime/sametime.c:5562
+#: ../libpurple/protocols/sametime/sametime.c:5568
 msgid "No Matches"
 msgstr "瘝貊泵"
 
-#: ../libpurple/protocols/sametime/sametime.c:5599
+#: ../libpurple/protocols/sametime/sametime.c:5605
 msgid "Search for a user"
 msgstr "撠銝雿輻刻"
 
-#: ../libpurple/protocols/sametime/sametime.c:5600
+#: ../libpurple/protocols/sametime/sametime.c:5606
 msgid ""
 "Enter a name or partial ID in the field below to search for matching users "
 "in your Sametime community."
 msgstr "頛詨亙其遢 ID 潔寧甈雿嚗靘亥岷 Sametime 蝷曄黎銝剔泵雿輻刻"
 
-#: ../libpurple/protocols/sametime/sametime.c:5603
+#: ../libpurple/protocols/sametime/sametime.c:5609
 msgid "User Search"
 msgstr "雿輻刻撠"
 
-#: ../libpurple/protocols/sametime/sametime.c:5616
+#: ../libpurple/protocols/sametime/sametime.c:5622
 msgid "Import Sametime List..."
 msgstr "臬 Sametime 皜..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5620
+#: ../libpurple/protocols/sametime/sametime.c:5626
 msgid "Export Sametime List..."
 msgstr "臬 Sametime 皜..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5624
+#: ../libpurple/protocols/sametime/sametime.c:5630
 msgid "Add Notes Address Book Group..."
 msgstr "啣 Notes 閮蝢斤"
 
-#: ../libpurple/protocols/sametime/sametime.c:5628
+#: ../libpurple/protocols/sametime/sametime.c:5634
 msgid "User Search..."
 msgstr "雿輻刻撠..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5725
+#: ../libpurple/protocols/sametime/sametime.c:5740
 msgid "Force login (ignore server redirects)"
 msgstr "撘瑁餃伐敹賜乩撩券啣嚗"
 
 #. pretend to be Sametime Connect
-#: ../libpurple/protocols/sametime/sametime.c:5735
+#: ../libpurple/protocols/sametime/sametime.c:5750
 msgid "Hide client identity"
 msgstr "梯摰X嗥垢霅"
 
@@ -9983,7 +10066,7 @@
 msgstr "whois &lt;梁迂&gt;嚗亦梁迂賊鞈閮"
 
 #: ../libpurple/protocols/silc/silc.c:1618
-#: ../libpurple/protocols/zephyr/zephyr.c:2684
+#: ../libpurple/protocols/zephyr/zephyr.c:2685
 msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user"
 msgstr "msg &lt;梁迂&gt; &lt;閮&gt;嚗箔蝘鈭箄舐策摰雿輻刻"
 
@@ -10277,26 +10360,26 @@
 msgstr "⊥撖怠"
 
 #: ../libpurple/protocols/simple/simple.c:438
-#: ../libpurple/protocols/simple/simple.c:1486
+#: ../libpurple/protocols/simple/simple.c:1484
 msgid "Could not connect"
 msgstr "⊥蝯"
 
-#: ../libpurple/protocols/simple/simple.c:1520
-#: ../libpurple/protocols/simple/simple.c:1562
-#: ../libpurple/protocols/simple/simple.c:1575
-#: ../libpurple/protocols/simple/simple.c:1626
+#: ../libpurple/protocols/simple/simple.c:1518
+#: ../libpurple/protocols/simple/simple.c:1560
+#: ../libpurple/protocols/simple/simple.c:1573
+#: ../libpurple/protocols/simple/simple.c:1624
 msgid "Could not create listen socket"
 msgstr "⊥撱箇 Socket "
 
-#: ../libpurple/protocols/simple/simple.c:1543
+#: ../libpurple/protocols/simple/simple.c:1541
 msgid "Couldn't resolve host"
 msgstr "⊥閫銝餅"
 
-#: ../libpurple/protocols/simple/simple.c:1634
+#: ../libpurple/protocols/simple/simple.c:1632
 msgid "Could not resolve hostname"
 msgstr "⊥閫銝餅"
 
-#: ../libpurple/protocols/simple/simple.c:1651
+#: ../libpurple/protocols/simple/simple.c:1649
 msgid "SIP screen names may not contain whitespaces or @ symbols"
 msgstr "SIP 撣唾銝臬急蝛箇賢@蝚西"
 
@@ -10308,36 +10391,36 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../libpurple/protocols/simple/simple.c:1826
+#: ../libpurple/protocols/simple/simple.c:1824
 msgid "SIP/SIMPLE Protocol Plugin"
 msgstr "SIP/SIMPLE 閮摰璅∠"
 
 #. *  summary
-#: ../libpurple/protocols/simple/simple.c:1827
+#: ../libpurple/protocols/simple/simple.c:1825
 msgid "The SIP/SIMPLE Protocol Plugin"
 msgstr "SIP/SIMPLE 閮摰璅∠"
 
-#: ../libpurple/protocols/simple/simple.c:1855
+#: ../libpurple/protocols/simple/simple.c:1853
 msgid "Publish status (note: everyone may watch you)"
 msgstr "餌嚗隢瘜冽嚗隞颱鈭粹質賜唳剁"
 
-#: ../libpurple/protocols/simple/simple.c:1861
+#: ../libpurple/protocols/simple/simple.c:1859
 msgid "Use UDP"
 msgstr "雿輻 UDP"
 
+#: ../libpurple/protocols/simple/simple.c:1861
+msgid "Use proxy"
+msgstr "雿輻 Proxy"
+
 #: ../libpurple/protocols/simple/simple.c:1863
-msgid "Use proxy"
-msgstr "雿輻 Proxy"
-
-#: ../libpurple/protocols/simple/simple.c:1865
 msgid "Proxy"
 msgstr "隞隡箸"
 
-#: ../libpurple/protocols/simple/simple.c:1867
+#: ../libpurple/protocols/simple/simple.c:1865
 msgid "Auth User"
 msgstr "隤霅雿輻刻"
 
-#: ../libpurple/protocols/simple/simple.c:1869
+#: ../libpurple/protocols/simple/simple.c:1867
 msgid "Auth Domain"
 msgstr "隤霅"
 
@@ -10573,21 +10656,21 @@
 msgstr "%s 典澆急剁"
 
 # XXX 怨陌
-#: ../libpurple/protocols/yahoo/yahoo.c:928
+#: ../libpurple/protocols/yahoo/yahoo.c:925
 #, c-format
 msgid "Yahoo! system message for %s:"
 msgstr "%s  Yahoo! 蝟餌絞閮荔"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:988
+#: ../libpurple/protocols/yahoo/yahoo.c:984
 msgid "Authorization denied message:"
 msgstr "蝯隤霅閮荔"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1069
+#: ../libpurple/protocols/yahoo/yahoo.c:1065
 #, c-format
 msgid "%s has (retroactively) denied your request to add them to your list."
 msgstr "雿輻刻 %s 蝯鈭典撠隞嚗憟對啣單函憟賢皜桃閬瘙"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1072
+#: ../libpurple/protocols/yahoo/yahoo.c:1068
 #, c-format
 msgid ""
 "%s has (retroactively) denied your request to add them to your list for the "
@@ -10596,11 +10679,11 @@
 "雿輻刻 %s 箔嚗蝯鈭典撠隞嚗憟對啣單函憟賢皜桃閬瘙嚗%"
 "s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1075
+#: ../libpurple/protocols/yahoo/yahoo.c:1071
 msgid "Add buddy rejected"
 msgstr "啣憟賢鋡急"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1826
+#: ../libpurple/protocols/yahoo/yahoo.c:1822
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -10610,11 +10693,11 @@
 "Yahoo 隡箸刻瘙鈭雿輻其蝔桐隤霅孵嚗甇文航賭餃 Yahoo隢 "
 "%s 瑼X交瘝湔啁研"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1829
+#: ../libpurple/protocols/yahoo/yahoo.c:1825
 msgid "Failed Yahoo! Authentication"
 msgstr "Yahoo! 隤霅憭望"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1895
+#: ../libpurple/protocols/yahoo/yahoo.c:1891
 #, c-format
 msgid ""
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
@@ -10623,70 +10706,70 @@
 "典閰血蕭亙冽函憟賢桀抒 %s憒冽蝞隞嚗憟對敺函憟賢皜桐葉蝘駁歹銝"
 "典喳蕭乩嚗憟對嚗隢銝銝胯"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1898
+#: ../libpurple/protocols/yahoo/yahoo.c:1894
 msgid "Ignore buddy?"
 msgstr "敹賜乩蝙刻嚗"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1957
+#: ../libpurple/protocols/yahoo/yahoo.c:1953
 msgid "Your account is locked, please log in to the Yahoo! website."
 msgstr "雿撣單嗥桀鋡急急隢函餃 Yahoo! 蝬脩"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1960
+#: ../libpurple/protocols/yahoo/yahoo.c:1956
 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr "芰亦航炊隞蝣 %d撌脩餃亙 Yahoo!嚗摰寧雯蝡銝航賢歇蝬靽格迤航炊"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2014
+#: ../libpurple/protocols/yahoo/yahoo.c:2010
 #, c-format
 msgid "Could not add buddy %s to group %s to the server list on account %s."
 msgstr "⊥撠憟賢%1$s啣喳董%3$s其撩其皜桀抒蝢斤%2$s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2017
+#: ../libpurple/protocols/yahoo/yahoo.c:2013
 msgid "Could not add buddy to server list"
 msgstr "⊥撠憟賢啣喃撩其皜桀"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2136
+#: ../libpurple/protocols/yahoo/yahoo.c:2132
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ 單瑼 %s/%s/%s.swf ] %s"
 
 # XXX 怨陌 - 20061025
-#: ../libpurple/protocols/yahoo/yahoo.c:2468
+#: ../libpurple/protocols/yahoo/yahoo.c:2464
 msgid "Received unexpected HTTP response from server."
 msgstr "隡箸函澆箔憟芰 HTTP "
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2492
-#: ../libpurple/protocols/yahoo/yahoo.c:2671
-#: ../libpurple/protocols/yahoo/yahoo.c:2774
-#: ../libpurple/protocols/yahoo/yahoo.c:2784
+#: ../libpurple/protocols/yahoo/yahoo.c:2488
+#: ../libpurple/protocols/yahoo/yahoo.c:2667
+#: ../libpurple/protocols/yahoo/yahoo.c:2770
+#: ../libpurple/protocols/yahoo/yahoo.c:2780
 #: ../libpurple/protocols/yahoo/yahoochat.c:1455
 #: ../libpurple/protocols/yahoo/yahoochat.c:1525
 #: ../libpurple/protocols/yahoo/ycht.c:585
 msgid "Connection problem"
 msgstr "蝺航炊"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2886
-#: ../libpurple/protocols/yahoo/yahoo.c:3497
+#: ../libpurple/protocols/yahoo/yahoo.c:2882
+#: ../libpurple/protocols/yahoo/yahoo.c:3493
 msgid "Not at Home"
 msgstr "銝典振"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2888
-#: ../libpurple/protocols/yahoo/yahoo.c:3500
+#: ../libpurple/protocols/yahoo/yahoo.c:2884
+#: ../libpurple/protocols/yahoo/yahoo.c:3496
 msgid "Not at Desk"
 msgstr "銝典漣雿"
 
+#: ../libpurple/protocols/yahoo/yahoo.c:2886
+#: ../libpurple/protocols/yahoo/yahoo.c:3499
+msgid "Not in Office"
+msgstr "銝刻齒砍恕"
+
 #: ../libpurple/protocols/yahoo/yahoo.c:2890
-#: ../libpurple/protocols/yahoo/yahoo.c:3503
-msgid "Not in Office"
-msgstr "銝刻齒砍恕"
+#: ../libpurple/protocols/yahoo/yahoo.c:3505
+msgid "On Vacation"
+msgstr "皜∪颱"
 
 #: ../libpurple/protocols/yahoo/yahoo.c:2894
-#: ../libpurple/protocols/yahoo/yahoo.c:3509
-msgid "On Vacation"
-msgstr "皜∪颱"
-
-#: ../libpurple/protocols/yahoo/yahoo.c:2898
-#: ../libpurple/protocols/yahoo/yahoo.c:3515
+#: ../libpurple/protocols/yahoo/yahoo.c:3511
 msgid "Stepped Out"
 msgstr "韏啣箏颱"
 
@@ -10694,92 +10777,92 @@
 # NOTE 銋銵函內雿銝閬憟賢餃亦蝑(yeah, it mean the buddy
 # NOTE isn't on the server's buddy list/ which also means you won't
 # NOTE be able to see when they log on, etc)
-#: ../libpurple/protocols/yahoo/yahoo.c:2991
-#: ../libpurple/protocols/yahoo/yahoo.c:3021
+#: ../libpurple/protocols/yahoo/yahoo.c:2987
+#: ../libpurple/protocols/yahoo/yahoo.c:3017
 msgid "Not on server list"
 msgstr "銝其撩其皜桐葉"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3038
-#: ../libpurple/protocols/yahoo/yahoo.c:3096
+#: ../libpurple/protocols/yahoo/yahoo.c:3034
+#: ../libpurple/protocols/yahoo/yahoo.c:3092
 msgid "Appear Online"
 msgstr "梁迂銝蝺"
 
 # NOTE Yahoo 摰寡陌瘞賊憿舐內Y嚗隤芰賭暺嗅祕單荔撠鈭綽瑟頨怒
-#: ../libpurple/protocols/yahoo/yahoo.c:3041
-#: ../libpurple/protocols/yahoo/yahoo.c:3117
+#: ../libpurple/protocols/yahoo/yahoo.c:3037
+#: ../libpurple/protocols/yahoo/yahoo.c:3113
 msgid "Appear Permanently Offline"
 msgstr "瑟梁迂Y"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3059
+#: ../libpurple/protocols/yahoo/yahoo.c:3055
 msgid "Presence"
 msgstr "銝蝺"
 
 # NOTE 銝甈∠餃交銝梁迂Y嚗隞亙急摮
-#: ../libpurple/protocols/yahoo/yahoo.c:3102
+#: ../libpurple/protocols/yahoo/yahoo.c:3098
 msgid "Appear Offline"
 msgstr "急梁迂Y"
 
 #  NOTE 舀桀抒銝隞
-#: ../libpurple/protocols/yahoo/yahoo.c:3111
+#: ../libpurple/protocols/yahoo/yahoo.c:3107
 msgid "Don't Appear Permanently Offline"
 msgstr "甇a瑟梁迂Y"
 
 # NOTE #gaim  Vann  LSchiere 閫嚗憒詨鈭憟賢桀潔憭抬靘踹亥府憭
 # NOTE Yahoo Chat甇撘霅舀箝航盲啜
-#: ../libpurple/protocols/yahoo/yahoo.c:3159
+#: ../libpurple/protocols/yahoo/yahoo.c:3155
 msgid "Join in Chat"
 msgstr "亙末桀函憭拙恕"
 
 # NOTE霅啣恕舀急霅胯Yahoo! 憟賢瘝箝Conference靘甇撘銝剛陌
-#: ../libpurple/protocols/yahoo/yahoo.c:3165
+#: ../libpurple/protocols/yahoo/yahoo.c:3161
 msgid "Initiate Conference"
 msgstr "霅啣恕"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3193
+#: ../libpurple/protocols/yahoo/yahoo.c:3189
 msgid "Presence Settings"
 msgstr "銝蝺閮剖"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3199
+#: ../libpurple/protocols/yahoo/yahoo.c:3195
 msgid "Start Doodling"
 msgstr "憪 Doodle"
 
 #. XXX Typo: This should be _("Activate which ID?") - fix after string freeze is over
-#: ../libpurple/protocols/yahoo/yahoo.c:3232
+#: ../libpurple/protocols/yahoo/yahoo.c:3228
 msgid "Active which ID?"
 msgstr "芯 ID嚗"
 
 # NOTE #gaim  Vann  LSchiere 閫嚗憒詨鈭憟賢桀潔憭抬靘踹亥府憭
 # NOTE Yahoo Chat甇撘霅舀箝航盲啜
-#: ../libpurple/protocols/yahoo/yahoo.c:3243
+#: ../libpurple/protocols/yahoo/yahoo.c:3239
 msgid "Join who in chat?"
 msgstr "亙芸憟賢桀函憭拙恕嚗"
 
+#: ../libpurple/protocols/yahoo/yahoo.c:3251
+msgid "Activate ID..."
+msgstr " ID..."
+
 #: ../libpurple/protocols/yahoo/yahoo.c:3255
-msgid "Activate ID..."
-msgstr " ID..."
-
-#: ../libpurple/protocols/yahoo/yahoo.c:3259
 msgid "Join User in Chat..."
 msgstr "亙末桀函憭拙恕..."
 
 #  XXX 航賢臭誑霅臬銝暺
-#: ../libpurple/protocols/yahoo/yahoo.c:3766
+#: ../libpurple/protocols/yahoo/yahoo.c:3762
 msgid "You have just sent a Buzz!"
 msgstr "典箔銝澆恬"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3825
+#: ../libpurple/protocols/yahoo/yahoo.c:3821
 msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
 msgstr "join: &lt憭拙恕&gt;嚗乩 Yahoo! 蝬脰楝銝憭拙恕"
 
+#: ../libpurple/protocols/yahoo/yahoo.c:3826
+msgid "list: List rooms on the Yahoo network"
+msgstr "list嚗旖ahoo蝬脰楝銝憭拙恕皜"
+
 #: ../libpurple/protocols/yahoo/yahoo.c:3830
-msgid "list: List rooms on the Yahoo network"
-msgstr "list嚗旖ahoo蝬脰楝銝憭拙恕皜"
+msgid "buzz: Buzz a user to get their attention"
+msgstr "buzz: 蝯血末銝嗚撘隞嚗憟對瘜冽"
 
 #: ../libpurple/protocols/yahoo/yahoo.c:3834
-msgid "buzz: Buzz a user to get their attention"
-msgstr "buzz: 蝯血末銝嗚撘隞嚗憟對瘜冽"
-
-#: ../libpurple/protocols/yahoo/yahoo.c:3838
 msgid "doodle: Request user to start a Doodle session"
 msgstr "doodle: 閬瘙雿輻刻憪 Doodle Session"
 
@@ -10793,57 +10876,57 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/yahoo/yahoo.c:4046
-#: ../libpurple/protocols/yahoo/yahoo.c:4048
+#: ../libpurple/protocols/yahoo/yahoo.c:4042
+#: ../libpurple/protocols/yahoo/yahoo.c:4044
 msgid "Yahoo Protocol Plugin"
 msgstr "Yahoo 摰璅∠"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4071
+#: ../libpurple/protocols/yahoo/yahoo.c:4067
 msgid "Yahoo Japan"
 msgstr "Yahoo Japan"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4074
+#: ../libpurple/protocols/yahoo/yahoo.c:4070
 msgid "Pager server"
 msgstr "喳潔撩"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4077
+#: ../libpurple/protocols/yahoo/yahoo.c:4073
 msgid "Japan Pager server"
 msgstr "喳潔撩剁交砍啣嚗"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4080
+#: ../libpurple/protocols/yahoo/yahoo.c:4076
 msgid "Pager port"
 msgstr "喳潛頂蝯梢閮"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4083
+#: ../libpurple/protocols/yahoo/yahoo.c:4079
 msgid "File transfer server"
 msgstr "瑼獢唾撓隡箸"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4086
+#: ../libpurple/protocols/yahoo/yahoo.c:4082
 msgid "Japan file transfer server"
 msgstr "瑼獢唾撓隡箸剁交砍啣嚗"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4089
+#: ../libpurple/protocols/yahoo/yahoo.c:4085
 msgid "File transfer port"
 msgstr "瑼獢唾撓閮"
 
 #  XXX ∪銝霅舀嚗霅胯啣喋湔(?!)
-#: ../libpurple/protocols/yahoo/yahoo.c:4092
+#: ../libpurple/protocols/yahoo/yahoo.c:4088
 msgid "Chat room locale"
 msgstr "憭拙恕 (Locale)"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4095
+#: ../libpurple/protocols/yahoo/yahoo.c:4091
 msgid "Ignore conference and chatroom invitations"
 msgstr "敹賜交霅啣恕憭拙恕隢"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4103
+#: ../libpurple/protocols/yahoo/yahoo.c:4099
 msgid "Chat room list URL"
 msgstr "憭拙恕皜格函雯"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4106
+#: ../libpurple/protocols/yahoo/yahoo.c:4102
 msgid "Yahoo Chat server"
 msgstr "Yahoo 憭拐撩"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4109
+#: ../libpurple/protocols/yahoo/yahoo.c:4105
 msgid "Yahoo Chat port"
 msgstr "Yahoo 憭拙恕閮"
 
@@ -11053,23 +11136,23 @@
 msgstr "⊥喲唾憭拙恕 %s,%s,%s"
 
 #: ../libpurple/protocols/zephyr/zephyr.c:786
-#: ../libpurple/protocols/zephyr/zephyr.c:1203
+#: ../libpurple/protocols/zephyr/zephyr.c:1204
 msgid "User"
 msgstr "雿輻刻"
 
 #: ../libpurple/protocols/zephyr/zephyr.c:791
-#: ../libpurple/protocols/zephyr/zephyr.c:1209
+#: ../libpurple/protocols/zephyr/zephyr.c:1210
 msgid "Hidden or not logged-in"
 msgstr "梯芰餃"
 
 #: ../libpurple/protocols/zephyr/zephyr.c:797
-#: ../libpurple/protocols/zephyr/zephyr.c:1211
+#: ../libpurple/protocols/zephyr/zephyr.c:1212
 #, c-format
 msgid "<br>At %s since %s"
 msgstr "<br>敺 %2$s 韏瑕歇 %1$s"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:1545
 #: ../libpurple/protocols/zephyr/zephyr.c:1546
+#: ../libpurple/protocols/zephyr/zephyr.c:1547
 msgid "Anyone"
 msgstr "隞颱鈭"
 
@@ -11080,65 +11163,65 @@
 # NOTE  http://consult.stanford.edu/pub/communications/zephyr-guide
 # NOTE (15:05:28) aatharuv: wing: A class is basically a high level chat. Any message sent to a class will also have "instance", and "recipient" parameters, which control who gets it. If someone "subscribes" to only a particular instance of the class, they'll only get messages sent to the specific class and instance, whereas someone who subs to all the instances of the class, instance "*", will get any message to the class.
 # NOTE (15:11:31) aatharuv: The "recipient" field also controls who gets a message. if the recipient is "", then anyone subbed to said class and instance will get the message, otherwise it will only be received by the person with that "username". This allows IM's in zephyr to be a special case of chats
-#: ../libpurple/protocols/zephyr/zephyr.c:2353
+#: ../libpurple/protocols/zephyr/zephyr.c:2354
 msgid "_Class:"
 msgstr "憿伐憭拙恕(_C)嚗"
 
 # XXX 怨陌
 # NOTE  http://www.mit.edu/afs/sipb/project/doc/izephyr/html/node19.html 園蝯
 # NOTE  http://consult.stanford.edu/pub/communications/zephyr-guide
-#: ../libpurple/protocols/zephyr/zephyr.c:2359
+#: ../libpurple/protocols/zephyr/zephyr.c:2360
 msgid "_Instance:"
 msgstr "撖阡嚗駁(_I)嚗"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2365
+#: ../libpurple/protocols/zephyr/zephyr.c:2366
 msgid "_Recipient:"
 msgstr "亙(_R)嚗"
 
 #  FIXME 怨陌
-#: ../libpurple/protocols/zephyr/zephyr.c:2376
+#: ../libpurple/protocols/zephyr/zephyr.c:2377
 #, c-format
 msgid "Attempt to subscribe to %s,%s,%s failed"
 msgstr "鈭箄憭拙恕嚗鈭方嚗 %s,%s,%s 憭望"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2689
+#: ../libpurple/protocols/zephyr/zephyr.c:2690
 msgid "zlocate &lt;nick&gt;: Locate user"
 msgstr "zlocate &lt;梁迂&gt;嚗撠曆蝙刻"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2694
+#: ../libpurple/protocols/zephyr/zephyr.c:2695
 msgid "zl &lt;nick&gt;: Locate user"
 msgstr "zl &lt;梁迂&gt;嚗撠曆蝙刻"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2699
+#: ../libpurple/protocols/zephyr/zephyr.c:2700
 msgid "instance &lt;instance&gt;: Set the instance to be used on this class"
 msgstr "instance &lt;撖阡&gt;嚗閮剖憿乓嚗憭拙恕嚗撖阡嚗駁嚗"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2704
+#: ../libpurple/protocols/zephyr/zephyr.c:2705
 msgid "inst &lt;instance&gt;: Set the instance to be used on this class"
 msgstr "inst &lt;撖阡&gt;嚗閮剖憿乓嚗憭拙恕嚗撖阡嚗駁嚗"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2709
+#: ../libpurple/protocols/zephyr/zephyr.c:2710
 msgid "topic &lt;instance&gt;: Set the instance to be used on this class"
 msgstr "topic &lt;撖阡&gt;嚗閮剖憿乓嚗憭拙恕嚗撖阡嚗駁嚗"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2715
+#: ../libpurple/protocols/zephyr/zephyr.c:2716
 msgid "sub &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Join a new chat"
 msgstr "sub &lt;憿&gt; &lt;撖阡&gt; &lt;亙&gt;嚗亥憭拙恕"
 
 #  NOTE (14:46:12) aatharuv: wing: So all zephyrs get sent to a triplet <class,instance,recipient>   . "message" is the default class that zephyrs go to, and "personal" is the default instance.
-#: ../libpurple/protocols/zephyr/zephyr.c:2720
+#: ../libpurple/protocols/zephyr/zephyr.c:2721
 msgid ""
 "zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
 msgstr "zi &lt;撖阡&gt;嚗箄航&lt;閮,<i>撖阡</i>,*&gt;"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2726
+#: ../libpurple/protocols/zephyr/zephyr.c:2727
 msgid ""
 "zci &lt;class&gt; &lt;instance&gt;: Send a message to &lt;<i>class</i>,"
 "<i>instance</i>,*&gt;"
 msgstr ""
 "zi &lt;憿&gt; &lt;撖阡&gt嚗箄航&lt;<i>憿</i>,<i>撖阡</i>,*&gt;"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2732
+#: ../libpurple/protocols/zephyr/zephyr.c:2733
 msgid ""
 "zcir &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;"
 "<i>class</i>,<i>instance</i>,<i>recipient</i>&gt;"
@@ -11146,7 +11229,7 @@
 "zcir &lt;憿&gt; &lt;撖阡&gt; &lt;亙&gt;嚗箄航 &lt;<i>憿</i>,<i>"
 "撖阡</i>,<i>亙</i>&gt;"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2738
+#: ../libpurple/protocols/zephyr/zephyr.c:2739
 msgid ""
 "zir &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;MESSAGE,"
 "<i>instance</i>,<i>recipient</i>&gt;"
@@ -11154,18 +11237,18 @@
 "zir &lt;撖阡&gt; &lt;亙&gt;嚗箄航 &lt;MESSAGE,<i>撖阡</i>,<i>亙"
 "</i>&gt;"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2743
+#: ../libpurple/protocols/zephyr/zephyr.c:2744
 msgid "zc &lt;class&gt;: Send a message to &lt;<i>class</i>,PERSONAL,*&gt;"
 msgstr "zc &lt;憿&gt;嚗箄航 &lt;<i>憿</i>,PERSONAL,*&gt;"
 
 #  NOTE (14:46:42) aatharuv: wing: resubscribe is basically "rejoin chat"
 #  NOTE (14:47:50) aatharuv: wing: err, "rejoin all chats"
-#: ../libpurple/protocols/zephyr/zephyr.c:2849
+#: ../libpurple/protocols/zephyr/zephyr.c:2850
 msgid "Resubscribe"
 msgstr "啣交憭拙恕"
 
 #  FIXME 閬閬亥陌
-#: ../libpurple/protocols/zephyr/zephyr.c:2852
+#: ../libpurple/protocols/zephyr/zephyr.c:2853
 msgid "Retrieve subscriptions from server"
 msgstr "曹撩典敺桀刻憭拙恕皜"
 
@@ -11179,16 +11262,16 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/zephyr/zephyr.c:2945
-#: ../libpurple/protocols/zephyr/zephyr.c:2947
+#: ../libpurple/protocols/zephyr/zephyr.c:2946
+#: ../libpurple/protocols/zephyr/zephyr.c:2948
 msgid "Zephyr Protocol Plugin"
 msgstr "Zephyr 摰璅∠"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2972
+#: ../libpurple/protocols/zephyr/zephyr.c:2973
 msgid "Use tzc"
 msgstr "雿輻 TZC"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2975
+#: ../libpurple/protocols/zephyr/zephyr.c:2976
 msgid "tzc command"
 msgstr "TZC 隞"
 
@@ -11198,11 +11281,11 @@
 # NOTE: gaim to write to .anyone upon logout. Some people use multiple
 # NOTE: clients and prefer to have separate buddylists for separate clients.
 # NOTE: Similarly, .zephyr.subs controls the chats that a person subs.
-#: ../libpurple/protocols/zephyr/zephyr.c:2978
+#: ../libpurple/protocols/zephyr/zephyr.c:2979
 msgid "Export to .anyone"
 msgstr "臬箄 .anyone 瑼"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2981
+#: ../libpurple/protocols/zephyr/zephyr.c:2982
 msgid "Export to .zephyr.subs"
 msgstr "臬箄 .zephyr.subs 瑼"
 
@@ -11212,22 +11295,22 @@
 # NOTE: gaim to write to .anyone upon logout. Some people use multiple
 # NOTE: clients and prefer to have separate buddylists for separate clients.
 # NOTE: Similarly, .zephyr.subs controls the chats that a person subs.
-#: ../libpurple/protocols/zephyr/zephyr.c:2984
+#: ../libpurple/protocols/zephyr/zephyr.c:2985
 msgid "Import from .anyone"
 msgstr " .anyone 瑼獢銝剖臬"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2987
+#: ../libpurple/protocols/zephyr/zephyr.c:2988
 msgid "Import from .zephyr.subs"
 msgstr " .zephyr.subs 瑼銝剖臬"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2990
+#: ../libpurple/protocols/zephyr/zephyr.c:2991
 msgid "Realm"
 msgstr ""
 
 # FIXME 怨陌嚗霅臬敺撌殷敺寥
 # NOTE: Zephyr Exposure梯澈喟曇澈銋蝔桃
 # NOTE: aatharuv: exposure in zephyr controls your visibility.
-#: ../libpurple/protocols/zephyr/zephyr.c:2993
+#: ../libpurple/protocols/zephyr/zephyr.c:2994
 msgid "Exposure"
 msgstr "曇澈蝔摨"
 
@@ -11296,12 +11379,12 @@
 msgid "saved statuses"
 msgstr "脣"
 
-#: ../libpurple/server.c:231
+#: ../libpurple/server.c:233
 #, c-format
 msgid "%s is now known as %s.\n"
 msgstr "%s 寡梁迂 %s\n"
 
-#: ../libpurple/server.c:673
+#: ../libpurple/server.c:679
 #, c-format
 msgid ""
 "%s has invited %s to the chat room %s:\n"
@@ -11310,58 +11393,58 @@
 "%s 隢 %s 啗憭拙恕%s嚗\n"
 "%s"
 
-#: ../libpurple/server.c:678
+#: ../libpurple/server.c:684
 #, c-format
 msgid "%s has invited %s to the chat room %s\n"
 msgstr "%s 隢鈭 %s 啗憭拙恕%s嚗\n"
 
-#: ../libpurple/server.c:682
+#: ../libpurple/server.c:688
 msgid "Accept chat invitation?"
 msgstr "亙隢嚗"
 
-#: ../libpurple/status.c:153
+#: ../libpurple/status.c:152
 msgid "Unset"
 msgstr "瘨閮剖"
 
-#: ../libpurple/status.c:156
+#: ../libpurple/status.c:155
 msgid "Unavailable"
 msgstr "Y"
 
-#: ../libpurple/status.c:160
+#: ../libpurple/status.c:159
 msgid "Mobile"
 msgstr "雿輻刻鋆蝵"
 
-#: ../libpurple/status.c:609
+#: ../libpurple/status.c:608
 #, c-format
 msgid "%s changed status from %s to %s"
 msgstr "%s 敺%s寡箝%s"
 
-#: ../libpurple/status.c:619
+#: ../libpurple/status.c:618
 #, c-format
 msgid "%s is now %s"
 msgstr "%s 桀%s"
 
-#: ../libpurple/status.c:624
+#: ../libpurple/status.c:623
 #, c-format
 msgid "%s is no longer %s"
 msgstr "%s 銝%s"
 
-#: ../libpurple/status.c:1288
+#: ../libpurple/status.c:1233
 #, c-format
 msgid "%s became idle"
 msgstr "%s 霈渡粹蝵"
 
-#: ../libpurple/status.c:1305
+#: ../libpurple/status.c:1250
 #, c-format
 msgid "%s became unidle"
 msgstr "%s 銝蝵"
 
-#: ../libpurple/status.c:1371
+#: ../libpurple/status.c:1312
 #, c-format
 msgid "+++ %s became idle"
 msgstr "+++ %s 霈渡粹蝵"
 
-#: ../libpurple/status.c:1373
+#: ../libpurple/status.c:1314
 #, c-format
 msgid "+++ %s became unidle"
 msgstr "+++ %s 銝蝵"
@@ -11371,13 +11454,13 @@
 msgid "%x %X"
 msgstr "%x %X"
 
-#: ../libpurple/util.c:2495
+#: ../libpurple/util.c:2553
 #, c-format
 msgid "Error Reading %s"
 msgstr "霈 %s 銝剔潛鈭航炊"
 
 # NOTE They臭暻澆g霅舀摰閰梧摰臭暻澆g撖恍瑚暺憟賭
-#: ../libpurple/util.c:2496
+#: ../libpurple/util.c:2554
 #, c-format
 msgid ""
 "An error was encountered reading your %s.  They have not been loaded, and "
@@ -11385,79 +11468,79 @@
 msgstr ""
 "刻圾函%s潛航炊瑼獢抒鞈銝行鋡怨伐瑼獢撌脩宏 %s~"
 
-#: ../libpurple/util.c:2980
+#: ../libpurple/util.c:3024
 msgid "Calculating..."
 msgstr "閮蝞銝..."
 
-#: ../libpurple/util.c:2983
+#: ../libpurple/util.c:3027
 msgid "Unknown."
 msgstr "芰乓"
 
-#: ../libpurple/util.c:3009
+#: ../libpurple/util.c:3053
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d 蝘"
 msgstr[1] "%d 蝘"
 
-#: ../libpurple/util.c:3021
+#: ../libpurple/util.c:3065
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d "
 msgstr[1] "%d "
 
-#: ../libpurple/util.c:3029
+#: ../libpurple/util.c:3073
 #, c-format
 msgid "%s, %d hour"
 msgid_plural "%s, %d hours"
 msgstr[0] "%s %d 撠"
 msgstr[1] "%s %d 撠"
 
-#: ../libpurple/util.c:3035
+#: ../libpurple/util.c:3079
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d 撠"
 msgstr[1] "%d 撠"
 
-#: ../libpurple/util.c:3043
+#: ../libpurple/util.c:3087
 #, c-format
 msgid "%s, %d minute"
 msgid_plural "%s, %d minutes"
 msgstr[0] "%s %d "
 msgstr[1] "%s %d "
 
-#: ../libpurple/util.c:3049
+#: ../libpurple/util.c:3093
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d "
 msgstr[1] "%d "
 
-#: ../libpurple/util.c:3315 ../libpurple/util.c:3613
+#: ../libpurple/util.c:3362 ../libpurple/util.c:3660
 #, c-format
 msgid "Unable to connect to %s"
 msgstr "⊥蝺啜%s"
 
-#: ../libpurple/util.c:3441
+#: ../libpurple/util.c:3488
 #, c-format
 msgid ""
 "Unable to allocate enough memory to hold the contents from %s.  The web "
 "server may be trying something malicious."
 msgstr "⊥箄乓%s敺頞喳閮園嚗蝬脩隡箸典航賣瑟⊥"
 
-#: ../libpurple/util.c:3476
+#: ../libpurple/util.c:3523
 #, c-format
 msgid "Error reading from %s: %s"
 msgstr "霈 %s 銝剔潛航炊嚗%s"
 
-#: ../libpurple/util.c:3507
+#: ../libpurple/util.c:3554
 #, c-format
 msgid "Error writing to %s: %s"
 msgstr "撖怠 %s 銝剔潛鈭航炊嚗%s"
 
-#: ../libpurple/util.c:3532
+#: ../libpurple/util.c:3579
 #, c-format
 msgid "Unable to connect to %s: %s"
 msgstr "⊥蝺 %s嚗%s"
@@ -11484,59 +11567,59 @@
 msgstr "蝟餌絞孵"
 
 #. Build the login options frame.
-#: ../pidgin/gtkaccount.c:398
+#: ../pidgin/gtkaccount.c:406
 msgid "Login Options"
 msgstr "餃仿賊"
 
 # NOTE Debian 霅胯local箝砍啁垢嚗祆狸indows霅舀嚗雿券鋆憟賢瘥頛憒亦
 # XXX
-#: ../pidgin/gtkaccount.c:500
+#: ../pidgin/gtkaccount.c:515
 msgid "Local alias:"
 msgstr "撣唾亙嚗芸冽祆嚗嚗"
 
 #. Build the user options frame.
-#: ../pidgin/gtkaccount.c:562
+#: ../pidgin/gtkaccount.c:577
 msgid "User Options"
 msgstr "雿輻刻芸賊"
 
 #. Buddy icon
-#: ../pidgin/gtkaccount.c:580
+#: ../pidgin/gtkaccount.c:595
 msgid "Use this buddy icon for this account:"
 msgstr "雿輻其憟賢蝷綽"
 
 #. Build the protocol options frame.
-#: ../pidgin/gtkaccount.c:700
+#: ../pidgin/gtkaccount.c:715
 #, c-format
 msgid "%s Options"
 msgstr "%s 賊"
 
-#: ../pidgin/gtkaccount.c:897
+#: ../pidgin/gtkaccount.c:912
 msgid "Use GNOME Proxy Settings"
 msgstr "雿輻 GNOME 隞隡箸刻身摰"
 
-#: ../pidgin/gtkaccount.c:898
+#: ../pidgin/gtkaccount.c:913
 msgid "Use Global Proxy Settings"
 msgstr "雿輻典典隞隡箸刻身摰"
 
 # NOTE 臭誑隞隡箸其瘥
 # NOTE 擐皜舀桅具瘥嚗雿雓隤瘥銝嚗銝雿輻具頛憟
-#: ../pidgin/gtkaccount.c:904
+#: ../pidgin/gtkaccount.c:919
 msgid "No Proxy"
 msgstr "銝雿輻其誨隡箸"
 
-#: ../pidgin/gtkaccount.c:910
+#: ../pidgin/gtkaccount.c:925
 msgid "HTTP"
 msgstr "HTTP"
 
-#: ../pidgin/gtkaccount.c:916
+#: ../pidgin/gtkaccount.c:931
 msgid "SOCKS 4"
 msgstr "SOCKS 4"
 
-#: ../pidgin/gtkaccount.c:922
+#: ../pidgin/gtkaccount.c:937
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
-#: ../pidgin/gtkaccount.c:928 ../pidgin/gtkprefs.c:1100
+#: ../pidgin/gtkaccount.c:943 ../pidgin/gtkprefs.c:1100
 msgid "Use Environmental Settings"
 msgstr "雿輻函啣霈貉身摰"
 
@@ -11545,60 +11628,60 @@
 #. A) your network is really slow and you have nothing better to do than
 #. look at butterflies.
 #. B)You are looking really closely at something that shouldn't matter.
-#: ../pidgin/gtkaccount.c:967
+#: ../pidgin/gtkaccount.c:982
 msgid "If you look real closely"
 msgstr "憒函敺憭隞蝝"
 
 #. This is an easter egg. See the comment on the previous line in the source.
-#: ../pidgin/gtkaccount.c:970
+#: ../pidgin/gtkaccount.c:985
 msgid "you can see the butterflies mating"
 msgstr "暾暾西渲嗡敺閬"
 
-#: ../pidgin/gtkaccount.c:991
+#: ../pidgin/gtkaccount.c:1006
 msgid "Proxy Options"
 msgstr "隞隡箸券賊"
 
-#: ../pidgin/gtkaccount.c:1005 ../pidgin/gtkprefs.c:1094
+#: ../pidgin/gtkaccount.c:1020 ../pidgin/gtkprefs.c:1094
 msgid "Proxy _type:"
 msgstr "隞隡箸典(_T)嚗"
 
-#: ../pidgin/gtkaccount.c:1014 ../pidgin/gtkprefs.c:1115
+#: ../pidgin/gtkaccount.c:1029 ../pidgin/gtkprefs.c:1115
 msgid "_Host:"
 msgstr "銝餅雿(_H)嚗"
 
-#: ../pidgin/gtkaccount.c:1018 ../pidgin/gtkprefs.c:1133
+#: ../pidgin/gtkaccount.c:1033 ../pidgin/gtkprefs.c:1133
 msgid "_Port:"
 msgstr "閮(_P)嚗"
 
-#: ../pidgin/gtkaccount.c:1026
+#: ../pidgin/gtkaccount.c:1041
 msgid "_Username:"
 msgstr "雿輻刻(_U)嚗"
 
-#: ../pidgin/gtkaccount.c:1033 ../pidgin/gtkprefs.c:1170
+#: ../pidgin/gtkaccount.c:1048 ../pidgin/gtkprefs.c:1170
 msgid "Pa_ssword:"
 msgstr "撖蝣(_S)嚗"
 
-#: ../pidgin/gtkaccount.c:1440
+#: ../pidgin/gtkaccount.c:1454
 msgid "Add Account"
 msgstr "啣撣唾"
 
-#: ../pidgin/gtkaccount.c:1464
+#: ../pidgin/gtkaccount.c:1478
 msgid "_Basic"
 msgstr "箸祈身摰(_B)"
 
-#: ../pidgin/gtkaccount.c:1475
+#: ../pidgin/gtkaccount.c:1489
 msgid "_Advanced"
 msgstr "脤閮剖(_A)"
 
-#: ../pidgin/gtkaccount.c:1947 ../pidgin/gtkplugin.c:568
+#: ../pidgin/gtkaccount.c:1961 ../pidgin/gtkplugin.c:568
 msgid "Enabled"
 msgstr ""
 
-#: ../pidgin/gtkaccount.c:1975
+#: ../pidgin/gtkaccount.c:1989
 msgid "Protocol"
 msgstr "閮摰"
 
-#: ../pidgin/gtkaccount.c:2169
+#: ../pidgin/gtkaccount.c:2183
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Welcome to %s!</span>\n"
@@ -11622,233 +11705,233 @@
 
 # TODO 韏瑚閰脩箏銝啁憭拙恕嚗銝行憭拙恕甇賊唳蝢斤
 # NOTE 霅舀游 by Paladin
-#: ../pidgin/gtkblist.c:722
+#: ../pidgin/gtkblist.c:724
 msgid "Join a Chat"
 msgstr "亥憭拙恕"
 
-#: ../pidgin/gtkblist.c:743
+#: ../pidgin/gtkblist.c:745
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 msgstr "隢頛詨仿潭冽喳亙末皜桃憭拙恕拍嗉閮\n"
 
-#: ../pidgin/gtkblist.c:754 ../pidgin/gtkpounce.c:531
+#: ../pidgin/gtkblist.c:756 ../pidgin/gtkpounce.c:531
 #: ../pidgin/gtkroomlist.c:399
 msgid "_Account:"
 msgstr "撣唾(_A)嚗"
 
-#: ../pidgin/gtkblist.c:1028 ../pidgin/gtkprivacy.c:606
+#: ../pidgin/gtkblist.c:1045 ../pidgin/gtkprivacy.c:606
 #: ../pidgin/gtkprivacy.c:620
 msgid "_Block"
 msgstr "撠(_B)"
 
-#: ../pidgin/gtkblist.c:1028
+#: ../pidgin/gtkblist.c:1045
 msgid "Un_block"
 msgstr "閫文(_B)"
 
-#: ../pidgin/gtkblist.c:1079
+#: ../pidgin/gtkblist.c:1096
 msgid "Get _Info"
 msgstr "敺鞈閮(_I)"
 
-#: ../pidgin/gtkblist.c:1082 ../pidgin/pidginstock.c:86
+#: ../pidgin/gtkblist.c:1099 ../pidgin/pidginstock.c:84
 msgid "I_M"
 msgstr "單閮(_M)"
 
-#: ../pidgin/gtkblist.c:1088
+#: ../pidgin/gtkblist.c:1105
 msgid "_Send File"
 msgstr "喲瑼獢(_S)"
 
-#: ../pidgin/gtkblist.c:1095
+#: ../pidgin/gtkblist.c:1112
 msgid "Add Buddy _Pounce"
 msgstr "亙末(_P)"
 
-#: ../pidgin/gtkblist.c:1099 ../pidgin/gtkblist.c:1103
-#: ../pidgin/gtkblist.c:1205 ../pidgin/gtkblist.c:1228
+#: ../pidgin/gtkblist.c:1116 ../pidgin/gtkblist.c:1120
+#: ../pidgin/gtkblist.c:1222 ../pidgin/gtkblist.c:1245
 msgid "View _Log"
 msgstr "閫亥(_L)"
 
-#: ../pidgin/gtkblist.c:1115
+#: ../pidgin/gtkblist.c:1132
 msgid "Alias..."
 msgstr "亙..."
 
-#: ../pidgin/gtkblist.c:1124 ../pidgin/gtkblist.c:1213
-#: ../pidgin/gtkblist.c:1234
+#: ../pidgin/gtkblist.c:1141 ../pidgin/gtkblist.c:1230
+#: ../pidgin/gtkblist.c:1251
 msgid "_Alias..."
 msgstr "亙(_A)..."
 
-#: ../pidgin/gtkblist.c:1126 ../pidgin/gtkblist.c:1215
-#: ../pidgin/gtkblist.c:1236
+#: ../pidgin/gtkblist.c:1143 ../pidgin/gtkblist.c:1232
+#: ../pidgin/gtkblist.c:1253
 msgid "_Remove"
 msgstr "蝘駁(_R)"
 
-#: ../pidgin/gtkblist.c:1175
+#: ../pidgin/gtkblist.c:1192
 msgid "Add a _Buddy"
 msgstr "啣銝憟賢(_B)"
 
-#: ../pidgin/gtkblist.c:1178
+#: ../pidgin/gtkblist.c:1195
 msgid "Add a C_hat"
 msgstr "啣銝憭拙恕(_H)"
 
-#: ../pidgin/gtkblist.c:1181
+#: ../pidgin/gtkblist.c:1198
 msgid "_Delete Group"
 msgstr "芷斤黎蝯(_D)"
 
-#: ../pidgin/gtkblist.c:1183
+#: ../pidgin/gtkblist.c:1200
 msgid "_Rename"
 msgstr "賢(_R)"
 
 #. join button
-#: ../pidgin/gtkblist.c:1201 ../pidgin/gtkroomlist.c:306
-#: ../pidgin/gtkroomlist.c:463 ../pidgin/pidginstock.c:84
+#: ../pidgin/gtkblist.c:1218 ../pidgin/gtkroomlist.c:306
+#: ../pidgin/gtkroomlist.c:463 ../pidgin/pidginstock.c:82
 msgid "_Join"
 msgstr "(_J)"
 
-#: ../pidgin/gtkblist.c:1203
+#: ../pidgin/gtkblist.c:1220
 msgid "Auto-Join"
 msgstr "芸"
 
-#: ../pidgin/gtkblist.c:1241 ../pidgin/gtkblist.c:1264
+#: ../pidgin/gtkblist.c:1258 ../pidgin/gtkblist.c:1281
 msgid "_Collapse"
 msgstr "嗉絲(_C)"
 
-#: ../pidgin/gtkblist.c:1269
+#: ../pidgin/gtkblist.c:1286
 msgid "_Expand"
 msgstr "撅(_E)"
 
-#: ../pidgin/gtkblist.c:1514 ../pidgin/gtkblist.c:1526
-#: ../pidgin/gtkblist.c:4489 ../pidgin/gtkblist.c:4499
+#: ../pidgin/gtkblist.c:1531 ../pidgin/gtkblist.c:1543
+#: ../pidgin/gtkblist.c:4511 ../pidgin/gtkblist.c:4521
 msgid "/Tools/Mute Sounds"
 msgstr "/撌亙/"
 
 # XXX 怨陌
-#: ../pidgin/gtkblist.c:1986 ../pidgin/gtkconv.c:4498
+#: ../pidgin/gtkblist.c:2003 ../pidgin/gtkconv.c:4535
 #: ../pidgin/gtkpounce.c:423
 msgid ""
 "You are not currently signed on with an account that can add that buddy."
 msgstr "其蒂芰餃乩遙雿銝臭冽啣芸憟賢閮摰"
 
 #. Buddies menu
-#: ../pidgin/gtkblist.c:2814
+#: ../pidgin/gtkblist.c:2832
 msgid "/_Buddies"
 msgstr "/憟賢(_B)"
 
-#: ../pidgin/gtkblist.c:2815
+#: ../pidgin/gtkblist.c:2833
 msgid "/Buddies/New Instant _Message..."
 msgstr "/憟賢/啣單閮(_M)"
 
-#: ../pidgin/gtkblist.c:2816
+#: ../pidgin/gtkblist.c:2834
 msgid "/Buddies/Join a _Chat..."
 msgstr "/憟賢/亥憭拙恕(_C)"
 
-#: ../pidgin/gtkblist.c:2817
+#: ../pidgin/gtkblist.c:2835
 msgid "/Buddies/Get User _Info..."
 msgstr "/憟賢/敺雿輻刻鞈閮(_I)..."
 
 #  NOTE 甇方霅胯霈隡潔頛敺憟賭暺
-#: ../pidgin/gtkblist.c:2818
+#: ../pidgin/gtkblist.c:2836
 msgid "/Buddies/View User _Log..."
 msgstr "/憟賢/霈雿輻刻亥(_L)..."
 
-#: ../pidgin/gtkblist.c:2820
+#: ../pidgin/gtkblist.c:2838
 msgid "/Buddies/Show _Offline Buddies"
 msgstr "/憟賢/憿舐內Y憟賢(_O)"
 
-#: ../pidgin/gtkblist.c:2821
+#: ../pidgin/gtkblist.c:2839
 msgid "/Buddies/Show _Empty Groups"
 msgstr "/憟賢/憿舐內蝛箇賜蝢斤(_E)"
 
-#: ../pidgin/gtkblist.c:2822
+#: ../pidgin/gtkblist.c:2840
 msgid "/Buddies/Show Buddy _Details"
 msgstr "/憟賢/憿舐內憟賢蝝啁(_D)"
 
-#: ../pidgin/gtkblist.c:2823
+#: ../pidgin/gtkblist.c:2841
 msgid "/Buddies/Show Idle _Times"
 msgstr "/憟賢/憿舐內蝵格(_T)"
 
-#: ../pidgin/gtkblist.c:2824
+#: ../pidgin/gtkblist.c:2842
 msgid "/Buddies/_Sort Buddies"
 msgstr "/憟賢/憟賢皜格摨(_S)"
 
-#: ../pidgin/gtkblist.c:2826
+#: ../pidgin/gtkblist.c:2844
 msgid "/Buddies/_Add Buddy..."
 msgstr "/憟賢/啣憟賢(_A)..."
 
-#: ../pidgin/gtkblist.c:2827
+#: ../pidgin/gtkblist.c:2845
 msgid "/Buddies/Add C_hat..."
 msgstr "/憟賢/啣憭拙恕(_H)..."
 
-#: ../pidgin/gtkblist.c:2828
+#: ../pidgin/gtkblist.c:2846
 msgid "/Buddies/Add _Group..."
 msgstr "/憟賢/啣蝢斤(_G)..."
 
-#: ../pidgin/gtkblist.c:2830
+#: ../pidgin/gtkblist.c:2848
 msgid "/Buddies/_Quit"
 msgstr "/憟賢/蝯蝔撘(_Q)"
 
 #. Accounts menu
-#: ../pidgin/gtkblist.c:2833
+#: ../pidgin/gtkblist.c:2851
 msgid "/_Accounts"
 msgstr "/撣唾(_A)"
 
-#: ../pidgin/gtkblist.c:2834 ../pidgin/gtkblist.c:6412
+#: ../pidgin/gtkblist.c:2852 ../pidgin/gtkblist.c:6446
 msgid "/Accounts/Add\\/Edit"
 msgstr "/撣唾(_A)/啣\\/蝺刻摩"
 
 #. Tools
-#: ../pidgin/gtkblist.c:2837
+#: ../pidgin/gtkblist.c:2855
 msgid "/_Tools"
 msgstr "撌亙(_T)"
 
-#: ../pidgin/gtkblist.c:2838
+#: ../pidgin/gtkblist.c:2856
 msgid "/Tools/Buddy _Pounces"
 msgstr "/撌亙/憟賢(_P)"
 
-#: ../pidgin/gtkblist.c:2839
+#: ../pidgin/gtkblist.c:2857
 msgid "/Tools/Plu_gins"
 msgstr "/撌亙/璅∠(_G)"
 
-#: ../pidgin/gtkblist.c:2840
+#: ../pidgin/gtkblist.c:2858
 msgid "/Tools/Pr_eferences"
 msgstr "/撌亙/憟質身摰(_E)"
 
-#: ../pidgin/gtkblist.c:2841
+#: ../pidgin/gtkblist.c:2859
 msgid "/Tools/Pr_ivacy"
 msgstr "/撌亙/梁閮剖(_I)"
 
-#: ../pidgin/gtkblist.c:2843
+#: ../pidgin/gtkblist.c:2861
 msgid "/Tools/_File Transfers"
 msgstr "/撌亙/瑼獢唾撓(_F)"
 
-#: ../pidgin/gtkblist.c:2844
+#: ../pidgin/gtkblist.c:2862
 msgid "/Tools/R_oom List"
 msgstr "/撌亙/憭拙恕皜(_O)"
 
-#: ../pidgin/gtkblist.c:2845
+#: ../pidgin/gtkblist.c:2863
 msgid "/Tools/System _Log"
 msgstr "/撌亙/蝟餌絞亥(_L)"
 
-#: ../pidgin/gtkblist.c:2847
+#: ../pidgin/gtkblist.c:2865
 msgid "/Tools/Mute _Sounds"
 msgstr "/撌亙/(_S)"
 
 #. Help
-#: ../pidgin/gtkblist.c:2850
+#: ../pidgin/gtkblist.c:2868
 msgid "/_Help"
 msgstr "隤芣(_H)"
 
-#: ../pidgin/gtkblist.c:2851
+#: ../pidgin/gtkblist.c:2869
 msgid "/Help/Online _Help"
 msgstr "蝺銝隤芣(_H)"
 
-#: ../pidgin/gtkblist.c:2852
+#: ../pidgin/gtkblist.c:2870
 msgid "/Help/_Debug Window"
 msgstr "/隤芣/日航蝒(_D)"
 
-#: ../pidgin/gtkblist.c:2853
+#: ../pidgin/gtkblist.c:2871
 msgid "/Help/_About"
 msgstr "/隤芣/(_A)"
 
-#: ../pidgin/gtkblist.c:2881
+#: ../pidgin/gtkblist.c:2899
 #, c-format
 msgid ""
 "\n"
@@ -11857,128 +11940,128 @@
 "\n"
 "<b>撣唾嚗</b>%s"
 
-#: ../pidgin/gtkblist.c:2959
+#: ../pidgin/gtkblist.c:2977
 msgid "Buddy Alias"
 msgstr "憟賢亙"
 
-#: ../pidgin/gtkblist.c:2980
+#: ../pidgin/gtkblist.c:2998
 msgid "Logged In"
 msgstr "撌脩餃"
 
-#: ../pidgin/gtkblist.c:3026
+#: ../pidgin/gtkblist.c:3044
 msgid "Last Seen"
 msgstr "銝甈∠餃"
 
 # XXX
-#: ../pidgin/gtkblist.c:3046
+#: ../pidgin/gtkblist.c:3064
 msgid "Spooky"
 msgstr "撟賡隡潛"
 
-#: ../pidgin/gtkblist.c:3048
+#: ../pidgin/gtkblist.c:3066
 msgid "Awesome"
 msgstr "勗"
 
-#: ../pidgin/gtkblist.c:3050
+#: ../pidgin/gtkblist.c:3068
 msgid "Rockin'"
 msgstr "勗"
 
-#: ../pidgin/gtkblist.c:3375
+#: ../pidgin/gtkblist.c:3394
 #, c-format
 msgid "Idle %dh %02dm"
 msgstr "蝵 %d 撠 %02d "
 
-#: ../pidgin/gtkblist.c:3377
+#: ../pidgin/gtkblist.c:3396
 #, c-format
 msgid "Idle %dm"
 msgstr "蝵 %d "
 
-#: ../pidgin/gtkblist.c:3514
+#: ../pidgin/gtkblist.c:3533
 msgid "/Buddies/New Instant Message..."
 msgstr "/憟賢/啣單閮..."
 
-#: ../pidgin/gtkblist.c:3515 ../pidgin/gtkblist.c:3548
+#: ../pidgin/gtkblist.c:3534 ../pidgin/gtkblist.c:3567
 msgid "/Buddies/Join a Chat..."
 msgstr "/憟賢/亥憭拙恕(_C)..."
 
-#: ../pidgin/gtkblist.c:3516
+#: ../pidgin/gtkblist.c:3535
 msgid "/Buddies/Get User Info..."
 msgstr "/憟賢/敺雿輻刻鞈閮..."
 
-#: ../pidgin/gtkblist.c:3517
+#: ../pidgin/gtkblist.c:3536
 msgid "/Buddies/Add Buddy..."
 msgstr "/憟賢/啣憟賢..."
 
-#: ../pidgin/gtkblist.c:3518 ../pidgin/gtkblist.c:3551
+#: ../pidgin/gtkblist.c:3537 ../pidgin/gtkblist.c:3570
 msgid "/Buddies/Add Chat..."
 msgstr "/憟賢/啣憭拙恕..."
 
-#: ../pidgin/gtkblist.c:3519
+#: ../pidgin/gtkblist.c:3538
 msgid "/Buddies/Add Group..."
 msgstr "/憟賢/啣蝢斤..."
 
-#: ../pidgin/gtkblist.c:3554
+#: ../pidgin/gtkblist.c:3573
 msgid "/Tools/Privacy"
 msgstr "/撌亙/梁閮剖"
 
-#: ../pidgin/gtkblist.c:3557
+#: ../pidgin/gtkblist.c:3576
 msgid "/Tools/Room List"
 msgstr "/撌亙/憭拙恕皜"
 
-#: ../pidgin/gtkblist.c:3654 ../pidgin/gtkdocklet.c:156
+#: ../pidgin/gtkblist.c:3673 ../pidgin/gtkdocklet.c:153
 #, c-format
 msgid "%d unread message from %s\n"
 msgid_plural "%d unread messages from %s\n"
 msgstr[0] "%d  %s 澆箇芾閮珮n"
 msgstr[1] "%d  %s 澆箇芾閮珮n"
 
-#: ../pidgin/gtkblist.c:3731
+#: ../pidgin/gtkblist.c:3750
 msgid "Manually"
 msgstr "雿輻刻芸"
 
-#: ../pidgin/gtkblist.c:3733
+#: ../pidgin/gtkblist.c:3752
 msgid "Alphabetically"
 msgstr "靘批瘥"
 
-#: ../pidgin/gtkblist.c:3734
+#: ../pidgin/gtkblist.c:3753
 msgid "By status"
 msgstr "靘抒"
 
-#: ../pidgin/gtkblist.c:3735
+#: ../pidgin/gtkblist.c:3754
 msgid "By log size"
 msgstr "靘扳亥憭批"
 
-#: ../pidgin/gtkblist.c:3937 ../pidgin/gtkconn.c:178
+#: ../pidgin/gtkblist.c:3956 ../pidgin/gtkconn.c:178
 #, c-format
 msgid "%s disconnected"
 msgstr "%s 蝯蝺"
 
-#: ../pidgin/gtkblist.c:3947
+#: ../pidgin/gtkblist.c:3966
 msgid "Re-enable Account"
 msgstr "啣撣唾"
 
-#: ../pidgin/gtkblist.c:3968
+#: ../pidgin/gtkblist.c:3990
 #, c-format
 msgid "<span color=\"red\">%s disconnected: %s</span>"
 msgstr "<span color=\"red\">%s 蝯蝺嚗%s</span>"
 
-#: ../pidgin/gtkblist.c:4121
+#: ../pidgin/gtkblist.c:4142
 msgid "<b>Username:</b>"
 msgstr "<b>雿輻刻蝔梧</b>"
 
-#: ../pidgin/gtkblist.c:4128
+#: ../pidgin/gtkblist.c:4149
 msgid "<b>Password:</b>"
 msgstr "<b>撖蝣潘</b>"
 
-#: ../pidgin/gtkblist.c:4139
+#: ../pidgin/gtkblist.c:4160
 msgid "_Login"
 msgstr "餃(_L)"
 
-#: ../pidgin/gtkblist.c:4224
+#: ../pidgin/gtkblist.c:4245
 msgid "/Accounts"
 msgstr "/撣唾"
 
 #. Translators: Please maintain the use of -> and <- to refer to menu heirarchy
-#: ../pidgin/gtkblist.c:4238
+#: ../pidgin/gtkblist.c:4259
 #, c-format
 msgid ""
 "<span weight='bold' size='larger'>Welcome to %s!</span>\n"
@@ -11996,23 +12079,23 @@
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: ../pidgin/gtkblist.c:4483
+#: ../pidgin/gtkblist.c:4505
 msgid "/Buddies/Show Offline Buddies"
 msgstr "/憟賢/憿舐內Y憟賢"
 
-#: ../pidgin/gtkblist.c:4486
+#: ../pidgin/gtkblist.c:4508
 msgid "/Buddies/Show Empty Groups"
 msgstr "/憟賢/憿舐內蝛箇憟賜蝢斤"
 
-#: ../pidgin/gtkblist.c:4492
+#: ../pidgin/gtkblist.c:4514
 msgid "/Buddies/Show Buddy Details"
 msgstr "/憟賢/憿舐內憟賢蝝啁"
 
-#: ../pidgin/gtkblist.c:4495
+#: ../pidgin/gtkblist.c:4517
 msgid "/Buddies/Show Idle Times"
 msgstr "/憟賢/憿舐內蝵格"
 
-#: ../pidgin/gtkblist.c:5333
+#: ../pidgin/gtkblist.c:5367
 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. "
@@ -12021,66 +12104,66 @@
 "隢頛詨交冽唾亙末撣唾典臭誑粹憟賢閮剖亙梁迂嚗閮剖撠"
 "典末皜桐葉憿舐內\n"
 
-#: ../pidgin/gtkblist.c:5393 ../pidgin/gtkblist.c:5754
+#: ../pidgin/gtkblist.c:5427 ../pidgin/gtkblist.c:5788
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:554
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:307
 msgid "Group:"
 msgstr "蝢斤嚗"
 
-#: ../pidgin/gtkblist.c:5652
+#: ../pidgin/gtkblist.c:5686
 msgid "This protocol does not support chat rooms."
 msgstr "閮摰銝舀渲憭拙恕"
 
-#: ../pidgin/gtkblist.c:5668
+#: ../pidgin/gtkblist.c:5702
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
 msgstr "其蒂芰餃乩遙雿銝臭典亥憭拙恕閮摰"
 
-#: ../pidgin/gtkblist.c:5709
+#: ../pidgin/gtkblist.c:5743
 msgid ""
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
 msgstr "隢頛詨亙亙嚗潭冽喳亙末皜桃憭拙恕拍嗉閮\n"
 
-#: ../pidgin/gtkblist.c:5792
+#: ../pidgin/gtkblist.c:5826
 msgid "Please enter the name of the group to be added."
 msgstr "隢蝯行冽啣蝢斤頛詨亙蝔晞"
 
 # XXX
-#: ../pidgin/gtkblist.c:6432
+#: ../pidgin/gtkblist.c:6466
 msgid "<PurpleMain>/Accounts/"
 msgstr "<PurpleMain>/撣唾/"
 
-#: ../pidgin/gtkblist.c:6456
+#: ../pidgin/gtkblist.c:6490
 msgid "_Edit Account"
 msgstr "蝺刻摩撣唾(_E)"
 
 #  NOTE 銝胯銝閮晞胯瘝嚗撠文嗆臬冽啁璅∠賊隞扎皜殷
 #  NOTE 霅舀銝閮晞撣豢
-#: ../pidgin/gtkblist.c:6469 ../pidgin/gtkconv.c:2900
+#: ../pidgin/gtkblist.c:6503 ../pidgin/gtkconv.c:2923
 msgid "No actions available"
 msgstr "瘝賊隞"
 
 # #NOTE 銝銝Enable Account撠
-#: ../pidgin/gtkblist.c:6477
+#: ../pidgin/gtkblist.c:6511
 msgid "_Disable"
 msgstr "典董(_D)"
 
-#: ../pidgin/gtkblist.c:6489
+#: ../pidgin/gtkblist.c:6523
 msgid "Enable Account"
 msgstr "撣唾"
 
 # XXX
-#: ../pidgin/gtkblist.c:6495
+#: ../pidgin/gtkblist.c:6529
 msgid "<PurpleMain>/Accounts/Enable Account"
 msgstr "<PurpleMain>/撣唾/撣唾"
 
-#: ../pidgin/gtkblist.c:6544
+#: ../pidgin/gtkblist.c:6578
 msgid "/Tools"
 msgstr "/撌亙"
 
-#: ../pidgin/gtkblist.c:6614
+#: ../pidgin/gtkblist.c:6648
 msgid "/Buddies/Sort Buddies"
 msgstr "/憟賢/憟賢皜格摨"
 
@@ -12095,209 +12178,209 @@
 "%s\n"
 "冽冽湔迤航炊銝阡啣撣唾嚗%s 撠銝閰西圈蝺"
 
-#: ../pidgin/gtkconv.c:782 ../pidgin/gtkconv.c:808
+#: ../pidgin/gtkconv.c:788 ../pidgin/gtkconv.c:814
 msgid "That buddy is not on the same protocol as this chat."
 msgstr "閰脣憟賢憭拐蒂雿輻典銝蝔桃閮摰"
 
 # XXX 怨陌
-#: ../pidgin/gtkconv.c:802
+#: ../pidgin/gtkconv.c:808
 msgid ""
 "You are not currently signed on with an account that can invite that buddy."
 msgstr "其蒂芰餃乩遙雿銝臭券隢芸憟賢閮摰"
 
-#: ../pidgin/gtkconv.c:855
+#: ../pidgin/gtkconv.c:861
 msgid "Invite Buddy Into Chat Room"
 msgstr "隢憟賢脣亥憭拙恕"
 
 #. Put our happy label in it.
-#: ../pidgin/gtkconv.c:885
+#: ../pidgin/gtkconv.c:891
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
 msgstr "隢頛詨交冽喲隢雿輻刻蝔梧隞亙隢閮胯"
 
-#: ../pidgin/gtkconv.c:906
+#: ../pidgin/gtkconv.c:912
 msgid "_Buddy:"
 msgstr "憟賢(_B)嚗"
 
-#: ../pidgin/gtkconv.c:926 ../pidgin/gtksavedstatuses.c:1142
+#: ../pidgin/gtkconv.c:932 ../pidgin/gtksavedstatuses.c:1142
 #: ../pidgin/gtksavedstatuses.c:1478
 msgid "_Message:"
 msgstr "閮(_M)嚗"
 
-#: ../pidgin/gtkconv.c:983 ../pidgin/gtkconv.c:2476 ../pidgin/gtkdebug.c:218
+#: ../pidgin/gtkconv.c:989 ../pidgin/gtkconv.c:2499 ../pidgin/gtkdebug.c:217
 #: ../pidgin/gtkft.c:542
 msgid "Unable to open file."
 msgstr "⊥瑼獢"
 
-#: ../pidgin/gtkconv.c:989
+#: ../pidgin/gtkconv.c:995
 #, c-format
 msgid "<h1>Conversation with %s</h1>\n"
 msgstr "<h1> %s 鈭方</h1>\n"
 
-#: ../pidgin/gtkconv.c:1013
+#: ../pidgin/gtkconv.c:1031
 msgid "Save Conversation"
 msgstr "脣憭拙批捆"
 
-#: ../pidgin/gtkconv.c:1162 ../pidgin/gtkdebug.c:166 ../pidgin/gtkdebug.c:758
+#: ../pidgin/gtkconv.c:1180 ../pidgin/gtkdebug.c:165 ../pidgin/gtkdebug.c:741
 msgid "Find"
 msgstr "撠"
 
-#: ../pidgin/gtkconv.c:1188 ../pidgin/gtkdebug.c:194
+#: ../pidgin/gtkconv.c:1206 ../pidgin/gtkdebug.c:193
 msgid "_Search for:"
 msgstr "撠(_S)嚗"
 
-#: ../pidgin/gtkconv.c:1340
+#: ../pidgin/gtkconv.c:1358
 msgid "Logging started. Future messages in this conversation will be logged."
 msgstr "亥蝟餌絞芯券鈭方銝剔閮舫賢鋡怨潭亥銝准"
 
-#: ../pidgin/gtkconv.c:1348
+#: ../pidgin/gtkconv.c:1366
 msgid ""
 "Logging stopped. Future messages in this conversation will not be logged."
 msgstr "亥蝟餌絞芯券鈭方銝剔閮舫賢銝鋡怨潭亥銝准"
 
-#: ../pidgin/gtkconv.c:1596
+#: ../pidgin/gtkconv.c:1614
 msgid "Un-Ignore"
 msgstr "瘨敹賜乩蝙刻"
 
 #  NOTEIgnore霅胯敹賜乩蝙刻嚗雿 gtkprefs.c 銝剔Ignore
 #  NOTE 銋敹賜交澆嚗芾質陌敹賜乓
-#: ../pidgin/gtkconv.c:1599
+#: ../pidgin/gtkconv.c:1617
 msgid "Ignore"
 msgstr "敹賜"
 
-#: ../pidgin/gtkconv.c:1619
+#: ../pidgin/gtkconv.c:1637
 msgid "Get Away Message"
 msgstr "敺a閮"
 
-#: ../pidgin/gtkconv.c:1642
+#: ../pidgin/gtkconv.c:1660
 msgid "Last said"
 msgstr "銝甈⊥"
 
-#: ../pidgin/gtkconv.c:2484
+#: ../pidgin/gtkconv.c:2507
 msgid "Unable to save icon file to disk."
 msgstr "⊥脣蝷箸獢喟蝣銝"
 
-#: ../pidgin/gtkconv.c:2535
+#: ../pidgin/gtkconv.c:2558
 msgid "Save Icon"
 msgstr "脣蝷"
 
-#: ../pidgin/gtkconv.c:2587
+#: ../pidgin/gtkconv.c:2610
 msgid "Animate"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:2592
+#: ../pidgin/gtkconv.c:2615
 msgid "Hide Icon"
 msgstr "梯蝷"
 
 #  NOTE 爹ight-Click蝷箸憿舐內隞歹霅胯As箝箝敺憟
-#: ../pidgin/gtkconv.c:2595
+#: ../pidgin/gtkconv.c:2618
 msgid "Save Icon As..."
 msgstr "脣蝷..."
 
-#: ../pidgin/gtkconv.c:2599
+#: ../pidgin/gtkconv.c:2622
 msgid "Set Custom Icon..."
 msgstr "芸蝷..."
 
-#: ../pidgin/gtkconv.c:2612
+#: ../pidgin/gtkconv.c:2635
 msgid "Remove Custom Icon"
 msgstr "蝘駁方芸蝷"
 
 #. Conversation menu
-#: ../pidgin/gtkconv.c:2754
+#: ../pidgin/gtkconv.c:2777
 msgid "/_Conversation"
 msgstr "/鈭方(_C)"
 
-#: ../pidgin/gtkconv.c:2756
+#: ../pidgin/gtkconv.c:2779
 msgid "/Conversation/New Instant _Message..."
 msgstr "/憟賢/啣單閮(_M)..."
 
-#: ../pidgin/gtkconv.c:2761
+#: ../pidgin/gtkconv.c:2784
 msgid "/Conversation/_Find..."
 msgstr "/鈭方/撠(_F)..."
 
-#: ../pidgin/gtkconv.c:2763
+#: ../pidgin/gtkconv.c:2786
 msgid "/Conversation/View _Log"
 msgstr "/鈭方/閫甇瑕脰(_L)"
 
-#: ../pidgin/gtkconv.c:2764
+#: ../pidgin/gtkconv.c:2787
 msgid "/Conversation/_Save As..."
 msgstr "/鈭方/血唳(_S)..."
 
-#: ../pidgin/gtkconv.c:2766
+#: ../pidgin/gtkconv.c:2789
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/鈭方/皜蝛箔漱隢批捆(_R)"
 
-#: ../pidgin/gtkconv.c:2770
+#: ../pidgin/gtkconv.c:2793
 msgid "/Conversation/Se_nd File..."
 msgstr "/鈭方/喲瑼獢(_N)..."
 
-#: ../pidgin/gtkconv.c:2771
+#: ../pidgin/gtkconv.c:2794
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/鈭方/啣憟賢(_P)..."
 
-#: ../pidgin/gtkconv.c:2773
+#: ../pidgin/gtkconv.c:2796
 msgid "/Conversation/_Get Info"
 msgstr "/鈭方/敺鞈閮(_G)"
 
-#: ../pidgin/gtkconv.c:2775
+#: ../pidgin/gtkconv.c:2798
 msgid "/Conversation/In_vite..."
 msgstr "/鈭方/隢(_V)..."
 
-#: ../pidgin/gtkconv.c:2777
+#: ../pidgin/gtkconv.c:2800
 msgid "/Conversation/M_ore"
 msgstr "/鈭方/游(_O)"
 
-#: ../pidgin/gtkconv.c:2781
+#: ../pidgin/gtkconv.c:2804
 msgid "/Conversation/Al_ias..."
 msgstr "/鈭方/亙(_I)..."
 
-#: ../pidgin/gtkconv.c:2783
+#: ../pidgin/gtkconv.c:2806
 msgid "/Conversation/_Block..."
 msgstr "/鈭方/撠(_B)..."
 
-#: ../pidgin/gtkconv.c:2785
+#: ../pidgin/gtkconv.c:2808
 msgid "/Conversation/_Unblock..."
 msgstr "/鈭方/閫文(_B)..."
 
-#: ../pidgin/gtkconv.c:2787
+#: ../pidgin/gtkconv.c:2810
 msgid "/Conversation/_Add..."
 msgstr "/鈭方/啣(_A)..."
 
-#: ../pidgin/gtkconv.c:2789
+#: ../pidgin/gtkconv.c:2812
 msgid "/Conversation/_Remove..."
 msgstr "/鈭方/蝘駁(_R)..."
 
-#: ../pidgin/gtkconv.c:2794
+#: ../pidgin/gtkconv.c:2817
 msgid "/Conversation/_Close"
 msgstr "/鈭方/(_C)"
 
 #. Options
-#: ../pidgin/gtkconv.c:2798
+#: ../pidgin/gtkconv.c:2821
 msgid "/_Options"
 msgstr "/賊(_O)"
 
-#: ../pidgin/gtkconv.c:2799
+#: ../pidgin/gtkconv.c:2822
 msgid "/Options/Enable _Logging"
 msgstr "/賊/憪閮亥(_L)"
 
-#: ../pidgin/gtkconv.c:2800
+#: ../pidgin/gtkconv.c:2823
 msgid "/Options/Enable _Sounds"
 msgstr "/賊/單(_S)"
 
-#: ../pidgin/gtkconv.c:2801
+#: ../pidgin/gtkconv.c:2824
 msgid "/Options/Show Buddy _Icon"
 msgstr "/賊/憿舐內憟賢蝷(_I)"
 
-#: ../pidgin/gtkconv.c:2803
+#: ../pidgin/gtkconv.c:2826
 msgid "/Options/Show Formatting _Toolbars"
 msgstr "/賊/憿舐內澆撌亙瑕(_T)"
 
-#: ../pidgin/gtkconv.c:2804
+#: ../pidgin/gtkconv.c:2827
 msgid "/Options/Show Ti_mestamps"
 msgstr "/賊/憿舐內唾(_M)"
 
-#: ../pidgin/gtkconv.c:2879
+#: ../pidgin/gtkconv.c:2902
 msgid "/Conversation/More"
 msgstr "/鈭方/游"
 
@@ -12306,234 +12389,234 @@
 #. 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:2924 ../pidgin/gtkconv.c:2956
+#: ../pidgin/gtkconv.c:2947 ../pidgin/gtkconv.c:2979
 msgid "/Conversation"
 msgstr "/鈭方"
 
-#: ../pidgin/gtkconv.c:2964
+#: ../pidgin/gtkconv.c:2987
 msgid "/Conversation/View Log"
 msgstr "/鈭方/閫甇瑕脰"
 
-#: ../pidgin/gtkconv.c:2970
+#: ../pidgin/gtkconv.c:2993
 msgid "/Conversation/Send File..."
 msgstr "/鈭方/喲瑼獢..."
 
-#: ../pidgin/gtkconv.c:2974
+#: ../pidgin/gtkconv.c:2997
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/鈭方/啣憟賢..."
 
-#: ../pidgin/gtkconv.c:2980
+#: ../pidgin/gtkconv.c:3003
 msgid "/Conversation/Get Info"
 msgstr "/鈭方/敺鞈閮"
 
-#: ../pidgin/gtkconv.c:2984
+#: ../pidgin/gtkconv.c:3007
 msgid "/Conversation/Invite..."
 msgstr "/鈭方/隢..."
 
-#: ../pidgin/gtkconv.c:2990
+#: ../pidgin/gtkconv.c:3013
 msgid "/Conversation/Alias..."
 msgstr "/鈭方/亙..."
 
-#: ../pidgin/gtkconv.c:2994
+#: ../pidgin/gtkconv.c:3017
 msgid "/Conversation/Block..."
 msgstr "/鈭方/撠..."
 
-#: ../pidgin/gtkconv.c:2998
+#: ../pidgin/gtkconv.c:3021
 msgid "/Conversation/Unblock..."
 msgstr "/鈭方/閫文..."
 
-#: ../pidgin/gtkconv.c:3002
+#: ../pidgin/gtkconv.c:3025
 msgid "/Conversation/Add..."
 msgstr "/鈭方/啣..."
 
-#: ../pidgin/gtkconv.c:3006
+#: ../pidgin/gtkconv.c:3029
 msgid "/Conversation/Remove..."
 msgstr "/鈭方/蝘駁..."
 
-#: ../pidgin/gtkconv.c:3010
+#: ../pidgin/gtkconv.c:3033
 msgid "/Options/Enable Logging"
 msgstr "/賊/憪閮亥"
 
-#: ../pidgin/gtkconv.c:3013
+#: ../pidgin/gtkconv.c:3036
 msgid "/Options/Enable Sounds"
 msgstr "/賊/單"
 
-#: ../pidgin/gtkconv.c:3026
+#: ../pidgin/gtkconv.c:3049
 msgid "/Options/Show Formatting Toolbars"
 msgstr "/賊/憿舐內澆撌亙瑕"
 
-#: ../pidgin/gtkconv.c:3029
+#: ../pidgin/gtkconv.c:3052
 msgid "/Options/Show Timestamps"
 msgstr "/賊/憿舐內唾"
 
-#: ../pidgin/gtkconv.c:3032
+#: ../pidgin/gtkconv.c:3055
 msgid "/Options/Show Buddy Icon"
 msgstr "/賊/憿舐內憟賢蝷"
 
-#: ../pidgin/gtkconv.c:3116 ../pidgin/gtkconv.c:3156
+#: ../pidgin/gtkconv.c:3139 ../pidgin/gtkconv.c:3181
 msgid "User is typing..."
-msgstr "雿輻刻甇刻撓..."
-
-#: ../pidgin/gtkconv.c:3159
+msgstr "撠寞迤刻撓..."
+
+#: ../pidgin/gtkconv.c:3184
 msgid "User has typed something and stopped"
-msgstr "雿輻刻頛詨乩銝鈭梯正嚗銝怠鈭"
+msgstr "撠寡撓乩銝鈭梯正嚗銝怠鈭"
 
 #. Build the Send To menu
-#: ../pidgin/gtkconv.c:3341
+#: ../pidgin/gtkconv.c:3366
 msgid "_Send To"
 msgstr "喲(_S)"
 
-#: ../pidgin/gtkconv.c:4049
+#: ../pidgin/gtkconv.c:4080
 msgid "_Send"
 msgstr "喲(_S)"
 
 #. Setup the label telling how many people are in the room.
-#: ../pidgin/gtkconv.c:4197
+#: ../pidgin/gtkconv.c:4229
 msgid "0 people in room"
 msgstr "瘝鈭箏券輸"
 
-#: ../pidgin/gtkconv.c:5371 ../pidgin/gtkconv.c:5492
+#: ../pidgin/gtkconv.c:5421 ../pidgin/gtkconv.c:5542
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "%d 鈭箏券輸"
 msgstr[1] "%d 鈭箏券輸"
 
-#: ../pidgin/gtkconv.c:6048 ../pidgin/gtkstatusbox.c:657
+#: ../pidgin/gtkconv.c:6108 ../pidgin/gtkstatusbox.c:657
 msgid "Typing"
 msgstr "頛詨乩葉"
 
-#: ../pidgin/gtkconv.c:6054
+#: ../pidgin/gtkconv.c:6114
 msgid "Stopped Typing"
 msgstr "甇Z撓"
 
-#: ../pidgin/gtkconv.c:6059
+#: ../pidgin/gtkconv.c:6119
 msgid "Nick Said"
 msgstr "梁迂鋡急"
 
-#: ../pidgin/gtkconv.c:6064 ../pidgin/gtkdocklet.c:511
+#: ../pidgin/gtkconv.c:6124 ../pidgin/gtkdocklet.c:492
 msgid "Unread Messages"
 msgstr "芾閮"
 
-#: ../pidgin/gtkconv.c:6069
+#: ../pidgin/gtkconv.c:6129
 msgid "New Event"
 msgstr "唬隞"
 
-#: ../pidgin/gtkconv.c:7196
+#: ../pidgin/gtkconv.c:7258
 msgid "Confirm close"
 msgstr "蝣箄"
 
-#: ../pidgin/gtkconv.c:7228
+#: ../pidgin/gtkconv.c:7290
 msgid "You have unread messages. Are you sure you want to close the window?"
 msgstr "券芾閮胯函Ⅱ摰閬閬蝒嚗"
 
-#: ../pidgin/gtkconv.c:7763
+#: ../pidgin/gtkconv.c:7807
 msgid "Close other tabs"
 msgstr "嗡"
 
-#: ../pidgin/gtkconv.c:7769
+#: ../pidgin/gtkconv.c:7813
 msgid "Close all tabs"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:7777
+#: ../pidgin/gtkconv.c:7821
 msgid "Detach this tab"
 msgstr "a"
 
-#: ../pidgin/gtkconv.c:7783
+#: ../pidgin/gtkconv.c:7827
 msgid "Close this tab"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:8086
+#: ../pidgin/gtkconv.c:8211
 msgid "Close conversation"
 msgstr "鈭方"
 
-#: ../pidgin/gtkconv.c:8550
+#: ../pidgin/gtkconv.c:8732
 msgid "Last created window"
 msgstr "銝銝閬蝒"
 
-#: ../pidgin/gtkconv.c:8552
+#: ../pidgin/gtkconv.c:8734
 msgid "Separate IM and Chat windows"
 msgstr "隞乩閬蝒憿舐內單閮臬憭"
 
-#: ../pidgin/gtkconv.c:8554 ../pidgin/gtkprefs.c:1303
+#: ../pidgin/gtkconv.c:8736 ../pidgin/gtkprefs.c:1303
 msgid "New window"
 msgstr "啗蝒"
 
-#: ../pidgin/gtkconv.c:8556
+#: ../pidgin/gtkconv.c:8738
 msgid "By group"
 msgstr "靘蝢斤"
 
-#: ../pidgin/gtkconv.c:8558
+#: ../pidgin/gtkconv.c:8740
 msgid "By account"
 msgstr "靘撣唾"
 
 #  NOTE日舀亥敺迎日舐頛嚗銝撌脩鈭箇
-#: ../pidgin/gtkdebug.c:233
+#: ../pidgin/gtkdebug.c:232
 msgid "Save Debug Log"
 msgstr "脣日舐"
 
 # NOTE 航賣舀詨
-#: ../pidgin/gtkdebug.c:596
+#: ../pidgin/gtkdebug.c:580
 msgid "Invert"
 msgstr ""
 
 # XXX TODO 撣貉剜Highlight霅舀擃鈭桀漲嚗雿霅舀臭誑寥 - Ambrose 20061029
-#: ../pidgin/gtkdebug.c:599
+#: ../pidgin/gtkdebug.c:583
 msgid "Highlight matches"
 msgstr "璅蝷箏寥摮銝"
 
 #  NOTE 日航蝒撌亙瑕敹怠詨桃隞歹撌亙瑕蝝隞亙蝷箸蝷箝嚗銝鈭
-#: ../pidgin/gtkdebug.c:666
+#: ../pidgin/gtkdebug.c:650
 msgid "_Icon Only"
 msgstr "憿舐內蝷(_I)"
 
-#: ../pidgin/gtkdebug.c:667
+#: ../pidgin/gtkdebug.c:651
 msgid "_Text Only"
 msgstr "憿舐內摮(_T)"
 
-#: ../pidgin/gtkdebug.c:668
+#: ../pidgin/gtkdebug.c:652
 msgid "_Both Icon & Text"
 msgstr "憿舐內蝷箏摮(_B)"
 
-#: ../pidgin/gtkdebug.c:804
+#: ../pidgin/gtkdebug.c:773
 msgid "Filter"
 msgstr "瞈曉"
 
-#: ../pidgin/gtkdebug.c:823
+#: ../pidgin/gtkdebug.c:792
 msgid "Right click for more options."
 msgstr "喲萎誑憿舐內游賊"
 
 # TODO 閬閬 - 20061025
-#: ../pidgin/gtkdebug.c:853
+#: ../pidgin/gtkdebug.c:822
 msgid "Level "
 msgstr "瞈曄摨 "
 
-#: ../pidgin/gtkdebug.c:854 ../pidgin/gtkdebug.c:860
+#: ../pidgin/gtkdebug.c:823 ../pidgin/gtkdebug.c:829
 msgid "Select the debug filter level."
 msgstr "豢日航舐瞈曄摨艾"
 
 # TODO 閬閬 - 20061025
-#: ../pidgin/gtkdebug.c:862
+#: ../pidgin/gtkdebug.c:831
 msgid "All"
 msgstr "券刻"
 
 # NOTE 銝舀Info嚗箏歇蝬Info銝嚗嚗臭蝔格Info閬雿撅斗活日航荔舀Debug
-#: ../pidgin/gtkdebug.c:863
+#: ../pidgin/gtkdebug.c:832
 msgid "Misc"
 msgstr "閮"
 
 # TODO 閬閬 - 20061025
-#: ../pidgin/gtkdebug.c:865
+#: ../pidgin/gtkdebug.c:834
 msgid "Warning"
 msgstr "霅血閮"
 
 # TODO 閬閬 - 20061025
-#: ../pidgin/gtkdebug.c:866
+#: ../pidgin/gtkdebug.c:835
 msgid "Error "
 msgstr "航炊閮"
 
 # TODO 閬閬 - 20061025
-#: ../pidgin/gtkdebug.c:867
+#: ../pidgin/gtkdebug.c:836
 msgid "Fatal Error"
 msgstr "湧航炊閮"
 
@@ -12582,14 +12665,14 @@
 msgstr "蝔撘蝺典神潭摰豢 [甇餅園狩]"
 
 #: ../pidgin/gtkdialogs.c:115
-msgid "Jabber developer"
-msgstr "Jabber 潸"
+msgid "XMPP developer"
+msgstr "XMPP 潸"
 
 #: ../pidgin/gtkdialogs.c:116
 msgid "original author"
 msgstr "雿"
 
-#  NOTE 霅舀摰其蝯曹嚗靘嗡 open source project靘嚗芣拐嚗霅舀瑁剜
+#  NOTE 閬 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=A
 #: ../pidgin/gtkdialogs.c:123
 msgid "Afrikaans"
 msgstr "瑁剜"
@@ -12608,11 +12691,13 @@
 msgid "Bengali"
 msgstr "摮"
 
-# NOTE 皜航陌瘜X臬側鈭
+# NOTE 閬 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=B&page=2
+# NOTE 皜航陌瘜X臬側鈭嚗唬祈陌瘜Wㄚ撠潔
 #: ../pidgin/gtkdialogs.c:131
 msgid "Bosnian"
-msgstr "瘜Wㄚ撠潔"
-
+msgstr "瘜W撠潔"
+
+#  NOTE 閬 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=C
 #: ../pidgin/gtkdialogs.c:132 ../pidgin/gtkdialogs.c:210
 #: ../pidgin/gtkdialogs.c:211
 msgid "Catalan"
@@ -12637,6 +12722,7 @@
 msgstr "敺瑟"
 
 # NOTE 胯銝銝嫘嚗銝剛陌靘銝靘隤
+# NOTE 閬 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=D
 #: ../pidgin/gtkdialogs.c:140 ../pidgin/gtkdialogs.c:141
 #: ../pidgin/gtkdialogs.c:142
 msgid "Dzongkha"
@@ -12689,21 +12775,28 @@
 msgid "French"
 msgstr "瘜"
 
+#  NOTE 閬 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=G&page=1
 #: ../pidgin/gtkdialogs.c:157
 msgid "Galician"
 msgstr "镼蹂"
 
+#  NOTE 閬 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=G&page=2
 #: ../pidgin/gtkdialogs.c:158 ../pidgin/gtkdialogs.c:159
 msgid "Gujarati"
 msgstr "文寞"
 
+#: ../pidgin/gtkdialogs.c:159
+msgid "Gujarati Language Team"
+msgstr "文寞蝧餉陌撠蝯"
+
 #: ../pidgin/gtkdialogs.c:160 ../pidgin/gtkdialogs.c:224
 msgid "Hebrew"
 msgstr "撣隡臭"
 
+#  NOTE 閬 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=H
 #: ../pidgin/gtkdialogs.c:161
 msgid "Hindi"
-msgstr "啣漲"
+msgstr "啣漲"
 
 #: ../pidgin/gtkdialogs.c:162
 msgid "Hungarian"
@@ -12717,9 +12810,10 @@
 #  NOTE 隤餉脖圈踝撱梯店抵脣餌詨榆箇蝬脩撖怒憭批押嚗
 #  NOTE 箇銝剖詨憿瘜鈭行憭批押璇嚗霅胯憭批押閰脫頛憟賬
 #  NOTE閬Slovenian
+#  NOTE 閮鳴 zh_TW  zh_HK 甇撘摰塚啣霅舀蝢拙之押
 #: ../pidgin/gtkdialogs.c:164 ../pidgin/gtkdialogs.c:225
 msgid "Italian"
-msgstr "憭批拇"
+msgstr "蝢拙之拇"
 
 #: ../pidgin/gtkdialogs.c:165 ../pidgin/gtkdialogs.c:226
 #: ../pidgin/gtkdialogs.c:227 ../pidgin/gtkdialogs.c:228
@@ -12730,20 +12824,31 @@
 msgid "Georgian"
 msgstr "祆祥鈭"
 
-# NOTE: 涔DE霅舀嚗銋閬澆啁憭批飛蝬脩 :P
+# FIXME 臭誑霅臬末銝暺 20070520 acli
+#: ../pidgin/gtkdialogs.c:166
+msgid "Ubuntu Georgian Translators"
+msgstr "Ubuntu 銝祆祥鈭蝧餉陌鈭箏"
+
+# NOTE 閬 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=K
+# NOTE 閮鳴KDE 霅胯蝝
 #: ../pidgin/gtkdialogs.c:167
 msgid "Kannada"
-msgstr "蝝"
+msgstr "摨瑞"
+
+#: ../pidgin/gtkdialogs.c:167
+msgid "Kannada Translation team"
+msgstr "摨瑞蝧餉陌撠蝯"
 
 #: ../pidgin/gtkdialogs.c:168 ../pidgin/gtkdialogs.c:230
 msgid "Korean"
 msgstr ""
 
-# NOTE 啗陌摨怠噸嚗皜航陌摨怎曉噸嚗雿啁踹銋具摨怎曉噸嚗摨怎曉噸頛憟
+#  NOTE 皜航陌芣摨怎曉噸嚗啗陌摨怠噸嚗璅皞霅舀嚗靘鈭西撣貉嚗摨怎曉噸
+#  NOTE 閮鳴 zh_TW  zh_HK 甇撘摰塚靽啣霅舀摨怠噸
 #: ../pidgin/gtkdialogs.c:169 ../pidgin/gtkdialogs.c:170
 #: ../pidgin/gtkdialogs.c:171
 msgid "Kurdish"
-msgstr "摨怎曉噸"
+msgstr "摨怠噸"
 
 #: ../pidgin/gtkdialogs.c:172 ../pidgin/gtkdialogs.c:231
 #: ../pidgin/gtkdialogs.c:232
@@ -12759,10 +12864,10 @@
 #  NOTE 唾陌穿擐祉整瘜W暺整撣怎整撌游
 #  NOTE 嗡霅舀穿銝寥漸嚗芸嚗憭扯梁曄嚗銝寥漸撘芸嚗蝬剖箇曄嚗望芸璅皞芸嚗找舀皞嚗憭 :P嚗
 #  NOTE 霅舫喃祆曉具芸敺砍憫改銋銝冽砍憫霅舫單曉具芸銋
-#  XXX 急霅舀芸撣怎暹
+#  NOTE ∠具璅皞銝閰嚗閬 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=N&page=2
 #: ../pidgin/gtkdialogs.c:174
 msgid "Bokm疇l Norwegian"
-msgstr "芸撣怎暹"
+msgstr "璅皞芸"
 
 #: ../pidgin/gtkdialogs.c:175
 msgid "Nepali"
@@ -12774,9 +12879,10 @@
 msgid "Dutch, Flemish"
 msgstr "瑁剜嚗瘜剖噸舀"
 
+#  NOTE 胯nn蝣潘喋Nynorsk Norwegian嚗隞亦渲陌芸銝虫啁
 #: ../pidgin/gtkdialogs.c:177
 msgid "Norwegian"
-msgstr "芸"
+msgstr "唳芸"
 
 #: ../pidgin/gtkdialogs.c:178 ../pidgin/gtkdialogs.c:179
 #: ../pidgin/gtkdialogs.c:180 ../pidgin/gtkdialogs.c:233
@@ -12791,10 +12897,11 @@
 msgid "Portuguese-Brazil"
 msgstr "撌渲正"
 
-#  XXX 憭批飛隢霅舀
+#  NOTE桐其圈賜靘航甇撣貊霅舀
+#  NOTE 閬 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=P&page=2
 #: ../pidgin/gtkdialogs.c:183
 msgid "Pashto"
-msgstr "撌湔臬 (Pashto)"
+msgstr "桐"
 
 #: ../pidgin/gtkdialogs.c:184
 msgid "Romanian"
@@ -12831,14 +12938,16 @@
 msgid "Swedish"
 msgstr "豢"
 
-# NOTE 皜航陌瘜啁掖整
+# NOTE 閬 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=T
+# NOTE 皜臭祈陌瘜啁掖整嚗唬祈陌憛蝐喟整嚗靘頛撣貉嚗瘜啁掖整
 #: ../pidgin/gtkdialogs.c:193
 msgid "Tamil"
-msgstr "憛蝐喟暹"
-
+msgstr "衣掖暹"
+
+# NOTE 閬 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=T
 #: ../pidgin/gtkdialogs.c:194
 msgid "Telugu"
-msgstr "寥陌箸"
+msgstr "敺瑟憡"
 
 #: ../pidgin/gtkdialogs.c:195
 msgid "Thai"
@@ -12869,7 +12978,7 @@
 msgid "Traditional Chinese"
 msgstr "甇擃銝剜"
 
-# XXX Yahoo霅舀
+# NOTE 閬 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=A
 #: ../pidgin/gtkdialogs.c:208
 msgid "Amharic"
 msgstr "踹"
@@ -12879,115 +12988,118 @@
 msgid "About %s"
 msgstr " %s"
 
-#: ../pidgin/gtkdialogs.c:363
-#, c-format
-msgid ""
-"%s is a modular messaging client capable of using AIM, MSN, Yahoo!, Jabber, "
-"ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, Bonjour, "
-"Zephyr, Gadu-Gadu, and QQ all at once.  It is written using GTK+.<BR><BR>You "
-"may modify and redistribute the program under the terms of the GPL (version "
-"2 or later).  A copy of the GPL is contained in the 'COPYING' file "
-"distributed with %s.  %s is copyrighted by its contributors.  See the "
-"'COPYRIGHT' file for the complete list of contributors.  We provide no "
-"warranty for this program.<BR><BR>"
-msgstr ""
-"%s 靽銝隞 GTK+ 潛璅∠閮舐撘嚗靘 AIMMSNYahoo!Jabber"
-"ICQIRCSILCSIP/SIMPLENovell GroupWiseLotus SametimeBonjour"
-"ZephyrGadu-Gadu  QQ 蝑賬<BR><BR>交典靽格寞潔蝔撘嚗芷"
-" GPL嚗蝚砌隞颱隞亙穿璇甈曉喳荔%s 批歇銝隞 GPL, 園典"
-"COPYING瑼獢銋扼%s 靽甈雿嚗甈甇詨券刻甜餉勗嚗鞎Y餉"
-"閰喳典箝COPYRIGHT瑼獢扼祉撘銝靘隞颱靽具<BR><BR>"
-
-#: ../pidgin/gtkdialogs.c:378
+#: ../pidgin/gtkdialogs.c:365
+#, c-format
+msgid ""
+"%s is a graphical modular messaging client based on libpurple which is "
+"capable of connecting to AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, "
+"Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, Gadu-Gadu, and QQ all at "
+"once.  It is written using GTK+.<BR><BR>You may modify and redistribute the "
+"program under the terms of the GPL (version 2 or later).  A copy of the GPL "
+"is contained in the 'COPYING' file distributed with %s.  %s is copyrighted "
+"by its contributors.  See the 'COPYRIGHT' file for the complete list of "
+"contributors.  We provide no warranty for this program.<BR><BR>"
+msgstr ""
+"%s 靽銝隞 GTK+ 潘敶VW璅∠閮舐撘嚗隞 libpurple 箏箇嚗"
+"靘 AIMMSNYahoo!XMPPICQIRCSILCSIP/SIMPLENovell GroupWise"
+"Lotus SametimeBonjourZephyrGadu-Gadu  QQ 蝑賬<BR><BR>交典靽"
+"寞潔蝔撘嚗芷 GPL嚗隞餅蝚砌頛啁嗡穿璇甈曉喳荔%s "
+"撌脤銝隞 GPL, 園典箝COPYING瑼獢銋扼%s 靽甈雿嚗甈甇詨"
+"刻甜餉勗嚗鞎Y餉喳閰喳典箝COPYRIGHT瑼獢扼祉撘銝靘隞"
+"雿靽具<BR><BR>"
+
+#: ../pidgin/gtkdialogs.c:381
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin-win32 on irc.freenode.net<BR><BR>"
 msgstr ""
 "<FONT SIZE=\"4\">IRC:</FONT> irc.freenode.net 銝 #pidgin-win32 駁<BR><BR>"
 
-#: ../pidgin/gtkdialogs.c:381
+#: ../pidgin/gtkdialogs.c:384
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin on irc.freenode.net<BR><BR>"
 msgstr ""
 "<FONT SIZE=\"4\">IRC:</FONT> irc.freenode.net 銝 #pidgin 駁<BR><BR>"
 
-#: ../pidgin/gtkdialogs.c:387
+#: ../pidgin/gtkdialogs.c:390
 msgid "Current Developers"
 msgstr "曆遙潸"
 
 # NOTE LSchiere2: wing: it means they must be crazy or they wouldn't work on gaim ;-)
 # NOTE Luke Schierer 隤:鈭鈭箔舐鈭嚗血銝 gaim 鞈
-# NOTE 銝嚗蝧餅梁璅∠雿瘥頛憟
-#: ../pidgin/gtkdialogs.c:402
+# NOTE 隞交迤蝣箇霅舀胯脩璅∠雿璅∠脖銋憿色
+# NOTE 銝璅憟賢暺隞踝隞亦蕃梁璅∠雿瘥頛憟 :P
+#: ../pidgin/gtkdialogs.c:405
 msgid "Crazy Patch Writers"
 msgstr "梁璅∠雿"
 
-#: ../pidgin/gtkdialogs.c:417
+#: ../pidgin/gtkdialogs.c:420
 msgid "Retired Developers"
 msgstr "隞駁潸"
 
-#: ../pidgin/gtkdialogs.c:432
+#  NOTE 航陌蝢撌乩犖∼嚗雿臬靽摰霅舀嚗Pidgin  Artist 臬閮剛蝷箝唳渡隞Y蝑鈭敺撌乩鈭綽隞亙憿舀胯閮剛∼
+#: ../pidgin/gtkdialogs.c:435
 msgid "Artists"
-msgstr "蝢撌乩犖"
-
-#: ../pidgin/gtkdialogs.c:447
+msgstr "撟喲Z身閮"
+
+#: ../pidgin/gtkdialogs.c:450
 msgid "Current Translators"
 msgstr "曆遙霅航"
 
-#: ../pidgin/gtkdialogs.c:467
+#: ../pidgin/gtkdialogs.c:470
 msgid "Past Translators"
 msgstr "隞餉陌"
 
 # NOTE 胯 Pidgin閬蝒銝哨敺箇橘其雿日舐函蝔株閮嚗銝質陌閮胯
-#: ../pidgin/gtkdialogs.c:485
+#: ../pidgin/gtkdialogs.c:488
 msgid "Debugging Information"
 msgstr "日臬刻閮"
 
-#: ../pidgin/gtkdialogs.c:854
+#: ../pidgin/gtkdialogs.c:857
 msgid "Get User Info"
 msgstr "敺雿輻刻鞈閮"
 
-#: ../pidgin/gtkdialogs.c:856
+#: ../pidgin/gtkdialogs.c:859
 msgid ""
 "Please enter the screen name or alias of the person whose info you would "
 "like to view."
 msgstr "隢頛詨交冽唾亥岷撠鞊∠撣唾"
 
-#: ../pidgin/gtkdialogs.c:946
+#: ../pidgin/gtkdialogs.c:949
 msgid "View User Log"
 msgstr "閫雿輻刻亥"
 
-#: ../pidgin/gtkdialogs.c:948
+#: ../pidgin/gtkdialogs.c:951
 msgid ""
 "Please enter the screen name or alias of the person whose log you would like "
 "to view."
 msgstr "隢頛詨交冽唾霈亥雿輻刻撣唾亙"
 
 # XXX 銝剜霅舀⊥亙箝Alias BuddyAlias Contact
-#: ../pidgin/gtkdialogs.c:968
+#: ../pidgin/gtkdialogs.c:971
 msgid "Alias Contact"
 msgstr "粹蝯憟賢銝亙"
 
 # XXX 銝剜霅舀⊥亙箝Alias BuddyAlias Contact
-#: ../pidgin/gtkdialogs.c:969
+#: ../pidgin/gtkdialogs.c:972
 msgid "Enter an alias for this contact."
 msgstr "隢粹蝯憟賢頛詨乩亙"
 
-#: ../pidgin/gtkdialogs.c:991
+#: ../pidgin/gtkdialogs.c:994
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "隢 %s 頛詨乩亙"
 
-#: ../pidgin/gtkdialogs.c:993
+#: ../pidgin/gtkdialogs.c:996
 msgid "Alias Buddy"
 msgstr "粹憟賢銝亙"
 
-#: ../pidgin/gtkdialogs.c:1014
+#: ../pidgin/gtkdialogs.c:1017
 msgid "Alias Chat"
 msgstr "蝯西憭拙恕孵亙"
 
-#: ../pidgin/gtkdialogs.c:1015
+#: ../pidgin/gtkdialogs.c:1018
 msgid "Enter an alias for this chat."
 msgstr "隢粹憭拙恕頛詨乩亙"
 
-#: ../pidgin/gtkdialogs.c:1054
+#: ../pidgin/gtkdialogs.c:1057
 #, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddy from "
@@ -13003,32 +13115,32 @@
 "雿嚗"
 
 # XXXRemove BuddyRemove Contact其葉Pidgin⊥伐航賣寥脩蝛粹
-#: ../pidgin/gtkdialogs.c:1062
+#: ../pidgin/gtkdialogs.c:1065
 msgid "Remove Contact"
 msgstr "蝘駁日蝯憟賢"
 
 # XXXRemove BuddyRemove Contact其葉Pidgin⊥伐航賣寥脩蝛粹
-#: ../pidgin/gtkdialogs.c:1065
+#: ../pidgin/gtkdialogs.c:1068
 msgid "_Remove Contact"
 msgstr "蝘駁方舐窗鈭(_R)"
 
 # TODO 霅舀敺寥 - 20061025
-#: ../pidgin/gtkdialogs.c:1096
+#: ../pidgin/gtkdialogs.c:1099
 #, c-format
 msgid ""
 "You are about to merge the group called %s into the group called %s. Do you "
 "want to continue?"
 msgstr "冽迤閰西撠蝢斤 %s  %s 雿蛛啁黎蝯隞亙賢刻蝜潛雿嚗"
 
-#: ../pidgin/gtkdialogs.c:1103
+#: ../pidgin/gtkdialogs.c:1106
 msgid "Merge Groups"
 msgstr "雿萇黎蝯"
 
-#: ../pidgin/gtkdialogs.c:1106
+#: ../pidgin/gtkdialogs.c:1109
 msgid "_Merge Groups"
 msgstr "雿萇黎蝯(_M)"
 
-#: ../pidgin/gtkdialogs.c:1156
+#: ../pidgin/gtkdialogs.c:1159
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
@@ -13036,81 +13148,78 @@
 msgstr ""
 "冽迤閰西撠蝢斤 %s 賊∪函憟賢皜桐葉蝘駁扎刻蝜潛雿嚗"
 
-#: ../pidgin/gtkdialogs.c:1159
+#: ../pidgin/gtkdialogs.c:1162
 msgid "Remove Group"
 msgstr "蝘駁斤黎蝯"
 
-#: ../pidgin/gtkdialogs.c:1162
+#: ../pidgin/gtkdialogs.c:1165
 msgid "_Remove Group"
 msgstr "蝘駁斤黎蝯(_R)"
 
-#: ../pidgin/gtkdialogs.c:1195
+#: ../pidgin/gtkdialogs.c:1198
 #, c-format
 msgid ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr "冽迤閰西撠 %s  敺函憟賢皜桐葉蝘駁扎刻蝜潛雿嚗"
 
 # XXXRemove BuddyRemove Contact其葉Pidgin⊥伐航賣寥脩蝛粹
-#: ../pidgin/gtkdialogs.c:1198
+#: ../pidgin/gtkdialogs.c:1201
 msgid "Remove Buddy"
 msgstr "蝘駁日憟賢"
 
 # XXXRemove BuddyRemove Contact其葉Pidgin⊥伐航賣寥脩蝛粹
-#: ../pidgin/gtkdialogs.c:1201
+#: ../pidgin/gtkdialogs.c:1204
 msgid "_Remove Buddy"
 msgstr "蝘駁日憟賢(_R)"
 
-#: ../pidgin/gtkdialogs.c:1222
+#: ../pidgin/gtkdialogs.c:1225
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
 "continue?"
 msgstr "冽迤閰西撠 %s 敺函憟賢皜桐葉蝘駁扎刻蝜潛雿嚗"
 
-#: ../pidgin/gtkdialogs.c:1225
+#: ../pidgin/gtkdialogs.c:1228
 msgid "Remove Chat"
 msgstr "蝘駁方憭拙恕"
 
-#: ../pidgin/gtkdialogs.c:1228
+#: ../pidgin/gtkdialogs.c:1231
 msgid "_Remove Chat"
 msgstr "蝘駁方憭拙恕(_R)"
 
 #  NOTE 霅舀游 by Ambrose
-#: ../pidgin/gtkdocklet.c:153
+#: ../pidgin/gtkdocklet.c:150
 msgid "Right-click for more unread messages...\n"
 msgstr "喲萎誑霈芾閮...\n"
 
-#: ../pidgin/gtkdocklet.c:454
+#: ../pidgin/gtkdocklet.c:435
 msgid "Change Status"
 msgstr "霈渡"
 
-#: ../pidgin/gtkdocklet.c:506
+#: ../pidgin/gtkdocklet.c:487
 msgid "Show Buddy List"
 msgstr "憿舐內憟賢皜"
 
-#: ../pidgin/gtkdocklet.c:532
+#: ../pidgin/gtkdocklet.c:513
 msgid "New Message..."
 msgstr "啗..."
 
-#: ../pidgin/gtkdocklet.c:547
+#: ../pidgin/gtkdocklet.c:528
 msgid "Mute Sounds"
 msgstr ""
 
-#: ../pidgin/gtkdocklet.c:554
+#: ../pidgin/gtkdocklet.c:535
 msgid "Blink on new message"
 msgstr "啗舀"
 
-#. TODO: need a submenu to change status, this needs to "link"
-#. * to the status in the buddy list gtkstatusbox
-#.
-#: ../pidgin/gtkdocklet.c:565
+#: ../pidgin/gtkdocklet.c:542
 msgid "Quit"
 msgstr "蝯蝔撘"
 
-#  XXX 憭芸芯 (^^;)
+#  NOTE 舀芷憪唾撓瑼獢嚗銝胯芸
 #: ../pidgin/gtkft.c:153
 msgid "Not started"
-msgstr "芸"
+msgstr "芷憪"
 
 # XXX 怨陌
 #: ../pidgin/gtkft.c:273
@@ -13190,7 +13299,7 @@
 msgstr "瑼獢唾撓蝝啁(_D)"
 
 #. Pause button
-#: ../pidgin/gtkft.c:835 ../pidgin/pidginstock.c:91
+#: ../pidgin/gtkft.c:835 ../pidgin/pidginstock.c:89
 msgid "_Pause"
 msgstr "怠(_P)"
 
@@ -13237,7 +13346,7 @@
 msgstr "銴鋆賡蝯雿(_C)"
 
 # NOTE "Defaulting to PNG" 舀 gaim 函∟舀賜瘜銝脩敶勗 PNG 澆
-#: ../pidgin/gtkimhtml.c:3202
+#: ../pidgin/gtkimhtml.c:3211
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -13248,7 +13357,7 @@
 "思嗆 PNG 瑼"
 
 # NOTE "Defaulting to PNG" 舀 gaim 函∟舀賜瘜銝脩敶勗 PNG 澆
-#: ../pidgin/gtkimhtml.c:3205
+#: ../pidgin/gtkimhtml.c:3214
 msgid ""
 "Unrecognized file type\n"
 "\n"
@@ -13258,7 +13367,7 @@
 "\n"
 "思嗆 PNG 瑼"
 
-#: ../pidgin/gtkimhtml.c:3218
+#: ../pidgin/gtkimhtml.c:3227
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -13269,7 +13378,7 @@
 "\n"
 "%s"
 
-#: ../pidgin/gtkimhtml.c:3221
+#: ../pidgin/gtkimhtml.c:3230
 #, c-format
 msgid ""
 "Error saving image\n"
@@ -13280,11 +13389,11 @@
 "\n"
 "%s"
 
-#: ../pidgin/gtkimhtml.c:3301 ../pidgin/gtkimhtml.c:3313
+#: ../pidgin/gtkimhtml.c:3310 ../pidgin/gtkimhtml.c:3322
 msgid "Save Image"
 msgstr "脣敶勗"
 
-#: ../pidgin/gtkimhtml.c:3341
+#: ../pidgin/gtkimhtml.c:3350
 msgid "_Save Image..."
 msgstr "脣敶勗(_S)..."
 
@@ -13509,26 +13618,26 @@
 "芯撣唾嚗銝虫蝙券) \n"
 "  -v, --version       憿舐內祈臭蒂a\n"
 
-#: ../pidgin/gtkmain.c:498
+#: ../pidgin/gtkmain.c:493
 #, 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"
-"If you can reproduce the crash, please notify the Pidgin\n"
-"developers by reporting a bug at\n"
-"%sbug.php\n"
+"If you can reproduce the crash, please notify the developers\n"
+"by reporting a bug at:\n"
+"%snewticket/\n"
 "\n"
 "Please make sure to specify what you were doing at the time\n"
 "and post the backtrace from the core file.  If you do not know\n"
 "how to get the backtrace, please read the instructions at\n"
-"%sgdb.php\n"
+"%swiki/GetABacktrace\n"
 "\n"
 "If you need further assistance, please IM either SeanEgn or \n"
 "LSchiere (via AIM).  Contact information for Sean and Luke \n"
 "on other protocols is at\n"
-"%scontactinfo.php\n"
+"%swiki/DeveloperPages\n"
 msgstr ""
 
 #: ../pidgin/gtknotify.c:337
@@ -13557,22 +13666,22 @@
 msgstr[0] "<b>冽 %d 撠圈萎辣</b>"
 msgstr[1] "<b>冽 %d 撠圈萎辣</b>"
 
-#: ../pidgin/gtknotify.c:909
+#: ../pidgin/gtknotify.c:951
 #, c-format
 msgid "The browser command \"%s\" is invalid."
 msgstr "閬賢冽隞扎%s舐⊥"
 
-#: ../pidgin/gtknotify.c:911 ../pidgin/gtknotify.c:923
-#: ../pidgin/gtknotify.c:936 ../pidgin/gtknotify.c:1064
+#: ../pidgin/gtknotify.c:953 ../pidgin/gtknotify.c:965
+#: ../pidgin/gtknotify.c:978 ../pidgin/gtknotify.c:1106
 msgid "Unable to open URL"
 msgstr "⊥蝬脤"
 
-#: ../pidgin/gtknotify.c:921 ../pidgin/gtknotify.c:934
+#: ../pidgin/gtknotify.c:963 ../pidgin/gtknotify.c:976
 #, c-format
 msgid "Error launching \"%s\": %s"
 msgstr " \"%s\" 潛航炊嚗%s"
 
-#: ../pidgin/gtknotify.c:1065
+#: ../pidgin/gtknotify.c:1107
 msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr "券貊其雿輻刻芸閬賢具嚗餅芣閮剖隞扎"
@@ -13987,6 +14096,11 @@
 msgid "Log all _status changes to system log"
 msgstr "閮寡喟頂蝯望亥(_S)"
 
+#: ../pidgin/gtkprefs.c:1475 ../pidgin/gtkprefs.c:1564
+#: ../pidgin/gtkprefs.c:1756
+msgid "(default)"
+msgstr "(閮)"
+
 #: ../pidgin/gtkprefs.c:1513
 msgid "Sound Selection"
 msgstr "詨單"
@@ -14376,33 +14490,37 @@
 msgid "Waiting for network connection"
 msgstr "蝑敺蝬脰楝蝺..."
 
-#: ../pidgin/gtkutils.c:1320 ../pidgin/gtkutils.c:1343
+#: ../pidgin/gtkutils.c:516
+msgid "Google Talk"
+msgstr "Google Talk"
+
+#: ../pidgin/gtkutils.c:1372 ../pidgin/gtkutils.c:1395
 #, c-format
 msgid "The following error has occurred loading %s: %s"
 msgstr "頛 %s 潛隞乩航炊嚗%s"
 
-#: ../pidgin/gtkutils.c:1323 ../pidgin/gtkutils.c:1345
+#: ../pidgin/gtkutils.c:1375 ../pidgin/gtkutils.c:1397
 msgid "Failed to load image"
 msgstr "霈敶勗憭望"
 
-#: ../pidgin/gtkutils.c:1419
+#: ../pidgin/gtkutils.c:1471
 #, c-format
 msgid "Cannot send folder %s."
 msgstr "⊥喲桅 %s"
 
-#: ../pidgin/gtkutils.c:1420
+#: ../pidgin/gtkutils.c:1472
 #, c-format
 msgid ""
 "%s cannot transfer a folder. You will need to send the files within "
-"individually"
-msgstr "%s 瘝颲行喲桅券閬亙喲瑼獢"
-
-#: ../pidgin/gtkutils.c:1452 ../pidgin/gtkutils.c:1464
-#: ../pidgin/gtkutils.c:1471
+"individually."
+msgstr "%s 瘝颲行喲桅嚗券閬亙喲桅抒瑼獢"
+
+#: ../pidgin/gtkutils.c:1504 ../pidgin/gtkutils.c:1516
+#: ../pidgin/gtkutils.c:1523
 msgid "You have dragged an image"
 msgstr "冽喃銝敶勗"
 
-#: ../pidgin/gtkutils.c:1453
+#: ../pidgin/gtkutils.c:1505
 msgid ""
 "You can send this image as a file transfer, embed it into this message, or "
 "use it as the buddy icon for this user."
@@ -14410,23 +14528,23 @@
 "典臭誑瑼獢唾撓亥荔摰嗆臭憟賢蝷箇孵嚗靘喲敶勗瑼"
 "蝯阡雿輻刻"
 
-#: ../pidgin/gtkutils.c:1459 ../pidgin/gtkutils.c:1480
+#: ../pidgin/gtkutils.c:1511 ../pidgin/gtkutils.c:1532
 msgid "Set as buddy icon"
 msgstr "閮剔箏末蝷"
 
-#: ../pidgin/gtkutils.c:1460 ../pidgin/gtkutils.c:1481
+#: ../pidgin/gtkutils.c:1512 ../pidgin/gtkutils.c:1533
 msgid "Send image file"
 msgstr "喲敶勗瑼"
 
-#: ../pidgin/gtkutils.c:1461 ../pidgin/gtkutils.c:1481
+#: ../pidgin/gtkutils.c:1513 ../pidgin/gtkutils.c:1533
 msgid "Insert in message"
 msgstr "亙啗"
 
-#: ../pidgin/gtkutils.c:1465
+#: ../pidgin/gtkutils.c:1517
 msgid "Would you like to set it as the buddy icon for this user?"
 msgstr "刻摰閮剔粹雿輻刻憟賢蝷箏嚗"
 
-#: ../pidgin/gtkutils.c:1472
+#: ../pidgin/gtkutils.c:1524
 msgid ""
 "You can send this image as a file transfer or embed it into this message, or "
 "use it as the buddy icon for this user."
@@ -14434,7 +14552,7 @@
 "典臭誑瑼獢唾撓亥荔摰嗆臭憟賢蝷箇孵嚗靘喲敶勗瑼"
 "蝯阡雿輻刻"
 
-#: ../pidgin/gtkutils.c:1474
+#: ../pidgin/gtkutils.c:1526
 msgid ""
 "You can insert this image into this message, or use it as the buddy icon for "
 "this user"
@@ -14447,17 +14565,17 @@
 #. * send.  The only logical one is "Application," but do we really want to send a binary and nothing else?
 #. * Probably not.  I'll just give an error and return.
 #. The original patch sent the icon used by the launcher.  That's probably wrong
-#: ../pidgin/gtkutils.c:1532
+#: ../pidgin/gtkutils.c:1584
 msgid "Cannot send launcher"
 msgstr "⊥喲"
 
-#: ../pidgin/gtkutils.c:1532
+#: ../pidgin/gtkutils.c:1584
 msgid ""
 "You dragged a desktop launcher. Most likely you wanted to send whatever this "
 "launcher points to instead of this launcher itself."
 msgstr "冽喃銝剁典之璁喳喲刻瑼獢嚗銝臬冽祈澈"
 
-#: ../pidgin/gtkutils.c:2302
+#: ../pidgin/gtkutils.c:2344
 #, c-format
 msgid ""
 "<b>File:</b> %s\n"
@@ -14468,25 +14586,25 @@
 "<b>瑼獢憭批嚗</b> %s\n"
 "<b>撠箏站嚗</b> %d%d"
 
-#: ../pidgin/gtkutils.c:2592
+#: ../pidgin/gtkutils.c:2640
 #, c-format
 msgid "The file '%s' is too large for %s.  Please try a smaller image.\n"
 msgstr "'%s' 撠 %s 靘隤芸云憭找隢閰西岫撠銝暺敶梯情\n"
 
-#: ../pidgin/gtkutils.c:2594
+#: ../pidgin/gtkutils.c:2642
 msgid "Icon Error"
 msgstr "航炊"
 
-#: ../pidgin/gtkutils.c:2595
+#: ../pidgin/gtkutils.c:2643
 msgid "Could not set icon"
 msgstr "⊥閮剖"
 
-#: ../pidgin/gtkutils.c:2695
+#: ../pidgin/gtkutils.c:2743
 #, c-format
 msgid "Failed to open file '%s': %s"
 msgstr "⊥瑼獢%s嚗%s"
 
-#: ../pidgin/gtkutils.c:2744
+#: ../pidgin/gtkutils.c:2792
 #, c-format
 msgid ""
 "Failed to load image '%s': reason not known, probably a corrupt image file"
@@ -14500,27 +14618,34 @@
 msgid "Select color"
 msgstr "豢憿"
 
-#: ../pidgin/pidginstock.c:83
+#  TODO Untranslated - This will need to be translated (NOT transliterated) for Chinese, but that'd be too much work
+#. Translators may want to transliterate the name.
+#. It is not to be translated.
+#: ../pidgin/pidgin.h:50
+msgid "Pidgin"
+msgstr "Pidgin"
+
+#: ../pidgin/pidginstock.c:81
 msgid "_Alias"
 msgstr "亙(_A)"
 
+#: ../pidgin/pidginstock.c:83
+msgid "Close _tabs"
+msgstr "(_T)"
+
 #: ../pidgin/pidginstock.c:85
-msgid "Close _tabs"
-msgstr "(_T)"
-
-#: ../pidgin/pidginstock.c:87
 msgid "_Get Info"
 msgstr "敺鞈閮(_G)"
 
-#: ../pidgin/pidginstock.c:88
+#: ../pidgin/pidginstock.c:86
 msgid "_Invite"
 msgstr "隢(_I)"
 
-#: ../pidgin/pidginstock.c:89
+#: ../pidgin/pidginstock.c:87
 msgid "_Modify"
 msgstr "靽格(_M)"
 
-#: ../pidgin/pidginstock.c:90
+#: ../pidgin/pidginstock.c:88
 msgid "_Open Mail"
 msgstr "萎辣(_O)"
 
@@ -14594,7 +14719,7 @@
 
 #: ../pidgin/plugins/contact_priority.c:63
 msgid "Buddy is \"extended\" away"
-msgstr "憟賢a"
+msgstr "憟賢瑟a"
 
 #. Not used yet.
 #: ../pidgin/plugins/contact_priority.c:66
@@ -14710,12 +14835,19 @@
 msgid "Conversation Placement"
 msgstr "鈭方雿蝵"
 
-#: ../pidgin/plugins/extplacement.c:106
+#. Translators: "New conversations" should match the text in the preferences dialog and "By conversation count" should be the same text used above
+#: ../pidgin/plugins/extplacement.c:105
+msgid ""
+"Note: The preference for \"New conversations\" must be set to \"By "
+"conversation count\"."
+msgstr "瘜冽嚗唬漱隢賊敹閮剖箝靘鈭方詻"
+
+#: ../pidgin/plugins/extplacement.c:111
 msgid "Number of conversations per window"
 msgstr "閬蝒找鈭方訾"
 
 #  XXX 閬詨祕霅舀嚗
-#: ../pidgin/plugins/extplacement.c:112
+#: ../pidgin/plugins/extplacement.c:117
 msgid "Separate IM and Chat windows when placing by number"
 msgstr "靘鈭方豢曄蔭唬漱隢嚗隞乩閬蝒憿舐內單閮臬憭"
 
@@ -14725,20 +14857,20 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/extplacement.c:141
+#: ../pidgin/plugins/extplacement.c:146
 msgid "ExtPlacement"
 msgstr "閬蝒雿蝵桅憭賊"
 
 #. *< name
 #. *< version
-#: ../pidgin/plugins/extplacement.c:143
+#: ../pidgin/plugins/extplacement.c:148
 msgid "Extra conversation placement options."
 msgstr "鈭方閬蝒雿蝵桅憭賊"
 
 #  XXX 霅臬敺撌殷隢寡 :-(
 #. *< summary
 #. *  description
-#: ../pidgin/plugins/extplacement.c:145
+#: ../pidgin/plugins/extplacement.c:150
 msgid ""
 "Restrict the number of conversations per windows, optionally separating IMs "
 "and Chats"
@@ -15204,39 +15336,31 @@
 msgid "Hyperlink Color"
 msgstr "頞蝯憿"
 
-#: ../pidgin/plugins/pidginrc.c:56
-msgid "GtkTreeView Expander Size"
-msgstr "GtkTreeView 撅典之撠"
-
-#: ../pidgin/plugins/pidginrc.c:57
+#: ../pidgin/plugins/pidginrc.c:54
 msgid "GtkTreeView Horizontal Separation"
 msgstr "GtkTreeView 瘞游像頝"
 
-#: ../pidgin/plugins/pidginrc.c:76
+#: ../pidgin/plugins/pidginrc.c:73
 msgid "Conversation Entry"
 msgstr "鈭方閬蝒頛詨交雿"
 
-#: ../pidgin/plugins/pidginrc.c:77
+#: ../pidgin/plugins/pidginrc.c:74
 msgid "Conversation History"
 msgstr "鈭方甇瑕"
 
-#: ../pidgin/plugins/pidginrc.c:78
+#: ../pidgin/plugins/pidginrc.c:75
 msgid "Log Viewer"
 msgstr "亥瑼Z"
 
 #  XXX 霅舀蝯嗅憿嚗雿喃唳璅霅航憟 - ambrose 20070415
-#: ../pidgin/plugins/pidginrc.c:79
+#: ../pidgin/plugins/pidginrc.c:76
 msgid "Request Dialog"
 msgstr "撠閰梯蝒 (Request Dialog)"
 
-#: ../pidgin/plugins/pidginrc.c:80
+#: ../pidgin/plugins/pidginrc.c:77
 msgid "Notify Dialog"
 msgstr "亥蝒 (Notify Dialog)"
 
-#: ../pidgin/plugins/pidginrc.c:91
-msgid "GtkTreeView Indent Expanders"
-msgstr "GtkTreeView撅"
-
 #: ../pidgin/plugins/pidginrc.c:322
 msgid "Select Color"
 msgstr "豢憿"
@@ -15258,36 +15382,56 @@
 msgid "GTK+ Text Shortcut Theme"
 msgstr ""
 
-#: ../pidgin/plugins/pidginrc.c:508
+#.
+#. for (i = 0; i < G_N_ELEMENTS(widget_bool_prefs); i++) {
+#. hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
+#. gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
+#.
+#. check = pidgin_prefs_checkbox(_(widget_bool_names[i]),
+#. widget_bool_prefs_set[i], hbox);
+#. gtk_size_group_add_widget(labelsg, check);
+#.
+#. widget_bool_widgets[i] = pidgin_prefs_checkbox("", widget_bool_prefs[i], hbox);
+#. *
+#. gtk_size_group_add_widget(widgetsb, widget_bool_widgets[i]);
+#. *
+#. gtk_widget_set_sensitive(widget_bool_widgets[i],
+#. purple_prefs_get_bool(widget_bool_prefs_set[i]));
+#. g_signal_connect(G_OBJECT(check), "toggled",
+#. G_CALLBACK(pidgin_toggle_sensitive),
+#. widget_bool_widgets[i]);
+#. }
+#.
+#: ../pidgin/plugins/pidginrc.c:510
 msgid "Interface colors"
 msgstr "隞a"
 
-#: ../pidgin/plugins/pidginrc.c:532
+#: ../pidgin/plugins/pidginrc.c:534
 msgid "Widget Sizes"
 msgstr "Widget 憭批"
 
-#: ../pidgin/plugins/pidginrc.c:553
+#: ../pidgin/plugins/pidginrc.c:555
 msgid "Fonts"
 msgstr "摮"
 
-#: ../pidgin/plugins/pidginrc.c:576
+#: ../pidgin/plugins/pidginrc.c:578
 msgid "Tools"
 msgstr "撌亙"
 
-#: ../pidgin/plugins/pidginrc.c:581
+#: ../pidgin/plugins/pidginrc.c:583
 #, c-format
 msgid "Write settings to %s%sgtkrc-2.0"
 msgstr "撠閮剖撖怠%s%sgtkrc-2.0"
 
-#: ../pidgin/plugins/pidginrc.c:589
+#: ../pidgin/plugins/pidginrc.c:591
 msgid "Re-read gtkrc files"
 msgstr "啗gtkrc瑼獢"
 
-#: ../pidgin/plugins/pidginrc.c:622
+#: ../pidgin/plugins/pidginrc.c:624
 msgid "Pidgin GTK+ Theme Control"
 msgstr "Pidgin GTK+ 雿臭蜓憿閮剖"
 
-#: ../pidgin/plugins/pidginrc.c:624 ../pidgin/plugins/pidginrc.c:625
+#: ../pidgin/plugins/pidginrc.c:626 ../pidgin/plugins/pidginrc.c:627
 msgid "Provides access to commonly used gtkrc settings."
 msgstr "靘銝 gtkrc 閮剖摮"
 
@@ -15304,11 +15448,11 @@
 
 #: ../pidgin/plugins/raw.c:178
 msgid ""
-"Lets you send raw input to text-based protocols (Jabber, MSN, IRC, TOC). Hit "
+"Lets you send raw input to text-based protocols (XMPP, MSN, IRC, TOC). Hit "
 "'Enter' in the entry box to send. Watch the debug window."
 msgstr ""
-"霈函湔亥撓交隞文蝔格摮璅∪閮摰嚗靘憒 JabberMSNIRC  TOC嚗脰"
-"雿刻撓交雿頛詨交隞歹 Enter 敺菟綽賊鞈閮券日航蝒憿舐內"
+"霈函湔亥撓交隞文蝔格摮璅∪閮摰嚗靘憒 XMPPMSNIRC  TOC嚗脰"
+"雿刻撓交雿頛詨交隞歹 Enter 敺菟綽賊鞈閮券日航蝒憿舐內"
 
 # XXX 怨陌
 #: ../pidgin/plugins/relnot.c:71
@@ -15481,9 +15625,8 @@
 msgstr "唾澆賊"
 
 #: ../pidgin/plugins/timestamp_format.c:26
-#, c-format
-msgid "_Force (traditional %s) 24-hour time format"
-msgstr "撘瑕嗡蝙剁%s 喟絞雿輻函嚗24撠嗆澆(_F)"
+msgid "_Force 24-hour time format"
+msgstr "撘瑕嗡蝙24撠嗆澆(_F)"
 
 #: ../pidgin/plugins/timestamp_format.c:33
 msgid "Show dates in..."
@@ -15514,19 +15657,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/timestamp_format.c:150
+#: ../pidgin/plugins/timestamp_format.c:151
 msgid "Message Timestamp Formats"
 msgstr "閮舀唾澆"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/timestamp_format.c:153
+#: ../pidgin/plugins/timestamp_format.c:154
 msgid "Customizes the message timestamp formats."
 msgstr "雿輻刻芸閮舀唾澆"
 
 #. *  description
-#: ../pidgin/plugins/timestamp_format.c:155
+#: ../pidgin/plugins/timestamp_format.c:156
 msgid ""
 "This plugin allows the user to customize conversation and logging message "
 "timestamp formats."
@@ -15697,6 +15840,40 @@
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr "撟怠拍 XMPP 隡箸冽摰X嗥垢脰日胯"
 
+#~ msgid "GtkTreeView Expander Size"
+#~ msgstr "GtkTreeView 撅典之撠"
+
+#~ msgid "GtkTreeView Indent Expanders"
+#~ msgstr "GtkTreeView撅"
+
+# FIXME 霅舀敺寥 - 20061028
+#~ msgid "Toggle offline buddies"
+#~ msgstr "憿舐內嚗銝憿舐內Y憟賢"
+
+#~ msgid "Timestamps"
+#~ msgstr "唾"
+
+#~ msgid "Jabber Account"
+#~ msgstr "Jabber 撣唾"
+
+#~ msgid "Cannot join %s:"
+#~ msgstr "⊥ %s嚗"
+
+#~ msgid "Search for Jabber users"
+#~ msgstr "撠Jabber雿輻刻"
+
+#~ msgid "Invalid Jabber ID"
+#~ msgstr "Jabber 撣唾⊥"
+
+#~ msgid "Change Jabber Password"
+#~ msgstr "靽格 Jabber 撖蝣"
+
+#~ msgid "Jabber Protocol Plugin"
+#~ msgstr "Jabber 摰璅∠"
+
+#~ msgid "Jabber developer"
+#~ msgstr "Jabber 潸"
+
 #~ msgid "..."
 #~ msgstr "..."
 
@@ -16515,9 +16692,6 @@
 #~ msgid "Offline "
 #~ msgstr "Y"
 
-#~ msgid "Default"
-#~ msgstr "閮"
-
 #~ msgid "<span weight=\"bold\">From:</span> %s\n"
 #~ msgstr "<span weight=\"bold\">靘迎</span> %s\n"