changeset 8023:c0d52c2a2a32

[gaim-migrate @ 8703] updated committer: Tailor Script <tailor@pidgin.im>
author Luke Schierer <lschiere@pidgin.im>
date Tue, 06 Jan 2004 14:57:40 +0000
parents 560f3694f760
children a8f84ec90b0d
files po/ja.po
diffstat 1 files changed, 2471 insertions(+), 2013 deletions(-) [+]
line wrap: on
line diff
--- a/po/ja.po	Tue Jan 06 08:07:39 2004 +0000
+++ b/po/ja.po	Tue Jan 06 14:57:40 2004 +0000
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Gaim 0.75\n"
-"POT-Creation-Date: 2003-10-09 15:23-0700\n"
+"POT-Creation-Date: 2004-01-06 00:00-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 +24,14 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/autorecon.c:105
+#: plugins/autorecon.c:104
 msgid "Auto-Reconnect"
 msgstr "自動再接続"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/autorecon.c:108 plugins/autorecon.c:110
+#: plugins/autorecon.c:107 plugins/autorecon.c:109
 msgid "When you are kicked offline, this reconnects you."
 msgstr "オフラインにされたときに再接続する。"
 
@@ -52,6 +52,69 @@
 msgid "Check email every X seconds.\n"
 msgstr "X 秒毎にメールをチェックする.\n"
 
+#: plugins/contact_priority.c:82
+msgid "Point values to use when..."
+msgstr ""
+
+#: plugins/contact_priority.c:91
+#, fuzzy
+msgid "Buddy is offline:"
+msgstr "仲間アイコンファイル:"
+
+#: plugins/contact_priority.c:105
+#, fuzzy
+msgid "Buddy is away:"
+msgstr "仲間の表示"
+
+#: plugins/contact_priority.c:119
+#, fuzzy
+msgid "Buddy is idle:"
+msgstr "仲間アイコンファイル:"
+
+#: plugins/contact_priority.c:133
+msgid "Use last matching buddy"
+msgstr ""
+
+#. Explanation
+#: plugins/contact_priority.c:139
+msgid ""
+"The buddy with the lowest score is the buddy who will have priority in the "
+"contact.\n"
+"The default values (offline = 4,away = 2, and idle = 1)\n"
+"will use what used to be the built-in order active->idle->away->away+idle-"
+">offline."
+msgstr ""
+
+#: plugins/contact_priority.c:142
+msgid "Point values to use for Account..."
+msgstr ""
+
+#. *< api_version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: plugins/contact_priority.c:191
+msgid "Contact Priority"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *< summary
+#: plugins/contact_priority.c:194
+msgid ""
+"Allows for controlling the values associated with different buddy states."
+msgstr ""
+
+#. *< description
+#: plugins/contact_priority.c:196
+msgid ""
+"Allows for changing the point values of idle/away/offline states for buddies "
+"in contact priority computations."
+msgstr ""
+
 #.
 #. *  DEFINES, MACROS & DATA TYPES
 #.
@@ -67,7 +130,7 @@
 msgid "Gaim - Away"
 msgstr "Gaim - 離席"
 
-#: plugins/docklet/docklet.c:114 src/gtkaccount.c:482 src/gtkaccount.c:1765
+#: plugins/docklet/docklet.c:114 src/gtkaccount.c:480 src/gtkaccount.c:1759
 msgid "Auto-login"
 msgstr "自動ログイン"
 
@@ -83,12 +146,12 @@
 msgid "New..."
 msgstr "新規..."
 
-#: plugins/docklet/docklet.c:153 src/gtkblist.c:1916 src/gtkpounce.c:461
-#: src/gtkprefs.c:1473 src/protocols/gg/gg.c:51 src/protocols/irc/msgs.c:187
-#: src/protocols/jabber/jabber.c:868 src/protocols/jabber/jutil.c:97
-#: src/protocols/jabber/presence.c:81 src/protocols/oscar/oscar.c:2833
-#: src/protocols/oscar/oscar.c:4529 src/protocols/oscar/oscar.c:5464
-#: src/protocols/oscar/oscar.c:6064
+#: 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
 msgid "Away"
 msgstr "離席"
 
@@ -100,16 +163,16 @@
 msgid "Mute Sounds"
 msgstr "消音"
 
-#: plugins/docklet/docklet.c:172 src/gtkft.c:559
+#: plugins/docklet/docklet.c:172 src/gtkft.c:581
 msgid "File Transfers"
 msgstr "ファイル転送"
 
 #. And now for the buttons
-#: plugins/docklet/docklet.c:173 src/gtkaccount.c:1924 src/main.c:323
+#: plugins/docklet/docklet.c:173 src/gtkaccount.c:1918 src/main.c:324
 msgid "Accounts"
 msgstr "アカウント"
 
-#: plugins/docklet/docklet.c:174 src/gtkprefs.c:2337 src/main.c:333
+#: plugins/docklet/docklet.c:174 src/gtkprefs.c:2323 src/main.c:330
 msgid "Preferences"
 msgstr "設定"
 
@@ -168,14 +231,14 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/filectl.c:201
+#: plugins/filectl.c:223
 msgid "Gaim File Control"
 msgstr "Gaim ファイル制御"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/filectl.c:204 plugins/filectl.c:206
+#: plugins/filectl.c:226 plugins/filectl.c:228
 msgid "Allows you to control Gaim by entering commands in a file."
 msgstr "ファイルにコマンドをいれることによりGaimを制御することができます"
 
@@ -202,7 +265,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/gaim-remote/remote.c:714
+#: plugins/gaim-remote/remote.c:715
 #, fuzzy
 msgid "Remote Control"
 msgstr "Gaim ファイル制御"
@@ -210,12 +273,12 @@
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/gaim-remote/remote.c:717
+#: plugins/gaim-remote/remote.c:718
 msgid "Provides remote control for gaim applications."
 msgstr ""
 
 #. *  description
-#: plugins/gaim-remote/remote.c:719
+#: plugins/gaim-remote/remote.c:720
 msgid ""
 "Gives Gaim the ability to be remote-controlled through third-party "
 "applications or through the gaim-remote tool."
@@ -228,19 +291,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/gaiminc.c:81
+#: plugins/gaiminc.c:87
 msgid "Gaim Demonstration Plugin"
 msgstr "Gaimデモプラグイン"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/gaiminc.c:84
+#: plugins/gaiminc.c:90
 msgid "An example plugin that does stuff - see the description."
 msgstr "何かをする例としてのプラグイン,説明をみてください"
 
 #. *  description
-#: plugins/gaiminc.c:86
+#: plugins/gaiminc.c:92
 msgid ""
 "This is a really cool plugin that does a lot of stuff:\n"
 "- It tells you who wrote the program when you log in\n"
@@ -305,49 +368,19 @@
 "上にドラッグして左にいくことで,前の会話に移動\n"
 "上にドラッグして右にいくことで,次の会話に移動します."
 
-#: plugins/gtik.c:719
-msgid "Gnome Stock Ticker Properties"
-msgstr "GNOME ストックティッカーのプロパティ"
-
-#: plugins/gtik.c:731
-msgid "Update Frequency in min"
-msgstr "更新頻度(分)"
-
-#: plugins/gtik.c:747
-msgid "Enter symbols delimited with \"+\" in the box below."
-msgstr "シンボルを \"+\" で区切って下のボックスに入力してください。"
-
-#. OUTPUT FORMAT and SCROLL DIRECTION
-#: plugins/gtik.c:757
-msgid "Check this box to display only symbols and price:"
-msgstr "シンボルと価格のみを表示するときにチェック:"
-
-#: plugins/gtik.c:758
-msgid "Check this box to scroll left to right:"
-msgstr "左から右へスクロールさせるときにチェック:"
-
-# NOTE Please read the source for this. "No change" is one phrase.
-#: plugins/gtik.c:994
-msgid "(No"
-msgstr ""
-
-# NOTE Please read the source for this. "No change" is one phrase.
-#: plugins/gtik.c:995
-msgid "Change"
-msgstr ""
-
-#: plugins/history.c:98
+#: plugins/history.c:74
 msgid "History"
 msgstr "ヒストリ"
 
-#: plugins/history.c:100
+#: plugins/history.c:76
 msgid "Shows recently logged conversations in new conversations."
 msgstr "新しい会話のときにログに残っている最近の会話を表示する "
 
-#: plugins/history.c:101
-msgid ""
-"When a new conversation is opened this plugin will insert the last XXX of "
-"the last conversation into the current conversation."
+#: plugins/history.c:77
+#, fuzzy
+msgid ""
+"When a new conversation is opened this plugin will insert the last "
+"conversation into the current conversation."
 msgstr ""
 "あたらしい会話が開始されたらプラグインは前回の会話の最後のXXX行を現在の会話に"
 "追加します"
@@ -383,7 +416,7 @@
 msgid "idle for"
 msgstr "アイドル時間"
 
-#: plugins/idle.c:90 plugins/timestamp.c:88
+#: plugins/idle.c:90 plugins/timestamp.c:109
 msgid "minutes."
 msgstr "分."
 
@@ -578,6 +611,29 @@
 "送信できます。 エンターキーを入力ボックスで押すと送信できます。デバッグウィン"
 "ドウを見てください。"
 
+#: plugins/relnot.c:62
+#, c-format
+msgid "You are using Gaim version %s.  The current version is %s.<hr>"
+msgstr ""
+
+#: plugins/relnot.c:68
+#, c-format
+msgid ""
+"<b>ChangeLog:</b>\n"
+"%s<br><br>"
+msgstr ""
+
+#: plugins/relnot.c:73
+#, c-format
+msgid ""
+"You can get version %s from:<br><a href=\"http://gaim.sourceforge.net/"
+"\">http://gaim.sourceforge.net</a>."
+msgstr ""
+
+#: plugins/relnot.c:77 plugins/relnot.c:78
+msgid "New Version Available"
+msgstr ""
+
 #. *< api_version
 #. *< type
 #. *< ui_requirement
@@ -585,14 +641,40 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/signals-test.c:502
+#: plugins/relnot.c:134
+#, fuzzy
+msgid "Release Notification"
+msgstr "メッセージ通知"
+
+#. *< name
+#. *< version
+#. *  summary
+#: plugins/relnot.c:137
+msgid "Checks periodically for new releases."
+msgstr ""
+
+#. *  description
+#: plugins/relnot.c:139
+msgid ""
+"Checks periodically for new releases and notifies the user with the "
+"ChangeLog."
+msgstr ""
+
+#. *< api_version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: plugins/signals-test.c:465
 msgid "Signals Test"
 msgstr ""
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/signals-test.c:505 plugins/signals-test.c:507
+#: plugins/signals-test.c:468 plugins/signals-test.c:470
 #, fuzzy
 msgid "Test to see that all signals are working properly."
 msgstr "全部のイベントが正常にうごいているかどうかのテスト"
@@ -654,14 +736,14 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/ssl/ssl-gnutls.c:190
+#: plugins/ssl/ssl-gnutls.c:218
 msgid "GNUTLS"
 msgstr "GNUTLS"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/ssl/ssl-gnutls.c:193 plugins/ssl/ssl-gnutls.c:195
+#: plugins/ssl/ssl-gnutls.c:221 plugins/ssl/ssl-gnutls.c:223
 msgid "Provides SSL support through GNUTLS."
 msgstr ""
 
@@ -672,14 +754,14 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/ssl/ssl-nss.c:287
+#: plugins/ssl/ssl-nss.c:306
 msgid "NSS"
 msgstr "NSS"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/ssl/ssl-nss.c:290 plugins/ssl/ssl-nss.c:292
+#: plugins/ssl/ssl-nss.c:309 plugins/ssl/ssl-nss.c:311
 msgid "Provides SSL support through Mozilla NSS."
 msgstr ""
 
@@ -701,7 +783,7 @@
 msgid "Provides a wrapper around SSL support libraries."
 msgstr ""
 
-#: plugins/statenotify.c:30 src/gtkpounce.c:843
+#: plugins/statenotify.c:30 src/gtkpounce.c:799
 #, c-format
 msgid "%s has gone away."
 msgstr "%s は離席しました"
@@ -743,11 +825,11 @@
 "相手がアイドル状態になったりもどってきたりしたときに会話ウィンドウに通知しま"
 "す"
 
-#: plugins/tcl/tcl.c:344
+#: plugins/tcl/tcl.c:348
 msgid "Tcl Plugin Loader"
 msgstr "Tcl プラグインローダ"
 
-#: plugins/tcl/tcl.c:346 plugins/tcl/tcl.c:347
+#: plugins/tcl/tcl.c:350 plugins/tcl/tcl.c:351
 msgid "Provides support for loading Tcl plugins"
 msgstr "Tcl プラグインをロードするためのサポートを提供します"
 
@@ -769,15 +851,15 @@
 msgid "A horizontal scrolling version of the buddy list."
 msgstr "水平スクロールするバージョンの仲間リスト"
 
-#: plugins/timestamp.c:74
+#: plugins/timestamp.c:95
 msgid "iChat Timestamp"
 msgstr "iChat タイムスタンプ"
 
-#: plugins/timestamp.c:81
+#: plugins/timestamp.c:102
 msgid "Delay"
 msgstr "遅延"
 
-#: plugins/timestamp.c:94
+#: plugins/timestamp.c:115
 msgid "_Apply"
 msgstr "適用 (_A)"
 
@@ -788,14 +870,14 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/timestamp.c:150
+#: plugins/timestamp.c:173
 msgid "Timestamp"
 msgstr "タイムスタンプ"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/timestamp.c:153 plugins/timestamp.c:155
+#: plugins/timestamp.c:176 plugins/timestamp.c:178
 msgid "Adds iChat-style timestamps to conversations every N minutes."
 msgstr "iChat スタイルのタイムスタンプを N 分おきに付ける。"
 
@@ -819,7 +901,7 @@
 msgstr "ウィンドウでスライダバーを表示する (_S)"
 
 #. Buddy List trans options
-#: plugins/win32/transparency/win2ktrans.c:365 src/gtkprefs.c:845
+#: plugins/win32/transparency/win2ktrans.c:365 src/gtkprefs.c:837
 msgid "Buddy List Window"
 msgstr "仲間リストウィンドウ"
 
@@ -866,8 +948,8 @@
 msgstr "Gaim を Windows の起動時に開始する (_S)"
 
 #. Buddy List
-#: plugins/win32/winprefs/winprefs.c:366 src/gtkblist.c:1756
-#: src/gtkprefs.c:2270
+#: plugins/win32/winprefs/winprefs.c:366 src/gtkblist.c:2386
+#: src/gtkprefs.c:2256
 msgid "Buddy List"
 msgstr "仲間リスト"
 
@@ -888,8 +970,8 @@
 msgstr "友達リストウィンドウを常に上に(_K)"
 
 #. Conversations
-#: plugins/win32/winprefs/winprefs.c:386 src/gtkprefs.c:894
-#: src/gtkprefs.c:2271
+#: plugins/win32/winprefs/winprefs.c:386 src/gtkprefs.c:875
+#: src/gtkprefs.c:2257
 msgid "Conversations"
 msgstr "会話"
 
@@ -906,11 +988,15 @@
 msgstr "Windows Gaim 特有のオプション"
 
 #: src/about.c:57
-#, c-format
-msgid "About Gaim v%s"
-msgstr "Gaim v%s について"
-
-#: src/about.c:89
+msgid "About Gaim"
+msgstr "Gaimについて"
+
+#: src/about.c:72
+#, 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
 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 "
@@ -920,219 +1006,228 @@
 "ICQ、Yahoo!、MSN、IRC、Jabber、Napster、Zephyr、そして GaduGaduを同時にサポー"
 "トしています。Gtk+ で開発され、GPL ライセンスで配布されています。"
 
-#: src/about.c:99
+#: src/about.c:102
 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:104
+#: src/about.c:107
 msgid "Active Developers"
 msgstr "活発な開発者"
 
-#: src/about.c:105
+#: src/about.c:108
 msgid "maintainer"
 msgstr "メンテナ"
 
-#: src/about.c:107
-msgid "lead developer"
-msgstr ""
-
 #: src/about.c:110
+msgid "lead developer"
+msgstr ""
+
+#: src/about.c:113
 msgid "developer & webmaster"
 msgstr ""
 
-#: src/about.c:111
+#: src/about.c:114
 msgid "win32 port"
 msgstr "Win32 への移植"
 
-#: src/about.c:114 src/about.c:115 src/about.c:116
+#: src/about.c:117 src/about.c:118 src/about.c:119
 msgid "developer"
 msgstr "開発者"
 
-#: src/about.c:117
-#, fuzzy
+#: src/about.c:120
 msgid "support"
-msgstr "認証ポート:"
-
-#: src/about.c:124
+msgstr ""
+
+#: src/about.c:127
 msgid "Crazy Patch Writers"
 msgstr "クレイジーなパッチ作者"
 
-#: src/about.c:144
+#: src/about.c:141
 msgid "Retired Developers"
 msgstr "引退した開発者"
 
-#: src/about.c:145
+#: src/about.c:142
 msgid "former libfaim maintainer"
 msgstr ""
 
+#: src/about.c:143
+msgid "former lead developer"
+msgstr ""
+
 #: src/about.c:146
-msgid "former lead developer"
-msgstr ""
-
-#: src/about.c:149
 msgid "former maintainer"
 msgstr ""
 
-#: src/about.c:150
+#: src/about.c:147
 msgid "former Jabber developer"
 msgstr ""
 
+#: src/about.c:148
+msgid "original author"
+msgstr ""
+
 #: src/about.c:151
-#, fuzzy
-msgid "original author"
-msgstr "オリジナルパスワード"
-
-#: src/about.c:154
 msgid "hacker and designated driver [lazy bum]"
 msgstr ""
 
+#: src/about.c:159
+msgid "Current Translators"
+msgstr ""
+
+#: src/about.c:160 src/about.c:193
+msgid "Catalan"
+msgstr "カタロニア語"
+
+#: src/about.c:161 src/about.c:194
+msgid "Czech"
+msgstr "チェコ語"
+
 #: src/about.c:162
-msgid "Current Translators"
-msgstr ""
-
-#: src/about.c:163 src/about.c:192
-msgid "Catalan"
-msgstr ""
-
-#: src/about.c:164 src/about.c:193
-msgid "Czech"
-msgstr ""
-
-#: src/about.c:165
 msgid "Danish"
-msgstr ""
-
-#: src/about.c:166 src/about.c:194
+msgstr "デンマーク語"
+
+#: src/about.c:163
+msgid "British English"
+msgstr "イギリス英語"
+
+#: src/about.c:164 src/about.c:195
 msgid "German"
 msgstr "ドイツ語"
 
-#: src/about.c:167 src/about.c:195
+#: src/about.c:165 src/about.c:196
 msgid "Spanish"
-msgstr ""
-
-#: src/about.c:168 src/about.c:196
+msgstr "スペイン語"
+
+#: src/about.c:166 src/about.c:197
+msgid "Finnish"
+msgstr "フィンランド語"
+
+#: src/about.c:167 src/about.c:198
 msgid "French"
 msgstr "フランス語"
 
+#: src/about.c:168
+msgid "Hindi"
+msgstr "ヒンディー語"
+
 #: src/about.c:169
-msgid "Hindi"
-msgstr ""
-
-#: src/about.c:170
 msgid "Hungarian"
-msgstr ""
-
-#: src/about.c:171 src/about.c:198
+msgstr "ハンガリー語"
+
+#: src/about.c:170 src/about.c:200
 msgid "Italian"
-msgstr ""
-
-#: src/about.c:172 src/about.c:200
+msgstr "イタリア語"
+
+#: src/about.c:171 src/about.c:202
 msgid "Korean"
-msgstr ""
+msgstr "韓国語"
+
+#: src/about.c:172
+msgid "Dutch; Flemish"
+msgstr "オランダ語"
 
 #: src/about.c:173
-msgid "Dutch; Flemish"
-msgstr ""
-
-#: src/about.c:174 src/about.c:202
+msgid "Norwegian"
+msgstr "ノルウェー語"
+
+#: src/about.c:174 src/about.c:203
 msgid "Polish"
-msgstr ""
+msgstr "ポーランド語"
 
 #: src/about.c:175
-msgid "Portuguese-Brazil"
-msgstr ""
+msgid "Portuguese"
+msgstr "ポルトガル語"
 
 #: src/about.c:176
-msgid "Portuguese-Portugal"
+msgid "Portuguese-Brazil"
 msgstr ""
 
 #: src/about.c:177
 msgid "Romanian"
-msgstr ""
-
-#: src/about.c:178 src/about.c:203
+msgstr "ルーマニア語"
+
+#: src/about.c:178 src/about.c:204
 msgid "Russian"
-msgstr ""
+msgstr "ロシア語"
 
 #: src/about.c:179
 msgid "Serbian"
-msgstr ""
-
-#: src/about.c:180 src/about.c:205
+msgstr "セルビア語"
+
+#: src/about.c:180 src/about.c:206
 msgid "Swedish"
-msgstr ""
+msgstr "スウェーデン語"
 
 #: src/about.c:181
-msgid "Simplified Chinese"
+msgid "Vietnamese"
+msgstr "ベトナム語"
+
+#: src/about.c:181
+msgid "Gnome Vi Team"
 msgstr ""
 
 #: src/about.c:182
+msgid "Simplified Chinese"
+msgstr "中国語(簡体字)"
+
+#: src/about.c:183
 msgid "Traditional Chinese"
-msgstr ""
-
-#: src/about.c:189
-msgid "Past Translators"
-msgstr ""
+msgstr "中国語(繁体字)"
 
 #: src/about.c:190
-msgid "Amharic"
+msgid "Past Translators"
 msgstr ""
 
 #: src/about.c:191
+msgid "Amharic"
+msgstr ""
+
+#: src/about.c:192
 msgid "Bulgarian"
-msgstr ""
-
-#: src/about.c:197
-msgid "Hebrew"
-msgstr ""
+msgstr "ブルガリア語"
 
 #: src/about.c:199
+msgid "Hebrew"
+msgstr "ヘブライ語"
+
+#: src/about.c:201
 msgid "Japanese"
 msgstr "日本語"
 
-#: src/about.c:201
-msgid "Norwegian"
-msgstr ""
-
-#: src/about.c:204
+#: src/about.c:205
 msgid "Slovak"
-msgstr ""
-
-#: src/about.c:206
+msgstr "スロバキア語"
+
+#: src/about.c:207
 msgid "Chinese"
 msgstr "中国語"
 
-#: src/about.c:219 src/dialogs.c:2290 src/gtkrequest.c:205
-#: src/protocols/msn/msn.c:247
-msgid "Close"
-msgstr "閉じる"
-
-#: src/account.c:265 src/protocols/jabber/jabber.c:918
+#: src/account.c:272 src/protocols/jabber/jabber.c:1017
 msgid "New passwords do not match."
 msgstr "新しいパスワードはマッチしません"
 
-#: src/account.c:273
+#: src/account.c:280
 msgid "Fill out all fields completely."
 msgstr "全てを入力してください"
 
-#: src/account.c:298
+#: src/account.c:305
 msgid "Original password"
 msgstr "オリジナルパスワード"
 
-#: src/account.c:304
+#: src/account.c:311
 msgid "New password"
 msgstr "新しいパスワード"
 
-#: src/account.c:310
+#: src/account.c:317
 msgid "New password (again)"
 msgstr "新しいパスワード(再入力)"
 
-#: src/account.c:315
+#: src/account.c:322
 #, c-format
 msgid "Change password for %s"
 msgstr "%s のパスワードを変更"
 
-#: src/account.c:321
+#: src/account.c:330
 #, fuzzy
 msgid "Please enter your current password and your new password."
 msgstr ""
@@ -1142,54 +1237,54 @@
 #. *
 #. * A wrapper for gaim_request_action() that uses OK and Cancel buttons.
 #.
-#: src/account.c:324 src/connection.c:193 src/dialogs.c:1812
-#: src/dialogs.c:1855 src/dialogs.c:1986 src/gtkblist.c:1138
-#: src/gtkrequest.c:202 src/protocols/jabber/jabber.c:963
-#: 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:2448 src/protocols/oscar/oscar.c:2528
-#: src/protocols/oscar/oscar.c:6114 src/protocols/oscar/oscar.c:6210
-#: src/protocols/oscar/oscar.c:6259 src/protocols/oscar/oscar.c:6339
-#: src/protocols/yahoo/yahoo.c:2232 src/request.h:852
+#: 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
 msgid "OK"
 msgstr "了解"
 
-#. Cancel button.
-#: src/account.c:325 src/account.c:359 src/buddy_chat.c:375
-#: src/connection.c:194 src/dialogs.c:466 src/dialogs.c:478 src/dialogs.c:491
-#: src/dialogs.c:512 src/dialogs.c:897 src/dialogs.c:1646 src/dialogs.c:1813
-#: src/dialogs.c:1856 src/dialogs.c:1993 src/gtkaccount.c:1619
-#: src/gtkaccount.c:2087 src/gtkblist.c:1139 src/gtkblist.c:3038
-#: src/gtkconn.c:147 src/gtkprivacy.c:568 src/gtkprivacy.c:581
-#: src/gtkprivacy.c:606 src/gtkprivacy.c:617 src/gtkrequest.c:203
-#: src/protocols/icq/gaim_icq.c:277 src/protocols/jabber/buddy.c:520
-#: src/protocols/jabber/jabber.c:613 src/protocols/jabber/jabber.c:964
+#: 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:2412
-#: src/protocols/oscar/oscar.c:2449 src/protocols/oscar/oscar.c:2484
-#: src/protocols/oscar/oscar.c:2529 src/protocols/oscar/oscar.c:5942
-#: src/protocols/oscar/oscar.c:6115 src/protocols/oscar/oscar.c:6211
-#: src/protocols/oscar/oscar.c:6260 src/protocols/oscar/oscar.c:6325
-#: src/protocols/oscar/oscar.c:6340 src/protocols/trepia/trepia.c:338
-#: src/protocols/yahoo/yahoo.c:2233 src/request.h:852 src/request.h:862
+#: 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
 msgid "Cancel"
 msgstr "取消"
 
-#: src/account.c:351
+#: src/account.c:360
 #, fuzzy, c-format
 msgid "Change user information for %s"
 msgstr "ユーザの情報を取得する"
 
-#: src/account.c:358 src/dialogs.c:893 src/dialogs.c:1634 src/dialogs.c:2299
-#: src/gtkrequest.c:209 src/protocols/jabber/buddy.c:519
-#: src/protocols/trepia/trepia.c:337
+#: src/account.c:367 src/dialogs.c:1310 src/gtkrequest.c:197
+#: src/protocols/jabber/buddy.c:511 src/protocols/trepia/trepia.c:346
 msgid "Save"
 msgstr "保存"
 
 #: src/away.c:208
-msgid "Gaim - Away!"
-msgstr "Gaim - 離席!"
+msgid "Away!"
+msgstr "離席!"
 
 #: src/away.c:269
 msgid "I'm Back!"
@@ -1207,16 +1302,16 @@
 msgid "Set All Away"
 msgstr "全部離席する"
 
-#: src/blist.c:548 src/gtkprefs.c:2273
+#: src/blist.c:576 src/gtkprefs.c:2259
 msgid "Chats"
 msgstr "チャット"
 
-#: src/blist.c:643 src/blist.c:816 src/blist.c:2018 src/gtkblist.c:2528
-#: src/protocols/jabber/roster.c:66 src/protocols/msn/notification.c:1146
+#: 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:1103
+#: src/blist.c:1158
 #, c-format
 msgid ""
 "%d buddy from group %s was not removed because its account was not logged "
@@ -1231,53 +1326,58 @@
 "%d の仲間が %s から削除できませんでした.そのアカウントはログインしていません"
 "でした.その仲間とグループは削除していません.\n"
 
-#: src/blist.c:1112
+#: src/blist.c:1167
 msgid "Group not removed"
 msgstr "グループが削除されません"
 
-#: src/blist.c:1163 src/gtkaccount.c:159 src/gtkpounce.c:307
-#: src/gtkutils.c:839 src/protocols/jabber/auth.c:97
-#: src/protocols/jabber/buddy.c:571
+#: src/blist.c:1217 src/gtkaccount.c:158 src/gtkutils.c:850
+#: src/protocols/jabber/auth.c:135 src/protocols/jabber/buddy.c:568
 msgid "Unknown"
 msgstr "不明"
 
-#: src/blist.c:1491
+#: src/blist.c:1544
 msgid "Invalid Groupname"
 msgstr "無効なグループ名"
 
-#: src/blist.c:2135
+#: src/blist.c:2194
 msgid ""
 "An error was encountered parsing your buddy list.  It has not been loaded."
 msgstr ""
 "あなたの仲間リストを解析しているときにエラーが起きました.内容を読み込んでい"
 "ません."
 
-#: src/blist.c:2137
+#: src/blist.c:2196
 msgid "Buddy List Error"
 msgstr "仲間リストエラー"
 
-#: src/buddy_chat.c:316 src/gtkblist.c:2931
+#: 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:330
-msgid "Join Chat"
+#: src/buddy_chat.c:223
+#, fuzzy
+msgid "Join a Chat"
 msgstr "チャットへ加入"
 
-#: src/buddy_chat.c:336
-msgid "Buddy Chat"
-msgstr "仲間チャット"
-
-#: src/buddy_chat.c:346
-msgid "Join Chat As:"
-msgstr "名前を指定してチャットに加入"
-
-#. Join button.
-#: src/buddy_chat.c:369
-msgid "Join"
-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
 #, fuzzy, c-format
@@ -1288,7 +1388,7 @@
 msgid "Registration Error"
 msgstr "登録エラー"
 
-#: src/connection.c:170 src/gtkconn.c:278
+#: src/connection.c:170
 msgid "Connection Error"
 msgstr "接続エラー"
 
@@ -1297,74 +1397,74 @@
 msgid "Enter password for %s"
 msgstr "パスワード入力"
 
-#: src/conversation.c:324
+#: src/conversation.c:297
 msgid "Unable to send message. The message is too large."
 msgstr "メッセージを送れません。このメッセージは大きすぎます."
 
-#: src/conversation.c:332
+#: src/conversation.c:305
 msgid "Unable to send message."
 msgstr "メッセージを送れません."
 
-#: src/conversation.c:1888
+#: src/conversation.c:1898
 #, c-format
 msgid "%s entered the room."
 msgstr "%sは部屋に入りました"
 
-#: src/conversation.c:1891
+#: src/conversation.c:1901
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>] は部屋に入りました"
 
-#: src/conversation.c:1976
+#: src/conversation.c:1986
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%sは%sとして知られています"
 
-#: src/conversation.c:2018
+#: src/conversation.c:2028
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%sは部屋(%s)を去りました"
 
-#: src/conversation.c:2020
+#: src/conversation.c:2030
 #, c-format
 msgid "%s left the room."
 msgstr "%sは部屋を去りました"
 
-#: src/conversation.c:2093
+#: src/conversation.c:2103
 #, fuzzy, c-format
 msgid "(+%d more)"
 msgstr "(%d メッセージ)"
 
-#: src/conversation.c:2095
+#: src/conversation.c:2105
 #, c-format
 msgid " left the room (%s)."
 msgstr "は部屋(%s)を去りました"
 
-#: src/conversation.c:2377
+#: src/conversation.c:2387
 msgid "Last created window"
 msgstr "最後に作成したウィンドウ"
 
-#: src/conversation.c:2379
+#: src/conversation.c:2389
 msgid "New window"
 msgstr "新しいウィンドウ"
 
-#: src/conversation.c:2381
+#: src/conversation.c:2391
 msgid "By group"
 msgstr "グループによる"
 
-#: src/conversation.c:2383
+#: src/conversation.c:2393
 msgid "By account"
 msgstr "アカウントによる"
 
-#: src/dialogs.c:314
+#: src/dialogs.c:200
 msgid "Warn User"
 msgstr "ユーザを警告"
 
-#: src/dialogs.c:317
+#: src/dialogs.c:203
 msgid "_Warn"
 msgstr "警告 (_W)"
 
-#: src/dialogs.c:333
+#: src/dialogs.c:219
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Warn %s?</span>\n"
@@ -1376,36 +1476,36 @@
 "\n"
 "%s の警告レベルを増加し、彼らが厳しい評価制限の対象になるようにします。\n"
 
-#: src/dialogs.c:342
+#: src/dialogs.c:228
 msgid "Warn _anonymously?"
 msgstr "匿名で警告しますか? (_A)"
 
-#: src/dialogs.c:349
+#: src/dialogs.c:235
 msgid "<b>Anonymous warnings are less severe.</b>"
 msgstr "<b>匿名の警告はそれほど荒くありません</b>"
 
-#: src/dialogs.c:462
+#: src/dialogs.c:347
 #, c-format
 msgid ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr "%s を仲間リストから削除しようとしています.実行しますか?"
 
-#: src/dialogs.c:464 src/dialogs.c:465
+#: src/dialogs.c:349 src/dialogs.c:350
 msgid "Remove Buddy"
 msgstr "仲間の削除"
 
-#: src/dialogs.c:474
+#: src/dialogs.c:359
 #, 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:476 src/dialogs.c:477
+#: src/dialogs.c:361 src/dialogs.c:362
 msgid "Remove Chat"
 msgstr "チャットを削除"
 
-#: src/dialogs.c:486
+#: src/dialogs.c:371
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
@@ -1414,11 +1514,11 @@
 "グループ %s とそのメンバを仲間リストから削除しようとしています.実行します"
 "か? "
 
-#: src/dialogs.c:489 src/dialogs.c:490
+#: src/dialogs.c:374 src/dialogs.c:375
 msgid "Remove Group"
 msgstr "グループ削除"
 
-#: src/dialogs.c:507
+#: src/dialogs.c:392
 #, fuzzy, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddies from "
@@ -1427,60 +1527,43 @@
 "グループ %s とそのメンバを仲間リストから削除しようとしています.実行します"
 "か? "
 
-#: src/dialogs.c:510 src/dialogs.c:511
+#: src/dialogs.c:395 src/dialogs.c:396
 #, fuzzy
 msgid "Remove Contact"
 msgstr "チャットを削除"
 
-#: src/dialogs.c:659
-msgid "New Message"
-msgstr "新しいメッセージ"
-
-#: src/dialogs.c:677
+#: src/dialogs.c:541
+#, 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"
 msgstr "IM したい相手のスクリーン名を入力してください。\n"
 
-#: src/dialogs.c:693 src/dialogs.c:770
+#: src/dialogs.c:571 src/dialogs.c:646
 msgid "_Screenname:"
 msgstr "スクリーン名 (_S):"
 
-#: src/dialogs.c:708 src/dialogs.c:786 src/gtkpounce.c:408
-msgid "_Account:"
-msgstr "アカウント (_A):"
-
-#: src/dialogs.c:739
+#: src/dialogs.c:616
 msgid "Get User Info"
 msgstr "ユーザ情報の取得"
 
-#: src/dialogs.c:758
+#: src/dialogs.c:634
 msgid ""
 "Please enter the screenname of the person whose info you would like to "
 "view.\n"
 msgstr "情報を見たい相手のスクリーン名を入力してください。\n"
 
-#: src/dialogs.c:852 src/protocols/jabber/jabber.c:974
-#: src/protocols/oscar/oscar.c:6408 src/protocols/toc/toc.c:1531
-msgid "Set User Info"
-msgstr "ユーザ情報の登録"
-
-#: src/dialogs.c:861
-#, c-format
-msgid "Changing info for %s:"
-msgstr "%s の情報を変更:"
-
-#: src/dialogs.c:963
-msgid "Log Conversation"
-msgstr "会話のログ"
-
-#: src/dialogs.c:1059
+#: src/dialogs.c:740
 msgid "Insert Link"
 msgstr "リンクの挿入"
 
