diff po/ja.po @ 3450:5dfdf622bdf7

[gaim-migrate @ 3495] I'm tired. committer: Tailor Script <tailor@pidgin.im>
author Sean Egan <seanegan@gmail.com>
date Tue, 27 Aug 2002 02:43:54 +0000
parents 3fa89049fe6c
children b5144a6311f3
line wrap: on
line diff
--- a/po/ja.po	Mon Aug 26 05:29:45 2002 +0000
+++ b/po/ja.po	Tue Aug 27 02:43:54 2002 +0000
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gaim version 0.56\n"
-"POT-Creation-Date: 2002-08-18 10:33-0700\n"
+"POT-Creation-Date: 2002-08-25 23:43-0400\n"
 "PO-Revision-Date: 2002-04-22 13:12+0900\n"
 "Last-Translator: Ryosuke Kutsuna <ryosuke@cool.email.ne.jp>\n"
 "Language-Team: Japanese\n"
@@ -25,9 +25,9 @@
 
 #: plugins/chatlist.c:339 src/about.c:165 src/aim.c:317 src/buddy.c:2690
 #: src/buddy_chat.c:1325 src/buddy_chat.c:1422 src/buddy_chat.c:1452
-#: src/conversation.c:2889 src/dialogs.c:592 src/dialogs.c:1527
-#: src/dialogs.c:4277 src/multi.c:1076 src/plugins.c:347 src/prefs.c:1854
-#: src/prpl.c:448 src/prpl.c:695 src/server.c:1097
+#: src/conversation.c:2919 src/dialogs.c:1541 src/dialogs.c:4292
+#: src/multi.c:1078 src/plugins.c:347 src/prpl.c:450 src/prpl.c:697
+#: src/server.c:1097
 msgid "Close"
 msgstr "閉じる"
 
@@ -40,16 +40,17 @@
 msgid "Refresh"
 msgstr ""
 
+#. Put the buttons in the box
 #: plugins/chatlist.c:364 src/buddy.c:489 src/buddy.c:2802
-#: src/buddy_chat.c:1457 src/conversation.c:2406 src/conversation.c:2904
-#: src/dialogs.c:957 src/dialogs.c:1139 src/dialogs.c:1478 src/dialogs.c:1512
-#: src/dialogs.c:2507 src/multi.c:1060 src/prefs.c:1566
+#: src/buddy_chat.c:1457 src/conversation.c:2436 src/conversation.c:2934
+#: src/dialogs.c:971 src/dialogs.c:1153 src/dialogs.c:1492 src/dialogs.c:1526
+#: src/dialogs.c:2521 src/multi.c:1062
 msgid "Add"
 msgstr "加える"
 
 #: plugins/chatlist.c:365 src/buddy.c:491 src/buddy.c:2804
-#: src/buddy_chat.c:1459 src/conversation.c:2392 src/conversation.c:2901
-#: src/dialogs.c:1482 src/dialogs.c:1516 src/prefs.c:1578
+#: src/buddy_chat.c:1459 src/conversation.c:2422 src/conversation.c:2931
+#: src/dialogs.c:1496 src/dialogs.c:1530
 msgid "Remove"
 msgstr "削除"
 
@@ -73,6 +74,7 @@
 msgid "Enter symbols delimited with \"+\" in the box below."
 msgstr ""
 
+#. OUTPUT FORMAT and SCROLL DIRECTION
 #: plugins/gtik.c:737
 msgid "Check this box to display only symbols and price:"
 msgstr ""
@@ -91,7 +93,7 @@
 msgid "Change"
 msgstr "接続:"
 
-#: src/protocols/gg/gg.c:71 src/protocols/msn/msn.c:1921
+#: src/protocols/gg/gg.c:71 src/protocols/msn/msn.c:1923
 msgid "Available"
 msgstr "可視"
 
@@ -99,8 +101,8 @@
 msgid "Available for friends only"
 msgstr "友達だけに可視"
 
-#: src/protocols/gg/gg.c:73 src/protocols/jabber/jabber.c:1141
-#: src/applet.c:197 src/buddy.c:494 src/buddy.c:2556 src/buddy.c:2701
+#: src/protocols/gg/gg.c:73 src/protocols/jabber/jabber.c:1143 src/buddy.c:494
+#: src/buddy.c:2556 src/buddy.c:2701 src/prefs.c:812
 msgid "Away"
 msgstr "離席"
 
@@ -116,7 +118,7 @@
 msgid "Invisible for friends only"
 msgstr "友達だけから隠れる"
 
-#: src/protocols/gg/gg.c:77 src/protocols/jabber/jabber.c:1137
+#: src/protocols/gg/gg.c:77 src/protocols/jabber/jabber.c:1139
 msgid "Unavailable"
 msgstr "放置"
 
@@ -148,7 +150,7 @@
 msgid "Unknown Error Code."
 msgstr "理解不能なコード"
 
-#: src/protocols/gg/gg.c:302 src/protocols/msn/msn.c:2052
+#: src/protocols/gg/gg.c:302 src/protocols/msn/msn.c:2054
 #, c-format
 msgid "Status: %s"
 msgstr "状態: %s"
@@ -218,16 +220,6 @@
 msgid "You are trying to send a message to an invalid Gadu-Gadu UIN."
 msgstr "無効なGadu-Gadu UINにメッセージを送ろうとしています"
 
-#: src/protocols/gg/gg.c:595 src/protocols/gg/gg.c:657
-#: src/protocols/gg/gg.c:762 src/protocols/gg/gg.c:768
-#: src/protocols/gg/gg.c:821 src/protocols/gg/gg.c:833
-#: src/protocols/gg/gg.c:845 src/protocols/gg/gg.c:956
-#: src/protocols/gg/gg.c:984 src/protocols/gg/gg.c:1043
-#: src/protocols/gg/gg.c:1066 src/protocols/gg/gg.c:1116
-#: src/protocols/gg/gg.c:1149 src/protocols/gg/gg.c:1214
-msgid "Gadu-Gadu Error"
-msgstr "Gadu-Gadu エラー"
-
 #: src/protocols/gg/gg.c:657
 msgid "Couldn't get search results"
 msgstr "検索結果を得られませんでした"
@@ -273,104 +265,151 @@
 msgid "Sex"
 msgstr "性"
 
-#: src/protocols/gg/gg.c:729 src/dialogs.c:2036 src/dialogs.c:2744
+#. Line 5
+#: src/protocols/gg/gg.c:729 src/dialogs.c:2050 src/dialogs.c:2758
 msgid "City"
 msgstr "町"
 
 #: src/protocols/gg/gg.c:761
-msgid "There is no Buddy List stored on server. Sorry!"
+#, fuzzy
+msgid "There is no Buddy List stored on the Gadu-Gadu server."
 msgstr "サーバ上に格納された仲間リストはありません。残念です!"
 
-#: src/protocols/gg/gg.c:768
+#: src/protocols/gg/gg.c:767
 msgid "Couldn't Import Buddies List from Server"
 msgstr "サーバから仲間リストを取得できませんでした"
 
-#: src/protocols/gg/gg.c:815
-msgid "Buddy List successfully transferred to server"
+#: src/protocols/gg/gg.c:814
+#, fuzzy
+msgid "Buddy List successfully transferred to Gadu-Gadu server"
 msgstr "サーバへ仲間リストの転送に成功しました"
 
-#: src/protocols/gg/gg.c:816 src/protocols/gg/gg.c:828
-#: src/protocols/gg/gg.c:840
-msgid "Gadu-Gadu Information"
-msgstr "Gadu-Gadu 情報"
-
-#: src/protocols/gg/gg.c:821
-msgid "Couldn't transfer Buddy List to server"
+#: src/protocols/gg/gg.c:819
+#, fuzzy
+msgid "Couldn't transfer Buddy List to Gadu-Gadu server"
 msgstr "仲間リストのサーバへの転送ができません"
 
-#: src/protocols/gg/gg.c:827
-msgid "Buddy List sucessfully deleted from server"
+#: src/protocols/gg/gg.c:825
+#, fuzzy
+msgid "Buddy List sucessfully deleted from Gadu-Gadu server"
 msgstr "サーバから仲間リストを削除しました"
 
-#: src/protocols/gg/gg.c:833
-msgid "Couldn't delete Buddy List from server"
+#: src/protocols/gg/gg.c:830
+#, fuzzy
+msgid "Couldn't delete Buddy List from Gadu-Gadu server"
 msgstr "サーバの仲間リストを削除できません"
 
-#: src/protocols/gg/gg.c:839
+#: src/protocols/gg/gg.c:836
 msgid "Password changed successfully"
 msgstr "パスワード変更できました"
 
-#: src/protocols/gg/gg.c:845
+#: src/protocols/gg/gg.c:841
 msgid "Password couldn't be changed"
 msgstr "パスワード変更ができませんでした"
 
-#: src/protocols/gg/gg.c:956
-msgid "Couldn't send http request"
-msgstr "HTTPリクエストを送れませんでした"
-
-#: src/protocols/gg/gg.c:982
-#, c-format
-msgid "Buddies List import from Server failed (%s)"
-msgstr "サーバから仲間リストのインポートに失敗 (%s)"
-
-#: src/protocols/gg/gg.c:1041
-#, c-format
-msgid "Buddies List export to Server failed (%s)"
-msgstr "サーバへの仲間リストのエクスポートに失敗 (%s)"
-
-#: src/protocols/gg/gg.c:1064
-#, c-format
-msgid "Deletion of Buddies List from Server failed (%s)"
-msgstr "サーバから仲間リストの削除に失敗 (%s)"
-
-#: src/protocols/gg/gg.c:1114 src/protocols/gg/gg.c:1212
-#, c-format
-msgid "Connect to search service failed (%s)"
-msgstr "検索サービスに接続失敗 (%s)"
-
-#: src/protocols/gg/gg.c:1147
-#, c-format
-msgid "Changing Password failed (%s)"
-msgstr "パスワードの変更に失敗 (%s)"
-
-#: src/protocols/gg/gg.c:1158 src/protocols/gg/gg.c:1175
+#: src/protocols/gg/gg.c:952
+msgid "Error communicating with Gadu-Gadu server"
+msgstr ""
+
+#: src/protocols/gg/gg.c:953
+msgid ""
+"Gaim was unable to complete your request due to a problem communicating to "
+"the Gadu-Gadu HTTP server.  Please try again later."
+msgstr ""
+
+#: src/protocols/gg/gg.c:980
+msgid "Unable to import Gadu-Gadu buddy list"
+msgstr ""
+
+#: src/protocols/gg/gg.c:981
+msgid ""
+"Gaim was unable to connect to the Gadu-Gadu buddy list server.  Please try "
+"again later."
+msgstr ""
+
+#: src/protocols/gg/gg.c:1038
+#, fuzzy
+msgid "Couldn't export buddy list"
+msgstr "サーバから仲間リストを取得できませんでした"
+
+#: src/protocols/gg/gg.c:1039 src/protocols/gg/gg.c:1061
+msgid ""
+"Gaim was unable to connect to the buddy list server.  Please try again later."
+msgstr ""
+
+#: src/protocols/gg/gg.c:1060
+msgid "Unable to delete Gadu-Gadu buddy list"
+msgstr ""
+
+#: src/protocols/gg/gg.c:1108
+#, fuzzy
+msgid "Unable to access directory"
+msgstr "直接IMを開けません"
+
+#: src/protocols/gg/gg.c:1109
+msgid ""
+"Gaim was unable to search the Directory because it was unable to connect to "
+"the directory server.  Please tryagain later."
+msgstr ""
+
+#: src/protocols/gg/gg.c:1141
+#, fuzzy
+msgid "Unable to change Gadu-Gadu password"
+msgstr "ソケットを読めません"
+
+#: src/protocols/gg/gg.c:1142
+msgid ""
+"Gaim was unable to change your password due to an error connecting to the "
+"Gadu-Gadu server.  Please try again later."
+msgstr ""
+
+#: src/protocols/gg/gg.c:1152 src/protocols/gg/gg.c:1169
 msgid "Directory Search"
 msgstr "ディレクトリ検索"
 
-#: src/protocols/gg/gg.c:1160 src/protocols/gg/gg.c:1177
-#: src/protocols/jabber/jabber.c:3953 src/protocols/jabber/jabber.c:3966
-#: src/dialogs.c:2153
+#.
+#. } else if (!strcmp(act, _("Set Dir Info"))) {
+#. show_set_dir(gc);
+#.
+#: src/protocols/gg/gg.c:1154 src/protocols/gg/gg.c:1171
+#: src/protocols/jabber/jabber.c:3957 src/protocols/jabber/jabber.c:3970
+#: src/dialogs.c:2167
 msgid "Change Password"
 msgstr "パスワード変更"
 
-#: src/protocols/gg/gg.c:1162 src/protocols/gg/gg.c:1179
+#: src/protocols/gg/gg.c:1156 src/protocols/gg/gg.c:1173
 msgid "Import Buddies List from Server"
 msgstr "サーバから仲間リストのインポート"
 
-#: src/protocols/gg/gg.c:1164 src/protocols/gg/gg.c:1180
+#: src/protocols/gg/gg.c:1158 src/protocols/gg/gg.c:1174
 msgid "Export Buddies List to Server"
 msgstr "サーバへ仲間リストをエクスポート"
 
-#: src/protocols/gg/gg.c:1166 src/protocols/gg/gg.c:1181
+#: src/protocols/gg/gg.c:1160 src/protocols/gg/gg.c:1175
 msgid "Delete Buddies List from Server"
 msgstr "サーバから仲間リストを削除"
 
+#: src/protocols/gg/gg.c:1204
+#, fuzzy
+msgid "Unable to access user profile."
+msgstr "%sファイルを読み込めません"
+
+#: src/protocols/gg/gg.c:1205
+msgid ""
+"Gaim was unable to access this users profile due to an error connecting to "
+"the directory server.  Please try again later."
+msgstr ""
+
+#: src/protocols/icq/gaim_icq.c:233
+msgid "Gaim encountered an error communicating with the ICQ server."
+msgstr ""
+
 #: src/protocols/icq/gaim_icq.c:308
 msgid "Send message through server"
 msgstr "サーバ経由でメッセージ送信"
 
 #: src/protocols/icq/gaim_icq.c:469 src/protocols/irc/irc.c:1851
-#: src/protocols/jabber/jabber.c:3041 src/protocols/oscar/oscar.c:3608
+#: src/protocols/jabber/jabber.c:3045 src/protocols/oscar/oscar.c:3611
 #: src/protocols/toc/toc.c:1219
 msgid "Get Info"
 msgstr "情報取得"
@@ -386,20 +425,16 @@
 msgstr "<B>%sのトピックは変わりました: %s</B>"
 
 #: src/protocols/irc/irc.c:825
-msgid "No such nick/channel"
-msgstr "そのようなニック/チャンネルはありません"
-
-#: src/protocols/irc/irc.c:825 src/protocols/irc/irc.c:828
-#: src/protocols/irc/irc.c:830 src/protocols/irc/irc.c:1073
-msgid "IRC Error"
-msgstr "IRCエラー"
+msgid "There is no such nick or channel on this IRC channel."
+msgstr ""
 
 #: src/protocols/irc/irc.c:828
-msgid "No such server"
-msgstr "そのようなサーバはありません"
+msgid "There is no such IRC Server"
+msgstr ""
 
 #: src/protocols/irc/irc.c:830
-msgid "No nickname given"
+#, fuzzy
+msgid "No IRC nickname given"
 msgstr "ニックが与えられていません"
 
 #: src/protocols/irc/irc.c:976
@@ -414,8 +449,8 @@
 msgstr "書き込めません"
 
 #: src/protocols/irc/irc.c:1071
-#, c-format
-msgid "You have been kicked from %s: %s"
+#, fuzzy, c-format
+msgid "You have been kicked from %s:"
 msgstr "あなたは%sに蹴られました: %s"
 
 #: src/protocols/irc/irc.c:1076
@@ -428,10 +463,6 @@
 msgid "You have left %s"
 msgstr "%sを退室しました"
 
