diff po/zh_CN.po @ 7224:10607f37a1bc

[gaim-migrate @ 7793] Committing the latest batch of .po files, because make dist is insisting on rebuilding them every time. Ugh. committer: Tailor Script <tailor@pidgin.im>
author Christian Hammond <chipx86@chipx86.com>
date Thu, 09 Oct 2003 23:41:13 +0000
parents 2dcf205d4306
children 345f3b22ebd6
line wrap: on
line diff
--- a/po/zh_CN.po	Thu Oct 09 22:47:44 2003 +0000
+++ b/po/zh_CN.po	Thu Oct 09 23:41:13 2003 +0000
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gaim\n"
-"POT-Creation-Date: 2003-10-08 09:17-0700\n"
+"POT-Creation-Date: 2003-10-09 15:23-0700\n"
 "PO-Revision-Date: 2003-10-09 00:20+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
@@ -65,7 +65,7 @@
 msgid "Gaim - Away"
 msgstr "Gaim - 离开"
 
-#: plugins/docklet/docklet.c:114 src/gtkaccount.c:482 src/gtkaccount.c:1758
+#: plugins/docklet/docklet.c:114 src/gtkaccount.c:482 src/gtkaccount.c:1765
 msgid "Auto-login"
 msgstr "自动登录"
 
@@ -103,11 +103,11 @@
 msgstr "文件传送"
 
 #. And now for the buttons
-#: plugins/docklet/docklet.c:173 src/gtkaccount.c:1917 src/main.c:326
+#: plugins/docklet/docklet.c:173 src/gtkaccount.c:1924 src/main.c:323
 msgid "Accounts"
 msgstr "账户"
 
-#: plugins/docklet/docklet.c:174 src/gtkprefs.c:2337 src/main.c:336
+#: plugins/docklet/docklet.c:174 src/gtkprefs.c:2337 src/main.c:333
 msgid "Preferences"
 msgstr "首选项"
 
@@ -1124,7 +1124,7 @@
 #: src/protocols/oscar/oscar.c:2448 src/protocols/oscar/oscar.c:2528
 #: src/protocols/oscar/oscar.c:6114 src/protocols/oscar/oscar.c:6210
 #: src/protocols/oscar/oscar.c:6259 src/protocols/oscar/oscar.c:6339
-#: src/protocols/yahoo/yahoo.c:2234 src/request.h:852
+#: src/protocols/yahoo/yahoo.c:2232 src/request.h:852
 msgid "OK"
 msgstr "确定"
 
@@ -1132,8 +1132,8 @@
 #: src/account.c:325 src/account.c:359 src/buddy_chat.c:375
 #: src/connection.c:194 src/dialogs.c:466 src/dialogs.c:478 src/dialogs.c:491
 #: src/dialogs.c:512 src/dialogs.c:897 src/dialogs.c:1646 src/dialogs.c:1813
-#: src/dialogs.c:1856 src/dialogs.c:1993 src/gtkaccount.c:1612
-#: src/gtkaccount.c:2080 src/gtkblist.c:1139 src/gtkblist.c:3038
+#: src/dialogs.c:1856 src/dialogs.c:1993 src/gtkaccount.c:1619
+#: src/gtkaccount.c:2087 src/gtkblist.c:1139 src/gtkblist.c:3038
 #: src/gtkconn.c:147 src/gtkprivacy.c:568 src/gtkprivacy.c:581
 #: src/gtkprivacy.c:606 src/gtkprivacy.c:617 src/gtkrequest.c:203
 #: src/protocols/icq/gaim_icq.c:277 src/protocols/jabber/buddy.c:520
@@ -1146,7 +1146,7 @@
 #: src/protocols/oscar/oscar.c:6115 src/protocols/oscar/oscar.c:6211
 #: src/protocols/oscar/oscar.c:6260 src/protocols/oscar/oscar.c:6325
 #: src/protocols/oscar/oscar.c:6340 src/protocols/trepia/trepia.c:338
-#: src/protocols/yahoo/yahoo.c:2235 src/request.h:852 src/request.h:862
+#: src/protocols/yahoo/yahoo.c:2233 src/request.h:852 src/request.h:862
 msgid "Cancel"
 msgstr "取消"
 
@@ -1186,7 +1186,7 @@
 msgstr "聊天"
 
 #: src/blist.c:643 src/blist.c:816 src/blist.c:2018 src/gtkblist.c:2528
-#: src/protocols/jabber/roster.c:66 src/protocols/msn/notification.c:1136
+#: src/protocols/jabber/roster.c:66 src/protocols/msn/notification.c:1146
 msgid "Buddies"
 msgstr "好友"
 
@@ -1745,7 +1745,7 @@
 msgid "Screenname:"
 msgstr "用户名:"
 
-#: src/gtkaccount.c:464 src/main.c:310 src/protocols/irc/irc.c:161
+#: src/gtkaccount.c:464 src/main.c:307 src/protocols/irc/irc.c:161
 #: src/protocols/jabber/chat.c:55
 msgid "Password:"
 msgstr "密码:"
@@ -1780,125 +1780,125 @@
 msgstr "重置(_R)"
 
 #. Build the protocol options frame.
-#: src/gtkaccount.c:625
+#: src/gtkaccount.c:626
 #, c-format
 msgid "%s Options"
 msgstr "%s 选项"
 
 #. Use Global Proxy Settings
-#: src/gtkaccount.c:746
+#: src/gtkaccount.c:747
 msgid "Use Global Proxy Settings"
 msgstr "使用全局代理设置"
 
 #. No Proxy
-#: src/gtkaccount.c:753
+#: src/gtkaccount.c:754
 msgid "No Proxy"
 msgstr "无代理"
 
 #. HTTP
-#: src/gtkaccount.c:760
+#: src/gtkaccount.c:761
 msgid "HTTP"
 msgstr "HTTP"
 
 #. SOCKS 4
-#: src/gtkaccount.c:767
+#: src/gtkaccount.c:768
 msgid "SOCKS 4"
 msgstr "SOCKS 4"
 
 #. SOCKS 5
-#: src/gtkaccount.c:774
+#: src/gtkaccount.c:775
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
 #. Use Environmental Settings
-#: src/gtkaccount.c:781 src/gtkprefs.c:1112
+#: src/gtkaccount.c:782 src/gtkprefs.c:1112
 msgid "Use Environmental Settings"
 msgstr "使用环境设置"
 
-#: src/gtkaccount.c:814
+#: src/gtkaccount.c:815
 msgid "you can see the butterflies mating"
 msgstr ""
 
-#: src/gtkaccount.c:818
+#: src/gtkaccount.c:819
 msgid "If you look real closely"
 msgstr ""
 
-#: src/gtkaccount.c:834
+#: src/gtkaccount.c:835
 msgid "Proxy Options"
 msgstr "代理选项"
 
-#: src/gtkaccount.c:850 src/gtkprefs.c:1106
+#: src/gtkaccount.c:851 src/gtkprefs.c:1106
 msgid "Proxy _type:"
 msgstr "代理类型(_T):"
 
-#: src/gtkaccount.c:859
+#: src/gtkaccount.c:860
 msgid "_Host:"
 msgstr "主机(_H):"
 
-#: src/gtkaccount.c:863
+#: src/gtkaccount.c:864
 msgid "_Port:"
 msgstr "端口(_P):"
 
-#: src/gtkaccount.c:871
+#: src/gtkaccount.c:872
 msgid "_Username:"
 msgstr "用户名(_U):"
 
-#: src/gtkaccount.c:876
+#: src/gtkaccount.c:877
 msgid "Pa_ssword:"
 msgstr "密码(_S):"
 
-#: src/gtkaccount.c:1208
+#: src/gtkaccount.c:1215
 msgid "Add Account"
 msgstr "添加账户"
 
