changeset 7915:1f60811e3f57

[gaim-migrate @ 8582] why is chinese zh? committer: Tailor Script <tailor@pidgin.im>
author Luke Schierer <lschiere@pidgin.im>
date Mon, 22 Dec 2003 21:46:06 +0000 (2003-12-22)
parents 3d2c80fa6de5
children 48dc9f358a91
files po/zh_TW.po
diffstat 1 files changed, 242 insertions(+), 204 deletions(-) [+]
line wrap: on
line diff
--- a/po/zh_TW.po	Mon Dec 22 20:15:25 2003 +0000
+++ b/po/zh_TW.po	Mon Dec 22 21:46:06 2003 +0000
@@ -17,19 +17,20 @@
 # NOTE  筝㊥��腟延�������綣���鐚�URL����篁ょ�荅牙��'/"���ゅ�
 # NOTE  篁ュ������Deny��(��腟�) ����Block��(絨���)鐚��上�����篋�
 # NOTE  ��腟���札茯�����弱�������筝���篏睡��������巷鐚����������罸�莠�絅純��
+# NOTE  nplurals ��荐㊦�� 2鐚����咲��������荀���莨��絋���絎�������絎�����筝�蕁���絖���
 # ----------------------------------------------------------
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: Gaim 0.75\n"
-"POT-Creation-Date: 2003-12-16 19:35-0500\n"
+"POT-Creation-Date: 2003-12-21 10:11-0500\n"
 "PO-Revision-Date: 2003-05-29 12:04+0800\n"
 "Last-Translator: Ambrose C. Li <acli@ada.dhs.org>\n"
 "Language-Team: Chinese (Traditional) <zh-l10n@linux.org.tw>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
 "\n"
 
 #. *< api_version
@@ -168,7 +169,7 @@
 msgid "New..."
 msgstr "�医�..."
 
-#: plugins/docklet/docklet.c:153 src/gtkblist.c:2530 src/gtkpounce.c:411
+#: plugins/docklet/docklet.c:153 src/gtkblist.c:2540 src/gtkpounce.c:411
 #: src/gtkprefs.c:1469 src/protocols/gg/gg.c:51 src/protocols/irc/msgs.c:187
 #: src/protocols/jabber/jabber.c:926 src/protocols/jabber/jutil.c:98
 #: src/protocols/jabber/presence.c:84 src/protocols/oscar/oscar.c:2845
@@ -981,7 +982,7 @@
 msgstr "�� Windows �����������決� Gaim(_S)"
 
 #. Buddy List
-#: plugins/win32/winprefs/winprefs.c:366 src/gtkblist.c:2364
+#: plugins/win32/winprefs/winprefs.c:366 src/gtkblist.c:2374
 #: src/gtkprefs.c:2266
 msgid "Buddy List"
 msgstr "絅遵�羝���"
@@ -1279,23 +1280,23 @@
 #. * A wrapper for gaim_request_action() that uses OK and Cancel buttons.
 #.
 #: src/account.c:336 src/connection.c:193 src/dialogs.c:1492
-#: src/dialogs.c:1509 src/dialogs.c:1528 src/gtkblist.c:1730
+#: src/dialogs.c:1509 src/dialogs.c:1528 src/gtkblist.c:1738
 #: src/gtkrequest.c:195 src/protocols/jabber/jabber.c:1023
 #: src/protocols/msn/msn.c:181 src/protocols/msn/msn.c:192
 #: src/protocols/msn/msn.c:203 src/protocols/msn/msn.c:214
 #: src/protocols/oscar/oscar.c:2456 src/protocols/oscar/oscar.c:2536
 #: src/protocols/oscar/oscar.c:6213 src/protocols/oscar/oscar.c:6309
 #: src/protocols/oscar/oscar.c:6358 src/protocols/oscar/oscar.c:6440
-#: src/protocols/yahoo/yahoo.c:2394 src/protocols/yahoo/yahoo.c:2402
-#: src/request.h:852
+#: src/protocols/yahoo/yahoo.c:2398 src/protocols/yahoo/yahoo.c:2406
+#: src/request.h:1001
 msgid "OK"
 msgstr "腆阪�"
 
 #: src/account.c:337 src/account.c:371 src/connection.c:194 src/dialogs.c:353
 #: src/dialogs.c:365 src/dialogs.c:378 src/dialogs.c:399 src/dialogs.c:1334
 #: src/dialogs.c:1493 src/dialogs.c:1510 src/dialogs.c:1529
-#: src/gtkaccount.c:1622 src/gtkaccount.c:2091 src/gtkblist.c:1731
-#: src/gtkblist.c:3677 src/gtkconn.c:148 src/gtkprivacy.c:568
+#: src/gtkaccount.c:1622 src/gtkaccount.c:2091 src/gtkblist.c:1739
+#: src/gtkblist.c:3689 src/gtkconn.c:149 src/gtkprivacy.c:568
 #: src/gtkprivacy.c:581 src/gtkprivacy.c:606 src/gtkprivacy.c:617
 #: src/gtkrequest.c:196 src/protocols/icq/gaim_icq.c:277
 #: src/protocols/jabber/buddy.c:512 src/protocols/jabber/jabber.c:651
@@ -1307,8 +1308,8 @@
 #: src/protocols/oscar/oscar.c:6041 src/protocols/oscar/oscar.c:6214
 #: src/protocols/oscar/oscar.c:6310 src/protocols/oscar/oscar.c:6359
 #: src/protocols/oscar/oscar.c:6424 src/protocols/oscar/oscar.c:6441
-#: src/protocols/trepia/trepia.c:347 src/protocols/yahoo/yahoo.c:2395
-#: src/protocols/yahoo/yahoo.c:2403 src/request.h:852 src/request.h:862
+#: src/protocols/trepia/trepia.c:347 src/protocols/yahoo/yahoo.c:2399
+#: src/protocols/yahoo/yahoo.c:2407 src/request.h:1001 src/request.h:1011
 msgid "Cancel"
 msgstr "��羔�"
 
@@ -1346,7 +1347,7 @@
 msgid "Chats"
 msgstr "��紊�"
 
-#: src/blist.c:661 src/blist.c:848 src/blist.c:2063 src/gtkblist.c:3146
+#: src/blist.c:661 src/blist.c:848 src/blist.c:2063 src/gtkblist.c:3156
 #: src/protocols/jabber/roster.c:66 src/protocols/msn/notification.c:1160
 msgid "Buddies"
 msgstr "絅遵�"
@@ -1360,6 +1361,9 @@
 "%d buddies from group %s were not removed because their accounts were not "
 "logged in.  These buddies and the group were not removed.\n"
 msgstr[0] ""
+"%d ���� %s 臂ょ���絅遵�筝����茴�Щ�わ����坂�鐚�絅刻���絨�����絽活��筝�����糸�ャ������絅�"
+"����臂ょ�羃���茴�Щ�ゃ��\n"
+msgstr[1] ""
 "%d ���� %s 臂ょ���絅遵�筝����茴�Щ�わ����坂�����絨�����絽活��筝�����糸�ャ����篋�絅遵���"
 "臂ょ�羃���茴�Щ�ゃ��\n"
 
@@ -1385,7 +1389,7 @@
 msgid "Buddy List Error"
 msgstr "絅遵�羝������"
 
-#: src/buddy_chat.c:212 src/gtkblist.c:3567
+#: src/buddy_chat.c:212 src/gtkblist.c:3579
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
@@ -1803,15 +1807,15 @@
 msgid "boring default"
 msgstr "�∴��鐚���荐㍼�"
 
-#: src/gaimrc.c:1259 src/gtkblist.c:2326
+#: src/gaimrc.c:1259 src/gtkblist.c:2336
 msgid "Alphabetical"
 msgstr "箴��у�罸�"
 
-#: src/gaimrc.c:1261 src/gtkblist.c:2327
+#: src/gaimrc.c:1261 src/gtkblist.c:2337
 msgid "By status"
 msgstr "箴��х����"
 