-#: src/dialogs.c:1061
-msgid "Insert"
-msgstr "挿入"
-
-#: src/dialogs.c:1083
+#: 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"
@@ -1488,169 +1571,105 @@
 "挿入したいリンクのURLと説明を入力してください.\n"
 "説明は必須ではありません.\n"
 
-#: src/dialogs.c:1101 src/protocols/jabber/buddy.c:257
-#: src/protocols/jabber/jabber.c:594
-msgid "URL"
-msgstr "URL"
-
-#: src/dialogs.c:1111 src/gtkprefs.c:601 src/gtkprefs.c:1809
-#: src/protocols/jabber/buddy.c:271 src/protocols/jabber/buddy.c:744
-msgid "Description"
-msgstr "概要"
-
-#: src/dialogs.c:1247 src/dialogs.c:1264
+#: 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
 msgid "Select Text Color"
 msgstr "文字色選択"
 
-#: src/dialogs.c:1299 src/dialogs.c:1316
+#: src/dialogs.c:976 src/dialogs.c:993
 msgid "Select Background Color"
 msgstr "背景色選択"
 
-#: src/dialogs.c:1401 src/dialogs.c:1427
+#: src/dialogs.c:1078 src/dialogs.c:1104
 msgid "Select Font"
 msgstr "フォントの選択"
 
-#: src/dialogs.c:1493
+#: src/dialogs.c:1168
 msgid "You cannot save an away message with a blank title"
 msgstr "空白の題名では離席メッセージを保存できません"
 
 # メッセージに題名をつけるか、保存せずに "立ち去る" を選択してください。
-#: src/dialogs.c:1495
+#: src/dialogs.c:1170
 msgid ""
 "Please give the message a title, or choose \"Use\" to use without saving."
 msgstr ""
 "メッセージに題名をつけるか、保存せずに \"利用する\" を選択してください。"
 
-#: src/dialogs.c:1505
+#: src/dialogs.c:1180
 msgid "You cannot create an empty away message"
 msgstr "空のメッセージを作れません"
 
-#: src/dialogs.c:1570 src/dialogs.c:1578
+#: src/dialogs.c:1242
 msgid "New away message"
 msgstr "新しい離席メッセージ"
 
-#: src/dialogs.c:1588
+#: src/dialogs.c:1263
 msgid "Away title: "
 msgstr "離席メッセージ 題名:"
 
-#: src/dialogs.c:1638
+#: src/dialogs.c:1314
 msgid "Save & Use"
 msgstr "保存して使う"
 
-#: src/dialogs.c:1642
+#: src/dialogs.c:1318
 msgid "Use"
 msgstr "使う"
 
 #. show everything
-#: src/dialogs.c:1791
+#: src/dialogs.c:1467
 msgid "Smile!"
 msgstr "笑え!"
 
-#: src/dialogs.c:1809
-#, fuzzy
+#: src/dialogs.c:1485
 msgid "Alias Chat"
-msgstr "エイリアス"
-
-#: src/dialogs.c:1809
-#, fuzzy
-msgid "Alias chat"
+msgstr "チャットのエイリアス"
+
+#: src/dialogs.c:1486
+msgid "Enter an alias for this chat."
+msgstr "チャットの別名を入力してください."
+
+#: src/dialogs.c:1502
+#, fuzzy
+msgid "Alias Contact"
 msgstr "エイリアス"
 
-#: src/dialogs.c:1810
-#, fuzzy
-msgid "Please enter an aliased name for this chat."
+#: src/dialogs.c:1503
+#, fuzzy
+msgid "Enter an alias for this contact."
 msgstr "チャットの別名を入力してください.\n"
 
-#: src/dialogs.c:1841
-msgid "_Screenname"
-msgstr "スクリーン名 (_S)"
-
-#: src/dialogs.c:1846 src/gtkblist.c:523 src/gtkblist.c:616
-msgid "_Alias"
-msgstr "エイリアス (_A)"
-
-#: src/dialogs.c:1850
+#: src/dialogs.c:1520
+#, fuzzy, c-format
+msgid "Enter an alias for %s."
+msgstr "%sの別名を入力してください."
+
+#: src/dialogs.c:1522
 msgid "Alias Buddy"
 msgstr "仲間のエイリアス"
 
-#: src/dialogs.c:1851
-#, fuzzy
-msgid "Alias buddy"
-msgstr "仲間のエイリアス"
-
-#: src/dialogs.c:1852
-#, fuzzy
-msgid ""
-"Please enter an aliased name for the person below, or rename this contact in "
-"your buddy list."
-msgstr ""
-"以下の人のエイリアスを入力してください,もしくはこの仲間の名前を仲間リストに"
-"て変更してください.\n"
-
-#: src/dialogs.c:1888 src/dialogs.c:1895
-#, c-format
-msgid "Couldn't write to %s."
-msgstr "%s に書けませんでした。"
-
-#: src/dialogs.c:1919
-msgid "Save Log File"
-msgstr "ログの保存"
-
-#: src/dialogs.c:1949
-#, c-format
-msgid "Couldn't remove file %s."
-msgstr "%s を削除できませんでした。"
-
-#: src/dialogs.c:1968
-msgid "Clear Log"
-msgstr "ログの消去"
-
-#: src/dialogs.c:1977
-msgid "Really clear log?"
-msgstr "本当にログを削除?"
-
-#: src/dialogs.c:2022 src/dialogs.c:2193
-#, c-format
-msgid "Couldn't open log file %s."
-msgstr "ログファイル%sを開けません"
-
-#: src/dialogs.c:2170
-#, c-format
-msgid "Conversations with %s"
-msgstr "%s との会話"
-
-#: src/dialogs.c:2172
-msgid "System Log"
-msgstr "システムログ"
-
-#: src/dialogs.c:2214 src/protocols/jabber/jabber.c:599
-msgid "Date"
-msgstr "日付"
-
-#: src/dialogs.c:2271
-msgid "Log"
-msgstr "ログ"
-
-#: src/dialogs.c:2294
-msgid "Clear"
-msgstr "消去"
-
-#: src/ft.c:123
+#: src/ft.c:139
 #, c-format
 msgid "%s is not a valid filename.\n"
 msgstr "%sは正しいファイル名ではありません.\n"
 
-#: src/ft.c:137
+#: src/ft.c:152
 #, c-format
 msgid "%s was not found.\n"
 msgstr "%s が見つかりません。\n"
 
-#: src/ft.c:693
+#: src/ft.c:754
 #, c-format
 msgid "File transfer to %s aborted.\n"
 msgstr "%s へのファイル転送が中断されました.\n"
 
-#: src/ft.c:695
+#: src/ft.c:756
 #, c-format
 msgid "File transfer from %s aborted.\n"
 msgstr "%s からのファイル転送が中断されました.\n"
@@ -1663,7 +1682,7 @@
 msgid "Size of the expander arrow"
 msgstr "エキスパンダー矢印の大きさ"
 
-#: src/gaim-remote.c:33
+#: src/gaim-remote.c:66
 #, c-format
 msgid ""
 "Usage: %s command [OPTIONS] [URI]\n"
@@ -1684,11 +1703,11 @@
 "    オプション:\n"
 "       -h, --help [命令]         その命令のヘルプを表示する\n"
 
-#: src/gaim-remote.c:139 src/gaim-remote.c:155
+#: src/gaim-remote.c:175 src/gaim-remote.c:191
 msgid "Gaim not running (on session 0)\n"
 msgstr "Gaimは動いていません(セッション0)\n"
 
-#: src/gaim-remote.c:167
+#: src/gaim-remote.c:204
 msgid ""
 "\n"
 "Using AIM: URIs:\n"
@@ -1700,14 +1719,14 @@
 "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"
 "with no message:\n"
-"\tgaim-remote uri aim:goim?screenname=Penguin\n"
+"\tgaim-remote uri 'aim:goim?screenname=Penguin'\n"
 "\n"
 "Joining a chat:\n"
-"\tgaim-remote uri aim:gochat?roomname=PenguinLounge\n"
+"\tgaim-remote uri 'aim:gochat?roomname=PenguinLounge'\n"
 "...joins the 'PenguinLounge' chat room.\n"
 "\n"
 "Adding a buddy to your buddy list:\n"
-"\tgaim-remote uri aim:addbuddy?screenname=Penguin\n"
+"\tgaim-remote uri 'aim:addbuddy?screenname=Penguin'\n"
 "...prompts you to add 'Penguin' to your buddy list.\n"
 msgstr ""
 "\n"
@@ -1722,17 +1741,17 @@
 "あります.そうしないとコマンドはそこで終了します.\n"
 "また,次はスクリーン名に対してメッセージは無しで,会話ウィンドウを開始するだ"
 "けの動作をします.\n"
-"\tgaim-remote uri aim:goim?screenname=Penguin\n"
+"\tgaim-remote uri 'aim:goim?screenname=Penguin'\n"
 "\n"
 "チャットに参加:\n"
-"\tgaim-remote uri aim:gochat?roomname=PenguinLounge\n"
+"\tgaim-remote uri 'aim:gochat?roomname=PenguinLounge'\n"
 "...は 'PenguinLounge' チャットルームに参加します.\n"
 "\n"
 "仲間を仲間リストに追加:\n"
-"\tgaim-remote uri aim:addbuddy?screenname=Penguin\n"
+"\tgaim-remote uri 'aim:addbuddy?screenname=Penguin'\n"
 "... 'Penguin' を仲間に追加するようにプロンプトが出ます.\n"
 
-#: src/gaim-remote.c:187
+#: src/gaim-remote.c:223
 msgid ""
 "\n"
 "Close running copy of Gaim\n"
@@ -1745,28 +1764,28 @@
 msgid "sorry, i ran out for a while. bbl"
 msgstr "ちょっとしばらくいないです.もうすぐ帰ります"
 
-#: src/gaimrc.c:369 src/gaimrc.c:1460
+#: src/gaimrc.c:373 src/gaimrc.c:1450
 msgid "boring default"
 msgstr "おもしろくもないデフォルト"
 
-#: src/gaimrc.c:1267 src/gtkblist.c:1717
+#: src/gaimrc.c:1259 src/gtkblist.c:2348
 msgid "Alphabetical"
 msgstr "アルファベット順"
 
-#: src/gaimrc.c:1269 src/gtkblist.c:1718
+#: src/gaimrc.c:1261 src/gtkblist.c:2349
 msgid "By status"
 msgstr "状態順"
 
-#: src/gaimrc.c:1271 src/gtkblist.c:1719
+#: src/gaimrc.c:1263 src/gtkblist.c:2350
 msgid "By log size"
 msgstr "ログのサイズで"
 
-#: src/gaimrc.c:1558
+#: src/gaimrc.c:1548
 #, c-format
 msgid "Could not open config file %s."
 msgstr "設定ファイル%sを開けません"
 
-#: src/gtkaccount.c:287
+#: src/gtkaccount.c:285
 #, c-format
 msgid ""
 "<b>File:</b> %s\n"
@@ -1774,179 +1793,178 @@
 "<b>Image size:</b> %dx%d"
 msgstr ""
 
-#: src/gtkaccount.c:318 src/protocols/oscar/oscar.c:3067
+#: src/gtkaccount.c:316 src/protocols/oscar/oscar.c:3077
 msgid "Buddy Icon"
 msgstr "仲間アイコン"
 
 #. Build the login options frame.
-#: src/gtkaccount.c:369
+#: src/gtkaccount.c:367
 msgid "Login Options"
 msgstr "ログインオプション"
 
-#: src/gtkaccount.c:386
+#: src/gtkaccount.c:384
 msgid "Protocol:"
 msgstr "プロトコル:"
 
-#: src/gtkaccount.c:391
+#: src/gtkaccount.c:389
 msgid "Screenname:"
 msgstr "スクリーン名:"
 
-#: src/gtkaccount.c:464 src/main.c:307 src/protocols/irc/irc.c:161
-#: src/protocols/jabber/chat.c:55
+#: src/gtkaccount.c:462 src/main.c:308
 msgid "Password:"
 msgstr "パスワード:"
 
-#: src/gtkaccount.c:469 src/gtkblist.c:2680 src/gtkblist.c:2989
+#: src/gtkaccount.c:467 src/gtkblist.c:3328 src/gtkblist.c:3650
 msgid "Alias:"
 msgstr "エイリアス:"
 
-#: src/gtkaccount.c:473
+#: src/gtkaccount.c:471
 msgid "Remember password"
 msgstr "パスワードを覚える"
 
 #. Build the user options frame.
-#: src/gtkaccount.c:527
+#: src/gtkaccount.c:525
 msgid "User Options"
 msgstr "ユーザオプション"
 
-#: src/gtkaccount.c:540
+#: src/gtkaccount.c:538
 msgid "New mail notifications"
 msgstr "新しいメール通知"
 
-#: src/gtkaccount.c:549
+#: src/gtkaccount.c:547
 msgid "Buddy icon file:"
 msgstr "仲間アイコンファイル:"
 
-#: src/gtkaccount.c:558
+#: src/gtkaccount.c:556
 msgid "_Browse"
 msgstr "閲覧 (_B)"
 
-#: src/gtkaccount.c:564
+#: src/gtkaccount.c:562
 msgid "_Reset"
 msgstr "リセット (_R)"
 
 #. Build the protocol options frame.
-#: src/gtkaccount.c:626
+#: src/gtkaccount.c:624
 #, c-format
 msgid "%s Options"
 msgstr "%s オプション"
 
 #. Use Global Proxy Settings
-#: src/gtkaccount.c:747
+#: src/gtkaccount.c:739
 msgid "Use Global Proxy Settings"
 msgstr "グローバルなプロキシ設定を使う"
 
 #. No Proxy
-#: src/gtkaccount.c:754
+#: src/gtkaccount.c:746
 msgid "No Proxy"
 msgstr "プロキシなし"
 
 #. HTTP
-#: src/gtkaccount.c:761
+#: src/gtkaccount.c:753
 msgid "HTTP"
 msgstr "HTTP"
 
 #. SOCKS 4
-#: src/gtkaccount.c:768
+#: src/gtkaccount.c:760
 msgid "SOCKS 4"
 msgstr "SOCKS 4"
 
 #. SOCKS 5
-#: src/gtkaccount.c:775
+#: src/gtkaccount.c:767
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
 #. Use Environmental Settings
-#: src/gtkaccount.c:782 src/gtkprefs.c:1112
+#: src/gtkaccount.c:774 src/gtkprefs.c:1091
 #, fuzzy
 msgid "Use Environmental Settings"
 msgstr "グローバルなプロキシ設定を使う"
 
-#: src/gtkaccount.c:815
+#: src/gtkaccount.c:807
 msgid "you can see the butterflies mating"
 msgstr ""
 
-#: src/gtkaccount.c:819
+#: src/gtkaccount.c:811
 msgid "If you look real closely"
 msgstr ""
 
-#: src/gtkaccount.c:835
+#: src/gtkaccount.c:827
 msgid "Proxy Options"
 msgstr "プロキシオプション"
 
-#: src/gtkaccount.c:851 src/gtkprefs.c:1106
+#: src/gtkaccount.c:843 src/gtkprefs.c:1085
 msgid "Proxy _type:"
 msgstr "プロキシの種類 (_T):"
 
-#: src/gtkaccount.c:860
+#: src/gtkaccount.c:852 src/gtkprefs.c:1115
 msgid "_Host:"
 msgstr "ホスト名 (_H):"
 
-#: src/gtkaccount.c:864
+#: src/gtkaccount.c:856 src/gtkprefs.c:1132
 msgid "_Port:"
 msgstr "ポート番号 (_P):"
 
-#: src/gtkaccount.c:872
+#: src/gtkaccount.c:864
 msgid "_Username:"
 msgstr "ユーザ名 (_U):"
 
-#: src/gtkaccount.c:877
+#: src/gtkaccount.c:869 src/gtkprefs.c:1167
 msgid "Pa_ssword:"
 msgstr "パスワード (_S):"
 
-#: src/gtkaccount.c:1215
+#: src/gtkaccount.c:1208
 #, fuzzy
 msgid "Add Account"
 msgstr "アカウント:"
 
-#: src/gtkaccount.c:1217
+#: src/gtkaccount.c:1210
 msgid "Modify Account"
 msgstr "アカウント修正"
 
 #. Add the disclosure
-#: src/gtkaccount.c:1241
+#: src/gtkaccount.c:1234
 msgid "Show more options"
 msgstr "他のオプションも表示"
 
-#: src/gtkaccount.c:1242
+#: src/gtkaccount.c:1235
 msgid "Show fewer options"
 msgstr "少ないオプションを表示"
 
 #. Register button
-#: src/gtkaccount.c:1269 src/protocols/jabber/jabber.c:612
+#: src/gtkaccount.c:1262 src/protocols/jabber/jabber.c:686
 msgid "Register"
 msgstr "登録"
 
-#: src/gtkaccount.c:1614
+#: src/gtkaccount.c:1607
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "本当に%sを削除したいのですか?"
 
-#: src/gtkaccount.c:1618 src/gtkrequest.c:206
+#: src/gtkaccount.c:1611 src/gtkrequest.c:194
 msgid "Delete"
 msgstr "削除"
 
-#: src/gtkaccount.c:1731
+#: src/gtkaccount.c:1725
 msgid "Screen Name"
 msgstr "スクリーン名"
 
-#: src/gtkaccount.c:1754 src/protocols/jabber/jabber.c:866
-#: src/protocols/oscar/oscar.c:2839 src/protocols/oscar/oscar.c:4527
-#: src/protocols/oscar/oscar.c:6063 src/protocols/yahoo/yahoo.c:2032
+#: 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
 msgid "Online"
 msgstr "オンライン"
 
-#: src/gtkaccount.c:1772
+#: src/gtkaccount.c:1766
 msgid "Protocol"
 msgstr "プロトコル:"
 
-#: src/gtkaccount.c:2062
+#: src/gtkaccount.c:2056
 #, 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:2076
+#: src/gtkaccount.c:2070
 msgid ""
 "\n"
 "\n"
@@ -1956,187 +1974,195 @@
 "\n"
 "彼らを仲間リストに追加しますか?"
 
-#: src/gtkaccount.c:2080
-msgid "Gaim - Information"
-msgstr "Gaim - 情報"
-
-#: src/gtkaccount.c:2084
+#: src/gtkaccount.c:2074
+msgid "Information"
+msgstr "情報"
+
+#: src/gtkaccount.c:2078
 msgid "Add buddy to your list?"
 msgstr "リストに仲間を追加しますか?"
 
-#: src/gtkaccount.c:2086 src/gtkblist.c:3037 src/gtkconv.c:1137
-#: src/gtkconv.c:3017 src/gtkconv.c:4191 src/gtkrequest.c:207
-#: src/protocols/icq/gaim_icq.c:277 src/protocols/oscar/oscar.c:2681
+#. 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
 msgid "Add"
 msgstr "追加"
 
-#: src/gtkblist.c:496
+#: src/gtkblist.c:815
 msgid "_Get Info"
 msgstr "情報取得 (_G)"
 
-#: src/gtkblist.c:499
+#: src/gtkblist.c:818
 msgid "_IM"
 msgstr "_IM"
 
-#: src/gtkblist.c:501
+#: src/gtkblist.c:820
 msgid "Add Buddy _Pounce"
 msgstr "掴む仲間に加える"
 
-#: src/gtkblist.c:503
+#: src/gtkblist.c:822
 msgid "View _Log"
 msgstr "ログを見る (_L)"
 
-#: src/gtkblist.c:525 src/gtkblist.c:618 src/gtkblist.c:626
+#: src/gtkblist.c:842 src/gtkblist.c:931 src/gtkblist.c:950
+msgid "_Alias..."
+msgstr "エイリアス (_A)..."
+
+#: src/gtkblist.c:844 src/gtkblist.c:933 src/gtkblist.c:955 src/gtkconn.c:358
 msgid "_Remove"
 msgstr "削除 (_R)"
 
-#: src/gtkblist.c:597
+#: src/gtkblist.c:907
 msgid "Add a _Buddy"
 msgstr "仲間を加える (_B)"
 
-#: src/gtkblist.c:599
+#: src/gtkblist.c:909
 msgid "Add a C_hat"
 msgstr "チャットの追加 (_H)"
 
-#: src/gtkblist.c:601
+#: src/gtkblist.c:911
 msgid "_Delete Group"
 msgstr "グループ削除 (_D)"
 
-#: src/gtkblist.c:603
+#: src/gtkblist.c:913
 msgid "_Rename"
 msgstr "改名 (_R)"
 
-#: src/gtkblist.c:611
-msgid "_Join"
-msgstr "加入 (_J)"
-
-#: src/gtkblist.c:613
+#: src/gtkblist.c:928
 #, fuzzy
 msgid "Auto-Join"
-msgstr "自動ログイン"
-
-#: src/gtkblist.c:622 src/gtkblist.c:653
+msgstr "自動加入"
+
+#: src/gtkblist.c:952 src/gtkblist.c:987
 msgid "_Collapse"
 msgstr ""
 
-#: src/gtkblist.c:658
+#: src/gtkblist.c:992
 msgid "_Expand"
 msgstr ""
 
+#: src/gtkblist.c:1391 src/gtkconv.c:3999
+#, fuzzy
+msgid ""
+"You are not currently signed on with an account that can add that buddy."
+msgstr "チャットできる機能がついているプロトコルでサインオンしていません."
+
 #. Buddies menu
-#: src/gtkblist.c:1088
+#: src/gtkblist.c:1690
 msgid "/_Buddies"
 msgstr "仲間 (_B)"
 
-#: src/gtkblist.c:1089
-msgid "/Buddies/New _Instant Message..."
-msgstr "新しいメッセージの送信 (_I)..."
-
-#: src/gtkblist.c:1090
+#: src/gtkblist.c:1691
+#, fuzzy
+msgid "/Buddies/New Instant _Message..."
+msgstr "新しいIMの送信 (_I)..."
+
+#: src/gtkblist.c:1692
 msgid "/Buddies/Join a _Chat..."
 msgstr "チャットに参加(_C)..."
 
-#: src/gtkblist.c:1091
+#: src/gtkblist.c:1693
 msgid "/Buddies/Get _User Info..."
 msgstr "ユーザ情報の取得 (_U)..."
 
-#: src/gtkblist.c:1093
+#: src/gtkblist.c:1695
 msgid "/Buddies/Show _Offline Buddies"
 msgstr "オフラインの仲間を表示 (_O)"
 
-#: src/gtkblist.c:1094
+#: src/gtkblist.c:1696
 msgid "/Buddies/Show _Empty Groups"
 msgstr "空のグループを表示 (_E)"
 
-#: src/gtkblist.c:1095
-msgid "/Buddies/_Add a Buddy..."
+#: src/gtkblist.c:1697
+msgid "/Buddies/_Add Buddy..."
 msgstr "仲間を加える (_A)..."
 
-#: src/gtkblist.c:1096
-msgid "/Buddies/Add a C_hat..."
+#: src/gtkblist.c:1698
+msgid "/Buddies/Add C_hat..."
 msgstr "チャットを追加 (_H)..."
 
-#: src/gtkblist.c:1097
-msgid "/Buddies/Add a _Group..."
+#: src/gtkblist.c:1699
+msgid "/Buddies/Add _Group..."
 msgstr "グループを追加 (_G)..."
 
-#: src/gtkblist.c:1099
+#: src/gtkblist.c:1701
 msgid "/Buddies/_Signoff"
 msgstr "サインオフ (_S)"
 
-#: src/gtkblist.c:1100
+#: src/gtkblist.c:1702
 msgid "/Buddies/_Quit"
 msgstr "終了 (_Q)"
 
 #. Tools
-#: src/gtkblist.c:1103
+#: src/gtkblist.c:1705
 msgid "/_Tools"
 msgstr "ツール (_T)"
 
-#: src/gtkblist.c:1104
+#: src/gtkblist.c:1706
 msgid "/Tools/_Away"
 msgstr "離席 (_A)"
 
-#: src/gtkblist.c:1105
+#: src/gtkblist.c:1707
 msgid "/Tools/Buddy _Pounce"
 msgstr "仲間を掴む (_P)"
 
-#: src/gtkblist.c:1106
+#: src/gtkblist.c:1708
 msgid "/Tools/P_rotocol Actions"
 msgstr "プロトコルごとの動作 (_P)"
 
-#: src/gtkblist.c:1108
+#: src/gtkblist.c:1710
 msgid "/Tools/A_ccounts"
 msgstr "アカウント (_C)..."
 
-#: src/gtkblist.c:1109
-msgid "/Tools/_File Transfers..."
+#: src/gtkblist.c:1711
+msgid "/Tools/_File Transfers"
 msgstr "ファイル転送 (_F)"
 
-#: src/gtkblist.c:1110
-msgid "/Tools/Preferences"
-msgstr "設定"
-
-#: src/gtkblist.c:1111
+#: src/gtkblist.c:1712
+msgid "/Tools/Pr_eferences"
+msgstr "設定 (_E)"
+
+#: src/gtkblist.c:1713
 msgid "/Tools/Pr_ivacy"
 msgstr "個人情報 (_I)"
 
-#: src/gtkblist.c:1113
+#: src/gtkblist.c:1716
 msgid "/Tools/View System _Log"
 msgstr "システムログを見る (_L)"
 
 #. Help
-#: src/gtkblist.c:1116
+#: src/gtkblist.c:1720
 msgid "/_Help"
 msgstr "ヘルプ (_H)"
 
-#: src/gtkblist.c:1117
+#: src/gtkblist.c:1721
 msgid "/Help/Online _Help"
 msgstr "オンラインヘルプ (_H)"
 
-#: src/gtkblist.c:1118
+#: src/gtkblist.c:1722
 msgid "/Help/_Debug Window"
 msgstr "デバッグウィンドウ (_D)"
 
-#: src/gtkblist.c:1119
+#: src/gtkblist.c:1723
 msgid "/Help/_About"
 msgstr "gaimについて (_A)..."
 
-#: src/gtkblist.c:1135
+#: src/gtkblist.c:1739
 msgid "Rename Group"
 msgstr "グループの改名"
 
-#: src/gtkblist.c:1135
+#: src/gtkblist.c:1739
 #, fuzzy
 msgid "New group name"
 msgstr "新しい名前"
 
-#: src/gtkblist.c:1136
+#: src/gtkblist.c:1740
 #, fuzzy
 msgid "Please enter a new name for the selected group."
 msgstr "新しいグループ名を入力してください。\n"
 
-#: src/gtkblist.c:1165
+#: src/gtkblist.c:1768
 #, c-format
 msgid ""
 "\n"
@@ -2145,16 +2171,16 @@
 "\n"
 "<b>アカウント:</b> %s"
 
-#: src/gtkblist.c:1224 src/protocols/oscar/oscar.c:5444
+#: src/gtkblist.c:1832 src/protocols/oscar/oscar.c:5525
 msgid "<b>Status:</b> Offline"
 msgstr "<b>ステータス:</b> オフライン"
 
-#: src/gtkblist.c:1236
+#: src/gtkblist.c:1847
 #, c-format
 msgid "%d%%"
 msgstr "%d%%"
 
-#: src/gtkblist.c:1250
+#: src/gtkblist.c:1863
 msgid ""
 "\n"
 "<b>Account:</b>"
@@ -2162,7 +2188,13 @@
 "\n"
 "<b>アカウント:</b>"
 
-#: src/gtkblist.c:1251
+#: src/gtkblist.c:1864
+msgid ""
+"\n"
+"<b>Contact Alias:</b>"
+msgstr ""
+
+#: src/gtkblist.c:1865
 msgid ""
 "\n"
 "<b>Alias:</b>"
@@ -2170,7 +2202,7 @@
 "\n"
 "<b>エイリアス:</b>"
 
-#: src/gtkblist.c:1252
+#: src/gtkblist.c:1866
 msgid ""
 "\n"
 "<b>Nickname:</b>"
@@ -2178,7 +2210,16 @@
 "\n"
 "<b>ニックネーム:</b>"
 
-#: src/gtkblist.c:1253
+#: src/gtkblist.c:1867
+#, fuzzy
+msgid ""
+"\n"
+"<b>Logged In:</b>"
+msgstr ""
+"\n"
+"<b>ログインしました:</b> "
+
+#: src/gtkblist.c:1868
 msgid ""
 "\n"
 "<b>Idle:</b>"
@@ -2186,7 +2227,7 @@
 "\n"
 "<b>アイドル:</b>"
 
-#: src/gtkblist.c:1254
+#: src/gtkblist.c:1869
 msgid ""
 "\n"
 "<b>Warned:</b>"
@@ -2194,7 +2235,7 @@
 "\n"
 "<b>警告された:</b>"
 
-#: src/gtkblist.c:1256
+#: src/gtkblist.c:1871
 msgid ""
 "\n"
 "<b>Description:</b> Spooky"
@@ -2202,7 +2243,7 @@
 "\n"
 "<b>説明:</b> スプーキー"
 
-#: src/gtkblist.c:1257
+#: src/gtkblist.c:1872
 msgid ""
 "\n"
 "<b>Status</b>: Awesome"
@@ -2210,7 +2251,7 @@
 "\n"
 "<b>状態:</b> すげえ"
 
-#: src/gtkblist.c:1258
+#: src/gtkblist.c:1873
 #, fuzzy
 msgid ""
 "\n"
@@ -2219,85 +2260,85 @@
 "\n"
 "<b>状態:</b> すげえ"
 
-#: src/gtkblist.c:1514
+#: src/gtkblist.c:2143
 #, c-format
 msgid "Idle (%dh%02dm) "
 msgstr "アイドル (%dh%02dm) "
 
-#: src/gtkblist.c:1516
+#: src/gtkblist.c:2145
 #, c-format
 msgid "Idle (%dm) "
 msgstr "アイドル (%dm) "
 
-#: src/gtkblist.c:1520
+#: src/gtkblist.c:2150
 #, c-format
 msgid "Warned (%d%%) "
 msgstr "警告: %d%% "
 
-#: src/gtkblist.c:1523
+#: src/gtkblist.c:2153
 msgid "Offline "
 msgstr "オフライン "
 
-#: src/gtkblist.c:1715 src/gtkprefs.c:842 src/gtkprefs.c:1501
+#: src/gtkblist.c:2346 src/gtkprefs.c:834 src/gtkprefs.c:1485
 msgid "None"
 msgstr "なし"
 
-#: src/gtkblist.c:1780
+#: src/gtkblist.c:2413
 msgid "/Tools/Away"
 msgstr "離席"
 
-#: src/gtkblist.c:1783
+#: src/gtkblist.c:2416
 msgid "/Tools/Buddy Pounce"
 msgstr "仲間を掴む"
 
-#: src/gtkblist.c:1786
+#: src/gtkblist.c:2419
 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:1870
+#: src/gtkblist.c:2506
 msgid "/Buddies/Show Offline Buddies"
 msgstr "オフラインの仲間を表示"
 
-#: src/gtkblist.c:1872
+#: src/gtkblist.c:2508
 msgid "/Buddies/Show Empty Groups"
 msgstr "空のグループを表示"
 
-#: src/gtkblist.c:1890 src/gtkconv.c:1096
+#: src/gtkblist.c:2526 src/gtkconv.c:1215
 msgid "IM"
 msgstr "IM"
 
-#: src/gtkblist.c:1896
+#: src/gtkblist.c:2532
 msgid "Send a message to the selected buddy"
 msgstr "選択した仲間にメッセージ送信"
 
-#: src/gtkblist.c:1899 src/protocols/napster/napster.c:529
+#: src/gtkblist.c:2535 src/protocols/napster/napster.c:529
 msgid "Get Info"
 msgstr "情報取得"
 
-#: src/gtkblist.c:1905
+#: src/gtkblist.c:2541
 msgid "Get information on the selected buddy"
 msgstr "選択した仲間の情報を取得"
 
-#: src/gtkblist.c:1908 src/protocols/oscar/oscar.c:3076
+#: src/gtkblist.c:2544 src/protocols/oscar/oscar.c:3086
 msgid "Chat"
 msgstr "チャット"
 
-#: src/gtkblist.c:1913
+#: src/gtkblist.c:2549
 msgid "Join a chat room"
 msgstr "チャットルームの参加"
 
-#: src/gtkblist.c:1921
+#: src/gtkblist.c:2557
 msgid "Set an away message"
 msgstr "離席メッセージを設定"
 
-#: src/gtkblist.c:2622 src/protocols/yahoo/yahoo.c:2166
+#: src/gtkblist.c:3270 src/protocols/yahoo/yahoo.c:2325
 msgid "Add Buddy"
 msgstr "仲間を加える"
 
-#: src/gtkblist.c:2645
+#: src/gtkblist.c:3293
 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. "
@@ -2307,24 +2348,24 @@
 "スとニックネームを入力できます。エイリアスは、可能な場合に限りスクリーン名の"
 "かわりに表示されます。\n"
 
-#: src/gtkblist.c:2667 src/main.c:289
+#: src/gtkblist.c:3315 src/main.c:290
 msgid "Screen Name:"
 msgstr "スクリーン名:"
 
-#: src/gtkblist.c:2693 src/gtkblist.c:3000
+#: src/gtkblist.c:3341 src/gtkblist.c:3663
 msgid "Group:"
 msgstr "グループ:"
 
 #. Set up stuff for the account box
-#: src/gtkblist.c:2702 src/gtkblist.c:2971
+#: src/gtkblist.c:3350 src/gtkblist.c:3631
 msgid "Account:"
 msgstr "アカウント:"
 
-#: src/gtkblist.c:2938
+#: src/gtkblist.c:3598
 msgid "Add Chat"
 msgstr "チャットの追加"
 
-#: src/gtkblist.c:2961
+#: src/gtkblist.c:3621
 msgid ""
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
@@ -2332,74 +2373,92 @@
 "以下の人のエイリアスと仲間リストに追加するチャットの情報を入力してくださ"
 "い.\n"
 
-#: src/gtkblist.c:3034
+#: src/gtkblist.c:3697
 msgid "Add Group"
 msgstr "グループの追加"
 
-#: src/gtkblist.c:3034
-#, fuzzy
-msgid "Add a new group"
-msgstr "新しいグループを加える"
-
-#: src/gtkblist.c:3035
+#: src/gtkblist.c:3698
 #, fuzzy
 msgid "Please enter the name of the group to be added."
 msgstr "加わるグループ名を入力してください。\n"
 
-#: src/gtkblist.c:3547
+#: src/gtkblist.c:4215
 msgid "No actions available"
 msgstr "可能なアクションが無いです"
 
-#: src/gtkconn.c:57 src/gtkconn.c:241 src/gtkconn.c:252
+#: src/gtkconn.c:77 src/gtkconn.c:249 src/gtkconn.c:260
 msgid "Done."
 msgstr "完了。"
 
-#: src/gtkconn.c:136
+#: src/gtkconn.c:156
 msgid "Signon: "
 msgstr "サインオン: "
 
-#: src/gtkconn.c:194
+#: src/gtkconn.c:202
 msgid "Signon"
 msgstr "サインオン"
 
-#: src/gtkconn.c:207
+#: src/gtkconn.c:215
 msgid "Cancel All"
 msgstr "すべてを取消"
 
