diff po/ja.po @ 20263:15ad77c653ad

I ran stats.pl to get updated po files. This was necessary to pull some old strings back into use, now that we've gone back in time.
author Richard Laager <rlaager@wiktel.com>
date Fri, 28 Sep 2007 18:19:24 +0000
parents 60485bc8ff7f
children e4719768af06
line wrap: on
line diff
--- a/po/ja.po	Fri Sep 28 17:11:39 2007 +0000
+++ b/po/ja.po	Fri Sep 28 18:19:24 2007 +0000
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: pidgin trunk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-25 01:15-0700\n"
+"POT-Creation-Date: 2007-09-28 13:16-0500\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"
@@ -51,7 +51,7 @@
 "  -n, --nologin       自動的にサイン・インしない\n"
 "  -v, --version       現在使用しているバージョンを表示して終了する\n"
 
-#: ../finch/finch.c:328 ../pidgin/gtkmain.c:718
+#: ../finch/finch.c:328 ../pidgin/gtkmain.c:711
 #, c-format
 msgid ""
 "%s encountered errors migrating your settings from %s to %s. Please "
@@ -67,7 +67,7 @@
 #: ../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/buddy.c:2029
 #: ../libpurple/protocols/jabber/chat.c:677
 #: ../libpurple/protocols/jabber/chat.c:688
 #: ../libpurple/protocols/jabber/jabber.c:1515
@@ -102,8 +102,8 @@
 msgid "(You probably forgot to 'make install'.)"
 msgstr ""
 
-#: ../finch/gntaccount.c:496 ../finch/gntconn.c:137
-#: ../pidgin/gtkaccount.c:1473 ../pidgin/gtkblist.c:4322
+#: ../finch/gntaccount.c:496 ../finch/gntconn.c:136
+#: ../pidgin/gtkaccount.c:1473 ../pidgin/gtkblist.c:4040
 msgid "Modify Account"
 msgstr "アカウントの編集"
 
@@ -133,7 +133,7 @@
 #: ../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/gntblist.c:1101 ../finch/gntblist.c:2222 ../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
@@ -143,8 +143,8 @@
 #: ../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/buddy.c:2413
+#: ../libpurple/protocols/jabber/buddy.c:2449
 #: ../libpurple/protocols/jabber/chat.c:786
 #: ../libpurple/protocols/jabber/jabber.c:1008
 #: ../libpurple/protocols/jabber/jabber.c:1017
@@ -153,10 +153,10 @@
 #: ../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/msn/msn.c:287 ../libpurple/protocols/msn/msn.c:304
+#: ../libpurple/protocols/msn/msn.c:321 ../libpurple/protocols/msn/msn.c:338
+#: ../libpurple/protocols/msn/msn.c:359
+#: ../libpurple/protocols/oscar/oscar.c:6094
 #: ../libpurple/protocols/oscar/peer.c:1046
 #: ../libpurple/protocols/qq/buddy_info.c:484
 #: ../libpurple/protocols/qq/buddy_opt.c:214
@@ -191,16 +191,16 @@
 #: ../libpurple/protocols/silc10/ops.c:1904
 #: ../libpurple/protocols/silc10/silc.c:736
 #: ../libpurple/protocols/silc10/silc.c:942
-#: ../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
+#: ../libpurple/protocols/yahoo/yahoo.c:1032
+#: ../libpurple/protocols/yahoo/yahoo.c:3498
+#: ../libpurple/protocols/yahoo/yahoo.c:3509 ../pidgin/gtkaccount.c:1908
+#: ../pidgin/gtkaccount.c:2495 ../pidgin/gtkblist.c:5967
+#: ../pidgin/gtkcertmgr.c:197 ../pidgin/gtkdialogs.c:769
+#: ../pidgin/gtkdialogs.c:908 ../pidgin/gtkdialogs.c:1000
+#: ../pidgin/gtkdialogs.c:1020 ../pidgin/gtkdialogs.c:1044
+#: ../pidgin/gtkdialogs.c:1066 ../pidgin/gtkdialogs.c:1114
+#: ../pidgin/gtkdialogs.c:1155 ../pidgin/gtkdialogs.c:1211
+#: ../pidgin/gtkdialogs.c:1250 ../pidgin/gtkdialogs.c:1277
 #: ../pidgin/gtkimhtmltoolbar.c:435 ../pidgin/gtklog.c:328
 #: ../pidgin/gtkplugin.c:289 ../pidgin/gtkpounce.c:1101
 #: ../pidgin/gtkprivacy.c:563 ../pidgin/gtkprivacy.c:579
@@ -241,7 +241,7 @@
 msgid "Delete"
 msgstr "削除する"
 
-#: ../finch/gntaccount.c:669 ../finch/gntblist.c:2121 ../finch/gntui.c:82
+#: ../finch/gntaccount.c:669 ../finch/gntblist.c:2119 ../finch/gntui.c:82
 #: ../pidgin/gtkaccount.c:2325 ../pidgin/gtkdocklet.c:522
 msgid "Accounts"
 msgstr "アカウント"
@@ -252,16 +252,15 @@
 
 #. Add button
 #: ../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
+#: ../finch/gntblist.c:421 ../finch/gntblist.c:456 ../finch/gntcertmgr.c:306
+#: ../finch/gntnotify.c:380 ../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:2494
-#: ../pidgin/gtkblist.c:6266 ../pidgin/gtkconv.c:1712
+#: ../pidgin/gtkblist.c:5966 ../pidgin/gtkconv.c:1659
 #: ../pidgin/gtkrequest.c:275
 msgid "Add"
 msgstr "追加する"
@@ -321,19 +320,19 @@
 msgid "Error adding buddy"
 msgstr "仲間を追加する際にエラー"
 
-#: ../finch/gntblist.c:325 ../libpurple/protocols/oscar/oscar.c:2884
+#: ../finch/gntblist.c:325 ../libpurple/protocols/oscar/oscar.c:2888
 #: ../pidgin/gtkaccount.c:1981 ../pidgin/gtksavedstatuses.c:980
 msgid "Screen Name"
 msgstr "スクリーン名"
 
 #: ../finch/gntblist.c:328 ../finch/gntblist.c:410 ../finch/gntblist.c:1250
-#: ../libpurple/protocols/msn/msn.c:1507
+#: ../libpurple/protocols/msn/msn.c:1395
 #: ../libpurple/protocols/silc/chat.c:606
 #: ../libpurple/protocols/silc10/chat.c:590
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:704
 #: ../libpurple/protocols/zephyr/zephyr.c:788
-#: ../libpurple/protocols/zephyr/zephyr.c:1207 ../pidgin/gtkdialogs.c:1017
-#: ../pidgin/gtkdialogs.c:1041 ../pidgin/gtkdialogs.c:1063
+#: ../libpurple/protocols/zephyr/zephyr.c:1207 ../pidgin/gtkdialogs.c:1019
+#: ../pidgin/gtkdialogs.c:1043 ../pidgin/gtkdialogs.c:1065
 #: ../pidgin/gtkrequest.c:278
 msgid "Alias"
 msgstr "別名"
@@ -345,7 +344,7 @@
 #: ../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:3206 ../pidgin/gtknotify.c:503
+#: ../pidgin/gtkblist.c:3008 ../pidgin/gtknotify.c:506
 #: ../pidgin/gtkpounce.c:1268 ../pidgin/plugins/gevolution/gevolution.c:445
 msgid "Account"
 msgstr "アカウント"
@@ -359,7 +358,7 @@
 #: ../libpurple/protocols/silc10/buddy.c:1033
 #: ../libpurple/protocols/silc10/buddy.c:1080
 #: ../libpurple/protocols/silc10/buddy.c:1180
-#: ../libpurple/protocols/yahoo/yahoo.c:3342 ../pidgin/gtkblist.c:5772
+#: ../libpurple/protocols/yahoo/yahoo.c:3343 ../pidgin/gtkblist.c:5483
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:445
 msgid "Add Buddy"
 msgstr "仲間の追加"
@@ -368,15 +367,15 @@
 msgid "Please enter buddy information."
 msgstr "仲間の情報を入力して下さい:"
 
-#: ../finch/gntblist.c:370 ../libpurple/blist.c:1210
+#: ../finch/gntblist.c:370 ../libpurple/blist.c:1209
 msgid "Chats"
 msgstr "チャット"
 
 #. Extract their Name and put it in
 #: ../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/msn/msn.c:1584 ../libpurple/protocols/msn/msn.c:1649
+#: ../libpurple/protocols/msn/msn.c:1676
 #: ../libpurple/protocols/qq/buddy_info.c:44 ../pidgin/gtkplugin.c:582
 #: ../pidgin/gtkroomlist.c:618
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:132
@@ -388,7 +387,7 @@
 msgid "Auto-join"
 msgstr "自動参加"
 
-#: ../finch/gntblist.c:419 ../finch/gntblist.c:854 ../pidgin/gtkblist.c:6154
+#: ../finch/gntblist.c:419 ../finch/gntblist.c:854 ../pidgin/gtkblist.c:5859
 msgid "Add Chat"
 msgstr "チャットの追加"
 
@@ -410,7 +409,7 @@
 
 #: ../finch/gntblist.c:454 ../finch/gntblist.c:856
 #: ../libpurple/protocols/sametime/sametime.c:5396
-#: ../libpurple/protocols/sametime/sametime.c:5484 ../pidgin/gtkblist.c:6263
+#: ../libpurple/protocols/sametime/sametime.c:5484 ../pidgin/gtkblist.c:5963
 msgid "Add Group"
 msgstr "グループの追加"
 
@@ -442,7 +441,7 @@
 msgid "Retrieving..."
 msgstr "取得中..."
 
-#: ../finch/gntblist.c:904 ../finch/gntconv.c:534
+#: ../finch/gntblist.c:904 ../finch/gntconv.c:507
 #: ../libpurple/protocols/silc/chat.c:899
 #: ../libpurple/protocols/silc10/chat.c:883
 msgid "Get Info"
@@ -453,10 +452,10 @@
 msgstr "つかむ仲間の追加"
 
 #. if (q_bud && is_online(q_bud->status)) {
-#: ../finch/gntblist.c:915 ../finch/gntconv.c:546
+#: ../finch/gntblist.c:915 ../finch/gntconv.c:519
 #: ../libpurple/protocols/jabber/si.c:874
 #: ../libpurple/protocols/oscar/oscar.c:654 ../libpurple/protocols/qq/qq.c:587
-#: ../pidgin/gtkconv.c:1660
+#: ../pidgin/gtkconv.c:1607
 msgid "Send File"
 msgstr "ファイルの送信"
 
@@ -500,14 +499,14 @@
 msgstr "削除の確認"
 
 #: ../finch/gntblist.c:1100 ../finch/gntblist.c:1252 ../finch/gntft.c:227
-#: ../pidgin/gtkconv.c:1709 ../pidgin/gtkrequest.c:276
+#: ../pidgin/gtkconv.c:1656 ../pidgin/gtkrequest.c:276
 #: ../pidgin/gtkstatusbox.c:264
 msgid "Remove"
 msgstr "削除"
 
 #. Buddy List
-#: ../finch/gntblist.c:1226 ../finch/gntblist.c:2355 ../finch/gntprefs.c:258
-#: ../finch/gntui.c:83 ../pidgin/gtkblist.c:2886 ../pidgin/gtkblist.c:4566
+#: ../finch/gntblist.c:1226 ../finch/gntblist.c:2307 ../finch/gntprefs.c:258
+#: ../finch/gntui.c:83 ../pidgin/gtkblist.c:2688 ../pidgin/gtkblist.c:4284
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:326
 msgid "Buddy List"
 msgstr "仲間リスト"
@@ -526,15 +525,15 @@
 #: ../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/buddy.c:2214
+#: ../libpurple/protocols/jabber/buddy.c:2396
 #: ../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/msn/msn.c:1403 ../libpurple/protocols/msn/msn.c:1587
 #: ../libpurple/protocols/qq/buddy_info.c:43
 #: ../libpurple/protocols/silc/buddy.c:1535
 #: ../libpurple/protocols/silc/ops.c:1002
@@ -544,7 +543,7 @@
 #: ../libpurple/protocols/silc10/ops.c:1036
 #: ../libpurple/protocols/silc10/ops.c:1179
 #: ../libpurple/protocols/silc10/ops.c:1328
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1066 ../pidgin/gtkblist.c:3230
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1066 ../pidgin/gtkblist.c:3032
 msgid "Nickname"
 msgstr "ニックネーム"
 
@@ -553,12 +552,12 @@
 #: ../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
+#: ../libpurple/protocols/msn/msn.c:544 ../libpurple/protocols/msn/state.c:32
+#: ../libpurple/protocols/novell/novell.c:2825
+#: ../libpurple/protocols/oscar/oscar.c:2912
+#: ../libpurple/protocols/yahoo/yahoo.c:3097
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:710 ../pidgin/gtkblist.c:3060
+#: ../pidgin/gtkblist.c:3460 ../pidgin/gtkprefs.c:1925
 msgid "Idle"
 msgstr "待機中"
 
@@ -590,36 +589,36 @@
 "\n"
 "最後にお会いしたのは: %s前"
 
-#: ../finch/gntblist.c:1704 ../pidgin/gtkdocklet.c:470
+#: ../finch/gntblist.c:1702 ../pidgin/gtkdocklet.c:470
 #: ../pidgin/gtkstatusbox.c:1072
 msgid "New..."
 msgstr "状態の追加..."
 
-#: ../finch/gntblist.c:1711 ../pidgin/gtkdocklet.c:471
+#: ../finch/gntblist.c:1709 ../pidgin/gtkdocklet.c:471
 #: ../pidgin/gtkstatusbox.c:1073
 msgid "Saved..."
 msgstr "他の状態..."
 
-#: ../finch/gntblist.c:2089 ../finch/gntplugin.c:255 ../finch/gntui.c:88
+#: ../finch/gntblist.c:2087 ../finch/gntplugin.c:255 ../finch/gntui.c:88
 #: ../pidgin/gtkdocklet.c:523 ../pidgin/gtkplugin.c:531
 msgid "Plugins"
 msgstr "プラグイン"
 
-#: ../finch/gntblist.c:2205 ../pidgin/gtkdialogs.c:748
-#: ../pidgin/gtkdialogs.c:887 ../pidgin/gtkdialogs.c:968
+#: ../finch/gntblist.c:2203 ../pidgin/gtkdialogs.c:750
+#: ../pidgin/gtkdialogs.c:889 ../pidgin/gtkdialogs.c:970
 msgid "_Name"
 msgstr "名前(_N)"
 
-#: ../finch/gntblist.c:2210 ../pidgin/gtkdialogs.c:753
-#: ../pidgin/gtkdialogs.c:892 ../pidgin/gtkdialogs.c:973
+#: ../finch/gntblist.c:2208 ../pidgin/gtkdialogs.c:755
+#: ../pidgin/gtkdialogs.c:894 ../pidgin/gtkdialogs.c:975
 msgid "_Account"
 msgstr "アカウント(_A)"
 
-#: ../finch/gntblist.c:2218 ../pidgin/gtkdialogs.c:761
+#: ../finch/gntblist.c:2216 ../pidgin/gtkdialogs.c:763
 msgid "New Instant Message"
 msgstr "新しいインスタント・メッセージ"
 
-#: ../finch/gntblist.c:2220 ../pidgin/gtkdialogs.c:763
+#: ../finch/gntblist.c:2218 ../pidgin/gtkdialogs.c:765
 msgid ""
 "Please enter the screen name or alias of the person you would like to IM."
 msgstr "IM で会話する相手のスクリーン名または別名を入力して下さい:"
@@ -627,15 +626,15 @@
 #. Not multiline
 #. Not masked?
 #. No hints?
-#: ../finch/gntblist.c:2223 ../finch/gntcertmgr.c:90 ../finch/gntconn.c:136
+#: ../finch/gntblist.c:2221 ../finch/gntcertmgr.c:90 ../finch/gntconn.c:135
 #: ../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/msn/msn.c:286 ../libpurple/protocols/msn/msn.c:303
+#: ../libpurple/protocols/msn/msn.c:320 ../libpurple/protocols/msn/msn.c:337
+#: ../libpurple/protocols/oscar/oscar.c:6093
 #: ../libpurple/protocols/silc/buddy.c:454
 #: ../libpurple/protocols/silc/buddy.c:1190
 #: ../libpurple/protocols/silc/chat.c:447
@@ -652,56 +651,45 @@
 #: ../libpurple/protocols/silc10/ops.c:1297
 #: ../libpurple/protocols/silc10/ops.c:1903
 #: ../libpurple/protocols/silc10/silc.c:735
-#: ../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
+#: ../libpurple/protocols/yahoo/yahoo.c:1031
+#: ../libpurple/protocols/yahoo/yahoo.c:3497
+#: ../libpurple/protocols/yahoo/yahoo.c:3508 ../pidgin/gtkblist.c:4039
+#: ../pidgin/gtkcertmgr.c:195 ../pidgin/gtkdialogs.c:768
+#: ../pidgin/gtkdialogs.c:907 ../pidgin/gtkdialogs.c:999
 #: ../pidgin/gtkrequest.c:270
 msgid "OK"
 msgstr "OK"
 
 #. Create the "Options" frame.
-#: ../finch/gntblist.c:2261 ../finch/gntpounce.c:447 ../pidgin/gtkpounce.c:790
+#: ../finch/gntblist.c:2241 ../finch/gntpounce.c:447 ../pidgin/gtkpounce.c:790
 msgid "Options"
 msgstr "オプション"
 
-#: ../finch/gntblist.c:2267
+#: ../finch/gntblist.c:2247
 msgid "Send IM..."
 msgstr "IM の送信..."
 
+#: ../finch/gntblist.c:2251
+#, fuzzy
+msgid "Show empty groups"
+msgstr "グループ毎に共有する"
+
+#: ../finch/gntblist.c:2257
+#, fuzzy
+msgid "Show offline buddies"
+msgstr "オフラインの仲間を表示する"
+
+#: ../finch/gntblist.c:2263
+msgid "Sort by status"
+msgstr "状態順"
+
+#: ../finch/gntblist.c:2267
+msgid "Sort alphabetically"
+msgstr "アルファベット順"
+
 #: ../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:2288
-#, fuzzy
-msgid "Sort"
-msgstr "ポート番号"
-
-#: ../finch/gntblist.c:2293
-#, fuzzy
-msgid "By Status"
-msgstr "状態順"
-
-#: ../finch/gntblist.c:2297 ../pidgin/gtkblist.c:4106
-msgid "Alphabetically"
-msgstr "アルファベット順"
-
-#: ../finch/gntblist.c:2301
-#, fuzzy
-msgid "By Log Size"
-msgstr "ログ・サイズ順"
+msgid "Sort by log size"
+msgstr "ログのサイズ順"
 
 #: ../finch/gntcertmgr.c:86 ../pidgin/gtkcertmgr.c:188
 #, fuzzy
@@ -793,7 +781,7 @@
 msgid "Hostname"
 msgstr "ホスト名"
 
-#: ../finch/gntcertmgr.c:315 ../finch/gntnotify.c:386 ../pidgin/gtkconv.c:1688
+#: ../finch/gntcertmgr.c:315 ../finch/gntnotify.c:383 ../pidgin/gtkconv.c:1635
 #: ../pidgin/gtkdebug.c:835
 msgid "Info"
 msgstr "情報"
@@ -801,24 +789,24 @@
 #. 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
+#: ../finch/gntstatus.c:216 ../libpurple/protocols/msn/msn.c:403
 #: ../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
+#: ../finch/gntconn.c:124
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../finch/gntconn.c:128
+#: ../finch/gntconn.c:127
 #, c-format
 msgid "%s disconnected."
 msgstr "%s さんは接続を切りました"
 
-#: ../finch/gntconn.c:129
+#: ../finch/gntconn.c:128
 #, c-format
 msgid ""
 "%s\n"
@@ -831,7 +819,7 @@
 "エラーを解決しアカウントをもう一度有効にするまで、そのアカウントには接続しま"
 "せん。"
 
-#: ../finch/gntconn.c:138 ../pidgin/gtkblist.c:4323
+#: ../finch/gntconn.c:137 ../pidgin/gtkblist.c:4041
 msgid "Re-enable Account"
 msgstr "アカウントを再び有効にする"
 
@@ -839,23 +827,23 @@
 msgid "No such command."
 msgstr "そのようなコマンドはありません"
 
-#: ../finch/gntconv.c:143 ../pidgin/gtkconv.c:530
+#: ../finch/gntconv.c:143 ../pidgin/gtkconv.c:489
 msgid "Syntax Error:  You typed the wrong number of arguments to that command."
 msgstr "入力エラー:  そのコマンドに対する引数の数が間違っています"
 
-#: ../finch/gntconv.c:148 ../pidgin/gtkconv.c:536
+#: ../finch/gntconv.c:148 ../pidgin/gtkconv.c:495
 msgid "Your command failed for an unknown reason."
 msgstr "原因不明ですが、コマンド適用に失敗しました"
 
-#: ../finch/gntconv.c:153 ../pidgin/gtkconv.c:543
+#: ../finch/gntconv.c:153 ../pidgin/gtkconv.c:502
 msgid "That command only works in chats, not IMs."
 msgstr "そのコマンドは IM ではなくチャットでのみ動作します"
 
-#: ../finch/gntconv.c:156 ../pidgin/gtkconv.c:546
+#: ../finch/gntconv.c:156 ../pidgin/gtkconv.c:505
 msgid "That command only works in IMs, not chats."
 msgstr "そのコマンドはチャットではなく IM でのみ動作します"
 
-#: ../finch/gntconv.c:160 ../pidgin/gtkconv.c:551
+#: ../finch/gntconv.c:160 ../pidgin/gtkconv.c:510
 msgid "That command doesn't work on this protocol."
 msgstr "そのコマンドは、このプロトコルでは動作しません"
 
@@ -874,7 +862,7 @@
 msgid "%s [%s]"
 msgstr "%s [%s]"
 
-#: ../finch/gntconv.c:279 ../finch/gntconv.c:801
+#: ../finch/gntconv.c:279 ../finch/gntconv.c:773
 #, c-format
 msgid ""
 "\n"
@@ -887,63 +875,63 @@
 msgid "You have left this chat."
 msgstr "このチャットから退出しました"
 
-#: ../finch/gntconv.c:414 ../pidgin/gtkconv.c:1415
+#: ../finch/gntconv.c:387 ../pidgin/gtkconv.c:1362
 msgid "Logging started. Future messages in this conversation will be logged."
 msgstr "ログの記録を開始しました。これ以降の会話がログに記録されます。"
 
-#: ../finch/gntconv.c:420 ../pidgin/gtkconv.c:1423
+#: ../finch/gntconv.c:393 ../pidgin/gtkconv.c:1370
 msgid ""
 "Logging stopped. Future messages in this conversation will not be logged."
 msgstr "ログの記録を停止しました。これ以降の会話はログに記録されません。"
 
-#: ../finch/gntconv.c:469
+#: ../finch/gntconv.c:442
 msgid "Send To"
 msgstr "送信先"
 
-#: ../finch/gntconv.c:513
+#: ../finch/gntconv.c:486
 msgid "Conversation"
 msgstr "会話ウィンドウ"
 
-#: ../finch/gntconv.c:519
+#: ../finch/gntconv.c:492
 msgid "Clear Scrollback"
 msgstr "スクロールバックのクリア"
 
-#: ../finch/gntconv.c:523 ../finch/gntprefs.c:191
+#: ../finch/gntconv.c:496 ../finch/gntprefs.c:191
 msgid "Show Timestamps"
 msgstr "タイムスタンプを表示する"
 
-#: ../finch/gntconv.c:539
+#: ../finch/gntconv.c:512
 msgid "Add Buddy Pounce..."
 msgstr "つかむ仲間の追加..."
 
-#: ../finch/gntconv.c:554
+#: ../finch/gntconv.c:527
 #, fuzzy
 msgid "Enable Logging"
 msgstr "/オプション/ログを記録する"
 
-#: ../finch/gntconv.c:560
+#: ../finch/gntconv.c:533
 #, fuzzy
 msgid "Enable Sounds"
 msgstr "いつサウンドを有効にするか...:"
 
-#: ../finch/gntconv.c:766
+#: ../finch/gntconv.c:739
 msgid "<AUTO-REPLY> "
 msgstr "<AUTO-REPLY> "
 
 #. Print the list of users in the room
-#: ../finch/gntconv.c:889
+#: ../finch/gntconv.c:861
 msgid "List of users:\n"
 msgstr "ユーザの一覧\n"
 
-#: ../finch/gntconv.c:1051 ../pidgin/gtkconv.c:370
+#: ../finch/gntconv.c:1023 ../pidgin/gtkconv.c:331
 msgid "Supported debug options are:  version"
 msgstr "サポートするデバッグ・オプションは:  バージョン"
 
-#: ../finch/gntconv.c:1087 ../pidgin/gtkconv.c:422
+#: ../finch/gntconv.c:1059 ../pidgin/gtkconv.c:381
 msgid "No such command (in this context)."
 msgstr "(このコンテキストには) そのようなコマンドはありません"
 
-#: ../finch/gntconv.c:1090 ../pidgin/gtkconv.c:425
+#: ../finch/gntconv.c:1062 ../pidgin/gtkconv.c:384
 msgid ""
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
 "The following commands are available in this context:\n"
@@ -952,7 +940,7 @@
 "\"/help &lt;command&gt;\" を使用して下さい。\n"
 "このコンテキストでは次のコマンドが利用可能です:\n"
 
-#: ../finch/gntconv.c:1148 ../pidgin/gtkconv.c:7642
+#: ../finch/gntconv.c:1120 ../pidgin/gtkconv.c:7560
 msgid ""
 "say &lt;message&gt;:  Send a message normally as if you weren't using a "
 "command."
@@ -960,13 +948,13 @@
 "say &lt;メッセージ&gt;:  コマンドを利用していない場合でもメッセージを送信しま"
 "す"
 
-#: ../finch/gntconv.c:1151 ../pidgin/gtkconv.c:7645
+#: ../finch/gntconv.c:1123 ../pidgin/gtkconv.c:7563
 msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
 msgstr ""
 "me &lt;アクション&gt;:  仲間またはチャットへ IRC スタイルのアクションを送信し"
 "ます"
 
-#: ../finch/gntconv.c:1154 ../pidgin/gtkconv.c:7648
+#: ../finch/gntconv.c:1126 ../pidgin/gtkconv.c:7566
 msgid ""
 "debug &lt;option&gt;:  Send various debug information to the current "
 "conversation."
@@ -974,39 +962,39 @@
 "debug &lt;オプション&gt;:  利用中の会話ウィンドウへいろいろなデバッグ情報を送"
 "信します"
 
-#: ../finch/gntconv.c:1157 ../pidgin/gtkconv.c:7651
+#: ../finch/gntconv.c:1129 ../pidgin/gtkconv.c:7569
 msgid "clear: Clears the conversation scrollback."
 msgstr "クリア: 会話ウィンドウにある以前のメッセージをクリアします"
 
-#: ../finch/gntconv.c:1160 ../pidgin/gtkconv.c:7657
+#: ../finch/gntconv.c:1132 ../pidgin/gtkconv.c:7575
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr "help &lt;コマンド&gt;:  特定のコマンドに対するヘルプを表示します"
 
-#: ../finch/gntconv.c:1163
+#: ../finch/gntconv.c:1135
 msgid "users:  Show the list of users in the chat."
 msgstr "users:  チャットの中にユーザの一覧を表示する"
 
-#: ../finch/gntconv.c:1168
+#: ../finch/gntconv.c:1140
 msgid "plugins: Show the plugins window."
 msgstr "plugins: プラグイン・ウィンドウを表示する"
 
-#: ../finch/gntconv.c:1171
+#: ../finch/gntconv.c:1143
 msgid "buddylist: Show the buddylist."
 msgstr "buddylist: 仲間リストを表示する"
 
-#: ../finch/gntconv.c:1174
+#: ../finch/gntconv.c:1146
 msgid "accounts: Show the accounts window."
 msgstr "accounts: アカウント・ウィンドウを表示する"
 
-#: ../finch/gntconv.c:1177
+#: ../finch/gntconv.c:1149
 msgid "debugwin: Show the debug window."
 msgstr "debugwin: デバッグ・ウィンドウを表示する"
 
-#: ../finch/gntconv.c:1180
+#: ../finch/gntconv.c:1152
 msgid "prefs: Show the preference window."
 msgstr "prefs: 設定ウィンドウを表示する"
 
-#: ../finch/gntconv.c:1183
+#: ../finch/gntconv.c:1155
 msgid "statuses: Show the savedstatuses window."
 msgstr "statuses: 保存状態のウィンドウを表示する"
 
@@ -1070,17 +1058,17 @@
 #: ../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/msn/msn.c:543
+#: ../libpurple/protocols/novell/novell.c:2835
 #: ../libpurple/protocols/oscar/oscar.c:821
 #: ../libpurple/protocols/oscar/oscar.c:826
 #: ../libpurple/protocols/oscar/oscar.c:828
-#: ../libpurple/protocols/oscar/oscar.c:2696
-#: ../libpurple/protocols/oscar/oscar.c:3776
+#: ../libpurple/protocols/oscar/oscar.c:2700
+#: ../libpurple/protocols/oscar/oscar.c:3780
 #: ../libpurple/protocols/sametime/sametime.c:3263
 #: ../libpurple/protocols/sametime/sametime.c:4150
-#: ../libpurple/protocols/yahoo/yahoo.c:3247 ../pidgin/gtkblist.c:3302
-#: ../pidgin/gtkblist.c:3316 ../pidgin/gtkblist.c:3318
+#: ../libpurple/protocols/yahoo/yahoo.c:3248 ../pidgin/gtkblist.c:3104
+#: ../pidgin/gtkblist.c:3118 ../pidgin/gtkblist.c:3120
 #: ../pidgin/gtksavedstatuses.c:999 ../pidgin/gtksavedstatuses.c:1144
 msgid "Status"
 msgstr "状態"
@@ -1124,7 +1112,7 @@
 msgid "Finished"
 msgstr "完了しました"
 
-#: ../finch/gntft.c:437 ../libpurple/protocols/msn/session.c:386
+#: ../finch/gntft.c:437 ../libpurple/protocols/msn/session.c:347
 msgid "Transferring"
 msgstr "転送しています"
 
@@ -1136,11 +1124,11 @@
 msgid "You have mail!"
 msgstr "メールが届きました!"
 
-#: ../finch/gntnotify.c:174 ../pidgin/gtknotify.c:510
+#: ../finch/gntnotify.c:174 ../pidgin/gtknotify.c:513
 msgid "Sender"
 msgstr "送信者"
 
-#: ../finch/gntnotify.c:174 ../pidgin/gtknotify.c:517
+#: ../finch/gntnotify.c:174 ../pidgin/gtknotify.c:520
 msgid "Subject"
 msgstr "件名"
 
@@ -1165,23 +1153,23 @@
 msgid "Buddy Information"
 msgstr "仲間の情報"
 
-#: ../finch/gntnotify.c:380 ../libpurple/protocols/qq/group_join.c:367
+#: ../finch/gntnotify.c:377 ../libpurple/protocols/qq/group_join.c:367
 msgid "Continue"
 msgstr "続行する"
 
-#: ../finch/gntnotify.c:389 ../pidgin/gtkconv.c:1649
+#: ../finch/gntnotify.c:386 ../pidgin/gtkconv.c:1596
 msgid "IM"
 msgstr "IM"
 
-#: ../finch/gntnotify.c:392
+#: ../finch/gntnotify.c:389
 msgid "Join"
 msgstr "参加する"
 
-#: ../finch/gntnotify.c:395 ../libpurple/protocols/sametime/sametime.c:3473
+#: ../finch/gntnotify.c:392 ../libpurple/protocols/sametime/sametime.c:3473
 msgid "Invite"
 msgstr "招待する"
 
-#: ../finch/gntnotify.c:398
+#: ../finch/gntnotify.c:395
 msgid "(none)"
 msgstr "(なし)"
 
@@ -1236,7 +1224,7 @@
 #. 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
+#: ../finch/gntui.c:90 ../pidgin/gtkdocklet.c:524 ../pidgin/gtkprefs.c:2067
 msgid "Preferences"
 msgstr "設定"
 
@@ -1417,6 +1405,7 @@
 msgstr "%s さんがあなたにメッセージを送信しました (%s)"
 
 #: ../finch/gntpounce.c:829 ../pidgin/gtkpounce.c:1471
+#, c-format
 msgid "Unknown pounce event. Please report this!"
 msgstr "不明な \"つかみ\" イベントです。ぜひバグ報告して下さい!"
 
@@ -1424,12 +1413,12 @@
 msgid "Based on keyboard use"
 msgstr "キーボードを操作し始めた時"
 
-#: ../finch/gntprefs.c:94 ../pidgin/gtkprefs.c:1932
+#: ../finch/gntprefs.c:94 ../pidgin/gtkprefs.c:1930
 msgid "From last sent message"
 msgstr "最後にメッセージを送信した後"
 
 #: ../finch/gntprefs.c:96 ../pidgin/gtkprefs.c:898 ../pidgin/gtkprefs.c:907
-#: ../pidgin/gtkprefs.c:1931 ../pidgin/gtkprefs.c:1945
+#: ../pidgin/gtkprefs.c:1929 ../pidgin/gtkprefs.c:1943
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:333
 msgid "Never"
 msgstr "しない"
@@ -1483,12 +1472,12 @@
 msgstr "次の状態に変更する(_S):"
 
 #. Conversations
-#: ../finch/gntprefs.c:259 ../pidgin/gtkprefs.c:993 ../pidgin/gtkprefs.c:2035
+#: ../finch/gntprefs.c:259 ../pidgin/gtkprefs.c:993 ../pidgin/gtkprefs.c:2033
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:340
 msgid "Conversations"
 msgstr "会話ウィンドウ"
 
-#: ../finch/gntprefs.c:260 ../pidgin/gtkprefs.c:1469 ../pidgin/gtkprefs.c:2046
+#: ../finch/gntprefs.c:260 ../pidgin/gtkprefs.c:1467 ../pidgin/gtkprefs.c:2044
 msgid "Logging"
 msgstr "ログの記録"
 
@@ -1554,8 +1543,8 @@
 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
+#: ../finch/gntsound.c:716 ../finch/gntsound.c:802 ../pidgin/gtkprefs.c:1587
+#: ../pidgin/gtkprefs.c:1676 ../pidgin/gtkprefs.c:1872
 msgid "(default)"
 msgstr "(デフォルト)"
 
@@ -1574,7 +1563,7 @@
 msgid "Profiles"
 msgstr "プロフィール"
 
-#: ../finch/gntsound.c:954 ../pidgin/gtkprefs.c:1719
+#: ../finch/gntsound.c:954 ../pidgin/gtkprefs.c:1717
 msgid "Automatic"
 msgstr "自動選択"
 
@@ -1583,7 +1572,7 @@
 msgid "Console Beep"
 msgstr "ビープ音"
 
-#: ../finch/gntsound.c:958 ../pidgin/gtkprefs.c:1723
+#: ../finch/gntsound.c:958 ../pidgin/gtkprefs.c:1721
 msgid "Command"
 msgstr "コマンド指定"
 
@@ -1592,7 +1581,7 @@
 msgid "No Sound"
 msgstr "サウンドなし"
 
-#: ../finch/gntsound.c:961 ../pidgin/gtkprefs.c:1714
+#: ../finch/gntsound.c:961 ../pidgin/gtkprefs.c:1712
 msgid "Sound Method"
 msgstr "サウンド出力の方法"
 
@@ -1611,7 +1600,7 @@
 "(ファイル名は %s で指定)"
 
 #. Sound options
-#: ../finch/gntsound.c:981 ../pidgin/gtkprefs.c:1758
+#: ../finch/gntsound.c:981 ../pidgin/gtkprefs.c:1756
 msgid "Sound Options"
 msgstr "サウンドのオプション"
 
@@ -1621,17 +1610,17 @@
 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/gtkprefs.c:1763 ../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
+#: ../finch/gntsound.c:991 ../pidgin/gtkprefs.c:1761
 msgid "Only when available"
 msgstr "在席している時だけ"
 