-#: src/gaimrc.c:1263 src/gtkblist.c:2328
+#: src/gaimrc.c:1263 src/gtkblist.c:2338
 msgid "By log size"
 msgstr "箴��ф�ヨ�紊у�"
 
@@ -1852,7 +1856,7 @@
 msgid "Password:"
 msgstr "絲�腆種�"
 
-#: src/gtkaccount.c:469 src/gtkblist.c:3306 src/gtkblist.c:3626
+#: src/gtkaccount.c:469 src/gtkblist.c:3316 src/gtkblist.c:3638
 msgid "Alias:"
 msgstr "�ュ��鐚�"
 
@@ -1988,7 +1992,7 @@
 
 #: src/gtkaccount.c:1758 src/protocols/jabber/jabber.c:924
 #: src/protocols/oscar/oscar.c:2851 src/protocols/oscar/oscar.c:4594
-#: src/protocols/oscar/oscar.c:6162 src/protocols/yahoo/yahoo.c:2189
+#: src/protocols/oscar/oscar.c:6162 src/protocols/yahoo/yahoo.c:2193
 #: src/protocols/zephyr/zephyr.c:886 src/protocols/zephyr/zephyr.c:896
 msgid "Online"
 msgstr "筝�膩�"
@@ -2020,7 +2024,7 @@
 msgid "Add buddy to your list?"
 msgstr "絨�篏睡�������ユ����絅遵�羝����"
 
-#: src/gtkaccount.c:2090 src/gtkblist.c:3676 src/gtkconv.c:1272
+#: src/gtkaccount.c:2090 src/gtkblist.c:3688 src/gtkconv.c:1272
 #: src/gtkconv.c:3197 src/gtkconv.c:4402 src/gtkrequest.c:200
 #: src/protocols/icq/gaim_icq.c:277 src/protocols/oscar/oscar.c:2693
 msgid "Add"
@@ -2046,8 +2050,8 @@
 msgid "_Alias..."
 msgstr "�ュ��(_A)..."
 
-#: src/gtkblist.c:842 src/gtkblist.c:931 src/gtkblist.c:953 src/gtkconn.c:424
-#: src/gtkconn.c:460
+#: src/gtkblist.c:842 src/gtkblist.c:931 src/gtkblist.c:953 src/gtkconn.c:425
+#: src/gtkconn.c:461
 msgid "_Remove"
 msgstr "腱脂��(_R)"
 
@@ -2086,117 +2090,117 @@
 msgstr "��研���糸�ヤ算篏�筝���������医�����絅遵�����荐���絎���"
 
 #. Buddies menu
-#: src/gtkblist.c:1680
+#: src/gtkblist.c:1688
 msgid "/_Buddies"
 msgstr "/絅遵�(_B)"
 
-#: src/gtkblist.c:1681
+#: src/gtkblist.c:1689
 msgid "/Buddies/New Instant _Message..."
 msgstr "/絅遵�/�医�恰��荐���(_M)"
 
-#: src/gtkblist.c:1682
+#: src/gtkblist.c:1690
 msgid "/Buddies/Join a _Chat..."
 msgstr "/絅遵�/���ヨ��紊��(_C)"
 
-#: src/gtkblist.c:1683
+#: src/gtkblist.c:1691
 msgid "/Buddies/Get _User Info..."
 msgstr "/絅遵�/��緇�篏睡����莖�荐�(_U)"
 
-#: src/gtkblist.c:1685
+#: src/gtkblist.c:1693
 msgid "/Buddies/Show _Offline Buddies"
 msgstr "/絅遵�/蕁�ず�∝�絅遵�(_O)"
 
-#: src/gtkblist.c:1686
+#: src/gtkblist.c:1694
 msgid "/Buddies/Show _Empty Groups"
 msgstr "/絅遵�/蕁�ず腥榊�順��臂ょ�(_E)"
 
-#: src/gtkblist.c:1687
+#: src/gtkblist.c:1695
 msgid "/Buddies/_Add Buddy..."
 msgstr "/絅遵�/�医�絅遵�(_A)..."
 
-#: src/gtkblist.c:1688
+#: src/gtkblist.c:1696
 msgid "/Buddies/Add C_hat..."
 msgstr "/絅遵�/�医���紊��(_H)..."
 
-#: src/gtkblist.c:1689
+#: src/gtkblist.c:1697
 msgid "/Buddies/Add _Group..."
 msgstr "/絅遵�/�医�臂ょ�(_G)..."
 
-#: src/gtkblist.c:1691
+#: src/gtkblist.c:1699
 msgid "/Buddies/_Signoff"
 msgstr "/絅遵�/�糸��(_S)"
 
-#: src/gtkblist.c:1692
+#: src/gtkblist.c:1700
 msgid "/Buddies/_Quit"
 msgstr "/絅遵�/腟���腮�綣�(_Q)"
 
 #. Tools
-#: src/gtkblist.c:1695
+#: src/gtkblist.c:1703
 msgid "/_Tools"
 msgstr "綏ュ��(_T)"
 
-#: src/gtkblist.c:1696
+#: src/gtkblist.c:1704
 msgid "/Tools/_Away"
 msgstr "/綏ュ��/�∫��(_A)"
 
-#: src/gtkblist.c:1697
+#: src/gtkblist.c:1705
 msgid "/Tools/Buddy _Pounce"
 msgstr "/綏ュ��/絅遵���������(_P)"
 
-#: src/gtkblist.c:1698
+#: src/gtkblist.c:1706
 msgid "/Tools/P_rotocol Actions"
 msgstr "/綏ュ��/��荐���絎��檎��荐㊤�(_R)"
 
-#: src/gtkblist.c:1700
+#: src/gtkblist.c:1708
 msgid "/Tools/A_ccounts"
 msgstr "/綏ュ��/絽活��羝���(_C)"
 
-#: src/gtkblist.c:1701
+#: src/gtkblist.c:1709
 msgid "/Tools/_File Transfers"
 msgstr "/綏ュ��/罟�罅��活叱(_F)"
 
-#: src/gtkblist.c:1702
+#: src/gtkblist.c:1710
 msgid "/Tools/Pr_eferences"
 msgstr "/綏ュ��/�鎁処┃絎�(_E)"
 
-#: src/gtkblist.c:1703
+#: src/gtkblist.c:1711
 msgid "/Tools/Pr_ivacy"
 msgstr "/綏ュ��/�援�荐㊤�(_I)"
 
-#: src/gtkblist.c:1705
+#: src/gtkblist.c:1713
 msgid "/Tools/View System _Log"
 msgstr "茹���膤紫輝�ヨ�(_L)"
 
 #. Help
-#: src/gtkblist.c:1708
+#: src/gtkblist.c:1716
 msgid "/_Help"
 msgstr "茯���(_H)"
 
-#: src/gtkblist.c:1709
+#: src/gtkblist.c:1717
 msgid "/Help/Online _Help"
 msgstr "膩�筝�茯���(_H)"
 
-#: src/gtkblist.c:1710
+#: src/gtkblist.c:1718
 msgid "/Help/_Debug Window"
 msgstr "/茯���/�ら���腦�(_D)"
 
-#: src/gtkblist.c:1711
+#: src/gtkblist.c:1719
 msgid "/Help/_About"
 msgstr "/茯���/����(_A)"
 
-#: src/gtkblist.c:1727
+#: src/gtkblist.c:1735
 msgid "Rename Group"
 msgstr "篆��合召腟���腮�"
 
-#: src/gtkblist.c:1727
+#: src/gtkblist.c:1735
 msgid "New group name"
 msgstr "�医��絖�"
 
-#: src/gtkblist.c:1728
+#: src/gtkblist.c:1736
 msgid "Please enter a new name for the selected group."
 msgstr "茫��咲�後���臂ょ�莠後�ヤ����亥����腮宴��"
 
-#: src/gtkblist.c:1756
+#: src/gtkblist.c:1764
 #, c-format
 msgid ""
 "\n"
@@ -2205,16 +2209,16 @@
 "\n"
 "<b>絽活��鐚�</b>%s"
 