-#: src/protocols/irc/irc.c:1582
-msgid "IRC Part"
-msgstr "IRCパート"
-
 #: src/protocols/irc/irc.c:1671
 msgid "Channel:"
 msgstr "接続:"
@@ -445,46 +476,60 @@
 msgstr "DCCチャット"
 
 #: src/protocols/jabber/jabber.c:950
-msgid "Incorrect current password! Password NOT Changed!"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:951 src/protocols/jabber/jabber.c:956
 #, fuzzy
-msgid "Password Change Error!"
-msgstr "Gaim - パスワード変更"
-
-#: src/protocols/jabber/jabber.c:955
-msgid "New password same as old password! Password NOT Changed!"
+msgid "Unable to change password."
+msgstr "ソケットを読めません"
+
+#: src/protocols/jabber/jabber.c:951
+msgid ""
+"The current password you entered is incorrect.  Your password has not been "
+"changed."
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1115
+#: src/protocols/jabber/jabber.c:956
+#, fuzzy
+msgid "Unable to change password"
+msgstr "ソケットを読めません"
+
+#: src/protocols/jabber/jabber.c:957
+msgid ""
+"The new password you entered is the same as your current passord.  Your "
+"password remains the same."
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1117
 msgid "Unknown"
 msgstr "不明"
 
-#: src/protocols/jabber/jabber.c:1143 src/protocols/jabber/jabber.c:1161
+#: src/protocols/jabber/jabber.c:1145 src/protocols/jabber/jabber.c:1163
 #: src/buddy.c:2862
 msgid "Online"
 msgstr "オンライン"
 
-#: src/protocols/jabber/jabber.c:1145
+#: src/protocols/jabber/jabber.c:1147
 msgid "Extended Away"
 msgstr "逃走中"
 
-#: src/protocols/jabber/jabber.c:1147
+#: src/protocols/jabber/jabber.c:1149
 msgid "Do Not Disturb"
 msgstr "邪魔するな"
 
-#: src/protocols/jabber/jabber.c:1457
+#: src/protocols/jabber/jabber.c:1347
+#, fuzzy, c-format
+msgid "Jabber Error %s"
+msgstr "Jabber エラー"
+
+#: src/protocols/jabber/jabber.c:1459
 #, c-format
 msgid "Error %s: %s"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1460
+#: src/protocols/jabber/jabber.c:1462
 #, fuzzy
 msgid "Unknown Error in presence"
 msgstr "理解不能なコード"
 
-#: src/protocols/jabber/jabber.c:1630
+#: src/protocols/jabber/jabber.c:1632
 #, fuzzy, c-format
 msgid "The user %s wants to add you to their buddy list."
 msgstr ""
@@ -492,209 +537,217 @@
 "\n"
 "彼らを仲間リストに追加しますか?"
 
-#: src/protocols/jabber/jabber.c:1655
-msgid "No such user"
+#: src/protocols/jabber/jabber.c:1657
+#, c-format
+msgid ""
+"The Jabber user %s does not exist and was therefore not added to your roster."
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1660
+#, fuzzy
+msgid "No such user."
 msgstr "そのようなユーザはいません"
 
-#: src/protocols/jabber/jabber.c:1657 src/protocols/jabber/jabber.c:2413
-#: src/protocols/jabber/jabber.c:2681
-msgid "Jabber Error"
-msgstr "Jabber エラー"
-
-#: src/protocols/jabber/jabber.c:1742 src/protocols/msn/msn.c:1112
-#: src/dialogs.c:912
+#: src/protocols/jabber/jabber.c:1745 src/protocols/msn/msn.c:1114
+#: src/dialogs.c:926
 msgid "Buddies"
 msgstr "仲間たち"
 
-#: src/protocols/jabber/jabber.c:1805
+#: src/protocols/jabber/jabber.c:1808
 msgid "Authenticating"
 msgstr "認証"
 
-#: src/protocols/jabber/jabber.c:1842
+#: src/protocols/jabber/jabber.c:1845
 msgid "Unknown login error"
 msgstr "不明なログインエラー"
 
-#: src/protocols/jabber/jabber.c:2033
+#: src/protocols/jabber/jabber.c:2036
 #, fuzzy
 msgid "Password successfully changed."
 msgstr "パスワード変更できました"
 
-#: src/protocols/jabber/jabber.c:2035
-#, fuzzy
-msgid "Password Change"
-msgstr "Gaim - パスワード変更"
-
-#: src/protocols/jabber/jabber.c:2077 src/protocols/jabber/jabber.c:3881
+#: src/protocols/jabber/jabber.c:2080 src/protocols/jabber/jabber.c:3885
 msgid "Connection lost"
 msgstr "接続が切れました"
 
-#: src/protocols/jabber/jabber.c:2079 src/protocols/jabber/jabber.c:2111
-#: src/protocols/jabber/jabber.c:3883 src/protocols/jabber/jabber.c:3929
-#: src/protocols/msn/msn.c:1743 src/protocols/msn/msn.c:1772
+#: src/protocols/jabber/jabber.c:2082 src/protocols/jabber/jabber.c:2114
+#: src/protocols/jabber/jabber.c:3887 src/protocols/jabber/jabber.c:3933
+#: src/protocols/msn/msn.c:1745 src/protocols/msn/msn.c:1774
 msgid "Unable to connect"
 msgstr "接続できません"
 
-#: src/protocols/jabber/jabber.c:2085
+#: src/protocols/jabber/jabber.c:2088
 msgid "Connected"
 msgstr "接続しました"
 
-#: src/protocols/jabber/jabber.c:2088
+#: src/protocols/jabber/jabber.c:2091
 msgid "Requesting Authentication Method"
 msgstr "認証要求中"
 
-#: src/protocols/jabber/jabber.c:2106 src/protocols/msn/msn.c:1764
+#. we have no chats yet
+#: src/protocols/jabber/jabber.c:2109 src/protocols/msn/msn.c:1766
 msgid "Connecting"
 msgstr "接続中"
 
-#: src/protocols/jabber/jabber.c:2412 src/protocols/jabber/jabber.c:2680
-#, fuzzy
-msgid "Invalid Jabber I.D."
-msgstr "無効な名前"
-
-#: src/protocols/jabber/jabber.c:2648
+#: src/protocols/jabber/jabber.c:2415
+#, c-format
+msgid "The user %s is an invalid Jabber I.D. and was therefore not added."
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:2417
+msgid "Jabber Error"
+msgstr "Jabber エラー"
+
+#: src/protocols/jabber/jabber.c:2652
 msgid "Room:"
 msgstr "部屋:"
 
-#: src/protocols/jabber/jabber.c:2652
+#: src/protocols/jabber/jabber.c:2656
 msgid "Server:"
 msgstr "サーバ:"
 
-#: src/protocols/jabber/jabber.c:2657
+#: src/protocols/jabber/jabber.c:2661
 msgid "Handle:"
 msgstr "ハンドル:"
 
-#: src/protocols/jabber/jabber.c:2714
+#: src/protocols/jabber/jabber.c:2685
+#, fuzzy
+msgid "Unable to join chat"
+msgstr "接続できません"
+
+#: src/protocols/jabber/jabber.c:2718
 #, fuzzy
 msgid "Chats"
 msgstr "チャット"
 
-#: src/protocols/jabber/jabber.c:3029
+#: src/protocols/jabber/jabber.c:3033
 #, fuzzy
 msgid "View Error Msg"
 msgstr "ログを見る"
 
-#: src/protocols/jabber/jabber.c:3046 src/protocols/oscar/oscar.c:3621
+#: src/protocols/jabber/jabber.c:3050 src/protocols/oscar/oscar.c:3624
 #: src/buddy_chat.c:889
 msgid "Get Away Msg"
 msgstr "離席メッセージ"
 
-#: src/protocols/jabber/jabber.c:3053
+#: src/protocols/jabber/jabber.c:3057
 msgid "Un-hide From"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3056
+#: src/protocols/jabber/jabber.c:3060
 msgid "Temporarily Hide From"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3074
+#: src/protocols/jabber/jabber.c:3078
 msgid "Remove From Roster"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3079
+#: src/protocols/jabber/jabber.c:3083
 #, fuzzy
 msgid "Cancel Presence Notification"
 msgstr "ポップアップ通知"
 
-#: src/protocols/jabber/jabber.c:3281
+#: src/protocols/jabber/jabber.c:3285
 msgid "Full Name"
 msgstr "氏名"
 
-#: src/protocols/jabber/jabber.c:3282
+#: src/protocols/jabber/jabber.c:3286
 msgid "Family Name"
 msgstr "家族名"
 
-#: src/protocols/jabber/jabber.c:3283
+#: src/protocols/jabber/jabber.c:3287
 msgid "Given Name"
 msgstr "与えられた名前"
 
-#: src/protocols/jabber/jabber.c:3284
+#: src/protocols/jabber/jabber.c:3288
 msgid "Nickname"
 msgstr "ニックネーム"
 
-#: src/protocols/jabber/jabber.c:3285 src/dialogs.c:2937
+#: src/protocols/jabber/jabber.c:3289 src/dialogs.c:2951
 msgid "URL"
 msgstr "URL"
 
-#: src/protocols/jabber/jabber.c:3286
+#: src/protocols/jabber/jabber.c:3290
 msgid "Street Address"
 msgstr "住所"
 
-#: src/protocols/jabber/jabber.c:3287
+#: src/protocols/jabber/jabber.c:3291
 msgid "Extended Address"
 msgstr "その他"
 
-#: src/protocols/jabber/jabber.c:3288
+#: src/protocols/jabber/jabber.c:3292
 msgid "Locality"
 msgstr "区"
 
-#: src/protocols/jabber/jabber.c:3289
+#: src/protocols/jabber/jabber.c:3293
 msgid "Region"
 msgstr "州"
 
-#: src/protocols/jabber/jabber.c:3290
+#: src/protocols/jabber/jabber.c:3294
 msgid "Postal Code"
 msgstr "郵便番号"
 
-#: src/protocols/jabber/jabber.c:3291 src/dialogs.c:2058 src/dialogs.c:2766
+#. Line 7
+#: src/protocols/jabber/jabber.c:3295 src/dialogs.c:2072 src/dialogs.c:2780
 msgid "Country"
 msgstr "国"
 
-#: src/protocols/jabber/jabber.c:3292
+#: src/protocols/jabber/jabber.c:3296
 msgid "Telephone"
 msgstr "電話番号"
 
-#: src/protocols/jabber/jabber.c:3293 src/dialogs.c:2842
+#: src/protocols/jabber/jabber.c:3297 src/dialogs.c:2856
 msgid "Email"
 msgstr "E-mail"
 
-#: src/protocols/jabber/jabber.c:3294
+#: src/protocols/jabber/jabber.c:3298
 msgid "Organization Name"
 msgstr "組織名"
 
-#: src/protocols/jabber/jabber.c:3295
+#: src/protocols/jabber/jabber.c:3299
 msgid "Organization Unit"
 msgstr "所属部署"
 
-#: src/protocols/jabber/jabber.c:3296
+#: src/protocols/jabber/jabber.c:3300
 msgid "Title"
 msgstr "題名"
 
-#: src/protocols/jabber/jabber.c:3297
+#: src/protocols/jabber/jabber.c:3301
 msgid "Role"
 msgstr "役職"
 
-#: src/protocols/jabber/jabber.c:3298
+#: src/protocols/jabber/jabber.c:3302
 msgid "Birthday"
 msgstr "誕生日"
 
-#: src/protocols/jabber/jabber.c:3299 src/dialogs.c:2945
+#: src/protocols/jabber/jabber.c:3303 src/dialogs.c:2959
 msgid "Description"
 msgstr "概要"
 
-#: src/protocols/jabber/jabber.c:3324
+#: src/protocols/jabber/jabber.c:3328
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable"
 msgstr ""
 "下記のアイテムはすべてオプションです。快適に感じる情報だけを入力します。"
 
-#: src/protocols/jabber/jabber.c:3325
+#: src/protocols/jabber/jabber.c:3329
 msgid "User Identity"
 msgstr "ユーザID"
 
-#: src/protocols/jabber/jabber.c:3737
+#: src/protocols/jabber/jabber.c:3741
 msgid "Gaim - Edit Jabber vCard"
 msgstr "Gaim - Jabber vCardによって開発された"
 
-#: src/protocols/jabber/jabber.c:3811
+#: src/protocols/jabber/jabber.c:3815
 msgid "Server Registration successful!"
 msgstr "サーバに登録しました"
 
-#: src/protocols/jabber/jabber.c:3838
+#: src/protocols/jabber/jabber.c:3842
 msgid "Unknown registration error"
 msgstr "不明な登録エラー"
 
-#: src/protocols/jabber/jabber.c:3947 src/protocols/jabber/jabber.c:3962
+#: src/protocols/jabber/jabber.c:3951 src/protocols/jabber/jabber.c:3966
 msgid "Set User Info"
 msgstr "ユーザ情報の登録"
 
@@ -862,116 +915,132 @@
 msgid "Unknown Error Code"
 msgstr "理解不能なコード"
 
-#: src/protocols/msn/msn.c:351 src/protocols/msn/msn.c:558
-#: src/protocols/msn/msn.c:815 src/protocols/msn/msn.c:2116
-#: src/protocols/msn/msn.c:2285 src/protocols/msn/msn.c:2338
-msgid "MSN Error"
-msgstr "MSNエラー"
-
 #: src/protocols/msn/msn.c:558
-msgid "A message may not have been received."
+msgid "An MSN message may not have been received."
 msgstr ""
 
 #: src/protocols/msn/msn.c:815
-msgid "Gaim was unable to send a message"
+#, fuzzy
+msgid "Gaim was unable to send an MSN message"
 msgstr "Gaimはメッセージを送れません"
 
-#: src/protocols/msn/msn.c:919
+#: src/protocols/msn/msn.c:816
+msgid ""
+"Gaim encountered an error communicating with the MSN switchboard server.  "
+"Please try again later."
+msgstr ""
+
+#: src/protocols/msn/msn.c:921
 #, c-format
 msgid "The user %s (%s) wants to add %s to his or her buddy list."
 msgstr ""
 
-#: src/protocols/msn/msn.c:1076
+#: src/protocols/msn/msn.c:1078
 #, c-format
 msgid "The user %s (%s) wants to add you to their buddy list"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1177
+#: src/protocols/msn/msn.c:1179
 msgid "You have been disconnected. You have signed on from another location."
 msgstr "切断されています 違う場所で接続してます"
 
-#: src/protocols/msn/msn.c:1437 src/protocols/msn/msn.c:1681
+#: src/protocols/msn/msn.c:1439 src/protocols/msn/msn.c:1683
 #, fuzzy
 msgid "Error reading from server"
 msgstr "ソケットからの読み込みに失敗"
 
-#: src/protocols/msn/msn.c:1570
+#: src/protocols/msn/msn.c:1572
 msgid "Requesting to send password"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1620
+#: src/protocols/msn/msn.c:1622
 #, fuzzy
 msgid "Unable to send password"
 msgstr "ソケットを読めません"
 
-#: src/protocols/msn/msn.c:1625
+#: src/protocols/msn/msn.c:1627
 #, fuzzy
 msgid "Password sent"
 msgstr "パスワード"
 
-#: src/protocols/msn/msn.c:1750
+#: src/protocols/msn/msn.c:1752
 #, fuzzy
 msgid "Unable to write to server"
 msgstr "サーバへ接続できません"
 
-#: src/protocols/msn/msn.c:1756
+#: src/protocols/msn/msn.c:1758
 #, fuzzy
 msgid "Synching with server"
 msgstr "サーバに登録"
 
-#: src/protocols/msn/msn.c:1922
+#: src/protocols/msn/msn.c:1924
 msgid "Away From Computer"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1923
+#: src/protocols/msn/msn.c:1925
 msgid "Be Right Back"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1924
-#, fuzzy
-msgid "Busy"
-msgstr "仲間"
-
-#: src/protocols/msn/msn.c:1925
-msgid "On The Phone"
-msgstr ""
-
 #: src/protocols/msn/msn.c:1926