-#: src/gtkconn.c:274
-#, fuzzy, c-format
-msgid "%s has been disconnected"
-msgstr "%s はサインオフしました"
-
-#: src/gtkconn.c:277
+#: src/gtkconn.c:358 src/gtkconn.c:585
+msgid "_Reconnect"
+msgstr "再接続 (_R)"
+
+#: src/gtkconn.c:549
+#, c-format
+msgid ""
+"<span weight=\"bold\" size=\"larger\">%s has been disconnected.</span>\n"
+"\n"
+"%s\n"
+"%s"
+msgstr ""
+"<span weight=\"bold\" size=\"larger\">%s はサインオフしました.</span>\n"
+"\n"
+"%s\n"
+"%s"
+
+#: src/gtkconn.c:551
 #, fuzzy
 msgid "Reason Unknown."
 msgstr "不明."
 
-#: src/gtkconv.c:185
-#, fuzzy
+#: src/gtkconn.c:590
+msgid "Reconnect _All"
+msgstr "すべてを再接続 (_A)"
+
+#: src/gtkconn.c:612
+msgid "Account"
+msgstr "アカウント"
+
+#: src/gtkconn.c:620
+msgid "Time"
+msgstr ""
+
+#: src/gtkconv.c:187
 msgid "That file already exists"
-msgstr "そのファイルはすでに存在します."
-
-#: src/gtkconv.c:186 src/gtkft.c:1034
+msgstr "そのファイルはすでに存在します"
+
+#: src/gtkconv.c:188 src/gtkft.c:1076
 msgid "Would you like to overwrite it?"
 msgstr "上書きしますか?"
 
-#: src/gtkconv.c:241
+#: src/gtkconv.c:244
 #, c-format
 msgid "Failed to store image: %s\n"
 msgstr ""
 
-#: src/gtkconv.c:303
-msgid "Gaim - Insert Image"
-msgstr "Gaim - 画像挿入"
-
-#: src/gtkconv.c:607
-msgid "Gaim - Invite Buddy Into Chat Room"
-msgstr "Gaim - 仲間のチャットルーム情報で招待"
+#: src/gtkconv.c:300
+msgid "Insert Image"
+msgstr "画像挿入"
+
+#: src/gtkconv.c:629
+msgid "Invite Buddy Into Chat Room"
+msgstr "仲間のチャットルーム情報で招待"
 
 #. Put our happy label in it.
-#: src/gtkconv.c:635
+#: src/gtkconv.c:657
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
@@ -2407,324 +2466,344 @@
 "招待しようとしているユーザの名前を入力してください.また,オプションとして招"
 "待メッセージも書いてください."
 
-#: src/gtkconv.c:656
+#: src/gtkconv.c:678
 msgid "_Buddy:"
 msgstr "仲間 (_B):"
 
-#: src/gtkconv.c:676
+#: src/gtkconv.c:698
 msgid "_Message:"
 msgstr "メッセージ (_M):"
 
-#: src/gtkconv.c:1104
+#: src/gtkconv.c:788
+msgid "Find"
+msgstr "検索"
+
+#: src/gtkconv.c:810
+msgid "_Search for:"
+msgstr ""
+
+#: src/gtkconv.c:1223
 msgid "Un-Ignore"
 msgstr "不無視"
 
-#: src/gtkconv.c:1106 src/gtkprefs.c:774
+#: src/gtkconv.c:1225 src/gtkprefs.c:767
 msgid "Ignore"
 msgstr "無視"
 
 #. Info button
-#: src/gtkconv.c:1115 src/gtkconv.c:3040
+#: src/gtkconv.c:1234 src/gtkconv.c:3246
 msgid "Info"
 msgstr "情報"
 
-#: src/gtkconv.c:1124
+#: src/gtkconv.c:1243
 msgid "Get Away Msg"
 msgstr "離席メッセージ"
 
-#: src/gtkconv.c:1135 src/gtkconv.c:3023 src/gtkconv.c:4176
-#: src/gtkrequest.c:208
+#. Remove button
+#: src/gtkconv.c:1254 src/gtkconv.c:3239 src/gtkconv.c:3330
+#: src/gtkrequest.c:196
 msgid "Remove"
 msgstr "削除"
 
-#: src/gtkconv.c:2248
+#: src/gtkconv.c:2489
 msgid "User is typing..."
 msgstr "ユーザが入力中 ..."
 
-#: src/gtkconv.c:2256
+#: src/gtkconv.c:2497
 msgid "User has typed something and paused"
 msgstr "ユーザは何かを入力して停止"
 
 #. Build the Send As menu
-#: src/gtkconv.c:2359
+#: src/gtkconv.c:2600
 msgid "_Send As"
 msgstr "送信 (_S)"
 
-#: src/gtkconv.c:2819
-msgid "Gaim - Save Conversation"
-msgstr "Gaim - 会話を保存"
+#: src/gtkconv.c:3011
+msgid "Save Conversation"
+msgstr "会話を保存"
 
 #. Conversation menu
-#: src/gtkconv.c:2836
+#: src/gtkconv.c:3028
 msgid "/_Conversation"
 msgstr "会話 (_C)"
 
-#: src/gtkconv.c:2838
+#: src/gtkconv.c:3030
+#, fuzzy
+msgid "/Conversation/New Instant _Message..."
+msgstr "新しいIMの送信 (_I)..."
+
+#: src/gtkconv.c:3035
+msgid "/Conversation/_Find..."
+msgstr "検索 (_F)..."
+
+#: src/gtkconv.c:3036
+msgid "/Conversation/View _Log"
+msgstr "ログを見る (_L)"
+
+#: src/gtkconv.c:3037
 msgid "/Conversation/_Save As..."
 msgstr "名前をつけて保存 (_S)..."
 
-#: src/gtkconv.c:2840
-msgid "/Conversation/View _Log..."
-msgstr "ログを見る (_L)"
-
-#: src/gtkconv.c:2844
+#: src/gtkconv.c:3042
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "掴む仲間に加える (_P)..."
 
-#: src/gtkconv.c:2846
+#: src/gtkconv.c:3044
+msgid "/Conversation/_Get Info"
+msgstr "情報取得 (_G)"
+
+#: src/gtkconv.c:3046
+msgid "/Conversation/_Warn..."
+msgstr "警告 (_W)..."
+
+#: src/gtkconv.c:3048
+msgid "/Conversation/In_vite..."
+msgstr "招待 (_V)..."
+
+#: src/gtkconv.c:3053
 msgid "/Conversation/A_lias..."
 msgstr "エイリアス (_A)..."
 
-#: src/gtkconv.c:2848
-msgid "/Conversation/_Get Info..."
-msgstr "情報取得 (_G)..."
-
-#: src/gtkconv.c:2850
-msgid "/Conversation/In_vite..."
-msgstr "招待 (_V)..."
-
-#: src/gtkconv.c:2855
-msgid "/Conversation/Insert _URL..."
-msgstr "URLを挿入 (_U)..."
-
-#: src/gtkconv.c:2857
-msgid "/Conversation/Insert _Image..."
-msgstr "画像の挿入 (_I)..."
-
-#: src/gtkconv.c:2862
-msgid "/Conversation/_Warn..."
-msgstr "警告 (_W)..."
-
-#: src/gtkconv.c:2864
+#: src/gtkconv.c:3055
 msgid "/Conversation/_Block..."
 msgstr ""
 
-#: src/gtkconv.c:2866
+#: src/gtkconv.c:3057
 msgid "/Conversation/_Add..."
 msgstr ""
 
-#: src/gtkconv.c:2868
+#: src/gtkconv.c:3059
 msgid "/Conversation/_Remove..."
 msgstr ""
 
-#: src/gtkconv.c:2873
+#: src/gtkconv.c:3064
+msgid "/Conversation/Insert Lin_k..."
+msgstr "リンクを挿入 (_K)..."
+
+#: src/gtkconv.c:3066
+msgid "/Conversation/Insert Imag_e..."
+msgstr "画像を挿入 (_E)..."
+
+#: src/gtkconv.c:3071
 msgid "/Conversation/_Close"
 msgstr "閉じる (_C)"
 
 #. Options
-#: src/gtkconv.c:2877
+#: src/gtkconv.c:3075
 msgid "/_Options"
 msgstr "オプション (_O)"
 
-#: src/gtkconv.c:2878
+#: src/gtkconv.c:3076
 msgid "/Options/Enable _Logging"
 msgstr "ログを有効にする (_L)"
 
-#: src/gtkconv.c:2879
+#: src/gtkconv.c:3077
 msgid "/Options/Enable _Sounds"
 msgstr "音を有効にする (_S)"
 
-#: src/gtkconv.c:2919
-msgid "/Conversation/View Log..."
+#: src/gtkconv.c:3078
+msgid "/Options/Show Formatting _Toolbar"
+msgstr ""
+
+#: src/gtkconv.c:3120
+msgid "/Conversation/View Log"
 msgstr "ログを見る..."
 
-#: src/gtkconv.c:2924
+#: src/gtkconv.c:3125
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "掴む仲間に加える..."
 
-#: src/gtkconv.c:2928
-msgid "/Conversation/Alias..."
-msgstr "エイリアス..."
-
-#: src/gtkconv.c:2932
-msgid "/Conversation/Get Info..."
-msgstr "情報取得..."
-
-#: src/gtkconv.c:2936
+#: src/gtkconv.c:3131
+msgid "/Conversation/Get Info"
+msgstr "情報取得"
+
+#: src/gtkconv.c:3135
+msgid "/Conversation/Warn..."
+msgstr "警告..."
+
+#: src/gtkconv.c:3139
 msgid "/Conversation/Invite..."
 msgstr "招待..."
 
-#: src/gtkconv.c:2942
-msgid "/Conversation/Insert URL..."
-msgstr "URLを挿入..."
-
-#: src/gtkconv.c:2946
+#: src/gtkconv.c:3145
+msgid "/Conversation/Alias..."
+msgstr "エイリアス..."
+
+#: src/gtkconv.c:3149
+msgid "/Conversation/Block..."
+msgstr ""
+
+#: src/gtkconv.c:3153
+msgid "/Conversation/Add..."
+msgstr ""
+
+#: src/gtkconv.c:3157
+msgid "/Conversation/Remove..."
+msgstr ""
+
+#: src/gtkconv.c:3163
+msgid "/Conversation/Insert Link..."
+msgstr "リンクを挿入..."
+
+#: src/gtkconv.c:3167
 msgid "/Conversation/Insert Image..."
 msgstr "画像を挿入..."
 
-#: src/gtkconv.c:2952
-msgid "/Conversation/Warn..."
-msgstr "警告..."
-
-#: src/gtkconv.c:2956
-msgid "/Conversation/Block..."
-msgstr ""
-
-#: src/gtkconv.c:2960
-msgid "/Conversation/Add..."
-msgstr ""
-
-#: src/gtkconv.c:2964
-msgid "/Conversation/Remove..."
-msgstr ""
-
-#: src/gtkconv.c:2970
+#: src/gtkconv.c:3173
 msgid "/Options/Enable Logging"
 msgstr "ログを有効にする"
 
-#: src/gtkconv.c:2973
+#: src/gtkconv.c:3176
 msgid "/Options/Enable Sounds"
 msgstr "音を有効にする"
 
+#: src/gtkconv.c:3179
+msgid "/Options/Show Formatting Toolbar"
+msgstr ""
+
 #. From right to left...
 #. Send button
-#: src/gtkconv.c:2997 src/gtkconv.c:2999 src/gtkconv.c:3097 src/gtkconv.c:3099
-#: src/gtkconv.c:5958
+#: src/gtkconv.c:3202 src/gtkconv.c:3204 src/gtkconv.c:3302 src/gtkconv.c:3304
 msgid "Send"
 msgstr "送信"
 
-#: src/gtkconv.c:3020 src/gtkconv.c:4194
-msgid "Add the user to your buddy list"
-msgstr "仲間リストユーザを追加する"
-
-#: src/gtkconv.c:3026 src/gtkconv.c:4179
-msgid "Remove the user from your buddy list"
-msgstr "仲間リストからユーザを削除する"
-
+#. Now, um, just kind of all over the place. Huh?
 #. Warn button
-#: src/gtkconv.c:3033
+#: src/gtkconv.c:3218
 msgid "Warn"
 msgstr "警告"
 
-#: src/gtkconv.c:3037
+#: src/gtkconv.c:3221
 msgid "Warn the user"
 msgstr "ユーザに警告する"
 
-#: src/gtkconv.c:3044 src/gtkconv.c:3479
-msgid "Get the user's information"
-msgstr "ユーザの情報を取得する"
-
 #. Block button
-#: src/gtkconv.c:3047 src/gtkprivacy.c:605 src/gtkprivacy.c:616
+#: src/gtkconv.c:3225 src/gtkprivacy.c:606 src/gtkprivacy.c:617
 msgid "Block"
 msgstr "拒む"
 
-#: src/gtkconv.c:3051
+#: src/gtkconv.c:3228
 msgid "Block the user"
 msgstr "ユーザを拒否する"
 
+#: src/gtkconv.c:3235
+msgid "Add the user to your buddy list"
+msgstr "仲間リストユーザを追加する"
+
+#: src/gtkconv.c:3242
+msgid "Remove the user from your buddy list"
+msgstr "仲間リストからユーザを削除する"
+
+#: src/gtkconv.c:3249 src/gtkconv.c:3747
+msgid "Get the user's information"
+msgstr "ユーザの情報を取得する"
+
 #. Invite
-#: src/gtkconv.c:3109 src/gtkconv.c:5961
+#: src/gtkconv.c:3316
 msgid "Invite"
 msgstr "招待"
 
-#: src/gtkconv.c:3112
+#: src/gtkconv.c:3319
 msgid "Invite a user"
 msgstr "ユーザを招待"
 
-#: src/gtkconv.c:3151
+#: src/gtkconv.c:3326
+msgid "Add the chat to your buddy list"
+msgstr "仲間リストチャットを追加する"
+
+#: src/gtkconv.c:3333
+msgid "Remove the chat from your buddy list"
+msgstr "仲間リストからチャットを削除する"
+
+#: src/gtkconv.c:3389
 msgid "Bold"
 msgstr "ボールド"
 
-#: src/gtkconv.c:3162
+#: src/gtkconv.c:3400
 msgid "Italic"
 msgstr "イタリック"
 
-#: src/gtkconv.c:3173
+#: src/gtkconv.c:3411
 msgid "Underline"
 msgstr "下線"
 
-#: src/gtkconv.c:3189
+#: src/gtkconv.c:3427
 msgid "Larger font size"
 msgstr "フォントサイズを大きく"
 
-#: src/gtkconv.c:3201
+#: src/gtkconv.c:3439
 msgid "Normal font size"
 msgstr "フォントサイズを通常サイズに"
 
-#: src/gtkconv.c:3213
+#: src/gtkconv.c:3451
 msgid "Smaller font size"
 msgstr "フォントサイズを小さく"
 
-#: src/gtkconv.c:3230
+#: src/gtkconv.c:3468
 msgid "Font Face"
 msgstr "フォント"
 
-#: src/gtkconv.c:3242
+#: src/gtkconv.c:3480
 msgid "Foreground font color"
 msgstr "前景色"
 
-#: src/gtkconv.c:3254
+#: src/gtkconv.c:3492
 msgid "Background color"
 msgstr "背景色"
 
-#: src/gtkconv.c:3269
+#: src/gtkconv.c:3507
+msgid "Insert link"
+msgstr "リンクの挿入"
+
+#: src/gtkconv.c:3518
 msgid "Insert image"
 msgstr "画像の挿入"
 
-#: src/gtkconv.c:3280
-msgid "Insert link"
-msgstr "リンクの挿入"
-
-#: src/gtkconv.c:3291
+#: src/gtkconv.c:3529
 msgid "Insert smiley"
 msgstr "顔文字の挿入"
 
-#: src/gtkconv.c:3348
+#: src/gtkconv.c:3614
 msgid "Topic:"
 msgstr "トピック:"
 
 #. Setup the label telling how many people are in the room.
-#: src/gtkconv.c:3399
+#: src/gtkconv.c:3671
 msgid "0 people in room"
 msgstr "誰もいません"
 
-#: src/gtkconv.c:3456
+#: src/gtkconv.c:3724
 msgid "IM the user"
 msgstr "ユーザにIMを送信"
 
-#: src/gtkconv.c:3468
+#: src/gtkconv.c:3736
 msgid "Ignore the user"
 msgstr "ユーザを無視する"
 
-#: src/gtkconv.c:3962 src/server.c:1380
-#, c-format
-msgid "<HR><BR><H3 Align=Center> ---- New Conversation @ %s ----</H3><BR>\n"
-msgstr ""
-
-#: src/gtkconv.c:3966 src/server.c:1383
-#, fuzzy, c-format
-msgid "---- New Conversation @ %s ----\n"
-msgstr "%s との会話"
-
-#: src/gtkconv.c:3999
+#: src/gtkconv.c:4284
 msgid "Close conversation"
 msgstr "会話を閉じる"
 
-#: src/gtkconv.c:4683 src/gtkconv.c:4715 src/gtkconv.c:4836 src/gtkconv.c:4903
+#: src/gtkconv.c:4808 src/gtkconv.c:4840 src/gtkconv.c:4961 src/gtkconv.c:5028
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "%d人部屋にいます"
 msgstr[1] "%d人部屋にいます"
 
-#: src/gtkconv.c:5225
-msgid "Disable Animation"
-msgstr "アニメーション無効化"
-
-#: src/gtkconv.c:5234
-msgid "Enable Animation"
-msgstr "アニメーション有効化"
-
-#: src/gtkconv.c:5241
+#: src/gtkconv.c:5360
+msgid "Animate"
+msgstr ""
+
+#: src/gtkconv.c:5365
 msgid "Hide Icon"
 msgstr "隠れアイコン"
 
-#: src/gtkconv.c:5247
+#: src/gtkconv.c:5371
 msgid "Save Icon As..."
-msgstr "名前を付けてアイコンを保存"
-
-#: src/gtkconv.c:5728 src/gtkconv.c:5731
+msgstr "名前を付けてアイコンを保存..."
+
+#: src/gtkconv.c:5767 src/gtkconv.c:5770
 #, fuzzy
 msgid "<main>/Conversation/Close"
 msgstr "閉じる"
@@ -2741,121 +2820,131 @@
 msgid "Timestamps"
 msgstr "タイムスタンプ"
 
-#: src/gtkft.c:126
+#: src/gtkft.c:133
 #, c-format
 msgid "%.2f KB/s"
 msgstr "%.2f KB/s"
 
-#: src/gtkft.c:200
+#: src/gtkft.c:207
 msgid "<b>Receiving From:</b>"
 msgstr "<b>受信:</b>"
 
-#: src/gtkft.c:203
+#: src/gtkft.c:210
 msgid "<b>Sending To:</b>"
 msgstr "<b>送信先:</b>"
 
-#: src/gtkft.c:436
+#: src/gtkft.c:458
 msgid "Progress"
 msgstr "進展"
 
-#: src/gtkft.c:443
+#: src/gtkft.c:465
 msgid "Filename"
 msgstr "ファイル名"
 
-#: src/gtkft.c:450
+#: src/gtkft.c:472
 msgid "Size"
 msgstr "大きさ"
 
-#: src/gtkft.c:457
+#: src/gtkft.c:479
 msgid "Remaining"
 msgstr "残り"
 
-#: src/gtkft.c:487
+#: src/gtkft.c:509
 msgid "Filename:"
 msgstr "ファイル名:"
 
-#: src/gtkft.c:488
+#: src/gtkft.c:510
 msgid "Status:"
 msgstr "状態:"
 
-#: src/gtkft.c:489
+#: src/gtkft.c:511
 msgid "Speed:"
 msgstr "速度:"
 
-#: src/gtkft.c:490
+#: src/gtkft.c:512
 msgid "Time Elapsed:"
 msgstr "経過時間:"
 
-#: src/gtkft.c:491
+#: src/gtkft.c:513
 msgid "Time Remaining:"
 msgstr "残り時間:"
 
-#: src/gtkft.c:588
+#: src/gtkft.c:610
 msgid "_Keep the dialog open"
 msgstr "ダイアログボックスをひらいたままにする (_K)"
 
-#: src/gtkft.c:598
+#: src/gtkft.c:620
 msgid "_Clear finished transfers"
 msgstr "終了した転送を消す (_C)"
 
 #. "Download Details" arrow
-#: src/gtkft.c:607
-msgid "Show download details"
-msgstr "ダウンロードの詳細を表示"
-
-#: src/gtkft.c:608
-msgid "Hide download details"
-msgstr "ダウンロードの詳細を隠す"
+#: src/gtkft.c:629
+msgid "Show transfer details"
+msgstr "転送の詳細を表示"
+
+#: src/gtkft.c:630
+msgid "Hide transfer details"
+msgstr "転送の詳細を隠す"
 
 #. Pause button
-#: src/gtkft.c:650 src/stock.c:86
+#: src/gtkft.c:672 src/stock.c:85
 msgid "_Pause"
 msgstr "一時停止 (_P)"
 
 #. Resume button
-#: src/gtkft.c:660
+#: src/gtkft.c:682
 msgid "_Resume"
 msgstr "リジューム (_R)"
 
-#: src/gtkft.c:1011
+#: src/gtkft.c:882
+#, fuzzy
+msgid "Canceled"
+msgstr "取消"
+
+#: src/gtkft.c:884
+#, fuzzy
+msgid "Failed"
+msgstr "失敗"
+
+#: src/gtkft.c:1053
 msgid "That file does not exist."
 msgstr "そのファイルは存在しません."
 
-#: src/gtkft.c:1020
+#: src/gtkft.c:1062
 msgid "Cannot send a file of 0 bytes."
 msgstr "0バイトのファイルを送信できません"
 
-#: src/gtkft.c:1033
+#: src/gtkft.c:1075
 msgid "That file already exists."
 msgstr "そのファイルはすでに存在します."
 
-#: src/gtkft.c:1058
-msgid "Gaim - Open..."
-msgstr "Gaim - 開く..."
-
-#: src/gtkft.c:1060 src/protocols/toc/toc.c:2041
-msgid "Gaim - Save As..."
-msgstr "Gaim - 名前を付けて保存..."
-
-#: src/gtkft.c:1107
+#: src/gtkft.c:1100
+msgid "Open..."
+msgstr "開く..."
+
+#: src/gtkft.c:1102
+msgid "Save As..."
+msgstr "名前を付けて保存..."
+
+#: src/gtkft.c:1149
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "%s は %s (%s) を送信したがっています"
 
-#: src/gtkimhtml.c:535
+#: src/gtkimhtml.c:614
 msgid "_Copy E-Mail Address"
 msgstr "メールアドレスをコピーする (_C)"
 
-#: src/gtkimhtml.c:547
+#: src/gtkimhtml.c:626
 msgid "_Copy Link Location"
 msgstr "リンクの場所をコピーする (_C)"
 
-#: src/gtkimhtml.c:557
+#: src/gtkimhtml.c:636
 msgid "_Open Link in Browser"
 msgstr "リンクをブラウザで開く (_O)"
 
 # NOTE cf. 0.62
-#: src/gtkimhtml.c:1639
+#: src/gtkimhtml.c:1752
 msgid ""
 "Unable to guess the image type based on the file extension supplied.  "
 "Defaulting to PNG."
@@ -2864,37 +2953,43 @@
 "デフォルトとしてPNGとして扱います."
 
 # FIXME This looks wrong
-#: src/gtkimhtml.c:1647
+#: src/gtkimhtml.c:1760
 #, c-format
 msgid "Error saving image: %s"
 msgstr "保存エラー,画像: %s"
 
-#: src/gtkimhtml.c:1656
+#: src/gtkimhtml.c:1769
 msgid "Save Image"
 msgstr "画像を保存"
 
-#: src/gtkimhtml.c:1679
+#: src/gtkimhtml.c:1792
 msgid "_Save Image..."
 msgstr "画像を保存 (_S)..."
 
-#: src/gtknotify.c:209
+# XXX This is untranslatable. Pathetic...
+#: src/gtklog.c:255
+#, fuzzy
+msgid "Conversations with"
+msgstr "%s との会話"
+
+#: src/gtknotify.c:211
 #, 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:217
+#: src/gtknotify.c:219
 #, c-format
 msgid "<span weight=\"bold\">From:</span> %s\n"
 msgstr "<span weight=\"bold\">送信元:</span> %s\n"
 
-#: src/gtknotify.c:222
+#: src/gtknotify.c:224
 #, c-format
 msgid "<span weight=\"bold\">Subject:</span> %s\n"
 msgstr "<span weight=\"bold\">タイトル:</span> %s\n"
 
-#: src/gtknotify.c:226
+#: src/gtknotify.c:228
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
@@ -2905,7 +3000,7 @@
 "\n"
 "%s%s%s%s"
 
-#: src/gtknotify.c:241
+#: src/gtknotify.c:243
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
@@ -2916,11 +3011,11 @@
 "\n"
 "%s"
 
-#: src/gtknotify.c:412 src/gtknotify.c:432 src/gtknotify.c:440
+#: src/gtknotify.c:430 src/gtknotify.c:450 src/gtknotify.c:458
 msgid "Unable to open URL"
 msgstr ""
 
-#: src/gtknotify.c:413
+#: src/gtknotify.c:431
 #, fuzzy
 msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
@@ -2928,12 +3023,12 @@
 "マニュアルブラウザ命令が指定されているのですが,コマンドが指定されていないた"
 "め,ブラウザを起動することができません."
 
-#: src/gtknotify.c:430
+#: src/gtknotify.c:448
 #, fuzzy, c-format
 msgid "The browser \"%s\" is invalid."
 msgstr "新しいフォーマットは不正です."
 
-#: src/gtknotify.c:437
+#: src/gtknotify.c:455
 #, fuzzy, c-format
 msgid "Error launching \"command\": %s"
 msgstr "保存エラー,画像: %s"
@@ -2947,147 +3042,147 @@
 msgstr "掴みかかる仲間をいれてください"
 
 #. "New Buddy Pounce"
-#: src/gtkpounce.c:383 src/gtkpounce.c:788
+#: src/gtkpounce.c:333 src/gtkpounce.c:738
 msgid "New Buddy Pounce"
 msgstr "新しい仲間を掴む"
 
-#: src/gtkpounce.c:383
+#: src/gtkpounce.c:333
 msgid "Edit Buddy Pounce"
 msgstr "掴む仲間を編集"
 
 #. Create the "Pounce Who" frame.
-#: src/gtkpounce.c:401
+#: src/gtkpounce.c:351
 msgid "Pounce Who"
 msgstr "誰を掴む"
 
-#: src/gtkpounce.c:427
+#: src/gtkpounce.c:377
 msgid "_Buddy Name:"
 msgstr "仲間名 (_B):"
 
 #. Create the "Pounce When" frame.
-#: src/gtkpounce.c:449
+#: src/gtkpounce.c:399
 msgid "Pounce When"
 msgstr "いつつかみかかる"
 
-#: src/gtkpounce.c:457 src/main.c:339
+#: src/gtkpounce.c:407 src/main.c:336
 msgid "Sign on"
 msgstr "サインオン"
 
-#: src/gtkpounce.c:459
+#: src/gtkpounce.c:409
 msgid "Sign off"
 msgstr "サインオフ"
 
-#: src/gtkpounce.c:463
+#: src/gtkpounce.c:413
 msgid "Return from away"
 msgstr "離席から戻った時"
 
-#: src/gtkpounce.c:465 src/gtkprefs.c:1498 src/protocols/msn/state.c:30
-#: src/protocols/yahoo/yahoo.c:2028
+#: src/gtkpounce.c:415 src/gtkprefs.c:1482 src/protocols/msn/state.c:30
+#: src/protocols/yahoo/yahoo.c:2189
 msgid "Idle"
 msgstr "休止中"
 
-#: src/gtkpounce.c:467
+#: src/gtkpounce.c:417
 msgid "Return from idle"
 msgstr "休止から戻った時"
 
-#: src/gtkpounce.c:469
+#: src/gtkpounce.c:419
 msgid "Buddy starts typing"
 msgstr "仲間がタイプしはじめたとき"
 
-#: src/gtkpounce.c:471
+#: src/gtkpounce.c:421
 msgid "Buddy stops typing"
 msgstr "仲間がタイピングを止めた時"
 
 #. Create the "Pounce Action" frame.
-#: src/gtkpounce.c:500
+#: src/gtkpounce.c:450
 msgid "Pounce Action"
 msgstr "掴み設定"
 
-#: src/gtkpounce.c:507
+#: src/gtkpounce.c:457
 msgid "Open an IM window"
 msgstr "IMウィンドウを開く"
 
-#: src/gtkpounce.c:508
+#: src/gtkpounce.c:458
 msgid "Popup notification"
 msgstr "ポップアップ通知"
 
-#: src/gtkpounce.c:509
+#: src/gtkpounce.c:459
 msgid "Send a message"
 msgstr "メッセージ送信"
 
-#: src/gtkpounce.c:510
+#: src/gtkpounce.c:460
 msgid "Execute a command"
 msgstr "コマンドの実行"
 
-#: src/gtkpounce.c:511
+#: src/gtkpounce.c:461
 msgid "Play a sound"
 msgstr "音を再生"
 
-#: src/gtkpounce.c:515 src/gtkpounce.c:517
+#: src/gtkpounce.c:465 src/gtkpounce.c:467
 msgid "Browse"
 msgstr "閲覧"
 
-#: src/gtkpounce.c:518 src/gtkprefs.c:2087
+#: src/gtkpounce.c:468 src/gtkprefs.c:2072
 msgid "Test"
 msgstr "テスト"
 
-#: src/gtkpounce.c:601
+#: src/gtkpounce.c:551
 msgid "_Save this pounce after activation"
 msgstr "活性化後の掴みの保存 (_S)"
 
 #. "Remove Buddy Pounce"
-#: src/gtkpounce.c:795
+#: src/gtkpounce.c:745
 msgid "Remove Buddy Pounce"
 msgstr "掴んだ仲間の削除"
 
-#: src/gtkpounce.c:836
+#: src/gtkpounce.c:792
 #, c-format
 msgid "%s has started typing to you"
 msgstr "%s はタイピングを開始しました"
 
-#: src/gtkpounce.c:837
+#: src/gtkpounce.c:793
 #, c-format
 msgid "%s has signed on"
 msgstr "%s はサインオンしました"
 
-#: src/gtkpounce.c:838
+#: src/gtkpounce.c:794
 #, c-format
 msgid "%s has returned from being idle"
 msgstr "%s はアイドルからもどってきました"
 
-#: src/gtkpounce.c:839
+#: src/gtkpounce.c:795
 #, c-format
 msgid "%s has returned from being away"
 msgstr "%s はアイドルからもどってきました"
 
-#: src/gtkpounce.c:840
+#: src/gtkpounce.c:796
 #, c-format
 msgid "%s has stopped typing to you"
 msgstr "%sはタイピングを終了しました"
 
-#: src/gtkpounce.c:841
+#: src/gtkpounce.c:797
 #, c-format
 msgid "%s has signed off"
 msgstr "%s はサインオフしました"
 
-#: src/gtkpounce.c:842
+#: src/gtkpounce.c:798
 #, c-format
 msgid "%s has become idle"
 msgstr "%s はアイドルになりました"
 
-#: src/gtkpounce.c:844
+#: src/gtkpounce.c:800
 msgid "Unknown pounce event. Please report this!"
 msgstr "不明な掴みイベントです.ぜひ報告してください!"
 
-#: src/gtkprefs.c:373
+#: src/gtkprefs.c:365
 msgid "Interface Options"
 msgstr "インターフェースオプション"
 
-#: src/gtkprefs.c:375
+#: src/gtkprefs.c:367
 msgid "D_isplay remote nicknames if no alias is set"
 msgstr "エイリアスがセットされていない場合リモートニックネームを表示する (_I)"
 
-#: src/gtkprefs.c:561
+#: src/gtkprefs.c:553
 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."
@@ -3095,448 +3190,431 @@
 "利用したい顔文字を以下のリストから選択してください.新しいテーマはテーマ一覧"
 "にドラッグアンドドロップすることにより追加できます."
 
-#: src/gtkprefs.c:594
+#: src/gtkprefs.c:588
 msgid "Icon"
 msgstr "アイコン"
 
-#: src/gtkprefs.c:668
+#: src/gtkprefs.c:595 src/gtkprefs.c:1794 src/protocols/jabber/buddy.c:263
+#: src/protocols/jabber/buddy.c:748
+msgid "Description"
+msgstr "概要"
+
+#: src/gtkprefs.c:662
 msgid "Style"
 msgstr "スタイル"
 
-#: src/gtkprefs.c:669
+#: src/gtkprefs.c:663
 msgid "_Bold"
 msgstr "ボールド (_B)"
 
-#: src/gtkprefs.c:671
+#: src/gtkprefs.c:665
 msgid "_Italics"
 msgstr "イタリック (_I)"
 
-#: src/gtkprefs.c:673
+#: src/gtkprefs.c:667
 msgid "_Underline"
 msgstr "下線 (_U)"
 
-#: src/gtkprefs.c:675
+#: src/gtkprefs.c:669
 msgid "_Strikethrough"
 msgstr "打ち消し (_S)"
 
-#: src/gtkprefs.c:678
+# FIXME this is completely wrong
+#: src/gtkprefs.c:672
+#, fuzzy
 msgid "Face"
 msgstr "顔文字"
 
-#: src/gtkprefs.c:681
+# FIXME this is completely wrong
+#: src/gtkprefs.c:675
+#, fuzzy
 msgid "Use custo_m face"
 msgstr "独自の顔文字を使う (_M)"
 
-#: src/gtkprefs.c:698
+#: src/gtkprefs.c:692
 msgid "Use custom si_ze"
 msgstr "独自のサイズを使う (_Z)"
 
-#: src/gtkprefs.c:711
+#: src/gtkprefs.c:704
 msgid "Color"
 msgstr "色"
 
-#: src/gtkprefs.c:715
+#: src/gtkprefs.c:708
 msgid "_Text color"
 msgstr "文字色 (_T)"
 
-#: src/gtkprefs.c:734
+#: src/gtkprefs.c:727
 msgid "Bac_kground color"
 msgstr "背景色 (_K)"
 
-#: src/gtkprefs.c:762 src/gtkprefs.c:1003 src/gtkprefs.c:1056
+#: src/gtkprefs.c:755 src/gtkprefs.c:987 src/gtkprefs.c:1035
 msgid "Display"
 msgstr "表示"
 
-#: src/gtkprefs.c:763
+#: src/gtkprefs.c:756
 msgid "Show graphical _smileys"
 msgstr "画像の顔文字を表示する (_S)"
 
-#: src/gtkprefs.c:765
+#: src/gtkprefs.c:758
 msgid "Show _timestamp on messages"
 msgstr "メッセージのタイムスタンプを表示する (_T)"
 
-#: src/gtkprefs.c:767
+#: src/gtkprefs.c:760
 msgid "Show _URLs as links"
 msgstr "リンクとして URL を表示する (_U)"
 
-#: src/gtkprefs.c:771
+#: src/gtkprefs.c:764
 msgid "_Highlight misspelled words"
 msgstr "ミススペルをハイライトする (_H)"
 
-#: src/gtkprefs.c:775
+#: src/gtkprefs.c:768
 msgid "Ignore c_olors"
 msgstr "色を無視する (_O)"
 
-#: src/gtkprefs.c:777
+#: src/gtkprefs.c:770
 msgid "Ignore font _faces"
 msgstr "フォントを無視する (_F)"
 
-#: src/gtkprefs.c:779
+#: src/gtkprefs.c:772
 msgid "Ignore font si_zes"
 msgstr "フォントサイズを無視する (_Z)"
 
+#: src/gtkprefs.c:785
+msgid "Send Message"
+msgstr "メッセージ送信"
+
+#: src/gtkprefs.c:786
+msgid "Enter _sends message"
+msgstr "「Enter」でメッセージを送信する (_S)"
+
+#: src/gtkprefs.c:788
+msgid "C_ontrol-Enter sends message"
+msgstr "「Control-Enter」でメッセージを送信する (_O)"
+
+#: src/gtkprefs.c:791
+msgid "Window Closing"
+msgstr "ウィンドウを閉じる"
+
 #: src/gtkprefs.c:792