-#: src/gtkblist.c:1817 src/protocols/oscar/oscar.c:5542
+#: src/gtkblist.c:1827 src/protocols/oscar/oscar.c:5542
 msgid "<b>Status:</b> Offline"
 msgstr "<b>����鐚�</b>�∝�"
 
-#: src/gtkblist.c:1829
+#: src/gtkblist.c:1839
 #, c-format
 msgid "%d%%"
 msgstr "%d%%"
 
-#: src/gtkblist.c:1844
+#: src/gtkblist.c:1854
 msgid ""
 "\n"
 "<b>Account:</b>"
@@ -2222,7 +2226,7 @@
 "\n"
 "<b>絽活��鐚�</b>"
 
-#: src/gtkblist.c:1845
+#: src/gtkblist.c:1855
 msgid ""
 "\n"
 "<b>Contact Alias:</b>"
@@ -2230,7 +2234,7 @@
 "\n"
 "<b>�ュ��鐚�</b>"
 
-#: src/gtkblist.c:1846
+#: src/gtkblist.c:1856
 msgid ""
 "\n"
 "<b>Alias:</b>"
@@ -2238,7 +2242,7 @@
 "\n"
 "<b>�ュ��鐚�</b>"
 
-#: src/gtkblist.c:1847
+#: src/gtkblist.c:1857
 msgid ""
 "\n"
 "<b>Nickname:</b>"
@@ -2246,7 +2250,7 @@
 "\n"
 "<b>�援┗鐚�</b>"
 
-#: src/gtkblist.c:1848
+#: src/gtkblist.c:1858
 msgid ""
 "\n"
 "<b>Idle:</b>"
@@ -2254,7 +2258,7 @@
 "\n"
 "<b>��臀��</b>"
 
-#: src/gtkblist.c:1849
+#: src/gtkblist.c:1859
 msgid ""
 "\n"
 "<b>Warned:</b>"
@@ -2262,7 +2266,7 @@
 "\n"
 "<b>茘���鐚�<b>"
 
-#: src/gtkblist.c:1851
+#: src/gtkblist.c:1861
 msgid ""
 "\n"
 "<b>Description:</b> Spooky"
@@ -2270,7 +2274,7 @@
 "\n"
 "<b>篁�膣刻�</b>綛初��篌主��"
 
-#: src/gtkblist.c:1852
+#: src/gtkblist.c:1862
 msgid ""
 "\n"
 "<b>Status</b>: Awesome"
@@ -2278,7 +2282,7 @@
 "\n"
 "<b>����鐚�</b>���怨��"
 
-#: src/gtkblist.c:1853
+#: src/gtkblist.c:1863
 msgid ""
 "\n"
 "<b>Status</b>: Rockin'"
@@ -2286,85 +2290,85 @@
 "\n"
 "<b>����鐚�</b>���怨��"
 
-#: src/gtkblist.c:2121
+#: src/gtkblist.c:2131
 #, c-format
 msgid "Idle (%dh%02dm) "
 msgstr "��臀��%d 絨�� %d ����"
 
-#: src/gtkblist.c:2123
+#: src/gtkblist.c:2133
 #, c-format
 msgid "Idle (%dm) "
 msgstr "��臀��%d ��鐚�"
 
-#: src/gtkblist.c:2128
+#: src/gtkblist.c:2138
 #, c-format
 msgid "Warned (%d%%) "
 msgstr "茘��� (%d%%)"
 
-#: src/gtkblist.c:2131
+#: src/gtkblist.c:2141
 msgid "Offline "
 msgstr "�∝�"
 
-#: src/gtkblist.c:2324 src/gtkprefs.c:841 src/gtkprefs.c:1497
+#: src/gtkblist.c:2334 src/gtkprefs.c:841 src/gtkprefs.c:1497
 msgid "None"
 msgstr "��"
 
-#: src/gtkblist.c:2391
+#: src/gtkblist.c:2401
 msgid "/Tools/Away"
 msgstr "/綏ュ��/�∫��"
 
-#: src/gtkblist.c:2394
+#: src/gtkblist.c:2404
 msgid "/Tools/Buddy Pounce"
 msgstr "/綏ュ��/絅遵���������"
 
-#: src/gtkblist.c:2397
+#: src/gtkblist.c:2407
 msgid "/Tools/Protocol Actions"
 msgstr "/綏ュ��/��荐���絎��檎��荐㊤�"
 
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: src/gtkblist.c:2484
+#: src/gtkblist.c:2494
 msgid "/Buddies/Show Offline Buddies"
 msgstr "/絅遵�/蕁�ず�∝�絅遵�"
 
-#: src/gtkblist.c:2486
+#: src/gtkblist.c:2496
 msgid "/Buddies/Show Empty Groups"
 msgstr "/絅遵�/蕁�ず腥榊��絅順��臂ょ�"
 
-#: src/gtkblist.c:2504 src/gtkconv.c:1231
+#: src/gtkblist.c:2514 src/gtkconv.c:1231
 msgid "IM"
 msgstr "�恰��荐���"
 
-#: src/gtkblist.c:2510
+#: src/gtkblist.c:2520
 msgid "Send a message to the selected buddy"
 msgstr "�渇��荐���畿茴��後���絅遵�"
 
-#: src/gtkblist.c:2513 src/protocols/napster/napster.c:529
+#: src/gtkblist.c:2523 src/protocols/napster/napster.c:529
 msgid "Get Info"
 msgstr "��緇�莖�荐�"
 
-#: src/gtkblist.c:2519
+#: src/gtkblist.c:2529
 msgid "Get information on the selected buddy"
 msgstr "��緇�茴��後�絅遵���莖�荐�"
 
-#: src/gtkblist.c:2522 src/protocols/oscar/oscar.c:3089
+#: src/gtkblist.c:2532 src/protocols/oscar/oscar.c:3089
 msgid "Chat"
 msgstr "��紊�"
 
-#: src/gtkblist.c:2527
+#: src/gtkblist.c:2537
 msgid "Join a chat room"
 msgstr "���ヤ�����紊��"
 
-#: src/gtkblist.c:2535
+#: src/gtkblist.c:2545
 msgid "Set an away message"
 msgstr "荐㊤�筝����∫��荐���"
 
-#: src/gtkblist.c:3248 src/protocols/yahoo/yahoo.c:2321
+#: src/gtkblist.c:3258 src/protocols/yahoo/yahoo.c:2325
 msgid "Add Buddy"
 msgstr "�医�絅遵�"
 
-#: src/gtkblist.c:3271
+#: src/gtkblist.c:3281
 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. "
@@ -2373,63 +2377,63 @@
 "茫�莠後�ユ�����活����ュソ����絽活�������札�咲����絅遵�荐㊤��ュ�����援┗鐚�������荐㊤�絨���"
 "��ソ��羝���賢蕁�ず��\n"
 
-#: src/gtkblist.c:3293 src/main.c:289
+#: src/gtkblist.c:3303 src/main.c:289
 msgid "Screen Name:"
 msgstr "絽活��鐚�"
 
-#: src/gtkblist.c:3319 src/gtkblist.c:3639
+#: src/gtkblist.c:3329 src/gtkblist.c:3651
 msgid "Group:"
 msgstr "臂ょ�鐚�"
 
 #. Set up stuff for the account box
-#: src/gtkblist.c:3328 src/gtkblist.c:3607
+#: src/gtkblist.c:3338 src/gtkblist.c:3619
 msgid "Account:"
 msgstr "絽活��鐚�"
 
-#: src/gtkblist.c:3574
+#: src/gtkblist.c:3586
 msgid "Add Chat"
 msgstr "�医���紊��"
 
-#: src/gtkblist.c:3597
+#: src/gtkblist.c:3609
 msgid ""
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
 msgstr "茫�莠後�ュ�ュ��鐚��������惹�����喝���ュソ��羝�������紊�������区�荐���\n"
 
-#: src/gtkblist.c:3673
+#: src/gtkblist.c:3685
 msgid "Add Group"
 msgstr "���ョ召腟�"
 