+#, fuzzy
+msgid "Busy"
+msgstr "仲間"
+
+#: src/protocols/msn/msn.c:1927
+msgid "On The Phone"
+msgstr ""
+
+#: src/protocols/msn/msn.c:1928
 msgid "Out To Lunch"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1927
+#: src/protocols/msn/msn.c:1929
 #, fuzzy
 msgid "Hidden"
 msgstr "隠れアイコン"
 
-#: src/protocols/msn/msn.c:2043
+#: src/protocols/msn/msn.c:2045
 msgid "Reset friendly name"
 msgstr ""
 
-#: src/protocols/msn/msn.c:2116
-msgid "Friendly name too long."
+#: src/protocols/msn/msn.c:2118
+msgid "New MSN friendly name too long."
 msgstr ""
 
-#: src/protocols/msn/msn.c:2131 src/protocols/msn/msn.c:2152
+#: src/protocols/msn/msn.c:2133 src/protocols/msn/msn.c:2154
 #, fuzzy
 msgid "Set Friendly Name"
 msgstr "名"
 
-#: src/protocols/msn/msn.c:2132
+#: src/protocols/msn/msn.c:2134
 #, fuzzy
 msgid "Set Friendly Name:"
 msgstr "スクリーンネーム: "
 
-#: src/protocols/msn/msn.c:2133
+#: src/protocols/msn/msn.c:2135
 msgid "Reset All Friendly Names"
 msgstr ""
 
-#: src/protocols/msn/msn.c:2285 src/protocols/msn/msn.c:2338
-msgid "Invalid name"
+#: src/protocols/msn/msn.c:2288
+#, c-format
+msgid ""
+"An MSN screenname must be in the form \"user@server.com\".  Perhaps you "
+"meant %s@hotmail.com.  No changes were made to your allow list."
+msgstr ""
+
+#: src/protocols/msn/msn.c:2291 src/protocols/msn/msn.c:2348
+#, fuzzy
+msgid "Invalid MSN screenname"
 msgstr "無効な名前"
 
-#: src/protocols/napster/napster.c:457 src/protocols/oscar/oscar.c:3224
+#: src/protocols/msn/msn.c:2345
+#, c-format
+msgid ""
+"An MSN screenname must be in the form \"user@server.com\".  Perhaps you "
+"meant %s@hotmail.com.  No changes were made to your block list."
+msgstr ""
+
+#: src/protocols/napster/napster.c:457 src/protocols/oscar/oscar.c:3227
 #: src/protocols/toc/toc.c:1104
 msgid "Join what group:"
 msgstr "グループへの参加:"
@@ -1004,60 +1073,55 @@
 msgid "You have been disconnected from chat room %s."
 msgstr "チャットルーム%sから切断されました"
 
-#: src/protocols/oscar/oscar.c:395
-msgid "Chat Error!"
-msgstr "チャットエラー"
-
 #: src/protocols/oscar/oscar.c:407
 msgid "Chat is currently unavailable"
 msgstr "チャットは接続できません"
 
-#: src/protocols/oscar/oscar.c:408
-msgid "Gaim - Chat"
-msgstr "Gaim - チャット"
-
-#: src/protocols/oscar/oscar.c:467 src/protocols/oscar/oscar.c:527
+#: src/protocols/oscar/oscar.c:466 src/protocols/oscar/oscar.c:526
 msgid "Couldn't connect to host"
 msgstr "ホストへ接続できませんでした"
 
-#: src/protocols/oscar/oscar.c:475
+#: src/protocols/oscar/oscar.c:474
 msgid "Password sent, waiting for response\n"
 msgstr "パスワード送信、返答待ちです\n"
 
-#: src/protocols/oscar/oscar.c:508
+#: src/protocols/oscar/oscar.c:507
 msgid "internal connection error\n"
 msgstr "内部接続エラーです\n"
 
-#: src/protocols/oscar/oscar.c:509
+#: src/protocols/oscar/oscar.c:508
 msgid "Unable to login to AIM"
 msgstr "AIMへログインできません"
 
-#: src/protocols/oscar/oscar.c:514
+#: src/protocols/oscar/oscar.c:513
 #, c-format
 msgid "Signon: %s"
 msgstr "サインオン: %s"
 
-#: src/protocols/oscar/oscar.c:586
+#: src/protocols/oscar/oscar.c:585
 msgid "Signed off.\n"
 msgstr "サインオフ\n"
 
-#: src/protocols/oscar/oscar.c:605 src/protocols/oscar/oscar.c:730
+#: src/protocols/oscar/oscar.c:604 src/protocols/oscar/oscar.c:729
 msgid "Could Not Connect"
 msgstr "接続できません"
 
-#: src/protocols/oscar/oscar.c:613
+#: src/protocols/oscar/oscar.c:612
 msgid "Connection established, cookie sent"
 msgstr "接続できました、cookie送信"
 
-#: src/protocols/oscar/oscar.c:639 src/protocols/toc/toc.c:459
+#. Incorrect nick/password
+#: src/protocols/oscar/oscar.c:638 src/protocols/toc/toc.c:459
 msgid "Incorrect nickname or password."
 msgstr "間違ったニックネームかパスワードです"
 
-#: src/protocols/oscar/oscar.c:644
+#. Suspended account
+#: src/protocols/oscar/oscar.c:643
 msgid "Your account is currently suspended."
 msgstr "あなたのアカウントは現在停止中です"
 
-#: src/protocols/oscar/oscar.c:648
+#. connecting too frequently
+#: src/protocols/oscar/oscar.c:647
 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."
@@ -1065,24 +1129,47 @@
 "頻繁に接続しすぎており分離していました。10分待って、再び試みてください。努力"
 "し続ければ、さらに長く待つ必要があるでしょう。"
 
-#: src/protocols/oscar/oscar.c:653
+#. client too old
+#: src/protocols/oscar/oscar.c:652
 msgid "The client version you are using is too old. Please upgrade at "
 msgstr "クライアントのバージョンが古すぎます アップデートしましょう"
 
-#: src/protocols/oscar/oscar.c:657 src/protocols/toc/toc.c:542
+#: src/protocols/oscar/oscar.c:656 src/protocols/toc/toc.c:542
 msgid "Authentication Failed"
 msgstr "認証に失敗"
 
-#: src/protocols/oscar/oscar.c:679
+#: src/protocols/oscar/oscar.c:678
 msgid "Internal Error"
 msgstr "内部エラー"
 
-#: src/protocols/oscar/oscar.c:1248 src/protocols/oscar/oscar.c:3435
+#: src/protocols/oscar/oscar.c:767 src/protocols/oscar/oscar.c:792
+#, fuzzy
+msgid "Gaim was Unable to get a valid AIM login hash."
+msgstr "Gaimはメッセージを送れません"
+
+#: src/protocols/oscar/oscar.c:768 src/protocols/oscar/oscar.c:793
+#: src/protocols/oscar/oscar.c:875
+msgid ""
+"You may be disconnected shortly.  You may want to use TOC until this is "
+"fixed.  Check "
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:769 src/protocols/oscar/oscar.c:794
+#: src/protocols/oscar/oscar.c:876
+msgid " for updates."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:874
+#, fuzzy
+msgid "Gaim was Unable to get valid login hash."
+msgstr "Gaimはメッセージを送れません"
+
+#: src/protocols/oscar/oscar.c:1250 src/protocols/oscar/oscar.c:3438
 #, c-format
 msgid "Direct IM with %s established"
 msgstr "%s との直接IM確立しました"
 
-#: src/protocols/oscar/oscar.c:1504 src/protocols/oscar/oscar.c:2456
+#: src/protocols/oscar/oscar.c:1506 src/protocols/oscar/oscar.c:2456
 #, fuzzy, c-format
 msgid ""
 "The user %lu has denied your request to add them to your contact list for "
@@ -1092,121 +1179,109 @@
 "ユーザ%dは、次の理由のためにあなたの接触リストにそれらを加えるあなたのリクエ"
 "ストを否定しました。\n"
 
-#: src/protocols/oscar/oscar.c:1504 src/protocols/oscar/oscar.c:2456
+#: src/protocols/oscar/oscar.c:1506 src/protocols/oscar/oscar.c:2456
 msgid "No reason given."
 msgstr "理由不明"
 
-#: src/protocols/oscar/oscar.c:1505 src/protocols/oscar/oscar.c:2457
-msgid "Gaim - ICQ Authorization Denied"
+#: src/protocols/oscar/oscar.c:1507
+#, fuzzy
+msgid "ICQ authorization denied."
 msgstr "Gaim - ICQ認証に拒否されました"
 
-#: src/protocols/oscar/oscar.c:1511 src/protocols/oscar/oscar.c:2463
+#: src/protocols/oscar/oscar.c:1513 src/protocols/oscar/oscar.c:2463
 #, fuzzy, c-format
 msgid "The user %lu has granted your request to add them to your contact list."
 msgstr ""
 "ユーザ%dは、あなたのリクエストがあなたのコンタクトリストに彼らを加えることを"
 "認めました。"
 
-#: src/protocols/oscar/oscar.c:1512 src/protocols/oscar/oscar.c:2464
-msgid "Gaim - ICQ Authorization Granted"
-msgstr "Gaim - ICQ認証"
-
-#: src/protocols/oscar/oscar.c:1585
+#: src/protocols/oscar/oscar.c:1587
 #, c-format
 msgid "You missed %d message from %s because it was invalid."
 msgstr "%2$sからのメッセージ%1$dは無効であるために失敗しました"
 
-#: src/protocols/oscar/oscar.c:1586
+#: src/protocols/oscar/oscar.c:1588
 #, c-format
 msgid "You missed %d messages from %s because they were invalid."
 msgstr "%2$sからのメッセージ%1$dは無効であるために失敗しました"
 
-#: src/protocols/oscar/oscar.c:1595
+#: src/protocols/oscar/oscar.c:1597
 #, c-format
 msgid "You missed %d message from %s because it was too large."
 msgstr "%2$sからの%1$dメッセージはでかすぎるために失敗しました"
 
-#: src/protocols/oscar/oscar.c:1596
+#: src/protocols/oscar/oscar.c:1598
 #, c-format
 msgid "You missed %d messages from %s because they were too large."
 msgstr "%2$sからの%1$dメッセージはでかすぎるために失敗しました"
 
-#: src/protocols/oscar/oscar.c:1605
+#: src/protocols/oscar/oscar.c:1607
 #, c-format
 msgid "You missed %d message from %s because the rate limit has been exceeded."
 msgstr "割合限界を超過したので%2$sからの%1$dメッセージを逃しました"
 
-#: src/protocols/oscar/oscar.c:1606
+#: src/protocols/oscar/oscar.c:1608
 #, c-format
 msgid ""
 "You missed %d messages from %s because the rate limit has been exceeded."
 msgstr "割合限界を超過したので%2$sからの%1$dメッセージを逃しました"
 
-#: src/protocols/oscar/oscar.c:1615
+#: src/protocols/oscar/oscar.c:1617
 #, c-format
 msgid "You missed %d message from %s because it was too evil."
 msgstr "有害すぎたので、%2$sからの%1$dメッセージを逃しました"
 
-#: src/protocols/oscar/oscar.c:1616
+#: src/protocols/oscar/oscar.c:1618
 #, c-format
 msgid "You missed %d messages from %s because they are too evil."
 msgstr "有害すぎたので、%2$sからの%1$dメッセージを逃しました"
 
-#: src/protocols/oscar/oscar.c:1625
+#: src/protocols/oscar/oscar.c:1627
 #, c-format
 msgid "You missed %d message from %s because you are too evil."
 msgstr "有害すぎたので、%2$sからの%1$dメッセージを逃しました"
 
-#: src/protocols/oscar/oscar.c:1626
+#: src/protocols/oscar/oscar.c:1628
 #, c-format
 msgid "You missed %d messages from %s because you are too evil."
 msgstr "有害すぎたので、%2$sからの%1$dメッセージを逃しました"
 
-#: src/protocols/oscar/oscar.c:1634
+#: src/protocols/oscar/oscar.c:1636
 #, c-format
 msgid "You missed %d message from %s for unknown reasons."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1635
+#: src/protocols/oscar/oscar.c:1637
 #, c-format
 msgid "You missed %d messages from %s for unknown reasons."
 msgstr "原因不明ですが%2$sからの%1$dメッセージを逃しました"
 
-#: src/protocols/oscar/oscar.c:1640 src/protocols/oscar/oscar.c:1755
-#: src/protocols/oscar/oscar.c:1773 src/protocols/oscar/oscar.c:2226
-#: src/protocols/yahoo/yahoo.c:594 src/dialogs.c:3432 src/dialogs.c:3438
-msgid "Gaim - Error"
-msgstr "Gaim - エラー"
-
-#: src/protocols/oscar/oscar.c:1703
+#: src/protocols/oscar/oscar.c:1705
 #, c-format
 msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR>%s<BR>"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1705
+#: src/protocols/oscar/oscar.c:1707
 #, c-format
 msgid "<B>Status:</B> %s<BR><HR><BR>%s<BR>"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1734
+#: src/protocols/oscar/oscar.c:1736
 #, c-format
 msgid "SNAC threw error: %s\n"
 msgstr "SNAC スルーエラー: %s\n"
 
-#: src/protocols/oscar/oscar.c:1736
-msgid "Gaim - Oscar SNAC Error"
-msgstr "Gaim - Oscar SNAC エラー"
-
-#: src/protocols/oscar/oscar.c:1753
+#: src/protocols/oscar/oscar.c:1755
 #, c-format
 msgid "Your message to %s did not get sent: %s"
 msgstr "%sへのメッセージは送信できませんでした:%s"
 
-#: src/protocols/oscar/oscar.c:1754 src/protocols/oscar/oscar.c:1772
-msgid "Reason unknown"
-msgstr "原因不明"
-
-#: src/protocols/oscar/oscar.c:1771
+#: src/protocols/oscar/oscar.c:1756 src/protocols/oscar/oscar.c:1773
+#, fuzzy
+msgid "No reason was given."
+msgstr "理由不明"
+
+#: src/protocols/oscar/oscar.c:1772
 #, c-format
 msgid "User information for %s unavailable: %s"
 msgstr "%sのユーザ情報が見えません: %s"
@@ -1316,50 +1391,87 @@
 msgstr "<i>提供されている情報はありません</i>"
 
 #: src/protocols/oscar/oscar.c:1989
-msgid "Your connection may be lost."
+#, fuzzy
+msgid "Your AIM connection may be lost."
 msgstr "接続が失われました"
 
-#: src/protocols/oscar/oscar.c:1990
-msgid "AOL error"
-msgstr "AOLエラー"
+#: src/protocols/oscar/oscar.c:2224
+msgid "Rate limiting error."
+msgstr ""
 
 #: src/protocols/oscar/oscar.c:2225
+#, fuzzy
 msgid ""
-"The last message was not sent because you are over the rate limit. Please "
+"The last message was not sent because you are over the rate limit.  Please "
 "wait 10 seconds and try again."
 msgstr ""
 "割合限界に達しているためメッセージは送信しませんでした10秒まって再送してくだ"
 "さい"
 