-#: src/gtkaccount.c:1210
+#: src/gtkaccount.c:1217
 msgid "Modify Account"
 msgstr "修改账户"
 
 #. Add the disclosure
-#: src/gtkaccount.c:1234
+#: src/gtkaccount.c:1241
 msgid "Show more options"
 msgstr "显示全部选项"
 
-#: src/gtkaccount.c:1235
+#: src/gtkaccount.c:1242
 msgid "Show fewer options"
 msgstr "显示主要选项"
 
 #. Register button
-#: src/gtkaccount.c:1262 src/protocols/jabber/jabber.c:612
+#: src/gtkaccount.c:1269 src/protocols/jabber/jabber.c:612
 msgid "Register"
 msgstr "注册"
 
-#: src/gtkaccount.c:1607
+#: src/gtkaccount.c:1614
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "您真的想要删除 %s 吗?"
 
-#: src/gtkaccount.c:1611 src/gtkrequest.c:206
+#: src/gtkaccount.c:1618 src/gtkrequest.c:206
 msgid "Delete"
 msgstr "删除"
 
-#: src/gtkaccount.c:1724
+#: src/gtkaccount.c:1731
 msgid "Screen Name"
 msgstr "用户名"
 
-#: src/gtkaccount.c:1747 src/protocols/jabber/jabber.c:866
+#: src/gtkaccount.c:1754 src/protocols/jabber/jabber.c:866
 #: src/protocols/oscar/oscar.c:2839 src/protocols/oscar/oscar.c:4527
-#: src/protocols/oscar/oscar.c:6063 src/protocols/yahoo/yahoo.c:2034
+#: src/protocols/oscar/oscar.c:6063 src/protocols/yahoo/yahoo.c:2032
 #: src/protocols/zephyr/zephyr.c:886 src/protocols/zephyr/zephyr.c:896
 msgid "Online"
 msgstr "在线"
 
-#: src/gtkaccount.c:1765
+#: src/gtkaccount.c:1772
 msgid "Protocol"
 msgstr "协议"
 
-#: src/gtkaccount.c:2055
+#: src/gtkaccount.c:2062
 #, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s%s"
 msgstr "%s%s%s%s 已经将 %s 加为好友%s%s%s"
 
-#: src/gtkaccount.c:2069
+#: src/gtkaccount.c:2076
 msgid ""
 "\n"
 "\n"
@@ -1908,16 +1908,16 @@
 "\n"
 "您是否想要将他/她添加为您的好友?"
 
-#: src/gtkaccount.c:2073
+#: src/gtkaccount.c:2080
 msgid "Gaim - Information"
 msgstr "Gaim - 信息"
 
-#: src/gtkaccount.c:2077
+#: src/gtkaccount.c:2084
 msgid "Add buddy to your list?"
 msgstr "将用户加为好友吗?"
 
-#: src/gtkaccount.c:2079 src/gtkblist.c:3037 src/gtkconv.c:1137
-#: src/gtkconv.c:3016 src/gtkconv.c:4190 src/gtkrequest.c:207
+#: src/gtkaccount.c:2086 src/gtkblist.c:3037 src/gtkconv.c:1137
+#: src/gtkconv.c:3017 src/gtkconv.c:4191 src/gtkrequest.c:207
 #: src/protocols/icq/gaim_icq.c:277 src/protocols/oscar/oscar.c:2681
 msgid "Add"
 msgstr "添加"
@@ -2241,7 +2241,7 @@
 msgid "Set an away message"
 msgstr "设置离开消息"
 
-#: src/gtkblist.c:2622 src/protocols/yahoo/yahoo.c:2168
+#: src/gtkblist.c:2622 src/protocols/yahoo/yahoo.c:2166
 msgid "Add Buddy"
 msgstr "添加好友"
 
@@ -2254,7 +2254,7 @@
 "您想要将谁加为好友?请输入他/她的用户名。您还可为好友输入别名和昵称。只要可能"
 "的话,别名将会替代用户名显示。\n"
 
-#: src/gtkblist.c:2667 src/main.c:292
+#: src/gtkblist.c:2667 src/main.c:289
 msgid "Screen Name:"
 msgstr "用户名:"
 
@@ -2363,7 +2363,7 @@
 msgstr "忽略"
 
 #. Info button
-#: src/gtkconv.c:1115 src/gtkconv.c:3039
+#: src/gtkconv.c:1115 src/gtkconv.c:3040
 msgid "Info"
 msgstr "信息"
 
@@ -2371,298 +2371,298 @@
 msgid "Get Away Msg"
 msgstr "获得离开消息"
 
-#: src/gtkconv.c:1135 src/gtkconv.c:3022 src/gtkconv.c:4175
+#: src/gtkconv.c:1135 src/gtkconv.c:3023 src/gtkconv.c:4176
 #: src/gtkrequest.c:208
 msgid "Remove"
 msgstr "删除"
 
-#: src/gtkconv.c:2247
+#: src/gtkconv.c:2248
 msgid "User is typing..."
 msgstr "用户正在打字..."
 
-#: src/gtkconv.c:2255
+#: src/gtkconv.c:2256
 msgid "User has typed something and paused"
 msgstr "用户打了几个字,停了一下"
 
 #. Build the Send As menu
-#: src/gtkconv.c:2358
+#: src/gtkconv.c:2359
 msgid "_Send As"
 msgstr "发送身份(_S)"
 
-#: src/gtkconv.c:2818
+#: src/gtkconv.c:2819
 msgid "Gaim - Save Conversation"
 msgstr "Gaim - 保存对话"
 
 #. Conversation menu
-#: src/gtkconv.c:2835
+#: src/gtkconv.c:2836
 msgid "/_Conversation"
 msgstr "/对话(_C)"
 
-#: src/gtkconv.c:2837
+#: src/gtkconv.c:2838
 msgid "/Conversation/_Save As..."
 msgstr "/对话(C)/另存为(_S)..."
 
-#: src/gtkconv.c:2839
+#: src/gtkconv.c:2840
 msgid "/Conversation/View _Log..."
 msgstr "/对话(C)/查看日志(_L)..."
 
-#: src/gtkconv.c:2843
+#: src/gtkconv.c:2844
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/对话(C)/添加好友千里眼(_P)..."
 
-#: src/gtkconv.c:2845
+#: src/gtkconv.c:2846
 msgid "/Conversation/A_lias..."
 msgstr "/对话(C)/别名(_L)..."
 
-#: src/gtkconv.c:2847
+#: src/gtkconv.c:2848
 msgid "/Conversation/_Get Info..."
 msgstr "/对话(C)/获取信息(_G)..."
 
-#: src/gtkconv.c:2849
+#: src/gtkconv.c:2850
 msgid "/Conversation/In_vite..."
 msgstr "/对话(C)/邀请(_V)..."
 
-#: src/gtkconv.c:2854
+#: src/gtkconv.c:2855
 msgid "/Conversation/Insert _URL..."
 msgstr "/对话(C)/插入 URL(_U)..."
 
-#: src/gtkconv.c:2856
+#: src/gtkconv.c:2857
 msgid "/Conversation/Insert _Image..."
 msgstr "/对话(C)/插入图像(_I)..."
 
-#: src/gtkconv.c:2861
+#: src/gtkconv.c:2862
 msgid "/Conversation/_Warn..."
 msgstr "/对话(C)/警告(_W)..."
 
-#: src/gtkconv.c:2863
+#: src/gtkconv.c:2864
 msgid "/Conversation/_Block..."
 msgstr "/对话(C)/屏蔽(_B)..."
 
-#: src/gtkconv.c:2865
+#: src/gtkconv.c:2866
 msgid "/Conversation/_Add..."
 msgstr "/对话(C)/添加(_A)..."
 
-#: src/gtkconv.c:2867
+#: src/gtkconv.c:2868
 msgid "/Conversation/_Remove..."
 msgstr "/对话(C)/删除(_R)..."
 