-#: src/gtkblist.c:3674
+#: src/gtkblist.c:3686
 msgid "Please enter the name of the group to be added."
 msgstr "茫�腟����医���臂ょ�莠後�ュ��腮宴��"
 
-#: src/gtkblist.c:4191
+#: src/gtkblist.c:4203
 msgid "No actions available"
 msgstr "筝���荐延算篏���篏�"
 
-#: src/gtkconn.c:58 src/gtkconn.c:242 src/gtkconn.c:253
+#: src/gtkconn.c:58 src/gtkconn.c:243 src/gtkconn.c:254
 msgid "Done."
 msgstr "絎�����"
 
-#: src/gtkconn.c:137
+#: src/gtkconn.c:138
 msgid "Signon: "
 msgstr "�糸�ワ�"
 
-#: src/gtkconn.c:195
+#: src/gtkconn.c:196
 msgid "Signon"
 msgstr "�糸��"
 
-#: src/gtkconn.c:208
+#: src/gtkconn.c:209
 msgid "Cancel All"
 msgstr "�����羔�"
 
-#: src/gtkconn.c:425 src/gtkconn.c:460 src/gtkconn.c:526
+#: src/gtkconn.c:426 src/gtkconn.c:461 src/gtkconn.c:527
 msgid "_Reconnect"
 msgstr "���育�g�(_R)"
 
 # XXX ��⑮
-#: src/gtkconn.c:490
+#: src/gtkconn.c:491
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">%s has been disconnected.</span>\n"
@@ -2442,19 +2446,19 @@
 "%s\n"
 "%s"
 
-#: src/gtkconn.c:492
+#: src/gtkconn.c:493
 msgid "Reason Unknown."
 msgstr "���延�����"
 
-#: src/gtkconn.c:531
+#: src/gtkconn.c:532
 msgid "Reconnect _All"
 msgstr "�������育�g�(_A)"
 
-#: src/gtkconn.c:554
+#: src/gtkconn.c:555
 msgid "Account"
 msgstr "絽活��"
 
-#: src/gtkconn.c:562
+#: src/gtkconn.c:563
 msgid "Time"
 msgstr "����"
 
@@ -2797,6 +2801,7 @@
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "%d ��篋阪�������翠��"
+msgstr[1] "%d ��篋阪�������翠��"
 
 #: src/gtkconv.c:5344
 msgid "Animate"
@@ -2980,6 +2985,7 @@
 msgid "%s has %d new message."
 msgid_plural "%s has %d new messages."
 msgstr[0] "%s �� %d 絨��育�灸散��"
+msgstr[1] "%s �� %d 絨��育�灸散��"
 
 #: src/gtknotify.c:219
 #, c-format
@@ -3076,7 +3082,7 @@
 msgstr "�演�∫��菴���"
 
 #: src/gtkpounce.c:415 src/gtkprefs.c:1494 src/protocols/msn/state.c:30
-#: src/protocols/yahoo/yahoo.c:2185
+#: src/protocols/yahoo/yahoo.c:2189
 msgid "Idle"
 msgstr "��臀�"
 
@@ -3884,11 +3890,11 @@
 #. *
 #. * A wrapper for gaim_request_action() that uses Yes and No buttons.
 #.
-#: src/gtkrequest.c:193 src/protocols/gg/gg.c:660 src/request.h:843
+#: src/gtkrequest.c:193 src/protocols/gg/gg.c:660 src/request.h:992
 msgid "Yes"
 msgstr "��"
 
-#: src/gtkrequest.c:194 src/protocols/gg/gg.c:660 src/request.h:843
+#: src/gtkrequest.c:194 src/protocols/gg/gg.c:660 src/request.h:992
 msgid "No"
 msgstr "��"
 
@@ -4079,8 +4085,8 @@
 #: src/protocols/gg/gg.c:49 src/protocols/jabber/jutil.c:110
 #: src/protocols/msn/msn.c:344 src/protocols/msn/state.c:27
 #: src/protocols/msn/state.c:28 src/protocols/msn/state.c:35
-#: src/protocols/msn/state.c:36 src/protocols/yahoo/yahoo.c:2488
-#: src/protocols/yahoo/yahoo.c:2597
+#: src/protocols/msn/state.c:36 src/protocols/yahoo/yahoo.c:2492
+#: src/protocols/yahoo/yahoo.c:2601
 msgid "Available"
 msgstr "筝�膩�"
 
@@ -4095,8 +4101,8 @@
 #: src/protocols/gg/gg.c:53 src/protocols/jabber/jabber.c:929
 #: src/protocols/jabber/presence.c:91 src/protocols/oscar/oscar.c:2849
 #: src/protocols/oscar/oscar.c:4584 src/protocols/oscar/oscar.c:4611
-#: src/protocols/oscar/oscar.c:6168 src/protocols/yahoo/yahoo.c:2183
-#: src/protocols/yahoo/yahoo.c:2508 src/protocols/yahoo/yahoo.c:2607
+#: src/protocols/oscar/oscar.c:6168 src/protocols/yahoo/yahoo.c:2187
+#: src/protocols/yahoo/yahoo.c:2512 src/protocols/yahoo/yahoo.c:2611
 msgid "Invisible"
 msgstr "�沿昆"
 
@@ -4255,9 +4261,9 @@
 #: src/protocols/gg/gg.c:722 src/protocols/msn/msn.c:1286
 #: src/protocols/msn/msn.c:1530 src/protocols/napster/napster.c:387
 #: src/protocols/oscar/oscar.c:2891 src/protocols/oscar/oscar.c:3203
-#: src/protocols/toc/toc.c:498 src/protocols/yahoo/yahoo.c:2780
-#: src/protocols/yahoo/yahoo.c:2802 src/protocols/yahoo/yahoo.c:2825
-#: src/protocols/yahoo/yahoo.c:2983 src/protocols/zephyr/zephyr.c:355
+#: src/protocols/toc/toc.c:498 src/protocols/yahoo/yahoo.c:2784
+#: src/protocols/yahoo/yahoo.c:2806 src/protocols/yahoo/yahoo.c:2829
+#: src/protocols/yahoo/yahoo.c:2987 src/protocols/zephyr/zephyr.c:355
 msgid "Buddy Information"
 msgstr "絅遵�莖�荐�"
 
@@ -4500,7 +4506,7 @@
 msgid "_Channel:"
 msgstr "�脂��(_C)鐚�"
 
-#: src/protocols/irc/irc.c:163 src/protocols/jabber/chat.c:56
+#: src/protocols/irc/irc.c:163 src/protocols/jabber/chat.c:57
 msgid "_Password:"
 msgstr "絲�腆�(_P)鐚�"
 
@@ -4584,7 +4590,7 @@
 msgid " <i>(identified)</i>"
 msgstr " <i>(綏臥�茘�)</i>"
 
-#: src/protocols/irc/msgs.c:192 src/protocols/yahoo/yahoo.c:2883
+#: src/protocols/irc/msgs.c:192 src/protocols/yahoo/yahoo.c:2887
 msgid "Realname"
 msgstr "紮���"
 
@@ -4822,7 +4828,7 @@
 msgstr "��"
 
 #: src/protocols/jabber/buddy.c:248 src/protocols/jabber/buddy.c:625
-#: src/protocols/jabber/jabber.c:592 src/protocols/yahoo/yahoo.c:2879
+#: src/protocols/jabber/jabber.c:592 src/protocols/yahoo/yahoo.c:2883
 msgid "Nickname"
 msgstr "�援┗"
 
@@ -4863,7 +4869,7 @@
 msgstr "�肢�"
 
 #: src/protocols/jabber/buddy.c:257 src/protocols/jabber/buddy.c:699
-#: src/protocols/jabber/buddy.c:707 src/protocols/yahoo/yahoo.c:2875
+#: src/protocols/jabber/buddy.c:707 src/protocols/yahoo/yahoo.c:2879
 msgid "Email"
 msgstr "�糸��灸散"
 