-#: src/protocols/oscar/oscar.c:2589 src/protocols/oscar/oscar.c:3556
-#: src/protocols/toc/toc.c:1564 src/protocols/toc/toc.c:1581
-#: src/protocols/toc/toc.c:1641 src/protocols/toc/toc.c:1683
-#: src/protocols/toc/toc.c:1802 src/protocols/toc/toc.c:1832
-#: src/protocols/toc/toc.c:1888 src/dialogs.c:3982
-msgid "Error"
-msgstr "エラー"
-
-#: src/protocols/oscar/oscar.c:3207
+#: src/protocols/oscar/oscar.c:2457
+#, fuzzy
+msgid "ICQ Authorization denied"
+msgstr "Gaim - ICQ認証に拒否されました"
+
+#: src/protocols/oscar/oscar.c:2464
+#, fuzzy
+msgid "ICQ Authorization Granted"
+msgstr "Gaim - ICQ認証"
+
+#: src/protocols/oscar/oscar.c:2791
+#, fuzzy
+msgid "Unable to set AIM profile."
+msgstr "%sファイルを読み込めません"
+
+#: src/protocols/oscar/oscar.c:2792
+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 "
+"fully connected."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2798
+#, c-format
+msgid ""
+"The maximum profile length of %d bytes has been exceeded.  Gaim has "
+"truncated and set it."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2818
+#, fuzzy
+msgid "Unable to set AIM away message."
+msgstr "Gaimはメッセージを送れません"
+
+#: src/protocols/oscar/oscar.c:2819
+msgid ""
+"You have probably requested to set your away message before the login "
+"procedure completed.  You remain in a \"present\" state; try setting it "
+"again when you are fully connected."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2834
+#, c-format
+msgid ""
+"The away message length of %d bytes has been exceeded.  Gaim has truncated "
+"it and set you away."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3210
 #, c-format
 msgid ""
 "The maximum number of buddies allowed in your buddy list is %d, and you have "
 "%d.  Until you are below the limit, some buddies will not show up as online."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3210
-#, fuzzy
-msgid "Gaim - Warning"
-msgstr "Gaim - ユーザを警告しますか?"
-
-#: src/protocols/oscar/oscar.c:3228 src/protocols/toc/toc.c:1108
+#: src/protocols/oscar/oscar.c:3231 src/protocols/toc/toc.c:1108
 msgid "Exchange:"
 msgstr "交換:"
 
-#: src/protocols/oscar/oscar.c:3556
+#: src/protocols/oscar/oscar.c:3559
 msgid "Unable to open Direct IM"
 msgstr "直接IMを開けません"
 
-#: src/protocols/oscar/oscar.c:3566
+#: src/protocols/oscar/oscar.c:3569
 #, c-format
 msgid ""
 "You have selected to open a Direct IM connection with %s. Doing this will "
@@ -1369,30 +1481,30 @@
 "%sとの直接IMを選択しました あなたのIPアドレスを彼らに見えるようにしますがセ"
 "キュリティ的危険があります続けますか?"
 
-#: src/protocols/oscar/oscar.c:3583
+#: src/protocols/oscar/oscar.c:3586
 #, c-format
 msgid ""
 "<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR><I>Remote client does not "
 "support sending status messages.</I><BR>"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3590
+#: src/protocols/oscar/oscar.c:3593
 #, c-format
 msgid ""
 "<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR><I>User has no status message."
 "</I><BR>"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3615
+#: src/protocols/oscar/oscar.c:3618
 #, fuzzy
 msgid "Get Status Msg"
 msgstr "離席メッセージ"
 
-#: src/protocols/oscar/oscar.c:3628
+#: src/protocols/oscar/oscar.c:3631
 msgid "Direct IM"
 msgstr "直接IM"
 
-#: src/protocols/oscar/oscar.c:3636
+#: src/protocols/oscar/oscar.c:3639
 msgid "Get Capabilities"
 msgstr "機能取得"
 
@@ -1524,48 +1636,42 @@
 msgid "TOC has come back from its pause. You may now send messages again."
 msgstr "TOCは休止からもどりました メッセージの再送ができます"
 
-#: src/protocols/toc/toc.c:599
-msgid "TOC Resume"
-msgstr "TOC履歴"
-
-#: src/protocols/toc/toc.c:763
-msgid "Chat Error"
-msgstr "チャットエラー"
-
 #: src/protocols/toc/toc.c:782
 msgid "Password Change Successful"
 msgstr "パスワード変更成功"
 
-#: src/protocols/toc/toc.c:782 src/dialogs.c:2142
-msgid "Gaim - Password Change"
-msgstr "Gaim - パスワード変更"
+#: src/protocols/toc/toc.c:785
+msgid "TOC has sent a PAUSE command."
+msgstr ""
 
 #: src/protocols/toc/toc.c:785
+#, fuzzy
 msgid ""
-"TOC has sent a PAUSE command. When this happens, TOC ignores any messages "
-"sent to it, and may kick you off if you send a message. Gaim will prevent "
-"anything from going through. This is only temporary, please be patient."
+"When this happens, TOC ignores any messages sent to it, and may kick you off "
+"if you send a message. Gaim will prevent anything from going through. This "
+"is only temporary, please be patient."
 msgstr ""
 "TOCは休止コマンドを送りました これが発生した場合TOCはメッセージの送信を無視"
 "し、あなたがメッセージを送っても蹴られます Gaimはこれによりどのメッセージが通"
 "り抜けることもありません 一時的ですので我慢してください"
 
-#: src/protocols/toc/toc.c:788
-msgid "TOC Pause"
-msgstr "TOC休止"
-
 #: src/protocols/toc/toc.c:1225
 msgid "Get Dir Info"
 msgstr "ディレクトリ情報取得"
 
 #: src/protocols/toc/toc.c:1641 src/protocols/toc/toc.c:1683
-#: src/protocols/toc/toc.c:1802 src/protocols/toc/toc.c:1888
+#: src/protocols/toc/toc.c:1888
+#, fuzzy
+msgid "Could not connect for transfer."
+msgstr "転送接続できません"
+
+#: src/protocols/toc/toc.c:1802
 msgid "Could not connect for transfer!"
 msgstr "転送接続できません"
 
 #: src/protocols/toc/toc.c:1832
-msgid "Could not write file header!"
-msgstr "ファイルヘッダを書くことができません!"
+msgid "Could not write file header.  The file will not be transferred."
+msgstr ""
 
 #: src/protocols/toc/toc.c:1921
 msgid "Gaim - Save As..."
@@ -1587,22 +1693,23 @@
 msgstr "%sがファイルを送るよう要求しています"
 
 #: src/protocols/yahoo/yahoo.c:594
-msgid "Your message did not get sent."
+#, fuzzy
+msgid "Your Yahoo! message did not get sent."
 msgstr "メッセージは送りませんでした"
 
-#: src/protocols/zephyr/zephyr.c:840
+#: src/protocols/zephyr/zephyr.c:841
 msgid "ZLocate"
 msgstr "ZLocate"
 
-#: src/protocols/zephyr/zephyr.c:877
+#: src/protocols/zephyr/zephyr.c:878
 msgid "Class:"
 msgstr "クラス:"
 
-#: src/protocols/zephyr/zephyr.c:881
+#: src/protocols/zephyr/zephyr.c:882
 msgid "Instance:"
 msgstr "インスタンス:"
 
-#: src/protocols/zephyr/zephyr.c:885
+#: src/protocols/zephyr/zephyr.c:886
 msgid "Recipient:"
 msgstr "受取人"
 
@@ -1625,10 +1732,11 @@
 "URL:"
 
 #: src/about.c:137
+#, fuzzy
 msgid ""
 "\n"
 "\n"
-"IRC: #gaim on irc.openprojects.net"
+"IRC: #gaim on irc.freenode.net"
 msgstr ""
 "\n"
 "\n"
@@ -1672,6 +1780,9 @@
 "Eric Warmenhoven                   [ warmenhoven@yahoo.com ]\n"
 "Mark Spencer (original author)   [ markster@marko.net ]"
 
+#. this makes the sizes not work.
+#. GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
+#. gtk_widget_grab_default(button);
 #: src/about.c:185
 msgid "Web Site"
 msgstr "Webサイト"
@@ -1681,13 +1792,10 @@
 msgstr "サインオフ"
 
 #: src/aim.c:162
-msgid "Please enter your logon"
+#, fuzzy
+msgid "Please enter your login."
 msgstr "ログインしてください"
 
-#: src/aim.c:162 src/multi.c:1407 src/server.c:55
-msgid "Signon Error"
-msgstr "サインオンエラー"
-
 #: src/aim.c:260
 msgid "Gaim - Login"
 msgstr "Gaim - ログイン"
@@ -1728,40 +1836,11 @@
 msgid "Preferences"
 msgstr "設定"
 
-#: src/aim.c:841 src/multi.c:1479
+#: src/aim.c:841 src/multi.c:1481
 #, fuzzy
 msgid "Auto-login"
 msgstr "自動ログイン"
 
-#: src/applet.c:109
-msgid "Attempting to sign on...."
-msgstr "サインオンの承認"
-
-#: src/applet.c:112
-msgid "Offline. Click to bring up login box."
-msgstr "オフライン ログインボックスをクリックしてください"
-
-#: src/applet.c:128
-#, c-format
-msgid "Away: %d pending."
-msgstr "離席: %d ペンディング"
-
-#: src/applet.c:131
-msgid "Away."
-msgstr "離席"
-
-#: src/applet.c:200 src/away.c:388
-msgid "New Away Message"
-msgstr "新しい離席メッセージ"
-
-#: src/applet.c:348
-msgid "Can't create Gaim applet!"
-msgstr "Gaimアプレットをつくれません!"
-
-#: src/applet.c:368
-msgid "About..."
-msgstr "About..."
-
 #: src/away.c:202
 msgid "Gaim - Away!"
 msgstr "Gaim - 離席!"
@@ -1774,6 +1853,10 @@
 msgid "Back"
 msgstr "戻る"
 
+#: src/away.c:388
+msgid "New Away Message"
+msgstr "新しい離席メッセージ"
+
 #: src/away.c:408
 msgid "Remove Away Message"
 msgstr "離席メッセージの削除"
@@ -1782,7 +1865,7 @@
 msgid "Set All Away"
 msgstr "全部離席する"
 
-#: src/buddy.c:490 src/buddy.c:2803 src/dialogs.c:967 src/dialogs.c:1114
+#: src/buddy.c:490 src/buddy.c:2803 src/dialogs.c:981 src/dialogs.c:1128
 msgid "Group"
 msgstr "グループ"
 
@@ -1792,12 +1875,13 @@
 msgstr "IM"
 
 #: src/buddy.c:497 src/buddy.c:2554 src/buddy_chat.c:880 src/buddy_chat.c:1289
-#: src/buddy_chat.c:1465 src/conversation.c:2922
+#: src/buddy_chat.c:1465 src/conversation.c:2952
 msgid "Info"
 msgstr "情報"
 
-#: src/buddy.c:653 src/buddy.c:823 src/dialogs.c:1106 src/dialogs.c:3836
-#: src/dialogs.c:3851
+#. Put the buttons in the box
+#: src/buddy.c:653 src/buddy.c:823 src/dialogs.c:1120 src/dialogs.c:3851
+#: src/dialogs.c:3866
 msgid "Alias"
 msgstr "エイリアス"
 
@@ -1817,10 +1901,6 @@
 msgid "Un-Alias"
 msgstr "エイリアスを解く"
 
-#: src/buddy.c:1629 src/buddy.c:2706
-msgid "Buddy Pounce"
-msgstr "仲間を掴む"
-
 #: src/buddy.c:1709
 msgid "New Buddy Pounce"
 msgstr "新しい仲間を掴む"
@@ -1877,7 +1957,7 @@
 msgid "Information on selected Buddy"
 msgstr "選択した仲間の情報"
 
-#: src/buddy.c:2589 src/dialogs.c:722
+#: src/buddy.c:2589 src/dialogs.c:736
 msgid "Send Instant Message"
 msgstr "簡易メッセージの送信"
 
@@ -1905,7 +1985,7 @@
 msgid "New Instant Message"
 msgstr "新しい簡易メッセージ"
 
-#: src/buddy.c:2673 src/dialogs.c:784
+#: src/buddy.c:2673 src/dialogs.c:798
 msgid "Get User Info"
 msgstr "ユーザ情報取得"
 
@@ -1917,6 +1997,10 @@
 msgid "Tools"
 msgstr "ツール"
 
+#: src/buddy.c:2706
+msgid "Buddy Pounce"
+msgstr "仲間を掴む"
+
 #: src/buddy.c:2719
 msgid "Protocol Actions"
 msgstr "プロトコル選択"
@@ -1963,7 +2047,7 @@
 msgid "About Gaim"
 msgstr "Gaimについて"
 
-#: src/buddy.c:2782 src/prefs.c:1660
+#: src/buddy.c:2782 src/prefs.c:1307
 msgid "Buddy List"
 msgstr "仲間リスト"
 
@@ -1996,12 +2080,12 @@
 msgstr "名前を指定してチャットに加入"
 
 #: src/buddy_chat.c:304 src/buddy_chat.c:392 src/dialogs.c:451
-#: src/dialogs.c:541 src/dialogs.c:740 src/dialogs.c:841 src/dialogs.c:959
-#: src/dialogs.c:1135 src/dialogs.c:1885 src/dialogs.c:2090 src/dialogs.c:2214
-#: src/dialogs.c:2274 src/dialogs.c:2496 src/dialogs.c:2678 src/dialogs.c:2853
-#: src/dialogs.c:2924 src/dialogs.c:3586 src/dialogs.c:3838 src/dialogs.c:4019
-#: src/dialogs.c:4394 src/dialogs.c:4500 src/dialogs.c:5185 src/multi.c:781
-#: src/multi.c:911 src/prpl.c:160 src/prpl.c:234
+#: src/dialogs.c:541 src/dialogs.c:754 src/dialogs.c:855 src/dialogs.c:973
+#: src/dialogs.c:1149 src/dialogs.c:1899 src/dialogs.c:2104 src/dialogs.c:2228
+#: src/dialogs.c:2288 src/dialogs.c:2510 src/dialogs.c:2692 src/dialogs.c:2867
+#: src/dialogs.c:2938 src/dialogs.c:3601 src/dialogs.c:3853 src/dialogs.c:4034
+#: src/dialogs.c:4409 src/dialogs.c:4515 src/dialogs.c:5199 src/multi.c:781
+#: src/multi.c:911 src/prpl.c:162 src/prpl.c:236
 msgid "Cancel"
 msgstr "取消"
 
@@ -2014,7 +2098,7 @@
 msgid "Invite"
 msgstr "招待"
 
-#: src/buddy_chat.c:412 src/dialogs.c:1713 src/dialogs.c:3846
+#: src/buddy_chat.c:412 src/dialogs.c:1727 src/dialogs.c:3861
 msgid "Buddy"
 msgstr "仲間"
 
@@ -2030,10 +2114,11 @@
 msgid "Un-Ignore"
 msgstr "不無視"
 
-#: src/buddy_chat.c:873 src/buddy_chat.c:1285
+#: src/buddy_chat.c:873 src/buddy_chat.c:1285 src/prefs.c:379
 msgid "Ignore"
 msgstr "無視"
 
+#. don't remove them from ignored in case they re-enter
 #: src/buddy_chat.c:936 src/buddy_chat.c:1048 src/buddy_chat.c:1511
 #: src/buddy_chat.c:1544
 #, c-format
@@ -2077,15 +2162,15 @@
 msgstr "ささやく"
 
 #: src/buddy_chat.c:1341 src/buddy_chat.c:1418 src/buddy_chat.c:1467
-#: src/conversation.c:2933
+#: src/conversation.c:2963
 msgid "Send"
 msgstr "送信"
 
-#: src/buddy_chat.c:1461 src/conversation.c:2910
+#: src/buddy_chat.c:1461 src/conversation.c:2940
 msgid "Block"
 msgstr "拒む"
 
-#: src/buddy_chat.c:1463 src/conversation.c:2916 src/dialogs.c:426
+#: src/buddy_chat.c:1463 src/conversation.c:2946 src/dialogs.c:426
 #: src/dialogs.c:455
 msgid "Warn"
 msgstr "警告"
@@ -2099,16 +2184,14 @@
 msgstr "Gaim - 画像挿入"
 
 #: src/conversation.c:1336
-msgid "Unable to send message: too large"
+#, fuzzy
+msgid "Unable to send message.  The message is too large"
 msgstr "メッセージを送れません: でかいから"
 
-#: src/conversation.c:1336 src/conversation.c:1340
-msgid "Message Error"
-msgstr "メッセージエラー"
-
 #: src/conversation.c:1340