-msgid "Send Message"
-msgstr "メッセージ送信"
-
-#: src/gtkprefs.c:793
-msgid "Enter _sends message"
-msgstr "「Enter」でメッセージを送信する (_S)"
+msgid "_Escape closes window"
+msgstr "「Escape」でウィンドウを閉じる (_E)"
 
 #: src/gtkprefs.c:795
-msgid "C_ontrol-Enter sends message"
-msgstr "「Control-Enter」でメッセージを送信する (_O)"
-
-#: src/gtkprefs.c:798
-msgid "Window Closing"
-msgstr "ウィンドウを閉じる"
-
-#: src/gtkprefs.c:799
-msgid "_Escape closes window"
-msgstr "「Escape」でウィンドウを閉じる (_E)"
-
-#: src/gtkprefs.c:802
 msgid "Insertions"
 msgstr "挿入"
 
-#: src/gtkprefs.c:803
+#: src/gtkprefs.c:796
 msgid "Control-{B/I/U} inserts _HTML tags"
 msgstr "「Control-{B/I/U}」で HTML タグを挿入する (_H)"
 
-#: src/gtkprefs.c:805
+#: src/gtkprefs.c:798
 msgid "Control-(number) _inserts smileys"
 msgstr "「Control-(number)」で顔文字を挿入する (_I)"
 
-#: src/gtkprefs.c:822
+#: src/gtkprefs.c:814
 msgid "Buddy List Sorting"
 msgstr "仲間リストのソート"
 
-#: src/gtkprefs.c:831
+#: src/gtkprefs.c:823
 msgid "Sorting:"
 msgstr "ソート:"
 
-#: src/gtkprefs.c:836
+#: src/gtkprefs.c:828
 msgid "Buddy List Toolbar"
 msgstr "仲間リストツールバー"
 
-#: src/gtkprefs.c:837 src/gtkprefs.c:973 src/gtkprefs.c:1029
+#: src/gtkprefs.c:829 src/gtkprefs.c:960 src/gtkprefs.c:1011
 msgid "Show _buttons as:"
 msgstr "ボタンの表示 (_B):"
 
-#: src/gtkprefs.c:839 src/gtkprefs.c:975 src/gtkprefs.c:1031
+#: src/gtkprefs.c:831 src/gtkprefs.c:962 src/gtkprefs.c:1013
 msgid "Pictures"
 msgstr "画像"
 
-#: src/gtkprefs.c:840 src/gtkprefs.c:976 src/gtkprefs.c:1032
+#: src/gtkprefs.c:832 src/gtkprefs.c:963 src/gtkprefs.c:1014
 msgid "Text"
 msgstr "テキスト"
 
-#: src/gtkprefs.c:841 src/gtkprefs.c:977 src/gtkprefs.c:1033
+#: src/gtkprefs.c:833 src/gtkprefs.c:964 src/gtkprefs.c:1015
 msgid "Pictures and text"
 msgstr "画像とテキスト"
 
-#: src/gtkprefs.c:846 src/gtkprefs.c:991 src/gtkprefs.c:1047
+#: src/gtkprefs.c:838 src/gtkprefs.c:975 src/gtkprefs.c:1026
 msgid "_Raise window on events"
 msgstr "イベント発生でウィンドウをアクティブにする (_R)"
 
-#: src/gtkprefs.c:849
+#: src/gtkprefs.c:841
 msgid "Group Display"
 msgstr "グループの表示"
 
-#: src/gtkprefs.c:850
+#: src/gtkprefs.c:842
 msgid "Show _numbers in groups"
 msgstr "グループの数を表示する (_N)"
 
-#: src/gtkprefs.c:853
+#: src/gtkprefs.c:845
 msgid "Buddy Display"
 msgstr "仲間の表示"
 
-#: src/gtkprefs.c:854 src/gtkprefs.c:998
+#: src/gtkprefs.c:846 src/gtkprefs.c:982
 msgid "Show buddy _icons"
 msgstr "仲間アイコンを表示する (_i)"
 
-#: src/gtkprefs.c:856
+#: src/gtkprefs.c:848
 msgid "Show _warning levels"
 msgstr "警告レベルを表示する (_w)"
 
-#: src/gtkprefs.c:859
+#: src/gtkprefs.c:850
 msgid "Show idle _times"
 msgstr "反応がない時間を表示する (_T)"
 
-#: src/gtkprefs.c:873
+#: src/gtkprefs.c:852
 msgid "Dim i_dle buddies"
 msgstr "反応のない仲間は暗く表示する (_D)"
 
-#: src/gtkprefs.c:898
+#: src/gtkprefs.c:854
+msgid "_Automatically expand contacts"
+msgstr ""
+
+#: src/gtkprefs.c:879
 msgid "_Placement:"
 msgstr "位置 (_P):"
 
-#: src/gtkprefs.c:905
+#: src/gtkprefs.c:886
 msgid "Send _URLs as Links"
 msgstr "リンクとして URL を送信する (_U)"
 
+#: src/gtkprefs.c:889
+msgid "Show Formatting Toolbar"
+msgstr ""
+
+#: src/gtkprefs.c:892
+msgid "Show a_liases in tabs/titles"
+msgstr "タブ/題名でエイリアスを表示する (_L)"
+
+#: src/gtkprefs.c:895
+msgid "Tab Options"
+msgstr "タブオプション"
+
+#: src/gtkprefs.c:897
+msgid "_Tab Placement:"
+msgstr "タブの位置 (_T):"
+
+#: src/gtkprefs.c:899
+msgid "Top"
+msgstr "上"
+
+#: src/gtkprefs.c:900
+msgid "Bottom"
+msgstr "下"
+
+#: src/gtkprefs.c:901
+msgid "Left"
+msgstr "左"
+
+#: src/gtkprefs.c:902
+msgid "Right"
+msgstr "右"
+
 #: src/gtkprefs.c:908
-msgid "Tab Options"
-msgstr "タブオプション"
-
-#: src/gtkprefs.c:910
-msgid "_Tab Placement:"
-msgstr "タブの位置 (_T):"
-
-#: src/gtkprefs.c:912
-msgid "Top"
-msgstr "上"
-
-#: src/gtkprefs.c:913
-msgid "Bottom"
-msgstr "下"
-
-#: src/gtkprefs.c:914
-msgid "Left"
-msgstr "左"
-
-#: src/gtkprefs.c:915
-msgid "Right"
-msgstr "右"
-
-#: src/gtkprefs.c:921
 #, fuzzy
 msgid "Show IMs and chats in _tabbed windows"
 msgstr "IM とチャットを同じタブウィンドウで表示する (_S)"
 
-#: src/gtkprefs.c:924
+#: src/gtkprefs.c:911
 #, fuzzy
 msgid "Show IMs and chats in _same tabbed window"
 msgstr "IM とチャットを同じタブウィンドウで表示する (_S)"
 
-#: src/gtkprefs.c:934
+#: src/gtkprefs.c:921
 msgid "Show _close button on tabs"
 msgstr "タブに閉じるボタンを表示する (_C)"
 
-#: src/gtkprefs.c:945
+#: src/gtkprefs.c:932
 #, fuzzy
 msgid "Show status _icons on tabs"
 msgstr "タブに閉じるボタンを表示する (_C)"
 
-#: src/gtkprefs.c:972 src/gtkprefs.c:1028
+#: src/gtkprefs.c:959 src/gtkprefs.c:1010
 msgid "Window"
 msgstr "ウィンドウ"
 
-#: src/gtkprefs.c:982 src/gtkprefs.c:1038
+#: src/gtkprefs.c:969 src/gtkprefs.c:1020
 msgid "New window _width:"
 msgstr "新しいウィンドウの幅 (_W):"
 
-#: src/gtkprefs.c:985 src/gtkprefs.c:1041
+#: src/gtkprefs.c:971 src/gtkprefs.c:1022
 msgid "New window _height:"
 msgstr "新しいウィンドウの高さ (_H):"
 
-#: src/gtkprefs.c:988 src/gtkprefs.c:1044
+#: src/gtkprefs.c:973 src/gtkprefs.c:1024
 msgid "_Entry field height:"
 msgstr "入力フィールドの高さ (_E):"
 
-#: src/gtkprefs.c:993
+#: src/gtkprefs.c:977
 msgid "Hide window on _send"
 msgstr "送信時にウィンドウを隠す (_S)"
 
-#: src/gtkprefs.c:997
+#: src/gtkprefs.c:981
 msgid "Buddy Icons"
 msgstr "仲間アイコン"
 
-#: src/gtkprefs.c:1000
+#: src/gtkprefs.c:984
 #, fuzzy
 msgid "Enable buddy icon a_nimation"
 msgstr "仲間アイコンのアニメーションを無効にする (_N)"
 
-#: src/gtkprefs.c:1004
+#: src/gtkprefs.c:988
 msgid "Show _logins in window"
 msgstr "ウィンドウでログインを表示する (_L)"
 
-#: src/gtkprefs.c:1006
-msgid "Show a_liases in tabs/titles"
-msgstr "タブ/題名でエイリアスを表示する (_L)"
-
-#: src/gtkprefs.c:1009
+#: src/gtkprefs.c:991
 msgid "Typing Notification"
 msgstr "タイピング通知"
 
-#: src/gtkprefs.c:1010
+#: src/gtkprefs.c:992
 msgid "Notify buddies that you are _typing to them"
 msgstr "メッセージ入力中であることを仲間に通知する (_T)"
 
-#: src/gtkprefs.c:1050
+#: src/gtkprefs.c:1029
 msgid "Tab Completion"
 msgstr "タブ補完"
 
-#: src/gtkprefs.c:1051
+#: src/gtkprefs.c:1030
 msgid "_Tab-complete nicks"
 msgstr "ニックネームをタブ補完する (_T)"
 
-#: src/gtkprefs.c:1053
+#: src/gtkprefs.c:1032
 msgid "_Old-style tab completion"
 msgstr "古いスタイルのタブ補完 (_O)"
 
-#: src/gtkprefs.c:1057
+#: src/gtkprefs.c:1036
 msgid "_Show people joining in window"
 msgstr "加入をウィンドウで表示 (_S)"
 
-#: src/gtkprefs.c:1059
+#: src/gtkprefs.c:1038
 msgid "_Show people leaving in window"
 msgstr "離席をウィンドウで表示 (_S)"
 
-#: src/gtkprefs.c:1061
+#: src/gtkprefs.c:1040
 msgid "Co_lorize screennames"
 msgstr "スクリーン名をカラーにする (_L)"
 
-#: src/gtkprefs.c:1105
+#: src/gtkprefs.c:1084
 msgid "Proxy Type"
 msgstr "プロキシの種類"
 
-#: src/gtkprefs.c:1108
+#: src/gtkprefs.c:1087
 msgid "No proxy"
 msgstr "プロキシなし"
 
-#: src/gtkprefs.c:1115
+#: src/gtkprefs.c:1094
 msgid "Proxy Server"
 msgstr "プロキシサーバ"
 
-#: src/gtkprefs.c:1136
-msgid "_Host"
-msgstr "ホスト名 (_H)"
-
-#: src/gtkprefs.c:1153 src/protocols/irc/irc.c:551
-#: src/protocols/jabber/jabber.c:1087 src/protocols/msn/msn.c:1617
-#: src/protocols/napster/napster.c:642 src/protocols/trepia/trepia.c:1335
-msgid "Port"
-msgstr "ポート番号"
-
-#: src/gtkprefs.c:1171
-msgid "_User"
+#: src/gtkprefs.c:1150
+msgid "_User:"
 msgstr "ユーザ名 (_U)"
 
-#: src/gtkprefs.c:1188
-msgid "Pa_ssword"
-msgstr "パスワード (_S)"
-
-#: src/gtkprefs.c:1225
+#: src/gtkprefs.c:1204
 msgid "Opera"
 msgstr "Opera"
 
-#: src/gtkprefs.c:1226
+#: src/gtkprefs.c:1205
 msgid "Netscape"
 msgstr "Netscape"
 
-#: src/gtkprefs.c:1227
+#: src/gtkprefs.c:1206
 msgid "Mozilla"
 msgstr "Mozilla"
 
-#: src/gtkprefs.c:1228
+#: src/gtkprefs.c:1207
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: src/gtkprefs.c:1229
+#: src/gtkprefs.c:1208
 msgid "Galeon"
 msgstr "Galeon"
 
-#: src/gtkprefs.c:1238
+#: src/gtkprefs.c:1209
+msgid "Firebird"
+msgstr "Firebird"
+
+#: src/gtkprefs.c:1218
 msgid "Manual"
 msgstr "手動設定"
 
-#: src/gtkprefs.c:1279
+#: src/gtkprefs.c:1259
 msgid "Browser Selection"
 msgstr "ブラウザの選択"
 
-#: src/gtkprefs.c:1283
+#: src/gtkprefs.c:1263
 msgid "_Browser:"
 msgstr "ブラウザ (_B):"
 
-#: src/gtkprefs.c:1293
+#: src/gtkprefs.c:1273
 #, c-format
 msgid ""
 "_Manual:\n"
 "(%s for URL)"
 msgstr ""
 
-#: src/gtkprefs.c:1314
+#: src/gtkprefs.c:1294
 msgid "Browser Options"
 msgstr "ブラウザオプション"
 
-#: src/gtkprefs.c:1315
+#: src/gtkprefs.c:1295
 msgid "Open new _window by default"
 msgstr "デフォルトで新しいウィンドウを開く (_W)"
 
-#: src/gtkprefs.c:1330
+#: src/gtkprefs.c:1311
 msgid "Message Logs"
 msgstr "メッセージログ"
 
-#: src/gtkprefs.c:1331
+#: src/gtkprefs.c:1314
+msgid "Log _Format:"
+msgstr ""
+
+#: src/gtkprefs.c:1317
 msgid "_Log all instant messages"
 msgstr "全てのインスタントメッセージを記録する (_L)"
 
-#: src/gtkprefs.c:1333
+#: src/gtkprefs.c:1319
 msgid "Log all c_hats"
 msgstr "全てのチャットを記録する (_H)"
 
-#: src/gtkprefs.c:1335
-msgid "Strip _HTML from logs"
-msgstr "ログから HTML を取り除く (_H)"
-
-#: src/gtkprefs.c:1338
-msgid "System Logs"
-msgstr "システムログ"
-
-#: src/gtkprefs.c:1339
-msgid "Log when buddies _sign on/sign off"
-msgstr "仲間がサインオン/オフしたときに記録する (_S)"
-
-#: src/gtkprefs.c:1341
-msgid "Log when buddies become _idle/un-idle"
-msgstr "仲間が休止/復帰したときに記録する (_I)"
-
-#: src/gtkprefs.c:1343
-msgid "Log when buddies go away/come _back"
-msgstr "仲間が離席/復席したときに記録する (_B)"
-
-#: src/gtkprefs.c:1345
-msgid "Log your _own signons/idleness/awayness"
-msgstr "自分のサインオン/休止/離席を記録する (_O)"
-
-#: src/gtkprefs.c:1347
-msgid "I_ndividual log file for each buddy's signons"
-msgstr "それぞれの仲間ごとにログファイルを分ける (_N)"
-
-#: src/gtkprefs.c:1390
+#: src/gtkprefs.c:1374
 msgid "Sound Options"
 msgstr "音声オプション"
 
-#: src/gtkprefs.c:1391
+#: src/gtkprefs.c:1375
 msgid "_No sounds when you log in"
 msgstr "ログインしたときに音を鳴らさない (_N)"
 
-#: src/gtkprefs.c:1393
+#: src/gtkprefs.c:1377
 msgid "_Sounds while away"
 msgstr "離席中にも音を鳴らす (_S)"
 
-#: src/gtkprefs.c:1397
+#: src/gtkprefs.c:1381
 msgid "Sound Method"
 msgstr "音声出力の方法"
 
-#: src/gtkprefs.c:1398
+#: src/gtkprefs.c:1382
 msgid "_Method:"
 msgstr "方法 (_M):"
 
-#: src/gtkprefs.c:1400
+#: src/gtkprefs.c:1384
 msgid "Console beep"
 msgstr "ビープ音"
 
-#: src/gtkprefs.c:1402
+#: src/gtkprefs.c:1386
 msgid "Automatic"
 msgstr "自動"
 
-#: src/gtkprefs.c:1409
+#: src/gtkprefs.c:1393
 msgid "Command"
 msgstr "コマンド"
 
-#: src/gtkprefs.c:1419
+#: src/gtkprefs.c:1403
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -3545,72 +3623,72 @@
 "音声出力コマンド (_O):\n"
 "(%s はファイル名になる)"
 
-#: src/gtkprefs.c:1474
+#: src/gtkprefs.c:1458
 msgid "_Sending messages removes away status"
 msgstr "メッセージを送信すると離席状態を解除する (_S)"
 
-#: src/gtkprefs.c:1476
+#: src/gtkprefs.c:1460
 msgid "_Queue new messages when away"
 msgstr "離席中の新規メッセージはキューする (_Q)"
 
-#: src/gtkprefs.c:1479
+#: src/gtkprefs.c:1463
 msgid "Auto-response"
 msgstr "自動返答"
 
-#: src/gtkprefs.c:1482
+#: src/gtkprefs.c:1466
 msgid "Seconds before _resending:"
 msgstr "再送までの時間 (_R):"
 
-#: src/gtkprefs.c:1485
+#: src/gtkprefs.c:1469
 #, fuzzy
 msgid "_Send auto-response"
 msgstr "自動返答を送らない (_D)"
 
-#: src/gtkprefs.c:1487
+#: src/gtkprefs.c:1471
 msgid "_Only send auto-response when idle"
 msgstr "休止中は自動返答のみ送信する (_O)"
 
-#: src/gtkprefs.c:1489
+#: src/gtkprefs.c:1473
 #, fuzzy
 msgid "Send auto-response in _active conversations"
 msgstr "進行中の会話では自動返答を送らない (_N)"
 
-#: src/gtkprefs.c:1499
+#: src/gtkprefs.c:1483
 msgid "Idle _time reporting:"
 msgstr "休止時間を報告する (_T):"
 
 # FIXME This looks wrong
-#: src/gtkprefs.c:1502
+#: src/gtkprefs.c:1486
 msgid "Gaim usage"
 msgstr "Gaim の利用法"
 
 # FIXME This looks wrong
-#: src/gtkprefs.c:1505
+#: src/gtkprefs.c:1489
 msgid "X usage"
 msgstr "X の利用法"
 
-# FIXME This looks wrong
-#: src/gtkprefs.c:1507
+# FIXME This still looks wrong
+#: src/gtkprefs.c:1491
 msgid "Windows usage"
-msgstr "ウィンドウの利用法"
-
-#: src/gtkprefs.c:1515
+msgstr "Windows の利用法"
+
+#: src/gtkprefs.c:1499
 msgid "Auto-away"
 msgstr "自動離席"
 
-#: src/gtkprefs.c:1516
+#: src/gtkprefs.c:1500
 msgid "Set away _when idle"
 msgstr "休止中は離席にする (_W)"
 
-#: src/gtkprefs.c:1518
+#: src/gtkprefs.c:1503
 msgid "_Minutes before setting away:"
 msgstr "何分で離席になるか (_M):"
 
-#: src/gtkprefs.c:1525
+#: src/gtkprefs.c:1509
 msgid "Away m_essage:"
 msgstr "離席メッセージ (_E):"
 
-#: src/gtkprefs.c:1587
+#: src/gtkprefs.c:1571
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -3625,7 +3703,7 @@
 "<span weight=\"bold\">URL:</span>         %s\n"
 "<span weight=\"bold\">ファイル名:</span>\t%s"
 
-#: src/gtkprefs.c:1592
+#: src/gtkprefs.c:1576
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -3640,97 +3718,97 @@
 "<span weight=\"bold\">URL:</span>  %s\n"
 "<span weight=\"bold\">ファイル名:</span>  %s"
 
-#: src/gtkprefs.c:1773
+#: src/gtkprefs.c:1758
 msgid "Load"
 msgstr "読み込み"
 
-#: src/gtkprefs.c:1780 src/protocols/jabber/jabber.c:544
-#: src/protocols/msn/msn.c:1303 src/protocols/trepia/trepia.c:392
+#: 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:1827
+#: src/gtkprefs.c:1812
 msgid "Details"
 msgstr "詳細"
 
-#: src/gtkprefs.c:1954
+#: src/gtkprefs.c:1939
 msgid "Sound Selection"
 msgstr "音声選択"
 
-#: src/gtkprefs.c:2061
+#: src/gtkprefs.c:2046
 msgid "Play"
 msgstr "再生"
 
-#: src/gtkprefs.c:2068
+#: src/gtkprefs.c:2053
 msgid "Event"
 msgstr "イベント"
 
-#: src/gtkprefs.c:2091
+#: src/gtkprefs.c:2076
 msgid "Reset"
 msgstr "リセット"
 
-#: src/gtkprefs.c:2095
+#: src/gtkprefs.c:2080
 msgid "Choose..."
 msgstr "選択..."
 
-#: src/gtkprefs.c:2229
+#: src/gtkprefs.c:2215
 msgid "_Edit"
 msgstr "編集 (_E)"
 
-#: src/gtkprefs.c:2265
+#: src/gtkprefs.c:2251
 msgid "Interface"
 msgstr "インターフェース"
 
-#: src/gtkprefs.c:2266
+#: src/gtkprefs.c:2252
 msgid "Smiley Themes"
 msgstr "顔文字のテーマ"
 
-#: src/gtkprefs.c:2267
+#: src/gtkprefs.c:2253
 msgid "Fonts"
 msgstr "フォント"
 
-#: src/gtkprefs.c:2268
+#: src/gtkprefs.c:2254
 msgid "Message Text"
 msgstr "メッセージテキスト"
 
-#: src/gtkprefs.c:2269
+#: src/gtkprefs.c:2255
 msgid "Shortcuts"
 msgstr "ショートカット"
 
-#: src/gtkprefs.c:2272
+#: src/gtkprefs.c:2258
 msgid "IMs"
 msgstr "IM"
 
-#: src/gtkprefs.c:2274
+#: src/gtkprefs.c:2260
 msgid "Proxy"
 msgstr "プロキシ"
 
 #. We use the registered default browser in windows
-#: src/gtkprefs.c:2277
+#: src/gtkprefs.c:2263
 msgid "Browser"
 msgstr "ブラウザ"
 
-#: src/gtkprefs.c:2279
+#: src/gtkprefs.c:2265
 msgid "Logging"
 msgstr "ログ"
 
-#: src/gtkprefs.c:2280
+#: src/gtkprefs.c:2266
 msgid "Sounds"
 msgstr "音声"
 
-#: src/gtkprefs.c:2281
+#: src/gtkprefs.c:2267
 msgid "Sound Events"
 msgstr "音声イベント"
 
-#: src/gtkprefs.c:2282
+#: src/gtkprefs.c:2268
 msgid "Away / Idle"
 msgstr "離席 / 休止中"
 
-#: src/gtkprefs.c:2283
+#: src/gtkprefs.c:2269
 msgid "Away Messages"
 msgstr "離席メッセージ"
 
-#: src/gtkprefs.c:2286
+#: src/gtkprefs.c:2272
 msgid "Plugins"
 msgstr "プラグイン"
 
@@ -3756,69 +3834,69 @@
 msgid "Block the users below"
 msgstr "以下のユーザのみ拒否する"
 
-#: src/gtkprivacy.c:368
+#: src/gtkprivacy.c:369
 msgid "Privacy"
 msgstr "個人情報"
 
-#: src/gtkprivacy.c:383
+#: src/gtkprivacy.c:384
 msgid "Changes to privacy settings take effect immediately."
 msgstr "個人情報の設定はすぐに反映されます。"
 
 #. "Set privacy for:" label
-#: src/gtkprivacy.c:395
+#: src/gtkprivacy.c:396
 msgid "Set privacy for:"
 msgstr "個人情報設定:"
 
-#: src/gtkprivacy.c:562 src/gtkprivacy.c:578
+#: src/gtkprivacy.c:563 src/gtkprivacy.c:579
 #, fuzzy
 msgid "Permit User"
 msgstr "許可"
 
-#: src/gtkprivacy.c:563
+#: src/gtkprivacy.c:564
 msgid "Type a user you permit to contact you."
 msgstr ""
 
-#: src/gtkprivacy.c:564
+#: src/gtkprivacy.c:565
 #, fuzzy
 msgid "Please enter the name of the user you wish to be able to contact you."
 msgstr ""
 "招待しようとしているユーザの名前を入力してください.また,オプションとして招"
 "待メッセージも書いてください."
 
-#: src/gtkprivacy.c:567 src/gtkprivacy.c:580
+#: src/gtkprivacy.c:568 src/gtkprivacy.c:581
 msgid "Permit"
 msgstr "許可"
 
-#: src/gtkprivacy.c:572
+#: src/gtkprivacy.c:573
 #, fuzzy, c-format
 msgid "Allow %s to contact you?"
 msgstr "すべてのユーザのコンタクトを許可する"
 
-#: src/gtkprivacy.c:574
+#: src/gtkprivacy.c:575
 #, fuzzy, c-format
 msgid "Are you sure you wish to allow %s to contact you?"
 msgstr "本当に%sを削除したいのですか?"
 
-#: src/gtkprivacy.c:601 src/gtkprivacy.c:614
+#: src/gtkprivacy.c:602 src/gtkprivacy.c:615
 #, fuzzy
 msgid "Block User"
 msgstr "ユーザを拒否する"
 
-#: src/gtkprivacy.c:602
+#: src/gtkprivacy.c:603
 msgid "Type a user to block."
 msgstr ""
 
-#: src/gtkprivacy.c:603
+#: src/gtkprivacy.c:604
 #, fuzzy
 msgid "Please enter the name of the user you wish to block."
 msgstr "加わるグループ名を入力してください。\n"
 
-#: src/gtkprivacy.c:610
+#: src/gtkprivacy.c:611
 #, fuzzy, c-format
 msgid "Block %s?"
 msgstr "拒む"
 
-#: src/gtkprivacy.c:612
+#: src/gtkprivacy.c:613
 #, fuzzy, c-format
 msgid "Are you sure you want to block %s?"
 msgstr "本当に%sを削除したいのですか?"
@@ -3826,64 +3904,68 @@
 #. *
 #. * A wrapper for gaim_request_action() that uses Yes and No buttons.
 #.
-#: src/gtkrequest.c:200 src/protocols/gg/gg.c:660 src/request.h:843
+#: src/gtkrequest.c:188 src/protocols/gg/gg.c:660 src/request.h:1009
 msgid "Yes"
 msgstr "はい"
 
-#: src/gtkrequest.c:201 src/protocols/gg/gg.c:660 src/request.h:843
+#: src/gtkrequest.c:189 src/protocols/gg/gg.c:660 src/request.h:1009
 msgid "No"
 msgstr "いいえ"
 
-#: src/gtkrequest.c:204
+#: src/gtkrequest.c:192
 msgid "Apply"
 msgstr "適用"
 
-#: src/gtksound.c:60
+#: src/gtkrequest.c:193 src/protocols/msn/msn.c:247
+msgid "Close"
+msgstr "閉じる"
+
+#: src/gtksound.c:61
 msgid "Buddy logs in"
 msgstr "仲間がログインしました"
 
-#: src/gtksound.c:61
+#: src/gtksound.c:62
 msgid "Buddy logs out"
 msgstr "仲間がログアウトしました"
 
-#: src/gtksound.c:62
+#: src/gtksound.c:63
 msgid "Message received"
 msgstr "メッセージ受信"
 
-#: src/gtksound.c:63
+#: src/gtksound.c:64
 msgid "Message received begins conversation"
 msgstr "受信したメッセージが会話を開始します"
 
-#: src/gtksound.c:64
+#: src/gtksound.c:65
 msgid "Message sent"
 msgstr "メッセージ送信"
 
-#: src/gtksound.c:65
+#: src/gtksound.c:66
 msgid "Person enters chat"
 msgstr "チャットに人が参加"
 
-#: src/gtksound.c:66
-msgid "Person leaves chat"
-msgstr "人がチャットから出ました"
-
 #: src/gtksound.c:67
+msgid "Person leaves chat"
+msgstr "人がチャットから出ました"
+
+#: src/gtksound.c:68
 msgid "You talk in chat"
 msgstr "あなたがチャットで話します"
 
-#: src/gtksound.c:68
+#: src/gtksound.c:69
 msgid "Others talk in chat"
 msgstr "他の人がチャットで話します"
 
-#: src/gtksound.c:71
+#: src/gtksound.c:72
 msgid "Someone says your name in chat"
 msgstr "チャットであなたの名前を誰かがいう"
 
-#: src/gtksound.c:153
+#: src/gtksound.c:156
 #, c-format
 msgid "Unable to play sound because the chosen file (%s) does not exist."
 msgstr "選択したファイル名 (%s)が存在しないため音を再生できません."
 
-#: src/gtksound.c:169
+#: src/gtksound.c:172
 msgid ""
 "Unable to play sound because the 'Command' sound method has been chosen, but "
 "no command has been set."
@@ -3891,153 +3973,75 @@
 "「コマンド」音声メソッドが選択されましたが,コマンドが指定されていないので音"
 "声を再生することができません."
 
-#: src/gtksound.c:178
+#: src/gtksound.c:184
 #, c-format
 msgid ""
 "Unable to play sound because the configured sound command could not be "
 "launched: %s"
 msgstr "設定した音声再生のコマンドが実行できないため音声を再生できません: %s"
 
-#: src/gtkutils.c:286
+#: src/gtkutils.c:298
 msgid "Can't save icon file to disk."
 msgstr "アイコンファイルをディスクに保存できません."
 
-#: src/gtkutils.c:321
-msgid "Gaim - Save Icon"
-msgstr "Gaim - アイコン保存"
-
-#: src/log.c:30
-msgid "Error in specifying buddy conversation."
-msgstr "仲間の会話の指定にエラーが起きました"
-
-#: src/log.c:36
-msgid "Unable to find conversation log"
-msgstr "会話ログを見付ける事ができません"
-
-#: src/log.c:119 src/log.c:140 src/log.c:153
-#, c-format
-msgid "Unable to make directory %s for logging"
-msgstr "ディレクトリ %s にログを作成するためのディレクトリを作成できません"
-
-#: src/log.c:207 src/log.c:223
-#, c-format
-msgid "IM Sessions with %s\n"
-msgstr "%s とのIMセッション\n"
-
-#: src/log.c:210 src/log.c:226
-#, c-format
-msgid "IM Sessions with %s"
-msgstr "%s とのIMセッション"
-
-#: src/log.c:270
-#, c-format
-msgid "+++ %s (%s) signed on @ %s"
-msgstr "+++ %s (%s) がサインオンしてきた @ %s"
-
-#: src/log.c:275
-#, c-format
-msgid "+++ %s (%s) signed off @ %s"
-msgstr "+++ %s (%s) はサインオフしました @ %s"
-
-#: src/log.c:280
-#, c-format
-msgid "+++ %s (%s) changed away state @ %s"
-msgstr "+++ %s (%s) は離席状態を変更しました @ %s"
-
-#: src/log.c:285
-#, c-format
-msgid "+++ %s (%s) came back @ %s"
-msgstr "+++ %s (%s) 戻ってきました @ %s"
-
-#: src/log.c:290
-#, c-format
-msgid "+++ %s (%s) became idle @ %s"
-msgstr "+++ %s (%s) アイドルになりました @ %s"
-
-#: src/log.c:295
-#, c-format
-msgid "+++ %s (%s) returned from idle @ %s"
-msgstr "+++ %s (%s) アイドルからもどってきました @ %s"
-
-#: src/log.c:300
-#, c-format
-msgid "+++ Program exit @ %s"
-msgstr "+++ プログラム終了 @ %s"
-
-#: src/log.c:307
-#, c-format
-msgid "%s (%s) reported that %s (%s) signed on @ %s"
-msgstr "%s (%s) の報告によると %s (%s) がサインオンしました @ %s"
-
-#: src/log.c:312
-#, c-format
-msgid "%s (%s) reported that %s (%s) signed off @ %s"
-msgstr "%s (%s) の報告によると %s (%s) がサインオフしました @ %s"
-
-#: src/log.c:317
-#, c-format
-msgid "%s (%s) reported that %s (%s) went away @ %s"
-msgstr "%s (%s) の報告によると %s (%s) が離席しました @ %s"
-
-#: src/log.c:322
-#, c-format
-msgid "%s (%s) reported that %s (%s) came back @ %s"
-msgstr "%s (%s) の報告によると %s (%s) が戻って着ました @ %s"
-
-#: src/log.c:327
-#, c-format
-msgid "%s (%s) reported that %s (%s) became idle @ %s"
-msgstr "%s (%s) の報告によると %s (%s) がアイドルになりました @ %s"
-
-#: src/log.c:333
-#, c-format
-msgid "%s (%s) reported that %s (%s) returned from idle @ %s"
-msgstr "%s (%s) の報告によると %s (%s) がアイドル状態から戻ってきました @ %s"
-
-#: src/log.c:345
-#, c-format
-msgid "%s (%s) reported that %s signed on @ %s"
-msgstr "%s (%s) の報告によると %s がサインオンしました @ %s"
-
-#: src/log.c:350
-#, c-format
-msgid "%s (%s) reported that %s signed off @ %s"
-msgstr "%s (%s) の報告によると %s がサインオフしました @ %s"
-
-#: src/log.c:355
-#, c-format
-msgid "%s (%s) reported that %s went away @ %s"
-msgstr "%s (%s) の報告によると %s が離席しました @ %s"
-
-#: src/log.c:360
-#, c-format
-msgid "%s (%s) reported that %s came back @ %s"
-msgstr "%s (%s) の報告によると %s が戻ってきました @ %s"
-
-#: src/log.c:365
-#, c-format
-msgid "%s (%s) reported that %s became idle @ %s"
-msgstr "%s (%s) の報告によると %s がアイドルになりました @ %s"
-
-#: src/log.c:371
-#, c-format
-msgid "%s (%s) reported that %s returned from idle @ %s"
-msgstr "%s (%s) の報告によると %s がアイドル状態からもどってきました @ %s"
-
-#: src/main.c:148
+#: src/gtkutils.c:333
+msgid "Save Icon"
+msgstr "アイコンを保存"
+
+#: src/log.c:83
+msgid "<b><font color=\"red\">The logger has no read function</font></b>"
+msgstr ""
+
+#: src/log.c:408
+msgid "XML"
+msgstr "XML"
+
+#: src/log.c:488
+#, c-format
+msgid "<font color=\"#16569E\">(%s) <b>%s <AUTO-REPLY>:</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"
+msgstr "<font color=\"#A82F2F\">(%s) <b>%s <自動返答>:</b></font> %s<br/>\n"
+
+#: src/log.c:534 src/log.c:669
+msgid "<font color=\"red\"><b>Unable to find log path!</b></font>"
+msgstr ""
+
+#: src/log.c:544 src/log.c:679
+#, c-format
+msgid "<font color=\"red\"><b>Could not read file: %s</b></font>"
+msgstr ""
+
+#: src/log.c:548
+msgid "HTML"
+msgstr "HTML"
+
+#: src/log.c:622
+#, c-format
+msgid "(%s) %s <AUTO-REPLY>: %s\n"
+msgstr "(%s) %s <自動返答>: %s\n"
+
+#: src/log.c:683
+msgid "Plain text"
+msgstr ""
+
+#: src/main.c:149
 msgid "Please enter your login."
 msgstr "ログイン名を入力してください"
 