@@ -4971,44 +4977,44 @@
 msgid "Unsubscribe"
 msgstr "緇�絅遵�����賢腱脂��"
 
-#: src/protocols/jabber/chat.c:37 src/protocols/yahoo/yahoochat.c:938
+#: src/protocols/jabber/chat.c:38 src/protocols/yahoo/yahoochat.c:938
 msgid "_Room:"
 msgstr "��紊��(_R)鐚�"
 
-#: src/protocols/jabber/chat.c:44
+#: src/protocols/jabber/chat.c:45
 msgid "_Server:"
 msgstr "篌堺����(_S)鐚�"
 
-#: src/protocols/jabber/chat.c:50
+#: src/protocols/jabber/chat.c:51
 msgid "_Handle:"
 msgstr "�援┗(_H)鐚�"
 
-#: src/protocols/jabber/chat.c:158
+#: src/protocols/jabber/chat.c:159
 #, c-format
 msgid "%s is not a valid room name"
 msgstr "%s 筝��������������紊����腮�"
 
-#: src/protocols/jabber/chat.c:159
+#: src/protocols/jabber/chat.c:160
 msgid "Invalid Room Name"
 msgstr "��紊����腮援�≧��"
 
-#: src/protocols/jabber/chat.c:164
+#: src/protocols/jabber/chat.c:165
 #, c-format
 msgid "%s is not a valid server name"
 msgstr "%s 筝������������篌堺������腮�"
 
-#: src/protocols/jabber/chat.c:165 src/protocols/jabber/chat.c:166
+#: src/protocols/jabber/chat.c:166 src/protocols/jabber/chat.c:167
 msgid "Invalid Server Name"
 msgstr "篌堺������腮援�≧��"
 
 # NOTE Arto Alakulju �主憗��room handle���恰����紊���т戎�����������援┗��綏�
-#: src/protocols/jabber/chat.c:170
+#: src/protocols/jabber/chat.c:171
 #, c-format
 msgid "%s is not a valid room handle"
 msgstr "%s 筝�������������援┗"
 
 # NOTE Arto Alakulju �主憗��room handle���恰����紊���т戎�����������援┗��綏�
-#: src/protocols/jabber/chat.c:171 src/protocols/jabber/chat.c:172
+#: src/protocols/jabber/chat.c:172 src/protocols/jabber/chat.c:173
 msgid "Invalid Room Handle"
 msgstr "�援┗�≧��"
 
@@ -5254,7 +5260,7 @@
 #: src/protocols/jabber/jabber.c:767 src/protocols/msn/dispatch.c:219
 #: src/protocols/msn/msn.c:483 src/protocols/napster/napster.c:487
 #: src/protocols/oscar/oscar.c:694 src/protocols/trepia/trepia.c:1110
-#: src/protocols/yahoo/yahoo.c:2069
+#: src/protocols/yahoo/yahoo.c:2073
 msgid "Connecting"
 msgstr "�g�筝�"
 
@@ -5271,7 +5277,7 @@
 msgstr "筝我����医��紮�筝�"
 
 #: src/protocols/jabber/jabber.c:909 src/protocols/jabber/jabber.c:962
-#: src/protocols/jabber/presence.c:296
+#: src/protocols/jabber/presence.c:292
 msgid "Error"
 msgstr "���"
 
@@ -5383,11 +5389,11 @@
 msgid "The user %s wants to add you to their buddy list."
 msgstr "篏睡���� %s �活�絨������ヤ�鐚�絅刻���絅遵�羝���賢��"
 
-#: src/protocols/jabber/presence.c:286 src/protocols/oscar/oscar.c:2950
+#: src/protocols/jabber/presence.c:282 src/protocols/oscar/oscar.c:2950
 msgid "Unknown error"
 msgstr "���ラ���"
 
-#: src/protocols/jabber/presence.c:292
+#: src/protocols/jabber/presence.c:288
 msgid "Unable to join chat"
 msgstr "�≧����ヨ��紊��"
 
@@ -5443,8 +5449,8 @@
 
 #: src/protocols/msn/dispatch.c:215 src/protocols/msn/msn.c:492
 #: src/protocols/msn/notification.c:2149 src/protocols/napster/napster.c:463
-#: src/protocols/napster/napster.c:494 src/protocols/yahoo/yahoo.c:1849
-#: src/protocols/yahoo/yahoo.c:1880 src/protocols/yahoo/yahoo.c:1945
+#: src/protocols/napster/napster.c:494 src/protocols/yahoo/yahoo.c:1853
+#: src/protocols/yahoo/yahoo.c:1884 src/protocols/yahoo/yahoo.c:1949
 msgid "Unable to connect"
 msgstr "�≧��g�"
 
@@ -5724,7 +5730,7 @@
 msgid "Page"
 msgstr "�喝��"
 
-#: src/protocols/msn/msn.c:332 src/protocols/yahoo/yahoo.c:2297
+#: src/protocols/msn/msn.c:332 src/protocols/yahoo/yahoo.c:2301
 #, c-format
 msgid "<b>Status:</b> %s"
 msgstr "<b>����鐚�</b>%s"
@@ -5735,26 +5741,26 @@
 msgstr "筝����肢����"
 
 #: src/protocols/msn/msn.c:346 src/protocols/msn/msn.c:630
-#: src/protocols/msn/state.c:31 src/protocols/yahoo/yahoo.c:2165
-#: src/protocols/yahoo/yahoo.c:2490 src/protocols/yahoo/yahoo.c:2598
+#: src/protocols/msn/state.c:31 src/protocols/yahoo/yahoo.c:2169
+#: src/protocols/yahoo/yahoo.c:2494 src/protocols/yahoo/yahoo.c:2602
 msgid "Be Right Back"
 msgstr "薤����箴�"
 
 #: src/protocols/msn/msn.c:347 src/protocols/msn/msn.c:632
-#: src/protocols/msn/state.c:29 src/protocols/yahoo/yahoo.c:2167
-#: src/protocols/yahoo/yahoo.c:2492 src/protocols/yahoo/yahoo.c:2599
+#: src/protocols/msn/state.c:29 src/protocols/yahoo/yahoo.c:2171
+#: src/protocols/yahoo/yahoo.c:2496 src/protocols/yahoo/yahoo.c:2603
 msgid "Busy"
 msgstr "綽�腆�"
 
 #: src/protocols/msn/msn.c:348 src/protocols/msn/msn.c:634
-#: src/protocols/msn/state.c:33 src/protocols/yahoo/yahoo.c:2175
-#: src/protocols/yahoo/yahoo.c:2500 src/protocols/yahoo/yahoo.c:2603
+#: src/protocols/msn/state.c:33 src/protocols/yahoo/yahoo.c:2179
+#: src/protocols/yahoo/yahoo.c:2504 src/protocols/yahoo/yahoo.c:2607
 msgid "On The Phone"
 msgstr "�肢�筝�"
 
 #: src/protocols/msn/msn.c:349 src/protocols/msn/msn.c:636
-#: src/protocols/msn/state.c:34 src/protocols/yahoo/yahoo.c:2179
-#: src/protocols/yahoo/yahoo.c:2504 src/protocols/yahoo/yahoo.c:2605
+#: src/protocols/msn/state.c:34 src/protocols/yahoo/yahoo.c:2183
+#: src/protocols/yahoo/yahoo.c:2508 src/protocols/yahoo/yahoo.c:2609
 msgid "Out To Lunch"
 msgstr "紊��榊���"
 
@@ -5796,9 +5802,14 @@
 msgid "Initiate Chat"
 msgstr "������紊��"
 
+# XXX ��⑮
 #: src/protocols/msn/msn.c:457
-msgid "SSL support is needed for MSN. Please install it."
-msgstr "MSN ��荀� SSL 腮�綣鎺�����呃�茫�絎�茖��檎����腮�綣鎺���"
+msgid ""
+"SSL support is needed for MSN. Please install a supported SSL library. See "
+"http://gaim.sf.net/faq-ssl.php for more information."
+msgstr ""
+"MSN ��荀� SSL 腮�綣鎺�����呃�茫�絎�茖�筝�������吡�� SSL 腮�綣鎺���荅恰��茫��� http://"
+"gaim.sf.net/faq-ssl.php��"
 
 #: src/protocols/msn/msn.c:745
 #, c-format