-#: ../finch/gntsound.c:992 ../pidgin/gtkprefs.c:1764
+#: ../finch/gntsound.c:992 ../pidgin/gtkprefs.c:1762
 msgid "Only when not available"
 msgstr "不在の時だけ"
 
@@ -1641,11 +1630,11 @@
 msgstr "音量:"
 
 #. Sound events
-#: ../finch/gntsound.c:1018 ../pidgin/gtkprefs.c:1800
+#: ../finch/gntsound.c:1018 ../pidgin/gtkprefs.c:1798
 msgid "Sound Events"
 msgstr "イベント毎のサウンド"
 
-#: ../finch/gntsound.c:1020 ../pidgin/gtkprefs.c:1859
+#: ../finch/gntsound.c:1020 ../pidgin/gtkprefs.c:1857
 msgid "Event"
 msgstr "イベント"
 
@@ -1654,15 +1643,15 @@
 msgid "File"
 msgstr "失敗しました"
 
-#: ../finch/gntsound.c:1039 ../pidgin/gtkprefs.c:1878
+#: ../finch/gntsound.c:1039 ../pidgin/gtkprefs.c:1876
 msgid "Test"
 msgstr "テスト"
 
-#: ../finch/gntsound.c:1042 ../pidgin/gtkprefs.c:1882
+#: ../finch/gntsound.c:1042 ../pidgin/gtkprefs.c:1880
 msgid "Reset"
 msgstr "リセット"
 
-#: ../finch/gntsound.c:1045 ../pidgin/gtkprefs.c:1886
+#: ../finch/gntsound.c:1045 ../pidgin/gtkprefs.c:1884
 msgid "Choose..."
 msgstr "選択..."
 
@@ -1682,7 +1671,7 @@
 #: ../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
+#: ../libpurple/protocols/novell/novell.c:1484
 #: ../pidgin/gtksavedstatuses.c:500
 msgid "Title"
 msgstr "題名"
@@ -1713,20 +1702,17 @@
 #: ../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/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:5554
+#: ../libpurple/protocols/oscar/oscar.c:5772
+#: ../libpurple/protocols/oscar/oscar.c:5786
+#: ../libpurple/protocols/oscar/oscar.c:5802
+#: ../libpurple/protocols/oscar/oscar.c:5809
+#: ../libpurple/protocols/oscar/oscar.c:5816
 #: ../libpurple/protocols/sametime/sametime.c:3286
 #: ../libpurple/protocols/sametime/sametime.c:3292
 #: ../libpurple/protocols/sametime/sametime.c:3298
@@ -1734,8 +1720,8 @@
 #: ../libpurple/protocols/silc/buddy.c:1551
 #: ../libpurple/protocols/silc10/buddy.c:1551
 #: ../libpurple/protocols/simple/simple.c:246
-#: ../libpurple/protocols/yahoo/yahoo.c:3750
-#: ../libpurple/protocols/yahoo/yahoo.c:3756
+#: ../libpurple/protocols/yahoo/yahoo.c:3751
+#: ../libpurple/protocols/yahoo/yahoo.c:3757
 #: ../libpurple/protocols/zephyr/zephyr.c:2337
 #: ../pidgin/gtksavedstatuses.c:526 ../pidgin/gtksavedstatuses.c:1010
 msgid "Message"
@@ -1791,7 +1777,7 @@
 msgid "Certificates"
 msgstr ""
 
-#: ../finch/gntui.c:89 ../pidgin/gtkprefs.c:2037
+#: ../finch/gntui.c:89 ../pidgin/gtkprefs.c:2035
 msgid "Sounds"
 msgstr "サウンド"
 
@@ -1896,16 +1882,16 @@
 msgid "Toaster plugin"
 msgstr "\"トースター\" プラグイン"
 
-#: ../finch/plugins/gnthistory.c:116 ../pidgin/plugins/history.c:123
+#: ../finch/plugins/gnthistory.c:116 ../pidgin/plugins/history.c:120
 #, 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:150
+#: ../finch/plugins/gnthistory.c:138 ../pidgin/plugins/history.c:147
 msgid "History Plugin Requires Logging"
 msgstr "ログ機能は \"履歴プラグイン\" で必要です"
 
-#: ../finch/plugins/gnthistory.c:139 ../pidgin/plugins/history.c:151
+#: ../finch/plugins/gnthistory.c:139 ../pidgin/plugins/history.c:148
 msgid ""
 "Logging can be enabled from Tools -> Preferences -> Logging.\n"
 "\n"
@@ -1921,11 +1907,11 @@
 msgid "GntHistory"
 msgstr "GntHistory"
 
-#: ../finch/plugins/gnthistory.c:181 ../pidgin/plugins/history.c:194
+#: ../finch/plugins/gnthistory.c:181 ../pidgin/plugins/history.c:190
 msgid "Shows recently logged conversations in new conversations."
 msgstr "新しい会話を始める時に最近ログに記録した会話を挿入します"
 
-#: ../finch/plugins/gnthistory.c:182 ../pidgin/plugins/history.c:195
+#: ../finch/plugins/gnthistory.c:182 ../pidgin/plugins/history.c:191
 msgid ""
 "When a new conversation is opened this plugin will insert the last "
 "conversation into the current conversation."
@@ -1935,15 +1921,16 @@
 msgid "Lastlog"
 msgstr "最後のログ"
 
-#: ../finch/plugins/lastlog.c:99
+#. Translator Note: The "backlog" is the conversation buffer/history.
+#: ../finch/plugins/lastlog.c:100
 msgid "lastlog: Searches for a substring in the backlog."
 msgstr "最後のログ: 過去のログにある部分文字列を検索します"
 
-#: ../finch/plugins/lastlog.c:121
+#: ../finch/plugins/lastlog.c:122
 msgid "GntLastlog"
 msgstr "GntLastlog"
 
-#: ../finch/plugins/lastlog.c:123 ../finch/plugins/lastlog.c:124
+#: ../finch/plugins/lastlog.c:124 ../finch/plugins/lastlog.c:125
 msgid "Lastlog plugin."
 msgstr "Lastlog のプラグインです"
 
@@ -1975,7 +1962,7 @@
 msgstr "プロトコル %s のプラグインがありません"
 
 #: ../libpurple/account.c:1041 ../libpurple/connection.c:108
-#: ../pidgin/gtkblist.c:4318
+#: ../pidgin/gtkblist.c:4036
 msgid "Connection Error"
 msgstr "接続エラー"
 
@@ -2020,16 +2007,16 @@
 
 #: ../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/jabber/buddy.c:2027
+#: ../libpurple/protocols/jabber/buddy.c:2044
+#: ../libpurple/protocols/novell/novell.c:2831
 #: ../libpurple/protocols/qq/qq.c:232 ../pidgin/gtkft.c:160
 msgid "Unknown"
 msgstr "不明"
 
-#: ../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
+#: ../libpurple/blist.c:521 ../libpurple/blist.c:1320
+#: ../libpurple/blist.c:1552 ../libpurple/protocols/jabber/roster.c:69
+#: ../libpurple/protocols/myspace/myspace.c:3244 ../pidgin/gtkblist.c:5373
 #: ../pidgin/plugins/gevolution/gevo-util.c:67
 #: ../pidgin/plugins/gevolution/gevolution.c:96
 msgid "Buddies"
@@ -2168,7 +2155,7 @@
 msgstr ""
 
 #. Make messages
-#: ../libpurple/certificate.c:1882
+#: ../libpurple/certificate.c:1881
 #, c-format
 msgid ""
 "Common name: %s\n"
@@ -2180,7 +2167,7 @@
 msgstr ""
 
 #. TODO: Find what the handle ought to be
-#: ../libpurple/certificate.c:1891
+#: ../libpurple/certificate.c:1890
 #, fuzzy
 msgid "Certificate Information"
 msgstr "サーバの情報"
@@ -2205,9 +2192,9 @@
 msgstr "+++ %s さんがサイン・アウトしました"
 
 #: ../libpurple/connection.c:497 ../libpurple/plugin.c:282
-#: ../libpurple/protocols/jabber/buddy.c:2340
+#: ../libpurple/protocols/jabber/buddy.c:2337
 #: ../libpurple/protocols/msn/servconn.c:141
-#: ../libpurple/protocols/msn/session.c:361
+#: ../libpurple/protocols/msn/session.c:322
 msgid "Unknown error"
 msgstr "原因不明のエラー"
 
@@ -2323,6 +2310,7 @@
 "%s"
 
 #: ../libpurple/dnsquery.c:578
+#, c-format
 msgid "EOF while reading from resolver process"
 msgstr "レゾルバ・プロセスから読み込んでいる際に EOF"
 
@@ -2431,6 +2419,7 @@
 msgstr "ファイル %s の転送が完了しました"
 
 #: ../libpurple/ft.c:685
+#, c-format
 msgid "File transfer complete"
 msgstr "ファイルの転送が完了しました"
 
@@ -2440,6 +2429,7 @@
 msgstr "%s の転送をキャンセルしました"
 
 #: ../libpurple/ft.c:1108
+#, c-format
 msgid "File transfer cancelled"
 msgstr "ファイルの転送がキャンセルされました"
 
@@ -2700,6 +2690,7 @@
 msgstr "%s を使用していますが、このプラグインには %s が必要です。"
 
 #: ../libpurple/plugin.c:380
+#, c-format
 msgid "This plugin has not defined an ID."
 msgstr "このプラグインは ID を定義していません。"
 
@@ -2781,13 +2772,13 @@
 #: ../libpurple/plugins/autoaccept.c:165 ../libpurple/plugins/idle.c:170
 #: ../libpurple/plugins/idle.c:204 ../libpurple/plugins/idle.c:230
 #: ../libpurple/protocols/oscar/oscar.c: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
+#: ../libpurple/protocols/oscar/oscar.c:2233
+#: ../libpurple/protocols/oscar/oscar.c:2282
+#: ../libpurple/protocols/oscar/oscar.c:5886
+#: ../libpurple/protocols/oscar/oscar.c:5941
+#: ../libpurple/protocols/oscar/oscar.c:6167
+#: ../libpurple/protocols/oscar/oscar.c:6237 ../libpurple/request.h:1388
+#: ../libpurple/request.h:1398
 msgid "_Cancel"
 msgstr "キャンセル(_C)"
 
@@ -2828,8 +2819,8 @@
 "自動受け入れによるファイルの転送が完了したらポップアップで知らせる\n"
 "(ファイルを送信した側と会話が無い場合にのみ)"
 
-#: ../libpurple/plugins/buddynote.c:46 ../libpurple/protocols/msn/msn.c:1770
-#: ../libpurple/protocols/msn/msn.c:1800
+#: ../libpurple/plugins/buddynote.c:46 ../libpurple/protocols/msn/msn.c:1660
+#: ../libpurple/protocols/msn/msn.c:1690
 msgid "Notes"
 msgstr "備考"
 
@@ -3266,9 +3257,9 @@
 msgstr "\"仲間をつかむ\" ダイアログで編集や削除が行えます。"
 
 #: ../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/msn/dialog.c:133
+#: ../libpurple/protocols/msn/msn.c:550 ../libpurple/protocols/msn/msn.c:560
+#: ../libpurple/protocols/novell/novell.c:1917
 #: ../libpurple/protocols/silc/buddy.c:317
 #: ../libpurple/protocols/silc/pk.c:113 ../libpurple/protocols/silc/wb.c:304
 #: ../libpurple/protocols/silc10/buddy.c:314
@@ -3278,9 +3269,9 @@
 msgstr "はい"
 
 #: ../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/msn/dialog.c:134
+#: ../libpurple/protocols/msn/msn.c:550 ../libpurple/protocols/msn/msn.c:560
+#: ../libpurple/protocols/novell/novell.c:1918
 #: ../libpurple/protocols/silc/buddy.c:318
 #: ../libpurple/protocols/silc/pk.c:114 ../libpurple/protocols/silc/wb.c:305
 #: ../libpurple/protocols/silc10/buddy.c:315
@@ -3388,7 +3379,7 @@
 msgstr "主要な機能が動作しているかどうかテストします"
 
 #. Scheme name
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:903
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:902
 #: ../libpurple/plugins/ssl/ssl-nss.c:725
 msgid "X.509 Certificates"
 msgstr ""
@@ -3399,7 +3390,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:987
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:986
 msgid "GNUTLS"
 msgstr "GNUTLS"
 
@@ -3407,8 +3398,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:990
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:992
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:989
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:991
 msgid "Provides SSL support through GNUTLS."
 msgstr "GNUTLS を介した SSL 機能を提供します"
 
@@ -3513,15 +3504,15 @@
 "会話の相手が離席したり、待機中から復帰もしくは在席していたら会話ウィンドウに"
 "通知します"
 
-#: ../libpurple/plugins/tcl/tcl.c:423
+#: ../libpurple/plugins/tcl/tcl.c:421
 msgid "Tcl Plugin Loader"
 msgstr "Tcl プラグイン・ローダ"
 
-#: ../libpurple/plugins/tcl/tcl.c:425 ../libpurple/plugins/tcl/tcl.c:426
+#: ../libpurple/plugins/tcl/tcl.c:423 ../libpurple/plugins/tcl/tcl.c:424
 msgid "Provides support for loading Tcl plugins"
 msgstr "Tcl プラグインを読み込む機能を提供します"
 
-#: ../libpurple/plugins/tcl/tcl.c:509
+#: ../libpurple/plugins/tcl/tcl.c:507
 msgid ""
 "Unable to detect ActiveTCL installation. If you wish to use TCL plugins, "
 "install ActiveTCL from http://www.activestate.com\n"
@@ -3561,7 +3552,7 @@
 #: ../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/jabber/buddy.c:2216
 #: ../libpurple/protocols/silc/ops.c:1041
 #: ../libpurple/protocols/silc/util.c:555
 #: ../libpurple/protocols/silc10/ops.c:1075
@@ -3742,8 +3733,8 @@
 #: ../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/oscar/oscar.c:3789
+#: ../libpurple/protocols/oscar/oscar.c:3802
 #: ../libpurple/protocols/qq/buddy_info.c:49
 msgid "City"
 msgstr "町"
@@ -3752,9 +3743,9 @@
 msgid "Year of birth"
 msgstr "誕生年"
 
-#: ../libpurple/protocols/gg/gg.c:650 ../libpurple/protocols/msn/msn.c:1699
+#: ../libpurple/protocols/gg/gg.c:650 ../libpurple/protocols/msn/msn.c:1589
 #: ../libpurple/protocols/myspace/user.c:115
-#: ../libpurple/protocols/oscar/oscar.c:3728
+#: ../libpurple/protocols/oscar/oscar.c:3732
 #: ../libpurple/protocols/qq/buddy_info.c:46
 #: ../libpurple/protocols/qq/qq.c:226 ../libpurple/protocols/qq/qq.c:229
 #: ../libpurple/protocols/qq/qq.c:232 ../libpurple/protocols/qq/qq.c:236
@@ -3767,14 +3758,14 @@
 msgstr "男/女"
 
 #: ../libpurple/protocols/gg/gg.c:652
-#: ../libpurple/protocols/oscar/oscar.c:3728
+#: ../libpurple/protocols/oscar/oscar.c:3732
 #: ../libpurple/protocols/qq/buddy_info.c:83
 #: ../libpurple/protocols/qq/qq.c:226
 msgid "Male"
 msgstr "男性"
 
 #: ../libpurple/protocols/gg/gg.c:653
-#: ../libpurple/protocols/oscar/oscar.c:3728
+#: ../libpurple/protocols/oscar/oscar.c:3732
 #: ../libpurple/protocols/qq/buddy_info.c:84
 #: ../libpurple/protocols/qq/qq.c:229
 msgid "Female"
@@ -3834,25 +3825,25 @@
 msgstr "チャットの追加..."
 
 #: ../libpurple/protocols/gg/gg.c:1008
-#: ../libpurple/protocols/jabber/buddy.c:2034
-#: ../libpurple/protocols/novell/novell.c:2833
+#: ../libpurple/protocols/jabber/buddy.c:2031
+#: ../libpurple/protocols/novell/novell.c:2828
 #: ../libpurple/protocols/oscar/oscar.c:828
-#: ../libpurple/protocols/oscar/oscar.c:5602
+#: ../libpurple/protocols/oscar/oscar.c:5604
 #: ../libpurple/protocols/qq/qq.c:170 ../libpurple/protocols/qq/qq.c:177
 #: ../libpurple/protocols/qq/qq.c:292
-#: ../libpurple/protocols/yahoo/yahoo.c:3098 ../libpurple/status.c:154
-#: ../pidgin/gtkblist.c:3302 ../pidgin/gtkblist.c:3640
+#: ../libpurple/protocols/yahoo/yahoo.c:3099 ../libpurple/status.c:154
+#: ../pidgin/gtkblist.c:3104 ../pidgin/gtkblist.c:3436
 #: ../pidgin/gtkdocklet.c:450 ../pidgin/gtkstatusbox.c:1061
 msgid "Offline"
 msgstr "オフライン"
 
 #: ../libpurple/protocols/gg/gg.c:1011
-#: ../libpurple/protocols/jabber/buddy.c:2036
+#: ../libpurple/protocols/jabber/buddy.c:2033
 #: ../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:2821
+#: ../libpurple/protocols/novell/novell.c:2816
 #: ../libpurple/protocols/qq/qq.c:280
-#: ../libpurple/protocols/yahoo/yahoo.c:3100 ../libpurple/status.c:155
+#: ../libpurple/protocols/yahoo/yahoo.c:3101 ../libpurple/status.c:155
 #: ../pidgin/gtkdocklet.c:438 ../pidgin/gtkstatusbox.c:1057
 msgid "Available"
 msgstr "在席しています"
@@ -3862,31 +3853,32 @@
 #. 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/jabber/buddy.c:2037
+#: ../libpurple/protocols/novell/novell.c:2819
 #: ../libpurple/protocols/oscar/oscar.c:733
-#: ../libpurple/protocols/oscar/oscar.c:4543
-#: ../libpurple/protocols/oscar/oscar.c:5630
+#: ../libpurple/protocols/oscar/oscar.c:4547
+#: ../libpurple/protocols/oscar/oscar.c:5632
 #: ../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
+#: ../libpurple/protocols/yahoo/yahoo.c:3653
+#: ../libpurple/protocols/yahoo/yahoo.c:3727 ../libpurple/status.c:158
+#: ../pidgin/gtkdocklet.c:442 ../pidgin/gtkprefs.c:1939
 #: ../pidgin/gtkstatusbox.c:1058
+#, c-format
 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
+#: ../libpurple/protocols/oscar/oscar.c:2699
+#: ../libpurple/protocols/oscar/oscar.c:3699
 msgid "UIN"
 msgstr "UIN"
 
 #: ../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/jabber/buddy.c:2210
+#: ../libpurple/protocols/jabber/buddy.c:2386
+#: ../libpurple/protocols/oscar/oscar.c:3710
 #: ../libpurple/protocols/silc/ops.c:990
 #: ../libpurple/protocols/silc10/ops.c:1024
 msgid "First Name"
@@ -3897,7 +3889,7 @@
 msgstr "誕生年"
 
 #: ../libpurple/protocols/gg/gg.c:1111 ../libpurple/protocols/gg/gg.c:1180
-#: ../libpurple/protocols/oscar/oscar.c:3907
+#: ../libpurple/protocols/oscar/oscar.c:3911
 msgid "Unable to display the search results."
 msgstr "検索結果を表示できません"
 
@@ -3941,7 +3933,7 @@
 msgid "Connection failed."
 msgstr "接続に失敗しました"
 
-#: ../libpurple/protocols/gg/gg.c:1621 ../libpurple/protocols/msn/msn.c:621
+#: ../libpurple/protocols/gg/gg.c:1621 ../libpurple/protocols/msn/msn.c:559
 msgid "Blocked"
 msgstr "拒否しているか"
 
@@ -4079,7 +4071,7 @@
 
 #: ../libpurple/protocols/irc/irc.c:127 ../libpurple/protocols/irc/irc.c:165
 #: ../libpurple/protocols/irc/irc.c:612 ../libpurple/protocols/irc/irc.c:637
-#: ../libpurple/protocols/myspace/myspace.c:2354
+#: ../libpurple/protocols/myspace/myspace.c:2356
 msgid "Server has disconnected"
 msgstr "サーバが接続を切りました"
 
@@ -4105,14 +4097,14 @@
 #. connect to the server
 #: ../libpurple/protocols/irc/irc.c:319
 #: ../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/msn/session.c:345
+#: ../libpurple/protocols/myspace/myspace.c:301
+#: ../libpurple/protocols/novell/novell.c:2182
 #: ../libpurple/protocols/oscar/oscar.c:1287
 #: ../libpurple/protocols/qq/qq.c:136
 #: ../libpurple/protocols/sametime/sametime.c:3723
-#: ../libpurple/protocols/simple/simple.c:1718
-#: ../libpurple/protocols/yahoo/yahoo.c:2938
+#: ../libpurple/protocols/simple/simple.c:1716
+#: ../libpurple/protocols/yahoo/yahoo.c:2939
 #: ../libpurple/protocols/zephyr/zephyr.c:1621 ../pidgin/gtkstatusbox.c:662
 msgid "Connecting"
 msgstr "接続中です"
@@ -4126,20 +4118,20 @@
 #. 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/myspace/myspace.c:317
 #: ../libpurple/protocols/simple/simple.c:464
-#: ../libpurple/protocols/simple/simple.c:1633
+#: ../libpurple/protocols/simple/simple.c:1631
 msgid "Couldn't create socket"
 msgstr "ソケットを生成できませんでした"
 
 #: ../libpurple/protocols/irc/irc.c:421
-#: ../libpurple/protocols/myspace/myspace.c:2467
+#: ../libpurple/protocols/myspace/myspace.c:2469
 #: ../libpurple/protocols/oscar/oscar.c:1283
 msgid "Couldn't connect to host"
 msgstr "ホストへ接続できませんでした"
 
 #: ../libpurple/protocols/irc/irc.c:609 ../libpurple/protocols/irc/irc.c:634
-#: ../libpurple/protocols/myspace/myspace.c:2350
+#: ../libpurple/protocols/myspace/myspace.c:2352
 msgid "Read error"
 msgstr "読み込みエラーです"
 
@@ -4179,22 +4171,22 @@
 
 #. host to connect to
 #: ../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/msn/msn.c:2185
+#: ../libpurple/protocols/oscar/oscar.c:6671
 #: ../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:1898
+#: ../libpurple/protocols/simple/simple.c:1896
 #: ../libpurple/protocols/toc/toc.c:2327
 msgid "Server"
 msgstr "サーバ"
 
 #. port to connect to
-#: ../libpurple/protocols/irc/irc.c:943 ../libpurple/protocols/msn/msn.c:2302
-#: ../libpurple/protocols/oscar/oscar.c:6672
+#: ../libpurple/protocols/irc/irc.c:943 ../libpurple/protocols/msn/msn.c:2190
+#: ../libpurple/protocols/oscar/oscar.c:6674
 #: ../libpurple/protocols/qq/qq.c:758
 #: ../libpurple/protocols/sametime/sametime.c:5732
 #: ../libpurple/protocols/silc/silc.c:1918
@@ -4266,7 +4258,7 @@
 msgstr " <i>(identified)</i>"
 
 #: ../libpurple/protocols/irc/msgs.c:303
-#: ../libpurple/protocols/oscar/oscar.c:3696
+#: ../libpurple/protocols/oscar/oscar.c:3700
 #: ../libpurple/protocols/silc/ops.c:1418
 #: ../libpurple/protocols/silc10/ops.c:1414
 msgid "Nick"
@@ -4549,7 +4541,7 @@
 msgstr "names [チャンネル]:  チャンネルに現在いるユーザを一覧表示します"
 
 #: ../libpurple/protocols/irc/parse.c:137
-#: ../libpurple/protocols/jabber/jabber.c:2299
+#: ../libpurple/protocols/jabber/jabber.c:2261
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr "nick &lt;新しいあだ名&gt;:  あだ名を変更します"
 
@@ -4690,7 +4682,7 @@
 msgid "Ad-Hoc Command Failed"
 msgstr "コマンドが無効です"
 
-#: ../libpurple/protocols/jabber/adhoccommands.c:176
+#: ../libpurple/protocols/jabber/adhoccommands.c:173
 #, fuzzy
 msgid "execute"
 msgstr "予想していないデータ"
@@ -4838,15 +4830,15 @@
 
 #: ../libpurple/protocols/jabber/buddy.c:300
 #: ../libpurple/protocols/jabber/buddy.c:1250
-#: ../libpurple/protocols/msn/msn.c:1768
-#: ../libpurple/protocols/oscar/oscar.c:3745
+#: ../libpurple/protocols/msn/msn.c:1658
+#: ../libpurple/protocols/oscar/oscar.c:3749
 msgid "Birthday"
 msgstr "誕生日"
 
 #: ../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
+#: ../libpurple/protocols/jabber/usermood.c:175 ../pidgin/gtkblist.c:3116
 #: ../pidgin/gtkprefs.c:739
 msgid "Description"
 msgstr "説明"
@@ -5160,7 +5152,7 @@
 
 #: ../libpurple/protocols/jabber/buddy.c:921
 #: ../libpurple/protocols/jabber/buddy.c:1081
-#: ../libpurple/protocols/oscar/oscar.c:2902
+#: ../libpurple/protocols/oscar/oscar.c:2906
 msgid "Capabilities"
 msgstr "機能"
 
@@ -5187,8 +5179,8 @@
 
 #: ../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/oscar/oscar.c:3788
+#: ../libpurple/protocols/oscar/oscar.c:3801
 #: ../libpurple/protocols/qq/buddy_info.c:56
 #: ../libpurple/protocols/silc/ops.c:1030
 #: ../libpurple/protocols/silc10/ops.c:1064
@@ -5207,73 +5199,74 @@
 msgid "Logo"
 msgstr "ロゴ"
 
-#: ../libpurple/protocols/jabber/buddy.c:1945
+#: ../libpurple/protocols/jabber/buddy.c:1942
 msgid "Un-hide From"
 msgstr "ここからは隠さない"
 
-#: ../libpurple/protocols/jabber/buddy.c:1949
+#: ../libpurple/protocols/jabber/buddy.c:1946
 msgid "Temporarily Hide From"
 msgstr "一時的にここから隠す"
 
 #. && NOT ME
-#: ../libpurple/protocols/jabber/buddy.c:1957
+#: ../libpurple/protocols/jabber/buddy.c:1954
 msgid "Cancel Presence Notification"
 msgstr "存在通知をやめる"
 
-#: ../libpurple/protocols/jabber/buddy.c:1964
+#: ../libpurple/protocols/jabber/buddy.c:1961
 msgid "(Re-)Request authorization"
 msgstr "承認の (再) 要求"
 
 #. if(NOT ME)
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
-#: ../libpurple/protocols/jabber/buddy.c:1973
+#: ../libpurple/protocols/jabber/buddy.c:1970
 msgid "Unsubscribe"
 msgstr "購読の取り消し"
 
-#: ../libpurple/protocols/jabber/buddy.c:1988
+#: ../libpurple/protocols/jabber/buddy.c:1985
 #, fuzzy
 msgid "Log In"
 msgstr "既にログインしています"
 
-#: ../libpurple/protocols/jabber/buddy.c:1992
+#: ../libpurple/protocols/jabber/buddy.c:1989
 #, fuzzy
 msgid "Log Out"
 msgstr "チャットをログに記録する"
 
-#: ../libpurple/protocols/jabber/buddy.c:2038
+#: ../libpurple/protocols/jabber/buddy.c:2035
 #: ../libpurple/protocols/jabber/jabber.c:1553
 msgid "Chatty"
 msgstr "チャッティー"
 
-#: ../libpurple/protocols/jabber/buddy.c:2042
+#: ../libpurple/protocols/jabber/buddy.c:2039
 msgid "Extended Away"
 msgstr "逃走中"
 
-#: ../libpurple/protocols/jabber/buddy.c:2044
+#: ../libpurple/protocols/jabber/buddy.c:2041
 #: ../libpurple/protocols/jabber/jabber.c:1622
 #: ../libpurple/protocols/oscar/oscar.c:727
-#: ../libpurple/protocols/oscar/oscar.c:5806
+#: ../libpurple/protocols/oscar/oscar.c:5808
 #: ../libpurple/protocols/sametime/sametime.c:3297
+#, c-format
 msgid "Do Not Disturb"
 msgstr "邪魔しないでね"
 
-#: ../libpurple/protocols/jabber/buddy.c:2211
+#: ../libpurple/protocols/jabber/buddy.c:2208
 msgid "JID"
 msgstr "JID"
 
-#: ../libpurple/protocols/jabber/buddy.c:2215
-#: ../libpurple/protocols/jabber/buddy.c:2394
-#: ../libpurple/protocols/oscar/oscar.c:3707
+#: ../libpurple/protocols/jabber/buddy.c:2212
+#: ../libpurple/protocols/jabber/buddy.c:2391
+#: ../libpurple/protocols/oscar/oscar.c:3711
 msgid "Last Name"
 msgstr "姓"
 
-#: ../libpurple/protocols/jabber/buddy.c:2247
+#: ../libpurple/protocols/jabber/buddy.c:2244
 msgid "The following are the results of your search"
 msgstr "検索結果です"
 
 #. current comment from Jabber User Directory users.jabber.org
-#: ../libpurple/protocols/jabber/buddy.c:2322
+#: ../libpurple/protocols/jabber/buddy.c:2319
 msgid ""
 "Find a contact by entering the search criteria in the given fields. Note: "
 "Each field supports wild card searches (%)"
@@ -5281,39 +5274,39 @@
 "指定した項目に対する検索条件を入力してコンタクトを検索します。注意: 各項目は"
 "ワイルドカードを使った検索 (%) をサポートしています。"
 
-#: ../libpurple/protocols/jabber/buddy.c:2342
+#: ../libpurple/protocols/jabber/buddy.c:2339
 msgid "Directory Query Failed"
 msgstr "ディレクトリの検索に失敗しました"
 
-#: ../libpurple/protocols/jabber/buddy.c:2343
+#: ../libpurple/protocols/jabber/buddy.c:2340
 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:2377
+#: ../libpurple/protocols/jabber/buddy.c:2374
 #, c-format
 msgid "Server Instructions: %s"
 msgstr "サーバの情報: %s"
 
-#: ../libpurple/protocols/jabber/buddy.c:2384
+#: ../libpurple/protocols/jabber/buddy.c:2381
 msgid "Fill in one or more fields to search for any matching XMPP users."
 msgstr "XMPP ユーザを検索するには一つ以上の欄を埋めて下さい:"
 
-#: ../libpurple/protocols/jabber/buddy.c:2404
-#: ../libpurple/protocols/novell/novell.c:1490
-#: ../libpurple/protocols/oscar/oscar.c:3710
-#: ../libpurple/protocols/oscar/oscar.c:3719
+#: ../libpurple/protocols/jabber/buddy.c:2401
+#: ../libpurple/protocols/novell/novell.c:1488
+#: ../libpurple/protocols/oscar/oscar.c:3714
+#: ../libpurple/protocols/oscar/oscar.c:3723
 msgid "E-Mail Address"
 msgstr "E-メール・アドレス"
 
-#: ../libpurple/protocols/jabber/buddy.c:2413
-#: ../libpurple/protocols/jabber/buddy.c:2414
+#: ../libpurple/protocols/jabber/buddy.c:2410
+#: ../libpurple/protocols/jabber/buddy.c:2411
 msgid "Search for XMPP users"
 msgstr "XMPP ユーザの検索"
 
 #. "Search"
-#: ../libpurple/protocols/jabber/buddy.c:2415
+#: ../libpurple/protocols/jabber/buddy.c:2412
 #: ../libpurple/protocols/qq/group.c:123
 #: ../libpurple/protocols/qq/group_im.c:147
 #: ../libpurple/protocols/qq/sys_msg.c:174
@@ -5325,24 +5318,24 @@
 msgid "Search"
 msgstr "検索"
 
-#: ../libpurple/protocols/jabber/buddy.c:2430
+#: ../libpurple/protocols/jabber/buddy.c:2427
 msgid "Invalid Directory"
 msgstr "ディレクトリが間違っています"
 
-#: ../libpurple/protocols/jabber/buddy.c:2447
+#: ../libpurple/protocols/jabber/buddy.c:2444
 msgid "Enter a User Directory"
 msgstr "ユーザ・ディレクトリを入力して下さい"
 
-#: ../libpurple/protocols/jabber/buddy.c:2448
+#: ../libpurple/protocols/jabber/buddy.c:2445
 msgid "Select a user directory to search"
 msgstr "検索するユーザ・ディレクトリの選択"
 
-#: ../libpurple/protocols/jabber/buddy.c:2451
+#: ../libpurple/protocols/jabber/buddy.c:2448
 msgid "Search Directory"
 msgstr "検索するディレクトリ"
 
 #: ../libpurple/protocols/jabber/chat.c:41
-#: ../libpurple/protocols/oscar/oscar.c:5290
+#: ../libpurple/protocols/oscar/oscar.c:5294
 #: ../libpurple/protocols/yahoo/yahoochat.c:1048
 msgid "_Room:"
 msgstr "ルーム(_R):"
@@ -5453,9 +5446,9 @@
 msgstr "読み込みエラー"
 
 #: ../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
+#: ../libpurple/protocols/oscar/flap_connection.c:394
+#: ../libpurple/protocols/yahoo/yahoo.c:2558
+#: ../libpurple/protocols/yahoo/yahoo.c:2590
 #, c-format
 msgid ""
 "Could not establish a connection with the server:\n"
@@ -5520,8 +5513,8 @@
 msgstr "既に登録されています"
 
 #: ../libpurple/protocols/jabber/jabber.c:962
-#: ../libpurple/protocols/oscar/oscar.c:3786
-#: ../libpurple/protocols/oscar/oscar.c:3799
+#: ../libpurple/protocols/oscar/oscar.c:3790
+#: ../libpurple/protocols/oscar/oscar.c:3803
 msgid "State"
 msgstr "州"
 
@@ -5605,7 +5598,7 @@
 msgstr "ストリームの初期化中"
 
 #: ../libpurple/protocols/jabber/jabber.c:1293
-#: ../libpurple/protocols/msn/session.c:390
+#: ../libpurple/protocols/msn/session.c:351
 msgid "Authenticating"
 msgstr "認証中"
 
@@ -5618,7 +5611,7 @@
 #: ../libpurple/protocols/jabber/jabber.c:1909
 #: ../libpurple/protocols/jabber/jabber.c:1945
 #: ../libpurple/protocols/oscar/oscar.c:826
-#: ../libpurple/protocols/oscar/oscar.c:5600
+#: ../libpurple/protocols/oscar/oscar.c:5602
 msgid "Not Authorized"
 msgstr "承認されていません"
 
@@ -5787,7 +5780,7 @@
 msgstr "新しいパスワードを入力して下さい"
 
 #: ../libpurple/protocols/jabber/jabber.c:1749
-#: ../libpurple/protocols/oscar/oscar.c:6386
+#: ../libpurple/protocols/oscar/oscar.c:6388
 #: ../libpurple/protocols/silc/silc.c:1093
 #: ../libpurple/protocols/silc10/silc.c:1004
 msgid "Set User Info..."
@@ -5795,7 +5788,7 @@
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
 #: ../libpurple/protocols/jabber/jabber.c:1754
-#: ../libpurple/protocols/oscar/oscar.c:6397
+#: ../libpurple/protocols/oscar/oscar.c:6399
 #: ../libpurple/protocols/silc/silc.c:1089
 #: ../libpurple/protocols/silc10/silc.c:1000
 msgid "Change Password..."
@@ -6058,51 +6051,33 @@
 "%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
+#: ../libpurple/protocols/jabber/jabber.c:2253
 msgid "config:  Configure a chat room."
 msgstr "config:  チャット・ルームを設定します"
 
-#: ../libpurple/protocols/jabber/jabber.c:2295
+#: ../libpurple/protocols/jabber/jabber.c:2257
 msgid "configure:  Configure a chat room."
 msgstr "configure:  チャット・ルームを設定します"
 