-#: src/main.c:231
+#: src/main.c:232
 msgid "<New User>"
 msgstr "<新規ユーザ>"
 
-#: src/main.c:273
+#: src/main.c:274
 msgid "Login"
 msgstr "ログイン"
 
 #. full help text
-#: src/main.c:550
+#: src/main.c:553
 #, c-format
 msgid ""
 "Gaim %s\n"
@@ -4070,23 +4074,23 @@
 "  -h, --help          このヘルプを表示して終了\n"
 
 #. short message
-#: src/main.c:565
+#: src/main.c:568
 #, c-format
 msgid "Gaim %s. Try `%s -h' for more information.\n"
 msgstr "Gaim %s. 詳しい情報は `%s -h' と入力してください\n"
 
-#: src/plugin.c:260
+#: src/plugin.c:267
 #, c-format
 msgid ""
 "The required plugin %s was not found. Please install this plugin and try "
 "again."
 msgstr ""
 
-#: src/plugin.c:265 src/plugin.c:293
+#: src/plugin.c:272 src/plugin.c:300
 msgid "Gaim was unable to load your plugin."
 msgstr "Gaim プラグインをロードできませんでした."
 
-#: src/plugin.c:289
+#: src/plugin.c:296
 #, c-format
 msgid "The required plugin %s was unable to load."
 msgstr ""
@@ -4096,11 +4100,11 @@
 msgid "Slightly less boring default"
 msgstr "おもしろくもないデフォルト"
 
-#: src/protocols/gg/gg.c:49 src/protocols/jabber/jutil.c:109
+#: src/protocols/gg/gg.c:49 src/protocols/jabber/jutil.c:110
 #: src/protocols/msn/msn.c:344 src/protocols/msn/state.c:27
 #: src/protocols/msn/state.c:28 src/protocols/msn/state.c:35
-#: src/protocols/msn/state.c:36 src/protocols/yahoo/yahoo.c:2304
-#: src/protocols/yahoo/yahoo.c:2405
+#: src/protocols/msn/state.c:36 src/protocols/yahoo/yahoo.c:2492
+#: src/protocols/yahoo/yahoo.c:2601
 msgid "Available"
 msgstr "可視"
 
@@ -4112,11 +4116,11 @@
 msgid "Away for friends only"
 msgstr "仲間だけに離席"
 
-#: src/protocols/gg/gg.c:53 src/protocols/jabber/jabber.c:871
-#: src/protocols/jabber/presence.c:88 src/protocols/oscar/oscar.c:2837
-#: src/protocols/oscar/oscar.c:4517 src/protocols/oscar/oscar.c:4544
-#: src/protocols/oscar/oscar.c:6069 src/protocols/yahoo/yahoo.c:2026
-#: src/protocols/yahoo/yahoo.c:2324 src/protocols/yahoo/yahoo.c:2415
+#: 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
 msgid "Invisible"
 msgstr "隠れる"
 
@@ -4136,7 +4140,9 @@
 msgid "Unable to connect to server."
 msgstr "サーバへ接続できません"
 
-#: src/protocols/gg/gg.c:142
+#: 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
 msgid "Invalid response from server."
 msgstr "サーバから無効な返答です"
 
@@ -4171,7 +4177,12 @@
 
 #. 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/toc/toc.c:200
+#: 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/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
 msgid "Unable to connect."
 msgstr "接続できません"
 
@@ -4233,22 +4244,24 @@
 msgid "Active"
 msgstr "有効"
 
-#: src/protocols/gg/gg.c:664 src/protocols/oscar/oscar.c:3892
+#: src/protocols/gg/gg.c:664 src/protocols/oscar/oscar.c:3962
 msgid "UIN"
 msgstr "UIN"
 
-#: src/protocols/gg/gg.c:668
-msgid "First name"
+#. 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
+msgid "First Name"
 msgstr "姓"
 
 #. Last Name
-#: src/protocols/gg/gg.c:673 src/protocols/jabber/jabber.c:564
-#: src/protocols/oscar/oscar.c:3900 src/protocols/trepia/trepia.c:265
+#: src/protocols/gg/gg.c:673 src/protocols/jabber/jabber.c:638
+#: src/protocols/oscar/oscar.c:3970 src/protocols/trepia/trepia.c:274
 msgid "Last Name"
 msgstr "名"
 
-#: src/protocols/gg/gg.c:677 src/protocols/gg/gg.c:1389
-#: src/protocols/irc/msgs.c:183 src/protocols/oscar/oscar.c:3894
+#: src/protocols/gg/gg.c:677 src/protocols/gg/gg.c:1388
+#: src/protocols/irc/msgs.c:183 src/protocols/oscar/oscar.c:3964
 msgid "Nick"
 msgstr "ニック"
 
@@ -4262,19 +4275,19 @@
 msgstr "性"
 
 #. City
-#: src/protocols/gg/gg.c:701 src/protocols/jabber/jabber.c:574
-#: src/protocols/oscar/oscar.c:3946 src/protocols/oscar/oscar.c:3962
-#: src/protocols/trepia/trepia.c:322 src/protocols/trepia/trepia.c:421
+#: 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/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:1241
-#: src/protocols/msn/msn.c:1483 src/protocols/napster/napster.c:387
-#: src/protocols/oscar/oscar.c:2879 src/protocols/oscar/oscar.c:3187
-#: src/protocols/toc/toc.c:498 src/protocols/yahoo/yahoo.c:2581
-#: src/protocols/yahoo/yahoo.c:2603 src/protocols/yahoo/yahoo.c:2623
-#: src/protocols/yahoo/yahoo.c:2810 src/protocols/zephyr/zephyr.c:355
+#: 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
 #, fuzzy
 msgid "Buddy Information"
 msgstr "勤務先情報:"
@@ -4378,8 +4391,8 @@
 msgid "Directory Search"
 msgstr "ディレクトリ検索"
 
-#: src/protocols/gg/gg.c:1204 src/protocols/jabber/jabber.c:981
-#: src/protocols/oscar/oscar.c:6422 src/protocols/toc/toc.c:1545
+#: src/protocols/gg/gg.c:1204 src/protocols/jabber/jabber.c:1080
+#: src/protocols/toc/toc.c:1546
 msgid "Change Password"
 msgstr "パスワード変更"
 
@@ -4417,7 +4430,7 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/gg/gg.c:1370 src/protocols/gg/gg.c:1372
+#: src/protocols/gg/gg.c:1369 src/protocols/gg/gg.c:1371
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr "Gadu-Gadu プロトコルプラグイン"
 
@@ -4430,17 +4443,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:181
-#: src/protocols/msn/notification.c:935 src/protocols/msn/notification.c:1256
-#: src/protocols/msn/notification.c:1422 src/protocols/oscar/oscar.c:2609
-#: src/protocols/oscar/oscar.c:5080
+#: 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
 msgid "Authorize"
 msgstr "承認"
 
-#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:182
-#: src/protocols/msn/notification.c:936 src/protocols/msn/notification.c:1258
-#: src/protocols/msn/notification.c:1424 src/protocols/oscar/oscar.c:2611
-#: src/protocols/oscar/oscar.c:5081
+#: 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
 msgid "Deny"
 msgstr "非許可"
 
@@ -4478,55 +4491,63 @@
 "PING<BR>QUERY QUIT QUOTE UMODE<BR>WALLOPS WHOIS"
 msgstr ""
 
-#: src/protocols/irc/cmds.c:459
+#: src/protocols/irc/cmds.c:459 src/protocols/jabber/chat.c:544
 #, fuzzy, c-format
 msgid "current topic is: %s"
 msgstr "現在トピックは %s です"
 
-#: src/protocols/irc/cmds.c:461
+#: src/protocols/irc/cmds.c:461 src/protocols/jabber/chat.c:546
 msgid "No topic is set"
 msgstr "トピックが設定されていません"
 
-#: src/protocols/irc/irc.c:64
+#: src/protocols/irc/irc.c:72
 msgid "Error displaying MOTD"
 msgstr ""
 
-#: src/protocols/irc/irc.c:64
+#: src/protocols/irc/irc.c:72
 msgid "No MOTD available"
 msgstr ""
 
-#: src/protocols/irc/irc.c:65
+#: src/protocols/irc/irc.c:73
 msgid "There is no MOTD associated with this connection."
 msgstr ""
 
-#: src/protocols/irc/irc.c:68
+#: src/protocols/irc/irc.c:76
 #, c-format
 msgid "MOTD for %s"
 msgstr ""
 
-#: src/protocols/irc/irc.c:137
+#: src/protocols/irc/irc.c:139
 msgid "View MOTD"
 msgstr ""
 
-#: src/protocols/irc/irc.c:156
-msgid "Channel:"
-msgstr "チャンネル:"
-
-#: src/protocols/irc/irc.c:180
+#: src/protocols/irc/irc.c:158
+msgid "_Channel:"
+msgstr "チャンネル (_C):"
+
+#: src/protocols/irc/irc.c:163 src/protocols/jabber/chat.c:59
+msgid "_Password:"
+msgstr "パスワード (_P):"
+
+#: src/protocols/irc/irc.c:182
 msgid "IRC nicks may not contain whitespace"
 msgstr ""
 
-#: src/protocols/irc/irc.c:199 src/protocols/oscar/oscar.c:679
-#: src/protocols/toc/toc.c:228
+#: src/protocols/irc/irc.c:201 src/protocols/toc/toc.c:228
 #, c-format
 msgid "Signon: %s"
 msgstr "サインオン: %s"
 
-#: src/protocols/irc/irc.c:208
+#: src/protocols/irc/irc.c:210
 #, fuzzy
 msgid "Couldn't create socket"
 msgstr "ソケットを読めません"
 
+#: src/protocols/irc/irc.c:359 src/protocols/trepia/trepia.c:972
+#, fuzzy
+msgid "Read error"
+msgstr "不正なエラー"
+
 #. *< api_version
 #. *< type
 #. *< ui_requirement
@@ -4536,25 +4557,36 @@
 #. *< id
 #. *< name
 #. *< version
-#: src/protocols/irc/irc.c:530
+#: src/protocols/irc/irc.c:533
 msgid "IRC Protocol Plugin"
 msgstr "IRCプロトコルプラグイン"
 
 #. *  summary
-#: src/protocols/irc/irc.c:531
+#: src/protocols/irc/irc.c:534
 #, fuzzy
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "IRCプロトコルプラグイン"
 
-#: src/protocols/irc/irc.c:548 src/protocols/irc/msgs.c:197
-#: src/protocols/jabber/jabber.c:1077 src/protocols/napster/napster.c:637
+#: src/protocols/irc/irc.c:551 src/protocols/irc/msgs.c:197
+#: src/protocols/jabber/jabber.c:1213 src/protocols/napster/napster.c:636
 msgid "Server"
 msgstr "サーバ"
 
-#: src/protocols/irc/irc.c:554
+#: 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
+msgid "Port"
+msgstr "ポート番号"
+
+#: src/protocols/irc/irc.c:557
 msgid "Encoding"
 msgstr "エンコーディング"
 
+#: src/protocols/irc/irc.c:560 src/protocols/irc/msgs.c:191
+#: src/protocols/jabber/jabber.c:608
+msgid "Username"
+msgstr "ユーザ名"
+
 #: src/protocols/irc/msgs.c:98
 msgid "Bad mode"
 msgstr ""
@@ -4576,11 +4608,7 @@
 msgid " <i>(identified)</i>"
 msgstr ""
 
-#: src/protocols/irc/msgs.c:191 src/protocols/jabber/jabber.c:534
-msgid "Username"
-msgstr "ユーザ名"
-
-#: src/protocols/irc/msgs.c:192 src/protocols/yahoo/yahoo.c:2681
+#: src/protocols/irc/msgs.c:192 src/protocols/yahoo/yahoo.c:2888
 msgid "Realname"
 msgstr ""
 
@@ -4631,88 +4659,92 @@
 msgid "Gaim has sent a message the IRC server did not understand."
 msgstr ""
 
+#: src/protocols/irc/msgs.c:370
+msgid "No such channel"
+msgstr "そのようなチャンネルはありません"
+
 #. does this happen?
-#: src/protocols/irc/msgs.c:371
+#: src/protocols/irc/msgs.c:381
 msgid "no such channel"
 msgstr "そのようなチャンネルはありません"
 
-#: src/protocols/irc/msgs.c:374
+#: src/protocols/irc/msgs.c:384
 #, fuzzy
 msgid "User is not logged in"
 msgstr "ログインしていません"
 
-#: src/protocols/irc/msgs.c:379
+#: src/protocols/irc/msgs.c:389
 msgid "No such nick or channel"
 msgstr "そのようなニック/チャンネルはありません"
 
-#: src/protocols/irc/msgs.c:399
+#: src/protocols/irc/msgs.c:409
 #, fuzzy
 msgid "Could not send"
 msgstr "接続できません"
 
-#: src/protocols/irc/msgs.c:455
+#: src/protocols/irc/msgs.c:465
 #, c-format
 msgid "Joining %s requires an invitation."
 msgstr ""
 
-#: src/protocols/irc/msgs.c:456
+#: src/protocols/irc/msgs.c:466
 msgid "Invitation only"
 msgstr ""
 
-#: src/protocols/irc/msgs.c:552
+#: src/protocols/irc/msgs.c:562
 #, fuzzy, c-format
 msgid "You have been kicked by %s: (%s)"
 msgstr "あなたは%sにより蹴られました: (%s)"
 
-#: src/protocols/irc/msgs.c:560
+#: src/protocols/irc/msgs.c:570
 #, c-format
 msgid "Kicked by %s (%s)"
 msgstr "%sにより蹴られました (%s)"
 
-#: src/protocols/irc/msgs.c:581
+#: src/protocols/irc/msgs.c:591
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr "モード (%s %s) by %s"
 
-#: src/protocols/irc/msgs.c:660
+#: src/protocols/irc/msgs.c:670
 #, fuzzy
 msgid "Could not change nick"
 msgstr "接続できません"
 
-#: src/protocols/irc/msgs.c:661
+#: src/protocols/irc/msgs.c:671
 msgid "Cannot change nick"
 msgstr ""
 
-#: src/protocols/irc/msgs.c:682
+#: src/protocols/irc/msgs.c:692
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr ""
 
-#: src/protocols/irc/msgs.c:720
+#: src/protocols/irc/msgs.c:730
 #, fuzzy
 msgid "Error: invalid PONG from server"
 msgstr "サーバからの読み込みに失敗"
 
-#: src/protocols/irc/msgs.c:722
+#: src/protocols/irc/msgs.c:732
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr ""
 
-#: src/protocols/irc/msgs.c:792
+#: src/protocols/irc/msgs.c:802
 #, fuzzy, c-format
 msgid "Cannot join %s:"
 msgstr "%s の情報を変更:"
 
-#: src/protocols/irc/msgs.c:793
+#: src/protocols/irc/msgs.c:803
 msgid "Cannot join channel"
 msgstr ""
 
-#: src/protocols/irc/msgs.c:823
+#: src/protocols/irc/msgs.c:833
 #, c-format
 msgid "Wallops from %s"
 msgstr ""
 
-#: src/protocols/irc/parse.c:160
+#: src/protocols/irc/parse.c:161
 msgid ""
 "(There was an error converting this message.  Check the 'Encoding' option in "
 "the Account Editor)"
@@ -4720,181 +4752,185 @@
 "(このメッセージを変換する際にエラーが発生しました。アカウントエディタの 'エ"
 "ンコード' オプションを確認してください)"
 
-#: src/protocols/irc/parse.c:291
+#: src/protocols/irc/parse.c:292
 #, c-format
 msgid "Reply time from %s: %lu seconds"
 msgstr ""
 
-#: src/protocols/irc/parse.c:292
+#: src/protocols/irc/parse.c:293
 msgid "PONG"
 msgstr "PONG"
 
-#: src/protocols/irc/parse.c:292
+#: src/protocols/irc/parse.c:293
 msgid "CTCP PING reply"
 msgstr ""
 
-#: src/protocols/irc/parse.c:391
-msgid "Disconnected"
+#: src/protocols/irc/parse.c:392 src/protocols/oscar/oscar.c:534
+#: 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:50
+#: src/protocols/jabber/auth.c:52
 msgid "Server requires SSL for login"
 msgstr ""
 
-#: src/protocols/jabber/auth.c:58 src/protocols/jabber/auth.c:342
-#: src/protocols/jabber/auth.c:354
-#, fuzzy
-msgid "Invalid response from server"
-msgstr "サーバから無効な返答です"
-
-#: src/protocols/jabber/auth.c:77 src/protocols/jabber/auth.c:124
+#: src/protocols/jabber/auth.c:106 src/protocols/jabber/auth.c:181
 msgid "Server does not use any supported authentication method"
 msgstr ""
 
-#: src/protocols/jabber/auth.c:327
+#: src/protocols/jabber/auth.c:170 src/protocols/jabber/jabber.c:462
+msgid "Unknown Error"
+msgstr "不明なエラー"
+
+#: src/protocols/jabber/auth.c:338
 #, fuzzy
 msgid "Invalid challenge from server"
 msgstr "サーバから無効な返答です"
 
-#: src/protocols/jabber/auth.c:357
+#: src/protocols/jabber/auth.c:432
 #, fuzzy
 msgid "Bad Protocol"
 msgstr "プロトコル:"
 
-#: src/protocols/jabber/auth.c:360
+#: src/protocols/jabber/auth.c:435
 msgid "Encryption Required"
 msgstr ""
 
-#: src/protocols/jabber/auth.c:363
+#: src/protocols/jabber/auth.c:438
 msgid "Invalid authzid"
 msgstr ""
 
-#: src/protocols/jabber/auth.c:366
+#: src/protocols/jabber/auth.c:441
 #, fuzzy
 msgid "Invalid Mechanism"
 msgstr "無効なユーザ名"
 
-#: src/protocols/jabber/auth.c:368
+#: src/protocols/jabber/auth.c:443
 #, fuzzy
 msgid "Invalid Realm"
 msgstr "無効なユーザ名"
 
-#: src/protocols/jabber/auth.c:371
+#: src/protocols/jabber/auth.c:446
 msgid "Mechanism Too Weak"
 msgstr ""
 
-#: src/protocols/jabber/auth.c:374 src/protocols/jabber/jabber.c:130
-#: src/protocols/jabber/jabber.c:806 src/protocols/jabber/jabber.c:856
-#: src/protocols/oscar/oscar.c:5472
+#: 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:377
+#: src/protocols/jabber/auth.c:452
 #, fuzzy
 msgid "Temporary Authentication Failure"
 msgstr "認証に失敗"
 
-#: src/protocols/jabber/auth.c:379
+#: src/protocols/jabber/auth.c:454
 msgid "Authentication Failure"
 msgstr "認証に失敗"
 
-#: src/protocols/jabber/buddy.c:253 src/protocols/jabber/buddy.c:603
+#: src/protocols/jabber/buddy.c:245 src/protocols/jabber/buddy.c:603
 msgid "Full Name"
 msgstr "氏名"
 
-#: src/protocols/jabber/buddy.c:254 src/protocols/jabber/buddy.c:616
+#: src/protocols/jabber/buddy.c:246 src/protocols/jabber/buddy.c:616
 msgid "Family Name"
 msgstr "名字"
 
-#: src/protocols/jabber/buddy.c:255 src/protocols/jabber/buddy.c:620
+#: src/protocols/jabber/buddy.c:247 src/protocols/jabber/buddy.c:620
 msgid "Given Name"
 msgstr "名前"
 
-#: src/protocols/jabber/buddy.c:256 src/protocols/jabber/buddy.c:631
-#: src/protocols/jabber/jabber.c:554 src/protocols/yahoo/yahoo.c:2675
+#: src/protocols/jabber/buddy.c:248 src/protocols/jabber/buddy.c:635
+#: src/protocols/jabber/jabber.c:628 src/protocols/yahoo/yahoo.c:2884
 msgid "Nickname"
 msgstr "ニックネーム"
 
-#: src/protocols/jabber/buddy.c:258 src/protocols/jabber/buddy.c:659
+#: src/protocols/jabber/buddy.c:249 src/protocols/jabber/jabber.c:668
+msgid "URL"
+msgstr "URL"
+
+#: src/protocols/jabber/buddy.c:250 src/protocols/jabber/buddy.c:663
 msgid "Street Address"
 msgstr "住所"
 
-#: src/protocols/jabber/buddy.c:259 src/protocols/jabber/buddy.c:655
+#: src/protocols/jabber/buddy.c:251 src/protocols/jabber/buddy.c:659
 msgid "Extended Address"
 msgstr "その他"
 
-#: src/protocols/jabber/buddy.c:260 src/protocols/jabber/buddy.c:663
+#: src/protocols/jabber/buddy.c:252 src/protocols/jabber/buddy.c:667
 msgid "Locality"
 msgstr "区"
 
-#: src/protocols/jabber/buddy.c:261 src/protocols/jabber/buddy.c:667
+#: src/protocols/jabber/buddy.c:253 src/protocols/jabber/buddy.c:671
 msgid "Region"
 msgstr "州"
 
-#: src/protocols/jabber/buddy.c:262 src/protocols/jabber/buddy.c:671
-#: src/protocols/jabber/jabber.c:584
+#: src/protocols/jabber/buddy.c:254 src/protocols/jabber/buddy.c:675
+#: src/protocols/jabber/jabber.c:658
 msgid "Postal Code"
 msgstr "郵便番号"
 
 #. Country
-#: src/protocols/jabber/buddy.c:263 src/protocols/jabber/buddy.c:676
-#: src/protocols/trepia/trepia.c:330 src/protocols/trepia/trepia.c:439
+#: src/protocols/jabber/buddy.c:255 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:264 src/protocols/jabber/buddy.c:687
-#: src/protocols/jabber/buddy.c:694
+#: src/protocols/jabber/buddy.c:256 src/protocols/jabber/buddy.c:691
+#: src/protocols/jabber/buddy.c:698
 msgid "Telephone"
 msgstr "電話番号"
 
-#: src/protocols/jabber/buddy.c:265 src/protocols/jabber/buddy.c:705
-#: src/protocols/jabber/buddy.c:713 src/protocols/yahoo/yahoo.c:2669
+#: src/protocols/jabber/buddy.c:257 src/protocols/jabber/buddy.c:709
+#: src/protocols/jabber/buddy.c:717 src/protocols/yahoo/yahoo.c:2880
 msgid "Email"
 msgstr "メールアドレス"
 
-#: src/protocols/jabber/buddy.c:266 src/protocols/jabber/buddy.c:728
+#: src/protocols/jabber/buddy.c:258 src/protocols/jabber/buddy.c:732
 msgid "Organization Name"
 msgstr "組織名"
 
-#: src/protocols/jabber/buddy.c:267 src/protocols/jabber/buddy.c:732
+#: src/protocols/jabber/buddy.c:259 src/protocols/jabber/buddy.c:736
 msgid "Organization Unit"
 msgstr "所属部署"
 
-#: src/protocols/jabber/buddy.c:268 src/protocols/jabber/buddy.c:738
+#: src/protocols/jabber/buddy.c:260 src/protocols/jabber/buddy.c:742
 msgid "Title"
 msgstr "肩書"
 
-#: src/protocols/jabber/buddy.c:269 src/protocols/jabber/buddy.c:741
+#: src/protocols/jabber/buddy.c:261 src/protocols/jabber/buddy.c:745
 msgid "Role"
 msgstr "役職"
 
-#: src/protocols/jabber/buddy.c:270 src/protocols/jabber/buddy.c:634
-#: src/protocols/oscar/oscar.c:3926
+#: src/protocols/jabber/buddy.c:262 src/protocols/jabber/buddy.c:638
+#: src/protocols/oscar/oscar.c:3996
 msgid "Birthday"
 msgstr "誕生日"
 
-#: src/protocols/jabber/buddy.c:514 src/protocols/jabber/buddy.c:515
+#: src/protocols/jabber/buddy.c:506 src/protocols/jabber/buddy.c:507
 msgid "Edit Jabber vCard"
 msgstr "Jabber vCardによって開発された"
 
-#: src/protocols/jabber/buddy.c:516
+#: src/protocols/jabber/buddy.c:508
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable."
 msgstr ""
 "下記のアイテムはすべてオプションです。快適に感じる情報だけを入力します。"
 
-#: src/protocols/jabber/buddy.c:554
+#: src/protocols/jabber/buddy.c:551
 msgid "Jabber ID"
 msgstr "Jabber ID"
 
-#: src/protocols/jabber/buddy.c:564 src/protocols/jabber/buddy.c:571
-#: src/protocols/jabber/buddy.c:582 src/protocols/jabber/jabber.c:843
-#: src/protocols/jabber/jabber.c:856
+#: 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
 msgid "Status"
 msgstr "状態"
 
-#: src/protocols/jabber/buddy.c:580 src/protocols/jabber/jabber.c:1080
+#: src/protocols/jabber/buddy.c:577 src/protocols/jabber/jabber.c:1216
 msgid "Resource"
 msgstr "リソース"
 
@@ -4902,330 +4938,412 @@
 msgid "Middle Name"
 msgstr "ミドルネーム"
 
-#: src/protocols/jabber/buddy.c:639 src/protocols/jabber/jabber.c:569
-#: src/protocols/oscar/oscar.c:3943 src/protocols/oscar/oscar.c:3959
+#: src/protocols/jabber/buddy.c:643 src/protocols/jabber/jabber.c:643
+#: src/protocols/oscar/oscar.c:4013 src/protocols/oscar/oscar.c:4029
 msgid "Address"
 msgstr "住所"
 
-#: src/protocols/jabber/buddy.c:651
+#: src/protocols/jabber/buddy.c:655
 msgid "P.O. Box"
 msgstr ""
 
-#: src/protocols/jabber/buddy.c:757
+#: src/protocols/jabber/buddy.c:761
 msgid "Photo"
 msgstr "写真"
 
-#: src/protocols/jabber/buddy.c:757
+#: src/protocols/jabber/buddy.c:761
 msgid "Logo"
 msgstr ""
 
-#: src/protocols/jabber/buddy.c:771
+#: src/protocols/jabber/buddy.c:775
 msgid "Jabber Profile"
 msgstr ""
 
-#: src/protocols/jabber/buddy.c:866
+#: src/protocols/jabber/buddy.c:915
 msgid "Un-hide From"
 msgstr "ここからは隠さない"
 
-#: src/protocols/jabber/buddy.c:869
+#: src/protocols/jabber/buddy.c:918
 msgid "Temporarily Hide From"
 msgstr "一時的にここから隠す"
 
-#: src/protocols/jabber/buddy.c:877
+#: src/protocols/jabber/buddy.c:926
 msgid "Cancel Presence Notification"
 msgstr "存在通知をやめる"
 
-#: src/protocols/jabber/buddy.c:885
-msgid "Re-request authorization"
-msgstr "認証の再要求"
-
-#: src/protocols/jabber/chat.c:36 src/protocols/yahoo/yahoochat.c:870
-msgid "Room:"
-msgstr "部屋:"
-
-#: src/protocols/jabber/chat.c:43
-msgid "Server:"
-msgstr "サーバ:"
-
-#: src/protocols/jabber/chat.c:49
-msgid "Handle:"
-msgstr "ハンドル:"
-
-#: src/protocols/jabber/jabber.c:80
+#: src/protocols/jabber/buddy.c:934
+msgid "(Re-)Request authorization"
+msgstr "認証の要求/再要求"
+
+#: src/protocols/jabber/buddy.c:940
+msgid "Unsubscribe"
+msgstr ""
+
+#: src/protocols/jabber/chat.c:40 src/protocols/yahoo/yahoochat.c:938
+msgid "_Room:"
+msgstr "部屋 (_R):"
+
+#: src/protocols/jabber/chat.c:47
+msgid "_Server:"
+msgstr "サーバ (_S):"
+
+#: src/protocols/jabber/chat.c:53
+msgid "_Handle:"
+msgstr "ハンドル (_H):"
+
+#: src/protocols/jabber/chat.c:161
+#, fuzzy, c-format
+msgid "%s is not a valid room name"
+msgstr "%sは正しいファイル名ではありません.\n"
+
+#: src/protocols/jabber/chat.c:162
+#, fuzzy
+msgid "Invalid Room Name"
+msgstr "無効な部屋名"
+
+#: src/protocols/jabber/chat.c:167
+#, 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
+#, fuzzy
+msgid "Invalid Server Name"
+msgstr "無効なサーバ名"
+
+#: src/protocols/jabber/chat.c:173
+#, 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
+#, 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
+#, fuzzy
+msgid "Configuration error"
+msgstr "接続エラー"
+
+#: src/protocols/jabber/chat.c:350 src/protocols/jabber/chat.c:503
+#, fuzzy
+msgid "Unable to configure"
+msgstr "接続できません"
+
+#: src/protocols/jabber/chat.c:364
+#, fuzzy
+msgid "Room Configuration Error"
+msgstr "登録エラー"
+
+#: src/protocols/jabber/chat.c:365
+msgid "This room is not capable of being configured"
+msgstr ""
+
+#: src/protocols/jabber/chat.c:492
+#, fuzzy
+msgid "Registration error"
+msgstr "登録エラー"
+
+#: src/protocols/jabber/chat.c:573
+msgid "Nick changing not supported in non-MUC chatrooms"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:72
 msgid "Error initializing session"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:105
+#: src/protocols/jabber/jabber.c:123
 msgid "Bad Format"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:107
+#: src/protocols/jabber/jabber.c:125
 msgid "Bad Namespace Prefix"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:110
+#: src/protocols/jabber/jabber.c:128
 #, fuzzy
 msgid "Resource Conflict"
 msgstr "リソース:"
 
-#: src/protocols/jabber/jabber.c:112
+#: src/protocols/jabber/jabber.c:130
 #, fuzzy
 msgid "Connection Timeout"
 msgstr "接続が切れました"
 
-#: src/protocols/jabber/jabber.c:114
+#: src/protocols/jabber/jabber.c:132
 msgid "Host Gone"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:116
-#, fuzzy
-msgid "Host Unknown"
-msgstr "不明"
-
-#: src/protocols/jabber/jabber.c:118
-msgid "Improper Addressing"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:120
-msgid "Internal Server Error"
-msgstr "サーバ内部エラー"
-
-#: src/protocols/jabber/jabber.c:122
-#, fuzzy
-msgid "Invalid ID"
-msgstr "無効なユーザ"
-
-#: src/protocols/jabber/jabber.c:124
-#, fuzzy
-msgid "Invalid Namespace"
-msgstr "無効なユーザ"
-
-#: src/protocols/jabber/jabber.c:126
-#, fuzzy
-msgid "Invalid XML"
-msgstr "無効なユーザ"
-
-#: src/protocols/jabber/jabber.c:128
-msgid "Non-matching Hosts"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:132
-msgid "Policy Violation"
-msgstr ""
-
 #: src/protocols/jabber/jabber.c:134
-msgid "Remote Connection Failed"
-msgstr ""
+#, fuzzy
+msgid "Host Unknown"
+msgstr "不明"
 
 #: src/protocols/jabber/jabber.c:136
-msgid "Resource Constraint"
+msgid "Improper Addressing"
 msgstr ""
 
 #: src/protocols/jabber/jabber.c:138
-msgid "Restricted XML"
-msgstr ""
+msgid "Internal Server Error"
+msgstr "サーバ内部エラー"
 
 #: src/protocols/jabber/jabber.c:140
-msgid "See Other Host"
-msgstr ""
+#, 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:144
+#: src/protocols/jabber/jabber.c:162
 msgid "Undefined Condition"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:146
-msgid "Unsupported Condition"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:148
+#: 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:150
+#: src/protocols/jabber/jabber.c:168
 msgid "Unsupported Version"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:152
+#: src/protocols/jabber/jabber.c:170
 msgid "XML Not Well Formed"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:154
+#: src/protocols/jabber/jabber.c:172
 #, fuzzy
 msgid "Stream Error"
 msgstr "内部エラー"
 
-#: src/protocols/jabber/jabber.c:232 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:516
-#: src/protocols/msn/msn.c:627 src/protocols/msn/msn.c:643
-#: src/protocols/msn/msn.c:691 src/protocols/msn/msn.c:714
-#: src/protocols/msn/msn.c:746 src/protocols/msn/msn.c:754
-#: src/protocols/msn/msn.c:787 src/protocols/msn/msn.c:795
-#: src/protocols/msn/msn.c:809 src/protocols/msn/msn.c:818
-#: src/protocols/msn/msn.c:832 src/protocols/msn/msn.c:856
-#: src/protocols/msn/msn.c:906 src/protocols/msn/msn.c:944
-#: src/protocols/msn/msn.c:1042 src/protocols/msn/msn.c:1074
-#: src/protocols/msn/msn.c:1095 src/protocols/msn/msn.c:1106
-#: src/protocols/msn/msn.c:1117 src/protocols/msn/msn.c:1141
-#: src/protocols/msn/msn.c:1153 src/protocols/msn/msn.c:1218
+#: 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:1655 src/protocols/msn/notification.c:1675
-#: src/protocols/trepia/trepia.c:239 src/protocols/trepia/trepia.c:740
-#: src/protocols/trepia/trepia.c:1023 src/protocols/trepia/trepia.c:1067
-#: src/protocols/trepia/trepia.c:1166 src/protocols/trepia/trepia.c:1222
+#: 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
 msgid "Write error"
 msgstr "書き込みエラー"
 
-#: src/protocols/jabber/jabber.c:269 src/protocols/jabber/jabber.c:289
+#: src/protocols/jabber/jabber.c:275 src/protocols/jabber/jabber.c:295
 #, fuzzy
 msgid "Read Error"
 msgstr "不正なエラー"
 
-#: src/protocols/jabber/jabber.c:394 src/protocols/jabber/jabber.c:671
-#: src/protocols/trepia/trepia.c:1106
+#: src/protocols/jabber/jabber.c:349
+msgid "SSL Handshake Failed"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:387 src/protocols/jabber/jabber.c:717
+msgid "Invalid Jabber ID"
+msgstr "無効なJabber ID"
+
+#: src/protocols/jabber/jabber.c:415 src/protocols/jabber/jabber.c:744
+#, fuzzy
+msgid "SSL support unavailable"
+msgstr "サーバが見付かりません"
+
+#: src/protocols/jabber/jabber.c:425 src/protocols/jabber/jabber.c:754
+#: src/protocols/trepia/trepia.c:1116
 #, fuzzy
 msgid "Unable to create socket"
 msgstr "ソケットを読めません"
 
-#: src/protocols/jabber/jabber.c:419
+#: src/protocols/jabber/jabber.c:450
 #, fuzzy, c-format
 msgid "Registration of %s@%s successful"
 msgstr "サーバに登録しました"
 
-#: src/protocols/jabber/jabber.c:421 src/protocols/jabber/jabber.c:422
+#: src/protocols/jabber/jabber.c:452 src/protocols/jabber/jabber.c:453
 #, fuzzy
 msgid "Registration Successful"
 msgstr "サーバに登録しました"
 
-#: src/protocols/jabber/jabber.c:431
-msgid "Unknown Error"
-msgstr "不明なエラー"
-
-#: src/protocols/jabber/jabber.c:434
+#: src/protocols/jabber/jabber.c:465
 #, c-format
 msgid "Registration of %s@%s failed: %s"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:436 src/protocols/jabber/jabber.c:437
+#: src/protocols/jabber/jabber.c:467 src/protocols/jabber/jabber.c:468
 #, fuzzy
 msgid "Registration Failed"
 msgstr "認証に失敗"
 
