diff po/ja.po @ 18480:226d523a34c2

fixes #1983 committer: Luke Schierer <lschiere@pidgin.im>
author Takashi Aihana <takeshi.aihana@gmail.com>
date Wed, 11 Jul 2007 17:51:38 +0000
parents 2908efabd7c1
children e5b23336e52f d679ee8062bf
line wrap: on
line diff
--- a/po/ja.po	Wed Jul 11 17:33:10 2007 +0000
+++ b/po/ja.po	Wed Jul 11 17:51:38 2007 +0000
@@ -10,8 +10,8 @@
 msgstr ""
 "Project-Id-Version: pidgin trunk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-05-01 23:40+0900\n"
-"PO-Revision-Date: 2007-05-01 23:40+0900\n"
+"POT-Creation-Date: 2007-06-30 14:57+0900\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"
 "MIME-Version: 1.0\n"
@@ -45,7 +45,13 @@
 "  -n, --nologin       自動的にサイン・インしない\n"
 "  -v, --version       現在使用しているバージョンを表示して終了する\n"
 
-#: ../finch/finch.c:304 ../pidgin/gtkmain.c:689
+#. Translators may want to transliterate the name.
+#. It is not to be translated.
+#: ../finch/finch.c:274 ../finch/finch.c:303
+msgid "Finch"
+msgstr "Finch"
+
+#: ../finch/finch.c:301 ../pidgin/gtkmain.c:682
 #, c-format
 msgid ""
 "%s encountered errors migrating your settings from %s to %s. Please "
@@ -56,19 +62,16 @@
 "を調査した上で手動にて移行を完了して下さい。それから http://developer.pidgin."
 "im にて問題を報告して下さい。"
 
-#: ../finch/finch.c:306
-msgid "Finch"
-msgstr "Finch"
-
-#: ../finch/gntaccount.c:119 ../finch/gntblist.c:286 ../finch/gntblist.c:411
-#: ../finch/gntblist.c:424 ../finch/gntplugin.c:163 ../finch/gntplugin.c:207
+#: ../finch/gntaccount.c:119 ../finch/gntblist.c:290 ../finch/gntblist.c:415
+#: ../finch/gntblist.c:428 ../finch/gntplugin.c:181 ../finch/gntplugin.c:225
 #: ../finch/gntstatus.c:294 ../finch/gntstatus.c:302
-#: ../libpurple/protocols/jabber/buddy.c:1401
-#: ../libpurple/protocols/jabber/chat.c:679
-#: ../libpurple/protocols/jabber/chat.c:690
-#: ../libpurple/protocols/jabber/jabber.c:1216
+#: ../libpurple/protocols/jabber/buddy.c:1426
+#: ../libpurple/protocols/jabber/chat.c:677
+#: ../libpurple/protocols/jabber/chat.c:688
+#: ../libpurple/protocols/jabber/jabber.c:1235
 #: ../libpurple/protocols/qq/group_join.c:326
-#: ../libpurple/protocols/silc/ops.c:1451
+#: ../libpurple/protocols/silc/ops.c:57 ../libpurple/protocols/silc/ops.c:1456
+#: ../libpurple/protocols/silc10/ops.c:1451
 msgid "Error"
 msgstr "エラー"
 
@@ -80,16 +83,16 @@
 msgid "Screenname of an account must be non-empty."
 msgstr "アカウントのスクリーン名は空にしないで下さい。"
 
-#: ../finch/gntaccount.c:423 ../pidgin/gtkaccount.c:575
+#: ../finch/gntaccount.c:423
 msgid "New mail notifications"
 msgstr "新着メールを通知する"
 
-#: ../finch/gntaccount.c:433 ../pidgin/gtkaccount.c:504
+#: ../finch/gntaccount.c:433
 msgid "Remember password"
 msgstr "パスワードを保存する"
 
-#: ../finch/gntaccount.c:474 ../pidgin/gtkaccount.c:1442
-#: ../pidgin/gtkblist.c:3948
+#: ../finch/gntaccount.c:474 ../pidgin/gtkaccount.c:1478
+#: ../pidgin/gtkblist.c:4005
 msgid "Modify Account"
 msgstr "アカウントの編集"
 
@@ -97,49 +100,48 @@
 msgid "New Account"
 msgstr "新しいアカウント"
 
-#: ../finch/gntaccount.c:500 ../pidgin/gtkaccount.c:415 ../pidgin/gtkft.c:695
+#: ../finch/gntaccount.c:500 ../pidgin/gtkft.c:695
 msgid "Protocol:"
 msgstr "プロトコル:"
 
-#: ../finch/gntaccount.c:508 ../pidgin/gtkaccount.c:420
-#: ../pidgin/gtkblist.c:5357
+#: ../finch/gntaccount.c:508
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:295
 msgid "Screen name:"
 msgstr "スクリーン名:"
 
-#: ../finch/gntaccount.c:521 ../pidgin/gtkaccount.c:495
+#: ../finch/gntaccount.c:521
 msgid "Password:"
 msgstr "パスワード:"
 
-#: ../finch/gntaccount.c:531 ../pidgin/gtkblist.c:5378
-#: ../pidgin/gtkblist.c:5741
+#: ../finch/gntaccount.c:531
 msgid "Alias:"
 msgstr "別名:"
 
 #. Cancel button
 #. Cancel
 #: ../finch/gntaccount.c:554 ../finch/gntaccount.c:617
-#: ../finch/gntaccount.c:838 ../finch/gntblist.c:330 ../finch/gntblist.c:399
-#: ../finch/gntblist.c:434 ../finch/gntblist.c:762 ../finch/gntblist.c:952
-#: ../finch/gntblist.c:1048 ../finch/gntblist.c:2137 ../finch/gntplugin.c:336
-#: ../finch/gntpounce.c:456 ../finch/gntpounce.c:654 ../finch/gntprefs.c:245
+#: ../finch/gntaccount.c:853 ../finch/gntblist.c:334 ../finch/gntblist.c:403
+#: ../finch/gntblist.c:438 ../finch/gntblist.c:770 ../finch/gntblist.c:967
+#: ../finch/gntblist.c:1063 ../finch/gntblist.c:2160 ../finch/gntplugin.c:360
+#: ../finch/gntpounce.c:456 ../finch/gntpounce.c:654 ../finch/gntprefs.c:246
 #: ../finch/gntstatus.c:142 ../finch/gntstatus.c:475 ../finch/gntstatus.c:600
 #: ../libpurple/account.c:984 ../libpurple/account.c:1234
-#: ../libpurple/account.c:1269 ../libpurple/conversation.c:1164
+#: ../libpurple/account.c:1269 ../libpurple/conversation.c:1168
 #: ../libpurple/plugins/buddynote.c:51 ../libpurple/protocols/gg/gg.c:502
 #: ../libpurple/protocols/gg/gg.c:661 ../libpurple/protocols/gg/gg.c:798
 #: ../libpurple/protocols/gg/gg.c:879
 #: ../libpurple/protocols/jabber/buddy.c:584
-#: ../libpurple/protocols/jabber/buddy.c:1763
-#: ../libpurple/protocols/jabber/buddy.c:1799
-#: ../libpurple/protocols/jabber/chat.c:788
-#: ../libpurple/protocols/jabber/jabber.c:874
-#: ../libpurple/protocols/jabber/jabber.c:1371
+#: ../libpurple/protocols/jabber/buddy.c:1788
+#: ../libpurple/protocols/jabber/buddy.c:1824
+#: ../libpurple/protocols/jabber/chat.c:786
+#: ../libpurple/protocols/jabber/jabber.c:882
+#: ../libpurple/protocols/jabber/jabber.c:1390
+#: ../libpurple/protocols/jabber/si.c:868
 #: ../libpurple/protocols/jabber/xdata.c:337
-#: ../libpurple/protocols/msn/msn.c:250 ../libpurple/protocols/msn/msn.c:267
-#: ../libpurple/protocols/msn/msn.c:284 ../libpurple/protocols/msn/msn.c:301
-#: ../libpurple/protocols/msn/msn.c:322
-#: ../libpurple/protocols/oscar/oscar.c:6003
+#: ../libpurple/protocols/msn/msn.c:259 ../libpurple/protocols/msn/msn.c:276
+#: ../libpurple/protocols/msn/msn.c:293 ../libpurple/protocols/msn/msn.c:310
+#: ../libpurple/protocols/msn/msn.c:331
+#: ../libpurple/protocols/oscar/oscar.c:6071
 #: ../libpurple/protocols/oscar/peer.c:1023
 #: ../libpurple/protocols/qq/buddy_info.c:484
 #: ../libpurple/protocols/qq/buddy_opt.c:214
@@ -155,27 +157,35 @@
 #: ../libpurple/protocols/sametime/sametime.c:3388
 #: ../libpurple/protocols/sametime/sametime.c:3474
 #: ../libpurple/protocols/sametime/sametime.c:3645
-#: ../libpurple/protocols/sametime/sametime.c:5391
-#: ../libpurple/protocols/sametime/sametime.c:5481
-#: ../libpurple/protocols/sametime/sametime.c:5606
-#: ../libpurple/protocols/silc/buddy.c:468
-#: ../libpurple/protocols/silc/buddy.c:1084
-#: ../libpurple/protocols/silc/buddy.c:1189
-#: ../libpurple/protocols/silc/chat.c:600
-#: ../libpurple/protocols/silc/chat.c:730
-#: ../libpurple/protocols/silc/ops.c:1913
-#: ../libpurple/protocols/silc/silc.c:744
-#: ../libpurple/protocols/silc/silc.c:950
-#: ../libpurple/protocols/yahoo/yahoo.c:991
-#: ../libpurple/protocols/yahoo/yahoo.c:3235
-#: ../libpurple/protocols/yahoo/yahoo.c:3246 ../pidgin/gtkaccount.c:1880
-#: ../pidgin/gtkaccount.c:2471 ../pidgin/gtkblist.c:5797
-#: ../pidgin/gtkdialogs.c:722 ../pidgin/gtkdialogs.c:860
-#: ../pidgin/gtkdialogs.c:952 ../pidgin/gtkdialogs.c:972
-#: ../pidgin/gtkdialogs.c:996 ../pidgin/gtkdialogs.c:1018
-#: ../pidgin/gtkdialogs.c:1066 ../pidgin/gtkdialogs.c:1107
-#: ../pidgin/gtkdialogs.c:1163 ../pidgin/gtkdialogs.c:1202
-#: ../pidgin/gtkdialogs.c:1229 ../pidgin/gtkimhtmltoolbar.c:419
+#: ../libpurple/protocols/sametime/sametime.c:5397
+#: ../libpurple/protocols/sametime/sametime.c:5487
+#: ../libpurple/protocols/sametime/sametime.c:5612
+#: ../libpurple/protocols/silc/buddy.c:455
+#: ../libpurple/protocols/silc/buddy.c:1076
+#: ../libpurple/protocols/silc/buddy.c:1191
+#: ../libpurple/protocols/silc/chat.c:616
+#: ../libpurple/protocols/silc/chat.c:746
+#: ../libpurple/protocols/silc/ops.c:1816
+#: ../libpurple/protocols/silc/silc.c:823
+#: ../libpurple/protocols/silc/silc.c:1031
+#: ../libpurple/protocols/silc10/buddy.c:468
+#: ../libpurple/protocols/silc10/buddy.c:1084
+#: ../libpurple/protocols/silc10/buddy.c:1189
+#: ../libpurple/protocols/silc10/chat.c:600
+#: ../libpurple/protocols/silc10/chat.c:730
+#: ../libpurple/protocols/silc10/ops.c:1904
+#: ../libpurple/protocols/silc10/silc.c:736
+#: ../libpurple/protocols/silc10/silc.c:942
+#: ../libpurple/protocols/yahoo/yahoo.c:989
+#: ../libpurple/protocols/yahoo/yahoo.c:3248
+#: ../libpurple/protocols/yahoo/yahoo.c:3259 ../pidgin/gtkaccount.c:1916
+#: ../pidgin/gtkaccount.c:2514 ../pidgin/gtkblist.c:5898
+#: ../pidgin/gtkdialogs.c:724 ../pidgin/gtkdialogs.c:871
+#: ../pidgin/gtkdialogs.c:963 ../pidgin/gtkdialogs.c:983
+#: ../pidgin/gtkdialogs.c:1007 ../pidgin/gtkdialogs.c:1029
+#: ../pidgin/gtkdialogs.c:1077 ../pidgin/gtkdialogs.c:1118
+#: ../pidgin/gtkdialogs.c:1174 ../pidgin/gtkdialogs.c:1213
+#: ../pidgin/gtkdialogs.c:1240 ../pidgin/gtkimhtmltoolbar.c:423
 #: ../pidgin/gtklog.c:302 ../pidgin/gtkplugin.c:288 ../pidgin/gtkpounce.c:1102
 #: ../pidgin/gtkprivacy.c:566 ../pidgin/gtkprivacy.c:582
 #: ../pidgin/gtkprivacy.c:607 ../pidgin/gtkprivacy.c:621
@@ -185,15 +195,15 @@
 
 #. Save button
 #. Save
-#: ../finch/gntaccount.c:558 ../finch/gntplugin.c:336 ../finch/gntpounce.c:462
-#: ../finch/gntprefs.c:245 ../finch/gntstatus.c:478 ../finch/gntstatus.c:588
+#: ../finch/gntaccount.c:558 ../finch/gntplugin.c:360 ../finch/gntpounce.c:462
+#: ../finch/gntprefs.c:246 ../finch/gntstatus.c:478 ../finch/gntstatus.c:588
 #: ../libpurple/account.c:1268 ../libpurple/plugins/buddynote.c:50
-#: ../libpurple/protocols/jabber/buddy.c:583 ../pidgin/gtkdebug.c:764
+#: ../libpurple/protocols/jabber/buddy.c:583 ../pidgin/gtkdebug.c:748
 #: ../pidgin/gtkrequest.c:276
 msgid "Save"
 msgstr "保存する"
 
-#: ../finch/gntaccount.c:611 ../pidgin/gtkaccount.c:1872
+#: ../finch/gntaccount.c:611 ../pidgin/gtkaccount.c:1908
 #: ../pidgin/gtksavedstatuses.c:328
 #, c-format
 msgid "Are you sure you want to delete %s?"
@@ -206,14 +216,14 @@
 #. Delete button
 #: ../finch/gntaccount.c:616 ../finch/gntaccount.c:683
 #: ../finch/gntpounce.c:653 ../finch/gntpounce.c:714 ../finch/gntstatus.c:141
-#: ../finch/gntstatus.c:204 ../pidgin/gtkaccount.c:1879 ../pidgin/gtklog.c:301
+#: ../finch/gntstatus.c:204 ../pidgin/gtkaccount.c:1915 ../pidgin/gtklog.c:301
 #: ../pidgin/gtkpounce.c:1101 ../pidgin/gtkrequest.c:273
 #: ../pidgin/gtksavedstatuses.c:336
 msgid "Delete"
 msgstr "削除する"
 
-#: ../finch/gntaccount.c:646 ../finch/gntblist.c:2043 ../finch/gntui.c:76
-#: ../pidgin/gtkaccount.c:2297 ../pidgin/gtkdocklet.c:539
+#: ../finch/gntaccount.c:646 ../finch/gntblist.c:2065 ../finch/gntui.c:76
+#: ../pidgin/gtkaccount.c:2340 ../pidgin/gtkdocklet.c:522
 msgid "Accounts"
 msgstr "アカウント"
 
@@ -222,15 +232,16 @@
 msgstr "次の一覧にあるアカウントの有効/無効を変更できます:"
 
 #. Add button
-#: ../finch/gntaccount.c:675 ../finch/gntaccount.c:837 ../finch/gntblist.c:329
-#: ../finch/gntblist.c:399 ../finch/gntblist.c:434 ../finch/gntnotify.c:309
+#: ../finch/gntaccount.c:675 ../finch/gntaccount.c:852 ../finch/gntblist.c:333
+#: ../finch/gntblist.c:403 ../finch/gntblist.c:438 ../finch/gntnotify.c:369
 #: ../finch/gntpounce.c:699 ../finch/gntstatus.c:194
 #: ../libpurple/protocols/gg/gg.c:878 ../libpurple/protocols/qq/sys_msg.c:116
 #: ../libpurple/protocols/qq/sys_msg.c:175
 #: ../libpurple/protocols/qq/sys_msg.c:270
-#: ../libpurple/protocols/sametime/sametime.c:5480
-#: ../libpurple/protocols/silc/chat.c:599 ../pidgin/gtkaccount.c:2470
-#: ../pidgin/gtkblist.c:5796 ../pidgin/gtkconv.c:1633
+#: ../libpurple/protocols/sametime/sametime.c:5486
+#: ../libpurple/protocols/silc/chat.c:615
+#: ../libpurple/protocols/silc10/chat.c:599 ../pidgin/gtkaccount.c:2513
+#: ../pidgin/gtkblist.c:5897 ../pidgin/gtkconv.c:1687
 #: ../pidgin/gtkrequest.c:274
 msgid "Add"
 msgstr "追加する"
@@ -240,101 +251,110 @@
 msgid "Modify"
 msgstr "変更する"
 
-#: ../finch/gntaccount.c:760 ../pidgin/gtkaccount.c:2417
+#: ../finch/gntaccount.c:775 ../pidgin/gtkaccount.c:2460
 #, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s"
 msgstr "%s%s%s%s さんは %s さんを仲間にしました%s%s"
 
-#: ../finch/gntaccount.c:833 ../pidgin/gtkaccount.c:2469
+#: ../finch/gntaccount.c:848 ../pidgin/gtkaccount.c:2512
 msgid "Add buddy to your list?"
 msgstr "仲間をリストに追加しますか?"
 
-#: ../finch/gntaccount.c:887 ../pidgin/gtkaccount.c:2521
+#: ../finch/gntaccount.c:902 ../pidgin/gtkaccount.c:2564
 #, c-format
 msgid "%s%s%s%s wants to add %s to his or her buddy list%s%s"
 msgstr "%s%s%s%s さんが %s さんを仲間リスト%s%s に追加したがっています"
 
-#: ../finch/gntaccount.c:907 ../finch/gntaccount.c:914
-#: ../pidgin/gtkaccount.c:2544 ../pidgin/gtkaccount.c:2550
+#: ../finch/gntaccount.c:922 ../finch/gntaccount.c:929
+#: ../pidgin/gtkaccount.c:2587 ../pidgin/gtkaccount.c:2593
 msgid "Authorize buddy?"
 msgstr "仲間として承認しますか?"
 
-#: ../finch/gntaccount.c:911 ../finch/gntaccount.c:918
-#: ../pidgin/gtkaccount.c:2545 ../pidgin/gtkaccount.c:2551
+#: ../finch/gntaccount.c:926 ../finch/gntaccount.c:933
+#: ../pidgin/gtkaccount.c:2588 ../pidgin/gtkaccount.c:2594
 msgid "Authorize"
 msgstr "承認する"
 
-#: ../finch/gntaccount.c:912 ../finch/gntaccount.c:919
-#: ../pidgin/gtkaccount.c:2546 ../pidgin/gtkaccount.c:2552
+#: ../finch/gntaccount.c:927 ../finch/gntaccount.c:934
+#: ../pidgin/gtkaccount.c:2589 ../pidgin/gtkaccount.c:2595
 msgid "Deny"
 msgstr "拒否する"
 
-#: ../finch/gntblist.c:278
+#: ../finch/gntblist.c:279
 msgid "You must provide a screename for the buddy."
 msgstr "仲間のスクリーン名を指定して下さい"
 
-#: ../finch/gntblist.c:280
+#: ../finch/gntblist.c:281
 msgid "You must provide a group."
 msgstr "グループを指定して下さい"
 
-#: ../finch/gntblist.c:282
+#: ../finch/gntblist.c:283
 msgid "You must select an account."
 msgstr "アカウントを選択して下さい"
 
-#: ../finch/gntblist.c:286
+#: ../finch/gntblist.c:285
+msgid "The selected account is not online."
+msgstr "選択したアカウントはオフラインです"
+
+#: ../finch/gntblist.c:290
 msgid "Error adding buddy"
 msgstr "仲間を追加する際にエラー"
 
-#: ../finch/gntblist.c:311 ../libpurple/protocols/oscar/oscar.c:2837
-#: ../pidgin/gtkaccount.c:1955 ../pidgin/gtksavedstatuses.c:924
+#: ../finch/gntblist.c:315 ../libpurple/protocols/oscar/oscar.c:2863
+#: ../pidgin/gtkaccount.c:1991 ../pidgin/gtksavedstatuses.c:924
 msgid "Screen Name"
 msgstr "スクリーン名"
 
-#: ../finch/gntblist.c:314 ../finch/gntblist.c:391 ../finch/gntblist.c:949
-#: ../finch/gntblist.c:1193 ../libpurple/protocols/msn/msn.c:1351
-#: ../libpurple/protocols/silc/chat.c:590
+#: ../finch/gntblist.c:318 ../finch/gntblist.c:395 ../finch/gntblist.c:1211
+#: ../libpurple/protocols/msn/msn.c:1364
+#: ../libpurple/protocols/silc/chat.c:606
+#: ../libpurple/protocols/silc10/chat.c:590
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:680
 #: ../libpurple/protocols/zephyr/zephyr.c:788
-#: ../libpurple/protocols/zephyr/zephyr.c:1206 ../pidgin/gtkdialogs.c:971
-#: ../pidgin/gtkdialogs.c:995 ../pidgin/gtkdialogs.c:1017
+#: ../libpurple/protocols/zephyr/zephyr.c:1207 ../pidgin/gtkdialogs.c:982
+#: ../pidgin/gtkdialogs.c:1006 ../pidgin/gtkdialogs.c:1028
 #: ../pidgin/gtkrequest.c:277
 msgid "Alias"
 msgstr "別名"
 
-#: ../finch/gntblist.c:317 ../finch/gntblist.c:394
+#: ../finch/gntblist.c:321 ../finch/gntblist.c:398
 msgid "Group"
 msgstr "グループ"
 
-#: ../finch/gntblist.c:321 ../finch/gntblist.c:382 ../finch/gntblist.c:1243
-#: ../finch/gntnotify.c:155 ../finch/gntstatus.c:566
+#: ../finch/gntblist.c:325 ../finch/gntblist.c:386 ../finch/gntblist.c:1261
+#: ../finch/gntnotify.c:171 ../finch/gntstatus.c:566
 #: ../libpurple/plugins/idle.c:153 ../libpurple/plugins/idle.c:190
-#: ../pidgin/gtkblist.c:2946 ../pidgin/gtknotify.c:476
-#: ../pidgin/gtkpounce.c:1269 ../pidgin/plugins/gevolution/gevolution.c:444
+#: ../pidgin/gtkblist.c:2984 ../pidgin/gtknotify.c:482
+#: ../pidgin/gtkpounce.c:1269 ../pidgin/plugins/gevolution/gevolution.c:443
 msgid "Account"
 msgstr "アカウント"
 
-#: ../finch/gntblist.c:327 ../finch/gntblist.c:811
-#: ../libpurple/protocols/silc/buddy.c:737
-#: ../libpurple/protocols/silc/buddy.c:1033
-#: ../libpurple/protocols/silc/buddy.c:1080
-#: ../libpurple/protocols/silc/buddy.c:1180
-#: ../libpurple/protocols/yahoo/yahoo.c:3148 ../pidgin/gtkblist.c:5311
+#: ../finch/gntblist.c:331 ../finch/gntblist.c:819
+#: ../libpurple/protocols/silc/buddy.c:725
+#: ../libpurple/protocols/silc/buddy.c:1027
+#: ../libpurple/protocols/silc/buddy.c:1072
+#: ../libpurple/protocols/silc/buddy.c:1182
+#: ../libpurple/protocols/silc10/buddy.c:737
+#: ../libpurple/protocols/silc10/buddy.c:1033
+#: ../libpurple/protocols/silc10/buddy.c:1080
+#: ../libpurple/protocols/silc10/buddy.c:1180
+#: ../libpurple/protocols/yahoo/yahoo.c:3161 ../pidgin/gtkblist.c:5403
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:447
 msgid "Add Buddy"
 msgstr "仲間の追加"
 
-#: ../finch/gntblist.c:327
+#: ../finch/gntblist.c:331
 msgid "Please enter buddy information."
 msgstr "仲間の情報を入力して下さい:"
 
-#: ../finch/gntblist.c:354 ../libpurple/blist.c:1192
+#: ../finch/gntblist.c:358 ../libpurple/blist.c:1192
 msgid "Chats"
 msgstr "チャット"
 
 #. Extract their Name and put it in
-#: ../finch/gntblist.c:388 ../libpurple/protocols/jabber/jabber.c:805
-#: ../libpurple/protocols/msn/msn.c:1524 ../libpurple/protocols/msn/msn.c:1589
-#: ../libpurple/protocols/msn/msn.c:1616
+#: ../finch/gntblist.c:392 ../libpurple/protocols/jabber/jabber.c:813
+#: ../libpurple/protocols/msn/msn.c:1553 ../libpurple/protocols/msn/msn.c:1618
+#: ../libpurple/protocols/msn/msn.c:1645
 #: ../libpurple/protocols/qq/buddy_info.c:44 ../pidgin/gtkplugin.c:581
 #: ../pidgin/gtkroomlist.c:621
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:132
@@ -342,160 +362,182 @@
 msgid "Name"
 msgstr "名前"
 
-#: ../finch/gntblist.c:397 ../finch/gntblist.c:813 ../pidgin/gtkblist.c:5687
+#: ../finch/gntblist.c:401 ../finch/gntblist.c:821 ../pidgin/gtkblist.c:5783
 msgid "Add Chat"
 msgstr "チャットの追加"
 
-#: ../finch/gntblist.c:398
+#: ../finch/gntblist.c:402
 msgid "You can edit more information from the context menu later."
 msgstr "右クリック・メニューから情報を編集できます"
 
-#: ../finch/gntblist.c:411 ../finch/gntblist.c:424
+#: ../finch/gntblist.c:415 ../finch/gntblist.c:428
 msgid "Error adding group"
 msgstr "グループを追加する際にエラー"
 
-#: ../finch/gntblist.c:412
+#: ../finch/gntblist.c:416
 msgid "You must give a name for the group to add."
 msgstr "追加するグループの名前を入力して下さい"
 
-#: ../finch/gntblist.c:425
+#: ../finch/gntblist.c:429
 msgid "A group with the name already exists."
 msgstr "その名前のグループは既に存在します"
 
-#: ../finch/gntblist.c:432 ../finch/gntblist.c:815
-#: ../libpurple/protocols/sametime/sametime.c:5390
-#: ../libpurple/protocols/sametime/sametime.c:5478 ../pidgin/gtkblist.c:5793
+#: ../finch/gntblist.c:436 ../finch/gntblist.c:823
+#: ../libpurple/protocols/sametime/sametime.c:5396
+#: ../libpurple/protocols/sametime/sametime.c:5484 ../pidgin/gtkblist.c:5894
 msgid "Add Group"
 msgstr "グループの追加"
 
-#: ../finch/gntblist.c:432
+#: ../finch/gntblist.c:436
 msgid "Enter the name of the group"
 msgstr "追加するグループの名前を入力して下さい:"
 
-#: ../finch/gntblist.c:761
+#: ../finch/gntblist.c:769
 msgid "Edit Chat"
 msgstr "チャットの編集"
 
-#: ../finch/gntblist.c:761
+#: ../finch/gntblist.c:769
 msgid "Please Update the necessary fields."
 msgstr "必要な項目を更新して下さい"
 
-#: ../finch/gntblist.c:762 ../finch/gntstatus.c:199
+#: ../finch/gntblist.c:770 ../finch/gntstatus.c:199
 msgid "Edit"
 msgstr "編集"
 
-#: ../finch/gntblist.c:778
+#: ../finch/gntblist.c:786
 msgid "Auto-join"
 msgstr "自動参加"
 
-#: ../finch/gntblist.c:787
+#: ../finch/gntblist.c:795
 msgid "Edit Settings"
 msgstr "設定の編集"
 
-#: ../finch/gntblist.c:851 ../libpurple/protocols/silc/chat.c:883
+#: ../finch/gntblist.c:833 ../finch/gntconv.c:317 ../pidgin/gtkblist.c:277
+#: ../pidgin/gtkconv.c:682 ../pidgin/gtkdialogs.c:830
+msgid "Information"
+msgstr "情報"
+
+#: ../finch/gntblist.c:833 ../finch/gntconv.c:317 ../pidgin/gtkblist.c:277
+#: ../pidgin/gtkconv.c:682 ../pidgin/gtkdialogs.c:830
+msgid "Retrieving..."
+msgstr "取得中..."
+
+#: ../finch/gntblist.c:866 ../finch/gntconv.c:418
+#: ../libpurple/protocols/silc/chat.c:899
+#: ../libpurple/protocols/silc10/chat.c:883
 msgid "Get Info"
 msgstr "情報の取得"
 
-#: ../finch/gntblist.c:855
+#: ../finch/gntblist.c:870
 msgid "Add Buddy Pounce"
 msgstr "つかむ仲間の追加"
 
 #. if (q_bud && is_online(q_bud->status)) {
-#: ../finch/gntblist.c:862 ../libpurple/protocols/oscar/oscar.c:635
-#: ../libpurple/protocols/qq/qq.c:585 ../pidgin/gtkconv.c:1581
+#: ../finch/gntblist.c:877 ../finch/gntconv.c:430
+#: ../libpurple/protocols/jabber/si.c:868
+#: ../libpurple/protocols/oscar/oscar.c:654 ../libpurple/protocols/qq/qq.c:585
+#: ../pidgin/gtkconv.c:1635
 msgid "Send File"
 msgstr "ファイルの送信"
 
-#: ../finch/gntblist.c:866
+#: ../finch/gntblist.c:881
 msgid "View Log"
 msgstr "ログの表示"
 
-#: ../finch/gntblist.c:947
+#: ../finch/gntblist.c:962
 #, c-format
 msgid "Please enter the new name for %s"
 msgstr "%s さんの新しい名前を入力して下さい"
 
-#: ../finch/gntblist.c:949 ../finch/gntblist.c:1193
+#: ../finch/gntblist.c:964 ../finch/gntblist.c:1211
 msgid "Rename"
 msgstr "名前の変更"
 
-#: ../finch/gntblist.c:950
+#: ../finch/gntblist.c:964
+msgid "Set Alias"
+msgstr "別名の指定"
+
+#: ../finch/gntblist.c:965
 msgid "Enter empty string to reset the name."
 msgstr "空の文字列を入力すると名前をリセットします"
 
-#: ../finch/gntblist.c:1026
+#: ../finch/gntblist.c:1041
 msgid "Removing this contact will also remove all the buddies in the contact"
 msgstr "この連絡先を削除すると、その中にある仲間の情報も全て削除されます"
 
-#: ../finch/gntblist.c:1034
+#: ../finch/gntblist.c:1049
 msgid "Removing this group will also remove all the buddies in the group"
 msgstr "このグループを削除すると、その中にある仲間の情報も全て削除されます"
 
-#: ../finch/gntblist.c:1039
+#: ../finch/gntblist.c:1054
 #, c-format
 msgid "Are you sure you want to remove %s?"
 msgstr "本当に %s を削除してもよろしいですか?"
 
 #. XXX: anything to do with the returned ui-handle?
-#: ../finch/gntblist.c:1042
+#: ../finch/gntblist.c:1057
 msgid "Confirm Remove"
 msgstr "削除の確認"
 
-#: ../finch/gntblist.c:1047 ../finch/gntblist.c:1195 ../finch/gntft.c:223
-#: ../pidgin/gtkblist.c:1118 ../pidgin/gtkconv.c:1630
-#: ../pidgin/gtkrequest.c:275 ../pidgin/gtkstatusbox.c:261
+#: ../finch/gntblist.c:1062 ../finch/gntblist.c:1213 ../finch/gntft.c:223
+#: ../pidgin/gtkconv.c:1684 ../pidgin/gtkrequest.c:275
+#: ../pidgin/gtkstatusbox.c:261
 msgid "Remove"
 msgstr "削除"
 
 #. Buddy List
-#: ../finch/gntblist.c:1169 ../finch/gntblist.c:2214 ../finch/gntprefs.c:239
-#: ../finch/gntui.c:77 ../pidgin/gtkblist.c:4190
+#: ../finch/gntblist.c:1187 ../finch/gntblist.c:2237 ../finch/gntprefs.c:240
+#: ../finch/gntui.c:77 ../pidgin/gtkblist.c:4249
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:330
 msgid "Buddy List"
 msgstr "仲間リスト"
 
-#: ../finch/gntblist.c:1200
+#: ../finch/gntblist.c:1218
 msgid "Place tagged"
 msgstr "Place tagged"
 
-#: ../finch/gntblist.c:1205
+#: ../finch/gntblist.c:1223
 msgid "Toggle Tag"
 msgstr "Toggle Tag"
 
 #. General
-#: ../finch/gntblist.c:1238 ../libpurple/protocols/gg/gg.c:632
+#: ../finch/gntblist.c:1256 ../libpurple/protocols/gg/gg.c:632
 #: ../libpurple/protocols/gg/gg.c:1045 ../libpurple/protocols/gg/gg.c:1120
 #: ../libpurple/protocols/gg/gg.c:2204
 #: ../libpurple/protocols/jabber/buddy.c:274
 #: ../libpurple/protocols/jabber/buddy.c:818
-#: ../libpurple/protocols/jabber/buddy.c:1564
-#: ../libpurple/protocols/jabber/buddy.c:1746
-#: ../libpurple/protocols/jabber/jabber.c:815
-#: ../libpurple/protocols/msn/msn.c:1359 ../libpurple/protocols/msn/msn.c:1527
+#: ../libpurple/protocols/jabber/buddy.c:1589
+#: ../libpurple/protocols/jabber/buddy.c:1771
+#: ../libpurple/protocols/jabber/jabber.c:823
+#: ../libpurple/protocols/msn/msn.c:1372 ../libpurple/protocols/msn/msn.c:1556
 #: ../libpurple/protocols/qq/buddy_info.c:43
 #: ../libpurple/protocols/silc/buddy.c:1535
-#: ../libpurple/protocols/silc/ops.c:1036
-#: ../libpurple/protocols/silc/ops.c:1179
-#: ../libpurple/protocols/silc/ops.c:1328
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1042 ../pidgin/gtkblist.c:2970
+#: ../libpurple/protocols/silc/ops.c:1002
+#: ../libpurple/protocols/silc/ops.c:1186
+#: ../libpurple/protocols/silc/ops.c:1322
+#: ../libpurple/protocols/silc10/buddy.c:1535
+#: ../libpurple/protocols/silc10/ops.c:1036
+#: ../libpurple/protocols/silc10/ops.c:1179
+#: ../libpurple/protocols/silc10/ops.c:1328
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1042 ../pidgin/gtkblist.c:3008
 msgid "Nickname"
 msgstr "ニックネーム"
 
 #. Idle stuff
-#: ../finch/gntblist.c:1258 ../finch/gntprefs.c:242
-#: ../libpurple/protocols/bonjour/bonjour.c:322
+#: ../finch/gntblist.c:1276 ../finch/gntprefs.c:243
+#: ../libpurple/protocols/bonjour/bonjour.c:314
 #: ../libpurple/protocols/jabber/buddy.c:643
 #: ../libpurple/protocols/jabber/buddy.c:683
-#: ../libpurple/protocols/msn/msn.c:524 ../libpurple/protocols/msn/state.c:32
+#: ../libpurple/protocols/msn/msn.c:516 ../libpurple/protocols/msn/state.c:32
 #: ../libpurple/protocols/novell/novell.c:2825
-#: ../libpurple/protocols/oscar/oscar.c:2861
-#: ../libpurple/protocols/yahoo/yahoo.c:2902
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:686 ../pidgin/gtkblist.c:2990
-#: ../pidgin/gtkblist.c:3379 ../pidgin/gtkprefs.c:1809
+#: ../libpurple/protocols/oscar/oscar.c:2887
+#: ../libpurple/protocols/yahoo/yahoo.c:2915
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:686 ../pidgin/gtkblist.c:3035
+#: ../pidgin/gtkblist.c:3428 ../pidgin/gtkprefs.c:1848
 msgid "Idle"
 msgstr "待機中"
 
-#: ../finch/gntblist.c:1347
+#: ../finch/gntblist.c:1365
 #, c-format
 msgid ""
 "Online: %d\n"
@@ -504,12 +546,12 @@
 "オンライン: %d\n"
 "合計: %d"
 
-#: ../finch/gntblist.c:1356
+#: ../finch/gntblist.c:1374
 #, c-format
 msgid "Account: %s (%s)"
 msgstr "アカウント: %s (%s)"
 
-#: ../finch/gntblist.c:1368
+#: ../finch/gntblist.c:1386
 #, c-format
 msgid ""
 "\n"
@@ -518,158 +560,159 @@
 "\n"
 "最後にお会いしたのは: %s前"
 
-#: ../finch/gntblist.c:1632 ../pidgin/gtkdocklet.c:487
+#: ../finch/gntblist.c:1651 ../pidgin/gtkdocklet.c:470
 #: ../pidgin/gtkstatusbox.c:1064
 msgid "New..."
 msgstr "状態の追加..."
 
-#: ../finch/gntblist.c:1639 ../pidgin/gtkdocklet.c:488
+#: ../finch/gntblist.c:1658 ../pidgin/gtkdocklet.c:471
 #: ../pidgin/gtkstatusbox.c:1065
 msgid "Saved..."
 msgstr "他の状態..."
 
-#: ../finch/gntblist.c:2011 ../finch/gntplugin.c:224 ../finch/gntui.c:81
-#: ../pidgin/gtkdocklet.c:540 ../pidgin/gtkplugin.c:530
+#: ../finch/gntblist.c:2033 ../finch/gntplugin.c:244 ../finch/gntui.c:81
+#: ../pidgin/gtkdocklet.c:523 ../pidgin/gtkplugin.c:530
 msgid "Plugins"
 msgstr "プラグイン"
 
-#: ../finch/gntblist.c:2118 ../pidgin/gtkdialogs.c:703
-#: ../pidgin/gtkdialogs.c:841 ../pidgin/gtkdialogs.c:922
+#: ../finch/gntblist.c:2141 ../pidgin/gtkdialogs.c:705
+#: ../pidgin/gtkdialogs.c:852 ../pidgin/gtkdialogs.c:933
 msgid "_Name"
 msgstr "名前(_N)"
 
-#: ../finch/gntblist.c:2123 ../pidgin/gtkdialogs.c:708
-#: ../pidgin/gtkdialogs.c:846 ../pidgin/gtkdialogs.c:927
+#: ../finch/gntblist.c:2146 ../pidgin/gtkdialogs.c:710
+#: ../pidgin/gtkdialogs.c:857 ../pidgin/gtkdialogs.c:938
 msgid "_Account"
 msgstr "アカウント(_A)"
 
-#: ../finch/gntblist.c:2131 ../pidgin/gtkdialogs.c:716
+#: ../finch/gntblist.c:2154 ../pidgin/gtkdialogs.c:718
 msgid "New Instant Message"
 msgstr "新しいインスタント・メッセージ"
 
-#: ../finch/gntblist.c:2133 ../pidgin/gtkdialogs.c:718
+#: ../finch/gntblist.c:2156 ../pidgin/gtkdialogs.c:720
 msgid ""
 "Please enter the screen name or alias of the person you would like to IM."
 msgstr "IM で会話する相手のスクリーン名または別名を入力して下さい:"
 
-#: ../finch/gntblist.c:2136 ../finch/gntconn.c:48 ../finch/gntnotify.c:79
-#: ../libpurple/account.c:983 ../libpurple/account.c:1233
-#: ../libpurple/protocols/gg/gg.c:501 ../libpurple/protocols/gg/gg.c:660
-#: ../libpurple/protocols/gg/gg.c:797
-#: ../libpurple/protocols/jabber/jabber.c:1370
+#: ../finch/gntblist.c:2159 ../finch/gntnotify.c:77 ../libpurple/account.c:983
+#: ../libpurple/account.c:1233 ../libpurple/protocols/gg/gg.c:501
+#: ../libpurple/protocols/gg/gg.c:660 ../libpurple/protocols/gg/gg.c:797
+#: ../libpurple/protocols/jabber/jabber.c:1389
 #: ../libpurple/protocols/jabber/xdata.c:336
-#: ../libpurple/protocols/msn/msn.c:249 ../libpurple/protocols/msn/msn.c:266
-#: ../libpurple/protocols/msn/msn.c:283 ../libpurple/protocols/msn/msn.c:300
-#: ../libpurple/protocols/oscar/oscar.c:6002
-#: ../libpurple/protocols/silc/buddy.c:467
-#: ../libpurple/protocols/silc/buddy.c:1188
-#: ../libpurple/protocols/silc/chat.c:425
-#: ../libpurple/protocols/silc/chat.c:464
-#: ../libpurple/protocols/silc/chat.c:729
-#: ../libpurple/protocols/silc/ops.c:1297
-#: ../libpurple/protocols/silc/ops.c:1912
-#: ../libpurple/protocols/silc/silc.c:743
-#: ../libpurple/protocols/yahoo/yahoo.c:990
-#: ../libpurple/protocols/yahoo/yahoo.c:3234
-#: ../libpurple/protocols/yahoo/yahoo.c:3245 ../pidgin/gtkblist.c:3947
-#: ../pidgin/gtkdialogs.c:721 ../pidgin/gtkdialogs.c:859
-#: ../pidgin/gtkdialogs.c:951 ../pidgin/gtkrequest.c:269
+#: ../libpurple/protocols/msn/msn.c:258 ../libpurple/protocols/msn/msn.c:275
+#: ../libpurple/protocols/msn/msn.c:292 ../libpurple/protocols/msn/msn.c:309
+#: ../libpurple/protocols/oscar/oscar.c:6070
+#: ../libpurple/protocols/silc/buddy.c:454
+#: ../libpurple/protocols/silc/buddy.c:1190
+#: ../libpurple/protocols/silc/chat.c:447
+#: ../libpurple/protocols/silc/chat.c:482
+#: ../libpurple/protocols/silc/chat.c:745
+#: ../libpurple/protocols/silc/ops.c:1291
+#: ../libpurple/protocols/silc/ops.c:1815
+#: ../libpurple/protocols/silc/silc.c:822
+#: ../libpurple/protocols/silc10/buddy.c:467
+#: ../libpurple/protocols/silc10/buddy.c:1188
+#: ../libpurple/protocols/silc10/chat.c:425
+#: ../libpurple/protocols/silc10/chat.c:464
+#: ../libpurple/protocols/silc10/chat.c:729
+#: ../libpurple/protocols/silc10/ops.c:1297
+#: ../libpurple/protocols/silc10/ops.c:1903
+#: ../libpurple/protocols/silc10/silc.c:735
+#: ../libpurple/protocols/yahoo/yahoo.c:988
+#: ../libpurple/protocols/yahoo/yahoo.c:3247
+#: ../libpurple/protocols/yahoo/yahoo.c:3258 ../pidgin/gtkblist.c:4004
+#: ../pidgin/gtkdialogs.c:723 ../pidgin/gtkdialogs.c:870
+#: ../pidgin/gtkdialogs.c:962 ../pidgin/gtkrequest.c:269
 msgid "OK"
 msgstr "OK"
 
 #. Create the "Options" frame.
-#: ../finch/gntblist.c:2156 ../finch/gntpounce.c:444 ../pidgin/gtkpounce.c:778
+#: ../finch/gntblist.c:2179 ../finch/gntpounce.c:444 ../pidgin/gtkpounce.c:778
 msgid "Options"
 msgstr "オプション"
 
-#: ../finch/gntblist.c:2162
+#: ../finch/gntblist.c:2185
 msgid "Send IM..."
 msgstr "IM の送信..."
 
-#: ../finch/gntblist.c:2166
-msgid "Toggle offline buddies"
-msgstr "オフラインの仲間に切り換える"
-
-#: ../finch/gntblist.c:2172
+#: ../finch/gntblist.c:2189
+msgid "Show offline buddies"
+msgstr "オフラインの仲間を表示する"
+
+#: ../finch/gntblist.c:2195
 msgid "Sort by status"
 msgstr "状態順"
 
-#: ../finch/gntblist.c:2176
+#: ../finch/gntblist.c:2199
 msgid "Sort alphabetically"
 msgstr "アルファベット順"
 
-#: ../finch/gntblist.c:2180
+#: ../finch/gntblist.c:2203
 msgid "Sort by log size"
 msgstr "ログのサイズ順"
 
-#: ../finch/gntconn.c:38
+#: ../finch/gntconn.c:109
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../finch/gntconn.c:41
+#: ../finch/gntconn.c:112
 #, c-format
 msgid "%s disconnected."
 msgstr "%s さんは接続を切りました"
 
-#: ../finch/gntconn.c:42
-#, c-format
-msgid ""
-"%s was disconnected due to the following error:\n"
-"%s"
-msgstr ""
-"%s さんが次のエラーが発生したので接続を切りました:\n"
-"%s"
-
-#: ../finch/gntconn.c:45 ../libpurple/account.c:1012
-#: ../libpurple/connection.c:107 ../pidgin/gtkblist.c:3944
-msgid "Connection Error"
-msgstr "接続エラー"
-
-#: ../finch/gntconn.c:49 ../libpurple/protocols/sametime/sametime.c:3644
-#: ../pidgin/gtkblist.c:3949
-msgid "Connect"
-msgstr "接続"
-
-#: ../finch/gntconv.c:103
+#: ../finch/gntconn.c:113
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"Finch will not attempt to reconnect the account until you correct the error "
+"and re-enable the account."
+msgstr ""
+"%s\n"
+"\n"
+"エラーを解決しアカウントをもう一度有効にするまで、そのアカウントには接続しま"
+"せん。"
+
+#: ../finch/gntconv.c:116
 msgid "No such command."
 msgstr "そのようなコマンドはありません"
 
-#: ../finch/gntconv.c:107 ../pidgin/gtkconv.c:507
+#: ../finch/gntconv.c:120 ../pidgin/gtkconv.c:513
 msgid "Syntax Error:  You typed the wrong number of arguments to that command."
 msgstr "入力エラー:  そのコマンドに対する引数の数が間違っています"
 
-#: ../finch/gntconv.c:112 ../pidgin/gtkconv.c:512
+#: ../finch/gntconv.c:125 ../pidgin/gtkconv.c:518
 msgid "Your command failed for an unknown reason."
 msgstr "原因不明ですが、コマンド適用に失敗しました"
 
-#: ../finch/gntconv.c:117 ../pidgin/gtkconv.c:518
+#: ../finch/gntconv.c:130 ../pidgin/gtkconv.c:524
 msgid "That command only works in chats, not IMs."
 msgstr "そのコマンドは IM ではなくチャットでのみ動作します"
 
-#: ../finch/gntconv.c:120 ../pidgin/gtkconv.c:521
+#: ../finch/gntconv.c:133 ../pidgin/gtkconv.c:527
 msgid "That command only works in IMs, not chats."
 msgstr "そのコマンドはチャットではなく IM でのみ動作します"
 
-#: ../finch/gntconv.c:124 ../pidgin/gtkconv.c:525
+#: ../finch/gntconv.c:137 ../pidgin/gtkconv.c:531
 msgid "That command doesn't work on this protocol."
 msgstr "そのコマンドは、このプロトコルでは動作しません"
 
-#: ../finch/gntconv.c:131
+#: ../finch/gntconv.c:144
 msgid "Commands are not supported yet. Message was NOT sent."
 msgstr "まだコマンドはサポートしていません (メッセージを送信しませんでした)"
 
-#: ../finch/gntconv.c:217
+#: ../finch/gntconv.c:230
 #, c-format
 msgid "%s (%s -- %s)"
 msgstr "%s (%s -- %s)"
 
-#: ../finch/gntconv.c:240
+#: ../finch/gntconv.c:253
 #, c-format
 msgid "%s [%s]"
 msgstr "%s [%s]"
 
-#: ../finch/gntconv.c:245 ../finch/gntconv.c:423
+#: ../finch/gntconv.c:258 ../finch/gntconv.c:619
 #, c-format
 msgid ""
 "\n"
@@ -678,24 +721,48 @@
 "\n"
 "%s さんが何か入力しています..."
 
-#: ../finch/gntconv.c:390
+#: ../finch/gntconv.c:277
+msgid "You have left this chat."
+msgstr "このチャットから退出しました"
+
+#: ../finch/gntconv.c:353
+msgid "Send To"
+msgstr "送信先"
+
+#: ../finch/gntconv.c:397
+msgid "Conversation"
+msgstr "会話ウィンドウ"
+
+#: ../finch/gntconv.c:403
+msgid "Clear Scrollback"
+msgstr "スクロールバックのクリア"
+
+#: ../finch/gntconv.c:407 ../finch/gntprefs.c:178
+msgid "Show Timestamps"
+msgstr "タイムスタンプを表示する"
+
+#: ../finch/gntconv.c:423
+msgid "Add Buddy Pounce..."
+msgstr "つかむ仲間の追加..."
+
+#: ../finch/gntconv.c:586
 msgid "<AUTO-REPLY> "
 msgstr "<AUTO-REPLY> "
 
 #. Print the list of users in the room
-#: ../finch/gntconv.c:492
+#: ../finch/gntconv.c:702
 msgid "List of users:\n"
 msgstr "ユーザの一覧\n"
 
-#: ../finch/gntconv.c:616 ../pidgin/gtkconv.c:388
+#: ../finch/gntconv.c:847 ../pidgin/gtkconv.c:394
 msgid "Supported debug options are:  version"
 msgstr "サポートするデバッグ・オプションは:  バージョン"
 
-#: ../finch/gntconv.c:651 ../pidgin/gtkconv.c:424
+#: ../finch/gntconv.c:882 ../pidgin/gtkconv.c:430
 msgid "No such command (in this context)."
 msgstr "(このコンテキストには) そのようなコマンドはありません"
 
-#: ../finch/gntconv.c:654 ../pidgin/gtkconv.c:427
+#: ../finch/gntconv.c:885 ../pidgin/gtkconv.c:433
 msgid ""
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
 "The following commands are available in this context:\n"
@@ -704,7 +771,7 @@
 "\"/help &lt;command&gt;\" を使用して下さい。\n"
 "このコンテキストでは次のコマンドが利用可能です:\n"
 
-#: ../finch/gntconv.c:693 ../pidgin/gtkconv.c:7023
+#: ../finch/gntconv.c:943 ../pidgin/gtkconv.c:7211
 msgid ""
 "say &lt;message&gt;:  Send a message normally as if you weren't using a "
 "command."
@@ -712,13 +779,13 @@
 "say &lt;メッセージ&gt;:  コマンドを利用していない場合でもメッセージを送信しま"
 "す"
 
-#: ../finch/gntconv.c:696 ../pidgin/gtkconv.c:7026
+#: ../finch/gntconv.c:946 ../pidgin/gtkconv.c:7214
 msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
 msgstr ""
 "me &lt;アクション&gt;:  仲間またはチャットへ IRC スタイルのアクションを送信し"
 "ます"
 
-#: ../finch/gntconv.c:699 ../pidgin/gtkconv.c:7029
+#: ../finch/gntconv.c:949 ../pidgin/gtkconv.c:7217
 msgid ""
 "debug &lt;option&gt;:  Send various debug information to the current "
 "conversation."
@@ -726,39 +793,43 @@
 "debug &lt;オプション&gt;:  利用中の会話ウィンドウへいろいろなデバッグ情報を送"
 "信します"
 
-#: ../finch/gntconv.c:702 ../pidgin/gtkconv.c:7032
+#: ../finch/gntconv.c:952 ../pidgin/gtkconv.c:7220
 msgid "clear: Clears the conversation scrollback."
 msgstr "クリア: 会話ウィンドウにある以前のメッセージをクリアします"
 
-#: ../finch/gntconv.c:705 ../pidgin/gtkconv.c:7035
+#: ../finch/gntconv.c:955 ../pidgin/gtkconv.c:7223
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr "help &lt;コマンド&gt;:  特定のコマンドに対するヘルプを表示します"
 
-#: ../finch/gntconv.c:710
+#: ../finch/gntconv.c:958
+msgid "users:  Show the list of users in the chat."
+msgstr "users:  チャットの中にユーザの一覧を表示する"
+
+#: ../finch/gntconv.c:963
 msgid "plugins: Show the plugins window."
 msgstr "plugins: プラグイン・ウィンドウを表示する"
 
-#: ../finch/gntconv.c:713
+#: ../finch/gntconv.c:966
 msgid "buddylist: Show the buddylist."
 msgstr "buddylist: 仲間リストを表示する"
 
-#: ../finch/gntconv.c:716
+#: ../finch/gntconv.c:969
 msgid "accounts: Show the accounts window."
 msgstr "accounts: アカウント・ウィンドウを表示する"
 
-#: ../finch/gntconv.c:719
+#: ../finch/gntconv.c:972
 msgid "debugwin: Show the debug window."
 msgstr "debugwin: デバッグ・ウィンドウを表示する"
 
-#: ../finch/gntconv.c:722
+#: ../finch/gntconv.c:975
 msgid "prefs: Show the preference window."
 msgstr "prefs: 設定ウィンドウを表示する"
 
-#: ../finch/gntconv.c:725
+#: ../finch/gntconv.c:978
 msgid "statuses: Show the savedstatuses window."
 msgstr "statuses: 保存状態のウィンドウを表示する"
 
-#: ../finch/gntdebug.c:211 ../finch/gntui.c:79 ../pidgin/gtkdebug.c:710
+#: ../finch/gntdebug.c:230 ../finch/gntui.c:79 ../pidgin/gtkdebug.c:694
 msgid "Debug Window"
 msgstr "デバッグ・ウィンドウ"
 
@@ -766,18 +837,18 @@
 #. * it's necessary to make the width of the debug window resizable ... like I said,
 #. * it doesn't make sense. The bug is likely in the packing in gntbox.c.
 #.
-#: ../finch/gntdebug.c:232 ../pidgin/gtkdebug.c:769
+#: ../finch/gntdebug.c:251 ../pidgin/gtkdebug.c:753
 msgid "Clear"
 msgstr "クリア"
 
-#: ../finch/gntdebug.c:237 ../pidgin/gtkdebug.c:778
+#: ../finch/gntdebug.c:257
+msgid "Filter: "
+msgstr "フィルタ: "
+
+#: ../finch/gntdebug.c:261 ../pidgin/gtkdebug.c:762
 msgid "Pause"
 msgstr "一時停止"
 
-#: ../finch/gntdebug.c:242 ../pidgin/gtkdebug.c:785 ../pidgin/gtkdebug.c:786
-msgid "Timestamps"
-msgstr "タイムスタンプ"
-
 #: ../finch/gntft.c:117 ../pidgin/gtkft.c:228
 #, c-format
 msgid "File Transfers - %d%% of %d files"
@@ -810,24 +881,24 @@
 
 #. XXX: Use of ggp_str_to_uin() is an ugly hack!
 #: ../finch/gntft.c:197 ../finch/gntstatus.c:537 ../finch/gntstatus.c:566
-#: ../libpurple/protocols/bonjour/bonjour.c:326
+#: ../libpurple/protocols/bonjour/bonjour.c:318
 #: ../libpurple/protocols/gg/gg.c:1034 ../libpurple/protocols/gg/gg.c:1573
 #: ../libpurple/protocols/gg/gg.c:1581
 #: ../libpurple/protocols/jabber/buddy.c:634
 #: ../libpurple/protocols/jabber/buddy.c:638
 #: ../libpurple/protocols/jabber/buddy.c:673
-#: ../libpurple/protocols/jabber/jabber.c:1201
-#: ../libpurple/protocols/msn/msn.c:523
+#: ../libpurple/protocols/jabber/jabber.c:1220
+#: ../libpurple/protocols/msn/msn.c:515
 #: ../libpurple/protocols/novell/novell.c:2835
-#: ../libpurple/protocols/oscar/oscar.c:802
-#: ../libpurple/protocols/oscar/oscar.c:807
-#: ../libpurple/protocols/oscar/oscar.c:809
-#: ../libpurple/protocols/oscar/oscar.c:2650
-#: ../libpurple/protocols/oscar/oscar.c:3761
+#: ../libpurple/protocols/oscar/oscar.c:821
+#: ../libpurple/protocols/oscar/oscar.c:826
+#: ../libpurple/protocols/oscar/oscar.c:828
+#: ../libpurple/protocols/oscar/oscar.c:2676
+#: ../libpurple/protocols/oscar/oscar.c:3793
 #: ../libpurple/protocols/sametime/sametime.c:3263
 #: ../libpurple/protocols/sametime/sametime.c:4150
-#: ../libpurple/protocols/yahoo/yahoo.c:3053 ../pidgin/gtkblist.c:3034
-#: ../pidgin/gtkblist.c:3047 ../pidgin/gtkblist.c:3049
+#: ../libpurple/protocols/yahoo/yahoo.c:3066 ../pidgin/gtkblist.c:3079
+#: ../pidgin/gtkblist.c:3092 ../pidgin/gtkblist.c:3094
 #: ../pidgin/gtksavedstatuses.c:943 ../pidgin/gtksavedstatuses.c:1090
 msgid "Status"
 msgstr "状態"
@@ -845,10 +916,11 @@
 msgstr "停止する"
 
 #. Close button
-#: ../finch/gntft.c:233 ../finch/gntnotify.c:163 ../finch/gntplugin.c:187
-#: ../finch/gntplugin.c:267 ../finch/gntpounce.c:722 ../finch/gntstatus.c:209
-#: ../libpurple/protocols/msn/msn.c:366 ../libpurple/protocols/silc/util.c:377
-#: ../pidgin/gtkaccount.c:2444 ../pidgin/gtkrequest.c:272
+#: ../finch/gntft.c:233 ../finch/gntnotify.c:179 ../finch/gntplugin.c:205
+#: ../finch/gntplugin.c:291 ../finch/gntpounce.c:722 ../finch/gntstatus.c:209
+#: ../libpurple/protocols/msn/msn.c:375 ../libpurple/protocols/silc/util.c:382
+#: ../libpurple/protocols/silc10/util.c:377 ../pidgin/gtkaccount.c:2487
+#: ../pidgin/gtkrequest.c:272
 msgid "Close"
 msgstr "閉じる"
 
@@ -874,72 +946,84 @@
 msgid "Finished"
 msgstr "完了しました"
 
-#: ../finch/gntft.c:428 ../libpurple/protocols/msn/session.c:346
+#: ../finch/gntft.c:428 ../libpurple/protocols/msn/session.c:347
 msgid "Transferring"
 msgstr "転送しています"
 
-#: ../finch/gntnotify.c:146
+#: ../finch/gntnotify.c:162
 msgid "Emails"
 msgstr "E-メール"
 
-#: ../finch/gntnotify.c:152 ../finch/gntnotify.c:206
+#: ../finch/gntnotify.c:168 ../finch/gntnotify.c:222
 msgid "You have mail!"
 msgstr "メールが届きました!"
 
-#: ../finch/gntnotify.c:155 ../libpurple/protocols/jabber/jabber.c:1161
+#: ../finch/gntnotify.c:171 ../libpurple/protocols/jabber/jabber.c:1180
 msgid "From"
 msgstr "差出人"
 
-#: ../finch/gntnotify.c:155 ../pidgin/gtknotify.c:490
+#: ../finch/gntnotify.c:171 ../pidgin/gtknotify.c:496
 msgid "Subject"
 msgstr "件名"
 
-#: ../finch/gntnotify.c:182
+#: ../finch/gntnotify.c:198
 #, c-format
 msgid "%s (%s) has %d new message."
 msgid_plural "%s (%s) has %d new messages."
 msgstr[0] "%s (%s) には %d通の新しいメッセージがあります"
 msgstr[1] "%s (%s) には %d通の新しいメッセージがあります"
 
-#: ../finch/gntnotify.c:206 ../pidgin/gtknotify.c:329
+#: ../finch/gntnotify.c:222 ../pidgin/gtknotify.c:335
 msgid "New Mail"
 msgstr "新着メール"
 
-#: ../finch/gntnotify.c:230 ../pidgin/gtknotify.c:866
+#: ../finch/gntnotify.c:287 ../pidgin/gtknotify.c:920
 #, c-format
 msgid "Info for %s"
 msgstr "%s さんの情報"
 
-#: ../finch/gntnotify.c:232 ../libpurple/protocols/toc/toc.c:476
-#: ../pidgin/gtknotify.c:868
+#: ../finch/gntnotify.c:288 ../libpurple/protocols/toc/toc.c:476
+#: ../pidgin/gtknotify.c:921
 msgid "Buddy Information"
 msgstr "仲間の情報"
 
-#: ../finch/gntnotify.c:306
+#: ../finch/gntnotify.c:366
 msgid "Continue"
 msgstr "続行する"
 
-#: ../finch/gntnotify.c:312 ../pidgin/gtkconv.c:1609 ../pidgin/gtkdebug.c:864
+#: ../finch/gntnotify.c:372 ../pidgin/gtkconv.c:1663 ../pidgin/gtkdebug.c:834
 msgid "Info"
 msgstr "情報"
 
-#: ../finch/gntnotify.c:315 ../pidgin/gtkconv.c:1570
+#: ../finch/gntnotify.c:375 ../pidgin/gtkconv.c:1624
 msgid "IM"
 msgstr "IM"
 
-#: ../finch/gntnotify.c:318
+#: ../finch/gntnotify.c:378
 msgid "Join"
 msgstr "参加する"
 
-#: ../finch/gntnotify.c:321 ../libpurple/protocols/sametime/sametime.c:3473
+#: ../finch/gntnotify.c:381 ../libpurple/protocols/sametime/sametime.c:3473
 msgid "Invite"
 msgstr "招待する"
 
-#: ../finch/gntnotify.c:324
+#: ../finch/gntnotify.c:384
 msgid "(none)"
 msgstr "(なし)"
 
-#: ../finch/gntplugin.c:111
+#: ../finch/gntplugin.c:73 ../finch/gntplugin.c:82
+msgid "ERROR"
+msgstr "エラー"
+
+#: ../finch/gntplugin.c:73
+msgid "loading plugin failed"
+msgstr "プラグインの読み込みに失敗しました"
+
+#: ../finch/gntplugin.c:82
+msgid "unloading plugin failed"
+msgstr "プラグインの解放に失敗しました"
+
+#: ../finch/gntplugin.c:124
 #, c-format
 msgid ""
 "Name: %s\n"
@@ -956,24 +1040,24 @@
 "配布元: %s\n"
 "ファイル名: %s\n"
 
-#: ../finch/gntplugin.c:164
+#: ../finch/gntplugin.c:182
 msgid "Plugin need to be loaded before you can configure it."
 msgstr "それを設定する前に適切なプラグインを読み込んで下さい"
 
-#: ../finch/gntplugin.c:208
+#: ../finch/gntplugin.c:226
 msgid "No configuration options for this plugin."
 msgstr "このプラグインに対するオプションが設定されていません"
 
-#: ../finch/gntplugin.c:229
+#: ../finch/gntplugin.c:249
 msgid "You can (un)load plugins from the following list."
 msgstr "次の一覧にあるプラグインを読み込んだり読み込みを解除できます"
 
-#: ../finch/gntplugin.c:272
+#: ../finch/gntplugin.c:296
 msgid "Configure Plugin"
 msgstr "プラグインの設定"
 
-#: ../finch/gntplugin.c:328 ../finch/gntplugin.c:335 ../finch/gntprefs.c:244
-#: ../finch/gntui.c:82 ../pidgin/gtkdocklet.c:541 ../pidgin/gtkprefs.c:1953
+#: ../finch/gntplugin.c:352 ../finch/gntplugin.c:359 ../finch/gntprefs.c:245
+#: ../finch/gntui.c:82 ../pidgin/gtkdocklet.c:524 ../pidgin/gtkprefs.c:1992
 msgid "Preferences"
 msgstr "設定"
 
@@ -994,9 +1078,7 @@
 msgstr "誰をつかむか..."
 
 #. Account:
-#. Set up stuff for the account box
-#: ../finch/gntpounce.c:333 ../finch/gntstatus.c:446 ../pidgin/gtkblist.c:5405
-#: ../pidgin/gtkblist.c:5721
+#: ../finch/gntpounce.c:333 ../finch/gntstatus.c:446
 msgid "Account:"
 msgstr "アカウント:"
 
@@ -1145,69 +1227,69 @@
 msgid "Unknown pounce event. Please report this!"
 msgstr "不明な \"つかみ\" イベントです。ぜひバグ報告して下さい!"
 
-#: ../finch/gntprefs.c:80 ../pidgin/gtkprefs.c:1814
+#: ../finch/gntprefs.c:79
+msgid "Based on keyboard use"
+msgstr "キーボードを操作し始めた時"
+
+#: ../finch/gntprefs.c:81 ../pidgin/gtkprefs.c:1853
 msgid "From last sent message"
 msgstr "最後にメッセージを送信した後"
 
-#: ../finch/gntprefs.c:82 ../pidgin/gtkprefs.c:820 ../pidgin/gtkprefs.c:829
-#: ../pidgin/gtkprefs.c:1813 ../pidgin/gtkprefs.c:1827
+#: ../finch/gntprefs.c:83 ../pidgin/gtkprefs.c:820 ../pidgin/gtkprefs.c:829
+#: ../pidgin/gtkprefs.c:1852 ../pidgin/gtkprefs.c:1866
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:337
 msgid "Never"
 msgstr "しない"
 
-#: ../finch/gntprefs.c:170
+#: ../finch/gntprefs.c:171
 msgid "Show Idle Time"
 msgstr "待機中の時間を表示する"
 
-#: ../finch/gntprefs.c:171
+#: ../finch/gntprefs.c:172
 msgid "Show Offline Buddies"
 msgstr "オフラインの仲間を表示する"
 
-#: ../finch/gntprefs.c:177
-msgid "Show Timestamps"
-msgstr "タイムスタンプを表示する"
-
-#: ../finch/gntprefs.c:178
+#: ../finch/gntprefs.c:179
 msgid "Notify buddies when you are typing"
 msgstr "メッセージを入力中であることを仲間に通知する"
 
-#: ../finch/gntprefs.c:184
+#: ../finch/gntprefs.c:185
 msgid "Log format"
 msgstr "ログの書式"
 
-#: ../finch/gntprefs.c:185
+#: ../finch/gntprefs.c:186
 msgid "Log IMs"
 msgstr "IM をログに記録する"
 
-#: ../finch/gntprefs.c:186
+#: ../finch/gntprefs.c:187
 msgid "Log chats"
 msgstr "チャットをログに記録する"
 
-#: ../finch/gntprefs.c:187
+#: ../finch/gntprefs.c:188
 msgid "Log status change events"
 msgstr "ログの状態の変更イベント"
 
 #. Conversations
-#: ../finch/gntprefs.c:240 ../pidgin/gtkprefs.c:898 ../pidgin/gtkprefs.c:1917
+#: ../finch/gntprefs.c:241 ../pidgin/gtkprefs.c:915 ../pidgin/gtkprefs.c:1956
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:344
 msgid "Conversations"
 msgstr "会話ウィンドウ"
 
-#: ../finch/gntprefs.c:241 ../pidgin/gtkprefs.c:1355 ../pidgin/gtkprefs.c:1928
+#: ../finch/gntprefs.c:242 ../pidgin/gtkprefs.c:1392 ../pidgin/gtkprefs.c:1967
 msgid "Logging"
 msgstr "ログの記録"
 
-#: ../finch/gntrequest.c:530
+#: ../finch/gntrequest.c:532
 msgid "Not implemented yet."
 msgstr "まだ実装していません"
 
-#: ../finch/gntrequest.c:595 ../pidgin/gtkrequest.c:1529
-#: ../pidgin/gtkrequest.c:1575
+#: ../finch/gntrequest.c:597 ../pidgin/gtkrequest.c:1530
+#: ../pidgin/gtkrequest.c:1576
 msgid "Save File..."
 msgstr "ファイルの保存..."
 
-#: ../finch/gntrequest.c:595 ../pidgin/gtkrequest.c:1530
-#: ../pidgin/gtkrequest.c:1576
+#: ../finch/gntrequest.c:597 ../pidgin/gtkrequest.c:1531
+#: ../pidgin/gtkrequest.c:1577
 msgid "Open File..."
 msgstr "ファイルを開く..."
 
@@ -1237,38 +1319,39 @@
 msgstr "種類"
 
 #: ../finch/gntstatus.c:177 ../finch/gntstatus.c:554 ../finch/gntstatus.c:566
-#: ../libpurple/protocols/bonjour/bonjour.c:258
-#: ../libpurple/protocols/bonjour/bonjour.c:265
-#: ../libpurple/protocols/bonjour/bonjour.c:328
+#: ../libpurple/protocols/bonjour/bonjour.c:247
+#: ../libpurple/protocols/bonjour/bonjour.c:254
+#: ../libpurple/protocols/bonjour/bonjour.c:320
 #: ../libpurple/protocols/gg/gg.c:1072 ../libpurple/protocols/gg/gg.c:1576
 #: ../libpurple/protocols/gg/gg.c:1594 ../libpurple/protocols/gg/gg.c:1604
 #: ../libpurple/protocols/gg/gg.c:1610 ../libpurple/protocols/gg/gg.c:1619
 #: ../libpurple/protocols/gg/gg.c:1624 ../libpurple/protocols/irc/irc.c:234
-#: ../libpurple/protocols/jabber/jabber.c:1233
-#: ../libpurple/protocols/jabber/jabber.c:1243
-#: ../libpurple/protocols/jabber/jabber.c:1253
-#: ../libpurple/protocols/jabber/jabber.c:1263
-#: ../libpurple/protocols/jabber/jabber.c:1273
-#: ../libpurple/protocols/jabber/jabber.c:1285
+#: ../libpurple/protocols/jabber/jabber.c:1252
+#: ../libpurple/protocols/jabber/jabber.c:1262
+#: ../libpurple/protocols/jabber/jabber.c:1272
+#: ../libpurple/protocols/jabber/jabber.c:1282
+#: ../libpurple/protocols/jabber/jabber.c:1292
+#: ../libpurple/protocols/jabber/jabber.c:1304
 #: ../libpurple/protocols/novell/novell.c:2838
 #: ../libpurple/protocols/novell/novell.c:2941
 #: ../libpurple/protocols/novell/novell.c:2947
 #: ../libpurple/protocols/novell/novell.c:2953
-#: ../libpurple/protocols/oscar/oscar.c:5463
-#: ../libpurple/protocols/oscar/oscar.c:5681
-#: ../libpurple/protocols/oscar/oscar.c:5695
-#: ../libpurple/protocols/oscar/oscar.c:5711
-#: ../libpurple/protocols/oscar/oscar.c:5718
-#: ../libpurple/protocols/oscar/oscar.c:5725
+#: ../libpurple/protocols/oscar/oscar.c:5531
+#: ../libpurple/protocols/oscar/oscar.c:5749
+#: ../libpurple/protocols/oscar/oscar.c:5763
+#: ../libpurple/protocols/oscar/oscar.c:5779
+#: ../libpurple/protocols/oscar/oscar.c:5786
+#: ../libpurple/protocols/oscar/oscar.c:5793
 #: ../libpurple/protocols/sametime/sametime.c:3286
 #: ../libpurple/protocols/sametime/sametime.c:3292
 #: ../libpurple/protocols/sametime/sametime.c:3298
 #: ../libpurple/protocols/sametime/sametime.c:3377
 #: ../libpurple/protocols/silc/buddy.c:1551
+#: ../libpurple/protocols/silc10/buddy.c:1551
 #: ../libpurple/protocols/simple/simple.c:246
-#: ../libpurple/protocols/yahoo/yahoo.c:3481
-#: ../libpurple/protocols/yahoo/yahoo.c:3487
-#: ../libpurple/protocols/zephyr/zephyr.c:2336
+#: ../libpurple/protocols/yahoo/yahoo.c:3494
+#: ../libpurple/protocols/yahoo/yahoo.c:3500
+#: ../libpurple/protocols/zephyr/zephyr.c:2337
 #: ../pidgin/gtksavedstatuses.c:490 ../pidgin/gtksavedstatuses.c:954
 msgid "Message"
 msgstr "メッセージ"
@@ -1339,64 +1422,64 @@
 "Gnt クリップボードの内容が変更されたら、その内容がXで利用可能になります (可"
 "能であれば)。"
 
-#: ../finch/plugins/gntgf.c:223
+#: ../finch/plugins/gntgf.c:231
 #, c-format
 msgid "%s just signed on"
 msgstr "%s さんがサイン・インしました"
 
-#: ../finch/plugins/gntgf.c:230
+#: ../finch/plugins/gntgf.c:238
 #, c-format
 msgid "%s just signed off"
 msgstr "%s さんがサイン・アウトしました"
 
-#: ../finch/plugins/gntgf.c:238
+#: ../finch/plugins/gntgf.c:246
 #, c-format
 msgid "%s sent you a message"
 msgstr "%s さんがメッセージを送信してきました"
 
-#: ../finch/plugins/gntgf.c:257
+#: ../finch/plugins/gntgf.c:265
 #, c-format
 msgid "%s said your nick in %s"
 msgstr "%s さんがあだ名を呼びました (%s)"
 
-#: ../finch/plugins/gntgf.c:259
+#: ../finch/plugins/gntgf.c:267
 #, c-format
 msgid "%s sent a message in %s"
 msgstr "%s さんがあなたにメッセージを送信しました (%s)"
 
-#: ../finch/plugins/gntgf.c:297
+#: ../finch/plugins/gntgf.c:305
 msgid "Buddy signs on/off"
 msgstr "仲間がサイン・イン/アウトした時"
 
-#: ../finch/plugins/gntgf.c:298
+#: ../finch/plugins/gntgf.c:306
 msgid "You receive an IM"
 msgstr "IM を受け取る時"
 
-#: ../finch/plugins/gntgf.c:299
+#: ../finch/plugins/gntgf.c:307
 msgid "Someone speaks in a chat"
 msgstr "チャットで誰かがあなたを呼んだ時"
 
-#: ../finch/plugins/gntgf.c:300
+#: ../finch/plugins/gntgf.c:308
 msgid "Someone says your name in a chat"
 msgstr "チャットで誰かがあなたの名前を入力した時"
 
-#: ../finch/plugins/gntgf.c:328
+#: ../finch/plugins/gntgf.c:336
 msgid "Notify with a toaster when"
 msgstr "Notify with a toaster when"
 
-#: ../finch/plugins/gntgf.c:343
+#: ../finch/plugins/gntgf.c:351
 msgid "Beep too!"
 msgstr "Beep too!"
 
-#: ../finch/plugins/gntgf.c:349
+#: ../finch/plugins/gntgf.c:357
 msgid "Set URGENT for the terminal window."
 msgstr "端末のウィンドウ属性が URGENT になった時"
 
-#: ../finch/plugins/gntgf.c:369
+#: ../finch/plugins/gntgf.c:377
 msgid "GntGf"
 msgstr "GntGf"
 
-#: ../finch/plugins/gntgf.c:371 ../finch/plugins/gntgf.c:372
+#: ../finch/plugins/gntgf.c:379 ../finch/plugins/gntgf.c:380
 msgid "Toaster plugin"
 msgstr "\"トースター\" プラグイン"
 
@@ -1478,8 +1561,13 @@
 msgid "Missing protocol plugin for %s"
 msgstr "プロトコル %s のプラグインがありません"
 
+#: ../libpurple/account.c:1012 ../libpurple/connection.c:107
+#: ../pidgin/gtkblist.c:4001
+msgid "Connection Error"
+msgstr "接続エラー"
+
 #: ../libpurple/account.c:1170 ../libpurple/protocols/gg/gg.c:702
-#: ../libpurple/protocols/jabber/jabber.c:1323
+#: ../libpurple/protocols/jabber/jabber.c:1342
 msgid "New passwords do not match."
 msgstr "新しいパスワードが一致しません。"
 
@@ -1519,8 +1607,8 @@
 
 #: ../libpurple/account.c:1744 ../libpurple/protocols/gg/gg.c:1012
 #: ../libpurple/protocols/jabber/buddy.c:638
-#: ../libpurple/protocols/jabber/buddy.c:1399
-#: ../libpurple/protocols/jabber/buddy.c:1416
+#: ../libpurple/protocols/jabber/buddy.c:1424
+#: ../libpurple/protocols/jabber/buddy.c:1441
 #: ../libpurple/protocols/novell/novell.c:2831
 #: ../libpurple/protocols/qq/qq.c:230 ../pidgin/gtkft.c:159
 msgid "Unknown"
@@ -1528,7 +1616,7 @@
 
 #: ../libpurple/blist.c:523 ../libpurple/blist.c:1291
 #: ../libpurple/blist.c:1520 ../libpurple/protocols/jabber/roster.c:68
-#: ../pidgin/gtkblist.c:5201 ../pidgin/plugins/gevolution/gevolution.c:97
+#: ../pidgin/gtkblist.c:5293 ../pidgin/plugins/gevolution/gevolution.c:96
 #: ../pidgin/plugins/gevolution/gevo-util.c:64
 msgid "Buddies"
 msgstr "仲間"
@@ -1552,9 +1640,9 @@
 msgstr "+++ %s さんがサイン・アウトしました"
 
 #: ../libpurple/connection.c:440 ../libpurple/plugin.c:282
-#: ../libpurple/protocols/jabber/buddy.c:1687
+#: ../libpurple/protocols/jabber/buddy.c:1712
 #: ../libpurple/protocols/msn/servconn.c:139
-#: ../libpurple/protocols/msn/session.c:321
+#: ../libpurple/protocols/msn/session.c:322
 msgid "Unknown error"
 msgstr "原因不明のエラー"
 
@@ -1571,44 +1659,45 @@
 msgid "The message is too large."
 msgstr "メッセージが長すぎます"
 
-#: ../libpurple/conversation.c:178
+#: ../libpurple/conversation.c:178 ../libpurple/protocols/bonjour/jabber.c:283
+#: ../libpurple/protocols/bonjour/jabber.c:325
 msgid "Unable to send message."
 msgstr "メッセージを送信できません"
 
-#: ../libpurple/conversation.c:1160
+#: ../libpurple/conversation.c:1164
 msgid "Send Message"
 msgstr "メッセージの送信"
 
-#: ../libpurple/conversation.c:1163
+#: ../libpurple/conversation.c:1167
 msgid "_Send Message"
 msgstr "メッセージの送信(_S)"
 
-#: ../libpurple/conversation.c:1566
+#: ../libpurple/conversation.c:1572
 #, c-format
 msgid "%s entered the room."
 msgstr "%s さんがチャットルームに入りました"
 
-#: ../libpurple/conversation.c:1569
+#: ../libpurple/conversation.c:1575
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>] さんがチャットルームに入りました"
 
-#: ../libpurple/conversation.c:1674
+#: ../libpurple/conversation.c:1682
 #, c-format
 msgid "You are now known as %s"
 msgstr "あなたは %s と認識されました"
 
-#: ../libpurple/conversation.c:1694
+#: ../libpurple/conversation.c:1702
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s さんは %s と認識されました"
 
-#: ../libpurple/conversation.c:1767
+#: ../libpurple/conversation.c:1775
 #, c-format
 msgid "%s left the room."
 msgstr "%s さんがチャットルームから退室しました"
 
-#: ../libpurple/conversation.c:1770
+#: ../libpurple/conversation.c:1778
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s さんがチャットルーム (%s) から退室しました"
@@ -1681,7 +1770,7 @@
 msgid "Unknown reason"
 msgstr "原因は不明です"
 
-#: ../libpurple/ft.c:204 ../libpurple/protocols/msn/msn.c:420
+#: ../libpurple/ft.c:204
 #, c-format
 msgid ""
 "Error reading %s: \n"
@@ -1780,31 +1869,31 @@
 msgid "File transfer complete"
 msgstr "ファイルの転送が完了しました"
 
-#: ../libpurple/ft.c:1090
+#: ../libpurple/ft.c:1091
 #, c-format
 msgid "You canceled the transfer of %s"
 msgstr "%s の転送をキャンセルしました"
 
-#: ../libpurple/ft.c:1095
+#: ../libpurple/ft.c:1096
 msgid "File transfer cancelled"
 msgstr "ファイルの転送がキャンセルされました"
 
-#: ../libpurple/ft.c:1153
+#: ../libpurple/ft.c:1154
 #, c-format
 msgid "%s canceled the transfer of %s"
 msgstr "%s さんは %s の転送をキャンセルしました"
 
-#: ../libpurple/ft.c:1158
+#: ../libpurple/ft.c:1159
 #, c-format
 msgid "%s canceled the file transfer"
 msgstr "%s さんはファイルの転送をキャンセルしました"
 
-#: ../libpurple/ft.c:1215
+#: ../libpurple/ft.c:1216
 #, c-format
 msgid "File transfer to %s failed."
 msgstr "%s へのファイルの転送が失敗しました。"
 
-#: ../libpurple/ft.c:1217
+#: ../libpurple/ft.c:1218
 #, c-format
 msgid "File transfer from %s failed."
 msgstr "%s からのファイルの転送が失敗しました。"
@@ -2126,13 +2215,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:1434
-#: ../libpurple/protocols/oscar/oscar.c:2225
-#: ../libpurple/protocols/oscar/oscar.c:2272
-#: ../libpurple/protocols/oscar/oscar.c:5795
-#: ../libpurple/protocols/oscar/oscar.c:5850
-#: ../libpurple/protocols/oscar/oscar.c:6076
-#: ../libpurple/protocols/oscar/oscar.c:6146 ../libpurple/request.h:1387
+#: ../libpurple/protocols/oscar/oscar.c:1458
+#: ../libpurple/protocols/oscar/oscar.c:2251
+#: ../libpurple/protocols/oscar/oscar.c:2298
+#: ../libpurple/protocols/oscar/oscar.c:5863
+#: ../libpurple/protocols/oscar/oscar.c:5918
+#: ../libpurple/protocols/oscar/oscar.c:6144
+#: ../libpurple/protocols/oscar/oscar.c:6214 ../libpurple/request.h:1387
 #: ../libpurple/request.h:1397
 msgid "_Cancel"
 msgstr "キャンセル(_C)"
@@ -2174,8 +2263,8 @@
 "自動受け入れによるファイルの転送が完了したらポップアップで知らせる\n"
 "(ファイルを送信した側と会話が無い場合にのみ)"
 
-#: ../libpurple/plugins/buddynote.c:46 ../libpurple/protocols/msn/msn.c:1600
-#: ../libpurple/protocols/msn/msn.c:1630
+#: ../libpurple/plugins/buddynote.c:46 ../libpurple/protocols/msn/msn.c:1629
+#: ../libpurple/protocols/msn/msn.c:1659
 msgid "Notes"
 msgstr "備考"
 
@@ -2183,7 +2272,7 @@
 msgid "Enter your notes below..."
 msgstr "書き置きするメモを入力して下さい..."
 
-#: ../libpurple/plugins/buddynote.c:62
+#: ../libpurple/plugins/buddynote.c:65
 msgid "Edit Notes..."
 msgstr "メモの編集..."
 
@@ -2195,18 +2284,18 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/buddynote.c:87
+#: ../libpurple/plugins/buddynote.c:90
 msgid "Buddy Notes"
 msgstr "仲間のメモ"
 
 #. *< name
 #. *< version
-#: ../libpurple/plugins/buddynote.c:89
+#: ../libpurple/plugins/buddynote.c:92
 msgid "Store notes on particular buddies."
 msgstr "特定の仲間に書き置きします"
 
 #. *< summary
-#: ../libpurple/plugins/buddynote.c:90
+#: ../libpurple/plugins/buddynote.c:93
 msgid "Adds the option to store notes for buddies on your buddy list."
 msgstr "仲間リストにいる仲間にメモを書き置きするための機能を追加します。"
 
@@ -2404,99 +2493,99 @@
 msgid "(UTC)"
 msgstr "(UTC)"
 
-#: ../libpurple/plugins/log_reader.c:1552
+#: ../libpurple/plugins/log_reader.c:1573
 msgid "User is offline."
 msgstr "ユーザはオフラインです"
 
-#: ../libpurple/plugins/log_reader.c:1558
+#: ../libpurple/plugins/log_reader.c:1579
 msgid "Auto-response sent:"
 msgstr "自動応答の送信:"
 
-#: ../libpurple/plugins/log_reader.c:1568
-#: ../libpurple/plugins/log_reader.c:1571
+#: ../libpurple/plugins/log_reader.c:1589
+#: ../libpurple/plugins/log_reader.c:1592
 #: ../libpurple/plugins/statenotify.c:80
 #, c-format
 msgid "%s has signed off."
 msgstr "%s さんがサイン・アウトしました。"
 
-#: ../libpurple/plugins/log_reader.c:1585
+#: ../libpurple/plugins/log_reader.c:1606
 msgid "One or more messages may have been undeliverable."
 msgstr "一つ以上のメッセージが配送不可能な状態になっています"
 
-#: ../libpurple/plugins/log_reader.c:1595
+#: ../libpurple/plugins/log_reader.c:1616
 msgid "You were disconnected from the server."
 msgstr "サーバが接続を切りました"
 
-#: ../libpurple/plugins/log_reader.c:1603
+#: ../libpurple/plugins/log_reader.c:1624
 msgid ""
 "You are currently disconnected. Messages will not be received unless you are "
 "logged in."
 msgstr ""
 "現在接続していません。ログインするまでメッセージを受け取ることはできません。"
 
-#: ../libpurple/plugins/log_reader.c:1618
+#: ../libpurple/plugins/log_reader.c:1639
 msgid "Message could not be sent because the maximum length was exceeded."
 msgstr "メッセージの最大サイズを超えたため送信できませんでした"
 
-#: ../libpurple/plugins/log_reader.c:1623
+#: ../libpurple/plugins/log_reader.c:1644
 msgid "Message could not be sent."
 msgstr "メッセージを送信することができませんでした"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:1976
-#: ../libpurple/plugins/log_reader.c:2085
+#: ../libpurple/plugins/log_reader.c:1989
+#: ../libpurple/plugins/log_reader.c:2098
 msgid "Adium"
 msgstr "Adium"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:1989
-#: ../libpurple/plugins/log_reader.c:2090
+#: ../libpurple/plugins/log_reader.c:2002
+#: ../libpurple/plugins/log_reader.c:2103
 msgid "Fire"
 msgstr "Fire"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2001
-#: ../libpurple/plugins/log_reader.c:2094
+#: ../libpurple/plugins/log_reader.c:2014
+#: ../libpurple/plugins/log_reader.c:2107
 msgid "Messenger Plus!"
 msgstr "メッセンジャー Plus!"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2014
-#: ../libpurple/plugins/log_reader.c:2099
+#: ../libpurple/plugins/log_reader.c:2027
+#: ../libpurple/plugins/log_reader.c:2112
 msgid "MSN Messenger"
 msgstr "MSN メッセンジャー"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2026
-#: ../libpurple/plugins/log_reader.c:2103
+#: ../libpurple/plugins/log_reader.c:2039
+#: ../libpurple/plugins/log_reader.c:2116
 msgid "Trillian"
 msgstr "Trillian"
 
 #. Add general preferences.
-#: ../libpurple/plugins/log_reader.c:2067
+#: ../libpurple/plugins/log_reader.c:2080
 msgid "General Log Reading Configuration"
 msgstr "全般"
 
-#: ../libpurple/plugins/log_reader.c:2071
+#: ../libpurple/plugins/log_reader.c:2084
 msgid "Fast size calculations"
 msgstr "サイズを高速に計算する"
 
-#: ../libpurple/plugins/log_reader.c:2075
+#: ../libpurple/plugins/log_reader.c:2088
 msgid "Use name heuristics"
 msgstr "名前形式のヒューリスティックを使う"
 
 #. Add Log Directory preferences.
-#: ../libpurple/plugins/log_reader.c:2081
+#: ../libpurple/plugins/log_reader.c:2094
 msgid "Log Directory"
 msgstr "ログを記録するフォルダ"
 
@@ -2506,19 +2595,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/log_reader.c:2132
+#: ../libpurple/plugins/log_reader.c:2145
 msgid "Log Reader"
 msgstr "ログ・リーダ"
 
 #. *< name
 #. *< version
 #. * summary
-#: ../libpurple/plugins/log_reader.c:2136
+#: ../libpurple/plugins/log_reader.c:2149
 msgid "Includes other IM clients' logs in the log viewer."
 msgstr "他の IM クライアントのログをログ・ビューアで表示します"
 
 #. * description
-#: ../libpurple/plugins/log_reader.c:2140
+#: ../libpurple/plugins/log_reader.c:2153
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
 "Currently, this includes Adium, MSN Messenger, and Trillian.\n"
@@ -2605,21 +2694,25 @@
 
 #: ../libpurple/plugins/offlinemsg.c:161
 #: ../libpurple/protocols/msn/dialog.c:133
-#: ../libpurple/protocols/msn/msn.c:530 ../libpurple/protocols/msn/msn.c:540
+#: ../libpurple/protocols/msn/msn.c:522 ../libpurple/protocols/msn/msn.c:532
 #: ../libpurple/protocols/novell/novell.c:1917
-#: ../libpurple/protocols/silc/buddy.c:314
-#: ../libpurple/protocols/silc/pk.c:119 ../libpurple/protocols/silc/wb.c:304
-#: ../pidgin/gtkrequest.c:267
+#: ../libpurple/protocols/silc/buddy.c:317
+#: ../libpurple/protocols/silc/pk.c:113 ../libpurple/protocols/silc/wb.c:304
+#: ../libpurple/protocols/silc10/buddy.c:314
+#: ../libpurple/protocols/silc10/pk.c:119
+#: ../libpurple/protocols/silc10/wb.c:304 ../pidgin/gtkrequest.c:267
 msgid "Yes"
 msgstr "はい"
 
 #: ../libpurple/plugins/offlinemsg.c:162
 #: ../libpurple/protocols/msn/dialog.c:134
-#: ../libpurple/protocols/msn/msn.c:530 ../libpurple/protocols/msn/msn.c:540
+#: ../libpurple/protocols/msn/msn.c:522 ../libpurple/protocols/msn/msn.c:532
 #: ../libpurple/protocols/novell/novell.c:1918
-#: ../libpurple/protocols/silc/buddy.c:315
-#: ../libpurple/protocols/silc/pk.c:120 ../libpurple/protocols/silc/wb.c:305
-#: ../pidgin/gtkrequest.c:268
+#: ../libpurple/protocols/silc/buddy.c:318
+#: ../libpurple/protocols/silc/pk.c:114 ../libpurple/protocols/silc/wb.c:305
+#: ../libpurple/protocols/silc10/buddy.c:315
+#: ../libpurple/protocols/silc10/pk.c:120
+#: ../libpurple/protocols/silc10/wb.c:305 ../pidgin/gtkrequest.c:268
 msgid "No"
 msgstr "いいえ"
 
@@ -2637,14 +2730,14 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/perl/perl.c:596
+#: ../libpurple/plugins/perl/perl.c:601
 msgid "Perl Plugin Loader"
 msgstr "Perl プラグイン・ローダ"
 
 #. *< name
 #. *< version
 #. *< summary
-#: ../libpurple/plugins/perl/perl.c:598 ../libpurple/plugins/perl/perl.c:599
+#: ../libpurple/plugins/perl/perl.c:603 ../libpurple/plugins/perl/perl.c:604
 msgid "Provides support for loading perl plugins."
 msgstr "Perl プラグインを読み込む機能を提供します"
 
@@ -2659,10 +2752,10 @@
 #: ../libpurple/plugins/psychic.c:22
 msgid ""
 "Causes conversation windows to appear as other users begin to message you.  "
-"This works for AIM, ICQ, Jabber, Sametime, and Yahoo!"
-msgstr ""
-"仲間が入力したメッセージを会話ウィンドウに直接表示します (AIM、ICQ、Jabber、"
-"Sametime、Yahoo!で動作します)。"
+"This works for AIM, ICQ, XMPP, Sametime, and Yahoo!"
+msgstr ""
+"他の仲間がメッセージ入力し始めたら会話ウィンドウを表示します (AIM、ICQ、"
+"XMPP、Sametime、Yahoo!で動作します)。"
 
 #: ../libpurple/plugins/psychic.c:72
 msgid "You feel a disturbance in the force..."
@@ -2745,7 +2838,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:263
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:275
 msgid "GNUTLS"
 msgstr "GNUTLS"
 
@@ -2753,8 +2846,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:266
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:268
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:278
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:280
 msgid "Provides SSL support through GNUTLS."
 msgstr "GNUTLS を介した SSL 機能を提供します"
 
@@ -2764,7 +2857,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ssl/ssl-nss.c:415
+#: ../libpurple/plugins/ssl/ssl-nss.c:423
 msgid "NSS"
 msgstr "NSS"
 
@@ -2772,8 +2865,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ssl/ssl-nss.c:418
-#: ../libpurple/plugins/ssl/ssl-nss.c:420
+#: ../libpurple/plugins/ssl/ssl-nss.c:426
+#: ../libpurple/plugins/ssl/ssl-nss.c:428
 msgid "Provides SSL support through Mozilla NSS."
 msgstr "Mozilla が提供する NSS を介して SSL 機能を提供します"
 
@@ -2849,7 +2942,7 @@
 msgid "Provides support for loading Tcl plugins"
 msgstr "Tcl プラグインを読み込む機能を提供します"
 
-#: ../libpurple/plugins/tcl/tcl.c:495
+#: ../libpurple/plugins/tcl/tcl.c:507
 msgid ""
 "Unable to detect ActiveTCL installation. If you wish to use TCL plugins, "
 "install ActiveTCL from http://www.activestate.com\n"
@@ -2859,11 +2952,11 @@
 "い。\n"
 
 #. Send a message about the connection error
-#: ../libpurple/protocols/bonjour/bonjour.c:113
+#: ../libpurple/protocols/bonjour/bonjour.c:112
 msgid "Unable to listen for incoming IM connections\n"
 msgstr "受信した IM 接続を確立できませんでした\n"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:148
+#: ../libpurple/protocols/bonjour/bonjour.c:137
 msgid ""
 "Unable to establish connection with the local mDNS server.  Is it running?"
 msgstr ""
@@ -2873,18 +2966,19 @@
 #. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
 #. Away stuff
-#: ../libpurple/protocols/bonjour/bonjour.c:302
-#: ../libpurple/protocols/gg/gg.c:1009 ../libpurple/protocols/irc/irc.c:516
-#: ../libpurple/protocols/irc/msgs.c:301
-#: ../libpurple/protocols/jabber/buddy.c:1409
+#: ../libpurple/protocols/bonjour/bonjour.c:294
+#: ../libpurple/protocols/gg/gg.c:1009 ../libpurple/protocols/irc/irc.c:530
+#: ../libpurple/protocols/irc/msgs.c:310
+#: ../libpurple/protocols/jabber/buddy.c:1434
 #: ../libpurple/protocols/novell/novell.c:2819
-#: ../libpurple/protocols/oscar/oscar.c:714
-#: ../libpurple/protocols/oscar/oscar.c:4490
-#: ../libpurple/protocols/oscar/oscar.c:5541
+#: ../libpurple/protocols/oscar/oscar.c:733
+#: ../libpurple/protocols/oscar/oscar.c:4544
+#: ../libpurple/protocols/oscar/oscar.c:5609
 #: ../libpurple/protocols/qq/qq.c:180 ../libpurple/protocols/silc/buddy.c:1476
-#: ../libpurple/protocols/yahoo/yahoo.c:3384
-#: ../libpurple/protocols/yahoo/yahoo.c:3457 ../libpurple/status.c:158
-#: ../pidgin/gtkdocklet.c:459 ../pidgin/gtkprefs.c:1823
+#: ../libpurple/protocols/silc10/buddy.c:1476
+#: ../libpurple/protocols/yahoo/yahoo.c:3397
+#: ../libpurple/protocols/yahoo/yahoo.c:3470 ../libpurple/status.c:157
+#: ../pidgin/gtkdocklet.c:442 ../pidgin/gtkprefs.c:1862
 #: ../pidgin/gtkstatusbox.c:1052
 msgid "Away"
 msgstr "離席中"
@@ -2904,81 +2998,86 @@
 msgid "Bonjour Protocol Plugin"
 msgstr "Bonjour プロトコルのプラグイン"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:463
 #: ../libpurple/protocols/bonjour/bonjour.c:470
-#: ../libpurple/protocols/bonjour/bonjour.c:528
+#: ../libpurple/protocols/bonjour/bonjour.c:477
+#: ../libpurple/protocols/bonjour/bonjour.c:535
 msgid "Purple Person"
 msgstr "Purple な人物"
 
 #. Creating the user splits
-#: ../libpurple/protocols/bonjour/bonjour.c:567
-#: ../libpurple/protocols/silc/silc.c:926
+#: ../libpurple/protocols/bonjour/bonjour.c:583
+#: ../libpurple/protocols/silc/silc.c:1007
+#: ../libpurple/protocols/silc10/silc.c:918
 msgid "Hostname"
 msgstr "ホスト名"
 
 #. Creating the options for the protocol
-#: ../libpurple/protocols/bonjour/bonjour.c:571
+#: ../libpurple/protocols/bonjour/bonjour.c:587
 #: ../libpurple/protocols/gg/gg.c:627
-#: ../libpurple/protocols/jabber/jabber.c:820
+#: ../libpurple/protocols/jabber/jabber.c:828
 msgid "First name"
 msgstr "名"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:574
+#: ../libpurple/protocols/bonjour/bonjour.c:590
 #: ../libpurple/protocols/gg/gg.c:622
-#: ../libpurple/protocols/jabber/jabber.c:825
+#: ../libpurple/protocols/jabber/jabber.c:833
 msgid "Last name"
 msgstr "姓"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:577
+#: ../libpurple/protocols/bonjour/bonjour.c:593
 #: ../libpurple/protocols/gg/gg.c:472
-#: ../libpurple/protocols/jabber/jabber.c:810
-#: ../libpurple/protocols/silc/silc.c:689
-#: ../libpurple/protocols/silc/silc.c:930
+#: ../libpurple/protocols/jabber/jabber.c:818
+#: ../libpurple/protocols/silc/silc.c:770
+#: ../libpurple/protocols/silc/silc.c:1011
+#: ../libpurple/protocols/silc10/silc.c:681
+#: ../libpurple/protocols/silc10/silc.c:922
 msgid "E-mail"
 msgstr "E-メール:"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:580
+#: ../libpurple/protocols/bonjour/bonjour.c:596
 msgid "AIM Account"
 msgstr "AIM のアカウント"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:583
-msgid "Jabber Account"
-msgstr "Jabber のアカウント"
-
-#: ../libpurple/protocols/bonjour/bonjour.h:35
+#: ../libpurple/protocols/bonjour/bonjour.c:599
+msgid "XMPP Account"
+msgstr "XMPP のアカウント"
+
+#: ../libpurple/protocols/bonjour/bonjour.h:33
 msgid "Bonjour"
 msgstr "Bonjour"
 
-#: ../libpurple/protocols/bonjour/jabber.c:374
+#: ../libpurple/protocols/bonjour/jabber.c:394
 #, c-format
 msgid "%s has closed the conversation."
 msgstr "%s さんが会話ウインドウを閉じました"
 
-#: ../libpurple/protocols/bonjour/jabber.c:461
+#: ../libpurple/protocols/bonjour/jabber.c:440
+#: ../libpurple/protocols/bonjour/jabber.c:653
+#: ../libpurple/protocols/bonjour/jabber.c:678
+msgid "Unable to send the message, the conversation couldn't be started."
+msgstr "メッセージを送信できません (会話を開始できませんでした)"
+
+#: ../libpurple/protocols/bonjour/jabber.c:574
 msgid "Cannot open socket"
 msgstr "ソケットを開けません"
 
-#: ../libpurple/protocols/bonjour/jabber.c:469
+#: ../libpurple/protocols/bonjour/jabber.c:582
 msgid "Error setting socket options"
 msgstr "ソケットにオプションをセットできません"
 
-#: ../libpurple/protocols/bonjour/jabber.c:493
+#: ../libpurple/protocols/bonjour/jabber.c:606
 msgid "Could not bind socket to port"
 msgstr "ポートにソケットを割り当てられませんでした"
 
-#: ../libpurple/protocols/bonjour/jabber.c:501
+#: ../libpurple/protocols/bonjour/jabber.c:614
 msgid "Could not listen on socket"
 msgstr "ソケットを監視できませんでした"
 
-#: ../libpurple/protocols/bonjour/jabber.c:599
-msgid "Unable to send the message, the conversation couldn't be started."
-msgstr "メッセージを送信できません (会話を開始できませんでした)"
-
-#: ../libpurple/protocols/gg/gg.c:76 ../libpurple/proxy.c:1800
+#: ../libpurple/protocols/gg/gg.c:76 ../libpurple/proxy.c:1812
 msgid "Invalid proxy settings"
 msgstr "不正なプロキシ設定"
 
-#: ../libpurple/protocols/gg/gg.c:77 ../libpurple/proxy.c:1800
+#: ../libpurple/protocols/gg/gg.c:77 ../libpurple/proxy.c:1812
 msgid ""
 "Either the host name or port number specified for your given proxy type is "
 "invalid."
@@ -3047,8 +3146,8 @@
 msgstr "登録が完了しました!"
 
 #: ../libpurple/protocols/gg/gg.c:477 ../libpurple/protocols/gg/gg.c:770
-#: ../libpurple/protocols/jabber/jabber.c:799
-#: ../libpurple/protocols/jabber/jabber.c:1358
+#: ../libpurple/protocols/jabber/jabber.c:807
+#: ../libpurple/protocols/jabber/jabber.c:1377
 msgid "Password"
 msgstr "パスワード"
 
@@ -3074,9 +3173,9 @@
 
 #: ../libpurple/protocols/gg/gg.c:637 ../libpurple/protocols/gg/gg.c:1049
 #: ../libpurple/protocols/gg/gg.c:1123
-#: ../libpurple/protocols/jabber/jabber.c:835
-#: ../libpurple/protocols/oscar/oscar.c:3770
-#: ../libpurple/protocols/oscar/oscar.c:3783
+#: ../libpurple/protocols/jabber/jabber.c:843
+#: ../libpurple/protocols/oscar/oscar.c:3802
+#: ../libpurple/protocols/oscar/oscar.c:3815
 #: ../libpurple/protocols/qq/buddy_info.c:49
 msgid "City"
 msgstr "町"
@@ -3085,8 +3184,8 @@
 msgid "Year of birth"
 msgstr "誕生年"
 
-#: ../libpurple/protocols/gg/gg.c:645 ../libpurple/protocols/msn/msn.c:1529
-#: ../libpurple/protocols/oscar/oscar.c:3713
+#: ../libpurple/protocols/gg/gg.c:645 ../libpurple/protocols/msn/msn.c:1558
+#: ../libpurple/protocols/oscar/oscar.c:3745
 #: ../libpurple/protocols/qq/buddy_info.c:46
 #: ../libpurple/protocols/qq/qq.c:224 ../libpurple/protocols/qq/qq.c:227
 #: ../libpurple/protocols/qq/qq.c:230 ../libpurple/protocols/qq/qq.c:234
@@ -3099,14 +3198,14 @@
 msgstr "男/女"
 
 #: ../libpurple/protocols/gg/gg.c:647
-#: ../libpurple/protocols/oscar/oscar.c:3713
+#: ../libpurple/protocols/oscar/oscar.c:3745
 #: ../libpurple/protocols/qq/buddy_info.c:83
 #: ../libpurple/protocols/qq/qq.c:224
 msgid "Male"
 msgstr "男性"
 
 #: ../libpurple/protocols/gg/gg.c:648
-#: ../libpurple/protocols/oscar/oscar.c:3713
+#: ../libpurple/protocols/oscar/oscar.c:3745
 #: ../libpurple/protocols/qq/buddy_info.c:84
 #: ../libpurple/protocols/qq/qq.c:227
 msgid "Female"
@@ -3166,38 +3265,39 @@
 msgstr "チャットの追加..."
 
 #: ../libpurple/protocols/gg/gg.c:1003
-#: ../libpurple/protocols/jabber/buddy.c:1403
+#: ../libpurple/protocols/jabber/buddy.c:1428
 #: ../libpurple/protocols/novell/novell.c:2828
-#: ../libpurple/protocols/oscar/oscar.c:809
-#: ../libpurple/protocols/oscar/oscar.c:5513
+#: ../libpurple/protocols/oscar/oscar.c:828
+#: ../libpurple/protocols/oscar/oscar.c:5581
 #: ../libpurple/protocols/qq/qq.c:170 ../libpurple/protocols/qq/qq.c:177
-#: ../libpurple/protocols/yahoo/yahoo.c:2904 ../libpurple/status.c:154
-#: ../pidgin/gtkblist.c:3034 ../pidgin/gtkblist.c:3358
-#: ../pidgin/gtkdocklet.c:467 ../pidgin/gtkstatusbox.c:1054
+#: ../libpurple/protocols/yahoo/yahoo.c:2917 ../libpurple/status.c:153
+#: ../pidgin/gtkblist.c:3079 ../pidgin/gtkblist.c:3407
+#: ../pidgin/gtkdocklet.c:450 ../pidgin/gtkstatusbox.c:1054
 msgid "Offline"
 msgstr "オフライン"
 
 #: ../libpurple/protocols/gg/gg.c:1006
-#: ../libpurple/protocols/jabber/buddy.c:1405
+#: ../libpurple/protocols/jabber/buddy.c:1430
 #: ../libpurple/protocols/msn/state.c:29 ../libpurple/protocols/msn/state.c:30
 #: ../libpurple/protocols/msn/state.c:37 ../libpurple/protocols/msn/state.c:38
 #: ../libpurple/protocols/novell/novell.c:2816
-#: ../libpurple/protocols/yahoo/yahoo.c:2906 ../libpurple/status.c:155
-#: ../pidgin/gtkdocklet.c:455 ../pidgin/gtkstatusbox.c:1051
+#: ../libpurple/protocols/yahoo/yahoo.c:2919 ../libpurple/status.c:154
+#: ../pidgin/gtkdocklet.c:438 ../pidgin/gtkstatusbox.c:1051
 msgid "Available"
 msgstr "在席しています"
 
 #: ../libpurple/protocols/gg/gg.c:1038 ../libpurple/protocols/gg/gg.c:1114
-#: ../libpurple/protocols/oscar/oscar.c:2649
-#: ../libpurple/protocols/oscar/oscar.c:3680
+#: ../libpurple/protocols/oscar/oscar.c:2675
+#: ../libpurple/protocols/oscar/oscar.c:3712
 msgid "UIN"
 msgstr "UIN"
 
 #: ../libpurple/protocols/gg/gg.c:1041 ../libpurple/protocols/gg/gg.c:1117
-#: ../libpurple/protocols/jabber/buddy.c:1560
-#: ../libpurple/protocols/jabber/buddy.c:1736
-#: ../libpurple/protocols/oscar/oscar.c:3691
-#: ../libpurple/protocols/silc/ops.c:1024
+#: ../libpurple/protocols/jabber/buddy.c:1585
+#: ../libpurple/protocols/jabber/buddy.c:1761
+#: ../libpurple/protocols/oscar/oscar.c:3723
+#: ../libpurple/protocols/silc/ops.c:990
+#: ../libpurple/protocols/silc10/ops.c:1024
 msgid "First Name"
 msgstr "名"
 
@@ -3206,7 +3306,7 @@
 msgstr "誕生年"
 
 #: ../libpurple/protocols/gg/gg.c:1108 ../libpurple/protocols/gg/gg.c:1177
-#: ../libpurple/protocols/oscar/oscar.c:3892
+#: ../libpurple/protocols/oscar/oscar.c:3924
 msgid "Unable to display the search results."
 msgstr "検索結果を表示できません"
 
@@ -3250,7 +3350,7 @@
 msgid "Connection failed."
 msgstr "接続に失敗しました"
 
-#: ../libpurple/protocols/gg/gg.c:1618 ../libpurple/protocols/msn/msn.c:539
+#: ../libpurple/protocols/gg/gg.c:1618 ../libpurple/protocols/msn/msn.c:531
 msgid "Blocked"
 msgstr "拒否しているか"
 
@@ -3335,21 +3435,24 @@
 msgstr "Gadu-Gadu ユーザ"
 
 #: ../libpurple/protocols/irc/cmds.c:43
-#: ../libpurple/protocols/silc/silc.c:1577
+#: ../libpurple/protocols/silc/silc.c:1637
+#: ../libpurple/protocols/silc10/silc.c:1566
 #, c-format
 msgid "Unknown command: %s"
 msgstr "不明なコマンド: %s"
 
 #: ../libpurple/protocols/irc/cmds.c:503
-#: ../libpurple/protocols/jabber/chat.c:593
-#: ../libpurple/protocols/silc/silc.c:1285
+#: ../libpurple/protocols/jabber/chat.c:591
+#: ../libpurple/protocols/silc/silc.c:1345
+#: ../libpurple/protocols/silc10/silc.c:1274
 #, c-format
 msgid "current topic is: %s"
 msgstr "現在のトピック: %s"
 
 #: ../libpurple/protocols/irc/cmds.c:507
-#: ../libpurple/protocols/jabber/chat.c:597
-#: ../libpurple/protocols/silc/silc.c:1289
+#: ../libpurple/protocols/jabber/chat.c:595
+#: ../libpurple/protocols/silc/silc.c:1349
+#: ../libpurple/protocols/silc10/silc.c:1278
 msgid "No topic is set"
 msgstr "トピックが設定されていません"
 
@@ -3384,7 +3487,7 @@
 msgstr "%s の MOTD"
 
 #: ../libpurple/protocols/irc/irc.c:127 ../libpurple/protocols/irc/irc.c:165
-#: ../libpurple/protocols/irc/irc.c:600 ../libpurple/protocols/irc/irc.c:625
+#: ../libpurple/protocols/irc/irc.c:614 ../libpurple/protocols/irc/irc.c:639
 msgid "Server has disconnected"
 msgstr "サーバが接続を切りました"
 
@@ -3393,11 +3496,12 @@
 msgstr "MOTD の表示"
 
 #: ../libpurple/protocols/irc/irc.c:261 ../libpurple/protocols/silc/chat.c:33
+#: ../libpurple/protocols/silc10/chat.c:33
 msgid "_Channel:"
 msgstr "チャンネル(_C):"
 
 #: ../libpurple/protocols/irc/irc.c:267
-#: ../libpurple/protocols/jabber/chat.c:59
+#: ../libpurple/protocols/jabber/chat.c:59 ../pidgin/gtkaccount.c:523
 msgid "_Password:"
 msgstr "パスワード(_P):"
 
@@ -3407,60 +3511,62 @@
 
 #. connect to the server
 #: ../libpurple/protocols/irc/irc.c:319
-#: ../libpurple/protocols/jabber/jabber.c:1038
-#: ../libpurple/protocols/msn/session.c:344
+#: ../libpurple/protocols/jabber/jabber.c:1048
+#: ../libpurple/protocols/msn/session.c:345
 #: ../libpurple/protocols/novell/novell.c:2182
-#: ../libpurple/protocols/oscar/oscar.c:1269
+#: ../libpurple/protocols/oscar/oscar.c:1288
 #: ../libpurple/protocols/qq/qq.c:136
 #: ../libpurple/protocols/sametime/sametime.c:3723
-#: ../libpurple/protocols/simple/simple.c:1673
-#: ../libpurple/protocols/yahoo/yahoo.c:2749
-#: ../libpurple/protocols/zephyr/zephyr.c:1620 ../pidgin/gtkstatusbox.c:659
+#: ../libpurple/protocols/simple/simple.c:1671
+#: ../libpurple/protocols/yahoo/yahoo.c:2762
+#: ../libpurple/protocols/zephyr/zephyr.c:1621 ../pidgin/gtkstatusbox.c:659
 msgid "Connecting"
 msgstr "接続中です"
 
 #: ../libpurple/protocols/irc/irc.c:327
-#: ../libpurple/protocols/jabber/jabber.c:595
-#: ../libpurple/protocols/jabber/jabber.c:942
+#: ../libpurple/protocols/jabber/jabber.c:603
+#: ../libpurple/protocols/jabber/jabber.c:950
 msgid "SSL support unavailable"
 msgstr "SSL サポートは無効です"
 
 #: ../libpurple/protocols/irc/irc.c:338
 #: ../libpurple/protocols/simple/simple.c:464
-#: ../libpurple/protocols/simple/simple.c:1588
+#: ../libpurple/protocols/simple/simple.c:1586
 msgid "Couldn't create socket"
 msgstr "ソケットを生成できませんでした"
 
-#: ../libpurple/protocols/irc/irc.c:402
-#: ../libpurple/protocols/jabber/jabber.c:466
-#: ../libpurple/protocols/oscar/oscar.c:1265
+#: ../libpurple/protocols/irc/irc.c:416
+#: ../libpurple/protocols/oscar/oscar.c:1284
 msgid "Couldn't connect to host"
 msgstr "ホストへ接続できませんでした"
 
-#: ../libpurple/protocols/irc/irc.c:424
-#: ../libpurple/protocols/jabber/jabber.c:495
+#: ../libpurple/protocols/irc/irc.c:438
+#: ../libpurple/protocols/jabber/jabber.c:499
 msgid "Connection Failed"
 msgstr "接続に失敗しました"
 
-#: ../libpurple/protocols/irc/irc.c:427
-#: ../libpurple/protocols/jabber/jabber.c:498
+#: ../libpurple/protocols/irc/irc.c:441
+#: ../libpurple/protocols/jabber/jabber.c:502
 msgid "SSL Handshake Failed"
 msgstr "SSL のハンドシェイクに失敗しました"
 
-#: ../libpurple/protocols/irc/irc.c:597 ../libpurple/protocols/irc/irc.c:622
+#: ../libpurple/protocols/irc/irc.c:611 ../libpurple/protocols/irc/irc.c:636
 msgid "Read error"
 msgstr "読み込みエラーです"
 
-#: ../libpurple/protocols/irc/irc.c:761
-#: ../libpurple/protocols/silc/chat.c:1426
+#: ../libpurple/protocols/irc/irc.c:775
+#: ../libpurple/protocols/silc/chat.c:1412
+#: ../libpurple/protocols/silc10/chat.c:1426
 #: ../libpurple/protocols/yahoo/yahoochat.c:1438
 msgid "Users"
 msgstr "ユーザ数"
 
-#: ../libpurple/protocols/irc/irc.c:764
+#: ../libpurple/protocols/irc/irc.c:778
 #: ../libpurple/protocols/sametime/sametime.c:3374
-#: ../libpurple/protocols/silc/chat.c:1429
-#: ../libpurple/protocols/silc/ops.c:1382
+#: ../libpurple/protocols/silc/chat.c:1415
+#: ../libpurple/protocols/silc/ops.c:1389
+#: ../libpurple/protocols/silc10/chat.c:1429
+#: ../libpurple/protocols/silc10/ops.c:1382
 #: ../libpurple/protocols/yahoo/yahoochat.c:1447
 msgid "Topic"
 msgstr "トピック"
@@ -3473,56 +3579,65 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../libpurple/protocols/irc/irc.c:901
+#: ../libpurple/protocols/irc/irc.c:915
 msgid "IRC Protocol Plugin"
 msgstr "IRC プロトコル・プラグイン"
 
 #. *  summary
-#: ../libpurple/protocols/irc/irc.c:902
+#: ../libpurple/protocols/irc/irc.c:916
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "IRC プロトコルのプラグイン (Sucks Less)"
 
 #. host to connect to
-#: ../libpurple/protocols/irc/irc.c:927 ../libpurple/protocols/irc/msgs.c:314
-#: ../libpurple/protocols/jabber/libxmpp.c:194
-#: ../libpurple/protocols/msn/msn.c:2122
-#: ../libpurple/protocols/oscar/oscar.c:6577
+#: ../libpurple/protocols/irc/irc.c:941 ../libpurple/protocols/irc/msgs.c:323
+#: ../libpurple/protocols/msn/msn.c:2154
+#: ../libpurple/protocols/oscar/oscar.c:6648
 #: ../libpurple/protocols/qq/qq.c:756
-#: ../libpurple/protocols/sametime/sametime.c:5712
-#: ../libpurple/protocols/silc/ops.c:1244
-#: ../libpurple/protocols/silc/ops.c:1347
-#: ../libpurple/protocols/simple/simple.c:1852
+#: ../libpurple/protocols/sametime/sametime.c:5727
+#: ../libpurple/protocols/silc/ops.c:1249
+#: ../libpurple/protocols/silc/ops.c:1341
+#: ../libpurple/protocols/silc10/ops.c:1244
+#: ../libpurple/protocols/silc10/ops.c:1347
+#: ../libpurple/protocols/simple/simple.c:1850
 #: ../libpurple/protocols/toc/toc.c:2327
 msgid "Server"
 msgstr "サーバ"
 
 #. port to connect to
-#: ../libpurple/protocols/irc/irc.c:930 ../libpurple/protocols/msn/msn.c:2127
-#: ../libpurple/protocols/oscar/oscar.c:6580
+#: ../libpurple/protocols/irc/irc.c:944 ../libpurple/protocols/msn/msn.c:2159
+#: ../libpurple/protocols/oscar/oscar.c:6651
 #: ../libpurple/protocols/qq/qq.c:759
-#: ../libpurple/protocols/sametime/sametime.c:5717
-#: ../libpurple/protocols/silc/silc.c:1852
+#: ../libpurple/protocols/sametime/sametime.c:5732
+#: ../libpurple/protocols/silc/silc.c:1917
+#: ../libpurple/protocols/silc10/silc.c:1859
 #: ../libpurple/protocols/toc/toc.c:2331
 msgid "Port"
 msgstr "ポート番号"
 
-#: ../libpurple/protocols/irc/irc.c:933
+#: ../libpurple/protocols/irc/irc.c:947
 msgid "Encodings"
 msgstr "エンコーディング"
 
-#: ../libpurple/protocols/irc/irc.c:936 ../libpurple/protocols/irc/msgs.c:307
-#: ../libpurple/protocols/jabber/jabber.c:795
+#: ../libpurple/protocols/irc/irc.c:950 ../libpurple/protocols/irc/msgs.c:316
+#: ../libpurple/protocols/jabber/jabber.c:803
 #: ../libpurple/protocols/silc/buddy.c:1539
-#: ../libpurple/protocols/silc/ops.c:1191
-#: ../libpurple/protocols/silc/ops.c:1194
-#: ../libpurple/protocols/silc/ops.c:1340
-#: ../libpurple/protocols/silc/ops.c:1343
-#: ../libpurple/protocols/silc/silc.c:924
+#: ../libpurple/protocols/silc/ops.c:1197
+#: ../libpurple/protocols/silc/ops.c:1200
+#: ../libpurple/protocols/silc/ops.c:1334
+#: ../libpurple/protocols/silc/ops.c:1337
+#: ../libpurple/protocols/silc/silc.c:1005
+#: ../libpurple/protocols/silc10/buddy.c:1539
+#: ../libpurple/protocols/silc10/ops.c:1191
+#: ../libpurple/protocols/silc10/ops.c:1194
+#: ../libpurple/protocols/silc10/ops.c:1340
+#: ../libpurple/protocols/silc10/ops.c:1343
+#: ../libpurple/protocols/silc10/silc.c:916
 msgid "Username"
 msgstr "ユーザ名"
 
-#: ../libpurple/protocols/irc/irc.c:939 ../libpurple/protocols/irc/msgs.c:308
-#: ../libpurple/protocols/silc/silc.c:928
+#: ../libpurple/protocols/irc/irc.c:953 ../libpurple/protocols/irc/msgs.c:317
+#: ../libpurple/protocols/silc/silc.c:1009
+#: ../libpurple/protocols/silc10/silc.c:920
 msgid "Real name"
 msgstr "氏名"
 
@@ -3530,155 +3645,158 @@
 #. option = purple_account_option_string_new(_("Quit message"), "quitmsg", IRC_DEFAULT_QUIT);
 #. prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
 #.
-#: ../libpurple/protocols/irc/irc.c:947
+#: ../libpurple/protocols/irc/irc.c:961
 msgid "Use SSL"
 msgstr "SSL を使う"
 
-#: ../libpurple/protocols/irc/msgs.c:178
+#: ../libpurple/protocols/irc/msgs.c:187
 msgid "Bad mode"
 msgstr "モードが間違っています"
 
-#: ../libpurple/protocols/irc/msgs.c:189
+#: ../libpurple/protocols/irc/msgs.c:198
 #, c-format
 msgid "You are banned from %s."
 msgstr "あなたは %s さんに締め出されました。"
 
-#: ../libpurple/protocols/irc/msgs.c:190
+#: ../libpurple/protocols/irc/msgs.c:199
 msgid "Banned"
 msgstr "締め出されました"
 
-#: ../libpurple/protocols/irc/msgs.c:207
+#: ../libpurple/protocols/irc/msgs.c:216
 #, c-format
 msgid "Cannot ban %s: banlist is full"
 msgstr "%s を締め出せません: 締め出しリストが一杯です"
 
-#: ../libpurple/protocols/irc/msgs.c:292
+#: ../libpurple/protocols/irc/msgs.c:301
 msgid " <i>(ircop)</i>"
 msgstr " <i>(ircop)</i>"
 
-#: ../libpurple/protocols/irc/msgs.c:293
+#: ../libpurple/protocols/irc/msgs.c:302
 msgid " <i>(identified)</i>"
 msgstr " <i>(identified)</i>"
 
-#: ../libpurple/protocols/irc/msgs.c:294
-#: ../libpurple/protocols/oscar/oscar.c:3681
-#: ../libpurple/protocols/silc/ops.c:1414
+#: ../libpurple/protocols/irc/msgs.c:303
+#: ../libpurple/protocols/oscar/oscar.c:3713
+#: ../libpurple/protocols/silc/ops.c:1418
+#: ../libpurple/protocols/silc10/ops.c:1414
 msgid "Nick"
 msgstr "あだ名"
 
-#: ../libpurple/protocols/irc/msgs.c:320
-#: ../libpurple/protocols/silc/ops.c:1272
+#: ../libpurple/protocols/irc/msgs.c:329
+#: ../libpurple/protocols/silc/ops.c:1268
+#: ../libpurple/protocols/silc10/ops.c:1272
 msgid "Currently on"
 msgstr "チャンネル"
 
-#: ../libpurple/protocols/irc/msgs.c:325
+#: ../libpurple/protocols/irc/msgs.c:334
 msgid "Idle for"
 msgstr "待機中"
 
-#: ../libpurple/protocols/irc/msgs.c:328
+#: ../libpurple/protocols/irc/msgs.c:337
 msgid "Online since"
 msgstr "入室した日時"
 
-#: ../libpurple/protocols/irc/msgs.c:332
+#: ../libpurple/protocols/irc/msgs.c:341
 msgid "<b>Defining adjective:</b>"
 msgstr "<b>形容詞の定義:</b>"
 
-#: ../libpurple/protocols/irc/msgs.c:332
+#: ../libpurple/protocols/irc/msgs.c:341
 msgid "Glorious"
 msgstr "Glorious"
 
-#: ../libpurple/protocols/irc/msgs.c:408
+#: ../libpurple/protocols/irc/msgs.c:420
 #, c-format
 msgid "%s has changed the topic to: %s"
 msgstr "%s さんがトピックを変更しました: %s"
 
-#: ../libpurple/protocols/irc/msgs.c:410
+#: ../libpurple/protocols/irc/msgs.c:422
 #, c-format
 msgid "%s has cleared the topic."
 msgstr "%s さんがトピックをクリアしました"
 
-#: ../libpurple/protocols/irc/msgs.c:418
+#: ../libpurple/protocols/irc/msgs.c:430
 #, c-format
 msgid "The topic for %s is: %s"
 msgstr "%s のトピック: %s"
 
-#: ../libpurple/protocols/irc/msgs.c:436
+#: ../libpurple/protocols/irc/msgs.c:448
 #, c-format
 msgid "Unknown message '%s'"
 msgstr "不明なメッセージ '%s'"
 
-#: ../libpurple/protocols/irc/msgs.c:437
+#: ../libpurple/protocols/irc/msgs.c:449
 msgid "Unknown message"
 msgstr "不明なメッセージ"
 
-#: ../libpurple/protocols/irc/msgs.c:437
+#: ../libpurple/protocols/irc/msgs.c:449
 msgid "The IRC server received a message it did not understand."
 msgstr "送信したメッセージを IRC サーバが処理しませんでした"
 
-#: ../libpurple/protocols/irc/msgs.c:458
+#: ../libpurple/protocols/irc/msgs.c:470
 #, c-format
 msgid "Users on %s: %s"
 msgstr "%s のユーザ数: %s"
 
-#: ../libpurple/protocols/irc/msgs.c:555
+#: ../libpurple/protocols/irc/msgs.c:575
 msgid "Time Response"
 msgstr "時間応答"
 
-#: ../libpurple/protocols/irc/msgs.c:556
+#: ../libpurple/protocols/irc/msgs.c:576
 msgid "The IRC server's local time is:"
 msgstr "IRC サーバのローカル・タイム:"
 
-#: ../libpurple/protocols/irc/msgs.c:567
+#: ../libpurple/protocols/irc/msgs.c:587
 msgid "No such channel"
 msgstr "そのようなチャンネルはありません"
 
 #. does this happen?
-#: ../libpurple/protocols/irc/msgs.c:578
+#: ../libpurple/protocols/irc/msgs.c:598
 msgid "no such channel"
 msgstr "そのようなチャンネルはありません"
 
-#: ../libpurple/protocols/irc/msgs.c:581
+#: ../libpurple/protocols/irc/msgs.c:601
 msgid "User is not logged in"
 msgstr "ユーザはログインしていません"
 
-#: ../libpurple/protocols/irc/msgs.c:586
+#: ../libpurple/protocols/irc/msgs.c:606
 msgid "No such nick or channel"
 msgstr "そのようなニックネームまたはチャンネルはありません"
 
-#: ../libpurple/protocols/irc/msgs.c:606
+#: ../libpurple/protocols/irc/msgs.c:626
 msgid "Could not send"
 msgstr "送信できませんでした"
 
-#: ../libpurple/protocols/irc/msgs.c:662
+#: ../libpurple/protocols/irc/msgs.c:682
 #, c-format
 msgid "Joining %s requires an invitation."
 msgstr "%s に参加するには招待する必要があります。"
 
-#: ../libpurple/protocols/irc/msgs.c:663
+#: ../libpurple/protocols/irc/msgs.c:683
 msgid "Invitation only"
 msgstr "招待だけ"
 
-#: ../libpurple/protocols/irc/msgs.c:775
+#: ../libpurple/protocols/irc/msgs.c:795
 #, c-format
 msgid "You have been kicked by %s: (%s)"
 msgstr "あなたは %s に蹴られました: (%s)"
 
 #. Remove user from channel
-#: ../libpurple/protocols/irc/msgs.c:780 ../libpurple/protocols/silc/ops.c:720
+#: ../libpurple/protocols/irc/msgs.c:800 ../libpurple/protocols/silc/ops.c:699
+#: ../libpurple/protocols/silc10/ops.c:720
 #, c-format
 msgid "Kicked by %s (%s)"
 msgstr "%s (%s) に蹴られました"
 
-#: ../libpurple/protocols/irc/msgs.c:803
+#: ../libpurple/protocols/irc/msgs.c:823
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr "モード (%s %s) by %s"
 
-#: ../libpurple/protocols/irc/msgs.c:888 ../libpurple/protocols/irc/msgs.c:889
+#: ../libpurple/protocols/irc/msgs.c:908 ../libpurple/protocols/irc/msgs.c:909
 msgid "Invalid nickname"
 msgstr "あだ名が間違っています"
 
-#: ../libpurple/protocols/irc/msgs.c:890
+#: ../libpurple/protocols/irc/msgs.c:910
 msgid ""
 "Your selected nickname was rejected by the server.  It probably contains "
 "invalid characters."
@@ -3686,7 +3804,7 @@
 "指定したあだ名がサーバ側で拒否されました。おそらく不正な文字が含まれていると"
 "思われます。"
 
-#: ../libpurple/protocols/irc/msgs.c:895
+#: ../libpurple/protocols/irc/msgs.c:915
 msgid ""
 "Your selected account name was rejected by the server.  It probably contains "
 "invalid characters."
@@ -3694,52 +3812,53 @@
 "指定したアカウント名がサーバ側で拒否されました。おそらく不正な文字が含まれて"
 "いると思われます。"
 
-#: ../libpurple/protocols/irc/msgs.c:934
+#: ../libpurple/protocols/irc/msgs.c:954
 msgid "Cannot change nick"
 msgstr "ニックネームを変更できません"
 
-#: ../libpurple/protocols/irc/msgs.c:934
+#: ../libpurple/protocols/irc/msgs.c:954
 msgid "Could not change nick"
 msgstr "ニックネームを変更できませんでした"
 
-#: ../libpurple/protocols/irc/msgs.c:955
+#: ../libpurple/protocols/irc/msgs.c:975
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr "チャンネル %s%s から離脱しました"
 
-#: ../libpurple/protocols/irc/msgs.c:997
+#: ../libpurple/protocols/irc/msgs.c:1017
 msgid "Error: invalid PONG from server"
 msgstr "エラー: サーバからの不正な PONG です"
 
-#: ../libpurple/protocols/irc/msgs.c:999
+#: ../libpurple/protocols/irc/msgs.c:1019
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr "PING 応答 -- Lag: %lu 秒"
 
-#: ../libpurple/protocols/irc/msgs.c:1080
-#, c-format
-msgid "Cannot join %s:"
-msgstr "%s に参加できません:"
-
-#: ../libpurple/protocols/irc/msgs.c:1081
-#: ../libpurple/protocols/silc/ops.c:1128
+#: ../libpurple/protocols/irc/msgs.c:1110
+#, c-format
+msgid "Cannot join %s: Registration is required."
+msgstr "%s に参加できません: 登録が必要です"
+
+#: ../libpurple/protocols/irc/msgs.c:1111
+#: ../libpurple/protocols/silc/ops.c:1093
+#: ../libpurple/protocols/silc10/ops.c:1128
 msgid "Cannot join channel"
 msgstr "チャンネルに参加できません"
 
-#: ../libpurple/protocols/irc/msgs.c:1115
+#: ../libpurple/protocols/irc/msgs.c:1145
 msgid "Nick or channel is temporarily unavailable."
 msgstr "一時的にあだ名またはチャンネルを利用できません。"
 
-#: ../libpurple/protocols/irc/msgs.c:1127
+#: ../libpurple/protocols/irc/msgs.c:1157
 #, c-format
 msgid "Wallops from %s"
 msgstr "%s さんからの wallops です"
 
-#: ../libpurple/protocols/irc/parse.c:121
+#: ../libpurple/protocols/irc/parse.c:122
 msgid "action &lt;action to perform&gt;:  Perform an action."
 msgstr "action &lt;実行するアクション&gt;:  アクションを実行します"
 
-#: ../libpurple/protocols/irc/parse.c:122
+#: ../libpurple/protocols/irc/parse.c:123
 msgid ""
 "away [message]:  Set an away message, or use no message to return from being "
 "away."
@@ -3747,11 +3866,11 @@
 "away [メッセージ]:  離席中のメッセージをセットする、または離席中から戻ったこ"
 "とを示すためにセットしたメッセージを解除します"
 
-#: ../libpurple/protocols/irc/parse.c:123
+#: ../libpurple/protocols/irc/parse.c:124
 msgid "chanserv: Send a command to chanserv"
 msgstr "chanserv: コマンドを chanserv へ送信します"
 
-#: ../libpurple/protocols/irc/parse.c:124
+#: ../libpurple/protocols/irc/parse.c:125
 msgid ""
 "deop &lt;nick1&gt; [nick2] ...:  Remove channel operator status from "
 "someone. You must be a channel operator to do this."
@@ -3759,7 +3878,7 @@
 "deop &lt;あだ名1&gt; [あだ名2] ...:  チャンネル操作権を剥奪します (これを行"
 "うには、自分自身がチャンネル操作権を持っていなければなりません)"
 
-#: ../libpurple/protocols/irc/parse.c:125
+#: ../libpurple/protocols/irc/parse.c:126
 msgid ""
 "devoice &lt;nick1&gt; [nick2] ...:  Remove channel voice status from "
 "someone, preventing them from speaking if the channel is moderated (+m). You "
@@ -3769,7 +3888,7 @@
 "ルがモデレート (+m) した時に発言しないようにします (これを行うには、自分自身"
 "がチャンネル操作権を持っていなければなりません)"
 
-#: ../libpurple/protocols/irc/parse.c:126
+#: ../libpurple/protocols/irc/parse.c:127
 msgid ""
 "invite &lt;nick&gt; [room]:  Invite someone to join you in the specified "
 "channel, or the current channel."
@@ -3777,7 +3896,7 @@
 "invite &lt;あだ名&gt; [チャットルーム]:  指定したチャンネル、または現在のチャ"
 "ンネルに招待します"
 
-#: ../libpurple/protocols/irc/parse.c:127
+#: ../libpurple/protocols/irc/parse.c:128
 msgid ""
 "j &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
 "channels, optionally providing a channel key for each if needed."
@@ -3786,7 +3905,7 @@
 "[,...]]:  一つ以上のチャンネルを指定すると、必要に応じて、追加でそれぞれの"
 "チャンネル・キーを提供します"
 
-#: ../libpurple/protocols/irc/parse.c:128
+#: ../libpurple/protocols/irc/parse.c:129
 msgid ""
 "join &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
 "channels, optionally providing a channel key for each if needed."
@@ -3795,7 +3914,7 @@
 "[,...]]:  一つ以上のチャンネルを指定すると、必要に応じて、追加でそれぞれの"
 "チャンネル・キーを提供します"
 
-#: ../libpurple/protocols/irc/parse.c:129
+#: ../libpurple/protocols/irc/parse.c:130
 msgid ""
 "kick &lt;nick&gt; [message]:  Remove someone from a channel. You must be a "
 "channel operator to do this."
@@ -3803,7 +3922,7 @@
 "kick &lt;あだ名&gt; [メッセージ]:  チャンネルから追い出します (これを行うに"
 "は、自分自身がチャンネル操作権を持っていなければなりません)"
 
-#: ../libpurple/protocols/irc/parse.c:130
+#: ../libpurple/protocols/irc/parse.c:131
 msgid ""
 "list:  Display a list of chat rooms on the network. <i>Warning, some servers "
 "may disconnect you upon doing this.</i>"
@@ -3811,15 +3930,15 @@
 "list:  ネットワーク上のチャットルームを一覧表示します。<i>【注意】これを行う"
 "と接続を切断するサーバがいくつかあります。</i>"
 
-#: ../libpurple/protocols/irc/parse.c:131
+#: ../libpurple/protocols/irc/parse.c:132
 msgid "me &lt;action to perform&gt;:  Perform an action."
 msgstr "me &lt;実行するアクション&gt;:  指定したアクションを実行します"
 
-#: ../libpurple/protocols/irc/parse.c:132
+#: ../libpurple/protocols/irc/parse.c:133
 msgid "memoserv: Send a command to memoserv"
 msgstr "memoserv: コマンドを memoserv へ送信します"
 
-#: ../libpurple/protocols/irc/parse.c:133
+#: ../libpurple/protocols/irc/parse.c:134
 msgid ""
 "mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;nick|channel&gt;:  Set or unset a channel "
 "or user mode."
@@ -3827,7 +3946,7 @@
 "mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;あだ名|チャンネル&gt;:  チャンネルまたは"
 "ユーザ・モードを設定または解除します"
 
-#: ../libpurple/protocols/irc/parse.c:134
+#: ../libpurple/protocols/irc/parse.c:135
 msgid ""
 "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
 "opposed to a channel)."
@@ -3835,20 +3954,20 @@
 "msg &lt;あだ名&gt; &lt;メッセージ&gt;:  あるユーザへ (チャンネルとは別に) 個"
 "人的なメッセージを送信します"
 
-#: ../libpurple/protocols/irc/parse.c:135
+#: ../libpurple/protocols/irc/parse.c:136
 msgid "names [channel]:  List the users currently in a channel."
 msgstr "names [チャンネル]:  チャンネルに現在いるユーザを一覧表示します"
 
-#: ../libpurple/protocols/irc/parse.c:136
-#: ../libpurple/protocols/jabber/jabber.c:1800
+#: ../libpurple/protocols/irc/parse.c:137
+#: ../libpurple/protocols/jabber/jabber.c:1819
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr "nick &lt;新しいあだ名&gt;:  あだ名を変更します"
 
-#: ../libpurple/protocols/irc/parse.c:137
+#: ../libpurple/protocols/irc/parse.c:138
 msgid "nickserv: Send a command to nickserv"
 msgstr "nickserv: コマンドを nickserv へ送信します"
 
-#: ../libpurple/protocols/irc/parse.c:138
+#: ../libpurple/protocols/irc/parse.c:139
 msgid ""
 "op &lt;nick1&gt; [nick2] ...:  Grant channel operator status to someone. You "
 "must be a channel operator to do this."
@@ -3856,7 +3975,7 @@
 "op &lt;あだ名1&gt; [あだ名2] ...:  チャンネル操作権を与えます (これを行うに"
 "は、自分自身がチャンネル操作権を持っていなければなりません)"
 
-#: ../libpurple/protocols/irc/parse.c:139
+#: ../libpurple/protocols/irc/parse.c:140
 msgid ""
 "operwall &lt;message&gt;:  If you don't know what this is, you probably "
 "can't use it."
@@ -3864,11 +3983,11 @@
 "operwall &lt;メッセージ&gt;:  (このコマンドが何を行うか知らない場合は、おそら"
 "く使うことは無いでしょう:)"
 
-#: ../libpurple/protocols/irc/parse.c:140
+#: ../libpurple/protocols/irc/parse.c:141
 msgid "operserv: Send a command to operserv"
 msgstr "operserv: コマンドを operserv へ送信します"
 
-#: ../libpurple/protocols/irc/parse.c:141
+#: ../libpurple/protocols/irc/parse.c:142
 msgid ""
 "part [room] [message]:  Leave the current channel, or a specified channel, "
 "with an optional message."
@@ -3876,7 +3995,7 @@
 "part [チャットルーム] [メッセージ]:  現在のチャンネルまたは指定したチャンネル"
 "からメッセージを残して退出します"
 
-#: ../libpurple/protocols/irc/parse.c:142
+#: ../libpurple/protocols/irc/parse.c:143
 msgid ""
 "ping [nick]:  Asks how much lag a user (or the server if no user specified) "
 "has."
@@ -3884,7 +4003,7 @@
 "ping [あだ名]:  ユーザ (または、ユーザが指定されない場合はサーバ) とどれくら"
 "いズレがあるか問い合わせます"
 
-#: ../libpurple/protocols/irc/parse.c:143
+#: ../libpurple/protocols/irc/parse.c:144
 msgid ""
 "query &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
 "opposed to a channel)."
@@ -3892,15 +4011,15 @@
 "query &lt;あだ名&gt; &lt;メッセージ&gt;:  あるユーザへ (チャンネルとは別に) "
 "個人的なメッセージを送信します"
 
-#: ../libpurple/protocols/irc/parse.c:144
+#: ../libpurple/protocols/irc/parse.c:145
 msgid "quit [message]:  Disconnect from the server, with an optional message."
 msgstr "quit [メッセージ]:  メッセージを残してサーバとの接続を切断します"
 
-#: ../libpurple/protocols/irc/parse.c:145
+#: ../libpurple/protocols/irc/parse.c:146
 msgid "quote [...]:  Send a raw command to the server."
 msgstr "quote [...]:  サーバへ低レベル・コマンドを送信します"
 
-#: ../libpurple/protocols/irc/parse.c:146
+#: ../libpurple/protocols/irc/parse.c:147
 msgid ""
 "remove &lt;nick&gt; [message]:  Remove someone from a room. You must be a "
 "channel operator to do this."
@@ -3908,23 +4027,23 @@
 "remove &lt;あだ名&gt; [メッセージ]:  チャット・ルームからあだ名の人を追い出し"
 "ます (これを行うには、自分自身がチャンネル操作権を持っていなければなりません)"
 
-#: ../libpurple/protocols/irc/parse.c:147
+#: ../libpurple/protocols/irc/parse.c:148
 msgid "time: Displays the current local time at the IRC server."
 msgstr "time: IRC サーバの現在時刻 (ローカルタイム) を表示します"
 
-#: ../libpurple/protocols/irc/parse.c:148
-msgid "topic [new topic]:  View or change the channel topic."
-msgstr "topic [新しいトピック]:  チャンネル・トピックを表示したり変更します"
-
 #: ../libpurple/protocols/irc/parse.c:149
-msgid "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Set or unset a user mode."
-msgstr "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  ユーザ・モードを設定または解除します"
+msgid "topic [new topic]:  View or change the channel topic."
+msgstr "topic [新しいトピック]:  チャンネル・トピックを表示したり変更します"
 
 #: ../libpurple/protocols/irc/parse.c:150
+msgid "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Set or unset a user mode."
+msgstr "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  ユーザ・モードを設定または解除します"
+
+#: ../libpurple/protocols/irc/parse.c:151
 msgid "version [nick]: send CTCP VERSION request to a user"
 msgstr "version [あだ名]: ユーザに CTCP VERSION 要求を送信します"
 
-#: ../libpurple/protocols/irc/parse.c:151
+#: ../libpurple/protocols/irc/parse.c:152
 msgid ""
 "voice &lt;nick1&gt; [nick2] ...:  Grant channel voice status to someone. You "
 "must be a channel operator to do this."
@@ -3932,7 +4051,7 @@
 "voice &lt;あだ名1&gt; [あだ名2] ...:  チャンネル・ボイス権を与えます (これ"
 "を行うには、自分自身がチャンネル操作権を持っていなければなりません)"
 
-#: ../libpurple/protocols/irc/parse.c:152
+#: ../libpurple/protocols/irc/parse.c:153
 msgid ""
 "wallops &lt;message&gt;:  If you don't know what this is, you probably can't "
 "use it."
@@ -3940,29 +4059,29 @@
 "wallops &lt;メッセージ&gt;:  (このコマンドが何を行うか知らない場合は、おそら"
 "く使うことは無いでしょう:)"
 
-#: ../libpurple/protocols/irc/parse.c:153
+#: ../libpurple/protocols/irc/parse.c:154
 msgid "whois [server] &lt;nick&gt;:  Get information on a user."
 msgstr "whois [サーバ名] &lt;あだ名&gt;:  ユーザ情報を取得します"
 
-#: ../libpurple/protocols/irc/parse.c:154
+#: ../libpurple/protocols/irc/parse.c:155
 msgid "whowas &lt;nick&gt;: Get information on a user that has logged off."
 msgstr "whowas &lt;あだ名&gt;: サイン・アウトしたユーザ情報を取得します"
 
-#: ../libpurple/protocols/irc/parse.c:448
+#: ../libpurple/protocols/irc/parse.c:465
 #, c-format
 msgid "Reply time from %s: %lu seconds"
 msgstr "%s からの応答時間: %lu 秒"
 
-#: ../libpurple/protocols/irc/parse.c:449
+#: ../libpurple/protocols/irc/parse.c:466
 msgid "PONG"
 msgstr "PONG"
 
-#: ../libpurple/protocols/irc/parse.c:449
+#: ../libpurple/protocols/irc/parse.c:466
 msgid "CTCP PING reply"
 msgstr "CTCP PING 応答"
 
-#: ../libpurple/protocols/irc/parse.c:560
-#: ../libpurple/protocols/irc/parse.c:564 ../libpurple/protocols/toc/toc.c:191
+#: ../libpurple/protocols/irc/parse.c:577
+#: ../libpurple/protocols/irc/parse.c:581 ../libpurple/protocols/toc/toc.c:191
 #: ../libpurple/protocols/toc/toc.c:694 ../libpurple/protocols/toc/toc.c:710
 #: ../libpurple/protocols/toc/toc.c:786
 msgid "Disconnected."
@@ -3979,17 +4098,42 @@
 msgstr "暗号化されていないストリームを介したプレーンテキスト認証が必要です"
 
 #: ../libpurple/protocols/jabber/auth.c:294
-#: ../libpurple/protocols/jabber/auth.c:295
-#: ../libpurple/protocols/jabber/auth.c:480
-#: ../libpurple/protocols/jabber/auth.c:481
-#: ../libpurple/protocols/jabber/auth.c:564
-#: ../libpurple/protocols/jabber/auth.c:565
+#: ../libpurple/protocols/jabber/auth.c:483
+#, c-format
+msgid ""
+"%s requires plaintext authentication over an unencrypted connection.  Allow "
+"this and continue authentication?"
+msgstr ""
+"%s が暗号化されていないストリーム接続を介したプレーンテキスト認証を要求してい"
+"ます。これを許可し認証を続行しますか?"
+
+#: ../libpurple/protocols/jabber/auth.c:296
+#: ../libpurple/protocols/jabber/auth.c:297
+#: ../libpurple/protocols/jabber/auth.c:485
+#: ../libpurple/protocols/jabber/auth.c:486
+#: ../libpurple/protocols/jabber/auth.c:570
+#: ../libpurple/protocols/jabber/auth.c:571
 msgid "Plaintext Authentication"
 msgstr "プレーンテキスト認証"
 
-#: ../libpurple/protocols/jabber/auth.c:296
-#: ../libpurple/protocols/jabber/auth.c:482
-#: ../libpurple/protocols/jabber/auth.c:566
+#: ../libpurple/protocols/jabber/auth.c:309
+#: ../libpurple/protocols/jabber/auth.c:498
+#: ../libpurple/protocols/jabber/auth.c:582
+msgid "Server does not use any supported authentication method"
+msgstr "サーバはサポートしている認証手法を利用しません"
+
+#. This should never happen!
+#: ../libpurple/protocols/jabber/auth.c:437
+#: ../libpurple/protocols/jabber/auth.c:533
+#: ../libpurple/protocols/jabber/auth.c:748
+#: ../libpurple/protocols/jabber/auth.c:889
+#: ../libpurple/protocols/jabber/auth.c:914
+#: ../libpurple/protocols/jabber/auth.c:933
+#: ../libpurple/protocols/jabber/jabber.c:115
+msgid "Invalid response from server."
+msgstr "サーバからの応答が不正です。"
+
+#: ../libpurple/protocols/jabber/auth.c:572
 msgid ""
 "This server requires plaintext authentication over an unencrypted "
 "connection.  Allow this and continue authentication?"
@@ -3997,41 +4141,27 @@
 "サーバが、暗号化されていないストリーム接続を介したプレーンテキスト認証を要求"
 "しています。これを許可し認証を続行しますか?"
 
-#: ../libpurple/protocols/jabber/auth.c:306
-#: ../libpurple/protocols/jabber/auth.c:492
-#: ../libpurple/protocols/jabber/auth.c:576
-msgid "Server does not use any supported authentication method"
-msgstr "サーバはサポートしている認証手法を利用しません"
-
-#. This should never happen!
-#: ../libpurple/protocols/jabber/auth.c:434
-#: ../libpurple/protocols/jabber/auth.c:527
-#: ../libpurple/protocols/jabber/auth.c:708
-#: ../libpurple/protocols/jabber/auth.c:842
-#: ../libpurple/protocols/jabber/auth.c:867
-#: ../libpurple/protocols/jabber/auth.c:886
-#: ../libpurple/protocols/jabber/jabber.c:115
-msgid "Invalid response from server."
-msgstr "サーバからの応答が不正です。"
-
-#: ../libpurple/protocols/jabber/auth.c:729
+#: ../libpurple/protocols/jabber/auth.c:769
+#: ../libpurple/protocols/jabber/auth.c:792
 msgid "Invalid challenge from server"
 msgstr "サーバからの不正な challenge です"
 
-#: ../libpurple/protocols/jabber/auth.c:817
+#: ../libpurple/protocols/jabber/auth.c:864
 msgid "SASL error"
 msgstr "SASL のエラー"
 
 #: ../libpurple/protocols/jabber/buddy.c:271
 #: ../libpurple/protocols/jabber/buddy.c:787
 #: ../libpurple/protocols/sametime/sametime.c:4128
-#: ../libpurple/protocols/silc/ops.c:1020
+#: ../libpurple/protocols/silc/ops.c:986
+#: ../libpurple/protocols/silc10/ops.c:1020
 msgid "Full Name"
 msgstr "氏名"
 
 #: ../libpurple/protocols/jabber/buddy.c:272
 #: ../libpurple/protocols/jabber/buddy.c:800
-#: ../libpurple/protocols/silc/ops.c:1032
+#: ../libpurple/protocols/silc/ops.c:998
+#: ../libpurple/protocols/silc10/ops.c:1032
 msgid "Family Name"
 msgstr "苗字"
 
@@ -4041,7 +4171,7 @@
 msgstr "名前"
 
 #: ../libpurple/protocols/jabber/buddy.c:275
-#: ../libpurple/protocols/jabber/jabber.c:855
+#: ../libpurple/protocols/jabber/jabber.c:863
 msgid "URL"
 msgstr "URL"
 
@@ -4072,7 +4202,8 @@
 
 #: ../libpurple/protocols/jabber/buddy.c:281
 #: ../libpurple/protocols/jabber/buddy.c:873
-#: ../libpurple/protocols/silc/silc.c:934
+#: ../libpurple/protocols/silc/silc.c:1015
+#: ../libpurple/protocols/silc10/silc.c:926
 msgid "Country"
 msgstr "国"
 
@@ -4085,9 +4216,11 @@
 #: ../libpurple/protocols/jabber/buddy.c:283
 #: ../libpurple/protocols/jabber/buddy.c:902
 #: ../libpurple/protocols/jabber/buddy.c:910
-#: ../libpurple/protocols/jabber/buddy.c:1566
-#: ../libpurple/protocols/silc/ops.c:1075
-#: ../libpurple/protocols/silc/util.c:551
+#: ../libpurple/protocols/jabber/buddy.c:1591
+#: ../libpurple/protocols/silc/ops.c:1041
+#: ../libpurple/protocols/silc/util.c:555
+#: ../libpurple/protocols/silc10/ops.c:1075
+#: ../libpurple/protocols/silc10/util.c:551
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1037
 msgid "E-Mail"
 msgstr "E-メール"
@@ -4109,22 +4242,22 @@
 
 #: ../libpurple/protocols/jabber/buddy.c:288
 #: ../libpurple/protocols/jabber/buddy.c:821
-#: ../libpurple/protocols/msn/msn.c:1598
-#: ../libpurple/protocols/oscar/oscar.c:3730
+#: ../libpurple/protocols/msn/msn.c:1627
+#: ../libpurple/protocols/oscar/oscar.c:3762
 msgid "Birthday"
 msgstr "誕生日"
 
 #: ../libpurple/protocols/jabber/buddy.c:289
 #: ../libpurple/protocols/jabber/buddy.c:941
-#: ../libpurple/protocols/jabber/chat.c:777 ../pidgin/gtkblist.c:3045
+#: ../libpurple/protocols/jabber/chat.c:775 ../pidgin/gtkblist.c:3090
 #: ../pidgin/gtkprefs.c:680
 msgid "Description"
 msgstr "説明"
 
 #: ../libpurple/protocols/jabber/buddy.c:578
 #: ../libpurple/protocols/jabber/buddy.c:579
-msgid "Edit Jabber vCard"
-msgstr "Jabber vCard の編集"
+msgid "Edit XMPP vCard"
+msgstr "XMPP vCard の編集"
 
 #: ../libpurple/protocols/jabber/buddy.c:580
 msgid ""
@@ -4145,30 +4278,33 @@
 msgstr "オペレーティング・システム"
 
 #: ../libpurple/protocols/jabber/buddy.c:665
-#: ../libpurple/protocols/jabber/libxmpp.c:197
+#: ../libpurple/protocols/jabber/libxmpp.c:198
+#: ../libpurple/protocols/jabber/si.c:853
 msgid "Resource"
 msgstr "リソース"
 
 #: ../libpurple/protocols/jabber/buddy.c:667
-#: ../libpurple/protocols/jabber/jabber.c:1232
-#: ../libpurple/protocols/jabber/jabber.c:1242
-#: ../libpurple/protocols/jabber/jabber.c:1252
-#: ../libpurple/protocols/jabber/jabber.c:1262
-#: ../libpurple/protocols/jabber/jabber.c:1272
+#: ../libpurple/protocols/jabber/jabber.c:1251
+#: ../libpurple/protocols/jabber/jabber.c:1261
+#: ../libpurple/protocols/jabber/jabber.c:1271
+#: ../libpurple/protocols/jabber/jabber.c:1281
+#: ../libpurple/protocols/jabber/jabber.c:1291
 msgid "Priority"
 msgstr "優先順位"
 
 #: ../libpurple/protocols/jabber/buddy.c:808
-#: ../libpurple/protocols/silc/ops.c:1028
+#: ../libpurple/protocols/silc/ops.c:994
+#: ../libpurple/protocols/silc10/ops.c:1028
 msgid "Middle Name"
 msgstr "ミドル・ネーム"
 
 #: ../libpurple/protocols/jabber/buddy.c:841
-#: ../libpurple/protocols/jabber/jabber.c:830
-#: ../libpurple/protocols/oscar/oscar.c:3769
-#: ../libpurple/protocols/oscar/oscar.c:3782
+#: ../libpurple/protocols/jabber/jabber.c:838
+#: ../libpurple/protocols/oscar/oscar.c:3801
+#: ../libpurple/protocols/oscar/oscar.c:3814
 #: ../libpurple/protocols/qq/buddy_info.c:56
-#: ../libpurple/protocols/silc/ops.c:1064
+#: ../libpurple/protocols/silc/ops.c:1030
+#: ../libpurple/protocols/silc10/ops.c:1064
 msgid "Address"
 msgstr "住所"
 
@@ -4184,63 +4320,63 @@
 msgid "Logo"
 msgstr "ロゴ"
 
-#: ../libpurple/protocols/jabber/buddy.c:1346
+#: ../libpurple/protocols/jabber/buddy.c:1371
 msgid "Un-hide From"
 msgstr "ここからは隠さない"
 
-#: ../libpurple/protocols/jabber/buddy.c:1350
+#: ../libpurple/protocols/jabber/buddy.c:1375
 msgid "Temporarily Hide From"
 msgstr "一時的にここから隠す"
 
 #. && NOT ME
-#: ../libpurple/protocols/jabber/buddy.c:1358
+#: ../libpurple/protocols/jabber/buddy.c:1383
 msgid "Cancel Presence Notification"
 msgstr "存在通知をやめる"
 
-#: ../libpurple/protocols/jabber/buddy.c:1365
+#: ../libpurple/protocols/jabber/buddy.c:1390
 msgid "(Re-)Request authorization"
-msgstr "認証の (再) 要求"
+msgstr "承認の (再) 要求"
 
 #. if(NOT ME)
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
-#: ../libpurple/protocols/jabber/buddy.c:1374
+#: ../libpurple/protocols/jabber/buddy.c:1399
 msgid "Unsubscribe"
 msgstr "購読の取り消し"
 
-#: ../libpurple/protocols/jabber/buddy.c:1407
-#: ../libpurple/protocols/jabber/jabber.c:1241
+#: ../libpurple/protocols/jabber/buddy.c:1432
+#: ../libpurple/protocols/jabber/jabber.c:1260
 msgid "Chatty"
 msgstr "チャッティー"
 
-#: ../libpurple/protocols/jabber/buddy.c:1411 ../libpurple/status.c:159
+#: ../libpurple/protocols/jabber/buddy.c:1436 ../libpurple/status.c:158
 msgid "Extended Away"
 msgstr "逃走中"
 
-#: ../libpurple/protocols/jabber/buddy.c:1413
-#: ../libpurple/protocols/jabber/jabber.c:1271
-#: ../libpurple/protocols/oscar/oscar.c:708
-#: ../libpurple/protocols/oscar/oscar.c:5717
+#: ../libpurple/protocols/jabber/buddy.c:1438
+#: ../libpurple/protocols/jabber/jabber.c:1290
+#: ../libpurple/protocols/oscar/oscar.c:727
+#: ../libpurple/protocols/oscar/oscar.c:5785
 #: ../libpurple/protocols/sametime/sametime.c:3297
 msgid "Do Not Disturb"
 msgstr "邪魔しないでね"
 
-#: ../libpurple/protocols/jabber/buddy.c:1558
+#: ../libpurple/protocols/jabber/buddy.c:1583
 msgid "JID"
 msgstr "JID"
 
-#: ../libpurple/protocols/jabber/buddy.c:1562
-#: ../libpurple/protocols/jabber/buddy.c:1741
-#: ../libpurple/protocols/oscar/oscar.c:3692
+#: ../libpurple/protocols/jabber/buddy.c:1587
+#: ../libpurple/protocols/jabber/buddy.c:1766
+#: ../libpurple/protocols/oscar/oscar.c:3724
 msgid "Last Name"
 msgstr "姓"
 
-#: ../libpurple/protocols/jabber/buddy.c:1594
+#: ../libpurple/protocols/jabber/buddy.c:1619
 msgid "The following are the results of your search"
 msgstr "検索結果です"
 
 #. current comment from Jabber User Directory users.jabber.org
-#: ../libpurple/protocols/jabber/buddy.c:1669
+#: ../libpurple/protocols/jabber/buddy.c:1694
 msgid ""
 "Find a contact by entering the search criteria in the given fields. Note: "
 "Each field supports wild card searches (%)"
@@ -4248,68 +4384,68 @@
 "指定した項目に対する検索条件を入力してコンタクトを検索します。注意: 各項目は"
 "ワイルドカードを使った検索 (%) をサポートしています。"
 
-#: ../libpurple/protocols/jabber/buddy.c:1689
+#: ../libpurple/protocols/jabber/buddy.c:1714
 msgid "Directory Query Failed"
 msgstr "ディレクトリの検索に失敗しました"
 
-#: ../libpurple/protocols/jabber/buddy.c:1690
+#: ../libpurple/protocols/jabber/buddy.c:1715
 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:1724
+#: ../libpurple/protocols/jabber/buddy.c:1749
 #, c-format
 msgid "Server Instructions: %s"
 msgstr "サーバの情報: %s"
 
-#: ../libpurple/protocols/jabber/buddy.c:1731
-msgid "Fill in one or more fields to search for any matching Jabber users."
-msgstr "Jabber ユーザを検索するには一つ以上の欄を埋めて下さい:"
-
-#: ../libpurple/protocols/jabber/buddy.c:1751
+#: ../libpurple/protocols/jabber/buddy.c:1756
+msgid "Fill in one or more fields to search for any matching XMPP users."
+msgstr "XMPP ユーザを検索するには一つ以上の欄を埋めて下さい:"
+
+#: ../libpurple/protocols/jabber/buddy.c:1776
 #: ../libpurple/protocols/novell/novell.c:1488
-#: ../libpurple/protocols/oscar/oscar.c:3695
-#: ../libpurple/protocols/oscar/oscar.c:3704
+#: ../libpurple/protocols/oscar/oscar.c:3727
+#: ../libpurple/protocols/oscar/oscar.c:3736
 msgid "E-Mail Address"
 msgstr "E-メール・アドレス"
 
-#: ../libpurple/protocols/jabber/buddy.c:1760
-#: ../libpurple/protocols/jabber/buddy.c:1761
-msgid "Search for Jabber users"
-msgstr "Jabber ユーザの検索"
+#: ../libpurple/protocols/jabber/buddy.c:1785
+#: ../libpurple/protocols/jabber/buddy.c:1786
+msgid "Search for XMPP users"
+msgstr "XMPP ユーザの検索"
 
 #. "Search"
-#: ../libpurple/protocols/jabber/buddy.c:1762
+#: ../libpurple/protocols/jabber/buddy.c:1787
 #: ../libpurple/protocols/qq/group.c:123
 #: ../libpurple/protocols/qq/group_im.c:145
 #: ../libpurple/protocols/qq/sys_msg.c:176
 #: ../libpurple/protocols/qq/sys_msg.c:253
 #: ../libpurple/protocols/qq/sys_msg.c:271
-#: ../libpurple/protocols/sametime/sametime.c:5605
+#: ../libpurple/protocols/sametime/sametime.c:5611
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:473
 #: ../pidgin/plugins/gevolution/assoc-buddy.c:358
 msgid "Search"
 msgstr "検索"
 
-#: ../libpurple/protocols/jabber/buddy.c:1777
+#: ../libpurple/protocols/jabber/buddy.c:1802
 msgid "Invalid Directory"
 msgstr "ディレクトリが間違っています"
 
-#: ../libpurple/protocols/jabber/buddy.c:1794
+#: ../libpurple/protocols/jabber/buddy.c:1819
 msgid "Enter a User Directory"
 msgstr "ユーザ・ディレクトリを入力して下さい"
 
-#: ../libpurple/protocols/jabber/buddy.c:1795
+#: ../libpurple/protocols/jabber/buddy.c:1820
 msgid "Select a user directory to search"
 msgstr "検索するユーザ・ディレクトリの選択"
 
-#: ../libpurple/protocols/jabber/buddy.c:1798
+#: ../libpurple/protocols/jabber/buddy.c:1823
 msgid "Search Directory"
 msgstr "検索するディレクトリ"
 
 #: ../libpurple/protocols/jabber/chat.c:41
-#: ../libpurple/protocols/oscar/oscar.c:5223
+#: ../libpurple/protocols/oscar/oscar.c:5271
 #: ../libpurple/protocols/yahoo/yahoochat.c:999
 msgid "_Room:"
 msgstr "ルーム(_R):"
@@ -4322,80 +4458,81 @@
 msgid "_Handle:"
 msgstr "ハンドル(_H):"
 
-#: ../libpurple/protocols/jabber/chat.c:225
+#: ../libpurple/protocols/jabber/chat.c:223
 #, c-format
 msgid "%s is not a valid room name"
 msgstr "%s は正しいルーム名ではありません"
 
-#: ../libpurple/protocols/jabber/chat.c:226
+#: ../libpurple/protocols/jabber/chat.c:224
 msgid "Invalid Room Name"
 msgstr "不正なルーム名"
 
-#: ../libpurple/protocols/jabber/chat.c:231
+#: ../libpurple/protocols/jabber/chat.c:229
 #, c-format
 msgid "%s is not a valid server name"
 msgstr "%s は正しいサーバ名ではありません"
 
-#: ../libpurple/protocols/jabber/chat.c:232
-#: ../libpurple/protocols/jabber/chat.c:233
+#: ../libpurple/protocols/jabber/chat.c:230
+#: ../libpurple/protocols/jabber/chat.c:231
 msgid "Invalid Server Name"
 msgstr "不正なサーバ名"
 
-#: ../libpurple/protocols/jabber/chat.c:237
+#: ../libpurple/protocols/jabber/chat.c:235
 #, c-format
 msgid "%s is not a valid room handle"
 msgstr "%s は正しいルーム・ハンドルではありません"
 
-#: ../libpurple/protocols/jabber/chat.c:238
-#: ../libpurple/protocols/jabber/chat.c:239
+#: ../libpurple/protocols/jabber/chat.c:236
+#: ../libpurple/protocols/jabber/chat.c:237
 msgid "Invalid Room Handle"
 msgstr "不正なルーム・ハンドル"
 
-#: ../libpurple/protocols/jabber/chat.c:398
+#: ../libpurple/protocols/jabber/chat.c:396
 msgid "Configuration error"
 msgstr "設定エラー"
 
-#: ../libpurple/protocols/jabber/chat.c:407
-#: ../libpurple/protocols/jabber/chat.c:550
+#: ../libpurple/protocols/jabber/chat.c:405
+#: ../libpurple/protocols/jabber/chat.c:548
 msgid "Unable to configure"
 msgstr "設定できません"
 
-#: ../libpurple/protocols/jabber/chat.c:422
+#: ../libpurple/protocols/jabber/chat.c:420
 msgid "Room Configuration Error"
 msgstr "ルームの設定エラー"
 
-#: ../libpurple/protocols/jabber/chat.c:423
+#: ../libpurple/protocols/jabber/chat.c:421
 msgid "This room is not capable of being configured"
 msgstr "この部屋は設定できません"
 
-#: ../libpurple/protocols/jabber/chat.c:472
-#: ../libpurple/protocols/jabber/chat.c:541
+#: ../libpurple/protocols/jabber/chat.c:470
+#: ../libpurple/protocols/jabber/chat.c:539
 msgid "Registration error"
 msgstr "登録エラー"
 
-#: ../libpurple/protocols/jabber/chat.c:629
+#: ../libpurple/protocols/jabber/chat.c:627
 msgid "Nick changing not supported in non-MUC chatrooms"
 msgstr "non-MUC チャットルームでのニックネーム変更はサポートしていません"
 
-#: ../libpurple/protocols/jabber/chat.c:680
-#: ../libpurple/protocols/jabber/chat.c:691
-#: ../libpurple/protocols/silc/ops.c:1451
+#: ../libpurple/protocols/jabber/chat.c:678
+#: ../libpurple/protocols/jabber/chat.c:689
+#: ../libpurple/protocols/silc/ops.c:1456
+#: ../libpurple/protocols/silc10/ops.c:1451
 msgid "Error retrieving room list"
 msgstr "ルーム一覧を取得する際にエラー"
 
-#: ../libpurple/protocols/jabber/chat.c:739
+#: ../libpurple/protocols/jabber/chat.c:737
 msgid "Invalid Server"
 msgstr "不正なサーバ名"
 
-#: ../libpurple/protocols/jabber/chat.c:783
+#: ../libpurple/protocols/jabber/chat.c:781
 msgid "Enter a Conference Server"
 msgstr "会議サーバの入力"
 
-#: ../libpurple/protocols/jabber/chat.c:784
+#: ../libpurple/protocols/jabber/chat.c:782
 msgid "Select a conference server to query"
 msgstr "問い合わせる会議サーバの選択"
 
-#: ../libpurple/protocols/jabber/chat.c:787
+#: ../libpurple/protocols/jabber/chat.c:785
 msgid "Find Rooms"
 msgstr "部屋の検索"
 
@@ -4414,422 +4551,444 @@
 msgid "Read Error"
 msgstr "読み込みエラー"
 
-#: ../libpurple/protocols/jabber/jabber.c:519
+#: ../libpurple/protocols/jabber/jabber.c:467
+#: ../libpurple/protocols/oscar/flap_connection.c:386
+#: ../libpurple/protocols/yahoo/yahoo.c:2381
+#: ../libpurple/protocols/yahoo/yahoo.c:2413
+#, c-format
+msgid ""
+"Could not establish a connection with the server:\n"
+"%s"
+msgstr ""
+"サーバとの接続を確立できませんでした:\n"
+"%s"
+
+#: ../libpurple/protocols/jabber/jabber.c:523
 msgid "Unable to create socket"
 msgstr "ソケットを生成できません"
 
-#: ../libpurple/protocols/jabber/jabber.c:565
-#: ../libpurple/protocols/jabber/jabber.c:910
-msgid "Invalid Jabber ID"
-msgstr "不正な Jabber ID"
-
-#: ../libpurple/protocols/jabber/jabber.c:636
+#: ../libpurple/protocols/jabber/jabber.c:568
+#: ../libpurple/protocols/jabber/jabber.c:918
+msgid "Invalid XMPP ID"
+msgstr "不正な XMPP ID"
+
+#: ../libpurple/protocols/jabber/jabber.c:573
+msgid "Invalid XMPP ID. Domain must be set."
+msgstr "XMPP ID が間違っています (ドメインを指定して下さい)"
+
+#: ../libpurple/protocols/jabber/jabber.c:644
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "%s@%s の登録が完了しました"
 
-#: ../libpurple/protocols/jabber/jabber.c:638
-#: ../libpurple/protocols/jabber/jabber.c:639
+#: ../libpurple/protocols/jabber/jabber.c:646
+#: ../libpurple/protocols/jabber/jabber.c:647
 msgid "Registration Successful"
 msgstr "登録の完了"
 
-#: ../libpurple/protocols/jabber/jabber.c:645
-#: ../libpurple/protocols/jabber/jabber.c:1511
+#: ../libpurple/protocols/jabber/jabber.c:653
+#: ../libpurple/protocols/jabber/jabber.c:1530
 msgid "Unknown Error"
 msgstr "不明なエラー"
 
-#: ../libpurple/protocols/jabber/jabber.c:647
-#: ../libpurple/protocols/jabber/jabber.c:648
+#: ../libpurple/protocols/jabber/jabber.c:655
+#: ../libpurple/protocols/jabber/jabber.c:656
 msgid "Registration Failed"
 msgstr "登録の失敗"
 
-#: ../libpurple/protocols/jabber/jabber.c:763
-#: ../libpurple/protocols/jabber/jabber.c:764
+#: ../libpurple/protocols/jabber/jabber.c:771
+#: ../libpurple/protocols/jabber/jabber.c:772
 msgid "Already Registered"
 msgstr "既に登録されています"
 
-#: ../libpurple/protocols/jabber/jabber.c:840
-#: ../libpurple/protocols/oscar/oscar.c:3771
-#: ../libpurple/protocols/oscar/oscar.c:3784
+#: ../libpurple/protocols/jabber/jabber.c:848
+#: ../libpurple/protocols/oscar/oscar.c:3803
+#: ../libpurple/protocols/oscar/oscar.c:3816
 msgid "State"
 msgstr "州"
 
-#: ../libpurple/protocols/jabber/jabber.c:845
+#: ../libpurple/protocols/jabber/jabber.c:853
 msgid "Postal code"
 msgstr "郵便番号"
 
-#: ../libpurple/protocols/jabber/jabber.c:850
-#: ../libpurple/protocols/silc/ops.c:1069
-#: ../libpurple/protocols/silc/silc.c:691
-#: ../libpurple/protocols/silc/util.c:553
+#: ../libpurple/protocols/jabber/jabber.c:858
+#: ../libpurple/protocols/silc/ops.c:1035
+#: ../libpurple/protocols/silc/silc.c:772
+#: ../libpurple/protocols/silc/util.c:557
+#: ../libpurple/protocols/silc10/ops.c:1069
+#: ../libpurple/protocols/silc10/silc.c:683
+#: ../libpurple/protocols/silc10/util.c:553
 msgid "Phone"
 msgstr "電話番号"
 
-#: ../libpurple/protocols/jabber/jabber.c:860
+#: ../libpurple/protocols/jabber/jabber.c:868
 msgid "Date"
 msgstr "日付"
 
-#: ../libpurple/protocols/jabber/jabber.c:868
+#: ../libpurple/protocols/jabber/jabber.c:876
 msgid "Please fill out the information below to register your new account."
 msgstr "新しいアカウントを登録するには、次の情報を全て入力して下さい。"
 
-#: ../libpurple/protocols/jabber/jabber.c:871
-#: ../libpurple/protocols/jabber/jabber.c:872
-msgid "Register New Jabber Account"
-msgstr "新しい Jabber アカウントの登録"
+#: ../libpurple/protocols/jabber/jabber.c:879
+#: ../libpurple/protocols/jabber/jabber.c:880
+msgid "Register New XMPP Account"
+msgstr "新しい XMPP アカウントの登録"
 
 #. Register button
-#: ../libpurple/protocols/jabber/jabber.c:873 ../pidgin/gtkaccount.c:1490
+#: ../libpurple/protocols/jabber/jabber.c:881 ../pidgin/gtkaccount.c:1526
 msgid "Register"
 msgstr "登録"
 
-#: ../libpurple/protocols/jabber/jabber.c:1042
+#: ../libpurple/protocols/jabber/jabber.c:1052
 msgid "Initializing Stream"
 msgstr "ストリームの初期化中"
 
-#: ../libpurple/protocols/jabber/jabber.c:1047
-#: ../libpurple/protocols/msn/session.c:350
+#: ../libpurple/protocols/jabber/jabber.c:1057
+#: ../libpurple/protocols/msn/session.c:351
 msgid "Authenticating"
 msgstr "認証中"
 
-#: ../libpurple/protocols/jabber/jabber.c:1056
+#: ../libpurple/protocols/jabber/jabber.c:1066
 msgid "Re-initializing Stream"
 msgstr "ストリームの再初期化中"
 
-#: ../libpurple/protocols/jabber/jabber.c:1115
-#: ../libpurple/protocols/jabber/jabber.c:1489
-#: ../libpurple/protocols/jabber/jabber.c:1530
-#: ../libpurple/protocols/jabber/jabber.c:1566
-#: ../libpurple/protocols/oscar/oscar.c:807
-#: ../libpurple/protocols/oscar/oscar.c:5511
+#: ../libpurple/protocols/jabber/jabber.c:1134
+#: ../libpurple/protocols/jabber/jabber.c:1508
+#: ../libpurple/protocols/jabber/jabber.c:1549
+#: ../libpurple/protocols/jabber/jabber.c:1585
+#: ../libpurple/protocols/oscar/oscar.c:826
+#: ../libpurple/protocols/oscar/oscar.c:5579
 msgid "Not Authorized"
-msgstr "認証されていません"
-
-#: ../libpurple/protocols/jabber/jabber.c:1157
+msgstr "承認されていません"
+
+#: ../libpurple/protocols/jabber/jabber.c:1176
 msgid "Both"
 msgstr "両方"
 
-#: ../libpurple/protocols/jabber/jabber.c:1159
+#: ../libpurple/protocols/jabber/jabber.c:1178
 msgid "From (To pending)"
 msgstr "From (To pending)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1164
+#: ../libpurple/protocols/jabber/jabber.c:1183
 msgid "To"
 msgstr "To"
 
-#: ../libpurple/protocols/jabber/jabber.c:1166
+#: ../libpurple/protocols/jabber/jabber.c:1185
 msgid "None (To pending)"
 msgstr "None (To pending)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1168
+#: ../libpurple/protocols/jabber/jabber.c:1187
 #: ../pidgin/plugins/gevolution/eds-utils.c:73
 #: ../pidgin/plugins/gevolution/eds-utils.c:86
 msgid "None"
 msgstr "なし"
 
-#: ../libpurple/protocols/jabber/jabber.c:1171
+#: ../libpurple/protocols/jabber/jabber.c:1190
 msgid "Subscription"
 msgstr "購読"
 
-#: ../libpurple/protocols/jabber/jabber.c:1301
+#: ../libpurple/protocols/jabber/jabber.c:1320
 msgid "Password Changed"
 msgstr "パスワードの変更"
 
-#: ../libpurple/protocols/jabber/jabber.c:1302
+#: ../libpurple/protocols/jabber/jabber.c:1321
 msgid "Your password has been changed."
 msgstr "パスワードを変更しました。"
 
-#: ../libpurple/protocols/jabber/jabber.c:1306
-#: ../libpurple/protocols/jabber/jabber.c:1307
+#: ../libpurple/protocols/jabber/jabber.c:1325
+#: ../libpurple/protocols/jabber/jabber.c:1326
 msgid "Error changing password"
 msgstr "パスワードを変更する際にエラー"
 
-#: ../libpurple/protocols/jabber/jabber.c:1363
+#: ../libpurple/protocols/jabber/jabber.c:1382
 msgid "Password (again)"
 msgstr "パスワード (確認用)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1368
-#: ../libpurple/protocols/jabber/jabber.c:1369
-msgid "Change Jabber Password"
-msgstr "Jabber パスワードの変更"
-
-#: ../libpurple/protocols/jabber/jabber.c:1369
+#: ../libpurple/protocols/jabber/jabber.c:1387
+#: ../libpurple/protocols/jabber/jabber.c:1388
+msgid "Change XMPP Password"
+msgstr "XMPP パスワードの変更"
+
+#: ../libpurple/protocols/jabber/jabber.c:1388
 msgid "Please enter your new password"
 msgstr "新しいパスワードを入力して下さい"
 
-#: ../libpurple/protocols/jabber/jabber.c:1381
-#: ../libpurple/protocols/oscar/oscar.c:6297
-#: ../libpurple/protocols/silc/silc.c:1015
+#: ../libpurple/protocols/jabber/jabber.c:1400
+#: ../libpurple/protocols/oscar/oscar.c:6365
+#: ../libpurple/protocols/silc/silc.c:1093
+#: ../libpurple/protocols/silc10/silc.c:1004
 msgid "Set User Info..."
 msgstr "ユーザ情報のセット..."
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
-#: ../libpurple/protocols/jabber/jabber.c:1386
-#: ../libpurple/protocols/oscar/oscar.c:6308
-#: ../libpurple/protocols/silc/silc.c:1011
+#: ../libpurple/protocols/jabber/jabber.c:1405
+#: ../libpurple/protocols/oscar/oscar.c:6376
+#: ../libpurple/protocols/silc/silc.c:1089
+#: ../libpurple/protocols/silc10/silc.c:1000
 msgid "Change Password..."
 msgstr "パスワードの変更..."
 
 #. }
-#: ../libpurple/protocols/jabber/jabber.c:1391
+#: ../libpurple/protocols/jabber/jabber.c:1410
 msgid "Search for Users..."
 msgstr "ユーザの検索..."
 
-#: ../libpurple/protocols/jabber/jabber.c:1469
+#: ../libpurple/protocols/jabber/jabber.c:1488
 msgid "Bad Request"
 msgstr "おかしな要求です"
 
-#: ../libpurple/protocols/jabber/jabber.c:1471
+#: ../libpurple/protocols/jabber/jabber.c:1490
 msgid "Conflict"
 msgstr "衝突してます"
 
-#: ../libpurple/protocols/jabber/jabber.c:1473
+#: ../libpurple/protocols/jabber/jabber.c:1492
 msgid "Feature Not Implemented"
 msgstr "まだ実装していません"
 
-#: ../libpurple/protocols/jabber/jabber.c:1475
+#: ../libpurple/protocols/jabber/jabber.c:1494
 msgid "Forbidden"
 msgstr "隠れています"
 
-#: ../libpurple/protocols/jabber/jabber.c:1477
+#: ../libpurple/protocols/jabber/jabber.c:1496
 msgid "Gone"
 msgstr "逝ってます"
 
-#: ../libpurple/protocols/jabber/jabber.c:1479
-#: ../libpurple/protocols/jabber/jabber.c:1556
+#: ../libpurple/protocols/jabber/jabber.c:1498
+#: ../libpurple/protocols/jabber/jabber.c:1575
 msgid "Internal Server Error"
 msgstr "サーバの内部エラー"
 
-#: ../libpurple/protocols/jabber/jabber.c:1481
+#: ../libpurple/protocols/jabber/jabber.c:1500
 msgid "Item Not Found"
 msgstr "アイテムが見つかりません"
 
-#: ../libpurple/protocols/jabber/jabber.c:1483
-msgid "Malformed Jabber ID"
-msgstr "おかしな Jabber ID"
-
-#: ../libpurple/protocols/jabber/jabber.c:1485
+#: ../libpurple/protocols/jabber/jabber.c:1502
+msgid "Malformed XMPP ID"
+msgstr "おかしな XMPP ID"
+
+#: ../libpurple/protocols/jabber/jabber.c:1504
 msgid "Not Acceptable"
 msgstr "受信できません"
 
-#: ../libpurple/protocols/jabber/jabber.c:1487
+#: ../libpurple/protocols/jabber/jabber.c:1506
 msgid "Not Allowed"
 msgstr "許可していません"
 
-#: ../libpurple/protocols/jabber/jabber.c:1491
+#: ../libpurple/protocols/jabber/jabber.c:1510
 msgid "Payment Required"
 msgstr "有料です"
 
-#: ../libpurple/protocols/jabber/jabber.c:1493
+#: ../libpurple/protocols/jabber/jabber.c:1512
 msgid "Recipient Unavailable"
 msgstr "受信者がいません"
 
-#: ../libpurple/protocols/jabber/jabber.c:1497
+#: ../libpurple/protocols/jabber/jabber.c:1516
 msgid "Registration Required"
 msgstr "登録が必要です"
 
-#: ../libpurple/protocols/jabber/jabber.c:1499
+#: ../libpurple/protocols/jabber/jabber.c:1518
 msgid "Remote Server Not Found"
 msgstr "リモート・サーバが見つかりません"
 
-#: ../libpurple/protocols/jabber/jabber.c:1501
+#: ../libpurple/protocols/jabber/jabber.c:1520
 msgid "Remote Server Timeout"
 msgstr "リモート・サーバがタイムアウトしました"
 
-#: ../libpurple/protocols/jabber/jabber.c:1503
+#: ../libpurple/protocols/jabber/jabber.c:1522
 msgid "Server Overloaded"
 msgstr "サーバがオーバーロードです"
 
-#: ../libpurple/protocols/jabber/jabber.c:1505
-msgid "Service Unavailable"
-msgstr "サービスは利用できません"
-
-#: ../libpurple/protocols/jabber/jabber.c:1507
-msgid "Subscription Required"
-msgstr "購読の申し込みが必要です"
-
-#: ../libpurple/protocols/jabber/jabber.c:1509
-msgid "Unexpected Request"
-msgstr "予期しないリクエストです"
-
-#: ../libpurple/protocols/jabber/jabber.c:1516
-msgid "Authorization Aborted"
-msgstr "認証が拒否されました"
-
-#: ../libpurple/protocols/jabber/jabber.c:1518
-msgid "Incorrect encoding in authorization"
-msgstr "認証で不正なエンコーディングです"
-
-#: ../libpurple/protocols/jabber/jabber.c:1521
-msgid "Invalid authzid"
-msgstr "不正な authzid です"
-
 #: ../libpurple/protocols/jabber/jabber.c:1524
-msgid "Invalid Authorization Mechanism"
-msgstr "不正な認証メカニズムです"
-
-#: ../libpurple/protocols/jabber/jabber.c:1527
-msgid "Authorization mechanism too weak"
-msgstr "認証メカニズムが不十分です"
-
-#: ../libpurple/protocols/jabber/jabber.c:1532
-msgid "Temporary Authentication Failure"
-msgstr "テンポラリな認証に失敗しました"
+msgid "Service Unavailable"
+msgstr "サービスは利用できません"
+
+#: ../libpurple/protocols/jabber/jabber.c:1526
+msgid "Subscription Required"
+msgstr "購読の申し込みが必要です"
+
+#: ../libpurple/protocols/jabber/jabber.c:1528
+msgid "Unexpected Request"
+msgstr "予期しないリクエストです"
 
 #: ../libpurple/protocols/jabber/jabber.c:1535
+msgid "Authorization Aborted"
+msgstr "承認が拒否されました"
+
+#: ../libpurple/protocols/jabber/jabber.c:1537
+msgid "Incorrect encoding in authorization"
+msgstr "承認で不正なエンコーディングが行われました"
+
+#: ../libpurple/protocols/jabber/jabber.c:1540
+msgid "Invalid authzid"
+msgstr "不正な authzid です"
+
+#: ../libpurple/protocols/jabber/jabber.c:1543
+msgid "Invalid Authorization Mechanism"
+msgstr "不正な承認メカニズムです"
+
+#: ../libpurple/protocols/jabber/jabber.c:1546
+msgid "Authorization mechanism too weak"
+msgstr "承認メカニズムが不十分です"
+
+#: ../libpurple/protocols/jabber/jabber.c:1551
+msgid "Temporary Authentication Failure"
+msgstr "テンポラリな認証に失敗しました"
+
+#: ../libpurple/protocols/jabber/jabber.c:1554
 msgid "Authentication Failure"
 msgstr "認証に失敗しました"
 
-#: ../libpurple/protocols/jabber/jabber.c:1541
+#: ../libpurple/protocols/jabber/jabber.c:1560
 msgid "Bad Format"
 msgstr "おかしなフォーマット"
 
-#: ../libpurple/protocols/jabber/jabber.c:1543
+#: ../libpurple/protocols/jabber/jabber.c:1562
 msgid "Bad Namespace Prefix"
 msgstr "おかしな名前空間の接頭子"
 
-#: ../libpurple/protocols/jabber/jabber.c:1546
+#: ../libpurple/protocols/jabber/jabber.c:1565
 msgid "Resource Conflict"
 msgstr "リソースの衝突"
 
-#: ../libpurple/protocols/jabber/jabber.c:1548
-#: ../libpurple/protocols/silc/ops.c:1729
+#: ../libpurple/protocols/jabber/jabber.c:1567
+#: ../libpurple/protocols/silc/silc.c:244
+#: ../libpurple/protocols/silc10/ops.c:1720
 msgid "Connection Timeout"
 msgstr "接続がタイムアウトしました"
 
-#: ../libpurple/protocols/jabber/jabber.c:1550
+#: ../libpurple/protocols/jabber/jabber.c:1569
 msgid "Host Gone"
 msgstr "ホストがお亡くなりになりました"
 
-#: ../libpurple/protocols/jabber/jabber.c:1552
+#: ../libpurple/protocols/jabber/jabber.c:1571
 msgid "Host Unknown"
 msgstr "ホストが不明です"
 
-#: ../libpurple/protocols/jabber/jabber.c:1554
+#: ../libpurple/protocols/jabber/jabber.c:1573
 msgid "Improper Addressing"
 msgstr "適切ではないアドレス設定"
 
-#: ../libpurple/protocols/jabber/jabber.c:1558
+#: ../libpurple/protocols/jabber/jabber.c:1577
 msgid "Invalid ID"
 msgstr "不正な ID"
 
-#: ../libpurple/protocols/jabber/jabber.c:1560
+#: ../libpurple/protocols/jabber/jabber.c:1579
 msgid "Invalid Namespace"
 msgstr "不正な名前空間"
 
-#: ../libpurple/protocols/jabber/jabber.c:1562
+#: ../libpurple/protocols/jabber/jabber.c:1581
 msgid "Invalid XML"
 msgstr "不正な XML"
 
-#: ../libpurple/protocols/jabber/jabber.c:1564
+#: ../libpurple/protocols/jabber/jabber.c:1583
 msgid "Non-matching Hosts"
 msgstr "一致しないホスト"
 
-#: ../libpurple/protocols/jabber/jabber.c:1568
+#: ../libpurple/protocols/jabber/jabber.c:1587
 msgid "Policy Violation"
 msgstr "ポリシー違反"
 
-#: ../libpurple/protocols/jabber/jabber.c:1570
+#: ../libpurple/protocols/jabber/jabber.c:1589
 msgid "Remote Connection Failed"
 msgstr "リモート接続に失敗しました"
 
-#: ../libpurple/protocols/jabber/jabber.c:1572
+#: ../libpurple/protocols/jabber/jabber.c:1591
 msgid "Resource Constraint"
 msgstr "リソース制限"
 
-#: ../libpurple/protocols/jabber/jabber.c:1574
+#: ../libpurple/protocols/jabber/jabber.c:1593
 msgid "Restricted XML"
 msgstr "制限付き XML"
 
-#: ../libpurple/protocols/jabber/jabber.c:1576
+#: ../libpurple/protocols/jabber/jabber.c:1595
 msgid "See Other Host"
 msgstr "他のホストを表示する"
 
-#: ../libpurple/protocols/jabber/jabber.c:1578
+#: ../libpurple/protocols/jabber/jabber.c:1597
 msgid "System Shutdown"
 msgstr "システム・シャットダウン"
 
-#: ../libpurple/protocols/jabber/jabber.c:1580
+#: ../libpurple/protocols/jabber/jabber.c:1599
 msgid "Undefined Condition"
 msgstr "定義していない条件"
 
-#: ../libpurple/protocols/jabber/jabber.c:1582
+#: ../libpurple/protocols/jabber/jabber.c:1601
 msgid "Unsupported Encoding"
 msgstr "サポートしていないエンコーディング"
 
-#: ../libpurple/protocols/jabber/jabber.c:1584
+#: ../libpurple/protocols/jabber/jabber.c:1603
 msgid "Unsupported Stanza Type"
 msgstr "サポートしていない Stanza 型"
 
-#: ../libpurple/protocols/jabber/jabber.c:1586
+#: ../libpurple/protocols/jabber/jabber.c:1605
 msgid "Unsupported Version"
 msgstr "サポートしていないバージョン"
 
-#: ../libpurple/protocols/jabber/jabber.c:1588
+#: ../libpurple/protocols/jabber/jabber.c:1607
 msgid "XML Not Well Formed"
 msgstr "ウェル・フォームド XML ではありません"
 
-#: ../libpurple/protocols/jabber/jabber.c:1590
+#: ../libpurple/protocols/jabber/jabber.c:1609
 msgid "Stream Error"
 msgstr "ストリーム・エラー"
 
-#: ../libpurple/protocols/jabber/jabber.c:1657
+#: ../libpurple/protocols/jabber/jabber.c:1676
 #, c-format
 msgid "Unable to ban user %s"
 msgstr "ユーザの %s さんを追い出せません"
 
-#: ../libpurple/protocols/jabber/jabber.c:1677
+#: ../libpurple/protocols/jabber/jabber.c:1696
 #, c-format
 msgid "Unknown affiliation: \"%s\""
 msgstr "不明な会員: \"%s\""
 
-#: ../libpurple/protocols/jabber/jabber.c:1682
+#: ../libpurple/protocols/jabber/jabber.c:1701
 #, c-format
 msgid "Unable to affiliate user %s as \"%s\""
 msgstr "ユーザの %s さんを \"%s\" として仲間に追加できません"
 
-#: ../libpurple/protocols/jabber/jabber.c:1701
+#: ../libpurple/protocols/jabber/jabber.c:1720
 #, c-format
 msgid "Unknown role: \"%s\""
 msgstr "不明な役割: \"%s\""
 
-#: ../libpurple/protocols/jabber/jabber.c:1708
+#: ../libpurple/protocols/jabber/jabber.c:1727
 #, c-format
 msgid "Unable to set role \"%s\" for user: %s"
 msgstr "ユーザに役割 \"%s\" をセットできません: %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:1761
+#: ../libpurple/protocols/jabber/jabber.c:1780
 #, c-format
 msgid "Unable to kick user %s"
 msgstr "ユーザの %s さんをキックできません"
 
-#: ../libpurple/protocols/jabber/jabber.c:1792
+#: ../libpurple/protocols/jabber/jabber.c:1811
 msgid "config:  Configure a chat room."
 msgstr "config:  チャット・ルームを設定します"
 
-#: ../libpurple/protocols/jabber/jabber.c:1796
+#: ../libpurple/protocols/jabber/jabber.c:1815
 msgid "configure:  Configure a chat room."
 msgstr "configure:  チャット・ルームを設定します"
 
-#: ../libpurple/protocols/jabber/jabber.c:1805
+#: ../libpurple/protocols/jabber/jabber.c:1824
 msgid "part [room]:  Leave the room."
 msgstr "part [部屋]:  部屋から退出します"
 
-#: ../libpurple/protocols/jabber/jabber.c:1810
+#: ../libpurple/protocols/jabber/jabber.c:1829
 msgid "register:  Register with a chat room."
 msgstr "register:  チャット・ルームを登録します"
 
-#: ../libpurple/protocols/jabber/jabber.c:1816
+#: ../libpurple/protocols/jabber/jabber.c:1835
 msgid "topic [new topic]:  View or change the topic."
 msgstr "topic [新しいトピック]:  トピックを表示したり変更します"
 
-#: ../libpurple/protocols/jabber/jabber.c:1822
+#: ../libpurple/protocols/jabber/jabber.c:1841
 msgid "ban &lt;user&gt; [room]:  Ban a user from the room."
 msgstr ""
 "ban &lt;ユーザ&gt; [ルーム]:  指定したチャット・ルームからユーザを追い出しま"
 "す"
 
-#: ../libpurple/protocols/jabber/jabber.c:1828
+#: ../libpurple/protocols/jabber/jabber.c:1847
 msgid ""
 "affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
 "affiliation with the room."
@@ -4837,7 +4996,7 @@
 "affiliate &lt;ユーザ&gt; &lt;owner|admin|member|outcast|none&gt;: ユーザの関"
 "係をセットします"
 
-#: ../libpurple/protocols/jabber/jabber.c:1834
+#: ../libpurple/protocols/jabber/jabber.c:1853
 msgid ""
 "role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
 "role in the room."
@@ -4845,21 +5004,21 @@
 "role &lt;ユーザ&gt; &lt;moderator|participant|visitor|none&gt;: チャトルーム"
 "での役割をセットします"
 
-#: ../libpurple/protocols/jabber/jabber.c:1840
+#: ../libpurple/protocols/jabber/jabber.c:1859
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
 msgstr "invite &lt;ユーザ&gt; [メッセージ]:  ユーザをルームに招待します"
 
-#: ../libpurple/protocols/jabber/jabber.c:1846
+#: ../libpurple/protocols/jabber/jabber.c:1865
 msgid "join: &lt;room&gt; [server]:  Join a chat on this server."
 msgstr "join: &lt;ルーム&gt; [サーバ]:  指定したサーバのチャットへ参加します"
 
-#: ../libpurple/protocols/jabber/jabber.c:1852
+#: ../libpurple/protocols/jabber/jabber.c:1871
 msgid "kick &lt;user&gt; [room]:  Kick a user from the room."
 msgstr ""
 "kick &lt;ユーザ&gt; [ルーム]:  指定したユーザをチャット・ルームから追い出しま"
 "す"
 
-#: ../libpurple/protocols/jabber/jabber.c:1857
+#: ../libpurple/protocols/jabber/jabber.c:1876
 msgid ""
 "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
 msgstr ""
@@ -4878,53 +5037,64 @@
 #. *  description
 #: ../libpurple/protocols/jabber/libxmpp.c:166
 #: ../libpurple/protocols/jabber/libxmpp.c:168
-msgid "Jabber Protocol Plugin"
-msgstr "Jabber プロトコルのプラグイン"
-
-#: ../libpurple/protocols/jabber/libxmpp.c:200
+msgid "XMPP Protocol Plugin"
+msgstr "XMPP プロトコルのプラグイン"
+
+#. Translators: 'domain' is used here in the context of Internet domains, e.g. pidgin.im
+#: ../libpurple/protocols/jabber/libxmpp.c:195 ../pidgin/gtkaccount.c:505
+msgid "Domain"
+msgstr "ドメイン名"
+
+#: ../libpurple/protocols/jabber/libxmpp.c:201
 msgid "Force old (port 5223) SSL"
 msgstr "古い SSL (ポート番号:5223) を強制的に使用する"
 
-#: ../libpurple/protocols/jabber/libxmpp.c:205
+#: ../libpurple/protocols/jabber/libxmpp.c:206
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "暗号化されていないストリームを介したプレーンテキスト認証を許可する"
 
-#: ../libpurple/protocols/jabber/libxmpp.c:210
-#: ../libpurple/protocols/simple/simple.c:1858
+#: ../libpurple/protocols/jabber/libxmpp.c:211
+#: ../libpurple/protocols/simple/simple.c:1856
 msgid "Connect port"
 msgstr "接続するポート番号"
 
 #. Account options
-#: ../libpurple/protocols/jabber/libxmpp.c:214
-#: ../libpurple/protocols/silc/silc.c:1848
+#: ../libpurple/protocols/jabber/libxmpp.c:215
+#: ../libpurple/protocols/silc/silc.c:1913
+#: ../libpurple/protocols/silc10/silc.c:1855 ../pidgin/gtkaccount.c:835
 msgid "Connect server"
 msgstr "サーバへ接続"
 
-#: ../libpurple/protocols/jabber/message.c:155
+#: ../libpurple/protocols/jabber/message.c:102
+#, c-format
+msgid "%s has left the conversation."
+msgstr "%s さんが会話ウインドウを閉じました"
+
+#: ../libpurple/protocols/jabber/message.c:153
 #, c-format
 msgid "Message from %s"
 msgstr "%s さんからのメッセージ"
 
-#: ../libpurple/protocols/jabber/message.c:219
+#: ../libpurple/protocols/jabber/message.c:217
 #, c-format
 msgid "%s has set the topic to: %s"
 msgstr "%s はトピックをセットしました: %s"
 
-#: ../libpurple/protocols/jabber/message.c:221
+#: ../libpurple/protocols/jabber/message.c:219
 #, c-format
 msgid "The topic is: %s"
 msgstr "トピック: %s"
 
-#: ../libpurple/protocols/jabber/message.c:269
+#: ../libpurple/protocols/jabber/message.c:267
 #, c-format
 msgid "Message delivery to %s failed: %s"
 msgstr "%s さんへのメッセージの配送に失敗: %s"
 
-#: ../libpurple/protocols/jabber/message.c:272
-msgid "Jabber Message Error"
-msgstr "Jabber メッセージ・エラー"
-
-#: ../libpurple/protocols/jabber/message.c:352
+#: ../libpurple/protocols/jabber/message.c:270
+msgid "XMPP Message Error"
+msgstr "XMPP メッセージ・エラー"
+
+#: ../libpurple/protocols/jabber/message.c:359
 #, c-format
 msgid " (Code %s)"
 msgstr " (コード %s)"
@@ -4933,16 +5103,16 @@
 msgid "XML Parse error"
 msgstr "XML 解析エラー"
 
-#: ../libpurple/protocols/jabber/presence.c:278
+#: ../libpurple/protocols/jabber/presence.c:279
 msgid "Unknown Error in presence"
 msgstr "不明なエラーが起きています"
 
-#: ../libpurple/protocols/jabber/presence.c:352
 #: ../libpurple/protocols/jabber/presence.c:353
+#: ../libpurple/protocols/jabber/presence.c:354
 msgid "Create New Room"
 msgstr "新しいチャット・ルームの生成"
 
-#: ../libpurple/protocols/jabber/presence.c:354
+#: ../libpurple/protocols/jabber/presence.c:355
 msgid ""
 "You are creating a new room.  Would you like to configure it, or accept the "
 "default settings?"
@@ -4950,11 +5120,11 @@
 "新しいチャット・ルームを生成します。チャット・ルームの設定を行いますか? それ"
 "ともデフォルト値を適用しますか?"
 
-#: ../libpurple/protocols/jabber/presence.c:360
+#: ../libpurple/protocols/jabber/presence.c:361
 msgid "_Configure Room"
 msgstr "ルームの設定(_C)"
 
-#: ../libpurple/protocols/jabber/presence.c:361
+#: ../libpurple/protocols/jabber/presence.c:362
 msgid "_Accept Defaults"
 msgstr "デフォルト値を適用する(_A)"
 
@@ -4968,18 +5138,44 @@
 msgid "Error joining chat %s"
 msgstr "チャット %s に参加する際にエラー"
 
-#: ../libpurple/protocols/jabber/si.c:765
+#: ../libpurple/protocols/jabber/si.c:769
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
 msgstr ""
 "%s さんへファイルを送信できません (ユーザはファイル転送をサポートしていませ"
 "ん)"
 
-#: ../libpurple/protocols/jabber/si.c:766
-#: ../libpurple/protocols/jabber/si.c:767
+#: ../libpurple/protocols/jabber/si.c:770
+#: ../libpurple/protocols/jabber/si.c:771
+#: ../libpurple/protocols/jabber/si.c:839
 msgid "File Send Failed"
 msgstr "ファイル送信の失敗"
 
+#: ../libpurple/protocols/jabber/si.c:832
+#, c-format
+msgid "Unable to send file to %s, invalid JID"
+msgstr "%s さんへファイルを送信できません (JID が間違っています)"
+
+#: ../libpurple/protocols/jabber/si.c:834
+#, c-format
+msgid "Unable to send file to %s, user is not online"
+msgstr "%s さんへファイルを送信できません (ユーザはオフラインです)"
+
+#: ../libpurple/protocols/jabber/si.c:836
+#, c-format
+msgid "Unable to send file to %s, not subscribed to user presence"
+msgstr ""
+"%s さんへファイルを送信できません (ユーザの在席情報が登録されていません)"
+
+#: ../libpurple/protocols/jabber/si.c:851
+#, c-format
+msgid "Please select which resource of %s you would like to send a file to"
+msgstr "ファイルとして送信する %s のリソースを選択して下さい"
+
+#: ../libpurple/protocols/jabber/si.c:867
+msgid "Select a Resource"
+msgstr "リソースの選択"
+
 #: ../libpurple/protocols/msn/dialog.c:110
 #, c-format
 msgid "Buddy list synchronization issue in %s (%s)"
@@ -5197,9 +5393,10 @@
 msgstr "サーバがとてもビジーです"
 
 #: ../libpurple/protocols/msn/error.c:222
-#: ../libpurple/protocols/oscar/oscar.c:1357
-#: ../libpurple/protocols/silc/ops.c:1718 ../libpurple/protocols/toc/toc.c:728
-#: ../libpurple/proxy.c:1351
+#: ../libpurple/protocols/oscar/oscar.c:1381
+#: ../libpurple/protocols/silc/silc.c:233
+#: ../libpurple/protocols/silc10/ops.c:1709
+#: ../libpurple/protocols/toc/toc.c:728 ../libpurple/proxy.c:1363
 msgid "Authentication failed"
 msgstr "認証に失敗しました"
 
@@ -5233,39 +5430,39 @@
 msgid "MSN Error: %s\n"
 msgstr "MSN エラー: %s\n"
 
-#: ../libpurple/protocols/msn/msn.c:112
+#: ../libpurple/protocols/msn/msn.c:121
 msgid "You have just sent a Nudge!"
 msgstr "今、合図を送りました!"
 
-#: ../libpurple/protocols/msn/msn.c:137
+#: ../libpurple/protocols/msn/msn.c:146
 msgid "Your new MSN friendly name is too long."
 msgstr "新しい MSN の公開名が長すぎます"
 
-#: ../libpurple/protocols/msn/msn.c:245
+#: ../libpurple/protocols/msn/msn.c:254
 msgid "Set your friendly name."
 msgstr "公開する名前をセットして下さい"
 
-#: ../libpurple/protocols/msn/msn.c:246
+#: ../libpurple/protocols/msn/msn.c:255
 msgid "This is the name that other MSN buddies will see you as."
 msgstr "MSN の他の仲間があなたを見るときに表示される名前です:"
 
-#: ../libpurple/protocols/msn/msn.c:264
+#: ../libpurple/protocols/msn/msn.c:273
 msgid "Set your home phone number."
 msgstr "自宅の電話番号を設定して下さい"
 
-#: ../libpurple/protocols/msn/msn.c:281
+#: ../libpurple/protocols/msn/msn.c:290
 msgid "Set your work phone number."
 msgstr "オフィスの電話番号を設定して下さい"
 
-#: ../libpurple/protocols/msn/msn.c:298
+#: ../libpurple/protocols/msn/msn.c:307
 msgid "Set your mobile phone number."
 msgstr "携帯電話の番号を設定して下さい"
 
-#: ../libpurple/protocols/msn/msn.c:313
+#: ../libpurple/protocols/msn/msn.c:322
 msgid "Allow MSN Mobile pages?"
 msgstr "MSN モバイル・ページを許可しますか?"
 
-#: ../libpurple/protocols/msn/msn.c:314
+#: ../libpurple/protocols/msn/msn.c:323
 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?"
@@ -5273,317 +5470,321 @@
 "仲間が携帯電話などのモバイル機器へ MSN モバイル・ページを送信することを許可し"
 "ますか?"
 
-#: ../libpurple/protocols/msn/msn.c:320
+#: ../libpurple/protocols/msn/msn.c:329
 msgid "Allow"
 msgstr "許可する"
 
-#: ../libpurple/protocols/msn/msn.c:321
+#: ../libpurple/protocols/msn/msn.c:330
 msgid "Disallow"
 msgstr "許可しない"
 
-#: ../libpurple/protocols/msn/msn.c:337
+#: ../libpurple/protocols/msn/msn.c:346
 msgid "This Hotmail account may not be active."
 msgstr "この Hotmail のアカウントは有効でないようです。"
 
-#: ../libpurple/protocols/msn/msn.c:363
+#: ../libpurple/protocols/msn/msn.c:372
 msgid "Send a mobile message."
 msgstr "モバイル・メッセージを送信します。"
 
-#: ../libpurple/protocols/msn/msn.c:365
+#: ../libpurple/protocols/msn/msn.c:374
 msgid "Page"
 msgstr "ページ"
 
-#: ../libpurple/protocols/msn/msn.c:529
+#: ../libpurple/protocols/msn/msn.c:521
 msgid "Has you"
 msgstr "あなたを仲間リストに登録しているか"
 
-#: ../libpurple/protocols/msn/msn.c:559 ../libpurple/protocols/msn/state.c:33
-#: ../libpurple/protocols/yahoo/yahoo.c:2882
-#: ../libpurple/protocols/yahoo/yahoo.c:3491
+#: ../libpurple/protocols/msn/msn.c:551 ../libpurple/protocols/msn/state.c:33
+#: ../libpurple/protocols/yahoo/yahoo.c:2895
+#: ../libpurple/protocols/yahoo/yahoo.c:3504
 msgid "Be Right Back"
 msgstr "もうすぐ帰ってきます"
 
-#: ../libpurple/protocols/msn/msn.c:563 ../libpurple/protocols/msn/state.c:31
+#: ../libpurple/protocols/msn/msn.c:555 ../libpurple/protocols/msn/state.c:31
 #: ../libpurple/protocols/novell/novell.c:2822
 #: ../libpurple/protocols/novell/novell.c:2952
 #: ../libpurple/protocols/silc/buddy.c:1480
-#: ../libpurple/protocols/silc/silc.c:47
-#: ../libpurple/protocols/yahoo/yahoo.c:2884
-#: ../libpurple/protocols/yahoo/yahoo.c:3494
+#: ../libpurple/protocols/silc/silc.c:56
+#: ../libpurple/protocols/silc10/buddy.c:1480
+#: ../libpurple/protocols/silc10/silc.c:47
+#: ../libpurple/protocols/yahoo/yahoo.c:2897
+#: ../libpurple/protocols/yahoo/yahoo.c:3507
 msgid "Busy"
 msgstr "取り込み中です"
 
-#: ../libpurple/protocols/msn/msn.c:567
-#: ../libpurple/protocols/yahoo/yahoo.c:2892
-#: ../libpurple/protocols/yahoo/yahoo.c:3506
+#: ../libpurple/protocols/msn/msn.c:559
+#: ../libpurple/protocols/yahoo/yahoo.c:2905
+#: ../libpurple/protocols/yahoo/yahoo.c:3519
 msgid "On the Phone"
 msgstr "電話中です"
 
-#: ../libpurple/protocols/msn/msn.c:571
-#: ../libpurple/protocols/yahoo/yahoo.c:2896
-#: ../libpurple/protocols/yahoo/yahoo.c:3512
+#: ../libpurple/protocols/msn/msn.c:563
+#: ../libpurple/protocols/yahoo/yahoo.c:2909
+#: ../libpurple/protocols/yahoo/yahoo.c:3525
 msgid "Out to Lunch"
 msgstr "食事に出かけています"
 
-#: ../libpurple/protocols/msn/msn.c:599
+#: ../libpurple/protocols/msn/msn.c:591
 msgid "Set Friendly Name..."
 msgstr "公開する名前の設定..."
 
-#: ../libpurple/protocols/msn/msn.c:604
+#: ../libpurple/protocols/msn/msn.c:596
 msgid "Set Home Phone Number..."
 msgstr "自宅の電話番号の設定..."
 
-#: ../libpurple/protocols/msn/msn.c:608
+#: ../libpurple/protocols/msn/msn.c:600
 msgid "Set Work Phone Number..."
 msgstr "オフィスの電話番号の設定..."
 
-#: ../libpurple/protocols/msn/msn.c:612
+#: ../libpurple/protocols/msn/msn.c:604
 msgid "Set Mobile Phone Number..."
 msgstr "携帯の電話番号の設定..."
 
-#: ../libpurple/protocols/msn/msn.c:618
+#: ../libpurple/protocols/msn/msn.c:610
 msgid "Enable/Disable Mobile Devices..."
 msgstr "モバイル機器の有効/無効..."
 
-#: ../libpurple/protocols/msn/msn.c:623
+#: ../libpurple/protocols/msn/msn.c:615
 msgid "Allow/Disallow Mobile Pages..."
 msgstr "モバイル・ページの許可/非許可...."
 
-#: ../libpurple/protocols/msn/msn.c:633
+#: ../libpurple/protocols/msn/msn.c:626
 msgid "Open Hotmail Inbox"
 msgstr "Hotmail の受信箱を開く"
 
-#: ../libpurple/protocols/msn/msn.c:657
+#: ../libpurple/protocols/msn/msn.c:650
 msgid "Send to Mobile"
 msgstr "モバイル機器へ送信"
 
-#: ../libpurple/protocols/msn/msn.c:667
+#: ../libpurple/protocols/msn/msn.c:660
 #: ../libpurple/protocols/novell/novell.c:3408
 msgid "Initiate _Chat"
 msgstr "チャットの開始(_C)"
 
-#: ../libpurple/protocols/msn/msn.c:705
+#: ../libpurple/protocols/msn/msn.c:698
 msgid "SSL support is needed for MSN. Please install a supported SSL library."
 msgstr ""
 "MSN では SSL サポートが必要です (サポートする SSL ライブラリをインストールし"
 "て下さい)"
 
-#: ../libpurple/protocols/msn/msn.c:730
+#: ../libpurple/protocols/msn/msn.c:723
 msgid "Failed to connect to server."
 msgstr "サーバへの接続に失敗しました"
 
-#: ../libpurple/protocols/msn/msn.c:1450 ../libpurple/protocols/msn/msn.c:1795
+#: ../libpurple/protocols/msn/msn.c:1479 ../libpurple/protocols/msn/msn.c:1827
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:784
 msgid "Error retrieving profile"
 msgstr "プロフィールを取得する際にエラー"
 
-#: ../libpurple/protocols/msn/msn.c:1521 ../pidgin/plugins/convcolors.c:309
+#: ../libpurple/protocols/msn/msn.c:1550 ../pidgin/plugins/convcolors.c:309
 #: ../pidgin/plugins/pidginrc.c:448
 msgid "General"
 msgstr "全般"
 
-#: ../libpurple/protocols/msn/msn.c:1528
-#: ../libpurple/protocols/oscar/oscar.c:3736
+#: ../libpurple/protocols/msn/msn.c:1557
+#: ../libpurple/protocols/oscar/oscar.c:3768
 #: ../libpurple/protocols/qq/buddy_info.c:45
 #: ../libpurple/protocols/qq/qq.c:219
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1057
 msgid "Age"
 msgstr "年齢"
 
-#: ../libpurple/protocols/msn/msn.c:1530
+#: ../libpurple/protocols/msn/msn.c:1559
 #: ../libpurple/protocols/qq/buddy_info.c:51
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1072
 msgid "Occupation"
 msgstr "職業"
 
-#: ../libpurple/protocols/msn/msn.c:1531
+#: ../libpurple/protocols/msn/msn.c:1560
 #: ../libpurple/protocols/novell/novell.c:1478
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1052
 #: ../libpurple/protocols/zephyr/zephyr.c:798
-#: ../libpurple/protocols/zephyr/zephyr.c:1214
+#: ../libpurple/protocols/zephyr/zephyr.c:1215
 msgid "Location"
 msgstr "場所"
 
-#: ../libpurple/protocols/msn/msn.c:1536 ../libpurple/protocols/msn/msn.c:1728
-#: ../libpurple/protocols/msn/msn.c:1734 ../libpurple/protocols/msn/msn.c:1741
+#: ../libpurple/protocols/msn/msn.c:1565 ../libpurple/protocols/msn/msn.c:1757
+#: ../libpurple/protocols/msn/msn.c:1763 ../libpurple/protocols/msn/msn.c:1770
 msgid "Hobbies and Interests"
 msgstr "趣味と興味のあること"
 
-#: ../libpurple/protocols/msn/msn.c:1542 ../libpurple/protocols/msn/msn.c:1662
-#: ../libpurple/protocols/msn/msn.c:1668 ../libpurple/protocols/msn/msn.c:1675
-#: ../libpurple/protocols/msn/msn.c:1683 ../libpurple/protocols/msn/msn.c:1690
+#: ../libpurple/protocols/msn/msn.c:1571 ../libpurple/protocols/msn/msn.c:1691
+#: ../libpurple/protocols/msn/msn.c:1697 ../libpurple/protocols/msn/msn.c:1704
+#: ../libpurple/protocols/msn/msn.c:1712 ../libpurple/protocols/msn/msn.c:1719
 msgid "A Little About Me"
 msgstr "ちょっとしたプロフィール"
 
-#: ../libpurple/protocols/msn/msn.c:1559
+#: ../libpurple/protocols/msn/msn.c:1588
 msgid "Social"
 msgstr "パーティ"
 
-#: ../libpurple/protocols/msn/msn.c:1561
+#: ../libpurple/protocols/msn/msn.c:1590
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1062
 msgid "Marital Status"
 msgstr "既婚/未婚"
 
-#: ../libpurple/protocols/msn/msn.c:1562
+#: ../libpurple/protocols/msn/msn.c:1591
 msgid "Interests"
 msgstr "趣味"
 
-#: ../libpurple/protocols/msn/msn.c:1563
+#: ../libpurple/protocols/msn/msn.c:1592
 msgid "Pets"
 msgstr "ペット"
 
-#: ../libpurple/protocols/msn/msn.c:1564
+#: ../libpurple/protocols/msn/msn.c:1593
 msgid "Hometown"
 msgstr "出身地"
 
-#: ../libpurple/protocols/msn/msn.c:1565
+#: ../libpurple/protocols/msn/msn.c:1594
 msgid "Places Lived"
 msgstr "現住所"
 
-#: ../libpurple/protocols/msn/msn.c:1566
+#: ../libpurple/protocols/msn/msn.c:1595
 msgid "Fashion"
 msgstr "ファッション"
 
-#: ../libpurple/protocols/msn/msn.c:1567
+#: ../libpurple/protocols/msn/msn.c:1596
 msgid "Humor"
 msgstr "ユーモア"
 
-#: ../libpurple/protocols/msn/msn.c:1568
+#: ../libpurple/protocols/msn/msn.c:1597
 msgid "Music"
 msgstr "音楽"
 
-#: ../libpurple/protocols/msn/msn.c:1569 ../libpurple/protocols/msn/msn.c:1750
-#: ../libpurple/protocols/msn/msn.c:1756
+#: ../libpurple/protocols/msn/msn.c:1598 ../libpurple/protocols/msn/msn.c:1779
+#: ../libpurple/protocols/msn/msn.c:1785
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1114
 msgid "Favorite Quote"
 msgstr "座右の銘"
 
-#: ../libpurple/protocols/msn/msn.c:1586
+#: ../libpurple/protocols/msn/msn.c:1615
 msgid "Contact Info"
 msgstr "連絡先の情報"
 
-#: ../libpurple/protocols/msn/msn.c:1587
+#: ../libpurple/protocols/msn/msn.c:1616
 msgid "Personal"
 msgstr "個人"
 
-#: ../libpurple/protocols/msn/msn.c:1590
+#: ../libpurple/protocols/msn/msn.c:1619
 msgid "Significant Other"
 msgstr "大切な人"
 
-#: ../libpurple/protocols/msn/msn.c:1591
+#: ../libpurple/protocols/msn/msn.c:1620
 msgid "Home Phone"
 msgstr "ホームページ"
 
-#: ../libpurple/protocols/msn/msn.c:1592
+#: ../libpurple/protocols/msn/msn.c:1621
 msgid "Home Phone 2"
 msgstr "ホームページ2"
 
-#: ../libpurple/protocols/msn/msn.c:1593
-#: ../libpurple/protocols/oscar/oscar.c:3774
+#: ../libpurple/protocols/msn/msn.c:1622
+#: ../libpurple/protocols/oscar/oscar.c:3806
 msgid "Home Address"
 msgstr "自宅の住所"
 
-#: ../libpurple/protocols/msn/msn.c:1594
+#: ../libpurple/protocols/msn/msn.c:1623
 msgid "Personal Mobile"
 msgstr "携帯 (個人)"
 
-#: ../libpurple/protocols/msn/msn.c:1595
+#: ../libpurple/protocols/msn/msn.c:1624
 msgid "Home Fax"
 msgstr "自宅の FAX"
 
-#: ../libpurple/protocols/msn/msn.c:1596
+#: ../libpurple/protocols/msn/msn.c:1625
 msgid "Personal E-Mail"
 msgstr "個人の E-メール"
 
-#: ../libpurple/protocols/msn/msn.c:1597
+#: ../libpurple/protocols/msn/msn.c:1626
 msgid "Personal IM"
 msgstr "個人の IM"
 
-#: ../libpurple/protocols/msn/msn.c:1599
+#: ../libpurple/protocols/msn/msn.c:1628
 msgid "Anniversary"
 msgstr "記念日"
 
 #. Business
-#: ../libpurple/protocols/msn/msn.c:1615
+#: ../libpurple/protocols/msn/msn.c:1644
 msgid "Work"
 msgstr "職種"
 
-#: ../libpurple/protocols/msn/msn.c:1617
-#: ../libpurple/protocols/silc/ops.c:1044
+#: ../libpurple/protocols/msn/msn.c:1646
+#: ../libpurple/protocols/silc/ops.c:1010
+#: ../libpurple/protocols/silc10/ops.c:1044
 msgid "Job Title"
 msgstr "肩書"
 
-#: ../libpurple/protocols/msn/msn.c:1618
-#: ../libpurple/protocols/oscar/oscar.c:3795
+#: ../libpurple/protocols/msn/msn.c:1647
+#: ../libpurple/protocols/oscar/oscar.c:3827
 msgid "Company"
 msgstr "勤務先"
 
-#: ../libpurple/protocols/msn/msn.c:1619
+#: ../libpurple/protocols/msn/msn.c:1648
 #: ../libpurple/protocols/novell/novell.c:1480
 msgid "Department"
 msgstr "部署"
 
-#: ../libpurple/protocols/msn/msn.c:1620
+#: ../libpurple/protocols/msn/msn.c:1649
 msgid "Profession"
 msgstr "職業"
 
-#: ../libpurple/protocols/msn/msn.c:1621
+#: ../libpurple/protocols/msn/msn.c:1650
 msgid "Work Phone"
 msgstr "勤務先の電話番号"
 
-#: ../libpurple/protocols/msn/msn.c:1622
+#: ../libpurple/protocols/msn/msn.c:1651
 msgid "Work Phone 2"
 msgstr "勤務先の電話番号2"
 
-#: ../libpurple/protocols/msn/msn.c:1623
-#: ../libpurple/protocols/oscar/oscar.c:3787
+#: ../libpurple/protocols/msn/msn.c:1652
+#: ../libpurple/protocols/oscar/oscar.c:3819
 msgid "Work Address"
 msgstr "勤務先の住所"
 
-#: ../libpurple/protocols/msn/msn.c:1624
+#: ../libpurple/protocols/msn/msn.c:1653
 msgid "Work Mobile"
 msgstr "携帯 (仕事)"
 
-#: ../libpurple/protocols/msn/msn.c:1625
+#: ../libpurple/protocols/msn/msn.c:1654
 msgid "Work Pager"
 msgstr "Work Pager"
 
-#: ../libpurple/protocols/msn/msn.c:1626
+#: ../libpurple/protocols/msn/msn.c:1655
 msgid "Work Fax"
 msgstr "勤務先の FAX"
 
-#: ../libpurple/protocols/msn/msn.c:1627
+#: ../libpurple/protocols/msn/msn.c:1656
 msgid "Work E-Mail"
 msgstr "勤務先の E-メール"
 
-#: ../libpurple/protocols/msn/msn.c:1628
+#: ../libpurple/protocols/msn/msn.c:1657
 msgid "Work IM"
 msgstr "勤務先の IM"
 
-#: ../libpurple/protocols/msn/msn.c:1629
+#: ../libpurple/protocols/msn/msn.c:1658
 msgid "Start Date"
 msgstr "開始日"
 
-#: ../libpurple/protocols/msn/msn.c:1699 ../libpurple/protocols/msn/msn.c:1705
-#: ../libpurple/protocols/msn/msn.c:1712 ../libpurple/protocols/msn/msn.c:1719
+#: ../libpurple/protocols/msn/msn.c:1728 ../libpurple/protocols/msn/msn.c:1734
+#: ../libpurple/protocols/msn/msn.c:1741 ../libpurple/protocols/msn/msn.c:1748
 msgid "Favorite Things"
 msgstr "お気に入りのもの"
 
-#: ../libpurple/protocols/msn/msn.c:1764
+#: ../libpurple/protocols/msn/msn.c:1793
 msgid "Last Updated"
 msgstr "最終更新日"
 
-#: ../libpurple/protocols/msn/msn.c:1775
+#: ../libpurple/protocols/msn/msn.c:1804
 #: ../libpurple/protocols/qq/buddy_info.c:60
-#: ../libpurple/protocols/silc/ops.c:1060
+#: ../libpurple/protocols/silc/ops.c:1026
+#: ../libpurple/protocols/silc10/ops.c:1060
 msgid "Homepage"
 msgstr "ホームページ"
 
-#: ../libpurple/protocols/msn/msn.c:1796
+#: ../libpurple/protocols/msn/msn.c:1828
 msgid "The user has not created a public profile."
 msgstr "このユーザはプロフィールを公開していません"
 
-#: ../libpurple/protocols/msn/msn.c:1797
+#: ../libpurple/protocols/msn/msn.c:1829
 msgid ""
 "MSN reported not being able to find the user's profile. This either means "
 "that the user does not exist, or that the user exists but has not created a "
@@ -5593,7 +5794,7 @@
 "ユーザが存在しないか、あるいはユーザは存在しますがプロフィールは公開していな"
 "いかのどちらかです。"
 
-#: ../libpurple/protocols/msn/msn.c:1801
+#: ../libpurple/protocols/msn/msn.c:1833
 msgid ""
 "Could not find any information in the user's profile. The user most likely "
 "does not exist."
@@ -5601,7 +5802,7 @@
 "ユーザのプロフィールから情報を取得できませんでした。そのユーザはおそらく存在"
 "していないと思われます。"
 
-#: ../libpurple/protocols/msn/msn.c:1809
+#: ../libpurple/protocols/msn/msn.c:1841
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1216
 msgid "Profile URL"
 msgstr "プロフィールの URL"
@@ -5616,19 +5817,19 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/msn/msn.c:2095 ../libpurple/protocols/msn/msn.c:2097
+#: ../libpurple/protocols/msn/msn.c:2127 ../libpurple/protocols/msn/msn.c:2129
 msgid "MSN Protocol Plugin"
 msgstr "MSN プロトコルのプラグイン"
 
-#: ../libpurple/protocols/msn/msn.c:2131
+#: ../libpurple/protocols/msn/msn.c:2163
 msgid "Use HTTP Method"
 msgstr "HTTP メソッドを利用する"
 
-#: ../libpurple/protocols/msn/msn.c:2136
+#: ../libpurple/protocols/msn/msn.c:2168
 msgid "Show custom smileys"
 msgstr "独自のスマイリーを表示する"
 
-#: ../libpurple/protocols/msn/msn.c:2144
+#: ../libpurple/protocols/msn/msn.c:2176
 msgid "nudge: nudge a user to get their attention"
 msgstr "合図: ユーザに向けて警告音を鳴らす"
 
@@ -5659,7 +5860,7 @@
 
 #: ../libpurple/protocols/msn/notification.c:184
 #: ../libpurple/protocols/msn/notification.c:532
-#: ../libpurple/protocols/msn/session.c:329
+#: ../libpurple/protocols/msn/session.c:330
 msgid "Unknown error."
 msgstr "原因不明のエラーです"
 
@@ -5697,15 +5898,15 @@
 msgid "Service Temporarily Unavailable."
 msgstr "サービスを一時的に利用できません"
 
-#: ../libpurple/protocols/msn/notification.c:823
+#: ../libpurple/protocols/msn/notification.c:851
 msgid "Unable to rename group"
 msgstr "グループ名を変更できません"
 
-#: ../libpurple/protocols/msn/notification.c:878
+#: ../libpurple/protocols/msn/notification.c:906
 msgid "Unable to delete group"
 msgstr "グループを削除できません"
 
-#: ../libpurple/protocols/msn/notification.c:1314
+#: ../libpurple/protocols/msn/notification.c:1325
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -5758,7 +5959,7 @@
 msgstr "HTTP を解析する際にエラーが発生しました"
 
 #: ../libpurple/protocols/msn/session.c:307
-#: ../libpurple/protocols/oscar/oscar.c:3448
+#: ../libpurple/protocols/oscar/oscar.c:3480
 #: ../libpurple/protocols/yahoo/yahoo.c:202
 msgid "You have signed on from another location."
 msgstr "別の場所からサイン・インしています"
@@ -5773,36 +5974,36 @@
 msgid "The MSN servers are going down temporarily."
 msgstr "MSN サーバが一時的にダウンしています"
 
-#: ../libpurple/protocols/msn/session.c:319
+#: ../libpurple/protocols/msn/session.c:320
 #, c-format
 msgid "Unable to authenticate: %s"
 msgstr "認証できません: %s"
 
-#: ../libpurple/protocols/msn/session.c:324
+#: ../libpurple/protocols/msn/session.c:325
 msgid ""
 "Your MSN buddy list is temporarily unavailable. Please wait and try again."
 msgstr ""
 "お使いの MSN 仲間リストが一時的に利用不可になっています。時間をあけて後で試し"
 "てみて下さい。"
 
-#: ../libpurple/protocols/msn/session.c:345
-#: ../libpurple/protocols/msn/session.c:347
+#: ../libpurple/protocols/msn/session.c:346
+#: ../libpurple/protocols/msn/session.c:348
 msgid "Handshaking"
 msgstr "通信を接続しています"
 
-#: ../libpurple/protocols/msn/session.c:348
+#: ../libpurple/protocols/msn/session.c:349
 msgid "Starting authentication"
 msgstr "認証を開始しています"
 
-#: ../libpurple/protocols/msn/session.c:349
+#: ../libpurple/protocols/msn/session.c:350
 msgid "Getting cookie"
 msgstr "クッキーを取得しています"
 
-#: ../libpurple/protocols/msn/session.c:351
+#: ../libpurple/protocols/msn/session.c:352
 msgid "Sending cookie"
 msgstr "クッキーを送信しています"
 
-#: ../libpurple/protocols/msn/session.c:352
+#: ../libpurple/protocols/msn/session.c:353
 msgid "Retrieving buddy list"
 msgstr "仲間リストを受信しています"
 
@@ -5840,14 +6041,22 @@
 
 #: ../libpurple/protocols/msn/switchboard.c:424
 msgid ""
+"Message could not be sent because we wer unable to establish a session with "
+"the server. This is likely a server problem, try again in a few minutes:"
+msgstr ""
+"サーバとの接続を確立できないのでメッセージを送信できませんでした (これはおそ"
+"らくサーバ側の問題と思われます; 数分後にもう一度試してみて下さい):"
+
+#: ../libpurple/protocols/msn/switchboard.c:431
+msgid ""
 "Message could not be sent because an error with the switchboard occurred:"
 msgstr "交換機系の接続エラーが発生したので、メッセージを送信できませんでした:"
 
-#: ../libpurple/protocols/msn/switchboard.c:432
+#: ../libpurple/protocols/msn/switchboard.c:439
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr "不明なエラーの発生により、メッセージは送信されませんでした:"
 
-#: ../libpurple/protocols/msn/switchboard.c:956
+#: ../libpurple/protocols/msn/switchboard.c:963
 #, c-format
 msgid "%s just sent you a Nudge!"
 msgstr "%s さんが合図を送りたがっています!"
@@ -5871,87 +6080,87 @@
 msgid "The screen name specified is invalid."
 msgstr "指定したスクリーン名が間違っています"
 
-#: ../libpurple/protocols/novell/nmuser.c:1878
+#: ../libpurple/protocols/novell/nmuser.c:1864
 msgid "Required parameters not passed in"
 msgstr "必要なパラメータが引き渡されていません"
 
-#: ../libpurple/protocols/novell/nmuser.c:1881
+#: ../libpurple/protocols/novell/nmuser.c:1867
 msgid "Unable to write to network"
 msgstr "ネットワークへ書き込めません"
 
-#: ../libpurple/protocols/novell/nmuser.c:1884
+#: ../libpurple/protocols/novell/nmuser.c:1870
 msgid "Unable to read from network"
 msgstr "ネットワークから読み込めません"
 
-#: ../libpurple/protocols/novell/nmuser.c:1887
+#: ../libpurple/protocols/novell/nmuser.c:1873
 msgid "Error communicating with server"
 msgstr "サーバと通信する際にエラーが発生しました"
 
-#: ../libpurple/protocols/novell/nmuser.c:1891
+#: ../libpurple/protocols/novell/nmuser.c:1877
 msgid "Conference not found"
 msgstr "会議が見つかりません"
 
-#: ../libpurple/protocols/novell/nmuser.c:1894
+#: ../libpurple/protocols/novell/nmuser.c:1880
 msgid "Conference does not exist"
 msgstr "会議が存在しません"
 
-#: ../libpurple/protocols/novell/nmuser.c:1898
+#: ../libpurple/protocols/novell/nmuser.c:1884
 msgid "A folder with that name already exists"
 msgstr "その名前のフォルダは既に存在します"
 
-#: ../libpurple/protocols/novell/nmuser.c:1901
+#: ../libpurple/protocols/novell/nmuser.c:1887
 msgid "Not supported"
 msgstr "サポートしていません"
 
-#: ../libpurple/protocols/novell/nmuser.c:1905
+#: ../libpurple/protocols/novell/nmuser.c:1891
 msgid "Password has expired"
 msgstr "パスワードの有効期限が切れています"
 
-#: ../libpurple/protocols/novell/nmuser.c:1908
+#: ../libpurple/protocols/novell/nmuser.c:1894
 msgid "Incorrect password"
 msgstr "パスワードが間違っています"
 
-#: ../libpurple/protocols/novell/nmuser.c:1911
+#: ../libpurple/protocols/novell/nmuser.c:1897
 msgid "User not found"
 msgstr "ユーザが見つかりません"
 
-#: ../libpurple/protocols/novell/nmuser.c:1914
+#: ../libpurple/protocols/novell/nmuser.c:1900
 msgid "Account has been disabled"
 msgstr "アカウントが無効になっています"
 
-#: ../libpurple/protocols/novell/nmuser.c:1917
+#: ../libpurple/protocols/novell/nmuser.c:1903
 msgid "The server could not access the directory"
 msgstr "サーバはディレクトリにアクセスできませんでした"
 
-#: ../libpurple/protocols/novell/nmuser.c:1920
+#: ../libpurple/protocols/novell/nmuser.c:1906
 msgid "Your system administrator has disabled this operation"
 msgstr "システム管理者がこの操作を無効にしています"
 
-#: ../libpurple/protocols/novell/nmuser.c:1923
+#: ../libpurple/protocols/novell/nmuser.c:1909
 msgid "The server is unavailable; try again later"
 msgstr "サーバを利用できません; あとでもう一度試して下さい"
 
-#: ../libpurple/protocols/novell/nmuser.c:1926
+#: ../libpurple/protocols/novell/nmuser.c:1912
 msgid "Cannot add a contact to the same folder twice"
 msgstr "同じフォルダへコンタクトを二回追加できません"
 
-#: ../libpurple/protocols/novell/nmuser.c:1929
+#: ../libpurple/protocols/novell/nmuser.c:1915
 msgid "Cannot add yourself"
 msgstr "あなた自身を追加できません"
 
-#: ../libpurple/protocols/novell/nmuser.c:1932
+#: ../libpurple/protocols/novell/nmuser.c:1918
 msgid "Master archive is misconfigured"
 msgstr "マスター・アーカイブの設定が間違っています"
 
-#: ../libpurple/protocols/novell/nmuser.c:1936
+#: ../libpurple/protocols/novell/nmuser.c:1922
 msgid "Incorrect screen name or password"
 msgstr "スクリーン名またはパスワードが間違っています"
 
-#: ../libpurple/protocols/novell/nmuser.c:1939
+#: ../libpurple/protocols/novell/nmuser.c:1925
 msgid "Could not recognize the host of the screen name you entered"
 msgstr "入力したスクリーン名のホストを認識できませんでした"
 
-#: ../libpurple/protocols/novell/nmuser.c:1942
+#: ../libpurple/protocols/novell/nmuser.c:1928
 msgid ""
 "Your account has been disabled because too many incorrect passwords were "
 "entered"
@@ -5959,41 +6168,41 @@
 "間違ったパスワードが複数回が入力されたので、お使いのアカウントを無効にしてい"
 "ます"
 
-#: ../libpurple/protocols/novell/nmuser.c:1945
+#: ../libpurple/protocols/novell/nmuser.c:1931
 msgid "You cannot add the same person twice to a conversation"
 msgstr "同一人物を二回会話へ追加できません"
 
-#: ../libpurple/protocols/novell/nmuser.c:1949
+#: ../libpurple/protocols/novell/nmuser.c:1935
 msgid "You have reached your limit for the number of contacts allowed"
 msgstr "コンタクト可能な数の最大値に到達しました"
 
-#: ../libpurple/protocols/novell/nmuser.c:1952
+#: ../libpurple/protocols/novell/nmuser.c:1938
 msgid "You have entered an incorrect screen name"
 msgstr "間違ったスクリーン名を入力しました"
 
-#: ../libpurple/protocols/novell/nmuser.c:1955
+#: ../libpurple/protocols/novell/nmuser.c:1941
 msgid "An error occurred while updating the directory"
 msgstr "フォルダを更新する際にエラーが発生しました。"
 
-#: ../libpurple/protocols/novell/nmuser.c:1958
+#: ../libpurple/protocols/novell/nmuser.c:1944
 msgid "Incompatible protocol version"
 msgstr "互換性のないバージョンのプロトコル"
 
-#: ../libpurple/protocols/novell/nmuser.c:1961
+#: ../libpurple/protocols/novell/nmuser.c:1947
 msgid "The user has blocked you"
 msgstr "ユーザはあなたをブロックしています"
 
-#: ../libpurple/protocols/novell/nmuser.c:1964
+#: ../libpurple/protocols/novell/nmuser.c:1950
 msgid ""
 "This evaluation version does not allow more than ten users to log in at one "
 "time"
 msgstr "この評価版では一度に 10 ユーザ以上はログインできません"
 
-#: ../libpurple/protocols/novell/nmuser.c:1967
+#: ../libpurple/protocols/novell/nmuser.c:1953
 msgid "The user is either offline or you are blocked"
 msgstr "ユーザはオフラインか、あるいはブロックされています"
 
-#: ../libpurple/protocols/novell/nmuser.c:1970
+#: ../libpurple/protocols/novell/nmuser.c:1956
 #, c-format
 msgid "Unknown error: 0x%X"
 msgstr "不明なエラー: 0x%X"
@@ -6223,19 +6432,19 @@
 msgstr "サーバのポート"
 
 #: ../libpurple/protocols/oscar/flap_connection.c:379
-#: ../libpurple/protocols/yahoo/yahoo.c:2294
-#: ../libpurple/protocols/yahoo/yahoo.c:2453
+#: ../libpurple/protocols/yahoo/yahoo.c:2292
+#: ../libpurple/protocols/yahoo/yahoo.c:2459
 #: ../libpurple/protocols/yahoo/ycht.c:481 ../libpurple/proxy.c:580
-#: ../libpurple/proxy.c:1085 ../libpurple/proxy.c:1196
-#: ../libpurple/proxy.c:1296 ../libpurple/proxy.c:1424
+#: ../libpurple/proxy.c:1099 ../libpurple/proxy.c:1208
+#: ../libpurple/proxy.c:1308 ../libpurple/proxy.c:1436
 msgid "Server closed the connection."
 msgstr "サーバが接続を閉じました"
 
 #: ../libpurple/protocols/oscar/flap_connection.c:381
-#: ../libpurple/protocols/yahoo/yahoo.c:2288
-#: ../libpurple/protocols/yahoo/yahoo.c:2447 ../libpurple/proxy.c:592
-#: ../libpurple/proxy.c:1097 ../libpurple/proxy.c:1208
-#: ../libpurple/proxy.c:1308 ../libpurple/proxy.c:1436
+#: ../libpurple/protocols/yahoo/yahoo.c:2286
+#: ../libpurple/protocols/yahoo/yahoo.c:2453 ../libpurple/proxy.c:592
+#: ../libpurple/proxy.c:1111 ../libpurple/proxy.c:1220
+#: ../libpurple/proxy.c:1320 ../libpurple/proxy.c:1448
 #, c-format
 msgid ""
 "Lost connection with server:\n"
@@ -6245,21 +6454,12 @@
 "%s"
 
 #: ../libpurple/protocols/oscar/flap_connection.c:384
-#: ../libpurple/proxy.c:1114 ../libpurple/proxy.c:1221
-#: ../libpurple/proxy.c:1320 ../libpurple/proxy.c:1392
-#: ../libpurple/proxy.c:1449
+#: ../libpurple/proxy.c:1128 ../libpurple/proxy.c:1233
+#: ../libpurple/proxy.c:1332 ../libpurple/proxy.c:1404
+#: ../libpurple/proxy.c:1461
 msgid "Received invalid data on connection with server."
 msgstr "サーバと接続する際に不正なデータを受け取りました"
 
-#: ../libpurple/protocols/oscar/flap_connection.c:386
-#, c-format
-msgid ""
-"Could not establish a connection with the server:\n"
-"%s"
-msgstr ""
-"サーバとの接続を確立できませんでした:\n"
-"%s"
-
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -6291,8 +6491,8 @@
 msgstr "ICQ プロトコル・プラグイン"
 
 #: ../libpurple/protocols/oscar/libicq.c:147
-#: ../libpurple/protocols/yahoo/yahoo.c:4098
-#: ../libpurple/protocols/zephyr/zephyr.c:2996
+#: ../libpurple/protocols/yahoo/yahoo.c:4111
+#: ../libpurple/protocols/zephyr/zephyr.c:2997
 msgid "Encoding"
 msgstr "エンコーディング"
 
@@ -6422,7 +6622,7 @@
 msgid "Not while on AOL"
 msgstr "AOL に居る時はできません"
 
-#: ../libpurple/protocols/oscar/oscar.c:329
+#: ../libpurple/protocols/oscar/oscar.c:348
 msgid ""
 "(There was an error receiving this message.  The buddy you are speaking with "
 "is probably using a different encoding than expected.  If you know what "
@@ -6434,7 +6634,7 @@
 "ディングがわかるのであれば、アカウント・ダイアログの拡張オプションで指定して"
 "みて下さい。)"
 
-#: ../libpurple/protocols/oscar/oscar.c:438
+#: ../libpurple/protocols/oscar/oscar.c:457
 #, c-format
 msgid ""
 "(There was an error receiving this message.  Either you and %s have "
@@ -6445,144 +6645,146 @@
 "と思われます。)"
 
 #. Label
-#: ../libpurple/protocols/oscar/oscar.c:620 ../pidgin/gtkutils.c:2346
-#: ../pidgin/gtkutils.c:2368
+#: ../libpurple/protocols/oscar/oscar.c:639 ../pidgin/gtkutils.c:2310
+#: ../pidgin/gtkutils.c:2340
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:338
 msgid "Buddy Icon"
 msgstr "仲間アイコン"
 
-#: ../libpurple/protocols/oscar/oscar.c:623
+#: ../libpurple/protocols/oscar/oscar.c:642
 msgid "Voice"
 msgstr "音声"
 
-#: ../libpurple/protocols/oscar/oscar.c:626
+#: ../libpurple/protocols/oscar/oscar.c:645
 msgid "AIM Direct IM"
 msgstr "AIM Direct IM"
 
-#: ../libpurple/protocols/oscar/oscar.c:629
-#: ../libpurple/protocols/silc/silc.c:687
-#: ../libpurple/protocols/silc/util.c:549
-msgid "Chat"
-msgstr "チャット"
-
-#: ../libpurple/protocols/oscar/oscar.c:632
-#: ../libpurple/protocols/oscar/oscar.c:5919
-msgid "Get File"
-msgstr "ファイルの取得"
-
-#: ../libpurple/protocols/oscar/oscar.c:639
-msgid "Games"
-msgstr "ゲーム"
-
-#: ../libpurple/protocols/oscar/oscar.c:642
-msgid "Add-Ins"
-msgstr "追加"
-
-#: ../libpurple/protocols/oscar/oscar.c:645
-msgid "Send Buddy List"
-msgstr "仲間リストの送信"
-
 #: ../libpurple/protocols/oscar/oscar.c:648
+#: ../libpurple/protocols/silc/silc.c:768
+#: ../libpurple/protocols/silc/util.c:553
+#: ../libpurple/protocols/silc10/silc.c:679
+#: ../libpurple/protocols/silc10/util.c:549
+msgid "Chat"
+msgstr "チャット"
+
+#: ../libpurple/protocols/oscar/oscar.c:651
+#: ../libpurple/protocols/oscar/oscar.c:5987
+msgid "Get File"
+msgstr "ファイルの取得"
+
+#: ../libpurple/protocols/oscar/oscar.c:658
+msgid "Games"
+msgstr "ゲーム"
+
+#: ../libpurple/protocols/oscar/oscar.c:661
+msgid "Add-Ins"
+msgstr "追加"
+
+#: ../libpurple/protocols/oscar/oscar.c:664
+msgid "Send Buddy List"
+msgstr "仲間リストの送信"
+
+#: ../libpurple/protocols/oscar/oscar.c:667
 msgid "ICQ Direct Connect"
 msgstr "ICQ Direct 接続"
 
-#: ../libpurple/protocols/oscar/oscar.c:651
+#: ../libpurple/protocols/oscar/oscar.c:670
 msgid "AP User"
 msgstr "AP ユーザ"
 
-#: ../libpurple/protocols/oscar/oscar.c:654
+#: ../libpurple/protocols/oscar/oscar.c:673
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
-#: ../libpurple/protocols/oscar/oscar.c:657
+#: ../libpurple/protocols/oscar/oscar.c:676
 msgid "Nihilist"
 msgstr "ニヒリスト"
 
-#: ../libpurple/protocols/oscar/oscar.c:660
+#: ../libpurple/protocols/oscar/oscar.c:679
 msgid "ICQ Server Relay"
 msgstr "ICQ サーバ中継"
 
-#: ../libpurple/protocols/oscar/oscar.c:663
+#: ../libpurple/protocols/oscar/oscar.c:682
 msgid "Old ICQ UTF8"
 msgstr "古い ICQ UTF8"
 
-#: ../libpurple/protocols/oscar/oscar.c:666
+#: ../libpurple/protocols/oscar/oscar.c:685
 msgid "Trillian Encryption"
 msgstr "Trillian 暗号化"
 
-#: ../libpurple/protocols/oscar/oscar.c:669
+#: ../libpurple/protocols/oscar/oscar.c:688
 msgid "ICQ UTF8"
 msgstr "ICQ UTF8"
 
-#: ../libpurple/protocols/oscar/oscar.c:672
+#: ../libpurple/protocols/oscar/oscar.c:691
 msgid "Hiptop"
 msgstr "ヒップトップ"
 
-#: ../libpurple/protocols/oscar/oscar.c:675
+#: ../libpurple/protocols/oscar/oscar.c:694
 msgid "Security Enabled"
 msgstr "セキュリティは有効"
 
-#: ../libpurple/protocols/oscar/oscar.c:678
+#: ../libpurple/protocols/oscar/oscar.c:697
 msgid "Video Chat"
 msgstr "ビデオ・チャット"
 
-#: ../libpurple/protocols/oscar/oscar.c:682
+#: ../libpurple/protocols/oscar/oscar.c:701
 msgid "iChat AV"
 msgstr "iChat AV"
 
-#: ../libpurple/protocols/oscar/oscar.c:685
+#: ../libpurple/protocols/oscar/oscar.c:704
 msgid "Live Video"
 msgstr "ライブ・ビデオ"
 
-#: ../libpurple/protocols/oscar/oscar.c:688
+#: ../libpurple/protocols/oscar/oscar.c:707
 msgid "Camera"
 msgstr "カメラ"
 
-#: ../libpurple/protocols/oscar/oscar.c:706
-#: ../libpurple/protocols/oscar/oscar.c:5689
+#: ../libpurple/protocols/oscar/oscar.c:725
+#: ../libpurple/protocols/oscar/oscar.c:5757
 msgid "Free For Chat"
 msgstr "チャットできます"
 
-#: ../libpurple/protocols/oscar/oscar.c:710
-#: ../libpurple/protocols/oscar/oscar.c:5724
+#: ../libpurple/protocols/oscar/oscar.c:729
+#: ../libpurple/protocols/oscar/oscar.c:5792
 msgid "Not Available"
 msgstr "不在です"
 
-#: ../libpurple/protocols/oscar/oscar.c:712
-#: ../libpurple/protocols/oscar/oscar.c:5710
+#: ../libpurple/protocols/oscar/oscar.c:731
+#: ../libpurple/protocols/oscar/oscar.c:5778
 msgid "Occupied"
 msgstr "多忙です"
 
-#: ../libpurple/protocols/oscar/oscar.c:716
+#: ../libpurple/protocols/oscar/oscar.c:735
 msgid "Web Aware"
 msgstr "ウェブは見てます"
 
-#: ../libpurple/protocols/oscar/oscar.c:718 ../libpurple/protocols/qq/qq.c:183
-#: ../libpurple/protocols/yahoo/yahoo.c:2900 ../libpurple/status.c:157
-#: ../pidgin/gtkdocklet.c:463 ../pidgin/gtkstatusbox.c:1053
+#: ../libpurple/protocols/oscar/oscar.c:737 ../libpurple/protocols/qq/qq.c:183
+#: ../libpurple/protocols/yahoo/yahoo.c:2913 ../libpurple/status.c:156
+#: ../pidgin/gtkdocklet.c:446 ../pidgin/gtkstatusbox.c:1053
 msgid "Invisible"
 msgstr "隠れています"
 
-#: ../libpurple/protocols/oscar/oscar.c:720
+#: ../libpurple/protocols/oscar/oscar.c:739
 msgid "Online"
 msgstr "オンライン"
 
-#: ../libpurple/protocols/oscar/oscar.c:819
-#: ../libpurple/protocols/oscar/oscar.c:3688
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:697 ../pidgin/gtkprefs.c:1015
+#: ../libpurple/protocols/oscar/oscar.c:838
+#: ../libpurple/protocols/oscar/oscar.c:3720
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:697 ../pidgin/gtkprefs.c:1052
 msgid "IP Address"
 msgstr "IP-アドレス"
 
-#: ../libpurple/protocols/oscar/oscar.c:826
-#: ../libpurple/protocols/oscar/oscar.c:2840
+#: ../libpurple/protocols/oscar/oscar.c:845
+#: ../libpurple/protocols/oscar/oscar.c:2866
 msgid "Warning Level"
 msgstr "警告レベル"
 
-#: ../libpurple/protocols/oscar/oscar.c:836
+#: ../libpurple/protocols/oscar/oscar.c:855
 msgid "Buddy Comment"
 msgstr "仲間のコメント"
 
-#: ../libpurple/protocols/oscar/oscar.c:976
+#: ../libpurple/protocols/oscar/oscar.c:995
 #, c-format
 msgid ""
 "Could not connect to authentication server:\n"
@@ -6591,7 +6793,7 @@
 "認証サーバに接続できませんでした:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:984
+#: ../libpurple/protocols/oscar/oscar.c:1003
 #, c-format
 msgid ""
 "Could not connect to BOS server:\n"
@@ -6600,20 +6802,20 @@
 "BOS サーバに接続できませんでした:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:1024
+#: ../libpurple/protocols/oscar/oscar.c:1043
 msgid "Screen name sent"
 msgstr "スクリーン名を送信しました"
 
-#: ../libpurple/protocols/oscar/oscar.c:1029
+#: ../libpurple/protocols/oscar/oscar.c:1048
 msgid "Connection established, cookie sent"
 msgstr "(接続完了) cookie を送信しました"
 
 #. TODO: Don't call this with ssi
-#: ../libpurple/protocols/oscar/oscar.c:1058
+#: ../libpurple/protocols/oscar/oscar.c:1077
 msgid "Finalizing connection"
 msgstr "接続の最終調整中"
 
-#: ../libpurple/protocols/oscar/oscar.c:1242
+#: ../libpurple/protocols/oscar/oscar.c:1261
 #, c-format
 msgid ""
 "Unable to login: Could not sign on as %s because the screen name is "
@@ -6624,28 +6826,29 @@
 "ませんでした。スクリーン名の先頭は文字にし、文字と数字とスペースのみ、または"
 "数字のみにして下さい。"
 
-#: ../libpurple/protocols/oscar/oscar.c:1327
-#: ../libpurple/protocols/yahoo/yahoo.c:1936
+#: ../libpurple/protocols/oscar/oscar.c:1346
+#: ../libpurple/protocols/yahoo/yahoo.c:1934
 msgid "Invalid screen name."
 msgstr "無効なスクリーン名です。"
 
-#: ../libpurple/protocols/oscar/oscar.c:1334
+#: ../libpurple/protocols/oscar/oscar.c:1353
 #: ../libpurple/protocols/qq/login_logout.c:483
-#: ../libpurple/protocols/simple/simple.c:1039
-#: ../libpurple/protocols/yahoo/yahoo.c:1954
+#: ../libpurple/protocols/simple/simple.c:1037
+#: ../libpurple/protocols/yahoo/yahoo.c:1952
 msgid "Incorrect password."
 msgstr "パスワードが間違っています。"
 
-#: ../libpurple/protocols/oscar/oscar.c:1339
+#: ../libpurple/protocols/oscar/oscar.c:1358
 msgid "Your account is currently suspended."
 msgstr "お使いのアカウントは現在停止中です"
 
 #. service temporarily unavailable
-#: ../libpurple/protocols/oscar/oscar.c:1343
+#: ../libpurple/protocols/oscar/oscar.c:1362
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "AOL インスタント・メッセンジャー・サービスは一時的に利用不可です"
 
-#: ../libpurple/protocols/oscar/oscar.c:1348
+#: ../libpurple/protocols/oscar/oscar.c:1367
+#: ../libpurple/protocols/oscar/oscar.c:1378
 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."
@@ -6653,44 +6856,44 @@
 "接続と切断を繰り返し行いました。10 分程待ってから再び試みてください。そのまま"
 "続行すると、さらに長く待たなければならなくなりますよ。"
 
-#: ../libpurple/protocols/oscar/oscar.c:1353
+#: ../libpurple/protocols/oscar/oscar.c:1372
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr "クライアントのバージョンが古すぎます。%s にアップグレードしましょう。"
 
-#: ../libpurple/protocols/oscar/oscar.c:1388
+#: ../libpurple/protocols/oscar/oscar.c:1412
 msgid "Could Not Connect"
 msgstr "接続できませんでした"
 
-#: ../libpurple/protocols/oscar/oscar.c:1393
+#: ../libpurple/protocols/oscar/oscar.c:1417
 msgid "Received authorization"
-msgstr "認証を受信しました"
-
-#: ../libpurple/protocols/oscar/oscar.c:1416
+msgstr "承認を受信しました"
+
+#: ../libpurple/protocols/oscar/oscar.c:1440
 msgid "The SecurID key entered is invalid."
 msgstr "入力したセキュア ID 鍵は不正です。"
 
-#: ../libpurple/protocols/oscar/oscar.c:1430
+#: ../libpurple/protocols/oscar/oscar.c:1454
 msgid "Enter SecurID"
 msgstr "セキュア ID の入力"
 
-#: ../libpurple/protocols/oscar/oscar.c:1431
+#: ../libpurple/protocols/oscar/oscar.c:1455
 msgid "Enter the 6 digit number from the digital display."
 msgstr "デジタル表示から6桁の数字を入力して下さい。"
 
 #. *
 #. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
 #.
-#: ../libpurple/protocols/oscar/oscar.c:1433
-#: ../libpurple/protocols/oscar/oscar.c:2224
-#: ../libpurple/protocols/oscar/oscar.c:2271
-#: ../libpurple/protocols/oscar/oscar.c:5794
-#: ../libpurple/protocols/oscar/oscar.c:6075 ../libpurple/request.h:1387
+#: ../libpurple/protocols/oscar/oscar.c:1457
+#: ../libpurple/protocols/oscar/oscar.c:2250
+#: ../libpurple/protocols/oscar/oscar.c:2297
+#: ../libpurple/protocols/oscar/oscar.c:5862
+#: ../libpurple/protocols/oscar/oscar.c:6143 ../libpurple/request.h:1387
 msgid "_OK"
 msgstr "OK(_O)"
 
-#: ../libpurple/protocols/oscar/oscar.c:1472
-#: ../libpurple/protocols/oscar/oscar.c:1515
+#: ../libpurple/protocols/oscar/oscar.c:1496
+#: ../libpurple/protocols/oscar/oscar.c:1539
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
@@ -6699,53 +6902,53 @@
 "まもなく切断されるでしょう。修正されたら TOC を利用してかまいません。更新のた"
 "めに、%s をチェックして下さい。"
 
-#: ../libpurple/protocols/oscar/oscar.c:1475
-#: ../libpurple/protocols/oscar/oscar.c:1518
+#: ../libpurple/protocols/oscar/oscar.c:1499
+#: ../libpurple/protocols/oscar/oscar.c:1542
 msgid "Unable to get a valid AIM login hash."
 msgstr "妥当な AIM ログインの hash 値を取得することができませんでした。"
 
-#: ../libpurple/protocols/oscar/oscar.c:1604
+#: ../libpurple/protocols/oscar/oscar.c:1627
 #, c-format
 msgid "You may be disconnected shortly.  Check %s for updates."
 msgstr "まもなく切断されるでしょう。更新のために、%s をチェックして下さい。"
 
-#: ../libpurple/protocols/oscar/oscar.c:1607
+#: ../libpurple/protocols/oscar/oscar.c:1630
 msgid "Unable to get a valid login hash."
 msgstr "妥当なログインの hash 値を取得できませんでした。"
 
-#: ../libpurple/protocols/oscar/oscar.c:1633
+#: ../libpurple/protocols/oscar/oscar.c:1659
 msgid "Password sent"
 msgstr "パスワードの送信中"
 
-#: ../libpurple/protocols/oscar/oscar.c:1689
+#: ../libpurple/protocols/oscar/oscar.c:1715
 msgid "Unable to initialize connection"
 msgstr "新しい接続を開けません"
 
-#: ../libpurple/protocols/oscar/oscar.c:2194
+#: ../libpurple/protocols/oscar/oscar.c:2220
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr "私があなたを仲間リストに追加できるように承認して下さい。"
 
-#: ../libpurple/protocols/oscar/oscar.c:2222
+#: ../libpurple/protocols/oscar/oscar.c:2248
 msgid "Authorization Request Message:"
 msgstr "承認要求メッセージ:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2223
+#: ../libpurple/protocols/oscar/oscar.c:2249
 msgid "Please authorize me!"
 msgstr "私を承認してください!"
 
-#: ../libpurple/protocols/oscar/oscar.c:2263
-#: ../libpurple/protocols/oscar/oscar.c:2270
-#: ../libpurple/protocols/oscar/oscar.c:2397
-#: ../libpurple/protocols/oscar/oscar.c:5192
-#: ../libpurple/protocols/yahoo/yahoo.c:989
+#: ../libpurple/protocols/oscar/oscar.c:2289
+#: ../libpurple/protocols/oscar/oscar.c:2296
+#: ../libpurple/protocols/oscar/oscar.c:2423
+#: ../libpurple/protocols/oscar/oscar.c:5240
+#: ../libpurple/protocols/yahoo/yahoo.c:987
 msgid "No reason given."
 msgstr "理由はわかりません。"
 
-#: ../libpurple/protocols/oscar/oscar.c:2269
+#: ../libpurple/protocols/oscar/oscar.c:2295
 msgid "Authorization Denied Message:"
 msgstr "承認拒否メッセージ:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2397
+#: ../libpurple/protocols/oscar/oscar.c:2423
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -6755,17 +6958,17 @@
 "ユーザの %u さんが次の理由で仲間リストに追加する要求を拒否しました:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2398
+#: ../libpurple/protocols/oscar/oscar.c:2424
 msgid "ICQ authorization denied."
-msgstr "ICQ 認証が拒否されました。"
+msgstr "ICQ の承認が拒否されました"
 
 #. Someone has granted you authorization
-#: ../libpurple/protocols/oscar/oscar.c:2405
+#: ../libpurple/protocols/oscar/oscar.c:2431
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
-msgstr "ユーザの %u さんが仲間リストに追加するあなたの要求を承認しました。"
-
-#: ../libpurple/protocols/oscar/oscar.c:2413
+msgstr "ユーザの %u さんが仲間リストに追加するあなたの要求を承認しました"
+
+#: ../libpurple/protocols/oscar/oscar.c:2439
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -6778,7 +6981,7 @@
 "差出人: %s [%s]\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2421
+#: ../libpurple/protocols/oscar/oscar.c:2447
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -6791,7 +6994,7 @@
 "差出人: %s [%s]\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2429
+#: ../libpurple/protocols/oscar/oscar.c:2455
 #, c-format
 msgid ""
 "You have received an ICQ e-mail from %s [%s]\n"
@@ -6804,24 +7007,24 @@
 "メッセージは:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2450
+#: ../libpurple/protocols/oscar/oscar.c:2476
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
 msgstr "ICQ ユーザの %u さんはあなたに仲間リストを送信しています: %s (%s)"
 
-#: ../libpurple/protocols/oscar/oscar.c:2456
+#: ../libpurple/protocols/oscar/oscar.c:2482
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr "この相手を仲間リストに追加しますか?"
 
-#: ../libpurple/protocols/oscar/oscar.c:2461 ../pidgin/gtkroomlist.c:308
+#: ../libpurple/protocols/oscar/oscar.c:2487 ../pidgin/gtkroomlist.c:308
 msgid "_Add"
 msgstr "追加(_A)"
 
-#: ../libpurple/protocols/oscar/oscar.c:2462
+#: ../libpurple/protocols/oscar/oscar.c:2488
 msgid "_Decline"
 msgstr "断る(_D)"
 
-#: ../libpurple/protocols/oscar/oscar.c:2546
+#: ../libpurple/protocols/oscar/oscar.c:2572
 #, 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."
@@ -6830,7 +7033,7 @@
 msgstr[1] ""
 "%2$s さんからの %1$hu 通のメッセージは妥当でないので受け取れませんでした。"
 
-#: ../libpurple/protocols/oscar/oscar.c:2555
+#: ../libpurple/protocols/oscar/oscar.c:2581
 #, 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."
@@ -6839,7 +7042,7 @@
 msgstr[1] ""
 "%2$s さんからの %1$hu 個のメッセージは大きすぎるために受け取れませんでした。"
 
-#: ../libpurple/protocols/oscar/oscar.c:2564
+#: ../libpurple/protocols/oscar/oscar.c:2590
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -6852,7 +7055,7 @@
 "速度制限を上回ったので %2$s さんからの %1$hu通のメッセージを受け取れませんで"
 "した。"
 
-#: ../libpurple/protocols/oscar/oscar.c:2573
+#: ../libpurple/protocols/oscar/oscar.c:2599
 #, 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."
@@ -6863,7 +7066,7 @@
 "相手が有害すぎたので、%2$s さんからの %1$hu 個のメッセージを受け取れませんで"
 "した。"
 
-#: ../libpurple/protocols/oscar/oscar.c:2582
+#: ../libpurple/protocols/oscar/oscar.c:2608
 #, 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."
@@ -6874,7 +7077,7 @@
 "あなたが有害すぎたので、%2$s さんからの %1$hu 個のメッセージを受け取れません"
 "でした。"
 
-#: ../libpurple/protocols/oscar/oscar.c:2591
+#: ../libpurple/protocols/oscar/oscar.c:2617
 #, 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."
@@ -6886,61 +7089,61 @@
 "た。"
 
 #. Data is assumed to be the destination sn
-#: ../libpurple/protocols/oscar/oscar.c:2746
+#: ../libpurple/protocols/oscar/oscar.c:2772
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "メッセージを送信できません: %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2746
-#: ../libpurple/protocols/oscar/oscar.c:2751
-#: ../libpurple/protocols/oscar/oscar.c:2813
-#: ../libpurple/protocols/oscar/oscar.c:2817
+#: ../libpurple/protocols/oscar/oscar.c:2772
+#: ../libpurple/protocols/oscar/oscar.c:2777
+#: ../libpurple/protocols/oscar/oscar.c:2839
+#: ../libpurple/protocols/oscar/oscar.c:2843
 msgid "Unknown reason."
 msgstr "原因は不明です"
 
-#: ../libpurple/protocols/oscar/oscar.c:2749
+#: ../libpurple/protocols/oscar/oscar.c:2775
 #: ../libpurple/protocols/sametime/sametime.c:2409
 #, c-format
 msgid "Unable to send message to %s:"
 msgstr "%s さんへメッセージを送信できません"
 
-#: ../libpurple/protocols/oscar/oscar.c:2813
+#: ../libpurple/protocols/oscar/oscar.c:2839
 #, c-format
 msgid "User information not available: %s"
 msgstr "ユーザ情報は有効ではありません: %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2816
+#: ../libpurple/protocols/oscar/oscar.c:2842
 #, c-format
 msgid "User information for %s unavailable:"
 msgstr "%s のユーザ情報は有効ではありません:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2845
+#: ../libpurple/protocols/oscar/oscar.c:2871
 msgid "Online Since"
 msgstr "サイン・インした日時"
 
-#: ../libpurple/protocols/oscar/oscar.c:2850
+#: ../libpurple/protocols/oscar/oscar.c:2876
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1161
 msgid "Member Since"
 msgstr "メンバになった日時"
 
-#: ../libpurple/protocols/oscar/oscar.c:2855
+#: ../libpurple/protocols/oscar/oscar.c:2881
 msgid "Capabilities"
 msgstr "機能"
 
-#: ../libpurple/protocols/oscar/oscar.c:2885
+#: ../libpurple/protocols/oscar/oscar.c:2911
 msgid "Available Message"
 msgstr "在席中のメッセージ"
 
-#: ../libpurple/protocols/oscar/oscar.c:2911
+#: ../libpurple/protocols/oscar/oscar.c:2939
 msgid "Profile"
 msgstr "プロフィール"
 
-#: ../libpurple/protocols/oscar/oscar.c:2988
+#: ../libpurple/protocols/oscar/oscar.c:3019
 msgid "Your AIM connection may be lost."
 msgstr "AIM への接続が切れたようです"
 
 #. The conversion failed!
-#: ../libpurple/protocols/oscar/oscar.c:3175
+#: ../libpurple/protocols/oscar/oscar.c:3207
 msgid ""
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
@@ -6948,7 +7151,7 @@
 "[メッセージに不正な文字が含まれているため、このユーザからのメッセージを表示で"
 "きません]"
 
-#: ../libpurple/protocols/oscar/oscar.c:3378
+#: ../libpurple/protocols/oscar/oscar.c:3410
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
@@ -6956,85 +7159,86 @@
 "速度制限を越えているため最後の操作は実行されませんでした。10 秒間ほど待ってか"
 "ら再度試みて下さい。"
 
-#: ../libpurple/protocols/oscar/oscar.c:3450
+#: ../libpurple/protocols/oscar/oscar.c:3482
 msgid "You have been signed off for an unknown reason."
 msgstr "原因は不明ですが、あなたはサイン・アウトしました"
 
-#: ../libpurple/protocols/oscar/oscar.c:3463
+#: ../libpurple/protocols/oscar/oscar.c:3495
 #: ../libpurple/protocols/toc/toc.c:977
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "チャット・ルーム %s から切断されました"
 
-#: ../libpurple/protocols/oscar/oscar.c:3710
-#: ../libpurple/protocols/silc/util.c:581
+#: ../libpurple/protocols/oscar/oscar.c:3742
+#: ../libpurple/protocols/silc/util.c:585
+#: ../libpurple/protocols/silc10/util.c:581
 msgid "Mobile Phone"
 msgstr "携帯電話"
 
-#: ../libpurple/protocols/oscar/oscar.c:3740
+#: ../libpurple/protocols/oscar/oscar.c:3772
 msgid "Personal Web Page"
 msgstr "個人的なウェブページ"
 
-#: ../libpurple/protocols/oscar/oscar.c:3764
+#: ../libpurple/protocols/oscar/oscar.c:3796
 #: ../libpurple/protocols/qq/buddy_info.c:40
 msgid "Additional Information"
 msgstr "追加情報"
 
-#: ../libpurple/protocols/oscar/oscar.c:3772
-#: ../libpurple/protocols/oscar/oscar.c:3785
+#: ../libpurple/protocols/oscar/oscar.c:3804
+#: ../libpurple/protocols/oscar/oscar.c:3817
 msgid "Zip Code"
 msgstr "郵便番号"
 
-#: ../libpurple/protocols/oscar/oscar.c:3796
+#: ../libpurple/protocols/oscar/oscar.c:3828
 msgid "Division"
 msgstr "所属"
 
-#: ../libpurple/protocols/oscar/oscar.c:3797
+#: ../libpurple/protocols/oscar/oscar.c:3829
 msgid "Position"
 msgstr "役職"
 
-#: ../libpurple/protocols/oscar/oscar.c:3799
+#: ../libpurple/protocols/oscar/oscar.c:3831
 msgid "Web Page"
 msgstr "ウェブページ"
 
-#: ../libpurple/protocols/oscar/oscar.c:3802
+#: ../libpurple/protocols/oscar/oscar.c:3834
 msgid "Work Information"
 msgstr "職業"
 
-#: ../libpurple/protocols/oscar/oscar.c:3858
+#: ../libpurple/protocols/oscar/oscar.c:3890
 msgid "Pop-Up Message"
 msgstr "ポップアップ・メッセージ"
 
-#: ../libpurple/protocols/oscar/oscar.c:3898
+#: ../libpurple/protocols/oscar/oscar.c:3930
 #, 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:3903
+#: ../libpurple/protocols/oscar/oscar.c:3935
 msgid "Screen name"
 msgstr "スクリーン名"
 
-#: ../libpurple/protocols/oscar/oscar.c:3929
+#: ../libpurple/protocols/oscar/oscar.c:3961
 #, c-format
 msgid "No results found for e-mail address %s"
 msgstr "E-メール・アドレス %s に対する結果を得られませんでした"
 
-#: ../libpurple/protocols/oscar/oscar.c:3950
+#: ../libpurple/protocols/oscar/oscar.c:3982
 #, c-format
 msgid "You should receive an e-mail asking to confirm %s."
 msgstr "%s さんを確認するための問い合わせメールを受信して下さい"
 
-#: ../libpurple/protocols/oscar/oscar.c:3952
+#: ../libpurple/protocols/oscar/oscar.c:3984
 msgid "Account Confirmation Requested"
 msgstr "アカウント認証を要求しました"
 
-#: ../libpurple/protocols/oscar/oscar.c:3983
+#: ../libpurple/protocols/oscar/oscar.c:4015
 msgid "Error Changing Account Info"
 msgstr "アカウント情報変更エラー"
 
-#: ../libpurple/protocols/oscar/oscar.c:3986
+#: ../libpurple/protocols/oscar/oscar.c:4018
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -7043,19 +7247,19 @@
 "エラー 0x%04x: 要求されたスクリーン名がオリジナルと異なっているため、整形でき"
 "ません。"
 
-#: ../libpurple/protocols/oscar/oscar.c:3989
+#: ../libpurple/protocols/oscar/oscar.c:4021
 #, c-format
 msgid "Error 0x%04x: Unable to format screen name because it is invalid."
 msgstr "エラー 0x%04x: 要求されたスクリーン名が間違っているので整形できません"
 
-#: ../libpurple/protocols/oscar/oscar.c:3992
+#: ../libpurple/protocols/oscar/oscar.c:4024
 #, 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:3995
+#: ../libpurple/protocols/oscar/oscar.c:4027
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because there is already a "
@@ -7064,7 +7268,7 @@
 "エラー 0x%04x: このスクリーン名に対して既に要求がきているので E-メール・アド"
 "レスを変更できません"
 
-#: ../libpurple/protocols/oscar/oscar.c:3998
+#: ../libpurple/protocols/oscar/oscar.c:4030
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address has "
@@ -7073,7 +7277,7 @@
 "エラー 0x%04x: たくさんのスクリーン名に割り当てられているので、この E-メー"
 "ル・アドレスには変更できません"
 
-#: ../libpurple/protocols/oscar/oscar.c:4001
+#: ../libpurple/protocols/oscar/oscar.c:4033
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address is "
@@ -7082,32 +7286,32 @@
 "エラー 0x%04x: このアドレスが間違っているので、この E-メール・アドレスに変更"
 "できません"
 
-#: ../libpurple/protocols/oscar/oscar.c:4004
+#: ../libpurple/protocols/oscar/oscar.c:4036
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "エラー 0x%04x: 原因不明のエラーです"
 
-#: ../libpurple/protocols/oscar/oscar.c:4014
+#: ../libpurple/protocols/oscar/oscar.c:4046
 #, c-format
 msgid "The e-mail address for %s is %s"
 msgstr "%s さんの E-メール・アドレスは %s です"
 
-#: ../libpurple/protocols/oscar/oscar.c:4016
+#: ../libpurple/protocols/oscar/oscar.c:4048
 msgid "Account Info"
 msgstr "アカウント情報"
 
-#: ../libpurple/protocols/oscar/oscar.c:4187
+#: ../libpurple/protocols/oscar/oscar.c:4220
 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:4432
+#: ../libpurple/protocols/oscar/oscar.c:4486
 msgid "Unable to set AIM profile."
 msgstr "AIM プロフィールをセットできません"
 
-#: ../libpurple/protocols/oscar/oscar.c:4433
+#: ../libpurple/protocols/oscar/oscar.c:4487
 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 "
@@ -7117,7 +7321,7 @@
 "す。あなたのプロフィールは設定されずに残っています。接続が完了してから再度試"
 "して下さい。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4447
+#: ../libpurple/protocols/oscar/oscar.c:4501
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  It has been "
@@ -7128,11 +7332,11 @@
 msgstr[0] "プロフィールの長さが上限値 ( %dバイト) に達したので切りつめました"
 msgstr[1] "プロフィールの長さが上限値 ( %dバイト) に達したので切りつめました"
 
-#: ../libpurple/protocols/oscar/oscar.c:4452
+#: ../libpurple/protocols/oscar/oscar.c:4506
 msgid "Profile too long."
 msgstr "プロフィールが長すぎます"
 
-#: ../libpurple/protocols/oscar/oscar.c:4497
+#: ../libpurple/protocols/oscar/oscar.c:4551
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  It has been "
@@ -7143,11 +7347,11 @@
 msgstr[0] "離席メッセージの長さが上限値 ( %dバイト) に達したので切りつめました"
 msgstr[1] "離席メッセージの長さが上限値 ( %dバイト) に達したので切りつめました"
 
-#: ../libpurple/protocols/oscar/oscar.c:4502
+#: ../libpurple/protocols/oscar/oscar.c:4556
 msgid "Away message too long."
 msgstr "離席メッセージが長すぎます"
 
-#: ../libpurple/protocols/oscar/oscar.c:4571
+#: ../libpurple/protocols/oscar/oscar.c:4625
 #, c-format
 msgid ""
 "Could not add the buddy %s because the screen name is invalid.  Screen names "
@@ -7157,17 +7361,17 @@
 "スクリーン名が間違っているため仲間 %s を追加できませんでした。スクリーン名の"
 "先頭は文字にし、文字と数字とスペースのみ、または数字のみにして下さい。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4573
-#: ../libpurple/protocols/oscar/oscar.c:4996
-#: ../libpurple/protocols/oscar/oscar.c:5010
+#: ../libpurple/protocols/oscar/oscar.c:4627
+#: ../libpurple/protocols/oscar/oscar.c:5050
+#: ../libpurple/protocols/oscar/oscar.c:5064
 msgid "Unable To Add"
 msgstr "追加できません"
 
-#: ../libpurple/protocols/oscar/oscar.c:4677
+#: ../libpurple/protocols/oscar/oscar.c:4731
 msgid "Unable To Retrieve Buddy List"
 msgstr "仲間リストを取得できません"
 
-#: ../libpurple/protocols/oscar/oscar.c:4678
+#: ../libpurple/protocols/oscar/oscar.c:4732
 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."
@@ -7175,16 +7379,16 @@
 "一時的に AIM サーバから仲間リストを取得できませんでした。仲間リストは失われて"
 "いません。おそらく数時間後には利用できるようになっているでしょう。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4882
-#: ../libpurple/protocols/oscar/oscar.c:4883
-#: ../libpurple/protocols/oscar/oscar.c:4888
-#: ../libpurple/protocols/oscar/oscar.c:5064
-#: ../libpurple/protocols/oscar/oscar.c:5065
-#: ../libpurple/protocols/oscar/oscar.c:5070
+#: ../libpurple/protocols/oscar/oscar.c:4936
+#: ../libpurple/protocols/oscar/oscar.c:4937
+#: ../libpurple/protocols/oscar/oscar.c:4942
+#: ../libpurple/protocols/oscar/oscar.c:5118
+#: ../libpurple/protocols/oscar/oscar.c:5119
+#: ../libpurple/protocols/oscar/oscar.c:5124
 msgid "Orphans"
 msgstr "みなしご"
 
-#: ../libpurple/protocols/oscar/oscar.c:4994
+#: ../libpurple/protocols/oscar/oscar.c:5048
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -7193,12 +7397,12 @@
 "仲間の %s さんを追加することができませんでした。仲間の数が多すぎます。一人削"
 "除して再度挑戦して下さい。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4994
-#: ../libpurple/protocols/oscar/oscar.c:5008
+#: ../libpurple/protocols/oscar/oscar.c:5048
+#: ../libpurple/protocols/oscar/oscar.c:5062
 msgid "(no name)"
 msgstr "(名前無し)"
 
-#: ../libpurple/protocols/oscar/oscar.c:5008
+#: ../libpurple/protocols/oscar/oscar.c:5062
 #, c-format
 msgid ""
 "Could not add the buddy %s for an unknown reason.  The most common reason "
@@ -7209,7 +7413,7 @@
 "これは仲間リストに追加可能な仲間の数を越えてしまっているということがあり得ま"
 "す。"
 
-#: ../libpurple/protocols/oscar/oscar.c:5102
+#: ../libpurple/protocols/oscar/oscar.c:5155
 #, c-format
 msgid ""
 "The user %s has given you permission to add you to their buddy list.  Do you "
@@ -7218,22 +7422,22 @@
 "ユーザの %s さんがあなたを仲間リストに加えることを許可しました。彼らを加えて"
 "もよろしいですか?"
 
-#: ../libpurple/protocols/oscar/oscar.c:5108
+#: ../libpurple/protocols/oscar/oscar.c:5163
 msgid "Authorization Given"
 msgstr "承認が得られました"
 
 #. Granted
-#: ../libpurple/protocols/oscar/oscar.c:5188
+#: ../libpurple/protocols/oscar/oscar.c:5236
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
 msgstr "ユーザの %s さんは仲間リストに追加するあなたの要求を承認しました"
 
-#: ../libpurple/protocols/oscar/oscar.c:5189
+#: ../libpurple/protocols/oscar/oscar.c:5237
 msgid "Authorization Granted"
 msgstr "承認が得られました"
 
 #. Denied
-#: ../libpurple/protocols/oscar/oscar.c:5192
+#: ../libpurple/protocols/oscar/oscar.c:5240
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -7244,52 +7448,52 @@
 "した:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:5193
+#: ../libpurple/protocols/oscar/oscar.c:5241
 msgid "Authorization Denied"
 msgstr "承認は拒否されました"
 
-#: ../libpurple/protocols/oscar/oscar.c:5229
+#: ../libpurple/protocols/oscar/oscar.c:5277
 #: ../libpurple/protocols/toc/toc.c:1371
 msgid "_Exchange:"
 msgstr "交換(_E):"
 
-#: ../libpurple/protocols/oscar/oscar.c:5269
+#: ../libpurple/protocols/oscar/oscar.c:5317
 msgid "Invalid chat name specified."
 msgstr "不正なチャット名が指定されました"
 
-#: ../libpurple/protocols/oscar/oscar.c:5339
+#: ../libpurple/protocols/oscar/oscar.c:5386
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 msgstr ""
 "IM 画像が送信されませんでした。AIM チャットで IM 画像を送信できません。"
 
-#: ../libpurple/protocols/oscar/oscar.c:5478
-#: ../libpurple/protocols/oscar/oscar.c:5483
+#: ../libpurple/protocols/oscar/oscar.c:5546
+#: ../libpurple/protocols/oscar/oscar.c:5551
 msgid "Away Message"
 msgstr "離席メッセージ"
 
-#: ../libpurple/protocols/oscar/oscar.c:5483
+#: ../libpurple/protocols/oscar/oscar.c:5551
 msgid "<i>(retrieving)</i>"
 msgstr "<i>(取得中)</i>"
 
-#: ../libpurple/protocols/oscar/oscar.c:5683
+#: ../libpurple/protocols/oscar/oscar.c:5751
 msgid "iTunes Music Store Link"
 msgstr "iTunes 楽曲ストアのリンク"
 
-#: ../libpurple/protocols/oscar/oscar.c:5791
+#: ../libpurple/protocols/oscar/oscar.c:5859
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "%s さんに対する仲間のコメント"
 
-#: ../libpurple/protocols/oscar/oscar.c:5792
+#: ../libpurple/protocols/oscar/oscar.c:5860
 msgid "Buddy Comment:"
 msgstr "仲間のコメント:"
 
-#: ../libpurple/protocols/oscar/oscar.c:5839
+#: ../libpurple/protocols/oscar/oscar.c:5907
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr "%s を利用した Direct IM 接続の開始を選択しています。"
 
-#: ../libpurple/protocols/oscar/oscar.c:5843
+#: ../libpurple/protocols/oscar/oscar.c:5911
 msgid ""
 "Because this reveals your IP address, it may be considered a security risk.  "
 "Do you wish to continue?"
@@ -7297,138 +7501,138 @@
 "理由は、あなたの IP-アドレスを開示することになるからです。これにより個人情報"
 "に関する危険性が高まります。続行してもよろしいですか?"
 
-#: ../libpurple/protocols/oscar/oscar.c:5849
+#: ../libpurple/protocols/oscar/oscar.c:5917
 msgid "C_onnect"
 msgstr "接続する(_O)"
 
-#: ../libpurple/protocols/oscar/oscar.c:5884
+#: ../libpurple/protocols/oscar/oscar.c:5952
 msgid "Get AIM Info"
 msgstr "AIM 情報の取得"
 
-#: ../libpurple/protocols/oscar/oscar.c:5890
+#: ../libpurple/protocols/oscar/oscar.c:5958
 msgid "Edit Buddy Comment"
 msgstr "仲間のコメントの編集"
 
-#: ../libpurple/protocols/oscar/oscar.c:5898
+#: ../libpurple/protocols/oscar/oscar.c:5966
 msgid "Get Status Msg"
 msgstr "状態メッセージの取得"
 
-#: ../libpurple/protocols/oscar/oscar.c:5911
+#: ../libpurple/protocols/oscar/oscar.c:5979
 msgid "Direct IM"
 msgstr "Direct IM"
 
-#: ../libpurple/protocols/oscar/oscar.c:5933
+#: ../libpurple/protocols/oscar/oscar.c:6001
 msgid "Re-request Authorization"
 msgstr "承認の再要求"
 
-#: ../libpurple/protocols/oscar/oscar.c:5992
+#: ../libpurple/protocols/oscar/oscar.c:6060
 msgid "Require authorization"
 msgstr "承認が必要です"
 
-#: ../libpurple/protocols/oscar/oscar.c:5995
+#: ../libpurple/protocols/oscar/oscar.c:6063
 msgid "Web aware (enabling this will cause you to receive SPAM!)"
 msgstr ""
 "ウェブは知っている (これを有効にすると SPAM を受け取ることになりますよ!)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6000
+#: ../libpurple/protocols/oscar/oscar.c:6068
 msgid "ICQ Privacy Options"
 msgstr "ICQ プライバシーのオプション"
 
-#: ../libpurple/protocols/oscar/oscar.c:6019
+#: ../libpurple/protocols/oscar/oscar.c:6087
 msgid "The new formatting is invalid."
 msgstr "新しい書式が間違っています"
 
-#: ../libpurple/protocols/oscar/oscar.c:6020
+#: ../libpurple/protocols/oscar/oscar.c:6088
 msgid "Screen name formatting can change only capitalization and whitespace."
 msgstr "スクリーン名の書式は大文字と空白文字しか変更できません"
 
-#: ../libpurple/protocols/oscar/oscar.c:6073
+#: ../libpurple/protocols/oscar/oscar.c:6141
 msgid "Change Address To:"
 msgstr "変更するアドレス:"
 
-#: ../libpurple/protocols/oscar/oscar.c:6119
+#: ../libpurple/protocols/oscar/oscar.c:6187
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>あなたは承認を待っていません</i>"
 
-#: ../libpurple/protocols/oscar/oscar.c:6122
+#: ../libpurple/protocols/oscar/oscar.c:6190
 msgid "You are awaiting authorization from the following buddies"
 msgstr "あなたは次の仲間からの承認を待っています"
 
-#: ../libpurple/protocols/oscar/oscar.c:6123
+#: ../libpurple/protocols/oscar/oscar.c:6191
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
 msgstr ""
-"右クリックして \"認証の再要求\" を選択することで、これらの仲間から認証を再要"
-"求することができます。"
-
-#: ../libpurple/protocols/oscar/oscar.c:6140
+"右クリックして \"承認の再要求\" を選択することで、これらの仲間からの承認をも"
+"う一度要求できます。"
+
+#: ../libpurple/protocols/oscar/oscar.c:6208
 msgid "Find Buddy by E-Mail"
 msgstr "E-メールから仲間を捜す"
 
-#: ../libpurple/protocols/oscar/oscar.c:6141
+#: ../libpurple/protocols/oscar/oscar.c:6209
 msgid "Search for a buddy by e-mail address"
 msgstr "E-メール・アドレスから仲間を検索します"
 
-#: ../libpurple/protocols/oscar/oscar.c:6142
+#: ../libpurple/protocols/oscar/oscar.c:6210
 msgid "Type the e-mail address of the buddy you are searching for."
 msgstr "検索する仲間の E-メール・アドレスを入力して下さい"
 
-#: ../libpurple/protocols/oscar/oscar.c:6145
+#: ../libpurple/protocols/oscar/oscar.c:6213
 msgid "_Search"
 msgstr "検索(_S)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6303
+#: ../libpurple/protocols/oscar/oscar.c:6371
 msgid "Set User Info (URL)..."
 msgstr "ユーザ情報のセット(URL)..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6314
+#: ../libpurple/protocols/oscar/oscar.c:6382
 msgid "Change Password (URL)"
 msgstr "パスワード変更 (URL)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6318
+#: ../libpurple/protocols/oscar/oscar.c:6386
 msgid "Configure IM Forwarding (URL)"
 msgstr "IM フォワーディング (URL) の設定"
 
 #. ICQ actions
-#: ../libpurple/protocols/oscar/oscar.c:6328
+#: ../libpurple/protocols/oscar/oscar.c:6396
 msgid "Set Privacy Options..."
 msgstr "プライバシー・オプションの追加..."
 
 #. AIM actions
-#: ../libpurple/protocols/oscar/oscar.c:6335
+#: ../libpurple/protocols/oscar/oscar.c:6403
 msgid "Confirm Account"
 msgstr "アカウントの確認"
 
-#: ../libpurple/protocols/oscar/oscar.c:6339
+#: ../libpurple/protocols/oscar/oscar.c:6407
 msgid "Display Currently Registered E-Mail Address"
 msgstr "現在登録されている E-メール・アドレスの表示"
 
-#: ../libpurple/protocols/oscar/oscar.c:6343
+#: ../libpurple/protocols/oscar/oscar.c:6411
 msgid "Change Currently Registered E-Mail Address..."
 msgstr "現在登録されている E-メール・アドレスの変更..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6350
+#: ../libpurple/protocols/oscar/oscar.c:6418
 msgid "Show Buddies Awaiting Authorization"
 msgstr "承認を待っている仲間を表示"
 
-#: ../libpurple/protocols/oscar/oscar.c:6356
+#: ../libpurple/protocols/oscar/oscar.c:6424
 msgid "Search for Buddy by E-Mail Address..."
 msgstr "E-メールで仲間の検索..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6361
-msgid "Search for Buddy by Information"
-msgstr "情報で仲間の検索..."
-
 #: ../libpurple/protocols/oscar/oscar.c:6429
+msgid "Search for Buddy by Information"
+msgstr "情報で仲間の検索..."
+
+#: ../libpurple/protocols/oscar/oscar.c:6497
 msgid "Use recent buddies group"
 msgstr "現在のグループを利用する"
 
-#: ../libpurple/protocols/oscar/oscar.c:6432
+#: ../libpurple/protocols/oscar/oscar.c:6500
 msgid "Show how long you have been idle"
 msgstr "待機中の時間を表示する"
 
-#: ../libpurple/protocols/oscar/oscar.c:6584
+#: ../libpurple/protocols/oscar/oscar.c:6655
 msgid ""
 "Always use ICQ proxy server for file transfers\n"
 "(slower, but does not reveal your IP address)"
@@ -7678,7 +7882,7 @@
 
 #: ../libpurple/protocols/qq/buddy_opt.c:277
 msgid "Add buddy with auth request fails"
-msgstr "認証付きで仲間の追加に失敗しました"
+msgstr "承認付きで仲間の追加に失敗しました"
 
 #: ../libpurple/protocols/qq/buddy_opt.c:308
 msgid "You have successfully removed a buddy"
@@ -7691,7 +7895,7 @@
 #: ../libpurple/protocols/qq/buddy_opt.c:402
 #, c-format
 msgid "User %d needs authentication"
-msgstr "ユーザ %d さんは認証が必要です"
+msgstr "ユーザ %d さんは承認が必要です"
 
 #: ../libpurple/protocols/qq/buddy_opt.c:404
 #: ../libpurple/protocols/qq/group_join.c:134
@@ -7844,11 +8048,11 @@
 
 #: ../libpurple/protocols/qq/group_join.c:255
 msgid "QQ Group Auth"
-msgstr "QQ グループの認証"
+msgstr "QQ グループの承認"
 
 #: ../libpurple/protocols/qq/group_join.c:256
 msgid "Your authorization operation has been accepted by the QQ server"
-msgstr "認証操作が QQ サーバによって許可されました"
+msgstr "承認操作が QQ サーバによって許可されました"
 
 #: ../libpurple/protocols/qq/group_join.c:327
 msgid "You inputted a group id outside the acceptable range"
@@ -7930,13 +8134,7 @@
 msgstr "ログインできません (デバッグ・ログを確認して下さい)"
 
 #. we didn't successfully connect. tdt->toc_fd is valid here
-#. TODO: Include error_message in the message below
 #: ../libpurple/protocols/qq/qq.c:139 ../libpurple/protocols/toc/toc.c:173
-#: ../libpurple/protocols/yahoo/yahoo.c:2382
-#: ../libpurple/protocols/yahoo/yahoo.c:2410
-#: ../libpurple/protocols/yahoo/yahoo.c:2517
-#: ../libpurple/protocols/yahoo/yahoo.c:2538
-#: ../libpurple/protocols/yahoo/yahoo.c:2622
 #: ../libpurple/protocols/yahoo/yahoo_filexfer.c:108
 #: ../libpurple/protocols/yahoo/yahoo_filexfer.c:188
 #: ../libpurple/protocols/yahoo/ycht.c:549
@@ -8343,7 +8541,7 @@
 msgid "Send TEST Announcement"
 msgstr "TEST 用アナウンスを送信する"
 
-#: ../libpurple/protocols/sametime/sametime.c:3586 ../pidgin/gtkconv.c:4145
+#: ../libpurple/protocols/sametime/sametime.c:3586 ../pidgin/gtkconv.c:4290
 msgid "Topic:"
 msgstr "トピック:"
 
@@ -8368,6 +8566,10 @@
 msgid "No Sametime Community Server Specified"
 msgstr "Sametime コミュニティ・サーバを指定して下さい"
 
+#: ../libpurple/protocols/sametime/sametime.c:3644 ../pidgin/gtkblist.c:4006
+msgid "Connect"
+msgstr "接続"
+
 #: ../libpurple/protocols/sametime/sametime.c:4135
 #, c-format
 msgid "Unknown (0x%04x)<br>"
@@ -8378,12 +8580,12 @@
 msgstr "Last Known Client:"
 
 #: ../libpurple/protocols/sametime/sametime.c:4301
-#: ../libpurple/protocols/sametime/sametime.c:5500
+#: ../libpurple/protocols/sametime/sametime.c:5506
 msgid "User Name"
 msgstr "ユーザ名"
 
 #: ../libpurple/protocols/sametime/sametime.c:4304
-#: ../libpurple/protocols/sametime/sametime.c:5503
+#: ../libpurple/protocols/sametime/sametime.c:5509
 msgid "Sametime ID"
 msgstr "Sametime ID"
 
@@ -8454,39 +8656,39 @@
 msgid "Synchronize List with Server"
 msgstr "サーバの仲間リストと同期する"
 
-#: ../libpurple/protocols/sametime/sametime.c:5209
+#: ../libpurple/protocols/sametime/sametime.c:5215
 #, c-format
 msgid "Import Sametime List for Account %s"
 msgstr "アカウント %s の Sametime リストを取り込む"
 
-#: ../libpurple/protocols/sametime/sametime.c:5249
+#: ../libpurple/protocols/sametime/sametime.c:5255
 #, c-format
 msgid "Export Sametime List for Account %s"
 msgstr "アカウント %s の Sametime リストを出力する"
 
-#: ../libpurple/protocols/sametime/sametime.c:5303
+#: ../libpurple/protocols/sametime/sametime.c:5309
 msgid "Unable to add group: group exists"
 msgstr "グループを追加できません: 既に存在しています"
 
-#: ../libpurple/protocols/sametime/sametime.c:5304
+#: ../libpurple/protocols/sametime/sametime.c:5310
 #, c-format
 msgid "A group named '%s' already exists in your buddy list."
 msgstr "既に '%s' というグループが仲間リストの中にあります"
 
-#: ../libpurple/protocols/sametime/sametime.c:5307
-#: ../libpurple/protocols/sametime/sametime.c:5437
+#: ../libpurple/protocols/sametime/sametime.c:5313
+#: ../libpurple/protocols/sametime/sametime.c:5443
 msgid "Unable to add group"
 msgstr "グループを追加できません"
 
-#: ../libpurple/protocols/sametime/sametime.c:5366
+#: ../libpurple/protocols/sametime/sametime.c:5372
 msgid "Possible Matches"
 msgstr "一致しそうなもの"
 
-#: ../libpurple/protocols/sametime/sametime.c:5382
+#: ../libpurple/protocols/sametime/sametime.c:5388
 msgid "Notes Address Book group results"
 msgstr "Notes アドレス帳グループの結果"
 
-#: ../libpurple/protocols/sametime/sametime.c:5383
+#: ../libpurple/protocols/sametime/sametime.c:5389
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following Notes Address "
@@ -8497,15 +8699,15 @@
 "ると思われます。仲間リストに追加する妥当なグループを次の一覧から選択して下さ"
 "い。"
 
-#: ../libpurple/protocols/sametime/sametime.c:5388
+#: ../libpurple/protocols/sametime/sametime.c:5394
 msgid "Select Notes Address Book"
 msgstr "Notes アドレス帳の選択"
 
-#: ../libpurple/protocols/sametime/sametime.c:5431
+#: ../libpurple/protocols/sametime/sametime.c:5437
 msgid "Unable to add group: group not found"
 msgstr "グループを追加できません: 見つかりません"
 
-#: ../libpurple/protocols/sametime/sametime.c:5433
+#: ../libpurple/protocols/sametime/sametime.c:5439
 #, c-format
 msgid ""
 "The identifier '%s' did not match any Notes Address Book groups in your "
@@ -8514,11 +8716,11 @@
 "ID '%s' に該当するグループが Sametime コミュニティの Notes アドレス帳グループ"
 "の中にはいませんでした。"
 
-#: ../libpurple/protocols/sametime/sametime.c:5474
+#: ../libpurple/protocols/sametime/sametime.c:5480
 msgid "Notes Address Book Group"
 msgstr "Notes アドレス帳グループ"
 
-#: ../libpurple/protocols/sametime/sametime.c:5475
+#: ../libpurple/protocols/sametime/sametime.c:5481
 msgid ""
 "Enter the name of a Notes Address Book group in the field below to add the "
 "group and its members to your buddy list."
@@ -8526,12 +8728,12 @@
 "次の欄に追加する Notes アドレス帳グループの名前を入力して仲間リストにそのグ"
 "ループのメンバを追加して下さい。"
 
-#: ../libpurple/protocols/sametime/sametime.c:5524
+#: ../libpurple/protocols/sametime/sametime.c:5530
 #, c-format
 msgid "Search results for '%s'"
 msgstr "'%s' の検索結果"
 
-#: ../libpurple/protocols/sametime/sametime.c:5525
+#: ../libpurple/protocols/sametime/sametime.c:5531
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following users. You "
@@ -8542,28 +8744,28 @@
 "のユーザを仲間リストに追加するか、または次のアクション・ボタンを選択して彼ら"
 "にメッセージを送信した方が良いでしょう。"
 
-#: ../libpurple/protocols/sametime/sametime.c:5532 ../pidgin/gtknotify.c:709
+#: ../libpurple/protocols/sametime/sametime.c:5538 ../pidgin/gtknotify.c:722
 msgid "Search Results"
 msgstr "検索結果"
 
-#: ../libpurple/protocols/sametime/sametime.c:5557
+#: ../libpurple/protocols/sametime/sametime.c:5563
 msgid "No matches"
 msgstr "見つかりません"
 
-#: ../libpurple/protocols/sametime/sametime.c:5558
+#: ../libpurple/protocols/sametime/sametime.c:5564
 #, c-format
 msgid "The identifier '%s' did not match any users in your Sametime community."
 msgstr "Sametime コミュニティには ID '%s' に一致するユーザはいませんでした"
 
-#: ../libpurple/protocols/sametime/sametime.c:5562
+#: ../libpurple/protocols/sametime/sametime.c:5568
 msgid "No Matches"
 msgstr "見つかりません"
 
-#: ../libpurple/protocols/sametime/sametime.c:5599
+#: ../libpurple/protocols/sametime/sametime.c:5605
 msgid "Search for a user"
 msgstr "ユーザの検索"
 
-#: ../libpurple/protocols/sametime/sametime.c:5600
+#: ../libpurple/protocols/sametime/sametime.c:5606
 msgid ""
 "Enter a name or partial ID in the field below to search for matching users "
 "in your Sametime community."
@@ -8571,97 +8773,123 @@
 "次の欄に名前または ID の一部を入力して Sametime コミュニティにいるユーザを検"
 "索して下さい"
 
-#: ../libpurple/protocols/sametime/sametime.c:5603
+#: ../libpurple/protocols/sametime/sametime.c:5609
 msgid "User Search"
 msgstr "ユーザの検索"
 
-#: ../libpurple/protocols/sametime/sametime.c:5616
+#: ../libpurple/protocols/sametime/sametime.c:5622
 msgid "Import Sametime List..."
 msgstr "Sametime リストを取り込む..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5620
+#: ../libpurple/protocols/sametime/sametime.c:5626
 msgid "Export Sametime List..."
 msgstr "Sametime リストを出力する..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5624
+#: ../libpurple/protocols/sametime/sametime.c:5630
 msgid "Add Notes Address Book Group..."
 msgstr "Notes アドレス帳グループを追加する..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5628
+#: ../libpurple/protocols/sametime/sametime.c:5634
 msgid "User Search..."
 msgstr "ユーザの検索..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5725
+#: ../libpurple/protocols/sametime/sametime.c:5740
 msgid "Force login (ignore server redirects)"
 msgstr "強制的にログインする (サーバからのリダイレクトを無視する)"
 
 #. pretend to be Sametime Connect
-#: ../libpurple/protocols/sametime/sametime.c:5735
+#: ../libpurple/protocols/sametime/sametime.c:5750
 msgid "Hide client identity"
 msgstr "クライアントの情報を隠す"
 
 #: ../libpurple/protocols/silc/buddy.c:52
-#: ../libpurple/protocols/silc/buddy.c:421
-#: ../libpurple/protocols/silc/buddy.c:546
-#: ../libpurple/protocols/silc/buddy.c:712
-#: ../libpurple/protocols/silc/ft.c:338
+#: ../libpurple/protocols/silc/buddy.c:410
+#: ../libpurple/protocols/silc/buddy.c:538
+#: ../libpurple/protocols/silc/buddy.c:700
+#: ../libpurple/protocols/silc/ft.c:423
+#: ../libpurple/protocols/silc10/buddy.c:52
+#: ../libpurple/protocols/silc10/buddy.c:421
+#: ../libpurple/protocols/silc10/buddy.c:546
+#: ../libpurple/protocols/silc10/buddy.c:712
+#: ../libpurple/protocols/silc10/ft.c:338
 #, c-format
 msgid "User %s is not present in the network"
 msgstr "ユーザの %s さんはネットワーク上にいません"
 
 #: ../libpurple/protocols/silc/buddy.c:53
+#: ../libpurple/protocols/silc/buddy.c:110
 #: ../libpurple/protocols/silc/buddy.c:115
-#: ../libpurple/protocols/silc/buddy.c:120
+#: ../libpurple/protocols/silc/buddy.c:119
 #: ../libpurple/protocols/silc/buddy.c:124
 #: ../libpurple/protocols/silc/buddy.c:129
 #: ../libpurple/protocols/silc/buddy.c:134
-#: ../libpurple/protocols/silc/buddy.c:139
-#: ../libpurple/protocols/silc/buddy.c:257
+#: ../libpurple/protocols/silc/buddy.c:254
+#: ../libpurple/protocols/silc10/buddy.c:53
+#: ../libpurple/protocols/silc10/buddy.c:115
+#: ../libpurple/protocols/silc10/buddy.c:120
+#: ../libpurple/protocols/silc10/buddy.c:124
+#: ../libpurple/protocols/silc10/buddy.c:129
+#: ../libpurple/protocols/silc10/buddy.c:134
+#: ../libpurple/protocols/silc10/buddy.c:139
+#: ../libpurple/protocols/silc10/buddy.c:257
 msgid "Key Agreement"
 msgstr "キーの同意"
 
 #: ../libpurple/protocols/silc/buddy.c:54
+#: ../libpurple/protocols/silc10/buddy.c:54
 msgid "Cannot perform the key agreement"
 msgstr "キーの同意を実行できません"
 
-#: ../libpurple/protocols/silc/buddy.c:116
+#: ../libpurple/protocols/silc/buddy.c:111
+#: ../libpurple/protocols/silc10/buddy.c:116
 msgid "Error occurred during key agreement"
 msgstr "キーに同意する際にエラーが発生しました"
 
-#: ../libpurple/protocols/silc/buddy.c:120
+#: ../libpurple/protocols/silc/buddy.c:115
+#: ../libpurple/protocols/silc10/buddy.c:120
 msgid "Key Agreement failed"
 msgstr "キーの同意に失敗しました"
 
-#: ../libpurple/protocols/silc/buddy.c:125
+#: ../libpurple/protocols/silc/buddy.c:120
+#: ../libpurple/protocols/silc10/buddy.c:125
 msgid "Timeout during key agreement"
 msgstr "キーに同意する際にタイムアウトしました"
 
+#: ../libpurple/protocols/silc/buddy.c:125
+#: ../libpurple/protocols/silc10/buddy.c:130
+msgid "Key agreement was aborted"
+msgstr "キーの同意が中断されました"
+
 #: ../libpurple/protocols/silc/buddy.c:130
-msgid "Key agreement was aborted"
-msgstr "キーの同意が中断されました"
-
-#: ../libpurple/protocols/silc/buddy.c:135
+#: ../libpurple/protocols/silc10/buddy.c:135
 msgid "Key agreement is already started"
 msgstr "既にキーの同意を開始しています"
 
-#: ../libpurple/protocols/silc/buddy.c:140
+#: ../libpurple/protocols/silc/buddy.c:135
+#: ../libpurple/protocols/silc10/buddy.c:140
 msgid "Key agreement cannot be started with yourself"
 msgstr "キーの同意を自分自身では開始できません"
 
-#: ../libpurple/protocols/silc/buddy.c:258
-#: ../libpurple/protocols/silc/buddy.c:389
-#: ../libpurple/protocols/silc/buddy.c:514
+#: ../libpurple/protocols/silc/buddy.c:255
+#: ../libpurple/protocols/silc/buddy.c:383
+#: ../libpurple/protocols/silc/buddy.c:497
+#: ../libpurple/protocols/silc/buddy.c:508
+#: ../libpurple/protocols/silc10/buddy.c:258
+#: ../libpurple/protocols/silc10/buddy.c:389
+#: ../libpurple/protocols/silc10/buddy.c:514
 msgid "The remote user is not present in the network any more"
 msgstr "リモート・ユーザはネットワーク等に存在しません"
 
-#: ../libpurple/protocols/silc/buddy.c:295
+#: ../libpurple/protocols/silc/buddy.c:298
+#: ../libpurple/protocols/silc10/buddy.c:295
 #, c-format
 msgid ""
 "Key agreement request received from %s. Would you like to perform the key "
 "agreement?"
 msgstr "%s さんからキーの同意要求を受け取りました。同意してもよろしいですか?"
 
-#: ../libpurple/protocols/silc/buddy.c:299
+#: ../libpurple/protocols/silc/buddy.c:302
+#: ../libpurple/protocols/silc10/buddy.c:299
 #, c-format
 msgid ""
 "The remote user is waiting key agreement on:\n"
@@ -8672,69 +8900,99 @@
 "リモート・ホスト: %s\n"
 "リモート・ポート: %d"
 
-#: ../libpurple/protocols/silc/buddy.c:312
+#: ../libpurple/protocols/silc/buddy.c:315
+#: ../libpurple/protocols/silc10/buddy.c:312
 msgid "Key Agreement Request"
 msgstr "キーの同意の要求"
 
-#: ../libpurple/protocols/silc/buddy.c:388
-#: ../libpurple/protocols/silc/buddy.c:423
-#: ../libpurple/protocols/silc/buddy.c:465
+#: ../libpurple/protocols/silc/buddy.c:382
+#: ../libpurple/protocols/silc/buddy.c:412
+#: ../libpurple/protocols/silc/buddy.c:452
+#: ../libpurple/protocols/silc10/buddy.c:388
+#: ../libpurple/protocols/silc10/buddy.c:423
+#: ../libpurple/protocols/silc10/buddy.c:465
 msgid "IM With Password"
 msgstr "パスワード付き IM"
 
-#: ../libpurple/protocols/silc/buddy.c:424
+#: ../libpurple/protocols/silc/buddy.c:413
+#: ../libpurple/protocols/silc10/buddy.c:424
 msgid "Cannot set IM key"
 msgstr "IM キーをセットできません"
 
-#: ../libpurple/protocols/silc/buddy.c:466
+#: ../libpurple/protocols/silc/buddy.c:453
+#: ../libpurple/protocols/silc10/buddy.c:466
 msgid "Set IM Password"
 msgstr "IM パスワードのセット"
 
-#: ../libpurple/protocols/silc/buddy.c:513
-#: ../libpurple/protocols/silc/buddy.c:548
-#: ../libpurple/protocols/silc/ops.c:1494
-#: ../libpurple/protocols/silc/ops.c:1505
+#: ../libpurple/protocols/silc/buddy.c:496
+#: ../libpurple/protocols/silc/buddy.c:507
+#: ../libpurple/protocols/silc/buddy.c:540
+#: ../libpurple/protocols/silc/ops.c:1499
+#: ../libpurple/protocols/silc/ops.c:1510
+#: ../libpurple/protocols/silc10/buddy.c:513
+#: ../libpurple/protocols/silc10/buddy.c:548
+#: ../libpurple/protocols/silc10/ops.c:1494
+#: ../libpurple/protocols/silc10/ops.c:1505
 msgid "Get Public Key"
 msgstr "公開鍵の取得"
 
-#: ../libpurple/protocols/silc/buddy.c:549
-#: ../libpurple/protocols/silc/ops.c:1495
-#: ../libpurple/protocols/silc/ops.c:1506
+#: ../libpurple/protocols/silc/buddy.c:541
+#: ../libpurple/protocols/silc/ops.c:1500
+#: ../libpurple/protocols/silc/ops.c:1511
+#: ../libpurple/protocols/silc10/buddy.c:549
+#: ../libpurple/protocols/silc10/ops.c:1495
+#: ../libpurple/protocols/silc10/ops.c:1506
 msgid "Cannot fetch the public key"
 msgstr "公開鍵を取得できません"
 
-#: ../libpurple/protocols/silc/buddy.c:635
-#: ../libpurple/protocols/silc/buddy.c:1654
+#: ../libpurple/protocols/silc/buddy.c:622
+#: ../libpurple/protocols/silc/buddy.c:1655
+#: ../libpurple/protocols/silc10/buddy.c:635
+#: ../libpurple/protocols/silc10/buddy.c:1654
 msgid "Show Public Key"
 msgstr "公開鍵の表示"
 
-#: ../libpurple/protocols/silc/buddy.c:636
-#: ../libpurple/protocols/silc/buddy.c:1033
+#: ../libpurple/protocols/silc/buddy.c:623
+#: ../libpurple/protocols/silc/buddy.c:1027
 #: ../libpurple/protocols/silc/chat.c:237
+#: ../libpurple/protocols/silc10/buddy.c:636
+#: ../libpurple/protocols/silc10/buddy.c:1033
+#: ../libpurple/protocols/silc10/chat.c:237
 msgid "Could not load public key"
 msgstr "公開鍵を読み込めませんでした"
 
-#: ../libpurple/protocols/silc/buddy.c:713
-#: ../libpurple/protocols/silc/ops.c:1087
-#: ../libpurple/protocols/silc/ops.c:1159
-#: ../libpurple/protocols/silc/ops.c:1294
-#: ../libpurple/protocols/silc/ops.c:1295
-#: ../libpurple/protocols/silc/ops.c:1313
+#: ../libpurple/protocols/silc/buddy.c:701
+#: ../libpurple/protocols/silc/ops.c:1053
+#: ../libpurple/protocols/silc/ops.c:1168
+#: ../libpurple/protocols/silc/ops.c:1288
+#: ../libpurple/protocols/silc/ops.c:1289
+#: ../libpurple/protocols/silc/ops.c:1307
+#: ../libpurple/protocols/silc10/buddy.c:713
+#: ../libpurple/protocols/silc10/ops.c:1087
+#: ../libpurple/protocols/silc10/ops.c:1159
+#: ../libpurple/protocols/silc10/ops.c:1294
+#: ../libpurple/protocols/silc10/ops.c:1295
+#: ../libpurple/protocols/silc10/ops.c:1313
 msgid "User Information"
 msgstr "ユーザ情報"
 
-#: ../libpurple/protocols/silc/buddy.c:714
-#: ../libpurple/protocols/silc/ops.c:1160
-#: ../libpurple/protocols/silc/ops.c:1314
+#: ../libpurple/protocols/silc/buddy.c:702
+#: ../libpurple/protocols/silc/ops.c:1169
+#: ../libpurple/protocols/silc/ops.c:1308
+#: ../libpurple/protocols/silc10/buddy.c:714
+#: ../libpurple/protocols/silc10/ops.c:1160
+#: ../libpurple/protocols/silc10/ops.c:1314
 msgid "Cannot get user information"
 msgstr "ユーザ情報を取得できません"
 
-#: ../libpurple/protocols/silc/buddy.c:735
+#: ../libpurple/protocols/silc/buddy.c:723
+#: ../libpurple/protocols/silc10/buddy.c:735
 #, c-format
 msgid "The %s buddy is not trusted"
 msgstr "仲間 %s は信用されていません"
 
-#: ../libpurple/protocols/silc/buddy.c:738
+#: ../libpurple/protocols/silc/buddy.c:726
+#: ../libpurple/protocols/silc10/buddy.c:738
 msgid ""
 "You cannot receive buddy notifications until you import his/her public key.  "
 "You can use the Get Public Key command to get the public key."
@@ -8743,16 +9001,19 @@
 "る際は、ボタン [公開鍵を取得する...] をクリックして下さい。"
 
 #. Open file selector to select the public key.
-#: ../libpurple/protocols/silc/buddy.c:1067
+#: ../libpurple/protocols/silc/buddy.c:1059
+#: ../libpurple/protocols/silc10/buddy.c:1067
 msgid "Open..."
 msgstr "開く..."
 
-#: ../libpurple/protocols/silc/buddy.c:1078
+#: ../libpurple/protocols/silc/buddy.c:1070
+#: ../libpurple/protocols/silc10/buddy.c:1078
 #, c-format
 msgid "The %s buddy is not present in the network"
 msgstr "仲間 %s はネットワーク上に存在しません"
 
-#: ../libpurple/protocols/silc/buddy.c:1081
+#: ../libpurple/protocols/silc/buddy.c:1073
+#: ../libpurple/protocols/silc10/buddy.c:1081
 msgid ""
 "To add the buddy you must import his/her public key. Press Import to import "
 "a public key."
@@ -8760,15 +9021,18 @@
 "仲間を追加するには公開鍵を取り込まなければなりません。公開鍵を取り込む際は、"
 "ボタン [インポートする...] をクリックして下さい。"
 
-#: ../libpurple/protocols/silc/buddy.c:1085
+#: ../libpurple/protocols/silc/buddy.c:1077
+#: ../libpurple/protocols/silc10/buddy.c:1085
 msgid "_Import..."
 msgstr "インポート(_I).."
 
-#: ../libpurple/protocols/silc/buddy.c:1181
+#: ../libpurple/protocols/silc/buddy.c:1183
+#: ../libpurple/protocols/silc10/buddy.c:1181
 msgid "Select correct user"
 msgstr "妥当なユーザの選択"
 
-#: ../libpurple/protocols/silc/buddy.c:1183
+#: ../libpurple/protocols/silc/buddy.c:1185
+#: ../libpurple/protocols/silc10/buddy.c:1183
 msgid ""
 "More than one user was found with the same public key. Select the correct "
 "user from the list to add to the buddy list."
@@ -8776,7 +9040,8 @@
 "同じ公開鍵を持ったユーザが一人以上います。仲間リストへ追加する妥当なユーザを"
 "一覧から選択して下さい。"
 
-#: ../libpurple/protocols/silc/buddy.c:1185
+#: ../libpurple/protocols/silc/buddy.c:1187
+#: ../libpurple/protocols/silc10/buddy.c:1185
 msgid ""
 "More than one user was found with the same name. Select the correct user "
 "from the list to add to the buddy list."
@@ -8785,237 +9050,318 @@
 "覧から選択して下さい。"
 
 #: ../libpurple/protocols/silc/buddy.c:1474
+#: ../libpurple/protocols/silc10/buddy.c:1474
 msgid "Detached"
 msgstr "切り離し済"
 
 #: ../libpurple/protocols/silc/buddy.c:1478
-#: ../libpurple/protocols/silc/silc.c:49
+#: ../libpurple/protocols/silc/silc.c:58
+#: ../libpurple/protocols/silc10/buddy.c:1478
+#: ../libpurple/protocols/silc10/silc.c:49
 msgid "Indisposed"
 msgstr "不適済"
 
 #: ../libpurple/protocols/silc/buddy.c:1482
-#: ../libpurple/protocols/silc/silc.c:51
+#: ../libpurple/protocols/silc/silc.c:60
+#: ../libpurple/protocols/silc10/buddy.c:1482
+#: ../libpurple/protocols/silc10/silc.c:51
 msgid "Wake Me Up"
 msgstr "起こして下さい"
 
 #: ../libpurple/protocols/silc/buddy.c:1484
-#: ../libpurple/protocols/silc/silc.c:43
+#: ../libpurple/protocols/silc/silc.c:52
+#: ../libpurple/protocols/silc10/buddy.c:1484
+#: ../libpurple/protocols/silc10/silc.c:43
 msgid "Hyper Active"
 msgstr "ハイパー・アクティブ"
 
 #: ../libpurple/protocols/silc/buddy.c:1486
+#: ../libpurple/protocols/silc10/buddy.c:1486
 msgid "Robot"
 msgstr "ロボット"
 
 #: ../libpurple/protocols/silc/buddy.c:1493
-#: ../libpurple/protocols/silc/silc.c:662
-#: ../libpurple/protocols/silc/util.c:512
+#: ../libpurple/protocols/silc/silc.c:743
+#: ../libpurple/protocols/silc/util.c:516
+#: ../libpurple/protocols/silc10/buddy.c:1493
+#: ../libpurple/protocols/silc10/silc.c:654
+#: ../libpurple/protocols/silc10/util.c:512
 msgid "Happy"
 msgstr "ハッピー"
 
 #: ../libpurple/protocols/silc/buddy.c:1495
-#: ../libpurple/protocols/silc/silc.c:664
-#: ../libpurple/protocols/silc/util.c:514
+#: ../libpurple/protocols/silc/silc.c:745
+#: ../libpurple/protocols/silc/util.c:518
+#: ../libpurple/protocols/silc10/buddy.c:1495
+#: ../libpurple/protocols/silc10/silc.c:656
+#: ../libpurple/protocols/silc10/util.c:514
 msgid "Sad"
 msgstr "悲しむ"
 
 #: ../libpurple/protocols/silc/buddy.c:1497
-#: ../libpurple/protocols/silc/silc.c:666
-#: ../libpurple/protocols/silc/util.c:516
+#: ../libpurple/protocols/silc/silc.c:747
+#: ../libpurple/protocols/silc/util.c:520
+#: ../libpurple/protocols/silc10/buddy.c:1497
+#: ../libpurple/protocols/silc10/silc.c:658
+#: ../libpurple/protocols/silc10/util.c:516
 msgid "Angry"
 msgstr "怒る"
 
 #: ../libpurple/protocols/silc/buddy.c:1499
-#: ../libpurple/protocols/silc/silc.c:668
-#: ../libpurple/protocols/silc/util.c:518
+#: ../libpurple/protocols/silc/silc.c:749
+#: ../libpurple/protocols/silc/util.c:522
+#: ../libpurple/protocols/silc10/buddy.c:1499
+#: ../libpurple/protocols/silc10/silc.c:660
+#: ../libpurple/protocols/silc10/util.c:518
 msgid "Jealous"
 msgstr "やきもち"
 
 #: ../libpurple/protocols/silc/buddy.c:1501
-#: ../libpurple/protocols/silc/silc.c:670
-#: ../libpurple/protocols/silc/util.c:520
+#: ../libpurple/protocols/silc/silc.c:751
+#: ../libpurple/protocols/silc/util.c:524
+#: ../libpurple/protocols/silc10/buddy.c:1501
+#: ../libpurple/protocols/silc10/silc.c:662
+#: ../libpurple/protocols/silc10/util.c:520
 msgid "Ashamed"
 msgstr "恥じる"
 
 #: ../libpurple/protocols/silc/buddy.c:1503
-#: ../libpurple/protocols/silc/silc.c:672
-#: ../libpurple/protocols/silc/util.c:522
+#: ../libpurple/protocols/silc/silc.c:753
+#: ../libpurple/protocols/silc/util.c:526
+#: ../libpurple/protocols/silc10/buddy.c:1503
+#: ../libpurple/protocols/silc10/silc.c:664
+#: ../libpurple/protocols/silc10/util.c:522
 msgid "Invincible"
 msgstr "無敵"
 
 #: ../libpurple/protocols/silc/buddy.c:1505
-#: ../libpurple/protocols/silc/util.c:524
+#: ../libpurple/protocols/silc/util.c:528
+#: ../libpurple/protocols/silc10/buddy.c:1505
+#: ../libpurple/protocols/silc10/util.c:524
 msgid "In Love"
 msgstr "恋愛中"
 
 #: ../libpurple/protocols/silc/buddy.c:1507
-#: ../libpurple/protocols/silc/silc.c:676
-#: ../libpurple/protocols/silc/util.c:526
+#: ../libpurple/protocols/silc/silc.c:757
+#: ../libpurple/protocols/silc/util.c:530
+#: ../libpurple/protocols/silc10/buddy.c:1507
+#: ../libpurple/protocols/silc10/silc.c:668
+#: ../libpurple/protocols/silc10/util.c:526
 msgid "Sleepy"
 msgstr "眠いよ"
 
 #: ../libpurple/protocols/silc/buddy.c:1509
-#: ../libpurple/protocols/silc/silc.c:678
-#: ../libpurple/protocols/silc/util.c:528
+#: ../libpurple/protocols/silc/silc.c:759
+#: ../libpurple/protocols/silc/util.c:532
+#: ../libpurple/protocols/silc10/buddy.c:1509
+#: ../libpurple/protocols/silc10/silc.c:670
+#: ../libpurple/protocols/silc10/util.c:528
 msgid "Bored"
 msgstr "うんざり"
 
 #: ../libpurple/protocols/silc/buddy.c:1511
-#: ../libpurple/protocols/silc/silc.c:680
-#: ../libpurple/protocols/silc/util.c:530
+#: ../libpurple/protocols/silc/silc.c:761
+#: ../libpurple/protocols/silc/util.c:534
+#: ../libpurple/protocols/silc10/buddy.c:1511
+#: ../libpurple/protocols/silc10/silc.c:672
+#: ../libpurple/protocols/silc10/util.c:530
 msgid "Excited"
 msgstr "興奮"
 
 #: ../libpurple/protocols/silc/buddy.c:1513
-#: ../libpurple/protocols/silc/silc.c:682
-#: ../libpurple/protocols/silc/util.c:532
+#: ../libpurple/protocols/silc/silc.c:763
+#: ../libpurple/protocols/silc/util.c:536
+#: ../libpurple/protocols/silc10/buddy.c:1513
+#: ../libpurple/protocols/silc10/silc.c:674
+#: ../libpurple/protocols/silc10/util.c:532
 msgid "Anxious"
 msgstr "心配"
 
 #: ../libpurple/protocols/silc/buddy.c:1545
-#: ../libpurple/protocols/silc/ops.c:1202
+#: ../libpurple/protocols/silc/ops.c:1207
+#: ../libpurple/protocols/silc10/buddy.c:1545
+#: ../libpurple/protocols/silc10/ops.c:1202
 msgid "User Modes"
 msgstr "ユーザ・モード"
 
 #: ../libpurple/protocols/silc/buddy.c:1557
-#: ../libpurple/protocols/silc/ops.c:1207
+#: ../libpurple/protocols/silc/ops.c:1212
+#: ../libpurple/protocols/silc10/buddy.c:1557
+#: ../libpurple/protocols/silc10/ops.c:1207
 msgid "Mood"
 msgstr "不機嫌"
 
 #: ../libpurple/protocols/silc/buddy.c:1562
-#: ../libpurple/protocols/silc/ops.c:1219
+#: ../libpurple/protocols/silc/ops.c:1224
+#: ../libpurple/protocols/silc10/buddy.c:1562
+#: ../libpurple/protocols/silc10/ops.c:1219
 msgid "Preferred Contact"
 msgstr "お好みの連絡先"
 
 #: ../libpurple/protocols/silc/buddy.c:1567
-#: ../libpurple/protocols/silc/ops.c:1224
+#: ../libpurple/protocols/silc/ops.c:1229
+#: ../libpurple/protocols/silc10/buddy.c:1567
+#: ../libpurple/protocols/silc10/ops.c:1224
 msgid "Preferred Language"
 msgstr "お好みの言語"
 
 #: ../libpurple/protocols/silc/buddy.c:1572
-#: ../libpurple/protocols/silc/ops.c:1229
+#: ../libpurple/protocols/silc/ops.c:1234
+#: ../libpurple/protocols/silc10/buddy.c:1572
+#: ../libpurple/protocols/silc10/ops.c:1229
 msgid "Device"
 msgstr "デバイス"
 
 #: ../libpurple/protocols/silc/buddy.c:1577
-#: ../libpurple/protocols/silc/ops.c:1234
-#: ../libpurple/protocols/silc/silc.c:730
-#: ../libpurple/protocols/silc/silc.c:732
+#: ../libpurple/protocols/silc/ops.c:1239
+#: ../libpurple/protocols/silc10/buddy.c:1577
+#: ../libpurple/protocols/silc10/ops.c:1234
+#: ../libpurple/protocols/silc10/silc.c:722
+#: ../libpurple/protocols/silc10/silc.c:724
 msgid "Timezone"
 msgstr "タイムゾーン"
 
 #: ../libpurple/protocols/silc/buddy.c:1582
-#: ../libpurple/protocols/silc/ops.c:1239
+#: ../libpurple/protocols/silc/ops.c:1244
+#: ../libpurple/protocols/silc10/buddy.c:1582
+#: ../libpurple/protocols/silc10/ops.c:1239
 msgid "Geolocation"
 msgstr "地理的位置"
 
-#: ../libpurple/protocols/silc/buddy.c:1636
+#: ../libpurple/protocols/silc/buddy.c:1638
+#: ../libpurple/protocols/silc10/buddy.c:1636
 msgid "Reset IM Key"
 msgstr "IM キーのリセット"
 
-#: ../libpurple/protocols/silc/buddy.c:1642
+#: ../libpurple/protocols/silc/buddy.c:1643
+#: ../libpurple/protocols/silc10/buddy.c:1642
 msgid "IM with Key Exchange"
 msgstr "キー交換付き IM"
 
-#: ../libpurple/protocols/silc/buddy.c:1647
+#: ../libpurple/protocols/silc/buddy.c:1648
+#: ../libpurple/protocols/silc10/buddy.c:1647
 msgid "IM with Password"
 msgstr "パスワード付き IM"
 
-#: ../libpurple/protocols/silc/buddy.c:1660
+#: ../libpurple/protocols/silc/buddy.c:1661
+#: ../libpurple/protocols/silc10/buddy.c:1660
 msgid "Get Public Key..."
 msgstr "公開鍵を取得する..."
 
-#: ../libpurple/protocols/silc/buddy.c:1667
-#: ../libpurple/protocols/silc/ops.c:1624
+#: ../libpurple/protocols/silc/buddy.c:1668
+#: ../libpurple/protocols/silc/ops.c:1608
+#: ../libpurple/protocols/silc10/buddy.c:1667
+#: ../libpurple/protocols/silc10/ops.c:1624
 msgid "Kill User"
 msgstr "ユーザの強制終了"
 
-#: ../libpurple/protocols/silc/buddy.c:1677
-#: ../libpurple/protocols/silc/chat.c:977
+#: ../libpurple/protocols/silc/buddy.c:1678
+#: ../libpurple/protocols/silc/chat.c:993
+#: ../libpurple/protocols/silc10/buddy.c:1677
+#: ../libpurple/protocols/silc10/chat.c:977
 msgid "Draw On Whiteboard"
 msgstr "ホワイトボードに描く"
 
 #: ../libpurple/protocols/silc/chat.c:39
+#: ../libpurple/protocols/silc10/chat.c:39
 msgid "_Passphrase:"
 msgstr "パスフレーズ(_P):"
 
 #: ../libpurple/protocols/silc/chat.c:80
+#: ../libpurple/protocols/silc10/chat.c:80
 #, c-format
 msgid "Channel %s does not exist in the network"
 msgstr "チャンネル %s はネットワーク上に存在しません"
 
 #: ../libpurple/protocols/silc/chat.c:81
-#: ../libpurple/protocols/silc/chat.c:174
+#: ../libpurple/protocols/silc/chat.c:175
+#: ../libpurple/protocols/silc10/chat.c:81
+#: ../libpurple/protocols/silc10/chat.c:174
 msgid "Channel Information"
 msgstr "チャンネル情報"
 
 #: ../libpurple/protocols/silc/chat.c:82
+#: ../libpurple/protocols/silc10/chat.c:82
 msgid "Cannot get channel information"
 msgstr "チャンネル情報を取得できません"
 
 #: ../libpurple/protocols/silc/chat.c:119
+#: ../libpurple/protocols/silc10/chat.c:119
 #, c-format
 msgid "<b>Channel Name:</b> %s"
 msgstr "<b>チャンネル名:</b> %s"
 
 #: ../libpurple/protocols/silc/chat.c:122
+#: ../libpurple/protocols/silc10/chat.c:122
 #, c-format
 msgid "<br><b>User Count:</b> %d"
 msgstr "<br><b>ユーザのカウント:</b> %d"
 
 #: ../libpurple/protocols/silc/chat.c:129
+#: ../libpurple/protocols/silc10/chat.c:129
 #, c-format
 msgid "<br><b>Channel Founder:</b> %s"
 msgstr "<br><b>チャンネル設立者:</b> %s"
 
 #: ../libpurple/protocols/silc/chat.c:138
+#: ../libpurple/protocols/silc10/chat.c:138
 #, c-format
 msgid "<br><b>Channel Cipher:</b> %s"
 msgstr "<br><b>チャンネル符号:</b> %s"
 
 #. Definition of HMAC: http://en.wikipedia.org/wiki/HMAC
-#: ../libpurple/protocols/silc/chat.c:142
+#: ../libpurple/protocols/silc/chat.c:143
+#: ../libpurple/protocols/silc10/chat.c:142
 #, c-format
 msgid "<br><b>Channel HMAC:</b> %s"
 msgstr "<br><b>チャンネル HMAC:</b> %s"
 
-#: ../libpurple/protocols/silc/chat.c:147
+#: ../libpurple/protocols/silc/chat.c:148
+#: ../libpurple/protocols/silc10/chat.c:147
 #, c-format
 msgid "<br><b>Channel Topic:</b><br>%s"
 msgstr "<br><b>チャンネル・トピック:</b><br>%s"
 
-#: ../libpurple/protocols/silc/chat.c:152
+#: ../libpurple/protocols/silc/chat.c:153
+#: ../libpurple/protocols/silc10/chat.c:152
 msgid "<br><b>Channel Modes:</b> "
 msgstr "<br><b>チャンネル・モード:</b> "
 
-#: ../libpurple/protocols/silc/chat.c:165
+#: ../libpurple/protocols/silc/chat.c:166
+#: ../libpurple/protocols/silc10/chat.c:165
 #, c-format
 msgid "<br><b>Founder Key Fingerprint:</b><br>%s"
 msgstr "<br><b>創立者キーの指紋:</b><br>%s"
 
-#: ../libpurple/protocols/silc/chat.c:166
+#: ../libpurple/protocols/silc/chat.c:167
+#: ../libpurple/protocols/silc10/chat.c:166
 #, c-format
 msgid "<br><b>Founder Key Babbleprint:</b><br>%s"
 msgstr "<br><b>創立者キーの Babbleprint:</b><br>%s"
 
 #: ../libpurple/protocols/silc/chat.c:236
+#: ../libpurple/protocols/silc10/chat.c:236
 msgid "Add Channel Public Key"
 msgstr "チャンネル公開鍵の追加"
 
 #. Add new public key
-#: ../libpurple/protocols/silc/chat.c:291
+#: ../libpurple/protocols/silc/chat.c:304
+#: ../libpurple/protocols/silc10/chat.c:291
 msgid "Open Public Key..."
 msgstr "公開鍵を開く..."
 
-#: ../libpurple/protocols/silc/chat.c:401
+#: ../libpurple/protocols/silc/chat.c:423
+#: ../libpurple/protocols/silc10/chat.c:401
 msgid "Channel Passphrase"
 msgstr "チャンネルのパスフレーズ"
 
-#: ../libpurple/protocols/silc/chat.c:408
+#: ../libpurple/protocols/silc/chat.c:430
+#: ../libpurple/protocols/silc10/chat.c:408
 msgid "Channel Public Keys List"
 msgstr "チャンネル公開鍵の一覧"
 
-#: ../libpurple/protocols/silc/chat.c:413
+#: ../libpurple/protocols/silc/chat.c:435
+#: ../libpurple/protocols/silc10/chat.c:413
 msgid ""
 "Channel authentication is used to secure the channel from unauthorized "
 "access. The authentication may be based on passphrase and digital "
@@ -9028,333 +9374,446 @@
 "がセットされていると参加するためのパスフレーズが要求され、チャンネルの公開鍵"
 "がセットされていると、公開鍵が一覧表示されているユーザのみ参加可能です。"
 
-#: ../libpurple/protocols/silc/chat.c:422
-#: ../libpurple/protocols/silc/chat.c:423
-#: ../libpurple/protocols/silc/chat.c:461
-#: ../libpurple/protocols/silc/chat.c:462
-#: ../libpurple/protocols/silc/chat.c:911
+#: ../libpurple/protocols/silc/chat.c:444
+#: ../libpurple/protocols/silc/chat.c:445
+#: ../libpurple/protocols/silc/chat.c:479
+#: ../libpurple/protocols/silc/chat.c:480
+#: ../libpurple/protocols/silc/chat.c:927
+#: ../libpurple/protocols/silc10/chat.c:422
+#: ../libpurple/protocols/silc10/chat.c:423
+#: ../libpurple/protocols/silc10/chat.c:461
+#: ../libpurple/protocols/silc10/chat.c:462
+#: ../libpurple/protocols/silc10/chat.c:911
 msgid "Channel Authentication"
 msgstr "チャンネル認証"
 
-#: ../libpurple/protocols/silc/chat.c:424
-#: ../libpurple/protocols/silc/chat.c:463
+#: ../libpurple/protocols/silc/chat.c:446
+#: ../libpurple/protocols/silc/chat.c:481
+#: ../libpurple/protocols/silc10/chat.c:424
+#: ../libpurple/protocols/silc10/chat.c:463
 msgid "Add / Remove"
 msgstr "追加 / 削除"
 
-#: ../libpurple/protocols/silc/chat.c:581
+#: ../libpurple/protocols/silc/chat.c:597
+#: ../libpurple/protocols/silc10/chat.c:581
 msgid "Group Name"
 msgstr "グループ名"
 
-#: ../libpurple/protocols/silc/chat.c:585
-#: ../libpurple/protocols/silc/ops.c:1910
-#: ../libpurple/protocols/silc/silc.c:939
+#: ../libpurple/protocols/silc/chat.c:601
+#: ../libpurple/protocols/silc/ops.c:1813
+#: ../libpurple/protocols/silc/silc.c:1020
+#: ../libpurple/protocols/silc10/chat.c:585
+#: ../libpurple/protocols/silc10/ops.c:1901
+#: ../libpurple/protocols/silc10/silc.c:931
 msgid "Passphrase"
 msgstr "パスフレーズ"
 
-#: ../libpurple/protocols/silc/chat.c:596
+#: ../libpurple/protocols/silc/chat.c:612
+#: ../libpurple/protocols/silc10/chat.c:596
 #, c-format
 msgid "Please enter the %s channel private group name and passphrase."
 msgstr ""
 "チャンネル %s のプライベートなグループ名とパフフレーズを入力して下さい。"
 
-#: ../libpurple/protocols/silc/chat.c:598
+#: ../libpurple/protocols/silc/chat.c:614
+#: ../libpurple/protocols/silc10/chat.c:598
 msgid "Add Channel Private Group"
 msgstr "プライベートなグループの追加"
 
-#: ../libpurple/protocols/silc/chat.c:726
+#: ../libpurple/protocols/silc/chat.c:742
+#: ../libpurple/protocols/silc10/chat.c:726
 msgid "User Limit"
 msgstr "ユーザの制限"
 
-#: ../libpurple/protocols/silc/chat.c:727
+#: ../libpurple/protocols/silc/chat.c:743
+#: ../libpurple/protocols/silc10/chat.c:727
 msgid "Set user limit on channel. Set to zero to reset user limit."
 msgstr ""
 "チャンネルで制限するユーザをセットして下さい (0: ユーザ制限をクリアします)。"
 
-#: ../libpurple/protocols/silc/chat.c:891
+#: ../libpurple/protocols/silc/chat.c:907
+#: ../libpurple/protocols/silc10/chat.c:891
 msgid "Invite List"
 msgstr "招待リスト"
 
-#: ../libpurple/protocols/silc/chat.c:896
+#: ../libpurple/protocols/silc/chat.c:912
+#: ../libpurple/protocols/silc10/chat.c:896
 msgid "Ban List"
 msgstr "追い出しリスト"
 
-#: ../libpurple/protocols/silc/chat.c:904
+#: ../libpurple/protocols/silc/chat.c:920
+#: ../libpurple/protocols/silc10/chat.c:904
 msgid "Add Private Group"
 msgstr "プライベート・グループの追加"
 
-#: ../libpurple/protocols/silc/chat.c:917
+#: ../libpurple/protocols/silc/chat.c:933
+#: ../libpurple/protocols/silc10/chat.c:917
 msgid "Reset Permanent"
 msgstr "永続性 OFF"
 
-#: ../libpurple/protocols/silc/chat.c:922
+#: ../libpurple/protocols/silc/chat.c:938
+#: ../libpurple/protocols/silc10/chat.c:922
 msgid "Set Permanent"
 msgstr "永続性 ON"
 
-#: ../libpurple/protocols/silc/chat.c:930
+#: ../libpurple/protocols/silc/chat.c:946
+#: ../libpurple/protocols/silc10/chat.c:930
 msgid "Set User Limit"
 msgstr "ユーザ制限 ON"
 
-#: ../libpurple/protocols/silc/chat.c:936
+#: ../libpurple/protocols/silc/chat.c:952
+#: ../libpurple/protocols/silc10/chat.c:936
 msgid "Reset Topic Restriction"
 msgstr "トピック限定 OFF"
 
-#: ../libpurple/protocols/silc/chat.c:941
+#: ../libpurple/protocols/silc/chat.c:957
+#: ../libpurple/protocols/silc10/chat.c:941
 msgid "Set Topic Restriction"
 msgstr "トピック限定 ON"
 
-#: ../libpurple/protocols/silc/chat.c:948
+#: ../libpurple/protocols/silc/chat.c:964
+#: ../libpurple/protocols/silc10/chat.c:948
 msgid "Reset Private Channel"
 msgstr "プライベートなチャンネル OFF"
 
-#: ../libpurple/protocols/silc/chat.c:953
+#: ../libpurple/protocols/silc/chat.c:969
+#: ../libpurple/protocols/silc10/chat.c:953
 msgid "Set Private Channel"
 msgstr "プライベートなチャンネル ON"
 
-#: ../libpurple/protocols/silc/chat.c:960
+#: ../libpurple/protocols/silc/chat.c:976
+#: ../libpurple/protocols/silc10/chat.c:960
 msgid "Reset Secret Channel"
 msgstr "シークレットなチャンネル OFF"
 
-#: ../libpurple/protocols/silc/chat.c:965
+#: ../libpurple/protocols/silc/chat.c:981
+#: ../libpurple/protocols/silc10/chat.c:965
 msgid "Set Secret Channel"
 msgstr "シークレットなチャンネル ON"
 
-#: ../libpurple/protocols/silc/chat.c:1039
-#, c-format
-msgid "You are channel founder on <I>%s</I>"
-msgstr "あなたは <I>%s</I> のチャンネル創設者です"
-
-#: ../libpurple/protocols/silc/chat.c:1043
-#, c-format
-msgid "Channel founder on <I>%s</I> is <I>%s</I>"
-msgstr "<I>%s</I> のチャンネル創設者は <I>%s</I> です"
-
-#: ../libpurple/protocols/silc/chat.c:1102
+#: ../libpurple/protocols/silc/chat.c:1045
+#: ../libpurple/protocols/silc10/chat.c:1102
 #, c-format
 msgid ""
 "You have to join the %s channel before you are able to join the private group"
 msgstr "プライベートなグループへ参加する前にチャンネル %s へ参加して下さい"
 
-#: ../libpurple/protocols/silc/chat.c:1104
+#: ../libpurple/protocols/silc/chat.c:1047
+#: ../libpurple/protocols/silc10/chat.c:1104
 msgid "Join Private Group"
 msgstr "プライベート・グループへ参加"
 
-#: ../libpurple/protocols/silc/chat.c:1105
+#: ../libpurple/protocols/silc/chat.c:1048
+#: ../libpurple/protocols/silc10/chat.c:1105
 msgid "Cannot join private group"
 msgstr "プライベート・グループへ参加できません"
 
-#: ../libpurple/protocols/silc/chat.c:1299
-#: ../libpurple/protocols/silc/silc.c:1148
+#: ../libpurple/protocols/silc/chat.c:1260
+#: ../libpurple/protocols/silc/silc.c:1217
+#: ../libpurple/protocols/silc10/chat.c:1299
+#: ../libpurple/protocols/silc10/silc.c:1137
 msgid "Call Command"
 msgstr "コマンドの実行"
 
-#: ../libpurple/protocols/silc/chat.c:1299
-#: ../libpurple/protocols/silc/silc.c:1148
+#: ../libpurple/protocols/silc/chat.c:1260
+#: ../libpurple/protocols/silc/silc.c:1218
+#: ../libpurple/protocols/silc10/chat.c:1299
+#: ../libpurple/protocols/silc10/silc.c:1137
 msgid "Cannot call command"
 msgstr "コマンドを実行できません"
 
-#: ../libpurple/protocols/silc/chat.c:1300
-#: ../libpurple/protocols/silc/silc.c:1149
+#: ../libpurple/protocols/silc/chat.c:1261
+#: ../libpurple/protocols/silc/silc.c:1219
+#: ../libpurple/protocols/silc10/chat.c:1300
+#: ../libpurple/protocols/silc10/silc.c:1138
 msgid "Unknown command"
 msgstr "不明なコマンド"
 
-#: ../libpurple/protocols/silc/ft.c:89 ../libpurple/protocols/silc/ft.c:92
-#: ../libpurple/protocols/silc/ft.c:96 ../libpurple/protocols/silc/ft.c:100
-#: ../libpurple/protocols/silc/ft.c:104 ../libpurple/protocols/silc/ft.c:205
-#: ../libpurple/protocols/silc/ft.c:210 ../libpurple/protocols/silc/ft.c:215
-#: ../libpurple/protocols/silc/ft.c:221 ../libpurple/protocols/silc/ft.c:340
+#: ../libpurple/protocols/silc/ft.c:85 ../libpurple/protocols/silc/ft.c:101
+#: ../libpurple/protocols/silc/ft.c:104 ../libpurple/protocols/silc/ft.c:108
+#: ../libpurple/protocols/silc/ft.c:112 ../libpurple/protocols/silc/ft.c:116
+#: ../libpurple/protocols/silc/ft.c:120 ../libpurple/protocols/silc/ft.c:272
+#: ../libpurple/protocols/silc/ft.c:277 ../libpurple/protocols/silc/ft.c:282
+#: ../libpurple/protocols/silc/ft.c:288 ../libpurple/protocols/silc/ft.c:425
+#: ../libpurple/protocols/silc10/ft.c:89 ../libpurple/protocols/silc10/ft.c:92
+#: ../libpurple/protocols/silc10/ft.c:96
+#: ../libpurple/protocols/silc10/ft.c:100
+#: ../libpurple/protocols/silc10/ft.c:104
+#: ../libpurple/protocols/silc10/ft.c:205
+#: ../libpurple/protocols/silc10/ft.c:210
+#: ../libpurple/protocols/silc10/ft.c:215
+#: ../libpurple/protocols/silc10/ft.c:221
+#: ../libpurple/protocols/silc10/ft.c:340
 msgid "Secure File Transfer"
 msgstr "セキュアなファイル転送"
 
-#: ../libpurple/protocols/silc/ft.c:90 ../libpurple/protocols/silc/ft.c:93
-#: ../libpurple/protocols/silc/ft.c:97 ../libpurple/protocols/silc/ft.c:101
-#: ../libpurple/protocols/silc/ft.c:105
+#: ../libpurple/protocols/silc/ft.c:86 ../libpurple/protocols/silc/ft.c:102
+#: ../libpurple/protocols/silc/ft.c:105 ../libpurple/protocols/silc/ft.c:109
+#: ../libpurple/protocols/silc/ft.c:113 ../libpurple/protocols/silc/ft.c:117
+#: ../libpurple/protocols/silc/ft.c:121 ../libpurple/protocols/silc10/ft.c:90
+#: ../libpurple/protocols/silc10/ft.c:93 ../libpurple/protocols/silc10/ft.c:97
+#: ../libpurple/protocols/silc10/ft.c:101
+#: ../libpurple/protocols/silc10/ft.c:105
 msgid "Error during file transfer"
 msgstr "ファイルを転送する際にエラー"
 
-#: ../libpurple/protocols/silc/ft.c:94
+#: ../libpurple/protocols/silc/ft.c:87
+msgid "Remote disconnected"
+msgstr "リモート側で接続を切りました"
+
+#: ../libpurple/protocols/silc/ft.c:106 ../libpurple/protocols/silc10/ft.c:94
 msgid "Permission denied"
 msgstr "権限がありません"
 
-#: ../libpurple/protocols/silc/ft.c:98
+#: ../libpurple/protocols/silc/ft.c:110 ../libpurple/protocols/silc10/ft.c:98
 msgid "Key agreement failed"
 msgstr "キーの同意に失敗しました"
 
-#: ../libpurple/protocols/silc/ft.c:102
+#: ../libpurple/protocols/silc/ft.c:114
+msgid "Connection timedout"
+msgstr "接続がタイムアウトしました"
+
+#: ../libpurple/protocols/silc/ft.c:118
+msgid "Creating connection failed"
+msgstr "接続に失敗しました"
+
+#: ../libpurple/protocols/silc/ft.c:122 ../libpurple/protocols/silc10/ft.c:102
 msgid "File transfer session does not exist"
 msgstr "ファイル転送セッションがありません"
 
-#: ../libpurple/protocols/silc/ft.c:206
+#: ../libpurple/protocols/silc/ft.c:273 ../libpurple/protocols/silc10/ft.c:206
 msgid "No file transfer session active"
 msgstr "ファイル転送セッションがアクティブではありません"
 
-#: ../libpurple/protocols/silc/ft.c:211
+#: ../libpurple/protocols/silc/ft.c:278 ../libpurple/protocols/silc10/ft.c:211
 msgid "File transfer already started"
 msgstr "既にファイル転送を開始しています"
 
-#: ../libpurple/protocols/silc/ft.c:216
+#: ../libpurple/protocols/silc/ft.c:283 ../libpurple/protocols/silc10/ft.c:216
 msgid "Could not perform key agreement for file transfer"
 msgstr "ファイル転送に必要なキーの同意を実行できませんでした"
 
-#: ../libpurple/protocols/silc/ft.c:222
+#: ../libpurple/protocols/silc/ft.c:289 ../libpurple/protocols/silc10/ft.c:222
 msgid "Could not start the file transfer"
 msgstr "ファイル転送を開始できませんでした"
 
-#: ../libpurple/protocols/silc/ft.c:341
+#: ../libpurple/protocols/silc/ft.c:426 ../libpurple/protocols/silc10/ft.c:341
 msgid "Cannot send file"
 msgstr "ファイルを送信できません"
 
-#: ../libpurple/protocols/silc/ops.c:554 ../libpurple/protocols/silc/ops.c:563
-#: ../libpurple/protocols/silc/ops.c:572
+#: ../libpurple/protocols/silc/ops.c:57
+msgid "Error occurred"
+msgstr "エラーが発生しました"
+
+#: ../libpurple/protocols/silc/ops.c:533 ../libpurple/protocols/silc/ops.c:542
+#: ../libpurple/protocols/silc/ops.c:551
+#: ../libpurple/protocols/silc10/ops.c:554
+#: ../libpurple/protocols/silc10/ops.c:563
+#: ../libpurple/protocols/silc10/ops.c:572
 #, c-format
 msgid "%s has changed the topic of <I>%s</I> to: %s"
 msgstr "%s は <I>%s</I> のトピックを %s へ変更しました:"
 
-#: ../libpurple/protocols/silc/ops.c:638
+#: ../libpurple/protocols/silc/ops.c:617
+#: ../libpurple/protocols/silc10/ops.c:638
 #, c-format
 msgid "<I>%s</I> set channel <I>%s</I> modes to: %s"
 msgstr "<I>%s</I> はチャンネル <I>%s</I> のモードを %s へセットしました:"
 
-#: ../libpurple/protocols/silc/ops.c:642
+#: ../libpurple/protocols/silc/ops.c:621
+#: ../libpurple/protocols/silc10/ops.c:642
 #, c-format
 msgid "<I>%s</I> removed all channel <I>%s</I> modes"
 msgstr "<I>%s</I> はチャンネル <I>%s</I> の全てのモードを削除しました:"
 
-#: ../libpurple/protocols/silc/ops.c:675
+#: ../libpurple/protocols/silc/ops.c:654
+#: ../libpurple/protocols/silc10/ops.c:675
 #, c-format
 msgid "<I>%s</I> set <I>%s's</I> modes to: %s"
 msgstr "<I>%s</I> は <I>%s の</I> モードを %s へセットしました:"
 
-#: ../libpurple/protocols/silc/ops.c:683
+#: ../libpurple/protocols/silc/ops.c:662
+#: ../libpurple/protocols/silc10/ops.c:683
 #, c-format
 msgid "<I>%s</I> removed all <I>%s's</I> modes"
 msgstr "<I>%s</I> は <I>%s の</I> 全てのモードを削除しました:"
 
-#: ../libpurple/protocols/silc/ops.c:712
+#: ../libpurple/protocols/silc/ops.c:691
+#: ../libpurple/protocols/silc10/ops.c:712
 #, c-format
 msgid "You have been kicked off <I>%s</I> by <I>%s</I> (%s)"
 msgstr "あなたは <I>%s</I> から <I>%s</I> (%s) によって追い出されました:"
 
-#: ../libpurple/protocols/silc/ops.c:742 ../libpurple/protocols/silc/ops.c:747
-#: ../libpurple/protocols/silc/ops.c:752
+#: ../libpurple/protocols/silc/ops.c:718 ../libpurple/protocols/silc/ops.c:723
+#: ../libpurple/protocols/silc/ops.c:728
+#: ../libpurple/protocols/silc10/ops.c:742
+#: ../libpurple/protocols/silc10/ops.c:747
+#: ../libpurple/protocols/silc10/ops.c:752
 #, c-format
 msgid "You have been killed by %s (%s)"
 msgstr "あなたは %s (%s) によって強制終了させられました:"
 
-#: ../libpurple/protocols/silc/ops.c:773 ../libpurple/protocols/silc/ops.c:778
-#: ../libpurple/protocols/silc/ops.c:783
+#: ../libpurple/protocols/silc/ops.c:749 ../libpurple/protocols/silc/ops.c:754
+#: ../libpurple/protocols/silc/ops.c:759
+#: ../libpurple/protocols/silc10/ops.c:773
+#: ../libpurple/protocols/silc10/ops.c:778
+#: ../libpurple/protocols/silc10/ops.c:783
 #, c-format
 msgid "Killed by %s (%s)"
 msgstr "%s (%s) によって強制終了させられました"
 
-#: ../libpurple/protocols/silc/ops.c:829
+#: ../libpurple/protocols/silc/ops.c:796
+#: ../libpurple/protocols/silc10/ops.c:829
 msgid "Server signoff"
 msgstr "サーバのサインオフ"
 
-#: ../libpurple/protocols/silc/ops.c:1017
+#: ../libpurple/protocols/silc/ops.c:983
+#: ../libpurple/protocols/silc10/ops.c:1017
 msgid "Personal Information"
 msgstr "個人情報"
 
-#: ../libpurple/protocols/silc/ops.c:1040
+#: ../libpurple/protocols/silc/ops.c:1006
+#: ../libpurple/protocols/silc10/ops.c:1040
 msgid "Birth Day"
 msgstr "誕生日"
 
-#: ../libpurple/protocols/silc/ops.c:1048
+#: ../libpurple/protocols/silc/ops.c:1014
+#: ../libpurple/protocols/silc10/ops.c:1048
 msgid "Job Role"
 msgstr "役職"
 
-#: ../libpurple/protocols/silc/ops.c:1052
-#: ../libpurple/protocols/silc/silc.c:932
+#: ../libpurple/protocols/silc/ops.c:1018
+#: ../libpurple/protocols/silc/silc.c:1013
+#: ../libpurple/protocols/silc10/ops.c:1052
+#: ../libpurple/protocols/silc10/silc.c:924
 msgid "Organization"
 msgstr "担当部署"
 
-#: ../libpurple/protocols/silc/ops.c:1056
+#: ../libpurple/protocols/silc/ops.c:1022
+#: ../libpurple/protocols/silc10/ops.c:1056
 msgid "Unit"
 msgstr "グループ"
 
-#: ../libpurple/protocols/silc/ops.c:1080
+#: ../libpurple/protocols/silc/ops.c:1046
+#: ../libpurple/protocols/silc10/ops.c:1080
 msgid "Note"
 msgstr "備考"
 
-#: ../libpurple/protocols/silc/ops.c:1128
+#: ../libpurple/protocols/silc/ops.c:1093
+#: ../libpurple/protocols/silc10/ops.c:1128
 msgid "Join Chat"
 msgstr "チャットに参加"
 
-#: ../libpurple/protocols/silc/ops.c:1183
-#: ../libpurple/protocols/silc/ops.c:1332
+#: ../libpurple/protocols/silc/ops.c:1127
+#: ../libpurple/protocols/silc10/chat.c:1039
+#, c-format
+msgid "You are channel founder on <I>%s</I>"
+msgstr "あなたは <I>%s</I> のチャンネル創設者です"
+
+#: ../libpurple/protocols/silc/ops.c:1131
+#: ../libpurple/protocols/silc10/chat.c:1043
+#, c-format
+msgid "Channel founder on <I>%s</I> is <I>%s</I>"
+msgstr "<I>%s</I> のチャンネル創設者は <I>%s</I> です"
+
+#: ../libpurple/protocols/silc/ops.c:1190
+#: ../libpurple/protocols/silc/ops.c:1326
+#: ../libpurple/protocols/silc10/ops.c:1183
+#: ../libpurple/protocols/silc10/ops.c:1332
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1047
 msgid "Real Name"
 msgstr "氏名"
 
-#: ../libpurple/protocols/silc/ops.c:1213
+#: ../libpurple/protocols/silc/ops.c:1218
+#: ../libpurple/protocols/silc10/ops.c:1213
 msgid "Status Text"
 msgstr "ステータス文"
 
-#: ../libpurple/protocols/silc/ops.c:1285
-#: ../libpurple/protocols/silc/ops.c:1357
+#: ../libpurple/protocols/silc/ops.c:1279
+#: ../libpurple/protocols/silc/ops.c:1351
+#: ../libpurple/protocols/silc10/ops.c:1285
+#: ../libpurple/protocols/silc10/ops.c:1357
 msgid "Public Key Fingerprint"
 msgstr "公開鍵の指紋"
 
-#: ../libpurple/protocols/silc/ops.c:1286
-#: ../libpurple/protocols/silc/ops.c:1358
+#: ../libpurple/protocols/silc/ops.c:1280
+#: ../libpurple/protocols/silc/ops.c:1352
+#: ../libpurple/protocols/silc10/ops.c:1286
+#: ../libpurple/protocols/silc10/ops.c:1358
 msgid "Public Key Babbleprint"
 msgstr "公開鍵の Babbleprint"
 
-#: ../libpurple/protocols/silc/ops.c:1298
+#: ../libpurple/protocols/silc/ops.c:1292
+#: ../libpurple/protocols/silc10/ops.c:1298
 msgid "_More..."
 msgstr "詳細(_M)..."
 
-#: ../libpurple/protocols/silc/ops.c:1371
-#: ../libpurple/protocols/silc/silc.c:999
+#: ../libpurple/protocols/silc/ops.c:1369
+#: ../libpurple/protocols/silc/silc.c:1077
+#: ../libpurple/protocols/silc10/ops.c:1371
+#: ../libpurple/protocols/silc10/silc.c:988
 msgid "Detach From Server"
 msgstr "サーバから切り離す"
 
-#: ../libpurple/protocols/silc/ops.c:1371
+#: ../libpurple/protocols/silc/ops.c:1369
+#: ../libpurple/protocols/silc10/ops.c:1371
 msgid "Cannot detach"
 msgstr "切り離せません"
 
-#: ../libpurple/protocols/silc/ops.c:1382
+#: ../libpurple/protocols/silc/ops.c:1389
+#: ../libpurple/protocols/silc10/ops.c:1382
 msgid "Cannot set topic"
 msgstr "トピックをセットできません"
 
-#: ../libpurple/protocols/silc/ops.c:1414
+#: ../libpurple/protocols/silc/ops.c:1418
+#: ../libpurple/protocols/silc10/ops.c:1414
 msgid "Failed to change nickname"
 msgstr "あだ名の変更に失敗しました"
 
-#: ../libpurple/protocols/silc/ops.c:1462
+#: ../libpurple/protocols/silc/ops.c:1467
+#: ../libpurple/protocols/silc10/ops.c:1462
 msgid "Roomlist"
 msgstr "部屋のリスト"
 
-#: ../libpurple/protocols/silc/ops.c:1462
+#: ../libpurple/protocols/silc/ops.c:1467
+#: ../libpurple/protocols/silc10/ops.c:1462
 msgid "Cannot get room list"
 msgstr "部屋のリストを取得できません"
 
-#: ../libpurple/protocols/silc/ops.c:1507
+#: ../libpurple/protocols/silc/ops.c:1468
+msgid "Network is empty"
+msgstr "ネットワークの情報が空です"
+
+#: ../libpurple/protocols/silc/ops.c:1512
+#: ../libpurple/protocols/silc10/ops.c:1507
 msgid "No public key was received"
 msgstr "公開鍵を受け取っていません"
 
-#: ../libpurple/protocols/silc/ops.c:1519
-#: ../libpurple/protocols/silc/ops.c:1532
+#: ../libpurple/protocols/silc/ops.c:1524
+#: ../libpurple/protocols/silc/ops.c:1537
+#: ../libpurple/protocols/silc10/ops.c:1519
+#: ../libpurple/protocols/silc10/ops.c:1532
 msgid "Server Information"
 msgstr "サーバの情報"
 
-#: ../libpurple/protocols/silc/ops.c:1520
+#: ../libpurple/protocols/silc/ops.c:1525
+#: ../libpurple/protocols/silc10/ops.c:1520
 msgid "Cannot get server information"
 msgstr "サーバの情報を取得できません"
 
-#: ../libpurple/protocols/silc/ops.c:1549
-#: ../libpurple/protocols/silc/ops.c:1558
+#: ../libpurple/protocols/silc/ops.c:1548
+#: ../libpurple/protocols/silc10/ops.c:1549
+#: ../libpurple/protocols/silc10/ops.c:1558
 msgid "Server Statistics"
 msgstr "サーバの統計情報"
 
-#: ../libpurple/protocols/silc/ops.c:1550
+#: ../libpurple/protocols/silc/ops.c:1549
+#: ../libpurple/protocols/silc10/ops.c:1550
 msgid "Cannot get server statistics"
 msgstr "サーバの統計情報を取得できません"
 
-#: ../libpurple/protocols/silc/ops.c:1559
-msgid "No server statistics available"
-msgstr "サーバの統計情報は利用できません"
-
-#: ../libpurple/protocols/silc/ops.c:1581
+#: ../libpurple/protocols/silc/ops.c:1556
+#: ../libpurple/protocols/silc10/ops.c:1581
 #, c-format
 msgid ""
 "Local server start time: %s\n"
@@ -9389,106 +9848,66 @@
 "サーバのオペレータ数の合計: %d\n"
 "ルータのオペレータ数の合計: %d\n"
 
-#: ../libpurple/protocols/silc/ops.c:1604
+#: ../libpurple/protocols/silc/ops.c:1588
+#: ../libpurple/protocols/silc10/ops.c:1604
 msgid "Network Statistics"
 msgstr "ネットワークの統計情報"
 
-#: ../libpurple/protocols/silc/ops.c:1612
-#: ../libpurple/protocols/silc/ops.c:1617
+#: ../libpurple/protocols/silc/ops.c:1596
+#: ../libpurple/protocols/silc/ops.c:1601
+#: ../libpurple/protocols/silc10/ops.c:1612
+#: ../libpurple/protocols/silc10/ops.c:1617
 msgid "Ping"
 msgstr "Ping"
 
-#: ../libpurple/protocols/silc/ops.c:1612
+#: ../libpurple/protocols/silc/ops.c:1596
+#: ../libpurple/protocols/silc10/ops.c:1612
 msgid "Ping failed"
 msgstr "Ping に失敗しました"
 
-#: ../libpurple/protocols/silc/ops.c:1617
+#: ../libpurple/protocols/silc/ops.c:1601
+#: ../libpurple/protocols/silc10/ops.c:1617
 msgid "Ping reply received from server"
 msgstr "サーバから Ping リプライを受け取りました"
 
-#: ../libpurple/protocols/silc/ops.c:1625
+#: ../libpurple/protocols/silc/ops.c:1609
+#: ../libpurple/protocols/silc10/ops.c:1625
 msgid "Could not kill user"
 msgstr "ユーザを強制終了できませんでした"
 
-#: ../libpurple/protocols/silc/ops.c:1709
-msgid "Error during connecting to SILC Server"
-msgstr "SILC サーバへ接続する際にエラー"
-
-#: ../libpurple/protocols/silc/ops.c:1714
-msgid "Key Exchange failed"
-msgstr "キーの交換に失敗しました"
-
-#: ../libpurple/protocols/silc/ops.c:1723
-msgid ""
-"Resuming detached session failed. Press Reconnect to create new connection."
-msgstr ""
-"切り離したセッションの復帰に失敗しました。新しい接続を確立する際は、ボタン "
-"[再接続] をクリックして下さい。"
-
-#: ../libpurple/protocols/silc/ops.c:1758
-msgid "Disconnected by server"
-msgstr "サーバが接続を切断しました"
-
-#: ../libpurple/protocols/silc/ops.c:1820
-#: ../libpurple/protocols/silc/ops.c:1867
-#: ../libpurple/protocols/silc/silc.c:182
+#: ../libpurple/protocols/silc/ops.c:1648
+msgid "WATCH"
+msgstr "WATCH"
+
+#: ../libpurple/protocols/silc/ops.c:1648
+msgid "Cannot watch user"
+msgstr "ユーザを監視できません"
+
+#: ../libpurple/protocols/silc/ops.c:1724
+#: ../libpurple/protocols/silc/ops.c:1775
+#: ../libpurple/protocols/silc/silc.c:277
+#: ../libpurple/protocols/silc10/ops.c:1811
+#: ../libpurple/protocols/silc10/ops.c:1858
+#: ../libpurple/protocols/silc10/silc.c:190
 msgid "Resuming session"
 msgstr "セッションの復帰中"
 
-#: ../libpurple/protocols/silc/ops.c:1822
+#: ../libpurple/protocols/silc/ops.c:1726
+#: ../libpurple/protocols/silc10/ops.c:1813
 msgid "Authenticating connection"
 msgstr "接続の認証中"
 
-#: ../libpurple/protocols/silc/ops.c:1869
+#: ../libpurple/protocols/silc/ops.c:1777
+#: ../libpurple/protocols/silc10/ops.c:1860
 msgid "Verifying server public key"
 msgstr "サーバの公開鍵の検証中"
 
-#: ../libpurple/protocols/silc/ops.c:1911
+#: ../libpurple/protocols/silc/ops.c:1814
+#: ../libpurple/protocols/silc10/ops.c:1902
 msgid "Passphrase required"
 msgstr "パスフレーズの要求"
 
-#: ../libpurple/protocols/silc/ops.c:1940
-msgid "Failure: Version mismatch, upgrade your client"
-msgstr "失敗: バージョン不整合、クライアントをアップグレードして下さい"
-
-#: ../libpurple/protocols/silc/ops.c:1943
-msgid "Failure: Remote does not trust/support your public key"
-msgstr ""
-"失敗: リモート側は信用されていなか、お使いの公開鍵をサポートしていません"
-
-#: ../libpurple/protocols/silc/ops.c:1946
-msgid "Failure: Remote does not support proposed KE group"
-msgstr "失敗: リモート側は推奨されている KE グループをサポートしていません"
-
-#: ../libpurple/protocols/silc/ops.c:1949
-msgid "Failure: Remote does not support proposed cipher"
-msgstr "失敗: リモート側は推奨されている Cipher をサポートしていません"
-
-#: ../libpurple/protocols/silc/ops.c:1952
-msgid "Failure: Remote does not support proposed PKCS"
-msgstr "失敗: リモート側は推奨されている PKCS をサポートしていません"
-
-#: ../libpurple/protocols/silc/ops.c:1955
-msgid "Failure: Remote does not support proposed hash function"
-msgstr "失敗: リモート側は推奨されているハッシュ機能をサポートしていません"
-
-#: ../libpurple/protocols/silc/ops.c:1958
-msgid "Failure: Remote does not support proposed HMAC"
-msgstr "失敗: リモート側は推奨されている HMAC をサポートしていません"
-
-#: ../libpurple/protocols/silc/ops.c:1960
-msgid "Failure: Incorrect signature"
-msgstr "失敗: 不正な署名です"
-
-#: ../libpurple/protocols/silc/ops.c:1962
-msgid "Failure: Invalid cookie"
-msgstr "失敗: 不正なクッキーです"
-
-#: ../libpurple/protocols/silc/ops.c:1973
-msgid "Failure: Authentication failed"
-msgstr "失敗: 認証に失敗しました"
-
-#: ../libpurple/protocols/silc/pk.c:104
+#: ../libpurple/protocols/silc/pk.c:98 ../libpurple/protocols/silc10/pk.c:104
 #, c-format
 msgid ""
 "Received %s's public key. Your local copy does not match this key. Would you "
@@ -9497,12 +9916,12 @@
 "%s の公開鍵を受け取りましたが、ローカルの複製と一致しません。この受け取った公"
 "開鍵をまだ受け入れますか?"
 
-#: ../libpurple/protocols/silc/pk.c:109
+#: ../libpurple/protocols/silc/pk.c:103 ../libpurple/protocols/silc10/pk.c:109
 #, c-format
 msgid "Received %s's public key. Would you like to accept this public key?"
 msgstr "%s の公開鍵を受け取りました。この受け取った公開鍵を受け入れますか?"
 
-#: ../libpurple/protocols/silc/pk.c:113
+#: ../libpurple/protocols/silc/pk.c:107 ../libpurple/protocols/silc10/pk.c:113
 #, c-format
 msgid ""
 "Fingerprint and babbleprint for the %s key are:\n"
@@ -9515,73 +9934,100 @@
 "%s\n"
 "%s\n"
 
-#: ../libpurple/protocols/silc/pk.c:116 ../libpurple/protocols/silc/pk.c:142
+#: ../libpurple/protocols/silc/pk.c:110 ../libpurple/protocols/silc/pk.c:139
+#: ../libpurple/protocols/silc10/pk.c:116
+#: ../libpurple/protocols/silc10/pk.c:142
 msgid "Verify Public Key"
 msgstr "公開鍵の検証"
 
-#: ../libpurple/protocols/silc/pk.c:121
+#: ../libpurple/protocols/silc/pk.c:115 ../libpurple/protocols/silc10/pk.c:121
 msgid "_View..."
 msgstr "表示する(_V)..."
 
-#: ../libpurple/protocols/silc/pk.c:143
+#: ../libpurple/protocols/silc/pk.c:140 ../libpurple/protocols/silc10/pk.c:143
 msgid "Unsupported public key type"
 msgstr "サポートしていない公開鍵の種類"
 
-#: ../libpurple/protocols/silc/silc.c:153
+#: ../libpurple/protocols/silc/silc.c:217
+#: ../libpurple/protocols/silc10/ops.c:1749
+msgid "Disconnected by server"
+msgstr "サーバが接続を切断しました"
+
+#: ../libpurple/protocols/silc/silc.c:224
+#: ../libpurple/protocols/silc10/ops.c:1700
+msgid "Error during connecting to SILC Server"
+msgstr "SILC サーバへ接続する際にエラー"
+
+#: ../libpurple/protocols/silc/silc.c:229
+#: ../libpurple/protocols/silc10/ops.c:1705
+msgid "Key Exchange failed"
+msgstr "キーの交換に失敗しました"
+
+#: ../libpurple/protocols/silc/silc.c:238
+#: ../libpurple/protocols/silc10/ops.c:1714
+msgid ""
+"Resuming detached session failed. Press Reconnect to create new connection."
+msgstr ""
+"切り離したセッションの復帰に失敗しました。新しい接続を確立する際は、ボタン "
+"[再接続] をクリックして下さい。"
+
+#: ../libpurple/protocols/silc/silc.c:265
+#: ../libpurple/protocols/silc/silc.c:311
+#: ../libpurple/protocols/silc10/silc.c:161
 msgid "Connection failed"
 msgstr "接続に失敗"
 
-#: ../libpurple/protocols/silc/silc.c:174
-msgid "Cannot initialize SILC Client connection"
-msgstr "SILC クライアント接続を初期化できません"
-
-#: ../libpurple/protocols/silc/silc.c:185
+#: ../libpurple/protocols/silc/silc.c:280
+#: ../libpurple/protocols/silc10/silc.c:193
 msgid "Performing key exchange"
 msgstr "鍵の交換の実行中"
 
-#: ../libpurple/protocols/silc/silc.c:271
+#. Progress
+#: ../libpurple/protocols/silc/silc.c:343
+#: ../libpurple/protocols/silc10/silc.c:325
+msgid "Connecting to SILC Server"
+msgstr "SILC サーバへ接続中"
+
+#: ../libpurple/protocols/silc/silc.c:352
+msgid "Could not load SILC key pair"
+msgstr "SILC の鍵ペアを読み込めませんでした"
+
+#: ../libpurple/protocols/silc/silc.c:366
+#: ../libpurple/protocols/silc10/silc.c:355
+msgid "Unable to create connection"
+msgstr "新しい接続を開けません"
+
+#: ../libpurple/protocols/silc/silc.c:395
+#: ../libpurple/protocols/silc10/silc.c:267
 msgid "Out of memory"
 msgstr "メモリが足りません"
 
-#: ../libpurple/protocols/silc/silc.c:294
-msgid "John Noname"
-msgstr "名前なし"
-
-#: ../libpurple/protocols/silc/silc.c:317
+#: ../libpurple/protocols/silc/silc.c:438
+#: ../libpurple/protocols/silc10/silc.c:313
 msgid "Cannot initialize SILC protocol"
 msgstr "SILC プロトコルを初期化できません"
 
-#: ../libpurple/protocols/silc/silc.c:324
-msgid "Cannot find/access ~/.silc directory"
-msgstr "~/.silc フォルダが見みつからないかアクセスできません"
-
-#. Progress
-#: ../libpurple/protocols/silc/silc.c:329
-msgid "Connecting to SILC Server"
-msgstr "SILC サーバへ接続中"
-
-#: ../libpurple/protocols/silc/silc.c:338
-#, c-format
-msgid "Could not load SILC key pair: %s"
-msgstr "SILC の鍵ペアを読み込めませんでした: %s"
-
-#: ../libpurple/protocols/silc/silc.c:359
-msgid "Unable to create connection"
-msgstr "新しい接続を開けません"
-
-#: ../libpurple/protocols/silc/silc.c:658
+#: ../libpurple/protocols/silc/silc.c:445
+msgid "Error loading SILC key pair"
+msgstr "SILC 鍵ペアを読み込む際にエラーが発生しました"
+
+#: ../libpurple/protocols/silc/silc.c:739
+#: ../libpurple/protocols/silc10/silc.c:650
 msgid "Your Current Mood"
 msgstr "現在の Mood"
 
-#: ../libpurple/protocols/silc/silc.c:660 ../pidgin/gtkprefs.c:1529
+#: ../libpurple/protocols/silc/silc.c:741
+#: ../libpurple/protocols/silc10/silc.c:652 ../pidgin/gtkprefs.c:1566
 msgid "Normal"
 msgstr "標準"
 
-#: ../libpurple/protocols/silc/silc.c:674
+#: ../libpurple/protocols/silc/silc.c:755
+#: ../libpurple/protocols/silc10/silc.c:666
 msgid "In love"
 msgstr "恋愛中"
 
-#: ../libpurple/protocols/silc/silc.c:685
+#: ../libpurple/protocols/silc/silc.c:766
+#: ../libpurple/protocols/silc10/silc.c:677
 msgid ""
 "\n"
 "Your Preferred Contact Methods"
@@ -9589,46 +10035,63 @@
 "\n"
 "お好みの連絡方法"
 
-#: ../libpurple/protocols/silc/silc.c:693
-#: ../libpurple/protocols/silc/util.c:557
+#: ../libpurple/protocols/silc/silc.c:774
+#: ../libpurple/protocols/silc/util.c:561
+#: ../libpurple/protocols/silc10/silc.c:685
+#: ../libpurple/protocols/silc10/util.c:557
 msgid "SMS"
 msgstr "SMS"
 
-#: ../libpurple/protocols/silc/silc.c:695
-#: ../libpurple/protocols/silc/util.c:559
+#: ../libpurple/protocols/silc/silc.c:776
+#: ../libpurple/protocols/silc/util.c:563
+#: ../libpurple/protocols/silc10/silc.c:687
+#: ../libpurple/protocols/silc10/util.c:559
 msgid "MMS"
 msgstr "MMS"
 
-#: ../libpurple/protocols/silc/silc.c:697
+#: ../libpurple/protocols/silc/silc.c:778
+#: ../libpurple/protocols/silc10/silc.c:689
 msgid "Video conferencing"
 msgstr "ビデオ会議"
 
-#: ../libpurple/protocols/silc/silc.c:702
+#: ../libpurple/protocols/silc/silc.c:783
+#: ../libpurple/protocols/silc10/silc.c:694
 msgid "Your Current Status"
 msgstr "現在のステータス"
 
-#: ../libpurple/protocols/silc/silc.c:709
+#: ../libpurple/protocols/silc/silc.c:790
+#: ../libpurple/protocols/silc10/silc.c:701
 msgid "Online Services"
 msgstr "オンライン・サービス"
 
-#: ../libpurple/protocols/silc/silc.c:712
+#: ../libpurple/protocols/silc/silc.c:793
+#: ../libpurple/protocols/silc10/silc.c:704
 msgid "Let others see what services you are using"
 msgstr "何のサービスが利用されているか他の人たちに公開して下さい"
 
-#: ../libpurple/protocols/silc/silc.c:718
+#: ../libpurple/protocols/silc/silc.c:799
+#: ../libpurple/protocols/silc10/silc.c:710
 msgid "Let others see what computer you are using"
 msgstr "どんなコンピュータを利用しているか他の人たちに公開して下さい"
 
-#: ../libpurple/protocols/silc/silc.c:725
+#: ../libpurple/protocols/silc/silc.c:806
+#: ../libpurple/protocols/silc10/silc.c:717
 msgid "Your VCard File"
 msgstr "VCard 型式ファイル"
 
-#: ../libpurple/protocols/silc/silc.c:737
-#: ../libpurple/protocols/silc/silc.c:738
+#: ../libpurple/protocols/silc/silc.c:812
+msgid "Timezone (UTC)"
+msgstr "タイムゾーン (UTC)"
+
+#: ../libpurple/protocols/silc/silc.c:816
+#: ../libpurple/protocols/silc/silc.c:817
+#: ../libpurple/protocols/silc10/silc.c:729
+#: ../libpurple/protocols/silc10/silc.c:730
 msgid "User Online Status Attributes"
 msgstr "ユーザのオンライン・ステータスの属性"
 
-#: ../libpurple/protocols/silc/silc.c:739
+#: ../libpurple/protocols/silc/silc.c:818
+#: ../libpurple/protocols/silc10/silc.c:731
 msgid ""
 "You can let other users see your online status information and your personal "
 "information. Please fill the information you would like other users to see "
@@ -9637,175 +10100,219 @@
 "あなたのオンライン・ステータス情報と個人情報を他のユーザへ公開することが可能"
 "です。他のユーザに公開したい情報を全て入力して下さい。"
 
-#: ../libpurple/protocols/silc/silc.c:780
-#: ../libpurple/protocols/silc/silc.c:786
-#: ../libpurple/protocols/silc/silc.c:1426
+#: ../libpurple/protocols/silc/silc.c:859
+#: ../libpurple/protocols/silc/silc.c:865
+#: ../libpurple/protocols/silc/silc.c:1486
+#: ../libpurple/protocols/silc10/silc.c:772
+#: ../libpurple/protocols/silc10/silc.c:778
+#: ../libpurple/protocols/silc10/silc.c:1415
 msgid "Message of the Day"
 msgstr "今日のメッセージ"
 
-#: ../libpurple/protocols/silc/silc.c:780
+#: ../libpurple/protocols/silc/silc.c:859
+#: ../libpurple/protocols/silc10/silc.c:772
 msgid "No Message of the Day available"
 msgstr "\"今日のメッセージ\" は利用できません"
 
-#: ../libpurple/protocols/silc/silc.c:781
-#: ../libpurple/protocols/silc/silc.c:1421
+#: ../libpurple/protocols/silc/silc.c:860
+#: ../libpurple/protocols/silc/silc.c:1481
+#: ../libpurple/protocols/silc10/silc.c:773
+#: ../libpurple/protocols/silc10/silc.c:1410
 msgid "There is no Message of the Day associated with this connection"
 msgstr "この接続に対応した \"今日のメッセージ\" はありません"
 
-#: ../libpurple/protocols/silc/silc.c:832
-#: ../libpurple/protocols/silc/silc.c:876
-#: ../libpurple/protocols/silc/silc.c:947
-#: ../libpurple/protocols/silc/silc.c:948
+#: ../libpurple/protocols/silc/silc.c:911
+#: ../libpurple/protocols/silc/silc.c:957
+#: ../libpurple/protocols/silc/silc.c:1028
+#: ../libpurple/protocols/silc/silc.c:1029
+#: ../libpurple/protocols/silc10/silc.c:824
+#: ../libpurple/protocols/silc10/silc.c:868
+#: ../libpurple/protocols/silc10/silc.c:939
+#: ../libpurple/protocols/silc10/silc.c:940
 msgid "Create New SILC Key Pair"
 msgstr "新しい SILC 鍵ペアの生成"
 
-#: ../libpurple/protocols/silc/silc.c:832
+#: ../libpurple/protocols/silc/silc.c:911
+#: ../libpurple/protocols/silc10/silc.c:824
 msgid "Passphrases do not match"
 msgstr "新しいパスフレーズが一致しません"
 
-#: ../libpurple/protocols/silc/silc.c:876
+#: ../libpurple/protocols/silc/silc.c:957
+#: ../libpurple/protocols/silc10/silc.c:868
 msgid "Key Pair Generation failed"
 msgstr "鍵ペアの生成が失敗しました"
 
-#: ../libpurple/protocols/silc/silc.c:915
+#: ../libpurple/protocols/silc/silc.c:996
+#: ../libpurple/protocols/silc10/silc.c:907
 msgid "Key length"
 msgstr "鍵の長さ"
 
-#: ../libpurple/protocols/silc/silc.c:917
+#: ../libpurple/protocols/silc/silc.c:998
+#: ../libpurple/protocols/silc10/silc.c:909
 msgid "Public key file"
 msgstr "公開鍵ファイル"
 
-#: ../libpurple/protocols/silc/silc.c:919
+#: ../libpurple/protocols/silc/silc.c:1000
+#: ../libpurple/protocols/silc10/silc.c:911
 msgid "Private key file"
 msgstr "秘密鍵ファイル"
 
-#: ../libpurple/protocols/silc/silc.c:942
+#: ../libpurple/protocols/silc/silc.c:1023
+#: ../libpurple/protocols/silc10/silc.c:934
 msgid "Passphrase (retype)"
 msgstr "パスフレーズ (確認用)"
 
-#: ../libpurple/protocols/silc/silc.c:949
+#: ../libpurple/protocols/silc/silc.c:1030
+#: ../libpurple/protocols/silc10/silc.c:941
 msgid "Generate Key Pair"
 msgstr "鍵ペアの生成"
 
-#: ../libpurple/protocols/silc/silc.c:994
+#: ../libpurple/protocols/silc/silc.c:1073
+#: ../libpurple/protocols/silc10/silc.c:984
 msgid "Online Status"
 msgstr "オンライン・ステータス"
 
-#: ../libpurple/protocols/silc/silc.c:1003
+#: ../libpurple/protocols/silc/silc.c:1081
+#: ../libpurple/protocols/silc10/silc.c:992
 msgid "View Message of the Day"
 msgstr "\"今日のメッセージ\" を表示する"
 
-#: ../libpurple/protocols/silc/silc.c:1007
+#: ../libpurple/protocols/silc/silc.c:1085
+#: ../libpurple/protocols/silc10/silc.c:996
 msgid "Create SILC Key Pair..."
 msgstr "SILC 鍵ペアの生成..."
 
-#: ../libpurple/protocols/silc/silc.c:1106
+#: ../libpurple/protocols/silc/silc.c:1177
+#: ../libpurple/protocols/silc10/silc.c:1095
 #, c-format
 msgid "User <I>%s</I> is not present in the network"
 msgstr "ユーザ <I>%s</I> はネットワークに存在しません"
 
-#: ../libpurple/protocols/silc/silc.c:1297
+#: ../libpurple/protocols/silc/silc.c:1357
+#: ../libpurple/protocols/silc10/silc.c:1286
 msgid "Topic too long"
 msgstr "トピックが長すぎます"
 
-#: ../libpurple/protocols/silc/silc.c:1378
+#: ../libpurple/protocols/silc/silc.c:1438
+#: ../libpurple/protocols/silc10/silc.c:1367
 msgid "You must specify a nick"
 msgstr "あだ名を指定して下さい"
 
-#: ../libpurple/protocols/silc/silc.c:1480
+#: ../libpurple/protocols/silc/silc.c:1540
+#: ../libpurple/protocols/silc10/silc.c:1469
 #, c-format
 msgid "channel %s not found"
 msgstr "チャンネル %s が見つかりません"
 
-#: ../libpurple/protocols/silc/silc.c:1485
+#: ../libpurple/protocols/silc/silc.c:1545
+#: ../libpurple/protocols/silc10/silc.c:1474
 #, c-format
 msgid "channel modes for %s: %s"
 msgstr "%s のチャンネル・モード: %s"
 
-#: ../libpurple/protocols/silc/silc.c:1487
+#: ../libpurple/protocols/silc/silc.c:1547
+#: ../libpurple/protocols/silc10/silc.c:1476
 #, c-format
 msgid "no channel modes are set on %s"
 msgstr "%s ではチャンネル・モードをセットしてません"
 
-#: ../libpurple/protocols/silc/silc.c:1500
+#: ../libpurple/protocols/silc/silc.c:1560
+#: ../libpurple/protocols/silc10/silc.c:1489
 #, c-format
 msgid "Failed to set cmodes for %s"
 msgstr "%s のチャンネル・モードのセットに失敗"
 
-#: ../libpurple/protocols/silc/silc.c:1530
+#: ../libpurple/protocols/silc/silc.c:1590
+#: ../libpurple/protocols/silc10/silc.c:1519
 #, c-format
 msgid "Unknown command: %s, (may be a client bug)"
 msgstr "不明なコマンド: %s (おそらくクライアント側のバグ)"
 
-#: ../libpurple/protocols/silc/silc.c:1593
+#: ../libpurple/protocols/silc/silc.c:1653
+#: ../libpurple/protocols/silc10/silc.c:1582
 msgid "part [channel]:  Leave the chat"
 msgstr "part [チャンネル]:  指定したチャンネルから退出します"
 
-#: ../libpurple/protocols/silc/silc.c:1597
+#: ../libpurple/protocols/silc/silc.c:1657
+#: ../libpurple/protocols/silc10/silc.c:1586
 msgid "leave [channel]:  Leave the chat"
 msgstr "leave [チャンネル]:  指定したチャンネルから退出します"
 
-#: ../libpurple/protocols/silc/silc.c:1601
+#: ../libpurple/protocols/silc/silc.c:1661
+#: ../libpurple/protocols/silc10/silc.c:1590
 msgid "topic [&lt;new topic&gt;]:  View or change the topic"
 msgstr "topic [&lt;新しいトピック&gt;]:  トピックを表示したり変更します"
 
-#: ../libpurple/protocols/silc/silc.c:1606
+#: ../libpurple/protocols/silc/silc.c:1666
+#: ../libpurple/protocols/silc10/silc.c:1595
 msgid "join &lt;channel&gt; [&lt;password&gt;]:  Join a chat on this network"
 msgstr ""
 "join &lt;チャンネル&gt; [&lt;パスワード&gt;]:  このネットワークのチャットへ参"
 "加します"
 
-#: ../libpurple/protocols/silc/silc.c:1610
+#: ../libpurple/protocols/silc/silc.c:1670
+#: ../libpurple/protocols/silc10/silc.c:1599
 msgid "list:  List channels on this network"
 msgstr "list:  このネットワーク上のチャンネルを一覧表示します"
 
-#: ../libpurple/protocols/silc/silc.c:1614
+#: ../libpurple/protocols/silc/silc.c:1674
+#: ../libpurple/protocols/silc10/silc.c:1603
 msgid "whois &lt;nick&gt;:  View nick's information"
 msgstr "whois &lt;あだ名&gt;:  指定したあだ名のユーザ情報を表示します"
 
-#: ../libpurple/protocols/silc/silc.c:1618
-#: ../libpurple/protocols/zephyr/zephyr.c:2684
+#: ../libpurple/protocols/silc/silc.c:1678
+#: ../libpurple/protocols/silc10/silc.c:1607
+#: ../libpurple/protocols/zephyr/zephyr.c:2685
 msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user"
 msgstr ""
 "msg &lt;あだ名&gt; &lt;メッセージ&gt;:  指定したあだ名のユーザへ個人的なメッ"
 "セージを送信します"
 
-#: ../libpurple/protocols/silc/silc.c:1622
+#: ../libpurple/protocols/silc/silc.c:1682
+#: ../libpurple/protocols/silc10/silc.c:1611
 msgid "query &lt;nick&gt; [&lt;message&gt;]:  Send a private message to a user"
 msgstr ""
 "query &lt;あだ名&gt; [&lt;メッセージ&gt;]:  指定したあだ名のユーザへ個人的な"
 "メッセージを送信します"
 
-#: ../libpurple/protocols/silc/silc.c:1626
+#: ../libpurple/protocols/silc/silc.c:1686
+#: ../libpurple/protocols/silc10/silc.c:1615
 msgid "motd:  View the server's Message Of The Day"
 msgstr "motd:  サーバにある \"今日のメッセージ\" を表示します"
 
-#: ../libpurple/protocols/silc/silc.c:1630
+#: ../libpurple/protocols/silc/silc.c:1690
+#: ../libpurple/protocols/silc10/silc.c:1619
 msgid "detach:  Detach this session"
 msgstr "detach:  このセッションを切り離します"
 
-#: ../libpurple/protocols/silc/silc.c:1634
+#: ../libpurple/protocols/silc/silc.c:1694
+#: ../libpurple/protocols/silc10/silc.c:1623
 msgid "quit [message]:  Disconnect from the server, with an optional message"
 msgstr "quit [メッセージ]:  追加でメッセージを残して、このサーバから切断します"
 
-#: ../libpurple/protocols/silc/silc.c:1638
+#: ../libpurple/protocols/silc/silc.c:1698
+#: ../libpurple/protocols/silc10/silc.c:1627
 msgid "call &lt;command&gt;:  Call any silc client command"
 msgstr "call &lt;コマンド&gt;:  SILC クライアント・コマンドを呼び出します"
 
-#: ../libpurple/protocols/silc/silc.c:1644
+#: ../libpurple/protocols/silc/silc.c:1704
+#: ../libpurple/protocols/silc10/silc.c:1633
 msgid "kill &lt;nick&gt; [-pubkey|&lt;reason&gt;]:  Kill nick"
 msgstr ""
 "kill &lt;あだ名&gt; [-pubkey|&lt;理由&gt;]:  あだ名のユーザを強制終了します"
 
-#: ../libpurple/protocols/silc/silc.c:1648
+#: ../libpurple/protocols/silc/silc.c:1708
+#: ../libpurple/protocols/silc10/silc.c:1637
 msgid "nick &lt;newnick&gt;:  Change your nickname"
 msgstr "nick &lt;新しいあだ名&gt;:  お使いのあだ名を変更します"
 
-#: ../libpurple/protocols/silc/silc.c:1652
+#: ../libpurple/protocols/silc/silc.c:1712
+#: ../libpurple/protocols/silc10/silc.c:1641
 msgid "whowas &lt;nick&gt;:  View nick's information"
 msgstr "whowas &lt;あだ名&gt;:  あだ名のユーザ情報を表示します"
 
-#: ../libpurple/protocols/silc/silc.c:1656
+#: ../libpurple/protocols/silc/silc.c:1716
+#: ../libpurple/protocols/silc10/silc.c:1645
 msgid ""
 "cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display "
 "channel modes"
@@ -9813,7 +10320,8 @@
 "cmode &lt;チャンネル&gt; [+|-&lt;モード&gt;] [引数]:  チャンネルのモードを変"
 "更したり表示します"
 
-#: ../libpurple/protocols/silc/silc.c:1660
+#: ../libpurple/protocols/silc/silc.c:1720
+#: ../libpurple/protocols/silc10/silc.c:1649
 msgid ""
 "cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes "
 "on channel"
@@ -9821,15 +10329,18 @@
 "cumode &lt;チャンネル&gt; +|-&lt;モード&gt; &lt;あだ名&gt;:  指定したチャンネ"
 "ルのあだ名のユーザのモードを変更します"
 
-#: ../libpurple/protocols/silc/silc.c:1664
+#: ../libpurple/protocols/silc/silc.c:1724
+#: ../libpurple/protocols/silc10/silc.c:1653
 msgid "umode &lt;usermodes&gt;:  Set your modes in the network"
 msgstr "umode &lt;ユーザ・モード&gt;:  ネットワークでのモードをセットします"
 
-#: ../libpurple/protocols/silc/silc.c:1668
+#: ../libpurple/protocols/silc/silc.c:1728
+#: ../libpurple/protocols/silc10/silc.c:1657
 msgid "oper &lt;nick&gt; [-pubkey]:  Get server operator privileges"
 msgstr "oper &lt;あだ名&gt; [-pubkey]:  サーバのオペレータ特権を取得します"
 
-#: ../libpurple/protocols/silc/silc.c:1672
+#: ../libpurple/protocols/silc/silc.c:1732
+#: ../libpurple/protocols/silc10/silc.c:1661
 msgid ""
 "invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
 "channel invite list"
@@ -9837,40 +10348,48 @@
 "invite &lt;チャンネル&gt; [-|+]&lt;あだ名&gt;:  指定したあだ名のユーザを招待"
 "する、または招待リストからそのユーザを追加/削除します"
 
-#: ../libpurple/protocols/silc/silc.c:1676
+#: ../libpurple/protocols/silc/silc.c:1736
+#: ../libpurple/protocols/silc10/silc.c:1665
 msgid "kick &lt;channel&gt; &lt;nick&gt; [comment]:  Kick client from channel"
 msgstr ""
 "kick &lt;チャンネル&gt; &lt;あだ名&gt; [コメント]:  チャンネルからクライアン"
 "トを追い出します"
 
-#: ../libpurple/protocols/silc/silc.c:1680
+#: ../libpurple/protocols/silc/silc.c:1740
+#: ../libpurple/protocols/silc10/silc.c:1669
 msgid "info [server]:  View server administrative details"
 msgstr "info [サーバ]:  サーバの管理者の詳細を表示します"
 
-#: ../libpurple/protocols/silc/silc.c:1684
+#: ../libpurple/protocols/silc/silc.c:1744
+#: ../libpurple/protocols/silc10/silc.c:1673
 msgid "ban [&lt;channel&gt; +|-&lt;nick&gt;]:  Ban client from channel"
 msgstr ""
 "ban [&lt;チャンネル&gt; +|-&lt;あだ名&gt;]:  クアイアントをチャンネルから追い"
 "出します"
 
-#: ../libpurple/protocols/silc/silc.c:1688
+#: ../libpurple/protocols/silc/silc.c:1748
+#: ../libpurple/protocols/silc10/silc.c:1677
 msgid "getkey &lt;nick|server&gt;:  Retrieve client's or server's public key"
 msgstr ""
 "getkey &lt;あだ名|サーバ&gt;:  クライアントまたはサーバの公開鍵を取得します"
 
-#: ../libpurple/protocols/silc/silc.c:1692
+#: ../libpurple/protocols/silc/silc.c:1752
+#: ../libpurple/protocols/silc10/silc.c:1681
 msgid "stats:  View server and network statistics"
 msgstr "stats:  サーバとネットワークの統計情報を表示します"
 
-#: ../libpurple/protocols/silc/silc.c:1696
+#: ../libpurple/protocols/silc/silc.c:1756
+#: ../libpurple/protocols/silc10/silc.c:1685
 msgid "ping:  Send PING to the connected server"
 msgstr "ping:  接続しているサーバへ PING を送信します"
 
-#: ../libpurple/protocols/silc/silc.c:1701
+#: ../libpurple/protocols/silc/silc.c:1761
+#: ../libpurple/protocols/silc10/silc.c:1690
 msgid "users &lt;channel&gt;:  List users in channel"
 msgstr "users &lt;チャンネル&gt;:  チャンネル内のユーザを一覧表示します"
 
-#: ../libpurple/protocols/silc/silc.c:1705
+#: ../libpurple/protocols/silc/silc.c:1765
+#: ../libpurple/protocols/silc10/silc.c:1694
 msgid ""
 "names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List "
 "specific users in channel(s)"
@@ -9887,116 +10406,141 @@
 #. *< name
 #. *< version
 #. *  summary
-#: ../libpurple/protocols/silc/silc.c:1816
+#: ../libpurple/protocols/silc/silc.c:1875
+#: ../libpurple/protocols/silc10/silc.c:1817
 msgid "SILC Protocol Plugin"
 msgstr "SILC プロトコルのプラグイン"
 
 #. *  description
-#: ../libpurple/protocols/silc/silc.c:1818
+#: ../libpurple/protocols/silc/silc.c:1877
+#: ../libpurple/protocols/silc10/silc.c:1819
 msgid "Secure Internet Live Conferencing (SILC) Protocol"
 msgstr "セキュアなインターネット・ライブ会議 (SILC) プロトコル"
 
-#: ../libpurple/protocols/silc/silc.c:1844 ../pidgin/gtkprefs.c:1920
+#: ../libpurple/protocols/silc/silc.c:1909
+#: ../libpurple/protocols/silc10/silc.c:1851 ../pidgin/gtkprefs.c:1959
 msgid "Network"
 msgstr "ネットワーク"
 
-#: ../libpurple/protocols/silc/silc.c:1855
+#: ../libpurple/protocols/silc/silc.c:1920
+#: ../libpurple/protocols/silc10/silc.c:1862
 msgid "Public Key file"
 msgstr "公開鍵ファイル"
 
-#: ../libpurple/protocols/silc/silc.c:1859
+#: ../libpurple/protocols/silc/silc.c:1924
+#: ../libpurple/protocols/silc10/silc.c:1866
 msgid "Private Key file"
 msgstr "秘密鍵ファイル"
 
-#: ../libpurple/protocols/silc/silc.c:1869
+#: ../libpurple/protocols/silc/silc.c:1934
+#: ../libpurple/protocols/silc10/silc.c:1876
 msgid "Cipher"
 msgstr "暗号"
 
-#: ../libpurple/protocols/silc/silc.c:1879
+#: ../libpurple/protocols/silc/silc.c:1944
+#: ../libpurple/protocols/silc10/silc.c:1886
 msgid "HMAC"
 msgstr "HMAC"
 
-#: ../libpurple/protocols/silc/silc.c:1882
+#: ../libpurple/protocols/silc/silc.c:1947
+msgid "Use Perfect Forward Secrecy"
+msgstr "PFS (Perfect Forward Secrecy) を使う"
+
+#: ../libpurple/protocols/silc/silc.c:1951
+#: ../libpurple/protocols/silc10/silc.c:1889
 msgid "Public key authentication"
 msgstr "公開鍵を認証する"
 
-#: ../libpurple/protocols/silc/silc.c:1885
-msgid "Reject watching by other users"
-msgstr "他のユーザからの監視を拒否する"
-
-#: ../libpurple/protocols/silc/silc.c:1888
-msgid "Block invites"
-msgstr "招待を拒否する"
-
-#: ../libpurple/protocols/silc/silc.c:1891
+#: ../libpurple/protocols/silc/silc.c:1954
+#: ../libpurple/protocols/silc10/silc.c:1892
 msgid "Block IMs without Key Exchange"
 msgstr "鍵の交換が無い IM を拒否する"
 
-#: ../libpurple/protocols/silc/silc.c:1894
-msgid "Reject online status attribute requests"
-msgstr "オンライン・ステータスの属性要求を拒否する"
-
-#: ../libpurple/protocols/silc/silc.c:1897
+#: ../libpurple/protocols/silc/silc.c:1957
+#: ../libpurple/protocols/silc10/silc.c:1895
 msgid "Block messages to whiteboard"
 msgstr "ホワイトボードへのメッセージをブロックする"
 
-#: ../libpurple/protocols/silc/silc.c:1900
+#: ../libpurple/protocols/silc/silc.c:1960
+#: ../libpurple/protocols/silc10/silc.c:1898
 msgid "Automatically open whiteboard"
 msgstr "ホワイトボードを自動的に公開する"
 
-#: ../libpurple/protocols/silc/silc.c:1903
+#: ../libpurple/protocols/silc/silc.c:1963
+#: ../libpurple/protocols/silc10/silc.c:1901
 msgid "Digitally sign and verify all messages"
 msgstr "電子署名して全てのメッセージを検証する"
 
 #: ../libpurple/protocols/silc/util.c:207
-#: ../libpurple/protocols/silc/util.c:247
+#: ../libpurple/protocols/silc/util.c:249
+#: ../libpurple/protocols/silc10/util.c:207
+#: ../libpurple/protocols/silc10/util.c:247
 msgid "Creating SILC key pair..."
 msgstr "SILC 鍵ペアの生成中..."
 
+#: ../libpurple/protocols/silc/util.c:215
+#: ../libpurple/protocols/silc/util.c:257
+msgid "Cannot create SILC key pair\n"
+msgstr "SILC 鍵ペアを生成できません\n"
+
 #. Hint for translators: Please check the tabulator width here and in
 #. the next strings (short strings: 2 tabs, longer strings 1 tab,
 #. sum: 3 tabs or 24 characters)
-#: ../libpurple/protocols/silc/util.c:355
+#: ../libpurple/protocols/silc/util.c:358
+#: ../libpurple/protocols/silc10/util.c:355
 #, c-format
 msgid "Real Name: \t%s\n"
 msgstr "氏名: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:357
+#: ../libpurple/protocols/silc/util.c:360
+#: ../libpurple/protocols/silc10/util.c:357
 #, c-format
 msgid "User Name: \t%s\n"
 msgstr "ユーザ名: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:359
+#: ../libpurple/protocols/silc/util.c:362
+#: ../libpurple/protocols/silc10/util.c:359
 #, c-format
 msgid "E-Mail: \t\t%s\n"
 msgstr "E-メール: \t\t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:361
+#: ../libpurple/protocols/silc/util.c:364
+#: ../libpurple/protocols/silc10/util.c:361
 #, c-format
 msgid "Host Name: \t%s\n"
 msgstr "ホスト名: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:363
+#: ../libpurple/protocols/silc/util.c:366
+#: ../libpurple/protocols/silc10/util.c:363
 #, c-format
 msgid "Organization: \t%s\n"
 msgstr "組織: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:365
+#: ../libpurple/protocols/silc/util.c:368
+#: ../libpurple/protocols/silc10/util.c:365
 #, c-format
 msgid "Country: \t%s\n"
 msgstr "国: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:366
+#: ../libpurple/protocols/silc/util.c:369
+#: ../libpurple/protocols/silc10/util.c:366
 #, c-format
 msgid "Algorithm: \t%s\n"
 msgstr "アルゴリズム: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:367
+#: ../libpurple/protocols/silc/util.c:370
+#: ../libpurple/protocols/silc10/util.c:367
 #, c-format
 msgid "Key Length: \t%d bits\n"
 msgstr "鍵の長さ: \t%d ビット\n"
 
-#: ../libpurple/protocols/silc/util.c:369
+#: ../libpurple/protocols/silc/util.c:372
+#, c-format
+msgid "Version: \t%s\n"
+msgstr "バージョン: \t%s\n"
+
+#: ../libpurple/protocols/silc/util.c:374
+#: ../libpurple/protocols/silc10/util.c:369
 #, c-format
 msgid ""
 "Public Key Fingerprint:\n"
@@ -10007,7 +10551,8 @@
 "%s\n"
 "\n"
 
-#: ../libpurple/protocols/silc/util.c:370
+#: ../libpurple/protocols/silc/util.c:375
+#: ../libpurple/protocols/silc10/util.c:370
 #, c-format
 msgid ""
 "Public Key Babbleprint:\n"
@@ -10016,39 +10561,46 @@
 "公開鍵の Babbleprint:\n"
 "%s"
 
-#: ../libpurple/protocols/silc/util.c:374
-#: ../libpurple/protocols/silc/util.c:375
+#: ../libpurple/protocols/silc/util.c:379
+#: ../libpurple/protocols/silc/util.c:380
+#: ../libpurple/protocols/silc10/util.c:374
+#: ../libpurple/protocols/silc10/util.c:375
 msgid "Public Key Information"
 msgstr "公開鍵の情報"
 
-#: ../libpurple/protocols/silc/util.c:555
+#: ../libpurple/protocols/silc/util.c:559
+#: ../libpurple/protocols/silc10/util.c:555
 msgid "Paging"
 msgstr "ページング"
 
-#: ../libpurple/protocols/silc/util.c:561
+#: ../libpurple/protocols/silc/util.c:565
+#: ../libpurple/protocols/silc10/util.c:561
 msgid "Video Conferencing"
 msgstr "ビデオ会議"
 
-#: ../libpurple/protocols/silc/util.c:579
+#: ../libpurple/protocols/silc/util.c:583
+#: ../libpurple/protocols/silc10/util.c:579
 msgid "Computer"
 msgstr "コンピュータ"
 
-#: ../libpurple/protocols/silc/util.c:583
+#: ../libpurple/protocols/silc/util.c:587
+#: ../libpurple/protocols/silc10/util.c:583
 msgid "PDA"
 msgstr "PDA"
 
-#: ../libpurple/protocols/silc/util.c:585
+#: ../libpurple/protocols/silc/util.c:589
+#: ../libpurple/protocols/silc10/util.c:585
 msgid "Terminal"
 msgstr "端末"
 
-#: ../libpurple/protocols/silc/wb.c:284
+#: ../libpurple/protocols/silc/wb.c:284 ../libpurple/protocols/silc10/wb.c:284
 #, c-format
 msgid "%s sent message to whiteboard. Would you like to open the whiteboard?"
 msgstr ""
 "%s さんがホワイトボードにメッセージを送信してきました。そのホワイトボードを公"
 "開してもよろしいですか?"
 
-#: ../libpurple/protocols/silc/wb.c:288
+#: ../libpurple/protocols/silc/wb.c:288 ../libpurple/protocols/silc10/wb.c:288
 #, c-format
 msgid ""
 "%s sent message to whiteboard on %s channel. Would you like to open the "
@@ -10057,36 +10609,98 @@
 "%s さんが %s にあるホワイトボードにメッセージを送信してきました。そのホワイト"
 "ボードを公開してもよろしいですか?"
 
-#: ../libpurple/protocols/silc/wb.c:302
+#: ../libpurple/protocols/silc/wb.c:302 ../libpurple/protocols/silc10/wb.c:302
 msgid "Whiteboard"
 msgstr "ホワイトボード"
 
+#: ../libpurple/protocols/silc10/ops.c:1559
+msgid "No server statistics available"
+msgstr "サーバの統計情報は利用できません"
+
+#: ../libpurple/protocols/silc10/ops.c:1931
+msgid "Failure: Version mismatch, upgrade your client"
+msgstr "失敗: バージョン不整合、クライアントをアップグレードして下さい"
+
+#: ../libpurple/protocols/silc10/ops.c:1934
+msgid "Failure: Remote does not trust/support your public key"
+msgstr ""
+"失敗: リモート側は信用されていなか、お使いの公開鍵をサポートしていません"
+
+#: ../libpurple/protocols/silc10/ops.c:1937
+msgid "Failure: Remote does not support proposed KE group"
+msgstr "失敗: リモート側は推奨されている KE グループをサポートしていません"
+
+#: ../libpurple/protocols/silc10/ops.c:1940
+msgid "Failure: Remote does not support proposed cipher"
+msgstr "失敗: リモート側は推奨されている Cipher をサポートしていません"
+
+#: ../libpurple/protocols/silc10/ops.c:1943
+msgid "Failure: Remote does not support proposed PKCS"
+msgstr "失敗: リモート側は推奨されている PKCS をサポートしていません"
+
+#: ../libpurple/protocols/silc10/ops.c:1946
+msgid "Failure: Remote does not support proposed hash function"
+msgstr "失敗: リモート側は推奨されているハッシュ機能をサポートしていません"
+
+#: ../libpurple/protocols/silc10/ops.c:1949
+msgid "Failure: Remote does not support proposed HMAC"
+msgstr "失敗: リモート側は推奨されている HMAC をサポートしていません"
+
+#: ../libpurple/protocols/silc10/ops.c:1951
+msgid "Failure: Incorrect signature"
+msgstr "失敗: 不正な署名です"
+
+#: ../libpurple/protocols/silc10/ops.c:1953
+msgid "Failure: Invalid cookie"
+msgstr "失敗: 不正なクッキーです"
+
+#: ../libpurple/protocols/silc10/ops.c:1964
+msgid "Failure: Authentication failed"
+msgstr "失敗: 認証に失敗しました"
+
+#: ../libpurple/protocols/silc10/silc.c:182
+msgid "Cannot initialize SILC Client connection"
+msgstr "SILC クライアント接続を初期化できません"
+
+#: ../libpurple/protocols/silc10/silc.c:290
+msgid "John Noname"
+msgstr "名前なし"
+
+#: ../libpurple/protocols/silc10/silc.c:320
+msgid "Cannot find/access ~/.silc directory"
+msgstr "~/.silc フォルダが見みつからないかアクセスできません"
+
+#: ../libpurple/protocols/silc10/silc.c:334
+#, c-format
+msgid "Could not load SILC key pair: %s"
+msgstr "SILC の鍵ペアを読み込めませんでした: %s"
+
 #. TODO: do we really want to disconnect on a failure to write?
 #: ../libpurple/protocols/simple/simple.c:416
 msgid "Could not write"
 msgstr "書き込めませんでした"
 
 #: ../libpurple/protocols/simple/simple.c:438
-#: ../libpurple/protocols/simple/simple.c:1486
+#: ../libpurple/protocols/simple/simple.c:1484
 msgid "Could not connect"
 msgstr "接続できませんでした"
 
-#: ../libpurple/protocols/simple/simple.c:1520
-#: ../libpurple/protocols/simple/simple.c:1562
-#: ../libpurple/protocols/simple/simple.c:1575
-#: ../libpurple/protocols/simple/simple.c:1626
+#: ../libpurple/protocols/simple/simple.c:1518
+#: ../libpurple/protocols/simple/simple.c:1560
+#: ../libpurple/protocols/simple/simple.c:1573
+#: ../libpurple/protocols/simple/simple.c:1624
 msgid "Could not create listen socket"
 msgstr "ソケットを生成できませんでした"
 
-#: ../libpurple/protocols/simple/simple.c:1543
+#: ../libpurple/protocols/simple/simple.c:1541
 msgid "Couldn't resolve host"
 msgstr "ホスト名を解決できませんでした"
 
-#: ../libpurple/protocols/simple/simple.c:1634
+#: ../libpurple/protocols/simple/simple.c:1632
 msgid "Could not resolve hostname"
 msgstr "ホスト名を解決できませんでした"
 
-#: ../libpurple/protocols/simple/simple.c:1651
+#: ../libpurple/protocols/simple/simple.c:1649
 msgid "SIP screen names may not contain whitespaces or @ symbols"
 msgstr "SIP のスクリーン名に空白または @ 記号が含まれていないようです"
 
@@ -10098,36 +10712,36 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../libpurple/protocols/simple/simple.c:1826
+#: ../libpurple/protocols/simple/simple.c:1824
 msgid "SIP/SIMPLE Protocol Plugin"
 msgstr "SIP/SIMPLE プロトコルのプラグイン"
 
 #. *  summary
-#: ../libpurple/protocols/simple/simple.c:1827
+#: ../libpurple/protocols/simple/simple.c:1825
 msgid "The SIP/SIMPLE Protocol Plugin"
 msgstr "SIP/SIMPLE プロトコルのプラグイン"
 
-#: ../libpurple/protocols/simple/simple.c:1855
+#: ../libpurple/protocols/simple/simple.c:1853
 msgid "Publish status (note: everyone may watch you)"
 msgstr "状態を公開する (注記: 他のユーザから丸見えになります)"
 
-#: ../libpurple/protocols/simple/simple.c:1861
+#: ../libpurple/protocols/simple/simple.c:1859
 msgid "Use UDP"
 msgstr "UDP を使用する"
 
+#: ../libpurple/protocols/simple/simple.c:1861
+msgid "Use proxy"
+msgstr "プロキシを利用する"
+
 #: ../libpurple/protocols/simple/simple.c:1863
-msgid "Use proxy"
-msgstr "プロキシを利用する"
-
-#: ../libpurple/protocols/simple/simple.c:1865
 msgid "Proxy"
 msgstr "プロキシ"
 
-#: ../libpurple/protocols/simple/simple.c:1867
+#: ../libpurple/protocols/simple/simple.c:1865
 msgid "Auth User"
 msgstr "ユーザ認証"
 
-#: ../libpurple/protocols/simple/simple.c:1869
+#: ../libpurple/protocols/simple/simple.c:1867
 msgid "Auth Domain"
 msgstr "ドメイン認証"
 
@@ -10286,7 +10900,8 @@
 msgid "Password Change Successful"
 msgstr "パスワードの変更が完了しました"
 
-#: ../libpurple/protocols/toc/toc.c:1366
+#: ../libpurple/protocols/toc/toc.c:1366 ../pidgin/gtkblist.c:5502
+#: ../pidgin/gtkblist.c:5856
 msgid "_Group:"
 msgstr "グループ(_G):"
 
@@ -10347,31 +10962,31 @@
 msgid "TOC Protocol Plugin"
 msgstr "TOC プロトコル・プラグイン"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:808
+#: ../libpurple/protocols/yahoo/yahoo.c:810
 msgid "Your Yahoo! message did not get sent."
 msgstr "Yahoo! メッセージを送ることができませんでした。"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:878
+#: ../libpurple/protocols/yahoo/yahoo.c:880
 #, c-format
 msgid "%s just sent you a Buzz!"
 msgstr "%s さんが合図を送りたがっています!"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:928
+#: ../libpurple/protocols/yahoo/yahoo.c:927
 #, c-format
 msgid "Yahoo! system message for %s:"
 msgstr "%s の Yahoo! システム・メッセージ:"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:988
+#: ../libpurple/protocols/yahoo/yahoo.c:986
 msgid "Authorization denied message:"
-msgstr "認証拒否メッセージ:"
-
-#: ../libpurple/protocols/yahoo/yahoo.c:1069
+msgstr "承認を拒否する旨のメッセージ:"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:1067
 #, c-format
 msgid "%s has (retroactively) denied your request to add them to your list."
 msgstr ""
 "%s は仲間リストに追加するあなたの要求を (以前にさかのぼって) 拒否しました。"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1072
+#: ../libpurple/protocols/yahoo/yahoo.c:1070
 #, c-format
 msgid ""
 "%s has (retroactively) denied your request to add them to your list for the "
@@ -10380,11 +10995,11 @@
 "%s は次の理由のため仲間リストに追加するあなたの要求を (以前にさかのぼって) 拒"
 "否しました\" %s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1075
+#: ../libpurple/protocols/yahoo/yahoo.c:1073
 msgid "Add buddy rejected"
 msgstr "拒否する仲間の追加"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1826
+#: ../libpurple/protocols/yahoo/yahoo.c:1824
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -10395,11 +11010,11 @@
 "pidgin ではおそらく Yahoo にサイン・インできないでしょう。%s にアップデートで"
 "きるか確認してみて下さい。"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1829
+#: ../libpurple/protocols/yahoo/yahoo.c:1827
 msgid "Failed Yahoo! Authentication"
 msgstr "Yahoo! 認証に失敗"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1895
+#: ../libpurple/protocols/yahoo/yahoo.c:1893
 #, c-format
 msgid ""
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
@@ -10408,155 +11023,173 @@
 "%s を無視しようとしましたが、ユーザが仲間リストにあります。そのユーザを仲間リ"
 "ストから削除して無視する場合は、\"はい\" をクリックして下さい。"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1898
+#: ../libpurple/protocols/yahoo/yahoo.c:1896
 msgid "Ignore buddy?"
 msgstr "仲間を無視しますか?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1957
+#: ../libpurple/protocols/yahoo/yahoo.c:1955
 msgid "Your account is locked, please log in to the Yahoo! website."
 msgstr ""
 "お使いのアカウントがロックされています。Yahoo! ウェブサイトへログインして下さ"
 "い。"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1960
+#: ../libpurple/protocols/yahoo/yahoo.c:1958
 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr ""
 "不明なエラー番号 %d です。Yahoo! ウェブサイトへログインすると修正されるかもし"
 "れません。"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2014
+#: ../libpurple/protocols/yahoo/yahoo.c:2012
 #, c-format
 msgid "Could not add buddy %s to group %s to the server list on account %s."
 msgstr ""
 "グループ %2$s の仲間 %1$s をアカウント %3$s でサーバ・リストに追加できません"
 "でした。"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2017
+#: ../libpurple/protocols/yahoo/yahoo.c:2015
 msgid "Could not add buddy to server list"
 msgstr "仲間をサーバ・リストに追加できませんでした"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2136
+#: ../libpurple/protocols/yahoo/yahoo.c:2134
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ 演奏可能 %s/%s/%s.swf ] %s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2468
+#: ../libpurple/protocols/yahoo/yahoo.c:2474
 msgid "Received unexpected HTTP response from server."
 msgstr "サーバから想定外の HTTP 応答を受け取りました"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2492
-#: ../libpurple/protocols/yahoo/yahoo.c:2671
-#: ../libpurple/protocols/yahoo/yahoo.c:2774
-#: ../libpurple/protocols/yahoo/yahoo.c:2784
+#: ../libpurple/protocols/yahoo/yahoo.c:2498
+#: ../libpurple/protocols/yahoo/yahoo.c:2684
+#: ../libpurple/protocols/yahoo/yahoo.c:2787
+#: ../libpurple/protocols/yahoo/yahoo.c:2797
 #: ../libpurple/protocols/yahoo/yahoochat.c:1455
 #: ../libpurple/protocols/yahoo/yahoochat.c:1525
 #: ../libpurple/protocols/yahoo/ycht.c:585
 msgid "Connection problem"
 msgstr "接続エラー"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2886
-#: ../libpurple/protocols/yahoo/yahoo.c:3497
+#: ../libpurple/protocols/yahoo/yahoo.c:2524
+#, c-format
+msgid ""
+"Lost connection with %s:\n"
+"%s"
+msgstr ""
+"%s との接続を失いました:\n"
+"%s"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:2549
+#, c-format
+msgid ""
+"Could not establish a connection with %s:\n"
+"%s"
+msgstr ""
+"%s との接続を確立できませんでした:\n"
+"%s"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:2899
+#: ../libpurple/protocols/yahoo/yahoo.c:3510
 msgid "Not at Home"
 msgstr "家に居ません"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2888
-#: ../libpurple/protocols/yahoo/yahoo.c:3500
+#: ../libpurple/protocols/yahoo/yahoo.c:2901
+#: ../libpurple/protocols/yahoo/yahoo.c:3513
 msgid "Not at Desk"
 msgstr "在席していません"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2890
-#: ../libpurple/protocols/yahoo/yahoo.c:3503
+#: ../libpurple/protocols/yahoo/yahoo.c:2903
+#: ../libpurple/protocols/yahoo/yahoo.c:3516
 msgid "Not in Office"
 msgstr "オフィスに居ません"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2894
-#: ../libpurple/protocols/yahoo/yahoo.c:3509
+#: ../libpurple/protocols/yahoo/yahoo.c:2907
+#: ../libpurple/protocols/yahoo/yahoo.c:3522
 msgid "On Vacation"
 msgstr "休暇中です"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2898
-#: ../libpurple/protocols/yahoo/yahoo.c:3515
+#: ../libpurple/protocols/yahoo/yahoo.c:2911
+#: ../libpurple/protocols/yahoo/yahoo.c:3528
 msgid "Stepped Out"
 msgstr "ちょっとそこまで"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2991
-#: ../libpurple/protocols/yahoo/yahoo.c:3021
+#: ../libpurple/protocols/yahoo/yahoo.c:3004
+#: ../libpurple/protocols/yahoo/yahoo.c:3034
 msgid "Not on server list"
 msgstr "サーバ・リストにありません"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3038
-#: ../libpurple/protocols/yahoo/yahoo.c:3096
+#: ../libpurple/protocols/yahoo/yahoo.c:3051
+#: ../libpurple/protocols/yahoo/yahoo.c:3109
 msgid "Appear Online"
 msgstr "オンラインのようです"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3041
-#: ../libpurple/protocols/yahoo/yahoo.c:3117
+#: ../libpurple/protocols/yahoo/yahoo.c:3054
+#: ../libpurple/protocols/yahoo/yahoo.c:3130
 msgid "Appear Permanently Offline"
 msgstr "一時的にオフラインのようです"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3059
+#: ../libpurple/protocols/yahoo/yahoo.c:3072
 msgid "Presence"
 msgstr "在席"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3102
+#: ../libpurple/protocols/yahoo/yahoo.c:3115
 msgid "Appear Offline"
 msgstr "オフラインのようです"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3111
+#: ../libpurple/protocols/yahoo/yahoo.c:3124
 msgid "Don't Appear Permanently Offline"
 msgstr "Don't Appear Permanently Offline"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3159
+#: ../libpurple/protocols/yahoo/yahoo.c:3172
 msgid "Join in Chat"
 msgstr "チャットへ参加"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3165
+#: ../libpurple/protocols/yahoo/yahoo.c:3178
 msgid "Initiate Conference"
 msgstr "会議に招待"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3193
+#: ../libpurple/protocols/yahoo/yahoo.c:3206
 msgid "Presence Settings"
 msgstr "在席状態の設定"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3199
+#: ../libpurple/protocols/yahoo/yahoo.c:3212
 msgid "Start Doodling"
 msgstr "いたずら書きする"
 
 #. XXX Typo: This should be _("Activate which ID?") - fix after string freeze is over
-#: ../libpurple/protocols/yahoo/yahoo.c:3232
+#: ../libpurple/protocols/yahoo/yahoo.c:3245
 msgid "Active which ID?"
 msgstr "どの ID を有効化しますか?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3243
+#: ../libpurple/protocols/yahoo/yahoo.c:3256
 msgid "Join who in chat?"
 msgstr "どのチャットへ参加しますか?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3255
+#: ../libpurple/protocols/yahoo/yahoo.c:3268
 msgid "Activate ID..."
 msgstr "ID の有効化..."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3259
+#: ../libpurple/protocols/yahoo/yahoo.c:3272
 msgid "Join User in Chat..."
 msgstr "チャットに参加する..."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3766
+#: ../libpurple/protocols/yahoo/yahoo.c:3779
 msgid "You have just sent a Buzz!"
 msgstr "今、合図を送りました!"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3825
+#: ../libpurple/protocols/yahoo/yahoo.c:3838
 msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
 msgstr "join &lt;ルーム&gt;: Yahoo ネットワーク上にあるチャットへ参加する"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3830
+#: ../libpurple/protocols/yahoo/yahoo.c:3843
 msgid "list: List rooms on the Yahoo network"
 msgstr "list: Yahoo ネットワーク上にあるルームを一覧表示します"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3834
+#: ../libpurple/protocols/yahoo/yahoo.c:3847
 msgid "buzz: Buzz a user to get their attention"
 msgstr "buzz: ユーザ宛に警告音を鳴らす"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3838
+#: ../libpurple/protocols/yahoo/yahoo.c:3851
 msgid "doodle: Request user to start a Doodle session"
 msgstr "doodle: いたずら書きを始めることをユーザに要求する"
 
@@ -10570,56 +11203,56 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/yahoo/yahoo.c:4046
-#: ../libpurple/protocols/yahoo/yahoo.c:4048
+#: ../libpurple/protocols/yahoo/yahoo.c:4059
+#: ../libpurple/protocols/yahoo/yahoo.c:4061
 msgid "Yahoo Protocol Plugin"
 msgstr "Yahoo! プロトコル・プラグイン"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4071
+#: ../libpurple/protocols/yahoo/yahoo.c:4084
 msgid "Yahoo Japan"
 msgstr "Yahoo Japan! に接続する"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4074
+#: ../libpurple/protocols/yahoo/yahoo.c:4087
 msgid "Pager server"
 msgstr "ページャのサーバ"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4077
+#: ../libpurple/protocols/yahoo/yahoo.c:4090
 msgid "Japan Pager server"
 msgstr "日本のページャ・サーバ"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4080
+#: ../libpurple/protocols/yahoo/yahoo.c:4093
 msgid "Pager port"
 msgstr "ページャのポート番号"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4083
+#: ../libpurple/protocols/yahoo/yahoo.c:4096
 msgid "File transfer server"
 msgstr "ファイル転送サーバ"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4086
+#: ../libpurple/protocols/yahoo/yahoo.c:4099
 msgid "Japan file transfer server"
 msgstr "日本のファイル転送サーバ"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4089
+#: ../libpurple/protocols/yahoo/yahoo.c:4102
 msgid "File transfer port"
 msgstr "ファイル転送のポート番号"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4092
+#: ../libpurple/protocols/yahoo/yahoo.c:4105
 msgid "Chat room locale"
 msgstr "チャット・ルームの場所"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4095
+#: ../libpurple/protocols/yahoo/yahoo.c:4108
 msgid "Ignore conference and chatroom invitations"
 msgstr "会議とチャットルームの招待を無視する"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4103
+#: ../libpurple/protocols/yahoo/yahoo.c:4116
 msgid "Chat room list URL"
 msgstr "チャット・ルームの URL リスト"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4106
+#: ../libpurple/protocols/yahoo/yahoo.c:4119
 msgid "Yahoo Chat server"
 msgstr "Yahoo チャット・サーバ"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4109
+#: ../libpurple/protocols/yahoo/yahoo.c:4122
 msgid "Yahoo Chat port"
 msgstr "Yahoo チャットのポート番号"
 
@@ -10708,7 +11341,7 @@
 msgstr "ファイル・デスクリプタを取得できません"
 
 #. TODO: what to do here - do we really have to disconnect?
-#: ../libpurple/protocols/yahoo/yahoo_packet.c:289
+#: ../libpurple/protocols/yahoo/yahoo_packet.c:302
 msgid "Write Error"
 msgstr "書き込みエラー"
 
@@ -10834,80 +11467,80 @@
 msgstr "チャット %s,%s,%s へ送信できません"
 
 #: ../libpurple/protocols/zephyr/zephyr.c:786
-#: ../libpurple/protocols/zephyr/zephyr.c:1203
+#: ../libpurple/protocols/zephyr/zephyr.c:1204
 msgid "User"
 msgstr "ユーザ"
 
 #: ../libpurple/protocols/zephyr/zephyr.c:791
-#: ../libpurple/protocols/zephyr/zephyr.c:1209
+#: ../libpurple/protocols/zephyr/zephyr.c:1210
 msgid "Hidden or not logged-in"
 msgstr "隠れているか、またはサインインしていません"
 
 #: ../libpurple/protocols/zephyr/zephyr.c:797
-#: ../libpurple/protocols/zephyr/zephyr.c:1211
+#: ../libpurple/protocols/zephyr/zephyr.c:1212
 #, c-format
 msgid "<br>At %s since %s"
 msgstr "<br> %s に %s から居ます"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:1545
 #: ../libpurple/protocols/zephyr/zephyr.c:1546
+#: ../libpurple/protocols/zephyr/zephyr.c:1547
 msgid "Anyone"
 msgstr "だれでも"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2353
+#: ../libpurple/protocols/zephyr/zephyr.c:2354
 msgid "_Class:"
 msgstr "クラス(_C):"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2359
+#: ../libpurple/protocols/zephyr/zephyr.c:2360
 msgid "_Instance:"
 msgstr "インスタンス(_I):"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2365
+#: ../libpurple/protocols/zephyr/zephyr.c:2366
 msgid "_Recipient:"
 msgstr "受取人(_R):"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2376
+#: ../libpurple/protocols/zephyr/zephyr.c:2377
 #, c-format
 msgid "Attempt to subscribe to %s,%s,%s failed"
 msgstr "%s,%s,%s への購読の試行に失敗"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2689
+#: ../libpurple/protocols/zephyr/zephyr.c:2690
 msgid "zlocate &lt;nick&gt;: Locate user"
 msgstr "zlocate &lt;あだ名&gt;: ユーザの所在地を確認します"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2694
+#: ../libpurple/protocols/zephyr/zephyr.c:2695
 msgid "zl &lt;nick&gt;: Locate user"
 msgstr "zl &lt;あだ名&gt;: ユーザの所在地を確認します"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2699
+#: ../libpurple/protocols/zephyr/zephyr.c:2700
 msgid "instance &lt;instance&gt;: Set the instance to be used on this class"
 msgstr ""
 "instance &lt;インスタンス&gt;: このクラスで使用するインスタンスをセットします"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2704
+#: ../libpurple/protocols/zephyr/zephyr.c:2705
 msgid "inst &lt;instance&gt;: Set the instance to be used on this class"
 msgstr ""
 "inst &lt;インスタンス&gt;: このクラスで使用するインスタンスをセットします"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2709
+#: ../libpurple/protocols/zephyr/zephyr.c:2710
 msgid "topic &lt;instance&gt;: Set the instance to be used on this class"
 msgstr ""
 "topic &lt;インスタンス&gt;: このクラスで使用するインスタンスをセットします"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2715
+#: ../libpurple/protocols/zephyr/zephyr.c:2716
 msgid "sub &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Join a new chat"
 msgstr ""
 "sub &lt;クラス&gt; &lt;インスタンス&gt; &lt;宛先&gt;: 新しいチャットへ参加し"
 "ます"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2720
+#: ../libpurple/protocols/zephyr/zephyr.c:2721
 msgid ""
 "zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
 msgstr ""
 "zi &lt;インスタンス&gt;: &lt;メッセージ、<i>インスタンス</i>、*&gt; へメッ"
 "セージを送信します"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2726
+#: ../libpurple/protocols/zephyr/zephyr.c:2727
 msgid ""
 "zci &lt;class&gt; &lt;instance&gt;: Send a message to &lt;<i>class</i>,"
 "<i>instance</i>,*&gt;"
@@ -10915,7 +11548,7 @@
 "zci &lt;クラス&gt; &lt;インスタンス&gt;: &lt;<i>クラス</i>、<i>インスタンス</"
 "i>、*&gt; へメッセージを送信します"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2732
+#: ../libpurple/protocols/zephyr/zephyr.c:2733
 msgid ""
 "zcir &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;"
 "<i>class</i>,<i>instance</i>,<i>recipient</i>&gt;"
@@ -10923,7 +11556,7 @@
 "zcir &lt;クラス&gt; &lt;インスタンス&gt; &lt;宛先&gt;: &lt;<i>クラス</i>、<i>"
 "インスタンス</i>、<i>宛先</i>&gt; へメッセージを送信します"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2738
+#: ../libpurple/protocols/zephyr/zephyr.c:2739
 msgid ""
 "zir &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;MESSAGE,"
 "<i>instance</i>,<i>recipient</i>&gt;"
@@ -10931,16 +11564,16 @@
 "zir &lt;インスタンス&gt; &lt;宛先&gt;: &lt;MESSAGE、<i>インスタンス</i>、<i>"
 "宛先</i>&gt; へメッセージを送信します"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2743
+#: ../libpurple/protocols/zephyr/zephyr.c:2744
 msgid "zc &lt;class&gt;: Send a message to &lt;<i>class</i>,PERSONAL,*&gt;"
 msgstr ""
 "zc &lt;クラス&gt;: &lt;<i>クラス</i>,PERSONAL,*&gt; へメッセージを送信します"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2849
+#: ../libpurple/protocols/zephyr/zephyr.c:2850
 msgid "Resubscribe"
 msgstr "再購読"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2852
+#: ../libpurple/protocols/zephyr/zephyr.c:2853
 msgid "Retrieve subscriptions from server"
 msgstr "サーバから購読を取得します"
 
@@ -10954,45 +11587,45 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/zephyr/zephyr.c:2945
-#: ../libpurple/protocols/zephyr/zephyr.c:2947
+#: ../libpurple/protocols/zephyr/zephyr.c:2946
+#: ../libpurple/protocols/zephyr/zephyr.c:2948
 msgid "Zephyr Protocol Plugin"
 msgstr "Zephyrプロトコル・プラグイン"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2972
+#: ../libpurple/protocols/zephyr/zephyr.c:2973
 msgid "Use tzc"
 msgstr "tzc を使う"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2975
+#: ../libpurple/protocols/zephyr/zephyr.c:2976
 msgid "tzc command"
 msgstr "tzc コマンド"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2978
+#: ../libpurple/protocols/zephyr/zephyr.c:2979
 msgid "Export to .anyone"
 msgstr ".anyone へエキスポート"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2981
+#: ../libpurple/protocols/zephyr/zephyr.c:2982
 msgid "Export to .zephyr.subs"
 msgstr ".zephyr.subs へエキスポート"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2984
+#: ../libpurple/protocols/zephyr/zephyr.c:2985
 msgid "Import from .anyone"
 msgstr ".anyone からインポート"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2987
+#: ../libpurple/protocols/zephyr/zephyr.c:2988
 msgid "Import from .zephyr.subs"
 msgstr ".zephyr.subs からインポート"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2990
+#: ../libpurple/protocols/zephyr/zephyr.c:2991
 msgid "Realm"
 msgstr "Realm"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2993
+#: ../libpurple/protocols/zephyr/zephyr.c:2994
 msgid "Exposure"
 msgstr "Exposure"
 
 #: ../libpurple/proxy.c:458 ../libpurple/proxy.c:877 ../libpurple/proxy.c:1032
-#: ../libpurple/proxy.c:1588
+#: ../libpurple/proxy.c:1600
 #, c-format
 msgid ""
 "Unable to create socket:\n"
@@ -11024,7 +11657,7 @@
 msgid "Error resolving %s"
 msgstr "%s を解決する際にエラー"
 
-#: ../libpurple/proxy.c:1685
+#: ../libpurple/proxy.c:1697
 msgid "Could not resolve host name"
 msgstr "ホスト名を解決できませんでした"
 
@@ -11057,12 +11690,12 @@
 msgid "saved statuses"
 msgstr "保存した状態"
 
-#: ../libpurple/server.c:228
+#: ../libpurple/server.c:233
 #, c-format
 msgid "%s is now known as %s.\n"
 msgstr "%s さんは %s さんと認識されました\n"
 
-#: ../libpurple/server.c:670
+#: ../libpurple/server.c:679
 #, c-format
 msgid ""
 "%s has invited %s to the chat room %s:\n"
@@ -11071,73 +11704,73 @@
 "%s さんが %s さんをチャット・ルーム %s へ招待しています:\n"
 "%s"
 
-#: ../libpurple/server.c:675
+#: ../libpurple/server.c:684
 #, c-format
 msgid "%s has invited %s to the chat room %s\n"
 msgstr "%s さんが %s さんをチャット・ルーム %s へ招待しています\n"
 
-#: ../libpurple/server.c:679
+#: ../libpurple/server.c:688
 msgid "Accept chat invitation?"
 msgstr "チャットへの招待を受けますか?"
 
-#: ../libpurple/status.c:153
+#: ../libpurple/status.c:152
 msgid "Unset"
 msgstr "解除"
 
-#: ../libpurple/status.c:156
+#: ../libpurple/status.c:155
 msgid "Unavailable"
 msgstr "利用不可"
 
-#: ../libpurple/status.c:160
+#: ../libpurple/status.c:159
 msgid "Mobile"
 msgstr "移動中"
 
-#: ../libpurple/status.c:609
+#: ../libpurple/status.c:608
 #, c-format
 msgid "%s changed status from %s to %s"
 msgstr "%s さんがステータスを %s から %s に変更しました"
 
-#: ../libpurple/status.c:619
+#: ../libpurple/status.c:618
 #, c-format
 msgid "%s is now %s"
 msgstr "%s さんは %s さんと認識されました"
 
-#: ../libpurple/status.c:624
+#: ../libpurple/status.c:623
 #, c-format
 msgid "%s is no longer %s"
 msgstr "もう %s さんは %s さんではありません"
 
-#: ../libpurple/status.c:1288
+#: ../libpurple/status.c:1233
 #, c-format
 msgid "%s became idle"
 msgstr "%s さんが待機中になりました"
 
-#: ../libpurple/status.c:1305
+#: ../libpurple/status.c:1250
 #, c-format
 msgid "%s became unidle"
 msgstr "%s さんが待機中から復帰しました"
 
-#: ../libpurple/status.c:1371
+#: ../libpurple/status.c:1313
 #, c-format
 msgid "+++ %s became idle"
 msgstr "+++ %s さんが待機中になりました"
 
-#: ../libpurple/status.c:1373
+#: ../libpurple/status.c:1315
 #, c-format
 msgid "+++ %s became unidle"
 msgstr "+++ %s さんが待機中から復帰しました"
 
-#: ../libpurple/util.c:681
+#: ../libpurple/util.c:682
 #, c-format
 msgid "%x %X"
 msgstr "%x %X"
 
-#: ../libpurple/util.c:2495
+#: ../libpurple/util.c:2586
 #, c-format
 msgid "Error Reading %s"
 msgstr "%s を読み込む際にエラー"
 
-#: ../libpurple/util.c:2496
+#: ../libpurple/util.c:2587
 #, c-format
 msgid ""
 "An error was encountered reading your %s.  They have not been loaded, and "
@@ -11146,62 +11779,67 @@
 "%s を読み込む際にエラーが発生しました。その情報は読み込まれません。また、古い"
 "ファイルの名前を \"%s~\" に変更しました。"
 
-#: ../libpurple/util.c:2980
+#: ../libpurple/util.c:3060
 msgid "Calculating..."
 msgstr "計算中..."
 
-#: ../libpurple/util.c:2983
+#: ../libpurple/util.c:3063
 msgid "Unknown."
 msgstr "不明です"
 
-#: ../libpurple/util.c:3009
+#: ../libpurple/util.c:3089
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d秒"
 msgstr[1] "%d秒"
 
-#: ../libpurple/util.c:3021
+#: ../libpurple/util.c:3101
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d日"
 msgstr[1] "%d日"
 
-#: ../libpurple/util.c:3029
+#: ../libpurple/util.c:3109
 #, c-format
 msgid "%s, %d hour"
 msgid_plural "%s, %d hours"
 msgstr[0] "%s %d時間"
 msgstr[1] "%s %d時間"
 
-#: ../libpurple/util.c:3035
+#: ../libpurple/util.c:3115
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d時間"
 msgstr[1] "%d時間"
 
-#: ../libpurple/util.c:3043
+#: ../libpurple/util.c:3123
 #, c-format
 msgid "%s, %d minute"
 msgid_plural "%s, %d minutes"
 msgstr[0] "%s %d分"
 msgstr[1] "%s %d分"
 
-#: ../libpurple/util.c:3049
+#: ../libpurple/util.c:3129
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d分"
 msgstr[1] "%d分"
 
-#: ../libpurple/util.c:3315 ../libpurple/util.c:3613
+#: ../libpurple/util.c:3389
+#, c-format
+msgid "Could not open %s: Redirected too many times"
+msgstr "%s を開けませんでした: 複数回リダイレクトしました"
+
+#: ../libpurple/util.c:3426 ../libpurple/util.c:3721
 #, c-format
 msgid "Unable to connect to %s"
 msgstr "%s へ接続できません"
 
-#: ../libpurple/util.c:3441
+#: ../libpurple/util.c:3549
 #, c-format
 msgid ""
 "Unable to allocate enough memory to hold the contents from %s.  The web "
@@ -11210,17 +11848,17 @@
 "%s から受け取った情報を格納するためのメモリを確保できません。ウェブ・サーバか"
 "ら何か悪意を持って転送している可能性があります。"
 
-#: ../libpurple/util.c:3476
+#: ../libpurple/util.c:3584
 #, c-format
 msgid "Error reading from %s: %s"
 msgstr "%s からの読み込みでエラー: %s"
 
-#: ../libpurple/util.c:3507
+#: ../libpurple/util.c:3615
 #, c-format
 msgid "Error writing to %s: %s"
 msgstr "%s へ書き込む際にエラー: %s"
 
-#: ../libpurple/util.c:3532
+#: ../libpurple/util.c:3640
 #, c-format
 msgid "Unable to connect to %s: %s"
 msgstr "%s へ接続できません: %s"
@@ -11246,55 +11884,71 @@
 msgstr "トレイの向きです"
 
 #. Build the login options frame.
-#: ../pidgin/gtkaccount.c:398
+#: ../pidgin/gtkaccount.c:409
 msgid "Login Options"
 msgstr "ログインのオプション"
 
-#: ../pidgin/gtkaccount.c:500
-msgid "Local alias:"
-msgstr "別名:"
+#: ../pidgin/gtkaccount.c:430
+msgid "Pro_tocol:"
+msgstr "プロトコル(_T):"
+
+#: ../pidgin/gtkaccount.c:441
+msgid "Screen _name:"
+msgstr "スクリーン名(_N):"
+
+#: ../pidgin/gtkaccount.c:528
+msgid "_Local alias:"
+msgstr "別名(_L):"
+
+#: ../pidgin/gtkaccount.c:532
+msgid "Remember pass_word"
+msgstr "パスワードを保存する(_W)"
 
 #. Build the user options frame.
-#: ../pidgin/gtkaccount.c:562
+#: ../pidgin/gtkaccount.c:590
 msgid "User Options"
 msgstr "ユーザのオプション"
 
+#: ../pidgin/gtkaccount.c:603
+msgid "New _mail notifications"
+msgstr "新着メールを通知する(_M)"
+
 #. Buddy icon
-#: ../pidgin/gtkaccount.c:580
-msgid "Use this buddy icon for this account:"
-msgstr "次の仲間アイコンを使用する:"
+#: ../pidgin/gtkaccount.c:608
+msgid "Use this buddy _icon for this account:"
+msgstr "次の仲間アイコンを使用する(_I):"
 
 #. Build the protocol options frame.
-#: ../pidgin/gtkaccount.c:700
+#: ../pidgin/gtkaccount.c:728
 #, c-format
 msgid "%s Options"
 msgstr "%s のオプション"
 
-#: ../pidgin/gtkaccount.c:897
+#: ../pidgin/gtkaccount.c:934
 msgid "Use GNOME Proxy Settings"
 msgstr "GNOME のプロキシ設定を使う"
 
-#: ../pidgin/gtkaccount.c:898
+#: ../pidgin/gtkaccount.c:935
 msgid "Use Global Proxy Settings"
 msgstr "グローバルなプロキシ設定を使う"
 
-#: ../pidgin/gtkaccount.c:904
+#: ../pidgin/gtkaccount.c:941
 msgid "No Proxy"
 msgstr "プロキシなし"
 
-#: ../pidgin/gtkaccount.c:910
+#: ../pidgin/gtkaccount.c:947
 msgid "HTTP"
 msgstr "HTTP"
 
-#: ../pidgin/gtkaccount.c:916
+#: ../pidgin/gtkaccount.c:953
 msgid "SOCKS 4"
 msgstr "SOCKS 4"
 
-#: ../pidgin/gtkaccount.c:922
+#: ../pidgin/gtkaccount.c:959
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
-#: ../pidgin/gtkaccount.c:928 ../pidgin/gtkprefs.c:1100
+#: ../pidgin/gtkaccount.c:965 ../pidgin/gtkprefs.c:1137
 msgid "Use Environmental Settings"
 msgstr "環境設定を使う"
 
@@ -11303,60 +11957,60 @@
 #. A) your network is really slow and you have nothing better to do than
 #. look at butterflies.
 #. B)You are looking really closely at something that shouldn't matter.
-#: ../pidgin/gtkaccount.c:967
+#: ../pidgin/gtkaccount.c:1004
 msgid "If you look real closely"
 msgstr "近づいてよく見れば"
 
 #. This is an easter egg. See the comment on the previous line in the source.
-#: ../pidgin/gtkaccount.c:970
+#: ../pidgin/gtkaccount.c:1007
 msgid "you can see the butterflies mating"
 msgstr "蝶が仲間になっているのが分かります"
 
-#: ../pidgin/gtkaccount.c:991
+#: ../pidgin/gtkaccount.c:1028
 msgid "Proxy Options"
 msgstr "プロキシのオプション"
 
-#: ../pidgin/gtkaccount.c:1005 ../pidgin/gtkprefs.c:1094
+#: ../pidgin/gtkaccount.c:1042 ../pidgin/gtkprefs.c:1131
 msgid "Proxy _type:"
 msgstr "プロキシの種類(_T):"
 
-#: ../pidgin/gtkaccount.c:1014 ../pidgin/gtkprefs.c:1115
+#: ../pidgin/gtkaccount.c:1051 ../pidgin/gtkprefs.c:1152
 msgid "_Host:"
 msgstr "ホスト名(_H):"
 
-#: ../pidgin/gtkaccount.c:1018 ../pidgin/gtkprefs.c:1133
+#: ../pidgin/gtkaccount.c:1055 ../pidgin/gtkprefs.c:1170
 msgid "_Port:"
 msgstr "ポート番号(_P):"
 
-#: ../pidgin/gtkaccount.c:1026
+#: ../pidgin/gtkaccount.c:1063
 msgid "_Username:"
 msgstr "ユーザ名(_U):"
 
-#: ../pidgin/gtkaccount.c:1033 ../pidgin/gtkprefs.c:1170
+#: ../pidgin/gtkaccount.c:1070 ../pidgin/gtkprefs.c:1207
 msgid "Pa_ssword:"
 msgstr "パスワード(_S):"
 
-#: ../pidgin/gtkaccount.c:1440
+#: ../pidgin/gtkaccount.c:1476
 msgid "Add Account"
 msgstr "アカウントの追加"
 
-#: ../pidgin/gtkaccount.c:1464
+#: ../pidgin/gtkaccount.c:1500
 msgid "_Basic"
 msgstr "基本(_B)"
 
-#: ../pidgin/gtkaccount.c:1475
+#: ../pidgin/gtkaccount.c:1511
 msgid "_Advanced"
 msgstr "拡張(_A)"
 
-#: ../pidgin/gtkaccount.c:1947 ../pidgin/gtkplugin.c:568
+#: ../pidgin/gtkaccount.c:1983 ../pidgin/gtkplugin.c:568
 msgid "Enabled"
 msgstr "有効"
 
-#: ../pidgin/gtkaccount.c:1975
+#: ../pidgin/gtkaccount.c:2011
 msgid "Protocol"
 msgstr "プロトコル"
 
-#: ../pidgin/gtkaccount.c:2169
+#: ../pidgin/gtkaccount.c:2212
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Welcome to %s!</span>\n"
@@ -11379,231 +12033,229 @@
 "仲間リストのウィンドウにある <b>アカウント->追加/編集</b> メニューからも、こ"
 "の画面を開くことができます。"
 
-#: ../pidgin/gtkblist.c:722
+#: ../pidgin/gtkblist.c:732
 msgid "Join a Chat"
 msgstr "チャットに参加"
 
-#: ../pidgin/gtkblist.c:743
+#: ../pidgin/gtkblist.c:753
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 msgstr "参加するチャットについて適切な情報を入力して下さい。\n"
 
-#: ../pidgin/gtkblist.c:754 ../pidgin/gtkpounce.c:531
+#. Set up stuff for the account box
+#: ../pidgin/gtkblist.c:764 ../pidgin/gtkblist.c:5450
+#: ../pidgin/gtkblist.c:5817 ../pidgin/gtkpounce.c:531
 #: ../pidgin/gtkroomlist.c:399
 msgid "_Account:"
 msgstr "アカウント(_A):"
 
-#: ../pidgin/gtkblist.c:1028 ../pidgin/gtkprivacy.c:606
+#: ../pidgin/gtkblist.c:1053 ../pidgin/gtkprivacy.c:606
 #: ../pidgin/gtkprivacy.c:620
 msgid "_Block"
 msgstr "拒否する(_B)"
 
-#: ../pidgin/gtkblist.c:1028
+#: ../pidgin/gtkblist.c:1053
 msgid "Un_block"
 msgstr "拒否しない(_B)"
 
-#: ../pidgin/gtkblist.c:1079
+#: ../pidgin/gtkblist.c:1104
 msgid "Get _Info"
 msgstr "情報の取得(_I)"
 
-#: ../pidgin/gtkblist.c:1082 ../pidgin/pidginstock.c:86
+#: ../pidgin/gtkblist.c:1107 ../pidgin/pidginstock.c:84
 msgid "I_M"
 msgstr "IM(_M)"
 
-#: ../pidgin/gtkblist.c:1088
+#: ../pidgin/gtkblist.c:1113
 msgid "_Send File"
 msgstr "ファイルの送信(_S)"
 
-#: ../pidgin/gtkblist.c:1095
+#: ../pidgin/gtkblist.c:1120
 msgid "Add Buddy _Pounce"
 msgstr "つかむ仲間の追加(_P)"
 
-#: ../pidgin/gtkblist.c:1099 ../pidgin/gtkblist.c:1103
-#: ../pidgin/gtkblist.c:1204 ../pidgin/gtkblist.c:1227
+#: ../pidgin/gtkblist.c:1124 ../pidgin/gtkblist.c:1128
+#: ../pidgin/gtkblist.c:1230 ../pidgin/gtkblist.c:1253
 msgid "View _Log"
 msgstr "ログの表示(_L)"
 
-#: ../pidgin/gtkblist.c:1115
-msgid "Alias..."
-msgstr "別名..."
-
-#: ../pidgin/gtkblist.c:1124 ../pidgin/gtkblist.c:1212
-#: ../pidgin/gtkblist.c:1233
+#: ../pidgin/gtkblist.c:1140 ../pidgin/gtkblist.c:1149
+#: ../pidgin/gtkblist.c:1238 ../pidgin/gtkblist.c:1259
 msgid "_Alias..."
 msgstr "別名(_A)..."
 
-#: ../pidgin/gtkblist.c:1126 ../pidgin/gtkblist.c:1214
-#: ../pidgin/gtkblist.c:1235
+#: ../pidgin/gtkblist.c:1143 ../pidgin/gtkblist.c:1151
+#: ../pidgin/gtkblist.c:1240 ../pidgin/gtkblist.c:1261
 msgid "_Remove"
 msgstr "削除(_R)"
 
-#: ../pidgin/gtkblist.c:1175
+#: ../pidgin/gtkblist.c:1200
 msgid "Add a _Buddy"
 msgstr "仲間の追加(_B)"
 
-#: ../pidgin/gtkblist.c:1177
+#: ../pidgin/gtkblist.c:1203
 msgid "Add a C_hat"
 msgstr "チャットの追加(_H)"
 
-#: ../pidgin/gtkblist.c:1180
+#: ../pidgin/gtkblist.c:1206
 msgid "_Delete Group"
 msgstr "グループの削除(_D)"
 
-#: ../pidgin/gtkblist.c:1182
+#: ../pidgin/gtkblist.c:1208
 msgid "_Rename"
 msgstr "名前の変更(_R)"
 
 #. join button
-#: ../pidgin/gtkblist.c:1200 ../pidgin/gtkroomlist.c:306
-#: ../pidgin/gtkroomlist.c:463 ../pidgin/pidginstock.c:84
+#: ../pidgin/gtkblist.c:1226 ../pidgin/gtkroomlist.c:306
+#: ../pidgin/gtkroomlist.c:463 ../pidgin/pidginstock.c:82
 msgid "_Join"
 msgstr "参加(_J)"
 
-#: ../pidgin/gtkblist.c:1202
+#: ../pidgin/gtkblist.c:1228
 msgid "Auto-Join"
 msgstr "自動参加"
 
-#: ../pidgin/gtkblist.c:1240 ../pidgin/gtkblist.c:1263
+#: ../pidgin/gtkblist.c:1266 ../pidgin/gtkblist.c:1289
 msgid "_Collapse"
 msgstr "畳む(_C)"
 
-#: ../pidgin/gtkblist.c:1268
+#: ../pidgin/gtkblist.c:1294
 msgid "_Expand"
 msgstr "広げる(_E)"
 
-#: ../pidgin/gtkblist.c:1513 ../pidgin/gtkblist.c:1525
-#: ../pidgin/gtkblist.c:4491 ../pidgin/gtkblist.c:4501
+#: ../pidgin/gtkblist.c:1539 ../pidgin/gtkblist.c:1551
+#: ../pidgin/gtkblist.c:4552 ../pidgin/gtkblist.c:4562
 msgid "/Tools/Mute Sounds"
 msgstr "/ツール/ミュート"
 
-#: ../pidgin/gtkblist.c:1985 ../pidgin/gtkconv.c:4498
+#: ../pidgin/gtkblist.c:2011 ../pidgin/gtkconv.c:4650
 #: ../pidgin/gtkpounce.c:423
 msgid ""
 "You are not currently signed on with an account that can add that buddy."
 msgstr "現在、仲間の追加が可能なアカウントでサイン・インしていません。"
 
 #. Buddies menu
-#: ../pidgin/gtkblist.c:2813
+#: ../pidgin/gtkblist.c:2851
 msgid "/_Buddies"
 msgstr "/仲間(_B)"
 
-#: ../pidgin/gtkblist.c:2814
+#: ../pidgin/gtkblist.c:2852
 msgid "/Buddies/New Instant _Message..."
 msgstr "/仲間/新しいインスタント・メッセージ(_I)..."
 
-#: ../pidgin/gtkblist.c:2815
+#: ../pidgin/gtkblist.c:2853
 msgid "/Buddies/Join a _Chat..."
 msgstr "/仲間/チャットに参加(_C)..."
 
-#: ../pidgin/gtkblist.c:2816
+#: ../pidgin/gtkblist.c:2854
 msgid "/Buddies/Get User _Info..."
 msgstr "/仲間/ユーザ情報の取得(_I)..."
 
-#: ../pidgin/gtkblist.c:2817
+#: ../pidgin/gtkblist.c:2855
 msgid "/Buddies/View User _Log..."
 msgstr "/仲間/ユーザ・ログの表示(_L)..."
 
-#: ../pidgin/gtkblist.c:2819
+#: ../pidgin/gtkblist.c:2857
 msgid "/Buddies/Show _Offline Buddies"
 msgstr "/仲間/オフラインの仲間を表示する(_O)"
 
-#: ../pidgin/gtkblist.c:2820
+#: ../pidgin/gtkblist.c:2858
 msgid "/Buddies/Show _Empty Groups"
 msgstr "/仲間/空グループを表示する(_E)"
 
-#: ../pidgin/gtkblist.c:2821
+#: ../pidgin/gtkblist.c:2859
 msgid "/Buddies/Show Buddy _Details"
 msgstr "/仲間/仲間の詳細を表示する(_D)"
 
-#: ../pidgin/gtkblist.c:2822
+#: ../pidgin/gtkblist.c:2860
 msgid "/Buddies/Show Idle _Times"
 msgstr "/仲間/待機中の時間を表示する(_T)"
 
-#: ../pidgin/gtkblist.c:2823
+#: ../pidgin/gtkblist.c:2861
 msgid "/Buddies/_Sort Buddies"
 msgstr "/仲間/仲間の並び替え(_S)"
 
-#: ../pidgin/gtkblist.c:2825
+#: ../pidgin/gtkblist.c:2863
 msgid "/Buddies/_Add Buddy..."
 msgstr "/仲間/仲間の追加(_A)..."
 
-#: ../pidgin/gtkblist.c:2826
+#: ../pidgin/gtkblist.c:2864
 msgid "/Buddies/Add C_hat..."
 msgstr "/仲間/チャットの追加(_H)..."
 
-#: ../pidgin/gtkblist.c:2827
+#: ../pidgin/gtkblist.c:2865
 msgid "/Buddies/Add _Group..."
 msgstr "/仲間/グループの追加(_G)..."
 
-#: ../pidgin/gtkblist.c:2829
+#: ../pidgin/gtkblist.c:2867
 msgid "/Buddies/_Quit"
 msgstr "/仲間/終了(_Q)"
 
 #. Accounts menu
-#: ../pidgin/gtkblist.c:2832
+#: ../pidgin/gtkblist.c:2870
 msgid "/_Accounts"
 msgstr "/アカウント(_A)"
 
-#: ../pidgin/gtkblist.c:2833 ../pidgin/gtkblist.c:6414
+#: ../pidgin/gtkblist.c:2871 ../pidgin/gtkblist.c:6515
 msgid "/Accounts/Add\\/Edit"
 msgstr "/アカウント/追加\\/編集"
 
 #. Tools
-#: ../pidgin/gtkblist.c:2836
+#: ../pidgin/gtkblist.c:2874
 msgid "/_Tools"
 msgstr "/ツール(_T)"
 
-#: ../pidgin/gtkblist.c:2837
+#: ../pidgin/gtkblist.c:2875
 msgid "/Tools/Buddy _Pounces"
 msgstr "/ツール/仲間をつかむ(_P)"
 
-#: ../pidgin/gtkblist.c:2838
+#: ../pidgin/gtkblist.c:2876
 msgid "/Tools/Plu_gins"
 msgstr "/ツール/プラグイン(_G)"
 
-#: ../pidgin/gtkblist.c:2839
+#: ../pidgin/gtkblist.c:2877
 msgid "/Tools/Pr_eferences"
 msgstr "/ツール/設定(_E)"
 
-#: ../pidgin/gtkblist.c:2840
+#: ../pidgin/gtkblist.c:2878
 msgid "/Tools/Pr_ivacy"
 msgstr "/ツール/個人情報(_I)"
 
-#: ../pidgin/gtkblist.c:2842
+#: ../pidgin/gtkblist.c:2880
 msgid "/Tools/_File Transfers"
 msgstr "/ツール/ファイルの転送(_F)"
 
-#: ../pidgin/gtkblist.c:2843
+#: ../pidgin/gtkblist.c:2881
 msgid "/Tools/R_oom List"
 msgstr "/ツール/チャットルームの一覧(_O)"
 
-#: ../pidgin/gtkblist.c:2844
+#: ../pidgin/gtkblist.c:2882
 msgid "/Tools/System _Log"
 msgstr "/ツール/システム・ログ(_L)"
 
-#: ../pidgin/gtkblist.c:2846
+#: ../pidgin/gtkblist.c:2884
 msgid "/Tools/Mute _Sounds"
 msgstr "/ツール/ミュート(_S)"
 
 #. Help
-#: ../pidgin/gtkblist.c:2849
+#: ../pidgin/gtkblist.c:2887
 msgid "/_Help"
 msgstr "/ヘルプ(_H)"
 
-#: ../pidgin/gtkblist.c:2850
+#: ../pidgin/gtkblist.c:2888
 msgid "/Help/Online _Help"
 msgstr "/ヘルプ/オンライン・ヘルプ(_H)"
 
-#: ../pidgin/gtkblist.c:2851
+#: ../pidgin/gtkblist.c:2889
 msgid "/Help/_Debug Window"
 msgstr "/ヘルプ/デバッグ・ウィンドウ(_D)"
 
-#: ../pidgin/gtkblist.c:2852
+#: ../pidgin/gtkblist.c:2890
 msgid "/Help/_About"
 msgstr "/ヘルプ/情報(_A)"
 
-#: ../pidgin/gtkblist.c:2880
+#: ../pidgin/gtkblist.c:2918
 #, c-format
 msgid ""
 "\n"
@@ -11612,131 +12264,127 @@
 "\n"
 "<b>アカウント:</b> %s"
 
-#: ../pidgin/gtkblist.c:2958
+#: ../pidgin/gtkblist.c:2996
 msgid "Buddy Alias"
 msgstr "仲間の別名"
 
-#: ../pidgin/gtkblist.c:2979
+#: ../pidgin/gtkblist.c:3024
 msgid "Logged In"
 msgstr "既にログインしています"
 
-#: ../pidgin/gtkblist.c:3025
+#: ../pidgin/gtkblist.c:3070
 msgid "Last Seen"
 msgstr "最後にお会いしたのは"
 
-#: ../pidgin/gtkblist.c:3045
+#: ../pidgin/gtkblist.c:3090
 msgid "Spooky"
 msgstr "不気味"
 
-#: ../pidgin/gtkblist.c:3047
+#: ../pidgin/gtkblist.c:3092
 msgid "Awesome"
 msgstr "サイコー"
 
-#: ../pidgin/gtkblist.c:3049
+#: ../pidgin/gtkblist.c:3094
 msgid "Rockin'"
 msgstr "グレイト!"
 
-#: ../pidgin/gtkblist.c:3374
+#: ../pidgin/gtkblist.c:3423
 #, c-format
 msgid "Idle %dh %02dm"
 msgstr "待機中 %dh %02dm"
 
-#: ../pidgin/gtkblist.c:3376
+#: ../pidgin/gtkblist.c:3425
 #, c-format
 msgid "Idle %dm"
 msgstr "待機中 %dm"
 
-#: ../pidgin/gtkblist.c:3513
+#: ../pidgin/gtkblist.c:3570
 msgid "/Buddies/New Instant Message..."
 msgstr "/仲間/新しいインスタント・メッセージ..."
 
-#: ../pidgin/gtkblist.c:3514 ../pidgin/gtkblist.c:3547
+#: ../pidgin/gtkblist.c:3571 ../pidgin/gtkblist.c:3604
 msgid "/Buddies/Join a Chat..."
 msgstr "/仲間/チャットに参加..."
 
-#: ../pidgin/gtkblist.c:3515
+#: ../pidgin/gtkblist.c:3572
 msgid "/Buddies/Get User Info..."
 msgstr "/仲間/ユーザ情報の取得..."
 
-#: ../pidgin/gtkblist.c:3516
+#: ../pidgin/gtkblist.c:3573
 msgid "/Buddies/Add Buddy..."
 msgstr "/仲間/仲間の追加..."
 
-#: ../pidgin/gtkblist.c:3517 ../pidgin/gtkblist.c:3550
+#: ../pidgin/gtkblist.c:3574 ../pidgin/gtkblist.c:3607
 msgid "/Buddies/Add Chat..."
 msgstr "/仲間/チャットの追加..."
 
-#: ../pidgin/gtkblist.c:3518
+#: ../pidgin/gtkblist.c:3575
 msgid "/Buddies/Add Group..."
 msgstr "/仲間/グループの追加..."
 
-#: ../pidgin/gtkblist.c:3553
-msgid "/Tools/Buddy Pounces"
-msgstr "/ツール/仲間をつかむ"
-
-#: ../pidgin/gtkblist.c:3556
+#: ../pidgin/gtkblist.c:3610
 msgid "/Tools/Privacy"
 msgstr "/ツール/個人情報"
 
-#: ../pidgin/gtkblist.c:3559
+#: ../pidgin/gtkblist.c:3613
 msgid "/Tools/Room List"
 msgstr "/ツール/チャットルームの一覧"
 
-#: ../pidgin/gtkblist.c:3656 ../pidgin/gtkdocklet.c:156
+#: ../pidgin/gtkblist.c:3710 ../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:3733
+#: ../pidgin/gtkblist.c:3790
 msgid "Manually"
 msgstr "手動"
 
-#: ../pidgin/gtkblist.c:3735
+#: ../pidgin/gtkblist.c:3792
 msgid "Alphabetically"
 msgstr "アルファベット順"
 
-#: ../pidgin/gtkblist.c:3736
+#: ../pidgin/gtkblist.c:3793
 msgid "By status"
 msgstr "状態順"
 
-#: ../pidgin/gtkblist.c:3737
+#: ../pidgin/gtkblist.c:3794
 msgid "By log size"
 msgstr "ログ・サイズ順"
 
-#: ../pidgin/gtkblist.c:3939 ../pidgin/gtkconn.c:178
+#: ../pidgin/gtkblist.c:3996 ../pidgin/gtkconn.c:178
 #, c-format
 msgid "%s disconnected"
 msgstr "%s さんは接続を切りました"
 
-#: ../pidgin/gtkblist.c:3949
+#: ../pidgin/gtkblist.c:4006
 msgid "Re-enable Account"
 msgstr "アカウントを再び有効にする"
 
-#: ../pidgin/gtkblist.c:3970
+#: ../pidgin/gtkblist.c:4030
 #, c-format
 msgid "<span color=\"red\">%s disconnected: %s</span>"
 msgstr "<span color=\"red\">%s さんは接続を切りました: %s</span>"
 
-#: ../pidgin/gtkblist.c:4123
+#: ../pidgin/gtkblist.c:4182
 msgid "<b>Username:</b>"
 msgstr "<b>ユーザ名</b>:"
 
-#: ../pidgin/gtkblist.c:4130
+#: ../pidgin/gtkblist.c:4189
 msgid "<b>Password:</b>"
 msgstr "<b>パスワード</b>:"
 
-#: ../pidgin/gtkblist.c:4141
+#: ../pidgin/gtkblist.c:4200
 msgid "_Login"
 msgstr "ログイン(_L)"
 
-#: ../pidgin/gtkblist.c:4226
+#: ../pidgin/gtkblist.c:4285
 msgid "/Accounts"
 msgstr "/アカウント"
 
 #. Translators: Please maintain the use of -> and <- to refer to menu heirarchy
-#: ../pidgin/gtkblist.c:4240
+#: ../pidgin/gtkblist.c:4299
 #, c-format
 msgid ""
 "<span weight='bold' size='larger'>Welcome to %s!</span>\n"
@@ -11754,23 +12402,23 @@
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: ../pidgin/gtkblist.c:4485
+#: ../pidgin/gtkblist.c:4546
 msgid "/Buddies/Show Offline Buddies"
 msgstr "/仲間/オフラインの仲間を表示する"
 
-#: ../pidgin/gtkblist.c:4488
+#: ../pidgin/gtkblist.c:4549
 msgid "/Buddies/Show Empty Groups"
 msgstr "/仲間/空のグループを表示する"
 
-#: ../pidgin/gtkblist.c:4494
+#: ../pidgin/gtkblist.c:4555
 msgid "/Buddies/Show Buddy Details"
 msgstr "/仲間/仲間の詳細を表示する"
 
-#: ../pidgin/gtkblist.c:4497
+#: ../pidgin/gtkblist.c:4558
 msgid "/Buddies/Show Idle Times"
 msgstr "/仲間/待機中の時間を表示する"
 
-#: ../pidgin/gtkblist.c:5335
+#: ../pidgin/gtkblist.c:5427
 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. "
@@ -11780,62 +12428,65 @@
 "別名またはあだ名を入力できます。別名は可能な限りスクリーン名の代わりに表示さ"
 "れます。\n"
 
-#: ../pidgin/gtkblist.c:5395 ../pidgin/gtkblist.c:5756
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:554
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:307
-msgid "Group:"
-msgstr "グループ:"
-
-#: ../pidgin/gtkblist.c:5654
+#. End of account box
+#: ../pidgin/gtkblist.c:5462
+msgid "_Screen name:"
+msgstr "スクリーン名(_S):"
+
+#: ../pidgin/gtkblist.c:5484 ../pidgin/gtkblist.c:5838
+msgid "A_lias:"
+msgstr "別名(_L):"
+
+#: ../pidgin/gtkblist.c:5750
 msgid "This protocol does not support chat rooms."
 msgstr "このプロトコルではチャット・ルームをサポートしていません。"
 
-#: ../pidgin/gtkblist.c:5670
+#: ../pidgin/gtkblist.c:5766
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
 msgstr "チャットが可能なプロトコルでサイン・インしていません。"
 
-#: ../pidgin/gtkblist.c:5711
+#: ../pidgin/gtkblist.c:5807
 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:5794
+#: ../pidgin/gtkblist.c:5895
 msgid "Please enter the name of the group to be added."
 msgstr "追加するグループの名前を入力して下さい:"
 
-#: ../pidgin/gtkblist.c:6434
+#: ../pidgin/gtkblist.c:6535
 msgid "<PurpleMain>/Accounts/"
 msgstr "<PurpleMain>/アカウント/"
 
-#: ../pidgin/gtkblist.c:6458
+#: ../pidgin/gtkblist.c:6559
 msgid "_Edit Account"
 msgstr "アカウントの編集(_E)"
 
-#: ../pidgin/gtkblist.c:6471 ../pidgin/gtkconv.c:2900
+#: ../pidgin/gtkblist.c:6572 ../pidgin/gtkconv.c:3024
 msgid "No actions available"
 msgstr "利用可能なアクションはありません"
 
-#: ../pidgin/gtkblist.c:6479
+#: ../pidgin/gtkblist.c:6580
 msgid "_Disable"
 msgstr "無効にする(_D)"
 
-#: ../pidgin/gtkblist.c:6491
+#: ../pidgin/gtkblist.c:6592
 msgid "Enable Account"
 msgstr "アカウントを有効にする"
 
-#: ../pidgin/gtkblist.c:6497
+#: ../pidgin/gtkblist.c:6598
 msgid "<PurpleMain>/Accounts/Enable Account"
 msgstr "<PurpleMain>/アカウント/アカウントを有効にする"
 
-#: ../pidgin/gtkblist.c:6546
+#: ../pidgin/gtkblist.c:6647
 msgid "/Tools"
 msgstr "/ツール"
 
-#: ../pidgin/gtkblist.c:6616
+#: ../pidgin/gtkblist.c:6717
 msgid "/Buddies/Sort Buddies"
 msgstr "/仲間/仲間の並び替え"
 
@@ -11851,205 +12502,213 @@
 "\n"
 "エラーを解決しアカウントをもう一度有効にするまで %s は再接続しません。"
 
-#: ../pidgin/gtkconv.c:782 ../pidgin/gtkconv.c:808
+#: ../pidgin/gtkconv.c:793 ../pidgin/gtkconv.c:819
 msgid "That buddy is not on the same protocol as this chat."
 msgstr "その仲間は、このチャットの同一プロトコル上にいません"
 
-#: ../pidgin/gtkconv.c:802
+#: ../pidgin/gtkconv.c:813
 msgid ""
 "You are not currently signed on with an account that can invite that buddy."
 msgstr "現在、その仲間を招待できるアカウントでサイン・インしていません"
 
-#: ../pidgin/gtkconv.c:855
+#: ../pidgin/gtkconv.c:866
 msgid "Invite Buddy Into Chat Room"
 msgstr "仲間をチャット・ルームへ招待"
 
 #. Put our happy label in it.
-#: ../pidgin/gtkconv.c:885
+#: ../pidgin/gtkconv.c:896
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
 msgstr "招待したい相手の名前と、オプションで招待メッセージを入力して下さい:"
 
-#: ../pidgin/gtkconv.c:906
+#: ../pidgin/gtkconv.c:917
 msgid "_Buddy:"
 msgstr "仲間(_B):"
 
-#: ../pidgin/gtkconv.c:926 ../pidgin/gtksavedstatuses.c:1142
-#: ../pidgin/gtksavedstatuses.c:1478
+#: ../pidgin/gtkconv.c:937 ../pidgin/gtksavedstatuses.c:1141
+#: ../pidgin/gtksavedstatuses.c:1477
 msgid "_Message:"
 msgstr "メッセージ(_M):"
 
-#: ../pidgin/gtkconv.c:983 ../pidgin/gtkconv.c:2476 ../pidgin/gtkdebug.c:218
+#: ../pidgin/gtkconv.c:994 ../pidgin/gtkconv.c:2548 ../pidgin/gtkdebug.c:218
 #: ../pidgin/gtkft.c:542
 msgid "Unable to open file."
 msgstr "ファイルを開けません"
 
-#: ../pidgin/gtkconv.c:989
+#: ../pidgin/gtkconv.c:1000
 #, c-format
 msgid "<h1>Conversation with %s</h1>\n"
 msgstr "<h1>%s さんとの会話</h1>\n"
 
-#: ../pidgin/gtkconv.c:1013
+#: ../pidgin/gtkconv.c:1036
 msgid "Save Conversation"
 msgstr "会話の保存"
 
-#: ../pidgin/gtkconv.c:1162 ../pidgin/gtkdebug.c:166 ../pidgin/gtkdebug.c:758
+#: ../pidgin/gtkconv.c:1185 ../pidgin/gtkdebug.c:166 ../pidgin/gtkdebug.c:742
 msgid "Find"
 msgstr "検索"
 
-#: ../pidgin/gtkconv.c:1188 ../pidgin/gtkdebug.c:194
+#: ../pidgin/gtkconv.c:1211 ../pidgin/gtkdebug.c:194
 msgid "_Search for:"
 msgstr "検索する単語(_S):"
 
-#: ../pidgin/gtkconv.c:1340
+#: ../pidgin/gtkconv.c:1394
 msgid "Logging started. Future messages in this conversation will be logged."
 msgstr "ログの記録を開始しました。これ以降の会話がログに記録されます。"
 
-#: ../pidgin/gtkconv.c:1348
+#: ../pidgin/gtkconv.c:1402
 msgid ""
 "Logging stopped. Future messages in this conversation will not be logged."
 msgstr "ログの記録を停止しました。これ以降の会話はログに記録されません。"
 
-#: ../pidgin/gtkconv.c:1596
+#: ../pidgin/gtkconv.c:1650
 msgid "Un-Ignore"
 msgstr "無視しない"
 
-#: ../pidgin/gtkconv.c:1599
+#: ../pidgin/gtkconv.c:1653
 msgid "Ignore"
 msgstr "無視する対象"
 
-#: ../pidgin/gtkconv.c:1619
+#: ../pidgin/gtkconv.c:1673
 msgid "Get Away Message"
 msgstr "離席メッセージの取得"
 
-#: ../pidgin/gtkconv.c:1642
+#: ../pidgin/gtkconv.c:1696
 msgid "Last said"
 msgstr "最後のメッセージ:"
 
-#: ../pidgin/gtkconv.c:2484
+#: ../pidgin/gtkconv.c:2556
 msgid "Unable to save icon file to disk."
 msgstr "アイコン・ファイルを保存できません。"
 
-#: ../pidgin/gtkconv.c:2535
+#: ../pidgin/gtkconv.c:2607
 msgid "Save Icon"
 msgstr "アイコンの保存"
 
-#: ../pidgin/gtkconv.c:2587
+#: ../pidgin/gtkconv.c:2659
 msgid "Animate"
 msgstr "アニメーションを有効にする"
 
-#: ../pidgin/gtkconv.c:2592
+#: ../pidgin/gtkconv.c:2664
 msgid "Hide Icon"
 msgstr "アイコンを隠す"
 
-#: ../pidgin/gtkconv.c:2595
+#: ../pidgin/gtkconv.c:2667
 msgid "Save Icon As..."
 msgstr "アイコンを別名で保存..."
 
-#: ../pidgin/gtkconv.c:2599
+#: ../pidgin/gtkconv.c:2671
 msgid "Set Custom Icon..."
 msgstr "独自アイコンのセット..."
 
-#: ../pidgin/gtkconv.c:2612
+#: ../pidgin/gtkconv.c:2684
 msgid "Remove Custom Icon"
 msgstr "独自アイコンの削除"
 
 #. Conversation menu
-#: ../pidgin/gtkconv.c:2754
+#: ../pidgin/gtkconv.c:2826
 msgid "/_Conversation"
 msgstr "/会話(_C)"
 
-#: ../pidgin/gtkconv.c:2756
+#: ../pidgin/gtkconv.c:2828
 msgid "/Conversation/New Instant _Message..."
 msgstr "/会話/新しいインスタント・メッセージ(_M)..."
 
-#: ../pidgin/gtkconv.c:2761
+#: ../pidgin/gtkconv.c:2833
 msgid "/Conversation/_Find..."
 msgstr "/会話/検索(_F)..."
 
-#: ../pidgin/gtkconv.c:2763
+#: ../pidgin/gtkconv.c:2835
 msgid "/Conversation/View _Log"
 msgstr "/会話/ログの表示(_L)"
 
-#: ../pidgin/gtkconv.c:2764
+#: ../pidgin/gtkconv.c:2836
 msgid "/Conversation/_Save As..."
 msgstr "/会話/別名で保存(_S)..."
 
-#: ../pidgin/gtkconv.c:2766
+#: ../pidgin/gtkconv.c:2838
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/会話/クリア(_R)"
 
-#: ../pidgin/gtkconv.c:2770
+#: ../pidgin/gtkconv.c:2842
 msgid "/Conversation/Se_nd File..."
 msgstr "/会話/ファイルの送信(_N)..."
 
-#: ../pidgin/gtkconv.c:2771
+#: ../pidgin/gtkconv.c:2843
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/会話/つかむ仲間に追加する(_P)..."
 
-#: ../pidgin/gtkconv.c:2773
+#: ../pidgin/gtkconv.c:2845
 msgid "/Conversation/_Get Info"
 msgstr "/会話/情報の取得(_G)"
 
-#: ../pidgin/gtkconv.c:2775
+#: ../pidgin/gtkconv.c:2847
 msgid "/Conversation/In_vite..."
 msgstr "/会話/招待(_V)..."
 
-#: ../pidgin/gtkconv.c:2777
+#: ../pidgin/gtkconv.c:2849
 msgid "/Conversation/M_ore"
 msgstr "/会話/その他(_O)"
 
-#: ../pidgin/gtkconv.c:2781
+#: ../pidgin/gtkconv.c:2853
 msgid "/Conversation/Al_ias..."
 msgstr "/会話/別名(_I)..."
 
-#: ../pidgin/gtkconv.c:2783
+#: ../pidgin/gtkconv.c:2855
 msgid "/Conversation/_Block..."
 msgstr "/会話/拒否(_B)..."
 
-#: ../pidgin/gtkconv.c:2785
+#: ../pidgin/gtkconv.c:2857
 msgid "/Conversation/_Unblock..."
 msgstr "/会話/拒否の解除(_U)..."
 
-#: ../pidgin/gtkconv.c:2787
+#: ../pidgin/gtkconv.c:2859
 msgid "/Conversation/_Add..."
 msgstr "/会話/追加(_A)..."
 
-#: ../pidgin/gtkconv.c:2789
+#: ../pidgin/gtkconv.c:2861
 msgid "/Conversation/_Remove..."
 msgstr "/会話/削除(_R)..."
 
-#: ../pidgin/gtkconv.c:2794
+#: ../pidgin/gtkconv.c:2866
+msgid "/Conversation/Insert Lin_k..."
+msgstr "/会話/リンクの挿入(_K)..."
+
+#: ../pidgin/gtkconv.c:2868
+msgid "/Conversation/Insert Imag_e..."
+msgstr "/会話/画像の挿入(_E)..."
+
+#: ../pidgin/gtkconv.c:2874
 msgid "/Conversation/_Close"
 msgstr "/会話/閉じる(_C)"
 
 #. Options
-#: ../pidgin/gtkconv.c:2798
+#: ../pidgin/gtkconv.c:2878
 msgid "/_Options"
 msgstr "/オプション(_O)"
 
-#: ../pidgin/gtkconv.c:2799
+#: ../pidgin/gtkconv.c:2879
 msgid "/Options/Enable _Logging"
 msgstr "/オプション/ログを記録する(_L)"
 
-#: ../pidgin/gtkconv.c:2800
+#: ../pidgin/gtkconv.c:2880
 msgid "/Options/Enable _Sounds"
 msgstr "/オプション/サウンドを有効にする(_S)"
 
-#: ../pidgin/gtkconv.c:2801
+#: ../pidgin/gtkconv.c:2881
 msgid "/Options/Show Buddy _Icon"
 msgstr "/オプション/仲間アイコンを表示する(_I)"
 
-#: ../pidgin/gtkconv.c:2803
+#: ../pidgin/gtkconv.c:2883
 msgid "/Options/Show Formatting _Toolbars"
 msgstr "/オプション/書式ツールバーを表示する(_T)"
 
-#: ../pidgin/gtkconv.c:2804
+#: ../pidgin/gtkconv.c:2884
 msgid "/Options/Show Ti_mestamps"
 msgstr "/オプション/タイムスタンプを表示する(_M)"
 
-#: ../pidgin/gtkconv.c:2879
+#: ../pidgin/gtkconv.c:2960
 msgid "/Conversation/More"
 msgstr "/会話/その他(_O)"
 
@@ -12058,165 +12717,173 @@
 #. 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:2924 ../pidgin/gtkconv.c:2956
+#: ../pidgin/gtkconv.c:3048 ../pidgin/gtkconv.c:3080
 msgid "/Conversation"
 msgstr "/会話"
 
-#: ../pidgin/gtkconv.c:2964
+#: ../pidgin/gtkconv.c:3088
 msgid "/Conversation/View Log"
 msgstr "/会話/ログの表示"
 
-#: ../pidgin/gtkconv.c:2970
+#: ../pidgin/gtkconv.c:3094
 msgid "/Conversation/Send File..."
 msgstr "/会話/ファイルの送信..."
 
-#: ../pidgin/gtkconv.c:2974
+#: ../pidgin/gtkconv.c:3098
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/会話/つかむ仲間に追加する..."
 
-#: ../pidgin/gtkconv.c:2980
+#: ../pidgin/gtkconv.c:3104
 msgid "/Conversation/Get Info"
 msgstr "/会話/情報の取得"
 
-#: ../pidgin/gtkconv.c:2984
+#: ../pidgin/gtkconv.c:3108
 msgid "/Conversation/Invite..."
 msgstr "/会話/招待..."
 
-#: ../pidgin/gtkconv.c:2990
+#: ../pidgin/gtkconv.c:3114
 msgid "/Conversation/Alias..."
 msgstr "/会話/別名..."
 
-#: ../pidgin/gtkconv.c:2994
+#: ../pidgin/gtkconv.c:3118
 msgid "/Conversation/Block..."
 msgstr "/会話/拒否..."
 
-#: ../pidgin/gtkconv.c:2998
+#: ../pidgin/gtkconv.c:3122
 msgid "/Conversation/Unblock..."
 msgstr "/会話/拒否の解除..."
 
-#: ../pidgin/gtkconv.c:3002
+#: ../pidgin/gtkconv.c:3126
 msgid "/Conversation/Add..."
 msgstr "/会話/追加..."
 
-#: ../pidgin/gtkconv.c:3006
+#: ../pidgin/gtkconv.c:3130
 msgid "/Conversation/Remove..."
 msgstr "/会話/削除..."
 
-#: ../pidgin/gtkconv.c:3010
+#: ../pidgin/gtkconv.c:3136
+msgid "/Conversation/Insert Link..."
+msgstr "/会話/リンクの挿入..."
+
+#: ../pidgin/gtkconv.c:3140
+msgid "/Conversation/Insert Image..."
+msgstr "/会話/画像の挿入..."
+
+#: ../pidgin/gtkconv.c:3146
 msgid "/Options/Enable Logging"
 msgstr "/オプション/ログを記録する"
 
-#: ../pidgin/gtkconv.c:3013
+#: ../pidgin/gtkconv.c:3149
 msgid "/Options/Enable Sounds"
 msgstr "/オプション/サウンドを有効にする"
 
-#: ../pidgin/gtkconv.c:3026
+#: ../pidgin/gtkconv.c:3162
 msgid "/Options/Show Formatting Toolbars"
 msgstr "/オプション/書式ツールバーを表示する"
 
-#: ../pidgin/gtkconv.c:3029
+#: ../pidgin/gtkconv.c:3165
 msgid "/Options/Show Timestamps"
 msgstr "/オプション/タイムスタンプを表示する"
 
-#: ../pidgin/gtkconv.c:3032
+#: ../pidgin/gtkconv.c:3168
 msgid "/Options/Show Buddy Icon"
 msgstr "/オプション/仲間アイコンを表示する"
 
-#: ../pidgin/gtkconv.c:3116 ../pidgin/gtkconv.c:3156
+#: ../pidgin/gtkconv.c:3252 ../pidgin/gtkconv.c:3294
 msgid "User is typing..."
 msgstr "ユーザが何か入力しています..."
 
-#: ../pidgin/gtkconv.c:3159
+#: ../pidgin/gtkconv.c:3297
 msgid "User has typed something and stopped"
 msgstr "ユーザは何か入力して一時停止中です"
 
 #. Build the Send To menu
-#: ../pidgin/gtkconv.c:3341
+#: ../pidgin/gtkconv.c:3479
 msgid "_Send To"
 msgstr "送信先(_S)"
 
-#: ../pidgin/gtkconv.c:4049
+#: ../pidgin/gtkconv.c:4193
 msgid "_Send"
 msgstr "送信する(_S)"
 
 #. Setup the label telling how many people are in the room.
-#: ../pidgin/gtkconv.c:4197
+#: ../pidgin/gtkconv.c:4344
 msgid "0 people in room"
 msgstr "誰もいません"
 
-#: ../pidgin/gtkconv.c:5371 ../pidgin/gtkconv.c:5492
+#: ../pidgin/gtkconv.c:5536 ../pidgin/gtkconv.c:5657
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "チャットルームに %d人にいます"
 msgstr[1] "チャットルームに %d人にいます"
 
-#: ../pidgin/gtkconv.c:6048 ../pidgin/gtkstatusbox.c:657
+#: ../pidgin/gtkconv.c:6231 ../pidgin/gtkstatusbox.c:657
 msgid "Typing"
 msgstr "入力中です"
 
-#: ../pidgin/gtkconv.c:6054
+#: ../pidgin/gtkconv.c:6237
 msgid "Stopped Typing"
 msgstr "入力を止めたようです"
 
-#: ../pidgin/gtkconv.c:6059
+#: ../pidgin/gtkconv.c:6242
 msgid "Nick Said"
 msgstr "Nick Said"
 
-#: ../pidgin/gtkconv.c:6064 ../pidgin/gtkdocklet.c:509
+#: ../pidgin/gtkconv.c:6247 ../pidgin/gtkdocklet.c:492
 msgid "Unread Messages"
 msgstr "メッセージの送信"
 
-#: ../pidgin/gtkconv.c:6069
+#: ../pidgin/gtkconv.c:6252
 msgid "New Event"
 msgstr "新しいイベント"
 
-#: ../pidgin/gtkconv.c:7196
+#: ../pidgin/gtkconv.c:7384
 msgid "Confirm close"
 msgstr "クローズの確認"
 
-#: ../pidgin/gtkconv.c:7228
+#: ../pidgin/gtkconv.c:7416
 msgid "You have unread messages. Are you sure you want to close the window?"
 msgstr ""
 "まだ未読のメッセージがあります。本当にウィンドウを閉じてもよろしいですか?"
 
-#: ../pidgin/gtkconv.c:7763
+#: ../pidgin/gtkconv.c:7938
 msgid "Close other tabs"
 msgstr "他のタブを閉じる"
 
-#: ../pidgin/gtkconv.c:7769
+#: ../pidgin/gtkconv.c:7944
 msgid "Close all tabs"
 msgstr "全てのタブを閉じる"
 
-#: ../pidgin/gtkconv.c:7777
+#: ../pidgin/gtkconv.c:7952
 msgid "Detach this tab"
 msgstr "このタブを取り外す"
 
-#: ../pidgin/gtkconv.c:7783
+#: ../pidgin/gtkconv.c:7958
 msgid "Close this tab"
 msgstr "このタブを閉じる"
 
-#: ../pidgin/gtkconv.c:8086
+#: ../pidgin/gtkconv.c:8344
 msgid "Close conversation"
 msgstr "会話ウィンドウを閉じます"
 
-#: ../pidgin/gtkconv.c:8550
+#: ../pidgin/gtkconv.c:8867
 msgid "Last created window"
 msgstr "最後に生成したウィンドウを再利用する"
 
-#: ../pidgin/gtkconv.c:8552
+#: ../pidgin/gtkconv.c:8869
 msgid "Separate IM and Chat windows"
 msgstr "IM とチャット・ウィンドウを分割する"
 
-#: ../pidgin/gtkconv.c:8554 ../pidgin/gtkprefs.c:1303
+#: ../pidgin/gtkconv.c:8871 ../pidgin/gtkprefs.c:1340
 msgid "New window"
 msgstr "新しいウィンドウで開く"
 
-#: ../pidgin/gtkconv.c:8556
+#: ../pidgin/gtkconv.c:8873
 msgid "By group"
 msgstr "グループ毎に共有する"
 
-#: ../pidgin/gtkconv.c:8558
+#: ../pidgin/gtkconv.c:8875
 msgid "By account"
 msgstr "アカウント毎に共有する"
 
@@ -12224,59 +12891,59 @@
 msgid "Save Debug Log"
 msgstr "デバッグ・ログの保存"
 
-#: ../pidgin/gtkdebug.c:596
+#: ../pidgin/gtkdebug.c:581
 msgid "Invert"
 msgstr "結果を反転する"
 
-#: ../pidgin/gtkdebug.c:599
+#: ../pidgin/gtkdebug.c:584
 msgid "Highlight matches"
 msgstr "一致する単語を強調表示する"
 
-#: ../pidgin/gtkdebug.c:666
+#: ../pidgin/gtkdebug.c:651
 msgid "_Icon Only"
 msgstr "アイコンのみ(_I)"
 
-#: ../pidgin/gtkdebug.c:667
+#: ../pidgin/gtkdebug.c:652
 msgid "_Text Only"
 msgstr "ラベルのみ(_T)"
 
-#: ../pidgin/gtkdebug.c:668
+#: ../pidgin/gtkdebug.c:653
 msgid "_Both Icon & Text"
 msgstr "両方(_B)"
 
-#: ../pidgin/gtkdebug.c:804
+#: ../pidgin/gtkdebug.c:774
 msgid "Filter"
 msgstr "フィルタ"
 
-#: ../pidgin/gtkdebug.c:823
+#: ../pidgin/gtkdebug.c:793
 msgid "Right click for more options."
 msgstr "右クリックで追加オプションを表示します"
 
-#: ../pidgin/gtkdebug.c:853
+#: ../pidgin/gtkdebug.c:823
 msgid "Level "
 msgstr "レベル"
 
-#: ../pidgin/gtkdebug.c:854 ../pidgin/gtkdebug.c:860
+#: ../pidgin/gtkdebug.c:824 ../pidgin/gtkdebug.c:830
 msgid "Select the debug filter level."
 msgstr "デバッグ・フィルタのレベルを選択して下さい:"
 
-#: ../pidgin/gtkdebug.c:862
+#: ../pidgin/gtkdebug.c:832
 msgid "All"
 msgstr "全て"
 
-#: ../pidgin/gtkdebug.c:863
+#: ../pidgin/gtkdebug.c:833
 msgid "Misc"
 msgstr "その他"
 
-#: ../pidgin/gtkdebug.c:865
+#: ../pidgin/gtkdebug.c:835
 msgid "Warning"
 msgstr "警告"
 
-#: ../pidgin/gtkdebug.c:866
+#: ../pidgin/gtkdebug.c:836
 msgid "Error "
 msgstr "エラー"
 
-#: ../pidgin/gtkdebug.c:867
+#: ../pidgin/gtkdebug.c:837
 msgid "Fatal Error"
 msgstr "致命的なエラー"
 
@@ -12290,8 +12957,8 @@
 #: ../pidgin/gtkdialogs.c:79 ../pidgin/gtkdialogs.c:80
 #: ../pidgin/gtkdialogs.c:81 ../pidgin/gtkdialogs.c:82
 #: ../pidgin/gtkdialogs.c:83 ../pidgin/gtkdialogs.c:84
-#: ../pidgin/gtkdialogs.c:87 ../pidgin/gtkdialogs.c:88
-#: ../pidgin/gtkdialogs.c:89
+#: ../pidgin/gtkdialogs.c:85 ../pidgin/gtkdialogs.c:88
+#: ../pidgin/gtkdialogs.c:89 ../pidgin/gtkdialogs.c:90
 msgid "developer"
 msgstr "開発者"
 
@@ -12299,11 +12966,11 @@
 msgid "developer & webmaster"
 msgstr "開発者/ウェブマスタ"
 
-#: ../pidgin/gtkdialogs.c:85
+#: ../pidgin/gtkdialogs.c:86
 msgid "support"
 msgstr "サポート"
 
-#: ../pidgin/gtkdialogs.c:86
+#: ../pidgin/gtkdialogs.c:87
 msgid "support/QA"
 msgstr "サポート/QA"
 
@@ -12325,8 +12992,8 @@
 msgstr "ハッカーと指定したドライバ [lazy bum]"
 
 #: ../pidgin/gtkdialogs.c:115
-msgid "Jabber developer"
-msgstr "Jabber の開発者"
+msgid "XMPP developer"
+msgstr "XMPP の開発者"
 
 #: ../pidgin/gtkdialogs.c:116
 msgid "original author"
@@ -12341,7 +13008,7 @@
 msgstr "アラビア語"
 
 #: ../pidgin/gtkdialogs.c:125 ../pidgin/gtkdialogs.c:126
-#: ../pidgin/gtkdialogs.c:209
+#: ../pidgin/gtkdialogs.c:211
 msgid "Bulgarian"
 msgstr "ブルガリア語"
 
@@ -12354,8 +13021,8 @@
 msgid "Bosnian"
 msgstr "ボスニア語"
 
-#: ../pidgin/gtkdialogs.c:132 ../pidgin/gtkdialogs.c:210
-#: ../pidgin/gtkdialogs.c:211
+#: ../pidgin/gtkdialogs.c:132 ../pidgin/gtkdialogs.c:212
+#: ../pidgin/gtkdialogs.c:213
 msgid "Catalan"
 msgstr "カタラン語"
 
@@ -12363,7 +13030,7 @@
 msgid "Valencian-Catalan"
 msgstr "バレンシア-カタロニア語"
 
-#: ../pidgin/gtkdialogs.c:135 ../pidgin/gtkdialogs.c:212
+#: ../pidgin/gtkdialogs.c:135 ../pidgin/gtkdialogs.c:214
 msgid "Czech"
 msgstr "チェコ語"
 
@@ -12372,7 +13039,7 @@
 msgstr "デンマーク語"
 
 #: ../pidgin/gtkdialogs.c:138 ../pidgin/gtkdialogs.c:139
-#: ../pidgin/gtkdialogs.c:213
+#: ../pidgin/gtkdialogs.c:215
 msgid "German"
 msgstr "ドイツ語"
 
@@ -12401,9 +13068,9 @@
 msgid "Esperanto"
 msgstr "エスペラント語"
 
-#: ../pidgin/gtkdialogs.c:149 ../pidgin/gtkdialogs.c:214
-#: ../pidgin/gtkdialogs.c:215 ../pidgin/gtkdialogs.c:216
-#: ../pidgin/gtkdialogs.c:217
+#: ../pidgin/gtkdialogs.c:149 ../pidgin/gtkdialogs.c:216
+#: ../pidgin/gtkdialogs.c:217 ../pidgin/gtkdialogs.c:218
+#: ../pidgin/gtkdialogs.c:219
 msgid "Spanish"
 msgstr "スペイン語"
 
@@ -12416,14 +13083,14 @@
 msgid "Persian"
 msgstr "ペルシア語"
 
-#: ../pidgin/gtkdialogs.c:155 ../pidgin/gtkdialogs.c:218
-#: ../pidgin/gtkdialogs.c:219
+#: ../pidgin/gtkdialogs.c:155 ../pidgin/gtkdialogs.c:220
+#: ../pidgin/gtkdialogs.c:221
 msgid "Finnish"
 msgstr "フィンランド語"
 
-#: ../pidgin/gtkdialogs.c:156 ../pidgin/gtkdialogs.c:220
-#: ../pidgin/gtkdialogs.c:221 ../pidgin/gtkdialogs.c:222
-#: ../pidgin/gtkdialogs.c:223
+#: ../pidgin/gtkdialogs.c:156 ../pidgin/gtkdialogs.c:222
+#: ../pidgin/gtkdialogs.c:223 ../pidgin/gtkdialogs.c:224
+#: ../pidgin/gtkdialogs.c:225
 msgid "French"
 msgstr "フランス語"
 
@@ -12435,7 +13102,11 @@
 msgid "Gujarati"
 msgstr "グジャラート語"
 
-#: ../pidgin/gtkdialogs.c:160 ../pidgin/gtkdialogs.c:224
+#: ../pidgin/gtkdialogs.c:159
+msgid "Gujarati Language Team"
+msgstr "グジャラート語チーム"
+
+#: ../pidgin/gtkdialogs.c:160 ../pidgin/gtkdialogs.c:226
 msgid "Hebrew"
 msgstr "ヘブライ語"
 
@@ -12451,24 +13122,32 @@
 msgid "Indonesian"
 msgstr "インドネシア語"
 
-#: ../pidgin/gtkdialogs.c:164 ../pidgin/gtkdialogs.c:225
+#: ../pidgin/gtkdialogs.c:164 ../pidgin/gtkdialogs.c:227
 msgid "Italian"
 msgstr "イタリア語"
 
-#: ../pidgin/gtkdialogs.c:165 ../pidgin/gtkdialogs.c:226
-#: ../pidgin/gtkdialogs.c:227 ../pidgin/gtkdialogs.c:228
+#: ../pidgin/gtkdialogs.c:165 ../pidgin/gtkdialogs.c:228
+#: ../pidgin/gtkdialogs.c:229 ../pidgin/gtkdialogs.c:230
 msgid "Japanese"
 msgstr "日本語"
 
-#: ../pidgin/gtkdialogs.c:166 ../pidgin/gtkdialogs.c:229
+#: ../pidgin/gtkdialogs.c:166 ../pidgin/gtkdialogs.c:231
 msgid "Georgian"
 msgstr "グルジア語"
 
+#: ../pidgin/gtkdialogs.c:166
+msgid "Ubuntu Georgian Translators"
+msgstr "Ubuntu グルジア語の翻訳者"
+
 #: ../pidgin/gtkdialogs.c:167
 msgid "Kannada"
 msgstr "カンナダ語"
 
-#: ../pidgin/gtkdialogs.c:168 ../pidgin/gtkdialogs.c:230
+#: ../pidgin/gtkdialogs.c:167
+msgid "Kannada Translation team"
+msgstr "カンナダ語チーム"
+
+#: ../pidgin/gtkdialogs.c:168 ../pidgin/gtkdialogs.c:232
 msgid "Korean"
 msgstr "韓国語"
 
@@ -12477,231 +13156,227 @@
 msgid "Kurdish"
 msgstr "クルド語"
 
-#: ../pidgin/gtkdialogs.c:172 ../pidgin/gtkdialogs.c:231
-#: ../pidgin/gtkdialogs.c:232
+#: ../pidgin/gtkdialogs.c:172 ../pidgin/gtkdialogs.c:233
+#: ../pidgin/gtkdialogs.c:234
 msgid "Lithuanian"
 msgstr "リトアニア語"
 
-#: ../pidgin/gtkdialogs.c:173
+#: ../pidgin/gtkdialogs.c:173 ../pidgin/gtkdialogs.c:174
+#: ../pidgin/gtkdialogs.c:235
 msgid "Macedonian"
 msgstr "マケドニア語"
 
-#: ../pidgin/gtkdialogs.c:174
+#: ../pidgin/gtkdialogs.c:175
 msgid "Bokmål Norwegian"
 msgstr "ボックマル・ノルウェー語"
 
-#: ../pidgin/gtkdialogs.c:175
+#: ../pidgin/gtkdialogs.c:176
 msgid "Nepali"
 msgstr "ネパール語"
 
-#: ../pidgin/gtkdialogs.c:176
+#: ../pidgin/gtkdialogs.c:177
 msgid "Dutch, Flemish"
 msgstr "オランダ/フランダース語"
 
-#: ../pidgin/gtkdialogs.c:177
+#: ../pidgin/gtkdialogs.c:178
 msgid "Norwegian"
 msgstr "ノルウェー語"
 
-#: ../pidgin/gtkdialogs.c:178 ../pidgin/gtkdialogs.c:179
-#: ../pidgin/gtkdialogs.c:180 ../pidgin/gtkdialogs.c:233
+#: ../pidgin/gtkdialogs.c:179 ../pidgin/gtkdialogs.c:180
+#: ../pidgin/gtkdialogs.c:181 ../pidgin/gtkdialogs.c:236
 msgid "Polish"
 msgstr "ポーランド語"
 
-#: ../pidgin/gtkdialogs.c:181
+#: ../pidgin/gtkdialogs.c:182
 msgid "Portuguese"
 msgstr "ポルトガル語"
 
-#: ../pidgin/gtkdialogs.c:182
-msgid "Portuguese-Brazil"
-msgstr "ポルトガル・ブラジル語"
-
 #: ../pidgin/gtkdialogs.c:183
+msgid "Portuguese-Brazil"
+msgstr "ポルトガル・ブラジル語"
+
+#: ../pidgin/gtkdialogs.c:184
 msgid "Pashto"
 msgstr "パシュト語"
 
-#: ../pidgin/gtkdialogs.c:184
+#: ../pidgin/gtkdialogs.c:185
 msgid "Romanian"
 msgstr "ルーマニア語"
 
-#: ../pidgin/gtkdialogs.c:185 ../pidgin/gtkdialogs.c:234
-#: ../pidgin/gtkdialogs.c:235
+#: ../pidgin/gtkdialogs.c:186 ../pidgin/gtkdialogs.c:237
+#: ../pidgin/gtkdialogs.c:238
 msgid "Russian"
 msgstr "ロシア語"
 
-#: ../pidgin/gtkdialogs.c:186 ../pidgin/gtkdialogs.c:187
-#: ../pidgin/gtkdialogs.c:236 ../pidgin/gtkdialogs.c:237
-#: ../pidgin/gtkdialogs.c:238
+#: ../pidgin/gtkdialogs.c:187 ../pidgin/gtkdialogs.c:188
+#: ../pidgin/gtkdialogs.c:239 ../pidgin/gtkdialogs.c:240
+#: ../pidgin/gtkdialogs.c:241
 msgid "Slovak"
 msgstr "スロバキア語"
 
-#: ../pidgin/gtkdialogs.c:188 ../pidgin/gtkdialogs.c:239
+#: ../pidgin/gtkdialogs.c:189 ../pidgin/gtkdialogs.c:242
 msgid "Slovenian"
 msgstr "スロベニア語"
 
-#: ../pidgin/gtkdialogs.c:189
+#: ../pidgin/gtkdialogs.c:190
 msgid "Albanian"
 msgstr "アルバニア語"
 
-#: ../pidgin/gtkdialogs.c:190 ../pidgin/gtkdialogs.c:191
+#: ../pidgin/gtkdialogs.c:191 ../pidgin/gtkdialogs.c:192
 msgid "Serbian"
 msgstr "セルビア語"
 
-#: ../pidgin/gtkdialogs.c:192 ../pidgin/gtkdialogs.c:240
+#: ../pidgin/gtkdialogs.c:193 ../pidgin/gtkdialogs.c:243
 msgid "Swedish"
 msgstr "スウェーデン語"
 
-#: ../pidgin/gtkdialogs.c:193
+#: ../pidgin/gtkdialogs.c:194
 msgid "Tamil"
 msgstr "タミル語"
 
-#: ../pidgin/gtkdialogs.c:194
+#: ../pidgin/gtkdialogs.c:195
 msgid "Telugu"
 msgstr "テルグ語"
 
-#: ../pidgin/gtkdialogs.c:195
-msgid "Thai"
-msgstr "タイ語"
-
 #: ../pidgin/gtkdialogs.c:196
+msgid "Thai"
+msgstr "タイ語"
+
+#: ../pidgin/gtkdialogs.c:197 ../pidgin/gtkdialogs.c:244
 msgid "Turkish"
 msgstr "トルコ語"
 
-#: ../pidgin/gtkdialogs.c:197
+#: ../pidgin/gtkdialogs.c:198
 msgid "Vietnamese"
 msgstr "ベトナム語"
 
-#: ../pidgin/gtkdialogs.c:197
+#: ../pidgin/gtkdialogs.c:198
 msgid "T.M.Thanh and the Gnome-Vi Team"
 msgstr "T.M.Thanh と Gnome-Vi チーム"
 
-#: ../pidgin/gtkdialogs.c:198 ../pidgin/gtkdialogs.c:241
+#: ../pidgin/gtkdialogs.c:199 ../pidgin/gtkdialogs.c:245
 msgid "Simplified Chinese"
 msgstr "簡体字中国語"
 
-#: ../pidgin/gtkdialogs.c:199 ../pidgin/gtkdialogs.c:200
+#: ../pidgin/gtkdialogs.c:200 ../pidgin/gtkdialogs.c:201
+#: ../pidgin/gtkdialogs.c:202
 msgid "Hong Kong Chinese"
 msgstr "中国語 (香港)"
 
-#: ../pidgin/gtkdialogs.c:201 ../pidgin/gtkdialogs.c:202
-#: ../pidgin/gtkdialogs.c:242
+#: ../pidgin/gtkdialogs.c:203 ../pidgin/gtkdialogs.c:204
+#: ../pidgin/gtkdialogs.c:246
 msgid "Traditional Chinese"
 msgstr "繁体字中国語"
 
-#: ../pidgin/gtkdialogs.c:208
+#: ../pidgin/gtkdialogs.c:210
 msgid "Amharic"
 msgstr "アムハラ語"
 
-#: ../pidgin/gtkdialogs.c:327
+#: ../pidgin/gtkdialogs.c:331
 #, c-format
 msgid "About %s"
 msgstr "%s について"
 
-#: ../pidgin/gtkdialogs.c:363
-#, c-format
-msgid ""
-"%s is a modular messaging client capable of using AIM, MSN, Yahoo!, Jabber, "
-"ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, Bonjour, "
-"Zephyr, Gadu-Gadu, and QQ all at once.  It is written using GTK+.<BR><BR>You "
-"may modify and redistribute the program under the terms of the GPL (version "
-"2 or later).  A copy of the GPL is contained in the 'COPYING' file "
-"distributed with %s.  %s is copyrighted by its contributors.  See the "
-"'COPYRIGHT' file for the complete list of contributors.  We provide no "
-"warranty for this program.<BR><BR>"
-msgstr ""
-"%s は AIM、MSN、Yahoo!、Jabber、ICQ、IRC、SILC、SIP/SIMPLE、Novell "
-"GroupWise、Lotus Sametime、Bonjour、Zephyr、Gadu-Gadu、QQ といったプロトコル"
-"を全て同時に利用できる、GTK+ ツールキットを採用したモジュール型のメッセージ・"
-"クライアントです。<BR><BR>GPL ライセンス (第二版、あるいはそれ以降の版) が定"
-"める条項の下で再頒布または変更することができます。GPL の複写が本 %s パッケー"
-"ジの中に 'COPYING' というファイル名として含まれています。%s のコピーライトは"
-"その貢献者に帰属します。この貢献者の詳細な一覧については 'COPYRIGHT' を御覧下"
-"さい。本プログラムは完全無保証です。<BR><BR>"
-
-#: ../pidgin/gtkdialogs.c:378
-msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin-win32 on irc.freenode.net<BR><BR>"
-msgstr ""
-"<FONT SIZE=\"4\">IRC:</FONT> irc.freenode.net の #pidgin-win32 チャンネル"
-"<BR><BR>"
-
-#: ../pidgin/gtkdialogs.c:381
+#: ../pidgin/gtkdialogs.c:369
+#, c-format
+msgid ""
+"%s is a graphical modular messaging client based on libpurple which is "
+"capable of connecting to AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, "
+"Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, Gadu-Gadu, and QQ all at "
+"once.  It is written using GTK+.<BR><BR>You may modify and redistribute the "
+"program under the terms of the GPL (version 2 or later).  A copy of the GPL "
+"is contained in the 'COPYING' file distributed with %s.  %s is copyrighted "
+"by its contributors.  See the 'COPYRIGHT' file for the complete list of "
+"contributors.  We provide no warranty for this program.<BR><BR>"
+msgstr ""
+"%s は AIM、MSN、Yahoo!、XMPP、ICQ、IRC、SILC、SIP/SIMPLE、Novell GroupWise、"
+"Lotus Sametime、Bonjour、Zephyr、Gadu-Gadu、QQ といったプロトコルを全て同時に"
+"利用できる、GTK+ ツールキットを採用したモジュール型のメッセージ・クライアント"
+"です。<BR><BR>GPL ライセンス (第二版、あるいはそれ以降の版) が定める条項の下"
+"で再頒布または変更することができます。GPL の複写が本 %s パッケージの中に "
+"'COPYING' というファイル名として含まれています。%s のコピーライトはその貢献者"
+"に帰属します。この貢献者の詳細な一覧については 'COPYRIGHT' を御覧下さい。本プ"
+"ログラムは完全無保証です。<BR><BR>"
+
+#: ../pidgin/gtkdialogs.c:384
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin on irc.freenode.net<BR><BR>"
 msgstr ""
 "<FONT SIZE=\"4\">IRC:</FONT> irc.freenode.net の #pidgin チャンネル<BR><BR>"
 
-#: ../pidgin/gtkdialogs.c:387
+#: ../pidgin/gtkdialogs.c:389
 msgid "Current Developers"
 msgstr "現在の開発者"
 
-#: ../pidgin/gtkdialogs.c:402
+#: ../pidgin/gtkdialogs.c:404
 msgid "Crazy Patch Writers"
 msgstr "Crazy なパッチの作者"
 
-#: ../pidgin/gtkdialogs.c:417
+#: ../pidgin/gtkdialogs.c:419
 msgid "Retired Developers"
 msgstr "開発者 (旧バージョン)"
 
-#: ../pidgin/gtkdialogs.c:432
+#: ../pidgin/gtkdialogs.c:434
 msgid "Artists"
 msgstr "アーティスト"
 
-#: ../pidgin/gtkdialogs.c:447
+#: ../pidgin/gtkdialogs.c:449
 msgid "Current Translators"
 msgstr "翻訳者 (最新バージョン)"
 
-#: ../pidgin/gtkdialogs.c:467
+#: ../pidgin/gtkdialogs.c:469
 msgid "Past Translators"
 msgstr "翻訳者 (旧バージョン)"
 
-#: ../pidgin/gtkdialogs.c:485
+#: ../pidgin/gtkdialogs.c:487
 msgid "Debugging Information"
 msgstr "デバッグする際の参考情報"
 
-#: ../pidgin/gtkdialogs.c:854
+#: ../pidgin/gtkdialogs.c:865
 msgid "Get User Info"
 msgstr "ユーザ情報の取得"
 
-#: ../pidgin/gtkdialogs.c:856
+#: ../pidgin/gtkdialogs.c:867
 msgid ""
 "Please enter the screen name or alias of the person whose info you would "
 "like to view."
 msgstr "情報を表示する相手のスクリーン名または別名を入力して下さい:"
 
-#: ../pidgin/gtkdialogs.c:946
+#: ../pidgin/gtkdialogs.c:957
 msgid "View User Log"
 msgstr "ユーザ・ログの表示"
 
-#: ../pidgin/gtkdialogs.c:948
+#: ../pidgin/gtkdialogs.c:959
 msgid ""
 "Please enter the screen name or alias of the person whose log you would like "
 "to view."
 msgstr "ログを表示する相手のスクリーン名または別名を入力して下さい:"
 
-#: ../pidgin/gtkdialogs.c:968
+#: ../pidgin/gtkdialogs.c:979
 msgid "Alias Contact"
 msgstr "コンタクトの別名"
 
-#: ../pidgin/gtkdialogs.c:969
+#: ../pidgin/gtkdialogs.c:980
 msgid "Enter an alias for this contact."
 msgstr "このコンタクトの別名を入力して下さい:"
 
-#: ../pidgin/gtkdialogs.c:991
+#: ../pidgin/gtkdialogs.c:1002
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "%s の別名を入力して下さい:"
 
-#: ../pidgin/gtkdialogs.c:993
+#: ../pidgin/gtkdialogs.c:1004
 msgid "Alias Buddy"
 msgstr "仲間の別名"
 
-#: ../pidgin/gtkdialogs.c:1014
+#: ../pidgin/gtkdialogs.c:1025
 msgid "Alias Chat"
 msgstr "チャットの別名"
 
-#: ../pidgin/gtkdialogs.c:1015
+#: ../pidgin/gtkdialogs.c:1026
 msgid "Enter an alias for this chat."
 msgstr "このチャットの別名を入力して下さい:"
 
-#: ../pidgin/gtkdialogs.c:1054
+#: ../pidgin/gtkdialogs.c:1065
 #, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddy from "
@@ -12716,15 +13391,15 @@
 "仲間リストから %s さんを含む %d個の仲間を削除しようとしています。続行してもよ"
 "ろしいですか?"
 
-#: ../pidgin/gtkdialogs.c:1062
+#: ../pidgin/gtkdialogs.c:1073
 msgid "Remove Contact"
 msgstr "コンタクトの削除"
 
-#: ../pidgin/gtkdialogs.c:1065
+#: ../pidgin/gtkdialogs.c:1076
 msgid "_Remove Contact"
 msgstr "削除する(_R)"
 
-#: ../pidgin/gtkdialogs.c:1096
+#: ../pidgin/gtkdialogs.c:1107
 #, c-format
 msgid ""
 "You are about to merge the group called %s into the group called %s. Do you "
@@ -12733,15 +13408,15 @@
 "%s というグループと %s というグループを一つにまとめようとしています。続行して"
 "もよろしいですか?"
 
-#: ../pidgin/gtkdialogs.c:1103
+#: ../pidgin/gtkdialogs.c:1114
 msgid "Merge Groups"
 msgstr "グループの統合"
 
-#: ../pidgin/gtkdialogs.c:1106
+#: ../pidgin/gtkdialogs.c:1117
 msgid "_Merge Groups"
 msgstr "グループを統合する(_M)"
 
-#: ../pidgin/gtkdialogs.c:1156
+#: ../pidgin/gtkdialogs.c:1167
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
@@ -12750,29 +13425,29 @@
 "仲間リストからグループ %s とそのメンバを削除しようとしています。続行してもよ"
 "ろしいですか?"
 
-#: ../pidgin/gtkdialogs.c:1159
+#: ../pidgin/gtkdialogs.c:1170
 msgid "Remove Group"
 msgstr "グループの削除"
 
-#: ../pidgin/gtkdialogs.c:1162
+#: ../pidgin/gtkdialogs.c:1173
 msgid "_Remove Group"
 msgstr "削除する(_R)"
 
-#: ../pidgin/gtkdialogs.c:1195
+#: ../pidgin/gtkdialogs.c:1206
 #, c-format
 msgid ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr "仲間リストから %s を削除しようとしています。続行してもよろしいですか?"
 
-#: ../pidgin/gtkdialogs.c:1198
+#: ../pidgin/gtkdialogs.c:1209
 msgid "Remove Buddy"
 msgstr "仲間の削除"
 
-#: ../pidgin/gtkdialogs.c:1201
+#: ../pidgin/gtkdialogs.c:1212
 msgid "_Remove Buddy"
 msgstr "削除する(_R)"
 
-#: ../pidgin/gtkdialogs.c:1222
+#: ../pidgin/gtkdialogs.c:1233
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
@@ -12781,42 +13456,39 @@
 "仲間リストからチャット %s を削除しようとしています。続行してもよろしいです"
 "か?"
 
-#: ../pidgin/gtkdialogs.c:1225
+#: ../pidgin/gtkdialogs.c:1236
 msgid "Remove Chat"
 msgstr "チャットの削除"
 
-#: ../pidgin/gtkdialogs.c:1228
+#: ../pidgin/gtkdialogs.c:1239
 msgid "_Remove Chat"
 msgstr "削除する(_R)"
 
-#: ../pidgin/gtkdocklet.c:153
+#: ../pidgin/gtkdocklet.c:150
 msgid "Right-click for more unread messages...\n"
 msgstr "さらに未読のメッセージを表示する場合は右クリックして下さい...\n"
 
-#: ../pidgin/gtkdocklet.c:452
+#: ../pidgin/gtkdocklet.c:435
 msgid "Change Status"
 msgstr "状態の変更"
 
-#: ../pidgin/gtkdocklet.c:504
+#: ../pidgin/gtkdocklet.c:487
 msgid "Show Buddy List"
 msgstr "仲間リストの表示"
 
-#: ../pidgin/gtkdocklet.c:530
+#: ../pidgin/gtkdocklet.c:513
 msgid "New Message..."
 msgstr "新しいメッセージ..."
 
-#: ../pidgin/gtkdocklet.c:545
+#: ../pidgin/gtkdocklet.c:528
 msgid "Mute Sounds"
 msgstr "ミュート"
 
-#: ../pidgin/gtkdocklet.c:552
+#: ../pidgin/gtkdocklet.c:535
 msgid "Blink on new message"
 msgstr "メッセージが届いたら点滅させる"
 
-#. TODO: need a submenu to change status, this needs to "link"
-#. * to the status in the buddy list gtkstatusbox
-#.
-#: ../pidgin/gtkdocklet.c:563
+#: ../pidgin/gtkdocklet.c:542
 msgid "Quit"
 msgstr "終了"
 
@@ -12899,7 +13571,7 @@
 msgstr "ファイル転送の詳細(_D)"
 
 #. Pause button
-#: ../pidgin/gtkft.c:835 ../pidgin/pidginstock.c:91
+#: ../pidgin/gtkft.c:835 ../pidgin/pidginstock.c:89
 msgid "_Pause"
 msgstr "一時停止(_P)"
 
@@ -12908,43 +13580,43 @@
 msgid "_Resume"
 msgstr "復帰(_R)"
 
-#: ../pidgin/gtkimhtml.c:792
+#: ../pidgin/gtkimhtml.c:796
 msgid "Paste as Plain _Text"
 msgstr "文字列として貼り付け(_T)"
 
-#: ../pidgin/gtkimhtml.c:809
+#: ../pidgin/gtkimhtml.c:813
 msgid "_Reset formatting"
 msgstr "書式のリセット(_R)"
 
-#: ../pidgin/gtkimhtml.c:1295
+#: ../pidgin/gtkimhtml.c:1309
 msgid "Hyperlink color"
 msgstr "ハイパーリンクの色"
 
-#: ../pidgin/gtkimhtml.c:1296
+#: ../pidgin/gtkimhtml.c:1310
 msgid "Color to draw hyperlinks."
 msgstr "ハイパーリンクを描画する色です"
 
-#: ../pidgin/gtkimhtml.c:1299
+#: ../pidgin/gtkimhtml.c:1313
 msgid "Hyperlink prelight color"
 msgstr "ハイパーリンク (prelight) の色"
 
-#: ../pidgin/gtkimhtml.c:1300
+#: ../pidgin/gtkimhtml.c:1314
 msgid "Color to draw hyperlinks when mouse is over them."
 msgstr "ハイパーリンクの上にマウスをのせた時の色です"
 
-#: ../pidgin/gtkimhtml.c:1516
+#: ../pidgin/gtkimhtml.c:1530
 msgid "_Copy E-Mail Address"
 msgstr "E-メール・アドレスのコピー(_C)"
 
-#: ../pidgin/gtkimhtml.c:1528
+#: ../pidgin/gtkimhtml.c:1542
 msgid "_Open Link in Browser"
 msgstr "リンク先をブラウザで開く(_O)"
 
-#: ../pidgin/gtkimhtml.c:1538
+#: ../pidgin/gtkimhtml.c:1552
 msgid "_Copy Link Location"
 msgstr "リンク先のコピー(_C)"
 
-#: ../pidgin/gtkimhtml.c:3202
+#: ../pidgin/gtkimhtml.c:3227
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -12954,7 +13626,7 @@
 "\n"
 "デフォルトの PNG 画像として扱います。"
 
-#: ../pidgin/gtkimhtml.c:3205
+#: ../pidgin/gtkimhtml.c:3230
 msgid ""
 "Unrecognized file type\n"
 "\n"
@@ -12964,7 +13636,7 @@
 "\n"
 "デフォルトの PNG 画像として扱います。"
 
-#: ../pidgin/gtkimhtml.c:3218
+#: ../pidgin/gtkimhtml.c:3259
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -12975,7 +13647,7 @@
 "\n"
 "%s"
 
-#: ../pidgin/gtkimhtml.c:3221
+#: ../pidgin/gtkimhtml.c:3262
 #, c-format
 msgid ""
 "Error saving image\n"
@@ -12986,116 +13658,116 @@
 "\n"
 "%s"
 
-#: ../pidgin/gtkimhtml.c:3301 ../pidgin/gtkimhtml.c:3313
+#: ../pidgin/gtkimhtml.c:3340 ../pidgin/gtkimhtml.c:3352
 msgid "Save Image"
 msgstr "画像の保存"
 
-#: ../pidgin/gtkimhtml.c:3341
+#: ../pidgin/gtkimhtml.c:3380
 msgid "_Save Image..."
 msgstr "画像の保存(_S)..."
 
-#: ../pidgin/gtkimhtmltoolbar.c:147
+#: ../pidgin/gtkimhtmltoolbar.c:151
 msgid "Select Font"
 msgstr "フォントの選択"
 
-#: ../pidgin/gtkimhtmltoolbar.c:226
+#: ../pidgin/gtkimhtmltoolbar.c:230
 msgid "Select Text Color"
 msgstr "メッセージの色の選択"
 
-#: ../pidgin/gtkimhtmltoolbar.c:305
+#: ../pidgin/gtkimhtmltoolbar.c:309
 msgid "Select Background Color"
 msgstr "背景色の選択"
 
-#: ../pidgin/gtkimhtmltoolbar.c:394
+#: ../pidgin/gtkimhtmltoolbar.c:398
 msgid "_URL"
 msgstr "URL(_U)"
 
-#: ../pidgin/gtkimhtmltoolbar.c:402
+#: ../pidgin/gtkimhtmltoolbar.c:406
 msgid "_Description"
 msgstr "説明(_D)"
 
-#: ../pidgin/gtkimhtmltoolbar.c:405
+#: ../pidgin/gtkimhtmltoolbar.c:409
 msgid ""
 "Please enter the URL and description of the link that you want to insert. "
 "The description is optional."
 msgstr ""
 "挿入するリンクの URL とその説明を入力して下さい (説明はオプションです):"
 
-#: ../pidgin/gtkimhtmltoolbar.c:409
+#: ../pidgin/gtkimhtmltoolbar.c:413
 msgid "Please enter the URL of the link that you want to insert."
 msgstr "挿入するリンクの URL を入力して下さい:"
 
-#: ../pidgin/gtkimhtmltoolbar.c:414
+#: ../pidgin/gtkimhtmltoolbar.c:418
 msgid "Insert Link"
 msgstr "リンクの挿入"
 
-#: ../pidgin/gtkimhtmltoolbar.c:418
+#: ../pidgin/gtkimhtmltoolbar.c:422
 msgid "_Insert"
 msgstr "挿入(_I)"
 
-#: ../pidgin/gtkimhtmltoolbar.c:487
+#: ../pidgin/gtkimhtmltoolbar.c:491
 #, c-format
 msgid "Failed to store image: %s\n"
 msgstr "画像の格納に失敗しました: %s\n"
 
-#: ../pidgin/gtkimhtmltoolbar.c:513 ../pidgin/gtkimhtmltoolbar.c:523
+#: ../pidgin/gtkimhtmltoolbar.c:517 ../pidgin/gtkimhtmltoolbar.c:527
 msgid "Insert Image"
 msgstr "画像の挿入"
 
-#: ../pidgin/gtkimhtmltoolbar.c:721
+#: ../pidgin/gtkimhtmltoolbar.c:725
 msgid "This theme has no available smileys."
 msgstr "このテーマには利用可能なスマイリーがありません。"
 
 #. show everything
-#: ../pidgin/gtkimhtmltoolbar.c:735
+#: ../pidgin/gtkimhtmltoolbar.c:739
 msgid "Smile!"
 msgstr "スマイリー (顔文字) !"
 
-#: ../pidgin/gtkimhtmltoolbar.c:922 ../pidgin/plugins/convcolors.c:287
+#: ../pidgin/gtkimhtmltoolbar.c:926 ../pidgin/plugins/convcolors.c:287
 msgid "Bold"
 msgstr "太字にする"
 
-#: ../pidgin/gtkimhtmltoolbar.c:933 ../pidgin/plugins/convcolors.c:294
+#: ../pidgin/gtkimhtmltoolbar.c:937 ../pidgin/plugins/convcolors.c:294
 msgid "Italic"
 msgstr "イタリックにする"
 
-#: ../pidgin/gtkimhtmltoolbar.c:944 ../pidgin/plugins/convcolors.c:301
+#: ../pidgin/gtkimhtmltoolbar.c:948 ../pidgin/plugins/convcolors.c:301
 msgid "Underline"
 msgstr "下線を付ける"
 
-#: ../pidgin/gtkimhtmltoolbar.c:960
+#: ../pidgin/gtkimhtmltoolbar.c:964
 msgid "Larger font size"
 msgstr "フォントのサイズを大きくします"
 
-#: ../pidgin/gtkimhtmltoolbar.c:972
+#: ../pidgin/gtkimhtmltoolbar.c:976
 msgid "Smaller font size"
 msgstr "フォントのサイズを小さくします"
 
-#: ../pidgin/gtkimhtmltoolbar.c:989
+#: ../pidgin/gtkimhtmltoolbar.c:993
 msgid "Font face"
 msgstr "フォントの種類を変更します"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1001
+#: ../pidgin/gtkimhtmltoolbar.c:1005
 msgid "Foreground font color"
 msgstr "メッセージの色を変更します"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1013
+#: ../pidgin/gtkimhtmltoolbar.c:1017
 msgid "Background color"
 msgstr "背景色を変更します"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1029
+#: ../pidgin/gtkimhtmltoolbar.c:1033
 msgid "Reset formatting"
 msgstr "書式をリセットします"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1044
+#: ../pidgin/gtkimhtmltoolbar.c:1048
 msgid "Insert link"
 msgstr "リンクを挿入します"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1054
+#: ../pidgin/gtkimhtmltoolbar.c:1058
 msgid "Insert image"
 msgstr "画像を挿入します"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1065
+#: ../pidgin/gtkimhtmltoolbar.c:1069
 msgid "Insert smiley"
 msgstr "スマイリー (顔文字) を挿入します"
 
@@ -13185,12 +13857,12 @@
 msgid "System Log"
 msgstr "システム・ログ"
 
-#: ../pidgin/gtkmain.c:372
+#: ../pidgin/gtkmain.c:368
 #, c-format
 msgid "%s %s. Try `%s -h' for more information.\n"
 msgstr "%s %s (詳しい情報は `%s -h' と入力して下さい)\n"
 
-#: ../pidgin/gtkmain.c:374
+#: ../pidgin/gtkmain.c:370
 #, c-format
 msgid ""
 "%s %s\n"
@@ -13217,26 +13889,26 @@
 "可)\n"
 "  -v, --version       現在使用しているバージョンを表示して終了する\n"
 
-#: ../pidgin/gtkmain.c:497
+#: ../pidgin/gtkmain.c:490
 #, c-format
 msgid ""
 "%s has segfaulted and attempted to dump a core file.\n"
 "This is a bug in the software and has happened through\n"
 "no fault of your own.\n"
 "\n"
-"If you can reproduce the crash, please notify the Pidgin\n"
-"developers by reporting a bug at\n"
-"%sbug.php\n"
+"If you can reproduce the crash, please notify the developers\n"
+"by reporting a bug at:\n"
+"%snewticket/\n"
 "\n"
 "Please make sure to specify what you were doing at the time\n"
 "and post the backtrace from the core file.  If you do not know\n"
 "how to get the backtrace, please read the instructions at\n"
-"%sgdb.php\n"
+"%swiki/GetABacktrace\n"
 "\n"
 "If you need further assistance, please IM either SeanEgn or \n"
 "LSchiere (via AIM).  Contact information for Sean and Luke \n"
 "on other protocols is at\n"
-"%scontactinfo.php\n"
+"%swiki/DeveloperPages\n"
 msgstr ""
 "セグメンテーション・フォルトが発生したため、%s が\n"
 "core ファイルの出力を試みました。これはソフトウェアの\n"
@@ -13244,62 +13916,62 @@
 "\n"
 "この問題を再現できるのであれば、次のサイトから\n"
 "Pidgin の開発者にバグとして報告して下さい:\n"
-"%sbug.php\n"
+"%snewticket/\n"
 "\n"
 "問題を再現するための手順と core ファイルからの\n"
 "バックトレース情報も添付して下さい。\n"
 "バックトレース情報の取得方法がわからない場合は\n"
 "次のサイトにある説明を参照してみて下さい:\n"
-"%sgdb.php\n"
+"%swiki/GetABacktrace\n"
 "\n"
 "さらにヘルプが必要なら、IM で\n"
 "SeanEgn 氏または LSchiere 氏 (共に AIM 経由) に\n"
 "声をかけてみて下さい。その他のプロトコル経由については\n"
 "次のサイトを参照してみて下さい:\n"
-"%scontactinfo.php\n"
-
-#: ../pidgin/gtknotify.c:337
+"%swiki/DeveloperPages\n"
+
+#: ../pidgin/gtknotify.c:343
 msgid "Open All Messages"
 msgstr "全てのメッセージを開く"
 
-#: ../pidgin/gtknotify.c:389
+#: ../pidgin/gtknotify.c:395
 msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">新着メールがあります!</span>"
 
-#: ../pidgin/gtknotify.c:483
+#: ../pidgin/gtknotify.c:489
 msgid "Sender"
 msgstr "送信者"
 
-#: ../pidgin/gtknotify.c:509
+#: ../pidgin/gtknotify.c:515
 #, 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:520
+#: ../pidgin/gtknotify.c:526
 #, c-format
 msgid "<b>You have %d new e-mail.</b>"
 msgid_plural "<b>You have %d new e-mails.</b>"
 msgstr[0] "<b>%d通の新しいメールがあります</b>"
 msgstr[1] "<b>%d通の新しいメールがあります</b>"
 
-#: ../pidgin/gtknotify.c:909
+#: ../pidgin/gtknotify.c:969
 #, c-format
 msgid "The browser command \"%s\" is invalid."
 msgstr "ブラウザを起動するコマンド \"%s\" が正しくありません。"
 
-#: ../pidgin/gtknotify.c:911 ../pidgin/gtknotify.c:923
-#: ../pidgin/gtknotify.c:936 ../pidgin/gtknotify.c:1064
+#: ../pidgin/gtknotify.c:971 ../pidgin/gtknotify.c:983
+#: ../pidgin/gtknotify.c:996 ../pidgin/gtknotify.c:1124
 msgid "Unable to open URL"
 msgstr "URL を開けません"
 
-#: ../pidgin/gtknotify.c:921 ../pidgin/gtknotify.c:934
+#: ../pidgin/gtknotify.c:981 ../pidgin/gtknotify.c:994
 #, c-format
 msgid "Error launching \"%s\": %s"
 msgstr "\"%s\" を起動する際にエラー: %s"
 
-#: ../pidgin/gtknotify.c:1065
+#: ../pidgin/gtknotify.c:1125
 msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr ""
@@ -13434,7 +14106,7 @@
 msgstr "プレビュー(_V)"
 
 #: ../pidgin/gtkpounce.c:786
-msgid "P_ounce only when my status is not available"
+msgid "P_ounce only when my status is not Available"
 msgstr "自分の状態を指定できない時にだけつかむ(_O)"
 
 #: ../pidgin/gtkpounce.c:791
@@ -13469,12 +14141,12 @@
 msgid "_Show system tray icon:"
 msgstr "いつアイコンを表示するか...(_S):"
 
-#: ../pidgin/gtkprefs.c:819 ../pidgin/gtkprefs.c:831 ../pidgin/gtkprefs.c:1648
+#: ../pidgin/gtkprefs.c:819 ../pidgin/gtkprefs.c:831 ../pidgin/gtkprefs.c:1686
 #: ../pidgin/plugins/timestamp_format.c:42
 #: ../pidgin/plugins/timestamp_format.c:51
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:338
 msgid "Always"
-msgstr "離席中の時"
+msgstr "常に"
 
 #: ../pidgin/gtkprefs.c:821
 msgid "On unread messages"
@@ -13488,7 +14160,7 @@
 msgid "_Hide new IM conversations:"
 msgstr "いつ新しい会話ウィンドウを隠すか...(_H):"
 
-#: ../pidgin/gtkprefs.c:830 ../pidgin/gtkprefs.c:1828
+#: ../pidgin/gtkprefs.c:830 ../pidgin/gtkprefs.c:1867
 msgid "When away"
 msgstr "離席する時だけ"
 
@@ -13537,39 +14209,55 @@
 msgid "N_ew conversations:"
 msgstr "新しい会話ウィンドウ(_E):"
 
-#: ../pidgin/gtkprefs.c:900
+#: ../pidgin/gtkprefs.c:917
 msgid "Show _formatting on incoming messages"
 msgstr "受信したメッセージの書式を有効にして表示する(_F)"
 
-#: ../pidgin/gtkprefs.c:903
+#: ../pidgin/gtkprefs.c:920
 msgid "Show buddy _icons"
 msgstr "仲間アイコンを表示する(_I)"
 
-#: ../pidgin/gtkprefs.c:905
+#: ../pidgin/gtkprefs.c:922
 msgid "Enable buddy ic_on animation"
 msgstr "仲間アイコンのアニメーションを有効にする(_O)"
 
-#: ../pidgin/gtkprefs.c:912
+#: ../pidgin/gtkprefs.c:929
 msgid "_Notify buddies that you are typing to them"
 msgstr "メッセージを入力中であることを仲間に通知する(_N)"
 
-#: ../pidgin/gtkprefs.c:915
+#: ../pidgin/gtkprefs.c:932
 msgid "Highlight _misspelled words"
 msgstr "スペル間違いを強調表示する(_M)"
 
-#: ../pidgin/gtkprefs.c:919
+#: ../pidgin/gtkprefs.c:936
 msgid "Use smooth-scrolling"
 msgstr "スクロールを滑らかにする"
 
-#: ../pidgin/gtkprefs.c:922
+#: ../pidgin/gtkprefs.c:939
 msgid "F_lash window when IMs are received"
 msgstr "メッセージを受け取ったらウィンドウを点滅させる(_L)"
 
-#: ../pidgin/gtkprefs.c:925
+#: ../pidgin/gtkprefs.c:943
+msgid "Font"
+msgstr "フォント"
+
+#: ../pidgin/gtkprefs.c:945
+msgid "Use document font from _theme"
+msgstr "テーマ指定のドキュメント用フォントを利用する(_T)"
+
+#: ../pidgin/gtkprefs.c:947
+msgid "Use font from _theme"
+msgstr "テーマ指定のフォントを利用する(_T)"
+
+#: ../pidgin/gtkprefs.c:949
+msgid "Conversation _font:"
+msgstr "メッセージのフォント(_F):"
+
+#: ../pidgin/gtkprefs.c:962
 msgid "Default Formatting"
 msgstr "デフォルトの書式"
 
-#: ../pidgin/gtkprefs.c:941
+#: ../pidgin/gtkprefs.c:978
 msgid ""
 "This is how your outgoing message text will appear when you use protocols "
 "that support formatting. :)"
@@ -13577,119 +14265,119 @@
 "これは書式をサポートするプロトコルを利用する際に、送信したメッセージがどのよ"
 "うに表示されるかを示すものです :)"
 
-#: ../pidgin/gtkprefs.c:1017
+#: ../pidgin/gtkprefs.c:1054
 msgid "ST_UN server:"
 msgstr "STUN サーバ(_U):"
 
-#: ../pidgin/gtkprefs.c:1029
+#: ../pidgin/gtkprefs.c:1066
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">例: stunserver.org</span>"
 
-#: ../pidgin/gtkprefs.c:1033
+#: ../pidgin/gtkprefs.c:1070
 msgid "_Autodetect IP address"
 msgstr "IP-アドレスを自動的に検出する(_A)"
 
-#: ../pidgin/gtkprefs.c:1042
+#: ../pidgin/gtkprefs.c:1079
 msgid "Public _IP:"
 msgstr "パブリック IP(_I):"
 
-#: ../pidgin/gtkprefs.c:1071
+#: ../pidgin/gtkprefs.c:1108
 msgid "Ports"
 msgstr "ポート"
 
-#: ../pidgin/gtkprefs.c:1074
+#: ../pidgin/gtkprefs.c:1111
 msgid "_Manually specify range of ports to listen on"
 msgstr "監視するポート番号の範囲を指定する(_M)"
 
-#: ../pidgin/gtkprefs.c:1077
+#: ../pidgin/gtkprefs.c:1114
 msgid "_Start port:"
 msgstr "開始のポート番号(_S):"
 
-#: ../pidgin/gtkprefs.c:1084
+#: ../pidgin/gtkprefs.c:1121
 msgid "_End port:"
 msgstr "終了のポート番号(_E):"
 
-#: ../pidgin/gtkprefs.c:1092
+#: ../pidgin/gtkprefs.c:1129
 msgid "Proxy Server"
 msgstr "プロキシ・サーバ"
 
-#: ../pidgin/gtkprefs.c:1096
+#: ../pidgin/gtkprefs.c:1133
 msgid "No proxy"
 msgstr "プロキシなし"
 
-#: ../pidgin/gtkprefs.c:1152
+#: ../pidgin/gtkprefs.c:1189
 msgid "_User:"
 msgstr "ユーザ名(_U):"
 
-#: ../pidgin/gtkprefs.c:1216
+#: ../pidgin/gtkprefs.c:1253
 msgid "Seamonkey"
 msgstr "Seamonkey"
 
-#: ../pidgin/gtkprefs.c:1217
+#: ../pidgin/gtkprefs.c:1254
 msgid "Opera"
 msgstr "Opera"
 
-#: ../pidgin/gtkprefs.c:1218
+#: ../pidgin/gtkprefs.c:1255
 msgid "Netscape"
 msgstr "Netscape"
 
-#: ../pidgin/gtkprefs.c:1219
+#: ../pidgin/gtkprefs.c:1256
 msgid "Mozilla"
 msgstr "Mozilla"
 
-#: ../pidgin/gtkprefs.c:1220
+#: ../pidgin/gtkprefs.c:1257
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: ../pidgin/gtkprefs.c:1221
+#: ../pidgin/gtkprefs.c:1258
 msgid "GNOME Default"
 msgstr "GNOME のデフォルト"
 
-#: ../pidgin/gtkprefs.c:1222
+#: ../pidgin/gtkprefs.c:1259
 msgid "Galeon"
 msgstr "Galeon"
 
-#: ../pidgin/gtkprefs.c:1223
+#: ../pidgin/gtkprefs.c:1260
 msgid "Firefox"
 msgstr "Firefox"
 
-#: ../pidgin/gtkprefs.c:1224
+#: ../pidgin/gtkprefs.c:1261
 msgid "Firebird"
 msgstr "Firebird"
 
-#: ../pidgin/gtkprefs.c:1225
+#: ../pidgin/gtkprefs.c:1262
 msgid "Epiphany"
 msgstr "Epiphany"
 
-#: ../pidgin/gtkprefs.c:1234
+#: ../pidgin/gtkprefs.c:1271
 msgid "Manual"
 msgstr "手動設定"
 
-#: ../pidgin/gtkprefs.c:1287
+#: ../pidgin/gtkprefs.c:1324
 msgid "Browser Selection"
 msgstr "ブラウザの選択"
 
-#: ../pidgin/gtkprefs.c:1291
+#: ../pidgin/gtkprefs.c:1328
 msgid "_Browser:"
 msgstr "ブラウザ(_B):"
 
-#: ../pidgin/gtkprefs.c:1299
+#: ../pidgin/gtkprefs.c:1336
 msgid "_Open link in:"
 msgstr "リンクを開く方法(_O):"
 
-#: ../pidgin/gtkprefs.c:1301
+#: ../pidgin/gtkprefs.c:1338
 msgid "Browser default"
 msgstr "ブラウザの設定に従う"
 
-#: ../pidgin/gtkprefs.c:1302
+#: ../pidgin/gtkprefs.c:1339
 msgid "Existing window"
 msgstr "既存のウィンドウで開く"
 
-#: ../pidgin/gtkprefs.c:1304
+#: ../pidgin/gtkprefs.c:1341
 msgid "New tab"
 msgstr "新しいタブで開く"
 
-#: ../pidgin/gtkprefs.c:1318
+#: ../pidgin/gtkprefs.c:1355
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -13698,75 +14386,80 @@
 "手動設定(_M):\n"
 "(URL は %s で指定)"
 
-#: ../pidgin/gtkprefs.c:1358
+#: ../pidgin/gtkprefs.c:1395
 msgid "Log _format:"
 msgstr "ログの書式(_F):"
 
-#: ../pidgin/gtkprefs.c:1363
+#: ../pidgin/gtkprefs.c:1400
 msgid "Log all _instant messages"
 msgstr "メッセージを全てログに記録する(_L)"
 
-#: ../pidgin/gtkprefs.c:1365
+#: ../pidgin/gtkprefs.c:1402
 msgid "Log all c_hats"
 msgstr "チャットを全てログに記録する(_H)"
 
-#: ../pidgin/gtkprefs.c:1367
+#: ../pidgin/gtkprefs.c:1404
 msgid "Log all _status changes to system log"
 msgstr "状態の変更を全てログに記録する(_S)"
 
-#: ../pidgin/gtkprefs.c:1513
+#: ../pidgin/gtkprefs.c:1512 ../pidgin/gtkprefs.c:1601
+#: ../pidgin/gtkprefs.c:1795
+msgid "(default)"
+msgstr "(デフォルト)"
+
+#: ../pidgin/gtkprefs.c:1550
 msgid "Sound Selection"
 msgstr "サウンドの選択"
 
-#: ../pidgin/gtkprefs.c:1523
+#: ../pidgin/gtkprefs.c:1560
 msgid "Quietest"
 msgstr "一番静か"
 
-#: ../pidgin/gtkprefs.c:1525
+#: ../pidgin/gtkprefs.c:1562
 msgid "Quieter"
 msgstr "まあまあ静か"
 
-#: ../pidgin/gtkprefs.c:1527
+#: ../pidgin/gtkprefs.c:1564
 msgid "Quiet"
 msgstr "静か"
 
-#: ../pidgin/gtkprefs.c:1531
+#: ../pidgin/gtkprefs.c:1568
 msgid "Loud"
 msgstr "大きい"
 
-#: ../pidgin/gtkprefs.c:1533
+#: ../pidgin/gtkprefs.c:1570
 msgid "Louder"
 msgstr "まあまあ大きい"
 
-#: ../pidgin/gtkprefs.c:1535
+#: ../pidgin/gtkprefs.c:1572
 msgid "Loudest"
 msgstr "一番大きい"
 
-#: ../pidgin/gtkprefs.c:1598
+#: ../pidgin/gtkprefs.c:1635
 msgid "Sound Method"
 msgstr "サウンド出力の方法"
 
-#: ../pidgin/gtkprefs.c:1599
+#: ../pidgin/gtkprefs.c:1636
 msgid "_Method:"
 msgstr "方法(_M):"
 
-#: ../pidgin/gtkprefs.c:1601
+#: ../pidgin/gtkprefs.c:1638
 msgid "Console beep"
 msgstr "ビープ音"
 
-#: ../pidgin/gtkprefs.c:1603
+#: ../pidgin/gtkprefs.c:1640
 msgid "Automatic"
 msgstr "自動選択"
 
-#: ../pidgin/gtkprefs.c:1606
+#: ../pidgin/gtkprefs.c:1644
 msgid "Command"
 msgstr "コマンド指定"
 
-#: ../pidgin/gtkprefs.c:1607
+#: ../pidgin/gtkprefs.c:1645
 msgid "No sounds"
 msgstr "サウンドなし"
 
-#: ../pidgin/gtkprefs.c:1615
+#: ../pidgin/gtkprefs.c:1653
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -13775,117 +14468,117 @@
 "サウンド・コマンド(_O)\n"
 "(ファイル名は %s で指定)"
 
-#: ../pidgin/gtkprefs.c:1641
+#: ../pidgin/gtkprefs.c:1679
 msgid "Sound Options"
 msgstr "サウンドのオプション"
 
-#: ../pidgin/gtkprefs.c:1642
+#: ../pidgin/gtkprefs.c:1680
 msgid "Sounds when conversation has _focus"
 msgstr "会話ウィンドウがフォーカスされたらサウンドを演奏する(_F)"
 
-#: ../pidgin/gtkprefs.c:1644
+#: ../pidgin/gtkprefs.c:1682
 msgid "Enable sounds:"
 msgstr "いつサウンドを有効にするか...:"
 
-#: ../pidgin/gtkprefs.c:1646
+#: ../pidgin/gtkprefs.c:1684
 msgid "Only when available"
 msgstr "在席している時だけ"
 
-#: ../pidgin/gtkprefs.c:1647
+#: ../pidgin/gtkprefs.c:1685
 msgid "Only when not available"
 msgstr "不在の時だけ"
 
-#: ../pidgin/gtkprefs.c:1655
+#: ../pidgin/gtkprefs.c:1693
 msgid "Volume:"
 msgstr "音量:"
 
-#: ../pidgin/gtkprefs.c:1683
+#: ../pidgin/gtkprefs.c:1721
 msgid "Sound Events"
 msgstr "イベント毎のサウンド"
 
-#: ../pidgin/gtkprefs.c:1734
+#: ../pidgin/gtkprefs.c:1773
 msgid "Play"
 msgstr "演奏"
 
-#: ../pidgin/gtkprefs.c:1741
+#: ../pidgin/gtkprefs.c:1780
 msgid "Event"
 msgstr "イベント"
 
-#: ../pidgin/gtkprefs.c:1760
+#: ../pidgin/gtkprefs.c:1799
 msgid "Test"
 msgstr "テスト"
 
-#: ../pidgin/gtkprefs.c:1764
+#: ../pidgin/gtkprefs.c:1803
 msgid "Reset"
 msgstr "リセット"
 
-#: ../pidgin/gtkprefs.c:1768
+#: ../pidgin/gtkprefs.c:1807
 msgid "Choose..."
 msgstr "選択..."
 
-#: ../pidgin/gtkprefs.c:1811
+#: ../pidgin/gtkprefs.c:1850
 msgid "_Report idle time:"
 msgstr "いつ待機時間を報告するか...(_R):"
 
-#: ../pidgin/gtkprefs.c:1816
+#: ../pidgin/gtkprefs.c:1855
 msgid "Based on keyboard or mouse use"
 msgstr "キーボードやマウスを操作し始めた時"
 
-#: ../pidgin/gtkprefs.c:1825
+#: ../pidgin/gtkprefs.c:1864
 msgid "_Auto-reply:"
 msgstr "自動応答(_A):"
 
-#: ../pidgin/gtkprefs.c:1829
+#: ../pidgin/gtkprefs.c:1868
 msgid "When both away and idle"
 msgstr "離席中で待機中の時"
 
 #. Auto-away stuff
-#: ../pidgin/gtkprefs.c:1835
+#: ../pidgin/gtkprefs.c:1874
 msgid "Auto-away"
 msgstr "自動離席"
 
-#: ../pidgin/gtkprefs.c:1837
+#: ../pidgin/gtkprefs.c:1876
 msgid "Change status when _idle"
 msgstr "待機中になったら状態を変更する(_I)"
 
-#: ../pidgin/gtkprefs.c:1841
+#: ../pidgin/gtkprefs.c:1880
 msgid "_Minutes before changing status:"
 msgstr "状態を変更するまでの時間(分)(_M):"
 
-#: ../pidgin/gtkprefs.c:1849
+#: ../pidgin/gtkprefs.c:1888
 msgid "Change _status to:"
 msgstr "次の状態に変更する(_S):"
 
 #. Signon status stuff
-#: ../pidgin/gtkprefs.c:1870
+#: ../pidgin/gtkprefs.c:1909
 msgid "Status at Startup"
 msgstr "起動時の状態"
 
-#: ../pidgin/gtkprefs.c:1872
+#: ../pidgin/gtkprefs.c:1911
 msgid "Use status from last _exit at startup"
 msgstr "最後に終了した時の状態を継承する(_E)"
 
-#: ../pidgin/gtkprefs.c:1878
+#: ../pidgin/gtkprefs.c:1917
 msgid "Status to a_pply at startup:"
 msgstr "起動時に適用する状態(_P):"
 
-#: ../pidgin/gtkprefs.c:1916
+#: ../pidgin/gtkprefs.c:1955
 msgid "Interface"
 msgstr "インタフェース"
 
-#: ../pidgin/gtkprefs.c:1918
+#: ../pidgin/gtkprefs.c:1957
 msgid "Smiley Themes"
 msgstr "顔文字のテーマ"
 
-#: ../pidgin/gtkprefs.c:1919
+#: ../pidgin/gtkprefs.c:1958
 msgid "Sounds"
 msgstr "サウンド"
 
-#: ../pidgin/gtkprefs.c:1925
+#: ../pidgin/gtkprefs.c:1964
 msgid "Browser"
 msgstr "ブラウザ"
 
-#: ../pidgin/gtkprefs.c:1929
+#: ../pidgin/gtkprefs.c:1968
 msgid "Status / Idle"
 msgstr "状態/待機"
 
@@ -13974,23 +14667,23 @@
 msgid "Apply"
 msgstr "適用"
 
-#: ../pidgin/gtkrequest.c:1481
+#: ../pidgin/gtkrequest.c:1482
 msgid "That file already exists"
 msgstr "既にそのファイルは存在します"
 
-#: ../pidgin/gtkrequest.c:1482
+#: ../pidgin/gtkrequest.c:1483
 msgid "Would you like to overwrite it?"
 msgstr "上書きしてもよろしいですか?"
 
-#: ../pidgin/gtkrequest.c:1485
+#: ../pidgin/gtkrequest.c:1486
 msgid "Overwrite"
 msgstr "上書きする"
 
-#: ../pidgin/gtkrequest.c:1486
+#: ../pidgin/gtkrequest.c:1487
 msgid "Choose New Name"
 msgstr "別の名前を付ける"
 
-#: ../pidgin/gtkrequest.c:1624 ../pidgin/gtkrequest.c:1638
+#: ../pidgin/gtkrequest.c:1625 ../pidgin/gtkrequest.c:1639
 msgid "Select Folder..."
 msgstr "フォルダの選択..."
 
@@ -14013,7 +14706,7 @@
 msgstr "本当に選択した保存済みの状態を削除してもよろしいですか?"
 
 #. Use button
-#: ../pidgin/gtksavedstatuses.c:580 ../pidgin/gtksavedstatuses.c:1214
+#: ../pidgin/gtksavedstatuses.c:580 ../pidgin/gtksavedstatuses.c:1213
 msgid "_Use"
 msgstr "使う(_U)"
 
@@ -14025,25 +14718,25 @@
 msgid "Different"
 msgstr "別の状態"
 
-#: ../pidgin/gtksavedstatuses.c:1107
+#: ../pidgin/gtksavedstatuses.c:1106
 msgid "_Title:"
 msgstr "題名(_T):"
 
-#: ../pidgin/gtksavedstatuses.c:1126 ../pidgin/gtksavedstatuses.c:1447
+#: ../pidgin/gtksavedstatuses.c:1125 ../pidgin/gtksavedstatuses.c:1446
 msgid "_Status:"
 msgstr "状態(_S):"
 
 #. Different status message expander
-#: ../pidgin/gtksavedstatuses.c:1158
+#: ../pidgin/gtksavedstatuses.c:1157
 msgid "Use a _different status for some accounts"
 msgstr "同じアカウントで別の状態を利用する(_D)"
 
 #. Save & Use button
-#: ../pidgin/gtksavedstatuses.c:1222
+#: ../pidgin/gtksavedstatuses.c:1221
 msgid "Sa_ve & Use"
 msgstr "保存して使う(_V)"
 
-#: ../pidgin/gtksavedstatuses.c:1428
+#: ../pidgin/gtksavedstatuses.c:1427
 #, c-format
 msgid "Status for %s"
 msgstr "%s の状態"
@@ -14100,34 +14793,38 @@
 msgid "Waiting for network connection"
 msgstr "ネットワークの接続待ちです"
 
-#: ../pidgin/gtkutils.c:1320 ../pidgin/gtkutils.c:1343
+#: ../pidgin/gtkutils.c:593
+msgid "Google Talk"
+msgstr "Google トーク"
+
+#: ../pidgin/gtkutils.c:1309 ../pidgin/gtkutils.c:1332
 #, c-format
 msgid "The following error has occurred loading %s: %s"
 msgstr "%s を読み込む際に次のエラーが発生しました: %s"
 
-#: ../pidgin/gtkutils.c:1323 ../pidgin/gtkutils.c:1345
+#: ../pidgin/gtkutils.c:1312 ../pidgin/gtkutils.c:1334
 msgid "Failed to load image"
 msgstr "画像の読み込みに失敗しました"
 
-#: ../pidgin/gtkutils.c:1419
+#: ../pidgin/gtkutils.c:1408
 #, c-format
 msgid "Cannot send folder %s."
 msgstr "フォルダ %s は転送できません"
 
-#: ../pidgin/gtkutils.c:1420
+#: ../pidgin/gtkutils.c:1409
 #, c-format
 msgid ""
 "%s cannot transfer a folder. You will need to send the files within "
-"individually"
-msgstr ""
-"%s ではフォルダそのものを転送できません。ファイルを別個に転送して下さい。"
-
-#: ../pidgin/gtkutils.c:1452 ../pidgin/gtkutils.c:1464
-#: ../pidgin/gtkutils.c:1471
+"individually."
+msgstr ""
+"%s ではフォルダそのものを転送できません。ファイルを個別に転送して下さい。"
+
+#: ../pidgin/gtkutils.c:1441 ../pidgin/gtkutils.c:1453
+#: ../pidgin/gtkutils.c:1460
 msgid "You have dragged an image"
 msgstr "ドラッグしたのは画像です"
 
-#: ../pidgin/gtkutils.c:1453
+#: ../pidgin/gtkutils.c:1442
 msgid ""
 "You can send this image as a file transfer, embed it into this message, or "
 "use it as the buddy icon for this user."
@@ -14135,31 +14832,31 @@
 "この画像をファイルとして転送したり、メッセージの中に埋め込んだり、あるいはこ"
 "のユーザの仲間アイコンに利用できます。"
 
-#: ../pidgin/gtkutils.c:1459 ../pidgin/gtkutils.c:1480
+#: ../pidgin/gtkutils.c:1448 ../pidgin/gtkutils.c:1468
 msgid "Set as buddy icon"
 msgstr "仲間アイコンにする"
 
-#: ../pidgin/gtkutils.c:1460 ../pidgin/gtkutils.c:1481
+#: ../pidgin/gtkutils.c:1449 ../pidgin/gtkutils.c:1469
 msgid "Send image file"
 msgstr "ファイルとして転送する"
 
-#: ../pidgin/gtkutils.c:1461 ../pidgin/gtkutils.c:1481
+#: ../pidgin/gtkutils.c:1450 ../pidgin/gtkutils.c:1469
 msgid "Insert in message"
 msgstr "メッセージの中に埋め込む"
 
-#: ../pidgin/gtkutils.c:1465
+#: ../pidgin/gtkutils.c:1454
 msgid "Would you like to set it as the buddy icon for this user?"
 msgstr "このユーザの仲間アイコンとして画像をセットしてもよろしいですか?"
 
-#: ../pidgin/gtkutils.c:1472
-msgid ""
-"You can send this image as a file transfer or embed it into this message, or "
-"use it as the buddy icon for this user."
-msgstr ""
-"この画像をファイルとして転送したり、メッセージの中に埋め込んだり、あるいはこ"
-"のユーザの仲間アイコンに利用できます。"
-
-#: ../pidgin/gtkutils.c:1474
+#: ../pidgin/gtkutils.c:1461
+msgid ""
+"You can send this image as a file transfer, or use it as the buddy icon for "
+"this user."
+msgstr ""
+"この画像をファイルとして転送したり、あるいはこのユーザの仲間アイコンに利用で"
+"きます。"
+
+#: ../pidgin/gtkutils.c:1462
 msgid ""
 "You can insert this image into this message, or use it as the buddy icon for "
 "this user"
@@ -14172,11 +14869,11 @@
 #. * send.  The only logical one is "Application," but do we really want to send a binary and nothing else?
 #. * Probably not.  I'll just give an error and return.
 #. The original patch sent the icon used by the launcher.  That's probably wrong
-#: ../pidgin/gtkutils.c:1532
+#: ../pidgin/gtkutils.c:1520
 msgid "Cannot send launcher"
 msgstr "ランチャは転送できません"
 
-#: ../pidgin/gtkutils.c:1532
+#: ../pidgin/gtkutils.c:1520
 msgid ""
 "You dragged a desktop launcher. Most likely you wanted to send whatever this "
 "launcher points to instead of this launcher itself."
@@ -14184,7 +14881,7 @@
 "ドラッグしたのはデスクトップのランチャです。おそらくランチャ自身ではなく、ラ"
 "ンチャが指しているオブジェクトを転送したいのでしょう。"
 
-#: ../pidgin/gtkutils.c:2302
+#: ../pidgin/gtkutils.c:2268
 #, c-format
 msgid ""
 "<b>File:</b> %s\n"
@@ -14195,27 +14892,27 @@
 "<b>サイズ:</b> %s\n"
 "<b>画像のサイズ:</b> %dx%d"
 
-#: ../pidgin/gtkutils.c:2592
+#: ../pidgin/gtkutils.c:2564
 #, c-format
 msgid "The file '%s' is too large for %s.  Please try a smaller image.\n"
 msgstr ""
 "ファイル '%s' は %s では大きすぎます。もっと小さい画像でトライしてみて下さ"
 "い。\n"
 
-#: ../pidgin/gtkutils.c:2594
+#: ../pidgin/gtkutils.c:2566
 msgid "Icon Error"
 msgstr "アイコンのエラー"
 
-#: ../pidgin/gtkutils.c:2595
+#: ../pidgin/gtkutils.c:2567
 msgid "Could not set icon"
 msgstr "アイコンを送信できませんでした"
 
-#: ../pidgin/gtkutils.c:2695
+#: ../pidgin/gtkutils.c:2667
 #, c-format
 msgid "Failed to open file '%s': %s"
 msgstr "ファイル '%s' を開けませんでした: %s"
 
-#: ../pidgin/gtkutils.c:2744
+#: ../pidgin/gtkutils.c:2716
 #, c-format
 msgid ""
 "Failed to load image '%s': reason not known, probably a corrupt image file"
@@ -14231,30 +14928,56 @@
 msgid "Select color"
 msgstr "色の選択"
 
-#: ../pidgin/pidginstock.c:83
+#. Translators may want to transliterate the name.
+#. It is not to be translated.
+#: ../pidgin/pidgin.h:50
+msgid "Pidgin"
+msgstr "Pidgin"
+
+#: ../pidgin/pidginstock.c:81
 msgid "_Alias"
 msgstr "別名(_A)"
 
+#: ../pidgin/pidginstock.c:83
+msgid "Close _tabs"
+msgstr "タブを閉じる(_T)"
+
 #: ../pidgin/pidginstock.c:85
-msgid "Close _tabs"
-msgstr "タブを閉じる(_T)"
-
-#: ../pidgin/pidginstock.c:87
 msgid "_Get Info"
 msgstr "情報の取得(_G)"
 
-#: ../pidgin/pidginstock.c:88
+#: ../pidgin/pidginstock.c:86
 msgid "_Invite"
 msgstr "招待(_I)"
 
-#: ../pidgin/pidginstock.c:89
+#: ../pidgin/pidginstock.c:87
 msgid "_Modify"
 msgstr "変更(_M)"
 
-#: ../pidgin/pidginstock.c:90
+#: ../pidgin/pidginstock.c:88
 msgid "_Open Mail"
 msgstr "メールを開く(_O)"
 
+#: ../pidgin/pixmaps/emotes/default/22/default.theme.in.h:1
+msgid "Default"
+msgstr "デフォルト"
+
+#: ../pidgin/pixmaps/emotes/default/22/default.theme.in.h:2
+msgid "Pidgin smileys"
+msgstr "Pidgin スマイリー"
+
+#: ../pidgin/pixmaps/emotes/none/none.theme.in.h:1
+msgid "Penguin Pimps"
+msgstr "ペンギン Pimps"
+
+#: ../pidgin/pixmaps/emotes/none/none.theme.in.h:2
+msgid "Selecting this disables graphical emoticons."
+msgstr "グラフィカルな顔文字を無効にします"
+
+#: ../pidgin/pixmaps/emotes/none/none.theme.in.h:3
+msgid "none"
+msgstr "なし"
+
 #: ../pidgin/plugins/cap/cap.c:449
 msgid "Display Statistics"
 msgstr "統計情報"
@@ -14357,20 +15080,20 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/contact_priority.c:182
+#: ../pidgin/plugins/contact_priority.c:187
 msgid "Contact Priority"
 msgstr "コンタクトの優先度"
 
 #. *< name
 #. *< version
 #. *< summary
-#: ../pidgin/plugins/contact_priority.c:185
+#: ../pidgin/plugins/contact_priority.c:190
 msgid ""
 "Allows for controlling the values associated with different buddy states."
 msgstr "仲間のいろいろな状態に合わせて優先度を調節できます"
 
 #. *< description
-#: ../pidgin/plugins/contact_priority.c:187
+#: ../pidgin/plugins/contact_priority.c:192
 msgid ""
 "Allows for changing the point values of idle/away/offline states for buddies "
 "in contact priority computations."
@@ -14431,11 +15154,18 @@
 msgid "Conversation Placement"
 msgstr "会話タブの配置"
 
-#: ../pidgin/plugins/extplacement.c:106
+#. Translators: "New conversations" should match the text in the preferences dialog and "By conversation count" should be the same text used above
+#: ../pidgin/plugins/extplacement.c:105
+msgid ""
+"Note: The preference for \"New conversations\" must be set to \"By "
+"conversation count\"."
+msgstr "注意: \"新しい会話\" の設定を \"会話の回数順に並べる\" にして下さい。"
+
+#: ../pidgin/plugins/extplacement.c:111
 msgid "Number of conversations per window"
 msgstr "ウィンドウ毎の会話タブの数"
 
-#: ../pidgin/plugins/extplacement.c:112
+#: ../pidgin/plugins/extplacement.c:117
 msgid "Separate IM and Chat windows when placing by number"
 msgstr "会話タブを番号順に配置する時に IM とチャット・ウィンドウを分割する"
 
@@ -14445,19 +15175,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/extplacement.c:141
+#: ../pidgin/plugins/extplacement.c:146
 msgid "ExtPlacement"
 msgstr "会話タブの配置"
 
 #. *< name
 #. *< version
-#: ../pidgin/plugins/extplacement.c:143
+#: ../pidgin/plugins/extplacement.c:148
 msgid "Extra conversation placement options."
 msgstr "会話タブを追加する時のオプションです"
 
 #. *< summary
 #. *  description
-#: ../pidgin/plugins/extplacement.c:145
+#: ../pidgin/plugins/extplacement.c:150
 msgid ""
 "Restrict the number of conversations per windows, optionally separating IMs "
 "and Chats"
@@ -14526,6 +15256,11 @@
 msgid "Select a person from your address book below, or add a new person."
 msgstr "下のアドレス帳から仲間を選択するか、または仲間を新規に追加して下さい:"
 
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:554
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:307
+msgid "Group:"
+msgstr "グループ:"
+
 #. "New Person" button
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:580
 #: ../pidgin/plugins/gevolution/assoc-buddy.c:469
@@ -14556,34 +15291,34 @@
 msgid "_Associate Buddy"
 msgstr "仲間との連携(_A)"
 
-#: ../pidgin/plugins/gevolution/gevolution.c:239
-#: ../pidgin/plugins/gevolution/gevolution.c:245
+#: ../pidgin/plugins/gevolution/gevolution.c:238
+#: ../pidgin/plugins/gevolution/gevolution.c:244
 msgid "Unable to send e-mail"
 msgstr "E-メールを送信できません"
 
-#: ../pidgin/plugins/gevolution/gevolution.c:240
+#: ../pidgin/plugins/gevolution/gevolution.c:239
 msgid "The evolution executable was not found in the PATH."
 msgstr "環境変数 PATH の中から Evolution の実行形式が見つかりませんでした。"
 
-#: ../pidgin/plugins/gevolution/gevolution.c:246
+#: ../pidgin/plugins/gevolution/gevolution.c:245
 msgid "An e-mail address was not found for this buddy."
 msgstr "この仲間の E-メール・アドレスがありません"
 
-#: ../pidgin/plugins/gevolution/gevolution.c:272
+#: ../pidgin/plugins/gevolution/gevolution.c:271
 msgid "Add to Address Book"
 msgstr "アドレス帳へ追加する"
 
-#: ../pidgin/plugins/gevolution/gevolution.c:284
+#: ../pidgin/plugins/gevolution/gevolution.c:283
 msgid "Send E-Mail"
 msgstr "E-メールを送信する"
 
 #. Configuration frame
-#: ../pidgin/plugins/gevolution/gevolution.c:411
+#: ../pidgin/plugins/gevolution/gevolution.c:410
 msgid "Evolution Integration Configuration"
 msgstr "Evolution との連携の設定"
 
 #. Label
-#: ../pidgin/plugins/gevolution/gevolution.c:414
+#: ../pidgin/plugins/gevolution/gevolution.c:413
 msgid "Select all accounts that buddies should be auto-added to."
 msgstr "自動的に仲間として追加するアカウントを全て選択して下さい:"
 
@@ -14593,7 +15328,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/gevolution/gevolution.c:521
+#: ../pidgin/plugins/gevolution/gevolution.c:525
 msgid "Evolution Integration"
 msgstr "Evolution との連携"
 
@@ -14601,8 +15336,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/gevolution/gevolution.c:524
-#: ../pidgin/plugins/gevolution/gevolution.c:526
+#: ../pidgin/plugins/gevolution/gevolution.c:528
+#: ../pidgin/plugins/gevolution/gevolution.c:530
 msgid "Provides integration with Evolution."
 msgstr "Evolution との連携機能を提供します"
 
@@ -14903,38 +15638,30 @@
 msgid "Hyperlink Color"
 msgstr "ハイパーリンクの色"
 
-#: ../pidgin/plugins/pidginrc.c:56
-msgid "GtkTreeView Expander Size"
-msgstr "GtkTreeView のエキスパンダの大きさ"
-
-#: ../pidgin/plugins/pidginrc.c:57
+#: ../pidgin/plugins/pidginrc.c:54
 msgid "GtkTreeView Horizontal Separation"
 msgstr "GtkTreeView の水平方向のセパレータ"
 
-#: ../pidgin/plugins/pidginrc.c:76
+#: ../pidgin/plugins/pidginrc.c:73
 msgid "Conversation Entry"
 msgstr "メッセージの文字"
 
-#: ../pidgin/plugins/pidginrc.c:77
+#: ../pidgin/plugins/pidginrc.c:74
 msgid "Conversation History"
 msgstr "会話履歴の文字"
 
-#: ../pidgin/plugins/pidginrc.c:78
+#: ../pidgin/plugins/pidginrc.c:75
 msgid "Log Viewer"
 msgstr "ログ・ビューアの文字"
 
-#: ../pidgin/plugins/pidginrc.c:79
+#: ../pidgin/plugins/pidginrc.c:76
 msgid "Request Dialog"
 msgstr "質問ダイアログの文字"
 
-#: ../pidgin/plugins/pidginrc.c:80
+#: ../pidgin/plugins/pidginrc.c:77
 msgid "Notify Dialog"
 msgstr "通知ダイアログの文字"
 
-#: ../pidgin/plugins/pidginrc.c:91
-msgid "GtkTreeView Indent Expanders"
-msgstr "GtkTreeView のエキスパンダを字下げして描画する"
-
 #: ../pidgin/plugins/pidginrc.c:322
 msgid "Select Color"
 msgstr "色の選択"
@@ -14956,36 +15683,56 @@
 msgid "GTK+ Text Shortcut Theme"
 msgstr "GTK+ テキストのショートカットのテーマ"
 
-#: ../pidgin/plugins/pidginrc.c:508
+#.
+#. for (i = 0; i < G_N_ELEMENTS(widget_bool_prefs); i++) {
+#. hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
+#. gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
+#.
+#. check = pidgin_prefs_checkbox(_(widget_bool_names[i]),
+#. widget_bool_prefs_set[i], hbox);
+#. gtk_size_group_add_widget(labelsg, check);
+#.
+#. widget_bool_widgets[i] = pidgin_prefs_checkbox("", widget_bool_prefs[i], hbox);
+#. *
+#. gtk_size_group_add_widget(widgetsb, widget_bool_widgets[i]);
+#. *
+#. gtk_widget_set_sensitive(widget_bool_widgets[i],
+#. purple_prefs_get_bool(widget_bool_prefs_set[i]));
+#. g_signal_connect(G_OBJECT(check), "toggled",
+#. G_CALLBACK(pidgin_toggle_sensitive),
+#. widget_bool_widgets[i]);
+#. }
+#.
+#: ../pidgin/plugins/pidginrc.c:510
 msgid "Interface colors"
 msgstr "インタフェースの色"
 
-#: ../pidgin/plugins/pidginrc.c:532
+#: ../pidgin/plugins/pidginrc.c:534
 msgid "Widget Sizes"
 msgstr "ウィジットの大きさ"
 
-#: ../pidgin/plugins/pidginrc.c:553
+#: ../pidgin/plugins/pidginrc.c:555
 msgid "Fonts"
 msgstr "フォント"
 
-#: ../pidgin/plugins/pidginrc.c:576
+#: ../pidgin/plugins/pidginrc.c:578
 msgid "Tools"
 msgstr "ツール"
 
-#: ../pidgin/plugins/pidginrc.c:581
+#: ../pidgin/plugins/pidginrc.c:583
 #, c-format
 msgid "Write settings to %s%sgtkrc-2.0"
 msgstr "これらの設定を \"%s%sgtkrc-2.0\" に書き込む"
 
-#: ../pidgin/plugins/pidginrc.c:589
+#: ../pidgin/plugins/pidginrc.c:591
 msgid "Re-read gtkrc files"
 msgstr "この \"gtkrc\" ファイルを読み込む"
 
-#: ../pidgin/plugins/pidginrc.c:622
+#: ../pidgin/plugins/pidginrc.c:624
 msgid "Pidgin GTK+ Theme Control"
 msgstr "GTK+ テーマのカスタマイズ"
 
-#: ../pidgin/plugins/pidginrc.c:624 ../pidgin/plugins/pidginrc.c:625
+#: ../pidgin/plugins/pidginrc.c:626 ../pidgin/plugins/pidginrc.c:627
 msgid "Provides access to commonly used gtkrc settings."
 msgstr "\"gtkrc\" の設定にアクセスする機能を提供します"
 
@@ -14999,37 +15746,28 @@
 
 #: ../pidgin/plugins/raw.c:178
 msgid ""
-"Lets you send raw input to text-based protocols (Jabber, MSN, IRC, TOC). Hit "
+"Lets you send raw input to text-based protocols (XMPP, MSN, IRC, TOC). Hit "
 "'Enter' in the entry box to send. Watch the debug window."
 msgstr ""
-"入力した生データをテキスト形式のプロトコル (Jabber, MSN, IRC, TOC) へ送信でき"
-"ます。送信する際は入力ボックスの中で [ENTER] キーを押して下さい。デバッグ・"
-"ウィンドウで送信内容を監視して下さい。"
+"入力した生データをテキスト形式のプロトコル (XMPP, MSN, IRC, TOC) へ送信できま"
+"す。送信する際は入力ボックスの中で [ENTER] キーを押して下さい。デバッグ・ウィ"
+"ンドウで送信内容を監視して下さい。"
 
 #: ../pidgin/plugins/relnot.c:71
 #, c-format
-msgid "You are using %s version %s.  The current version is %s.<hr>"
-msgstr "お使いのバージョンは %s %s です。最新バージョンは %s です。<hr>"
-
-#: ../pidgin/plugins/relnot.c:77
-#, c-format
-msgid ""
-"<b>ChangeLog:</b>\n"
-"%s<br><br>"
-msgstr ""
-"<b>変更履歴:</b>\n"
-"%s<br><br>"
-
-#: ../pidgin/plugins/relnot.c:82
-#, c-format
-msgid ""
-"You can get version %s from:<br><a href=\"http://pidgin.im/\">http://pidgin."
-"im</a>."
-msgstr ""
-"バージョン %s は次のサイトから入手できます:<br><a href=\"http://pidgin.im/"
-"\">http://pidgin.im</a>"
-
-#: ../pidgin/plugins/relnot.c:86 ../pidgin/plugins/relnot.c:87
+msgid ""
+"You are using %s version %s.  The current version is %s.  You can get it "
+"from <a href=\""
+msgstr ""
+"お使いのバージョンは %s %s です。最新バージョンは %s です; 最新版は次からダウ"
+"ンロードできます: <a href=\""
+
+#: ../pidgin/plugins/relnot.c:78
+#, c-format
+msgid "<b>ChangeLog:</b><br>%s"
+msgstr "<b>変更履歴:</b><br>%s"
+
+#: ../pidgin/plugins/relnot.c:83 ../pidgin/plugins/relnot.c:84
 msgid "New Version Available"
 msgstr "最新バージョンのお知らせ"
 
@@ -15039,19 +15777,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/relnot.c:145
+#: ../pidgin/plugins/relnot.c:142
 msgid "Release Notification"
 msgstr "リリース通知"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/relnot.c:148
+#: ../pidgin/plugins/relnot.c:145
 msgid "Checks periodically for new releases."
 msgstr "最新リリースの情報を周期的にチェックします"
 
 #. *  description
-#: ../pidgin/plugins/relnot.c:150
+#: ../pidgin/plugins/relnot.c:147
 msgid ""
 "Checks periodically for new releases and notifies the user with the "
 "ChangeLog."
@@ -15172,9 +15910,8 @@
 msgstr "タイムスタンプの書式オプション"
 
 #: ../pidgin/plugins/timestamp_format.c:26
-#, c-format
-msgid "_Force (traditional %s) 24-hour time format"
-msgstr "強制的に 24時間制にする (従来の %s)(_F)"
+msgid "_Force 24-hour time format"
+msgstr "強制的に 24時間制にする(_F)"
 
 #: ../pidgin/plugins/timestamp_format.c:33
 msgid "Show dates in..."
@@ -15204,19 +15941,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/timestamp_format.c:150
+#: ../pidgin/plugins/timestamp_format.c:151
 msgid "Message Timestamp Formats"
 msgstr "メッセージ・タイムスタンプの書式"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/timestamp_format.c:153
+#: ../pidgin/plugins/timestamp_format.c:154
 msgid "Customizes the message timestamp formats."
 msgstr "メッセージに付与するタイムスタンプの書式をカスタマイズします"
 
 #. *  description
-#: ../pidgin/plugins/timestamp_format.c:155
+#: ../pidgin/plugins/timestamp_format.c:156
 msgid ""
 "This plugin allows the user to customize conversation and logging message "
 "timestamp formats."
@@ -15228,7 +15965,7 @@
 #: ../pidgin/plugins/win32/transparency/win2ktrans.c:569
 #: ../pidgin/plugins/win32/transparency/win2ktrans.c:616
 msgid "Opacity:"
-msgstr "不透明度:"
+msgstr "透明度:"
 
 #. IM Convo trans options
 #: ../pidgin/plugins/win32/transparency/win2ktrans.c:533
@@ -15328,8 +16065,8 @@
 msgstr "チャットでメッセージを受け取ったらウィンドウを点滅させる(_F)"
 
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:375
-msgid "Pidgwin Options"
-msgstr "Pidgin のオプション"
+msgid "Windows Pidgin Options"
+msgstr "Windows 版 Pidgin のオプション"
 
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:377
 msgid "Options specific to Pidgin for Windows."
@@ -15342,7 +16079,7 @@
 "Windows 版の Pidgin に特化したオプション機能 (会話ウィンドウの組み込みなど) "
 "を提供します"
 
-#: ../pidgin/plugins/xmppconsole.c:665
+#: ../pidgin/plugins/xmppconsole.c:666
 msgid "<font color='#777777'>Logged out.</font>"
 msgstr "<font color='#777777'>サイン・アウトしました</font>"
 
@@ -15352,40 +16089,40 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/xmppconsole.c:745 ../pidgin/plugins/xmppconsole.c:841
-#: ../pidgin/plugins/xmppconsole.c:860
+#: ../pidgin/plugins/xmppconsole.c:746 ../pidgin/plugins/xmppconsole.c:842
+#: ../pidgin/plugins/xmppconsole.c:861
 msgid "XMPP Console"
 msgstr "XMPP のコンソール"
 
-#: ../pidgin/plugins/xmppconsole.c:753
+#: ../pidgin/plugins/xmppconsole.c:754
 msgid "Account: "
 msgstr "アカウント: "
 
-#: ../pidgin/plugins/xmppconsole.c:780
+#: ../pidgin/plugins/xmppconsole.c:781
 msgid "<font color='#777777'>Not connected to XMPP</font>"
 msgstr "<font color='#777777'>XMPP に接続していません</font>"
 
-#: ../pidgin/plugins/xmppconsole.c:790
+#: ../pidgin/plugins/xmppconsole.c:791
 msgid "Insert an <iq/> stanza."
 msgstr "<iq/> スタンザを挿入します"
 
-#: ../pidgin/plugins/xmppconsole.c:799
+#: ../pidgin/plugins/xmppconsole.c:800
 msgid "Insert a <presence/> stanza."
 msgstr "<presence/> スタンザを挿入します"
 
-#: ../pidgin/plugins/xmppconsole.c:808
+#: ../pidgin/plugins/xmppconsole.c:809
 msgid "Insert a <message/> stanza."
 msgstr "<message/> スタンザを挿入します"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/xmppconsole.c:863
+#: ../pidgin/plugins/xmppconsole.c:864
 msgid "Send and receive raw XMPP stanzas."
 msgstr "低レベルの XMPP スタンザを送信したり受信します"
 
 #. *  description
-#: ../pidgin/plugins/xmppconsole.c:865
+#: ../pidgin/plugins/xmppconsole.c:866
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr ""
 "これは XMPP サービスやクライアントをデバッグする際に便利なプラグインです。"