diff po/ja.po @ 20639:576dacab8a1f

Check in updated po files because holy crap, it cut the time that it takes to run stats.pl on my machine from 30 minutes to 30 seconds.
author Mark Doliner <mark@kingant.net>
date Tue, 25 Sep 2007 08:47:16 +0000
parents e5b23336e52f
children 15ad77c653ad
line wrap: on
line diff
--- a/po/ja.po	Tue Sep 25 07:37:18 2007 +0000
+++ b/po/ja.po	Tue Sep 25 08:47:16 2007 +0000
@@ -6,11 +6,12 @@
 #
 # This file is distributed under the same license as the 'pidgin' package.
 #
+#: ../libpurple/certificate.c:543
 msgid ""
 msgstr ""
 "Project-Id-Version: pidgin trunk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-06-30 14:57+0900\n"
+"POT-Creation-Date: 2007-09-25 01:15-0700\n"
 "PO-Revision-Date: 2007-06-30 14:57+0900\n"
 "Last-Translator: Takeshi AIHANA <takeshi.aihana@gmail.com>\n"
 "Language-Team: Japanese <gnome-translation@gnome.gr.jp>\n"
@@ -19,12 +20,17 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../finch/finch.c:180
+#: ../finch/finch.c:64 ../finch/finch.c:301 ../finch/finch.c:330
+#: ../finch/finch.c:418
+msgid "Finch"
+msgstr "Finch"
+
+#: ../finch/finch.c:206
 #, c-format
 msgid "%s. Try `%s -h' for more information.\n"
 msgstr "%s (詳しい情報は `%s -h' と入力して下さい)\n"
 
-#: ../finch/finch.c:182
+#: ../finch/finch.c:208
 #, c-format
 msgid ""
 "%s\n"
@@ -45,13 +51,7 @@
 "  -n, --nologin       自動的にサイン・インしない\n"
 "  -v, --version       現在使用しているバージョンを表示して終了する\n"
 
-#. Translators may want to transliterate the name.
-#. It is not to be translated.
-#: ../finch/finch.c:274 ../finch/finch.c:303
-msgid "Finch"
-msgstr "Finch"
-
-#: ../finch/finch.c:301 ../pidgin/gtkmain.c:682
+#: ../finch/finch.c:328 ../pidgin/gtkmain.c:718
 #, c-format
 msgid ""
 "%s encountered errors migrating your settings from %s to %s. Please "
@@ -62,98 +62,113 @@
 "を調査した上で手動にて移行を完了して下さい。それから http://developer.pidgin."
 "im にて問題を報告して下さい。"
 
-#: ../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
+#: ../finch/gntaccount.c:124 ../finch/gntaccount.c:484 ../finch/gntblist.c:300
+#: ../finch/gntblist.c:433 ../finch/gntblist.c:446 ../finch/gntplugin.c:186
+#: ../finch/gntplugin.c:234 ../finch/gntstatus.c:301 ../finch/gntstatus.c:310
+#: ../finch/plugins/gntclipboard.c:115 ../finch/plugins/gntclipboard.c:121
+#: ../finch/plugins/gntclipboard.c:128
+#: ../libpurple/protocols/jabber/buddy.c:2032
 #: ../libpurple/protocols/jabber/chat.c:677
 #: ../libpurple/protocols/jabber/chat.c:688
-#: ../libpurple/protocols/jabber/jabber.c:1235
-#: ../libpurple/protocols/qq/group_join.c:326
-#: ../libpurple/protocols/silc/ops.c:57 ../libpurple/protocols/silc/ops.c:1456
+#: ../libpurple/protocols/jabber/jabber.c:1515
+#: ../libpurple/protocols/qq/group_join.c:328
+#: ../libpurple/protocols/qq/im.c:576 ../libpurple/protocols/silc/ops.c:57
+#: ../libpurple/protocols/silc/ops.c:1456
 #: ../libpurple/protocols/silc10/ops.c:1451
 msgid "Error"
 msgstr "エラー"
 
-#: ../finch/gntaccount.c:119
+#: ../finch/gntaccount.c:124
 msgid "Account was not added"
 msgstr "アカウントが追加されませんでした"
 
-#: ../finch/gntaccount.c:120
+#: ../finch/gntaccount.c:125
 msgid "Screenname of an account must be non-empty."
 msgstr "アカウントのスクリーン名は空にしないで下さい。"
 
-#: ../finch/gntaccount.c:423
+#: ../finch/gntaccount.c:437
 msgid "New mail notifications"
 msgstr "新着メールを通知する"
 
-#: ../finch/gntaccount.c:433
+#: ../finch/gntaccount.c:447
 msgid "Remember password"
 msgstr "パスワードを保存する"
 
-#: ../finch/gntaccount.c:474 ../pidgin/gtkaccount.c:1478
-#: ../pidgin/gtkblist.c:4005
+#: ../finch/gntaccount.c:485
+msgid "There's no protocol plugins installed."
+msgstr ""
+
+#: ../finch/gntaccount.c:486
+msgid "(You probably forgot to 'make install'.)"
+msgstr ""
+
+#: ../finch/gntaccount.c:496 ../finch/gntconn.c:137
+#: ../pidgin/gtkaccount.c:1473 ../pidgin/gtkblist.c:4322
 msgid "Modify Account"
 msgstr "アカウントの編集"
 
-#: ../finch/gntaccount.c:474
+#: ../finch/gntaccount.c:496
 msgid "New Account"
 msgstr "新しいアカウント"
 
-#: ../finch/gntaccount.c:500 ../pidgin/gtkft.c:695
+#: ../finch/gntaccount.c:521 ../pidgin/gtkft.c:696
 msgid "Protocol:"
 msgstr "プロトコル:"
 
-#: ../finch/gntaccount.c:508
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:295
+#: ../finch/gntaccount.c:529
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:290
 msgid "Screen name:"
 msgstr "スクリーン名:"
 
-#: ../finch/gntaccount.c:521
+#: ../finch/gntaccount.c:542
 msgid "Password:"
 msgstr "パスワード:"
 
-#: ../finch/gntaccount.c:531
+#: ../finch/gntaccount.c:552
 msgid "Alias:"
 msgstr "別名:"
 
 #. Cancel button
 #. Cancel
-#: ../finch/gntaccount.c:554 ../finch/gntaccount.c:617
-#: ../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
-#: ../libpurple/account.c:1269 ../libpurple/conversation.c:1168
-#: ../libpurple/plugins/buddynote.c:51 ../libpurple/protocols/gg/gg.c:502
-#: ../libpurple/protocols/gg/gg.c:661 ../libpurple/protocols/gg/gg.c:798
-#: ../libpurple/protocols/gg/gg.c:879
-#: ../libpurple/protocols/jabber/buddy.c:584
-#: ../libpurple/protocols/jabber/buddy.c:1788
-#: ../libpurple/protocols/jabber/buddy.c:1824
+#: ../finch/gntaccount.c:575 ../finch/gntaccount.c:638
+#: ../finch/gntaccount.c:889 ../finch/gntblist.c:344 ../finch/gntblist.c:421
+#: ../finch/gntblist.c:456 ../finch/gntblist.c:803 ../finch/gntblist.c:1005
+#: ../finch/gntblist.c:1101 ../finch/gntblist.c:2224 ../finch/gntcertmgr.c:91
+#: ../finch/gntplugin.c:379 ../finch/gntpounce.c:459 ../finch/gntpounce.c:667
+#: ../finch/gntprefs.c:265 ../finch/gntsound.c:1058 ../finch/gntstatus.c:145
+#: ../finch/gntstatus.c:485 ../finch/gntstatus.c:610
+#: ../libpurple/account.c:1013 ../libpurple/account.c:1263
+#: ../libpurple/account.c:1298 ../libpurple/conversation.c:1215
+#: ../libpurple/plugins/buddynote.c:51 ../libpurple/protocols/gg/gg.c:507
+#: ../libpurple/protocols/gg/gg.c:666 ../libpurple/protocols/gg/gg.c:803
+#: ../libpurple/protocols/gg/gg.c:884
+#: ../libpurple/protocols/jabber/buddy.c:728
+#: ../libpurple/protocols/jabber/buddy.c:2416
+#: ../libpurple/protocols/jabber/buddy.c:2452
 #: ../libpurple/protocols/jabber/chat.c:786
-#: ../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:6071
-#: ../libpurple/protocols/oscar/peer.c:1023
+#: ../libpurple/protocols/jabber/jabber.c:1008
+#: ../libpurple/protocols/jabber/jabber.c:1017
+#: ../libpurple/protocols/jabber/jabber.c:1737
+#: ../libpurple/protocols/jabber/si.c:874
+#: ../libpurple/protocols/jabber/usermood.c:184
+#: ../libpurple/protocols/jabber/usernick.c:78
+#: ../libpurple/protocols/jabber/xdata.c:400
+#: ../libpurple/protocols/msn/msn.c:290 ../libpurple/protocols/msn/msn.c:307
+#: ../libpurple/protocols/msn/msn.c:324 ../libpurple/protocols/msn/msn.c:341
+#: ../libpurple/protocols/msn/msn.c:362
+#: ../libpurple/protocols/oscar/oscar.c:6092
+#: ../libpurple/protocols/oscar/peer.c:1046
 #: ../libpurple/protocols/qq/buddy_info.c:484
 #: ../libpurple/protocols/qq/buddy_opt.c:214
-#: ../libpurple/protocols/qq/buddy_opt.c:409
+#: ../libpurple/protocols/qq/buddy_opt.c:411
 #: ../libpurple/protocols/qq/group.c:124
-#: ../libpurple/protocols/qq/group_join.c:138
-#: ../libpurple/protocols/qq/group_join.c:363
-#: ../libpurple/protocols/qq/group_opt.c:143
-#: ../libpurple/protocols/qq/group_opt.c:398
-#: ../libpurple/protocols/qq/sys_msg.c:115
-#: ../libpurple/protocols/qq/sys_msg.c:174
-#: ../libpurple/protocols/qq/sys_msg.c:269
+#: ../libpurple/protocols/qq/group_join.c:140
+#: ../libpurple/protocols/qq/group_join.c:365
+#: ../libpurple/protocols/qq/group_opt.c:144
+#: ../libpurple/protocols/qq/group_opt.c:399
+#: ../libpurple/protocols/qq/sys_msg.c:113
+#: ../libpurple/protocols/qq/sys_msg.c:172
+#: ../libpurple/protocols/qq/sys_msg.c:266
 #: ../libpurple/protocols/sametime/sametime.c:3388
 #: ../libpurple/protocols/sametime/sametime.c:3474
 #: ../libpurple/protocols/sametime/sametime.c:3645
@@ -176,160 +191,166 @@
 #: ../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:5898
-#: ../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
-#: ../pidgin/gtkrequest.c:270 ../pidgin/gtksavedstatuses.c:337
+#: ../libpurple/protocols/yahoo/yahoo.c:1031
+#: ../libpurple/protocols/yahoo/yahoo.c:3497
+#: ../libpurple/protocols/yahoo/yahoo.c:3508 ../pidgin/gtkaccount.c:1908
+#: ../pidgin/gtkaccount.c:2495 ../pidgin/gtkblist.c:6267
+#: ../pidgin/gtkcertmgr.c:197 ../pidgin/gtkdialogs.c:767
+#: ../pidgin/gtkdialogs.c:906 ../pidgin/gtkdialogs.c:998
+#: ../pidgin/gtkdialogs.c:1018 ../pidgin/gtkdialogs.c:1042
+#: ../pidgin/gtkdialogs.c:1064 ../pidgin/gtkdialogs.c:1112
+#: ../pidgin/gtkdialogs.c:1153 ../pidgin/gtkdialogs.c:1209
+#: ../pidgin/gtkdialogs.c:1248 ../pidgin/gtkdialogs.c:1275
+#: ../pidgin/gtkimhtmltoolbar.c:435 ../pidgin/gtklog.c:328
+#: ../pidgin/gtkplugin.c:289 ../pidgin/gtkpounce.c:1101
+#: ../pidgin/gtkprivacy.c:563 ../pidgin/gtkprivacy.c:579
+#: ../pidgin/gtkprivacy.c:604 ../pidgin/gtkprivacy.c:618
+#: ../pidgin/gtkrequest.c:271 ../pidgin/gtksavedstatuses.c:345
+#: ../pidgin/gtkstatusbox.c:1574
 msgid "Cancel"
 msgstr "キャンセル"
 
 #. Save button
 #. Save
-#: ../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:748
-#: ../pidgin/gtkrequest.c:276
+#: ../finch/gntaccount.c:579 ../finch/gntcertmgr.c:311
+#: ../finch/gntplugin.c:379 ../finch/gntpounce.c:465 ../finch/gntprefs.c:265
+#: ../finch/gntsound.c:1055 ../finch/gntstatus.c:488 ../finch/gntstatus.c:598
+#: ../libpurple/account.c:1297 ../libpurple/plugins/buddynote.c:50
+#: ../libpurple/protocols/jabber/buddy.c:727 ../pidgin/gtkdebug.c:749
+#: ../pidgin/gtkrequest.c:277
 msgid "Save"
 msgstr "保存する"
 
-#: ../finch/gntaccount.c:611 ../pidgin/gtkaccount.c:1908
-#: ../pidgin/gtksavedstatuses.c:328
+#: ../finch/gntaccount.c:632 ../pidgin/gtkaccount.c:1900
+#: ../pidgin/gtksavedstatuses.c:333 ../pidgin/gtkstatusbox.c:1568
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "本当に %s を削除してもよろしいですか?"
 
-#: ../finch/gntaccount.c:614
+#: ../finch/gntaccount.c:635
 msgid "Delete Account"
 msgstr "アカウントの削除"
 
 #. 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:1915 ../pidgin/gtklog.c:301
-#: ../pidgin/gtkpounce.c:1101 ../pidgin/gtkrequest.c:273
-#: ../pidgin/gtksavedstatuses.c:336
+#: ../finch/gntaccount.c:637 ../finch/gntaccount.c:707
+#: ../finch/gntcertmgr.c:319 ../finch/gntpounce.c:666 ../finch/gntpounce.c:729
+#: ../finch/gntstatus.c:144 ../finch/gntstatus.c:210
+#: ../pidgin/gtkaccount.c:1907 ../pidgin/gtklog.c:327
+#: ../pidgin/gtkpounce.c:1100 ../pidgin/gtkrequest.c:274
+#: ../pidgin/gtksavedstatuses.c:344 ../pidgin/gtkstatusbox.c:1573
 msgid "Delete"
 msgstr "削除する"
 
-#: ../finch/gntaccount.c:646 ../finch/gntblist.c:2065 ../finch/gntui.c:76
-#: ../pidgin/gtkaccount.c:2340 ../pidgin/gtkdocklet.c:522
+#: ../finch/gntaccount.c:669 ../finch/gntblist.c:2121 ../finch/gntui.c:82
+#: ../pidgin/gtkaccount.c:2325 ../pidgin/gtkdocklet.c:522
 msgid "Accounts"
 msgstr "アカウント"
 
-#: ../finch/gntaccount.c:652
+#: ../finch/gntaccount.c:675
 msgid "You can enable/disable accounts from the following list."
 msgstr "次の一覧にあるアカウントの有効/無効を変更できます:"
 
 #. Add button
-#: ../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
+#: ../finch/gntaccount.c:698 ../finch/gntaccount.c:888 ../finch/gntblist.c:343
+#: ../finch/gntblist.c:421 ../finch/gntblist.c:456 ../finch/gntblist.c:2305
+#: ../finch/gntcertmgr.c:306 ../finch/gntnotify.c:383 ../finch/gntpounce.c:713
+#: ../finch/gntstatus.c:199 ../libpurple/protocols/gg/gg.c:883
+#: ../libpurple/protocols/qq/sys_msg.c:114
+#: ../libpurple/protocols/qq/sys_msg.c:173
+#: ../libpurple/protocols/qq/sys_msg.c:267
 #: ../libpurple/protocols/sametime/sametime.c:5486
 #: ../libpurple/protocols/silc/chat.c:615
-#: ../libpurple/protocols/silc10/chat.c:599 ../pidgin/gtkaccount.c:2513
-#: ../pidgin/gtkblist.c:5897 ../pidgin/gtkconv.c:1687
-#: ../pidgin/gtkrequest.c:274
+#: ../libpurple/protocols/silc10/chat.c:599 ../pidgin/gtkaccount.c:2494
+#: ../pidgin/gtkblist.c:6266 ../pidgin/gtkconv.c:1712
+#: ../pidgin/gtkrequest.c:275
 msgid "Add"
 msgstr "追加する"
 
 #. Modify button
-#: ../finch/gntaccount.c:679 ../finch/gntpounce.c:706
+#: ../finch/gntaccount.c:703 ../finch/gntpounce.c:721
 msgid "Modify"
 msgstr "変更する"
 
-#: ../finch/gntaccount.c:775 ../pidgin/gtkaccount.c:2460
+#: ../finch/gntaccount.c:811 ../pidgin/gtkaccount.c:2441
 #, 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:848 ../pidgin/gtkaccount.c:2512
+#: ../finch/gntaccount.c:884 ../pidgin/gtkaccount.c:2493
 msgid "Add buddy to your list?"
 msgstr "仲間をリストに追加しますか?"
 
-#: ../finch/gntaccount.c:902 ../pidgin/gtkaccount.c:2564
+#: ../finch/gntaccount.c:944 ../pidgin/gtkaccount.c:2551
 #, 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:922 ../finch/gntaccount.c:929
-#: ../pidgin/gtkaccount.c:2587 ../pidgin/gtkaccount.c:2593
+#: ../finch/gntaccount.c:969 ../finch/gntaccount.c:972
+#: ../finch/gntaccount.c:999 ../pidgin/gtkaccount.c:2574
+#: ../pidgin/gtkaccount.c:2580
 msgid "Authorize buddy?"
 msgstr "仲間として承認しますか?"
 
-#: ../finch/gntaccount.c:926 ../finch/gntaccount.c:933
-#: ../pidgin/gtkaccount.c:2588 ../pidgin/gtkaccount.c:2594
+#: ../finch/gntaccount.c:976 ../finch/gntaccount.c:1003
+#: ../pidgin/gtkaccount.c:2575 ../pidgin/gtkaccount.c:2581
 msgid "Authorize"
 msgstr "承認する"
 
-#: ../finch/gntaccount.c:927 ../finch/gntaccount.c:934
-#: ../pidgin/gtkaccount.c:2589 ../pidgin/gtkaccount.c:2595
+#: ../finch/gntaccount.c:977 ../finch/gntaccount.c:1004
+#: ../pidgin/gtkaccount.c:2576 ../pidgin/gtkaccount.c:2582
 msgid "Deny"
 msgstr "拒否する"
 
-#: ../finch/gntblist.c:279
+#: ../finch/gntblist.c:289
 msgid "You must provide a screename for the buddy."
 msgstr "仲間のスクリーン名を指定して下さい"
 
-#: ../finch/gntblist.c:281
+#: ../finch/gntblist.c:291
 msgid "You must provide a group."
 msgstr "グループを指定して下さい"
 
-#: ../finch/gntblist.c:283
+#: ../finch/gntblist.c:293
 msgid "You must select an account."
 msgstr "アカウントを選択して下さい"
 
-#: ../finch/gntblist.c:285
+#: ../finch/gntblist.c:295
 msgid "The selected account is not online."
 msgstr "選択したアカウントはオフラインです"
 
-#: ../finch/gntblist.c:290
+#: ../finch/gntblist.c:300
 msgid "Error adding buddy"
 msgstr "仲間を追加する際にエラー"
 
-#: ../finch/gntblist.c:315 ../libpurple/protocols/oscar/oscar.c:2863
-#: ../pidgin/gtkaccount.c:1991 ../pidgin/gtksavedstatuses.c:924
+#: ../finch/gntblist.c:325 ../libpurple/protocols/oscar/oscar.c:2884
+#: ../pidgin/gtkaccount.c:1981 ../pidgin/gtksavedstatuses.c:980
 msgid "Screen Name"
 msgstr "スクリーン名"
 
-#: ../finch/gntblist.c:318 ../finch/gntblist.c:395 ../finch/gntblist.c:1211
-#: ../libpurple/protocols/msn/msn.c:1364
+#: ../finch/gntblist.c:328 ../finch/gntblist.c:410 ../finch/gntblist.c:1250
+#: ../libpurple/protocols/msn/msn.c:1507
 #: ../libpurple/protocols/silc/chat.c:606
 #: ../libpurple/protocols/silc10/chat.c:590
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:680
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:704
 #: ../libpurple/protocols/zephyr/zephyr.c:788
-#: ../libpurple/protocols/zephyr/zephyr.c:1207 ../pidgin/gtkdialogs.c:982
-#: ../pidgin/gtkdialogs.c:1006 ../pidgin/gtkdialogs.c:1028
-#: ../pidgin/gtkrequest.c:277
+#: ../libpurple/protocols/zephyr/zephyr.c:1207 ../pidgin/gtkdialogs.c:1017
+#: ../pidgin/gtkdialogs.c:1041 ../pidgin/gtkdialogs.c:1063
+#: ../pidgin/gtkrequest.c:278
 msgid "Alias"
 msgstr "別名"
 
-#: ../finch/gntblist.c:321 ../finch/gntblist.c:398
+#: ../finch/gntblist.c:331 ../finch/gntblist.c:413
 msgid "Group"
 msgstr "グループ"
 
-#: ../finch/gntblist.c:325 ../finch/gntblist.c:386 ../finch/gntblist.c:1261
-#: ../finch/gntnotify.c:171 ../finch/gntstatus.c:566
+#: ../finch/gntblist.c:335 ../finch/gntblist.c:401 ../finch/gntblist.c:1305
+#: ../finch/gntnotify.c:174 ../finch/gntstatus.c:576
 #: ../libpurple/plugins/idle.c:153 ../libpurple/plugins/idle.c:190
-#: ../pidgin/gtkblist.c:2984 ../pidgin/gtknotify.c:482
-#: ../pidgin/gtkpounce.c:1269 ../pidgin/plugins/gevolution/gevolution.c:443
+#: ../pidgin/gtkblist.c:3206 ../pidgin/gtknotify.c:503
+#: ../pidgin/gtkpounce.c:1268 ../pidgin/plugins/gevolution/gevolution.c:445
 msgid "Account"
 msgstr "アカウント"
 
-#: ../finch/gntblist.c:331 ../finch/gntblist.c:819
+#: ../finch/gntblist.c:341 ../finch/gntblist.c:852
 #: ../libpurple/protocols/silc/buddy.c:725
 #: ../libpurple/protocols/silc/buddy.c:1027
 #: ../libpurple/protocols/silc/buddy.c:1072
@@ -338,178 +359,182 @@
 #: ../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:5403
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:447
+#: ../libpurple/protocols/yahoo/yahoo.c:3342 ../pidgin/gtkblist.c:5772
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:445
 msgid "Add Buddy"
 msgstr "仲間の追加"
 
-#: ../finch/gntblist.c:331
+#: ../finch/gntblist.c:341
 msgid "Please enter buddy information."
 msgstr "仲間の情報を入力して下さい:"
 
-#: ../finch/gntblist.c:358 ../libpurple/blist.c:1192
+#: ../finch/gntblist.c:370 ../libpurple/blist.c:1210
 msgid "Chats"
 msgstr "チャット"
 
 #. Extract their Name and put it in
-#: ../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
+#: ../finch/gntblist.c:407 ../libpurple/protocols/jabber/jabber.c:924
+#: ../libpurple/protocols/jabber/jabber.c:927
+#: ../libpurple/protocols/msn/msn.c:1694 ../libpurple/protocols/msn/msn.c:1759
+#: ../libpurple/protocols/msn/msn.c:1786
+#: ../libpurple/protocols/qq/buddy_info.c:44 ../pidgin/gtkplugin.c:582
+#: ../pidgin/gtkroomlist.c:618
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:132
 #: ../pidgin/plugins/gevolution/assoc-buddy.c:123
 msgid "Name"
 msgstr "名前"
 
-#: ../finch/gntblist.c:401 ../finch/gntblist.c:821 ../pidgin/gtkblist.c:5783
+#: ../finch/gntblist.c:416 ../finch/gntblist.c:819
+msgid "Auto-join"
+msgstr "自動参加"
+
+#: ../finch/gntblist.c:419 ../finch/gntblist.c:854 ../pidgin/gtkblist.c:6154
 msgid "Add Chat"
 msgstr "チャットの追加"
 
-#: ../finch/gntblist.c:402
+#: ../finch/gntblist.c:420
 msgid "You can edit more information from the context menu later."
 msgstr "右クリック・メニューから情報を編集できます"
 
-#: ../finch/gntblist.c:415 ../finch/gntblist.c:428
+#: ../finch/gntblist.c:433 ../finch/gntblist.c:446
 msgid "Error adding group"
 msgstr "グループを追加する際にエラー"
 
-#: ../finch/gntblist.c:416
+#: ../finch/gntblist.c:434
 msgid "You must give a name for the group to add."
 msgstr "追加するグループの名前を入力して下さい"
 
-#: ../finch/gntblist.c:429
+#: ../finch/gntblist.c:447
 msgid "A group with the name already exists."
 msgstr "その名前のグループは既に存在します"
 
-#: ../finch/gntblist.c:436 ../finch/gntblist.c:823
+#: ../finch/gntblist.c:454 ../finch/gntblist.c:856
 #: ../libpurple/protocols/sametime/sametime.c:5396
-#: ../libpurple/protocols/sametime/sametime.c:5484 ../pidgin/gtkblist.c:5894
+#: ../libpurple/protocols/sametime/sametime.c:5484 ../pidgin/gtkblist.c:6263
 msgid "Add Group"
 msgstr "グループの追加"
 
-#: ../finch/gntblist.c:436
+#: ../finch/gntblist.c:454
 msgid "Enter the name of the group"
 msgstr "追加するグループの名前を入力して下さい:"
 
-#: ../finch/gntblist.c:769
+#: ../finch/gntblist.c:802
 msgid "Edit Chat"
 msgstr "チャットの編集"
 
-#: ../finch/gntblist.c:769
+#: ../finch/gntblist.c:802
 msgid "Please Update the necessary fields."
 msgstr "必要な項目を更新して下さい"
 
-#: ../finch/gntblist.c:770 ../finch/gntstatus.c:199
+#: ../finch/gntblist.c:803 ../finch/gntstatus.c:205
 msgid "Edit"
 msgstr "編集"
 
-#: ../finch/gntblist.c:786
-msgid "Auto-join"
-msgstr "自動参加"
-
-#: ../finch/gntblist.c:795
+#: ../finch/gntblist.c:828
 msgid "Edit Settings"
 msgstr "設定の編集"
 
-#: ../finch/gntblist.c:833 ../finch/gntconv.c:317 ../pidgin/gtkblist.c:277
-#: ../pidgin/gtkconv.c:682 ../pidgin/gtkdialogs.c:830
+#: ../finch/gntblist.c:864 ../pidgin/gtkutils.c:931
 msgid "Information"
 msgstr "情報"
 
-#: ../finch/gntblist.c:833 ../finch/gntconv.c:317 ../pidgin/gtkblist.c:277
-#: ../pidgin/gtkconv.c:682 ../pidgin/gtkdialogs.c:830
+#: ../finch/gntblist.c:864 ../pidgin/gtkutils.c:931
 msgid "Retrieving..."
 msgstr "取得中..."
 
-#: ../finch/gntblist.c:866 ../finch/gntconv.c:418
+#: ../finch/gntblist.c:904 ../finch/gntconv.c:534
 #: ../libpurple/protocols/silc/chat.c:899
 #: ../libpurple/protocols/silc10/chat.c:883
 msgid "Get Info"
 msgstr "情報の取得"
 
-#: ../finch/gntblist.c:870
+#: ../finch/gntblist.c:908
 msgid "Add Buddy Pounce"
 msgstr "つかむ仲間の追加"
 
 #. if (q_bud && is_online(q_bud->status)) {
-#: ../finch/gntblist.c:877 ../finch/gntconv.c:430
-#: ../libpurple/protocols/jabber/si.c:868
-#: ../libpurple/protocols/oscar/oscar.c:654 ../libpurple/protocols/qq/qq.c:585
-#: ../pidgin/gtkconv.c:1635
+#: ../finch/gntblist.c:915 ../finch/gntconv.c:546
+#: ../libpurple/protocols/jabber/si.c:874
+#: ../libpurple/protocols/oscar/oscar.c:654 ../libpurple/protocols/qq/qq.c:587
+#: ../pidgin/gtkconv.c:1660
 msgid "Send File"
 msgstr "ファイルの送信"
 
-#: ../finch/gntblist.c:881
+#: ../finch/gntblist.c:919
 msgid "View Log"
 msgstr "ログの表示"
 
-#: ../finch/gntblist.c:962
+#: ../finch/gntblist.c:1000
 #, c-format
 msgid "Please enter the new name for %s"
 msgstr "%s さんの新しい名前を入力して下さい"
 
-#: ../finch/gntblist.c:964 ../finch/gntblist.c:1211
+#: ../finch/gntblist.c:1002 ../finch/gntblist.c:1250
 msgid "Rename"
 msgstr "名前の変更"
 
-#: ../finch/gntblist.c:964
+#: ../finch/gntblist.c:1002
 msgid "Set Alias"
 msgstr "別名の指定"
 
-#: ../finch/gntblist.c:965
+#: ../finch/gntblist.c:1003
 msgid "Enter empty string to reset the name."
 msgstr "空の文字列を入力すると名前をリセットします"
 
-#: ../finch/gntblist.c:1041
+#: ../finch/gntblist.c:1079
 msgid "Removing this contact will also remove all the buddies in the contact"
 msgstr "この連絡先を削除すると、その中にある仲間の情報も全て削除されます"
 
-#: ../finch/gntblist.c:1049
+#: ../finch/gntblist.c:1087
 msgid "Removing this group will also remove all the buddies in the group"
 msgstr "このグループを削除すると、その中にある仲間の情報も全て削除されます"
 
-#: ../finch/gntblist.c:1054
+#: ../finch/gntblist.c:1092
 #, 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:1057
+#: ../finch/gntblist.c:1095
 msgid "Confirm Remove"
 msgstr "削除の確認"
 
-#: ../finch/gntblist.c:1062 ../finch/gntblist.c:1213 ../finch/gntft.c:223
-#: ../pidgin/gtkconv.c:1684 ../pidgin/gtkrequest.c:275
-#: ../pidgin/gtkstatusbox.c:261
+#: ../finch/gntblist.c:1100 ../finch/gntblist.c:1252 ../finch/gntft.c:227
+#: ../pidgin/gtkconv.c:1709 ../pidgin/gtkrequest.c:276
+#: ../pidgin/gtkstatusbox.c:264
 msgid "Remove"
 msgstr "削除"
 
 #. Buddy List
-#: ../finch/gntblist.c:1187 ../finch/gntblist.c:2237 ../finch/gntprefs.c:240
-#: ../finch/gntui.c:77 ../pidgin/gtkblist.c:4249
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:330
+#: ../finch/gntblist.c:1226 ../finch/gntblist.c:2355 ../finch/gntprefs.c:258
+#: ../finch/gntui.c:83 ../pidgin/gtkblist.c:2886 ../pidgin/gtkblist.c:4566
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:326
 msgid "Buddy List"
 msgstr "仲間リスト"
 
-#: ../finch/gntblist.c:1218
+#: ../finch/gntblist.c:1257
 msgid "Place tagged"
 msgstr "Place tagged"
 
-#: ../finch/gntblist.c:1223
+#: ../finch/gntblist.c:1262
 msgid "Toggle Tag"
 msgstr "Toggle Tag"
 
 #. General
-#: ../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:823
-#: ../libpurple/protocols/msn/msn.c:1372 ../libpurple/protocols/msn/msn.c:1556
+#: ../finch/gntblist.c:1298 ../libpurple/protocols/gg/gg.c:637
+#: ../libpurple/protocols/gg/gg.c:1050 ../libpurple/protocols/gg/gg.c:1123
+#: ../libpurple/protocols/gg/gg.c:2207
+#: ../libpurple/protocols/jabber/buddy.c:286
+#: ../libpurple/protocols/jabber/buddy.c:1247
+#: ../libpurple/protocols/jabber/buddy.c:2217
+#: ../libpurple/protocols/jabber/buddy.c:2399
+#: ../libpurple/protocols/jabber/jabber.c:937
+#: ../libpurple/protocols/jabber/jabber.c:1544
+#: ../libpurple/protocols/jabber/jabber.c:1567
+#: ../libpurple/protocols/jabber/jabber.c:1590
+#: ../libpurple/protocols/jabber/jabber.c:1613
+#: ../libpurple/protocols/jabber/jabber.c:1636
+#: ../libpurple/protocols/msn/msn.c:1515 ../libpurple/protocols/msn/msn.c:1697
 #: ../libpurple/protocols/qq/buddy_info.c:43
 #: ../libpurple/protocols/silc/buddy.c:1535
 #: ../libpurple/protocols/silc/ops.c:1002
@@ -519,25 +544,30 @@
 #: ../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:3008
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1066 ../pidgin/gtkblist.c:3230
 msgid "Nickname"
 msgstr "ニックネーム"
 
 #. Idle stuff
-#: ../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:2887
-#: ../libpurple/protocols/yahoo/yahoo.c:2915
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:686 ../pidgin/gtkblist.c:3035
-#: ../pidgin/gtkblist.c:3428 ../pidgin/gtkprefs.c:1848
+#: ../finch/gntblist.c:1320 ../finch/gntprefs.c:261
+#: ../libpurple/protocols/bonjour/bonjour.c:340
+#: ../libpurple/protocols/jabber/buddy.c:787
+#: ../libpurple/protocols/jabber/buddy.c:951
+#: ../libpurple/protocols/msn/state.c:32
+#: ../libpurple/protocols/novell/novell.c:2830
+#: ../libpurple/protocols/oscar/oscar.c:2908
+#: ../libpurple/protocols/yahoo/yahoo.c:3096
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:710 ../pidgin/gtkblist.c:3258
+#: ../pidgin/gtkblist.c:3664 ../pidgin/gtkprefs.c:1927
 msgid "Idle"
 msgstr "待機中"
 
-#: ../finch/gntblist.c:1365
+#: ../finch/gntblist.c:1334
+#, fuzzy
+msgid "On Mobile"
+msgstr "移動中"
+
+#: ../finch/gntblist.c:1415
 #, c-format
 msgid ""
 "Online: %d\n"
@@ -546,12 +576,12 @@
 "オンライン: %d\n"
 "合計: %d"
 
-#: ../finch/gntblist.c:1374
+#: ../finch/gntblist.c:1424
 #, c-format
 msgid "Account: %s (%s)"
 msgstr "アカウント: %s (%s)"
 
-#: ../finch/gntblist.c:1386
+#: ../finch/gntblist.c:1436
 #, c-format
 msgid ""
 "\n"
@@ -560,48 +590,52 @@
 "\n"
 "最後にお会いしたのは: %s前"
 
-#: ../finch/gntblist.c:1651 ../pidgin/gtkdocklet.c:470
-#: ../pidgin/gtkstatusbox.c:1064
+#: ../finch/gntblist.c:1704 ../pidgin/gtkdocklet.c:470
+#: ../pidgin/gtkstatusbox.c:1072
 msgid "New..."
 msgstr "状態の追加..."
 
-#: ../finch/gntblist.c:1658 ../pidgin/gtkdocklet.c:471
-#: ../pidgin/gtkstatusbox.c:1065
+#: ../finch/gntblist.c:1711 ../pidgin/gtkdocklet.c:471
+#: ../pidgin/gtkstatusbox.c:1073
 msgid "Saved..."
 msgstr "他の状態..."
 
-#: ../finch/gntblist.c:2033 ../finch/gntplugin.c:244 ../finch/gntui.c:81
-#: ../pidgin/gtkdocklet.c:523 ../pidgin/gtkplugin.c:530
+#: ../finch/gntblist.c:2089 ../finch/gntplugin.c:255 ../finch/gntui.c:88
+#: ../pidgin/gtkdocklet.c:523 ../pidgin/gtkplugin.c:531
 msgid "Plugins"
 msgstr "プラグイン"
 
-#: ../finch/gntblist.c:2141 ../pidgin/gtkdialogs.c:705
-#: ../pidgin/gtkdialogs.c:852 ../pidgin/gtkdialogs.c:933
+#: ../finch/gntblist.c:2205 ../pidgin/gtkdialogs.c:748
+#: ../pidgin/gtkdialogs.c:887 ../pidgin/gtkdialogs.c:968
 msgid "_Name"
 msgstr "名前(_N)"
 
-#: ../finch/gntblist.c:2146 ../pidgin/gtkdialogs.c:710
-#: ../pidgin/gtkdialogs.c:857 ../pidgin/gtkdialogs.c:938
+#: ../finch/gntblist.c:2210 ../pidgin/gtkdialogs.c:753
+#: ../pidgin/gtkdialogs.c:892 ../pidgin/gtkdialogs.c:973
 msgid "_Account"
 msgstr "アカウント(_A)"
 
-#: ../finch/gntblist.c:2154 ../pidgin/gtkdialogs.c:718
+#: ../finch/gntblist.c:2218 ../pidgin/gtkdialogs.c:761
 msgid "New Instant Message"
 msgstr "新しいインスタント・メッセージ"
 
-#: ../finch/gntblist.c:2156 ../pidgin/gtkdialogs.c:720
+#: ../finch/gntblist.c:2220 ../pidgin/gtkdialogs.c:763
 msgid ""
 "Please enter the screen name or alias of the person you would like to IM."
 msgstr "IM で会話する相手のスクリーン名または別名を入力して下さい:"
 
-#: ../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:6070
+#. Not multiline
+#. Not masked?
+#. No hints?
+#: ../finch/gntblist.c:2223 ../finch/gntcertmgr.c:90 ../finch/gntconn.c:136
+#: ../finch/gntnotify.c:80 ../libpurple/account.c:1012
+#: ../libpurple/account.c:1262 ../libpurple/protocols/gg/gg.c:506
+#: ../libpurple/protocols/gg/gg.c:665 ../libpurple/protocols/gg/gg.c:802
+#: ../libpurple/protocols/jabber/jabber.c:1736
+#: ../libpurple/protocols/jabber/xdata.c:399
+#: ../libpurple/protocols/msn/msn.c:289 ../libpurple/protocols/msn/msn.c:306
+#: ../libpurple/protocols/msn/msn.c:323 ../libpurple/protocols/msn/msn.c:340
+#: ../libpurple/protocols/oscar/oscar.c:6091
 #: ../libpurple/protocols/silc/buddy.c:454
 #: ../libpurple/protocols/silc/buddy.c:1190
 #: ../libpurple/protocols/silc/chat.c:447
@@ -618,50 +652,173 @@
 #: ../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:4004
-#: ../pidgin/gtkdialogs.c:723 ../pidgin/gtkdialogs.c:870
-#: ../pidgin/gtkdialogs.c:962 ../pidgin/gtkrequest.c:269
+#: ../libpurple/protocols/yahoo/yahoo.c:1030
+#: ../libpurple/protocols/yahoo/yahoo.c:3496
+#: ../libpurple/protocols/yahoo/yahoo.c:3507 ../pidgin/gtkblist.c:4321
+#: ../pidgin/gtkcertmgr.c:195 ../pidgin/gtkdialogs.c:766
+#: ../pidgin/gtkdialogs.c:905 ../pidgin/gtkdialogs.c:997
+#: ../pidgin/gtkrequest.c:270
 msgid "OK"
 msgstr "OK"
 
 #. Create the "Options" frame.
-#: ../finch/gntblist.c:2179 ../finch/gntpounce.c:444 ../pidgin/gtkpounce.c:778
+#: ../finch/gntblist.c:2261 ../finch/gntpounce.c:447 ../pidgin/gtkpounce.c:790
 msgid "Options"
 msgstr "オプション"
 
-#: ../finch/gntblist.c:2185
+#: ../finch/gntblist.c:2267
 msgid "Send IM..."
 msgstr "IM の送信..."
 
-#: ../finch/gntblist.c:2189
-msgid "Show offline buddies"
+#: ../finch/gntblist.c:2271
+msgid "Show"
+msgstr ""
+
+#: ../finch/gntblist.c:2276
+#, fuzzy
+msgid "Empty groups"
+msgstr "グループ毎に共有する"
+
+#: ../finch/gntblist.c:2282
+#, fuzzy
+msgid "Offline buddies"
 msgstr "オフラインの仲間を表示する"
 
-#: ../finch/gntblist.c:2195
-msgid "Sort by status"
+#: ../finch/gntblist.c:2288
+#, fuzzy
+msgid "Sort"
+msgstr "ポート番号"
+
+#: ../finch/gntblist.c:2293
+#, fuzzy
+msgid "By Status"
 msgstr "状態順"
 
-#: ../finch/gntblist.c:2199
-msgid "Sort alphabetically"
+#: ../finch/gntblist.c:2297 ../pidgin/gtkblist.c:4106
+msgid "Alphabetically"
 msgstr "アルファベット順"
 
-#: ../finch/gntblist.c:2203
-msgid "Sort by log size"
-msgstr "ログのサイズ順"
-
-#: ../finch/gntconn.c:109
+#: ../finch/gntblist.c:2301
+#, fuzzy
+msgid "By Log Size"
+msgstr "ログ・サイズ順"
+
+#: ../finch/gntcertmgr.c:86 ../pidgin/gtkcertmgr.c:188
+#, fuzzy
+msgid "Certificate Import"
+msgstr "接続するポート番号"
+
+#: ../finch/gntcertmgr.c:87 ../pidgin/gtkcertmgr.c:189
+msgid "Specify a hostname"
+msgstr ""
+
+#: ../finch/gntcertmgr.c:88 ../pidgin/gtkcertmgr.c:190
+msgid "Type the host name this certificate is for."
+msgstr ""
+
+#: ../finch/gntcertmgr.c:97 ../pidgin/gtkcertmgr.c:210
+#, c-format
+msgid ""
+"File %s could not be imported.\n"
+"Make sure that the file is readable and in PEM format.\n"
+msgstr ""
+
+#: ../finch/gntcertmgr.c:99 ../pidgin/gtkcertmgr.c:212
+msgid "Certificate Import Error"
+msgstr ""
+
+#: ../finch/gntcertmgr.c:100 ../pidgin/gtkcertmgr.c:213
+msgid "X.509 certificate import failed"
+msgstr ""
+
+#: ../finch/gntcertmgr.c:110 ../pidgin/gtkcertmgr.c:224
+#, fuzzy
+msgid "Select a PEM certificate"
+msgstr "ファイルの選択"
+
+#: ../finch/gntcertmgr.c:127 ../pidgin/gtkcertmgr.c:245
+#, c-format
+msgid ""
+"Export to file %s failed.\n"
+"Check that you have write permission to the target path\n"
+msgstr ""
+
+#: ../finch/gntcertmgr.c:129 ../pidgin/gtkcertmgr.c:247
+msgid "Certificate Export Error"
+msgstr ""
+
+#: ../finch/gntcertmgr.c:130 ../pidgin/gtkcertmgr.c:248
+msgid "X.509 certificate export failed"
+msgstr ""
+
+#: ../finch/gntcertmgr.c:159 ../pidgin/gtkcertmgr.c:299
+msgid "PEM X.509 Certificate Export"
+msgstr ""
+
+#: ../finch/gntcertmgr.c:188
+#, fuzzy, c-format
+msgid "Certificate for %s"
+msgstr "%s の状態"
+
+#: ../finch/gntcertmgr.c:195
+#, c-format
+msgid ""
+"Common name: %s\n"
+"\n"
+"SHA1 fingerprint:\n"
+"%s"
+msgstr ""
+
+#: ../finch/gntcertmgr.c:198
+msgid "SSL Host Certificate"
+msgstr ""
+
+#: ../finch/gntcertmgr.c:233 ../pidgin/gtkcertmgr.c:372
+#, c-format
+msgid "Really delete certificate for %s?"
+msgstr ""
+
+#: ../finch/gntcertmgr.c:236 ../pidgin/gtkcertmgr.c:374
+msgid "Confirm certificate delete"
+msgstr ""
+
+#: ../finch/gntcertmgr.c:293 ../pidgin/gtkcertmgr.c:602
+msgid "Certificate Manager"
+msgstr ""
+
+#. Creating the user splits
+#: ../finch/gntcertmgr.c:298 ../libpurple/protocols/bonjour/bonjour.c:652
+#: ../libpurple/protocols/silc/silc.c:1007
+#: ../libpurple/protocols/silc10/silc.c:918
+msgid "Hostname"
+msgstr "ホスト名"
+
+#: ../finch/gntcertmgr.c:315 ../finch/gntnotify.c:386 ../pidgin/gtkconv.c:1688
+#: ../pidgin/gtkdebug.c:835
+msgid "Info"
+msgstr "情報"
+
+#. Close button
+#: ../finch/gntcertmgr.c:324 ../finch/gntft.c:237 ../finch/gntnotify.c:182
+#: ../finch/gntplugin.c:210 ../finch/gntplugin.c:310 ../finch/gntpounce.c:738
+#: ../finch/gntstatus.c:216 ../libpurple/protocols/msn/msn.c:406
+#: ../libpurple/protocols/silc/util.c:382
+#: ../libpurple/protocols/silc10/util.c:377 ../pidgin/gtkaccount.c:2468
+#: ../pidgin/gtkrequest.c:273
+msgid "Close"
+msgstr "閉じる"
+
+#: ../finch/gntconn.c:125
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../finch/gntconn.c:112
+#: ../finch/gntconn.c:128
 #, c-format
 msgid "%s disconnected."
 msgstr "%s さんは接続を切りました"
 
-#: ../finch/gntconn.c:113
+#: ../finch/gntconn.c:129
 #, c-format
 msgid ""
 "%s\n"
@@ -674,45 +831,50 @@
 "エラーを解決しアカウントをもう一度有効にするまで、そのアカウントには接続しま"
 "せん。"
 
-#: ../finch/gntconv.c:116
+#: ../finch/gntconn.c:138 ../pidgin/gtkblist.c:4323
+msgid "Re-enable Account"
+msgstr "アカウントを再び有効にする"
+
+#: ../finch/gntconv.c:139
 msgid "No such command."
 msgstr "そのようなコマンドはありません"
 
-#: ../finch/gntconv.c:120 ../pidgin/gtkconv.c:513
+#: ../finch/gntconv.c:143 ../pidgin/gtkconv.c:530
 msgid "Syntax Error:  You typed the wrong number of arguments to that command."
 msgstr "入力エラー:  そのコマンドに対する引数の数が間違っています"
 
-#: ../finch/gntconv.c:125 ../pidgin/gtkconv.c:518
+#: ../finch/gntconv.c:148 ../pidgin/gtkconv.c:536
 msgid "Your command failed for an unknown reason."
 msgstr "原因不明ですが、コマンド適用に失敗しました"
 
-#: ../finch/gntconv.c:130 ../pidgin/gtkconv.c:524
+#: ../finch/gntconv.c:153 ../pidgin/gtkconv.c:543
 msgid "That command only works in chats, not IMs."
 msgstr "そのコマンドは IM ではなくチャットでのみ動作します"
 
-#: ../finch/gntconv.c:133 ../pidgin/gtkconv.c:527
+#: ../finch/gntconv.c:156 ../pidgin/gtkconv.c:546
 msgid "That command only works in IMs, not chats."
 msgstr "そのコマンドはチャットではなく IM でのみ動作します"
 
-#: ../finch/gntconv.c:137 ../pidgin/gtkconv.c:531
+#: ../finch/gntconv.c:160 ../pidgin/gtkconv.c:551
 msgid "That command doesn't work on this protocol."
 msgstr "そのコマンドは、このプロトコルでは動作しません"
 
-#: ../finch/gntconv.c:144
-msgid "Commands are not supported yet. Message was NOT sent."
-msgstr "まだコマンドはサポートしていません (メッセージを送信しませんでした)"
-
-#: ../finch/gntconv.c:230
+#: ../finch/gntconv.c:168
+#, fuzzy
+msgid "Message was not sent, because you are not signed on."
+msgstr "送信するタイミングが早過ぎたので、メッセージを送信できませんでした:"
+
+#: ../finch/gntconv.c:251
 #, c-format
 msgid "%s (%s -- %s)"
 msgstr "%s (%s -- %s)"
 
-#: ../finch/gntconv.c:253
+#: ../finch/gntconv.c:274
 #, c-format
 msgid "%s [%s]"
 msgstr "%s [%s]"
 
-#: ../finch/gntconv.c:258 ../finch/gntconv.c:619
+#: ../finch/gntconv.c:279 ../finch/gntconv.c:801
 #, c-format
 msgid ""
 "\n"
@@ -721,48 +883,67 @@
 "\n"
 "%s さんが何か入力しています..."
 
-#: ../finch/gntconv.c:277
+#: ../finch/gntconv.c:298
 msgid "You have left this chat."
 msgstr "このチャットから退出しました"
 
-#: ../finch/gntconv.c:353
+#: ../finch/gntconv.c:414 ../pidgin/gtkconv.c:1415
+msgid "Logging started. Future messages in this conversation will be logged."
+msgstr "ログの記録を開始しました。これ以降の会話がログに記録されます。"
+
+#: ../finch/gntconv.c:420 ../pidgin/gtkconv.c:1423
+msgid ""
+"Logging stopped. Future messages in this conversation will not be logged."
+msgstr "ログの記録を停止しました。これ以降の会話はログに記録されません。"
+
+#: ../finch/gntconv.c:469
 msgid "Send To"
 msgstr "送信先"
 
-#: ../finch/gntconv.c:397
+#: ../finch/gntconv.c:513
 msgid "Conversation"
 msgstr "会話ウィンドウ"
 
-#: ../finch/gntconv.c:403
+#: ../finch/gntconv.c:519
 msgid "Clear Scrollback"
 msgstr "スクロールバックのクリア"
 
-#: ../finch/gntconv.c:407 ../finch/gntprefs.c:178
+#: ../finch/gntconv.c:523 ../finch/gntprefs.c:191
 msgid "Show Timestamps"
 msgstr "タイムスタンプを表示する"
 
-#: ../finch/gntconv.c:423
+#: ../finch/gntconv.c:539
 msgid "Add Buddy Pounce..."
 msgstr "つかむ仲間の追加..."
 
-#: ../finch/gntconv.c:586
+#: ../finch/gntconv.c:554
+#, fuzzy
+msgid "Enable Logging"
+msgstr "/オプション/ログを記録する"
+
+#: ../finch/gntconv.c:560
+#, fuzzy
+msgid "Enable Sounds"
+msgstr "いつサウンドを有効にするか...:"
+
+#: ../finch/gntconv.c:766
 msgid "<AUTO-REPLY> "
 msgstr "<AUTO-REPLY> "
 
 #. Print the list of users in the room
-#: ../finch/gntconv.c:702
+#: ../finch/gntconv.c:889
 msgid "List of users:\n"
 msgstr "ユーザの一覧\n"
 
-#: ../finch/gntconv.c:847 ../pidgin/gtkconv.c:394
+#: ../finch/gntconv.c:1051 ../pidgin/gtkconv.c:370
 msgid "Supported debug options are:  version"
 msgstr "サポートするデバッグ・オプションは:  バージョン"
 
-#: ../finch/gntconv.c:882 ../pidgin/gtkconv.c:430
+#: ../finch/gntconv.c:1087 ../pidgin/gtkconv.c:422
 msgid "No such command (in this context)."
 msgstr "(このコンテキストには) そのようなコマンドはありません"
 
-#: ../finch/gntconv.c:885 ../pidgin/gtkconv.c:433
+#: ../finch/gntconv.c:1090 ../pidgin/gtkconv.c:425
 msgid ""
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
 "The following commands are available in this context:\n"
@@ -771,7 +952,7 @@
 "\"/help &lt;command&gt;\" を使用して下さい。\n"
 "このコンテキストでは次のコマンドが利用可能です:\n"
 
-#: ../finch/gntconv.c:943 ../pidgin/gtkconv.c:7211
+#: ../finch/gntconv.c:1148 ../pidgin/gtkconv.c:7642
 msgid ""
 "say &lt;message&gt;:  Send a message normally as if you weren't using a "
 "command."
@@ -779,13 +960,13 @@
 "say &lt;メッセージ&gt;:  コマンドを利用していない場合でもメッセージを送信しま"
 "す"
 
-#: ../finch/gntconv.c:946 ../pidgin/gtkconv.c:7214
+#: ../finch/gntconv.c:1151 ../pidgin/gtkconv.c:7645
 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:7217
+#: ../finch/gntconv.c:1154 ../pidgin/gtkconv.c:7648
 msgid ""
 "debug &lt;option&gt;:  Send various debug information to the current "
 "conversation."
@@ -793,43 +974,43 @@
 "debug &lt;オプション&gt;:  利用中の会話ウィンドウへいろいろなデバッグ情報を送"
 "信します"
 
-#: ../finch/gntconv.c:952 ../pidgin/gtkconv.c:7220
+#: ../finch/gntconv.c:1157 ../pidgin/gtkconv.c:7651
 msgid "clear: Clears the conversation scrollback."
 msgstr "クリア: 会話ウィンドウにある以前のメッセージをクリアします"
 
-#: ../finch/gntconv.c:955 ../pidgin/gtkconv.c:7223
+#: ../finch/gntconv.c:1160 ../pidgin/gtkconv.c:7657
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr "help &lt;コマンド&gt;:  特定のコマンドに対するヘルプを表示します"
 
-#: ../finch/gntconv.c:958
+#: ../finch/gntconv.c:1163
 msgid "users:  Show the list of users in the chat."
 msgstr "users:  チャットの中にユーザの一覧を表示する"
 
-#: ../finch/gntconv.c:963
+#: ../finch/gntconv.c:1168
 msgid "plugins: Show the plugins window."
 msgstr "plugins: プラグイン・ウィンドウを表示する"
 
-#: ../finch/gntconv.c:966
+#: ../finch/gntconv.c:1171
 msgid "buddylist: Show the buddylist."
 msgstr "buddylist: 仲間リストを表示する"
 
-#: ../finch/gntconv.c:969
+#: ../finch/gntconv.c:1174
 msgid "accounts: Show the accounts window."
 msgstr "accounts: アカウント・ウィンドウを表示する"
 
-#: ../finch/gntconv.c:972
+#: ../finch/gntconv.c:1177
 msgid "debugwin: Show the debug window."
 msgstr "debugwin: デバッグ・ウィンドウを表示する"
 
-#: ../finch/gntconv.c:975
+#: ../finch/gntconv.c:1180
 msgid "prefs: Show the preference window."
 msgstr "prefs: 設定ウィンドウを表示する"
 
-#: ../finch/gntconv.c:978
+#: ../finch/gntconv.c:1183
 msgid "statuses: Show the savedstatuses window."
 msgstr "statuses: 保存状態のウィンドウを表示する"
 
-#: ../finch/gntdebug.c:230 ../finch/gntui.c:79 ../pidgin/gtkdebug.c:694
+#: ../finch/gntdebug.c:235 ../finch/gntui.c:86 ../pidgin/gtkdebug.c:695
 msgid "Debug Window"
 msgstr "デバッグ・ウィンドウ"
 
@@ -837,193 +1018,186 @@
 #. * 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:753
+#: ../finch/gntdebug.c:256 ../pidgin/gtkdebug.c:754
 msgid "Clear"
 msgstr "クリア"
 
-#: ../finch/gntdebug.c:257
+#: ../finch/gntdebug.c:262
 msgid "Filter: "
 msgstr "フィルタ: "
 
-#: ../finch/gntdebug.c:261 ../pidgin/gtkdebug.c:762
+#: ../finch/gntdebug.c:266 ../pidgin/gtkdebug.c:763
 msgid "Pause"
 msgstr "一時停止"
 
-#: ../finch/gntft.c:117 ../pidgin/gtkft.c:228
+#: ../finch/gntft.c:118 ../pidgin/gtkft.c:229
 #, c-format
 msgid "File Transfers - %d%% of %d files"
 msgstr "ファイル転送 - %d%% / %d個のファイル"
 
-#: ../finch/gntft.c:122 ../finch/gntft.c:194 ../finch/gntui.c:80
-#: ../pidgin/gtkft.c:233 ../pidgin/gtkft.c:763
+#. Create the window.
+#: ../finch/gntft.c:123 ../finch/gntft.c:196 ../finch/gntui.c:87
+#: ../pidgin/gtkft.c:234 ../pidgin/gtkft.c:762
 msgid "File Transfers"
 msgstr "ファイルの転送"
 
-#: ../finch/gntft.c:197 ../pidgin/gtkft.c:644
+#: ../finch/gntft.c:201 ../pidgin/gtkft.c:645
 msgid "Progress"
 msgstr "進捗"
 
-#: ../finch/gntft.c:197 ../pidgin/gtkft.c:651
+#: ../finch/gntft.c:201 ../pidgin/gtkft.c:652
 msgid "Filename"
 msgstr "ファイル名"
 
-#: ../finch/gntft.c:197 ../pidgin/gtkft.c:658
+#: ../finch/gntft.c:201 ../pidgin/gtkft.c:659
 msgid "Size"
 msgstr "サイズ"
 
-#: ../finch/gntft.c:197
+#: ../finch/gntft.c:201
 msgid "Speed"
 msgstr "速度"
 
-#: ../finch/gntft.c:197 ../pidgin/gtkft.c:665
+#: ../finch/gntft.c:201 ../pidgin/gtkft.c:666
 msgid "Remaining"
 msgstr "残り"
 
 #. 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: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:1220
-#: ../libpurple/protocols/msn/msn.c:515
-#: ../libpurple/protocols/novell/novell.c:2835
+#: ../finch/gntft.c:201 ../finch/gntstatus.c:547 ../finch/gntstatus.c:576
+#: ../libpurple/protocols/bonjour/bonjour.c:344
+#: ../libpurple/protocols/gg/gg.c:1039 ../libpurple/protocols/gg/gg.c:1576
+#: ../libpurple/protocols/gg/gg.c:1584
+#: ../libpurple/protocols/jabber/buddy.c:778
+#: ../libpurple/protocols/jabber/buddy.c:782
+#: ../libpurple/protocols/jabber/buddy.c:941
+#: ../libpurple/protocols/jabber/jabber.c:1500
+#: ../libpurple/protocols/msn/msn.c:596 ../libpurple/protocols/msn/msn.c:603
+#: ../libpurple/protocols/novell/novell.c:2840
 #: ../libpurple/protocols/oscar/oscar.c:821
 #: ../libpurple/protocols/oscar/oscar.c:826
 #: ../libpurple/protocols/oscar/oscar.c:828
-#: ../libpurple/protocols/oscar/oscar.c:2676
-#: ../libpurple/protocols/oscar/oscar.c:3793
+#: ../libpurple/protocols/oscar/oscar.c:2696
+#: ../libpurple/protocols/oscar/oscar.c:3776
 #: ../libpurple/protocols/sametime/sametime.c:3263
 #: ../libpurple/protocols/sametime/sametime.c:4150
-#: ../libpurple/protocols/yahoo/yahoo.c:3066 ../pidgin/gtkblist.c:3079
-#: ../pidgin/gtkblist.c:3092 ../pidgin/gtkblist.c:3094
-#: ../pidgin/gtksavedstatuses.c:943 ../pidgin/gtksavedstatuses.c:1090
+#: ../libpurple/protocols/yahoo/yahoo.c:3247 ../pidgin/gtkblist.c:3302
+#: ../pidgin/gtkblist.c:3316 ../pidgin/gtkblist.c:3318
+#: ../pidgin/gtksavedstatuses.c:999 ../pidgin/gtksavedstatuses.c:1144
 msgid "Status"
 msgstr "状態"
 
-#: ../finch/gntft.c:207
+#: ../finch/gntft.c:211
 msgid "Close this window when all transfers finish"
 msgstr "転送が完了したら全てのウィンドウを閉じる"
 
-#: ../finch/gntft.c:214
+#: ../finch/gntft.c:218
 msgid "Clear finished transfers"
 msgstr "完了した転送をクリアする"
 
-#: ../finch/gntft.c:228
+#: ../finch/gntft.c:232
 msgid "Stop"
 msgstr "停止する"
 
-#. 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:382
-#: ../libpurple/protocols/silc10/util.c:377 ../pidgin/gtkaccount.c:2487
-#: ../pidgin/gtkrequest.c:272
-msgid "Close"
-msgstr "閉じる"
-
-#: ../finch/gntft.c:299 ../pidgin/gtkft.c:168 ../pidgin/gtkft.c:975
+#: ../finch/gntft.c:305 ../pidgin/gtkft.c:169 ../pidgin/gtkft.c:973
 msgid "Waiting for transfer to begin"
 msgstr "転送開始を待っています"
 
-#: ../finch/gntft.c:366 ../pidgin/gtkft.c:165 ../pidgin/gtkft.c:1056
+#: ../finch/gntft.c:372 ../pidgin/gtkft.c:166 ../pidgin/gtkft.c:1054
 msgid "Canceled"
 msgstr "キャンセルしました"
 
-#: ../finch/gntft.c:368 ../pidgin/gtkft.c:1058
+#: ../finch/gntft.c:374 ../pidgin/gtkft.c:1056
 msgid "Failed"
 msgstr "失敗しました"
 
-#: ../finch/gntft.c:414 ../pidgin/gtkft.c:133
-#, c-format
-msgid "%.2f KB/s"
+#: ../finch/gntft.c:420 ../pidgin/gtkft.c:134
+#, fuzzy, c-format
+msgid "%.2f KiB/s"
 msgstr "%.2f Kバイト/秒"
 
-#: ../finch/gntft.c:425 ../finch/gntft.c:426 ../pidgin/gtkft.c:162
-#: ../pidgin/gtkft.c:1118
+#: ../finch/gntft.c:431
+#, c-format
+msgid "The file was saved as %s."
+msgstr ""
+
+#: ../finch/gntft.c:432 ../finch/gntft.c:433 ../pidgin/gtkft.c:163
+#: ../pidgin/gtkft.c:1116
 msgid "Finished"
 msgstr "完了しました"
 
-#: ../finch/gntft.c:428 ../libpurple/protocols/msn/session.c:347
+#: ../finch/gntft.c:437 ../libpurple/protocols/msn/session.c:386
 msgid "Transferring"
 msgstr "転送しています"
 
-#: ../finch/gntnotify.c:162
+#: ../finch/gntnotify.c:165
 msgid "Emails"
 msgstr "E-メール"
 
-#: ../finch/gntnotify.c:168 ../finch/gntnotify.c:222
+#: ../finch/gntnotify.c:171 ../finch/gntnotify.c:225
 msgid "You have mail!"
 msgstr "メールが届きました!"
 
-#: ../finch/gntnotify.c:171 ../libpurple/protocols/jabber/jabber.c:1180
-msgid "From"
-msgstr "差出人"
-
-#: ../finch/gntnotify.c:171 ../pidgin/gtknotify.c:496
+#: ../finch/gntnotify.c:174 ../pidgin/gtknotify.c:510
+msgid "Sender"
+msgstr "送信者"
+
+#: ../finch/gntnotify.c:174 ../pidgin/gtknotify.c:517
 msgid "Subject"
 msgstr "件名"
 
-#: ../finch/gntnotify.c:198
+#: ../finch/gntnotify.c:201
 #, c-format
 msgid "%s (%s) has %d new message."
 msgid_plural "%s (%s) has %d new messages."
 msgstr[0] "%s (%s) には %d通の新しいメッセージがあります"
 msgstr[1] "%s (%s) には %d通の新しいメッセージがあります"
 
-#: ../finch/gntnotify.c:222 ../pidgin/gtknotify.c:335
+#: ../finch/gntnotify.c:225 ../pidgin/gtknotify.c:341
 msgid "New Mail"
 msgstr "新着メール"
 
-#: ../finch/gntnotify.c:287 ../pidgin/gtknotify.c:920
+#: ../finch/gntnotify.c:290 ../pidgin/gtknotify.c:940
 #, c-format
 msgid "Info for %s"
 msgstr "%s さんの情報"
 
-#: ../finch/gntnotify.c:288 ../libpurple/protocols/toc/toc.c:476
-#: ../pidgin/gtknotify.c:921
+#: ../finch/gntnotify.c:291 ../libpurple/protocols/toc/toc.c:476
+#: ../pidgin/gtknotify.c:941
 msgid "Buddy Information"
 msgstr "仲間の情報"
 
-#: ../finch/gntnotify.c:366
+#: ../finch/gntnotify.c:380 ../libpurple/protocols/qq/group_join.c:367
 msgid "Continue"
 msgstr "続行する"
 
-#: ../finch/gntnotify.c:372 ../pidgin/gtkconv.c:1663 ../pidgin/gtkdebug.c:834
-msgid "Info"
-msgstr "情報"
-
-#: ../finch/gntnotify.c:375 ../pidgin/gtkconv.c:1624
+#: ../finch/gntnotify.c:389 ../pidgin/gtkconv.c:1649
 msgid "IM"
 msgstr "IM"
 
-#: ../finch/gntnotify.c:378
+#: ../finch/gntnotify.c:392
 msgid "Join"
 msgstr "参加する"
 
-#: ../finch/gntnotify.c:381 ../libpurple/protocols/sametime/sametime.c:3473
+#: ../finch/gntnotify.c:395 ../libpurple/protocols/sametime/sametime.c:3473
 msgid "Invite"
 msgstr "招待する"
 
-#: ../finch/gntnotify.c:384
+#: ../finch/gntnotify.c:398
 msgid "(none)"
 msgstr "(なし)"
 
-#: ../finch/gntplugin.c:73 ../finch/gntplugin.c:82
+#: ../finch/gntplugin.c:75 ../finch/gntplugin.c:84
 msgid "ERROR"
 msgstr "エラー"
 
-#: ../finch/gntplugin.c:73
+#: ../finch/gntplugin.c:75
 msgid "loading plugin failed"
 msgstr "プラグインの読み込みに失敗しました"
 
-#: ../finch/gntplugin.c:82
+#: ../finch/gntplugin.c:84
 msgid "unloading plugin failed"
 msgstr "プラグインの解放に失敗しました"
 
-#: ../finch/gntplugin.c:124
+#: ../finch/gntplugin.c:129
 #, c-format
 msgid ""
 "Name: %s\n"
@@ -1040,308 +1214,519 @@
 "配布元: %s\n"
 "ファイル名: %s\n"
 
-#: ../finch/gntplugin.c:182
+#: ../finch/gntplugin.c:187
 msgid "Plugin need to be loaded before you can configure it."
 msgstr "それを設定する前に適切なプラグインを読み込んで下さい"
 
-#: ../finch/gntplugin.c:226
+#: ../finch/gntplugin.c:235
 msgid "No configuration options for this plugin."
 msgstr "このプラグインに対するオプションが設定されていません"
 
-#: ../finch/gntplugin.c:249
+#: ../finch/gntplugin.c:260
 msgid "You can (un)load plugins from the following list."
 msgstr "次の一覧にあるプラグインを読み込んだり読み込みを解除できます"
 
-#: ../finch/gntplugin.c:296
+#: ../finch/gntplugin.c:315
 msgid "Configure Plugin"
 msgstr "プラグインの設定"
 
-#: ../finch/gntplugin.c:352 ../finch/gntplugin.c:359 ../finch/gntprefs.c:245
-#: ../finch/gntui.c:82 ../pidgin/gtkdocklet.c:524 ../pidgin/gtkprefs.c:1992
+#. copy the preferences to tmp values...
+#. * I liked "take affect immediately" Oh well :-(
+#. (that should have been "effect," right?)
+#. Back to instant-apply! I win!  BU-HAHAHA!
+#. Create the window
+#: ../finch/gntplugin.c:371 ../finch/gntplugin.c:378 ../finch/gntprefs.c:264
+#: ../finch/gntui.c:90 ../pidgin/gtkdocklet.c:524 ../pidgin/gtkprefs.c:2069
 msgid "Preferences"
 msgstr "設定"
 
-#: ../finch/gntpounce.c:180 ../pidgin/gtkpounce.c:253
+#: ../finch/gntpounce.c:183 ../pidgin/gtkpounce.c:256
 msgid "Please enter a buddy to pounce."
 msgstr "つかむ仲間を入力して下さい。"
 
-#: ../finch/gntpounce.c:325 ../pidgin/gtkpounce.c:507
+#: ../finch/gntpounce.c:328 ../pidgin/gtkpounce.c:517
 msgid "New Buddy Pounce"
 msgstr "新しい仲間をつかむ"
 
-#: ../finch/gntpounce.c:325 ../pidgin/gtkpounce.c:507
+#: ../finch/gntpounce.c:328 ../pidgin/gtkpounce.c:517
 msgid "Edit Buddy Pounce"
 msgstr "つかむ仲間の編集"
 
-#: ../finch/gntpounce.c:330
+#: ../finch/gntpounce.c:333
 msgid "Pounce Who"
 msgstr "誰をつかむか..."
 
 #. Account:
-#: ../finch/gntpounce.c:333 ../finch/gntstatus.c:446
+#: ../finch/gntpounce.c:336 ../finch/gntstatus.c:456
 msgid "Account:"
 msgstr "アカウント:"
 
-#: ../finch/gntpounce.c:355
+#: ../finch/gntpounce.c:358
 msgid "Buddy name:"
 msgstr "つかむ仲間(_B):"
 
 #. Create the "Pounce When Buddy..." frame.
-#: ../finch/gntpounce.c:371 ../pidgin/gtkpounce.c:577
+#: ../finch/gntpounce.c:374 ../pidgin/gtkpounce.c:585
 msgid "Pounce When Buddy..."
 msgstr "いつ仲間をつかむか..."
 
-#: ../finch/gntpounce.c:373
+#: ../finch/gntpounce.c:376
 msgid "Signs on"
 msgstr "サイン・インした時"
 
-#: ../finch/gntpounce.c:374
-msgid "Signs off"
-msgstr "サイン・アウトした時"
-
-#: ../finch/gntpounce.c:375
-msgid "Goes away"
-msgstr "離席中になった時"
-
-#: ../finch/gntpounce.c:376
-msgid "Returns from away"
-msgstr "離席中から戻った時"
-
 #: ../finch/gntpounce.c:377
-msgid "Becomes idle"
-msgstr "待機中になった時"
+msgid "Signs off"
+msgstr "サイン・アウトした時"
 
 #: ../finch/gntpounce.c:378
+msgid "Goes away"
+msgstr "離席中になった時"
+
+#: ../finch/gntpounce.c:379
+msgid "Returns from away"
+msgstr "離席中から戻った時"
+
+#: ../finch/gntpounce.c:380
+msgid "Becomes idle"
+msgstr "待機中になった時"
+
+#: ../finch/gntpounce.c:381
 msgid "Is no longer idle"
 msgstr "待機中から復帰した時"
 
-#: ../finch/gntpounce.c:379
+#: ../finch/gntpounce.c:382
 msgid "Starts typing"
 msgstr "入力を開始した時"
 
-#: ../finch/gntpounce.c:380
+#: ../finch/gntpounce.c:383
 msgid "Pauses while typing"
 msgstr "入力を一旦停止した時"
 
-#: ../finch/gntpounce.c:381
+#: ../finch/gntpounce.c:384
 msgid "Stops typing"
 msgstr "入力を止めた時"
 
-#: ../finch/gntpounce.c:382
+#: ../finch/gntpounce.c:385
 msgid "Sends a message"
 msgstr "メッセージを送信する時"
 
 #. Create the "Action" frame.
-#: ../finch/gntpounce.c:411 ../pidgin/gtkpounce.c:638
+#: ../finch/gntpounce.c:414 ../pidgin/gtkpounce.c:646
 msgid "Action"
 msgstr "つかんだら何をするか..."
 
-#: ../finch/gntpounce.c:413
-msgid "Open an IM window"
-msgstr "会話ウィンドウを開く"
-
-#: ../finch/gntpounce.c:414
-msgid "Pop up a notification"
-msgstr "ポップアップして通知する"
-
-#: ../finch/gntpounce.c:415
-msgid "Send a message"
-msgstr "メッセージを送信する"
-
 #: ../finch/gntpounce.c:416
+msgid "Open an IM window"
+msgstr "会話ウィンドウを開く"
+
+#: ../finch/gntpounce.c:417
+msgid "Pop up a notification"
+msgstr "ポップアップして通知する"
+
+#: ../finch/gntpounce.c:418
+msgid "Send a message"
+msgstr "メッセージを送信する"
+
+#: ../finch/gntpounce.c:419
 msgid "Execute a command"
 msgstr "コマンドを実行する"
 
-#: ../finch/gntpounce.c:417
+#: ../finch/gntpounce.c:420
 msgid "Play a sound"
 msgstr "サウンドを演奏する"
 
-#: ../finch/gntpounce.c:445
+#: ../finch/gntpounce.c:448
 msgid "Pounce only when my status is not available"
 msgstr "自分の状態を変更できない時にだけつかむ"
 
-#: ../finch/gntpounce.c:447 ../pidgin/gtkpounce.c:1282
+#: ../finch/gntpounce.c:450 ../pidgin/gtkpounce.c:1281
 msgid "Recurring"
 msgstr "繰り返す"
 
-#: ../finch/gntpounce.c:649 ../pidgin/gtkpounce.c:1097
+#: ../finch/gntpounce.c:618
+#, fuzzy
+msgid "Cannot create pounce"
+msgstr "ニックネームを変更できません"
+
+#: ../finch/gntpounce.c:619
+#, fuzzy
+msgid "You do not have any accounts."
+msgstr "アカウントを選択して下さい"
+
+#: ../finch/gntpounce.c:620
+msgid "You must create an account first before you can create a pounce."
+msgstr ""
+
+#: ../finch/gntpounce.c:662 ../pidgin/gtkpounce.c:1096
 #, c-format
 msgid "Are you sure you want to delete the pounce on %s for %s?"
 msgstr "本当にアカウント %s で %s さんに対する \"つかむ\" 設定を削除しますか?"
 
-#: ../finch/gntpounce.c:682 ../finch/gntui.c:78 ../pidgin/gtkpounce.c:1329
+#: ../finch/gntpounce.c:696 ../finch/gntui.c:84 ../pidgin/gtkpounce.c:1325
 msgid "Buddy Pounces"
 msgstr "仲間をつかむ"
 
-#: ../finch/gntpounce.c:794 ../pidgin/gtkpounce.c:1456
+#: ../finch/gntpounce.c:810 ../pidgin/gtkpounce.c:1452
 #, c-format
 msgid "%s has started typing to you (%s)"
 msgstr "%s さんが入力を開始しました (%s)"
 
-#: ../finch/gntpounce.c:796 ../pidgin/gtkpounce.c:1458
+#: ../finch/gntpounce.c:812 ../pidgin/gtkpounce.c:1454
 #, c-format
 msgid "%s has paused while typing to you (%s)"
 msgstr "%s さんが入力を一停止しました (%s)"
 
-#: ../finch/gntpounce.c:798 ../pidgin/gtkpounce.c:1460
+#: ../finch/gntpounce.c:814 ../pidgin/gtkpounce.c:1456
 #, c-format
 msgid "%s has signed on (%s)"
 msgstr "%s さんがサイン・インしました (%s)"
 
-#: ../finch/gntpounce.c:800 ../pidgin/gtkpounce.c:1462
+#: ../finch/gntpounce.c:816 ../pidgin/gtkpounce.c:1458
 #, c-format
 msgid "%s has returned from being idle (%s)"
 msgstr "%s さんが待機中から戻ってきました (%s)"
 
-#: ../finch/gntpounce.c:802 ../pidgin/gtkpounce.c:1464
+#: ../finch/gntpounce.c:818 ../pidgin/gtkpounce.c:1460
 #, c-format
 msgid "%s has returned from being away (%s)"
 msgstr "%s さんが離席中から戻ってきました (%s)"
 
-#: ../finch/gntpounce.c:804 ../pidgin/gtkpounce.c:1466
+#: ../finch/gntpounce.c:820 ../pidgin/gtkpounce.c:1462
 #, c-format
 msgid "%s has stopped typing to you (%s)"
 msgstr "%s さんが入力を停止しました (%s)"
 
-#: ../finch/gntpounce.c:806 ../pidgin/gtkpounce.c:1468
+#: ../finch/gntpounce.c:822 ../pidgin/gtkpounce.c:1464
 #, c-format
 msgid "%s has signed off (%s)"
 msgstr "%s さんがサイン・アウトしました (%s)"
 
-#: ../finch/gntpounce.c:808 ../pidgin/gtkpounce.c:1470
+#: ../finch/gntpounce.c:824 ../pidgin/gtkpounce.c:1466
 #, c-format
 msgid "%s has become idle (%s)"
 msgstr "%s さんが待機中になりました (%s)"
 
-#: ../finch/gntpounce.c:810 ../pidgin/gtkpounce.c:1472
+#: ../finch/gntpounce.c:826 ../pidgin/gtkpounce.c:1468
 #, c-format
 msgid "%s has gone away. (%s)"
 msgstr "%s さんが離席しました (%s)"
 
-#: ../finch/gntpounce.c:812 ../pidgin/gtkpounce.c:1474
+#: ../finch/gntpounce.c:828 ../pidgin/gtkpounce.c:1470
 #, c-format
 msgid "%s has sent you a message. (%s)"
 msgstr "%s さんがあなたにメッセージを送信しました (%s)"
 
-#: ../finch/gntpounce.c:813 ../pidgin/gtkpounce.c:1475
+#: ../finch/gntpounce.c:829 ../pidgin/gtkpounce.c:1471
 msgid "Unknown pounce event. Please report this!"
 msgstr "不明な \"つかみ\" イベントです。ぜひバグ報告して下さい!"
 
-#: ../finch/gntprefs.c:79
+#: ../finch/gntprefs.c:92
 msgid "Based on keyboard use"
 msgstr "キーボードを操作し始めた時"
 
-#: ../finch/gntprefs.c:81 ../pidgin/gtkprefs.c:1853
+#: ../finch/gntprefs.c:94 ../pidgin/gtkprefs.c:1932
 msgid "From last sent message"
 msgstr "最後にメッセージを送信した後"
 
-#: ../finch/gntprefs.c:83 ../pidgin/gtkprefs.c:820 ../pidgin/gtkprefs.c:829
-#: ../pidgin/gtkprefs.c:1852 ../pidgin/gtkprefs.c:1866
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:337
+#: ../finch/gntprefs.c:96 ../pidgin/gtkprefs.c:898 ../pidgin/gtkprefs.c:907
+#: ../pidgin/gtkprefs.c:1931 ../pidgin/gtkprefs.c:1945
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:333
 msgid "Never"
 msgstr "しない"
 
-#: ../finch/gntprefs.c:171
+#: ../finch/gntprefs.c:184
 msgid "Show Idle Time"
 msgstr "待機中の時間を表示する"
 
-#: ../finch/gntprefs.c:172
+#: ../finch/gntprefs.c:185
 msgid "Show Offline Buddies"
 msgstr "オフラインの仲間を表示する"
 
-#: ../finch/gntprefs.c:179
+#: ../finch/gntprefs.c:192
 msgid "Notify buddies when you are typing"
 msgstr "メッセージを入力中であることを仲間に通知する"
 
-#: ../finch/gntprefs.c:185
+#: ../finch/gntprefs.c:198
 msgid "Log format"
 msgstr "ログの書式"
 
-#: ../finch/gntprefs.c:186
+#: ../finch/gntprefs.c:199
 msgid "Log IMs"
 msgstr "IM をログに記録する"
 
-#: ../finch/gntprefs.c:187
+#: ../finch/gntprefs.c:200
 msgid "Log chats"
 msgstr "チャットをログに記録する"
 
-#: ../finch/gntprefs.c:188
+#: ../finch/gntprefs.c:201
 msgid "Log status change events"
 msgstr "ログの状態の変更イベント"
 
+#: ../finch/gntprefs.c:207
+#, fuzzy
+msgid "Report Idle time"
+msgstr "いつ待機時間を報告するか...(_R):"
+
+#: ../finch/gntprefs.c:208
+#, fuzzy
+msgid "Change status when idle"
+msgstr "待機中になったら状態を変更する(_I)"
+
+#: ../finch/gntprefs.c:209
+#, fuzzy
+msgid "Minutes before changing status"
+msgstr "状態を変更するまでの時間(分)(_M):"
+
+#: ../finch/gntprefs.c:210
+#, fuzzy
+msgid "Change status to"
+msgstr "次の状態に変更する(_S):"
+
 #. Conversations
-#: ../finch/gntprefs.c:241 ../pidgin/gtkprefs.c:915 ../pidgin/gtkprefs.c:1956
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:344
+#: ../finch/gntprefs.c:259 ../pidgin/gtkprefs.c:993 ../pidgin/gtkprefs.c:2035
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:340
 msgid "Conversations"
 msgstr "会話ウィンドウ"
 
-#: ../finch/gntprefs.c:242 ../pidgin/gtkprefs.c:1392 ../pidgin/gtkprefs.c:1967
+#: ../finch/gntprefs.c:260 ../pidgin/gtkprefs.c:1469 ../pidgin/gtkprefs.c:2046
 msgid "Logging"
 msgstr "ログの記録"
 
-#: ../finch/gntrequest.c:532
+#: ../finch/gntrequest.c:583
 msgid "Not implemented yet."
 msgstr "まだ実装していません"
 
-#: ../finch/gntrequest.c:597 ../pidgin/gtkrequest.c:1530
-#: ../pidgin/gtkrequest.c:1576
+#: ../finch/gntrequest.c:659 ../pidgin/gtkrequest.c:1555
+#: ../pidgin/gtkrequest.c:1601
 msgid "Save File..."
 msgstr "ファイルの保存..."
 
-#: ../finch/gntrequest.c:597 ../pidgin/gtkrequest.c:1531
-#: ../pidgin/gtkrequest.c:1577
+#: ../finch/gntrequest.c:659 ../pidgin/gtkrequest.c:1556
+#: ../pidgin/gtkrequest.c:1602
 msgid "Open File..."
 msgstr "ファイルを開く..."
 
-#: ../finch/gntstatus.c:135
+#: ../finch/gntsound.c:97 ../pidgin/gtksound.c:64
+msgid "Buddy logs in"
+msgstr "仲間がログインしました"
+
+#: ../finch/gntsound.c:98 ../pidgin/gtksound.c:65
+msgid "Buddy logs out"
+msgstr "仲間がログアウトしました"
+
+#: ../finch/gntsound.c:99 ../pidgin/gtksound.c:66
+msgid "Message received"
+msgstr "メッセージを受信しました"
+
+#: ../finch/gntsound.c:100 ../pidgin/gtksound.c:67
+msgid "Message received begins conversation"
+msgstr "受信したメッセージと会話と開始しました"
+
+#: ../finch/gntsound.c:101 ../pidgin/gtksound.c:68
+msgid "Message sent"
+msgstr "メッセージを送信しました"
+
+#: ../finch/gntsound.c:102 ../pidgin/gtksound.c:69
+msgid "Person enters chat"
+msgstr "チャットに参加してきました"
+
+#: ../finch/gntsound.c:103 ../pidgin/gtksound.c:70
+msgid "Person leaves chat"
+msgstr "チャットから離れました"
+
+#: ../finch/gntsound.c:104 ../pidgin/gtksound.c:71
+msgid "You talk in chat"
+msgstr "チャットで話しました"
+
+#: ../finch/gntsound.c:105 ../pidgin/gtksound.c:72
+msgid "Others talk in chat"
+msgstr "他の人がチャットで話しました"
+
+#: ../finch/gntsound.c:107 ../pidgin/gtksound.c:75
+msgid "Someone says your screen name in chat"
+msgstr "チャットで誰かがあなたを呼びました"
+
+#: ../finch/gntsound.c:361 ../pidgin/gtksound.c:311
+msgid "GStreamer Failure"
+msgstr "GStreamer のエラー"
+
+#: ../finch/gntsound.c:362 ../pidgin/gtksound.c:312
+msgid "GStreamer failed to initialize."
+msgstr "GStreamer の初期化に失敗しました"
+
+#: ../finch/gntsound.c:716 ../finch/gntsound.c:802 ../pidgin/gtkprefs.c:1589
+#: ../pidgin/gtkprefs.c:1678 ../pidgin/gtkprefs.c:1874
+msgid "(default)"
+msgstr "(デフォルト)"
+
+#: ../finch/gntsound.c:729
+#, fuzzy
+msgid "Select Sound File ..."
+msgstr "フォルダの選択..."
+
+#: ../finch/gntsound.c:904
+#, fuzzy
+msgid "Sound Preferences"
+msgstr "設定"
+
+#: ../finch/gntsound.c:915
+#, fuzzy
+msgid "Profiles"
+msgstr "プロフィール"
+
+#: ../finch/gntsound.c:954 ../pidgin/gtkprefs.c:1719
+msgid "Automatic"
+msgstr "自動選択"
+
+#: ../finch/gntsound.c:957
+#, fuzzy
+msgid "Console Beep"
+msgstr "ビープ音"
+
+#: ../finch/gntsound.c:958 ../pidgin/gtkprefs.c:1723
+msgid "Command"
+msgstr "コマンド指定"
+
+#: ../finch/gntsound.c:959
+#, fuzzy
+msgid "No Sound"
+msgstr "サウンドなし"
+
+#: ../finch/gntsound.c:961 ../pidgin/gtkprefs.c:1714
+msgid "Sound Method"
+msgstr "サウンド出力の方法"
+
+#: ../finch/gntsound.c:966
+#, fuzzy
+msgid "Method: "
+msgstr "方法(_M):"
+
+#: ../finch/gntsound.c:973
+#, fuzzy, c-format
+msgid ""
+"Sound Command\n"
+"(%s for filename)"
+msgstr ""
+"サウンド・コマンド(_O)\n"
+"(ファイル名は %s で指定)"
+
+#. Sound options
+#: ../finch/gntsound.c:981 ../pidgin/gtkprefs.c:1758
+msgid "Sound Options"
+msgstr "サウンドのオプション"
+
+#: ../finch/gntsound.c:982
+#, fuzzy
+msgid "Sounds when conversation has focus"
+msgstr "会話ウィンドウがフォーカスされたらサウンドを演奏する(_F)"
+
+#: ../finch/gntsound.c:990 ../pidgin/gtkprefs.c:897 ../pidgin/gtkprefs.c:909
+#: ../pidgin/gtkprefs.c:1765 ../pidgin/plugins/timestamp_format.c:42
+#: ../pidgin/plugins/timestamp_format.c:51
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:334
+msgid "Always"
+msgstr "常に"
+
+#: ../finch/gntsound.c:991 ../pidgin/gtkprefs.c:1763
+msgid "Only when available"
+msgstr "在席している時だけ"
+
+#: ../finch/gntsound.c:992 ../pidgin/gtkprefs.c:1764
+msgid "Only when not available"
+msgstr "不在の時だけ"
+
+#: ../finch/gntsound.c:999
+#, fuzzy
+msgid "Volume(0-100):"
+msgstr "音量:"
+
+#. Sound events
+#: ../finch/gntsound.c:1018 ../pidgin/gtkprefs.c:1800
+msgid "Sound Events"
+msgstr "イベント毎のサウンド"
+
+#: ../finch/gntsound.c:1020 ../pidgin/gtkprefs.c:1859
+msgid "Event"
+msgstr "イベント"
+
+#: ../finch/gntsound.c:1020
+#, fuzzy
+msgid "File"
+msgstr "失敗しました"
+
+#: ../finch/gntsound.c:1039 ../pidgin/gtkprefs.c:1878
+msgid "Test"
+msgstr "テスト"
+
+#: ../finch/gntsound.c:1042 ../pidgin/gtkprefs.c:1882
+msgid "Reset"
+msgstr "リセット"
+
+#: ../finch/gntsound.c:1045 ../pidgin/gtkprefs.c:1886
+msgid "Choose..."
+msgstr "選択..."
+
+#: ../finch/gntstatus.c:138
 #, c-format
 msgid "Are you sure you want to delete \"%s\""
 msgstr "本当に %s さんを削除してもよろしいですか?"
 
-#: ../finch/gntstatus.c:138
+#: ../finch/gntstatus.c:141
 msgid "Delete Status"
 msgstr "状態の削除"
 
-#: ../finch/gntstatus.c:170 ../pidgin/gtksavedstatuses.c:557
+#: ../finch/gntstatus.c:176 ../pidgin/gtksavedstatuses.c:597
 msgid "Saved Statuses"
 msgstr "保存した状態"
 
-#: ../finch/gntstatus.c:177 ../finch/gntstatus.c:529
-#: ../libpurple/protocols/jabber/buddy.c:286
-#: ../libpurple/protocols/jabber/buddy.c:935
-#: ../libpurple/protocols/novell/novell.c:1484
-#: ../pidgin/gtksavedstatuses.c:464
+#: ../finch/gntstatus.c:183 ../finch/gntstatus.c:539
+#: ../libpurple/protocols/jabber/buddy.c:298
+#: ../libpurple/protocols/jabber/buddy.c:1359
+#: ../libpurple/protocols/novell/novell.c:1486
+#: ../pidgin/gtksavedstatuses.c:500
 msgid "Title"
 msgstr "題名"
 
-#: ../finch/gntstatus.c:177 ../pidgin/gtksavedstatuses.c:479
+#: ../finch/gntstatus.c:183 ../pidgin/gtksavedstatuses.c:515
 msgid "Type"
 msgstr "種類"
 
-#: ../finch/gntstatus.c:177 ../finch/gntstatus.c:554 ../finch/gntstatus.c:566
-#: ../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: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:5531
-#: ../libpurple/protocols/oscar/oscar.c:5749
-#: ../libpurple/protocols/oscar/oscar.c:5763
-#: ../libpurple/protocols/oscar/oscar.c:5779
-#: ../libpurple/protocols/oscar/oscar.c:5786
-#: ../libpurple/protocols/oscar/oscar.c:5793
+#. Statuses are almost all the same. Define a macro to reduce code repetition.
+#. PurpleStatusPrimitive
+#. id - use default
+#. name - use default
+#. savable
+#. user_settable
+#. not independent
+#. Attributes - each status can have a message.
+#: ../finch/gntstatus.c:183 ../finch/gntstatus.c:564 ../finch/gntstatus.c:576
+#: ../libpurple/protocols/bonjour/bonjour.c:256
+#: ../libpurple/protocols/bonjour/bonjour.c:263
+#: ../libpurple/protocols/bonjour/bonjour.c:346
+#: ../libpurple/protocols/gg/gg.c:1077 ../libpurple/protocols/gg/gg.c:1579
+#: ../libpurple/protocols/gg/gg.c:1597 ../libpurple/protocols/gg/gg.c:1607
+#: ../libpurple/protocols/gg/gg.c:1613 ../libpurple/protocols/gg/gg.c:1622
+#: ../libpurple/protocols/gg/gg.c:1627 ../libpurple/protocols/irc/irc.c:234
+#: ../libpurple/protocols/jabber/jabber.c:1532
+#: ../libpurple/protocols/jabber/jabber.c:1555
+#: ../libpurple/protocols/jabber/jabber.c:1578
+#: ../libpurple/protocols/jabber/jabber.c:1601
+#: ../libpurple/protocols/jabber/jabber.c:1624
+#: ../libpurple/protocols/jabber/jabber.c:1649
+#: ../libpurple/protocols/msn/msn.c:634 ../libpurple/protocols/msn/msn.c:641
+#: ../libpurple/protocols/msn/msn.c:648 ../libpurple/protocols/msn/msn.c:655
+#: ../libpurple/protocols/msn/msn.c:661 ../libpurple/protocols/msn/msn.c:667
+#: ../libpurple/protocols/myspace/myspace.c:148
+#: ../libpurple/protocols/novell/novell.c:2843
+#: ../libpurple/protocols/novell/novell.c:2946
+#: ../libpurple/protocols/novell/novell.c:2952
+#: ../libpurple/protocols/novell/novell.c:2958
+#: ../libpurple/protocols/oscar/oscar.c:5552
+#: ../libpurple/protocols/oscar/oscar.c:5770
+#: ../libpurple/protocols/oscar/oscar.c:5784
+#: ../libpurple/protocols/oscar/oscar.c:5800
+#: ../libpurple/protocols/oscar/oscar.c:5807
+#: ../libpurple/protocols/oscar/oscar.c:5814
 #: ../libpurple/protocols/sametime/sametime.c:3286
 #: ../libpurple/protocols/sametime/sametime.c:3292
 #: ../libpurple/protocols/sametime/sametime.c:3298
@@ -1349,72 +1734,100 @@
 #: ../libpurple/protocols/silc/buddy.c:1551
 #: ../libpurple/protocols/silc10/buddy.c:1551
 #: ../libpurple/protocols/simple/simple.c:246
-#: ../libpurple/protocols/yahoo/yahoo.c:3494
-#: ../libpurple/protocols/yahoo/yahoo.c:3500
+#: ../libpurple/protocols/yahoo/yahoo.c:3750
+#: ../libpurple/protocols/yahoo/yahoo.c:3756
 #: ../libpurple/protocols/zephyr/zephyr.c:2337
-#: ../pidgin/gtksavedstatuses.c:490 ../pidgin/gtksavedstatuses.c:954
+#: ../pidgin/gtksavedstatuses.c:526 ../pidgin/gtksavedstatuses.c:1010
 msgid "Message"
 msgstr "メッセージ"
 
 #. Use
-#: ../finch/gntstatus.c:189 ../finch/gntstatus.c:583
+#: ../finch/gntstatus.c:194 ../finch/gntstatus.c:593
 msgid "Use"
 msgstr "使う"
 
-#: ../finch/gntstatus.c:294
+#: ../finch/gntstatus.c:301
 msgid "Invalid title"
 msgstr "不正なタイトルです"
 
-#: ../finch/gntstatus.c:295
+#: ../finch/gntstatus.c:302
 msgid "Please enter a non-empty title for the status."
 msgstr "ステータスのタイトルを空にしないで下さい"
 
-#: ../finch/gntstatus.c:302
+#: ../finch/gntstatus.c:310
 msgid "Duplicate title"
 msgstr "タイトルが重複しています"
 
-#: ../finch/gntstatus.c:303
+#: ../finch/gntstatus.c:311
 msgid "Please enter a different title for the status."
 msgstr "別のタイトルを入力して下さい:"
 
-#: ../finch/gntstatus.c:443
+#: ../finch/gntstatus.c:452
 msgid "Substatus"
 msgstr "サブステータス"
 
-#: ../finch/gntstatus.c:454 ../pidgin/gtkft.c:698
+#: ../finch/gntstatus.c:464 ../pidgin/gtkft.c:699
 msgid "Status:"
 msgstr "状態:"
 
-#: ../finch/gntstatus.c:469
+#: ../finch/gntstatus.c:479
 msgid "Message:"
 msgstr "メッセージ"
 
-#: ../finch/gntstatus.c:518
+#: ../finch/gntstatus.c:528
 msgid "Edit Status"
 msgstr "状態の編集"
 
-#: ../finch/gntstatus.c:560
+#: ../finch/gntstatus.c:570
 msgid "Use different status for following accounts"
 msgstr "次のアカウントで別の状態を使用する"
 
 #. Save & Use
-#: ../finch/gntstatus.c:594
+#: ../finch/gntstatus.c:604
 msgid "Save & Use"
 msgstr "保存して使う"
 
-#: ../finch/gntui.c:83
+#: ../finch/gntui.c:85
+msgid "Certificates"
+msgstr ""
+
+#: ../finch/gntui.c:89 ../pidgin/gtkprefs.c:2037
+msgid "Sounds"
+msgstr "サウンド"
+
+#: ../finch/gntui.c:91
 msgid "Statuses"
 msgstr "状態"
 
-#: ../finch/plugins/gntclipboard.c:149
+#: ../finch/plugins/gntclipboard.c:115 ../finch/plugins/gntclipboard.c:121
+#: ../finch/plugins/gntclipboard.c:128
+#, fuzzy
+msgid "Error loading the plugin."
+msgstr "プラグインを解放する際にエラーが発生しました"
+
+#: ../finch/plugins/gntclipboard.c:116
+#, fuzzy
+msgid "Couldn't find X display"
+msgstr "ファイルを開けませんでした。"
+
+#: ../finch/plugins/gntclipboard.c:122
+#, fuzzy
+msgid "Couldn't find window"
+msgstr "ファイルを開けませんでした。"
+
+#: ../finch/plugins/gntclipboard.c:129
+msgid "This plugin cannot be loaded because it was not built with X11 support."
+msgstr ""
+
+#: ../finch/plugins/gntclipboard.c:158
 msgid "GntClipboard"
 msgstr "GntClipboard"
 
-#: ../finch/plugins/gntclipboard.c:151
+#: ../finch/plugins/gntclipboard.c:160
 msgid "Clipboard plugin"
 msgstr "クリップボードのプラグイン"
 
-#: ../finch/plugins/gntclipboard.c:152
+#: ../finch/plugins/gntclipboard.c:161
 msgid ""
 "When the gnt clipboard contents change, the contents are made available to "
 "X, if possible."
@@ -1483,16 +1896,16 @@
 msgid "Toaster plugin"
 msgstr "\"トースター\" プラグイン"
 
-#: ../finch/plugins/gnthistory.c:116 ../pidgin/plugins/history.c:120
+#: ../finch/plugins/gnthistory.c:116 ../pidgin/plugins/history.c:123
 #, c-format
 msgid "<b>Conversation with %s on %s:</b><br>"
 msgstr "<b>%s さんと %s の会話</b><br>"
 
-#: ../finch/plugins/gnthistory.c:138 ../pidgin/plugins/history.c:147
+#: ../finch/plugins/gnthistory.c:138 ../pidgin/plugins/history.c:150
 msgid "History Plugin Requires Logging"
 msgstr "ログ機能は \"履歴プラグイン\" で必要です"
 
-#: ../finch/plugins/gnthistory.c:139 ../pidgin/plugins/history.c:148
+#: ../finch/plugins/gnthistory.c:139 ../pidgin/plugins/history.c:151
 msgid ""
 "Logging can be enabled from Tools -> Preferences -> Logging.\n"
 "\n"
@@ -1508,11 +1921,11 @@
 msgid "GntHistory"
 msgstr "GntHistory"
 
-#: ../finch/plugins/gnthistory.c:181 ../pidgin/plugins/history.c:190
+#: ../finch/plugins/gnthistory.c:181 ../pidgin/plugins/history.c:194
 msgid "Shows recently logged conversations in new conversations."
 msgstr "新しい会話を始める時に最近ログに記録した会話を挿入します"
 
-#: ../finch/plugins/gnthistory.c:182 ../pidgin/plugins/history.c:191
+#: ../finch/plugins/gnthistory.c:182 ../pidgin/plugins/history.c:195
 msgid ""
 "When a new conversation is opened this plugin will insert the last "
 "conversation into the current conversation."
@@ -1534,206 +1947,358 @@
 msgid "Lastlog plugin."
 msgstr "Lastlog のプラグインです"
 
-#: ../libpurple/account.c:790
+#: ../libpurple/account.c:791
 msgid "accounts"
 msgstr "アカウント"
 
-#: ../libpurple/account.c:937 ../libpurple/protocols/jabber/auth.c:194
-#: ../libpurple/protocols/jabber/auth.c:233
+#: ../libpurple/account.c:958 ../libpurple/protocols/jabber/auth.c:195
 msgid "Password is required to sign on."
 msgstr "サイン・インするにはパスワードが必要です。"
 
-#: ../libpurple/account.c:963
+#: ../libpurple/account.c:992
 #, c-format
 msgid "Enter password for %s (%s)"
 msgstr "%s (%s) のパスワードを入力して下さい"
 
-#: ../libpurple/account.c:970
+#: ../libpurple/account.c:999
 msgid "Enter Password"
 msgstr "パスワードの入力"
 
-#: ../libpurple/account.c:975
+#: ../libpurple/account.c:1004
 msgid "Save password"
 msgstr "パスワードの保存"
 
-#: ../libpurple/account.c:1010 ../libpurple/connection.c:104
+#: ../libpurple/account.c:1039 ../libpurple/connection.c:105
+#: ../libpurple/connection.c:178
 #, c-format
 msgid "Missing protocol plugin for %s"
 msgstr "プロトコル %s のプラグインがありません"
 
-#: ../libpurple/account.c:1012 ../libpurple/connection.c:107
-#: ../pidgin/gtkblist.c:4001
+#: ../libpurple/account.c:1041 ../libpurple/connection.c:108
+#: ../pidgin/gtkblist.c:4318
 msgid "Connection Error"
 msgstr "接続エラー"
 
-#: ../libpurple/account.c:1170 ../libpurple/protocols/gg/gg.c:702
-#: ../libpurple/protocols/jabber/jabber.c:1342
+#: ../libpurple/account.c:1199 ../libpurple/protocols/gg/gg.c:707
+#: ../libpurple/protocols/jabber/jabber.c:1687
 msgid "New passwords do not match."
 msgstr "新しいパスワードが一致しません。"
 
-#: ../libpurple/account.c:1179
+#: ../libpurple/account.c:1208
 msgid "Fill out all fields completely."
 msgstr "全てのフィールドを完全に埋めて下さい。"
 
-#: ../libpurple/account.c:1202
+#: ../libpurple/account.c:1231
 msgid "Original password"
 msgstr "元のパスワード"
 
-#: ../libpurple/account.c:1209
+#: ../libpurple/account.c:1238
 msgid "New password"
 msgstr "新しいパスワード"
 
-#: ../libpurple/account.c:1216
+#: ../libpurple/account.c:1245
 msgid "New password (again)"
 msgstr "新しいパスワード (確認用)"
 
-#: ../libpurple/account.c:1222
+#: ../libpurple/account.c:1251
 #, c-format
 msgid "Change password for %s"
 msgstr "%s のパスワードの変更"
 
-#: ../libpurple/account.c:1230
+#: ../libpurple/account.c:1259
 msgid "Please enter your current password and your new password."
 msgstr "現在使用しているパスワードと新しいパスワードを入力して下さい。"
 
-#: ../libpurple/account.c:1261
+#: ../libpurple/account.c:1290
 #, c-format
 msgid "Change user information for %s"
 msgstr "%s のユーザ情報の変更"
 
-#: ../libpurple/account.c:1264 ../libpurple/protocols/toc/toc.c:1670
+#: ../libpurple/account.c:1293 ../libpurple/protocols/toc/toc.c:1670
 msgid "Set User Info"
 msgstr "ユーザ情報のセット"
 
-#: ../libpurple/account.c:1744 ../libpurple/protocols/gg/gg.c:1012
-#: ../libpurple/protocols/jabber/buddy.c:638
-#: ../libpurple/protocols/jabber/buddy.c:1424
-#: ../libpurple/protocols/jabber/buddy.c:1441
-#: ../libpurple/protocols/novell/novell.c:2831
-#: ../libpurple/protocols/qq/qq.c:230 ../pidgin/gtkft.c:159
+#: ../libpurple/account.c:1764 ../libpurple/protocols/gg/gg.c:1017
+#: ../libpurple/protocols/jabber/buddy.c:782
+#: ../libpurple/protocols/jabber/buddy.c:2030
+#: ../libpurple/protocols/jabber/buddy.c:2047
+#: ../libpurple/protocols/novell/novell.c:2836
+#: ../libpurple/protocols/qq/qq.c:232 ../pidgin/gtkft.c:160
 msgid "Unknown"
 msgstr "不明"
 
-#: ../libpurple/blist.c:523 ../libpurple/blist.c:1291
-#: ../libpurple/blist.c:1520 ../libpurple/protocols/jabber/roster.c:68
-#: ../pidgin/gtkblist.c:5293 ../pidgin/plugins/gevolution/gevolution.c:96
-#: ../pidgin/plugins/gevolution/gevo-util.c:64
+#: ../libpurple/blist.c:521 ../libpurple/blist.c:1321
+#: ../libpurple/blist.c:1531 ../libpurple/protocols/jabber/roster.c:69
+#: ../libpurple/protocols/myspace/myspace.c:3242 ../pidgin/gtkblist.c:5662
+#: ../pidgin/plugins/gevolution/gevo-util.c:67
+#: ../pidgin/plugins/gevolution/gevolution.c:96
 msgid "Buddies"
 msgstr "仲間"
 
-#: ../libpurple/blist.c:550
+#: ../libpurple/blist.c:548
 msgid "buddy list"
 msgstr "仲間リスト"
 
-#: ../libpurple/connection.c:106
+#: ../libpurple/certificate.c:545
+msgid "(DOES NOT MATCH)"
+msgstr ""
+
+#. Make messages
+#: ../libpurple/certificate.c:549
+#, c-format
+msgid "%s has presented the following certificate for just-this-once use:"
+msgstr ""
+
+#: ../libpurple/certificate.c:550
+#, c-format
+msgid ""
+"Common name: %s %s\n"
+"Fingerprint (SHA1): %s"
+msgstr ""
+
+#. TODO: Find what the handle ought to be
+#: ../libpurple/certificate.c:555
+msgid "Single-use Certificate Verification"
+msgstr ""
+
+#. Scheme name
+#. Pool name
+#: ../libpurple/certificate.c:872
+msgid "Certificate Authorities"
+msgstr ""
+
+#. Scheme name
+#. Pool name
+#: ../libpurple/certificate.c:1040
+msgid "SSL Peers Cache"
+msgstr ""
+
+#. Make messages
+#: ../libpurple/certificate.c:1171
+#, fuzzy, c-format
+msgid "Accept certificate for %s?"
+msgstr "チャットへの招待を受けますか?"
+
+#. TODO: Find what the handle ought to be
+#: ../libpurple/certificate.c:1177
+msgid "SSL Certificate Verification"
+msgstr ""
+
+#. Number of actions
+#: ../libpurple/certificate.c:1186
+#, fuzzy
+msgid "Accept"
+msgstr "許可する(_A)"
+
+#: ../libpurple/certificate.c:1187 ../libpurple/protocols/qq/buddy_opt.c:214
+#: ../libpurple/protocols/qq/group_im.c:144
+#: ../libpurple/protocols/qq/group_opt.c:127
+#: ../libpurple/protocols/qq/sys_msg.c:90
+#: ../libpurple/protocols/qq/sys_msg.c:246
+msgid "Reject"
+msgstr "拒否する"
+
+#: ../libpurple/certificate.c:1188
+msgid "_View Certificate..."
+msgstr ""
+
+#. Prompt the user to authenticate the certificate
+#. TODO: Provide the user with more guidance about why he is
+#. being prompted
+#. vrq will be completed by user_auth
+#: ../libpurple/certificate.c:1288
+#, c-format
+msgid ""
+"The certificate presented by \"%s\" claims to be from \"%s\" instead.  This "
+"could mean that you are not connecting to the service you believe you are."
+msgstr ""
+
+#. Prompt the user to authenticate the certificate
+#. vrq will be completed by user_auth
+#: ../libpurple/certificate.c:1313
+#, c-format
+msgid ""
+"The certificate presented by \"%s\" is self-signed. It cannot be "
+"automatically checked."
+msgstr ""
+
+#: ../libpurple/certificate.c:1331
+#, c-format
+msgid "The certificate chain presented for %s is not valid."
+msgstr ""
+
+#. TODO: Make this error either block the ensuing SSL
+#. connection error until the user dismisses this one, or
+#. stifle it.
+#. TODO: Probably wrong.
+#. TODO: Probably wrong
+#: ../libpurple/certificate.c:1339 ../libpurple/certificate.c:1416
+#, fuzzy
+msgid "SSL Certificate Error"
+msgstr "書き込みエラー"
+
+#: ../libpurple/certificate.c:1340
+#, fuzzy
+msgid "Invalid certificate chain"
+msgstr "不正なタイトルです"
+
+#. vrq will be completed by user_auth
+#: ../libpurple/certificate.c:1360
+msgid ""
+"You have no database of root certificates, so this certificate cannot be "
+"validated."
+msgstr ""
+
+#. vrq will be completed by user_auth
+#: ../libpurple/certificate.c:1382
+msgid ""
+"The root certificate this one claims to be issued by is unknown to Pidgin."
+msgstr ""
+
+#: ../libpurple/certificate.c:1408
+#, c-format
+msgid ""
+"The certificate chain presented by %s does not have a valid digital "
+"signature from the Certificate Authority from which it claims to have a "
+"signature."
+msgstr ""
+
+#: ../libpurple/certificate.c:1417
+msgid "Invalid certificate authority signature"
+msgstr ""
+
+#. Make messages
+#: ../libpurple/certificate.c:1882
+#, c-format
+msgid ""
+"Common name: %s\n"
+"\n"
+"Fingerprint (SHA1): %s\n"
+"\n"
+"Activation date: %s\n"
+"Expiration date: %s\n"
+msgstr ""
+
+#. TODO: Find what the handle ought to be
+#: ../libpurple/certificate.c:1891
+#, fuzzy
+msgid "Certificate Information"
+msgstr "サーバの情報"
+
+#: ../libpurple/connection.c:107
 msgid "Registration Error"
 msgstr "登録エラー"
 
-#: ../libpurple/connection.c:293
+#: ../libpurple/connection.c:180
+#, fuzzy
+msgid "Unregistration Error"
+msgstr "登録エラー"
+
+#: ../libpurple/connection.c:350
 #, c-format
 msgid "+++ %s signed on"
 msgstr "+++ %s さんがサイン・インしました"
 
-#: ../libpurple/connection.c:323
+#: ../libpurple/connection.c:380
 #, c-format
 msgid "+++ %s signed off"
 msgstr "+++ %s さんがサイン・アウトしました"
 
-#: ../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:322
+#: ../libpurple/connection.c:497 ../libpurple/plugin.c:282
+#: ../libpurple/protocols/jabber/buddy.c:2340
+#: ../libpurple/protocols/msn/servconn.c:141
+#: ../libpurple/protocols/msn/session.c:361
 msgid "Unknown error"
 msgstr "原因不明のエラー"
 
-#: ../libpurple/conversation.c:165
+#: ../libpurple/conversation.c:170
 msgid "Unable to send message: The message is too large."
 msgstr "メッセージの送信に失敗: メッセージが長すぎます"
 
-#: ../libpurple/conversation.c:168 ../libpurple/conversation.c:181
+#: ../libpurple/conversation.c:173 ../libpurple/conversation.c:186
 #, c-format
 msgid "Unable to send message to %s."
 msgstr "%s さんにメッセージを送信できません"
 
-#: ../libpurple/conversation.c:169
+#: ../libpurple/conversation.c:174
 msgid "The message is too large."
 msgstr "メッセージが長すぎます"
 
-#: ../libpurple/conversation.c:178 ../libpurple/protocols/bonjour/jabber.c:283
-#: ../libpurple/protocols/bonjour/jabber.c:325
+#: ../libpurple/conversation.c:183 ../libpurple/protocols/bonjour/jabber.c:255
+#: ../libpurple/protocols/bonjour/jabber.c:298
 msgid "Unable to send message."
 msgstr "メッセージを送信できません"
 
-#: ../libpurple/conversation.c:1164
+#: ../libpurple/conversation.c:1211
 msgid "Send Message"
 msgstr "メッセージの送信"
 
-#: ../libpurple/conversation.c:1167
+#: ../libpurple/conversation.c:1214
 msgid "_Send Message"
 msgstr "メッセージの送信(_S)"
 
-#: ../libpurple/conversation.c:1572
+#: ../libpurple/conversation.c:1620
 #, c-format
 msgid "%s entered the room."
 msgstr "%s さんがチャットルームに入りました"
 
-#: ../libpurple/conversation.c:1575
+#: ../libpurple/conversation.c:1623
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>] さんがチャットルームに入りました"
 
-#: ../libpurple/conversation.c:1682
+#: ../libpurple/conversation.c:1733
 #, c-format
 msgid "You are now known as %s"
 msgstr "あなたは %s と認識されました"
 
-#: ../libpurple/conversation.c:1702
+#: ../libpurple/conversation.c:1753
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s さんは %s と認識されました"
 
-#: ../libpurple/conversation.c:1775
+#: ../libpurple/conversation.c:1828
 #, c-format
 msgid "%s left the room."
 msgstr "%s さんがチャットルームから退室しました"
 
-#: ../libpurple/conversation.c:1778
+#: ../libpurple/conversation.c:1831
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s さんがチャットルーム (%s) から退室しました"
 
-#: ../libpurple/dbus-server.c:578
+#: ../libpurple/dbus-server.c:584
 #, c-format
 msgid "Failed to get connection: %s"
 msgstr "新しい接続を開けません: %s"
 
-#: ../libpurple/dbus-server.c:590
+#: ../libpurple/dbus-server.c:596
 #, c-format
 msgid "Failed to get name: %s"
 msgstr "名前の取得に失敗しました: %s"
 
-#: ../libpurple/dbus-server.c:603
+#: ../libpurple/dbus-server.c:610
 #, c-format
 msgid "Failed to get serv name: %s"
 msgstr "サーバ名の取得に失敗しました: %s"
 
-#: ../libpurple/dbus-server.h:83
+#: ../libpurple/dbus-server.h:85
 msgid "Purple's D-BUS server is not running for the reason listed below"
 msgstr "Purple の D-BUS サーバが次に示す理由で起動されていません:"
 
-#: ../libpurple/desktopitem.c:286 ../libpurple/desktopitem.c:877
+#: ../libpurple/desktopitem.c:287 ../libpurple/desktopitem.c:878
 msgid "No name"
 msgstr "名前なし"
 
-#: ../libpurple/dnsquery.c:510
+#: ../libpurple/dnsquery.c:511
 msgid "Unable to create new resolver process\n"
 msgstr "新しいレゾルバ・プロセスを生成できません\n"
 
-#: ../libpurple/dnsquery.c:515
+#: ../libpurple/dnsquery.c:516
 msgid "Unable to send request to resolver process\n"
 msgstr "レゾルバ・プロセスに要求を出せません\n"
 
-#: ../libpurple/dnsquery.c:548 ../libpurple/dnsquery.c:696
+#: ../libpurple/dnsquery.c:549 ../libpurple/dnsquery.c:697
 #, c-format
 msgid ""
 "Error resolving %s:\n"
@@ -1742,13 +2307,13 @@
 "%s を解決する際にエラー:\n"
 "%s"
 
-#: ../libpurple/dnsquery.c:551 ../libpurple/dnsquery.c:710
-#: ../libpurple/dnsquery.c:830
+#: ../libpurple/dnsquery.c:552 ../libpurple/dnsquery.c:711
+#: ../libpurple/dnsquery.c:831
 #, c-format
 msgid "Error resolving %s: %d"
 msgstr "%s を解決する際にエラー: %d"
 
-#: ../libpurple/dnsquery.c:573
+#: ../libpurple/dnsquery.c:574
 #, c-format
 msgid ""
 "Error reading from resolver process:\n"
@@ -1757,20 +2322,20 @@
 "レゾルバ・プロセスから読み込む際にエラー:\n"
 "%s"
 
-#: ../libpurple/dnsquery.c:577
+#: ../libpurple/dnsquery.c:578
 msgid "EOF while reading from resolver process"
 msgstr "レゾルバ・プロセスから読み込んでいる際に EOF"
 
-#: ../libpurple/dnsquery.c:760
+#: ../libpurple/dnsquery.c:761
 #, c-format
 msgid "Thread creation failure: %s"
 msgstr "スレッドの生成に失敗しました: %s"
 
-#: ../libpurple/dnsquery.c:761
+#: ../libpurple/dnsquery.c:762
 msgid "Unknown reason"
 msgstr "原因は不明です"
 
-#: ../libpurple/ft.c:204
+#: ../libpurple/ft.c:209
 #, c-format
 msgid ""
 "Error reading %s: \n"
@@ -1779,7 +2344,7 @@
 "%s を読み込む際にエラー: \n"
 "%s\n"
 
-#: ../libpurple/ft.c:208
+#: ../libpurple/ft.c:213
 #, c-format
 msgid ""
 "Error writing %s: \n"
@@ -1788,7 +2353,7 @@
 "%s へ書き込む際にエラー: \n"
 "%s\n"
 
-#: ../libpurple/ft.c:212
+#: ../libpurple/ft.c:217
 #, c-format
 msgid ""
 "Error accessing %s: \n"
@@ -1797,39 +2362,39 @@
 "%s にアクセスする際にエラー:\n"
 "%s\n"
 
-#: ../libpurple/ft.c:248
+#: ../libpurple/ft.c:253
 msgid "Directory is not writable."
 msgstr "ディレクトリに書き込む権限がありません"
 
-#: ../libpurple/ft.c:263
+#: ../libpurple/ft.c:268
 msgid "Cannot send a file of 0 bytes."
 msgstr "0 バイトのファイルは送信できません。"
 
-#: ../libpurple/ft.c:273
+#: ../libpurple/ft.c:278
 msgid "Cannot send a directory."
 msgstr "フォルダは送信できません。"
 
-#: ../libpurple/ft.c:282
+#: ../libpurple/ft.c:287
 #, c-format
 msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
 msgstr "%s は妥当なファイルではありません。上書きを拒否することにします。\n"
 
-#: ../libpurple/ft.c:342
+#: ../libpurple/ft.c:347
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "%s さんが %s (%s) を送信したがっています"
 
-#: ../libpurple/ft.c:349
+#: ../libpurple/ft.c:354
 #, c-format
 msgid "%s wants to send you a file"
 msgstr "%s さんがファイルを転送したがっています"
 
-#: ../libpurple/ft.c:392
+#: ../libpurple/ft.c:397
 #, c-format
 msgid "Accept file transfer request from %s?"
 msgstr "%s さんからのファイル転送要求を承諾しますか?"
 
-#: ../libpurple/ft.c:396
+#: ../libpurple/ft.c:401
 #, c-format
 msgid ""
 "A file is available for download from:\n"
@@ -1840,60 +2405,60 @@
 "リモート・ホスト: %s\n"
 "リモート・ポート: %d"
 
-#: ../libpurple/ft.c:431
+#: ../libpurple/ft.c:436
 #, c-format
 msgid "%s is offering to send file %s"
 msgstr "%s さんがファイル %s の送信を要求しています"
 
-#: ../libpurple/ft.c:483
+#: ../libpurple/ft.c:488
 #, c-format
 msgid "%s is not a valid filename.\n"
 msgstr "%s は正しいファイル名ではありません。\n"
 
-#: ../libpurple/ft.c:504
+#: ../libpurple/ft.c:509
 #, c-format
 msgid "Offering to send %s to %s"
 msgstr "%s を %s へ送信する旨を伝えています"
 
-#: ../libpurple/ft.c:516
+#: ../libpurple/ft.c:521
 #, c-format
 msgid "Starting transfer of %s from %s"
 msgstr "%s を %s から転送を開始しています"
 
-#: ../libpurple/ft.c:670
+#: ../libpurple/ft.c:682
 #, c-format
 msgid "Transfer of file %s complete"
 msgstr "ファイル %s の転送が完了しました"
 
-#: ../libpurple/ft.c:673
+#: ../libpurple/ft.c:685
 msgid "File transfer complete"
 msgstr "ファイルの転送が完了しました"
 
-#: ../libpurple/ft.c:1091
+#: ../libpurple/ft.c:1103
 #, c-format
 msgid "You canceled the transfer of %s"
 msgstr "%s の転送をキャンセルしました"
 
-#: ../libpurple/ft.c:1096
+#: ../libpurple/ft.c:1108
 msgid "File transfer cancelled"
 msgstr "ファイルの転送がキャンセルされました"
 
-#: ../libpurple/ft.c:1154
+#: ../libpurple/ft.c:1166
 #, c-format
 msgid "%s canceled the transfer of %s"
 msgstr "%s さんは %s の転送をキャンセルしました"
 
-#: ../libpurple/ft.c:1159
+#: ../libpurple/ft.c:1171
 #, c-format
 msgid "%s canceled the file transfer"
 msgstr "%s さんはファイルの転送をキャンセルしました"
 
-#: ../libpurple/ft.c:1216
+#: ../libpurple/ft.c:1228
 #, c-format
 msgid "File transfer to %s failed."
 msgstr "%s へのファイルの転送が失敗しました。"
 
-#: ../libpurple/ft.c:1218
+#: ../libpurple/ft.c:1230
 #, c-format
 msgid "File transfer from %s failed."
 msgstr "%s からのファイルの転送が失敗しました。"
@@ -2073,31 +2638,31 @@
 msgid "Whether the specified command should handle \"ymsgr\" URLs"
 msgstr "指定したコマンドで \"ymsgr\" の URL を処理するかどうか"
 
-#: ../libpurple/log.c:181
+#: ../libpurple/log.c:183
 msgid "<b><font color=\"red\">The logger has no read function</font></b>"
 msgstr "<b><font color=\"red\">ログ記録には読み込み関数がありません</font></b>"
 
-#: ../libpurple/log.c:593
+#: ../libpurple/log.c:598
 msgid "HTML"
 msgstr "HTML 形式"
 
-#: ../libpurple/log.c:607
+#: ../libpurple/log.c:612
 msgid "Plain text"
 msgstr "通常のテキスト"
 
-#: ../libpurple/log.c:621
+#: ../libpurple/log.c:626
 msgid "Old flat format"
 msgstr "古い形式"
 
-#: ../libpurple/log.c:732
+#: ../libpurple/log.c:839
 msgid "Logging of this conversation failed."
 msgstr "このメッセージのログを記録できませんでした"
 
-#: ../libpurple/log.c:1175
+#: ../libpurple/log.c:1282
 msgid "XML"
 msgstr "XML"
 
-#: ../libpurple/log.c:1251
+#: ../libpurple/log.c:1366
 #, c-format
 msgid ""
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -2106,7 +2671,7 @@
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
 "REPLY&gt;:</b></font> %s<br/>\n"
 
-#: ../libpurple/log.c:1253
+#: ../libpurple/log.c:1368
 #, c-format
 msgid ""
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -2115,16 +2680,16 @@
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
 "REPLY&gt;:</b></font> %s<br/>\n"
 
-#: ../libpurple/log.c:1311 ../libpurple/log.c:1444
+#: ../libpurple/log.c:1426 ../libpurple/log.c:1559
 msgid "<font color=\"red\"><b>Unable to find log path!</b></font>"
 msgstr "<font color=\"red\"><b>ログ・ファイルが見つかりません!</b></font>"
 
-#: ../libpurple/log.c:1323 ../libpurple/log.c:1453
+#: ../libpurple/log.c:1438 ../libpurple/log.c:1568
 #, c-format
 msgid "<font color=\"red\"><b>Could not read file: %s</b></font>"
 msgstr "<font color=\"red\"><b>ファイルを読み込めませんでした: %s</b></font>"
 
-#: ../libpurple/log.c:1385
+#: ../libpurple/log.c:1500
 #, c-format
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <AUTO-REPLY>: %s\n"
@@ -2215,14 +2780,14 @@
 
 #: ../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:1458
-#: ../libpurple/protocols/oscar/oscar.c:2251
-#: ../libpurple/protocols/oscar/oscar.c:2298
-#: ../libpurple/protocols/oscar/oscar.c:5863
-#: ../libpurple/protocols/oscar/oscar.c:5918
-#: ../libpurple/protocols/oscar/oscar.c:6144
-#: ../libpurple/protocols/oscar/oscar.c:6214 ../libpurple/request.h:1387
-#: ../libpurple/request.h:1397
+#: ../libpurple/protocols/oscar/oscar.c:1453
+#: ../libpurple/protocols/oscar/oscar.c:2229
+#: ../libpurple/protocols/oscar/oscar.c:2278
+#: ../libpurple/protocols/oscar/oscar.c:5884
+#: ../libpurple/protocols/oscar/oscar.c:5939
+#: ../libpurple/protocols/oscar/oscar.c:6165
+#: ../libpurple/protocols/oscar/oscar.c:6235 ../libpurple/request.h:1388
+#: ../libpurple/request.h:1398 ../pidgin/gtkblist.c:527
 msgid "_Cancel"
 msgstr "キャンセル(_C)"
 
@@ -2238,12 +2803,12 @@
 msgid "Auto Reject"
 msgstr "拒否する"
 
-#: ../libpurple/plugins/autoaccept.c:184
+#: ../libpurple/plugins/autoaccept.c:185
 msgid "Autoaccept File Transfers..."
 msgstr "ファイル転送の自動受け入れ..."
 
 #. XXX: Is there a better way than this? There really should be.
-#: ../libpurple/plugins/autoaccept.c:214
+#: ../libpurple/plugins/autoaccept.c:215
 msgid ""
 "Path to save the files in\n"
 "(Please provide the full path)"
@@ -2251,11 +2816,11 @@
 "ファイルを保存する場所\n"
 "(絶対パスで指定すること)"
 
-#: ../libpurple/plugins/autoaccept.c:219
+#: ../libpurple/plugins/autoaccept.c:220
 msgid "Automatically reject from users not in buddy list"
 msgstr "仲間リストに無いユーザからの要求は拒否する"
 
-#: ../libpurple/plugins/autoaccept.c:223
+#: ../libpurple/plugins/autoaccept.c:224
 msgid ""
 "Notify with a popup when an autoaccepted file transfer is complete\n"
 "(only when there's no conversation with the sender)"
@@ -2263,8 +2828,8 @@
 "自動受け入れによるファイルの転送が完了したらポップアップで知らせる\n"
 "(ファイルを送信した側と会話が無い場合にのみ)"
 
-#: ../libpurple/plugins/buddynote.c:46 ../libpurple/protocols/msn/msn.c:1629
-#: ../libpurple/protocols/msn/msn.c:1659
+#: ../libpurple/plugins/buddynote.c:46 ../libpurple/protocols/msn/msn.c:1770
+#: ../libpurple/protocols/msn/msn.c:1800
 msgid "Notes"
 msgstr "備考"
 
@@ -2284,18 +2849,18 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/buddynote.c:90
+#: ../libpurple/plugins/buddynote.c:90 ../pidgin/plugins/gtkbuddynote.c:74
 msgid "Buddy Notes"
 msgstr "仲間のメモ"
 
 #. *< name
 #. *< version
-#: ../libpurple/plugins/buddynote.c:92
+#: ../libpurple/plugins/buddynote.c:92 ../pidgin/plugins/gtkbuddynote.c:76
 msgid "Store notes on particular buddies."
 msgstr "特定の仲間に書き置きします"
 
 #. *< summary
-#: ../libpurple/plugins/buddynote.c:93
+#: ../libpurple/plugins/buddynote.c:93 ../pidgin/plugins/gtkbuddynote.c:77
 msgid "Adds the option to store notes for buddies on your buddy list."
 msgstr "仲間リストにいる仲間にメモを書き置きするための機能を追加します。"
 
@@ -2489,103 +3054,111 @@
 #. * offset is way off.  The user should never really see it, but
 #. * it's here just in case.  The parens are to make it clear it's
 #. * not a real timezone.
-#: ../libpurple/plugins/log_reader.c:497
+#: ../libpurple/plugins/log_reader.c:493
 msgid "(UTC)"
 msgstr "(UTC)"
 
-#: ../libpurple/plugins/log_reader.c:1573
+#: ../libpurple/plugins/log_reader.c:1577
 msgid "User is offline."
 msgstr "ユーザはオフラインです"
 
-#: ../libpurple/plugins/log_reader.c:1579
+#: ../libpurple/plugins/log_reader.c:1583
 msgid "Auto-response sent:"
 msgstr "自動応答の送信:"
 
-#: ../libpurple/plugins/log_reader.c:1589
-#: ../libpurple/plugins/log_reader.c:1592
+#: ../libpurple/plugins/log_reader.c:1593
+#: ../libpurple/plugins/log_reader.c:1596
 #: ../libpurple/plugins/statenotify.c:80
 #, c-format
 msgid "%s has signed off."
 msgstr "%s さんがサイン・アウトしました。"
 
-#: ../libpurple/plugins/log_reader.c:1606
+#: ../libpurple/plugins/log_reader.c:1610
 msgid "One or more messages may have been undeliverable."
 msgstr "一つ以上のメッセージが配送不可能な状態になっています"
 
-#: ../libpurple/plugins/log_reader.c:1616
+#: ../libpurple/plugins/log_reader.c:1620
 msgid "You were disconnected from the server."
 msgstr "サーバが接続を切りました"
 
-#: ../libpurple/plugins/log_reader.c:1624
+#: ../libpurple/plugins/log_reader.c:1628
 msgid ""
 "You are currently disconnected. Messages will not be received unless you are "
 "logged in."
 msgstr ""
 "現在接続していません。ログインするまでメッセージを受け取ることはできません。"
 
-#: ../libpurple/plugins/log_reader.c:1639
+#: ../libpurple/plugins/log_reader.c:1643
 msgid "Message could not be sent because the maximum length was exceeded."
 msgstr "メッセージの最大サイズを超えたため送信できませんでした"
 
-#: ../libpurple/plugins/log_reader.c:1644
+#: ../libpurple/plugins/log_reader.c:1648
 msgid "Message could not be sent."
 msgstr "メッセージを送信することができませんでした"
 
 #. 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:2098
+#: ../libpurple/plugins/log_reader.c:2349
+#: ../libpurple/plugins/log_reader.c:2472
 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:2002
-#: ../libpurple/plugins/log_reader.c:2103
+#: ../libpurple/plugins/log_reader.c:2362
+#: ../libpurple/plugins/log_reader.c:2477
 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:2014
-#: ../libpurple/plugins/log_reader.c:2107
+#: ../libpurple/plugins/log_reader.c:2374
+#: ../libpurple/plugins/log_reader.c:2481
 msgid "Messenger Plus!"
 msgstr "メッセンジャー 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:2027
-#: ../libpurple/plugins/log_reader.c:2112
+#: ../libpurple/plugins/log_reader.c:2388
+#: ../libpurple/plugins/log_reader.c:2486
+msgid "QIP"
+msgstr ""
+
+#. 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:2400
+#: ../libpurple/plugins/log_reader.c:2490
 msgid "MSN Messenger"
 msgstr "MSN メッセンジャー"
 
 #. 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:2039
-#: ../libpurple/plugins/log_reader.c:2116
+#: ../libpurple/plugins/log_reader.c:2412
+#: ../libpurple/plugins/log_reader.c:2494
 msgid "Trillian"
 msgstr "Trillian"
 
 #. Add general preferences.
-#: ../libpurple/plugins/log_reader.c:2080
+#: ../libpurple/plugins/log_reader.c:2454
 msgid "General Log Reading Configuration"
 msgstr "全般"
 
-#: ../libpurple/plugins/log_reader.c:2084
+#: ../libpurple/plugins/log_reader.c:2458
 msgid "Fast size calculations"
 msgstr "サイズを高速に計算する"
 
-#: ../libpurple/plugins/log_reader.c:2088
+#: ../libpurple/plugins/log_reader.c:2462
 msgid "Use name heuristics"
 msgstr "名前形式のヒューリスティックを使う"
 
 #. Add Log Directory preferences.
-#: ../libpurple/plugins/log_reader.c:2094
+#: ../libpurple/plugins/log_reader.c:2468
 msgid "Log Directory"
 msgstr "ログを記録するフォルダ"
 
@@ -2595,19 +3168,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/log_reader.c:2145
+#: ../libpurple/plugins/log_reader.c:2523
 msgid "Log Reader"
 msgstr "ログ・リーダ"
 
 #. *< name
 #. *< version
 #. * summary
-#: ../libpurple/plugins/log_reader.c:2149
+#: ../libpurple/plugins/log_reader.c:2527
 msgid "Includes other IM clients' logs in the log viewer."
 msgstr "他の IM クライアントのログをログ・ビューアで表示します"
 
 #. * description
-#: ../libpurple/plugins/log_reader.c:2153
+#: ../libpurple/plugins/log_reader.c:2531
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
 "Currently, this includes Adium, MSN Messenger, and Trillian.\n"
@@ -2675,7 +3248,7 @@
 "送信できなかった残りのメッセージを保存します。\"仲間をつかむ\" ダイアログで編"
 "集や削除が行えます。"
 
-#: ../libpurple/plugins/offlinemsg.c:152
+#: ../libpurple/plugins/offlinemsg.c:156
 #, c-format
 msgid ""
 "\"%s\" is currently offline. Do you want to save the rest of the messages in "
@@ -2684,43 +3257,43 @@
 "\"%s\" さんは現在オフラインです。送信できなかった残りのメッセージを保存してお"
 "き、\"%s\" さんが再びログオンした時に自動的に再送しますか?"
 
-#: ../libpurple/plugins/offlinemsg.c:156
+#: ../libpurple/plugins/offlinemsg.c:160
 msgid "Offline Message"
 msgstr "オフラインのメッセージ"
 
-#: ../libpurple/plugins/offlinemsg.c:157
+#: ../libpurple/plugins/offlinemsg.c:161
 msgid "You can edit/delete the pounce from the `Buddy Pounces' dialog"
 msgstr "\"仲間をつかむ\" ダイアログで編集や削除が行えます。"
 
-#: ../libpurple/plugins/offlinemsg.c:161
-#: ../libpurple/protocols/msn/dialog.c:133
-#: ../libpurple/protocols/msn/msn.c:522 ../libpurple/protocols/msn/msn.c:532
-#: ../libpurple/protocols/novell/novell.c:1917
+#: ../libpurple/plugins/offlinemsg.c:165
+#: ../libpurple/protocols/msn/dialog.c:141
+#: ../libpurple/protocols/msn/msn.c:622
+#: ../libpurple/protocols/novell/novell.c:1919
 #: ../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
+#: ../libpurple/protocols/silc10/wb.c:304 ../pidgin/gtkrequest.c:268
 msgid "Yes"
 msgstr "はい"
 
-#: ../libpurple/plugins/offlinemsg.c:162
-#: ../libpurple/protocols/msn/dialog.c:134
-#: ../libpurple/protocols/msn/msn.c:522 ../libpurple/protocols/msn/msn.c:532
-#: ../libpurple/protocols/novell/novell.c:1918
+#: ../libpurple/plugins/offlinemsg.c:166
+#: ../libpurple/protocols/msn/dialog.c:142
+#: ../libpurple/protocols/msn/msn.c:622
+#: ../libpurple/protocols/novell/novell.c:1920
 #: ../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
+#: ../libpurple/protocols/silc10/wb.c:305 ../pidgin/gtkrequest.c:269
 msgid "No"
 msgstr "いいえ"
 
-#: ../libpurple/plugins/offlinemsg.c:189
+#: ../libpurple/plugins/offlinemsg.c:193
 msgid "Save offline messages in pounce"
 msgstr "オフライン時のメッセージの保存"
 
-#: ../libpurple/plugins/offlinemsg.c:193
+#: ../libpurple/plugins/offlinemsg.c:197
 msgid "Do not ask. Always save in pounce."
 msgstr "常に保存しておく"
 
@@ -2783,7 +3356,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/signals-test.c:684
+#: ../libpurple/plugins/signals-test.c:711
 msgid "Signals Test"
 msgstr "シグナルのテスト"
 
@@ -2791,8 +3364,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/signals-test.c:687
-#: ../libpurple/plugins/signals-test.c:689
+#: ../libpurple/plugins/signals-test.c:714
+#: ../libpurple/plugins/signals-test.c:716
 msgid "Test to see that all signals are working properly."
 msgstr "全てのシグナルが正常に動作しているかテストします"
 
@@ -2814,6 +3387,50 @@
 msgid "Tests to see that most things are working."
 msgstr "主要な機能が動作しているかどうかテストします"
 
+#. Scheme name
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:903
+#: ../libpurple/plugins/ssl/ssl-nss.c:725
+msgid "X.509 Certificates"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:987
+msgid "GNUTLS"
+msgstr "GNUTLS"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:990
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:992
+msgid "Provides SSL support through GNUTLS."
+msgstr "GNUTLS を介した SSL 機能を提供します"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libpurple/plugins/ssl/ssl-nss.c:810
+msgid "NSS"
+msgstr "NSS"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../libpurple/plugins/ssl/ssl-nss.c:813
+#: ../libpurple/plugins/ssl/ssl-nss.c:815
+msgid "Provides SSL support through Mozilla NSS."
+msgstr "Mozilla が提供する NSS を介して SSL 機能を提供します"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -2832,44 +3449,6 @@
 msgid "Provides a wrapper around SSL support libraries."
 msgstr "SSL ライブラリのラッパーを提供します"
 
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:275
-msgid "GNUTLS"
-msgstr "GNUTLS"
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:278
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:280
-msgid "Provides SSL support through GNUTLS."
-msgstr "GNUTLS を介した SSL 機能を提供します"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../libpurple/plugins/ssl/ssl-nss.c:423
-msgid "NSS"
-msgstr "NSS"
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../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 機能を提供します"
-
 #: ../libpurple/plugins/statenotify.c:50
 #, c-format
 msgid "%s is no longer away."
@@ -2934,15 +3513,15 @@
 "会話の相手が離席したり、待機中から復帰もしくは在席していたら会話ウィンドウに"
 "通知します"
 
-#: ../libpurple/plugins/tcl/tcl.c:421
+#: ../libpurple/plugins/tcl/tcl.c:423
 msgid "Tcl Plugin Loader"
 msgstr "Tcl プラグイン・ローダ"
 
-#: ../libpurple/plugins/tcl/tcl.c:423 ../libpurple/plugins/tcl/tcl.c:424
+#: ../libpurple/plugins/tcl/tcl.c:425 ../libpurple/plugins/tcl/tcl.c:426
 msgid "Provides support for loading Tcl plugins"
 msgstr "Tcl プラグインを読み込む機能を提供します"
 
-#: ../libpurple/plugins/tcl/tcl.c:507
+#: ../libpurple/plugins/tcl/tcl.c:509
 msgid ""
 "Unable to detect ActiveTCL installation. If you wish to use TCL plugins, "
 "install ActiveTCL from http://www.activestate.com\n"
@@ -2963,25 +3542,43 @@
 "ローカルの mDNS サーバを使った接続は確立できませんでした。サーバは正しく起動"
 "されていますか?"
 
-#. 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: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:733
-#: ../libpurple/protocols/oscar/oscar.c:4544
-#: ../libpurple/protocols/oscar/oscar.c:5609
-#: ../libpurple/protocols/qq/qq.c:180 ../libpurple/protocols/silc/buddy.c:1476
-#: ../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 "離席中"
+#. Creating the options for the protocol
+#: ../libpurple/protocols/bonjour/bonjour.c:351
+#: ../libpurple/protocols/bonjour/bonjour.c:656
+#: ../libpurple/protocols/gg/gg.c:632
+#: ../libpurple/protocols/jabber/jabber.c:942
+msgid "First name"
+msgstr "名"
+
+#: ../libpurple/protocols/bonjour/bonjour.c:353
+#: ../libpurple/protocols/bonjour/bonjour.c:659
+#: ../libpurple/protocols/gg/gg.c:627
+#: ../libpurple/protocols/jabber/jabber.c:947
+msgid "Last name"
+msgstr "姓"
+
+#: ../libpurple/protocols/bonjour/bonjour.c:357
+#: ../libpurple/protocols/jabber/buddy.c:295
+#: ../libpurple/protocols/jabber/buddy.c:1325
+#: ../libpurple/protocols/jabber/buddy.c:1335
+#: ../libpurple/protocols/jabber/buddy.c:2219
+#: ../libpurple/protocols/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:1061
+msgid "E-Mail"
+msgstr "E-メール"
+
+#: ../libpurple/protocols/bonjour/bonjour.c:360
+#: ../libpurple/protocols/bonjour/bonjour.c:665
+msgid "AIM Account"
+msgstr "AIM のアカウント"
+
+#: ../libpurple/protocols/bonjour/bonjour.c:363
+#: ../libpurple/protocols/bonjour/bonjour.c:668
+msgid "XMPP Account"
+msgstr "XMPP のアカウント"
 
 #. *< type
 #. *< ui_requirement
@@ -2993,40 +3590,18 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/bonjour/bonjour.c:425
-#: ../libpurple/protocols/bonjour/bonjour.c:427
+#: ../libpurple/protocols/bonjour/bonjour.c:467
+#: ../libpurple/protocols/bonjour/bonjour.c:469
 msgid "Bonjour Protocol Plugin"
 msgstr "Bonjour プロトコルのプラグイン"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:470
-#: ../libpurple/protocols/bonjour/bonjour.c:477
-#: ../libpurple/protocols/bonjour/bonjour.c:535
+#: ../libpurple/protocols/bonjour/bonjour.c:610
 msgid "Purple Person"
 msgstr "Purple な人物"
 
-#. Creating the user splits
-#: ../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:587
-#: ../libpurple/protocols/gg/gg.c:627
-#: ../libpurple/protocols/jabber/jabber.c:828
-msgid "First name"
-msgstr "名"
-
-#: ../libpurple/protocols/bonjour/bonjour.c:590
-#: ../libpurple/protocols/gg/gg.c:622
-#: ../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/bonjour/bonjour.c:662
+#: ../libpurple/protocols/gg/gg.c:477
+#: ../libpurple/protocols/jabber/jabber.c:932
 #: ../libpurple/protocols/silc/silc.c:770
 #: ../libpurple/protocols/silc/silc.c:1011
 #: ../libpurple/protocols/silc10/silc.c:681
@@ -3034,50 +3609,42 @@
 msgid "E-mail"
 msgstr "E-メール:"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:596
-msgid "AIM Account"
-msgstr "AIM のアカウント"
-
-#: ../libpurple/protocols/bonjour/bonjour.c:599
-msgid "XMPP Account"
-msgstr "XMPP のアカウント"
-
 #: ../libpurple/protocols/bonjour/bonjour.h:33
 msgid "Bonjour"
 msgstr "Bonjour"
 
-#: ../libpurple/protocols/bonjour/jabber.c:394
+#: ../libpurple/protocols/bonjour/jabber.c:380
 #, c-format
 msgid "%s has closed the conversation."
 msgstr "%s さんが会話ウインドウを閉じました"
 
-#: ../libpurple/protocols/bonjour/jabber.c:440
-#: ../libpurple/protocols/bonjour/jabber.c:653
+#: ../libpurple/protocols/bonjour/jabber.c:437
+#: ../libpurple/protocols/bonjour/jabber.c:660
 #: ../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
+#: ../libpurple/protocols/bonjour/jabber.c:583
 msgid "Cannot open socket"
 msgstr "ソケットを開けません"
 
-#: ../libpurple/protocols/bonjour/jabber.c:582
+#: ../libpurple/protocols/bonjour/jabber.c:591
 msgid "Error setting socket options"
 msgstr "ソケットにオプションをセットできません"
 
-#: ../libpurple/protocols/bonjour/jabber.c:606
+#: ../libpurple/protocols/bonjour/jabber.c:615
 msgid "Could not bind socket to port"
 msgstr "ポートにソケットを割り当てられませんでした"
 
-#: ../libpurple/protocols/bonjour/jabber.c:614
+#: ../libpurple/protocols/bonjour/jabber.c:623
 msgid "Could not listen on socket"
 msgstr "ソケットを監視できませんでした"
 
-#: ../libpurple/protocols/gg/gg.c:76 ../libpurple/proxy.c:1812
+#: ../libpurple/protocols/gg/gg.c:76 ../libpurple/proxy.c:1829
 msgid "Invalid proxy settings"
 msgstr "不正なプロキシ設定"
 
-#: ../libpurple/protocols/gg/gg.c:77 ../libpurple/proxy.c:1812
+#: ../libpurple/protocols/gg/gg.c:77 ../libpurple/proxy.c:1829
 msgid ""
 "Either the host name or port number specified for your given proxy type is "
 "invalid."
@@ -3145,268 +3712,292 @@
 msgid "Registration completed successfully!"
 msgstr "登録が完了しました!"
 
-#: ../libpurple/protocols/gg/gg.c:477 ../libpurple/protocols/gg/gg.c:770
-#: ../libpurple/protocols/jabber/jabber.c:807
-#: ../libpurple/protocols/jabber/jabber.c:1377
+#: ../libpurple/protocols/gg/gg.c:482 ../libpurple/protocols/gg/gg.c:775
+#: ../libpurple/protocols/jabber/jabber.c:913
+#: ../libpurple/protocols/jabber/jabber.c:916
+#: ../libpurple/protocols/jabber/jabber.c:1722
 msgid "Password"
 msgstr "パスワード"
 
-#: ../libpurple/protocols/gg/gg.c:482 ../libpurple/protocols/gg/gg.c:775
+#: ../libpurple/protocols/gg/gg.c:487 ../libpurple/protocols/gg/gg.c:780
 msgid "Password (retype)"
 msgstr "パスワード (確認用)"
 
-#: ../libpurple/protocols/gg/gg.c:487 ../libpurple/protocols/gg/gg.c:780
+#: ../libpurple/protocols/gg/gg.c:492 ../libpurple/protocols/gg/gg.c:785
 msgid "Enter current token"
 msgstr "現在のトークンを入力して下さい"
 
-#: ../libpurple/protocols/gg/gg.c:493 ../libpurple/protocols/gg/gg.c:786
+#: ../libpurple/protocols/gg/gg.c:498 ../libpurple/protocols/gg/gg.c:791
 msgid "Current token"
 msgstr "現在のトークン"
 
-#: ../libpurple/protocols/gg/gg.c:497 ../libpurple/protocols/gg/gg.c:498
+#: ../libpurple/protocols/gg/gg.c:502 ../libpurple/protocols/gg/gg.c:503
 msgid "Register New Gadu-Gadu Account"
 msgstr "新しい Gadu-Gadu アカウントの登録"
 
-#: ../libpurple/protocols/gg/gg.c:499
+#: ../libpurple/protocols/gg/gg.c:504
 msgid "Please, fill in the following fields"
 msgstr "次の欄を埋めて下さい:"
 
-#: ../libpurple/protocols/gg/gg.c:637 ../libpurple/protocols/gg/gg.c:1049
-#: ../libpurple/protocols/gg/gg.c:1123
-#: ../libpurple/protocols/jabber/jabber.c:843
-#: ../libpurple/protocols/oscar/oscar.c:3802
-#: ../libpurple/protocols/oscar/oscar.c:3815
+#: ../libpurple/protocols/gg/gg.c:642 ../libpurple/protocols/gg/gg.c:1054
+#: ../libpurple/protocols/gg/gg.c:1126
+#: ../libpurple/protocols/jabber/jabber.c:957
+#: ../libpurple/protocols/oscar/oscar.c:3785
+#: ../libpurple/protocols/oscar/oscar.c:3798
 #: ../libpurple/protocols/qq/buddy_info.c:49
 msgid "City"
 msgstr "町"
 
-#: ../libpurple/protocols/gg/gg.c:642
+#: ../libpurple/protocols/gg/gg.c:647
 msgid "Year of birth"
 msgstr "誕生年"
 
-#: ../libpurple/protocols/gg/gg.c:645 ../libpurple/protocols/msn/msn.c:1558
-#: ../libpurple/protocols/oscar/oscar.c:3745
+#: ../libpurple/protocols/gg/gg.c:650 ../libpurple/protocols/msn/msn.c:1699
+#: ../libpurple/protocols/myspace/user.c:115
+#: ../libpurple/protocols/oscar/oscar.c:3728
 #: ../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
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1067
+#: ../libpurple/protocols/qq/qq.c:226 ../libpurple/protocols/qq/qq.c:229
+#: ../libpurple/protocols/qq/qq.c:232 ../libpurple/protocols/qq/qq.c:236
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1091
 msgid "Gender"
 msgstr "性別"
 
-#: ../libpurple/protocols/gg/gg.c:646
+#: ../libpurple/protocols/gg/gg.c:651
 msgid "Male or female"
 msgstr "男/女"
 
-#: ../libpurple/protocols/gg/gg.c:647
-#: ../libpurple/protocols/oscar/oscar.c:3745
+#: ../libpurple/protocols/gg/gg.c:652
+#: ../libpurple/protocols/oscar/oscar.c:3728
 #: ../libpurple/protocols/qq/buddy_info.c:83
-#: ../libpurple/protocols/qq/qq.c:224
+#: ../libpurple/protocols/qq/qq.c:226
 msgid "Male"
 msgstr "男性"
 
-#: ../libpurple/protocols/gg/gg.c:648
-#: ../libpurple/protocols/oscar/oscar.c:3745
+#: ../libpurple/protocols/gg/gg.c:653
+#: ../libpurple/protocols/oscar/oscar.c:3728
 #: ../libpurple/protocols/qq/buddy_info.c:84
-#: ../libpurple/protocols/qq/qq.c:227
+#: ../libpurple/protocols/qq/qq.c:229
 msgid "Female"
 msgstr "女性"
 
-#: ../libpurple/protocols/gg/gg.c:652
+#: ../libpurple/protocols/gg/gg.c:657
 msgid "Only online"
 msgstr "オンラインのみ"
 
-#: ../libpurple/protocols/gg/gg.c:656 ../libpurple/protocols/gg/gg.c:657
+#: ../libpurple/protocols/gg/gg.c:661 ../libpurple/protocols/gg/gg.c:662
 msgid "Find buddies"
 msgstr "仲間の検索"
 
-#: ../libpurple/protocols/gg/gg.c:658
+#: ../libpurple/protocols/gg/gg.c:663
 msgid "Please, enter your search criteria below"
 msgstr "検索条件を入力して下さい"
 
-#: ../libpurple/protocols/gg/gg.c:696
+#: ../libpurple/protocols/gg/gg.c:701
 msgid "Fill in the fields."
 msgstr "次の欄を埋めて下さい:"
 
-#: ../libpurple/protocols/gg/gg.c:708
+#: ../libpurple/protocols/gg/gg.c:713
 msgid "Your current password is different from the one that you specified."
 msgstr "現在使用しているパスワードと指定したパスワードが一致しませんでした。"
 
-#: ../libpurple/protocols/gg/gg.c:722
+#: ../libpurple/protocols/gg/gg.c:727
 msgid "Unable to change password. Error occurred.\n"
 msgstr "パスワードを変更できません。エラーが発生しました。\n"
 
-#: ../libpurple/protocols/gg/gg.c:731
+#: ../libpurple/protocols/gg/gg.c:736
 msgid "Change password for the Gadu-Gadu account"
 msgstr "Gadu-Gadu アカウントのパスワードの変更"
 
-#: ../libpurple/protocols/gg/gg.c:732
+#: ../libpurple/protocols/gg/gg.c:737
 msgid "Password was changed successfully!"
 msgstr "パスワードの変更が完了しました!"
 
-#: ../libpurple/protocols/gg/gg.c:765
+#: ../libpurple/protocols/gg/gg.c:770
 msgid "Current password"
 msgstr "現在のパスワード"
 
-#: ../libpurple/protocols/gg/gg.c:790
+#: ../libpurple/protocols/gg/gg.c:795
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr "現在使用しているパスワードと UIN の新しいパスワードを入力して下さい:"
 
-#: ../libpurple/protocols/gg/gg.c:794 ../libpurple/protocols/gg/gg.c:795
+#: ../libpurple/protocols/gg/gg.c:799 ../libpurple/protocols/gg/gg.c:800
 msgid "Change Gadu-Gadu Password"
 msgstr "Gadu-Gadu のパスワードの変更"
 
-#: ../libpurple/protocols/gg/gg.c:871
+#: ../libpurple/protocols/gg/gg.c:876
 #, c-format
 msgid "Select a chat for buddy: %s"
 msgstr "チャットの選択: %s"
 
-#: ../libpurple/protocols/gg/gg.c:874 ../libpurple/protocols/gg/gg.c:875
+#: ../libpurple/protocols/gg/gg.c:879 ../libpurple/protocols/gg/gg.c:880
 msgid "Add to chat..."
 msgstr "チャットの追加..."
 
-#: ../libpurple/protocols/gg/gg.c:1003
-#: ../libpurple/protocols/jabber/buddy.c:1428
-#: ../libpurple/protocols/novell/novell.c:2828
+#: ../libpurple/protocols/gg/gg.c:1008
+#: ../libpurple/protocols/jabber/buddy.c:2034
+#: ../libpurple/protocols/novell/novell.c:2833
 #: ../libpurple/protocols/oscar/oscar.c:828
-#: ../libpurple/protocols/oscar/oscar.c:5581
+#: ../libpurple/protocols/oscar/oscar.c:5602
 #: ../libpurple/protocols/qq/qq.c:170 ../libpurple/protocols/qq/qq.c:177
-#: ../libpurple/protocols/yahoo/yahoo.c:2917 ../libpurple/status.c:153
-#: ../pidgin/gtkblist.c:3079 ../pidgin/gtkblist.c:3407
-#: ../pidgin/gtkdocklet.c:450 ../pidgin/gtkstatusbox.c:1054
+#: ../libpurple/protocols/qq/qq.c:292
+#: ../libpurple/protocols/yahoo/yahoo.c:3098 ../libpurple/status.c:154
+#: ../pidgin/gtkblist.c:3302 ../pidgin/gtkblist.c:3640
+#: ../pidgin/gtkdocklet.c:450 ../pidgin/gtkstatusbox.c:1061
 msgid "Offline"
 msgstr "オフライン"
 
-#: ../libpurple/protocols/gg/gg.c:1006
-#: ../libpurple/protocols/jabber/buddy.c:1430
+#: ../libpurple/protocols/gg/gg.c:1011
+#: ../libpurple/protocols/jabber/buddy.c:2036
 #: ../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:2919 ../libpurple/status.c:154
-#: ../pidgin/gtkdocklet.c:438 ../pidgin/gtkstatusbox.c:1051
+#: ../libpurple/protocols/novell/novell.c:2821
+#: ../libpurple/protocols/qq/qq.c:280
+#: ../libpurple/protocols/yahoo/yahoo.c:3100 ../libpurple/status.c:155
+#: ../pidgin/gtkdocklet.c:438 ../pidgin/gtkstatusbox.c:1057
 msgid "Available"
 msgstr "在席しています"
 
-#: ../libpurple/protocols/gg/gg.c:1038 ../libpurple/protocols/gg/gg.c:1114
-#: ../libpurple/protocols/oscar/oscar.c:2675
-#: ../libpurple/protocols/oscar/oscar.c:3712
+#. 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/gg/gg.c:1014 ../libpurple/protocols/irc/irc.c:528
+#: ../libpurple/protocols/irc/msgs.c:310
+#: ../libpurple/protocols/jabber/buddy.c:2040
+#: ../libpurple/protocols/novell/novell.c:2824
+#: ../libpurple/protocols/oscar/oscar.c:733
+#: ../libpurple/protocols/oscar/oscar.c:4543
+#: ../libpurple/protocols/oscar/oscar.c:5630
+#: ../libpurple/protocols/qq/qq.c:180 ../libpurple/protocols/qq/qq.c:284
+#: ../libpurple/protocols/silc/buddy.c:1476
+#: ../libpurple/protocols/silc10/buddy.c:1476
+#: ../libpurple/protocols/yahoo/yahoo.c:3652
+#: ../libpurple/protocols/yahoo/yahoo.c:3726 ../libpurple/status.c:158
+#: ../pidgin/gtkdocklet.c:442 ../pidgin/gtkprefs.c:1941
+#: ../pidgin/gtkstatusbox.c:1058
+msgid "Away"
+msgstr "離席中"
+
+#: ../libpurple/protocols/gg/gg.c:1043 ../libpurple/protocols/gg/gg.c:1117
+#: ../libpurple/protocols/oscar/oscar.c:2695
+#: ../libpurple/protocols/oscar/oscar.c:3695
 msgid "UIN"
 msgstr "UIN"
 
-#: ../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:3723
+#: ../libpurple/protocols/gg/gg.c:1046 ../libpurple/protocols/gg/gg.c:1120
+#: ../libpurple/protocols/jabber/buddy.c:2213
+#: ../libpurple/protocols/jabber/buddy.c:2389
+#: ../libpurple/protocols/oscar/oscar.c:3706
 #: ../libpurple/protocols/silc/ops.c:990
 #: ../libpurple/protocols/silc10/ops.c:1024
 msgid "First Name"
 msgstr "名"
 
-#: ../libpurple/protocols/gg/gg.c:1054 ../libpurple/protocols/gg/gg.c:1126
+#: ../libpurple/protocols/gg/gg.c:1059 ../libpurple/protocols/gg/gg.c:1129
 msgid "Birth Year"
 msgstr "誕生年"
 
-#: ../libpurple/protocols/gg/gg.c:1108 ../libpurple/protocols/gg/gg.c:1177
-#: ../libpurple/protocols/oscar/oscar.c:3924
+#: ../libpurple/protocols/gg/gg.c:1111 ../libpurple/protocols/gg/gg.c:1180
+#: ../libpurple/protocols/oscar/oscar.c:3907
 msgid "Unable to display the search results."
 msgstr "検索結果を表示できません"
 
-#: ../libpurple/protocols/gg/gg.c:1168
+#: ../libpurple/protocols/gg/gg.c:1171
 msgid "Gadu-Gadu Public Directory"
 msgstr "Gadu-Gadu の公開フォルダ"
 
-#: ../libpurple/protocols/gg/gg.c:1169
+#: ../libpurple/protocols/gg/gg.c:1172
 msgid "Search results"
 msgstr "検索結果"
 
-#: ../libpurple/protocols/gg/gg.c:1212
+#: ../libpurple/protocols/gg/gg.c:1215
 msgid "No matching users found"
 msgstr "一致するユーザが見つかりませんでした"
 
-#: ../libpurple/protocols/gg/gg.c:1213
+#: ../libpurple/protocols/gg/gg.c:1216
 msgid "There are no users matching your search criteria."
 msgstr "検索条件に一致するユーザが存在しませんでした。"
 
-#: ../libpurple/protocols/gg/gg.c:1307 ../libpurple/protocols/gg/gg.c:1460
+#: ../libpurple/protocols/gg/gg.c:1310 ../libpurple/protocols/gg/gg.c:1463
 msgid "Unable to read socket"
 msgstr "ソケットを読めません"
 
-#: ../libpurple/protocols/gg/gg.c:1392
+#: ../libpurple/protocols/gg/gg.c:1395
 msgid "Buddy list downloaded"
 msgstr "仲間リストをダウンロードしました"
 
-#: ../libpurple/protocols/gg/gg.c:1393
+#: ../libpurple/protocols/gg/gg.c:1396
 msgid "Your buddy list was downloaded from the server."
 msgstr "仲間リストをサーバからダウンロードしました。"
 
-#: ../libpurple/protocols/gg/gg.c:1400
+#: ../libpurple/protocols/gg/gg.c:1403
 msgid "Buddy list uploaded"
 msgstr "仲間リストをアップロードしました"
 
-#: ../libpurple/protocols/gg/gg.c:1401
+#: ../libpurple/protocols/gg/gg.c:1404
 msgid "Your buddy list was stored on the server."
 msgstr "仲間リストをサーバに格納しました。"
 
-#: ../libpurple/protocols/gg/gg.c:1506 ../libpurple/protocols/gg/gg.c:1712
+#: ../libpurple/protocols/gg/gg.c:1509 ../libpurple/protocols/gg/gg.c:1715
 msgid "Connection failed."
 msgstr "接続に失敗しました"
 
-#: ../libpurple/protocols/gg/gg.c:1618 ../libpurple/protocols/msn/msn.c:531
+#: ../libpurple/protocols/gg/gg.c:1621 ../libpurple/protocols/msn/msn.c:621
 msgid "Blocked"
 msgstr "拒否しているか"
 
-#: ../libpurple/protocols/gg/gg.c:1641
+#: ../libpurple/protocols/gg/gg.c:1644
 msgid "Add to chat"
 msgstr "チャットに追加"
 
-#: ../libpurple/protocols/gg/gg.c:1650
+#: ../libpurple/protocols/gg/gg.c:1653
 msgid "Unblock"
 msgstr "拒否しない"
 
-#: ../libpurple/protocols/gg/gg.c:1654
+#: ../libpurple/protocols/gg/gg.c:1657
 msgid "Block"
 msgstr "拒否する"
 
-#: ../libpurple/protocols/gg/gg.c:1671
+#: ../libpurple/protocols/gg/gg.c:1674
 msgid "Chat _name:"
 msgstr "チャット名(_N):"
 
-#: ../libpurple/protocols/gg/gg.c:1911
+#: ../libpurple/protocols/gg/gg.c:1914
 msgid "Chat error"
 msgstr "チャットのエラー"
 
-#: ../libpurple/protocols/gg/gg.c:1912
+#: ../libpurple/protocols/gg/gg.c:1915
 msgid "This chat name is already in use"
 msgstr "そのチャット名は既に使用されています。"
 
-#: ../libpurple/protocols/gg/gg.c:1995
+#: ../libpurple/protocols/gg/gg.c:1998
 msgid "Not connected to the server."
 msgstr "サーバへ接続していません。"
 
-#: ../libpurple/protocols/gg/gg.c:2018
+#: ../libpurple/protocols/gg/gg.c:2021
 msgid "Find buddies..."
 msgstr "仲間の検索..."
 
-#: ../libpurple/protocols/gg/gg.c:2024
+#: ../libpurple/protocols/gg/gg.c:2027
 msgid "Change password..."
 msgstr "パスワードの変更..."
 
-#: ../libpurple/protocols/gg/gg.c:2030
+#: ../libpurple/protocols/gg/gg.c:2033
 msgid "Upload buddylist to Server"
 msgstr "仲間リストのアップロード"
 
-#: ../libpurple/protocols/gg/gg.c:2034
+#: ../libpurple/protocols/gg/gg.c:2037
 msgid "Download buddylist from Server"
 msgstr "仲間リストのダウンロード"
 
-#: ../libpurple/protocols/gg/gg.c:2038
+#: ../libpurple/protocols/gg/gg.c:2041
 msgid "Delete buddylist from Server"
 msgstr "サーバから仲間リストの削除"
 
-#: ../libpurple/protocols/gg/gg.c:2042
+#: ../libpurple/protocols/gg/gg.c:2045
 msgid "Save buddylist to file..."
 msgstr "仲間リストの保存..."
 
-#: ../libpurple/protocols/gg/gg.c:2046
+#: ../libpurple/protocols/gg/gg.c:2049
 msgid "Load buddylist from file..."
 msgstr "仲間リストのインポート..."
 
@@ -3421,16 +4012,16 @@
 #. id
 #. name
 #. version
-#: ../libpurple/protocols/gg/gg.c:2150
+#: ../libpurple/protocols/gg/gg.c:2153
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr "Gadu-Gadu プロトコルのプラグイン"
 
 #. summary
-#: ../libpurple/protocols/gg/gg.c:2151
+#: ../libpurple/protocols/gg/gg.c:2154
 msgid "Polish popular IM"
 msgstr "ポーランドで人気のある IM です"
 
-#: ../libpurple/protocols/gg/gg.c:2205
+#: ../libpurple/protocols/gg/gg.c:2208
 msgid "Gadu-Gadu User"
 msgstr "Gadu-Gadu ユーザ"
 
@@ -3458,9 +4049,9 @@
 
 #: ../libpurple/protocols/irc/dcc_send.c:296
 #: ../libpurple/protocols/irc/dcc_send.c:337
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:268
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:277
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:290
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:269
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:278
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:287
 msgid "File Transfer Failed"
 msgstr "ファイルの転送が失敗しました"
 
@@ -3487,7 +4078,8 @@
 msgstr "%s の MOTD"
 
 #: ../libpurple/protocols/irc/irc.c:127 ../libpurple/protocols/irc/irc.c:165
-#: ../libpurple/protocols/irc/irc.c:614 ../libpurple/protocols/irc/irc.c:639
+#: ../libpurple/protocols/irc/irc.c:612 ../libpurple/protocols/irc/irc.c:637
+#: ../libpurple/protocols/myspace/myspace.c:2354
 msgid "Server has disconnected"
 msgstr "サーバが接続を切りました"
 
@@ -3501,7 +4093,7 @@
 msgstr "チャンネル(_C):"
 
 #: ../libpurple/protocols/irc/irc.c:267
-#: ../libpurple/protocols/jabber/chat.c:59 ../pidgin/gtkaccount.c:523
+#: ../libpurple/protocols/jabber/chat.c:59 ../pidgin/gtkaccount.c:524
 msgid "_Password:"
 msgstr "パスワード(_P):"
 
@@ -3509,65 +4101,62 @@
 msgid "IRC nicks may not contain whitespace"
 msgstr "IRC のニックネームには空白が含まれていないかもしれません"
 
+#. 1. connect to server
 #. connect to the server
 #: ../libpurple/protocols/irc/irc.c:319
-#: ../libpurple/protocols/jabber/jabber.c:1048
-#: ../libpurple/protocols/msn/session.c:345
-#: ../libpurple/protocols/novell/novell.c:2182
-#: ../libpurple/protocols/oscar/oscar.c:1288
+#: ../libpurple/protocols/jabber/jabber.c:1280
+#: ../libpurple/protocols/msn/session.c:384
+#: ../libpurple/protocols/myspace/myspace.c:302
+#: ../libpurple/protocols/novell/novell.c:2187
+#: ../libpurple/protocols/oscar/oscar.c:1287
 #: ../libpurple/protocols/qq/qq.c:136
 #: ../libpurple/protocols/sametime/sametime.c:3723
-#: ../libpurple/protocols/simple/simple.c:1671
-#: ../libpurple/protocols/yahoo/yahoo.c:2762
-#: ../libpurple/protocols/zephyr/zephyr.c:1621 ../pidgin/gtkstatusbox.c:659
+#: ../libpurple/protocols/simple/simple.c:1718
+#: ../libpurple/protocols/yahoo/yahoo.c:2938
+#: ../libpurple/protocols/zephyr/zephyr.c:1621 ../pidgin/gtkstatusbox.c:662
 msgid "Connecting"
 msgstr "接続中です"
 
 #: ../libpurple/protocols/irc/irc.c:327
-#: ../libpurple/protocols/jabber/jabber.c:603
-#: ../libpurple/protocols/jabber/jabber.c:950
+#: ../libpurple/protocols/jabber/jabber.c:610
+#: ../libpurple/protocols/jabber/jabber.c:1095
 msgid "SSL support unavailable"
 msgstr "SSL サポートは無効です"
 
+#. TODO: try other ports if in auto mode, then save
+#. * working port and try that first next time.
 #: ../libpurple/protocols/irc/irc.c:338
+#: ../libpurple/protocols/myspace/myspace.c:318
 #: ../libpurple/protocols/simple/simple.c:464
-#: ../libpurple/protocols/simple/simple.c:1586
+#: ../libpurple/protocols/simple/simple.c:1633
 msgid "Couldn't create socket"
 msgstr "ソケットを生成できませんでした"
 
-#: ../libpurple/protocols/irc/irc.c:416
-#: ../libpurple/protocols/oscar/oscar.c:1284
+#: ../libpurple/protocols/irc/irc.c:421
+#: ../libpurple/protocols/myspace/myspace.c:2467
+#: ../libpurple/protocols/oscar/oscar.c:1283
 msgid "Couldn't connect to host"
 msgstr "ホストへ接続できませんでした"
 
-#: ../libpurple/protocols/irc/irc.c:438
-#: ../libpurple/protocols/jabber/jabber.c:499
-msgid "Connection Failed"
-msgstr "接続に失敗しました"
-
-#: ../libpurple/protocols/irc/irc.c:441
-#: ../libpurple/protocols/jabber/jabber.c:502
-msgid "SSL Handshake Failed"
-msgstr "SSL のハンドシェイクに失敗しました"
-
-#: ../libpurple/protocols/irc/irc.c:611 ../libpurple/protocols/irc/irc.c:636
+#: ../libpurple/protocols/irc/irc.c:609 ../libpurple/protocols/irc/irc.c:634
+#: ../libpurple/protocols/myspace/myspace.c:2350
 msgid "Read error"
 msgstr "読み込みエラーです"
 
-#: ../libpurple/protocols/irc/irc.c:775
+#: ../libpurple/protocols/irc/irc.c:773
 #: ../libpurple/protocols/silc/chat.c:1412
 #: ../libpurple/protocols/silc10/chat.c:1426
-#: ../libpurple/protocols/yahoo/yahoochat.c:1438
+#: ../libpurple/protocols/yahoo/yahoochat.c:1497
 msgid "Users"
 msgstr "ユーザ数"
 
-#: ../libpurple/protocols/irc/irc.c:778
+#: ../libpurple/protocols/irc/irc.c:776
 #: ../libpurple/protocols/sametime/sametime.c:3374
 #: ../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
+#: ../libpurple/protocols/yahoo/yahoochat.c:1506
 msgid "Topic"
 msgstr "トピック"
 
@@ -3579,47 +4168,48 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../libpurple/protocols/irc/irc.c:915
+#: ../libpurple/protocols/irc/irc.c:914
 msgid "IRC Protocol Plugin"
 msgstr "IRC プロトコル・プラグイン"
 
 #. *  summary
-#: ../libpurple/protocols/irc/irc.c:916
+#: ../libpurple/protocols/irc/irc.c:915
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "IRC プロトコルのプラグイン (Sucks Less)"
 
 #. host to connect to
-#: ../libpurple/protocols/irc/irc.c:941 ../libpurple/protocols/irc/msgs.c:323
-#: ../libpurple/protocols/msn/msn.c:2154
-#: ../libpurple/protocols/oscar/oscar.c:6648
-#: ../libpurple/protocols/qq/qq.c:756
+#: ../libpurple/protocols/irc/irc.c:940 ../libpurple/protocols/irc/msgs.c:323
+#: ../libpurple/protocols/msn/msn.c:2297
+#: ../libpurple/protocols/oscar/oscar.c:6669
+#: ../libpurple/protocols/qq/qq.c:755
 #: ../libpurple/protocols/sametime/sametime.c:5727
 #: ../libpurple/protocols/silc/ops.c:1249
 #: ../libpurple/protocols/silc/ops.c:1341
 #: ../libpurple/protocols/silc10/ops.c:1244
 #: ../libpurple/protocols/silc10/ops.c:1347
-#: ../libpurple/protocols/simple/simple.c:1850
+#: ../libpurple/protocols/simple/simple.c:1898
 #: ../libpurple/protocols/toc/toc.c:2327
 msgid "Server"
 msgstr "サーバ"
 
 #. port to connect to
-#: ../libpurple/protocols/irc/irc.c:944 ../libpurple/protocols/msn/msn.c:2159
-#: ../libpurple/protocols/oscar/oscar.c:6651
-#: ../libpurple/protocols/qq/qq.c:759
+#: ../libpurple/protocols/irc/irc.c:943 ../libpurple/protocols/msn/msn.c:2302
+#: ../libpurple/protocols/oscar/oscar.c:6672
+#: ../libpurple/protocols/qq/qq.c:758
 #: ../libpurple/protocols/sametime/sametime.c:5732
-#: ../libpurple/protocols/silc/silc.c:1917
-#: ../libpurple/protocols/silc10/silc.c:1859
+#: ../libpurple/protocols/silc/silc.c:1918
+#: ../libpurple/protocols/silc10/silc.c:1861
 #: ../libpurple/protocols/toc/toc.c:2331
 msgid "Port"
 msgstr "ポート番号"
 
-#: ../libpurple/protocols/irc/irc.c:947
+#: ../libpurple/protocols/irc/irc.c:946
 msgid "Encodings"
 msgstr "エンコーディング"
 
-#: ../libpurple/protocols/irc/irc.c:950 ../libpurple/protocols/irc/msgs.c:316
-#: ../libpurple/protocols/jabber/jabber.c:803
+#: ../libpurple/protocols/irc/irc.c:949 ../libpurple/protocols/irc/msgs.c:316
+#: ../libpurple/protocols/jabber/jabber.c:904
+#: ../libpurple/protocols/jabber/jabber.c:907
 #: ../libpurple/protocols/silc/buddy.c:1539
 #: ../libpurple/protocols/silc/ops.c:1197
 #: ../libpurple/protocols/silc/ops.c:1200
@@ -3635,7 +4225,7 @@
 msgid "Username"
 msgstr "ユーザ名"
 
-#: ../libpurple/protocols/irc/irc.c:953 ../libpurple/protocols/irc/msgs.c:317
+#: ../libpurple/protocols/irc/irc.c:952 ../libpurple/protocols/irc/msgs.c:317
 #: ../libpurple/protocols/silc/silc.c:1009
 #: ../libpurple/protocols/silc10/silc.c:920
 msgid "Real name"
@@ -3645,7 +4235,7 @@
 #. option = purple_account_option_string_new(_("Quit message"), "quitmsg", IRC_DEFAULT_QUIT);
 #. prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
 #.
-#: ../libpurple/protocols/irc/irc.c:961
+#: ../libpurple/protocols/irc/irc.c:960
 msgid "Use SSL"
 msgstr "SSL を使う"
 
@@ -3676,7 +4266,7 @@
 msgstr " <i>(identified)</i>"
 
 #: ../libpurple/protocols/irc/msgs.c:303
-#: ../libpurple/protocols/oscar/oscar.c:3713
+#: ../libpurple/protocols/oscar/oscar.c:3696
 #: ../libpurple/protocols/silc/ops.c:1418
 #: ../libpurple/protocols/silc10/ops.c:1414
 msgid "Nick"
@@ -3959,7 +4549,7 @@
 msgstr "names [チャンネル]:  チャンネルに現在いるユーザを一覧表示します"
 
 #: ../libpurple/protocols/irc/parse.c:137
-#: ../libpurple/protocols/jabber/jabber.c:1819
+#: ../libpurple/protocols/jabber/jabber.c:2299
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr "nick &lt;新しいあだ名&gt;:  あだ名を変更します"
 
@@ -4087,18 +4677,36 @@
 msgid "Disconnected."
 msgstr "切断されました"
 
-#: ../libpurple/protocols/jabber/auth.c:52
+#: ../libpurple/protocols/jabber/adhoccommands.c:137
+#: ../libpurple/protocols/jabber/jabber.c:671
+#: ../libpurple/protocols/jabber/jabber.c:701
+#: ../libpurple/protocols/jabber/jabber.c:1887
+msgid "Unknown Error"
+msgstr "不明なエラー"
+
+#: ../libpurple/protocols/jabber/adhoccommands.c:139
+#: ../libpurple/protocols/jabber/adhoccommands.c:140
+#, fuzzy
+msgid "Ad-Hoc Command Failed"
+msgstr "コマンドが無効です"
+
+#: ../libpurple/protocols/jabber/adhoccommands.c:176
+#, fuzzy
+msgid "execute"
+msgstr "予想していないデータ"
+
+#: ../libpurple/protocols/jabber/auth.c:53
 msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
 msgstr ""
 "ログインするためにサーバが TLS/SSL を要求してきましたが、TLS/SSL はサポートし"
 "ていません。"
 
-#: ../libpurple/protocols/jabber/auth.c:115
+#: ../libpurple/protocols/jabber/auth.c:116
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr "暗号化されていないストリームを介したプレーンテキスト認証が必要です"
 
-#: ../libpurple/protocols/jabber/auth.c:294
-#: ../libpurple/protocols/jabber/auth.c:483
+#: ../libpurple/protocols/jabber/auth.c:319
+#: ../libpurple/protocols/jabber/auth.c:508
 #, c-format
 msgid ""
 "%s requires plaintext authentication over an unencrypted connection.  Allow "
@@ -4107,33 +4715,33 @@
 "%s が暗号化されていないストリーム接続を介したプレーンテキスト認証を要求してい"
 "ます。これを許可し認証を続行しますか?"
 
-#: ../libpurple/protocols/jabber/auth.c:296
-#: ../libpurple/protocols/jabber/auth.c:297
-#: ../libpurple/protocols/jabber/auth.c:485
-#: ../libpurple/protocols/jabber/auth.c:486
-#: ../libpurple/protocols/jabber/auth.c:570
-#: ../libpurple/protocols/jabber/auth.c:571
+#: ../libpurple/protocols/jabber/auth.c:321
+#: ../libpurple/protocols/jabber/auth.c:322
+#: ../libpurple/protocols/jabber/auth.c:510
+#: ../libpurple/protocols/jabber/auth.c:511
+#: ../libpurple/protocols/jabber/auth.c:598
+#: ../libpurple/protocols/jabber/auth.c:599
 msgid "Plaintext Authentication"
 msgstr "プレーンテキスト認証"
 
-#: ../libpurple/protocols/jabber/auth.c:309
-#: ../libpurple/protocols/jabber/auth.c:498
-#: ../libpurple/protocols/jabber/auth.c:582
+#: ../libpurple/protocols/jabber/auth.c:334
+#: ../libpurple/protocols/jabber/auth.c:523
+#: ../libpurple/protocols/jabber/auth.c:610
 msgid "Server does not use any supported authentication method"
 msgstr "サーバはサポートしている認証手法を利用しません"
 
 #. This should never happen!
-#: ../libpurple/protocols/jabber/auth.c:437
-#: ../libpurple/protocols/jabber/auth.c:533
-#: ../libpurple/protocols/jabber/auth.c: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
+#: ../libpurple/protocols/jabber/auth.c:462
+#: ../libpurple/protocols/jabber/auth.c:561
+#: ../libpurple/protocols/jabber/auth.c:776
+#: ../libpurple/protocols/jabber/auth.c:917
+#: ../libpurple/protocols/jabber/auth.c:942
+#: ../libpurple/protocols/jabber/auth.c:961
+#: ../libpurple/protocols/jabber/jabber.c:123
 msgid "Invalid response from server."
 msgstr "サーバからの応答が不正です。"
 
-#: ../libpurple/protocols/jabber/auth.c:572
+#: ../libpurple/protocols/jabber/auth.c:600
 msgid ""
 "This server requires plaintext authentication over an unencrypted "
 "connection.  Allow this and continue authentication?"
@@ -4141,125 +4749,114 @@
 "サーバが、暗号化されていないストリーム接続を介したプレーンテキスト認証を要求"
 "しています。これを許可し認証を続行しますか?"
 
-#: ../libpurple/protocols/jabber/auth.c:769
-#: ../libpurple/protocols/jabber/auth.c:792
+#: ../libpurple/protocols/jabber/auth.c:797
+#: ../libpurple/protocols/jabber/auth.c:820
 msgid "Invalid challenge from server"
 msgstr "サーバからの不正な challenge です"
 
-#: ../libpurple/protocols/jabber/auth.c:864
+#: ../libpurple/protocols/jabber/auth.c:892
 msgid "SASL error"
 msgstr "SASL のエラー"
 
-#: ../libpurple/protocols/jabber/buddy.c:271
-#: ../libpurple/protocols/jabber/buddy.c:787
+#: ../libpurple/protocols/jabber/buddy.c:283
+#: ../libpurple/protocols/jabber/buddy.c:1219
 #: ../libpurple/protocols/sametime/sametime.c:4128
 #: ../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/jabber/buddy.c:284
+#: ../libpurple/protocols/jabber/buddy.c:1231
 #: ../libpurple/protocols/silc/ops.c:998
 #: ../libpurple/protocols/silc10/ops.c:1032
 msgid "Family Name"
 msgstr "苗字"
 
-#: ../libpurple/protocols/jabber/buddy.c:273
-#: ../libpurple/protocols/jabber/buddy.c:804
+#: ../libpurple/protocols/jabber/buddy.c:285
+#: ../libpurple/protocols/jabber/buddy.c:1234
 msgid "Given Name"
 msgstr "名前"
 
-#: ../libpurple/protocols/jabber/buddy.c:275
-#: ../libpurple/protocols/jabber/jabber.c:863
+#: ../libpurple/protocols/jabber/buddy.c:287
+#: ../libpurple/protocols/jabber/jabber.c:977
 msgid "URL"
 msgstr "URL"
 
-#: ../libpurple/protocols/jabber/buddy.c:276
-#: ../libpurple/protocols/jabber/buddy.c:856
+#: ../libpurple/protocols/jabber/buddy.c:288
+#: ../libpurple/protocols/jabber/buddy.c:1282
 msgid "Street Address"
 msgstr "住所"
 
-#: ../libpurple/protocols/jabber/buddy.c:277
-#: ../libpurple/protocols/jabber/buddy.c:852
+#: ../libpurple/protocols/jabber/buddy.c:289
+#: ../libpurple/protocols/jabber/buddy.c:1279
 msgid "Extended Address"
 msgstr "その他"
 
-#: ../libpurple/protocols/jabber/buddy.c:278
-#: ../libpurple/protocols/jabber/buddy.c:860
+#: ../libpurple/protocols/jabber/buddy.c:290
+#: ../libpurple/protocols/jabber/buddy.c:1285
 msgid "Locality"
 msgstr "区"
 
-#: ../libpurple/protocols/jabber/buddy.c:279
-#: ../libpurple/protocols/jabber/buddy.c:864
+#: ../libpurple/protocols/jabber/buddy.c:291
+#: ../libpurple/protocols/jabber/buddy.c:1288
 msgid "Region"
 msgstr "州"
 
-#: ../libpurple/protocols/jabber/buddy.c:280
-#: ../libpurple/protocols/jabber/buddy.c:868
+#: ../libpurple/protocols/jabber/buddy.c:292
+#: ../libpurple/protocols/jabber/buddy.c:1291
 msgid "Postal Code"
 msgstr "郵便番号"
 
-#: ../libpurple/protocols/jabber/buddy.c:281
-#: ../libpurple/protocols/jabber/buddy.c:873
+#: ../libpurple/protocols/jabber/buddy.c:293
+#: ../libpurple/protocols/jabber/buddy.c:1295
 #: ../libpurple/protocols/silc/silc.c:1015
 #: ../libpurple/protocols/silc10/silc.c:926
 msgid "Country"
 msgstr "国"
 
-#: ../libpurple/protocols/jabber/buddy.c:282
-#: ../libpurple/protocols/jabber/buddy.c:884
-#: ../libpurple/protocols/jabber/buddy.c:891
+#: ../libpurple/protocols/jabber/buddy.c:294
+#: ../libpurple/protocols/jabber/buddy.c:1306
+#: ../libpurple/protocols/jabber/buddy.c:1313
 msgid "Telephone"
 msgstr "電話番号"
 
-#: ../libpurple/protocols/jabber/buddy.c:283
-#: ../libpurple/protocols/jabber/buddy.c:902
-#: ../libpurple/protocols/jabber/buddy.c:910
-#: ../libpurple/protocols/jabber/buddy.c:1591
-#: ../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 "E-メール"
-
-#: ../libpurple/protocols/jabber/buddy.c:284
-#: ../libpurple/protocols/jabber/buddy.c:925
+#: ../libpurple/protocols/jabber/buddy.c:296
+#: ../libpurple/protocols/jabber/buddy.c:1350
 msgid "Organization Name"
 msgstr "組織名"
 
-#: ../libpurple/protocols/jabber/buddy.c:285
-#: ../libpurple/protocols/jabber/buddy.c:929
+#: ../libpurple/protocols/jabber/buddy.c:297
+#: ../libpurple/protocols/jabber/buddy.c:1353
 msgid "Organization Unit"
 msgstr "担当部署"
 
-#: ../libpurple/protocols/jabber/buddy.c:287
-#: ../libpurple/protocols/jabber/buddy.c:938
+#: ../libpurple/protocols/jabber/buddy.c:299
+#: ../libpurple/protocols/jabber/buddy.c:1362
 msgid "Role"
 msgstr "役職"
 
-#: ../libpurple/protocols/jabber/buddy.c:288
-#: ../libpurple/protocols/jabber/buddy.c:821
-#: ../libpurple/protocols/msn/msn.c:1627
-#: ../libpurple/protocols/oscar/oscar.c:3762
+#: ../libpurple/protocols/jabber/buddy.c:300
+#: ../libpurple/protocols/jabber/buddy.c:1250
+#: ../libpurple/protocols/msn/msn.c:1768
+#: ../libpurple/protocols/oscar/oscar.c:3745
 msgid "Birthday"
 msgstr "誕生日"
 
-#: ../libpurple/protocols/jabber/buddy.c:289
-#: ../libpurple/protocols/jabber/buddy.c:941
-#: ../libpurple/protocols/jabber/chat.c:775 ../pidgin/gtkblist.c:3090
-#: ../pidgin/gtkprefs.c:680
+#: ../libpurple/protocols/jabber/buddy.c:301
+#: ../libpurple/protocols/jabber/buddy.c:1365
+#: ../libpurple/protocols/jabber/chat.c:775
+#: ../libpurple/protocols/jabber/usermood.c:175 ../pidgin/gtkblist.c:3314
+#: ../pidgin/gtkprefs.c:739
 msgid "Description"
 msgstr "説明"
 
-#: ../libpurple/protocols/jabber/buddy.c:578
-#: ../libpurple/protocols/jabber/buddy.c:579
+#: ../libpurple/protocols/jabber/buddy.c:722
+#: ../libpurple/protocols/jabber/buddy.c:723
 msgid "Edit XMPP vCard"
 msgstr "XMPP vCard の編集"
 
-#: ../libpurple/protocols/jabber/buddy.c:580
+#: ../libpurple/protocols/jabber/buddy.c:724
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable."
@@ -4267,116 +4864,416 @@
 "次のアイテムは全てオプションです。快適に操作できると思われる情報のみ入力して"
 "下さい。"
 
-#: ../libpurple/protocols/jabber/buddy.c:651
-#: ../libpurple/protocols/jabber/buddy.c:692
+#: ../libpurple/protocols/jabber/buddy.c:795
+#: ../libpurple/protocols/jabber/buddy.c:960
 msgid "Client"
 msgstr "クライアント"
 
-#: ../libpurple/protocols/jabber/buddy.c:655
-#: ../libpurple/protocols/jabber/buddy.c:696
+#: ../libpurple/protocols/jabber/buddy.c:799
+#: ../libpurple/protocols/jabber/buddy.c:964
 msgid "Operating System"
 msgstr "オペレーティング・システム"
 
-#: ../libpurple/protocols/jabber/buddy.c:665
-#: ../libpurple/protocols/jabber/libxmpp.c:198
-#: ../libpurple/protocols/jabber/si.c:853
+#: ../libpurple/protocols/jabber/buddy.c:815
+#: ../libpurple/protocols/jabber/buddy.c:975
+msgid "Last Activity"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:817
+#: ../libpurple/protocols/jabber/buddy.c:977
+#, fuzzy
+msgid "Service Discovery Info"
+msgstr "フォルダ情報の設定"
+
+#: ../libpurple/protocols/jabber/buddy.c:819
+#: ../libpurple/protocols/jabber/buddy.c:979
+msgid "Service Discovery Items"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:821
+#: ../libpurple/protocols/jabber/buddy.c:981
+#, fuzzy
+msgid "Extended Stanza Addressing"
+msgstr "その他"
+
+#: ../libpurple/protocols/jabber/buddy.c:823
+#: ../libpurple/protocols/jabber/buddy.c:983
+#, fuzzy
+msgid "Multi-User Chat"
+msgstr "チャットの別名"
+
+#: ../libpurple/protocols/jabber/buddy.c:825
+#: ../libpurple/protocols/jabber/buddy.c:985
+#, fuzzy
+msgid "Multi-User Chat Extended Presence Information"
+msgstr "フォルダ情報がありません"
+
+#: ../libpurple/protocols/jabber/buddy.c:827
+#: ../libpurple/protocols/jabber/buddy.c:987
+msgid "In-Band Bytestreams"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:829
+#: ../libpurple/protocols/jabber/buddy.c:989
+#, fuzzy
+msgid "Ad-Hoc Commands"
+msgstr "コマンド指定"
+
+#: ../libpurple/protocols/jabber/buddy.c:831
+#: ../libpurple/protocols/jabber/buddy.c:991
+msgid "PubSub Service"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:833
+#: ../libpurple/protocols/jabber/buddy.c:993
+msgid "SOCKS5 Bytestreams"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:835
+#: ../libpurple/protocols/jabber/buddy.c:995
+msgid "Out of Band Data"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:837
+#: ../libpurple/protocols/jabber/buddy.c:997
+#, fuzzy
+msgid "XHTML-IM"
+msgstr "HTML 形式"
+
+#: ../libpurple/protocols/jabber/buddy.c:839
+#: ../libpurple/protocols/jabber/buddy.c:999
+#, fuzzy
+msgid "In-Band Registration"
+msgstr "登録エラー"
+
+#: ../libpurple/protocols/jabber/buddy.c:841
+#: ../libpurple/protocols/jabber/buddy.c:1001
+#, fuzzy
+msgid "User Location"
+msgstr "場所"
+
+#: ../libpurple/protocols/jabber/buddy.c:843
+#: ../libpurple/protocols/jabber/buddy.c:1003
+#, fuzzy
+msgid "User Avatar"
+msgstr "ユーザの検索"
+
+#: ../libpurple/protocols/jabber/buddy.c:845
+#: ../libpurple/protocols/jabber/buddy.c:1005
+#, fuzzy
+msgid "Chat State Notifications"
+msgstr "仲間の状態の通知"
+
+#: ../libpurple/protocols/jabber/buddy.c:847
+#: ../libpurple/protocols/jabber/buddy.c:1007
+#, fuzzy
+msgid "Software Version"
+msgstr "サポートしていないバージョン"
+
+#: ../libpurple/protocols/jabber/buddy.c:849
+#: ../libpurple/protocols/jabber/buddy.c:1009
+#, fuzzy
+msgid "Stream Initiation"
+msgstr "向き"
+
+#: ../libpurple/protocols/jabber/buddy.c:851
+#: ../libpurple/protocols/jabber/buddy.c:1011
+#: ../libpurple/protocols/sametime/sametime.c:3235
+msgid "File Transfer"
+msgstr "ファイルの転送"
+
+#: ../libpurple/protocols/jabber/buddy.c:853
+#: ../libpurple/protocols/jabber/buddy.c:1013
+#, fuzzy
+msgid "User Mood"
+msgstr "ユーザ・モード"
+
+#: ../libpurple/protocols/jabber/buddy.c:855
+#: ../libpurple/protocols/jabber/buddy.c:1015
+#, fuzzy
+msgid "User Activity"
+msgstr "ユーザの制限"
+
+#: ../libpurple/protocols/jabber/buddy.c:857
+#: ../libpurple/protocols/jabber/buddy.c:1017
+#, fuzzy
+msgid "Entity Capabilities"
+msgstr "機能"
+
+#: ../libpurple/protocols/jabber/buddy.c:859
+#: ../libpurple/protocols/jabber/buddy.c:1019
+msgid "Encrypted Session Negotiations"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:861
+#: ../libpurple/protocols/jabber/buddy.c:1021
+#, fuzzy
+msgid "User Tune"
+msgstr "ユーザ名"
+
+#: ../libpurple/protocols/jabber/buddy.c:863
+#: ../libpurple/protocols/jabber/buddy.c:1023
+#, fuzzy
+msgid "Roster Item Exchange"
+msgstr "キー交換付き IM"
+
+#: ../libpurple/protocols/jabber/buddy.c:865
+#: ../libpurple/protocols/jabber/buddy.c:1025
+#, fuzzy
+msgid "Reachability Address"
+msgstr "E-メール・アドレス"
+
+#: ../libpurple/protocols/jabber/buddy.c:867
+#: ../libpurple/protocols/jabber/buddy.c:1027
+#, fuzzy
+msgid "User Profile"
+msgstr "プロフィール"
+
+#: ../libpurple/protocols/jabber/buddy.c:869
+#: ../libpurple/protocols/jabber/buddy.c:1029
+#, fuzzy
+msgid "Jingle"
+msgstr "参加する"
+
+#: ../libpurple/protocols/jabber/buddy.c:871
+#: ../libpurple/protocols/jabber/buddy.c:1031
+msgid "Jingle Audio"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:873
+#: ../libpurple/protocols/jabber/buddy.c:1033
+#, fuzzy
+msgid "User Nickname"
+msgstr "ユーザ名"
+
+#: ../libpurple/protocols/jabber/buddy.c:875
+#: ../libpurple/protocols/jabber/buddy.c:1035
+msgid "Jingle ICE UDP"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:877
+#: ../libpurple/protocols/jabber/buddy.c:1037
+msgid "Jingle ICE TCP"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:879
+#: ../libpurple/protocols/jabber/buddy.c:1039
+msgid "Jingle Raw UDP"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:881
+#: ../libpurple/protocols/jabber/buddy.c:1041
+#, fuzzy
+msgid "Jingle Video"
+msgstr "ライブ・ビデオ"
+
+#: ../libpurple/protocols/jabber/buddy.c:883
+#: ../libpurple/protocols/jabber/buddy.c:1043
+msgid "Jingle DTMF"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:885
+#: ../libpurple/protocols/jabber/buddy.c:1045
+#, fuzzy
+msgid "Message Receipts"
+msgstr "メッセージを受信しました"
+
+#: ../libpurple/protocols/jabber/buddy.c:887
+#: ../libpurple/protocols/jabber/buddy.c:1047
+#, fuzzy
+msgid "Public Key Publishing"
+msgstr "公開鍵の Babbleprint"
+
+#: ../libpurple/protocols/jabber/buddy.c:889
+#: ../libpurple/protocols/jabber/buddy.c:1049
+#, fuzzy
+msgid "User Chatting"
+msgstr "ユーザのオプション"
+
+#: ../libpurple/protocols/jabber/buddy.c:891
+#: ../libpurple/protocols/jabber/buddy.c:1051
+#, fuzzy
+msgid "User Browsing"
+msgstr "ユーザ・モード"
+
+#: ../libpurple/protocols/jabber/buddy.c:893
+#: ../libpurple/protocols/jabber/buddy.c:1053
+#, fuzzy
+msgid "User Gaming"
+msgstr "ユーザ名"
+
+#: ../libpurple/protocols/jabber/buddy.c:895
+#: ../libpurple/protocols/jabber/buddy.c:1055
+#, fuzzy
+msgid "User Viewing"
+msgstr "ユーザの制限"
+
+#: ../libpurple/protocols/jabber/buddy.c:897
+#: ../libpurple/protocols/jabber/buddy.c:1057
+#: ../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/jabber/buddy.c:899
+#: ../libpurple/protocols/jabber/buddy.c:1059
+#, fuzzy
+msgid "Stanza Encryption"
+msgstr "Trillian 暗号化"
+
+#: ../libpurple/protocols/jabber/buddy.c:901
+#: ../libpurple/protocols/jabber/buddy.c:1061
+msgid "Entity Time"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:903
+#: ../libpurple/protocols/jabber/buddy.c:1063
+msgid "Delayed Delivery"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:905
+#: ../libpurple/protocols/jabber/buddy.c:1065
+msgid "Collaborative Data Objects"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:907
+#: ../libpurple/protocols/jabber/buddy.c:1067
+msgid "File Repository and Sharing"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:909
+#: ../libpurple/protocols/jabber/buddy.c:1069
+msgid "STUN Service Discovery for Jingle"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:911
+#: ../libpurple/protocols/jabber/buddy.c:1071
+msgid "Simplified Encrypted Session Negotiation"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:913
+#: ../libpurple/protocols/jabber/buddy.c:1073
+msgid "Hop Check"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:921
+#: ../libpurple/protocols/jabber/buddy.c:1081
+#: ../libpurple/protocols/oscar/oscar.c:2902
+msgid "Capabilities"
+msgstr "機能"
+
+#: ../libpurple/protocols/jabber/buddy.c:933
+#: ../libpurple/protocols/jabber/libxmpp.c:206
+#: ../libpurple/protocols/jabber/si.c:859
 msgid "Resource"
 msgstr "リソース"
 
-#: ../libpurple/protocols/jabber/buddy.c:667
-#: ../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
+#: ../libpurple/protocols/jabber/buddy.c:935
+#: ../libpurple/protocols/jabber/jabber.c:1531
+#: ../libpurple/protocols/jabber/jabber.c:1554
+#: ../libpurple/protocols/jabber/jabber.c:1577
+#: ../libpurple/protocols/jabber/jabber.c:1600
+#: ../libpurple/protocols/jabber/jabber.c:1623
 msgid "Priority"
 msgstr "優先順位"
 
-#: ../libpurple/protocols/jabber/buddy.c:808
+#: ../libpurple/protocols/jabber/buddy.c:1237
 #: ../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:838
-#: ../libpurple/protocols/oscar/oscar.c:3801
-#: ../libpurple/protocols/oscar/oscar.c:3814
+#: ../libpurple/protocols/jabber/buddy.c:1270
+#: ../libpurple/protocols/jabber/jabber.c:952
+#: ../libpurple/protocols/oscar/oscar.c:3784
+#: ../libpurple/protocols/oscar/oscar.c:3797
 #: ../libpurple/protocols/qq/buddy_info.c:56
 #: ../libpurple/protocols/silc/ops.c:1030
 #: ../libpurple/protocols/silc10/ops.c:1064
 msgid "Address"
 msgstr "住所"
 
-#: ../libpurple/protocols/jabber/buddy.c:848
+#: ../libpurple/protocols/jabber/buddy.c:1276
 msgid "P.O. Box"
 msgstr "郵便箱"
 
-#: ../libpurple/protocols/jabber/buddy.c:962
+#: ../libpurple/protocols/jabber/buddy.c:1386
 msgid "Photo"
 msgstr "写真"
 
-#: ../libpurple/protocols/jabber/buddy.c:962
+#: ../libpurple/protocols/jabber/buddy.c:1386
 msgid "Logo"
 msgstr "ロゴ"
 
-#: ../libpurple/protocols/jabber/buddy.c:1371
+#: ../libpurple/protocols/jabber/buddy.c:1945
 msgid "Un-hide From"
 msgstr "ここからは隠さない"
 
-#: ../libpurple/protocols/jabber/buddy.c:1375
+#: ../libpurple/protocols/jabber/buddy.c:1949
 msgid "Temporarily Hide From"
 msgstr "一時的にここから隠す"
 
 #. && NOT ME
-#: ../libpurple/protocols/jabber/buddy.c:1383
+#: ../libpurple/protocols/jabber/buddy.c:1957
 msgid "Cancel Presence Notification"
 msgstr "存在通知をやめる"
 
-#: ../libpurple/protocols/jabber/buddy.c:1390
+#: ../libpurple/protocols/jabber/buddy.c:1964
 msgid "(Re-)Request authorization"
 msgstr "承認の (再) 要求"
 
 #. if(NOT ME)
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
-#: ../libpurple/protocols/jabber/buddy.c:1399
+#: ../libpurple/protocols/jabber/buddy.c:1973
 msgid "Unsubscribe"
 msgstr "購読の取り消し"
 
-#: ../libpurple/protocols/jabber/buddy.c:1432
-#: ../libpurple/protocols/jabber/jabber.c:1260
+#: ../libpurple/protocols/jabber/buddy.c:1988
+#, fuzzy
+msgid "Log In"
+msgstr "既にログインしています"
+
+#: ../libpurple/protocols/jabber/buddy.c:1992
+#, fuzzy
+msgid "Log Out"
+msgstr "チャットをログに記録する"
+
+#: ../libpurple/protocols/jabber/buddy.c:2038
+#: ../libpurple/protocols/jabber/jabber.c:1553
 msgid "Chatty"
 msgstr "チャッティー"
 
-#: ../libpurple/protocols/jabber/buddy.c:1436 ../libpurple/status.c:158
+#: ../libpurple/protocols/jabber/buddy.c:2042
 msgid "Extended Away"
 msgstr "逃走中"
 
-#: ../libpurple/protocols/jabber/buddy.c:1438
-#: ../libpurple/protocols/jabber/jabber.c:1290
+#: ../libpurple/protocols/jabber/buddy.c:2044
+#: ../libpurple/protocols/jabber/jabber.c:1622
 #: ../libpurple/protocols/oscar/oscar.c:727
-#: ../libpurple/protocols/oscar/oscar.c:5785
+#: ../libpurple/protocols/oscar/oscar.c:5806
 #: ../libpurple/protocols/sametime/sametime.c:3297
 msgid "Do Not Disturb"
 msgstr "邪魔しないでね"
 
-#: ../libpurple/protocols/jabber/buddy.c:1583
+#: ../libpurple/protocols/jabber/buddy.c:2211
 msgid "JID"
 msgstr "JID"
 
-#: ../libpurple/protocols/jabber/buddy.c:1587
-#: ../libpurple/protocols/jabber/buddy.c:1766
-#: ../libpurple/protocols/oscar/oscar.c:3724
+#: ../libpurple/protocols/jabber/buddy.c:2215
+#: ../libpurple/protocols/jabber/buddy.c:2394
+#: ../libpurple/protocols/oscar/oscar.c:3707
 msgid "Last Name"
 msgstr "姓"
 
-#: ../libpurple/protocols/jabber/buddy.c:1619
+#: ../libpurple/protocols/jabber/buddy.c:2247
 msgid "The following are the results of your search"
 msgstr "検索結果です"
 
 #. current comment from Jabber User Directory users.jabber.org
-#: ../libpurple/protocols/jabber/buddy.c:1694
+#: ../libpurple/protocols/jabber/buddy.c:2322
 msgid ""
 "Find a contact by entering the search criteria in the given fields. Note: "
 "Each field supports wild card searches (%)"
@@ -4384,69 +5281,69 @@
 "指定した項目に対する検索条件を入力してコンタクトを検索します。注意: 各項目は"
 "ワイルドカードを使った検索 (%) をサポートしています。"
 
-#: ../libpurple/protocols/jabber/buddy.c:1714
+#: ../libpurple/protocols/jabber/buddy.c:2342
 msgid "Directory Query Failed"
 msgstr "ディレクトリの検索に失敗しました"
 
-#: ../libpurple/protocols/jabber/buddy.c:1715
+#: ../libpurple/protocols/jabber/buddy.c:2343
 msgid "Could not query the directory server."
 msgstr "ディレクトリ・サーバを検索できませんでした"
 
 #. Try to translate the message (see static message
 #. list in jabber_user_dir_comments[])
-#: ../libpurple/protocols/jabber/buddy.c:1749
+#: ../libpurple/protocols/jabber/buddy.c:2377
 #, c-format
 msgid "Server Instructions: %s"
 msgstr "サーバの情報: %s"
 
-#: ../libpurple/protocols/jabber/buddy.c:1756
+#: ../libpurple/protocols/jabber/buddy.c:2384
 msgid "Fill in one or more fields to search for any matching XMPP users."
 msgstr "XMPP ユーザを検索するには一つ以上の欄を埋めて下さい:"
 
-#: ../libpurple/protocols/jabber/buddy.c:1776
-#: ../libpurple/protocols/novell/novell.c:1488
-#: ../libpurple/protocols/oscar/oscar.c:3727
-#: ../libpurple/protocols/oscar/oscar.c:3736
+#: ../libpurple/protocols/jabber/buddy.c:2404
+#: ../libpurple/protocols/novell/novell.c:1490
+#: ../libpurple/protocols/oscar/oscar.c:3710
+#: ../libpurple/protocols/oscar/oscar.c:3719
 msgid "E-Mail Address"
 msgstr "E-メール・アドレス"
 
-#: ../libpurple/protocols/jabber/buddy.c:1785
-#: ../libpurple/protocols/jabber/buddy.c:1786
+#: ../libpurple/protocols/jabber/buddy.c:2413
+#: ../libpurple/protocols/jabber/buddy.c:2414
 msgid "Search for XMPP users"
 msgstr "XMPP ユーザの検索"
 
 #. "Search"
-#: ../libpurple/protocols/jabber/buddy.c:1787
+#: ../libpurple/protocols/jabber/buddy.c:2415
 #: ../libpurple/protocols/qq/group.c:123
-#: ../libpurple/protocols/qq/group_im.c:145
-#: ../libpurple/protocols/qq/sys_msg.c:176
-#: ../libpurple/protocols/qq/sys_msg.c:253
-#: ../libpurple/protocols/qq/sys_msg.c:271
+#: ../libpurple/protocols/qq/group_im.c:147
+#: ../libpurple/protocols/qq/sys_msg.c:174
+#: ../libpurple/protocols/qq/sys_msg.c:250
+#: ../libpurple/protocols/qq/sys_msg.c:268
 #: ../libpurple/protocols/sametime/sametime.c:5611
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:473
-#: ../pidgin/plugins/gevolution/assoc-buddy.c:358
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:470
+#: ../pidgin/plugins/gevolution/assoc-buddy.c:356
 msgid "Search"
 msgstr "検索"
 
-#: ../libpurple/protocols/jabber/buddy.c:1802
+#: ../libpurple/protocols/jabber/buddy.c:2430
 msgid "Invalid Directory"
 msgstr "ディレクトリが間違っています"
 
-#: ../libpurple/protocols/jabber/buddy.c:1819
+#: ../libpurple/protocols/jabber/buddy.c:2447
 msgid "Enter a User Directory"
 msgstr "ユーザ・ディレクトリを入力して下さい"
 
-#: ../libpurple/protocols/jabber/buddy.c:1820
+#: ../libpurple/protocols/jabber/buddy.c:2448
 msgid "Select a user directory to search"
 msgstr "検索するユーザ・ディレクトリの選択"
 
-#: ../libpurple/protocols/jabber/buddy.c:1823
+#: ../libpurple/protocols/jabber/buddy.c:2451
 msgid "Search Directory"
 msgstr "検索するディレクトリ"
 
 #: ../libpurple/protocols/jabber/chat.c:41
-#: ../libpurple/protocols/oscar/oscar.c:5271
-#: ../libpurple/protocols/yahoo/yahoochat.c:999
+#: ../libpurple/protocols/oscar/oscar.c:5290
+#: ../libpurple/protocols/yahoo/yahoochat.c:1048
 msgid "_Room:"
 msgstr "ルーム(_R):"
 
@@ -4536,25 +5433,29 @@
 msgid "Find Rooms"
 msgstr "部屋の検索"
 
-#: ../libpurple/protocols/jabber/jabber.c:84
+#: ../libpurple/protocols/jabber/jabber.c:92
 msgid "Error initializing session"
 msgstr "セッションの初期化でエラー"
 
-#: ../libpurple/protocols/jabber/jabber.c:247
-#: ../libpurple/protocols/jabber/jabber.c:300
-#: ../libpurple/protocols/jabber/jabber.c:328
+#: ../libpurple/protocols/jabber/jabber.c:145
+msgid "You require encryption, but it is not available on this server."
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:259
+#: ../libpurple/protocols/jabber/jabber.c:312
+#: ../libpurple/protocols/jabber/jabber.c:340
 msgid "Write error"
 msgstr "書き込みエラー"
 
-#: ../libpurple/protocols/jabber/jabber.c:396
-#: ../libpurple/protocols/jabber/jabber.c:433
+#: ../libpurple/protocols/jabber/jabber.c:408
+#: ../libpurple/protocols/jabber/jabber.c:445
 msgid "Read Error"
 msgstr "読み込みエラー"
 
-#: ../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
+#: ../libpurple/protocols/jabber/jabber.c:482
+#: ../libpurple/protocols/oscar/flap_connection.c:396
+#: ../libpurple/protocols/yahoo/yahoo.c:2557
+#: ../libpurple/protocols/yahoo/yahoo.c:2589
 #, c-format
 msgid ""
 "Could not establish a connection with the server:\n"
@@ -4563,55 +5464,72 @@
 "サーバとの接続を確立できませんでした:\n"
 "%s"
 
-#: ../libpurple/protocols/jabber/jabber.c:523
+#: ../libpurple/protocols/jabber/jabber.c:529
 msgid "Unable to create socket"
 msgstr "ソケットを生成できません"
 
-#: ../libpurple/protocols/jabber/jabber.c:568
-#: ../libpurple/protocols/jabber/jabber.c:918
+#: ../libpurple/protocols/jabber/jabber.c:575
+#: ../libpurple/protocols/jabber/jabber.c:1063
 msgid "Invalid XMPP ID"
 msgstr "不正な XMPP ID"
 
-#: ../libpurple/protocols/jabber/jabber.c:573
+#: ../libpurple/protocols/jabber/jabber.c:580
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr "XMPP ID が間違っています (ドメインを指定して下さい)"
 
-#: ../libpurple/protocols/jabber/jabber.c:644
+#: ../libpurple/protocols/jabber/jabber.c:656
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "%s@%s の登録が完了しました"
 
-#: ../libpurple/protocols/jabber/jabber.c:646
-#: ../libpurple/protocols/jabber/jabber.c:647
+#: ../libpurple/protocols/jabber/jabber.c:662
+#, fuzzy, c-format
+msgid "Registration to %s successful"
+msgstr "%s@%s の登録が完了しました"
+
+#: ../libpurple/protocols/jabber/jabber.c:664
+#: ../libpurple/protocols/jabber/jabber.c:665
 msgid "Registration Successful"
 msgstr "登録の完了"
 
-#: ../libpurple/protocols/jabber/jabber.c:653
-#: ../libpurple/protocols/jabber/jabber.c:1530
-msgid "Unknown Error"
-msgstr "不明なエラー"
-
-#: ../libpurple/protocols/jabber/jabber.c:655
-#: ../libpurple/protocols/jabber/jabber.c:656
+#: ../libpurple/protocols/jabber/jabber.c:673
+#: ../libpurple/protocols/jabber/jabber.c:674
 msgid "Registration Failed"
 msgstr "登録の失敗"
 
-#: ../libpurple/protocols/jabber/jabber.c:771
-#: ../libpurple/protocols/jabber/jabber.c:772
+#: ../libpurple/protocols/jabber/jabber.c:692
+#, fuzzy, c-format
+msgid "Registration from %s successfully removed"
+msgstr "%s@%s の登録が完了しました"
+
+#: ../libpurple/protocols/jabber/jabber.c:694
+#: ../libpurple/protocols/jabber/jabber.c:695
+#, fuzzy
+msgid "Unregistration Successful"
+msgstr "登録の完了"
+
+#: ../libpurple/protocols/jabber/jabber.c:703
+#: ../libpurple/protocols/jabber/jabber.c:704
+#, fuzzy
+msgid "Unregistration Failed"
+msgstr "登録の失敗"
+
+#: ../libpurple/protocols/jabber/jabber.c:864
+#: ../libpurple/protocols/jabber/jabber.c:865
 msgid "Already Registered"
 msgstr "既に登録されています"
 
-#: ../libpurple/protocols/jabber/jabber.c:848
-#: ../libpurple/protocols/oscar/oscar.c:3803
-#: ../libpurple/protocols/oscar/oscar.c:3816
+#: ../libpurple/protocols/jabber/jabber.c:962
+#: ../libpurple/protocols/oscar/oscar.c:3786
+#: ../libpurple/protocols/oscar/oscar.c:3799
 msgid "State"
 msgstr "州"
 
-#: ../libpurple/protocols/jabber/jabber.c:853
+#: ../libpurple/protocols/jabber/jabber.c:967
 msgid "Postal code"
 msgstr "郵便番号"
 
-#: ../libpurple/protocols/jabber/jabber.c:858
+#: ../libpurple/protocols/jabber/jabber.c:972
 #: ../libpurple/protocols/silc/ops.c:1035
 #: ../libpurple/protocols/silc/silc.c:772
 #: ../libpurple/protocols/silc/util.c:557
@@ -4621,374 +5539,570 @@
 msgid "Phone"
 msgstr "電話番号"
 
-#: ../libpurple/protocols/jabber/jabber.c:868
+#: ../libpurple/protocols/jabber/jabber.c:982
 msgid "Date"
 msgstr "日付"
 
-#: ../libpurple/protocols/jabber/jabber.c:876
+#: ../libpurple/protocols/jabber/jabber.c:987
+#, fuzzy
+msgid "Unregister"
+msgstr "登録"
+
+#: ../libpurple/protocols/jabber/jabber.c:994
+#, fuzzy
+msgid ""
+"Please fill out the information below to change your account registration."
+msgstr "新しいアカウントを登録するには、次の情報を全て入力して下さい。"
+
+#: ../libpurple/protocols/jabber/jabber.c:997
 msgid "Please fill out the information below to register your new account."
 msgstr "新しいアカウントを登録するには、次の情報を全て入力して下さい。"
 
-#: ../libpurple/protocols/jabber/jabber.c:879
-#: ../libpurple/protocols/jabber/jabber.c:880
+#: ../libpurple/protocols/jabber/jabber.c:1005
+#: ../libpurple/protocols/jabber/jabber.c:1006
 msgid "Register New XMPP Account"
 msgstr "新しい XMPP アカウントの登録"
 
-#. Register button
-#: ../libpurple/protocols/jabber/jabber.c:881 ../pidgin/gtkaccount.c:1526
+#: ../libpurple/protocols/jabber/jabber.c:1007
+#: ../libpurple/protocols/jabber/jabber.c:1016
 msgid "Register"
 msgstr "登録"
 
-#: ../libpurple/protocols/jabber/jabber.c:1052
+#: ../libpurple/protocols/jabber/jabber.c:1012
+#, fuzzy, c-format
+msgid "Change Account Registration at %s"
+msgstr "%s のユーザ情報の変更"
+
+#: ../libpurple/protocols/jabber/jabber.c:1013
+#, fuzzy, c-format
+msgid "Register New Account at %s"
+msgstr "新しい XMPP アカウントの登録"
+
+#: ../libpurple/protocols/jabber/jabber.c:1016
+#, fuzzy
+msgid "Change Registration"
+msgstr "登録エラー"
+
+#: ../libpurple/protocols/jabber/jabber.c:1120
+#: ../libpurple/protocols/jabber/jabber.c:1121
+#, fuzzy
+msgid "Error unregistering account"
+msgstr "アカウント情報変更エラー"
+
+#: ../libpurple/protocols/jabber/jabber.c:1126
+#: ../libpurple/protocols/jabber/jabber.c:1127
+#, fuzzy
+msgid "Account successfully unregistered"
+msgstr "Qun の生成が完了しました"
+
+#: ../libpurple/protocols/jabber/jabber.c:1284
 msgid "Initializing Stream"
 msgstr "ストリームの初期化中"
 
-#: ../libpurple/protocols/jabber/jabber.c:1057
-#: ../libpurple/protocols/msn/session.c:351
+#: ../libpurple/protocols/jabber/jabber.c:1289
+#, fuzzy
+msgid "Initializing SSL/TLS"
+msgstr "ストリームの初期化中"
+
+#: ../libpurple/protocols/jabber/jabber.c:1293
+#: ../libpurple/protocols/msn/session.c:390
 msgid "Authenticating"
 msgstr "認証中"
 
-#: ../libpurple/protocols/jabber/jabber.c:1066
+#: ../libpurple/protocols/jabber/jabber.c:1302
 msgid "Re-initializing Stream"
 msgstr "ストリームの再初期化中"
 
-#: ../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/jabber/jabber.c:1396
+#: ../libpurple/protocols/jabber/jabber.c:1865
+#: ../libpurple/protocols/jabber/jabber.c:1909
+#: ../libpurple/protocols/jabber/jabber.c:1945
 #: ../libpurple/protocols/oscar/oscar.c:826
-#: ../libpurple/protocols/oscar/oscar.c:5579
+#: ../libpurple/protocols/oscar/oscar.c:5600
 msgid "Not Authorized"
 msgstr "承認されていません"
 
-#: ../libpurple/protocols/jabber/jabber.c:1176
+#: ../libpurple/protocols/jabber/jabber.c:1442
 msgid "Both"
 msgstr "両方"
 
-#: ../libpurple/protocols/jabber/jabber.c:1178
+#: ../libpurple/protocols/jabber/jabber.c:1444
 msgid "From (To pending)"
 msgstr "From (To pending)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1183
+#: ../libpurple/protocols/jabber/jabber.c:1446
+msgid "From"
+msgstr "差出人"
+
+#: ../libpurple/protocols/jabber/jabber.c:1449
 msgid "To"
 msgstr "To"
 
-#: ../libpurple/protocols/jabber/jabber.c:1185
+#: ../libpurple/protocols/jabber/jabber.c:1451
 msgid "None (To pending)"
 msgstr "None (To pending)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1187
+#: ../libpurple/protocols/jabber/jabber.c:1453
 #: ../pidgin/plugins/gevolution/eds-utils.c:73
 #: ../pidgin/plugins/gevolution/eds-utils.c:86
 msgid "None"
 msgstr "なし"
 
-#: ../libpurple/protocols/jabber/jabber.c:1190
+#: ../libpurple/protocols/jabber/jabber.c:1456
 msgid "Subscription"
 msgstr "購読"
 
-#: ../libpurple/protocols/jabber/jabber.c:1320
+#: ../libpurple/protocols/jabber/jabber.c:1466
+#: ../libpurple/protocols/jabber/jabber.c:1469
+#: ../libpurple/protocols/jabber/jabber.c:1533
+#: ../libpurple/protocols/jabber/jabber.c:1556
+#: ../libpurple/protocols/jabber/jabber.c:1579
+#: ../libpurple/protocols/jabber/jabber.c:1602
+#: ../libpurple/protocols/jabber/jabber.c:1625
+#: ../libpurple/protocols/jabber/usermood.c:166
+#: ../libpurple/protocols/silc/buddy.c:1557
+#: ../libpurple/protocols/silc/ops.c:1212
+#: ../libpurple/protocols/silc10/buddy.c:1557
+#: ../libpurple/protocols/silc10/ops.c:1207
+msgid "Mood"
+msgstr "不機嫌"
+
+#: ../libpurple/protocols/jabber/jabber.c:1534
+#: ../libpurple/protocols/jabber/jabber.c:1557
+#: ../libpurple/protocols/jabber/jabber.c:1580
+#: ../libpurple/protocols/jabber/jabber.c:1603
+#: ../libpurple/protocols/jabber/jabber.c:1626
+#, fuzzy
+msgid "Mood Text"
+msgstr "血液型"
+
+#: ../libpurple/protocols/jabber/jabber.c:1535
+#: ../libpurple/protocols/jabber/jabber.c:1558
+#: ../libpurple/protocols/jabber/jabber.c:1581
+#: ../libpurple/protocols/jabber/jabber.c:1604
+#: ../libpurple/protocols/jabber/jabber.c:1627
+#, fuzzy
+msgid "Tune Artist"
+msgstr "アーティスト"
+
+#: ../libpurple/protocols/jabber/jabber.c:1536
+#: ../libpurple/protocols/jabber/jabber.c:1559
+#: ../libpurple/protocols/jabber/jabber.c:1582
+#: ../libpurple/protocols/jabber/jabber.c:1605
+#: ../libpurple/protocols/jabber/jabber.c:1628
+#, fuzzy
+msgid "Tune Title"
+msgstr "題名"
+
+#: ../libpurple/protocols/jabber/jabber.c:1537
+#: ../libpurple/protocols/jabber/jabber.c:1560
+#: ../libpurple/protocols/jabber/jabber.c:1583
+#: ../libpurple/protocols/jabber/jabber.c:1606
+#: ../libpurple/protocols/jabber/jabber.c:1629
+msgid "Tune Album"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:1538
+#: ../libpurple/protocols/jabber/jabber.c:1561
+#: ../libpurple/protocols/jabber/jabber.c:1584
+#: ../libpurple/protocols/jabber/jabber.c:1607
+#: ../libpurple/protocols/jabber/jabber.c:1630
+msgid "Tune Genre"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:1539
+#: ../libpurple/protocols/jabber/jabber.c:1562
+#: ../libpurple/protocols/jabber/jabber.c:1585
+#: ../libpurple/protocols/jabber/jabber.c:1608
+#: ../libpurple/protocols/jabber/jabber.c:1631
+#, fuzzy
+msgid "Tune Comment"
+msgstr "仲間のコメント"
+
+#: ../libpurple/protocols/jabber/jabber.c:1540
+#: ../libpurple/protocols/jabber/jabber.c:1563
+#: ../libpurple/protocols/jabber/jabber.c:1586
+#: ../libpurple/protocols/jabber/jabber.c:1609
+#: ../libpurple/protocols/jabber/jabber.c:1632
+msgid "Tune Track"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:1541
+#: ../libpurple/protocols/jabber/jabber.c:1564
+#: ../libpurple/protocols/jabber/jabber.c:1587
+#: ../libpurple/protocols/jabber/jabber.c:1610
+#: ../libpurple/protocols/jabber/jabber.c:1633
+msgid "Tune Time"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:1542
+#: ../libpurple/protocols/jabber/jabber.c:1565
+#: ../libpurple/protocols/jabber/jabber.c:1588
+#: ../libpurple/protocols/jabber/jabber.c:1611
+#: ../libpurple/protocols/jabber/jabber.c:1634
+msgid "Tune Year"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:1543
+#: ../libpurple/protocols/jabber/jabber.c:1566
+#: ../libpurple/protocols/jabber/jabber.c:1589
+#: ../libpurple/protocols/jabber/jabber.c:1612
+#: ../libpurple/protocols/jabber/jabber.c:1635
+msgid "Tune URL"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:1545
+#: ../libpurple/protocols/jabber/jabber.c:1568
+#: ../libpurple/protocols/jabber/jabber.c:1591
+#: ../libpurple/protocols/jabber/jabber.c:1614
+#: ../libpurple/protocols/jabber/jabber.c:1637
+#, fuzzy
+msgid "Allow Buzz"
+msgstr "許可する"
+
+#: ../libpurple/protocols/jabber/jabber.c:1665
 msgid "Password Changed"
 msgstr "パスワードの変更"
 
-#: ../libpurple/protocols/jabber/jabber.c:1321
+#: ../libpurple/protocols/jabber/jabber.c:1666
 msgid "Your password has been changed."
 msgstr "パスワードを変更しました。"
 
-#: ../libpurple/protocols/jabber/jabber.c:1325
-#: ../libpurple/protocols/jabber/jabber.c:1326
+#: ../libpurple/protocols/jabber/jabber.c:1670
+#: ../libpurple/protocols/jabber/jabber.c:1671
 msgid "Error changing password"
 msgstr "パスワードを変更する際にエラー"
 
-#: ../libpurple/protocols/jabber/jabber.c:1382
+#: ../libpurple/protocols/jabber/jabber.c:1728
 msgid "Password (again)"
 msgstr "パスワード (確認用)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1387
-#: ../libpurple/protocols/jabber/jabber.c:1388
+#: ../libpurple/protocols/jabber/jabber.c:1734
+#: ../libpurple/protocols/jabber/jabber.c:1735
 msgid "Change XMPP Password"
 msgstr "XMPP パスワードの変更"
 
-#: ../libpurple/protocols/jabber/jabber.c:1388
+#: ../libpurple/protocols/jabber/jabber.c:1735
 msgid "Please enter your new password"
 msgstr "新しいパスワードを入力して下さい"
 
-#: ../libpurple/protocols/jabber/jabber.c:1400
-#: ../libpurple/protocols/oscar/oscar.c:6365
+#: ../libpurple/protocols/jabber/jabber.c:1749
+#: ../libpurple/protocols/oscar/oscar.c:6386
 #: ../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:1405
-#: ../libpurple/protocols/oscar/oscar.c:6376
+#: ../libpurple/protocols/jabber/jabber.c:1754
+#: ../libpurple/protocols/oscar/oscar.c:6397
 #: ../libpurple/protocols/silc/silc.c:1089
 #: ../libpurple/protocols/silc10/silc.c:1000
 msgid "Change Password..."
 msgstr "パスワードの変更..."
 
 #. }
-#: ../libpurple/protocols/jabber/jabber.c:1410
+#: ../libpurple/protocols/jabber/jabber.c:1759
 msgid "Search for Users..."
 msgstr "ユーザの検索..."
 
-#: ../libpurple/protocols/jabber/jabber.c:1488
+#: ../libpurple/protocols/jabber/jabber.c:1845
 msgid "Bad Request"
 msgstr "おかしな要求です"
 
-#: ../libpurple/protocols/jabber/jabber.c:1490
+#: ../libpurple/protocols/jabber/jabber.c:1847
 msgid "Conflict"
 msgstr "衝突してます"
 
-#: ../libpurple/protocols/jabber/jabber.c:1492
+#: ../libpurple/protocols/jabber/jabber.c:1849
 msgid "Feature Not Implemented"
 msgstr "まだ実装していません"
 
-#: ../libpurple/protocols/jabber/jabber.c:1494
+#: ../libpurple/protocols/jabber/jabber.c:1851
 msgid "Forbidden"
 msgstr "隠れています"
 
-#: ../libpurple/protocols/jabber/jabber.c:1496
+#: ../libpurple/protocols/jabber/jabber.c:1853
 msgid "Gone"
 msgstr "逝ってます"
 
-#: ../libpurple/protocols/jabber/jabber.c:1498
-#: ../libpurple/protocols/jabber/jabber.c:1575
+#: ../libpurple/protocols/jabber/jabber.c:1855
+#: ../libpurple/protocols/jabber/jabber.c:1935
 msgid "Internal Server Error"
 msgstr "サーバの内部エラー"
 
-#: ../libpurple/protocols/jabber/jabber.c:1500
+#: ../libpurple/protocols/jabber/jabber.c:1857
 msgid "Item Not Found"
 msgstr "アイテムが見つかりません"
 
-#: ../libpurple/protocols/jabber/jabber.c:1502
+#: ../libpurple/protocols/jabber/jabber.c:1859
 msgid "Malformed XMPP ID"
 msgstr "おかしな XMPP ID"
 
-#: ../libpurple/protocols/jabber/jabber.c:1504
+#: ../libpurple/protocols/jabber/jabber.c:1861
 msgid "Not Acceptable"
 msgstr "受信できません"
 
-#: ../libpurple/protocols/jabber/jabber.c:1506
+#: ../libpurple/protocols/jabber/jabber.c:1863
 msgid "Not Allowed"
 msgstr "許可していません"
 
-#: ../libpurple/protocols/jabber/jabber.c:1510
+#: ../libpurple/protocols/jabber/jabber.c:1867
 msgid "Payment Required"
 msgstr "有料です"
 
-#: ../libpurple/protocols/jabber/jabber.c:1512
+#: ../libpurple/protocols/jabber/jabber.c:1869
 msgid "Recipient Unavailable"
 msgstr "受信者がいません"
 
-#: ../libpurple/protocols/jabber/jabber.c:1516
+#: ../libpurple/protocols/jabber/jabber.c:1873
 msgid "Registration Required"
 msgstr "登録が必要です"
 
-#: ../libpurple/protocols/jabber/jabber.c:1518
+#: ../libpurple/protocols/jabber/jabber.c:1875
 msgid "Remote Server Not Found"
 msgstr "リモート・サーバが見つかりません"
 
-#: ../libpurple/protocols/jabber/jabber.c:1520
+#: ../libpurple/protocols/jabber/jabber.c:1877
 msgid "Remote Server Timeout"
 msgstr "リモート・サーバがタイムアウトしました"
 
-#: ../libpurple/protocols/jabber/jabber.c:1522
+#: ../libpurple/protocols/jabber/jabber.c:1879
 msgid "Server Overloaded"
 msgstr "サーバがオーバーロードです"
 
-#: ../libpurple/protocols/jabber/jabber.c:1524
+#: ../libpurple/protocols/jabber/jabber.c:1881
 msgid "Service Unavailable"
 msgstr "サービスは利用できません"
 
-#: ../libpurple/protocols/jabber/jabber.c:1526
+#: ../libpurple/protocols/jabber/jabber.c:1883
 msgid "Subscription Required"
 msgstr "購読の申し込みが必要です"
 
-#: ../libpurple/protocols/jabber/jabber.c:1528
+#: ../libpurple/protocols/jabber/jabber.c:1885
 msgid "Unexpected Request"
 msgstr "予期しないリクエストです"
 
-#: ../libpurple/protocols/jabber/jabber.c:1535
+#: ../libpurple/protocols/jabber/jabber.c:1892
 msgid "Authorization Aborted"
 msgstr "承認が拒否されました"
 
-#: ../libpurple/protocols/jabber/jabber.c:1537
+#: ../libpurple/protocols/jabber/jabber.c:1894
 msgid "Incorrect encoding in authorization"
 msgstr "承認で不正なエンコーディングが行われました"
 
-#: ../libpurple/protocols/jabber/jabber.c:1540
+#: ../libpurple/protocols/jabber/jabber.c:1897
 msgid "Invalid authzid"
 msgstr "不正な authzid です"
 
-#: ../libpurple/protocols/jabber/jabber.c:1543
+#: ../libpurple/protocols/jabber/jabber.c:1900
 msgid "Invalid Authorization Mechanism"
 msgstr "不正な承認メカニズムです"
 
-#: ../libpurple/protocols/jabber/jabber.c:1546
+#: ../libpurple/protocols/jabber/jabber.c:1903
 msgid "Authorization mechanism too weak"
 msgstr "承認メカニズムが不十分です"
 
-#: ../libpurple/protocols/jabber/jabber.c:1551
+#: ../libpurple/protocols/jabber/jabber.c:1911
 msgid "Temporary Authentication Failure"
 msgstr "テンポラリな認証に失敗しました"
 
-#: ../libpurple/protocols/jabber/jabber.c:1554
+#: ../libpurple/protocols/jabber/jabber.c:1914
 msgid "Authentication Failure"
 msgstr "認証に失敗しました"
 
-#: ../libpurple/protocols/jabber/jabber.c:1560
+#: ../libpurple/protocols/jabber/jabber.c:1920
 msgid "Bad Format"
 msgstr "おかしなフォーマット"
 
-#: ../libpurple/protocols/jabber/jabber.c:1562
+#: ../libpurple/protocols/jabber/jabber.c:1922
 msgid "Bad Namespace Prefix"
 msgstr "おかしな名前空間の接頭子"
 
-#: ../libpurple/protocols/jabber/jabber.c:1565
+#: ../libpurple/protocols/jabber/jabber.c:1925
 msgid "Resource Conflict"
 msgstr "リソースの衝突"
 
-#: ../libpurple/protocols/jabber/jabber.c:1567
+#: ../libpurple/protocols/jabber/jabber.c:1927
 #: ../libpurple/protocols/silc/silc.c:244
 #: ../libpurple/protocols/silc10/ops.c:1720
 msgid "Connection Timeout"
 msgstr "接続がタイムアウトしました"
 
-#: ../libpurple/protocols/jabber/jabber.c:1569
+#: ../libpurple/protocols/jabber/jabber.c:1929
 msgid "Host Gone"
 msgstr "ホストがお亡くなりになりました"
 
-#: ../libpurple/protocols/jabber/jabber.c:1571
+#: ../libpurple/protocols/jabber/jabber.c:1931
 msgid "Host Unknown"
 msgstr "ホストが不明です"
 
-#: ../libpurple/protocols/jabber/jabber.c:1573
+#: ../libpurple/protocols/jabber/jabber.c:1933
 msgid "Improper Addressing"
 msgstr "適切ではないアドレス設定"
 
-#: ../libpurple/protocols/jabber/jabber.c:1577
+#: ../libpurple/protocols/jabber/jabber.c:1937
 msgid "Invalid ID"
 msgstr "不正な ID"
 
-#: ../libpurple/protocols/jabber/jabber.c:1579
+#: ../libpurple/protocols/jabber/jabber.c:1939
 msgid "Invalid Namespace"
 msgstr "不正な名前空間"
 
-#: ../libpurple/protocols/jabber/jabber.c:1581
+#: ../libpurple/protocols/jabber/jabber.c:1941
 msgid "Invalid XML"
 msgstr "不正な XML"
 
-#: ../libpurple/protocols/jabber/jabber.c:1583
+#: ../libpurple/protocols/jabber/jabber.c:1943
 msgid "Non-matching Hosts"
 msgstr "一致しないホスト"
 
-#: ../libpurple/protocols/jabber/jabber.c:1587
+#: ../libpurple/protocols/jabber/jabber.c:1947
 msgid "Policy Violation"
 msgstr "ポリシー違反"
 
-#: ../libpurple/protocols/jabber/jabber.c:1589
+#: ../libpurple/protocols/jabber/jabber.c:1949
 msgid "Remote Connection Failed"
 msgstr "リモート接続に失敗しました"
 
-#: ../libpurple/protocols/jabber/jabber.c:1591
+#: ../libpurple/protocols/jabber/jabber.c:1951
 msgid "Resource Constraint"
 msgstr "リソース制限"
 
-#: ../libpurple/protocols/jabber/jabber.c:1593
+#: ../libpurple/protocols/jabber/jabber.c:1953
 msgid "Restricted XML"
 msgstr "制限付き XML"
 
-#: ../libpurple/protocols/jabber/jabber.c:1595
+#: ../libpurple/protocols/jabber/jabber.c:1955
 msgid "See Other Host"
 msgstr "他のホストを表示する"
 
-#: ../libpurple/protocols/jabber/jabber.c:1597
+#: ../libpurple/protocols/jabber/jabber.c:1957
 msgid "System Shutdown"
 msgstr "システム・シャットダウン"
 
-#: ../libpurple/protocols/jabber/jabber.c:1599
+#: ../libpurple/protocols/jabber/jabber.c:1959
 msgid "Undefined Condition"
 msgstr "定義していない条件"
 
-#: ../libpurple/protocols/jabber/jabber.c:1601
+#: ../libpurple/protocols/jabber/jabber.c:1961
 msgid "Unsupported Encoding"
 msgstr "サポートしていないエンコーディング"
 
-#: ../libpurple/protocols/jabber/jabber.c:1603
+#: ../libpurple/protocols/jabber/jabber.c:1963
 msgid "Unsupported Stanza Type"
 msgstr "サポートしていない Stanza 型"
 
-#: ../libpurple/protocols/jabber/jabber.c:1605
+#: ../libpurple/protocols/jabber/jabber.c:1965
 msgid "Unsupported Version"
 msgstr "サポートしていないバージョン"
 
-#: ../libpurple/protocols/jabber/jabber.c:1607
+#: ../libpurple/protocols/jabber/jabber.c:1967
 msgid "XML Not Well Formed"
 msgstr "ウェル・フォームド XML ではありません"
 
-#: ../libpurple/protocols/jabber/jabber.c:1609
+#: ../libpurple/protocols/jabber/jabber.c:1969
 msgid "Stream Error"
 msgstr "ストリーム・エラー"
 
-#: ../libpurple/protocols/jabber/jabber.c:1676
+#: ../libpurple/protocols/jabber/jabber.c:2052
 #, c-format
 msgid "Unable to ban user %s"
 msgstr "ユーザの %s さんを追い出せません"
 
-#: ../libpurple/protocols/jabber/jabber.c:1696
+#: ../libpurple/protocols/jabber/jabber.c:2072
 #, c-format
 msgid "Unknown affiliation: \"%s\""
 msgstr "不明な会員: \"%s\""
 
-#: ../libpurple/protocols/jabber/jabber.c:1701
+#: ../libpurple/protocols/jabber/jabber.c:2077
 #, c-format
 msgid "Unable to affiliate user %s as \"%s\""
 msgstr "ユーザの %s さんを \"%s\" として仲間に追加できません"
 
-#: ../libpurple/protocols/jabber/jabber.c:1720
+#: ../libpurple/protocols/jabber/jabber.c:2096
 #, c-format
 msgid "Unknown role: \"%s\""
 msgstr "不明な役割: \"%s\""
 
-#: ../libpurple/protocols/jabber/jabber.c:1727
+#: ../libpurple/protocols/jabber/jabber.c:2101
 #, c-format
 msgid "Unable to set role \"%s\" for user: %s"
 msgstr "ユーザに役割 \"%s\" をセットできません: %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:1780
+#: ../libpurple/protocols/jabber/jabber.c:2154
 #, c-format
 msgid "Unable to kick user %s"
 msgstr "ユーザの %s さんをキックできません"
 
-#: ../libpurple/protocols/jabber/jabber.c:1811
+#: ../libpurple/protocols/jabber/jabber.c:2185
+#, fuzzy, c-format
+msgid "Unable to ping user %s"
+msgstr "ユーザの %s さんを追い出せません"
+
+#: ../libpurple/protocols/jabber/jabber.c:2207
+#: ../libpurple/protocols/jabber/jabber.c:2217
+#, c-format
+msgid "Unable to buzz, because there is nothing known about user %s."
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:2213
+#, c-format
+msgid "Unable to buzz, because user %s might be offline."
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:2239
+#, fuzzy, c-format
+msgid "Unable to buzz, because the user %s does not support it."
+msgstr ""
+"%s さんへファイルを送信できません (ユーザはファイル転送をサポートしていませ"
+"ん)"
+
+#: ../libpurple/protocols/jabber/jabber.c:2250
+#: ../libpurple/protocols/yahoo/yahoo.c:4118
+msgid "Buzz"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:2251
+#: ../libpurple/protocols/jabber/message.c:307
+#: ../libpurple/protocols/yahoo/yahoo.c:4119
+#, fuzzy, c-format
+msgid "%s has buzzed you!"
+msgstr "%s さんがあなた [%s] を追加しました"
+
+#: ../libpurple/protocols/jabber/jabber.c:2252
+#: ../libpurple/protocols/yahoo/yahoo.c:4120
+#, c-format
+msgid "Buzzing %s..."
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:2291
 msgid "config:  Configure a chat room."
 msgstr "config:  チャット・ルームを設定します"
 
-#: ../libpurple/protocols/jabber/jabber.c:1815
+#: ../libpurple/protocols/jabber/jabber.c:2295
 msgid "configure:  Configure a chat room."
 msgstr "configure:  チャット・ルームを設定します"
 
-#: ../libpurple/protocols/jabber/jabber.c:1824
+#: ../libpurple/protocols/jabber/jabber.c:2304
 msgid "part [room]:  Leave the room."
 msgstr "part [部屋]:  部屋から退出します"
 
-#: ../libpurple/protocols/jabber/jabber.c:1829
+#: ../libpurple/protocols/jabber/jabber.c:2309
 msgid "register:  Register with a chat room."
 msgstr "register:  チャット・ルームを登録します"
 
-#: ../libpurple/protocols/jabber/jabber.c:1835
+#: ../libpurple/protocols/jabber/jabber.c:2315
 msgid "topic [new topic]:  View or change the topic."
 msgstr "topic [新しいトピック]:  トピックを表示したり変更します"
 
-#: ../libpurple/protocols/jabber/jabber.c:1841
+#: ../libpurple/protocols/jabber/jabber.c:2321
 msgid "ban &lt;user&gt; [room]:  Ban a user from the room."
 msgstr ""
 "ban &lt;ユーザ&gt; [ルーム]:  指定したチャット・ルームからユーザを追い出しま"
 "す"
 
-#: ../libpurple/protocols/jabber/jabber.c:1847
+#: ../libpurple/protocols/jabber/jabber.c:2327
 msgid ""
 "affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
 "affiliation with the room."
@@ -4996,7 +6110,7 @@
 "affiliate &lt;ユーザ&gt; &lt;owner|admin|member|outcast|none&gt;: ユーザの関"
 "係をセットします"
 
-#: ../libpurple/protocols/jabber/jabber.c:1853
+#: ../libpurple/protocols/jabber/jabber.c:2333
 msgid ""
 "role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
 "role in the room."
@@ -5004,27 +6118,36 @@
 "role &lt;ユーザ&gt; &lt;moderator|participant|visitor|none&gt;: チャトルーム"
 "での役割をセットします"
 
-#: ../libpurple/protocols/jabber/jabber.c:1859
+#: ../libpurple/protocols/jabber/jabber.c:2339
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
 msgstr "invite &lt;ユーザ&gt; [メッセージ]:  ユーザをルームに招待します"
 
-#: ../libpurple/protocols/jabber/jabber.c:1865
+#: ../libpurple/protocols/jabber/jabber.c:2345
 msgid "join: &lt;room&gt; [server]:  Join a chat on this server."
 msgstr "join: &lt;ルーム&gt; [サーバ]:  指定したサーバのチャットへ参加します"
 
-#: ../libpurple/protocols/jabber/jabber.c:1871
+#: ../libpurple/protocols/jabber/jabber.c:2351
 msgid "kick &lt;user&gt; [room]:  Kick a user from the room."
 msgstr ""
 "kick &lt;ユーザ&gt; [ルーム]:  指定したユーザをチャット・ルームから追い出しま"
 "す"
 
-#: ../libpurple/protocols/jabber/jabber.c:1876
+#: ../libpurple/protocols/jabber/jabber.c:2356
 msgid ""
 "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
 msgstr ""
 "msg &lt;ユーザ&gt; &lt;メッセージ&gt;:  他のユーザへ個人的なメッセージを送信"
 "します"
 
+#: ../libpurple/protocols/jabber/jabber.c:2362
+msgid "ping &lt;jid&gt;:\tPing a user/component/server."
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:2367
+#: ../libpurple/protocols/yahoo/yahoo.c:4144
+msgid "buzz: Buzz a user to get their attention"
+msgstr "buzz: ユーザ宛に警告音を鳴らす"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -5035,84 +6158,92 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/jabber/libxmpp.c:166
-#: ../libpurple/protocols/jabber/libxmpp.c:168
+#: ../libpurple/protocols/jabber/libxmpp.c:170
+#: ../libpurple/protocols/jabber/libxmpp.c:172
 msgid "XMPP Protocol Plugin"
 msgstr "XMPP プロトコルのプラグイン"
 
 #. Translators: 'domain' is used here in the context of Internet domains, e.g. pidgin.im
-#: ../libpurple/protocols/jabber/libxmpp.c:195 ../pidgin/gtkaccount.c:505
+#: ../libpurple/protocols/jabber/libxmpp.c:202 ../pidgin/gtkaccount.c:506
 msgid "Domain"
 msgstr "ドメイン名"
 
-#: ../libpurple/protocols/jabber/libxmpp.c:201
+#: ../libpurple/protocols/jabber/libxmpp.c:210
+msgid "Require SSL/TLS"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/libxmpp.c:214
 msgid "Force old (port 5223) SSL"
 msgstr "古い SSL (ポート番号:5223) を強制的に使用する"
 
-#: ../libpurple/protocols/jabber/libxmpp.c:206
+#: ../libpurple/protocols/jabber/libxmpp.c:219
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "暗号化されていないストリームを介したプレーンテキスト認証を許可する"
 
-#: ../libpurple/protocols/jabber/libxmpp.c:211
-#: ../libpurple/protocols/simple/simple.c:1856
+#: ../libpurple/protocols/jabber/libxmpp.c:224
+#: ../libpurple/protocols/myspace/myspace.c:3275
+#: ../libpurple/protocols/simple/simple.c:1904
 msgid "Connect port"
 msgstr "接続するポート番号"
 
+#. TODO: default to automatically try different ports. Make the user be
+#. * able to set the first port to try (like LastConnectedPort in Windows client).
 #. Account options
-#: ../libpurple/protocols/jabber/libxmpp.c:215
-#: ../libpurple/protocols/silc/silc.c:1913
-#: ../libpurple/protocols/silc10/silc.c:1855 ../pidgin/gtkaccount.c:835
+#: ../libpurple/protocols/jabber/libxmpp.c:228
+#: ../libpurple/protocols/myspace/myspace.c:3272
+#: ../libpurple/protocols/silc/silc.c:1914
+#: ../libpurple/protocols/silc10/silc.c:1857 ../pidgin/gtkaccount.c:837
 msgid "Connect server"
 msgstr "サーバへ接続"
 
-#: ../libpurple/protocols/jabber/message.c:102
+#: ../libpurple/protocols/jabber/message.c:106
 #, c-format
 msgid "%s has left the conversation."
 msgstr "%s さんが会話ウインドウを閉じました"
 
-#: ../libpurple/protocols/jabber/message.c:153
+#: ../libpurple/protocols/jabber/message.c:161
 #, c-format
 msgid "Message from %s"
 msgstr "%s さんからのメッセージ"
 
-#: ../libpurple/protocols/jabber/message.c:217
+#: ../libpurple/protocols/jabber/message.c:225
 #, c-format
 msgid "%s has set the topic to: %s"
 msgstr "%s はトピックをセットしました: %s"
 
-#: ../libpurple/protocols/jabber/message.c:219
+#: ../libpurple/protocols/jabber/message.c:227
 #, c-format
 msgid "The topic is: %s"
 msgstr "トピック: %s"
 
-#: ../libpurple/protocols/jabber/message.c:267
+#: ../libpurple/protocols/jabber/message.c:275
 #, c-format
 msgid "Message delivery to %s failed: %s"
 msgstr "%s さんへのメッセージの配送に失敗: %s"
 
-#: ../libpurple/protocols/jabber/message.c:270
+#: ../libpurple/protocols/jabber/message.c:278
 msgid "XMPP Message Error"
 msgstr "XMPP メッセージ・エラー"
 
-#: ../libpurple/protocols/jabber/message.c:359
+#: ../libpurple/protocols/jabber/message.c:407
 #, c-format
 msgid " (Code %s)"
 msgstr " (コード %s)"
 
-#: ../libpurple/protocols/jabber/parser.c:193
+#: ../libpurple/protocols/jabber/parser.c:196
 msgid "XML Parse error"
 msgstr "XML 解析エラー"
 
-#: ../libpurple/protocols/jabber/presence.c:279
+#: ../libpurple/protocols/jabber/presence.c:422
 msgid "Unknown Error in presence"
 msgstr "不明なエラーが起きています"
 
-#: ../libpurple/protocols/jabber/presence.c:353
-#: ../libpurple/protocols/jabber/presence.c:354
+#: ../libpurple/protocols/jabber/presence.c:503
+#: ../libpurple/protocols/jabber/presence.c:504
 msgid "Create New Room"
 msgstr "新しいチャット・ルームの生成"
 
-#: ../libpurple/protocols/jabber/presence.c:355
+#: ../libpurple/protocols/jabber/presence.c:505
 msgid ""
 "You are creating a new room.  Would you like to configure it, or accept the "
 "default settings?"
@@ -5120,68 +6251,130 @@
 "新しいチャット・ルームを生成します。チャット・ルームの設定を行いますか? それ"
 "ともデフォルト値を適用しますか?"
 
-#: ../libpurple/protocols/jabber/presence.c:361
+#: ../libpurple/protocols/jabber/presence.c:511
 msgid "_Configure Room"
 msgstr "ルームの設定(_C)"
 
-#: ../libpurple/protocols/jabber/presence.c:362
+#: ../libpurple/protocols/jabber/presence.c:512
 msgid "_Accept Defaults"
 msgstr "デフォルト値を適用する(_A)"
 
-#: ../libpurple/protocols/jabber/presence.c:398
+#: ../libpurple/protocols/jabber/presence.c:554
 #, c-format
 msgid "Error in chat %s"
 msgstr "チャット %s でエラー"
 
-#: ../libpurple/protocols/jabber/presence.c:401
+#: ../libpurple/protocols/jabber/presence.c:558
 #, c-format
 msgid "Error joining chat %s"
 msgstr "チャット %s に参加する際にエラー"
 
-#: ../libpurple/protocols/jabber/si.c:769
+#: ../libpurple/protocols/jabber/si.c:775
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
 msgstr ""
 "%s さんへファイルを送信できません (ユーザはファイル転送をサポートしていませ"
 "ん)"
 
-#: ../libpurple/protocols/jabber/si.c:770
-#: ../libpurple/protocols/jabber/si.c:771
-#: ../libpurple/protocols/jabber/si.c:839
+#: ../libpurple/protocols/jabber/si.c:776
+#: ../libpurple/protocols/jabber/si.c:777
+#: ../libpurple/protocols/jabber/si.c:845
 msgid "File Send Failed"
 msgstr "ファイル送信の失敗"
 
-#: ../libpurple/protocols/jabber/si.c:832
+#: ../libpurple/protocols/jabber/si.c:838
 #, c-format
 msgid "Unable to send file to %s, invalid JID"
 msgstr "%s さんへファイルを送信できません (JID が間違っています)"
 
-#: ../libpurple/protocols/jabber/si.c:834
+#: ../libpurple/protocols/jabber/si.c:840
 #, c-format
 msgid "Unable to send file to %s, user is not online"
 msgstr "%s さんへファイルを送信できません (ユーザはオフラインです)"
 
-#: ../libpurple/protocols/jabber/si.c:836
+#: ../libpurple/protocols/jabber/si.c:842
 #, c-format
 msgid "Unable to send file to %s, not subscribed to user presence"
 msgstr ""
 "%s さんへファイルを送信できません (ユーザの在席情報が登録されていません)"
 
-#: ../libpurple/protocols/jabber/si.c:851
+#: ../libpurple/protocols/jabber/si.c:857
 #, c-format
 msgid "Please select which resource of %s you would like to send a file to"
 msgstr "ファイルとして送信する %s のリソースを選択して下さい"
 
-#: ../libpurple/protocols/jabber/si.c:867
+#: ../libpurple/protocols/jabber/si.c:873
 msgid "Select a Resource"
 msgstr "リソースの選択"
 
-#: ../libpurple/protocols/msn/dialog.c:110
+#: ../libpurple/protocols/jabber/usermood.c:179
+#: ../libpurple/protocols/jabber/usermood.c:180
+#, fuzzy
+msgid "Edit User Mood"
+msgstr "ユーザ・モード"
+
+#: ../libpurple/protocols/jabber/usermood.c:181
+msgid "Please select your mood from the list."
+msgstr ""
+
+#: ../libpurple/protocols/jabber/usermood.c:183
+#: ../libpurple/protocols/jabber/usernick.c:78
+#, fuzzy
+msgid "Set"
+msgstr "設定(_S)"
+
+#: ../libpurple/protocols/jabber/usermood.c:191
+#, fuzzy
+msgid "Set Mood..."
+msgstr "IM の送信..."
+
+#: ../libpurple/protocols/jabber/usernick.c:76
+#, fuzzy
+msgid "Set User Nickname"
+msgstr "ユーザ制限 ON"
+
+#: ../libpurple/protocols/jabber/usernick.c:76
+#, fuzzy
+msgid "Please specify a new nickname for you."
+msgstr "%s さんの新しい名前を入力して下さい"
+
+#: ../libpurple/protocols/jabber/usernick.c:77
+msgid ""
+"This information is visible to all contacts on your contact list, so choose "
+"something appropriate."
+msgstr ""
+
+#: ../libpurple/protocols/jabber/usernick.c:100
+#, fuzzy
+msgid "Set Nickname..."
+msgstr "ニックネーム"
+
+#: ../libpurple/protocols/jabber/xdata.c:378
+#, fuzzy
+msgid "Actions"
+msgstr "つかんだら何をするか..."
+
+#: ../libpurple/protocols/jabber/xdata.c:380
+#, fuzzy
+msgid "Select an action"
+msgstr "ファイルの選択"
+
+#: ../libpurple/protocols/msn/contact.c:207
+#, fuzzy
+msgid "Unable to connect to contact server"
+msgstr "サーバへ接続できません"
+
+#: ../libpurple/protocols/msn/contact.c:954
+#, fuzzy
+msgid "Unable to retrieve MSN Address Book"
+msgstr "Notes アドレス帳の選択"
+
+#: ../libpurple/protocols/msn/dialog.c:118
 #, c-format
 msgid "Buddy list synchronization issue in %s (%s)"
 msgstr "%s (%s) で仲間リストの同期が発生しました"
 
-#: ../libpurple/protocols/msn/dialog.c:116
+#: ../libpurple/protocols/msn/dialog.c:124
 #, c-format
 msgid ""
 "%s on the local list is inside the group \"%s\" but not on the server list. "
@@ -5191,7 +6384,7 @@
 "すが、サーバ上のリストではそうなっていません。サーバ上のリストで、この仲間を"
 "追加してよろしいですか?"
 
-#: ../libpurple/protocols/msn/dialog.c:124
+#: ../libpurple/protocols/msn/dialog.c:132
 #, c-format
 msgid ""
 "%s is on the local list but not on the server list. Do you want this buddy "
@@ -5298,7 +6491,7 @@
 msgstr "FND にヒットしすぎです"
 
 #: ../libpurple/protocols/msn/error.c:124
-#: ../libpurple/protocols/oscar/oscar.c:119
+#: ../libpurple/protocols/oscar/oscar.c:120
 msgid "Not logged in"
 msgstr "ログインしていません"
 
@@ -5393,10 +6586,10 @@
 msgstr "サーバがとてもビジーです"
 
 #: ../libpurple/protocols/msn/error.c:222
-#: ../libpurple/protocols/oscar/oscar.c:1381
+#: ../libpurple/protocols/oscar/oscar.c:1380
 #: ../libpurple/protocols/silc/silc.c:233
 #: ../libpurple/protocols/silc10/ops.c:1709
-#: ../libpurple/protocols/toc/toc.c:728 ../libpurple/proxy.c:1363
+#: ../libpurple/protocols/toc/toc.c:728 ../libpurple/proxy.c:1380
 msgid "Authentication failed"
 msgstr "認証に失敗しました"
 
@@ -5430,39 +6623,49 @@
 msgid "MSN Error: %s\n"
 msgstr "MSN エラー: %s\n"
 
-#: ../libpurple/protocols/msn/msn.c:121
-msgid "You have just sent a Nudge!"
-msgstr "今、合図を送りました!"
-
-#: ../libpurple/protocols/msn/msn.c:146
+#: ../libpurple/protocols/msn/msn.c:130
+msgid "Nudge"
+msgstr ""
+
+#: ../libpurple/protocols/msn/msn.c:131
+#, fuzzy, c-format
+msgid "%s has nudged you!"
+msgstr "%s さんがあなた [%s] を追加しました"
+
+#: ../libpurple/protocols/msn/msn.c:132
+#, c-format
+msgid "Nudging %s..."
+msgstr ""
+
+#: ../libpurple/protocols/msn/msn.c:174
 msgid "Your new MSN friendly name is too long."
 msgstr "新しい MSN の公開名が長すぎます"
 
-#: ../libpurple/protocols/msn/msn.c:254
+#: ../libpurple/protocols/msn/msn.c:285
 msgid "Set your friendly name."
 msgstr "公開する名前をセットして下さい"
 
-#: ../libpurple/protocols/msn/msn.c:255
+#: ../libpurple/protocols/msn/msn.c:286
 msgid "This is the name that other MSN buddies will see you as."
 msgstr "MSN の他の仲間があなたを見るときに表示される名前です:"
 
-#: ../libpurple/protocols/msn/msn.c:273
+#: ../libpurple/protocols/msn/msn.c:304
 msgid "Set your home phone number."
 msgstr "自宅の電話番号を設定して下さい"
 
-#: ../libpurple/protocols/msn/msn.c:290
+#: ../libpurple/protocols/msn/msn.c:321
 msgid "Set your work phone number."
 msgstr "オフィスの電話番号を設定して下さい"
 
-#: ../libpurple/protocols/msn/msn.c:307
+#: ../libpurple/protocols/msn/msn.c:338
 msgid "Set your mobile phone number."
 msgstr "携帯電話の番号を設定して下さい"
 
-#: ../libpurple/protocols/msn/msn.c:322
+#: ../libpurple/protocols/msn/msn.c:353
 msgid "Allow MSN Mobile pages?"
 msgstr "MSN モバイル・ページを許可しますか?"
 
-#: ../libpurple/protocols/msn/msn.c:323
+#: ../libpurple/protocols/msn/msn.c:354
 msgid ""
 "Do you want to allow or disallow people on your buddy list to send you MSN "
 "Mobile pages to your cell phone or other mobile device?"
@@ -5470,321 +6673,327 @@
 "仲間が携帯電話などのモバイル機器へ MSN モバイル・ページを送信することを許可し"
 "ますか?"
 
-#: ../libpurple/protocols/msn/msn.c:329
+#: ../libpurple/protocols/msn/msn.c:360
 msgid "Allow"
 msgstr "許可する"
 
-#: ../libpurple/protocols/msn/msn.c:330
+#: ../libpurple/protocols/msn/msn.c:361
 msgid "Disallow"
 msgstr "許可しない"
 
-#: ../libpurple/protocols/msn/msn.c:346
+#: ../libpurple/protocols/msn/msn.c:377
 msgid "This Hotmail account may not be active."
 msgstr "この Hotmail のアカウントは有効でないようです。"
 
-#: ../libpurple/protocols/msn/msn.c:372
+#: ../libpurple/protocols/msn/msn.c:403
 msgid "Send a mobile message."
 msgstr "モバイル・メッセージを送信します。"
 
-#: ../libpurple/protocols/msn/msn.c:374
+#: ../libpurple/protocols/msn/msn.c:405
 msgid "Page"
 msgstr "ページ"
 
-#: ../libpurple/protocols/msn/msn.c:521
-msgid "Has you"
-msgstr "あなたを仲間リストに登録しているか"
-
-#: ../libpurple/protocols/msn/msn.c:551 ../libpurple/protocols/msn/state.c:33
-#: ../libpurple/protocols/yahoo/yahoo.c:2895
-#: ../libpurple/protocols/yahoo/yahoo.c:3504
+#: ../libpurple/protocols/msn/msn.c:610 ../libpurple/protocols/msn/msn.c:635
+#: ../libpurple/protocols/msn/msn.c:642 ../libpurple/protocols/msn/msn.c:649
+#: ../libpurple/protocols/msn/msn.c:656 ../libpurple/protocols/msn/msn.c:662
+#: ../libpurple/protocols/msn/msn.c:668
+#, fuzzy
+msgid "Current media"
+msgstr "現在のトークン"
+
+#: ../libpurple/protocols/msn/msn.c:647 ../libpurple/protocols/msn/state.c:33
+#: ../libpurple/protocols/yahoo/yahoo.c:3076
+#: ../libpurple/protocols/yahoo/yahoo.c:3760
 msgid "Be Right Back"
 msgstr "もうすぐ帰ってきます"
 
-#: ../libpurple/protocols/msn/msn.c:555 ../libpurple/protocols/msn/state.c:31
-#: ../libpurple/protocols/novell/novell.c:2822
-#: ../libpurple/protocols/novell/novell.c:2952
+#: ../libpurple/protocols/msn/msn.c:654 ../libpurple/protocols/msn/state.c:31
+#: ../libpurple/protocols/novell/novell.c:2827
+#: ../libpurple/protocols/novell/novell.c:2957
 #: ../libpurple/protocols/silc/buddy.c:1480
 #: ../libpurple/protocols/silc/silc.c:56
 #: ../libpurple/protocols/silc10/buddy.c:1480
 #: ../libpurple/protocols/silc10/silc.c:47
-#: ../libpurple/protocols/yahoo/yahoo.c:2897
-#: ../libpurple/protocols/yahoo/yahoo.c:3507
+#: ../libpurple/protocols/yahoo/yahoo.c:3078
+#: ../libpurple/protocols/yahoo/yahoo.c:3763
 msgid "Busy"
 msgstr "取り込み中です"
 
-#: ../libpurple/protocols/msn/msn.c:559
-#: ../libpurple/protocols/yahoo/yahoo.c:2905
-#: ../libpurple/protocols/yahoo/yahoo.c:3519
+#: ../libpurple/protocols/msn/msn.c:660
+#: ../libpurple/protocols/yahoo/yahoo.c:3086
+#: ../libpurple/protocols/yahoo/yahoo.c:3775
 msgid "On the Phone"
 msgstr "電話中です"
 
-#: ../libpurple/protocols/msn/msn.c:563
-#: ../libpurple/protocols/yahoo/yahoo.c:2909
-#: ../libpurple/protocols/yahoo/yahoo.c:3525
+#: ../libpurple/protocols/msn/msn.c:666
+#: ../libpurple/protocols/yahoo/yahoo.c:3090
+#: ../libpurple/protocols/yahoo/yahoo.c:3781
 msgid "Out to Lunch"
 msgstr "食事に出かけています"
 
-#: ../libpurple/protocols/msn/msn.c:591
+#: ../libpurple/protocols/msn/msn.c:697
 msgid "Set Friendly Name..."
 msgstr "公開する名前の設定..."
 
-#: ../libpurple/protocols/msn/msn.c:596
+#: ../libpurple/protocols/msn/msn.c:702
 msgid "Set Home Phone Number..."
 msgstr "自宅の電話番号の設定..."
 
-#: ../libpurple/protocols/msn/msn.c:600
+#: ../libpurple/protocols/msn/msn.c:706
 msgid "Set Work Phone Number..."
 msgstr "オフィスの電話番号の設定..."
 
-#: ../libpurple/protocols/msn/msn.c:604
+#: ../libpurple/protocols/msn/msn.c:710
 msgid "Set Mobile Phone Number..."
 msgstr "携帯の電話番号の設定..."
 
-#: ../libpurple/protocols/msn/msn.c:610
+#: ../libpurple/protocols/msn/msn.c:716
 msgid "Enable/Disable Mobile Devices..."
 msgstr "モバイル機器の有効/無効..."
 
-#: ../libpurple/protocols/msn/msn.c:615
+#: ../libpurple/protocols/msn/msn.c:721
 msgid "Allow/Disallow Mobile Pages..."
 msgstr "モバイル・ページの許可/非許可...."
 
-#: ../libpurple/protocols/msn/msn.c:626
+#: ../libpurple/protocols/msn/msn.c:732
 msgid "Open Hotmail Inbox"
 msgstr "Hotmail の受信箱を開く"
 
-#: ../libpurple/protocols/msn/msn.c:650
+#: ../libpurple/protocols/msn/msn.c:756
 msgid "Send to Mobile"
 msgstr "モバイル機器へ送信"
 
-#: ../libpurple/protocols/msn/msn.c:660
-#: ../libpurple/protocols/novell/novell.c:3408
+#: ../libpurple/protocols/msn/msn.c:766
+#: ../libpurple/protocols/novell/novell.c:3413
 msgid "Initiate _Chat"
 msgstr "チャットの開始(_C)"
 
-#: ../libpurple/protocols/msn/msn.c:698
+#: ../libpurple/protocols/msn/msn.c:804
 msgid "SSL support is needed for MSN. Please install a supported SSL library."
 msgstr ""
 "MSN では SSL サポートが必要です (サポートする SSL ライブラリをインストールし"
 "て下さい)"
 
-#: ../libpurple/protocols/msn/msn.c:723
+#: ../libpurple/protocols/msn/msn.c:832
 msgid "Failed to connect to server."
 msgstr "サーバへの接続に失敗しました"
 
-#: ../libpurple/protocols/msn/msn.c:1479 ../libpurple/protocols/msn/msn.c:1827
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:784
+#: ../libpurple/protocols/msn/msn.c:1620 ../libpurple/protocols/msn/msn.c:1968
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:808
 msgid "Error retrieving profile"
 msgstr "プロフィールを取得する際にエラー"
 
-#: ../libpurple/protocols/msn/msn.c:1550 ../pidgin/plugins/convcolors.c:309
-#: ../pidgin/plugins/pidginrc.c:448
+#: ../libpurple/protocols/msn/msn.c:1691 ../pidgin/plugins/convcolors.c:309
+#: ../pidgin/plugins/pidginrc.c:360
 msgid "General"
 msgstr "全般"
 
-#: ../libpurple/protocols/msn/msn.c:1557
-#: ../libpurple/protocols/oscar/oscar.c:3768
+#: ../libpurple/protocols/msn/msn.c:1698
+#: ../libpurple/protocols/myspace/user.c:110
+#: ../libpurple/protocols/oscar/oscar.c:3751
 #: ../libpurple/protocols/qq/buddy_info.c:45
-#: ../libpurple/protocols/qq/qq.c:219
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1057
+#: ../libpurple/protocols/qq/qq.c:221
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1081
 msgid "Age"
 msgstr "年齢"
 
-#: ../libpurple/protocols/msn/msn.c:1559
+#: ../libpurple/protocols/msn/msn.c:1700
 #: ../libpurple/protocols/qq/buddy_info.c:51
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1072
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1096
 msgid "Occupation"
 msgstr "職業"
 
-#: ../libpurple/protocols/msn/msn.c:1560
-#: ../libpurple/protocols/novell/novell.c:1478
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1052
+#: ../libpurple/protocols/msn/msn.c:1701
+#: ../libpurple/protocols/myspace/user.c:119
+#: ../libpurple/protocols/novell/novell.c:1480
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1076
 #: ../libpurple/protocols/zephyr/zephyr.c:798
 #: ../libpurple/protocols/zephyr/zephyr.c:1215
 msgid "Location"
 msgstr "場所"
 
-#: ../libpurple/protocols/msn/msn.c:1565 ../libpurple/protocols/msn/msn.c:1757
-#: ../libpurple/protocols/msn/msn.c:1763 ../libpurple/protocols/msn/msn.c:1770
+#: ../libpurple/protocols/msn/msn.c:1706 ../libpurple/protocols/msn/msn.c:1898
+#: ../libpurple/protocols/msn/msn.c:1904 ../libpurple/protocols/msn/msn.c:1911
 msgid "Hobbies and Interests"
 msgstr "趣味と興味のあること"
 
-#: ../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
+#: ../libpurple/protocols/msn/msn.c:1712 ../libpurple/protocols/msn/msn.c:1832
+#: ../libpurple/protocols/msn/msn.c:1838 ../libpurple/protocols/msn/msn.c:1845
+#: ../libpurple/protocols/msn/msn.c:1853 ../libpurple/protocols/msn/msn.c:1860
 msgid "A Little About Me"
 msgstr "ちょっとしたプロフィール"
 
-#: ../libpurple/protocols/msn/msn.c:1588
+#: ../libpurple/protocols/msn/msn.c:1729
 msgid "Social"
 msgstr "パーティ"
 
-#: ../libpurple/protocols/msn/msn.c:1590
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1062
+#: ../libpurple/protocols/msn/msn.c:1731
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1086
 msgid "Marital Status"
 msgstr "既婚/未婚"
 
-#: ../libpurple/protocols/msn/msn.c:1591
+#: ../libpurple/protocols/msn/msn.c:1732
 msgid "Interests"
 msgstr "趣味"
 
-#: ../libpurple/protocols/msn/msn.c:1592
+#: ../libpurple/protocols/msn/msn.c:1733
 msgid "Pets"
 msgstr "ペット"
 
-#: ../libpurple/protocols/msn/msn.c:1593
+#: ../libpurple/protocols/msn/msn.c:1734
 msgid "Hometown"
 msgstr "出身地"
 
-#: ../libpurple/protocols/msn/msn.c:1594
+#: ../libpurple/protocols/msn/msn.c:1735
 msgid "Places Lived"
 msgstr "現住所"
 
-#: ../libpurple/protocols/msn/msn.c:1595
+#: ../libpurple/protocols/msn/msn.c:1736
 msgid "Fashion"
 msgstr "ファッション"
 
-#: ../libpurple/protocols/msn/msn.c:1596
+#: ../libpurple/protocols/msn/msn.c:1737
 msgid "Humor"
 msgstr "ユーモア"
 
-#: ../libpurple/protocols/msn/msn.c:1597
+#: ../libpurple/protocols/msn/msn.c:1738
 msgid "Music"
 msgstr "音楽"
 
-#: ../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
+#: ../libpurple/protocols/msn/msn.c:1739 ../libpurple/protocols/msn/msn.c:1920
+#: ../libpurple/protocols/msn/msn.c:1926
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1138
 msgid "Favorite Quote"
 msgstr "座右の銘"
 
-#: ../libpurple/protocols/msn/msn.c:1615
+#: ../libpurple/protocols/msn/msn.c:1756
 msgid "Contact Info"
 msgstr "連絡先の情報"
 
-#: ../libpurple/protocols/msn/msn.c:1616
+#: ../libpurple/protocols/msn/msn.c:1757
 msgid "Personal"
 msgstr "個人"
 
-#: ../libpurple/protocols/msn/msn.c:1619
+#: ../libpurple/protocols/msn/msn.c:1760
 msgid "Significant Other"
 msgstr "大切な人"
 
-#: ../libpurple/protocols/msn/msn.c:1620
+#: ../libpurple/protocols/msn/msn.c:1761
 msgid "Home Phone"
 msgstr "ホームページ"
 
-#: ../libpurple/protocols/msn/msn.c:1621
+#: ../libpurple/protocols/msn/msn.c:1762
 msgid "Home Phone 2"
 msgstr "ホームページ2"
 
-#: ../libpurple/protocols/msn/msn.c:1622
-#: ../libpurple/protocols/oscar/oscar.c:3806
+#: ../libpurple/protocols/msn/msn.c:1763
+#: ../libpurple/protocols/oscar/oscar.c:3789
 msgid "Home Address"
 msgstr "自宅の住所"
 
-#: ../libpurple/protocols/msn/msn.c:1623
+#: ../libpurple/protocols/msn/msn.c:1764
 msgid "Personal Mobile"
 msgstr "携帯 (個人)"
 
-#: ../libpurple/protocols/msn/msn.c:1624
+#: ../libpurple/protocols/msn/msn.c:1765
 msgid "Home Fax"
 msgstr "自宅の FAX"
 
-#: ../libpurple/protocols/msn/msn.c:1625
+#: ../libpurple/protocols/msn/msn.c:1766
 msgid "Personal E-Mail"
 msgstr "個人の E-メール"
 
-#: ../libpurple/protocols/msn/msn.c:1626
+#: ../libpurple/protocols/msn/msn.c:1767
 msgid "Personal IM"
 msgstr "個人の IM"
 
-#: ../libpurple/protocols/msn/msn.c:1628
+#: ../libpurple/protocols/msn/msn.c:1769
 msgid "Anniversary"
 msgstr "記念日"
 
 #. Business
-#: ../libpurple/protocols/msn/msn.c:1644
+#: ../libpurple/protocols/msn/msn.c:1785
 msgid "Work"
 msgstr "職種"
 
-#: ../libpurple/protocols/msn/msn.c:1646
+#: ../libpurple/protocols/msn/msn.c:1787
 #: ../libpurple/protocols/silc/ops.c:1010
 #: ../libpurple/protocols/silc10/ops.c:1044
 msgid "Job Title"
 msgstr "肩書"
 
-#: ../libpurple/protocols/msn/msn.c:1647
-#: ../libpurple/protocols/oscar/oscar.c:3827
+#: ../libpurple/protocols/msn/msn.c:1788
+#: ../libpurple/protocols/oscar/oscar.c:3810
 msgid "Company"
 msgstr "勤務先"
 
-#: ../libpurple/protocols/msn/msn.c:1648
-#: ../libpurple/protocols/novell/novell.c:1480
+#: ../libpurple/protocols/msn/msn.c:1789
+#: ../libpurple/protocols/novell/novell.c:1482
 msgid "Department"
 msgstr "部署"
 
-#: ../libpurple/protocols/msn/msn.c:1649
+#: ../libpurple/protocols/msn/msn.c:1790
 msgid "Profession"
 msgstr "職業"
 
-#: ../libpurple/protocols/msn/msn.c:1650
+#: ../libpurple/protocols/msn/msn.c:1791
 msgid "Work Phone"
 msgstr "勤務先の電話番号"
 
-#: ../libpurple/protocols/msn/msn.c:1651
+#: ../libpurple/protocols/msn/msn.c:1792
 msgid "Work Phone 2"
 msgstr "勤務先の電話番号2"
 
-#: ../libpurple/protocols/msn/msn.c:1652
-#: ../libpurple/protocols/oscar/oscar.c:3819
+#: ../libpurple/protocols/msn/msn.c:1793
+#: ../libpurple/protocols/oscar/oscar.c:3802
 msgid "Work Address"
 msgstr "勤務先の住所"
 
-#: ../libpurple/protocols/msn/msn.c:1653
+#: ../libpurple/protocols/msn/msn.c:1794
 msgid "Work Mobile"
 msgstr "携帯 (仕事)"
 
-#: ../libpurple/protocols/msn/msn.c:1654
+#: ../libpurple/protocols/msn/msn.c:1795
 msgid "Work Pager"
 msgstr "Work Pager"
 
-#: ../libpurple/protocols/msn/msn.c:1655
+#: ../libpurple/protocols/msn/msn.c:1796
 msgid "Work Fax"
 msgstr "勤務先の FAX"
 
-#: ../libpurple/protocols/msn/msn.c:1656
+#: ../libpurple/protocols/msn/msn.c:1797
 msgid "Work E-Mail"
 msgstr "勤務先の E-メール"
 
-#: ../libpurple/protocols/msn/msn.c:1657
+#: ../libpurple/protocols/msn/msn.c:1798
 msgid "Work IM"
 msgstr "勤務先の IM"
 
-#: ../libpurple/protocols/msn/msn.c:1658
+#: ../libpurple/protocols/msn/msn.c:1799
 msgid "Start Date"
 msgstr "開始日"
 
-#: ../libpurple/protocols/msn/msn.c:1728 ../libpurple/protocols/msn/msn.c:1734
-#: ../libpurple/protocols/msn/msn.c:1741 ../libpurple/protocols/msn/msn.c:1748
+#: ../libpurple/protocols/msn/msn.c:1869 ../libpurple/protocols/msn/msn.c:1875
+#: ../libpurple/protocols/msn/msn.c:1882 ../libpurple/protocols/msn/msn.c:1889
 msgid "Favorite Things"
 msgstr "お気に入りのもの"
 
-#: ../libpurple/protocols/msn/msn.c:1793
+#: ../libpurple/protocols/msn/msn.c:1934
 msgid "Last Updated"
 msgstr "最終更新日"
 
-#: ../libpurple/protocols/msn/msn.c:1804
+#: ../libpurple/protocols/msn/msn.c:1945
 #: ../libpurple/protocols/qq/buddy_info.c:60
 #: ../libpurple/protocols/silc/ops.c:1026
 #: ../libpurple/protocols/silc10/ops.c:1060
 msgid "Homepage"
 msgstr "ホームページ"
 
-#: ../libpurple/protocols/msn/msn.c:1828
+#: ../libpurple/protocols/msn/msn.c:1969
 msgid "The user has not created a public profile."
 msgstr "このユーザはプロフィールを公開していません"
 
-#: ../libpurple/protocols/msn/msn.c:1829
+#: ../libpurple/protocols/msn/msn.c:1970
 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 "
@@ -5794,7 +7003,7 @@
 "ユーザが存在しないか、あるいはユーザは存在しますがプロフィールは公開していな"
 "いかのどちらかです。"
 
-#: ../libpurple/protocols/msn/msn.c:1833
+#: ../libpurple/protocols/msn/msn.c:1974
 msgid ""
 "Could not find any information in the user's profile. The user most likely "
 "does not exist."
@@ -5802,8 +7011,8 @@
 "ユーザのプロフィールから情報を取得できませんでした。そのユーザはおそらく存在"
 "していないと思われます。"
 
-#: ../libpurple/protocols/msn/msn.c:1841
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1216
+#: ../libpurple/protocols/msn/msn.c:1982
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1240
 msgid "Profile URL"
 msgstr "プロフィールの URL"
 
@@ -5817,96 +7026,106 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/msn/msn.c:2127 ../libpurple/protocols/msn/msn.c:2129
-msgid "MSN Protocol Plugin"
-msgstr "MSN プロトコルのプラグイン"
-
-#: ../libpurple/protocols/msn/msn.c:2163
+#: ../libpurple/protocols/msn/msn.c:2269 ../libpurple/protocols/msn/msn.c:2271
+#, fuzzy
+msgid "Windows Live Messenger Protocol Plugin"
+msgstr "Novell GroupWise メッセンジャー・プロトコルのプラグイン"
+
+#: ../libpurple/protocols/msn/msn.c:2306
 msgid "Use HTTP Method"
 msgstr "HTTP メソッドを利用する"
 
-#: ../libpurple/protocols/msn/msn.c:2168
+#: ../libpurple/protocols/msn/msn.c:2311
+#, fuzzy
+msgid "HTTP Method Server"
+msgstr "IPC のテスト用サーバ"
+
+#: ../libpurple/protocols/msn/msn.c:2316
 msgid "Show custom smileys"
 msgstr "独自のスマイリーを表示する"
 
-#: ../libpurple/protocols/msn/msn.c:2176
+#: ../libpurple/protocols/msn/msn.c:2324
 msgid "nudge: nudge a user to get their attention"
 msgstr "合図: ユーザに向けて警告音を鳴らす"
 
-#: ../libpurple/protocols/msn/nexus.c:146
-#: ../libpurple/protocols/msn/servconn.c:133
-#: ../libpurple/protocols/qq/qq_proxy.c:242
-#: ../libpurple/protocols/qq/qq_proxy.c:321
-#: ../libpurple/protocols/qq/qq_proxy.c:366
-#: ../libpurple/protocols/qq/qq_proxy.c:399
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:63
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:163
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:187
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:200
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:229
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:243
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:268
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:302
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:332
-#: ../libpurple/protocols/yahoo/yahoochat.c:1357
-#: ../libpurple/protocols/yahoo/yahoochat.c:1383
-msgid "Unable to connect"
-msgstr "接続できません"
-
-#: ../libpurple/protocols/msn/notification.c:178
+#: ../libpurple/protocols/msn/nexus.c:137
+msgid "Windows Live ID authentication:Unable to connect"
+msgstr ""
+
+#: ../libpurple/protocols/msn/nexus.c:275
+#, fuzzy
+msgid "Windows Live ID authentication Failed"
+msgstr "失敗: 認証に失敗しました"
+
+#: ../libpurple/protocols/msn/notification.c:191
 #, c-format
 msgid "%s is not a valid group."
 msgstr "%s は正しいグループではありません"
 
-#: ../libpurple/protocols/msn/notification.c:184
-#: ../libpurple/protocols/msn/notification.c:532
-#: ../libpurple/protocols/msn/session.c:330
+#: ../libpurple/protocols/msn/notification.c:197
+#: ../libpurple/protocols/msn/notification.c:938
+#: ../libpurple/protocols/msn/session.c:369
 msgid "Unknown error."
 msgstr "原因不明のエラーです"
 
-#: ../libpurple/protocols/msn/notification.c:187
+#: ../libpurple/protocols/msn/notification.c:200
 #, c-format
 msgid "%s on %s (%s)"
 msgstr "%2$s (%3$s) の %1$s"
 
-#: ../libpurple/protocols/msn/notification.c:498
+#: ../libpurple/protocols/msn/notification.c:518
+#, c-format
+msgid "%s just sent you a Nudge!"
+msgstr "%s さんが合図を送りたがっています!"
+
+#: ../libpurple/protocols/msn/notification.c:843
+#, fuzzy, c-format
+msgid "Unknown error (%d)"
+msgstr "原因不明のエラー"
+
+#: ../libpurple/protocols/msn/notification.c:844
+#: ../libpurple/protocols/sametime/sametime.c:4425
+msgid "Unable to add user"
+msgstr "ユーザを追加できません"
+
+#: ../libpurple/protocols/msn/notification.c:904
 #, c-format
 msgid "Unable to add user on %s (%s)"
 msgstr "%s (%s) のユーザを追加できません"
 
-#: ../libpurple/protocols/msn/notification.c:502
+#: ../libpurple/protocols/msn/notification.c:908
 #, c-format
 msgid "Unable to block user on %s (%s)"
 msgstr "%s (%s) のユーザをブロックできません"
 
-#: ../libpurple/protocols/msn/notification.c:506
+#: ../libpurple/protocols/msn/notification.c:912
 #, c-format
 msgid "Unable to permit user on %s (%s)"
 msgstr "%s (%s) のユーザを許可できません"
 
-#: ../libpurple/protocols/msn/notification.c:514
+#: ../libpurple/protocols/msn/notification.c:920
 #, c-format
 msgid "%s could not be added because your buddy list is full."
 msgstr "仲間リストが満杯なので、%s さんを追加できませんでした"
 
-#: ../libpurple/protocols/msn/notification.c:523
+#: ../libpurple/protocols/msn/notification.c:929
 #, c-format
 msgid "%s is not a valid passport account."
 msgstr "%s さんのパスポート・アカウントは正しくありません"
 
-#: ../libpurple/protocols/msn/notification.c:528
+#: ../libpurple/protocols/msn/notification.c:934
 msgid "Service Temporarily Unavailable."
 msgstr "サービスを一時的に利用できません"
 
-#: ../libpurple/protocols/msn/notification.c:851
+#: ../libpurple/protocols/msn/notification.c:1272
 msgid "Unable to rename group"
 msgstr "グループ名を変更できません"
 
-#: ../libpurple/protocols/msn/notification.c:906
+#: ../libpurple/protocols/msn/notification.c:1327
 msgid "Unable to delete group"
 msgstr "グループを削除できません"
 
-#: ../libpurple/protocols/msn/notification.c:1325
+#: ../libpurple/protocols/msn/notification.c:1943
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -5933,15 +7152,39 @@
 "\n"
 "メンテナンスが完了したら、またサイン・インできるようになります。"
 
+#: ../libpurple/protocols/msn/oim.c:141
+#, fuzzy
+msgid "Unable to connect to OIM server"
+msgstr "サーバへ接続できません"
+
 #: ../libpurple/protocols/msn/servconn.c:135
-msgid "Writing error"
-msgstr "書き込み時にエラー"
+#: ../libpurple/protocols/qq/qq_proxy.c:242
+#: ../libpurple/protocols/qq/qq_proxy.c:321
+#: ../libpurple/protocols/qq/qq_proxy.c:366
+#: ../libpurple/protocols/qq/qq_proxy.c:399
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:63
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:163
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:187
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:200
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:229
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:243
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:268
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:302
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:332
+#: ../libpurple/protocols/yahoo/yahoochat.c:1416
+#: ../libpurple/protocols/yahoo/yahoochat.c:1442
+msgid "Unable to connect"
+msgstr "接続できません"
 
 #: ../libpurple/protocols/msn/servconn.c:137
+msgid "Writing error"
+msgstr "書き込み時にエラー"
+
+#: ../libpurple/protocols/msn/servconn.c:139
 msgid "Reading error"
 msgstr "読み込み時にエラー"
 
-#: ../libpurple/protocols/msn/servconn.c:144
+#: ../libpurple/protocols/msn/servconn.c:146
 #, c-format
 msgid ""
 "Connection error from %s server:\n"
@@ -5950,60 +7193,60 @@
 "サーバ %s で接続エラー:\n"
 "%s"
 
-#: ../libpurple/protocols/msn/session.c:299
+#: ../libpurple/protocols/msn/session.c:336
 msgid "Our protocol is not supported by the server."
 msgstr "サーバはこのプロトコルをサポートしていません"
 
-#: ../libpurple/protocols/msn/session.c:303
+#: ../libpurple/protocols/msn/session.c:340
 msgid "Error parsing HTTP."
 msgstr "HTTP を解析する際にエラーが発生しました"
 
-#: ../libpurple/protocols/msn/session.c:307
-#: ../libpurple/protocols/oscar/oscar.c:3480
-#: ../libpurple/protocols/yahoo/yahoo.c:202
+#: ../libpurple/protocols/msn/session.c:344
+#: ../libpurple/protocols/oscar/flap_connection.c:384
+#: ../libpurple/protocols/yahoo/yahoo.c:207
 msgid "You have signed on from another location."
 msgstr "別の場所からサイン・インしています"
 
-#: ../libpurple/protocols/msn/session.c:310
+#: ../libpurple/protocols/msn/session.c:349
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr ""
 "MSN サーバが一時的に利用不可になっています。時間をあけて後で試してみて下さ"
 "い。"
 
-#: ../libpurple/protocols/msn/session.c:315
+#: ../libpurple/protocols/msn/session.c:354
 msgid "The MSN servers are going down temporarily."
 msgstr "MSN サーバが一時的にダウンしています"
 
-#: ../libpurple/protocols/msn/session.c:320
+#: ../libpurple/protocols/msn/session.c:359
 #, c-format
 msgid "Unable to authenticate: %s"
 msgstr "認証できません: %s"
 
-#: ../libpurple/protocols/msn/session.c:325
+#: ../libpurple/protocols/msn/session.c:364
 msgid ""
 "Your MSN buddy list is temporarily unavailable. Please wait and try again."
 msgstr ""
 "お使いの MSN 仲間リストが一時的に利用不可になっています。時間をあけて後で試し"
 "てみて下さい。"
 
-#: ../libpurple/protocols/msn/session.c:346
-#: ../libpurple/protocols/msn/session.c:348
+#: ../libpurple/protocols/msn/session.c:385
+#: ../libpurple/protocols/msn/session.c:387
 msgid "Handshaking"
 msgstr "通信を接続しています"
 
-#: ../libpurple/protocols/msn/session.c:349
+#: ../libpurple/protocols/msn/session.c:388
 msgid "Starting authentication"
 msgstr "認証を開始しています"
 
-#: ../libpurple/protocols/msn/session.c:350
+#: ../libpurple/protocols/msn/session.c:389
 msgid "Getting cookie"
 msgstr "クッキーを取得しています"
 
-#: ../libpurple/protocols/msn/session.c:352
+#: ../libpurple/protocols/msn/session.c:391
 msgid "Sending cookie"
 msgstr "クッキーを送信しています"
 
-#: ../libpurple/protocols/msn/session.c:353
+#: ../libpurple/protocols/msn/session.c:392
 msgid "Retrieving buddy list"
 msgstr "仲間リストを受信しています"
 
@@ -6040,8 +7283,9 @@
 msgstr "送信するタイミングが早過ぎたので、メッセージを送信できませんでした:"
 
 #: ../libpurple/protocols/msn/switchboard.c:424
-msgid ""
-"Message could not be sent because we wer unable to establish a session with "
+#, fuzzy
+msgid ""
+"Message could not be sent because we were unable to establish a session with "
 "the server. This is likely a server problem, try again in a few minutes:"
 msgstr ""
 "サーバとの接続を確立できないのでメッセージを送信できませんでした (これはおそ"
@@ -6056,30 +7300,442 @@
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr "不明なエラーの発生により、メッセージは送信されませんでした:"
 
-#: ../libpurple/protocols/msn/switchboard.c:963
-#, c-format
-msgid "%s just sent you a Nudge!"
-msgstr "%s さんが合図を送りたがっています!"
-
-#: ../libpurple/protocols/msn/userlist.c:250
+#: ../libpurple/protocols/msn/userlist.c:243
 #, c-format
 msgid "%s has added you to his or her buddy list."
 msgstr "%s さんはあなたを仲間リストに追加しています"
 
-#: ../libpurple/protocols/msn/userlist.c:319
+#: ../libpurple/protocols/msn/userlist.c:312
 #, c-format
 msgid "%s has removed you from his or her buddy list."
 msgstr "%s さんはあなたを仲間リストから削除しています"
 
-#: ../libpurple/protocols/msn/userlist.c:641
+#. only notify the user about problems adding to the friends list
+#. * maybe we should do something else for other lists, but it probably
+#. * won't cause too many problems if we just ignore it
+#: ../libpurple/protocols/msn/userlist.c:693
 #, c-format
 msgid "Unable to add \"%s\"."
 msgstr "\"%s\" さんを追加できません"
 
-#: ../libpurple/protocols/msn/userlist.c:643
+#: ../libpurple/protocols/msn/userlist.c:696
 msgid "The screen name specified is invalid."
 msgstr "指定したスクリーン名が間違っています"
 
+#: ../libpurple/protocols/myspace/myspace.c:111
+#, fuzzy
+msgid "Missing Cipher"
+msgstr "暗号"
+
+#: ../libpurple/protocols/myspace/myspace.c:112
+msgid "The RC4 cipher could not be found"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:113
+msgid ""
+"Upgrade to a libpurple with RC4 support (>= 2.0.1). MySpaceIM plugin will "
+"not be loaded."
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:286
+#, c-format
+msgid ""
+"Sorry, passwords over %d characters in length (yours is %d) are not "
+"supported by MySpace."
+msgstr ""
+
+#. Notify an error message also, because this is important!
+#: ../libpurple/protocols/myspace/myspace.c:292
+#: ../libpurple/protocols/myspace/myspace.c:1798
+msgid "MySpaceIM Error"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:349
+#, fuzzy
+msgid "Reading challenge"
+msgstr "読み込み時にエラー"
+
+#: ../libpurple/protocols/myspace/myspace.c:355
+#, fuzzy
+msgid "Unexpected challenge length from server"
+msgstr "サーバからの不正な challenge です"
+
+#: ../libpurple/protocols/myspace/myspace.c:359
+#, fuzzy
+msgid "Logging in"
+msgstr "ログの記録"
+
+#: ../libpurple/protocols/myspace/myspace.c:1278
+#, c-format
+msgid "Connection to server lost (no data received within %d seconds)"
+msgstr ""
+
+#. Can't write _()'d strings in array initializers. Workaround.
+#: ../libpurple/protocols/myspace/myspace.c:1321
+#, fuzzy
+msgid "New mail messages"
+msgstr "メッセージを送信する"
+
+#: ../libpurple/protocols/myspace/myspace.c:1322
+msgid "New blog comments"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:1323
+msgid "New profile comments"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:1324
+msgid "New friend requests!"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:1325
+msgid "New picture comments"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:1355
+msgid "MySpace"
+msgstr ""
+
+#. The session is now set up, ready to be connected. This emits the
+#. * signedOn signal, so clients can now do anything with msimprpl, and
+#. * we're ready for it (session key, userid, username all setup).
+#: ../libpurple/protocols/myspace/myspace.c:1538
+#: ../libpurple/protocols/sametime/sametime.c:1544
+msgid "Connected"
+msgstr "接続しました"
+
+#: ../libpurple/protocols/myspace/myspace.c:1549
+#: ../libpurple/protocols/myspace/myspace.c:1551
+#, fuzzy
+msgid "No username set"
+msgstr "名前なし"
+
+#: ../libpurple/protocols/myspace/myspace.c:1550
+msgid ""
+"Please go to http://editprofile.myspace.com/index.cfm?fuseaction=profile."
+"username and choose a username and try to login again."
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:1777
+#, fuzzy, c-format
+msgid "Protocol error, code %d: %s"
+msgstr "プロセスがエラー・コード %d を返してきました"
+
+#: ../libpurple/protocols/myspace/myspace.c:1970
+#: ../libpurple/protocols/myspace/myspace.c:2004
+#, fuzzy
+msgid "Failed to add buddy"
+msgstr "チャットの仲間に参加できません"
+
+#: ../libpurple/protocols/myspace/myspace.c:1970
+#, fuzzy
+msgid "'addbuddy' command failed."
+msgstr "仲間リストのインポート..."
+
+#: ../libpurple/protocols/myspace/myspace.c:2004
+#: ../libpurple/protocols/myspace/myspace.c:2245
+#, fuzzy
+msgid "persist command failed"
+msgstr "スイッチボードに失敗しました"
+
+#: ../libpurple/protocols/myspace/myspace.c:2113
+#, c-format
+msgid "No such user: %s"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:2114
+#, fuzzy
+msgid "User lookup"
+msgstr "ユーザの部屋"
+
+#: ../libpurple/protocols/myspace/myspace.c:2226
+#: ../libpurple/protocols/myspace/myspace.c:2245
+#: ../libpurple/protocols/myspace/myspace.c:2267
+#, fuzzy
+msgid "Failed to remove buddy"
+msgstr "チャットの仲間に参加できません"
+
+#: ../libpurple/protocols/myspace/myspace.c:2226
+msgid "'delbuddy' command failed"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:2267
+#, fuzzy
+msgid "blocklist command failed"
+msgstr "スイッチボードに失敗しました"
+
+#: ../libpurple/protocols/myspace/myspace.c:2313
+#, fuzzy
+msgid "Invalid input condition"
+msgstr "接続の最終調整中"
+
+#. TODO: g_realloc like msn, yahoo, irc, jabber?
+#: ../libpurple/protocols/myspace/myspace.c:2331
+#: ../libpurple/protocols/myspace/myspace.c:2362
+#, fuzzy
+msgid "Read buffer full"
+msgstr "キューが一杯です"
+
+#: ../libpurple/protocols/myspace/myspace.c:2400
+#, fuzzy
+msgid "Unparseable message"
+msgstr "メッセージを解読できません"
+
+#: ../libpurple/protocols/myspace/myspace.c:2469
+#, fuzzy, c-format
+msgid "Couldn't connect to host: %s (%d)"
+msgstr "ホストへ接続できませんでした"
+
+#: ../libpurple/protocols/myspace/myspace.c:2640
+#, fuzzy
+msgid "IM Friends"
+msgstr "IM ウィンドウ(_I)"
+
+#: ../libpurple/protocols/myspace/myspace.c:2739
+#, c-format
+msgid ""
+"%d buddies were added or updated from the server (including buddies already "
+"on the server-side list)"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:2740
+#, fuzzy
+msgid "Add contacts from server"
+msgstr "サーバからの応答が不正です。"
+
+#: ../libpurple/protocols/myspace/myspace.c:2792
+#: ../libpurple/protocols/myspace/myspace.c:2857
+msgid "Add friends from MySpace.com"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:2793
+#, fuzzy
+msgid "Importing friends failed"
+msgstr "プラグインの読み込みに失敗しました"
+
+#. TODO: find out how
+#: ../libpurple/protocols/myspace/myspace.c:2849
+#, fuzzy
+msgid "Find people..."
+msgstr "仲間の検索..."
+
+#: ../libpurple/protocols/myspace/myspace.c:2852
+#, fuzzy
+msgid "Change IM name..."
+msgstr "パスワードの変更..."
+
+#: ../libpurple/protocols/myspace/myspace.c:3154
+msgid "myim URL handler"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:3155
+msgid "No suitable MySpaceIM account could be found to open this myim URL."
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:3156
+msgid "Enable the proper MySpaceIM account and try again."
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:3279
+msgid "Show display name in status text"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:3282
+msgid "Show headline in status text"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:3287
+#, fuzzy
+msgid "Send emoticons"
+msgstr "サウンドのオプション"
+
+#: ../libpurple/protocols/myspace/myspace.c:3292
+msgid "Screen resolution (dots per inch)"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:3295
+#, fuzzy
+msgid "Base font size (points)"
+msgstr "フォントのサイズを大きくします"
+
+#: ../libpurple/protocols/myspace/user.c:95
+#: ../libpurple/protocols/zephyr/zephyr.c:786
+#: ../libpurple/protocols/zephyr/zephyr.c:1204
+msgid "User"
+msgstr "ユーザ"
+
+#. TODO: link to username, if available
+#: ../libpurple/protocols/myspace/user.c:102
+#: ../libpurple/protocols/oscar/oscar.c:2960
+msgid "Profile"
+msgstr "プロフィール"
+
+#: ../libpurple/protocols/myspace/user.c:124
+#, fuzzy
+msgid "Headline"
+msgstr "ハンドル(_H):"
+
+#: ../libpurple/protocols/myspace/user.c:129
+#, fuzzy
+msgid "Song"
+msgstr "サウンド"
+
+#: ../libpurple/protocols/myspace/user.c:134
+msgid "Total Friends"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/user.c:145
+#: ../libpurple/protocols/myspace/user.c:148
+#: ../libpurple/protocols/myspace/user.c:151
+#, fuzzy
+msgid "Client Version"
+msgstr "会話ウィンドウを閉じます"
+
+#. TODO: icons for each zap
+#: ../libpurple/protocols/myspace/zap.c:44
+#: ../libpurple/protocols/myspace/zap.c:177
+msgid "Zap"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/zap.c:44
+#, fuzzy, c-format
+msgid "%s has zapped you!"
+msgstr "%s さんがあなた [%s] を追加しました"
+
+#: ../libpurple/protocols/myspace/zap.c:44
+#, c-format
+msgid "Zapping %s..."
+msgstr ""
+
+#: ../libpurple/protocols/myspace/zap.c:45
+msgid "Whack"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/zap.c:45
+#, fuzzy, c-format
+msgid "%s has whacked you!"
+msgstr "%s さんがあなた [%s] を追加しました"
+
+#: ../libpurple/protocols/myspace/zap.c:45
+#, c-format
+msgid "Whacking %s..."
+msgstr ""
+
+#: ../libpurple/protocols/myspace/zap.c:46
+#, fuzzy
+msgid "Torch"
+msgstr "トピック"
+
+#: ../libpurple/protocols/myspace/zap.c:46
+#, fuzzy, c-format
+msgid "%s has torched you!"
+msgstr "ユーザはあなたをブロックしています"
+
+#: ../libpurple/protocols/myspace/zap.c:46
+#, c-format
+msgid "Torching %s..."
+msgstr ""
+
+#: ../libpurple/protocols/myspace/zap.c:47
+msgid "Smooch"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/zap.c:47
+#, fuzzy, c-format
+msgid "%s has smooched you!"
+msgstr "%s さんがサイン・インしました。"
+
+#: ../libpurple/protocols/myspace/zap.c:47
+#, c-format
+msgid "Smooching %s..."
+msgstr ""
+
+#: ../libpurple/protocols/myspace/zap.c:48
+msgid "Hug"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/zap.c:48
+#, fuzzy, c-format
+msgid "%s has hugged you!"
+msgstr "%s さんがサイン・インしました。"
+
+#: ../libpurple/protocols/myspace/zap.c:48
+#, c-format
+msgid "Hugging %s..."
+msgstr ""
+
+#: ../libpurple/protocols/myspace/zap.c:49
+#, fuzzy
+msgid "Slap"
+msgstr "眠いよ"
+
+#: ../libpurple/protocols/myspace/zap.c:49
+#, fuzzy, c-format
+msgid "%s has slapped you!"
+msgstr "%s さんがあなた [%s] を追加しました"
+
+#: ../libpurple/protocols/myspace/zap.c:49
+#, c-format
+msgid "Slapping %s..."
+msgstr ""
+
+#: ../libpurple/protocols/myspace/zap.c:50
+#, fuzzy
+msgid "Goose"
+msgstr "逝ってます"
+
+#: ../libpurple/protocols/myspace/zap.c:50
+#, fuzzy, c-format
+msgid "%s has goosed you!"
+msgstr "%s さんが離席しました。"
+
+#: ../libpurple/protocols/myspace/zap.c:50
+#, fuzzy, c-format
+msgid "Goosing %s..."
+msgstr "%s の検索中"
+
+#: ../libpurple/protocols/myspace/zap.c:51
+msgid "High-five"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/zap.c:51
+#, fuzzy, c-format
+msgid "%s has high-fived you!"
+msgstr "%s さんがサイン・インしました。"
+
+#: ../libpurple/protocols/myspace/zap.c:51
+#, c-format
+msgid "High-fiving %s..."
+msgstr ""
+
+#: ../libpurple/protocols/myspace/zap.c:52
+msgid "Punk"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/zap.c:52
+#, fuzzy, c-format
+msgid "%s has punk'd you!"
+msgstr "%s さんがサイン・インしました。"
+
+#: ../libpurple/protocols/myspace/zap.c:52
+#, c-format
+msgid "Punking %s..."
+msgstr ""
+
+#: ../libpurple/protocols/myspace/zap.c:53
+msgid "Raspberry"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/zap.c:53
+#, fuzzy, c-format
+msgid "%s has raspberried you!"
+msgstr "%s さんがサイン・インしました。"
+
+#: ../libpurple/protocols/myspace/zap.c:53
+#, c-format
+msgid "Raspberrying %s..."
+msgstr ""
+
 #: ../libpurple/protocols/novell/nmuser.c:1864
 msgid "Required parameters not passed in"
 msgstr "必要なパラメータが引き渡されていません"
@@ -6212,40 +7868,40 @@
 msgid "Login failed (%s)."
 msgstr "ログインに失敗しました (%s)。"
 
-#: ../libpurple/protocols/novell/novell.c:247
+#: ../libpurple/protocols/novell/novell.c:249
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
 msgstr ""
 "メッセージを送信できません。ユーザの詳細情報を取得できませんでした (%s)。"
 
-#: ../libpurple/protocols/novell/novell.c:396
+#: ../libpurple/protocols/novell/novell.c:398
 #, c-format
 msgid "Unable to add %s to your buddy list (%s)."
 msgstr "%s さんを仲間リスト (%s) に追加できません"
 
 #. TODO: Improve this! message to who or for what conference?
-#: ../libpurple/protocols/novell/novell.c:422
+#: ../libpurple/protocols/novell/novell.c:424
 #, c-format
 msgid "Unable to send message (%s)."
 msgstr "メッセージ (%s) を送信できません"
 
-#: ../libpurple/protocols/novell/novell.c:493
-#: ../libpurple/protocols/novell/novell.c:985
+#: ../libpurple/protocols/novell/novell.c:495
+#: ../libpurple/protocols/novell/novell.c:987
 #, c-format
 msgid "Unable to invite user (%s)."
 msgstr "ユーザ (%s) を招待できません"
 
-#: ../libpurple/protocols/novell/novell.c:532
+#: ../libpurple/protocols/novell/novell.c:534
 #, c-format
 msgid "Unable to send message to %s. Could not create the conference (%s)."
 msgstr "%s へメッセージを送信できません。会議 (%s) を作成できませんでした。"
 
-#: ../libpurple/protocols/novell/novell.c:537
+#: ../libpurple/protocols/novell/novell.c:539
 #, c-format
 msgid "Unable to send message. Could not create the conference (%s)."
 msgstr "メッセージを送信できません。会議 (%s) を作成できませんでした。"
 
-#: ../libpurple/protocols/novell/novell.c:584
+#: ../libpurple/protocols/novell/novell.c:586
 #, c-format
 msgid ""
 "Unable to move user %s to folder %s in the server side list. Error while "
@@ -6254,7 +7910,7 @@
 "ユーザ %s をサーバ・サイド・リストにあるフォルダ %s へ移動できません。フォル"
 "ダの作成エラーです (%s)。"
 
-#: ../libpurple/protocols/novell/novell.c:632
+#: ../libpurple/protocols/novell/novell.c:634
 #, c-format
 msgid ""
 "Unable to add %s to your buddy list. Error creating folder in server side "
@@ -6263,61 +7919,61 @@
 "%s を仲間リストへ追加できません。サーバ・サイド・リスト (%s) のフォルダ作成エ"
 "ラーです。"
 
-#: ../libpurple/protocols/novell/novell.c:705
+#: ../libpurple/protocols/novell/novell.c:707
 #, c-format
 msgid "Could not get details for user %s (%s)."
 msgstr "ユーザの %s (%s) さんの詳細情報を取得できませんでした"
 
-#: ../libpurple/protocols/novell/novell.c:751
-#: ../libpurple/protocols/novell/novell.c:897
+#: ../libpurple/protocols/novell/novell.c:753
+#: ../libpurple/protocols/novell/novell.c:899
 #, c-format
 msgid "Unable to add user to privacy list (%s)."
 msgstr "ユーザを仲間リスト (%s) へ追加できません"
 
-#: ../libpurple/protocols/novell/novell.c:798
+#: ../libpurple/protocols/novell/novell.c:800
 #, c-format
 msgid "Unable to add %s to deny list (%s)."
 msgstr "%s さんを拒否リスト (%s) へ追加できません"
 
-#: ../libpurple/protocols/novell/novell.c:851
+#: ../libpurple/protocols/novell/novell.c:853
 #, c-format
 msgid "Unable to add %s to permit list (%s)."
 msgstr "%s さんを許可リスト (%s) へ追加できません"
 
-#: ../libpurple/protocols/novell/novell.c:919
+#: ../libpurple/protocols/novell/novell.c:921
 #, c-format
 msgid "Unable to remove %s from privacy list (%s)."
 msgstr "%s さんをプライバシー・リスト (%s) から削除できません"
 
-#: ../libpurple/protocols/novell/novell.c:942
-#: ../libpurple/protocols/novell/novell.c:1647
+#: ../libpurple/protocols/novell/novell.c:944
+#: ../libpurple/protocols/novell/novell.c:1649
 #, c-format
 msgid "Unable to change server side privacy settings (%s)."
 msgstr "サーバ・サイド・プライバシー設定 (%s) を変更できません"
 
-#: ../libpurple/protocols/novell/novell.c:1012
+#: ../libpurple/protocols/novell/novell.c:1014
 #, c-format
 msgid "Unable to create conference (%s)."
 msgstr "会議 (%s) を生成できません"
 
-#: ../libpurple/protocols/novell/novell.c:1121
-#: ../libpurple/protocols/novell/novell.c:1692
+#: ../libpurple/protocols/novell/novell.c:1123
+#: ../libpurple/protocols/novell/novell.c:1694
 msgid "Error communicating with server. Closing connection."
 msgstr "サーバとの通信中にエラーです。接続を閉じました。"
 
-#: ../libpurple/protocols/novell/novell.c:1476
+#: ../libpurple/protocols/novell/novell.c:1478
 msgid "Telephone Number"
 msgstr "電話番号"
 
-#: ../libpurple/protocols/novell/novell.c:1482
+#: ../libpurple/protocols/novell/novell.c:1484
 msgid "Personal Title"
 msgstr "個人的な肩書き"
 
-#: ../libpurple/protocols/novell/novell.c:1486
+#: ../libpurple/protocols/novell/novell.c:1488
 msgid "Mailstop"
 msgstr "メールストップ"
 
-#: ../libpurple/protocols/novell/novell.c:1502
+#: ../libpurple/protocols/novell/novell.c:1504
 #: ../libpurple/protocols/sametime/sametime.c:4122
 msgid "User ID"
 msgstr "ユーザ ID"
@@ -6328,41 +7984,41 @@
 #. purple_notify_user_info_add_pair(user_info, tag, value);
 #. }
 #.
-#: ../libpurple/protocols/novell/novell.c:1515
+#: ../libpurple/protocols/novell/novell.c:1517
 msgid "Full name"
 msgstr "氏名"
 
-#: ../libpurple/protocols/novell/novell.c:1637
+#: ../libpurple/protocols/novell/novell.c:1639
 #, c-format
 msgid "GroupWise Conference %d"
 msgstr "GroupWise 会議 %d"
 
-#: ../libpurple/protocols/novell/novell.c:1668
+#: ../libpurple/protocols/novell/novell.c:1670
 msgid "Unable to make SSL connection to server."
 msgstr "サーバへ SSL 接続できません"
 
-#: ../libpurple/protocols/novell/novell.c:1720
+#: ../libpurple/protocols/novell/novell.c:1722
 msgid "Authenticating..."
 msgstr "認証中..."
 
-#: ../libpurple/protocols/novell/novell.c:1732
+#: ../libpurple/protocols/novell/novell.c:1734
 msgid "Unable to connect to server."
 msgstr "サーバへ接続できません"
 
-#: ../libpurple/protocols/novell/novell.c:1735
+#: ../libpurple/protocols/novell/novell.c:1737
 msgid "Waiting for response..."
 msgstr "応答待ちです..."
 
-#: ../libpurple/protocols/novell/novell.c:1870
+#: ../libpurple/protocols/novell/novell.c:1872
 #, c-format
 msgid "%s has been invited to this conversation."
 msgstr "%s さんが会話ウインドウへ招待されています"
 
-#: ../libpurple/protocols/novell/novell.c:1898
+#: ../libpurple/protocols/novell/novell.c:1900
 msgid "Invitation to Conversation"
 msgstr "会議の招集"
 
-#: ../libpurple/protocols/novell/novell.c:1899
+#: ../libpurple/protocols/novell/novell.c:1901
 #, c-format
 msgid ""
 "Invitation from: %s\n"
@@ -6373,18 +8029,17 @@
 "\n"
 "送信先: %s"
 
-#: ../libpurple/protocols/novell/novell.c:1901
+#: ../libpurple/protocols/novell/novell.c:1903
 msgid "Would you like to join the conversation?"
 msgstr "会議に出席しますか?"
 
-#. we don't want to reconnect in this case
-#: ../libpurple/protocols/novell/novell.c:2012
+#: ../libpurple/protocols/novell/novell.c:2017
 msgid "You have been logged out because you logged in at another workstation."
 msgstr ""
 "別のワークステーションからログインしているので、強制的にログアウトされまし"
 "た。"
 
-#: ../libpurple/protocols/novell/novell.c:2069
+#: ../libpurple/protocols/novell/novell.c:2074
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
@@ -6394,17 +8049,17 @@
 #. *  purple_request_fields(gc, _("Server Address"),...);
 #.
 #. ...but for now just error out with a nice message.
-#: ../libpurple/protocols/novell/novell.c:2167
+#: ../libpurple/protocols/novell/novell.c:2172
 msgid ""
 "Unable to connect to server. Please enter the address of the server you wish "
 "to connect to."
 msgstr "サーバへ接続できません。接続するサーバのアドレスを入力して下さい。"
 
-#: ../libpurple/protocols/novell/novell.c:2195
+#: ../libpurple/protocols/novell/novell.c:2200
 msgid "Error. SSL support is not installed."
 msgstr "エラーです。SSL サポートがインストールされていません。"
 
-#: ../libpurple/protocols/novell/novell.c:2504
+#: ../libpurple/protocols/novell/novell.c:2509
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "この会議は閉会しています。メッセージを送信することはできません。"
 
@@ -6418,33 +8073,33 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/novell/novell.c:3518
-#: ../libpurple/protocols/novell/novell.c:3520
+#: ../libpurple/protocols/novell/novell.c:3523
+#: ../libpurple/protocols/novell/novell.c:3525
 msgid "Novell GroupWise Messenger Protocol Plugin"
 msgstr "Novell GroupWise メッセンジャー・プロトコルのプラグイン"
 
-#: ../libpurple/protocols/novell/novell.c:3545
+#: ../libpurple/protocols/novell/novell.c:3550
 msgid "Server address"
 msgstr "サーバのアドレス"
 
-#: ../libpurple/protocols/novell/novell.c:3549
+#: ../libpurple/protocols/novell/novell.c:3554
 msgid "Server port"
 msgstr "サーバのポート"
 
-#: ../libpurple/protocols/oscar/flap_connection.c:379
-#: ../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:1099 ../libpurple/proxy.c:1208
-#: ../libpurple/proxy.c:1308 ../libpurple/proxy.c:1436
+#: ../libpurple/protocols/oscar/flap_connection.c:389
+#: ../libpurple/protocols/yahoo/yahoo.c:2468
+#: ../libpurple/protocols/yahoo/yahoo.c:2635
+#: ../libpurple/protocols/yahoo/ycht.c:481 ../libpurple/proxy.c:581
+#: ../libpurple/proxy.c:1116 ../libpurple/proxy.c:1225
+#: ../libpurple/proxy.c:1325 ../libpurple/proxy.c:1453
 msgid "Server closed the connection."
 msgstr "サーバが接続を閉じました"
 
-#: ../libpurple/protocols/oscar/flap_connection.c:381
-#: ../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
+#: ../libpurple/protocols/oscar/flap_connection.c:391
+#: ../libpurple/protocols/yahoo/yahoo.c:2462
+#: ../libpurple/protocols/yahoo/yahoo.c:2629 ../libpurple/proxy.c:593
+#: ../libpurple/proxy.c:1128 ../libpurple/proxy.c:1237
+#: ../libpurple/proxy.c:1337 ../libpurple/proxy.c:1465
 #, c-format
 msgid ""
 "Lost connection with server:\n"
@@ -6453,10 +8108,10 @@
 "サーバとの接続を失いました:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/flap_connection.c:384
-#: ../libpurple/proxy.c:1128 ../libpurple/proxy.c:1233
-#: ../libpurple/proxy.c:1332 ../libpurple/proxy.c:1404
-#: ../libpurple/proxy.c:1461
+#: ../libpurple/protocols/oscar/flap_connection.c:394
+#: ../libpurple/proxy.c:1145 ../libpurple/proxy.c:1250
+#: ../libpurple/proxy.c:1349 ../libpurple/proxy.c:1421
+#: ../libpurple/proxy.c:1478
 msgid "Received invalid data on connection with server."
 msgstr "サーバと接続する際に不正なデータを受け取りました"
 
@@ -6491,7 +8146,7 @@
 msgstr "ICQ プロトコル・プラグイン"
 
 #: ../libpurple/protocols/oscar/libicq.c:147
-#: ../libpurple/protocols/yahoo/yahoo.c:4111
+#: ../libpurple/protocols/yahoo/yahoo.c:4409
 #: ../libpurple/protocols/zephyr/zephyr.c:2997
 msgid "Encoding"
 msgstr "エンコーディング"
@@ -6521,104 +8176,104 @@
 msgid "Direct IM established"
 msgstr "Direct IM を確立しました"
 
-#: ../libpurple/protocols/oscar/oft.c:657
+#: ../libpurple/protocols/oscar/oft.c:656
 #, c-format
 msgid "File %s is %s, which is larger than the maximum size of %s."
 msgstr "ファイル %s は %s です (%s の最大サイズを超えています)"
 
-#: ../libpurple/protocols/oscar/oscar.c:115
+#: ../libpurple/protocols/oscar/oscar.c:116
 msgid "Invalid error"
 msgstr "不正なエラー"
 
-#: ../libpurple/protocols/oscar/oscar.c:116
+#: ../libpurple/protocols/oscar/oscar.c:117
 msgid "Invalid SNAC"
 msgstr "不正な SNAC"
 
-#: ../libpurple/protocols/oscar/oscar.c:117
+#: ../libpurple/protocols/oscar/oscar.c:118
 msgid "Rate to host"
 msgstr "ホストの速度"
 
-#: ../libpurple/protocols/oscar/oscar.c:118
+#: ../libpurple/protocols/oscar/oscar.c:119
 msgid "Rate to client"
 msgstr "クライアントの速度"
 
-#: ../libpurple/protocols/oscar/oscar.c:120
+#: ../libpurple/protocols/oscar/oscar.c:121
 msgid "Service unavailable"
 msgstr "サービスが利用できません"
 
-#: ../libpurple/protocols/oscar/oscar.c:121
+#: ../libpurple/protocols/oscar/oscar.c:122
 msgid "Service not defined"
 msgstr "サービスが定義されていません"
 
-#: ../libpurple/protocols/oscar/oscar.c:122
+#: ../libpurple/protocols/oscar/oscar.c:123
 msgid "Obsolete SNAC"
 msgstr "旧式の SNAC"
 
-#: ../libpurple/protocols/oscar/oscar.c:123
+#: ../libpurple/protocols/oscar/oscar.c:124
 msgid "Not supported by host"
 msgstr "ホストではサポートしていません"
 
-#: ../libpurple/protocols/oscar/oscar.c:124
+#: ../libpurple/protocols/oscar/oscar.c:125
 msgid "Not supported by client"
 msgstr "クライアントではサポートしていません"
 
-#: ../libpurple/protocols/oscar/oscar.c:125
+#: ../libpurple/protocols/oscar/oscar.c:126
 msgid "Refused by client"
 msgstr "クライアントに拒否されました"
 
-#: ../libpurple/protocols/oscar/oscar.c:126
+#: ../libpurple/protocols/oscar/oscar.c:127
 msgid "Reply too big"
 msgstr "返信が大きすぎます"
 
-#: ../libpurple/protocols/oscar/oscar.c:127
+#: ../libpurple/protocols/oscar/oscar.c:128
 msgid "Responses lost"
 msgstr "応答がありません"
 
-#: ../libpurple/protocols/oscar/oscar.c:128
+#: ../libpurple/protocols/oscar/oscar.c:129
 msgid "Request denied"
 msgstr "リクエストが拒否されました"
 
-#: ../libpurple/protocols/oscar/oscar.c:129
+#: ../libpurple/protocols/oscar/oscar.c:130
 msgid "Busted SNAC payload"
 msgstr "SNAC 格納エリアが壊れました"
 
-#: ../libpurple/protocols/oscar/oscar.c:130
+#: ../libpurple/protocols/oscar/oscar.c:131
 msgid "Insufficient rights"
 msgstr "不十分な要求です"
 
-#: ../libpurple/protocols/oscar/oscar.c:131
+#: ../libpurple/protocols/oscar/oscar.c:132
 msgid "In local permit/deny"
 msgstr "局所的な許可/不許可"
 
-#: ../libpurple/protocols/oscar/oscar.c:132
+#: ../libpurple/protocols/oscar/oscar.c:133
 msgid "Too evil (sender)"
 msgstr "とても悪い (送信者)"
 
-#: ../libpurple/protocols/oscar/oscar.c:133
+#: ../libpurple/protocols/oscar/oscar.c:134
 msgid "Too evil (receiver)"
 msgstr "とても悪い (受信者)"
 
-#: ../libpurple/protocols/oscar/oscar.c:134
+#: ../libpurple/protocols/oscar/oscar.c:135
 msgid "User temporarily unavailable"
 msgstr "ユーザが一時的に無効です"
 
-#: ../libpurple/protocols/oscar/oscar.c:135
+#: ../libpurple/protocols/oscar/oscar.c:136
 msgid "No match"
 msgstr "マッチしません"
 
-#: ../libpurple/protocols/oscar/oscar.c:136
+#: ../libpurple/protocols/oscar/oscar.c:137
 msgid "List overflow"
 msgstr "リスト溢れ"
 
-#: ../libpurple/protocols/oscar/oscar.c:137
+#: ../libpurple/protocols/oscar/oscar.c:138
 msgid "Request ambiguous"
 msgstr "要求が曖昧です"
 
-#: ../libpurple/protocols/oscar/oscar.c:138
+#: ../libpurple/protocols/oscar/oscar.c:139
 msgid "Queue full"
 msgstr "キューが一杯です"
 
-#: ../libpurple/protocols/oscar/oscar.c:139
+#: ../libpurple/protocols/oscar/oscar.c:140
 msgid "Not while on AOL"
 msgstr "AOL に居る時はできません"
 
@@ -6645,9 +8300,9 @@
 "と思われます。)"
 
 #. Label
-#: ../libpurple/protocols/oscar/oscar.c:639 ../pidgin/gtkutils.c:2310
-#: ../pidgin/gtkutils.c:2340
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:338
+#: ../libpurple/protocols/oscar/oscar.c:639 ../pidgin/gtkutils.c:2387
+#: ../pidgin/gtkutils.c:2417
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:332
 msgid "Buddy Icon"
 msgstr "仲間アイコン"
 
@@ -6668,7 +8323,7 @@
 msgstr "チャット"
 
 #: ../libpurple/protocols/oscar/oscar.c:651
-#: ../libpurple/protocols/oscar/oscar.c:5987
+#: ../libpurple/protocols/oscar/oscar.c:6008
 msgid "Get File"
 msgstr "ファイルの取得"
 
@@ -6741,17 +8396,17 @@
 msgstr "カメラ"
 
 #: ../libpurple/protocols/oscar/oscar.c:725
-#: ../libpurple/protocols/oscar/oscar.c:5757
+#: ../libpurple/protocols/oscar/oscar.c:5778
 msgid "Free For Chat"
 msgstr "チャットできます"
 
 #: ../libpurple/protocols/oscar/oscar.c:729
-#: ../libpurple/protocols/oscar/oscar.c:5792
+#: ../libpurple/protocols/oscar/oscar.c:5813
 msgid "Not Available"
 msgstr "不在です"
 
 #: ../libpurple/protocols/oscar/oscar.c:731
-#: ../libpurple/protocols/oscar/oscar.c:5778
+#: ../libpurple/protocols/oscar/oscar.c:5799
 msgid "Occupied"
 msgstr "多忙です"
 
@@ -6760,8 +8415,9 @@
 msgstr "ウェブは見てます"
 
 #: ../libpurple/protocols/oscar/oscar.c:737 ../libpurple/protocols/qq/qq.c:183
-#: ../libpurple/protocols/yahoo/yahoo.c:2913 ../libpurple/status.c:156
-#: ../pidgin/gtkdocklet.c:446 ../pidgin/gtkstatusbox.c:1053
+#: ../libpurple/protocols/qq/qq.c:288
+#: ../libpurple/protocols/yahoo/yahoo.c:3094 ../libpurple/status.c:157
+#: ../pidgin/gtkdocklet.c:446 ../pidgin/gtkstatusbox.c:1060
 msgid "Invisible"
 msgstr "隠れています"
 
@@ -6770,13 +8426,13 @@
 msgstr "オンライン"
 
 #: ../libpurple/protocols/oscar/oscar.c:838
-#: ../libpurple/protocols/oscar/oscar.c:3720
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:697 ../pidgin/gtkprefs.c:1052
+#: ../libpurple/protocols/oscar/oscar.c:3703
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:721 ../pidgin/gtkprefs.c:1128
 msgid "IP Address"
 msgstr "IP-アドレス"
 
 #: ../libpurple/protocols/oscar/oscar.c:845
-#: ../libpurple/protocols/oscar/oscar.c:2866
+#: ../libpurple/protocols/oscar/oscar.c:2887
 msgid "Warning Level"
 msgstr "警告レベル"
 
@@ -6815,40 +8471,40 @@
 msgid "Finalizing connection"
 msgstr "接続の最終調整中"
 
-#: ../libpurple/protocols/oscar/oscar.c:1261
-#, c-format
+#: ../libpurple/protocols/oscar/oscar.c:1260
+#, fuzzy, c-format
 msgid ""
 "Unable to login: Could not sign on as %s because the screen name is "
-"invalid.  Screen names must either start with a letter and contain only "
-"letters, numbers and spaces, or contain only numbers."
+"invalid.  Screen names must be a valid email address, or start with a letter "
+"and contain only letters, numbers and spaces, or contain only numbers."
 msgstr ""
 "ログインできません: スクリーン名が間違っているため %s としてサイン・オンでき"
 "ませんでした。スクリーン名の先頭は文字にし、文字と数字とスペースのみ、または"
 "数字のみにして下さい。"
 
-#: ../libpurple/protocols/oscar/oscar.c:1346
-#: ../libpurple/protocols/yahoo/yahoo.c:1934
+#: ../libpurple/protocols/oscar/oscar.c:1345
+#: ../libpurple/protocols/yahoo/yahoo.c:2104
 msgid "Invalid screen name."
 msgstr "無効なスクリーン名です。"
 
-#: ../libpurple/protocols/oscar/oscar.c:1353
-#: ../libpurple/protocols/qq/login_logout.c:483
-#: ../libpurple/protocols/simple/simple.c:1037
-#: ../libpurple/protocols/yahoo/yahoo.c:1952
+#: ../libpurple/protocols/oscar/oscar.c:1352
+#: ../libpurple/protocols/qq/login_logout.c:485
+#: ../libpurple/protocols/simple/simple.c:1047
+#: ../libpurple/protocols/yahoo/yahoo.c:2125
 msgid "Incorrect password."
 msgstr "パスワードが間違っています。"
 
-#: ../libpurple/protocols/oscar/oscar.c:1358
+#: ../libpurple/protocols/oscar/oscar.c:1357
 msgid "Your account is currently suspended."
 msgstr "お使いのアカウントは現在停止中です"
 
 #. service temporarily unavailable
-#: ../libpurple/protocols/oscar/oscar.c:1362
+#: ../libpurple/protocols/oscar/oscar.c:1361
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "AOL インスタント・メッセンジャー・サービスは一時的に利用不可です"
 
-#: ../libpurple/protocols/oscar/oscar.c:1367
-#: ../libpurple/protocols/oscar/oscar.c:1378
+#: ../libpurple/protocols/oscar/oscar.c:1366
+#: ../libpurple/protocols/oscar/oscar.c:1377
 msgid ""
 "You have been connecting and disconnecting too frequently. Wait ten minutes "
 "and try again. If you continue to try, you will need to wait even longer."
@@ -6856,44 +8512,44 @@
 "接続と切断を繰り返し行いました。10 分程待ってから再び試みてください。そのまま"
 "続行すると、さらに長く待たなければならなくなりますよ。"
 
-#: ../libpurple/protocols/oscar/oscar.c:1372
+#: ../libpurple/protocols/oscar/oscar.c:1371
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr "クライアントのバージョンが古すぎます。%s にアップグレードしましょう。"
 
-#: ../libpurple/protocols/oscar/oscar.c:1412
+#: ../libpurple/protocols/oscar/oscar.c:1410
 msgid "Could Not Connect"
 msgstr "接続できませんでした"
 
-#: ../libpurple/protocols/oscar/oscar.c:1417
+#: ../libpurple/protocols/oscar/oscar.c:1414
 msgid "Received authorization"
 msgstr "承認を受信しました"
 
-#: ../libpurple/protocols/oscar/oscar.c:1440
+#: ../libpurple/protocols/oscar/oscar.c:1436
 msgid "The SecurID key entered is invalid."
 msgstr "入力したセキュア ID 鍵は不正です。"
 
-#: ../libpurple/protocols/oscar/oscar.c:1454
+#: ../libpurple/protocols/oscar/oscar.c:1449
 msgid "Enter SecurID"
 msgstr "セキュア ID の入力"
 
-#: ../libpurple/protocols/oscar/oscar.c:1455
+#: ../libpurple/protocols/oscar/oscar.c:1450
 msgid "Enter the 6 digit number from the digital display."
 msgstr "デジタル表示から6桁の数字を入力して下さい。"
 
 #. *
 #. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
 #.
-#: ../libpurple/protocols/oscar/oscar.c:1457
-#: ../libpurple/protocols/oscar/oscar.c:2250
-#: ../libpurple/protocols/oscar/oscar.c:2297
-#: ../libpurple/protocols/oscar/oscar.c:5862
-#: ../libpurple/protocols/oscar/oscar.c:6143 ../libpurple/request.h:1387
+#: ../libpurple/protocols/oscar/oscar.c:1452
+#: ../libpurple/protocols/oscar/oscar.c:2228
+#: ../libpurple/protocols/oscar/oscar.c:2277
+#: ../libpurple/protocols/oscar/oscar.c:5883
+#: ../libpurple/protocols/oscar/oscar.c:6164 ../libpurple/request.h:1388
 msgid "_OK"
 msgstr "OK(_O)"
 
-#: ../libpurple/protocols/oscar/oscar.c:1496
-#: ../libpurple/protocols/oscar/oscar.c:1539
+#: ../libpurple/protocols/oscar/oscar.c:1491
+#: ../libpurple/protocols/oscar/oscar.c:1534
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
@@ -6902,53 +8558,53 @@
 "まもなく切断されるでしょう。修正されたら TOC を利用してかまいません。更新のた"
 "めに、%s をチェックして下さい。"
 
-#: ../libpurple/protocols/oscar/oscar.c:1499
-#: ../libpurple/protocols/oscar/oscar.c:1542
+#: ../libpurple/protocols/oscar/oscar.c:1494
+#: ../libpurple/protocols/oscar/oscar.c:1537
 msgid "Unable to get a valid AIM login hash."
 msgstr "妥当な AIM ログインの hash 値を取得することができませんでした。"
 
-#: ../libpurple/protocols/oscar/oscar.c:1627
+#: ../libpurple/protocols/oscar/oscar.c:1622
 #, c-format
 msgid "You may be disconnected shortly.  Check %s for updates."
 msgstr "まもなく切断されるでしょう。更新のために、%s をチェックして下さい。"
 
-#: ../libpurple/protocols/oscar/oscar.c:1630
+#: ../libpurple/protocols/oscar/oscar.c:1625
 msgid "Unable to get a valid login hash."
 msgstr "妥当なログインの hash 値を取得できませんでした。"
 
-#: ../libpurple/protocols/oscar/oscar.c:1659
+#: ../libpurple/protocols/oscar/oscar.c:1655
 msgid "Password sent"
 msgstr "パスワードの送信中"
 
-#: ../libpurple/protocols/oscar/oscar.c:1715
+#: ../libpurple/protocols/oscar/oscar.c:1711
 msgid "Unable to initialize connection"
 msgstr "新しい接続を開けません"
 
-#: ../libpurple/protocols/oscar/oscar.c:2220
+#: ../libpurple/protocols/oscar/oscar.c:2198
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr "私があなたを仲間リストに追加できるように承認して下さい。"
 
-#: ../libpurple/protocols/oscar/oscar.c:2248
+#: ../libpurple/protocols/oscar/oscar.c:2226
 msgid "Authorization Request Message:"
 msgstr "承認要求メッセージ:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2249
+#: ../libpurple/protocols/oscar/oscar.c:2227
 msgid "Please authorize me!"
 msgstr "私を承認してください!"
 
-#: ../libpurple/protocols/oscar/oscar.c:2289
-#: ../libpurple/protocols/oscar/oscar.c:2296
-#: ../libpurple/protocols/oscar/oscar.c:2423
-#: ../libpurple/protocols/oscar/oscar.c:5240
-#: ../libpurple/protocols/yahoo/yahoo.c:987
+#: ../libpurple/protocols/oscar/oscar.c:2268
+#: ../libpurple/protocols/oscar/oscar.c:2276
+#: ../libpurple/protocols/oscar/oscar.c:2403
+#: ../libpurple/protocols/oscar/oscar.c:5259
+#: ../libpurple/protocols/yahoo/yahoo.c:1029
 msgid "No reason given."
 msgstr "理由はわかりません。"
 
-#: ../libpurple/protocols/oscar/oscar.c:2295
+#: ../libpurple/protocols/oscar/oscar.c:2275
 msgid "Authorization Denied Message:"
 msgstr "承認拒否メッセージ:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2423
+#: ../libpurple/protocols/oscar/oscar.c:2403
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -6958,17 +8614,17 @@
 "ユーザの %u さんが次の理由で仲間リストに追加する要求を拒否しました:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2424
+#: ../libpurple/protocols/oscar/oscar.c:2404
 msgid "ICQ authorization denied."
 msgstr "ICQ の承認が拒否されました"
 
 #. Someone has granted you authorization
-#: ../libpurple/protocols/oscar/oscar.c:2431
+#: ../libpurple/protocols/oscar/oscar.c:2411
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
 msgstr "ユーザの %u さんが仲間リストに追加するあなたの要求を承認しました"
 
-#: ../libpurple/protocols/oscar/oscar.c:2439
+#: ../libpurple/protocols/oscar/oscar.c:2419
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -6981,7 +8637,7 @@
 "差出人: %s [%s]\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2447
+#: ../libpurple/protocols/oscar/oscar.c:2427
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -6994,7 +8650,7 @@
 "差出人: %s [%s]\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2455
+#: ../libpurple/protocols/oscar/oscar.c:2435
 #, c-format
 msgid ""
 "You have received an ICQ e-mail from %s [%s]\n"
@@ -7007,24 +8663,24 @@
 "メッセージは:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2476
+#: ../libpurple/protocols/oscar/oscar.c:2456
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
 msgstr "ICQ ユーザの %u さんはあなたに仲間リストを送信しています: %s (%s)"
 
-#: ../libpurple/protocols/oscar/oscar.c:2482
+#: ../libpurple/protocols/oscar/oscar.c:2462
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr "この相手を仲間リストに追加しますか?"
 
-#: ../libpurple/protocols/oscar/oscar.c:2487 ../pidgin/gtkroomlist.c:308
+#: ../libpurple/protocols/oscar/oscar.c:2467 ../pidgin/gtkroomlist.c:309
 msgid "_Add"
 msgstr "追加(_A)"
 
-#: ../libpurple/protocols/oscar/oscar.c:2488
+#: ../libpurple/protocols/oscar/oscar.c:2468
 msgid "_Decline"
 msgstr "断る(_D)"
 
-#: ../libpurple/protocols/oscar/oscar.c:2572
+#: ../libpurple/protocols/oscar/oscar.c:2592
 #, 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."
@@ -7033,7 +8689,7 @@
 msgstr[1] ""
 "%2$s さんからの %1$hu 通のメッセージは妥当でないので受け取れませんでした。"
 
-#: ../libpurple/protocols/oscar/oscar.c:2581
+#: ../libpurple/protocols/oscar/oscar.c:2601
 #, 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."
@@ -7042,7 +8698,7 @@
 msgstr[1] ""
 "%2$s さんからの %1$hu 個のメッセージは大きすぎるために受け取れませんでした。"
 
-#: ../libpurple/protocols/oscar/oscar.c:2590
+#: ../libpurple/protocols/oscar/oscar.c:2610
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -7055,7 +8711,7 @@
 "速度制限を上回ったので %2$s さんからの %1$hu通のメッセージを受け取れませんで"
 "した。"
 
-#: ../libpurple/protocols/oscar/oscar.c:2599
+#: ../libpurple/protocols/oscar/oscar.c:2619
 #, 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."
@@ -7066,7 +8722,7 @@
 "相手が有害すぎたので、%2$s さんからの %1$hu 個のメッセージを受け取れませんで"
 "した。"
 
-#: ../libpurple/protocols/oscar/oscar.c:2608
+#: ../libpurple/protocols/oscar/oscar.c:2628
 #, 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."
@@ -7077,7 +8733,7 @@
 "あなたが有害すぎたので、%2$s さんからの %1$hu 個のメッセージを受け取れません"
 "でした。"
 
-#: ../libpurple/protocols/oscar/oscar.c:2617
+#: ../libpurple/protocols/oscar/oscar.c:2637
 #, 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."
@@ -7089,61 +8745,47 @@
 "た。"
 
 #. Data is assumed to be the destination sn
-#: ../libpurple/protocols/oscar/oscar.c:2772
+#: ../libpurple/protocols/oscar/oscar.c:2792
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "メッセージを送信できません: %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2772
-#: ../libpurple/protocols/oscar/oscar.c:2777
-#: ../libpurple/protocols/oscar/oscar.c:2839
-#: ../libpurple/protocols/oscar/oscar.c:2843
+#: ../libpurple/protocols/oscar/oscar.c:2792
+#: ../libpurple/protocols/oscar/oscar.c:2797
+#: ../libpurple/protocols/oscar/oscar.c:2861
 msgid "Unknown reason."
 msgstr "原因は不明です"
 
-#: ../libpurple/protocols/oscar/oscar.c:2775
+#: ../libpurple/protocols/oscar/oscar.c:2795
 #: ../libpurple/protocols/sametime/sametime.c:2409
 #, c-format
 msgid "Unable to send message to %s:"
 msgstr "%s さんへメッセージを送信できません"
 
-#: ../libpurple/protocols/oscar/oscar.c:2839
+#: ../libpurple/protocols/oscar/oscar.c:2861
 #, c-format
 msgid "User information not available: %s"
 msgstr "ユーザ情報は有効ではありません: %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2842
-#, c-format
-msgid "User information for %s unavailable:"
-msgstr "%s のユーザ情報は有効ではありません:"
-
-#: ../libpurple/protocols/oscar/oscar.c:2871
+#: ../libpurple/protocols/oscar/oscar.c:2892
 msgid "Online Since"
 msgstr "サイン・インした日時"
 
-#: ../libpurple/protocols/oscar/oscar.c:2876
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1161
+#: ../libpurple/protocols/oscar/oscar.c:2897
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1185
 msgid "Member Since"
 msgstr "メンバになった日時"
 
-#: ../libpurple/protocols/oscar/oscar.c:2881
-msgid "Capabilities"
-msgstr "機能"
-
-#: ../libpurple/protocols/oscar/oscar.c:2911
+#: ../libpurple/protocols/oscar/oscar.c:2932
 msgid "Available Message"
 msgstr "在席中のメッセージ"
 
-#: ../libpurple/protocols/oscar/oscar.c:2939
-msgid "Profile"
-msgstr "プロフィール"
-
-#: ../libpurple/protocols/oscar/oscar.c:3019
+#: ../libpurple/protocols/oscar/oscar.c:3040
 msgid "Your AIM connection may be lost."
 msgstr "AIM への接続が切れたようです"
 
 #. The conversion failed!
-#: ../libpurple/protocols/oscar/oscar.c:3207
+#: ../libpurple/protocols/oscar/oscar.c:3228
 msgid ""
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
@@ -7151,7 +8793,7 @@
 "[メッセージに不正な文字が含まれているため、このユーザからのメッセージを表示で"
 "きません]"
 
-#: ../libpurple/protocols/oscar/oscar.c:3410
+#: ../libpurple/protocols/oscar/oscar.c:3392
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
@@ -7159,86 +8801,82 @@
 "速度制限を越えているため最後の操作は実行されませんでした。10 秒間ほど待ってか"
 "ら再度試みて下さい。"
 
-#: ../libpurple/protocols/oscar/oscar.c:3482
-msgid "You have been signed off for an unknown reason."
-msgstr "原因は不明ですが、あなたはサイン・アウトしました"
-
-#: ../libpurple/protocols/oscar/oscar.c:3495
+#: ../libpurple/protocols/oscar/oscar.c:3475
 #: ../libpurple/protocols/toc/toc.c:977
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "チャット・ルーム %s から切断されました"
 
-#: ../libpurple/protocols/oscar/oscar.c:3742
+#: ../libpurple/protocols/oscar/oscar.c:3725
 #: ../libpurple/protocols/silc/util.c:585
 #: ../libpurple/protocols/silc10/util.c:581
 msgid "Mobile Phone"
 msgstr "携帯電話"
 
-#: ../libpurple/protocols/oscar/oscar.c:3772
+#: ../libpurple/protocols/oscar/oscar.c:3755
 msgid "Personal Web Page"
 msgstr "個人的なウェブページ"
 
-#: ../libpurple/protocols/oscar/oscar.c:3796
+#: ../libpurple/protocols/oscar/oscar.c:3779
 #: ../libpurple/protocols/qq/buddy_info.c:40
 msgid "Additional Information"
 msgstr "追加情報"
 
-#: ../libpurple/protocols/oscar/oscar.c:3804
-#: ../libpurple/protocols/oscar/oscar.c:3817
+#: ../libpurple/protocols/oscar/oscar.c:3787
+#: ../libpurple/protocols/oscar/oscar.c:3800
 msgid "Zip Code"
 msgstr "郵便番号"
 
-#: ../libpurple/protocols/oscar/oscar.c:3828
+#: ../libpurple/protocols/oscar/oscar.c:3811
 msgid "Division"
 msgstr "所属"
 
-#: ../libpurple/protocols/oscar/oscar.c:3829
+#: ../libpurple/protocols/oscar/oscar.c:3812
 msgid "Position"
 msgstr "役職"
 
-#: ../libpurple/protocols/oscar/oscar.c:3831
+#: ../libpurple/protocols/oscar/oscar.c:3814
 msgid "Web Page"
 msgstr "ウェブページ"
 
-#: ../libpurple/protocols/oscar/oscar.c:3834
+#: ../libpurple/protocols/oscar/oscar.c:3817
 msgid "Work Information"
 msgstr "職業"
 
-#: ../libpurple/protocols/oscar/oscar.c:3890
+#: ../libpurple/protocols/oscar/oscar.c:3873
 msgid "Pop-Up Message"
 msgstr "ポップアップ・メッセージ"
 
-#: ../libpurple/protocols/oscar/oscar.c:3930
+#: ../libpurple/protocols/oscar/oscar.c:3913
 #, 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:3935
+#: ../libpurple/protocols/oscar/oscar.c:3918
 msgid "Screen name"
 msgstr "スクリーン名"
 
-#: ../libpurple/protocols/oscar/oscar.c:3961
+#: ../libpurple/protocols/oscar/oscar.c:3944
 #, c-format
 msgid "No results found for e-mail address %s"
 msgstr "E-メール・アドレス %s に対する結果を得られませんでした"
 
-#: ../libpurple/protocols/oscar/oscar.c:3982
+#: ../libpurple/protocols/oscar/oscar.c:3965
 #, c-format
 msgid "You should receive an e-mail asking to confirm %s."
 msgstr "%s さんを確認するための問い合わせメールを受信して下さい"
 
-#: ../libpurple/protocols/oscar/oscar.c:3984
+#: ../libpurple/protocols/oscar/oscar.c:3967
 msgid "Account Confirmation Requested"
 msgstr "アカウント認証を要求しました"
 
-#: ../libpurple/protocols/oscar/oscar.c:4015
+#: ../libpurple/protocols/oscar/oscar.c:3998
 msgid "Error Changing Account Info"
 msgstr "アカウント情報変更エラー"
 
-#: ../libpurple/protocols/oscar/oscar.c:4018
+#: ../libpurple/protocols/oscar/oscar.c:4001
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -7247,19 +8885,19 @@
 "エラー 0x%04x: 要求されたスクリーン名がオリジナルと異なっているため、整形でき"
 "ません。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4021
+#: ../libpurple/protocols/oscar/oscar.c:4004
 #, c-format
 msgid "Error 0x%04x: Unable to format screen name because it is invalid."
 msgstr "エラー 0x%04x: 要求されたスクリーン名が間違っているので整形できません"
 
-#: ../libpurple/protocols/oscar/oscar.c:4024
+#: ../libpurple/protocols/oscar/oscar.c:4007
 #, 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:4027
+#: ../libpurple/protocols/oscar/oscar.c:4010
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because there is already a "
@@ -7268,7 +8906,7 @@
 "エラー 0x%04x: このスクリーン名に対して既に要求がきているので E-メール・アド"
 "レスを変更できません"
 
-#: ../libpurple/protocols/oscar/oscar.c:4030
+#: ../libpurple/protocols/oscar/oscar.c:4013
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address has "
@@ -7277,7 +8915,7 @@
 "エラー 0x%04x: たくさんのスクリーン名に割り当てられているので、この E-メー"
 "ル・アドレスには変更できません"
 
-#: ../libpurple/protocols/oscar/oscar.c:4033
+#: ../libpurple/protocols/oscar/oscar.c:4016
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address is "
@@ -7286,32 +8924,32 @@
 "エラー 0x%04x: このアドレスが間違っているので、この E-メール・アドレスに変更"
 "できません"
 
-#: ../libpurple/protocols/oscar/oscar.c:4036
+#: ../libpurple/protocols/oscar/oscar.c:4019
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "エラー 0x%04x: 原因不明のエラーです"
 
-#: ../libpurple/protocols/oscar/oscar.c:4046
+#: ../libpurple/protocols/oscar/oscar.c:4029
 #, c-format
 msgid "The e-mail address for %s is %s"
 msgstr "%s さんの E-メール・アドレスは %s です"
 
-#: ../libpurple/protocols/oscar/oscar.c:4048
+#: ../libpurple/protocols/oscar/oscar.c:4031
 msgid "Account Info"
 msgstr "アカウント情報"
 
-#: ../libpurple/protocols/oscar/oscar.c:4220
+#: ../libpurple/protocols/oscar/oscar.c:4214
 msgid ""
 "Your IM Image was not sent. You must be Direct Connected to send IM Images."
 msgstr ""
 "IM 画像が送信されませんでした。IM 画像を送信するには Direct Connected になっ"
 "て下さい"
 
-#: ../libpurple/protocols/oscar/oscar.c:4486
+#: ../libpurple/protocols/oscar/oscar.c:4485
 msgid "Unable to set AIM profile."
 msgstr "AIM プロフィールをセットできません"
 
-#: ../libpurple/protocols/oscar/oscar.c:4487
+#: ../libpurple/protocols/oscar/oscar.c:4486
 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 "
@@ -7321,7 +8959,7 @@
 "す。あなたのプロフィールは設定されずに残っています。接続が完了してから再度試"
 "して下さい。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4501
+#: ../libpurple/protocols/oscar/oscar.c:4500
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  It has been "
@@ -7332,11 +8970,11 @@
 msgstr[0] "プロフィールの長さが上限値 ( %dバイト) に達したので切りつめました"
 msgstr[1] "プロフィールの長さが上限値 ( %dバイト) に達したので切りつめました"
 
-#: ../libpurple/protocols/oscar/oscar.c:4506
+#: ../libpurple/protocols/oscar/oscar.c:4505
 msgid "Profile too long."
 msgstr "プロフィールが長すぎます"
 
-#: ../libpurple/protocols/oscar/oscar.c:4551
+#: ../libpurple/protocols/oscar/oscar.c:4550
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  It has been "
@@ -7347,31 +8985,31 @@
 msgstr[0] "離席メッセージの長さが上限値 ( %dバイト) に達したので切りつめました"
 msgstr[1] "離席メッセージの長さが上限値 ( %dバイト) に達したので切りつめました"
 
-#: ../libpurple/protocols/oscar/oscar.c:4556
+#: ../libpurple/protocols/oscar/oscar.c:4555
 msgid "Away message too long."
 msgstr "離席メッセージが長すぎます"
 
-#: ../libpurple/protocols/oscar/oscar.c:4625
-#, c-format
+#: ../libpurple/protocols/oscar/oscar.c:4624
+#, fuzzy, c-format
 msgid ""
 "Could not add the buddy %s because the screen name is invalid.  Screen names "
-"must either start with a letter and contain only letters, numbers and "
-"spaces, or contain only numbers."
+"must be a valid email address, or start with a letter and contain only "
+"letters, numbers and spaces, or contain only numbers."
 msgstr ""
 "スクリーン名が間違っているため仲間 %s を追加できませんでした。スクリーン名の"
 "先頭は文字にし、文字と数字とスペースのみ、または数字のみにして下さい。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4627
-#: ../libpurple/protocols/oscar/oscar.c:5050
-#: ../libpurple/protocols/oscar/oscar.c:5064
+#: ../libpurple/protocols/oscar/oscar.c:4626
+#: ../libpurple/protocols/oscar/oscar.c:5056
+#: ../libpurple/protocols/oscar/oscar.c:5071
 msgid "Unable To Add"
 msgstr "追加できません"
 
-#: ../libpurple/protocols/oscar/oscar.c:4731
+#: ../libpurple/protocols/oscar/oscar.c:4735
 msgid "Unable To Retrieve Buddy List"
 msgstr "仲間リストを取得できません"
 
-#: ../libpurple/protocols/oscar/oscar.c:4732
+#: ../libpurple/protocols/oscar/oscar.c:4736
 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."
@@ -7379,16 +9017,15 @@
 "一時的に AIM サーバから仲間リストを取得できませんでした。仲間リストは失われて"
 "いません。おそらく数時間後には利用できるようになっているでしょう。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4936
-#: ../libpurple/protocols/oscar/oscar.c:4937
-#: ../libpurple/protocols/oscar/oscar.c:4942
-#: ../libpurple/protocols/oscar/oscar.c:5118
-#: ../libpurple/protocols/oscar/oscar.c:5119
-#: ../libpurple/protocols/oscar/oscar.c:5124
+#: ../libpurple/protocols/oscar/oscar.c:4918
+#: ../libpurple/protocols/oscar/oscar.c:4920
+#: ../libpurple/protocols/oscar/oscar.c:5136
+#: ../libpurple/protocols/oscar/oscar.c:5137
+#: ../libpurple/protocols/oscar/oscar.c:5142
 msgid "Orphans"
 msgstr "みなしご"
 
-#: ../libpurple/protocols/oscar/oscar.c:5048
+#: ../libpurple/protocols/oscar/oscar.c:5054
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -7397,23 +9034,17 @@
 "仲間の %s さんを追加することができませんでした。仲間の数が多すぎます。一人削"
 "除して再度挑戦して下さい。"
 
-#: ../libpurple/protocols/oscar/oscar.c:5048
-#: ../libpurple/protocols/oscar/oscar.c:5062
+#: ../libpurple/protocols/oscar/oscar.c:5054
+#: ../libpurple/protocols/oscar/oscar.c:5069
 msgid "(no name)"
 msgstr "(名前無し)"
 
-#: ../libpurple/protocols/oscar/oscar.c:5062
-#, c-format
-msgid ""
-"Could not add the buddy %s for an unknown reason.  The most common reason "
-"for this is that you have the maximum number of allowed buddies in your "
-"buddy list."
-msgstr ""
-"不明な理由により、仲間 %s を追加できませんでした。最も一般的な問題としては、"
-"これは仲間リストに追加可能な仲間の数を越えてしまっているということがあり得ま"
-"す。"
-
-#: ../libpurple/protocols/oscar/oscar.c:5155
+#: ../libpurple/protocols/oscar/oscar.c:5068
+#, fuzzy, c-format
+msgid "Could not add the buddy %s for an unknown reason."
+msgstr "原因不明ですが、コマンド適用に失敗しました"
+
+#: ../libpurple/protocols/oscar/oscar.c:5174
 #, c-format
 msgid ""
 "The user %s has given you permission to add you to their buddy list.  Do you "
@@ -7422,22 +9053,22 @@
 "ユーザの %s さんがあなたを仲間リストに加えることを許可しました。彼らを加えて"
 "もよろしいですか?"
 
-#: ../libpurple/protocols/oscar/oscar.c:5163
+#: ../libpurple/protocols/oscar/oscar.c:5182
 msgid "Authorization Given"
 msgstr "承認が得られました"
 
 #. Granted
-#: ../libpurple/protocols/oscar/oscar.c:5236
+#: ../libpurple/protocols/oscar/oscar.c:5255
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
 msgstr "ユーザの %s さんは仲間リストに追加するあなたの要求を承認しました"
 
-#: ../libpurple/protocols/oscar/oscar.c:5237
+#: ../libpurple/protocols/oscar/oscar.c:5256
 msgid "Authorization Granted"
 msgstr "承認が得られました"
 
 #. Denied
-#: ../libpurple/protocols/oscar/oscar.c:5240
+#: ../libpurple/protocols/oscar/oscar.c:5259
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -7448,52 +9079,52 @@
 "した:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:5241
+#: ../libpurple/protocols/oscar/oscar.c:5260
 msgid "Authorization Denied"
 msgstr "承認は拒否されました"
 
-#: ../libpurple/protocols/oscar/oscar.c:5277
+#: ../libpurple/protocols/oscar/oscar.c:5296
 #: ../libpurple/protocols/toc/toc.c:1371
 msgid "_Exchange:"
 msgstr "交換(_E):"
 
-#: ../libpurple/protocols/oscar/oscar.c:5317
+#: ../libpurple/protocols/oscar/oscar.c:5336
 msgid "Invalid chat name specified."
 msgstr "不正なチャット名が指定されました"
 
-#: ../libpurple/protocols/oscar/oscar.c:5386
+#: ../libpurple/protocols/oscar/oscar.c:5405
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 msgstr ""
 "IM 画像が送信されませんでした。AIM チャットで IM 画像を送信できません。"
 
-#: ../libpurple/protocols/oscar/oscar.c:5546
-#: ../libpurple/protocols/oscar/oscar.c:5551
+#: ../libpurple/protocols/oscar/oscar.c:5567
+#: ../libpurple/protocols/oscar/oscar.c:5572
 msgid "Away Message"
 msgstr "離席メッセージ"
 
-#: ../libpurple/protocols/oscar/oscar.c:5551
+#: ../libpurple/protocols/oscar/oscar.c:5572
 msgid "<i>(retrieving)</i>"
 msgstr "<i>(取得中)</i>"
 
-#: ../libpurple/protocols/oscar/oscar.c:5751
+#: ../libpurple/protocols/oscar/oscar.c:5772
 msgid "iTunes Music Store Link"
 msgstr "iTunes 楽曲ストアのリンク"
 
-#: ../libpurple/protocols/oscar/oscar.c:5859
+#: ../libpurple/protocols/oscar/oscar.c:5880
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "%s さんに対する仲間のコメント"
 
-#: ../libpurple/protocols/oscar/oscar.c:5860
+#: ../libpurple/protocols/oscar/oscar.c:5881
 msgid "Buddy Comment:"
 msgstr "仲間のコメント:"
 
-#: ../libpurple/protocols/oscar/oscar.c:5907
+#: ../libpurple/protocols/oscar/oscar.c:5928
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr "%s を利用した Direct IM 接続の開始を選択しています。"
 
-#: ../libpurple/protocols/oscar/oscar.c:5911
+#: ../libpurple/protocols/oscar/oscar.c:5932
 msgid ""
 "Because this reveals your IP address, it may be considered a security risk.  "
 "Do you wish to continue?"
@@ -7501,64 +9132,65 @@
 "理由は、あなたの IP-アドレスを開示することになるからです。これにより個人情報"
 "に関する危険性が高まります。続行してもよろしいですか?"
 
-#: ../libpurple/protocols/oscar/oscar.c:5917
+#: ../libpurple/protocols/oscar/oscar.c:5938
+#: ../libpurple/protocols/oscar/peer.c:1045
 msgid "C_onnect"
 msgstr "接続する(_O)"
 
-#: ../libpurple/protocols/oscar/oscar.c:5952
+#: ../libpurple/protocols/oscar/oscar.c:5973
 msgid "Get AIM Info"
 msgstr "AIM 情報の取得"
 
-#: ../libpurple/protocols/oscar/oscar.c:5958
+#: ../libpurple/protocols/oscar/oscar.c:5979
 msgid "Edit Buddy Comment"
 msgstr "仲間のコメントの編集"
 
-#: ../libpurple/protocols/oscar/oscar.c:5966
+#: ../libpurple/protocols/oscar/oscar.c:5987
 msgid "Get Status Msg"
 msgstr "状態メッセージの取得"
 
-#: ../libpurple/protocols/oscar/oscar.c:5979
+#: ../libpurple/protocols/oscar/oscar.c:6000
 msgid "Direct IM"
 msgstr "Direct IM"
 
-#: ../libpurple/protocols/oscar/oscar.c:6001
+#: ../libpurple/protocols/oscar/oscar.c:6022
 msgid "Re-request Authorization"
 msgstr "承認の再要求"
 
-#: ../libpurple/protocols/oscar/oscar.c:6060
+#: ../libpurple/protocols/oscar/oscar.c:6081
 msgid "Require authorization"
 msgstr "承認が必要です"
 
-#: ../libpurple/protocols/oscar/oscar.c:6063
+#: ../libpurple/protocols/oscar/oscar.c:6084
 msgid "Web aware (enabling this will cause you to receive SPAM!)"
 msgstr ""
 "ウェブは知っている (これを有効にすると SPAM を受け取ることになりますよ!)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6068
+#: ../libpurple/protocols/oscar/oscar.c:6089
 msgid "ICQ Privacy Options"
 msgstr "ICQ プライバシーのオプション"
 
-#: ../libpurple/protocols/oscar/oscar.c:6087
+#: ../libpurple/protocols/oscar/oscar.c:6108
 msgid "The new formatting is invalid."
 msgstr "新しい書式が間違っています"
 
-#: ../libpurple/protocols/oscar/oscar.c:6088
+#: ../libpurple/protocols/oscar/oscar.c:6109
 msgid "Screen name formatting can change only capitalization and whitespace."
 msgstr "スクリーン名の書式は大文字と空白文字しか変更できません"
 
-#: ../libpurple/protocols/oscar/oscar.c:6141
+#: ../libpurple/protocols/oscar/oscar.c:6162
 msgid "Change Address To:"
 msgstr "変更するアドレス:"
 
-#: ../libpurple/protocols/oscar/oscar.c:6187
+#: ../libpurple/protocols/oscar/oscar.c:6208
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>あなたは承認を待っていません</i>"
 
-#: ../libpurple/protocols/oscar/oscar.c:6190
+#: ../libpurple/protocols/oscar/oscar.c:6211
 msgid "You are awaiting authorization from the following buddies"
 msgstr "あなたは次の仲間からの承認を待っています"
 
-#: ../libpurple/protocols/oscar/oscar.c:6191
+#: ../libpurple/protocols/oscar/oscar.c:6212
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
@@ -7566,73 +9198,73 @@
 "右クリックして \"承認の再要求\" を選択することで、これらの仲間からの承認をも"
 "う一度要求できます。"
 
-#: ../libpurple/protocols/oscar/oscar.c:6208
+#: ../libpurple/protocols/oscar/oscar.c:6229
 msgid "Find Buddy by E-Mail"
 msgstr "E-メールから仲間を捜す"
 
-#: ../libpurple/protocols/oscar/oscar.c:6209
+#: ../libpurple/protocols/oscar/oscar.c:6230
 msgid "Search for a buddy by e-mail address"
 msgstr "E-メール・アドレスから仲間を検索します"
 
-#: ../libpurple/protocols/oscar/oscar.c:6210
+#: ../libpurple/protocols/oscar/oscar.c:6231
 msgid "Type the e-mail address of the buddy you are searching for."
 msgstr "検索する仲間の E-メール・アドレスを入力して下さい"
 
-#: ../libpurple/protocols/oscar/oscar.c:6213
+#: ../libpurple/protocols/oscar/oscar.c:6234
 msgid "_Search"
 msgstr "検索(_S)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6371
+#: ../libpurple/protocols/oscar/oscar.c:6392
 msgid "Set User Info (URL)..."
 msgstr "ユーザ情報のセット(URL)..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6382
+#: ../libpurple/protocols/oscar/oscar.c:6403
 msgid "Change Password (URL)"
 msgstr "パスワード変更 (URL)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6386
+#: ../libpurple/protocols/oscar/oscar.c:6407
 msgid "Configure IM Forwarding (URL)"
 msgstr "IM フォワーディング (URL) の設定"
 
 #. ICQ actions
-#: ../libpurple/protocols/oscar/oscar.c:6396
+#: ../libpurple/protocols/oscar/oscar.c:6417
 msgid "Set Privacy Options..."
 msgstr "プライバシー・オプションの追加..."
 
 #. AIM actions
-#: ../libpurple/protocols/oscar/oscar.c:6403
+#: ../libpurple/protocols/oscar/oscar.c:6424
 msgid "Confirm Account"
 msgstr "アカウントの確認"
 
-#: ../libpurple/protocols/oscar/oscar.c:6407
+#: ../libpurple/protocols/oscar/oscar.c:6428
 msgid "Display Currently Registered E-Mail Address"
 msgstr "現在登録されている E-メール・アドレスの表示"
 
-#: ../libpurple/protocols/oscar/oscar.c:6411
+#: ../libpurple/protocols/oscar/oscar.c:6432
 msgid "Change Currently Registered E-Mail Address..."
 msgstr "現在登録されている E-メール・アドレスの変更..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6418
+#: ../libpurple/protocols/oscar/oscar.c:6439
 msgid "Show Buddies Awaiting Authorization"
 msgstr "承認を待っている仲間を表示"
 
-#: ../libpurple/protocols/oscar/oscar.c:6424
+#: ../libpurple/protocols/oscar/oscar.c:6445
 msgid "Search for Buddy by E-Mail Address..."
 msgstr "E-メールで仲間の検索..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6429
+#: ../libpurple/protocols/oscar/oscar.c:6450
 msgid "Search for Buddy by Information"
 msgstr "情報で仲間の検索..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6497
+#: ../libpurple/protocols/oscar/oscar.c:6518
 msgid "Use recent buddies group"
 msgstr "現在のグループを利用する"
 
-#: ../libpurple/protocols/oscar/oscar.c:6500
+#: ../libpurple/protocols/oscar/oscar.c:6521
 msgid "Show how long you have been idle"
 msgstr "待機中の時間を表示する"
 
-#: ../libpurple/protocols/oscar/oscar.c:6655
+#: ../libpurple/protocols/oscar/oscar.c:6676
 msgid ""
 "Always use ICQ proxy server for file transfers\n"
 "(slower, but does not reveal your IP address)"
@@ -7640,26 +9272,26 @@
 "ファイルの転送では常に ICQ プロキシ・サーバを利用する\n"
 "(速度は低下しますが、IP-アドレスは開示されません)"
 
-#: ../libpurple/protocols/oscar/peer.c:674
+#: ../libpurple/protocols/oscar/peer.c:697
 #, c-format
 msgid "Asking %s to connect to us at %s:%hu for Direct IM."
 msgstr "Direct IM で %s は %s:%hu で問い合わせがきています。"
 
-#: ../libpurple/protocols/oscar/peer.c:759
+#: ../libpurple/protocols/oscar/peer.c:782
 #, c-format
 msgid "Attempting to connect to %s:%hu."
 msgstr "%s:%hu にコンタクトを試みています"
 
-#: ../libpurple/protocols/oscar/peer.c:833
+#: ../libpurple/protocols/oscar/peer.c:856
 msgid "Attempting to connect via proxy server."
 msgstr "プロキシ・サーバを介してコンタクトを試みています..."
 
-#: ../libpurple/protocols/oscar/peer.c:1010
+#: ../libpurple/protocols/oscar/peer.c:1033
 #, c-format
 msgid "%s has just asked to directly connect to %s"
 msgstr "%s は直接 %s に接続するように要求しました。"
 
-#: ../libpurple/protocols/oscar/peer.c:1014
+#: ../libpurple/protocols/oscar/peer.c:1037
 msgid ""
 "This requires a direct connection between the two computers and is necessary "
 "for IM Images.  Because your IP address will be revealed, this may be "
@@ -7669,10 +9301,6 @@
 "す。IP アドレスが明らかになるので、プライバシーに対するリスクが発生するかもし"
 "れません。"
 
-#: ../libpurple/protocols/oscar/peer.c:1022
-msgid "_Connect"
-msgstr "接続する(_C)"
-
 #: ../libpurple/protocols/qq/buddy_info.c:39
 msgid "Primary Information"
 msgstr "主要な情報"
@@ -7852,13 +9480,12 @@
 msgstr "不正な顔アイコンです"
 
 #: ../libpurple/protocols/qq/buddy_opt.c:208
-#: ../libpurple/protocols/qq/group_opt.c:135
+#: ../libpurple/protocols/qq/group_opt.c:136
 #, c-format
 msgid "You rejected %d's request"
 msgstr "%d個の要求を拒否しました"
 
 #: ../libpurple/protocols/qq/buddy_opt.c:209
-#: ../libpurple/protocols/qq/group_opt.c:136
 msgid "Input your reason:"
 msgstr "理由を入力して下さい:"
 
@@ -7868,65 +9495,61 @@
 
 #. title
 #: ../libpurple/protocols/qq/buddy_opt.c:213
-#: ../libpurple/protocols/qq/group_opt.c:140
+#: ../libpurple/protocols/qq/group_opt.c:141
 msgid "Sorry, you are not my type..."
 msgstr "すみませんが、私のタイプではありません..."
 
-#: ../libpurple/protocols/qq/buddy_opt.c:214
-#: ../libpurple/protocols/qq/group_im.c:142
-#: ../libpurple/protocols/qq/group_opt.c:126
-#: ../libpurple/protocols/qq/sys_msg.c:91
-#: ../libpurple/protocols/qq/sys_msg.c:249
-msgid "Reject"
-msgstr "拒否する"
-
 #: ../libpurple/protocols/qq/buddy_opt.c:277
-msgid "Add buddy with auth request fails"
+#, fuzzy
+msgid "Add buddy with auth request failed"
 msgstr "承認付きで仲間の追加に失敗しました"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:308
+#. TODO: We don't really need to notify the user about this, do we?
+#: ../libpurple/protocols/qq/buddy_opt.c:309
 msgid "You have successfully removed a buddy"
 msgstr "仲間を削除しました"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:336
-msgid "You have successfully removed yourself from a buddy"
+#. TODO: Does the user really need to be notified about this?
+#: ../libpurple/protocols/qq/buddy_opt.c:338
+#, fuzzy
+msgid "You have successfully removed yourself from your friend's buddy list"
 msgstr "仲間リストからあなた自身を削除しました"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:402
+#: ../libpurple/protocols/qq/buddy_opt.c:404
 #, c-format
 msgid "User %d needs authentication"
 msgstr "ユーザ %d さんは承認が必要です"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:404
-#: ../libpurple/protocols/qq/group_join.c:134
+#: ../libpurple/protocols/qq/buddy_opt.c:406
+#: ../libpurple/protocols/qq/group_join.c:136
 msgid "Input request here"
 msgstr "ここにリクエストをどうぞ"
 
 #. TODO: Awkward string to fix post string freeze - standardize auth dialogues? -evands
-#: ../libpurple/protocols/qq/buddy_opt.c:405
-#: ../libpurple/protocols/qq/group_join.c:135
+#: ../libpurple/protocols/qq/buddy_opt.c:407
+#: ../libpurple/protocols/qq/group_join.c:137
 msgid "Would you be my friend?"
 msgstr "私の友達になってくれますか?"
 
 #. multiline
 #. masked
 #. hint
-#: ../libpurple/protocols/qq/buddy_opt.c:406
-#: ../libpurple/protocols/qq/group_join.c:136
-#: ../libpurple/protocols/qq/group_opt.c:142
+#: ../libpurple/protocols/qq/buddy_opt.c:408
+#: ../libpurple/protocols/qq/group_join.c:138
+#: ../libpurple/protocols/qq/group_opt.c:143
 msgid "Send"
 msgstr "送信する"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:416
-#, c-format
-msgid "You have added %d in buddy list"
+#: ../libpurple/protocols/qq/buddy_opt.c:418
+#, fuzzy, c-format
+msgid "You have added %d to buddy list"
 msgstr "%d さんを仲間リストに追加しました"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:513
+#: ../libpurple/protocols/qq/buddy_opt.c:515
 msgid "QQid Error"
 msgstr "QQid のエラー"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:514
+#: ../libpurple/protocols/qq/buddy_opt.c:516
 msgid "Invalid QQid"
 msgstr "不正な QQid です"
 
@@ -7955,71 +9578,73 @@
 msgstr "QQ Qun"
 
 #: ../libpurple/protocols/qq/group.c:120
-msgid "Please input external group ID"
+#, fuzzy
+msgid "Please enter external group ID"
 msgstr "外部のグループ ID を入力して下さい"
 
 #: ../libpurple/protocols/qq/group.c:121
 msgid "You can only search for permanent QQ groups\n"
 msgstr "半永久的に使用できる QQ グループのみ検索できます\n"
 
-#: ../libpurple/protocols/qq/group_im.c:124
-#, c-format
-msgid "User %d applied to join group %d"
+#: ../libpurple/protocols/qq/group_im.c:126
+#, fuzzy, c-format
+msgid "User %d requested to join group %d"
 msgstr "ユーザ %d さんがグループ %d に参加しました"
 
-#: ../libpurple/protocols/qq/group_im.c:125
-#: ../libpurple/protocols/qq/group_im.c:179
-#: ../libpurple/protocols/qq/sys_msg.c:195
+#: ../libpurple/protocols/qq/group_im.c:127
+#: ../libpurple/protocols/qq/group_im.c:181
+#: ../libpurple/protocols/qq/sys_msg.c:193
 #, c-format
 msgid "Reason: %s"
 msgstr "理由: %s"
 
-#: ../libpurple/protocols/qq/group_im.c:134
-#: ../libpurple/protocols/qq/group_im.c:181
-#: ../libpurple/protocols/qq/group_im.c:221
-#: ../libpurple/protocols/qq/group_im.c:256
-#: ../libpurple/protocols/qq/group_im.c:290
-#: ../libpurple/protocols/qq/group_join.c:231
-#: ../libpurple/protocols/qq/group_join.c:357
-#: ../libpurple/protocols/qq/group_opt.c:234
-#: ../libpurple/protocols/qq/group_opt.c:304
-#: ../libpurple/protocols/qq/group_opt.c:390
+#: ../libpurple/protocols/qq/group_im.c:136
+#: ../libpurple/protocols/qq/group_im.c:183
+#: ../libpurple/protocols/qq/group_im.c:223
+#: ../libpurple/protocols/qq/group_im.c:258
+#: ../libpurple/protocols/qq/group_im.c:292
+#: ../libpurple/protocols/qq/group_join.c:233
+#: ../libpurple/protocols/qq/group_join.c:359
+#: ../libpurple/protocols/qq/group_opt.c:235
+#: ../libpurple/protocols/qq/group_opt.c:305
+#: ../libpurple/protocols/qq/group_opt.c:391
 msgid "QQ Qun Operation"
 msgstr "QQ Qun の操作"
 
-#: ../libpurple/protocols/qq/group_im.c:139
-#: ../libpurple/protocols/qq/group_opt.c:127
-#: ../libpurple/protocols/qq/sys_msg.c:92
-#: ../libpurple/protocols/qq/sys_msg.c:251
+#: ../libpurple/protocols/qq/group_im.c:141
+#: ../libpurple/protocols/qq/group_opt.c:128
+#: ../libpurple/protocols/qq/sys_msg.c:91
+#: ../libpurple/protocols/qq/sys_msg.c:248
 msgid "Approve"
 msgstr "承認する"
 
-#: ../libpurple/protocols/qq/group_im.c:178
-#, c-format
-msgid "You request to join group %d has been rejected by admin %d"
+#: ../libpurple/protocols/qq/group_im.c:180
+#, fuzzy, c-format
+msgid "Your request to join group %d has been rejected by admin %d"
 msgstr "グループ %d に参加するあなたの要求が管理者 %d によって拒否されました"
 
-#: ../libpurple/protocols/qq/group_im.c:219
-#, c-format
-msgid "You request to join group %d has been approved by admin %d"
+#: ../libpurple/protocols/qq/group_im.c:221
+#, fuzzy, c-format
+msgid "Your request to join group %d has been approved by admin %d"
 msgstr "グループ %d に参加するあなたの要求が管理者 %d によって承認されました"
 
-#: ../libpurple/protocols/qq/group_im.c:255
-#, c-format
-msgid "You [%d] has exit group \"%d\""
+#: ../libpurple/protocols/qq/group_im.c:257
+#, fuzzy, c-format
+msgid "You [%d] have left group \"%d\""
 msgstr "あなた [%d] はグループ \"%d\" から退去しました"
 
-#: ../libpurple/protocols/qq/group_im.c:289
-#, c-format
-msgid "You [%d] has been added by group \"%d\""
+#: ../libpurple/protocols/qq/group_im.c:291
+#, fuzzy, c-format
+msgid "You [%d] have been added to group \"%d\""
 msgstr "あなた [%d] はグループ \"%d\" に追加されました"
 
-#: ../libpurple/protocols/qq/group_im.c:290
+#: ../libpurple/protocols/qq/group_im.c:292
 msgid "This group has been added to your buddy list"
 msgstr "このグループは仲間リストに追加されています"
 
 #: ../libpurple/protocols/qq/group_internal.c:41
-msgid "I am not member"
+#, fuzzy
+msgid "I am not a member"
 msgstr "私はメンバではありません"
 
 #: ../libpurple/protocols/qq/group_internal.c:44
@@ -8038,31 +9663,35 @@
 msgid "Unknown status"
 msgstr "不明な状態"
 
-#: ../libpurple/protocols/qq/group_join.c:80
+#: ../libpurple/protocols/qq/group_join.c:82
 msgid "This group does not allow others to join"
 msgstr "このグループでは他の人たちの参加を許可していません"
 
-#: ../libpurple/protocols/qq/group_join.c:231
-msgid "You have successfully exited the group"
+#: ../libpurple/protocols/qq/group_join.c:233
+#, fuzzy
+msgid "You have successfully left the group"
 msgstr "グループからの退去が完了しました"
 
-#: ../libpurple/protocols/qq/group_join.c:255
+#: ../libpurple/protocols/qq/group_join.c:257
 msgid "QQ Group Auth"
 msgstr "QQ グループの承認"
 
-#: ../libpurple/protocols/qq/group_join.c:256
-msgid "Your authorization operation has been accepted by the QQ server"
+#: ../libpurple/protocols/qq/group_join.c:258
+#, fuzzy
+msgid "Your authorization request has been accepted by the QQ server"
 msgstr "承認操作が QQ サーバによって許可されました"
 
-#: ../libpurple/protocols/qq/group_join.c:327
-msgid "You inputted a group id outside the acceptable range"
+#: ../libpurple/protocols/qq/group_join.c:329
+#, fuzzy
+msgid "You entered a group ID outside the acceptable range"
 msgstr "入力したグループ ID は範囲外です"
 
-#: ../libpurple/protocols/qq/group_join.c:358
-msgid "Are you sure to exit this Qun?"
-msgstr "この Qun を終了してもよろしいですか?"
-
 #: ../libpurple/protocols/qq/group_join.c:360
+#, fuzzy
+msgid "Are you sure you want to leave this Qun?"
+msgstr "本当に %s を削除してもよろしいですか?"
+
+#: ../libpurple/protocols/qq/group_join.c:362
 msgid ""
 "Note, if you are the creator, \n"
 "this operation will eventually remove this Qun."
@@ -8070,73 +9699,76 @@
 "注意: あなたが作成者の場合、\n"
 "この操作によって最終的に Qun が完全に削除されます。"
 
-#: ../libpurple/protocols/qq/group_join.c:365
-msgid "Go ahead"
-msgstr "続行する"
-
-#: ../libpurple/protocols/qq/group_network.c:90
+#: ../libpurple/protocols/qq/group_network.c:92
 #, c-format
 msgid "Code [0x%02X]: %s"
 msgstr "コード [0x%02X]: %s"
 
-#: ../libpurple/protocols/qq/group_network.c:91
+#: ../libpurple/protocols/qq/group_network.c:93
 msgid "Group Operation Error"
 msgstr "グループ操作のエラー"
 
-#. we wanna see window
-#: ../libpurple/protocols/qq/group_opt.c:123
-#: ../libpurple/protocols/qq/sys_msg.c:88
-msgid "Do you wanna approve the request?"
+#. we want to see window
+#: ../libpurple/protocols/qq/group_opt.c:124
+#: ../libpurple/protocols/qq/sys_msg.c:87
+#, fuzzy
+msgid "Do you want to approve the request?"
 msgstr "その要求を承認しますか?"
 
-#: ../libpurple/protocols/qq/group_opt.c:234
-msgid "You have successfully modify Qun member"
+#: ../libpurple/protocols/qq/group_opt.c:137
+#, fuzzy
+msgid "Enter your reason:"
+msgstr "理由を入力して下さい:"
+
+#: ../libpurple/protocols/qq/group_opt.c:235
+#, fuzzy
+msgid "You have successfully modified Qun member"
 msgstr "Qun メンバの変更が完了しました"
 
-#: ../libpurple/protocols/qq/group_opt.c:304
-msgid "You have successfully modify Qun information"
+#: ../libpurple/protocols/qq/group_opt.c:305
+#, fuzzy
+msgid "You have successfully modified Qun information"
 msgstr "Qun 情報の変更が完了しました"
 
-#: ../libpurple/protocols/qq/group_opt.c:391
+#: ../libpurple/protocols/qq/group_opt.c:392
 msgid "You have successfully created a Qun"
 msgstr "Qun の生成が完了しました"
 
-#: ../libpurple/protocols/qq/group_opt.c:393
+#: ../libpurple/protocols/qq/group_opt.c:394
 msgid "Would you like to set up the Qun details now?"
 msgstr "今すぐ Qun の詳細な情報を入力しますか?"
 
-#: ../libpurple/protocols/qq/group_opt.c:397
+#: ../libpurple/protocols/qq/group_opt.c:398
 msgid "Setup"
 msgstr "入力する"
 
-#: ../libpurple/protocols/qq/im.c:430
+#: ../libpurple/protocols/qq/im.c:432
 msgid "System Message"
 msgstr "システム・メッセージ"
 
-#: ../libpurple/protocols/qq/im.c:574
-msgid "Server ACK"
-msgstr "サーバの ACK"
-
-#: ../libpurple/protocols/qq/im.c:574
-msgid "Send IM fail\n"
-msgstr "メールの送信エラー\n"
-
-#: ../libpurple/protocols/qq/keep_alive.c:85
-msgid "Keep alive error, seems connection lost!"
-msgstr "エラーが連続的に発生しています (接続が切れたと思われます!)"
+#: ../libpurple/protocols/qq/im.c:576
+#, fuzzy
+msgid "Failed to send IM."
+msgstr "名前の取得に失敗しました: %s"
+
+#: ../libpurple/protocols/qq/keep_alive.c:87
+#, fuzzy
+msgid "Keep alive error"
+msgstr "読み込み時にエラー"
 
 #: ../libpurple/protocols/qq/login_logout.c:408
-msgid "Request login token error!"
-msgstr "ログイン要求エラー!"
-
-#: ../libpurple/protocols/qq/login_logout.c:486
+#, fuzzy
+msgid "Error requesting login token"
+msgstr "接続を開始する際にエラー"
+
+#: ../libpurple/protocols/qq/login_logout.c:488
 msgid "Unable to login, check debug log"
 msgstr "ログインできません (デバッグ・ログを確認して下さい)"
 
 #. we didn't successfully connect. tdt->toc_fd is valid here
 #: ../libpurple/protocols/qq/qq.c:139 ../libpurple/protocols/toc/toc.c:173
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:108
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:188
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:109
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:189
 #: ../libpurple/protocols/yahoo/ycht.c:549
 msgid "Unable to connect."
 msgstr "接続できません"
@@ -8146,96 +9778,87 @@
 msgid "Unknown-%d"
 msgstr "不明な %d"
 
-#: ../libpurple/protocols/qq/qq.c:209
-#, c-format
-msgid "%s Address"
-msgstr "%s 住所"
-
-#: ../libpurple/protocols/qq/qq.c:240
+#: ../libpurple/protocols/qq/qq.c:211
+#, fuzzy
+msgid "TCP Address"
+msgstr "IP-アドレス"
+
+#: ../libpurple/protocols/qq/qq.c:213
+#, fuzzy
+msgid "UDP Address"
+msgstr "IP-アドレス"
+
+#: ../libpurple/protocols/qq/qq.c:242
 msgid "Level"
 msgstr "レベル"
 
-#: ../libpurple/protocols/qq/qq.c:278
-msgid "QQ: Available"
-msgstr "QQ: 在席してます"
-
-#: ../libpurple/protocols/qq/qq.c:282
-msgid "QQ: Away"
-msgstr "QQ: 離席中"
-
-#: ../libpurple/protocols/qq/qq.c:286
-msgid "QQ: Invisible"
-msgstr "QQ: 隠れています"
-
-#: ../libpurple/protocols/qq/qq.c:290
-msgid "QQ: Offline"
-msgstr "QQ: オフラインです"
-
-#: ../libpurple/protocols/qq/qq.c:371
+#: ../libpurple/protocols/qq/qq.c:373
 msgid "Invalid name"
 msgstr "名前が間違っています"
 
-#: ../libpurple/protocols/qq/qq.c:437
+#: ../libpurple/protocols/qq/qq.c:439
 #, c-format
 msgid "<b>Current Online</b>: %d<br>\n"
 msgstr "<b>現在のオンライン</b>: %d<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:438
+#: ../libpurple/protocols/qq/qq.c:440
 #, c-format
 msgid "<b>Last Refresh</b>: %s<br>\n"
 msgstr "<b>Last Refresh</b>: %s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:442
+#: ../libpurple/protocols/qq/qq.c:444
 #, c-format
 msgid "<b>Connection Mode</b>: %s<br>\n"
 msgstr "<b>接続モード</b>: %s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:443
+#: ../libpurple/protocols/qq/qq.c:445
 #, c-format
 msgid "<b>Server IP</b>: %s: %d<br>\n"
 msgstr "<b>サーバの IP</b>: %s: %d<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:444
+#: ../libpurple/protocols/qq/qq.c:446
 #, c-format
 msgid "<b>My Public IP</b>: %s<br>\n"
 msgstr "<b>My Public IP</b>: %s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:449
+#: ../libpurple/protocols/qq/qq.c:451
 #, c-format
 msgid "<b>Login Time</b>: %s<br>\n"
 msgstr "<b>ログインした日時</b>: %s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:450
+#: ../libpurple/protocols/qq/qq.c:452
 #, c-format
 msgid "<b>Last Login IP</b>: %s<br>\n"
 msgstr "<b>最後にログインした IP</b>: %s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:451
+#: ../libpurple/protocols/qq/qq.c:453
 #, c-format
 msgid "<b>Last Login Time</b>: %s\n"
 msgstr "<b>最後にログインした日時</b>: %s\n"
 
-#: ../libpurple/protocols/qq/qq.c:455
+#: ../libpurple/protocols/qq/qq.c:457
 msgid "Login Information"
 msgstr "ログイン情報"
 
-#: ../libpurple/protocols/qq/qq.c:531
-msgid "Modify My Information"
-msgstr "自分の情報の変更"
-
-#: ../libpurple/protocols/qq/qq.c:534 ../libpurple/protocols/toc/toc.c:1680
+#: ../libpurple/protocols/qq/qq.c:533
+#, fuzzy
+msgid "Set My Information"
+msgstr "サーバの情報"
+
+#: ../libpurple/protocols/qq/qq.c:536 ../libpurple/protocols/toc/toc.c:1680
 msgid "Change Password"
 msgstr "パスワードの変更"
 
-#: ../libpurple/protocols/qq/qq.c:537
+#: ../libpurple/protocols/qq/qq.c:539
 msgid "Show Login Information"
 msgstr "ログイン情報を表示する"
 
-#: ../libpurple/protocols/qq/qq.c:558
-msgid "Exit this QQ Qun"
+#: ../libpurple/protocols/qq/qq.c:560
+#, fuzzy
+msgid "Leave this QQ Qun"
 msgstr "この QQ Qun を終了する"
 
-#: ../libpurple/protocols/qq/qq.c:582
+#: ../libpurple/protocols/qq/qq.c:584
 msgid "Block this buddy"
 msgstr "この仲間を拒否する"
 
@@ -8249,25 +9872,14 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/qq/qq.c:723 ../libpurple/protocols/qq/qq.c:725
+#: ../libpurple/protocols/qq/qq.c:725 ../libpurple/protocols/qq/qq.c:727
 msgid "QQ Protocol\tPlugin"
 msgstr "QQ プロトコル\tプラグイン"
 
-#: ../libpurple/protocols/qq/qq.c:750
-msgid "Login in TCP"
-msgstr "TCP でログインする"
-
-#: ../libpurple/protocols/qq/qq.c:753
-msgid "Login Hidden"
-msgstr "ログインを隠す"
-
-#: ../libpurple/protocols/qq/qq_proxy.c:497
-msgid "Socket send error"
-msgstr "ソケット送信のエラー"
-
-#: ../libpurple/protocols/qq/qq_proxy.c:500
-msgid "Connection refused"
-msgstr "接続が拒否されました"
+#: ../libpurple/protocols/qq/qq.c:752
+#, fuzzy
+msgid "Connect using TCP"
+msgstr "接続中です"
 
 #: ../libpurple/protocols/qq/recv_core.c:309
 msgid "Socket error"
@@ -8277,80 +9889,77 @@
 msgid "Unable to read from socket"
 msgstr "ソケットを読めません"
 
-#: ../libpurple/protocols/qq/send_file.c:706
+#: ../libpurple/protocols/qq/send_file.c:707
 #, c-format
 msgid "%d has declined the file %s"
 msgstr "%d さんがファイル %s を開示しました"
 
-#: ../libpurple/protocols/qq/send_file.c:709
-#: ../libpurple/protocols/qq/send_file.c:738
+#: ../libpurple/protocols/qq/send_file.c:710
+#: ../libpurple/protocols/qq/send_file.c:739
 msgid "File Send"
 msgstr "ファイルの送信"
 
-#: ../libpurple/protocols/qq/send_file.c:735
+#: ../libpurple/protocols/qq/send_file.c:736
 #, c-format
 msgid "%d canceled the transfer of %s"
 msgstr "%d さんは %s の転送をキャンセルしました"
 
-#: ../libpurple/protocols/qq/sendqueue.c:122
+#: ../libpurple/protocols/qq/sendqueue.c:123
 msgid "Connection lost"
 msgstr "接続を閉じました"
 
 #. cancel login progress
-#: ../libpurple/protocols/qq/sendqueue.c:130
+#: ../libpurple/protocols/qq/sendqueue.c:131
 msgid "Login failed, no reply"
 msgstr "ログインに失敗しました (応答無し)"
 
-#: ../libpurple/protocols/qq/sys_msg.c:112
-msgid "Do you wanna add this buddy?"
+#: ../libpurple/protocols/qq/sys_msg.c:110
+#, fuzzy
+msgid "Do you want to add this buddy?"
 msgstr "この相手を追加しますか?"
 
 #. only need to get value
-#: ../libpurple/protocols/qq/sys_msg.c:168
+#: ../libpurple/protocols/qq/sys_msg.c:166
 #, c-format
 msgid "You have been added by %s"
 msgstr "あなたは %s さんによって追加されました"
 
-#: ../libpurple/protocols/qq/sys_msg.c:171
-msgid "Would like to add him?"
+#: ../libpurple/protocols/qq/sys_msg.c:169
+#: ../libpurple/protocols/qq/sys_msg.c:263
+msgid "Would you like to add him?"
 msgstr "彼を追加しますか?"
 
-#: ../libpurple/protocols/qq/sys_msg.c:178
-#, c-format
-msgid "%s has added you [%s]"
-msgstr "%s さんがあなた [%s] を追加しました"
-
-#: ../libpurple/protocols/qq/sys_msg.c:194
+#: ../libpurple/protocols/qq/sys_msg.c:176
+#, fuzzy, c-format
+msgid "%s has added you [%s] to his or her buddy list"
+msgstr "%s さんはあなたを仲間リストに追加しています"
+
+#: ../libpurple/protocols/qq/sys_msg.c:192
 #, c-format
 msgid "User %s rejected your request"
 msgstr "ユーザの %s さんはあなたの要求を拒否しました"
 
-#: ../libpurple/protocols/qq/sys_msg.c:214
-#, c-format
-msgid "User %s has approved your request"
+#: ../libpurple/protocols/qq/sys_msg.c:212
+#, fuzzy, c-format
+msgid "User %s approved your request"
 msgstr "ユーザの %s さんがあなたの要求を承認しました"
 
-#. TODO: 'wanna' is not an appropriate word for this string. Fix after string freeze
 #. TODO: this should go through purple_account_request_authorization()
-#: ../libpurple/protocols/qq/sys_msg.c:241
-#, c-format
-msgid "%s wanna add you [%s] as friends"
+#: ../libpurple/protocols/qq/sys_msg.c:238
+#, fuzzy, c-format
+msgid "%s wants to add you [%s] as a friend"
 msgstr "%s さんがあなた [%s] を友達として追加したがっています"
 
-#: ../libpurple/protocols/qq/sys_msg.c:242
+#: ../libpurple/protocols/qq/sys_msg.c:239
 #, c-format
 msgid "Message: %s"
 msgstr "メッセージ: %s"
 
-#: ../libpurple/protocols/qq/sys_msg.c:264
+#: ../libpurple/protocols/qq/sys_msg.c:261
 #, c-format
 msgid "%s is not in your buddy list"
 msgstr "%s さんは仲間リストにはありません"
 
-#: ../libpurple/protocols/qq/sys_msg.c:266
-msgid "Would you like to add him?"
-msgstr "彼を追加しますか?"
-
 #: ../libpurple/protocols/sametime/sametime.c:417
 msgid "Connection closed (writing)"
 msgstr "書き込み用の接続を閉じました"
@@ -8414,10 +10023,6 @@
 msgid "Starting Services"
 msgstr "サービスの開始"
 
-#: ../libpurple/protocols/sametime/sametime.c:1544
-msgid "Connected"
-msgstr "接続しました"
-
 #: ../libpurple/protocols/sametime/sametime.c:1645
 #, c-format
 msgid ""
@@ -8472,10 +10077,6 @@
 msgid "Video Camera"
 msgstr "ビデオ・カメラ"
 
-#: ../libpurple/protocols/sametime/sametime.c:3235
-msgid "File Transfer"
-msgstr "ファイルの転送"
-
 #: ../libpurple/protocols/sametime/sametime.c:3269
 #: ../libpurple/protocols/sametime/sametime.c:4145
 msgid "Supports"
@@ -8541,7 +10142,7 @@
 msgid "Send TEST Announcement"
 msgstr "TEST 用アナウンスを送信する"
 
-#: ../libpurple/protocols/sametime/sametime.c:3586 ../pidgin/gtkconv.c:4290
+#: ../libpurple/protocols/sametime/sametime.c:3586 ../pidgin/gtkconv.c:4417
 msgid "Topic:"
 msgstr "トピック:"
 
@@ -8566,7 +10167,7 @@
 msgid "No Sametime Community Server Specified"
 msgstr "Sametime コミュニティ・サーバを指定して下さい"
 
-#: ../libpurple/protocols/sametime/sametime.c:3644 ../pidgin/gtkblist.c:4006
+#: ../libpurple/protocols/sametime/sametime.c:3644 ../pidgin/gtkblist.c:4323
 msgid "Connect"
 msgstr "接続"
 
@@ -8619,10 +10220,6 @@
 "ID '%s' に該当するユーザが Sametime コミュニティの中にはいませんでした。仲間"
 "リストからこのエントリを削除しました。"
 
-#: ../libpurple/protocols/sametime/sametime.c:4425
-msgid "Unable to add user"
-msgstr "ユーザを追加できません"
-
 #: ../libpurple/protocols/sametime/sametime.c:5011
 #, c-format
 msgid ""
@@ -8744,7 +10341,7 @@
 "のユーザを仲間リストに追加するか、または次のアクション・ボタンを選択して彼ら"
 "にメッセージを送信した方が良いでしょう。"
 
-#: ../libpurple/protocols/sametime/sametime.c:5538 ../pidgin/gtknotify.c:722
+#: ../libpurple/protocols/sametime/sametime.c:5538 ../pidgin/gtknotify.c:755
 msgid "Search Results"
 msgstr "検索結果"
 
@@ -9184,13 +10781,6 @@
 msgid "User Modes"
 msgstr "ユーザ・モード"
 
-#: ../libpurple/protocols/silc/buddy.c:1557
-#: ../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:1224
 #: ../libpurple/protocols/silc10/buddy.c:1562
@@ -9570,7 +11160,8 @@
 msgstr "キーの同意に失敗しました"
 
 #: ../libpurple/protocols/silc/ft.c:114
-msgid "Connection timedout"
+#, fuzzy
+msgid "Connection timed out"
 msgstr "接続がタイムアウトしました"
 
 #: ../libpurple/protocols/silc/ft.c:118
@@ -9720,7 +11311,7 @@
 #: ../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
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1071
 msgid "Real Name"
 msgstr "氏名"
 
@@ -9854,13 +11445,6 @@
 msgstr "ネットワークの統計情報"
 
 #: ../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:1596
 #: ../libpurple/protocols/silc10/ops.c:1612
 msgid "Ping failed"
 msgstr "Ping に失敗しました"
@@ -10017,7 +11601,7 @@
 msgstr "現在の Mood"
 
 #: ../libpurple/protocols/silc/silc.c:741
-#: ../libpurple/protocols/silc10/silc.c:652 ../pidgin/gtkprefs.c:1566
+#: ../libpurple/protocols/silc10/silc.c:652 ../pidgin/gtkprefs.c:1643
 msgid "Normal"
 msgstr "標準"
 
@@ -10406,68 +11990,68 @@
 #. *< name
 #. *< version
 #. *  summary
-#: ../libpurple/protocols/silc/silc.c:1875
-#: ../libpurple/protocols/silc10/silc.c:1817
+#: ../libpurple/protocols/silc/silc.c:1876
+#: ../libpurple/protocols/silc10/silc.c:1819
 msgid "SILC Protocol Plugin"
 msgstr "SILC プロトコルのプラグイン"
 
 #. *  description
-#: ../libpurple/protocols/silc/silc.c:1877
-#: ../libpurple/protocols/silc10/silc.c:1819
+#: ../libpurple/protocols/silc/silc.c:1878
+#: ../libpurple/protocols/silc10/silc.c:1821
 msgid "Secure Internet Live Conferencing (SILC) Protocol"
 msgstr "セキュアなインターネット・ライブ会議 (SILC) プロトコル"
 
-#: ../libpurple/protocols/silc/silc.c:1909
-#: ../libpurple/protocols/silc10/silc.c:1851 ../pidgin/gtkprefs.c:1959
+#: ../libpurple/protocols/silc/silc.c:1910
+#: ../libpurple/protocols/silc10/silc.c:1853 ../pidgin/gtkprefs.c:2038
 msgid "Network"
 msgstr "ネットワーク"
 
-#: ../libpurple/protocols/silc/silc.c:1920
-#: ../libpurple/protocols/silc10/silc.c:1862
+#: ../libpurple/protocols/silc/silc.c:1921
+#: ../libpurple/protocols/silc10/silc.c:1864
 msgid "Public Key file"
 msgstr "公開鍵ファイル"
 
-#: ../libpurple/protocols/silc/silc.c:1924
-#: ../libpurple/protocols/silc10/silc.c:1866
+#: ../libpurple/protocols/silc/silc.c:1925
+#: ../libpurple/protocols/silc10/silc.c:1868
 msgid "Private Key file"
 msgstr "秘密鍵ファイル"
 
-#: ../libpurple/protocols/silc/silc.c:1934
-#: ../libpurple/protocols/silc10/silc.c:1876
+#: ../libpurple/protocols/silc/silc.c:1935
+#: ../libpurple/protocols/silc10/silc.c:1878
 msgid "Cipher"
 msgstr "暗号"
 
-#: ../libpurple/protocols/silc/silc.c:1944
-#: ../libpurple/protocols/silc10/silc.c:1886
+#: ../libpurple/protocols/silc/silc.c:1945
+#: ../libpurple/protocols/silc10/silc.c:1888
 msgid "HMAC"
 msgstr "HMAC"
 
-#: ../libpurple/protocols/silc/silc.c:1947
+#: ../libpurple/protocols/silc/silc.c:1948
 msgid "Use Perfect Forward Secrecy"
 msgstr "PFS (Perfect Forward Secrecy) を使う"
 
-#: ../libpurple/protocols/silc/silc.c:1951
-#: ../libpurple/protocols/silc10/silc.c:1889
+#: ../libpurple/protocols/silc/silc.c:1952
+#: ../libpurple/protocols/silc10/silc.c:1891
 msgid "Public key authentication"
 msgstr "公開鍵を認証する"
 
-#: ../libpurple/protocols/silc/silc.c:1954
-#: ../libpurple/protocols/silc10/silc.c:1892
+#: ../libpurple/protocols/silc/silc.c:1955
+#: ../libpurple/protocols/silc10/silc.c:1894
 msgid "Block IMs without Key Exchange"
 msgstr "鍵の交換が無い IM を拒否する"
 
-#: ../libpurple/protocols/silc/silc.c:1957
-#: ../libpurple/protocols/silc10/silc.c:1895
+#: ../libpurple/protocols/silc/silc.c:1958
+#: ../libpurple/protocols/silc10/silc.c:1897
 msgid "Block messages to whiteboard"
 msgstr "ホワイトボードへのメッセージをブロックする"
 
-#: ../libpurple/protocols/silc/silc.c:1960
-#: ../libpurple/protocols/silc10/silc.c:1898
+#: ../libpurple/protocols/silc/silc.c:1961
+#: ../libpurple/protocols/silc10/silc.c:1900
 msgid "Automatically open whiteboard"
 msgstr "ホワイトボードを自動的に公開する"
 
-#: ../libpurple/protocols/silc/silc.c:1963
-#: ../libpurple/protocols/silc10/silc.c:1901
+#: ../libpurple/protocols/silc/silc.c:1964
+#: ../libpurple/protocols/silc10/silc.c:1903
 msgid "Digitally sign and verify all messages"
 msgstr "電子署名して全てのメッセージを検証する"
 
@@ -10681,26 +12265,31 @@
 msgstr "書き込めませんでした"
 
 #: ../libpurple/protocols/simple/simple.c:438
-#: ../libpurple/protocols/simple/simple.c:1484
+#: ../libpurple/protocols/simple/simple.c:1531
 msgid "Could not connect"
 msgstr "接続できませんでした"
 
-#: ../libpurple/protocols/simple/simple.c:1518
-#: ../libpurple/protocols/simple/simple.c:1560
-#: ../libpurple/protocols/simple/simple.c:1573
-#: ../libpurple/protocols/simple/simple.c:1624
+#: ../libpurple/protocols/simple/simple.c:1061
+#, fuzzy
+msgid "Unknown server response."
+msgstr "原因は不明です"
+
+#: ../libpurple/protocols/simple/simple.c:1565
+#: ../libpurple/protocols/simple/simple.c:1607
+#: ../libpurple/protocols/simple/simple.c:1620
+#: ../libpurple/protocols/simple/simple.c:1671
 msgid "Could not create listen socket"
 msgstr "ソケットを生成できませんでした"
 
-#: ../libpurple/protocols/simple/simple.c:1541
+#: ../libpurple/protocols/simple/simple.c:1588
 msgid "Couldn't resolve host"
 msgstr "ホスト名を解決できませんでした"
 
-#: ../libpurple/protocols/simple/simple.c:1632
+#: ../libpurple/protocols/simple/simple.c:1679
 msgid "Could not resolve hostname"
 msgstr "ホスト名を解決できませんでした"
 
-#: ../libpurple/protocols/simple/simple.c:1649
+#: ../libpurple/protocols/simple/simple.c:1696
 msgid "SIP screen names may not contain whitespaces or @ symbols"
 msgstr "SIP のスクリーン名に空白または @ 記号が含まれていないようです"
 
@@ -10712,36 +12301,36 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../libpurple/protocols/simple/simple.c:1824
+#: ../libpurple/protocols/simple/simple.c:1872
 msgid "SIP/SIMPLE Protocol Plugin"
 msgstr "SIP/SIMPLE プロトコルのプラグイン"
 
 #. *  summary
-#: ../libpurple/protocols/simple/simple.c:1825
+#: ../libpurple/protocols/simple/simple.c:1873
 msgid "The SIP/SIMPLE Protocol Plugin"
 msgstr "SIP/SIMPLE プロトコルのプラグイン"
 
-#: ../libpurple/protocols/simple/simple.c:1853
+#: ../libpurple/protocols/simple/simple.c:1901
 msgid "Publish status (note: everyone may watch you)"
 msgstr "状態を公開する (注記: 他のユーザから丸見えになります)"
 
-#: ../libpurple/protocols/simple/simple.c:1859
+#: ../libpurple/protocols/simple/simple.c:1907
 msgid "Use UDP"
 msgstr "UDP を使用する"
 
-#: ../libpurple/protocols/simple/simple.c:1861
+#: ../libpurple/protocols/simple/simple.c:1909
 msgid "Use proxy"
 msgstr "プロキシを利用する"
 
-#: ../libpurple/protocols/simple/simple.c:1863
+#: ../libpurple/protocols/simple/simple.c:1911
 msgid "Proxy"
 msgstr "プロキシ"
 
-#: ../libpurple/protocols/simple/simple.c:1865
+#: ../libpurple/protocols/simple/simple.c:1913
 msgid "Auth User"
 msgstr "ユーザ認証"
 
-#: ../libpurple/protocols/simple/simple.c:1867
+#: ../libpurple/protocols/simple/simple.c:1915
 msgid "Auth Domain"
 msgstr "ドメイン認証"
 
@@ -10900,8 +12489,8 @@
 msgid "Password Change Successful"
 msgstr "パスワードの変更が完了しました"
 
-#: ../libpurple/protocols/toc/toc.c:1366 ../pidgin/gtkblist.c:5502
-#: ../pidgin/gtkblist.c:5856
+#: ../libpurple/protocols/toc/toc.c:1366 ../pidgin/gtkblist.c:5871
+#: ../pidgin/gtkblist.c:6227
 msgid "_Group:"
 msgstr "グループ(_G):"
 
@@ -10962,31 +12551,25 @@
 msgid "TOC Protocol Plugin"
 msgstr "TOC プロトコル・プラグイン"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:810
+#: ../libpurple/protocols/yahoo/yahoo.c:784
+#, c-format
+msgid "%s has sent you a webcam invite, which is not yet supported."
+msgstr ""
+
+#: ../libpurple/protocols/yahoo/yahoo.c:840
 msgid "Your Yahoo! message did not get sent."
 msgstr "Yahoo! メッセージを送ることができませんでした。"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:880
-#, c-format
-msgid "%s just sent you a Buzz!"
-msgstr "%s さんが合図を送りたがっています!"
-
-#: ../libpurple/protocols/yahoo/yahoo.c:927
+#: ../libpurple/protocols/yahoo/yahoo.c:959
 #, c-format
 msgid "Yahoo! system message for %s:"
 msgstr "%s の Yahoo! システム・メッセージ:"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:986
+#: ../libpurple/protocols/yahoo/yahoo.c:1028
 msgid "Authorization denied message:"
 msgstr "承認を拒否する旨のメッセージ:"
 
-#: ../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:1070
+#: ../libpurple/protocols/yahoo/yahoo.c:1046
 #, c-format
 msgid ""
 "%s has (retroactively) denied your request to add them to your list for the "
@@ -10995,11 +12578,17 @@
 "%s は次の理由のため仲間リストに追加するあなたの要求を (以前にさかのぼって) 拒"
 "否しました\" %s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1073
+#: ../libpurple/protocols/yahoo/yahoo.c:1049
+#, c-format
+msgid "%s has (retroactively) denied your request to add them to your list."
+msgstr ""
+"%s は仲間リストに追加するあなたの要求を (以前にさかのぼって) 拒否しました。"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:1051
 msgid "Add buddy rejected"
 msgstr "拒否する仲間の追加"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1824
+#: ../libpurple/protocols/yahoo/yahoo.c:1993
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -11010,11 +12599,11 @@
 "pidgin ではおそらく Yahoo にサイン・インできないでしょう。%s にアップデートで"
 "きるか確認してみて下さい。"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1827
+#: ../libpurple/protocols/yahoo/yahoo.c:1996
 msgid "Failed Yahoo! Authentication"
 msgstr "Yahoo! 認証に失敗"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1893
+#: ../libpurple/protocols/yahoo/yahoo.c:2062
 #, c-format
 msgid ""
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
@@ -11023,54 +12612,54 @@
 "%s を無視しようとしましたが、ユーザが仲間リストにあります。そのユーザを仲間リ"
 "ストから削除して無視する場合は、\"はい\" をクリックして下さい。"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1896
+#: ../libpurple/protocols/yahoo/yahoo.c:2065
 msgid "Ignore buddy?"
 msgstr "仲間を無視しますか?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1955
+#: ../libpurple/protocols/yahoo/yahoo.c:2128
 msgid "Your account is locked, please log in to the Yahoo! website."
 msgstr ""
 "お使いのアカウントがロックされています。Yahoo! ウェブサイトへログインして下さ"
 "い。"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1958
+#: ../libpurple/protocols/yahoo/yahoo.c:2131
 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr ""
 "不明なエラー番号 %d です。Yahoo! ウェブサイトへログインすると修正されるかもし"
 "れません。"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2012
+#: ../libpurple/protocols/yahoo/yahoo.c:2185
 #, c-format
 msgid "Could not add buddy %s to group %s to the server list on account %s."
 msgstr ""
 "グループ %2$s の仲間 %1$s をアカウント %3$s でサーバ・リストに追加できません"
 "でした。"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2015
+#: ../libpurple/protocols/yahoo/yahoo.c:2188
 msgid "Could not add buddy to server list"
 msgstr "仲間をサーバ・リストに追加できませんでした"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2134
+#: ../libpurple/protocols/yahoo/yahoo.c:2307
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ 演奏可能 %s/%s/%s.swf ] %s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2474
+#: ../libpurple/protocols/yahoo/yahoo.c:2650
 msgid "Received unexpected HTTP response from server."
 msgstr "サーバから想定外の HTTP 応答を受け取りました"
 
-#: ../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/yahoo.c:2674
+#: ../libpurple/protocols/yahoo/yahoo.c:2860
+#: ../libpurple/protocols/yahoo/yahoo.c:2963
+#: ../libpurple/protocols/yahoo/yahoo.c:2973
+#: ../libpurple/protocols/yahoo/yahoochat.c:1514
+#: ../libpurple/protocols/yahoo/yahoochat.c:1584
 #: ../libpurple/protocols/yahoo/ycht.c:585
 msgid "Connection problem"
 msgstr "接続エラー"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2524
+#: ../libpurple/protocols/yahoo/yahoo.c:2700
 #, c-format
 msgid ""
 "Lost connection with %s:\n"
@@ -11079,7 +12668,7 @@
 "%s との接続を失いました:\n"
 "%s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2549
+#: ../libpurple/protocols/yahoo/yahoo.c:2725
 #, c-format
 msgid ""
 "Could not establish a connection with %s:\n"
@@ -11088,108 +12677,105 @@
 "%s との接続を確立できませんでした:\n"
 "%s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2899
-#: ../libpurple/protocols/yahoo/yahoo.c:3510
+#: ../libpurple/protocols/yahoo/yahoo.c:3080
+#: ../libpurple/protocols/yahoo/yahoo.c:3766
 msgid "Not at Home"
 msgstr "家に居ません"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2901
-#: ../libpurple/protocols/yahoo/yahoo.c:3513
+#: ../libpurple/protocols/yahoo/yahoo.c:3082
+#: ../libpurple/protocols/yahoo/yahoo.c:3769
 msgid "Not at Desk"
 msgstr "在席していません"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2903
-#: ../libpurple/protocols/yahoo/yahoo.c:3516
+#: ../libpurple/protocols/yahoo/yahoo.c:3084
+#: ../libpurple/protocols/yahoo/yahoo.c:3772
 msgid "Not in Office"
 msgstr "オフィスに居ません"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2907
-#: ../libpurple/protocols/yahoo/yahoo.c:3522
+#: ../libpurple/protocols/yahoo/yahoo.c:3088
+#: ../libpurple/protocols/yahoo/yahoo.c:3778
 msgid "On Vacation"
 msgstr "休暇中です"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2911
-#: ../libpurple/protocols/yahoo/yahoo.c:3528
+#: ../libpurple/protocols/yahoo/yahoo.c:3092
+#: ../libpurple/protocols/yahoo/yahoo.c:3784
 msgid "Stepped Out"
 msgstr "ちょっとそこまで"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3004
-#: ../libpurple/protocols/yahoo/yahoo.c:3034
+#: ../libpurple/protocols/yahoo/yahoo.c:3185
+#: ../libpurple/protocols/yahoo/yahoo.c:3215
 msgid "Not on server list"
 msgstr "サーバ・リストにありません"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3051
-#: ../libpurple/protocols/yahoo/yahoo.c:3109
+#: ../libpurple/protocols/yahoo/yahoo.c:3232
+#: ../libpurple/protocols/yahoo/yahoo.c:3290
 msgid "Appear Online"
 msgstr "オンラインのようです"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3054
-#: ../libpurple/protocols/yahoo/yahoo.c:3130
+#: ../libpurple/protocols/yahoo/yahoo.c:3235
+#: ../libpurple/protocols/yahoo/yahoo.c:3311
 msgid "Appear Permanently Offline"
 msgstr "一時的にオフラインのようです"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3072
+#: ../libpurple/protocols/yahoo/yahoo.c:3253
 msgid "Presence"
 msgstr "在席"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3115
+#: ../libpurple/protocols/yahoo/yahoo.c:3296
 msgid "Appear Offline"
 msgstr "オフラインのようです"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3124
+#: ../libpurple/protocols/yahoo/yahoo.c:3305
 msgid "Don't Appear Permanently Offline"
 msgstr "Don't Appear Permanently Offline"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3172
+#: ../libpurple/protocols/yahoo/yahoo.c:3353
 msgid "Join in Chat"
 msgstr "チャットへ参加"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3178
+#: ../libpurple/protocols/yahoo/yahoo.c:3359
 msgid "Initiate Conference"
 msgstr "会議に招待"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3206
+#: ../libpurple/protocols/yahoo/yahoo.c:3387
 msgid "Presence Settings"
 msgstr "在席状態の設定"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3212
+#: ../libpurple/protocols/yahoo/yahoo.c:3393
 msgid "Start Doodling"
 msgstr "いたずら書きする"
 
-#. XXX Typo: This should be _("Activate which ID?") - fix after string freeze is over
-#: ../libpurple/protocols/yahoo/yahoo.c:3245
-msgid "Active which ID?"
+#: ../libpurple/protocols/yahoo/yahoo.c:3494
+#, fuzzy
+msgid "Activate which ID?"
 msgstr "どの ID を有効化しますか?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3256
+#: ../libpurple/protocols/yahoo/yahoo.c:3505
 msgid "Join whom in chat?"
 msgstr "どのチャットへ参加しますか?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3268
+#: ../libpurple/protocols/yahoo/yahoo.c:3517
 msgid "Activate ID..."
 msgstr "ID の有効化..."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3272
+#: ../libpurple/protocols/yahoo/yahoo.c:3521
 msgid "Join User in Chat..."
 msgstr "チャットに参加する..."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3779
-msgid "You have just sent a Buzz!"
-msgstr "今、合図を送りました!"
-
-#: ../libpurple/protocols/yahoo/yahoo.c:3838
+#: ../libpurple/protocols/yahoo/yahoo.c:3526
+#, fuzzy
+msgid "Open Inbox"
+msgstr "Hotmail の受信箱を開く"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:4135
 msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
 msgstr "join &lt;ルーム&gt;: Yahoo ネットワーク上にあるチャットへ参加する"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3843
+#: ../libpurple/protocols/yahoo/yahoo.c:4140
 msgid "list: List rooms on the Yahoo network"
 msgstr "list: Yahoo ネットワーク上にあるルームを一覧表示します"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3847
-msgid "buzz: Buzz a user to get their attention"
-msgstr "buzz: ユーザ宛に警告音を鳴らす"
-
-#: ../libpurple/protocols/yahoo/yahoo.c:3851
+#: ../libpurple/protocols/yahoo/yahoo.c:4148
 msgid "doodle: Request user to start a Doodle session"
 msgstr "doodle: いたずら書きを始めることをユーザに要求する"
 
@@ -11203,130 +12789,59 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/yahoo/yahoo.c:4059
-#: ../libpurple/protocols/yahoo/yahoo.c:4061
+#: ../libpurple/protocols/yahoo/yahoo.c:4357
+#: ../libpurple/protocols/yahoo/yahoo.c:4359
 msgid "Yahoo Protocol Plugin"
 msgstr "Yahoo! プロトコル・プラグイン"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4084
+#: ../libpurple/protocols/yahoo/yahoo.c:4382
 msgid "Yahoo Japan"
 msgstr "Yahoo Japan! に接続する"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4087
+#: ../libpurple/protocols/yahoo/yahoo.c:4385
 msgid "Pager server"
 msgstr "ページャのサーバ"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4090
+#: ../libpurple/protocols/yahoo/yahoo.c:4388
 msgid "Japan Pager server"
 msgstr "日本のページャ・サーバ"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4093
+#: ../libpurple/protocols/yahoo/yahoo.c:4391
 msgid "Pager port"
 msgstr "ページャのポート番号"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4096
+#: ../libpurple/protocols/yahoo/yahoo.c:4394
 msgid "File transfer server"
 msgstr "ファイル転送サーバ"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4099
+#: ../libpurple/protocols/yahoo/yahoo.c:4397
 msgid "Japan file transfer server"
 msgstr "日本のファイル転送サーバ"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4102
+#: ../libpurple/protocols/yahoo/yahoo.c:4400
 msgid "File transfer port"
 msgstr "ファイル転送のポート番号"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4105
+#: ../libpurple/protocols/yahoo/yahoo.c:4403
 msgid "Chat room locale"
 msgstr "チャット・ルームの場所"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4108
+#: ../libpurple/protocols/yahoo/yahoo.c:4406
 msgid "Ignore conference and chatroom invitations"
 msgstr "会議とチャットルームの招待を無視する"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4116
+#: ../libpurple/protocols/yahoo/yahoo.c:4414
 msgid "Chat room list URL"
 msgstr "チャット・ルームの URL リスト"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4119
+#: ../libpurple/protocols/yahoo/yahoo.c:4417
 msgid "Yahoo Chat server"
 msgstr "Yahoo チャット・サーバ"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4122
+#: ../libpurple/protocols/yahoo/yahoo.c:4420
 msgid "Yahoo Chat port"
 msgstr "Yahoo チャットのポート番号"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:203
-#, c-format
-msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
-msgstr "%s は会議招待を部屋 \"%s\" に落としました (理由は \"%s\")。"
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:205
-msgid "Invitation Rejected"
-msgstr "招待が拒否されました"
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:361
-msgid "Failed to join chat"
-msgstr "チャットへの参加が失敗しました"
-
-#. -6
-#: ../libpurple/protocols/yahoo/yahoochat.c:364
-msgid "Unknown room"
-msgstr "不明なルーム"
-
-#. -15
-#: ../libpurple/protocols/yahoo/yahoochat.c:367
-msgid "Maybe the room is full"
-msgstr "おそらくルームが一杯かも?"
-
-#. -35
-#: ../libpurple/protocols/yahoo/yahoochat.c:370
-msgid "Not available"
-msgstr "利用不可"
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:374
-msgid ""
-"Unknown error. You may need to logout and wait five minutes before being "
-"able to rejoin a chatroom"
-msgstr ""
-"原因不明のエラーです (ログアウトし 5秒ほど待機してから、もう一度チャトルーム"
-"へ参加して下さい)"
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:452
-#, c-format
-msgid "You are now chatting in %s."
-msgstr "あなたは %s でチャットしています"
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:627
-msgid "Failed to join buddy in chat"
-msgstr "チャットの仲間に参加できません"
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:628
-msgid "Maybe they're not in a chat?"
-msgstr "おそらくチャットには誰もいないかも?"
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:1357
-#: ../libpurple/protocols/yahoo/yahoochat.c:1383
-msgid "Fetching the room list failed."
-msgstr "部屋一覧の取得に失敗しました"
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:1441
-msgid "Voices"
-msgstr "音声"
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:1444
-msgid "Webcams"
-msgstr "ウェブカム"
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:1455
-#: ../libpurple/protocols/yahoo/yahoochat.c:1525
-msgid "Unable to fetch room list."
-msgstr "部屋一覧を取得できません"
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:1518
-msgid "User Rooms"
-msgstr "ユーザの部屋"
-
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
@@ -11334,26 +12849,26 @@
 msgid "Sent Doodle request."
 msgstr "Doodle 要求を送信する"
 
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:269
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:278
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:291
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:270
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:279
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:288
 msgid "Unable to establish file descriptor."
 msgstr "ファイル・デスクリプタを取得できません"
 
 #. TODO: what to do here - do we really have to disconnect?
-#: ../libpurple/protocols/yahoo/yahoo_packet.c:302
+#: ../libpurple/protocols/yahoo/yahoo_packet.c:307
 msgid "Write Error"
 msgstr "書き込みエラー"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:773
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:797
 msgid "Yahoo! Japan Profile"
 msgstr "Yahoo! Japan プロファイル"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:774
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:798
 msgid "Yahoo! Profile"
 msgstr "Yahoo! プロファイル"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:814
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:838
 msgid ""
 "Sorry, profiles marked as containing adult content are not supported at this "
 "time."
@@ -11361,7 +12876,7 @@
 "すみません、このバージョンでは、アダルト向けコンテンツを含んでいるとマークが"
 "付けられたプロファイルは利用いただけません."
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:816
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:840
 msgid ""
 "If you wish to view this profile, you will need to visit this link in your "
 "web browser:"
@@ -11369,47 +12884,47 @@
 "このプロフィールの閲覧を希望する場合は、お使いのウェブ・ブラウザから次のリン"
 "クを訪問して下さい:"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1010
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1034
 msgid "Yahoo! ID"
 msgstr "Yahoo! ID"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1085
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1089
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1093
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1109
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1113
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1117
 msgid "Hobbies"
 msgstr "趣味"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1103
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1107
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1127
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1131
 msgid "Latest News"
 msgstr "最新ニュース"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1128
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1152
 msgid "Home Page"
 msgstr "ホームページ"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1143
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1167
 msgid "Cool Link 1"
 msgstr "クールなリンク1"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1148
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1172
 msgid "Cool Link 2"
 msgstr "クールなリンク2"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1152
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1176
 msgid "Cool Link 3"
 msgstr "クールなリンク3"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1166
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1190
 msgid "Last Update"
 msgstr "最終更新日"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1175
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1199
 #, c-format
 msgid "User information for %s unavailable"
 msgstr "%s のユーザ情報は有効ではありません"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1181
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1205
 msgid ""
 "Sorry, this profile seems to be in a language or format that is not "
 "supported at this time."
@@ -11417,7 +12932,7 @@
 "すみません、このプロファイルはこのバージョンではサポートされていない書式/言語"
 "のようです。"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1197
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1221
 msgid ""
 "Could not retrieve the user's profile. This most likely is a temporary "
 "server-side problem. Please try again later."
@@ -11425,7 +12940,7 @@
 "ユーザのプロフィールを取得できませんでした。これは、おそらく一時的なサーバ側"
 "の問題でしょう。後で再試行してみて下さい。"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1200
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1224
 msgid ""
 "Could not retrieve the user's profile. This most likely means that the user "
 "does not exist; however, Yahoo! sometimes does fail to find a user's "
@@ -11436,10 +12951,81 @@
 "ることがあります。そのユーザが存在していることが確かならば、後で再試行してみ"
 "て下さい。"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1207
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1231
 msgid "The user's profile is empty."
 msgstr "ユーザのプロフィールが空です。"
 
+#: ../libpurple/protocols/yahoo/yahoochat.c:217
+#, c-format
+msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
+msgstr "%s は会議招待を部屋 \"%s\" に落としました (理由は \"%s\")。"
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:219
+msgid "Invitation Rejected"
+msgstr "招待が拒否されました"
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:438
+msgid "Failed to join chat"
+msgstr "チャットへの参加が失敗しました"
+
+#. -6
+#: ../libpurple/protocols/yahoo/yahoochat.c:441
+msgid "Unknown room"
+msgstr "不明なルーム"
+
+#. -15
+#: ../libpurple/protocols/yahoo/yahoochat.c:444
+msgid "Maybe the room is full"
+msgstr "おそらくルームが一杯かも?"
+
+#. -35
+#: ../libpurple/protocols/yahoo/yahoochat.c:447
+msgid "Not available"
+msgstr "利用不可"
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:451
+msgid ""
+"Unknown error. You may need to logout and wait five minutes before being "
+"able to rejoin a chatroom"
+msgstr ""
+"原因不明のエラーです (ログアウトし 5秒ほど待機してから、もう一度チャトルーム"
+"へ参加して下さい)"
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:534
+#, c-format
+msgid "You are now chatting in %s."
+msgstr "あなたは %s でチャットしています"
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:719
+msgid "Failed to join buddy in chat"
+msgstr "チャットの仲間に参加できません"
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:720
+msgid "Maybe they're not in a chat?"
+msgstr "おそらくチャットには誰もいないかも?"
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:1416
+#: ../libpurple/protocols/yahoo/yahoochat.c:1442
+msgid "Fetching the room list failed."
+msgstr "部屋一覧の取得に失敗しました"
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:1500
+msgid "Voices"
+msgstr "音声"
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:1503
+msgid "Webcams"
+msgstr "ウェブカム"
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:1514
+#: ../libpurple/protocols/yahoo/yahoochat.c:1584
+msgid "Unable to fetch room list."
+msgstr "部屋一覧を取得できません"
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:1577
+msgid "User Rooms"
+msgstr "ユーザの部屋"
+
 #: ../libpurple/protocols/yahoo/ycht.c:456
 msgid "Connection problem with the YCHT server."
 msgstr "YCHT サーバを使った接続に問題があります。"
@@ -11466,11 +13052,6 @@
 msgid "Unable to send to chat %s,%s,%s"
 msgstr "チャット %s,%s,%s へ送信できません"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:786
-#: ../libpurple/protocols/zephyr/zephyr.c:1204
-msgid "User"
-msgstr "ユーザ"
-
 #: ../libpurple/protocols/zephyr/zephyr.c:791
 #: ../libpurple/protocols/zephyr/zephyr.c:1210
 msgid "Hidden or not logged-in"
@@ -11624,8 +13205,8 @@
 msgid "Exposure"
 msgstr "Exposure"
 
-#: ../libpurple/proxy.c:458 ../libpurple/proxy.c:877 ../libpurple/proxy.c:1032
-#: ../libpurple/proxy.c:1600
+#: ../libpurple/proxy.c:459 ../libpurple/proxy.c:894 ../libpurple/proxy.c:1049
+#: ../libpurple/proxy.c:1617
 #, c-format
 msgid ""
 "Unable to create socket:\n"
@@ -11634,68 +13215,78 @@
 "ソケットを生成できません:\n"
 "%s"
 
-#: ../libpurple/proxy.c:658
+#: ../libpurple/proxy.c:659
 #, c-format
 msgid "Unable to parse response from HTTP proxy: %s\n"
 msgstr "HTTP プロキシからの応答を解析できません: %s\n"
 
-#: ../libpurple/proxy.c:686 ../libpurple/proxy.c:732 ../libpurple/proxy.c:770
-#: ../libpurple/proxy.c:782
+#: ../libpurple/proxy.c:698 ../libpurple/proxy.c:744 ../libpurple/proxy.c:780
+#: ../libpurple/proxy.c:792
 #, c-format
 msgid "HTTP proxy connection error %d"
 msgstr "HTTP プロキシの接続エラー %d"
 
-#: ../libpurple/proxy.c:778
+#: ../libpurple/proxy.c:788
 #, c-format
 msgid "Access denied: HTTP proxy server forbids port %d tunneling."
 msgstr ""
 "アクセスが拒否されました: HTTP プロキシ・サーバがポート番号 %d のトンネリング"
 "を拒否しました"
 
-#: ../libpurple/proxy.c:995
+#: ../libpurple/proxy.c:1012
 #, c-format
 msgid "Error resolving %s"
 msgstr "%s を解決する際にエラー"
 
-#: ../libpurple/proxy.c:1697
+#: ../libpurple/proxy.c:1714
 msgid "Could not resolve host name"
 msgstr "ホスト名を解決できませんでした"
 
 #. *
 #. * A wrapper for purple_request_action() that uses @c Yes and @c No buttons.
 #.
-#: ../libpurple/request.h:1377
+#: ../libpurple/request.h:1378
 msgid "_Yes"
 msgstr "はい(_Y)"
 
-#: ../libpurple/request.h:1377
+#: ../libpurple/request.h:1378
 msgid "_No"
 msgstr "いいえ(_N)"
 
 #. *
 #. * A wrapper for purple_request_action() that uses Accept and Cancel buttons.
 #.
-#: ../libpurple/request.h:1397
+#: ../libpurple/request.h:1398
 msgid "_Accept"
 msgstr "許可する(_A)"
 
 #. *
 #. * The default message to use when the user becomes auto-away.
 #.
-#: ../libpurple/savedstatuses.c:46
+#: ../libpurple/savedstatuses.c:48
 msgid "I'm not here right now"
 msgstr "今は離席中です"
 
-#: ../libpurple/savedstatuses.c:532
+#: ../libpurple/savedstatuses.c:535
 msgid "saved statuses"
 msgstr "保存した状態"
 
-#: ../libpurple/server.c:233
+#: ../libpurple/server.c:234
 #, c-format
 msgid "%s is now known as %s.\n"
 msgstr "%s さんは %s さんと認識されました\n"
 
-#: ../libpurple/server.c:679
+#: ../libpurple/server.c:302
+#, c-format
+msgid "Requesting %s's attention..."
+msgstr ""
+
+#: ../libpurple/server.c:347
+#, c-format
+msgid "%s has requested your attention!"
+msgstr ""
+
+#: ../libpurple/server.c:793
 #, c-format
 msgid ""
 "%s has invited %s to the chat room %s:\n"
@@ -11704,73 +13295,112 @@
 "%s さんが %s さんをチャット・ルーム %s へ招待しています:\n"
 "%s"
 
-#: ../libpurple/server.c:684
+#: ../libpurple/server.c:798
 #, c-format
 msgid "%s has invited %s to the chat room %s\n"
 msgstr "%s さんが %s さんをチャット・ルーム %s へ招待しています\n"
 
-#: ../libpurple/server.c:688
+#: ../libpurple/server.c:802
 msgid "Accept chat invitation?"
 msgstr "チャットへの招待を受けますか?"
 
-#: ../libpurple/status.c:152
+#: ../libpurple/sslconn.c:164
+#, fuzzy
+msgid "SSL Connection Failed"
+msgstr "接続に失敗しました"
+
+#: ../libpurple/sslconn.c:166
+msgid "SSL Handshake Failed"
+msgstr "SSL のハンドシェイクに失敗しました"
+
+#: ../libpurple/sslconn.c:168
+msgid "SSL peer presented an invalid certificate"
+msgstr ""
+
+#: ../libpurple/sslconn.c:171
+#, fuzzy
+msgid "Unknown SSL error"
+msgstr "原因不明のエラー"
+
+#: ../libpurple/status.c:153
 msgid "Unset"
 msgstr "解除"
 
-#: ../libpurple/status.c:155
-msgid "Unavailable"
-msgstr "利用不可"
+#: ../libpurple/status.c:156 ../pidgin/gtkstatusbox.c:1059
+#, fuzzy
+msgid "Do not disturb"
+msgstr "邪魔しないでね"
 
 #: ../libpurple/status.c:159
+#, fuzzy
+msgid "Extended away"
+msgstr "逃走中"
+
+#: ../libpurple/status.c:160
 msgid "Mobile"
 msgstr "移動中"
 
-#: ../libpurple/status.c:608
+#: ../libpurple/status.c:609
 #, c-format
 msgid "%s changed status from %s to %s"
 msgstr "%s さんがステータスを %s から %s に変更しました"
 
-#: ../libpurple/status.c:618
+#: ../libpurple/status.c:612
+#, fuzzy, c-format
+msgid "%s (%s) changed status from %s to %s"
+msgstr "%s さんがステータスを %s から %s に変更しました"
+
+#: ../libpurple/status.c:623
 #, c-format
 msgid "%s is now %s"
 msgstr "%s さんは %s さんと認識されました"
 
-#: ../libpurple/status.c:623
+#: ../libpurple/status.c:625
+#, fuzzy, c-format
+msgid "%s (%s) is now %s"
+msgstr "%s さんは %s さんと認識されました"
+
+#: ../libpurple/status.c:631
 #, c-format
 msgid "%s is no longer %s"
 msgstr "もう %s さんは %s さんではありません"
 
-#: ../libpurple/status.c:1233
+#: ../libpurple/status.c:633
+#, fuzzy, c-format
+msgid "%s (%s) is no longer %s"
+msgstr "もう %s さんは %s さんではありません"
+
+#: ../libpurple/status.c:1244
 #, c-format
 msgid "%s became idle"
 msgstr "%s さんが待機中になりました"
 
-#: ../libpurple/status.c:1250
+#: ../libpurple/status.c:1261
 #, c-format
 msgid "%s became unidle"
 msgstr "%s さんが待機中から復帰しました"
 
-#: ../libpurple/status.c:1313
+#: ../libpurple/status.c:1324
 #, c-format
 msgid "+++ %s became idle"
 msgstr "+++ %s さんが待機中になりました"
 
-#: ../libpurple/status.c:1315
+#: ../libpurple/status.c:1326
 #, c-format
 msgid "+++ %s became unidle"
 msgstr "+++ %s さんが待機中から復帰しました"
 
-#: ../libpurple/util.c:682
+#: ../libpurple/util.c:701
 #, c-format
 msgid "%x %X"
 msgstr "%x %X"
 
-#: ../libpurple/util.c:2586
+#: ../libpurple/util.c:2705
 #, c-format
 msgid "Error Reading %s"
 msgstr "%s を読み込む際にエラー"
 
-#: ../libpurple/util.c:2587
+#: ../libpurple/util.c:2706
 #, c-format
 msgid ""
 "An error was encountered reading your %s.  They have not been loaded, and "
@@ -11779,67 +13409,67 @@
 "%s を読み込む際にエラーが発生しました。その情報は読み込まれません。また、古い"
 "ファイルの名前を \"%s~\" に変更しました。"
 
-#: ../libpurple/util.c:3060
+#: ../libpurple/util.c:3206
 msgid "Calculating..."
 msgstr "計算中..."
 
-#: ../libpurple/util.c:3063
+#: ../libpurple/util.c:3209
 msgid "Unknown."
 msgstr "不明です"
 
-#: ../libpurple/util.c:3089
+#: ../libpurple/util.c:3235
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d秒"
 msgstr[1] "%d秒"
 
-#: ../libpurple/util.c:3101
+#: ../libpurple/util.c:3247
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d日"
 msgstr[1] "%d日"
 
-#: ../libpurple/util.c:3109
+#: ../libpurple/util.c:3255
 #, c-format
 msgid "%s, %d hour"
 msgid_plural "%s, %d hours"
 msgstr[0] "%s %d時間"
 msgstr[1] "%s %d時間"
 
-#: ../libpurple/util.c:3115
+#: ../libpurple/util.c:3261
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d時間"
 msgstr[1] "%d時間"
 
-#: ../libpurple/util.c:3123
+#: ../libpurple/util.c:3269
 #, c-format
 msgid "%s, %d minute"
 msgid_plural "%s, %d minutes"
 msgstr[0] "%s %d分"
 msgstr[1] "%s %d分"
 
-#: ../libpurple/util.c:3129
+#: ../libpurple/util.c:3275
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d分"
 msgstr[1] "%d分"
 
-#: ../libpurple/util.c:3389
+#: ../libpurple/util.c:3535
 #, c-format
 msgid "Could not open %s: Redirected too many times"
 msgstr "%s を開けませんでした: 複数回リダイレクトしました"
 
-#: ../libpurple/util.c:3426 ../libpurple/util.c:3721
+#: ../libpurple/util.c:3572 ../libpurple/util.c:3868
 #, c-format
 msgid "Unable to connect to %s"
 msgstr "%s へ接続できません"
 
-#: ../libpurple/util.c:3549
+#: ../libpurple/util.c:3695
 #, c-format
 msgid ""
 "Unable to allocate enough memory to hold the contents from %s.  The web "
@@ -11848,17 +13478,17 @@
 "%s から受け取った情報を格納するためのメモリを確保できません。ウェブ・サーバか"
 "ら何か悪意を持って転送している可能性があります。"
 
-#: ../libpurple/util.c:3584
+#: ../libpurple/util.c:3730
 #, c-format
 msgid "Error reading from %s: %s"
 msgstr "%s からの読み込みでエラー: %s"
 
-#: ../libpurple/util.c:3615
+#: ../libpurple/util.c:3761
 #, c-format
 msgid "Error writing to %s: %s"
 msgstr "%s へ書き込む際にエラー: %s"
 
-#: ../libpurple/util.c:3640
+#: ../libpurple/util.c:3786
 #, c-format
 msgid "Unable to connect to %s: %s"
 msgstr "%s へ接続できません: %s"
@@ -11884,71 +13514,71 @@
 msgstr "トレイの向きです"
 
 #. Build the login options frame.
-#: ../pidgin/gtkaccount.c:409
+#: ../pidgin/gtkaccount.c:407
 msgid "Login Options"
 msgstr "ログインのオプション"
 
-#: ../pidgin/gtkaccount.c:430
+#: ../pidgin/gtkaccount.c:428
 msgid "Pro_tocol:"
 msgstr "プロトコル(_T):"
 
-#: ../pidgin/gtkaccount.c:441
+#: ../pidgin/gtkaccount.c:439
 msgid "Screen _name:"
 msgstr "スクリーン名(_N):"
 
-#: ../pidgin/gtkaccount.c:528
+#: ../pidgin/gtkaccount.c:529
 msgid "_Local alias:"
 msgstr "別名(_L):"
 
-#: ../pidgin/gtkaccount.c:532
+#: ../pidgin/gtkaccount.c:533
 msgid "Remember pass_word"
 msgstr "パスワードを保存する(_W)"
 
 #. Build the user options frame.
-#: ../pidgin/gtkaccount.c:590
+#: ../pidgin/gtkaccount.c:591
 msgid "User Options"
 msgstr "ユーザのオプション"
 
-#: ../pidgin/gtkaccount.c:603
+#: ../pidgin/gtkaccount.c:604
 msgid "New _mail notifications"
 msgstr "新着メールを通知する(_M)"
 
 #. Buddy icon
-#: ../pidgin/gtkaccount.c:608
+#: ../pidgin/gtkaccount.c:609
 msgid "Use this buddy _icon for this account:"
 msgstr "次の仲間アイコンを使用する(_I):"
 
 #. Build the protocol options frame.
-#: ../pidgin/gtkaccount.c:728
+#: ../pidgin/gtkaccount.c:731
 #, c-format
 msgid "%s Options"
 msgstr "%s のオプション"
 
-#: ../pidgin/gtkaccount.c:934
+#: ../pidgin/gtkaccount.c:936
 msgid "Use GNOME Proxy Settings"
 msgstr "GNOME のプロキシ設定を使う"
 
-#: ../pidgin/gtkaccount.c:935
+#: ../pidgin/gtkaccount.c:937
 msgid "Use Global Proxy Settings"
 msgstr "グローバルなプロキシ設定を使う"
 
-#: ../pidgin/gtkaccount.c:941
+#: ../pidgin/gtkaccount.c:943
 msgid "No Proxy"
 msgstr "プロキシなし"
 
-#: ../pidgin/gtkaccount.c:947
+#: ../pidgin/gtkaccount.c:949
 msgid "HTTP"
 msgstr "HTTP"
 
-#: ../pidgin/gtkaccount.c:953
+#: ../pidgin/gtkaccount.c:955
 msgid "SOCKS 4"
 msgstr "SOCKS 4"
 
-#: ../pidgin/gtkaccount.c:959
+#: ../pidgin/gtkaccount.c:961
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
-#: ../pidgin/gtkaccount.c:965 ../pidgin/gtkprefs.c:1137
+#: ../pidgin/gtkaccount.c:967 ../pidgin/gtkprefs.c:1213
 msgid "Use Environmental Settings"
 msgstr "環境設定を使う"
 
@@ -11957,60 +13587,73 @@
 #. 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:1004
+#: ../pidgin/gtkaccount.c:1006
 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:1007
+#: ../pidgin/gtkaccount.c:1009
 msgid "you can see the butterflies mating"
 msgstr "蝶が仲間になっているのが分かります"
 
-#: ../pidgin/gtkaccount.c:1028
+#: ../pidgin/gtkaccount.c:1030
 msgid "Proxy Options"
 msgstr "プロキシのオプション"
 
-#: ../pidgin/gtkaccount.c:1042 ../pidgin/gtkprefs.c:1131
+#: ../pidgin/gtkaccount.c:1044 ../pidgin/gtkprefs.c:1207
 msgid "Proxy _type:"
 msgstr "プロキシの種類(_T):"
 
-#: ../pidgin/gtkaccount.c:1051 ../pidgin/gtkprefs.c:1152
+#: ../pidgin/gtkaccount.c:1053 ../pidgin/gtkprefs.c:1228
 msgid "_Host:"
 msgstr "ホスト名(_H):"
 
-#: ../pidgin/gtkaccount.c:1055 ../pidgin/gtkprefs.c:1170
+#: ../pidgin/gtkaccount.c:1057 ../pidgin/gtkprefs.c:1246
 msgid "_Port:"
 msgstr "ポート番号(_P):"
 
-#: ../pidgin/gtkaccount.c:1063
+#: ../pidgin/gtkaccount.c:1065
 msgid "_Username:"
 msgstr "ユーザ名(_U):"
 
-#: ../pidgin/gtkaccount.c:1070 ../pidgin/gtkprefs.c:1207
+#: ../pidgin/gtkaccount.c:1072 ../pidgin/gtkprefs.c:1283
 msgid "Pa_ssword:"
 msgstr "パスワード(_S):"
 
-#: ../pidgin/gtkaccount.c:1476
+#: ../pidgin/gtkaccount.c:1195
+#, fuzzy
+msgid "Unable to save new account"
+msgstr "新しい接続を開けません"
+
+#: ../pidgin/gtkaccount.c:1196
+msgid "An account already exists with the specified criteria."
+msgstr ""
+
+#: ../pidgin/gtkaccount.c:1473
 msgid "Add Account"
 msgstr "アカウントの追加"
 
-#: ../pidgin/gtkaccount.c:1500
+#: ../pidgin/gtkaccount.c:1492
 msgid "_Basic"
 msgstr "基本(_B)"
 
-#: ../pidgin/gtkaccount.c:1511
+#: ../pidgin/gtkaccount.c:1499
+msgid "Create this new account on the server"
+msgstr ""
+
+#: ../pidgin/gtkaccount.c:1515
 msgid "_Advanced"
 msgstr "拡張(_A)"
 
-#: ../pidgin/gtkaccount.c:1983 ../pidgin/gtkplugin.c:568
+#: ../pidgin/gtkaccount.c:1973 ../pidgin/gtkplugin.c:569
 msgid "Enabled"
 msgstr "有効"
 
-#: ../pidgin/gtkaccount.c:2011
+#: ../pidgin/gtkaccount.c:2001
 msgid "Protocol"
 msgstr "プロトコル"
 
-#: ../pidgin/gtkaccount.c:2212
+#: ../pidgin/gtkaccount.c:2201
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Welcome to %s!</span>\n"
@@ -12033,229 +13676,290 @@
 "仲間リストのウィンドウにある <b>アカウント->追加/編集</b> メニューからも、こ"
 "の画面を開くことができます。"
 
-#: ../pidgin/gtkblist.c:732
+#: ../pidgin/gtkblist.c:524
+#, c-format
+msgid "You have %d contact named %s. Would you like to merge them?"
+msgid_plural ""
+"You currently have %d contacts named %s. Would you like to merge them?"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../pidgin/gtkblist.c:525
+msgid ""
+"Merging these contacts will cause them to share a single entry on the buddy "
+"list and use a single conversation window. You can separate them again by "
+"choosing 'Expand' from the contact's context menu"
+msgstr ""
+
+#: ../pidgin/gtkblist.c:527
+#, fuzzy
+msgid "_Merge"
+msgstr "メッセージ(_M):"
+
+#: ../pidgin/gtkblist.c:924
 msgid "Join a Chat"
 msgstr "チャットに参加"
 
-#: ../pidgin/gtkblist.c:753
+#: ../pidgin/gtkblist.c:945
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 msgstr "参加するチャットについて適切な情報を入力して下さい。\n"
 
-#. Set up stuff for the account box
-#: ../pidgin/gtkblist.c:764 ../pidgin/gtkblist.c:5450
-#: ../pidgin/gtkblist.c:5817 ../pidgin/gtkpounce.c:531
-#: ../pidgin/gtkroomlist.c:399
+#: ../pidgin/gtkblist.c:956 ../pidgin/gtkblist.c:6188
+#: ../pidgin/gtkpounce.c:539 ../pidgin/gtkroomlist.c:396
 msgid "_Account:"
 msgstr "アカウント(_A):"
 
-#: ../pidgin/gtkblist.c:1053 ../pidgin/gtkprivacy.c:606
-#: ../pidgin/gtkprivacy.c:620
+#: ../pidgin/gtkblist.c:1245 ../pidgin/gtkprivacy.c:603
+#: ../pidgin/gtkprivacy.c:617
 msgid "_Block"
 msgstr "拒否する(_B)"
 
-#: ../pidgin/gtkblist.c:1053
+#: ../pidgin/gtkblist.c:1245
 msgid "Un_block"
 msgstr "拒否しない(_B)"
 
-#: ../pidgin/gtkblist.c:1104
+#: ../pidgin/gtkblist.c:1288
+msgid "Move to"
+msgstr ""
+
+#: ../pidgin/gtkblist.c:1328
 msgid "Get _Info"
 msgstr "情報の取得(_I)"
 
-#: ../pidgin/gtkblist.c:1107 ../pidgin/pidginstock.c:84
+#: ../pidgin/gtkblist.c:1331 ../pidgin/pidginstock.c:90
 msgid "I_M"
 msgstr "IM(_M)"
 
-#: ../pidgin/gtkblist.c:1113
-msgid "_Send File"
+#: ../pidgin/gtkblist.c:1337
+#, fuzzy
+msgid "_Send File..."
 msgstr "ファイルの送信(_S)"
 
-#: ../pidgin/gtkblist.c:1120
-msgid "Add Buddy _Pounce"
-msgstr "つかむ仲間の追加(_P)"
-
-#: ../pidgin/gtkblist.c:1124 ../pidgin/gtkblist.c:1128
-#: ../pidgin/gtkblist.c:1230 ../pidgin/gtkblist.c:1253
+#: ../pidgin/gtkblist.c:1344
+#, fuzzy
+msgid "Add Buddy _Pounce..."
+msgstr "つかむ仲間の追加..."
+
+#: ../pidgin/gtkblist.c:1349 ../pidgin/gtkblist.c:1353
+#: ../pidgin/gtkblist.c:1468 ../pidgin/gtkblist.c:1491
 msgid "View _Log"
 msgstr "ログの表示(_L)"
 
-#: ../pidgin/gtkblist.c:1140 ../pidgin/gtkblist.c:1149
-#: ../pidgin/gtkblist.c:1238 ../pidgin/gtkblist.c:1259
+#: ../pidgin/gtkblist.c:1359
+#, fuzzy
+msgid "Hide when offline"
+msgstr "オフラインの時は許可できません"
+
+#: ../pidgin/gtkblist.c:1359
+#, fuzzy
+msgid "Show when offline"
+msgstr "オフラインの時は許可できません"
+
+#: ../pidgin/gtkblist.c:1373 ../pidgin/gtkblist.c:1382
+#: ../pidgin/gtkblist.c:1476 ../pidgin/gtkblist.c:1497
 msgid "_Alias..."
 msgstr "別名(_A)..."
 
-#: ../pidgin/gtkblist.c:1143 ../pidgin/gtkblist.c:1151
-#: ../pidgin/gtkblist.c:1240 ../pidgin/gtkblist.c:1261
+#: ../pidgin/gtkblist.c:1376 ../pidgin/gtkblist.c:1384
+#: ../pidgin/gtkblist.c:1478 ../pidgin/gtkblist.c:1499
 msgid "_Remove"
 msgstr "削除(_R)"
 
-#: ../pidgin/gtkblist.c:1200
-msgid "Add a _Buddy"
-msgstr "仲間の追加(_B)"
-
-#: ../pidgin/gtkblist.c:1203
-msgid "Add a C_hat"
-msgstr "チャットの追加(_H)"
-
-#: ../pidgin/gtkblist.c:1206
+#: ../pidgin/gtkblist.c:1434
+#, fuzzy
+msgid "Add _Buddy..."
+msgstr "仲間の追加"
+
+#: ../pidgin/gtkblist.c:1437
+#, fuzzy
+msgid "Add C_hat..."
+msgstr "チャットの追加"
+
+#: ../pidgin/gtkblist.c:1440
 msgid "_Delete Group"
 msgstr "グループの削除(_D)"
 
-#: ../pidgin/gtkblist.c:1208
+#: ../pidgin/gtkblist.c:1442
 msgid "_Rename"
 msgstr "名前の変更(_R)"
 
 #. join button
-#: ../pidgin/gtkblist.c:1226 ../pidgin/gtkroomlist.c:306
-#: ../pidgin/gtkroomlist.c:463 ../pidgin/pidginstock.c:82
+#: ../pidgin/gtkblist.c:1462 ../pidgin/gtkroomlist.c:307
+#: ../pidgin/gtkroomlist.c:460 ../pidgin/pidginstock.c:88
 msgid "_Join"
 msgstr "参加(_J)"
 
-#: ../pidgin/gtkblist.c:1228
+#: ../pidgin/gtkblist.c:1464
 msgid "Auto-Join"
 msgstr "自動参加"
 
-#: ../pidgin/gtkblist.c:1266 ../pidgin/gtkblist.c:1289
+#: ../pidgin/gtkblist.c:1466
+#, fuzzy
+msgid "Persistent"
+msgstr "ペルシア語"
+
+#: ../pidgin/gtkblist.c:1504 ../pidgin/gtkblist.c:1527
 msgid "_Collapse"
 msgstr "畳む(_C)"
 
-#: ../pidgin/gtkblist.c:1294
+#: ../pidgin/gtkblist.c:1532
 msgid "_Expand"
 msgstr "広げる(_E)"
 
-#: ../pidgin/gtkblist.c:1539 ../pidgin/gtkblist.c:1551
-#: ../pidgin/gtkblist.c:4552 ../pidgin/gtkblist.c:4562
+#: ../pidgin/gtkblist.c:1783 ../pidgin/gtkblist.c:1795
+#: ../pidgin/gtkblist.c:4885 ../pidgin/gtkblist.c:4898
 msgid "/Tools/Mute Sounds"
 msgstr "/ツール/ミュート"
 
-#: ../pidgin/gtkblist.c:2011 ../pidgin/gtkconv.c:4650
-#: ../pidgin/gtkpounce.c:423
+#: ../pidgin/gtkblist.c:2255 ../pidgin/gtkconv.c:4903
+#: ../pidgin/gtkpounce.c:430
 msgid ""
 "You are not currently signed on with an account that can add that buddy."
 msgstr "現在、仲間の追加が可能なアカウントでサイン・インしていません。"
 
 #. Buddies menu
-#: ../pidgin/gtkblist.c:2851
+#: ../pidgin/gtkblist.c:3067
 msgid "/_Buddies"
 msgstr "/仲間(_B)"
 
-#: ../pidgin/gtkblist.c:2852
+#: ../pidgin/gtkblist.c:3068
 msgid "/Buddies/New Instant _Message..."
 msgstr "/仲間/新しいインスタント・メッセージ(_I)..."
 
-#: ../pidgin/gtkblist.c:2853
+#: ../pidgin/gtkblist.c:3069
 msgid "/Buddies/Join a _Chat..."
 msgstr "/仲間/チャットに参加(_C)..."
 
-#: ../pidgin/gtkblist.c:2854
+#: ../pidgin/gtkblist.c:3070
 msgid "/Buddies/Get User _Info..."
 msgstr "/仲間/ユーザ情報の取得(_I)..."
 
-#: ../pidgin/gtkblist.c:2855
+#: ../pidgin/gtkblist.c:3071
 msgid "/Buddies/View User _Log..."
 msgstr "/仲間/ユーザ・ログの表示(_L)..."
 
-#: ../pidgin/gtkblist.c:2857
-msgid "/Buddies/Show _Offline Buddies"
+#: ../pidgin/gtkblist.c:3073
+#, fuzzy
+msgid "/Buddies/Show"
+msgstr "/仲間(_B)"
+
+#: ../pidgin/gtkblist.c:3074
+#, fuzzy
+msgid "/Buddies/Show/_Offline Buddies"
 msgstr "/仲間/オフラインの仲間を表示する(_O)"
 
-#: ../pidgin/gtkblist.c:2858
-msgid "/Buddies/Show _Empty Groups"
+#: ../pidgin/gtkblist.c:3075
+#, fuzzy
+msgid "/Buddies/Show/_Empty Groups"
 msgstr "/仲間/空グループを表示する(_E)"
 
-#: ../pidgin/gtkblist.c:2859
-msgid "/Buddies/Show Buddy _Details"
+#: ../pidgin/gtkblist.c:3076
+#, fuzzy
+msgid "/Buddies/Show/Buddy _Details"
 msgstr "/仲間/仲間の詳細を表示する(_D)"
 
-#: ../pidgin/gtkblist.c:2860
-msgid "/Buddies/Show Idle _Times"
+#: ../pidgin/gtkblist.c:3077
+#, fuzzy
+msgid "/Buddies/Show/Idle _Times"
 msgstr "/仲間/待機中の時間を表示する(_T)"
 
-#: ../pidgin/gtkblist.c:2861
+#: ../pidgin/gtkblist.c:3078
+#, fuzzy
+msgid "/Buddies/Show/_Protocol Icons"
+msgstr "/仲間/空グループを表示する(_E)"
+
+#: ../pidgin/gtkblist.c:3079
 msgid "/Buddies/_Sort Buddies"
 msgstr "/仲間/仲間の並び替え(_S)"
 
-#: ../pidgin/gtkblist.c:2863
+#: ../pidgin/gtkblist.c:3081
 msgid "/Buddies/_Add Buddy..."
 msgstr "/仲間/仲間の追加(_A)..."
 
-#: ../pidgin/gtkblist.c:2864
+#: ../pidgin/gtkblist.c:3082
 msgid "/Buddies/Add C_hat..."
 msgstr "/仲間/チャットの追加(_H)..."
 
-#: ../pidgin/gtkblist.c:2865
+#: ../pidgin/gtkblist.c:3083
 msgid "/Buddies/Add _Group..."
 msgstr "/仲間/グループの追加(_G)..."
 
-#: ../pidgin/gtkblist.c:2867
+#: ../pidgin/gtkblist.c:3085
 msgid "/Buddies/_Quit"
 msgstr "/仲間/終了(_Q)"
 
 #. Accounts menu
-#: ../pidgin/gtkblist.c:2870
+#: ../pidgin/gtkblist.c:3088
 msgid "/_Accounts"
 msgstr "/アカウント(_A)"
 
-#: ../pidgin/gtkblist.c:2871 ../pidgin/gtkblist.c:6515
-msgid "/Accounts/Add\\/Edit"
-msgstr "/アカウント/追加\\/編集"
+#: ../pidgin/gtkblist.c:3089 ../pidgin/gtkblist.c:6889
+#, fuzzy
+msgid "/Accounts/Manage"
+msgstr "/アカウント"
 
 #. Tools
-#: ../pidgin/gtkblist.c:2874
+#: ../pidgin/gtkblist.c:3092
 msgid "/_Tools"
 msgstr "/ツール(_T)"
 
-#: ../pidgin/gtkblist.c:2875
+#: ../pidgin/gtkblist.c:3093
 msgid "/Tools/Buddy _Pounces"
 msgstr "/ツール/仲間をつかむ(_P)"
 
-#: ../pidgin/gtkblist.c:2876
+#: ../pidgin/gtkblist.c:3094
+#, fuzzy
+msgid "/Tools/_Certificates"
+msgstr "/ツール/設定(_E)"
+
+#: ../pidgin/gtkblist.c:3095
 msgid "/Tools/Plu_gins"
 msgstr "/ツール/プラグイン(_G)"
 
-#: ../pidgin/gtkblist.c:2877
+#: ../pidgin/gtkblist.c:3096
 msgid "/Tools/Pr_eferences"
 msgstr "/ツール/設定(_E)"
 
-#: ../pidgin/gtkblist.c:2878
+#: ../pidgin/gtkblist.c:3097
 msgid "/Tools/Pr_ivacy"
 msgstr "/ツール/個人情報(_I)"
 
-#: ../pidgin/gtkblist.c:2880
+#: ../pidgin/gtkblist.c:3099
 msgid "/Tools/_File Transfers"
 msgstr "/ツール/ファイルの転送(_F)"
 
-#: ../pidgin/gtkblist.c:2881
+#: ../pidgin/gtkblist.c:3100
 msgid "/Tools/R_oom List"
 msgstr "/ツール/チャットルームの一覧(_O)"
 
-#: ../pidgin/gtkblist.c:2882
+#: ../pidgin/gtkblist.c:3101
 msgid "/Tools/System _Log"
 msgstr "/ツール/システム・ログ(_L)"
 
-#: ../pidgin/gtkblist.c:2884
+#: ../pidgin/gtkblist.c:3103
 msgid "/Tools/Mute _Sounds"
 msgstr "/ツール/ミュート(_S)"
 
 #. Help
-#: ../pidgin/gtkblist.c:2887
+#: ../pidgin/gtkblist.c:3105
 msgid "/_Help"
 msgstr "/ヘルプ(_H)"
 
-#: ../pidgin/gtkblist.c:2888
+#: ../pidgin/gtkblist.c:3106
 msgid "/Help/Online _Help"
 msgstr "/ヘルプ/オンライン・ヘルプ(_H)"
 
-#: ../pidgin/gtkblist.c:2889
+#: ../pidgin/gtkblist.c:3107
 msgid "/Help/_Debug Window"
 msgstr "/ヘルプ/デバッグ・ウィンドウ(_D)"
 
-#: ../pidgin/gtkblist.c:2890
+#: ../pidgin/gtkblist.c:3109 ../pidgin/gtkblist.c:3111
 msgid "/Help/_About"
 msgstr "/ヘルプ/情報(_A)"
 
-#: ../pidgin/gtkblist.c:2918
+#: ../pidgin/gtkblist.c:3140
 #, c-format
 msgid ""
 "\n"
@@ -12264,133 +13968,130 @@
 "\n"
 "<b>アカウント:</b> %s"
 
-#: ../pidgin/gtkblist.c:2996
+#: ../pidgin/gtkblist.c:3218
 msgid "Buddy Alias"
 msgstr "仲間の別名"
 
-#: ../pidgin/gtkblist.c:3024
+#: ../pidgin/gtkblist.c:3247
 msgid "Logged In"
 msgstr "既にログインしています"
 
-#: ../pidgin/gtkblist.c:3070
+#: ../pidgin/gtkblist.c:3293
 msgid "Last Seen"
 msgstr "最後にお会いしたのは"
 
-#: ../pidgin/gtkblist.c:3090
+#: ../pidgin/gtkblist.c:3314
 msgid "Spooky"
 msgstr "不気味"
 
-#: ../pidgin/gtkblist.c:3092
+#: ../pidgin/gtkblist.c:3316
 msgid "Awesome"
 msgstr "サイコー"
 
-#: ../pidgin/gtkblist.c:3094
+#: ../pidgin/gtkblist.c:3318
 msgid "Rockin'"
 msgstr "グレイト!"
 
-#: ../pidgin/gtkblist.c:3423
+#: ../pidgin/gtkblist.c:3657
+#, fuzzy, c-format
+msgid "Idle %dd %dh %02dm"
+msgstr "待機中 %dh %02dm"
+
+#: ../pidgin/gtkblist.c:3659
 #, c-format
 msgid "Idle %dh %02dm"
 msgstr "待機中 %dh %02dm"
 
-#: ../pidgin/gtkblist.c:3425
+#: ../pidgin/gtkblist.c:3661
 #, c-format
 msgid "Idle %dm"
 msgstr "待機中 %dm"
 
-#: ../pidgin/gtkblist.c:3570
+#: ../pidgin/gtkblist.c:3806
 msgid "/Buddies/New Instant Message..."
 msgstr "/仲間/新しいインスタント・メッセージ..."
 
-#: ../pidgin/gtkblist.c:3571 ../pidgin/gtkblist.c:3604
+#: ../pidgin/gtkblist.c:3807 ../pidgin/gtkblist.c:3840
 msgid "/Buddies/Join a Chat..."
 msgstr "/仲間/チャットに参加..."
 
-#: ../pidgin/gtkblist.c:3572
+#: ../pidgin/gtkblist.c:3808
 msgid "/Buddies/Get User Info..."
 msgstr "/仲間/ユーザ情報の取得..."
 
-#: ../pidgin/gtkblist.c:3573
+#: ../pidgin/gtkblist.c:3809
 msgid "/Buddies/Add Buddy..."
 msgstr "/仲間/仲間の追加..."
 
-#: ../pidgin/gtkblist.c:3574 ../pidgin/gtkblist.c:3607
+#: ../pidgin/gtkblist.c:3810 ../pidgin/gtkblist.c:3843
 msgid "/Buddies/Add Chat..."
 msgstr "/仲間/チャットの追加..."
 
-#: ../pidgin/gtkblist.c:3575
+#: ../pidgin/gtkblist.c:3811
 msgid "/Buddies/Add Group..."
 msgstr "/仲間/グループの追加..."
 
-#: ../pidgin/gtkblist.c:3610
+#: ../pidgin/gtkblist.c:3846
 msgid "/Tools/Privacy"
 msgstr "/ツール/個人情報"
 
-#: ../pidgin/gtkblist.c:3613
+#: ../pidgin/gtkblist.c:3849
 msgid "/Tools/Room List"
 msgstr "/ツール/チャットルームの一覧"
 
-#: ../pidgin/gtkblist.c:3710 ../pidgin/gtkdocklet.c:153
+#: ../pidgin/gtkblist.c:3944 ../pidgin/gtkdocklet.c:153
 #, c-format
 msgid "%d unread message from %s\n"
 msgid_plural "%d unread messages from %s\n"
 msgstr[0] "%2$s さんから %1$d個の未読のメッセージがあります\n"
 msgstr[1] "%2$s さんから %1$d個の未読のメッセージがあります\n"
 
-#: ../pidgin/gtkblist.c:3790
+#: ../pidgin/gtkblist.c:4104
 msgid "Manually"
 msgstr "手動"
 
-#: ../pidgin/gtkblist.c:3792
-msgid "Alphabetically"
-msgstr "アルファベット順"
-
-#: ../pidgin/gtkblist.c:3793
+#: ../pidgin/gtkblist.c:4107
 msgid "By status"
 msgstr "状態順"
 
-#: ../pidgin/gtkblist.c:3794
+#: ../pidgin/gtkblist.c:4108
 msgid "By log size"
 msgstr "ログ・サイズ順"
 
-#: ../pidgin/gtkblist.c:3996 ../pidgin/gtkconn.c:178
+#: ../pidgin/gtkblist.c:4313 ../pidgin/gtkconn.c:180
 #, c-format
 msgid "%s disconnected"
 msgstr "%s さんは接続を切りました"
 
-#: ../pidgin/gtkblist.c:4006
-msgid "Re-enable Account"
-msgstr "アカウントを再び有効にする"
-
-#: ../pidgin/gtkblist.c:4030
+#: ../pidgin/gtkblist.c:4349
 #, c-format
 msgid "<span color=\"red\">%s disconnected: %s</span>"
 msgstr "<span color=\"red\">%s さんは接続を切りました: %s</span>"
 
-#: ../pidgin/gtkblist.c:4182
+#: ../pidgin/gtkblist.c:4501
 msgid "<b>Username:</b>"
 msgstr "<b>ユーザ名</b>:"
 
-#: ../pidgin/gtkblist.c:4189
+#: ../pidgin/gtkblist.c:4508
 msgid "<b>Password:</b>"
 msgstr "<b>パスワード</b>:"
 
-#: ../pidgin/gtkblist.c:4200
+#: ../pidgin/gtkblist.c:4519
 msgid "_Login"
 msgstr "ログイン(_L)"
 
-#: ../pidgin/gtkblist.c:4285
+#: ../pidgin/gtkblist.c:4602
 msgid "/Accounts"
 msgstr "/アカウント"
 
 #. Translators: Please maintain the use of -> and <- to refer to menu heirarchy
-#: ../pidgin/gtkblist.c:4299
-#, c-format
+#: ../pidgin/gtkblist.c:4616
+#, fuzzy, c-format
 msgid ""
 "<span weight='bold' size='larger'>Welcome to %s!</span>\n"
 "\n"
 "You have no accounts enabled. Enable your IM accounts from the <b>Accounts</"
-"b> window at <b>Accounts->Add/Edit</b>. Once you enable accounts, you'll be "
+"b> window at <b>Accounts->Manage</b>. Once you enable accounts, you'll be "
 "able to sign on, set your status, and talk to your friends."
 msgstr ""
 "<span weight='bold' size='larger'>%s へようこそ!</span>\n"
@@ -12402,23 +14103,32 @@
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: ../pidgin/gtkblist.c:4546
-msgid "/Buddies/Show Offline Buddies"
+#: ../pidgin/gtkblist.c:4879
+#, fuzzy
+msgid "/Buddies/Show/Offline Buddies"
 msgstr "/仲間/オフラインの仲間を表示する"
 
-#: ../pidgin/gtkblist.c:4549
-msgid "/Buddies/Show Empty Groups"
+#: ../pidgin/gtkblist.c:4882
+#, fuzzy
+msgid "/Buddies/Show/Empty Groups"
 msgstr "/仲間/空のグループを表示する"
 
-#: ../pidgin/gtkblist.c:4555
-msgid "/Buddies/Show Buddy Details"
+#: ../pidgin/gtkblist.c:4888
+#, fuzzy
+msgid "/Buddies/Show/Buddy Details"
 msgstr "/仲間/仲間の詳細を表示する"
 
-#: ../pidgin/gtkblist.c:4558
-msgid "/Buddies/Show Idle Times"
+#: ../pidgin/gtkblist.c:4891
+#, fuzzy
+msgid "/Buddies/Show/Idle Times"
 msgstr "/仲間/待機中の時間を表示する"
 
-#: ../pidgin/gtkblist.c:5427
+#: ../pidgin/gtkblist.c:4894
+#, fuzzy
+msgid "/Buddies/Show/Protocol Icons"
+msgstr "/仲間/空のグループを表示する"
+
+#: ../pidgin/gtkblist.c:5796
 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. "
@@ -12428,69 +14138,89 @@
 "別名またはあだ名を入力できます。別名は可能な限りスクリーン名の代わりに表示さ"
 "れます。\n"
 
+#. Set up stuff for the account box
+#: ../pidgin/gtkblist.c:5819
+#, fuzzy
+msgid "A_ccount:"
+msgstr "アカウント:"
+
 #. End of account box
-#: ../pidgin/gtkblist.c:5462
+#: ../pidgin/gtkblist.c:5831
 msgid "_Screen name:"
 msgstr "スクリーン名(_S):"
 
-#: ../pidgin/gtkblist.c:5484 ../pidgin/gtkblist.c:5838
+#: ../pidgin/gtkblist.c:5853 ../pidgin/gtkblist.c:6209
 msgid "A_lias:"
 msgstr "別名(_L):"
 
-#: ../pidgin/gtkblist.c:5750
+#: ../pidgin/gtkblist.c:6121
 msgid "This protocol does not support chat rooms."
 msgstr "このプロトコルではチャット・ルームをサポートしていません。"
 
-#: ../pidgin/gtkblist.c:5766
+#: ../pidgin/gtkblist.c:6137
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
 msgstr "チャットが可能なプロトコルでサイン・インしていません。"
 
-#: ../pidgin/gtkblist.c:5807
+#: ../pidgin/gtkblist.c:6178
 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:5895
+#: ../pidgin/gtkblist.c:6237
+msgid "Autojoin when account becomes online."
+msgstr ""
+
+#: ../pidgin/gtkblist.c:6238
+msgid "Hide chat when the window is closed."
+msgstr ""
+
+#: ../pidgin/gtkblist.c:6264
 msgid "Please enter the name of the group to be added."
 msgstr "追加するグループの名前を入力して下さい:"
 
-#: ../pidgin/gtkblist.c:6535
+#: ../pidgin/gtkblist.c:6909
 msgid "<PurpleMain>/Accounts/"
 msgstr "<PurpleMain>/アカウント/"
 
-#: ../pidgin/gtkblist.c:6559
+#: ../pidgin/gtkblist.c:6933
 msgid "_Edit Account"
 msgstr "アカウントの編集(_E)"
 
-#: ../pidgin/gtkblist.c:6572 ../pidgin/gtkconv.c:3024
+#: ../pidgin/gtkblist.c:6946 ../pidgin/gtkconv.c:3136
 msgid "No actions available"
 msgstr "利用可能なアクションはありません"
 
-#: ../pidgin/gtkblist.c:6580
+#: ../pidgin/gtkblist.c:6954
 msgid "_Disable"
 msgstr "無効にする(_D)"
 
-#: ../pidgin/gtkblist.c:6592
+#: ../pidgin/gtkblist.c:6966
 msgid "Enable Account"
 msgstr "アカウントを有効にする"
 
-#: ../pidgin/gtkblist.c:6598
+#: ../pidgin/gtkblist.c:6972
 msgid "<PurpleMain>/Accounts/Enable Account"
 msgstr "<PurpleMain>/アカウント/アカウントを有効にする"
 
-#: ../pidgin/gtkblist.c:6647
+#: ../pidgin/gtkblist.c:7021
 msgid "/Tools"
 msgstr "/ツール"
 
-#: ../pidgin/gtkblist.c:6717
+#: ../pidgin/gtkblist.c:7091
 msgid "/Buddies/Sort Buddies"
 msgstr "/仲間/仲間の並び替え"
 
-#: ../pidgin/gtkconn.c:179
+#. Widget creation function
+#: ../pidgin/gtkcertmgr.c:530
+#, fuzzy
+msgid "SSL Servers"
+msgstr "サーバ"
+
+#: ../pidgin/gtkconn.c:181
 #, c-format
 msgid ""
 "%s\n"
@@ -12502,487 +14232,495 @@
 "\n"
 "エラーを解決しアカウントをもう一度有効にするまで %s は再接続しません。"
 
-#: ../pidgin/gtkconv.c:793 ../pidgin/gtkconv.c:819
+#: ../pidgin/gtkconv.c:523
+#, fuzzy
+msgid "Unknown command."
+msgstr "不明なコマンド"
+
+#: ../pidgin/gtkconv.c:795 ../pidgin/gtkconv.c:821
 msgid "That buddy is not on the same protocol as this chat."
 msgstr "その仲間は、このチャットの同一プロトコル上にいません"
 
-#: ../pidgin/gtkconv.c:813
+#: ../pidgin/gtkconv.c:815
 msgid ""
 "You are not currently signed on with an account that can invite that buddy."
 msgstr "現在、その仲間を招待できるアカウントでサイン・インしていません"
 
-#: ../pidgin/gtkconv.c:866
+#: ../pidgin/gtkconv.c:868
 msgid "Invite Buddy Into Chat Room"
 msgstr "仲間をチャット・ルームへ招待"
 
 #. Put our happy label in it.
-#: ../pidgin/gtkconv.c:896
+#: ../pidgin/gtkconv.c:898
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
 msgstr "招待したい相手の名前と、オプションで招待メッセージを入力して下さい:"
 
-#: ../pidgin/gtkconv.c:917
+#: ../pidgin/gtkconv.c:919
 msgid "_Buddy:"
 msgstr "仲間(_B):"
 
-#: ../pidgin/gtkconv.c:937 ../pidgin/gtksavedstatuses.c:1141
-#: ../pidgin/gtksavedstatuses.c:1477
+#: ../pidgin/gtkconv.c:930 ../pidgin/gtksavedstatuses.c:1194
+#: ../pidgin/gtksavedstatuses.c:1528
 msgid "_Message:"
 msgstr "メッセージ(_M):"
 
-#: ../pidgin/gtkconv.c:994 ../pidgin/gtkconv.c:2548 ../pidgin/gtkdebug.c:218
-#: ../pidgin/gtkft.c:542
+#: ../pidgin/gtkconv.c:988 ../pidgin/gtkconv.c:2657 ../pidgin/gtkdebug.c:219
+#: ../pidgin/gtkft.c:543
 msgid "Unable to open file."
 msgstr "ファイルを開けません"
 
-#: ../pidgin/gtkconv.c:1000
+#: ../pidgin/gtkconv.c:994
 #, c-format
 msgid "<h1>Conversation with %s</h1>\n"
 msgstr "<h1>%s さんとの会話</h1>\n"
 
-#: ../pidgin/gtkconv.c:1036
+#: ../pidgin/gtkconv.c:1032
 msgid "Save Conversation"
 msgstr "会話の保存"
 
-#: ../pidgin/gtkconv.c:1185 ../pidgin/gtkdebug.c:166 ../pidgin/gtkdebug.c:742
+#: ../pidgin/gtkconv.c:1178 ../pidgin/gtkdebug.c:167 ../pidgin/gtkdebug.c:743
 msgid "Find"
 msgstr "検索"
 
-#: ../pidgin/gtkconv.c:1211 ../pidgin/gtkdebug.c:194
+#: ../pidgin/gtkconv.c:1204 ../pidgin/gtkdebug.c:195
 msgid "_Search for:"
 msgstr "検索する単語(_S):"
 
-#: ../pidgin/gtkconv.c:1394
-msgid "Logging started. Future messages in this conversation will be logged."
-msgstr "ログの記録を開始しました。これ以降の会話がログに記録されます。"
-
-#: ../pidgin/gtkconv.c:1402
-msgid ""
-"Logging stopped. Future messages in this conversation will not be logged."
-msgstr "ログの記録を停止しました。これ以降の会話はログに記録されません。"
-
-#: ../pidgin/gtkconv.c:1650
+#: ../pidgin/gtkconv.c:1675
 msgid "Un-Ignore"
 msgstr "無視しない"
 
-#: ../pidgin/gtkconv.c:1653
+#: ../pidgin/gtkconv.c:1678
 msgid "Ignore"
 msgstr "無視する対象"
 
-#: ../pidgin/gtkconv.c:1673
+#: ../pidgin/gtkconv.c:1698
 msgid "Get Away Message"
 msgstr "離席メッセージの取得"
 
-#: ../pidgin/gtkconv.c:1696
+#: ../pidgin/gtkconv.c:1721
 msgid "Last said"
 msgstr "最後のメッセージ:"
 
-#: ../pidgin/gtkconv.c:2556
+#: ../pidgin/gtkconv.c:2665
 msgid "Unable to save icon file to disk."
 msgstr "アイコン・ファイルを保存できません。"
 
-#: ../pidgin/gtkconv.c:2607
+#: ../pidgin/gtkconv.c:2716
 msgid "Save Icon"
 msgstr "アイコンの保存"
 
-#: ../pidgin/gtkconv.c:2659
+#: ../pidgin/gtkconv.c:2768
 msgid "Animate"
 msgstr "アニメーションを有効にする"
 
-#: ../pidgin/gtkconv.c:2664
+#: ../pidgin/gtkconv.c:2773
 msgid "Hide Icon"
 msgstr "アイコンを隠す"
 
-#: ../pidgin/gtkconv.c:2667
+#: ../pidgin/gtkconv.c:2776
 msgid "Save Icon As..."
 msgstr "アイコンを別名で保存..."
 
-#: ../pidgin/gtkconv.c:2671
+#: ../pidgin/gtkconv.c:2780
 msgid "Set Custom Icon..."
 msgstr "独自アイコンのセット..."
 
-#: ../pidgin/gtkconv.c:2684
+#: ../pidgin/gtkconv.c:2793
 msgid "Remove Custom Icon"
 msgstr "独自アイコンの削除"
 
+#: ../pidgin/gtkconv.c:2924
+msgid "Show All"
+msgstr ""
+
 #. Conversation menu
-#: ../pidgin/gtkconv.c:2826
+#: ../pidgin/gtkconv.c:2943
 msgid "/_Conversation"
 msgstr "/会話(_C)"
 
-#: ../pidgin/gtkconv.c:2828
+#: ../pidgin/gtkconv.c:2945
 msgid "/Conversation/New Instant _Message..."
 msgstr "/会話/新しいインスタント・メッセージ(_M)..."
 
-#: ../pidgin/gtkconv.c:2833
+#: ../pidgin/gtkconv.c:2950
 msgid "/Conversation/_Find..."
 msgstr "/会話/検索(_F)..."
 
-#: ../pidgin/gtkconv.c:2835
+#: ../pidgin/gtkconv.c:2952
 msgid "/Conversation/View _Log"
 msgstr "/会話/ログの表示(_L)"
 
-#: ../pidgin/gtkconv.c:2836
+#: ../pidgin/gtkconv.c:2953
 msgid "/Conversation/_Save As..."
 msgstr "/会話/別名で保存(_S)..."
 
-#: ../pidgin/gtkconv.c:2838
+#: ../pidgin/gtkconv.c:2955
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/会話/クリア(_R)"
 
-#: ../pidgin/gtkconv.c:2842
+#: ../pidgin/gtkconv.c:2959
 msgid "/Conversation/Se_nd File..."
 msgstr "/会話/ファイルの送信(_N)..."
 
-#: ../pidgin/gtkconv.c:2843
+#: ../pidgin/gtkconv.c:2960
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/会話/つかむ仲間に追加する(_P)..."
 
-#: ../pidgin/gtkconv.c:2845
+#: ../pidgin/gtkconv.c:2962
 msgid "/Conversation/_Get Info"
 msgstr "/会話/情報の取得(_G)"
 
-#: ../pidgin/gtkconv.c:2847
+#: ../pidgin/gtkconv.c:2964
 msgid "/Conversation/In_vite..."
 msgstr "/会話/招待(_V)..."
 
-#: ../pidgin/gtkconv.c:2849
+#: ../pidgin/gtkconv.c:2966
 msgid "/Conversation/M_ore"
 msgstr "/会話/その他(_O)"
 
-#: ../pidgin/gtkconv.c:2853
+#: ../pidgin/gtkconv.c:2970
 msgid "/Conversation/Al_ias..."
 msgstr "/会話/別名(_I)..."
 
-#: ../pidgin/gtkconv.c:2855
+#: ../pidgin/gtkconv.c:2972
 msgid "/Conversation/_Block..."
 msgstr "/会話/拒否(_B)..."
 
-#: ../pidgin/gtkconv.c:2857
+#: ../pidgin/gtkconv.c:2974
 msgid "/Conversation/_Unblock..."
 msgstr "/会話/拒否の解除(_U)..."
 
-#: ../pidgin/gtkconv.c:2859
+#: ../pidgin/gtkconv.c:2976
 msgid "/Conversation/_Add..."
 msgstr "/会話/追加(_A)..."
 
-#: ../pidgin/gtkconv.c:2861
+#: ../pidgin/gtkconv.c:2978
 msgid "/Conversation/_Remove..."
 msgstr "/会話/削除(_R)..."
 
-#: ../pidgin/gtkconv.c:2866
+#: ../pidgin/gtkconv.c:2983
 msgid "/Conversation/Insert Lin_k..."
 msgstr "/会話/リンクの挿入(_K)..."
 
-#: ../pidgin/gtkconv.c:2868
+#: ../pidgin/gtkconv.c:2985
 msgid "/Conversation/Insert Imag_e..."
 msgstr "/会話/画像の挿入(_E)..."
 
-#: ../pidgin/gtkconv.c:2874
+#: ../pidgin/gtkconv.c:2991
 msgid "/Conversation/_Close"
 msgstr "/会話/閉じる(_C)"
 
 #. Options
-#: ../pidgin/gtkconv.c:2878
+#: ../pidgin/gtkconv.c:2995
 msgid "/_Options"
 msgstr "/オプション(_O)"
 
-#: ../pidgin/gtkconv.c:2879
+#: ../pidgin/gtkconv.c:2996
 msgid "/Options/Enable _Logging"
 msgstr "/オプション/ログを記録する(_L)"
 
-#: ../pidgin/gtkconv.c:2880
+#: ../pidgin/gtkconv.c:2997
 msgid "/Options/Enable _Sounds"
 msgstr "/オプション/サウンドを有効にする(_S)"
 
-#: ../pidgin/gtkconv.c:2881
-msgid "/Options/Show Buddy _Icon"
-msgstr "/オプション/仲間アイコンを表示する(_I)"
-
-#: ../pidgin/gtkconv.c:2883
+#: ../pidgin/gtkconv.c:2999
 msgid "/Options/Show Formatting _Toolbars"
 msgstr "/オプション/書式ツールバーを表示する(_T)"
 
-#: ../pidgin/gtkconv.c:2884
+#: ../pidgin/gtkconv.c:3000
 msgid "/Options/Show Ti_mestamps"
 msgstr "/オプション/タイムスタンプを表示する(_M)"
 
-#: ../pidgin/gtkconv.c:2960
+#: ../pidgin/gtkconv.c:3124
 msgid "/Conversation/More"
 msgstr "/会話/その他(_O)"
 
+#: ../pidgin/gtkconv.c:3180
+#, fuzzy
+msgid "/Options"
+msgstr "/オプション(_O)"
+
 #. The menubar has been deactivated. Make sure the 'More' submenu is regenerated next time
 #. * the 'Conversation' menu pops up.
 #. 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:3048 ../pidgin/gtkconv.c:3080
+#: ../pidgin/gtkconv.c:3215 ../pidgin/gtkconv.c:3247
 msgid "/Conversation"
 msgstr "/会話"
 
-#: ../pidgin/gtkconv.c:3088
+#: ../pidgin/gtkconv.c:3255
 msgid "/Conversation/View Log"
 msgstr "/会話/ログの表示"
 
-#: ../pidgin/gtkconv.c:3094
+#: ../pidgin/gtkconv.c:3261
 msgid "/Conversation/Send File..."
 msgstr "/会話/ファイルの送信..."
 
-#: ../pidgin/gtkconv.c:3098
+#: ../pidgin/gtkconv.c:3265
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/会話/つかむ仲間に追加する..."
 
-#: ../pidgin/gtkconv.c:3104
+#: ../pidgin/gtkconv.c:3271
 msgid "/Conversation/Get Info"
 msgstr "/会話/情報の取得"
 
-#: ../pidgin/gtkconv.c:3108
+#: ../pidgin/gtkconv.c:3275
 msgid "/Conversation/Invite..."
 msgstr "/会話/招待..."
 
-#: ../pidgin/gtkconv.c:3114
+#: ../pidgin/gtkconv.c:3281
 msgid "/Conversation/Alias..."
 msgstr "/会話/別名..."
 
-#: ../pidgin/gtkconv.c:3118
+#: ../pidgin/gtkconv.c:3285
 msgid "/Conversation/Block..."
 msgstr "/会話/拒否..."
 
-#: ../pidgin/gtkconv.c:3122
+#: ../pidgin/gtkconv.c:3289
 msgid "/Conversation/Unblock..."
 msgstr "/会話/拒否の解除..."
 
-#: ../pidgin/gtkconv.c:3126
+#: ../pidgin/gtkconv.c:3293
 msgid "/Conversation/Add..."
 msgstr "/会話/追加..."
 
-#: ../pidgin/gtkconv.c:3130
+#: ../pidgin/gtkconv.c:3297
 msgid "/Conversation/Remove..."
 msgstr "/会話/削除..."
 
-#: ../pidgin/gtkconv.c:3136
+#: ../pidgin/gtkconv.c:3303
 msgid "/Conversation/Insert Link..."
 msgstr "/会話/リンクの挿入..."
 
-#: ../pidgin/gtkconv.c:3140
+#: ../pidgin/gtkconv.c:3307
 msgid "/Conversation/Insert Image..."
 msgstr "/会話/画像の挿入..."
 
-#: ../pidgin/gtkconv.c:3146
+#: ../pidgin/gtkconv.c:3313
 msgid "/Options/Enable Logging"
 msgstr "/オプション/ログを記録する"
 
-#: ../pidgin/gtkconv.c:3149
+#: ../pidgin/gtkconv.c:3316
 msgid "/Options/Enable Sounds"
 msgstr "/オプション/サウンドを有効にする"
 
-#: ../pidgin/gtkconv.c:3162
+#: ../pidgin/gtkconv.c:3329
 msgid "/Options/Show Formatting Toolbars"
 msgstr "/オプション/書式ツールバーを表示する"
 
-#: ../pidgin/gtkconv.c:3165
+#: ../pidgin/gtkconv.c:3332
 msgid "/Options/Show Timestamps"
 msgstr "/オプション/タイムスタンプを表示する"
 
-#: ../pidgin/gtkconv.c:3168
-msgid "/Options/Show Buddy Icon"
-msgstr "/オプション/仲間アイコンを表示する"
-
-#: ../pidgin/gtkconv.c:3252 ../pidgin/gtkconv.c:3294
+#: ../pidgin/gtkconv.c:3409 ../pidgin/gtkconv.c:3451
 msgid "User is typing..."
 msgstr "ユーザが何か入力しています..."
 
-#: ../pidgin/gtkconv.c:3297
+#: ../pidgin/gtkconv.c:3454
 msgid "User has typed something and stopped"
 msgstr "ユーザは何か入力して一時停止中です"
 
 #. Build the Send To menu
-#: ../pidgin/gtkconv.c:3479
-msgid "_Send To"
-msgstr "送信先(_S)"
-
-#: ../pidgin/gtkconv.c:4193
+#: ../pidgin/gtkconv.c:3637 ../pidgin/gtkconv.c:8103
+#, fuzzy
+msgid "S_end To"
+msgstr "送信先"
+
+#: ../pidgin/gtkconv.c:4349
 msgid "_Send"
 msgstr "送信する(_S)"
 
 #. Setup the label telling how many people are in the room.
-#: ../pidgin/gtkconv.c:4344
+#: ../pidgin/gtkconv.c:4453
 msgid "0 people in room"
 msgstr "誰もいません"
 
-#: ../pidgin/gtkconv.c:5536 ../pidgin/gtkconv.c:5657
+#: ../pidgin/gtkconv.c:5823 ../pidgin/gtkconv.c:5944
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "チャットルームに %d人にいます"
 msgstr[1] "チャットルームに %d人にいます"
 
-#: ../pidgin/gtkconv.c:6231 ../pidgin/gtkstatusbox.c:657
+#: ../pidgin/gtkconv.c:6550 ../pidgin/gtkstatusbox.c:660
 msgid "Typing"
 msgstr "入力中です"
 
-#: ../pidgin/gtkconv.c:6237
+#: ../pidgin/gtkconv.c:6554
 msgid "Stopped Typing"
 msgstr "入力を止めたようです"
 
-#: ../pidgin/gtkconv.c:6242
+#: ../pidgin/gtkconv.c:6557
 msgid "Nick Said"
 msgstr "Nick Said"
 
-#: ../pidgin/gtkconv.c:6247 ../pidgin/gtkdocklet.c:492
+#: ../pidgin/gtkconv.c:6560 ../pidgin/gtkdocklet.c:492
 msgid "Unread Messages"
 msgstr "メッセージの送信"
 
-#: ../pidgin/gtkconv.c:6252
+#: ../pidgin/gtkconv.c:6563
 msgid "New Event"
 msgstr "新しいイベント"
 
-#: ../pidgin/gtkconv.c:7384
+#: ../pidgin/gtkconv.c:7654
+#, fuzzy
+msgid "clear: Clears all conversation scrollbacks."
+msgstr "クリア: 会話ウィンドウにある以前のメッセージをクリアします"
+
+#: ../pidgin/gtkconv.c:7817
 msgid "Confirm close"
 msgstr "クローズの確認"
 
-#: ../pidgin/gtkconv.c:7416
+#: ../pidgin/gtkconv.c:7849
 msgid "You have unread messages. Are you sure you want to close the window?"
 msgstr ""
 "まだ未読のメッセージがあります。本当にウィンドウを閉じてもよろしいですか?"
 
-#: ../pidgin/gtkconv.c:7938
+#: ../pidgin/gtkconv.c:8436
 msgid "Close other tabs"
 msgstr "他のタブを閉じる"
 
-#: ../pidgin/gtkconv.c:7944
+#: ../pidgin/gtkconv.c:8442
 msgid "Close all tabs"
 msgstr "全てのタブを閉じる"
 
-#: ../pidgin/gtkconv.c:7952
+#: ../pidgin/gtkconv.c:8450
 msgid "Detach this tab"
 msgstr "このタブを取り外す"
 
-#: ../pidgin/gtkconv.c:7958
+#: ../pidgin/gtkconv.c:8456
 msgid "Close this tab"
 msgstr "このタブを閉じる"
 
-#: ../pidgin/gtkconv.c:8344
+#: ../pidgin/gtkconv.c:8951
 msgid "Close conversation"
 msgstr "会話ウィンドウを閉じます"
 
-#: ../pidgin/gtkconv.c:8867
+#: ../pidgin/gtkconv.c:9553
 msgid "Last created window"
 msgstr "最後に生成したウィンドウを再利用する"
 
-#: ../pidgin/gtkconv.c:8869
+#: ../pidgin/gtkconv.c:9555
 msgid "Separate IM and Chat windows"
 msgstr "IM とチャット・ウィンドウを分割する"
 
-#: ../pidgin/gtkconv.c:8871 ../pidgin/gtkprefs.c:1340
+#: ../pidgin/gtkconv.c:9557 ../pidgin/gtkprefs.c:1417
 msgid "New window"
 msgstr "新しいウィンドウで開く"
 
-#: ../pidgin/gtkconv.c:8873
+#: ../pidgin/gtkconv.c:9559
 msgid "By group"
 msgstr "グループ毎に共有する"
 
-#: ../pidgin/gtkconv.c:8875
+#: ../pidgin/gtkconv.c:9561
 msgid "By account"
 msgstr "アカウント毎に共有する"
 
-#: ../pidgin/gtkdebug.c:233
+#: ../pidgin/gtkdebug.c:234
 msgid "Save Debug Log"
 msgstr "デバッグ・ログの保存"
 
-#: ../pidgin/gtkdebug.c:581
+#: ../pidgin/gtkdebug.c:582
 msgid "Invert"
 msgstr "結果を反転する"
 
-#: ../pidgin/gtkdebug.c:584
+#: ../pidgin/gtkdebug.c:585
 msgid "Highlight matches"
 msgstr "一致する単語を強調表示する"
 
-#: ../pidgin/gtkdebug.c:651
+#: ../pidgin/gtkdebug.c:652
 msgid "_Icon Only"
 msgstr "アイコンのみ(_I)"
 
-#: ../pidgin/gtkdebug.c:652
+#: ../pidgin/gtkdebug.c:653
 msgid "_Text Only"
 msgstr "ラベルのみ(_T)"
 
-#: ../pidgin/gtkdebug.c:653
+#: ../pidgin/gtkdebug.c:654
 msgid "_Both Icon & Text"
 msgstr "両方(_B)"
 
-#: ../pidgin/gtkdebug.c:774
+#: ../pidgin/gtkdebug.c:775
 msgid "Filter"
 msgstr "フィルタ"
 
-#: ../pidgin/gtkdebug.c:793
+#: ../pidgin/gtkdebug.c:794
 msgid "Right click for more options."
 msgstr "右クリックで追加オプションを表示します"
 
-#: ../pidgin/gtkdebug.c:823
+#: ../pidgin/gtkdebug.c:824
 msgid "Level "
 msgstr "レベル"
 
-#: ../pidgin/gtkdebug.c:824 ../pidgin/gtkdebug.c:830
+#: ../pidgin/gtkdebug.c:825 ../pidgin/gtkdebug.c:831
 msgid "Select the debug filter level."
 msgstr "デバッグ・フィルタのレベルを選択して下さい:"
 
-#: ../pidgin/gtkdebug.c:832
+#: ../pidgin/gtkdebug.c:833
 msgid "All"
 msgstr "全て"
 
-#: ../pidgin/gtkdebug.c:833
+#: ../pidgin/gtkdebug.c:834
 msgid "Misc"
 msgstr "その他"
 
-#: ../pidgin/gtkdebug.c:835
-msgid "Warning"
-msgstr "警告"
-
 #: ../pidgin/gtkdebug.c:836
+msgid "Warning"
+msgstr "警告"
+
+#: ../pidgin/gtkdebug.c:837
 msgid "Error "
 msgstr "エラー"
 
-#: ../pidgin/gtkdebug.c:837
+#: ../pidgin/gtkdebug.c:838
 msgid "Fatal Error"
 msgstr "致命的なエラー"
 
-#: ../pidgin/gtkdialogs.c:71 ../pidgin/gtkdialogs.c:117
+#: ../pidgin/gtkdialogs.c:72 ../pidgin/gtkdialogs.c:117
 msgid "lead developer"
 msgstr "メインの開発者"
 
-#: ../pidgin/gtkdialogs.c:72 ../pidgin/gtkdialogs.c:73
-#: ../pidgin/gtkdialogs.c:74 ../pidgin/gtkdialogs.c:75
-#: ../pidgin/gtkdialogs.c:76 ../pidgin/gtkdialogs.c:78
+#: ../pidgin/gtkdialogs.c:73 ../pidgin/gtkdialogs.c:74
+#: ../pidgin/gtkdialogs.c:75 ../pidgin/gtkdialogs.c:76
+#: ../pidgin/gtkdialogs.c:77 ../pidgin/gtkdialogs.c:78
 #: ../pidgin/gtkdialogs.c:79 ../pidgin/gtkdialogs.c:80
 #: ../pidgin/gtkdialogs.c:81 ../pidgin/gtkdialogs.c:82
 #: ../pidgin/gtkdialogs.c:83 ../pidgin/gtkdialogs.c:84
-#: ../pidgin/gtkdialogs.c:85 ../pidgin/gtkdialogs.c:88
-#: ../pidgin/gtkdialogs.c:89 ../pidgin/gtkdialogs.c:90
+#: ../pidgin/gtkdialogs.c:85 ../pidgin/gtkdialogs.c:86
+#: ../pidgin/gtkdialogs.c:89 ../pidgin/gtkdialogs.c:91
+#: ../pidgin/gtkdialogs.c:92
 msgid "developer"
 msgstr "開発者"
 
-#: ../pidgin/gtkdialogs.c:77
-msgid "developer & webmaster"
-msgstr "開発者/ウェブマスタ"
-
-#: ../pidgin/gtkdialogs.c:86
+#: ../pidgin/gtkdialogs.c:87
 msgid "support"
 msgstr "サポート"
 
-#: ../pidgin/gtkdialogs.c:87
+#: ../pidgin/gtkdialogs.c:88
 msgid "support/QA"
 msgstr "サポート/QA"
 
-#: ../pidgin/gtkdialogs.c:109
+#: ../pidgin/gtkdialogs.c:90 ../pidgin/gtkdialogs.c:112
+msgid "developer & webmaster"
+msgstr "開発者/ウェブマスタ"
+
+#: ../pidgin/gtkdialogs.c:99
+msgid "Senior Contributor/QA"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:108
 msgid "win32 port"
 msgstr "Win32 のポーティング"
 
-#: ../pidgin/gtkdialogs.c:110 ../pidgin/gtkdialogs.c:111
+#: ../pidgin/gtkdialogs.c:109 ../pidgin/gtkdialogs.c:110
 msgid "maintainer"
 msgstr "メンテナ"
 
-#: ../pidgin/gtkdialogs.c:112
+#: ../pidgin/gtkdialogs.c:111
 msgid "libfaim maintainer"
 msgstr "libfaim のメンテナ"
 
@@ -12999,295 +14737,309 @@
 msgid "original author"
 msgstr "オリジナルの作者"
 
-#: ../pidgin/gtkdialogs.c:123
+#: ../pidgin/gtkdialogs.c:133
 msgid "Afrikaans"
 msgstr "アフリカーンズ語"
 
-#: ../pidgin/gtkdialogs.c:124
+#: ../pidgin/gtkdialogs.c:134
 msgid "Arabic"
 msgstr "アラビア語"
 
-#: ../pidgin/gtkdialogs.c:125 ../pidgin/gtkdialogs.c:126
-#: ../pidgin/gtkdialogs.c:211
+#: ../pidgin/gtkdialogs.c:135
+msgid "Belarusian Latin"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:136 ../pidgin/gtkdialogs.c:137
+#: ../pidgin/gtkdialogs.c:224
 msgid "Bulgarian"
 msgstr "ブルガリア語"
 
-#: ../pidgin/gtkdialogs.c:127 ../pidgin/gtkdialogs.c:128
-#: ../pidgin/gtkdialogs.c:129 ../pidgin/gtkdialogs.c:130
+#: ../pidgin/gtkdialogs.c:138 ../pidgin/gtkdialogs.c:139
+#: ../pidgin/gtkdialogs.c:140 ../pidgin/gtkdialogs.c:141
 msgid "Bengali"
 msgstr "ベンガル語"
 
-#: ../pidgin/gtkdialogs.c:131
+#: ../pidgin/gtkdialogs.c:142
 msgid "Bosnian"
 msgstr "ボスニア語"
 
-#: ../pidgin/gtkdialogs.c:132 ../pidgin/gtkdialogs.c:212
-#: ../pidgin/gtkdialogs.c:213
+#: ../pidgin/gtkdialogs.c:143 ../pidgin/gtkdialogs.c:225
+#: ../pidgin/gtkdialogs.c:226
 msgid "Catalan"
 msgstr "カタラン語"
 
-#: ../pidgin/gtkdialogs.c:133 ../pidgin/gtkdialogs.c:134
+#: ../pidgin/gtkdialogs.c:144 ../pidgin/gtkdialogs.c:145
 msgid "Valencian-Catalan"
 msgstr "バレンシア-カタロニア語"
 
-#: ../pidgin/gtkdialogs.c:135 ../pidgin/gtkdialogs.c:214
+#: ../pidgin/gtkdialogs.c:146 ../pidgin/gtkdialogs.c:227
 msgid "Czech"
 msgstr "チェコ語"
 
-#: ../pidgin/gtkdialogs.c:136 ../pidgin/gtkdialogs.c:137
+#: ../pidgin/gtkdialogs.c:147 ../pidgin/gtkdialogs.c:148
 msgid "Danish"
 msgstr "デンマーク語"
 
-#: ../pidgin/gtkdialogs.c:138 ../pidgin/gtkdialogs.c:139
-#: ../pidgin/gtkdialogs.c:215
+#: ../pidgin/gtkdialogs.c:149 ../pidgin/gtkdialogs.c:150
+#: ../pidgin/gtkdialogs.c:228
 msgid "German"
 msgstr "ドイツ語"
 
-#: ../pidgin/gtkdialogs.c:140 ../pidgin/gtkdialogs.c:141
-#: ../pidgin/gtkdialogs.c:142
+#: ../pidgin/gtkdialogs.c:151 ../pidgin/gtkdialogs.c:152
+#: ../pidgin/gtkdialogs.c:153
 msgid "Dzongkha"
 msgstr "ゾンカ語"
 
-#: ../pidgin/gtkdialogs.c:143 ../pidgin/gtkdialogs.c:144
+#: ../pidgin/gtkdialogs.c:154 ../pidgin/gtkdialogs.c:155
 msgid "Greek"
 msgstr "ギリシア語"
 
-#: ../pidgin/gtkdialogs.c:145
+#: ../pidgin/gtkdialogs.c:156
 msgid "Australian English"
 msgstr "英語 (オーストラリア)"
 
-#: ../pidgin/gtkdialogs.c:146
+#: ../pidgin/gtkdialogs.c:157
 msgid "Canadian English"
 msgstr "英語 (カナダ)"
 
-#: ../pidgin/gtkdialogs.c:147
+#: ../pidgin/gtkdialogs.c:158
 msgid "British English"
 msgstr "英語 (英国)"
 
-#: ../pidgin/gtkdialogs.c:148
+#: ../pidgin/gtkdialogs.c:159
 msgid "Esperanto"
 msgstr "エスペラント語"
 
-#: ../pidgin/gtkdialogs.c:149 ../pidgin/gtkdialogs.c:216
-#: ../pidgin/gtkdialogs.c:217 ../pidgin/gtkdialogs.c:218
-#: ../pidgin/gtkdialogs.c:219
+#: ../pidgin/gtkdialogs.c:160 ../pidgin/gtkdialogs.c:229
+#: ../pidgin/gtkdialogs.c:230 ../pidgin/gtkdialogs.c:231
+#: ../pidgin/gtkdialogs.c:232
 msgid "Spanish"
 msgstr "スペイン語"
 
-#: ../pidgin/gtkdialogs.c:150 ../pidgin/gtkdialogs.c:151
+#: ../pidgin/gtkdialogs.c:161
+#, fuzzy
+msgid "Estonian"
+msgstr "ボスニア語"
+
+#: ../pidgin/gtkdialogs.c:162 ../pidgin/gtkdialogs.c:163
 msgid "Euskera(Basque)"
 msgstr "エウシカラ (バスク語)"
 
-#: ../pidgin/gtkdialogs.c:152 ../pidgin/gtkdialogs.c:153
-#: ../pidgin/gtkdialogs.c:154
+#: ../pidgin/gtkdialogs.c:164 ../pidgin/gtkdialogs.c:165
+#: ../pidgin/gtkdialogs.c:166
 msgid "Persian"
 msgstr "ペルシア語"
 
-#: ../pidgin/gtkdialogs.c:155 ../pidgin/gtkdialogs.c:220
-#: ../pidgin/gtkdialogs.c:221
+#: ../pidgin/gtkdialogs.c:167 ../pidgin/gtkdialogs.c:233
+#: ../pidgin/gtkdialogs.c:234
 msgid "Finnish"
 msgstr "フィンランド語"
 
-#: ../pidgin/gtkdialogs.c:156 ../pidgin/gtkdialogs.c:222
-#: ../pidgin/gtkdialogs.c:223 ../pidgin/gtkdialogs.c:224
-#: ../pidgin/gtkdialogs.c:225
+#: ../pidgin/gtkdialogs.c:168 ../pidgin/gtkdialogs.c:235
+#: ../pidgin/gtkdialogs.c:236 ../pidgin/gtkdialogs.c:237
+#: ../pidgin/gtkdialogs.c:238
 msgid "French"
 msgstr "フランス語"
 
-#: ../pidgin/gtkdialogs.c:157
+#: ../pidgin/gtkdialogs.c:169 ../pidgin/gtkdialogs.c:170
+#: ../pidgin/gtkdialogs.c:239
 msgid "Galician"
 msgstr "ガルシア語"
 
-#: ../pidgin/gtkdialogs.c:158 ../pidgin/gtkdialogs.c:159
+#: ../pidgin/gtkdialogs.c:171 ../pidgin/gtkdialogs.c:172
 msgid "Gujarati"
 msgstr "グジャラート語"
 
-#: ../pidgin/gtkdialogs.c:159
+#: ../pidgin/gtkdialogs.c:172
 msgid "Gujarati Language Team"
 msgstr "グジャラート語チーム"
 
-#: ../pidgin/gtkdialogs.c:160 ../pidgin/gtkdialogs.c:226
+#: ../pidgin/gtkdialogs.c:173 ../pidgin/gtkdialogs.c:240
 msgid "Hebrew"
 msgstr "ヘブライ語"
 
-#: ../pidgin/gtkdialogs.c:161
+#: ../pidgin/gtkdialogs.c:174
 msgid "Hindi"
 msgstr "ヒンズー語"
 
-#: ../pidgin/gtkdialogs.c:162
+#: ../pidgin/gtkdialogs.c:175 ../pidgin/gtkdialogs.c:241
 msgid "Hungarian"
 msgstr "ハンガリー語"
 
-#: ../pidgin/gtkdialogs.c:163
+#: ../pidgin/gtkdialogs.c:176
 msgid "Indonesian"
 msgstr "インドネシア語"
 
-#: ../pidgin/gtkdialogs.c:164 ../pidgin/gtkdialogs.c:227
+#: ../pidgin/gtkdialogs.c:177 ../pidgin/gtkdialogs.c:242
 msgid "Italian"
 msgstr "イタリア語"
 
-#: ../pidgin/gtkdialogs.c:165 ../pidgin/gtkdialogs.c:228
-#: ../pidgin/gtkdialogs.c:229 ../pidgin/gtkdialogs.c:230
+#: ../pidgin/gtkdialogs.c:178 ../pidgin/gtkdialogs.c:243
+#: ../pidgin/gtkdialogs.c:244 ../pidgin/gtkdialogs.c:245
 msgid "Japanese"
 msgstr "日本語"
 
-#: ../pidgin/gtkdialogs.c:166 ../pidgin/gtkdialogs.c:231
+#: ../pidgin/gtkdialogs.c:179 ../pidgin/gtkdialogs.c:246
 msgid "Georgian"
 msgstr "グルジア語"
 
-#: ../pidgin/gtkdialogs.c:166
+#: ../pidgin/gtkdialogs.c:179
 msgid "Ubuntu Georgian Translators"
 msgstr "Ubuntu グルジア語の翻訳者"
 
-#: ../pidgin/gtkdialogs.c:167
+#: ../pidgin/gtkdialogs.c:180
 msgid "Kannada"
 msgstr "カンナダ語"
 
-#: ../pidgin/gtkdialogs.c:167
+#: ../pidgin/gtkdialogs.c:180
 msgid "Kannada Translation team"
 msgstr "カンナダ語チーム"
 
-#: ../pidgin/gtkdialogs.c:168 ../pidgin/gtkdialogs.c:232
+#: ../pidgin/gtkdialogs.c:181 ../pidgin/gtkdialogs.c:247
+#: ../pidgin/gtkdialogs.c:248
 msgid "Korean"
 msgstr "韓国語"
 
-#: ../pidgin/gtkdialogs.c:169 ../pidgin/gtkdialogs.c:170
-#: ../pidgin/gtkdialogs.c:171
+#: ../pidgin/gtkdialogs.c:182 ../pidgin/gtkdialogs.c:183
+#: ../pidgin/gtkdialogs.c:184
 msgid "Kurdish"
 msgstr "クルド語"
 
-#: ../pidgin/gtkdialogs.c:172 ../pidgin/gtkdialogs.c:233
-#: ../pidgin/gtkdialogs.c:234
+#: ../pidgin/gtkdialogs.c:185 ../pidgin/gtkdialogs.c:249
+#: ../pidgin/gtkdialogs.c:250
 msgid "Lithuanian"
 msgstr "リトアニア語"
 
-#: ../pidgin/gtkdialogs.c:173 ../pidgin/gtkdialogs.c:174
-#: ../pidgin/gtkdialogs.c:235
+#: ../pidgin/gtkdialogs.c:186 ../pidgin/gtkdialogs.c:187
+#: ../pidgin/gtkdialogs.c:251
 msgid "Macedonian"
 msgstr "マケドニア語"
 
-#: ../pidgin/gtkdialogs.c:175
+#: ../pidgin/gtkdialogs.c:188 ../pidgin/gtkdialogs.c:252
 msgid "Bokmål Norwegian"
 msgstr "ボックマル・ノルウェー語"
 
-#: ../pidgin/gtkdialogs.c:176
+#: ../pidgin/gtkdialogs.c:189
 msgid "Nepali"
 msgstr "ネパール語"
 
-#: ../pidgin/gtkdialogs.c:177
+#: ../pidgin/gtkdialogs.c:190
 msgid "Dutch, Flemish"
 msgstr "オランダ/フランダース語"
 
-#: ../pidgin/gtkdialogs.c:178
-msgid "Norwegian"
+#: ../pidgin/gtkdialogs.c:191
+#, fuzzy
+msgid "Norwegian Nynorsk"
 msgstr "ノルウェー語"
 
-#: ../pidgin/gtkdialogs.c:179 ../pidgin/gtkdialogs.c:180
-#: ../pidgin/gtkdialogs.c:181 ../pidgin/gtkdialogs.c:236
+#: ../pidgin/gtkdialogs.c:192 ../pidgin/gtkdialogs.c:193
+#: ../pidgin/gtkdialogs.c:194 ../pidgin/gtkdialogs.c:253
 msgid "Polish"
 msgstr "ポーランド語"
 
-#: ../pidgin/gtkdialogs.c:182
+#: ../pidgin/gtkdialogs.c:195
 msgid "Portuguese"
 msgstr "ポルトガル語"
 
-#: ../pidgin/gtkdialogs.c:183
+#: ../pidgin/gtkdialogs.c:196
 msgid "Portuguese-Brazil"
 msgstr "ポルトガル・ブラジル語"
 
-#: ../pidgin/gtkdialogs.c:184
+#: ../pidgin/gtkdialogs.c:197
 msgid "Pashto"
 msgstr "パシュト語"
 
-#: ../pidgin/gtkdialogs.c:185
+#: ../pidgin/gtkdialogs.c:198
 msgid "Romanian"
 msgstr "ルーマニア語"
 
-#: ../pidgin/gtkdialogs.c:186 ../pidgin/gtkdialogs.c:237
-#: ../pidgin/gtkdialogs.c:238
+#: ../pidgin/gtkdialogs.c:199 ../pidgin/gtkdialogs.c:254
+#: ../pidgin/gtkdialogs.c:255
 msgid "Russian"
 msgstr "ロシア語"
 
-#: ../pidgin/gtkdialogs.c:187 ../pidgin/gtkdialogs.c:188
-#: ../pidgin/gtkdialogs.c:239 ../pidgin/gtkdialogs.c:240
-#: ../pidgin/gtkdialogs.c:241
+#: ../pidgin/gtkdialogs.c:200 ../pidgin/gtkdialogs.c:201
+#: ../pidgin/gtkdialogs.c:256 ../pidgin/gtkdialogs.c:257
+#: ../pidgin/gtkdialogs.c:258
 msgid "Slovak"
 msgstr "スロバキア語"
 
-#: ../pidgin/gtkdialogs.c:189 ../pidgin/gtkdialogs.c:242
+#: ../pidgin/gtkdialogs.c:202 ../pidgin/gtkdialogs.c:259
 msgid "Slovenian"
 msgstr "スロベニア語"
 
-#: ../pidgin/gtkdialogs.c:190
+#: ../pidgin/gtkdialogs.c:203
 msgid "Albanian"
 msgstr "アルバニア語"
 
-#: ../pidgin/gtkdialogs.c:191 ../pidgin/gtkdialogs.c:192
+#: ../pidgin/gtkdialogs.c:204 ../pidgin/gtkdialogs.c:205
 msgid "Serbian"
 msgstr "セルビア語"
 
-#: ../pidgin/gtkdialogs.c:193 ../pidgin/gtkdialogs.c:243
+#: ../pidgin/gtkdialogs.c:206 ../pidgin/gtkdialogs.c:260
+#: ../pidgin/gtkdialogs.c:261
 msgid "Swedish"
 msgstr "スウェーデン語"
 
-#: ../pidgin/gtkdialogs.c:194
+#: ../pidgin/gtkdialogs.c:207
 msgid "Tamil"
 msgstr "タミル語"
 
-#: ../pidgin/gtkdialogs.c:195
+#: ../pidgin/gtkdialogs.c:208
 msgid "Telugu"
 msgstr "テルグ語"
 
-#: ../pidgin/gtkdialogs.c:196
+#: ../pidgin/gtkdialogs.c:209
 msgid "Thai"
 msgstr "タイ語"
 
-#: ../pidgin/gtkdialogs.c:197 ../pidgin/gtkdialogs.c:244
+#: ../pidgin/gtkdialogs.c:210 ../pidgin/gtkdialogs.c:262
 msgid "Turkish"
 msgstr "トルコ語"
 
-#: ../pidgin/gtkdialogs.c:198
+#: ../pidgin/gtkdialogs.c:211
 msgid "Vietnamese"
 msgstr "ベトナム語"
 
-#: ../pidgin/gtkdialogs.c:198
+#: ../pidgin/gtkdialogs.c:211
 msgid "T.M.Thanh and the Gnome-Vi Team"
 msgstr "T.M.Thanh と Gnome-Vi チーム"
 
-#: ../pidgin/gtkdialogs.c:199 ../pidgin/gtkdialogs.c:245
+#: ../pidgin/gtkdialogs.c:212 ../pidgin/gtkdialogs.c:263
 msgid "Simplified Chinese"
 msgstr "簡体字中国語"
 
-#: ../pidgin/gtkdialogs.c:200 ../pidgin/gtkdialogs.c:201
-#: ../pidgin/gtkdialogs.c:202
+#: ../pidgin/gtkdialogs.c:213 ../pidgin/gtkdialogs.c:214
+#: ../pidgin/gtkdialogs.c:215
 msgid "Hong Kong Chinese"
 msgstr "中国語 (香港)"
 
-#: ../pidgin/gtkdialogs.c:203 ../pidgin/gtkdialogs.c:204
-#: ../pidgin/gtkdialogs.c:246
+#: ../pidgin/gtkdialogs.c:216 ../pidgin/gtkdialogs.c:217
+#: ../pidgin/gtkdialogs.c:264
 msgid "Traditional Chinese"
 msgstr "繁体字中国語"
 
-#: ../pidgin/gtkdialogs.c:210
+#: ../pidgin/gtkdialogs.c:223
 msgid "Amharic"
 msgstr "アムハラ語"
 
-#: ../pidgin/gtkdialogs.c:331
+#: ../pidgin/gtkdialogs.c:351
 #, c-format
 msgid "About %s"
 msgstr "%s について"
 
-#: ../pidgin/gtkdialogs.c:369
-#, c-format
+#: ../pidgin/gtkdialogs.c:394
+#, fuzzy, c-format
 msgid ""
 "%s is a graphical modular messaging client based on libpurple which is "
 "capable of connecting to AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, "
-"Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, Gadu-Gadu, and QQ all at "
-"once.  It is written using GTK+.<BR><BR>You may modify and redistribute the "
-"program under the terms of the GPL (version 2 or later).  A copy of the GPL "
-"is contained in the 'COPYING' file distributed with %s.  %s is copyrighted "
-"by its contributors.  See the 'COPYRIGHT' file for the complete list of "
-"contributors.  We provide no warranty for this program.<BR><BR>"
+"Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, MySpaceIM, Gadu-Gadu, and "
+"QQ all at once.  It is written using GTK+.<BR><BR>You may modify and "
+"redistribute the program under the terms of the GPL (version 2 or later).  A "
+"copy of the GPL is contained in the 'COPYING' file distributed with %s.  %s "
+"is copyrighted by its contributors.  See the 'COPYRIGHT' file for the "
+"complete list of contributors.  We provide no warranty for this program."
+"<BR><BR>"
 msgstr ""
 "%s は AIM、MSN、Yahoo!、XMPP、ICQ、IRC、SILC、SIP/SIMPLE、Novell GroupWise、"
 "Lotus Sametime、Bonjour、Zephyr、Gadu-Gadu、QQ といったプロトコルを全て同時に"
@@ -13298,85 +15050,90 @@
 "に帰属します。この貢献者の詳細な一覧については 'COPYRIGHT' を御覧下さい。本プ"
 "ログラムは完全無保証です。<BR><BR>"
 
-#: ../pidgin/gtkdialogs.c:384
+#: ../pidgin/gtkdialogs.c:412
 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:389
+#: ../pidgin/gtkdialogs.c:417
 msgid "Current Developers"
 msgstr "現在の開発者"
 
-#: ../pidgin/gtkdialogs.c:404
+#: ../pidgin/gtkdialogs.c:432
 msgid "Crazy Patch Writers"
 msgstr "Crazy なパッチの作者"
 
-#: ../pidgin/gtkdialogs.c:419
+#: ../pidgin/gtkdialogs.c:447
 msgid "Retired Developers"
 msgstr "開発者 (旧バージョン)"
 
-#: ../pidgin/gtkdialogs.c:434
+#: ../pidgin/gtkdialogs.c:462
+#, fuzzy
+msgid "Retired Crazy Patch Writers"
+msgstr "Crazy なパッチの作者"
+
+#: ../pidgin/gtkdialogs.c:477
 msgid "Artists"
 msgstr "アーティスト"
 
-#: ../pidgin/gtkdialogs.c:449
+#: ../pidgin/gtkdialogs.c:492
 msgid "Current Translators"
 msgstr "翻訳者 (最新バージョン)"
 
-#: ../pidgin/gtkdialogs.c:469
+#: ../pidgin/gtkdialogs.c:512
 msgid "Past Translators"
 msgstr "翻訳者 (旧バージョン)"
 
-#: ../pidgin/gtkdialogs.c:487
+#: ../pidgin/gtkdialogs.c:530
 msgid "Debugging Information"
 msgstr "デバッグする際の参考情報"
 
-#: ../pidgin/gtkdialogs.c:865
+#: ../pidgin/gtkdialogs.c:900
 msgid "Get User Info"
 msgstr "ユーザ情報の取得"
 
-#: ../pidgin/gtkdialogs.c:867
+#: ../pidgin/gtkdialogs.c:902
 msgid ""
 "Please enter the screen name or alias of the person whose info you would "
 "like to view."
 msgstr "情報を表示する相手のスクリーン名または別名を入力して下さい:"
 
-#: ../pidgin/gtkdialogs.c:957
+#: ../pidgin/gtkdialogs.c:992
 msgid "View User Log"
 msgstr "ユーザ・ログの表示"
 
-#: ../pidgin/gtkdialogs.c:959
+#: ../pidgin/gtkdialogs.c:994
 msgid ""
 "Please enter the screen name or alias of the person whose log you would like "
 "to view."
 msgstr "ログを表示する相手のスクリーン名または別名を入力して下さい:"
 
-#: ../pidgin/gtkdialogs.c:979
+#: ../pidgin/gtkdialogs.c:1014
 msgid "Alias Contact"
 msgstr "コンタクトの別名"
 
-#: ../pidgin/gtkdialogs.c:980
+#: ../pidgin/gtkdialogs.c:1015
 msgid "Enter an alias for this contact."
 msgstr "このコンタクトの別名を入力して下さい:"
 
-#: ../pidgin/gtkdialogs.c:1002
+#: ../pidgin/gtkdialogs.c:1037
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "%s の別名を入力して下さい:"
 
-#: ../pidgin/gtkdialogs.c:1004
+#: ../pidgin/gtkdialogs.c:1039
 msgid "Alias Buddy"
 msgstr "仲間の別名"
 
-#: ../pidgin/gtkdialogs.c:1025
+#: ../pidgin/gtkdialogs.c:1060
 msgid "Alias Chat"
 msgstr "チャットの別名"
 
-#: ../pidgin/gtkdialogs.c:1026
+#: ../pidgin/gtkdialogs.c:1061
 msgid "Enter an alias for this chat."
 msgstr "このチャットの別名を入力して下さい:"
 
-#: ../pidgin/gtkdialogs.c:1065
+#: ../pidgin/gtkdialogs.c:1100
 #, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddy from "
@@ -13391,15 +15148,15 @@
 "仲間リストから %s さんを含む %d個の仲間を削除しようとしています。続行してもよ"
 "ろしいですか?"
 
-#: ../pidgin/gtkdialogs.c:1073
+#: ../pidgin/gtkdialogs.c:1108
 msgid "Remove Contact"
 msgstr "コンタクトの削除"
 
-#: ../pidgin/gtkdialogs.c:1076
+#: ../pidgin/gtkdialogs.c:1111
 msgid "_Remove Contact"
 msgstr "削除する(_R)"
 
-#: ../pidgin/gtkdialogs.c:1107
+#: ../pidgin/gtkdialogs.c:1142
 #, c-format
 msgid ""
 "You are about to merge the group called %s into the group called %s. Do you "
@@ -13408,15 +15165,15 @@
 "%s というグループと %s というグループを一つにまとめようとしています。続行して"
 "もよろしいですか?"
 
-#: ../pidgin/gtkdialogs.c:1114
+#: ../pidgin/gtkdialogs.c:1149
 msgid "Merge Groups"
 msgstr "グループの統合"
 
-#: ../pidgin/gtkdialogs.c:1117
+#: ../pidgin/gtkdialogs.c:1152
 msgid "_Merge Groups"
 msgstr "グループを統合する(_M)"
 
-#: ../pidgin/gtkdialogs.c:1167
+#: ../pidgin/gtkdialogs.c:1202
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
@@ -13425,29 +15182,29 @@
 "仲間リストからグループ %s とそのメンバを削除しようとしています。続行してもよ"
 "ろしいですか?"
 
-#: ../pidgin/gtkdialogs.c:1170
+#: ../pidgin/gtkdialogs.c:1205
 msgid "Remove Group"
 msgstr "グループの削除"
 
-#: ../pidgin/gtkdialogs.c:1173
+#: ../pidgin/gtkdialogs.c:1208
 msgid "_Remove Group"
 msgstr "削除する(_R)"
 
-#: ../pidgin/gtkdialogs.c:1206
+#: ../pidgin/gtkdialogs.c:1241
 #, c-format
 msgid ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr "仲間リストから %s を削除しようとしています。続行してもよろしいですか?"
 
-#: ../pidgin/gtkdialogs.c:1209
+#: ../pidgin/gtkdialogs.c:1244
 msgid "Remove Buddy"
 msgstr "仲間の削除"
 
-#: ../pidgin/gtkdialogs.c:1212
+#: ../pidgin/gtkdialogs.c:1247
 msgid "_Remove Buddy"
 msgstr "削除する(_R)"
 
-#: ../pidgin/gtkdialogs.c:1233
+#: ../pidgin/gtkdialogs.c:1268
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
@@ -13456,11 +15213,11 @@
 "仲間リストからチャット %s を削除しようとしています。続行してもよろしいです"
 "か?"
 
-#: ../pidgin/gtkdialogs.c:1236
+#: ../pidgin/gtkdialogs.c:1271
 msgid "Remove Chat"
 msgstr "チャットの削除"
 
-#: ../pidgin/gtkdialogs.c:1239
+#: ../pidgin/gtkdialogs.c:1274
 msgid "_Remove Chat"
 msgstr "削除する(_R)"
 
@@ -13485,138 +15242,139 @@
 msgstr "ミュート"
 
 #: ../pidgin/gtkdocklet.c:535
-msgid "Blink on new message"
+#, fuzzy
+msgid "Blink on New Message"
 msgstr "メッセージが届いたら点滅させる"
 
 #: ../pidgin/gtkdocklet.c:542
 msgid "Quit"
 msgstr "終了"
 
-#: ../pidgin/gtkft.c:153
+#: ../pidgin/gtkft.c:154
 msgid "Not started"
 msgstr "開始していません"
 
-#: ../pidgin/gtkft.c:273
+#: ../pidgin/gtkft.c:274
 msgid "<b>Receiving As:</b>"
 msgstr "<b>受信レート:</b>"
 
-#: ../pidgin/gtkft.c:275
+#: ../pidgin/gtkft.c:276
 msgid "<b>Receiving From:</b>"
 msgstr "<b>受信元:</b>"
 
-#: ../pidgin/gtkft.c:279
+#: ../pidgin/gtkft.c:280
 msgid "<b>Sending To:</b>"
 msgstr "<b>送信先:</b>"
 
-#: ../pidgin/gtkft.c:281
+#: ../pidgin/gtkft.c:282
 msgid "<b>Sending As:</b>"
 msgstr "<b>送信レート:</b>"
 
-#: ../pidgin/gtkft.c:497
+#: ../pidgin/gtkft.c:498
 msgid "There is no application configured to open this type of file."
 msgstr ""
 "この種類のファイルをオープンするために設定されたアプリケーションがありませ"
 "ん。"
 
-#: ../pidgin/gtkft.c:502
+#: ../pidgin/gtkft.c:503
 msgid "An error occurred while opening the file."
 msgstr "ファイルをオープンする際にエラーが発生しました。"
 
-#: ../pidgin/gtkft.c:539
+#: ../pidgin/gtkft.c:540
 #, c-format
 msgid "Error launching %s: %s"
 msgstr "%s を起動する際にエラー: %s"
 
-#: ../pidgin/gtkft.c:548
+#: ../pidgin/gtkft.c:549
 #, c-format
 msgid "Error running %s"
 msgstr "%s を実行する際にエラー"
 
-#: ../pidgin/gtkft.c:549
+#: ../pidgin/gtkft.c:550
 #, c-format
 msgid "Process returned error code %d"
 msgstr "プロセスがエラー・コード %d を返してきました"
 
-#: ../pidgin/gtkft.c:696
+#: ../pidgin/gtkft.c:697
 msgid "Filename:"
 msgstr "ファイル名:"
 
-#: ../pidgin/gtkft.c:697
+#: ../pidgin/gtkft.c:698
 msgid "Local File:"
 msgstr "ローカル・ファイル:"
 
-#: ../pidgin/gtkft.c:699
-msgid "Speed:"
-msgstr "速度:"
-
 #: ../pidgin/gtkft.c:700
+msgid "Speed:"
+msgstr "速度:"
+
+#: ../pidgin/gtkft.c:701
 msgid "Time Elapsed:"
 msgstr "経過時間:"
 
-#: ../pidgin/gtkft.c:701
+#: ../pidgin/gtkft.c:702
 msgid "Time Remaining:"
 msgstr "残り時間:"
 
-#: ../pidgin/gtkft.c:786
+#: ../pidgin/gtkft.c:784
 msgid "Close this window when all transfers _finish"
 msgstr "転送が完了したらダイアログを閉じる(_F)"
 
-#: ../pidgin/gtkft.c:796
+#: ../pidgin/gtkft.c:794
 msgid "C_lear finished transfers"
 msgstr "完了した転送をクリアする(_L)"
 
 #. "Download Details" arrow
-#: ../pidgin/gtkft.c:805
+#: ../pidgin/gtkft.c:803
 msgid "File transfer _details"
 msgstr "ファイル転送の詳細(_D)"
 
 #. Pause button
-#: ../pidgin/gtkft.c:835 ../pidgin/pidginstock.c:89
+#: ../pidgin/gtkft.c:833 ../pidgin/pidginstock.c:95
 msgid "_Pause"
 msgstr "一時停止(_P)"
 
 #. Resume button
-#: ../pidgin/gtkft.c:845
+#: ../pidgin/gtkft.c:843
 msgid "_Resume"
 msgstr "復帰(_R)"
 
-#: ../pidgin/gtkimhtml.c:796
+#: ../pidgin/gtkimhtml.c:816
 msgid "Paste as Plain _Text"
 msgstr "文字列として貼り付け(_T)"
 
-#: ../pidgin/gtkimhtml.c:813
+#: ../pidgin/gtkimhtml.c:833 ../pidgin/gtkimhtmltoolbar.c:1192
 msgid "_Reset formatting"
 msgstr "書式のリセット(_R)"
 
-#: ../pidgin/gtkimhtml.c:1309
+#: ../pidgin/gtkimhtml.c:1373
 msgid "Hyperlink color"
 msgstr "ハイパーリンクの色"
 
-#: ../pidgin/gtkimhtml.c:1310
+#: ../pidgin/gtkimhtml.c:1374
 msgid "Color to draw hyperlinks."
 msgstr "ハイパーリンクを描画する色です"
 
-#: ../pidgin/gtkimhtml.c:1313
+#: ../pidgin/gtkimhtml.c:1377
 msgid "Hyperlink prelight color"
 msgstr "ハイパーリンク (prelight) の色"
 
-#: ../pidgin/gtkimhtml.c:1314
+#: ../pidgin/gtkimhtml.c:1378
 msgid "Color to draw hyperlinks when mouse is over them."
 msgstr "ハイパーリンクの上にマウスをのせた時の色です"
 
-#: ../pidgin/gtkimhtml.c:1530
+#: ../pidgin/gtkimhtml.c:1598
 msgid "_Copy E-Mail Address"
 msgstr "E-メール・アドレスのコピー(_C)"
 
-#: ../pidgin/gtkimhtml.c:1542
+#: ../pidgin/gtkimhtml.c:1610
 msgid "_Open Link in Browser"
 msgstr "リンク先をブラウザで開く(_O)"
 
-#: ../pidgin/gtkimhtml.c:1552
+#: ../pidgin/gtkimhtml.c:1620
 msgid "_Copy Link Location"
 msgstr "リンク先のコピー(_C)"
 
-#: ../pidgin/gtkimhtml.c:3227
+#: ../pidgin/gtkimhtml.c:3369
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -13626,7 +15384,7 @@
 "\n"
 "デフォルトの PNG 画像として扱います。"
 
-#: ../pidgin/gtkimhtml.c:3230
+#: ../pidgin/gtkimhtml.c:3372
 msgid ""
 "Unrecognized file type\n"
 "\n"
@@ -13636,7 +15394,7 @@
 "\n"
 "デフォルトの PNG 画像として扱います。"
 
-#: ../pidgin/gtkimhtml.c:3259
+#: ../pidgin/gtkimhtml.c:3401
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -13647,7 +15405,7 @@
 "\n"
 "%s"
 
-#: ../pidgin/gtkimhtml.c:3262
+#: ../pidgin/gtkimhtml.c:3404
 #, c-format
 msgid ""
 "Error saving image\n"
@@ -13658,120 +15416,213 @@
 "\n"
 "%s"
 
-#: ../pidgin/gtkimhtml.c:3340 ../pidgin/gtkimhtml.c:3352
+#: ../pidgin/gtkimhtml.c:3482 ../pidgin/gtkimhtml.c:3494
 msgid "Save Image"
 msgstr "画像の保存"
 
-#: ../pidgin/gtkimhtml.c:3380
+#: ../pidgin/gtkimhtml.c:3522
 msgid "_Save Image..."
 msgstr "画像の保存(_S)..."
 
-#: ../pidgin/gtkimhtmltoolbar.c:151
+#: ../pidgin/gtkimhtmltoolbar.c:163
 msgid "Select Font"
 msgstr "フォントの選択"
 
-#: ../pidgin/gtkimhtmltoolbar.c:230
+#: ../pidgin/gtkimhtmltoolbar.c:242
 msgid "Select Text Color"
 msgstr "メッセージの色の選択"
 
-#: ../pidgin/gtkimhtmltoolbar.c:309
+#: ../pidgin/gtkimhtmltoolbar.c:321
 msgid "Select Background Color"
 msgstr "背景色の選択"
 
-#: ../pidgin/gtkimhtmltoolbar.c:398
+#: ../pidgin/gtkimhtmltoolbar.c:410
 msgid "_URL"
 msgstr "URL(_U)"
 
-#: ../pidgin/gtkimhtmltoolbar.c:406
+#: ../pidgin/gtkimhtmltoolbar.c:418
 msgid "_Description"
 msgstr "説明(_D)"
 
-#: ../pidgin/gtkimhtmltoolbar.c:409
+#: ../pidgin/gtkimhtmltoolbar.c:421
 msgid ""
 "Please enter the URL and description of the link that you want to insert. "
 "The description is optional."
 msgstr ""
 "挿入するリンクの URL とその説明を入力して下さい (説明はオプションです):"
 
-#: ../pidgin/gtkimhtmltoolbar.c:413
+#: ../pidgin/gtkimhtmltoolbar.c:425
 msgid "Please enter the URL of the link that you want to insert."
 msgstr "挿入するリンクの URL を入力して下さい:"
 
-#: ../pidgin/gtkimhtmltoolbar.c:418
+#: ../pidgin/gtkimhtmltoolbar.c:430 ../pidgin/gtkimhtmltoolbar.c:1099
 msgid "Insert Link"
 msgstr "リンクの挿入"
 
-#: ../pidgin/gtkimhtmltoolbar.c:422
+#: ../pidgin/gtkimhtmltoolbar.c:434 ../pidgin/gtkimhtmltoolbar.c:1260
 msgid "_Insert"
 msgstr "挿入(_I)"
 
-#: ../pidgin/gtkimhtmltoolbar.c:491
+#: ../pidgin/gtkimhtmltoolbar.c:514
 #, c-format
 msgid "Failed to store image: %s\n"
 msgstr "画像の格納に失敗しました: %s\n"
 
-#: ../pidgin/gtkimhtmltoolbar.c:517 ../pidgin/gtkimhtmltoolbar.c:527
+#: ../pidgin/gtkimhtmltoolbar.c:540 ../pidgin/gtkimhtmltoolbar.c:550
 msgid "Insert Image"
 msgstr "画像の挿入"
 
-#: ../pidgin/gtkimhtmltoolbar.c:725
+#: ../pidgin/gtkimhtmltoolbar.c:761
 msgid "This theme has no available smileys."
 msgstr "このテーマには利用可能なスマイリーがありません。"
 
 #. show everything
-#: ../pidgin/gtkimhtmltoolbar.c:739
+#: ../pidgin/gtkimhtmltoolbar.c:778
 msgid "Smile!"
 msgstr "スマイリー (顔文字) !"
 
-#: ../pidgin/gtkimhtmltoolbar.c:926 ../pidgin/plugins/convcolors.c:287
+#: ../pidgin/gtkimhtmltoolbar.c:843 ../pidgin/gtkimhtmltoolbar.c:1217
+#, fuzzy
+msgid "_Font"
+msgstr "フォント"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1051
+#, fuzzy
+msgid "Group Items"
+msgstr "グループ ID"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1051
+msgid "Ungroup Items"
+msgstr ""
+
+#: ../pidgin/gtkimhtmltoolbar.c:1085 ../pidgin/plugins/convcolors.c:287
 msgid "Bold"
 msgstr "太字にする"
 
-#: ../pidgin/gtkimhtmltoolbar.c:937 ../pidgin/plugins/convcolors.c:294
+#: ../pidgin/gtkimhtmltoolbar.c:1086 ../pidgin/plugins/convcolors.c:294
 msgid "Italic"
 msgstr "イタリックにする"
 
-#: ../pidgin/gtkimhtmltoolbar.c:948 ../pidgin/plugins/convcolors.c:301
+#: ../pidgin/gtkimhtmltoolbar.c:1087 ../pidgin/plugins/convcolors.c:301
 msgid "Underline"
 msgstr "下線を付ける"
 
-#: ../pidgin/gtkimhtmltoolbar.c:964
-msgid "Larger font size"
-msgstr "フォントのサイズを大きくします"
-
-#: ../pidgin/gtkimhtmltoolbar.c:976
-msgid "Smaller font size"
-msgstr "フォントのサイズを小さくします"
-
-#: ../pidgin/gtkimhtmltoolbar.c:993
-msgid "Font face"
+#: ../pidgin/gtkimhtmltoolbar.c:1088
+msgid "Strikethrough"
+msgstr ""
+
+#: ../pidgin/gtkimhtmltoolbar.c:1090
+msgid "Increase Font Size"
+msgstr ""
+
+#: ../pidgin/gtkimhtmltoolbar.c:1091
+msgid "Decrease Font Size"
+msgstr ""
+
+#: ../pidgin/gtkimhtmltoolbar.c:1093
+#, fuzzy
+msgid "Font Face"
 msgstr "フォントの種類を変更します"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1005
-msgid "Foreground font color"
-msgstr "メッセージの色を変更します"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1017
-msgid "Background color"
+#: ../pidgin/gtkimhtmltoolbar.c:1094
+#, fuzzy
+msgid "Background Color"
 msgstr "背景色を変更します"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1033
-msgid "Reset formatting"
+#: ../pidgin/gtkimhtmltoolbar.c:1095
+#, fuzzy
+msgid "Foreground Color"
+msgstr "メッセージの色を変更します"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1097
+#, fuzzy
+msgid "Reset Formatting"
 msgstr "書式をリセットします"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1048
-msgid "Insert link"
-msgstr "リンクを挿入します"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1058
-msgid "Insert image"
-msgstr "画像を挿入します"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1069
-msgid "Insert smiley"
+#: ../pidgin/gtkimhtmltoolbar.c:1100
+#, fuzzy
+msgid "Insert IM Image"
+msgstr "画像の挿入"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1101
+#, fuzzy
+msgid "Insert Smiley"
 msgstr "スマイリー (顔文字) を挿入します"
 
-#: ../pidgin/gtklog.c:267
+#: ../pidgin/gtkimhtmltoolbar.c:1177
+#, fuzzy
+msgid "<b>_Bold</b>"
+msgstr "<b>パスワード</b>:"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1178
+#, fuzzy
+msgid "<i>_Italic</i>"
+msgstr " <i>(ircop)</i>"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1179
+#, fuzzy
+msgid "<u>_Underline</u>"
+msgstr "下線を付ける"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1180
+msgid "<span strikethrough='true'>Strikethrough</span>"
+msgstr ""
+
+#: ../pidgin/gtkimhtmltoolbar.c:1181
+#, fuzzy
+msgid "<span size='larger'>_Larger</span>"
+msgstr ""
+"<span size='larger' weight='bold'>画像を保存する際にエラー</span>\n"
+"\n"
+"%s"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1183
+#, fuzzy
+msgid "_Normal"
+msgstr "標準"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1185
+msgid "<span size='smaller'>_Smaller</span>"
+msgstr ""
+
+#. If we want to show the formatting for the following items, we would
+#. * need to update them when formatting changes. The above items don't need
+#. * no updating nor nothin'
+#: ../pidgin/gtkimhtmltoolbar.c:1189
+#, fuzzy
+msgid "_Font face"
+msgstr "フォントの種類を変更します"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1190
+#, fuzzy
+msgid "Foreground _color"
+msgstr "メッセージの色を変更します"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1191
+#, fuzzy
+msgid "Bac_kground color"
+msgstr "背景色を変更します"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1268
+#, fuzzy
+msgid "_Image"
+msgstr "画像の保存"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1274
+#, fuzzy
+msgid "_Link"
+msgstr "ログイン(_L)"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1280
+msgid "_Horizontal rule"
+msgstr ""
+
+#: ../pidgin/gtkimhtmltoolbar.c:1302
+#, fuzzy
+msgid "_Smile!"
+msgstr "スマイリー (顔文字) !"
+
+#: ../pidgin/gtklog.c:293
 #, c-format
 msgid ""
 "Are you sure you want to permanently delete the log of the conversation with "
@@ -13779,35 +15630,35 @@
 msgstr ""
 "%s さんと %s から記録し始めた会話ログを完全に削除してもよろしいですか?"
 
-#: ../pidgin/gtklog.c:278
+#: ../pidgin/gtklog.c:304
 #, c-format
 msgid ""
 "Are you sure you want to permanently delete the log of the conversation in %"
 "s which started at %s?"
 msgstr "%s で %s から記録し始めた会話ログを完全に削除してもよろしいですか?"
 
-#: ../pidgin/gtklog.c:283
+#: ../pidgin/gtklog.c:309
 #, c-format
 msgid ""
 "Are you sure you want to permanently delete the system log which started at %"
 "s?"
 msgstr "%s から記録し始めたシステム・ログを完全に削除してもよろしいですか?"
 
-#: ../pidgin/gtklog.c:427
+#: ../pidgin/gtklog.c:453
 #, c-format
 msgid "<span size='larger' weight='bold'>Conversation in %s on %s</span>"
 msgstr "<span size='larger' weight='bold'>%s での会話 (%s)</span>"
 
-#: ../pidgin/gtklog.c:430
+#: ../pidgin/gtklog.c:456
 #, c-format
 msgid "<span size='larger' weight='bold'>Conversation with %s on %s</span>"
 msgstr "<span size='larger' weight='bold'>%s さんとの会話 (%s)</span>"
 
-#: ../pidgin/gtklog.c:477
+#: ../pidgin/gtklog.c:503
 msgid "%B %Y"
 msgstr "%Y年%B"
 
-#: ../pidgin/gtklog.c:524
+#: ../pidgin/gtklog.c:550
 msgid ""
 "System events will only be logged if the \"Log all status changes to system "
 "log\" preference is enabled."
@@ -13815,7 +15666,7 @@
 "システム・イベントのログは、設定ダイアログで \"状態の変更を全てシステム・ログ"
 "に記録する\" が有効な場合にのみ記録します。"
 
-#: ../pidgin/gtklog.c:528
+#: ../pidgin/gtklog.c:554
 msgid ""
 "Instant messages will only be logged if the \"Log all instant messages\" "
 "preference is enabled."
@@ -13823,47 +15674,47 @@
 "インスタント・メッセージのログは、設定ダイアログで \"インスタント・メッセージ"
 "を全てログに記録する\" が有効な場合にのみ記録します。"
 
-#: ../pidgin/gtklog.c:531
+#: ../pidgin/gtklog.c:557
 msgid ""
 "Chats will only be logged if the \"Log all chats\" preference is enabled."
 msgstr ""
 "チャットのログは、設定ダイアログで \"チャットを全てシステム・ログに記録する"
 "\" が有効な場合にのみログを記録します。"
 
-#: ../pidgin/gtklog.c:535
+#: ../pidgin/gtklog.c:561
 msgid "No logs were found"
 msgstr "ログが見つかりませんでした"
 
 #. Steal the "HELP" response and use it to trigger browsing to the logs folder
-#: ../pidgin/gtklog.c:550
+#: ../pidgin/gtklog.c:576
 msgid "_Browse logs folder"
 msgstr "ログ・フォルダの参照(_B)"
 
-#: ../pidgin/gtklog.c:614
+#: ../pidgin/gtklog.c:640
 msgid "Total log size:"
 msgstr "ログの合計サイズ:"
 
-#: ../pidgin/gtklog.c:683
+#: ../pidgin/gtklog.c:709
 #, c-format
 msgid "Conversations in %s"
 msgstr "%s さんとの会話"
 
-#: ../pidgin/gtklog.c:691 ../pidgin/gtklog.c:753
+#: ../pidgin/gtklog.c:717 ../pidgin/gtklog.c:779
 #, c-format
 msgid "Conversations with %s"
 msgstr "%s さんとの会話"
 
-#: ../pidgin/gtklog.c:778
+#: ../pidgin/gtklog.c:804
 msgid "System Log"
 msgstr "システム・ログ"
 
-#: ../pidgin/gtkmain.c:368
+#: ../pidgin/gtkmain.c:386
 #, c-format
 msgid "%s %s. Try `%s -h' for more information.\n"
 msgstr "%s %s (詳しい情報は `%s -h' と入力して下さい)\n"
 
-#: ../pidgin/gtkmain.c:370
-#, c-format
+#: ../pidgin/gtkmain.c:388
+#, fuzzy, c-format
 msgid ""
 "%s %s\n"
 "Usage: %s [OPTION]...\n"
@@ -13871,9 +15722,11 @@
 "  -c, --config=DIR    use DIR for config files\n"
 "  -d, --debug         print debugging messages to stdout\n"
 "  -h, --help          display this help and exit\n"
+"  -m, --multiple      do not ensure single instance\n"
 "  -n, --nologin       don't automatically login\n"
 "  -l, --login[=NAME]  automatically login (optional argument NAME specifies\n"
 "                      account(s) to use, separated by commas)\n"
+"  --display=DISPLAY   X display to use\n"
 "  -v, --version       display the current version and exit\n"
 msgstr ""
 "%s %s\n"
@@ -13889,16 +15742,16 @@
 "可)\n"
 "  -v, --version       現在使用しているバージョンを表示して終了する\n"
 
-#: ../pidgin/gtkmain.c:490
-#, c-format
-msgid ""
-"%s has segfaulted and attempted to dump a core file.\n"
+#: ../pidgin/gtkmain.c:516
+#, fuzzy, c-format
+msgid ""
+"%s %s has segfaulted and attempted to dump a core file.\n"
 "This is a bug in the software and has happened through\n"
 "no fault of your own.\n"
 "\n"
 "If you can reproduce the crash, please notify the developers\n"
 "by reporting a bug at:\n"
-"%snewticket/\n"
+"%ssimpleticket/\n"
 "\n"
 "Please make sure to specify what you were doing at the time\n"
 "and post the backtrace from the core file.  If you do not know\n"
@@ -13930,67 +15783,69 @@
 "次のサイトを参照してみて下さい:\n"
 "%swiki/DeveloperPages\n"
 
-#: ../pidgin/gtknotify.c:343
+#. Translators may want to transliterate the name.
+#. It is not to be translated.
+#: ../pidgin/gtkmain.c:706 ../pidgin/pidgin.h:51
+msgid "Pidgin"
+msgstr "Pidgin"
+
+#: ../pidgin/gtknotify.c:349
 msgid "Open All Messages"
 msgstr "全てのメッセージを開く"
 
-#: ../pidgin/gtknotify.c:395
+#: ../pidgin/gtknotify.c:402
 msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">新着メールがあります!</span>"
 
-#: ../pidgin/gtknotify.c:489
-msgid "Sender"
-msgstr "送信者"
-
-#: ../pidgin/gtknotify.c:515
+#: ../pidgin/gtknotify.c:537
 #, c-format
 msgid "%s has %d new message."
 msgid_plural "%s has %d new messages."
 msgstr[0] "%s には %d通の新しいメッセージがあります。"
 msgstr[1] "%s には %d通の新しいメッセージがあります。"
 
-#: ../pidgin/gtknotify.c:526
-#, c-format
-msgid "<b>You have %d new e-mail.</b>"
-msgid_plural "<b>You have %d new e-mails.</b>"
+#: ../pidgin/gtknotify.c:562
+#, fuzzy, c-format
+msgid "<b>%d new e-mail.</b>"
+msgid_plural "<b>%d new e-mails.</b>"
 msgstr[0] "<b>%d通の新しいメールがあります</b>"
 msgstr[1] "<b>%d通の新しいメールがあります</b>"
 
-#: ../pidgin/gtknotify.c:969
+#: ../pidgin/gtknotify.c:989
 #, c-format
 msgid "The browser command \"%s\" is invalid."
 msgstr "ブラウザを起動するコマンド \"%s\" が正しくありません。"
 
-#: ../pidgin/gtknotify.c:971 ../pidgin/gtknotify.c:983
-#: ../pidgin/gtknotify.c:996 ../pidgin/gtknotify.c:1124
+#: ../pidgin/gtknotify.c:991 ../pidgin/gtknotify.c:1003
+#: ../pidgin/gtknotify.c:1016 ../pidgin/gtknotify.c:1144
 msgid "Unable to open URL"
 msgstr "URL を開けません"
 
-#: ../pidgin/gtknotify.c:981 ../pidgin/gtknotify.c:994
+#: ../pidgin/gtknotify.c:1001 ../pidgin/gtknotify.c:1014
 #, c-format
 msgid "Error launching \"%s\": %s"
 msgstr "\"%s\" を起動する際にエラー: %s"
 
-#: ../pidgin/gtknotify.c:1125
+#: ../pidgin/gtknotify.c:1145
 msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr ""
 "ブラウザのコマンドを '手動設定' したようですが、コマンドが指定されていませ"
 "ん。"
 
-#: ../pidgin/gtkplugin.c:264
+#: ../pidgin/gtkplugin.c:265
 msgid "The following plugins will be unloaded."
 msgstr "次のプラグインを解放します。"
 
-#: ../pidgin/gtkplugin.c:283
+#: ../pidgin/gtkplugin.c:284
 msgid "Multiple plugins will be unloaded."
 msgstr "複数個のプラグインを解放します。"
 
-#: ../pidgin/gtkplugin.c:287
+#: ../pidgin/gtkplugin.c:288
 msgid "Unload Plugins"
 msgstr "プラグインの解放"
 
-#: ../pidgin/gtkplugin.c:399
+#: ../pidgin/gtkplugin.c:400
 #, c-format
 msgid ""
 "%s%s<span weight=\"bold\">Written by:</span>\t%s\n"
@@ -14001,7 +15856,7 @@
 "<span weight=\"bold\">配布元:</span> %s\n"
 "<span weight=\"bold\">ファイル名:</span> %s"
 
-#: ../pidgin/gtkplugin.c:409
+#: ../pidgin/gtkplugin.c:410
 #, c-format
 msgid ""
 "%s\n"
@@ -14012,116 +15867,125 @@
 "<span foreground=\"#ff0000\" weight=\"bold\">エラー: %s\n"
 "アップデートが提供されていないか配布元で確認して下さい。</span>"
 
-#: ../pidgin/gtkplugin.c:535
+#: ../pidgin/gtkplugin.c:536
 msgid "Configure Pl_ugin"
 msgstr "プラグインの設定(_U)"
 
-#: ../pidgin/gtkplugin.c:598
+#: ../pidgin/gtkplugin.c:599
 msgid "<b>Plugin Details</b>"
 msgstr "<b>プラグインの詳細</b>"
 
-#: ../pidgin/gtkpounce.c:155
+#: ../pidgin/gtkpounce.c:157
 msgid "Select a file"
 msgstr "ファイルの選択"
 
 #. Create the "Pounce on Whom" frame.
-#: ../pidgin/gtkpounce.c:524
+#: ../pidgin/gtkpounce.c:532
 msgid "Pounce on Whom"
 msgstr "どのアカウントで誰をつかむか..."
 
-#: ../pidgin/gtkpounce.c:551
+#: ../pidgin/gtkpounce.c:559
 msgid "_Buddy name:"
 msgstr "つかむ仲間(_B):"
 
-#: ../pidgin/gtkpounce.c:585
+#: ../pidgin/gtkpounce.c:593
 msgid "Si_gns on"
 msgstr "サイン・インした時(_G)"
 
-#: ../pidgin/gtkpounce.c:587
+#: ../pidgin/gtkpounce.c:595
 msgid "Signs o_ff"
 msgstr "サイン・アウトした時(_F)"
 
-#: ../pidgin/gtkpounce.c:589
+#: ../pidgin/gtkpounce.c:597
 msgid "Goes a_way"
 msgstr "離席中になった時(_W)"
 
-#: ../pidgin/gtkpounce.c:591
+#: ../pidgin/gtkpounce.c:599
 msgid "Ret_urns from away"
 msgstr "離席中から戻った時(_U)"
 
-#: ../pidgin/gtkpounce.c:593
+#: ../pidgin/gtkpounce.c:601
 msgid "Becomes _idle"
 msgstr "待機中になった時(_I)"
 
-#: ../pidgin/gtkpounce.c:595
+#: ../pidgin/gtkpounce.c:603
 msgid "Is no longer i_dle"
 msgstr "待機中から復帰した時(_D)"
 
-#: ../pidgin/gtkpounce.c:597
+#: ../pidgin/gtkpounce.c:605
 msgid "Starts _typing"
 msgstr "入力を開始した時(_T)"
 
-#: ../pidgin/gtkpounce.c:599
+#: ../pidgin/gtkpounce.c:607
 msgid "P_auses while typing"
 msgstr "入力を一旦停止した時(_A)"
 
-#: ../pidgin/gtkpounce.c:601
+#: ../pidgin/gtkpounce.c:609
 msgid "Stops t_yping"
 msgstr "入力を止めた時(_Y)"
 
-#: ../pidgin/gtkpounce.c:603
+#: ../pidgin/gtkpounce.c:611
 msgid "Sends a _message"
 msgstr "メッセージを送信する時(_M)"
 
-#: ../pidgin/gtkpounce.c:646
+#: ../pidgin/gtkpounce.c:654
 msgid "Ope_n an IM window"
 msgstr "会話ウィンドウを開く(_N)"
 
-#: ../pidgin/gtkpounce.c:648
+#: ../pidgin/gtkpounce.c:656
 msgid "_Pop up a notification"
 msgstr "ポップアップして通知する(_P)"
 
-#: ../pidgin/gtkpounce.c:650
+#: ../pidgin/gtkpounce.c:658
 msgid "Send a _message"
 msgstr "メッセージを送信する(_M)"
 
-#: ../pidgin/gtkpounce.c:652
+#: ../pidgin/gtkpounce.c:660
 msgid "E_xecute a command"
 msgstr "コマンドを実行する(_X)"
 
-#: ../pidgin/gtkpounce.c:654
+#: ../pidgin/gtkpounce.c:662
 msgid "P_lay a sound"
 msgstr "サウンドを演奏する(_L)"
 
-#: ../pidgin/gtkpounce.c:659
+#: ../pidgin/gtkpounce.c:668
 msgid "Brows_e..."
 msgstr "参照(_E)..."
 
-#: ../pidgin/gtkpounce.c:661
+#: ../pidgin/gtkpounce.c:670
 msgid "Br_owse..."
 msgstr "参照(_O)..."
 
-#: ../pidgin/gtkpounce.c:662
+#: ../pidgin/gtkpounce.c:671
 msgid "Pre_view"
 msgstr "プレビュー(_V)"
 
-#: ../pidgin/gtkpounce.c:786
+#: ../pidgin/gtkpounce.c:798
 msgid "P_ounce only when my status is not Available"
 msgstr "自分の状態を指定できない時にだけつかむ(_O)"
 
-#: ../pidgin/gtkpounce.c:791
+#: ../pidgin/gtkpounce.c:803
 msgid "_Recurring"
 msgstr "繰り返す(_R)"
 
-#: ../pidgin/gtkpounce.c:1247
+#: ../pidgin/gtkpounce.c:1246
 msgid "Pounce Target"
 msgstr "つかむ相手"
 
-#: ../pidgin/gtkprefs.c:509
+#: ../pidgin/gtkprefs.c:386
+#: ../pidgin/pixmaps/emotes/default/24/default.theme.in.h:1
+msgid "Default"
+msgstr "デフォルト"
+
+#: ../pidgin/gtkprefs.c:517
 msgid "Smiley theme failed to unpack."
 msgstr "スマイリーのテーマを展開できませんでした"
 
-#: ../pidgin/gtkprefs.c:638
+#: ../pidgin/gtkprefs.c:644
+msgid "Install Theme"
+msgstr ""
+
+#: ../pidgin/gtkprefs.c:697
 msgid ""
 "Select a smiley theme that you would like to use from the list below. New "
 "themes can be installed by dragging and dropping them onto the theme list."
@@ -14129,255 +15993,259 @@
 "下の一覧から使用するスマイリー (顔文字) のテーマを選択して下さい。この一覧の"
 "中へ新しいテーマをドラッグ&ドロップするとインストールすることができます。"
 
-#: ../pidgin/gtkprefs.c:673
+#: ../pidgin/gtkprefs.c:732
 msgid "Icon"
 msgstr "アイコン"
 
-#: ../pidgin/gtkprefs.c:816
+#: ../pidgin/gtkprefs.c:894
 msgid "System Tray Icon"
 msgstr "システム・トレイのアイコン"
 
-#: ../pidgin/gtkprefs.c:817
+#: ../pidgin/gtkprefs.c:895
 msgid "_Show system tray icon:"
 msgstr "いつアイコンを表示するか...(_S):"
 
-#: ../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
-msgid "Always"
-msgstr "常に"
-
-#: ../pidgin/gtkprefs.c:821
+#: ../pidgin/gtkprefs.c:899
 msgid "On unread messages"
 msgstr "メッセージが届いた時"
 
-#: ../pidgin/gtkprefs.c:826
+#: ../pidgin/gtkprefs.c:904
 msgid "Conversation Window Hiding"
 msgstr "会話ウィンドウを隠す"
 
-#: ../pidgin/gtkprefs.c:827
+#: ../pidgin/gtkprefs.c:905
 msgid "_Hide new IM conversations:"
 msgstr "いつ新しい会話ウィンドウを隠すか...(_H):"
 
-#: ../pidgin/gtkprefs.c:830 ../pidgin/gtkprefs.c:1867
+#: ../pidgin/gtkprefs.c:908 ../pidgin/gtkprefs.c:1946
 msgid "When away"
 msgstr "離席する時だけ"
 
 #. All the tab options!
-#: ../pidgin/gtkprefs.c:838
+#: ../pidgin/gtkprefs.c:916
 msgid "Tabs"
 msgstr "タブ"
 
-#: ../pidgin/gtkprefs.c:840
+#: ../pidgin/gtkprefs.c:918
 msgid "Show IMs and chats in _tabbed windows"
 msgstr "タブ付きのウィンドウの中に IM とチャットを表示する(_T)"
 
-#: ../pidgin/gtkprefs.c:854
+#: ../pidgin/gtkprefs.c:932
 msgid "Show close b_utton on tabs"
 msgstr "タブに閉じるボタンを表示する(_U)"
 
-#: ../pidgin/gtkprefs.c:857
+#: ../pidgin/gtkprefs.c:935
 msgid "_Placement:"
 msgstr "タブの位置(_P):"
 
-#: ../pidgin/gtkprefs.c:859
+#: ../pidgin/gtkprefs.c:937
 msgid "Top"
 msgstr "上側"
 
-#: ../pidgin/gtkprefs.c:860
+#: ../pidgin/gtkprefs.c:938
 msgid "Bottom"
 msgstr "下側"
 
-#: ../pidgin/gtkprefs.c:861
+#: ../pidgin/gtkprefs.c:939
 msgid "Left"
 msgstr "左側"
 
-#: ../pidgin/gtkprefs.c:862
+#: ../pidgin/gtkprefs.c:940
 msgid "Right"
 msgstr "右側"
 
-#: ../pidgin/gtkprefs.c:864
+#: ../pidgin/gtkprefs.c:942
 msgid "Left Vertical"
 msgstr "左側に縦向き"
 
-#: ../pidgin/gtkprefs.c:865
+#: ../pidgin/gtkprefs.c:943
 msgid "Right Vertical"
 msgstr "右側に縦向き"
 
-#: ../pidgin/gtkprefs.c:872
+#: ../pidgin/gtkprefs.c:950
 msgid "N_ew conversations:"
 msgstr "新しい会話ウィンドウ(_E):"
 
-#: ../pidgin/gtkprefs.c:917
+#: ../pidgin/gtkprefs.c:995
 msgid "Show _formatting on incoming messages"
 msgstr "受信したメッセージの書式を有効にして表示する(_F)"
 
-#: ../pidgin/gtkprefs.c:920
-msgid "Show buddy _icons"
-msgstr "仲間アイコンを表示する(_I)"
-
-#: ../pidgin/gtkprefs.c:922
+#: ../pidgin/gtkprefs.c:997
+msgid "Close IMs immediately when the tab is closed"
+msgstr ""
+
+#: ../pidgin/gtkprefs.c:1000
+#, fuzzy
+msgid "Show _detailed information"
+msgstr "ログイン情報を表示する"
+
+#: ../pidgin/gtkprefs.c:1002
 msgid "Enable buddy ic_on animation"
 msgstr "仲間アイコンのアニメーションを有効にする(_O)"
 
-#: ../pidgin/gtkprefs.c:929
+#: ../pidgin/gtkprefs.c:1009
 msgid "_Notify buddies that you are typing to them"
 msgstr "メッセージを入力中であることを仲間に通知する(_N)"
 
-#: ../pidgin/gtkprefs.c:932
+#: ../pidgin/gtkprefs.c:1012
 msgid "Highlight _misspelled words"
 msgstr "スペル間違いを強調表示する(_M)"
 
-#: ../pidgin/gtkprefs.c:936
+#: ../pidgin/gtkprefs.c:1016
 msgid "Use smooth-scrolling"
 msgstr "スクロールを滑らかにする"
 
-#: ../pidgin/gtkprefs.c:939
+#: ../pidgin/gtkprefs.c:1019
 msgid "F_lash window when IMs are received"
 msgstr "メッセージを受け取ったらウィンドウを点滅させる(_L)"
 
-#: ../pidgin/gtkprefs.c:943
+#: ../pidgin/gtkprefs.c:1021
+#, fuzzy
+msgid "Minimi_ze new conversation windows"
+msgstr "会話ウィンドウを前面に出す(_A)"
+
+#: ../pidgin/gtkprefs.c:1025
 msgid "Font"
 msgstr "フォント"
 
-#: ../pidgin/gtkprefs.c:945
+#: ../pidgin/gtkprefs.c:1027
 msgid "Use document font from _theme"
 msgstr "テーマ指定のドキュメント用フォントを利用する(_T)"
 
-#: ../pidgin/gtkprefs.c:947
+#: ../pidgin/gtkprefs.c:1029
 msgid "Use font from _theme"
 msgstr "テーマ指定のフォントを利用する(_T)"
 
-#: ../pidgin/gtkprefs.c:949
+#: ../pidgin/gtkprefs.c:1031
 msgid "Conversation _font:"
 msgstr "メッセージのフォント(_F):"
 
-#: ../pidgin/gtkprefs.c:962
+#: ../pidgin/gtkprefs.c:1045
 msgid "Default Formatting"
 msgstr "デフォルトの書式"
 
-#: ../pidgin/gtkprefs.c:978
+#: ../pidgin/gtkprefs.c:1064
+#, fuzzy
 msgid ""
 "This is how your outgoing message text will appear when you use protocols "
-"that support formatting. :)"
+"that support formatting."
 msgstr ""
 "これは書式をサポートするプロトコルを利用する際に、送信したメッセージがどのよ"
 "うに表示されるかを示すものです :)"
 
-#: ../pidgin/gtkprefs.c:1054
+#: ../pidgin/gtkprefs.c:1130
 msgid "ST_UN server:"
 msgstr "STUN サーバ(_U):"
 
-#: ../pidgin/gtkprefs.c:1066
+#: ../pidgin/gtkprefs.c:1142
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">例: stunserver.org</span>"
 
-#: ../pidgin/gtkprefs.c:1070
+#: ../pidgin/gtkprefs.c:1146
 msgid "_Autodetect IP address"
 msgstr "IP-アドレスを自動的に検出する(_A)"
 
-#: ../pidgin/gtkprefs.c:1079
+#: ../pidgin/gtkprefs.c:1155
 msgid "Public _IP:"
 msgstr "パブリック IP(_I):"
 
-#: ../pidgin/gtkprefs.c:1108
+#: ../pidgin/gtkprefs.c:1184
 msgid "Ports"
 msgstr "ポート"
 
-#: ../pidgin/gtkprefs.c:1111
+#: ../pidgin/gtkprefs.c:1187
 msgid "_Manually specify range of ports to listen on"
 msgstr "監視するポート番号の範囲を指定する(_M)"
 
-#: ../pidgin/gtkprefs.c:1114
+#: ../pidgin/gtkprefs.c:1190
 msgid "_Start port:"
 msgstr "開始のポート番号(_S):"
 
-#: ../pidgin/gtkprefs.c:1121
+#: ../pidgin/gtkprefs.c:1197
 msgid "_End port:"
 msgstr "終了のポート番号(_E):"
 
-#: ../pidgin/gtkprefs.c:1129
+#: ../pidgin/gtkprefs.c:1205
 msgid "Proxy Server"
 msgstr "プロキシ・サーバ"
 
-#: ../pidgin/gtkprefs.c:1133
+#: ../pidgin/gtkprefs.c:1209
 msgid "No proxy"
 msgstr "プロキシなし"
 
-#: ../pidgin/gtkprefs.c:1189
+#: ../pidgin/gtkprefs.c:1265
 msgid "_User:"
 msgstr "ユーザ名(_U):"
 
-#: ../pidgin/gtkprefs.c:1253
+#: ../pidgin/gtkprefs.c:1330
 msgid "Seamonkey"
 msgstr "Seamonkey"
 
-#: ../pidgin/gtkprefs.c:1254
+#: ../pidgin/gtkprefs.c:1331
 msgid "Opera"
 msgstr "Opera"
 
-#: ../pidgin/gtkprefs.c:1255
+#: ../pidgin/gtkprefs.c:1332
 msgid "Netscape"
 msgstr "Netscape"
 
-#: ../pidgin/gtkprefs.c:1256
+#: ../pidgin/gtkprefs.c:1333
 msgid "Mozilla"
 msgstr "Mozilla"
 
-#: ../pidgin/gtkprefs.c:1257
+#: ../pidgin/gtkprefs.c:1334
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: ../pidgin/gtkprefs.c:1258
+#: ../pidgin/gtkprefs.c:1335
 msgid "GNOME Default"
 msgstr "GNOME のデフォルト"
 
-#: ../pidgin/gtkprefs.c:1259
+#: ../pidgin/gtkprefs.c:1336
 msgid "Galeon"
 msgstr "Galeon"
 
-#: ../pidgin/gtkprefs.c:1260
+#: ../pidgin/gtkprefs.c:1337
 msgid "Firefox"
 msgstr "Firefox"
 
-#: ../pidgin/gtkprefs.c:1261
+#: ../pidgin/gtkprefs.c:1338
 msgid "Firebird"
 msgstr "Firebird"
 
-#: ../pidgin/gtkprefs.c:1262
+#: ../pidgin/gtkprefs.c:1339
 msgid "Epiphany"
 msgstr "Epiphany"
 
-#: ../pidgin/gtkprefs.c:1271
+#: ../pidgin/gtkprefs.c:1348
 msgid "Manual"
 msgstr "手動設定"
 
-#: ../pidgin/gtkprefs.c:1324
+#: ../pidgin/gtkprefs.c:1401
 msgid "Browser Selection"
 msgstr "ブラウザの選択"
 
-#: ../pidgin/gtkprefs.c:1328
+#: ../pidgin/gtkprefs.c:1405
 msgid "_Browser:"
 msgstr "ブラウザ(_B):"
 
-#: ../pidgin/gtkprefs.c:1336
+#: ../pidgin/gtkprefs.c:1413
 msgid "_Open link in:"
 msgstr "リンクを開く方法(_O):"
 
-#: ../pidgin/gtkprefs.c:1338
+#: ../pidgin/gtkprefs.c:1415
 msgid "Browser default"
 msgstr "ブラウザの設定に従う"
 
-#: ../pidgin/gtkprefs.c:1339
+#: ../pidgin/gtkprefs.c:1416
 msgid "Existing window"
 msgstr "既存のウィンドウで開く"
 
-#: ../pidgin/gtkprefs.c:1341
+#: ../pidgin/gtkprefs.c:1418
 msgid "New tab"
 msgstr "新しいタブで開く"
 
-#: ../pidgin/gtkprefs.c:1355
+#: ../pidgin/gtkprefs.c:1432
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -14386,80 +16254,63 @@
 "手動設定(_M):\n"
 "(URL は %s で指定)"
 
-#: ../pidgin/gtkprefs.c:1395
+#: ../pidgin/gtkprefs.c:1472
 msgid "Log _format:"
 msgstr "ログの書式(_F):"
 
-#: ../pidgin/gtkprefs.c:1400
+#: ../pidgin/gtkprefs.c:1477
 msgid "Log all _instant messages"
 msgstr "メッセージを全てログに記録する(_L)"
 
-#: ../pidgin/gtkprefs.c:1402
+#: ../pidgin/gtkprefs.c:1479
 msgid "Log all c_hats"
 msgstr "チャットを全てログに記録する(_H)"
 
-#: ../pidgin/gtkprefs.c:1404
+#: ../pidgin/gtkprefs.c:1481
 msgid "Log all _status changes to system log"
 msgstr "状態の変更を全てログに記録する(_S)"
 
-#: ../pidgin/gtkprefs.c:1512 ../pidgin/gtkprefs.c:1601
-#: ../pidgin/gtkprefs.c:1795
-msgid "(default)"
-msgstr "(デフォルト)"
-
-#: ../pidgin/gtkprefs.c:1550
+#: ../pidgin/gtkprefs.c:1627
 msgid "Sound Selection"
 msgstr "サウンドの選択"
 
-#: ../pidgin/gtkprefs.c:1560
+#: ../pidgin/gtkprefs.c:1637
 msgid "Quietest"
 msgstr "一番静か"
 
-#: ../pidgin/gtkprefs.c:1562
+#: ../pidgin/gtkprefs.c:1639
 msgid "Quieter"
 msgstr "まあまあ静か"
 
-#: ../pidgin/gtkprefs.c:1564
+#: ../pidgin/gtkprefs.c:1641
 msgid "Quiet"
 msgstr "静か"
 
-#: ../pidgin/gtkprefs.c:1568
+#: ../pidgin/gtkprefs.c:1645
 msgid "Loud"
 msgstr "大きい"
 
-#: ../pidgin/gtkprefs.c:1570
+#: ../pidgin/gtkprefs.c:1647
 msgid "Louder"
 msgstr "まあまあ大きい"
 
-#: ../pidgin/gtkprefs.c:1572
+#: ../pidgin/gtkprefs.c:1649
 msgid "Loudest"
 msgstr "一番大きい"
 
-#: ../pidgin/gtkprefs.c:1635
-msgid "Sound Method"
-msgstr "サウンド出力の方法"
-
-#: ../pidgin/gtkprefs.c:1636
+#: ../pidgin/gtkprefs.c:1715
 msgid "_Method:"
 msgstr "方法(_M):"
 
-#: ../pidgin/gtkprefs.c:1638
+#: ../pidgin/gtkprefs.c:1717
 msgid "Console beep"
 msgstr "ビープ音"
 
-#: ../pidgin/gtkprefs.c:1640
-msgid "Automatic"
-msgstr "自動選択"
-
-#: ../pidgin/gtkprefs.c:1644
-msgid "Command"
-msgstr "コマンド指定"
-
-#: ../pidgin/gtkprefs.c:1645
+#: ../pidgin/gtkprefs.c:1724
 msgid "No sounds"
 msgstr "サウンドなし"
 
-#: ../pidgin/gtkprefs.c:1653
+#: ../pidgin/gtkprefs.c:1732
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -14468,350 +16319,268 @@
 "サウンド・コマンド(_O)\n"
 "(ファイル名は %s で指定)"
 
-#: ../pidgin/gtkprefs.c:1679
-msgid "Sound Options"
-msgstr "サウンドのオプション"
-
-#: ../pidgin/gtkprefs.c:1680
+#: ../pidgin/gtkprefs.c:1759
 msgid "Sounds when conversation has _focus"
 msgstr "会話ウィンドウがフォーカスされたらサウンドを演奏する(_F)"
 
-#: ../pidgin/gtkprefs.c:1682
+#: ../pidgin/gtkprefs.c:1761
 msgid "Enable sounds:"
 msgstr "いつサウンドを有効にするか...:"
 
-#: ../pidgin/gtkprefs.c:1684
-msgid "Only when available"
-msgstr "在席している時だけ"
-
-#: ../pidgin/gtkprefs.c:1685
-msgid "Only when not available"
-msgstr "不在の時だけ"
-
-#: ../pidgin/gtkprefs.c:1693
+#: ../pidgin/gtkprefs.c:1772
 msgid "Volume:"
 msgstr "音量:"
 
-#: ../pidgin/gtkprefs.c:1721
-msgid "Sound Events"
-msgstr "イベント毎のサウンド"
-
-#: ../pidgin/gtkprefs.c:1773
+#: ../pidgin/gtkprefs.c:1852
 msgid "Play"
 msgstr "演奏"
 
-#: ../pidgin/gtkprefs.c:1780
-msgid "Event"
-msgstr "イベント"
-
-#: ../pidgin/gtkprefs.c:1799
-msgid "Test"
-msgstr "テスト"
-
-#: ../pidgin/gtkprefs.c:1803
-msgid "Reset"
-msgstr "リセット"
-
-#: ../pidgin/gtkprefs.c:1807
-msgid "Choose..."
-msgstr "選択..."
-
-#: ../pidgin/gtkprefs.c:1850
+#: ../pidgin/gtkprefs.c:1929
 msgid "_Report idle time:"
 msgstr "いつ待機時間を報告するか...(_R):"
 
-#: ../pidgin/gtkprefs.c:1855
+#: ../pidgin/gtkprefs.c:1934
 msgid "Based on keyboard or mouse use"
 msgstr "キーボードやマウスを操作し始めた時"
 
-#: ../pidgin/gtkprefs.c:1864
+#: ../pidgin/gtkprefs.c:1943
 msgid "_Auto-reply:"
 msgstr "自動応答(_A):"
 
-#: ../pidgin/gtkprefs.c:1868
+#: ../pidgin/gtkprefs.c:1947
 msgid "When both away and idle"
 msgstr "離席中で待機中の時"
 
 #. Auto-away stuff
-#: ../pidgin/gtkprefs.c:1874
+#: ../pidgin/gtkprefs.c:1953
 msgid "Auto-away"
 msgstr "自動離席"
 
-#: ../pidgin/gtkprefs.c:1876
+#: ../pidgin/gtkprefs.c:1955
 msgid "Change status when _idle"
 msgstr "待機中になったら状態を変更する(_I)"
 
-#: ../pidgin/gtkprefs.c:1880
-msgid "_Minutes before changing status:"
+#: ../pidgin/gtkprefs.c:1959
+#, fuzzy
+msgid "_Minutes before becoming idle:"
 msgstr "状態を変更するまでの時間(分)(_M):"
 
-#: ../pidgin/gtkprefs.c:1888
+#: ../pidgin/gtkprefs.c:1967
 msgid "Change _status to:"
 msgstr "次の状態に変更する(_S):"
 
 #. Signon status stuff
-#: ../pidgin/gtkprefs.c:1909
+#: ../pidgin/gtkprefs.c:1988
 msgid "Status at Startup"
 msgstr "起動時の状態"
 
-#: ../pidgin/gtkprefs.c:1911
+#: ../pidgin/gtkprefs.c:1990
 msgid "Use status from last _exit at startup"
 msgstr "最後に終了した時の状態を継承する(_E)"
 
-#: ../pidgin/gtkprefs.c:1917
+#: ../pidgin/gtkprefs.c:1996
 msgid "Status to a_pply at startup:"
 msgstr "起動時に適用する状態(_P):"
 
-#: ../pidgin/gtkprefs.c:1955
+#: ../pidgin/gtkprefs.c:2034
 msgid "Interface"
 msgstr "インタフェース"
 
-#: ../pidgin/gtkprefs.c:1957
+#: ../pidgin/gtkprefs.c:2036
 msgid "Smiley Themes"
 msgstr "顔文字のテーマ"
 
-#: ../pidgin/gtkprefs.c:1958
-msgid "Sounds"
-msgstr "サウンド"
-
-#: ../pidgin/gtkprefs.c:1964
+#: ../pidgin/gtkprefs.c:2043
 msgid "Browser"
 msgstr "ブラウザ"
 
-#: ../pidgin/gtkprefs.c:1968
+#: ../pidgin/gtkprefs.c:2047
 msgid "Status / Idle"
 msgstr "状態/待機"
 
-#: ../pidgin/gtkprivacy.c:79
+#: ../pidgin/gtkprivacy.c:80
 msgid "Allow all users to contact me"
 msgstr "全てのユーザからのコンタクトを許可する"
 
-#: ../pidgin/gtkprivacy.c:80
+#: ../pidgin/gtkprivacy.c:81
 msgid "Allow only the users on my buddy list"
 msgstr "仲間リストに登録されているユーザのみ許可する"
 
-#: ../pidgin/gtkprivacy.c:81
+#: ../pidgin/gtkprivacy.c:82
 msgid "Allow only the users below"
 msgstr "次のユーザのみ許可する"
 
-#: ../pidgin/gtkprivacy.c:82
+#: ../pidgin/gtkprivacy.c:83
 msgid "Block all users"
 msgstr "全てのユーザを拒否する"
 
-#: ../pidgin/gtkprivacy.c:83
+#: ../pidgin/gtkprivacy.c:84
 msgid "Block only the users below"
 msgstr "次のユーザのみ拒否する"
 
-#: ../pidgin/gtkprivacy.c:372
+#: ../pidgin/gtkprivacy.c:370
 msgid "Privacy"
 msgstr "個人情報"
 
-#: ../pidgin/gtkprivacy.c:385
+#: ../pidgin/gtkprivacy.c:382
 msgid "Changes to privacy settings take effect immediately."
 msgstr "個人情報の設定はすぐに反映されます。"
 
 #. "Set privacy for:" label
-#: ../pidgin/gtkprivacy.c:397
+#: ../pidgin/gtkprivacy.c:394
 msgid "Set privacy for:"
 msgstr "設定する個人情報:"
 
-#: ../pidgin/gtkprivacy.c:560 ../pidgin/gtkprivacy.c:577
+#: ../pidgin/gtkprivacy.c:557 ../pidgin/gtkprivacy.c:574
 msgid "Permit User"
 msgstr "許可するユーザ"
 
-#: ../pidgin/gtkprivacy.c:561
+#: ../pidgin/gtkprivacy.c:558
 msgid "Type a user you permit to contact you."
 msgstr "コンタクトを許可するユーザを入力して下さい。"
 
-#: ../pidgin/gtkprivacy.c:562
+#: ../pidgin/gtkprivacy.c:559
 msgid "Please enter the name of the user you wish to be able to contact you."
 msgstr "コンタクトを許可したいユーザの名前を入力して下さい。"
 
-#: ../pidgin/gtkprivacy.c:565 ../pidgin/gtkprivacy.c:581
+#: ../pidgin/gtkprivacy.c:562 ../pidgin/gtkprivacy.c:578
 msgid "_Permit"
 msgstr "許可する(_P)"
 
-#: ../pidgin/gtkprivacy.c:571
+#: ../pidgin/gtkprivacy.c:568
 #, c-format
 msgid "Allow %s to contact you?"
 msgstr "%s さんからのコンタクトを許可しますか?"
 
-#: ../pidgin/gtkprivacy.c:573
+#: ../pidgin/gtkprivacy.c:570
 #, c-format
 msgid "Are you sure you wish to allow %s to contact you?"
 msgstr "本当に %s さんにコンタクトを許可しますか?"
 
-#: ../pidgin/gtkprivacy.c:602 ../pidgin/gtkprivacy.c:616
+#: ../pidgin/gtkprivacy.c:599 ../pidgin/gtkprivacy.c:613
 msgid "Block User"
 msgstr "ユーザの拒否"
 
-#: ../pidgin/gtkprivacy.c:603
+#: ../pidgin/gtkprivacy.c:600
 msgid "Type a user to block."
 msgstr "拒否するユーザを入力して下さい。"
 
-#: ../pidgin/gtkprivacy.c:604
+#: ../pidgin/gtkprivacy.c:601
 msgid "Please enter the name of the user you wish to block."
 msgstr "拒否したいユーザの名前を入力して下さい。"
 
-#: ../pidgin/gtkprivacy.c:612
+#: ../pidgin/gtkprivacy.c:609
 #, c-format
 msgid "Block %s?"
 msgstr "%s さんを拒否しますか?"
 
-#: ../pidgin/gtkprivacy.c:614
+#: ../pidgin/gtkprivacy.c:611
 #, c-format
 msgid "Are you sure you want to block %s?"
 msgstr "本当に %s さんを拒否しますか?"
 
-#: ../pidgin/gtkrequest.c:271
+#: ../pidgin/gtkrequest.c:272
 msgid "Apply"
 msgstr "適用"
 
-#: ../pidgin/gtkrequest.c:1482
+#: ../pidgin/gtkrequest.c:1507
 msgid "That file already exists"
 msgstr "既にそのファイルは存在します"
 
-#: ../pidgin/gtkrequest.c:1483
+#: ../pidgin/gtkrequest.c:1508
 msgid "Would you like to overwrite it?"
 msgstr "上書きしてもよろしいですか?"
 
-#: ../pidgin/gtkrequest.c:1486
+#: ../pidgin/gtkrequest.c:1511
 msgid "Overwrite"
 msgstr "上書きする"
 
-#: ../pidgin/gtkrequest.c:1487
+#: ../pidgin/gtkrequest.c:1512
 msgid "Choose New Name"
 msgstr "別の名前を付ける"
 
-#: ../pidgin/gtkrequest.c:1625 ../pidgin/gtkrequest.c:1639
+#: ../pidgin/gtkrequest.c:1650 ../pidgin/gtkrequest.c:1664
 msgid "Select Folder..."
 msgstr "フォルダの選択..."
 
-#: ../pidgin/gtkroomlist.c:376
+#. Create the window.
+#: ../pidgin/gtkroomlist.c:375
 msgid "Room List"
 msgstr "ルームの一覧"
 
 #. list button
-#: ../pidgin/gtkroomlist.c:446
+#: ../pidgin/gtkroomlist.c:443
 msgid "_Get List"
 msgstr "一覧の取得(_G)"
 
 #. add button
-#: ../pidgin/gtkroomlist.c:454
+#: ../pidgin/gtkroomlist.c:451
 msgid "_Add Chat"
 msgstr "チャットの追加(_A)"
 
-#: ../pidgin/gtksavedstatuses.c:331
+#: ../pidgin/gtksavedstatuses.c:337
 msgid "Are you sure you want to delete the selected saved statuses?"
 msgstr "本当に選択した保存済みの状態を削除してもよろしいですか?"
 
 #. Use button
-#: ../pidgin/gtksavedstatuses.c:580 ../pidgin/gtksavedstatuses.c:1213
+#: ../pidgin/gtksavedstatuses.c:620 ../pidgin/gtksavedstatuses.c:1266
 msgid "_Use"
 msgstr "使う(_U)"
 
-#: ../pidgin/gtksavedstatuses.c:726
+#: ../pidgin/gtksavedstatuses.c:780
 msgid "Title already in use.  You must choose a unique title."
 msgstr "その題名は既に使用中です。重複しない題名を選択して下さい。"
 
-#: ../pidgin/gtksavedstatuses.c:914
+#: ../pidgin/gtksavedstatuses.c:970
 msgid "Different"
 msgstr "別の状態"
 
-#: ../pidgin/gtksavedstatuses.c:1106
+#: ../pidgin/gtksavedstatuses.c:1159
 msgid "_Title:"
 msgstr "題名(_T):"
 
-#: ../pidgin/gtksavedstatuses.c:1125 ../pidgin/gtksavedstatuses.c:1446
+#: ../pidgin/gtksavedstatuses.c:1178 ../pidgin/gtksavedstatuses.c:1497
 msgid "_Status:"
 msgstr "状態(_S):"
 
 #. Different status message expander
-#: ../pidgin/gtksavedstatuses.c:1157
+#: ../pidgin/gtksavedstatuses.c:1210
 msgid "Use a _different status for some accounts"
 msgstr "同じアカウントで別の状態を利用する(_D)"
 
 #. Save & Use button
-#: ../pidgin/gtksavedstatuses.c:1221
+#: ../pidgin/gtksavedstatuses.c:1274
 msgid "Sa_ve & Use"
 msgstr "保存して使う(_V)"
 
-#: ../pidgin/gtksavedstatuses.c:1427
+#: ../pidgin/gtksavedstatuses.c:1480
 #, c-format
 msgid "Status for %s"
 msgstr "%s の状態"
 
-#: ../pidgin/gtksound.c:63
-msgid "Buddy logs in"
-msgstr "仲間がログインしました"
-
-#: ../pidgin/gtksound.c:64
-msgid "Buddy logs out"
-msgstr "仲間がログアウトしました"
-
-#: ../pidgin/gtksound.c:65
-msgid "Message received"
-msgstr "メッセージを受信しました"
-
-#: ../pidgin/gtksound.c:66
-msgid "Message received begins conversation"
-msgstr "受信したメッセージと会話と開始しました"
-
-#: ../pidgin/gtksound.c:67
-msgid "Message sent"
-msgstr "メッセージを送信しました"
-
-#: ../pidgin/gtksound.c:68
-msgid "Person enters chat"
-msgstr "チャットに参加してきました"
-
-#: ../pidgin/gtksound.c:69
-msgid "Person leaves chat"
-msgstr "チャットから離れました"
-
-#: ../pidgin/gtksound.c:70
-msgid "You talk in chat"
-msgstr "チャットで話しました"
-
-#: ../pidgin/gtksound.c:71
-msgid "Others talk in chat"
-msgstr "他の人がチャットで話しました"
-
-#: ../pidgin/gtksound.c:74
-msgid "Someone says your screen name in chat"
-msgstr "チャットで誰かがあなたを呼びました"
-
-#: ../pidgin/gtksound.c:310
-msgid "GStreamer Failure"
-msgstr "GStreamer のエラー"
-
-#: ../pidgin/gtksound.c:311
-msgid "GStreamer failed to initialize."
-msgstr "GStreamer の初期化に失敗しました"
-
-#: ../pidgin/gtkstatusbox.c:661
+#: ../pidgin/gtkstatusbox.c:664
 msgid "Waiting for network connection"
 msgstr "ネットワークの接続待ちです"
 
-#: ../pidgin/gtkutils.c:593
+#: ../pidgin/gtkutils.c:632
 msgid "Google Talk"
 msgstr "Google トーク"
 
-#: ../pidgin/gtkutils.c:1309 ../pidgin/gtkutils.c:1332
+#: ../pidgin/gtkutils.c:1399 ../pidgin/gtkutils.c:1422
 #, c-format
 msgid "The following error has occurred loading %s: %s"
 msgstr "%s を読み込む際に次のエラーが発生しました: %s"
 
-#: ../pidgin/gtkutils.c:1312 ../pidgin/gtkutils.c:1334
+#: ../pidgin/gtkutils.c:1402 ../pidgin/gtkutils.c:1424
 msgid "Failed to load image"
 msgstr "画像の読み込みに失敗しました"
 
-#: ../pidgin/gtkutils.c:1408
+#: ../pidgin/gtkutils.c:1498
 #, c-format
 msgid "Cannot send folder %s."
 msgstr "フォルダ %s は転送できません"
 
-#: ../pidgin/gtkutils.c:1409
+#: ../pidgin/gtkutils.c:1499
 #, c-format
 msgid ""
 "%s cannot transfer a folder. You will need to send the files within "
@@ -14819,12 +16588,12 @@
 msgstr ""
 "%s ではフォルダそのものを転送できません。ファイルを個別に転送して下さい。"
 
-#: ../pidgin/gtkutils.c:1441 ../pidgin/gtkutils.c:1453
-#: ../pidgin/gtkutils.c:1460
+#: ../pidgin/gtkutils.c:1531 ../pidgin/gtkutils.c:1543
+#: ../pidgin/gtkutils.c:1550
 msgid "You have dragged an image"
 msgstr "ドラッグしたのは画像です"
 
-#: ../pidgin/gtkutils.c:1442
+#: ../pidgin/gtkutils.c:1532
 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."
@@ -14832,23 +16601,23 @@
 "この画像をファイルとして転送したり、メッセージの中に埋め込んだり、あるいはこ"
 "のユーザの仲間アイコンに利用できます。"
 
-#: ../pidgin/gtkutils.c:1448 ../pidgin/gtkutils.c:1468
+#: ../pidgin/gtkutils.c:1538 ../pidgin/gtkutils.c:1558
 msgid "Set as buddy icon"
 msgstr "仲間アイコンにする"
 
-#: ../pidgin/gtkutils.c:1449 ../pidgin/gtkutils.c:1469
+#: ../pidgin/gtkutils.c:1539 ../pidgin/gtkutils.c:1559
 msgid "Send image file"
 msgstr "ファイルとして転送する"
 
-#: ../pidgin/gtkutils.c:1450 ../pidgin/gtkutils.c:1469
+#: ../pidgin/gtkutils.c:1540 ../pidgin/gtkutils.c:1559
 msgid "Insert in message"
 msgstr "メッセージの中に埋め込む"
 
-#: ../pidgin/gtkutils.c:1454
+#: ../pidgin/gtkutils.c:1544
 msgid "Would you like to set it as the buddy icon for this user?"
 msgstr "このユーザの仲間アイコンとして画像をセットしてもよろしいですか?"
 
-#: ../pidgin/gtkutils.c:1461
+#: ../pidgin/gtkutils.c:1551
 msgid ""
 "You can send this image as a file transfer, or use it as the buddy icon for "
 "this user."
@@ -14856,7 +16625,7 @@
 "この画像をファイルとして転送したり、あるいはこのユーザの仲間アイコンに利用で"
 "きます。"
 
-#: ../pidgin/gtkutils.c:1462
+#: ../pidgin/gtkutils.c:1552
 msgid ""
 "You can insert this image into this message, or use it as the buddy icon for "
 "this user"
@@ -14869,11 +16638,11 @@
 #. * 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:1520
+#: ../pidgin/gtkutils.c:1610
 msgid "Cannot send launcher"
 msgstr "ランチャは転送できません"
 
-#: ../pidgin/gtkutils.c:1520
+#: ../pidgin/gtkutils.c:1610
 msgid ""
 "You dragged a desktop launcher. Most likely you wanted to send whatever this "
 "launcher points to instead of this launcher itself."
@@ -14881,7 +16650,7 @@
 "ドラッグしたのはデスクトップのランチャです。おそらくランチャ自身ではなく、ラ"
 "ンチャが指しているオブジェクトを転送したいのでしょう。"
 
-#: ../pidgin/gtkutils.c:2268
+#: ../pidgin/gtkutils.c:2345
 #, c-format
 msgid ""
 "<b>File:</b> %s\n"
@@ -14892,27 +16661,27 @@
 "<b>サイズ:</b> %s\n"
 "<b>画像のサイズ:</b> %dx%d"
 
-#: ../pidgin/gtkutils.c:2564
+#: ../pidgin/gtkutils.c:2641
 #, c-format
 msgid "The file '%s' is too large for %s.  Please try a smaller image.\n"
 msgstr ""
 "ファイル '%s' は %s では大きすぎます。もっと小さい画像でトライしてみて下さ"
 "い。\n"
 
-#: ../pidgin/gtkutils.c:2566
+#: ../pidgin/gtkutils.c:2643
 msgid "Icon Error"
 msgstr "アイコンのエラー"
 
-#: ../pidgin/gtkutils.c:2567
+#: ../pidgin/gtkutils.c:2644
 msgid "Could not set icon"
 msgstr "アイコンを送信できませんでした"
 
-#: ../pidgin/gtkutils.c:2667
+#: ../pidgin/gtkutils.c:2744
 #, c-format
 msgid "Failed to open file '%s': %s"
 msgstr "ファイル '%s' を開けませんでした: %s"
 
-#: ../pidgin/gtkutils.c:2716
+#: ../pidgin/gtkutils.c:2793
 #, c-format
 msgid ""
 "Failed to load image '%s': reason not known, probably a corrupt image file"
@@ -14920,49 +16689,39 @@
 "画像 '%s' の読み込みに失敗しました: 原因は不明ですが、おそらく画像ファイルが"
 "壊れているようです"
 
-#: ../pidgin/gtkwhiteboard.c:760 ../pidgin/gtkwhiteboard.c:779
+#: ../pidgin/gtkwhiteboard.c:754 ../pidgin/gtkwhiteboard.c:773
 msgid "Save File"
 msgstr "ファイルの保存"
 
-#: ../pidgin/gtkwhiteboard.c:867
+#: ../pidgin/gtkwhiteboard.c:861
 msgid "Select color"
 msgstr "色の選択"
 
-#. Translators may want to transliterate the name.
-#. It is not to be translated.
-#: ../pidgin/pidgin.h:50
-msgid "Pidgin"
-msgstr "Pidgin"
-
-#: ../pidgin/pidginstock.c:81
+#: ../pidgin/pidginstock.c:87
 msgid "_Alias"
 msgstr "別名(_A)"
 
-#: ../pidgin/pidginstock.c:83
+#: ../pidgin/pidginstock.c:89
 msgid "Close _tabs"
 msgstr "タブを閉じる(_T)"
 
-#: ../pidgin/pidginstock.c:85
+#: ../pidgin/pidginstock.c:91
 msgid "_Get Info"
 msgstr "情報の取得(_G)"
 
-#: ../pidgin/pidginstock.c:86
+#: ../pidgin/pidginstock.c:92
 msgid "_Invite"
 msgstr "招待(_I)"
 
-#: ../pidgin/pidginstock.c:87
+#: ../pidgin/pidginstock.c:93
 msgid "_Modify"
 msgstr "変更(_M)"
 
-#: ../pidgin/pidginstock.c:88
+#: ../pidgin/pidginstock.c:94
 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
+#: ../pidgin/pixmaps/emotes/default/24/default.theme.in.h:2
 msgid "Pidgin smileys"
 msgstr "Pidgin スマイリー"
 
@@ -14978,35 +16737,35 @@
 msgid "none"
 msgstr "なし"
 
-#: ../pidgin/plugins/cap/cap.c:449
+#: ../pidgin/plugins/cap/cap.c:450
 msgid "Display Statistics"
 msgstr "統計情報"
 
-#: ../pidgin/plugins/cap/cap.c:461 ../pidgin/plugins/cap/cap.c:464
+#: ../pidgin/plugins/cap/cap.c:462 ../pidgin/plugins/cap/cap.c:465
 msgid "Response Probability:"
 msgstr "応答の見込み"
 
-#: ../pidgin/plugins/cap/cap.c:810
+#: ../pidgin/plugins/cap/cap.c:811
 msgid "Statistics Configuration"
 msgstr "統計情報の設定"
 
 #. msg_difference spinner
-#: ../pidgin/plugins/cap/cap.c:813
+#: ../pidgin/plugins/cap/cap.c:814
 msgid "Maximum response timeout:"
 msgstr "最大応答のタイムアウト:"
 
-#: ../pidgin/plugins/cap/cap.c:816 ../pidgin/plugins/cap/cap.c:823
-#: ../pidgin/plugins/cap/cap.c:830 ../pidgin/plugins/timestamp.c:150
+#: ../pidgin/plugins/cap/cap.c:817 ../pidgin/plugins/cap/cap.c:824
+#: ../pidgin/plugins/cap/cap.c:831 ../pidgin/plugins/timestamp.c:150
 msgid "minutes"
 msgstr "分間"
 
 #. last_seen spinner
-#: ../pidgin/plugins/cap/cap.c:820
+#: ../pidgin/plugins/cap/cap.c:821
 msgid "Maximum last-seen difference:"
 msgstr "最大 last-seen difference:"
 
 #. threshold spinner
-#: ../pidgin/plugins/cap/cap.c:827
+#: ../pidgin/plugins/cap/cap.c:828
 msgid "Threshold:"
 msgstr "しきい値:"
 
@@ -15016,18 +16775,18 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/cap/cap.c:934
+#: ../pidgin/plugins/cap/cap.c:936
 msgid "Contact Availability Prediction"
 msgstr "コンタクトの可能性の予測"
 
 #. *< name
 #. *< version
-#: ../pidgin/plugins/cap/cap.c:936
+#: ../pidgin/plugins/cap/cap.c:938
 msgid "Contact Availability Prediction plugin."
 msgstr "仲間と会話する可能性を予測するプラグインです"
 
 #. *  summary
-#: ../pidgin/plugins/cap/cap.c:937
+#: ../pidgin/plugins/cap/cap.c:939
 msgid ""
 "The contact availability plugin (cap) is used to display statistical "
 "information about buddies in a users contact list."
@@ -15129,7 +16888,7 @@
 msgid "Received Messages"
 msgstr "受信したメッセージ"
 
-#: ../pidgin/plugins/convcolors.c:210 ../pidgin/plugins/pidginrc.c:320
+#: ../pidgin/plugins/convcolors.c:210 ../pidgin/plugins/pidginrc.c:245
 #, c-format
 msgid "Select Color for %s"
 msgstr "%s に使用する色の選択"
@@ -15252,29 +17011,29 @@
 msgstr "インスタント・メッセンジャー"
 
 #. Add the label.
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:460
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:457
 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
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:551
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:301
 msgid "Group:"
 msgstr "グループ:"
 
 #. "New Person" button
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:580
-#: ../pidgin/plugins/gevolution/assoc-buddy.c:469
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:251
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:576
+#: ../pidgin/plugins/gevolution/assoc-buddy.c:467
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:248
 msgid "New Person"
 msgstr "新しい仲間"
 
 #. "Select Buddy" button
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:597
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:593
 msgid "Select Buddy"
 msgstr "仲間の選択"
 
 #. Add the label.
-#: ../pidgin/plugins/gevolution/assoc-buddy.c:345
+#: ../pidgin/plugins/gevolution/assoc-buddy.c:343
 msgid ""
 "Select a person from your address book to add this buddy to, or create a new "
 "person."
@@ -15282,43 +17041,43 @@
 "アドレス帳から追加する仲間を選択するか、または新しい仲間を作成して下さい:"
 
 #. Add the expander
-#: ../pidgin/plugins/gevolution/assoc-buddy.c:433
+#: ../pidgin/plugins/gevolution/assoc-buddy.c:431
 msgid "User _details"
 msgstr "ユーザの詳細(_D)"
 
 #. "Associate Buddy" button
-#: ../pidgin/plugins/gevolution/assoc-buddy.c:486
+#: ../pidgin/plugins/gevolution/assoc-buddy.c:484
 msgid "_Associate Buddy"
 msgstr "仲間との連携(_A)"
 
-#: ../pidgin/plugins/gevolution/gevolution.c:238
-#: ../pidgin/plugins/gevolution/gevolution.c:244
+#: ../pidgin/plugins/gevolution/gevolution.c:240
+#: ../pidgin/plugins/gevolution/gevolution.c:246
 msgid "Unable to send e-mail"
 msgstr "E-メールを送信できません"
 
-#: ../pidgin/plugins/gevolution/gevolution.c:239
+#: ../pidgin/plugins/gevolution/gevolution.c:241
 msgid "The evolution executable was not found in the PATH."
 msgstr "環境変数 PATH の中から Evolution の実行形式が見つかりませんでした。"
 
-#: ../pidgin/plugins/gevolution/gevolution.c:245
+#: ../pidgin/plugins/gevolution/gevolution.c:247
 msgid "An e-mail address was not found for this buddy."
 msgstr "この仲間の E-メール・アドレスがありません"
 
-#: ../pidgin/plugins/gevolution/gevolution.c:271
+#: ../pidgin/plugins/gevolution/gevolution.c:273
 msgid "Add to Address Book"
 msgstr "アドレス帳へ追加する"
 
-#: ../pidgin/plugins/gevolution/gevolution.c:283
+#: ../pidgin/plugins/gevolution/gevolution.c:285
 msgid "Send E-Mail"
 msgstr "E-メールを送信する"
 
 #. Configuration frame
-#: ../pidgin/plugins/gevolution/gevolution.c:410
+#: ../pidgin/plugins/gevolution/gevolution.c:412
 msgid "Evolution Integration Configuration"
 msgstr "Evolution との連携の設定"
 
 #. Label
-#: ../pidgin/plugins/gevolution/gevolution.c:413
+#: ../pidgin/plugins/gevolution/gevolution.c:415
 msgid "Select all accounts that buddies should be auto-added to."
 msgstr "自動的に仲間として追加するアカウントを全て選択して下さい:"
 
@@ -15328,7 +17087,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/gevolution/gevolution.c:525
+#: ../pidgin/plugins/gevolution/gevolution.c:527
 msgid "Evolution Integration"
 msgstr "Evolution との連携"
 
@@ -15336,37 +17095,37 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/gevolution/gevolution.c:528
 #: ../pidgin/plugins/gevolution/gevolution.c:530
+#: ../pidgin/plugins/gevolution/gevolution.c:532
 msgid "Provides integration with Evolution."
 msgstr "Evolution との連携機能を提供します"
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:267
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:262
 msgid "Please enter the person's information below."
 msgstr "ユーザ情報を入力して下さい。"
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:271
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:266
 msgid "Please enter the buddy's screen name and account type below."
 msgstr "仲間のスクリーン名とアカウントの種類を入力して下さい。"
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:291
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:286
 msgid "Account type:"
 msgstr "アカウントの種類:"
 
 #. Optional Information section
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:315
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:309
 msgid "Optional information:"
 msgstr "追加の情報:"
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:350
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:344
 msgid "First name:"
 msgstr "名:"
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:362
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:356
 msgid "Last name:"
 msgstr "姓:"
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:382
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:376
 msgid "E-mail:"
 msgstr "E-メール"
 
@@ -15389,7 +17148,14 @@
 msgid "Test to see that all ui signals are working properly."
 msgstr "全ての UI シグナルが正常に動作しているかテストします"
 
-#: ../pidgin/plugins/history.c:188
+#: ../pidgin/plugins/gtkbuddynote.c:36
+#, fuzzy, c-format
+msgid ""
+"\n"
+"<b>Buddy Note</b>: %s"
+msgstr "仲間のメモ"
+
+#: ../pidgin/plugins/history.c:192
 msgid "History"
 msgstr "履歴"
 
@@ -15436,11 +17202,11 @@
 msgid "Draw Markerline in "
 msgstr "下線を付与する場所"
 
-#: ../pidgin/plugins/markerline.c:250 ../pidgin/plugins/notify.c:676
+#: ../pidgin/plugins/markerline.c:250 ../pidgin/plugins/notify.c:682
 msgid "_IM windows"
 msgstr "IM ウィンドウ(_I)"
 
-#: ../pidgin/plugins/markerline.c:254 ../pidgin/plugins/notify.c:683
+#: ../pidgin/plugins/markerline.c:254 ../pidgin/plugins/notify.c:689
 msgid "C_hat windows"
 msgstr "チャット・ウィンドウ(_H)"
 
@@ -15456,32 +17222,32 @@
 msgid "Music messaging session confirmed."
 msgstr "楽曲メッセージのセッションに入りました。"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:419
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:430
 msgid "Music Messaging"
 msgstr "楽曲メッセージ"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:420
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:431
 msgid "There was a conflict in running the command:"
 msgstr "実行中のコマンドで衝突が起りました:"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:528
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:539
 msgid "Error Running Editor"
 msgstr "エディタの起動エラー"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:529
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:540
 msgid "The following error has occurred:"
 msgstr "次のエラーが発生しました:"
 
 #. Configuration frame
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:628
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:639
 msgid "Music Messaging Configuration"
 msgstr "楽曲メッセージの設定"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:632
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:643
 msgid "Score Editor Path"
 msgstr "スコア・エディタのパス名:"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:633
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:644
 msgid "_Apply"
 msgstr "適用(_A)"
 
@@ -15493,12 +17259,12 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:674
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:685
 msgid "Music Messaging Plugin for collaborative composition."
 msgstr "コラボレートするための楽曲メッセージ・プラグインです"
 
 #. *  summary
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:676
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:687
 msgid ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
 "on a piece of music by editting a common score in real-time."
@@ -15507,74 +17273,74 @@
 "分を同時に演奏することを可能にする楽曲メッセージのプラグインです。"
 
 #. ---------- "Notify For" ----------
-#: ../pidgin/plugins/notify.c:672
+#: ../pidgin/plugins/notify.c:678
 msgid "Notify For"
 msgstr "通知先"
 
-#: ../pidgin/plugins/notify.c:691
+#: ../pidgin/plugins/notify.c:697
 msgid "\t_Only when someone says your screen name"
 msgstr "\t誰かがあなたのスクリーン名を呼んだ時だけ(_O)"
 
-#: ../pidgin/plugins/notify.c:701
+#: ../pidgin/plugins/notify.c:707
 msgid "_Focused windows"
 msgstr "フォーカスしたウィンドウ(_F)"
 
 #. ---------- "Notification Methods" ----------
-#: ../pidgin/plugins/notify.c:709
+#: ../pidgin/plugins/notify.c:715
 msgid "Notification Methods"
 msgstr "通知方法"
 
-#: ../pidgin/plugins/notify.c:716
+#: ../pidgin/plugins/notify.c:722
 msgid "Prepend _string into window title:"
 msgstr "文字列をウィンドウ・タイトルの先頭に追加する(_S):"
 
 #. Count method button
-#: ../pidgin/plugins/notify.c:735
+#: ../pidgin/plugins/notify.c:741
 msgid "Insert c_ount of new messages into window title"
 msgstr "新しいメッセージ数をウィンドウのタイトルに挿入する(_O)"
 
 #. Count xprop method button
-#: ../pidgin/plugins/notify.c:744
+#: ../pidgin/plugins/notify.c:750
 msgid "Insert count of new message into _X property"
 msgstr "新しいメッセージ数をXのプロパティに挿入する(_X)"
 
 #. Urgent method button
-#: ../pidgin/plugins/notify.c:752
+#: ../pidgin/plugins/notify.c:758
 msgid "Set window manager \"_URGENT\" hint"
 msgstr "ウィンドウ・マネージャに \"URGENT (緊急)\" ヒントをセットする(_U)"
 
 #. Raise window method button
-#: ../pidgin/plugins/notify.c:761
+#: ../pidgin/plugins/notify.c:767
 msgid "R_aise conversation window"
 msgstr "会話ウィンドウを前面に出す(_A)"
 
 #. ---------- "Notification Removals" ----------
-#: ../pidgin/plugins/notify.c:769
+#: ../pidgin/plugins/notify.c:775
 msgid "Notification Removal"
 msgstr "通知を削除する時期"
 
 #. Remove on focus button
-#: ../pidgin/plugins/notify.c:774
+#: ../pidgin/plugins/notify.c:780
 msgid "Remove when conversation window _gains focus"
 msgstr "会話ウィンドウがフォーカスされたら(_G)"
 
 #. Remove on click button
-#: ../pidgin/plugins/notify.c:781
+#: ../pidgin/plugins/notify.c:787
 msgid "Remove when conversation window _receives click"
 msgstr "会話ウィンドウをクリックしたら(_R)"
 
 #. Remove on type button
-#: ../pidgin/plugins/notify.c:789
+#: ../pidgin/plugins/notify.c:795
 msgid "Remove when _typing in conversation window"
 msgstr "会話ウィンドウで何か入力したら(_T)"
 
 #. Remove on message send button
-#: ../pidgin/plugins/notify.c:797
+#: ../pidgin/plugins/notify.c:803
 msgid "Remove when a _message gets sent"
 msgstr "メッセージを送信したら(_M)"
 
 #. Remove on conversation switch button
-#: ../pidgin/plugins/notify.c:806
+#: ../pidgin/plugins/notify.c:812
 msgid "Remove on switch to conversation ta_b"
 msgstr "会話ウィンドのタブが切り替わったら(_B)"
 
@@ -15584,7 +17350,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/notify.c:901
+#: ../pidgin/plugins/notify.c:907
 msgid "Message Notification"
 msgstr "メッセージの通知"
 
@@ -15592,7 +17358,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/notify.c:904 ../pidgin/plugins/notify.c:906
+#: ../pidgin/plugins/notify.c:910 ../pidgin/plugins/notify.c:912
 msgid "Provides a variety of ways of notifying you of unread messages."
 msgstr "未読メッセージを通知するいろいろな方法を提供します"
 
@@ -15642,44 +17408,36 @@
 msgid "GtkTreeView Horizontal Separation"
 msgstr "GtkTreeView の水平方向のセパレータ"
 
-#: ../pidgin/plugins/pidginrc.c:73
+#: ../pidgin/plugins/pidginrc.c:69
 msgid "Conversation Entry"
 msgstr "メッセージの文字"
 
-#: ../pidgin/plugins/pidginrc.c:74
-msgid "Conversation History"
-msgstr "会話履歴の文字"
-
-#: ../pidgin/plugins/pidginrc.c:75
-msgid "Log Viewer"
-msgstr "ログ・ビューアの文字"
-
-#: ../pidgin/plugins/pidginrc.c:76
+#: ../pidgin/plugins/pidginrc.c:70
 msgid "Request Dialog"
 msgstr "質問ダイアログの文字"
 
-#: ../pidgin/plugins/pidginrc.c:77
+#: ../pidgin/plugins/pidginrc.c:71
 msgid "Notify Dialog"
 msgstr "通知ダイアログの文字"
 
-#: ../pidgin/plugins/pidginrc.c:322
+#: ../pidgin/plugins/pidginrc.c:247
 msgid "Select Color"
 msgstr "色の選択"
 
-#: ../pidgin/plugins/pidginrc.c:361
+#: ../pidgin/plugins/pidginrc.c:294
+msgid "Select Interface Font"
+msgstr "フォントの選択"
+
+#: ../pidgin/plugins/pidginrc.c:297
 #, c-format
 msgid "Select Font for %s"
 msgstr "%s に使用するフォントの選択"
 
-#: ../pidgin/plugins/pidginrc.c:398
-msgid "Select Interface Font"
-msgstr "フォントの選択"
-
-#: ../pidgin/plugins/pidginrc.c:453
+#: ../pidgin/plugins/pidginrc.c:365
 msgid "GTK+ Interface Font"
 msgstr "GTK+ インタフェースで使用するフォント"
 
-#: ../pidgin/plugins/pidginrc.c:473
+#: ../pidgin/plugins/pidginrc.c:385
 msgid "GTK+ Text Shortcut Theme"
 msgstr "GTK+ テキストのショートカットのテーマ"
 
@@ -15703,36 +17461,36 @@
 #. widget_bool_widgets[i]);
 #. }
 #.
-#: ../pidgin/plugins/pidginrc.c:510
+#: ../pidgin/plugins/pidginrc.c:422
 msgid "Interface colors"
 msgstr "インタフェースの色"
 
-#: ../pidgin/plugins/pidginrc.c:534
+#: ../pidgin/plugins/pidginrc.c:446
 msgid "Widget Sizes"
 msgstr "ウィジットの大きさ"
 
-#: ../pidgin/plugins/pidginrc.c:555
+#: ../pidgin/plugins/pidginrc.c:467
 msgid "Fonts"
 msgstr "フォント"
 
-#: ../pidgin/plugins/pidginrc.c:578
-msgid "Tools"
-msgstr "ツール"
-
-#: ../pidgin/plugins/pidginrc.c:583
+#: ../pidgin/plugins/pidginrc.c:491
+msgid "Gtkrc File Tools"
+msgstr ""
+
+#: ../pidgin/plugins/pidginrc.c:496
 #, c-format
 msgid "Write settings to %s%sgtkrc-2.0"
 msgstr "これらの設定を \"%s%sgtkrc-2.0\" に書き込む"
 
-#: ../pidgin/plugins/pidginrc.c:591
+#: ../pidgin/plugins/pidginrc.c:505
 msgid "Re-read gtkrc files"
 msgstr "この \"gtkrc\" ファイルを読み込む"
 
-#: ../pidgin/plugins/pidginrc.c:624
+#: ../pidgin/plugins/pidginrc.c:538
 msgid "Pidgin GTK+ Theme Control"
 msgstr "GTK+ テーマのカスタマイズ"
 
-#: ../pidgin/plugins/pidginrc.c:626 ../pidgin/plugins/pidginrc.c:627
+#: ../pidgin/plugins/pidginrc.c:540 ../pidgin/plugins/pidginrc.c:541
 msgid "Provides access to commonly used gtkrc settings."
 msgstr "\"gtkrc\" の設定にアクセスする機能を提供します"
 
@@ -15754,20 +17512,20 @@
 "ンドウで送信内容を監視して下さい。"
 
 #: ../pidgin/plugins/relnot.c:71
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "You are using %s version %s.  The current version is %s.  You can get it "
-"from <a href=\""
+"from <a href=\"%s\">%s</a><hr>"
 msgstr ""
 "お使いのバージョンは %s %s です。最新バージョンは %s です; 最新版は次からダウ"
 "ンロードできます: <a href=\""
 
-#: ../pidgin/plugins/relnot.c:78
+#: ../pidgin/plugins/relnot.c:79
 #, c-format
 msgid "<b>ChangeLog:</b><br>%s"
 msgstr "<b>変更履歴:</b><br>%s"
 
-#: ../pidgin/plugins/relnot.c:83 ../pidgin/plugins/relnot.c:84
+#: ../pidgin/plugins/relnot.c:84 ../pidgin/plugins/relnot.c:85
 msgid "New Version Available"
 msgstr "最新バージョンのお知らせ"
 
@@ -15777,87 +17535,87 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/relnot.c:142
+#: ../pidgin/plugins/relnot.c:143
 msgid "Release Notification"
 msgstr "リリース通知"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/relnot.c:145
+#: ../pidgin/plugins/relnot.c:146
 msgid "Checks periodically for new releases."
 msgstr "最新リリースの情報を周期的にチェックします"
 
 #. *  description
-#: ../pidgin/plugins/relnot.c:147
+#: ../pidgin/plugins/relnot.c:148
 msgid ""
 "Checks periodically for new releases and notifies the user with the "
 "ChangeLog."
 msgstr ""
 "最新リリースを周期的にチェックして変更履歴 (ChangeLog) をユーザに通知します。"
 
-#: ../pidgin/plugins/spellchk.c:1965
+#: ../pidgin/plugins/spellchk.c:1962
 msgid "Duplicate Correction"
 msgstr "文字列が重複しています"
 
-#: ../pidgin/plugins/spellchk.c:1966
+#: ../pidgin/plugins/spellchk.c:1963
 msgid "The specified word already exists in the correction list."
 msgstr "指定した文字列は既に一覧にあります"
 
-#: ../pidgin/plugins/spellchk.c:2180
+#: ../pidgin/plugins/spellchk.c:2177
 msgid "Text Replacements"
 msgstr "文字列の置換"
 
-#: ../pidgin/plugins/spellchk.c:2203
+#: ../pidgin/plugins/spellchk.c:2200
 msgid "You type"
 msgstr "入力した文字列"
 
-#: ../pidgin/plugins/spellchk.c:2217
+#: ../pidgin/plugins/spellchk.c:2214
 msgid "You send"
 msgstr "実際に送信する文字列"
 
-#: ../pidgin/plugins/spellchk.c:2231
+#: ../pidgin/plugins/spellchk.c:2228
 msgid "Whole words only"
 msgstr "単語だけ"
 
-#: ../pidgin/plugins/spellchk.c:2243
+#: ../pidgin/plugins/spellchk.c:2240
 msgid "Case sensitive"
 msgstr "大/小文字を区別する"
 
-#: ../pidgin/plugins/spellchk.c:2269
+#: ../pidgin/plugins/spellchk.c:2266
 msgid "Add a new text replacement"
 msgstr "新しい置換の追加"
 
-#: ../pidgin/plugins/spellchk.c:2285
+#: ../pidgin/plugins/spellchk.c:2282
 msgid "You _type:"
 msgstr "入力した文字列(_T):"
 
-#: ../pidgin/plugins/spellchk.c:2302
+#: ../pidgin/plugins/spellchk.c:2299
 msgid "You _send:"
 msgstr "実際に送信する文字列(_S):"
 
 #. Created here so it can be passed to whole_words_button_toggled.
-#: ../pidgin/plugins/spellchk.c:2314
+#: ../pidgin/plugins/spellchk.c:2311
 msgid "_Exact case match (uncheck for automatic case handling)"
 msgstr "大/小文字を区別する(_E)"
 
-#: ../pidgin/plugins/spellchk.c:2316
+#: ../pidgin/plugins/spellchk.c:2313
 msgid "Only replace _whole words"
 msgstr "単語が一致した時に置換する(_W)"
 
-#: ../pidgin/plugins/spellchk.c:2341
+#: ../pidgin/plugins/spellchk.c:2338
 msgid "General Text Replacement Options"
 msgstr "一般的な文字列の置換オプション"
 
-#: ../pidgin/plugins/spellchk.c:2342
+#: ../pidgin/plugins/spellchk.c:2339
 msgid "Enable replacement of last word on send"
 msgstr "送信時にまとめて置換する"
 
-#: ../pidgin/plugins/spellchk.c:2373
+#: ../pidgin/plugins/spellchk.c:2370
 msgid "Text replacement"
 msgstr "メッセージの置換"
 
-#: ../pidgin/plugins/spellchk.c:2375 ../pidgin/plugins/spellchk.c:2376
+#: ../pidgin/plugins/spellchk.c:2372 ../pidgin/plugins/spellchk.c:2373
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr "ユーザが定義した規則に従って、実際に送信するメッセージを書き換えます"
 
@@ -15867,7 +17625,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/ticker/ticker.c:77 ../pidgin/plugins/ticker/ticker.c:355
+#: ../pidgin/plugins/ticker/ticker.c:74 ../pidgin/plugins/ticker/ticker.c:354
 msgid "Buddy Ticker"
 msgstr "仲間表示器"
 
@@ -15875,7 +17633,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/ticker/ticker.c:358 ../pidgin/plugins/ticker/ticker.c:360
+#: ../pidgin/plugins/ticker/ticker.c:357 ../pidgin/plugins/ticker/ticker.c:359
 msgid "A horizontal scrolling version of the buddy list."
 msgstr "仲間リストを水平方向にスクロールするバージョンです"
 
@@ -15961,44 +17719,44 @@
 "このプラグインを使えば、会話やログのメッセージに付与するタイムスタンプの書式"
 "をカスタマイズできます。"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:183
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:569
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:616
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:175
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:598
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:645
 msgid "Opacity:"
 msgstr "透明度:"
 
 #. IM Convo trans options
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:533
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:562
 msgid "IM Conversation Windows"
 msgstr "IM の会話ウィンドウ"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:534
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:563
 msgid "_IM window transparency"
 msgstr "会話ウィンドウの透明度(_I)"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:548
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:577
 msgid "_Show slider bar in IM window"
 msgstr "会話ウィンドウの中にスライダ・バーを表示する(_S)"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:555
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:584
 msgid "Remove IM window transparency on focus"
 msgstr "フォーカスされたら会話ウィンドウの透明度を解除する"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:558
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:606
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:587
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:635
 msgid "Always on top"
 msgstr "常に前面に配置する"
 
 #. Buddy List trans options
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:590
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:619
 msgid "Buddy List Window"
 msgstr "仲間リストのウィンドウ"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:591
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:620
 msgid "_Buddy List window transparency"
 msgstr "仲間リストの透明度(_B)"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:604
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:633
 msgid "Remove Buddy List window transparency on focus"
 msgstr "フォーカスされたら仲間リストの透明度を解除する"
 
@@ -16008,19 +17766,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:664
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:693
 msgid "Transparency"
 msgstr "透明度"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:667
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:696
 msgid "Variable Transparency for the buddy list and conversations."
 msgstr "仲間リストと会話ウィンドウを段階的に透明化します"
 
 #. *  description
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:669
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:698
 msgid ""
 "This plugin enables variable alpha transparency on conversation windows and "
 "the buddy list.\n"
@@ -16032,54 +17790,54 @@
 "\n"
 "* 注記: このプラグインは Windows 2000 以上で動作します。"
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:307
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:303
 msgid "GTK+ Runtime Version"
 msgstr "GTK+ ラインタイムのバージョン"
 
 #. Autostart
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:315
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:311
 msgid "Startup"
 msgstr "スタートアップ"
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:316
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:312
 #, c-format
 msgid "_Start %s on Windows startup"
 msgstr "Windows のスタートアップで %s を起動する(_S)"
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:331
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:327
 msgid "_Dockable Buddy List"
 msgstr "仲間リストを格納式にする(_D)"
 
 #. Blist On Top
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:335
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:331
 msgid "_Keep Buddy List window on top:"
 msgstr "仲間リストを前面に配置したままにする(_K):"
 
 #. XXX: Did this ever work?
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:340
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:336
 msgid "Only when docked"
 msgstr "格納した時にだけ"
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:345
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:341
 msgid "_Flash window when chat messages are received"
 msgstr "チャットでメッセージを受け取ったらウィンドウを点滅させる(_F)"
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:375
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:371
 msgid "Windows Pidgin Options"
 msgstr "Windows 版 Pidgin のオプション"
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:377
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:373
 msgid "Options specific to Pidgin for Windows."
 msgstr "Windows 版 Pidgin 専用のオプション機能を提供します"
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:378
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:374
 msgid ""
 "Provides options specific to Pidgin for Windows , such as buddy list docking."
 msgstr ""
 "Windows 版の Pidgin に特化したオプション機能 (会話ウィンドウの組み込みなど) "
 "を提供します"
 
-#: ../pidgin/plugins/xmppconsole.c:666
+#: ../pidgin/plugins/xmppconsole.c:667
 msgid "<font color='#777777'>Logged out.</font>"
 msgstr "<font color='#777777'>サイン・アウトしました</font>"
 
@@ -16089,40 +17847,181 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/xmppconsole.c:746 ../pidgin/plugins/xmppconsole.c:842
-#: ../pidgin/plugins/xmppconsole.c:861
+#: ../pidgin/plugins/xmppconsole.c:746 ../pidgin/plugins/xmppconsole.c:841
+#: ../pidgin/plugins/xmppconsole.c:860
 msgid "XMPP Console"
 msgstr "XMPP のコンソール"
 
-#: ../pidgin/plugins/xmppconsole.c:754
+#: ../pidgin/plugins/xmppconsole.c:753
 msgid "Account: "
 msgstr "アカウント: "
 
-#: ../pidgin/plugins/xmppconsole.c:781
+#: ../pidgin/plugins/xmppconsole.c:780
 msgid "<font color='#777777'>Not connected to XMPP</font>"
 msgstr "<font color='#777777'>XMPP に接続していません</font>"
 
-#: ../pidgin/plugins/xmppconsole.c:791
+#: ../pidgin/plugins/xmppconsole.c:790
 msgid "Insert an <iq/> stanza."
 msgstr "<iq/> スタンザを挿入します"
 
-#: ../pidgin/plugins/xmppconsole.c:800
+#: ../pidgin/plugins/xmppconsole.c:799
 msgid "Insert a <presence/> stanza."
 msgstr "<presence/> スタンザを挿入します"
 
-#: ../pidgin/plugins/xmppconsole.c:809
+#: ../pidgin/plugins/xmppconsole.c:808
 msgid "Insert a <message/> stanza."
 msgstr "<message/> スタンザを挿入します"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/xmppconsole.c:864
+#: ../pidgin/plugins/xmppconsole.c:863
 msgid "Send and receive raw XMPP stanzas."
 msgstr "低レベルの XMPP スタンザを送信したり受信します"
 
 #. *  description
-#: ../pidgin/plugins/xmppconsole.c:866
+#: ../pidgin/plugins/xmppconsole.c:865
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr ""
 "これは XMPP サービスやクライアントをデバッグする際に便利なプラグインです。"
+
+#~ msgid "Sort by status"
+#~ msgstr "状態順"
+
+#~ msgid "Sort alphabetically"
+#~ msgstr "アルファベット順"
+
+#~ msgid "Sort by log size"
+#~ msgstr "ログのサイズ順"
+
+#~ msgid "Commands are not supported yet. Message was NOT sent."
+#~ msgstr "まだコマンドはサポートしていません (メッセージを送信しませんでした)"
+
+#~ msgid "You have just sent a Nudge!"
+#~ msgstr "今、合図を送りました!"
+
+#~ msgid "Has you"
+#~ msgstr "あなたを仲間リストに登録しているか"
+
+#~ msgid "MSN Protocol Plugin"
+#~ msgstr "MSN プロトコルのプラグイン"
+
+#~ msgid "User information for %s unavailable:"
+#~ msgstr "%s のユーザ情報は有効ではありません:"
+
+#~ msgid "You have been signed off for an unknown reason."
+#~ msgstr "原因は不明ですが、あなたはサイン・アウトしました"
+
+#~ msgid ""
+#~ "Could not add the buddy %s for an unknown reason.  The most common reason "
+#~ "for this is that you have the maximum number of allowed buddies in your "
+#~ "buddy list."
+#~ msgstr ""
+#~ "不明な理由により、仲間 %s を追加できませんでした。最も一般的な問題として"
+#~ "は、これは仲間リストに追加可能な仲間の数を越えてしまっているということがあ"
+#~ "り得ます。"
+
+#~ msgid "_Connect"
+#~ msgstr "接続する(_C)"
+
+#~ msgid "Are you sure to exit this Qun?"
+#~ msgstr "この Qun を終了してもよろしいですか?"
+
+#~ msgid "Go ahead"
+#~ msgstr "続行する"
+
+#~ msgid "Server ACK"
+#~ msgstr "サーバの ACK"
+
+#~ msgid "Send IM fail\n"
+#~ msgstr "メールの送信エラー\n"
+
+#~ msgid "Keep alive error, seems connection lost!"
+#~ msgstr "エラーが連続的に発生しています (接続が切れたと思われます!)"
+
+#~ msgid "Request login token error!"
+#~ msgstr "ログイン要求エラー!"
+
+#~ msgid "%s Address"
+#~ msgstr "%s 住所"
+
+#~ msgid "QQ: Available"
+#~ msgstr "QQ: 在席してます"
+
+#~ msgid "QQ: Away"
+#~ msgstr "QQ: 離席中"
+
+#~ msgid "QQ: Invisible"
+#~ msgstr "QQ: 隠れています"
+
+#~ msgid "QQ: Offline"
+#~ msgstr "QQ: オフラインです"
+
+#~ msgid "Modify My Information"
+#~ msgstr "自分の情報の変更"
+
+#~ msgid "Login in TCP"
+#~ msgstr "TCP でログインする"
+
+#~ msgid "Login Hidden"
+#~ msgstr "ログインを隠す"
+
+#~ msgid "Socket send error"
+#~ msgstr "ソケット送信のエラー"
+
+#~ msgid "Connection refused"
+#~ msgstr "接続が拒否されました"
+
+#~ msgid "Would like to add him?"
+#~ msgstr "彼を追加しますか?"
+
+#~ msgid "%s just sent you a Buzz!"
+#~ msgstr "%s さんが合図を送りたがっています!"
+
+#~ msgid "You have just sent a Buzz!"
+#~ msgstr "今、合図を送りました!"
+
+#~ msgid "Unavailable"
+#~ msgstr "利用不可"
+
+#~ msgid "Add Buddy _Pounce"
+#~ msgstr "つかむ仲間の追加(_P)"
+
+#~ msgid "Add a _Buddy"
+#~ msgstr "仲間の追加(_B)"
+
+#~ msgid "Add a C_hat"
+#~ msgstr "チャットの追加(_H)"
+
+#~ msgid "/Accounts/Add\\/Edit"
+#~ msgstr "/アカウント/追加\\/編集"
+
+#~ msgid "/Options/Show Buddy _Icon"
+#~ msgstr "/オプション/仲間アイコンを表示する(_I)"
+
+#~ msgid "/Options/Show Buddy Icon"
+#~ msgstr "/オプション/仲間アイコンを表示する"
+
+#~ msgid "_Send To"
+#~ msgstr "送信先(_S)"
+
+#~ msgid "Smaller font size"
+#~ msgstr "フォントのサイズを小さくします"
+
+#~ msgid "Insert link"
+#~ msgstr "リンクを挿入します"
+
+#~ msgid "Insert image"
+#~ msgstr "画像を挿入します"
+
+#~ msgid "Show buddy _icons"
+#~ msgstr "仲間アイコンを表示する(_I)"
+
+#~ msgid "Conversation History"
+#~ msgstr "会話履歴の文字"
+
+#~ msgid "Log Viewer"
+#~ msgstr "ログ・ビューアの文字"
+
+#~ msgid "Tools"
+#~ msgstr "ツール"