-#: ../libpurple/protocols/jabber/jabber.c:2304
+#: ../libpurple/protocols/jabber/jabber.c:2266
 msgid "part [room]:  Leave the room."
 msgstr "part [部屋]:  部屋から退出します"
 
-#: ../libpurple/protocols/jabber/jabber.c:2309
+#: ../libpurple/protocols/jabber/jabber.c:2271
 msgid "register:  Register with a chat room."
 msgstr "register:  チャット・ルームを登録します"
 
-#: ../libpurple/protocols/jabber/jabber.c:2315
+#: ../libpurple/protocols/jabber/jabber.c:2277
 msgid "topic [new topic]:  View or change the topic."
 msgstr "topic [新しいトピック]:  トピックを表示したり変更します"
 
-#: ../libpurple/protocols/jabber/jabber.c:2321
+#: ../libpurple/protocols/jabber/jabber.c:2283
 msgid "ban &lt;user&gt; [room]:  Ban a user from the room."
 msgstr ""
 "ban &lt;ユーザ&gt; [ルーム]:  指定したチャット・ルームからユーザを追い出しま"
 "す"
 
-#: ../libpurple/protocols/jabber/jabber.c:2327
+#: ../libpurple/protocols/jabber/jabber.c:2289
 msgid ""
 "affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
 "affiliation with the room."
@@ -6110,7 +6085,7 @@
 "affiliate &lt;ユーザ&gt; &lt;owner|admin|member|outcast|none&gt;: ユーザの関"
 "係をセットします"
 
-#: ../libpurple/protocols/jabber/jabber.c:2333
+#: ../libpurple/protocols/jabber/jabber.c:2295
 msgid ""
 "role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
 "role in the room."
@@ -6118,33 +6093,33 @@
 "role &lt;ユーザ&gt; &lt;moderator|participant|visitor|none&gt;: チャトルーム"
 "での役割をセットします"
 
-#: ../libpurple/protocols/jabber/jabber.c:2339
+#: ../libpurple/protocols/jabber/jabber.c:2301
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
 msgstr "invite &lt;ユーザ&gt; [メッセージ]:  ユーザをルームに招待します"
 
-#: ../libpurple/protocols/jabber/jabber.c:2345
+#: ../libpurple/protocols/jabber/jabber.c:2307
 msgid "join: &lt;room&gt; [server]:  Join a chat on this server."
 msgstr "join: &lt;ルーム&gt; [サーバ]:  指定したサーバのチャットへ参加します"
 
-#: ../libpurple/protocols/jabber/jabber.c:2351
+#: ../libpurple/protocols/jabber/jabber.c:2313
 msgid "kick &lt;user&gt; [room]:  Kick a user from the room."
 msgstr ""
 "kick &lt;ユーザ&gt; [ルーム]:  指定したユーザをチャット・ルームから追い出しま"
 "す"
 
-#: ../libpurple/protocols/jabber/jabber.c:2356
+#: ../libpurple/protocols/jabber/jabber.c:2318
 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
+#: ../libpurple/protocols/jabber/jabber.c:2324
 msgid "ping &lt;jid&gt;:\tPing a user/component/server."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2367
-#: ../libpurple/protocols/yahoo/yahoo.c:4144
+#: ../libpurple/protocols/jabber/jabber.c:2329
+#: ../libpurple/protocols/yahoo/yahoo.c:4145
 msgid "buzz: Buzz a user to get their attention"
 msgstr "buzz: ユーザ宛に警告音を鳴らす"
 
@@ -6181,8 +6156,8 @@
 msgstr "暗号化されていないストリームを介したプレーンテキスト認証を許可する"
 
 #: ../libpurple/protocols/jabber/libxmpp.c:224
-#: ../libpurple/protocols/myspace/myspace.c:3275
-#: ../libpurple/protocols/simple/simple.c:1904
+#: ../libpurple/protocols/myspace/myspace.c:3277
+#: ../libpurple/protocols/simple/simple.c:1902
 msgid "Connect port"
 msgstr "接続するポート番号"
 
@@ -6190,7 +6165,7 @@
 #. * able to set the first port to try (like LastConnectedPort in Windows client).
 #. Account options
 #: ../libpurple/protocols/jabber/libxmpp.c:228
-#: ../libpurple/protocols/myspace/myspace.c:3272
+#: ../libpurple/protocols/myspace/myspace.c:3274
 #: ../libpurple/protocols/silc/silc.c:1914
 #: ../libpurple/protocols/silc10/silc.c:1857 ../pidgin/gtkaccount.c:837
 msgid "Connect server"
@@ -6225,6 +6200,12 @@
 msgid "XMPP Message Error"
 msgstr "XMPP メッセージ・エラー"
 
+#: ../libpurple/protocols/jabber/message.c:307
+#: ../libpurple/protocols/yahoo/yahoo.c:4120
+#, fuzzy, c-format
+msgid "%s has buzzed you!"
+msgstr "%s さんがあなた [%s] を追加しました"
+
 #: ../libpurple/protocols/jabber/message.c:407
 #, c-format
 msgid " (Code %s)"
@@ -6234,16 +6215,16 @@
 msgid "XML Parse error"
 msgstr "XML 解析エラー"
 
-#: ../libpurple/protocols/jabber/presence.c:422
+#: ../libpurple/protocols/jabber/presence.c:427
 msgid "Unknown Error in presence"
 msgstr "不明なエラーが起きています"
 
-#: ../libpurple/protocols/jabber/presence.c:503
-#: ../libpurple/protocols/jabber/presence.c:504
+#: ../libpurple/protocols/jabber/presence.c:508
+#: ../libpurple/protocols/jabber/presence.c:509
 msgid "Create New Room"
 msgstr "新しいチャット・ルームの生成"
 
-#: ../libpurple/protocols/jabber/presence.c:505
+#: ../libpurple/protocols/jabber/presence.c:510
 msgid ""
 "You are creating a new room.  Would you like to configure it, or accept the "
 "default settings?"
@@ -6251,20 +6232,20 @@
 "新しいチャット・ルームを生成します。チャット・ルームの設定を行いますか? それ"
 "ともデフォルト値を適用しますか?"
 
-#: ../libpurple/protocols/jabber/presence.c:511
+#: ../libpurple/protocols/jabber/presence.c:516
 msgid "_Configure Room"
 msgstr "ルームの設定(_C)"
 
-#: ../libpurple/protocols/jabber/presence.c:512
+#: ../libpurple/protocols/jabber/presence.c:517
 msgid "_Accept Defaults"
 msgstr "デフォルト値を適用する(_A)"
 
-#: ../libpurple/protocols/jabber/presence.c:554
+#: ../libpurple/protocols/jabber/presence.c:559
 #, c-format
 msgid "Error in chat %s"
 msgstr "チャット %s でエラー"
 
-#: ../libpurple/protocols/jabber/presence.c:558
+#: ../libpurple/protocols/jabber/presence.c:563
 #, c-format
 msgid "Error joining chat %s"
 msgstr "チャット %s に参加する際にエラー"
@@ -6344,7 +6325,7 @@
 "something appropriate."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/usernick.c:100
+#: ../libpurple/protocols/jabber/usernick.c:99
 #, fuzzy
 msgid "Set Nickname..."
 msgstr "ニックネーム"
@@ -6359,22 +6340,12 @@
 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
+#: ../libpurple/protocols/msn/dialog.c:110
 #, c-format
 msgid "Buddy list synchronization issue in %s (%s)"
 msgstr "%s (%s) で仲間リストの同期が発生しました"
 
-#: ../libpurple/protocols/msn/dialog.c:124
+#: ../libpurple/protocols/msn/dialog.c:116
 #, c-format
 msgid ""
 "%s on the local list is inside the group \"%s\" but not on the server list. "
@@ -6384,7 +6355,7 @@
 "すが、サーバ上のリストではそうなっていません。サーバ上のリストで、この仲間を"
 "追加してよろしいですか?"
 
-#: ../libpurple/protocols/msn/dialog.c:132
+#: ../libpurple/protocols/msn/dialog.c:124
 #, c-format
 msgid ""
 "%s is on the local list but not on the server list. Do you want this buddy "
@@ -6394,194 +6365,241 @@
 "ん。サーバ上のリストで、この仲間を追加してもよろしいですか?"
 
 #: ../libpurple/protocols/msn/error.c:36
+#, c-format
 msgid "Unable to parse message"
 msgstr "メッセージを解読できません"
 
 #: ../libpurple/protocols/msn/error.c:41
+#, c-format
 msgid "Syntax Error (probably a client bug)"
 msgstr "文法エラー (おそらくクライアント側のバグ)"
 
 #: ../libpurple/protocols/msn/error.c:46
+#, c-format
 msgid "Invalid e-mail address"
 msgstr "E-メール・アドレスが間違っています"
 
 #: ../libpurple/protocols/msn/error.c:49
+#, c-format
 msgid "User does not exist"
 msgstr "ユーザがいません"
 
 #: ../libpurple/protocols/msn/error.c:53
+#, c-format
 msgid "Fully qualified domain name missing"
 msgstr "FQDN (完全修飾ドメイン名) がありません"
 
 #: ../libpurple/protocols/msn/error.c:56
+#, c-format
 msgid "Already logged in"
 msgstr "既にサインインしています"
 
 #: ../libpurple/protocols/msn/error.c:59
+#, c-format
 msgid "Invalid screen name"
 msgstr "無効なスクリーン名です"
 
 #: ../libpurple/protocols/msn/error.c:62
+#, c-format
 msgid "Invalid friendly name"
 msgstr "無効な公開名です"
 
 #: ../libpurple/protocols/msn/error.c:65
+#, c-format
 msgid "List full"
 msgstr "リストがいっぱいです"
 
 #: ../libpurple/protocols/msn/error.c:68
+#, c-format
 msgid "Already there"
 msgstr "既にそこにいます"
 
 #: ../libpurple/protocols/msn/error.c:72
+#, c-format
 msgid "Not on list"
 msgstr "リストにありません"
 
 #: ../libpurple/protocols/msn/error.c:75
 #: ../libpurple/protocols/zephyr/zephyr.c:756
+#, c-format
 msgid "User is offline"
 msgstr "ユーザはオフラインです"
 
 #: ../libpurple/protocols/msn/error.c:78
+#, c-format
 msgid "Already in the mode"
 msgstr "既にそのモードにいます"
 
 #: ../libpurple/protocols/msn/error.c:82
+#, c-format
 msgid "Already in opposite list"
 msgstr "既にリストの反対にいます"
 
 #: ../libpurple/protocols/msn/error.c:86
+#, c-format
 msgid "Too many groups"
 msgstr "グループが多すぎます"
 
 #: ../libpurple/protocols/msn/error.c:89
+#, c-format
 msgid "Invalid group"
 msgstr "無効なグループ名"
 
 #: ../libpurple/protocols/msn/error.c:92
+#, c-format
 msgid "User not in group"
 msgstr "ユーザがグループにありません"
 
 #: ../libpurple/protocols/msn/error.c:95
+#, c-format
 msgid "Group name too long"
 msgstr "グループ名が長すぎます"
 
 #: ../libpurple/protocols/msn/error.c:98
+#, c-format
 msgid "Cannot remove group zero"
 msgstr "グループ 0 は削除できません"
 
 #: ../libpurple/protocols/msn/error.c:103
+#, c-format
 msgid "Tried to add a user to a group that doesn't exist"
 msgstr "存在しないグループにユーザを追加しようとしました"
 
 #: ../libpurple/protocols/msn/error.c:107
+#, c-format
 msgid "Switchboard failed"
 msgstr "スイッチボードに失敗しました"
 
 #: ../libpurple/protocols/msn/error.c:111
+#, c-format
 msgid "Notify transfer failed"
 msgstr "通知の転送に失敗しました"
 
 #: ../libpurple/protocols/msn/error.c:116
+#, c-format
 msgid "Required fields missing"
 msgstr "必要なフィールドがありません"
 
 #: ../libpurple/protocols/msn/error.c:120
+#, c-format
 msgid "Too many hits to a FND"
 msgstr "FND にヒットしすぎです"
 
 #: ../libpurple/protocols/msn/error.c:124
 #: ../libpurple/protocols/oscar/oscar.c:120
+#, c-format
 msgid "Not logged in"
 msgstr "ログインしていません"
 
 #: ../libpurple/protocols/msn/error.c:128
+#, c-format
 msgid "Service temporarily unavailable"
 msgstr "一時的にサービスを利用できません"
 
 #: ../libpurple/protocols/msn/error.c:131
+#, c-format
 msgid "Database server error"
 msgstr "データベース・サーバのエラー"
 
 #: ../libpurple/protocols/msn/error.c:135
+#, c-format
 msgid "Command disabled"
 msgstr "コマンドが無効です"
 
 #: ../libpurple/protocols/msn/error.c:139
+#, c-format
 msgid "File operation error"
 msgstr "ファイル操作のエラー"
 
 #: ../libpurple/protocols/msn/error.c:143
+#, c-format
 msgid "Memory allocation error"
 msgstr "メモリ確保のエラー"
 
 #: ../libpurple/protocols/msn/error.c:147
+#, c-format
 msgid "Wrong CHL value sent to server"
 msgstr "間違った CHL 値がサーバに送信されました"
 
 #: ../libpurple/protocols/msn/error.c:152
+#, c-format
 msgid "Server busy"
 msgstr "サーバがビジーです"
 
 #: ../libpurple/protocols/msn/error.c:155
 #: ../libpurple/protocols/msn/error.c:170
 #: ../libpurple/protocols/msn/error.c:230
+#, c-format
 msgid "Server unavailable"
 msgstr "サーバを利用できません"
 
 #: ../libpurple/protocols/msn/error.c:158
+#, c-format
 msgid "Peer notification server down"
 msgstr "ピア通知サーバがダウンしています"
 
 #: ../libpurple/protocols/msn/error.c:162
+#, c-format
 msgid "Database connect error"
 msgstr "データベース接続エラーです"
 
 #: ../libpurple/protocols/msn/error.c:167
+#, c-format
 msgid "Server is going down (abandon ship)"
 msgstr "サーバがダウンしています (見捨てましょう)"
 
 #: ../libpurple/protocols/msn/error.c:174
+#, c-format
 msgid "Error creating connection"
 msgstr "接続を開始する際にエラー"
 
 #: ../libpurple/protocols/msn/error.c:179
+#, c-format
 msgid "CVR parameters are either unknown or not allowed"
 msgstr "CVR パラメータが不明または許可されていません"
 
 #: ../libpurple/protocols/msn/error.c:183
+#, c-format
 msgid "Unable to write"
 msgstr "書き込めません"
 
 #: ../libpurple/protocols/msn/error.c:186
+#, c-format
 msgid "Session overload"
 msgstr "セッションの負荷が過剰です"
 
 #: ../libpurple/protocols/msn/error.c:190
+#, c-format
 msgid "User is too active"
 msgstr "ユーザがアクティブすぎます"
 
 #: ../libpurple/protocols/msn/error.c:193
+#, c-format
 msgid "Too many sessions"
 msgstr "セッションが多すぎです"
 
 #: ../libpurple/protocols/msn/error.c:196
+#, c-format
 msgid "Passport not verified"
 msgstr "パスポートは確認されていません"
 
 #: ../libpurple/protocols/msn/error.c:199
+#, c-format
 msgid "Bad friend file"
 msgstr "おかしな仲間ファイル"
 
 #: ../libpurple/protocols/msn/error.c:203
+#, c-format
 msgid "Not expected"
 msgstr "予想していないデータ"
 
 #: ../libpurple/protocols/msn/error.c:209
+#, c-format
 msgid "Friendly name changes too rapidly"
 msgstr "公開する名前が短すぎます"
 
 #: ../libpurple/protocols/msn/error.c:218
+#, c-format
 msgid "Server too busy"
 msgstr "サーバがとてもビジーです"
 
@@ -6590,26 +6608,32 @@
 #: ../libpurple/protocols/silc/silc.c:233
 #: ../libpurple/protocols/silc10/ops.c:1709
 #: ../libpurple/protocols/toc/toc.c:728 ../libpurple/proxy.c:1380
+#, c-format
 msgid "Authentication failed"
 msgstr "認証に失敗しました"
 
 #: ../libpurple/protocols/msn/error.c:225
+#, c-format
 msgid "Not allowed when offline"
 msgstr "オフラインの時は許可できません"
 
 #: ../libpurple/protocols/msn/error.c:233
+#, c-format
 msgid "Not accepting new users"
 msgstr "新しいユーザを受け入れていません"
 
 #: ../libpurple/protocols/msn/error.c:237
+#, c-format
 msgid "Kids Passport without parental consent"
 msgstr "親の承諾がない Kids パスポートです"
 
 #: ../libpurple/protocols/msn/error.c:241
+#, c-format
 msgid "Passport account not yet verified"
 msgstr "まだパスポートのアカウントは確認されていません"
 
 #: ../libpurple/protocols/msn/error.c:244
+#, c-format
 msgid "Bad ticket"
 msgstr "おかしなチケットです"
 
@@ -6641,31 +6665,31 @@
 msgid "Your new MSN friendly name is too long."
 msgstr "新しい MSN の公開名が長すぎます"
 
-#: ../libpurple/protocols/msn/msn.c:285
+#: ../libpurple/protocols/msn/msn.c:282
 msgid "Set your friendly name."
 msgstr "公開する名前をセットして下さい"
 
-#: ../libpurple/protocols/msn/msn.c:286
+#: ../libpurple/protocols/msn/msn.c:283
 msgid "This is the name that other MSN buddies will see you as."
 msgstr "MSN の他の仲間があなたを見るときに表示される名前です:"
 
-#: ../libpurple/protocols/msn/msn.c:304
+#: ../libpurple/protocols/msn/msn.c:301
 msgid "Set your home phone number."
 msgstr "自宅の電話番号を設定して下さい"
 
-#: ../libpurple/protocols/msn/msn.c:321
+#: ../libpurple/protocols/msn/msn.c:318
 msgid "Set your work phone number."
 msgstr "オフィスの電話番号を設定して下さい"
 
-#: ../libpurple/protocols/msn/msn.c:338
+#: ../libpurple/protocols/msn/msn.c:335
 msgid "Set your mobile phone number."
 msgstr "携帯電話の番号を設定して下さい"
 
-#: ../libpurple/protocols/msn/msn.c:353
+#: ../libpurple/protocols/msn/msn.c:350
 msgid "Allow MSN Mobile pages?"
 msgstr "MSN モバイル・ページを許可しますか?"
 
-#: ../libpurple/protocols/msn/msn.c:354
+#: ../libpurple/protocols/msn/msn.c:351
 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?"
@@ -6673,327 +6697,323 @@
 "仲間が携帯電話などのモバイル機器へ MSN モバイル・ページを送信することを許可し"
 "ますか?"
 
-#: ../libpurple/protocols/msn/msn.c:360
+#: ../libpurple/protocols/msn/msn.c:357
 msgid "Allow"
 msgstr "許可する"
 
-#: ../libpurple/protocols/msn/msn.c:361
+#: ../libpurple/protocols/msn/msn.c:358
 msgid "Disallow"
 msgstr "許可しない"
 
-#: ../libpurple/protocols/msn/msn.c:377
+#: ../libpurple/protocols/msn/msn.c:374
 msgid "This Hotmail account may not be active."
 msgstr "この Hotmail のアカウントは有効でないようです。"
 
-#: ../libpurple/protocols/msn/msn.c:403
+#: ../libpurple/protocols/msn/msn.c:400
 msgid "Send a mobile message."
 msgstr "モバイル・メッセージを送信します。"
 
-#: ../libpurple/protocols/msn/msn.c:405
+#: ../libpurple/protocols/msn/msn.c:402
 msgid "Page"
 msgstr "ページ"
 
-#: ../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
+#: ../libpurple/protocols/msn/msn.c:549
+msgid "Has you"
+msgstr "あなたを仲間リストに登録しているか"
+
+#: ../libpurple/protocols/msn/msn.c:579 ../libpurple/protocols/msn/state.c:33
+#: ../libpurple/protocols/yahoo/yahoo.c:3077
+#: ../libpurple/protocols/yahoo/yahoo.c:3761
 msgid "Be Right Back"
 msgstr "もうすぐ帰ってきます"
 
-#: ../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/msn/msn.c:583 ../libpurple/protocols/msn/state.c:31
+#: ../libpurple/protocols/novell/novell.c:2822
+#: ../libpurple/protocols/novell/novell.c:2952
 #: ../libpurple/protocols/silc/buddy.c:1480
 #: ../libpurple/protocols/silc/silc.c:56
 #: ../libpurple/protocols/silc10/buddy.c:1480
 #: ../libpurple/protocols/silc10/silc.c:47
-#: ../libpurple/protocols/yahoo/yahoo.c:3078
-#: ../libpurple/protocols/yahoo/yahoo.c:3763
+#: ../libpurple/protocols/yahoo/yahoo.c:3079
+#: ../libpurple/protocols/yahoo/yahoo.c:3764
 msgid "Busy"
 msgstr "取り込み中です"
 
-#: ../libpurple/protocols/msn/msn.c:660
-#: ../libpurple/protocols/yahoo/yahoo.c:3086
-#: ../libpurple/protocols/yahoo/yahoo.c:3775
+#: ../libpurple/protocols/msn/msn.c:587
+#: ../libpurple/protocols/yahoo/yahoo.c:3087
+#: ../libpurple/protocols/yahoo/yahoo.c:3776
 msgid "On the Phone"
 msgstr "電話中です"
 
-#: ../libpurple/protocols/msn/msn.c:666
-#: ../libpurple/protocols/yahoo/yahoo.c:3090
-#: ../libpurple/protocols/yahoo/yahoo.c:3781
+#: ../libpurple/protocols/msn/msn.c:591
+#: ../libpurple/protocols/yahoo/yahoo.c:3091
+#: ../libpurple/protocols/yahoo/yahoo.c:3782
 msgid "Out to Lunch"
 msgstr "食事に出かけています"
 
-#: ../libpurple/protocols/msn/msn.c:697
+#: ../libpurple/protocols/msn/msn.c:619
 msgid "Set Friendly Name..."
 msgstr "公開する名前の設定..."
 
-#: ../libpurple/protocols/msn/msn.c:702
+#: ../libpurple/protocols/msn/msn.c:624
 msgid "Set Home Phone Number..."
 msgstr "自宅の電話番号の設定..."
 
-#: ../libpurple/protocols/msn/msn.c:706
+#: ../libpurple/protocols/msn/msn.c:628
 msgid "Set Work Phone Number..."
 msgstr "オフィスの電話番号の設定..."
 
-#: ../libpurple/protocols/msn/msn.c:710
+#: ../libpurple/protocols/msn/msn.c:632
 msgid "Set Mobile Phone Number..."
 msgstr "携帯の電話番号の設定..."
 
-#: ../libpurple/protocols/msn/msn.c:716
+#: ../libpurple/protocols/msn/msn.c:638
 msgid "Enable/Disable Mobile Devices..."
 msgstr "モバイル機器の有効/無効..."
 
-#: ../libpurple/protocols/msn/msn.c:721
+#: ../libpurple/protocols/msn/msn.c:643
 msgid "Allow/Disallow Mobile Pages..."
 msgstr "モバイル・ページの許可/非許可...."
 
-#: ../libpurple/protocols/msn/msn.c:732
+#: ../libpurple/protocols/msn/msn.c:654
 msgid "Open Hotmail Inbox"
 msgstr "Hotmail の受信箱を開く"
 
-#: ../libpurple/protocols/msn/msn.c:756
+#: ../libpurple/protocols/msn/msn.c:678
 msgid "Send to Mobile"
 msgstr "モバイル機器へ送信"
 
-#: ../libpurple/protocols/msn/msn.c:766
-#: ../libpurple/protocols/novell/novell.c:3413
+#: ../libpurple/protocols/msn/msn.c:688
+#: ../libpurple/protocols/novell/novell.c:3408
 msgid "Initiate _Chat"
 msgstr "チャットの開始(_C)"
 
-#: ../libpurple/protocols/msn/msn.c:804
+#: ../libpurple/protocols/msn/msn.c:726
 msgid "SSL support is needed for MSN. Please install a supported SSL library."
 msgstr ""
 "MSN では SSL サポートが必要です (サポートする SSL ライブラリをインストールし"
 "て下さい)"
 
-#: ../libpurple/protocols/msn/msn.c:832
+#: ../libpurple/protocols/msn/msn.c:754
 msgid "Failed to connect to server."
 msgstr "サーバへの接続に失敗しました"
 
-#: ../libpurple/protocols/msn/msn.c:1620 ../libpurple/protocols/msn/msn.c:1968
+#: ../libpurple/protocols/msn/msn.c:1510 ../libpurple/protocols/msn/msn.c:1858
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:808
 msgid "Error retrieving profile"
 msgstr "プロフィールを取得する際にエラー"
 
-#: ../libpurple/protocols/msn/msn.c:1691 ../pidgin/plugins/convcolors.c:309
-#: ../pidgin/plugins/pidginrc.c:360
+#: ../libpurple/protocols/msn/msn.c:1581 ../pidgin/plugins/convcolors.c:309
+#: ../pidgin/plugins/pidginrc.c:366
 msgid "General"
 msgstr "全般"
 
-#: ../libpurple/protocols/msn/msn.c:1698
+#: ../libpurple/protocols/msn/msn.c:1588
 #: ../libpurple/protocols/myspace/user.c:110
-#: ../libpurple/protocols/oscar/oscar.c:3751
+#: ../libpurple/protocols/oscar/oscar.c:3755
 #: ../libpurple/protocols/qq/buddy_info.c:45
 #: ../libpurple/protocols/qq/qq.c:221
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1081
 msgid "Age"
 msgstr "年齢"
 
-#: ../libpurple/protocols/msn/msn.c:1700
+#: ../libpurple/protocols/msn/msn.c:1590
 #: ../libpurple/protocols/qq/buddy_info.c:51
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1096
 msgid "Occupation"
 msgstr "職業"
 
-#: ../libpurple/protocols/msn/msn.c:1701
+#: ../libpurple/protocols/msn/msn.c:1591
 #: ../libpurple/protocols/myspace/user.c:119
-#: ../libpurple/protocols/novell/novell.c:1480
+#: ../libpurple/protocols/novell/novell.c:1478
 #: ../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:1706 ../libpurple/protocols/msn/msn.c:1898
-#: ../libpurple/protocols/msn/msn.c:1904 ../libpurple/protocols/msn/msn.c:1911
+#: ../libpurple/protocols/msn/msn.c:1596 ../libpurple/protocols/msn/msn.c:1788
+#: ../libpurple/protocols/msn/msn.c:1794 ../libpurple/protocols/msn/msn.c:1801
 msgid "Hobbies and Interests"
 msgstr "趣味と興味のあること"
 
-#: ../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
+#: ../libpurple/protocols/msn/msn.c:1602 ../libpurple/protocols/msn/msn.c:1722
+#: ../libpurple/protocols/msn/msn.c:1728 ../libpurple/protocols/msn/msn.c:1735
+#: ../libpurple/protocols/msn/msn.c:1743 ../libpurple/protocols/msn/msn.c:1750
 msgid "A Little About Me"
 msgstr "ちょっとしたプロフィール"
 
-#: ../libpurple/protocols/msn/msn.c:1729
+#: ../libpurple/protocols/msn/msn.c:1619
 msgid "Social"
 msgstr "パーティ"
 
-#: ../libpurple/protocols/msn/msn.c:1731
+#: ../libpurple/protocols/msn/msn.c:1621
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1086
 msgid "Marital Status"
 msgstr "既婚/未婚"
 
-#: ../libpurple/protocols/msn/msn.c:1732
+#: ../libpurple/protocols/msn/msn.c:1622
 msgid "Interests"
 msgstr "趣味"
 
-#: ../libpurple/protocols/msn/msn.c:1733
+#: ../libpurple/protocols/msn/msn.c:1623
 msgid "Pets"
 msgstr "ペット"
 
-#: ../libpurple/protocols/msn/msn.c:1734
+#: ../libpurple/protocols/msn/msn.c:1624
 msgid "Hometown"
 msgstr "出身地"
 
-#: ../libpurple/protocols/msn/msn.c:1735
+#: ../libpurple/protocols/msn/msn.c:1625
 msgid "Places Lived"
 msgstr "現住所"
 
-#: ../libpurple/protocols/msn/msn.c:1736
+#: ../libpurple/protocols/msn/msn.c:1626
 msgid "Fashion"
 msgstr "ファッション"
 
-#: ../libpurple/protocols/msn/msn.c:1737
+#: ../libpurple/protocols/msn/msn.c:1627
 msgid "Humor"
 msgstr "ユーモア"
 
-#: ../libpurple/protocols/msn/msn.c:1738
+#: ../libpurple/protocols/msn/msn.c:1628
 msgid "Music"
 msgstr "音楽"
 
-#: ../libpurple/protocols/msn/msn.c:1739 ../libpurple/protocols/msn/msn.c:1920
-#: ../libpurple/protocols/msn/msn.c:1926
+#: ../libpurple/protocols/msn/msn.c:1629 ../libpurple/protocols/msn/msn.c:1810
+#: ../libpurple/protocols/msn/msn.c:1816
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1138
 msgid "Favorite Quote"
 msgstr "座右の銘"
 
-#: ../libpurple/protocols/msn/msn.c:1756
+#: ../libpurple/protocols/msn/msn.c:1646
 msgid "Contact Info"
 msgstr "連絡先の情報"
 
-#: ../libpurple/protocols/msn/msn.c:1757
+#: ../libpurple/protocols/msn/msn.c:1647
 msgid "Personal"
 msgstr "個人"
 
-#: ../libpurple/protocols/msn/msn.c:1760
+#: ../libpurple/protocols/msn/msn.c:1650
 msgid "Significant Other"
 msgstr "大切な人"
 
-#: ../libpurple/protocols/msn/msn.c:1761
+#: ../libpurple/protocols/msn/msn.c:1651
 msgid "Home Phone"
 msgstr "ホームページ"
 
-#: ../libpurple/protocols/msn/msn.c:1762
+#: ../libpurple/protocols/msn/msn.c:1652
 msgid "Home Phone 2"
 msgstr "ホームページ2"
 
-#: ../libpurple/protocols/msn/msn.c:1763
-#: ../libpurple/protocols/oscar/oscar.c:3789
+#: ../libpurple/protocols/msn/msn.c:1653
+#: ../libpurple/protocols/oscar/oscar.c:3793
 msgid "Home Address"
 msgstr "自宅の住所"
 
-#: ../libpurple/protocols/msn/msn.c:1764
+#: ../libpurple/protocols/msn/msn.c:1654
 msgid "Personal Mobile"
 msgstr "携帯 (個人)"
 
-#: ../libpurple/protocols/msn/msn.c:1765
+#: ../libpurple/protocols/msn/msn.c:1655
 msgid "Home Fax"
 msgstr "自宅の FAX"
 
-#: ../libpurple/protocols/msn/msn.c:1766
+#: ../libpurple/protocols/msn/msn.c:1656
 msgid "Personal E-Mail"
 msgstr "個人の E-メール"
 
-#: ../libpurple/protocols/msn/msn.c:1767
+#: ../libpurple/protocols/msn/msn.c:1657
 msgid "Personal IM"
 msgstr "個人の IM"
 
-#: ../libpurple/protocols/msn/msn.c:1769
+#: ../libpurple/protocols/msn/msn.c:1659
 msgid "Anniversary"
 msgstr "記念日"
 
 #. Business
-#: ../libpurple/protocols/msn/msn.c:1785
+#: ../libpurple/protocols/msn/msn.c:1675
 msgid "Work"
 msgstr "職種"
 
-#: ../libpurple/protocols/msn/msn.c:1787
+#: ../libpurple/protocols/msn/msn.c:1677
 #: ../libpurple/protocols/silc/ops.c:1010
 #: ../libpurple/protocols/silc10/ops.c:1044
 msgid "Job Title"
 msgstr "肩書"
 
-#: ../libpurple/protocols/msn/msn.c:1788
-#: ../libpurple/protocols/oscar/oscar.c:3810
+#: ../libpurple/protocols/msn/msn.c:1678
+#: ../libpurple/protocols/oscar/oscar.c:3814
 msgid "Company"
 msgstr "勤務先"
 
-#: ../libpurple/protocols/msn/msn.c:1789
-#: ../libpurple/protocols/novell/novell.c:1482
+#: ../libpurple/protocols/msn/msn.c:1679
+#: ../libpurple/protocols/novell/novell.c:1480
 msgid "Department"
 msgstr "部署"
 
-#: ../libpurple/protocols/msn/msn.c:1790
+#: ../libpurple/protocols/msn/msn.c:1680
 msgid "Profession"
 msgstr "職業"
 
-#: ../libpurple/protocols/msn/msn.c:1791
+#: ../libpurple/protocols/msn/msn.c:1681
 msgid "Work Phone"
 msgstr "勤務先の電話番号"
 
-#: ../libpurple/protocols/msn/msn.c:1792
+#: ../libpurple/protocols/msn/msn.c:1682
 msgid "Work Phone 2"
 msgstr "勤務先の電話番号2"
 
-#: ../libpurple/protocols/msn/msn.c:1793
-#: ../libpurple/protocols/oscar/oscar.c:3802
+#: ../libpurple/protocols/msn/msn.c:1683
+#: ../libpurple/protocols/oscar/oscar.c:3806
 msgid "Work Address"
 msgstr "勤務先の住所"
 
-#: ../libpurple/protocols/msn/msn.c:1794
+#: ../libpurple/protocols/msn/msn.c:1684
 msgid "Work Mobile"
 msgstr "携帯 (仕事)"
 
-#: ../libpurple/protocols/msn/msn.c:1795
+#: ../libpurple/protocols/msn/msn.c:1685
 msgid "Work Pager"
 msgstr "Work Pager"
 
-#: ../libpurple/protocols/msn/msn.c:1796
+#: ../libpurple/protocols/msn/msn.c:1686
 msgid "Work Fax"
 msgstr "勤務先の FAX"
 
-#: ../libpurple/protocols/msn/msn.c:1797
+#: ../libpurple/protocols/msn/msn.c:1687
 msgid "Work E-Mail"
 msgstr "勤務先の E-メール"
 
-#: ../libpurple/protocols/msn/msn.c:1798
+#: ../libpurple/protocols/msn/msn.c:1688
 msgid "Work IM"
 msgstr "勤務先の IM"
 
-#: ../libpurple/protocols/msn/msn.c:1799
+#: ../libpurple/protocols/msn/msn.c:1689
 msgid "Start Date"
 msgstr "開始日"
 
-#: ../libpurple/protocols/msn/msn.c:1869 ../libpurple/protocols/msn/msn.c:1875
-#: ../libpurple/protocols/msn/msn.c:1882 ../libpurple/protocols/msn/msn.c:1889
+#: ../libpurple/protocols/msn/msn.c:1759 ../libpurple/protocols/msn/msn.c:1765
+#: ../libpurple/protocols/msn/msn.c:1772 ../libpurple/protocols/msn/msn.c:1779
 msgid "Favorite Things"
 msgstr "お気に入りのもの"
 
-#: ../libpurple/protocols/msn/msn.c:1934
+#: ../libpurple/protocols/msn/msn.c:1824
 msgid "Last Updated"
 msgstr "最終更新日"
 
-#: ../libpurple/protocols/msn/msn.c:1945
+#: ../libpurple/protocols/msn/msn.c:1835
 #: ../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:1969
+#: ../libpurple/protocols/msn/msn.c:1859
 msgid "The user has not created a public profile."
 msgstr "このユーザはプロフィールを公開していません"
 
-#: ../libpurple/protocols/msn/msn.c:1970
+#: ../libpurple/protocols/msn/msn.c:1860
 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 "
@@ -7003,7 +7023,7 @@
 "ユーザが存在しないか、あるいはユーザは存在しますがプロフィールは公開していな"
 "いかのどちらかです。"
 
-#: ../libpurple/protocols/msn/msn.c:1974
+#: ../libpurple/protocols/msn/msn.c:1864
 msgid ""
 "Could not find any information in the user's profile. The user most likely "
 "does not exist."
@@ -7011,7 +7031,7 @@
 "ユーザのプロフィールから情報を取得できませんでした。そのユーザはおそらく存在"
 "していないと思われます。"
 