-#: src/protocols/jabber/jabber.c:524 src/protocols/jabber/jabber.c:525
+#: src/protocols/jabber/jabber.c:580 src/protocols/jabber/jabber.c:581
 #, fuzzy
 msgid "Already Registered"
 msgstr "すでにそこにいます"
 
-#: src/protocols/jabber/jabber.c:538 src/protocols/jabber/jabber.c:951
+#: src/protocols/jabber/jabber.c:612 src/protocols/jabber/jabber.c:1050
 msgid "Password"
 msgstr "パスワード"
 
-#: src/protocols/jabber/jabber.c:549
+#: src/protocols/jabber/jabber.c:623
 msgid "E-Mail"
 msgstr "メールアドレス"
 
-#. First Name
-#: src/protocols/jabber/jabber.c:559 src/protocols/oscar/oscar.c:3897
-#: src/protocols/trepia/trepia.c:258
-msgid "First Name"
-msgstr "姓"
-
 #. State
-#: src/protocols/jabber/jabber.c:579 src/protocols/oscar/oscar.c:3949
-#: src/protocols/oscar/oscar.c:3965 src/protocols/trepia/trepia.c:326
-#: src/protocols/trepia/trepia.c:430
+#: 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/trepia/trepia.c:439
 msgid "State"
 msgstr "州"
 
-#: src/protocols/jabber/jabber.c:589
+#: src/protocols/jabber/jabber.c:663
 msgid "Phone"
 msgstr "電話番号"
 
-#: src/protocols/jabber/jabber.c:607
+#: src/protocols/jabber/jabber.c:673
+msgid "Date"
+msgstr "日付"
+
+#: src/protocols/jabber/jabber.c:681
 msgid "Please fill out the information below to register your new account."
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:610 src/protocols/jabber/jabber.c:611
+#: src/protocols/jabber/jabber.c:684 src/protocols/jabber/jabber.c:685
 msgid "Register New Jabber Account"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:710 src/protocols/msn/dispatch.c:219
-#: src/protocols/msn/msn.c:461 src/protocols/napster/napster.c:487
-#: src/protocols/trepia/trepia.c:1100 src/protocols/yahoo/yahoo.c:1923
+#: 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
 msgid "Connecting"
 msgstr "接続中"
 
-#: src/protocols/jabber/jabber.c:714
+#: src/protocols/jabber/jabber.c:807
 msgid "Initializing Stream"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:720
+#: src/protocols/jabber/jabber.c:813
 msgid "Authenticating"
 msgstr "認証中"
 
-#: src/protocols/jabber/jabber.c:728
+#: src/protocols/jabber/jabber.c:823
 msgid "Re-initializing Stream"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:851 src/protocols/jabber/jabber.c:902
-#: src/protocols/jabber/presence.c:257
+#: src/protocols/jabber/jabber.c:948 src/protocols/jabber/jabber.c:1001
+#: src/protocols/jabber/presence.c:293
 msgid "Error"
 msgstr "エラー"
 
-#: src/protocols/jabber/jabber.c:867 src/protocols/jabber/jutil.c:100
-#: src/protocols/jabber/presence.c:79
+#: src/protocols/jabber/jabber.c:964 src/protocols/jabber/jutil.c:101
+#: src/protocols/jabber/presence.c:82
 msgid "Chatty"
 msgstr "チャッティー"
 
-#: src/protocols/jabber/jabber.c:869 src/protocols/jabber/jutil.c:103
-#: src/protocols/jabber/presence.c:84
+#: src/protocols/jabber/jabber.c:966 src/protocols/jabber/jutil.c:104
+#: src/protocols/jabber/presence.c:87
 msgid "Extended Away"
 msgstr "逃走中"
 
-#: src/protocols/jabber/jabber.c:870 src/protocols/jabber/jutil.c:106
-#: src/protocols/jabber/presence.c:86 src/protocols/oscar/oscar.c:2827
-#: src/protocols/oscar/oscar.c:4532 src/protocols/oscar/oscar.c:6065
+#: 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
 msgid "Do Not Disturb"
 msgstr "邪魔しないでね"
 
-#: src/protocols/jabber/jabber.c:884
+#: src/protocols/jabber/jabber.c:983
 msgid "Password Changed"
 msgstr "パスワード変更できました"
 
-#: src/protocols/jabber/jabber.c:885
+#: src/protocols/jabber/jabber.c:984
 #, fuzzy
 msgid "Your password has been changed."
 msgstr "パスワード変更ができませんでした"
 
-#: src/protocols/jabber/jabber.c:895
+#: src/protocols/jabber/jabber.c:994
 #, fuzzy, c-format
 msgid "Error changing password: %s"
 msgstr "パスワード変更エラー: %s"
 
-#: src/protocols/jabber/jabber.c:899
+#: src/protocols/jabber/jabber.c:998
 #, fuzzy
 msgid "Unknown error occurred changing password"
 msgstr "パスワードを変更できません。"
 
-#: src/protocols/jabber/jabber.c:956
+#: src/protocols/jabber/jabber.c:1055
 msgid "Password (again)"
 msgstr "新しいパスワード(再入力)"
 
-#: src/protocols/jabber/jabber.c:961 src/protocols/jabber/jabber.c:962
+#: src/protocols/jabber/jabber.c:1060 src/protocols/jabber/jabber.c:1061
 #, fuzzy
 msgid "Change Jabber Password"
 msgstr "パスワード変更"
 
-#: src/protocols/jabber/jabber.c:962
+#: src/protocols/jabber/jabber.c:1061
 #, fuzzy
 msgid "Please enter your new password"
 msgstr "パスワードを入力してください"
 
+#: src/protocols/jabber/jabber.c:1073 src/protocols/toc/toc.c:1532
+msgid "Set User Info"
+msgstr "ユーザ情報の登録"
+
 #. *< api_version
 #. *< type
 #. *< ui_requirement
@@ -5236,63 +5354,100 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/jabber/jabber.c:1057 src/protocols/jabber/jabber.c:1059
+#: src/protocols/jabber/jabber.c:1193 src/protocols/jabber/jabber.c:1195
 msgid "Jabber Protocol Plugin"
 msgstr "Jabberプロトコルプラグイン"
 
-#: src/protocols/jabber/jabber.c:1083
-msgid "Force Old SSL"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:1091
+#: src/protocols/jabber/jabber.c:1219
+msgid "Use TLS if available"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1224
+msgid "Force old SSL"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1232
 msgid "Connect server"
 msgstr "サーバに接続"
 
-#: src/protocols/jabber/message.c:95
+#: src/protocols/jabber/message.c:125
 #, fuzzy, c-format
 msgid "Message from %s"
 msgstr "メッセージログ"
 
-#: src/protocols/jabber/message.c:178
+#: src/protocols/jabber/message.c:187
+#, fuzzy, c-format
+msgid "%s has set the topic to: %s"
+msgstr "%sのトピックは変わりました: %s"
+
+#: src/protocols/jabber/message.c:189
+#, c-format
+msgid "The topic is: %s"
+msgstr "トピックは %s です"
+
+#: src/protocols/jabber/message.c:236
 #, c-format
 msgid "Message delivery to %s failed: %s"
 msgstr ""
 
-#: src/protocols/jabber/message.c:181
+#: src/protocols/jabber/message.c:239
 #, fuzzy
 msgid "Jabber Message Error"
 msgstr "Jabber エラー"
 
-#: src/protocols/jabber/message.c:244
-#, c-format
-msgid " (Code %s)"
-msgstr ""
-
 #: src/protocols/jabber/parser.c:129
 #, fuzzy
 msgid "XML Parse error"
 msgstr "書き込みエラー"
 
-#: src/protocols/jabber/presence.c:167
-#, c-format
-msgid "%s (Code %s)"
-msgstr ""
-
-#: src/protocols/jabber/presence.c:172
+#: src/protocols/jabber/presence.c:178
 msgid "Unknown Error in presence"
 msgstr "不明なエラーが起きています"
 
-#: src/protocols/jabber/presence.c:176
+#: src/protocols/jabber/presence.c:183
 #, c-format
 msgid "The user %s wants to add you to their buddy list."
 msgstr "ユーザ %s があなたを仲間リストに追加したがっています"
 
-#: src/protocols/jabber/presence.c:253
+#: src/protocols/jabber/presence.c:244 src/protocols/jabber/presence.c:245
+#, fuzzy
+msgid "Create New Room"
+msgstr "チャットルーム"
+
+#: src/protocols/jabber/presence.c:246
+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
+msgid "Configure Room"
+msgstr ""
+
+#: src/protocols/jabber/presence.c:250
+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
+#, 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
+#, fuzzy
+msgid "File Send Failed"
+msgstr "ファイル送信"
+
 #: src/protocols/msn/dispatch.c:42 src/protocols/msn/notification.c:278
-#: src/protocols/msn/notification.c:509
+#: src/protocols/msn/notification.c:521
 msgid "Unable to request USR\n"
 msgstr "USR を要求できません\n"
 
@@ -5313,15 +5468,15 @@
 msgid "Protocol version not supported"
 msgstr "プロトコルがサポートされていません"
 
-#: src/protocols/msn/dispatch.c:117 src/protocols/msn/notification.c:771
+#: src/protocols/msn/dispatch.c:117 src/protocols/msn/notification.c:792
 msgid "Unable to request CVR\n"
 msgstr "CVR を要求できません\n"
 
-#: src/protocols/msn/dispatch.c:126 src/protocols/msn/notification.c:780
+#: src/protocols/msn/dispatch.c:126 src/protocols/msn/notification.c:801
 msgid "Unable to request INF\n"
 msgstr "INF を要求できません\n"
 
-#: src/protocols/msn/dispatch.c:147 src/protocols/msn/notification.c:1889
+#: src/protocols/msn/dispatch.c:147 src/protocols/msn/notification.c:1927
 msgid "Got invalid XFR"
 msgstr "不正な XFR"
 
@@ -5329,27 +5484,20 @@
 msgid "Unable to transfer"
 msgstr "転送できません"
 
-#: src/protocols/msn/dispatch.c:199
+#: src/protocols/msn/dispatch.c:192
 msgid "Unable to parse message."
 msgstr "メッセージを解読できません"
 
-#: src/protocols/msn/dispatch.c:215 src/protocols/msn/msn.c:470
-#: src/protocols/msn/notification.c:2116 src/protocols/napster/napster.c:463
-#: src/protocols/napster/napster.c:494 src/protocols/yahoo/yahoo.c:1715
-#: src/protocols/yahoo/yahoo.c:1746 src/protocols/yahoo/yahoo.c:1811
-msgid "Unable to connect"
-msgstr "接続できません"
-
-#: src/protocols/msn/dispatch.c:239 src/protocols/msn/notification.c:876
-#: src/protocols/msn/notification.c:2138
+#: src/protocols/msn/dispatch.c:232 src/protocols/msn/notification.c:897
+#: src/protocols/msn/notification.c:2187
 msgid "Unable to write to server"
 msgstr "サーバへ書き込みできません"
 
-#: src/protocols/msn/dispatch.c:243 src/protocols/msn/notification.c:2145
+#: src/protocols/msn/dispatch.c:236 src/protocols/msn/notification.c:2194
 msgid "Syncing with server"
 msgstr "サーバと同期中"
 
-#: src/protocols/msn/dispatch.c:257 src/protocols/msn/notification.c:2159
+#: src/protocols/msn/dispatch.c:250 src/protocols/msn/notification.c:2208
 msgid "Error reading from server"
 msgstr "サーバからの読み込みに失敗"
 
@@ -5449,7 +5597,7 @@
 msgid "Too many hits to a FND"
 msgstr ""
 
-#: src/protocols/msn/error.c:107 src/protocols/oscar/oscar.c:179
+#: src/protocols/msn/error.c:107 src/protocols/oscar/oscar.c:182
 msgid "Not logged in"
 msgstr "ログインしていません"
 
@@ -5502,8 +5650,7 @@
 msgid "CVR parameters are either unknown or not allowed"
 msgstr "CVRパラメータは未知か不正です"
 
-#: src/protocols/msn/error.c:154 src/protocols/msn/notification.c:623
-#: src/protocols/msn/notification.c:1269 src/protocols/msn/notification.c:1437
+#: src/protocols/msn/error.c:154 src/protocols/msn/notification.c:636
 msgid "Unable to write"
 msgstr "書き込めません"
 
@@ -5536,7 +5683,7 @@
 msgid "Server too busy"
 msgstr "サーバビジー"
 
-#: src/protocols/msn/error.c:190 src/protocols/oscar/oscar.c:1074
+#: src/protocols/msn/error.c:190 src/protocols/oscar/oscar.c:1075
 #: src/protocols/toc/toc.c:659
 msgid "Authentication failed"
 msgstr "認証失敗"
@@ -5613,41 +5760,41 @@
 msgid "Page"
 msgstr "ページ"
 
-#: src/protocols/msn/msn.c:332 src/protocols/yahoo/yahoo.c:2142
+#: src/protocols/msn/msn.c:332 src/protocols/yahoo/yahoo.c:2301
 #, c-format
 msgid "<b>Status:</b> %s"
 msgstr "<b>状態:</b> %s"
 
-#: src/protocols/msn/msn.c:345 src/protocols/msn/msn.c:603
+#: src/protocols/msn/msn.c:345 src/protocols/msn/msn.c:628
 #: src/protocols/msn/state.c:32
 msgid "Away From Computer"
 msgstr "コンピュータから離れてます"
 
-#: src/protocols/msn/msn.c:346 src/protocols/msn/msn.c:605
-#: src/protocols/msn/state.c:31 src/protocols/yahoo/yahoo.c:2008
-#: src/protocols/yahoo/yahoo.c:2306 src/protocols/yahoo/yahoo.c:2406
+#: 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
 msgid "Be Right Back"
 msgstr "もうすぐ帰ってきます"
 
-#: src/protocols/msn/msn.c:347 src/protocols/msn/msn.c:607
-#: src/protocols/msn/state.c:29 src/protocols/yahoo/yahoo.c:2010
-#: src/protocols/yahoo/yahoo.c:2308 src/protocols/yahoo/yahoo.c:2407
+#: 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
 msgid "Busy"
 msgstr "取り込み中"
 
-#: src/protocols/msn/msn.c:348 src/protocols/msn/msn.c:609
-#: src/protocols/msn/state.c:33 src/protocols/yahoo/yahoo.c:2018
-#: src/protocols/yahoo/yahoo.c:2316 src/protocols/yahoo/yahoo.c:2411
+#: 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
 msgid "On The Phone"
 msgstr "電話中"
 
-#: src/protocols/msn/msn.c:349 src/protocols/msn/msn.c:611
-#: src/protocols/msn/state.c:34 src/protocols/yahoo/yahoo.c:2022
-#: src/protocols/yahoo/yahoo.c:2320 src/protocols/yahoo/yahoo.c:2413
+#: 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
 msgid "Out To Lunch"
 msgstr "昼休み"
 
-#: src/protocols/msn/msn.c:350 src/protocols/msn/msn.c:613
+#: src/protocols/msn/msn.c:350 src/protocols/msn/msn.c:638
 #: src/protocols/zephyr/zephyr.c:883 src/protocols/zephyr/zephyr.c:898
 msgid "Hidden"
 msgstr "隠れている"
@@ -5685,7 +5832,13 @@
 msgid "Initiate Chat"
 msgstr "エイリアス"
 
-#: src/protocols/msn/msn.c:727
+#: src/protocols/msn/msn.c:457
+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 "
@@ -5694,11 +5847,11 @@
 "MSN のスクリーン名は \"user@server.com\" の形でなければなりません。たぶん %"
 "s@hotmail.com のことでしょう。許可リストは変更していません。"
 
-#: src/protocols/msn/msn.c:731 src/protocols/msn/msn.c:771
+#: src/protocols/msn/msn.c:749 src/protocols/msn/msn.c:789
 msgid "Invalid MSN screenname"
 msgstr "無効な MSN サインイン名"
 
-#: src/protocols/msn/msn.c:767
+#: src/protocols/msn/msn.c:785
 #, c-format
 msgid ""
 "An MSN screenname must be in the form \"user@server.com\". Perhaps you meant "
@@ -5707,76 +5860,76 @@
 "MSN スクリーン名は \"user@server.com\" の形でなければなりません。たぶん %"
 "s@hotmail.com のことでしょう。拒否リストは変更していません。"
 
-#: src/protocols/msn/msn.c:1242 src/protocols/yahoo/yahoo.c:2582
+#: src/protocols/msn/msn.c:1287 src/protocols/yahoo/yahoo.c:2786
 msgid "<html><body><b>Error retrieving profile</b></body></html>"
 msgstr ""
 
 #. Age
-#: src/protocols/msn/msn.c:1310 src/protocols/oscar/oscar.c:3931
-#: src/protocols/trepia/trepia.c:276 src/protocols/trepia/trepia.c:404
-#: src/protocols/yahoo/yahoo.c:2693
+#: src/protocols/msn/msn.c:1357 src/protocols/oscar/oscar.c:4001
+#: src/protocols/trepia/trepia.c:285 src/protocols/trepia/trepia.c:413
+#: src/protocols/yahoo/yahoo.c:2896
 msgid "Age"
 msgstr "年齢"
 
 #. Gender
-#: src/protocols/msn/msn.c:1317 src/protocols/oscar/oscar.c:3917
-#: src/protocols/trepia/trepia.c:270 src/protocols/trepia/trepia.c:412
-#: src/protocols/yahoo/yahoo.c:2705
+#: src/protocols/msn/msn.c:1364 src/protocols/oscar/oscar.c:3987
+#: src/protocols/trepia/trepia.c:279 src/protocols/trepia/trepia.c:421
+#: src/protocols/yahoo/yahoo.c:2904
 msgid "Gender"
 msgstr "性別"
 
 # NOTE official translation
-#: src/protocols/msn/msn.c:1325 src/protocols/yahoo/yahoo.c:2699
+#: src/protocols/msn/msn.c:1372 src/protocols/yahoo/yahoo.c:2900
 msgid "Marital Status"
 msgstr "未婚/既婚"
 
-#: src/protocols/msn/msn.c:1332 src/protocols/yahoo/yahoo.c:2687
+#: src/protocols/msn/msn.c:1379 src/protocols/yahoo/yahoo.c:2892
 msgid "Location"
 msgstr ""
 
 # NOTE official translation
-#: src/protocols/msn/msn.c:1340 src/protocols/yahoo/yahoo.c:2711
+#: src/protocols/msn/msn.c:1387 src/protocols/yahoo/yahoo.c:2908
 msgid "Occupation"
 msgstr "職業"
 
-#: src/protocols/msn/msn.c:1357 src/protocols/msn/msn.c:1363
-#: src/protocols/msn/msn.c:1370 src/protocols/msn/msn.c:1377
-#: src/protocols/msn/msn.c:1384
+#: 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
 msgid "A Little About Me"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1393 src/protocols/msn/msn.c:1406
-#: src/protocols/msn/msn.c:1413
+#: src/protocols/msn/msn.c:1440 src/protocols/msn/msn.c:1453
+#: src/protocols/msn/msn.c:1460
 msgid "Favorite Things"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1422 src/protocols/msn/msn.c:1428
-#: src/protocols/msn/msn.c:1435
+#: src/protocols/msn/msn.c:1469 src/protocols/msn/msn.c:1475
+#: src/protocols/msn/msn.c:1482
 msgid "Hobbies and Interests"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1444 src/protocols/msn/msn.c:1450
-#: src/protocols/yahoo/yahoo.c:2755
+#: src/protocols/msn/msn.c:1491 src/protocols/msn/msn.c:1497
+#: src/protocols/yahoo/yahoo.c:2943
 msgid "Favorite Quote"
 msgstr ""
 
 # NOTE official translation
-#: src/protocols/msn/msn.c:1458 src/protocols/yahoo/yahoo.c:2799
+#: src/protocols/msn/msn.c:1505 src/protocols/yahoo/yahoo.c:2979
 msgid "Last Updated"
 msgstr "最終更新日"
 
 #. Homepage
-#: src/protocols/msn/msn.c:1469 src/protocols/trepia/trepia.c:280
-#: src/protocols/trepia/trepia.c:448
+#: src/protocols/msn/msn.c:1516 src/protocols/trepia/trepia.c:289
+#: src/protocols/trepia/trepia.c:457
 msgid "Homepage"
 msgstr "ウェブページ"
 
-#: src/protocols/msn/msn.c:1491 src/protocols/yahoo/yahoo.c:2817
+#: src/protocols/msn/msn.c:1538 src/protocols/yahoo/yahoo.c:2994
 #, c-format
 msgid "User information for %s unavailable"
 msgstr "%s のユーザ情報は利用できません"
 
-#: src/protocols/msn/msn.c:1493 src/protocols/yahoo/yahoo.c:2819
+#: src/protocols/msn/msn.c:1540 src/protocols/yahoo/yahoo.c:2996
 msgid "The user's profile is empty."
 msgstr ""
 
@@ -5790,86 +5943,95 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/msn/msn.c:1591 src/protocols/msn/msn.c:1593
+#: src/protocols/msn/msn.c:1637 src/protocols/msn/msn.c:1639
 msgid "MSN Protocol Plugin"
 msgstr "MSNプロトコルプラグイン"
 
 # NOTE 0.62 (but this looks wrong)-:
-#: src/protocols/msn/msn.c:1612 src/protocols/trepia/trepia.c:1330
+#: src/protocols/msn/msn.c:1656 src/protocols/trepia/trepia.c:1339
 msgid "Login server"
 msgstr "サーバにログイン"
 
+#: src/protocols/msn/msn.c:1666
+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:366 src/protocols/msn/notification.c:534
+#: src/protocols/msn/notification.c:322
+msgid "Unable to connect to server"
+msgstr "サーバへ接続できません"
+
+#: src/protocols/msn/notification.c:377 src/protocols/msn/notification.c:546
 #, fuzzy
 msgid "Unable to write to MSN Nexus server."
 msgstr "サーバへ書き込みできません"
 
-#: src/protocols/msn/notification.c:375 src/protocols/msn/notification.c:549
+#: 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:395
+#: src/protocols/msn/notification.c:406
 msgid "MSN Nexus server returned invalid redirect information."
 msgstr ""
 
-#: src/protocols/msn/notification.c:448
+#: src/protocols/msn/notification.c:460
 msgid "Unknown error when attempting to authorize with MSN login server."
 msgstr ""
 
-#: src/protocols/msn/notification.c:560
+#: src/protocols/msn/notification.c:572
 msgid "MSN Nexus server returned invalid information."
 msgstr ""
 
-#: src/protocols/msn/notification.c:628 src/protocols/trepia/trepia.c:677
+#: src/protocols/msn/notification.c:641 src/protocols/trepia/trepia.c:686
 msgid "Retrieving buddy list"
 msgstr "仲間リストの受信"
 
-#: src/protocols/msn/notification.c:690
+#: src/protocols/msn/notification.c:711
 #, fuzzy
 msgid "Unable to connect to passport server"
 msgstr "サーバへ接続できません"
 
-#: src/protocols/msn/notification.c:695 src/protocols/msn/notification.c:727
+#: src/protocols/msn/notification.c:716 src/protocols/msn/notification.c:748
+#: src/protocols/oscar/oscar.c:1361
 msgid "Password sent"
 msgstr "パスワードを送信しました"
 
-#: src/protocols/msn/notification.c:722
+#: src/protocols/msn/notification.c:743
 msgid "Unable to send password"
 msgstr "パスワードを送信できません"
 
-#: src/protocols/msn/notification.c:758
+#: src/protocols/msn/notification.c:779
 msgid "Protocol not supported"
 msgstr "プロトコルがサポートされていません"
 
-#: src/protocols/msn/notification.c:800
+#: src/protocols/msn/notification.c:821
 msgid "You have been disconnected. You have signed on from another location."
 msgstr "違う場所で接続したため、切断されました。"
 
-#: src/protocols/msn/notification.c:805
+#: src/protocols/msn/notification.c:826
 msgid "You have been disconnected. The MSN servers are going down temporarily."
 msgstr "あなたの接続は切断されました.MSNサーバが一時的に停止します."
 
-#: src/protocols/msn/notification.c:931
+#: src/protocols/msn/notification.c:953
 #, 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:1250 src/protocols/msn/notification.c:1416
+#: src/protocols/msn/notification.c:1278 src/protocols/msn/notification.c:1445
 #, c-format
 msgid "The user %s (%s) wants to add you to their buddy list."
 msgstr "ユーザ %s (%s) があなたを仲間リストに追加したがっています"
 
-#: src/protocols/msn/notification.c:1931
+#: src/protocols/msn/notification.c:1972
 msgid "Unable to transfer to notification server"
 msgstr "通知サーバと通信できません"
 
-#: src/protocols/msn/notification.c:2079
+#: src/protocols/msn/notification.c:2128
 #, fuzzy, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -5896,6 +6058,10 @@
 "\n"
 "メンテナンスが終了したら,またサインインできるようになります."
 
+#: src/protocols/msn/servconn.c:533
+msgid "Received HTTP error. Please report this."
+msgstr ""
+
 #: src/protocols/msn/switchboard.c:147
 msgid "The conversation has become inactive and timed out."
 msgstr "会話が休止状態になってタイムアウトしました"
@@ -5951,10 +6117,10 @@
 msgid "%s requested a PING"
 msgstr "%s はPINGを要求しました"
 
-#: src/protocols/napster/napster.c:543 src/protocols/oscar/oscar.c:5151
-#: src/protocols/toc/toc.c:1258
-msgid "Join what group:"
-msgstr "グループへの参加:"
+#: src/protocols/napster/napster.c:543 src/protocols/oscar/oscar.c:5213
+#: src/protocols/toc/toc.c:1259
+msgid "_Group:"
+msgstr "グループ (_G):"
 
 #. *< api_version
 #. *< type
@@ -5966,178 +6132,178 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/napster/napster.c:619 src/protocols/napster/napster.c:621
+#: src/protocols/napster/napster.c:618 src/protocols/napster/napster.c:620
 msgid "NAPSTER Protocol Plugin"
 msgstr "NAPSTERプロトコルプラグイン"
 
-#: src/protocols/oscar/oscar.c:175
+#: src/protocols/oscar/oscar.c:178
 msgid "Invalid error"
 msgstr "不正なエラー"
 
-#: src/protocols/oscar/oscar.c:176
+#: src/protocols/oscar/oscar.c:179
 msgid "Invalid SNAC"
 msgstr "不正な SNAC"
 
-#: src/protocols/oscar/oscar.c:177
+#: src/protocols/oscar/oscar.c:180
 msgid "Rate to host"
 msgstr "ホストの速度"
 
-#: src/protocols/oscar/oscar.c:178
-msgid "Rate to client"
-msgstr "クライアントの速度"
-
-#: src/protocols/oscar/oscar.c:180
-msgid "Service unavailable"
-msgstr "サービスが利用できません"
-
 #: src/protocols/oscar/oscar.c:181
-msgid "Service not defined"
-msgstr "サービスが定義されていません"
-
-#: src/protocols/oscar/oscar.c:182
-msgid "Obsolete SNAC"
-msgstr "旧式の SNAC"
+msgid "Rate to client"
+msgstr "クライアントの速度"
 
 #: src/protocols/oscar/oscar.c:183
-msgid "Not supported by host"
-msgstr "ホストではサポートしていません"
+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"
+
+#: src/protocols/oscar/oscar.c:186
+msgid "Not supported by host"
+msgstr "ホストではサポートしていません"
+
+#: src/protocols/oscar/oscar.c:187
 msgid "Not supported by client"
 msgstr "クライアントではサポートしていません"
 
-#: src/protocols/oscar/oscar.c:185
+#: src/protocols/oscar/oscar.c:188
 msgid "Refused by client"
 msgstr "クライアントに拒否されました"
 
-#: src/protocols/oscar/oscar.c:186
+#: src/protocols/oscar/oscar.c:189
 msgid "Reply too big"
 msgstr "返事が大きすぎます"
 
-#: src/protocols/oscar/oscar.c:187
+#: src/protocols/oscar/oscar.c:190
 msgid "Responses lost"
 msgstr "反応を失いました"
 
-#: src/protocols/oscar/oscar.c:188
+#: src/protocols/oscar/oscar.c:191
 msgid "Request denied"
 msgstr "リクエストが拒否されました"
 
-#: src/protocols/oscar/oscar.c:189
+#: src/protocols/oscar/oscar.c:192
 msgid "Busted SNAC payload"
 msgstr "SNAC 格納エリアが壊れました"
 
-#: src/protocols/oscar/oscar.c:190
+#: src/protocols/oscar/oscar.c:193
 msgid "Insufficient rights"
 msgstr "不十分な要求です"
 
-#: src/protocols/oscar/oscar.c:191
-msgid "In local permit/deny"
-msgstr "局所的な許可/不許可"
-
-#: src/protocols/oscar/oscar.c:192
-msgid "Too evil (sender)"
-msgstr "とても悪い (送信者)"
-
-#: src/protocols/oscar/oscar.c:193
-msgid "Too evil (receiver)"
-msgstr "とても悪い (受信者)"
-
 #: src/protocols/oscar/oscar.c:194
-msgid "User temporarily unavailable"
-msgstr "ユーザが一時的に無効です"
+msgid "In local permit/deny"
+msgstr "局所的な許可/不許可"
 
 #: src/protocols/oscar/oscar.c:195
-msgid "No match"
-msgstr "マッチしません"
+msgid "Too evil (sender)"
+msgstr "とても悪い (送信者)"
 
 #: src/protocols/oscar/oscar.c:196
-msgid "List overflow"
-msgstr "リスト溢れ"
+msgid "Too evil (receiver)"
+msgstr "とても悪い (受信者)"
 
 #: src/protocols/oscar/oscar.c:197
+msgid "User temporarily unavailable"
+msgstr "ユーザが一時的に無効です"
+
+#: src/protocols/oscar/oscar.c:198
+msgid "No match"
+msgstr "マッチしません"
+
+#: src/protocols/oscar/oscar.c:199
+msgid "List overflow"
+msgstr "リスト溢れ"
+
+#: src/protocols/oscar/oscar.c:200
 msgid "Request ambiguous"
 msgstr "要求が曖昧です"
 
-#: src/protocols/oscar/oscar.c:198
+#: src/protocols/oscar/oscar.c:201
 msgid "Queue full"
 msgstr "キューがいっぱいです"
 
-#: src/protocols/oscar/oscar.c:199
+#: src/protocols/oscar/oscar.c:202
 msgid "Not while on AOL"
 msgstr "AOL 中にはできません"
 
-#: src/protocols/oscar/oscar.c:470
+#: src/protocols/oscar/oscar.c:474
 #, c-format
 msgid "Direct IM with %s closed"
 msgstr "%sの直接IMは閉じました"
 
-#: src/protocols/oscar/oscar.c:472
+#: src/protocols/oscar/oscar.c:476
 #, c-format
 msgid "Direct IM with %s failed"
 msgstr "%sの直接IMは失敗しました"
 
-#: src/protocols/oscar/oscar.c:531 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/oscar/oscar.c:543 src/protocols/toc/toc.c:885
+#: src/protocols/oscar/oscar.c:546 src/protocols/toc/toc.c:885
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "チャットルーム%sから切断されました"
 
-#: src/protocols/oscar/oscar.c:559
+#: src/protocols/oscar/oscar.c:562
 msgid "Chat is currently unavailable"
 msgstr "チャットは接続できません"
 
-#: src/protocols/oscar/oscar.c:633 src/protocols/oscar/oscar.c:690
+#: src/protocols/oscar/oscar.c:633 src/protocols/oscar/oscar.c:689
 msgid "Couldn't connect to host"
 msgstr "ホストへ接続できませんでした"
 
-#: src/protocols/oscar/oscar.c:675
+#: src/protocols/oscar/oscar.c:643
+msgid "Screen name sent"
+msgstr "スクリーン名を送信しました"
+
+#: src/protocols/oscar/oscar.c:677
 msgid "Unable to login to AIM"
 msgstr "AIMへログインできません"
 
-#: src/protocols/oscar/oscar.c:778 src/protocols/oscar/oscar.c:1165
+#: src/protocols/oscar/oscar.c:778 src/protocols/oscar/oscar.c:1166
 msgid "Could Not Connect"
 msgstr "接続できません"
 
-#: src/protocols/oscar/oscar.c:785
+#: src/protocols/oscar/oscar.c:786
 msgid "Connection established, cookie sent"
 msgstr "接続できました、cookie送信"
 
-#: src/protocols/oscar/oscar.c:852 src/protocols/oscar/oscar.c:865
-#: src/protocols/oscar/oscar.c:870
+#: 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:853
+#: src/protocols/oscar/oscar.c:854
 msgid "Unable to establish listener socket."
 msgstr "読み込みソケットを確立できません."
 
-#: src/protocols/oscar/oscar.c:866
+#: 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:871
+#: src/protocols/oscar/oscar.c:872
 msgid "Unable to create new connection."
 msgstr "新規接続を作成できません."
 
-#: src/protocols/oscar/oscar.c:1051 src/protocols/toc/toc.c:571
+#: src/protocols/oscar/oscar.c:1052 src/protocols/toc/toc.c:571
 msgid "Incorrect nickname or password."
 msgstr "間違ったニックネームかパスワードです"
 
-#: src/protocols/oscar/oscar.c:1056
+#: src/protocols/oscar/oscar.c:1057
 msgid "Your account is currently suspended."
 msgstr "あなたのアカウントは現在停止中です"
 
 #. service temporarily unavailable
-#: src/protocols/oscar/oscar.c:1060
+#: src/protocols/oscar/oscar.c:1061
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "AOL インスタントメッセンジャーサービスは一時的に利用不能です。"
 
-#: src/protocols/oscar/oscar.c:1065
+#: src/protocols/oscar/oscar.c:1066
 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."
@@ -6145,17 +6311,22 @@
 "頻繁に接続しすぎており分離していました。10分待って、再び試みてください。努力"
 "し続ければ、さらに長く待つ必要があるでしょう。"
 
-#: src/protocols/oscar/oscar.c:1070
+#: src/protocols/oscar/oscar.c:1071
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr "クライアントのバージョンが古すぎます。%s にアップグレードしましょう"
 
-#: src/protocols/oscar/oscar.c:1102
+#: src/protocols/oscar/oscar.c:1103
 msgid "Internal Error"
 msgstr "内部エラー"
 
-#: src/protocols/oscar/oscar.c:1204 src/protocols/oscar/oscar.c:1234
-#: src/protocols/oscar/oscar.c:1322
+#: src/protocols/oscar/oscar.c:1173
+#, fuzzy
+msgid "Received authorization"
+msgstr "認証の再要求"
+
+#: src/protocols/oscar/oscar.c:1208 src/protocols/oscar/oscar.c:1238
+#: src/protocols/oscar/oscar.c:1326
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
@@ -6164,29 +6335,30 @@
 "まもなく切断されるでしょう。修正されたら TOC を利用してかまいません。更新のた"
 "めに、%s をチェックしてください。"
 
-#: src/protocols/oscar/oscar.c:1207 src/protocols/oscar/oscar.c:1237
-msgid "Gaim was Unable to get a valid AIM login hash."
+#: src/protocols/oscar/oscar.c:1211 src/protocols/oscar/oscar.c:1241
+msgid "Gaim was unable to get a valid AIM login hash."
 msgstr "Gaim は正しい AIM ログイン hash を取得することができませんでした。"
 
-#: src/protocols/oscar/oscar.c:1325
-msgid "Gaim was Unable to get a valid login hash."
+#: src/protocols/oscar/oscar.c:1329
+#, fuzzy
+msgid "Gaim was unable to get a valid login hash."
 msgstr "Gaim は正しいログイン hash を取得できませんでした。"
 