-#: src/gtkconv.c:2872
+#: src/gtkconv.c:2873
 msgid "/Conversation/_Close"
 msgstr "/对话(C)/关闭(_C)"
 
 #. Options
-#: src/gtkconv.c:2876
+#: src/gtkconv.c:2877
 msgid "/_Options"
 msgstr "/选项(_O)"
 
-#: src/gtkconv.c:2877
+#: src/gtkconv.c:2878
 msgid "/Options/Enable _Logging"
 msgstr "/选项(O)/允许记录日志(_L)"
 
-#: src/gtkconv.c:2878
+#: src/gtkconv.c:2879
 msgid "/Options/Enable _Sounds"
 msgstr "/选项(O)/允许声音(_S)"
 
-#: src/gtkconv.c:2918
+#: src/gtkconv.c:2919
 msgid "/Conversation/View Log..."
 msgstr "/对话(C)/查看日志(L)..."
 
-#: src/gtkconv.c:2923
+#: src/gtkconv.c:2924
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/对话(C)/添加好友千里眼(P)..."
 
-#: src/gtkconv.c:2927
+#: src/gtkconv.c:2928
 msgid "/Conversation/Alias..."
 msgstr "/对话(C)/别名(L)..."
 
-#: src/gtkconv.c:2931
+#: src/gtkconv.c:2932
 msgid "/Conversation/Get Info..."
 msgstr "/对话(C)/获取信息(G)..."
 
-#: src/gtkconv.c:2935
+#: src/gtkconv.c:2936
 msgid "/Conversation/Invite..."
 msgstr "/对话(C)/邀请(V)..."
 
-#: src/gtkconv.c:2941
+#: src/gtkconv.c:2942
 msgid "/Conversation/Insert URL..."
 msgstr "/对话(C)/插入 URL(U)..."
 
-#: src/gtkconv.c:2945
+#: src/gtkconv.c:2946
 msgid "/Conversation/Insert Image..."
 msgstr "/对话(C)/插入图像(I)..."
 
-#: src/gtkconv.c:2951
+#: src/gtkconv.c:2952
 msgid "/Conversation/Warn..."
 msgstr "/对话(C)/警告(W)..."
 
-#: src/gtkconv.c:2955
+#: src/gtkconv.c:2956
 msgid "/Conversation/Block..."
 msgstr "/对话(C)/屏蔽(B)..."
 
-#: src/gtkconv.c:2959
+#: src/gtkconv.c:2960
 msgid "/Conversation/Add..."
 msgstr "/对话(C)/添加(A)..."
 
-#: src/gtkconv.c:2963
+#: src/gtkconv.c:2964
 msgid "/Conversation/Remove..."
 msgstr "/对话(C)/删除(R)..."
 
-#: src/gtkconv.c:2969
+#: src/gtkconv.c:2970
 msgid "/Options/Enable Logging"
 msgstr "/选项(O)/允许记录(L)"
 
-#: src/gtkconv.c:2972
+#: src/gtkconv.c:2973
 msgid "/Options/Enable Sounds"
 msgstr "/选项(O)/允许声音(S)"
 
 #. From right to left...
 #. Send button
-#: src/gtkconv.c:2996 src/gtkconv.c:2998 src/gtkconv.c:3096 src/gtkconv.c:3098
-#: src/gtkconv.c:5957
+#: src/gtkconv.c:2997 src/gtkconv.c:2999 src/gtkconv.c:3097 src/gtkconv.c:3099
+#: src/gtkconv.c:5958
 msgid "Send"
 msgstr "发送"
 
-#: src/gtkconv.c:3019 src/gtkconv.c:4193
+#: src/gtkconv.c:3020 src/gtkconv.c:4194
 msgid "Add the user to your buddy list"
 msgstr "将用户加为好友"
 
-#: src/gtkconv.c:3025 src/gtkconv.c:4178
+#: src/gtkconv.c:3026 src/gtkconv.c:4179
 msgid "Remove the user from your buddy list"
 msgstr "从您的好友列表中删除该用户"
 
 #. Warn button
-#: src/gtkconv.c:3032
+#: src/gtkconv.c:3033
 msgid "Warn"
 msgstr "警告"
 
-#: src/gtkconv.c:3036
+#: src/gtkconv.c:3037
 msgid "Warn the user"
 msgstr "警告用户"
 
-#: src/gtkconv.c:3043 src/gtkconv.c:3478
+#: src/gtkconv.c:3044 src/gtkconv.c:3479
 msgid "Get the user's information"
 msgstr "获取用户信息"
 
 #. Block button
-#: src/gtkconv.c:3046 src/gtkprivacy.c:605 src/gtkprivacy.c:616
+#: src/gtkconv.c:3047 src/gtkprivacy.c:605 src/gtkprivacy.c:616
 msgid "Block"
 msgstr "屏蔽"
 
-#: src/gtkconv.c:3050
+#: src/gtkconv.c:3051
 msgid "Block the user"
 msgstr "屏蔽用户"
 
 #. Invite
-#: src/gtkconv.c:3108 src/gtkconv.c:5960
+#: src/gtkconv.c:3109 src/gtkconv.c:5961
 msgid "Invite"
 msgstr "邀请"
 
-#: src/gtkconv.c:3111
+#: src/gtkconv.c:3112
 msgid "Invite a user"
 msgstr "邀请用户"
 
-#: src/gtkconv.c:3150
+#: src/gtkconv.c:3151
 msgid "Bold"
 msgstr "粗体"
 
-#: src/gtkconv.c:3161
+#: src/gtkconv.c:3162
 msgid "Italic"
 msgstr "斜体"
 
-#: src/gtkconv.c:3172
+#: src/gtkconv.c:3173
 msgid "Underline"
 msgstr "下划线"
 
-#: src/gtkconv.c:3188
+#: src/gtkconv.c:3189
 msgid "Larger font size"
 msgstr "较大字体"
 
-#: src/gtkconv.c:3200
+#: src/gtkconv.c:3201
 msgid "Normal font size"
 msgstr "标准字体"
 
-#: src/gtkconv.c:3212
+#: src/gtkconv.c:3213
 msgid "Smaller font size"
 msgstr "较小字体"
 
-#: src/gtkconv.c:3229
+#: src/gtkconv.c:3230
 msgid "Font Face"
 msgstr "字体"
 
-#: src/gtkconv.c:3241
+#: src/gtkconv.c:3242
 msgid "Foreground font color"
 msgstr "字体颜色"
 
-#: src/gtkconv.c:3253
+#: src/gtkconv.c:3254
 msgid "Background color"
 msgstr "背景颜色"
 
-#: src/gtkconv.c:3268
+#: src/gtkconv.c:3269
 msgid "Insert image"
 msgstr "插入图像"
 
-#: src/gtkconv.c:3279
+#: src/gtkconv.c:3280
 msgid "Insert link"
 msgstr "插入链接"
 
-#: src/gtkconv.c:3290
+#: src/gtkconv.c:3291
 msgid "Insert smiley"
 msgstr "插入笑脸"
 
-#: src/gtkconv.c:3347
+#: src/gtkconv.c:3348
 msgid "Topic:"
 msgstr "话题:"
 
 #. Setup the label telling how many people are in the room.
-#: src/gtkconv.c:3398
+#: src/gtkconv.c:3399
 msgid "0 people in room"
 msgstr "聊天室里没有人"
 
-#: src/gtkconv.c:3455
+#: src/gtkconv.c:3456
 msgid "IM the user"
 msgstr "给用户发送即时消息"
 
-#: src/gtkconv.c:3467
+#: src/gtkconv.c:3468
 msgid "Ignore the user"
 msgstr "忽略用户"
 
