changeset 17869:657dccbf8020

fixes #1680 committer: Luke Schierer <lschiere@pidgin.im>
author Ambrose C. Li <acli@ada.dhs.org>
date Thu, 14 Jun 2007 16:14:38 +0000
parents 3d0d28438a59
children 91e92cb0d875
files po/ChangeLog po/zh_TW.po
diffstat 2 files changed, 2716 insertions(+), 2026 deletions(-) [+]
line wrap: on
line diff
--- a/po/ChangeLog	Thu Jun 14 16:12:55 2007 +0000
+++ b/po/ChangeLog	Thu Jun 14 16:14:38 2007 +0000
@@ -1,6 +1,7 @@
 Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
 
 version 2.0.2
+	* Chinese (Traditional) translation updated (Ambrose C. Li)
 	* English (British) translation updated (Luke Ross)
 	* Finnish translation updated (Timo Jyrinki)
 	* Lithuanian translation updated (Laurynas Biveinis)
--- a/po/zh_TW.po	Thu Jun 14 16:12:55 2007 +0000
+++ b/po/zh_TW.po	Thu Jun 14 16:14:38 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.468 2007/05/21 21:53:48 acli Exp $
+# $InternalId: zh_TW.po,v 1.473 2007/06/14 08:14:46 acli Exp $
 #
 # ----------------------------------------------------------
 # For internal use only:
@@ -48,9 +48,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Pidgin 2.0.0\n"
-"POT-Creation-Date: 2007-05-21 00:01-0400\n"
-"PO-Revision-Date: 2007-05-20 01:57-0400\n"
+"Project-Id-Version: Pidgin 2.0.2\n"
+"POT-Creation-Date: 2007-06-13 07:40-0400\n"
+"PO-Revision-Date: 2007-06-14 01:22-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"
@@ -93,7 +93,7 @@
 msgstr "Finch"
 
 #  NOTE 第二、三個 %s 係目錄名稱(不是程式名)
-#: ../finch/finch.c:301 ../pidgin/gtkmain.c:685
+#: ../finch/finch.c:301 ../pidgin/gtkmain.c:682
 #, c-format
 msgid ""
 "%s encountered errors migrating your settings from %s to %s. Please "
@@ -103,15 +103,16 @@
 "%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/gntaccount.c:119 ../finch/gntblist.c:290 ../finch/gntblist.c:415
+#: ../finch/gntblist.c:428 ../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/jabber/jabber.c:1235
 #: ../libpurple/protocols/qq/group_join.c:326
-#: ../libpurple/protocols/silc/ops.c:1451
+#: ../libpurple/protocols/silc/ops.c:57 ../libpurple/protocols/silc/ops.c:1456
+#: ../libpurple/protocols/silc10/ops.c:1451
 msgid "Error"
 msgstr "錯誤"
 
@@ -124,16 +125,16 @@
 msgid "Screenname of an account must be non-empty."
 msgstr "帳號不可留空。"
 
-#: ../finch/gntaccount.c:423 ../pidgin/gtkaccount.c:590
+#: ../finch/gntaccount.c:423
 msgid "New mail notifications"
 msgstr "新郵件通知"
 
-#: ../finch/gntaccount.c:433 ../pidgin/gtkaccount.c:519
+#: ../finch/gntaccount.c:433
 msgid "Remember password"
 msgstr "記住密碼"
 
-#: ../finch/gntaccount.c:474 ../pidgin/gtkaccount.c:1456
-#: ../pidgin/gtkblist.c:3965
+#: ../finch/gntaccount.c:474 ../pidgin/gtkaccount.c:1478
+#: ../pidgin/gtkblist.c:3996
 msgid "Modify Account"
 msgstr "修改帳號"
 
@@ -142,31 +143,29 @@
 msgid "New Account"
 msgstr "新帳號"
 
-#: ../finch/gntaccount.c:500 ../pidgin/gtkaccount.c:427 ../pidgin/gtkft.c:695
+#: ../finch/gntaccount.c:500 ../pidgin/gtkft.c:695
 msgid "Protocol:"
 msgstr "通訊協定:"
 
-#: ../finch/gntaccount.c:508 ../pidgin/gtkaccount.c:435
-#: ../pidgin/gtkblist.c:5389
+#: ../finch/gntaccount.c:508
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:295
 msgid "Screen name:"
 msgstr "帳號:"
 
-#: ../finch/gntaccount.c:521 ../pidgin/gtkaccount.c:510
+#: ../finch/gntaccount.c:521
 msgid "Password:"
 msgstr "密碼:"
 
-#: ../finch/gntaccount.c:531 ../pidgin/gtkblist.c:5410
-#: ../pidgin/gtkblist.c:5773
+#: ../finch/gntaccount.c:531
 msgid "Alias:"
 msgstr "別名:"
 
 #. Cancel button
 #. Cancel
 #: ../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/gntaccount.c:853 ../finch/gntblist.c:334 ../finch/gntblist.c:403
+#: ../finch/gntblist.c:438 ../finch/gntblist.c:770 ../finch/gntblist.c:967
+#: ../finch/gntblist.c:1063 ../finch/gntblist.c:2160 ../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
@@ -178,13 +177,14 @@
 #: ../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/jabber.c:882
+#: ../libpurple/protocols/jabber/jabber.c:1390
+#: ../libpurple/protocols/jabber/si.c:868
 #: ../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/oscar.c:6046
 #: ../libpurple/protocols/oscar/peer.c:1023
 #: ../libpurple/protocols/qq/buddy_info.c:484
 #: ../libpurple/protocols/qq/buddy_opt.c:214
@@ -203,24 +203,32 @@
 #: ../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: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
+#: ../libpurple/protocols/silc/buddy.c:455
+#: ../libpurple/protocols/silc/buddy.c:1076
+#: ../libpurple/protocols/silc/buddy.c:1191
+#: ../libpurple/protocols/silc/chat.c:616
+#: ../libpurple/protocols/silc/chat.c:746
+#: ../libpurple/protocols/silc/ops.c:1816
+#: ../libpurple/protocols/silc/silc.c:823
+#: ../libpurple/protocols/silc/silc.c:1031
+#: ../libpurple/protocols/silc10/buddy.c:468
+#: ../libpurple/protocols/silc10/buddy.c:1084
+#: ../libpurple/protocols/silc10/buddy.c:1189
+#: ../libpurple/protocols/silc10/chat.c:600
+#: ../libpurple/protocols/silc10/chat.c:730
+#: ../libpurple/protocols/silc10/ops.c:1904
+#: ../libpurple/protocols/silc10/silc.c:736
+#: ../libpurple/protocols/silc10/silc.c:942
+#: ../libpurple/protocols/yahoo/yahoo.c:989
+#: ../libpurple/protocols/yahoo/yahoo.c:3248
+#: ../libpurple/protocols/yahoo/yahoo.c:3259 ../pidgin/gtkaccount.c:1916
+#: ../pidgin/gtkaccount.c:2514 ../pidgin/gtkblist.c:5889
+#: ../pidgin/gtkdialogs.c:724 ../pidgin/gtkdialogs.c:871
+#: ../pidgin/gtkdialogs.c:963 ../pidgin/gtkdialogs.c:983
+#: ../pidgin/gtkdialogs.c:1007 ../pidgin/gtkdialogs.c:1029
+#: ../pidgin/gtkdialogs.c:1077 ../pidgin/gtkdialogs.c:1118
+#: ../pidgin/gtkdialogs.c:1174 ../pidgin/gtkdialogs.c:1213
+#: ../pidgin/gtkdialogs.c:1240 ../pidgin/gtkimhtmltoolbar.c:423
 #: ../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
@@ -233,12 +241,12 @@
 #: ../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
+#: ../libpurple/protocols/jabber/buddy.c:583 ../pidgin/gtkdebug.c:748
 #: ../pidgin/gtkrequest.c:276
 msgid "Save"
 msgstr "儲存"
 
-#: ../finch/gntaccount.c:611 ../pidgin/gtkaccount.c:1886
+#: ../finch/gntaccount.c:611 ../pidgin/gtkaccount.c:1908
 #: ../pidgin/gtksavedstatuses.c:328
 #, c-format
 msgid "Are you sure you want to delete %s?"
@@ -251,14 +259,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:1893 ../pidgin/gtklog.c:301
+#: ../finch/gntstatus.c:204 ../pidgin/gtkaccount.c:1915 ../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:2060 ../finch/gntui.c:76
-#: ../pidgin/gtkaccount.c:2311 ../pidgin/gtkdocklet.c:522
+#: ../finch/gntaccount.c:646 ../finch/gntblist.c:2065 ../finch/gntui.c:76
+#: ../pidgin/gtkaccount.c:2340 ../pidgin/gtkdocklet.c:522
 msgid "Accounts"
 msgstr "帳號清單"
 
@@ -267,15 +275,16 @@
 msgstr "以下列表的帳號可隨意啟用、停用。"
 
 #. Add button
-#: ../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/gntaccount.c:675 ../finch/gntaccount.c:852 ../finch/gntblist.c:333
+#: ../finch/gntblist.c:403 ../finch/gntblist.c:438 ../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
+#: ../libpurple/protocols/silc/chat.c:615
+#: ../libpurple/protocols/silc10/chat.c:599 ../pidgin/gtkaccount.c:2513
+#: ../pidgin/gtkblist.c:5888 ../pidgin/gtkconv.c:1687
 #: ../pidgin/gtkrequest.c:274
 msgid "Add"
 msgstr "加入"
@@ -285,109 +294,114 @@
 msgid "Modify"
 msgstr "修改"
 
-#: ../finch/gntaccount.c:760 ../pidgin/gtkaccount.c:2431
+#: ../finch/gntaccount.c:775 ../pidgin/gtkaccount.c:2460
 #, 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:2483
+#: ../finch/gntaccount.c:848 ../pidgin/gtkaccount.c:2512
 msgid "Add buddy to your list?"
 msgstr "將使用者加入您的好友清單?"
 
 #  NOTE: 最頭的 %s%s%s%s 是對方帳號,或帳號括弧別名(第二、四個 %s 是括弧)
 #  NOTE: 最尾的 %s%s 是空白或「: 訊息」,基本上可以不理會(也不能怎樣理會)
-#: ../finch/gntaccount.c:887 ../pidgin/gtkaccount.c:2535
+#: ../finch/gntaccount.c:902 ../pidgin/gtkaccount.c:2564
 #, 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:2558 ../pidgin/gtkaccount.c:2564
+#: ../finch/gntaccount.c:922 ../finch/gntaccount.c:929
+#: ../pidgin/gtkaccount.c:2587 ../pidgin/gtkaccount.c:2593
 msgid "Authorize buddy?"
 msgstr "給予認證?"
 
-#: ../finch/gntaccount.c:911 ../finch/gntaccount.c:918
-#: ../pidgin/gtkaccount.c:2559 ../pidgin/gtkaccount.c:2565
+#: ../finch/gntaccount.c:926 ../finch/gntaccount.c:933
+#: ../pidgin/gtkaccount.c:2588 ../pidgin/gtkaccount.c:2594
 msgid "Authorize"
 msgstr "給予認證"
 
-#: ../finch/gntaccount.c:912 ../finch/gntaccount.c:919
-#: ../pidgin/gtkaccount.c:2560 ../pidgin/gtkaccount.c:2566
+#: ../finch/gntaccount.c:927 ../finch/gntaccount.c:934
+#: ../pidgin/gtkaccount.c:2589 ../pidgin/gtkaccount.c:2595
 msgid "Deny"
 msgstr "拒絕"
 
-#: ../finch/gntblist.c:278
+#: ../finch/gntblist.c:279
 msgid "You must provide a screename for the buddy."
 msgstr "必須為好友指定帳號。"
 
-#: ../finch/gntblist.c:280
+#: ../finch/gntblist.c:281
 msgid "You must provide a group."
 msgstr "必須為好友指定群組。"
 
-#: ../finch/gntblist.c:282
+#: ../finch/gntblist.c:283
 msgid "You must select an account."
 msgstr "必須指定帳號"
 
-#: ../finch/gntblist.c:284
+#: ../finch/gntblist.c:285
 msgid "The selected account is not online."
 msgstr "所指定的帳號目前沒有連線。"
 
-#: ../finch/gntblist.c:288
+#: ../finch/gntblist.c:290
 msgid "Error adding buddy"
 msgstr "新增好友途中發生了錯誤"
 
-#: ../finch/gntblist.c:313 ../libpurple/protocols/oscar/oscar.c:2843
-#: ../pidgin/gtkaccount.c:1969 ../pidgin/gtksavedstatuses.c:924
+#: ../finch/gntblist.c:315 ../libpurple/protocols/oscar/oscar.c:2844
+#: ../pidgin/gtkaccount.c:1991 ../pidgin/gtksavedstatuses.c:924
 msgid "Screen Name"
 msgstr "帳號"
 
-#: ../finch/gntblist.c:316 ../finch/gntblist.c:393 ../finch/gntblist.c:1209
-#: ../libpurple/protocols/msn/msn.c:1359
-#: ../libpurple/protocols/silc/chat.c:590
+#: ../finch/gntblist.c:318 ../finch/gntblist.c:395 ../finch/gntblist.c:1211
+#: ../libpurple/protocols/msn/msn.c:1364
+#: ../libpurple/protocols/silc/chat.c:606
+#: ../libpurple/protocols/silc10/chat.c:590
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:680
 #: ../libpurple/protocols/zephyr/zephyr.c:788
-#: ../libpurple/protocols/zephyr/zephyr.c:1207 ../pidgin/gtkdialogs.c:974
-#: ../pidgin/gtkdialogs.c:998 ../pidgin/gtkdialogs.c:1020
+#: ../libpurple/protocols/zephyr/zephyr.c:1207 ../pidgin/gtkdialogs.c:982
+#: ../pidgin/gtkdialogs.c:1006 ../pidgin/gtkdialogs.c:1028
 #: ../pidgin/gtkrequest.c:277
 msgid "Alias"
 msgstr "別名"
 
-#: ../finch/gntblist.c:319 ../finch/gntblist.c:396
+#: ../finch/gntblist.c:321 ../finch/gntblist.c:398
 msgid "Group"
 msgstr "群組"
 
-#: ../finch/gntblist.c:323 ../finch/gntblist.c:384 ../finch/gntblist.c:1259
+#: ../finch/gntblist.c:325 ../finch/gntblist.c:386 ../finch/gntblist.c:1261
 #: ../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
+#: ../pidgin/gtkblist.c:2975 ../pidgin/gtknotify.c:476
+#: ../pidgin/gtkpounce.c:1269 ../pidgin/plugins/gevolution/gevolution.c:443
 msgid "Account"
 msgstr "帳號"
 
-#: ../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
+#: ../finch/gntblist.c:331 ../finch/gntblist.c:819
+#: ../libpurple/protocols/silc/buddy.c:725
+#: ../libpurple/protocols/silc/buddy.c:1027
+#: ../libpurple/protocols/silc/buddy.c:1072
+#: ../libpurple/protocols/silc/buddy.c:1182
+#: ../libpurple/protocols/silc10/buddy.c:737
+#: ../libpurple/protocols/silc10/buddy.c:1033
+#: ../libpurple/protocols/silc10/buddy.c:1080
+#: ../libpurple/protocols/silc10/buddy.c:1180
+#: ../libpurple/protocols/yahoo/yahoo.c:3161 ../pidgin/gtkblist.c:5394
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:447
 msgid "Add Buddy"
 msgstr "新增好友"
 
 # TODO 要覆查 - 20061025
-#: ../finch/gntblist.c:329
+#: ../finch/gntblist.c:331
 msgid "Please enter buddy information."
 msgstr "請輸入好友的資訊。"
 
-#: ../finch/gntblist.c:356 ../libpurple/blist.c:1192
+#: ../finch/gntblist.c:358 ../libpurple/blist.c:1192
 msgid "Chats"
 msgstr "聊天"
 
 # NOTE 只能譯「名稱」,因為同時解作「人名」及「模組名稱」
 #. Extract their Name and put it in
-#: ../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
+#: ../finch/gntblist.c:392 ../libpurple/protocols/jabber/jabber.c:813
+#: ../libpurple/protocols/msn/msn.c:1553 ../libpurple/protocols/msn/msn.c:1618
+#: ../libpurple/protocols/msn/msn.c:1645
 #: ../libpurple/protocols/qq/buddy_info.c:44 ../pidgin/gtkplugin.c:581
 #: ../pidgin/gtkroomlist.c:621
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:132
@@ -395,185 +409,191 @@
 msgid "Name"
 msgstr "名稱"
 
-#: ../finch/gntblist.c:399 ../finch/gntblist.c:819 ../pidgin/gtkblist.c:5719
+#: ../finch/gntblist.c:401 ../finch/gntblist.c:821 ../pidgin/gtkblist.c:5774
 msgid "Add Chat"
 msgstr "新增聊天室"
 
-#: ../finch/gntblist.c:400
+#: ../finch/gntblist.c:402
 msgid "You can edit more information from the context menu later."
 msgstr "如果要繼續修改其他細節,請用快顯選單。"
 
-#: ../finch/gntblist.c:413 ../finch/gntblist.c:426
+#: ../finch/gntblist.c:415 ../finch/gntblist.c:428
 msgid "Error adding group"
 msgstr "新增群組途中發生了錯誤"
 
-#: ../finch/gntblist.c:414
+#: ../finch/gntblist.c:416
 msgid "You must give a name for the group to add."
 msgstr "請給您新增的群組輸入名稱。"
 
-#: ../finch/gntblist.c:427
+#: ../finch/gntblist.c:429
 msgid "A group with the name already exists."
 msgstr "那個群組已經存在"
 
 # TODO 請覆查核實:是「加入」抑或「新增」?
-#: ../finch/gntblist.c:434 ../finch/gntblist.c:821
+#: ../finch/gntblist.c:436 ../finch/gntblist.c:823
 #: ../libpurple/protocols/sametime/sametime.c:5396
-#: ../libpurple/protocols/sametime/sametime.c:5484 ../pidgin/gtkblist.c:5825
+#: ../libpurple/protocols/sametime/sametime.c:5484 ../pidgin/gtkblist.c:5885
 msgid "Add Group"
 msgstr "加入群組"
 
 # TODO 要覆查 - 20061026
-#: ../finch/gntblist.c:434
+#: ../finch/gntblist.c:436
 msgid "Enter the name of the group"
 msgstr "請給群組輸入名稱。"
 
-#: ../finch/gntblist.c:767
+#: ../finch/gntblist.c:769
 msgid "Edit Chat"
 msgstr "修改聊天室"
 
-#: ../finch/gntblist.c:767
+#: ../finch/gntblist.c:769
 msgid "Please Update the necessary fields."
 msgstr "請按需要更新欄位內的資訊。"
 
 # TODO 要覆查 - 20061025
-#: ../finch/gntblist.c:768 ../finch/gntstatus.c:199
+#: ../finch/gntblist.c:770 ../finch/gntstatus.c:199
 msgid "Edit"
 msgstr "修改"
 
-#: ../finch/gntblist.c:784
+#: ../finch/gntblist.c:786
 msgid "Auto-join"
 msgstr "自動加入"
 
 # XXX 還是「修改選項」?
-#: ../finch/gntblist.c:793
+#: ../finch/gntblist.c:795
 msgid "Edit Settings"
 msgstr "修改設定"
 
 # XXX 20070518
-#: ../finch/gntblist.c:831 ../finch/gntconv.c:317 ../pidgin/gtkblist.c:278
-#: ../pidgin/gtkconv.c:677
+#: ../finch/gntblist.c:833 ../finch/gntconv.c:317 ../pidgin/gtkblist.c:277
+#: ../pidgin/gtkconv.c:682 ../pidgin/gtkdialogs.c:830
 msgid "Information"
 msgstr "資訊"
 
-#: ../finch/gntblist.c:831 ../finch/gntconv.c:317 ../pidgin/gtkblist.c:278
-#: ../pidgin/gtkconv.c:677
+#: ../finch/gntblist.c:833 ../finch/gntconv.c:317 ../pidgin/gtkblist.c:277
+#: ../pidgin/gtkconv.c:682 ../pidgin/gtkdialogs.c:830
 msgid "Retrieving..."
 msgstr "讀取中..."
 
-#: ../finch/gntblist.c:864 ../finch/gntconv.c:418
-#: ../libpurple/protocols/silc/chat.c:883
+#: ../finch/gntblist.c:866 ../finch/gntconv.c:418
+#: ../libpurple/protocols/silc/chat.c:899
+#: ../libpurple/protocols/silc10/chat.c:883
 msgid "Get Info"
 msgstr "取得資訊"
 
-#: ../finch/gntblist.c:868
+#: ../finch/gntblist.c:870
 msgid "Add Buddy Pounce"
 msgstr "加入好友狀態捕捉"
 
 #. if (q_bud && is_online(q_bud->status)) {
-#: ../finch/gntblist.c:875 ../finch/gntconv.c:430
+#: ../finch/gntblist.c:877 ../finch/gntconv.c:430
+#: ../libpurple/protocols/jabber/si.c:868
 #: ../libpurple/protocols/oscar/oscar.c:636 ../libpurple/protocols/qq/qq.c:585
-#: ../pidgin/gtkconv.c:1599
+#: ../pidgin/gtkconv.c:1635
 msgid "Send File"
 msgstr "傳送檔案"
 
-#: ../finch/gntblist.c:879
+#: ../finch/gntblist.c:881
 msgid "View Log"
 msgstr "觀看日誌"
 
-#: ../finch/gntblist.c:960
+#: ../finch/gntblist.c:962
 #, c-format
 msgid "Please enter the new name for %s"
 msgstr "請輸入 %s 的新密碼"
 
-#: ../finch/gntblist.c:962 ../finch/gntblist.c:1209
+#: ../finch/gntblist.c:964 ../finch/gntblist.c:1211
 msgid "Rename"
 msgstr "重命名"
 
-#: ../finch/gntblist.c:962
+#: ../finch/gntblist.c:964
 msgid "Set Alias"
 msgstr "設定別名"
 
 # FIXME 譯文有待改進 - 20061029
-#: ../finch/gntblist.c:963
+#: ../finch/gntblist.c:965
 msgid "Enter empty string to reset the name."
 msgstr "如果要重置名稱,請輸入空白字串。"
 
-#: ../finch/gntblist.c:1039
+#: ../finch/gntblist.c:1041
 msgid "Removing this contact will also remove all the buddies in the contact"
 msgstr "移除這組好友會同時移除裏面的所有好友"
 
-#: ../finch/gntblist.c:1047
+#: ../finch/gntblist.c:1049
 msgid "Removing this group will also remove all the buddies in the group"
 msgstr "移除這個群組會同時移除裏面的所有好友"
 
-#: ../finch/gntblist.c:1052
+#: ../finch/gntblist.c:1054
 #, 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:1055
+#: ../finch/gntblist.c:1057
 msgid "Confirm Remove"
 msgstr "確認移除"
 
-#: ../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
+#: ../finch/gntblist.c:1062 ../finch/gntblist.c:1213 ../finch/gntft.c:223
+#: ../pidgin/gtkconv.c:1684 ../pidgin/gtkrequest.c:275
+#: ../pidgin/gtkstatusbox.c:261
 msgid "Remove"
 msgstr "移除"
 
 #. Buddy List
-#: ../finch/gntblist.c:1185 ../finch/gntblist.c:2232 ../finch/gntprefs.c:240
-#: ../finch/gntui.c:77 ../pidgin/gtkblist.c:4209
+#: ../finch/gntblist.c:1187 ../finch/gntblist.c:2237 ../finch/gntprefs.c:240
+#: ../finch/gntui.c:77 ../pidgin/gtkblist.c:4240
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:330
 msgid "Buddy List"
 msgstr "好友清單"
 
 # XXX - 20061122
 # NOTE (01時35分37秒) 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:1216
+#: ../finch/gntblist.c:1218
 msgid "Place tagged"
 msgstr "移動已標記的項目"
 
 # FIXME - 20061122
-#: ../finch/gntblist.c:1221
+#: ../finch/gntblist.c:1223
 msgid "Toggle Tag"
 msgstr "切換標記"
 
 #. General
-#: ../finch/gntblist.c:1254 ../libpurple/protocols/gg/gg.c:632
+#: ../finch/gntblist.c:1256 ../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: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/jabber/jabber.c:823
+#: ../libpurple/protocols/msn/msn.c:1372 ../libpurple/protocols/msn/msn.c:1556
 #: ../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:2989
+#: ../libpurple/protocols/silc/ops.c:1002
+#: ../libpurple/protocols/silc/ops.c:1186
+#: ../libpurple/protocols/silc/ops.c:1322
+#: ../libpurple/protocols/silc10/buddy.c:1535
+#: ../libpurple/protocols/silc10/ops.c:1036
+#: ../libpurple/protocols/silc10/ops.c:1179
+#: ../libpurple/protocols/silc10/ops.c:1328
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1042 ../pidgin/gtkblist.c:2999
 msgid "Nickname"
 msgstr "暱稱"
 
 #. Idle stuff
-#: ../finch/gntblist.c:1274 ../finch/gntprefs.c:243
-#: ../libpurple/protocols/bonjour/bonjour.c:322
+#: ../finch/gntblist.c:1276 ../finch/gntprefs.c:243
+#: ../libpurple/protocols/bonjour/bonjour.c:314
 #: ../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
+#: ../libpurple/protocols/oscar/oscar.c:2868
+#: ../libpurple/protocols/yahoo/yahoo.c:2915
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:686 ../pidgin/gtkblist.c:3026
+#: ../pidgin/gtkblist.c:3419 ../pidgin/gtkprefs.c:1848
 msgid "Idle"
 msgstr "閒置"
 
-#: ../finch/gntblist.c:1363
+#: ../finch/gntblist.c:1365
 #, c-format
 msgid ""
 "Online: %d\n"
@@ -582,12 +602,12 @@
 "上線:%d 人\n"
 "總數:%d 人"
 
-#: ../finch/gntblist.c:1372
+#: ../finch/gntblist.c:1374
 #, c-format
 msgid "Account: %s (%s)"
 msgstr "帳號:%s (%s)"
 
-#: ../finch/gntblist.c:1384
+#: ../finch/gntblist.c:1386
 #, c-format
 msgid ""
 "\n"
@@ -597,143 +617,143 @@
 "<b>最後見到:</b>%s前"
 
 # XXX check
-#: ../finch/gntblist.c:1649 ../pidgin/gtkdocklet.c:470
+#: ../finch/gntblist.c:1651 ../pidgin/gtkdocklet.c:470
 #: ../pidgin/gtkstatusbox.c:1064
 msgid "New..."
 msgstr "新增..."
 
 # NOTE 這是很差的原文,指「已儲存」(Saved) 的「狀態」:P
 # NOTE 上下文有一些常用(?)的狀態及「新增」(新增一個狀態),彈出的視窗也有「新增」,可能應該叫「狀態一覽」或者「狀態清單」一類的……
-#: ../finch/gntblist.c:1656 ../pidgin/gtkdocklet.c:471
+#: ../finch/gntblist.c:1658 ../pidgin/gtkdocklet.c:471
 #: ../pidgin/gtkstatusbox.c:1065
 msgid "Saved..."
 msgstr "狀態清單..."
 
-#: ../finch/gntblist.c:2028 ../finch/gntplugin.c:244 ../finch/gntui.c:81
+#: ../finch/gntblist.c:2033 ../finch/gntplugin.c:244 ../finch/gntui.c:81
 #: ../pidgin/gtkdocklet.c:523 ../pidgin/gtkplugin.c:530
 msgid "Plugins"
 msgstr "模組清單"
 
 # NOTE 只能譯「名稱」,因為同時解作「人名」及「模組名稱」
-#: ../finch/gntblist.c:2136 ../pidgin/gtkdialogs.c:706
-#: ../pidgin/gtkdialogs.c:844 ../pidgin/gtkdialogs.c:925
+#: ../finch/gntblist.c:2141 ../pidgin/gtkdialogs.c:705
+#: ../pidgin/gtkdialogs.c:852 ../pidgin/gtkdialogs.c:933
 msgid "_Name"
 msgstr "名稱(_N)"
 
-#: ../finch/gntblist.c:2141 ../pidgin/gtkdialogs.c:711
-#: ../pidgin/gtkdialogs.c:849 ../pidgin/gtkdialogs.c:930
+#: ../finch/gntblist.c:2146 ../pidgin/gtkdialogs.c:710
+#: ../pidgin/gtkdialogs.c:857 ../pidgin/gtkdialogs.c:938
 msgid "_Account"
 msgstr "帳號(_A)"
 
-#: ../finch/gntblist.c:2149 ../pidgin/gtkdialogs.c:719
+#: ../finch/gntblist.c:2154 ../pidgin/gtkdialogs.c:718
 msgid "New Instant Message"
 msgstr "新即時訊息"
 
-#: ../finch/gntblist.c:2151 ../pidgin/gtkdialogs.c:721
+#: ../finch/gntblist.c:2156 ../pidgin/gtkdialogs.c:720
 msgid ""
 "Please enter the screen name or alias of the person you would like to IM."
 msgstr "請輸入您所想要發送即時訊息對象的帳號。"
 
-#: ../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
+#: ../finch/gntblist.c:2159 ../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:1389
 #: ../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:1912
-#: ../libpurple/protocols/silc/silc.c:743
-#: ../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
+#: ../libpurple/protocols/oscar/oscar.c:6045
+#: ../libpurple/protocols/silc/buddy.c:454
+#: ../libpurple/protocols/silc/buddy.c:1190
+#: ../libpurple/protocols/silc/chat.c:447
+#: ../libpurple/protocols/silc/chat.c:482
+#: ../libpurple/protocols/silc/chat.c:745
+#: ../libpurple/protocols/silc/ops.c:1291
+#: ../libpurple/protocols/silc/ops.c:1815
+#: ../libpurple/protocols/silc/silc.c:822
+#: ../libpurple/protocols/silc10/buddy.c:467
+#: ../libpurple/protocols/silc10/buddy.c:1188
+#: ../libpurple/protocols/silc10/chat.c:425
+#: ../libpurple/protocols/silc10/chat.c:464
+#: ../libpurple/protocols/silc10/chat.c:729
+#: ../libpurple/protocols/silc10/ops.c:1297
+#: ../libpurple/protocols/silc10/ops.c:1903
+#: ../libpurple/protocols/silc10/silc.c:735
+#: ../libpurple/protocols/yahoo/yahoo.c:988
+#: ../libpurple/protocols/yahoo/yahoo.c:3247
+#: ../libpurple/protocols/yahoo/yahoo.c:3258 ../pidgin/gtkblist.c:3995
+#: ../pidgin/gtkdialogs.c:723 ../pidgin/gtkdialogs.c:870
+#: ../pidgin/gtkdialogs.c:962 ../pidgin/gtkrequest.c:269
 msgid "OK"
 msgstr "確定"
 
 #. Create the "Options" frame.
-#: ../finch/gntblist.c:2174 ../finch/gntpounce.c:444 ../pidgin/gtkpounce.c:778
+#: ../finch/gntblist.c:2179 ../finch/gntpounce.c:444 ../pidgin/gtkpounce.c:778
 msgid "Options"
 msgstr "選項"
 
-#: ../finch/gntblist.c:2180
+#: ../finch/gntblist.c:2185
 msgid "Send IM..."
 msgstr "送出即時訊息..."
 
-#: ../finch/gntblist.c:2184
+#: ../finch/gntblist.c:2189
 msgid "Show offline buddies"
 msgstr "顯示離線好友"
 
-#: ../finch/gntblist.c:2190
+#: ../finch/gntblist.c:2195
 msgid "Sort by status"
 msgstr "依照狀態排列"
 
-#: ../finch/gntblist.c:2194
+#: ../finch/gntblist.c:2199
 msgid "Sort alphabetically"
 msgstr "依照字母排列"
 
-#: ../finch/gntblist.c:2198
+#: ../finch/gntblist.c:2203
 msgid "Sort by log size"
 msgstr "依照日誌大小排列"
 
-#: ../finch/gntconn.c:38
+#: ../finch/gntconn.c:109
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../finch/gntconn.c:41
+#: ../finch/gntconn.c:112
 #, c-format
 msgid "%s disconnected."
 msgstr "%s 結束連線。"
 
-#: ../finch/gntconn.c:42
-#, c-format
-msgid ""
-"%s was disconnected due to the following error:\n"
-"%s"
-msgstr ""
-"%s 因下列錯誤結束了連線:\n"
-"%s"
-
-#: ../finch/gntconn.c:45 ../libpurple/account.c:1012
-#: ../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:3966
-msgid "Connect"
-msgstr "連線"
+#: ../finch/gntconn.c:113
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"Finch will not attempt to reconnect the account until you correct the error "
+"and re-enable the account."
+msgstr ""
+"%s\n"
+"\n"
+"在您更正這個錯誤並重新啟動這個帳號前,Finch 將不會再試著重新連線。"
 
 #: ../finch/gntconv.c:116
 msgid "No such command."
 msgstr "無此指令。"
 
-#: ../finch/gntconv.c:120 ../pidgin/gtkconv.c:508
+#: ../finch/gntconv.c:120 ../pidgin/gtkconv.c:513
 msgid "Syntax Error:  You typed the wrong number of arguments to that command."
 msgstr "語法錯誤:輸入的參數少於指令所需的參數數量。"
 
-#: ../finch/gntconv.c:125 ../pidgin/gtkconv.c:513
+#: ../finch/gntconv.c:125 ../pidgin/gtkconv.c:518
 msgid "Your command failed for an unknown reason."
 msgstr "指令執行失敗,原因不明。"
 
-#: ../finch/gntconv.c:130 ../pidgin/gtkconv.c:519
+#: ../finch/gntconv.c:130 ../pidgin/gtkconv.c:524
 msgid "That command only works in chats, not IMs."
 msgstr "這個指令只在聊天室內有效,在即時訊息中無效。"
 
-#: ../finch/gntconv.c:133 ../pidgin/gtkconv.c:522
+#: ../finch/gntconv.c:133 ../pidgin/gtkconv.c:527
 msgid "That command only works in IMs, not chats."
 msgstr "這個指令只在即時訊息中有效,在聊天室內無效。"
 
-#: ../finch/gntconv.c:137 ../pidgin/gtkconv.c:526
+#: ../finch/gntconv.c:137 ../pidgin/gtkconv.c:531
 msgid "That command doesn't work on this protocol."
 msgstr "這個指令在這個通訊協定內無效。"
 
@@ -795,15 +815,15 @@
 msgid "List of users:\n"
 msgstr "使用者列表:\n"
 
-#: ../finch/gntconv.c:847 ../pidgin/gtkconv.c:389
+#: ../finch/gntconv.c:847 ../pidgin/gtkconv.c:394
 msgid "Supported debug options are:  version"
 msgstr "支援的除錯選項有:version"
 
-#: ../finch/gntconv.c:882 ../pidgin/gtkconv.c:425
+#: ../finch/gntconv.c:882 ../pidgin/gtkconv.c:430
 msgid "No such command (in this context)."
 msgstr "沒有這個指令(可在這裏使用)"
 
-#: ../finch/gntconv.c:885 ../pidgin/gtkconv.c:428
+#: ../finch/gntconv.c:885 ../pidgin/gtkconv.c:433
 msgid ""
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
 "The following commands are available in this context:\n"
@@ -811,28 +831,28 @@
 "要獲得某一指令的說明,輸入「/help &lt;指令&gt;」即可。\n"
 "在這裏,可用的指令有:\n"
 
-#: ../finch/gntconv.c:943 ../pidgin/gtkconv.c:7085
+#: ../finch/gntconv.c:943 ../pidgin/gtkconv.c:7211
 msgid ""
 "say &lt;message&gt;:  Send a message normally as if you weren't using a "
 "command."
 msgstr "say &lt;訊息&gt;:將指定的訊息當成一般訊息正常送出,而非當為指令處理。"
 
-#: ../finch/gntconv.c:946 ../pidgin/gtkconv.c:7088
+#: ../finch/gntconv.c:946 ../pidgin/gtkconv.c:7214
 msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
 msgstr "me &lt;要執行的動作&gt;:模仿IRC,執行一個動作。"
 
-#: ../finch/gntconv.c:949 ../pidgin/gtkconv.c:7091
+#: ../finch/gntconv.c:949 ../pidgin/gtkconv.c:7217
 msgid ""
 "debug &lt;option&gt;:  Send various debug information to the current "
 "conversation."
 msgstr "debug &lt;選項&gt;:向目前的交談送出一些除錯資訊。"
 
 # XXX
-#: ../finch/gntconv.c:952 ../pidgin/gtkconv.c:7094
+#: ../finch/gntconv.c:952 ../pidgin/gtkconv.c:7220
 msgid "clear: Clears the conversation scrollback."
 msgstr "clear:清空交談的回捲緩衝區"
 
-#: ../finch/gntconv.c:955 ../pidgin/gtkconv.c:7097
+#: ../finch/gntconv.c:955 ../pidgin/gtkconv.c:7223
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr "help &lt;指令&gt;:顯示某一指令的說明。"
 
@@ -864,7 +884,7 @@
 msgid "statuses: Show the savedstatuses window."
 msgstr "statuses:「狀態清單」視窗"
 
-#: ../finch/gntdebug.c:230 ../finch/gntui.c:79 ../pidgin/gtkdebug.c:693
+#: ../finch/gntdebug.c:230 ../finch/gntui.c:79 ../pidgin/gtkdebug.c:694
 msgid "Debug Window"
 msgstr "除錯視窗"
 
@@ -872,7 +892,7 @@
 #. * 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:251 ../pidgin/gtkdebug.c:752
+#: ../finch/gntdebug.c:251 ../pidgin/gtkdebug.c:753
 msgid "Clear"
 msgstr "清除"
 
@@ -880,7 +900,7 @@
 msgid "Filter: "
 msgstr "過濾器:"
 
-#: ../finch/gntdebug.c:261 ../pidgin/gtkdebug.c:761
+#: ../finch/gntdebug.c:261 ../pidgin/gtkdebug.c:762
 msgid "Pause"
 msgstr "暫停"
 
@@ -916,24 +936,24 @@
 
 #. XXX: Use of ggp_str_to_uin() is an ugly hack!
 #: ../finch/gntft.c:197 ../finch/gntstatus.c:537 ../finch/gntstatus.c:566
-#: ../libpurple/protocols/bonjour/bonjour.c:326
+#: ../libpurple/protocols/bonjour/bonjour.c:318
 #: ../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/jabber/jabber.c:1220
 #: ../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/oscar/oscar.c:2657
+#: ../libpurple/protocols/oscar/oscar.c:3768
 #: ../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
+#: ../libpurple/protocols/yahoo/yahoo.c:3066 ../pidgin/gtkblist.c:3070
+#: ../pidgin/gtkblist.c:3083 ../pidgin/gtkblist.c:3085
 #: ../pidgin/gtksavedstatuses.c:943 ../pidgin/gtksavedstatuses.c:1090
 msgid "Status"
 msgstr "狀態"
@@ -953,8 +973,9 @@
 #. Close button
 #: ../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
+#: ../libpurple/protocols/msn/msn.c:375 ../libpurple/protocols/silc/util.c:382
+#: ../libpurple/protocols/silc10/util.c:377 ../pidgin/gtkaccount.c:2487
+#: ../pidgin/gtkrequest.c:272
 msgid "Close"
 msgstr "關閉"
 
@@ -981,7 +1002,7 @@
 msgid "Finished"
 msgstr "已完成"
 
-#: ../finch/gntft.c:428 ../libpurple/protocols/msn/session.c:346
+#: ../finch/gntft.c:428 ../libpurple/protocols/msn/session.c:347
 msgid "Transferring"
 msgstr "傳輸中"
 
@@ -997,7 +1018,7 @@
 # FIXME 原文一詞兩義,根本無法翻譯
 #  NOTE gntnotify 字義為「發信人」
 #  NOTE Jabber 術語字義見「Both」條
-#: ../finch/gntnotify.c:171 ../libpurple/protocols/jabber/jabber.c:1174
+#: ../finch/gntnotify.c:171 ../libpurple/protocols/jabber/jabber.c:1180
 msgid "From"
 msgstr "已認證對方"
 
@@ -1033,11 +1054,11 @@
 # XXX「Info」的作用似乎係取得使用者資訊,但不肯定,看了其他po檔仍是不肯定這是什麼
 # XXX javajsp (Ka-Hing CHEUNG) 見過的「Info」按紐全都是「取得使用者資訊」
 # XXX 注:現在 (2.0.0b4) 不是了,除錯視窗的「過濾程度」竟有「Info」(資訊)級別……
-#: ../finch/gntnotify.c:372 ../pidgin/gtkconv.c:1627 ../pidgin/gtkdebug.c:833
+#: ../finch/gntnotify.c:372 ../pidgin/gtkconv.c:1663 ../pidgin/gtkdebug.c:834
 msgid "Info"
 msgstr "資訊"
 
-#: ../finch/gntnotify.c:375 ../pidgin/gtkconv.c:1588
+#: ../finch/gntnotify.c:375 ../pidgin/gtkconv.c:1624
 msgid "IM"
 msgstr "即時訊息"
 
@@ -1100,7 +1121,7 @@
 msgstr "設定模組"
 
 #: ../finch/gntplugin.c:352 ../finch/gntplugin.c:359 ../finch/gntprefs.c:245
-#: ../finch/gntui.c:82 ../pidgin/gtkdocklet.c:524 ../pidgin/gtkprefs.c:1953
+#: ../finch/gntui.c:82 ../pidgin/gtkdocklet.c:524 ../pidgin/gtkprefs.c:1992
 msgid "Preferences"
 msgstr "偏好設定"
 
@@ -1121,9 +1142,7 @@
 msgstr "捕捉誰的狀態"
 
 #. Account:
-#. Set up stuff for the account box
-#: ../finch/gntpounce.c:333 ../finch/gntstatus.c:446 ../pidgin/gtkblist.c:5437
-#: ../pidgin/gtkblist.c:5753
+#: ../finch/gntpounce.c:333 ../finch/gntstatus.c:446
 msgid "Account:"
 msgstr "帳號:"
 
@@ -1278,12 +1297,12 @@
 msgid "Based on keyboard use"
 msgstr "以鍵盤的使用為基準"
 
-#: ../finch/gntprefs.c:81 ../pidgin/gtkprefs.c:1814
+#: ../finch/gntprefs.c:81 ../pidgin/gtkprefs.c:1853
 msgid "From last sent message"
 msgstr "從上次送出訊息時為基準"
 
 #: ../finch/gntprefs.c:83 ../pidgin/gtkprefs.c:820 ../pidgin/gtkprefs.c:829
-#: ../pidgin/gtkprefs.c:1813 ../pidgin/gtkprefs.c:1827
+#: ../pidgin/gtkprefs.c:1852 ../pidgin/gtkprefs.c:1866
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:337
 msgid "Never"
 msgstr "從不"
@@ -1317,12 +1336,12 @@
 msgstr "記錄所有的狀態改變"
 
 #. Conversations
-#: ../finch/gntprefs.c:241 ../pidgin/gtkprefs.c:898 ../pidgin/gtkprefs.c:1917
+#: ../finch/gntprefs.c:241 ../pidgin/gtkprefs.c:915 ../pidgin/gtkprefs.c:1956
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:344
 msgid "Conversations"
 msgstr "交談"
 
-#: ../finch/gntprefs.c:242 ../pidgin/gtkprefs.c:1355 ../pidgin/gtkprefs.c:1928
+#: ../finch/gntprefs.c:242 ../pidgin/gtkprefs.c:1392 ../pidgin/gtkprefs.c:1967
 msgid "Logging"
 msgstr "日誌"
 
@@ -1330,13 +1349,13 @@
 msgid "Not implemented yet."
 msgstr "該功能尚未實作"
 
-#: ../finch/gntrequest.c:597 ../pidgin/gtkrequest.c:1529
-#: ../pidgin/gtkrequest.c:1575
+#: ../finch/gntrequest.c:597 ../pidgin/gtkrequest.c:1530
+#: ../pidgin/gtkrequest.c:1576
 msgid "Save File..."
 msgstr "儲存檔案..."
 
-#: ../finch/gntrequest.c:597 ../pidgin/gtkrequest.c:1530
-#: ../pidgin/gtkrequest.c:1576
+#: ../finch/gntrequest.c:597 ../pidgin/gtkrequest.c:1531
+#: ../pidgin/gtkrequest.c:1577
 msgid "Open File..."
 msgstr "開啟檔案..."
 
@@ -1369,37 +1388,38 @@
 msgstr "格式"
 
 #: ../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/bonjour/bonjour.c:247
+#: ../libpurple/protocols/bonjour/bonjour.c:254
+#: ../libpurple/protocols/bonjour/bonjour.c:320
 #: ../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/jabber/jabber.c:1252
+#: ../libpurple/protocols/jabber/jabber.c:1262
+#: ../libpurple/protocols/jabber/jabber.c:1272
+#: ../libpurple/protocols/jabber/jabber.c:1282
+#: ../libpurple/protocols/jabber/jabber.c:1292
+#: ../libpurple/protocols/jabber/jabber.c:1304
 #: ../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/oscar/oscar.c:5506
+#: ../libpurple/protocols/oscar/oscar.c:5724
+#: ../libpurple/protocols/oscar/oscar.c:5738
+#: ../libpurple/protocols/oscar/oscar.c:5754
+#: ../libpurple/protocols/oscar/oscar.c:5761
+#: ../libpurple/protocols/oscar/oscar.c:5768
 #: ../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/silc10/buddy.c:1551
 #: ../libpurple/protocols/simple/simple.c:246
-#: ../libpurple/protocols/yahoo/yahoo.c:3477
-#: ../libpurple/protocols/yahoo/yahoo.c:3483
+#: ../libpurple/protocols/yahoo/yahoo.c:3494
+#: ../libpurple/protocols/yahoo/yahoo.c:3500
 #: ../libpurple/protocols/zephyr/zephyr.c:2337
 #: ../pidgin/gtksavedstatuses.c:490 ../pidgin/gtksavedstatuses.c:954
 msgid "Message"
@@ -1468,7 +1488,7 @@
 msgid ""
 "When the gnt clipboard contents change, the contents are made available to "
 "X, if possible."
-msgstr "當 gnt 的剪則薄內容有所變更時,儘可能把新的內容滙出至 X 視窗系統。"
+msgstr "當 gnt 的剪貼簿內容有所變更時,儘可能把新的內容匯出至 X 視窗系統。"
 
 #: ../finch/plugins/gntgf.c:231
 #, c-format
@@ -1610,8 +1630,13 @@
 msgid "Missing protocol plugin for %s"
 msgstr "找不到 %s 的協定模組"
 
+#: ../libpurple/account.c:1012 ../libpurple/connection.c:107
+#: ../pidgin/gtkblist.c:3992
+msgid "Connection Error"
+msgstr "連線錯誤"
+
 #: ../libpurple/account.c:1170 ../libpurple/protocols/gg/gg.c:702
-#: ../libpurple/protocols/jabber/jabber.c:1336
+#: ../libpurple/protocols/jabber/jabber.c:1342
 msgid "New passwords do not match."
 msgstr "新密碼並不相符。"
 
@@ -1668,7 +1693,7 @@
 
 #: ../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/gtkblist.c:5284 ../pidgin/plugins/gevolution/gevolution.c:96
 #: ../pidgin/plugins/gevolution/gevo-util.c:64
 msgid "Buddies"
 msgstr "好友"
@@ -1694,7 +1719,7 @@
 #: ../libpurple/connection.c:440 ../libpurple/plugin.c:282
 #: ../libpurple/protocols/jabber/buddy.c:1712
 #: ../libpurple/protocols/msn/servconn.c:139
-#: ../libpurple/protocols/msn/session.c:321
+#: ../libpurple/protocols/msn/session.c:322
 msgid "Unknown error"
 msgstr "未知錯誤"
 
@@ -1711,7 +1736,8 @@
 msgid "The message is too large."
 msgstr "這個訊息太大了。"
 
-#: ../libpurple/conversation.c:178
+#: ../libpurple/conversation.c:178 ../libpurple/protocols/bonjour/jabber.c:283
+#: ../libpurple/protocols/bonjour/jabber.c:325
 msgid "Unable to send message."
 msgstr "無法送出訊息。"
 
@@ -1723,32 +1749,32 @@
 msgid "_Send Message"
 msgstr "送出訊息(_S)"
 
-#: ../libpurple/conversation.c:1570
+#: ../libpurple/conversation.c:1572
 #, c-format
 msgid "%s entered the room."
 msgstr "%s 進入聊天室。"
 
-#: ../libpurple/conversation.c:1573
+#: ../libpurple/conversation.c:1575
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>] 進入聊天室。"
 
-#: ../libpurple/conversation.c:1678
+#: ../libpurple/conversation.c:1682
 #, c-format
 msgid "You are now known as %s"
 msgstr "你改變暱稱為 %s"
 
-#: ../libpurple/conversation.c:1698
+#: ../libpurple/conversation.c:1702
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s 改變暱稱為 %s"
 
-#: ../libpurple/conversation.c:1771
+#: ../libpurple/conversation.c:1775
 #, c-format
 msgid "%s left the room."
 msgstr "%s 離開聊天室。"
 
-#: ../libpurple/conversation.c:1774
+#: ../libpurple/conversation.c:1778
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s 離開聊天室 (%s)。"
@@ -2251,12 +2277,12 @@
 #: ../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/protocols/oscar/oscar.c:2232
+#: ../libpurple/protocols/oscar/oscar.c:2279
+#: ../libpurple/protocols/oscar/oscar.c:5838
+#: ../libpurple/protocols/oscar/oscar.c:5893
+#: ../libpurple/protocols/oscar/oscar.c:6119
+#: ../libpurple/protocols/oscar/oscar.c:6189 ../libpurple/request.h:1387
 #: ../libpurple/request.h:1397
 msgid "_Cancel"
 msgstr "取消(_C)"
@@ -2314,8 +2340,8 @@
 "當完成自動接受檔案傳輸時跳出視窗通知\n"
 "(只發生在未與傳送者進行交談的情況下)"
 
-#: ../libpurple/plugins/buddynote.c:46 ../libpurple/protocols/msn/msn.c:1608
-#: ../libpurple/protocols/msn/msn.c:1638
+#: ../libpurple/plugins/buddynote.c:46 ../libpurple/protocols/msn/msn.c:1629
+#: ../libpurple/protocols/msn/msn.c:1659
 msgid "Notes"
 msgstr "備註"
 
@@ -2323,7 +2349,7 @@
 msgid "Enter your notes below..."
 msgstr "請在下面的空位輸入備註"
 
-#: ../libpurple/plugins/buddynote.c:62
+#: ../libpurple/plugins/buddynote.c:65
 msgid "Edit Notes..."
 msgstr "編輯備註..."
 
@@ -2335,18 +2361,18 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/buddynote.c:87
+#: ../libpurple/plugins/buddynote.c:90
 msgid "Buddy Notes"
 msgstr "好友備註"
 
 #. *< name
 #. *< version
-#: ../libpurple/plugins/buddynote.c:89
+#: ../libpurple/plugins/buddynote.c:92
 msgid "Store notes on particular buddies."
 msgstr "給個別好友加上備註。"
 
 #. *< summary
-#: ../libpurple/plugins/buddynote.c:90
+#: ../libpurple/plugins/buddynote.c:93
 msgid "Adds the option to store notes for buddies on your buddy list."
 msgstr "提供給好友清單上的好友加上備註的功能。"
 
@@ -2553,40 +2579,40 @@
 msgid "(UTC)"
 msgstr "(UTC)"
 
-#: ../libpurple/plugins/log_reader.c:1552
+#: ../libpurple/plugins/log_reader.c:1573
 msgid "User is offline."
 msgstr "使用者是離線的。"
 
-#: ../libpurple/plugins/log_reader.c:1558
+#: ../libpurple/plugins/log_reader.c:1579
 msgid "Auto-response sent:"
 msgstr "自動回應送出:"
 
-#: ../libpurple/plugins/log_reader.c:1568
-#: ../libpurple/plugins/log_reader.c:1571
+#: ../libpurple/plugins/log_reader.c:1589
+#: ../libpurple/plugins/log_reader.c:1592
 #: ../libpurple/plugins/statenotify.c:80
 #, c-format
 msgid "%s has signed off."
 msgstr "%s 已經登出。"
 
-#: ../libpurple/plugins/log_reader.c:1585
+#: ../libpurple/plugins/log_reader.c:1606
 msgid "One or more messages may have been undeliverable."
 msgstr "一個或多個訊息可能傳送失敗。"
 
-#: ../libpurple/plugins/log_reader.c:1595
+#: ../libpurple/plugins/log_reader.c:1616
 msgid "You were disconnected from the server."
 msgstr "您已經停止與伺服器的連線。"
 
-#: ../libpurple/plugins/log_reader.c:1603
+#: ../libpurple/plugins/log_reader.c:1624
 msgid ""
 "You are currently disconnected. Messages will not be received unless you are "
 "logged in."
 msgstr "您目前是離線狀態。在您重新登入前,將無法收到任何訊息。"
 
-#: ../libpurple/plugins/log_reader.c:1618
+#: ../libpurple/plugins/log_reader.c:1639
 msgid "Message could not be sent because the maximum length was exceeded."
 msgstr "由於達到長度上限,所以訊息無法送出。"
 
-#: ../libpurple/plugins/log_reader.c:1623
+#: ../libpurple/plugins/log_reader.c:1644
 msgid "Message could not be sent."
 msgstr "訊息無法送出。"
 
@@ -2594,32 +2620,32 @@
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:1976
-#: ../libpurple/plugins/log_reader.c:2085
+#: ../libpurple/plugins/log_reader.c:1989
+#: ../libpurple/plugins/log_reader.c:2098
 msgid "Adium"
 msgstr "Adium"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:1989
-#: ../libpurple/plugins/log_reader.c:2090
+#: ../libpurple/plugins/log_reader.c:2002
+#: ../libpurple/plugins/log_reader.c:2103
 msgid "Fire"
 msgstr "Fire"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2001
-#: ../libpurple/plugins/log_reader.c:2094
+#: ../libpurple/plugins/log_reader.c:2014
+#: ../libpurple/plugins/log_reader.c:2107
 msgid "Messenger Plus!"
 msgstr "Messenger Plus!"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2014
-#: ../libpurple/plugins/log_reader.c:2099
+#: ../libpurple/plugins/log_reader.c:2027
+#: ../libpurple/plugins/log_reader.c:2112
 msgid "MSN Messenger"
 msgstr "MSN Messenger"
 
@@ -2627,28 +2653,28 @@
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2026
-#: ../libpurple/plugins/log_reader.c:2103
+#: ../libpurple/plugins/log_reader.c:2039
+#: ../libpurple/plugins/log_reader.c:2116
 msgid "Trillian"
 msgstr "Trillian"
 
 #. Add general preferences.
-#: ../libpurple/plugins/log_reader.c:2067
+#: ../libpurple/plugins/log_reader.c:2080
 msgid "General Log Reading Configuration"
 msgstr "基本的日誌讀取設定"
 
-#: ../libpurple/plugins/log_reader.c:2071
+#: ../libpurple/plugins/log_reader.c:2084
 msgid "Fast size calculations"
 msgstr "快速計算日誌大小"
 
 #  XXX 譯文計有「啟發式XX」、「經驗法則」、「發現技法」、「探索法」、「探究法」等(後兩者似乎只限用於數學)
 #  XXX 這裏的「name heuristics」是指一些幫助 Pidgin「估計」帳號身分的經驗性規則;單從字義判斷,合用的譯文只有「經驗法則」
-#: ../libpurple/plugins/log_reader.c:2075
+#: ../libpurple/plugins/log_reader.c:2088
 msgid "Use name heuristics"
 msgstr "匹配帳號時使用經驗法則 (heuristics)"
 
 #. Add Log Directory preferences.
-#: ../libpurple/plugins/log_reader.c:2081
+#: ../libpurple/plugins/log_reader.c:2094
 msgid "Log Directory"
 msgstr "日誌目錄"
 
@@ -2658,20 +2684,20 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/log_reader.c:2132
+#: ../libpurple/plugins/log_reader.c:2145
 msgid "Log Reader"
 msgstr "日誌檢視器"
 
 #. *< name
 #. *< version
 #. * summary
-#: ../libpurple/plugins/log_reader.c:2136
+#: ../libpurple/plugins/log_reader.c:2149
 msgid "Includes other IM clients' logs in the log viewer."
 msgstr "在日誌瀏覽器中包含其他即時訊息用戶端日誌。"
 
 # XXX 譯文有待改進(第二段) - 20061025
 #. * description
-#: ../libpurple/plugins/log_reader.c:2140
+#: ../libpurple/plugins/log_reader.c:2153
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
 "Currently, this includes Adium, MSN Messenger, and Trillian.\n"
@@ -2756,9 +2782,11 @@
 #: ../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
+#: ../libpurple/protocols/silc/buddy.c:317
+#: ../libpurple/protocols/silc/pk.c:113 ../libpurple/protocols/silc/wb.c:304
+#: ../libpurple/protocols/silc10/buddy.c:314
+#: ../libpurple/protocols/silc10/pk.c:119
+#: ../libpurple/protocols/silc10/wb.c:304 ../pidgin/gtkrequest.c:267
 msgid "Yes"
 msgstr "是"
 
@@ -2766,9 +2794,11 @@
 #: ../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
+#: ../libpurple/protocols/silc/buddy.c:318
+#: ../libpurple/protocols/silc/pk.c:114 ../libpurple/protocols/silc/wb.c:305
+#: ../libpurple/protocols/silc10/buddy.c:315
+#: ../libpurple/protocols/silc10/pk.c:120
+#: ../libpurple/protocols/silc10/wb.c:305 ../pidgin/gtkrequest.c:268
 msgid "No"
 msgstr "否"
 
@@ -2895,7 +2925,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:263
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:275
 msgid "GNUTLS"
 msgstr "GNUTLS"
 
@@ -2903,8 +2933,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:266
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:268
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:278
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:280
 msgid "Provides SSL support through GNUTLS."
 msgstr "透過 GNUTLS 提供 SSL 的支援。"
 
@@ -2914,7 +2944,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ssl/ssl-nss.c:415
+#: ../libpurple/plugins/ssl/ssl-nss.c:423
 msgid "NSS"
 msgstr "NSS"
 
@@ -2922,8 +2952,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ssl/ssl-nss.c:418
-#: ../libpurple/plugins/ssl/ssl-nss.c:420
+#: ../libpurple/plugins/ssl/ssl-nss.c:426
+#: ../libpurple/plugins/ssl/ssl-nss.c:428
 msgid "Provides SSL support through Mozilla NSS."
 msgstr "透過 Mozilla 的 NSS 提供 SSL 的支援。"
 
@@ -2997,7 +3027,7 @@
 msgid "Provides support for loading Tcl plugins"
 msgstr "提供讀入 Tcl 模組的支援"
 
-#: ../libpurple/plugins/tcl/tcl.c:495
+#: ../libpurple/plugins/tcl/tcl.c:507
 msgid ""
 "Unable to detect ActiveTCL installation. If you wish to use TCL plugins, "
 "install ActiveTCL from http://www.activestate.com\n"
@@ -3006,11 +3036,11 @@
 "com 下載及安裝 ActiveTCL。\n"
 
 #. Send a message about the connection error
-#: ../libpurple/protocols/bonjour/bonjour.c:113
+#: ../libpurple/protocols/bonjour/bonjour.c:112
 msgid "Unable to listen for incoming IM connections\n"
 msgstr "無法接收連入的即時訊息連線\n"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:148
+#: ../libpurple/protocols/bonjour/bonjour.c:137
 msgid ""
 "Unable to establish connection with the local mDNS server.  Is it running?"
 msgstr "無法與近端的 mDNS 伺服器建立連線。它在執行中嗎?"
@@ -3018,18 +3048,19 @@
 #. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
 #. Away stuff
-#: ../libpurple/protocols/bonjour/bonjour.c:302
+#: ../libpurple/protocols/bonjour/bonjour.c:294
 #: ../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/oscar/oscar.c:4519
+#: ../libpurple/protocols/oscar/oscar.c:5584
 #: ../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
+#: ../libpurple/protocols/silc10/buddy.c:1476
+#: ../libpurple/protocols/yahoo/yahoo.c:3397
+#: ../libpurple/protocols/yahoo/yahoo.c:3470 ../libpurple/status.c:157
+#: ../pidgin/gtkdocklet.c:442 ../pidgin/gtkprefs.c:1862
 #: ../pidgin/gtkstatusbox.c:1052
 msgid "Away"
 msgstr "離開"
@@ -3044,89 +3075,94 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/bonjour/bonjour.c:431
-#: ../libpurple/protocols/bonjour/bonjour.c:433
+#: ../libpurple/protocols/bonjour/bonjour.c:425
+#: ../libpurple/protocols/bonjour/bonjour.c:427
 msgid "Bonjour Protocol Plugin"
 msgstr "Bonjour 協定模組"
 
 #  XXX 這原文很奇怪 - ambrose 20070414
 #  NOTE 對應 evolution PO 檔之譯法,詳見上面「Local Addressbook」條
-#: ../libpurple/protocols/bonjour/bonjour.c:476
-#: ../libpurple/protocols/bonjour/bonjour.c:483
-#: ../libpurple/protocols/bonjour/bonjour.c:541
+#: ../libpurple/protocols/bonjour/bonjour.c:470
+#: ../libpurple/protocols/bonjour/bonjour.c:477
+#: ../libpurple/protocols/bonjour/bonjour.c:535
 msgid "Purple Person"
 msgstr "連絡人"
 
 #. Creating the user splits
-#: ../libpurple/protocols/bonjour/bonjour.c:589
-#: ../libpurple/protocols/silc/silc.c:926
+#: ../libpurple/protocols/bonjour/bonjour.c:583
+#: ../libpurple/protocols/silc/silc.c:1007
+#: ../libpurple/protocols/silc10/silc.c:918
 msgid "Hostname"
 msgstr "主機名稱"
 
 #. Creating the options for the protocol
-#: ../libpurple/protocols/bonjour/bonjour.c:593
+#: ../libpurple/protocols/bonjour/bonjour.c:587
 #: ../libpurple/protocols/gg/gg.c:627
-#: ../libpurple/protocols/jabber/jabber.c:824
+#: ../libpurple/protocols/jabber/jabber.c:828
 msgid "First name"
 msgstr "名"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:596
+#: ../libpurple/protocols/bonjour/bonjour.c:590
 #: ../libpurple/protocols/gg/gg.c:622
-#: ../libpurple/protocols/jabber/jabber.c:829
+#: ../libpurple/protocols/jabber/jabber.c:833
 msgid "Last name"
 msgstr "姓"
 
+#: ../libpurple/protocols/bonjour/bonjour.c:593
+#: ../libpurple/protocols/gg/gg.c:472
+#: ../libpurple/protocols/jabber/jabber.c:818
+#: ../libpurple/protocols/silc/silc.c:770
+#: ../libpurple/protocols/silc/silc.c:1011
+#: ../libpurple/protocols/silc10/silc.c:681
+#: ../libpurple/protocols/silc10/silc.c:922
+msgid "E-mail"
+msgstr "電子郵件"
+
+#: ../libpurple/protocols/bonjour/bonjour.c:596
+msgid "AIM Account"
+msgstr "AIM 帳號"
+
 #: ../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:930
-msgid "E-mail"
-msgstr "電子郵件"
-
-#: ../libpurple/protocols/bonjour/bonjour.c:602
-msgid "AIM Account"
-msgstr "AIM 帳號"
-
-#: ../libpurple/protocols/bonjour/bonjour.c:605
 msgid "XMPP Account"
 msgstr "XMPP 帳號"
 
 # NOTE 這是通訊協定名稱,不是問候語
-#: ../libpurple/protocols/bonjour/bonjour.h:35
+#: ../libpurple/protocols/bonjour/bonjour.h:33
 msgid "Bonjour"
 msgstr "Bonjour"
 
-#: ../libpurple/protocols/bonjour/jabber.c:374
+#: ../libpurple/protocols/bonjour/jabber.c:394
 #, c-format
 msgid "%s has closed the conversation."
 msgstr "%s 已經關閉這個交談。"
 
-#: ../libpurple/protocols/bonjour/jabber.c:461
+#: ../libpurple/protocols/bonjour/jabber.c:440
+#: ../libpurple/protocols/bonjour/jabber.c:653
+#: ../libpurple/protocols/bonjour/jabber.c:678
+msgid "Unable to send the message, the conversation couldn't be started."
+msgstr "無法送出訊息,交談無法開始。"
+
+#: ../libpurple/protocols/bonjour/jabber.c:574
 msgid "Cannot open socket"
 msgstr "無法開啟Socket"
 
-#: ../libpurple/protocols/bonjour/jabber.c:469
+#: ../libpurple/protocols/bonjour/jabber.c:582
 msgid "Error setting socket options"
 msgstr "設定 Socket 選項時錯誤"
 
-#: ../libpurple/protocols/bonjour/jabber.c:493
+#: ../libpurple/protocols/bonjour/jabber.c:606
 msgid "Could not bind socket to port"
 msgstr "無法聯結 Socket 到通訊埠"
 
-#: ../libpurple/protocols/bonjour/jabber.c:501
+#: ../libpurple/protocols/bonjour/jabber.c:614
 msgid "Could not listen on socket"
 msgstr "無法監聽 Socket"
 
-#: ../libpurple/protocols/bonjour/jabber.c:599
-msgid "Unable to send the message, the conversation couldn't be started."
-msgstr "無法送出訊息,交談無法開始。"
-
-#: ../libpurple/protocols/gg/gg.c:76 ../libpurple/proxy.c:1800
+#: ../libpurple/protocols/gg/gg.c:76 ../libpurple/proxy.c:1812
 msgid "Invalid proxy settings"
 msgstr "無效的代理伺服器設定"
 
-#: ../libpurple/protocols/gg/gg.c:77 ../libpurple/proxy.c:1800
+#: ../libpurple/protocols/gg/gg.c:77 ../libpurple/proxy.c:1812
 msgid ""
 "Either the host name or port number specified for your given proxy type is "
 "invalid."
@@ -3196,8 +3232,8 @@
 msgstr "註冊成功!"
 
 #: ../libpurple/protocols/gg/gg.c:477 ../libpurple/protocols/gg/gg.c:770
-#: ../libpurple/protocols/jabber/jabber.c:803
-#: ../libpurple/protocols/jabber/jabber.c:1371
+#: ../libpurple/protocols/jabber/jabber.c:807
+#: ../libpurple/protocols/jabber/jabber.c:1377
 msgid "Password"
 msgstr "密碼"
 
@@ -3223,9 +3259,9 @@
 
 #: ../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/jabber/jabber.c:843
+#: ../libpurple/protocols/oscar/oscar.c:3777
+#: ../libpurple/protocols/oscar/oscar.c:3790
 #: ../libpurple/protocols/qq/buddy_info.c:49
 msgid "City"
 msgstr "城市"
@@ -3234,8 +3270,8 @@
 msgid "Year of birth"
 msgstr "出生年"
 
-#: ../libpurple/protocols/gg/gg.c:645 ../libpurple/protocols/msn/msn.c:1537
-#: ../libpurple/protocols/oscar/oscar.c:3719
+#: ../libpurple/protocols/gg/gg.c:645 ../libpurple/protocols/msn/msn.c:1558
+#: ../libpurple/protocols/oscar/oscar.c:3720
 #: ../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
@@ -3248,14 +3284,14 @@
 msgstr "男性或女性"
 
 #: ../libpurple/protocols/gg/gg.c:647
-#: ../libpurple/protocols/oscar/oscar.c:3719
+#: ../libpurple/protocols/oscar/oscar.c:3720
 #: ../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:3719
+#: ../libpurple/protocols/oscar/oscar.c:3720
 #: ../libpurple/protocols/qq/buddy_info.c:84
 #: ../libpurple/protocols/qq/qq.c:227
 msgid "Female"
@@ -3299,7 +3335,7 @@
 
 #: ../libpurple/protocols/gg/gg.c:790
 msgid "Please, enter your current password and your new password for UIN: "
-msgstr "請輸您的舊密碼及你的新密碼:"
+msgstr "請輸入您的舊密碼及你的新密碼:"
 
 #: ../libpurple/protocols/gg/gg.c:794 ../libpurple/protocols/gg/gg.c:795
 msgid "Change Gadu-Gadu Password"
@@ -3318,10 +3354,10 @@
 #: ../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/oscar/oscar.c:5556
 #: ../libpurple/protocols/qq/qq.c:170 ../libpurple/protocols/qq/qq.c:177
-#: ../libpurple/protocols/yahoo/yahoo.c:2900 ../libpurple/status.c:153
-#: ../pidgin/gtkblist.c:3053 ../pidgin/gtkblist.c:3378
+#: ../libpurple/protocols/yahoo/yahoo.c:2917 ../libpurple/status.c:153
+#: ../pidgin/gtkblist.c:3070 ../pidgin/gtkblist.c:3398
 #: ../pidgin/gtkdocklet.c:450 ../pidgin/gtkstatusbox.c:1054
 msgid "Offline"
 msgstr "離線"
@@ -3331,22 +3367,23 @@
 #: ../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:2902 ../libpurple/status.c:154
+#: ../libpurple/protocols/yahoo/yahoo.c:2919 ../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:2655
-#: ../libpurple/protocols/oscar/oscar.c:3686
+#: ../libpurple/protocols/oscar/oscar.c:2656
+#: ../libpurple/protocols/oscar/oscar.c:3687
 msgid "UIN"
 msgstr "帳號"
 
 #: ../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
+#: ../libpurple/protocols/oscar/oscar.c:3698
+#: ../libpurple/protocols/silc/ops.c:990
+#: ../libpurple/protocols/silc10/ops.c:1024
 msgid "First Name"
 msgstr "名"
 
@@ -3355,7 +3392,7 @@
 msgstr "出生年"
 
 #: ../libpurple/protocols/gg/gg.c:1108 ../libpurple/protocols/gg/gg.c:1177
-#: ../libpurple/protocols/oscar/oscar.c:3898
+#: ../libpurple/protocols/oscar/oscar.c:3899
 msgid "Unable to display the search results."
 msgstr "無法顯示搜尋結果。"
 
@@ -3485,21 +3522,24 @@
 msgstr "Gadu-Gadu 使用者"
 
 #: ../libpurple/protocols/irc/cmds.c:43
-#: ../libpurple/protocols/silc/silc.c:1577
+#: ../libpurple/protocols/silc/silc.c:1637
+#: ../libpurple/protocols/silc10/silc.c:1566
 #, c-format
 msgid "Unknown command: %s"
 msgstr "未知的指令:%s"
 
 #: ../libpurple/protocols/irc/cmds.c:503
 #: ../libpurple/protocols/jabber/chat.c:591
-#: ../libpurple/protocols/silc/silc.c:1285
+#: ../libpurple/protocols/silc/silc.c:1345
+#: ../libpurple/protocols/silc10/silc.c:1274
 #, c-format
 msgid "current topic is: %s"
 msgstr "現在的主題為:%s"
 
 #: ../libpurple/protocols/irc/cmds.c:507
 #: ../libpurple/protocols/jabber/chat.c:595
-#: ../libpurple/protocols/silc/silc.c:1289
+#: ../libpurple/protocols/silc/silc.c:1349
+#: ../libpurple/protocols/silc10/silc.c:1278
 msgid "No topic is set"
 msgstr "沒有設定主題"
 
@@ -3543,11 +3583,12 @@
 msgstr "顯示是日訊息 (MOTD)"
 
 #: ../libpurple/protocols/irc/irc.c:261 ../libpurple/protocols/silc/chat.c:33
+#: ../libpurple/protocols/silc10/chat.c:33
 msgid "_Channel:"
 msgstr "頻道(_C):"
 
 #: ../libpurple/protocols/irc/irc.c:267
-#: ../libpurple/protocols/jabber/chat.c:59
+#: ../libpurple/protocols/jabber/chat.c:59 ../pidgin/gtkaccount.c:523
 msgid "_Password:"
 msgstr "密碼(_P):"
 
@@ -3557,22 +3598,22 @@
 
 #. connect to the server
 #: ../libpurple/protocols/irc/irc.c:319
-#: ../libpurple/protocols/jabber/jabber.c:1044
-#: ../libpurple/protocols/msn/session.c:344
+#: ../libpurple/protocols/jabber/jabber.c:1048
+#: ../libpurple/protocols/msn/session.c:345
 #: ../libpurple/protocols/novell/novell.c:2182
 #: ../libpurple/protocols/oscar/oscar.c:1270
 #: ../libpurple/protocols/qq/qq.c:136
 #: ../libpurple/protocols/sametime/sametime.c:3723
 #: ../libpurple/protocols/simple/simple.c:1671
-#: ../libpurple/protocols/yahoo/yahoo.c:2745
+#: ../libpurple/protocols/yahoo/yahoo.c:2762
 #: ../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:599
-#: ../libpurple/protocols/jabber/jabber.c:946
+#: ../libpurple/protocols/jabber/jabber.c:603
+#: ../libpurple/protocols/jabber/jabber.c:950
 msgid "SSL support unavailable"
 msgstr "沒有 SSL 支援"
 
@@ -3583,7 +3624,6 @@
 msgstr "無法建立 Socket"
 
 #: ../libpurple/protocols/irc/irc.c:416
-#: ../libpurple/protocols/jabber/jabber.c:466
 #: ../libpurple/protocols/oscar/oscar.c:1266
 msgid "Couldn't connect to host"
 msgstr "無法連到伺服器"
@@ -3593,12 +3633,12 @@
 # NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
 # XXX 真正的意思是「無法連線至認證所需的遠端資源」,不是「連線失敗」(見上列文章)
 #: ../libpurple/protocols/irc/irc.c:438
-#: ../libpurple/protocols/jabber/jabber.c:495
+#: ../libpurple/protocols/jabber/jabber.c:499
 msgid "Connection Failed"
 msgstr "無法連線至認證所需的遠端資源"
 
 #: ../libpurple/protocols/irc/irc.c:441
-#: ../libpurple/protocols/jabber/jabber.c:498
+#: ../libpurple/protocols/jabber/jabber.c:502
 msgid "SSL Handshake Failed"
 msgstr "SSL 交談失敗"
 
@@ -3608,15 +3648,18 @@
 msgstr "讀取錯誤"
 
 #: ../libpurple/protocols/irc/irc.c:775
-#: ../libpurple/protocols/silc/chat.c:1426
+#: ../libpurple/protocols/silc/chat.c:1412
+#: ../libpurple/protocols/silc10/chat.c:1426
 #: ../libpurple/protocols/yahoo/yahoochat.c:1438
 msgid "Users"
 msgstr "使用者"
 
 #: ../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/silc/chat.c:1415
+#: ../libpurple/protocols/silc/ops.c:1389
+#: ../libpurple/protocols/silc10/chat.c:1429
+#: ../libpurple/protocols/silc10/ops.c:1382
 #: ../libpurple/protocols/yahoo/yahoochat.c:1447
 msgid "Topic"
 msgstr "主題"
@@ -3640,23 +3683,26 @@
 
 #. host to connect to
 #: ../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/msn/msn.c:2154
+#: ../libpurple/protocols/oscar/oscar.c:6623
 #: ../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/silc/ops.c:1249
+#: ../libpurple/protocols/silc/ops.c:1341
+#: ../libpurple/protocols/silc10/ops.c:1244
+#: ../libpurple/protocols/silc10/ops.c:1347
 #: ../libpurple/protocols/simple/simple.c:1850
 #: ../libpurple/protocols/toc/toc.c:2327
 msgid "Server"
 msgstr "伺服器"
 
 #. port to connect to
-#: ../libpurple/protocols/irc/irc.c:944 ../libpurple/protocols/msn/msn.c:2135
-#: ../libpurple/protocols/oscar/oscar.c:6584
+#: ../libpurple/protocols/irc/irc.c:944 ../libpurple/protocols/msn/msn.c:2159
+#: ../libpurple/protocols/oscar/oscar.c:6626
 #: ../libpurple/protocols/qq/qq.c:759
 #: ../libpurple/protocols/sametime/sametime.c:5732
-#: ../libpurple/protocols/silc/silc.c:1870
+#: ../libpurple/protocols/silc/silc.c:1917
+#: ../libpurple/protocols/silc10/silc.c:1859
 #: ../libpurple/protocols/toc/toc.c:2331
 msgid "Port"
 msgstr "通訊埠"
@@ -3666,18 +3712,25 @@
 msgstr "編碼"
 
 #: ../libpurple/protocols/irc/irc.c:950 ../libpurple/protocols/irc/msgs.c:316
-#: ../libpurple/protocols/jabber/jabber.c:799
+#: ../libpurple/protocols/jabber/jabber.c:803
 #: ../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:924
+#: ../libpurple/protocols/silc/ops.c:1197
+#: ../libpurple/protocols/silc/ops.c:1200
+#: ../libpurple/protocols/silc/ops.c:1334
+#: ../libpurple/protocols/silc/ops.c:1337
+#: ../libpurple/protocols/silc/silc.c:1005
+#: ../libpurple/protocols/silc10/buddy.c:1539
+#: ../libpurple/protocols/silc10/ops.c:1191
+#: ../libpurple/protocols/silc10/ops.c:1194
+#: ../libpurple/protocols/silc10/ops.c:1340
+#: ../libpurple/protocols/silc10/ops.c:1343
+#: ../libpurple/protocols/silc10/silc.c:916
 msgid "Username"
 msgstr "使用者"
 
 #: ../libpurple/protocols/irc/irc.c:953 ../libpurple/protocols/irc/msgs.c:317
-#: ../libpurple/protocols/silc/silc.c:928
+#: ../libpurple/protocols/silc/silc.c:1009
+#: ../libpurple/protocols/silc10/silc.c:920
 msgid "Real name"
 msgstr "姓名"
 
@@ -3719,13 +3772,15 @@
 msgstr " <i>(已驗證)</i>"
 
 #: ../libpurple/protocols/irc/msgs.c:303
-#: ../libpurple/protocols/oscar/oscar.c:3687
-#: ../libpurple/protocols/silc/ops.c:1414
+#: ../libpurple/protocols/oscar/oscar.c:3688
+#: ../libpurple/protocols/silc/ops.c:1418
+#: ../libpurple/protocols/silc10/ops.c:1414
 msgid "Nick"
 msgstr "暱稱"
 
 #: ../libpurple/protocols/irc/msgs.c:329
-#: ../libpurple/protocols/silc/ops.c:1272
+#: ../libpurple/protocols/silc/ops.c:1268
+#: ../libpurple/protocols/silc10/ops.c:1272
 msgid "Currently on"
 msgstr "所在頻道"
 
@@ -3747,150 +3802,152 @@
 msgstr "光宗耀祖"
 
 # NOTE 新版的IRC prpl起動時不顯示這個;直譯「修改」沒有問題
-#: ../libpurple/protocols/irc/msgs.c:417
+#: ../libpurple/protocols/irc/msgs.c:420
 #, c-format
 msgid "%s has changed the topic to: %s"
 msgstr "%s 把聊天主題修改為:%s"
 
 # NOTE 新版的IRC prpl起動時不顯示這個;直譯「修改」沒有問題
-#: ../libpurple/protocols/irc/msgs.c:419
+#: ../libpurple/protocols/irc/msgs.c:422
 #, c-format
 msgid "%s has cleared the topic."
 msgstr "%s 已經把主題清除。"
 
-#: ../libpurple/protocols/irc/msgs.c:427
+#: ../libpurple/protocols/irc/msgs.c:430
 #, c-format
 msgid "The topic for %s is: %s"
 msgstr "%s 的主題為:%s"
 
-#: ../libpurple/protocols/irc/msgs.c:445
+#: ../libpurple/protocols/irc/msgs.c:448
 #, c-format
 msgid "Unknown message '%s'"
 msgstr "不明的訊息「%s」"
 
-#: ../libpurple/protocols/irc/msgs.c:446
+#: ../libpurple/protocols/irc/msgs.c:449
 msgid "Unknown message"
 msgstr "不明的訊息"
 
-#: ../libpurple/protocols/irc/msgs.c:446
+#: ../libpurple/protocols/irc/msgs.c:449
 msgid "The IRC server received a message it did not understand."
 msgstr "IRC 伺服器收到了個它不明白的訊息。"
 
-#: ../libpurple/protocols/irc/msgs.c:467
+#: ../libpurple/protocols/irc/msgs.c:470
 #, c-format
 msgid "Users on %s: %s"
 msgstr "在 %s 內的使用者:%s"
 
 #  XXX
-#: ../libpurple/protocols/irc/msgs.c:572
+#: ../libpurple/protocols/irc/msgs.c:575
 msgid "Time Response"
 msgstr "時間回應"
 
 #  XXX
-#: ../libpurple/protocols/irc/msgs.c:573
+#: ../libpurple/protocols/irc/msgs.c:576
 msgid "The IRC server's local time is:"
 msgstr "IRC 伺服器端之時間為:"
 
-#: ../libpurple/protocols/irc/msgs.c:584
+#: ../libpurple/protocols/irc/msgs.c:587
 msgid "No such channel"
 msgstr "沒有那個頻道"
 
 #. does this happen?
-#: ../libpurple/protocols/irc/msgs.c:595
+#: ../libpurple/protocols/irc/msgs.c:598
 msgid "no such channel"
 msgstr "沒有那個頻道"
 
-#: ../libpurple/protocols/irc/msgs.c:598
+#: ../libpurple/protocols/irc/msgs.c:601
 msgid "User is not logged in"
 msgstr "使用者沒有登入"
 
-#: ../libpurple/protocols/irc/msgs.c:603
+#: ../libpurple/protocols/irc/msgs.c:606
 msgid "No such nick or channel"
 msgstr "沒有那個暱稱或頻道"
 
-#: ../libpurple/protocols/irc/msgs.c:623
+#: ../libpurple/protocols/irc/msgs.c:626
 msgid "Could not send"
 msgstr "無法送出"
 
-#: ../libpurple/protocols/irc/msgs.c:679
+#: ../libpurple/protocols/irc/msgs.c:682
 #, c-format
 msgid "Joining %s requires an invitation."
 msgstr "只有被邀請者才可加入 %s。"
 
-#: ../libpurple/protocols/irc/msgs.c:680
+#: ../libpurple/protocols/irc/msgs.c:683
 msgid "Invitation only"
 msgstr "只限被邀請者"
 
-#: ../libpurple/protocols/irc/msgs.c:792
+#: ../libpurple/protocols/irc/msgs.c:795
 #, c-format
 msgid "You have been kicked by %s: (%s)"
 msgstr "您被 %s 踢出:(%s)"
 
 #. Remove user from channel
-#: ../libpurple/protocols/irc/msgs.c:797 ../libpurple/protocols/silc/ops.c:720
+#: ../libpurple/protocols/irc/msgs.c:800 ../libpurple/protocols/silc/ops.c:699
+#: ../libpurple/protocols/silc10/ops.c:720
 #, c-format
 msgid "Kicked by %s (%s)"
 msgstr "被 %s 踢出 (%s)"
 
-#: ../libpurple/protocols/irc/msgs.c:820
+#: ../libpurple/protocols/irc/msgs.c:823
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr "模式 (%s %s) 被 %s 設定"
 
-#: ../libpurple/protocols/irc/msgs.c:905 ../libpurple/protocols/irc/msgs.c:906
+#: ../libpurple/protocols/irc/msgs.c:908 ../libpurple/protocols/irc/msgs.c:909
 msgid "Invalid nickname"
 msgstr "暱稱無效"
 
-#: ../libpurple/protocols/irc/msgs.c:907
+#: ../libpurple/protocols/irc/msgs.c:910
 msgid ""
 "Your selected nickname was rejected by the server.  It probably contains "
 "invalid characters."
 msgstr "伺服器拒絕了您所指定的暱稱,暱稱中大概含有無效字元。"
 
-#: ../libpurple/protocols/irc/msgs.c:912
+#: ../libpurple/protocols/irc/msgs.c:915
 msgid ""
 "Your selected account name was rejected by the server.  It probably contains "
 "invalid characters."
 msgstr "伺服器拒絕了您所指定的帳號名稱,名稱中大概含有無效字元。"
 
-#: ../libpurple/protocols/irc/msgs.c:951
+#: ../libpurple/protocols/irc/msgs.c:954
 msgid "Cannot change nick"
 msgstr "無法更改暱稱"
 
-#: ../libpurple/protocols/irc/msgs.c:951
+#: ../libpurple/protocols/irc/msgs.c:954
 msgid "Could not change nick"
 msgstr "無法更改暱稱"
 
-#: ../libpurple/protocols/irc/msgs.c:972
+#: ../libpurple/protocols/irc/msgs.c:975
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr "您離開了頻道%s%s"
 
-#: ../libpurple/protocols/irc/msgs.c:1014
+#: ../libpurple/protocols/irc/msgs.c:1017
 msgid "Error: invalid PONG from server"
 msgstr "錯誤:來自伺服器的 PONG 無效"
 
-#: ../libpurple/protocols/irc/msgs.c:1016
+#: ../libpurple/protocols/irc/msgs.c:1019
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr "PING 回答──延遲:%lu秒"
 
-#: ../libpurple/protocols/irc/msgs.c:1097
+#: ../libpurple/protocols/irc/msgs.c:1110
 #, c-format
 msgid "Cannot join %s: Registration is required."
 msgstr "無法加入 %s:必須註冊。"
 
-#: ../libpurple/protocols/irc/msgs.c:1098
-#: ../libpurple/protocols/silc/ops.c:1128
+#: ../libpurple/protocols/irc/msgs.c:1111
+#: ../libpurple/protocols/silc/ops.c:1093
+#: ../libpurple/protocols/silc10/ops.c:1128
 msgid "Cannot join channel"
 msgstr "無法加入頻道"
 
 #  NOTE「暫時無法使用」應該比「暫時不存在」通順
-#: ../libpurple/protocols/irc/msgs.c:1132
+#: ../libpurple/protocols/irc/msgs.c:1145
 msgid "Nick or channel is temporarily unavailable."
 msgstr "暫時無法使用該個暱稱或頻道。"
 
-#: ../libpurple/protocols/irc/msgs.c:1144
+#: ../libpurple/protocols/irc/msgs.c:1157
 #, c-format
 msgid "Wallops from %s"
 msgstr "來自 %s 的 Wallops"
@@ -3995,7 +4052,7 @@
 msgstr "names [頻道]:列出目前在頻道中的使用者清單。"
 
 #: ../libpurple/protocols/irc/parse.c:137
-#: ../libpurple/protocols/jabber/jabber.c:1813
+#: ../libpurple/protocols/jabber/jabber.c:1819
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr "nick &lt;新暱稱&gt;:改變您的暱稱。"
 
@@ -4104,21 +4161,21 @@
 msgid "whowas &lt;nick&gt;: Get information on a user that has logged off."
 msgstr "whowas &lt;暱稱&gt;:取得已離線的使用者的資訊。"
 
-#: ../libpurple/protocols/irc/parse.c:449
+#: ../libpurple/protocols/irc/parse.c:465
 #, c-format
 msgid "Reply time from %s: %lu seconds"
 msgstr "%s 回答需時:%lu 秒"
 
-#: ../libpurple/protocols/irc/parse.c:450
+#: ../libpurple/protocols/irc/parse.c:466
 msgid "PONG"
 msgstr "PONG"
 
-#: ../libpurple/protocols/irc/parse.c:450
+#: ../libpurple/protocols/irc/parse.c:466
 msgid "CTCP PING reply"
 msgstr "CTCP PING 回答"
 
-#: ../libpurple/protocols/irc/parse.c:561
-#: ../libpurple/protocols/irc/parse.c:565 ../libpurple/protocols/toc/toc.c:191
+#: ../libpurple/protocols/irc/parse.c:577
+#: ../libpurple/protocols/irc/parse.c:581 ../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."
@@ -4158,10 +4215,10 @@
 #. 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/auth.c:748
+#: ../libpurple/protocols/jabber/auth.c:889
+#: ../libpurple/protocols/jabber/auth.c:914
+#: ../libpurple/protocols/jabber/auth.c:933
 #: ../libpurple/protocols/jabber/jabber.c:115
 msgid "Invalid response from server."
 msgstr "伺服器送來了無效的回應。"
@@ -4173,25 +4230,28 @@
 msgstr "伺服器需要經由未經加密的串流進行明文認證。允許並繼續進行認證?"
 
 # XXX 好像有些怪,譯文有待改進
-#: ../libpurple/protocols/jabber/auth.c:735
+#: ../libpurple/protocols/jabber/auth.c:769
+#: ../libpurple/protocols/jabber/auth.c:792
 msgid "Invalid challenge from server"
 msgstr "伺服器送來了無效的驗證挑戰"
 
 # NOTE OSCAR 錯誤訊息應可參閱 http://aimdoc.sourceforge.net/OSCARdoc/,但在該站很難找東西
-#: ../libpurple/protocols/jabber/auth.c:823
+#: ../libpurple/protocols/jabber/auth.c:864
 msgid "SASL error"
 msgstr "SASL 錯誤"
 
 #: ../libpurple/protocols/jabber/buddy.c:271
 #: ../libpurple/protocols/jabber/buddy.c:787
 #: ../libpurple/protocols/sametime/sametime.c:4128
-#: ../libpurple/protocols/silc/ops.c:1020
+#: ../libpurple/protocols/silc/ops.c:986
+#: ../libpurple/protocols/silc10/ops.c:1020
 msgid "Full Name"
 msgstr "全名"
 
 #: ../libpurple/protocols/jabber/buddy.c:272
 #: ../libpurple/protocols/jabber/buddy.c:800
-#: ../libpurple/protocols/silc/ops.c:1032
+#: ../libpurple/protocols/silc/ops.c:998
+#: ../libpurple/protocols/silc10/ops.c:1032
 msgid "Family Name"
 msgstr "姓"
 
@@ -4201,7 +4261,7 @@
 msgstr "名"
 
 #: ../libpurple/protocols/jabber/buddy.c:275
-#: ../libpurple/protocols/jabber/jabber.c:859
+#: ../libpurple/protocols/jabber/jabber.c:863
 msgid "URL"
 msgstr "URL"
 
@@ -4232,7 +4292,8 @@
 
 #: ../libpurple/protocols/jabber/buddy.c:281
 #: ../libpurple/protocols/jabber/buddy.c:873
-#: ../libpurple/protocols/silc/silc.c:934
+#: ../libpurple/protocols/silc/silc.c:1015
+#: ../libpurple/protocols/silc10/silc.c:926
 msgid "Country"
 msgstr "國家"
 
@@ -4246,8 +4307,10 @@
 #: ../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/silc/ops.c:1041
+#: ../libpurple/protocols/silc/util.c:555
+#: ../libpurple/protocols/silc10/ops.c:1075
+#: ../libpurple/protocols/silc10/util.c:551
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1037
 msgid "E-Mail"
 msgstr "電子郵件"
@@ -4269,14 +4332,14 @@
 
 #: ../libpurple/protocols/jabber/buddy.c:288
 #: ../libpurple/protocols/jabber/buddy.c:821
-#: ../libpurple/protocols/msn/msn.c:1606
-#: ../libpurple/protocols/oscar/oscar.c:3736
+#: ../libpurple/protocols/msn/msn.c:1627
+#: ../libpurple/protocols/oscar/oscar.c:3737
 msgid "Birthday"
 msgstr "生日"
 
 #: ../libpurple/protocols/jabber/buddy.c:289
 #: ../libpurple/protocols/jabber/buddy.c:941
-#: ../libpurple/protocols/jabber/chat.c:775 ../pidgin/gtkblist.c:3064
+#: ../libpurple/protocols/jabber/chat.c:775 ../pidgin/gtkblist.c:3081
 #: ../pidgin/gtkprefs.c:680
 msgid "Description"
 msgstr "描述"
@@ -4310,31 +4373,34 @@
 # NOTE 見 http://www.jabber.org/user/userguide.html
 #: ../libpurple/protocols/jabber/buddy.c:665
 #: ../libpurple/protocols/jabber/libxmpp.c:198
+#: ../libpurple/protocols/jabber/si.c:853
 msgid "Resource"
 msgstr ""
 
 #: ../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
+#: ../libpurple/protocols/jabber/jabber.c:1251
+#: ../libpurple/protocols/jabber/jabber.c:1261
+#: ../libpurple/protocols/jabber/jabber.c:1271
+#: ../libpurple/protocols/jabber/jabber.c:1281
+#: ../libpurple/protocols/jabber/jabber.c:1291
 msgid "Priority"
 msgstr "優先次序"
 
 # NOTE: 法、德文均譯「第二個名」,芬蘭文譯「其他名」,日文音譯了事
 # NOTE: 在網上幾間台灣大學寫「英文別名」,現套用,也跟芬蘭文PO檔處理手法相同
 #: ../libpurple/protocols/jabber/buddy.c:808
-#: ../libpurple/protocols/silc/ops.c:1028
+#: ../libpurple/protocols/silc/ops.c:994
+#: ../libpurple/protocols/silc10/ops.c:1028
 msgid "Middle Name"
 msgstr "英文別名"
 
 #: ../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/jabber/jabber.c:838
+#: ../libpurple/protocols/oscar/oscar.c:3776
+#: ../libpurple/protocols/oscar/oscar.c:3789
 #: ../libpurple/protocols/qq/buddy_info.c:56
-#: ../libpurple/protocols/silc/ops.c:1064
+#: ../libpurple/protocols/silc/ops.c:1030
+#: ../libpurple/protocols/silc10/ops.c:1064
 msgid "Address"
 msgstr "地址"
 
@@ -4378,7 +4444,7 @@
 msgstr "從好友名單中移除"
 
 #: ../libpurple/protocols/jabber/buddy.c:1432
-#: ../libpurple/protocols/jabber/jabber.c:1254
+#: ../libpurple/protocols/jabber/jabber.c:1260
 msgid "Chatty"
 msgstr "想聊天"
 
@@ -4387,9 +4453,9 @@
 msgstr "長時間離開"
 
 #: ../libpurple/protocols/jabber/buddy.c:1438
-#: ../libpurple/protocols/jabber/jabber.c:1284
+#: ../libpurple/protocols/jabber/jabber.c:1290
 #: ../libpurple/protocols/oscar/oscar.c:709
-#: ../libpurple/protocols/oscar/oscar.c:5718
+#: ../libpurple/protocols/oscar/oscar.c:5760
 #: ../libpurple/protocols/sametime/sametime.c:3297
 msgid "Do Not Disturb"
 msgstr "請勿打擾"
@@ -4400,7 +4466,7 @@
 
 #: ../libpurple/protocols/jabber/buddy.c:1587
 #: ../libpurple/protocols/jabber/buddy.c:1766
-#: ../libpurple/protocols/oscar/oscar.c:3698
+#: ../libpurple/protocols/oscar/oscar.c:3699
 msgid "Last Name"
 msgstr "姓"
 
@@ -4438,8 +4504,8 @@
 
 #: ../libpurple/protocols/jabber/buddy.c:1776
 #: ../libpurple/protocols/novell/novell.c:1488
-#: ../libpurple/protocols/oscar/oscar.c:3701
-#: ../libpurple/protocols/oscar/oscar.c:3710
+#: ../libpurple/protocols/oscar/oscar.c:3702
+#: ../libpurple/protocols/oscar/oscar.c:3711
 msgid "E-Mail Address"
 msgstr "電子郵件"
 
@@ -4479,7 +4545,7 @@
 msgstr "搜尋目錄"
 
 #: ../libpurple/protocols/jabber/chat.c:41
-#: ../libpurple/protocols/oscar/oscar.c:5224
+#: ../libpurple/protocols/oscar/oscar.c:5246
 #: ../libpurple/protocols/yahoo/yahoochat.c:999
 msgid "_Room:"
 msgstr "聊天室(_R):"
@@ -4555,7 +4621,8 @@
 
 #: ../libpurple/protocols/jabber/chat.c:678
 #: ../libpurple/protocols/jabber/chat.c:689
-#: ../libpurple/protocols/silc/ops.c:1451
+#: ../libpurple/protocols/silc/ops.c:1456
+#: ../libpurple/protocols/silc10/ops.c:1451
 msgid "Error retrieving room list"
 msgstr "讀取聊天室清單時發生錯誤"
 
@@ -4593,98 +4660,113 @@
 msgid "Read Error"
 msgstr "讀取錯誤"
 
-#: ../libpurple/protocols/jabber/jabber.c:519
+#: ../libpurple/protocols/jabber/jabber.c:467
+#: ../libpurple/protocols/oscar/flap_connection.c:386
+#: ../libpurple/protocols/yahoo/yahoo.c:2381
+#: ../libpurple/protocols/yahoo/yahoo.c:2413
+#, c-format
+msgid ""
+"Could not establish a connection with the server:\n"
+"%s"
+msgstr ""
+"無法與伺服器建立連線:\n"
+"%s"
+
+#: ../libpurple/protocols/jabber/jabber.c:523
 msgid "Unable to create socket"
 msgstr "無法建立 Socket"
 
-#: ../libpurple/protocols/jabber/jabber.c:564
-#: ../libpurple/protocols/jabber/jabber.c:914
+#: ../libpurple/protocols/jabber/jabber.c:568
+#: ../libpurple/protocols/jabber/jabber.c:918
 msgid "Invalid XMPP ID"
 msgstr "XMPP 帳號無效"
 
-#: ../libpurple/protocols/jabber/jabber.c:569
+#: ../libpurple/protocols/jabber/jabber.c:573
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr "XMPP 帳號無效,域名是必須設定的。"
 
-#: ../libpurple/protocols/jabber/jabber.c:640
+#: ../libpurple/protocols/jabber/jabber.c:644
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "成功註冊 %s@%s"
 
-#: ../libpurple/protocols/jabber/jabber.c:642
-#: ../libpurple/protocols/jabber/jabber.c:643
+#: ../libpurple/protocols/jabber/jabber.c:646
+#: ../libpurple/protocols/jabber/jabber.c:647
 msgid "Registration Successful"
 msgstr "註冊成功"
 
-#: ../libpurple/protocols/jabber/jabber.c:649
-#: ../libpurple/protocols/jabber/jabber.c:1524
+#: ../libpurple/protocols/jabber/jabber.c:653
+#: ../libpurple/protocols/jabber/jabber.c:1530
 msgid "Unknown Error"
 msgstr "未知錯誤"
 
-#: ../libpurple/protocols/jabber/jabber.c:651
-#: ../libpurple/protocols/jabber/jabber.c:652
+#: ../libpurple/protocols/jabber/jabber.c:655
+#: ../libpurple/protocols/jabber/jabber.c:656
 msgid "Registration Failed"
 msgstr "註冊失敗"
 
-#: ../libpurple/protocols/jabber/jabber.c:767
-#: ../libpurple/protocols/jabber/jabber.c:768
+#: ../libpurple/protocols/jabber/jabber.c:771
+#: ../libpurple/protocols/jabber/jabber.c:772
 msgid "Already Registered"
 msgstr "已經註冊"
 
-#: ../libpurple/protocols/jabber/jabber.c:844
-#: ../libpurple/protocols/oscar/oscar.c:3777
-#: ../libpurple/protocols/oscar/oscar.c:3790
+#: ../libpurple/protocols/jabber/jabber.c:848
+#: ../libpurple/protocols/oscar/oscar.c:3778
+#: ../libpurple/protocols/oscar/oscar.c:3791
 msgid "State"
 msgstr "省/州"
 
-#: ../libpurple/protocols/jabber/jabber.c:849
+#: ../libpurple/protocols/jabber/jabber.c:853
 msgid "Postal code"
 msgstr "郵遞區號"
 
-#: ../libpurple/protocols/jabber/jabber.c:854
-#: ../libpurple/protocols/silc/ops.c:1069
-#: ../libpurple/protocols/silc/silc.c:691
-#: ../libpurple/protocols/silc/util.c:553
+#: ../libpurple/protocols/jabber/jabber.c:858
+#: ../libpurple/protocols/silc/ops.c:1035
+#: ../libpurple/protocols/silc/silc.c:772
+#: ../libpurple/protocols/silc/util.c:557
+#: ../libpurple/protocols/silc10/ops.c:1069
+#: ../libpurple/protocols/silc10/silc.c:683
+#: ../libpurple/protocols/silc10/util.c:553
 msgid "Phone"
 msgstr "電話"
 
-#: ../libpurple/protocols/jabber/jabber.c:864
+#: ../libpurple/protocols/jabber/jabber.c:868
 msgid "Date"
 msgstr "日期"
 
-#: ../libpurple/protocols/jabber/jabber.c:872
+#: ../libpurple/protocols/jabber/jabber.c:876
 msgid "Please fill out the information below to register your new account."
 msgstr "為您的新帳戶註冊,請填寫下列資料:"
 
-#: ../libpurple/protocols/jabber/jabber.c:875
-#: ../libpurple/protocols/jabber/jabber.c:876
+#: ../libpurple/protocols/jabber/jabber.c:879
+#: ../libpurple/protocols/jabber/jabber.c:880
 msgid "Register New XMPP Account"
 msgstr "註冊新的 XMPP 帳戶"
 
 #. Register button
-#: ../libpurple/protocols/jabber/jabber.c:877 ../pidgin/gtkaccount.c:1504
+#: ../libpurple/protocols/jabber/jabber.c:881 ../pidgin/gtkaccount.c:1526
 msgid "Register"
 msgstr "註冊"
 
-#: ../libpurple/protocols/jabber/jabber.c:1048
+#: ../libpurple/protocols/jabber/jabber.c:1052
 msgid "Initializing Stream"
 msgstr "串流初始中"
 
-#: ../libpurple/protocols/jabber/jabber.c:1053
-#: ../libpurple/protocols/msn/session.c:350
+#: ../libpurple/protocols/jabber/jabber.c:1057
+#: ../libpurple/protocols/msn/session.c:351
 msgid "Authenticating"
 msgstr "認證中"
 
-#: ../libpurple/protocols/jabber/jabber.c:1062
+#: ../libpurple/protocols/jabber/jabber.c:1066
 msgid "Re-initializing Stream"
 msgstr "串流重新初始中"
 
-#: ../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/jabber/jabber.c:1134
+#: ../libpurple/protocols/jabber/jabber.c:1508
+#: ../libpurple/protocols/jabber/jabber.c:1549
+#: ../libpurple/protocols/jabber/jabber.c:1585
 #: ../libpurple/protocols/oscar/oscar.c:808
-#: ../libpurple/protocols/oscar/oscar.c:5512
+#: ../libpurple/protocols/oscar/oscar.c:5554
 msgid "Not Authorized"
 msgstr "未認證"
 
@@ -4693,82 +4775,84 @@
 # 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:1170
+#: ../libpurple/protocols/jabber/jabber.c:1176
 msgid "Both"
 msgstr "已互相認證"
 
 #  NOTE Jabber 術語,見「Both」條
-#: ../libpurple/protocols/jabber/jabber.c:1172
+#: ../libpurple/protocols/jabber/jabber.c:1178
 msgid "From (To pending)"
 msgstr "已認證對方(但仍等待對方認證您)"
 
 #  NOTE Jabber 術語,見「Both」條
-#: ../libpurple/protocols/jabber/jabber.c:1177
+#: ../libpurple/protocols/jabber/jabber.c:1183
 msgid "To"
 msgstr "已獲對方認證"
 
 #  NOTE Jabber 術語,見「Both」條
-#: ../libpurple/protocols/jabber/jabber.c:1179
+#: ../libpurple/protocols/jabber/jabber.c:1185
 msgid "None (To pending)"
 msgstr "無(但正等待對方認證您)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1181
+#: ../libpurple/protocols/jabber/jabber.c:1187
 #: ../pidgin/plugins/gevolution/eds-utils.c:73
 #: ../pidgin/plugins/gevolution/eds-utils.c:86
 msgid "None"
 msgstr "無"
 
 #  NOTE Jabber 術語,見「Both」條
-#: ../libpurple/protocols/jabber/jabber.c:1184
+#: ../libpurple/protocols/jabber/jabber.c:1190
 msgid "Subscription"
 msgstr "認證狀態"
 
-#: ../libpurple/protocols/jabber/jabber.c:1314
+#: ../libpurple/protocols/jabber/jabber.c:1320
 msgid "Password Changed"
 msgstr "密碼修改成功"
 
-#: ../libpurple/protocols/jabber/jabber.c:1315
+#: ../libpurple/protocols/jabber/jabber.c:1321
 msgid "Your password has been changed."
 msgstr "成功修改了您的密碼。"
 
-#: ../libpurple/protocols/jabber/jabber.c:1319
-#: ../libpurple/protocols/jabber/jabber.c:1320
+#: ../libpurple/protocols/jabber/jabber.c:1325
+#: ../libpurple/protocols/jabber/jabber.c:1326
 msgid "Error changing password"
 msgstr "修改密碼期間出現錯誤"
 
-#: ../libpurple/protocols/jabber/jabber.c:1376
+#: ../libpurple/protocols/jabber/jabber.c:1382
 msgid "Password (again)"
 msgstr "舊密碼(再次確認)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1381
-#: ../libpurple/protocols/jabber/jabber.c:1382
+#: ../libpurple/protocols/jabber/jabber.c:1387
+#: ../libpurple/protocols/jabber/jabber.c:1388
 msgid "Change XMPP Password"
 msgstr "修改 XMPP 密碼"
 
-#: ../libpurple/protocols/jabber/jabber.c:1382
+#: ../libpurple/protocols/jabber/jabber.c:1388
 msgid "Please enter your new password"
 msgstr "請輸入您的新密碼"
 
-#: ../libpurple/protocols/jabber/jabber.c:1394
-#: ../libpurple/protocols/oscar/oscar.c:6298
-#: ../libpurple/protocols/silc/silc.c:1015
+#: ../libpurple/protocols/jabber/jabber.c:1400
+#: ../libpurple/protocols/oscar/oscar.c:6340
+#: ../libpurple/protocols/silc/silc.c:1093
+#: ../libpurple/protocols/silc10/silc.c:1004
 msgid "Set User Info..."
 msgstr "設定使用者資訊..."
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
-#: ../libpurple/protocols/jabber/jabber.c:1399
-#: ../libpurple/protocols/oscar/oscar.c:6309
-#: ../libpurple/protocols/silc/silc.c:1011
+#: ../libpurple/protocols/jabber/jabber.c:1405
+#: ../libpurple/protocols/oscar/oscar.c:6351
+#: ../libpurple/protocols/silc/silc.c:1089
+#: ../libpurple/protocols/silc10/silc.c:1000
 msgid "Change Password..."
 msgstr "修改密碼..."
 
 #. }
-#: ../libpurple/protocols/jabber/jabber.c:1404
+#: ../libpurple/protocols/jabber/jabber.c:1410
 msgid "Search for Users..."
 msgstr "搜尋使用者..."
 
 # NOTE 見 http://www.jabber.org/jeps/jep-0103.html
-#: ../libpurple/protocols/jabber/jabber.c:1482
+#: ../libpurple/protocols/jabber/jabber.c:1488
 msgid "Bad Request"
 msgstr "傳送網址時發生了不明的錯誤"
 
@@ -4776,52 +4860,52 @@
 #  NOTE(大概係指登入用的使用者自定字串)或工作階段登入,以致無法存取
 #  NOTE 詳見 http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt
 #  NOTE 譯文更動 by Ambrose
-#: ../libpurple/protocols/jabber/jabber.c:1484
+#: ../libpurple/protocols/jabber/jabber.c:1490
 msgid "Conflict"
 msgstr "名稱或位址衝突"
 
-#: ../libpurple/protocols/jabber/jabber.c:1486
+#: ../libpurple/protocols/jabber/jabber.c:1492
 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:1488
+#: ../libpurple/protocols/jabber/jabber.c:1494
 msgid "Forbidden"
 msgstr "權限不夠"
 
 #  NOTE Jabber 錯誤 <gone/>,表示使用者或伺服器曾經上線,後來離了線
 #  NOTE 詳見 http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt
-#: ../libpurple/protocols/jabber/jabber.c:1490
+#: ../libpurple/protocols/jabber/jabber.c:1496
 msgid "Gone"
 msgstr "已離線"
 
-#: ../libpurple/protocols/jabber/jabber.c:1492
-#: ../libpurple/protocols/jabber/jabber.c:1569
+#: ../libpurple/protocols/jabber/jabber.c:1498
+#: ../libpurple/protocols/jabber/jabber.c:1575
 msgid "Internal Server Error"
 msgstr "伺服器內部錯誤"
 
-#: ../libpurple/protocols/jabber/jabber.c:1494
+#: ../libpurple/protocols/jabber/jabber.c:1500
 msgid "Item Not Found"
 msgstr "項目未找到"
 
 # FIXME 譯文聽來好像有點怪 20070518 acli
-#: ../libpurple/protocols/jabber/jabber.c:1496
+#: ../libpurple/protocols/jabber/jabber.c:1502
 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:1498
+#: ../libpurple/protocols/jabber/jabber.c:1504
 msgid "Not Acceptable"
 msgstr "無法接受"
 
-#: ../libpurple/protocols/jabber/jabber.c:1500
+#: ../libpurple/protocols/jabber/jabber.c:1506
 msgid "Not Allowed"
 msgstr "不被允許"
 
-#: ../libpurple/protocols/jabber/jabber.c:1504
+#: ../libpurple/protocols/jabber/jabber.c:1510
 msgid "Payment Required"
 msgstr "必須付款"
 
@@ -4829,78 +4913,78 @@
 #  NOTE 詳見 http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt
 #  NOTE「暫時無法聯絡」應該比「不存在」通順
 #  NOTE 譯文更動 by Ambrose
-#: ../libpurple/protocols/jabber/jabber.c:1506
+#: ../libpurple/protocols/jabber/jabber.c:1512
 msgid "Recipient Unavailable"
 msgstr "暫時無法聯絡接收者"
 
-#: ../libpurple/protocols/jabber/jabber.c:1510
+#: ../libpurple/protocols/jabber/jabber.c:1516
 msgid "Registration Required"
 msgstr "必須註冊"
 
-#: ../libpurple/protocols/jabber/jabber.c:1512
+#: ../libpurple/protocols/jabber/jabber.c:1518
 msgid "Remote Server Not Found"
 msgstr "遠端伺服器未找到"
 
-#: ../libpurple/protocols/jabber/jabber.c:1514
+#: ../libpurple/protocols/jabber/jabber.c:1520
 msgid "Remote Server Timeout"
 msgstr "遠端伺服器逾時"
 
-#: ../libpurple/protocols/jabber/jabber.c:1516
+#: ../libpurple/protocols/jabber/jabber.c:1522
 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:1518
+#: ../libpurple/protocols/jabber/jabber.c:1524
 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:1520
+#: ../libpurple/protocols/jabber/jabber.c:1526
 msgid "Subscription Required"
 msgstr "必須認證"
 
-#: ../libpurple/protocols/jabber/jabber.c:1522
+#: ../libpurple/protocols/jabber/jabber.c:1528
 msgid "Unexpected Request"
 msgstr "未預期的要求"
 
-#: ../libpurple/protocols/jabber/jabber.c:1529
+#: ../libpurple/protocols/jabber/jabber.c:1535
 msgid "Authorization Aborted"
 msgstr "認證取消"
 
-#: ../libpurple/protocols/jabber/jabber.c:1531
+#: ../libpurple/protocols/jabber/jabber.c:1537
 msgid "Incorrect encoding in authorization"
 msgstr "認證含錯誤的編碼"
 
-#: ../libpurple/protocols/jabber/jabber.c:1534
+#: ../libpurple/protocols/jabber/jabber.c:1540
 msgid "Invalid authzid"
 msgstr "無效的 authzid"
 
 # XXX 要覆查譯文
-#: ../libpurple/protocols/jabber/jabber.c:1537
+#: ../libpurple/protocols/jabber/jabber.c:1543
 msgid "Invalid Authorization Mechanism"
 msgstr "無效的認證機制"
 
-#: ../libpurple/protocols/jabber/jabber.c:1540
+#: ../libpurple/protocols/jabber/jabber.c:1546
 msgid "Authorization mechanism too weak"
 msgstr "認證機制太薄弱了"
 
-#: ../libpurple/protocols/jabber/jabber.c:1545
+#: ../libpurple/protocols/jabber/jabber.c:1551
 msgid "Temporary Authentication Failure"
 msgstr "認證暫時失敗"
 
-#: ../libpurple/protocols/jabber/jabber.c:1548
+#: ../libpurple/protocols/jabber/jabber.c:1554
 msgid "Authentication Failure"
 msgstr "認證失敗"
 
-#: ../libpurple/protocols/jabber/jabber.c:1554
+#: ../libpurple/protocols/jabber/jabber.c:1560
 msgid "Bad Format"
 msgstr "無效的格式"
 
-#: ../libpurple/protocols/jabber/jabber.c:1556
+#: ../libpurple/protocols/jabber/jabber.c:1562
 msgid "Bad Namespace Prefix"
 msgstr "無效的 Namespace Prefix"
 
@@ -4910,181 +4994,182 @@
 # 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:1559
+#: ../libpurple/protocols/jabber/jabber.c:1565
 msgid "Resource Conflict"
 msgstr "已經以指定的 Resource 在其他地方登入"
 
-#: ../libpurple/protocols/jabber/jabber.c:1561
-#: ../libpurple/protocols/silc/ops.c:1729
+#: ../libpurple/protocols/jabber/jabber.c:1567
+#: ../libpurple/protocols/silc/silc.c:244
+#: ../libpurple/protocols/silc10/ops.c:1720
 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:1563
+#: ../libpurple/protocols/jabber/jabber.c:1569
 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:1565
+#: ../libpurple/protocols/jabber/jabber.c:1571
 msgid "Host Unknown"
 msgstr "不明的伺服器名稱"
 
-#: ../libpurple/protocols/jabber/jabber.c:1567
+#: ../libpurple/protocols/jabber/jabber.c:1573
 msgid "Improper Addressing"
 msgstr "錯誤的定址"
 
-#: ../libpurple/protocols/jabber/jabber.c:1571
+#: ../libpurple/protocols/jabber/jabber.c:1577
 msgid "Invalid ID"
 msgstr "帳號無效"
 
 # FIXME 必須覆查譯文
-#: ../libpurple/protocols/jabber/jabber.c:1573
+#: ../libpurple/protocols/jabber/jabber.c:1579
 msgid "Invalid Namespace"
 msgstr "命名空間無效"
 
-#: ../libpurple/protocols/jabber/jabber.c:1575
+#: ../libpurple/protocols/jabber/jabber.c:1581
 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:1577
+#: ../libpurple/protocols/jabber/jabber.c:1583
 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:1581
+#: ../libpurple/protocols/jabber/jabber.c:1587
 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:1583
+#: ../libpurple/protocols/jabber/jabber.c:1589
 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:1585
+#: ../libpurple/protocols/jabber/jabber.c:1591
 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:1587
+#: ../libpurple/protocols/jabber/jabber.c:1593
 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:1589
+#: ../libpurple/protocols/jabber/jabber.c:1595
 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:1591
+#: ../libpurple/protocols/jabber/jabber.c:1597
 msgid "System Shutdown"
 msgstr "伺服器目前在關機中"
 
 # NOTE 見 http://www.jabber.org/jeps/jep-0103.html
-#: ../libpurple/protocols/jabber/jabber.c:1593
+#: ../libpurple/protocols/jabber/jabber.c:1599
 msgid "Undefined Condition"
 msgstr "傳送網址時發生了不明的錯誤"
 
 # NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-August/001431.html
-#: ../libpurple/protocols/jabber/jabber.c:1595
+#: ../libpurple/protocols/jabber/jabber.c:1601
 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:1597
+#: ../libpurple/protocols/jabber/jabber.c:1603
 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:1599
+#: ../libpurple/protocols/jabber/jabber.c:1605
 msgid "Unsupported Version"
 msgstr "不支援給定的 XMPP 版本"
 
-#: ../libpurple/protocols/jabber/jabber.c:1601
+#: ../libpurple/protocols/jabber/jabber.c:1607
 msgid "XML Not Well Formed"
 msgstr "XML 文件格式有問題"
 
-#: ../libpurple/protocols/jabber/jabber.c:1603
+#: ../libpurple/protocols/jabber/jabber.c:1609
 msgid "Stream Error"
 msgstr "串流錯誤"
 
-#: ../libpurple/protocols/jabber/jabber.c:1670
+#: ../libpurple/protocols/jabber/jabber.c:1676
 #, c-format
 msgid "Unable to ban user %s"
 msgstr "無法禁止使用者 %s"
 
 #  XXX 暫譯「(會員)等級」 - ambrose 20070415
 #  NOTE: Unknown affiliation 指 owner、admin、member、outcast、none 五種以外的其他不明數值
-#: ../libpurple/protocols/jabber/jabber.c:1690
+#: ../libpurple/protocols/jabber/jabber.c:1696
 #, c-format
 msgid "Unknown affiliation: \"%s\""
 msgstr "不明的等級:「%s」"
 
 #  XXX 暫譯 - ambrose 20070415
-#: ../libpurple/protocols/jabber/jabber.c:1695
+#: ../libpurple/protocols/jabber/jabber.c:1701
 #, c-format
 msgid "Unable to affiliate user %s as \"%s\""
 msgstr "無法將使用者 %s 的等級設定為「%s」"
 
 #  XXX 暫譯 - ambrose 20070415
 #  NOTE: Unknown role 指 moderator、participant、visitor、none 四種以外的其他不明數值
-#: ../libpurple/protocols/jabber/jabber.c:1714
+#: ../libpurple/protocols/jabber/jabber.c:1720
 #, c-format
 msgid "Unknown role: \"%s\""
 msgstr "不明的身份:「%s」"
 
 #  XXX 暫譯 - ambrose 20070415
-#: ../libpurple/protocols/jabber/jabber.c:1721
+#: ../libpurple/protocols/jabber/jabber.c:1727
 #, c-format
 msgid "Unable to set role \"%s\" for user: %s"
 msgstr "無法將使用者 %2$s 的身份設定為「%1$s」"
 
-#: ../libpurple/protocols/jabber/jabber.c:1774
+#: ../libpurple/protocols/jabber/jabber.c:1780
 #, c-format
 msgid "Unable to kick user %s"
 msgstr "無法踢出使用者 %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:1805
+#: ../libpurple/protocols/jabber/jabber.c:1811
 msgid "config:  Configure a chat room."
 msgstr "config:設定一個聊天室"
 
-#: ../libpurple/protocols/jabber/jabber.c:1809
+#: ../libpurple/protocols/jabber/jabber.c:1815
 msgid "configure:  Configure a chat room."
 msgstr "configure:設定一個聊天室"
 
-#: ../libpurple/protocols/jabber/jabber.c:1818
+#: ../libpurple/protocols/jabber/jabber.c:1824
 msgid "part [room]:  Leave the room."
 msgstr "part [聊天室]:離開聊天室。"
 
-#: ../libpurple/protocols/jabber/jabber.c:1823
+#: ../libpurple/protocols/jabber/jabber.c:1829
 msgid "register:  Register with a chat room."
 msgstr "register:加入一個聊天室"
 
-#: ../libpurple/protocols/jabber/jabber.c:1829
+#: ../libpurple/protocols/jabber/jabber.c:1835
 msgid "topic [new topic]:  View or change the topic."
 msgstr "topic [新主題]:檢視或修改聊天主題"
 
-#: ../libpurple/protocols/jabber/jabber.c:1835
+#: ../libpurple/protocols/jabber/jabber.c:1841
 msgid "ban &lt;user&gt; [room]:  Ban a user from the room."
 msgstr "ban &lt;使用者&gt; [聊天室]:禁止某使用者進入聊天室"
 
 #  XXX 暫譯「(會員)等級」 - ambrose 20070415
-#: ../libpurple/protocols/jabber/jabber.c:1841
+#: ../libpurple/protocols/jabber/jabber.c:1847
 msgid ""
 "affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
 "affiliation with the room."
@@ -5093,7 +5178,7 @@
 "在這聊天室內的等級"
 
 #  NOTE 譯文改動 by ambrose
-#: ../libpurple/protocols/jabber/jabber.c:1847
+#: ../libpurple/protocols/jabber/jabber.c:1853
 msgid ""
 "role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
 "role in the room."
@@ -5101,19 +5186,19 @@
 "role &lt;使用者&gt; &lt;moderator|participant|visitor|none&gt;: 設定使用者在"
 "這聊天室內的身份。"
 
-#: ../libpurple/protocols/jabber/jabber.c:1853
+#: ../libpurple/protocols/jabber/jabber.c:1859
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
 msgstr "invite &lt;使用者&gt; [訊息]:邀請使用者進入聊天室"
 
-#: ../libpurple/protocols/jabber/jabber.c:1859
+#: ../libpurple/protocols/jabber/jabber.c:1865
 msgid "join: &lt;room&gt; [server]:  Join a chat on this server."
 msgstr "join: &lt;聊天室&gt; [伺服器]:加入位於這個伺服器的一個聊天室"
 
-#: ../libpurple/protocols/jabber/jabber.c:1865
+#: ../libpurple/protocols/jabber/jabber.c:1871
 msgid "kick &lt;user&gt; [room]:  Kick a user from the room."
 msgstr "kick &lt;使用者&gt; [聊天室]:將使用者從聊天室中踢出。"
 
-#: ../libpurple/protocols/jabber/jabber.c:1870
+#: ../libpurple/protocols/jabber/jabber.c:1876
 msgid ""
 "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
 msgstr "msg &lt;使用者&gt; &lt;訊息&gt;:傳送私人訊息給另一個使用者"
@@ -5134,7 +5219,7 @@
 msgstr "XMPP 協定模組"
 
 #. Translators: 'domain' is used here in the context of Internet domains, e.g. pidgin.im
-#: ../libpurple/protocols/jabber/libxmpp.c:195
+#: ../libpurple/protocols/jabber/libxmpp.c:195 ../pidgin/gtkaccount.c:505
 msgid "Domain"
 msgstr "域名"
 
@@ -5154,7 +5239,8 @@
 
 #. Account options
 #: ../libpurple/protocols/jabber/libxmpp.c:215
-#: ../libpurple/protocols/silc/silc.c:1866
+#: ../libpurple/protocols/silc/silc.c:1913
+#: ../libpurple/protocols/silc10/silc.c:1855 ../pidgin/gtkaccount.c:835
 msgid "Connect server"
 msgstr "連結伺服器"
 
@@ -5187,7 +5273,7 @@
 msgid "XMPP Message Error"
 msgstr "XMPP 訊息錯誤"
 
-#: ../libpurple/protocols/jabber/message.c:350
+#: ../libpurple/protocols/jabber/message.c:359
 #, c-format
 msgid " (Code %s)"
 msgstr " (代碼 %s)"
@@ -5196,26 +5282,26 @@
 msgid "XML Parse error"
 msgstr "XML 分析錯誤"
 
-#: ../libpurple/protocols/jabber/presence.c:278
+#: ../libpurple/protocols/jabber/presence.c:279
 msgid "Unknown Error in presence"
 msgstr "不明的上線狀態錯誤"
 
-#: ../libpurple/protocols/jabber/presence.c:352
 #: ../libpurple/protocols/jabber/presence.c:353
+#: ../libpurple/protocols/jabber/presence.c:354
 msgid "Create New Room"
 msgstr "建立新聊天室"
 
-#: ../libpurple/protocols/jabber/presence.c:354
+#: ../libpurple/protocols/jabber/presence.c:355
 msgid ""
 "You are creating a new room.  Would you like to configure it, or accept the "
 "default settings?"
 msgstr "您正要建立一個新的聊天室,您要設定它,還是使用預設值?"
 
-#: ../libpurple/protocols/jabber/presence.c:360
+#: ../libpurple/protocols/jabber/presence.c:361
 msgid "_Configure Room"
 msgstr "設定聊天室(_C)"
 
-#: ../libpurple/protocols/jabber/presence.c:361
+#: ../libpurple/protocols/jabber/presence.c:362
 msgid "_Accept Defaults"
 msgstr "使用預設值(_A)"
 
@@ -5229,16 +5315,45 @@
 msgid "Error joining chat %s"
 msgstr "加入聊天室 %s 時發生錯誤"
 
-#: ../libpurple/protocols/jabber/si.c:765
+#: ../libpurple/protocols/jabber/si.c:769
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
 msgstr "無法傳送檔案至 %s,因為對方不支援檔案傳輸"
 
-#: ../libpurple/protocols/jabber/si.c:766
-#: ../libpurple/protocols/jabber/si.c:767
+#: ../libpurple/protocols/jabber/si.c:770
+#: ../libpurple/protocols/jabber/si.c:771
+#: ../libpurple/protocols/jabber/si.c:839
 msgid "File Send Failed"
 msgstr "傳送檔案失敗"
 
+#: ../libpurple/protocols/jabber/si.c:832
+#, c-format
+msgid "Unable to send file to %s, invalid JID"
+msgstr "無法送出訊息給 %s,因為這個 JID 是無效的"
+
+#: ../libpurple/protocols/jabber/si.c:834
+#, c-format
+msgid "Unable to send file to %s, user is not online"
+msgstr "無法傳送檔案至 %s,因為對方目前沒有連線"
+
+#  NOTE「not subscribed to user presence」是指沒有「SUB_TO」的 subscription
+#  FIXME 這很明顯是有問題的譯文,但這是這個 PO 檔現有的譯法(見「To」條);
+#  FIXME 如果這個要改,其他有關 presence 的譯文也要一齊改才行。-acli 20070614
+#: ../libpurple/protocols/jabber/si.c:836
+#, c-format
+msgid "Unable to send file to %s, not subscribed to user presence"
+msgstr "無法傳送檔案至 %s,因為未獲對方認證"
+
+#  FIXME 這不通順 - acli 20070614
+#: ../libpurple/protocols/jabber/si.c:851
+#, c-format
+msgid "Please select which resource of %s you would like to send a file to"
+msgstr "請指定檔案應該傳送至 %s 的那一個 Resource"
+
+#: ../libpurple/protocols/jabber/si.c:867
+msgid "Select a Resource"
+msgstr "選擇一個 Resource"
+
 # XXX 暫譯
 #: ../libpurple/protocols/msn/dialog.c:110
 #, c-format
@@ -5463,8 +5578,9 @@
 
 #: ../libpurple/protocols/msn/error.c:222
 #: ../libpurple/protocols/oscar/oscar.c:1363
-#: ../libpurple/protocols/silc/ops.c:1718 ../libpurple/protocols/toc/toc.c:728
-#: ../libpurple/proxy.c:1351
+#: ../libpurple/protocols/silc/silc.c:233
+#: ../libpurple/protocols/silc10/ops.c:1709
+#: ../libpurple/protocols/toc/toc.c:728 ../libpurple/proxy.c:1363
 msgid "Authentication failed"
 msgstr "認證失敗"
 
@@ -5569,8 +5685,8 @@
 msgstr "你在他(她)的好友清單裏"
 
 #: ../libpurple/protocols/msn/msn.c:551 ../libpurple/protocols/msn/state.c:33
-#: ../libpurple/protocols/yahoo/yahoo.c:2878
-#: ../libpurple/protocols/yahoo/yahoo.c:3487
+#: ../libpurple/protocols/yahoo/yahoo.c:2895
+#: ../libpurple/protocols/yahoo/yahoo.c:3504
 msgid "Be Right Back"
 msgstr "馬上回來"
 
@@ -5578,21 +5694,23 @@
 #: ../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:2880
-#: ../libpurple/protocols/yahoo/yahoo.c:3490
+#: ../libpurple/protocols/silc/silc.c:56
+#: ../libpurple/protocols/silc10/buddy.c:1480
+#: ../libpurple/protocols/silc10/silc.c:47
+#: ../libpurple/protocols/yahoo/yahoo.c:2897
+#: ../libpurple/protocols/yahoo/yahoo.c:3507
 msgid "Busy"
 msgstr "忙碌"
 
 #: ../libpurple/protocols/msn/msn.c:559
-#: ../libpurple/protocols/yahoo/yahoo.c:2888
-#: ../libpurple/protocols/yahoo/yahoo.c:3502
+#: ../libpurple/protocols/yahoo/yahoo.c:2905
+#: ../libpurple/protocols/yahoo/yahoo.c:3519
 msgid "On the Phone"
 msgstr "電話中"
 
 #: ../libpurple/protocols/msn/msn.c:563
-#: ../libpurple/protocols/yahoo/yahoo.c:2892
-#: ../libpurple/protocols/yahoo/yahoo.c:3508
+#: ../libpurple/protocols/yahoo/yahoo.c:2909
+#: ../libpurple/protocols/yahoo/yahoo.c:3525
 msgid "Out to Lunch"
 msgstr "外出用餐"
 
@@ -5642,31 +5760,31 @@
 msgid "Failed to connect to server."
 msgstr "無法連線到伺服器。"
 
-#: ../libpurple/protocols/msn/msn.c:1458 ../libpurple/protocols/msn/msn.c:1803
+#: ../libpurple/protocols/msn/msn.c:1479 ../libpurple/protocols/msn/msn.c:1827
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:784
 msgid "Error retrieving profile"
 msgstr "取得個人資訊時發生錯誤"
 
-#: ../libpurple/protocols/msn/msn.c:1529 ../pidgin/plugins/convcolors.c:309
+#: ../libpurple/protocols/msn/msn.c:1550 ../pidgin/plugins/convcolors.c:309
 #: ../pidgin/plugins/pidginrc.c:448
 msgid "General"
 msgstr "一般"
 
-#: ../libpurple/protocols/msn/msn.c:1536
-#: ../libpurple/protocols/oscar/oscar.c:3742
+#: ../libpurple/protocols/msn/msn.c:1557
+#: ../libpurple/protocols/oscar/oscar.c:3743
 #: ../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:1538
+#: ../libpurple/protocols/msn/msn.c:1559
 #: ../libpurple/protocols/qq/buddy_info.c:51
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1072
 msgid "Occupation"
 msgstr "職業"
 
-#: ../libpurple/protocols/msn/msn.c:1539
+#: ../libpurple/protocols/msn/msn.c:1560
 #: ../libpurple/protocols/novell/novell.c:1478
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1052
 #: ../libpurple/protocols/zephyr/zephyr.c:798
@@ -5674,187 +5792,189 @@
 msgid "Location"
 msgstr "所在位置"
 
-#: ../libpurple/protocols/msn/msn.c:1544 ../libpurple/protocols/msn/msn.c:1736
-#: ../libpurple/protocols/msn/msn.c:1742 ../libpurple/protocols/msn/msn.c:1749
+#: ../libpurple/protocols/msn/msn.c:1565 ../libpurple/protocols/msn/msn.c:1757
+#: ../libpurple/protocols/msn/msn.c:1763 ../libpurple/protocols/msn/msn.c:1770
 msgid "Hobbies and Interests"
 msgstr "嗜好/興趣"
 
-#: ../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
+#: ../libpurple/protocols/msn/msn.c:1571 ../libpurple/protocols/msn/msn.c:1691
+#: ../libpurple/protocols/msn/msn.c:1697 ../libpurple/protocols/msn/msn.c:1704
+#: ../libpurple/protocols/msn/msn.c:1712 ../libpurple/protocols/msn/msn.c:1719
 msgid "A Little About Me"
 msgstr "自我簡介"
 
-#: ../libpurple/protocols/msn/msn.c:1567
+#: ../libpurple/protocols/msn/msn.c:1588
 msgid "Social"
 msgstr "社交"
 
-#: ../libpurple/protocols/msn/msn.c:1569
+#: ../libpurple/protocols/msn/msn.c:1590
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1062
 msgid "Marital Status"
 msgstr "婚姻狀況"
 
-#: ../libpurple/protocols/msn/msn.c:1570
+#: ../libpurple/protocols/msn/msn.c:1591
 msgid "Interests"
 msgstr "興趣"
 
-#: ../libpurple/protocols/msn/msn.c:1571
+#: ../libpurple/protocols/msn/msn.c:1592
 msgid "Pets"
 msgstr "寵物"
 
-#: ../libpurple/protocols/msn/msn.c:1572
+#: ../libpurple/protocols/msn/msn.c:1593
 msgid "Hometown"
 msgstr "故鄉"
 
-#: ../libpurple/protocols/msn/msn.c:1573
+#: ../libpurple/protocols/msn/msn.c:1594
 msgid "Places Lived"
 msgstr "居住過的地方"
 
-#: ../libpurple/protocols/msn/msn.c:1574
+#: ../libpurple/protocols/msn/msn.c:1595
 msgid "Fashion"
 msgstr "時尚"
 
-#: ../libpurple/protocols/msn/msn.c:1575
+#: ../libpurple/protocols/msn/msn.c:1596
 msgid "Humor"
 msgstr "幽默"
 
-#: ../libpurple/protocols/msn/msn.c:1576
+#: ../libpurple/protocols/msn/msn.c:1597
 msgid "Music"
 msgstr "音樂"
 
 # NOTE 日文po檔及MSN本身均譯「座右銘」
-#: ../libpurple/protocols/msn/msn.c:1577 ../libpurple/protocols/msn/msn.c:1758
-#: ../libpurple/protocols/msn/msn.c:1764
+#: ../libpurple/protocols/msn/msn.c:1598 ../libpurple/protocols/msn/msn.c:1779
+#: ../libpurple/protocols/msn/msn.c:1785
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1114
 msgid "Favorite Quote"
 msgstr "座右銘"
 
-#: ../libpurple/protocols/msn/msn.c:1594
+#: ../libpurple/protocols/msn/msn.c:1615
 msgid "Contact Info"
 msgstr "聯絡資訊"
 
-#: ../libpurple/protocols/msn/msn.c:1595
+#: ../libpurple/protocols/msn/msn.c:1616
 msgid "Personal"
 msgstr "個人資料"
 
-#: ../libpurple/protocols/msn/msn.c:1598
+#: ../libpurple/protocols/msn/msn.c:1619
 msgid "Significant Other"
 msgstr "另一半"
 
-#: ../libpurple/protocols/msn/msn.c:1599
+#: ../libpurple/protocols/msn/msn.c:1620
 msgid "Home Phone"
 msgstr "住家電話"
 
-#: ../libpurple/protocols/msn/msn.c:1600
+#: ../libpurple/protocols/msn/msn.c:1621
 msgid "Home Phone 2"
 msgstr "住家電話2"
 
-#: ../libpurple/protocols/msn/msn.c:1601
-#: ../libpurple/protocols/oscar/oscar.c:3780
+#: ../libpurple/protocols/msn/msn.c:1622
+#: ../libpurple/protocols/oscar/oscar.c:3781
 msgid "Home Address"
 msgstr "住家地址"
 
-#: ../libpurple/protocols/msn/msn.c:1602
+#: ../libpurple/protocols/msn/msn.c:1623
 msgid "Personal Mobile"
 msgstr "個人行動電話"
 
-#: ../libpurple/protocols/msn/msn.c:1603
+#: ../libpurple/protocols/msn/msn.c:1624
 msgid "Home Fax"
 msgstr "住家傳真"
 
-#: ../libpurple/protocols/msn/msn.c:1604
+#: ../libpurple/protocols/msn/msn.c:1625
 msgid "Personal E-Mail"
 msgstr "個人電子郵件"
 
-#: ../libpurple/protocols/msn/msn.c:1605
+#: ../libpurple/protocols/msn/msn.c:1626
 msgid "Personal IM"
 msgstr "個人即時訊息帳號"
 
-#: ../libpurple/protocols/msn/msn.c:1607
+#: ../libpurple/protocols/msn/msn.c:1628
 msgid "Anniversary"
 msgstr "週年紀念日"
 
 #. Business
-#: ../libpurple/protocols/msn/msn.c:1623
+#: ../libpurple/protocols/msn/msn.c:1644
 msgid "Work"
 msgstr "工作資料"
 
-#: ../libpurple/protocols/msn/msn.c:1625
-#: ../libpurple/protocols/silc/ops.c:1044
+#: ../libpurple/protocols/msn/msn.c:1646
+#: ../libpurple/protocols/silc/ops.c:1010
+#: ../libpurple/protocols/silc10/ops.c:1044
 msgid "Job Title"
 msgstr "職銜"
 
-#: ../libpurple/protocols/msn/msn.c:1626
-#: ../libpurple/protocols/oscar/oscar.c:3801
+#: ../libpurple/protocols/msn/msn.c:1647
+#: ../libpurple/protocols/oscar/oscar.c:3802
 msgid "Company"
 msgstr "公司名稱"
 
-#: ../libpurple/protocols/msn/msn.c:1627
+#: ../libpurple/protocols/msn/msn.c:1648
 #: ../libpurple/protocols/novell/novell.c:1480
 msgid "Department"
 msgstr "所屬部門"
 
-#: ../libpurple/protocols/msn/msn.c:1628
+#: ../libpurple/protocols/msn/msn.c:1649
 msgid "Profession"
 msgstr "專業"
 
-#: ../libpurple/protocols/msn/msn.c:1629
+#: ../libpurple/protocols/msn/msn.c:1650
 msgid "Work Phone"
 msgstr "商務電話"
 
-#: ../libpurple/protocols/msn/msn.c:1630
+#: ../libpurple/protocols/msn/msn.c:1651
 msgid "Work Phone 2"
 msgstr "商務電話2"
 
-#: ../libpurple/protocols/msn/msn.c:1631
-#: ../libpurple/protocols/oscar/oscar.c:3793
+#: ../libpurple/protocols/msn/msn.c:1652
+#: ../libpurple/protocols/oscar/oscar.c:3794
 msgid "Work Address"
 msgstr "工作地址"
 
-#: ../libpurple/protocols/msn/msn.c:1632
+#: ../libpurple/protocols/msn/msn.c:1653
 msgid "Work Mobile"
 msgstr "商務行動電話"
 
-#: ../libpurple/protocols/msn/msn.c:1633
+#: ../libpurple/protocols/msn/msn.c:1654
 msgid "Work Pager"
 msgstr "商務呼叫器"
 
-#: ../libpurple/protocols/msn/msn.c:1634
+#: ../libpurple/protocols/msn/msn.c:1655
 msgid "Work Fax"
 msgstr "商務傳真"
 
-#: ../libpurple/protocols/msn/msn.c:1635
+#: ../libpurple/protocols/msn/msn.c:1656
 msgid "Work E-Mail"
 msgstr "商務電子郵件"
 
-#: ../libpurple/protocols/msn/msn.c:1636
+#: ../libpurple/protocols/msn/msn.c:1657
 msgid "Work IM"
 msgstr "商務即時訊息帳號"
 
-#: ../libpurple/protocols/msn/msn.c:1637
+#: ../libpurple/protocols/msn/msn.c:1658
 msgid "Start Date"
 msgstr "開始日期"
 
-#: ../libpurple/protocols/msn/msn.c:1707 ../libpurple/protocols/msn/msn.c:1713
-#: ../libpurple/protocols/msn/msn.c:1720 ../libpurple/protocols/msn/msn.c:1727
+#: ../libpurple/protocols/msn/msn.c:1728 ../libpurple/protocols/msn/msn.c:1734
+#: ../libpurple/protocols/msn/msn.c:1741 ../libpurple/protocols/msn/msn.c:1748
 msgid "Favorite Things"
 msgstr "喜愛事物"
 
-#: ../libpurple/protocols/msn/msn.c:1772
+#: ../libpurple/protocols/msn/msn.c:1793
 msgid "Last Updated"
 msgstr "更新日期"
 
-#: ../libpurple/protocols/msn/msn.c:1783
+#: ../libpurple/protocols/msn/msn.c:1804
 #: ../libpurple/protocols/qq/buddy_info.c:60
-#: ../libpurple/protocols/silc/ops.c:1060
+#: ../libpurple/protocols/silc/ops.c:1026
+#: ../libpurple/protocols/silc10/ops.c:1060
 msgid "Homepage"
 msgstr "網頁"
 
-#: ../libpurple/protocols/msn/msn.c:1804
+#: ../libpurple/protocols/msn/msn.c:1828
 msgid "The user has not created a public profile."
 msgstr "這個使用者未有建立公開的個人資料。"
 
-#: ../libpurple/protocols/msn/msn.c:1805
+#: ../libpurple/protocols/msn/msn.c:1829
 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 "
@@ -5863,14 +5983,14 @@
 "MSN 回報說找不到這個使用者的個人資料。這表示這個使用者可能不存在;亦有可能使"
 "用者存在,但沒有建立公開的個人資料。"
 
-#: ../libpurple/protocols/msn/msn.c:1809
+#: ../libpurple/protocols/msn/msn.c:1833
 msgid ""
 "Could not find any information in the user's profile. The user most likely "
 "does not exist."
 msgstr ""
 "在這個使用者的個人資料網頁找不到任何可用的資料。這個使用者極有可能並不存在。"
 
-#: ../libpurple/protocols/msn/msn.c:1817
+#: ../libpurple/protocols/msn/msn.c:1841
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1216
 msgid "Profile URL"
 msgstr "個人資料網址"
@@ -5885,19 +6005,19 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/msn/msn.c:2103 ../libpurple/protocols/msn/msn.c:2105
+#: ../libpurple/protocols/msn/msn.c:2127 ../libpurple/protocols/msn/msn.c:2129
 msgid "MSN Protocol Plugin"
 msgstr "MSN 協定模組"
 
-#: ../libpurple/protocols/msn/msn.c:2139
+#: ../libpurple/protocols/msn/msn.c:2163
 msgid "Use HTTP Method"
 msgstr "使用 HTTP 方式"
 
-#: ../libpurple/protocols/msn/msn.c:2144
+#: ../libpurple/protocols/msn/msn.c:2168
 msgid "Show custom smileys"
 msgstr "顯示使用者圖示"
 
-#: ../libpurple/protocols/msn/msn.c:2152
+#: ../libpurple/protocols/msn/msn.c:2176
 msgid "nudge: nudge a user to get their attention"
 msgstr "nudge:呼叫使用者,引起他們的注意"
 
@@ -5928,7 +6048,7 @@
 
 #: ../libpurple/protocols/msn/notification.c:184
 #: ../libpurple/protocols/msn/notification.c:532
-#: ../libpurple/protocols/msn/session.c:329
+#: ../libpurple/protocols/msn/session.c:330
 msgid "Unknown error."
 msgstr "未知錯誤。"
 
@@ -5973,17 +6093,17 @@
 msgid "Service Temporarily Unavailable."
 msgstr "暫時無法提供服務"
 
-#: ../libpurple/protocols/msn/notification.c:840
+#: ../libpurple/protocols/msn/notification.c:851
 msgid "Unable to rename group"
 msgstr "無法更改群組名稱"
 
-#: ../libpurple/protocols/msn/notification.c:895
+#: ../libpurple/protocols/msn/notification.c:906
 msgid "Unable to delete group"
 msgstr "無法移除群組"
 
 # NOTE "in %d minutes" 意為「在 %d 分鐘之內」的意思
 # NOTE 譯文更動 by Ambrose
-#: ../libpurple/protocols/msn/notification.c:1321
+#: ../libpurple/protocols/msn/notification.c:1325
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -6038,7 +6158,7 @@
 msgstr "解析 HTTP 途中發生錯誤。"
 
 #: ../libpurple/protocols/msn/session.c:307
-#: ../libpurple/protocols/oscar/oscar.c:3454
+#: ../libpurple/protocols/oscar/oscar.c:3455
 #: ../libpurple/protocols/yahoo/yahoo.c:202
 msgid "You have signed on from another location."
 msgstr "您由其他的地方登入。"
@@ -6052,34 +6172,34 @@
 msgid "The MSN servers are going down temporarily."
 msgstr "MSN 伺服器將暫時關閉。"
 
-#: ../libpurple/protocols/msn/session.c:319
+#: ../libpurple/protocols/msn/session.c:320
 #, c-format
 msgid "Unable to authenticate: %s"
 msgstr "無法認證:%s"
 
-#: ../libpurple/protocols/msn/session.c:324
+#: ../libpurple/protocols/msn/session.c:325
 msgid ""
 "Your MSN buddy list is temporarily unavailable. Please wait and try again."
 msgstr "暫時無法取得您的好友清單,請過一會後重試。"
 
-#: ../libpurple/protocols/msn/session.c:345
-#: ../libpurple/protocols/msn/session.c:347
+#: ../libpurple/protocols/msn/session.c:346
+#: ../libpurple/protocols/msn/session.c:348
 msgid "Handshaking"
 msgstr "交談中"
 
-#: ../libpurple/protocols/msn/session.c:348
+#: ../libpurple/protocols/msn/session.c:349
 msgid "Starting authentication"
 msgstr "認證開始中"
 
-#: ../libpurple/protocols/msn/session.c:349
+#: ../libpurple/protocols/msn/session.c:350
 msgid "Getting cookie"
 msgstr "取得 Cookie 中"
 
-#: ../libpurple/protocols/msn/session.c:351
+#: ../libpurple/protocols/msn/session.c:352
 msgid "Sending cookie"
 msgstr "傳送 Cookie 中"
 
-#: ../libpurple/protocols/msn/session.c:352
+#: ../libpurple/protocols/msn/session.c:353
 msgid "Retrieving buddy list"
 msgstr "讀取好友清單中"
 
@@ -6117,14 +6237,22 @@
 
 #: ../libpurple/protocols/msn/switchboard.c:424
 msgid ""
+"Message could not be sent because we wer unable to establish a session with "
+"the server. This is likely a server problem, try again in a few minutes:"
+msgstr ""
+"因為無法與伺服器建立工作階段,所以訊息無法送出(這大概是伺服器出現了問題,請"
+"幾分鐘後重試):"
+
+#: ../libpurple/protocols/msn/switchboard.c:431
+msgid ""
 "Message could not be sent because an error with the switchboard occurred:"
 msgstr "因為 Switchboard 發生錯誤,所以訊息無法送出"
 
-#: ../libpurple/protocols/msn/switchboard.c:432
+#: ../libpurple/protocols/msn/switchboard.c:439
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr "因為發生不明的錯誤,訊息可能沒有送出:"
 
-#: ../libpurple/protocols/msn/switchboard.c:956
+#: ../libpurple/protocols/msn/switchboard.c:963
 #, c-format
 msgid "%s just sent you a Nudge!"
 msgstr "%s 在呼叫您!"
@@ -6500,19 +6628,19 @@
 msgstr "伺服器通訊埠"
 
 #: ../libpurple/protocols/oscar/flap_connection.c:379
-#: ../libpurple/protocols/yahoo/yahoo.c:2290
-#: ../libpurple/protocols/yahoo/yahoo.c:2449
+#: ../libpurple/protocols/yahoo/yahoo.c:2292
+#: ../libpurple/protocols/yahoo/yahoo.c:2459
 #: ../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
+#: ../libpurple/proxy.c:1099 ../libpurple/proxy.c:1208
+#: ../libpurple/proxy.c:1308 ../libpurple/proxy.c:1436
 msgid "Server closed the connection."
 msgstr "伺服器關閉連線。"
 
 #: ../libpurple/protocols/oscar/flap_connection.c:381
-#: ../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
+#: ../libpurple/protocols/yahoo/yahoo.c:2286
+#: ../libpurple/protocols/yahoo/yahoo.c:2453 ../libpurple/proxy.c:592
+#: ../libpurple/proxy.c:1111 ../libpurple/proxy.c:1220
+#: ../libpurple/proxy.c:1320 ../libpurple/proxy.c:1448
 #, c-format
 msgid ""
 "Lost connection with server:\n"
@@ -6522,21 +6650,12 @@
 "%s"
 
 #: ../libpurple/protocols/oscar/flap_connection.c:384
-#: ../libpurple/proxy.c:1114 ../libpurple/proxy.c:1221
-#: ../libpurple/proxy.c:1320 ../libpurple/proxy.c:1392
-#: ../libpurple/proxy.c:1449
+#: ../libpurple/proxy.c:1128 ../libpurple/proxy.c:1233
+#: ../libpurple/proxy.c:1332 ../libpurple/proxy.c:1404
+#: ../libpurple/proxy.c:1461
 msgid "Received invalid data on connection with server."
 msgstr "連線至伺服器時收到無效的資料。"
 
-#: ../libpurple/protocols/oscar/flap_connection.c:386
-#, c-format
-msgid ""
-"Could not establish a connection with the server:\n"
-"%s"
-msgstr ""
-"無法與伺服器建立連線:\n"
-"%s"
-
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -6568,7 +6687,7 @@
 msgstr "ICQ 協定模組"
 
 #: ../libpurple/protocols/oscar/libicq.c:147
-#: ../libpurple/protocols/yahoo/yahoo.c:4094
+#: ../libpurple/protocols/yahoo/yahoo.c:4111
 #: ../libpurple/protocols/zephyr/zephyr.c:2997
 msgid "Encoding"
 msgstr "編碼"
@@ -6725,8 +6844,8 @@
 "用有問題的用戶端程式。)"
 
 #. Label
-#: ../libpurple/protocols/oscar/oscar.c:621 ../pidgin/gtkutils.c:2386
-#: ../pidgin/gtkutils.c:2416
+#: ../libpurple/protocols/oscar/oscar.c:621 ../pidgin/gtkutils.c:2310
+#: ../pidgin/gtkutils.c:2340
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:338
 msgid "Buddy Icon"
 msgstr "好友圖示"
@@ -6741,13 +6860,15 @@
 msgstr "AIM 式即時訊息"
 
 #: ../libpurple/protocols/oscar/oscar.c:630
-#: ../libpurple/protocols/silc/silc.c:687
-#: ../libpurple/protocols/silc/util.c:549
+#: ../libpurple/protocols/silc/silc.c:768
+#: ../libpurple/protocols/silc/util.c:553
+#: ../libpurple/protocols/silc10/silc.c:679
+#: ../libpurple/protocols/silc10/util.c:549
 msgid "Chat"
 msgstr "聊天"
 
 #: ../libpurple/protocols/oscar/oscar.c:633
-#: ../libpurple/protocols/oscar/oscar.c:5920
+#: ../libpurple/protocols/oscar/oscar.c:5962
 msgid "Get File"
 msgstr "接收檔案"
 
@@ -6832,17 +6953,17 @@
 msgstr "照相機"
 
 #: ../libpurple/protocols/oscar/oscar.c:707
-#: ../libpurple/protocols/oscar/oscar.c:5690
+#: ../libpurple/protocols/oscar/oscar.c:5732
 msgid "Free For Chat"
 msgstr "我有空聊天"
 
 #: ../libpurple/protocols/oscar/oscar.c:711
-#: ../libpurple/protocols/oscar/oscar.c:5725
+#: ../libpurple/protocols/oscar/oscar.c:5767
 msgid "Not Available"
 msgstr "長時間離開"
 
 #: ../libpurple/protocols/oscar/oscar.c:713
-#: ../libpurple/protocols/oscar/oscar.c:5711
+#: ../libpurple/protocols/oscar/oscar.c:5753
 msgid "Occupied"
 msgstr "忙碌"
 
@@ -6852,7 +6973,7 @@
 msgstr "允許其他使用者在網路上查看您目前的狀態"
 
 #: ../libpurple/protocols/oscar/oscar.c:719 ../libpurple/protocols/qq/qq.c:183
-#: ../libpurple/protocols/yahoo/yahoo.c:2896 ../libpurple/status.c:156
+#: ../libpurple/protocols/yahoo/yahoo.c:2913 ../libpurple/status.c:156
 #: ../pidgin/gtkdocklet.c:446 ../pidgin/gtkstatusbox.c:1053
 msgid "Invisible"
 msgstr "隱身"
@@ -6862,13 +6983,13 @@
 msgstr "上線"
 
 #: ../libpurple/protocols/oscar/oscar.c:820
-#: ../libpurple/protocols/oscar/oscar.c:3694
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:697 ../pidgin/gtkprefs.c:1015
+#: ../libpurple/protocols/oscar/oscar.c:3695
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:697 ../pidgin/gtkprefs.c:1052
 msgid "IP Address"
 msgstr "IP 位址"
 
 #: ../libpurple/protocols/oscar/oscar.c:827
-#: ../libpurple/protocols/oscar/oscar.c:2846
+#: ../libpurple/protocols/oscar/oscar.c:2847
 msgid "Warning Level"
 msgstr "警告等級"
 
@@ -6918,14 +7039,14 @@
 "並只含英文字母、數字及空白;或者只由數字組成。"
 
 #: ../libpurple/protocols/oscar/oscar.c:1328
-#: ../libpurple/protocols/yahoo/yahoo.c:1932
+#: ../libpurple/protocols/yahoo/yahoo.c:1934
 msgid "Invalid screen name."
 msgstr "帳號無效。"
 
 #: ../libpurple/protocols/oscar/oscar.c:1335
 #: ../libpurple/protocols/qq/login_logout.c:483
 #: ../libpurple/protocols/simple/simple.c:1037
-#: ../libpurple/protocols/yahoo/yahoo.c:1950
+#: ../libpurple/protocols/yahoo/yahoo.c:1952
 msgid "Incorrect password."
 msgstr "錯誤的密碼。"
 
@@ -6978,10 +7099,10 @@
 #. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
 #.
 #: ../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
+#: ../libpurple/protocols/oscar/oscar.c:2231
+#: ../libpurple/protocols/oscar/oscar.c:2278
+#: ../libpurple/protocols/oscar/oscar.c:5837
+#: ../libpurple/protocols/oscar/oscar.c:6118 ../libpurple/request.h:1387
 msgid "_OK"
 msgstr "確定(_O)"
 
@@ -7000,48 +7121,48 @@
 msgid "Unable to get a valid AIM login hash."
 msgstr "無法取得有效的 AIM 登入碼。"
 
-#: ../libpurple/protocols/oscar/oscar.c:1610
+#: ../libpurple/protocols/oscar/oscar.c:1609
 #, c-format
 msgid "You may be disconnected shortly.  Check %s for updates."
 msgstr "您可能會短時間中斷連線。請到 %s 看看有沒有更新。"
 
-#: ../libpurple/protocols/oscar/oscar.c:1613
+#: ../libpurple/protocols/oscar/oscar.c:1612
 msgid "Unable to get a valid login hash."
 msgstr "無法取得有效的登入碼。"
 
-#: ../libpurple/protocols/oscar/oscar.c:1639
+#: ../libpurple/protocols/oscar/oscar.c:1641
 msgid "Password sent"
 msgstr "密碼送出"
 
-#: ../libpurple/protocols/oscar/oscar.c:1695
+#: ../libpurple/protocols/oscar/oscar.c:1697
 msgid "Unable to initialize connection"
 msgstr "無法初始化連結"
 
-#: ../libpurple/protocols/oscar/oscar.c:2200
+#: ../libpurple/protocols/oscar/oscar.c:2201
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr "請通過我的認證要求,好讓我可以將您加入我的好友清單中。"
 
-#: ../libpurple/protocols/oscar/oscar.c:2228
+#: ../libpurple/protocols/oscar/oscar.c:2229
 msgid "Authorization Request Message:"
 msgstr "認證要求訊息:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2229
+#: ../libpurple/protocols/oscar/oscar.c:2230
 msgid "Please authorize me!"
 msgstr "請通過我的認證!"
 
-#: ../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
+#: ../libpurple/protocols/oscar/oscar.c:2270
+#: ../libpurple/protocols/oscar/oscar.c:2277
+#: ../libpurple/protocols/oscar/oscar.c:2404
+#: ../libpurple/protocols/oscar/oscar.c:5215
+#: ../libpurple/protocols/yahoo/yahoo.c:987
 msgid "No reason given."
 msgstr "沒有給予原因。"
 
-#: ../libpurple/protocols/oscar/oscar.c:2275
+#: ../libpurple/protocols/oscar/oscar.c:2276
 msgid "Authorization Denied Message:"
 msgstr "拒絕認證訊息:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2403
+#: ../libpurple/protocols/oscar/oscar.c:2404
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -7051,17 +7172,17 @@
 "使用者 %u 因為下列原因,拒絕了您將其加入好友清單的要求:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2404
+#: ../libpurple/protocols/oscar/oscar.c:2405
 msgid "ICQ authorization denied."
 msgstr "ICQ 認證拒絕。"
 
 #. Someone has granted you authorization
-#: ../libpurple/protocols/oscar/oscar.c:2411
+#: ../libpurple/protocols/oscar/oscar.c:2412
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
 msgstr "使用者 %u 同意了您將其加入好友清單的要求。"
 
-#: ../libpurple/protocols/oscar/oscar.c:2419
+#: ../libpurple/protocols/oscar/oscar.c:2420
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -7074,7 +7195,7 @@
 "來自:%s [%s]\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2427
+#: ../libpurple/protocols/oscar/oscar.c:2428
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -7087,7 +7208,7 @@
 "來自:%s [%s]\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2435
+#: ../libpurple/protocols/oscar/oscar.c:2436
 #, c-format
 msgid ""
 "You have received an ICQ e-mail from %s [%s]\n"
@@ -7100,38 +7221,38 @@
 "訊息為:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2456
+#: ../libpurple/protocols/oscar/oscar.c:2457
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
 msgstr "ICQ 使用者 %u 送來一個好友資訊:%s (%s)"
 
-#: ../libpurple/protocols/oscar/oscar.c:2462
+#: ../libpurple/protocols/oscar/oscar.c:2463
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr "您想將他(她)加入到您的好友名單中嗎?"
 
-#: ../libpurple/protocols/oscar/oscar.c:2467 ../pidgin/gtkroomlist.c:308
+#: ../libpurple/protocols/oscar/oscar.c:2468 ../pidgin/gtkroomlist.c:308
 msgid "_Add"
 msgstr "加入(_A)"
 
-#: ../libpurple/protocols/oscar/oscar.c:2468
+#: ../libpurple/protocols/oscar/oscar.c:2469
 msgid "_Decline"
 msgstr "婉拒(_D)"
 
-#: ../libpurple/protocols/oscar/oscar.c:2552
+#: ../libpurple/protocols/oscar/oscar.c:2553
 #, 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:2561
+#: ../libpurple/protocols/oscar/oscar.c:2562
 #, 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:2570
+#: ../libpurple/protocols/oscar/oscar.c:2571
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -7141,21 +7262,21 @@
 msgstr[1] "您遺失了 %hu 個由 %s 送來的訊息,因為它們傳送的速度太快。"
 
 # XXX 跟芬蘭文的前譯者 (Arto) 有同感,直譯「邪惡」好像行不通,下同
-#: ../libpurple/protocols/oscar/oscar.c:2579
+#: ../libpurple/protocols/oscar/oscar.c:2580
 #, 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:2588
+#: ../libpurple/protocols/oscar/oscar.c:2589
 #, 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:2597
+#: ../libpurple/protocols/oscar/oscar.c:2598
 #, 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."
@@ -7163,70 +7284,70 @@
 msgstr[1] "您遺失了 %hu 個由 %s 送來的訊息,原因不明。"
 
 #. Data is assumed to be the destination sn
-#: ../libpurple/protocols/oscar/oscar.c:2752
+#: ../libpurple/protocols/oscar/oscar.c:2753
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "無法送出訊息:%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2752
-#: ../libpurple/protocols/oscar/oscar.c:2757
-#: ../libpurple/protocols/oscar/oscar.c:2819
-#: ../libpurple/protocols/oscar/oscar.c:2823
+#: ../libpurple/protocols/oscar/oscar.c:2753
+#: ../libpurple/protocols/oscar/oscar.c:2758
+#: ../libpurple/protocols/oscar/oscar.c:2820
+#: ../libpurple/protocols/oscar/oscar.c:2824
 msgid "Unknown reason."
 msgstr "原因不明。"
 
-#: ../libpurple/protocols/oscar/oscar.c:2755
+#: ../libpurple/protocols/oscar/oscar.c:2756
 #: ../libpurple/protocols/sametime/sametime.c:2409
 #, c-format
 msgid "Unable to send message to %s:"
 msgstr "無法送出訊息至 %s:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2819
+#: ../libpurple/protocols/oscar/oscar.c:2820
 #, c-format
 msgid "User information not available: %s"
 msgstr "無法取得個人資訊:%s"
 
 # NOTE 譯文更動 by Ambrose
-#: ../libpurple/protocols/oscar/oscar.c:2822
+#: ../libpurple/protocols/oscar/oscar.c:2823
 #, c-format
 msgid "User information for %s unavailable:"
 msgstr "無法取得使用者 %s 的個人資訊:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2851
+#: ../libpurple/protocols/oscar/oscar.c:2852
 msgid "Online Since"
 msgstr "上線自"
 
 # XXX 改譯「註冊日期」會否比較通順?
-#: ../libpurple/protocols/oscar/oscar.c:2856
+#: ../libpurple/protocols/oscar/oscar.c:2857
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1161
 msgid "Member Since"
 msgstr "成為成員的時間"
 
-#: ../libpurple/protocols/oscar/oscar.c:2861
+#: ../libpurple/protocols/oscar/oscar.c:2862
 msgid "Capabilities"
 msgstr "相容性"
 
-#: ../libpurple/protocols/oscar/oscar.c:2891
+#: ../libpurple/protocols/oscar/oscar.c:2892
 msgid "Available Message"
 msgstr "尚有訊息"
 
-#: ../libpurple/protocols/oscar/oscar.c:2917
+#: ../libpurple/protocols/oscar/oscar.c:2918
 msgid "Profile"
 msgstr "個人資料"
 
-#: ../libpurple/protocols/oscar/oscar.c:2994
+#: ../libpurple/protocols/oscar/oscar.c:2995
 msgid "Your AIM connection may be lost."
 msgstr "您的 AIM 可能斷線了。"
 
 #  The conversion failed!
 #. The conversion failed!
-#: ../libpurple/protocols/oscar/oscar.c:3181
+#: ../libpurple/protocols/oscar/oscar.c:3182
 msgid ""
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
 msgstr "「無法顯示來自這個使用者的訊息,因為它包含了無效字元。」"
 
-#: ../libpurple/protocols/oscar/oscar.c:3384
+#: ../libpurple/protocols/oscar/oscar.c:3385
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
@@ -7234,113 +7355,114 @@
 "您最近做的一個動作無法完成,因為您已經達到發送訊息速率的上限。請等待十秒後再"
 "試一次。"
 
-#: ../libpurple/protocols/oscar/oscar.c:3456
+#: ../libpurple/protocols/oscar/oscar.c:3457
 msgid "You have been signed off for an unknown reason."
 msgstr "您因為不明原因而登出。"
 
-#: ../libpurple/protocols/oscar/oscar.c:3469
+#: ../libpurple/protocols/oscar/oscar.c:3470
 #: ../libpurple/protocols/toc/toc.c:977
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "您已經由聊天室 %s 停止連線。"
 
-#: ../libpurple/protocols/oscar/oscar.c:3716
-#: ../libpurple/protocols/silc/util.c:581
+#: ../libpurple/protocols/oscar/oscar.c:3717
+#: ../libpurple/protocols/silc/util.c:585
+#: ../libpurple/protocols/silc10/util.c:581
 msgid "Mobile Phone"
 msgstr "行動電話"
 
-#: ../libpurple/protocols/oscar/oscar.c:3746
+#: ../libpurple/protocols/oscar/oscar.c:3747
 msgid "Personal Web Page"
 msgstr "個人網頁"
 
-#: ../libpurple/protocols/oscar/oscar.c:3770
+#: ../libpurple/protocols/oscar/oscar.c:3771
 #: ../libpurple/protocols/qq/buddy_info.c:40
 msgid "Additional Information"
 msgstr "其他資訊"
 
-#: ../libpurple/protocols/oscar/oscar.c:3778
-#: ../libpurple/protocols/oscar/oscar.c:3791
+#: ../libpurple/protocols/oscar/oscar.c:3779
+#: ../libpurple/protocols/oscar/oscar.c:3792
 msgid "Zip Code"
 msgstr "郵遞區號"
 
-#: ../libpurple/protocols/oscar/oscar.c:3802
+#: ../libpurple/protocols/oscar/oscar.c:3803
 msgid "Division"
 msgstr "部門"
 
-#: ../libpurple/protocols/oscar/oscar.c:3803
+#: ../libpurple/protocols/oscar/oscar.c:3804
 msgid "Position"
 msgstr "職位"
 
-#: ../libpurple/protocols/oscar/oscar.c:3805
+#: ../libpurple/protocols/oscar/oscar.c:3806
 msgid "Web Page"
 msgstr "網頁"
 
-#: ../libpurple/protocols/oscar/oscar.c:3808
+#: ../libpurple/protocols/oscar/oscar.c:3809
 msgid "Work Information"
 msgstr "工作資訊"
 
 # XXX 這是什麼 (情形下出現的)? (好像是以前譯「訊息」的那個??)
-#: ../libpurple/protocols/oscar/oscar.c:3864
+#: ../libpurple/protocols/oscar/oscar.c:3865
 msgid "Pop-Up Message"
 msgstr "彈出訊息"
 
 # Patch by Kevin Leung
-#: ../libpurple/protocols/oscar/oscar.c:3904
+#: ../libpurple/protocols/oscar/oscar.c:3905
 #, 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:3909
+#: ../libpurple/protocols/oscar/oscar.c:3910
 msgid "Screen name"
 msgstr "帳號"
 
-#: ../libpurple/protocols/oscar/oscar.c:3935
+#: ../libpurple/protocols/oscar/oscar.c:3936
 #, c-format
 msgid "No results found for e-mail address %s"
 msgstr "找不到和電子郵件地址 %s 相關的結果"
 
-#: ../libpurple/protocols/oscar/oscar.c:3956
+#: ../libpurple/protocols/oscar/oscar.c:3957
 #, c-format
 msgid "You should receive an e-mail asking to confirm %s."
 msgstr "您應該會收到一封要求對 %s 進行認證的電子郵件。"
 
-#: ../libpurple/protocols/oscar/oscar.c:3958
+#: ../libpurple/protocols/oscar/oscar.c:3959
 msgid "Account Confirmation Requested"
 msgstr "帳號確認"
 
-#: ../libpurple/protocols/oscar/oscar.c:3989
+#: ../libpurple/protocols/oscar/oscar.c:3990
 msgid "Error Changing Account Info"
 msgstr "更改帳號資訊錯誤"
 
-#: ../libpurple/protocols/oscar/oscar.c:3992
+#: ../libpurple/protocols/oscar/oscar.c:3993
 #, 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:3995
+#: ../libpurple/protocols/oscar/oscar.c:3996
 #, c-format
 msgid "Error 0x%04x: Unable to format screen name because it is invalid."
 msgstr "錯誤 0x%04x:無法格式化帳號,因為它是無效的。"
 
-#: ../libpurple/protocols/oscar/oscar.c:3998
+#: ../libpurple/protocols/oscar/oscar.c:3999
 #, 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:4001
+#: ../libpurple/protocols/oscar/oscar.c:4002
 #, 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:4004
+#: ../libpurple/protocols/oscar/oscar.c:4005
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address has "
@@ -7348,37 +7470,37 @@
 msgstr ""
 "錯誤 0x%04x:無法改變電子郵件地址,因為這個電子郵件地址和太多的帳號產生關連。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4007
+#: ../libpurple/protocols/oscar/oscar.c:4008
 #, 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:4010
+#: ../libpurple/protocols/oscar/oscar.c:4011
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "錯誤 0x%04x:未知錯誤。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4020
+#: ../libpurple/protocols/oscar/oscar.c:4021
 #, c-format
 msgid "The e-mail address for %s is %s"
 msgstr "%s 的電子郵件地址為 %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:4022
+#: ../libpurple/protocols/oscar/oscar.c:4023
 msgid "Account Info"
 msgstr "帳號資訊"
 
-#: ../libpurple/protocols/oscar/oscar.c:4194
+#: ../libpurple/protocols/oscar/oscar.c:4195
 msgid ""
 "Your IM Image was not sent. You must be Direct Connected to send IM Images."
 msgstr "無法傳送即時訊息影像;要傳送即時訊息影像,必須與對方直接連線。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4439
+#: ../libpurple/protocols/oscar/oscar.c:4461
 msgid "Unable to set AIM profile."
 msgstr "無法設定 AIM 個人資料。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4440
+#: ../libpurple/protocols/oscar/oscar.c:4462
 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 "
@@ -7387,7 +7509,7 @@
 "您在未登入完成前要求修改您的個人資訊,所以這些資訊並未被修改。請在完成登入後"
 "再重新進行設定。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4454
+#: ../libpurple/protocols/oscar/oscar.c:4476
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  It has been "
@@ -7398,11 +7520,11 @@
 msgstr[0] "個人資訊的長度超出了 %d 個位元組的上限,過長部分已被截去。"
 msgstr[1] "個人資訊的長度超出了 %d 個位元組的上限,過長部分已被截去。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4459
+#: ../libpurple/protocols/oscar/oscar.c:4481
 msgid "Profile too long."
 msgstr "個人資訊過長。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4504
+#: ../libpurple/protocols/oscar/oscar.c:4526
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  It has been "
@@ -7413,11 +7535,11 @@
 msgstr[0] "離開訊息的長度超出了 %d 個位元組的上限,過長部分已被截去。"
 msgstr[1] "離開訊息的長度超出了 %d 個位元組的上限,過長部分已被截去。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4509
+#: ../libpurple/protocols/oscar/oscar.c:4531
 msgid "Away message too long."
 msgstr "離開訊息過長。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4578
+#: ../libpurple/protocols/oscar/oscar.c:4600
 #, c-format
 msgid ""
 "Could not add the buddy %s because the screen name is invalid.  Screen names "
@@ -7428,17 +7550,17 @@
 "文字母為開頭,同時由「英文字母」、「數字」和「空白」所組成,或者單純以「數"
 "字」組成。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4580
-#: ../libpurple/protocols/oscar/oscar.c:5003
-#: ../libpurple/protocols/oscar/oscar.c:5017
+#: ../libpurple/protocols/oscar/oscar.c:4602
+#: ../libpurple/protocols/oscar/oscar.c:5025
+#: ../libpurple/protocols/oscar/oscar.c:5039
 msgid "Unable To Add"
 msgstr "無法加入"
 
-#: ../libpurple/protocols/oscar/oscar.c:4684
+#: ../libpurple/protocols/oscar/oscar.c:4706
 msgid "Unable To Retrieve Buddy List"
 msgstr "無法讀取好友清單"
 
-#: ../libpurple/protocols/oscar/oscar.c:4685
+#: ../libpurple/protocols/oscar/oscar.c:4707
 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."
@@ -7446,16 +7568,16 @@
 "AIM 伺服器暫時無法送出您的好友清單。不過這個好友清單並沒有遺失,可能可以在幾"
 "個小時後取得。"
 
-#: ../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
+#: ../libpurple/protocols/oscar/oscar.c:4911
+#: ../libpurple/protocols/oscar/oscar.c:4912
+#: ../libpurple/protocols/oscar/oscar.c:4917
+#: ../libpurple/protocols/oscar/oscar.c:5093
+#: ../libpurple/protocols/oscar/oscar.c:5094
+#: ../libpurple/protocols/oscar/oscar.c:5099
 msgid "Orphans"
 msgstr "孤兒們"
 
-#: ../libpurple/protocols/oscar/oscar.c:5001
+#: ../libpurple/protocols/oscar/oscar.c:5023
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -7464,12 +7586,12 @@
 "因為您的好友法單中有太多的好友,所以沒有辦法加入好友 %s。請在移除部份好友後重"
 "試。"
 
-#: ../libpurple/protocols/oscar/oscar.c:5001
-#: ../libpurple/protocols/oscar/oscar.c:5015
+#: ../libpurple/protocols/oscar/oscar.c:5023
+#: ../libpurple/protocols/oscar/oscar.c:5037
 msgid "(no name)"
 msgstr "(沒有名字)"
 
-#: ../libpurple/protocols/oscar/oscar.c:5015
+#: ../libpurple/protocols/oscar/oscar.c:5037
 #, c-format
 msgid ""
 "Could not add the buddy %s for an unknown reason.  The most common reason "
@@ -7479,7 +7601,7 @@
 "因為不明原因而無法將好友 %s 加入。一般的原因是因為您的好友清單中的好友數目超"
 "過所系統允許的上限。"
 
-#: ../libpurple/protocols/oscar/oscar.c:5108
+#: ../libpurple/protocols/oscar/oscar.c:5130
 #, c-format
 msgid ""
 "The user %s has given you permission to add you to their buddy list.  Do you "
@@ -7489,23 +7611,23 @@
 "呢?"
 
 # NOTE 這是我們允許別人發出的認證要求後顯示給我們自己看的
-#: ../libpurple/protocols/oscar/oscar.c:5116
+#: ../libpurple/protocols/oscar/oscar.c:5138
 msgid "Authorization Given"
 msgstr "給予認證"
 
 #. Granted
-#: ../libpurple/protocols/oscar/oscar.c:5189
+#: ../libpurple/protocols/oscar/oscar.c:5211
 #, 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:5190
+#: ../libpurple/protocols/oscar/oscar.c:5212
 msgid "Authorization Granted"
 msgstr "認證獲允"
 
 #. Denied
-#: ../libpurple/protocols/oscar/oscar.c:5193
+#: ../libpurple/protocols/oscar/oscar.c:5215
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -7515,32 +7637,32 @@
 "使用者 %s 因為下列原因,拒絕了您將他(她)加入好友清單的要求:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:5194
+#: ../libpurple/protocols/oscar/oscar.c:5216
 msgid "Authorization Denied"
 msgstr "認證被拒"
 
 # NOTE: 這裡的字義係由 #gaim 的 MrHappy 及 deryni 提供的
 # NOTE: KingAnt 提供的字義有些不同,暫時不予理會
-#: ../libpurple/protocols/oscar/oscar.c:5230
+#: ../libpurple/protocols/oscar/oscar.c:5252
 #: ../libpurple/protocols/toc/toc.c:1371
 msgid "_Exchange:"
 msgstr "頻道號碼(_E):"
 
-#: ../libpurple/protocols/oscar/oscar.c:5270
+#: ../libpurple/protocols/oscar/oscar.c:5292
 msgid "Invalid chat name specified."
 msgstr "給予了無效的聊天室名稱。"
 
-#: ../libpurple/protocols/oscar/oscar.c:5340
+#: ../libpurple/protocols/oscar/oscar.c:5361
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 msgstr "無法傳送即時訊息影像;AIM 聊天並不支援即時訊息影像的傳送。"
 
-#: ../libpurple/protocols/oscar/oscar.c:5479
-#: ../libpurple/protocols/oscar/oscar.c:5484
+#: ../libpurple/protocols/oscar/oscar.c:5521
+#: ../libpurple/protocols/oscar/oscar.c:5526
 msgid "Away Message"
 msgstr "離開訊息"
 
 # XXX 好像不對,又好像沒問題
-#: ../libpurple/protocols/oscar/oscar.c:5484
+#: ../libpurple/protocols/oscar/oscar.c:5526
 msgid "<i>(retrieving)</i>"
 msgstr " <i>(搜尋中)</i>"
 
@@ -7548,89 +7670,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:5684
+#: ../libpurple/protocols/oscar/oscar.c:5726
 msgid "iTunes Music Store Link"
 msgstr "iTunes Store 網站連結"
 
-#: ../libpurple/protocols/oscar/oscar.c:5792
+#: ../libpurple/protocols/oscar/oscar.c:5834
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "%s 的好友說明"
 
-#: ../libpurple/protocols/oscar/oscar.c:5793
+#: ../libpurple/protocols/oscar/oscar.c:5835
 msgid "Buddy Comment:"
 msgstr "好友說明:"
 
-#: ../libpurple/protocols/oscar/oscar.c:5840
+#: ../libpurple/protocols/oscar/oscar.c:5882
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr "您選擇了與 %s 開啟一個直接即時訊息。"
 
-#: ../libpurple/protocols/oscar/oscar.c:5844
+#: ../libpurple/protocols/oscar/oscar.c:5886
 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:5850
+#: ../libpurple/protocols/oscar/oscar.c:5892
 msgid "C_onnect"
 msgstr "連線(_O)"
 
-#: ../libpurple/protocols/oscar/oscar.c:5885
+#: ../libpurple/protocols/oscar/oscar.c:5927
 msgid "Get AIM Info"
 msgstr "取得 AIM 資訊"
 
-#: ../libpurple/protocols/oscar/oscar.c:5891
+#: ../libpurple/protocols/oscar/oscar.c:5933
 msgid "Edit Buddy Comment"
 msgstr "編輯好友說明"
 
-#: ../libpurple/protocols/oscar/oscar.c:5899
+#: ../libpurple/protocols/oscar/oscar.c:5941
 msgid "Get Status Msg"
 msgstr "取得狀態訊息"
 
 # NOTE 將「直接消息」改譯為「即時訊息」
-#: ../libpurple/protocols/oscar/oscar.c:5912
+#: ../libpurple/protocols/oscar/oscar.c:5954
 msgid "Direct IM"
 msgstr "即時訊息"
 
-#: ../libpurple/protocols/oscar/oscar.c:5934
+#: ../libpurple/protocols/oscar/oscar.c:5976
 msgid "Re-request Authorization"
 msgstr "重新要求認證"
 
 # NOTE Require意為「需要」,不是「要求」
-#: ../libpurple/protocols/oscar/oscar.c:5993
+#: ../libpurple/protocols/oscar/oscar.c:6035
 msgid "Require authorization"
 msgstr "需要認證"
 
-#: ../libpurple/protocols/oscar/oscar.c:5996
+#: ../libpurple/protocols/oscar/oscar.c:6038
 msgid "Web aware (enabling this will cause you to receive SPAM!)"
 msgstr "允許其他使用者在網路上查看您目前的狀態(會導致您收到垃圾訊息!)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6001
+#: ../libpurple/protocols/oscar/oscar.c:6043
 msgid "ICQ Privacy Options"
 msgstr "ICQ 隱私選頊"
 
-#: ../libpurple/protocols/oscar/oscar.c:6020
+#: ../libpurple/protocols/oscar/oscar.c:6062
 msgid "The new formatting is invalid."
 msgstr "新的格式是無效的。"
 
-#: ../libpurple/protocols/oscar/oscar.c:6021
+#: ../libpurple/protocols/oscar/oscar.c:6063
 msgid "Screen name formatting can change only capitalization and whitespace."
 msgstr "帳號格式化只能改變大寫以及空白。"
 
-#: ../libpurple/protocols/oscar/oscar.c:6074
+#: ../libpurple/protocols/oscar/oscar.c:6116
 msgid "Change Address To:"
 msgstr "變更地址為:"
 
-#: ../libpurple/protocols/oscar/oscar.c:6120
+#: ../libpurple/protocols/oscar/oscar.c:6162
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>您並沒有在等待驗證</i>"
 
-#: ../libpurple/protocols/oscar/oscar.c:6123
+#: ../libpurple/protocols/oscar/oscar.c:6165
 msgid "You are awaiting authorization from the following buddies"
 msgstr "您目前正在等待下列好友的認證"
 
-#: ../libpurple/protocols/oscar/oscar.c:6124
+#: ../libpurple/protocols/oscar/oscar.c:6166
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
@@ -7638,74 +7760,74 @@
 "您可以重新要求這些好友的認證,只要在好友清單中以滑鼠右鍵點擊他們,然後選擇"
 "「要求重新認證」。"
 
-#: ../libpurple/protocols/oscar/oscar.c:6141
+#: ../libpurple/protocols/oscar/oscar.c:6183
 msgid "Find Buddy by E-Mail"
 msgstr "以電子郵件地址來找尋好友"
 
-#: ../libpurple/protocols/oscar/oscar.c:6142
+#: ../libpurple/protocols/oscar/oscar.c:6184
 msgid "Search for a buddy by e-mail address"
 msgstr "使用電子郵件地址搜尋好友"
 
-#: ../libpurple/protocols/oscar/oscar.c:6143
+#: ../libpurple/protocols/oscar/oscar.c:6185
 msgid "Type the e-mail address of the buddy you are searching for."
 msgstr "請輸入對方的電子郵件地址。"
 
-#: ../libpurple/protocols/oscar/oscar.c:6146
+#: ../libpurple/protocols/oscar/oscar.c:6188
 msgid "_Search"
 msgstr "搜尋(_S)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6304
+#: ../libpurple/protocols/oscar/oscar.c:6346
 msgid "Set User Info (URL)..."
 msgstr "設定使用者資訊 (透過網頁)..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6315
+#: ../libpurple/protocols/oscar/oscar.c:6357
 msgid "Change Password (URL)"
 msgstr "修改密碼 (透過網頁)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6319
+#: ../libpurple/protocols/oscar/oscar.c:6361
 msgid "Configure IM Forwarding (URL)"
 msgstr "設定即時訊息的轉送 (透過網頁)"
 
 #  NOTE 譯文更動 by Ambrose
 #. ICQ actions
-#: ../libpurple/protocols/oscar/oscar.c:6329
+#: ../libpurple/protocols/oscar/oscar.c:6371
 msgid "Set Privacy Options..."
 msgstr "設定隱私選項..."
 
 #. AIM actions
-#: ../libpurple/protocols/oscar/oscar.c:6336
+#: ../libpurple/protocols/oscar/oscar.c:6378
 msgid "Confirm Account"
 msgstr "確認帳號"
 
-#: ../libpurple/protocols/oscar/oscar.c:6340
+#: ../libpurple/protocols/oscar/oscar.c:6382
 msgid "Display Currently Registered E-Mail Address"
 msgstr "顯示目前所註冊的電子郵件位址"
 
-#: ../libpurple/protocols/oscar/oscar.c:6344
+#: ../libpurple/protocols/oscar/oscar.c:6386
 msgid "Change Currently Registered E-Mail Address..."
 msgstr "修改目前所註冊的電子郵件位址..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6351
+#: ../libpurple/protocols/oscar/oscar.c:6393
 msgid "Show Buddies Awaiting Authorization"
 msgstr "顯示等待認證的好友"
 
-#: ../libpurple/protocols/oscar/oscar.c:6357
+#: ../libpurple/protocols/oscar/oscar.c:6399
 msgid "Search for Buddy by E-Mail Address..."
 msgstr "使用電子郵件地址搜尋好友..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6362
+#: ../libpurple/protocols/oscar/oscar.c:6404
 msgid "Search for Buddy by Information"
 msgstr "依照資訊尋找好友"
 
-#: ../libpurple/protocols/oscar/oscar.c:6430
+#: ../libpurple/protocols/oscar/oscar.c:6472
 msgid "Use recent buddies group"
 msgstr "使用「Recent Buddies」群組"
 
-#: ../libpurple/protocols/oscar/oscar.c:6433
+#: ../libpurple/protocols/oscar/oscar.c:6475
 msgid "Show how long you have been idle"
-msgstr "顯示你閒置多久時間"
-
-#: ../libpurple/protocols/oscar/oscar.c:6588
+msgstr "顯示您閒置多久時間"
+
+#: ../libpurple/protocols/oscar/oscar.c:6630
 msgid ""
 "Always use ICQ proxy server for file transfers\n"
 "(slower, but does not reveal your IP address)"
@@ -7939,11 +8061,14 @@
 msgid "Reject request"
 msgstr "拒絕"
 
+#  NOTE 這個「你」字沒有打錯,主要是法文及德文的譯者都採用「你」
+#  NOTE(法文「tu」、德文「du」)而不是「您」(「vous」、「Sie」),
+#  NOTE 中文採用「你」應該也是恰當的。
 #. title
 #: ../libpurple/protocols/qq/buddy_opt.c:213
 #: ../libpurple/protocols/qq/group_opt.c:140
 msgid "Sorry, you are not my type..."
-msgstr "對不起,我和你合不來……"
+msgstr "對不起,我和你,合不來的……"
 
 #: ../libpurple/protocols/qq/buddy_opt.c:214
 #: ../libpurple/protocols/qq/group_im.c:142
@@ -8209,13 +8334,7 @@
 msgstr "無法登入,請檢查除錯記錄"
 
 #. 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: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
@@ -8642,7 +8761,7 @@
 msgid "Send TEST Announcement"
 msgstr "送出測試通告"
 
-#: ../libpurple/protocols/sametime/sametime.c:3586 ../pidgin/gtkconv.c:4177
+#: ../libpurple/protocols/sametime/sametime.c:3586 ../pidgin/gtkconv.c:4290
 msgid "Topic:"
 msgstr "主題:"
 
@@ -8669,6 +8788,10 @@
 msgid "No Sametime Community Server Specified"
 msgstr "未指定 Sametime 社群伺服器"
 
+#: ../libpurple/protocols/sametime/sametime.c:3644 ../pidgin/gtkblist.c:3997
+msgid "Connect"
+msgstr "連線"
+
 #: ../libpurple/protocols/sametime/sametime.c:4135
 #, c-format
 msgid "Unknown (0x%04x)<br>"
@@ -8898,67 +9021,93 @@
 msgstr "隱藏客戶端識別"
 
 #: ../libpurple/protocols/silc/buddy.c:52
-#: ../libpurple/protocols/silc/buddy.c:421
-#: ../libpurple/protocols/silc/buddy.c:546
-#: ../libpurple/protocols/silc/buddy.c:712
-#: ../libpurple/protocols/silc/ft.c:338
+#: ../libpurple/protocols/silc/buddy.c:410
+#: ../libpurple/protocols/silc/buddy.c:538
+#: ../libpurple/protocols/silc/buddy.c:700
+#: ../libpurple/protocols/silc/ft.c:423
+#: ../libpurple/protocols/silc10/buddy.c:52
+#: ../libpurple/protocols/silc10/buddy.c:421
+#: ../libpurple/protocols/silc10/buddy.c:546
+#: ../libpurple/protocols/silc10/buddy.c:712
+#: ../libpurple/protocols/silc10/ft.c:338
 #, c-format
 msgid "User %s is not present in the network"
 msgstr "使用者 %s 不在網路上"
 
 #: ../libpurple/protocols/silc/buddy.c:53
+#: ../libpurple/protocols/silc/buddy.c:110
 #: ../libpurple/protocols/silc/buddy.c:115
-#: ../libpurple/protocols/silc/buddy.c:120
+#: ../libpurple/protocols/silc/buddy.c:119
 #: ../libpurple/protocols/silc/buddy.c:124
 #: ../libpurple/protocols/silc/buddy.c:129
 #: ../libpurple/protocols/silc/buddy.c:134
-#: ../libpurple/protocols/silc/buddy.c:139
-#: ../libpurple/protocols/silc/buddy.c:257
+#: ../libpurple/protocols/silc/buddy.c:254
+#: ../libpurple/protocols/silc10/buddy.c:53
+#: ../libpurple/protocols/silc10/buddy.c:115
+#: ../libpurple/protocols/silc10/buddy.c:120
+#: ../libpurple/protocols/silc10/buddy.c:124
+#: ../libpurple/protocols/silc10/buddy.c:129
+#: ../libpurple/protocols/silc10/buddy.c:134
+#: ../libpurple/protocols/silc10/buddy.c:139
+#: ../libpurple/protocols/silc10/buddy.c:257
 msgid "Key Agreement"
 msgstr "交換密鑰"
 
 #: ../libpurple/protocols/silc/buddy.c:54
+#: ../libpurple/protocols/silc10/buddy.c:54
 msgid "Cannot perform the key agreement"
 msgstr "無法交換密鑰"
 
-#: ../libpurple/protocols/silc/buddy.c:116
+#: ../libpurple/protocols/silc/buddy.c:111
+#: ../libpurple/protocols/silc10/buddy.c:116
 msgid "Error occurred during key agreement"
 msgstr "交換密鑰中出現錯誤"
 
-#: ../libpurple/protocols/silc/buddy.c:120
+#: ../libpurple/protocols/silc/buddy.c:115
+#: ../libpurple/protocols/silc10/buddy.c:120
 msgid "Key Agreement failed"
 msgstr "交換密鑰失敗"
 
-#: ../libpurple/protocols/silc/buddy.c:125
+#: ../libpurple/protocols/silc/buddy.c:120
+#: ../libpurple/protocols/silc10/buddy.c:125
 msgid "Timeout during key agreement"
 msgstr "交換密鑰逾時"
 
+#: ../libpurple/protocols/silc/buddy.c:125
+#: ../libpurple/protocols/silc10/buddy.c:130
+msgid "Key agreement was aborted"
+msgstr "交換密鑰被中止"
+
 #: ../libpurple/protocols/silc/buddy.c:130
-msgid "Key agreement was aborted"
-msgstr "交換密鑰被中止"
-
-#: ../libpurple/protocols/silc/buddy.c:135
+#: ../libpurple/protocols/silc10/buddy.c:135
 msgid "Key agreement is already started"
 msgstr "交換密鑰己開始"
 
-#: ../libpurple/protocols/silc/buddy.c:140
+#: ../libpurple/protocols/silc/buddy.c:135
+#: ../libpurple/protocols/silc10/buddy.c:140
 msgid "Key agreement cannot be started with yourself"
 msgstr "不可與自己交換密鑰"
 
-#: ../libpurple/protocols/silc/buddy.c:258
-#: ../libpurple/protocols/silc/buddy.c:389
-#: ../libpurple/protocols/silc/buddy.c:514
+#: ../libpurple/protocols/silc/buddy.c:255
+#: ../libpurple/protocols/silc/buddy.c:383
+#: ../libpurple/protocols/silc/buddy.c:497
+#: ../libpurple/protocols/silc/buddy.c:508
+#: ../libpurple/protocols/silc10/buddy.c:258
+#: ../libpurple/protocols/silc10/buddy.c:389
+#: ../libpurple/protocols/silc10/buddy.c:514
 msgid "The remote user is not present in the network any more"
 msgstr "遠端使用者已不在網路上"
 
-#: ../libpurple/protocols/silc/buddy.c:295
+#: ../libpurple/protocols/silc/buddy.c:298
+#: ../libpurple/protocols/silc10/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:299
+#: ../libpurple/protocols/silc/buddy.c:302
+#: ../libpurple/protocols/silc10/buddy.c:299
 #, c-format
 msgid ""
 "The remote user is waiting key agreement on:\n"
@@ -8969,69 +9118,99 @@
 "遠端主機 :%s\n"
 "遠端通訊埠:%d"
 
-#: ../libpurple/protocols/silc/buddy.c:312
+#: ../libpurple/protocols/silc/buddy.c:315
+#: ../libpurple/protocols/silc10/buddy.c:312
 msgid "Key Agreement Request"
 msgstr "交換密鑰要求"
 
-#: ../libpurple/protocols/silc/buddy.c:388
-#: ../libpurple/protocols/silc/buddy.c:423
-#: ../libpurple/protocols/silc/buddy.c:465
+#: ../libpurple/protocols/silc/buddy.c:382
+#: ../libpurple/protocols/silc/buddy.c:412
+#: ../libpurple/protocols/silc/buddy.c:452
+#: ../libpurple/protocols/silc10/buddy.c:388
+#: ../libpurple/protocols/silc10/buddy.c:423
+#: ../libpurple/protocols/silc10/buddy.c:465
 msgid "IM With Password"
 msgstr "有密碼之即時訊息"
 
-#: ../libpurple/protocols/silc/buddy.c:424
+#: ../libpurple/protocols/silc/buddy.c:413
+#: ../libpurple/protocols/silc10/buddy.c:424
 msgid "Cannot set IM key"
 msgstr "無法設定即時訊息密鑰"
 
-#: ../libpurple/protocols/silc/buddy.c:466
+#: ../libpurple/protocols/silc/buddy.c:453
+#: ../libpurple/protocols/silc10/buddy.c:466
 msgid "Set IM Password"
 msgstr "設定即時訊息密碼"
 
-#: ../libpurple/protocols/silc/buddy.c:513
-#: ../libpurple/protocols/silc/buddy.c:548
-#: ../libpurple/protocols/silc/ops.c:1494
-#: ../libpurple/protocols/silc/ops.c:1505
+#: ../libpurple/protocols/silc/buddy.c:496
+#: ../libpurple/protocols/silc/buddy.c:507
+#: ../libpurple/protocols/silc/buddy.c:540
+#: ../libpurple/protocols/silc/ops.c:1499
+#: ../libpurple/protocols/silc/ops.c:1510
+#: ../libpurple/protocols/silc10/buddy.c:513
+#: ../libpurple/protocols/silc10/buddy.c:548
+#: ../libpurple/protocols/silc10/ops.c:1494
+#: ../libpurple/protocols/silc10/ops.c:1505
 msgid "Get Public Key"
 msgstr "取得公鑰"
 
-#: ../libpurple/protocols/silc/buddy.c:549
-#: ../libpurple/protocols/silc/ops.c:1495
-#: ../libpurple/protocols/silc/ops.c:1506
+#: ../libpurple/protocols/silc/buddy.c:541
+#: ../libpurple/protocols/silc/ops.c:1500
+#: ../libpurple/protocols/silc/ops.c:1511
+#: ../libpurple/protocols/silc10/buddy.c:549
+#: ../libpurple/protocols/silc10/ops.c:1495
+#: ../libpurple/protocols/silc10/ops.c:1506
 msgid "Cannot fetch the public key"
 msgstr "無法取得公鑰"
 
-#: ../libpurple/protocols/silc/buddy.c:635
-#: ../libpurple/protocols/silc/buddy.c:1654
+#: ../libpurple/protocols/silc/buddy.c:622
+#: ../libpurple/protocols/silc/buddy.c:1655
+#: ../libpurple/protocols/silc10/buddy.c:635
+#: ../libpurple/protocols/silc10/buddy.c:1654
 msgid "Show Public Key"
 msgstr "顯示公鑰"
 
-#: ../libpurple/protocols/silc/buddy.c:636
-#: ../libpurple/protocols/silc/buddy.c:1033
+#: ../libpurple/protocols/silc/buddy.c:623
+#: ../libpurple/protocols/silc/buddy.c:1027
 #: ../libpurple/protocols/silc/chat.c:237
+#: ../libpurple/protocols/silc10/buddy.c:636
+#: ../libpurple/protocols/silc10/buddy.c:1033
+#: ../libpurple/protocols/silc10/chat.c:237
 msgid "Could not load public key"
 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
-#: ../libpurple/protocols/silc/ops.c:1295
-#: ../libpurple/protocols/silc/ops.c:1313
+#: ../libpurple/protocols/silc/buddy.c:701
+#: ../libpurple/protocols/silc/ops.c:1053
+#: ../libpurple/protocols/silc/ops.c:1168
+#: ../libpurple/protocols/silc/ops.c:1288
+#: ../libpurple/protocols/silc/ops.c:1289
+#: ../libpurple/protocols/silc/ops.c:1307
+#: ../libpurple/protocols/silc10/buddy.c:713
+#: ../libpurple/protocols/silc10/ops.c:1087
+#: ../libpurple/protocols/silc10/ops.c:1159
+#: ../libpurple/protocols/silc10/ops.c:1294
+#: ../libpurple/protocols/silc10/ops.c:1295
+#: ../libpurple/protocols/silc10/ops.c:1313
 msgid "User Information"
 msgstr "使用者資訊"
 
-#: ../libpurple/protocols/silc/buddy.c:714
-#: ../libpurple/protocols/silc/ops.c:1160
-#: ../libpurple/protocols/silc/ops.c:1314
+#: ../libpurple/protocols/silc/buddy.c:702
+#: ../libpurple/protocols/silc/ops.c:1169
+#: ../libpurple/protocols/silc/ops.c:1308
+#: ../libpurple/protocols/silc10/buddy.c:714
+#: ../libpurple/protocols/silc10/ops.c:1160
+#: ../libpurple/protocols/silc10/ops.c:1314
 msgid "Cannot get user information"
 msgstr "無法讀取使用者資訊"
 
-#: ../libpurple/protocols/silc/buddy.c:735
+#: ../libpurple/protocols/silc/buddy.c:723
+#: ../libpurple/protocols/silc10/buddy.c:735
 #, c-format
 msgid "The %s buddy is not trusted"
 msgstr "好友 %s 不被信任"
 
-#: ../libpurple/protocols/silc/buddy.c:738
+#: ../libpurple/protocols/silc/buddy.c:726
+#: ../libpurple/protocols/silc10/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."
@@ -9040,37 +9219,44 @@
 "鑰」指令即可。"
 
 #. Open file selector to select the public key.
-#: ../libpurple/protocols/silc/buddy.c:1067
+#: ../libpurple/protocols/silc/buddy.c:1059
+#: ../libpurple/protocols/silc10/buddy.c:1067
 msgid "Open..."
 msgstr "開啟..."
 
-#: ../libpurple/protocols/silc/buddy.c:1078
+#: ../libpurple/protocols/silc/buddy.c:1070
+#: ../libpurple/protocols/silc10/buddy.c:1078
 #, c-format
 msgid "The %s buddy is not present in the network"
 msgstr "好友 %s 不在網路上"
 
-#: ../libpurple/protocols/silc/buddy.c:1081
+#: ../libpurple/protocols/silc/buddy.c:1073
+#: ../libpurple/protocols/silc10/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:1085
+#: ../libpurple/protocols/silc/buddy.c:1077
+#: ../libpurple/protocols/silc10/buddy.c:1085
 msgid "_Import..."
 msgstr "匯入(_I)..."
 
-#: ../libpurple/protocols/silc/buddy.c:1181
+#: ../libpurple/protocols/silc/buddy.c:1183
+#: ../libpurple/protocols/silc10/buddy.c:1181
 msgid "Select correct user"
 msgstr "選擇正確的使用者"
 
-#: ../libpurple/protocols/silc/buddy.c:1183
+#: ../libpurple/protocols/silc/buddy.c:1185
+#: ../libpurple/protocols/silc10/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:1185
+#: ../libpurple/protocols/silc/buddy.c:1187
+#: ../libpurple/protocols/silc10/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."
@@ -9078,6 +9264,7 @@
 "超過一個使用者使用同一名稱。請從清單選擇正確的使用者,以便新增至好友清單內。"
 
 #: ../libpurple/protocols/silc/buddy.c:1474
+#: ../libpurple/protocols/silc10/buddy.c:1474
 msgid "Detached"
 msgstr "暫停連線"
 
@@ -9085,235 +9272,315 @@
 #  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:1478
-#: ../libpurple/protocols/silc/silc.c:49
+#: ../libpurple/protocols/silc/silc.c:58
+#: ../libpurple/protocols/silc10/buddy.c:1478
+#: ../libpurple/protocols/silc10/silc.c:49
 msgid "Indisposed"
 msgstr "不適"
 
 #  XXX
 #: ../libpurple/protocols/silc/buddy.c:1482
-#: ../libpurple/protocols/silc/silc.c:51
+#: ../libpurple/protocols/silc/silc.c:60
+#: ../libpurple/protocols/silc10/buddy.c:1482
+#: ../libpurple/protocols/silc10/silc.c:51
 msgid "Wake Me Up"
 msgstr "叫醒我!"
 
 #  XXX
 #: ../libpurple/protocols/silc/buddy.c:1484
-#: ../libpurple/protocols/silc/silc.c:43
+#: ../libpurple/protocols/silc/silc.c:52
+#: ../libpurple/protocols/silc10/buddy.c:1484
+#: ../libpurple/protocols/silc10/silc.c:43
 msgid "Hyper Active"
 msgstr "極度活躍"
 
 #: ../libpurple/protocols/silc/buddy.c:1486
+#: ../libpurple/protocols/silc10/buddy.c:1486
 msgid "Robot"
 msgstr "機械人"
 
 #: ../libpurple/protocols/silc/buddy.c:1493
-#: ../libpurple/protocols/silc/silc.c:662
-#: ../libpurple/protocols/silc/util.c:512
+#: ../libpurple/protocols/silc/silc.c:743
+#: ../libpurple/protocols/silc/util.c:516
+#: ../libpurple/protocols/silc10/buddy.c:1493
+#: ../libpurple/protocols/silc10/silc.c:654
+#: ../libpurple/protocols/silc10/util.c:512
 msgid "Happy"
 msgstr "開心"
 
 #: ../libpurple/protocols/silc/buddy.c:1495
-#: ../libpurple/protocols/silc/silc.c:664
-#: ../libpurple/protocols/silc/util.c:514
+#: ../libpurple/protocols/silc/silc.c:745
+#: ../libpurple/protocols/silc/util.c:518
+#: ../libpurple/protocols/silc10/buddy.c:1495
+#: ../libpurple/protocols/silc10/silc.c:656
+#: ../libpurple/protocols/silc10/util.c:514
 msgid "Sad"
 msgstr "憂愁"
 
 #: ../libpurple/protocols/silc/buddy.c:1497
-#: ../libpurple/protocols/silc/silc.c:666
-#: ../libpurple/protocols/silc/util.c:516
+#: ../libpurple/protocols/silc/silc.c:747
+#: ../libpurple/protocols/silc/util.c:520
+#: ../libpurple/protocols/silc10/buddy.c:1497
+#: ../libpurple/protocols/silc10/silc.c:658
+#: ../libpurple/protocols/silc10/util.c:516
 msgid "Angry"
 msgstr "憤怒"
 
 #: ../libpurple/protocols/silc/buddy.c:1499
-#: ../libpurple/protocols/silc/silc.c:668
-#: ../libpurple/protocols/silc/util.c:518
+#: ../libpurple/protocols/silc/silc.c:749
+#: ../libpurple/protocols/silc/util.c:522
+#: ../libpurple/protocols/silc10/buddy.c:1499
+#: ../libpurple/protocols/silc10/silc.c:660
+#: ../libpurple/protocols/silc10/util.c:518
 msgid "Jealous"
 msgstr "嫉妒"
 
 #: ../libpurple/protocols/silc/buddy.c:1501
-#: ../libpurple/protocols/silc/silc.c:670
-#: ../libpurple/protocols/silc/util.c:520
+#: ../libpurple/protocols/silc/silc.c:751
+#: ../libpurple/protocols/silc/util.c:524
+#: ../libpurple/protocols/silc10/buddy.c:1501
+#: ../libpurple/protocols/silc10/silc.c:662
+#: ../libpurple/protocols/silc10/util.c:520
 msgid "Ashamed"
 msgstr "慚愧"
 
 #: ../libpurple/protocols/silc/buddy.c:1503
-#: ../libpurple/protocols/silc/silc.c:672
-#: ../libpurple/protocols/silc/util.c:522
+#: ../libpurple/protocols/silc/silc.c:753
+#: ../libpurple/protocols/silc/util.c:526
+#: ../libpurple/protocols/silc10/buddy.c:1503
+#: ../libpurple/protocols/silc10/silc.c:664
+#: ../libpurple/protocols/silc10/util.c:522
 msgid "Invincible"
 msgstr "無敵"
 
 #: ../libpurple/protocols/silc/buddy.c:1505
-#: ../libpurple/protocols/silc/util.c:524
+#: ../libpurple/protocols/silc/util.c:528
+#: ../libpurple/protocols/silc10/buddy.c:1505
+#: ../libpurple/protocols/silc10/util.c:524
 msgid "In Love"
 msgstr "戀愛中"
 
 #: ../libpurple/protocols/silc/buddy.c:1507
-#: ../libpurple/protocols/silc/silc.c:676
-#: ../libpurple/protocols/silc/util.c:526
+#: ../libpurple/protocols/silc/silc.c:757
+#: ../libpurple/protocols/silc/util.c:530
+#: ../libpurple/protocols/silc10/buddy.c:1507
+#: ../libpurple/protocols/silc10/silc.c:668
+#: ../libpurple/protocols/silc10/util.c:526
 msgid "Sleepy"
 msgstr "想睡"
 
 #: ../libpurple/protocols/silc/buddy.c:1509
-#: ../libpurple/protocols/silc/silc.c:678
-#: ../libpurple/protocols/silc/util.c:528
+#: ../libpurple/protocols/silc/silc.c:759
+#: ../libpurple/protocols/silc/util.c:532
+#: ../libpurple/protocols/silc10/buddy.c:1509
+#: ../libpurple/protocols/silc10/silc.c:670
+#: ../libpurple/protocols/silc10/util.c:528
 msgid "Bored"
 msgstr "發悶"
 
 #: ../libpurple/protocols/silc/buddy.c:1511
-#: ../libpurple/protocols/silc/silc.c:680
-#: ../libpurple/protocols/silc/util.c:530
+#: ../libpurple/protocols/silc/silc.c:761
+#: ../libpurple/protocols/silc/util.c:534
+#: ../libpurple/protocols/silc10/buddy.c:1511
+#: ../libpurple/protocols/silc10/silc.c:672
+#: ../libpurple/protocols/silc10/util.c:530
 msgid "Excited"
 msgstr "興奮"
 
 #: ../libpurple/protocols/silc/buddy.c:1513
-#: ../libpurple/protocols/silc/silc.c:682
-#: ../libpurple/protocols/silc/util.c:532
+#: ../libpurple/protocols/silc/silc.c:763
+#: ../libpurple/protocols/silc/util.c:536
+#: ../libpurple/protocols/silc10/buddy.c:1513
+#: ../libpurple/protocols/silc10/silc.c:674
+#: ../libpurple/protocols/silc10/util.c:532
 msgid "Anxious"
 msgstr "憂慮"
 
 #: ../libpurple/protocols/silc/buddy.c:1545
-#: ../libpurple/protocols/silc/ops.c:1202
+#: ../libpurple/protocols/silc/ops.c:1207
+#: ../libpurple/protocols/silc10/buddy.c:1545
+#: ../libpurple/protocols/silc10/ops.c:1202
 msgid "User Modes"
 msgstr "使用者模式"
 
 #: ../libpurple/protocols/silc/buddy.c:1557
-#: ../libpurple/protocols/silc/ops.c:1207
+#: ../libpurple/protocols/silc/ops.c:1212
+#: ../libpurple/protocols/silc10/buddy.c:1557
+#: ../libpurple/protocols/silc10/ops.c:1207
 msgid "Mood"
 msgstr "心情"
 
 #: ../libpurple/protocols/silc/buddy.c:1562
-#: ../libpurple/protocols/silc/ops.c:1219
+#: ../libpurple/protocols/silc/ops.c:1224
+#: ../libpurple/protocols/silc10/buddy.c:1562
+#: ../libpurple/protocols/silc10/ops.c:1219
 msgid "Preferred Contact"
 msgstr "聯絡方法"
 
 #: ../libpurple/protocols/silc/buddy.c:1567
-#: ../libpurple/protocols/silc/ops.c:1224
+#: ../libpurple/protocols/silc/ops.c:1229
+#: ../libpurple/protocols/silc10/buddy.c:1567
+#: ../libpurple/protocols/silc10/ops.c:1224
 msgid "Preferred Language"
 msgstr "選用語文"
 
 #: ../libpurple/protocols/silc/buddy.c:1572
-#: ../libpurple/protocols/silc/ops.c:1229
+#: ../libpurple/protocols/silc/ops.c:1234
+#: ../libpurple/protocols/silc10/buddy.c:1572
+#: ../libpurple/protocols/silc10/ops.c:1229
 msgid "Device"
 msgstr "所用裝置"
 
 #: ../libpurple/protocols/silc/buddy.c:1577
-#: ../libpurple/protocols/silc/ops.c:1234
-#: ../libpurple/protocols/silc/silc.c:730
-#: ../libpurple/protocols/silc/silc.c:732
+#: ../libpurple/protocols/silc/ops.c:1239
+#: ../libpurple/protocols/silc10/buddy.c:1577
+#: ../libpurple/protocols/silc10/ops.c:1234
+#: ../libpurple/protocols/silc10/silc.c:722
+#: ../libpurple/protocols/silc10/silc.c:724
 msgid "Timezone"
 msgstr "時區"
 
 #: ../libpurple/protocols/silc/buddy.c:1582
-#: ../libpurple/protocols/silc/ops.c:1239
+#: ../libpurple/protocols/silc/ops.c:1244
+#: ../libpurple/protocols/silc10/buddy.c:1582
+#: ../libpurple/protocols/silc10/ops.c:1239
 msgid "Geolocation"
 msgstr "所在位置"
 
-#: ../libpurple/protocols/silc/buddy.c:1636
+#: ../libpurple/protocols/silc/buddy.c:1638
+#: ../libpurple/protocols/silc10/buddy.c:1636
 msgid "Reset IM Key"
 msgstr "清除即時訊息密鑰"
 
-#: ../libpurple/protocols/silc/buddy.c:1642
+#: ../libpurple/protocols/silc/buddy.c:1643
+#: ../libpurple/protocols/silc10/buddy.c:1642
 msgid "IM with Key Exchange"
 msgstr "要交換密鑰之即時訊息"
 
-#: ../libpurple/protocols/silc/buddy.c:1647
+#: ../libpurple/protocols/silc/buddy.c:1648
+#: ../libpurple/protocols/silc10/buddy.c:1647
 msgid "IM with Password"
 msgstr "有密碼之即時訊息"
 
-#: ../libpurple/protocols/silc/buddy.c:1660
+#: ../libpurple/protocols/silc/buddy.c:1661
+#: ../libpurple/protocols/silc10/buddy.c:1660
 msgid "Get Public Key..."
 msgstr "取得公鑰..."
 
-#: ../libpurple/protocols/silc/buddy.c:1667
-#: ../libpurple/protocols/silc/ops.c:1624
+#: ../libpurple/protocols/silc/buddy.c:1668
+#: ../libpurple/protocols/silc/ops.c:1608
+#: ../libpurple/protocols/silc10/buddy.c:1667
+#: ../libpurple/protocols/silc10/ops.c:1624
 msgid "Kill User"
 msgstr "從網路上移除使用者"
 
-#: ../libpurple/protocols/silc/buddy.c:1677
-#: ../libpurple/protocols/silc/chat.c:977
+#: ../libpurple/protocols/silc/buddy.c:1678
+#: ../libpurple/protocols/silc/chat.c:993
+#: ../libpurple/protocols/silc10/buddy.c:1677
+#: ../libpurple/protocols/silc10/chat.c:977
 msgid "Draw On Whiteboard"
 msgstr "在白板上繪圖"
 
 #: ../libpurple/protocols/silc/chat.c:39
+#: ../libpurple/protocols/silc10/chat.c:39
 msgid "_Passphrase:"
 msgstr "密碼(_P):"
 
 #: ../libpurple/protocols/silc/chat.c:80
+#: ../libpurple/protocols/silc10/chat.c:80
 #, c-format
 msgid "Channel %s does not exist in the network"
 msgstr "頻道 %s 不在網路上"
 
 #: ../libpurple/protocols/silc/chat.c:81
-#: ../libpurple/protocols/silc/chat.c:174
+#: ../libpurple/protocols/silc/chat.c:175
+#: ../libpurple/protocols/silc10/chat.c:81
+#: ../libpurple/protocols/silc10/chat.c:174
 msgid "Channel Information"
 msgstr "頻道資訊"
 
 #: ../libpurple/protocols/silc/chat.c:82
+#: ../libpurple/protocols/silc10/chat.c:82
 msgid "Cannot get channel information"
 msgstr "無法取得頻道資訊"
 
 #: ../libpurple/protocols/silc/chat.c:119
+#: ../libpurple/protocols/silc10/chat.c:119
 #, c-format
 msgid "<b>Channel Name:</b> %s"
 msgstr "<b>頻道名稱:</b>%s"
 
 #: ../libpurple/protocols/silc/chat.c:122
+#: ../libpurple/protocols/silc10/chat.c:122
 #, c-format
 msgid "<br><b>User Count:</b> %d"
 msgstr "<br><b>使用者人數:</b>%d"
 
 #: ../libpurple/protocols/silc/chat.c:129
+#: ../libpurple/protocols/silc10/chat.c:129
 #, c-format
 msgid "<br><b>Channel Founder:</b> %s"
 msgstr "<br><b>頻道創立者:</b>%s"
 
 #: ../libpurple/protocols/silc/chat.c:138
+#: ../libpurple/protocols/silc10/chat.c:138
 #, c-format
 msgid "<br><b>Channel Cipher:</b> %s"
 msgstr "<br><b>頻道加密方式 (Cipher):</b>%s"
 
 #. Definition of HMAC: http://en.wikipedia.org/wiki/HMAC
-#: ../libpurple/protocols/silc/chat.c:142
+#: ../libpurple/protocols/silc/chat.c:143
+#: ../libpurple/protocols/silc10/chat.c:142
 #, c-format
 msgid "<br><b>Channel HMAC:</b> %s"
 msgstr "<br><b>頻道身份驗證代碼 (HMAC):</b>%s"
 
-#: ../libpurple/protocols/silc/chat.c:147
+#: ../libpurple/protocols/silc/chat.c:148
+#: ../libpurple/protocols/silc10/chat.c:147
 #, c-format
 msgid "<br><b>Channel Topic:</b><br>%s"
 msgstr "<br><b>頻道主題:</b><br>%s"
 
-#: ../libpurple/protocols/silc/chat.c:152
+#: ../libpurple/protocols/silc/chat.c:153
+#: ../libpurple/protocols/silc10/chat.c:152
 msgid "<br><b>Channel Modes:</b> "
 msgstr "<br><b>頻道模式:</b>"
 
-#: ../libpurple/protocols/silc/chat.c:165
+#: ../libpurple/protocols/silc/chat.c:166
+#: ../libpurple/protocols/silc10/chat.c:165
 #, c-format
 msgid "<br><b>Founder Key Fingerprint:</b><br>%s"
 msgstr "<br><b>創立者之公鑰指紋:</b><br>%s"
 
-#: ../libpurple/protocols/silc/chat.c:166
+#: ../libpurple/protocols/silc/chat.c:167
+#: ../libpurple/protocols/silc10/chat.c:166
 #, c-format
 msgid "<br><b>Founder Key Babbleprint:</b><br>%s"
 msgstr "<br><b>創立者之公鑰指紋可讀版本 (Babbleprint):</b><br>%s"
 
 #: ../libpurple/protocols/silc/chat.c:236
+#: ../libpurple/protocols/silc10/chat.c:236
 msgid "Add Channel Public Key"
 msgstr "新增頻道公鑰"
 
 #. Add new public key
-#: ../libpurple/protocols/silc/chat.c:291
+#: ../libpurple/protocols/silc/chat.c:304
+#: ../libpurple/protocols/silc10/chat.c:291
 msgid "Open Public Key..."
 msgstr "開啟公鑰..."
 
-#: ../libpurple/protocols/silc/chat.c:401
+#: ../libpurple/protocols/silc/chat.c:423
+#: ../libpurple/protocols/silc10/chat.c:401
 msgid "Channel Passphrase"
 msgstr "頻道密碼"
 
-#: ../libpurple/protocols/silc/chat.c:408
+#: ../libpurple/protocols/silc/chat.c:430
+#: ../libpurple/protocols/silc10/chat.c:408
 msgid "Channel Public Keys List"
 msgstr "頻道公鑰清單"
 
-#: ../libpurple/protocols/silc/chat.c:413
+#: ../libpurple/protocols/silc/chat.c:435
+#: ../libpurple/protocols/silc10/chat.c:413
 msgid ""
 "Channel authentication is used to secure the channel from unauthorized "
 "access. The authentication may be based on passphrase and digital "
@@ -9326,338 +9593,452 @@
 "道就必須擁有所列公鑰內之其一。"
 
 #  XXX 暫譯
-#: ../libpurple/protocols/silc/chat.c:422
-#: ../libpurple/protocols/silc/chat.c:423
-#: ../libpurple/protocols/silc/chat.c:461
-#: ../libpurple/protocols/silc/chat.c:462
-#: ../libpurple/protocols/silc/chat.c:911
+#: ../libpurple/protocols/silc/chat.c:444
+#: ../libpurple/protocols/silc/chat.c:445
+#: ../libpurple/protocols/silc/chat.c:479
+#: ../libpurple/protocols/silc/chat.c:480
+#: ../libpurple/protocols/silc/chat.c:927
+#: ../libpurple/protocols/silc10/chat.c:422
+#: ../libpurple/protocols/silc10/chat.c:423
+#: ../libpurple/protocols/silc10/chat.c:461
+#: ../libpurple/protocols/silc10/chat.c:462
+#: ../libpurple/protocols/silc10/chat.c:911
 msgid "Channel Authentication"
 msgstr "頻道認證"
 
-#: ../libpurple/protocols/silc/chat.c:424
-#: ../libpurple/protocols/silc/chat.c:463
+#: ../libpurple/protocols/silc/chat.c:446
+#: ../libpurple/protocols/silc/chat.c:481
+#: ../libpurple/protocols/silc10/chat.c:424
+#: ../libpurple/protocols/silc10/chat.c:463
 msgid "Add / Remove"
 msgstr "新增/移除"
 
 # XXX may be wrong
-#: ../libpurple/protocols/silc/chat.c:581
+#: ../libpurple/protocols/silc/chat.c:597
+#: ../libpurple/protocols/silc10/chat.c:581
 msgid "Group Name"
 msgstr "聊天室名稱"
 
-#: ../libpurple/protocols/silc/chat.c:585
-#: ../libpurple/protocols/silc/ops.c:1910
-#: ../libpurple/protocols/silc/silc.c:939
+#: ../libpurple/protocols/silc/chat.c:601
+#: ../libpurple/protocols/silc/ops.c:1813
+#: ../libpurple/protocols/silc/silc.c:1020
+#: ../libpurple/protocols/silc10/chat.c:585
+#: ../libpurple/protocols/silc10/ops.c:1901
+#: ../libpurple/protocols/silc10/silc.c:931
 msgid "Passphrase"
 msgstr "密碼"
 
-#: ../libpurple/protocols/silc/chat.c:596
+#: ../libpurple/protocols/silc/chat.c:612
+#: ../libpurple/protocols/silc10/chat.c:596
 #, c-format
 msgid "Please enter the %s channel private group name and passphrase."
 msgstr "請您給頻道 %s 內的小圈子輸入名稱及密碼。"
 
-#: ../libpurple/protocols/silc/chat.c:598
+#: ../libpurple/protocols/silc/chat.c:614
+#: ../libpurple/protocols/silc10/chat.c:598
 msgid "Add Channel Private Group"
 msgstr "新增頻道小圈子"
 
 # XXX may be wrong
-#: ../libpurple/protocols/silc/chat.c:726
+#: ../libpurple/protocols/silc/chat.c:742
+#: ../libpurple/protocols/silc10/chat.c:726
 msgid "User Limit"
 msgstr "使用者數目上限"
 
-#: ../libpurple/protocols/silc/chat.c:727
+#: ../libpurple/protocols/silc/chat.c:743
+#: ../libpurple/protocols/silc10/chat.c:727
 msgid "Set user limit on channel. Set to zero to reset user limit."
 msgstr "設定使用者數目上限;要清除使用者數目上限,輸入零即可。"
 
-#: ../libpurple/protocols/silc/chat.c:891
+#: ../libpurple/protocols/silc/chat.c:907
+#: ../libpurple/protocols/silc10/chat.c:891
 msgid "Invite List"
 msgstr "邀請清單"
 
 #  XXX 暫譯
-#: ../libpurple/protocols/silc/chat.c:896
+#: ../libpurple/protocols/silc/chat.c:912
+#: ../libpurple/protocols/silc10/chat.c:896
 msgid "Ban List"
 msgstr "禁止清單"
 
-#: ../libpurple/protocols/silc/chat.c:904
+#: ../libpurple/protocols/silc/chat.c:920
+#: ../libpurple/protocols/silc10/chat.c:904
 msgid "Add Private Group"
 msgstr "新增小圈子"
 
-#: ../libpurple/protocols/silc/chat.c:917
+#: ../libpurple/protocols/silc/chat.c:933
+#: ../libpurple/protocols/silc10/chat.c:917
 msgid "Reset Permanent"
 msgstr "清除永久性頻道模式"
 
-#: ../libpurple/protocols/silc/chat.c:922
+#: ../libpurple/protocols/silc/chat.c:938
+#: ../libpurple/protocols/silc10/chat.c:922
 msgid "Set Permanent"
 msgstr "設定永久性頻道模式"
 
 #  XXX may be wrong
-#: ../libpurple/protocols/silc/chat.c:930
+#: ../libpurple/protocols/silc/chat.c:946
+#: ../libpurple/protocols/silc10/chat.c:930
 msgid "Set User Limit"
 msgstr "設定使用者數目上限"
 
-#: ../libpurple/protocols/silc/chat.c:936
+#: ../libpurple/protocols/silc/chat.c:952
+#: ../libpurple/protocols/silc10/chat.c:936
 msgid "Reset Topic Restriction"
 msgstr "清除主題限制"
 
-#: ../libpurple/protocols/silc/chat.c:941
+#: ../libpurple/protocols/silc/chat.c:957
+#: ../libpurple/protocols/silc10/chat.c:941
 msgid "Set Topic Restriction"
 msgstr "設定主題限制"
 
-#: ../libpurple/protocols/silc/chat.c:948
+#: ../libpurple/protocols/silc/chat.c:964
+#: ../libpurple/protocols/silc10/chat.c:948
 msgid "Reset Private Channel"
 msgstr "清除私用頻道模式"
 
-#: ../libpurple/protocols/silc/chat.c:953
+#: ../libpurple/protocols/silc/chat.c:969
+#: ../libpurple/protocols/silc10/chat.c:953
 msgid "Set Private Channel"
 msgstr "設定私用頻道模式"
 
-#: ../libpurple/protocols/silc/chat.c:960
+#: ../libpurple/protocols/silc/chat.c:976
+#: ../libpurple/protocols/silc10/chat.c:960
 msgid "Reset Secret Channel"
 msgstr "清除秘密頻道模式"
 
-#: ../libpurple/protocols/silc/chat.c:965
+#: ../libpurple/protocols/silc/chat.c:981
+#: ../libpurple/protocols/silc10/chat.c:965
 msgid "Set Secret Channel"
 msgstr "設定秘密頻道模式"
 
-#  XXX 暫譯
-#: ../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: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:1102
+#: ../libpurple/protocols/silc/chat.c:1045
+#: ../libpurple/protocols/silc10/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:1104
+#: ../libpurple/protocols/silc/chat.c:1047
+#: ../libpurple/protocols/silc10/chat.c:1104
 msgid "Join Private Group"
 msgstr "加入小圈子"
 
-#: ../libpurple/protocols/silc/chat.c:1105
+#: ../libpurple/protocols/silc/chat.c:1048
+#: ../libpurple/protocols/silc10/chat.c:1105
 msgid "Cannot join private group"
 msgstr "無法加入小圈子"
 
-#: ../libpurple/protocols/silc/chat.c:1299
-#: ../libpurple/protocols/silc/silc.c:1148
+#: ../libpurple/protocols/silc/chat.c:1260
+#: ../libpurple/protocols/silc/silc.c:1217
+#: ../libpurple/protocols/silc10/chat.c:1299
+#: ../libpurple/protocols/silc10/silc.c:1137
 msgid "Call Command"
 msgstr "呼叫指令"
 
-#: ../libpurple/protocols/silc/chat.c:1299
-#: ../libpurple/protocols/silc/silc.c:1148
+#: ../libpurple/protocols/silc/chat.c:1260
+#: ../libpurple/protocols/silc/silc.c:1218
+#: ../libpurple/protocols/silc10/chat.c:1299
+#: ../libpurple/protocols/silc10/silc.c:1137
 msgid "Cannot call command"
 msgstr "無法執行指令"
 
-#: ../libpurple/protocols/silc/chat.c:1300
-#: ../libpurple/protocols/silc/silc.c:1149
+#: ../libpurple/protocols/silc/chat.c:1261
+#: ../libpurple/protocols/silc/silc.c:1219
+#: ../libpurple/protocols/silc10/chat.c:1300
+#: ../libpurple/protocols/silc10/silc.c:1138
 msgid "Unknown command"
 msgstr "未知的指令"
 
 #  NOTE 這些都是視窗標題
-#: ../libpurple/protocols/silc/ft.c:89 ../libpurple/protocols/silc/ft.c:92
-#: ../libpurple/protocols/silc/ft.c:96 ../libpurple/protocols/silc/ft.c:100
-#: ../libpurple/protocols/silc/ft.c:104 ../libpurple/protocols/silc/ft.c:205
-#: ../libpurple/protocols/silc/ft.c:210 ../libpurple/protocols/silc/ft.c:215
-#: ../libpurple/protocols/silc/ft.c:221 ../libpurple/protocols/silc/ft.c:340
+#: ../libpurple/protocols/silc/ft.c:85 ../libpurple/protocols/silc/ft.c:101
+#: ../libpurple/protocols/silc/ft.c:104 ../libpurple/protocols/silc/ft.c:108
+#: ../libpurple/protocols/silc/ft.c:112 ../libpurple/protocols/silc/ft.c:116
+#: ../libpurple/protocols/silc/ft.c:120 ../libpurple/protocols/silc/ft.c:272
+#: ../libpurple/protocols/silc/ft.c:277 ../libpurple/protocols/silc/ft.c:282
+#: ../libpurple/protocols/silc/ft.c:288 ../libpurple/protocols/silc/ft.c:425
+#: ../libpurple/protocols/silc10/ft.c:89 ../libpurple/protocols/silc10/ft.c:92
+#: ../libpurple/protocols/silc10/ft.c:96
+#: ../libpurple/protocols/silc10/ft.c:100
+#: ../libpurple/protocols/silc10/ft.c:104
+#: ../libpurple/protocols/silc10/ft.c:205
+#: ../libpurple/protocols/silc10/ft.c:210
+#: ../libpurple/protocols/silc10/ft.c:215
+#: ../libpurple/protocols/silc10/ft.c:221
+#: ../libpurple/protocols/silc10/ft.c:340
 msgid "Secure File Transfer"
 msgstr "安全的檔案傳輸"
 
-#: ../libpurple/protocols/silc/ft.c:90 ../libpurple/protocols/silc/ft.c:93
-#: ../libpurple/protocols/silc/ft.c:97 ../libpurple/protocols/silc/ft.c:101
-#: ../libpurple/protocols/silc/ft.c:105
+#: ../libpurple/protocols/silc/ft.c:86 ../libpurple/protocols/silc/ft.c:102
+#: ../libpurple/protocols/silc/ft.c:105 ../libpurple/protocols/silc/ft.c:109
+#: ../libpurple/protocols/silc/ft.c:113 ../libpurple/protocols/silc/ft.c:117
+#: ../libpurple/protocols/silc/ft.c:121 ../libpurple/protocols/silc10/ft.c:90
+#: ../libpurple/protocols/silc10/ft.c:93 ../libpurple/protocols/silc10/ft.c:97
+#: ../libpurple/protocols/silc10/ft.c:101
+#: ../libpurple/protocols/silc10/ft.c:105
 msgid "Error during file transfer"
 msgstr "檔案傳輸時發生錯誤"
 
-#: ../libpurple/protocols/silc/ft.c:94
+#: ../libpurple/protocols/silc/ft.c:87
+msgid "Remote disconnected"
+msgstr "遠端結束連線"
+
+#: ../libpurple/protocols/silc/ft.c:106 ../libpurple/protocols/silc10/ft.c:94
 msgid "Permission denied"
 msgstr "拒絕不符權限的操作"
 
-#: ../libpurple/protocols/silc/ft.c:98
+#: ../libpurple/protocols/silc/ft.c:110 ../libpurple/protocols/silc10/ft.c:98
 msgid "Key agreement failed"
 msgstr "交換密鑰失敗"
 
-#: ../libpurple/protocols/silc/ft.c:102
+#: ../libpurple/protocols/silc/ft.c:114
+msgid "Connection timedout"
+msgstr "連線已逾時"
+
+#: ../libpurple/protocols/silc/ft.c:118
+msgid "Creating connection failed"
+msgstr "連線失敗"
+
+#: ../libpurple/protocols/silc/ft.c:122 ../libpurple/protocols/silc10/ft.c:102
 msgid "File transfer session does not exist"
 msgstr "檔案傳輸工作階段不存在"
 
-#: ../libpurple/protocols/silc/ft.c:206
+#: ../libpurple/protocols/silc/ft.c:273 ../libpurple/protocols/silc10/ft.c:206
 msgid "No file transfer session active"
 msgstr "沒有進行中的檔案傳輸工作階段"
 
-#: ../libpurple/protocols/silc/ft.c:211
+#: ../libpurple/protocols/silc/ft.c:278 ../libpurple/protocols/silc10/ft.c:211
 msgid "File transfer already started"
 msgstr "檔案傳輸已開始"
 
-#: ../libpurple/protocols/silc/ft.c:216
+#: ../libpurple/protocols/silc/ft.c:283 ../libpurple/protocols/silc10/ft.c:216
 msgid "Could not perform key agreement for file transfer"
 msgstr "無法交換密鑰以供傳輸"
 
-#: ../libpurple/protocols/silc/ft.c:222
+#: ../libpurple/protocols/silc/ft.c:289 ../libpurple/protocols/silc10/ft.c:222
 msgid "Could not start the file transfer"
 msgstr "無法開始檔案傳輸"
 
-#: ../libpurple/protocols/silc/ft.c:341
+#: ../libpurple/protocols/silc/ft.c:426 ../libpurple/protocols/silc10/ft.c:341
 msgid "Cannot send file"
 msgstr "無法傳送檔案"
 
-#: ../libpurple/protocols/silc/ops.c:554 ../libpurple/protocols/silc/ops.c:563
-#: ../libpurple/protocols/silc/ops.c:572
+#: ../libpurple/protocols/silc/ops.c:57
+msgid "Error occurred"
+msgstr "出現了錯誤"
+
+#: ../libpurple/protocols/silc/ops.c:533 ../libpurple/protocols/silc/ops.c:542
+#: ../libpurple/protocols/silc/ops.c:551
+#: ../libpurple/protocols/silc10/ops.c:554
+#: ../libpurple/protocols/silc10/ops.c:563
+#: ../libpurple/protocols/silc10/ops.c:572
 #, c-format
 msgid "%s has changed the topic of <I>%s</I> to: %s"
 msgstr "%s 把 <I>%s</I> 的聊天主題修改為:%s"
 
-#: ../libpurple/protocols/silc/ops.c:638
+#: ../libpurple/protocols/silc/ops.c:617
+#: ../libpurple/protocols/silc10/ops.c:638
 #, c-format
 msgid "<I>%s</I> set channel <I>%s</I> modes to: %s"
 msgstr "<I>%s</I> 設定頻道 <I>%s</I> 的模式為:%s"
 
-#: ../libpurple/protocols/silc/ops.c:642
+#: ../libpurple/protocols/silc/ops.c:621
+#: ../libpurple/protocols/silc10/ops.c:642
 #, c-format
 msgid "<I>%s</I> removed all channel <I>%s</I> modes"
 msgstr "<I>%s</I> 清除了頻道 <I>%s</I> 所有的模式"
 
-#: ../libpurple/protocols/silc/ops.c:675
+#: ../libpurple/protocols/silc/ops.c:654
+#: ../libpurple/protocols/silc10/ops.c:675
 #, c-format
 msgid "<I>%s</I> set <I>%s's</I> modes to: %s"
 msgstr "<I>%s</I> 設定 <I>%s</I> 的使用者模式為:%s"
 
-#: ../libpurple/protocols/silc/ops.c:683
+#: ../libpurple/protocols/silc/ops.c:662
+#: ../libpurple/protocols/silc10/ops.c:683
 #, c-format
 msgid "<I>%s</I> removed all <I>%s's</I> modes"
 msgstr "<I>%s</I> 清除了 <I>%s's</I> 所有的模式"
 
-#: ../libpurple/protocols/silc/ops.c:712
+#: ../libpurple/protocols/silc/ops.c:691
+#: ../libpurple/protocols/silc10/ops.c:712
 #, c-format
 msgid "You have been kicked off <I>%s</I> by <I>%s</I> (%s)"
 msgstr "您被 <I>%2$s</I> 由 <I>%1$s</I> 踢出 (%3$s)"
 
-#: ../libpurple/protocols/silc/ops.c:742 ../libpurple/protocols/silc/ops.c:747
-#: ../libpurple/protocols/silc/ops.c:752
+#: ../libpurple/protocols/silc/ops.c:718 ../libpurple/protocols/silc/ops.c:723
+#: ../libpurple/protocols/silc/ops.c:728
+#: ../libpurple/protocols/silc10/ops.c:742
+#: ../libpurple/protocols/silc10/ops.c:747
+#: ../libpurple/protocols/silc10/ops.c:752
 #, c-format
 msgid "You have been killed by %s (%s)"
 msgstr "您被 %s 從網路上移除 (%s)"
 
-#: ../libpurple/protocols/silc/ops.c:773 ../libpurple/protocols/silc/ops.c:778
-#: ../libpurple/protocols/silc/ops.c:783
+#: ../libpurple/protocols/silc/ops.c:749 ../libpurple/protocols/silc/ops.c:754
+#: ../libpurple/protocols/silc/ops.c:759
+#: ../libpurple/protocols/silc10/ops.c:773
+#: ../libpurple/protocols/silc10/ops.c:778
+#: ../libpurple/protocols/silc10/ops.c:783
 #, c-format
 msgid "Killed by %s (%s)"
 msgstr "被 %s 從網路上移除 (%s)"
 
 #  XXX 要核實
-#: ../libpurple/protocols/silc/ops.c:829
+#: ../libpurple/protocols/silc/ops.c:796
+#: ../libpurple/protocols/silc10/ops.c:829
 msgid "Server signoff"
 msgstr "從伺服器登出"
 
-#: ../libpurple/protocols/silc/ops.c:1017
+#: ../libpurple/protocols/silc/ops.c:983
+#: ../libpurple/protocols/silc10/ops.c:1017
 msgid "Personal Information"
 msgstr "個人資訊"
 
-#: ../libpurple/protocols/silc/ops.c:1040
+#: ../libpurple/protocols/silc/ops.c:1006
+#: ../libpurple/protocols/silc10/ops.c:1040
 msgid "Birth Day"
 msgstr "生日"
 
-#: ../libpurple/protocols/silc/ops.c:1048
+#: ../libpurple/protocols/silc/ops.c:1014
+#: ../libpurple/protocols/silc10/ops.c:1048
 msgid "Job Role"
 msgstr "職責"
 
-#: ../libpurple/protocols/silc/ops.c:1052
-#: ../libpurple/protocols/silc/silc.c:932
+#: ../libpurple/protocols/silc/ops.c:1018
+#: ../libpurple/protocols/silc/silc.c:1013
+#: ../libpurple/protocols/silc10/ops.c:1052
+#: ../libpurple/protocols/silc10/silc.c:924
 msgid "Organization"
 msgstr "所屬機構"
 
-#: ../libpurple/protocols/silc/ops.c:1056
+#: ../libpurple/protocols/silc/ops.c:1022
+#: ../libpurple/protocols/silc10/ops.c:1056
 msgid "Unit"
 msgstr "部門"
 
-#: ../libpurple/protocols/silc/ops.c:1080
+#: ../libpurple/protocols/silc/ops.c:1046
+#: ../libpurple/protocols/silc10/ops.c:1080
 msgid "Note"
 msgstr "備註"
 
-#: ../libpurple/protocols/silc/ops.c:1128
+#: ../libpurple/protocols/silc/ops.c:1093
+#: ../libpurple/protocols/silc10/ops.c:1128
 msgid "Join Chat"
 msgstr "加入聊天室"
 
-#: ../libpurple/protocols/silc/ops.c:1183
-#: ../libpurple/protocols/silc/ops.c:1332
+#  XXX 暫譯
+#: ../libpurple/protocols/silc/ops.c:1127
+#: ../libpurple/protocols/silc10/chat.c:1039
+#, c-format
+msgid "You are channel founder on <I>%s</I>"
+msgstr "您是 <I>%s</I> 的頻道創立者"
+
+#: ../libpurple/protocols/silc/ops.c:1131
+#: ../libpurple/protocols/silc10/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/ops.c:1190
+#: ../libpurple/protocols/silc/ops.c:1326
+#: ../libpurple/protocols/silc10/ops.c:1183
+#: ../libpurple/protocols/silc10/ops.c:1332
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1047
 msgid "Real Name"
 msgstr "姓名"
 
-#: ../libpurple/protocols/silc/ops.c:1213
+#: ../libpurple/protocols/silc/ops.c:1218
+#: ../libpurple/protocols/silc10/ops.c:1213
 msgid "Status Text"
 msgstr "狀態訊息"
 
-#: ../libpurple/protocols/silc/ops.c:1285
-#: ../libpurple/protocols/silc/ops.c:1357
+#: ../libpurple/protocols/silc/ops.c:1279
+#: ../libpurple/protocols/silc/ops.c:1351
+#: ../libpurple/protocols/silc10/ops.c:1285
+#: ../libpurple/protocols/silc10/ops.c:1357
 msgid "Public Key Fingerprint"
 msgstr "公鑰指紋"
 
-#: ../libpurple/protocols/silc/ops.c:1286
-#: ../libpurple/protocols/silc/ops.c:1358
+#: ../libpurple/protocols/silc/ops.c:1280
+#: ../libpurple/protocols/silc/ops.c:1352
+#: ../libpurple/protocols/silc10/ops.c:1286
+#: ../libpurple/protocols/silc10/ops.c:1358
 msgid "Public Key Babbleprint"
 msgstr "公鑰指紋可讀版本 (Babbleprint)"
 
-#: ../libpurple/protocols/silc/ops.c:1298
+#: ../libpurple/protocols/silc/ops.c:1292
+#: ../libpurple/protocols/silc10/ops.c:1298
 msgid "_More..."
 msgstr "更多(_M)..."
 
-#: ../libpurple/protocols/silc/ops.c:1371
-#: ../libpurple/protocols/silc/silc.c:999
+#: ../libpurple/protocols/silc/ops.c:1369
+#: ../libpurple/protocols/silc/silc.c:1077
+#: ../libpurple/protocols/silc10/ops.c:1371
+#: ../libpurple/protocols/silc10/silc.c:988
 msgid "Detach From Server"
 msgstr "與伺服器暫停連線"
 
-#: ../libpurple/protocols/silc/ops.c:1371
+#: ../libpurple/protocols/silc/ops.c:1369
+#: ../libpurple/protocols/silc10/ops.c:1371
 msgid "Cannot detach"
 msgstr "無法暫停連線"
 
-#: ../libpurple/protocols/silc/ops.c:1382
+#: ../libpurple/protocols/silc/ops.c:1389
+#: ../libpurple/protocols/silc10/ops.c:1382
 msgid "Cannot set topic"
 msgstr "無法設定主題"
 
-#: ../libpurple/protocols/silc/ops.c:1414
+#: ../libpurple/protocols/silc/ops.c:1418
+#: ../libpurple/protocols/silc10/ops.c:1414
 msgid "Failed to change nickname"
 msgstr "無法更改暱稱"
 
-#: ../libpurple/protocols/silc/ops.c:1462
+#: ../libpurple/protocols/silc/ops.c:1467
+#: ../libpurple/protocols/silc10/ops.c:1462
 msgid "Roomlist"
 msgstr "聊天室清單"
 
-#: ../libpurple/protocols/silc/ops.c:1462
+#: ../libpurple/protocols/silc/ops.c:1467
+#: ../libpurple/protocols/silc10/ops.c:1462
 msgid "Cannot get room list"
 msgstr "無法取得聊天室清單"
 
-#: ../libpurple/protocols/silc/ops.c:1507
+#  FIXME 看了原始碼也不知所云,所以大概會是譯錯 - acli 20070614
+#: ../libpurple/protocols/silc/ops.c:1468
+msgid "Network is empty"
+msgstr "這個網路是空白的"
+
+#: ../libpurple/protocols/silc/ops.c:1512
+#: ../libpurple/protocols/silc10/ops.c:1507
 msgid "No public key was received"
 msgstr "沒有收到公鑰"
 
-#: ../libpurple/protocols/silc/ops.c:1519
-#: ../libpurple/protocols/silc/ops.c:1532
+#: ../libpurple/protocols/silc/ops.c:1524
+#: ../libpurple/protocols/silc/ops.c:1537
+#: ../libpurple/protocols/silc10/ops.c:1519
+#: ../libpurple/protocols/silc10/ops.c:1532
 msgid "Server Information"
 msgstr "伺服器資訊"
 
-#: ../libpurple/protocols/silc/ops.c:1520
+#: ../libpurple/protocols/silc/ops.c:1525
+#: ../libpurple/protocols/silc10/ops.c:1520
 msgid "Cannot get server information"
 msgstr "無法取得伺服器資訊"
 
-#: ../libpurple/protocols/silc/ops.c:1549
-#: ../libpurple/protocols/silc/ops.c:1558
+#: ../libpurple/protocols/silc/ops.c:1548
+#: ../libpurple/protocols/silc10/ops.c:1549
+#: ../libpurple/protocols/silc10/ops.c:1558
 msgid "Server Statistics"
 msgstr "伺服器統計資料"
 
-#: ../libpurple/protocols/silc/ops.c:1550
+#: ../libpurple/protocols/silc/ops.c:1549
+#: ../libpurple/protocols/silc10/ops.c:1550
 msgid "Cannot get server statistics"
 msgstr "無法取得伺服器的統計資料"
 
-#: ../libpurple/protocols/silc/ops.c:1559
-msgid "No server statistics available"
-msgstr "伺服器沒有統計資料"
-
-#: ../libpurple/protocols/silc/ops.c:1581
+#: ../libpurple/protocols/silc/ops.c:1556
+#: ../libpurple/protocols/silc10/ops.c:1581
 #, c-format
 msgid ""
 "Local server start time: %s\n"
@@ -9692,117 +10073,79 @@
 "伺服器管理者總數:%d 人\n"
 "路由器管理者總數:%d 人\n"
 
-#: ../libpurple/protocols/silc/ops.c:1604
+#: ../libpurple/protocols/silc/ops.c:1588
+#: ../libpurple/protocols/silc10/ops.c:1604
 msgid "Network Statistics"
 msgstr "網路統計資料"
 
-#: ../libpurple/protocols/silc/ops.c:1612
-#: ../libpurple/protocols/silc/ops.c:1617
+#: ../libpurple/protocols/silc/ops.c:1596
+#: ../libpurple/protocols/silc/ops.c:1601
+#: ../libpurple/protocols/silc10/ops.c:1612
+#: ../libpurple/protocols/silc10/ops.c:1617
 msgid "Ping"
 msgstr "Ping"
 
-#: ../libpurple/protocols/silc/ops.c:1612
+#: ../libpurple/protocols/silc/ops.c:1596
+#: ../libpurple/protocols/silc10/ops.c:1612
 msgid "Ping failed"
 msgstr "Ping 失敗"
 
-#: ../libpurple/protocols/silc/ops.c:1617
+#: ../libpurple/protocols/silc/ops.c:1601
+#: ../libpurple/protocols/silc10/ops.c:1617
 msgid "Ping reply received from server"
 msgstr "由伺服器收到 Ping 回應"
 
-#: ../libpurple/protocols/silc/ops.c:1625
+#: ../libpurple/protocols/silc/ops.c:1609
+#: ../libpurple/protocols/silc10/ops.c:1625
 msgid "Could not kill user"
 msgstr "無法傱網路上移除使用者"
 
-#: ../libpurple/protocols/silc/ops.c:1709
-msgid "Error during connecting to SILC Server"
-msgstr "連線至 SILC 伺服器時發生錯誤"
-
-#: ../libpurple/protocols/silc/ops.c:1714
-msgid "Key Exchange failed"
-msgstr "密鑰交換失敗"
-
-#: ../libpurple/protocols/silc/ops.c:1723
-msgid ""
-"Resuming detached session failed. Press Reconnect to create new connection."
-msgstr "恢復連線失敗,請按「重新連線」建立新的連線。"
-
-#: ../libpurple/protocols/silc/ops.c:1758
-msgid "Disconnected by server"
-msgstr "伺服器中斷了連線"
-
-#: ../libpurple/protocols/silc/ops.c:1820
-#: ../libpurple/protocols/silc/ops.c:1867
-#: ../libpurple/protocols/silc/silc.c:182
+#  XXX acli 20070614
+#: ../libpurple/protocols/silc/ops.c:1648
+msgid "WATCH"
+msgstr "WATCH"
+
+#: ../libpurple/protocols/silc/ops.c:1648
+msgid "Cannot watch user"
+msgstr "無法追蹤使用者"
+
+#: ../libpurple/protocols/silc/ops.c:1724
+#: ../libpurple/protocols/silc/ops.c:1775
+#: ../libpurple/protocols/silc/silc.c:277
+#: ../libpurple/protocols/silc10/ops.c:1811
+#: ../libpurple/protocols/silc10/ops.c:1858
+#: ../libpurple/protocols/silc10/silc.c:190
 msgid "Resuming session"
 msgstr "恢復工作階段中"
 
-#: ../libpurple/protocols/silc/ops.c:1822
+#: ../libpurple/protocols/silc/ops.c:1726
+#: ../libpurple/protocols/silc10/ops.c:1813
 msgid "Authenticating connection"
 msgstr "為連線進行驗證中"
 
-#: ../libpurple/protocols/silc/ops.c:1869
+#: ../libpurple/protocols/silc/ops.c:1777
+#: ../libpurple/protocols/silc10/ops.c:1860
 msgid "Verifying server public key"
 msgstr "核實伺服器的公鑰中"
 
-#: ../libpurple/protocols/silc/ops.c:1911
+#: ../libpurple/protocols/silc/ops.c:1814
+#: ../libpurple/protocols/silc10/ops.c:1902
 msgid "Passphrase required"
 msgstr "必須輸入密碼"
 
-#: ../libpurple/protocols/silc/ops.c:1940
-msgid "Failure: Version mismatch, upgrade your client"
-msgstr "失敗:版本不符,請更新您的用戶端程式"
-
-#: ../libpurple/protocols/silc/ops.c:1943
-msgid "Failure: Remote does not trust/support your public key"
-msgstr "失敗:遠端不信任/不支援您的公鑰"
-
-#: ../libpurple/protocols/silc/ops.c:1946
-msgid "Failure: Remote does not support proposed KE group"
-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:1952
-msgid "Failure: Remote does not support proposed PKCS"
-msgstr "失敗:遠端不支援建議中的公開鑰匙證書標準 (PKCS)"
-
-#: ../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:1958
-msgid "Failure: Remote does not support proposed HMAC"
-msgstr "失敗:遠端不支援建議中的身份驗證代碼 (HMAC)"
-
-#: ../libpurple/protocols/silc/ops.c:1960
-msgid "Failure: Incorrect signature"
-msgstr "失敗:錯誤的簽章"
-
-#: ../libpurple/protocols/silc/ops.c:1962
-msgid "Failure: Invalid cookie"
-msgstr "失敗:無效的 Cookie"
-
-#: ../libpurple/protocols/silc/ops.c:1973
-msgid "Failure: Authentication failed"
-msgstr "失敗:認證失敗"
-
-#: ../libpurple/protocols/silc/pk.c:104
+#: ../libpurple/protocols/silc/pk.c:98 ../libpurple/protocols/silc10/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:109
+#: ../libpurple/protocols/silc/pk.c:103 ../libpurple/protocols/silc10/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:113
+#: ../libpurple/protocols/silc/pk.c:107 ../libpurple/protocols/silc10/pk.c:113
 #, c-format
 msgid ""
 "Fingerprint and babbleprint for the %s key are:\n"
@@ -9815,74 +10158,98 @@
 "%s\n"
 "%s\n"
 
-#: ../libpurple/protocols/silc/pk.c:116 ../libpurple/protocols/silc/pk.c:142
+#: ../libpurple/protocols/silc/pk.c:110 ../libpurple/protocols/silc/pk.c:139
+#: ../libpurple/protocols/silc10/pk.c:116
+#: ../libpurple/protocols/silc10/pk.c:142
 msgid "Verify Public Key"
 msgstr "核實公鑰"
 
-#: ../libpurple/protocols/silc/pk.c:121
+#: ../libpurple/protocols/silc/pk.c:115 ../libpurple/protocols/silc10/pk.c:121
 msgid "_View..."
 msgstr "檢視(_V)..."
 
-#: ../libpurple/protocols/silc/pk.c:143
+#: ../libpurple/protocols/silc/pk.c:140 ../libpurple/protocols/silc10/pk.c:143
 msgid "Unsupported public key type"
 msgstr "不支援的公鑰類型"
 
-#: ../libpurple/protocols/silc/silc.c:153
+#: ../libpurple/protocols/silc/silc.c:217
+#: ../libpurple/protocols/silc10/ops.c:1749
+msgid "Disconnected by server"
+msgstr "伺服器中斷了連線"
+
+#: ../libpurple/protocols/silc/silc.c:224
+#: ../libpurple/protocols/silc10/ops.c:1700
+msgid "Error during connecting to SILC Server"
+msgstr "連線至 SILC 伺服器時發生錯誤"
+
+#: ../libpurple/protocols/silc/silc.c:229
+#: ../libpurple/protocols/silc10/ops.c:1705
+msgid "Key Exchange failed"
+msgstr "密鑰交換失敗"
+
+#: ../libpurple/protocols/silc/silc.c:238
+#: ../libpurple/protocols/silc10/ops.c:1714
+msgid ""
+"Resuming detached session failed. Press Reconnect to create new connection."
+msgstr "恢復連線失敗,請按「重新連線」建立新的連線。"
+
+#: ../libpurple/protocols/silc/silc.c:265
+#: ../libpurple/protocols/silc/silc.c:311
+#: ../libpurple/protocols/silc10/silc.c:161
 msgid "Connection failed"
 msgstr "連線失敗"
 
-#: ../libpurple/protocols/silc/silc.c:174
-msgid "Cannot initialize SILC Client connection"
-msgstr "無法初始化 SILC 的用戶端連線"
-
-#: ../libpurple/protocols/silc/silc.c:185
+#: ../libpurple/protocols/silc/silc.c:280
+#: ../libpurple/protocols/silc10/silc.c:193
 msgid "Performing key exchange"
 msgstr "交換密鑰中"
 
-#: ../libpurple/protocols/silc/silc.c:271
+#. Progress
+#: ../libpurple/protocols/silc/silc.c:343
+#: ../libpurple/protocols/silc10/silc.c:325
+msgid "Connecting to SILC Server"
+msgstr "連線至 SILC 伺服器中"
+
+#: ../libpurple/protocols/silc/silc.c:352
+msgid "Could not load SILC key pair"
+msgstr "無法讀取 SILC 密鑰對"
+
+#: ../libpurple/protocols/silc/silc.c:366
+#: ../libpurple/protocols/silc10/silc.c:355
+msgid "Unable to create connection"
+msgstr "無法建立連結"
+
+#: ../libpurple/protocols/silc/silc.c:395
+#: ../libpurple/protocols/silc10/silc.c:267
 msgid "Out of memory"
 msgstr "記憶體不夠"
 
-# NOTE 香港會寫「陳大文」,台灣人會看不明(寫「老張」一類,港人看見會覺得很怪),頭痛 :P
-#: ../libpurple/protocols/silc/silc.c:294
-msgid "John Noname"
-msgstr "無名氏"
-
-#: ../libpurple/protocols/silc/silc.c:317
+#: ../libpurple/protocols/silc/silc.c:438
+#: ../libpurple/protocols/silc10/silc.c:313
 msgid "Cannot initialize SILC protocol"
 msgstr "無法初始化 SILC 協定"
 
-#: ../libpurple/protocols/silc/silc.c:324
-msgid "Cannot find/access ~/.silc directory"
-msgstr "無法找到或存取 ~/.silc 目錄"
-
-#. Progress
-#: ../libpurple/protocols/silc/silc.c:329
-msgid "Connecting to SILC Server"
-msgstr "連線至 SILC 伺服器中"
-
-#: ../libpurple/protocols/silc/silc.c:338
-#, c-format
-msgid "Could not load SILC key pair: %s"
-msgstr "無法讀取 SILC 密鑰對:%s"
-
-#: ../libpurple/protocols/silc/silc.c:359
-msgid "Unable to create connection"
-msgstr "無法建立連結"
-
-#: ../libpurple/protocols/silc/silc.c:658
+#: ../libpurple/protocols/silc/silc.c:445
+msgid "Error loading SILC key pair"
+msgstr "讀取 SILC 密鑰對途中出現錯誤"
+
+#: ../libpurple/protocols/silc/silc.c:739
+#: ../libpurple/protocols/silc10/silc.c:650
 msgid "Your Current Mood"
 msgstr "您目前的心情"
 
-#: ../libpurple/protocols/silc/silc.c:660 ../pidgin/gtkprefs.c:1529
+#: ../libpurple/protocols/silc/silc.c:741
+#: ../libpurple/protocols/silc10/silc.c:652 ../pidgin/gtkprefs.c:1566
 msgid "Normal"
 msgstr "正常"
 
-#: ../libpurple/protocols/silc/silc.c:674
+#: ../libpurple/protocols/silc/silc.c:755
+#: ../libpurple/protocols/silc10/silc.c:666
 msgid "In love"
 msgstr "戀愛中"
 
-#: ../libpurple/protocols/silc/silc.c:685
+#: ../libpurple/protocols/silc/silc.c:766
+#: ../libpurple/protocols/silc10/silc.c:677
 msgid ""
 "\n"
 "Your Preferred Contact Methods"
@@ -9890,49 +10257,67 @@
 "\n"
 "聯絡方法"
 
-#: ../libpurple/protocols/silc/silc.c:693
-#: ../libpurple/protocols/silc/util.c:557
+#: ../libpurple/protocols/silc/silc.c:774
+#: ../libpurple/protocols/silc/util.c:561
+#: ../libpurple/protocols/silc10/silc.c:685
+#: ../libpurple/protocols/silc10/util.c:557
 msgid "SMS"
 msgstr "SMS"
 
-#: ../libpurple/protocols/silc/silc.c:695
-#: ../libpurple/protocols/silc/util.c:559
+#: ../libpurple/protocols/silc/silc.c:776
+#: ../libpurple/protocols/silc/util.c:563
+#: ../libpurple/protocols/silc10/silc.c:687
+#: ../libpurple/protocols/silc10/util.c:559
 msgid "MMS"
 msgstr "MMS"
 
-#: ../libpurple/protocols/silc/silc.c:697
+#: ../libpurple/protocols/silc/silc.c:778
+#: ../libpurple/protocols/silc10/silc.c:689
 msgid "Video conferencing"
 msgstr "視訊會議中"
 
-#: ../libpurple/protocols/silc/silc.c:702
+#: ../libpurple/protocols/silc/silc.c:783
+#: ../libpurple/protocols/silc10/silc.c:694
 msgid "Your Current Status"
 msgstr "目前狀態"
 
 #  XXX 暫譯
-#: ../libpurple/protocols/silc/silc.c:709
+#: ../libpurple/protocols/silc/silc.c:790
+#: ../libpurple/protocols/silc10/silc.c:701
 msgid "Online Services"
 msgstr "所用之線上服務"
 
-#: ../libpurple/protocols/silc/silc.c:712
+#: ../libpurple/protocols/silc/silc.c:793
+#: ../libpurple/protocols/silc10/silc.c:704
 msgid "Let others see what services you are using"
 msgstr "讓他人可以得知您使用那些線上服務"
 
 #  NOTE XXX 原始碼顯示這個其實不是電腦類型,而是操作系統版本 :-/
-#: ../libpurple/protocols/silc/silc.c:718
+#: ../libpurple/protocols/silc/silc.c:799
+#: ../libpurple/protocols/silc10/silc.c:710
 msgid "Let others see what computer you are using"
 msgstr "容許別人查看您用的是什麼電腦"
 
-#: ../libpurple/protocols/silc/silc.c:725
+#: ../libpurple/protocols/silc/silc.c:806
+#: ../libpurple/protocols/silc10/silc.c:717
 msgid "Your VCard File"
 msgstr "您的 VCard 檔案"
 
+#  XXX 看了原始碼也不知所云,暫時只有直譯了事
+#: ../libpurple/protocols/silc/silc.c:812
+msgid "Timezone (UTC)"
+msgstr "時區 (UTC)"
+
 #  XXX 好像很怪
-#: ../libpurple/protocols/silc/silc.c:737
-#: ../libpurple/protocols/silc/silc.c:738
+#: ../libpurple/protocols/silc/silc.c:816
+#: ../libpurple/protocols/silc/silc.c:817
+#: ../libpurple/protocols/silc10/silc.c:729
+#: ../libpurple/protocols/silc10/silc.c:730
 msgid "User Online Status Attributes"
 msgstr "使用者上線狀態屬性"
 
-#: ../libpurple/protocols/silc/silc.c:739
+#: ../libpurple/protocols/silc/silc.c:818
+#: ../libpurple/protocols/silc10/silc.c:731
 msgid ""
 "You can let other users see your online status information and your personal "
 "information. Please fill the information you would like other users to see "
@@ -9941,174 +10326,219 @@
 "您可以給其他使用者看見您的上線狀態及個人資訊。有關您的資訊,只須輸入您希望別"
 "人看得見的各項。"
 
-#: ../libpurple/protocols/silc/silc.c:780
-#: ../libpurple/protocols/silc/silc.c:786
-#: ../libpurple/protocols/silc/silc.c:1426
+#: ../libpurple/protocols/silc/silc.c:859
+#: ../libpurple/protocols/silc/silc.c:865
+#: ../libpurple/protocols/silc/silc.c:1486
+#: ../libpurple/protocols/silc10/silc.c:772
+#: ../libpurple/protocols/silc10/silc.c:778
+#: ../libpurple/protocols/silc10/silc.c:1415
 msgid "Message of the Day"
 msgstr "是日訊息"
 
-#: ../libpurple/protocols/silc/silc.c:780
+#: ../libpurple/protocols/silc/silc.c:859
+#: ../libpurple/protocols/silc10/silc.c:772
 msgid "No Message of the Day available"
 msgstr "沒有是日訊息"
 
-#: ../libpurple/protocols/silc/silc.c:781
-#: ../libpurple/protocols/silc/silc.c:1421
+#: ../libpurple/protocols/silc/silc.c:860
+#: ../libpurple/protocols/silc/silc.c:1481
+#: ../libpurple/protocols/silc10/silc.c:773
+#: ../libpurple/protocols/silc10/silc.c:1410
 msgid "There is no Message of the Day associated with this connection"
 msgstr "這個連結沒有相關的是日訊息"
 
-#: ../libpurple/protocols/silc/silc.c:832
-#: ../libpurple/protocols/silc/silc.c:876
-#: ../libpurple/protocols/silc/silc.c:947
-#: ../libpurple/protocols/silc/silc.c:948
+#: ../libpurple/protocols/silc/silc.c:911
+#: ../libpurple/protocols/silc/silc.c:957
+#: ../libpurple/protocols/silc/silc.c:1028
+#: ../libpurple/protocols/silc/silc.c:1029
+#: ../libpurple/protocols/silc10/silc.c:824
+#: ../libpurple/protocols/silc10/silc.c:868
+#: ../libpurple/protocols/silc10/silc.c:939
+#: ../libpurple/protocols/silc10/silc.c:940
 msgid "Create New SILC Key Pair"
 msgstr "產生新的 SILC 密錀對"
 
-#: ../libpurple/protocols/silc/silc.c:832
+#: ../libpurple/protocols/silc/silc.c:911
+#: ../libpurple/protocols/silc10/silc.c:824
 msgid "Passphrases do not match"
 msgstr "密碼不符"
 
-#: ../libpurple/protocols/silc/silc.c:876
+#: ../libpurple/protocols/silc/silc.c:957
+#: ../libpurple/protocols/silc10/silc.c:868
 msgid "Key Pair Generation failed"
 msgstr "密鑰對產生失敗"
 
-#: ../libpurple/protocols/silc/silc.c:915
+#: ../libpurple/protocols/silc/silc.c:996
+#: ../libpurple/protocols/silc10/silc.c:907
 msgid "Key length"
 msgstr "密鑰長度"
 
-#: ../libpurple/protocols/silc/silc.c:917
+#: ../libpurple/protocols/silc/silc.c:998
+#: ../libpurple/protocols/silc10/silc.c:909
 msgid "Public key file"
 msgstr "公鑰檔案"
 
-#: ../libpurple/protocols/silc/silc.c:919
+#: ../libpurple/protocols/silc/silc.c:1000
+#: ../libpurple/protocols/silc10/silc.c:911
 msgid "Private key file"
 msgstr "私鑰檔案"
 
-#: ../libpurple/protocols/silc/silc.c:942
+#: ../libpurple/protocols/silc/silc.c:1023
+#: ../libpurple/protocols/silc10/silc.c:934
 msgid "Passphrase (retype)"
 msgstr "密碼(再次輸入)"
 
-#: ../libpurple/protocols/silc/silc.c:949
+#: ../libpurple/protocols/silc/silc.c:1030
+#: ../libpurple/protocols/silc10/silc.c:941
 msgid "Generate Key Pair"
 msgstr "產生密鑰對"
 
-#: ../libpurple/protocols/silc/silc.c:994
+#: ../libpurple/protocols/silc/silc.c:1073
+#: ../libpurple/protocols/silc10/silc.c:984
 msgid "Online Status"
 msgstr "上線狀態"
 
-#: ../libpurple/protocols/silc/silc.c:1003
+#: ../libpurple/protocols/silc/silc.c:1081
+#: ../libpurple/protocols/silc10/silc.c:992
 msgid "View Message of the Day"
 msgstr "顯示是日訊息 (MOTD)"
 
-#: ../libpurple/protocols/silc/silc.c:1007
+#: ../libpurple/protocols/silc/silc.c:1085
+#: ../libpurple/protocols/silc10/silc.c:996
 msgid "Create SILC Key Pair..."
 msgstr "產生 SILC 密鑰對..."
 
-#: ../libpurple/protocols/silc/silc.c:1106
+#: ../libpurple/protocols/silc/silc.c:1177
+#: ../libpurple/protocols/silc10/silc.c:1095
 #, c-format
 msgid "User <I>%s</I> is not present in the network"
 msgstr "使用者 <I>%s</I> 不在網路上"
 
-#: ../libpurple/protocols/silc/silc.c:1297
+#: ../libpurple/protocols/silc/silc.c:1357
+#: ../libpurple/protocols/silc10/silc.c:1286
 msgid "Topic too long"
 msgstr "聊天主題過長"
 
-#: ../libpurple/protocols/silc/silc.c:1378
+#: ../libpurple/protocols/silc/silc.c:1438
+#: ../libpurple/protocols/silc10/silc.c:1367
 msgid "You must specify a nick"
 msgstr "必須指定暱稱"
 
-#: ../libpurple/protocols/silc/silc.c:1480
+#: ../libpurple/protocols/silc/silc.c:1540
+#: ../libpurple/protocols/silc10/silc.c:1469
 #, c-format
 msgid "channel %s not found"
 msgstr "找不到會議 %s"
 
-#: ../libpurple/protocols/silc/silc.c:1485
+#: ../libpurple/protocols/silc/silc.c:1545
+#: ../libpurple/protocols/silc10/silc.c:1474
 #, c-format
 msgid "channel modes for %s: %s"
 msgstr "%s 的頻道模式為:%s"
 
-#: ../libpurple/protocols/silc/silc.c:1487
+#: ../libpurple/protocols/silc/silc.c:1547
+#: ../libpurple/protocols/silc10/silc.c:1476
 #, c-format
 msgid "no channel modes are set on %s"
 msgstr "%s 沒有設定頻道模式"
 
-#: ../libpurple/protocols/silc/silc.c:1500
+#: ../libpurple/protocols/silc/silc.c:1560
+#: ../libpurple/protocols/silc10/silc.c:1489
 #, c-format
 msgid "Failed to set cmodes for %s"
 msgstr "無法為 %s 設定頻道模式"
 
-#: ../libpurple/protocols/silc/silc.c:1530
+#: ../libpurple/protocols/silc/silc.c:1590
+#: ../libpurple/protocols/silc10/silc.c:1519
 #, c-format
 msgid "Unknown command: %s, (may be a client bug)"
 msgstr "未知的指令:%s(可能是客戶端的錯誤)"
 
-#: ../libpurple/protocols/silc/silc.c:1593
+#: ../libpurple/protocols/silc/silc.c:1653
+#: ../libpurple/protocols/silc10/silc.c:1582
 msgid "part [channel]:  Leave the chat"
 msgstr "part [頻道]:離開聊天室"
 
-#: ../libpurple/protocols/silc/silc.c:1597
+#: ../libpurple/protocols/silc/silc.c:1657
+#: ../libpurple/protocols/silc10/silc.c:1586
 msgid "leave [channel]:  Leave the chat"
 msgstr "leave [頻道]:離開聊天室"
 
-#: ../libpurple/protocols/silc/silc.c:1601
+#: ../libpurple/protocols/silc/silc.c:1661
+#: ../libpurple/protocols/silc10/silc.c:1590
 msgid "topic [&lt;new topic&gt;]:  View or change the topic"
 msgstr "topic [&lt;新主題&gt;]:檢視或修改聊天主題"
 
-#: ../libpurple/protocols/silc/silc.c:1606
+#: ../libpurple/protocols/silc/silc.c:1666
+#: ../libpurple/protocols/silc10/silc.c:1595
 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:1610
+#: ../libpurple/protocols/silc/silc.c:1670
+#: ../libpurple/protocols/silc10/silc.c:1599
 msgid "list:  List channels on this network"
 msgstr "list:列出目前在網絡上的聊天室清單"
 
-#: ../libpurple/protocols/silc/silc.c:1614
+#: ../libpurple/protocols/silc/silc.c:1674
+#: ../libpurple/protocols/silc10/silc.c:1603
 msgid "whois &lt;nick&gt;:  View nick's information"
 msgstr "whois &lt;暱稱&gt;:查看這個暱稱的相關資訊"
 
-#: ../libpurple/protocols/silc/silc.c:1618
+#: ../libpurple/protocols/silc/silc.c:1678
+#: ../libpurple/protocols/silc10/silc.c:1607
 #: ../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:1622
+#: ../libpurple/protocols/silc/silc.c:1682
+#: ../libpurple/protocols/silc10/silc.c:1611
 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:1626
+#: ../libpurple/protocols/silc/silc.c:1686
+#: ../libpurple/protocols/silc10/silc.c:1615
 msgid "motd:  View the server's Message Of The Day"
 msgstr "motd:顯示伺服器的是日訊息 (MOTD)"
 
-#: ../libpurple/protocols/silc/silc.c:1630
+#: ../libpurple/protocols/silc/silc.c:1690
+#: ../libpurple/protocols/silc10/silc.c:1619
 msgid "detach:  Detach this session"
 msgstr "detach:暫停連線這個工作階段"
 
-#: ../libpurple/protocols/silc/silc.c:1634
+#: ../libpurple/protocols/silc/silc.c:1694
+#: ../libpurple/protocols/silc10/silc.c:1623
 msgid "quit [message]:  Disconnect from the server, with an optional message"
 msgstr "quit [訊息]:自伺服器離線,並可選擇送出指定的訊息"
 
-#: ../libpurple/protocols/silc/silc.c:1638
+#: ../libpurple/protocols/silc/silc.c:1698
+#: ../libpurple/protocols/silc10/silc.c:1627
 msgid "call &lt;command&gt;:  Call any silc client command"
 msgstr "call &lt;指令&gt;:執行 SILC 指定的用戶端指令"
 
-#: ../libpurple/protocols/silc/silc.c:1644
+#: ../libpurple/protocols/silc/silc.c:1704
+#: ../libpurple/protocols/silc10/silc.c:1633
 msgid "kill &lt;nick&gt; [-pubkey|&lt;reason&gt;]:  Kill nick"
 msgstr "kill &lt;暱稱&gt; [-pubkey|&lt;理由&gt;]:從網路上移除暱稱"
 
-#: ../libpurple/protocols/silc/silc.c:1648
+#: ../libpurple/protocols/silc/silc.c:1708
+#: ../libpurple/protocols/silc10/silc.c:1637
 msgid "nick &lt;newnick&gt;:  Change your nickname"
 msgstr "nick &lt;新暱稱&gt;:改變您的暱稱"
 
-#: ../libpurple/protocols/silc/silc.c:1652
+#: ../libpurple/protocols/silc/silc.c:1712
+#: ../libpurple/protocols/silc10/silc.c:1641
 msgid "whowas &lt;nick&gt;:  View nick's information"
 msgstr "whois &lt;暱稱&gt;:查看暱稱的相關資訊"
 
-#: ../libpurple/protocols/silc/silc.c:1656
+#: ../libpurple/protocols/silc/silc.c:1716
+#: ../libpurple/protocols/silc10/silc.c:1645
 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:1660
+#: ../libpurple/protocols/silc/silc.c:1720
+#: ../libpurple/protocols/silc10/silc.c:1649
 msgid ""
 "cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes "
 "on channel"
@@ -10116,15 +10546,18 @@
 "cumode &lt;頻道&gt; +|-&lt;模式&gt; &lt;暱稱&gt;:在指定頻道修改指定的暱稱的"
 "模式"
 
-#: ../libpurple/protocols/silc/silc.c:1664
+#: ../libpurple/protocols/silc/silc.c:1724
+#: ../libpurple/protocols/silc10/silc.c:1653
 msgid "umode &lt;usermodes&gt;:  Set your modes in the network"
 msgstr "umode &lt;使用者模式&gt;:設定您在網路上的模式"
 
-#: ../libpurple/protocols/silc/silc.c:1668
+#: ../libpurple/protocols/silc/silc.c:1728
+#: ../libpurple/protocols/silc10/silc.c:1657
 msgid "oper &lt;nick&gt; [-pubkey]:  Get server operator privileges"
 msgstr "oper &lt;暱稱&gt; [-pubkey]:取得伺服器管理者的權限"
 
-#: ../libpurple/protocols/silc/silc.c:1672
+#: ../libpurple/protocols/silc/silc.c:1732
+#: ../libpurple/protocols/silc10/silc.c:1661
 msgid ""
 "invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
 "channel invite list"
@@ -10132,37 +10565,45 @@
 "invite &lt;頻道&gt; [-|+]&lt;暱稱&gt;:邀請指定的暱稱、新增指定的暱稱到頻道的"
 "被邀者列表、或把指定的暱稱從頻道的被邀者列表中移除"
 
-#: ../libpurple/protocols/silc/silc.c:1676
+#: ../libpurple/protocols/silc/silc.c:1736
+#: ../libpurple/protocols/silc10/silc.c:1665
 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:1680
+#: ../libpurple/protocols/silc/silc.c:1740
+#: ../libpurple/protocols/silc10/silc.c:1669
 msgid "info [server]:  View server administrative details"
 msgstr "info [伺服器]:觀看伺服器的管理細節"
 
 #  XXX 暫譯
-#: ../libpurple/protocols/silc/silc.c:1684
+#: ../libpurple/protocols/silc/silc.c:1744
+#: ../libpurple/protocols/silc10/silc.c:1673
 msgid "ban [&lt;channel&gt; +|-&lt;nick&gt;]:  Ban client from channel"
 msgstr "ban [&lt;頻道&gt; +|-&lt;暱稱&gt;]:於指定的頻道禁止指定的用戶端"
 
-#: ../libpurple/protocols/silc/silc.c:1688
+#: ../libpurple/protocols/silc/silc.c:1748
+#: ../libpurple/protocols/silc10/silc.c:1677
 msgid "getkey &lt;nick|server&gt;:  Retrieve client's or server's public key"
 msgstr "getkey &lt;暱稱|伺服器&gt;:取得用戶端或伺服器的公鑰"
 
-#: ../libpurple/protocols/silc/silc.c:1692
+#: ../libpurple/protocols/silc/silc.c:1752
+#: ../libpurple/protocols/silc10/silc.c:1681
 msgid "stats:  View server and network statistics"
 msgstr "stats:觀看伺服器及網路的統計資料"
 
-#: ../libpurple/protocols/silc/silc.c:1696
+#: ../libpurple/protocols/silc/silc.c:1756
+#: ../libpurple/protocols/silc10/silc.c:1685
 msgid "ping:  Send PING to the connected server"
 msgstr "ping:向連結的伺服器送出 PING"
 
-#: ../libpurple/protocols/silc/silc.c:1701
+#: ../libpurple/protocols/silc/silc.c:1761
+#: ../libpurple/protocols/silc10/silc.c:1690
 msgid "users &lt;channel&gt;:  List users in channel"
 msgstr "users &lt;頻道&gt;:列出頻道中的使用者"
 
-#: ../libpurple/protocols/silc/silc.c:1705
+#: ../libpurple/protocols/silc/silc.c:1765
+#: ../libpurple/protocols/silc10/silc.c:1694
 msgid ""
 "names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List "
 "specific users in channel(s)"
@@ -10179,121 +10620,147 @@
 #. *< name
 #. *< version
 #. *  summary
-#: ../libpurple/protocols/silc/silc.c:1828
+#: ../libpurple/protocols/silc/silc.c:1875
+#: ../libpurple/protocols/silc10/silc.c:1817
 msgid "SILC Protocol Plugin"
 msgstr "SILC 協定模組"
 
 #. *  description
-#: ../libpurple/protocols/silc/silc.c:1830
+#: ../libpurple/protocols/silc/silc.c:1877
+#: ../libpurple/protocols/silc10/silc.c:1819
 msgid "Secure Internet Live Conferencing (SILC) Protocol"
 msgstr "安全性網際網路即時會議 (SILC) 協定"
 
-#: ../libpurple/protocols/silc/silc.c:1862 ../pidgin/gtkprefs.c:1920
+#: ../libpurple/protocols/silc/silc.c:1909
+#: ../libpurple/protocols/silc10/silc.c:1851 ../pidgin/gtkprefs.c:1959
 msgid "Network"
 msgstr "網路"
 
-#: ../libpurple/protocols/silc/silc.c:1873
+#: ../libpurple/protocols/silc/silc.c:1920
+#: ../libpurple/protocols/silc10/silc.c:1862
 msgid "Public Key file"
 msgstr "公鑰檔案"
 
-#: ../libpurple/protocols/silc/silc.c:1877
+#: ../libpurple/protocols/silc/silc.c:1924
+#: ../libpurple/protocols/silc10/silc.c:1866
 msgid "Private Key file"
 msgstr "私鑰檔案"
 
 # XXX 暫譯 - 20061025
-#: ../libpurple/protocols/silc/silc.c:1887
+#: ../libpurple/protocols/silc/silc.c:1934
+#: ../libpurple/protocols/silc10/silc.c:1876
 msgid "Cipher"
 msgstr "加密方法"
 
-#: ../libpurple/protocols/silc/silc.c:1897
+#: ../libpurple/protocols/silc/silc.c:1944
+#: ../libpurple/protocols/silc10/silc.c:1886
 msgid "HMAC"
 msgstr "HMAC"
 
+#  XXX 譯文源自 http://www.cert.org.tw/document/column/show.php?key=28
+#  XXX 但其實譯文並不統一 - acli 20070614
+#: ../libpurple/protocols/silc/silc.c:1947
+msgid "Use Perfect Forward Secrecy"
+msgstr "使用完全向前保密 (PFS)"
+
 #  XXX
-#: ../libpurple/protocols/silc/silc.c:1900
+#: ../libpurple/protocols/silc/silc.c:1951
+#: ../libpurple/protocols/silc10/silc.c:1889
 msgid "Public key authentication"
 msgstr "使用公鑰認證"
 
-#  TODO 譯文有待改進,這是意譯
-#: ../libpurple/protocols/silc/silc.c:1903
-msgid "Reject watching by other users"
-msgstr "拒絕伺服器端的好友狀態捕捉"
-
-#: ../libpurple/protocols/silc/silc.c:1906
-msgid "Block invites"
-msgstr "拒絕邀請"
-
 #  XXX 好像聽來很怪
-#: ../libpurple/protocols/silc/silc.c:1909
+#: ../libpurple/protocols/silc/silc.c:1954
+#: ../libpurple/protocols/silc10/silc.c:1892
 msgid "Block IMs without Key Exchange"
 msgstr "拒絕沒有交換密鑰的即時訊息"
 
-#: ../libpurple/protocols/silc/silc.c:1912
-msgid "Reject online status attribute requests"
-msgstr "拒絕上線狀態屬性要求"
-
-#: ../libpurple/protocols/silc/silc.c:1915
+#: ../libpurple/protocols/silc/silc.c:1957
+#: ../libpurple/protocols/silc10/silc.c:1895
 msgid "Block messages to whiteboard"
 msgstr "禁止傳送訊息至白板"
 
 # XXX 暫譯
-#: ../libpurple/protocols/silc/silc.c:1918
+#: ../libpurple/protocols/silc/silc.c:1960
+#: ../libpurple/protocols/silc10/silc.c:1898
 msgid "Automatically open whiteboard"
 msgstr "自動打開白板"
 
-#: ../libpurple/protocols/silc/silc.c:1921
+#: ../libpurple/protocols/silc/silc.c:1963
+#: ../libpurple/protocols/silc10/silc.c:1901
 msgid "Digitally sign and verify all messages"
 msgstr "數位簽署所有即時訊息"
 
 #: ../libpurple/protocols/silc/util.c:207
-#: ../libpurple/protocols/silc/util.c:247
+#: ../libpurple/protocols/silc/util.c:249
+#: ../libpurple/protocols/silc10/util.c:207
+#: ../libpurple/protocols/silc10/util.c:247
 msgid "Creating SILC key pair..."
-msgstr "建立 SILC key pair 中..."
+msgstr "產生 SILC 密鑰對中..."
+
+#: ../libpurple/protocols/silc/util.c:215
+#: ../libpurple/protocols/silc/util.c:257
+msgid "Cannot create SILC key pair\n"
+msgstr "無法產生 SILC 密鑰對\n"
 
 #. Hint for translators: Please check the tabulator width here and in
 #. the next strings (short strings: 2 tabs, longer strings 1 tab,
 #. sum: 3 tabs or 24 characters)
-#: ../libpurple/protocols/silc/util.c:355
+#: ../libpurple/protocols/silc/util.c:358
+#: ../libpurple/protocols/silc10/util.c:355
 #, c-format
 msgid "Real Name: \t%s\n"
 msgstr "姓名:   \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:357
+#: ../libpurple/protocols/silc/util.c:360
+#: ../libpurple/protocols/silc10/util.c:357
 #, c-format
 msgid "User Name: \t%s\n"
 msgstr "使用者名稱:\t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:359
+#: ../libpurple/protocols/silc/util.c:362
+#: ../libpurple/protocols/silc10/util.c:359
 #, c-format
 msgid "E-Mail: \t\t%s\n"
 msgstr "電子郵件:\t\t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:361
+#: ../libpurple/protocols/silc/util.c:364
+#: ../libpurple/protocols/silc10/util.c:361
 #, c-format
 msgid "Host Name: \t%s\n"
 msgstr "主機名稱: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:363
+#: ../libpurple/protocols/silc/util.c:366
+#: ../libpurple/protocols/silc10/util.c:363
 #, c-format
 msgid "Organization: \t%s\n"
 msgstr "所屬機構: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:365
+#: ../libpurple/protocols/silc/util.c:368
+#: ../libpurple/protocols/silc10/util.c:365
 #, c-format
 msgid "Country: \t%s\n"
 msgstr "國家:   \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:366
+#: ../libpurple/protocols/silc/util.c:369
+#: ../libpurple/protocols/silc10/util.c:366
 #, c-format
 msgid "Algorithm: \t%s\n"
 msgstr "演算法:  \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:367
+#: ../libpurple/protocols/silc/util.c:370
+#: ../libpurple/protocols/silc10/util.c:367
 #, c-format
 msgid "Key Length: \t%d bits\n"
 msgstr "密鑰長度: \t%d 個位元\n"
 
-#: ../libpurple/protocols/silc/util.c:369
+#: ../libpurple/protocols/silc/util.c:372
+#, c-format
+msgid "Version: \t%s\n"
+msgstr "版本:   \t%s\n"
+
+#: ../libpurple/protocols/silc/util.c:374
+#: ../libpurple/protocols/silc10/util.c:369
 #, c-format
 msgid ""
 "Public Key Fingerprint:\n"
@@ -10304,7 +10771,8 @@
 "%s\n"
 "\n"
 
-#: ../libpurple/protocols/silc/util.c:370
+#: ../libpurple/protocols/silc/util.c:375
+#: ../libpurple/protocols/silc10/util.c:370
 #, c-format
 msgid ""
 "Public Key Babbleprint:\n"
@@ -10313,47 +10781,118 @@
 "公鑰指紋可讀版本 (Babbleprint):\n"
 "%s"
 
-#: ../libpurple/protocols/silc/util.c:374
-#: ../libpurple/protocols/silc/util.c:375
+#: ../libpurple/protocols/silc/util.c:379
+#: ../libpurple/protocols/silc/util.c:380
+#: ../libpurple/protocols/silc10/util.c:374
+#: ../libpurple/protocols/silc10/util.c:375
 msgid "Public Key Information"
 msgstr "公鑰資訊"
 
-#: ../libpurple/protocols/silc/util.c:555
+#: ../libpurple/protocols/silc/util.c:559
+#: ../libpurple/protocols/silc10/util.c:555
 msgid "Paging"
 msgstr "傳呼"
 
-#: ../libpurple/protocols/silc/util.c:561
+#: ../libpurple/protocols/silc/util.c:565
+#: ../libpurple/protocols/silc10/util.c:561
 msgid "Video Conferencing"
 msgstr "視像會議"
 
-#: ../libpurple/protocols/silc/util.c:579
+#: ../libpurple/protocols/silc/util.c:583
+#: ../libpurple/protocols/silc10/util.c:579
 msgid "Computer"
 msgstr "電腦"
 
-#: ../libpurple/protocols/silc/util.c:583
+#: ../libpurple/protocols/silc/util.c:587
+#: ../libpurple/protocols/silc10/util.c:583
 msgid "PDA"
 msgstr "電子手帳"
 
-#: ../libpurple/protocols/silc/util.c:585
+#: ../libpurple/protocols/silc/util.c:589
+#: ../libpurple/protocols/silc10/util.c:585
 msgid "Terminal"
 msgstr "終端機"
 
-#: ../libpurple/protocols/silc/wb.c:284
+#: ../libpurple/protocols/silc/wb.c:284 ../libpurple/protocols/silc10/wb.c:284
 #, c-format
 msgid "%s sent message to whiteboard. Would you like to open the whiteboard?"
 msgstr "%s 傳送訊息到白板。您要開啟白板嗎?"
 
-#: ../libpurple/protocols/silc/wb.c:288
+#: ../libpurple/protocols/silc/wb.c:288 ../libpurple/protocols/silc10/wb.c:288
 #, c-format
 msgid ""
 "%s sent message to whiteboard on %s channel. Would you like to open the "
 "whiteboard?"
 msgstr "%s 傳送訊息到 %s 頻道的白板。您要開啟白板嗎?"
 
-#: ../libpurple/protocols/silc/wb.c:302
+#: ../libpurple/protocols/silc/wb.c:302 ../libpurple/protocols/silc10/wb.c:302
 msgid "Whiteboard"
 msgstr "白板"
 
+#: ../libpurple/protocols/silc10/ops.c:1559
+msgid "No server statistics available"
+msgstr "伺服器沒有統計資料"
+
+#: ../libpurple/protocols/silc10/ops.c:1931
+msgid "Failure: Version mismatch, upgrade your client"
+msgstr "失敗:版本不符,請更新您的用戶端程式"
+
+#: ../libpurple/protocols/silc10/ops.c:1934
+msgid "Failure: Remote does not trust/support your public key"
+msgstr "失敗:遠端不信任/不支援您的公鑰"
+
+#: ../libpurple/protocols/silc10/ops.c:1937
+msgid "Failure: Remote does not support proposed KE group"
+msgstr "失敗:遠端不支援建議中的密鑰交換群組 (KE group)"
+
+#: ../libpurple/protocols/silc10/ops.c:1940
+msgid "Failure: Remote does not support proposed cipher"
+msgstr "失敗:遠端不支援建議中的加密方式 (cipher)"
+
+#  NOTE 譯文源自 http://www.nii.org.tw/cnt/info/Report/19980906.htm
+#: ../libpurple/protocols/silc10/ops.c:1943
+msgid "Failure: Remote does not support proposed PKCS"
+msgstr "失敗:遠端不支援建議中的公開鑰匙證書標準 (PKCS)"
+
+#: ../libpurple/protocols/silc10/ops.c:1946
+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/silc10/ops.c:1949
+msgid "Failure: Remote does not support proposed HMAC"
+msgstr "失敗:遠端不支援建議中的身份驗證代碼 (HMAC)"
+
+#: ../libpurple/protocols/silc10/ops.c:1951
+msgid "Failure: Incorrect signature"
+msgstr "失敗:錯誤的簽章"
+
+#: ../libpurple/protocols/silc10/ops.c:1953
+msgid "Failure: Invalid cookie"
+msgstr "失敗:無效的 Cookie"
+
+#: ../libpurple/protocols/silc10/ops.c:1964
+msgid "Failure: Authentication failed"
+msgstr "失敗:認證失敗"
+
+#: ../libpurple/protocols/silc10/silc.c:182
+msgid "Cannot initialize SILC Client connection"
+msgstr "無法初始化 SILC 的用戶端連線"
+
+# NOTE 香港會寫「陳大文」,台灣人會看不明(寫「老張」一類,港人看見會覺得很怪),頭痛 :P
+#: ../libpurple/protocols/silc10/silc.c:290
+msgid "John Noname"
+msgstr "無名氏"
+
+#: ../libpurple/protocols/silc10/silc.c:320
+msgid "Cannot find/access ~/.silc directory"
+msgstr "無法找到或存取 ~/.silc 目錄"
+
+#: ../libpurple/protocols/silc10/silc.c:334
+#, c-format
+msgid "Could not load SILC key pair: %s"
+msgstr "無法讀取 SILC 密鑰對:%s"
+
 #. TODO: do we really want to disconnect on a failure to write?
 #: ../libpurple/protocols/simple/simple.c:416
 msgid "Could not write"
@@ -10584,7 +11123,8 @@
 msgid "Password Change Successful"
 msgstr "密碼修改成功"
 
-#: ../libpurple/protocols/toc/toc.c:1366
+#: ../libpurple/protocols/toc/toc.c:1366 ../pidgin/gtkblist.c:5493
+#: ../pidgin/gtkblist.c:5847
 msgid "_Group:"
 msgstr "群組(_G):"
 
@@ -10645,32 +11185,32 @@
 msgstr "TOC 協定模組"
 
 # NOTE 譯文更動 by Ambrose
-#: ../libpurple/protocols/yahoo/yahoo.c:808
+#: ../libpurple/protocols/yahoo/yahoo.c:810
 msgid "Your Yahoo! message did not get sent."
 msgstr "無法送出您的 Yahoo! 訊息。"
 
 #  XXX 可能可以譯得生動一點
-#: ../libpurple/protocols/yahoo/yahoo.c:878
+#: ../libpurple/protocols/yahoo/yahoo.c:880
 #, c-format
 msgid "%s just sent you a Buzz!"
 msgstr "%s 在呼叫您!"
 
 # XXX 暫譯
-#: ../libpurple/protocols/yahoo/yahoo.c:925
+#: ../libpurple/protocols/yahoo/yahoo.c:927
 #, c-format
 msgid "Yahoo! system message for %s:"
 msgstr "%s 的 Yahoo! 系統訊息:"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:984
+#: ../libpurple/protocols/yahoo/yahoo.c:986
 msgid "Authorization denied message:"
 msgstr "拒絕認證訊息:"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1065
+#: ../libpurple/protocols/yahoo/yahoo.c:1067
 #, c-format
 msgid "%s has (retroactively) denied your request to add them to your list."
 msgstr "使用者 %s 剛剛拒絕了您先前將他(她)新增至您的好友清單的要求。"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1068
+#: ../libpurple/protocols/yahoo/yahoo.c:1070
 #, c-format
 msgid ""
 "%s has (retroactively) denied your request to add them to your list for the "
@@ -10679,11 +11219,11 @@
 "使用者 %s 因為下列原因,剛剛拒絕了您先前將他(她)新增至您的好友清單的要求:%"
 "s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1071
+#: ../libpurple/protocols/yahoo/yahoo.c:1073
 msgid "Add buddy rejected"
 msgstr "新增好友被拒"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1822
+#: ../libpurple/protocols/yahoo/yahoo.c:1824
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -10693,11 +11233,11 @@
 "Yahoo 伺服器要求了使用一種不明的認證方式,因此很可能不會成功登入 Yahoo。請到 "
 "%s 檢查有沒有更新的版本。"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1825
+#: ../libpurple/protocols/yahoo/yahoo.c:1827
 msgid "Failed Yahoo! Authentication"
 msgstr "Yahoo! 認證失敗"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1891
+#: ../libpurple/protocols/yahoo/yahoo.c:1893
 #, c-format
 msgid ""
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
@@ -10706,70 +11246,88 @@
 "您嘗試忽略在您的好友名單內的 %s。如果您打算把他(她)從您的好友清單中移除,並"
 "隨即忽略他(她),請按一下「是」。"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1894
+#: ../libpurple/protocols/yahoo/yahoo.c:1896
 msgid "Ignore buddy?"
 msgstr "忽略使用者?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1953
+#: ../libpurple/protocols/yahoo/yahoo.c:1955
 msgid "Your account is locked, please log in to the Yahoo! website."
 msgstr "你的帳戶目前被暫時關閉。請您登入 Yahoo! 網站。"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1956
+#: ../libpurple/protocols/yahoo/yahoo.c:1958
 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr "未知的錯誤代碼 %d。已經登入到 Yahoo!,官方網站上可能已經修正這個錯誤。"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2010
+#: ../libpurple/protocols/yahoo/yahoo.c:2012
 #, 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:2013
+#: ../libpurple/protocols/yahoo/yahoo.c:2015
 msgid "Could not add buddy to server list"
 msgstr "無法將好友新增至伺服器上的清單內"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2132
+#: ../libpurple/protocols/yahoo/yahoo.c:2134
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ 音效檔 %s/%s/%s.swf ] %s"
 
 # XXX 暫譯 - 20061025
-#: ../libpurple/protocols/yahoo/yahoo.c:2464
+#: ../libpurple/protocols/yahoo/yahoo.c:2474
 msgid "Received unexpected HTTP response from server."
 msgstr "伺服器發出了奇怪的 HTTP 回應。"
 
-#: ../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/yahoo.c:2498
+#: ../libpurple/protocols/yahoo/yahoo.c:2684
+#: ../libpurple/protocols/yahoo/yahoo.c:2787
+#: ../libpurple/protocols/yahoo/yahoo.c:2797
 #: ../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:2882
-#: ../libpurple/protocols/yahoo/yahoo.c:3493
+#: ../libpurple/protocols/yahoo/yahoo.c:2524
+#, c-format
+msgid ""
+"Lost connection with %s:\n"
+"%s"
+msgstr ""
+"與 %s 之間的連線突然中斷:\n"
+"%s"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:2549
+#, c-format
+msgid ""
+"Could not establish a connection with %s:\n"
+"%s"
+msgstr ""
+"無法與 %s 建立連線:\n"
+"%s"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:2899
+#: ../libpurple/protocols/yahoo/yahoo.c:3510
 msgid "Not at Home"
 msgstr "不在家"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2884
-#: ../libpurple/protocols/yahoo/yahoo.c:3496
+#: ../libpurple/protocols/yahoo/yahoo.c:2901
+#: ../libpurple/protocols/yahoo/yahoo.c:3513
 msgid "Not at Desk"
 msgstr "不在座位"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2886
-#: ../libpurple/protocols/yahoo/yahoo.c:3499
+#: ../libpurple/protocols/yahoo/yahoo.c:2903
+#: ../libpurple/protocols/yahoo/yahoo.c:3516
 msgid "Not in Office"
 msgstr "不在辦公室"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2890
-#: ../libpurple/protocols/yahoo/yahoo.c:3505
+#: ../libpurple/protocols/yahoo/yahoo.c:2907
+#: ../libpurple/protocols/yahoo/yahoo.c:3522
 msgid "On Vacation"
 msgstr "渡假去了"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2894
-#: ../libpurple/protocols/yahoo/yahoo.c:3511
+#: ../libpurple/protocols/yahoo/yahoo.c:2911
+#: ../libpurple/protocols/yahoo/yahoo.c:3528
 msgid "Stepped Out"
 msgstr "走出去了"
 
@@ -10777,92 +11335,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:2987
-#: ../libpurple/protocols/yahoo/yahoo.c:3017
+#: ../libpurple/protocols/yahoo/yahoo.c:3004
+#: ../libpurple/protocols/yahoo/yahoo.c:3034
 msgid "Not on server list"
 msgstr "不在伺服器上的清單中"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3034
-#: ../libpurple/protocols/yahoo/yahoo.c:3092
+#: ../libpurple/protocols/yahoo/yahoo.c:3051
+#: ../libpurple/protocols/yahoo/yahoo.c:3109
 msgid "Appear Online"
 msgstr "報稱上線"
 
 # NOTE Yahoo 官方譯「永遠顯示離線」,說白一點其實即是(針對某人)「長期隠身」
-#: ../libpurple/protocols/yahoo/yahoo.c:3037
-#: ../libpurple/protocols/yahoo/yahoo.c:3113
+#: ../libpurple/protocols/yahoo/yahoo.c:3054
+#: ../libpurple/protocols/yahoo/yahoo.c:3130
 msgid "Appear Permanently Offline"
 msgstr "長期報稱離線"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3055
+#: ../libpurple/protocols/yahoo/yahoo.c:3072
 msgid "Presence"
 msgstr "上線狀態"
 
 # NOTE 下次登入時不報稱離線,所以加「暫時」字眼
-#: ../libpurple/protocols/yahoo/yahoo.c:3098
+#: ../libpurple/protocols/yahoo/yahoo.c:3115
 msgid "Appear Offline"
 msgstr "暫時報稱離線"
 
 #  NOTE 這是清單內的一個指令
-#: ../libpurple/protocols/yahoo/yahoo.c:3107
+#: ../libpurple/protocols/yahoo/yahoo.c:3124
 msgid "Don't Appear Permanently Offline"
 msgstr "停止長期報稱離線"
 
 # NOTE #gaim 的 Vann 及 LSchiere 解:如果選取了的好友目前處於一個聊天,便加入該個聊天
 # NOTE Yahoo 的「Chat」正式譯文為「聯誼園地」
-#: ../libpurple/protocols/yahoo/yahoo.c:3155
+#: ../libpurple/protocols/yahoo/yahoo.c:3172
 msgid "Join in Chat"
 msgstr "加入好友目前所在的聊天室"
 
 # NOTE「會議室」是暫時的意譯。Yahoo! 好像沒有為「Conference」提供正式中譯名。
-#: ../libpurple/protocols/yahoo/yahoo.c:3161
+#: ../libpurple/protocols/yahoo/yahoo.c:3178
 msgid "Initiate Conference"
 msgstr "開啟會議室"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3189
+#: ../libpurple/protocols/yahoo/yahoo.c:3206
 msgid "Presence Settings"
 msgstr "上線狀態設定"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3195
+#: ../libpurple/protocols/yahoo/yahoo.c:3212
 msgid "Start Doodling"
 msgstr "開始 Doodle"
 
 #. XXX Typo: This should be _("Activate which ID?") - fix after string freeze is over
-#: ../libpurple/protocols/yahoo/yahoo.c:3228
+#: ../libpurple/protocols/yahoo/yahoo.c:3245
 msgid "Active which ID?"
 msgstr "啟動哪一個 ID?"
 
 # NOTE #gaim 的 Vann 及 LSchiere 解:如果選取了的好友目前處於一個聊天,便加入該個聊天
 # NOTE Yahoo 的「Chat」正式譯文為「聯誼園地」
-#: ../libpurple/protocols/yahoo/yahoo.c:3239
+#: ../libpurple/protocols/yahoo/yahoo.c:3256
 msgid "Join who in chat?"
 msgstr "加入哪個好友目前所在的聊天室?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3251
+#: ../libpurple/protocols/yahoo/yahoo.c:3268
 msgid "Activate ID..."
 msgstr "啟動 ID..."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3255
+#: ../libpurple/protocols/yahoo/yahoo.c:3272
 msgid "Join User in Chat..."
 msgstr "加入好友目前所在的聊天室..."
 
 #  XXX 可能可以譯得生動一點
-#: ../libpurple/protocols/yahoo/yahoo.c:3762
+#: ../libpurple/protocols/yahoo/yahoo.c:3779
 msgid "You have just sent a Buzz!"
 msgstr "您剛送出了一個呼叫!"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3821
+#: ../libpurple/protocols/yahoo/yahoo.c:3838
 msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
 msgstr "join: &lt聊天室&gt;:加入位於 Yahoo! 網路的一個聊天室"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3826
+#: ../libpurple/protocols/yahoo/yahoo.c:3843
 msgid "list: List rooms on the Yahoo network"
 msgstr "list:列出Yahoo網路上的聊天室清單"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3830
+#: ../libpurple/protocols/yahoo/yahoo.c:3847
 msgid "buzz: Buzz a user to get their attention"
 msgstr "buzz: 給好友一個「嗶」引他(她)注意"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3834
+#: ../libpurple/protocols/yahoo/yahoo.c:3851
 msgid "doodle: Request user to start a Doodle session"
 msgstr "doodle: 要求使用者開始 Doodle Session"
 
@@ -10876,57 +11434,57 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/yahoo/yahoo.c:4042
-#: ../libpurple/protocols/yahoo/yahoo.c:4044
+#: ../libpurple/protocols/yahoo/yahoo.c:4059
+#: ../libpurple/protocols/yahoo/yahoo.c:4061
 msgid "Yahoo Protocol Plugin"
 msgstr "Yahoo 協定模組"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4067
+#: ../libpurple/protocols/yahoo/yahoo.c:4084
 msgid "Yahoo Japan"
 msgstr "Yahoo Japan"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4070
+#: ../libpurple/protocols/yahoo/yahoo.c:4087
 msgid "Pager server"
 msgstr "傳呼伺服器"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4073
+#: ../libpurple/protocols/yahoo/yahoo.c:4090
 msgid "Japan Pager server"
 msgstr "傳呼伺服器(日本地區)"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4076
+#: ../libpurple/protocols/yahoo/yahoo.c:4093
 msgid "Pager port"
 msgstr "傳呼系統通訊埠"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4079
+#: ../libpurple/protocols/yahoo/yahoo.c:4096
 msgid "File transfer server"
 msgstr "檔案傳輸伺服器"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4082
+#: ../libpurple/protocols/yahoo/yahoo.c:4099
 msgid "Japan file transfer server"
 msgstr "檔案傳輸伺服器(日本地區)"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4085
+#: ../libpurple/protocols/yahoo/yahoo.c:4102
 msgid "File transfer port"
 msgstr "檔案傳輸通訊埠"
 
 #  XXX 無劃一譯法,有譯「地區」、「區域」甚至「場所」(?!)
-#: ../libpurple/protocols/yahoo/yahoo.c:4088
+#: ../libpurple/protocols/yahoo/yahoo.c:4105
 msgid "Chat room locale"
 msgstr "聊天室區域 (Locale)"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4091
+#: ../libpurple/protocols/yahoo/yahoo.c:4108
 msgid "Ignore conference and chatroom invitations"
 msgstr "忽略會議室與聊天室邀請"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4099
+#: ../libpurple/protocols/yahoo/yahoo.c:4116
 msgid "Chat room list URL"
 msgstr "聊天室清單所在網址"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4102
+#: ../libpurple/protocols/yahoo/yahoo.c:4119
 msgid "Yahoo Chat server"
 msgstr "Yahoo 聊天伺服器"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4105
+#: ../libpurple/protocols/yahoo/yahoo.c:4122
 msgid "Yahoo Chat port"
 msgstr "Yahoo 聊天室通訊埠"
 
@@ -11019,7 +11577,7 @@
 msgstr "無法建立檔案介紹。"
 
 #. TODO: what to do here - do we really have to disconnect?
-#: ../libpurple/protocols/yahoo/yahoo_packet.c:289
+#: ../libpurple/protocols/yahoo/yahoo_packet.c:302
 msgid "Write Error"
 msgstr "寫入錯誤"
 
@@ -11315,7 +11873,7 @@
 msgstr "現身程度"
 
 #: ../libpurple/proxy.c:458 ../libpurple/proxy.c:877 ../libpurple/proxy.c:1032
-#: ../libpurple/proxy.c:1588
+#: ../libpurple/proxy.c:1600
 #, c-format
 msgid ""
 "Unable to create socket:\n"
@@ -11345,7 +11903,7 @@
 msgid "Error resolving %s"
 msgstr "解析 %s 途中發生了錯誤"
 
-#: ../libpurple/proxy.c:1685
+#: ../libpurple/proxy.c:1697
 msgid "Could not resolve host name"
 msgstr "無法解析主機"
 
@@ -11439,28 +11997,28 @@
 msgid "%s became unidle"
 msgstr "%s 不再閒置"
 
-#: ../libpurple/status.c:1312
+#: ../libpurple/status.c:1313
 #, c-format
 msgid "+++ %s became idle"
 msgstr "+++ %s 變更狀態為閒置"
 
-#: ../libpurple/status.c:1314
+#: ../libpurple/status.c:1315
 #, c-format
 msgid "+++ %s became unidle"
 msgstr "+++ %s 不再閒置"
 
-#: ../libpurple/util.c:681
+#: ../libpurple/util.c:682
 #, c-format
 msgid "%x %X"
 msgstr "%x %X"
 
-#: ../libpurple/util.c:2553
+#: ../libpurple/util.c:2586
 #, c-format
 msgid "Error Reading %s"
 msgstr "讀取 %s 途中發生了錯誤"
 
 # NOTE 「They」是什麼呢?譯成「它們」的話,「它們」又是什麼呢?寫長一點好了。
-#: ../libpurple/util.c:2554
+#: ../libpurple/util.c:2587
 #, c-format
 msgid ""
 "An error was encountered reading your %s.  They have not been loaded, and "
@@ -11468,79 +12026,84 @@
 msgstr ""
 "在解析您的%s時發生錯誤。檔案內的資料並沒有被讀入,同時舊檔案已移至 %s~。"
 
-#: ../libpurple/util.c:3024
+#: ../libpurple/util.c:3060
 msgid "Calculating..."
 msgstr "計算中..."
 
-#: ../libpurple/util.c:3027
+#: ../libpurple/util.c:3063
 msgid "Unknown."
 msgstr "未知。"
 
-#: ../libpurple/util.c:3053
+#: ../libpurple/util.c:3089
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d 秒"
 msgstr[1] "%d 秒"
 
-#: ../libpurple/util.c:3065
+#: ../libpurple/util.c:3101
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d 日"
 msgstr[1] "%d 日"
 
-#: ../libpurple/util.c:3073
+#: ../libpurple/util.c:3109
 #, c-format
 msgid "%s, %d hour"
 msgid_plural "%s, %d hours"
 msgstr[0] "%s %d 小時"
 msgstr[1] "%s %d 小時"
 
-#: ../libpurple/util.c:3079
+#: ../libpurple/util.c:3115
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d 小時"
 msgstr[1] "%d 小時"
 
-#: ../libpurple/util.c:3087
+#: ../libpurple/util.c:3123
 #, c-format
 msgid "%s, %d minute"
 msgid_plural "%s, %d minutes"
 msgstr[0] "%s %d 分"
 msgstr[1] "%s %d 分"
 
-#: ../libpurple/util.c:3093
+#: ../libpurple/util.c:3129
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d 分"
 msgstr[1] "%d 分"
 
-#: ../libpurple/util.c:3362 ../libpurple/util.c:3660
+#: ../libpurple/util.c:3389
+#, c-format
+msgid "Could not open %s: Redirected too many times"
+msgstr "無法打開 %s:重新導向的次數超過了上限"
+
+#: ../libpurple/util.c:3426 ../libpurple/util.c:3721
 #, c-format
 msgid "Unable to connect to %s"
 msgstr "無法連線到「%s」"
 
-#: ../libpurple/util.c:3488
+#: ../libpurple/util.c:3549
 #, 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:3523
+#: ../libpurple/util.c:3584
 #, c-format
 msgid "Error reading from %s: %s"
 msgstr "讀入 %s 途中發生錯誤:%s"
 
-#: ../libpurple/util.c:3554
+#: ../libpurple/util.c:3615
 #, c-format
 msgid "Error writing to %s: %s"
 msgstr "寫入 %s 途中發生了錯誤:%s"
 
-#: ../libpurple/util.c:3579
+#: ../libpurple/util.c:3640
 #, c-format
 msgid "Unable to connect to %s: %s"
 msgstr "無法連線到 %s:%s"
@@ -11567,59 +12130,75 @@
 msgstr "系統匣方向"
 
 #. Build the login options frame.
-#: ../pidgin/gtkaccount.c:406
+#: ../pidgin/gtkaccount.c:409
 msgid "Login Options"
 msgstr "登入選項"
 
+#: ../pidgin/gtkaccount.c:430
+msgid "Pro_tocol:"
+msgstr "通訊協定(_T):"
+
+#: ../pidgin/gtkaccount.c:441
+msgid "Screen _name:"
+msgstr "帳號(_N):"
+
 # NOTE Debian 譯「local」為「本地端」,「本機」是Windows譯法,但在這裏好像比較妥當
 # XXX
-#: ../pidgin/gtkaccount.c:515
-msgid "Local alias:"
-msgstr "帳號別名(只在本機生效):"
+#: ../pidgin/gtkaccount.c:528
+msgid "_Local alias:"
+msgstr "帳號別名(只在本機生效)(_L):"
+
+#: ../pidgin/gtkaccount.c:532
+msgid "Remember pass_word"
+msgstr "記住密碼(_W)"
 
 #. Build the user options frame.
-#: ../pidgin/gtkaccount.c:577
+#: ../pidgin/gtkaccount.c:590
 msgid "User Options"
 msgstr "使用者自定選項"
 
+#: ../pidgin/gtkaccount.c:603
+msgid "New _mail notifications"
+msgstr "新郵件通知(_M)"
+
 #. Buddy icon
-#: ../pidgin/gtkaccount.c:595
-msgid "Use this buddy icon for this account:"
-msgstr "使用下列好友圖示:"
+#: ../pidgin/gtkaccount.c:608
+msgid "Use this buddy _icon for this account:"
+msgstr "使用下列好友圖示(_I):"
 
 #. Build the protocol options frame.
-#: ../pidgin/gtkaccount.c:715
+#: ../pidgin/gtkaccount.c:728
 #, c-format
 msgid "%s Options"
 msgstr "%s 選項"
 
-#: ../pidgin/gtkaccount.c:912
+#: ../pidgin/gtkaccount.c:934
 msgid "Use GNOME Proxy Settings"
 msgstr "使用 GNOME 的代理伺服器設定"
 
-#: ../pidgin/gtkaccount.c:913
+#: ../pidgin/gtkaccount.c:935
 msgid "Use Global Proxy Settings"
 msgstr "使用全域的代理伺服器設定"
 
 # NOTE 可以有代理伺服器但毋須用
 # NOTE 香港普遍用「毋須」,但講國語「毋須」會不通順,「不使用」較好
-#: ../pidgin/gtkaccount.c:919
+#: ../pidgin/gtkaccount.c:941
 msgid "No Proxy"
 msgstr "不使用代理伺服器"
 
-#: ../pidgin/gtkaccount.c:925
+#: ../pidgin/gtkaccount.c:947
 msgid "HTTP"
 msgstr "HTTP"
 
-#: ../pidgin/gtkaccount.c:931
+#: ../pidgin/gtkaccount.c:953
 msgid "SOCKS 4"
 msgstr "SOCKS 4"
 
-#: ../pidgin/gtkaccount.c:937
+#: ../pidgin/gtkaccount.c:959
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
-#: ../pidgin/gtkaccount.c:943 ../pidgin/gtkprefs.c:1100
+#: ../pidgin/gtkaccount.c:965 ../pidgin/gtkprefs.c:1137
 msgid "Use Environmental Settings"
 msgstr "使用環境變數設定"
 
@@ -11628,60 +12207,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:982
+#: ../pidgin/gtkaccount.c:1004
 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:985
+#: ../pidgin/gtkaccount.c:1007
 msgid "you can see the butterflies mating"
 msgstr "鴛鴦蝴蝶也看得見耶"
 
-#: ../pidgin/gtkaccount.c:1006
+#: ../pidgin/gtkaccount.c:1028
 msgid "Proxy Options"
 msgstr "代理伺服器選項"
 
-#: ../pidgin/gtkaccount.c:1020 ../pidgin/gtkprefs.c:1094
+#: ../pidgin/gtkaccount.c:1042 ../pidgin/gtkprefs.c:1131
 msgid "Proxy _type:"
 msgstr "代理伺服器型態(_T):"
 
-#: ../pidgin/gtkaccount.c:1029 ../pidgin/gtkprefs.c:1115
+#: ../pidgin/gtkaccount.c:1051 ../pidgin/gtkprefs.c:1152
 msgid "_Host:"
 msgstr "主機位址(_H):"
 
-#: ../pidgin/gtkaccount.c:1033 ../pidgin/gtkprefs.c:1133
+#: ../pidgin/gtkaccount.c:1055 ../pidgin/gtkprefs.c:1170
 msgid "_Port:"
 msgstr "通訊埠(_P):"
 
-#: ../pidgin/gtkaccount.c:1041
+#: ../pidgin/gtkaccount.c:1063
 msgid "_Username:"
 msgstr "使用者(_U):"
 
-#: ../pidgin/gtkaccount.c:1048 ../pidgin/gtkprefs.c:1170
+#: ../pidgin/gtkaccount.c:1070 ../pidgin/gtkprefs.c:1207
 msgid "Pa_ssword:"
 msgstr "密碼(_S):"
 
-#: ../pidgin/gtkaccount.c:1454
+#: ../pidgin/gtkaccount.c:1476
 msgid "Add Account"
 msgstr "新增帳號"
 
-#: ../pidgin/gtkaccount.c:1478
+#: ../pidgin/gtkaccount.c:1500
 msgid "_Basic"
 msgstr "基本設定(_B)"
 
-#: ../pidgin/gtkaccount.c:1489
+#: ../pidgin/gtkaccount.c:1511
 msgid "_Advanced"
 msgstr "進階設定(_A)"
 
-#: ../pidgin/gtkaccount.c:1961 ../pidgin/gtkplugin.c:568
+#: ../pidgin/gtkaccount.c:1983 ../pidgin/gtkplugin.c:568
 msgid "Enabled"
 msgstr "啟動"
 
-#: ../pidgin/gtkaccount.c:1989
+#: ../pidgin/gtkaccount.c:2011
 msgid "Protocol"
 msgstr "通訊協定"
 
-#: ../pidgin/gtkaccount.c:2183
+#: ../pidgin/gtkaccount.c:2212
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Welcome to %s!</span>\n"
@@ -11705,233 +12284,222 @@
 
 # TODO 看起來應該為加一個新的聊天室,並把聊天室歸類到某個群組。
 # NOTE 譯文更動 by Paladin
-#: ../pidgin/gtkblist.c:724
+#: ../pidgin/gtkblist.c:727
 msgid "Join a Chat"
 msgstr "加入聊天室"
 
-#: ../pidgin/gtkblist.c:745
+#: ../pidgin/gtkblist.c:748
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 msgstr "請輸入關於您所想加入好友清單的聊天室的適當資訊。\n"
 
-#: ../pidgin/gtkblist.c:756 ../pidgin/gtkpounce.c:531
+#. Set up stuff for the account box
+#: ../pidgin/gtkblist.c:759 ../pidgin/gtkblist.c:5441
+#: ../pidgin/gtkblist.c:5808 ../pidgin/gtkpounce.c:531
 #: ../pidgin/gtkroomlist.c:399
 msgid "_Account:"
 msgstr "帳號(_A):"
 
-#: ../pidgin/gtkblist.c:1045 ../pidgin/gtkprivacy.c:606
+#: ../pidgin/gtkblist.c:1048 ../pidgin/gtkprivacy.c:606
 #: ../pidgin/gtkprivacy.c:620
 msgid "_Block"
 msgstr "封鎖(_B)"
 
-#: ../pidgin/gtkblist.c:1045
+#: ../pidgin/gtkblist.c:1048
 msgid "Un_block"
 msgstr "解除封鎖(_B)"
 
-#: ../pidgin/gtkblist.c:1096
+#: ../pidgin/gtkblist.c:1099
 msgid "Get _Info"
 msgstr "取得資訊(_I)"
 
-#: ../pidgin/gtkblist.c:1099 ../pidgin/pidginstock.c:84
+#: ../pidgin/gtkblist.c:1102 ../pidgin/pidginstock.c:84
 msgid "I_M"
 msgstr "即時訊息(_M)"
 
-#: ../pidgin/gtkblist.c:1105
+#: ../pidgin/gtkblist.c:1108
 msgid "_Send File"
 msgstr "傳送檔案(_S)"
 
-#: ../pidgin/gtkblist.c:1112
+#: ../pidgin/gtkblist.c:1115
 msgid "Add Buddy _Pounce"
 msgstr "加入好友狀態捕捉(_P)"
 
-#: ../pidgin/gtkblist.c:1116 ../pidgin/gtkblist.c:1120
-#: ../pidgin/gtkblist.c:1222 ../pidgin/gtkblist.c:1245
+#: ../pidgin/gtkblist.c:1119 ../pidgin/gtkblist.c:1123
+#: ../pidgin/gtkblist.c:1225 ../pidgin/gtkblist.c:1248
 msgid "View _Log"
 msgstr "觀看日誌(_L)"
 
-#: ../pidgin/gtkblist.c:1132
-msgid "Alias..."
-msgstr "別名..."
-
-#: ../pidgin/gtkblist.c:1141 ../pidgin/gtkblist.c:1230
-#: ../pidgin/gtkblist.c:1251
+#: ../pidgin/gtkblist.c:1135 ../pidgin/gtkblist.c:1144
+#: ../pidgin/gtkblist.c:1233 ../pidgin/gtkblist.c:1254
 msgid "_Alias..."
 msgstr "別名(_A)..."
 
-#: ../pidgin/gtkblist.c:1143 ../pidgin/gtkblist.c:1232
-#: ../pidgin/gtkblist.c:1253
+#: ../pidgin/gtkblist.c:1138 ../pidgin/gtkblist.c:1146
+#: ../pidgin/gtkblist.c:1235 ../pidgin/gtkblist.c:1256
 msgid "_Remove"
 msgstr "移除(_R)"
 
-#: ../pidgin/gtkblist.c:1192
+#: ../pidgin/gtkblist.c:1195
 msgid "Add a _Buddy"
 msgstr "新增一個好友(_B)"
 
-#: ../pidgin/gtkblist.c:1195
+#: ../pidgin/gtkblist.c:1198
 msgid "Add a C_hat"
 msgstr "新增一個聊天室(_H)"
 
-#: ../pidgin/gtkblist.c:1198
+#: ../pidgin/gtkblist.c:1201
 msgid "_Delete Group"
 msgstr "刪除群組(_D)"
 
-#: ../pidgin/gtkblist.c:1200
+#: ../pidgin/gtkblist.c:1203
 msgid "_Rename"
 msgstr "重命名(_R)"
 
 #. join button
-#: ../pidgin/gtkblist.c:1218 ../pidgin/gtkroomlist.c:306
+#: ../pidgin/gtkblist.c:1221 ../pidgin/gtkroomlist.c:306
 #: ../pidgin/gtkroomlist.c:463 ../pidgin/pidginstock.c:82
 msgid "_Join"
 msgstr "加入(_J)"
 
-#: ../pidgin/gtkblist.c:1220
+#: ../pidgin/gtkblist.c:1223
 msgid "Auto-Join"
 msgstr "自動加入"
 
-#: ../pidgin/gtkblist.c:1258 ../pidgin/gtkblist.c:1281
+#: ../pidgin/gtkblist.c:1261 ../pidgin/gtkblist.c:1284
 msgid "_Collapse"
 msgstr "收起(_C)"
 
-#: ../pidgin/gtkblist.c:1286
+#: ../pidgin/gtkblist.c:1289
 msgid "_Expand"
 msgstr "展開(_E)"
 
-#: ../pidgin/gtkblist.c:1531 ../pidgin/gtkblist.c:1543
-#: ../pidgin/gtkblist.c:4511 ../pidgin/gtkblist.c:4521
+#: ../pidgin/gtkblist.c:1534 ../pidgin/gtkblist.c:1546
+#: ../pidgin/gtkblist.c:4543 ../pidgin/gtkblist.c:4553
 msgid "/Tools/Mute Sounds"
 msgstr "/工具/靜音"
 
 # XXX 暫譯
-#: ../pidgin/gtkblist.c:2003 ../pidgin/gtkconv.c:4535
+#: ../pidgin/gtkblist.c:2006 ../pidgin/gtkconv.c:4650
 #: ../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:2832
+#: ../pidgin/gtkblist.c:2846
 msgid "/_Buddies"
 msgstr "/好友(_B)"
 
-#: ../pidgin/gtkblist.c:2833
+#: ../pidgin/gtkblist.c:2847
 msgid "/Buddies/New Instant _Message..."
 msgstr "/好友/新即時訊息(_M)"
 
-#: ../pidgin/gtkblist.c:2834
+#: ../pidgin/gtkblist.c:2848
 msgid "/Buddies/Join a _Chat..."
 msgstr "/好友/加入聊天室(_C)"
 
-#: ../pidgin/gtkblist.c:2835
+#: ../pidgin/gtkblist.c:2849
 msgid "/Buddies/Get User _Info..."
 msgstr "/好友/取得使用者資訊(_I)..."
 
 #  NOTE 此處譯「讀取」似乎較「取得」好一點
-#: ../pidgin/gtkblist.c:2836
+#: ../pidgin/gtkblist.c:2850
 msgid "/Buddies/View User _Log..."
 msgstr "/好友/讀取使用者日誌(_L)..."
 
-#: ../pidgin/gtkblist.c:2838
+#: ../pidgin/gtkblist.c:2852
 msgid "/Buddies/Show _Offline Buddies"
 msgstr "/好友/顯示離線好友(_O)"
 
-#: ../pidgin/gtkblist.c:2839
+#: ../pidgin/gtkblist.c:2853
 msgid "/Buddies/Show _Empty Groups"
 msgstr "/好友/顯示空白的群組(_E)"
 
-#: ../pidgin/gtkblist.c:2840
+#: ../pidgin/gtkblist.c:2854
 msgid "/Buddies/Show Buddy _Details"
 msgstr "/好友/顯示好友細節(_D)"
 
-#: ../pidgin/gtkblist.c:2841
+#: ../pidgin/gtkblist.c:2855
 msgid "/Buddies/Show Idle _Times"
 msgstr "/好友/顯示閒置時間(_T)"
 
-#: ../pidgin/gtkblist.c:2842
+#: ../pidgin/gtkblist.c:2856
 msgid "/Buddies/_Sort Buddies"
 msgstr "/好友/好友清單排序(_S)"
 
-#: ../pidgin/gtkblist.c:2844
+#: ../pidgin/gtkblist.c:2858
 msgid "/Buddies/_Add Buddy..."
 msgstr "/好友/新增好友(_A)..."
 
-#: ../pidgin/gtkblist.c:2845
+#: ../pidgin/gtkblist.c:2859
 msgid "/Buddies/Add C_hat..."
 msgstr "/好友/新增聊天室(_H)..."
 
-#: ../pidgin/gtkblist.c:2846
+#: ../pidgin/gtkblist.c:2860
 msgid "/Buddies/Add _Group..."
 msgstr "/好友/新增群組(_G)..."
 
-#: ../pidgin/gtkblist.c:2848
+#: ../pidgin/gtkblist.c:2862
+msgid "/Buddies/_About Pidgin"
+msgstr "/好友/關於 Pidgin(_A)"
+
+#: ../pidgin/gtkblist.c:2863
 msgid "/Buddies/_Quit"
 msgstr "/好友/結束程式(_Q)"
 
 #. Accounts menu
-#: ../pidgin/gtkblist.c:2851
+#: ../pidgin/gtkblist.c:2866
 msgid "/_Accounts"
 msgstr "/帳號(_A)"
 
-#: ../pidgin/gtkblist.c:2852 ../pidgin/gtkblist.c:6446
+#: ../pidgin/gtkblist.c:2867 ../pidgin/gtkblist.c:6506
 msgid "/Accounts/Add\\/Edit"
 msgstr "/帳號(_A)/新增\\/編輯"
 
 #. Tools
-#: ../pidgin/gtkblist.c:2855
+#: ../pidgin/gtkblist.c:2870
 msgid "/_Tools"
 msgstr "工具(_T)"
 
-#: ../pidgin/gtkblist.c:2856
+#: ../pidgin/gtkblist.c:2871
 msgid "/Tools/Buddy _Pounces"
 msgstr "/工具/好友狀態捕捉(_P)"
 
-#: ../pidgin/gtkblist.c:2857
+#: ../pidgin/gtkblist.c:2872
 msgid "/Tools/Plu_gins"
 msgstr "/工具/模組(_G)"
 
-#: ../pidgin/gtkblist.c:2858
+#: ../pidgin/gtkblist.c:2873
 msgid "/Tools/Pr_eferences"
 msgstr "/工具/偏好設定(_E)"
 
-#: ../pidgin/gtkblist.c:2859
+#: ../pidgin/gtkblist.c:2874
 msgid "/Tools/Pr_ivacy"
 msgstr "/工具/隱私設定(_I)"
 
-#: ../pidgin/gtkblist.c:2861
+#: ../pidgin/gtkblist.c:2876
 msgid "/Tools/_File Transfers"
 msgstr "/工具/檔案傳輸(_F)"
 
-#: ../pidgin/gtkblist.c:2862
+#: ../pidgin/gtkblist.c:2877
 msgid "/Tools/R_oom List"
 msgstr "/工具/聊天室清單(_O)"
 
-#: ../pidgin/gtkblist.c:2863
+#: ../pidgin/gtkblist.c:2878
 msgid "/Tools/System _Log"
 msgstr "/工具/系統日誌(_L)"
 
-#: ../pidgin/gtkblist.c:2865
+#: ../pidgin/gtkblist.c:2879
+msgid "/Tools/_Debug Window"
+msgstr "/工具/除錯視窗(_D)"
+
+#: ../pidgin/gtkblist.c:2881
 msgid "/Tools/Mute _Sounds"
 msgstr "/工具/靜音(_S)"
 
-#. Help
-#: ../pidgin/gtkblist.c:2868
-msgid "/_Help"
-msgstr "說明(_H)"
-
-#: ../pidgin/gtkblist.c:2869
-msgid "/Help/Online _Help"
-msgstr "線上說明(_H)"
-
-#: ../pidgin/gtkblist.c:2870
-msgid "/Help/_Debug Window"
-msgstr "/說明/除錯視窗(_D)"
-
-#: ../pidgin/gtkblist.c:2871
-msgid "/Help/_About"
-msgstr "/說明/關於(_A)"
-
-#: ../pidgin/gtkblist.c:2899
+#: ../pidgin/gtkblist.c:2909
 #, c-format
 msgid ""
 "\n"
@@ -11940,128 +12508,128 @@
 "\n"
 "<b>帳號:</b>%s"
 
-#: ../pidgin/gtkblist.c:2977
+#: ../pidgin/gtkblist.c:2987
 msgid "Buddy Alias"
 msgstr "好友別名"
 
-#: ../pidgin/gtkblist.c:2998
+#: ../pidgin/gtkblist.c:3015
 msgid "Logged In"
 msgstr "已登入"
 
-#: ../pidgin/gtkblist.c:3044
+#: ../pidgin/gtkblist.c:3061
 msgid "Last Seen"
 msgstr "上次登入"
 
 # XXX
-#: ../pidgin/gtkblist.c:3064
+#: ../pidgin/gtkblist.c:3081
 msgid "Spooky"
 msgstr "幽靈似的"
 
-#: ../pidgin/gtkblist.c:3066
+#: ../pidgin/gtkblist.c:3083
 msgid "Awesome"
 msgstr "頂呱呱"
 
-#: ../pidgin/gtkblist.c:3068
+#: ../pidgin/gtkblist.c:3085
 msgid "Rockin'"
 msgstr "頂呱呱"
 
-#: ../pidgin/gtkblist.c:3394
+#: ../pidgin/gtkblist.c:3414
 #, c-format
 msgid "Idle %dh %02dm"
 msgstr "閒置 %d 小時 %02d 分"
 
-#: ../pidgin/gtkblist.c:3396
+#: ../pidgin/gtkblist.c:3416
 #, c-format
 msgid "Idle %dm"
 msgstr "閒置 %d 分"
 
-#: ../pidgin/gtkblist.c:3533
+#: ../pidgin/gtkblist.c:3561
 msgid "/Buddies/New Instant Message..."
 msgstr "/好友/新即時訊息..."
 
-#: ../pidgin/gtkblist.c:3534 ../pidgin/gtkblist.c:3567
+#: ../pidgin/gtkblist.c:3562 ../pidgin/gtkblist.c:3595
 msgid "/Buddies/Join a Chat..."
 msgstr "/好友/加入聊天室(_C)..."
 
-#: ../pidgin/gtkblist.c:3535
+#: ../pidgin/gtkblist.c:3563
 msgid "/Buddies/Get User Info..."
 msgstr "/好友/取得使用者資訊..."
 
-#: ../pidgin/gtkblist.c:3536
+#: ../pidgin/gtkblist.c:3564
 msgid "/Buddies/Add Buddy..."
 msgstr "/好友/新增好友..."
 
-#: ../pidgin/gtkblist.c:3537 ../pidgin/gtkblist.c:3570
+#: ../pidgin/gtkblist.c:3565 ../pidgin/gtkblist.c:3598
 msgid "/Buddies/Add Chat..."
 msgstr "/好友/新增聊天室..."
 
-#: ../pidgin/gtkblist.c:3538
+#: ../pidgin/gtkblist.c:3566
 msgid "/Buddies/Add Group..."
 msgstr "/好友/新增群組..."
 
-#: ../pidgin/gtkblist.c:3573
+#: ../pidgin/gtkblist.c:3601
 msgid "/Tools/Privacy"
 msgstr "/工具/隱私設定"
 
-#: ../pidgin/gtkblist.c:3576
+#: ../pidgin/gtkblist.c:3604
 msgid "/Tools/Room List"
 msgstr "/工具/聊天室清單"
 
-#: ../pidgin/gtkblist.c:3673 ../pidgin/gtkdocklet.c:153
+#: ../pidgin/gtkblist.c:3701 ../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:3750
+#: ../pidgin/gtkblist.c:3781
 msgid "Manually"
 msgstr "使用者自定"
 
-#: ../pidgin/gtkblist.c:3752
+#: ../pidgin/gtkblist.c:3783
 msgid "Alphabetically"
 msgstr "依照字母"
 
-#: ../pidgin/gtkblist.c:3753
+#: ../pidgin/gtkblist.c:3784
 msgid "By status"
 msgstr "依照狀態"
 
-#: ../pidgin/gtkblist.c:3754
+#: ../pidgin/gtkblist.c:3785
 msgid "By log size"
 msgstr "依照日誌大小"
 
-#: ../pidgin/gtkblist.c:3956 ../pidgin/gtkconn.c:178
+#: ../pidgin/gtkblist.c:3987 ../pidgin/gtkconn.c:178
 #, c-format
 msgid "%s disconnected"
 msgstr "%s 結束連線"
 
-#: ../pidgin/gtkblist.c:3966
+#: ../pidgin/gtkblist.c:3997
 msgid "Re-enable Account"
 msgstr "重新啟動帳號"
 
-#: ../pidgin/gtkblist.c:3990
+#: ../pidgin/gtkblist.c:4021
 #, c-format
 msgid "<span color=\"red\">%s disconnected: %s</span>"
 msgstr "<span color=\"red\">%s 結束連線:%s</span>"
 
-#: ../pidgin/gtkblist.c:4142
+#: ../pidgin/gtkblist.c:4173
 msgid "<b>Username:</b>"
 msgstr "<b>使用者名稱:</b>"
 
-#: ../pidgin/gtkblist.c:4149
+#: ../pidgin/gtkblist.c:4180
 msgid "<b>Password:</b>"
 msgstr "<b>密碼:</b>"
 
-#: ../pidgin/gtkblist.c:4160
+#: ../pidgin/gtkblist.c:4191
 msgid "_Login"
 msgstr "登入(_L)"
 
-#: ../pidgin/gtkblist.c:4245
+#: ../pidgin/gtkblist.c:4276
 msgid "/Accounts"
 msgstr "/帳號"
 
 #. Translators: Please maintain the use of -> and <- to refer to menu heirarchy
-#: ../pidgin/gtkblist.c:4259
+#: ../pidgin/gtkblist.c:4290
 #, c-format
 msgid ""
 "<span weight='bold' size='larger'>Welcome to %s!</span>\n"
@@ -12079,23 +12647,23 @@
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: ../pidgin/gtkblist.c:4505
+#: ../pidgin/gtkblist.c:4537
 msgid "/Buddies/Show Offline Buddies"
 msgstr "/好友/顯示離線好友"
 
-#: ../pidgin/gtkblist.c:4508
+#: ../pidgin/gtkblist.c:4540
 msgid "/Buddies/Show Empty Groups"
 msgstr "/好友/顯示空的好的群組"
 
-#: ../pidgin/gtkblist.c:4514
+#: ../pidgin/gtkblist.c:4546
 msgid "/Buddies/Show Buddy Details"
 msgstr "/好友/顯示好友細節"
 
-#: ../pidgin/gtkblist.c:4517
+#: ../pidgin/gtkblist.c:4549
 msgid "/Buddies/Show Idle Times"
 msgstr "/好友/顯示閒置時間"
 
-#: ../pidgin/gtkblist.c:5367
+#: ../pidgin/gtkblist.c:5418
 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. "
@@ -12104,66 +12672,69 @@
 "請輸入您所想要加入好友的帳號。您可以為這個好友設定別名或暱稱,而這個設定將會"
 "在好友清單中顯示。\n"
 
-#: ../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:5686
+#. End of account box
+#: ../pidgin/gtkblist.c:5453
+msgid "_Screen name:"
+msgstr "帳號(_S):"
+
+#: ../pidgin/gtkblist.c:5475 ../pidgin/gtkblist.c:5829
+msgid "A_lias:"
+msgstr "別名(_L):"
+
+#: ../pidgin/gtkblist.c:5741
 msgid "This protocol does not support chat rooms."
 msgstr "這個通訊協定不支援聊天室。"
 
-#: ../pidgin/gtkblist.c:5702
+#: ../pidgin/gtkblist.c:5757
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
 msgstr "您並未登入任何一個可供您加入聊天室的通訊協定。"
 
-#: ../pidgin/gtkblist.c:5743
+#: ../pidgin/gtkblist.c:5798
 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:5826
+#: ../pidgin/gtkblist.c:5886
 msgid "Please enter the name of the group to be added."
 msgstr "請給您新增的群組輸入名稱。"
 
 # XXX
-#: ../pidgin/gtkblist.c:6466
+#: ../pidgin/gtkblist.c:6526
 msgid "<PurpleMain>/Accounts/"
 msgstr "<PurpleMain>/帳號/"
 
-#: ../pidgin/gtkblist.c:6490
+#: ../pidgin/gtkblist.c:6550
 msgid "_Edit Account"
 msgstr "編輯帳號(_E)"
 
 #  NOTE 這不是「不允許」而是「沒有」,尤其是在新的「模組相關指令」清單,
 #  NOTE 譯成「不允許」會非常怪
-#: ../pidgin/gtkblist.c:6503 ../pidgin/gtkconv.c:2923
+#: ../pidgin/gtkblist.c:6563 ../pidgin/gtkconv.c:3024
 msgid "No actions available"
 msgstr "沒有相關指令"
 
 # #NOTE 和下一個「Enable Account」對應。
-#: ../pidgin/gtkblist.c:6511
+#: ../pidgin/gtkblist.c:6571
 msgid "_Disable"
 msgstr "停用帳號(_D)"
 
-#: ../pidgin/gtkblist.c:6523
+#: ../pidgin/gtkblist.c:6583
 msgid "Enable Account"
 msgstr "啟動帳號"
 
 # XXX
-#: ../pidgin/gtkblist.c:6529
+#: ../pidgin/gtkblist.c:6589
 msgid "<PurpleMain>/Accounts/Enable Account"
 msgstr "<PurpleMain>/帳號/啟動帳號"
 
-#: ../pidgin/gtkblist.c:6578
+#: ../pidgin/gtkblist.c:6638
 msgid "/Tools"
 msgstr "/工具"
 
-#: ../pidgin/gtkblist.c:6648
+#: ../pidgin/gtkblist.c:6708
 msgid "/Buddies/Sort Buddies"
 msgstr "/好友/好友清單排序"
 
@@ -12178,209 +12749,217 @@
 "%s\n"
 "在您更正這個錯誤並重新啟動這個帳號前,%s 將不會再試著重新連線。"
 
-#: ../pidgin/gtkconv.c:788 ../pidgin/gtkconv.c:814
+#: ../pidgin/gtkconv.c:793 ../pidgin/gtkconv.c:819
 msgid "That buddy is not on the same protocol as this chat."
 msgstr "該個好友與這個聊天並非使用同一種的通訊協定"
 
 # XXX 暫譯
-#: ../pidgin/gtkconv.c:808
+#: ../pidgin/gtkconv.c:813
 msgid ""
 "You are not currently signed on with an account that can invite that buddy."
 msgstr "您並未登入任何一個可供您邀請哪個好友的通訊協定。"
 
-#: ../pidgin/gtkconv.c:861
+#: ../pidgin/gtkconv.c:866
 msgid "Invite Buddy Into Chat Room"
 msgstr "邀請好友進入聊天室"
 
 #. Put our happy label in it.
-#: ../pidgin/gtkconv.c:891
+#: ../pidgin/gtkconv.c:896
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
 msgstr "請輸入您想邀請的使用者名稱,以及邀請的訊息。"
 
-#: ../pidgin/gtkconv.c:912
+#: ../pidgin/gtkconv.c:917
 msgid "_Buddy:"
 msgstr "好友(_B):"
 
-#: ../pidgin/gtkconv.c:932 ../pidgin/gtksavedstatuses.c:1142
-#: ../pidgin/gtksavedstatuses.c:1478
+#: ../pidgin/gtkconv.c:937 ../pidgin/gtksavedstatuses.c:1141
+#: ../pidgin/gtksavedstatuses.c:1477
 msgid "_Message:"
 msgstr "訊息(_M):"
 
-#: ../pidgin/gtkconv.c:989 ../pidgin/gtkconv.c:2499 ../pidgin/gtkdebug.c:217
+#: ../pidgin/gtkconv.c:994 ../pidgin/gtkconv.c:2548 ../pidgin/gtkdebug.c:218
 #: ../pidgin/gtkft.c:542
 msgid "Unable to open file."
 msgstr "無法開啟檔案。"
 
-#: ../pidgin/gtkconv.c:995
+#: ../pidgin/gtkconv.c:1000
 #, c-format
 msgid "<h1>Conversation with %s</h1>\n"
 msgstr "<h1>與 %s 的交談</h1>\n"
 
-#: ../pidgin/gtkconv.c:1031
+#: ../pidgin/gtkconv.c:1036
 msgid "Save Conversation"
 msgstr "儲存聊天內容"
 
-#: ../pidgin/gtkconv.c:1180 ../pidgin/gtkdebug.c:165 ../pidgin/gtkdebug.c:741
+#: ../pidgin/gtkconv.c:1185 ../pidgin/gtkdebug.c:166 ../pidgin/gtkdebug.c:742
 msgid "Find"
 msgstr "搜尋"
 
-#: ../pidgin/gtkconv.c:1206 ../pidgin/gtkdebug.c:193
+#: ../pidgin/gtkconv.c:1211 ../pidgin/gtkdebug.c:194
 msgid "_Search for:"
 msgstr "搜尋(_S):"
 
-#: ../pidgin/gtkconv.c:1358
+#: ../pidgin/gtkconv.c:1394
 msgid "Logging started. Future messages in this conversation will be logged."
 msgstr "日誌系統啟動。未來在這個交談中的訊息都將被記錄於日誌中。"
 
-#: ../pidgin/gtkconv.c:1366
+#: ../pidgin/gtkconv.c:1402
 msgid ""
 "Logging stopped. Future messages in this conversation will not be logged."
 msgstr "日誌系統關閉。未來在這個交談中的訊息都將不會被記錄於日誌中。"
 
-#: ../pidgin/gtkconv.c:1614
+#: ../pidgin/gtkconv.c:1650
 msgid "Un-Ignore"
 msgstr "取消忽略使用者"
 
 #  NOTE「Ignore」原譯「忽略使用者」,但 gtkprefs.c 中的「Ignore」
 #  NOTE 乃「忽略格式」的意思,故只能譯成「忽略」
-#: ../pidgin/gtkconv.c:1617
+#: ../pidgin/gtkconv.c:1653
 msgid "Ignore"
 msgstr "忽略"
 
-#: ../pidgin/gtkconv.c:1637
+#: ../pidgin/gtkconv.c:1673
 msgid "Get Away Message"
 msgstr "取得離開訊息"
 
-#: ../pidgin/gtkconv.c:1660
+#: ../pidgin/gtkconv.c:1696
 msgid "Last said"
 msgstr "上次提到"
 
-#: ../pidgin/gtkconv.c:2507
+#: ../pidgin/gtkconv.c:2556
 msgid "Unable to save icon file to disk."
 msgstr "無法儲存圖示檔案至磁碟上。"
 
-#: ../pidgin/gtkconv.c:2558
+#: ../pidgin/gtkconv.c:2607
 msgid "Save Icon"
 msgstr "儲存圖示"
 
-#: ../pidgin/gtkconv.c:2610
+#: ../pidgin/gtkconv.c:2659
 msgid "Animate"
 msgstr "動畫"
 
-#: ../pidgin/gtkconv.c:2615
+#: ../pidgin/gtkconv.c:2664
 msgid "Hide Icon"
 msgstr "隱藏圖示"
 
 #  NOTE 這是Right-Click圖示時顯示的指令,譯「As」為「為」會很奇怪
-#: ../pidgin/gtkconv.c:2618
+#: ../pidgin/gtkconv.c:2667
 msgid "Save Icon As..."
 msgstr "儲存圖示..."
 
-#: ../pidgin/gtkconv.c:2622
+#: ../pidgin/gtkconv.c:2671
 msgid "Set Custom Icon..."
 msgstr "自定圖示..."
 
-#: ../pidgin/gtkconv.c:2635
+#: ../pidgin/gtkconv.c:2684
 msgid "Remove Custom Icon"
 msgstr "移除自定圖示"
 
 #. Conversation menu
-#: ../pidgin/gtkconv.c:2777
+#: ../pidgin/gtkconv.c:2826
 msgid "/_Conversation"
 msgstr "/交談(_C)"
 
-#: ../pidgin/gtkconv.c:2779
+#: ../pidgin/gtkconv.c:2828
 msgid "/Conversation/New Instant _Message..."
 msgstr "/好友/新即時訊息(_M)..."
 
-#: ../pidgin/gtkconv.c:2784
+#: ../pidgin/gtkconv.c:2833
 msgid "/Conversation/_Find..."
 msgstr "/交談/搜尋(_F)..."
 
-#: ../pidgin/gtkconv.c:2786
+#: ../pidgin/gtkconv.c:2835
 msgid "/Conversation/View _Log"
 msgstr "/交談/觀看歷史記錄(_L)"
 
-#: ../pidgin/gtkconv.c:2787
+#: ../pidgin/gtkconv.c:2836
 msgid "/Conversation/_Save As..."
 msgstr "/交談/另存新檔(_S)..."
 
-#: ../pidgin/gtkconv.c:2789
+#: ../pidgin/gtkconv.c:2838
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/交談/清空交談內容(_R)"
 
-#: ../pidgin/gtkconv.c:2793
+#: ../pidgin/gtkconv.c:2842
 msgid "/Conversation/Se_nd File..."
 msgstr "/交談/傳送檔案(_N)..."
 
-#: ../pidgin/gtkconv.c:2794
+#: ../pidgin/gtkconv.c:2843
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/交談/新增好友狀態捕捉(_P)..."
 
-#: ../pidgin/gtkconv.c:2796
+#: ../pidgin/gtkconv.c:2845
 msgid "/Conversation/_Get Info"
 msgstr "/交談/取得資訊(_G)"
 
-#: ../pidgin/gtkconv.c:2798
+#: ../pidgin/gtkconv.c:2847
 msgid "/Conversation/In_vite..."
 msgstr "/交談/邀請(_V)..."
 
-#: ../pidgin/gtkconv.c:2800
+#: ../pidgin/gtkconv.c:2849
 msgid "/Conversation/M_ore"
 msgstr "/交談/更多(_O)"
 
-#: ../pidgin/gtkconv.c:2804
+#: ../pidgin/gtkconv.c:2853
 msgid "/Conversation/Al_ias..."
 msgstr "/交談/別名(_I)..."
 
-#: ../pidgin/gtkconv.c:2806
+#: ../pidgin/gtkconv.c:2855
 msgid "/Conversation/_Block..."
 msgstr "/交談/封鎖(_B)..."
 
-#: ../pidgin/gtkconv.c:2808
+#: ../pidgin/gtkconv.c:2857
 msgid "/Conversation/_Unblock..."
 msgstr "/交談/解除封鎖(_B)..."
 
-#: ../pidgin/gtkconv.c:2810
+#: ../pidgin/gtkconv.c:2859
 msgid "/Conversation/_Add..."
 msgstr "/交談/新增(_A)..."
 
-#: ../pidgin/gtkconv.c:2812
+#: ../pidgin/gtkconv.c:2861
 msgid "/Conversation/_Remove..."
 msgstr "/交談/移除(_R)..."
 
-#: ../pidgin/gtkconv.c:2817
+#: ../pidgin/gtkconv.c:2866
+msgid "/Conversation/Insert Lin_k..."
+msgstr "/交談/插入連結(_k)..."
+
+#: ../pidgin/gtkconv.c:2868
+msgid "/Conversation/Insert Imag_e..."
+msgstr "/交談/插入影像(_E)..."
+
+#: ../pidgin/gtkconv.c:2874
 msgid "/Conversation/_Close"
 msgstr "/交談/關閉(_C)"
 
 #. Options
-#: ../pidgin/gtkconv.c:2821
+#: ../pidgin/gtkconv.c:2878
 msgid "/_Options"
 msgstr "/選項(_O)"
 
-#: ../pidgin/gtkconv.c:2822
+#: ../pidgin/gtkconv.c:2879
 msgid "/Options/Enable _Logging"
 msgstr "/選項/開始記錄日誌(_L)"
 
-#: ../pidgin/gtkconv.c:2823
+#: ../pidgin/gtkconv.c:2880
 msgid "/Options/Enable _Sounds"
 msgstr "/選項/開啟音效(_S)"
 
-#: ../pidgin/gtkconv.c:2824
+#: ../pidgin/gtkconv.c:2881
 msgid "/Options/Show Buddy _Icon"
 msgstr "/選項/顯示好友圖示(_I)"
 
-#: ../pidgin/gtkconv.c:2826
+#: ../pidgin/gtkconv.c:2883
 msgid "/Options/Show Formatting _Toolbars"
 msgstr "/選項/顯示格式工具列(_T)"
 
-#: ../pidgin/gtkconv.c:2827
+#: ../pidgin/gtkconv.c:2884
 msgid "/Options/Show Ti_mestamps"
 msgstr "/選項/顯示時間戳記(_M)"
 
-#: ../pidgin/gtkconv.c:2902
+#: ../pidgin/gtkconv.c:2960
 msgid "/Conversation/More"
 msgstr "/交談/更多"
 
@@ -12389,234 +12968,242 @@
 #. 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:2947 ../pidgin/gtkconv.c:2979
+#: ../pidgin/gtkconv.c:3048 ../pidgin/gtkconv.c:3080
 msgid "/Conversation"
 msgstr "/交談"
 
-#: ../pidgin/gtkconv.c:2987
+#: ../pidgin/gtkconv.c:3088
 msgid "/Conversation/View Log"
 msgstr "/交談/觀看歷史記錄"
 
-#: ../pidgin/gtkconv.c:2993
+#: ../pidgin/gtkconv.c:3094
 msgid "/Conversation/Send File..."
 msgstr "/交談/傳送檔案..."
 
-#: ../pidgin/gtkconv.c:2997
+#: ../pidgin/gtkconv.c:3098
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/交談/新增好友狀態捕捉..."
 
-#: ../pidgin/gtkconv.c:3003
+#: ../pidgin/gtkconv.c:3104
 msgid "/Conversation/Get Info"
 msgstr "/交談/取得資訊"
 
-#: ../pidgin/gtkconv.c:3007
+#: ../pidgin/gtkconv.c:3108
 msgid "/Conversation/Invite..."
 msgstr "/交談/邀請..."
 
-#: ../pidgin/gtkconv.c:3013
+#: ../pidgin/gtkconv.c:3114
 msgid "/Conversation/Alias..."
 msgstr "/交談/別名..."
 
-#: ../pidgin/gtkconv.c:3017
+#: ../pidgin/gtkconv.c:3118
 msgid "/Conversation/Block..."
 msgstr "/交談/封鎖..."
 
-#: ../pidgin/gtkconv.c:3021
+#: ../pidgin/gtkconv.c:3122
 msgid "/Conversation/Unblock..."
 msgstr "/交談/解除封鎖..."
 
-#: ../pidgin/gtkconv.c:3025
+#: ../pidgin/gtkconv.c:3126
 msgid "/Conversation/Add..."
 msgstr "/交談/新增..."
 
-#: ../pidgin/gtkconv.c:3029
+#: ../pidgin/gtkconv.c:3130
 msgid "/Conversation/Remove..."
 msgstr "/交談/移除..."
 
-#: ../pidgin/gtkconv.c:3033
+#: ../pidgin/gtkconv.c:3136
+msgid "/Conversation/Insert Link..."
+msgstr "/交談/插入連結..."
+
+#: ../pidgin/gtkconv.c:3140
+msgid "/Conversation/Insert Image..."
+msgstr "/交談/插入影像..."
+
+#: ../pidgin/gtkconv.c:3146
 msgid "/Options/Enable Logging"
 msgstr "/選項/開始記錄日誌"
 
-#: ../pidgin/gtkconv.c:3036
+#: ../pidgin/gtkconv.c:3149
 msgid "/Options/Enable Sounds"
 msgstr "/選項/開啟音效"
 
-#: ../pidgin/gtkconv.c:3049
+#: ../pidgin/gtkconv.c:3162
 msgid "/Options/Show Formatting Toolbars"
 msgstr "/選項/顯示格式工具列"
 
-#: ../pidgin/gtkconv.c:3052
+#: ../pidgin/gtkconv.c:3165
 msgid "/Options/Show Timestamps"
 msgstr "/選項/顯示時間戳記"
 
-#: ../pidgin/gtkconv.c:3055
+#: ../pidgin/gtkconv.c:3168
 msgid "/Options/Show Buddy Icon"
 msgstr "/選項/顯示好友圖示"
 
-#: ../pidgin/gtkconv.c:3139 ../pidgin/gtkconv.c:3181
+#: ../pidgin/gtkconv.c:3252 ../pidgin/gtkconv.c:3294
 msgid "User is typing..."
 msgstr "對方正在輸入..."
 
-#: ../pidgin/gtkconv.c:3184
+#: ../pidgin/gtkconv.c:3297
 msgid "User has typed something and stopped"
 msgstr "對方輸入了一些東西,不過暫停了"
 
 #. Build the Send To menu
-#: ../pidgin/gtkconv.c:3366
+#: ../pidgin/gtkconv.c:3479
 msgid "_Send To"
 msgstr "傳送到(_S)"
 
-#: ../pidgin/gtkconv.c:4080
+#: ../pidgin/gtkconv.c:4193
 msgid "_Send"
 msgstr "傳送(_S)"
 
 #. Setup the label telling how many people are in the room.
-#: ../pidgin/gtkconv.c:4229
+#: ../pidgin/gtkconv.c:4344
 msgid "0 people in room"
 msgstr "沒有人在這個房間"
 
-#: ../pidgin/gtkconv.c:5421 ../pidgin/gtkconv.c:5542
+#: ../pidgin/gtkconv.c:5536 ../pidgin/gtkconv.c:5657
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "%d 個人在這個房間"
 msgstr[1] "%d 個人在這個房間"
 
-#: ../pidgin/gtkconv.c:6108 ../pidgin/gtkstatusbox.c:657
+#: ../pidgin/gtkconv.c:6231 ../pidgin/gtkstatusbox.c:657
 msgid "Typing"
 msgstr "輸入中"
 
-#: ../pidgin/gtkconv.c:6114
+#: ../pidgin/gtkconv.c:6237
 msgid "Stopped Typing"
 msgstr "停止輸入"
 
-#: ../pidgin/gtkconv.c:6119
+#: ../pidgin/gtkconv.c:6242
 msgid "Nick Said"
 msgstr "暱稱被提及"
 
-#: ../pidgin/gtkconv.c:6124 ../pidgin/gtkdocklet.c:492
+#: ../pidgin/gtkconv.c:6247 ../pidgin/gtkdocklet.c:492
 msgid "Unread Messages"
 msgstr "未讀訊息"
 
-#: ../pidgin/gtkconv.c:6129
+#: ../pidgin/gtkconv.c:6252
 msgid "New Event"
 msgstr "新事件"
 
-#: ../pidgin/gtkconv.c:7258
+#: ../pidgin/gtkconv.c:7384
 msgid "Confirm close"
 msgstr "確認關閉"
 
-#: ../pidgin/gtkconv.c:7290
+#: ../pidgin/gtkconv.c:7416
 msgid "You have unread messages. Are you sure you want to close the window?"
 msgstr "您還有未讀取的訊息。您確定要關閉這個視窗嗎?"
 
-#: ../pidgin/gtkconv.c:7807
+#: ../pidgin/gtkconv.c:7938
 msgid "Close other tabs"
 msgstr "關閉其他分頁"
 
-#: ../pidgin/gtkconv.c:7813
+#: ../pidgin/gtkconv.c:7944
 msgid "Close all tabs"
 msgstr "關閉所有分頁"
 
-#: ../pidgin/gtkconv.c:7821
+#: ../pidgin/gtkconv.c:7952
 msgid "Detach this tab"
 msgstr "分離這個分頁"
 
-#: ../pidgin/gtkconv.c:7827
+#: ../pidgin/gtkconv.c:7958
 msgid "Close this tab"
 msgstr "關閉這個分頁"
 
-#: ../pidgin/gtkconv.c:8211
+#: ../pidgin/gtkconv.c:8344
 msgid "Close conversation"
 msgstr "關閉交談"
 
-#: ../pidgin/gtkconv.c:8732
+#: ../pidgin/gtkconv.c:8867
 msgid "Last created window"
 msgstr "上一個開啟的視窗"
 
-#: ../pidgin/gtkconv.c:8734
+#: ../pidgin/gtkconv.c:8869
 msgid "Separate IM and Chat windows"
 msgstr "以不同的視窗顯示即時訊息和聊天"
 
-#: ../pidgin/gtkconv.c:8736 ../pidgin/gtkprefs.c:1303
+#: ../pidgin/gtkconv.c:8871 ../pidgin/gtkprefs.c:1340
 msgid "New window"
 msgstr "新視窗"
 
-#: ../pidgin/gtkconv.c:8738
+#: ../pidgin/gtkconv.c:8873
 msgid "By group"
 msgstr "依群組"
 
-#: ../pidgin/gtkconv.c:8740
+#: ../pidgin/gtkconv.c:8875
 msgid "By account"
 msgstr "依帳號"
 
 #  NOTE「除錯日誌」很怪,「除錯紀錄」較順口,而且已經有人用
-#: ../pidgin/gtkdebug.c:232
+#: ../pidgin/gtkdebug.c:233
 msgid "Save Debug Log"
 msgstr "儲存除錯紀錄"
 
 # NOTE 可能是指「反向選取」
-#: ../pidgin/gtkdebug.c:580
+#: ../pidgin/gtkdebug.c:581
 msgid "Invert"
 msgstr "反向"
 
 # XXX TODO 我非常討厭把「Highlight」譯成「高亮度」,但譯文可以改進 - Ambrose 20061029
-#: ../pidgin/gtkdebug.c:583
+#: ../pidgin/gtkdebug.c:584
 msgid "Highlight matches"
 msgstr "標示匹配字串"
 
 #  NOTE 除錯視窗的工具列的快取選單的指令,指「工具列的按紐以圖示標示」,下二同
-#: ../pidgin/gtkdebug.c:650
+#: ../pidgin/gtkdebug.c:651
 msgid "_Icon Only"
 msgstr "顯示圖示(_I)"
 
-#: ../pidgin/gtkdebug.c:651
-msgid "_Text Only"
-msgstr "顯示文字(_T)"
-
 #: ../pidgin/gtkdebug.c:652
+msgid "_Text Only"
+msgstr "顯示文字(_T)"
+
+#: ../pidgin/gtkdebug.c:653
 msgid "_Both Icon & Text"
 msgstr "顯示圖示和文字(_B)"
 
-#: ../pidgin/gtkdebug.c:773
+#: ../pidgin/gtkdebug.c:774
 msgid "Filter"
 msgstr "過濾器"
 
-#: ../pidgin/gtkdebug.c:792
+#: ../pidgin/gtkdebug.c:793
 msgid "Right click for more options."
 msgstr "按右鍵以顯示更多選項。"
 
 # TODO 要覆查 - 20061025
-#: ../pidgin/gtkdebug.c:822
+#: ../pidgin/gtkdebug.c:823
 msgid "Level "
 msgstr "過濾程度 "
 
-#: ../pidgin/gtkdebug.c:823 ../pidgin/gtkdebug.c:829
+#: ../pidgin/gtkdebug.c:824 ../pidgin/gtkdebug.c:830
 msgid "Select the debug filter level."
 msgstr "選擇除錯訊息的過濾程度。"
 
 # TODO 要覆查 - 20061025
-#: ../pidgin/gtkdebug.c:831
+#: ../pidgin/gtkdebug.c:832
 msgid "All"
 msgstr "全部訊息"
 
 # NOTE 這個不是指「Info」(因為已經有「Info」一項),而是一種比「Info」還要低層次的除錯訊息,應是指「Debug」
-#: ../pidgin/gtkdebug.c:832
+#: ../pidgin/gtkdebug.c:833
 msgid "Misc"
 msgstr "閒雜訊息"
 
 # TODO 要覆查 - 20061025
-#: ../pidgin/gtkdebug.c:834
+#: ../pidgin/gtkdebug.c:835
 msgid "Warning"
 msgstr "警告訊息"
 
 # TODO 要覆查 - 20061025
-#: ../pidgin/gtkdebug.c:835
+#: ../pidgin/gtkdebug.c:836
 msgid "Error "
 msgstr "錯誤訊息"
 
 # TODO 要覆查 - 20061025
-#: ../pidgin/gtkdebug.c:836
+#: ../pidgin/gtkdebug.c:837
 msgid "Fatal Error"
 msgstr "嚴重錯誤訊息"
 
@@ -12630,8 +13217,8 @@
 #: ../pidgin/gtkdialogs.c:79 ../pidgin/gtkdialogs.c:80
 #: ../pidgin/gtkdialogs.c:81 ../pidgin/gtkdialogs.c:82
 #: ../pidgin/gtkdialogs.c:83 ../pidgin/gtkdialogs.c:84
-#: ../pidgin/gtkdialogs.c:87 ../pidgin/gtkdialogs.c:88
-#: ../pidgin/gtkdialogs.c:89
+#: ../pidgin/gtkdialogs.c:85 ../pidgin/gtkdialogs.c:88
+#: ../pidgin/gtkdialogs.c:89 ../pidgin/gtkdialogs.c:90
 msgid "developer"
 msgstr "開發者"
 
@@ -12639,11 +13226,11 @@
 msgid "developer & webmaster"
 msgstr "開發者兼網站管理員"
 
-#: ../pidgin/gtkdialogs.c:85
+#: ../pidgin/gtkdialogs.c:86
 msgid "support"
 msgstr "支援"
 
-#: ../pidgin/gtkdialogs.c:86
+#: ../pidgin/gtkdialogs.c:87
 msgid "support/QA"
 msgstr "支援兼品管"
 
@@ -12682,7 +13269,7 @@
 msgstr "阿拉伯文"
 
 #: ../pidgin/gtkdialogs.c:125 ../pidgin/gtkdialogs.c:126
-#: ../pidgin/gtkdialogs.c:209
+#: ../pidgin/gtkdialogs.c:211
 msgid "Bulgarian"
 msgstr "保加利亞文"
 
@@ -12698,8 +13285,8 @@
 msgstr "波希尼亞文"
 
 #  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
+#: ../pidgin/gtkdialogs.c:132 ../pidgin/gtkdialogs.c:212
+#: ../pidgin/gtkdialogs.c:213
 msgid "Catalan"
 msgstr "加泰隆文"
 
@@ -12708,7 +13295,7 @@
 msgid "Valencian-Catalan"
 msgstr "瓦倫西亞文"
 
-#: ../pidgin/gtkdialogs.c:135 ../pidgin/gtkdialogs.c:212
+#: ../pidgin/gtkdialogs.c:135 ../pidgin/gtkdialogs.c:214
 msgid "Czech"
 msgstr "捷克文"
 
@@ -12717,7 +13304,7 @@
 msgstr "丹麥文"
 
 #: ../pidgin/gtkdialogs.c:138 ../pidgin/gtkdialogs.c:139
-#: ../pidgin/gtkdialogs.c:213
+#: ../pidgin/gtkdialogs.c:215
 msgid "German"
 msgstr "德文"
 
@@ -12749,9 +13336,9 @@
 msgid "Esperanto"
 msgstr "世界語"
 
-#: ../pidgin/gtkdialogs.c:149 ../pidgin/gtkdialogs.c:214
-#: ../pidgin/gtkdialogs.c:215 ../pidgin/gtkdialogs.c:216
-#: ../pidgin/gtkdialogs.c:217
+#: ../pidgin/gtkdialogs.c:149 ../pidgin/gtkdialogs.c:216
+#: ../pidgin/gtkdialogs.c:217 ../pidgin/gtkdialogs.c:218
+#: ../pidgin/gtkdialogs.c:219
 msgid "Spanish"
 msgstr "西班牙文"
 
@@ -12764,14 +13351,14 @@
 msgid "Persian"
 msgstr "波斯文"
 
-#: ../pidgin/gtkdialogs.c:155 ../pidgin/gtkdialogs.c:218
-#: ../pidgin/gtkdialogs.c:219
+#: ../pidgin/gtkdialogs.c:155 ../pidgin/gtkdialogs.c:220
+#: ../pidgin/gtkdialogs.c:221
 msgid "Finnish"
 msgstr "芬蘭文"
 
-#: ../pidgin/gtkdialogs.c:156 ../pidgin/gtkdialogs.c:220
-#: ../pidgin/gtkdialogs.c:221 ../pidgin/gtkdialogs.c:222
-#: ../pidgin/gtkdialogs.c:223
+#: ../pidgin/gtkdialogs.c:156 ../pidgin/gtkdialogs.c:222
+#: ../pidgin/gtkdialogs.c:223 ../pidgin/gtkdialogs.c:224
+#: ../pidgin/gtkdialogs.c:225
 msgid "French"
 msgstr "法文"
 
@@ -12789,7 +13376,7 @@
 msgid "Gujarati Language Team"
 msgstr "古吉拉特文翻譯小組"
 
-#: ../pidgin/gtkdialogs.c:160 ../pidgin/gtkdialogs.c:224
+#: ../pidgin/gtkdialogs.c:160 ../pidgin/gtkdialogs.c:226
 msgid "Hebrew"
 msgstr "希伯來文"
 
@@ -12811,16 +13398,16 @@
 #  NOTE 臺灣的中國圖書分類法亦有「意大利」條,譯「意大利」應該比較好。
 #  NOTE【參見「Slovenian」】
 #  NOTE 註:因 zh_TW 和 zh_HK 正式分家,還原成台式譯法「義大利」
-#: ../pidgin/gtkdialogs.c:164 ../pidgin/gtkdialogs.c:225
+#: ../pidgin/gtkdialogs.c:164 ../pidgin/gtkdialogs.c:227
 msgid "Italian"
 msgstr "義大利文"
 
-#: ../pidgin/gtkdialogs.c:165 ../pidgin/gtkdialogs.c:226
-#: ../pidgin/gtkdialogs.c:227 ../pidgin/gtkdialogs.c:228
+#: ../pidgin/gtkdialogs.c:165 ../pidgin/gtkdialogs.c:228
+#: ../pidgin/gtkdialogs.c:229 ../pidgin/gtkdialogs.c:230
 msgid "Japanese"
 msgstr "日文"
 
-#: ../pidgin/gtkdialogs.c:166 ../pidgin/gtkdialogs.c:229
+#: ../pidgin/gtkdialogs.c:166 ../pidgin/gtkdialogs.c:231
 msgid "Georgian"
 msgstr "喬治亞文"
 
@@ -12839,7 +13426,7 @@
 msgid "Kannada Translation team"
 msgstr "康納達文翻譯小組"
 
-#: ../pidgin/gtkdialogs.c:168 ../pidgin/gtkdialogs.c:230
+#: ../pidgin/gtkdialogs.c:168 ../pidgin/gtkdialogs.c:232
 msgid "Korean"
 msgstr "韓文"
 
@@ -12850,13 +13437,14 @@
 msgid "Kurdish"
 msgstr "庫德文"
 
-#: ../pidgin/gtkdialogs.c:172 ../pidgin/gtkdialogs.c:231
-#: ../pidgin/gtkdialogs.c:232
+#: ../pidgin/gtkdialogs.c:172 ../pidgin/gtkdialogs.c:233
+#: ../pidgin/gtkdialogs.c:234
 msgid "Lithuanian"
 msgstr "立陶宛文"
 
 #  NOTE「馬其頓文」是一種東歐語文,跟希臘的馬其頓並無關係
-#: ../pidgin/gtkdialogs.c:173
+#: ../pidgin/gtkdialogs.c:173 ../pidgin/gtkdialogs.c:174
+#: ../pidgin/gtkdialogs.c:235
 msgid "Macedonian"
 msgstr "馬其頓文"
 
@@ -12865,56 +13453,56 @@
 #  NOTE 其他譯法包括:丹麥-挪威文(大英百科)、丹麥式挪威文(維基百科)、東挪威文、標準挪威文(國內不是標準,國外是 :P)
 #  NOTE 譯音一般放在「挪威文」後的括弧內,也有不用括弧把譯音放在「挪威」和「文」之間
 #  NOTE 採用「標準」一詞,參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=N&page=2
-#: ../pidgin/gtkdialogs.c:174
+#: ../pidgin/gtkdialogs.c:175
 msgid "Bokmål Norwegian"
 msgstr "標準挪威文"
 
-#: ../pidgin/gtkdialogs.c:175
+#: ../pidgin/gtkdialogs.c:176
 msgid "Nepali"
 msgstr "尼泊爾文"
 
 # NOTE Flemish 譯法是跟了http://www.ee.tku.edu.tw/~rexchen/cdict/
 # XXX Dutch 和 Flemish 是同一種語言,是否應該只寫「荷蘭文」,刪去「法蘭德斯文」?
-#: ../pidgin/gtkdialogs.c:176
+#: ../pidgin/gtkdialogs.c:177
 msgid "Dutch, Flemish"
 msgstr "荷蘭文/法蘭德斯文"
 
 #  NOTE 這是「nn」碼,即「Nynorsk Norwegian」,所以直譯「挪威文」並不恰當
-#: ../pidgin/gtkdialogs.c:177
+#: ../pidgin/gtkdialogs.c:178
 msgid "Norwegian"
 msgstr "新挪威文"
 
-#: ../pidgin/gtkdialogs.c:178 ../pidgin/gtkdialogs.c:179
-#: ../pidgin/gtkdialogs.c:180 ../pidgin/gtkdialogs.c:233
+#: ../pidgin/gtkdialogs.c:179 ../pidgin/gtkdialogs.c:180
+#: ../pidgin/gtkdialogs.c:181 ../pidgin/gtkdialogs.c:236
 msgid "Polish"
 msgstr "波蘭文"
 
-#: ../pidgin/gtkdialogs.c:181
+#: ../pidgin/gtkdialogs.c:182
 msgid "Portuguese"
 msgstr "標準萄文"
 
-#: ../pidgin/gtkdialogs.c:182
+#: ../pidgin/gtkdialogs.c:183
 msgid "Portuguese-Brazil"
 msgstr "巴西萄文"
 
 #  NOTE「普什圖」在三地都看來是較正常的譯法
 #  NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=P&page=2
-#: ../pidgin/gtkdialogs.c:183
+#: ../pidgin/gtkdialogs.c:184
 msgid "Pashto"
 msgstr "普什圖文"
 
-#: ../pidgin/gtkdialogs.c:184
+#: ../pidgin/gtkdialogs.c:185
 msgid "Romanian"
 msgstr "羅馬尼亞文"
 
-#: ../pidgin/gtkdialogs.c:185 ../pidgin/gtkdialogs.c:234
-#: ../pidgin/gtkdialogs.c:235
+#: ../pidgin/gtkdialogs.c:186 ../pidgin/gtkdialogs.c:237
+#: ../pidgin/gtkdialogs.c:238
 msgid "Russian"
 msgstr "俄文"
 
-#: ../pidgin/gtkdialogs.c:186 ../pidgin/gtkdialogs.c:187
-#: ../pidgin/gtkdialogs.c:236 ../pidgin/gtkdialogs.c:237
-#: ../pidgin/gtkdialogs.c:238
+#: ../pidgin/gtkdialogs.c:187 ../pidgin/gtkdialogs.c:188
+#: ../pidgin/gtkdialogs.c:239 ../pidgin/gtkdialogs.c:240
+#: ../pidgin/gtkdialogs.c:241
 msgid "Slovak"
 msgstr "斯洛伐克文"
 
@@ -12922,73 +13510,74 @@
 #  NOTE 以粵語發音,跟臺譯反而發音較準;況且,這至少名義上也是zh_TW;
 #  NOTE 所以不跟港譯(其實是大陸譯法),跟臺譯。
 #  NOTE【參見「Italian」】
-#: ../pidgin/gtkdialogs.c:188 ../pidgin/gtkdialogs.c:239
+#: ../pidgin/gtkdialogs.c:189 ../pidgin/gtkdialogs.c:242
 msgid "Slovenian"
 msgstr "斯洛維尼亞文"
 
-#: ../pidgin/gtkdialogs.c:189
+#: ../pidgin/gtkdialogs.c:190
 msgid "Albanian"
 msgstr "阿爾巴尼亞文"
 
-#: ../pidgin/gtkdialogs.c:190 ../pidgin/gtkdialogs.c:191
+#: ../pidgin/gtkdialogs.c:191 ../pidgin/gtkdialogs.c:192
 msgid "Serbian"
 msgstr "塞爾維亞文"
 
-#: ../pidgin/gtkdialogs.c:192 ../pidgin/gtkdialogs.c:240
+#: ../pidgin/gtkdialogs.c:193 ../pidgin/gtkdialogs.c:243
 msgid "Swedish"
 msgstr "瑞典文"
 
 # NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=T
 # NOTE 港一般譯「泰米爾」,台一般譯「塔米爾」(看來較常見)或「泰米爾」
-#: ../pidgin/gtkdialogs.c:193
+#: ../pidgin/gtkdialogs.c:194
 msgid "Tamil"
 msgstr "坦米爾文"
 
 # NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=T
-#: ../pidgin/gtkdialogs.c:194
+#: ../pidgin/gtkdialogs.c:195
 msgid "Telugu"
 msgstr "德拉威文"
 
-#: ../pidgin/gtkdialogs.c:195
+#: ../pidgin/gtkdialogs.c:196
 msgid "Thai"
 msgstr "泰文"
 
-#: ../pidgin/gtkdialogs.c:196
+#: ../pidgin/gtkdialogs.c:197 ../pidgin/gtkdialogs.c:244
 msgid "Turkish"
 msgstr "土耳其文"
 
-#: ../pidgin/gtkdialogs.c:197
+#: ../pidgin/gtkdialogs.c:198
 msgid "Vietnamese"
 msgstr "越南文"
 
-#: ../pidgin/gtkdialogs.c:197
+#: ../pidgin/gtkdialogs.c:198
 msgid "T.M.Thanh and the Gnome-Vi Team"
 msgstr "T.M.Thanh 及 Gnome 越南文翻譯小組之其他組員"
 
-#: ../pidgin/gtkdialogs.c:198 ../pidgin/gtkdialogs.c:241
+#: ../pidgin/gtkdialogs.c:199 ../pidgin/gtkdialogs.c:245
 msgid "Simplified Chinese"
 msgstr "簡體中文"
 
-#: ../pidgin/gtkdialogs.c:199 ../pidgin/gtkdialogs.c:200
+#: ../pidgin/gtkdialogs.c:200 ../pidgin/gtkdialogs.c:201
+#: ../pidgin/gtkdialogs.c:202
 msgid "Hong Kong Chinese"
 msgstr "港式中文"
 
-#: ../pidgin/gtkdialogs.c:201 ../pidgin/gtkdialogs.c:202
-#: ../pidgin/gtkdialogs.c:242
+#: ../pidgin/gtkdialogs.c:203 ../pidgin/gtkdialogs.c:204
+#: ../pidgin/gtkdialogs.c:246
 msgid "Traditional Chinese"
 msgstr "正體中文"
 
 # NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=A
-#: ../pidgin/gtkdialogs.c:208
+#: ../pidgin/gtkdialogs.c:210
 msgid "Amharic"
 msgstr "阿姆哈拉文"
 
-#: ../pidgin/gtkdialogs.c:327
+#: ../pidgin/gtkdialogs.c:331
 #, c-format
 msgid "About %s"
 msgstr "關於 %s"
 
-#: ../pidgin/gtkdialogs.c:365
+#: ../pidgin/gtkdialogs.c:369
 #, c-format
 msgid ""
 "%s is a graphical modular messaging client based on libpurple which is "
@@ -13008,17 +13597,12 @@
 "部貢獻者共同所有,貢獻者芳名詳列在名為「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: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:390
+#: ../pidgin/gtkdialogs.c:389
 msgid "Current Developers"
 msgstr "現任開發者"
 
@@ -13026,80 +13610,80 @@
 # NOTE Luke Schierer 說:「這些人一個是瘋了,否則不會為 gaim 賣力」
 # NOTE 所以正確的譯文應是「瘋癲的模組作者」或者「模組的瘋癲作者」之類……
 # NOTE 不過這樣好像有點過份,所以翻成「狂熱的模組作者」會比較好 :P
-#: ../pidgin/gtkdialogs.c:405
+#: ../pidgin/gtkdialogs.c:404
 msgid "Crazy Patch Writers"
 msgstr "狂熱的模組作者"
 
-#: ../pidgin/gtkdialogs.c:420
+#: ../pidgin/gtkdialogs.c:419
 msgid "Retired Developers"
 msgstr "前任開發者"
 
 #  NOTE 可譯「美工人員」,但那是很保守的譯法;Pidgin 的 Artist 是做設計圖示、重新整理介面等等這些很難做的工作的人,所以很明顯是「設計員」
-#: ../pidgin/gtkdialogs.c:435
+#: ../pidgin/gtkdialogs.c:434
 msgid "Artists"
 msgstr "平面設計"
 
-#: ../pidgin/gtkdialogs.c:450
+#: ../pidgin/gtkdialogs.c:449
 msgid "Current Translators"
 msgstr "現任譯者"
 
-#: ../pidgin/gtkdialogs.c:470
+#: ../pidgin/gtkdialogs.c:469
 msgid "Past Translators"
 msgstr "前任譯者"
 
 # NOTE 這是「關於 Pidgin」視窗中,最後出現,用來作除錯用的各種資訊,不能譯成「訊息」
-#: ../pidgin/gtkdialogs.c:488
+#: ../pidgin/gtkdialogs.c:487
 msgid "Debugging Information"
 msgstr "除錯專用資訊"
 
-#: ../pidgin/gtkdialogs.c:857
+#: ../pidgin/gtkdialogs.c:865
 msgid "Get User Info"
 msgstr "取得使用者資訊"
 
-#: ../pidgin/gtkdialogs.c:859
+#: ../pidgin/gtkdialogs.c:867
 msgid ""
 "Please enter the screen name or alias of the person whose info you would "
 "like to view."
 msgstr "請輸入您所想要查詢對象的帳號。"
 
-#: ../pidgin/gtkdialogs.c:949
+#: ../pidgin/gtkdialogs.c:957
 msgid "View User Log"
 msgstr "觀看使用者日誌"
 
-#: ../pidgin/gtkdialogs.c:951
+#: ../pidgin/gtkdialogs.c:959
 msgid ""
 "Please enter the screen name or alias of the person whose log you would like "
 "to view."
 msgstr "請輸入您所想要讀取日誌的使用者的帳號或別名。"
 
 # XXX 中文譯文無法分別出「Alias Buddy」和「Alias Contact」
-#: ../pidgin/gtkdialogs.c:971
+#: ../pidgin/gtkdialogs.c:979
 msgid "Alias Contact"
 msgstr "為這組好友加上別名"
 
 # XXX 中文譯文無法分別出「Alias Buddy」和「Alias Contact」
-#: ../pidgin/gtkdialogs.c:972
+#: ../pidgin/gtkdialogs.c:980
 msgid "Enter an alias for this contact."
 msgstr "請為這組好友輸入一個別名。"
 
-#: ../pidgin/gtkdialogs.c:994
+#: ../pidgin/gtkdialogs.c:1002
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "請為 %s 輸入一個別名"
 
-#: ../pidgin/gtkdialogs.c:996
+#: ../pidgin/gtkdialogs.c:1004
 msgid "Alias Buddy"
 msgstr "為這個好友加上別名"
 
-#: ../pidgin/gtkdialogs.c:1017
+#: ../pidgin/gtkdialogs.c:1025
 msgid "Alias Chat"
 msgstr "給聊天室改別名"
 
-#: ../pidgin/gtkdialogs.c:1018
+#: ../pidgin/gtkdialogs.c:1026
 msgid "Enter an alias for this chat."
 msgstr "請為這個聊天室輸入一個別名。"
 
-#: ../pidgin/gtkdialogs.c:1057
+#: ../pidgin/gtkdialogs.c:1065
 #, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddy from "
@@ -13115,32 +13699,32 @@
 "作嗎?"
 
 # XXX「Remove Buddy」和「Remove Contact」在中文版Pidgin無法析別;可能有改進的空間
-#: ../pidgin/gtkdialogs.c:1065
+#: ../pidgin/gtkdialogs.c:1073
 msgid "Remove Contact"
 msgstr "移除這組好友"
 
 # XXX「Remove Buddy」和「Remove Contact」在中文版Pidgin無法析別;可能有改進的空間
-#: ../pidgin/gtkdialogs.c:1068
+#: ../pidgin/gtkdialogs.c:1076
 msgid "_Remove Contact"
 msgstr "移除聯絡人(_R)"
 
 # TODO 譯文有待改進 - 20061025
-#: ../pidgin/gtkdialogs.c:1099
+#: ../pidgin/gtkdialogs.c:1107
 #, 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:1106
+#: ../pidgin/gtkdialogs.c:1114
 msgid "Merge Groups"
 msgstr "合併群組"
 
-#: ../pidgin/gtkdialogs.c:1109
+#: ../pidgin/gtkdialogs.c:1117
 msgid "_Merge Groups"
 msgstr "合併群組(_M)"
 
-#: ../pidgin/gtkdialogs.c:1159
+#: ../pidgin/gtkdialogs.c:1167
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
@@ -13148,42 +13732,42 @@
 msgstr ""
 "您正試著將群組 %s 及相關的成員從您的好友清單中移除。您要繼續這個動作嗎?"
 
-#: ../pidgin/gtkdialogs.c:1162
+#: ../pidgin/gtkdialogs.c:1170
 msgid "Remove Group"
 msgstr "移除群組"
 
-#: ../pidgin/gtkdialogs.c:1165
+#: ../pidgin/gtkdialogs.c:1173
 msgid "_Remove Group"
 msgstr "移除群組(_R)"
 
-#: ../pidgin/gtkdialogs.c:1198
+#: ../pidgin/gtkdialogs.c:1206
 #, c-format
 msgid ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr "您正試著將 %s  從您的好友清單中移除。您要繼續這個動作嗎?"
 
 # XXX「Remove Buddy」和「Remove Contact」在中文版Pidgin無法析別;可能有改進的空間
-#: ../pidgin/gtkdialogs.c:1201
+#: ../pidgin/gtkdialogs.c:1209
 msgid "Remove Buddy"
 msgstr "移除這個好友"
 
 # XXX「Remove Buddy」和「Remove Contact」在中文版Pidgin無法析別;可能有改進的空間
-#: ../pidgin/gtkdialogs.c:1204
+#: ../pidgin/gtkdialogs.c:1212
 msgid "_Remove Buddy"
 msgstr "移除這個好友(_R)"
 
-#: ../pidgin/gtkdialogs.c:1225
+#: ../pidgin/gtkdialogs.c:1233
 #, 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:1228
+#: ../pidgin/gtkdialogs.c:1236
 msgid "Remove Chat"
 msgstr "移除聊天室"
 
-#: ../pidgin/gtkdialogs.c:1231
+#: ../pidgin/gtkdialogs.c:1239
 msgid "_Remove Chat"
 msgstr "移除聊天室(_R)"
 
@@ -13309,44 +13893,44 @@
 msgstr "恢復(_R)"
 
 #  NOTE Nautilus譯「貼上文本」,Abiword譯「未格式化貼上」,聽來都有些怪
-#: ../pidgin/gtkimhtml.c:792
+#: ../pidgin/gtkimhtml.c:796
 msgid "Paste as Plain _Text"
 msgstr "貼上純文字(_T)"
 
-#: ../pidgin/gtkimhtml.c:809
+#: ../pidgin/gtkimhtml.c:813
 msgid "_Reset formatting"
 msgstr "清除格式化(_R)"
 
-#: ../pidgin/gtkimhtml.c:1295
+#: ../pidgin/gtkimhtml.c:1309
 msgid "Hyperlink color"
 msgstr "連結顏色"
 
-#: ../pidgin/gtkimhtml.c:1296
+#: ../pidgin/gtkimhtml.c:1310
 msgid "Color to draw hyperlinks."
 msgstr "顯示連結時所用的顏色。"
 
-#: ../pidgin/gtkimhtml.c:1299
+#: ../pidgin/gtkimhtml.c:1313
 msgid "Hyperlink prelight color"
 msgstr "連結顏色"
 
-#: ../pidgin/gtkimhtml.c:1300
+#: ../pidgin/gtkimhtml.c:1314
 msgid "Color to draw hyperlinks when mouse is over them."
 msgstr "當滑鼠經過連結時的連結顏色。"
 
-#: ../pidgin/gtkimhtml.c:1516
+#: ../pidgin/gtkimhtml.c:1530
 msgid "_Copy E-Mail Address"
 msgstr "複製電子郵件地址(_C)"
 
-#: ../pidgin/gtkimhtml.c:1528
+#: ../pidgin/gtkimhtml.c:1542
 msgid "_Open Link in Browser"
 msgstr "在瀏覽器中打開連結(_O)"
 
-#: ../pidgin/gtkimhtml.c:1538
+#: ../pidgin/gtkimhtml.c:1552
 msgid "_Copy Link Location"
 msgstr "複製連結位址(_C)"
 
 # NOTE "Defaulting to PNG" 是指 gaim 在無計可施的情況下盲猜影像是 PNG 格式
-#: ../pidgin/gtkimhtml.c:3211
+#: ../pidgin/gtkimhtml.c:3227
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -13357,7 +13941,7 @@
 "暫且當成 PNG 檔處理。"
 
 # NOTE "Defaulting to PNG" 是指 gaim 在無計可施的情況下盲猜影像是 PNG 格式
-#: ../pidgin/gtkimhtml.c:3214
+#: ../pidgin/gtkimhtml.c:3230
 msgid ""
 "Unrecognized file type\n"
 "\n"
@@ -13367,7 +13951,7 @@
 "\n"
 "暫且當成 PNG 檔處理。"
 
-#: ../pidgin/gtkimhtml.c:3227
+#: ../pidgin/gtkimhtml.c:3259
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -13378,7 +13962,7 @@
 "\n"
 "%s"
 
-#: ../pidgin/gtkimhtml.c:3230
+#: ../pidgin/gtkimhtml.c:3262
 #, c-format
 msgid ""
 "Error saving image\n"
@@ -13389,117 +13973,118 @@
 "\n"
 "%s"
 
-#: ../pidgin/gtkimhtml.c:3310 ../pidgin/gtkimhtml.c:3322
+#: ../pidgin/gtkimhtml.c:3340 ../pidgin/gtkimhtml.c:3352
 msgid "Save Image"
 msgstr "儲存影像"
 
-#: ../pidgin/gtkimhtml.c:3350
+#: ../pidgin/gtkimhtml.c:3380
 msgid "_Save Image..."
 msgstr "儲存影像(_S)..."
 
-#: ../pidgin/gtkimhtmltoolbar.c:147
+#: ../pidgin/gtkimhtmltoolbar.c:151
 msgid "Select Font"
 msgstr "選擇字型"
 
-#: ../pidgin/gtkimhtmltoolbar.c:226
+#: ../pidgin/gtkimhtmltoolbar.c:230
 msgid "Select Text Color"
 msgstr "設定文字顏色"
 
-#: ../pidgin/gtkimhtmltoolbar.c:305
+#: ../pidgin/gtkimhtmltoolbar.c:309
 msgid "Select Background Color"
 msgstr "設定背景顏色"
 
-#: ../pidgin/gtkimhtmltoolbar.c:394
+#: ../pidgin/gtkimhtmltoolbar.c:398
 msgid "_URL"
 msgstr "_URL"
 
-#: ../pidgin/gtkimhtmltoolbar.c:402
+#: ../pidgin/gtkimhtmltoolbar.c:406
 msgid "_Description"
 msgstr "描述(_D)"
 
-#: ../pidgin/gtkimhtmltoolbar.c:405
+#: ../pidgin/gtkimhtmltoolbar.c:409
 msgid ""
 "Please enter the URL and description of the link that you want to insert. "
 "The description is optional."
 msgstr "請輸入您所要插入的 URL 及它的描述,描述是選擇性的,可不用輸入。"
 
-#: ../pidgin/gtkimhtmltoolbar.c:409
+#: ../pidgin/gtkimhtmltoolbar.c:413
 msgid "Please enter the URL of the link that you want to insert."
 msgstr "請輸入您所要插入的 URL。"
 
-#: ../pidgin/gtkimhtmltoolbar.c:414
+#: ../pidgin/gtkimhtmltoolbar.c:418
 msgid "Insert Link"
 msgstr "加入連結"
 
-#: ../pidgin/gtkimhtmltoolbar.c:418
+#: ../pidgin/gtkimhtmltoolbar.c:422
 msgid "_Insert"
 msgstr "插入(_I)"
 
-#: ../pidgin/gtkimhtmltoolbar.c:487
+#: ../pidgin/gtkimhtmltoolbar.c:491
 #, c-format
 msgid "Failed to store image: %s\n"
 msgstr "無法儲存影像:%s\n"
 
-#: ../pidgin/gtkimhtmltoolbar.c:513 ../pidgin/gtkimhtmltoolbar.c:523
+#: ../pidgin/gtkimhtmltoolbar.c:517 ../pidgin/gtkimhtmltoolbar.c:527
 msgid "Insert Image"
 msgstr "插入影像"
 
 #  XXX 譯文不通順
-#: ../pidgin/gtkimhtmltoolbar.c:721
+#: ../pidgin/gtkimhtmltoolbar.c:725
 msgid "This theme has no available smileys."
 msgstr "這個表情主題不含任何表情。"
 
 #. show everything
-#: ../pidgin/gtkimhtmltoolbar.c:735
+#: ../pidgin/gtkimhtmltoolbar.c:739
 msgid "Smile!"
 msgstr "笑一個!"
 
-#: ../pidgin/gtkimhtmltoolbar.c:922 ../pidgin/plugins/convcolors.c:287
+#: ../pidgin/gtkimhtmltoolbar.c:926 ../pidgin/plugins/convcolors.c:287
 msgid "Bold"
 msgstr "粗體"
 
 # NOTE「Italic」本來是指某程度上模仿手寫、以曲線為主的字型,「斜體」其實是誤譯,但已根深蒂固,不可能改正
-#: ../pidgin/gtkimhtmltoolbar.c:933 ../pidgin/plugins/convcolors.c:294
+#: ../pidgin/gtkimhtmltoolbar.c:937 ../pidgin/plugins/convcolors.c:294
 msgid "Italic"
 msgstr "斜體"
 
-#: ../pidgin/gtkimhtmltoolbar.c:944 ../pidgin/plugins/convcolors.c:301
+#: ../pidgin/gtkimhtmltoolbar.c:948 ../pidgin/plugins/convcolors.c:301
 msgid "Underline"
 msgstr "底線"
 
-#: ../pidgin/gtkimhtmltoolbar.c:960
+#: ../pidgin/gtkimhtmltoolbar.c:964
 msgid "Larger font size"
 msgstr "放大字體"
 
-#: ../pidgin/gtkimhtmltoolbar.c:972
+#: ../pidgin/gtkimhtmltoolbar.c:976
 msgid "Smaller font size"
 msgstr "縮小字體"
 
-#: ../pidgin/gtkimhtmltoolbar.c:989
+#: ../pidgin/gtkimhtmltoolbar.c:993
 msgid "Font face"
 msgstr "字型"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1001
+#  XXX 譯「文字顏色」會否較好? - acli 20070614
+#: ../pidgin/gtkimhtmltoolbar.c:1005
 msgid "Foreground font color"
 msgstr "前景顏色"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1013
+#: ../pidgin/gtkimhtmltoolbar.c:1017
 msgid "Background color"
 msgstr "背景顏色"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1029
+#: ../pidgin/gtkimhtmltoolbar.c:1033
 msgid "Reset formatting"
 msgstr "清除格式化"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1044
+#: ../pidgin/gtkimhtmltoolbar.c:1048
 msgid "Insert link"
 msgstr "插入連結"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1054
+#: ../pidgin/gtkimhtmltoolbar.c:1058
 msgid "Insert image"
 msgstr "插入影像"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1065
+#: ../pidgin/gtkimhtmltoolbar.c:1069
 msgid "Insert smiley"
 msgstr "插入表情"
 
@@ -13587,13 +14172,13 @@
 msgid "System Log"
 msgstr "系統日誌"
 
-#: ../pidgin/gtkmain.c:373
+#: ../pidgin/gtkmain.c:368
 #, c-format
 msgid "%s %s. Try `%s -h' for more information.\n"
 msgstr "%s %s。執行「%s -h」以獲得更進一步的資訊。\n"
 
 #  FIXME
-#: ../pidgin/gtkmain.c:375
+#: ../pidgin/gtkmain.c:370
 #, c-format
 msgid ""
 "%s %s\n"
@@ -13618,7 +14203,7 @@
 "哪些帳號,並使用逗號分隔) \n"
 "  -v, --version       顯示版本訊息並離開\n"
 
-#: ../pidgin/gtkmain.c:493
+#: ../pidgin/gtkmain.c:490
 #, c-format
 msgid ""
 "%s has segfaulted and attempted to dump a core file.\n"
@@ -13814,7 +14399,7 @@
 msgstr "預覽(_V)"
 
 #: ../pidgin/gtkpounce.c:786
-msgid "P_ounce only when my status is not available"
+msgid "P_ounce only when my status is not Available"
 msgstr "只在我的狀態不為「上線」時啟用(_O)"
 
 #: ../pidgin/gtkpounce.c:791
@@ -13850,7 +14435,7 @@
 msgid "_Show system tray icon:"
 msgstr "顯示系統工作匣圖示(_S):"
 
-#: ../pidgin/gtkprefs.c:819 ../pidgin/gtkprefs.c:831 ../pidgin/gtkprefs.c:1648
+#: ../pidgin/gtkprefs.c:819 ../pidgin/gtkprefs.c:831 ../pidgin/gtkprefs.c:1686
 #: ../pidgin/plugins/timestamp_format.c:42
 #: ../pidgin/plugins/timestamp_format.c:51
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:338
@@ -13869,7 +14454,7 @@
 msgid "_Hide new IM conversations:"
 msgstr "隱藏新的即時訊息交談(_H):"
 
-#: ../pidgin/gtkprefs.c:830 ../pidgin/gtkprefs.c:1828
+#: ../pidgin/gtkprefs.c:830 ../pidgin/gtkprefs.c:1867
 msgid "When away"
 msgstr "離開期間"
 
@@ -13918,160 +14503,177 @@
 msgid "N_ew conversations:"
 msgstr "新交談(_E):"
 
-#: ../pidgin/gtkprefs.c:900
+#: ../pidgin/gtkprefs.c:917
 msgid "Show _formatting on incoming messages"
 msgstr "顯示所收訊息的格式化(_F)"
 
-#: ../pidgin/gtkprefs.c:903
+#: ../pidgin/gtkprefs.c:920
 msgid "Show buddy _icons"
 msgstr "顯示好友圖示(_I)"
 
-#: ../pidgin/gtkprefs.c:905
+#: ../pidgin/gtkprefs.c:922
 msgid "Enable buddy ic_on animation"
 msgstr "啟動好友圖示動畫(_O)"
 
-#: ../pidgin/gtkprefs.c:912
+#: ../pidgin/gtkprefs.c:929
 msgid "_Notify buddies that you are typing to them"
 msgstr "通知您的好友您正在發訊息給他們(_N)"
 
-#: ../pidgin/gtkprefs.c:915
+#: ../pidgin/gtkprefs.c:932
 msgid "Highlight _misspelled words"
 msgstr "標示出拼錯的字(_M)"
 
-#: ../pidgin/gtkprefs.c:919
+#: ../pidgin/gtkprefs.c:936
 msgid "Use smooth-scrolling"
 msgstr "使用平滑捲軸"
 
-#: ../pidgin/gtkprefs.c:922
+#: ../pidgin/gtkprefs.c:939
 msgid "F_lash window when IMs are received"
 msgstr "收到即時訊息後閃動視窗(_F)"
 
-#: ../pidgin/gtkprefs.c:925
+#: ../pidgin/gtkprefs.c:943
+msgid "Font"
+msgstr "字型"
+
+#  XXX 要覆查 - acli 20070614
+#: ../pidgin/gtkprefs.c:945
+msgid "Use document font from _theme"
+msgstr "使用主題指定的文件字型(_T)"
+
+#: ../pidgin/gtkprefs.c:947
+msgid "Use font from _theme"
+msgstr "使用主題指定的字型(_T)"
+
+#: ../pidgin/gtkprefs.c:949
+msgid "Conversation _font:"
+msgstr "交談用的字型(_F):"
+
+#: ../pidgin/gtkprefs.c:962
 msgid "Default Formatting"
 msgstr "預設格式"
 
 # NOTE 這不是說明文,而是樣本本身,玩死人了 :P
-#: ../pidgin/gtkprefs.c:941
+#: ../pidgin/gtkprefs.c:978
 msgid ""
 "This is how your outgoing message text will appear when you use protocols "
 "that support formatting. :)"
 msgstr ""
 "這是一個樣本。假如您使用的協定支援格式化,送出訊息的式樣將會類似這段文字。"
 
-#: ../pidgin/gtkprefs.c:1017
+#: ../pidgin/gtkprefs.c:1054
 msgid "ST_UN server:"
 msgstr "STUN 伺服器(_U):"
 
-#: ../pidgin/gtkprefs.c:1029
+#: ../pidgin/gtkprefs.c:1066
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">例:stunserver.org</span>"
 
-#: ../pidgin/gtkprefs.c:1033
+#: ../pidgin/gtkprefs.c:1070
 msgid "_Autodetect IP address"
 msgstr "自動偵測 IP 位址(_A)"
 
-#: ../pidgin/gtkprefs.c:1042
+#: ../pidgin/gtkprefs.c:1079
 msgid "Public _IP:"
 msgstr "公共IP (_I):"
 
-#: ../pidgin/gtkprefs.c:1071
+#: ../pidgin/gtkprefs.c:1108
 msgid "Ports"
 msgstr "通訊埠"
 
-#: ../pidgin/gtkprefs.c:1074
+#: ../pidgin/gtkprefs.c:1111
 msgid "_Manually specify range of ports to listen on"
 msgstr "自定通訊埠監聽範圍(_M)"
 
-#: ../pidgin/gtkprefs.c:1077
+#: ../pidgin/gtkprefs.c:1114
 msgid "_Start port:"
 msgstr "啟始通訊埠(_S):"
 
-#: ../pidgin/gtkprefs.c:1084
+#: ../pidgin/gtkprefs.c:1121
 msgid "_End port:"
 msgstr "結束通訊埠(_E):"
 
-#: ../pidgin/gtkprefs.c:1092
+#: ../pidgin/gtkprefs.c:1129
 msgid "Proxy Server"
 msgstr "代理伺服器"
 
 # NOTE 理由同前,不用「毋須」,改為「不使用」
-#: ../pidgin/gtkprefs.c:1096
+#: ../pidgin/gtkprefs.c:1133
 msgid "No proxy"
 msgstr "不使用代理伺服器"
 
-#: ../pidgin/gtkprefs.c:1152
+#: ../pidgin/gtkprefs.c:1189
 msgid "_User:"
 msgstr "使用者(_U):"
 
-#: ../pidgin/gtkprefs.c:1216
+#: ../pidgin/gtkprefs.c:1253
 msgid "Seamonkey"
 msgstr "Seamonkey"
 
-#: ../pidgin/gtkprefs.c:1217
+#: ../pidgin/gtkprefs.c:1254
 msgid "Opera"
 msgstr "Opera"
 
-#: ../pidgin/gtkprefs.c:1218
+#: ../pidgin/gtkprefs.c:1255
 msgid "Netscape"
 msgstr "Netscape"
 
-#: ../pidgin/gtkprefs.c:1219
+#: ../pidgin/gtkprefs.c:1256
 msgid "Mozilla"
 msgstr "Mozilla"
 
-#: ../pidgin/gtkprefs.c:1220
+#: ../pidgin/gtkprefs.c:1257
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: ../pidgin/gtkprefs.c:1221
+#: ../pidgin/gtkprefs.c:1258
 msgid "GNOME Default"
 msgstr "GNOME預設"
 
-#: ../pidgin/gtkprefs.c:1222
+#: ../pidgin/gtkprefs.c:1259
 msgid "Galeon"
 msgstr "Galeon"
 
-#: ../pidgin/gtkprefs.c:1223
+#: ../pidgin/gtkprefs.c:1260
 msgid "Firefox"
 msgstr "Firefox"
 
-#: ../pidgin/gtkprefs.c:1224
+#: ../pidgin/gtkprefs.c:1261
 msgid "Firebird"
 msgstr "Firebird"
 
-#: ../pidgin/gtkprefs.c:1225
+#: ../pidgin/gtkprefs.c:1262
 msgid "Epiphany"
 msgstr "Epiphany"
 
-#: ../pidgin/gtkprefs.c:1234
+#: ../pidgin/gtkprefs.c:1271
 msgid "Manual"
 msgstr "使用者自定"
 
-#: ../pidgin/gtkprefs.c:1287
+#: ../pidgin/gtkprefs.c:1324
 msgid "Browser Selection"
 msgstr "選擇瀏覽器"
 
-#: ../pidgin/gtkprefs.c:1291
+#: ../pidgin/gtkprefs.c:1328
 msgid "_Browser:"
 msgstr "瀏覽器(_B):"
 
-#: ../pidgin/gtkprefs.c:1299
+#: ../pidgin/gtkprefs.c:1336
 msgid "_Open link in:"
 msgstr "在瀏覽器中打開連結(_O):"
 
-#: ../pidgin/gtkprefs.c:1301
+#: ../pidgin/gtkprefs.c:1338
 msgid "Browser default"
 msgstr "瀏覽器預設"
 
-#: ../pidgin/gtkprefs.c:1302
+#: ../pidgin/gtkprefs.c:1339
 msgid "Existing window"
 msgstr "既有的視窗"
 
-#: ../pidgin/gtkprefs.c:1304
+#: ../pidgin/gtkprefs.c:1341
 msgid "New tab"
 msgstr "新分頁"
 
-#: ../pidgin/gtkprefs.c:1318
+#: ../pidgin/gtkprefs.c:1355
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -14080,80 +14682,80 @@
 "使用者自定(_M):\n"
 "(請以 %s 代表網址)"
 
-#: ../pidgin/gtkprefs.c:1358
+#: ../pidgin/gtkprefs.c:1395
 msgid "Log _format:"
 msgstr "日誌格式(_F):"
 
-#: ../pidgin/gtkprefs.c:1363
+#: ../pidgin/gtkprefs.c:1400
 msgid "Log all _instant messages"
 msgstr "記錄所有即時訊息(_I)"
 
-#: ../pidgin/gtkprefs.c:1365
+#: ../pidgin/gtkprefs.c:1402
 msgid "Log all c_hats"
 msgstr "記錄所有聊天內容(_H)"
 
-#: ../pidgin/gtkprefs.c:1367
+#: ../pidgin/gtkprefs.c:1404
 msgid "Log all _status changes to system log"
 msgstr "記錄所有狀態改變至系統日誌(_S)"
 
-#: ../pidgin/gtkprefs.c:1475 ../pidgin/gtkprefs.c:1564
-#: ../pidgin/gtkprefs.c:1756
+#: ../pidgin/gtkprefs.c:1512 ../pidgin/gtkprefs.c:1601
+#: ../pidgin/gtkprefs.c:1795
 msgid "(default)"
 msgstr "(預設)"
 
-#: ../pidgin/gtkprefs.c:1513
+#: ../pidgin/gtkprefs.c:1550
 msgid "Sound Selection"
 msgstr "選取音效"
 
-#: ../pidgin/gtkprefs.c:1523
+#: ../pidgin/gtkprefs.c:1560
 msgid "Quietest"
 msgstr "最小聲"
 
-#: ../pidgin/gtkprefs.c:1525
+#: ../pidgin/gtkprefs.c:1562
 msgid "Quieter"
 msgstr "再小聲"
 
-#: ../pidgin/gtkprefs.c:1527
+#: ../pidgin/gtkprefs.c:1564
 msgid "Quiet"
 msgstr "小聲"
 
-#: ../pidgin/gtkprefs.c:1531
+#: ../pidgin/gtkprefs.c:1568
 msgid "Loud"
 msgstr "大聲"
 
-#: ../pidgin/gtkprefs.c:1533
+#: ../pidgin/gtkprefs.c:1570
 msgid "Louder"
 msgstr "再大聲"
 
-#: ../pidgin/gtkprefs.c:1535
+#: ../pidgin/gtkprefs.c:1572
 msgid "Loudest"
 msgstr "最大聲"
 
-#: ../pidgin/gtkprefs.c:1598
+#: ../pidgin/gtkprefs.c:1635
 msgid "Sound Method"
 msgstr "音效播放方式"
 
-#: ../pidgin/gtkprefs.c:1599
+#: ../pidgin/gtkprefs.c:1636
 msgid "_Method:"
 msgstr "播放方式(_M):"
 
-#: ../pidgin/gtkprefs.c:1601
+#: ../pidgin/gtkprefs.c:1638
 msgid "Console beep"
 msgstr "嗶一聲"
 
-#: ../pidgin/gtkprefs.c:1603
+#: ../pidgin/gtkprefs.c:1640
 msgid "Automatic"
 msgstr "自動"
 
-#: ../pidgin/gtkprefs.c:1606
+#: ../pidgin/gtkprefs.c:1644
 msgid "Command"
 msgstr "指令"
 
-#: ../pidgin/gtkprefs.c:1607
+#: ../pidgin/gtkprefs.c:1645
 msgid "No sounds"
 msgstr "無音效"
 
-#: ../pidgin/gtkprefs.c:1615
+#: ../pidgin/gtkprefs.c:1653
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -14162,118 +14764,118 @@
 "音效指令(_C):\n"
 "(請以 %s 代表檔名)"
 
-#: ../pidgin/gtkprefs.c:1641
+#: ../pidgin/gtkprefs.c:1679
 msgid "Sound Options"
 msgstr "音效選項"
 
-#: ../pidgin/gtkprefs.c:1642
+#: ../pidgin/gtkprefs.c:1680
 msgid "Sounds when conversation has _focus"
 msgstr "當交談取得輸入焦點發出音效(_F)"
 
-#: ../pidgin/gtkprefs.c:1644
+#: ../pidgin/gtkprefs.c:1682
 msgid "Enable sounds:"
 msgstr "啟動音效:"
 
-#: ../pidgin/gtkprefs.c:1646
+#: ../pidgin/gtkprefs.c:1684
 msgid "Only when available"
 msgstr "上線而非離開期間"
 
-#: ../pidgin/gtkprefs.c:1647
+#: ../pidgin/gtkprefs.c:1685
 msgid "Only when not available"
 msgstr "離開期間"
 
-#: ../pidgin/gtkprefs.c:1655
+#: ../pidgin/gtkprefs.c:1693
 msgid "Volume:"
 msgstr "音量:"
 
-#: ../pidgin/gtkprefs.c:1683
+#: ../pidgin/gtkprefs.c:1721
 msgid "Sound Events"
 msgstr "事件音效"
 
-#: ../pidgin/gtkprefs.c:1734
+#: ../pidgin/gtkprefs.c:1773
 msgid "Play"
 msgstr "播放"
 
-#: ../pidgin/gtkprefs.c:1741
+#: ../pidgin/gtkprefs.c:1780
 msgid "Event"
 msgstr "事件"
 
-#: ../pidgin/gtkprefs.c:1760
+#: ../pidgin/gtkprefs.c:1799
 msgid "Test"
 msgstr "測試"
 
-#: ../pidgin/gtkprefs.c:1764
+#: ../pidgin/gtkprefs.c:1803
 msgid "Reset"
 msgstr "重置"
 
-#: ../pidgin/gtkprefs.c:1768
+#: ../pidgin/gtkprefs.c:1807
 msgid "Choose..."
 msgstr "選擇..."
 
-#: ../pidgin/gtkprefs.c:1811
+#: ../pidgin/gtkprefs.c:1850
 msgid "_Report idle time:"
 msgstr "閒置時間基準(_R)"
 
-#: ../pidgin/gtkprefs.c:1816
+#: ../pidgin/gtkprefs.c:1855
 msgid "Based on keyboard or mouse use"
 msgstr "以鍵盤及滑鼠的使用為基準"
 
-#: ../pidgin/gtkprefs.c:1825
+#: ../pidgin/gtkprefs.c:1864
 msgid "_Auto-reply:"
 msgstr "何時送出自動回應:"
 
-#: ../pidgin/gtkprefs.c:1829
+#: ../pidgin/gtkprefs.c:1868
 msgid "When both away and idle"
 msgstr "當離開並同時閒置時"
 
 #. Auto-away stuff
-#: ../pidgin/gtkprefs.c:1835
+#: ../pidgin/gtkprefs.c:1874
 msgid "Auto-away"
 msgstr "自動離開"
 
-#: ../pidgin/gtkprefs.c:1837
+#: ../pidgin/gtkprefs.c:1876
 msgid "Change status when _idle"
 msgstr "閒置時更改狀態(_I)"
 
 # NOTE 譯文更動 by Ambrose
-#: ../pidgin/gtkprefs.c:1841
+#: ../pidgin/gtkprefs.c:1880
 msgid "_Minutes before changing status:"
 msgstr "閒置多少分鐘設為離開(_M):"
 
-#: ../pidgin/gtkprefs.c:1849
+#: ../pidgin/gtkprefs.c:1888
 msgid "Change _status to:"
 msgstr "更改狀態為(_S):"
 
 #. Signon status stuff
-#: ../pidgin/gtkprefs.c:1870
+#: ../pidgin/gtkprefs.c:1909
 msgid "Status at Startup"
 msgstr "啟動時狀態"
 
-#: ../pidgin/gtkprefs.c:1872
+#: ../pidgin/gtkprefs.c:1911
 msgid "Use status from last _exit at startup"
 msgstr "使用上次結束前的狀態"
 
-#: ../pidgin/gtkprefs.c:1878
+#: ../pidgin/gtkprefs.c:1917
 msgid "Status to a_pply at startup:"
 msgstr "啟動時套用的狀態:"
 
-#: ../pidgin/gtkprefs.c:1916
+#: ../pidgin/gtkprefs.c:1955
 msgid "Interface"
 msgstr "介面"
 
-#: ../pidgin/gtkprefs.c:1918
+#: ../pidgin/gtkprefs.c:1957
 msgid "Smiley Themes"
 msgstr "表情主題"
 
-#: ../pidgin/gtkprefs.c:1919
+#: ../pidgin/gtkprefs.c:1958
 msgid "Sounds"
 msgstr "音效"
 
-#: ../pidgin/gtkprefs.c:1925
+#: ../pidgin/gtkprefs.c:1964
 msgid "Browser"
 msgstr "瀏覽器"
 
-#: ../pidgin/gtkprefs.c:1929
+#: ../pidgin/gtkprefs.c:1968
 msgid "Status / Idle"
 msgstr "狀態/閒置"
 
@@ -14362,23 +14964,23 @@
 msgid "Apply"
 msgstr "套用"
 
-#: ../pidgin/gtkrequest.c:1481
+#: ../pidgin/gtkrequest.c:1482
 msgid "That file already exists"
 msgstr "那個檔案已經存在"
 
-#: ../pidgin/gtkrequest.c:1482
+#: ../pidgin/gtkrequest.c:1483
 msgid "Would you like to overwrite it?"
 msgstr "您要覆蓋它嗎?"
 
-#: ../pidgin/gtkrequest.c:1485
+#: ../pidgin/gtkrequest.c:1486
 msgid "Overwrite"
 msgstr "覆寫"
 
-#: ../pidgin/gtkrequest.c:1486
+#: ../pidgin/gtkrequest.c:1487
 msgid "Choose New Name"
 msgstr "選取新名稱"
 
-#: ../pidgin/gtkrequest.c:1624 ../pidgin/gtkrequest.c:1638
+#: ../pidgin/gtkrequest.c:1625 ../pidgin/gtkrequest.c:1639
 msgid "Select Folder..."
 msgstr "選擇資料匣..."
 
@@ -14402,7 +15004,7 @@
 msgstr "您確定您要刪除被選取的狀態?"
 
 #. Use button
-#: ../pidgin/gtksavedstatuses.c:580 ../pidgin/gtksavedstatuses.c:1214
+#: ../pidgin/gtksavedstatuses.c:580 ../pidgin/gtksavedstatuses.c:1213
 msgid "_Use"
 msgstr "使用(_U)"
 
@@ -14415,25 +15017,25 @@
 msgid "Different"
 msgstr "差異"
 
-#: ../pidgin/gtksavedstatuses.c:1107
+#: ../pidgin/gtksavedstatuses.c:1106
 msgid "_Title:"
 msgstr "標題(_T):"
 
-#: ../pidgin/gtksavedstatuses.c:1126 ../pidgin/gtksavedstatuses.c:1447
+#: ../pidgin/gtksavedstatuses.c:1125 ../pidgin/gtksavedstatuses.c:1446
 msgid "_Status:"
 msgstr "狀態(_S):"
 
 #. Different status message expander
-#: ../pidgin/gtksavedstatuses.c:1158
+#: ../pidgin/gtksavedstatuses.c:1157
 msgid "Use a _different status for some accounts"
 msgstr "為部份帳號設定不同的狀態(_D)"
 
 #. Save & Use button
-#: ../pidgin/gtksavedstatuses.c:1222
+#: ../pidgin/gtksavedstatuses.c:1221
 msgid "Sa_ve & Use"
 msgstr "儲存並使用(_V)"
 
-#: ../pidgin/gtksavedstatuses.c:1428
+#: ../pidgin/gtksavedstatuses.c:1427
 #, c-format
 msgid "Status for %s"
 msgstr "狀態:%s"
@@ -14490,37 +15092,37 @@
 msgid "Waiting for network connection"
 msgstr "等待網路連線..."
 
-#: ../pidgin/gtkutils.c:516
+#: ../pidgin/gtkutils.c:593
 msgid "Google Talk"
 msgstr "Google Talk"
 
-#: ../pidgin/gtkutils.c:1372 ../pidgin/gtkutils.c:1395
+#: ../pidgin/gtkutils.c:1309 ../pidgin/gtkutils.c:1332
 #, c-format
 msgid "The following error has occurred loading %s: %s"
 msgstr "載入 %s 時發生以下錯誤:%s"
 
-#: ../pidgin/gtkutils.c:1375 ../pidgin/gtkutils.c:1397
+#: ../pidgin/gtkutils.c:1312 ../pidgin/gtkutils.c:1334
 msgid "Failed to load image"
 msgstr "讀取影像失敗"
 
-#: ../pidgin/gtkutils.c:1471
+#: ../pidgin/gtkutils.c:1408
 #, c-format
 msgid "Cannot send folder %s."
 msgstr "無法傳送目錄 %s。"
 
-#: ../pidgin/gtkutils.c:1472
+#: ../pidgin/gtkutils.c:1409
 #, c-format
 msgid ""
 "%s cannot transfer a folder. You will need to send the files within "
 "individually."
 msgstr "%s 沒有辦法傳送目錄,您需要個別傳送目錄內的檔案。"
 
-#: ../pidgin/gtkutils.c:1504 ../pidgin/gtkutils.c:1516
-#: ../pidgin/gtkutils.c:1523
+#: ../pidgin/gtkutils.c:1441 ../pidgin/gtkutils.c:1453
+#: ../pidgin/gtkutils.c:1460
 msgid "You have dragged an image"
 msgstr "您拖曳了一個影像"
 
-#: ../pidgin/gtkutils.c:1505
+#: ../pidgin/gtkutils.c:1442
 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."
@@ -14528,31 +15130,31 @@
 "您可以透過檔案傳輸、插入訊息,或者把它當成是你的好友圖示等方式,來傳送影像檔"
 "給這個使用者。"
 
-#: ../pidgin/gtkutils.c:1511 ../pidgin/gtkutils.c:1532
+#: ../pidgin/gtkutils.c:1448 ../pidgin/gtkutils.c:1468
 msgid "Set as buddy icon"
 msgstr "設為好友圖示"
 
-#: ../pidgin/gtkutils.c:1512 ../pidgin/gtkutils.c:1533
+#: ../pidgin/gtkutils.c:1449 ../pidgin/gtkutils.c:1469
 msgid "Send image file"
 msgstr "傳送影像檔"
 
-#: ../pidgin/gtkutils.c:1513 ../pidgin/gtkutils.c:1533
+#: ../pidgin/gtkutils.c:1450 ../pidgin/gtkutils.c:1469
 msgid "Insert in message"
 msgstr "插入到訊息"
 
-#: ../pidgin/gtkutils.c:1517
+#: ../pidgin/gtkutils.c:1454
 msgid "Would you like to set it as the buddy icon for this user?"
 msgstr "您要把它設為這個使用者的好友圖示嗎?"
 
-#: ../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."
-msgstr ""
-"您可以透過檔案傳輸、插入訊息,或者把它當成是你的好友圖示等方式,來傳送影像檔"
-"給這個使用者。"
-
-#: ../pidgin/gtkutils.c:1526
+#: ../pidgin/gtkutils.c:1461
+msgid ""
+"You can send this image as a file transfer, or use it as the buddy icon for "
+"this user."
+msgstr ""
+"您可以透過檔案傳輸,或者把它當成是你的好友圖示等方式,來傳送影像檔給這個使用"
+"者。"
+
+#: ../pidgin/gtkutils.c:1462
 msgid ""
 "You can insert this image into this message, or use it as the buddy icon for "
 "this user"
@@ -14565,17 +15167,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:1584
+#: ../pidgin/gtkutils.c:1520
 msgid "Cannot send launcher"
 msgstr "無法傳送啟動器"
 
-#: ../pidgin/gtkutils.c:1584
+#: ../pidgin/gtkutils.c:1520
 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:2344
+#: ../pidgin/gtkutils.c:2268
 #, c-format
 msgid ""
 "<b>File:</b> %s\n"
@@ -14586,25 +15188,25 @@
 "<b>檔案大小:</b> %s\n"
 "<b>圖像尺寸:</b> %d×%d"
 
-#: ../pidgin/gtkutils.c:2640
+#: ../pidgin/gtkutils.c:2564
 #, c-format
 msgid "The file '%s' is too large for %s.  Please try a smaller image.\n"
 msgstr "'%s' 對 %s 來說太大了。請試試小一點的影象。\n"
 
-#: ../pidgin/gtkutils.c:2642
+#: ../pidgin/gtkutils.c:2566
 msgid "Icon Error"
 msgstr "圖像錯誤"
 
-#: ../pidgin/gtkutils.c:2643
+#: ../pidgin/gtkutils.c:2567
 msgid "Could not set icon"
 msgstr "無法設定圖像"
 
-#: ../pidgin/gtkutils.c:2743
+#: ../pidgin/gtkutils.c:2667
 #, c-format
 msgid "Failed to open file '%s': %s"
 msgstr "無法開啟檔案「%s」:%s"
 
-#: ../pidgin/gtkutils.c:2792
+#: ../pidgin/gtkutils.c:2716
 #, c-format
 msgid ""
 "Failed to load image '%s': reason not known, probably a corrupt image file"
@@ -14649,6 +15251,27 @@
 msgid "_Open Mail"
 msgstr "開啟郵件(_O)"
 
+#: ../pidgin/pixmaps/emotes/default/22/default.theme.in.h:1
+msgid "Default"
+msgstr "預設"
+
+#: ../pidgin/pixmaps/emotes/default/22/default.theme.in.h:2
+msgid "Pidgin smileys"
+msgstr "Pidgin 表情圖示"
+
+#: ../pidgin/pixmaps/emotes/none/none.theme.in.h:1
+msgid "Penguin Pimps"
+msgstr ""
+
+#: ../pidgin/pixmaps/emotes/none/none.theme.in.h:2
+msgid "Selecting this disables graphical emoticons."
+msgstr "不使用表情圖示,選擇這個主題即可。"
+
+# NOTE 這個「none」是指「沒有(不使用)圖示」
+#: ../pidgin/pixmaps/emotes/none/none.theme.in.h:3
+msgid "none"
+msgstr "無"
+
 #: ../pidgin/plugins/cap/cap.c:449
 msgid "Display Statistics"
 msgstr "顯示統計資料"
@@ -14939,6 +15562,11 @@
 msgid "Select a person from your address book below, or add a new person."
 msgstr "請在下面從目錄服務選擇連絡人,或新增一個連絡人。"
 
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:554
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:307
+msgid "Group:"
+msgstr "群組:"
+
 #  NOTE 對應 evolution PO 檔之譯法,詳見上面「Local Addressbook」條
 #. "New Person" button
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:580
@@ -14974,30 +15602,30 @@
 msgid "_Associate Buddy"
 msgstr "聯結好友 (_A)"
 
-#: ../pidgin/plugins/gevolution/gevolution.c:239
-#: ../pidgin/plugins/gevolution/gevolution.c:245
+#: ../pidgin/plugins/gevolution/gevolution.c:238
+#: ../pidgin/plugins/gevolution/gevolution.c:244
 msgid "Unable to send e-mail"
 msgstr "無法送出電子郵件"
 
-#: ../pidgin/plugins/gevolution/gevolution.c:240
+#: ../pidgin/plugins/gevolution/gevolution.c:239
 msgid "The evolution executable was not found in the PATH."
 msgstr "在 PATH 裡找不到可執行的 Evolution 程式。"
 
-#: ../pidgin/plugins/gevolution/gevolution.c:246
+#: ../pidgin/plugins/gevolution/gevolution.c:245
 msgid "An e-mail address was not found for this buddy."
 msgstr "找不到與這個好友相關的電郵地址。"
 
 #  NOTE 注意!evolution 本身的譯法是「目錄服務」而非「通訊錄」
-#: ../pidgin/plugins/gevolution/gevolution.c:272
+#: ../pidgin/plugins/gevolution/gevolution.c:271
 msgid "Add to Address Book"
 msgstr "增加到通訊錄"
 
-#: ../pidgin/plugins/gevolution/gevolution.c:284
+#: ../pidgin/plugins/gevolution/gevolution.c:283
 msgid "Send E-Mail"
 msgstr "傳送電子郵件"
 
 #. Configuration frame
-#: ../pidgin/plugins/gevolution/gevolution.c:411
+#: ../pidgin/plugins/gevolution/gevolution.c:410
 msgid "Evolution Integration Configuration"
 msgstr "Evolution 整合設定"
 
@@ -15005,7 +15633,7 @@
 # NOTE (00:39:19) LSchiere: wing: apparently when adding a contact to your address book, if you fill in the screenname/im field, it is auto adding it to your list.
 # NOTE (00:39:46) LSchiere: wing: so its asking you to select what account(s) it'll be added to. now if there were an inherent correlation it would just know, but there isn't so it doesn't
 #. Label
-#: ../pidgin/plugins/gevolution/gevolution.c:414
+#: ../pidgin/plugins/gevolution/gevolution.c:413
 msgid "Select all accounts that buddies should be auto-added to."
 msgstr "請選擇新增好友至那幾個帳號。"
 
@@ -15015,7 +15643,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/gevolution/gevolution.c:526
+#: ../pidgin/plugins/gevolution/gevolution.c:525
 msgid "Evolution Integration"
 msgstr "Evolution 整合"
 
@@ -15026,8 +15654,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/gevolution/gevolution.c:529
-#: ../pidgin/plugins/gevolution/gevolution.c:531
+#: ../pidgin/plugins/gevolution/gevolution.c:528
+#: ../pidgin/plugins/gevolution/gevolution.c:530
 msgid "Provides integration with Evolution."
 msgstr "提供和 Evolution 的整合。"
 
@@ -15454,31 +16082,21 @@
 "讓您直接輸入指令對各種文字模式的通訊協定(例如 XMPP、MSN、IRC 及 TOC)進行操"
 "作。在輸入欄位輸入指令,按 Enter 後鍵送出;相關資訊會在除錯視窗顯示。"
 
-# XXX 暫譯
 #: ../pidgin/plugins/relnot.c:71
 #, c-format
-msgid "You are using %s version %s.  The current version is %s.<hr>"
-msgstr "您目前使用的 %s 版本為 %s ,最新的版本是 %s。<hr>"
-
-#: ../pidgin/plugins/relnot.c:77
-#, c-format
-msgid ""
-"<b>ChangeLog:</b>\n"
-"%s<br><br>"
-msgstr ""
-"<b>功能說明:</b>\n"
-"%s<br><br>"
-
-#: ../pidgin/plugins/relnot.c:82
-#, c-format
-msgid ""
-"You can get version %s from:<br><a href=\"http://pidgin.im/\">http://pidgin."
-"im</a>."
-msgstr ""
-"您可以由下列網址,取得最新的 %s 版:<br><a href=\"http://pidgin.im/\">http://"
-"pidgin.im</a>"
-
-#: ../pidgin/plugins/relnot.c:86 ../pidgin/plugins/relnot.c:87
+msgid ""
+"You are using %s version %s.  The current version is %s.  You can get it "
+"from <a href=\""
+msgstr ""
+"您目前使用的 %s 版本為 %s,最新的版本是 %s。新版本可由以下網址取得:<a href="
+"\""
+
+#: ../pidgin/plugins/relnot.c:78
+#, c-format
+msgid "<b>ChangeLog:</b><br>%s"
+msgstr "<b>功能說明:</b><br>%s"
+
+#: ../pidgin/plugins/relnot.c:83 ../pidgin/plugins/relnot.c:84
 msgid "New Version Available"
 msgstr "有新版本"
 
@@ -15488,19 +16106,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/relnot.c:145
+#: ../pidgin/plugins/relnot.c:142
 msgid "Release Notification"
 msgstr "新版本通知"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/relnot.c:148
+#: ../pidgin/plugins/relnot.c:145
 msgid "Checks periodically for new releases."
 msgstr "不時查看有沒有新版本。"
 
 #. *  description
-#: ../pidgin/plugins/relnot.c:150
+#: ../pidgin/plugins/relnot.c:147
 msgid ""
 "Checks periodically for new releases and notifies the user with the "
 "ChangeLog."
@@ -15791,7 +16409,7 @@
 "Provides options specific to Pidgin for Windows , such as buddy list docking."
 msgstr "提供 Windows 版 Pidgin 的相關選項,例如好友清單的停駐功能。"
 
-#: ../pidgin/plugins/xmppconsole.c:665
+#: ../pidgin/plugins/xmppconsole.c:666
 msgid "<font color='#777777'>Logged out.</font>"
 msgstr "<font color='#777777'>已登出。</font>"
 
@@ -15801,29 +16419,29 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/xmppconsole.c:745 ../pidgin/plugins/xmppconsole.c:841
-#: ../pidgin/plugins/xmppconsole.c:860
+#: ../pidgin/plugins/xmppconsole.c:746 ../pidgin/plugins/xmppconsole.c:842
+#: ../pidgin/plugins/xmppconsole.c:861
 msgid "XMPP Console"
 msgstr "XMPP 監控器"
 
-#: ../pidgin/plugins/xmppconsole.c:753
+#: ../pidgin/plugins/xmppconsole.c:754
 msgid "Account: "
 msgstr "帳號:"
 
-#: ../pidgin/plugins/xmppconsole.c:780
+#: ../pidgin/plugins/xmppconsole.c:781
 msgid "<font color='#777777'>Not connected to XMPP</font>"
 msgstr "<font color='#777777'>未有連線至 XMPP</font>"
 
 #  NOTE Jabber 的「stanza」譯「段落」,下同
-#: ../pidgin/plugins/xmppconsole.c:790
+#: ../pidgin/plugins/xmppconsole.c:791
 msgid "Insert an <iq/> stanza."
 msgstr "插入 <iq/> 段落。"
 
-#: ../pidgin/plugins/xmppconsole.c:799
+#: ../pidgin/plugins/xmppconsole.c:800
 msgid "Insert a <presence/> stanza."
 msgstr "插入 <presence/> 段落。"
 
-#: ../pidgin/plugins/xmppconsole.c:808
+#: ../pidgin/plugins/xmppconsole.c:809
 msgid "Insert a <message/> stanza."
 msgstr "插入 <message/> 段落。"
 
@@ -15831,15 +16449,105 @@
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/xmppconsole.c:863
+#: ../pidgin/plugins/xmppconsole.c:864
 msgid "Send and receive raw XMPP stanzas."
 msgstr "送出、讀取未加工的 XMPP 段落。"
 
 #. *  description
-#: ../pidgin/plugins/xmppconsole.c:865
+#: ../pidgin/plugins/xmppconsole.c:866
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr "幫助為 XMPP 伺服器或客戶端進行除錯。"
 
+#  TODO 譯文有待改進,這是意譯
+#~ msgid "Reject watching by other users"
+#~ msgstr "拒絕伺服器端的好友狀態捕捉"
+
+#~ msgid "Block invites"
+#~ msgstr "拒絕邀請"
+
+#~ msgid "Reject online status attribute requests"
+#~ msgstr "拒絕上線狀態屬性要求"
+
+#~ msgid "Alias..."
+#~ msgstr "別名..."
+
+#, fuzzy
+#~ msgid "_Font"
+#~ msgstr "字型"
+
+#, fuzzy
+#~ msgid "_Bold"
+#~ msgstr "粗體"
+
+# NOTE「Italic」本來是指某程度上模仿手寫、以曲線為主的字型,「斜體」其實是誤譯,但已根深蒂固,不可能改正
+#, fuzzy
+#~ msgid "_Italic"
+#~ msgstr "斜體"
+
+#, fuzzy
+#~ msgid "_Underline"
+#~ msgstr "底線"
+
+#, fuzzy
+#~ msgid "_Normal"
+#~ msgstr "正常"
+
+#, fuzzy
+#~ msgid "_Smaller"
+#~ msgstr "儲存(_S)"
+
+#, fuzzy
+#~ msgid "_Reset font"
+#~ msgstr "清除格式化(_R)"
+
+#, fuzzy
+#~ msgid "_Smiley"
+#~ msgstr "笑一個!"
+
+#, fuzzy
+#~ msgid "_Image"
+#~ msgstr "儲存影像"
+
+#, fuzzy
+#~ msgid "_Link"
+#~ msgstr "登入(_L)"
+
+#~ msgid ""
+#~ "You can get version %s from:<br><a href=\"http://pidgin.im/\">http://"
+#~ "pidgin.im</a>."
+#~ msgstr ""
+#~ "您可以由下列網址,取得最新的 %s 版:<br><a href=\"http://pidgin.im/"
+#~ "\">http://pidgin.im</a>"
+
+#~ 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."
+#~ msgstr ""
+#~ "您可以透過檔案傳輸、插入訊息,或者把它當成是你的好友圖示等方式,來傳送影像"
+#~ "檔給這個使用者。"
+
+#~ msgid "/_Help"
+#~ msgstr "說明(_H)"
+
+#~ msgid "/Help/Online _Help"
+#~ msgstr "線上說明(_H)"
+
+#~ msgid "/Help/_About"
+#~ msgstr "/說明/關於(_A)"
+
+#~ msgid ""
+#~ "%s was disconnected due to the following error:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "%s 因下列錯誤結束了連線:\n"
+#~ "%s"
+
+#~ 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>"
+
 #~ msgid "GtkTreeView Expander Size"
 #~ msgstr "GtkTreeView 展開器大小"
 
@@ -16049,18 +16757,6 @@
 #~ "\n"
 #~ "<b>狀態:</b>頂呱呱"
 
-#~ msgid "/Conversation/Insert Lin_k..."
-#~ msgstr "/交談/插入連結(_k)..."
-
-#~ msgid "/Conversation/Insert Imag_e..."
-#~ msgstr "/交談/插入影像(_E)..."
-
-#~ msgid "/Conversation/Insert Link..."
-#~ msgstr "/交談/插入連結..."
-
-#~ msgid "/Conversation/Insert Image..."
-#~ msgstr "/交談/插入影像..."
-
 #~ msgid "<FONT SIZE=\"4\">IRC:</FONT> #wingaim on irc.freenode.net<BR><BR>"
 #~ msgstr ""
 #~ "<FONT SIZE=\"4\">IRC:</FONT> irc.freenode.net 上的 #wingaim 頻道<BR><BR>"
@@ -16239,10 +16935,6 @@
 #~ msgstr "選擇"
 
 #  XXX 要覆查
-#~ msgid "Select a number"
-#~ msgstr "選擇一個編號"
-
-#  XXX 要覆查
 #~ msgid "Faces"
 #~ msgstr "好友圖示"
 
@@ -16266,9 +16958,6 @@
 #~ msgid "Please wait for new version"
 #~ msgstr "請等待新版本推出"
 
-#~ msgid "Connection timeout!"
-#~ msgstr "連線已逾時!"
-
 # TODO 譯文有待改進 - 20061028
 #~ msgid "User info is not updated"
 #~ msgstr "無法更新使用者資訊"