@@ -5822,33 +5833,33 @@
 "MSN ��絽活��綽����冴��user@server.com�����弱�����荐掩���������� %s@hotmail.com����"
 "��絨�筝���莅��贋������腟�羝�����"
 
-#: src/protocols/msn/msn.c:1287 src/protocols/yahoo/yahoo.c:2781
+#: src/protocols/msn/msn.c:1287 src/protocols/yahoo/yahoo.c:2785
 msgid "<html><body><b>Error retrieving profile</b></body></html>"
 msgstr "<html><body><b>莅�����篋肴�荐����主�����</b></body></html>"
 
 #. Age
 #: src/protocols/msn/msn.c:1357 src/protocols/oscar/oscar.c:4001
 #: src/protocols/trepia/trepia.c:285 src/protocols/trepia/trepia.c:413
-#: src/protocols/yahoo/yahoo.c:2891
+#: src/protocols/yahoo/yahoo.c:2895
 msgid "Age"
 msgstr "綛顔宗"
 
 #. Gender
 #: src/protocols/msn/msn.c:1364 src/protocols/oscar/oscar.c:3987
 #: src/protocols/trepia/trepia.c:279 src/protocols/trepia/trepia.c:421
-#: src/protocols/yahoo/yahoo.c:2899
+#: src/protocols/yahoo/yahoo.c:2903
 msgid "Gender"
 msgstr "�у��"
 
-#: src/protocols/msn/msn.c:1372 src/protocols/yahoo/yahoo.c:2895
+#: src/protocols/msn/msn.c:1372 src/protocols/yahoo/yahoo.c:2899
 msgid "Marital Status"
 msgstr "紿�紮紫��羈�"
 
-#: src/protocols/msn/msn.c:1379 src/protocols/yahoo/yahoo.c:2887
+#: src/protocols/msn/msn.c:1379 src/protocols/yahoo/yahoo.c:2891
 msgid "Location"
 msgstr "�����臀�"
 
-#: src/protocols/msn/msn.c:1387 src/protocols/yahoo/yahoo.c:2903
+#: src/protocols/msn/msn.c:1387 src/protocols/yahoo/yahoo.c:2907
 msgid "Occupation"
 msgstr "�傑キ"
 
@@ -5869,11 +5880,11 @@
 msgstr "��絅�/��莇�"
 
 #: src/protocols/msn/msn.c:1491 src/protocols/msn/msn.c:1497
-#: src/protocols/yahoo/yahoo.c:2938
+#: src/protocols/yahoo/yahoo.c:2942
 msgid "Favorite Quote"
 msgstr "�恰����荐�"
 
-#: src/protocols/msn/msn.c:1505 src/protocols/yahoo/yahoo.c:2974
+#: src/protocols/msn/msn.c:1505 src/protocols/yahoo/yahoo.c:2978
 msgid "Last Updated"
 msgstr "�贋�井�ユ��"
 
@@ -5884,12 +5895,12 @@
 msgstr "膓臥��"
 
 # NOTE 茘����翫�� by Ambrose
-#: src/protocols/msn/msn.c:1538 src/protocols/yahoo/yahoo.c:2989
+#: src/protocols/msn/msn.c:1538 src/protocols/yahoo/yahoo.c:2993
 #, c-format
 msgid "User information for %s unavailable"
 msgstr "�≧���緇�篏睡���� %s ����篋肴�荐�"
 
-#: src/protocols/msn/msn.c:1540 src/protocols/yahoo/yahoo.c:2991
+#: src/protocols/msn/msn.c:1540 src/protocols/yahoo/yahoo.c:2995
 msgid "The user's profile is empty."
 msgstr "����篏睡������莖�荐�����順����"
 
@@ -6010,6 +6021,11 @@
 "綽������������篋よ���\n"
 "\n"
 "�句境茘桁轡篏�腟���鐚������札��綺��糸�ャ��"
+msgstr[1] ""
+"MSN 篌堺�����荀��� %d �����ч����篁ラ�画�膓㊧Ⅲ鐚�絮���������延失����������糸�冴��茫���"
+"綽������������篋よ���\n"
+"\n"
+"�句境茘桁轡篏�腟���鐚������札��綺��糸�ャ��"
 
 #: src/protocols/msn/servconn.c:533
 msgid "Received HTTP error. Please report this."
@@ -6464,7 +6480,7 @@
 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 ��箴���荐�������阪����遵お紊т���"
+msgstr[1] "���阪け篋� %hu ���� %s ��箴���荐�������阪���紊�ぇ篋���"
 
 #: src/protocols/oscar/oscar.c:2794
 #, c-format
@@ -6473,24 +6489,29 @@
 msgid_plural ""
 "You missed %hu messages from %s because the rate limit has been exceeded."
 msgstr[0] "���阪け篋� %hu ���� %s ��箴���荐�������阪��渇������綺�お綽���"
-
+msgstr[1] "���阪け篋� %hu ���� %s ��箴���荐�������阪����渇������綺�お綽���"
+
+# XXX 莊����㊥����茘���������鐚��頑⑮�����<��絅遵�頫�筝���鐚�筝���
 #: src/protocols/oscar/oscar.c:2803
 #, 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 ��箴���荐�������坂� / 絅劫お���>���"
 
 #: src/protocols/oscar/oscar.c:2812
 #, 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 ��箴���荐�������堺��お���>���"
 
 #: src/protocols/oscar/oscar.c:2821
 #, 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."
 msgstr[0] "�����坂���������阪け篋� %hu ���� %s ��箴���荐�����"
+msgstr[1] "�����坂���������阪け篋� %hu ���� %s ��箴���荐�����"
 
 #: src/protocols/oscar/oscar.c:2837 src/protocols/oscar/oscar.c:4608
 #: src/protocols/oscar/oscar.c:6167
@@ -6548,7 +6569,7 @@
 msgstr "�ユ�倶�罅�"
 
 #: src/protocols/oscar/oscar.c:3095 src/protocols/oscar/oscar.c:6258
-#: src/protocols/yahoo/yahoo.c:2346
+#: src/protocols/yahoo/yahoo.c:2350
 msgid "Send File"
 msgstr "�渇��罟�罅�"
 
@@ -6862,6 +6883,7 @@
 "The maximum profile length of %d bytes has been exceeded.  Gaim has "
 "truncated it for you."
 msgstr[0] "莇��阪��篋肴�荐����桁墾筝��� %d 篏���腟���Gaim 絨������㊤�у�緇��画�荐㊤���"
+msgstr[1] "莇��阪��篋肴�荐����桁墾筝��� %d 篏���腟���Gaim 絨������㊤�у�緇��画�荐㊤���"
 
 #: src/protocols/oscar/oscar.c:4505
 msgid "Profile too long."
@@ -6889,6 +6911,7 @@
 "The maximum away message length of %d bytes has been exceeded.  Gaim has "
 "truncated it for you."
 msgstr[0] "莇��咲�∫��荐������桁墾筝��� %d 篏���腟���Gaim 絨������㊤�у�緇��画�荐㊤���"
+msgstr[1] "莇��咲�∫��荐������桁墾筝��� %d 篏���腟���Gaim 絨������㊤�у�緇��画�荐㊤���"
 
 #: src/protocols/oscar/oscar.c:4568
 msgid "Away message too long."
@@ -7026,7 +7049,7 @@
 msgid "<b>Status:</b> Not Authorized"
 msgstr "<b>����鐚�</b>���茘�"
 
-#: src/protocols/oscar/oscar.c:5572 src/protocols/yahoo/yahoo.c:2187
+#: src/protocols/oscar/oscar.c:5572 src/protocols/yahoo/yahoo.c:2191
 msgid "Offline"
 msgstr "�∝�"
 