-#: src/gtkconv.c:3961 src/server.c:1380
+#: src/gtkconv.c:3962 src/server.c:1380
 #, c-format
 msgid "<HR><BR><H3 Align=Center> ---- New Conversation @ %s ----</H3><BR>\n"
 msgstr "<HR><BR><H3 Align=Center> ---- 新对话 @ %s ----</H3><BR>\n"
 
-#: src/gtkconv.c:3965 src/server.c:1383
+#: src/gtkconv.c:3966 src/server.c:1383
 #, c-format
 msgid "---- New Conversation @ %s ----\n"
 msgstr "---- 新对话 @ %s ----\n"
 
-#: src/gtkconv.c:3998
+#: src/gtkconv.c:3999
 msgid "Close conversation"
 msgstr "关闭对话"
 
-#: src/gtkconv.c:4682 src/gtkconv.c:4714 src/gtkconv.c:4835 src/gtkconv.c:4902
+#: src/gtkconv.c:4683 src/gtkconv.c:4715 src/gtkconv.c:4836 src/gtkconv.c:4903
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "聊天室里有 %d 个人"
 
-#: src/gtkconv.c:5224
+#: src/gtkconv.c:5225
 msgid "Disable Animation"
 msgstr "禁用动画"
 
-#: src/gtkconv.c:5233
+#: src/gtkconv.c:5234
 msgid "Enable Animation"
 msgstr "启用动画"
 
-#: src/gtkconv.c:5240
+#: src/gtkconv.c:5241
 msgid "Hide Icon"
 msgstr "隐藏图标"
 
-#: src/gtkconv.c:5246
+#: src/gtkconv.c:5247
 msgid "Save Icon As..."
 msgstr "图标另存为..."
 
-#: src/gtkconv.c:5727 src/gtkconv.c:5730
+#: src/gtkconv.c:5728 src/gtkconv.c:5731
 msgid "<main>/Conversation/Close"
 msgstr "<main>/对话(C)/关闭(C)"
 
@@ -2898,7 +2898,7 @@
 msgid "Pounce When"
 msgstr "监视的事件"
 
-#: src/gtkpounce.c:457 src/main.c:342
+#: src/gtkpounce.c:457 src/main.c:339
 msgid "Sign on"
 msgstr "登入"
 
@@ -2911,7 +2911,7 @@
 msgstr "回来"
 
 #: src/gtkpounce.c:465 src/gtkprefs.c:1498 src/protocols/msn/state.c:30
-#: src/protocols/yahoo/yahoo.c:2030
+#: src/protocols/yahoo/yahoo.c:2028
 msgid "Idle"
 msgstr "瞌睡"
 
@@ -3327,7 +3327,7 @@
 msgstr "主机(_H)"
 
 #: src/gtkprefs.c:1153 src/protocols/irc/irc.c:551
-#: src/protocols/jabber/jabber.c:1087 src/protocols/msn/msn.c:1616
+#: src/protocols/jabber/jabber.c:1087 src/protocols/msn/msn.c:1617
 #: src/protocols/napster/napster.c:642 src/protocols/trepia/trepia.c:1335
 msgid "Port"
 msgstr "端口"
@@ -3565,7 +3565,7 @@
 msgstr "装入"
 
 #: src/gtkprefs.c:1780 src/protocols/jabber/jabber.c:544
-#: src/protocols/msn/msn.c:1302 src/protocols/trepia/trepia.c:392
+#: src/protocols/msn/msn.c:1303 src/protocols/trepia/trepia.c:392
 msgid "Name"
 msgstr "名称"
 
@@ -3934,20 +3934,20 @@
 msgid "%s (%s) reported that %s returned from idle @ %s"
 msgstr "%s (%s) 报告 %s 睡醒了 @ %s"
 
-#: src/main.c:151
+#: src/main.c:148
 msgid "Please enter your login."
 msgstr "请输入您的登录名。"
 
-#: src/main.c:234
+#: src/main.c:231
 msgid "<New User>"
 msgstr "<新用户>"
 
-#: src/main.c:276
+#: src/main.c:273
 msgid "Login"
 msgstr "登入"
 
 #. full help text
-#: src/main.c:553
+#: src/main.c:550
 #, c-format
 msgid ""
 "Gaim %s\n"
@@ -3979,7 +3979,7 @@
 "  -h, --help          显示帮助并退出\n"
 
 #. short message
-#: src/main.c:568
+#: src/main.c:565
 #, c-format
 msgid "Gaim %s. Try `%s -h' for more information.\n"
 msgstr "Gaim %s。试试“%s -h”查看帮助。\n"
@@ -4007,8 +4007,8 @@
 #: src/protocols/gg/gg.c:49 src/protocols/jabber/jutil.c:109
 #: src/protocols/msn/msn.c:344 src/protocols/msn/state.c:27
 #: src/protocols/msn/state.c:28 src/protocols/msn/state.c:35
-#: src/protocols/msn/state.c:36 src/protocols/yahoo/yahoo.c:2306
-#: src/protocols/yahoo/yahoo.c:2407
+#: src/protocols/msn/state.c:36 src/protocols/yahoo/yahoo.c:2304
+#: src/protocols/yahoo/yahoo.c:2405
 msgid "Available"
 msgstr "可用"
 
@@ -4023,8 +4023,8 @@
 #: src/protocols/gg/gg.c:53 src/protocols/jabber/jabber.c:871
 #: src/protocols/jabber/presence.c:88 src/protocols/oscar/oscar.c:2837
 #: src/protocols/oscar/oscar.c:4517 src/protocols/oscar/oscar.c:4544
-#: src/protocols/oscar/oscar.c:6069 src/protocols/yahoo/yahoo.c:2028
-#: src/protocols/yahoo/yahoo.c:2326 src/protocols/yahoo/yahoo.c:2417
+#: src/protocols/oscar/oscar.c:6069 src/protocols/yahoo/yahoo.c:2026
+#: src/protocols/yahoo/yahoo.c:2324 src/protocols/yahoo/yahoo.c:2415
 msgid "Invisible"
 msgstr "隐身"
 
@@ -4177,12 +4177,12 @@
 msgstr "城市"
 
 #. res[0] == username
-#: src/protocols/gg/gg.c:722 src/protocols/msn/msn.c:1240
-#: src/protocols/msn/msn.c:1482 src/protocols/napster/napster.c:387
+#: src/protocols/gg/gg.c:722 src/protocols/msn/msn.c:1241
+#: src/protocols/msn/msn.c:1483 src/protocols/napster/napster.c:387
 #: src/protocols/oscar/oscar.c:2879 src/protocols/oscar/oscar.c:3187
-#: src/protocols/toc/toc.c:498 src/protocols/yahoo/yahoo.c:2583
-#: src/protocols/yahoo/yahoo.c:2605 src/protocols/yahoo/yahoo.c:2625
-#: src/protocols/yahoo/yahoo.c:2812 src/protocols/zephyr/zephyr.c:355
+#: src/protocols/toc/toc.c:498 src/protocols/yahoo/yahoo.c:2581
+#: src/protocols/yahoo/yahoo.c:2603 src/protocols/yahoo/yahoo.c:2623
+#: src/protocols/yahoo/yahoo.c:2810 src/protocols/zephyr/zephyr.c:355
 msgid "Buddy Information"
 msgstr "好友信息"
 
@@ -4330,15 +4330,15 @@
 msgstr "用户 %s (%s%s%s%s%s) 需要您的同意。"
 
 #: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:181
-#: src/protocols/msn/notification.c:925 src/protocols/msn/notification.c:1246
-#: src/protocols/msn/notification.c:1412 src/protocols/oscar/oscar.c:2609
+#: src/protocols/msn/notification.c:935 src/protocols/msn/notification.c:1256
+#: src/protocols/msn/notification.c:1422 src/protocols/oscar/oscar.c:2609
 #: src/protocols/oscar/oscar.c:5080
 msgid "Authorize"
 msgstr "同意"
 
 #: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:182