-#: src/protocols/oscar/oscar.c:1905 src/protocols/oscar/oscar.c:5572
+#: src/protocols/oscar/oscar.c:1910 src/protocols/oscar/oscar.c:5654
 #, c-format
 msgid "Direct IM with %s established"
 msgstr "%s との直接IM確立しました"
 
-#: src/protocols/oscar/oscar.c:2234 src/protocols/oscar/oscar.c:2256
+#: src/protocols/oscar/oscar.c:2239 src/protocols/oscar/oscar.c:2261
 msgid "(There was an error receiving this message)"
 msgstr "(メッセージ受信時にエラーが発生しました)"
 
-#: src/protocols/oscar/oscar.c:2403
+#: src/protocols/oscar/oscar.c:2408
 #, c-format
 msgid "%s has just asked to directly connect to %s"
 msgstr "%s は直接 %s に接続するように要求されました."
 
-#: src/protocols/oscar/oscar.c:2406
+#: src/protocols/oscar/oscar.c:2411
 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 "
@@ -6195,23 +6367,23 @@
 "これは 2 台のコンピュータ間の直接接続を要求しており、IM 画像に必要です。IP ア"
 "ドレスが明らかになるためで、プライバシーのリスクが考えられます。"
 
-#: src/protocols/oscar/oscar.c:2411 src/protocols/oscar/oscar.c:5941
+#: src/protocols/oscar/oscar.c:2416 src/protocols/oscar/oscar.c:6023
 msgid "Connect"
 msgstr "接続"
 
-#: src/protocols/oscar/oscar.c:2438
+#: src/protocols/oscar/oscar.c:2443
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr "私があなたを仲間リストに追加できるように承認してください."
 
-#: src/protocols/oscar/oscar.c:2446
+#: src/protocols/oscar/oscar.c:2451
 msgid "Authorization Request Message:"
 msgstr "承認要求メッセージ:"
 
-#: src/protocols/oscar/oscar.c:2447
+#: src/protocols/oscar/oscar.c:2452
 msgid "Please authorize me!"
 msgstr "私を承認してください!"
 
-#: src/protocols/oscar/oscar.c:2475
+#: src/protocols/oscar/oscar.c:2480
 #, c-format
 msgid ""
 "The user %s requires authorization before being added to a buddy list.  Do "
@@ -6220,22 +6392,23 @@
 "ユーザ %s が仲間リストに加える前に承認を求めています。承認の要求を送りたいで"
 "すか?"
 
-#: src/protocols/oscar/oscar.c:2480 src/protocols/oscar/oscar.c:2482
+#: src/protocols/oscar/oscar.c:2485 src/protocols/oscar/oscar.c:2487
 msgid "Request Authorization"
 msgstr "承認の要求"
 
-#: src/protocols/oscar/oscar.c:2518 src/protocols/oscar/oscar.c:2520
-#: src/protocols/oscar/oscar.c:2527 src/protocols/oscar/oscar.c:2599
-#: src/protocols/oscar/oscar.c:2619 src/protocols/oscar/oscar.c:2975
-#: src/protocols/oscar/oscar.c:5072 src/protocols/oscar/oscar.c:5118
+#: 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
 msgid "No reason given."
 msgstr "理由はわかりません。"
 
-#: src/protocols/oscar/oscar.c:2526
+#: src/protocols/oscar/oscar.c:2531
 msgid "Authorization Denied Message:"
 msgstr "承認拒否メッセージ:"
 
-#: src/protocols/oscar/oscar.c:2599
+#: src/protocols/oscar/oscar.c:2608
 #, c-format
 msgid ""
 "The user %u wants to add you to their buddy list for the following reason:\n"
@@ -6244,11 +6417,11 @@
 "ユーザ %u が以下の理由で仲間リストに追加したがっています: \n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2607 src/protocols/oscar/oscar.c:5078
+#: src/protocols/oscar/oscar.c:2616 src/protocols/oscar/oscar.c:5140
 msgid "Authorization Request"
 msgstr "承認の要求"
 
-#: src/protocols/oscar/oscar.c:2619
+#: src/protocols/oscar/oscar.c:2628
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -6259,18 +6432,18 @@
 "リクエストを拒否しました:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2620
+#: src/protocols/oscar/oscar.c:2629
 msgid "ICQ authorization denied."
 msgstr "ICQ認証は拒否されました。"
 
 #. Someone has granted you authorization
-#: src/protocols/oscar/oscar.c:2627
+#: src/protocols/oscar/oscar.c:2636
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
 msgstr ""
 "ユーザ%uは、あなたのコンタクトリストに彼らを加えるリクエストを認めました。"
 
-#: src/protocols/oscar/oscar.c:2635
+#: src/protocols/oscar/oscar.c:2644
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -6283,7 +6456,7 @@
 "送信者: %s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2643
+#: src/protocols/oscar/oscar.c:2652
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -6296,7 +6469,7 @@
 "送信者: %s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2651
+#: src/protocols/oscar/oscar.c:2660
 #, c-format
 msgid ""
 "You have received an ICQ email from %s [%s]\n"
@@ -6309,20 +6482,20 @@
 "メッセージは:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2672
+#: src/protocols/oscar/oscar.c:2681
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
 msgstr "ICQ ユーザ %u はあなたにコンタクトを送信しています: %s (%s)"
 
-#: src/protocols/oscar/oscar.c:2678
+#: src/protocols/oscar/oscar.c:2687
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr "この相手を仲間リストに追加しますか?"
 
-#: src/protocols/oscar/oscar.c:2682
+#: src/protocols/oscar/oscar.c:2691
 msgid "Decline"
 msgstr "断る"
 
-#: src/protocols/oscar/oscar.c:2764
+#: src/protocols/oscar/oscar.c:2773
 #, 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."
@@ -6331,7 +6504,7 @@
 msgstr[1] ""
 "%2$s からの %1$hu 個のメッセージは妥当でないので受け取れませんでした。"
 
-#: src/protocols/oscar/oscar.c:2773
+#: src/protocols/oscar/oscar.c:2782
 #, 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."
@@ -6340,7 +6513,7 @@
 msgstr[1] ""
 "%2$s からの %1$hu 個のメッセージは大きすぎるために受け取れませんでした。"
 
-#: src/protocols/oscar/oscar.c:2782
+#: src/protocols/oscar/oscar.c:2791
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -6353,7 +6526,7 @@
 "速度制限を上回ったので %2$s からの %1$hu 個のメッセージを受け取れませんでし"
 "た。"
 
-#: src/protocols/oscar/oscar.c:2791
+#: src/protocols/oscar/oscar.c:2800
 #, 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."
@@ -6364,7 +6537,7 @@
 "相手が有害すぎたので、%2$s からの %1$hu 個のメッセージを受け取れませんでし"
 "た。"
 
-#: src/protocols/oscar/oscar.c:2800
+#: src/protocols/oscar/oscar.c:2809
 #, 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."
@@ -6375,7 +6548,7 @@
 "あなたが有害すぎたので、%2$s からの %1$hu 個のメッセージを受け取れませんでし"
 "た。"
 
-#: src/protocols/oscar/oscar.c:2809
+#: src/protocols/oscar/oscar.c:2818
 #, 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."
@@ -6384,154 +6557,165 @@
 msgstr[1] ""
 "原因不明ですが、%2$s からの %1$hu 個のメッセージを受け取れませんでした。"
 
-#: src/protocols/oscar/oscar.c:2825 src/protocols/oscar/oscar.c:4541
-#: src/protocols/oscar/oscar.c:6068
+#: src/protocols/oscar/oscar.c:2834 src/protocols/oscar/oscar.c:4608
+#: src/protocols/oscar/oscar.c:6150
 msgid "Free For Chat"
 msgstr "チャットできます"
 
-#: src/protocols/oscar/oscar.c:2829 src/protocols/oscar/oscar.c:4535
-#: src/protocols/oscar/oscar.c:6066
+#: src/protocols/oscar/oscar.c:2838 src/protocols/oscar/oscar.c:4602
+#: src/protocols/oscar/oscar.c:6148
 msgid "Not Available"
 msgstr "不在"
 
-#: src/protocols/oscar/oscar.c:2831 src/protocols/oscar/oscar.c:4538
-#: src/protocols/oscar/oscar.c:6067
+#: src/protocols/oscar/oscar.c:2840 src/protocols/oscar/oscar.c:4605
+#: src/protocols/oscar/oscar.c:6149
 msgid "Occupied"
 msgstr "忙しい"
 
-#: src/protocols/oscar/oscar.c:2835
+#: src/protocols/oscar/oscar.c:2844
 msgid "Web Aware"
 msgstr "ウェブは見てます"
 
-#: src/protocols/oscar/oscar.c:2878
+#: src/protocols/oscar/oscar.c:2887
 #, 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:2937
+#: src/protocols/oscar/oscar.c:2946
 #, c-format
 msgid "SNAC threw error: %s\n"
 msgstr "SNAC スルーエラー: %s\n"
 
-#: src/protocols/oscar/oscar.c:2938
-msgid "Unknown error"
-msgstr "不明なエラー"
-
 #. Data is assumed to be the destination sn
-#: src/protocols/oscar/oscar.c:2973
+#: src/protocols/oscar/oscar.c:2982
 #, c-format
 msgid "Your message to %s did not get sent:"
 msgstr "%s へのメッセージは送信できませんでした:"
 
-#: src/protocols/oscar/oscar.c:3070
+#: src/protocols/oscar/oscar.c:3041
+#, c-format
+msgid "User information for %s unavailable:"
+msgstr "%s のユーザ情報は利用できません:"
+
+#: src/protocols/oscar/oscar.c:3080
 msgid "Voice"
 msgstr "音声"
 
-#: src/protocols/oscar/oscar.c:3073
+#: src/protocols/oscar/oscar.c:3083
 #, fuzzy
 msgid "AIM Direct IM"
 msgstr "直接IM"
 
-#: src/protocols/oscar/oscar.c:3079 src/protocols/oscar/oscar.c:6167
+#: src/protocols/oscar/oscar.c:3089 src/protocols/oscar/oscar.c:6249
 msgid "Get File"
 msgstr "ファイル取得"
 
-#: src/protocols/oscar/oscar.c:3082 src/protocols/oscar/oscar.c:6159
+#: 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:3086
+#: src/protocols/oscar/oscar.c:3096
 msgid "Games"
 msgstr "ゲーム"
 
 # FIXME This is likely wrong
-#: src/protocols/oscar/oscar.c:3089
+#: src/protocols/oscar/oscar.c:3099
 msgid "Add-Ins"
 msgstr "追加"
 
-#: src/protocols/oscar/oscar.c:3092
+#: src/protocols/oscar/oscar.c:3102
 msgid "Send Buddy List"
 msgstr "仲間リスト送信"
 
-#: src/protocols/oscar/oscar.c:3095
+#: src/protocols/oscar/oscar.c:3105
 #, fuzzy
 msgid "ICQ Direct Connect"
 msgstr "接続できません"
 
-#: src/protocols/oscar/oscar.c:3098
+#: src/protocols/oscar/oscar.c:3108
 msgid "AP User"
 msgstr "AP ユーザ"
 
-#: src/protocols/oscar/oscar.c:3101
+#: src/protocols/oscar/oscar.c:3111
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
-#: src/protocols/oscar/oscar.c:3104
+#: src/protocols/oscar/oscar.c:3114
 msgid "Nihilist"
 msgstr "ニヒリスト"
 
-#: src/protocols/oscar/oscar.c:3107
+#: src/protocols/oscar/oscar.c:3117
 msgid "ICQ Server Relay"
 msgstr "ICQ サーバ中継"
 
-#: src/protocols/oscar/oscar.c:3110
+#: src/protocols/oscar/oscar.c:3120
 msgid "Old ICQ UTF8"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3113
+#: src/protocols/oscar/oscar.c:3123
 msgid "Trillian Encryption"
 msgstr "Trillian 暗号化"
 
-#: src/protocols/oscar/oscar.c:3116
+#: src/protocols/oscar/oscar.c:3126
 msgid "ICQ UTF8"
 msgstr "ICQ UTF8"
 
-#: src/protocols/oscar/oscar.c:3119
+#: src/protocols/oscar/oscar.c:3129
 msgid "Hiptop"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3122
-msgid "Secure IM"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:3151
+#: src/protocols/oscar/oscar.c:3132
+msgid "Security Enabled"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3135
+#, fuzzy
+msgid "Video Chat"
+msgstr "チャットの追加"
+
+#: src/protocols/oscar/oscar.c:3138
+msgid "iChat AV"
+msgstr "iChat AV"
+
+#: src/protocols/oscar/oscar.c:3167
 #, c-format
 msgid "Username: <b>%s</b><br>\n"
 msgstr "ユーザ名: <b>%s</b><br>\n"
 
-#: src/protocols/oscar/oscar.c:3152
+#: src/protocols/oscar/oscar.c:3168
 #, c-format
 msgid "Warning Level: <b>%d%%</b><br>\n"
 msgstr "警告レベル: <b>%d%%</b><br>\n"
 
-#: src/protocols/oscar/oscar.c:3155
+#: src/protocols/oscar/oscar.c:3171
 #, c-format
 msgid "Online Since: <b>%s</b><br>\n"
 msgstr "オンライン開始 : <b>%s</b><br>\n"
 
-#: src/protocols/oscar/oscar.c:3159
+#: src/protocols/oscar/oscar.c:3175
 #, c-format
 msgid "Member Since: <b>%s</b><br>\n"
 msgstr "メンバー開始 : <b>%s</b><br>\n"
 
-#: src/protocols/oscar/oscar.c:3164
+#: src/protocols/oscar/oscar.c:3180
 #, c-format
 msgid "Idle: <b>%s</b>"
 msgstr "アイドル: <b>%s</b>"
 
-#: src/protocols/oscar/oscar.c:3167
+#: src/protocols/oscar/oscar.c:3183
 msgid "Idle: <b>Active</b>"
 msgstr "アイドル: <b>活動中</b>"
 
-#: src/protocols/oscar/oscar.c:3206
+#: src/protocols/oscar/oscar.c:3222
 msgid "Your AIM connection may be lost."
 msgstr "AIM への接続が失われたようです。"
 
-#: src/protocols/oscar/oscar.c:3594
+#: src/protocols/oscar/oscar.c:3616
 msgid "Rate limiting error."
 msgstr "速度制限エラー。"
 
-#: src/protocols/oscar/oscar.c:3595
+#: src/protocols/oscar/oscar.c:3617
 #, fuzzy
 msgid ""
 "The last action you attempted could not be performed because you are over "
@@ -6540,113 +6724,118 @@
 "速度制限を越えているためメッセージは送信しませんでした。10 秒待って再送してく"
 "ださい。"
 
-#: src/protocols/oscar/oscar.c:3656
+#: src/protocols/oscar/oscar.c:3680
 msgid ""
 "You have been disconnected because you have signed on with this screen name "
 "at another location."
 msgstr "違う場所で同じニックを利用して接続したため、切断されました。"
 
-#: src/protocols/oscar/oscar.c:3658
+#: src/protocols/oscar/oscar.c:3682
 msgid "You have been signed off for an unknown reason."
 msgstr "原因不明ですが、あなたはサインオフしました."
 
-#: src/protocols/oscar/oscar.c:3903 src/protocols/oscar/oscar.c:3909
+#: src/protocols/oscar/oscar.c:3713
+#, fuzzy
+msgid "Finalizing connection"
+msgstr "接続開始エラー"
+
+#: src/protocols/oscar/oscar.c:3973 src/protocols/oscar/oscar.c:3979
 msgid "Email Address"
 msgstr "メールアドレス"
 
-#: src/protocols/oscar/oscar.c:3914
+#: src/protocols/oscar/oscar.c:3984
 msgid "Mobile Phone"
 msgstr "携帯電話"
 
-#: src/protocols/oscar/oscar.c:3917 src/protocols/trepia/trepia.c:272
-#: src/protocols/trepia/trepia.c:413
+#: src/protocols/oscar/oscar.c:3987 src/protocols/trepia/trepia.c:281
+#: src/protocols/trepia/trepia.c:422
 msgid "Female"
 msgstr "女性"
 
-#: src/protocols/oscar/oscar.c:3917 src/protocols/trepia/trepia.c:271
-#: src/protocols/trepia/trepia.c:413
+#: src/protocols/oscar/oscar.c:3987 src/protocols/trepia/trepia.c:280
+#: src/protocols/trepia/trepia.c:422
 msgid "Male"
 msgstr "男性"
 
-#: src/protocols/oscar/oscar.c:3934
+#: src/protocols/oscar/oscar.c:4004
 msgid "Personal Web Page"
 msgstr "個人的なウェブページ"
 
-#: src/protocols/oscar/oscar.c:3937
+#: src/protocols/oscar/oscar.c:4007
 #, fuzzy
 msgid "Additional Information"
 msgstr "追加情報"
 
-#: src/protocols/oscar/oscar.c:3941
+#: src/protocols/oscar/oscar.c:4011
 msgid "Home Address"
 msgstr "自宅の住所"
 
-#: src/protocols/oscar/oscar.c:3952 src/protocols/oscar/oscar.c:3968
+#: src/protocols/oscar/oscar.c:4022 src/protocols/oscar/oscar.c:4038
 msgid "Zip Code"
 msgstr "郵便番号"
 
-#: src/protocols/oscar/oscar.c:3957
+#: src/protocols/oscar/oscar.c:4027
 msgid "Work Address"
 msgstr "勤務先住所"
 
-#: src/protocols/oscar/oscar.c:3973
+#: src/protocols/oscar/oscar.c:4043
 msgid "Work Information"
 msgstr "勤務先情報"
 
-#: src/protocols/oscar/oscar.c:3975
+#: src/protocols/oscar/oscar.c:4045
 msgid "Company"
 msgstr "会社"
 
-#: src/protocols/oscar/oscar.c:3978
+#: src/protocols/oscar/oscar.c:4048
 msgid "Division"
 msgstr "所属"
 
-#: src/protocols/oscar/oscar.c:3981
+#: src/protocols/oscar/oscar.c:4051
 msgid "Position"
 msgstr "役職"
 
-#: src/protocols/oscar/oscar.c:3984
+#: src/protocols/oscar/oscar.c:4054
 msgid "Web Page"
 msgstr "ウェブページ"
 
-#: src/protocols/oscar/oscar.c:3990
+#: src/protocols/oscar/oscar.c:4060
 #, fuzzy, c-format
 msgid "ICQ Info for %s"
 msgstr "%s の情報を変更:"
 
-#: src/protocols/oscar/oscar.c:4040
+#: src/protocols/oscar/oscar.c:4110
 #, fuzzy
 msgid "Pop-Up Message"
 msgstr "新しいメッセージ"
 
-#: src/protocols/oscar/oscar.c:4061
+#: src/protocols/oscar/oscar.c:4131
 #, c-format
 msgid "The following screennames are associated with %s"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:4065
+#: src/protocols/oscar/oscar.c:4135
 msgid "Search Results"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:4082
+#: src/protocols/oscar/oscar.c:4152
 #, c-format
 msgid "No results found for email address %s"
 msgstr "%sというメールアドレスに対して結果がありませんでした"
 
-#: src/protocols/oscar/oscar.c:4103
+#: src/protocols/oscar/oscar.c:4173
 #, c-format
 msgid "You should receive an email asking to confirm %s."
 msgstr "%sを確認するためにメールを受信するはずです."
 
-#: src/protocols/oscar/oscar.c:4105
+#: src/protocols/oscar/oscar.c:4175
 msgid "Account Confirmation Requested"
 msgstr "アカウント認証を要求しました"
 
-#: src/protocols/oscar/oscar.c:4133
+#: src/protocols/oscar/oscar.c:4203
 msgid "Error Changing Account Info"
 msgstr "アカウント情報変更エラー"
 
-#: src/protocols/oscar/oscar.c:4136
+#: src/protocols/oscar/oscar.c:4206
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -6655,7 +6844,7 @@
 "エラー 0x%04x: 要求されたスクリーン名がオリジナルと異なっているため、整形でき"
 "ません。"
 
-#: src/protocols/oscar/oscar.c:4139
+#: src/protocols/oscar/oscar.c:4209
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -6664,14 +6853,14 @@
 "エラー 0x%04x: 要求されたスクリーン名が空白で終わっているため、整形できませ"
 "ん。"
 
-#: src/protocols/oscar/oscar.c:4142
+#: src/protocols/oscar/oscar.c:4212
 #, 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:4145
+#: src/protocols/oscar/oscar.c:4215
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because there is already a "
@@ -6680,7 +6869,7 @@
 "エラー 0x%04x: このスクリーン名に対してすでに要求があるため、メールアドレスを"
 "変更できません。"
 
-#: src/protocols/oscar/oscar.c:4148
+#: src/protocols/oscar/oscar.c:4218
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address has "
@@ -6689,7 +6878,7 @@
 "エラー 0x%04x: たくさんのスクリーン名に割り当てられているため、このメールアド"
 "レスには変更できません。"
 
-#: src/protocols/oscar/oscar.c:4151
+#: src/protocols/oscar/oscar.c:4221
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address is "
@@ -6698,12 +6887,12 @@
 "エラー 0x%04x: このアドレスは不正なので、このメールアドレスには変更できませ"
 "ん。"
 
-#: src/protocols/oscar/oscar.c:4154
+#: src/protocols/oscar/oscar.c:4224
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "エラー 0x%04x: 不明なエラー。"
 
-#: src/protocols/oscar/oscar.c:4164
+#: src/protocols/oscar/oscar.c:4234
 #, c-format
 msgid ""
 "Your screen name is currently formatted as follows:\n"
@@ -6712,20 +6901,20 @@
 "あなたのスクリーン名は、現在次のように整形されています:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:4165 src/protocols/oscar/oscar.c:4172
+#: src/protocols/oscar/oscar.c:4235 src/protocols/oscar/oscar.c:4242
 msgid "Account Info"
 msgstr "アカウント情報"
 
-#: src/protocols/oscar/oscar.c:4170
+#: src/protocols/oscar/oscar.c:4240
 #, c-format
 msgid "The email address for %s is %s"
 msgstr "%s のメールアドレスは %s です"
 
-#: src/protocols/oscar/oscar.c:4400
+#: src/protocols/oscar/oscar.c:4472
 msgid "Unable to set AIM profile."
 msgstr "AIM プロフィールをセットできません。"
 
-#: src/protocols/oscar/oscar.c:4401
+#: src/protocols/oscar/oscar.c:4473
 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 "
@@ -6735,7 +6924,7 @@
 "す。あなたのプロフィールは設定されずに残っています。接続が完了してから、再度"
 "試してください。"
 
-#: src/protocols/oscar/oscar.c:4431
+#: src/protocols/oscar/oscar.c:4500
 #, fuzzy, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  Gaim has truncated "
@@ -6750,15 +6939,15 @@
 "プロフィールの長さが最大値 (%d バイト) に達しました。Gaim は切り捨てて設定し"
 "ます。"
 
-#: src/protocols/oscar/oscar.c:4436
+#: src/protocols/oscar/oscar.c:4505
 msgid "Profile too long."
 msgstr "プロフィールが長すぎます"
 
-#: src/protocols/oscar/oscar.c:4455
+#: src/protocols/oscar/oscar.c:4522
 msgid "Unable to set AIM away message."
 msgstr "AIM 離席メッセージをセットできません。"
 
-#: src/protocols/oscar/oscar.c:4456
+#: src/protocols/oscar/oscar.c:4523
 msgid ""
 "You have probably requested to set your away message before the login "
 "procedure completed.  You remain in a \"present\" state; try setting it "
@@ -6767,7 +6956,7 @@
 "ログインの手続きが完了する前に離席メッセージを設定しようとしているようです。"
 "あなたは「現在の」状態のままです。接続が完了してから、再度試してください。"
 
-#: src/protocols/oscar/oscar.c:4496
+#: src/protocols/oscar/oscar.c:4563
 #, fuzzy, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  Gaim has "
@@ -6782,16 +6971,16 @@
 "離席メッセージの長さの最大値%d バイトを越えました。Gaim は切り捨てて設定しま"
 "した。"
 
-#: src/protocols/oscar/oscar.c:4501
+#: src/protocols/oscar/oscar.c:4568
 msgid "Away message too long."
 msgstr "離席メッセージが長すぎます"
 
-#: src/protocols/oscar/oscar.c:4721
+#: src/protocols/oscar/oscar.c:4782
 #, fuzzy
 msgid "Unable To Retrieve Buddy List"
 msgstr "仲間リストを取得できません"
 
-#: src/protocols/oscar/oscar.c:4722
+#: src/protocols/oscar/oscar.c:4783
 #, fuzzy
 msgid ""
 "Gaim was temporarily unable to retrieve your buddy list from the AIM "
@@ -6802,12 +6991,12 @@
 "ストは失われてはいません.おそらく数時間後には再度利用できるようになっている"
 "でしょう."
 
-#: src/protocols/oscar/oscar.c:4813 src/protocols/oscar/oscar.c:4814
-#: src/protocols/oscar/oscar.c:4819
+#: src/protocols/oscar/oscar.c:4875 src/protocols/oscar/oscar.c:4876
+#: src/protocols/oscar/oscar.c:4881
 msgid "Orphans"
 msgstr "みなしご"
 
-#: src/protocols/oscar/oscar.c:4985
+#: src/protocols/oscar/oscar.c:5047
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -6816,15 +7005,15 @@
 "仲間 %s を追加することができませんでした.仲間の数が多すぎます.一人削除して"
 "再度挑戦してください."
 
-#: src/protocols/oscar/oscar.c:4985 src/protocols/oscar/oscar.c:4998
+#: src/protocols/oscar/oscar.c:5047 src/protocols/oscar/oscar.c:5060
 msgid "(no name)"
 msgstr "(名前無し)"
 
-#: src/protocols/oscar/oscar.c:4986 src/protocols/oscar/oscar.c:4999
+#: src/protocols/oscar/oscar.c:5048 src/protocols/oscar/oscar.c:5061
 msgid "Unable To Add"
 msgstr "追加できません"
 
-#: src/protocols/oscar/oscar.c:4998
+#: src/protocols/oscar/oscar.c:5060
 #, c-format
 msgid ""
 "Could not add the buddy %s for an unknown reason.  The most common reason "
@@ -6835,7 +7024,7 @@
 "これはバディーリストに追加可能なバディーの数を越えてしまっているということが"
 "あり得ます."
 
-#: src/protocols/oscar/oscar.c:5033
+#: src/protocols/oscar/oscar.c:5095
 #, c-format
 msgid ""
 "The user %s has given you permission to add you to their buddy list.  Do you "
@@ -6844,11 +7033,11 @@
 "ユーザ %s があなたを仲間リストに加えることを許可しました。彼らを加えたいです"
 "か?"
 
-#: src/protocols/oscar/oscar.c:5039
+#: src/protocols/oscar/oscar.c:5101
 msgid "Authorization Given"
 msgstr "承認が得られました"
 
-#: src/protocols/oscar/oscar.c:5072
+#: src/protocols/oscar/oscar.c:5134
 #, c-format
 msgid ""
 "The user %s wants to add you to their buddy list for the following reason:\n"
@@ -6858,17 +7047,17 @@
 "%s"
 
 #. Granted
-#: src/protocols/oscar/oscar.c:5114
+#: src/protocols/oscar/oscar.c:5176
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
 msgstr "ユーザ %s は、コンタクトリストに彼らを加えることを承認しました。"
 
-#: src/protocols/oscar/oscar.c:5115
+#: src/protocols/oscar/oscar.c:5177
 msgid "Authorization Granted"
 msgstr "承認が得られました"
 
 #. Denied
-#: src/protocols/oscar/oscar.c:5118
+#: src/protocols/oscar/oscar.c:5180
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -6879,58 +7068,59 @@
 "した:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:5119
+#: src/protocols/oscar/oscar.c:5181
 msgid "Authorization Denied"
 msgstr "承認は拒否されました"
 
 # FIXME This is likely wrong
-#: src/protocols/oscar/oscar.c:5156 src/protocols/toc/toc.c:1263
-msgid "Exchange:"
-msgstr "交換:"
-
-#: src/protocols/oscar/oscar.c:5379
+#: src/protocols/oscar/oscar.c:5218 src/protocols/toc/toc.c:1264
+msgid "_Exchange:"
+msgstr "交換 (_E):"
+
+#: src/protocols/oscar/oscar.c:5456
 msgid "<b>Status:</b> "
 msgstr "<b>状態:</b> "
 
-#: src/protocols/oscar/oscar.c:5388
-msgid "<b>Logged In:</b> "
-msgstr "<b>ログインしました:</b> "
-
-#: src/protocols/oscar/oscar.c:5400
+#: src/protocols/oscar/oscar.c:5468
 msgid "<b>IP Address:</b> "
 msgstr "<b>IP アドレス:</b> "
 
-#: src/protocols/oscar/oscar.c:5408
+#: src/protocols/oscar/oscar.c:5476
 msgid "<b>Capabilities:</b> "
 msgstr "<b>機能:</b> "
 
-#: src/protocols/oscar/oscar.c:5415
+#: src/protocols/oscar/oscar.c:5485
+#, fuzzy
+msgid "<b>Buddy Comment:</b> "
+msgstr "仲間名 (_B):"
+
+#: src/protocols/oscar/oscar.c:5494
 #, fuzzy
 msgid "<b>Available:</b> "
 msgstr "<b>機能:</b> "
 
-#: src/protocols/oscar/oscar.c:5431
+#: src/protocols/oscar/oscar.c:5512
 msgid "<b>Away Message:</b> "
 msgstr "<b>離席メッセージ:</b> "
 
-#: src/protocols/oscar/oscar.c:5440
+#: src/protocols/oscar/oscar.c:5521
 msgid "<b>Status:</b> Not Authorized"
 msgstr "<b>状態:</b> 未認証"
 
-#: src/protocols/oscar/oscar.c:5474 src/protocols/yahoo/yahoo.c:2030
+#: src/protocols/oscar/oscar.c:5555 src/protocols/yahoo/yahoo.c:2191
 msgid "Offline"
 msgstr "オフライン "
 
-#: src/protocols/oscar/oscar.c:5921
+#: src/protocols/oscar/oscar.c:6003
 msgid "Unable to open Direct IM"
 msgstr "直接IMを開けません"
 
-#: src/protocols/oscar/oscar.c:5934
+#: src/protocols/oscar/oscar.c:6016
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr "%s を利用した直接 IM 接続の開始を選択しています。"
 
-#: src/protocols/oscar/oscar.c:5937
+#: src/protocols/oscar/oscar.c:6019
 msgid ""
 "Because this reveals your IP address, it may be considered a privacy risk.  "
 "Do you wish to continue?"
@@ -6938,54 +7128,54 @@
 "なぜなら、あなたの IP アドレスを明かすことになるからです。これにより、プライ"
 "バシーのリスクが考えられます。続けますか?"
 
-#: src/protocols/oscar/oscar.c:6112
+#: src/protocols/oscar/oscar.c:6194
 #, fuzzy
 msgid "Buddy Comment:"
 msgstr "仲間名 (_B):"
 
-#: src/protocols/oscar/oscar.c:6128
+#: src/protocols/oscar/oscar.c:6210
 #, fuzzy
 msgid "Edit Buddy Comment"
 msgstr "掴む仲間を編集"
 
-#: src/protocols/oscar/oscar.c:6136
+#: src/protocols/oscar/oscar.c:6218
 msgid "Get Status Msg"
 msgstr "ステータスメッセージを取得"
 
-#: src/protocols/oscar/oscar.c:6151
+#: src/protocols/oscar/oscar.c:6233
 msgid "Direct IM"
 msgstr "直接IM"
 
-#: src/protocols/oscar/oscar.c:6180
+#: src/protocols/oscar/oscar.c:6262
 msgid "Re-request Authorization"
 msgstr "承認の再要求"
 
-#: src/protocols/oscar/oscar.c:6201
+#: src/protocols/oscar/oscar.c:6283
 msgid "The new formatting is invalid."
 msgstr "新しいフォーマットは不正です."
 
-#: src/protocols/oscar/oscar.c:6202
+#: src/protocols/oscar/oscar.c:6284
 msgid "Screenname formatting can change only capitalization and whitespace."
 msgstr "スクリーン名フォーマットは大文字化と空白文字しか変更できません."
 
-#: src/protocols/oscar/oscar.c:6208
+#: src/protocols/oscar/oscar.c:6290
 msgid "New screenname formatting:"
 msgstr "新しいスクリーン名フォーマット:"
 
-#: src/protocols/oscar/oscar.c:6257
+#: src/protocols/oscar/oscar.c:6339
 msgid "Change Address To:"
 msgstr "このアドレスに変更する:"
 
-#: src/protocols/oscar/oscar.c:6301
+#: src/protocols/oscar/oscar.c:6383
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>あなたは承認を待っていません</i>"
 
-#: src/protocols/oscar/oscar.c:6304
+#: src/protocols/oscar/oscar.c:6386
 #, fuzzy
 msgid "You are awaiting authorization from the following buddies"
 msgstr "あなたは以下の仲間からの承認を待っています:<BR>"
 
-#: src/protocols/oscar/oscar.c:6305
+#: src/protocols/oscar/oscar.c:6387
 #, fuzzy
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
@@ -6994,63 +7184,75 @@
 "%s<BR><BR>これらの仲間からの認証を再要求することを,右クリックして「認証を再"
 "要求する」を選択すればできます."
 
-#: src/protocols/oscar/oscar.c:6319
+#: src/protocols/oscar/oscar.c:6401
 msgid "Find Buddy by E-mail"
 msgstr "E-mailから仲間を探す"
 
-#: src/protocols/oscar/oscar.c:6320
+#: src/protocols/oscar/oscar.c:6402
 msgid "Search for a buddy by e-mail address"
 msgstr "メールで仲間を検索"
 
-#: src/protocols/oscar/oscar.c:6321
+#: src/protocols/oscar/oscar.c:6403
 msgid "Type the e-mail address of the buddy you are searching for."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:6324
+#: src/protocols/oscar/oscar.c:6406
 msgid "Search"
 msgstr "検索"
 
-#: src/protocols/oscar/oscar.c:6337
+#: src/protocols/oscar/oscar.c:6420
 #, fuzzy
 msgid "Available Message:"
 msgstr "可視"
 
-#: src/protocols/oscar/oscar.c:6415
-#, fuzzy
-msgid "Set Available Message"
+#: src/protocols/oscar/oscar.c:6421
+msgid "I'm doing work and hoping for a distraction--IM me!"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:6492
+msgid "Set User Info..."
+msgstr "ユーザ情報の登録..."
+
+#: src/protocols/oscar/oscar.c:6499
+#, fuzzy
+msgid "Set Available Message..."
 msgstr "離席メッセージを設定"
 
-#: src/protocols/oscar/oscar.c:6429
+#: src/protocols/oscar/oscar.c:6506
+msgid "Change Password..."
+msgstr "パスワード変更..."
+
+#: src/protocols/oscar/oscar.c:6513
 msgid "Change Password (URL)"
 msgstr "パスワード変更 (URL)"
 
-#: src/protocols/oscar/oscar.c:6437
+#: src/protocols/oscar/oscar.c:6521
 msgid "Configure IM Forwarding (URL)"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:6448
-msgid "Format Screenname"
-msgstr "スクリーン名のフォーマット:"
-
-#: src/protocols/oscar/oscar.c:6454
+#: src/protocols/oscar/oscar.c:6532
+msgid "Format Screenname..."
+msgstr "スクリーン名のフォーマット..."
+
+#: src/protocols/oscar/oscar.c:6538
 msgid "Confirm Account"
 msgstr "アカウントを確認"
 