-msgid "Unable to send message: Unknown reason"
-msgstr "メッセージを送れません: 原因不明"
+#, fuzzy
+msgid "Unable to send message"
+msgstr "メッセージを送れません: でかいから"
 
 #: src/conversation.c:1559
 #, c-format
@@ -2120,156 +2203,156 @@
 msgid "Setting position to %d\n"
 msgstr "位置を%dにします\n"
 
-#: src/conversation.c:2187
+#: src/conversation.c:2217
 msgid "Bold Text"
 msgstr "ボールドテキスト"
 
-#: src/conversation.c:2187 src/prefs.c:308
+#: src/conversation.c:2217
 msgid "Bold"
 msgstr "ボールド"
 
-#: src/conversation.c:2191
+#: src/conversation.c:2221
 msgid "Italics Text"
 msgstr "イタリックテキスト"
 
-#: src/conversation.c:2192 src/prefs.c:309
+#: src/conversation.c:2222
 msgid "Italics"
 msgstr "イタリック"
 
-#: src/conversation.c:2195
+#: src/conversation.c:2225
 msgid "Underline Text"
 msgstr "下線テキスト"
 
-#: src/conversation.c:2196 src/prefs.c:310
+#: src/conversation.c:2226
 msgid "Underline"
 msgstr "下線"
 
-#: src/conversation.c:2200
+#: src/conversation.c:2230
 msgid "Strike through Text"
 msgstr "テキスト入力"
 
-#: src/conversation.c:2200
+#: src/conversation.c:2230
 msgid "Strike"
 msgstr "入力"
 
-#: src/conversation.c:2206
+#: src/conversation.c:2236
 msgid "Decrease font size"
 msgstr "サイズ減少"
 
-#: src/conversation.c:2206
+#: src/conversation.c:2236
 msgid "Small"
 msgstr "小さい"
 
-#: src/conversation.c:2209
+#: src/conversation.c:2239
 msgid "Normal font size"
 msgstr "普通のフォントサイズ"
 
-#: src/conversation.c:2209
+#: src/conversation.c:2239
 msgid "Normal"
 msgstr "普通"
 
-#: src/conversation.c:2212
+#: src/conversation.c:2242
 msgid "Increase font size"
 msgstr "サイズ増大"
 
-#: src/conversation.c:2212
+#: src/conversation.c:2242
 msgid "Big"
 msgstr "大きい"
 
-#: src/conversation.c:2219 src/dialogs.c:3239 src/dialogs.c:3263
+#: src/conversation.c:2249 src/dialogs.c:3253 src/dialogs.c:3277
 msgid "Select Font"
 msgstr "フォントの選択"
 
-#: src/conversation.c:2220
+#: src/conversation.c:2250
 msgid "Font"
 msgstr "フォント"
 
-#: src/conversation.c:2223
+#: src/conversation.c:2253
 msgid "Text Color"
 msgstr "文字色"
 
-#: src/conversation.c:2224 src/conversation.c:2228
+#: src/conversation.c:2254 src/conversation.c:2258 src/prefs.c:329
 msgid "Color"
 msgstr "色"
 
-#: src/conversation.c:2228
+#: src/conversation.c:2258
 msgid "Background Color"
 msgstr "背景色"
 
-#: src/conversation.c:2235 src/dialogs.c:2918
+#: src/conversation.c:2265 src/dialogs.c:2932
 msgid "Insert Link"
 msgstr "リンクの挿入"
 
-#: src/conversation.c:2236
+#: src/conversation.c:2266
 msgid "Link"
 msgstr "リンク"
 
-#: src/conversation.c:2239
+#: src/conversation.c:2269
 msgid "Insert smiley face"
 msgstr "スマイリー挿入"
 
-#: src/conversation.c:2239
+#: src/conversation.c:2269
 msgid "Smiley"
 msgstr "スマイリー"
 
-#: src/conversation.c:2242
+#: src/conversation.c:2272
 msgid "Insert IM Image"
 msgstr "IM画像挿入"
 
-#: src/conversation.c:2242
+#: src/conversation.c:2272
 msgid "Image"
 msgstr "画像"
 
-#: src/conversation.c:2249
+#: src/conversation.c:2279
 msgid "Enable logging"
 msgstr "ログ有効化"
 
-#: src/conversation.c:2250 src/prefs.c:1667
+#: src/conversation.c:2280 src/prefs.c:1314
 msgid "Logging"
 msgstr "ログ"
 
-#: src/conversation.c:2259
+#: src/conversation.c:2289
 msgid "Save Conversation"
 msgstr "会話の保存"
 
-#: src/conversation.c:2260 src/dialogs.c:2094 src/dialogs.c:2278
-#: src/dialogs.c:3598 src/dialogs.c:4286 src/dialogs.c:5193
+#: src/conversation.c:2290 src/dialogs.c:2108 src/dialogs.c:2292
+#: src/dialogs.c:3613 src/dialogs.c:4301 src/dialogs.c:5207
 msgid "Save"
 msgstr "保存"
 
-#: src/conversation.c:2264
+#: src/conversation.c:2294
 msgid "Toggle Sound"
 msgstr ""
 
-#: src/conversation.c:2265
+#: src/conversation.c:2295
 msgid "Sound"
 msgstr "音"
 
-#: src/conversation.c:2752
+#: src/conversation.c:2782
 msgid "Gaim - Conversations"
 msgstr "Gaim - 会話"
 
-#: src/conversation.c:2839
+#: src/conversation.c:2869
 msgid "Send message as: "
 msgstr "名前を付けてメッセージ送信:"
 
-#: src/conversation.c:3503
+#: src/conversation.c:3533
 msgid "Gaim - Save Icon"
 msgstr "Gaim - アイコン保存"
 
-#: src/conversation.c:3537
+#: src/conversation.c:3567
 msgid "Disable Animation"
 msgstr "アニメーション無効化"
 
-#: src/conversation.c:3548
+#: src/conversation.c:3578
 msgid "Enable Animation"
 msgstr "アニメーション有効化"
 
-#: src/conversation.c:3554
+#: src/conversation.c:3584
 msgid "Hide Icon"
 msgstr "隠れアイコン"
 
-#: src/conversation.c:3560
+#: src/conversation.c:3590
 msgid "Save Icon As..."
 msgstr "名前を付けてアイコンを保存"
 
@@ -2311,385 +2394,406 @@
 "your buddylist. Do you want to continue?"
 msgstr "仲間リストから'%s'を削除することについて続けますか?"
 
-#: src/dialogs.c:531 src/prpl.c:164 src/prpl.c:238
+#: src/dialogs.c:531 src/prpl.c:166 src/prpl.c:240
 msgid "Accept"
 msgstr "了解"
 
-#: src/dialogs.c:660 src/dialogs.c:745 src/dialogs.c:846 src/dialogs.c:1889
-#: src/dialogs.c:2218 src/dialogs.c:2369 src/dialogs.c:2677 src/dialogs.c:2857
-#: src/dialogs.c:2923 src/dialogs.c:4399 src/dialogs.c:4505 src/multi.c:786
-#: src/prefs.c:1831
+#. Build OK Button
+#: src/dialogs.c:674 src/dialogs.c:759 src/dialogs.c:860 src/dialogs.c:1903
+#: src/dialogs.c:2232 src/dialogs.c:2383 src/dialogs.c:2691 src/dialogs.c:2871
+#: src/dialogs.c:2937 src/dialogs.c:4414 src/dialogs.c:4520 src/multi.c:786
 msgid "OK"
 msgstr "了解"
 
-#: src/dialogs.c:712
+#: src/dialogs.c:726
 msgid "Gaim - IM user"
 msgstr "Gaim - IMユーザ"
 
-#: src/dialogs.c:729
+#: src/dialogs.c:743
 msgid "IM who:"
 msgstr "IM 誰:"
 
-#: src/dialogs.c:793
+#: src/dialogs.c:807
 msgid "User:"
 msgstr "ユーザ:"
 
-#: src/dialogs.c:802
+#: src/dialogs.c:816
 #, fuzzy
 msgid "Account:"
 msgstr "アカウント"
 
-#: src/dialogs.c:851
+#. Finish up
+#: src/dialogs.c:865
 msgid "Gaim - Get User Info"
 msgstr "Gaim - ユーザ情報取得"
 
-#: src/dialogs.c:965
+#: src/dialogs.c:979
 msgid "Add Group"
 msgstr "グループ追加"
 
-#: src/dialogs.c:990
+#: src/dialogs.c:1004
 msgid "Gaim - Add Group"
 msgstr "Gaim - グループ追加"
 
-#: src/dialogs.c:1074
+#: src/dialogs.c:1088
 msgid "Gaim - Add Buddy"
 msgstr "Gaim - 仲間追加"
 
-#: src/dialogs.c:1086
+#: src/dialogs.c:1100
 msgid "Add Buddy"
 msgstr "仲間追加"
 
-#: src/dialogs.c:1096
+#: src/dialogs.c:1110
 msgid "Contact"
 msgstr "コンタクト"
 
-#: src/dialogs.c:1122
+#. Set up stuff for the account box
+#: src/dialogs.c:1136
 msgid "Add To"
 msgstr "追加"
 
-#: src/dialogs.c:1417
+#: src/dialogs.c:1431
 #, fuzzy
 msgid "Gaim - Privacy"
 msgstr "Gaim - 離席!"
 
-#: src/dialogs.c:1429
+#: src/dialogs.c:1443
 msgid "Privacy settings are affected immediately."
 msgstr ""
 
-#: src/dialogs.c:1437
+#: src/dialogs.c:1451
 msgid "Set privacy for:"
 msgstr "個人情報設定:"
 
-#: src/dialogs.c:1456
+#: src/dialogs.c:1470
 msgid "Allow all users to contact me"
 msgstr "だれの接触も許可"
 
-#: src/dialogs.c:1457
+#: src/dialogs.c:1471
 msgid "Allow only the users below"
 msgstr "以下のユーザのみ許可"
 
-#: src/dialogs.c:1459
+#: src/dialogs.c:1473
 msgid "Allow List"
 msgstr "許可リスト"
 
-#: src/dialogs.c:1490
+#: src/dialogs.c:1504
 msgid "Deny all users"
 msgstr "誰も許さない"
 
-#: src/dialogs.c:1491
+#: src/dialogs.c:1505
 msgid "Block the users below"
 msgstr "以下のユーザのみ拒否"
 
-#: src/dialogs.c:1493
+#: src/dialogs.c:1507
 msgid "Block List"
 msgstr "拒否リスト"
 
-#: src/dialogs.c:1546
+#: src/dialogs.c:1560
 msgid "Please enter a buddy to pounce."
 msgstr "掴みかかる仲間をいれてください"
 
-#: src/dialogs.c:1546
-msgid "Buddy Pounce Error"
-msgstr "仲間掴みエラー"
-
-#: src/dialogs.c:1682
+#: src/dialogs.c:1696
 msgid "Gaim - New Buddy Pounce"
 msgstr "Gaim - 新しい仲間を掴む"
 
-#: src/dialogs.c:1693
+#. <pounce type="who">
+#: src/dialogs.c:1707
 msgid "Pounce Who"
 msgstr "誰を掴む"
 
-#: src/dialogs.c:1704
+#: src/dialogs.c:1718
 msgid "Account"
 msgstr "アカウント"
 
-#: src/dialogs.c:1730
+#. </pounce type="who">
+#. <pounce type="when">
+#: src/dialogs.c:1744
 msgid "Pounce When"
 msgstr "いつつかみかかる"
 
-#: src/dialogs.c:1740
+#: src/dialogs.c:1754
 msgid "Pounce on sign on"
 msgstr "サインオンの時"
 
-#: src/dialogs.c:1749
+#: src/dialogs.c:1763
 msgid "Pounce on return from away"
 msgstr "離席から戻った時"
 
-#: src/dialogs.c:1758
+#: src/dialogs.c:1772
 msgid "Pounce on return from idle"
 msgstr "休止から戻った時"
 
-#: src/dialogs.c:1767
+#: src/dialogs.c:1781
 msgid "Pounce when buddy is typing to you"
 msgstr "あなたへ仲間が入力した時"
 
-#: src/dialogs.c:1777
+#. </pounce type="when">
+#. <pounce type="action">
+#: src/dialogs.c:1791
 msgid "Pounce Action"
 msgstr "掴み設定"
 
-#: src/dialogs.c:1788
+#: src/dialogs.c:1802
 msgid "Open IM Window"
 msgstr "IMウィンドウを開く"
 
-#: src/dialogs.c:1797
+#: src/dialogs.c:1811
 msgid "Popup Notification"
 msgstr "ポップアップ通知"
 
-#: src/dialogs.c:1806
+#: src/dialogs.c:1820 src/prefs.c:395
 msgid "Send Message"
 msgstr "メッセージ送信"
 
-#: src/dialogs.c:1827
+#: src/dialogs.c:1841
 msgid "Execute command on pounce"
 msgstr "掴むコマンドの実行"
 
-#: src/dialogs.c:1849
+#: src/dialogs.c:1863
 msgid "Play sound on pounce"
 msgstr "掴む音を再生"
 
-#: src/dialogs.c:1871
+#. </pounce type="action">
+#: src/dialogs.c:1885
 msgid "Save this pounce after activation"
 msgstr "活性化後の掴みの保存"
 
-#: src/dialogs.c:1957
+#: src/dialogs.c:1971
 msgid "Gaim - Set Dir Info"
 msgstr "Gaim - ディレクトリ情報の設定"
 
-#: src/dialogs.c:1966
+#: src/dialogs.c:1980
 msgid "Directory Info"
 msgstr "ディレクトリ情報"
 
-#: src/dialogs.c:1988
+#: src/dialogs.c:2002
 msgid "Allow Web Searches To Find Your Info"
 msgstr "Web検索からあなたの情報を見付けることを許可する"
 
-#: src/dialogs.c:1991 src/dialogs.c:2696
+#. Line 1
+#: src/dialogs.c:2005 src/dialogs.c:2710
 msgid "First Name"
 msgstr "姓"
 
-#: src/dialogs.c:2002 src/dialogs.c:2708
+#. Line 2
+#: src/dialogs.c:2016 src/dialogs.c:2722
 msgid "Middle Name"
 msgstr "ミドルネーム"
 
-#: src/dialogs.c:2014 src/dialogs.c:2720
+#. Line 3
+#: src/dialogs.c:2028 src/dialogs.c:2734
 msgid "Last Name"
 msgstr "名"
 
-#: src/dialogs.c:2025 src/dialogs.c:2732
+#. Line 4
+#: src/dialogs.c:2039 src/dialogs.c:2746
 msgid "Maiden Name"
 msgstr "旧姓"
 
-#: src/dialogs.c:2047 src/dialogs.c:2755
+#. Line 6
+#: src/dialogs.c:2061 src/dialogs.c:2769
 msgid "State"
 msgstr "州"
 
-#: src/dialogs.c:2112
+#: src/dialogs.c:2126
 msgid "New Passwords Do Not Match"
 msgstr "新しいパスワードはマッチしません"
 
-#: src/dialogs.c:2112 src/dialogs.c:2117
-msgid "Gaim - Change Password Error"
-msgstr "Gaim - パスワード変更エラー"
-
-#: src/dialogs.c:2117
+#: src/dialogs.c:2131
 msgid "Fill out all fields completely"
 msgstr "全てを入力してください"
 
-#: src/dialogs.c:2172
-msgid "Original Password"
-msgstr "オリジナルパスワード"
+#: src/dialogs.c:2156
+msgid "Gaim - Password Change"
+msgstr "Gaim - パスワード変更"
 
 #: src/dialogs.c:2186
+msgid "Original Password"
+msgstr "オリジナルパスワード"
+
+#: src/dialogs.c:2200
 msgid "New Password"
 msgstr "新しいパスワード"
 
-#: src/dialogs.c:2200
+#: src/dialogs.c:2214
 msgid "New Password (again)"
 msgstr "新しいパスワード(再入力)"
 
-#: src/dialogs.c:2241
+#: src/dialogs.c:2255
 msgid "Gaim - Set User Info"
 msgstr "Gaim - ユーザ情報の登録"
 