-#: src/protocols/msn/notification.c:926 src/protocols/msn/notification.c:1248
-#: src/protocols/msn/notification.c:1414 src/protocols/oscar/oscar.c:2611
+#: src/protocols/msn/notification.c:936 src/protocols/msn/notification.c:1258
+#: src/protocols/msn/notification.c:1424 src/protocols/oscar/oscar.c:2611
 #: src/protocols/oscar/oscar.c:5081
 msgid "Deny"
 msgstr "拒绝"
@@ -4482,7 +4482,7 @@
 msgid "Username"
 msgstr "用户名"
 
-#: src/protocols/irc/msgs.c:192 src/protocols/yahoo/yahoo.c:2683
+#: src/protocols/irc/msgs.c:192 src/protocols/yahoo/yahoo.c:2681
 msgid "Realname"
 msgstr "真名"
 
@@ -4699,7 +4699,7 @@
 msgstr "名"
 
 #: src/protocols/jabber/buddy.c:256 src/protocols/jabber/buddy.c:631
-#: src/protocols/jabber/jabber.c:554 src/protocols/yahoo/yahoo.c:2677
+#: src/protocols/jabber/jabber.c:554 src/protocols/yahoo/yahoo.c:2675
 msgid "Nickname"
 msgstr "昵称"
 
@@ -4736,7 +4736,7 @@
 msgstr "电话号码"
 
 #: src/protocols/jabber/buddy.c:265 src/protocols/jabber/buddy.c:705
-#: src/protocols/jabber/buddy.c:713 src/protocols/yahoo/yahoo.c:2671
+#: src/protocols/jabber/buddy.c:713 src/protocols/yahoo/yahoo.c:2669
 msgid "Email"
 msgstr "电子邮件"
 
@@ -4948,12 +4948,12 @@
 #: src/protocols/msn/msn.c:809 src/protocols/msn/msn.c:818
 #: src/protocols/msn/msn.c:832 src/protocols/msn/msn.c:856
 #: src/protocols/msn/msn.c:906 src/protocols/msn/msn.c:944
-#: src/protocols/msn/msn.c:1041 src/protocols/msn/msn.c:1073
-#: src/protocols/msn/msn.c:1094 src/protocols/msn/msn.c:1105
-#: src/protocols/msn/msn.c:1116 src/protocols/msn/msn.c:1140
-#: src/protocols/msn/msn.c:1152 src/protocols/msn/msn.c:1217
+#: src/protocols/msn/msn.c:1042 src/protocols/msn/msn.c:1074
+#: src/protocols/msn/msn.c:1095 src/protocols/msn/msn.c:1106
+#: src/protocols/msn/msn.c:1117 src/protocols/msn/msn.c:1141
+#: src/protocols/msn/msn.c:1153 src/protocols/msn/msn.c:1218
 #: src/protocols/msn/notification.c:179 src/protocols/msn/notification.c:207
-#: src/protocols/msn/notification.c:1645 src/protocols/msn/notification.c:1665
+#: src/protocols/msn/notification.c:1655 src/protocols/msn/notification.c:1675
 #: src/protocols/trepia/trepia.c:239 src/protocols/trepia/trepia.c:740
 #: src/protocols/trepia/trepia.c:1023 src/protocols/trepia/trepia.c:1067
 #: src/protocols/trepia/trepia.c:1166 src/protocols/trepia/trepia.c:1222
@@ -5030,7 +5030,7 @@
 
 #: src/protocols/jabber/jabber.c:710 src/protocols/msn/dispatch.c:219
 #: src/protocols/msn/msn.c:461 src/protocols/napster/napster.c:487
-#: src/protocols/trepia/trepia.c:1100 src/protocols/yahoo/yahoo.c:1925
+#: src/protocols/trepia/trepia.c:1100 src/protocols/yahoo/yahoo.c:1923
 msgid "Connecting"
 msgstr "正在连接"
 
@@ -5160,7 +5160,7 @@
 msgstr "无法加入聊天"
 
 #: src/protocols/msn/dispatch.c:42 src/protocols/msn/notification.c:278
-#: src/protocols/msn/notification.c:499
+#: src/protocols/msn/notification.c:509
 msgid "Unable to request USR\n"
 msgstr "无法请求 USR\n"
 
@@ -5180,15 +5180,15 @@
 msgid "Protocol version not supported"
 msgstr "协议版本不支持"
 
-#: src/protocols/msn/dispatch.c:117 src/protocols/msn/notification.c:761
+#: src/protocols/msn/dispatch.c:117 src/protocols/msn/notification.c:771
 msgid "Unable to request CVR\n"
 msgstr "无法请求 CVR\n"
 
-#: src/protocols/msn/dispatch.c:126 src/protocols/msn/notification.c:770
+#: src/protocols/msn/dispatch.c:126 src/protocols/msn/notification.c:780
 msgid "Unable to request INF\n"
 msgstr "无法请求 INF\n"
 
-#: src/protocols/msn/dispatch.c:147 src/protocols/msn/notification.c:1879
+#: src/protocols/msn/dispatch.c:147 src/protocols/msn/notification.c:1889
 msgid "Got invalid XFR"
 msgstr "得到无效的 XFR"
 
@@ -5201,22 +5201,22 @@
 msgstr "无法处理消息。"
 
 #: src/protocols/msn/dispatch.c:215 src/protocols/msn/msn.c:470
-#: src/protocols/msn/notification.c:2106 src/protocols/napster/napster.c:463
-#: src/protocols/napster/napster.c:494 src/protocols/yahoo/yahoo.c:1717
-#: src/protocols/yahoo/yahoo.c:1748 src/protocols/yahoo/yahoo.c:1813
+#: src/protocols/msn/notification.c:2116 src/protocols/napster/napster.c:463
+#: src/protocols/napster/napster.c:494 src/protocols/yahoo/yahoo.c:1715
+#: src/protocols/yahoo/yahoo.c:1746 src/protocols/yahoo/yahoo.c:1811
 msgid "Unable to connect"
 msgstr "无法连接"
 
-#: src/protocols/msn/dispatch.c:239 src/protocols/msn/notification.c:866
-#: src/protocols/msn/notification.c:2128
+#: src/protocols/msn/dispatch.c:239 src/protocols/msn/notification.c:876
+#: src/protocols/msn/notification.c:2138
 msgid "Unable to write to server"
 msgstr "无法写入服务器。"
 
-#: src/protocols/msn/dispatch.c:243 src/protocols/msn/notification.c:2135
+#: src/protocols/msn/dispatch.c:243 src/protocols/msn/notification.c:2145
 msgid "Syncing with server"
 msgstr "正在与服务器同步"
 
-#: src/protocols/msn/dispatch.c:257 src/protocols/msn/notification.c:2149
+#: src/protocols/msn/dispatch.c:257 src/protocols/msn/notification.c:2159
 msgid "Error reading from server"
 msgstr "从服务器读取时出错"
 
@@ -5365,8 +5365,8 @@
 msgid "CVR parameters are either unknown or not allowed"
 msgstr "CVR 参数未知或不允许"
 
-#: src/protocols/msn/error.c:154 src/protocols/msn/notification.c:613
-#: src/protocols/msn/notification.c:1259 src/protocols/msn/notification.c:1427
+#: src/protocols/msn/error.c:154 src/protocols/msn/notification.c:623
+#: src/protocols/msn/notification.c:1269 src/protocols/msn/notification.c:1437
 msgid "Unable to write"
 msgstr "无法写入"
 
@@ -5476,7 +5476,7 @@
 msgid "Page"
 msgstr "寻呼"
 
-#: src/protocols/msn/msn.c:332 src/protocols/yahoo/yahoo.c:2144
+#: src/protocols/msn/msn.c:332 src/protocols/yahoo/yahoo.c:2142
 #, c-format
 msgid "<b>Status:</b> %s"
 msgstr "<b>状态:</b> %s"