@@ -7378,6 +7401,7 @@
 msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
 msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
 msgstr[0] "%s 荀�羆� %s �ユ�� %d ��罟�罅�鐚�%s (%.2f %s)%s%s"
+msgstr[1] "%s 荀�羆� %s �ユ�� %d ��罟�罅�鐚�%s (%.2f %s)%s%s"
 
 #: src/protocols/toc/toc.c:2083
 #, c-format
@@ -7494,22 +7518,29 @@
 msgid "Trepia Protocol Plugin"
 msgstr "Trepia ��絎�罔∞�"
 
-#: src/protocols/yahoo/yahoo.c:726
+# XXX ��⑮
+#: src/protocols/yahoo/yahoo.c:297
+msgid ""
+"You have been logged off as you have logged in on a different machine or "
+"device."
+msgstr "��群膓�茴��糸�削����堺��群��Ί����糸�ャ��"
+
+#: src/protocols/yahoo/yahoo.c:730
 msgid "Your Yahoo! message did not get sent."
 msgstr "���� Yahoo! 荐���研羃���茴����冴��"
 
 # XXX ��⑮
-#: src/protocols/yahoo/yahoo.c:768
+#: src/protocols/yahoo/yahoo.c:772
 #, c-format
 msgid "Yahoo! system message for %s:"
 msgstr "%s �� Yahoo! 膤紫輝荐����"
 
-#: src/protocols/yahoo/yahoo.c:834
+#: src/protocols/yahoo/yahoo.c:838
 #, c-format
 msgid "%s has (retroactively) denied your request to add them to your list."
 msgstr "篏睡���� %s ������腟�篋�������絨�篁�鐚�絅刻��医��恰����絅遵�羝�����荀�羆���"
 
-#: src/protocols/yahoo/yahoo.c:837
+#: src/protocols/yahoo/yahoo.c:841
 #, c-format
 msgid ""
 "%s has (retroactively) denied your request to add them to your list for the "
@@ -7518,11 +7549,11 @@
 "篏睡���� %s ���坂�������鐚�������腟�篋�������絨�篁�鐚�絅刻��医��恰����絅遵�羝�����荀�羆�鐚�%"
 "s"
 
-#: src/protocols/yahoo/yahoo.c:840
+#: src/protocols/yahoo/yahoo.c:844
 msgid "Add buddy rejected"
 msgstr "�医�絅遵�茴���"
 
-#: src/protocols/yahoo/yahoo.c:1490
+#: src/protocols/yahoo/yahoo.c:1494
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -7532,11 +7563,11 @@
 "Yahoo 篌堺�����羆�篋�篏睡���腮������茯�茘��劫�鐚���罩ら���������� Gaim 緇����巡�������"
 "�糸�� Yahoo��茫��� %s 罟∽�ユ��羃����贋�亥��������"
 
-#: src/protocols/yahoo/yahoo.c:1493
+#: src/protocols/yahoo/yahoo.c:1497
 msgid "Failed Yahoo! Authentication"
 msgstr "Yahoo! 茯�茘�紊掩��"
 
-#: src/protocols/yahoo/yahoo.c:1566
+#: src/protocols/yahoo/yahoo.c:1570
 #, c-format
 msgid ""
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
@@ -7545,68 +7576,68 @@
 "����荅�申�ュ������絅遵������х�� %s��絋�������膊���篁�鐚�絅刻�緇�����絅遵�羝���賢腱脂�わ�筝�"
 "���喝申�ヤ�鐚�絅刻�鐚�茫���筝�筝���������"
 
-#: src/protocols/yahoo/yahoo.c:1569
+#: src/protocols/yahoo/yahoo.c:1573
 msgid "Ignore buddy?"
 msgstr "綽順�ヤ戎����鐚�"
 
-#: src/protocols/yahoo/yahoo.c:1602
+#: src/protocols/yahoo/yahoo.c:1606
 msgid "Invalid username."
 msgstr "篏睡������腮援�≧����"
 
-#: src/protocols/yahoo/yahoo.c:1605
+#: src/protocols/yahoo/yahoo.c:1609
 msgid "Incorrect password."
 msgstr "�����絲�腆若��"
 
 # XXX ��⑮
-#: src/protocols/yahoo/yahoo.c:1608
+#: src/protocols/yahoo/yahoo.c:1612
 msgid "Your account is locked, please log in to the yahoo website."
 msgstr "篏���絽恰�句����茴������茫����糸�� Yahoo 膓牙���"
 
-#: src/protocols/yahoo/yahoo.c:1611
+#: src/protocols/yahoo/yahoo.c:1615
 #, c-format
 msgid "Unknown error number %d."
 msgstr "���ョ�����篁g⊆ %d��"
 
-#: src/protocols/yahoo/yahoo.c:1668
+#: src/protocols/yahoo/yahoo.c:1672
 #, c-format
 msgid "Could not add buddy %s to group %s to the server list on account %s."
 msgstr "�≧�絨�絅遵���%1$s���医��喝験����%3$s����失�������羝����х��臂ょ���%2$s����"
 
-#: src/protocols/yahoo/yahoo.c:1670
+#: src/protocols/yahoo/yahoo.c:1674
 msgid "Could not add buddy to server list"
 msgstr "�≧�絨�絅遵��医��割失�������羝�����"
 
-#: src/protocols/yahoo/yahoo.c:1780 src/protocols/yahoo/yahoo.c:1910
+#: src/protocols/yahoo/yahoo.c:1784 src/protocols/yahoo/yahoo.c:1914
 msgid "Unable to read"
 msgstr "�≧�莅���"
 
-#: src/protocols/yahoo/yahoo.c:1935 src/protocols/yahoo/yahoo.c:2044
-#: src/protocols/yahoo/yahoo.c:2085
+#: src/protocols/yahoo/yahoo.c:1939 src/protocols/yahoo/yahoo.c:2048
+#: src/protocols/yahoo/yahoo.c:2089
 msgid "Connection problem"
 msgstr "�g����"
 
-#: src/protocols/yahoo/yahoo.c:2169 src/protocols/yahoo/yahoo.c:2494
-#: src/protocols/yahoo/yahoo.c:2600
+#: src/protocols/yahoo/yahoo.c:2173 src/protocols/yahoo/yahoo.c:2498
+#: src/protocols/yahoo/yahoo.c:2604
 msgid "Not At Home"
 msgstr "筝����"
 
-#: src/protocols/yahoo/yahoo.c:2171 src/protocols/yahoo/yahoo.c:2496
-#: src/protocols/yahoo/yahoo.c:2601
+#: src/protocols/yahoo/yahoo.c:2175 src/protocols/yahoo/yahoo.c:2500
+#: src/protocols/yahoo/yahoo.c:2605
 msgid "Not At Desk"
 msgstr "筝���婚篏�"
 
-#: src/protocols/yahoo/yahoo.c:2173 src/protocols/yahoo/yahoo.c:2498
-#: src/protocols/yahoo/yahoo.c:2602
+#: src/protocols/yahoo/yahoo.c:2177 src/protocols/yahoo/yahoo.c:2502
+#: src/protocols/yahoo/yahoo.c:2606
 msgid "Not In Office"
 msgstr "筝���商���"
 
-#: src/protocols/yahoo/yahoo.c:2177 src/protocols/yahoo/yahoo.c:2502
-#: src/protocols/yahoo/yahoo.c:2604
+#: src/protocols/yahoo/yahoo.c:2181 src/protocols/yahoo/yahoo.c:2506
+#: src/protocols/yahoo/yahoo.c:2608
 msgid "On Vacation"
 msgstr "羝≦���私�"
 
-#: src/protocols/yahoo/yahoo.c:2181 src/protocols/yahoo/yahoo.c:2506
-#: src/protocols/yahoo/yahoo.c:2606
+#: src/protocols/yahoo/yahoo.c:2185 src/protocols/yahoo/yahoo.c:2510
+#: src/protocols/yahoo/yahoo.c:2610
 msgid "Stepped Out"
 msgstr "莎医�阪サ篋�"
 