-#: src/protocols/oscar/oscar.c:6460
-msgid "Display Current Registered Address"
+#: src/protocols/oscar/oscar.c:6544
+msgid "Display Currently Registered Address"
 msgstr "現在登録されているアドレスを表示"
 
-#: src/protocols/oscar/oscar.c:6466
-msgid "Change Current Registered Address"
+#: src/protocols/oscar/oscar.c:6550
+msgid "Change Currently Registered Address..."
 msgstr "現在登録されているアドレスを変更"
 
-#: src/protocols/oscar/oscar.c:6475
+#: src/protocols/oscar/oscar.c:6559
 msgid "Show Buddies Awaiting Authorization"
 msgstr "承認を待っている仲間を表示"
 
-#: src/protocols/oscar/oscar.c:6483
-msgid "Search for Buddy by Email"
-msgstr "メールで仲間を検索"
+#: src/protocols/oscar/oscar.c:6567
+msgid "Search for Buddy by Email..."
+msgstr "メールで仲間を検索..."
 
 #. *< api_version
 #. *< type
@@ -7062,15 +7264,15 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/oscar/oscar.c:6604 src/protocols/oscar/oscar.c:6606
+#: src/protocols/oscar/oscar.c:6687 src/protocols/oscar/oscar.c:6689
 msgid "AIM/ICQ Protocol Plugin"
 msgstr "AIM/ICQプロトコルプラグイン"
 
-#: src/protocols/oscar/oscar.c:6623
+#: src/protocols/oscar/oscar.c:6706
 msgid "Auth host"
 msgstr "認証ホスト"
 
-#: src/protocols/oscar/oscar.c:6628
+#: src/protocols/oscar/oscar.c:6711
 msgid "Auth port"
 msgstr "認証ポート"
 
@@ -7224,44 +7426,44 @@
 "これが発生した場合、TOC はメッセージの送信を無視し、メッセージを送っても蹴ら"
 "れます。Gaim はすべて抑止します。 一時的ですので我慢してください。"
 
-#: src/protocols/toc/toc.c:1401
+#: src/protocols/toc/toc.c:1402
 msgid "Get Dir Info"
 msgstr "ディレクトリ情報取得"
 
-#: src/protocols/toc/toc.c:1538
+#: src/protocols/toc/toc.c:1539
 msgid "Set Dir Info"
 msgstr "ディレクトリ情報設定"
 
-#: src/protocols/toc/toc.c:1663
+#: src/protocols/toc/toc.c:1664
 #, c-format
 msgid "Could not open %s for writing!"
 msgstr "書き込むために %s を開けません!"
 
-#: src/protocols/toc/toc.c:1699
+#: src/protocols/toc/toc.c:1700
 msgid "File transfer failed; other side probably canceled."
 msgstr "ファイル転送が失敗しました.おそらく向こう側がキャンセルしたのでしょう"
 
-#: src/protocols/toc/toc.c:1744 src/protocols/toc/toc.c:1784
-#: src/protocols/toc/toc.c:1996
+#: src/protocols/toc/toc.c:1745 src/protocols/toc/toc.c:1785
+#: src/protocols/toc/toc.c:1909 src/protocols/toc/toc.c:1997
 msgid "Could not connect for transfer."
 msgstr "転送のための接続ができません!"
 
-#: src/protocols/toc/toc.c:1908
-msgid "Could not connect for transfer!"
-msgstr "転送のための接続ができません!"
-
-#: src/protocols/toc/toc.c:1941
+#: src/protocols/toc/toc.c:1942
 msgid "Could not write file header.  The file will not be transferred."
 msgstr "ファイルヘッダを書けません。ファイルは送信されません。"
 
-#: src/protocols/toc/toc.c:2075
+#: src/protocols/toc/toc.c:2042
+msgid "Gaim - Save As..."
+msgstr "Gaim - 名前を付けて保存..."
+
+#: src/protocols/toc/toc.c:2076
 #, c-format
 msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
 msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
 msgstr[0] "%s の %s への %d 個のファイルの要求: %s (%.2f %s)%s%s"
 msgstr[1] "%s の %s への %d 個のファイルの要求: %s (%.2f %s)%s%s"
 
-#: src/protocols/toc/toc.c:2082
+#: src/protocols/toc/toc.c:2083
 #, c-format
 msgid "%s requests you to send them a file"
 msgstr "%sがファイルを送るよう要求しています"
@@ -7289,79 +7491,74 @@
 msgstr "TOC ポート番号"
 
 #. Basic Profile group.
-#: src/protocols/trepia/trepia.c:254
+#: src/protocols/trepia/trepia.c:263
 msgid "Basic Profile"
 msgstr ""
 
 #. E-Mail Address
-#: src/protocols/trepia/trepia.c:285
+#: src/protocols/trepia/trepia.c:294
 msgid "E-Mail Address"
 msgstr "メールアドレス"
 
-#: src/protocols/trepia/trepia.c:291
+#: src/protocols/trepia/trepia.c:300
 #, fuzzy
 msgid "Profile Information"
 msgstr "勤務先情報:"
 
 #. Instant Messagers
-#: src/protocols/trepia/trepia.c:297
+#: src/protocols/trepia/trepia.c:306
 #, fuzzy
 msgid "Instant Messagers"
 msgstr "Gaim インスタントメッセンジャー"
 
 #. AIM
-#: src/protocols/trepia/trepia.c:301
+#: src/protocols/trepia/trepia.c:310
 msgid "AIM"
 msgstr "AIM"
 
 #. ICQ
-#: src/protocols/trepia/trepia.c:305
+#: src/protocols/trepia/trepia.c:314
 msgid "ICQ UIN"
 msgstr "ICQ UIN"
 
 #. MSN
-#: src/protocols/trepia/trepia.c:309
+#: src/protocols/trepia/trepia.c:318
 msgid "MSN"
 msgstr "MSN"
 
 #. Yahoo
-#: src/protocols/trepia/trepia.c:313
+#: src/protocols/trepia/trepia.c:322
 msgid "Yahoo"
 msgstr "Yahoo"
 
 #. I'm From
-#: src/protocols/trepia/trepia.c:318
+#: src/protocols/trepia/trepia.c:327
 msgid "I'm From"
 msgstr ""
 
 #. Call the dialog.
-#: src/protocols/trepia/trepia.c:335
+#: src/protocols/trepia/trepia.c:344
 msgid "Set your Trepia profile data."
 msgstr ""
 
-#: src/protocols/trepia/trepia.c:459
+#: src/protocols/trepia/trepia.c:468
 msgid "Profile"
 msgstr "プロフィール"
 
-#: src/protocols/trepia/trepia.c:481
+#: src/protocols/trepia/trepia.c:490
 msgid "Set Profile"
 msgstr ""
 
-#: src/protocols/trepia/trepia.c:517
+#: src/protocols/trepia/trepia.c:526
 msgid "Visit Homepage"
 msgstr ""
 
-#: src/protocols/trepia/trepia.c:863 src/protocols/trepia/trepia.c:866
+#: src/protocols/trepia/trepia.c:872 src/protocols/trepia/trepia.c:875
 #, fuzzy
 msgid "Local Users"
 msgstr "無効なユーザ"
 
-#: src/protocols/trepia/trepia.c:962
-#, fuzzy
-msgid "Read error"
-msgstr "不正なエラー"
-
-#: src/protocols/trepia/trepia.c:1063
+#: src/protocols/trepia/trepia.c:1073
 #, fuzzy
 msgid "Logging in"
 msgstr "ログ"
@@ -7376,20 +7573,31 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/trepia/trepia.c:1311 src/protocols/trepia/trepia.c:1313
+#: src/protocols/trepia/trepia.c:1320 src/protocols/trepia/trepia.c:1322
 msgid "Trepia Protocol Plugin"
 msgstr "Trepiaプロトコルプラグイン"
 
-#: src/protocols/yahoo/yahoo.c:700
+#: src/protocols/yahoo/yahoo.c:297
+msgid ""
+"You have been logged off as you have logged in on a different machine or "
+"device."
+msgstr ""
+
+#: src/protocols/yahoo/yahoo.c:730
 msgid "Your Yahoo! message did not get sent."
 msgstr "Yahoo! メッセージを送ることができませんでした。"
 
-#: src/protocols/yahoo/yahoo.c:758
+#: src/protocols/yahoo/yahoo.c:772
+#, c-format
+msgid "Yahoo! system message for %s:"
+msgstr ""
+
+#: src/protocols/yahoo/yahoo.c:838
 #, fuzzy, c-format
 msgid "%s has (retroactively) denied your request to add them to your list."
 msgstr "ユーザ %s は、コンタクトリストに彼らを加えることを承認しました。"
 
-#: src/protocols/yahoo/yahoo.c:760
+#: src/protocols/yahoo/yahoo.c:841
 #, fuzzy, c-format
 msgid ""
 "%s has (retroactively) denied your request to add them to your list for the "
@@ -7399,12 +7607,12 @@
 "した:\n"
 "%s"
 
-#: src/protocols/yahoo/yahoo.c:761
+#: src/protocols/yahoo/yahoo.c:844
 #, fuzzy
 msgid "Add buddy rejected"
 msgstr "掴む仲間に加える"
 
-#: src/protocols/yahoo/yahoo.c:1381
+#: src/protocols/yahoo/yahoo.c:1494
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -7412,153 +7620,168 @@
 "on to Yahoo.  Check %s for updates."
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:1384
+#: src/protocols/yahoo/yahoo.c:1497
 #, fuzzy
 msgid "Failed Yahoo! Authentication"
 msgstr "認証中"
 
-#: src/protocols/yahoo/yahoo.c:1457
+#: src/protocols/yahoo/yahoo.c:1570
 #, 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:1460
+#: src/protocols/yahoo/yahoo.c:1573
 #, fuzzy
 msgid "Ignore buddy?"
 msgstr "無視"
 
-#: src/protocols/yahoo/yahoo.c:1489
+#: src/protocols/yahoo/yahoo.c:1606
 msgid "Invalid username."
 msgstr "無効なユーザ名"
 
-#: src/protocols/yahoo/yahoo.c:1492
+#: src/protocols/yahoo/yahoo.c:1609
 #, fuzzy
 msgid "Incorrect password."
 msgstr "間違ったパスワードです"
 
-#: src/protocols/yahoo/yahoo.c:1495
-msgid "Unknown error."
-msgstr "不明なエラー"
-
-#: src/protocols/yahoo/yahoo.c:1542
+#: src/protocols/yahoo/yahoo.c:1612
+msgid "Your account is locked, please log in to the yahoo website."
+msgstr ""
+
+#: src/protocols/yahoo/yahoo.c:1615
+#, c-format
+msgid "Unknown error number %d."
+msgstr "不明なエラーコード %d"
+
+#: src/protocols/yahoo/yahoo.c:1672
 #, c-format
 msgid "Could not add buddy %s to group %s to the server list on account %s."
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:1544
+#: src/protocols/yahoo/yahoo.c:1674
 #, fuzzy
 msgid "Could not add buddy to server list"
 msgstr "仲間リストのエクスポートができませんでした"
 
-#: src/protocols/yahoo/yahoo.c:1646 src/protocols/yahoo/yahoo.c:1776
+#: src/protocols/yahoo/yahoo.c:1784 src/protocols/yahoo/yahoo.c:1914
 #, fuzzy
 msgid "Unable to read"
 msgstr "書き込めません"
 
-#: src/protocols/yahoo/yahoo.c:1801 src/protocols/yahoo/yahoo.c:1910
-#: src/protocols/yahoo/yahoo.c:1934
+#: src/protocols/yahoo/yahoo.c:1939 src/protocols/yahoo/yahoo.c:2048
+#: src/protocols/yahoo/yahoo.c:2089
 #, fuzzy
 msgid "Connection problem"
 msgstr "接続エラー"
 
-#: src/protocols/yahoo/yahoo.c:2012 src/protocols/yahoo/yahoo.c:2310
-#: src/protocols/yahoo/yahoo.c:2408
+#: src/protocols/yahoo/yahoo.c:2173 src/protocols/yahoo/yahoo.c:2498
+#: src/protocols/yahoo/yahoo.c:2604
 msgid "Not At Home"
 msgstr "家に居ません"
 
-#: src/protocols/yahoo/yahoo.c:2014 src/protocols/yahoo/yahoo.c:2312
-#: src/protocols/yahoo/yahoo.c:2409
+#: src/protocols/yahoo/yahoo.c:2175 src/protocols/yahoo/yahoo.c:2500
+#: src/protocols/yahoo/yahoo.c:2605
 msgid "Not At Desk"
 msgstr "デスクに居ません"
 
-#: src/protocols/yahoo/yahoo.c:2016 src/protocols/yahoo/yahoo.c:2314
-#: src/protocols/yahoo/yahoo.c:2410
+#: src/protocols/yahoo/yahoo.c:2177 src/protocols/yahoo/yahoo.c:2502
+#: src/protocols/yahoo/yahoo.c:2606
 msgid "Not In Office"
 msgstr "オフィスに居ません"
 
-#: src/protocols/yahoo/yahoo.c:2020 src/protocols/yahoo/yahoo.c:2318
-#: src/protocols/yahoo/yahoo.c:2412
+#: src/protocols/yahoo/yahoo.c:2181 src/protocols/yahoo/yahoo.c:2506
+#: src/protocols/yahoo/yahoo.c:2608
 msgid "On Vacation"
 msgstr "休暇中"
 
-#: src/protocols/yahoo/yahoo.c:2024 src/protocols/yahoo/yahoo.c:2322
-#: src/protocols/yahoo/yahoo.c:2414
+#: src/protocols/yahoo/yahoo.c:2185 src/protocols/yahoo/yahoo.c:2510
+#: src/protocols/yahoo/yahoo.c:2610
 msgid "Stepped Out"
 msgstr "ちょっとそこまで"
 
-#: src/protocols/yahoo/yahoo.c:2088 src/protocols/yahoo/yahoo.c:2122
+#: src/protocols/yahoo/yahoo.c:2249 src/protocols/yahoo/yahoo.c:2281
 #, fuzzy
 msgid "Not on server list"
 msgstr "リストにいません"
 
-#: src/protocols/yahoo/yahoo.c:2178
+#: src/protocols/yahoo/yahoo.c:2337
 #, fuzzy
 msgid "Join in Chat"
 msgstr "チャットへ加入"
 
-#: src/protocols/yahoo/yahoo.c:2184
+#: src/protocols/yahoo/yahoo.c:2343
 msgid "Initiate Conference"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:2230
+#: src/protocols/yahoo/yahoo.c:2396
 msgid "Active which ID?"
 msgstr "どのIDを有効化しますかID"
 
-#: src/protocols/yahoo/yahoo.c:2241
-msgid "Activate ID"
-msgstr "IDの有効化"
-
-#: src/protocols/yahoo/yahoo.c:2599
+#: src/protocols/yahoo/yahoo.c:2404
+#, fuzzy
+msgid "Join who in chat?"
+msgstr "チャットへ加入"
+
+#: src/protocols/yahoo/yahoo.c:2415
+msgid "Activate ID..."
+msgstr "IDの有効化..."
+
+#: src/protocols/yahoo/yahoo.c:2421
+#, fuzzy
+msgid "Join user in chat..."
+msgstr "チャットに加わる ..."
+
+#: src/protocols/yahoo/yahoo.c:2803
 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:2600 src/protocols/yahoo/yahoo.c:2620
+#: src/protocols/yahoo/yahoo.c:2804 src/protocols/yahoo/yahoo.c:2827
 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:2619
+#: src/protocols/yahoo/yahoo.c:2826
 msgid ""
 "<b>Sorry, non-English profiles are not supported at this time.</b><br><br>\n"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:2664
+#: src/protocols/yahoo/yahoo.c:2874 src/protocols/yahoo/yahoo.c:2875
 msgid "Yahoo! ID"
 msgstr "Yahoo! ID"
 
 # NOTE official translation
-#: src/protocols/yahoo/yahoo.c:2724 src/protocols/yahoo/yahoo.c:2728
-#: src/protocols/yahoo/yahoo.c:2732
+#: src/protocols/yahoo/yahoo.c:2919 src/protocols/yahoo/yahoo.c:2922
+#: src/protocols/yahoo/yahoo.c:2925
 msgid "Hobbies"
 msgstr "趣味"
 
 # NOTE official translation
-#: src/protocols/yahoo/yahoo.c:2743 src/protocols/yahoo/yahoo.c:2747
+#: src/protocols/yahoo/yahoo.c:2934 src/protocols/yahoo/yahoo.c:2937
 msgid "Latest News"
 msgstr "最近の出来事"
 
-#: src/protocols/yahoo/yahoo.c:2765
+#: src/protocols/yahoo/yahoo.c:2951
 msgid "Home Page"
 msgstr "ウェブページ"
 
-#: src/protocols/yahoo/yahoo.c:2779
+#: src/protocols/yahoo/yahoo.c:2963
 msgid "Cool Link 1"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:2784
+#: src/protocols/yahoo/yahoo.c:2967
 msgid "Cool Link 2"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:2787
+#: src/protocols/yahoo/yahoo.c:2969
 msgid "Cool Link 3"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:2793
+#: src/protocols/yahoo/yahoo.c:2975
 msgid "Member Since"
 msgstr "メンバー開始"
 
@@ -7572,18 +7795,28 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/yahoo/yahoo.c:2958 src/protocols/yahoo/yahoo.c:2960
+#: src/protocols/yahoo/yahoo.c:3175 src/protocols/yahoo/yahoo.c:3177
 msgid "Yahoo Protocol Plugin"
 msgstr "Yahooプロトコルプラグイン"
 
-#: src/protocols/yahoo/yahoo.c:2977
+#: src/protocols/yahoo/yahoo.c:3194
 msgid "Pager host"
 msgstr "ページャホスト"
 
-#: src/protocols/yahoo/yahoo.c:2982
+#: src/protocols/yahoo/yahoo.c:3197
 msgid "Pager port"
 msgstr "ページャポート番号"
 
+#: src/protocols/yahoo/yahoo.c:3200
+#, fuzzy
+msgid "File transfer host"
+msgstr "ファイル転送"
+
+#: src/protocols/yahoo/yahoo.c:3203
+#, fuzzy
+msgid "File transfer port"
+msgstr "ファイル転送が中断されました"
+
 #: src/protocols/yahoo/yahoochat.c:194
 #, c-format
 msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
@@ -7593,21 +7826,21 @@
 msgid "Invitation Rejected"
 msgstr ""
 
-#: src/protocols/yahoo/yahoochat.c:333
+#: src/protocols/yahoo/yahoochat.c:346
 #, fuzzy
 msgid "Failed to join chat"
 msgstr "チャットに参加できません"
 
-#: src/protocols/yahoo/yahoochat.c:333
+#: src/protocols/yahoo/yahoochat.c:346
 msgid "Maybe the room is full?"
 msgstr ""
 
-#: src/protocols/yahoo/yahoochat.c:531
+#: src/protocols/yahoo/yahoochat.c:558
 #, fuzzy
 msgid "Failed to join buddy in chat"
 msgstr "チャットに参加できません"
 
-#: src/protocols/yahoo/yahoochat.c:532
+#: src/protocols/yahoo/yahoochat.c:559
 msgid "Maybe they're not in a chat?"
 msgstr ""
 
@@ -7651,16 +7884,16 @@
 msgstr "ZLocate"
 
 #: src/protocols/zephyr/zephyr.c:908
-msgid "Class:"
-msgstr "クラス:"
+msgid "_Class:"
+msgstr "クラス (_C):"
 
 #: src/protocols/zephyr/zephyr.c:913
-msgid "Instance:"
-msgstr "インスタンス:"
+msgid "_Instance:"
+msgstr "インスタンス (_I):"
 
 #: src/protocols/zephyr/zephyr.c:918
-msgid "Recipient:"
-msgstr "受取人"
+msgid "_Recipient:"
+msgstr "受取人 (_R):"
 
 #. *< api_version
 #. *< type
@@ -7672,16 +7905,26 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/zephyr/zephyr.c:1050 src/protocols/zephyr/zephyr.c:1052
+#: src/protocols/zephyr/zephyr.c:1049 src/protocols/zephyr/zephyr.c:1051
 msgid "Zephyr Protocol Plugin"
 msgstr "Zephyrプロトコルプラグイン"
 
-#: src/proxy.c:1681
+#. Forbidden
+#: src/proxy.c:1014
+msgid "Access denied: proxy server forbids port 80 tunnelling."
+msgstr ""
+
+#: src/proxy.c:1016
+#, fuzzy, c-format
+msgid "Proxy connection error %d"
+msgstr "接続エラー"
+
+#: src/proxy.c:1736
 #, fuzzy
 msgid "Invalid proxy settings"
 msgstr "グローバルなプロキシ設定を使う"
 
-#: src/proxy.c:1681
+#: src/proxy.c:1736
 msgid ""
 "Either the host name or port number specified for your given proxy type is "
 "invalid."
@@ -7695,7 +7938,7 @@
 #. *
 #. * A wrapper for gaim_request_action() that uses Accept and Cancel buttons.
 #.
-#: src/request.h:862
+#: src/request.h:1028
 msgid "Accept"
 msgstr "了解"
 
@@ -7703,14 +7946,14 @@
 msgid "Please enter your password"
 msgstr "パスワードを入力してください"
 
-#: src/server.c:949
+#: src/server.c:948
 #, c-format
 msgid "(%d message)"
 msgid_plural "(%d messages)"
 msgstr[0] "(%d メッセージ)"
 msgstr[1] "(%d メッセージ)"
 
-#: src/server.c:962
+#: src/server.c:961
 msgid "(1 message)"
 msgstr "(1 メッセージ)"
 
@@ -7759,56 +8002,295 @@
 #. I don't know who "myself" is in this context.  The exclamation point
 #. * makes it slightly less boring ;)
 #: src/status.c:35
-#, fuzzy
 msgid "Sorry, I ran out for a bit!"
 msgstr "ちょっとしばらくいないです.もうすぐ帰ります"
 
+#: src/stock.c:83
+msgid "_Modify"
+msgstr "変更 (_M)"
+
 #: src/stock.c:84
-msgid "_Modify"
-msgstr "変更 (_M)"
-
-#: src/stock.c:85
 msgid "_Open Mail"
 msgstr "メールを開く (_O)"
 
-#: src/util.c:1527
+#: src/util.c:1893
 msgid "Calculating..."
 msgstr "計算中..."
 
-#: src/util.c:1530
+#: src/util.c:1896
 msgid "Unknown."
 msgstr "不明."
 
-#: src/util.c:1561 src/util.c:1566 src/util.c:1571 src/util.c:1574
+#: src/util.c:1927 src/util.c:1932 src/util.c:1937 src/util.c:1940
 msgid "day"
 msgid_plural "days"
 msgstr[0] "日"
 msgstr[1] "日"
 
-#: src/util.c:1562 src/util.c:1566 src/util.c:1580 src/util.c:1582
+#: src/util.c:1928 src/util.c:1932 src/util.c:1946 src/util.c:1948
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "時間"
 msgstr[1] "時間"
 
-#: src/util.c:1562 src/util.c:1571 src/util.c:1580 src/util.c:1585
+#: src/util.c:1928 src/util.c:1937 src/util.c:1946 src/util.c:1951
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "分"
 msgstr[1] "分"
 
-#: src/util.c:1917
+#: src/util.c:2283
 msgid "g003: Error opening connection.\n"
 msgstr "g003: 接続開始エラー\n"
 
-#: src/win32/win32dep.c:474
-#, fuzzy
+#: src/win32/win32dep.c:271
+msgid "Moving Gaim Settings.."
+msgstr ""
+
+#: src/win32/win32dep.c:274
+msgid "Moving Gaim user settings to: "
+msgstr ""
+
+#: src/win32/win32dep.c:276
 msgid "Notification"
-msgstr "タイピング通知"
-
-#: src/win32/win32dep.c:475
-msgid "Moving Gaim user settings directory to:"
-msgstr ""
+msgstr "通知"
+
+#~ msgid "Gnome Stock Ticker Properties"
+#~ msgstr "GNOME ストックティッカーのプロパティ"
+
+#~ msgid "Update Frequency in min"
+#~ msgstr "更新頻度(分)"
+
+#~ msgid "Enter symbols delimited with \"+\" in the box below."
+#~ msgstr "シンボルを \"+\" で区切って下のボックスに入力してください。"
+
+#~ msgid "Check this box to display only symbols and price:"
+#~ msgstr "シンボルと価格のみを表示するときにチェック:"
+
+#~ msgid "Check this box to scroll left to right:"
+#~ msgstr "左から右へスクロールさせるときにチェック:"
+
+#~ msgid "About Gaim v%s"
+#~ msgstr "Gaim v%s について"
+
+#~ msgid "Gaim - Away!"
+#~ msgstr "Gaim - 離席!"
+
+#~ msgid "Buddy Chat"
+#~ msgstr "仲間チャット"
+
+#~ msgid "Join Chat As:"
+#~ msgstr "名前を指定してチャットに加入"
+
+#~ msgid "Join"
+#~ msgstr "加入"
+
+#~ msgid "New Message"
+#~ msgstr "新しいメッセージ"
+
+#~ msgid "Changing info for %s:"
+#~ msgstr "%s の情報を変更:"
+
+#~ msgid "Log Conversation"
+#~ msgstr "会話のログ"
+
+#, fuzzy
+#~ msgid "Alias chat"
+#~ msgstr "エイリアス"
+
+#~ msgid "_Screenname"
+#~ msgstr "スクリーン名 (_S)"
+
+#, fuzzy
+#~ msgid "Alias buddy"
+#~ msgstr "仲間のエイリアス"
+
+#, fuzzy
+#~ msgid ""
+#~ "Please enter an aliased name for the person below, or rename this contact "
+#~ "in your buddy list."
+#~ msgstr ""
+#~ "以下の人のエイリアスを入力してください,もしくはこの仲間の名前を仲間リスト"
+#~ "にて変更してください.\n"
+
+#~ msgid "Couldn't write to %s."
+#~ msgstr "%s に書けませんでした。"
+
+#~ msgid "Save Log File"
+#~ msgstr "ログの保存"
+
+#~ msgid "Couldn't remove file %s."
+#~ msgstr "%s を削除できませんでした。"
+
+#~ msgid "Clear Log"
+#~ msgstr "ログの消去"
+
+#~ msgid "Really clear log?"
+#~ msgstr "本当にログを削除?"
+
+#~ msgid "Couldn't open log file %s."
+#~ msgstr "ログファイル%sを開けません"
+
+#~ msgid "System Log"
+#~ msgstr "システムログ"
+
+#~ msgid "Log"
+#~ msgstr "ログ"
+
+#~ msgid "Clear"
+#~ msgstr "消去"
+
+#~ msgid "Gaim - Information"
+#~ msgstr "Gaim - 情報"
+
+#, fuzzy
+#~ msgid "Add a new group"
+#~ msgstr "新しいグループを加える"
+
+#, fuzzy
+#~ msgid "%s has been disconnected"
+#~ msgstr "%s はサインオフしました"
+
+#~ msgid "Gaim - Insert Image"
+#~ msgstr "Gaim - 画像挿入"
+
+#~ msgid "Gaim - Save Conversation"
+#~ msgstr "Gaim - 会話を保存"
+
+#~ msgid "/Conversation/Insert _URL..."
+#~ msgstr "URLを挿入 (_U)..."
+
+#, fuzzy
+#~ msgid "---- New Conversation @ %s ----\n"
+#~ msgstr "%s との会話"
+
+#~ msgid "Disable Animation"
+#~ msgstr "アニメーション無効化"
+
+#~ msgid "Enable Animation"
+#~ msgstr "アニメーション有効化"
+
+#~ msgid "_Host"
+#~ msgstr "ホスト名 (_H)"
+
+#~ msgid "Pa_ssword"
+#~ msgstr "パスワード (_S)"
+
+#~ msgid "Strip _HTML from logs"
+#~ msgstr "ログから HTML を取り除く (_H)"
+
+#~ msgid "System Logs"
+#~ msgstr "システムログ"
+
+#~ msgid "Log when buddies _sign on/sign off"
+#~ msgstr "仲間がサインオン/オフしたときに記録する (_S)"
+
+#~ msgid "Log when buddies become _idle/un-idle"
+#~ msgstr "仲間が休止/復帰したときに記録する (_I)"
+
+#~ msgid "Log when buddies go away/come _back"
+#~ msgstr "仲間が離席/復席したときに記録する (_B)"
+
+#~ msgid "Log your _own signons/idleness/awayness"
+#~ msgstr "自分のサインオン/休止/離席を記録する (_O)"
+
+#~ msgid "I_ndividual log file for each buddy's signons"
+#~ msgstr "それぞれの仲間ごとにログファイルを分ける (_N)"
+
+#~ msgid "Gaim - Save Icon"
+#~ msgstr "Gaim - アイコン保存"
+
+#~ msgid "Error in specifying buddy conversation."
+#~ msgstr "仲間の会話の指定にエラーが起きました"
+
+#~ msgid "Unable to find conversation log"
+#~ msgstr "会話ログを見付ける事ができません"
+
+#~ msgid "Unable to make directory %s for logging"
+#~ msgstr "ディレクトリ %s にログを作成するためのディレクトリを作成できません"
+
+#~ msgid "IM Sessions with %s\n"
+#~ msgstr "%s とのIMセッション\n"
+
+#~ msgid "IM Sessions with %s"
+#~ msgstr "%s とのIMセッション"
+
+#~ msgid "+++ %s (%s) signed on @ %s"
+#~ msgstr "+++ %s (%s) がサインオンしてきた @ %s"
+
+#~ msgid "+++ %s (%s) signed off @ %s"
+#~ msgstr "+++ %s (%s) はサインオフしました @ %s"
+
+#~ msgid "+++ %s (%s) changed away state @ %s"
+#~ msgstr "+++ %s (%s) は離席状態を変更しました @ %s"
+
+#~ msgid "+++ %s (%s) came back @ %s"
+#~ msgstr "+++ %s (%s) 戻ってきました @ %s"
+
+#~ msgid "+++ %s (%s) became idle @ %s"
+#~ msgstr "+++ %s (%s) アイドルになりました @ %s"
+
+#~ msgid "+++ %s (%s) returned from idle @ %s"
+#~ msgstr "+++ %s (%s) アイドルからもどってきました @ %s"
+
+#~ msgid "+++ Program exit @ %s"
+#~ msgstr "+++ プログラム終了 @ %s"
+
+#~ msgid "%s (%s) reported that %s (%s) signed on @ %s"
+#~ msgstr "%s (%s) の報告によると %s (%s) がサインオンしました @ %s"
+
+#~ msgid "%s (%s) reported that %s (%s) signed off @ %s"
+#~ msgstr "%s (%s) の報告によると %s (%s) がサインオフしました @ %s"
+
+#~ msgid "%s (%s) reported that %s (%s) went away @ %s"
+#~ msgstr "%s (%s) の報告によると %s (%s) が離席しました @ %s"
+
+#~ msgid "%s (%s) reported that %s (%s) came back @ %s"
+#~ msgstr "%s (%s) の報告によると %s (%s) が戻って着ました @ %s"
+
+#~ msgid "%s (%s) reported that %s (%s) became idle @ %s"
+#~ msgstr "%s (%s) の報告によると %s (%s) がアイドルになりました @ %s"
+
+#~ msgid "%s (%s) reported that %s (%s) returned from idle @ %s"
+#~ msgstr ""
+#~ "%s (%s) の報告によると %s (%s) がアイドル状態から戻ってきました @ %s"
+
+#~ msgid "%s (%s) reported that %s signed on @ %s"
+#~ msgstr "%s (%s) の報告によると %s がサインオンしました @ %s"
+
+#~ msgid "%s (%s) reported that %s signed off @ %s"
+#~ msgstr "%s (%s) の報告によると %s がサインオフしました @ %s"
+
+#~ msgid "%s (%s) reported that %s went away @ %s"
+#~ msgstr "%s (%s) の報告によると %s が離席しました @ %s"
+
+#~ msgid "%s (%s) reported that %s came back @ %s"
+#~ msgstr "%s (%s) の報告によると %s が戻ってきました @ %s"
+
+#~ msgid "%s (%s) reported that %s became idle @ %s"
+#~ msgstr "%s (%s) の報告によると %s がアイドルになりました @ %s"
+
+#~ msgid "%s (%s) reported that %s returned from idle @ %s"
+#~ msgstr "%s (%s) の報告によると %s がアイドル状態からもどってきました @ %s"
+
+#~ msgid "First name"
+#~ msgstr "姓"
+
+#~ msgid "Disconnected"
+#~ msgstr "切断されました"
+
+#, fuzzy
+#~ msgid "Invalid response from server"
+#~ msgstr "サーバから無効な返答です"
+
+#~ msgid "Join what group:"
+#~ msgstr "グループへの参加:"
+
+#~ msgid "Could not connect for transfer!"
+#~ msgstr "転送のための接続ができません!"
+
+#~ msgid "Unknown error."
+#~ msgstr "不明なエラー"
 
 #~ msgid "Event Test"
 #~ msgstr "イベントテスト"
@@ -8087,9 +8569,6 @@
 #~ msgid "There was an error launching your chosen browser: %s"
 #~ msgstr "選択したブラウザを起動するときにエラーが起きました: %s"
 
-#~ msgid "_Group:"
-#~ msgstr "グループ (_G):"
-
 #~ msgid "Alias"
 #~ msgstr "エイリアス"
 
@@ -8126,9 +8605,6 @@
 #~ msgid "Add Deny"
 #~ msgstr "非許可の追加"
 
-#~ msgid "Search for Buddy"
-#~ msgstr "仲間の検索"
-
 #~ msgid "Find Buddy By Info"
 #~ msgstr "情報から仲間を探す"
 
@@ -8138,9 +8614,6 @@
 #~ msgid "Couldn't open log file %s"
 #~ msgstr "ログファイル%sを開けません"
 
-#~ msgid "Screenname"
-#~ msgstr "スクリーン名:"
-
 #~ msgid "_Raise windows on events"
 #~ msgstr "イベント発生でウィンドウをアクティブにする (_R)"
 
@@ -8229,9 +8702,6 @@
 #~ msgid "_Login"
 #~ msgstr "ログイン (_L)"
 
-#~ msgid "_Password"
-#~ msgstr "パスワード (_P)"
-
 #~ msgid "TOC not found."
 #~ msgstr "TOC が見つかりません。"
 
@@ -8393,9 +8863,6 @@
 #~ msgid "Gaim Chat"
 #~ msgstr "Gaim チャット"
 
-#~ msgid "Chat Rooms"
-#~ msgstr "チャットルーム"
-
 #~ msgid "Refresh"
 #~ msgstr "更新"
 
@@ -8560,18 +9027,12 @@
 #~ msgid "Activate Away Message"
 #~ msgstr "有効な離席メッセージ"
 
-#~ msgid "File"
-#~ msgstr "ファイル"
-
 #~ msgid "_Accounts..."
 #~ msgstr "アカウント (_A)"
 
 #~ msgid "_Preferences..."
 #~ msgstr "設定 (_P) ..."
 
-#~ msgid "About Gaim"
-#~ msgstr "Gaimについて"
-
 #~ msgid "Remove selected Buddy/Group"
 #~ msgstr "選択した仲間/グループの削除"
 
@@ -8581,9 +9042,6 @@
 #~ msgid "Gaim - Group Chats"
 #~ msgstr "Gaim - グループチャット"
 
-#~ msgid "_Save Conversation"
-#~ msgstr "会話の保存 (_S)"
-
 #~ msgid " [TYPING]"
 #~ msgstr " [TYPING]"