-#: ../libpurple/protocols/msn/msn.c:1982
+#: ../libpurple/protocols/msn/msn.c:1872
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1240
 msgid "Profile URL"
 msgstr "プロフィールの URL"
@@ -7026,106 +7046,101 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../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
+#: ../libpurple/protocols/msn/msn.c:2158 ../libpurple/protocols/msn/msn.c:2160
+msgid "MSN Protocol Plugin"
+msgstr "MSN プロトコルのプラグイン"
+
+#: ../libpurple/protocols/msn/msn.c:2194
 msgid "Use HTTP Method"
 msgstr "HTTP メソッドを利用する"
 
-#: ../libpurple/protocols/msn/msn.c:2311
+#: ../libpurple/protocols/msn/msn.c:2199
 #, fuzzy
 msgid "HTTP Method Server"
 msgstr "IPC のテスト用サーバ"
 
-#: ../libpurple/protocols/msn/msn.c:2316
+#: ../libpurple/protocols/msn/msn.c:2204
 msgid "Show custom smileys"
 msgstr "独自のスマイリーを表示する"
 
-#: ../libpurple/protocols/msn/msn.c:2324
+#: ../libpurple/protocols/msn/msn.c:2212
 msgid "nudge: nudge a user to get their attention"
 msgstr "合図: ユーザに向けて警告音を鳴らす"
 
-#: ../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
+#: ../libpurple/protocols/msn/nexus.c:146
+#: ../libpurple/protocols/msn/servconn.c:135
+#: ../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/notification.c:178
 #, c-format
 msgid "%s is not a valid group."
 msgstr "%s は正しいグループではありません"
 
-#: ../libpurple/protocols/msn/notification.c:197
-#: ../libpurple/protocols/msn/notification.c:938
-#: ../libpurple/protocols/msn/session.c:369
+#: ../libpurple/protocols/msn/notification.c:184
+#: ../libpurple/protocols/msn/notification.c:532
+#: ../libpurple/protocols/msn/session.c:330
 msgid "Unknown error."
 msgstr "原因不明のエラーです"
 
-#: ../libpurple/protocols/msn/notification.c:200
+#: ../libpurple/protocols/msn/notification.c:187
 #, c-format
 msgid "%s on %s (%s)"
 msgstr "%2$s (%3$s) の %1$s"
 
-#: ../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
+#: ../libpurple/protocols/msn/notification.c:498
 #, c-format
 msgid "Unable to add user on %s (%s)"
 msgstr "%s (%s) のユーザを追加できません"
 
-#: ../libpurple/protocols/msn/notification.c:908
+#: ../libpurple/protocols/msn/notification.c:502
 #, c-format
 msgid "Unable to block user on %s (%s)"
 msgstr "%s (%s) のユーザをブロックできません"
 
-#: ../libpurple/protocols/msn/notification.c:912
+#: ../libpurple/protocols/msn/notification.c:506
 #, c-format
 msgid "Unable to permit user on %s (%s)"
 msgstr "%s (%s) のユーザを許可できません"
 
-#: ../libpurple/protocols/msn/notification.c:920
+#: ../libpurple/protocols/msn/notification.c:514
 #, c-format
 msgid "%s could not be added because your buddy list is full."
 msgstr "仲間リストが満杯なので、%s さんを追加できませんでした"
 
-#: ../libpurple/protocols/msn/notification.c:929
+#: ../libpurple/protocols/msn/notification.c:523
 #, c-format
 msgid "%s is not a valid passport account."
 msgstr "%s さんのパスポート・アカウントは正しくありません"
 
-#: ../libpurple/protocols/msn/notification.c:934
+#: ../libpurple/protocols/msn/notification.c:528
 msgid "Service Temporarily Unavailable."
 msgstr "サービスを一時的に利用できません"
 
-#: ../libpurple/protocols/msn/notification.c:1272
+#: ../libpurple/protocols/msn/notification.c:851
 msgid "Unable to rename group"
 msgstr "グループ名を変更できません"
 
-#: ../libpurple/protocols/msn/notification.c:1327
+#: ../libpurple/protocols/msn/notification.c:906
 msgid "Unable to delete group"
 msgstr "グループを削除できません"
 
-#: ../libpurple/protocols/msn/notification.c:1943
+#: ../libpurple/protocols/msn/notification.c:1325
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -7152,30 +7167,6 @@
 "\n"
 "メンテナンスが完了したら、またサイン・インできるようになります。"
 
-#: ../libpurple/protocols/msn/oim.c:141
-#, fuzzy
-msgid "Unable to connect to OIM server"
-msgstr "サーバへ接続できません"
-
-#: ../libpurple/protocols/msn/servconn.c:135
-#: ../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 "書き込み時にエラー"
@@ -7193,60 +7184,60 @@
 "サーバ %s で接続エラー:\n"
 "%s"
 
-#: ../libpurple/protocols/msn/session.c:336
+#: ../libpurple/protocols/msn/session.c:299
 msgid "Our protocol is not supported by the server."
 msgstr "サーバはこのプロトコルをサポートしていません"
 
-#: ../libpurple/protocols/msn/session.c:340
+#: ../libpurple/protocols/msn/session.c:303
 msgid "Error parsing HTTP."
 msgstr "HTTP を解析する際にエラーが発生しました"
 
-#: ../libpurple/protocols/msn/session.c:344
+#: ../libpurple/protocols/msn/session.c:307
 #: ../libpurple/protocols/oscar/flap_connection.c:384
-#: ../libpurple/protocols/yahoo/yahoo.c:207
+#: ../libpurple/protocols/yahoo/yahoo.c:205
 msgid "You have signed on from another location."
 msgstr "別の場所からサイン・インしています"
 
-#: ../libpurple/protocols/msn/session.c:349
+#: ../libpurple/protocols/msn/session.c:310
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr ""
 "MSN サーバが一時的に利用不可になっています。時間をあけて後で試してみて下さ"
 "い。"
 
-#: ../libpurple/protocols/msn/session.c:354
+#: ../libpurple/protocols/msn/session.c:315
 msgid "The MSN servers are going down temporarily."
 msgstr "MSN サーバが一時的にダウンしています"
 
-#: ../libpurple/protocols/msn/session.c:359
+#: ../libpurple/protocols/msn/session.c:320
 #, c-format
 msgid "Unable to authenticate: %s"
 msgstr "認証できません: %s"
 
-#: ../libpurple/protocols/msn/session.c:364
+#: ../libpurple/protocols/msn/session.c:325
 msgid ""
 "Your MSN buddy list is temporarily unavailable. Please wait and try again."
 msgstr ""
 "お使いの MSN 仲間リストが一時的に利用不可になっています。時間をあけて後で試し"
 "てみて下さい。"
 
-#: ../libpurple/protocols/msn/session.c:385
-#: ../libpurple/protocols/msn/session.c:387
+#: ../libpurple/protocols/msn/session.c:346
+#: ../libpurple/protocols/msn/session.c:348
 msgid "Handshaking"
 msgstr "通信を接続しています"
 
-#: ../libpurple/protocols/msn/session.c:388
+#: ../libpurple/protocols/msn/session.c:349
 msgid "Starting authentication"
 msgstr "認証を開始しています"
 
-#: ../libpurple/protocols/msn/session.c:389
+#: ../libpurple/protocols/msn/session.c:350
 msgid "Getting cookie"
 msgstr "クッキーを取得しています"
 
-#: ../libpurple/protocols/msn/session.c:391
+#: ../libpurple/protocols/msn/session.c:352
 msgid "Sending cookie"
 msgstr "クッキーを送信しています"
 
-#: ../libpurple/protocols/msn/session.c:392
+#: ../libpurple/protocols/msn/session.c:353
 msgid "Retrieving buddy list"
 msgstr "仲間リストを受信しています"
 
@@ -7300,25 +7291,22 @@
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr "不明なエラーの発生により、メッセージは送信されませんでした:"
 
-#: ../libpurple/protocols/msn/userlist.c:243
+#: ../libpurple/protocols/msn/userlist.c:252
 #, c-format
 msgid "%s has added you to his or her buddy list."
 msgstr "%s さんはあなたを仲間リストに追加しています"
 
-#: ../libpurple/protocols/msn/userlist.c:312
+#: ../libpurple/protocols/msn/userlist.c:321
 #, c-format
 msgid "%s has removed you from his or her buddy list."
 msgstr "%s さんはあなたを仲間リストから削除しています"
 
-#. 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
+#: ../libpurple/protocols/msn/userlist.c:643
 #, c-format
 msgid "Unable to add \"%s\"."
 msgstr "\"%s\" さんを追加できません"
 
-#: ../libpurple/protocols/msn/userlist.c:696
+#: ../libpurple/protocols/msn/userlist.c:645
 msgid "The screen name specified is invalid."
 msgstr "指定したスクリーン名が間違っています"
 
@@ -7346,7 +7334,7 @@
 
 #. Notify an error message also, because this is important!
 #: ../libpurple/protocols/myspace/myspace.c:292
-#: ../libpurple/protocols/myspace/myspace.c:1798
+#: ../libpurple/protocols/myspace/myspace.c:1801
 msgid "MySpaceIM Error"
 msgstr ""
 
@@ -7365,195 +7353,195 @@
 msgid "Logging in"
 msgstr "ログの記録"
 
-#: ../libpurple/protocols/myspace/myspace.c:1278
+#: ../libpurple/protocols/myspace/myspace.c:1286
 #, 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
+#: ../libpurple/protocols/myspace/myspace.c:1328
 #, fuzzy
 msgid "New mail messages"
 msgstr "メッセージを送信する"
 
-#: ../libpurple/protocols/myspace/myspace.c:1322
+#: ../libpurple/protocols/myspace/myspace.c:1329
 msgid "New blog comments"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:1323
+#: ../libpurple/protocols/myspace/myspace.c:1330
 msgid "New profile comments"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:1324
+#: ../libpurple/protocols/myspace/myspace.c:1331
 msgid "New friend requests!"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:1325
+#: ../libpurple/protocols/myspace/myspace.c:1332
 msgid "New picture comments"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:1355
+#: ../libpurple/protocols/myspace/myspace.c:1360
 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/myspace/myspace.c:1543
 #: ../libpurple/protocols/sametime/sametime.c:1544
 msgid "Connected"
 msgstr "接続しました"
 
-#: ../libpurple/protocols/myspace/myspace.c:1549
-#: ../libpurple/protocols/myspace/myspace.c:1551
+#: ../libpurple/protocols/myspace/myspace.c:1554
+#: ../libpurple/protocols/myspace/myspace.c:1556
 #, fuzzy
 msgid "No username set"
 msgstr "名前なし"
 
-#: ../libpurple/protocols/myspace/myspace.c:1550
+#: ../libpurple/protocols/myspace/myspace.c:1555
 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
+#: ../libpurple/protocols/myspace/myspace.c:1782
 #, fuzzy, c-format
 msgid "Protocol error, code %d: %s"
 msgstr "プロセスがエラー・コード %d を返してきました"
 
-#: ../libpurple/protocols/myspace/myspace.c:1970
-#: ../libpurple/protocols/myspace/myspace.c:2004
+#: ../libpurple/protocols/myspace/myspace.c:1972
+#: ../libpurple/protocols/myspace/myspace.c:2006
 #, fuzzy
 msgid "Failed to add buddy"
 msgstr "チャットの仲間に参加できません"
 
-#: ../libpurple/protocols/myspace/myspace.c:1970
+#: ../libpurple/protocols/myspace/myspace.c:1972
 #, fuzzy
 msgid "'addbuddy' command failed."
 msgstr "仲間リストのインポート..."
 
-#: ../libpurple/protocols/myspace/myspace.c:2004
-#: ../libpurple/protocols/myspace/myspace.c:2245
+#: ../libpurple/protocols/myspace/myspace.c:2006
+#: ../libpurple/protocols/myspace/myspace.c:2247
 #, fuzzy
 msgid "persist command failed"
 msgstr "スイッチボードに失敗しました"
 
-#: ../libpurple/protocols/myspace/myspace.c:2113
+#: ../libpurple/protocols/myspace/myspace.c:2115
 #, c-format
 msgid "No such user: %s"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:2114
+#: ../libpurple/protocols/myspace/myspace.c:2116
 #, fuzzy
 msgid "User lookup"
 msgstr "ユーザの部屋"
 
-#: ../libpurple/protocols/myspace/myspace.c:2226
-#: ../libpurple/protocols/myspace/myspace.c:2245
-#: ../libpurple/protocols/myspace/myspace.c:2267
+#: ../libpurple/protocols/myspace/myspace.c:2228
+#: ../libpurple/protocols/myspace/myspace.c:2247
+#: ../libpurple/protocols/myspace/myspace.c:2269
 #, fuzzy
 msgid "Failed to remove buddy"
 msgstr "チャットの仲間に参加できません"
 
-#: ../libpurple/protocols/myspace/myspace.c:2226
+#: ../libpurple/protocols/myspace/myspace.c:2228
 msgid "'delbuddy' command failed"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:2267
+#: ../libpurple/protocols/myspace/myspace.c:2269
 #, fuzzy
 msgid "blocklist command failed"
 msgstr "スイッチボードに失敗しました"
 
-#: ../libpurple/protocols/myspace/myspace.c:2313
+#: ../libpurple/protocols/myspace/myspace.c:2315
 #, 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
+#: ../libpurple/protocols/myspace/myspace.c:2333
+#: ../libpurple/protocols/myspace/myspace.c:2364
 #, fuzzy
 msgid "Read buffer full"
 msgstr "キューが一杯です"
 
-#: ../libpurple/protocols/myspace/myspace.c:2400
+#: ../libpurple/protocols/myspace/myspace.c:2402
 #, fuzzy
 msgid "Unparseable message"
 msgstr "メッセージを解読できません"
 
-#: ../libpurple/protocols/myspace/myspace.c:2469
+#: ../libpurple/protocols/myspace/myspace.c:2471
 #, fuzzy, c-format
 msgid "Couldn't connect to host: %s (%d)"
 msgstr "ホストへ接続できませんでした"
 
-#: ../libpurple/protocols/myspace/myspace.c:2640
+#: ../libpurple/protocols/myspace/myspace.c:2642
 #, fuzzy
 msgid "IM Friends"
 msgstr "IM ウィンドウ(_I)"
 
-#: ../libpurple/protocols/myspace/myspace.c:2739
+#: ../libpurple/protocols/myspace/myspace.c:2741
 #, 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
+#: ../libpurple/protocols/myspace/myspace.c:2742
 #, fuzzy
 msgid "Add contacts from server"
 msgstr "サーバからの応答が不正です。"
 
-#: ../libpurple/protocols/myspace/myspace.c:2792
-#: ../libpurple/protocols/myspace/myspace.c:2857
+#: ../libpurple/protocols/myspace/myspace.c:2794
+#: ../libpurple/protocols/myspace/myspace.c:2859
 msgid "Add friends from MySpace.com"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:2793
+#: ../libpurple/protocols/myspace/myspace.c:2795
 #, fuzzy
 msgid "Importing friends failed"
 msgstr "プラグインの読み込みに失敗しました"
 
 #. TODO: find out how
-#: ../libpurple/protocols/myspace/myspace.c:2849
+#: ../libpurple/protocols/myspace/myspace.c:2851
 #, fuzzy
 msgid "Find people..."
 msgstr "仲間の検索..."
 
-#: ../libpurple/protocols/myspace/myspace.c:2852
+#: ../libpurple/protocols/myspace/myspace.c:2854
 #, fuzzy
 msgid "Change IM name..."
 msgstr "パスワードの変更..."
 
-#: ../libpurple/protocols/myspace/myspace.c:3154
+#: ../libpurple/protocols/myspace/myspace.c:3156
 msgid "myim URL handler"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:3155
+#: ../libpurple/protocols/myspace/myspace.c:3157
 msgid "No suitable MySpaceIM account could be found to open this myim URL."
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:3156
+#: ../libpurple/protocols/myspace/myspace.c:3158
 msgid "Enable the proper MySpaceIM account and try again."
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:3279
+#: ../libpurple/protocols/myspace/myspace.c:3281
 msgid "Show display name in status text"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:3282
+#: ../libpurple/protocols/myspace/myspace.c:3284
 msgid "Show headline in status text"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:3287
+#: ../libpurple/protocols/myspace/myspace.c:3289
 #, fuzzy
 msgid "Send emoticons"
 msgstr "サウンドのオプション"
 
-#: ../libpurple/protocols/myspace/myspace.c:3292
+#: ../libpurple/protocols/myspace/myspace.c:3294
 msgid "Screen resolution (dots per inch)"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:3295
+#: ../libpurple/protocols/myspace/myspace.c:3297
 #, fuzzy
 msgid "Base font size (points)"
 msgstr "フォントのサイズを大きくします"
@@ -7566,7 +7554,7 @@
 
 #. TODO: link to username, if available
 #: ../libpurple/protocols/myspace/user.c:102
-#: ../libpurple/protocols/oscar/oscar.c:2960
+#: ../libpurple/protocols/oscar/oscar.c:2964
 msgid "Profile"
 msgstr "プロフィール"
 
@@ -7868,40 +7856,40 @@
 msgid "Login failed (%s)."
 msgstr "ログインに失敗しました (%s)。"
 
-#: ../libpurple/protocols/novell/novell.c:249
+#: ../libpurple/protocols/novell/novell.c:247
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
 msgstr ""
 "メッセージを送信できません。ユーザの詳細情報を取得できませんでした (%s)。"
 
-#: ../libpurple/protocols/novell/novell.c:398
+#: ../libpurple/protocols/novell/novell.c:396
 #, 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:424
+#: ../libpurple/protocols/novell/novell.c:422
 #, c-format
 msgid "Unable to send message (%s)."
 msgstr "メッセージ (%s) を送信できません"
 
-#: ../libpurple/protocols/novell/novell.c:495
-#: ../libpurple/protocols/novell/novell.c:987
+#: ../libpurple/protocols/novell/novell.c:493
+#: ../libpurple/protocols/novell/novell.c:985
 #, c-format
 msgid "Unable to invite user (%s)."
 msgstr "ユーザ (%s) を招待できません"
 
-#: ../libpurple/protocols/novell/novell.c:534
+#: ../libpurple/protocols/novell/novell.c:532
 #, c-format
 msgid "Unable to send message to %s. Could not create the conference (%s)."
 msgstr "%s へメッセージを送信できません。会議 (%s) を作成できませんでした。"
 
-#: ../libpurple/protocols/novell/novell.c:539
+#: ../libpurple/protocols/novell/novell.c:537
 #, c-format
 msgid "Unable to send message. Could not create the conference (%s)."
 msgstr "メッセージを送信できません。会議 (%s) を作成できませんでした。"
 
-#: ../libpurple/protocols/novell/novell.c:586
+#: ../libpurple/protocols/novell/novell.c:584
 #, c-format
 msgid ""
 "Unable to move user %s to folder %s in the server side list. Error while "
@@ -7910,7 +7898,7 @@
 "ユーザ %s をサーバ・サイド・リストにあるフォルダ %s へ移動できません。フォル"
 "ダの作成エラーです (%s)。"
 
-#: ../libpurple/protocols/novell/novell.c:634
+#: ../libpurple/protocols/novell/novell.c:632
 #, c-format
 msgid ""
 "Unable to add %s to your buddy list. Error creating folder in server side "
@@ -7919,61 +7907,61 @@
 "%s を仲間リストへ追加できません。サーバ・サイド・リスト (%s) のフォルダ作成エ"
 "ラーです。"
 
-#: ../libpurple/protocols/novell/novell.c:707
+#: ../libpurple/protocols/novell/novell.c:705
 #, c-format
 msgid "Could not get details for user %s (%s)."
 msgstr "ユーザの %s (%s) さんの詳細情報を取得できませんでした"
 
-#: ../libpurple/protocols/novell/novell.c:753
-#: ../libpurple/protocols/novell/novell.c:899
+#: ../libpurple/protocols/novell/novell.c:751
+#: ../libpurple/protocols/novell/novell.c:897
 #, c-format
 msgid "Unable to add user to privacy list (%s)."
 msgstr "ユーザを仲間リスト (%s) へ追加できません"
 
-#: ../libpurple/protocols/novell/novell.c:800
+#: ../libpurple/protocols/novell/novell.c:798
 #, c-format
 msgid "Unable to add %s to deny list (%s)."
 msgstr "%s さんを拒否リスト (%s) へ追加できません"
 
-#: ../libpurple/protocols/novell/novell.c:853
+#: ../libpurple/protocols/novell/novell.c:851
 #, c-format
 msgid "Unable to add %s to permit list (%s)."
 msgstr "%s さんを許可リスト (%s) へ追加できません"
 
-#: ../libpurple/protocols/novell/novell.c:921
+#: ../libpurple/protocols/novell/novell.c:919
 #, c-format
 msgid "Unable to remove %s from privacy list (%s)."
 msgstr "%s さんをプライバシー・リスト (%s) から削除できません"
 
-#: ../libpurple/protocols/novell/novell.c:944
-#: ../libpurple/protocols/novell/novell.c:1649
+#: ../libpurple/protocols/novell/novell.c:942
+#: ../libpurple/protocols/novell/novell.c:1647
 #, c-format
 msgid "Unable to change server side privacy settings (%s)."
 msgstr "サーバ・サイド・プライバシー設定 (%s) を変更できません"
 
-#: ../libpurple/protocols/novell/novell.c:1014
+#: ../libpurple/protocols/novell/novell.c:1012
 #, c-format
 msgid "Unable to create conference (%s)."
 msgstr "会議 (%s) を生成できません"
 
-#: ../libpurple/protocols/novell/novell.c:1123
-#: ../libpurple/protocols/novell/novell.c:1694
+#: ../libpurple/protocols/novell/novell.c:1121
+#: ../libpurple/protocols/novell/novell.c:1692
 msgid "Error communicating with server. Closing connection."
 msgstr "サーバとの通信中にエラーです。接続を閉じました。"
 
-#: ../libpurple/protocols/novell/novell.c:1478
+#: ../libpurple/protocols/novell/novell.c:1476
 msgid "Telephone Number"
 msgstr "電話番号"
 
-#: ../libpurple/protocols/novell/novell.c:1484
+#: ../libpurple/protocols/novell/novell.c:1482
 msgid "Personal Title"
 msgstr "個人的な肩書き"
 
-#: ../libpurple/protocols/novell/novell.c:1488
+#: ../libpurple/protocols/novell/novell.c:1486
 msgid "Mailstop"
 msgstr "メールストップ"
 
-#: ../libpurple/protocols/novell/novell.c:1504
+#: ../libpurple/protocols/novell/novell.c:1502
 #: ../libpurple/protocols/sametime/sametime.c:4122
 msgid "User ID"
 msgstr "ユーザ ID"
@@ -7984,41 +7972,41 @@
 #. purple_notify_user_info_add_pair(user_info, tag, value);
 #. }
 #.
-#: ../libpurple/protocols/novell/novell.c:1517
+#: ../libpurple/protocols/novell/novell.c:1515
 msgid "Full name"
 msgstr "氏名"
 
-#: ../libpurple/protocols/novell/novell.c:1639
+#: ../libpurple/protocols/novell/novell.c:1637
 #, c-format
 msgid "GroupWise Conference %d"
 msgstr "GroupWise 会議 %d"
 
-#: ../libpurple/protocols/novell/novell.c:1670
+#: ../libpurple/protocols/novell/novell.c:1668
 msgid "Unable to make SSL connection to server."
 msgstr "サーバへ SSL 接続できません"
 
-#: ../libpurple/protocols/novell/novell.c:1722
+#: ../libpurple/protocols/novell/novell.c:1720
 msgid "Authenticating..."
 msgstr "認証中..."
 
-#: ../libpurple/protocols/novell/novell.c:1734
+#: ../libpurple/protocols/novell/novell.c:1732
 msgid "Unable to connect to server."
 msgstr "サーバへ接続できません"
 
-#: ../libpurple/protocols/novell/novell.c:1737
+#: ../libpurple/protocols/novell/novell.c:1735
 msgid "Waiting for response..."
 msgstr "応答待ちです..."
 
-#: ../libpurple/protocols/novell/novell.c:1872
+#: ../libpurple/protocols/novell/novell.c:1870
 #, c-format
 msgid "%s has been invited to this conversation."
 msgstr "%s さんが会話ウインドウへ招待されています"
 
-#: ../libpurple/protocols/novell/novell.c:1900
+#: ../libpurple/protocols/novell/novell.c:1898
 msgid "Invitation to Conversation"
 msgstr "会議の招集"
 
-#: ../libpurple/protocols/novell/novell.c:1901
+#: ../libpurple/protocols/novell/novell.c:1899
 #, c-format
 msgid ""
 "Invitation from: %s\n"
@@ -8029,17 +8017,18 @@
 "\n"
 "送信先: %s"
 
-#: ../libpurple/protocols/novell/novell.c:1903
+#: ../libpurple/protocols/novell/novell.c:1901
 msgid "Would you like to join the conversation?"
 msgstr "会議に出席しますか?"
 
-#: ../libpurple/protocols/novell/novell.c:2017
+#. we don't want to reconnect in this case
+#: ../libpurple/protocols/novell/novell.c:2012
 msgid "You have been logged out because you logged in at another workstation."
 msgstr ""
 "別のワークステーションからログインしているので、強制的にログアウトされまし"
 "た。"
 
-#: ../libpurple/protocols/novell/novell.c:2074
+#: ../libpurple/protocols/novell/novell.c:2069
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
@@ -8049,17 +8038,18 @@
 #. *  purple_request_fields(gc, _("Server Address"),...);
 #.
 #. ...but for now just error out with a nice message.
-#: ../libpurple/protocols/novell/novell.c:2172
+#: ../libpurple/protocols/novell/novell.c:2167
 msgid ""
 "Unable to connect to server. Please enter the address of the server you wish "
 "to connect to."
 msgstr "サーバへ接続できません。接続するサーバのアドレスを入力して下さい。"
 
-#: ../libpurple/protocols/novell/novell.c:2200
+#: ../libpurple/protocols/novell/novell.c:2195
 msgid "Error. SSL support is not installed."
 msgstr "エラーです。SSL サポートがインストールされていません。"
 
-#: ../libpurple/protocols/novell/novell.c:2509
+#: ../libpurple/protocols/novell/novell.c:2504
+#, c-format
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "この会議は閉会しています。メッセージを送信することはできません。"
 
@@ -8073,31 +8063,31 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/novell/novell.c:3523
-#: ../libpurple/protocols/novell/novell.c:3525
+#: ../libpurple/protocols/novell/novell.c:3518
+#: ../libpurple/protocols/novell/novell.c:3520
 msgid "Novell GroupWise Messenger Protocol Plugin"
 msgstr "Novell GroupWise メッセンジャー・プロトコルのプラグイン"
 
-#: ../libpurple/protocols/novell/novell.c:3550
+#: ../libpurple/protocols/novell/novell.c:3545
 msgid "Server address"
 msgstr "サーバのアドレス"
 
-#: ../libpurple/protocols/novell/novell.c:3554
+#: ../libpurple/protocols/novell/novell.c:3549
 msgid "Server port"
 msgstr "サーバのポート"
 
-#: ../libpurple/protocols/oscar/flap_connection.c:389
-#: ../libpurple/protocols/yahoo/yahoo.c:2468
-#: ../libpurple/protocols/yahoo/yahoo.c:2635
+#: ../libpurple/protocols/oscar/flap_connection.c:387
+#: ../libpurple/protocols/yahoo/yahoo.c:2469
+#: ../libpurple/protocols/yahoo/yahoo.c:2636
 #: ../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:391
-#: ../libpurple/protocols/yahoo/yahoo.c:2462
-#: ../libpurple/protocols/yahoo/yahoo.c:2629 ../libpurple/proxy.c:593
+#: ../libpurple/protocols/oscar/flap_connection.c:389
+#: ../libpurple/protocols/yahoo/yahoo.c:2463
+#: ../libpurple/protocols/yahoo/yahoo.c:2630 ../libpurple/proxy.c:593
 #: ../libpurple/proxy.c:1128 ../libpurple/proxy.c:1237
 #: ../libpurple/proxy.c:1337 ../libpurple/proxy.c:1465
 #, c-format
@@ -8108,7 +8098,7 @@
 "サーバとの接続を失いました:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/flap_connection.c:394
+#: ../libpurple/protocols/oscar/flap_connection.c:392
 #: ../libpurple/proxy.c:1145 ../libpurple/proxy.c:1250
 #: ../libpurple/proxy.c:1349 ../libpurple/proxy.c:1421
 #: ../libpurple/proxy.c:1478
@@ -8146,7 +8136,7 @@
 msgstr "ICQ プロトコル・プラグイン"
 
 #: ../libpurple/protocols/oscar/libicq.c:147
-#: ../libpurple/protocols/yahoo/yahoo.c:4409
+#: ../libpurple/protocols/yahoo/yahoo.c:4410
 #: ../libpurple/protocols/zephyr/zephyr.c:2997
 msgid "Encoding"
 msgstr "エンコーディング"
@@ -8323,7 +8313,7 @@
 msgstr "チャット"
 
 #: ../libpurple/protocols/oscar/oscar.c:651
-#: ../libpurple/protocols/oscar/oscar.c:6008
+#: ../libpurple/protocols/oscar/oscar.c:6010
 msgid "Get File"
 msgstr "ファイルの取得"
 
@@ -8396,43 +8386,49 @@
 msgstr "カメラ"
 
 #: ../libpurple/protocols/oscar/oscar.c:725
-#: ../libpurple/protocols/oscar/oscar.c:5778
+#: ../libpurple/protocols/oscar/oscar.c:5780
+#, c-format
 msgid "Free For Chat"
 msgstr "チャットできます"
 
 #: ../libpurple/protocols/oscar/oscar.c:729
-#: ../libpurple/protocols/oscar/oscar.c:5813
+#: ../libpurple/protocols/oscar/oscar.c:5815
+#, c-format
 msgid "Not Available"
 msgstr "不在です"
 
 #: ../libpurple/protocols/oscar/oscar.c:731
-#: ../libpurple/protocols/oscar/oscar.c:5799
+#: ../libpurple/protocols/oscar/oscar.c:5801
+#, c-format
 msgid "Occupied"
 msgstr "多忙です"
 
 #: ../libpurple/protocols/oscar/oscar.c:735
+#, c-format
 msgid "Web Aware"
 msgstr "ウェブは見てます"
 
 #: ../libpurple/protocols/oscar/oscar.c:737 ../libpurple/protocols/qq/qq.c:183
 #: ../libpurple/protocols/qq/qq.c:288
-#: ../libpurple/protocols/yahoo/yahoo.c:3094 ../libpurple/status.c:157
+#: ../libpurple/protocols/yahoo/yahoo.c:3095 ../libpurple/status.c:157
 #: ../pidgin/gtkdocklet.c:446 ../pidgin/gtkstatusbox.c:1060
+#, c-format
 msgid "Invisible"
 msgstr "隠れています"
 
 #: ../libpurple/protocols/oscar/oscar.c:739
+#, c-format
 msgid "Online"
 msgstr "オンライン"
 
 #: ../libpurple/protocols/oscar/oscar.c:838
-#: ../libpurple/protocols/oscar/oscar.c:3703
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:721 ../pidgin/gtkprefs.c:1128
+#: ../libpurple/protocols/oscar/oscar.c:3707
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:721 ../pidgin/gtkprefs.c:1126
 msgid "IP Address"
 msgstr "IP-アドレス"
 
 #: ../libpurple/protocols/oscar/oscar.c:845
-#: ../libpurple/protocols/oscar/oscar.c:2887
+#: ../libpurple/protocols/oscar/oscar.c:2891
 msgid "Warning Level"
 msgstr "警告レベル"
 
@@ -8483,14 +8479,14 @@
 "数字のみにして下さい。"
 
 #: ../libpurple/protocols/oscar/oscar.c:1345
-#: ../libpurple/protocols/yahoo/yahoo.c:2104
+#: ../libpurple/protocols/yahoo/yahoo.c:2105
 msgid "Invalid screen name."
 msgstr "無効なスクリーン名です。"
 
 #: ../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
+#: ../libpurple/protocols/qq/login_logout.c:483
+#: ../libpurple/protocols/simple/simple.c:1045
+#: ../libpurple/protocols/yahoo/yahoo.c:2126
 msgid "Incorrect password."
 msgstr "パスワードが間違っています。"
 
@@ -8541,10 +8537,10 @@
 #. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
 #.
 #: ../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
+#: ../libpurple/protocols/oscar/oscar.c:2232
+#: ../libpurple/protocols/oscar/oscar.c:2281
+#: ../libpurple/protocols/oscar/oscar.c:5885
+#: ../libpurple/protocols/oscar/oscar.c:6166 ../libpurple/request.h:1388
 msgid "_OK"
 msgstr "OK(_O)"
 
@@ -8580,31 +8576,31 @@
 msgid "Unable to initialize connection"
 msgstr "新しい接続を開けません"
 
-#: ../libpurple/protocols/oscar/oscar.c:2198
+#: ../libpurple/protocols/oscar/oscar.c:2202
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr "私があなたを仲間リストに追加できるように承認して下さい。"
 
-#: ../libpurple/protocols/oscar/oscar.c:2226
+#: ../libpurple/protocols/oscar/oscar.c:2230
 msgid "Authorization Request Message:"
 msgstr "承認要求メッセージ:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2227
+#: ../libpurple/protocols/oscar/oscar.c:2231
 msgid "Please authorize me!"
 msgstr "私を承認してください!"
 
-#: ../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
+#: ../libpurple/protocols/oscar/oscar.c:2272
+#: ../libpurple/protocols/oscar/oscar.c:2280
+#: ../libpurple/protocols/oscar/oscar.c:2407
+#: ../libpurple/protocols/oscar/oscar.c:5263
+#: ../libpurple/protocols/yahoo/yahoo.c:1030
 msgid "No reason given."
 msgstr "理由はわかりません。"
 
-#: ../libpurple/protocols/oscar/oscar.c:2275
+#: ../libpurple/protocols/oscar/oscar.c:2279
 msgid "Authorization Denied Message:"
 msgstr "承認拒否メッセージ:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2403
+#: ../libpurple/protocols/oscar/oscar.c:2407
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -8614,17 +8610,17 @@
 "ユーザの %u さんが次の理由で仲間リストに追加する要求を拒否しました:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2404
+#: ../libpurple/protocols/oscar/oscar.c:2408
 msgid "ICQ authorization denied."
 msgstr "ICQ の承認が拒否されました"
 
 #. Someone has granted you authorization
-#: ../libpurple/protocols/oscar/oscar.c:2411
+#: ../libpurple/protocols/oscar/oscar.c:2415
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
 msgstr "ユーザの %u さんが仲間リストに追加するあなたの要求を承認しました"
 
-#: ../libpurple/protocols/oscar/oscar.c:2419
+#: ../libpurple/protocols/oscar/oscar.c:2423
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -8637,7 +8633,7 @@
 "差出人: %s [%s]\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2427
+#: ../libpurple/protocols/oscar/oscar.c:2431
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -8650,7 +8646,7 @@
 "差出人: %s [%s]\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2435
+#: ../libpurple/protocols/oscar/oscar.c:2439
 #, c-format
 msgid ""
 "You have received an ICQ e-mail from %s [%s]\n"
@@ -8663,24 +8659,24 @@
 "メッセージは:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2456
+#: ../libpurple/protocols/oscar/oscar.c:2460
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
 msgstr "ICQ ユーザの %u さんはあなたに仲間リストを送信しています: %s (%s)"
 
-#: ../libpurple/protocols/oscar/oscar.c:2462
+#: ../libpurple/protocols/oscar/oscar.c:2466
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr "この相手を仲間リストに追加しますか?"
 
-#: ../libpurple/protocols/oscar/oscar.c:2467 ../pidgin/gtkroomlist.c:309
+#: ../libpurple/protocols/oscar/oscar.c:2471 ../pidgin/gtkroomlist.c:309
 msgid "_Add"
 msgstr "追加(_A)"
 
-#: ../libpurple/protocols/oscar/oscar.c:2468
+#: ../libpurple/protocols/oscar/oscar.c:2472
 msgid "_Decline"
 msgstr "断る(_D)"
 