-#: src/dialogs.c:2353
+#: src/dialogs.c:2367
 msgid "Below are the results of your search: "
 msgstr "あなたの検索結果は: "
 
-#: src/dialogs.c:2486 src/dialogs.c:2493
+#: src/dialogs.c:2500 src/dialogs.c:2507
 msgid "Permit"
 msgstr "許可"
 
-#: src/dialogs.c:2488 src/dialogs.c:2495
+#: src/dialogs.c:2502 src/dialogs.c:2509
 msgid "Deny"
 msgstr "非許可"
 
-#: src/dialogs.c:2532
+#: src/dialogs.c:2546
 msgid "Gaim - Add Permit"
 msgstr "Gaim - 許可の追加"
 
-#: src/dialogs.c:2534
+#: src/dialogs.c:2548
 msgid "Gaim - Add Deny"
 msgstr "Gaim - 非許可の追加"
 
-#: src/dialogs.c:2594
+#: src/dialogs.c:2608
 msgid "Gaim - Log Conversation"
 msgstr "Gaim - ログ会話"
 
-#: src/dialogs.c:2672 src/dialogs.c:2835
+#: src/dialogs.c:2686 src/dialogs.c:2849
 msgid "Search for Buddy"
 msgstr "仲間の検索"
 
-#: src/dialogs.c:2800
+#: src/dialogs.c:2814
 msgid "Gaim - Find Buddy By Info"
 msgstr "Gaim - 情報から仲間を探す"
 
-#: src/dialogs.c:2829
+#: src/dialogs.c:2843
 msgid "Gaim - Find Buddy By Email"
 msgstr "Gaim - E-mailから仲間を探す"
 
-#: src/dialogs.c:2969
+#: src/dialogs.c:2983
 msgid "Gaim - Add URL"
 msgstr "Gaim - URL追加"
 
-#: src/dialogs.c:3083 src/dialogs.c:3104 src/dialogs.c:3158
+#: src/dialogs.c:3097 src/dialogs.c:3118 src/dialogs.c:3172
 msgid "Select Text Color"
 msgstr "文字色選択"
 
-#: src/dialogs.c:3137
+#: src/dialogs.c:3151
 msgid "Select Background Color"
 msgstr "背景色選択"
 
-#: src/dialogs.c:3340
+#: src/dialogs.c:3354
 msgid "Import to:"
 msgstr "インポートする: "
 
-#: src/dialogs.c:3364
+#: src/dialogs.c:3378
 msgid "Gaim - Import Buddy List"
 msgstr "Gaim - 仲間リストのインポート"
 
-#: src/dialogs.c:3431
-msgid "You cannot create an away message with a blank title"
+#. We shouldn't allow a blank title
+#: src/dialogs.c:3445
+#, fuzzy
+msgid "You cannot save an away message with a blank title"
 msgstr "空白の題名で離席メッセージは作れません"
 
-#: src/dialogs.c:3438
+#: src/dialogs.c:3446
+msgid ""
+"Please give the message a title, or choose \"Make Away\" to use without "
+"saving."
+msgstr ""
+
+#. We shouldn't allow a blank message
+#: src/dialogs.c:3453
 msgid "You cannot create an empty away message"
 msgstr "空のメッセージを作れません"
 
-#: src/dialogs.c:3506
+#: src/dialogs.c:3521
 msgid "Gaim - New away message"
 msgstr "Gaim - 新しい離席メッセージ"
 
-#: src/dialogs.c:3516
+#: src/dialogs.c:3531
 msgid "New away message"
 msgstr "新しい離席メッセージ"
 
-#: src/dialogs.c:3529
+#: src/dialogs.c:3544
 msgid "Away title: "
 msgstr "離席メッセージ 題名:"
 
-#: src/dialogs.c:3590
+#: src/dialogs.c:3605
 msgid "Use"
 msgstr "使う"
 
-#: src/dialogs.c:3594
+#: src/dialogs.c:3609
 msgid "Save & Use"
 msgstr "保存して使う"
 
-#: src/dialogs.c:3791
+#. show everything
+#: src/dialogs.c:3806
 msgid "Smile!"
 msgstr "笑え!"
 
-#: src/dialogs.c:3844
+#: src/dialogs.c:3859
 msgid "Alias Buddy"
 msgstr "仲間のエイリアス"
 
-#: src/dialogs.c:3877
+#: src/dialogs.c:3892
 msgid "Gaim - Alias Buddy"
 msgstr "Gaim - 仲間のエイリアス"
 
-#: src/dialogs.c:3949
+#: src/dialogs.c:3933 src/dialogs.c:3940
+#, fuzzy, c-format
+msgid "Couldn't write to %s."
+msgstr "ホストへ接続できませんでした"
+
+#: src/dialogs.c:3964
 msgid "Gaim - Save Log File"
 msgstr "Gaim - ログの保存"
 
-#: src/dialogs.c:3981
-#, c-format
-msgid "Unable to remove file %s - %s"
-msgstr "ファイル %s - %s を削除"
-
-#: src/dialogs.c:4009
-msgid "Really clear log?"
-msgstr "本当にログを削除?"
+#: src/dialogs.c:3996
+#, fuzzy, c-format
+msgid "Couldn't remove file %s."
+msgstr "設定ファイル%sを開けません"
 
 #: src/dialogs.c:4024
+msgid "Really clear log?"
+msgstr "本当にログを削除?"
+
+#: src/dialogs.c:4039
 msgid "Okay"
 msgstr "OK"
 
-#: src/dialogs.c:4195
+#: src/dialogs.c:4210
 msgid "Date"
 msgstr "日付"
 
-#: src/dialogs.c:4258
+#: src/dialogs.c:4273
 msgid "Conversation"
 msgstr "会話"
 
-#: src/dialogs.c:4281
+#: src/dialogs.c:4296
 msgid "Clear"
 msgstr "消去"
 
-#: src/dialogs.c:4363
+#: src/dialogs.c:4378
 msgid "Gaim - Rename Group"
 msgstr "Gaim - グループの改名"
 
-#: src/dialogs.c:4373
+#: src/dialogs.c:4388
 msgid "Rename Group"
 msgstr "グループの改名"
 
-#: src/dialogs.c:4380 src/dialogs.c:4486
+#: src/dialogs.c:4395 src/dialogs.c:4501
 msgid "New name:"
 msgstr "新しい名前"
 
-#: src/dialogs.c:4469
+#: src/dialogs.c:4484
 msgid "Gaim - Rename Buddy"
 msgstr "Gaim - 仲間の改名"
 
-#: src/dialogs.c:4479
+#: src/dialogs.c:4494
 msgid "Rename Buddy"
 msgstr "仲間の改名"
 
-#: src/dialogs.c:4563
+#. Below is basically stolen from plugins.c
+#: src/dialogs.c:4578
 msgid "Gaim - Select Perl Script"
 msgstr "Gaim - Perlスクリプトの選択"
 
-#: src/gaimrc.c:1141
+#: src/gaimrc.c:1242
 #, c-format
 msgid "Could not open config file %s."
 msgstr "設定ファイル%sを開けません"
 
-#: src/gaimrc.c:1142
-msgid "Preferences Error"
-msgstr "設定エラー"
-
 #: src/html.c:183
 #, c-format
 msgid "Received: '%s'\n"
@@ -2699,10 +2803,10 @@
 msgid "g003: Error opening connection.\n"
 msgstr "g003: 接続開始エラー\n"
 
-#: src/module.c:106 src/module.c:112 src/module.c:122
+#: src/module.c:106 src/module.c:112
 #, fuzzy
-msgid "Plugin Error"
-msgstr "ログインエラー"
+msgid "Gaim was unable to load your plugin."
+msgstr "Gaimはメッセージを送れません"
 
 #: src/multi.c:454
 msgid "Gaim - Load Buddy Icon"
@@ -2716,7 +2820,7 @@
 msgid "Browse"
 msgstr "閲覧"
 
-#: src/multi.c:513 src/prefs.c:1344
+#: src/multi.c:513 src/prefs.c:1066
 msgid "Reset"
 msgstr "リセット"
 
@@ -2758,17 +2862,22 @@
 msgstr "パスワード入力"
 
 #: src/multi.c:948
+msgid "TOC not found."
+msgstr ""
+
+#: src/multi.c:949
 msgid ""
 "You have attempted to login an IM account using the TOC protocol.  Because "
 "this protocol is inferior to OSCAR, it is now compiled as a plugin by "
 "default.  To login, edit this account to use OSCAR or load the TOC plugin."
 msgstr ""
 
-#: src/multi.c:952 src/multi.c:956
-msgid "Login Error"
-msgstr "ログインエラー"
-
-#: src/multi.c:954
+#: src/multi.c:955
+#, fuzzy
+msgid "Protocol not found."
+msgstr "プロトコル選択"
+
+#: src/multi.c:956
 msgid ""
 "You cannot log this account in; you do not have the protocol it uses loaded, "
 "or the protocol does not have a login function."
@@ -2776,40 +2885,40 @@
 "このアカウントではログをとれません プロトコルを読み込んでいないなら読み込む"
 "か、プロトコルがログインでは機能しないかです"
 
-#: src/multi.c:985
+#: src/multi.c:987
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "本当に%sを削除したいのですか?"
 
-#: src/multi.c:1022
+#: src/multi.c:1024
 msgid "Gaim - Account Editor"
 msgstr "Gaim - アカウント編集"
 
-#: src/multi.c:1041
+#: src/multi.c:1043
 msgid "Select All"
 msgstr "全て選択"
 
-#: src/multi.c:1046
+#: src/multi.c:1048
 msgid "Select Autos"
 msgstr "全て自動選択"
 
-#: src/multi.c:1050
+#: src/multi.c:1052
 msgid "Select None"
 msgstr "何も選択しない"
 
-#: src/multi.c:1064
+#: src/multi.c:1066
 msgid "Modify"
 msgstr "編集"
 
-#: src/multi.c:1068
+#: src/multi.c:1070
 msgid "Sign On/Off"
 msgstr "サインオン/オフ"
 
-#: src/multi.c:1072
+#: src/multi.c:1074
 msgid "Delete"
 msgstr "削除"
 
-#: src/multi.c:1387
+#: src/multi.c:1389
 #, c-format
 msgid ""
 "%s\n"
@@ -2818,28 +2927,28 @@
 "%s\n"
 "%s: %s"
 
-#: src/multi.c:1406
+#: src/multi.c:1408
 #, c-format
 msgid "%s was unable to sign on"
 msgstr "%s はサインオンできません"
 
-#: src/multi.c:1417
+#: src/multi.c:1409
+msgid "Signon Error"
+msgstr "サインオンエラー"
+
+#: src/multi.c:1419
 msgid "Notice"
 msgstr "注意"
 
-#: src/multi.c:1427
+#: src/multi.c:1429
 #, c-format
 msgid "%s has been signed off"
 msgstr "%s はサインオフしました"
 
-#: src/multi.c:1428
+#: src/multi.c:1430
 msgid "Connection Error"
 msgstr "接続エラー"
 
-#: src/perl.c:879
-msgid "Perl Scripts"
-msgstr "Perl スクリプト"
-
 #: src/plugins.c:120
 msgid "Gaim - Plugin List"
 msgstr "Gaim - プラグインリスト"
@@ -2848,10 +2957,12 @@
 msgid "Gaim - Plugins"
 msgstr "Gaim - プラグイン"
 
+#. Left side: frame with list of plugin file names
 #: src/plugins.c:221
 msgid "Loaded Plugins"
 msgstr "プラグインの読み込み"
 
+#. Right side: frame with description and the filepath of plugin
 #: src/plugins.c:265
 #, fuzzy
 msgid "Selected Plugin"
@@ -2897,428 +3008,596 @@
 msgid "Close this window"
 msgstr "このウィンドウを閉じる"
 
-#: src/prefs.c:266
+#: src/prefs.c:279
+#, fuzzy
+msgid "Interface Options"
+msgstr "一般的なオプション"
+
+#. This shouldn't have to wait for user to click OK or APPLY or whatnot
+#. This really shouldn't be in preferences at all
+#: src/prefs.c:282
 #, fuzzy
-msgid "Windows"
-msgstr "IMウィンドウ"
-
-#: src/prefs.c:276
-msgid "Show Debug Window"
+msgid "Show _Debug Window"
 msgstr "デバッグウィンドウを表示"
 
-#: src/prefs.c:280 src/prefs.c:302
+#: src/prefs.c:285
+#, fuzzy
+msgid "Use _borderless buttons"
+msgstr "境界線なしボタンを使う"
+
+#: src/prefs.c:301
 #, fuzzy
 msgid "Style"
 msgstr "州"
 
-#: src/prefs.c:286
-msgid "Use borderless buttons"
-msgstr "境界線なしボタンを使う"
-
-#: src/prefs.c:311
+#: src/prefs.c:302
+#, fuzzy
+msgid "_Bold"
+msgstr "ボールド"
+
+#: src/prefs.c:303
 #, fuzzy
-msgid "Strikethough"
+msgid "_Italics"
+msgstr "イタリック"
+
+#: src/prefs.c:304
+#, fuzzy
+msgid "_Underline"
+msgstr "下線"
+
+#: src/prefs.c:305
+#, fuzzy
+msgid "_Strikethough"
 msgstr "テキスト入力"
 
-#: src/prefs.c:315
+#: src/prefs.c:307
 #, fuzzy
 msgid "Face"
 msgstr "取消"
 
-#: src/prefs.c:323
+#: src/prefs.c:310
 #, fuzzy
-msgid "Use custom face"
+msgid "Use custo_m face"
+msgstr "スマイリー挿入"
+
+#: src/prefs.c:322
+#, fuzzy
+msgid "Use custom si_ze"
 msgstr "スマイリー挿入"
 
-#: src/prefs.c:327 src/prefs.c:366 src/prefs.c:387
-msgid "Select"
-msgstr "選択"
-
-#: src/prefs.c:341
-msgid "Use custom size"
-msgstr ""
-
-#: src/prefs.c:359
+#: src/prefs.c:334
+#, fuzzy
+msgid "_Text color"
+msgstr "文字色"
+
+#: src/prefs.c:350
+#, fuzzy
+msgid "Bac_kground color"
+msgstr "背景色"
+
+#: src/prefs.c:373 src/prefs.c:468 src/prefs.c:508
+#, fuzzy
+msgid "Display"
+msgstr "仲間を表示"
+
+#: src/prefs.c:374
 #, fuzzy
-msgid "Text color"
-msgstr "文字色"
+msgid "Show graphical _smileys"
+msgstr "グラフィックスマイリーの表示"
+
+#: src/prefs.c:375
+#, fuzzy
+msgid "Show _timestamp on messages"
+msgstr "メッセージのタイムスタンプを表示"
+
+#: src/prefs.c:376
+#, fuzzy
+msgid "Show _URLs as links"
+msgstr "リンクとしてURLを表示"
+
+#: src/prefs.c:377
+#, fuzzy
+msgid "_Highlight misspelled words"
+msgstr "ミススペルをハイライトする"
+
+#: src/prefs.c:380
+#, fuzzy
+msgid "Ignore c_olors"
+msgstr "色を無視"
 
 #: src/prefs.c:381
 #, fuzzy