@@ -7614,88 +7645,88 @@
 # 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)
-#: src/protocols/yahoo/yahoo.c:2245 src/protocols/yahoo/yahoo.c:2277
+#: src/protocols/yahoo/yahoo.c:2249 src/protocols/yahoo/yahoo.c:2281
 msgid "Not on server list"
 msgstr "筝���失�������羝���賢"
 
 # NOTE #gaim �� Vann �� LSchiere 茹o�絋����後�篋���絅遵��������寂�����紊��箴水���ヨ�����紊�
 # NOTE Yahoo ����Chat��罩e�茘����冴��������違��
-#: src/protocols/yahoo/yahoo.c:2333
+#: src/protocols/yahoo/yahoo.c:2337
 msgid "Join in Chat"
 msgstr "���ュソ��������������紊��"
 
 # NOTE����茘医������������顑���Yahoo! 絅遵�閽����冴��Conference����箴�罩e�筝㊧⑮����
-#: src/protocols/yahoo/yahoo.c:2339
+#: src/protocols/yahoo/yahoo.c:2343
 msgid "Initiate Conference"
 msgstr "������茘医�"
 
-#: src/protocols/yahoo/yahoo.c:2392
+#: src/protocols/yahoo/yahoo.c:2396
 msgid "Active which ID?"
 msgstr "��������� ID鐚�"
 
 # NOTE #gaim �� Vann �� LSchiere 茹o�絋����後�篋���絅遵��������寂�����紊��箴水���ヨ�����紊�
 # NOTE Yahoo ����Chat��罩e�茘����冴��������違��
-#: src/protocols/yahoo/yahoo.c:2400
+#: src/protocols/yahoo/yahoo.c:2404
 msgid "Join who in chat?"
 msgstr "���ュ����絅遵�������������紊��鐚�"
 
-#: src/protocols/yahoo/yahoo.c:2411
+#: src/protocols/yahoo/yahoo.c:2415
 msgid "Activate ID..."
 msgstr "���� ID..."
 
-#: src/protocols/yahoo/yahoo.c:2417
+#: src/protocols/yahoo/yahoo.c:2421
 msgid "Join user in chat..."
 msgstr "���ュソ��������������紊��..."
 
-#: src/protocols/yahoo/yahoo.c:2798
+#: src/protocols/yahoo/yahoo.c:2802
 msgid ""
 "<b>Sorry, profiles marked as containing adult content are not supported at "
 "this time.</b><br><br>\n"
 msgstr "<b>絨�筝�莎件�����筝����吓�у�茴����阪��腴ヤ�絎�����篋肴�荐���</b><br><br>\n"
 
 # NOTE 羈������腟���⑮��箙�筝�蕁�ず鐚���茘�����篁ヤ���
-#: src/protocols/yahoo/yahoo.c:2799 src/protocols/yahoo/yahoo.c:2822
+#: src/protocols/yahoo/yahoo.c:2803 src/protocols/yahoo/yahoo.c:2826
 msgid ""
 "If you wish to view this profile, you will need to visit this link in your "
 "web browser<br>"
 msgstr "������括��������篋肴�荐�鐚�茫��������頳遵������篁ヤ��g�<br>"
 
-#: src/protocols/yahoo/yahoo.c:2821
+#: src/protocols/yahoo/yahoo.c:2825
 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:2869 src/protocols/yahoo/yahoo.c:2870
+#: src/protocols/yahoo/yahoo.c:2873 src/protocols/yahoo/yahoo.c:2874
 msgid "Yahoo! ID"
 msgstr "Yahoo! 絽活��"
 
-#: src/protocols/yahoo/yahoo.c:2914 src/protocols/yahoo/yahoo.c:2917
-#: src/protocols/yahoo/yahoo.c:2920
+#: src/protocols/yahoo/yahoo.c:2918 src/protocols/yahoo/yahoo.c:2921
+#: src/protocols/yahoo/yahoo.c:2924
 msgid "Hobbies"
 msgstr "��絅�"
 
-#: src/protocols/yahoo/yahoo.c:2929 src/protocols/yahoo/yahoo.c:2932
+#: src/protocols/yahoo/yahoo.c:2933 src/protocols/yahoo/yahoo.c:2936
 msgid "Latest News"
 msgstr "���井���"
 
-#: src/protocols/yahoo/yahoo.c:2946
+#: src/protocols/yahoo/yahoo.c:2950
 msgid "Home Page"
 msgstr "膓臥��"
 
-#: src/protocols/yahoo/yahoo.c:2958
+#: src/protocols/yahoo/yahoo.c:2962
 msgid "Cool Link 1"
 msgstr "�潔�g�(筝�)"
 
-#: src/protocols/yahoo/yahoo.c:2962
+#: src/protocols/yahoo/yahoo.c:2966
 msgid "Cool Link 2"
 msgstr "�潔�g�(篋�)"
 
-#: src/protocols/yahoo/yahoo.c:2964
+#: src/protocols/yahoo/yahoo.c:2968
 msgid "Cool Link 3"
 msgstr "�潔�g�(筝�)"
 
 # XXX �壕⑮��荐糸���ユ���������莠�����鐚�
-#: src/protocols/yahoo/yahoo.c:2970
+#: src/protocols/yahoo/yahoo.c:2974
 msgid "Member Since"
 msgstr "���堺���∞������"
 
@@ -7709,23 +7740,23 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/yahoo/yahoo.c:3171 src/protocols/yahoo/yahoo.c:3173
+#: src/protocols/yahoo/yahoo.c:3175 src/protocols/yahoo/yahoo.c:3177
 msgid "Yahoo Protocol Plugin"
 msgstr "Yahoo ��絎�罔∞�"
 
-#: src/protocols/yahoo/yahoo.c:3190
+#: src/protocols/yahoo/yahoo.c:3194
 msgid "Pager host"
 msgstr "�喝�主鎧腟延失����"
 
-#: src/protocols/yahoo/yahoo.c:3193
+#: src/protocols/yahoo/yahoo.c:3197
 msgid "Pager port"
 msgstr "�喝�主鎧腟演��荐���"
 
-#: src/protocols/yahoo/yahoo.c:3196
+#: src/protocols/yahoo/yahoo.c:3200
 msgid "File transfer host"
 msgstr "罟�罅��活叱筝紙�"
 
-#: src/protocols/yahoo/yahoo.c:3199
+#: src/protocols/yahoo/yahoo.c:3203
 msgid "File transfer port"
 msgstr "罟�罅��活叱��荐���"
 
@@ -7856,7 +7887,7 @@
 #. *
 #. * A wrapper for gaim_request_action() that uses Accept and Cancel buttons.
 #.
-#: src/request.h:862
+#: src/request.h:1011
 msgid "Accept"
 msgstr "�ュ�"
 
@@ -7869,6 +7900,7 @@
 msgid "(%d message)"
 msgid_plural "(%d messages)"
 msgstr[0] "鐚�%d ��荐����"
+msgstr[1] "鐚�%d ��荐����"
 
 #: src/server.c:961
 msgid "(1 message)"
@@ -7942,16 +7974,19 @@
 msgid "day"
 msgid_plural "days"
 msgstr[0] "紊�"
+msgstr[1] "紊�"
 
 #: src/util.c:1928 src/util.c:1932 src/util.c:1946 src/util.c:1948
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "絨��"
+msgstr[1] "鎞��"
 
 #: src/util.c:1928 src/util.c:1937 src/util.c:1946 src/util.c:1951
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "��"
+msgstr[1] "��"
 
 #: src/util.c:2283
 msgid "g003: Error opening connection.\n"
@@ -7969,6 +8004,9 @@
 msgid "Notification"
 msgstr "����"
 
+#~ msgid "SSL support is needed for MSN. Please install it."
+#~ msgstr "MSN ��頳� SSL 腮�綣鎺�����呃�茫�絎�茖��檎����腮�綣鎺���"
+
 # XXX ��鐚�筝��遵���筝���������......
 #~ msgid "Esperanto"
 #~ msgstr "筝���茯�"