-#: ../libpurple/protocols/oscar/oscar.c:2592
+#: ../libpurple/protocols/oscar/oscar.c:2596
 #, 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."
@@ -8689,7 +8685,7 @@
 msgstr[1] ""
 "%2$s さんからの %1$hu 通のメッセージは妥当でないので受け取れませんでした。"
 
-#: ../libpurple/protocols/oscar/oscar.c:2601
+#: ../libpurple/protocols/oscar/oscar.c:2605
 #, 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."
@@ -8698,7 +8694,7 @@
 msgstr[1] ""
 "%2$s さんからの %1$hu 個のメッセージは大きすぎるために受け取れませんでした。"
 
-#: ../libpurple/protocols/oscar/oscar.c:2610
+#: ../libpurple/protocols/oscar/oscar.c:2614
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -8711,7 +8707,7 @@
 "速度制限を上回ったので %2$s さんからの %1$hu通のメッセージを受け取れませんで"
 "した。"
 
-#: ../libpurple/protocols/oscar/oscar.c:2619
+#: ../libpurple/protocols/oscar/oscar.c:2623
 #, 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."
@@ -8722,7 +8718,7 @@
 "相手が有害すぎたので、%2$s さんからの %1$hu 個のメッセージを受け取れませんで"
 "した。"
 
-#: ../libpurple/protocols/oscar/oscar.c:2628
+#: ../libpurple/protocols/oscar/oscar.c:2632
 #, 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."
@@ -8733,7 +8729,7 @@
 "あなたが有害すぎたので、%2$s さんからの %1$hu 個のメッセージを受け取れません"
 "でした。"
 
-#: ../libpurple/protocols/oscar/oscar.c:2637
+#: ../libpurple/protocols/oscar/oscar.c:2641
 #, 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."
@@ -8745,47 +8741,47 @@
 "た。"
 
 #. Data is assumed to be the destination sn
-#: ../libpurple/protocols/oscar/oscar.c:2792
+#: ../libpurple/protocols/oscar/oscar.c:2796
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "メッセージを送信できません: %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2792
-#: ../libpurple/protocols/oscar/oscar.c:2797
-#: ../libpurple/protocols/oscar/oscar.c:2861
+#: ../libpurple/protocols/oscar/oscar.c:2796
+#: ../libpurple/protocols/oscar/oscar.c:2801
+#: ../libpurple/protocols/oscar/oscar.c:2865
 msgid "Unknown reason."
 msgstr "原因は不明です"
 
-#: ../libpurple/protocols/oscar/oscar.c:2795
+#: ../libpurple/protocols/oscar/oscar.c:2799
 #: ../libpurple/protocols/sametime/sametime.c:2409
 #, c-format
 msgid "Unable to send message to %s:"
 msgstr "%s さんへメッセージを送信できません"
 
-#: ../libpurple/protocols/oscar/oscar.c:2861
+#: ../libpurple/protocols/oscar/oscar.c:2865
 #, c-format
 msgid "User information not available: %s"
 msgstr "ユーザ情報は有効ではありません: %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2892
+#: ../libpurple/protocols/oscar/oscar.c:2896
 msgid "Online Since"
 msgstr "サイン・インした日時"
 
-#: ../libpurple/protocols/oscar/oscar.c:2897
+#: ../libpurple/protocols/oscar/oscar.c:2901
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1185
 msgid "Member Since"
 msgstr "メンバになった日時"
 
-#: ../libpurple/protocols/oscar/oscar.c:2932
+#: ../libpurple/protocols/oscar/oscar.c:2936
 msgid "Available Message"
 msgstr "在席中のメッセージ"
 
-#: ../libpurple/protocols/oscar/oscar.c:3040
+#: ../libpurple/protocols/oscar/oscar.c:3044
 msgid "Your AIM connection may be lost."
 msgstr "AIM への接続が切れたようです"
 
 #. The conversion failed!
-#: ../libpurple/protocols/oscar/oscar.c:3228
+#: ../libpurple/protocols/oscar/oscar.c:3232
 msgid ""
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
@@ -8793,7 +8789,7 @@
 "[メッセージに不正な文字が含まれているため、このユーザからのメッセージを表示で"
 "きません]"
 
-#: ../libpurple/protocols/oscar/oscar.c:3392
+#: ../libpurple/protocols/oscar/oscar.c:3396
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
@@ -8801,82 +8797,83 @@
 "速度制限を越えているため最後の操作は実行されませんでした。10 秒間ほど待ってか"
 "ら再度試みて下さい。"
 
-#: ../libpurple/protocols/oscar/oscar.c:3475
+#: ../libpurple/protocols/oscar/oscar.c:3479
 #: ../libpurple/protocols/toc/toc.c:977
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "チャット・ルーム %s から切断されました"
 
-#: ../libpurple/protocols/oscar/oscar.c:3725
+#: ../libpurple/protocols/oscar/oscar.c:3729
 #: ../libpurple/protocols/silc/util.c:585
 #: ../libpurple/protocols/silc10/util.c:581
 msgid "Mobile Phone"
 msgstr "携帯電話"
 
-#: ../libpurple/protocols/oscar/oscar.c:3755
+#: ../libpurple/protocols/oscar/oscar.c:3759
 msgid "Personal Web Page"
 msgstr "個人的なウェブページ"
 
-#: ../libpurple/protocols/oscar/oscar.c:3779
+#: ../libpurple/protocols/oscar/oscar.c:3783
 #: ../libpurple/protocols/qq/buddy_info.c:40
 msgid "Additional Information"
 msgstr "追加情報"
 
-#: ../libpurple/protocols/oscar/oscar.c:3787
-#: ../libpurple/protocols/oscar/oscar.c:3800
+#: ../libpurple/protocols/oscar/oscar.c:3791
+#: ../libpurple/protocols/oscar/oscar.c:3804
 msgid "Zip Code"
 msgstr "郵便番号"
 
-#: ../libpurple/protocols/oscar/oscar.c:3811
+#: ../libpurple/protocols/oscar/oscar.c:3815
 msgid "Division"
 msgstr "所属"
 
-#: ../libpurple/protocols/oscar/oscar.c:3812
+#: ../libpurple/protocols/oscar/oscar.c:3816
 msgid "Position"
 msgstr "役職"
 
-#: ../libpurple/protocols/oscar/oscar.c:3814
+#: ../libpurple/protocols/oscar/oscar.c:3818
 msgid "Web Page"
 msgstr "ウェブページ"
 
-#: ../libpurple/protocols/oscar/oscar.c:3817
+#: ../libpurple/protocols/oscar/oscar.c:3821
 msgid "Work Information"
 msgstr "職業"
 
-#: ../libpurple/protocols/oscar/oscar.c:3873
+#: ../libpurple/protocols/oscar/oscar.c:3877
 msgid "Pop-Up Message"
 msgstr "ポップアップ・メッセージ"
 
-#: ../libpurple/protocols/oscar/oscar.c:3913
+#: ../libpurple/protocols/oscar/oscar.c:3917
 #, 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:3918
+#: ../libpurple/protocols/oscar/oscar.c:3922
 msgid "Screen name"
 msgstr "スクリーン名"
 
-#: ../libpurple/protocols/oscar/oscar.c:3944
+#: ../libpurple/protocols/oscar/oscar.c:3948
 #, c-format
 msgid "No results found for e-mail address %s"
 msgstr "E-メール・アドレス %s に対する結果を得られませんでした"
 
-#: ../libpurple/protocols/oscar/oscar.c:3965
+#: ../libpurple/protocols/oscar/oscar.c:3969
 #, c-format
 msgid "You should receive an e-mail asking to confirm %s."
 msgstr "%s さんを確認するための問い合わせメールを受信して下さい"
 
-#: ../libpurple/protocols/oscar/oscar.c:3967
+#: ../libpurple/protocols/oscar/oscar.c:3971
 msgid "Account Confirmation Requested"
 msgstr "アカウント認証を要求しました"
 
-#: ../libpurple/protocols/oscar/oscar.c:3998
+#: ../libpurple/protocols/oscar/oscar.c:4002
+#, c-format
 msgid "Error Changing Account Info"
 msgstr "アカウント情報変更エラー"
 
-#: ../libpurple/protocols/oscar/oscar.c:4001
+#: ../libpurple/protocols/oscar/oscar.c:4005
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -8885,19 +8882,19 @@
 "エラー 0x%04x: 要求されたスクリーン名がオリジナルと異なっているため、整形でき"
 "ません。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4004
+#: ../libpurple/protocols/oscar/oscar.c:4008
 #, c-format
 msgid "Error 0x%04x: Unable to format screen name because it is invalid."
 msgstr "エラー 0x%04x: 要求されたスクリーン名が間違っているので整形できません"
 
-#: ../libpurple/protocols/oscar/oscar.c:4007
+#: ../libpurple/protocols/oscar/oscar.c:4011
 #, 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:4010
+#: ../libpurple/protocols/oscar/oscar.c:4014
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because there is already a "
@@ -8906,7 +8903,7 @@
 "エラー 0x%04x: このスクリーン名に対して既に要求がきているので E-メール・アド"
 "レスを変更できません"
 
-#: ../libpurple/protocols/oscar/oscar.c:4013
+#: ../libpurple/protocols/oscar/oscar.c:4017
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address has "
@@ -8915,7 +8912,7 @@
 "エラー 0x%04x: たくさんのスクリーン名に割り当てられているので、この E-メー"
 "ル・アドレスには変更できません"
 
-#: ../libpurple/protocols/oscar/oscar.c:4016
+#: ../libpurple/protocols/oscar/oscar.c:4020
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address is "
@@ -8924,32 +8921,32 @@
 "エラー 0x%04x: このアドレスが間違っているので、この E-メール・アドレスに変更"
 "できません"
 
-#: ../libpurple/protocols/oscar/oscar.c:4019
+#: ../libpurple/protocols/oscar/oscar.c:4023
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "エラー 0x%04x: 原因不明のエラーです"
 
-#: ../libpurple/protocols/oscar/oscar.c:4029
+#: ../libpurple/protocols/oscar/oscar.c:4033
 #, c-format
 msgid "The e-mail address for %s is %s"
 msgstr "%s さんの E-メール・アドレスは %s です"
 
-#: ../libpurple/protocols/oscar/oscar.c:4031
+#: ../libpurple/protocols/oscar/oscar.c:4035
 msgid "Account Info"
 msgstr "アカウント情報"
 
-#: ../libpurple/protocols/oscar/oscar.c:4214
+#: ../libpurple/protocols/oscar/oscar.c:4218
 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:4485
+#: ../libpurple/protocols/oscar/oscar.c:4489
 msgid "Unable to set AIM profile."
 msgstr "AIM プロフィールをセットできません"
 
-#: ../libpurple/protocols/oscar/oscar.c:4486
+#: ../libpurple/protocols/oscar/oscar.c:4490
 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 "
@@ -8959,7 +8956,7 @@
 "す。あなたのプロフィールは設定されずに残っています。接続が完了してから再度試"
 "して下さい。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4500
+#: ../libpurple/protocols/oscar/oscar.c:4504
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  It has been "
@@ -8970,11 +8967,11 @@
 msgstr[0] "プロフィールの長さが上限値 ( %dバイト) に達したので切りつめました"
 msgstr[1] "プロフィールの長さが上限値 ( %dバイト) に達したので切りつめました"
 
-#: ../libpurple/protocols/oscar/oscar.c:4505
+#: ../libpurple/protocols/oscar/oscar.c:4509
 msgid "Profile too long."
 msgstr "プロフィールが長すぎます"
 
-#: ../libpurple/protocols/oscar/oscar.c:4550
+#: ../libpurple/protocols/oscar/oscar.c:4554
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  It has been "
@@ -8985,11 +8982,11 @@
 msgstr[0] "離席メッセージの長さが上限値 ( %dバイト) に達したので切りつめました"
 msgstr[1] "離席メッセージの長さが上限値 ( %dバイト) に達したので切りつめました"
 
-#: ../libpurple/protocols/oscar/oscar.c:4555
+#: ../libpurple/protocols/oscar/oscar.c:4559
 msgid "Away message too long."
 msgstr "離席メッセージが長すぎます"
 
-#: ../libpurple/protocols/oscar/oscar.c:4624
+#: ../libpurple/protocols/oscar/oscar.c:4628
 #, fuzzy, c-format
 msgid ""
 "Could not add the buddy %s because the screen name is invalid.  Screen names "
@@ -8999,17 +8996,17 @@
 "スクリーン名が間違っているため仲間 %s を追加できませんでした。スクリーン名の"
 "先頭は文字にし、文字と数字とスペースのみ、または数字のみにして下さい。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4626
-#: ../libpurple/protocols/oscar/oscar.c:5056
-#: ../libpurple/protocols/oscar/oscar.c:5071
+#: ../libpurple/protocols/oscar/oscar.c:4630
+#: ../libpurple/protocols/oscar/oscar.c:5060
+#: ../libpurple/protocols/oscar/oscar.c:5075
 msgid "Unable To Add"
 msgstr "追加できません"
 
-#: ../libpurple/protocols/oscar/oscar.c:4735
+#: ../libpurple/protocols/oscar/oscar.c:4739
 msgid "Unable To Retrieve Buddy List"
 msgstr "仲間リストを取得できません"
 
-#: ../libpurple/protocols/oscar/oscar.c:4736
+#: ../libpurple/protocols/oscar/oscar.c:4740
 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."
@@ -9017,15 +9014,15 @@
 "一時的に AIM サーバから仲間リストを取得できませんでした。仲間リストは失われて"
 "いません。おそらく数時間後には利用できるようになっているでしょう。"
 
-#: ../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
+#: ../libpurple/protocols/oscar/oscar.c:4922
+#: ../libpurple/protocols/oscar/oscar.c:4924
+#: ../libpurple/protocols/oscar/oscar.c:5140
+#: ../libpurple/protocols/oscar/oscar.c:5141
+#: ../libpurple/protocols/oscar/oscar.c:5146
 msgid "Orphans"
 msgstr "みなしご"
 
-#: ../libpurple/protocols/oscar/oscar.c:5054
+#: ../libpurple/protocols/oscar/oscar.c:5058
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -9034,17 +9031,17 @@
 "仲間の %s さんを追加することができませんでした。仲間の数が多すぎます。一人削"
 "除して再度挑戦して下さい。"
 
-#: ../libpurple/protocols/oscar/oscar.c:5054
-#: ../libpurple/protocols/oscar/oscar.c:5069
+#: ../libpurple/protocols/oscar/oscar.c:5058
+#: ../libpurple/protocols/oscar/oscar.c:5073
 msgid "(no name)"
 msgstr "(名前無し)"
 
-#: ../libpurple/protocols/oscar/oscar.c:5068
+#: ../libpurple/protocols/oscar/oscar.c:5072
 #, fuzzy, c-format
 msgid "Could not add the buddy %s for an unknown reason."
 msgstr "原因不明ですが、コマンド適用に失敗しました"
 
-#: ../libpurple/protocols/oscar/oscar.c:5174
+#: ../libpurple/protocols/oscar/oscar.c:5178
 #, c-format
 msgid ""
 "The user %s has given you permission to add you to their buddy list.  Do you "
@@ -9053,22 +9050,22 @@
 "ユーザの %s さんがあなたを仲間リストに加えることを許可しました。彼らを加えて"
 "もよろしいですか?"
 
-#: ../libpurple/protocols/oscar/oscar.c:5182
+#: ../libpurple/protocols/oscar/oscar.c:5186
 msgid "Authorization Given"
 msgstr "承認が得られました"
 
 #. Granted
-#: ../libpurple/protocols/oscar/oscar.c:5255
+#: ../libpurple/protocols/oscar/oscar.c:5259
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
 msgstr "ユーザの %s さんは仲間リストに追加するあなたの要求を承認しました"
 
-#: ../libpurple/protocols/oscar/oscar.c:5256
+#: ../libpurple/protocols/oscar/oscar.c:5260
 msgid "Authorization Granted"
 msgstr "承認が得られました"
 
 #. Denied
-#: ../libpurple/protocols/oscar/oscar.c:5259
+#: ../libpurple/protocols/oscar/oscar.c:5263
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -9079,52 +9076,52 @@
 "した:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:5260
+#: ../libpurple/protocols/oscar/oscar.c:5264
 msgid "Authorization Denied"
 msgstr "承認は拒否されました"
 
-#: ../libpurple/protocols/oscar/oscar.c:5296
+#: ../libpurple/protocols/oscar/oscar.c:5300
 #: ../libpurple/protocols/toc/toc.c:1371
 msgid "_Exchange:"
 msgstr "交換(_E):"
 
-#: ../libpurple/protocols/oscar/oscar.c:5336
+#: ../libpurple/protocols/oscar/oscar.c:5340
 msgid "Invalid chat name specified."
 msgstr "不正なチャット名が指定されました"
 
-#: ../libpurple/protocols/oscar/oscar.c:5405
+#: ../libpurple/protocols/oscar/oscar.c:5409
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 msgstr ""
 "IM 画像が送信されませんでした。AIM チャットで IM 画像を送信できません。"
 
-#: ../libpurple/protocols/oscar/oscar.c:5567
-#: ../libpurple/protocols/oscar/oscar.c:5572
+#: ../libpurple/protocols/oscar/oscar.c:5569
+#: ../libpurple/protocols/oscar/oscar.c:5574
 msgid "Away Message"
 msgstr "離席メッセージ"
 
-#: ../libpurple/protocols/oscar/oscar.c:5572
+#: ../libpurple/protocols/oscar/oscar.c:5574
 msgid "<i>(retrieving)</i>"
 msgstr "<i>(取得中)</i>"
 
-#: ../libpurple/protocols/oscar/oscar.c:5772
+#: ../libpurple/protocols/oscar/oscar.c:5774
 msgid "iTunes Music Store Link"
 msgstr "iTunes 楽曲ストアのリンク"
 
-#: ../libpurple/protocols/oscar/oscar.c:5880
+#: ../libpurple/protocols/oscar/oscar.c:5882
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "%s さんに対する仲間のコメント"
 
-#: ../libpurple/protocols/oscar/oscar.c:5881
+#: ../libpurple/protocols/oscar/oscar.c:5883
 msgid "Buddy Comment:"
 msgstr "仲間のコメント:"
 
-#: ../libpurple/protocols/oscar/oscar.c:5928
+#: ../libpurple/protocols/oscar/oscar.c:5930
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr "%s を利用した Direct IM 接続の開始を選択しています。"
 
-#: ../libpurple/protocols/oscar/oscar.c:5932
+#: ../libpurple/protocols/oscar/oscar.c:5934
 msgid ""
 "Because this reveals your IP address, it may be considered a security risk.  "
 "Do you wish to continue?"
@@ -9132,65 +9129,65 @@
 "理由は、あなたの IP-アドレスを開示することになるからです。これにより個人情報"
 "に関する危険性が高まります。続行してもよろしいですか?"
 
-#: ../libpurple/protocols/oscar/oscar.c:5938
+#: ../libpurple/protocols/oscar/oscar.c:5940
 #: ../libpurple/protocols/oscar/peer.c:1045
 msgid "C_onnect"
 msgstr "接続する(_O)"
 
-#: ../libpurple/protocols/oscar/oscar.c:5973
+#: ../libpurple/protocols/oscar/oscar.c:5975
 msgid "Get AIM Info"
 msgstr "AIM 情報の取得"
 
-#: ../libpurple/protocols/oscar/oscar.c:5979
+#: ../libpurple/protocols/oscar/oscar.c:5981
 msgid "Edit Buddy Comment"
 msgstr "仲間のコメントの編集"
 
-#: ../libpurple/protocols/oscar/oscar.c:5987
+#: ../libpurple/protocols/oscar/oscar.c:5989
 msgid "Get Status Msg"
 msgstr "状態メッセージの取得"
 
-#: ../libpurple/protocols/oscar/oscar.c:6000
+#: ../libpurple/protocols/oscar/oscar.c:6002
 msgid "Direct IM"
 msgstr "Direct IM"
 
-#: ../libpurple/protocols/oscar/oscar.c:6022
+#: ../libpurple/protocols/oscar/oscar.c:6024
 msgid "Re-request Authorization"
 msgstr "承認の再要求"
 
-#: ../libpurple/protocols/oscar/oscar.c:6081
+#: ../libpurple/protocols/oscar/oscar.c:6083
 msgid "Require authorization"
 msgstr "承認が必要です"
 
-#: ../libpurple/protocols/oscar/oscar.c:6084
+#: ../libpurple/protocols/oscar/oscar.c:6086
 msgid "Web aware (enabling this will cause you to receive SPAM!)"
 msgstr ""
 "ウェブは知っている (これを有効にすると SPAM を受け取ることになりますよ!)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6089
+#: ../libpurple/protocols/oscar/oscar.c:6091
 msgid "ICQ Privacy Options"
 msgstr "ICQ プライバシーのオプション"
 
-#: ../libpurple/protocols/oscar/oscar.c:6108
+#: ../libpurple/protocols/oscar/oscar.c:6110
 msgid "The new formatting is invalid."
 msgstr "新しい書式が間違っています"
 
-#: ../libpurple/protocols/oscar/oscar.c:6109
+#: ../libpurple/protocols/oscar/oscar.c:6111
 msgid "Screen name formatting can change only capitalization and whitespace."
 msgstr "スクリーン名の書式は大文字と空白文字しか変更できません"
 
-#: ../libpurple/protocols/oscar/oscar.c:6162
+#: ../libpurple/protocols/oscar/oscar.c:6164
 msgid "Change Address To:"
 msgstr "変更するアドレス:"
 
-#: ../libpurple/protocols/oscar/oscar.c:6208
+#: ../libpurple/protocols/oscar/oscar.c:6210
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>あなたは承認を待っていません</i>"
 
-#: ../libpurple/protocols/oscar/oscar.c:6211
+#: ../libpurple/protocols/oscar/oscar.c:6213
 msgid "You are awaiting authorization from the following buddies"
 msgstr "あなたは次の仲間からの承認を待っています"
 
-#: ../libpurple/protocols/oscar/oscar.c:6212
+#: ../libpurple/protocols/oscar/oscar.c:6214
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
@@ -9198,73 +9195,73 @@
 "右クリックして \"承認の再要求\" を選択することで、これらの仲間からの承認をも"
 "う一度要求できます。"
 
-#: ../libpurple/protocols/oscar/oscar.c:6229
+#: ../libpurple/protocols/oscar/oscar.c:6231
 msgid "Find Buddy by E-Mail"
 msgstr "E-メールから仲間を捜す"
 
-#: ../libpurple/protocols/oscar/oscar.c:6230
+#: ../libpurple/protocols/oscar/oscar.c:6232
 msgid "Search for a buddy by e-mail address"
 msgstr "E-メール・アドレスから仲間を検索します"
 
-#: ../libpurple/protocols/oscar/oscar.c:6231
+#: ../libpurple/protocols/oscar/oscar.c:6233
 msgid "Type the e-mail address of the buddy you are searching for."
 msgstr "検索する仲間の E-メール・アドレスを入力して下さい"
 
-#: ../libpurple/protocols/oscar/oscar.c:6234
+#: ../libpurple/protocols/oscar/oscar.c:6236
 msgid "_Search"
 msgstr "検索(_S)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6392
+#: ../libpurple/protocols/oscar/oscar.c:6394
 msgid "Set User Info (URL)..."
 msgstr "ユーザ情報のセット(URL)..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6403
+#: ../libpurple/protocols/oscar/oscar.c:6405
 msgid "Change Password (URL)"
 msgstr "パスワード変更 (URL)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6407
+#: ../libpurple/protocols/oscar/oscar.c:6409
 msgid "Configure IM Forwarding (URL)"
 msgstr "IM フォワーディング (URL) の設定"
 
 #. ICQ actions
-#: ../libpurple/protocols/oscar/oscar.c:6417
+#: ../libpurple/protocols/oscar/oscar.c:6419
 msgid "Set Privacy Options..."
 msgstr "プライバシー・オプションの追加..."
 
 #. AIM actions
-#: ../libpurple/protocols/oscar/oscar.c:6424
+#: ../libpurple/protocols/oscar/oscar.c:6426
 msgid "Confirm Account"
 msgstr "アカウントの確認"
 
-#: ../libpurple/protocols/oscar/oscar.c:6428
+#: ../libpurple/protocols/oscar/oscar.c:6430
 msgid "Display Currently Registered E-Mail Address"
 msgstr "現在登録されている E-メール・アドレスの表示"
 
-#: ../libpurple/protocols/oscar/oscar.c:6432
+#: ../libpurple/protocols/oscar/oscar.c:6434
 msgid "Change Currently Registered E-Mail Address..."
 msgstr "現在登録されている E-メール・アドレスの変更..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6439
+#: ../libpurple/protocols/oscar/oscar.c:6441
 msgid "Show Buddies Awaiting Authorization"
 msgstr "承認を待っている仲間を表示"
 
-#: ../libpurple/protocols/oscar/oscar.c:6445
+#: ../libpurple/protocols/oscar/oscar.c:6447
 msgid "Search for Buddy by E-Mail Address..."
 msgstr "E-メールで仲間の検索..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6450
+#: ../libpurple/protocols/oscar/oscar.c:6452
 msgid "Search for Buddy by Information"
 msgstr "情報で仲間の検索..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6518
+#: ../libpurple/protocols/oscar/oscar.c:6520
 msgid "Use recent buddies group"
 msgstr "現在のグループを利用する"
 
-#: ../libpurple/protocols/oscar/oscar.c:6521
+#: ../libpurple/protocols/oscar/oscar.c:6523
 msgid "Show how long you have been idle"
 msgstr "待機中の時間を表示する"
 
-#: ../libpurple/protocols/oscar/oscar.c:6676
+#: ../libpurple/protocols/oscar/oscar.c:6678
 msgid ""
 "Always use ICQ proxy server for file transfers\n"
 "(slower, but does not reveal your IP address)"
@@ -9283,6 +9280,7 @@
 msgstr "%s:%hu にコンタクトを試みています"
 
 #: ../libpurple/protocols/oscar/peer.c:856
+#, c-format
 msgid "Attempting to connect via proxy server."
 msgstr "プロキシ・サーバを介してコンタクトを試みています..."
 
@@ -9761,7 +9759,7 @@
 msgid "Error requesting login token"
 msgstr "接続を開始する際にエラー"
 
-#: ../libpurple/protocols/qq/login_logout.c:488
+#: ../libpurple/protocols/qq/login_logout.c:486
 msgid "Unable to login, check debug log"
 msgstr "ログインできません (デバッグ・ログを確認して下さい)"
 
@@ -10142,7 +10140,7 @@
 msgid "Send TEST Announcement"
 msgstr "TEST 用アナウンスを送信する"
 
-#: ../libpurple/protocols/sametime/sametime.c:3586 ../pidgin/gtkconv.c:4417
+#: ../libpurple/protocols/sametime/sametime.c:3586 ../pidgin/gtkconv.c:4354
 msgid "Topic:"
 msgstr "トピック:"
 
@@ -10167,7 +10165,7 @@
 msgid "No Sametime Community Server Specified"
 msgstr "Sametime コミュニティ・サーバを指定して下さい"
 
-#: ../libpurple/protocols/sametime/sametime.c:3644 ../pidgin/gtkblist.c:4323
+#: ../libpurple/protocols/sametime/sametime.c:3644 ../pidgin/gtkblist.c:4041
 msgid "Connect"
 msgstr "接続"
 
@@ -10220,6 +10218,10 @@
 "ID '%s' に該当するユーザが Sametime コミュニティの中にはいませんでした。仲間"
 "リストからこのエントリを削除しました。"
 
+#: ../libpurple/protocols/sametime/sametime.c:4425
+msgid "Unable to add user"
+msgstr "ユーザを追加できません"
+
 #: ../libpurple/protocols/sametime/sametime.c:5011
 #, c-format
 msgid ""
@@ -10341,7 +10343,7 @@
 "のユーザを仲間リストに追加するか、または次のアクション・ボタンを選択して彼ら"
 "にメッセージを送信した方が良いでしょう。"
 
-#: ../libpurple/protocols/sametime/sametime.c:5538 ../pidgin/gtknotify.c:755
+#: ../libpurple/protocols/sametime/sametime.c:5538 ../pidgin/gtknotify.c:756
 msgid "Search Results"
 msgstr "検索結果"
 
@@ -10914,6 +10916,7 @@
 
 #: ../libpurple/protocols/silc/chat.c:153
 #: ../libpurple/protocols/silc10/chat.c:152
+#, c-format
 msgid "<br><b>Channel Modes:</b> "
 msgstr "<br><b>チャンネル・モード:</b> "
 
@@ -10952,6 +10955,7 @@
 
 #: ../libpurple/protocols/silc/chat.c:435
 #: ../libpurple/protocols/silc10/chat.c:413
+#, c-format
 msgid ""
 "Channel authentication is used to secure the channel from unauthorized "
 "access. The authentication may be based on passphrase and digital "
@@ -11573,6 +11577,7 @@
 msgstr "SILC サーバへ接続中"
 
 #: ../libpurple/protocols/silc/silc.c:352
+#, c-format
 msgid "Could not load SILC key pair"
 msgstr "SILC の鍵ペアを読み込めませんでした"
 
@@ -11601,7 +11606,8 @@
 msgstr "現在の Mood"
 
 #: ../libpurple/protocols/silc/silc.c:741
-#: ../libpurple/protocols/silc10/silc.c:652 ../pidgin/gtkprefs.c:1643
+#: ../libpurple/protocols/silc10/silc.c:652 ../pidgin/gtkprefs.c:1641
+#, c-format
 msgid "Normal"
 msgstr "標準"
 
@@ -12002,7 +12008,7 @@
 msgstr "セキュアなインターネット・ライブ会議 (SILC) プロトコル"
 
 #: ../libpurple/protocols/silc/silc.c:1910
-#: ../libpurple/protocols/silc10/silc.c:1853 ../pidgin/gtkprefs.c:2038
+#: ../libpurple/protocols/silc10/silc.c:1853 ../pidgin/gtkprefs.c:2036
 msgid "Network"
 msgstr "ネットワーク"
 
@@ -12202,43 +12208,53 @@
 msgstr "サーバの統計情報は利用できません"
 
 #: ../libpurple/protocols/silc10/ops.c:1931
+#, c-format
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "失敗: バージョン不整合、クライアントをアップグレードして下さい"
 
 #: ../libpurple/protocols/silc10/ops.c:1934
+#, c-format
 msgid "Failure: Remote does not trust/support your public key"
 msgstr ""
 "失敗: リモート側は信用されていなか、お使いの公開鍵をサポートしていません"
 
 #: ../libpurple/protocols/silc10/ops.c:1937
+#, c-format
 msgid "Failure: Remote does not support proposed KE group"
 msgstr "失敗: リモート側は推奨されている KE グループをサポートしていません"
 
 #: ../libpurple/protocols/silc10/ops.c:1940
+#, c-format
 msgid "Failure: Remote does not support proposed cipher"
 msgstr "失敗: リモート側は推奨されている Cipher をサポートしていません"
 
 #: ../libpurple/protocols/silc10/ops.c:1943
+#, c-format
 msgid "Failure: Remote does not support proposed PKCS"
 msgstr "失敗: リモート側は推奨されている PKCS をサポートしていません"
 
 #: ../libpurple/protocols/silc10/ops.c:1946
+#, c-format
 msgid "Failure: Remote does not support proposed hash function"
 msgstr "失敗: リモート側は推奨されているハッシュ機能をサポートしていません"
 
 #: ../libpurple/protocols/silc10/ops.c:1949
+#, c-format
 msgid "Failure: Remote does not support proposed HMAC"
 msgstr "失敗: リモート側は推奨されている HMAC をサポートしていません"
 
 #: ../libpurple/protocols/silc10/ops.c:1951
+#, c-format
 msgid "Failure: Incorrect signature"
 msgstr "失敗: 不正な署名です"
 
 #: ../libpurple/protocols/silc10/ops.c:1953
+#, c-format
 msgid "Failure: Invalid cookie"
 msgstr "失敗: 不正なクッキーです"
 
 #: ../libpurple/protocols/silc10/ops.c:1964
+#, c-format
 msgid "Failure: Authentication failed"
 msgstr "失敗: 認証に失敗しました"
 
@@ -12265,31 +12281,31 @@
 msgstr "書き込めませんでした"
 
 #: ../libpurple/protocols/simple/simple.c:438
-#: ../libpurple/protocols/simple/simple.c:1531
+#: ../libpurple/protocols/simple/simple.c:1529
 msgid "Could not connect"
 msgstr "接続できませんでした"
 
-#: ../libpurple/protocols/simple/simple.c:1061
+#: ../libpurple/protocols/simple/simple.c:1059
 #, 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
+#: ../libpurple/protocols/simple/simple.c:1563
+#: ../libpurple/protocols/simple/simple.c:1605
+#: ../libpurple/protocols/simple/simple.c:1618
+#: ../libpurple/protocols/simple/simple.c:1669
 msgid "Could not create listen socket"
 msgstr "ソケットを生成できませんでした"
 
-#: ../libpurple/protocols/simple/simple.c:1588
+#: ../libpurple/protocols/simple/simple.c:1586
 msgid "Couldn't resolve host"
 msgstr "ホスト名を解決できませんでした"
 
-#: ../libpurple/protocols/simple/simple.c:1679
+#: ../libpurple/protocols/simple/simple.c:1677
 msgid "Could not resolve hostname"
 msgstr "ホスト名を解決できませんでした"
 
-#: ../libpurple/protocols/simple/simple.c:1696
+#: ../libpurple/protocols/simple/simple.c:1694
 msgid "SIP screen names may not contain whitespaces or @ symbols"
 msgstr "SIP のスクリーン名に空白または @ 記号が含まれていないようです"
 
@@ -12301,36 +12317,36 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../libpurple/protocols/simple/simple.c:1872
+#: ../libpurple/protocols/simple/simple.c:1870
 msgid "SIP/SIMPLE Protocol Plugin"
 msgstr "SIP/SIMPLE プロトコルのプラグイン"
 
 #. *  summary
-#: ../libpurple/protocols/simple/simple.c:1873
+#: ../libpurple/protocols/simple/simple.c:1871
 msgid "The SIP/SIMPLE Protocol Plugin"
 msgstr "SIP/SIMPLE プロトコルのプラグイン"
 
-#: ../libpurple/protocols/simple/simple.c:1901
+#: ../libpurple/protocols/simple/simple.c:1899
 msgid "Publish status (note: everyone may watch you)"
 msgstr "状態を公開する (注記: 他のユーザから丸見えになります)"
 
-#: ../libpurple/protocols/simple/simple.c:1907
+#: ../libpurple/protocols/simple/simple.c:1905
 msgid "Use UDP"
 msgstr "UDP を使用する"
 
+#: ../libpurple/protocols/simple/simple.c:1907
+msgid "Use proxy"
+msgstr "プロキシを利用する"
+
 #: ../libpurple/protocols/simple/simple.c:1909
-msgid "Use proxy"
-msgstr "プロキシを利用する"
-
-#: ../libpurple/protocols/simple/simple.c:1911
 msgid "Proxy"
 msgstr "プロキシ"
 
-#: ../libpurple/protocols/simple/simple.c:1913
+#: ../libpurple/protocols/simple/simple.c:1911
 msgid "Auth User"
 msgstr "ユーザ認証"
 
-#: ../libpurple/protocols/simple/simple.c:1915
+#: ../libpurple/protocols/simple/simple.c:1913
 msgid "Auth Domain"
 msgstr "ドメイン認証"
 
@@ -12375,6 +12391,7 @@
 msgstr "%s の警告は許されません"
 
 #: ../libpurple/protocols/toc/toc.c:503
+#, c-format
 msgid "A message has been dropped, you are exceeding the server speed limit."
 msgstr "サーバの速度制限を越えたためメッセージは落されました"
 
@@ -12399,38 +12416,47 @@
 msgstr "早く送りすぎたので %s さんからの IM を無視しました"
 
 #: ../libpurple/protocols/toc/toc.c:518
+#, c-format
 msgid "Failure."
 msgstr "失敗しました"
 
 #: ../libpurple/protocols/toc/toc.c:521