-msgid "Background color"
-msgstr "背景色"
+msgid "Ignore font _faces"
+msgstr "フォントを無視"
+
+#: src/prefs.c:382
+#, fuzzy
+msgid "Ignore font si_zes"
+msgstr "フォントサイズを無視"
+
+#: src/prefs.c:383
+#, fuzzy
+msgid "Ignore Ti_K Automated Messages"
+msgstr "TiK自動メッセージを無視"
+
+#: src/prefs.c:396
+#, fuzzy
+msgid "_Enter sends message"
+msgstr "「Enter」でメッセージ送信"
+
+#: src/prefs.c:397
+#, fuzzy
+msgid "C_ontrol-Enter sends message"
+msgstr "「Control-Enter」でメッセージ送信"
+
+#: src/prefs.c:399
+#, fuzzy
+msgid "Window Closing"
+msgstr "IMウィンドウ"
+
+#: src/prefs.c:400
+#, fuzzy
+msgid "E_scape closes window"
+msgstr "「Escape」でウィンドウを閉じる"
+
+#: src/prefs.c:401
+#, fuzzy
+msgid "Control-_W closes window"
+msgstr "「Escape」でウィンドウを閉じる"
+
+#: src/prefs.c:404
+#, fuzzy
+msgid "Control-{B/I/U/S} inserts _HTML tags"
+msgstr "「Control-{B/I/U/S}」でHTMLタグを挿入"
+
+#: src/prefs.c:405
+#, fuzzy
+msgid "Control-(number) inserts _smileys"
+msgstr "「Control-(number)」でスマイリー挿入"
+
+#: src/prefs.c:417
+#, fuzzy
+msgid "Buttons"
+msgstr "一番下"
+
+#: src/prefs.c:418
+#, fuzzy
+msgid "_Hide IM/Info/Chat buttons"
+msgstr "IM/情報/チャットボタンを隠す"
 
 #: src/prefs.c:419
-msgid "Show graphical smileys"
-msgstr "グラフィックスマイリーの表示"
-
-#: src/prefs.c:420
-msgid "Show timestamp on messages"
-msgstr "メッセージのタイムスタンプを表示"
+#, fuzzy
+msgid "Show _pictures on buttons"
+msgstr "ボタン画像を表示"
 
 #: src/prefs.c:421
-msgid "Show URLs as links"
-msgstr "リンクとしてURLを表示"
+msgid "Buddy List Window"
+msgstr "仲間リストウィンドウ"
 
 #: src/prefs.c:422
-msgid "Highlight misspelled words"
-msgstr "ミススペルをハイライトする"
+#, fuzzy
+msgid "_Save Window Size/Position"
+msgstr "ウィンドウサイズ、位置を保存"
+
+#: src/prefs.c:423
+#, fuzzy
+msgid "_Raise Window on Events"
+msgstr "イベント発生でウィンドウをアクティブにする"
+
+#: src/prefs.c:425
+#, fuzzy
+msgid "Group Display"
+msgstr "グループを表示"
+
+#: src/prefs.c:426
+#, fuzzy
+msgid "Hide _groups with no online buddies"
+msgstr "オフラインの友達はグループを隠す"
+
+#: src/prefs.c:427
+#, fuzzy
+msgid "Show _numbers in groups"
+msgstr "グループ数の表示"
+
+#: src/prefs.c:429
+#, fuzzy
+msgid "Buddy Display"
+msgstr "仲間を表示"
+
+#: src/prefs.c:430
+#, fuzzy
+msgid "Show buddy type _icons"
+msgstr "仲間タイプアイコンの表示"
+
+#: src/prefs.c:431
+#, fuzzy
+msgid "Show _warning levels"
+msgstr "警告レベルの表示"
 
 #: src/prefs.c:432
-msgid "Ignore colors"
-msgstr "色を無視"
+#, fuzzy
+msgid "Show idle _times"
+msgstr "休止時間の表示"
 
 #: src/prefs.c:433
-msgid "Ignore font faces"
-msgstr "フォントを無視"
-
-#: src/prefs.c:434
-msgid "Ignore font sizes"
-msgstr "フォントサイズを無視"
-
-#: src/prefs.c:435
-msgid "Ignore TiK Automated Messages"
-msgstr "TiK自動メッセージを無視"
-
-#: src/prefs.c:455
-msgid "Enter sends message"
-msgstr "「Enter」でメッセージ送信"
-
-#: src/prefs.c:456
-msgid "Control-Enter sends message"
-msgstr "「Control-Enter」でメッセージ送信"
+#, fuzzy
+msgid "Grey i_dle buddies"
+msgstr "休止仲間はグレーで"
+
+#: src/prefs.c:450 src/prefs.c:492
+#, fuzzy
+msgid "Window"
+msgstr "IMウィンドウ"
+
+#: src/prefs.c:457 src/prefs.c:499
+#, fuzzy
+msgid "New window _width:"
+msgstr "新しいウィンドウの幅:"
+
+#: src/prefs.c:458 src/prefs.c:500
+#, fuzzy
+msgid "New window _height:"
+msgstr "新しいウィンドウの高さ:"
+
+#: src/prefs.c:459 src/prefs.c:501
+#, fuzzy
+msgid "_Entry widget height:"
+msgstr "入力ウィジェットの高さ:"
+
+#: src/prefs.c:460 src/prefs.c:502
+#, fuzzy
+msgid "_Raise windows on events"
+msgstr "イベント発生でウィンドウをアクティブにする"
+
+#: src/prefs.c:461
+#, fuzzy
+msgid "Hide window on _send"
+msgstr "送信ウィンドウを隠す"
+
+#: src/prefs.c:464
+msgid "Buddy Icons"
+msgstr "仲間アイコン"
 
 #: src/prefs.c:465
-msgid "Escape closes window"
-msgstr "「Escape」でウィンドウを閉じる"
+#, fuzzy
+msgid "Hide Buddy _Icons"
+msgstr "仲間アイコンを隠す"
 
 #: src/prefs.c:466
 #, fuzzy
-msgid "Control-W closes window"
-msgstr "「Escape」でウィンドウを閉じる"
-
-#: src/prefs.c:476
-msgid "Control-{B/I/U/S} inserts HTML tags"
-msgstr "「Control-{B/I/U/S}」でHTMLタグを挿入"
-
-#: src/prefs.c:477
-msgid "Control-(number) inserts smileys"
-msgstr "「Control-(number)」でスマイリー挿入"
-
-#: src/prefs.c:496
-msgid "Hide IM/Info/Chat buttons"
-msgstr "IM/情報/チャットボタンを隠す"
-
-#: src/prefs.c:497
-msgid "Show pictures on buttons"
-msgstr "ボタン画像を表示"
-
-#: src/prefs.c:507
-msgid "Automatically show buddy list on sign on"
-msgstr "登録された友達リストを自動で表示"
+msgid "Disable Buddy Icon A_nimation"
+msgstr "アニメーション仲間アイコン無効化"
+
+#: src/prefs.c:469
+#, fuzzy
+msgid "Show _logins in window"
+msgstr "ウィンドウでログイン表示"
+
+#: src/prefs.c:471
+#, fuzzy
+msgid "Typing Notification"
+msgstr "ポップアップ通知"
+
+#: src/prefs.c:472
+#, fuzzy
+msgid "Notify buddies that you are _typing to them"
+msgstr "メッセージ入力中を通知する"
+
+#: src/prefs.c:504
+msgid "Tab Completion"
+msgstr "タブ完了"
+
+#: src/prefs.c:505
+#, fuzzy
+msgid "_Tab-Complete Nicks"
+msgstr "タブのニックネーム"
+
+#: src/prefs.c:506
+#, fuzzy
+msgid "_Old-Style Tab Completion"
+msgstr "古いスタイルのタブ"
 
 #: src/prefs.c:509
-msgid "Display Buddy List near applet"
-msgstr "アプレット付近で友達リストを表示"
-
-#: src/prefs.c:512
-msgid "Save Window Size/Position"
-msgstr "ウィンドウサイズ、位置を保存"
-
-#: src/prefs.c:513
 #, fuzzy
-msgid "Raise Window on Events"
-msgstr "イベント発生でウィンドウをアクティブにする"
-
-#: src/prefs.c:522
-msgid "Hide groups with no online buddies"
-msgstr "オフラインの友達はグループを隠す"
-
-#: src/prefs.c:523
-msgid "Show numbers in groups"
-msgstr "グループ数の表示"
-
-#: src/prefs.c:532
-msgid "Show buddy type icons"
-msgstr "仲間タイプアイコンの表示"
+msgid "_Show people joining/leaving in window"
+msgstr "加入/離席をウィンドウで表示"
+
+#: src/prefs.c:510
+msgid "Co_lorize screennames"
+msgstr ""
+
+#: src/prefs.c:526
+msgid "IM Tabs"
+msgstr ""
 
 #: src/prefs.c:533
-msgid "Show warning levels"
-msgstr "警告レベルの表示"
+#, fuzzy
+msgid ""
+"Show all _Instant Messages in one tabbed\n"
+"window"
+msgstr "全てのチャットを一つのタブウィンドウで表示"
 
 #: src/prefs.c:534
-msgid "Show idle times"
-msgstr "休止時間の表示"
-
-#: src/prefs.c:535
-msgid "Grey idle buddies"
-msgstr "休止仲間はグレーで"
-
-#: src/prefs.c:564 src/prefs.c:626
-msgid "New window width:"
-msgstr "新しいウィンドウの幅:"
-
-#: src/prefs.c:565 src/prefs.c:627
-msgid "New window height:"
-msgstr "新しいウィンドウの高さ:"
-
-#: src/prefs.c:566 src/prefs.c:628
-msgid "Entry widget height:"
-msgstr "入力ウィジェットの高さ:"
-
-#: src/prefs.c:567 src/prefs.c:629
-msgid "Raise windows on events"
-msgstr "イベント発生でウィンドウをアクティブにする"
-
-#: src/prefs.c:568
-msgid "Hide window on send"
-msgstr "送信ウィンドウを隠す"
-
-#: src/prefs.c:577
-msgid "Hide Buddy Icons"
-msgstr "仲間アイコンを隠す"
-
-#: src/prefs.c:578
-msgid "Disable Buddy Icon Animation"
-msgstr "アニメーション仲間アイコン無効化"
-
-#: src/prefs.c:587
-msgid "Show logins in window"
-msgstr "ウィンドウでログイン表示"
-
-#: src/prefs.c:596
-msgid "Notify buddies that you are typing to them"
-msgstr "メッセージ入力中を通知する"
-
-#: src/prefs.c:638
-msgid "Tab-Complete Nicks"
-msgstr "タブのニックネーム"
-
-#: src/prefs.c:639
-msgid "Old-Style Tab Completion"
-msgstr "古いスタイルのタブ"
-
-#: src/prefs.c:648
-msgid "Show people joining/leaving in window"
-msgstr "加入/離席をウィンドウで表示"
-
-#: src/prefs.c:649
-msgid "Colorize screennames"
+#, fuzzy
+msgid "Show a_liases in tabs/titles"
+msgstr "タブ/題名をエイリアス表示"
+
+#: src/prefs.c:536
+#, fuzzy
+msgid "Chat Tabs"
+msgstr "チャット"
+
+#: src/prefs.c:543
+#, fuzzy
+msgid "Show all c_hats in one tabbed window"
+msgstr "全てのチャットを一つのタブウィンドウで表示"
+
+#: src/prefs.c:546
+msgid "Combined Tabs"
 msgstr ""
 
-#: src/prefs.c:674
+#: src/prefs.c:547
 #, fuzzy
 msgid ""
-"Show all Instant Messages in one tabbed\n"
-"window"
-msgstr "全てのチャットを一つのタブウィンドウで表示"
-
-#: src/prefs.c:675
-#, fuzzy
-msgid "Show aliases in tabs/titles"
-msgstr "タブ/題名をエイリアス表示"
-
-#: src/prefs.c:690
-msgid "Show all chats in one tabbed window"
-msgstr "全てのチャットを一つのタブウィンドウで表示"
-
-#: src/prefs.c:700
-#, fuzzy
-msgid ""
-"Show IMs and chats in same tabbed\n"
+"Show IMs and chats in _same tabbed\n"
 "window."
 msgstr "同じタブウィンドウでチャットを表示"
 
-#: src/prefs.c:747
+#: src/prefs.c:549
+#, fuzzy
+msgid "Buddy List Tabs"
+msgstr "仲間リスト"
+
+#: src/prefs.c:570
+msgid "Proxy Type"
+msgstr "プロキシタイプ"
+
+#: src/prefs.c:582
 msgid "Proxy Server"
 msgstr "プロキシサーバ"
 
-#: src/prefs.c:764
-msgid "Host"
+#: src/prefs.c:595
+#, fuzzy
+msgid "_Host"
 msgstr "ホスト名"
 
-#: src/prefs.c:780
+#: src/prefs.c:609
 msgid "Port"
 msgstr "ポート番号"
 
-#: src/prefs.c:797
-msgid "User"
+#: src/prefs.c:625
+#, fuzzy
+msgid "_User"
 msgstr "ユーザ名"
 
-#: src/prefs.c:813
-msgid "Password"
+#: src/prefs.c:639
+#, fuzzy
+msgid "Pa_ssword"
 msgstr "パスワード"
 
-#: src/prefs.c:873
+#: src/prefs.c:670
+msgid "Browser Selection"
+msgstr ""
+
+#: src/prefs.c:697
 #, fuzzy
-msgid "Open new window by default"
+msgid "Browser Options"
+msgstr "プロキシオプション"
+
+#: src/prefs.c:698
+#, fuzzy
+msgid "Open new _window by default"
 msgstr "デフォルトで新しいウィンドウを開く"
 
-#: src/prefs.c:892
-msgid "Log all conversations"
+#: src/prefs.c:710
+#, fuzzy
+msgid "Message Logs"
+msgstr "メッセージ"
+
+#: src/prefs.c:711
+#, fuzzy
+msgid "_Log all conversations"
 msgstr "全ての会話をログする"
 
-#: src/prefs.c:893
-msgid "Strip HTML from logs"
+#: src/prefs.c:712
+#, fuzzy
+msgid "Strip _HTML from logs"
 msgstr "ログからHTMLを吐く"
 
-#: src/prefs.c:902
-msgid "Log when buddies sign on/sign off"
+#: src/prefs.c:714
+#, fuzzy
+msgid "System Logs"
+msgstr "システムログを見る"
+
+#: src/prefs.c:715
+#, fuzzy
+msgid "Log when buddies _sign on/sign off"
 msgstr "仲間がサインオン/オフしたときをログする"
 
-#: src/prefs.c:904
-msgid "Log when buddies become idle/un-idle"
+#: src/prefs.c:717
+#, fuzzy
+msgid "Log when buddies become _idle/un-idle"
 msgstr "仲間が休止/復帰したときをログする"
 
-#: src/prefs.c:906
-msgid "Log when buddies go away/come back"
+#: src/prefs.c:719
+#, fuzzy
+msgid "Log when buddies go away/come _back"
 msgstr "仲間が離席/復席したときをログする"
 
-#: src/prefs.c:907
-msgid "Log your own signons/idleness/awayness"
+#: src/prefs.c:720
+#, fuzzy
+msgid "Log your _own signons/idleness/awayness"
 msgstr "あなたが自分でサインオン/休止/離席するのをログする"
 
-#: src/prefs.c:909
-msgid "Individual log file for each buddy's signons"
+#: src/prefs.c:722
+#, fuzzy
+msgid "I_ndividual log file for each buddy's signons"
 msgstr "仲間それぞれでログする"
 
-#: src/prefs.c:952
-msgid "No sounds when you log in"
+#: src/prefs.c:749
+msgid "Sound Options"
+msgstr "音声オプション"
+
+#: src/prefs.c:750
+#, fuzzy
+msgid "_No sounds when you log in"
 msgstr "ログインしたときに音を鳴らさない"
 
-#: src/prefs.c:953
-msgid "Sounds while away"
+#: src/prefs.c:751
+#, fuzzy
+msgid "_Sounds while away"
 msgstr "離席中の音"
 
-#: src/prefs.c:990
-#, c-format
+#: src/prefs.c:753
+#, fuzzy
+msgid "Sound Method"
+msgstr "音声メソッド"
+
+#: src/prefs.c:777
+#, fuzzy, c-format
 msgid ""
-"Sound command\n"
+"Sound c_ommand\n"
 "(%s for filename)"
 msgstr ""
 "音声コマンド\n"
 "(ファイル名%s)"
 
-#: src/prefs.c:1032
-msgid "Sending messages removes away status"
+#: src/prefs.c:813
+#, fuzzy
+msgid "_Sending messages removes away status"
 msgstr "離席状態のメッセージを送信"
 