@@ -5487,26 +5487,26 @@
 msgstr "远离电脑"
 
 #: src/protocols/msn/msn.c:346 src/protocols/msn/msn.c:605
-#: src/protocols/msn/state.c:31 src/protocols/yahoo/yahoo.c:2010
-#: src/protocols/yahoo/yahoo.c:2308 src/protocols/yahoo/yahoo.c:2408
+#: src/protocols/msn/state.c:31 src/protocols/yahoo/yahoo.c:2008
+#: src/protocols/yahoo/yahoo.c:2306 src/protocols/yahoo/yahoo.c:2406
 msgid "Be Right Back"
 msgstr "马上回来"
 
 #: src/protocols/msn/msn.c:347 src/protocols/msn/msn.c:607
-#: src/protocols/msn/state.c:29 src/protocols/yahoo/yahoo.c:2012
-#: src/protocols/yahoo/yahoo.c:2310 src/protocols/yahoo/yahoo.c:2409
+#: src/protocols/msn/state.c:29 src/protocols/yahoo/yahoo.c:2010
+#: src/protocols/yahoo/yahoo.c:2308 src/protocols/yahoo/yahoo.c:2407
 msgid "Busy"
 msgstr "忙碌"
 
 #: src/protocols/msn/msn.c:348 src/protocols/msn/msn.c:609
-#: src/protocols/msn/state.c:33 src/protocols/yahoo/yahoo.c:2020
-#: src/protocols/yahoo/yahoo.c:2318 src/protocols/yahoo/yahoo.c:2413
+#: src/protocols/msn/state.c:33 src/protocols/yahoo/yahoo.c:2018
+#: src/protocols/yahoo/yahoo.c:2316 src/protocols/yahoo/yahoo.c:2411
 msgid "On The Phone"
 msgstr "接听电话"
 
 #: src/protocols/msn/msn.c:349 src/protocols/msn/msn.c:611
-#: src/protocols/msn/state.c:34 src/protocols/yahoo/yahoo.c:2024
-#: src/protocols/yahoo/yahoo.c:2322 src/protocols/yahoo/yahoo.c:2415
+#: src/protocols/msn/state.c:34 src/protocols/yahoo/yahoo.c:2022
+#: src/protocols/yahoo/yahoo.c:2320 src/protocols/yahoo/yahoo.c:2413
 msgid "Out To Lunch"
 msgstr "外出就餐"
 
@@ -5569,73 +5569,73 @@
 "MSN 用户名的格式必须是“user@server.com”。可能您希望的是 %s@hotmail.com。您的"
 "屏蔽列表未作任何更改。"
 
-#: src/protocols/msn/msn.c:1241 src/protocols/yahoo/yahoo.c:2584
+#: src/protocols/msn/msn.c:1242 src/protocols/yahoo/yahoo.c:2582
 msgid "<html><body><b>Error retrieving profile</b></body></html>"
 msgstr "<html><body><b>获取个人资料出错</b></body></html>"
 
 #. Age
-#: src/protocols/msn/msn.c:1309 src/protocols/oscar/oscar.c:3931
+#: src/protocols/msn/msn.c:1310 src/protocols/oscar/oscar.c:3931
 #: src/protocols/trepia/trepia.c:276 src/protocols/trepia/trepia.c:404
-#: src/protocols/yahoo/yahoo.c:2695
+#: src/protocols/yahoo/yahoo.c:2693
 msgid "Age"
 msgstr "年龄"
 
 #. Gender
-#: src/protocols/msn/msn.c:1316 src/protocols/oscar/oscar.c:3917
+#: src/protocols/msn/msn.c:1317 src/protocols/oscar/oscar.c:3917
 #: src/protocols/trepia/trepia.c:270 src/protocols/trepia/trepia.c:412
-#: src/protocols/yahoo/yahoo.c:2707
+#: src/protocols/yahoo/yahoo.c:2705
 msgid "Gender"
 msgstr "性别"
 
-#: src/protocols/msn/msn.c:1324 src/protocols/yahoo/yahoo.c:2701
+#: src/protocols/msn/msn.c:1325 src/protocols/yahoo/yahoo.c:2699
 msgid "Marital Status"
 msgstr "婚姻状况"
 
-#: src/protocols/msn/msn.c:1331 src/protocols/yahoo/yahoo.c:2689
+#: src/protocols/msn/msn.c:1332 src/protocols/yahoo/yahoo.c:2687
 msgid "Location"
 msgstr "位置"
 
-#: src/protocols/msn/msn.c:1339 src/protocols/yahoo/yahoo.c:2713
+#: src/protocols/msn/msn.c:1340 src/protocols/yahoo/yahoo.c:2711
 msgid "Occupation"
 msgstr "职业"
 
-#: src/protocols/msn/msn.c:1356 src/protocols/msn/msn.c:1362
-#: src/protocols/msn/msn.c:1369 src/protocols/msn/msn.c:1376
-#: src/protocols/msn/msn.c:1383
+#: src/protocols/msn/msn.c:1357 src/protocols/msn/msn.c:1363
+#: src/protocols/msn/msn.c:1370 src/protocols/msn/msn.c:1377
+#: src/protocols/msn/msn.c:1384
 msgid "A Little About Me"
 msgstr "自我介绍"
 
-#: src/protocols/msn/msn.c:1392 src/protocols/msn/msn.c:1405
-#: src/protocols/msn/msn.c:1412
+#: src/protocols/msn/msn.c:1393 src/protocols/msn/msn.c:1406
+#: src/protocols/msn/msn.c:1413
 msgid "Favorite Things"
 msgstr "收藏"
 
-#: src/protocols/msn/msn.c:1421 src/protocols/msn/msn.c:1427
-#: src/protocols/msn/msn.c:1434
+#: src/protocols/msn/msn.c:1422 src/protocols/msn/msn.c:1428
+#: src/protocols/msn/msn.c:1435
 msgid "Hobbies and Interests"
 msgstr "嗜好和兴趣"
 
-#: src/protocols/msn/msn.c:1443 src/protocols/msn/msn.c:1449
-#: src/protocols/yahoo/yahoo.c:2757
+#: src/protocols/msn/msn.c:1444 src/protocols/msn/msn.c:1450
+#: src/protocols/yahoo/yahoo.c:2755
 msgid "Favorite Quote"
 msgstr "格言"
 
-#: src/protocols/msn/msn.c:1457 src/protocols/yahoo/yahoo.c:2801
+#: src/protocols/msn/msn.c:1458 src/protocols/yahoo/yahoo.c:2799
 msgid "Last Updated"
 msgstr "上次更新"
 
 #. Homepage
-#: src/protocols/msn/msn.c:1468 src/protocols/trepia/trepia.c:280
+#: src/protocols/msn/msn.c:1469 src/protocols/trepia/trepia.c:280
 #: src/protocols/trepia/trepia.c:448
 msgid "Homepage"
 msgstr "主页"
 
-#: src/protocols/msn/msn.c:1490 src/protocols/yahoo/yahoo.c:2819
+#: src/protocols/msn/msn.c:1491 src/protocols/yahoo/yahoo.c:2817
 #, c-format
 msgid "User information for %s unavailable"
 msgstr "%s 的用户信息不可用"
 
-#: src/protocols/msn/msn.c:1492 src/protocols/yahoo/yahoo.c:2821
+#: src/protocols/msn/msn.c:1493 src/protocols/yahoo/yahoo.c:2819
 msgid "The user's profile is empty."
 msgstr "用户的配置文件为空。"
 
@@ -5649,11 +5649,11 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/msn/msn.c:1590 src/protocols/msn/msn.c:1592
+#: src/protocols/msn/msn.c:1591 src/protocols/msn/msn.c:1593
 msgid "MSN Protocol Plugin"
 msgstr "MSN 协议插件"
 