+#, c-format
 msgid "Too many matches."
 msgstr "一致するものが多すぎます"
 
 #: ../libpurple/protocols/toc/toc.c:524
+#, c-format
 msgid "Need more qualifiers."
 msgstr "より多くの修飾語を必要とします"
 
 #: ../libpurple/protocols/toc/toc.c:527
+#, c-format
 msgid "Dir service temporarily unavailable."
 msgstr "一時的にディレクトリ・サービスが利用できません"
 
 #: ../libpurple/protocols/toc/toc.c:530
+#, c-format
 msgid "E-mail lookup restricted."
 msgstr "E-メール検索が拒否されました"
 
 #: ../libpurple/protocols/toc/toc.c:533
+#, c-format
 msgid "Keyword ignored."
 msgstr "キーワードが無効です"
 
 #: ../libpurple/protocols/toc/toc.c:536
+#, c-format
 msgid "No keywords."
 msgstr "キーワードがありません"
 
 #: ../libpurple/protocols/toc/toc.c:539
+#, c-format
 msgid "User has no directory information."
 msgstr "フォルダ情報がありません"
 
 #: ../libpurple/protocols/toc/toc.c:543
+#, c-format
 msgid "Country not supported."
 msgstr "サポートされていない国です"
 
@@ -12440,18 +12466,22 @@
 msgstr "原因不明の失敗: %s"
 
 #: ../libpurple/protocols/toc/toc.c:549
+#, c-format
 msgid "Incorrect screen name or password."
 msgstr "スクリーン名またはパスワードが間違っています"
 
 #: ../libpurple/protocols/toc/toc.c:552
+#, c-format
 msgid "The service is temporarily unavailable."
 msgstr "一時的にサービスが利用できません"
 
 #: ../libpurple/protocols/toc/toc.c:555
+#, c-format
 msgid "Your warning level is currently too high to log in."
 msgstr "ログインする警告レベルが高すぎます"
 
 #: ../libpurple/protocols/toc/toc.c:558
+#, c-format
 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."
@@ -12489,8 +12519,8 @@
 msgid "Password Change Successful"
 msgstr "パスワードの変更が完了しました"
 
-#: ../libpurple/protocols/toc/toc.c:1366 ../pidgin/gtkblist.c:5871
-#: ../pidgin/gtkblist.c:6227
+#: ../libpurple/protocols/toc/toc.c:1366 ../pidgin/gtkblist.c:5582
+#: ../pidgin/gtkblist.c:5932
 msgid "_Group:"
 msgstr "グループ(_G):"
 
@@ -12551,25 +12581,25 @@
 msgid "TOC Protocol Plugin"
 msgstr "TOC プロトコル・プラグイン"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:784
+#: ../libpurple/protocols/yahoo/yahoo.c:782
 #, c-format
 msgid "%s has sent you a webcam invite, which is not yet supported."
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:840
+#: ../libpurple/protocols/yahoo/yahoo.c:838
 msgid "Your Yahoo! message did not get sent."
 msgstr "Yahoo! メッセージを送ることができませんでした。"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:959
+#: ../libpurple/protocols/yahoo/yahoo.c:960
 #, c-format
 msgid "Yahoo! system message for %s:"
 msgstr "%s の Yahoo! システム・メッセージ:"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1028
+#: ../libpurple/protocols/yahoo/yahoo.c:1029
 msgid "Authorization denied message:"
 msgstr "承認を拒否する旨のメッセージ:"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1046
+#: ../libpurple/protocols/yahoo/yahoo.c:1047
 #, c-format
 msgid ""
 "%s has (retroactively) denied your request to add them to your list for the "
@@ -12578,17 +12608,17 @@
 "%s は次の理由のため仲間リストに追加するあなたの要求を (以前にさかのぼって) 拒"
 "否しました\" %s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1049
+#: ../libpurple/protocols/yahoo/yahoo.c:1050
 #, c-format
 msgid "%s has (retroactively) denied your request to add them to your list."
 msgstr ""
 "%s は仲間リストに追加するあなたの要求を (以前にさかのぼって) 拒否しました。"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1051
+#: ../libpurple/protocols/yahoo/yahoo.c:1052
 msgid "Add buddy rejected"
 msgstr "拒否する仲間の追加"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1993
+#: ../libpurple/protocols/yahoo/yahoo.c:1994
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -12599,11 +12629,11 @@
 "pidgin ではおそらく Yahoo にサイン・インできないでしょう。%s にアップデートで"
 "きるか確認してみて下さい。"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1996
+#: ../libpurple/protocols/yahoo/yahoo.c:1997
 msgid "Failed Yahoo! Authentication"
 msgstr "Yahoo! 認証に失敗"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2062
+#: ../libpurple/protocols/yahoo/yahoo.c:2063
 #, c-format
 msgid ""
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
@@ -12612,54 +12642,54 @@
 "%s を無視しようとしましたが、ユーザが仲間リストにあります。そのユーザを仲間リ"
 "ストから削除して無視する場合は、\"はい\" をクリックして下さい。"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2065
+#: ../libpurple/protocols/yahoo/yahoo.c:2066
 msgid "Ignore buddy?"
 msgstr "仲間を無視しますか?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2128
+#: ../libpurple/protocols/yahoo/yahoo.c:2129
 msgid "Your account is locked, please log in to the Yahoo! website."
 msgstr ""
 "お使いのアカウントがロックされています。Yahoo! ウェブサイトへログインして下さ"
 "い。"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2131
+#: ../libpurple/protocols/yahoo/yahoo.c:2132
 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr ""
 "不明なエラー番号 %d です。Yahoo! ウェブサイトへログインすると修正されるかもし"
 "れません。"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2185
+#: ../libpurple/protocols/yahoo/yahoo.c:2186
 #, 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:2188
+#: ../libpurple/protocols/yahoo/yahoo.c:2189
 msgid "Could not add buddy to server list"
 msgstr "仲間をサーバ・リストに追加できませんでした"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2307
+#: ../libpurple/protocols/yahoo/yahoo.c:2308
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ 演奏可能 %s/%s/%s.swf ] %s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2650
+#: ../libpurple/protocols/yahoo/yahoo.c:2651
 msgid "Received unexpected HTTP response from server."
 msgstr "サーバから想定外の HTTP 応答を受け取りました"
 
-#: ../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/yahoo.c:2675
+#: ../libpurple/protocols/yahoo/yahoo.c:2861
+#: ../libpurple/protocols/yahoo/yahoo.c:2964
+#: ../libpurple/protocols/yahoo/yahoo.c:2974
 #: ../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:2700
+#: ../libpurple/protocols/yahoo/yahoo.c:2701
 #, c-format
 msgid ""
 "Lost connection with %s:\n"
@@ -12668,7 +12698,7 @@
 "%s との接続を失いました:\n"
 "%s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2725
+#: ../libpurple/protocols/yahoo/yahoo.c:2726
 #, c-format
 msgid ""
 "Could not establish a connection with %s:\n"
@@ -12677,105 +12707,114 @@
 "%s との接続を確立できませんでした:\n"
 "%s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3080
-#: ../libpurple/protocols/yahoo/yahoo.c:3766
+#: ../libpurple/protocols/yahoo/yahoo.c:3081
+#: ../libpurple/protocols/yahoo/yahoo.c:3767
 msgid "Not at Home"
 msgstr "家に居ません"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3082
-#: ../libpurple/protocols/yahoo/yahoo.c:3769
+#: ../libpurple/protocols/yahoo/yahoo.c:3083
+#: ../libpurple/protocols/yahoo/yahoo.c:3770
 msgid "Not at Desk"
 msgstr "在席していません"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3084
-#: ../libpurple/protocols/yahoo/yahoo.c:3772
+#: ../libpurple/protocols/yahoo/yahoo.c:3085
+#: ../libpurple/protocols/yahoo/yahoo.c:3773
 msgid "Not in Office"
 msgstr "オフィスに居ません"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3088
-#: ../libpurple/protocols/yahoo/yahoo.c:3778
+#: ../libpurple/protocols/yahoo/yahoo.c:3089
+#: ../libpurple/protocols/yahoo/yahoo.c:3779
 msgid "On Vacation"
 msgstr "休暇中です"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3092
-#: ../libpurple/protocols/yahoo/yahoo.c:3784
+#: ../libpurple/protocols/yahoo/yahoo.c:3093
+#: ../libpurple/protocols/yahoo/yahoo.c:3785
 msgid "Stepped Out"
 msgstr "ちょっとそこまで"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3185
-#: ../libpurple/protocols/yahoo/yahoo.c:3215
+#: ../libpurple/protocols/yahoo/yahoo.c:3186
+#: ../libpurple/protocols/yahoo/yahoo.c:3216
 msgid "Not on server list"
 msgstr "サーバ・リストにありません"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3232
-#: ../libpurple/protocols/yahoo/yahoo.c:3290
+#: ../libpurple/protocols/yahoo/yahoo.c:3233
+#: ../libpurple/protocols/yahoo/yahoo.c:3291
 msgid "Appear Online"
 msgstr "オンラインのようです"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3235
-#: ../libpurple/protocols/yahoo/yahoo.c:3311
+#: ../libpurple/protocols/yahoo/yahoo.c:3236
+#: ../libpurple/protocols/yahoo/yahoo.c:3312
 msgid "Appear Permanently Offline"
 msgstr "一時的にオフラインのようです"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3253
+#: ../libpurple/protocols/yahoo/yahoo.c:3254
 msgid "Presence"
 msgstr "在席"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3296
+#: ../libpurple/protocols/yahoo/yahoo.c:3297
 msgid "Appear Offline"
 msgstr "オフラインのようです"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3305
+#: ../libpurple/protocols/yahoo/yahoo.c:3306
 msgid "Don't Appear Permanently Offline"
 msgstr "Don't Appear Permanently Offline"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3353
+#: ../libpurple/protocols/yahoo/yahoo.c:3354
 msgid "Join in Chat"
 msgstr "チャットへ参加"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3359
+#: ../libpurple/protocols/yahoo/yahoo.c:3360
 msgid "Initiate Conference"
 msgstr "会議に招待"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3387
+#: ../libpurple/protocols/yahoo/yahoo.c:3388
 msgid "Presence Settings"
 msgstr "在席状態の設定"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3393
+#: ../libpurple/protocols/yahoo/yahoo.c:3394
 msgid "Start Doodling"
 msgstr "いたずら書きする"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3494
+#: ../libpurple/protocols/yahoo/yahoo.c:3495
 #, fuzzy
 msgid "Activate which ID?"
 msgstr "どの ID を有効化しますか?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3505
+#: ../libpurple/protocols/yahoo/yahoo.c:3506
 msgid "Join whom in chat?"
 msgstr "どのチャットへ参加しますか?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3517
+#: ../libpurple/protocols/yahoo/yahoo.c:3518
 msgid "Activate ID..."
 msgstr "ID の有効化..."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3521
+#: ../libpurple/protocols/yahoo/yahoo.c:3522
 msgid "Join User in Chat..."
 msgstr "チャットに参加する..."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3526
+#: ../libpurple/protocols/yahoo/yahoo.c:3527
 #, fuzzy
 msgid "Open Inbox"
 msgstr "Hotmail の受信箱を開く"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4135
+#: ../libpurple/protocols/yahoo/yahoo.c:4119
+msgid "Buzz"
+msgstr ""
+
+#: ../libpurple/protocols/yahoo/yahoo.c:4121
+#, c-format
+msgid "Buzzing %s..."
+msgstr ""
+
+#: ../libpurple/protocols/yahoo/yahoo.c:4136
 msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
 msgstr "join &lt;ルーム&gt;: Yahoo ネットワーク上にあるチャットへ参加する"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4140
+#: ../libpurple/protocols/yahoo/yahoo.c:4141
 msgid "list: List rooms on the Yahoo network"
 msgstr "list: Yahoo ネットワーク上にあるルームを一覧表示します"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4148
+#: ../libpurple/protocols/yahoo/yahoo.c:4149
 msgid "doodle: Request user to start a Doodle session"
 msgstr "doodle: いたずら書きを始めることをユーザに要求する"
 
@@ -12789,56 +12828,56 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/yahoo/yahoo.c:4357
-#: ../libpurple/protocols/yahoo/yahoo.c:4359
+#: ../libpurple/protocols/yahoo/yahoo.c:4358
+#: ../libpurple/protocols/yahoo/yahoo.c:4360
 msgid "Yahoo Protocol Plugin"
 msgstr "Yahoo! プロトコル・プラグイン"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4382
+#: ../libpurple/protocols/yahoo/yahoo.c:4383
 msgid "Yahoo Japan"
 msgstr "Yahoo Japan! に接続する"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4385
+#: ../libpurple/protocols/yahoo/yahoo.c:4386
 msgid "Pager server"
 msgstr "ページャのサーバ"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4388
+#: ../libpurple/protocols/yahoo/yahoo.c:4389
 msgid "Japan Pager server"
 msgstr "日本のページャ・サーバ"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4391
+#: ../libpurple/protocols/yahoo/yahoo.c:4392
 msgid "Pager port"
 msgstr "ページャのポート番号"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4394
+#: ../libpurple/protocols/yahoo/yahoo.c:4395
 msgid "File transfer server"
 msgstr "ファイル転送サーバ"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4397
+#: ../libpurple/protocols/yahoo/yahoo.c:4398
 msgid "Japan file transfer server"
 msgstr "日本のファイル転送サーバ"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4400
+#: ../libpurple/protocols/yahoo/yahoo.c:4401
 msgid "File transfer port"
 msgstr "ファイル転送のポート番号"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4403
+#: ../libpurple/protocols/yahoo/yahoo.c:4404
 msgid "Chat room locale"
 msgstr "チャット・ルームの場所"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4406
+#: ../libpurple/protocols/yahoo/yahoo.c:4407
 msgid "Ignore conference and chatroom invitations"
 msgstr "会議とチャットルームの招待を無視する"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4414
+#: ../libpurple/protocols/yahoo/yahoo.c:4415
 msgid "Chat room list URL"
 msgstr "チャット・ルームの URL リスト"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4417
+#: ../libpurple/protocols/yahoo/yahoo.c:4418
 msgid "Yahoo Chat server"
 msgstr "Yahoo チャット・サーバ"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4420
+#: ../libpurple/protocols/yahoo/yahoo.c:4421
 msgid "Yahoo Chat port"
 msgstr "Yahoo チャットのポート番号"
 
@@ -13286,7 +13325,7 @@
 msgid "%s has requested your attention!"
 msgstr ""
 
-#: ../libpurple/server.c:793
+#: ../libpurple/server.c:796
 #, c-format
 msgid ""
 "%s has invited %s to the chat room %s:\n"
@@ -13295,12 +13334,12 @@
 "%s さんが %s さんをチャット・ルーム %s へ招待しています:\n"
 "%s"
 
-#: ../libpurple/server.c:798
+#: ../libpurple/server.c:801
 #, c-format
 msgid "%s has invited %s to the chat room %s\n"
 msgstr "%s さんが %s さんをチャット・ルーム %s へ招待しています\n"
 
-#: ../libpurple/server.c:802
+#: ../libpurple/server.c:805
 msgid "Accept chat invitation?"
 msgstr "チャットへの招待を受けますか?"
 
@@ -13345,62 +13384,47 @@
 msgid "%s changed status from %s to %s"
 msgstr "%s さんがステータスを %s から %s に変更しました"
 
-#: ../libpurple/status.c:612
-#, fuzzy, c-format
-msgid "%s (%s) changed status from %s to %s"
-msgstr "%s さんがステータスを %s から %s に変更しました"
-
-#: ../libpurple/status.c:623
+#: ../libpurple/status.c:619
 #, c-format
 msgid "%s is now %s"
 msgstr "%s さんは %s さんと認識されました"
 
-#: ../libpurple/status.c:625
-#, fuzzy, c-format
-msgid "%s (%s) is now %s"
-msgstr "%s さんは %s さんと認識されました"
-
-#: ../libpurple/status.c:631
+#: ../libpurple/status.c:624
 #, c-format
 msgid "%s is no longer %s"
 msgstr "もう %s さんは %s さんではありません"
 
-#: ../libpurple/status.c:633
-#, fuzzy, c-format
-msgid "%s (%s) is no longer %s"
-msgstr "もう %s さんは %s さんではありません"
-
-#: ../libpurple/status.c:1244
+#: ../libpurple/status.c:1234
 #, c-format
 msgid "%s became idle"
 msgstr "%s さんが待機中になりました"
 
-#: ../libpurple/status.c:1261
+#: ../libpurple/status.c:1251
 #, c-format
 msgid "%s became unidle"
 msgstr "%s さんが待機中から復帰しました"
 
-#: ../libpurple/status.c:1324
+#: ../libpurple/status.c:1314
 #, c-format
 msgid "+++ %s became idle"
 msgstr "+++ %s さんが待機中になりました"
 
-#: ../libpurple/status.c:1326
+#: ../libpurple/status.c:1316
 #, c-format
 msgid "+++ %s became unidle"
 msgstr "+++ %s さんが待機中から復帰しました"
 
-#: ../libpurple/util.c:701
+#: ../libpurple/util.c:718
 #, c-format
 msgid "%x %X"
 msgstr "%x %X"
 
-#: ../libpurple/util.c:2705
+#: ../libpurple/util.c:2722
 #, c-format
 msgid "Error Reading %s"
 msgstr "%s を読み込む際にエラー"
 
-#: ../libpurple/util.c:2706
+#: ../libpurple/util.c:2723
 #, c-format
 msgid ""
 "An error was encountered reading your %s.  They have not been loaded, and "
@@ -13409,67 +13433,67 @@
 "%s を読み込む際にエラーが発生しました。その情報は読み込まれません。また、古い"
 "ファイルの名前を \"%s~\" に変更しました。"
 
-#: ../libpurple/util.c:3206
+#: ../libpurple/util.c:3223
 msgid "Calculating..."
 msgstr "計算中..."
 
-#: ../libpurple/util.c:3209
+#: ../libpurple/util.c:3226
 msgid "Unknown."
 msgstr "不明です"
 
-#: ../libpurple/util.c:3235
+#: ../libpurple/util.c:3252
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d秒"
 msgstr[1] "%d秒"
 
-#: ../libpurple/util.c:3247
+#: ../libpurple/util.c:3264
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d日"
 msgstr[1] "%d日"
 
-#: ../libpurple/util.c:3255
+#: ../libpurple/util.c:3272
 #, c-format
 msgid "%s, %d hour"
 msgid_plural "%s, %d hours"
 msgstr[0] "%s %d時間"
 msgstr[1] "%s %d時間"
 
-#: ../libpurple/util.c:3261
+#: ../libpurple/util.c:3278
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d時間"
 msgstr[1] "%d時間"
 
-#: ../libpurple/util.c:3269
+#: ../libpurple/util.c:3286
 #, c-format
 msgid "%s, %d minute"
 msgid_plural "%s, %d minutes"
 msgstr[0] "%s %d分"
 msgstr[1] "%s %d分"
 
-#: ../libpurple/util.c:3275
+#: ../libpurple/util.c:3292
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d分"
 msgstr[1] "%d分"
 
-#: ../libpurple/util.c:3535
+#: ../libpurple/util.c:3552
 #, c-format
 msgid "Could not open %s: Redirected too many times"
 msgstr "%s を開けませんでした: 複数回リダイレクトしました"
 
-#: ../libpurple/util.c:3572 ../libpurple/util.c:3868
+#: ../libpurple/util.c:3589 ../libpurple/util.c:3885
 #, c-format
 msgid "Unable to connect to %s"
 msgstr "%s へ接続できません"
 
-#: ../libpurple/util.c:3695
+#: ../libpurple/util.c:3712
 #, c-format
 msgid ""
 "Unable to allocate enough memory to hold the contents from %s.  The web "
@@ -13478,17 +13502,17 @@
 "%s から受け取った情報を格納するためのメモリを確保できません。ウェブ・サーバか"
 "ら何か悪意を持って転送している可能性があります。"
 
-#: ../libpurple/util.c:3730
+#: ../libpurple/util.c:3747
 #, c-format
 msgid "Error reading from %s: %s"
 msgstr "%s からの読み込みでエラー: %s"
 
-#: ../libpurple/util.c:3761
+#: ../libpurple/util.c:3778
 #, c-format
 msgid "Error writing to %s: %s"
 msgstr "%s へ書き込む際にエラー: %s"
 
-#: ../libpurple/util.c:3786
+#: ../libpurple/util.c:3803
 #, c-format
 msgid "Unable to connect to %s: %s"
 msgstr "%s へ接続できません: %s"
@@ -13578,7 +13602,7 @@
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
-#: ../pidgin/gtkaccount.c:967 ../pidgin/gtkprefs.c:1213
+#: ../pidgin/gtkaccount.c:967 ../pidgin/gtkprefs.c:1211
 msgid "Use Environmental Settings"
 msgstr "環境設定を使う"
 
@@ -13600,15 +13624,15 @@
 msgid "Proxy Options"
 msgstr "プロキシのオプション"
 
-#: ../pidgin/gtkaccount.c:1044 ../pidgin/gtkprefs.c:1207
+#: ../pidgin/gtkaccount.c:1044 ../pidgin/gtkprefs.c:1205
 msgid "Proxy _type:"
 msgstr "プロキシの種類(_T):"
 
-#: ../pidgin/gtkaccount.c:1053 ../pidgin/gtkprefs.c:1228
+#: ../pidgin/gtkaccount.c:1053 ../pidgin/gtkprefs.c:1226
 msgid "_Host:"
 msgstr "ホスト名(_H):"
 
-#: ../pidgin/gtkaccount.c:1057 ../pidgin/gtkprefs.c:1246
+#: ../pidgin/gtkaccount.c:1057 ../pidgin/gtkprefs.c:1244
 msgid "_Port:"
 msgstr "ポート番号(_P):"
 
@@ -13616,7 +13640,7 @@
 msgid "_Username:"
 msgstr "ユーザ名(_U):"
 
-#: ../pidgin/gtkaccount.c:1072 ../pidgin/gtkprefs.c:1283
+#: ../pidgin/gtkaccount.c:1072 ../pidgin/gtkprefs.c:1281
 msgid "Pa_ssword:"
 msgstr "パスワード(_S):"
 
@@ -13676,290 +13700,249 @@
 "仲間リストのウィンドウにある <b>アカウント->追加/編集</b> メニューからも、こ"
 "の画面を開くことができます。"
 
-#: ../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
+#: ../pidgin/gtkblist.c:767
 msgid "Join a Chat"
 msgstr "チャットに参加"
 
-#: ../pidgin/gtkblist.c:945
+#: ../pidgin/gtkblist.c:788
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 msgstr "参加するチャットについて適切な情報を入力して下さい。\n"
 
-#: ../pidgin/gtkblist.c:956 ../pidgin/gtkblist.c:6188
-#: ../pidgin/gtkpounce.c:539 ../pidgin/gtkroomlist.c:396
+#. Set up stuff for the account box
+#: ../pidgin/gtkblist.c:799 ../pidgin/gtkblist.c:5530
+#: ../pidgin/gtkblist.c:5893 ../pidgin/gtkpounce.c:539
+#: ../pidgin/gtkroomlist.c:396
 msgid "_Account:"
 msgstr "アカウント(_A):"
 
-#: ../pidgin/gtkblist.c:1245 ../pidgin/gtkprivacy.c:603
+#: ../pidgin/gtkblist.c:1088 ../pidgin/gtkprivacy.c:603
 #: ../pidgin/gtkprivacy.c:617
 msgid "_Block"
 msgstr "拒否する(_B)"
 
-#: ../pidgin/gtkblist.c:1245
+#: ../pidgin/gtkblist.c:1088
 msgid "Un_block"
 msgstr "拒否しない(_B)"
 
-#: ../pidgin/gtkblist.c:1288
-msgid "Move to"
-msgstr ""
-
-#: ../pidgin/gtkblist.c:1328
+#: ../pidgin/gtkblist.c:1139
 msgid "Get _Info"
 msgstr "情報の取得(_I)"
 
-#: ../pidgin/gtkblist.c:1331 ../pidgin/pidginstock.c:90
+#: ../pidgin/gtkblist.c:1142 ../pidgin/pidginstock.c:90
 msgid "I_M"
 msgstr "IM(_M)"
 
-#: ../pidgin/gtkblist.c:1337
-#, fuzzy
-msgid "_Send File..."
-msgstr "ファイルの送信(_S)"
-
-#: ../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
+#: ../pidgin/gtkblist.c:1148
+#, fuzzy
+msgid "_Send File"
+msgstr "ファイルの送信"
+
+#: ../pidgin/gtkblist.c:1155
+msgid "Add Buddy _Pounce"
+msgstr "つかむ仲間の追加(_P)"
+
+#: ../pidgin/gtkblist.c:1160 ../pidgin/gtkblist.c:1164
+#: ../pidgin/gtkblist.c:1269 ../pidgin/gtkblist.c:1292
 msgid "View _Log"
 msgstr "ログの表示(_L)"
 
-#: ../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
+#: ../pidgin/gtkblist.c:1177 ../pidgin/gtkblist.c:1186
+#: ../pidgin/gtkblist.c:1277 ../pidgin/gtkblist.c:1298
 msgid "_Alias..."
 msgstr "別名(_A)..."
 
-#: ../pidgin/gtkblist.c:1376 ../pidgin/gtkblist.c:1384
-#: ../pidgin/gtkblist.c:1478 ../pidgin/gtkblist.c:1499
+#: ../pidgin/gtkblist.c:1180 ../pidgin/gtkblist.c:1188
+#: ../pidgin/gtkblist.c:1279 ../pidgin/gtkblist.c:1300
 msgid "_Remove"
 msgstr "削除(_R)"
 
-#: ../pidgin/gtkblist.c:1434
-#, fuzzy
-msgid "Add _Buddy..."
-msgstr "仲間の追加"
-
-#: ../pidgin/gtkblist.c:1437
-#, fuzzy
-msgid "Add C_hat..."
-msgstr "チャットの追加"
-
-#: ../pidgin/gtkblist.c:1440
+#: ../pidgin/gtkblist.c:1238
+msgid "Add a _Buddy"
+msgstr "仲間の追加(_B)"
+
+#: ../pidgin/gtkblist.c:1241
+msgid "Add a C_hat"
+msgstr "チャットの追加(_H)"
+
+#: ../pidgin/gtkblist.c:1244
 msgid "_Delete Group"
 msgstr "グループの削除(_D)"
 
-#: ../pidgin/gtkblist.c:1442
+#: ../pidgin/gtkblist.c:1246
 msgid "_Rename"
 msgstr "名前の変更(_R)"
 
 #. join button
-#: ../pidgin/gtkblist.c:1462 ../pidgin/gtkroomlist.c:307
+#: ../pidgin/gtkblist.c:1265 ../pidgin/gtkroomlist.c:307
 #: ../pidgin/gtkroomlist.c:460 ../pidgin/pidginstock.c:88
 msgid "_Join"
 msgstr "参加(_J)"
 
-#: ../pidgin/gtkblist.c:1464
+#: ../pidgin/gtkblist.c:1267
 msgid "Auto-Join"
 msgstr "自動参加"
 
-#: ../pidgin/gtkblist.c:1466
-#, fuzzy
-msgid "Persistent"
-msgstr "ペルシア語"
-
-#: ../pidgin/gtkblist.c:1504 ../pidgin/gtkblist.c:1527
+#: ../pidgin/gtkblist.c:1305 ../pidgin/gtkblist.c:1329
 msgid "_Collapse"
 msgstr "畳む(_C)"
 
-#: ../pidgin/gtkblist.c:1532
+#: ../pidgin/gtkblist.c:1334
 msgid "_Expand"
 msgstr "広げる(_E)"
 
-#: ../pidgin/gtkblist.c:1783 ../pidgin/gtkblist.c:1795
-#: ../pidgin/gtkblist.c:4885 ../pidgin/gtkblist.c:4898
+#: ../pidgin/gtkblist.c:1585 ../pidgin/gtkblist.c:1597
+#: ../pidgin/gtkblist.c:4603 ../pidgin/gtkblist.c:4616
 msgid "/Tools/Mute Sounds"
 msgstr "/ツール/ミュート"
 
-#: ../pidgin/gtkblist.c:2255 ../pidgin/gtkconv.c:4903
+#: ../pidgin/gtkblist.c:2057 ../pidgin/gtkconv.c:4840
 #: ../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:3067
+#: ../pidgin/gtkblist.c:2869
 msgid "/_Buddies"
 msgstr "/仲間(_B)"
 
-#: ../pidgin/gtkblist.c:3068
+#: ../pidgin/gtkblist.c:2870
 msgid "/Buddies/New Instant _Message..."
 msgstr "/仲間/新しいインスタント・メッセージ(_I)..."
 
-#: ../pidgin/gtkblist.c:3069
+#: ../pidgin/gtkblist.c:2871
 msgid "/Buddies/Join a _Chat..."
 msgstr "/仲間/チャットに参加(_C)..."
 
-#: ../pidgin/gtkblist.c:3070
+#: ../pidgin/gtkblist.c:2872
 msgid "/Buddies/Get User _Info..."
 msgstr "/仲間/ユーザ情報の取得(_I)..."
 
-#: ../pidgin/gtkblist.c:3071
+#: ../pidgin/gtkblist.c:2873
 msgid "/Buddies/View User _Log..."
 msgstr "/仲間/ユーザ・ログの表示(_L)..."
 
-#: ../pidgin/gtkblist.c:3073
+#: ../pidgin/gtkblist.c:2875
 #, fuzzy
 msgid "/Buddies/Show"
 msgstr "/仲間(_B)"
 
-#: ../pidgin/gtkblist.c:3074
+#: ../pidgin/gtkblist.c:2876
 #, fuzzy
 msgid "/Buddies/Show/_Offline Buddies"
 msgstr "/仲間/オフラインの仲間を表示する(_O)"
 
-#: ../pidgin/gtkblist.c:3075
+#: ../pidgin/gtkblist.c:2877
 #, fuzzy
 msgid "/Buddies/Show/_Empty Groups"
 msgstr "/仲間/空グループを表示する(_E)"
 
-#: ../pidgin/gtkblist.c:3076
+#: ../pidgin/gtkblist.c:2878
 #, fuzzy
 msgid "/Buddies/Show/Buddy _Details"
 msgstr "/仲間/仲間の詳細を表示する(_D)"
 
-#: ../pidgin/gtkblist.c:3077
+#: ../pidgin/gtkblist.c:2879
 #, fuzzy
 msgid "/Buddies/Show/Idle _Times"
 msgstr "/仲間/待機中の時間を表示する(_T)"
 
-#: ../pidgin/gtkblist.c:3078
+#: ../pidgin/gtkblist.c:2880
 #, fuzzy
 msgid "/Buddies/Show/_Protocol Icons"
 msgstr "/仲間/空グループを表示する(_E)"
 
-#: ../pidgin/gtkblist.c:3079
+#: ../pidgin/gtkblist.c:2881
 msgid "/Buddies/_Sort Buddies"
 msgstr "/仲間/仲間の並び替え(_S)"
 
-#: ../pidgin/gtkblist.c:3081
+#: ../pidgin/gtkblist.c:2883
 msgid "/Buddies/_Add Buddy..."
 msgstr "/仲間/仲間の追加(_A)..."
 
-#: ../pidgin/gtkblist.c:3082
+#: ../pidgin/gtkblist.c:2884
 msgid "/Buddies/Add C_hat..."
 msgstr "/仲間/チャットの追加(_H)..."
 
-#: ../pidgin/gtkblist.c:3083
+#: ../pidgin/gtkblist.c:2885
 msgid "/Buddies/Add _Group..."
 msgstr "/仲間/グループの追加(_G)..."
 
-#: ../pidgin/gtkblist.c:3085
+#: ../pidgin/gtkblist.c:2887
 msgid "/Buddies/_Quit"
 msgstr "/仲間/終了(_Q)"
 
 #. Accounts menu
-#: ../pidgin/gtkblist.c:3088
+#: ../pidgin/gtkblist.c:2890
 msgid "/_Accounts"
 msgstr "/アカウント(_A)"
 
-#: ../pidgin/gtkblist.c:3089 ../pidgin/gtkblist.c:6889
-#, fuzzy
-msgid "/Accounts/Manage"
-msgstr "/アカウント"
+#: ../pidgin/gtkblist.c:2891 ../pidgin/gtkblist.c:6589
+msgid "/Accounts/Add\\/Edit"
+msgstr "/アカウント/追加\\/編集"
 
 #. Tools
-#: ../pidgin/gtkblist.c:3092
+#: ../pidgin/gtkblist.c:2894
 msgid "/_Tools"
 msgstr "/ツール(_T)"
 
-#: ../pidgin/gtkblist.c:3093
+#: ../pidgin/gtkblist.c:2895
 msgid "/Tools/Buddy _Pounces"
 msgstr "/ツール/仲間をつかむ(_P)"
 
-#: ../pidgin/gtkblist.c:3094
+#: ../pidgin/gtkblist.c:2896
 #, fuzzy
 msgid "/Tools/_Certificates"
 msgstr "/ツール/設定(_E)"
 
-#: ../pidgin/gtkblist.c:3095
+#: ../pidgin/gtkblist.c:2897
 msgid "/Tools/Plu_gins"
 msgstr "/ツール/プラグイン(_G)"
 
-#: ../pidgin/gtkblist.c:3096
+#: ../pidgin/gtkblist.c:2898
 msgid "/Tools/Pr_eferences"
 msgstr "/ツール/設定(_E)"
 
-#: ../pidgin/gtkblist.c:3097
+#: ../pidgin/gtkblist.c:2899
 msgid "/Tools/Pr_ivacy"
 msgstr "/ツール/個人情報(_I)"
 
-#: ../pidgin/gtkblist.c:3099
+#: ../pidgin/gtkblist.c:2901
 msgid "/Tools/_File Transfers"
 msgstr "/ツール/ファイルの転送(_F)"
 
-#: ../pidgin/gtkblist.c:3100
+#: ../pidgin/gtkblist.c:2902
 msgid "/Tools/R_oom List"
 msgstr "/ツール/チャットルームの一覧(_O)"
 
-#: ../pidgin/gtkblist.c:3101
+#: ../pidgin/gtkblist.c:2903
 msgid "/Tools/System _Log"
 msgstr "/ツール/システム・ログ(_L)"
 
-#: ../pidgin/gtkblist.c:3103
+#: ../pidgin/gtkblist.c:2905
 msgid "/Tools/Mute _Sounds"
 msgstr "/ツール/ミュート(_S)"
 
 #. Help
-#: ../pidgin/gtkblist.c:3105
+#: ../pidgin/gtkblist.c:2907
 msgid "/_Help"
 msgstr "/ヘルプ(_H)"
 
-#: ../pidgin/gtkblist.c:3106
+#: ../pidgin/gtkblist.c:2908
 msgid "/Help/Online _Help"
 msgstr "/ヘルプ/オンライン・ヘルプ(_H)"
 
-#: ../pidgin/gtkblist.c:3107
+#: ../pidgin/gtkblist.c:2909
 msgid "/Help/_Debug Window"
 msgstr "/ヘルプ/デバッグ・ウィンドウ(_D)"
 
-#: ../pidgin/gtkblist.c:3109 ../pidgin/gtkblist.c:3111
+#: ../pidgin/gtkblist.c:2911 ../pidgin/gtkblist.c:2913
 msgid "/Help/_About"
 msgstr "/ヘルプ/情報(_A)"
 
-#: ../pidgin/gtkblist.c:3140
+#: ../pidgin/gtkblist.c:2942
 #, c-format
 msgid ""
 "\n"
@@ -13968,130 +13951,134 @@
 "\n"
 "<b>アカウント:</b> %s"
 
-#: ../pidgin/gtkblist.c:3218
+#: ../pidgin/gtkblist.c:3020
 msgid "Buddy Alias"
 msgstr "仲間の別名"
 
-#: ../pidgin/gtkblist.c:3247
+#: ../pidgin/gtkblist.c:3049
 msgid "Logged In"
 msgstr "既にログインしています"
 
-#: ../pidgin/gtkblist.c:3293
+#: ../pidgin/gtkblist.c:3095
 msgid "Last Seen"
 msgstr "最後にお会いしたのは"
 