-#: src/prefs.c:1033
-msgid "Queue new messages when away"
+#: src/prefs.c:814
+#, fuzzy
+msgid "_Queue new messages when away"
 msgstr "離席したら新しいメッセージはキューする"
 
-#: src/prefs.c:1034
-msgid "Ignore new conversations when away"
+#: src/prefs.c:815
+#, fuzzy
+msgid "_Ignore new conversations when away"
 msgstr "離席時の新しい会話は無視"
 
-#: src/prefs.c:1046
-msgid "Seconds before resending:"
+#: src/prefs.c:817
+#, fuzzy
+msgid "Auto-response"
+msgstr "自動返答を送らない"
+
+#: src/prefs.c:820
+msgid "Seconds before _resending:"
 msgstr ""
 
-#: src/prefs.c:1049
-msgid "Don't send auto-response"
+#: src/prefs.c:822
+#, fuzzy
+msgid "_Don't send auto-response"
 msgstr "自動返答を送らない"
 
-#: src/prefs.c:1050
-msgid "Only send auto-response when idle"
+#: src/prefs.c:823
+#, fuzzy
+msgid "_Only send auto-response when idle"
 msgstr "休止中は自動返答のみ"
 
-#: src/prefs.c:1077
-msgid "Set away when idle"
+#: src/prefs.c:828
+#, fuzzy
+msgid "Idle"
+msgstr "アイドル: "
+
+#: src/prefs.c:839
+#, fuzzy
+msgid "Auto-away"
+msgstr "離席"
+
+#: src/prefs.c:840
+msgid "Set away _when idle"
 msgstr ""
 
-#: src/prefs.c:1191
+#: src/prefs.c:954
 msgid "Gaim - Sound Configuration"
 msgstr "Gaim - 音声設定"
 
-#: src/prefs.c:1339
+#: src/prefs.c:1062
 msgid "Test"
 msgstr "テスト"
 
-#: src/prefs.c:1349
+#: src/prefs.c:1070
 msgid "Choose..."
 msgstr "選択..."
 
-#: src/prefs.c:1587
+#: src/prefs.c:1239
 #, fuzzy
 msgid "_Edit"
 msgstr "編集"
 
-#: src/prefs.c:1590
-msgid "Edit"
-msgstr "編集"
-
-#: src/prefs.c:1656
+#: src/prefs.c:1303
 #, fuzzy
 msgid "Interface"
 msgstr "インスタンス:"
 
-#: src/prefs.c:1657
+#: src/prefs.c:1304
 #, fuzzy
 msgid "Fonts"
 msgstr "フォント"
 
-#: src/prefs.c:1658
+#: src/prefs.c:1305
 #, fuzzy
 msgid "Message Text"
 msgstr "メッセージ"
 
-#: src/prefs.c:1659
+#: src/prefs.c:1306
 msgid "Shortcuts"
 msgstr ""
 
-#: src/prefs.c:1661
+#: src/prefs.c:1308
 msgid "IM Window"
 msgstr "IMウィンドウ"
 
-#: src/prefs.c:1662
+#: src/prefs.c:1309
 #, fuzzy
 msgid "Chat Window"
 msgstr "グループチャットウィンドウ"
 
-#: src/prefs.c:1663
+#: src/prefs.c:1310
 msgid "Tabs"
 msgstr ""
 
-#: src/prefs.c:1664
+#: src/prefs.c:1311
 msgid "Proxy"
 msgstr "プロキシ"
 
-#: src/prefs.c:1665
+#: src/prefs.c:1312
 msgid "Browser"
 msgstr "閲覧する"
 
-#: src/prefs.c:1668
+#: src/prefs.c:1315
 msgid "Sounds"
 msgstr "音声"
 
-#: src/prefs.c:1669
+#: src/prefs.c:1316
 #, fuzzy
 msgid "Sound Events"
 msgstr "音声"
 
-#: src/prefs.c:1670
+#: src/prefs.c:1317
 #, fuzzy
 msgid "Away / Idle"
 msgstr "離席メッセージ 題名:"
 
-#: src/prefs.c:1671
+#: src/prefs.c:1318
 msgid "Away Messages"
 msgstr "離席メッセージ"
 
-#: src/prefs.c:1732
+#: src/prefs.c:1380
 msgid "Gaim - Preferences"
 msgstr "Gaim - 設定"
 
-#: src/prefs.c:1842
-msgid "Apply"
-msgstr ""
-
-#: src/prefs.c:1891
+#: src/prefs.c:1519
 msgid "Gaim debug output window"
 msgstr "Gaim デバッグウィンドウ"
 
 #: src/prpl.c:70
+msgid "Incompatible protocol detected."
+msgstr ""
+
+#: src/prpl.c:71
 msgid ""
 "You have attempted to load a protocol which was not compiled from the same "
 "version of the source as this application was. Unfortunately, because it is "
@@ -3330,11 +3609,11 @@
 "どれだったかあなたに伝えることができません言うまでもなく、それは成功裡にロー"
 "ドされませんでした"
 
-#: src/prpl.c:74
-msgid "Protocol Error"
-msgstr "プロトコルエラー"
-
-#: src/prpl.c:84
+#: src/prpl.c:85
+msgid "Libicq.so detected."
+msgstr ""
+
+#: src/prpl.c:86
 msgid ""
 "Gaim has loaded the ICQ plugin.  This plugin has been deprecated. As such, "
 "it was probably not compiled from the same version of the source as this "
@@ -3342,42 +3621,33 @@
 "you use the AIM/ICQ protocol to connect to ICQ"
 msgstr ""
 
-#: src/prpl.c:88
-#, fuzzy
-msgid "Protocol Warning"
-msgstr "プロトコル選択"
-
-#: src/prpl.c:103
+#: src/prpl.c:105
 #, c-format
 msgid "%s was using %s, which got removed. %s is now offline."
 msgstr "%sは削除した%sを利用しています %sは今オフラインです"
 
-#: src/prpl.c:106
-msgid "Disconnect"
-msgstr "切断"
-
-#: src/prpl.c:143
+#: src/prpl.c:145
 msgid "Accept?"
 msgstr "許可しますか?"
 
-#: src/prpl.c:209
+#: src/prpl.c:211
 msgid "Gaim - Prompt"
 msgstr "Gaim - プロンプト"
 
-#: src/prpl.c:429
+#: src/prpl.c:431
 msgid "Gaim - New Mail"
 msgstr "Gaim - 新しいメール"
 
-#: src/prpl.c:455
+#: src/prpl.c:457
 msgid "Open Mail"
 msgstr "メールを開く"
 
-#: src/prpl.c:580
+#: src/prpl.c:582
 #, fuzzy, 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を作りました"
 
-#: src/prpl.c:588
+#: src/prpl.c:590
 #, fuzzy
 msgid ""
 "\n"
@@ -3388,21 +3658,21 @@
 "\n"
 "彼らを仲間リストに追加しますか?"
 
-#: src/prpl.c:631
+#: src/prpl.c:633
 msgid ""
 "You do not currently have any protocols available that are able to register "
 "new accounts."
 msgstr "新しいアカウント登録が必要なプロトコルで現在使えません"
 
-#: src/prpl.c:668
+#: src/prpl.c:670
 msgid "Gaim - Registration"
 msgstr "Gaim - 登録"
 
-#: src/prpl.c:683
+#: src/prpl.c:685
 msgid "Registration Information"
 msgstr "登録情報"
 
-#: src/prpl.c:700
+#: src/prpl.c:702
 msgid "Register"
 msgstr "登録"
 
@@ -3419,10 +3689,6 @@
 msgid "(1 message)"
 msgstr "(1 メッセージ)"
 
-#: src/server.c:808
-msgid "Warned"
-msgstr "警告"
-
 #: src/server.c:901
 msgid "Yes"
 msgstr "はい"
@@ -3479,12 +3745,171 @@
 msgid "Someone says your name in chat"
 msgstr ""
 
+#~ msgid "Gadu-Gadu Error"
+#~ msgstr "Gadu-Gadu エラー"
+
+#~ msgid "Gadu-Gadu Information"
+#~ msgstr "Gadu-Gadu 情報"
+
+#~ msgid "Couldn't send http request"
+#~ msgstr "HTTPリクエストを送れませんでした"
+
+#~ msgid "Buddies List import from Server failed (%s)"
+#~ msgstr "サーバから仲間リストのインポートに失敗 (%s)"
+
+#~ msgid "Buddies List export to Server failed (%s)"
+#~ msgstr "サーバへの仲間リストのエクスポートに失敗 (%s)"
+
+#~ msgid "Deletion of Buddies List from Server failed (%s)"
+#~ msgstr "サーバから仲間リストの削除に失敗 (%s)"
+
+#~ msgid "Connect to search service failed (%s)"
+#~ msgstr "検索サービスに接続失敗 (%s)"
+
+#~ msgid "Changing Password failed (%s)"
+#~ msgstr "パスワードの変更に失敗 (%s)"
+
+#~ msgid "No such nick/channel"
+#~ msgstr "そのようなニック/チャンネルはありません"
+
+#~ msgid "IRC Error"
+#~ msgstr "IRCエラー"
+
+#~ msgid "No such server"
+#~ msgstr "そのようなサーバはありません"
+
+#~ msgid "IRC Part"
+#~ msgstr "IRCパート"
+
+#, fuzzy
+#~ msgid "Password Change Error!"
+#~ msgstr "Gaim - パスワード変更"
+
+#, fuzzy
+#~ msgid "Password Change"
+#~ msgstr "Gaim - パスワード変更"
+
+#, fuzzy
+#~ msgid "Invalid Jabber I.D."
+#~ msgstr "無効な名前"
+
+#~ msgid "MSN Error"
+#~ msgstr "MSNエラー"
+
+#~ msgid "Invalid name"
+#~ msgstr "無効な名前"
+
+#~ msgid "Chat Error!"
+#~ msgstr "チャットエラー"
+
+#~ msgid "Gaim - Chat"
+#~ msgstr "Gaim - チャット"
+
+#~ msgid "Gaim - Error"
+#~ msgstr "Gaim - エラー"
+
+#~ msgid "Gaim - Oscar SNAC Error"
+#~ msgstr "Gaim - Oscar SNAC エラー"
+
+#~ msgid "Reason unknown"
+#~ msgstr "原因不明"
+
+#~ msgid "AOL error"
+#~ msgstr "AOLエラー"
+
+#~ msgid "Error"
+#~ msgstr "エラー"
+
+#, fuzzy
+#~ msgid "Gaim - Warning"
+#~ msgstr "Gaim - ユーザを警告しますか?"
+
+#~ msgid "TOC Resume"
+#~ msgstr "TOC履歴"
+
+#~ msgid "Chat Error"
+#~ msgstr "チャットエラー"
+
+#~ msgid "TOC Pause"
+#~ msgstr "TOC休止"
+
+#~ msgid "Could not write file header!"
+#~ msgstr "ファイルヘッダを書くことができません!"
+
+#~ msgid "Attempting to sign on...."
+#~ msgstr "サインオンの承認"
+
+#~ msgid "Offline. Click to bring up login box."
+#~ msgstr "オフライン ログインボックスをクリックしてください"
+
+#~ msgid "Away: %d pending."
+#~ msgstr "離席: %d ペンディング"
+
+#~ msgid "Away."
+#~ msgstr "離席"
+
+#~ msgid "Can't create Gaim applet!"
+#~ msgstr "Gaimアプレットをつくれません!"
+
+#~ msgid "About..."
+#~ msgstr "About..."
+
+#~ msgid "Message Error"
+#~ msgstr "メッセージエラー"
+
+#~ msgid "Unable to send message: Unknown reason"
+#~ msgstr "メッセージを送れません: 原因不明"
+
+#~ msgid "Buddy Pounce Error"
+#~ msgstr "仲間掴みエラー"
+
+#~ msgid "Gaim - Change Password Error"
+#~ msgstr "Gaim - パスワード変更エラー"
+
+#~ msgid "Unable to remove file %s - %s"
+#~ msgstr "ファイル %s - %s を削除"
+
+#~ msgid "Preferences Error"
+#~ msgstr "設定エラー"
+
+#, fuzzy
+#~ msgid "Plugin Error"
+#~ msgstr "ログインエラー"
+
+#~ msgid "Login Error"
+#~ msgstr "ログインエラー"
+
+#~ msgid "Perl Scripts"
+#~ msgstr "Perl スクリプト"
+
+#~ msgid "Select"
+#~ msgstr "選択"
+
+#~ msgid "Automatically show buddy list on sign on"
+#~ msgstr "登録された友達リストを自動で表示"
+
+#~ msgid "Display Buddy List near applet"
+#~ msgstr "アプレット付近で友達リストを表示"
+
+#~ msgid "Edit"
+#~ msgstr "編集"
+
+#~ msgid "Protocol Error"
+#~ msgstr "プロトコルエラー"
+
+#, fuzzy
+#~ msgid "Protocol Warning"
+#~ msgstr "プロトコル選択"
+
+#~ msgid "Disconnect"
+#~ msgstr "切断"
+
+#~ msgid "Warned"
+#~ msgstr "警告"
+
 #~ msgid "Show Buddy Ticker"
 #~ msgstr "仲間チェックの表示"
 
-#~ msgid "General Options"
-#~ msgstr "一般的なオプション"
-
 #~ msgid "All options take effect immediately unless otherwise noted."
 #~ msgstr ""
 #~ "もし他の方法で注意されなかったならば、オプションはすべて効果を直ちに現わし"
@@ -3517,9 +3942,6 @@
 #~ msgid "Galeon"
 #~ msgstr "Galeon"
 
-#~ msgid "Proxy Options"
-#~ msgstr "プロキシオプション"
-
 #~ msgid ""
 #~ "Not all protocols can use these proxy options. Please see the README file "
 #~ "for details."
@@ -3527,9 +3949,6 @@
 #~ "全てのプロトコルでプロキシオプションは使わない READMEファイルをみてくださ"
 #~ "い"
 
-#~ msgid "Proxy Type"
-#~ msgstr "プロキシタイプ"
-
 #~ msgid "No Proxy"
 #~ msgstr "プロキシを利用しない"
 
@@ -3545,24 +3964,12 @@
 #~ msgid "Buddy List Options"
 #~ msgstr "仲間リストオプション"
 
-#~ msgid "Buddy List Window"
-#~ msgstr "仲間リストウィンドウ"
-
 #~ msgid "Tab Placement:"
 #~ msgstr "タブ置換"
 
 #~ msgid "Top"
 #~ msgstr "一番上"
 
-#~ msgid "Bottom"
-#~ msgstr "一番下"
-
-#~ msgid "Group Displays"
-#~ msgstr "グループを表示"
-
-#~ msgid "Buddy Displays"
-#~ msgstr "仲間を表示"
-
 #~ msgid "Conversation Options"
 #~ msgstr "会話オプション"
 
@@ -3605,18 +4012,12 @@
 #~ msgid "Right"
 #~ msgstr "右"
 
-#~ msgid "Buddy Icons"
-#~ msgstr "仲間アイコン"
-
 #~ msgid "Chat Options"
 #~ msgstr "チャットオプション"
 
 #~ msgid "Show conversations in the same tabbed window"
 #~ msgstr "全ての会話を同じタブウィンドウで表示"
 
-#~ msgid "Tab Completion"
-#~ msgstr "タブ完了"
-
 #~ msgid "Font Options"
 #~ msgstr "フォントオプション"
 
@@ -3629,12 +4030,6 @@
 #~ msgid "Font Size for Text"
 #~ msgstr "テキストのフォントサイズ選択"
 
-#~ msgid "Sound Options"
-#~ msgstr "音声オプション"
-
-#~ msgid "Sound method"
-#~ msgstr "音声メソッド"
-
 #~ msgid "Sound played when:"
 #~ msgstr "音を鳴らすとき:"
 
@@ -3647,9 +4042,6 @@
 #~ msgid "minutes using"
 #~ msgstr "数分利用"
 
-#~ msgid "Messages"
-#~ msgstr "メッセージ"
-
 #~ msgid "Make Away"
 #~ msgstr "どっかいけ"