-#: src/protocols/msn/msn.c:1611 src/protocols/trepia/trepia.c:1330
+#: src/protocols/msn/msn.c:1612 src/protocols/trepia/trepia.c:1330
 msgid "Login server"
 msgstr "登录服务器"
 
@@ -5662,69 +5662,69 @@
 msgid "MSN Error: %s\n"
 msgstr "MSN 错误:%s\n"
 
-#: src/protocols/msn/notification.c:363 src/protocols/msn/notification.c:524
+#: src/protocols/msn/notification.c:366 src/protocols/msn/notification.c:534
 msgid "Unable to write to MSN Nexus server."
 msgstr "无法写入 MSN Nexus 服务器。"
 
-#: src/protocols/msn/notification.c:372 src/protocols/msn/notification.c:539
+#: src/protocols/msn/notification.c:375 src/protocols/msn/notification.c:549
 msgid "Unable to read from MSN Nexus server."
 msgstr "无法从 MSN Nexus 服务器读取。"
 
-#: src/protocols/msn/notification.c:392
+#: src/protocols/msn/notification.c:395
 msgid "MSN Nexus server returned invalid redirect information."
 msgstr "MSN Nexus 服务器返回了无效的重定向信息。"
 
-#: src/protocols/msn/notification.c:438
+#: src/protocols/msn/notification.c:448
 msgid "Unknown error when attempting to authorize with MSN login server."
 msgstr "试图认证 MSN 登录服务器时发生了未知错误。"
 
-#: src/protocols/msn/notification.c:550
+#: src/protocols/msn/notification.c:560
 msgid "MSN Nexus server returned invalid information."
 msgstr "MSN Nexus 服务器返回了无效的信息。"
 
-#: src/protocols/msn/notification.c:618 src/protocols/trepia/trepia.c:677
+#: src/protocols/msn/notification.c:628 src/protocols/trepia/trepia.c:677
 msgid "Retrieving buddy list"
 msgstr "正在获取好友列表"
 
-#: src/protocols/msn/notification.c:680
+#: src/protocols/msn/notification.c:690
 msgid "Unable to connect to passport server"
 msgstr "无法连接到 Passport 服务器"
 
-#: src/protocols/msn/notification.c:685 src/protocols/msn/notification.c:717
+#: src/protocols/msn/notification.c:695 src/protocols/msn/notification.c:727
 msgid "Password sent"
 msgstr "密码已送出"
 
-#: src/protocols/msn/notification.c:712
+#: src/protocols/msn/notification.c:722
 msgid "Unable to send password"
 msgstr "无法发送密码"
 
-#: src/protocols/msn/notification.c:748
+#: src/protocols/msn/notification.c:758
 msgid "Protocol not supported"
 msgstr "协议不支持"
 
-#: src/protocols/msn/notification.c:790
+#: src/protocols/msn/notification.c:800
 msgid "You have been disconnected. You have signed on from another location."
 msgstr "您已经被断开。原因是您在其它位置用此用户名登入了。"
 
-#: src/protocols/msn/notification.c:795
+#: src/protocols/msn/notification.c:805
 msgid "You have been disconnected. The MSN servers are going down temporarily."
 msgstr "您已经被断开。MSN 服务器目前维护中。"
 
-#: src/protocols/msn/notification.c:921
+#: src/protocols/msn/notification.c:931
 #, c-format
 msgid "The user %s (%s) wants to add %s to his or her buddy list."
 msgstr "用户 %s(%s) 想要将 %s 添加为好友。"
 
-#: src/protocols/msn/notification.c:1240 src/protocols/msn/notification.c:1406
+#: src/protocols/msn/notification.c:1250 src/protocols/msn/notification.c:1416
 #, c-format
 msgid "The user %s (%s) wants to add you to their buddy list."
 msgstr "用户 %s(%s) 想要将您添加为好友。"
 
-#: src/protocols/msn/notification.c:1921
+#: src/protocols/msn/notification.c:1931
 msgid "Unable to transfer to notification server"
 msgstr "无法传送到通知服务器。"
 
-#: src/protocols/msn/notification.c:2069
+#: src/protocols/msn/notification.c:2079
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -6703,7 +6703,7 @@
 msgid "<b>Status:</b> Not Authorized"
 msgstr "<b>状态:</b>未认证"
 
-#: src/protocols/oscar/oscar.c:5474 src/protocols/yahoo/yahoo.c:2032
+#: src/protocols/oscar/oscar.c:5474 src/protocols/yahoo/yahoo.c:2030
 msgid "Offline"
 msgstr "离线"
 
@@ -7154,27 +7154,27 @@
 msgid "Trepia Protocol Plugin"
 msgstr "Trepia 协议插件"
 
-#: src/protocols/yahoo/yahoo.c:702
+#: src/protocols/yahoo/yahoo.c:700
 msgid "Your Yahoo! message did not get sent."
 msgstr "未发送您的 Yahoo! 消息。"
 
-#: src/protocols/yahoo/yahoo.c:760
+#: src/protocols/yahoo/yahoo.c:758
 #, c-format
 msgid "%s has (retroactively) denied your request to add them to your list."
 msgstr "%s 拒绝您将他/她加入好友。"
 
-#: src/protocols/yahoo/yahoo.c:762
+#: src/protocols/yahoo/yahoo.c:760
 #, c-format
 msgid ""
 "%s has (retroactively) denied your request to add them to your list for the "
 "following reason: %s."
 msgstr "%s 拒绝了您将其加为好友的请求,原因如下:%s。"
 
-#: src/protocols/yahoo/yahoo.c:763
+#: src/protocols/yahoo/yahoo.c:761
 msgid "Add buddy rejected"
 msgstr "添加拒绝的好友"
 
-#: src/protocols/yahoo/yahoo.c:1383
+#: src/protocols/yahoo/yahoo.c:1381
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -7184,11 +7184,11 @@
 "Yahoo 服务器请求使用未识别的认证方式。此版本的 Gaim 可能无法成功登入 Yahoo。"
 "请检查 %s 上的更新。"
 
-#: src/protocols/yahoo/yahoo.c:1386
+#: src/protocols/yahoo/yahoo.c:1384
 msgid "Failed Yahoo! Authentication"
 msgstr "Yahoo! 认证失败"
 
-#: src/protocols/yahoo/yahoo.c:1459
+#: src/protocols/yahoo/yahoo.c:1457
 #, c-format
 msgid ""
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
@@ -7196,132 +7196,132 @@
 msgstr ""
 "您试图忽略 %s,但是该用户位于您的好友列表中。单击“是”将删除并忽略好友。"
 
-#: src/protocols/yahoo/yahoo.c:1462
+#: src/protocols/yahoo/yahoo.c:1460
 msgid "Ignore buddy?"
 msgstr "忽略好友?"
 
-#: src/protocols/yahoo/yahoo.c:1491
+#: src/protocols/yahoo/yahoo.c:1489
 msgid "Invalid username."
 msgstr "用户名无效。"
 
-#: src/protocols/yahoo/yahoo.c:1494
+#: src/protocols/yahoo/yahoo.c:1492
 msgid "Incorrect password."
 msgstr "密码不对。"
 
-#: src/protocols/yahoo/yahoo.c:1497
+#: src/protocols/yahoo/yahoo.c:1495
 msgid "Unknown error."
 msgstr "未知错误。"
 
-#: src/protocols/yahoo/yahoo.c:1544
+#: src/protocols/yahoo/yahoo.c:1542
 #, c-format
 msgid "Could not add buddy %s to group %s to the server list on account %s."
 msgstr "无法将好友 %s 添加到账户 %s 位于服务器列表上的组 %s。"
 