-#: ../pidgin/gtkblist.c:3314
+#: ../pidgin/gtkblist.c:3116
 msgid "Spooky"
 msgstr "不気味"
 
-#: ../pidgin/gtkblist.c:3316
+#: ../pidgin/gtkblist.c:3118
 msgid "Awesome"
 msgstr "サイコー"
 
-#: ../pidgin/gtkblist.c:3318
+#: ../pidgin/gtkblist.c:3120
 msgid "Rockin'"
 msgstr "グレイト!"
 
-#: ../pidgin/gtkblist.c:3657
+#: ../pidgin/gtkblist.c:3453
 #, fuzzy, c-format
 msgid "Idle %dd %dh %02dm"
 msgstr "待機中 %dh %02dm"
 
-#: ../pidgin/gtkblist.c:3659
+#: ../pidgin/gtkblist.c:3455
 #, c-format
 msgid "Idle %dh %02dm"
 msgstr "待機中 %dh %02dm"
 
-#: ../pidgin/gtkblist.c:3661
+#: ../pidgin/gtkblist.c:3457
 #, c-format
 msgid "Idle %dm"
 msgstr "待機中 %dm"
 
-#: ../pidgin/gtkblist.c:3806
+#: ../pidgin/gtkblist.c:3602
 msgid "/Buddies/New Instant Message..."
 msgstr "/仲間/新しいインスタント・メッセージ..."
 
-#: ../pidgin/gtkblist.c:3807 ../pidgin/gtkblist.c:3840
+#: ../pidgin/gtkblist.c:3603 ../pidgin/gtkblist.c:3636
 msgid "/Buddies/Join a Chat..."
 msgstr "/仲間/チャットに参加..."
 
-#: ../pidgin/gtkblist.c:3808
+#: ../pidgin/gtkblist.c:3604
 msgid "/Buddies/Get User Info..."
 msgstr "/仲間/ユーザ情報の取得..."
 
-#: ../pidgin/gtkblist.c:3809
+#: ../pidgin/gtkblist.c:3605
 msgid "/Buddies/Add Buddy..."
 msgstr "/仲間/仲間の追加..."
 
-#: ../pidgin/gtkblist.c:3810 ../pidgin/gtkblist.c:3843
+#: ../pidgin/gtkblist.c:3606 ../pidgin/gtkblist.c:3639
 msgid "/Buddies/Add Chat..."
 msgstr "/仲間/チャットの追加..."
 
-#: ../pidgin/gtkblist.c:3811
+#: ../pidgin/gtkblist.c:3607
 msgid "/Buddies/Add Group..."
 msgstr "/仲間/グループの追加..."
 
-#: ../pidgin/gtkblist.c:3846
+#: ../pidgin/gtkblist.c:3642
 msgid "/Tools/Privacy"
 msgstr "/ツール/個人情報"
 
-#: ../pidgin/gtkblist.c:3849
+#: ../pidgin/gtkblist.c:3645
 msgid "/Tools/Room List"
 msgstr "/ツール/チャットルームの一覧"
 
-#: ../pidgin/gtkblist.c:3944 ../pidgin/gtkdocklet.c:153
+#: ../pidgin/gtkblist.c:3742 ../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:4104
+#: ../pidgin/gtkblist.c:3822
 msgid "Manually"
 msgstr "手動"
 
-#: ../pidgin/gtkblist.c:4107
+#: ../pidgin/gtkblist.c:3824
+msgid "Alphabetically"
+msgstr "アルファベット順"
+
+#: ../pidgin/gtkblist.c:3825
 msgid "By status"
 msgstr "状態順"
 
-#: ../pidgin/gtkblist.c:4108
+#: ../pidgin/gtkblist.c:3826
 msgid "By log size"
 msgstr "ログ・サイズ順"
 
-#: ../pidgin/gtkblist.c:4313 ../pidgin/gtkconn.c:180
+#: ../pidgin/gtkblist.c:4031 ../pidgin/gtkconn.c:179
 #, c-format
 msgid "%s disconnected"
 msgstr "%s さんは接続を切りました"
 
-#: ../pidgin/gtkblist.c:4349
+#: ../pidgin/gtkblist.c:4067
 #, c-format
 msgid "<span color=\"red\">%s disconnected: %s</span>"
 msgstr "<span color=\"red\">%s さんは接続を切りました: %s</span>"
 
-#: ../pidgin/gtkblist.c:4501
+#: ../pidgin/gtkblist.c:4219
 msgid "<b>Username:</b>"
 msgstr "<b>ユーザ名</b>:"
 
-#: ../pidgin/gtkblist.c:4508
+#: ../pidgin/gtkblist.c:4226
 msgid "<b>Password:</b>"
 msgstr "<b>パスワード</b>:"
 
-#: ../pidgin/gtkblist.c:4519
+#: ../pidgin/gtkblist.c:4237
 msgid "_Login"
 msgstr "ログイン(_L)"
 
-#: ../pidgin/gtkblist.c:4602
+#: ../pidgin/gtkblist.c:4320
 msgid "/Accounts"
 msgstr "/アカウント"
 
 #. Translators: Please maintain the use of -> and <- to refer to menu heirarchy
-#: ../pidgin/gtkblist.c:4616
+#: ../pidgin/gtkblist.c:4334
 #, 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->Manage</b>. Once you enable accounts, you'll be "
+"b> window at <b>Accounts->Add/Edit</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"
@@ -14103,32 +14090,32 @@
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: ../pidgin/gtkblist.c:4879
+#: ../pidgin/gtkblist.c:4597
 #, fuzzy
 msgid "/Buddies/Show/Offline Buddies"
 msgstr "/仲間/オフラインの仲間を表示する"
 
-#: ../pidgin/gtkblist.c:4882
+#: ../pidgin/gtkblist.c:4600
 #, fuzzy
 msgid "/Buddies/Show/Empty Groups"
 msgstr "/仲間/空のグループを表示する"
 
-#: ../pidgin/gtkblist.c:4888
+#: ../pidgin/gtkblist.c:4606
 #, fuzzy
 msgid "/Buddies/Show/Buddy Details"
 msgstr "/仲間/仲間の詳細を表示する"
 
-#: ../pidgin/gtkblist.c:4891
+#: ../pidgin/gtkblist.c:4609
 #, fuzzy
 msgid "/Buddies/Show/Idle Times"
 msgstr "/仲間/待機中の時間を表示する"
 
-#: ../pidgin/gtkblist.c:4894
+#: ../pidgin/gtkblist.c:4612
 #, fuzzy
 msgid "/Buddies/Show/Protocol Icons"
 msgstr "/仲間/空のグループを表示する"
 
-#: ../pidgin/gtkblist.c:5796
+#: ../pidgin/gtkblist.c:5507
 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. "
@@ -14138,79 +14125,65 @@
 "別名またはあだ名を入力できます。別名は可能な限りスクリーン名の代わりに表示さ"
 "れます。\n"
 
-#. Set up stuff for the account box
-#: ../pidgin/gtkblist.c:5819
-#, fuzzy
-msgid "A_ccount:"
-msgstr "アカウント:"
-
 #. End of account box
-#: ../pidgin/gtkblist.c:5831
+#: ../pidgin/gtkblist.c:5542
 msgid "_Screen name:"
 msgstr "スクリーン名(_S):"
 
-#: ../pidgin/gtkblist.c:5853 ../pidgin/gtkblist.c:6209
+#: ../pidgin/gtkblist.c:5564 ../pidgin/gtkblist.c:5914
 msgid "A_lias:"
 msgstr "別名(_L):"
 
-#: ../pidgin/gtkblist.c:6121
+#: ../pidgin/gtkblist.c:5826
 msgid "This protocol does not support chat rooms."
 msgstr "このプロトコルではチャット・ルームをサポートしていません。"
 
-#: ../pidgin/gtkblist.c:6137
+#: ../pidgin/gtkblist.c:5842
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
 msgstr "チャットが可能なプロトコルでサイン・インしていません。"
 
-#: ../pidgin/gtkblist.c:6178
+#: ../pidgin/gtkblist.c:5883
 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: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
+#: ../pidgin/gtkblist.c:5964
 msgid "Please enter the name of the group to be added."
 msgstr "追加するグループの名前を入力して下さい:"
 
-#: ../pidgin/gtkblist.c:6909
+#: ../pidgin/gtkblist.c:6609
 msgid "<PurpleMain>/Accounts/"
 msgstr "<PurpleMain>/アカウント/"
 
-#: ../pidgin/gtkblist.c:6933
+#: ../pidgin/gtkblist.c:6633
 msgid "_Edit Account"
 msgstr "アカウントの編集(_E)"
 
-#: ../pidgin/gtkblist.c:6946 ../pidgin/gtkconv.c:3136
+#: ../pidgin/gtkblist.c:6646 ../pidgin/gtkconv.c:3073
 msgid "No actions available"
 msgstr "利用可能なアクションはありません"
 
-#: ../pidgin/gtkblist.c:6954
+#: ../pidgin/gtkblist.c:6654
 msgid "_Disable"
 msgstr "無効にする(_D)"
 
-#: ../pidgin/gtkblist.c:6966
+#: ../pidgin/gtkblist.c:6666
 msgid "Enable Account"
 msgstr "アカウントを有効にする"
 
-#: ../pidgin/gtkblist.c:6972
+#: ../pidgin/gtkblist.c:6672
 msgid "<PurpleMain>/Accounts/Enable Account"
 msgstr "<PurpleMain>/アカウント/アカウントを有効にする"
 
-#: ../pidgin/gtkblist.c:7021
+#: ../pidgin/gtkblist.c:6721
 msgid "/Tools"
 msgstr "/ツール"
 
-#: ../pidgin/gtkblist.c:7091
+#: ../pidgin/gtkblist.c:6791
 msgid "/Buddies/Sort Buddies"
 msgstr "/仲間/仲間の並び替え"
 
@@ -14220,7 +14193,7 @@
 msgid "SSL Servers"
 msgstr "サーバ"
 
-#: ../pidgin/gtkconn.c:181
+#: ../pidgin/gtkconn.c:180
 #, c-format
 msgid ""
 "%s\n"
@@ -14232,213 +14205,213 @@
 "\n"
 "エラーを解決しアカウントをもう一度有効にするまで %s は再接続しません。"
 
-#: ../pidgin/gtkconv.c:523
+#: ../pidgin/gtkconv.c:482
 #, fuzzy
 msgid "Unknown command."
 msgstr "不明なコマンド"
 
-#: ../pidgin/gtkconv.c:795 ../pidgin/gtkconv.c:821
+#: ../pidgin/gtkconv.c:754 ../pidgin/gtkconv.c:780
 msgid "That buddy is not on the same protocol as this chat."
 msgstr "その仲間は、このチャットの同一プロトコル上にいません"
 
-#: ../pidgin/gtkconv.c:815
+#: ../pidgin/gtkconv.c:774
 msgid ""
 "You are not currently signed on with an account that can invite that buddy."
 msgstr "現在、その仲間を招待できるアカウントでサイン・インしていません"
 
-#: ../pidgin/gtkconv.c:868
+#: ../pidgin/gtkconv.c:827
 msgid "Invite Buddy Into Chat Room"
 msgstr "仲間をチャット・ルームへ招待"
 
 #. Put our happy label in it.
-#: ../pidgin/gtkconv.c:898
+#: ../pidgin/gtkconv.c:857
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
 msgstr "招待したい相手の名前と、オプションで招待メッセージを入力して下さい:"
 
-#: ../pidgin/gtkconv.c:919
+#: ../pidgin/gtkconv.c:878
 msgid "_Buddy:"
 msgstr "仲間(_B):"
 
-#: ../pidgin/gtkconv.c:930 ../pidgin/gtksavedstatuses.c:1194
+#: ../pidgin/gtkconv.c:889 ../pidgin/gtksavedstatuses.c:1194
 #: ../pidgin/gtksavedstatuses.c:1528
 msgid "_Message:"
 msgstr "メッセージ(_M):"
 
-#: ../pidgin/gtkconv.c:988 ../pidgin/gtkconv.c:2657 ../pidgin/gtkdebug.c:219
+#: ../pidgin/gtkconv.c:947 ../pidgin/gtkconv.c:2598 ../pidgin/gtkdebug.c:219
 #: ../pidgin/gtkft.c:543
 msgid "Unable to open file."
 msgstr "ファイルを開けません"
 
-#: ../pidgin/gtkconv.c:994
+#: ../pidgin/gtkconv.c:953
 #, c-format
 msgid "<h1>Conversation with %s</h1>\n"
 msgstr "<h1>%s さんとの会話</h1>\n"
 
-#: ../pidgin/gtkconv.c:1032
+#: ../pidgin/gtkconv.c:991
 msgid "Save Conversation"
 msgstr "会話の保存"
 
-#: ../pidgin/gtkconv.c:1178 ../pidgin/gtkdebug.c:167 ../pidgin/gtkdebug.c:743
+#: ../pidgin/gtkconv.c:1140 ../pidgin/gtkdebug.c:167 ../pidgin/gtkdebug.c:743
 msgid "Find"
 msgstr "検索"
 
-#: ../pidgin/gtkconv.c:1204 ../pidgin/gtkdebug.c:195
+#: ../pidgin/gtkconv.c:1166 ../pidgin/gtkdebug.c:195
 msgid "_Search for:"
 msgstr "検索する単語(_S):"
 
-#: ../pidgin/gtkconv.c:1675
+#: ../pidgin/gtkconv.c:1622
 msgid "Un-Ignore"
 msgstr "無視しない"
 
-#: ../pidgin/gtkconv.c:1678
+#: ../pidgin/gtkconv.c:1625
 msgid "Ignore"
 msgstr "無視する対象"
 
-#: ../pidgin/gtkconv.c:1698
+#: ../pidgin/gtkconv.c:1645
 msgid "Get Away Message"
 msgstr "離席メッセージの取得"
 
-#: ../pidgin/gtkconv.c:1721
+#: ../pidgin/gtkconv.c:1668
 msgid "Last said"
 msgstr "最後のメッセージ:"
 
-#: ../pidgin/gtkconv.c:2665
+#: ../pidgin/gtkconv.c:2606
 msgid "Unable to save icon file to disk."
 msgstr "アイコン・ファイルを保存できません。"
 
-#: ../pidgin/gtkconv.c:2716
+#: ../pidgin/gtkconv.c:2657
 msgid "Save Icon"
 msgstr "アイコンの保存"
 
-#: ../pidgin/gtkconv.c:2768
+#: ../pidgin/gtkconv.c:2709
 msgid "Animate"
 msgstr "アニメーションを有効にする"
 
-#: ../pidgin/gtkconv.c:2773
+#: ../pidgin/gtkconv.c:2714
 msgid "Hide Icon"
 msgstr "アイコンを隠す"
 
-#: ../pidgin/gtkconv.c:2776
+#: ../pidgin/gtkconv.c:2717
 msgid "Save Icon As..."
 msgstr "アイコンを別名で保存..."
 
-#: ../pidgin/gtkconv.c:2780
+#: ../pidgin/gtkconv.c:2721
 msgid "Set Custom Icon..."
 msgstr "独自アイコンのセット..."
 
-#: ../pidgin/gtkconv.c:2793
+#: ../pidgin/gtkconv.c:2734
 msgid "Remove Custom Icon"
 msgstr "独自アイコンの削除"
 
-#: ../pidgin/gtkconv.c:2924
+#: ../pidgin/gtkconv.c:2861
 msgid "Show All"
 msgstr ""
 
 #. Conversation menu
-#: ../pidgin/gtkconv.c:2943
+#: ../pidgin/gtkconv.c:2880
 msgid "/_Conversation"
 msgstr "/会話(_C)"
 
-#: ../pidgin/gtkconv.c:2945
+#: ../pidgin/gtkconv.c:2882
 msgid "/Conversation/New Instant _Message..."
 msgstr "/会話/新しいインスタント・メッセージ(_M)..."
 
-#: ../pidgin/gtkconv.c:2950
+#: ../pidgin/gtkconv.c:2887
 msgid "/Conversation/_Find..."
 msgstr "/会話/検索(_F)..."
 
-#: ../pidgin/gtkconv.c:2952
+#: ../pidgin/gtkconv.c:2889
 msgid "/Conversation/View _Log"
 msgstr "/会話/ログの表示(_L)"
 
-#: ../pidgin/gtkconv.c:2953
+#: ../pidgin/gtkconv.c:2890
 msgid "/Conversation/_Save As..."
 msgstr "/会話/別名で保存(_S)..."
 
-#: ../pidgin/gtkconv.c:2955
+#: ../pidgin/gtkconv.c:2892
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/会話/クリア(_R)"
 
-#: ../pidgin/gtkconv.c:2959
+#: ../pidgin/gtkconv.c:2896
 msgid "/Conversation/Se_nd File..."
 msgstr "/会話/ファイルの送信(_N)..."
 
-#: ../pidgin/gtkconv.c:2960
+#: ../pidgin/gtkconv.c:2897
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/会話/つかむ仲間に追加する(_P)..."
 
-#: ../pidgin/gtkconv.c:2962
+#: ../pidgin/gtkconv.c:2899
 msgid "/Conversation/_Get Info"
 msgstr "/会話/情報の取得(_G)"
 
-#: ../pidgin/gtkconv.c:2964
+#: ../pidgin/gtkconv.c:2901
 msgid "/Conversation/In_vite..."
 msgstr "/会話/招待(_V)..."
 
-#: ../pidgin/gtkconv.c:2966
+#: ../pidgin/gtkconv.c:2903
 msgid "/Conversation/M_ore"
 msgstr "/会話/その他(_O)"
 
-#: ../pidgin/gtkconv.c:2970
+#: ../pidgin/gtkconv.c:2907
 msgid "/Conversation/Al_ias..."
 msgstr "/会話/別名(_I)..."
 
-#: ../pidgin/gtkconv.c:2972
+#: ../pidgin/gtkconv.c:2909
 msgid "/Conversation/_Block..."
 msgstr "/会話/拒否(_B)..."
 
-#: ../pidgin/gtkconv.c:2974
+#: ../pidgin/gtkconv.c:2911
 msgid "/Conversation/_Unblock..."
 msgstr "/会話/拒否の解除(_U)..."
 
-#: ../pidgin/gtkconv.c:2976
+#: ../pidgin/gtkconv.c:2913
 msgid "/Conversation/_Add..."
 msgstr "/会話/追加(_A)..."
 
-#: ../pidgin/gtkconv.c:2978
+#: ../pidgin/gtkconv.c:2915
 msgid "/Conversation/_Remove..."
 msgstr "/会話/削除(_R)..."
 
-#: ../pidgin/gtkconv.c:2983
+#: ../pidgin/gtkconv.c:2920
 msgid "/Conversation/Insert Lin_k..."
 msgstr "/会話/リンクの挿入(_K)..."
 
-#: ../pidgin/gtkconv.c:2985
+#: ../pidgin/gtkconv.c:2922
 msgid "/Conversation/Insert Imag_e..."
 msgstr "/会話/画像の挿入(_E)..."
 
-#: ../pidgin/gtkconv.c:2991
+#: ../pidgin/gtkconv.c:2928
 msgid "/Conversation/_Close"
 msgstr "/会話/閉じる(_C)"
 
 #. Options
-#: ../pidgin/gtkconv.c:2995
+#: ../pidgin/gtkconv.c:2932
 msgid "/_Options"
 msgstr "/オプション(_O)"
 
-#: ../pidgin/gtkconv.c:2996
+#: ../pidgin/gtkconv.c:2933
 msgid "/Options/Enable _Logging"
 msgstr "/オプション/ログを記録する(_L)"
 
-#: ../pidgin/gtkconv.c:2997
+#: ../pidgin/gtkconv.c:2934
 msgid "/Options/Enable _Sounds"
 msgstr "/オプション/サウンドを有効にする(_S)"
 
-#: ../pidgin/gtkconv.c:2999
+#: ../pidgin/gtkconv.c:2936
 msgid "/Options/Show Formatting _Toolbars"
 msgstr "/オプション/書式ツールバーを表示する(_T)"
 
-#: ../pidgin/gtkconv.c:3000
+#: ../pidgin/gtkconv.c:2937
 msgid "/Options/Show Ti_mestamps"
 msgstr "/オプション/タイムスタンプを表示する(_M)"
 
-#: ../pidgin/gtkconv.c:3124
+#: ../pidgin/gtkconv.c:3061
 msgid "/Conversation/More"
 msgstr "/会話/その他(_O)"
 
-#: ../pidgin/gtkconv.c:3180
+#: ../pidgin/gtkconv.c:3117
 #, fuzzy
 msgid "/Options"
 msgstr "/オプション(_O)"
@@ -14448,175 +14421,174 @@
 #. 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:3215 ../pidgin/gtkconv.c:3247
+#: ../pidgin/gtkconv.c:3152 ../pidgin/gtkconv.c:3184
 msgid "/Conversation"
 msgstr "/会話"
 
-#: ../pidgin/gtkconv.c:3255
+#: ../pidgin/gtkconv.c:3192
 msgid "/Conversation/View Log"
 msgstr "/会話/ログの表示"
 
-#: ../pidgin/gtkconv.c:3261
+#: ../pidgin/gtkconv.c:3198
 msgid "/Conversation/Send File..."
 msgstr "/会話/ファイルの送信..."
 
-#: ../pidgin/gtkconv.c:3265
+#: ../pidgin/gtkconv.c:3202
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/会話/つかむ仲間に追加する..."
 
-#: ../pidgin/gtkconv.c:3271
+#: ../pidgin/gtkconv.c:3208
 msgid "/Conversation/Get Info"
 msgstr "/会話/情報の取得"
 
-#: ../pidgin/gtkconv.c:3275
+#: ../pidgin/gtkconv.c:3212
 msgid "/Conversation/Invite..."
 msgstr "/会話/招待..."
 
-#: ../pidgin/gtkconv.c:3281
+#: ../pidgin/gtkconv.c:3218
 msgid "/Conversation/Alias..."
 msgstr "/会話/別名..."
 
-#: ../pidgin/gtkconv.c:3285
+#: ../pidgin/gtkconv.c:3222
 msgid "/Conversation/Block..."
 msgstr "/会話/拒否..."
 
-#: ../pidgin/gtkconv.c:3289
+#: ../pidgin/gtkconv.c:3226
 msgid "/Conversation/Unblock..."
 msgstr "/会話/拒否の解除..."
 
-#: ../pidgin/gtkconv.c:3293
+#: ../pidgin/gtkconv.c:3230
 msgid "/Conversation/Add..."
 msgstr "/会話/追加..."
 
-#: ../pidgin/gtkconv.c:3297
+#: ../pidgin/gtkconv.c:3234
 msgid "/Conversation/Remove..."
 msgstr "/会話/削除..."
 
-#: ../pidgin/gtkconv.c:3303
+#: ../pidgin/gtkconv.c:3240
 msgid "/Conversation/Insert Link..."
 msgstr "/会話/リンクの挿入..."
 
-#: ../pidgin/gtkconv.c:3307
+#: ../pidgin/gtkconv.c:3244
 msgid "/Conversation/Insert Image..."
 msgstr "/会話/画像の挿入..."
 
-#: ../pidgin/gtkconv.c:3313
+#: ../pidgin/gtkconv.c:3250
 msgid "/Options/Enable Logging"
 msgstr "/オプション/ログを記録する"
 
-#: ../pidgin/gtkconv.c:3316
+#: ../pidgin/gtkconv.c:3253
 msgid "/Options/Enable Sounds"
 msgstr "/オプション/サウンドを有効にする"
 
-#: ../pidgin/gtkconv.c:3329
+#: ../pidgin/gtkconv.c:3266
 msgid "/Options/Show Formatting Toolbars"
 msgstr "/オプション/書式ツールバーを表示する"
 
-#: ../pidgin/gtkconv.c:3332
+#: ../pidgin/gtkconv.c:3269
 msgid "/Options/Show Timestamps"
 msgstr "/オプション/タイムスタンプを表示する"
 
-#: ../pidgin/gtkconv.c:3409 ../pidgin/gtkconv.c:3451
+#: ../pidgin/gtkconv.c:3346 ../pidgin/gtkconv.c:3388
 msgid "User is typing..."
 msgstr "ユーザが何か入力しています..."
 
-#: ../pidgin/gtkconv.c:3454
+#: ../pidgin/gtkconv.c:3391
 msgid "User has typed something and stopped"
 msgstr "ユーザは何か入力して一時停止中です"
 
 #. Build the Send To menu
-#: ../pidgin/gtkconv.c:3637 ../pidgin/gtkconv.c:8103
-#, fuzzy
-msgid "S_end To"
-msgstr "送信先"
-
-#: ../pidgin/gtkconv.c:4349
+#: ../pidgin/gtkconv.c:3574 ../pidgin/gtkconv.c:8022
+msgid "_Send To"
+msgstr "送信先(_S)"
+
+#: ../pidgin/gtkconv.c:4286
 msgid "_Send"
 msgstr "送信する(_S)"
 
 #. Setup the label telling how many people are in the room.
-#: ../pidgin/gtkconv.c:4453
+#: ../pidgin/gtkconv.c:4390
 msgid "0 people in room"
 msgstr "誰もいません"
 
-#: ../pidgin/gtkconv.c:5823 ../pidgin/gtkconv.c:5944
+#: ../pidgin/gtkconv.c:5759 ../pidgin/gtkconv.c:5880
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "チャットルームに %d人にいます"
 msgstr[1] "チャットルームに %d人にいます"
 
-#: ../pidgin/gtkconv.c:6550 ../pidgin/gtkstatusbox.c:660
+#: ../pidgin/gtkconv.c:6486 ../pidgin/gtkstatusbox.c:660
 msgid "Typing"
 msgstr "入力中です"
 
-#: ../pidgin/gtkconv.c:6554
+#: ../pidgin/gtkconv.c:6490
 msgid "Stopped Typing"
 msgstr "入力を止めたようです"
 
-#: ../pidgin/gtkconv.c:6557
+#: ../pidgin/gtkconv.c:6493
 msgid "Nick Said"
 msgstr "Nick Said"
 
-#: ../pidgin/gtkconv.c:6560 ../pidgin/gtkdocklet.c:492
+#: ../pidgin/gtkconv.c:6496 ../pidgin/gtkdocklet.c:492
 msgid "Unread Messages"
 msgstr "メッセージの送信"
 
-#: ../pidgin/gtkconv.c:6563
+#: ../pidgin/gtkconv.c:6499
 msgid "New Event"
 msgstr "新しいイベント"
 
-#: ../pidgin/gtkconv.c:7654
+#: ../pidgin/gtkconv.c:7572
 #, fuzzy
 msgid "clear: Clears all conversation scrollbacks."
 msgstr "クリア: 会話ウィンドウにある以前のメッセージをクリアします"
 
-#: ../pidgin/gtkconv.c:7817
+#: ../pidgin/gtkconv.c:7736
 msgid "Confirm close"
 msgstr "クローズの確認"
 
-#: ../pidgin/gtkconv.c:7849
+#: ../pidgin/gtkconv.c:7768
 msgid "You have unread messages. Are you sure you want to close the window?"
 msgstr ""
 "まだ未読のメッセージがあります。本当にウィンドウを閉じてもよろしいですか?"
 
-#: ../pidgin/gtkconv.c:8436
+#: ../pidgin/gtkconv.c:8355
 msgid "Close other tabs"
 msgstr "他のタブを閉じる"
 
-#: ../pidgin/gtkconv.c:8442
+#: ../pidgin/gtkconv.c:8361
 msgid "Close all tabs"
 msgstr "全てのタブを閉じる"
 
-#: ../pidgin/gtkconv.c:8450
+#: ../pidgin/gtkconv.c:8369
 msgid "Detach this tab"
 msgstr "このタブを取り外す"
 
-#: ../pidgin/gtkconv.c:8456
+#: ../pidgin/gtkconv.c:8375
 msgid "Close this tab"
 msgstr "このタブを閉じる"
 
-#: ../pidgin/gtkconv.c:8951
+#: ../pidgin/gtkconv.c:8875
 msgid "Close conversation"
 msgstr "会話ウィンドウを閉じます"
 
-#: ../pidgin/gtkconv.c:9553
+#: ../pidgin/gtkconv.c:9477
 msgid "Last created window"
 msgstr "最後に生成したウィンドウを再利用する"
 
-#: ../pidgin/gtkconv.c:9555
+#: ../pidgin/gtkconv.c:9479
 msgid "Separate IM and Chat windows"
 msgstr "IM とチャット・ウィンドウを分割する"
 
-#: ../pidgin/gtkconv.c:9557 ../pidgin/gtkprefs.c:1417
+#: ../pidgin/gtkconv.c:9481 ../pidgin/gtkprefs.c:1415
 msgid "New window"
 msgstr "新しいウィンドウで開く"
 
-#: ../pidgin/gtkconv.c:9559
+#: ../pidgin/gtkconv.c:9483
 msgid "By group"
 msgstr "グループ毎に共有する"
 
-#: ../pidgin/gtkconv.c:9561
+#: ../pidgin/gtkconv.c:9485
 msgid "By account"
 msgstr "アカウント毎に共有する"
 
@@ -14973,11 +14945,12 @@
 msgstr "アルバニア語"
 
 #: ../pidgin/gtkdialogs.c:204 ../pidgin/gtkdialogs.c:205
+#: ../pidgin/gtkdialogs.c:260 ../pidgin/gtkdialogs.c:261
 msgid "Serbian"
 msgstr "セルビア語"
 
-#: ../pidgin/gtkdialogs.c:206 ../pidgin/gtkdialogs.c:260
-#: ../pidgin/gtkdialogs.c:261
+#: ../pidgin/gtkdialogs.c:206 ../pidgin/gtkdialogs.c:262
+#: ../pidgin/gtkdialogs.c:263
 msgid "Swedish"
 msgstr "スウェーデン語"
 
@@ -14993,7 +14966,7 @@
 msgid "Thai"
 msgstr "タイ語"
 
-#: ../pidgin/gtkdialogs.c:210 ../pidgin/gtkdialogs.c:262
+#: ../pidgin/gtkdialogs.c:210 ../pidgin/gtkdialogs.c:264
 msgid "Turkish"
 msgstr "トルコ語"
 
@@ -15005,7 +14978,7 @@
 msgid "T.M.Thanh and the Gnome-Vi Team"
 msgstr "T.M.Thanh と Gnome-Vi チーム"
 
-#: ../pidgin/gtkdialogs.c:212 ../pidgin/gtkdialogs.c:263
+#: ../pidgin/gtkdialogs.c:212 ../pidgin/gtkdialogs.c:265
 msgid "Simplified Chinese"
 msgstr "簡体字中国語"
 
@@ -15015,7 +14988,7 @@
 msgstr "中国語 (香港)"
 
 #: ../pidgin/gtkdialogs.c:216 ../pidgin/gtkdialogs.c:217
-#: ../pidgin/gtkdialogs.c:264
+#: ../pidgin/gtkdialogs.c:266
 msgid "Traditional Chinese"
 msgstr "繁体字中国語"
 
@@ -15023,12 +14996,12 @@
 msgid "Amharic"
 msgstr "アムハラ語"
 
-#: ../pidgin/gtkdialogs.c:351
+#: ../pidgin/gtkdialogs.c:353
 #, c-format
 msgid "About %s"
 msgstr "%s について"
 
-#: ../pidgin/gtkdialogs.c:394
+#: ../pidgin/gtkdialogs.c:396
 #, fuzzy, c-format
 msgid ""
 "%s is a graphical modular messaging client based on libpurple which is "
@@ -15050,90 +15023,91 @@
 "に帰属します。この貢献者の詳細な一覧については 'COPYRIGHT' を御覧下さい。本プ"
 "ログラムは完全無保証です。<BR><BR>"
 
-#: ../pidgin/gtkdialogs.c:412
+#: ../pidgin/gtkdialogs.c:414
+#, c-format
 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:417
+#: ../pidgin/gtkdialogs.c:419
 msgid "Current Developers"
 msgstr "現在の開発者"
 
-#: ../pidgin/gtkdialogs.c:432
+#: ../pidgin/gtkdialogs.c:434
 msgid "Crazy Patch Writers"
 msgstr "Crazy なパッチの作者"
 
-#: ../pidgin/gtkdialogs.c:447
+#: ../pidgin/gtkdialogs.c:449
 msgid "Retired Developers"
 msgstr "開発者 (旧バージョン)"
 
-#: ../pidgin/gtkdialogs.c:462
+#: ../pidgin/gtkdialogs.c:464
 #, fuzzy
 msgid "Retired Crazy Patch Writers"
 msgstr "Crazy なパッチの作者"
 
-#: ../pidgin/gtkdialogs.c:477
+#: ../pidgin/gtkdialogs.c:479
 msgid "Artists"
 msgstr "アーティスト"
 
-#: ../pidgin/gtkdialogs.c:492
+#: ../pidgin/gtkdialogs.c:494
 msgid "Current Translators"
 msgstr "翻訳者 (最新バージョン)"
 
-#: ../pidgin/gtkdialogs.c:512
+#: ../pidgin/gtkdialogs.c:514
 msgid "Past Translators"
 msgstr "翻訳者 (旧バージョン)"
 
-#: ../pidgin/gtkdialogs.c:530
+#: ../pidgin/gtkdialogs.c:532
 msgid "Debugging Information"
 msgstr "デバッグする際の参考情報"
 
-#: ../pidgin/gtkdialogs.c:900
+#: ../pidgin/gtkdialogs.c:902
 msgid "Get User Info"
 msgstr "ユーザ情報の取得"
 
-#: ../pidgin/gtkdialogs.c:902
+#: ../pidgin/gtkdialogs.c:904
 msgid ""
 "Please enter the screen name or alias of the person whose info you would "
 "like to view."
 msgstr "情報を表示する相手のスクリーン名または別名を入力して下さい:"
 
-#: ../pidgin/gtkdialogs.c:992
+#: ../pidgin/gtkdialogs.c:994
 msgid "View User Log"
 msgstr "ユーザ・ログの表示"
 
-#: ../pidgin/gtkdialogs.c:994
+#: ../pidgin/gtkdialogs.c:996
 msgid ""
 "Please enter the screen name or alias of the person whose log you would like "
 "to view."
 msgstr "ログを表示する相手のスクリーン名または別名を入力して下さい:"
 
-#: ../pidgin/gtkdialogs.c:1014
+#: ../pidgin/gtkdialogs.c:1016
 msgid "Alias Contact"
 msgstr "コンタクトの別名"
 
-#: ../pidgin/gtkdialogs.c:1015
+#: ../pidgin/gtkdialogs.c:1017
 msgid "Enter an alias for this contact."
 msgstr "このコンタクトの別名を入力して下さい:"
 
-#: ../pidgin/gtkdialogs.c:1037
+#: ../pidgin/gtkdialogs.c:1039
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "%s の別名を入力して下さい:"
 
-#: ../pidgin/gtkdialogs.c:1039
+#: ../pidgin/gtkdialogs.c:1041
 msgid "Alias Buddy"
 msgstr "仲間の別名"
 
-#: ../pidgin/gtkdialogs.c:1060
+#: ../pidgin/gtkdialogs.c:1062
 msgid "Alias Chat"
 msgstr "チャットの別名"
 
-#: ../pidgin/gtkdialogs.c:1061
+#: ../pidgin/gtkdialogs.c:1063
 msgid "Enter an alias for this chat."
 msgstr "このチャットの別名を入力して下さい:"
 
-#: ../pidgin/gtkdialogs.c:1100
+#: ../pidgin/gtkdialogs.c:1102
 #, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddy from "
@@ -15148,15 +15122,15 @@
 "仲間リストから %s さんを含む %d個の仲間を削除しようとしています。続行してもよ"
 "ろしいですか?"
 
-#: ../pidgin/gtkdialogs.c:1108
+#: ../pidgin/gtkdialogs.c:1110
 msgid "Remove Contact"
 msgstr "コンタクトの削除"
 
-#: ../pidgin/gtkdialogs.c:1111
+#: ../pidgin/gtkdialogs.c:1113
 msgid "_Remove Contact"
 msgstr "削除する(_R)"
 
