diff po/ja.po @ 8459:3afd1761da09

[gaim-migrate @ 9189] make make dist work committer: Tailor Script <tailor@pidgin.im>
author Luke Schierer <lschiere@pidgin.im>
date Tue, 16 Mar 2004 20:35:22 +0000
parents d85555980495
children 03b9ce930f0d
line wrap: on
line diff
--- a/po/ja.po	Tue Mar 16 20:24:37 2004 +0000
+++ b/po/ja.po	Tue Mar 16 20:35:22 2004 +0000
@@ -8,7 +8,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Gaim 0.75\n"
-"POT-Creation-Date: 2004-01-06 00:00-0500\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2004-03-16 15:37-0500\n"
 "PO-Revision-Date: 2003-06-07 19:23+0900\n"
 "Last-Translator: Junichi Uekawa <dancer@debian.org>\n"
 "Language-Team: Japanese <translation@gnome.gr.jp>\n"
@@ -24,14 +25,15 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/autorecon.c:104
+#: plugins/autorecon.c:110
 msgid "Auto-Reconnect"
 msgstr "自動再接続"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/autorecon.c:107 plugins/autorecon.c:109
+#. *  description
+#: plugins/autorecon.c:113 plugins/autorecon.c:115
 msgid "When you are kicked offline, this reconnects you."
 msgstr "オフラインにされたときに再接続する。"
 
@@ -130,7 +132,7 @@
 msgid "Gaim - Away"
 msgstr "Gaim - 離席"
 
-#: plugins/docklet/docklet.c:114 src/gtkaccount.c:480 src/gtkaccount.c:1759
+#: plugins/docklet/docklet.c:114 src/gtkaccount.c:495 src/gtkaccount.c:1820
 msgid "Auto-login"
 msgstr "自動ログイン"
 
@@ -146,16 +148,16 @@
 msgid "New..."
 msgstr "新規..."
 
-#: plugins/docklet/docklet.c:153 src/gtkblist.c:2552 src/gtkpounce.c:411
-#: src/gtkprefs.c:1457 src/protocols/gg/gg.c:51 src/protocols/irc/msgs.c:187
-#: src/protocols/jabber/jabber.c:965 src/protocols/jabber/jutil.c:98
-#: src/protocols/jabber/presence.c:84 src/protocols/oscar/oscar.c:2842
-#: src/protocols/oscar/oscar.c:4596 src/protocols/oscar/oscar.c:5545
-#: src/protocols/oscar/oscar.c:6146
+#: plugins/docklet/docklet.c:153 src/gtkprefs.c:1576 src/protocols/gg/gg.c:51
+#: src/protocols/irc/msgs.c:187 src/protocols/jabber/jabber.c:960
+#: src/protocols/jabber/jutil.c:99 src/protocols/jabber/presence.c:58
+#: src/protocols/jabber/presence.c:114 src/protocols/oscar/oscar.c:2939
+#: src/protocols/oscar/oscar.c:4748 src/protocols/oscar/oscar.c:5792
+#: src/protocols/oscar/oscar.c:6410
 msgid "Away"
 msgstr "離席"
 
-#: plugins/docklet/docklet.c:159 src/away.c:515
+#: plugins/docklet/docklet.c:159 src/away.c:522
 msgid "Back"
 msgstr "戻る"
 
@@ -163,16 +165,16 @@
 msgid "Mute Sounds"
 msgstr "消音"
 
-#: plugins/docklet/docklet.c:172 src/gtkft.c:581
+#: plugins/docklet/docklet.c:172 src/gtkft.c:605
 msgid "File Transfers"
 msgstr "ファイル転送"
 
 #. And now for the buttons
-#: plugins/docklet/docklet.c:173 src/gtkaccount.c:1918 src/main.c:324
+#: plugins/docklet/docklet.c:173 src/gtkaccount.c:1999 src/main.c:288
 msgid "Accounts"
 msgstr "アカウント"
 
-#: plugins/docklet/docklet.c:174 src/gtkprefs.c:2323 src/main.c:330
+#: plugins/docklet/docklet.c:174 src/gtkprefs.c:2564 src/main.c:294
 msgid "Preferences"
 msgstr "設定"
 
@@ -238,6 +240,7 @@
 #. *< name
 #. *< version
 #. *  summary
+#. *  description
 #: plugins/filectl.c:226 plugins/filectl.c:228
 msgid "Allows you to control Gaim by entering commands in a file."
 msgstr "ファイルにコマンドをいれることによりGaimを制御することができます"
@@ -368,6 +371,176 @@
 "上にドラッグして左にいくことで,前の会話に移動\n"
 "上にドラッグして右にいくことで,次の会話に移動します."
 
+#: plugins/gevolution/add_buddy_dialog.c:136
+#: plugins/gevolution/assoc-buddy.c:76
+#, fuzzy
+msgid "Local Addressbook"
+msgstr "メールアドレス"
+
+#: plugins/gevolution/add_buddy_dialog.c:146
+#: plugins/gevolution/add_buddy_dialog.c:157
+#: plugins/gevolution/assoc-buddy.c:86 plugins/gevolution/assoc-buddy.c:97
+#: src/gtkblist.c:2879 src/gtkprefs.c:851 src/gtkprefs.c:1604
+#: src/protocols/jabber/jabber.c:916
+msgid "None"
+msgstr "なし"
+
+#: plugins/gevolution/add_buddy_dialog.c:190
+#: plugins/gevolution/assoc-buddy.c:180 src/gtkprefs.c:1981
+#: src/gtkroomlist.c:561 src/protocols/jabber/jabber.c:590
+#: src/protocols/msn/msn.c:1367 src/protocols/trepia/trepia.c:401
+msgid "Name"
+msgstr "名前"
+
+#: plugins/gevolution/add_buddy_dialog.c:201
+#, fuzzy
+msgid "Instant Messaging"
+msgstr "Gaim インスタントメッセンジャー"
+
+#. Add the label.
+#: plugins/gevolution/add_buddy_dialog.c:482
+msgid "Select a person from your address book below, or add a new person."
+msgstr ""
+
+#. "Search"
+#: plugins/gevolution/add_buddy_dialog.c:495
+#: plugins/gevolution/assoc-buddy.c:385 src/protocols/oscar/oscar.c:6680
+msgid "Search"
+msgstr "検索"
+
+#: plugins/gevolution/add_buddy_dialog.c:566
+#: plugins/gevolution/new_person_dialog.c:310 src/gtkblist.c:3897
+#: src/gtkblist.c:4225
+msgid "Group:"
+msgstr "グループ:"
+
+#. "New Person" button
+#: plugins/gevolution/add_buddy_dialog.c:592
+#: plugins/gevolution/assoc-buddy.c:488
+#, fuzzy
+msgid "New Person"
+msgstr "<新規ユーザ>"
+
+#. "Select Buddy" button
+#: plugins/gevolution/add_buddy_dialog.c:609
+#, fuzzy
+msgid "Select Buddy"
+msgstr "仲間の改名"
+
+#. Add the label.
+#: plugins/gevolution/assoc-buddy.c:372
+msgid ""
+"Select a person from your address book to add this buddy to, or create a new "
+"person."
+msgstr ""
+
+#. Add the disclosure
+#: plugins/gevolution/assoc-buddy.c:451
+#, fuzzy
+msgid "Show user details"
+msgstr "転送の詳細を表示"
+
+#: plugins/gevolution/assoc-buddy.c:452
+#, fuzzy
+msgid "Hide user details"
+msgstr "転送の詳細を隠す"
+
+#. "Associate Buddy" button
+#: plugins/gevolution/assoc-buddy.c:505
+#, fuzzy
+msgid "_Associate Buddy"
+msgstr "仲間のエイリアス"
+
+#: plugins/gevolution/gevo-util.c:66 plugins/gevolution/gevolution.c:90
+#: src/blist.c:674 src/blist.c:861 src/blist.c:2094 src/gtkblist.c:3722
+#: src/protocols/jabber/roster.c:66 src/protocols/msn/notification.c:792
+msgid "Buddies"
+msgstr "仲間"
+
+#: plugins/gevolution/gevolution.c:214
+msgid "Add to Address Book"
+msgstr ""
+
+#. Configuration frame
+#: plugins/gevolution/gevolution.c:347
+#, fuzzy
+msgid "Evolution Integration Configuration"
+msgstr "トレイアイコンの設定"
+
+#. Label
+#: plugins/gevolution/gevolution.c:350
+msgid "Select all accounts that buddies should be auto-added to."
+msgstr ""
+
+#: plugins/gevolution/gevolution.c:380 src/gtkconn.c:620
+msgid "Account"
+msgstr "アカウント"
+
+#. *< api_version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: plugins/gevolution/gevolution.c:461
+#, fuzzy
+msgid "Evolution Integration"
+msgstr "追加情報"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: plugins/gevolution/gevolution.c:464 plugins/gevolution/gevolution.c:466
+msgid "Provides integration with Ximian Evolution."
+msgstr ""
+
+#: plugins/gevolution/new_person_dialog.c:270
+#, fuzzy
+msgid "Please enter the person's information below."
+msgstr "ユーザの情報を取得する"
+
+#: plugins/gevolution/new_person_dialog.c:274
+msgid "Please enter the buddy's screen name and account type below."
+msgstr ""
+
+#: plugins/gevolution/new_person_dialog.c:294
+#, fuzzy
+msgid "Account type:"
+msgstr "アカウント:"
+
+#: plugins/gevolution/new_person_dialog.c:298
+msgid "Screenname:"
+msgstr "スクリーン名:"
+
+#. Optional Information section
+#: plugins/gevolution/new_person_dialog.c:318
+#, fuzzy
+msgid "Optional information:"
+msgstr "追加情報"
+
+#. Label
+#: plugins/gevolution/new_person_dialog.c:341 src/gtkaccount.c:318
+#: src/protocols/oscar/oscar.c:3174
+msgid "Buddy Icon"
+msgstr "仲間アイコン"
+
+#: plugins/gevolution/new_person_dialog.c:353
+#, fuzzy
+msgid "First name:"
+msgstr "姓"
+
+#: plugins/gevolution/new_person_dialog.c:365
+#, fuzzy
+msgid "Last name:"
+msgstr "姓:"
+
+#: plugins/gevolution/new_person_dialog.c:385
+#, fuzzy
+msgid "E-mail:"
+msgstr "メールアドレス"
+
 #: plugins/history.c:74
 msgid "History"
 msgstr "ヒストリ"
@@ -398,6 +571,7 @@
 #. *< name
 #. *< version
 #. *  summary
+#. *  description
 #: plugins/iconaway.c:83 plugins/iconaway.c:85
 #, fuzzy
 msgid "Iconifies the buddy list and your conversations when you go away."
@@ -572,6 +746,7 @@
 #. *< name
 #. *< version
 #. *  summary
+#. *  description
 #: plugins/notify.c:765 plugins/notify.c:767
 msgid "Provides a variety of ways of notifying you of unread messages."
 msgstr "未読メッセージの通知のさまざまな方法を提供する."
@@ -583,13 +758,14 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/perl/perl.c:524
+#: plugins/perl/perl.c:530
 msgid "Perl Plugin Loader"
 msgstr "Perl プラグインローダ"
 
 #. *< name
 #. *< version
-#: plugins/perl/perl.c:526 plugins/perl/perl.c:527
+#. *< summary
+#: plugins/perl/perl.c:532 plugins/perl/perl.c:533
 msgid "Provides support for loading perl plugins."
 msgstr "Perl プラグインをロードするためのサポートを提供します"
 
@@ -673,6 +849,7 @@
 #. *< name
 #. *< version
 #. *  summary
+#. *  description
 #: plugins/signals-test.c:468 plugins/signals-test.c:470
 #, fuzzy
 msgid "Test to see that all signals are working properly."
@@ -692,6 +869,7 @@
 #. *< name
 #. *< version
 #. *  summary
+#. *  description
 #: plugins/simple.c:34 plugins/simple.c:36
 msgid "Tests to see that most things are working."
 msgstr "大体動いている事を確認するためのテスト"
@@ -735,14 +913,15 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/ssl/ssl-gnutls.c:218
+#: plugins/ssl/ssl-gnutls.c:223
 msgid "GNUTLS"
 msgstr "GNUTLS"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/ssl/ssl-gnutls.c:221 plugins/ssl/ssl-gnutls.c:223
+#. *  description
+#: plugins/ssl/ssl-gnutls.c:226 plugins/ssl/ssl-gnutls.c:228
 msgid "Provides SSL support through GNUTLS."
 msgstr ""
 
@@ -753,14 +932,15 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/ssl/ssl-nss.c:306
+#: plugins/ssl/ssl-nss.c:312
 msgid "NSS"
 msgstr "NSS"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/ssl/ssl-nss.c:309 plugins/ssl/ssl-nss.c:311
+#. *  description
+#: plugins/ssl/ssl-nss.c:315 plugins/ssl/ssl-nss.c:317
 msgid "Provides SSL support through Mozilla NSS."
 msgstr ""
 
@@ -778,11 +958,12 @@
 #. *< name
 #. *< version
 #. *  summary
+#. *  description
 #: plugins/ssl/ssl.c:94 plugins/ssl/ssl.c:96
 msgid "Provides a wrapper around SSL support libraries."
 msgstr ""
 
-#: plugins/statenotify.c:30 src/gtkpounce.c:799
+#: plugins/statenotify.c:30 src/gtkpounce.c:820
 #, c-format
 msgid "%s has gone away."
 msgstr "%s は離席しました"
@@ -816,6 +997,7 @@
 #. *< name
 #. *< version
 #. *  summary
+#. *  description
 #: plugins/statenotify.c:81 plugins/statenotify.c:84
 msgid ""
 "Notifies in a conversation window when a buddy goes or returns from away or "
@@ -824,11 +1006,11 @@
 "相手がアイドル状態になったりもどってきたりしたときに会話ウィンドウに通知しま"
 "す"
 
-#: plugins/tcl/tcl.c:348
+#: plugins/tcl/tcl.c:349
 msgid "Tcl Plugin Loader"
 msgstr "Tcl プラグインローダ"
 
-#: plugins/tcl/tcl.c:350 plugins/tcl/tcl.c:351
+#: plugins/tcl/tcl.c:351 plugins/tcl/tcl.c:352
 msgid "Provides support for loading Tcl plugins"
 msgstr "Tcl プラグインをロードするためのサポートを提供します"
 
@@ -839,14 +1021,15 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/ticker/ticker.c:74 plugins/ticker/ticker.c:330
+#: plugins/ticker/ticker.c:74 plugins/ticker/ticker.c:328
 msgid "Buddy Ticker"
 msgstr "仲間ティッカー"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/ticker/ticker.c:333 plugins/ticker/ticker.c:335
+#. *  description
+#: plugins/ticker/ticker.c:331 plugins/ticker/ticker.c:333
 msgid "A horizontal scrolling version of the buddy list."
 msgstr "水平スクロールするバージョンの仲間リスト"
 
@@ -876,6 +1059,7 @@
 #. *< name
 #. *< version
 #. *  summary
+#. *  description
 #: plugins/timestamp.c:176 plugins/timestamp.c:178
 msgid "Adds iChat-style timestamps to conversations every N minutes."
 msgstr "iChat スタイルのタイムスタンプを N 分おきに付ける。"
@@ -900,7 +1084,7 @@
 msgstr "ウィンドウでスライダバーを表示する (_S)"
 
 #. Buddy List trans options
-#: plugins/win32/transparency/win2ktrans.c:365 src/gtkprefs.c:837
+#: plugins/win32/transparency/win2ktrans.c:365 src/gtkprefs.c:854
 msgid "Buddy List Window"
 msgstr "仲間リストウィンドウ"
 
@@ -922,6 +1106,7 @@
 #. *< name
 #. *< version
 #. *  summary
+#. *  description
 #: plugins/win32/transparency/win2ktrans.c:425
 #: plugins/win32/transparency/win2ktrans.c:427
 msgid ""
@@ -947,8 +1132,8 @@
 msgstr "Gaim を Windows の起動時に開始する (_S)"
 
 #. Buddy List
-#: plugins/win32/winprefs/winprefs.c:366 src/gtkblist.c:2386
-#: src/gtkprefs.c:2256
+#: plugins/win32/winprefs/winprefs.c:366 src/gtkblist.c:2920
+#: src/gtkprefs.c:2480
 msgid "Buddy List"
 msgstr "仲間リスト"
 
@@ -969,8 +1154,8 @@
 msgstr "友達リストウィンドウを常に上に(_K)"
 
 #. Conversations
-#: plugins/win32/winprefs/winprefs.c:386 src/gtkprefs.c:875
-#: src/gtkprefs.c:2257
+#: plugins/win32/winprefs/winprefs.c:386 src/gtkprefs.c:892
+#: src/gtkprefs.c:2481 src/protocols/msn/msn.c:1697
 msgid "Conversations"
 msgstr "会話"
 
@@ -986,16 +1171,16 @@
 msgid "Options specific to Windows Gaim."
 msgstr "Windows Gaim 特有のオプション"
 
-#: src/about.c:57
+#: src/about.c:59
 msgid "About Gaim"
 msgstr "Gaimについて"
 
-#: src/about.c:72
+#: src/about.c:74
 #, c-format
 msgid "<span weight=\"bold\" size=\"larger\">Gaim v%s</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">Gaim v%s</span>"
 
-#: src/about.c:92
+#: src/about.c:94
 msgid ""
 "Gaim is a modular Instant Messaging client capable of using AIM, ICQ, "
 "Yahoo!, MSN, IRC, Jabber, Napster, Zephyr, and Gadu-Gadu all at once.  It is "
@@ -1005,228 +1190,228 @@
 "ICQ、Yahoo!、MSN、IRC、Jabber、Napster、Zephyr、そして GaduGaduを同時にサポー"
 "トしています。Gtk+ で開発され、GPL ライセンスで配布されています。"
 
-#: src/about.c:102
+#: src/about.c:104
 msgid "<FONT SIZE=\"3\">IRC:</FONT> #gaim on irc.freenode.net<BR><BR>"
 msgstr "<FONT SIZE=\"3\">IRC:</FONT> irc.freenode.net の #gaim<BR><BR>"
 
-#: src/about.c:107
+#: src/about.c:109
 msgid "Active Developers"
 msgstr "活発な開発者"
 
-#: src/about.c:108
-msgid "maintainer"
-msgstr "メンテナ"
-
 #: src/about.c:110
+msgid "maintainer"
+msgstr "メンテナ"
+
+#: src/about.c:112
 msgid "lead developer"
 msgstr ""
 
-#: src/about.c:113
+#: src/about.c:115
 msgid "developer & webmaster"
 msgstr ""
 
-#: src/about.c:114
+#: src/about.c:116
 msgid "win32 port"
 msgstr "Win32 への移植"
 
-#: src/about.c:117 src/about.c:118 src/about.c:119
+#: src/about.c:119 src/about.c:120 src/about.c:121
 msgid "developer"
 msgstr "開発者"
 
-#: src/about.c:120
+#: src/about.c:122
 msgid "support"
 msgstr ""
 
-#: src/about.c:127
+#: src/about.c:129
 msgid "Crazy Patch Writers"
 msgstr "クレイジーなパッチ作者"
 
-#: src/about.c:141
+#: src/about.c:143
 msgid "Retired Developers"
 msgstr "引退した開発者"
 
-#: src/about.c:142
+#: src/about.c:144
 msgid "former libfaim maintainer"
 msgstr ""
 
-#: src/about.c:143
+#: src/about.c:145
 msgid "former lead developer"
 msgstr ""
 
-#: src/about.c:146
-msgid "former maintainer"
-msgstr ""
-
-#: src/about.c:147
-msgid "former Jabber developer"
-msgstr ""
-
 #: src/about.c:148
+msgid "former maintainer"
+msgstr ""
+
+#: src/about.c:149
+msgid "former Jabber developer"
+msgstr ""
+
+#: src/about.c:150
 msgid "original author"
 msgstr ""
 
-#: src/about.c:151
+#: src/about.c:153
 msgid "hacker and designated driver [lazy bum]"
 msgstr ""
 
-#: src/about.c:159
+#: src/about.c:161
 msgid "Current Translators"
 msgstr ""
 
-#: src/about.c:160 src/about.c:193
+#: src/about.c:162 src/about.c:195
 msgid "Catalan"
 msgstr "カタロニア語"
 
-#: src/about.c:161 src/about.c:194
+#: src/about.c:163 src/about.c:196
 msgid "Czech"
 msgstr "チェコ語"
 
-#: src/about.c:162
+#: src/about.c:164
 msgid "Danish"
 msgstr "デンマーク語"
 
-#: src/about.c:163
+#: src/about.c:165
 msgid "British English"
 msgstr "イギリス英語"
 
-#: src/about.c:164 src/about.c:195
+#: src/about.c:166 src/about.c:197
 msgid "German"
 msgstr "ドイツ語"
 
-#: src/about.c:165 src/about.c:196
+#: src/about.c:167 src/about.c:198
 msgid "Spanish"
 msgstr "スペイン語"
 
-#: src/about.c:166 src/about.c:197
+#: src/about.c:168 src/about.c:199
 msgid "Finnish"
 msgstr "フィンランド語"
 
-#: src/about.c:167 src/about.c:198
+#: src/about.c:169 src/about.c:200
 msgid "French"
 msgstr "フランス語"
 
-#: src/about.c:168
+#: src/about.c:170
 msgid "Hindi"
 msgstr "ヒンディー語"
 
-#: src/about.c:169
+#: src/about.c:171
 msgid "Hungarian"
 msgstr "ハンガリー語"
 
-#: src/about.c:170 src/about.c:200
+#: src/about.c:172 src/about.c:202
 msgid "Italian"
 msgstr "イタリア語"
 
-#: src/about.c:171 src/about.c:202
+#: src/about.c:173 src/about.c:204
 msgid "Korean"
 msgstr "韓国語"
 
-#: src/about.c:172
+#: src/about.c:174
 msgid "Dutch; Flemish"
 msgstr "オランダ語"
 
-#: src/about.c:173
+#: src/about.c:175
 msgid "Norwegian"
 msgstr "ノルウェー語"
 
-#: src/about.c:174 src/about.c:203
+#: src/about.c:176 src/about.c:205
 msgid "Polish"
 msgstr "ポーランド語"
 
-#: src/about.c:175
-msgid "Portuguese"
-msgstr "ポルトガル語"
-
-#: src/about.c:176
-msgid "Portuguese-Brazil"
-msgstr ""
-
 #: src/about.c:177
-msgid "Romanian"
-msgstr "ルーマニア語"
-
-#: src/about.c:178 src/about.c:204
-msgid "Russian"
-msgstr "ロシア語"
+msgid "Portuguese"
+msgstr "ポルトガル語"
+
+#: src/about.c:178
+msgid "Portuguese-Brazil"
+msgstr ""
 
 #: src/about.c:179
-msgid "Serbian"
-msgstr "セルビア語"
+msgid "Romanian"
+msgstr "ルーマニア語"
 
 #: src/about.c:180 src/about.c:206
+msgid "Russian"
+msgstr "ロシア語"
+
+#: src/about.c:181
+msgid "Serbian"
+msgstr "セルビア語"
+
+#: src/about.c:182 src/about.c:208
 msgid "Swedish"
 msgstr "スウェーデン語"
 
-#: src/about.c:181
+#: src/about.c:183
 msgid "Vietnamese"
 msgstr "ベトナム語"
 
-#: src/about.c:181
+#: src/about.c:183
 msgid "Gnome Vi Team"
 msgstr ""
 
-#: src/about.c:182
+#: src/about.c:184
 msgid "Simplified Chinese"
 msgstr "中国語(簡体字)"
 
-#: src/about.c:183
+#: src/about.c:185
 msgid "Traditional Chinese"
 msgstr "中国語(繁体字)"
 
-#: src/about.c:190
-msgid "Past Translators"
-msgstr ""
-
-#: src/about.c:191
-msgid "Amharic"
-msgstr ""
-
 #: src/about.c:192
+msgid "Past Translators"
+msgstr ""
+
+#: src/about.c:193
+msgid "Amharic"
+msgstr ""
+
+#: src/about.c:194
 msgid "Bulgarian"
 msgstr "ブルガリア語"
 
-#: src/about.c:199
-msgid "Hebrew"
-msgstr "ヘブライ語"
-
 #: src/about.c:201
+msgid "Hebrew"
+msgstr "ヘブライ語"
+
+#: src/about.c:203
 msgid "Japanese"
 msgstr "日本語"
 
-#: src/about.c:205
+#: src/about.c:207
 msgid "Slovak"
 msgstr "スロバキア語"
 
-#: src/about.c:207
+#: src/about.c:209
 msgid "Chinese"
 msgstr "中国語"
 
-#: src/account.c:272 src/protocols/jabber/jabber.c:1017
+#: src/account.c:275 src/protocols/jabber/jabber.c:1001
 msgid "New passwords do not match."
 msgstr "新しいパスワードはマッチしません"
 
-#: src/account.c:280
+#: src/account.c:283
 msgid "Fill out all fields completely."
 msgstr "全てを入力してください"
 
-#: src/account.c:305
+#: src/account.c:308
 msgid "Original password"
 msgstr "オリジナルパスワード"
 
-#: src/account.c:311
+#: src/account.c:314
 msgid "New password"
 msgstr "新しいパスワード"
 
-#: src/account.c:317
+#: src/account.c:320
 msgid "New password (again)"
 msgstr "新しいパスワード(再入力)"
 
-#: src/account.c:322
+#: src/account.c:325
 #, c-format
 msgid "Change password for %s"
 msgstr "%s のパスワードを変更"
 
-#: src/account.c:330
+#: src/account.c:333
 #, fuzzy
 msgid "Please enter your current password and your new password."
 msgstr ""
@@ -1236,81 +1421,76 @@
 #. *
 #. * A wrapper for gaim_request_action() that uses OK and Cancel buttons.
 #.
-#: src/account.c:333 src/connection.c:193 src/dialogs.c:1488
-#: src/dialogs.c:1505 src/dialogs.c:1524 src/gtkblist.c:1742
-#: src/gtkrequest.c:190 src/protocols/jabber/jabber.c:1062
-#: src/protocols/jabber/xdata.c:334 src/protocols/msn/msn.c:181
-#: src/protocols/msn/msn.c:192 src/protocols/msn/msn.c:203
-#: src/protocols/msn/msn.c:214 src/protocols/oscar/oscar.c:2453
-#: src/protocols/oscar/oscar.c:2533 src/protocols/oscar/oscar.c:6196
-#: src/protocols/oscar/oscar.c:6292 src/protocols/oscar/oscar.c:6341
-#: src/protocols/oscar/oscar.c:6423 src/protocols/yahoo/yahoo.c:2398
-#: src/protocols/yahoo/yahoo.c:2406 src/request.h:1018
+#: src/account.c:336 src/connection.c:198 src/dialogs.c:472 src/dialogs.c:528
+#: src/gtkblist.c:2278 src/gtkrequest.c:225 src/protocols/jabber/jabber.c:1046
+#: src/protocols/jabber/xdata.c:337 src/protocols/msn/msn.c:182
+#: src/protocols/msn/msn.c:193 src/protocols/msn/msn.c:204
+#: src/protocols/msn/msn.c:215 src/protocols/oscar/oscar.c:2549
+#: src/protocols/oscar/oscar.c:2630 src/protocols/oscar/oscar.c:6470
+#: src/protocols/oscar/oscar.c:6566 src/protocols/oscar/oscar.c:6615
+#: src/protocols/oscar/oscar.c:6697 src/protocols/yahoo/yahoo.c:2500
+#: src/protocols/yahoo/yahoo.c:2508 src/request.h:1237
 msgid "OK"
 msgstr "了解"
 
-#: src/account.c:334 src/account.c:368 src/connection.c:194 src/dialogs.c:351
-#: src/dialogs.c:363 src/dialogs.c:376 src/dialogs.c:397 src/dialogs.c:1322
-#: src/dialogs.c:1489 src/dialogs.c:1506 src/dialogs.c:1525
-#: src/gtkaccount.c:1612 src/gtkaccount.c:2081 src/gtkblist.c:1743
-#: src/gtkblist.c:3701 src/gtkconn.c:167 src/gtkprivacy.c:569
-#: src/gtkprivacy.c:582 src/gtkprivacy.c:607 src/gtkprivacy.c:618
-#: src/gtkrequest.c:191 src/protocols/icq/gaim_icq.c:277
-#: src/protocols/jabber/buddy.c:512 src/protocols/jabber/jabber.c:687
-#: src/protocols/jabber/jabber.c:1063 src/protocols/jabber/xdata.c:335
-#: src/protocols/msn/msn.c:182 src/protocols/msn/msn.c:193
-#: src/protocols/msn/msn.c:204 src/protocols/msn/msn.c:215
-#: src/protocols/msn/msn.c:228 src/protocols/oscar/oscar.c:2417
-#: src/protocols/oscar/oscar.c:2454 src/protocols/oscar/oscar.c:2489
-#: src/protocols/oscar/oscar.c:2534 src/protocols/oscar/oscar.c:6024
-#: src/protocols/oscar/oscar.c:6197 src/protocols/oscar/oscar.c:6293
-#: src/protocols/oscar/oscar.c:6342 src/protocols/oscar/oscar.c:6407
-#: src/protocols/oscar/oscar.c:6424 src/protocols/trepia/trepia.c:347
-#: src/protocols/yahoo/yahoo.c:2399 src/protocols/yahoo/yahoo.c:2407
-#: src/request.h:1018 src/request.h:1028
+#: src/account.c:337 src/account.c:371 src/connection.c:199 src/dialogs.c:306
+#: src/dialogs.c:318 src/dialogs.c:331 src/dialogs.c:352 src/dialogs.c:473
+#: src/dialogs.c:529 src/dialogs.c:837 src/dialogs.c:858 src/dialogs.c:875
+#: src/dialogs.c:894 src/gtkaccount.c:1673 src/gtkaccount.c:2164
+#: src/gtkblist.c:2279 src/gtkblist.c:4264 src/gtkconn.c:168
+#: src/gtkimhtmltoolbar.c:366 src/gtkprivacy.c:561 src/gtkprivacy.c:574
+#: src/gtkprivacy.c:599 src/gtkprivacy.c:610 src/gtkrequest.c:226
+#: src/protocols/icq/gaim_icq.c:277 src/protocols/jabber/buddy.c:514
+#: src/protocols/jabber/chat.c:691 src/protocols/jabber/jabber.c:659
+#: src/protocols/jabber/jabber.c:1047 src/protocols/jabber/xdata.c:338
+#: src/protocols/msn/msn.c:183 src/protocols/msn/msn.c:194
+#: src/protocols/msn/msn.c:205 src/protocols/msn/msn.c:216
+#: src/protocols/msn/msn.c:229 src/protocols/oscar/oscar.c:2513
+#: src/protocols/oscar/oscar.c:2550 src/protocols/oscar/oscar.c:2586
+#: src/protocols/oscar/oscar.c:2631 src/protocols/oscar/oscar.c:6289
+#: src/protocols/oscar/oscar.c:6471 src/protocols/oscar/oscar.c:6567
+#: src/protocols/oscar/oscar.c:6616 src/protocols/oscar/oscar.c:6681
+#: src/protocols/oscar/oscar.c:6698 src/protocols/trepia/trepia.c:347
+#: src/protocols/yahoo/yahoo.c:2501 src/protocols/yahoo/yahoo.c:2509
+#: src/request.h:1237 src/request.h:1247
 msgid "Cancel"
 msgstr "取消"
 
-#: src/account.c:360
+#: src/account.c:363
 #, fuzzy, c-format
 msgid "Change user information for %s"
 msgstr "ユーザの情報を取得する"
 
-#: src/account.c:367 src/dialogs.c:1310 src/gtkrequest.c:197
-#: src/protocols/jabber/buddy.c:511 src/protocols/trepia/trepia.c:346
+#: src/account.c:370 src/dialogs.c:825 src/gtkrequest.c:232
+#: src/protocols/jabber/buddy.c:513 src/protocols/trepia/trepia.c:346
 msgid "Save"
 msgstr "保存"
 
-#: src/away.c:208
+#: src/away.c:210
 msgid "Away!"
 msgstr "離席!"
 
-#: src/away.c:269
+#: src/away.c:275
 msgid "I'm Back!"
 msgstr "帰って来ました!"
 
-#: src/away.c:368
+#: src/away.c:375
 msgid "New Away Message"
 msgstr "新しい離席メッセージ"
 
-#: src/away.c:388
+#: src/away.c:395
 msgid "Remove Away Message"
 msgstr "離席メッセージの削除"
 
-#: src/away.c:583
+#: src/away.c:590
 msgid "Set All Away"
 msgstr "全部離席する"
 
-#: src/blist.c:576 src/gtkprefs.c:2259
+#: src/blist.c:579 src/gtkprefs.c:2483
 msgid "Chats"
 msgstr "チャット"
 
-#: src/blist.c:671 src/blist.c:858 src/blist.c:2077 src/gtkblist.c:3168
-#: src/protocols/jabber/roster.c:66 src/protocols/msn/notification.c:1168
-msgid "Buddies"
-msgstr "仲間"
-
-#: src/blist.c:1158
+#: src/blist.c:1181
 #, c-format
 msgid ""
 "%d buddy from group %s was not removed because its account was not logged "
@@ -1325,144 +1505,117 @@
 "%d の仲間が %s から削除できませんでした.そのアカウントはログインしていません"
 "でした.その仲間とグループは削除していません.\n"
 
-#: src/blist.c:1167
+#: src/blist.c:1190
 msgid "Group not removed"
 msgstr "グループが削除されません"
 
-#: src/blist.c:1217 src/gtkaccount.c:158 src/gtkutils.c:850
-#: src/protocols/jabber/auth.c:135 src/protocols/jabber/buddy.c:568
+#: src/blist.c:1240 src/gtkaccount.c:162 src/gtkft.c:153 src/gtkutils.c:860
+#: src/protocols/jabber/buddy.c:569
 msgid "Unknown"
 msgstr "不明"
 
-#: src/blist.c:1544
+#: src/blist.c:1567
 msgid "Invalid Groupname"
 msgstr "無効なグループ名"
 
-#: src/blist.c:2194
+#: src/blist.c:2209
 msgid ""
 "An error was encountered parsing your buddy list.  It has not been loaded."
 msgstr ""
 "あなたの仲間リストを解析しているときにエラーが起きました.内容を読み込んでい"
 "ません."
 
-#: src/blist.c:2196
+#: src/blist.c:2211
 msgid "Buddy List Error"
 msgstr "仲間リストエラー"
 
-#: src/buddy_chat.c:212 src/gtkblist.c:3591
-msgid ""
-"You are not currently signed on with any protocols that have the ability to "
-"chat."
-msgstr "チャットできる機能がついているプロトコルでサインオンしていません."
-
-#: src/buddy_chat.c:223
-msgid "Join a Chat"
-msgstr "チャットへ加入"
-
-#: src/buddy_chat.c:225 src/gtkblist.c:926
-msgid "_Join"
-msgstr "加入 (_J)"
-
-#: src/buddy_chat.c:242
-#, fuzzy
-msgid ""
-"Please enter the appropriate information about the chat you would like to "
-"join.\n"
-msgstr ""
-"以下の人のエイリアスと仲間リストに追加するチャットの情報を入力してくださ"
-"い.\n"
-
-#: src/buddy_chat.c:253 src/dialogs.c:587 src/dialogs.c:662
-#: src/gtkpounce.c:358
-msgid "_Account:"
-msgstr "アカウント (_A):"
-
-#: src/connection.c:117 src/connection.c:165
+#: src/connection.c:119 src/connection.c:170
 #, fuzzy, c-format
 msgid "Missing protocol plugin for %s"
 msgstr "MSNプロトコルプラグイン"
 
-#: src/connection.c:122
+#: src/connection.c:124
 msgid "Registration Error"
 msgstr "登録エラー"
 
-#: src/connection.c:170
+#: src/connection.c:175
 msgid "Connection Error"
 msgstr "接続エラー"
 
-#: src/connection.c:191
+#: src/connection.c:196
 #, fuzzy, c-format
 msgid "Enter password for %s"
 msgstr "パスワード入力"
 
-#: src/conversation.c:297
+#: src/conversation.c:296
 msgid "Unable to send message. The message is too large."
 msgstr "メッセージを送れません。このメッセージは大きすぎます."
 
-#: src/conversation.c:305
+#: src/conversation.c:304
 msgid "Unable to send message."
 msgstr "メッセージを送れません."
 
-#: src/conversation.c:1898
+#: src/conversation.c:1968
 #, c-format
 msgid "%s entered the room."
 msgstr "%sは部屋に入りました"
 
-#: src/conversation.c:1901
+#: src/conversation.c:1971
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>] は部屋に入りました"
 
-#: src/conversation.c:1986
+#: src/conversation.c:2063
+#, fuzzy, c-format
+msgid "You are now known as %s"
+msgstr "%sは%sとして知られています"
+
+#: src/conversation.c:2066
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%sは%sとして知られています"
 
-#: src/conversation.c:2028
+#: src/conversation.c:2109
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%sは部屋(%s)を去りました"
 
-#: src/conversation.c:2030
+#: src/conversation.c:2111
 #, c-format
 msgid "%s left the room."
 msgstr "%sは部屋を去りました"
 
-#: src/conversation.c:2103
+#: src/conversation.c:2184
 #, fuzzy, c-format
 msgid "(+%d more)"
 msgstr "(%d メッセージ)"
 
-#: src/conversation.c:2105
+#: src/conversation.c:2186
 #, c-format
 msgid " left the room (%s)."
 msgstr "は部屋(%s)を去りました"
 
-#: src/conversation.c:2387
+#: src/conversation.c:2466
 msgid "Last created window"
 msgstr "最後に作成したウィンドウ"
 
-#: src/conversation.c:2389
+#: src/conversation.c:2468 src/gtkprefs.c:1380
 msgid "New window"
 msgstr "新しいウィンドウ"
 
-#: src/conversation.c:2391
+#: src/conversation.c:2470
 msgid "By group"
 msgstr "グループによる"
 
-#: src/conversation.c:2393
+#: src/conversation.c:2472
 msgid "By account"
 msgstr "アカウントによる"
 
-#: src/dialogs.c:200
+#: src/dialogs.c:155
 msgid "Warn User"
 msgstr "ユーザを警告"
 
-#: src/dialogs.c:203
-msgid "_Warn"
-msgstr "警告 (_W)"
-
-#: src/dialogs.c:219
+#: src/dialogs.c:174
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Warn %s?</span>\n"
@@ -1474,36 +1627,36 @@
 "\n"
 "%s の警告レベルを増加し、彼らが厳しい評価制限の対象になるようにします。\n"
 
-#: src/dialogs.c:228
+#: src/dialogs.c:183
 msgid "Warn _anonymously?"
 msgstr "匿名で警告しますか? (_A)"
 
-#: src/dialogs.c:235
+#: src/dialogs.c:190
 msgid "<b>Anonymous warnings are less severe.</b>"
 msgstr "<b>匿名の警告はそれほど荒くありません</b>"
 
-#: src/dialogs.c:347
+#: src/dialogs.c:302
 #, c-format
 msgid ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr "%s を仲間リストから削除しようとしています.実行しますか?"
 
-#: src/dialogs.c:349 src/dialogs.c:350
+#: src/dialogs.c:304 src/dialogs.c:305
 msgid "Remove Buddy"
 msgstr "仲間の削除"
 
-#: src/dialogs.c:359
+#: src/dialogs.c:314
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
 "continue?"
 msgstr "チャット %s を仲間リストから削除しようとしています.実行しますか?"
 
-#: src/dialogs.c:361 src/dialogs.c:362
+#: src/dialogs.c:316 src/dialogs.c:317
 msgid "Remove Chat"
 msgstr "チャットを削除"
 
-#: src/dialogs.c:371
+#: src/dialogs.c:326
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
@@ -1512,11 +1665,11 @@
 "グループ %s とそのメンバを仲間リストから削除しようとしています.実行します"
 "か? "
 
-#: src/dialogs.c:374 src/dialogs.c:375
+#: src/dialogs.c:329 src/dialogs.c:330
 msgid "Remove Group"
 msgstr "グループ削除"
 
-#: src/dialogs.c:392
+#: src/dialogs.c:347
 #, fuzzy, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddies from "
@@ -1525,130 +1678,112 @@
 "グループ %s とそのメンバを仲間リストから削除しようとしています.実行します"
 "か? "
 
-#: src/dialogs.c:395 src/dialogs.c:396
+#: src/dialogs.c:350 src/dialogs.c:351
 #, fuzzy
 msgid "Remove Contact"
 msgstr "チャットを削除"
 
-#: src/dialogs.c:541
+#: src/dialogs.c:454 src/dialogs.c:510
+#, fuzzy
+msgid "_Screen name"
+msgstr "スクリーン名 (_S)"
+
+#: src/dialogs.c:460 src/dialogs.c:516
+#, fuzzy
+msgid "_Account"
+msgstr "アカウント (_A):"
+
+#: src/dialogs.c:467
 #, fuzzy
 msgid "New Instant Message"
 msgstr "新しいIM"
 
-#: src/dialogs.c:559
-msgid "Please enter the screenname of the person you would like to IM.\n"
+#: src/dialogs.c:469
+#, fuzzy
+msgid "Please enter the screen name of the person you would like to IM."
 msgstr "IM したい相手のスクリーン名を入力してください。\n"
 
-#: src/dialogs.c:571 src/dialogs.c:646
-msgid "_Screenname:"
-msgstr "スクリーン名 (_S):"
-
-#: src/dialogs.c:616
+#: src/dialogs.c:523
 msgid "Get User Info"
 msgstr "ユーザ情報の取得"
 
-#: src/dialogs.c:634
-msgid ""
-"Please enter the screenname of the person whose info you would like to "
-"view.\n"
+#: src/dialogs.c:525
+#, fuzzy
+msgid ""
+"Please enter the screen name of the person whose info you would like to view."
 msgstr "情報を見たい相手のスクリーン名を入力してください。\n"
 
-#: src/dialogs.c:740
-msgid "Insert Link"
-msgstr "リンクの挿入"
-
-#: src/dialogs.c:742
-msgid "_Insert"
-msgstr "挿入 (_I)"
-
-#: src/dialogs.c:767
-msgid ""
-"Please enter the URL and description of the link that you want to insert.  "
-"The description is optional.\n"
-msgstr ""
-"挿入したいリンクのURLと説明を入力してください.\n"
-"説明は必須ではありません.\n"
-
-#: src/dialogs.c:780
-msgid "_URL:"
-msgstr "URL (_U):"
-
-#: src/dialogs.c:793
-msgid "_Description:"
-msgstr "概要 (_D):"
-
-#: src/dialogs.c:924 src/dialogs.c:941
+#: src/dialogs.c:553 src/gtkimhtmltoolbar.c:209
 msgid "Select Text Color"
 msgstr "文字色選択"
 
-#: src/dialogs.c:976 src/dialogs.c:993
+#: src/dialogs.c:581 src/gtkimhtmltoolbar.c:279
 msgid "Select Background Color"
 msgstr "背景色選択"
 
-#: src/dialogs.c:1078 src/dialogs.c:1104
+#: src/dialogs.c:620 src/gtkimhtmltoolbar.c:133
 msgid "Select Font"
 msgstr "フォントの選択"
 
-#: src/dialogs.c:1168
+#: src/dialogs.c:682
 msgid "You cannot save an away message with a blank title"
 msgstr "空白の題名では離席メッセージを保存できません"
 
 # メッセージに題名をつけるか、保存せずに "立ち去る" を選択してください。
-#: src/dialogs.c:1170
+#: src/dialogs.c:684
 msgid ""
 "Please give the message a title, or choose \"Use\" to use without saving."
 msgstr ""
 "メッセージに題名をつけるか、保存せずに \"利用する\" を選択してください。"
 
-#: src/dialogs.c:1180
+#: src/dialogs.c:694
 msgid "You cannot create an empty away message"
 msgstr "空のメッセージを作れません"
 
-#: src/dialogs.c:1242
+#: src/dialogs.c:756
 msgid "New away message"
 msgstr "新しい離席メッセージ"
 
-#: src/dialogs.c:1263
+#: src/dialogs.c:777
 msgid "Away title: "
 msgstr "離席メッセージ 題名:"
 
-#: src/dialogs.c:1314
+#: src/dialogs.c:829
 msgid "Save & Use"
 msgstr "保存して使う"
 
-#: src/dialogs.c:1318
+#: src/dialogs.c:833
 msgid "Use"
 msgstr "使う"
 
-#. show everything
-#: src/dialogs.c:1467
-msgid "Smile!"
-msgstr "笑え!"
-
-#: src/dialogs.c:1485
+#: src/dialogs.c:854
 msgid "Alias Chat"
 msgstr "チャットのエイリアス"
 
-#: src/dialogs.c:1486
+#: src/dialogs.c:855
 msgid "Enter an alias for this chat."
 msgstr "チャットの別名を入力してください."
 
-#: src/dialogs.c:1502
+#: src/dialogs.c:857 src/dialogs.c:874 src/dialogs.c:893 src/gtkrequest.c:233
+msgid "Alias"
+msgstr "エイリアス"
+
+#: src/dialogs.c:871
 #, fuzzy
 msgid "Alias Contact"
 msgstr "エイリアス"
 
-#: src/dialogs.c:1503
+#: src/dialogs.c:872
 #, fuzzy
 msgid "Enter an alias for this contact."
 msgstr "チャットの別名を入力してください.\n"
 
-#: src/dialogs.c:1520
+#: src/dialogs.c:889
 #, fuzzy, c-format
 msgid "Enter an alias for %s."
 msgstr "%sの別名を入力してください."
 
-#: src/dialogs.c:1522
+#: src/dialogs.c:891
 msgid "Alias Buddy"
 msgstr "仲間のエイリアス"
 
@@ -1662,12 +1797,12 @@
 msgid "%s was not found.\n"
 msgstr "%s が見つかりません。\n"
 
-#: src/ft.c:754
+#: src/ft.c:769
 #, c-format
 msgid "File transfer to %s aborted.\n"
 msgstr "%s へのファイル転送が中断されました.\n"
 
-#: src/ft.c:756
+#: src/ft.c:771
 #, c-format
 msgid "File transfer from %s aborted.\n"
 msgstr "%s からのファイル転送が中断されました.\n"
@@ -1706,16 +1841,17 @@
 msgstr "Gaimは動いていません(セッション0)\n"
 
 #: src/gaim-remote.c:204
+#, fuzzy
 msgid ""
 "\n"
 "Using AIM: URIs:\n"
-"Sending an IM to a screenname:\n"
+"Sending an IM to a screen name:\n"
 "\tgaim-remote uri 'aim:goim?screenname=Penguin&message=hello+world'\n"
-"In this case, 'Penguin' is the screenname we wish to IM, and 'hello world'\n"
+"In this case, 'Penguin' is the screen name we wish to IM, and 'hello world'\n"
 "is the message to be sent.  '+' must be used in place of spaces.\n"
 "Please note the quoting used above - if you run this from a shell the '&'\n"
 "needs to be escaped, or the command will stop at that point.\n"
-"Also,the following will just open a conversation window to a screenname,\n"
+"Also,the following will just open a conversation window to a screen name,\n"
 "with no message:\n"
 "\tgaim-remote uri 'aim:goim?screenname=Penguin'\n"
 "\n"
@@ -1758,32 +1894,32 @@
 "実行中のGaimを閉じる\n"
 
 #. for people like myself, who are too lazy to add an away msg :)
-#: src/gaimrc.c:44
+#: src/gaimrc.c:46
 msgid "sorry, i ran out for a while. bbl"
 msgstr "ちょっとしばらくいないです.もうすぐ帰ります"
 
-#: src/gaimrc.c:373 src/gaimrc.c:1450
+#: src/gaimrc.c:375 src/gaimrc.c:1451
 msgid "boring default"
 msgstr "おもしろくもないデフォルト"
 
-#: src/gaimrc.c:1259 src/gtkblist.c:2348
+#: src/gaimrc.c:1260 src/gtkblist.c:2881
 msgid "Alphabetical"
 msgstr "アルファベット順"
 
-#: src/gaimrc.c:1261 src/gtkblist.c:2349
+#: src/gaimrc.c:1262 src/gtkblist.c:2882
 msgid "By status"
 msgstr "状態順"
 
-#: src/gaimrc.c:1263 src/gtkblist.c:2350
+#: src/gaimrc.c:1264 src/gtkblist.c:2883
 msgid "By log size"
 msgstr "ログのサイズで"
 
-#: src/gaimrc.c:1548
+#: src/gaimrc.c:1549
 #, c-format
 msgid "Could not open config file %s."
 msgstr "設定ファイル%sを開けません"
 
-#: src/gtkaccount.c:285
+#: src/gtkaccount.c:287
 #, c-format
 msgid ""
 "<b>File:</b> %s\n"
@@ -1791,178 +1927,174 @@
 "<b>Image size:</b> %dx%d"
 msgstr ""
 
-#: src/gtkaccount.c:316 src/protocols/oscar/oscar.c:3077
-msgid "Buddy Icon"
-msgstr "仲間アイコン"
-
 #. Build the login options frame.
-#: src/gtkaccount.c:367
+#: src/gtkaccount.c:382
 msgid "Login Options"
 msgstr "ログインオプション"
 
-#: src/gtkaccount.c:384
+#: src/gtkaccount.c:399
 msgid "Protocol:"
 msgstr "プロトコル:"
 
-#: src/gtkaccount.c:389
-msgid "Screenname:"
+#: src/gtkaccount.c:404 src/gtkblist.c:3869
+msgid "Screen Name:"
 msgstr "スクリーン名:"
 
-#: src/gtkaccount.c:462 src/main.c:308
+#: src/gtkaccount.c:477
 msgid "Password:"
 msgstr "パスワード:"
 
-#: src/gtkaccount.c:467 src/gtkblist.c:3328 src/gtkblist.c:3650
+#: src/gtkaccount.c:482 src/gtkblist.c:3883 src/gtkblist.c:4211
 msgid "Alias:"
 msgstr "エイリアス:"
 
-#: src/gtkaccount.c:471
+#: src/gtkaccount.c:486
 msgid "Remember password"
 msgstr "パスワードを覚える"
 
 #. Build the user options frame.
-#: src/gtkaccount.c:525
+#: src/gtkaccount.c:540
 msgid "User Options"
 msgstr "ユーザオプション"
 
-#: src/gtkaccount.c:538
+#: src/gtkaccount.c:553
 msgid "New mail notifications"
 msgstr "新しいメール通知"
 
-#: src/gtkaccount.c:547
+#: src/gtkaccount.c:562
 msgid "Buddy icon file:"
 msgstr "仲間アイコンファイル:"
 
-#: src/gtkaccount.c:556
+#: src/gtkaccount.c:572
 msgid "_Browse"
 msgstr "閲覧 (_B)"
 
-#: src/gtkaccount.c:562
+#: src/gtkaccount.c:578
 msgid "_Reset"
 msgstr "リセット (_R)"
 
 #. Build the protocol options frame.
-#: src/gtkaccount.c:624
+#: src/gtkaccount.c:640
 #, c-format
 msgid "%s Options"
 msgstr "%s オプション"
 
 #. Use Global Proxy Settings
-#: src/gtkaccount.c:739
+#: src/gtkaccount.c:772
 msgid "Use Global Proxy Settings"
 msgstr "グローバルなプロキシ設定を使う"
 
 #. No Proxy
-#: src/gtkaccount.c:746
+#: src/gtkaccount.c:779
 msgid "No Proxy"
 msgstr "プロキシなし"
 
 #. HTTP
-#: src/gtkaccount.c:753
+#: src/gtkaccount.c:786
 msgid "HTTP"
 msgstr "HTTP"
 
 #. SOCKS 4
-#: src/gtkaccount.c:760
+#: src/gtkaccount.c:793
 msgid "SOCKS 4"
 msgstr "SOCKS 4"
 
 #. SOCKS 5
-#: src/gtkaccount.c:767
+#: src/gtkaccount.c:800
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
 #. Use Environmental Settings
-#: src/gtkaccount.c:774 src/gtkprefs.c:1091
+#: src/gtkaccount.c:807 src/gtkprefs.c:1181
 #, fuzzy
 msgid "Use Environmental Settings"
 msgstr "グローバルなプロキシ設定を使う"
 
-#: src/gtkaccount.c:807
+#: src/gtkaccount.c:840
 msgid "you can see the butterflies mating"
 msgstr ""
 
-#: src/gtkaccount.c:811
+#: src/gtkaccount.c:844
 msgid "If you look real closely"
 msgstr ""
 
-#: src/gtkaccount.c:827
+#: src/gtkaccount.c:860
 msgid "Proxy Options"
 msgstr "プロキシオプション"
 
-#: src/gtkaccount.c:843 src/gtkprefs.c:1085
+#: src/gtkaccount.c:876 src/gtkprefs.c:1175
 msgid "Proxy _type:"
 msgstr "プロキシの種類 (_T):"
 
-#: src/gtkaccount.c:852 src/gtkprefs.c:1115
+#: src/gtkaccount.c:885 src/gtkprefs.c:1205
 msgid "_Host:"
 msgstr "ホスト名 (_H):"
 
-#: src/gtkaccount.c:856 src/gtkprefs.c:1132
+#: src/gtkaccount.c:889 src/gtkprefs.c:1223
 msgid "_Port:"
 msgstr "ポート番号 (_P):"
 
-#: src/gtkaccount.c:864
+#: src/gtkaccount.c:897
 msgid "_Username:"
 msgstr "ユーザ名 (_U):"
 
-#: src/gtkaccount.c:869 src/gtkprefs.c:1167
+#: src/gtkaccount.c:902 src/gtkprefs.c:1260
 msgid "Pa_ssword:"
 msgstr "パスワード (_S):"
 
-#: src/gtkaccount.c:1208
+#: src/gtkaccount.c:1260
 #, fuzzy
 msgid "Add Account"
 msgstr "アカウント:"
 
-#: src/gtkaccount.c:1210
+#: src/gtkaccount.c:1262
 msgid "Modify Account"
 msgstr "アカウント修正"
 
 #. Add the disclosure
-#: src/gtkaccount.c:1234
+#: src/gtkaccount.c:1286
 msgid "Show more options"
 msgstr "他のオプションも表示"
 
-#: src/gtkaccount.c:1235
+#: src/gtkaccount.c:1287
 msgid "Show fewer options"
 msgstr "少ないオプションを表示"
 
 #. Register button
-#: src/gtkaccount.c:1262 src/protocols/jabber/jabber.c:686
+#: src/gtkaccount.c:1314 src/protocols/jabber/jabber.c:658
 msgid "Register"
 msgstr "登録"
 
-#: src/gtkaccount.c:1607
+#: src/gtkaccount.c:1668
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "本当に%sを削除したいのですか?"
 
-#: src/gtkaccount.c:1611 src/gtkrequest.c:194
+#: src/gtkaccount.c:1672 src/gtkrequest.c:229
 msgid "Delete"
 msgstr "削除"
 
-#: src/gtkaccount.c:1725
+#: src/gtkaccount.c:1786
 msgid "Screen Name"
 msgstr "スクリーン名"
 
-#: src/gtkaccount.c:1748 src/protocols/jabber/jabber.c:963
-#: src/protocols/oscar/oscar.c:2848 src/protocols/oscar/oscar.c:4594
-#: src/protocols/oscar/oscar.c:6145 src/protocols/yahoo/yahoo.c:2193
-#: src/protocols/zephyr/zephyr.c:886 src/protocols/zephyr/zephyr.c:896
+#: src/gtkaccount.c:1809 src/protocols/jabber/jabber.c:958
+#: src/protocols/oscar/oscar.c:2945 src/protocols/oscar/oscar.c:4746
+#: src/protocols/oscar/oscar.c:6409 src/protocols/yahoo/yahoo.c:2295
+#: src/protocols/zephyr/zephyr.c:1176 src/protocols/zephyr/zephyr.c:1186
 msgid "Online"
 msgstr "オンライン"
 
-#: src/gtkaccount.c:1766
+#: src/gtkaccount.c:1827
 msgid "Protocol"
 msgstr "プロトコル:"
 
-#: src/gtkaccount.c:2056
+#: src/gtkaccount.c:2139
 #, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s%s"
 msgstr "%s%s%s%s は %sを仲間にしました%s%s %s"
 
-#: src/gtkaccount.c:2070
+#: src/gtkaccount.c:2153
 msgid ""
 "\n"
 "\n"
@@ -1972,195 +2104,233 @@
 "\n"
 "彼らを仲間リストに追加しますか?"
 
-#: src/gtkaccount.c:2074
+#: src/gtkaccount.c:2157
 msgid "Information"
 msgstr "情報"
 
-#: src/gtkaccount.c:2078
+#: src/gtkaccount.c:2161
 msgid "Add buddy to your list?"
 msgstr "リストに仲間を追加しますか?"
 
 #. Add button
-#: src/gtkaccount.c:2080 src/gtkblist.c:3700 src/gtkconv.c:1256
-#: src/gtkconv.c:3232 src/gtkconv.c:3323 src/gtkrequest.c:195
-#: src/protocols/icq/gaim_icq.c:277 src/protocols/oscar/oscar.c:2690
+#: src/gtkaccount.c:2163 src/gtkblist.c:4263 src/gtkconv.c:1072
+#: src/gtkconv.c:3289 src/gtkconv.c:3380 src/gtkrequest.c:230
+#: src/protocols/icq/gaim_icq.c:277 src/protocols/oscar/oscar.c:2787
 msgid "Add"
 msgstr "追加"
 
-#: src/gtkblist.c:815
-msgid "_Get Info"
-msgstr "情報取得 (_G)"
-
-#: src/gtkblist.c:818
-msgid "_IM"
-msgstr "_IM"
-
-#: src/gtkblist.c:820
+#: src/gtkblist.c:803 src/gtkblist.c:4151
+msgid ""
+"You are not currently signed on with any protocols that have the ability to "
+"chat."
+msgstr "チャットできる機能がついているプロトコルでサインオンしていません."
+
+#: src/gtkblist.c:816
+msgid "Join a Chat"
+msgstr "チャットへ加入"
+
+#: src/gtkblist.c:837
+#, fuzzy
+msgid ""
+"Please enter the appropriate information about the chat you would like to "
+"join.\n"
+msgstr ""
+"以下の人のエイリアスと仲間リストに追加するチャットの情報を入力してくださ"
+"い.\n"
+
+#: src/gtkblist.c:850 src/gtkpounce.c:361 src/gtkroomlist.c:365
+msgid "_Account:"
+msgstr "アカウント (_A):"
+
+#: src/gtkblist.c:1088 src/gtkblist.c:3070
+#, fuzzy
+msgid "Get _Info"
+msgstr "情報取得"
+
+#: src/gtkblist.c:1091 src/gtkblist.c:3061
+#, fuzzy
+msgid "I_M"
+msgstr "IM"
+
+#: src/gtkblist.c:1093
 msgid "Add Buddy _Pounce"
 msgstr "掴む仲間に加える"
 
-#: src/gtkblist.c:822
+#: src/gtkblist.c:1095
 msgid "View _Log"
 msgstr "ログを見る (_L)"
 
-#: src/gtkblist.c:842 src/gtkblist.c:931 src/gtkblist.c:950
+#: src/gtkblist.c:1115 src/gtkblist.c:1187 src/gtkblist.c:1200
 msgid "_Alias..."
 msgstr "エイリアス (_A)..."
 
-#: src/gtkblist.c:844 src/gtkblist.c:933 src/gtkblist.c:955 src/gtkconn.c:358
+#: src/gtkblist.c:1117 src/gtkblist.c:1189 src/gtkblist.c:1205
+#: src/gtkconn.c:361
 msgid "_Remove"
 msgstr "削除 (_R)"
 
-#: src/gtkblist.c:907
+#: src/gtkblist.c:1162
 msgid "Add a _Buddy"
 msgstr "仲間を加える (_B)"
 
-#: src/gtkblist.c:909
+#: src/gtkblist.c:1164
 msgid "Add a C_hat"
 msgstr "チャットの追加 (_H)"
 
-#: src/gtkblist.c:911
+#: src/gtkblist.c:1166
 msgid "_Delete Group"
 msgstr "グループ削除 (_D)"
 
-#: src/gtkblist.c:913
+#: src/gtkblist.c:1168
 msgid "_Rename"
 msgstr "改名 (_R)"
 
-#: src/gtkblist.c:928
+#. join button
+#: src/gtkblist.c:1182 src/gtkroomlist.c:261 src/gtkroomlist.c:417
+#: src/stock.c:87
+msgid "_Join"
+msgstr "加入 (_J)"
+
+#: src/gtkblist.c:1184
 #, fuzzy
 msgid "Auto-Join"
 msgstr "自動加入"
 
-#: src/gtkblist.c:952 src/gtkblist.c:987
+#: src/gtkblist.c:1202 src/gtkblist.c:1228
 msgid "_Collapse"
 msgstr ""
 
-#: src/gtkblist.c:992
+#: src/gtkblist.c:1233
 msgid "_Expand"
 msgstr ""
 
-#: src/gtkblist.c:1391 src/gtkconv.c:3999
+#: src/gtkblist.c:1884 src/gtkconv.c:3864
 #, fuzzy
 msgid ""
 "You are not currently signed on with an account that can add that buddy."
 msgstr "チャットできる機能がついているプロトコルでサインオンしていません."
 
 #. Buddies menu
-#: src/gtkblist.c:1690
+#: src/gtkblist.c:2225
 msgid "/_Buddies"
 msgstr "仲間 (_B)"
 
-#: src/gtkblist.c:1691
+#: src/gtkblist.c:2226
 #, fuzzy
 msgid "/Buddies/New Instant _Message..."
 msgstr "新しいIMの送信 (_I)..."
 
-#: src/gtkblist.c:1692
+#: src/gtkblist.c:2227
 msgid "/Buddies/Join a _Chat..."
 msgstr "チャットに参加(_C)..."
 
-#: src/gtkblist.c:1693
-msgid "/Buddies/Get _User Info..."
+#: src/gtkblist.c:2228
+#, fuzzy
+msgid "/Buddies/Get User _Info..."
 msgstr "ユーザ情報の取得 (_U)..."
 
-#: src/gtkblist.c:1695
+#: src/gtkblist.c:2230
 msgid "/Buddies/Show _Offline Buddies"
 msgstr "オフラインの仲間を表示 (_O)"
 
-#: src/gtkblist.c:1696
+#: src/gtkblist.c:2231
 msgid "/Buddies/Show _Empty Groups"
 msgstr "空のグループを表示 (_E)"
 
-#: src/gtkblist.c:1697
+#: src/gtkblist.c:2232
 msgid "/Buddies/_Add Buddy..."
 msgstr "仲間を加える (_A)..."
 
-#: src/gtkblist.c:1698
+#: src/gtkblist.c:2233
 msgid "/Buddies/Add C_hat..."
 msgstr "チャットを追加 (_H)..."
 
-#: src/gtkblist.c:1699
+#: src/gtkblist.c:2234
 msgid "/Buddies/Add _Group..."
 msgstr "グループを追加 (_G)..."
 
-#: src/gtkblist.c:1701
+#: src/gtkblist.c:2236
 msgid "/Buddies/_Signoff"
 msgstr "サインオフ (_S)"
 
-#: src/gtkblist.c:1702
+#: src/gtkblist.c:2237
 msgid "/Buddies/_Quit"
 msgstr "終了 (_Q)"
 
 #. Tools
-#: src/gtkblist.c:1705
+#: src/gtkblist.c:2240
 msgid "/_Tools"
 msgstr "ツール (_T)"
 
-#: src/gtkblist.c:1706
+#: src/gtkblist.c:2241
 msgid "/Tools/_Away"
 msgstr "離席 (_A)"
 
-#: src/gtkblist.c:1707
+#: src/gtkblist.c:2242
 msgid "/Tools/Buddy _Pounce"
 msgstr "仲間を掴む (_P)"
 
-#: src/gtkblist.c:1708
+#: src/gtkblist.c:2243
 msgid "/Tools/P_rotocol Actions"
 msgstr "プロトコルごとの動作 (_P)"
 
-#: src/gtkblist.c:1710
+#: src/gtkblist.c:2245
 msgid "/Tools/A_ccounts"
 msgstr "アカウント (_C)..."
 
-#: src/gtkblist.c:1711
+#: src/gtkblist.c:2246
 msgid "/Tools/_File Transfers"
 msgstr "ファイル転送 (_F)"
 
-#: src/gtkblist.c:1712
+#: src/gtkblist.c:2247
+#, fuzzy
+msgid "/Tools/R_oom List"
+msgstr "プロトコルごとの動作 (_P)"
+
+#: src/gtkblist.c:2248
 msgid "/Tools/Pr_eferences"
 msgstr "設定 (_E)"
 
-#: src/gtkblist.c:1713
+#: src/gtkblist.c:2249
 msgid "/Tools/Pr_ivacy"
 msgstr "個人情報 (_I)"
 
-#: src/gtkblist.c:1716
+#: src/gtkblist.c:2252
 msgid "/Tools/View System _Log"
 msgstr "システムログを見る (_L)"
 
 #. Help
-#: src/gtkblist.c:1720
+#: src/gtkblist.c:2256
 msgid "/_Help"
 msgstr "ヘルプ (_H)"
 
-#: src/gtkblist.c:1721
+#: src/gtkblist.c:2257
 msgid "/Help/Online _Help"
 msgstr "オンラインヘルプ (_H)"
 
-#: src/gtkblist.c:1722
+#: src/gtkblist.c:2258
 msgid "/Help/_Debug Window"
 msgstr "デバッグウィンドウ (_D)"
 
-#: src/gtkblist.c:1723
+#: src/gtkblist.c:2259
 msgid "/Help/_About"
 msgstr "gaimについて (_A)..."
 
-#: src/gtkblist.c:1739
+#: src/gtkblist.c:2275
 msgid "Rename Group"
 msgstr "グループの改名"
 
-#: src/gtkblist.c:1739
+#: src/gtkblist.c:2275
 #, fuzzy
 msgid "New group name"
 msgstr "新しい名前"
 
-#: src/gtkblist.c:1740
+#: src/gtkblist.c:2276
 #, fuzzy
 msgid "Please enter a new name for the selected group."
 msgstr "新しいグループ名を入力してください。\n"
 
-#: src/gtkblist.c:1768
+#: src/gtkblist.c:2304
 #, c-format
 msgid ""
 "\n"
@@ -2169,16 +2339,16 @@
 "\n"
 "<b>アカウント:</b> %s"
 
-#: src/gtkblist.c:1832 src/protocols/oscar/oscar.c:5525
+#: src/gtkblist.c:2368 src/protocols/oscar/oscar.c:5772
 msgid "<b>Status:</b> Offline"
 msgstr "<b>ステータス:</b> オフライン"
 
-#: src/gtkblist.c:1847
+#: src/gtkblist.c:2383
 #, c-format
 msgid "%d%%"
 msgstr "%d%%"
 
-#: src/gtkblist.c:1863
+#: src/gtkblist.c:2399
 msgid ""
 "\n"
 "<b>Account:</b>"
@@ -2186,13 +2356,13 @@
 "\n"
 "<b>アカウント:</b>"
 
-#: src/gtkblist.c:1864
+#: src/gtkblist.c:2400
 msgid ""
 "\n"
 "<b>Contact Alias:</b>"
 msgstr ""
 
-#: src/gtkblist.c:1865
+#: src/gtkblist.c:2401
 msgid ""
 "\n"
 "<b>Alias:</b>"
@@ -2200,7 +2370,7 @@
 "\n"
 "<b>エイリアス:</b>"
 
-#: src/gtkblist.c:1866
+#: src/gtkblist.c:2402
 msgid ""
 "\n"
 "<b>Nickname:</b>"
@@ -2208,7 +2378,7 @@
 "\n"
 "<b>ニックネーム:</b>"
 
-#: src/gtkblist.c:1867
+#: src/gtkblist.c:2403
 #, fuzzy
 msgid ""
 "\n"
@@ -2217,7 +2387,7 @@
 "\n"
 "<b>ログインしました:</b> "
 
-#: src/gtkblist.c:1868
+#: src/gtkblist.c:2404
 msgid ""
 "\n"
 "<b>Idle:</b>"
@@ -2225,7 +2395,7 @@
 "\n"
 "<b>アイドル:</b>"
 
-#: src/gtkblist.c:1869
+#: src/gtkblist.c:2405
 msgid ""
 "\n"
 "<b>Warned:</b>"
@@ -2233,7 +2403,7 @@
 "\n"
 "<b>警告された:</b>"
 
-#: src/gtkblist.c:1871
+#: src/gtkblist.c:2407
 msgid ""
 "\n"
 "<b>Description:</b> Spooky"
@@ -2241,7 +2411,7 @@
 "\n"
 "<b>説明:</b> スプーキー"
 
-#: src/gtkblist.c:1872
+#: src/gtkblist.c:2408
 msgid ""
 "\n"
 "<b>Status</b>: Awesome"
@@ -2249,7 +2419,7 @@
 "\n"
 "<b>状態:</b> すげえ"
 
-#: src/gtkblist.c:1873
+#: src/gtkblist.c:2409
 #, fuzzy
 msgid ""
 "\n"
@@ -2258,85 +2428,79 @@
 "\n"
 "<b>状態:</b> すげえ"
 
-#: src/gtkblist.c:2143
+#: src/gtkblist.c:2679
 #, c-format
 msgid "Idle (%dh%02dm) "
 msgstr "アイドル (%dh%02dm) "
 
-#: src/gtkblist.c:2145
+#: src/gtkblist.c:2681
 #, c-format
 msgid "Idle (%dm) "
 msgstr "アイドル (%dm) "
 
-#: src/gtkblist.c:2150
+#: src/gtkblist.c:2686
 #, c-format
 msgid "Warned (%d%%) "
 msgstr "警告: %d%% "
 
-#: src/gtkblist.c:2153
+#: src/gtkblist.c:2689
 msgid "Offline "
 msgstr "オフライン "
 
-#: src/gtkblist.c:2346 src/gtkprefs.c:834 src/gtkprefs.c:1485
-msgid "None"
-msgstr "なし"
-
-#: src/gtkblist.c:2413
+#: src/gtkblist.c:2947
 msgid "/Tools/Away"
 msgstr "離席"
 
-#: src/gtkblist.c:2416
+#: src/gtkblist.c:2950
 msgid "/Tools/Buddy Pounce"
 msgstr "仲間を掴む"
 
-#: src/gtkblist.c:2419
+#: src/gtkblist.c:2953
 msgid "/Tools/Protocol Actions"
 msgstr "プロトコルごとの動作"
 
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: src/gtkblist.c:2506
+#: src/gtkblist.c:3041
 msgid "/Buddies/Show Offline Buddies"
 msgstr "オフラインの仲間を表示"
 
-#: src/gtkblist.c:2508
+#: src/gtkblist.c:3043
 msgid "/Buddies/Show Empty Groups"
 msgstr "空のグループを表示"
 
-#: src/gtkblist.c:2526 src/gtkconv.c:1215
-msgid "IM"
-msgstr "IM"
-
-#: src/gtkblist.c:2532
+#: src/gtkblist.c:3067
 msgid "Send a message to the selected buddy"
 msgstr "選択した仲間にメッセージ送信"
 
-#: src/gtkblist.c:2535 src/protocols/napster/napster.c:529
-msgid "Get Info"
-msgstr "情報取得"
-
-#: src/gtkblist.c:2541
+#: src/gtkblist.c:3076
 msgid "Get information on the selected buddy"
 msgstr "選択した仲間の情報を取得"
 
-#: src/gtkblist.c:2544 src/protocols/oscar/oscar.c:3086
-msgid "Chat"
+#: src/gtkblist.c:3079
+#, fuzzy
+msgid "_Chat"
 msgstr "チャット"
 
-#: src/gtkblist.c:2549
+#: src/gtkblist.c:3084
 msgid "Join a chat room"
 msgstr "チャットルームの参加"
 
-#: src/gtkblist.c:2557
+#: src/gtkblist.c:3087
+#, fuzzy
+msgid "_Away"
+msgstr "離席"
+
+#: src/gtkblist.c:3092
 msgid "Set an away message"
 msgstr "離席メッセージを設定"
 
-#: src/gtkblist.c:3270 src/protocols/yahoo/yahoo.c:2325
+#: src/gtkblist.c:3824 src/protocols/yahoo/yahoo.c:2427
 msgid "Add Buddy"
 msgstr "仲間を加える"
 
-#: src/gtkblist.c:3293
+#: src/gtkblist.c:3847
 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. "
@@ -2346,24 +2510,16 @@
 "スとニックネームを入力できます。エイリアスは、可能な場合に限りスクリーン名の"
 "かわりに表示されます。\n"
 
-#: src/gtkblist.c:3315 src/main.c:290
-msgid "Screen Name:"
-msgstr "スクリーン名:"
-
-#: src/gtkblist.c:3341 src/gtkblist.c:3663
-msgid "Group:"
-msgstr "グループ:"
-
 #. Set up stuff for the account box
-#: src/gtkblist.c:3350 src/gtkblist.c:3631
+#: src/gtkblist.c:3907 src/gtkblist.c:4191
 msgid "Account:"
 msgstr "アカウント:"
 
-#: src/gtkblist.c:3598
+#: src/gtkblist.c:4158
 msgid "Add Chat"
 msgstr "チャットの追加"
 
-#: src/gtkblist.c:3621
+#: src/gtkblist.c:4181
 msgid ""
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
@@ -2371,39 +2527,39 @@
 "以下の人のエイリアスと仲間リストに追加するチャットの情報を入力してくださ"
 "い.\n"
 
-#: src/gtkblist.c:3697
+#: src/gtkblist.c:4260
 msgid "Add Group"
 msgstr "グループの追加"
 
-#: src/gtkblist.c:3698
+#: src/gtkblist.c:4261
 msgid "Please enter the name of the group to be added."
 msgstr "加わるグループ名を入力してください。"
 
-#: src/gtkblist.c:4215
+#: src/gtkblist.c:4780
 msgid "No actions available"
 msgstr "可能なアクションが無いです"
 
-#: src/gtkconn.c:77 src/gtkconn.c:249 src/gtkconn.c:260
+#: src/gtkconn.c:78 src/gtkconn.c:250 src/gtkconn.c:261
 msgid "Done."
 msgstr "完了。"
 
-#: src/gtkconn.c:156
+#: src/gtkconn.c:157
 msgid "Signon: "
 msgstr "サインオン: "
 
-#: src/gtkconn.c:202
+#: src/gtkconn.c:203
 msgid "Signon"
 msgstr "サインオン"
 
-#: src/gtkconn.c:215
+#: src/gtkconn.c:216
 msgid "Cancel All"
 msgstr "すべてを取消"
 
-#: src/gtkconn.c:358 src/gtkconn.c:585
+#: src/gtkconn.c:361 src/gtkconn.c:593
 msgid "_Reconnect"
 msgstr "再接続 (_R)"
 
-#: src/gtkconn.c:549
+#: src/gtkconn.c:557
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">%s has been disconnected.</span>\n"
@@ -2416,46 +2572,33 @@
 "%s\n"
 "%s"
 
-#: src/gtkconn.c:551
+#: src/gtkconn.c:559
 #, fuzzy
 msgid "Reason Unknown."
 msgstr "不明."
 
-#: src/gtkconn.c:590
+#: src/gtkconn.c:598
 msgid "Reconnect _All"
 msgstr "すべてを再接続 (_A)"
 
-#: src/gtkconn.c:612
-msgid "Account"
-msgstr "アカウント"
-
-#: src/gtkconn.c:620
+#: src/gtkconn.c:628
 msgid "Time"
 msgstr ""
 
-#: src/gtkconv.c:187
+#: src/gtkconv.c:183
 msgid "That file already exists"
 msgstr "そのファイルはすでに存在します"
 
-#: src/gtkconv.c:188 src/gtkft.c:1076
+#: src/gtkconv.c:184 src/gtkft.c:1106
 msgid "Would you like to overwrite it?"
 msgstr "上書きしますか?"
 
-#: src/gtkconv.c:244
-#, c-format
-msgid "Failed to store image: %s\n"
-msgstr ""
-
-#: src/gtkconv.c:300
-msgid "Insert Image"
-msgstr "画像挿入"
-
-#: src/gtkconv.c:629
+#: src/gtkconv.c:470
 msgid "Invite Buddy Into Chat Room"
 msgstr "仲間のチャットルーム情報で招待"
 
 #. Put our happy label in it.
-#: src/gtkconv.c:657
+#: src/gtkconv.c:498
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
@@ -2463,485 +2606,454 @@
 "招待しようとしているユーザの名前を入力してください.また,オプションとして招"
 "待メッセージも書いてください."
 
-#: src/gtkconv.c:678
+#: src/gtkconv.c:519
 msgid "_Buddy:"
 msgstr "仲間 (_B):"
 
-#: src/gtkconv.c:698
+#: src/gtkconv.c:539
 msgid "_Message:"
 msgstr "メッセージ (_M):"
 
-#: src/gtkconv.c:788
+#: src/gtkconv.c:632
 msgid "Find"
 msgstr "検索"
 
-#: src/gtkconv.c:810
+#: src/gtkconv.c:658
 msgid "_Search for:"
 msgstr ""
 
-#: src/gtkconv.c:1223
+#: src/gtkconv.c:1030
+msgid "IM"
+msgstr "IM"
+
+#: src/gtkconv.c:1038
 msgid "Un-Ignore"
 msgstr "不無視"
 
-#: src/gtkconv.c:1225 src/gtkprefs.c:767
+#: src/gtkconv.c:1040 src/gtkprefs.c:784
 msgid "Ignore"
 msgstr "無視"
 
 #. Info button
-#: src/gtkconv.c:1234 src/gtkconv.c:3246
+#: src/gtkconv.c:1049 src/gtkconv.c:3303
 msgid "Info"
 msgstr "情報"
 
-#: src/gtkconv.c:1243
+#: src/gtkconv.c:1058
 msgid "Get Away Msg"
 msgstr "離席メッセージ"
 
 #. Remove button
-#: src/gtkconv.c:1254 src/gtkconv.c:3239 src/gtkconv.c:3330
-#: src/gtkrequest.c:196
+#: src/gtkconv.c:1070 src/gtkconv.c:3296 src/gtkconv.c:3387
+#: src/gtkrequest.c:231
 msgid "Remove"
 msgstr "削除"
 
-#: src/gtkconv.c:2489
+#: src/gtkconv.c:2162
+msgid "Animate"
+msgstr ""
+
+#: src/gtkconv.c:2167
+msgid "Hide Icon"
+msgstr "隠れアイコン"
+
+#: src/gtkconv.c:2173
+msgid "Save Icon As..."
+msgstr "名前を付けてアイコンを保存..."
+
+#: src/gtkconv.c:2536
 msgid "User is typing..."
 msgstr "ユーザが入力中 ..."
 
-#: src/gtkconv.c:2497
+#: src/gtkconv.c:2544
 msgid "User has typed something and paused"
 msgstr "ユーザは何かを入力して停止"
 
 #. Build the Send As menu
-#: src/gtkconv.c:2600
+#: src/gtkconv.c:2647
 msgid "_Send As"
 msgstr "送信 (_S)"
 
-#: src/gtkconv.c:3011
+#: src/gtkconv.c:3067
 msgid "Save Conversation"
 msgstr "会話を保存"
 
 #. Conversation menu
-#: src/gtkconv.c:3028
+#: src/gtkconv.c:3084
 msgid "/_Conversation"
 msgstr "会話 (_C)"
 
-#: src/gtkconv.c:3030
+#: src/gtkconv.c:3086
 #, fuzzy
 msgid "/Conversation/New Instant _Message..."
 msgstr "新しいIMの送信 (_I)..."
 
-#: src/gtkconv.c:3035
+#: src/gtkconv.c:3091
 msgid "/Conversation/_Find..."
 msgstr "検索 (_F)..."
 
-#: src/gtkconv.c:3036
+#: src/gtkconv.c:3093
 msgid "/Conversation/View _Log"
 msgstr "ログを見る (_L)"
 
-#: src/gtkconv.c:3037
+#: src/gtkconv.c:3094
 msgid "/Conversation/_Save As..."
 msgstr "名前をつけて保存 (_S)..."
 
-#: src/gtkconv.c:3042
+#: src/gtkconv.c:3099
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "掴む仲間に加える (_P)..."
 
-#: src/gtkconv.c:3044
+#: src/gtkconv.c:3101
 msgid "/Conversation/_Get Info"
 msgstr "情報取得 (_G)"
 
-#: src/gtkconv.c:3046
+#: src/gtkconv.c:3103
 msgid "/Conversation/_Warn..."
 msgstr "警告 (_W)..."
 
-#: src/gtkconv.c:3048
+#: src/gtkconv.c:3105
 msgid "/Conversation/In_vite..."
 msgstr "招待 (_V)..."
 
-#: src/gtkconv.c:3053
+#: src/gtkconv.c:3110
 msgid "/Conversation/A_lias..."
 msgstr "エイリアス (_A)..."
 
-#: src/gtkconv.c:3055
+#: src/gtkconv.c:3112
 msgid "/Conversation/_Block..."
 msgstr ""
 
-#: src/gtkconv.c:3057
+#: src/gtkconv.c:3114
 msgid "/Conversation/_Add..."
 msgstr ""
 
-#: src/gtkconv.c:3059
+#: src/gtkconv.c:3116
 msgid "/Conversation/_Remove..."
 msgstr ""
 
-#: src/gtkconv.c:3064
+#: src/gtkconv.c:3121
 msgid "/Conversation/Insert Lin_k..."
 msgstr "リンクを挿入 (_K)..."
 
-#: src/gtkconv.c:3066
+#: src/gtkconv.c:3123
 msgid "/Conversation/Insert Imag_e..."
 msgstr "画像を挿入 (_E)..."
 
-#: src/gtkconv.c:3071
+#: src/gtkconv.c:3128
 msgid "/Conversation/_Close"
 msgstr "閉じる (_C)"
 
 #. Options
-#: src/gtkconv.c:3075
+#: src/gtkconv.c:3132
 msgid "/_Options"
 msgstr "オプション (_O)"
 
-#: src/gtkconv.c:3076
+#: src/gtkconv.c:3133
 msgid "/Options/Enable _Logging"
 msgstr "ログを有効にする (_L)"
 
-#: src/gtkconv.c:3077
+#: src/gtkconv.c:3134
 msgid "/Options/Enable _Sounds"
 msgstr "音を有効にする (_S)"
 
-#: src/gtkconv.c:3078
+#: src/gtkconv.c:3135
 msgid "/Options/Show Formatting _Toolbar"
 msgstr ""
 
-#: src/gtkconv.c:3120
+#: src/gtkconv.c:3177
 msgid "/Conversation/View Log"
 msgstr "ログを見る..."
 
-#: src/gtkconv.c:3125
+#: src/gtkconv.c:3182
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "掴む仲間に加える..."
 
-#: src/gtkconv.c:3131
+#: src/gtkconv.c:3188
 msgid "/Conversation/Get Info"
 msgstr "情報取得"
 
-#: src/gtkconv.c:3135
+#: src/gtkconv.c:3192
 msgid "/Conversation/Warn..."
 msgstr "警告..."
 
-#: src/gtkconv.c:3139
+#: src/gtkconv.c:3196
 msgid "/Conversation/Invite..."
 msgstr "招待..."
 
-#: src/gtkconv.c:3145
+#: src/gtkconv.c:3202
 msgid "/Conversation/Alias..."
 msgstr "エイリアス..."
 
-#: src/gtkconv.c:3149
+#: src/gtkconv.c:3206
 msgid "/Conversation/Block..."
 msgstr ""
 
-#: src/gtkconv.c:3153
+#: src/gtkconv.c:3210
 msgid "/Conversation/Add..."
 msgstr ""
 
-#: src/gtkconv.c:3157
+#: src/gtkconv.c:3214
 msgid "/Conversation/Remove..."
 msgstr ""
 
-#: src/gtkconv.c:3163
+#: src/gtkconv.c:3220
 msgid "/Conversation/Insert Link..."
 msgstr "リンクを挿入..."
 
-#: src/gtkconv.c:3167
+#: src/gtkconv.c:3224
 msgid "/Conversation/Insert Image..."
 msgstr "画像を挿入..."
 
-#: src/gtkconv.c:3173
+#: src/gtkconv.c:3230
 msgid "/Options/Enable Logging"
 msgstr "ログを有効にする"
 
-#: src/gtkconv.c:3176
+#: src/gtkconv.c:3233
 msgid "/Options/Enable Sounds"
 msgstr "音を有効にする"
 
-#: src/gtkconv.c:3179
+#: src/gtkconv.c:3236
 msgid "/Options/Show Formatting Toolbar"
 msgstr ""
 
 #. From right to left...
 #. Send button
-#: src/gtkconv.c:3202 src/gtkconv.c:3204 src/gtkconv.c:3302 src/gtkconv.c:3304
+#: src/gtkconv.c:3259 src/gtkconv.c:3261 src/gtkconv.c:3359 src/gtkconv.c:3361
 msgid "Send"
 msgstr "送信"
 
 #. Now, um, just kind of all over the place. Huh?
 #. Warn button
-#: src/gtkconv.c:3218
+#: src/gtkconv.c:3275
 msgid "Warn"
 msgstr "警告"
 
-#: src/gtkconv.c:3221
+#: src/gtkconv.c:3278
 msgid "Warn the user"
 msgstr "ユーザに警告する"
 
 #. Block button
-#: src/gtkconv.c:3225 src/gtkprivacy.c:606 src/gtkprivacy.c:617
+#: src/gtkconv.c:3282 src/gtkprivacy.c:598 src/gtkprivacy.c:609
 msgid "Block"
 msgstr "拒む"
 
-#: src/gtkconv.c:3228
+#: src/gtkconv.c:3285
 msgid "Block the user"
 msgstr "ユーザを拒否する"
 
-#: src/gtkconv.c:3235
+#: src/gtkconv.c:3292
 msgid "Add the user to your buddy list"
 msgstr "仲間リストユーザを追加する"
 
-#: src/gtkconv.c:3242
+#: src/gtkconv.c:3299
 msgid "Remove the user from your buddy list"
 msgstr "仲間リストからユーザを削除する"
 
-#: src/gtkconv.c:3249 src/gtkconv.c:3747
+#: src/gtkconv.c:3306 src/gtkconv.c:3628
 msgid "Get the user's information"
 msgstr "ユーザの情報を取得する"
 
 #. Invite
-#: src/gtkconv.c:3316
+#: src/gtkconv.c:3373
 msgid "Invite"
 msgstr "招待"
 
-#: src/gtkconv.c:3319
+#: src/gtkconv.c:3376
 msgid "Invite a user"
 msgstr "ユーザを招待"
 
-#: src/gtkconv.c:3326
+#: src/gtkconv.c:3383
 msgid "Add the chat to your buddy list"
 msgstr "仲間リストチャットを追加する"
 
-#: src/gtkconv.c:3333
+#: src/gtkconv.c:3390
 msgid "Remove the chat from your buddy list"
 msgstr "仲間リストからチャットを削除する"
 
-#: src/gtkconv.c:3389
-msgid "Bold"
-msgstr "ボールド"
-
-#: src/gtkconv.c:3400
-msgid "Italic"
-msgstr "イタリック"
-
-#: src/gtkconv.c:3411
-msgid "Underline"
-msgstr "下線"
-
-#: src/gtkconv.c:3427
-msgid "Larger font size"
-msgstr "フォントサイズを大きく"
-
-#: src/gtkconv.c:3439
-msgid "Normal font size"
-msgstr "フォントサイズを通常サイズに"
-
-#: src/gtkconv.c:3451
-msgid "Smaller font size"
-msgstr "フォントサイズを小さく"
-
-#: src/gtkconv.c:3468
-msgid "Font Face"
-msgstr "フォント"
-
-#: src/gtkconv.c:3480
-msgid "Foreground font color"
-msgstr "前景色"
-
-#: src/gtkconv.c:3492
-msgid "Background color"
-msgstr "背景色"
-
-#: src/gtkconv.c:3507
-msgid "Insert link"
-msgstr "リンクの挿入"
-
-#: src/gtkconv.c:3518
-msgid "Insert image"
-msgstr "画像の挿入"
-
-#: src/gtkconv.c:3529
-msgid "Insert smiley"
-msgstr "顔文字の挿入"
-
-#: src/gtkconv.c:3614
+#: src/gtkconv.c:3490
 msgid "Topic:"
 msgstr "トピック:"
 
 #. Setup the label telling how many people are in the room.
-#: src/gtkconv.c:3671
+#: src/gtkconv.c:3550
 msgid "0 people in room"
 msgstr "誰もいません"
 
-#: src/gtkconv.c:3724
+#: src/gtkconv.c:3605
 msgid "IM the user"
 msgstr "ユーザにIMを送信"
 
-#: src/gtkconv.c:3736
+#: src/gtkconv.c:3617
 msgid "Ignore the user"
 msgstr "ユーザを無視する"
 
-#: src/gtkconv.c:4284
+#: src/gtkconv.c:4155
 msgid "Close conversation"
 msgstr "会話を閉じる"
 
-#: src/gtkconv.c:4808 src/gtkconv.c:4840 src/gtkconv.c:4961 src/gtkconv.c:5028
+#: src/gtkconv.c:4668 src/gtkconv.c:4700 src/gtkconv.c:4821 src/gtkconv.c:4888
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "%d人部屋にいます"
 msgstr[1] "%d人部屋にいます"
 
-#: src/gtkconv.c:5360
-msgid "Animate"
-msgstr ""
-
-#: src/gtkconv.c:5365
-msgid "Hide Icon"
-msgstr "隠れアイコン"
-
-#: src/gtkconv.c:5371
-msgid "Save Icon As..."
-msgstr "名前を付けてアイコンを保存..."
-
-#: src/gtkconv.c:5767 src/gtkconv.c:5770
+#: src/gtkconv.c:5404 src/gtkconv.c:5407
 #, fuzzy
 msgid "<main>/Conversation/Close"
 msgstr "閉じる"
 
-#: src/gtkdebug.c:133
+#: src/gtkdebug.c:135
 msgid "Debug Window"
 msgstr "デバッグウィンドウ"
 
-#: src/gtkdebug.c:173
+#: src/gtkdebug.c:175
 msgid "Pause"
 msgstr "一時停止"
 
-#: src/gtkdebug.c:179
+#: src/gtkdebug.c:181
 msgid "Timestamps"
 msgstr "タイムスタンプ"
 
-#: src/gtkft.c:133
+#: src/gtkft.c:135
 #, c-format
 msgid "%.2f KB/s"
 msgstr "%.2f KB/s"
 
-#: src/gtkft.c:207
+#: src/gtkft.c:156 src/gtkft.c:957
+#, fuzzy
+msgid "Finished"
+msgstr "フィンランド語"
+
+#: src/gtkft.c:209
 msgid "<b>Receiving From:</b>"
 msgstr "<b>受信:</b>"
 
-#: src/gtkft.c:210
+#: src/gtkft.c:212
 msgid "<b>Sending To:</b>"
 msgstr "<b>送信先:</b>"
 
-#: src/gtkft.c:458
+#: src/gtkft.c:386
+msgid "There is no application configured to open this type of file."
+msgstr ""
+
+#: src/gtkft.c:391
+msgid "An error occurred while opening the file."
+msgstr ""
+
+#: src/gtkft.c:482
 msgid "Progress"
 msgstr "進展"
 
-#: src/gtkft.c:465
+#: src/gtkft.c:489
 msgid "Filename"
 msgstr "ファイル名"
 
-#: src/gtkft.c:472
+#: src/gtkft.c:496
 msgid "Size"
 msgstr "大きさ"
 
-#: src/gtkft.c:479
+#: src/gtkft.c:503
 msgid "Remaining"
 msgstr "残り"
 
-#: src/gtkft.c:509
+#: src/gtkft.c:533
 msgid "Filename:"
 msgstr "ファイル名:"
 
-#: src/gtkft.c:510
+#: src/gtkft.c:534
 msgid "Status:"
 msgstr "状態:"
 
-#: src/gtkft.c:511
+#: src/gtkft.c:535
 msgid "Speed:"
 msgstr "速度:"
 
-#: src/gtkft.c:512
+#: src/gtkft.c:536
 msgid "Time Elapsed:"
 msgstr "経過時間:"
 
-#: src/gtkft.c:513
+#: src/gtkft.c:537
 msgid "Time Remaining:"
 msgstr "残り時間:"
 
-#: src/gtkft.c:610
+#: src/gtkft.c:634
 msgid "_Keep the dialog open"
 msgstr "ダイアログボックスをひらいたままにする (_K)"
 
-#: src/gtkft.c:620
+#: src/gtkft.c:644
 msgid "_Clear finished transfers"
 msgstr "終了した転送を消す (_C)"
 
 #. "Download Details" arrow
-#: src/gtkft.c:629
+#: src/gtkft.c:653
 msgid "Show transfer details"
 msgstr "転送の詳細を表示"
 
-#: src/gtkft.c:630
+#: src/gtkft.c:654
 msgid "Hide transfer details"
 msgstr "転送の詳細を隠す"
 
 #. Pause button
-#: src/gtkft.c:672 src/stock.c:85
+#: src/gtkft.c:696 src/stock.c:90
 msgid "_Pause"
 msgstr "一時停止 (_P)"
 
 #. Resume button
-#: src/gtkft.c:682
+#: src/gtkft.c:706
 msgid "_Resume"
 msgstr "リジューム (_R)"
 
-#: src/gtkft.c:882
+#: src/gtkft.c:908
 #, fuzzy
 msgid "Canceled"
 msgstr "取消"
 
-#: src/gtkft.c:884
+#: src/gtkft.c:910
 #, fuzzy
 msgid "Failed"
 msgstr "失敗"
 
-#: src/gtkft.c:1053
+#: src/gtkft.c:1082
 msgid "That file does not exist."
 msgstr "そのファイルは存在しません."
 
-#: src/gtkft.c:1062
+#: src/gtkft.c:1091
 msgid "Cannot send a file of 0 bytes."
 msgstr "0バイトのファイルを送信できません"
 
-#: src/gtkft.c:1075
+#: src/gtkft.c:1105
 msgid "That file already exists."
 msgstr "そのファイルはすでに存在します."
 
-#: src/gtkft.c:1100
+#: src/gtkft.c:1131
 msgid "Open..."
 msgstr "開く..."
 
-#: src/gtkft.c:1102
+#: src/gtkft.c:1133
 msgid "Save As..."
 msgstr "名前を付けて保存..."
 
-#: src/gtkft.c:1149
+#: src/gtkft.c:1181
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "%s は %s (%s) を送信したがっています"
 
-#: src/gtkimhtml.c:614
+#: src/gtkimhtml.c:829
 msgid "_Copy E-Mail Address"
 msgstr "メールアドレスをコピーする (_C)"
 
-#: src/gtkimhtml.c:626
+#: src/gtkimhtml.c:841
 msgid "_Copy Link Location"
 msgstr "リンクの場所をコピーする (_C)"
 
-#: src/gtkimhtml.c:636
+#: src/gtkimhtml.c:851
 msgid "_Open Link in Browser"
 msgstr "リンクをブラウザで開く (_O)"
 
 # NOTE cf. 0.62
-#: src/gtkimhtml.c:1752
+#: src/gtkimhtml.c:2262
 msgid ""
 "Unable to guess the image type based on the file extension supplied.  "
 "Defaulting to PNG."
@@ -2950,43 +3062,129 @@
 "デフォルトとしてPNGとして扱います."
 
 # FIXME This looks wrong
-#: src/gtkimhtml.c:1760
+#: src/gtkimhtml.c:2270
 #, c-format
 msgid "Error saving image: %s"
 msgstr "保存エラー,画像: %s"
 
-#: src/gtkimhtml.c:1769
+#: src/gtkimhtml.c:2279
 msgid "Save Image"
 msgstr "画像を保存"
 
-#: src/gtkimhtml.c:1792
+#: src/gtkimhtml.c:2302
 msgid "_Save Image..."
 msgstr "画像を保存 (_S)..."
 
+#: src/gtkimhtmltoolbar.c:350
+#, fuzzy
+msgid "_URL"
+msgstr "URL (_U):"
+
+#: src/gtkimhtmltoolbar.c:354
+#, fuzzy
+msgid "_Description"
+msgstr "概要 (_D):"
+
+#: src/gtkimhtmltoolbar.c:359
+msgid "Insert Link"
+msgstr "リンクの挿入"
+
+#: src/gtkimhtmltoolbar.c:361
+#, fuzzy
+msgid ""
+"Please enter the URL and description of the link that you want to insert. "
+"The description is optional."
+msgstr ""
+"挿入したいリンクのURLと説明を入力してください.\n"
+"説明は必須ではありません.\n"
+
+#: src/gtkimhtmltoolbar.c:365
+msgid "_Insert"
+msgstr "挿入 (_I)"
+
+#: src/gtkimhtmltoolbar.c:422
+#, c-format
+msgid "Failed to store image: %s\n"
+msgstr ""
+
+#: src/gtkimhtmltoolbar.c:448
+msgid "Insert Image"
+msgstr "画像挿入"
+
+#. show everything
+#: src/gtkimhtmltoolbar.c:592
+msgid "Smile!"
+msgstr "笑え!"
+
+#: src/gtkimhtmltoolbar.c:722
+msgid "Bold"
+msgstr "ボールド"
+
+#: src/gtkimhtmltoolbar.c:733
+msgid "Italic"
+msgstr "イタリック"
+
+#: src/gtkimhtmltoolbar.c:744
+msgid "Underline"
+msgstr "下線"
+
+#: src/gtkimhtmltoolbar.c:760
+msgid "Larger font size"
+msgstr "フォントサイズを大きく"
+
+#: src/gtkimhtmltoolbar.c:772
+msgid "Smaller font size"
+msgstr "フォントサイズを小さく"
+
+#: src/gtkimhtmltoolbar.c:789
+msgid "Font Face"
+msgstr "フォント"
+
+#: src/gtkimhtmltoolbar.c:801
+msgid "Foreground font color"
+msgstr "前景色"
+
+#: src/gtkimhtmltoolbar.c:813
+msgid "Background color"
+msgstr "背景色"
+
+#: src/gtkimhtmltoolbar.c:828
+msgid "Insert link"
+msgstr "リンクの挿入"
+
+#: src/gtkimhtmltoolbar.c:838
+msgid "Insert image"
+msgstr "画像の挿入"
+
+#: src/gtkimhtmltoolbar.c:849
+msgid "Insert smiley"
+msgstr "顔文字の挿入"
+
 # XXX This is untranslatable. Pathetic...
-#: src/gtklog.c:255
+#: src/gtklog.c:257
 #, fuzzy
 msgid "Conversations with"
 msgstr "%s との会話"
 
-#: src/gtknotify.c:211
+#. Descriptive label
+#: src/gtknotify.c:215
 #, c-format
 msgid "%s has %d new message."
 msgid_plural "%s has %d new messages."
 msgstr[0] "%s には %d のメッセージがあります."
 msgstr[1] "%s には %d のメッセージがあります."
 
-#: src/gtknotify.c:219
+#: src/gtknotify.c:227
 #, c-format
 msgid "<span weight=\"bold\">From:</span> %s\n"
 msgstr "<span weight=\"bold\">送信元:</span> %s\n"
 
-#: src/gtknotify.c:224
+#: src/gtknotify.c:233
 #, c-format
 msgid "<span weight=\"bold\">Subject:</span> %s\n"
 msgstr "<span weight=\"bold\">タイトル:</span> %s\n"
 
-#: src/gtknotify.c:228
+#: src/gtknotify.c:237
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
@@ -2997,7 +3195,7 @@
 "\n"
 "%s%s%s%s"
 
-#: src/gtknotify.c:243
+#: src/gtknotify.c:253
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
@@ -3008,11 +3206,22 @@
 "\n"
 "%s"
 
-#: src/gtknotify.c:430 src/gtknotify.c:450 src/gtknotify.c:458
+#: src/gtknotify.c:439
+#, fuzzy, c-format
+msgid "The browser command \"%s\" is invalid."
+msgstr "新しいフォーマットは不正です."
+
+#: src/gtknotify.c:442 src/gtknotify.c:456 src/gtknotify.c:471
+#: src/gtknotify.c:579
 msgid "Unable to open URL"
 msgstr ""
 
-#: src/gtknotify.c:431
+#: src/gtknotify.c:453 src/gtknotify.c:468
+#, fuzzy, c-format
+msgid "Error launching \"%s\": %s"
+msgstr "保存エラー,画像: %s"
+
+#: src/gtknotify.c:580
 #, fuzzy
 msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
@@ -3020,166 +3229,179 @@
 "マニュアルブラウザ命令が指定されているのですが,コマンドが指定されていないた"
 "め,ブラウザを起動することができません."
 
-#: src/gtknotify.c:448
-#, fuzzy, c-format
-msgid "The browser \"%s\" is invalid."
-msgstr "新しいフォーマットは不正です."
-
-#: src/gtknotify.c:455
-#, fuzzy, c-format
-msgid "Error launching \"command\": %s"
-msgstr "保存エラー,画像: %s"
-
-#: src/gtkpounce.c:140
+#: src/gtkpounce.c:143
 msgid "Select a file"
 msgstr "ファイル選択"
 
-#: src/gtkpounce.c:189
+#: src/gtkpounce.c:192
 msgid "Please enter a buddy to pounce."
 msgstr "掴みかかる仲間をいれてください"
 
 #. "New Buddy Pounce"
-#: src/gtkpounce.c:333 src/gtkpounce.c:738
+#: src/gtkpounce.c:336 src/gtkpounce.c:756
 msgid "New Buddy Pounce"
 msgstr "新しい仲間を掴む"
 
-#: src/gtkpounce.c:333
+#: src/gtkpounce.c:336
 msgid "Edit Buddy Pounce"
 msgstr "掴む仲間を編集"
 
 #. Create the "Pounce Who" frame.
-#: src/gtkpounce.c:351
+#: src/gtkpounce.c:354
 msgid "Pounce Who"
 msgstr "誰を掴む"
 
-#: src/gtkpounce.c:377
+#: src/gtkpounce.c:381
 msgid "_Buddy Name:"
 msgstr "仲間名 (_B):"
 
 #. Create the "Pounce When" frame.
-#: src/gtkpounce.c:399
+#: src/gtkpounce.c:404
 msgid "Pounce When"
 msgstr "いつつかみかかる"
 
-#: src/gtkpounce.c:407 src/main.c:336
-msgid "Sign on"
+#: src/gtkpounce.c:412
+#, fuzzy
+msgid "_Sign on"
 msgstr "サインオン"
 
-#: src/gtkpounce.c:409
-msgid "Sign off"
+#: src/gtkpounce.c:414
+#, fuzzy
+msgid "Sign _off"
 msgstr "サインオフ"
 
-#: src/gtkpounce.c:413
-msgid "Return from away"
+#: src/gtkpounce.c:416
+#, fuzzy
+msgid "A_way"
+msgstr "離席"
+
+#: src/gtkpounce.c:418
+#, fuzzy
+msgid "Re_turn from away"
 msgstr "離席から戻った時"
 
-#: src/gtkpounce.c:415 src/gtkprefs.c:1482 src/protocols/msn/state.c:30
-#: src/protocols/yahoo/yahoo.c:2189
-msgid "Idle"
+#: src/gtkpounce.c:420
+#, fuzzy
+msgid "_Idle"
 msgstr "休止中"
 
-#: src/gtkpounce.c:417
-msgid "Return from idle"
+#: src/gtkpounce.c:422
+#, fuzzy
+msgid "Retur_n from idle"
 msgstr "休止から戻った時"
 
-#: src/gtkpounce.c:419
-msgid "Buddy starts typing"
+#: src/gtkpounce.c:424
+#, fuzzy
+msgid "Buddy starts _typing"
 msgstr "仲間がタイプしはじめたとき"
 
-#: src/gtkpounce.c:421
-msgid "Buddy stops typing"
+#: src/gtkpounce.c:426
+#, fuzzy
+msgid "Buddy stops t_yping"
 msgstr "仲間がタイピングを止めた時"
 
 #. Create the "Pounce Action" frame.
-#: src/gtkpounce.c:450
+#: src/gtkpounce.c:455
 msgid "Pounce Action"
 msgstr "掴み設定"
 
-#: src/gtkpounce.c:457
-msgid "Open an IM window"
+#: src/gtkpounce.c:462
+#, fuzzy
+msgid "Op_en an IM window"
 msgstr "IMウィンドウを開く"
 
-#: src/gtkpounce.c:458
-msgid "Popup notification"
+#: src/gtkpounce.c:463
+#, fuzzy
+msgid "_Popup notification"
 msgstr "ポップアップ通知"
 
-#: src/gtkpounce.c:459
-msgid "Send a message"
+#: src/gtkpounce.c:464
+#, fuzzy
+msgid "Send a _message"
 msgstr "メッセージ送信"
 
-#: src/gtkpounce.c:460
-msgid "Execute a command"
+#: src/gtkpounce.c:465
+#, fuzzy
+msgid "E_xecute a command"
 msgstr "コマンドの実行"
 
-#: src/gtkpounce.c:461
-msgid "Play a sound"
+#: src/gtkpounce.c:466
+#, fuzzy
+msgid "P_lay a sound"
 msgstr "音を再生"
 
-#: src/gtkpounce.c:465 src/gtkpounce.c:467
-msgid "Browse"
+#: src/gtkpounce.c:470
+#, fuzzy
+msgid "B_rowse..."
 msgstr "閲覧"
 
-#: src/gtkpounce.c:468 src/gtkprefs.c:2072
-msgid "Test"
-msgstr "テスト"
-
-#: src/gtkpounce.c:551
-msgid "_Save this pounce after activation"
+#: src/gtkpounce.c:472
+#, fuzzy
+msgid "Bro_wse..."
+msgstr "閲覧"
+
+#: src/gtkpounce.c:473
+msgid "Pre_view"
+msgstr ""
+
+#: src/gtkpounce.c:556
+#, fuzzy
+msgid "Sav_e this pounce after activation"
 msgstr "活性化後の掴みの保存 (_S)"
 
 #. "Remove Buddy Pounce"
-#: src/gtkpounce.c:745
+#: src/gtkpounce.c:763
 msgid "Remove Buddy Pounce"
 msgstr "掴んだ仲間の削除"
 
-#: src/gtkpounce.c:792
+#: src/gtkpounce.c:813
 #, c-format
 msgid "%s has started typing to you"
 msgstr "%s はタイピングを開始しました"
 
-#: src/gtkpounce.c:793
+#: src/gtkpounce.c:814
 #, c-format
 msgid "%s has signed on"
 msgstr "%s はサインオンしました"
 
-#: src/gtkpounce.c:794
+#: src/gtkpounce.c:815
 #, c-format
 msgid "%s has returned from being idle"
 msgstr "%s はアイドルからもどってきました"
 
-#: src/gtkpounce.c:795
+#: src/gtkpounce.c:816
 #, c-format
 msgid "%s has returned from being away"
 msgstr "%s はアイドルからもどってきました"
 
-#: src/gtkpounce.c:796
+#: src/gtkpounce.c:817
 #, c-format
 msgid "%s has stopped typing to you"
 msgstr "%sはタイピングを終了しました"
 
-#: src/gtkpounce.c:797
+#: src/gtkpounce.c:818
 #, c-format
 msgid "%s has signed off"
 msgstr "%s はサインオフしました"
 
-#: src/gtkpounce.c:798
+#: src/gtkpounce.c:819
 #, c-format
 msgid "%s has become idle"
 msgstr "%s はアイドルになりました"
 
-#: src/gtkpounce.c:800
+#: src/gtkpounce.c:821
 msgid "Unknown pounce event. Please report this!"
 msgstr "不明な掴みイベントです.ぜひ報告してください!"
 
-#: src/gtkprefs.c:365
+#: src/gtkprefs.c:374
 msgid "Interface Options"
 msgstr "インターフェースオプション"
 
-#: src/gtkprefs.c:367
+#: src/gtkprefs.c:376
 msgid "D_isplay remote nicknames if no alias is set"
 msgstr "エイリアスがセットされていない場合リモートニックネームを表示する (_I)"
 
-#: src/gtkprefs.c:553
+#: src/gtkprefs.c:562
 msgid ""
 "Select a smiley theme that you would like to use from the list below. New "
 "themes can be installed by dragging and dropping them onto the theme list."
@@ -3187,431 +3409,492 @@
 "利用したい顔文字を以下のリストから選択してください.新しいテーマはテーマ一覧"
 "にドラッグアンドドロップすることにより追加できます."
 
-#: src/gtkprefs.c:588
+#: src/gtkprefs.c:597
 msgid "Icon"
 msgstr "アイコン"
 
-#: src/gtkprefs.c:595 src/gtkprefs.c:1794 src/protocols/jabber/buddy.c:263
-#: src/protocols/jabber/buddy.c:748
+#: src/gtkprefs.c:604 src/gtkprefs.c:2018 src/protocols/jabber/buddy.c:265
+#: src/protocols/jabber/buddy.c:748 src/protocols/jabber/chat.c:683
 msgid "Description"
 msgstr "概要"
 
-#: src/gtkprefs.c:662
+#: src/gtkprefs.c:671
 msgid "Style"
 msgstr "スタイル"
 
-#: src/gtkprefs.c:663
+#: src/gtkprefs.c:672
 msgid "_Bold"
 msgstr "ボールド (_B)"
 
-#: src/gtkprefs.c:665
+#: src/gtkprefs.c:674
 msgid "_Italics"
 msgstr "イタリック (_I)"
 
-#: src/gtkprefs.c:667
+#: src/gtkprefs.c:676
 msgid "_Underline"
 msgstr "下線 (_U)"
 
-#: src/gtkprefs.c:669
+#. who in their right mind would use this as a default anyway?
+#. * and plus, it wouldn't work as the code currently existed,
+#. * and then i went and applied simguy's patch to remove the
+#. * non-functional code.
+#. *
+#. * remove this after string freeze ends
+#.
+#: src/gtkprefs.c:686
 msgid "_Strikethrough"
 msgstr "打ち消し (_S)"
 
 # FIXME this is completely wrong
-#: src/gtkprefs.c:672
+#: src/gtkprefs.c:689
 #, fuzzy
 msgid "Face"
 msgstr "顔文字"
 
 # FIXME this is completely wrong
-#: src/gtkprefs.c:675
+#: src/gtkprefs.c:692
 #, fuzzy
 msgid "Use custo_m face"
 msgstr "独自の顔文字を使う (_M)"
 
-#: src/gtkprefs.c:692
+#: src/gtkprefs.c:709
 msgid "Use custom si_ze"
 msgstr "独自のサイズを使う (_Z)"
 
-#: src/gtkprefs.c:704
+#: src/gtkprefs.c:721
 msgid "Color"
 msgstr "色"
 
-#: src/gtkprefs.c:708
+#: src/gtkprefs.c:725
 msgid "_Text color"
 msgstr "文字色 (_T)"
 
-#: src/gtkprefs.c:727
+#: src/gtkprefs.c:744
 msgid "Bac_kground color"
 msgstr "背景色 (_K)"
 
-#: src/gtkprefs.c:755 src/gtkprefs.c:987 src/gtkprefs.c:1035
+#: src/gtkprefs.c:772 src/gtkprefs.c:1004 src/gtkprefs.c:1052
 msgid "Display"
 msgstr "表示"
 
-#: src/gtkprefs.c:756
+#: src/gtkprefs.c:773
 msgid "Show graphical _smileys"
 msgstr "画像の顔文字を表示する (_S)"
 
-#: src/gtkprefs.c:758
+#: src/gtkprefs.c:775
 msgid "Show _timestamp on messages"
 msgstr "メッセージのタイムスタンプを表示する (_T)"
 
-#: src/gtkprefs.c:760
+#: src/gtkprefs.c:777
 msgid "Show _URLs as links"
 msgstr "リンクとして URL を表示する (_U)"
 
-#: src/gtkprefs.c:764
+#: src/gtkprefs.c:781
 msgid "_Highlight misspelled words"
 msgstr "ミススペルをハイライトする (_H)"
 
-#: src/gtkprefs.c:768
+#: src/gtkprefs.c:785
 msgid "Ignore c_olors"
 msgstr "色を無視する (_O)"
 
-#: src/gtkprefs.c:770
+#: src/gtkprefs.c:787
 msgid "Ignore font _faces"
 msgstr "フォントを無視する (_F)"
 
-#: src/gtkprefs.c:772
+#: src/gtkprefs.c:789
 msgid "Ignore font si_zes"
 msgstr "フォントサイズを無視する (_Z)"
 
-#: src/gtkprefs.c:785
+#: src/gtkprefs.c:802
 msgid "Send Message"
 msgstr "メッセージ送信"
 
-#: src/gtkprefs.c:786
+#: src/gtkprefs.c:803
 msgid "Enter _sends message"
 msgstr "「Enter」でメッセージを送信する (_S)"
 
-#: src/gtkprefs.c:788
+#: src/gtkprefs.c:805
 msgid "C_ontrol-Enter sends message"
 msgstr "「Control-Enter」でメッセージを送信する (_O)"
 
-#: src/gtkprefs.c:791
+#: src/gtkprefs.c:808
 msgid "Window Closing"
 msgstr "ウィンドウを閉じる"
 
-#: src/gtkprefs.c:792
+#: src/gtkprefs.c:809
 msgid "_Escape closes window"
 msgstr "「Escape」でウィンドウを閉じる (_E)"
 
-#: src/gtkprefs.c:795
+#: src/gtkprefs.c:812
 msgid "Insertions"
 msgstr "挿入"
 
-#: src/gtkprefs.c:796
+#: src/gtkprefs.c:813
 msgid "Control-{B/I/U} inserts _HTML tags"
 msgstr "「Control-{B/I/U}」で HTML タグを挿入する (_H)"
 
-#: src/gtkprefs.c:798
+#: src/gtkprefs.c:815
 msgid "Control-(number) _inserts smileys"
 msgstr "「Control-(number)」で顔文字を挿入する (_I)"
 
-#: src/gtkprefs.c:814
+#: src/gtkprefs.c:831
 msgid "Buddy List Sorting"
 msgstr "仲間リストのソート"
 
-#: src/gtkprefs.c:823
-msgid "Sorting:"
+#: src/gtkprefs.c:840
+#, fuzzy
+msgid "_Sorting:"
 msgstr "ソート:"
 
-#: src/gtkprefs.c:828
+#: src/gtkprefs.c:845
 msgid "Buddy List Toolbar"
 msgstr "仲間リストツールバー"
 
-#: src/gtkprefs.c:829 src/gtkprefs.c:960 src/gtkprefs.c:1011
+#: src/gtkprefs.c:846 src/gtkprefs.c:977 src/gtkprefs.c:1028
 msgid "Show _buttons as:"
 msgstr "ボタンの表示 (_B):"
 
-#: src/gtkprefs.c:831 src/gtkprefs.c:962 src/gtkprefs.c:1013
+#: src/gtkprefs.c:848 src/gtkprefs.c:979 src/gtkprefs.c:1030
 msgid "Pictures"
 msgstr "画像"
 
-#: src/gtkprefs.c:832 src/gtkprefs.c:963 src/gtkprefs.c:1014
+#: src/gtkprefs.c:849 src/gtkprefs.c:980 src/gtkprefs.c:1031
 msgid "Text"
 msgstr "テキスト"
 
-#: src/gtkprefs.c:833 src/gtkprefs.c:964 src/gtkprefs.c:1015
+#: src/gtkprefs.c:850 src/gtkprefs.c:981 src/gtkprefs.c:1032
 msgid "Pictures and text"
 msgstr "画像とテキスト"
 
-#: src/gtkprefs.c:838 src/gtkprefs.c:975 src/gtkprefs.c:1026
+#: src/gtkprefs.c:855 src/gtkprefs.c:992 src/gtkprefs.c:1043
 msgid "_Raise window on events"
 msgstr "イベント発生でウィンドウをアクティブにする (_R)"
 
-#: src/gtkprefs.c:841
+#: src/gtkprefs.c:858
 msgid "Group Display"
 msgstr "グループの表示"
 
-#: src/gtkprefs.c:842
+#: src/gtkprefs.c:859
 msgid "Show _numbers in groups"
 msgstr "グループの数を表示する (_N)"
 
-#: src/gtkprefs.c:845
+#: src/gtkprefs.c:862
 msgid "Buddy Display"
 msgstr "仲間の表示"
 
-#: src/gtkprefs.c:846 src/gtkprefs.c:982
+#: src/gtkprefs.c:863 src/gtkprefs.c:999
 msgid "Show buddy _icons"
 msgstr "仲間アイコンを表示する (_i)"
 
-#: src/gtkprefs.c:848
+#: src/gtkprefs.c:865
 msgid "Show _warning levels"
 msgstr "警告レベルを表示する (_w)"
 
-#: src/gtkprefs.c:850
+#: src/gtkprefs.c:867
 msgid "Show idle _times"
 msgstr "反応がない時間を表示する (_T)"
 
-#: src/gtkprefs.c:852
+#: src/gtkprefs.c:869
 msgid "Dim i_dle buddies"
 msgstr "反応のない仲間は暗く表示する (_D)"
 
-#: src/gtkprefs.c:854
+#: src/gtkprefs.c:871
 msgid "_Automatically expand contacts"
 msgstr ""
 
-#: src/gtkprefs.c:879
+#: src/gtkprefs.c:896
 msgid "_Placement:"
 msgstr "位置 (_P):"
 
-#: src/gtkprefs.c:886
+#: src/gtkprefs.c:903
 msgid "Send _URLs as Links"
 msgstr "リンクとして URL を送信する (_U)"
 
-#: src/gtkprefs.c:889
-msgid "Show Formatting Toolbar"
-msgstr ""
-
-#: src/gtkprefs.c:892
+#: src/gtkprefs.c:906
+msgid "Show _Formatting Toolbar"
+msgstr ""
+
+#: src/gtkprefs.c:909
 msgid "Show a_liases in tabs/titles"
 msgstr "タブ/題名でエイリアスを表示する (_L)"
 
-#: src/gtkprefs.c:895
+#: src/gtkprefs.c:912
 msgid "Tab Options"
 msgstr "タブオプション"
 
-#: src/gtkprefs.c:897
+#: src/gtkprefs.c:914
 msgid "_Tab Placement:"
 msgstr "タブの位置 (_T):"
 
-#: src/gtkprefs.c:899
+#: src/gtkprefs.c:916
 msgid "Top"
 msgstr "上"
 
-#: src/gtkprefs.c:900
+#: src/gtkprefs.c:917
 msgid "Bottom"
 msgstr "下"
 
-#: src/gtkprefs.c:901
+#: src/gtkprefs.c:918
 msgid "Left"
 msgstr "左"
 
-#: src/gtkprefs.c:902
+#: src/gtkprefs.c:919
 msgid "Right"
 msgstr "右"
 
-#: src/gtkprefs.c:908
+#: src/gtkprefs.c:925
 #, fuzzy
 msgid "Show IMs and chats in _tabbed windows"
 msgstr "IM とチャットを同じタブウィンドウで表示する (_S)"
 
-#: src/gtkprefs.c:911
+#: src/gtkprefs.c:928
 #, fuzzy
 msgid "Show IMs and chats in _same tabbed window"
 msgstr "IM とチャットを同じタブウィンドウで表示する (_S)"
 
-#: src/gtkprefs.c:921
+#: src/gtkprefs.c:938
 msgid "Show _close button on tabs"
 msgstr "タブに閉じるボタンを表示する (_C)"
 
-#: src/gtkprefs.c:932
+#: src/gtkprefs.c:949
 #, fuzzy
 msgid "Show status _icons on tabs"
 msgstr "タブに閉じるボタンを表示する (_C)"
 
-#: src/gtkprefs.c:959 src/gtkprefs.c:1010
+#: src/gtkprefs.c:976 src/gtkprefs.c:1027
 msgid "Window"
 msgstr "ウィンドウ"
 
-#: src/gtkprefs.c:969 src/gtkprefs.c:1020
+#: src/gtkprefs.c:986 src/gtkprefs.c:1037
 msgid "New window _width:"
 msgstr "新しいウィンドウの幅 (_W):"
 
-#: src/gtkprefs.c:971 src/gtkprefs.c:1022
+#: src/gtkprefs.c:988 src/gtkprefs.c:1039
 msgid "New window _height:"
 msgstr "新しいウィンドウの高さ (_H):"
 
-#: src/gtkprefs.c:973 src/gtkprefs.c:1024
+#: src/gtkprefs.c:990 src/gtkprefs.c:1041
 msgid "_Entry field height:"
 msgstr "入力フィールドの高さ (_E):"
 
-#: src/gtkprefs.c:977
+#: src/gtkprefs.c:994
 msgid "Hide window on _send"
 msgstr "送信時にウィンドウを隠す (_S)"
 
-#: src/gtkprefs.c:981
+#: src/gtkprefs.c:998
 msgid "Buddy Icons"
 msgstr "仲間アイコン"
 
-#: src/gtkprefs.c:984
+#: src/gtkprefs.c:1001
 #, fuzzy
 msgid "Enable buddy icon a_nimation"
 msgstr "仲間アイコンのアニメーションを無効にする (_N)"
 
-#: src/gtkprefs.c:988
+#: src/gtkprefs.c:1005
 msgid "Show _logins in window"
 msgstr "ウィンドウでログインを表示する (_L)"
 
-#: src/gtkprefs.c:991
+#: src/gtkprefs.c:1008
 msgid "Typing Notification"
 msgstr "タイピング通知"
 
-#: src/gtkprefs.c:992
+#: src/gtkprefs.c:1009
 msgid "Notify buddies that you are _typing to them"
 msgstr "メッセージ入力中であることを仲間に通知する (_T)"
 
-#: src/gtkprefs.c:1029
+#: src/gtkprefs.c:1046
 msgid "Tab Completion"
 msgstr "タブ補完"
 
-#: src/gtkprefs.c:1030
+#: src/gtkprefs.c:1047
 msgid "_Tab-complete nicks"
 msgstr "ニックネームをタブ補完する (_T)"
 
-#: src/gtkprefs.c:1032
+#: src/gtkprefs.c:1049
 msgid "_Old-style tab completion"
 msgstr "古いスタイルのタブ補完 (_O)"
 
-#: src/gtkprefs.c:1036
+#: src/gtkprefs.c:1053
 msgid "_Show people joining in window"
 msgstr "加入をウィンドウで表示 (_S)"
 
-#: src/gtkprefs.c:1038
+#: src/gtkprefs.c:1055
 msgid "_Show people leaving in window"
 msgstr "離席をウィンドウで表示 (_S)"
 
-#: src/gtkprefs.c:1040
-msgid "Co_lorize screennames"
+#: src/gtkprefs.c:1057
+#, fuzzy
+msgid "Co_lorize screen names"
 msgstr "スクリーン名をカラーにする (_L)"
 
-#: src/gtkprefs.c:1084
+#: src/gtkprefs.c:1078
+#, fuzzy
+msgid "IP Address"
+msgstr "住所"
+
+#: src/gtkprefs.c:1080
+#, fuzzy
+msgid "_Autodetect IP Address"
+msgstr "住所"
+
+#: src/gtkprefs.c:1089
+msgid "Public _IP:"
+msgstr ""
+
+#: src/gtkprefs.c:1113
+#, fuzzy
+msgid "Ports"
+msgstr "ポート番号"
+
+#: src/gtkprefs.c:1116
+msgid "_Manually specify range of ports to listen on"
+msgstr ""
+
+#: src/gtkprefs.c:1119
+#, fuzzy
+msgid "_Start Port:"
+msgstr "ポート番号 (_P):"
+
+#: src/gtkprefs.c:1126
+#, fuzzy
+msgid "_End Port:"
+msgstr "ポート番号 (_P):"
+
+#: src/gtkprefs.c:1174
 msgid "Proxy Type"
 msgstr "プロキシの種類"
 
-#: src/gtkprefs.c:1087
+#: src/gtkprefs.c:1177
 msgid "No proxy"
 msgstr "プロキシなし"
 
-#: src/gtkprefs.c:1094
+#: src/gtkprefs.c:1184
 msgid "Proxy Server"
 msgstr "プロキシサーバ"
 
-#: src/gtkprefs.c:1150
+#: src/gtkprefs.c:1242
 msgid "_User:"
 msgstr "ユーザ名 (_U):"
 
-#: src/gtkprefs.c:1204
+#: src/gtkprefs.c:1298
 msgid "Opera"
 msgstr "Opera"
 
-#: src/gtkprefs.c:1205
+#: src/gtkprefs.c:1299
 msgid "Netscape"
 msgstr "Netscape"
 
-#: src/gtkprefs.c:1206
+#: src/gtkprefs.c:1300
 msgid "Mozilla"
 msgstr "Mozilla"
 
-#: src/gtkprefs.c:1207
+#: src/gtkprefs.c:1301
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: src/gtkprefs.c:1208
+#: src/gtkprefs.c:1302
 msgid "Galeon"
 msgstr "Galeon"
 
-#: src/gtkprefs.c:1209
+#: src/gtkprefs.c:1303
 msgid "Firebird"
 msgstr "Firebird"
 
-#: src/gtkprefs.c:1218
+#: src/gtkprefs.c:1304
+msgid "Firefox"
+msgstr ""
+
+#: src/gtkprefs.c:1305
+msgid "Gnome Default"
+msgstr ""
+
+#: src/gtkprefs.c:1314
 msgid "Manual"
 msgstr "手動設定"
 
-#: src/gtkprefs.c:1259
+#: src/gtkprefs.c:1365
 msgid "Browser Selection"
 msgstr "ブラウザの選択"
 
-#: src/gtkprefs.c:1263
+#: src/gtkprefs.c:1369
 msgid "_Browser:"
 msgstr "ブラウザ (_B):"
 
-#: src/gtkprefs.c:1273
+#: src/gtkprefs.c:1376
+#, fuzzy
+msgid "_Open link in:"
+msgstr "リンクをブラウザで開く (_O)"
+
+#: src/gtkprefs.c:1378
+#, fuzzy
+msgid "Browser default"
+msgstr "おもしろくもないデフォルト"
+
+#: src/gtkprefs.c:1379
+msgid "Existing window"
+msgstr ""
+
+#: src/gtkprefs.c:1381
+#, fuzzy
+msgid "New tab"
+msgstr "新規"
+
+#: src/gtkprefs.c:1395
 #, c-format
 msgid ""
 "_Manual:\n"
 "(%s for URL)"
 msgstr ""
 
-#: src/gtkprefs.c:1294
-msgid "Browser Options"
-msgstr "ブラウザオプション"
-
-#: src/gtkprefs.c:1295
-msgid "Open new _window by default"
-msgstr "デフォルトで新しいウィンドウを開く (_W)"
-
-#: src/gtkprefs.c:1311
+#: src/gtkprefs.c:1428
 msgid "Message Logs"
 msgstr "メッセージログ"
 
-#: src/gtkprefs.c:1314
+#: src/gtkprefs.c:1431
 msgid "Log _Format:"
 msgstr ""
 
-#: src/gtkprefs.c:1317
+#: src/gtkprefs.c:1434
 msgid "_Log all instant messages"
 msgstr "全てのインスタントメッセージを記録する (_L)"
 
-#: src/gtkprefs.c:1319
+#: src/gtkprefs.c:1436
 msgid "Log all c_hats"
 msgstr "全てのチャットを記録する (_H)"
 
-#: src/gtkprefs.c:1374
+#: src/gtkprefs.c:1491
 msgid "Sound Options"
 msgstr "音声オプション"
 
-#: src/gtkprefs.c:1375
+#: src/gtkprefs.c:1492
 msgid "_No sounds when you log in"
 msgstr "ログインしたときに音を鳴らさない (_N)"
 
-#: src/gtkprefs.c:1377
+#: src/gtkprefs.c:1494
 msgid "_Sounds while away"
 msgstr "離席中にも音を鳴らす (_S)"
 
-#: src/gtkprefs.c:1381
+#: src/gtkprefs.c:1498
 msgid "Sound Method"
 msgstr "音声出力の方法"
 
-#: src/gtkprefs.c:1382
+#: src/gtkprefs.c:1499
 msgid "_Method:"
 msgstr "方法 (_M):"
 
-#: src/gtkprefs.c:1384
+#: src/gtkprefs.c:1501
 msgid "Console beep"
 msgstr "ビープ音"
 
-#: src/gtkprefs.c:1386
+#: src/gtkprefs.c:1503
 msgid "Automatic"
 msgstr "自動"
 
-#: src/gtkprefs.c:1393
+#: src/gtkprefs.c:1510
 msgid "Command"
 msgstr "コマンド"
 
-#: src/gtkprefs.c:1403
+#: src/gtkprefs.c:1520
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -3620,72 +3903,77 @@
 "音声出力コマンド (_O):\n"
 "(%s はファイル名になる)"
 
-#: src/gtkprefs.c:1458
+#: src/gtkprefs.c:1577
 msgid "_Sending messages removes away status"
 msgstr "メッセージを送信すると離席状態を解除する (_S)"
 
-#: src/gtkprefs.c:1460
+#: src/gtkprefs.c:1579
 msgid "_Queue new messages when away"
 msgstr "離席中の新規メッセージはキューする (_Q)"
 
-#: src/gtkprefs.c:1463
+#: src/gtkprefs.c:1582
 msgid "Auto-response"
 msgstr "自動返答"
 
-#: src/gtkprefs.c:1466
+#: src/gtkprefs.c:1585
 msgid "Seconds before _resending:"
 msgstr "再送までの時間 (_R):"
 
-#: src/gtkprefs.c:1469
+#: src/gtkprefs.c:1588
 #, fuzzy
 msgid "_Send auto-response"
 msgstr "自動返答を送らない (_D)"
 
-#: src/gtkprefs.c:1471
+#: src/gtkprefs.c:1590
 msgid "_Only send auto-response when idle"
 msgstr "休止中は自動返答のみ送信する (_O)"
 
-#: src/gtkprefs.c:1473
+#: src/gtkprefs.c:1592
 #, fuzzy
 msgid "Send auto-response in _active conversations"
 msgstr "進行中の会話では自動返答を送らない (_N)"
 
-#: src/gtkprefs.c:1483
+#: src/gtkprefs.c:1601 src/protocols/msn/state.c:30
+#: src/protocols/yahoo/yahoo.c:2291
+msgid "Idle"
+msgstr "休止中"
+
+#: src/gtkprefs.c:1602
 msgid "Idle _time reporting:"
 msgstr "休止時間を報告する (_T):"
 
 # FIXME This looks wrong
-#: src/gtkprefs.c:1486
+#: src/gtkprefs.c:1605
 msgid "Gaim usage"
 msgstr "Gaim の利用法"
 
 # FIXME This looks wrong
-#: src/gtkprefs.c:1489
+#: src/gtkprefs.c:1608
 msgid "X usage"
 msgstr "X の利用法"
 
 # FIXME This still looks wrong
-#: src/gtkprefs.c:1491
+#: src/gtkprefs.c:1610
 msgid "Windows usage"
 msgstr "Windows の利用法"
 
-#: src/gtkprefs.c:1499
+#: src/gtkprefs.c:1618
 msgid "Auto-away"
 msgstr "自動離席"
 
-#: src/gtkprefs.c:1500
+#: src/gtkprefs.c:1619
 msgid "Set away _when idle"
 msgstr "休止中は離席にする (_W)"
 
-#: src/gtkprefs.c:1503
+#: src/gtkprefs.c:1623
 msgid "_Minutes before setting away:"
 msgstr "何分で離席になるか (_M):"
 
-#: src/gtkprefs.c:1509
+#: src/gtkprefs.c:1631
 msgid "Away m_essage:"
 msgstr "離席メッセージ (_E):"
 
-#: src/gtkprefs.c:1571
+#: src/gtkprefs.c:1786
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -3700,7 +3988,7 @@
 "<span weight=\"bold\">URL:</span>         %s\n"
 "<span weight=\"bold\">ファイル名:</span>\t%s"
 
-#: src/gtkprefs.c:1576
+#: src/gtkprefs.c:1791
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -3715,185 +4003,199 @@
 "<span weight=\"bold\">URL:</span>  %s\n"
 "<span weight=\"bold\">ファイル名:</span>  %s"
 
-#: src/gtkprefs.c:1758
+#: src/gtkprefs.c:1974
 msgid "Load"
 msgstr "読み込み"
 
-#: src/gtkprefs.c:1765 src/protocols/jabber/jabber.c:618
-#: src/protocols/msn/msn.c:1350 src/protocols/trepia/trepia.c:401
-msgid "Name"
-msgstr "名前"
-
-#: src/gtkprefs.c:1812
+#: src/gtkprefs.c:1988
+msgid "Summary"
+msgstr ""
+
+#: src/gtkprefs.c:2036
 msgid "Details"
 msgstr "詳細"
 
-#: src/gtkprefs.c:1939
+#: src/gtkprefs.c:2163
 msgid "Sound Selection"
 msgstr "音声選択"
 
-#: src/gtkprefs.c:2046
+#: src/gtkprefs.c:2270
 msgid "Play"
 msgstr "再生"
 
-#: src/gtkprefs.c:2053
+#: src/gtkprefs.c:2277
 msgid "Event"
 msgstr "イベント"
 
-#: src/gtkprefs.c:2076
+#: src/gtkprefs.c:2296
+msgid "Test"
+msgstr "テスト"
+
+#: src/gtkprefs.c:2300
 msgid "Reset"
 msgstr "リセット"
 
-#: src/gtkprefs.c:2080
+#: src/gtkprefs.c:2304
 msgid "Choose..."
 msgstr "選択..."
 
-#: src/gtkprefs.c:2215
+#: src/gtkprefs.c:2439
 msgid "_Edit"
 msgstr "編集 (_E)"
 
-#: src/gtkprefs.c:2251
+#: src/gtkprefs.c:2475
 msgid "Interface"
 msgstr "インターフェース"
 
-#: src/gtkprefs.c:2252
+#: src/gtkprefs.c:2476
 msgid "Smiley Themes"
 msgstr "顔文字のテーマ"
 
-#: src/gtkprefs.c:2253
+#: src/gtkprefs.c:2477
 msgid "Fonts"
 msgstr "フォント"
 
-#: src/gtkprefs.c:2254
+#: src/gtkprefs.c:2478
 msgid "Message Text"
 msgstr "メッセージテキスト"
 
-#: src/gtkprefs.c:2255
+#: src/gtkprefs.c:2479
 msgid "Shortcuts"
 msgstr "ショートカット"
 
-#: src/gtkprefs.c:2258
+#: src/gtkprefs.c:2482
 msgid "IMs"
 msgstr "IM"
 
-#: src/gtkprefs.c:2260
+#: src/gtkprefs.c:2484
+#, fuzzy
+msgid "Network"
+msgstr "新規"
+
+#: src/gtkprefs.c:2485
 msgid "Proxy"
 msgstr "プロキシ"
 
 #. We use the registered default browser in windows
-#: src/gtkprefs.c:2263
+#: src/gtkprefs.c:2488
 msgid "Browser"
 msgstr "ブラウザ"
 
-#: src/gtkprefs.c:2265
+#: src/gtkprefs.c:2490
 msgid "Logging"
 msgstr "ログ"
 
-#: src/gtkprefs.c:2266
+#: src/gtkprefs.c:2491
 msgid "Sounds"
 msgstr "音声"
 
-#: src/gtkprefs.c:2267
+#: src/gtkprefs.c:2492
 msgid "Sound Events"
 msgstr "音声イベント"
 
-#: src/gtkprefs.c:2268
+#: src/gtkprefs.c:2493
 msgid "Away / Idle"
 msgstr "離席 / 休止中"
 
-#: src/gtkprefs.c:2269
+#: src/gtkprefs.c:2494
 msgid "Away Messages"
 msgstr "離席メッセージ"
 
-#: src/gtkprefs.c:2272
+#: src/gtkprefs.c:2496
+#, fuzzy
+msgid "Protocols"
+msgstr "プロトコル:"
+
+#: src/gtkprefs.c:2512
 msgid "Plugins"
 msgstr "プラグイン"
 
-#: src/gtkprivacy.c:86
+#: src/gtkprivacy.c:77
 msgid "Allow all users to contact me"
 msgstr "すべてのユーザのコンタクトを許可する"
 
-#: src/gtkprivacy.c:87
+#: src/gtkprivacy.c:78
 #, fuzzy
 msgid "Allow only the users on my buddy list"
 msgstr "仲間リストに入っているユーザのみ許可する"
 
-#: src/gtkprivacy.c:88
+#: src/gtkprivacy.c:79
 msgid "Allow only the users below"
 msgstr "以下のユーザのみ許可する"
 
-#: src/gtkprivacy.c:89
+#: src/gtkprivacy.c:80
 #, fuzzy
 msgid "Block all users"
 msgstr "ユーザを拒否する"
 
-#: src/gtkprivacy.c:90
-msgid "Block the users below"
+#: src/gtkprivacy.c:81
+#, fuzzy
+msgid "Block only the users below"
 msgstr "以下のユーザのみ拒否する"
 
-#: src/gtkprivacy.c:369
+#: src/gtkprivacy.c:360 src/protocols/jabber/jabber.c:1406
 msgid "Privacy"
 msgstr "個人情報"
 
-#: src/gtkprivacy.c:384
+#: src/gtkprivacy.c:375
 msgid "Changes to privacy settings take effect immediately."
 msgstr "個人情報の設定はすぐに反映されます。"
 
 #. "Set privacy for:" label
-#: src/gtkprivacy.c:396
+#: src/gtkprivacy.c:387
 msgid "Set privacy for:"
 msgstr "個人情報設定:"
 
-#: src/gtkprivacy.c:563 src/gtkprivacy.c:579
+#: src/gtkprivacy.c:555 src/gtkprivacy.c:571
 #, fuzzy
 msgid "Permit User"
 msgstr "許可"
 
-#: src/gtkprivacy.c:564
+#: src/gtkprivacy.c:556
 msgid "Type a user you permit to contact you."
 msgstr ""
 
-#: src/gtkprivacy.c:565
+#: src/gtkprivacy.c:557
 #, fuzzy
 msgid "Please enter the name of the user you wish to be able to contact you."
 msgstr ""
 "招待しようとしているユーザの名前を入力してください.また,オプションとして招"
 "待メッセージも書いてください."
 
-#: src/gtkprivacy.c:568 src/gtkprivacy.c:581
+#: src/gtkprivacy.c:560 src/gtkprivacy.c:573
 msgid "Permit"
 msgstr "許可"
 
-#: src/gtkprivacy.c:573
+#: src/gtkprivacy.c:565
 #, fuzzy, c-format
 msgid "Allow %s to contact you?"
 msgstr "すべてのユーザのコンタクトを許可する"
 
-#: src/gtkprivacy.c:575
+#: src/gtkprivacy.c:567
 #, fuzzy, c-format
 msgid "Are you sure you wish to allow %s to contact you?"
 msgstr "本当に%sを削除したいのですか?"
 
-#: src/gtkprivacy.c:602 src/gtkprivacy.c:615
+#: src/gtkprivacy.c:594 src/gtkprivacy.c:607
 #, fuzzy
 msgid "Block User"
 msgstr "ユーザを拒否する"
 
-#: src/gtkprivacy.c:603
+#: src/gtkprivacy.c:595
 msgid "Type a user to block."
 msgstr ""
 
-#: src/gtkprivacy.c:604
+#: src/gtkprivacy.c:596
 #, fuzzy
 msgid "Please enter the name of the user you wish to block."
 msgstr "加わるグループ名を入力してください。\n"
 
-#: src/gtkprivacy.c:611
+#: src/gtkprivacy.c:603
 #, fuzzy, c-format
 msgid "Block %s?"
 msgstr "拒む"
 
-#: src/gtkprivacy.c:613
+#: src/gtkprivacy.c:605
 #, fuzzy, c-format
 msgid "Are you sure you want to block %s?"
 msgstr "本当に%sを削除したいのですか?"
@@ -3901,68 +4203,85 @@
 #. *
 #. * A wrapper for gaim_request_action() that uses Yes and No buttons.
 #.
-#: src/gtkrequest.c:188 src/protocols/gg/gg.c:660 src/request.h:1009
+#: src/gtkrequest.c:223 src/protocols/gg/gg.c:663 src/request.h:1228
 msgid "Yes"
 msgstr "はい"
 
-#: src/gtkrequest.c:189 src/protocols/gg/gg.c:660 src/request.h:1009
+#: src/gtkrequest.c:224 src/protocols/gg/gg.c:663 src/request.h:1228
 msgid "No"
 msgstr "いいえ"
 
-#: src/gtkrequest.c:192
+#: src/gtkrequest.c:227
 msgid "Apply"
 msgstr "適用"
 
-#: src/gtkrequest.c:193 src/protocols/msn/msn.c:247
+#: src/gtkrequest.c:228 src/protocols/msn/msn.c:248
 msgid "Close"
 msgstr "閉じる"
 
-#: src/gtksound.c:61
+#: src/gtkroomlist.c:322
+#, fuzzy
+msgid ""
+"You are not currently signed on with any protocols that have the ability to "
+"list rooms."
+msgstr "チャットできる機能がついているプロトコルでサインオンしていません."
+
+#: src/gtkroomlist.c:335
+#, fuzzy
+msgid "Room List"
+msgstr "リストにいません"
+
+#. list button
+#: src/gtkroomlist.c:410
+msgid "_Get List"
+msgstr ""
+
+#: src/gtksound.c:62
 msgid "Buddy logs in"
 msgstr "仲間がログインしました"
 
-#: src/gtksound.c:62
+#: src/gtksound.c:63
 msgid "Buddy logs out"
 msgstr "仲間がログアウトしました"
 
-#: src/gtksound.c:63
-msgid "Message received"
-msgstr "メッセージ受信"
-
 #: src/gtksound.c:64
+msgid "Message received"
+msgstr "メッセージ受信"
+
+#: src/gtksound.c:65
 msgid "Message received begins conversation"
 msgstr "受信したメッセージが会話を開始します"
 
-#: src/gtksound.c:65
+#: src/gtksound.c:66
 msgid "Message sent"
 msgstr "メッセージ送信"
 
-#: src/gtksound.c:66
+#: src/gtksound.c:67
 msgid "Person enters chat"
 msgstr "チャットに人が参加"
 
-#: src/gtksound.c:67
+#: src/gtksound.c:68
 msgid "Person leaves chat"
 msgstr "人がチャットから出ました"
 
-#: src/gtksound.c:68
+#: src/gtksound.c:69
 msgid "You talk in chat"
 msgstr "あなたがチャットで話します"
 
-#: src/gtksound.c:69
+#: src/gtksound.c:70
 msgid "Others talk in chat"
 msgstr "他の人がチャットで話します"
 
-#: src/gtksound.c:72
+#: src/gtksound.c:73
 msgid "Someone says your name in chat"
 msgstr "チャットであなたの名前を誰かがいう"
 
-#: src/gtksound.c:156
+#: src/gtksound.c:157
 #, c-format
 msgid "Unable to play sound because the chosen file (%s) does not exist."
 msgstr "選択したファイル名 (%s)が存在しないため音を再生できません."
 
-#: src/gtksound.c:172
+#: src/gtksound.c:173
 msgid ""
 "Unable to play sound because the 'Command' sound method has been chosen, but "
 "no command has been set."
@@ -3970,75 +4289,90 @@
 "「コマンド」音声メソッドが選択されましたが,コマンドが指定されていないので音"
 "声を再生することができません."
 
-#: src/gtksound.c:184
+#: src/gtksound.c:185
 #, c-format
 msgid ""
 "Unable to play sound because the configured sound command could not be "
 "launched: %s"
 msgstr "設定した音声再生のコマンドが実行できないため音声を再生できません: %s"
 
-#: src/gtkutils.c:298
+#: src/gtkutils.c:297
 msgid "Can't save icon file to disk."
 msgstr "アイコンファイルをディスクに保存できません."
 
-#: src/gtkutils.c:333
+#: src/gtkutils.c:332
 msgid "Save Icon"
 msgstr "アイコンを保存"
 
-#: src/log.c:83
+#: src/log.c:88
 msgid "<b><font color=\"red\">The logger has no read function</font></b>"
 msgstr ""
 
-#: src/log.c:408
+#: src/log.c:433
 msgid "XML"
 msgstr "XML"
 
-#: src/log.c:488
-#, c-format
-msgid "<font color=\"#16569E\">(%s) <b>%s <AUTO-REPLY>:</b></font> %s<br/>\n"
+#: src/log.c:514
+#, fuzzy, c-format
+msgid ""
+"<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
+"REPLY&gt;:</b></font> %s<br/>\n"
 msgstr "<font color=\"#16569E\">(%s) <b>%s <自動返答>:</b></font> %s<br/>\n"
 
-#: src/log.c:490
-#, c-format
-msgid "<font color=\"#A82F2F\">(%s) <b>%s <AUTO-REPLY>:</b></font> %s<br/>\n"
+#: src/log.c:516
+#, fuzzy, c-format
+msgid ""
+"<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
+"REPLY&gt;:</b></font> %s<br/>\n"
 msgstr "<font color=\"#A82F2F\">(%s) <b>%s <自動返答>:</b></font> %s<br/>\n"
 
-#: src/log.c:534 src/log.c:669
+#: src/log.c:560 src/log.c:696
 msgid "<font color=\"red\"><b>Unable to find log path!</b></font>"
 msgstr ""
 
-#: src/log.c:544 src/log.c:679
+#: src/log.c:570 src/log.c:706
 #, c-format
 msgid "<font color=\"red\"><b>Could not read file: %s</b></font>"
 msgstr ""
 
-#: src/log.c:548
+#: src/log.c:574
 msgid "HTML"
 msgstr "HTML"
 
-#: src/log.c:622
+#: src/log.c:649
 #, c-format
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <自動返答>: %s\n"
 
-#: src/log.c:683
+#: src/log.c:710
 msgid "Plain text"
 msgstr ""
 
-#: src/main.c:149
-msgid "Please enter your login."
+#: src/main.c:157
+#, fuzzy
+msgid "Please create an account."
 msgstr "ログイン名を入力してください"
 
-#: src/main.c:232
-msgid "<New User>"
-msgstr "<新規ユーザ>"
-
-#: src/main.c:274
+#: src/main.c:239
 msgid "Login"
 msgstr "ログイン"
 
+#: src/main.c:257
+#, fuzzy
+msgid "<b>Screen Name:</b>"
+msgstr "スクリーン名:"
+
+#: src/main.c:271
+#, fuzzy
+msgid "<b>Password:</b>"
+msgstr "パスワード:"
+
+#: src/main.c:300
+msgid "Sign on"
+msgstr "サインオン"
+
 #. full help text
-#: src/main.c:553
+#: src/main.c:524
 #, c-format
 msgid ""
 "Gaim %s\n"
@@ -4071,37 +4405,37 @@
 "  -h, --help          このヘルプを表示して終了\n"
 
 #. short message
-#: src/main.c:568
+#: src/main.c:539
 #, c-format
 msgid "Gaim %s. Try `%s -h' for more information.\n"
 msgstr "Gaim %s. 詳しい情報は `%s -h' と入力してください\n"
 
-#: src/plugin.c:267
+#: src/plugin.c:269
 #, c-format
 msgid ""
 "The required plugin %s was not found. Please install this plugin and try "
 "again."
 msgstr ""
 
-#: src/plugin.c:272 src/plugin.c:300
+#: src/plugin.c:274 src/plugin.c:302
 msgid "Gaim was unable to load your plugin."
 msgstr "Gaim プラグインをロードできませんでした."
 
-#: src/plugin.c:296
+#: src/plugin.c:298
 #, c-format
 msgid "The required plugin %s was unable to load."
 msgstr ""
 
-#: src/prefs.c:111 src/status.c:270
+#: src/prefs.c:113 src/status.c:271
 #, fuzzy
 msgid "Slightly less boring default"
 msgstr "おもしろくもないデフォルト"
 
-#: src/protocols/gg/gg.c:49 src/protocols/jabber/jutil.c:110
-#: src/protocols/msn/msn.c:344 src/protocols/msn/state.c:27
+#: src/protocols/gg/gg.c:49 src/protocols/jabber/jutil.c:111
+#: src/protocols/msn/msn.c:345 src/protocols/msn/state.c:27
 #: src/protocols/msn/state.c:28 src/protocols/msn/state.c:35
-#: src/protocols/msn/state.c:36 src/protocols/yahoo/yahoo.c:2492
-#: src/protocols/yahoo/yahoo.c:2601
+#: src/protocols/msn/state.c:36 src/protocols/yahoo/yahoo.c:2594
+#: src/protocols/yahoo/yahoo.c:2703
 msgid "Available"
 msgstr "可視"
 
@@ -4113,11 +4447,12 @@
 msgid "Away for friends only"
 msgstr "仲間だけに離席"
 
-#: src/protocols/gg/gg.c:53 src/protocols/jabber/jabber.c:968
-#: src/protocols/jabber/presence.c:91 src/protocols/oscar/oscar.c:2846
-#: src/protocols/oscar/oscar.c:4584 src/protocols/oscar/oscar.c:4611
-#: src/protocols/oscar/oscar.c:6151 src/protocols/yahoo/yahoo.c:2187
-#: src/protocols/yahoo/yahoo.c:2512 src/protocols/yahoo/yahoo.c:2611
+#: src/protocols/gg/gg.c:53 src/protocols/jabber/jabber.c:964
+#: src/protocols/jabber/presence.c:121 src/protocols/oscar/oscar.c:2943
+#: src/protocols/oscar/oscar.c:4668 src/protocols/oscar/oscar.c:4739
+#: src/protocols/oscar/oscar.c:4763 src/protocols/oscar/oscar.c:6415
+#: src/protocols/oscar/oscar.c:6419 src/protocols/yahoo/yahoo.c:2289
+#: src/protocols/yahoo/yahoo.c:2614 src/protocols/yahoo/yahoo.c:2713
 msgid "Invisible"
 msgstr "隠れる"
 
@@ -4137,9 +4472,10 @@
 msgid "Unable to connect to server."
 msgstr "サーバへ接続できません"
 
-#: src/protocols/gg/gg.c:142 src/protocols/jabber/auth.c:65
-#: src/protocols/jabber/auth.c:158 src/protocols/jabber/auth.c:317
-#: src/protocols/jabber/auth.c:417 src/protocols/jabber/auth.c:429
+#: src/protocols/gg/gg.c:142 src/protocols/jabber/auth.c:130
+#: src/protocols/jabber/auth.c:204 src/protocols/jabber/auth.c:354
+#: src/protocols/jabber/auth.c:452 src/protocols/jabber/auth.c:464
+#: src/protocols/jabber/jabber.c:103
 msgid "Invalid response from server."
 msgstr "サーバから無効な返答です"
 
@@ -4173,159 +4509,161 @@
 msgstr "ソケットを読めません"
 
 #. we didn't successfully connect. tdt->toc_fd is valid here
-#: src/protocols/gg/gg.c:399 src/protocols/icq/gaim_icq.c:344
-#: src/protocols/msn/dispatch.c:208 src/protocols/msn/msn.c:492
-#: src/protocols/msn/notification.c:2165 src/protocols/napster/napster.c:463
+#: src/protocols/gg/gg.c:402 src/protocols/icq/gaim_icq.c:344
+#: src/protocols/msn/dispatch.c:208 src/protocols/msn/msn.c:496
+#: src/protocols/msn/notification.c:1789 src/protocols/napster/napster.c:463
 #: src/protocols/napster/napster.c:494 src/protocols/toc/toc.c:200
-#: src/protocols/yahoo/yahoo.c:1853 src/protocols/yahoo/yahoo.c:1884
-#: src/protocols/yahoo/yahoo.c:1949 src/protocols/yahoo/yahoo_filexfer.c:70
-#: src/protocols/yahoo/yahoo_filexfer.c:141
+#: src/protocols/yahoo/yahoo.c:1954 src/protocols/yahoo/yahoo.c:1985
+#: src/protocols/yahoo/yahoo.c:2048 src/protocols/yahoo/yahoo_filexfer.c:68
+#: src/protocols/yahoo/yahoo_filexfer.c:139
 msgid "Unable to connect."
 msgstr "接続できません"
 
-#: src/protocols/gg/gg.c:415
-msgid "Reading data"
-msgstr "データ読み込み中"
-
 #: src/protocols/gg/gg.c:418
+msgid "Reading data"
+msgstr "データ読み込み中"
+
+#: src/protocols/gg/gg.c:421
 msgid "Balancer handshake"
 msgstr "Balancer handshake"
 
-#: src/protocols/gg/gg.c:421
-msgid "Reading server key"
-msgstr "サーバキー読み込み中"
-
 #: src/protocols/gg/gg.c:424
+msgid "Reading server key"
+msgstr "サーバキー読み込み中"
+
+#: src/protocols/gg/gg.c:427
 msgid "Exchanging key hash"
 msgstr "ハッシュキーの交換中"
 
-#: src/protocols/gg/gg.c:434
+#: src/protocols/gg/gg.c:437
 msgid "Critical error in GG library\n"
 msgstr "GGライブラリに致命的なエラー\n"
 
-#: src/protocols/gg/gg.c:452 src/protocols/gg/gg.c:543
+#: src/protocols/gg/gg.c:455 src/protocols/gg/gg.c:546
 #: src/protocols/toc/toc.c:176
 #, c-format
 msgid "Connect to %s failed"
 msgstr "%s への接続に失敗しました"
 
-#: src/protocols/gg/gg.c:500
+#: src/protocols/gg/gg.c:503
 msgid "Unable to ping server"
 msgstr "サーバpingできません"
 
-#: src/protocols/gg/gg.c:512
+#: src/protocols/gg/gg.c:515
 msgid "Send as message"
 msgstr "メッセージ送信"
 
-#: src/protocols/gg/gg.c:517
+#: src/protocols/gg/gg.c:520
 msgid "Looking up GG server"
 msgstr "GGサーバ検索"
 
-#: src/protocols/gg/gg.c:520
+#: src/protocols/gg/gg.c:523
 msgid "Invalid Gadu-Gadu UIN specified"
 msgstr "それは無効なGadu-Gadu UINです"
 
-#: src/protocols/gg/gg.c:567
+#: src/protocols/gg/gg.c:570
 msgid "You are trying to send a message to an invalid Gadu-Gadu UIN."
 msgstr "無効なGadu-Gadu UINにメッセージを送ろうとしています"
 
-#: src/protocols/gg/gg.c:629
+#: src/protocols/gg/gg.c:632
 msgid "Couldn't get search results"
 msgstr "検索結果を得られませんでした"
 
-#: src/protocols/gg/gg.c:634
+#: src/protocols/gg/gg.c:637
 msgid "Gadu-Gadu Search Engine"
 msgstr "Gadu-Gadu 検索エンジン"
 
-#: src/protocols/gg/gg.c:659
+#: src/protocols/gg/gg.c:662
 msgid "Active"
 msgstr "有効"
 
-#: src/protocols/gg/gg.c:664 src/protocols/oscar/oscar.c:3962
+#: src/protocols/gg/gg.c:667 src/protocols/oscar/oscar.c:4106
 msgid "UIN"
 msgstr "UIN"
 
 #. First Name
-#: src/protocols/gg/gg.c:668 src/protocols/jabber/jabber.c:633
-#: src/protocols/oscar/oscar.c:3967 src/protocols/trepia/trepia.c:267
+#: src/protocols/gg/gg.c:671 src/protocols/jabber/jabber.c:605
+#: src/protocols/oscar/oscar.c:4111 src/protocols/trepia/trepia.c:267
 msgid "First Name"
 msgstr "姓"
 
 #. Last Name
-#: src/protocols/gg/gg.c:673 src/protocols/jabber/jabber.c:638
-#: src/protocols/oscar/oscar.c:3970 src/protocols/trepia/trepia.c:274
+#: src/protocols/gg/gg.c:676 src/protocols/jabber/jabber.c:610
+#: src/protocols/oscar/oscar.c:4114 src/protocols/trepia/trepia.c:274
 msgid "Last Name"
 msgstr "名"
 
-#: src/protocols/gg/gg.c:677 src/protocols/gg/gg.c:1388
-#: src/protocols/irc/msgs.c:183 src/protocols/oscar/oscar.c:3964
+#: src/protocols/gg/gg.c:680 src/protocols/gg/gg.c:1392
+#: src/protocols/irc/msgs.c:183 src/protocols/oscar/oscar.c:4108
 msgid "Nick"
 msgstr "ニック"
 
-#: src/protocols/gg/gg.c:684 src/protocols/gg/gg.c:687
-msgid "Birth year"
+#: src/protocols/gg/gg.c:687 src/protocols/gg/gg.c:690
+#, fuzzy
+msgid "Birth Year"
 msgstr "誕生年"
 
-#: src/protocols/gg/gg.c:693 src/protocols/gg/gg.c:695
-#: src/protocols/gg/gg.c:697
+#: src/protocols/gg/gg.c:696 src/protocols/gg/gg.c:698
+#: src/protocols/gg/gg.c:700
 msgid "Sex"
 msgstr "性"
 
 #. City
-#: src/protocols/gg/gg.c:701 src/protocols/jabber/jabber.c:648
-#: src/protocols/oscar/oscar.c:4016 src/protocols/oscar/oscar.c:4032
+#: src/protocols/gg/gg.c:704 src/protocols/jabber/jabber.c:620
+#: src/protocols/oscar/oscar.c:4160 src/protocols/oscar/oscar.c:4176
 #: src/protocols/trepia/trepia.c:331 src/protocols/trepia/trepia.c:430
 msgid "City"
 msgstr "町"
 
 #. res[0] == username
-#: src/protocols/gg/gg.c:722 src/protocols/msn/msn.c:1286
-#: src/protocols/msn/msn.c:1530 src/protocols/napster/napster.c:387
-#: src/protocols/oscar/oscar.c:2888 src/protocols/oscar/oscar.c:3203
-#: src/protocols/toc/toc.c:498 src/protocols/yahoo/yahoo.c:2785
-#: src/protocols/yahoo/yahoo.c:2807 src/protocols/yahoo/yahoo.c:2830
-#: src/protocols/yahoo/yahoo.c:2988 src/protocols/zephyr/zephyr.c:355
+#. show it to the user
+#: src/protocols/gg/gg.c:725 src/protocols/msn/msn.c:1303
+#: src/protocols/msn/msn.c:1547 src/protocols/napster/napster.c:387
+#: src/protocols/oscar/oscar.c:2985 src/protocols/oscar/oscar.c:3311
+#: src/protocols/toc/toc.c:498 src/protocols/yahoo/yahoo.c:2887
+#: src/protocols/yahoo/yahoo.c:2909 src/protocols/yahoo/yahoo.c:2932
+#: src/protocols/yahoo/yahoo.c:3090 src/protocols/zephyr/zephyr.c:536
 #, fuzzy
 msgid "Buddy Information"
 msgstr "勤務先情報:"
 
-#: src/protocols/gg/gg.c:741
+#: src/protocols/gg/gg.c:744
 msgid "There is no Buddy List stored on the Gadu-Gadu server."
 msgstr "Gadu-Gadu サーバ上に保存された仲間リストはありません。"
 
-#: src/protocols/gg/gg.c:749
+#: src/protocols/gg/gg.c:752
 msgid "Couldn't Import Buddy List from Server"
 msgstr "サーバから仲間リストの取り込みができませんでした"
 
-#: src/protocols/gg/gg.c:812
+#: src/protocols/gg/gg.c:815
 msgid "Buddy List successfully transferred to Gadu-Gadu server"
 msgstr "Gadu-Gadu サーバへの仲間リストの転送に成功しました"
 
-#: src/protocols/gg/gg.c:820
+#: src/protocols/gg/gg.c:823
 msgid "Couldn't transfer Buddy List to Gadu-Gadu server"
 msgstr "仲間リストの Gadu-Gadu サーバへの転送ができません"
 
-#: src/protocols/gg/gg.c:828
+#: src/protocols/gg/gg.c:831
 msgid "Buddy List successfully deleted from Gadu-Gadu server"
 msgstr "Gadu-Gadu サーバから仲間リストを削除しました"
 
-#: src/protocols/gg/gg.c:836
+#: src/protocols/gg/gg.c:839
 msgid "Couldn't delete Buddy List from Gadu-Gadu server"
 msgstr "Gadu-Gadu サーバの仲間リストを削除できません"
 
-#: src/protocols/gg/gg.c:844
+#: src/protocols/gg/gg.c:847
 msgid "Password changed successfully"
 msgstr "パスワード変更できました"
 
-#: src/protocols/gg/gg.c:851
+#: src/protocols/gg/gg.c:854
 msgid "Password couldn't be changed"
 msgstr "パスワード変更ができませんでした"
 
-#: src/protocols/gg/gg.c:968
+#: src/protocols/gg/gg.c:971
 msgid "Error communicating with Gadu-Gadu server"
 msgstr "Gadu-Gadu サーバとの通信中にエラー"
 
-#: src/protocols/gg/gg.c:969
+#: src/protocols/gg/gg.c:972
 msgid ""
 "Gaim was unable to complete your request due to a problem communicating with "
 "the Gadu-Gadu HTTP server.  Please try again later."
@@ -4333,11 +4671,11 @@
 "Gaim は Gadu-Gadu HTTP サーバとの通信で問題が発生したため、要求が完了できませ"
 "んでした。あとでもういちど試してみてください。"
 
-#: src/protocols/gg/gg.c:997
+#: src/protocols/gg/gg.c:1000
 msgid "Unable to import Gadu-Gadu buddy list"
 msgstr "Gadu-Gadu の仲間リストを取り込めません"
 
-#: src/protocols/gg/gg.c:998
+#: src/protocols/gg/gg.c:1001
 msgid ""
 "Gaim was unable to connect to the Gadu-Gadu buddy list server.  Please try "
 "again later."
@@ -4345,26 +4683,26 @@
 "Gaim は Gadu-Gadu の仲間リストサーバに接続できませんでした。あとでもう一度試"
 "してみてください。"
 
-#: src/protocols/gg/gg.c:1071
+#: src/protocols/gg/gg.c:1074
 msgid "Couldn't export buddy list"
 msgstr "仲間リストのエクスポートができませんでした"
 
-#: src/protocols/gg/gg.c:1072 src/protocols/gg/gg.c:1095
+#: src/protocols/gg/gg.c:1075 src/protocols/gg/gg.c:1098
 msgid ""
 "Gaim was unable to connect to the buddy list server.  Please try again later."
 msgstr ""
 "Gaim は 仲間リストサーバに接続できませんでした。あとでもう一度試してみてくだ"
 "さい。"
 
-#: src/protocols/gg/gg.c:1094
+#: src/protocols/gg/gg.c:1097
 msgid "Unable to delete Gadu-Gadu buddy list"
 msgstr "Gadu-Gadu の仲間リストを削除できません"
 
-#: src/protocols/gg/gg.c:1143
+#: src/protocols/gg/gg.c:1146
 msgid "Unable to access directory"
 msgstr "ディレクトリにアクセスできません"
 
-#: src/protocols/gg/gg.c:1144
+#: src/protocols/gg/gg.c:1147
 msgid ""
 "Gaim was unable to search the Directory because it was unable to connect to "
 "the directory server.  Please try again later."
@@ -4372,11 +4710,11 @@
 "Gaim はディレクトリサーバに接続できなかったので、ディレクトリを検索できません"
 "でした。あとでもう一度試してみてください。"
 
-#: src/protocols/gg/gg.c:1177
+#: src/protocols/gg/gg.c:1180
 msgid "Unable to change Gadu-Gadu password"
 msgstr "Gadu-Gadu のパスワードを変更できません"
 
-#: src/protocols/gg/gg.c:1178
+#: src/protocols/gg/gg.c:1181
 msgid ""
 "Gaim was unable to change your password due to an error connecting to the "
 "Gadu-Gadu server.  Please try again later."
@@ -4384,32 +4722,32 @@
 "Gaim は Gadu-Gadu サーバに接続中にエラーが発生したため、パスワードを変更でき"
 "ませんでした。あとでもう一度試してみてください。"
 
-#: src/protocols/gg/gg.c:1195
+#: src/protocols/gg/gg.c:1198
 msgid "Directory Search"
 msgstr "ディレクトリ検索"
 
-#: src/protocols/gg/gg.c:1204 src/protocols/jabber/jabber.c:1080
+#: src/protocols/gg/gg.c:1207 src/protocols/jabber/jabber.c:1063
 #: src/protocols/toc/toc.c:1546
 msgid "Change Password"
 msgstr "パスワード変更"
 
-#: src/protocols/gg/gg.c:1212
+#: src/protocols/gg/gg.c:1215
 msgid "Import Buddy List from Server"
 msgstr "サーバから仲間リストのインポート"
 
-#: src/protocols/gg/gg.c:1218
+#: src/protocols/gg/gg.c:1221
 msgid "Export Buddy List to Server"
 msgstr "サーバへ仲間リストをエクスポート"
 
-#: src/protocols/gg/gg.c:1224
+#: src/protocols/gg/gg.c:1227
 msgid "Delete Buddy List from Server"
 msgstr "サーバから仲間リストを削除"
 
-#: src/protocols/gg/gg.c:1257
+#: src/protocols/gg/gg.c:1260
 msgid "Unable to access user profile."
 msgstr "ユーザプロフィールにアクセスできません"
 
-#: src/protocols/gg/gg.c:1258
+#: src/protocols/gg/gg.c:1261
 msgid ""
 "Gaim was unable to access this user's profile due to an error connecting to "
 "the directory server.  Please try again later."
@@ -4427,7 +4765,8 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/gg/gg.c:1369 src/protocols/gg/gg.c:1371
+#. *  description
+#: src/protocols/gg/gg.c:1373 src/protocols/gg/gg.c:1375
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr "Gadu-Gadu プロトコルプラグイン"
 
@@ -4440,17 +4779,17 @@
 msgid "The user %s (%s%s%s%s%s) wants you to authorize them."
 msgstr "ユーザ %s (%s%s%s%s%s) があなたに承認されたがっています."
 
-#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:188
-#: src/protocols/msn/notification.c:957 src/protocols/msn/notification.c:1284
-#: src/protocols/msn/notification.c:1451 src/protocols/oscar/oscar.c:2618
-#: src/protocols/oscar/oscar.c:5142
+#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:224
+#: src/protocols/msn/notification.c:581 src/protocols/msn/notification.c:908
+#: src/protocols/msn/notification.c:1075 src/protocols/oscar/oscar.c:2715
+#: src/protocols/oscar/oscar.c:5374
 msgid "Authorize"
 msgstr "承認"
 
-#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:189
-#: src/protocols/msn/notification.c:958 src/protocols/msn/notification.c:1286
-#: src/protocols/msn/notification.c:1453 src/protocols/oscar/oscar.c:2620
-#: src/protocols/oscar/oscar.c:5143
+#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:225
+#: src/protocols/msn/notification.c:582 src/protocols/msn/notification.c:910
+#: src/protocols/msn/notification.c:1077 src/protocols/oscar/oscar.c:2717
+#: src/protocols/oscar/oscar.c:5375
 msgid "Deny"
 msgstr "非許可"
 
@@ -4488,63 +4827,89 @@
 "PING<BR>QUERY QUIT QUOTE UMODE<BR>WALLOPS WHOIS"
 msgstr ""
 
-#: src/protocols/irc/cmds.c:459 src/protocols/jabber/chat.c:544
+#: src/protocols/irc/cmds.c:466 src/protocols/jabber/chat.c:527
 #, fuzzy, c-format
 msgid "current topic is: %s"
 msgstr "現在トピックは %s です"
 
-#: src/protocols/irc/cmds.c:461 src/protocols/jabber/chat.c:546
+#: src/protocols/irc/cmds.c:468 src/protocols/jabber/chat.c:529
 msgid "No topic is set"
 msgstr "トピックが設定されていません"
 
-#: src/protocols/irc/irc.c:72
+#: src/protocols/irc/dcc_send.c:272 src/protocols/yahoo/yahoo_filexfer.c:199
+#: src/protocols/yahoo/yahoo_filexfer.c:208
+#: src/protocols/yahoo/yahoo_filexfer.c:217
+msgid "File Transfer Aborted"
+msgstr "ファイル転送が中断されました"
+
+#: src/protocols/irc/dcc_send.c:273
+msgid "Gaim could not open a listening port."
+msgstr ""
+
+#: src/protocols/irc/irc.c:73
 msgid "Error displaying MOTD"
 msgstr ""
 
-#: src/protocols/irc/irc.c:72
-msgid "No MOTD available"
-msgstr ""
-
 #: src/protocols/irc/irc.c:73
+msgid "No MOTD available"
+msgstr ""
+
+#: src/protocols/irc/irc.c:74
 msgid "There is no MOTD associated with this connection."
 msgstr ""
 
-#: src/protocols/irc/irc.c:76
+#: src/protocols/irc/irc.c:77
 #, c-format
 msgid "MOTD for %s"
 msgstr ""
 
-#: src/protocols/irc/irc.c:139
+#: src/protocols/irc/irc.c:140
 msgid "View MOTD"
 msgstr ""
 
-#: src/protocols/irc/irc.c:158
+#: src/protocols/irc/irc.c:154 src/protocols/jabber/buddy.c:883
+#: src/protocols/oscar/oscar.c:3189 src/protocols/oscar/oscar.c:6515
+#: src/protocols/yahoo/yahoo.c:2452
+msgid "Send File"
+msgstr "ファイル送信"
+
+#: src/protocols/irc/irc.c:168
 msgid "_Channel:"
 msgstr "チャンネル (_C):"
 
-#: src/protocols/irc/irc.c:163 src/protocols/jabber/chat.c:59
+#: src/protocols/irc/irc.c:173 src/protocols/jabber/chat.c:59
 msgid "_Password:"
 msgstr "パスワード (_P):"
 
-#: src/protocols/irc/irc.c:182
+#: src/protocols/irc/irc.c:192
 msgid "IRC nicks may not contain whitespace"
 msgstr ""
 
-#: src/protocols/irc/irc.c:201 src/protocols/toc/toc.c:228
+#: src/protocols/irc/irc.c:211 src/protocols/toc/toc.c:228
 #, c-format
 msgid "Signon: %s"
 msgstr "サインオン: %s"
 
-#: src/protocols/irc/irc.c:210
+#: src/protocols/irc/irc.c:220
 #, fuzzy
 msgid "Couldn't create socket"
 msgstr "ソケットを読めません"
 
-#: src/protocols/irc/irc.c:359 src/protocols/trepia/trepia.c:972
+#: src/protocols/irc/irc.c:369 src/protocols/trepia/trepia.c:977
 #, fuzzy
 msgid "Read error"
 msgstr "不正なエラー"
 
+#: src/protocols/irc/irc.c:503 src/protocols/yahoo/yahoochat.c:1343
+#, fuzzy
+msgid "Users"
+msgstr "ユーザ"
+
+#: src/protocols/irc/irc.c:506 src/protocols/yahoo/yahoochat.c:1352
+#, fuzzy
+msgid "Topic"
+msgstr "トピック:"
+
 #. *< api_version
 #. *< type
 #. *< ui_requirement
@@ -4554,33 +4919,33 @@
 #. *< id
 #. *< name
 #. *< version
-#: src/protocols/irc/irc.c:533
+#: src/protocols/irc/irc.c:611
 msgid "IRC Protocol Plugin"
 msgstr "IRCプロトコルプラグイン"
 
 #. *  summary
-#: src/protocols/irc/irc.c:534
+#: src/protocols/irc/irc.c:612
 #, fuzzy
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "IRCプロトコルプラグイン"
 
-#: src/protocols/irc/irc.c:551 src/protocols/irc/msgs.c:197
-#: src/protocols/jabber/jabber.c:1213 src/protocols/napster/napster.c:636
+#: src/protocols/irc/irc.c:629 src/protocols/irc/msgs.c:197
+#: src/protocols/jabber/jabber.c:1369 src/protocols/napster/napster.c:637
 msgid "Server"
 msgstr "サーバ"
 
-#: src/protocols/irc/irc.c:554 src/protocols/jabber/jabber.c:1228
-#: src/protocols/msn/msn.c:1661 src/protocols/napster/napster.c:641
-#: src/protocols/trepia/trepia.c:1344
+#: src/protocols/irc/irc.c:632 src/protocols/jabber/jabber.c:1390
+#: src/protocols/msn/msn.c:1680 src/protocols/napster/napster.c:642
+#: src/protocols/trepia/trepia.c:1350
 msgid "Port"
 msgstr "ポート番号"
 
-#: src/protocols/irc/irc.c:557
+#: src/protocols/irc/irc.c:635
 msgid "Encoding"
 msgstr "エンコーディング"
 
-#: src/protocols/irc/irc.c:560 src/protocols/irc/msgs.c:191
-#: src/protocols/jabber/jabber.c:608
+#: src/protocols/irc/irc.c:638 src/protocols/irc/msgs.c:191
+#: src/protocols/jabber/jabber.c:580
 msgid "Username"
 msgstr "ユーザ名"
 
@@ -4605,7 +4970,7 @@
 msgid " <i>(identified)</i>"
 msgstr ""
 
-#: src/protocols/irc/msgs.c:192 src/protocols/yahoo/yahoo.c:2888
+#: src/protocols/irc/msgs.c:192 src/protocols/yahoo/yahoo.c:2990
 msgid "Realname"
 msgstr ""
 
@@ -4632,116 +4997,116 @@
 msgstr ""
 
 # NOTE 0.62 (but this looks wrong)-:
-#: src/protocols/irc/msgs.c:247
+#: src/protocols/irc/msgs.c:277
 #, c-format
 msgid "%s has changed the topic to: %s"
 msgstr "%sのトピックは変わりました: %s"
 
-#: src/protocols/irc/msgs.c:252
+#: src/protocols/irc/msgs.c:282
 #, c-format
 msgid "The topic for %s is: %s"
 msgstr "%s のトピックは %s です"
 
-#: src/protocols/irc/msgs.c:266
+#: src/protocols/irc/msgs.c:296
 #, fuzzy, c-format
 msgid "Unknown message '%s'"
 msgstr "[メッセージなし]"
 
-#: src/protocols/irc/msgs.c:267
+#: src/protocols/irc/msgs.c:297
 #, fuzzy
 msgid "Unknown message"
 msgstr "[メッセージなし]"
 
-#: src/protocols/irc/msgs.c:267
+#: src/protocols/irc/msgs.c:297
 msgid "Gaim has sent a message the IRC server did not understand."
 msgstr ""
 
-#: src/protocols/irc/msgs.c:370
+#: src/protocols/irc/msgs.c:400
 msgid "No such channel"
 msgstr "そのようなチャンネルはありません"
 
 #. does this happen?
-#: src/protocols/irc/msgs.c:381
+#: src/protocols/irc/msgs.c:411
 msgid "no such channel"
 msgstr "そのようなチャンネルはありません"
 
-#: src/protocols/irc/msgs.c:384
+#: src/protocols/irc/msgs.c:414
 #, fuzzy
 msgid "User is not logged in"
 msgstr "ログインしていません"
 
-#: src/protocols/irc/msgs.c:389
+#: src/protocols/irc/msgs.c:419
 msgid "No such nick or channel"
 msgstr "そのようなニック/チャンネルはありません"
 
-#: src/protocols/irc/msgs.c:409
+#: src/protocols/irc/msgs.c:439
 #, fuzzy
 msgid "Could not send"
 msgstr "接続できません"
 
-#: src/protocols/irc/msgs.c:465
+#: src/protocols/irc/msgs.c:495
 #, c-format
 msgid "Joining %s requires an invitation."
 msgstr ""
 
-#: src/protocols/irc/msgs.c:466
+#: src/protocols/irc/msgs.c:496
 msgid "Invitation only"
 msgstr ""
 
-#: src/protocols/irc/msgs.c:562
+#: src/protocols/irc/msgs.c:592
 #, fuzzy, c-format
 msgid "You have been kicked by %s: (%s)"
 msgstr "あなたは%sにより蹴られました: (%s)"
 
-#: src/protocols/irc/msgs.c:570
+#: src/protocols/irc/msgs.c:597
 #, c-format
 msgid "Kicked by %s (%s)"
 msgstr "%sにより蹴られました (%s)"
 
-#: src/protocols/irc/msgs.c:591
+#: src/protocols/irc/msgs.c:618
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr "モード (%s %s) by %s"
 
-#: src/protocols/irc/msgs.c:670
+#: src/protocols/irc/msgs.c:697
 #, fuzzy
 msgid "Could not change nick"
 msgstr "接続できません"
 
-#: src/protocols/irc/msgs.c:671
+#: src/protocols/irc/msgs.c:698
 msgid "Cannot change nick"
 msgstr ""
 
-#: src/protocols/irc/msgs.c:692
+#: src/protocols/irc/msgs.c:719
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr ""
 
-#: src/protocols/irc/msgs.c:730
+#: src/protocols/irc/msgs.c:759
 #, fuzzy
 msgid "Error: invalid PONG from server"
 msgstr "サーバからの読み込みに失敗"
 
-#: src/protocols/irc/msgs.c:732
+#: src/protocols/irc/msgs.c:761
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr ""
 
-#: src/protocols/irc/msgs.c:802
+#: src/protocols/irc/msgs.c:836
 #, fuzzy, c-format
 msgid "Cannot join %s:"
 msgstr "%s の情報を変更:"
 
-#: src/protocols/irc/msgs.c:803
+#: src/protocols/irc/msgs.c:837
 msgid "Cannot join channel"
 msgstr ""
 
-#: src/protocols/irc/msgs.c:833
+#: src/protocols/irc/msgs.c:867
 #, c-format
 msgid "Wallops from %s"
 msgstr ""
 
-#: src/protocols/irc/parse.c:161
+#: src/protocols/irc/parse.c:166
 msgid ""
 "(There was an error converting this message.  Check the 'Encoding' option in "
 "the Account Editor)"
@@ -4749,185 +5114,154 @@
 "(このメッセージを変換する際にエラーが発生しました。アカウントエディタの 'エ"
 "ンコード' オプションを確認してください)"
 
-#: src/protocols/irc/parse.c:292
+#: src/protocols/irc/parse.c:297
 #, c-format
 msgid "Reply time from %s: %lu seconds"
 msgstr ""
 
-#: src/protocols/irc/parse.c:293
+#: src/protocols/irc/parse.c:298
 msgid "PONG"
 msgstr "PONG"
 
-#: src/protocols/irc/parse.c:293
+#: src/protocols/irc/parse.c:298
 msgid "CTCP PING reply"
 msgstr ""
 
-#: src/protocols/irc/parse.c:392 src/protocols/oscar/oscar.c:534
+#: src/protocols/irc/parse.c:400 src/protocols/oscar/oscar.c:581
 #: src/protocols/toc/toc.c:218 src/protocols/toc/toc.c:625
 #: src/protocols/toc/toc.c:641 src/protocols/toc/toc.c:709
 msgid "Disconnected."
 msgstr "切断されました"
 
-#: src/protocols/jabber/auth.c:52
+#: src/protocols/jabber/auth.c:51
 msgid "Server requires SSL for login"
 msgstr ""
 
-#: src/protocols/jabber/auth.c:106 src/protocols/jabber/auth.c:181
+#: src/protocols/jabber/auth.c:111
+msgid "Server requires plaintext authentication over an unencrypted stream"
+msgstr ""
+
+#: src/protocols/jabber/auth.c:160 src/protocols/jabber/auth.c:161
+#: src/protocols/jabber/auth.c:238 src/protocols/jabber/auth.c:239
+#, fuzzy
+msgid "Plaintext Authentication"
+msgstr "認証中"
+
+#: src/protocols/jabber/auth.c:162 src/protocols/jabber/auth.c:240
+msgid ""
+"This server requires plaintext authentication over an unencrypted "
+"connection.  Allow this and continue authentication?"
+msgstr ""
+
+#: src/protocols/jabber/auth.c:170 src/protocols/jabber/auth.c:248
 msgid "Server does not use any supported authentication method"
 msgstr ""
 
-#: src/protocols/jabber/auth.c:170 src/protocols/jabber/jabber.c:462
-msgid "Unknown Error"
-msgstr "不明なエラー"
-
-#: src/protocols/jabber/auth.c:338
+#: src/protocols/jabber/auth.c:375
 #, fuzzy
 msgid "Invalid challenge from server"
 msgstr "サーバから無効な返答です"
 
-#: src/protocols/jabber/auth.c:432
-#, fuzzy
-msgid "Bad Protocol"
-msgstr "プロトコル:"
-
-#: src/protocols/jabber/auth.c:435
-msgid "Encryption Required"
-msgstr ""
-
-#: src/protocols/jabber/auth.c:438
-msgid "Invalid authzid"
-msgstr ""
-
-#: src/protocols/jabber/auth.c:441
-#, fuzzy
-msgid "Invalid Mechanism"
-msgstr "無効なユーザ名"
-
-#: src/protocols/jabber/auth.c:443
-#, fuzzy
-msgid "Invalid Realm"
-msgstr "無効なユーザ名"
-
-#: src/protocols/jabber/auth.c:446
-msgid "Mechanism Too Weak"
-msgstr ""
-
-#: src/protocols/jabber/auth.c:449 src/protocols/jabber/jabber.c:148
-#: src/protocols/jabber/jabber.c:903 src/protocols/jabber/jabber.c:953
-#: src/protocols/oscar/oscar.c:5553
-msgid "Not Authorized"
-msgstr "認証されていません"
-
-#: src/protocols/jabber/auth.c:452
-#, fuzzy
-msgid "Temporary Authentication Failure"
-msgstr "認証に失敗"
-
-#: src/protocols/jabber/auth.c:454
-msgid "Authentication Failure"
-msgstr "認証に失敗"
-
-#: src/protocols/jabber/buddy.c:245 src/protocols/jabber/buddy.c:603
+#: src/protocols/jabber/buddy.c:247 src/protocols/jabber/buddy.c:603
 msgid "Full Name"
 msgstr "氏名"
 
-#: src/protocols/jabber/buddy.c:246 src/protocols/jabber/buddy.c:616
+#: src/protocols/jabber/buddy.c:248 src/protocols/jabber/buddy.c:616
 msgid "Family Name"
 msgstr "名字"
 
-#: src/protocols/jabber/buddy.c:247 src/protocols/jabber/buddy.c:620
+#: src/protocols/jabber/buddy.c:249 src/protocols/jabber/buddy.c:620
 msgid "Given Name"
 msgstr "名前"
 
-#: src/protocols/jabber/buddy.c:248 src/protocols/jabber/buddy.c:635
-#: src/protocols/jabber/jabber.c:628 src/protocols/yahoo/yahoo.c:2884
+#: src/protocols/jabber/buddy.c:250 src/protocols/jabber/buddy.c:635
+#: src/protocols/jabber/jabber.c:600 src/protocols/yahoo/yahoo.c:2986
 msgid "Nickname"
 msgstr "ニックネーム"
 
-#: src/protocols/jabber/buddy.c:249 src/protocols/jabber/jabber.c:668
+#: src/protocols/jabber/buddy.c:251 src/protocols/jabber/jabber.c:640
 msgid "URL"
 msgstr "URL"
 
-#: src/protocols/jabber/buddy.c:250 src/protocols/jabber/buddy.c:663
+#: src/protocols/jabber/buddy.c:252 src/protocols/jabber/buddy.c:663
 msgid "Street Address"
 msgstr "住所"
 
-#: src/protocols/jabber/buddy.c:251 src/protocols/jabber/buddy.c:659
+#: src/protocols/jabber/buddy.c:253 src/protocols/jabber/buddy.c:659
 msgid "Extended Address"
 msgstr "その他"
 
-#: src/protocols/jabber/buddy.c:252 src/protocols/jabber/buddy.c:667
+#: src/protocols/jabber/buddy.c:254 src/protocols/jabber/buddy.c:667
 msgid "Locality"
 msgstr "区"
 
-#: src/protocols/jabber/buddy.c:253 src/protocols/jabber/buddy.c:671
+#: src/protocols/jabber/buddy.c:255 src/protocols/jabber/buddy.c:671
 msgid "Region"
 msgstr "州"
 
-#: src/protocols/jabber/buddy.c:254 src/protocols/jabber/buddy.c:675
-#: src/protocols/jabber/jabber.c:658
+#: src/protocols/jabber/buddy.c:256 src/protocols/jabber/buddy.c:675
+#: src/protocols/jabber/jabber.c:630
 msgid "Postal Code"
 msgstr "郵便番号"
 
 #. Country
-#: src/protocols/jabber/buddy.c:255 src/protocols/jabber/buddy.c:680
+#: src/protocols/jabber/buddy.c:257 src/protocols/jabber/buddy.c:680
 #: src/protocols/trepia/trepia.c:339 src/protocols/trepia/trepia.c:448
 msgid "Country"
 msgstr "国"
 
-#: src/protocols/jabber/buddy.c:256 src/protocols/jabber/buddy.c:691
+#: src/protocols/jabber/buddy.c:258 src/protocols/jabber/buddy.c:691
 #: src/protocols/jabber/buddy.c:698
 msgid "Telephone"
 msgstr "電話番号"
 
-#: src/protocols/jabber/buddy.c:257 src/protocols/jabber/buddy.c:709
-#: src/protocols/jabber/buddy.c:717 src/protocols/yahoo/yahoo.c:2880
+#: src/protocols/jabber/buddy.c:259 src/protocols/jabber/buddy.c:709
+#: src/protocols/jabber/buddy.c:717 src/protocols/yahoo/yahoo.c:2982
 msgid "Email"
 msgstr "メールアドレス"
 
-#: src/protocols/jabber/buddy.c:258 src/protocols/jabber/buddy.c:732
+#: src/protocols/jabber/buddy.c:260 src/protocols/jabber/buddy.c:732
 msgid "Organization Name"
 msgstr "組織名"
 
-#: src/protocols/jabber/buddy.c:259 src/protocols/jabber/buddy.c:736
+#: src/protocols/jabber/buddy.c:261 src/protocols/jabber/buddy.c:736
 msgid "Organization Unit"
 msgstr "所属部署"
 
-#: src/protocols/jabber/buddy.c:260 src/protocols/jabber/buddy.c:742
+#: src/protocols/jabber/buddy.c:262 src/protocols/jabber/buddy.c:742
 msgid "Title"
 msgstr "肩書"
 
-#: src/protocols/jabber/buddy.c:261 src/protocols/jabber/buddy.c:745
+#: src/protocols/jabber/buddy.c:263 src/protocols/jabber/buddy.c:745
 msgid "Role"
 msgstr "役職"
 
-#: src/protocols/jabber/buddy.c:262 src/protocols/jabber/buddy.c:638
-#: src/protocols/oscar/oscar.c:3996
+#: src/protocols/jabber/buddy.c:264 src/protocols/jabber/buddy.c:638
+#: src/protocols/oscar/oscar.c:4140
 msgid "Birthday"
 msgstr "誕生日"
 
-#: src/protocols/jabber/buddy.c:506 src/protocols/jabber/buddy.c:507
+#: src/protocols/jabber/buddy.c:508 src/protocols/jabber/buddy.c:509
 msgid "Edit Jabber vCard"
 msgstr "Jabber vCardによって開発された"
 
-#: src/protocols/jabber/buddy.c:508
+#: src/protocols/jabber/buddy.c:510
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable."
 msgstr ""
 "下記のアイテムはすべてオプションです。快適に感じる情報だけを入力します。"
 
-#: src/protocols/jabber/buddy.c:551
+#: src/protocols/jabber/buddy.c:552
 msgid "Jabber ID"
 msgstr "Jabber ID"
 
-#: src/protocols/jabber/buddy.c:561 src/protocols/jabber/buddy.c:568
-#: src/protocols/jabber/buddy.c:579 src/protocols/jabber/jabber.c:940
-#: src/protocols/jabber/jabber.c:953
+#: src/protocols/jabber/buddy.c:562 src/protocols/jabber/buddy.c:569
+#: src/protocols/jabber/buddy.c:580 src/protocols/jabber/jabber.c:930
 msgid "Status"
 msgstr "状態"
 
-#: src/protocols/jabber/buddy.c:577 src/protocols/jabber/jabber.c:1216
+#: src/protocols/jabber/buddy.c:578 src/protocols/jabber/jabber.c:1372
 msgid "Resource"
 msgstr "リソース"
 
@@ -4935,8 +5269,8 @@
 msgid "Middle Name"
 msgstr "ミドルネーム"
 
-#: src/protocols/jabber/buddy.c:643 src/protocols/jabber/jabber.c:643
-#: src/protocols/oscar/oscar.c:4013 src/protocols/oscar/oscar.c:4029
+#: src/protocols/jabber/buddy.c:643 src/protocols/jabber/jabber.c:615
+#: src/protocols/oscar/oscar.c:4157 src/protocols/oscar/oscar.c:4173
 msgid "Address"
 msgstr "住所"
 
@@ -4952,31 +5286,31 @@
 msgid "Logo"
 msgstr ""
 
-#: src/protocols/jabber/buddy.c:775
+#: src/protocols/jabber/buddy.c:777
 msgid "Jabber Profile"
 msgstr ""
 
-#: src/protocols/jabber/buddy.c:915
+#: src/protocols/jabber/buddy.c:893
 msgid "Un-hide From"
 msgstr "ここからは隠さない"
 
-#: src/protocols/jabber/buddy.c:918
+#: src/protocols/jabber/buddy.c:896
 msgid "Temporarily Hide From"
 msgstr "一時的にここから隠す"
 
-#: src/protocols/jabber/buddy.c:926
+#: src/protocols/jabber/buddy.c:905
 msgid "Cancel Presence Notification"
 msgstr "存在通知をやめる"
 
-#: src/protocols/jabber/buddy.c:934
+#: src/protocols/jabber/buddy.c:913
 msgid "(Re-)Request authorization"
 msgstr "認証の要求/再要求"
 
-#: src/protocols/jabber/buddy.c:940
+#: src/protocols/jabber/buddy.c:919
 msgid "Unsubscribe"
 msgstr ""
 
-#: src/protocols/jabber/chat.c:40 src/protocols/yahoo/yahoochat.c:938
+#: src/protocols/jabber/chat.c:42 src/protocols/yahoo/yahoochat.c:965
 msgid "_Room:"
 msgstr "部屋 (_R):"
 
@@ -4988,359 +5322,528 @@
 msgid "_Handle:"
 msgstr "ハンドル (_H):"
 
-#: src/protocols/jabber/chat.c:161
+#: src/protocols/jabber/chat.c:164
 #, fuzzy, c-format
 msgid "%s is not a valid room name"
 msgstr "%sは正しいファイル名ではありません.\n"
 
-#: src/protocols/jabber/chat.c:162
+#: src/protocols/jabber/chat.c:165
 #, fuzzy
 msgid "Invalid Room Name"
 msgstr "無効な部屋名"
 
-#: src/protocols/jabber/chat.c:167
+#: src/protocols/jabber/chat.c:170
 #, fuzzy, c-format
 msgid "%s is not a valid server name"
 msgstr "%sは正しいサーバ名ではありません.\n"
 
-#: src/protocols/jabber/chat.c:168 src/protocols/jabber/chat.c:169
+#: src/protocols/jabber/chat.c:171 src/protocols/jabber/chat.c:172
 #, fuzzy
 msgid "Invalid Server Name"
 msgstr "無効なサーバ名"
 
-#: src/protocols/jabber/chat.c:173
+#: src/protocols/jabber/chat.c:176
 #, fuzzy, c-format
 msgid "%s is not a valid room handle"
 msgstr "%sは正しいハンドルではありません.\n"
 
-#: src/protocols/jabber/chat.c:174 src/protocols/jabber/chat.c:175
+#: src/protocols/jabber/chat.c:177 src/protocols/jabber/chat.c:178
 #, fuzzy
 msgid "Invalid Room Handle"
 msgstr "無効なユーザ名"
 
-#: src/protocols/jabber/chat.c:336 src/protocols/jabber/chat.c:489
-#: src/protocols/jabber/message.c:299
-#, c-format
-msgid " (Code %s)"
-msgstr " (コード %s)"
-
-#: src/protocols/jabber/chat.c:339
+#: src/protocols/jabber/chat.c:332
 #, fuzzy
 msgid "Configuration error"
 msgstr "接続エラー"
 
-#: src/protocols/jabber/chat.c:350 src/protocols/jabber/chat.c:503
+#: src/protocols/jabber/chat.c:341 src/protocols/jabber/chat.c:486
 #, fuzzy
 msgid "Unable to configure"
 msgstr "接続できません"
 
-#: src/protocols/jabber/chat.c:364
+#: src/protocols/jabber/chat.c:357
 #, fuzzy
 msgid "Room Configuration Error"
 msgstr "登録エラー"
 
-#: src/protocols/jabber/chat.c:365
+#: src/protocols/jabber/chat.c:358
 msgid "This room is not capable of being configured"
 msgstr ""
 
-#: src/protocols/jabber/chat.c:492
+#: src/protocols/jabber/chat.c:408 src/protocols/jabber/chat.c:477
 #, fuzzy
 msgid "Registration error"
 msgstr "登録エラー"
 
-#: src/protocols/jabber/chat.c:573
+#: src/protocols/jabber/chat.c:556
 msgid "Nick changing not supported in non-MUC chatrooms"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:72
+#: src/protocols/jabber/chat.c:599 src/protocols/jabber/chat.c:610
+#, fuzzy
+msgid "Roomlist Error"
+msgstr "登録エラー"
+
+#: src/protocols/jabber/chat.c:600 src/protocols/jabber/chat.c:611
+#, fuzzy
+msgid "Error retreiving roomlist"
+msgstr "サーバからの読み込みに失敗"
+
+#: src/protocols/jabber/chat.c:651
+#, fuzzy
+msgid "Invalid Server"
+msgstr "無効なサーバ名"
+
+#: src/protocols/jabber/chat.c:688
+msgid "Enter a Conference Server"
+msgstr ""
+
+#: src/protocols/jabber/chat.c:689
+msgid "Select a conference server to query"
+msgstr ""
+
+#: src/protocols/jabber/chat.c:691
+msgid "Find Rooms"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:73
 msgid "Error initializing session"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:123
-msgid "Bad Format"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:125
-msgid "Bad Namespace Prefix"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:128
-#, fuzzy
-msgid "Resource Conflict"
-msgstr "リソース:"
-
-#: src/protocols/jabber/jabber.c:130
-#, fuzzy
-msgid "Connection Timeout"
-msgstr "接続が切れました"
-
-#: src/protocols/jabber/jabber.c:132
-msgid "Host Gone"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:134
-#, fuzzy
-msgid "Host Unknown"
-msgstr "不明"
-
-#: src/protocols/jabber/jabber.c:136
-msgid "Improper Addressing"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:138
-msgid "Internal Server Error"
-msgstr "サーバ内部エラー"
-
-#: src/protocols/jabber/jabber.c:140
-#, fuzzy
-msgid "Invalid ID"
-msgstr "無効なユーザ"
-
-#: src/protocols/jabber/jabber.c:142
-#, fuzzy
-msgid "Invalid Namespace"
-msgstr "無効なユーザ"
-
-#: src/protocols/jabber/jabber.c:144
-#, fuzzy
-msgid "Invalid XML"
-msgstr "無効なユーザ"
-
-#: src/protocols/jabber/jabber.c:146
-msgid "Non-matching Hosts"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:150
-msgid "Policy Violation"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:152
-msgid "Remote Connection Failed"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:154
-msgid "Resource Constraint"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:156
-msgid "Restricted XML"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:158
-msgid "See Other Host"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:160
-#, fuzzy
-msgid "System Shutdown"
-msgstr "システムログ"
-
-#: src/protocols/jabber/jabber.c:162
-msgid "Undefined Condition"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:164
-#, fuzzy
-msgid "Unsupported Encoding"
-msgstr "クライアントではサポートしていません"
-
-#: src/protocols/jabber/jabber.c:166
-msgid "Unsupported Stanza Type"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:168
-msgid "Unsupported Version"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:170
-msgid "XML Not Well Formed"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:172
-#, fuzzy
-msgid "Stream Error"
-msgstr "内部エラー"
-
-#: src/protocols/jabber/jabber.c:237 src/protocols/msn/httpmethod.c:234
-#: src/protocols/msn/msn.c:82 src/protocols/msn/msn.c:102
-#: src/protocols/msn/msn.c:160 src/protocols/msn/msn.c:260
-#: src/protocols/msn/msn.c:538 src/protocols/msn/msn.c:709
-#: src/protocols/msn/msn.c:732 src/protocols/msn/msn.c:764
-#: src/protocols/msn/msn.c:772 src/protocols/msn/msn.c:805
-#: src/protocols/msn/msn.c:813 src/protocols/msn/msn.c:827
-#: src/protocols/msn/msn.c:836 src/protocols/msn/msn.c:851
-#: src/protocols/msn/msn.c:861 src/protocols/msn/msn.c:883
-#: src/protocols/msn/msn.c:933 src/protocols/msn/msn.c:971
-#: src/protocols/msn/msn.c:1069 src/protocols/msn/msn.c:1101
-#: src/protocols/msn/msn.c:1122 src/protocols/msn/msn.c:1133
-#: src/protocols/msn/msn.c:1144 src/protocols/msn/msn.c:1168
-#: src/protocols/msn/msn.c:1180 src/protocols/msn/msn.c:1261
-#: src/protocols/msn/notification.c:179 src/protocols/msn/notification.c:207
-#: src/protocols/msn/notification.c:1680 src/protocols/msn/notification.c:1700
-#: src/protocols/msn/session.c:208 src/protocols/trepia/trepia.c:248
-#: src/protocols/trepia/trepia.c:749 src/protocols/trepia/trepia.c:1033
-#: src/protocols/trepia/trepia.c:1077 src/protocols/trepia/trepia.c:1176
-#: src/protocols/trepia/trepia.c:1232
+#: src/protocols/jabber/jabber.c:203 src/protocols/msn/httpmethod.c:255
+#: src/protocols/msn/msn.c:83 src/protocols/msn/msn.c:103
+#: src/protocols/msn/msn.c:161 src/protocols/msn/msn.c:261
+#: src/protocols/msn/msn.c:548 src/protocols/msn/msn.c:721
+#: src/protocols/msn/msn.c:744 src/protocols/msn/msn.c:776
+#: src/protocols/msn/msn.c:784 src/protocols/msn/msn.c:817
+#: src/protocols/msn/msn.c:825 src/protocols/msn/msn.c:839
+#: src/protocols/msn/msn.c:848 src/protocols/msn/msn.c:863
+#: src/protocols/msn/msn.c:873 src/protocols/msn/msn.c:895
+#: src/protocols/msn/msn.c:945 src/protocols/msn/msn.c:983
+#: src/protocols/msn/msn.c:1085 src/protocols/msn/msn.c:1118
+#: src/protocols/msn/msn.c:1139 src/protocols/msn/msn.c:1150
+#: src/protocols/msn/msn.c:1161 src/protocols/msn/msn.c:1185
+#: src/protocols/msn/msn.c:1197 src/protocols/msn/msn.c:1278
+#: src/protocols/msn/notification.c:147 src/protocols/msn/notification.c:175
+#: src/protocols/msn/notification.c:1304 src/protocols/msn/notification.c:1324
+#: src/protocols/msn/session.c:205 src/protocols/trepia/trepia.c:248
+#: src/protocols/trepia/trepia.c:749 src/protocols/trepia/trepia.c:1038
+#: src/protocols/trepia/trepia.c:1082 src/protocols/trepia/trepia.c:1181
+#: src/protocols/trepia/trepia.c:1237
 msgid "Write error"
 msgstr "書き込みエラー"
 
-#: src/protocols/jabber/jabber.c:275 src/protocols/jabber/jabber.c:295
+#: src/protocols/jabber/jabber.c:241 src/protocols/jabber/jabber.c:261
 #, fuzzy
 msgid "Read Error"
 msgstr "不正なエラー"
 
-#: src/protocols/jabber/jabber.c:349
+#: src/protocols/jabber/jabber.c:316
+#, fuzzy
+msgid "Connection Failed"
+msgstr "接続を閉じました"
+
+#: src/protocols/jabber/jabber.c:319
 msgid "SSL Handshake Failed"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:387 src/protocols/jabber/jabber.c:717
+#: src/protocols/jabber/jabber.c:362 src/protocols/jabber/jabber.c:691
 msgid "Invalid Jabber ID"
 msgstr "無効なJabber ID"
 
-#: src/protocols/jabber/jabber.c:415 src/protocols/jabber/jabber.c:744
+#: src/protocols/jabber/jabber.c:390 src/protocols/jabber/jabber.c:718
 #, fuzzy
 msgid "SSL support unavailable"
 msgstr "サーバが見付かりません"
 
-#: src/protocols/jabber/jabber.c:425 src/protocols/jabber/jabber.c:754
-#: src/protocols/trepia/trepia.c:1116
+#: src/protocols/jabber/jabber.c:400 src/protocols/jabber/jabber.c:728
+#: src/protocols/trepia/trepia.c:1121
 #, fuzzy
 msgid "Unable to create socket"
 msgstr "ソケットを読めません"
 
-#: src/protocols/jabber/jabber.c:450
+#: src/protocols/jabber/jabber.c:425
 #, fuzzy, c-format
 msgid "Registration of %s@%s successful"
 msgstr "サーバに登録しました"
 
-#: src/protocols/jabber/jabber.c:452 src/protocols/jabber/jabber.c:453
+#: src/protocols/jabber/jabber.c:427 src/protocols/jabber/jabber.c:428
 #, fuzzy
 msgid "Registration Successful"
 msgstr "サーバに登録しました"
 
-#: src/protocols/jabber/jabber.c:465
-#, c-format
-msgid "Registration of %s@%s failed: %s"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:467 src/protocols/jabber/jabber.c:468
+#: src/protocols/jabber/jabber.c:434 src/protocols/jabber/jabber.c:1183
+msgid "Unknown Error"
+msgstr "不明なエラー"
+
+#: src/protocols/jabber/jabber.c:436 src/protocols/jabber/jabber.c:437
 #, fuzzy
 msgid "Registration Failed"
 msgstr "認証に失敗"
 
-#: src/protocols/jabber/jabber.c:580 src/protocols/jabber/jabber.c:581
+#: src/protocols/jabber/jabber.c:548 src/protocols/jabber/jabber.c:549
 #, fuzzy
 msgid "Already Registered"
 msgstr "すでにそこにいます"
 
-#: src/protocols/jabber/jabber.c:612 src/protocols/jabber/jabber.c:1050
+#: src/protocols/jabber/jabber.c:584 src/protocols/jabber/jabber.c:1034
 msgid "Password"
 msgstr "パスワード"
 
-#: src/protocols/jabber/jabber.c:623
+#: src/protocols/jabber/jabber.c:595
 msgid "E-Mail"
 msgstr "メールアドレス"
 
 #. State
-#: src/protocols/jabber/jabber.c:653 src/protocols/oscar/oscar.c:4019
-#: src/protocols/oscar/oscar.c:4035 src/protocols/trepia/trepia.c:335
+#: src/protocols/jabber/jabber.c:625 src/protocols/oscar/oscar.c:4163
+#: src/protocols/oscar/oscar.c:4179 src/protocols/trepia/trepia.c:335
 #: src/protocols/trepia/trepia.c:439
 msgid "State"
 msgstr "州"
 
-#: src/protocols/jabber/jabber.c:663
+#: src/protocols/jabber/jabber.c:635
 msgid "Phone"
 msgstr "電話番号"
 
-#: src/protocols/jabber/jabber.c:673
+#: src/protocols/jabber/jabber.c:645
 msgid "Date"
 msgstr "日付"
 
-#: src/protocols/jabber/jabber.c:681
+#: src/protocols/jabber/jabber.c:653
 msgid "Please fill out the information below to register your new account."
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:684 src/protocols/jabber/jabber.c:685
+#: src/protocols/jabber/jabber.c:656 src/protocols/jabber/jabber.c:657
 msgid "Register New Jabber Account"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:803 src/protocols/msn/dispatch.c:212
-#: src/protocols/msn/msn.c:483 src/protocols/napster/napster.c:487
-#: src/protocols/oscar/oscar.c:693 src/protocols/trepia/trepia.c:1110
-#: src/protocols/yahoo/yahoo.c:2073
+#: src/protocols/jabber/jabber.c:774 src/protocols/msn/dispatch.c:212
+#: src/protocols/msn/msn.c:487 src/protocols/napster/napster.c:487
+#: src/protocols/oscar/oscar.c:750 src/protocols/trepia/trepia.c:1115
+#: src/protocols/yahoo/yahoo.c:2173
 msgid "Connecting"
 msgstr "接続中"
 
-#: src/protocols/jabber/jabber.c:807
+#: src/protocols/jabber/jabber.c:778
 msgid "Initializing Stream"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:813
+#: src/protocols/jabber/jabber.c:784
 msgid "Authenticating"
 msgstr "認証中"
 
-#: src/protocols/jabber/jabber.c:823
+#: src/protocols/jabber/jabber.c:793
 msgid "Re-initializing Stream"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:948 src/protocols/jabber/jabber.c:1001
-#: src/protocols/jabber/presence.c:293
+#: src/protocols/jabber/jabber.c:873 src/protocols/jabber/jabber.c:1161
+#: src/protocols/jabber/jabber.c:1202 src/protocols/jabber/jabber.c:1235
+#: src/protocols/oscar/oscar.c:5800
+msgid "Not Authorized"
+msgstr "認証されていません"
+
+#: src/protocols/jabber/jabber.c:905
+#, fuzzy
+msgid "Both"
+msgstr "下"
+
+#: src/protocols/jabber/jabber.c:907
+msgid "From (To pending)"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:909
+msgid "From"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:912
+#, fuzzy
+msgid "To"
+msgstr "上"
+
+#: src/protocols/jabber/jabber.c:914
+msgid "None (To pending)"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:918
+#, fuzzy
+msgid "Subscription"
+msgstr "概要"
+
+#: src/protocols/jabber/jabber.c:938
 msgid "Error"
 msgstr "エラー"
 
-#: src/protocols/jabber/jabber.c:964 src/protocols/jabber/jutil.c:101
-#: src/protocols/jabber/presence.c:82
+#: src/protocols/jabber/jabber.c:959 src/protocols/jabber/jutil.c:102
+#: src/protocols/jabber/presence.c:61 src/protocols/jabber/presence.c:112
 msgid "Chatty"
 msgstr "チャッティー"
 
-#: src/protocols/jabber/jabber.c:966 src/protocols/jabber/jutil.c:104
-#: src/protocols/jabber/presence.c:87
+#: src/protocols/jabber/jabber.c:961 src/protocols/jabber/jutil.c:105
+#: src/protocols/jabber/presence.c:63 src/protocols/jabber/presence.c:117
 msgid "Extended Away"
 msgstr "逃走中"
 
-#: src/protocols/jabber/jabber.c:967 src/protocols/jabber/jutil.c:107
-#: src/protocols/jabber/presence.c:89 src/protocols/oscar/oscar.c:2836
-#: src/protocols/oscar/oscar.c:4599 src/protocols/oscar/oscar.c:6147
+#: src/protocols/jabber/jabber.c:962 src/protocols/jabber/jutil.c:108
+#: src/protocols/jabber/presence.c:65 src/protocols/jabber/presence.c:119
+#: src/protocols/oscar/oscar.c:2933 src/protocols/oscar/oscar.c:4751
+#: src/protocols/oscar/oscar.c:6411
 msgid "Do Not Disturb"
 msgstr "邪魔しないでね"
 
-#: src/protocols/jabber/jabber.c:983
+#: src/protocols/jabber/jabber.c:979
 msgid "Password Changed"
 msgstr "パスワード変更できました"
 
-#: src/protocols/jabber/jabber.c:984
+#: src/protocols/jabber/jabber.c:980
 #, fuzzy
 msgid "Your password has been changed."
 msgstr "パスワード変更ができませんでした"
 
-#: src/protocols/jabber/jabber.c:994
-#, fuzzy, c-format
-msgid "Error changing password: %s"
+#: src/protocols/jabber/jabber.c:984 src/protocols/jabber/jabber.c:985
+#, fuzzy
+msgid "Error changing password"
 msgstr "パスワード変更エラー: %s"
 
-#: src/protocols/jabber/jabber.c:998
-#, fuzzy
-msgid "Unknown error occurred changing password"
-msgstr "パスワードを変更できません。"
-
-#: src/protocols/jabber/jabber.c:1055
+#: src/protocols/jabber/jabber.c:1039
 msgid "Password (again)"
 msgstr "新しいパスワード(再入力)"
 
-#: src/protocols/jabber/jabber.c:1060 src/protocols/jabber/jabber.c:1061
+#: src/protocols/jabber/jabber.c:1044 src/protocols/jabber/jabber.c:1045
 #, fuzzy
 msgid "Change Jabber Password"
 msgstr "パスワード変更"
 
-#: src/protocols/jabber/jabber.c:1061
+#: src/protocols/jabber/jabber.c:1045
 #, fuzzy
 msgid "Please enter your new password"
 msgstr "パスワードを入力してください"
 
-#: src/protocols/jabber/jabber.c:1073 src/protocols/toc/toc.c:1532
+#: src/protocols/jabber/jabber.c:1056 src/protocols/toc/toc.c:1532
 msgid "Set User Info"
 msgstr "ユーザ情報の登録"
 
+#: src/protocols/jabber/jabber.c:1141
+msgid "Bad Request"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1143
+#, fuzzy
+msgid "Conflict"
+msgstr "接続"
+
+#: src/protocols/jabber/jabber.c:1145
+msgid "Feature Not Implemented"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1147
+#, fuzzy
+msgid "Forbidden"
+msgstr "隠れている"
+
+#: src/protocols/jabber/jabber.c:1149
+#, fuzzy
+msgid "Gone"
+msgstr "なし"
+
+#: src/protocols/jabber/jabber.c:1151 src/protocols/jabber/jabber.c:1225
+msgid "Internal Server Error"
+msgstr "サーバ内部エラー"
+
+#: src/protocols/jabber/jabber.c:1153
+msgid "Item Not Found"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1155
+#, fuzzy
+msgid "Malformed Jabber ID"
+msgstr "無効なJabber ID"
+
+#: src/protocols/jabber/jabber.c:1157
+#, fuzzy
+msgid "Not Acceptable"
+msgstr "不在"
+
+#: src/protocols/jabber/jabber.c:1159
+#, fuzzy
+msgid "Not Allowed"
+msgstr "不在"
+
+#: src/protocols/jabber/jabber.c:1163
+msgid "Payment Required"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1165
+#, fuzzy
+msgid "Recipient Unavailable"
+msgstr "サービスが利用できません"
+
+#: src/protocols/jabber/jabber.c:1169
+#, fuzzy
+msgid "Registration Required"
+msgstr "認証に失敗"
+
+#: src/protocols/jabber/jabber.c:1171
+msgid "Remote Server Not Found"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1173
+msgid "Remote Server Timeout"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1175
+#, fuzzy
+msgid "Server Overloaded"
+msgstr "サーバが見付かりません"
+
+#: src/protocols/jabber/jabber.c:1177
+#, fuzzy
+msgid "Service Unavailable"
+msgstr "サービスが利用できません"
+
+#: src/protocols/jabber/jabber.c:1179
+#, fuzzy
+msgid "Subscription Required"
+msgstr "承認の要求"
+
+#: src/protocols/jabber/jabber.c:1181
+msgid "Unexpected Request"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1188
+#, fuzzy
+msgid "Authorization Aborted"
+msgstr "承認が得られました"
+
+#: src/protocols/jabber/jabber.c:1190
+#, fuzzy
+msgid "Incorrect encoding in authorization"
+msgstr "認証の再要求"
+
+#: src/protocols/jabber/jabber.c:1193
+msgid "Invalid authzid"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1196
+#, fuzzy
+msgid "Invalid Authorization Mechanism"
+msgstr "無効なユーザ名"
+
+#: src/protocols/jabber/jabber.c:1199
+#, fuzzy
+msgid "Authorization mechanism too weak"
+msgstr "承認は拒否されました"
+
+#: src/protocols/jabber/jabber.c:1204
+#, fuzzy
+msgid "Temporary Authentication Failure"
+msgstr "認証に失敗"
+
+#: src/protocols/jabber/jabber.c:1206
+msgid "Authentication Failure"
+msgstr "認証に失敗"
+
+#: src/protocols/jabber/jabber.c:1210
+msgid "Bad Format"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1212
+msgid "Bad Namespace Prefix"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1215
+#, fuzzy
+msgid "Resource Conflict"
+msgstr "リソース:"
+
+#: src/protocols/jabber/jabber.c:1217
+#, fuzzy
+msgid "Connection Timeout"
+msgstr "接続が切れました"
+
+#: src/protocols/jabber/jabber.c:1219
+msgid "Host Gone"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1221
+#, fuzzy
+msgid "Host Unknown"
+msgstr "不明"
+
+#: src/protocols/jabber/jabber.c:1223
+msgid "Improper Addressing"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1227
+#, fuzzy
+msgid "Invalid ID"
+msgstr "無効なユーザ"
+
+#: src/protocols/jabber/jabber.c:1229
+#, fuzzy
+msgid "Invalid Namespace"
+msgstr "無効なユーザ"
+
+#: src/protocols/jabber/jabber.c:1231
+#, fuzzy
+msgid "Invalid XML"
+msgstr "無効なユーザ"
+
+#: src/protocols/jabber/jabber.c:1233
+msgid "Non-matching Hosts"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1237
+msgid "Policy Violation"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1239
+msgid "Remote Connection Failed"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1241
+msgid "Resource Constraint"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1243
+msgid "Restricted XML"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1245
+msgid "See Other Host"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1247
+#, fuzzy
+msgid "System Shutdown"
+msgstr "システムログ"
+
+#: src/protocols/jabber/jabber.c:1249
+msgid "Undefined Condition"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1251
+#, fuzzy
+msgid "Unsupported Encoding"
+msgstr "クライアントではサポートしていません"
+
+#: src/protocols/jabber/jabber.c:1253
+msgid "Unsupported Stanza Type"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1255
+msgid "Unsupported Version"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1257
+msgid "XML Not Well Formed"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1259
+#, fuzzy
+msgid "Stream Error"
+msgstr "内部エラー"
+
 #. *< api_version
 #. *< type
 #. *< ui_requirement
@@ -5351,112 +5854,129 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/jabber/jabber.c:1193 src/protocols/jabber/jabber.c:1195
+#. *  description
+#: src/protocols/jabber/jabber.c:1348 src/protocols/jabber/jabber.c:1350
 msgid "Jabber Protocol Plugin"
 msgstr "Jabberプロトコルプラグイン"
 
-#: src/protocols/jabber/jabber.c:1219
+#: src/protocols/jabber/jabber.c:1375
 msgid "Use TLS if available"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1224
+#: src/protocols/jabber/jabber.c:1380
 msgid "Force old SSL"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1232
+#: src/protocols/jabber/jabber.c:1385
+msgid "Allow plaintext auth over unencrypted streams"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1394
 msgid "Connect server"
 msgstr "サーバに接続"
 
-#: src/protocols/jabber/message.c:125
+#: src/protocols/jabber/jabber.c:1411
+msgid "Hide Operating System"
+msgstr ""
+
+#: src/protocols/jabber/message.c:111
 #, fuzzy, c-format
 msgid "Message from %s"
 msgstr "メッセージログ"
 
-#: src/protocols/jabber/message.c:187
+#: src/protocols/jabber/message.c:173
 #, fuzzy, c-format
 msgid "%s has set the topic to: %s"
 msgstr "%sのトピックは変わりました: %s"
 
-#: src/protocols/jabber/message.c:189
+#: src/protocols/jabber/message.c:175
 #, c-format
 msgid "The topic is: %s"
 msgstr "トピックは %s です"
 
-#: src/protocols/jabber/message.c:236
+#: src/protocols/jabber/message.c:222
 #, c-format
 msgid "Message delivery to %s failed: %s"
 msgstr ""
 
-#: src/protocols/jabber/message.c:239
+#: src/protocols/jabber/message.c:225
 #, fuzzy
 msgid "Jabber Message Error"
 msgstr "Jabber エラー"
 
-#: src/protocols/jabber/parser.c:129
+#: src/protocols/jabber/message.c:288
+#, c-format
+msgid " (Code %s)"
+msgstr " (コード %s)"
+
+#: src/protocols/jabber/parser.c:131
 #, fuzzy
 msgid "XML Parse error"
 msgstr "書き込みエラー"
 
-#: src/protocols/jabber/presence.c:178
+#: src/protocols/jabber/presence.c:216
 msgid "Unknown Error in presence"
 msgstr "不明なエラーが起きています"
 
-#: src/protocols/jabber/presence.c:183
+#: src/protocols/jabber/presence.c:219
 #, c-format
 msgid "The user %s wants to add you to their buddy list."
 msgstr "ユーザ %s があなたを仲間リストに追加したがっています"
 
-#: src/protocols/jabber/presence.c:244 src/protocols/jabber/presence.c:245
+#: src/protocols/jabber/presence.c:272 src/protocols/jabber/presence.c:273
 #, fuzzy
 msgid "Create New Room"
 msgstr "チャットルーム"
 
-#: src/protocols/jabber/presence.c:246
+#: src/protocols/jabber/presence.c:274
 msgid ""
 "You are creating a new room.  Would you like to configure it, or accept the "
 "default settings?"
 msgstr ""
 
-#: src/protocols/jabber/presence.c:248
+#: src/protocols/jabber/presence.c:276
 msgid "Configure Room"
 msgstr ""
 
-#: src/protocols/jabber/presence.c:250
+#: src/protocols/jabber/presence.c:278
 msgid "Accept Defaults"
 msgstr ""
 
-#: src/protocols/jabber/presence.c:283 src/protocols/oscar/oscar.c:2947
-msgid "Unknown error"
-msgstr "不明なエラー"
-
-#: src/protocols/jabber/presence.c:289
-msgid "Unable to join chat"
-msgstr "チャットに参加できません"
-
-#: src/protocols/jabber/si.c:233
+# FIXME This looks wrong
+#: src/protocols/jabber/presence.c:298
+#, fuzzy, c-format
+msgid "Error in chat %s"
+msgstr "保存エラー,画像: %s"
+
+# FIXME This looks wrong
+#: src/protocols/jabber/presence.c:301
 #, fuzzy, c-format
-msgid "Could not send %s to %s, protocol not supported."
-msgstr "サポートされていない国です"
-
-#: src/protocols/jabber/si.c:234 src/protocols/jabber/si.c:235
+msgid "Error joining chat %s"
+msgstr "保存エラー,画像: %s"
+
+#: src/protocols/jabber/si.c:579
+#, c-format
+msgid "Unable to send file to %s, user does not support file transfers"
+msgstr ""
+
+#: src/protocols/jabber/si.c:580 src/protocols/jabber/si.c:581
 #, fuzzy
 msgid "File Send Failed"
 msgstr "ファイル送信"
 
-#: src/protocols/msn/dispatch.c:42 src/protocols/msn/notification.c:278
-#: src/protocols/msn/notification.c:521
+#: src/protocols/msn/dispatch.c:42 src/protocols/msn/notification.c:246
 msgid "Unable to request USR\n"
 msgstr "USR を要求できません\n"
 
-#: src/protocols/msn/dispatch.c:59 src/protocols/msn/notification.c:295
+#: src/protocols/msn/dispatch.c:59 src/protocols/msn/notification.c:263
 msgid "Unable to login using MD5"
 msgstr "MD5 を利用してログインできません"
 
-#: src/protocols/msn/dispatch.c:68 src/protocols/msn/notification.c:304
+#: src/protocols/msn/dispatch.c:68 src/protocols/msn/notification.c:272
 msgid "Unable to send USR"
 msgstr "USR を送れません"
 
-#: src/protocols/msn/dispatch.c:73 src/protocols/msn/notification.c:309
+#: src/protocols/msn/dispatch.c:73 src/protocols/msn/notification.c:277
 msgid "Requesting to send password"
 msgstr "パスワードの送信を要求しています"
 
@@ -5465,15 +5985,15 @@
 msgid "Protocol version not supported"
 msgstr "プロトコルがサポートされていません"
 
-#: src/protocols/msn/dispatch.c:117 src/protocols/msn/notification.c:792
+#: src/protocols/msn/dispatch.c:117 src/protocols/msn/notification.c:416
 msgid "Unable to request CVR\n"
 msgstr "CVR を要求できません\n"
 
-#: src/protocols/msn/dispatch.c:126 src/protocols/msn/notification.c:801
+#: src/protocols/msn/dispatch.c:126 src/protocols/msn/notification.c:425
 msgid "Unable to request INF\n"
 msgstr "INF を要求できません\n"
 
-#: src/protocols/msn/dispatch.c:147 src/protocols/msn/notification.c:1927
+#: src/protocols/msn/dispatch.c:147 src/protocols/msn/notification.c:1551
 msgid "Got invalid XFR"
 msgstr "不正な XFR"
 
@@ -5485,16 +6005,16 @@
 msgid "Unable to parse message."
 msgstr "メッセージを解読できません"
 
-#: src/protocols/msn/dispatch.c:232 src/protocols/msn/notification.c:897
-#: src/protocols/msn/notification.c:2187
+#: src/protocols/msn/dispatch.c:232 src/protocols/msn/notification.c:521
+#: src/protocols/msn/notification.c:1811
 msgid "Unable to write to server"
 msgstr "サーバへ書き込みできません"
 
-#: src/protocols/msn/dispatch.c:236 src/protocols/msn/notification.c:2194
+#: src/protocols/msn/dispatch.c:236 src/protocols/msn/notification.c:1818
 msgid "Syncing with server"
 msgstr "サーバと同期中"
 
-#: src/protocols/msn/dispatch.c:250 src/protocols/msn/notification.c:2208
+#: src/protocols/msn/dispatch.c:250 src/protocols/msn/notification.c:1832
 msgid "Error reading from server"
 msgstr "サーバからの読み込みに失敗"
 
@@ -5594,339 +6114,351 @@
 msgid "Too many hits to a FND"
 msgstr ""
 
-#: src/protocols/msn/error.c:107 src/protocols/oscar/oscar.c:182
+#: src/protocols/msn/error.c:107 src/protocols/oscar/oscar.c:185
 msgid "Not logged in"
 msgstr "ログインしていません"
 
 #: src/protocols/msn/error.c:111
-msgid "Internal server error"
-msgstr "サーバ内部エラー"
+#, fuzzy
+msgid "Service Temporarily Unavailable"
+msgstr "一時ディレクトリサービスは使えません"
 
 #: src/protocols/msn/error.c:114
 msgid "Database server error"
 msgstr "データベースサーバエラー"
 
 #: src/protocols/msn/error.c:117
+#, fuzzy
+msgid "Command disabled"
+msgstr "コマンド"
+
+#: src/protocols/msn/error.c:120
 msgid "File operation error"
 msgstr "ファイル処理エラー"
 
-#: src/protocols/msn/error.c:120
+#: src/protocols/msn/error.c:123
 msgid "Memory allocation error"
 msgstr "メモリ確保エラー"
 
-#: src/protocols/msn/error.c:123
+#: src/protocols/msn/error.c:126
 msgid "Wrong CHL value sent to server"
 msgstr "間違ったCHLの値がサーバに送信されました"
 
-#: src/protocols/msn/error.c:127
+#: src/protocols/msn/error.c:130
 msgid "Server busy"
 msgstr "サーバビジー"
 
-#: src/protocols/msn/error.c:130 src/protocols/msn/error.c:143
-#: src/protocols/msn/error.c:198
+#: src/protocols/msn/error.c:133 src/protocols/msn/error.c:146
+#: src/protocols/msn/error.c:201
 msgid "Server unavailable"
 msgstr "サーバが見付かりません"
 
-#: src/protocols/msn/error.c:133
+#: src/protocols/msn/error.c:136
 msgid "Peer Notification server down"
 msgstr "ピアノーティフィケーションサーバがダウンしています"
 
-#: src/protocols/msn/error.c:136
+#: src/protocols/msn/error.c:139
 msgid "Database connect error"
 msgstr "データベース接続エラーです"
 
-#: src/protocols/msn/error.c:140
+#: src/protocols/msn/error.c:143
 msgid "Server is going down (abandon ship)"
 msgstr "サーバが停止します(脱出しましょう)"
 
-#: src/protocols/msn/error.c:147
+#: src/protocols/msn/error.c:150
 msgid "Error creating connection"
 msgstr "接続開始エラー"
 
-#: src/protocols/msn/error.c:151
+#: src/protocols/msn/error.c:154
 msgid "CVR parameters are either unknown or not allowed"
 msgstr "CVRパラメータは未知か不正です"
 
-#: src/protocols/msn/error.c:154 src/protocols/msn/notification.c:636
+#: src/protocols/msn/error.c:157 src/protocols/msn/notification.c:310
 msgid "Unable to write"
 msgstr "書き込めません"
 
-#: src/protocols/msn/error.c:157
+#: src/protocols/msn/error.c:160
 msgid "Session overload"
 msgstr "セッション負荷過剰"
 
-#: src/protocols/msn/error.c:160
-msgid "User is too active"
-msgstr "ユーザがアクティブすぎます"
-
 #: src/protocols/msn/error.c:163
+msgid "User is too active"
+msgstr "ユーザがアクティブすぎます"
+
+#: src/protocols/msn/error.c:166
 msgid "Too many sessions"
 msgstr "セッションが多すぎです"
 
-#: src/protocols/msn/error.c:166 src/protocols/msn/error.c:172
+#: src/protocols/msn/error.c:169 src/protocols/msn/error.c:175
 msgid "Not expected"
 msgstr "予想していないデータ"
 
-#: src/protocols/msn/error.c:169
+#: src/protocols/msn/error.c:172
 msgid "Bad friend file"
 msgstr "不正な友好ファイル"
 
-#: src/protocols/msn/error.c:177
+#: src/protocols/msn/error.c:180
 msgid "Friendly name changes too rapidly"
 msgstr ""
 
-#: src/protocols/msn/error.c:186
+#: src/protocols/msn/error.c:189
 #, fuzzy
 msgid "Server too busy"
 msgstr "サーバビジー"
 
-#: src/protocols/msn/error.c:190 src/protocols/oscar/oscar.c:1075
+#: src/protocols/msn/error.c:193 src/protocols/oscar/oscar.c:1163
 #: src/protocols/toc/toc.c:659
 msgid "Authentication failed"
 msgstr "認証失敗"
 
-#: src/protocols/msn/error.c:193
+#: src/protocols/msn/error.c:196
 msgid "Not allowed when offline"
 msgstr "オフラインのときにはできません"
 
-#: src/protocols/msn/error.c:201
+#: src/protocols/msn/error.c:204
 msgid "Not accepting new users"
 msgstr "新しいユーザを受け付ていない"
 
-#: src/protocols/msn/error.c:205
+#: src/protocols/msn/error.c:208
 msgid "Kids Passport without parental consent"
 msgstr ""
 
-#: src/protocols/msn/error.c:209
+#: src/protocols/msn/error.c:212
 msgid "Passport account not yet verified"
 msgstr "パスポートアカウントがまだ確認できていません"
 
-#: src/protocols/msn/error.c:213
+#: src/protocols/msn/error.c:215
+#, fuzzy
+msgid "Bad ticket"
+msgstr "仲間ティッカー"
+
+#: src/protocols/msn/error.c:219
 #, c-format
 msgid "Unknown Error Code %d"
 msgstr "不明なエラーコード %d"
 
-#: src/protocols/msn/msn.c:70
+#: src/protocols/msn/msn.c:71
 msgid "Your new MSN friendly name is too long."
 msgstr "新しく設定した MSN で公開する名前が長すぎます。"
 
-#: src/protocols/msn/msn.c:177
+#: src/protocols/msn/msn.c:178
 msgid "Set your friendly name."
 msgstr "公開する名前を設定"
 
-#: src/protocols/msn/msn.c:178
+#: src/protocols/msn/msn.c:179
 msgid "This is the name that other MSN buddies will see you as."
 msgstr "他のMSNの仲間があなたを見るときに見える名前です"
 
-#: src/protocols/msn/msn.c:190
+#: src/protocols/msn/msn.c:191
 msgid "Set your home phone number."
 msgstr "自宅の電話番号を設定してください"
 
-#: src/protocols/msn/msn.c:201
+#: src/protocols/msn/msn.c:202
 msgid "Set your work phone number."
 msgstr "仕事場の電話番号を設定してください"
 
-#: src/protocols/msn/msn.c:212
+#: src/protocols/msn/msn.c:213
 msgid "Set your mobile phone number."
 msgstr "携帯電話の番号を設定してください"
 
-#: src/protocols/msn/msn.c:221
+#: src/protocols/msn/msn.c:222
 msgid "Allow MSN Mobile pages?"
 msgstr "MSNモバイルページを許可しますか?"
 
-#: src/protocols/msn/msn.c:222
+#: src/protocols/msn/msn.c:223
 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?"
 msgstr ""
 "仲間がMSNモバイルページを携帯電話などの携帯機器に送信することを許可しますか?"
 
-#: src/protocols/msn/msn.c:226
+#: src/protocols/msn/msn.c:227
 msgid "Allow"
 msgstr "許可する"
 
-#: src/protocols/msn/msn.c:227
+#: src/protocols/msn/msn.c:228
 msgid "Disallow"
 msgstr "非許可"
 
-#: src/protocols/msn/msn.c:244
+#: src/protocols/msn/msn.c:245
 msgid "Send a mobile message."
 msgstr "モバイルメッセージ送信"
 
-#: src/protocols/msn/msn.c:246
+#: src/protocols/msn/msn.c:247
 msgid "Page"
 msgstr "ページ"
 
-#: src/protocols/msn/msn.c:332 src/protocols/yahoo/yahoo.c:2301
+#: src/protocols/msn/msn.c:333 src/protocols/yahoo/yahoo.c:2403
 #, c-format
 msgid "<b>Status:</b> %s"
 msgstr "<b>状態:</b> %s"
 
-#: src/protocols/msn/msn.c:345 src/protocols/msn/msn.c:628
+#: src/protocols/msn/msn.c:346 src/protocols/msn/msn.c:640
 #: src/protocols/msn/state.c:32
 msgid "Away From Computer"
 msgstr "コンピュータから離れてます"
 
-#: src/protocols/msn/msn.c:346 src/protocols/msn/msn.c:630
-#: src/protocols/msn/state.c:31 src/protocols/yahoo/yahoo.c:2169
-#: src/protocols/yahoo/yahoo.c:2494 src/protocols/yahoo/yahoo.c:2602
+#: src/protocols/msn/msn.c:347 src/protocols/msn/msn.c:642
+#: src/protocols/msn/state.c:31 src/protocols/yahoo/yahoo.c:2271
+#: src/protocols/yahoo/yahoo.c:2596 src/protocols/yahoo/yahoo.c:2704
 msgid "Be Right Back"
 msgstr "もうすぐ帰ってきます"
 
-#: src/protocols/msn/msn.c:347 src/protocols/msn/msn.c:632
-#: src/protocols/msn/state.c:29 src/protocols/yahoo/yahoo.c:2171
-#: src/protocols/yahoo/yahoo.c:2496 src/protocols/yahoo/yahoo.c:2603
+#: src/protocols/msn/msn.c:348 src/protocols/msn/msn.c:644
+#: src/protocols/msn/state.c:29 src/protocols/yahoo/yahoo.c:2273
+#: src/protocols/yahoo/yahoo.c:2598 src/protocols/yahoo/yahoo.c:2705
 msgid "Busy"
 msgstr "取り込み中"
 
-#: src/protocols/msn/msn.c:348 src/protocols/msn/msn.c:634
-#: src/protocols/msn/state.c:33 src/protocols/yahoo/yahoo.c:2179
-#: src/protocols/yahoo/yahoo.c:2504 src/protocols/yahoo/yahoo.c:2607
+#: src/protocols/msn/msn.c:349 src/protocols/msn/msn.c:646
+#: src/protocols/msn/state.c:33 src/protocols/yahoo/yahoo.c:2281
+#: src/protocols/yahoo/yahoo.c:2606 src/protocols/yahoo/yahoo.c:2709
 msgid "On The Phone"
 msgstr "電話中"
 
-#: src/protocols/msn/msn.c:349 src/protocols/msn/msn.c:636
-#: src/protocols/msn/state.c:34 src/protocols/yahoo/yahoo.c:2183
-#: src/protocols/yahoo/yahoo.c:2508 src/protocols/yahoo/yahoo.c:2609
+#: src/protocols/msn/msn.c:350 src/protocols/msn/msn.c:648
+#: src/protocols/msn/state.c:34 src/protocols/yahoo/yahoo.c:2285
+#: src/protocols/yahoo/yahoo.c:2610 src/protocols/yahoo/yahoo.c:2711
 msgid "Out To Lunch"
 msgstr "昼休み"
 
-#: src/protocols/msn/msn.c:350 src/protocols/msn/msn.c:638
-#: src/protocols/zephyr/zephyr.c:883 src/protocols/zephyr/zephyr.c:898
+#: src/protocols/msn/msn.c:351 src/protocols/msn/msn.c:650
+#: src/protocols/zephyr/zephyr.c:1173 src/protocols/zephyr/zephyr.c:1188
 msgid "Hidden"
 msgstr "隠れている"
 
-#: src/protocols/msn/msn.c:362
+#: src/protocols/msn/msn.c:363
 msgid "Set Friendly Name"
 msgstr "公開する名前を設定"
 
-#: src/protocols/msn/msn.c:370
+#: src/protocols/msn/msn.c:371
 msgid "Set Home Phone Number"
 msgstr "自宅の電話番号を設定"
 
-#: src/protocols/msn/msn.c:376
+#: src/protocols/msn/msn.c:377
 msgid "Set Work Phone Number"
 msgstr "仕事場の電話番号を設定"
 
-#: src/protocols/msn/msn.c:382
+#: src/protocols/msn/msn.c:383
 msgid "Set Mobile Phone Number"
 msgstr "携帯電話を設定"
 
-#: src/protocols/msn/msn.c:391
+#: src/protocols/msn/msn.c:392
 msgid "Enable/Disable Mobile Devices"
 msgstr "モバイルデバイスを有効/無効にする"
 
-#: src/protocols/msn/msn.c:398
+#: src/protocols/msn/msn.c:399
 msgid "Allow/Disallow Mobile Pages"
 msgstr "モバイルページを許可/非許可にする"
 
-#: src/protocols/msn/msn.c:424
+#: src/protocols/msn/msn.c:425
 msgid "Send to Mobile"
 msgstr "携帯機器に送信"
 
-#: src/protocols/msn/msn.c:433
+#: src/protocols/msn/msn.c:434
 #, fuzzy
 msgid "Initiate Chat"
 msgstr "エイリアス"
 
-#: src/protocols/msn/msn.c:457
+#: src/protocols/msn/msn.c:458
 msgid ""
 "SSL support is needed for MSN. Please install a supported SSL library. See "
 "http://gaim.sf.net/faq-ssl.php for more information."
 msgstr ""
 
-#: src/protocols/msn/msn.c:745
-#, c-format
-msgid ""
-"An MSN screenname must be in the form \"user@server.com\". Perhaps you meant "
-"%s@hotmail.com. No changes were made to your allow list."
+#: src/protocols/msn/msn.c:757
+#, fuzzy, c-format
+msgid ""
+"An MSN screen name must be in the form \"user@server.com\". Perhaps you "
+"meant %s@hotmail.com. No changes were made to your allow list."
 msgstr ""
 "MSN のスクリーン名は \"user@server.com\" の形でなければなりません。たぶん %"
 "s@hotmail.com のことでしょう。許可リストは変更していません。"
 
-#: src/protocols/msn/msn.c:749 src/protocols/msn/msn.c:789
-msgid "Invalid MSN screenname"
+#: src/protocols/msn/msn.c:761 src/protocols/msn/msn.c:801
+#, fuzzy
+msgid "Invalid MSN screen name"
 msgstr "無効な MSN サインイン名"
 
-#: src/protocols/msn/msn.c:785
-#, c-format
-msgid ""
-"An MSN screenname must be in the form \"user@server.com\". Perhaps you meant "
-"%s@hotmail.com. No changes were made to your block list."
+#: src/protocols/msn/msn.c:797
+#, fuzzy, c-format
+msgid ""
+"An MSN screen name must be in the form \"user@server.com\". Perhaps you "
+"meant %s@hotmail.com. No changes were made to your block list."
 msgstr ""
 "MSN スクリーン名は \"user@server.com\" の形でなければなりません。たぶん %"
 "s@hotmail.com のことでしょう。拒否リストは変更していません。"
 
-#: src/protocols/msn/msn.c:1287 src/protocols/yahoo/yahoo.c:2786
+#: src/protocols/msn/msn.c:1304 src/protocols/yahoo/yahoo.c:2888
 msgid "<html><body><b>Error retrieving profile</b></body></html>"
 msgstr ""
 
 #. Age
-#: src/protocols/msn/msn.c:1357 src/protocols/oscar/oscar.c:4001
+#: src/protocols/msn/msn.c:1374 src/protocols/oscar/oscar.c:4145
 #: src/protocols/trepia/trepia.c:285 src/protocols/trepia/trepia.c:413
-#: src/protocols/yahoo/yahoo.c:2896
+#: src/protocols/yahoo/yahoo.c:2998
 msgid "Age"
 msgstr "年齢"
 
 #. Gender
-#: src/protocols/msn/msn.c:1364 src/protocols/oscar/oscar.c:3987
+#: src/protocols/msn/msn.c:1381 src/protocols/oscar/oscar.c:4131
 #: src/protocols/trepia/trepia.c:279 src/protocols/trepia/trepia.c:421
-#: src/protocols/yahoo/yahoo.c:2904
+#: src/protocols/yahoo/yahoo.c:3006
 msgid "Gender"
 msgstr "性別"
 
 # NOTE official translation
-#: src/protocols/msn/msn.c:1372 src/protocols/yahoo/yahoo.c:2900
+#: src/protocols/msn/msn.c:1389 src/protocols/yahoo/yahoo.c:3002
 msgid "Marital Status"
 msgstr "未婚/既婚"
 
-#: src/protocols/msn/msn.c:1379 src/protocols/yahoo/yahoo.c:2892
+#: src/protocols/msn/msn.c:1396 src/protocols/yahoo/yahoo.c:2994
 msgid "Location"
 msgstr ""
 
 # NOTE official translation
-#: src/protocols/msn/msn.c:1387 src/protocols/yahoo/yahoo.c:2908
+#: src/protocols/msn/msn.c:1404 src/protocols/yahoo/yahoo.c:3010
 msgid "Occupation"
 msgstr "職業"
 
-#: src/protocols/msn/msn.c:1404 src/protocols/msn/msn.c:1410
-#: src/protocols/msn/msn.c:1417 src/protocols/msn/msn.c:1424
-#: src/protocols/msn/msn.c:1431
+#: src/protocols/msn/msn.c:1421 src/protocols/msn/msn.c:1427
+#: src/protocols/msn/msn.c:1434 src/protocols/msn/msn.c:1441
+#: src/protocols/msn/msn.c:1448
 msgid "A Little About Me"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1440 src/protocols/msn/msn.c:1453
-#: src/protocols/msn/msn.c:1460
+#: src/protocols/msn/msn.c:1457 src/protocols/msn/msn.c:1470
+#: src/protocols/msn/msn.c:1477
 msgid "Favorite Things"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1469 src/protocols/msn/msn.c:1475
-#: src/protocols/msn/msn.c:1482
+#: src/protocols/msn/msn.c:1486 src/protocols/msn/msn.c:1492
+#: src/protocols/msn/msn.c:1499
 msgid "Hobbies and Interests"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1491 src/protocols/msn/msn.c:1497
-#: src/protocols/yahoo/yahoo.c:2943
+#: src/protocols/msn/msn.c:1508 src/protocols/msn/msn.c:1514
+#: src/protocols/yahoo/yahoo.c:3045
 msgid "Favorite Quote"
 msgstr ""
 
 # NOTE official translation
-#: src/protocols/msn/msn.c:1505 src/protocols/yahoo/yahoo.c:2979
+#: src/protocols/msn/msn.c:1522 src/protocols/yahoo/yahoo.c:3081
 msgid "Last Updated"
 msgstr "最終更新日"
 
 #. Homepage
-#: src/protocols/msn/msn.c:1516 src/protocols/trepia/trepia.c:289
+#: src/protocols/msn/msn.c:1533 src/protocols/trepia/trepia.c:289
 #: src/protocols/trepia/trepia.c:457
 msgid "Homepage"
 msgstr "ウェブページ"
 
-#: src/protocols/msn/msn.c:1538 src/protocols/yahoo/yahoo.c:2994
+#: src/protocols/msn/msn.c:1555 src/protocols/yahoo/yahoo.c:3096
 #, c-format
 msgid "User information for %s unavailable"
 msgstr "%s のユーザ情報は利用できません"
 
-#: src/protocols/msn/msn.c:1540 src/protocols/yahoo/yahoo.c:2996
+#: src/protocols/msn/msn.c:1557 src/protocols/yahoo/yahoo.c:3098
 msgid "The user's profile is empty."
 msgstr ""
 
@@ -5940,95 +6472,90 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/msn/msn.c:1637 src/protocols/msn/msn.c:1639
+#. *  description
+#: src/protocols/msn/msn.c:1655 src/protocols/msn/msn.c:1657
 msgid "MSN Protocol Plugin"
 msgstr "MSNプロトコルプラグイン"
 
 # NOTE 0.62 (but this looks wrong)-:
-#: src/protocols/msn/msn.c:1656 src/protocols/trepia/trepia.c:1339
+#: src/protocols/msn/msn.c:1675 src/protocols/trepia/trepia.c:1345
 msgid "Login server"
 msgstr "サーバにログイン"
 
-#: src/protocols/msn/msn.c:1666
+#: src/protocols/msn/msn.c:1684
 msgid "Use HTTP Method"
 msgstr ""
 
-#: src/protocols/msn/notification.c:247
-#, fuzzy, c-format
-msgid "MSN Error: %s\n"
-msgstr "エラー %s: %s"
-
-#: src/protocols/msn/notification.c:322
+#: src/protocols/msn/msn.c:1702
+msgid "Display conversation closed notices"
+msgstr ""
+
+#: src/protocols/msn/msn.c:1707
+msgid "Display timeout notices"
+msgstr ""
+
+#: src/protocols/msn/nexus.c:56
 msgid "Unable to connect to server"
 msgstr "サーバへ接続できません"
 
-#: src/protocols/msn/notification.c:377 src/protocols/msn/notification.c:546
+#: src/protocols/msn/nexus.c:121 src/protocols/msn/nexus.c:130
 #, fuzzy
 msgid "Unable to write to MSN Nexus server."
 msgstr "サーバへ書き込みできません"
 
-#: src/protocols/msn/notification.c:386 src/protocols/msn/notification.c:561
-#, fuzzy
-msgid "Unable to read from MSN Nexus server."
-msgstr "サーバからヘッダが読み込めません"
-
-#: src/protocols/msn/notification.c:406
+#: src/protocols/msn/nexus.c:147
 msgid "MSN Nexus server returned invalid redirect information."
 msgstr ""
 
-#: src/protocols/msn/notification.c:460
+#: src/protocols/msn/nexus.c:204
 msgid "Unknown error when attempting to authorize with MSN login server."
 msgstr ""
 
-#: src/protocols/msn/notification.c:572
-msgid "MSN Nexus server returned invalid information."
-msgstr ""
-
-#: src/protocols/msn/notification.c:641 src/protocols/trepia/trepia.c:686
+#: src/protocols/msn/notification.c:215
+#, fuzzy, c-format
+msgid "MSN Error: %s\n"
+msgstr "エラー %s: %s"
+
+#: src/protocols/msn/notification.c:315 src/protocols/trepia/trepia.c:686
 msgid "Retrieving buddy list"
 msgstr "仲間リストの受信"
 
-#: src/protocols/msn/notification.c:711
-#, fuzzy
-msgid "Unable to connect to passport server"
-msgstr "サーバへ接続できません"
-
-#: src/protocols/msn/notification.c:716 src/protocols/msn/notification.c:748
-#: src/protocols/oscar/oscar.c:1361
+#: src/protocols/msn/notification.c:340 src/protocols/msn/notification.c:372
+#: src/protocols/oscar/oscar.c:1452
 msgid "Password sent"
 msgstr "パスワードを送信しました"
 
-#: src/protocols/msn/notification.c:743
+#: src/protocols/msn/notification.c:367
 msgid "Unable to send password"
 msgstr "パスワードを送信できません"
 
-#: src/protocols/msn/notification.c:779
+#: src/protocols/msn/notification.c:403
 msgid "Protocol not supported"
 msgstr "プロトコルがサポートされていません"
 
-#: src/protocols/msn/notification.c:821
+#: src/protocols/msn/notification.c:445
 msgid "You have been disconnected. You have signed on from another location."
 msgstr "違う場所で接続したため、切断されました。"
 
-#: src/protocols/msn/notification.c:826
+#: src/protocols/msn/notification.c:450
 msgid "You have been disconnected. The MSN servers are going down temporarily."
 msgstr "あなたの接続は切断されました.MSNサーバが一時的に停止します."
 
-#: src/protocols/msn/notification.c:953
+#: src/protocols/msn/notification.c:577
 #, c-format
 msgid "The user %s (%s) wants to add %s to his or her buddy list."
 msgstr "ユーザ %s (%s) が %s を仲間リストに追加したがっています"
 
-#: src/protocols/msn/notification.c:1278 src/protocols/msn/notification.c:1445
+#: src/protocols/msn/notification.c:902 src/protocols/msn/notification.c:1069
 #, c-format
 msgid "The user %s (%s) wants to add you to their buddy list."
 msgstr "ユーザ %s (%s) があなたを仲間リストに追加したがっています"
 
-#: src/protocols/msn/notification.c:1972
+#: src/protocols/msn/notification.c:1596
 msgid "Unable to transfer to notification server"
 msgstr "通知サーバと通信できません"
 
-#: src/protocols/msn/notification.c:2128
+#: src/protocols/msn/notification.c:1752
 #, fuzzy, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -6055,20 +6582,20 @@
 "\n"
 "メンテナンスが終了したら,またサインインできるようになります."
 
-#: src/protocols/msn/servconn.c:533
+#: src/protocols/msn/servconn.c:536
 msgid "Received HTTP error. Please report this."
 msgstr ""
 
-#: src/protocols/msn/switchboard.c:147
+#: src/protocols/msn/switchboard.c:150
 msgid "The conversation has become inactive and timed out."
 msgstr "会話が休止状態になってタイムアウトしました"
 
-#: src/protocols/msn/switchboard.c:154
+#: src/protocols/msn/switchboard.c:159
 #, c-format
 msgid "%s has closed the conversation window."
 msgstr "%s は会話ウインドウを閉じました"
 
-#: src/protocols/msn/switchboard.c:277
+#: src/protocols/msn/switchboard.c:285
 msgid "An MSN message may not have been received."
 msgstr "MSN メッセージが受信できなかったかもしれません"
 
@@ -6114,7 +6641,11 @@
 msgid "%s requested a PING"
 msgstr "%s はPINGを要求しました"
 
-#: src/protocols/napster/napster.c:543 src/protocols/oscar/oscar.c:5213
+#: src/protocols/napster/napster.c:529
+msgid "Get Info"
+msgstr "情報取得"
+
+#: src/protocols/napster/napster.c:543 src/protocols/oscar/oscar.c:5445
 #: src/protocols/toc/toc.c:1259
 msgid "_Group:"
 msgstr "グループ (_G):"
@@ -6129,178 +6660,181 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/napster/napster.c:618 src/protocols/napster/napster.c:620
+#. *  description
+#: src/protocols/napster/napster.c:619 src/protocols/napster/napster.c:621
 msgid "NAPSTER Protocol Plugin"
 msgstr "NAPSTERプロトコルプラグイン"
 
-#: src/protocols/oscar/oscar.c:178
+#: src/protocols/oscar/oscar.c:181
 msgid "Invalid error"
 msgstr "不正なエラー"
 
-#: src/protocols/oscar/oscar.c:179
+#: src/protocols/oscar/oscar.c:182
 msgid "Invalid SNAC"
 msgstr "不正な SNAC"
 
-#: src/protocols/oscar/oscar.c:180
+#: src/protocols/oscar/oscar.c:183
 msgid "Rate to host"
 msgstr "ホストの速度"
 
-#: src/protocols/oscar/oscar.c:181
-msgid "Rate to client"
-msgstr "クライアントの速度"
-
-#: src/protocols/oscar/oscar.c:183
-msgid "Service unavailable"
-msgstr "サービスが利用できません"
-
 #: src/protocols/oscar/oscar.c:184
-msgid "Service not defined"
-msgstr "サービスが定義されていません"
-
-#: src/protocols/oscar/oscar.c:185
-msgid "Obsolete SNAC"
-msgstr "旧式の SNAC"
+msgid "Rate to client"
+msgstr "クライアントの速度"
 
 #: src/protocols/oscar/oscar.c:186
-msgid "Not supported by host"
-msgstr "ホストではサポートしていません"
+msgid "Service unavailable"
+msgstr "サービスが利用できません"
 
 #: src/protocols/oscar/oscar.c:187
+msgid "Service not defined"
+msgstr "サービスが定義されていません"
+
+#: src/protocols/oscar/oscar.c:188
+msgid "Obsolete SNAC"
+msgstr "旧式の SNAC"
+
+#: src/protocols/oscar/oscar.c:189
+msgid "Not supported by host"
+msgstr "ホストではサポートしていません"
+
+#: src/protocols/oscar/oscar.c:190
 msgid "Not supported by client"
 msgstr "クライアントではサポートしていません"
 
-#: src/protocols/oscar/oscar.c:188
+#: src/protocols/oscar/oscar.c:191
 msgid "Refused by client"
 msgstr "クライアントに拒否されました"
 
-#: src/protocols/oscar/oscar.c:189
+#: src/protocols/oscar/oscar.c:192
 msgid "Reply too big"
 msgstr "返事が大きすぎます"
 
-#: src/protocols/oscar/oscar.c:190
+#: src/protocols/oscar/oscar.c:193
 msgid "Responses lost"
 msgstr "反応を失いました"
 
-#: src/protocols/oscar/oscar.c:191
+#: src/protocols/oscar/oscar.c:194
 msgid "Request denied"
 msgstr "リクエストが拒否されました"
 
-#: src/protocols/oscar/oscar.c:192
+#: src/protocols/oscar/oscar.c:195
 msgid "Busted SNAC payload"
 msgstr "SNAC 格納エリアが壊れました"
 
-#: src/protocols/oscar/oscar.c:193
+#: src/protocols/oscar/oscar.c:196
 msgid "Insufficient rights"
 msgstr "不十分な要求です"
 
-#: src/protocols/oscar/oscar.c:194
-msgid "In local permit/deny"
-msgstr "局所的な許可/不許可"
-
-#: src/protocols/oscar/oscar.c:195
-msgid "Too evil (sender)"
-msgstr "とても悪い (送信者)"
-
-#: src/protocols/oscar/oscar.c:196
-msgid "Too evil (receiver)"
-msgstr "とても悪い (受信者)"
-
 #: src/protocols/oscar/oscar.c:197
-msgid "User temporarily unavailable"
-msgstr "ユーザが一時的に無効です"
+msgid "In local permit/deny"
+msgstr "局所的な許可/不許可"
 
 #: src/protocols/oscar/oscar.c:198
-msgid "No match"
-msgstr "マッチしません"
+msgid "Too evil (sender)"
+msgstr "とても悪い (送信者)"
 
 #: src/protocols/oscar/oscar.c:199
-msgid "List overflow"
-msgstr "リスト溢れ"
+msgid "Too evil (receiver)"
+msgstr "とても悪い (受信者)"
 
 #: src/protocols/oscar/oscar.c:200
+msgid "User temporarily unavailable"
+msgstr "ユーザが一時的に無効です"
+
+#: src/protocols/oscar/oscar.c:201
+msgid "No match"
+msgstr "マッチしません"
+
+#: src/protocols/oscar/oscar.c:202
+msgid "List overflow"
+msgstr "リスト溢れ"
+
+#: src/protocols/oscar/oscar.c:203
 msgid "Request ambiguous"
 msgstr "要求が曖昧です"
 
-#: src/protocols/oscar/oscar.c:201
+#: src/protocols/oscar/oscar.c:204
 msgid "Queue full"
 msgstr "キューがいっぱいです"
 
-#: src/protocols/oscar/oscar.c:202
+#: src/protocols/oscar/oscar.c:205
 msgid "Not while on AOL"
 msgstr "AOL 中にはできません"
 
-#: src/protocols/oscar/oscar.c:474
+#: src/protocols/oscar/oscar.c:520
 #, c-format
 msgid "Direct IM with %s closed"
 msgstr "%sの直接IMは閉じました"
 
-#: src/protocols/oscar/oscar.c:476
+#: src/protocols/oscar/oscar.c:522
 #, c-format
 msgid "Direct IM with %s failed"
 msgstr "%sの直接IMは失敗しました"
 
-#: src/protocols/oscar/oscar.c:546 src/protocols/toc/toc.c:885
+#: src/protocols/oscar/oscar.c:593 src/protocols/toc/toc.c:885
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "チャットルーム%sから切断されました"
 
-#: src/protocols/oscar/oscar.c:562
+#: src/protocols/oscar/oscar.c:609
 msgid "Chat is currently unavailable"
 msgstr "チャットは接続できません"
 
-#: src/protocols/oscar/oscar.c:633 src/protocols/oscar/oscar.c:689
+#: src/protocols/oscar/oscar.c:680 src/protocols/oscar/oscar.c:746
 msgid "Couldn't connect to host"
 msgstr "ホストへ接続できませんでした"
 
-#: src/protocols/oscar/oscar.c:643
+#: src/protocols/oscar/oscar.c:690
 msgid "Screen name sent"
 msgstr "スクリーン名を送信しました"
 
-#: src/protocols/oscar/oscar.c:677
+#: src/protocols/oscar/oscar.c:705
+#, c-format
+msgid ""
+"Unable to login: Could not sign on as %s because the screen name is "
+"invalid.  Screen names must either start with a letter and contain only "
+"letters, numbers and spaces, or contain only numbers."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:734
 msgid "Unable to login to AIM"
 msgstr "AIMへログインできません"
 
-#: src/protocols/oscar/oscar.c:778 src/protocols/oscar/oscar.c:1166
+#: src/protocols/oscar/oscar.c:838 src/protocols/oscar/oscar.c:1256
 msgid "Could Not Connect"
 msgstr "接続できません"
 
-#: src/protocols/oscar/oscar.c:786
+#: src/protocols/oscar/oscar.c:846
 msgid "Connection established, cookie sent"
 msgstr "接続できました、cookie送信"
 
-#: src/protocols/oscar/oscar.c:853 src/protocols/oscar/oscar.c:866
-#: src/protocols/oscar/oscar.c:871 src/protocols/yahoo/yahoo_filexfer.c:204
-#: src/protocols/yahoo/yahoo_filexfer.c:212
-msgid "File Transfer Aborted"
-msgstr "ファイル転送が中断されました"
-
-#: src/protocols/oscar/oscar.c:854
+#: src/protocols/oscar/oscar.c:959 src/protocols/yahoo/yahoo_filexfer.c:209
+#: src/protocols/yahoo/yahoo_filexfer.c:218
+msgid "Unable to establish file descriptor."
+msgstr "ファイルデスクリプタを確立できません."
+
+#: src/protocols/oscar/oscar.c:964
+msgid "Unable to create new connection."
+msgstr "新規接続を作成できません."
+
+#: src/protocols/oscar/oscar.c:1035
 msgid "Unable to establish listener socket."
 msgstr "読み込みソケットを確立できません."
 
-#: src/protocols/oscar/oscar.c:867 src/protocols/yahoo/yahoo_filexfer.c:205
-#: src/protocols/yahoo/yahoo_filexfer.c:213
-msgid "Unable to establish file descriptor."
-msgstr "ファイルデスクリプタを確立できません."
-
-#: src/protocols/oscar/oscar.c:872
-msgid "Unable to create new connection."
-msgstr "新規接続を作成できません."
-
-#: src/protocols/oscar/oscar.c:1052 src/protocols/toc/toc.c:571
+#: src/protocols/oscar/oscar.c:1140 src/protocols/toc/toc.c:571
 msgid "Incorrect nickname or password."
 msgstr "間違ったニックネームかパスワードです"
 
-#: src/protocols/oscar/oscar.c:1057
+#: src/protocols/oscar/oscar.c:1145
 msgid "Your account is currently suspended."
 msgstr "あなたのアカウントは現在停止中です"
 
 #. service temporarily unavailable
-#: src/protocols/oscar/oscar.c:1061
+#: src/protocols/oscar/oscar.c:1149
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "AOL インスタントメッセンジャーサービスは一時的に利用不能です。"
 
-#: src/protocols/oscar/oscar.c:1066
+#: src/protocols/oscar/oscar.c:1154
 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."
@@ -6308,22 +6842,22 @@
 "頻繁に接続しすぎており分離していました。10分待って、再び試みてください。努力"
 "し続ければ、さらに長く待つ必要があるでしょう。"
 
-#: src/protocols/oscar/oscar.c:1071
+#: src/protocols/oscar/oscar.c:1159
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr "クライアントのバージョンが古すぎます。%s にアップグレードしましょう"
 
-#: src/protocols/oscar/oscar.c:1103
+#: src/protocols/oscar/oscar.c:1191
 msgid "Internal Error"
 msgstr "内部エラー"
 
-#: src/protocols/oscar/oscar.c:1173
+#: src/protocols/oscar/oscar.c:1263
 #, fuzzy
 msgid "Received authorization"
 msgstr "認証の再要求"
 
-#: src/protocols/oscar/oscar.c:1208 src/protocols/oscar/oscar.c:1238
-#: src/protocols/oscar/oscar.c:1326
+#: src/protocols/oscar/oscar.c:1299 src/protocols/oscar/oscar.c:1329
+#: src/protocols/oscar/oscar.c:1417
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
@@ -6332,30 +6866,30 @@
 "まもなく切断されるでしょう。修正されたら TOC を利用してかまいません。更新のた"
 "めに、%s をチェックしてください。"
 
-#: src/protocols/oscar/oscar.c:1211 src/protocols/oscar/oscar.c:1241
+#: src/protocols/oscar/oscar.c:1302 src/protocols/oscar/oscar.c:1332
 msgid "Gaim was unable to get a valid AIM login hash."
 msgstr "Gaim は正しい AIM ログイン hash を取得することができませんでした。"
 
-#: src/protocols/oscar/oscar.c:1329
+#: src/protocols/oscar/oscar.c:1420
 #, fuzzy
 msgid "Gaim was unable to get a valid login hash."
 msgstr "Gaim は正しいログイン hash を取得できませんでした。"
 
-#: src/protocols/oscar/oscar.c:1910 src/protocols/oscar/oscar.c:5654
+#: src/protocols/oscar/oscar.c:2002 src/protocols/oscar/oscar.c:5906
 #, c-format
 msgid "Direct IM with %s established"
 msgstr "%s との直接IM確立しました"
 
-#: src/protocols/oscar/oscar.c:2239 src/protocols/oscar/oscar.c:2261
+#: src/protocols/oscar/oscar.c:2333 src/protocols/oscar/oscar.c:2355
 msgid "(There was an error receiving this message)"
 msgstr "(メッセージ受信時にエラーが発生しました)"
 
-#: src/protocols/oscar/oscar.c:2408
+#: src/protocols/oscar/oscar.c:2504
 #, c-format
 msgid "%s has just asked to directly connect to %s"
 msgstr "%s は直接 %s に接続するように要求されました."
 
-#: src/protocols/oscar/oscar.c:2411
+#: src/protocols/oscar/oscar.c:2507
 msgid ""
 "This requires a direct connection between the two computers and is necessary "
 "for IM Images.  Because your IP address will be revealed, this may be "
@@ -6364,23 +6898,23 @@
 "これは 2 台のコンピュータ間の直接接続を要求しており、IM 画像に必要です。IP ア"
 "ドレスが明らかになるためで、プライバシーのリスクが考えられます。"
 
-#: src/protocols/oscar/oscar.c:2416 src/protocols/oscar/oscar.c:6023
+#: src/protocols/oscar/oscar.c:2512 src/protocols/oscar/oscar.c:6288
 msgid "Connect"
 msgstr "接続"
 
-#: src/protocols/oscar/oscar.c:2443
+#: src/protocols/oscar/oscar.c:2539
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr "私があなたを仲間リストに追加できるように承認してください."
 
-#: src/protocols/oscar/oscar.c:2451
+#: src/protocols/oscar/oscar.c:2547
 msgid "Authorization Request Message:"
 msgstr "承認要求メッセージ:"
 
-#: src/protocols/oscar/oscar.c:2452
+#: src/protocols/oscar/oscar.c:2548
 msgid "Please authorize me!"
 msgstr "私を承認してください!"
 
-#: src/protocols/oscar/oscar.c:2480
+#: src/protocols/oscar/oscar.c:2577
 #, c-format
 msgid ""
 "The user %s requires authorization before being added to a buddy list.  Do "
@@ -6389,23 +6923,23 @@
 "ユーザ %s が仲間リストに加える前に承認を求めています。承認の要求を送りたいで"
 "すか?"
 
-#: src/protocols/oscar/oscar.c:2485 src/protocols/oscar/oscar.c:2487
+#: src/protocols/oscar/oscar.c:2582 src/protocols/oscar/oscar.c:2584
 msgid "Request Authorization"
 msgstr "承認の要求"
 
-#: src/protocols/oscar/oscar.c:2523 src/protocols/oscar/oscar.c:2525
-#: src/protocols/oscar/oscar.c:2532 src/protocols/oscar/oscar.c:2608
-#: src/protocols/oscar/oscar.c:2628 src/protocols/oscar/oscar.c:2984
-#: src/protocols/oscar/oscar.c:3044 src/protocols/oscar/oscar.c:5134
-#: src/protocols/oscar/oscar.c:5180
+#: src/protocols/oscar/oscar.c:2620 src/protocols/oscar/oscar.c:2622
+#: src/protocols/oscar/oscar.c:2629 src/protocols/oscar/oscar.c:2705
+#: src/protocols/oscar/oscar.c:2725 src/protocols/oscar/oscar.c:3081
+#: src/protocols/oscar/oscar.c:3141 src/protocols/oscar/oscar.c:5366
+#: src/protocols/oscar/oscar.c:5412
 msgid "No reason given."
 msgstr "理由はわかりません。"
 
-#: src/protocols/oscar/oscar.c:2531
+#: src/protocols/oscar/oscar.c:2628
 msgid "Authorization Denied Message:"
 msgstr "承認拒否メッセージ:"
 
-#: src/protocols/oscar/oscar.c:2608
+#: src/protocols/oscar/oscar.c:2705
 #, c-format
 msgid ""
 "The user %u wants to add you to their buddy list for the following reason:\n"
@@ -6414,11 +6948,11 @@
 "ユーザ %u が以下の理由で仲間リストに追加したがっています: \n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2616 src/protocols/oscar/oscar.c:5140
+#: src/protocols/oscar/oscar.c:2713 src/protocols/oscar/oscar.c:5372
 msgid "Authorization Request"
 msgstr "承認の要求"
 
-#: src/protocols/oscar/oscar.c:2628
+#: src/protocols/oscar/oscar.c:2725
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -6429,18 +6963,18 @@
 "リクエストを拒否しました:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2629
+#: src/protocols/oscar/oscar.c:2726
 msgid "ICQ authorization denied."
 msgstr "ICQ認証は拒否されました。"
 
 #. Someone has granted you authorization
-#: src/protocols/oscar/oscar.c:2636
+#: src/protocols/oscar/oscar.c:2733
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
 msgstr ""
 "ユーザ%uは、あなたのコンタクトリストに彼らを加えるリクエストを認めました。"
 
-#: src/protocols/oscar/oscar.c:2644
+#: src/protocols/oscar/oscar.c:2741
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -6453,7 +6987,7 @@
 "送信者: %s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2652
+#: src/protocols/oscar/oscar.c:2749
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -6466,7 +7000,7 @@
 "送信者: %s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2660
+#: src/protocols/oscar/oscar.c:2757
 #, c-format
 msgid ""
 "You have received an ICQ email from %s [%s]\n"
@@ -6479,20 +7013,20 @@
 "メッセージは:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2681
+#: src/protocols/oscar/oscar.c:2778
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
 msgstr "ICQ ユーザ %u はあなたにコンタクトを送信しています: %s (%s)"
 
-#: src/protocols/oscar/oscar.c:2687
+#: src/protocols/oscar/oscar.c:2784
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr "この相手を仲間リストに追加しますか?"
 
-#: src/protocols/oscar/oscar.c:2691
+#: src/protocols/oscar/oscar.c:2788
 msgid "Decline"
 msgstr "断る"
 
-#: src/protocols/oscar/oscar.c:2773
+#: src/protocols/oscar/oscar.c:2870
 #, 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."
@@ -6501,7 +7035,7 @@
 msgstr[1] ""
 "%2$s からの %1$hu 個のメッセージは妥当でないので受け取れませんでした。"
 
-#: src/protocols/oscar/oscar.c:2782
+#: src/protocols/oscar/oscar.c:2879
 #, 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."
@@ -6510,7 +7044,7 @@
 msgstr[1] ""
 "%2$s からの %1$hu 個のメッセージは大きすぎるために受け取れませんでした。"
 
-#: src/protocols/oscar/oscar.c:2791
+#: src/protocols/oscar/oscar.c:2888
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -6523,7 +7057,7 @@
 "速度制限を上回ったので %2$s からの %1$hu 個のメッセージを受け取れませんでし"
 "た。"
 
-#: src/protocols/oscar/oscar.c:2800
+#: src/protocols/oscar/oscar.c:2897
 #, 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."
@@ -6534,7 +7068,7 @@
 "相手が有害すぎたので、%2$s からの %1$hu 個のメッセージを受け取れませんでし"
 "た。"
 
-#: src/protocols/oscar/oscar.c:2809
+#: src/protocols/oscar/oscar.c:2906
 #, 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."
@@ -6545,7 +7079,7 @@
 "あなたが有害すぎたので、%2$s からの %1$hu 個のメッセージを受け取れませんでし"
 "た。"
 
-#: src/protocols/oscar/oscar.c:2818
+#: src/protocols/oscar/oscar.c:2915
 #, 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."
@@ -6554,165 +7088,177 @@
 msgstr[1] ""
 "原因不明ですが、%2$s からの %1$hu 個のメッセージを受け取れませんでした。"
 
-#: src/protocols/oscar/oscar.c:2834 src/protocols/oscar/oscar.c:4608
-#: src/protocols/oscar/oscar.c:6150
+#: src/protocols/oscar/oscar.c:2931 src/protocols/oscar/oscar.c:4760
+#: src/protocols/oscar/oscar.c:6414
 msgid "Free For Chat"
 msgstr "チャットできます"
 
-#: src/protocols/oscar/oscar.c:2838 src/protocols/oscar/oscar.c:4602
-#: src/protocols/oscar/oscar.c:6148
+#: src/protocols/oscar/oscar.c:2935 src/protocols/oscar/oscar.c:4754
+#: src/protocols/oscar/oscar.c:6412
 msgid "Not Available"
 msgstr "不在"
 
-#: src/protocols/oscar/oscar.c:2840 src/protocols/oscar/oscar.c:4605
-#: src/protocols/oscar/oscar.c:6149
+#: src/protocols/oscar/oscar.c:2937 src/protocols/oscar/oscar.c:4757
+#: src/protocols/oscar/oscar.c:6413
 msgid "Occupied"
 msgstr "忙しい"
 
-#: src/protocols/oscar/oscar.c:2844
+#: src/protocols/oscar/oscar.c:2941
 msgid "Web Aware"
 msgstr "ウェブは見てます"
 
-#: src/protocols/oscar/oscar.c:2887
+#: src/protocols/oscar/oscar.c:2984
 #, c-format
 msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<HR>%s"
 msgstr "<B>UIN:</B> %s<BR><B>状態:</B> %s<HR>%s"
 
-#: src/protocols/oscar/oscar.c:2946
+#: src/protocols/oscar/oscar.c:3043
 #, c-format
 msgid "SNAC threw error: %s\n"
 msgstr "SNAC スルーエラー: %s\n"
 
+#: src/protocols/oscar/oscar.c:3044
+msgid "Unknown error"
+msgstr "不明なエラー"
+
 #. Data is assumed to be the destination sn
-#: src/protocols/oscar/oscar.c:2982
+#: src/protocols/oscar/oscar.c:3079
 #, c-format
 msgid "Your message to %s did not get sent:"
 msgstr "%s へのメッセージは送信できませんでした:"
 
-#: src/protocols/oscar/oscar.c:3041
+#: src/protocols/oscar/oscar.c:3138
 #, c-format
 msgid "User information for %s unavailable:"
 msgstr "%s のユーザ情報は利用できません:"
 
-#: src/protocols/oscar/oscar.c:3080
+#: src/protocols/oscar/oscar.c:3177
 msgid "Voice"
 msgstr "音声"
 
-#: src/protocols/oscar/oscar.c:3083
+#: src/protocols/oscar/oscar.c:3180
 #, fuzzy
 msgid "AIM Direct IM"
 msgstr "直接IM"
 
-#: src/protocols/oscar/oscar.c:3089 src/protocols/oscar/oscar.c:6249
+#: src/protocols/oscar/oscar.c:3183
+msgid "Chat"
+msgstr "チャット"
+
+#: src/protocols/oscar/oscar.c:3186 src/protocols/oscar/oscar.c:6523
 msgid "Get File"
 msgstr "ファイル取得"
 
-#: src/protocols/oscar/oscar.c:3092 src/protocols/oscar/oscar.c:6241
-#: src/protocols/yahoo/yahoo.c:2350
-msgid "Send File"
-msgstr "ファイル送信"
-
-#: src/protocols/oscar/oscar.c:3096
+#: src/protocols/oscar/oscar.c:3193
 msgid "Games"
 msgstr "ゲーム"
 
 # FIXME This is likely wrong
-#: src/protocols/oscar/oscar.c:3099
+#: src/protocols/oscar/oscar.c:3196
 msgid "Add-Ins"
 msgstr "追加"
 
-#: src/protocols/oscar/oscar.c:3102
+#: src/protocols/oscar/oscar.c:3199
 msgid "Send Buddy List"
 msgstr "仲間リスト送信"
 
-#: src/protocols/oscar/oscar.c:3105
+#: src/protocols/oscar/oscar.c:3202
 #, fuzzy
 msgid "ICQ Direct Connect"
 msgstr "接続できません"
 
-#: src/protocols/oscar/oscar.c:3108
+#: src/protocols/oscar/oscar.c:3205
 msgid "AP User"
 msgstr "AP ユーザ"
 
-#: src/protocols/oscar/oscar.c:3111
+#: src/protocols/oscar/oscar.c:3208
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
-#: src/protocols/oscar/oscar.c:3114
+#: src/protocols/oscar/oscar.c:3211
 msgid "Nihilist"
 msgstr "ニヒリスト"
 
-#: src/protocols/oscar/oscar.c:3117
+#: src/protocols/oscar/oscar.c:3214
 msgid "ICQ Server Relay"
 msgstr "ICQ サーバ中継"
 
-#: src/protocols/oscar/oscar.c:3120
+#: src/protocols/oscar/oscar.c:3217
 msgid "Old ICQ UTF8"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3123
+#: src/protocols/oscar/oscar.c:3220
 msgid "Trillian Encryption"
 msgstr "Trillian 暗号化"
 
-#: src/protocols/oscar/oscar.c:3126
+#: src/protocols/oscar/oscar.c:3223
 msgid "ICQ UTF8"
 msgstr "ICQ UTF8"
 
-#: src/protocols/oscar/oscar.c:3129
+#: src/protocols/oscar/oscar.c:3226
 msgid "Hiptop"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3132
+#: src/protocols/oscar/oscar.c:3229
 msgid "Security Enabled"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3135
+#: src/protocols/oscar/oscar.c:3232
 #, fuzzy
 msgid "Video Chat"
 msgstr "チャットの追加"
 
-#: src/protocols/oscar/oscar.c:3138
+#: src/protocols/oscar/oscar.c:3236
 msgid "iChat AV"
 msgstr "iChat AV"
 
-#: src/protocols/oscar/oscar.c:3167
+#: src/protocols/oscar/oscar.c:3239
+msgid "Live Video"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3242
+#, fuzzy
+msgid "Camera"
+msgstr "名前"
+
+#: src/protocols/oscar/oscar.c:3271
 #, c-format
 msgid "Username: <b>%s</b><br>\n"
 msgstr "ユーザ名: <b>%s</b><br>\n"
 
-#: src/protocols/oscar/oscar.c:3168
+#: src/protocols/oscar/oscar.c:3272
 #, c-format
 msgid "Warning Level: <b>%d%%</b><br>\n"
 msgstr "警告レベル: <b>%d%%</b><br>\n"
 
-#: src/protocols/oscar/oscar.c:3171
+#: src/protocols/oscar/oscar.c:3275
 #, c-format
 msgid "Online Since: <b>%s</b><br>\n"
 msgstr "オンライン開始 : <b>%s</b><br>\n"
 
-#: src/protocols/oscar/oscar.c:3175
+#: src/protocols/oscar/oscar.c:3279
 #, c-format
 msgid "Member Since: <b>%s</b><br>\n"
 msgstr "メンバー開始 : <b>%s</b><br>\n"
 
-#: src/protocols/oscar/oscar.c:3180
+#: src/protocols/oscar/oscar.c:3284
 #, c-format
 msgid "Idle: <b>%s</b>"
 msgstr "アイドル: <b>%s</b>"
 
-#: src/protocols/oscar/oscar.c:3183
+#: src/protocols/oscar/oscar.c:3287
 msgid "Idle: <b>Active</b>"
 msgstr "アイドル: <b>活動中</b>"
 
-#: src/protocols/oscar/oscar.c:3222
+#: src/protocols/oscar/oscar.c:3359
 msgid "Your AIM connection may be lost."
 msgstr "AIM への接続が失われたようです。"
 
-#: src/protocols/oscar/oscar.c:3616
+#: src/protocols/oscar/oscar.c:3760
 msgid "Rate limiting error."
 msgstr "速度制限エラー。"
 
-#: src/protocols/oscar/oscar.c:3617
+#: src/protocols/oscar/oscar.c:3761
 #, fuzzy
 msgid ""
 "The last action you attempted could not be performed because you are over "
@@ -6721,118 +7267,118 @@
 "速度制限を越えているためメッセージは送信しませんでした。10 秒待って再送してく"
 "ださい。"
 
-#: src/protocols/oscar/oscar.c:3680
+#: src/protocols/oscar/oscar.c:3824
 msgid ""
 "You have been disconnected because you have signed on with this screen name "
 "at another location."
 msgstr "違う場所で同じニックを利用して接続したため、切断されました。"
 
-#: src/protocols/oscar/oscar.c:3682
+#: src/protocols/oscar/oscar.c:3826
 msgid "You have been signed off for an unknown reason."
 msgstr "原因不明ですが、あなたはサインオフしました."
 
-#: src/protocols/oscar/oscar.c:3713
+#: src/protocols/oscar/oscar.c:3857
 #, fuzzy
 msgid "Finalizing connection"
 msgstr "接続開始エラー"
 
-#: src/protocols/oscar/oscar.c:3973 src/protocols/oscar/oscar.c:3979
+#: src/protocols/oscar/oscar.c:4117 src/protocols/oscar/oscar.c:4123
 msgid "Email Address"
 msgstr "メールアドレス"
 
-#: src/protocols/oscar/oscar.c:3984
+#: src/protocols/oscar/oscar.c:4128
 msgid "Mobile Phone"
 msgstr "携帯電話"
 
-#: src/protocols/oscar/oscar.c:3987 src/protocols/trepia/trepia.c:281
+#: src/protocols/oscar/oscar.c:4131 src/protocols/trepia/trepia.c:281
 #: src/protocols/trepia/trepia.c:422
 msgid "Female"
 msgstr "女性"
 
-#: src/protocols/oscar/oscar.c:3987 src/protocols/trepia/trepia.c:280
+#: src/protocols/oscar/oscar.c:4131 src/protocols/trepia/trepia.c:280
 #: src/protocols/trepia/trepia.c:422
 msgid "Male"
 msgstr "男性"
 
-#: src/protocols/oscar/oscar.c:4004
+#: src/protocols/oscar/oscar.c:4148
 msgid "Personal Web Page"
 msgstr "個人的なウェブページ"
 
-#: src/protocols/oscar/oscar.c:4007
+#: src/protocols/oscar/oscar.c:4151
 #, fuzzy
 msgid "Additional Information"
 msgstr "追加情報"
 
-#: src/protocols/oscar/oscar.c:4011
+#: src/protocols/oscar/oscar.c:4155
 msgid "Home Address"
 msgstr "自宅の住所"
 
-#: src/protocols/oscar/oscar.c:4022 src/protocols/oscar/oscar.c:4038
+#: src/protocols/oscar/oscar.c:4166 src/protocols/oscar/oscar.c:4182
 msgid "Zip Code"
 msgstr "郵便番号"
 
-#: src/protocols/oscar/oscar.c:4027
+#: src/protocols/oscar/oscar.c:4171
 msgid "Work Address"
 msgstr "勤務先住所"
 
-#: src/protocols/oscar/oscar.c:4043
+#: src/protocols/oscar/oscar.c:4187
 msgid "Work Information"
 msgstr "勤務先情報"
 
-#: src/protocols/oscar/oscar.c:4045
+#: src/protocols/oscar/oscar.c:4189
 msgid "Company"
 msgstr "会社"
 
-#: src/protocols/oscar/oscar.c:4048
+#: src/protocols/oscar/oscar.c:4192
 msgid "Division"
 msgstr "所属"
 
-#: src/protocols/oscar/oscar.c:4051
+#: src/protocols/oscar/oscar.c:4195
 msgid "Position"
 msgstr "役職"
 
-#: src/protocols/oscar/oscar.c:4054
+#: src/protocols/oscar/oscar.c:4198
 msgid "Web Page"
 msgstr "ウェブページ"
 
-#: src/protocols/oscar/oscar.c:4060
+#: src/protocols/oscar/oscar.c:4204
 #, fuzzy, c-format
 msgid "ICQ Info for %s"
 msgstr "%s の情報を変更:"
 
-#: src/protocols/oscar/oscar.c:4110
+#: src/protocols/oscar/oscar.c:4254
 #, fuzzy
 msgid "Pop-Up Message"
 msgstr "新しいメッセージ"
 
-#: src/protocols/oscar/oscar.c:4131
-#, c-format
-msgid "The following screennames are associated with %s"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:4135
+#: src/protocols/oscar/oscar.c:4275
+#, c-format
+msgid "The following screen names are associated with %s"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:4279
 msgid "Search Results"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:4152
+#: src/protocols/oscar/oscar.c:4296
 #, c-format
 msgid "No results found for email address %s"
 msgstr "%sというメールアドレスに対して結果がありませんでした"
 
-#: src/protocols/oscar/oscar.c:4173
+#: src/protocols/oscar/oscar.c:4317
 #, c-format
 msgid "You should receive an email asking to confirm %s."
 msgstr "%sを確認するためにメールを受信するはずです."
 
-#: src/protocols/oscar/oscar.c:4175
+#: src/protocols/oscar/oscar.c:4319
 msgid "Account Confirmation Requested"
 msgstr "アカウント認証を要求しました"
 
-#: src/protocols/oscar/oscar.c:4203
+#: src/protocols/oscar/oscar.c:4347
 msgid "Error Changing Account Info"
 msgstr "アカウント情報変更エラー"
 
-#: src/protocols/oscar/oscar.c:4206
+#: src/protocols/oscar/oscar.c:4350
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -6841,7 +7387,7 @@
 "エラー 0x%04x: 要求されたスクリーン名がオリジナルと異なっているため、整形でき"
 "ません。"
 
-#: src/protocols/oscar/oscar.c:4209
+#: src/protocols/oscar/oscar.c:4353
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -6850,14 +7396,14 @@
 "エラー 0x%04x: 要求されたスクリーン名が空白で終わっているため、整形できませ"
 "ん。"
 
-#: src/protocols/oscar/oscar.c:4212
+#: src/protocols/oscar/oscar.c:4356
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
 "is too long."
 msgstr "エラー 0x%04x: 要求されたスクリーン名が長すぎるため、整形できません。"
 
-#: src/protocols/oscar/oscar.c:4215
+#: src/protocols/oscar/oscar.c:4359
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because there is already a "
@@ -6866,7 +7412,7 @@
 "エラー 0x%04x: このスクリーン名に対してすでに要求があるため、メールアドレスを"
 "変更できません。"
 
-#: src/protocols/oscar/oscar.c:4218
+#: src/protocols/oscar/oscar.c:4362
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address has "
@@ -6875,7 +7421,7 @@
 "エラー 0x%04x: たくさんのスクリーン名に割り当てられているため、このメールアド"
 "レスには変更できません。"
 
-#: src/protocols/oscar/oscar.c:4221
+#: src/protocols/oscar/oscar.c:4365
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address is "
@@ -6884,12 +7430,12 @@
 "エラー 0x%04x: このアドレスは不正なので、このメールアドレスには変更できませ"
 "ん。"
 
-#: src/protocols/oscar/oscar.c:4224
+#: src/protocols/oscar/oscar.c:4368
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "エラー 0x%04x: 不明なエラー。"
 
-#: src/protocols/oscar/oscar.c:4234
+#: src/protocols/oscar/oscar.c:4378
 #, c-format
 msgid ""
 "Your screen name is currently formatted as follows:\n"
@@ -6898,20 +7444,20 @@
 "あなたのスクリーン名は、現在次のように整形されています:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:4235 src/protocols/oscar/oscar.c:4242
+#: src/protocols/oscar/oscar.c:4379 src/protocols/oscar/oscar.c:4386
 msgid "Account Info"
 msgstr "アカウント情報"
 
-#: src/protocols/oscar/oscar.c:4240
+#: src/protocols/oscar/oscar.c:4384
 #, c-format
 msgid "The email address for %s is %s"
 msgstr "%s のメールアドレスは %s です"
 
-#: src/protocols/oscar/oscar.c:4472
+#: src/protocols/oscar/oscar.c:4616
 msgid "Unable to set AIM profile."
 msgstr "AIM プロフィールをセットできません。"
 
-#: src/protocols/oscar/oscar.c:4473
+#: src/protocols/oscar/oscar.c:4617
 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 "
@@ -6921,7 +7467,7 @@
 "す。あなたのプロフィールは設定されずに残っています。接続が完了してから、再度"
 "試してください。"
 
-#: src/protocols/oscar/oscar.c:4500
+#: src/protocols/oscar/oscar.c:4644
 #, fuzzy, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  Gaim has truncated "
@@ -6936,15 +7482,20 @@
 "プロフィールの長さが最大値 (%d バイト) に達しました。Gaim は切り捨てて設定し"
 "ます。"
 
-#: src/protocols/oscar/oscar.c:4505
+#: src/protocols/oscar/oscar.c:4649
 msgid "Profile too long."
 msgstr "プロフィールが長すぎます"
 
-#: src/protocols/oscar/oscar.c:4522
+#: src/protocols/oscar/oscar.c:4665 src/protocols/oscar/oscar.c:6418
+#, fuzzy
+msgid "Visible"
+msgstr "隠れる"
+
+#: src/protocols/oscar/oscar.c:4676
 msgid "Unable to set AIM away message."
 msgstr "AIM 離席メッセージをセットできません。"
 
-#: src/protocols/oscar/oscar.c:4523
+#: src/protocols/oscar/oscar.c:4677
 msgid ""
 "You have probably requested to set your away message before the login "
 "procedure completed.  You remain in a \"present\" state; try setting it "
@@ -6953,7 +7504,7 @@
 "ログインの手続きが完了する前に離席メッセージを設定しようとしているようです。"
 "あなたは「現在の」状態のままです。接続が完了してから、再度試してください。"
 
-#: src/protocols/oscar/oscar.c:4563
+#: src/protocols/oscar/oscar.c:4717
 #, fuzzy, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  Gaim has "
@@ -6968,16 +7519,29 @@
 "離席メッセージの長さの最大値%d バイトを越えました。Gaim は切り捨てて設定しま"
 "した。"
 
-#: src/protocols/oscar/oscar.c:4568
+#: src/protocols/oscar/oscar.c:4722
 msgid "Away message too long."
 msgstr "離席メッセージが長すぎます"
 
-#: src/protocols/oscar/oscar.c:4782
+#: src/protocols/oscar/oscar.c:4815
+#, c-format
+msgid ""
+"Could not add the buddy %s because the screen name is invalid.  Screen names "
+"must either start with a letter and contain only letters, numbers and "
+"spaces, or contain only numbers."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:4816 src/protocols/oscar/oscar.c:5233
+#: src/protocols/oscar/oscar.c:5246
+msgid "Unable To Add"
+msgstr "追加できません"
+
+#: src/protocols/oscar/oscar.c:4952
 #, fuzzy
 msgid "Unable To Retrieve Buddy List"
 msgstr "仲間リストを取得できません"
 
-#: src/protocols/oscar/oscar.c:4783
+#: src/protocols/oscar/oscar.c:4953
 #, fuzzy
 msgid ""
 "Gaim was temporarily unable to retrieve your buddy list from the AIM "
@@ -6988,12 +7552,13 @@
 "ストは失われてはいません.おそらく数時間後には再度利用できるようになっている"
 "でしょう."
 
-#: src/protocols/oscar/oscar.c:4875 src/protocols/oscar/oscar.c:4876
-#: src/protocols/oscar/oscar.c:4881
+#: src/protocols/oscar/oscar.c:5129 src/protocols/oscar/oscar.c:5130
+#: src/protocols/oscar/oscar.c:5135 src/protocols/oscar/oscar.c:5290
+#: src/protocols/oscar/oscar.c:5291 src/protocols/oscar/oscar.c:5296
 msgid "Orphans"
 msgstr "みなしご"
 
-#: src/protocols/oscar/oscar.c:5047
+#: src/protocols/oscar/oscar.c:5232
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -7002,15 +7567,11 @@
 "仲間 %s を追加することができませんでした.仲間の数が多すぎます.一人削除して"
 "再度挑戦してください."
 
-#: src/protocols/oscar/oscar.c:5047 src/protocols/oscar/oscar.c:5060
+#: src/protocols/oscar/oscar.c:5232 src/protocols/oscar/oscar.c:5245
 msgid "(no name)"
 msgstr "(名前無し)"
 
-#: src/protocols/oscar/oscar.c:5048 src/protocols/oscar/oscar.c:5061
-msgid "Unable To Add"
-msgstr "追加できません"
-
-#: src/protocols/oscar/oscar.c:5060
+#: src/protocols/oscar/oscar.c:5245
 #, c-format
 msgid ""
 "Could not add the buddy %s for an unknown reason.  The most common reason "
@@ -7021,7 +7582,7 @@
 "これはバディーリストに追加可能なバディーの数を越えてしまっているということが"
 "あり得ます."
 
-#: src/protocols/oscar/oscar.c:5095
+#: src/protocols/oscar/oscar.c:5327
 #, c-format
 msgid ""
 "The user %s has given you permission to add you to their buddy list.  Do you "
@@ -7030,11 +7591,11 @@
 "ユーザ %s があなたを仲間リストに加えることを許可しました。彼らを加えたいです"
 "か?"
 
-#: src/protocols/oscar/oscar.c:5101
+#: src/protocols/oscar/oscar.c:5333
 msgid "Authorization Given"
 msgstr "承認が得られました"
 
-#: src/protocols/oscar/oscar.c:5134
+#: src/protocols/oscar/oscar.c:5366
 #, c-format
 msgid ""
 "The user %s wants to add you to their buddy list for the following reason:\n"
@@ -7044,17 +7605,17 @@
 "%s"
 
 #. Granted
-#: src/protocols/oscar/oscar.c:5176
+#: src/protocols/oscar/oscar.c:5408
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
 msgstr "ユーザ %s は、コンタクトリストに彼らを加えることを承認しました。"
 
-#: src/protocols/oscar/oscar.c:5177
+#: src/protocols/oscar/oscar.c:5409
 msgid "Authorization Granted"
 msgstr "承認が得られました"
 
 #. Denied
-#: src/protocols/oscar/oscar.c:5180
+#: src/protocols/oscar/oscar.c:5412
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -7065,59 +7626,64 @@
 "した:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:5181
+#: src/protocols/oscar/oscar.c:5413
 msgid "Authorization Denied"
 msgstr "承認は拒否されました"
 
 # FIXME This is likely wrong
-#: src/protocols/oscar/oscar.c:5218 src/protocols/toc/toc.c:1264
+#: src/protocols/oscar/oscar.c:5450 src/protocols/toc/toc.c:1264
 msgid "_Exchange:"
 msgstr "交換 (_E):"
 
-#: src/protocols/oscar/oscar.c:5456
+#: src/protocols/oscar/oscar.c:5472
+#, fuzzy
+msgid "Invalid chat name specified."
+msgstr "それは無効なGadu-Gadu UINです"
+
+#: src/protocols/oscar/oscar.c:5703
 msgid "<b>Status:</b> "
 msgstr "<b>状態:</b> "
 
-#: src/protocols/oscar/oscar.c:5468
+#: src/protocols/oscar/oscar.c:5715
 msgid "<b>IP Address:</b> "
 msgstr "<b>IP アドレス:</b> "
 
-#: src/protocols/oscar/oscar.c:5476
+#: src/protocols/oscar/oscar.c:5723
 msgid "<b>Capabilities:</b> "
 msgstr "<b>機能:</b> "
 
-#: src/protocols/oscar/oscar.c:5485
+#: src/protocols/oscar/oscar.c:5732
 #, fuzzy
 msgid "<b>Buddy Comment:</b> "
 msgstr "仲間名 (_B):"
 
-#: src/protocols/oscar/oscar.c:5494
+#: src/protocols/oscar/oscar.c:5741
 #, fuzzy
 msgid "<b>Available:</b> "
 msgstr "<b>機能:</b> "
 
-#: src/protocols/oscar/oscar.c:5512
+#: src/protocols/oscar/oscar.c:5760
 msgid "<b>Away Message:</b> "
 msgstr "<b>離席メッセージ:</b> "
 
-#: src/protocols/oscar/oscar.c:5521
+#: src/protocols/oscar/oscar.c:5768
 msgid "<b>Status:</b> Not Authorized"
 msgstr "<b>状態:</b> 未認証"
 
-#: src/protocols/oscar/oscar.c:5555 src/protocols/yahoo/yahoo.c:2191
+#: src/protocols/oscar/oscar.c:5802 src/protocols/yahoo/yahoo.c:2293
 msgid "Offline"
 msgstr "オフライン "
 
-#: src/protocols/oscar/oscar.c:6003
+#: src/protocols/oscar/oscar.c:6268
 msgid "Unable to open Direct IM"
 msgstr "直接IMを開けません"
 
-#: src/protocols/oscar/oscar.c:6016
+#: src/protocols/oscar/oscar.c:6281
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr "%s を利用した直接 IM 接続の開始を選択しています。"
 
-#: src/protocols/oscar/oscar.c:6019
+#: src/protocols/oscar/oscar.c:6284
 msgid ""
 "Because this reveals your IP address, it may be considered a privacy risk.  "
 "Do you wish to continue?"
@@ -7125,54 +7691,56 @@
 "なぜなら、あなたの IP アドレスを明かすことになるからです。これにより、プライ"
 "バシーのリスクが考えられます。続けますか?"
 
-#: src/protocols/oscar/oscar.c:6194
+#: src/protocols/oscar/oscar.c:6468
 #, fuzzy
 msgid "Buddy Comment:"
 msgstr "仲間名 (_B):"
 
-#: src/protocols/oscar/oscar.c:6210
+#: src/protocols/oscar/oscar.c:6484
 #, fuzzy
 msgid "Edit Buddy Comment"
 msgstr "掴む仲間を編集"
 
-#: src/protocols/oscar/oscar.c:6218
+#: src/protocols/oscar/oscar.c:6492
 msgid "Get Status Msg"
 msgstr "ステータスメッセージを取得"
 
-#: src/protocols/oscar/oscar.c:6233
+#: src/protocols/oscar/oscar.c:6507
 msgid "Direct IM"
 msgstr "直接IM"
 
-#: src/protocols/oscar/oscar.c:6262
+#: src/protocols/oscar/oscar.c:6536
 msgid "Re-request Authorization"
 msgstr "承認の再要求"
 
-#: src/protocols/oscar/oscar.c:6283
+#: src/protocols/oscar/oscar.c:6557
 msgid "The new formatting is invalid."
 msgstr "新しいフォーマットは不正です."
 
-#: src/protocols/oscar/oscar.c:6284
-msgid "Screenname formatting can change only capitalization and whitespace."
+#: src/protocols/oscar/oscar.c:6558
+#, fuzzy
+msgid "Screen name formatting can change only capitalization and whitespace."
 msgstr "スクリーン名フォーマットは大文字化と空白文字しか変更できません."
 
-#: src/protocols/oscar/oscar.c:6290
-msgid "New screenname formatting:"
+#: src/protocols/oscar/oscar.c:6564
+#, fuzzy
+msgid "New screen name formatting:"
 msgstr "新しいスクリーン名フォーマット:"
 
-#: src/protocols/oscar/oscar.c:6339
+#: src/protocols/oscar/oscar.c:6613
 msgid "Change Address To:"
 msgstr "このアドレスに変更する:"
 
-#: src/protocols/oscar/oscar.c:6383
+#: src/protocols/oscar/oscar.c:6657
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>あなたは承認を待っていません</i>"
 
-#: src/protocols/oscar/oscar.c:6386
+#: src/protocols/oscar/oscar.c:6660
 #, fuzzy
 msgid "You are awaiting authorization from the following buddies"
 msgstr "あなたは以下の仲間からの承認を待っています:<BR>"
 
-#: src/protocols/oscar/oscar.c:6387
+#: src/protocols/oscar/oscar.c:6661
 #, fuzzy
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
@@ -7181,73 +7749,70 @@
 "%s<BR><BR>これらの仲間からの認証を再要求することを,右クリックして「認証を再"
 "要求する」を選択すればできます."
 
-#: src/protocols/oscar/oscar.c:6401
+#: src/protocols/oscar/oscar.c:6675
 msgid "Find Buddy by E-mail"
 msgstr "E-mailから仲間を探す"
 
-#: src/protocols/oscar/oscar.c:6402
+#: src/protocols/oscar/oscar.c:6676
 msgid "Search for a buddy by e-mail address"
 msgstr "メールで仲間を検索"
 
-#: src/protocols/oscar/oscar.c:6403
+#: src/protocols/oscar/oscar.c:6677
 msgid "Type the e-mail address of the buddy you are searching for."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:6406
-msgid "Search"
-msgstr "検索"
-
-#: src/protocols/oscar/oscar.c:6420
+#: src/protocols/oscar/oscar.c:6694
 #, fuzzy
 msgid "Available Message:"
 msgstr "可視"
 
-#: src/protocols/oscar/oscar.c:6421
+#: src/protocols/oscar/oscar.c:6695
 msgid "I'm doing work and hoping for a distraction--IM me!"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:6492
+#: src/protocols/oscar/oscar.c:6766
 msgid "Set User Info..."
 msgstr "ユーザ情報の登録..."
 
-#: src/protocols/oscar/oscar.c:6499
+#: src/protocols/oscar/oscar.c:6773
 #, fuzzy
 msgid "Set Available Message..."
 msgstr "離席メッセージを設定"
 
-#: src/protocols/oscar/oscar.c:6506
+#: src/protocols/oscar/oscar.c:6780
 msgid "Change Password..."
 msgstr "パスワード変更..."
 
-#: src/protocols/oscar/oscar.c:6513
+#: src/protocols/oscar/oscar.c:6787
 msgid "Change Password (URL)"
 msgstr "パスワード変更 (URL)"
 
-#: src/protocols/oscar/oscar.c:6521
+#: src/protocols/oscar/oscar.c:6795
 msgid "Configure IM Forwarding (URL)"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:6532
-msgid "Format Screenname..."
+#: src/protocols/oscar/oscar.c:6806
+#, fuzzy
+msgid "Format Screen Name..."
 msgstr "スクリーン名のフォーマット..."
 
-#: src/protocols/oscar/oscar.c:6538
+#: src/protocols/oscar/oscar.c:6812
 msgid "Confirm Account"
 msgstr "アカウントを確認"
 
-#: src/protocols/oscar/oscar.c:6544
+#: src/protocols/oscar/oscar.c:6818
 msgid "Display Currently Registered Address"
 msgstr "現在登録されているアドレスを表示"
 
-#: src/protocols/oscar/oscar.c:6550
+#: src/protocols/oscar/oscar.c:6824
 msgid "Change Currently Registered Address..."
 msgstr "現在登録されているアドレスを変更"
 
-#: src/protocols/oscar/oscar.c:6559
+#: src/protocols/oscar/oscar.c:6833
 msgid "Show Buddies Awaiting Authorization"
 msgstr "承認を待っている仲間を表示"
 
-#: src/protocols/oscar/oscar.c:6567
+#: src/protocols/oscar/oscar.c:6841
 msgid "Search for Buddy by Email..."
 msgstr "メールで仲間を検索..."
 
@@ -7261,15 +7826,16 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/oscar/oscar.c:6687 src/protocols/oscar/oscar.c:6689
+#. *  description
+#: src/protocols/oscar/oscar.c:6962 src/protocols/oscar/oscar.c:6964
 msgid "AIM/ICQ Protocol Plugin"
 msgstr "AIM/ICQプロトコルプラグイン"
 
-#: src/protocols/oscar/oscar.c:6706
+#: src/protocols/oscar/oscar.c:6981
 msgid "Auth host"
 msgstr "認証ホスト"
 
-#: src/protocols/oscar/oscar.c:6711
+#: src/protocols/oscar/oscar.c:6986
 msgid "Auth port"
 msgstr "認証ポート"
 
@@ -7475,15 +8041,16 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/toc/toc.c:2158 src/protocols/toc/toc.c:2160
+#. *  description
+#: src/protocols/toc/toc.c:2159 src/protocols/toc/toc.c:2161
 msgid "TOC Protocol Plugin"
 msgstr "TOCプロトコルプラグイン"
 
-#: src/protocols/toc/toc.c:2177
+#: src/protocols/toc/toc.c:2178
 msgid "TOC host"
 msgstr "TOC ホスト"
 
-#: src/protocols/toc/toc.c:2181
+#: src/protocols/toc/toc.c:2182
 msgid "TOC port"
 msgstr "TOC ポート番号"
 
@@ -7555,7 +8122,7 @@
 msgid "Local Users"
 msgstr "無効なユーザ"
 
-#: src/protocols/trepia/trepia.c:1073
+#: src/protocols/trepia/trepia.c:1078
 #, fuzzy
 msgid "Logging in"
 msgstr "ログ"
@@ -7570,31 +8137,36 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/trepia/trepia.c:1320 src/protocols/trepia/trepia.c:1322
+#. *  description
+#: src/protocols/trepia/trepia.c:1326 src/protocols/trepia/trepia.c:1328
 msgid "Trepia Protocol Plugin"
 msgstr "Trepiaプロトコルプラグイン"
 
-#: src/protocols/yahoo/yahoo.c:297
+#: src/protocols/yahoo/yahoo.c:308
 msgid ""
 "You have been logged off as you have logged in on a different machine or "
 "device."
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:730
+#: src/protocols/yahoo/yahoo.c:747
 msgid "Your Yahoo! message did not get sent."
 msgstr "Yahoo! メッセージを送ることができませんでした。"
 
-#: src/protocols/yahoo/yahoo.c:772
+#: src/protocols/yahoo/yahoo.c:765
+msgid "Buzz!!"
+msgstr ""
+
+#: src/protocols/yahoo/yahoo.c:800
 #, c-format
 msgid "Yahoo! system message for %s:"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:838
+#: src/protocols/yahoo/yahoo.c:866
 #, fuzzy, c-format
 msgid "%s has (retroactively) denied your request to add them to your list."
 msgstr "ユーザ %s は、コンタクトリストに彼らを加えることを承認しました。"
 
-#: src/protocols/yahoo/yahoo.c:841
+#: src/protocols/yahoo/yahoo.c:869
 #, fuzzy, c-format
 msgid ""
 "%s has (retroactively) denied your request to add them to your list for the "
@@ -7604,12 +8176,12 @@
 "した:\n"
 "%s"
 
-#: src/protocols/yahoo/yahoo.c:844
+#: src/protocols/yahoo/yahoo.c:872
 #, fuzzy
 msgid "Add buddy rejected"
 msgstr "掴む仲間に加える"
 
-#: src/protocols/yahoo/yahoo.c:1494
+#: src/protocols/yahoo/yahoo.c:1595
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -7617,168 +8189,169 @@
 "on to Yahoo.  Check %s for updates."
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:1497
+#: src/protocols/yahoo/yahoo.c:1598
 #, fuzzy
 msgid "Failed Yahoo! Authentication"
 msgstr "認証中"
 
-#: src/protocols/yahoo/yahoo.c:1570
+#: src/protocols/yahoo/yahoo.c:1671
 #, c-format
 msgid ""
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
 "\"Yes\" will remove and ignore the buddy."
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:1573
+#: src/protocols/yahoo/yahoo.c:1674
 #, fuzzy
 msgid "Ignore buddy?"
 msgstr "無視"
 
-#: src/protocols/yahoo/yahoo.c:1606
+#: src/protocols/yahoo/yahoo.c:1707
 msgid "Invalid username."
 msgstr "無効なユーザ名"
 
-#: src/protocols/yahoo/yahoo.c:1609
+#: src/protocols/yahoo/yahoo.c:1710
 #, fuzzy
 msgid "Incorrect password."
 msgstr "間違ったパスワードです"
 
-#: src/protocols/yahoo/yahoo.c:1612
+#: src/protocols/yahoo/yahoo.c:1713
 msgid "Your account is locked, please log in to the yahoo website."
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:1615
+#: src/protocols/yahoo/yahoo.c:1716
 #, c-format
 msgid "Unknown error number %d."
 msgstr "不明なエラーコード %d"
 
-#: src/protocols/yahoo/yahoo.c:1672
+#: src/protocols/yahoo/yahoo.c:1773
 #, c-format
 msgid "Could not add buddy %s to group %s to the server list on account %s."
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:1674
+#: src/protocols/yahoo/yahoo.c:1775
 #, fuzzy
 msgid "Could not add buddy to server list"
 msgstr "仲間リストのエクスポートができませんでした"
 
-#: src/protocols/yahoo/yahoo.c:1784 src/protocols/yahoo/yahoo.c:1914
+#: src/protocols/yahoo/yahoo.c:1885 src/protocols/yahoo/yahoo.c:2016
 #, fuzzy
 msgid "Unable to read"
 msgstr "書き込めません"
 
-#: src/protocols/yahoo/yahoo.c:1939 src/protocols/yahoo/yahoo.c:2048
-#: src/protocols/yahoo/yahoo.c:2089
+#: src/protocols/yahoo/yahoo.c:2038 src/protocols/yahoo/yahoo.c:2148
+#: src/protocols/yahoo/yahoo.c:2191 src/protocols/yahoo/yahoochat.c:1360
+#: src/protocols/yahoo/yahoochat.c:1421
 #, fuzzy
 msgid "Connection problem"
 msgstr "接続エラー"
 
-#: src/protocols/yahoo/yahoo.c:2173 src/protocols/yahoo/yahoo.c:2498
-#: src/protocols/yahoo/yahoo.c:2604
+#: src/protocols/yahoo/yahoo.c:2275 src/protocols/yahoo/yahoo.c:2600
+#: src/protocols/yahoo/yahoo.c:2706
 msgid "Not At Home"
 msgstr "家に居ません"
 
-#: src/protocols/yahoo/yahoo.c:2175 src/protocols/yahoo/yahoo.c:2500
-#: src/protocols/yahoo/yahoo.c:2605
+#: src/protocols/yahoo/yahoo.c:2277 src/protocols/yahoo/yahoo.c:2602
+#: src/protocols/yahoo/yahoo.c:2707
 msgid "Not At Desk"
 msgstr "デスクに居ません"
 
-#: src/protocols/yahoo/yahoo.c:2177 src/protocols/yahoo/yahoo.c:2502
-#: src/protocols/yahoo/yahoo.c:2606
+#: src/protocols/yahoo/yahoo.c:2279 src/protocols/yahoo/yahoo.c:2604
+#: src/protocols/yahoo/yahoo.c:2708
 msgid "Not In Office"
 msgstr "オフィスに居ません"
 
-#: src/protocols/yahoo/yahoo.c:2181 src/protocols/yahoo/yahoo.c:2506
-#: src/protocols/yahoo/yahoo.c:2608
+#: src/protocols/yahoo/yahoo.c:2283 src/protocols/yahoo/yahoo.c:2608
+#: src/protocols/yahoo/yahoo.c:2710
 msgid "On Vacation"
 msgstr "休暇中"
 
-#: src/protocols/yahoo/yahoo.c:2185 src/protocols/yahoo/yahoo.c:2510
-#: src/protocols/yahoo/yahoo.c:2610
+#: src/protocols/yahoo/yahoo.c:2287 src/protocols/yahoo/yahoo.c:2612
+#: src/protocols/yahoo/yahoo.c:2712
 msgid "Stepped Out"
 msgstr "ちょっとそこまで"
 
-#: src/protocols/yahoo/yahoo.c:2249 src/protocols/yahoo/yahoo.c:2281
+#: src/protocols/yahoo/yahoo.c:2351 src/protocols/yahoo/yahoo.c:2383
 #, fuzzy
 msgid "Not on server list"
 msgstr "リストにいません"
 
-#: src/protocols/yahoo/yahoo.c:2337
+#: src/protocols/yahoo/yahoo.c:2439
 #, fuzzy
 msgid "Join in Chat"
 msgstr "チャットへ加入"
 
-#: src/protocols/yahoo/yahoo.c:2343
+#: src/protocols/yahoo/yahoo.c:2445
 msgid "Initiate Conference"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:2396
+#: src/protocols/yahoo/yahoo.c:2498
 msgid "Active which ID?"
 msgstr "どのIDを有効化しますかID"
 
-#: src/protocols/yahoo/yahoo.c:2404
+#: src/protocols/yahoo/yahoo.c:2506
 #, fuzzy
 msgid "Join who in chat?"
 msgstr "チャットへ加入"
 
-#: src/protocols/yahoo/yahoo.c:2415
+#: src/protocols/yahoo/yahoo.c:2517
 msgid "Activate ID..."
 msgstr "IDの有効化..."
 
-#: src/protocols/yahoo/yahoo.c:2421
+#: src/protocols/yahoo/yahoo.c:2523
 #, fuzzy
 msgid "Join user in chat..."
 msgstr "チャットに加わる ..."
 
-#: src/protocols/yahoo/yahoo.c:2803
+#: src/protocols/yahoo/yahoo.c:2905
 msgid ""
 "<b>Sorry, profiles marked as containing adult content are not supported at "
 "this time.</b><br><br>\n"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:2804 src/protocols/yahoo/yahoo.c:2827
+#: src/protocols/yahoo/yahoo.c:2906 src/protocols/yahoo/yahoo.c:2929
 msgid ""
 "If you wish to view this profile, you will need to visit this link in your "
 "web browser<br>"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:2826
+#: src/protocols/yahoo/yahoo.c:2928
 msgid ""
 "<b>Sorry, non-English profiles are not supported at this time.</b><br><br>\n"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:2874 src/protocols/yahoo/yahoo.c:2875
+#: src/protocols/yahoo/yahoo.c:2976 src/protocols/yahoo/yahoo.c:2977
 msgid "Yahoo! ID"
 msgstr "Yahoo! ID"
 
 # NOTE official translation
-#: src/protocols/yahoo/yahoo.c:2919 src/protocols/yahoo/yahoo.c:2922
-#: src/protocols/yahoo/yahoo.c:2925
+#: src/protocols/yahoo/yahoo.c:3021 src/protocols/yahoo/yahoo.c:3024
+#: src/protocols/yahoo/yahoo.c:3027
 msgid "Hobbies"
 msgstr "趣味"
 
 # NOTE official translation
-#: src/protocols/yahoo/yahoo.c:2934 src/protocols/yahoo/yahoo.c:2937
+#: src/protocols/yahoo/yahoo.c:3036 src/protocols/yahoo/yahoo.c:3039
 msgid "Latest News"
 msgstr "最近の出来事"
 
-#: src/protocols/yahoo/yahoo.c:2951
+#: src/protocols/yahoo/yahoo.c:3053
 msgid "Home Page"
 msgstr "ウェブページ"
 
-#: src/protocols/yahoo/yahoo.c:2963
+#: src/protocols/yahoo/yahoo.c:3065
 msgid "Cool Link 1"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:2967
+#: src/protocols/yahoo/yahoo.c:3069
 msgid "Cool Link 2"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:2969
+#: src/protocols/yahoo/yahoo.c:3071
 msgid "Cool Link 3"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:2975
+#: src/protocols/yahoo/yahoo.c:3077
 msgid "Member Since"
 msgstr "メンバー開始"
 
@@ -7792,83 +8365,128 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/yahoo/yahoo.c:3175 src/protocols/yahoo/yahoo.c:3177
+#. *  description
+#: src/protocols/yahoo/yahoo.c:3283 src/protocols/yahoo/yahoo.c:3285
 msgid "Yahoo Protocol Plugin"
 msgstr "Yahooプロトコルプラグイン"
 
-#: src/protocols/yahoo/yahoo.c:3194
+#: src/protocols/yahoo/yahoo.c:3302
 msgid "Pager host"
 msgstr "ページャホスト"
 
-#: src/protocols/yahoo/yahoo.c:3197
+#: src/protocols/yahoo/yahoo.c:3305
 msgid "Pager port"
 msgstr "ページャポート番号"
 
-#: src/protocols/yahoo/yahoo.c:3200
+#: src/protocols/yahoo/yahoo.c:3308
 #, fuzzy
 msgid "File transfer host"
 msgstr "ファイル転送"
 
-#: src/protocols/yahoo/yahoo.c:3203
+#: src/protocols/yahoo/yahoo.c:3311
 #, fuzzy
 msgid "File transfer port"
 msgstr "ファイル転送が中断されました"
 
-#: src/protocols/yahoo/yahoochat.c:194
+#: src/protocols/yahoo/yahoo.c:3314
+msgid "Chat Room List Url"
+msgstr ""
+
+#: src/protocols/yahoo/yahoo_filexfer.c:200
+msgid ""
+"Gaim cannot send files over Yahoo! that are bigger than One Megabyte "
+"(1,048,576 bytes)."
+msgstr ""
+
+#: src/protocols/yahoo/yahoochat.c:198
 #, c-format
 msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
 msgstr ""
 
-#: src/protocols/yahoo/yahoochat.c:196
+#: src/protocols/yahoo/yahoochat.c:200
 msgid "Invitation Rejected"
 msgstr ""
 
-#: src/protocols/yahoo/yahoochat.c:346
+#: src/protocols/yahoo/yahoochat.c:350
 #, fuzzy
 msgid "Failed to join chat"
 msgstr "チャットに参加できません"
 
-#: src/protocols/yahoo/yahoochat.c:346
+#: src/protocols/yahoo/yahoochat.c:350
 msgid "Maybe the room is full?"
 msgstr ""
 
-#: src/protocols/yahoo/yahoochat.c:558
+#: src/protocols/yahoo/yahoochat.c:426
+#, fuzzy, c-format
+msgid "You are now chatting in %s."
+msgstr "あなたは%sに蹴られました: %s"
+
+#: src/protocols/yahoo/yahoochat.c:580
 #, fuzzy
 msgid "Failed to join buddy in chat"
 msgstr "チャットに参加できません"
 
-#: src/protocols/yahoo/yahoochat.c:559
+#: src/protocols/yahoo/yahoochat.c:581
 msgid "Maybe they're not in a chat?"
 msgstr ""
 
-#: src/protocols/zephyr/zephyr.c:344
+#: src/protocols/yahoo/yahoochat.c:1301
+#, fuzzy
+msgid "Unable to connect"
+msgstr "接続できません"
+
+#: src/protocols/yahoo/yahoochat.c:1301
+msgid "Fetching the room list failed."
+msgstr ""
+
+#: src/protocols/yahoo/yahoochat.c:1346
+#, fuzzy
+msgid "Voices"
+msgstr "音声"
+
+#: src/protocols/yahoo/yahoochat.c:1349
+msgid "Webcams"
+msgstr ""
+
+#: src/protocols/yahoo/yahoochat.c:1360 src/protocols/yahoo/yahoochat.c:1421
+#, fuzzy
+msgid "Unable to fetch room list."
+msgstr "AIM プロフィールをセットできません。"
+
+#: src/protocols/yahoo/yahoochat.c:1414
+#, fuzzy
+msgid "User Rooms"
+msgstr "ユーザオプション"
+
+#: src/protocols/zephyr/zephyr.c:525
 #, c-format
 msgid "<b>User:</b> %s<br>"
 msgstr "<b>ユーザ:</b> %s<br>"
 
-#: src/protocols/zephyr/zephyr.c:346
+#: src/protocols/zephyr/zephyr.c:527
 #, c-format
 msgid "<b>Alias:</b> %s<br>"
 msgstr "<b>エイリアス:</b> %s<br>"
 
-#: src/protocols/zephyr/zephyr.c:348
+#: src/protocols/zephyr/zephyr.c:529
 msgid "<br>Hidden or not logged-in"
 msgstr "<br>隠れているか,ログインしていません"
 
-#: src/protocols/zephyr/zephyr.c:352
+#: src/protocols/zephyr/zephyr.c:533
 #, c-format
 msgid "<br>At %s since %s"
 msgstr "<br> %s に %s から居ます"
 
-#: src/protocols/zephyr/zephyr.c:584 src/protocols/zephyr/zephyr.c:585
+#: src/protocols/zephyr/zephyr.c:793 src/protocols/zephyr/zephyr.c:794
+#: src/protocols/zephyr/zephyr.c:982 src/protocols/zephyr/zephyr.c:983
 msgid "Anyone"
 msgstr "だれでも"
 
-#: src/protocols/zephyr/zephyr.c:609
+#: src/protocols/zephyr/zephyr.c:820
 msgid "Already logged in with Zephyr"
 msgstr "Zephyrにはすでにログインしています"
 
-#: src/protocols/zephyr/zephyr.c:610
+#: src/protocols/zephyr/zephyr.c:821
 msgid ""
 "Because Zephyr uses your system username, you are unable to have multiple "
 "accounts on it when logged in as the same user."
@@ -7876,19 +8494,19 @@
 "Zephyrはあなたのシステムのユーザ名を利用するため,複数のアカウントを持つ事は"
 "同じユーザとしてログインしている場合には無理です."
 
-#: src/protocols/zephyr/zephyr.c:868
+#: src/protocols/zephyr/zephyr.c:1158
 msgid "ZLocate"
 msgstr "ZLocate"
 
-#: src/protocols/zephyr/zephyr.c:908
+#: src/protocols/zephyr/zephyr.c:1198
 msgid "_Class:"
 msgstr "クラス (_C):"
 
-#: src/protocols/zephyr/zephyr.c:913
+#: src/protocols/zephyr/zephyr.c:1203
 msgid "_Instance:"
 msgstr "インスタンス (_I):"
 
-#: src/protocols/zephyr/zephyr.c:918
+#: src/protocols/zephyr/zephyr.c:1208
 msgid "_Recipient:"
 msgstr "受取人 (_R):"
 
@@ -7902,69 +8520,82 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/zephyr/zephyr.c:1049 src/protocols/zephyr/zephyr.c:1051
+#. *  description
+#: src/protocols/zephyr/zephyr.c:1358 src/protocols/zephyr/zephyr.c:1360
 msgid "Zephyr Protocol Plugin"
 msgstr "Zephyrプロトコルプラグイン"
 
+#: src/protocols/zephyr/zephyr.c:1377
+msgid "Export to .anyone"
+msgstr ""
+
+#: src/protocols/zephyr/zephyr.c:1380
+msgid "Export to .zephyr.subs"
+msgstr ""
+
+#: src/protocols/zephyr/zephyr.c:1383
+msgid "Exposure"
+msgstr ""
+
 #. Forbidden
-#: src/proxy.c:1014
+#: src/proxy.c:954
 msgid "Access denied: proxy server forbids port 80 tunnelling."
 msgstr ""
 
-#: src/proxy.c:1016
+#: src/proxy.c:956
 #, fuzzy, c-format
 msgid "Proxy connection error %d"
 msgstr "接続エラー"
 
-#: src/proxy.c:1736
+#: src/proxy.c:1695
 #, fuzzy
 msgid "Invalid proxy settings"
 msgstr "グローバルなプロキシ設定を使う"
 
-#: src/proxy.c:1736
+#: src/proxy.c:1695
 msgid ""
 "Either the host name or port number specified for your given proxy type is "
 "invalid."
 msgstr ""
 
 #. * Custom away message.
-#: src/prpl.h:187
+#: src/prpl.h:189
 msgid "Custom"
 msgstr "カスタム"
 
 #. *
 #. * A wrapper for gaim_request_action() that uses Accept and Cancel buttons.
 #.
-#: src/request.h:1028
+#: src/request.h:1247
 msgid "Accept"
 msgstr "了解"
 
-#: src/server.c:56
+#: src/server.c:58
 msgid "Please enter your password"
 msgstr "パスワードを入力してください"
 
-#: src/server.c:948
+#: src/server.c:960
 #, c-format
 msgid "(%d message)"
 msgid_plural "(%d messages)"
 msgstr[0] "(%d メッセージ)"
 msgstr[1] "(%d メッセージ)"
 
-#: src/server.c:961
+#: src/server.c:974
 msgid "(1 message)"
 msgstr "(1 メッセージ)"
 
-#: src/server.c:1145 src/server.c:1155
+#: src/server.c:1161 src/server.c:1171
 #, c-format
 msgid "%s logged in."
 msgstr "%s はログインしてます"
 
-#: src/server.c:1172 src/server.c:1180
+#: src/server.c:1188 src/server.c:1196
 #, c-format
 msgid "%s logged out."
 msgstr "%s はログアウトしました"
 
-#: src/server.c:1227
+#: src/server.c:1243
 #, c-format
 msgid ""
 "%s has just been warned by %s.\n"
@@ -7973,11 +8604,11 @@
 "%s は %s から警告されました.\n"
 "あなたの新しい警告レベルは %d%% です"
 
-#: src/server.c:1230
+#: src/server.c:1246
 msgid "an anonymous person"
 msgstr "匿名の人"
 
-#: src/server.c:1333
+#: src/server.c:1349
 #, c-format
 msgid ""
 "User '%s' invites %s to buddy chat room: '%s'\n"
@@ -7986,72 +8617,129 @@
 "ユーザ '%s' が %s を仲間チャットルームに招待: '%s'\n"
 "%s"
 
-#: src/server.c:1337
+#: src/server.c:1353
 #, c-format
 msgid "User '%s' invites %s to buddy chat room: '%s'\n"
 msgstr "ユーザ '%s' が %s を仲間チャットルームに招待: '%s'\n"
 
-#: src/server.c:1343
+#: src/server.c:1359
 msgid "Accept chat invitation?"
 msgstr "チャットへの招待を受けますか?"
 
 #. for people like myself who are too lazy to add an away msg :)
 #. I don't know who "myself" is in this context.  The exclamation point
 #. * makes it slightly less boring ;)
-#: src/status.c:35
+#: src/status.c:36
 msgid "Sorry, I ran out for a bit!"
 msgstr "ちょっとしばらくいないです.もうすぐ帰ります"
 
-#: src/stock.c:83
+#: src/stock.c:86
+#, fuzzy
+msgid "_Alias"
+msgstr "エイリアス (_A):"
+
+#: src/stock.c:88
 msgid "_Modify"
 msgstr "変更 (_M)"
 
-#: src/stock.c:84
+#: src/stock.c:89
 msgid "_Open Mail"
 msgstr "メールを開く (_O)"
 
-#: src/util.c:1893
+#: src/stock.c:91
+msgid "_Warn"
+msgstr "警告 (_W)"
+
+#: src/util.c:1884
 msgid "Calculating..."
 msgstr "計算中..."
 
-#: src/util.c:1896
+#: src/util.c:1887
 msgid "Unknown."
 msgstr "不明."
 
-#: src/util.c:1927 src/util.c:1932 src/util.c:1937 src/util.c:1940
+#: src/util.c:1918 src/util.c:1923 src/util.c:1928 src/util.c:1931
 msgid "day"
 msgid_plural "days"
 msgstr[0] "日"
 msgstr[1] "日"
 
-#: src/util.c:1928 src/util.c:1932 src/util.c:1946 src/util.c:1948
+#: src/util.c:1919 src/util.c:1923 src/util.c:1937 src/util.c:1939
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "時間"
 msgstr[1] "時間"
 
-#: src/util.c:1928 src/util.c:1937 src/util.c:1946 src/util.c:1951
+#: src/util.c:1919 src/util.c:1928 src/util.c:1937 src/util.c:1942
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "分"
 msgstr[1] "分"
 
-#: src/util.c:2283
+#: src/util.c:2274
 msgid "g003: Error opening connection.\n"
 msgstr "g003: 接続開始エラー\n"
 
-#: src/win32/win32dep.c:271
+#: src/win32/win32dep.c:272
 msgid "Moving Gaim Settings.."
 msgstr ""
 
-#: src/win32/win32dep.c:274
+#: src/win32/win32dep.c:275
 msgid "Moving Gaim user settings to: "
 msgstr ""
 
-#: src/win32/win32dep.c:276
+#: src/win32/win32dep.c:277
 msgid "Notification"
 msgstr "通知"
 
+#~ msgid "_Screenname:"
+#~ msgstr "スクリーン名 (_S):"
+
+#~ msgid "_Get Info"
+#~ msgstr "情報取得 (_G)"
+
+#~ msgid "_IM"
+#~ msgstr "_IM"
+
+#~ msgid "Normal font size"
+#~ msgstr "フォントサイズを通常サイズに"
+
+#~ msgid "Browser Options"
+#~ msgstr "ブラウザオプション"
+
+#~ msgid "Open new _window by default"
+#~ msgstr "デフォルトで新しいウィンドウを開く (_W)"
+
+#, fuzzy
+#~ msgid "Bad Protocol"
+#~ msgstr "プロトコル:"
+
+#, fuzzy
+#~ msgid "Invalid Realm"
+#~ msgstr "無効なユーザ名"
+
+#, fuzzy
+#~ msgid "Unknown error occurred changing password"
+#~ msgstr "パスワードを変更できません。"
+
+#~ msgid "Unable to join chat"
+#~ msgstr "チャットに参加できません"
+
+#, fuzzy
+#~ msgid "Could not send %s to %s, protocol not supported."
+#~ msgstr "サポートされていない国です"
+
+#~ msgid "Internal server error"
+#~ msgstr "サーバ内部エラー"
+
+#, fuzzy
+#~ msgid "Unable to read from MSN Nexus server."
+#~ msgstr "サーバからヘッダが読み込めません"
+
+#, fuzzy
+#~ msgid "Unable to connect to passport server"
+#~ msgstr "サーバへ接続できません"
+
 #~ msgid "Gnome Stock Ticker Properties"
 #~ msgstr "GNOME ストックティッカーのプロパティ"
 
@@ -8095,9 +8783,6 @@
 #~ msgid "Alias chat"
 #~ msgstr "エイリアス"
 
-#~ msgid "_Screenname"
-#~ msgstr "スクリーン名 (_S)"
-
 #, fuzzy
 #~ msgid "Alias buddy"
 #~ msgstr "仲間のエイリアス"
@@ -8270,9 +8955,6 @@
 #~ msgid "%s (%s) reported that %s returned from idle @ %s"
 #~ msgstr "%s (%s) の報告によると %s がアイドル状態からもどってきました @ %s"
 
-#~ msgid "First name"
-#~ msgstr "姓"
-
 #~ msgid "Disconnected"
 #~ msgstr "切断されました"
 
@@ -8322,9 +9004,6 @@
 #~ msgid "DCC Chat with %s established"
 #~ msgstr "%s との DCC チャットが始まりました"
 
-#~ msgid "User"
-#~ msgstr "ユーザ"
-
 #~ msgid "IRC Operator"
 #~ msgstr "IRC オペレータ"
 
@@ -8517,9 +9196,6 @@
 #~ msgid "First Name:"
 #~ msgstr "名:"
 
-#~ msgid "Last Name:"
-#~ msgstr "姓:"
-
 #~ msgid "Gender:"
 #~ msgstr "性別:"
 
@@ -8566,9 +9242,6 @@
 #~ msgid "There was an error launching your chosen browser: %s"
 #~ msgstr "選択したブラウザを起動するときにエラーが起きました: %s"
 
-#~ msgid "Alias"
-#~ msgstr "エイリアス"
-
 #~ msgid "Group"
 #~ msgstr "グループ"
 
@@ -8605,9 +9278,6 @@
 #~ msgid "Find Buddy By Info"
 #~ msgstr "情報から仲間を探す"
 
-#~ msgid "_Alias:"
-#~ msgstr "エイリアス (_A):"
-
 #~ msgid "Couldn't open log file %s"
 #~ msgstr "ログファイル%sを開けません"
 
@@ -8640,9 +9310,6 @@
 #~ msgid "Preferences..."
 #~ msgstr "設定..."
 
-#~ msgid "Rename Buddy"
-#~ msgstr "仲間の改名"
-
 #~ msgid "Unable to Save Preferences"
 #~ msgstr "設定を保存できません"
 
@@ -8759,9 +9426,6 @@
 #~ msgid "Gaim Instant Messenger - Away"
 #~ msgstr "Gaim インスタントメッセンジャー - 離席"
 
-#~ msgid "New"
-#~ msgstr "新規"
-
 #~ msgid "I'm Back"
 #~ msgstr "帰って来ました!"