-#: src/protocols/yahoo/yahoo.c:1546
+#: src/protocols/yahoo/yahoo.c:1544
 msgid "Could not add buddy to server list"
 msgstr "无法将好友添加到服务器列表"
 
-#: src/protocols/yahoo/yahoo.c:1648 src/protocols/yahoo/yahoo.c:1778
+#: src/protocols/yahoo/yahoo.c:1646 src/protocols/yahoo/yahoo.c:1776
 msgid "Unable to read"
 msgstr "无法读取"
 
-#: src/protocols/yahoo/yahoo.c:1803 src/protocols/yahoo/yahoo.c:1912
-#: src/protocols/yahoo/yahoo.c:1936
+#: src/protocols/yahoo/yahoo.c:1801 src/protocols/yahoo/yahoo.c:1910
+#: src/protocols/yahoo/yahoo.c:1934
 msgid "Connection problem"
 msgstr "连接问题"
 
-#: src/protocols/yahoo/yahoo.c:2014 src/protocols/yahoo/yahoo.c:2312
-#: src/protocols/yahoo/yahoo.c:2410
+#: src/protocols/yahoo/yahoo.c:2012 src/protocols/yahoo/yahoo.c:2310
+#: src/protocols/yahoo/yahoo.c:2408
 msgid "Not At Home"
 msgstr "不在家"
 
+#: src/protocols/yahoo/yahoo.c:2014 src/protocols/yahoo/yahoo.c:2312
+#: src/protocols/yahoo/yahoo.c:2409
+msgid "Not At Desk"
+msgstr "不在桌前"
+
 #: src/protocols/yahoo/yahoo.c:2016 src/protocols/yahoo/yahoo.c:2314
-#: src/protocols/yahoo/yahoo.c:2411
-msgid "Not At Desk"
-msgstr "不在桌前"
-
-#: src/protocols/yahoo/yahoo.c:2018 src/protocols/yahoo/yahoo.c:2316
-#: src/protocols/yahoo/yahoo.c:2412
+#: src/protocols/yahoo/yahoo.c:2410
 msgid "Not In Office"
 msgstr "不在办公室"
 
-#: src/protocols/yahoo/yahoo.c:2022 src/protocols/yahoo/yahoo.c:2320
-#: src/protocols/yahoo/yahoo.c:2414
+#: src/protocols/yahoo/yahoo.c:2020 src/protocols/yahoo/yahoo.c:2318
+#: src/protocols/yahoo/yahoo.c:2412
 msgid "On Vacation"
 msgstr "度假中"
 
-#: src/protocols/yahoo/yahoo.c:2026 src/protocols/yahoo/yahoo.c:2324
-#: src/protocols/yahoo/yahoo.c:2416
+#: src/protocols/yahoo/yahoo.c:2024 src/protocols/yahoo/yahoo.c:2322
+#: src/protocols/yahoo/yahoo.c:2414
 msgid "Stepped Out"
 msgstr "郊游"
 
-#: src/protocols/yahoo/yahoo.c:2090 src/protocols/yahoo/yahoo.c:2124
+#: src/protocols/yahoo/yahoo.c:2088 src/protocols/yahoo/yahoo.c:2122
 msgid "Not on server list"
 msgstr "不在服务器列表中"
 
-#: src/protocols/yahoo/yahoo.c:2180
+#: src/protocols/yahoo/yahoo.c:2178
 msgid "Join in Chat"
 msgstr "加入聊天"
 
-#: src/protocols/yahoo/yahoo.c:2186
+#: src/protocols/yahoo/yahoo.c:2184
 msgid "Initiate Conference"
 msgstr "发起会议"
 
-#: src/protocols/yahoo/yahoo.c:2232
+#: src/protocols/yahoo/yahoo.c:2230
 msgid "Active which ID?"
 msgstr "激活哪个 ID?"
 
-#: src/protocols/yahoo/yahoo.c:2243
+#: src/protocols/yahoo/yahoo.c:2241
 msgid "Activate ID"
 msgstr "激活 ID"
 
-#: src/protocols/yahoo/yahoo.c:2601
+#: src/protocols/yahoo/yahoo.c:2599
 msgid ""
 "<b>Sorry, profiles marked as containing adult content are not supported at "
 "this time.</b><br><br>\n"
 msgstr "<b>抱歉,标为含有成人内容的个人资料目前不被支持。</b><br><br>\n"
 
-#: src/protocols/yahoo/yahoo.c:2602 src/protocols/yahoo/yahoo.c:2622
+#: src/protocols/yahoo/yahoo.c:2600 src/protocols/yahoo/yahoo.c:2620
 msgid ""
 "If you wish to view this profile, you will need to visit this link in your "
 "web browser<br>"
 msgstr "如果您想要查看此资料,您需要在您的 Web 浏览器中浏览此链接<br>"
 
-#: src/protocols/yahoo/yahoo.c:2621
+#: src/protocols/yahoo/yahoo.c:2619
 msgid ""
 "<b>Sorry, non-English profiles are not supported at this time.</b><br><br>\n"
 msgstr "<b>抱歉,目前不支持非英语的个人资料。</b><br><br>\n"
 
-#: src/protocols/yahoo/yahoo.c:2666
+#: src/protocols/yahoo/yahoo.c:2664
 msgid "Yahoo! ID"
 msgstr "Yahoo! ID"
 
-#: src/protocols/yahoo/yahoo.c:2726 src/protocols/yahoo/yahoo.c:2730
-#: src/protocols/yahoo/yahoo.c:2734
+#: src/protocols/yahoo/yahoo.c:2724 src/protocols/yahoo/yahoo.c:2728
+#: src/protocols/yahoo/yahoo.c:2732
 msgid "Hobbies"
 msgstr "嗜好"
 
-#: src/protocols/yahoo/yahoo.c:2745 src/protocols/yahoo/yahoo.c:2749
+#: src/protocols/yahoo/yahoo.c:2743 src/protocols/yahoo/yahoo.c:2747
 msgid "Latest News"
 msgstr "最新新闻"
 
-#: src/protocols/yahoo/yahoo.c:2767
+#: src/protocols/yahoo/yahoo.c:2765
 msgid "Home Page"
 msgstr "主页"
 
-#: src/protocols/yahoo/yahoo.c:2781
+#: src/protocols/yahoo/yahoo.c:2779
 msgid "Cool Link 1"
 msgstr "酷链接 1"
 
-#: src/protocols/yahoo/yahoo.c:2786
+#: src/protocols/yahoo/yahoo.c:2784
 msgid "Cool Link 2"
 msgstr "酷链接 2"
 
-#: src/protocols/yahoo/yahoo.c:2789
+#: src/protocols/yahoo/yahoo.c:2787
 msgid "Cool Link 3"
 msgstr "酷链接 3"
 
-#: src/protocols/yahoo/yahoo.c:2795
+#: src/protocols/yahoo/yahoo.c:2793
 msgid "Member Since"
 msgstr "注册时间"
 
@@ -7335,15 +7335,15 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/yahoo/yahoo.c:2960 src/protocols/yahoo/yahoo.c:2962
+#: src/protocols/yahoo/yahoo.c:2958 src/protocols/yahoo/yahoo.c:2960
 msgid "Yahoo Protocol Plugin"
 msgstr "Yahoo 协议插件"
 
-#: src/protocols/yahoo/yahoo.c:2979
+#: src/protocols/yahoo/yahoo.c:2977
 msgid "Pager host"
 msgstr "寻呼主机"
 
-#: src/protocols/yahoo/yahoo.c:2984
+#: src/protocols/yahoo/yahoo.c:2982
 msgid "Pager port"
 msgstr "寻呼端口"
 
@@ -7563,4 +7563,3 @@
 #: src/win32/win32dep.c:475
 msgid "Moving Gaim user settings directory to:"
 msgstr "正在将 Gaim 用户设置目录移动到:"
-