-#: ../pidgin/gtkdialogs.c:1142
+#: ../pidgin/gtkdialogs.c:1144
 #, c-format
 msgid ""
 "You are about to merge the group called %s into the group called %s. Do you "
@@ -15165,15 +15139,15 @@
 "%s というグループと %s というグループを一つにまとめようとしています。続行して"
 "もよろしいですか?"
 
-#: ../pidgin/gtkdialogs.c:1149
+#: ../pidgin/gtkdialogs.c:1151
 msgid "Merge Groups"
 msgstr "グループの統合"
 
-#: ../pidgin/gtkdialogs.c:1152
+#: ../pidgin/gtkdialogs.c:1154
 msgid "_Merge Groups"
 msgstr "グループを統合する(_M)"
 
-#: ../pidgin/gtkdialogs.c:1202
+#: ../pidgin/gtkdialogs.c:1204
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
@@ -15182,29 +15156,29 @@
 "仲間リストからグループ %s とそのメンバを削除しようとしています。続行してもよ"
 "ろしいですか?"
 
-#: ../pidgin/gtkdialogs.c:1205
+#: ../pidgin/gtkdialogs.c:1207
 msgid "Remove Group"
 msgstr "グループの削除"
 
-#: ../pidgin/gtkdialogs.c:1208
+#: ../pidgin/gtkdialogs.c:1210
 msgid "_Remove Group"
 msgstr "削除する(_R)"
 
-#: ../pidgin/gtkdialogs.c:1241
+#: ../pidgin/gtkdialogs.c:1243
 #, c-format
 msgid ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr "仲間リストから %s を削除しようとしています。続行してもよろしいですか?"
 
-#: ../pidgin/gtkdialogs.c:1244
+#: ../pidgin/gtkdialogs.c:1246
 msgid "Remove Buddy"
 msgstr "仲間の削除"
 
-#: ../pidgin/gtkdialogs.c:1247
+#: ../pidgin/gtkdialogs.c:1249
 msgid "_Remove Buddy"
 msgstr "削除する(_R)"
 
-#: ../pidgin/gtkdialogs.c:1268
+#: ../pidgin/gtkdialogs.c:1270
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
@@ -15213,11 +15187,11 @@
 "仲間リストからチャット %s を削除しようとしています。続行してもよろしいです"
 "か?"
 
-#: ../pidgin/gtkdialogs.c:1271
+#: ../pidgin/gtkdialogs.c:1273
 msgid "Remove Chat"
 msgstr "チャットの削除"
 
-#: ../pidgin/gtkdialogs.c:1274
+#: ../pidgin/gtkdialogs.c:1276
 msgid "_Remove Chat"
 msgstr "削除する(_R)"
 
@@ -15243,7 +15217,7 @@
 
 #: ../pidgin/gtkdocklet.c:535
 #, fuzzy
-msgid "Blink on New Message"
+msgid "Blink on new message"
 msgstr "メッセージが届いたら点滅させる"
 
 #: ../pidgin/gtkdocklet.c:542
@@ -15342,7 +15316,7 @@
 msgid "Paste as Plain _Text"
 msgstr "文字列として貼り付け(_T)"
 
-#: ../pidgin/gtkimhtml.c:833 ../pidgin/gtkimhtmltoolbar.c:1192
+#: ../pidgin/gtkimhtml.c:833 ../pidgin/gtkimhtmltoolbar.c:1194
 msgid "_Reset formatting"
 msgstr "書式のリセット(_R)"
 
@@ -15421,6 +15395,7 @@
 msgstr "画像の保存"
 
 #: ../pidgin/gtkimhtml.c:3522
+#, c-format
 msgid "_Save Image..."
 msgstr "画像の保存(_S)..."
 
@@ -15455,11 +15430,11 @@
 msgid "Please enter the URL of the link that you want to insert."
 msgstr "挿入するリンクの URL を入力して下さい:"
 
-#: ../pidgin/gtkimhtmltoolbar.c:430 ../pidgin/gtkimhtmltoolbar.c:1099
+#: ../pidgin/gtkimhtmltoolbar.c:430 ../pidgin/gtkimhtmltoolbar.c:1102
 msgid "Insert Link"
 msgstr "リンクの挿入"
 
-#: ../pidgin/gtkimhtmltoolbar.c:434 ../pidgin/gtkimhtmltoolbar.c:1260
+#: ../pidgin/gtkimhtmltoolbar.c:434 ../pidgin/gtkimhtmltoolbar.c:1262
 msgid "_Insert"
 msgstr "挿入(_I)"
 
@@ -15481,94 +15456,94 @@
 msgid "Smile!"
 msgstr "スマイリー (顔文字) !"
 
-#: ../pidgin/gtkimhtmltoolbar.c:843 ../pidgin/gtkimhtmltoolbar.c:1217
+#: ../pidgin/gtkimhtmltoolbar.c:846 ../pidgin/gtkimhtmltoolbar.c:1219
 #, fuzzy
 msgid "_Font"
 msgstr "フォント"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1051
+#: ../pidgin/gtkimhtmltoolbar.c:1054
 #, fuzzy
 msgid "Group Items"
 msgstr "グループ ID"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1051
+#: ../pidgin/gtkimhtmltoolbar.c:1054
 msgid "Ungroup Items"
 msgstr ""
 
-#: ../pidgin/gtkimhtmltoolbar.c:1085 ../pidgin/plugins/convcolors.c:287
+#: ../pidgin/gtkimhtmltoolbar.c:1088 ../pidgin/plugins/convcolors.c:287
 msgid "Bold"
 msgstr "太字にする"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1086 ../pidgin/plugins/convcolors.c:294
+#: ../pidgin/gtkimhtmltoolbar.c:1089 ../pidgin/plugins/convcolors.c:294
 msgid "Italic"
 msgstr "イタリックにする"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1087 ../pidgin/plugins/convcolors.c:301
+#: ../pidgin/gtkimhtmltoolbar.c:1090 ../pidgin/plugins/convcolors.c:301
 msgid "Underline"
 msgstr "下線を付ける"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1088
+#: ../pidgin/gtkimhtmltoolbar.c:1091
 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
+msgid "Increase Font Size"
+msgstr ""
+
+#: ../pidgin/gtkimhtmltoolbar.c:1094
+msgid "Decrease Font Size"
+msgstr ""
+
+#: ../pidgin/gtkimhtmltoolbar.c:1096
 #, fuzzy
 msgid "Font Face"
 msgstr "フォントの種類を変更します"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1094
+#: ../pidgin/gtkimhtmltoolbar.c:1097
 #, fuzzy
 msgid "Background Color"
 msgstr "背景色を変更します"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1095
+#: ../pidgin/gtkimhtmltoolbar.c:1098
 #, fuzzy
 msgid "Foreground Color"
 msgstr "メッセージの色を変更します"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1097
+#: ../pidgin/gtkimhtmltoolbar.c:1100
 #, fuzzy
 msgid "Reset Formatting"
 msgstr "書式をリセットします"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1100
+#: ../pidgin/gtkimhtmltoolbar.c:1103
 #, fuzzy
 msgid "Insert IM Image"
 msgstr "画像の挿入"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1101
+#: ../pidgin/gtkimhtmltoolbar.c:1104
 #, fuzzy
 msgid "Insert Smiley"
 msgstr "スマイリー (顔文字) を挿入します"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1177
+#: ../pidgin/gtkimhtmltoolbar.c:1179
 #, fuzzy
 msgid "<b>_Bold</b>"
 msgstr "<b>パスワード</b>:"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1178
+#: ../pidgin/gtkimhtmltoolbar.c:1180
 #, fuzzy
 msgid "<i>_Italic</i>"
 msgstr " <i>(ircop)</i>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1179
+#: ../pidgin/gtkimhtmltoolbar.c:1181
 #, fuzzy
 msgid "<u>_Underline</u>"
 msgstr "下線を付ける"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1180
+#: ../pidgin/gtkimhtmltoolbar.c:1182
 msgid "<span strikethrough='true'>Strikethrough</span>"
 msgstr ""
 
-#: ../pidgin/gtkimhtmltoolbar.c:1181
+#: ../pidgin/gtkimhtmltoolbar.c:1183
 #, fuzzy
 msgid "<span size='larger'>_Larger</span>"
 msgstr ""
@@ -15576,52 +15551,52 @@
 "\n"
 "%s"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1183
+#: ../pidgin/gtkimhtmltoolbar.c:1185
 #, fuzzy
 msgid "_Normal"
 msgstr "標準"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1185
+#: ../pidgin/gtkimhtmltoolbar.c:1187
 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
+#: ../pidgin/gtkimhtmltoolbar.c:1191
 #, fuzzy
 msgid "_Font face"
 msgstr "フォントの種類を変更します"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1190
+#: ../pidgin/gtkimhtmltoolbar.c:1192
 #, fuzzy
 msgid "Foreground _color"
 msgstr "メッセージの色を変更します"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1191
+#: ../pidgin/gtkimhtmltoolbar.c:1193
 #, fuzzy
 msgid "Bac_kground color"
 msgstr "背景色を変更します"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1268
+#: ../pidgin/gtkimhtmltoolbar.c:1270
+#, fuzzy
+msgid "_Smiley"
+msgstr "スマイリー (顔文字) !"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1276
 #, fuzzy
 msgid "_Image"
 msgstr "画像の保存"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1274
+#: ../pidgin/gtkimhtmltoolbar.c:1282
 #, fuzzy
 msgid "_Link"
 msgstr "ログイン(_L)"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1280
+#: ../pidgin/gtkimhtmltoolbar.c:1288
 msgid "_Horizontal rule"
 msgstr ""
 
-#: ../pidgin/gtkimhtmltoolbar.c:1302
-#, fuzzy
-msgid "_Smile!"
-msgstr "スマイリー (顔文字) !"
-
 #: ../pidgin/gtklog.c:293
 #, c-format
 msgid ""
@@ -15726,7 +15701,6 @@
 "  -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"
@@ -15742,10 +15716,10 @@
 "可)\n"
 "  -v, --version       現在使用しているバージョンを表示して終了する\n"
 
-#: ../pidgin/gtkmain.c:516
+#: ../pidgin/gtkmain.c:512
 #, fuzzy, c-format
 msgid ""
-"%s %s has segfaulted and attempted to dump a core file.\n"
+"%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"
@@ -15785,7 +15759,7 @@
 
 #. Translators may want to transliterate the name.
 #. It is not to be translated.
-#: ../pidgin/gtkmain.c:706 ../pidgin/pidgin.h:51
+#: ../pidgin/gtkmain.c:699 ../pidgin/pidgin.h:51
 msgid "Pidgin"
 msgstr "Pidgin"
 
@@ -15797,17 +15771,17 @@
 msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">新着メールがあります!</span>"
 
-#: ../pidgin/gtknotify.c:537
+#: ../pidgin/gtknotify.c:540
 #, 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:562
+#: ../pidgin/gtknotify.c:564
 #, fuzzy, c-format
-msgid "<b>%d new e-mail.</b>"
-msgid_plural "<b>%d new e-mails.</b>"
+msgid "<b>You have %d new e-mail.</b>"
+msgid_plural "<b>You have %d new e-mails.</b>"
 msgstr[0] "<b>%d通の新しいメールがあります</b>"
 msgstr[1] "<b>%d通の新しいメールがあります</b>"
 
@@ -16017,7 +15991,7 @@
 msgid "_Hide new IM conversations:"
 msgstr "いつ新しい会話ウィンドウを隠すか...(_H):"
 
-#: ../pidgin/gtkprefs.c:908 ../pidgin/gtkprefs.c:1946
+#: ../pidgin/gtkprefs.c:908 ../pidgin/gtkprefs.c:1944
 msgid "When away"
 msgstr "離席する時だけ"
 
@@ -16070,61 +16044,57 @@
 msgid "Show _formatting on incoming messages"
 msgstr "受信したメッセージの書式を有効にして表示する(_F)"
 
-#: ../pidgin/gtkprefs.c:997
-msgid "Close IMs immediately when the tab is closed"
-msgstr ""
-
-#: ../pidgin/gtkprefs.c:1000
+#: ../pidgin/gtkprefs.c:998
 #, fuzzy
 msgid "Show _detailed information"
 msgstr "ログイン情報を表示する"
 
-#: ../pidgin/gtkprefs.c:1002
+#: ../pidgin/gtkprefs.c:1000
 msgid "Enable buddy ic_on animation"
 msgstr "仲間アイコンのアニメーションを有効にする(_O)"
 
-#: ../pidgin/gtkprefs.c:1009
+#: ../pidgin/gtkprefs.c:1007
 msgid "_Notify buddies that you are typing to them"
 msgstr "メッセージを入力中であることを仲間に通知する(_N)"
 
-#: ../pidgin/gtkprefs.c:1012
+#: ../pidgin/gtkprefs.c:1010
 msgid "Highlight _misspelled words"
 msgstr "スペル間違いを強調表示する(_M)"
 
-#: ../pidgin/gtkprefs.c:1016
+#: ../pidgin/gtkprefs.c:1014
 msgid "Use smooth-scrolling"
 msgstr "スクロールを滑らかにする"
 
+#: ../pidgin/gtkprefs.c:1017
+msgid "F_lash window when IMs are received"
+msgstr "メッセージを受け取ったらウィンドウを点滅させる(_L)"
+
 #: ../pidgin/gtkprefs.c:1019
-msgid "F_lash window when IMs are received"
-msgstr "メッセージを受け取ったらウィンドウを点滅させる(_L)"
-
-#: ../pidgin/gtkprefs.c:1021
 #, fuzzy
 msgid "Minimi_ze new conversation windows"
 msgstr "会話ウィンドウを前面に出す(_A)"
 
-#: ../pidgin/gtkprefs.c:1025
+#: ../pidgin/gtkprefs.c:1023
 msgid "Font"
 msgstr "フォント"
 
+#: ../pidgin/gtkprefs.c:1025
+msgid "Use document font from _theme"
+msgstr "テーマ指定のドキュメント用フォントを利用する(_T)"
+
 #: ../pidgin/gtkprefs.c:1027
-msgid "Use document font from _theme"
-msgstr "テーマ指定のドキュメント用フォントを利用する(_T)"
-
-#: ../pidgin/gtkprefs.c:1029
 msgid "Use font from _theme"
 msgstr "テーマ指定のフォントを利用する(_T)"
 
-#: ../pidgin/gtkprefs.c:1031
+#: ../pidgin/gtkprefs.c:1029
 msgid "Conversation _font:"
 msgstr "メッセージのフォント(_F):"
 
-#: ../pidgin/gtkprefs.c:1045
+#: ../pidgin/gtkprefs.c:1043
 msgid "Default Formatting"
 msgstr "デフォルトの書式"
 
-#: ../pidgin/gtkprefs.c:1064
+#: ../pidgin/gtkprefs.c:1062
 #, fuzzy
 msgid ""
 "This is how your outgoing message text will appear when you use protocols "
@@ -16133,119 +16103,119 @@
 "これは書式をサポートするプロトコルを利用する際に、送信したメッセージがどのよ"
 "うに表示されるかを示すものです :)"
 
-#: ../pidgin/gtkprefs.c:1130
+#: ../pidgin/gtkprefs.c:1128
 msgid "ST_UN server:"
 msgstr "STUN サーバ(_U):"
 
-#: ../pidgin/gtkprefs.c:1142
+#: ../pidgin/gtkprefs.c:1140
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">例: stunserver.org</span>"
 
-#: ../pidgin/gtkprefs.c:1146
+#: ../pidgin/gtkprefs.c:1144
 msgid "_Autodetect IP address"
 msgstr "IP-アドレスを自動的に検出する(_A)"
 
-#: ../pidgin/gtkprefs.c:1155
+#: ../pidgin/gtkprefs.c:1153
 msgid "Public _IP:"
 msgstr "パブリック IP(_I):"
 
-#: ../pidgin/gtkprefs.c:1184
+#: ../pidgin/gtkprefs.c:1182
 msgid "Ports"
 msgstr "ポート"
 
-#: ../pidgin/gtkprefs.c:1187
+#: ../pidgin/gtkprefs.c:1185
 msgid "_Manually specify range of ports to listen on"
 msgstr "監視するポート番号の範囲を指定する(_M)"
 
-#: ../pidgin/gtkprefs.c:1190
+#: ../pidgin/gtkprefs.c:1188
 msgid "_Start port:"
 msgstr "開始のポート番号(_S):"
 
-#: ../pidgin/gtkprefs.c:1197
+#: ../pidgin/gtkprefs.c:1195
 msgid "_End port:"
 msgstr "終了のポート番号(_E):"
 
-#: ../pidgin/gtkprefs.c:1205
+#: ../pidgin/gtkprefs.c:1203
 msgid "Proxy Server"
 msgstr "プロキシ・サーバ"
 
-#: ../pidgin/gtkprefs.c:1209
+#: ../pidgin/gtkprefs.c:1207
 msgid "No proxy"
 msgstr "プロキシなし"
 
-#: ../pidgin/gtkprefs.c:1265
+#: ../pidgin/gtkprefs.c:1263
 msgid "_User:"
 msgstr "ユーザ名(_U):"
 
-#: ../pidgin/gtkprefs.c:1330
+#: ../pidgin/gtkprefs.c:1328
 msgid "Seamonkey"
 msgstr "Seamonkey"
 
-#: ../pidgin/gtkprefs.c:1331
+#: ../pidgin/gtkprefs.c:1329
 msgid "Opera"
 msgstr "Opera"
 
-#: ../pidgin/gtkprefs.c:1332
+#: ../pidgin/gtkprefs.c:1330
 msgid "Netscape"
 msgstr "Netscape"
 
+#: ../pidgin/gtkprefs.c:1331
+msgid "Mozilla"
+msgstr "Mozilla"
+
+#: ../pidgin/gtkprefs.c:1332
+msgid "Konqueror"
+msgstr "Konqueror"
+
 #: ../pidgin/gtkprefs.c:1333
-msgid "Mozilla"
-msgstr "Mozilla"
+msgid "GNOME Default"
+msgstr "GNOME のデフォルト"
 
 #: ../pidgin/gtkprefs.c:1334
-msgid "Konqueror"
-msgstr "Konqueror"
+msgid "Galeon"
+msgstr "Galeon"
 
 #: ../pidgin/gtkprefs.c:1335
-msgid "GNOME Default"
-msgstr "GNOME のデフォルト"
+msgid "Firefox"
+msgstr "Firefox"
 
 #: ../pidgin/gtkprefs.c:1336
-msgid "Galeon"
-msgstr "Galeon"
+msgid "Firebird"
+msgstr "Firebird"
 
 #: ../pidgin/gtkprefs.c:1337
-msgid "Firefox"
-msgstr "Firefox"
-
-#: ../pidgin/gtkprefs.c:1338
-msgid "Firebird"
-msgstr "Firebird"
-
-#: ../pidgin/gtkprefs.c:1339
 msgid "Epiphany"
 msgstr "Epiphany"
 
-#: ../pidgin/gtkprefs.c:1348
+#: ../pidgin/gtkprefs.c:1346
 msgid "Manual"
 msgstr "手動設定"
 
-#: ../pidgin/gtkprefs.c:1401
+#: ../pidgin/gtkprefs.c:1399
 msgid "Browser Selection"
 msgstr "ブラウザの選択"
 
-#: ../pidgin/gtkprefs.c:1405
+#: ../pidgin/gtkprefs.c:1403
 msgid "_Browser:"
 msgstr "ブラウザ(_B):"
 
-#: ../pidgin/gtkprefs.c:1413
+#: ../pidgin/gtkprefs.c:1411
 msgid "_Open link in:"
 msgstr "リンクを開く方法(_O):"
 
-#: ../pidgin/gtkprefs.c:1415
+#: ../pidgin/gtkprefs.c:1413
 msgid "Browser default"
 msgstr "ブラウザの設定に従う"
 
-#: ../pidgin/gtkprefs.c:1416
+#: ../pidgin/gtkprefs.c:1414
 msgid "Existing window"
 msgstr "既存のウィンドウで開く"
 
-#: ../pidgin/gtkprefs.c:1418
+#: ../pidgin/gtkprefs.c:1416
 msgid "New tab"
 msgstr "新しいタブで開く"
 
-#: ../pidgin/gtkprefs.c:1432
+#: ../pidgin/gtkprefs.c:1430
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -16254,63 +16224,69 @@
 "手動設定(_M):\n"
 "(URL は %s で指定)"
 
-#: ../pidgin/gtkprefs.c:1472
+#: ../pidgin/gtkprefs.c:1470
 msgid "Log _format:"
 msgstr "ログの書式(_F):"
 
+#: ../pidgin/gtkprefs.c:1475
+msgid "Log all _instant messages"
+msgstr "メッセージを全てログに記録する(_L)"
+
 #: ../pidgin/gtkprefs.c:1477
-msgid "Log all _instant messages"
-msgstr "メッセージを全てログに記録する(_L)"
-
-#: ../pidgin/gtkprefs.c:1479
 msgid "Log all c_hats"
 msgstr "チャットを全てログに記録する(_H)"
 
-#: ../pidgin/gtkprefs.c:1481
+#: ../pidgin/gtkprefs.c:1479
 msgid "Log all _status changes to system log"
 msgstr "状態の変更を全てログに記録する(_S)"
 
-#: ../pidgin/gtkprefs.c:1627
+#: ../pidgin/gtkprefs.c:1625
 msgid "Sound Selection"
 msgstr "サウンドの選択"
 
-#: ../pidgin/gtkprefs.c:1637
+#: ../pidgin/gtkprefs.c:1635
+#, c-format
 msgid "Quietest"
 msgstr "一番静か"
 
-#: ../pidgin/gtkprefs.c:1639
+#: ../pidgin/gtkprefs.c:1637
+#, c-format
 msgid "Quieter"
 msgstr "まあまあ静か"
 
-#: ../pidgin/gtkprefs.c:1641
+#: ../pidgin/gtkprefs.c:1639
+#, c-format
 msgid "Quiet"
 msgstr "静か"
 
-#: ../pidgin/gtkprefs.c:1645
+#: ../pidgin/gtkprefs.c:1643
+#, c-format
 msgid "Loud"
 msgstr "大きい"
 
-#: ../pidgin/gtkprefs.c:1647
+#: ../pidgin/gtkprefs.c:1645
+#, c-format
 msgid "Louder"
 msgstr "まあまあ大きい"
 
-#: ../pidgin/gtkprefs.c:1649
+#: ../pidgin/gtkprefs.c:1647
+#, c-format
 msgid "Loudest"
 msgstr "一番大きい"
 
-#: ../pidgin/gtkprefs.c:1715
+#: ../pidgin/gtkprefs.c:1713
 msgid "_Method:"
 msgstr "方法(_M):"
 
-#: ../pidgin/gtkprefs.c:1717
+#: ../pidgin/gtkprefs.c:1715
 msgid "Console beep"
 msgstr "ビープ音"
 
-#: ../pidgin/gtkprefs.c:1724
+#: ../pidgin/gtkprefs.c:1722
 msgid "No sounds"
 msgstr "サウンドなし"
 
-#: ../pidgin/gtkprefs.c:1732
+#: ../pidgin/gtkprefs.c:1730
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -16319,82 +16295,82 @@
 "サウンド・コマンド(_O)\n"
 "(ファイル名は %s で指定)"
 
-#: ../pidgin/gtkprefs.c:1759
+#: ../pidgin/gtkprefs.c:1757
 msgid "Sounds when conversation has _focus"
 msgstr "会話ウィンドウがフォーカスされたらサウンドを演奏する(_F)"
 
-#: ../pidgin/gtkprefs.c:1761
+#: ../pidgin/gtkprefs.c:1759
 msgid "Enable sounds:"
 msgstr "いつサウンドを有効にするか...:"
 
-#: ../pidgin/gtkprefs.c:1772
+#: ../pidgin/gtkprefs.c:1770
 msgid "Volume:"
 msgstr "音量:"
 
-#: ../pidgin/gtkprefs.c:1852
+#: ../pidgin/gtkprefs.c:1850
 msgid "Play"
 msgstr "演奏"
 
-#: ../pidgin/gtkprefs.c:1929
+#: ../pidgin/gtkprefs.c:1927
 msgid "_Report idle time:"
 msgstr "いつ待機時間を報告するか...(_R):"
 
-#: ../pidgin/gtkprefs.c:1934
+#: ../pidgin/gtkprefs.c:1932
 msgid "Based on keyboard or mouse use"
 msgstr "キーボードやマウスを操作し始めた時"
 
-#: ../pidgin/gtkprefs.c:1943
+#: ../pidgin/gtkprefs.c:1941
 msgid "_Auto-reply:"
 msgstr "自動応答(_A):"
 
-#: ../pidgin/gtkprefs.c:1947
+#: ../pidgin/gtkprefs.c:1945
 msgid "When both away and idle"
 msgstr "離席中で待機中の時"
 
 #. Auto-away stuff
-#: ../pidgin/gtkprefs.c:1953
+#: ../pidgin/gtkprefs.c:1951
 msgid "Auto-away"
 msgstr "自動離席"
 
-#: ../pidgin/gtkprefs.c:1955
+#: ../pidgin/gtkprefs.c:1953
 msgid "Change status when _idle"
 msgstr "待機中になったら状態を変更する(_I)"
 
-#: ../pidgin/gtkprefs.c:1959
+#: ../pidgin/gtkprefs.c:1957
 #, fuzzy
 msgid "_Minutes before becoming idle:"
 msgstr "状態を変更するまでの時間(分)(_M):"
 
-#: ../pidgin/gtkprefs.c:1967
+#: ../pidgin/gtkprefs.c:1965
 msgid "Change _status to:"
 msgstr "次の状態に変更する(_S):"
 
 #. Signon status stuff
-#: ../pidgin/gtkprefs.c:1988
+#: ../pidgin/gtkprefs.c:1986
 msgid "Status at Startup"
 msgstr "起動時の状態"
 
-#: ../pidgin/gtkprefs.c:1990
+#: ../pidgin/gtkprefs.c:1988
 msgid "Use status from last _exit at startup"
 msgstr "最後に終了した時の状態を継承する(_E)"
 
-#: ../pidgin/gtkprefs.c:1996
+#: ../pidgin/gtkprefs.c:1994
 msgid "Status to a_pply at startup:"
 msgstr "起動時に適用する状態(_P):"
 
+#: ../pidgin/gtkprefs.c:2032
+msgid "Interface"
+msgstr "インタフェース"
+
 #: ../pidgin/gtkprefs.c:2034
-msgid "Interface"
-msgstr "インタフェース"
-
-#: ../pidgin/gtkprefs.c:2036
 msgid "Smiley Themes"
 msgstr "顔文字のテーマ"
 
-#: ../pidgin/gtkprefs.c:2043
+#: ../pidgin/gtkprefs.c:2041
 msgid "Browser"
 msgstr "ブラウザ"
 
-#: ../pidgin/gtkprefs.c:2047
+#: ../pidgin/gtkprefs.c:2045
 msgid "Status / Idle"
 msgstr "状態/待機"
 
@@ -16888,7 +16864,7 @@
 msgid "Received Messages"
 msgstr "受信したメッセージ"
 
-#: ../pidgin/plugins/convcolors.c:210 ../pidgin/plugins/pidginrc.c:245
+#: ../pidgin/plugins/convcolors.c:210 ../pidgin/plugins/pidginrc.c:251
 #, c-format
 msgid "Select Color for %s"
 msgstr "%s に使用する色の選択"
@@ -17155,7 +17131,7 @@
 "<b>Buddy Note</b>: %s"
 msgstr "仲間のメモ"
 
-#: ../pidgin/plugins/history.c:192
+#: ../pidgin/plugins/history.c:188
 msgid "History"
 msgstr "履歴"
 
@@ -17408,36 +17384,45 @@
 msgid "GtkTreeView Horizontal Separation"
 msgstr "GtkTreeView の水平方向のセパレータ"
 
-#: ../pidgin/plugins/pidginrc.c:69
+#: ../pidgin/plugins/pidginrc.c:73
 msgid "Conversation Entry"
 msgstr "メッセージの文字"
 
-#: ../pidgin/plugins/pidginrc.c:70
+#: ../pidgin/plugins/pidginrc.c:74
+msgid "Conversation History"
+msgstr "会話履歴の文字"
+
+#: ../pidgin/plugins/pidginrc.c:75
+msgid "Log Viewer"
+msgstr "ログ・ビューアの文字"
+
+#: ../pidgin/plugins/pidginrc.c:76
 msgid "Request Dialog"
 msgstr "質問ダイアログの文字"
 
-#: ../pidgin/plugins/pidginrc.c:71
+#: ../pidgin/plugins/pidginrc.c:77
 msgid "Notify Dialog"
 msgstr "通知ダイアログの文字"
 
-#: ../pidgin/plugins/pidginrc.c:247
+#: ../pidgin/plugins/pidginrc.c:253
 msgid "Select Color"
 msgstr "色の選択"
 
-#: ../pidgin/plugins/pidginrc.c:294
+#: ../pidgin/plugins/pidginrc.c:300
+#, c-format
 msgid "Select Interface Font"
 msgstr "フォントの選択"
 
-#: ../pidgin/plugins/pidginrc.c:297
+#: ../pidgin/plugins/pidginrc.c:303
 #, c-format
 msgid "Select Font for %s"
 msgstr "%s に使用するフォントの選択"
 
-#: ../pidgin/plugins/pidginrc.c:365
+#: ../pidgin/plugins/pidginrc.c:371
 msgid "GTK+ Interface Font"
 msgstr "GTK+ インタフェースで使用するフォント"
 
-#: ../pidgin/plugins/pidginrc.c:385
+#: ../pidgin/plugins/pidginrc.c:391
 msgid "GTK+ Text Shortcut Theme"
 msgstr "GTK+ テキストのショートカットのテーマ"
 
@@ -17461,36 +17446,36 @@
 #. widget_bool_widgets[i]);
 #. }
 #.
-#: ../pidgin/plugins/pidginrc.c:422
+#: ../pidgin/plugins/pidginrc.c:428
 msgid "Interface colors"
 msgstr "インタフェースの色"
 
-#: ../pidgin/plugins/pidginrc.c:446
+#: ../pidgin/plugins/pidginrc.c:452
 msgid "Widget Sizes"
 msgstr "ウィジットの大きさ"
 
-#: ../pidgin/plugins/pidginrc.c:467
+#: ../pidgin/plugins/pidginrc.c:473
 msgid "Fonts"
 msgstr "フォント"
 
-#: ../pidgin/plugins/pidginrc.c:491
+#: ../pidgin/plugins/pidginrc.c:497
 msgid "Gtkrc File Tools"
 msgstr ""
 
-#: ../pidgin/plugins/pidginrc.c:496
+#: ../pidgin/plugins/pidginrc.c:502
 #, c-format
 msgid "Write settings to %s%sgtkrc-2.0"
 msgstr "これらの設定を \"%s%sgtkrc-2.0\" に書き込む"
 
-#: ../pidgin/plugins/pidginrc.c:505
+#: ../pidgin/plugins/pidginrc.c:511
 msgid "Re-read gtkrc files"
 msgstr "この \"gtkrc\" ファイルを読み込む"
 
-#: ../pidgin/plugins/pidginrc.c:538
+#: ../pidgin/plugins/pidginrc.c:544
 msgid "Pidgin GTK+ Theme Control"
 msgstr "GTK+ テーマのカスタマイズ"
 
-#: ../pidgin/plugins/pidginrc.c:540 ../pidgin/plugins/pidginrc.c:541
+#: ../pidgin/plugins/pidginrc.c:546 ../pidgin/plugins/pidginrc.c:547
 msgid "Provides access to commonly used gtkrc settings."
 msgstr "\"gtkrc\" の設定にアクセスする機能を提供します"
 
@@ -17668,6 +17653,7 @@
 msgstr "タイムスタンプの書式オプション"
 
 #: ../pidgin/plugins/timestamp_format.c:26
+#, c-format
 msgid "_Force 24-hour time format"
 msgstr "強制的に 24時間制にする(_F)"
 
@@ -17885,14 +17871,108 @@
 msgstr ""
 "これは XMPP サービスやクライアントをデバッグする際に便利なプラグインです。"
 
-#~ msgid "Sort by status"
+#, fuzzy
+#~ msgid "Offline buddies"
+#~ msgstr "オフラインの仲間を表示する"
+
+#, fuzzy
+#~ msgid "Sort"
+#~ msgstr "ポート番号"
+
+#, fuzzy
+#~ msgid "By Status"
 #~ msgstr "状態順"
 
-#~ msgid "Sort alphabetically"
-#~ msgstr "アルファベット順"
-
-#~ msgid "Sort by log size"
-#~ msgstr "ログのサイズ順"
+#, fuzzy
+#~ msgid "By Log Size"
+#~ msgstr "ログ・サイズ順"
+
+#, fuzzy
+#~ msgid "Unable to connect to contact server"
+#~ msgstr "サーバへ接続できません"
+
+#, fuzzy
+#~ msgid "Unable to retrieve MSN Address Book"
+#~ msgstr "Notes アドレス帳の選択"
+
+#, fuzzy
+#~ msgid "Current media"
+#~ msgstr "現在のトークン"
+
+#, fuzzy
+#~ msgid "Windows Live Messenger Protocol Plugin"
+#~ msgstr "Novell GroupWise メッセンジャー・プロトコルのプラグイン"
+
+#, fuzzy
+#~ msgid "Windows Live ID authentication Failed"
+#~ msgstr "失敗: 認証に失敗しました"
+
+#~ msgid "%s just sent you a Nudge!"
+#~ msgstr "%s さんが合図を送りたがっています!"
+
+#, fuzzy
+#~ msgid "Unknown error (%d)"
+#~ msgstr "原因不明のエラー"
+
+#, fuzzy
+#~ msgid "Unable to connect to OIM server"
+#~ msgstr "サーバへ接続できません"
+
+#, fuzzy
+#~ msgid "%s (%s) changed status from %s to %s"
+#~ msgstr "%s さんがステータスを %s から %s に変更しました"
+
+#, fuzzy
+#~ msgid "%s (%s) is now %s"
+#~ msgstr "%s さんは %s さんと認識されました"
+
+#, fuzzy
+#~ msgid "%s (%s) is no longer %s"
+#~ msgstr "もう %s さんは %s さんではありません"
+
+#, fuzzy
+#~ msgid "_Merge"
+#~ msgstr "メッセージ(_M):"
+
+#, fuzzy
+#~ msgid "_Send File..."
+#~ msgstr "ファイルの送信(_S)"
+
+#, fuzzy
+#~ msgid "Add Buddy _Pounce..."
+#~ msgstr "つかむ仲間の追加..."
+
+#, fuzzy
+#~ msgid "Hide when offline"
+#~ msgstr "オフラインの時は許可できません"
+
+#, fuzzy
+#~ msgid "Show when offline"
+#~ msgstr "オフラインの時は許可できません"
+
+#, fuzzy
+#~ msgid "Add _Buddy..."
+#~ msgstr "仲間の追加"
+
+#, fuzzy
+#~ msgid "Add C_hat..."
+#~ msgstr "チャットの追加"
+
+#, fuzzy
+#~ msgid "Persistent"
+#~ msgstr "ペルシア語"
+
+#, fuzzy
+#~ msgid "/Accounts/Manage"
+#~ msgstr "/アカウント"
+
+#, fuzzy
+#~ msgid "A_ccount:"
+#~ msgstr "アカウント:"
+
+#, fuzzy
+#~ msgid "S_end To"
+#~ msgstr "送信先"
 
 #~ msgid "Commands are not supported yet. Message was NOT sent."
 #~ msgstr "まだコマンドはサポートしていません (メッセージを送信しませんでした)"
@@ -17900,12 +17980,6 @@
 #~ 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 のユーザ情報は有効ではありません:"
 
@@ -17984,27 +18058,12 @@
 #~ 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 "フォントのサイズを小さくします"
 
@@ -18017,11 +18076,5 @@
 #~ msgid "Show buddy _icons"
 #~ msgstr "仲間アイコンを表示する(_I)"
 
-#~ msgid "Conversation History"
-#~ msgstr "会話履歴の文字"
-
-#~ msgid "Log Viewer"
-#~ msgstr "ログ・ビューアの文字"
-
 #~ msgid "Tools"
 #~ msgstr "ツール"