changeset 9563:97b746219d5c

[gaim-migrate @ 10402] updated committer: Tailor Script <tailor@pidgin.im>
author Luke Schierer <lschiere@pidgin.im>
date Sun, 18 Jul 2004 23:30:34 +0000
parents 900c72d9a6d6
children 8faa2e191ba8
files po/ChangeLog po/en_CA.po po/ja.po
diffstat 3 files changed, 1174 insertions(+), 1274 deletions(-) [+]
line wrap: on
line diff
--- a/po/ChangeLog	Sun Jul 18 22:21:52 2004 +0000
+++ b/po/ChangeLog	Sun Jul 18 23:30:34 2004 +0000
@@ -1,5 +1,8 @@
 Gaim: The Pimpin' Penguin IM Clone that's good for the soul!
 
+version 0.81cvs
+	* Japanese translation updated (Takeshi Aihana)
+
 version 0.80 (07/15/2004):
 	* Chinese (Simplified) translation updated (Funda Wang)
 	* Chinese (Traditional) translation updated (Ambrose C. Li)
--- a/po/en_CA.po	Sun Jul 18 22:21:52 2004 +0000
+++ b/po/en_CA.po	Sun Jul 18 23:30:34 2004 +0000
@@ -6,28 +6,32 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gaim\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-07-16 00:15-0400\n"
-"PO-Revision-Date: 2004-06-25 19:45-0400\n"
+"POT-Creation-Date: 2004-07-18 16:45-0400\n"
+"PO-Revision-Date: 2004-07-18 19:45-0400\n"
 "Last-Translator: Adam Weinberger <adamw@gnome.org>\n"
 "Language-Team: en_CA <adamw@FreeBSD.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Report-Msgid-Bugs-To: \n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: plugins/autorecon.c:174
+#: plugins/autorecon.c:233
 msgid "Error Message Suppression"
 msgstr "Error Message Suppression"
 
-#: plugins/autorecon.c:178
+#: plugins/autorecon.c:237
 msgid "Hide Disconnect Errors"
 msgstr "Hide Disconnect Errors"
 
-#: plugins/autorecon.c:182
+#: plugins/autorecon.c:241
 msgid "Hide Login Errors"
 msgstr "Hide Login Errors"
 
+#: plugins/autorecon.c:245
+msgid "Restore Away State On Reconnent"
+msgstr "Restore Away State On Reconnent"
+
 #. *< api_version
 #. *< type
 #. *< ui_requirement
@@ -35,15 +39,14 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/autorecon.c:204
+#: plugins/autorecon.c:267
 msgid "Auto-Reconnect"
 msgstr "Auto-Reconnect"
 
 #. *< name
 #. *< version
 #. *  summary
-#. *  description
-#: plugins/autorecon.c:207 plugins/autorecon.c:209
+#: plugins/autorecon.c:270 plugins/autorecon.c:272
 msgid "When you are kicked offline, this reconnects you."
 msgstr "When you are kicked offline, this reconnects you."
 
@@ -147,7 +150,7 @@
 msgid "Gaim - Away"
 msgstr "Gaim - Away"
 
-#: plugins/docklet/docklet.c:114 src/gtkaccount.c:727 src/gtkaccount.c:2152
+#: plugins/docklet/docklet.c:114 src/gtkaccount.c:732 src/gtkaccount.c:2151
 msgid "Auto-login"
 msgstr "Auto-login"
 
@@ -164,10 +167,10 @@
 msgstr "New..."
 
 #: plugins/docklet/docklet.c:153 src/gtkprefs.c:1809 src/protocols/gg/gg.c:51
-#: src/protocols/irc/msgs.c:187 src/protocols/jabber/jabber.c:960
+#: src/protocols/irc/msgs.c:186 src/protocols/jabber/jabber.c:960
 #: src/protocols/jabber/jutil.c:32 src/protocols/jabber/presence.c:63
-#: src/protocols/jabber/presence.c:119 src/protocols/novell/novell.c:2724
-#: src/protocols/novell/novell.c:2841 src/protocols/novell/novell.c:2893
+#: src/protocols/jabber/presence.c:119 src/protocols/novell/novell.c:2722
+#: src/protocols/novell/novell.c:2839 src/protocols/novell/novell.c:2891
 #: src/protocols/oscar/oscar.c:532 src/protocols/oscar/oscar.c:5484
 #: src/protocols/oscar/oscar.c:6489 src/protocols/oscar/oscar.c:6689
 #: src/protocols/silc/buddy.c:1379 src/protocols/silc/silc.c:46
@@ -176,7 +179,7 @@
 msgstr "Away"
 
 #. else...
-#: plugins/docklet/docklet.c:159 src/away.c:550
+#: plugins/docklet/docklet.c:159 src/away.c:566
 #: src/protocols/oscar/oscar.c:5402 src/protocols/oscar/oscar.c:6697
 msgid "Back"
 msgstr "Back"
@@ -189,7 +192,7 @@
 msgid "File Transfers"
 msgstr "File Transfers"
 
-#: plugins/docklet/docklet.c:173 src/gtkaccount.c:2333
+#: plugins/docklet/docklet.c:173 src/gtkaccount.c:2332
 msgid "Accounts"
 msgstr "Accounts"
 
@@ -257,9 +260,8 @@
 msgstr "Number of conversations per window"
 
 #: plugins/extplacement.c:107
-#, fuzzy
 msgid "Separate IM and Chat windows when placing by number"
-msgstr "Separate IM and Chat windows"
+msgstr "Separate IM and Chat windows when placing by number"
 
 #. *< api_version
 #. *< type
@@ -281,13 +283,12 @@
 #. *< summary
 #. *  description
 #: plugins/extplacement.c:130
-#, fuzzy
 msgid ""
 "Restrict the number of conversations per windows, optionally separating IMs "
 "and Chats"
 msgstr ""
-"Either restrict the number of conversations per windows or use separate "
-"windows for IMs and Chats"
+"Restrict the number of conversations per windows, optionally separating IMs "
+"and Chats"
 
 #. *< api_version
 #. *< type
@@ -303,7 +304,6 @@
 #. *< name
 #. *< version
 #. *  summary
-#. *  description
 #: plugins/filectl.c:225 plugins/filectl.c:227
 msgid "Allows you to control Gaim by entering commands in a file."
 msgstr "Allows you to control Gaim by entering commands in a file."
@@ -561,7 +561,6 @@
 #. *< name
 #. *< version
 #. *  summary
-#. *  description
 #: plugins/gevolution/gevolution.c:468 plugins/gevolution/gevolution.c:470
 msgid "Provides integration with Ximian Evolution."
 msgstr "Provides integration with Ximian Evolution."
@@ -588,8 +587,8 @@
 msgstr "Optional information:"
 
 #. Label
-#: plugins/gevolution/new_person_dialog.c:338 src/gtkaccount.c:378
-#: src/gtkaccount.c:408 src/protocols/oscar/oscar.c:438
+#: plugins/gevolution/new_person_dialog.c:338 src/gtkaccount.c:380
+#: src/gtkaccount.c:410 src/protocols/oscar/oscar.c:438
 msgid "Buddy Icon"
 msgstr "Buddy Icon"
 
@@ -635,7 +634,6 @@
 #. *< name
 #. *< version
 #. *  summary
-#. *  description
 #: plugins/iconaway.c:83 plugins/iconaway.c:85
 msgid "Iconifies the buddy list and your conversations when you go away."
 msgstr "Iconifies the buddy list and your conversations when you go away."
@@ -806,7 +804,6 @@
 #. *< name
 #. *< version
 #. *  summary
-#. *  description
 #: plugins/notify.c:795 plugins/notify.c:797
 msgid "Provides a variety of ways of notifying you of unread messages."
 msgstr "Provides a variety of ways of notifying you of unread messages."
@@ -824,7 +821,6 @@
 
 #. *< name
 #. *< version
-#. *< summary
 #: plugins/perl/perl.c:533 plugins/perl/perl.c:534
 msgid "Provides support for loading perl plugins."
 msgstr "Provides support for loading perl plugins."
@@ -906,15 +902,14 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/signals-test.c:566
+#: plugins/signals-test.c:578
 msgid "Signals Test"
 msgstr "Signals Test"
 
 #. *< name
 #. *< version
 #. *  summary
-#. *  description
-#: plugins/signals-test.c:569 plugins/signals-test.c:571
+#: plugins/signals-test.c:581 plugins/signals-test.c:583
 msgid "Test to see that all signals are working properly."
 msgstr "Test to see that all signals are working properly."
 
@@ -932,7 +927,6 @@
 #. *< name
 #. *< version
 #. *  summary
-#. *  description
 #: plugins/simple.c:34 plugins/simple.c:36
 msgid "Tests to see that most things are working."
 msgstr "Tests to see that most things are working."
@@ -983,7 +977,6 @@
 #. *< name
 #. *< version
 #. *  summary
-#. *  description
 #: plugins/ssl/ssl-gnutls.c:226 plugins/ssl/ssl-gnutls.c:228
 msgid "Provides SSL support through GNUTLS."
 msgstr "Provides SSL support through GNUTLS."
@@ -1002,7 +995,6 @@
 #. *< name
 #. *< version
 #. *  summary
-#. *  description
 #: plugins/ssl/ssl-nss.c:315 plugins/ssl/ssl-nss.c:317
 msgid "Provides SSL support through Mozilla NSS."
 msgstr "Provides SSL support through Mozilla NSS."
@@ -1021,7 +1013,6 @@
 #. *< name
 #. *< version
 #. *  summary
-#. *  description
 #: plugins/ssl/ssl.c:94 plugins/ssl/ssl.c:96
 msgid "Provides a wrapper around SSL support libraries."
 msgstr "Provides a wrapper around SSL support libraries."
@@ -1060,7 +1051,6 @@
 #. *< name
 #. *< version
 #. *  summary
-#. *  description
 #: plugins/statenotify.c:81 plugins/statenotify.c:84
 msgid ""
 "Notifies in a conversation window when a buddy goes or returns from away or "
@@ -1091,7 +1081,6 @@
 #. *< name
 #. *< version
 #. *  summary
-#. *  description
 #: plugins/ticker/ticker.c:331 plugins/ticker/ticker.c:333
 msgid "A horizontal scrolling version of the buddy list."
 msgstr "A horizontal scrolling version of the buddy list."
@@ -1126,7 +1115,6 @@
 #. *< name
 #. *< version
 #. *  summary
-#. *  description
 #: plugins/timestamp.c:271 plugins/timestamp.c:273
 msgid "Adds iChat-style timestamps to conversations every N minutes."
 msgstr "Adds iChat-style timestamps to conversations every N minutes."
@@ -1390,7 +1378,7 @@
 
 #: src/about.c:182
 msgid "Lithuanian"
-msgstr ""
+msgstr "Lithuanian"
 
 #: src/about.c:183 src/about.c:215
 msgid "Korean"
@@ -1445,9 +1433,8 @@
 msgstr "Vietnamese"
 
 #: src/about.c:195
-#, fuzzy
 msgid "and the Gnome-Vi Team"
-msgstr "Gnome Vi Team"
+msgstr "and the Gnome Vi Team"
 
 #: src/about.c:196
 msgid "Simplified Chinese"
@@ -1515,22 +1502,22 @@
 #: src/protocols/oscar/oscar.c:6906 src/protocols/oscar/oscar.c:6992
 #: src/protocols/silc/buddy.c:460 src/protocols/silc/buddy.c:1132
 #: src/protocols/silc/chat.c:409 src/protocols/silc/chat.c:447
-#: src/protocols/silc/chat.c:710 src/protocols/silc/ops.c:1063
-#: src/protocols/silc/ops.c:1671 src/protocols/silc/silc.c:692
+#: src/protocols/silc/chat.c:710 src/protocols/silc/ops.c:1071
+#: src/protocols/silc/ops.c:1679 src/protocols/silc/silc.c:692
 #: src/protocols/yahoo/yahoo.c:2752 src/protocols/yahoo/yahoo.c:2761
 #: src/request.h:1243
 msgid "OK"
 msgstr "OK"
 
-#: src/account.c:343 src/account.c:381 src/away.c:334 src/connection.c:198
+#: src/account.c:343 src/account.c:381 src/away.c:350 src/connection.c:198
 #: src/dialogs.c:299 src/dialogs.c:311 src/dialogs.c:324 src/dialogs.c:345
 #: src/dialogs.c:463 src/dialogs.c:519 src/dialogs.c:572 src/dialogs.c:808
-#: src/dialogs.c:824 src/dialogs.c:842 src/gtkaccount.c:2002
-#: src/gtkaccount.c:2498 src/gtkblist.c:2392 src/gtkblist.c:4412
+#: src/dialogs.c:824 src/dialogs.c:842 src/gtkaccount.c:2001
+#: src/gtkaccount.c:2497 src/gtkblist.c:2392 src/gtkblist.c:4412
 #: src/gtkconn.c:168 src/gtkimhtmltoolbar.c:414 src/gtkprivacy.c:587
 #: src/gtkprivacy.c:600 src/gtkprivacy.c:625 src/gtkprivacy.c:636
 #: src/gtkrequest.c:243 src/protocols/icq/gaim_icq.c:277
-#: src/protocols/jabber/buddy.c:515 src/protocols/jabber/chat.c:710
+#: src/protocols/jabber/buddy.c:515 src/protocols/jabber/chat.c:702
 #: src/protocols/jabber/jabber.c:667 src/protocols/jabber/jabber.c:1049
 #: src/protocols/jabber/xdata.c:338 src/protocols/msn/msn.c:227
 #: src/protocols/msn/msn.c:242 src/protocols/msn/msn.c:257
@@ -1542,7 +1529,7 @@
 #: src/protocols/oscar/oscar.c:6976 src/protocols/oscar/oscar.c:6993
 #: src/protocols/silc/buddy.c:461 src/protocols/silc/buddy.c:1037
 #: src/protocols/silc/buddy.c:1133 src/protocols/silc/chat.c:582
-#: src/protocols/silc/chat.c:711 src/protocols/silc/ops.c:1672
+#: src/protocols/silc/chat.c:711 src/protocols/silc/ops.c:1680
 #: src/protocols/silc/silc.c:693 src/protocols/trepia/trepia.c:347
 #: src/protocols/yahoo/yahoo.c:2753 src/protocols/yahoo/yahoo.c:2762
 #: src/request.h:1243 src/request.h:1253
@@ -1559,34 +1546,34 @@
 msgid "Save"
 msgstr "Save"
 
-#: src/away.c:211
+#: src/away.c:227
 msgid "Away!"
 msgstr "Away!"
 
-#: src/away.c:276
+#: src/away.c:292
 msgid "I'm Back!"
 msgstr "I'm Back!"
 
-#: src/away.c:330
+#: src/away.c:346
 #, c-format
 msgid "Are you sure you want to remove the away message \"%s\"?"
 msgstr "Are you sure you want to remove the away message \"%s\"?"
 
-#: src/away.c:332 src/away.c:423
+#: src/away.c:348 src/away.c:439
 msgid "Remove Away Message"
 msgstr "Remove Away Message"
 
 #. Remove button
-#: src/away.c:333 src/gtkconv.c:1388 src/gtkconv.c:3680 src/gtkconv.c:3784
+#: src/away.c:349 src/gtkconv.c:1387 src/gtkconv.c:3702 src/gtkconv.c:3806
 #: src/gtkrequest.c:248
 msgid "Remove"
 msgstr "Remove"
 
-#: src/away.c:403
+#: src/away.c:419
 msgid "New Away Message"
 msgstr "New Away Message"
 
-#: src/away.c:618
+#: src/away.c:634
 msgid "Set All Away"
 msgstr "Set All Away"
 
@@ -1595,7 +1582,7 @@
 msgstr "Chats"
 
 #: src/blist.c:1321
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%d buddy from group %s was not removed because its account was not logged "
 "in.  This buddy and the group were not removed.\n"
@@ -1605,11 +1592,7 @@
 msgstr[0] ""
 "%d buddy from group %s was not removed because its account was not logged "
 "in.  This buddy and the group were not removed.\n"
-"%d buddies from group %s were not removed because their accounts were not "
-"logged in.  These buddies and the group were not removed.\n"
 msgstr[1] ""
-"%d buddy from group %s was not removed because its account was not logged "
-"in.  This buddy and the group were not removed.\n"
 "%d buddies from group %s were not removed because their accounts were not "
 "logged in.  These buddies and the group were not removed.\n"
 
@@ -1617,8 +1600,8 @@
 msgid "Group not removed"
 msgstr "Group not removed"
 
-#: src/blist.c:1393 src/gtkaccount.c:167 src/gtkft.c:154 src/gtkutils.c:627
-#: src/protocols/jabber/buddy.c:570 src/protocols/novell/novell.c:2736
+#: src/blist.c:1393 src/gtkaccount.c:169 src/gtkft.c:154 src/gtkutils.c:627
+#: src/protocols/jabber/buddy.c:570 src/protocols/novell/novell.c:2734
 msgid "Unknown"
 msgstr "Unknown"
 
@@ -1652,71 +1635,71 @@
 msgid "Enter password for %s"
 msgstr "Enter password for %s"
 
-#: src/conversation.c:261
+#: src/conversation.c:229
 msgid "Unable to send message. The message is too large."
 msgstr "Unable to send message. The message is too large."
 
-#: src/conversation.c:269
+#: src/conversation.c:237
 msgid "Unable to send message."
 msgstr "Unable to send message."
 
-#: src/conversation.c:1953
+#: src/conversation.c:1924
 #, c-format
 msgid "%s entered the room."
 msgstr "%s entered the room."
 
-#: src/conversation.c:1956
+#: src/conversation.c:1927
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>] entered the room."
 
-#: src/conversation.c:2047
+#: src/conversation.c:2022
 #, c-format
 msgid "You are now known as %s"
 msgstr "You are now known as %s"
 
-#: src/conversation.c:2050
+#: src/conversation.c:2025
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s is now known as %s"
 
-#: src/conversation.c:2092
+#: src/conversation.c:2064
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s left the room (%s)."
 
-#: src/conversation.c:2094
+#: src/conversation.c:2066
 #, c-format
 msgid "%s left the room."
 msgstr "%s left the room."
 
-#: src/conversation.c:2165
+#: src/conversation.c:2133
 #, c-format
 msgid "(+%d more)"
 msgstr "(+%d more)"
 
-#: src/conversation.c:2167
+#: src/conversation.c:2135
 #, c-format
 msgid " left the room (%s)."
 msgstr " left the room (%s)."
 
-#: src/conversation.c:2457
+#: src/conversation.c:2540
 msgid "Last created window"
 msgstr "Last created window"
 
-#: src/conversation.c:2459
+#: src/conversation.c:2542
 msgid "Separate IM and Chat windows"
 msgstr "Separate IM and Chat windows"
 
-#: src/conversation.c:2461 src/gtkprefs.c:1384
+#: src/conversation.c:2544 src/gtkprefs.c:1384
 msgid "New window"
 msgstr "New window"
 
-#: src/conversation.c:2463
+#: src/conversation.c:2546
 msgid "By group"
 msgstr "By group"
 
-#: src/conversation.c:2465
+#: src/conversation.c:2548
 msgid "By account"
 msgstr "By account"
 
@@ -2048,7 +2031,7 @@
 msgid "By log size"
 msgstr "By log size"
 
-#: src/gtkaccount.c:331
+#: src/gtkaccount.c:333
 #, c-format
 msgid ""
 "<b>File:</b> %s\n"
@@ -2060,164 +2043,164 @@
 "<b>Image size:</b> %dx%d"
 
 #. Build the login options frame.
-#: src/gtkaccount.c:614
+#: src/gtkaccount.c:619
 msgid "Login Options"
 msgstr "Login Options"
 
-#: src/gtkaccount.c:631
+#: src/gtkaccount.c:636
 msgid "Protocol:"
 msgstr "Protocol:"
 
-#: src/gtkaccount.c:636 src/gtkblist.c:4018
+#: src/gtkaccount.c:641 src/gtkblist.c:4018
 msgid "Screen Name:"
 msgstr "Screen Name:"
 
-#: src/gtkaccount.c:709
+#: src/gtkaccount.c:714
 msgid "Password:"
 msgstr "Password:"
 
-#: src/gtkaccount.c:714 src/gtkblist.c:4032 src/gtkblist.c:4360
+#: src/gtkaccount.c:719 src/gtkblist.c:4032 src/gtkblist.c:4360
 msgid "Alias:"
 msgstr "Alias:"
 
-#: src/gtkaccount.c:718
+#: src/gtkaccount.c:723
 msgid "Remember password"
 msgstr "Remember password"
 
 #. Build the user options frame.
-#: src/gtkaccount.c:774
+#: src/gtkaccount.c:779
 msgid "User Options"
 msgstr "User Options"
 
-#: src/gtkaccount.c:787
+#: src/gtkaccount.c:792
 msgid "New mail notifications"
 msgstr "New mail notifications"
 
-#: src/gtkaccount.c:796
+#: src/gtkaccount.c:801
 msgid "Buddy icon:"
 msgstr "Buddy icon:"
 
 #. Build the protocol options frame.
-#: src/gtkaccount.c:885
+#: src/gtkaccount.c:890
 #, c-format
 msgid "%s Options"
 msgstr "%s Options"
 
 #. Use Global Proxy Settings
-#: src/gtkaccount.c:1021 src/gtkaccount.c:1068
+#: src/gtkaccount.c:1026 src/gtkaccount.c:1073
 msgid "Use Global Proxy Settings"
 msgstr "Use Global Proxy Settings"
 
 #. No Proxy
-#: src/gtkaccount.c:1027 src/gtkaccount.c:1075
+#: src/gtkaccount.c:1032 src/gtkaccount.c:1080
 msgid "No Proxy"
 msgstr "No Proxy"
 
 #. HTTP
-#: src/gtkaccount.c:1033 src/gtkaccount.c:1082
+#: src/gtkaccount.c:1038 src/gtkaccount.c:1087
 msgid "HTTP"
 msgstr "HTTP"
 
 #. SOCKS 4
-#: src/gtkaccount.c:1039 src/gtkaccount.c:1089
+#: src/gtkaccount.c:1044 src/gtkaccount.c:1094
 msgid "SOCKS 4"
 msgstr "SOCKS 4"
 
 #. SOCKS 5
-#: src/gtkaccount.c:1045 src/gtkaccount.c:1096
+#: src/gtkaccount.c:1050 src/gtkaccount.c:1101
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
 #. Use Environmental Settings
-#: src/gtkaccount.c:1051 src/gtkaccount.c:1103 src/gtkprefs.c:1187
+#: src/gtkaccount.c:1056 src/gtkaccount.c:1108 src/gtkprefs.c:1187
 msgid "Use Environmental Settings"
 msgstr "Use Environmental Settings"
 
-#: src/gtkaccount.c:1142
+#: src/gtkaccount.c:1147
 msgid "you can see the butterflies mating"
 msgstr "you can see the butterflies mating"
 
-#: src/gtkaccount.c:1146
+#: src/gtkaccount.c:1151
 msgid "If you look real closely"
 msgstr "If you look real closely"
 
-#: src/gtkaccount.c:1162
+#: src/gtkaccount.c:1167
 msgid "Proxy Options"
 msgstr "Proxy Options"
 
-#: src/gtkaccount.c:1180 src/gtkprefs.c:1181
+#: src/gtkaccount.c:1185 src/gtkprefs.c:1181
 msgid "Proxy _type:"
 msgstr "Proxy _type:"
 
-#: src/gtkaccount.c:1189 src/gtkprefs.c:1208
+#: src/gtkaccount.c:1194 src/gtkprefs.c:1208
 msgid "_Host:"
 msgstr "_Host:"
 
-#: src/gtkaccount.c:1193 src/gtkprefs.c:1226
+#: src/gtkaccount.c:1198 src/gtkprefs.c:1226
 msgid "_Port:"
 msgstr "_Port:"
 
-#: src/gtkaccount.c:1201
+#: src/gtkaccount.c:1206
 msgid "_Username:"
 msgstr "_Username:"
 
-#: src/gtkaccount.c:1206 src/gtkprefs.c:1263
+#: src/gtkaccount.c:1211 src/gtkprefs.c:1263
 msgid "Pa_ssword:"
 msgstr "Pa_ssword:"
 
-#: src/gtkaccount.c:1578
+#: src/gtkaccount.c:1577
 msgid "Add Account"
 msgstr "Add Account"
 
-#: src/gtkaccount.c:1580
+#: src/gtkaccount.c:1579
 msgid "Modify Account"
 msgstr "Modify Account"
 
 #. Add the disclosure
-#: src/gtkaccount.c:1604
+#: src/gtkaccount.c:1603
 msgid "Show more options"
 msgstr "Show more options"
 
-#: src/gtkaccount.c:1605
+#: src/gtkaccount.c:1604
 msgid "Show fewer options"
 msgstr "Show fewer options"
 
 #. Register button
-#: src/gtkaccount.c:1632 src/protocols/jabber/jabber.c:666
+#: src/gtkaccount.c:1631 src/protocols/jabber/jabber.c:666
 msgid "Register"
 msgstr "Register"
 
-#: src/gtkaccount.c:1997
+#: src/gtkaccount.c:1996
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "Are you sure you want to delete %s?"
 
-#: src/gtkaccount.c:2001 src/gtkrequest.c:246
+#: src/gtkaccount.c:2000 src/gtkrequest.c:246
 msgid "Delete"
 msgstr "Delete"
 
-#: src/gtkaccount.c:2115 src/protocols/oscar/oscar.c:3998
+#: src/gtkaccount.c:2114 src/protocols/oscar/oscar.c:3998
 msgid "Screen Name"
 msgstr "Screen Name"
 
-#: src/gtkaccount.c:2139 src/protocols/jabber/jabber.c:958
+#: src/gtkaccount.c:2138 src/protocols/jabber/jabber.c:958
 #: src/protocols/oscar/oscar.c:538 src/protocols/oscar/oscar.c:5482
 #: src/protocols/oscar/oscar.c:6688 src/protocols/silc/silc.c:44
-#: src/protocols/yahoo/yahoo.c:2515 src/protocols/zephyr/zephyr.c:1360
-#: src/protocols/zephyr/zephyr.c:1372
+#: src/protocols/yahoo/yahoo.c:2515 src/protocols/zephyr/zephyr.c:1354
+#: src/protocols/zephyr/zephyr.c:1366
 msgid "Online"
 msgstr "Online"
 
-#: src/gtkaccount.c:2160
+#: src/gtkaccount.c:2159
 msgid "Protocol"
 msgstr "Protocol"
 
-#: src/gtkaccount.c:2473
+#: src/gtkaccount.c:2472
 #, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s%s"
 msgstr "%s%s%s%s has made %s his or her buddy%s%s%s"
 
-#: src/gtkaccount.c:2487
+#: src/gtkaccount.c:2486
 msgid ""
 "\n"
 "\n"
@@ -2227,17 +2210,17 @@
 "\n"
 "Do you wish to add him or her to your buddy list?"
 
-#: src/gtkaccount.c:2491
+#: src/gtkaccount.c:2490
 msgid "Information"
 msgstr "Information"
 
-#: src/gtkaccount.c:2495
+#: src/gtkaccount.c:2494
 msgid "Add buddy to your list?"
 msgstr "Add buddy to your list?"
 
 #. Add button
-#: src/gtkaccount.c:2497 src/gtkblist.c:4411 src/gtkconv.c:1390
-#: src/gtkconv.c:3673 src/gtkconv.c:3777 src/gtkrequest.c:247
+#: src/gtkaccount.c:2496 src/gtkblist.c:4411 src/gtkconv.c:1389
+#: src/gtkconv.c:3695 src/gtkconv.c:3799 src/gtkrequest.c:247
 #: src/protocols/icq/gaim_icq.c:277 src/protocols/oscar/oscar.c:3627
 #: src/protocols/silc/chat.c:581
 msgid "Add"
@@ -2268,9 +2251,8 @@
 msgstr "I_M"
 
 #: src/gtkblist.c:1141
-#, fuzzy
 msgid "_Send File"
-msgstr "Send File"
+msgstr "_Send File"
 
 #: src/gtkblist.c:1145
 msgid "Add Buddy _Pounce"
@@ -2323,7 +2305,7 @@
 msgid "_Expand"
 msgstr "_Expand"
 
-#: src/gtkblist.c:1949 src/gtkconv.c:4315 src/gtkpounce.c:314
+#: src/gtkblist.c:1949 src/gtkconv.c:4368 src/gtkpounce.c:314
 msgid ""
 "You are not currently signed on with an account that can add that buddy."
 msgstr ""
@@ -2792,12 +2774,12 @@
 msgid "That command doesn't work on this protocol."
 msgstr "That command doesn't work on this protocol."
 
-#: src/gtkconv.c:693
+#: src/gtkconv.c:694
 msgid "Invite Buddy Into Chat Room"
 msgstr "Invite Buddy Into Chat Room"
 
 #. Put our happy label in it.
-#: src/gtkconv.c:721
+#: src/gtkconv.c:722
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
@@ -2805,67 +2787,65 @@
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
 
-#: src/gtkconv.c:742
+#: src/gtkconv.c:743
 msgid "_Buddy:"
 msgstr "_Buddy:"
 
-#: src/gtkconv.c:762
+#: src/gtkconv.c:763
 msgid "_Message:"
 msgstr "_Message:"
 
-#: src/gtkconv.c:799 src/gtkconv.c:2489 src/gtkdebug.c:182
-#, fuzzy
+#: src/gtkconv.c:800 src/gtkconv.c:2489 src/gtkdebug.c:182
 msgid "Unable to open file."
-msgstr "Unable to read file %s."
-
-#: src/gtkconv.c:804
+msgstr "Unable to open file."
+
+#: src/gtkconv.c:805
 #, c-format
 msgid "<h1>Conversation with %s</h1>\n"
 msgstr "<h1>Conversation with %s</h1>\n"
 
-#: src/gtkconv.c:818
+#: src/gtkconv.c:819
 msgid "Save Conversation"
 msgstr "Save Conversation"
 
-#: src/gtkconv.c:895 src/gtkdebug.c:131
+#: src/gtkconv.c:896 src/gtkdebug.c:131
 msgid "Find"
 msgstr "Find"
 
-#: src/gtkconv.c:921 src/gtkdebug.c:159
+#: src/gtkconv.c:922 src/gtkdebug.c:159
 msgid "_Search for:"
 msgstr "_Search for:"
 
-#: src/gtkconv.c:1338
+#: src/gtkconv.c:1337
 msgid "IM"
 msgstr "IM"
 
-#. Block button
-#: src/gtkconv.c:1347 src/gtkconv.c:3666 src/protocols/oscar/oscar.c:453
+#. Send File button
+#: src/gtkconv.c:1346 src/gtkconv.c:3688 src/protocols/oscar/oscar.c:453
 #: src/protocols/oscar/oscar.c:6798
 msgid "Send File"
 msgstr "Send File"
 
-#: src/gtkconv.c:1356
+#: src/gtkconv.c:1355
 msgid "Un-Ignore"
 msgstr "Un-Ignore"
 
-#: src/gtkconv.c:1358 src/gtkprefs.c:826
+#: src/gtkconv.c:1357 src/gtkprefs.c:826
 msgid "Ignore"
 msgstr "Ignore"
 
 #. Info button
-#: src/gtkconv.c:1367 src/gtkconv.c:3687
+#: src/gtkconv.c:1366 src/gtkconv.c:3709
 msgid "Info"
 msgstr "Info"
 
-#: src/gtkconv.c:1376
+#: src/gtkconv.c:1375
 msgid "Get Away Msg"
 msgstr "Get Away Msg"
 
 #: src/gtkconv.c:2497
-#, fuzzy
 msgid "Unable to save icon file to disk."
-msgstr "Can't save icon file to disk."
+msgstr "Unable to save icon file to disk."
 
 #: src/gtkconv.c:2514
 msgid "Save Icon"
@@ -2897,261 +2877,258 @@
 msgstr "_Send As"
 
 #. Conversation menu
-#: src/gtkconv.c:3450
+#: src/gtkconv.c:3472
 msgid "/_Conversation"
 msgstr "/_Conversation"
 
-#: src/gtkconv.c:3452
+#: src/gtkconv.c:3474
 msgid "/Conversation/New Instant _Message..."
 msgstr "/Conversation/New Instant _Message..."
 
-#: src/gtkconv.c:3457
+#: src/gtkconv.c:3479
 msgid "/Conversation/_Find..."
 msgstr "/Conversation/_Find..."
 
-#: src/gtkconv.c:3459
+#: src/gtkconv.c:3481
 msgid "/Conversation/View _Log"
 msgstr "/Conversation/View _Log"
 
-#: src/gtkconv.c:3460
+#: src/gtkconv.c:3482
 msgid "/Conversation/_Save As..."
 msgstr "/Conversation/_Save As..."
 
-#: src/gtkconv.c:3462
+#: src/gtkconv.c:3484
 msgid "/Conversation/Clear"
 msgstr "/Conversation/Clear"
 
-#: src/gtkconv.c:3466
-#, fuzzy
+#: src/gtkconv.c:3488
 msgid "/Conversation/Se_nd File..."
-msgstr "/Conversation/_Find..."
-
-#: src/gtkconv.c:3467
+msgstr "/Conversation/Se_nd File..."
+
+#: src/gtkconv.c:3489
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Conversation/Add Buddy _Pounce..."
 
-#: src/gtkconv.c:3469
+#: src/gtkconv.c:3491
 msgid "/Conversation/_Get Info"
 msgstr "/Conversation/_Get Info"
 
-#: src/gtkconv.c:3471
+#: src/gtkconv.c:3493
 msgid "/Conversation/_Warn..."
 msgstr "/Conversation/_Warn..."
 
-#: src/gtkconv.c:3473
+#: src/gtkconv.c:3495
 msgid "/Conversation/In_vite..."
 msgstr "/Conversation/In_vite..."
 
-#: src/gtkconv.c:3478
+#: src/gtkconv.c:3500
 msgid "/Conversation/A_lias..."
 msgstr "/Conversation/A_lias..."
 
-#: src/gtkconv.c:3480
+#: src/gtkconv.c:3502
 msgid "/Conversation/_Block..."
 msgstr "/Conversation/_Block..."
 
-#: src/gtkconv.c:3482
+#: src/gtkconv.c:3504
 msgid "/Conversation/_Add..."
 msgstr "/Conversation/_Add..."
 
-#: src/gtkconv.c:3484
+#: src/gtkconv.c:3506
 msgid "/Conversation/_Remove..."
 msgstr "/Conversation/_Remove..."
 
-#: src/gtkconv.c:3489
+#: src/gtkconv.c:3511
 msgid "/Conversation/Insert Lin_k..."
 msgstr "/Conversation/Insert Lin_k..."
 
-#: src/gtkconv.c:3491
+#: src/gtkconv.c:3513
 msgid "/Conversation/Insert Imag_e..."
 msgstr "/Conversation/Insert Imag_e..."
 
-#: src/gtkconv.c:3496
+#: src/gtkconv.c:3518
 msgid "/Conversation/_Close"
 msgstr "/Conversation/_Close"
 
 #. Options
-#: src/gtkconv.c:3500
+#: src/gtkconv.c:3522
 msgid "/_Options"
 msgstr "/_Options"
 
-#: src/gtkconv.c:3501
+#: src/gtkconv.c:3523
 msgid "/Options/Enable _Logging"
 msgstr "/Options/Enable _Logging"
 
-#: src/gtkconv.c:3502
+#: src/gtkconv.c:3524
 msgid "/Options/Enable _Sounds"
 msgstr "/Options/Enable _Sounds"
 
-#: src/gtkconv.c:3503
+#: src/gtkconv.c:3525
 msgid "/Options/Show Formatting _Toolbar"
 msgstr "/Options/Show Formatting _Toolbar"
 
-#: src/gtkconv.c:3504
+#: src/gtkconv.c:3526
 msgid "/Options/Show T_imestamps"
 msgstr "/Options/Show T_imestamps"
 
-#: src/gtkconv.c:3546
+#: src/gtkconv.c:3568
 msgid "/Conversation/View Log"
 msgstr "/Conversation/View Log"
 
-#: src/gtkconv.c:3551
-#, fuzzy
+#: src/gtkconv.c:3573
 msgid "/Conversation/Send File..."
-msgstr "/Conversation/Invite..."
-
-#: src/gtkconv.c:3555
+msgstr "/Conversation/Send File..."
+
+#: src/gtkconv.c:3577
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Conversation/Add Buddy Pounce..."
 
-#: src/gtkconv.c:3561
+#: src/gtkconv.c:3583
 msgid "/Conversation/Get Info"
 msgstr "/Conversation/Get Info"
 
-#: src/gtkconv.c:3565
+#: src/gtkconv.c:3587
 msgid "/Conversation/Warn..."
 msgstr "/Conversation/Warn..."
 
-#: src/gtkconv.c:3569
+#: src/gtkconv.c:3591
 msgid "/Conversation/Invite..."
 msgstr "/Conversation/Invite..."
 
-#: src/gtkconv.c:3575
+#: src/gtkconv.c:3597
 msgid "/Conversation/Alias..."
 msgstr "/Conversation/Alias..."
 
-#: src/gtkconv.c:3579
+#: src/gtkconv.c:3601
 msgid "/Conversation/Block..."
 msgstr "/Conversation/Block..."
 
-#: src/gtkconv.c:3583
+#: src/gtkconv.c:3605
 msgid "/Conversation/Add..."
 msgstr "/Conversation/Add..."
 
-#: src/gtkconv.c:3587
+#: src/gtkconv.c:3609
 msgid "/Conversation/Remove..."
 msgstr "/Conversation/Remove..."
 
-#: src/gtkconv.c:3593
+#: src/gtkconv.c:3615
 msgid "/Conversation/Insert Link..."
 msgstr "/Conversation/Insert Link..."
 
-#: src/gtkconv.c:3597
+#: src/gtkconv.c:3619
 msgid "/Conversation/Insert Image..."
 msgstr "/Conversation/Insert Image..."
 
-#: src/gtkconv.c:3603
+#: src/gtkconv.c:3625
 msgid "/Options/Enable Logging"
 msgstr "/Options/Enable Logging"
 
-#: src/gtkconv.c:3606
+#: src/gtkconv.c:3628
 msgid "/Options/Enable Sounds"
 msgstr "/Options/Enable Sounds"
 
-#: src/gtkconv.c:3609
+#: src/gtkconv.c:3631
 msgid "/Options/Show Formatting Toolbar"
 msgstr "/Options/Show Formatting Toolbar"
 
-#: src/gtkconv.c:3612
+#: src/gtkconv.c:3634
 msgid "/Options/Show Timestamps"
 msgstr "/Options/Show Timestamps"
 
 #. From right to left...
 #. Send button
-#: src/gtkconv.c:3636 src/gtkconv.c:3638 src/gtkconv.c:3756 src/gtkconv.c:3758
+#: src/gtkconv.c:3658 src/gtkconv.c:3660 src/gtkconv.c:3778 src/gtkconv.c:3780
 msgid "Send"
 msgstr "Send"
 
 #. Now, um, just kind of all over the place. Huh?
 #. Warn button
-#: src/gtkconv.c:3652
+#: src/gtkconv.c:3674
 msgid "Warn"
 msgstr "Warn"
 
-#: src/gtkconv.c:3655
+#: src/gtkconv.c:3677
 msgid "Warn the user"
 msgstr "Warn the user"
 
 #. Block button
-#: src/gtkconv.c:3659 src/gtkprivacy.c:624 src/gtkprivacy.c:635
+#: src/gtkconv.c:3681 src/gtkprivacy.c:624 src/gtkprivacy.c:635
 msgid "Block"
 msgstr "Block"
 
-#: src/gtkconv.c:3662
+#: src/gtkconv.c:3684
 msgid "Block the user"
 msgstr "Block the user"
 
-#: src/gtkconv.c:3669
-#, fuzzy
+#: src/gtkconv.c:3691
 msgid "Send a file to the user"
-msgstr "Send a mobile message."
-
-#: src/gtkconv.c:3676
+msgstr "Send a file to the user"
+
+#: src/gtkconv.c:3698
 msgid "Add the user to your buddy list"
 msgstr "Add the user to your buddy list"
 
-#: src/gtkconv.c:3683
+#: src/gtkconv.c:3705
 msgid "Remove the user from your buddy list"
 msgstr "Remove the user from your buddy list"
 
-#: src/gtkconv.c:3690 src/gtkconv.c:4039
+#: src/gtkconv.c:3712 src/gtkconv.c:4092
 msgid "Get the user's information"
 msgstr "Get the user's information"
 
 #. Invite
-#: src/gtkconv.c:3770
+#: src/gtkconv.c:3792
 msgid "Invite"
 msgstr "Invite"
 
-#: src/gtkconv.c:3773
+#: src/gtkconv.c:3795
 msgid "Invite a user"
 msgstr "Invite a user"
 
-#: src/gtkconv.c:3780
+#: src/gtkconv.c:3802
 msgid "Add the chat to your buddy list"
 msgstr "Add the chat to your buddy list"
 
-#: src/gtkconv.c:3787
+#: src/gtkconv.c:3809
 msgid "Remove the chat from your buddy list"
 msgstr "Remove the chat from your buddy list"
 
-#: src/gtkconv.c:3897
+#: src/gtkconv.c:3945
 msgid "Topic:"
 msgstr "Topic:"
 
 #. Setup the label telling how many people are in the room.
-#: src/gtkconv.c:3960
+#: src/gtkconv.c:4008
 msgid "0 people in room"
 msgstr "0 people in room"
 
-#: src/gtkconv.c:4016
+#: src/gtkconv.c:4069
 msgid "IM the user"
 msgstr "IM the user"
 
-#: src/gtkconv.c:4028
+#: src/gtkconv.c:4081
 msgid "Ignore the user"
 msgstr "Ignore the user"
 
-#: src/gtkconv.c:4627
+#: src/gtkconv.c:4680
 msgid "Close conversation"
 msgstr "Close conversation"
 
-#: src/gtkconv.c:5169 src/gtkconv.c:5201 src/gtkconv.c:5322 src/gtkconv.c:5389
+#: src/gtkconv.c:5221 src/gtkconv.c:5250 src/gtkconv.c:5346 src/gtkconv.c:5398
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "%d person in room"
 msgstr[1] "%d people in room"
 
-#: src/gtkconv.c:5901 src/gtkconv.c:5904
+#: src/gtkconv.c:5952 src/gtkconv.c:5955
 msgid "<main>/Conversation/Close"
 msgstr "<main>/Conversation/Close"
 
-#: src/gtkconv.c:6276
+#: src/gtkconv.c:6327
 msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
 msgstr "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
 
-#: src/gtkconv.c:6279
+#: src/gtkconv.c:6330
 msgid ""
 "debug &lt;option&gt;:  Send various debug information to the current "
 "conversation."
@@ -3159,11 +3136,11 @@
 "debug &lt;option&gt;:  Send various debug information to the current "
 "conversation."
 
-#: src/gtkconv.c:6283
+#: src/gtkconv.c:6334
 msgid "help:  List available commands."
 msgstr "help:  List available commands."
 
-#: src/gtkconv.c:6287
+#: src/gtkconv.c:6338
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr "help &lt;command&gt;:  Help on a specific command."
 
@@ -3674,7 +3651,7 @@
 msgstr "Icon"
 
 #: src/gtkprefs.c:722 src/gtkprefs.c:2212 src/protocols/jabber/buddy.c:264
-#: src/protocols/jabber/buddy.c:748 src/protocols/jabber/chat.c:701
+#: src/protocols/jabber/buddy.c:748 src/protocols/jabber/chat.c:693
 msgid "Description"
 msgstr "Description"
 
@@ -3922,7 +3899,7 @@
 
 #: src/gtkprefs.c:1301
 msgid "Epiphany"
-msgstr ""
+msgstr "Epiphany"
 
 #: src/gtkprefs.c:1302
 msgid "Firebird"
@@ -4119,7 +4096,7 @@
 msgstr "_Only send auto-response when idle"
 
 #: src/gtkprefs.c:1819 src/protocols/msn/msn.c:1179
-#: src/protocols/msn/state.c:32 src/protocols/novell/novell.c:2730
+#: src/protocols/msn/state.c:32 src/protocols/novell/novell.c:2728
 #: src/protocols/oscar/oscar.c:4011 src/protocols/yahoo/yahoo.c:2511
 #: src/protocols/yahoo/yahoo_profile.c:664
 msgid "Idle"
@@ -4362,14 +4339,12 @@
 msgstr "Would you like to overwrite it?"
 
 #: src/gtkrequest.c:1430 src/gtkrequest.c:1451
-#, fuzzy
 msgid "Save File..."
-msgstr "Send File..."
+msgstr "Save File..."
 
 #: src/gtkrequest.c:1431 src/gtkrequest.c:1452
-#, fuzzy
 msgid "Open File..."
-msgstr "Send File..."
+msgstr "Open File..."
 
 #: src/gtkroomlist.c:330
 msgid "Room List"
@@ -4580,8 +4555,8 @@
 #: src/protocols/gg/gg.c:49 src/protocols/jabber/jutil.c:44
 #: src/protocols/msn/msn.c:462 src/protocols/msn/state.c:29
 #: src/protocols/msn/state.c:30 src/protocols/msn/state.c:37
-#: src/protocols/msn/state.c:38 src/protocols/novell/novell.c:2721
-#: src/protocols/novell/novell.c:2840 src/protocols/novell/novell.c:2891
+#: src/protocols/msn/state.c:38 src/protocols/novell/novell.c:2719
+#: src/protocols/novell/novell.c:2838 src/protocols/novell/novell.c:2889
 #: src/protocols/oscar/oscar.c:616 src/protocols/yahoo/yahoo.c:2851
 #: src/protocols/yahoo/yahoo.c:2967
 msgid "Available"
@@ -4651,8 +4626,8 @@
 #. res[0] == username
 #: src/protocols/gg/gg.c:243 src/protocols/gg/gg.c:1011
 #: src/protocols/napster/napster.c:393 src/protocols/oscar/oscar.c:3824
-#: src/protocols/oscar/oscar.c:4040 src/protocols/silc/ops.c:1067
-#: src/protocols/silc/ops.c:1128 src/protocols/toc/toc.c:468
+#: src/protocols/oscar/oscar.c:4040 src/protocols/silc/ops.c:1075
+#: src/protocols/silc/ops.c:1136 src/protocols/toc/toc.c:468
 #: src/protocols/zephyr/zephyr.c:635
 msgid "Buddy Information"
 msgstr "Buddy Information"
@@ -4744,7 +4719,7 @@
 
 #. First Name
 #: src/protocols/gg/gg.c:957 src/protocols/jabber/jabber.c:613
-#: src/protocols/oscar/oscar.c:4858 src/protocols/silc/ops.c:790
+#: src/protocols/oscar/oscar.c:4858 src/protocols/silc/ops.c:798
 #: src/protocols/trepia/trepia.c:267
 msgid "First Name"
 msgstr "First Name"
@@ -4756,8 +4731,8 @@
 msgstr "Last Name"
 
 #: src/protocols/gg/gg.c:966 src/protocols/gg/gg.c:1707
-#: src/protocols/irc/msgs.c:183 src/protocols/oscar/oscar.c:4848
-#: src/protocols/silc/ops.c:1184
+#: src/protocols/irc/msgs.c:182 src/protocols/oscar/oscar.c:4848
+#: src/protocols/silc/ops.c:1192
 msgid "Nick"
 msgstr "Nick"
 
@@ -4915,7 +4890,6 @@
 #. *< name
 #. *< version
 #. *  summary
-#. *  description
 #: src/protocols/gg/gg.c:1686 src/protocols/gg/gg.c:1688
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr "Gadu-Gadu Protocol Plugin"
@@ -4929,13 +4903,13 @@
 msgid "The user %s (%s%s%s%s%s) wants you to authorize them."
 msgstr "The user %s (%s%s%s%s%s) wants you to authorize them."
 
-#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:232
+#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:233
 #: src/protocols/msn/userlist.c:100 src/protocols/oscar/oscar.c:3555
 #: src/protocols/oscar/oscar.c:6126
 msgid "Authorize"
 msgstr "Authorize"
 
-#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:233
+#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:234
 #: src/protocols/msn/userlist.c:101 src/protocols/oscar/oscar.c:3557
 #: src/protocols/oscar/oscar.c:6127
 msgid "Deny"
@@ -4962,13 +4936,13 @@
 msgid "Unknown command: %s"
 msgstr "Unknown command: %s"
 
-#: src/protocols/irc/cmds.c:448 src/protocols/jabber/chat.c:544
+#: src/protocols/irc/cmds.c:448 src/protocols/jabber/chat.c:536
 #: src/protocols/silc/silc.c:995
 #, c-format
 msgid "current topic is: %s"
 msgstr "current topic is: %s"
 
-#: src/protocols/irc/cmds.c:451 src/protocols/jabber/chat.c:546
+#: src/protocols/irc/cmds.c:451 src/protocols/jabber/chat.c:538
 #: src/protocols/silc/silc.c:998
 msgid "No topic is set"
 msgstr "No topic is set"
@@ -5001,52 +4975,51 @@
 msgid "MOTD for %s"
 msgstr "MOTD for %s"
 
-#: src/protocols/irc/irc.c:93 src/protocols/irc/irc.c:373
-#, fuzzy
+#: src/protocols/irc/irc.c:93 src/protocols/irc/irc.c:388
 msgid "Server has disconnected"
-msgstr "Disconnected."
-
-#: src/protocols/irc/irc.c:147
+msgstr "Server has disconnected"
+
+#: src/protocols/irc/irc.c:158
 msgid "View MOTD"
 msgstr "View MOTD"
 
-#: src/protocols/irc/irc.c:169 src/protocols/silc/chat.c:32
+#: src/protocols/irc/irc.c:180 src/protocols/silc/chat.c:32
 msgid "_Channel:"
 msgstr "_Channel:"
 
-#: src/protocols/irc/irc.c:174 src/protocols/jabber/chat.c:59
+#: src/protocols/irc/irc.c:185 src/protocols/jabber/chat.c:59
 msgid "_Password:"
 msgstr "_Password:"
 
-#: src/protocols/irc/irc.c:194
+#: src/protocols/irc/irc.c:205
 msgid "IRC nicks may not contain whitespace"
 msgstr "IRC nicks may not contain whitespace"
 
-#: src/protocols/irc/irc.c:213 src/protocols/toc/toc.c:198
+#: src/protocols/irc/irc.c:224 src/protocols/toc/toc.c:198
 #, c-format
 msgid "Signon: %s"
 msgstr "Signon: %s"
 
-#: src/protocols/irc/irc.c:222
+#: src/protocols/irc/irc.c:233
 msgid "Couldn't create socket"
 msgstr "Couldn't create socket"
 
-#: src/protocols/irc/irc.c:237 src/protocols/jabber/jabber.c:297
+#: src/protocols/irc/irc.c:248 src/protocols/jabber/jabber.c:297
 #: src/protocols/oscar/oscar.c:1529 src/protocols/oscar/oscar.c:1593
 msgid "Couldn't connect to host"
 msgstr "Couldn't connect to host"
 
-#: src/protocols/irc/irc.c:370 src/protocols/trepia/trepia.c:926
+#: src/protocols/irc/irc.c:385 src/protocols/trepia/trepia.c:926
 msgid "Read error"
 msgstr "Read error"
 
-#: src/protocols/irc/irc.c:521 src/protocols/silc/chat.c:1363
-#: src/protocols/yahoo/yahoochat.c:1380
+#: src/protocols/irc/irc.c:536 src/protocols/silc/chat.c:1356
+#: src/protocols/yahoo/yahoochat.c:1376
 msgid "Users"
 msgstr "Users"
 
-#: src/protocols/irc/irc.c:524 src/protocols/silc/chat.c:1366
-#: src/protocols/silc/ops.c:1146 src/protocols/yahoo/yahoochat.c:1389
+#: src/protocols/irc/irc.c:539 src/protocols/silc/chat.c:1359
+#: src/protocols/silc/ops.c:1154 src/protocols/yahoo/yahoochat.c:1385
 msgid "Topic"
 msgstr "Topic"
 
@@ -5059,191 +5032,191 @@
 #. *< id
 #. *< name
 #. *< version
-#: src/protocols/irc/irc.c:628
+#: src/protocols/irc/irc.c:643
 msgid "IRC Protocol Plugin"
 msgstr "IRC Protocol Plugin"
 
 #. *  summary
-#: src/protocols/irc/irc.c:629
+#: src/protocols/irc/irc.c:644
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "The IRC Protocol Plugin that Sucks Less"
 
-#: src/protocols/irc/irc.c:648 src/protocols/irc/msgs.c:197
+#: src/protocols/irc/irc.c:663 src/protocols/irc/msgs.c:196
 #: src/protocols/jabber/jabber.c:1559 src/protocols/napster/napster.c:644
-#: src/protocols/silc/ops.c:1008 src/protocols/silc/ops.c:1110
+#: src/protocols/silc/ops.c:1016 src/protocols/silc/ops.c:1118
 msgid "Server"
 msgstr "Server"
 
-#: src/protocols/irc/irc.c:651 src/protocols/jabber/jabber.c:1580
+#: src/protocols/irc/irc.c:666 src/protocols/jabber/jabber.c:1580
 #: src/protocols/msn/msn.c:1758 src/protocols/napster/napster.c:649
 #: src/protocols/silc/silc.c:1576 src/protocols/trepia/trepia.c:1297
 msgid "Port"
 msgstr "Port"
 
-#: src/protocols/irc/irc.c:654 src/protocols/zephyr/zephyr.c:1915
+#: src/protocols/irc/irc.c:669 src/protocols/zephyr/zephyr.c:1909
 msgid "Encoding"
 msgstr "Encoding"
 
-#: src/protocols/irc/irc.c:657 src/protocols/irc/msgs.c:191
+#: src/protocols/irc/irc.c:672 src/protocols/irc/msgs.c:190
 #: src/protocols/jabber/jabber.c:588 src/protocols/silc/buddy.c:1445
-#: src/protocols/silc/ops.c:955 src/protocols/silc/ops.c:957
-#: src/protocols/silc/ops.c:1104 src/protocols/silc/ops.c:1106
+#: src/protocols/silc/ops.c:963 src/protocols/silc/ops.c:965
+#: src/protocols/silc/ops.c:1112 src/protocols/silc/ops.c:1114
 msgid "Username"
 msgstr "Username"
 
-#: src/protocols/irc/msgs.c:98
+#: src/protocols/irc/msgs.c:97
 msgid "Bad mode"
 msgstr "Bad mode"
 
-#: src/protocols/irc/msgs.c:109
+#: src/protocols/irc/msgs.c:108
 #, c-format
 msgid "You are banned from %s."
 msgstr "You are banned from %s."
 
-#: src/protocols/irc/msgs.c:110
+#: src/protocols/irc/msgs.c:109
 msgid "Banned"
 msgstr "Banned"
 
+#: src/protocols/irc/msgs.c:183
+msgid " <i>(ircop)</i>"
+msgstr " <i>(ircop)</i>"
+
 #: src/protocols/irc/msgs.c:184
-msgid " <i>(ircop)</i>"
-msgstr " <i>(ircop)</i>"
-
-#: src/protocols/irc/msgs.c:185
 msgid " <i>(identified)</i>"
 msgstr " <i>(identified)</i>"
 
-#: src/protocols/irc/msgs.c:192 src/protocols/silc/ops.c:949
-#: src/protocols/silc/ops.c:1098 src/protocols/yahoo/yahoo_profile.c:1005
+#: src/protocols/irc/msgs.c:191 src/protocols/silc/ops.c:957
+#: src/protocols/silc/ops.c:1106 src/protocols/yahoo/yahoo_profile.c:1005
 msgid "Realname"
 msgstr "Realname"
 
-#: src/protocols/irc/msgs.c:202 src/protocols/silc/ops.c:1021
+#: src/protocols/irc/msgs.c:201 src/protocols/silc/ops.c:1029
 msgid "Currently on"
 msgstr "Currently on"
 
-#: src/protocols/irc/msgs.c:207
+#: src/protocols/irc/msgs.c:206
 #, c-format
 msgid "<b>Idle for:</b> %s<br>"
 msgstr "<b>Idle for:</b> %s<br>"
 
-#: src/protocols/irc/msgs.c:209
+#: src/protocols/irc/msgs.c:208
 msgid "Online since"
 msgstr "Online since"
 
-#: src/protocols/irc/msgs.c:212
+#: src/protocols/irc/msgs.c:211
 msgid "<br><b>Defining adjective:</b> Glorious<br>"
 msgstr "<br><b>Defining adjective:</b> Glorious<br>"
 
-#: src/protocols/irc/msgs.c:219
+#: src/protocols/irc/msgs.c:218
 #, c-format
 msgid "Buddy Information for %s"
 msgstr "Buddy Information for %s"
 
-#: src/protocols/irc/msgs.c:279
+#: src/protocols/irc/msgs.c:278
 #, c-format
 msgid "%s has changed the topic to: %s"
 msgstr "%s has changed the topic to: %s"
 
-#: src/protocols/irc/msgs.c:284
+#: src/protocols/irc/msgs.c:283
 #, c-format
 msgid "The topic for %s is: %s"
 msgstr "The topic for %s is: %s"
 
-#: src/protocols/irc/msgs.c:301
+#: src/protocols/irc/msgs.c:300
 #, c-format
 msgid "Unknown message '%s'"
 msgstr "Unknown message '%s'"
 
-#: src/protocols/irc/msgs.c:302
+#: src/protocols/irc/msgs.c:301
 msgid "Unknown message"
 msgstr "Unknown message"
 
-#: src/protocols/irc/msgs.c:302
+#: src/protocols/irc/msgs.c:301
 msgid "Gaim has sent a message the IRC server did not understand."
 msgstr "Gaim has sent a message the IRC server did not understand."
 
-#: src/protocols/irc/msgs.c:325
+#: src/protocols/irc/msgs.c:324
 #, c-format
 msgid "Users on %s: %s"
 msgstr "Users on %s: %s"
 
-#: src/protocols/irc/msgs.c:407
+#: src/protocols/irc/msgs.c:418
 msgid "No such channel"
 msgstr "No such channel"
 
 #. does this happen?
-#: src/protocols/irc/msgs.c:418
+#: src/protocols/irc/msgs.c:429
 msgid "no such channel"
 msgstr "no such channel"
 
-#: src/protocols/irc/msgs.c:421
+#: src/protocols/irc/msgs.c:432
 msgid "User is not logged in"
 msgstr "User is not logged in"
 
-#: src/protocols/irc/msgs.c:426
+#: src/protocols/irc/msgs.c:437
 msgid "No such nick or channel"
 msgstr "No such nick or channel"
 
-#: src/protocols/irc/msgs.c:446
+#: src/protocols/irc/msgs.c:457
 msgid "Could not send"
 msgstr "Could not send"
 
-#: src/protocols/irc/msgs.c:502
+#: src/protocols/irc/msgs.c:513
 #, c-format
 msgid "Joining %s requires an invitation."
 msgstr "Joining %s requires an invitation."
 
-#: src/protocols/irc/msgs.c:503
+#: src/protocols/irc/msgs.c:514
 msgid "Invitation only"
 msgstr "Invitation only"
 
-#: src/protocols/irc/msgs.c:606
+#: src/protocols/irc/msgs.c:617
 #, c-format
 msgid "You have been kicked by %s: (%s)"
 msgstr "You have been kicked by %s: (%s)"
 
-#: src/protocols/irc/msgs.c:611
+#: src/protocols/irc/msgs.c:622
 #, c-format
 msgid "Kicked by %s (%s)"
 msgstr "Kicked by %s (%s)"
 
-#: src/protocols/irc/msgs.c:632
+#: src/protocols/irc/msgs.c:643
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr "mode (%s %s) by %s"
 
-#: src/protocols/irc/msgs.c:711
+#: src/protocols/irc/msgs.c:750
 msgid "Could not change nick"
 msgstr "Could not change nick"
 
-#: src/protocols/irc/msgs.c:712
+#: src/protocols/irc/msgs.c:751
 msgid "Cannot change nick"
 msgstr "Cannot change nick"
 
-#: src/protocols/irc/msgs.c:733
+#: src/protocols/irc/msgs.c:772
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr "You have parted the channel%s%s"
 
-#: src/protocols/irc/msgs.c:773
+#: src/protocols/irc/msgs.c:812
 msgid "Error: invalid PONG from server"
 msgstr "Error: invalid PONG from server"
 
-#: src/protocols/irc/msgs.c:775
+#: src/protocols/irc/msgs.c:814
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr "PING reply -- Lag: %lu seconds"
 
-#: src/protocols/irc/msgs.c:850
+#: src/protocols/irc/msgs.c:889
 #, c-format
 msgid "Cannot join %s:"
 msgstr "Cannot join %s:"
 
-#: src/protocols/irc/msgs.c:851 src/protocols/silc/ops.c:894
+#: src/protocols/irc/msgs.c:890 src/protocols/silc/ops.c:902
 msgid "Cannot join channel"
 msgstr "Cannot join channel"
 
-#: src/protocols/irc/msgs.c:887
+#: src/protocols/irc/msgs.c:926
 #, c-format
 msgid "Wallops from %s"
 msgstr "Wallops from %s"
@@ -5487,12 +5460,12 @@
 msgstr "Invalid challenge from server"
 
 #: src/protocols/jabber/buddy.c:246 src/protocols/jabber/buddy.c:604
-#: src/protocols/silc/ops.c:786
+#: src/protocols/silc/ops.c:794
 msgid "Full Name"
 msgstr "Full Name"
 
 #: src/protocols/jabber/buddy.c:247 src/protocols/jabber/buddy.c:617
-#: src/protocols/silc/ops.c:798
+#: src/protocols/silc/ops.c:806
 msgid "Family Name"
 msgstr "Family Name"
 
@@ -5502,8 +5475,8 @@
 
 #: src/protocols/jabber/buddy.c:249 src/protocols/jabber/buddy.c:635
 #: src/protocols/jabber/jabber.c:608 src/protocols/msn/msn.c:1172
-#: src/protocols/silc/buddy.c:1442 src/protocols/silc/ops.c:802
-#: src/protocols/silc/ops.c:945 src/protocols/silc/ops.c:1094
+#: src/protocols/silc/buddy.c:1442 src/protocols/silc/ops.c:810
+#: src/protocols/silc/ops.c:953 src/protocols/silc/ops.c:1102
 #: src/protocols/yahoo/yahoo_profile.c:1000
 msgid "Nickname"
 msgstr "Nickname"
@@ -5589,8 +5562,8 @@
 
 #: src/protocols/jabber/buddy.c:563 src/protocols/jabber/buddy.c:570
 #: src/protocols/jabber/buddy.c:581 src/protocols/jabber/jabber.c:938
-#: src/protocols/msn/msn.c:450 src/protocols/novell/novell.c:2743
-#: src/protocols/novell/novell.c:2747 src/protocols/oscar/oscar.c:578
+#: src/protocols/msn/msn.c:450 src/protocols/novell/novell.c:2741
+#: src/protocols/novell/novell.c:2745 src/protocols/oscar/oscar.c:578
 #: src/protocols/oscar/oscar.c:584 src/protocols/oscar/oscar.c:586
 #: src/protocols/yahoo/yahoo.c:2634
 msgid "Status"
@@ -5600,13 +5573,13 @@
 msgid "Resource"
 msgstr "Resource"
 
-#: src/protocols/jabber/buddy.c:625 src/protocols/silc/ops.c:794
+#: src/protocols/jabber/buddy.c:625 src/protocols/silc/ops.c:802
 msgid "Middle Name"
 msgstr "Middle Name"
 
 #: src/protocols/jabber/buddy.c:643 src/protocols/jabber/jabber.c:623
 #: src/protocols/oscar/oscar.c:4901 src/protocols/oscar/oscar.c:4909
-#: src/protocols/silc/ops.c:830
+#: src/protocols/silc/ops.c:838
 msgid "Address"
 msgstr "Address"
 
@@ -5650,7 +5623,7 @@
 msgid "Unsubscribe"
 msgstr "Unsubscribe"
 
-#: src/protocols/jabber/chat.c:42 src/protocols/yahoo/yahoochat.c:1002
+#: src/protocols/jabber/chat.c:42 src/protocols/yahoo/yahoochat.c:998
 msgid "_Room:"
 msgstr "_Room:"
 
@@ -5689,51 +5662,51 @@
 msgid "Invalid Room Handle"
 msgstr "Invalid Room Handle"
 
-#: src/protocols/jabber/chat.c:349
+#: src/protocols/jabber/chat.c:341
 msgid "Configuration error"
 msgstr "Configuration error"
 
-#: src/protocols/jabber/chat.c:358 src/protocols/jabber/chat.c:503
+#: src/protocols/jabber/chat.c:350 src/protocols/jabber/chat.c:495
 msgid "Unable to configure"
 msgstr "Unable to configure"
 
-#: src/protocols/jabber/chat.c:374
+#: src/protocols/jabber/chat.c:366
 msgid "Room Configuration Error"
 msgstr "Room Configuration Error"
 
-#: src/protocols/jabber/chat.c:375
+#: src/protocols/jabber/chat.c:367
 msgid "This room is not capable of being configured"
 msgstr "This room is not capable of being configured"
 
-#: src/protocols/jabber/chat.c:425 src/protocols/jabber/chat.c:494
+#: src/protocols/jabber/chat.c:417 src/protocols/jabber/chat.c:486
 msgid "Registration error"
 msgstr "Registration error"
 
-#: src/protocols/jabber/chat.c:573
+#: src/protocols/jabber/chat.c:565
 msgid "Nick changing not supported in non-MUC chatrooms"
 msgstr "Nick changing not supported in non-MUC chatrooms"
 
-#: src/protocols/jabber/chat.c:617 src/protocols/jabber/chat.c:628
+#: src/protocols/jabber/chat.c:609 src/protocols/jabber/chat.c:620
 msgid "Roomlist Error"
 msgstr "Roomlist Error"
 
-#: src/protocols/jabber/chat.c:618 src/protocols/jabber/chat.c:629
+#: src/protocols/jabber/chat.c:610 src/protocols/jabber/chat.c:621
 msgid "Error retreiving roomlist"
 msgstr "Error retreiving roomlist"
 
-#: src/protocols/jabber/chat.c:669
+#: src/protocols/jabber/chat.c:661
 msgid "Invalid Server"
 msgstr "Invalid Server"
 
-#: src/protocols/jabber/chat.c:706
+#: src/protocols/jabber/chat.c:698
 msgid "Enter a Conference Server"
 msgstr "Enter a Conference Server"
 
-#: src/protocols/jabber/chat.c:707
+#: src/protocols/jabber/chat.c:699
 msgid "Select a conference server to query"
 msgstr "Select a conference server to query"
 
-#: src/protocols/jabber/chat.c:710
+#: src/protocols/jabber/chat.c:702
 msgid "Find Rooms"
 msgstr "Find Rooms"
 
@@ -5809,7 +5782,7 @@
 msgid "State"
 msgstr "Province/Territory"
 
-#: src/protocols/jabber/jabber.c:643 src/protocols/silc/ops.c:835
+#: src/protocols/jabber/jabber.c:643 src/protocols/silc/ops.c:843
 #: src/protocols/silc/silc.c:639 src/protocols/silc/util.c:510
 msgid "Phone"
 msgstr "Phone"
@@ -5832,9 +5805,9 @@
 
 #. connect to the server
 #: src/protocols/jabber/jabber.c:783 src/protocols/msn/msn.c:608
-#: src/protocols/napster/napster.c:499 src/protocols/novell/novell.c:2105
+#: src/protocols/napster/napster.c:499 src/protocols/novell/novell.c:2103
 #: src/protocols/oscar/oscar.c:1597 src/protocols/trepia/trepia.c:1064
-#: src/protocols/yahoo/yahoo.c:2379 src/protocols/zephyr/zephyr.c:1017
+#: src/protocols/yahoo/yahoo.c:2379 src/protocols/zephyr/zephyr.c:1011
 msgid "Connecting"
 msgstr "Connecting"
 
@@ -6045,7 +6018,7 @@
 msgid "Resource Conflict"
 msgstr "Resource Conflict"
 
-#: src/protocols/jabber/jabber.c:1215 src/protocols/silc/ops.c:1491
+#: src/protocols/jabber/jabber.c:1215 src/protocols/silc/ops.c:1499
 msgid "Connection Timeout"
 msgstr "Connection Timeout"
 
@@ -6191,7 +6164,6 @@
 #. *< name
 #. *< version
 #. *  summary
-#. *  description
 #: src/protocols/jabber/jabber.c:1537 src/protocols/jabber/jabber.c:1539
 msgid "Jabber Protocol Plugin"
 msgstr "Jabber Protocol Plugin"
@@ -6246,20 +6218,20 @@
 msgid "XML Parse error"
 msgstr "XML Parse error"
 
-#: src/protocols/jabber/presence.c:224
+#: src/protocols/jabber/presence.c:225
 msgid "Unknown Error in presence"
 msgstr "Unknown Error in presence"
 
-#: src/protocols/jabber/presence.c:227
+#: src/protocols/jabber/presence.c:228
 #, c-format
 msgid "The user %s wants to add you to their buddy list."
 msgstr "The user %s wants to add you to their buddy list."
 
-#: src/protocols/jabber/presence.c:280 src/protocols/jabber/presence.c:281
+#: src/protocols/jabber/presence.c:281 src/protocols/jabber/presence.c:282
 msgid "Create New Room"
 msgstr "Create New Room"
 
-#: src/protocols/jabber/presence.c:282
+#: src/protocols/jabber/presence.c:283
 msgid ""
 "You are creating a new room.  Would you like to configure it, or accept the "
 "default settings?"
@@ -6267,20 +6239,20 @@
 "You are creating a new room.  Would you like to configure it, or accept the "
 "default settings?"
 
-#: src/protocols/jabber/presence.c:284
+#: src/protocols/jabber/presence.c:285
 msgid "Configure Room"
 msgstr "Configure Room"
 
-#: src/protocols/jabber/presence.c:286
+#: src/protocols/jabber/presence.c:287
 msgid "Accept Defaults"
 msgstr "Accept Defaults"
 
-#: src/protocols/jabber/presence.c:308
+#: src/protocols/jabber/presence.c:309
 #, c-format
 msgid "Error in chat %s"
 msgstr "Error in chat %s"
 
-#: src/protocols/jabber/presence.c:311
+#: src/protocols/jabber/presence.c:312
 #, c-format
 msgid "Error joining chat %s"
 msgstr "Error joining chat %s"
@@ -6496,7 +6468,7 @@
 msgstr "Server too busy"
 
 #: src/protocols/msn/error.c:198 src/protocols/oscar/oscar.c:2026
-#: src/protocols/silc/ops.c:1480 src/protocols/toc/toc.c:630
+#: src/protocols/silc/ops.c:1488 src/protocols/toc/toc.c:630
 msgid "Authentication failed"
 msgstr "Authentication failed"
 
@@ -6594,8 +6566,8 @@
 msgstr "Be Right Back"
 
 #: src/protocols/msn/msn.c:465 src/protocols/msn/msn.c:760
-#: src/protocols/msn/state.c:31 src/protocols/novell/novell.c:2727
-#: src/protocols/novell/novell.c:2842 src/protocols/novell/novell.c:2896
+#: src/protocols/msn/state.c:31 src/protocols/novell/novell.c:2725
+#: src/protocols/novell/novell.c:2840 src/protocols/novell/novell.c:2894
 #: src/protocols/silc/buddy.c:1383 src/protocols/silc/silc.c:47
 #: src/protocols/silc/silc.c:78 src/protocols/yahoo/yahoo.c:2493
 #: src/protocols/yahoo/yahoo.c:2855 src/protocols/yahoo/yahoo.c:2970
@@ -6615,7 +6587,7 @@
 msgstr "Out To Lunch"
 
 #: src/protocols/msn/msn.c:468 src/protocols/msn/msn.c:766
-#: src/protocols/zephyr/zephyr.c:1355 src/protocols/zephyr/zephyr.c:1374
+#: src/protocols/zephyr/zephyr.c:1349 src/protocols/zephyr/zephyr.c:1368
 msgid "Hidden"
 msgstr "Hidden"
 
@@ -6679,7 +6651,7 @@
 #: src/protocols/msn/msn.c:1173
 #, c-format
 msgid "<font sml=\"msn\">%s</font><br>"
-msgstr ""
+msgstr "<font sml=\"msn\">%s</font><br>"
 
 #: src/protocols/msn/msn.c:1179 src/protocols/yahoo/yahoo_profile.c:664
 #, c-format
@@ -6687,9 +6659,8 @@
 msgstr "<b>%s:</b> %s<br>"
 
 #: src/protocols/msn/msn.c:1242
-#, fuzzy
 msgid "MSN Profile"
-msgstr "Set Profile"
+msgstr "MSN Profile"
 
 #: src/protocols/msn/msn.c:1247 src/protocols/msn/msn.c:1499
 #: src/protocols/yahoo/yahoo_profile.c:761
@@ -6748,14 +6719,14 @@
 msgstr "Last Updated"
 
 #. Homepage
-#: src/protocols/msn/msn.c:1479 src/protocols/silc/ops.c:826
+#: src/protocols/msn/msn.c:1479 src/protocols/silc/ops.c:834
 #: src/protocols/trepia/trepia.c:289 src/protocols/trepia/trepia.c:419
 msgid "Homepage"
 msgstr "Homepage"
 
 #: src/protocols/msn/msn.c:1501
 msgid "The user has not created a public profile."
-msgstr ""
+msgstr "The user has not created a public profile."
 
 #: src/protocols/msn/msn.c:1502
 msgid ""
@@ -6763,12 +6734,18 @@
 "that the user does not exist, or that the user exists but has not created a "
 "public profile."
 msgstr ""
-
+"MSN reported not being able to find the user's profile. This either means "
+"that the user does not exist, or that the user exists but has not created a "
+"public profile."
+
+#. This should never happen
 #: src/protocols/msn/msn.c:1506
 msgid ""
 "Gaim could not find any information in the user's profile. The user most "
 "likely does not exist."
 msgstr ""
+"Gaim could not find any information in the user's profile. The user most "
+"likely does not exist."
 
 #: src/protocols/msn/msn.c:1512 src/protocols/yahoo/yahoo_profile.c:1168
 msgid "Profile URL"
@@ -6792,7 +6769,6 @@
 #. *< name
 #. *< version
 #. *  summary
-#. *  description
 #: src/protocols/msn/msn.c:1732 src/protocols/msn/msn.c:1734
 msgid "MSN Protocol Plugin"
 msgstr "MSN Protocol Plugin"
@@ -6827,7 +6803,7 @@
 msgstr "Password sent"
 
 #: src/protocols/msn/notification.c:1071
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
 "automatically be signed out at that time.  Please finish any conversations "
@@ -6848,23 +6824,13 @@
 "in progress.\n"
 "\n"
 "After the maintenance has been completed, you will be able to successfully "
-"sign in.The MSN server will shut down for maintenance in %d minutes. You "
-"will automatically be signed out at that time.  Please finish any "
-"conversations in progress.\n"
-"\n"
-"After the maintenance has been completed, you will be able to successfully "
 "sign in."
 msgstr[1] ""
-"The MSN server will shut down for maintenance in %d minute. You will "
+"The MSN server will shut down for maintenance in %d minutes. You will "
 "automatically be signed out at that time.  Please finish any conversations "
 "in progress.\n"
 "\n"
 "After the maintenance has been completed, you will be able to successfully "
-"sign in.The MSN server will shut down for maintenance in %d minutes. You "
-"will automatically be signed out at that time.  Please finish any "
-"conversations in progress.\n"
-"\n"
-"After the maintenance has been completed, you will be able to successfully "
 "sign in."
 
 #: src/protocols/msn/notification.c:1136
@@ -6979,7 +6945,6 @@
 #. *< name
 #. *< version
 #. *  summary
-#. *  description
 #: src/protocols/napster/napster.c:624 src/protocols/napster/napster.c:626
 msgid "NAPSTER Protocol Plugin"
 msgstr "NAPSTER Protocol Plugin"
@@ -7271,11 +7236,11 @@
 msgid "Would you like to join the conversation?"
 msgstr "Would you like to join the conversation?"
 
-#: src/protocols/novell/novell.c:1938
+#: src/protocols/novell/novell.c:1936
 msgid "You have been logged out because you logged in at another workstation."
 msgstr "You have been logged out because you logged in at another workstation."
 
-#: src/protocols/novell/novell.c:1992
+#: src/protocols/novell/novell.c:1990
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
@@ -7286,7 +7251,7 @@
 #. *  gaim_request_fields(gc, _("Server Address"),...);
 #.
 #. ...but for now just error out with a nice message.
-#: src/protocols/novell/novell.c:2090
+#: src/protocols/novell/novell.c:2088
 msgid ""
 "Unable to connect to server. Please enter the address of the server you wish "
 "to connect to."
@@ -7294,28 +7259,28 @@
 "Unable to connect to server. Please enter the address of the server you wish "
 "to connect to."
 
-#: src/protocols/novell/novell.c:2112
+#: src/protocols/novell/novell.c:2110
 msgid "Error. SSL support is not installed."
 msgstr "Error. SSL support is not installed."
 
-#: src/protocols/novell/novell.c:2421
+#: src/protocols/novell/novell.c:2419
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "This conference has been closed. No more messages can be sent."
 
-#: src/protocols/novell/novell.c:2733 src/protocols/oscar/oscar.c:586
+#: src/protocols/novell/novell.c:2731 src/protocols/oscar/oscar.c:586
 #: src/protocols/oscar/oscar.c:6499 src/protocols/yahoo/yahoo.c:2513
 msgid "Offline"
 msgstr "Offline"
 
-#: src/protocols/novell/novell.c:2744
+#: src/protocols/novell/novell.c:2742
 msgid "Message"
 msgstr "Message"
 
-#: src/protocols/novell/novell.c:2843 src/protocols/novell/novell.c:2899
+#: src/protocols/novell/novell.c:2841 src/protocols/novell/novell.c:2897
 msgid "Appear Offline"
 msgstr "Appear Offline"
 
-#: src/protocols/novell/novell.c:3293
+#: src/protocols/novell/novell.c:3291
 msgid "Initiate _Chat"
 msgstr "Initiate _Chat"
 
@@ -7329,16 +7294,15 @@
 #. *< name
 #. *< version
 #. *  summary
-#. *  description
-#: src/protocols/novell/novell.c:3389 src/protocols/novell/novell.c:3391
+#: src/protocols/novell/novell.c:3387 src/protocols/novell/novell.c:3389
 msgid "Novell GroupWise Messenger Protocol Plugin"
 msgstr "Novell GroupWise Messenger Protocol Plugin"
 
-#: src/protocols/novell/novell.c:3410
+#: src/protocols/novell/novell.c:3408
 msgid "Server address"
 msgstr "Server address"
 
-#: src/protocols/novell/novell.c:3414
+#: src/protocols/novell/novell.c:3412
 msgid "Server port"
 msgstr "Server port"
 
@@ -7439,13 +7403,12 @@
 msgstr "Not while on AOL"
 
 #: src/protocols/oscar/oscar.c:403
-#, fuzzy
 msgid ""
 "(There was an error converting this message.  The buddy you are speaking to "
 "most likely has a buggy client.)"
 msgstr ""
-"(There was an error converting this message.  Check the 'Encoding' option in "
-"the Account Editor)"
+"(There was an error converting this message.  The buddy you are speaking to "
+"most likely has a buggy client.)"
 
 #: src/protocols/oscar/oscar.c:441
 msgid "Voice"
@@ -7868,13 +7831,15 @@
 msgstr[1] "You missed %hu messages from %s because they were too large."
 
 #: src/protocols/oscar/oscar.c:3731
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
 msgid_plural ""
 "You missed %hu messages from %s because the rate limit has been exceeded."
-msgstr[0] "You missed %hu message from %s because it was invalid."
-msgstr[1] "You missed %hu messages from %s because they were invalid."
+msgstr[0]
+"You missed %hu message from %s because the rate limit has been exceeded."
+msgstr[1]
+"You missed %hu messages from %s because the rate limit has been exceeded."
 
 #: src/protocols/oscar/oscar.c:3740
 #, c-format
@@ -8171,7 +8136,7 @@
 "fully connected."
 
 #: src/protocols/oscar/oscar.c:5373
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  Gaim has truncated "
 "it for you."
@@ -8180,12 +8145,10 @@
 "truncated it for you."
 msgstr[0] ""
 "The maximum profile length of %d byte has been exceeded.  Gaim has truncated "
-"it for you.The maximum profile length of %d bytes has been exceeded.  Gaim "
-"has truncated it for you."
+"it for you."
 msgstr[1] ""
-"The maximum profile length of %d byte has been exceeded.  Gaim has truncated "
-"it for you.The maximum profile length of %d bytes has been exceeded.  Gaim "
-"has truncated it for you."
+"The maximum profile length of %d bytes has been exceeded.  Gaim has "
+"truncated it for you."
 
 #: src/protocols/oscar/oscar.c:5378
 msgid "Profile too long."
@@ -8210,7 +8173,7 @@
 "again when you are fully connected."
 
 #: src/protocols/oscar/oscar.c:5453
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  Gaim has "
 "truncated it for you."
@@ -8219,12 +8182,10 @@
 "truncated it for you."
 msgstr[0] ""
 "The maximum away message length of %d byte has been exceeded.  Gaim has "
-"truncated it for you.The maximum away message length of %d bytes has been "
-"exceeded.  Gaim has truncated it for you."
+"truncated it for you."
 msgstr[1] ""
-"The maximum away message length of %d byte has been exceeded.  Gaim has "
-"truncated it for you.The maximum away message length of %d bytes has been "
-"exceeded.  Gaim has truncated it for you."
+"The maximum away message length of %d bytes has been exceeded.  Gaim has "
+"truncated it for you."
 
 #: src/protocols/oscar/oscar.c:5458
 msgid "Away message too long."
@@ -8488,7 +8449,6 @@
 #. *< name
 #. *< version
 #. *  summary
-#. *  description
 #: src/protocols/oscar/oscar.c:7254 src/protocols/oscar/oscar.c:7256
 msgid "AIM/ICQ Protocol Plugin"
 msgstr "AIM/ICQ Protocol Plugin"
@@ -8586,12 +8546,12 @@
 msgstr "Set IM Password"
 
 #: src/protocols/silc/buddy.c:506 src/protocols/silc/buddy.c:541
-#: src/protocols/silc/ops.c:1256 src/protocols/silc/ops.c:1267
+#: src/protocols/silc/ops.c:1264 src/protocols/silc/ops.c:1275
 msgid "Get Public Key"
 msgstr "Get Public Key"
 
-#: src/protocols/silc/buddy.c:542 src/protocols/silc/ops.c:1257
-#: src/protocols/silc/ops.c:1268
+#: src/protocols/silc/buddy.c:542 src/protocols/silc/ops.c:1265
+#: src/protocols/silc/ops.c:1276
 msgid "Cannot fetch the public key"
 msgstr "Cannot fetch the public key"
 
@@ -8604,14 +8564,14 @@
 msgid "Could not load public key"
 msgstr "Could not load public key"
 
-#: src/protocols/silc/buddy.c:707 src/protocols/silc/ops.c:853
-#: src/protocols/silc/ops.c:925 src/protocols/silc/ops.c:1060
-#: src/protocols/silc/ops.c:1061 src/protocols/silc/ops.c:1079
+#: src/protocols/silc/buddy.c:707 src/protocols/silc/ops.c:861
+#: src/protocols/silc/ops.c:933 src/protocols/silc/ops.c:1068
+#: src/protocols/silc/ops.c:1069 src/protocols/silc/ops.c:1087
 msgid "User Information"
 msgstr "User Information"
 
-#: src/protocols/silc/buddy.c:708 src/protocols/silc/ops.c:926
-#: src/protocols/silc/ops.c:1080
+#: src/protocols/silc/buddy.c:708 src/protocols/silc/ops.c:934
+#: src/protocols/silc/ops.c:1088
 msgid "Cannot get user information"
 msgstr "Cannot get user information"
 
@@ -8748,37 +8708,36 @@
 msgid "Anxious"
 msgstr "Anxious"
 
-#: src/protocols/silc/buddy.c:1448 src/protocols/silc/ops.c:962
-#, fuzzy
+#: src/protocols/silc/buddy.c:1448 src/protocols/silc/ops.c:970
 msgid "User Modes"
-msgstr "User Mode"
-
-#: src/protocols/silc/buddy.c:1457 src/protocols/silc/ops.c:971
+msgstr "User Modes"
+
+#: src/protocols/silc/buddy.c:1457 src/protocols/silc/ops.c:979
 msgid "Mood"
 msgstr "Mood"
 
-#: src/protocols/silc/buddy.c:1461 src/protocols/silc/ops.c:977
+#: src/protocols/silc/buddy.c:1461 src/protocols/silc/ops.c:985
 msgid "Status Text"
 msgstr "Status Text"
 
-#: src/protocols/silc/buddy.c:1466 src/protocols/silc/ops.c:983
+#: src/protocols/silc/buddy.c:1466 src/protocols/silc/ops.c:991
 msgid "Preferred Contact"
 msgstr "Preferred Contact"
 
-#: src/protocols/silc/buddy.c:1471 src/protocols/silc/ops.c:988
+#: src/protocols/silc/buddy.c:1471 src/protocols/silc/ops.c:996
 msgid "Preferred Language"
 msgstr "Preferred Language"
 
-#: src/protocols/silc/buddy.c:1476 src/protocols/silc/ops.c:993
+#: src/protocols/silc/buddy.c:1476 src/protocols/silc/ops.c:1001
 msgid "Device"
 msgstr "Device"
 
-#: src/protocols/silc/buddy.c:1481 src/protocols/silc/ops.c:998
+#: src/protocols/silc/buddy.c:1481 src/protocols/silc/ops.c:1006
 #: src/protocols/silc/silc.c:678 src/protocols/silc/silc.c:680
 msgid "Timezone"
 msgstr "Time Zone"
 
-#: src/protocols/silc/buddy.c:1486 src/protocols/silc/ops.c:1003
+#: src/protocols/silc/buddy.c:1486 src/protocols/silc/ops.c:1011
 msgid "Geolocation"
 msgstr "Geolocation"
 
@@ -8798,7 +8757,7 @@
 msgid "Get Public Key..."
 msgstr "Get Public Key..."
 
-#: src/protocols/silc/buddy.c:1555 src/protocols/silc/ops.c:1389
+#: src/protocols/silc/buddy.c:1555 src/protocols/silc/ops.c:1397
 msgid "Kill User"
 msgstr "Kill User"
 
@@ -8820,60 +8779,48 @@
 msgstr "Cannot get channel information"
 
 #: src/protocols/silc/chat.c:105
-#, fuzzy, c-format
+#, c-format
 msgid "<b>Channel Name:</b> %s"
-msgstr "Channel Name:\t\t%s\n"
+msgstr "<b>Channel Name:</b> %s"
 
 #: src/protocols/silc/chat.c:108
-#, fuzzy, c-format
+#, c-format
 msgid "<br><b>User Count:</b> %d"
-msgstr "<b>User:</b> %s<br>"
+msgstr "<br><b>User Count:</b> %d"
 
 #: src/protocols/silc/chat.c:115
-#, fuzzy, c-format
+#, c-format
 msgid "<br><b>Channel Founder:</b> %s"
-msgstr "Channel Founder:\t%s\n"
+msgstr "<br><b>Channel Founder:</b> %s"
 
 #: src/protocols/silc/chat.c:124
-#, fuzzy, c-format
+#, c-format
 msgid "<br><b>Channel Cipher:</b> %s"
-msgstr "Channel Cipher:\t\t%s\n"
+msgstr "<br><b>Channel Cipher:</b> %s"
 
 #: src/protocols/silc/chat.c:127
-#, fuzzy, c-format
+#, c-format
 msgid "<br><b>Channel HMAC:</b> %s"
-msgstr "Channel HMAC:\t\t%s\n"
+msgstr "<br><b>Channel HMAC:</b> %s"
 
 #: src/protocols/silc/chat.c:132
-#, fuzzy, c-format
+#, c-format
 msgid "<br><b>Channel Topic:</b><br>%s"
-msgstr ""
-"\n"
-"Channel Topic:\n"
-"\t%s\n"
+msgstr "<br><b>Channel Topic:</b><br>%s"
 
 #: src/protocols/silc/chat.c:137
-#, fuzzy
 msgid "<br><b>Channel Modes:</b> "
-msgstr ""
-"\n"
-"Channel Modes:\n"
+msgstr "<br><b>Channel Modes:</b> "
 
 #: src/protocols/silc/chat.c:150
-#, fuzzy, c-format
+#, c-format
 msgid "<br><b>Founder Key Fingerprint:</b><br>%s"
-msgstr ""
-"\n"
-"Founder Key Fingerprint:\n"
-"%s\n"
-"\n"
+msgstr "<br><b>Founder Key Fingerprint:</b><br>%s"
 
 #: src/protocols/silc/chat.c:151
-#, fuzzy, c-format
+#, c-format
 msgid "<br><b>Founder Key Babbleprint:</b><br>%s"
-msgstr ""
-"Founder Key Babbleprint:\n"
-"%s"
+msgstr "<br><b>Founder Key Babbleprint:</b><br>%s"
 
 #: src/protocols/silc/chat.c:221
 msgid "Add Channel Public Key"
@@ -8920,7 +8867,7 @@
 msgid "Group Name"
 msgstr "Group Name"
 
-#: src/protocols/silc/chat.c:567 src/protocols/silc/ops.c:1669
+#: src/protocols/silc/chat.c:567 src/protocols/silc/ops.c:1677
 msgid "Passphrase"
 msgstr "Passphrase"
 
@@ -8993,36 +8940,36 @@
 msgid "Set Secret Channel"
 msgstr "Set Secret Channel"
 
-#: src/protocols/silc/chat.c:989
+#: src/protocols/silc/chat.c:981
 #, c-format
 msgid "You are channel founder on <I>%s</I>"
 msgstr "You are channel founder on <I>%s</I>"
 
-#: src/protocols/silc/chat.c:993
+#: src/protocols/silc/chat.c:985
 #, c-format
 msgid "Channel founder on <I>%s</I> is <I>%s</I>"
 msgstr "Channel founder on <I>%s</I> is <I>%s</I>"
 
-#: src/protocols/silc/chat.c:1046
+#: src/protocols/silc/chat.c:1039
 #, c-format
 msgid ""
 "You have to join the %s channel before you are able to join the private group"
 msgstr ""
 "You have to join the %s channel before you are able to join the private group"
 
-#: src/protocols/silc/chat.c:1048
+#: src/protocols/silc/chat.c:1041
 msgid "Join Private Group"
 msgstr "Join Private Group"
 
-#: src/protocols/silc/chat.c:1049
+#: src/protocols/silc/chat.c:1042
 msgid "Cannot join private group"
 msgstr "Cannot join private group"
 
-#: src/protocols/silc/chat.c:1242 src/protocols/silc/silc.c:888
+#: src/protocols/silc/chat.c:1235 src/protocols/silc/silc.c:888
 msgid "Cannot call command"
 msgstr "Cannot call command"
 
-#: src/protocols/silc/chat.c:1243 src/protocols/silc/silc.c:889
+#: src/protocols/silc/chat.c:1236 src/protocols/silc/silc.c:889
 msgid "Unknown command"
 msgstr "Unknown command"
 
@@ -9088,138 +9035,134 @@
 msgid "<I>%s</I> removed all channel <I>%s</I> modes"
 msgstr "<I>%s</I> removed all channel <I>%s</I> modes"
 
-#: src/protocols/silc/ops.c:448
+#: src/protocols/silc/ops.c:450
 #, c-format
 msgid "<I>%s</I> set <I>%s's</I> modes to: %s"
 msgstr "<I>%s</I> set <I>%s's</I> modes to: %s"
 
-#: src/protocols/silc/ops.c:452
+#: src/protocols/silc/ops.c:458
 #, c-format
 msgid "<I>%s</I> removed all <I>%s's</I> modes"
 msgstr "<I>%s</I> removed all <I>%s's</I> modes"
 
-#: src/protocols/silc/ops.c:479
+#: src/protocols/silc/ops.c:487
 #, c-format
 msgid "You have been kicked off <I>%s</I> by <I>%s</I> (%s)"
 msgstr "You have been kicked off <I>%s</I> by <I>%s</I> (%s)"
 
-#: src/protocols/silc/ops.c:509 src/protocols/silc/ops.c:514
-#: src/protocols/silc/ops.c:519
+#: src/protocols/silc/ops.c:517 src/protocols/silc/ops.c:522
+#: src/protocols/silc/ops.c:527
 #, c-format
 msgid "You have been killed by %s (%s)"
 msgstr "You have been killed by %s (%s)"
 
-#: src/protocols/silc/ops.c:540 src/protocols/silc/ops.c:545
-#: src/protocols/silc/ops.c:550
+#: src/protocols/silc/ops.c:548 src/protocols/silc/ops.c:553
+#: src/protocols/silc/ops.c:558
 #, c-format
 msgid "Killed by %s (%s)"
 msgstr "Killed by %s (%s)"
 
-#: src/protocols/silc/ops.c:596
+#: src/protocols/silc/ops.c:604
 msgid "Server signoff"
 msgstr "Server signoff"
 
-#: src/protocols/silc/ops.c:783
+#: src/protocols/silc/ops.c:791
 msgid "Personal Information"
 msgstr "Personal Information"
 
-#: src/protocols/silc/ops.c:806
+#: src/protocols/silc/ops.c:814
 msgid "Birth Day"
 msgstr "Birth Day"
 
-#: src/protocols/silc/ops.c:810
+#: src/protocols/silc/ops.c:818
 msgid "Job Title"
 msgstr "Job Title"
 
-#: src/protocols/silc/ops.c:814
-msgid "Job Role"
-msgstr "Job Role"
-
-#: src/protocols/silc/ops.c:818
-msgid "Organization"
-msgstr "Organization"
-
 #: src/protocols/silc/ops.c:822
+msgid "Job Role"
+msgstr "Job Role"
+
+#: src/protocols/silc/ops.c:826
+msgid "Organization"
+msgstr "Organization"
+
+#: src/protocols/silc/ops.c:830
 msgid "Unit"
 msgstr "Unit"
 
-#: src/protocols/silc/ops.c:841
+#: src/protocols/silc/ops.c:849
 msgid "EMail"
 msgstr "EMail"
 
-#: src/protocols/silc/ops.c:846
+#: src/protocols/silc/ops.c:854
 msgid "Note"
 msgstr "Note"
 
-#: src/protocols/silc/ops.c:894
+#: src/protocols/silc/ops.c:902
 msgid "Join Chat"
 msgstr "Join Chat"
 
-#: src/protocols/silc/ops.c:1050 src/protocols/silc/ops.c:1120
+#: src/protocols/silc/ops.c:1058 src/protocols/silc/ops.c:1128
 msgid "Public Key Fingerprint"
 msgstr "Public Key Fingerprint"
 
-#: src/protocols/silc/ops.c:1051 src/protocols/silc/ops.c:1121
+#: src/protocols/silc/ops.c:1059 src/protocols/silc/ops.c:1129
 msgid "Public Key Babbleprint"
 msgstr "Public Key Babbleprint"
 
-#: src/protocols/silc/ops.c:1064
+#: src/protocols/silc/ops.c:1072
 msgid "More..."
 msgstr "More..."
 
-#: src/protocols/silc/ops.c:1135 src/protocols/silc/silc.c:777
+#: src/protocols/silc/ops.c:1143 src/protocols/silc/silc.c:777
 msgid "Detach From Server"
 msgstr "Detach From Server"
 
-#: src/protocols/silc/ops.c:1135
+#: src/protocols/silc/ops.c:1143
 msgid "Cannot detach"
 msgstr "Cannot detach"
 
-#: src/protocols/silc/ops.c:1146
+#: src/protocols/silc/ops.c:1154
 msgid "Cannot set topic"
 msgstr "Cannot set topic"
 
-#: src/protocols/silc/ops.c:1184
-#, fuzzy
+#: src/protocols/silc/ops.c:1192
 msgid "Failed to change nickname"
-msgstr "Could not change nick"
-
-#: src/protocols/silc/ops.c:1221
+msgstr "Failed to change nickname"
+
+#: src/protocols/silc/ops.c:1229
 msgid "Roomlist"
 msgstr "Roomlist"
 
-#: src/protocols/silc/ops.c:1221
+#: src/protocols/silc/ops.c:1229
 msgid "Cannot get room list"
 msgstr "Cannot get room list"
 
-#: src/protocols/silc/ops.c:1269
+#: src/protocols/silc/ops.c:1277
 msgid "No public key was received"
 msgstr "No public key was received"
 
-#: src/protocols/silc/ops.c:1282 src/protocols/silc/ops.c:1296
+#: src/protocols/silc/ops.c:1290 src/protocols/silc/ops.c:1304
 msgid "Server Information"
 msgstr "Server Information"
 
-#: src/protocols/silc/ops.c:1283
+#: src/protocols/silc/ops.c:1291
 msgid "Cannot get server information"
 msgstr "Cannot get server information"
 
-#: src/protocols/silc/ops.c:1314 src/protocols/silc/ops.c:1323
-#, fuzzy
+#: src/protocols/silc/ops.c:1322 src/protocols/silc/ops.c:1331
 msgid "Server Statistics"
-msgstr "Server address"
-
-#: src/protocols/silc/ops.c:1315
-#, fuzzy
+msgstr "Server Statistics"
+
+#: src/protocols/silc/ops.c:1323
 msgid "Cannot get server statistics"
-msgstr "Cannot get server information"
-
-#: src/protocols/silc/ops.c:1324
-#, fuzzy
+msgstr "Cannot get server statistics"
+
+#: src/protocols/silc/ops.c:1332
 msgid "No server statisitics available"
-msgstr "No actions available"
-
-#: src/protocols/silc/ops.c:1346
+msgstr "No server statistics available"
+
+#: src/protocols/silc/ops.c:1354
 #, c-format
 msgid ""
 "Local server start time: %s\n"
@@ -9238,102 +9181,114 @@
 "Total server operators: %d\n"
 "Total router operators: %d\n"
 msgstr ""
-
-#: src/protocols/silc/ops.c:1369
-msgid "Network Statistics"
-msgstr ""
-
-#: src/protocols/silc/ops.c:1377 src/protocols/silc/ops.c:1382
-#, fuzzy
-msgid "Ping"
-msgstr "Paging"
+"Local server start time: %s\n"
+"Local server uptime: %s\n"
+"Local server clients: %d\n"
+"Local server channels: %d\n"
+"Local server operators: %d\n"
+"Local router operators: %d\n"
+"Local cell clients: %d\n"
+"Local cell channels: %d\n"
+"Local cell servers: %d\n"
+"Total clients: %d\n"
+"Total channels: %d\n"
+"Total servers: %d\n"
+"Total routers: %d\n"
+"Total server operators: %d\n"
+"Total router operators: %d\n"
 
 #: src/protocols/silc/ops.c:1377
-#, fuzzy
+msgid "Network Statistics"
+msgstr "Network Statistics"
+
+#: src/protocols/silc/ops.c:1385 src/protocols/silc/ops.c:1390
+msgid "Ping"
+msgstr "Ping"
+
+#: src/protocols/silc/ops.c:1385
 msgid "Ping failed"
-msgstr "Connection failed"
-
-#: src/protocols/silc/ops.c:1382
-#, fuzzy
-msgid "Ping reply received from server"
-msgstr "Invalid challenge from server"
+msgstr "Ping failed"
 
 #: src/protocols/silc/ops.c:1390
+msgid "Ping reply received from server"
+msgstr "Ping reply received from server"
+
+#: src/protocols/silc/ops.c:1398
 msgid "Could not kill user"
 msgstr "Could not kill user"
 
-#: src/protocols/silc/ops.c:1471
+#: src/protocols/silc/ops.c:1479
 msgid "Error during connecting to SILC Server"
 msgstr "Error during connecting to SILC Server"
 
-#: src/protocols/silc/ops.c:1476
+#: src/protocols/silc/ops.c:1484
 msgid "Key Exchange failed"
 msgstr "Key Exchange failed"
 
-#: src/protocols/silc/ops.c:1485
+#: src/protocols/silc/ops.c:1493
 msgid ""
 "Resuming detached session failed. Press Reconnect to create new connection."
 msgstr ""
 "Resuming detached session failed. Press Reconnect to create new connection."
 
-#: src/protocols/silc/ops.c:1520
+#: src/protocols/silc/ops.c:1528
 msgid "Disconnected by server"
 msgstr "Disconnected by server"
 
-#: src/protocols/silc/ops.c:1580 src/protocols/silc/ops.c:1627
+#: src/protocols/silc/ops.c:1588 src/protocols/silc/ops.c:1635
 #: src/protocols/silc/silc.c:167
 msgid "Resuming session"
 msgstr "Resuming session"
 
-#: src/protocols/silc/ops.c:1582
+#: src/protocols/silc/ops.c:1590
 msgid "Authenticating connection"
 msgstr "Authenticating connection"
 
-#: src/protocols/silc/ops.c:1629
+#: src/protocols/silc/ops.c:1637
 msgid "Verifying server public key"
 msgstr "Verifying server public key"
 
-#: src/protocols/silc/ops.c:1670
+#: src/protocols/silc/ops.c:1678
 msgid "Passphrase required"
 msgstr "Passphrase required"
 
-#: src/protocols/silc/ops.c:1699
+#: src/protocols/silc/ops.c:1707
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "Failure: Version mismatch; upgrade your client"
 
-#: src/protocols/silc/ops.c:1702
+#: src/protocols/silc/ops.c:1710
 msgid "Failure: Remote does not trust/support your public key"
 msgstr "Failure: Remote does not trust/support your public key"
 
-#: src/protocols/silc/ops.c:1705
+#: src/protocols/silc/ops.c:1713
 msgid "Failure: Remote does not support proposed KE group"
 msgstr "Failure: Remote does not support proposed KE group"
 
-#: src/protocols/silc/ops.c:1708
+#: src/protocols/silc/ops.c:1716
 msgid "Failure: Remote does not support proposed cipher"
 msgstr "Failure: Remote does not support proposed cipher"
 
-#: src/protocols/silc/ops.c:1711
+#: src/protocols/silc/ops.c:1719
 msgid "Failure: Remote does not support proposed PKCS"
 msgstr "Failure: Remote does not support proposed PKCS"
 
-#: src/protocols/silc/ops.c:1714
+#: src/protocols/silc/ops.c:1722
 msgid "Failure: Remote does not support proposed hash function"
 msgstr "Failure: Remote does not support proposed hash function"
 
-#: src/protocols/silc/ops.c:1717
+#: src/protocols/silc/ops.c:1725
 msgid "Failure: Remote does not support proposed HMAC"
 msgstr "Failure: Remote does not support proposed HMAC"
 
-#: src/protocols/silc/ops.c:1719
+#: src/protocols/silc/ops.c:1727
 msgid "Failure: Incorrect signature"
 msgstr "Failure: Incorrect signature"
 
-#: src/protocols/silc/ops.c:1721
+#: src/protocols/silc/ops.c:1729
 msgid "Failure: Invalid cookie"
 msgstr "Failure: Invalid cookie"
 
-#: src/protocols/silc/ops.c:1732
+#: src/protocols/silc/ops.c:1740
 msgid "Failure: Authentication failed"
 msgstr "Failure: Authentication failed"
 
@@ -9486,53 +9441,49 @@
 msgstr "User <I>%s</I> is not present in the network"
 
 #: src/protocols/silc/silc.c:962
-#, fuzzy
 msgid "Failed to leave channel"
-msgstr "Failed to join chat"
+msgstr "Failed to leave channel"
 
 #: src/protocols/silc/silc.c:1006
-#, fuzzy
 msgid "Topic too long"
-msgstr "Profile too long."
+msgstr "Topic too long"
 
 #: src/protocols/silc/silc.c:1087
 msgid "You must specify a nick"
-msgstr ""
+msgstr "You must specify a nick"
 
 #: src/protocols/silc/silc.c:1189
-#, fuzzy, c-format
+#, c-format
 msgid "channel %s not found"
-msgstr "Conference not found"
+msgstr "channel %s not found"
 
 #: src/protocols/silc/silc.c:1194
-#, fuzzy, c-format
+#, c-format
 msgid "channel modes for %s: %s"
-msgstr "The topic for %s is: %s"
+msgstr "channel modes for %s: %s"
 
 #: src/protocols/silc/silc.c:1196
-#, fuzzy, c-format
+#, c-format
 msgid "no channel modes are set on %s"
-msgstr "You are channel founder on <I>%s</I>"
+msgstr "no channel modes are set on %s"
 
 #: src/protocols/silc/silc.c:1209
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to set cmodes for %s"
-msgstr "Failed to store image: %s\n"
+msgstr "Failed to set cmodes for %s"
 
 #: src/protocols/silc/silc.c:1239
-#, fuzzy, c-format
+#, c-format
 msgid "Unknown command: %s, (may be a Gaim bug)"
-msgstr "Unknown command: %s"
+msgstr "Unknown command: %s, (may be a Gaim bug)"
 
 #: src/protocols/silc/silc.c:1302
-#, fuzzy
 msgid "part [channel]:  Leave the chat"
-msgstr "part:  Leave the chat"
+msgstr "part [channel]:  Leave the chat"
 
 #: src/protocols/silc/silc.c:1306
-#, fuzzy
 msgid "leave [channel]:  Leave the chat"
-msgstr "leave:  Leave the chat"
+msgstr "leave [channel]:  Leave the chat"
 
 #: src/protocols/silc/silc.c:1310
 msgid "topic [&lt;new topic&gt;]:  View or change the topic"
@@ -9550,7 +9501,7 @@
 msgid "whois &lt;nick&gt;:  View nick's information"
 msgstr "whois &lt;nick&gt;:  View nick's information"
 
-#: src/protocols/silc/silc.c:1327 src/protocols/zephyr/zephyr.c:1673
+#: src/protocols/silc/silc.c:1327 src/protocols/zephyr/zephyr.c:1667
 msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user"
 msgstr "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user"
 
@@ -9568,97 +9519,92 @@
 msgstr "detach:  Detach this session"
 
 #: src/protocols/silc/silc.c:1343
-#, fuzzy
 msgid "quit [message]:  Disconnect from the server, with an optional message"
-msgstr "quit [message]:  Disconnect from the server, with an optional message."
+msgstr "quit [message]:  Disconnect from the server, with an optional message"
 
 #: src/protocols/silc/silc.c:1347
-#, fuzzy
 msgid "call &lt;command&gt;:  Call any silc client command"
-msgstr "help &lt;command&gt;:  Help on a specific command."
+msgstr "call &lt;command&gt;:  Call any silc client command"
 
 #: src/protocols/silc/silc.c:1352
 msgid "kill &lt;nick&gt; [-pubkey|&lt;reason&gt;]:  Kill nick"
-msgstr ""
+msgstr "kill &lt;nick&gt; [-pubkey|&lt;reason&gt;]:  Kill nick"
 
 #: src/protocols/silc/silc.c:1356
-#, fuzzy
 msgid "nick &lt;newnick&gt;:  Change your nickname"
-msgstr "nick &lt;new nickname&gt;:  Change your nickname."
+msgstr "nick &lt;newnick&gt;:  Change your nickname"
 
 #: src/protocols/silc/silc.c:1360
-#, fuzzy
 msgid "whowas &lt;nick&gt;:  View nick's information"
-msgstr "whois &lt;nick&gt;:  View nick's information"
+msgstr "whowas &lt;nick&gt;:  View nick's information"
 
 #: src/protocols/silc/silc.c:1364
-#, fuzzy
-msgid ""
-"cmode &lt;channel&gt; [+|-&lt;modes&gt]; [arguments]:  Change or display "
+msgid ""
+"cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display "
 "channel modes"
 msgstr ""
-"mode &lt;nick|channel&gt; &lt;+|-&gt;&lt;A-Za-z&gt;:  Set or unset a channel "
-"or user mode."
+"cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display "
+"channel modes"
 
 #: src/protocols/silc/silc.c:1368
-#, fuzzy
 msgid ""
 "cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes "
 "on channel"
 msgstr ""
-"mode &lt;nick|channel&gt; &lt;+|-&gt;&lt;A-Za-z&gt;:  Set or unset a channel "
-"or user mode."
+"cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes "
+"on channel"
 
 #: src/protocols/silc/silc.c:1372
-#, fuzzy
 msgid "umode &lt;usermodes&gt;:  Set your modes in the network"
-msgstr "umode &lt;usermodes&gt;:  Set your user options"
+msgstr "umode &lt;usermodes&gt;:  Set your modes in the network"
 
 #: src/protocols/silc/silc.c:1376
 msgid "oper &lt;nick&gt; [-pubkey]:  Get server operator privileges"
-msgstr ""
+msgstr "oper &lt;nick&gt; [-pubkey]:  Get server operator privileges"
 
 #: src/protocols/silc/silc.c:1380
 msgid ""
 "invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
 "channel invite list"
 msgstr ""
+"invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
+"channel invite list"
 
 #: src/protocols/silc/silc.c:1384
 msgid "kick &lt;channel&gt; &lt;nick&gt; [comment]:  Kick client from channel"
-msgstr ""
+msgstr "kick &lt;channel&gt; &lt;nick&gt; [comment]:  Kick client from channel"
 
 #: src/protocols/silc/silc.c:1388
 msgid "info [server]:  View server administrative details"
-msgstr ""
+msgstr "info [server]:  View server administrative details"
 
 #: src/protocols/silc/silc.c:1392
-#, fuzzy
 msgid "ban [&lt;channel&gt; +|-&lt;nick&gt;]:  Ban client from channel"
-msgstr "join &lt;channel&gt; [&lt;password&gt;]:  Join a chat on this network"
+msgstr "ban [&lt;channel&gt; +|-&lt;nick&gt;]:  Ban client from channel"
 
 #: src/protocols/silc/silc.c:1396
 msgid "getkey &lt;nick|server&gt;:  Retrieve client's or server's public key"
-msgstr ""
+msgstr "getkey &lt;nick|server&gt;:  Retrieve client's or server's public key"
 
 #: src/protocols/silc/silc.c:1400
 msgid "stats:  View server and network statistics"
-msgstr ""
+msgstr "stats:  View server and network statistics"
 
 #: src/protocols/silc/silc.c:1404
 msgid "ping:  Send PING to the connected server"
-msgstr ""
+msgstr "ping:  Send PING to the connected server"
 
 #: src/protocols/silc/silc.c:1409
-#, fuzzy
 msgid "users &lt;channel&gt;:  List users in channel"
-msgstr "names [channel]:  List the users currently in a channel."
+msgstr "users &lt;channel&gt;:  List users in channel"
 
 #: src/protocols/silc/silc.c:1413
 msgid ""
 "names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List "
 "specific users in channel(s)"
 msgstr ""
+"names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List "
+"specific users in channel(s)"
 
 #: src/protocols/silc/silc.c:1425
 msgid "Instant Messages"
@@ -9781,9 +9727,9 @@
 msgstr "Country: \t%s\n"
 
 #: src/protocols/silc/util.c:321
-#, fuzzy, c-format
+#, c-format
 msgid "Algorithm: \t%s\n"
-msgstr "Algorithm: \t\t%s\n"
+msgstr "Algorithm: \t%s\n"
 
 #: src/protocols/silc/util.c:322
 #, c-format
@@ -10033,7 +9979,6 @@
 #. *< name
 #. *< version
 #. *  summary
-#. *  description
 #: src/protocols/toc/toc.c:2169 src/protocols/toc/toc.c:2171
 msgid "TOC Protocol Plugin"
 msgstr "TOC Protocol Plugin"
@@ -10125,7 +10070,6 @@
 #. *< name
 #. *< version
 #. *  summary
-#. *  description
 #: src/protocols/trepia/trepia.c:1271 src/protocols/trepia/trepia.c:1273
 msgid "Trepia Protocol Plugin"
 msgstr "Trepia Protocol Plugin"
@@ -10202,9 +10146,8 @@
 msgstr "Invalid username."
 
 #: src/protocols/yahoo/yahoo.c:1825
-#, fuzzy
 msgid "Normal authencation failed!"
-msgstr "Authentication failed"
+msgstr "Normal authentication failed!"
 
 #: src/protocols/yahoo/yahoo.c:1826
 msgid ""
@@ -10213,6 +10156,10 @@
 "attempt to log in using Web Messenger authencation, will which result in "
 "reduced functionality and features."
 msgstr ""
+"The normal authencation method has failed. This means either your password "
+"is incorrect, or Yahoo!'s authencation scheme has changed. Gaim will now "
+"attempt to log in using Web Messenger authencation, will which result in "
+"reduced functionality and features."
 
 #: src/protocols/yahoo/yahoo.c:1834
 msgid "Incorrect password."
@@ -10242,7 +10189,7 @@
 
 #: src/protocols/yahoo/yahoo.c:2238 src/protocols/yahoo/yahoo.c:2348
 #: src/protocols/yahoo/yahoo.c:2398 src/protocols/yahoo/yahoo.c:2408
-#: src/protocols/yahoo/yahoochat.c:1397 src/protocols/yahoo/yahoochat.c:1458
+#: src/protocols/yahoo/yahoochat.c:1393 src/protocols/yahoo/yahoochat.c:1454
 msgid "Connection problem"
 msgstr "Connection problem"
 
@@ -10318,7 +10265,6 @@
 #. *< name
 #. *< version
 #. *  summary
-#. *  description
 #: src/protocols/yahoo/yahoo.c:3292 src/protocols/yahoo/yahoo.c:3294
 msgid "Yahoo Protocol Plugin"
 msgstr "Yahoo Protocol Plugin"
@@ -10377,14 +10323,12 @@
 msgstr "<b>IP Address:</b> %s<br>"
 
 #: src/protocols/yahoo/yahoo_profile.c:749
-#, fuzzy
 msgid "Yahoo! Japan Profile"
-msgstr "Yahoo Japan"
+msgstr "Yahoo! Japan Profile"
 
 #: src/protocols/yahoo/yahoo_profile.c:750
-#, fuzzy
 msgid "Yahoo! Profile"
-msgstr "Profile"
+msgstr "Yahoo! Profile"
 
 #: src/protocols/yahoo/yahoo_profile.c:794
 msgid ""
@@ -10451,6 +10395,8 @@
 "Could not retrieve the user's profile. This most likely is a temporary "
 "server-side problem. Please try again later."
 msgstr ""
+"Could not retrieve the user's profile. This most likely is a temporary "
+"server-side problem. Please try again later."
 
 #: src/protocols/yahoo/yahoo_profile.c:1155
 msgid ""
@@ -10458,62 +10404,65 @@
 "does not exist; however, Yahoo! sometimes does fail to find a user's "
 "profile. If you know that the user exists, please try again later."
 msgstr ""
+"Could not retrieve the user's profile. This most likely means that the user "
+"does not exist; however, Yahoo! sometimes does fail to find a user's "
+"profile. If you know that the user exists, please try again later."
 
 #: src/protocols/yahoo/yahoo_profile.c:1163
 msgid "The user's profile is empty."
 msgstr "The user's profile is empty."
 
-#: src/protocols/yahoo/yahoochat.c:203
+#: src/protocols/yahoo/yahoochat.c:191
 #, c-format
 msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
 msgstr "%s declined your conference invitation to room \"%s\" because \"%s\"."
 
-#: src/protocols/yahoo/yahoochat.c:205
+#: src/protocols/yahoo/yahoochat.c:193
 msgid "Invitation Rejected"
 msgstr "Invitation Rejected"
 
-#: src/protocols/yahoo/yahoochat.c:355
+#: src/protocols/yahoo/yahoochat.c:343
 msgid "Failed to join chat"
 msgstr "Failed to join chat"
 
-#: src/protocols/yahoo/yahoochat.c:355
+#: src/protocols/yahoo/yahoochat.c:343
 msgid "Maybe the room is full?"
 msgstr "Maybe the room is full?"
 
-#: src/protocols/yahoo/yahoochat.c:429
+#: src/protocols/yahoo/yahoochat.c:421
 #, c-format
 msgid "You are now chatting in %s."
 msgstr "You are now chatting in %s."
 
-#: src/protocols/yahoo/yahoochat.c:583
+#: src/protocols/yahoo/yahoochat.c:575
 msgid "Failed to join buddy in chat"
 msgstr "Failed to join buddy in chat"
 
-#: src/protocols/yahoo/yahoochat.c:584
+#: src/protocols/yahoo/yahoochat.c:576
 msgid "Maybe they're not in a chat?"
 msgstr "Maybe they're not in a chat?"
 
-#: src/protocols/yahoo/yahoochat.c:1338
+#: src/protocols/yahoo/yahoochat.c:1334
 msgid "Unable to connect"
 msgstr "Unable to connect"
 
-#: src/protocols/yahoo/yahoochat.c:1338
+#: src/protocols/yahoo/yahoochat.c:1334
 msgid "Fetching the room list failed."
 msgstr "Fetching the room list failed."
 
-#: src/protocols/yahoo/yahoochat.c:1383
+#: src/protocols/yahoo/yahoochat.c:1379
 msgid "Voices"
 msgstr "Voices"
 
-#: src/protocols/yahoo/yahoochat.c:1386
+#: src/protocols/yahoo/yahoochat.c:1382
 msgid "Webcams"
 msgstr "Webcams"
 
-#: src/protocols/yahoo/yahoochat.c:1397 src/protocols/yahoo/yahoochat.c:1458
+#: src/protocols/yahoo/yahoochat.c:1393 src/protocols/yahoo/yahoochat.c:1454
 msgid "Unable to fetch room list."
 msgstr "Unable to fetch room list."
 
-#: src/protocols/yahoo/yahoochat.c:1451
+#: src/protocols/yahoo/yahoochat.c:1447
 msgid "User Rooms"
 msgstr "User Rooms"
 
@@ -10536,15 +10485,15 @@
 msgid "<br>At %s since %s"
 msgstr "<br>At %s since %s"
 
-#: src/protocols/zephyr/zephyr.c:983 src/protocols/zephyr/zephyr.c:984
+#: src/protocols/zephyr/zephyr.c:977 src/protocols/zephyr/zephyr.c:978
 msgid "Anyone"
 msgstr "Anyone"
 
-#: src/protocols/zephyr/zephyr.c:1011
+#: src/protocols/zephyr/zephyr.c:1005
 msgid "Already logged in with Zephyr"
 msgstr "Already logged in with Zephyr"
 
-#: src/protocols/zephyr/zephyr.c:1011
+#: src/protocols/zephyr/zephyr.c:1005
 msgid ""
 "Because Zephyr uses your system username, you are unable to have multiple "
 "accounts on it when logged in as the same user."
@@ -10552,81 +10501,84 @@
 "Because Zephyr uses your system username, you are unable to have multiple "
 "accounts on it when logged in as the same user."
 
-#: src/protocols/zephyr/zephyr.c:1386
+#: src/protocols/zephyr/zephyr.c:1380
 msgid "_Class:"
 msgstr "_Class:"
 
-#: src/protocols/zephyr/zephyr.c:1392
+#: src/protocols/zephyr/zephyr.c:1386
 msgid "_Instance:"
 msgstr "_Instance:"
 
-#: src/protocols/zephyr/zephyr.c:1398
+#: src/protocols/zephyr/zephyr.c:1392
 msgid "_Recipient:"
 msgstr "_Recipient:"
 
-#: src/protocols/zephyr/zephyr.c:1409
+#: src/protocols/zephyr/zephyr.c:1403
 #, c-format
 msgid "Attempt to subscribe to %s,%s,%s failed"
-msgstr ""
-
-#: src/protocols/zephyr/zephyr.c:1678
-#, fuzzy
+msgstr "Attempt to subscribe to %s,%s,%s failed"
+
+#: src/protocols/zephyr/zephyr.c:1672
 msgid "zlocate &lt;nick&gt;: Locate user"
-msgstr "whois &lt;nick&gt;:  Get information on a user."
-
-#: src/protocols/zephyr/zephyr.c:1683
-#, fuzzy
+msgstr "zlocate &lt;nick&gt;: Locate user"
+
+#: src/protocols/zephyr/zephyr.c:1677
 msgid "zl &lt;nick&gt;: Locate user"
-msgstr "whois &lt;nick&gt;:  Get information on a user."
-
-#: src/protocols/zephyr/zephyr.c:1688
+msgstr "zl &lt;nick&gt;: Locate user"
+
+#: src/protocols/zephyr/zephyr.c:1682
 msgid "instance &lt;instance&gt;: Set the instance to be used on this class"
-msgstr ""
+msgstr "instance &lt;instance&gt;: Set the instance to be used on this class"
+
+#: src/protocols/zephyr/zephyr.c:1687
+msgid "inst &lt;instance&gt;: Set the instance to be used on this class"
+msgstr "inst &lt;instance&gt;: Set the instance to be used on this class"
 
 #: src/protocols/zephyr/zephyr.c:1693
-msgid "inst &lt;instance&gt;: Set the instance to be used on this class"
-msgstr ""
-
-#: src/protocols/zephyr/zephyr.c:1699
 msgid "sub &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Join a new chat"
-msgstr ""
+msgstr "sub &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Join a new chat"
+
+#: src/protocols/zephyr/zephyr.c:1698
+msgid ""
+"zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
+msgstr ""
+"zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
 
 #: src/protocols/zephyr/zephyr.c:1704
 msgid ""
-"zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
-msgstr ""
-
-#: src/protocols/zephyr/zephyr.c:1710
-msgid ""
 "zci &lt;class&gt; &lt;instance&gt;: Send a message to &lt;<i>class</i>,"
 "<i>instance</i>,*&gt;"
 msgstr ""
-
-#: src/protocols/zephyr/zephyr.c:1716
+"zci &lt;class&gt; &lt;instance&gt;: Send a message to &lt;<i>class</i>,"
+"<i>instance</i>,*&gt;"
+
+#: src/protocols/zephyr/zephyr.c:1710
 msgid ""
 "zcir &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;"
 "<i>class</i>,<i>instance</i>,<i>recipient</i>&gt;"
 msgstr ""
-
-#: src/protocols/zephyr/zephyr.c:1722
+"zcir &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;"
+"<i>class</i>,<i>instance</i>,<i>recipient</i>&gt;"
+
+#: src/protocols/zephyr/zephyr.c:1716
 msgid ""
 "zir &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;MESSAGE,"
 "<i>instance</i>,<i>recipient</i>&gt;"
 msgstr ""
-
-#: src/protocols/zephyr/zephyr.c:1727
+"zir &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;MESSAGE,"
+"<i>instance</i>,<i>recipient</i>&gt;"
+
+#: src/protocols/zephyr/zephyr.c:1721
 msgid "zc &lt;class&gt;: Send a message to &lt;<i>class</i>,PERSONAL,*&gt;"
-msgstr ""
-
-#: src/protocols/zephyr/zephyr.c:1802
-#, fuzzy
+msgstr "zc &lt;class&gt;: Send a message to &lt;<i>class</i>,PERSONAL,*&gt;"
+
+#: src/protocols/zephyr/zephyr.c:1796
 msgid "Resubscribe"
-msgstr "Unsubscribe"
-
-#: src/protocols/zephyr/zephyr.c:1805
-#, fuzzy
+msgstr "Resubscribe"
+
+#: src/protocols/zephyr/zephyr.c:1799
 msgid "Retrieve subscriptions from server"
-msgstr "Invalid response from server."
+msgstr "Retrieve subscriptions from server"
 
 #. *< api_version
 #. *< type
@@ -10638,20 +10590,19 @@
 #. *< name
 #. *< version
 #. *  summary
-#. *  description
-#: src/protocols/zephyr/zephyr.c:1885 src/protocols/zephyr/zephyr.c:1887
+#: src/protocols/zephyr/zephyr.c:1879 src/protocols/zephyr/zephyr.c:1881
 msgid "Zephyr Protocol Plugin"
 msgstr "Zephyr Protocol Plugin"
 
+#: src/protocols/zephyr/zephyr.c:1900
+msgid "Export to .anyone"
+msgstr "Export to .anyone"
+
+#: src/protocols/zephyr/zephyr.c:1903
+msgid "Export to .zephyr.subs"
+msgstr "Export to .zephyr.subs"
+
 #: src/protocols/zephyr/zephyr.c:1906
-msgid "Export to .anyone"
-msgstr "Export to .anyone"
-
-#: src/protocols/zephyr/zephyr.c:1909
-msgid "Export to .zephyr.subs"
-msgstr "Export to .zephyr.subs"
-
-#: src/protocols/zephyr/zephyr.c:1912
 msgid "Exposure"
 msgstr "Exposure"
 
@@ -10814,11 +10765,10 @@
 msgstr "Unknown."
 
 #: src/util.c:2392
-#, fuzzy
 msgid "second"
 msgid_plural "seconds"
-msgstr[0] "Icon"
-msgstr[1] "Icon"
+msgstr[0] "second"
+msgstr[1] "seconds"
 
 #: src/util.c:2406
 msgid "day"
@@ -10854,33 +10804,3 @@
 msgid "Notification"
 msgstr "Notification"
 
-#~ msgid "Invalid Groupname"
-#~ msgstr "Invalid Groupname"
-
-#~ msgid "That file already exists."
-#~ msgstr "That file already exists."
-
-#~ msgid "Save As..."
-#~ msgstr "Save As..."
-
-#~ msgid "MSN ID"
-#~ msgstr "MSN ID"
-
-#~ msgid ""
-#~ "You missed %hu message from %s because the rate limit has been exceeded."
-#~ "You missed %hu messages from %s because the rate limit has been exceeded."
-#~ msgstr ""
-#~ "You missed %hu message from %s because the rate limit has been exceeded."
-#~ "You missed %hu messages from %s because the rate limit has been exceeded."
-
-#~ msgid "Modes"
-#~ msgstr "Modes"
-
-#~ msgid "User Count:\t\t%d\n"
-#~ msgstr "User Count:\t\t%d\n"
-
-#~ msgid "Hostname"
-#~ msgstr "Hostname"
-
-#~ msgid "Channels"
-#~ msgstr "Channels"
--- a/po/ja.po	Sun Jul 18 22:21:52 2004 +0000
+++ b/po/ja.po	Sun Jul 18 23:30:34 2004 +0000
@@ -8,10 +8,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gaim 0.79\n"
+"Project-Id-Version: gaim v0_80\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-07-16 00:15-0400\n"
-"PO-Revision-Date: 2004-06-26 00:55+0900\n"
+"POT-Creation-Date: 2004-07-18 22:06+0900\n"
+"PO-Revision-Date: 2004-07-18 22:05+0900\n"
 "Last-Translator: Takeshi AIHANA <aihana@gnome.gr.jp>\n"
 "Language-Team: Japanese <gnome-translation@gnome.gr.jp>\n"
 "MIME-Version: 1.0\n"
@@ -51,46 +51,41 @@
 msgstr "オフラインにされたら再接続します。"
 
 #: plugins/chkmail.c:90 plugins/chkmail.c:113 plugins/chkmail.c:122
-#, fuzzy
 msgid "Mail Server"
-msgstr "不正なサーバ名"
+msgstr "メール・サーバ"
 
 #: plugins/chkmail.c:132
 #, c-format
 msgid "%s (%d new/%d total)"
-msgstr ""
+msgstr "%s (新規 %d 通/合計 %d 通)"
 
 #: plugins/chkmail.c:195
-#, fuzzy
 msgid "Check Mail"
-msgstr "メールを開く(_O)"
+msgstr "メールのチェック"
 
 #: plugins/chkmail.c:199
 msgid "Check email every X seconds.\n"
-msgstr ""
+msgstr "X 秒間隔で E-メールをチェックします。\n"
 
 #: plugins/contact_priority.c:82
 msgid "Point values to use when..."
-msgstr ""
+msgstr "次の時に使用するポイント値..."
 
 #: plugins/contact_priority.c:91
-#, fuzzy
 msgid "Buddy is offline:"
-msgstr "仲間アイコン:"
+msgstr "仲間がオフラインの時:"
 
 #: plugins/contact_priority.c:105
-#, fuzzy
 msgid "Buddy is away:"
-msgstr "仲間の表示"
+msgstr "仲間が離席中の時:"
 
 #: plugins/contact_priority.c:119
-#, fuzzy
 msgid "Buddy is idle:"
-msgstr "仲間リスト・ウィンドウ"
+msgstr "仲間が待機中の時:"
 
 #: plugins/contact_priority.c:133
 msgid "Use last matching buddy"
-msgstr ""
+msgstr "最後に一致する仲間を使用する"
 
 #. Explanation
 #: plugins/contact_priority.c:139
@@ -101,10 +96,14 @@
 "will use what used to be the built-in order active->idle->away->away+idle-"
 ">offline."
 msgstr ""
+"一番低いスコアの仲間がコンタクトの優先度を持つことになります。\n"
+"デフォルト値 (オフライン時 = 4、離席中 = 2、待機中 = 1) は\n"
+"アクティブ->待機中->離席中->離席中+待機中->オフラインになるように使用されま"
+"す。"
 
 #: plugins/contact_priority.c:142
 msgid "Point values to use for Account..."
-msgstr ""
+msgstr "アカウントで使用するポイント値..."
 
 #. *< api_version
 #. *< type
@@ -115,7 +114,7 @@
 #. *< id
 #: plugins/contact_priority.c:191
 msgid "Contact Priority"
-msgstr ""
+msgstr "コンタクトの優先度"
 
 #. *< name
 #. *< version
@@ -123,7 +122,7 @@
 #: plugins/contact_priority.c:194
 msgid ""
 "Allows for controlling the values associated with different buddy states."
-msgstr ""
+msgstr "別の仲間の状態に対応する値をコントロールできます。"
 
 #. *< description
 #: plugins/contact_priority.c:196
@@ -131,6 +130,8 @@
 "Allows for changing the point values of idle/away/offline states for buddies "
 "in contact priority computations."
 msgstr ""
+"コンタクトの優先度計算で仲間の状態 (待機中/離席中/オフライン) のポイント値を"
+"変更することができます。"
 
 #.
 #. *  DEFINES, MACROS & DATA TYPES
@@ -255,12 +256,11 @@
 
 #: plugins/extplacement.c:101
 msgid "Number of conversations per window"
-msgstr "会話ウィンドウの数"
+msgstr "ウィンドウ毎の会話数"
 
 #: plugins/extplacement.c:107
-#, fuzzy
 msgid "Separate IM and Chat windows when placing by number"
-msgstr "IM とチャット・ウィンドウを分割する"
+msgstr "番号順に配置する際に IM とチャット・ウィンドウを分割する"
 
 #. *< api_version
 #. *< type
@@ -282,13 +282,12 @@
 #. *< summary
 #. *  description
 #: plugins/extplacement.c:130
-#, fuzzy
 msgid ""
 "Restrict the number of conversations per windows, optionally separating IMs "
 "and Chats"
 msgstr ""
-"ウィンドウあたりの会話数を制限するか、または IM とチャットのウィンドウを分割"
-"します"
+"ウィンドウあたりの会話数を制限し、追加で IM とチャットのウィンドウを分割しま"
+"す"
 
 #. *< api_version
 #. *< type
@@ -374,14 +373,14 @@
 #. *< id
 #: plugins/gaiminc.c:87
 msgid "Gaim Demonstration Plugin"
-msgstr ""
+msgstr "Gaim デモ・プラグイン"
 
 #. *< name
 #. *< version
 #. *  summary
 #: plugins/gaiminc.c:90
 msgid "An example plugin that does stuff - see the description."
-msgstr ""
+msgstr "いろいろなことを実行するサンプル・プラグインです (説明をご覧下さい)。"
 
 #. *  description
 #: plugins/gaiminc.c:92
@@ -391,6 +390,10 @@
 "- It reverses all incoming text\n"
 "- It sends a message to people on your list immediately when they sign on"
 msgstr ""
+"これはいろいろなことを実行する、ホントにクールなプラグインです:\n"
+"- ログインしたらプログラムの作者を伝えてくれます\n"
+"- 受信した全てのテキストを反転します\n"
+"- サイン・オンしたら仲間リストの人たちにメッセージを速攻で送信します"
 
 #. Configuration frame
 #: plugins/gestures/gestures.c:220
@@ -671,14 +674,14 @@
 #. *< id
 #: plugins/ipc-test-client.c:84
 msgid "IPC Test Client"
-msgstr ""
+msgstr "IPC テスト用クライアント"
 
 #. *< name
 #. *< version
 #. *  summary
 #: plugins/ipc-test-client.c:87
 msgid "Test plugin IPC support, as a client."
-msgstr ""
+msgstr "クライアント側で IPC をサポートするテスト用プラグインです。"
 
 #. *  description
 #: plugins/ipc-test-client.c:89
@@ -686,6 +689,8 @@
 "Test plugin IPC support, as a client. This locates the server plugin and "
 "calls the commands registered."
 msgstr ""
+"クライアント側で IPC をサポートするテスト用プラグインです。これはサーバ用プラ"
+"グインの場所を検出して登録されたコマンドを呼び出します。"
 
 #. *< api_version
 #. *< type
@@ -695,21 +700,22 @@
 #. *< priority
 #. *< id
 #: plugins/ipc-test-server.c:71
-#, fuzzy
 msgid "IPC Test Server"
-msgstr "サーバに接続する"
+msgstr "IPC テスト用サーバ"
 
 #. *< name
 #. *< version
 #. *  summary
 #: plugins/ipc-test-server.c:74
 msgid "Test plugin IPC support, as a server."
-msgstr ""
+msgstr "サーバ側で IPC をサポートするテスト用プラグインです。"
 
 #. *  description
 #: plugins/ipc-test-server.c:76
 msgid "Test plugin IPC support, as a server. This registers the IPC commands."
 msgstr ""
+"サーバ側で IPC をサポートするテスト用プラグインです。これは IPC コマンドを登"
+"録します。"
 
 #: plugins/mailchk.c:157
 msgid "Mail Checker"
@@ -1342,7 +1348,7 @@
 
 #: src/about.c:170
 msgid "Danish"
-msgstr "オランダ語"
+msgstr "デンマーク語"
 
 #: src/about.c:171
 msgid "British English"
@@ -1390,7 +1396,7 @@
 
 #: src/about.c:182
 msgid "Lithuanian"
-msgstr ""
+msgstr "リトアニア語"
 
 #: src/about.c:183 src/about.c:215
 msgid "Korean"
@@ -1445,9 +1451,8 @@
 msgstr "ベトナム語"
 
 #: src/about.c:195
-#, fuzzy
 msgid "and the Gnome-Vi Team"
-msgstr "GNOME Vi チーム"
+msgstr "そして Gnome-Vi チーム"
 
 #: src/about.c:196
 msgid "Simplified Chinese"
@@ -1882,7 +1887,7 @@
 #: src/dialogs.c:837
 #, c-format
 msgid "Enter an alias for %s."
-msgstr "%s のパスワードを入力して下さい。"
+msgstr "%s のエイリアスを入力して下さい。"
 
 #: src/dialogs.c:839
 msgid "Alias Buddy"
@@ -2260,9 +2265,8 @@
 msgstr "IM(_M)"
 
 #: src/gtkblist.c:1141
-#, fuzzy
 msgid "_Send File"
-msgstr "ファイルの送信"
+msgstr "ファイルの送信(_S)"
 
 #: src/gtkblist.c:1145
 msgid "Add Buddy _Pounce"
@@ -2802,9 +2806,8 @@
 msgstr "メッセージ(_M):"
 
 #: src/gtkconv.c:799 src/gtkconv.c:2489 src/gtkdebug.c:182
-#, fuzzy
 msgid "Unable to open file."
-msgstr "ファイル %s を読み込めません。"
+msgstr "ファイルを開けません。"
 
 #: src/gtkconv.c:804
 #, c-format
@@ -2851,9 +2854,8 @@
 msgstr "離席メッセージの取得"
 
 #: src/gtkconv.c:2497
-#, fuzzy
 msgid "Unable to save icon file to disk."
-msgstr "アイコン・ファイルをディスクに保存できません。"
+msgstr "アイコン・ファイルを保存できません。"
 
 #: src/gtkconv.c:2514
 msgid "Save Icon"
@@ -2910,9 +2912,8 @@
 msgstr "/会話/クリア"
 
 #: src/gtkconv.c:3466
-#, fuzzy
 msgid "/Conversation/Se_nd File..."
-msgstr "/会話/検索(_F)..."
+msgstr "/会話/ファイルの送信(_N)..."
 
 #: src/gtkconv.c:3467
 msgid "/Conversation/Add Buddy _Pounce..."
@@ -2984,9 +2985,8 @@
 msgstr "/会話/ログの表示"
 
 #: src/gtkconv.c:3551
-#, fuzzy
 msgid "/Conversation/Send File..."
-msgstr "/会話/招待..."
+msgstr "/会話/ファイルの送信..."
 
 #: src/gtkconv.c:3555
 msgid "/Conversation/Add Buddy Pounce..."
@@ -3070,9 +3070,8 @@
 msgstr "ユーザからの会話を拒否します"
 
 #: src/gtkconv.c:3669
-#, fuzzy
 msgid "Send a file to the user"
-msgstr "モバイル・メッセージを送信します。"
+msgstr "ファイルをユーザへ送信します"
 
 #: src/gtkconv.c:3676
 msgid "Add the user to your buddy list"
@@ -3511,7 +3510,7 @@
 #. Create the "Pounce Who" frame.
 #: src/gtkpounce.c:405
 msgid "Pounce Who"
-msgstr "つかむ相手は?"
+msgstr "つかむ相手"
 
 #: src/gtkpounce.c:432
 msgid "_Buddy name:"
@@ -3520,7 +3519,7 @@
 #. Create the "Pounce When" frame.
 #: src/gtkpounce.c:456
 msgid "Pounce When"
-msgstr "いつつかむか?"
+msgstr "つかむ時期"
 
 #: src/gtkpounce.c:464 src/main.c:296
 msgid "_Sign on"
@@ -3528,11 +3527,11 @@
 
 #: src/gtkpounce.c:466
 msgid "Sign _off"
-msgstr "サイン・オフ(_O)"
+msgstr "サイン・オフした時(_O)"
 
 #: src/gtkpounce.c:468
 msgid "A_way"
-msgstr "離席(_W)"
+msgstr "離席した時(_W)"
 
 #: src/gtkpounce.c:470
 msgid "Re_turn from away"
@@ -3540,7 +3539,7 @@
 
 #: src/gtkpounce.c:472
 msgid "_Idle"
-msgstr "待機中(_I)"
+msgstr "待機中の時(_I)"
 
 #: src/gtkpounce.c:474
 msgid "Retur_n from idle"
@@ -3557,7 +3556,7 @@
 #. Create the "Pounce Action" frame.
 #: src/gtkpounce.c:507
 msgid "Pounce Action"
-msgstr "つかんだらどうするか?"
+msgstr "つかんだ時のアクション"
 
 #: src/gtkpounce.c:515
 msgid "Op_en an IM window"
@@ -3675,7 +3674,7 @@
 
 #: src/gtkprefs.c:819
 msgid "Show _timestamp on messages"
-msgstr "メッセージにタイムスタンプを表示する(_T)"
+msgstr "メッセージにタイムスタンプを挿入する(_T)"
 
 #: src/gtkprefs.c:822
 msgid "_Highlight misspelled words"
@@ -3751,11 +3750,11 @@
 
 #: src/gtkprefs.c:941
 msgid "Buddy List Sorting"
-msgstr "仲間リストのソート"
+msgstr "仲間リストの並び替え"
 
 #: src/gtkprefs.c:950
 msgid "_Sorting:"
-msgstr "ソート(_S):"
+msgstr "並び替え(_S):"
 
 #: src/gtkprefs.c:956 src/gtkprefs.c:1009
 msgid "Show _buttons as:"
@@ -3763,15 +3762,15 @@
 
 #: src/gtkprefs.c:958 src/gtkprefs.c:1011
 msgid "Pictures"
-msgstr "画像"
+msgstr "アイコン"
 
 #: src/gtkprefs.c:959 src/gtkprefs.c:1012
 msgid "Text"
-msgstr "テキスト"
+msgstr "ラベル"
 
 #: src/gtkprefs.c:960 src/gtkprefs.c:1013
 msgid "Pictures and text"
-msgstr "画像とテキスト"
+msgstr "アイコンとラベル"
 
 #: src/gtkprefs.c:963
 msgid "_Raise window on events"
@@ -3913,7 +3912,7 @@
 
 #: src/gtkprefs.c:1301
 msgid "Epiphany"
-msgstr ""
+msgstr "Epiphany"
 
 #: src/gtkprefs.c:1302
 msgid "Firebird"
@@ -4034,11 +4033,11 @@
 
 #: src/gtkprefs.c:1648
 msgid "Sounds when conversation has _focus"
-msgstr "会話ウィンドウがフォーカスされたらサウンドを鳴らす(_F)"
+msgstr "会話ウィンドウがフォーカスされたらサウンドを演奏する(_F)"
 
 #: src/gtkprefs.c:1650
 msgid "_Sounds while away"
-msgstr "離席している間もサウンドを鳴らす(_S)"
+msgstr "離席している間もサウンドを演奏する(_S)"
 
 #: src/gtkprefs.c:1654
 msgid "Sound Method"
@@ -4075,7 +4074,7 @@
 
 #: src/gtkprefs.c:1752
 msgid "Play"
-msgstr "有効"
+msgstr "演奏"
 
 #: src/gtkprefs.c:1759
 msgid "Event"
@@ -4107,7 +4106,7 @@
 
 #: src/gtkprefs.c:1816
 msgid "_Only send auto-response when idle"
-msgstr "待機中の際にのみ自動的に応答する(_O)"
+msgstr "待機中のみ自動的に応答する(_O)"
 
 #: src/gtkprefs.c:1819 src/protocols/msn/msn.c:1179
 #: src/protocols/msn/state.c:32 src/protocols/novell/novell.c:2730
@@ -4142,7 +4141,7 @@
 
 #: src/gtkprefs.c:1841
 msgid "_Minutes before setting away:"
-msgstr "離席状態になるまでの時間(秒)(M):"
+msgstr "離席状態になるまでの時間(分)(M):"
 
 #: src/gtkprefs.c:1849
 msgid "Away m_essage:"
@@ -4353,14 +4352,12 @@
 msgstr "上書きしてもよろしいですか?"
 
 #: src/gtkrequest.c:1430 src/gtkrequest.c:1451
-#, fuzzy
 msgid "Save File..."
-msgstr "ファイルの送信"
+msgstr "ファイルの保存..."
 
 #: src/gtkrequest.c:1431 src/gtkrequest.c:1452
-#, fuzzy
 msgid "Open File..."
-msgstr "ファイルの送信"
+msgstr "ファイルを開く..."
 
 #: src/gtkroomlist.c:330
 msgid "Room List"
@@ -4911,14 +4908,13 @@
 msgstr "Gadu-Gadu プロトコルのプラグイン"
 
 #: src/protocols/icq/gaim_icq.c:224
-#, fuzzy
 msgid "Gaim encountered an error communicating with the ICQ server."
-msgstr "サーバと通信する際にエラーが発生しました"
+msgstr "ICQ サーバと通信する際にエラーを受け取りました。"
 
 #: src/protocols/icq/gaim_icq.c:294
-#, fuzzy, c-format
+#, c-format
 msgid "The user %s (%s%s%s%s%s) wants you to authorize them."
-msgstr "ユーザ %s (%s) が %s を仲間リストに追加したがっています。"
+msgstr "ユーザ %s (%s%s%s%s%s) が彼らの認証を要求しています。"
 
 #: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:232
 #: src/protocols/msn/userlist.c:100 src/protocols/oscar/oscar.c:3555
@@ -4933,22 +4929,18 @@
 msgstr "拒否する"
 
 #: src/protocols/icq/gaim_icq.c:310
-#, fuzzy
 msgid "Send message through server"
-msgstr "選択した仲間にメッセージを送信します"
+msgstr "メッセージをサーバを介して送信します"
 
 #: src/protocols/icq/gaim_icq.c:352
-#, fuzzy
 msgid "Connecting..."
-msgstr "接続中"
+msgstr "接続中..."
 
 #: src/protocols/icq/gaim_icq.c:498
-#, fuzzy
 msgid "Nick:"
-msgstr "あだ名"
+msgstr "あだ名:"
 
 #: src/protocols/icq/gaim_icq.c:499
-#, fuzzy
 msgid "Gaim User"
 msgstr "Gaim を使う"
 
@@ -4997,9 +4989,8 @@
 msgstr "%s の MOTD"
 
 #: src/protocols/irc/irc.c:93 src/protocols/irc/irc.c:373
-#, fuzzy
 msgid "Server has disconnected"
-msgstr "切断されました"
+msgstr "サーバが切断しました"
 
 #: src/protocols/irc/irc.c:147
 msgid "View MOTD"
@@ -5245,19 +5236,23 @@
 
 #: src/protocols/irc/parse.c:109
 msgid "action &lt;action to perform&gt;:  Perform an action."
-msgstr "action &lt;実行するアクション&gt;:  アクションを実行します"
+msgstr "action &lt;実行するアクション&gt;:  アクションを実行します。"
 
 #: src/protocols/irc/parse.c:110
 msgid ""
 "away [message]:  Set an away message, or use no message to return from being "
 "away."
 msgstr ""
+"away [メッセージ]:  離席中のメッセージをセットする、または離席中から戻ったこ"
+"とを示すためにセットしたメッセージを解除します。"
 
 #: src/protocols/irc/parse.c:111
 msgid ""
 "deop &lt;nick1&gt; [nick2] ...:  Remove channel operator status from "
 "someone. You must be a channel operator to do this."
 msgstr ""
+"deop &lt;あだ名1&gt; [あだ名2] ...:  チャンネル操作権を剥奪します (これを行"
+"うには、自分自身がチャンネル操作権を持っていなければなりません)。"
 
 #: src/protocols/irc/parse.c:112
 msgid ""
@@ -5265,128 +5260,163 @@
 "someone, preventing them from speaking if the channel is moderated (+m). You "
 "must be a channel operator to do this."
 msgstr ""
+"devoice &lt;あだ名1&gt; [あだ名2] ...:  チャンネル発言権を剥奪し、チャンネ"
+"ルがモデレート (+m) した時に発言しないようにします (これを行うには、自分自身"
+"がチャンネル操作権を持っていなければなりません)。"
 
 #: src/protocols/irc/parse.c:113
 msgid ""
 "invite &lt;nick&gt; [room]:  Invite someone to join you in the specified "
 "channel, or the current channel."
 msgstr ""
+"invite &lt;あだ名&gt; [部屋]:  指定したチャンネル、または現在のチャンネルに招"
+"待します。"
 
 #: src/protocols/irc/parse.c:114
 msgid ""
 "j &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
 "channels, optionally providing a channel key for each if needed."
 msgstr ""
+"j &lt;部屋1&gt;[,部屋2][,...] [キー1[,キー2][,...]]:  一つ以上のチャンネ"
+"ルを指定すると、必要に応じて、追加でそれぞれのチャンネル・キーを提供します。"
 
 #: src/protocols/irc/parse.c:115
 msgid ""
 "join &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
 "channels, optionally providing a channel key for each if needed."
 msgstr ""
+"join &lt;部屋1&gt;[,部屋2][,...] [キー1[,キー2][,...]]:  一つ以上のチャン"
+"ネルを指定すると、必要に応じて、追加でそれぞれのチャンネル・キーを提供しま"
+"す。"
 
 #: src/protocols/irc/parse.c:116
 msgid ""
 "kick &lt;nick&gt; [message]:  Remove someone from a channel. You must be a "
 "channel operator to do this."
 msgstr ""
+"kick &lt;あだ名&gt; [メッセージ]:  チャンネルから追い出します (これを行うに"
+"は、自分自身がチャンネル操作権を持っていなければなりません)。"
 
 #: src/protocols/irc/parse.c:117
 msgid ""
 "list:  Display a list of chat rooms on the network. <i>Warning, some servers "
 "may disconnect you upon doing this.</i>"
 msgstr ""
+"list:  ネットワーク上のチャット部屋を一覧表示します。<i>【注意】これを行うと"
+"接続を切断するサーバがいくつかあります。</i>"
 
 #: src/protocols/irc/parse.c:118
 msgid "me &lt;action to perform&gt;:  Perform an action."
-msgstr ""
+msgstr "me &lt;実行するアクション&gt;:  指定したアクションを実行します。"
 
 #: src/protocols/irc/parse.c:119
 msgid ""
 "mode &lt;nick|channel&gt; &lt;+|-&gt;&lt;A-Za-z&gt;:  Set or unset a channel "
 "or user mode."
 msgstr ""
+"mode &lt;あだ名|チャンネル&gt; &lt;+|-&gt;&lt;A-Za-z&gt;:  チャンネルまたは"
+"ユーザ・モードを設定または解除します。"
 
 #: src/protocols/irc/parse.c:120
 msgid ""
 "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
 "opposed to a channel)."
 msgstr ""
+"msg &lt;あだ名&gt; &lt;メッセージ&gt;:  あるユーザへ (チャンネルとは別に) 個"
+"人的なメッセージを送信します。"
 
 #: src/protocols/irc/parse.c:121
 msgid "names [channel]:  List the users currently in a channel."
-msgstr ""
+msgstr "names [チャンネル]:  チャンネルに現在いるユーザを一覧表示します。"
 
 #: src/protocols/irc/parse.c:122 src/protocols/jabber/jabber.c:1407
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
-msgstr ""
+msgstr "nick &lt;新しいあだ名&gt;:  あだ名を変更します。"
 
 #: src/protocols/irc/parse.c:123
 msgid ""
 "op &lt;nick1&gt; [nick2] ...:  Grant channel operator status to someone. You "
 "must be a channel operator to do this."
 msgstr ""
+"op &lt;あだ名1&gt; [あだ名2] ...:  チャンネル操作権を与えます (これを行うに"
+"は、自分自身がチャンネル操作権を持っていなければなりません)。"
 
 #: src/protocols/irc/parse.c:124
 msgid ""
 "operwall &lt;message&gt;:  If you don't know what this is, you probably "
 "can't use it."
 msgstr ""
+"operwall &lt;メッセージ&gt;:  (このコマンドが何を行うか知らない場合は、おそら"
+"く使うことは無いでしょう:)"
 
 #: src/protocols/irc/parse.c:125
 msgid ""
 "part [room] [message]:  Leave the current channel, or a specified channel, "
 "with an optional message."
 msgstr ""
+"part [部屋] [メッセージ]:  現在のチャンネルまたは指定したチャンネルからメッ"
+"セージを残して退出します。"
 
 #: src/protocols/irc/parse.c:126
 msgid ""
 "ping [nick]:  Asks how much lag a user (or the server if no user specified) "
 "has."
 msgstr ""
+"ping [あだ名]:  ユーザ (または、ユーザが指定されない場合はサーバ) とどれくら"
+"いズレがあるか問い合わせます。"
 
 #: src/protocols/irc/parse.c:127
 msgid ""
 "query &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
 "opposed to a channel)."
 msgstr ""
+"query &lt;あだ名&gt; &lt;メッセージ&gt;:  あるユーザへ (チャンネルとは別に) "
+"個人的なメッセージを送信します。"
 
 #: src/protocols/irc/parse.c:128
 msgid "quit [message]:  Disconnect from the server, with an optional message."
-msgstr ""
+msgstr "quit [メッセージ]:  メッセージを残してサーバとの接続を切断します。"
 
 #: src/protocols/irc/parse.c:129
 msgid "quote [...]:  Send a raw command to the server."
-msgstr ""
+msgstr "quote [...]:  サーバへ低レベル・コマンドを送信します。"
 
 #: src/protocols/irc/parse.c:130
 msgid ""
 "remove &lt;nick&gt; [message]:  Remove someone from a room. You must be a "
 "channel operator to do this."
 msgstr ""
+"remove &lt;あだ名&gt; [メッセージ]:  部屋からあだ名の人を追い出します (これを"
+"行うには、自分自身がチャンネル操作権を持っていなければなりません)。"
 
 #: src/protocols/irc/parse.c:131
 msgid "topic [new topic]:  View or change the channel topic."
-msgstr ""
+msgstr "topic [新しいトピック]:  チャンネル・トピックを表示したり変更します。"
 
 #: src/protocols/irc/parse.c:132
 msgid "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Set or unset a user mode."
 msgstr ""
+"umode &lt;+|-&gt;&lt;A-Za-z&gt;:  ユーザ・モードを設定または解除します。"
 
 #: src/protocols/irc/parse.c:133
 msgid ""
 "voice &lt;nick1&gt; [nick2] ...:  Grant channel voice status to someone. You "
 "must be a channel operator to do this."
 msgstr ""
+"voice &lt;あだ名1&gt; [あだ名2] ...:  チャンネル・ボイス権を与えます (これ"
+"を行うには、自分自身がチャンネル操作権を持っていなければなりません)。"
 
 #: src/protocols/irc/parse.c:134
 msgid ""
 "wallops &lt;message&gt;:  If you don't know what this is, you probably can't "
 "use it."
 msgstr ""
+"wallops &lt;メッセージ&gt;:  (このコマンドが何を行うか知らない場合は、おそら"
+"く使うことは無いでしょう:)"
 
 #: src/protocols/irc/parse.c:135
 msgid "whois &lt;nick&gt;:  Get information on a user."
-msgstr ""
+msgstr "whois &lt;あだ名&gt;:  ユーザ情報を取得します。"
 
 #: src/protocols/irc/parse.c:228 src/protocols/zephyr/zephyr.c:256
 msgid ""
@@ -6089,52 +6119,58 @@
 msgstr "ユーザ %s を ban できません"
 
 #: src/protocols/jabber/jabber.c:1376
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to kick user %s"
-msgstr "ユーザ (%s) を招待できません。"
+msgstr "ユーザ %s を kick できません"
 
 #: src/protocols/jabber/jabber.c:1401
-#, fuzzy
 msgid "config:  Configure a chat room."
-msgstr "チャット・ルームに参加します"
+msgstr "config:  チャット・ルームを設定します。"
 
 #: src/protocols/jabber/jabber.c:1404
-#, fuzzy
 msgid "configure:  Configure a chat room."
-msgstr "チャット・ルームに参加します"
+msgstr "configure:  チャット・ルームを設定します。"
 
 #: src/protocols/jabber/jabber.c:1411
 msgid "part [room]:  Leave the room."
-msgstr ""
+msgstr "part [部屋]:  部屋から退出します。"
 
 #: src/protocols/jabber/jabber.c:1414
 msgid "register:  Register with a chat room."
-msgstr ""
+msgstr "register:  チャット・ルームを登録します。"
 
 #: src/protocols/jabber/jabber.c:1419
 msgid "topic [new topic]:  View or change the topic."
-msgstr ""
+msgstr "topic [新しいトピック]:  トピックを表示したり変更します。"
 
 #: src/protocols/jabber/jabber.c:1423
 msgid "ban &lt;user&gt; [room]:  Ban a user from the room."
 msgstr ""
+"ban &lt;ユーザ&gt; [ルーム]:  指定したチャット・ルームからユーザを追い出しま"
+"す。"
 
 #: src/protocols/jabber/jabber.c:1427
 msgid "invite &lt;user&gt; [room]:  Invite a user to the room."
 msgstr ""
+"invite &lt;ユーザ&gt; [ルーム]:  指定したユーザをチャット・ルームへ招待しま"
+"す。"
 
 #: src/protocols/jabber/jabber.c:1431
 msgid "join: &lt;room&gt; [server]:  Join a chat on this server."
-msgstr ""
+msgstr "join: &lt;ルーム&gt; [サーバ]:  指定したサーバのチャットへ参加します。"
 
 #: src/protocols/jabber/jabber.c:1435
 msgid "kick &lt;user&gt; [room]:  Kick a user from the room."
 msgstr ""
+"kick &lt;ユーザ&gt; [ルーム]:  指定したユーザをチャット・ルームから追い出しま"
+"す。"
 
 #: src/protocols/jabber/jabber.c:1439
 msgid ""
 "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
 msgstr ""
+"msg &lt;ユーザ&gt; &lt;メッセージ&gt;:  他のユーザへ個人的なメッセージを送信"
+"します。"
 
 #: src/protocols/jabber/jabber.c:1453
 msgid "Hide Operating System"
@@ -6153,7 +6189,7 @@
 #. *  description
 #: src/protocols/jabber/jabber.c:1537 src/protocols/jabber/jabber.c:1539
 msgid "Jabber Protocol Plugin"
-msgstr "Jabberプロトコル・プラグイン"
+msgstr "Jabber プロトコル・プラグイン"
 
 #: src/protocols/jabber/jabber.c:1565
 msgid "Use TLS if available"
@@ -6170,7 +6206,7 @@
 #. Account options
 #: src/protocols/jabber/jabber.c:1584 src/protocols/silc/silc.c:1572
 msgid "Connect server"
-msgstr "サーバに接続する"
+msgstr "サーバへ接続"
 
 #: src/protocols/jabber/message.c:111
 #, c-format
@@ -6216,15 +6252,15 @@
 
 #: src/protocols/jabber/presence.c:280 src/protocols/jabber/presence.c:281
 msgid "Create New Room"
-msgstr "新しいチャットルームの生成"
+msgstr "新しいチャット・ルームの生成"
 
 #: src/protocols/jabber/presence.c:282
 msgid ""
 "You are creating a new room.  Would you like to configure it, or accept the "
 "default settings?"
 msgstr ""
-"新しいチャットルームを生成します。チャットルームの設定を行いますか? それとも"
-"デフォルト値を適用しますか?"
+"新しいチャット・ルームを生成します。チャット・ルームの設定を行いますか? それ"
+"ともデフォルト値を適用しますか?"
 
 #: src/protocols/jabber/presence.c:284
 msgid "Configure Room"
@@ -6256,17 +6292,15 @@
 
 #: src/protocols/msn/cmdproc.c:336
 msgid "Miscellaneous error"
-msgstr ""
+msgstr "その他のエラー"
 
 #: src/protocols/msn/cmdproc.c:338
-#, fuzzy
 msgid "You have signed on from another location."
-msgstr "別の場所からサイン・オンしたので、切断されています。"
+msgstr "別の場所からサイン・オンしています。"
 
 #: src/protocols/msn/cmdproc.c:340
-#, fuzzy
 msgid "The MSN servers are going down temporarily."
-msgstr "MSN サーバが一時的にダウンしているので、切断されています。"
+msgstr "MSN サーバが一時的にダウンしています。"
 
 #: src/protocols/msn/error.c:35
 msgid "Unable to parse message"
@@ -6634,32 +6668,28 @@
 #. put a link to the actual profile URL
 #: src/protocols/msn/msn.c:1172 src/protocols/msn/msn.c:1512
 #: src/protocols/yahoo/yahoo_profile.c:1168 src/util.c:792
-#, fuzzy, c-format
+#, c-format
 msgid "<b>%s:</b> "
-msgstr ""
-"\n"
-"<b>%s:</b> %s"
+msgstr "<b>%s:</b> "
 
 #: src/protocols/msn/msn.c:1173
 #, c-format
 msgid "<font sml=\"msn\">%s</font><br>"
-msgstr ""
+msgstr "<font sml=\"msn\">%s</font><br>"
 
 #: src/protocols/msn/msn.c:1179 src/protocols/yahoo/yahoo_profile.c:664
-#, fuzzy, c-format
+#, c-format
 msgid "<b>%s:</b> %s<br>"
-msgstr "<b>ユーザ:</b> %s<br>"
+msgstr "<b>%s:</b> %s<br>"
 
 #: src/protocols/msn/msn.c:1242
-#, fuzzy
 msgid "MSN Profile"
-msgstr "プロフィールの設定"
+msgstr "MSN プロフィール"
 
 #: src/protocols/msn/msn.c:1247 src/protocols/msn/msn.c:1499
 #: src/protocols/yahoo/yahoo_profile.c:761
-#, fuzzy
 msgid "Error retrieving profile"
-msgstr "部屋一覧取得のエラー"
+msgstr "プロフィール取得のエラー"
 
 #. Age
 #: src/protocols/msn/msn.c:1318 src/protocols/oscar/oscar.c:4888
@@ -6677,7 +6707,7 @@
 
 #: src/protocols/msn/msn.c:1334 src/protocols/yahoo/yahoo_profile.c:1020
 msgid "Marital Status"
-msgstr "既婚者かどうか"
+msgstr "既婚/未婚"
 
 #: src/protocols/msn/msn.c:1341 src/protocols/yahoo/yahoo_profile.c:1010
 msgid "Location"
@@ -6720,7 +6750,7 @@
 
 #: src/protocols/msn/msn.c:1501
 msgid "The user has not created a public profile."
-msgstr ""
+msgstr "このユーザはプロフィールを公開していません。"
 
 #: src/protocols/msn/msn.c:1502
 msgid ""
@@ -6728,17 +6758,21 @@
 "that the user does not exist, or that the user exists but has not created a "
 "public profile."
 msgstr ""
+"そのユーザのプロフィールが見つからないと MSN が報告してきました。これは、その"
+"ユーザが存在しないか、あるいはユーザは存在するが、プロフィールは公開していな"
+"いかのどちらかです。"
 
 #: src/protocols/msn/msn.c:1506
 msgid ""
 "Gaim could not find any information in the user's profile. The user most "
 "likely does not exist."
 msgstr ""
+"Gaim はユーザのプロフィールから情報を取得できませんでした。そのユーザはおそら"
+"く存在していないと思われます。"
 
 #: src/protocols/msn/msn.c:1512 src/protocols/yahoo/yahoo_profile.c:1168
-#, fuzzy
 msgid "Profile URL"
-msgstr "プロフィール"
+msgstr "プロフィールの URL"
 
 #: src/protocols/msn/msn.c:1643
 msgid "Display conversation closed notices"
@@ -6831,12 +6865,12 @@
 #: src/protocols/msn/servconn.c:50
 #, c-format
 msgid "Error writing to %s server"
-msgstr "サーバ %s へ書き込む際にエラーが発生しました"
+msgstr "サーバ %s へ書き込む際にエラー"
 
 #: src/protocols/msn/servconn.c:54
-#, fuzzy, c-format
+#, c-format
 msgid "Error reading from %s server"
-msgstr "サーバ %s へ書き込む際にエラーが発生しました"
+msgstr "サーバ %s から読み込む際にエラー"
 
 #: src/protocols/msn/servconn.c:58
 #, c-format
@@ -6846,7 +6880,7 @@
 #: src/protocols/msn/servconn.c:72
 #, c-format
 msgid "MSN error for account %s"
-msgstr ""
+msgstr "アカウント %s の MSN エラー"
 
 #: src/protocols/msn/servconn.c:346
 msgid "Received HTTP error. Please report this."
@@ -6867,9 +6901,9 @@
 msgstr "ユーザ %s (%s) が %s を仲間リストに追加したがっています。"
 
 #: src/protocols/msn/userlist.c:94
-#, fuzzy, c-format
+#, c-format
 msgid "The user %s wants to add %s to his or her buddy list."
-msgstr "ユーザ %s (%s) が %s を仲間リストに追加したがっています。"
+msgstr "ユーザ %s が %s を仲間リストに追加したがっています。"
 
 #: src/protocols/napster/napster.c:230
 msgid "Unable to read header from server"
@@ -7384,13 +7418,12 @@
 msgstr "AOL 中にはできません"
 
 #: src/protocols/oscar/oscar.c:403
-#, fuzzy
 msgid ""
 "(There was an error converting this message.  The buddy you are speaking to "
 "most likely has a buggy client.)"
 msgstr ""
-"(このメッセージを変換する際にエラーが発生しました。アカウント・エディタの 'エ"
-"ンコード' オプションを確認して下さい)"
+"(このメッセージを変換する際にエラーが発生しました。会話している仲間は buggy "
+"なクライアントを持っているようです。)"
 
 #: src/protocols/oscar/oscar.c:441
 msgid "Voice"
@@ -7557,7 +7590,7 @@
 #: src/protocols/oscar/oscar.c:1442 src/protocols/toc/toc.c:872
 #, c-format
 msgid "You have been disconnected from chat room %s."
-msgstr "チャットルーム %s から切断されました"
+msgstr "チャット・ルーム %s から切断されました"
 
 #: src/protocols/oscar/oscar.c:1458
 msgid "Chat is currently unavailable"
@@ -7860,9 +7893,9 @@
 "原因不明ですが、%2$s からの %1$hu 個のメッセージを受け取れませんでした。"
 
 #: src/protocols/oscar/oscar.c:3815 src/protocols/oscar/oscar.c:4039
-#, fuzzy, c-format
+#, c-format
 msgid "Info for %s"
-msgstr "%s の ICQ 情報"
+msgstr "%s の情報"
 
 #: src/protocols/oscar/oscar.c:3881
 #, c-format
@@ -8462,42 +8495,41 @@
 #: src/protocols/silc/buddy.c:114 src/protocols/silc/buddy.c:118
 #: src/protocols/silc/buddy.c:123 src/protocols/silc/buddy.c:128
 #: src/protocols/silc/buddy.c:133 src/protocols/silc/buddy.c:251
-#, fuzzy
 msgid "Key Agreement"
-msgstr "テキストの置換"
+msgstr "キーの同意"
 
 #: src/protocols/silc/buddy.c:53
 msgid "Cannot perform the key agreement"
-msgstr ""
+msgstr "キーの同意を実行できません"
 
 #: src/protocols/silc/buddy.c:110
 msgid "Error occurred during key agreement"
-msgstr ""
+msgstr "キーに同意する際にエラーが発生しました"
 
 #: src/protocols/silc/buddy.c:114
 msgid "Key Agreement failed"
-msgstr ""
+msgstr "キーの同意に失敗しました"
 
 #: src/protocols/silc/buddy.c:119
 msgid "Timeout during key agreement"
-msgstr ""
+msgstr "キーに同意する際にタイムアウトしました"
 
 #: src/protocols/silc/buddy.c:124
 msgid "Key agreement was aborted"
-msgstr ""
+msgstr "キーの同意が中断されました"
 
 #: src/protocols/silc/buddy.c:129
 msgid "Key agreement is already started"
-msgstr ""
+msgstr "既にキーの同意を開始しています"
 
 #: src/protocols/silc/buddy.c:134
 msgid "Key agreement cannot be started with yourself"
-msgstr ""
+msgstr "キーの同意を自分自身では開始できません"
 
 #: src/protocols/silc/buddy.c:252 src/protocols/silc/buddy.c:382
 #: src/protocols/silc/buddy.c:507
 msgid "The remote user is not present in the network any more"
-msgstr ""
+msgstr "リモート・ユーザはネットワーク等に存在しません"
 
 #: src/protocols/silc/buddy.c:288
 #, c-format
@@ -8505,81 +8537,79 @@
 "Key agreement request received from %s. Would you like to perform the key "
 "agreement?"
 msgstr ""
+"キーの同意要求を %s から受け取りました。キーの同意を実行してもよろしいです"
+"か?"
 
 #: src/protocols/silc/buddy.c:292
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "The remote user is waiting key agreement on:\n"
 "Remote host: %s\n"
 "Remote port: %d"
 msgstr ""
-"次のサイトからファイルのダウンロードが可能です:\n"
+"リモート・ユーザがキーの同意を要求しています:\n"
 "リモート・ホスト: %s\n"
 "リモート・ポート: %d"
 
 #: src/protocols/silc/buddy.c:305
 msgid "Key Agreement Request"
-msgstr ""
+msgstr "キーの同意の要求"
 
 #: src/protocols/silc/buddy.c:381 src/protocols/silc/buddy.c:416
 #: src/protocols/silc/buddy.c:458
-#, fuzzy
 msgid "IM With Password"
-msgstr "パスワード"
+msgstr "パスワード付き IM"
 
 #: src/protocols/silc/buddy.c:417
 msgid "Cannot set IM key"
-msgstr ""
+msgstr "IM キーをセットできません"
 
 #: src/protocols/silc/buddy.c:459
-#, fuzzy
 msgid "Set IM Password"
-msgstr "パスワード"
+msgstr "IM パスワードのセット"
 
 #: src/protocols/silc/buddy.c:506 src/protocols/silc/buddy.c:541
 #: src/protocols/silc/ops.c:1256 src/protocols/silc/ops.c:1267
 msgid "Get Public Key"
-msgstr ""
+msgstr "公開鍵の取得"
 
 #: src/protocols/silc/buddy.c:542 src/protocols/silc/ops.c:1257
 #: src/protocols/silc/ops.c:1268
-#, fuzzy
 msgid "Cannot fetch the public key"
-msgstr "ニックネームを変更できません"
+msgstr "公開鍵を取得できません"
 
 #: src/protocols/silc/buddy.c:629 src/protocols/silc/buddy.c:1544
 msgid "Show Public Key"
-msgstr ""
+msgstr "公開鍵の表示"
 
 #: src/protocols/silc/buddy.c:630 src/protocols/silc/buddy.c:989
 #: src/protocols/silc/chat.c:222
-#, fuzzy
 msgid "Could not load public key"
-msgstr "ニックネームを変更できませんでした"
+msgstr "公開鍵を読み込めませんでした"
 
 #: src/protocols/silc/buddy.c:707 src/protocols/silc/ops.c:853
 #: src/protocols/silc/ops.c:925 src/protocols/silc/ops.c:1060
 #: src/protocols/silc/ops.c:1061 src/protocols/silc/ops.c:1079
-#, fuzzy
 msgid "User Information"
-msgstr "情報"
+msgstr "ユーザ情報"
 
 #: src/protocols/silc/buddy.c:708 src/protocols/silc/ops.c:926
 #: src/protocols/silc/ops.c:1080
-#, fuzzy
 msgid "Cannot get user information"
-msgstr "%s のユーザ情報の変更"
+msgstr "ユーザ情報を取得できません"
 
 #: src/protocols/silc/buddy.c:729
 #, c-format
 msgid "The %s buddy is not trusted"
-msgstr ""
+msgstr "仲間 %s は信用されていません"
 
 #: src/protocols/silc/buddy.c:732
 msgid ""
 "You cannot receive buddy notifications until you import his/her public key.  "
 "You can use the Get Public Key command to get the public key."
 msgstr ""
+"仲間の公開鍵を取り込むまで仲間通知を受け取ることはできません。公開鍵を取得す"
+"る際は、ボタン [公開鍵を取得する...] をクリックして下さい。"
 
 #. Open file selector to select the public key.
 #: src/protocols/silc/buddy.c:1023
@@ -8589,264 +8619,248 @@
 #: src/protocols/silc/buddy.c:1032
 #, c-format
 msgid "The %s buddy is not present in the network"
-msgstr ""
+msgstr "仲間 %s はネットワーク上に存在しません"
 
 #: src/protocols/silc/buddy.c:1035
 msgid ""
 "To add the buddy you must import his/her public key. Press Import to import "
 "a public key."
 msgstr ""
+"仲間を追加するには公開鍵を取り込まなければなりません。公開鍵を取り込む際は、"
+"ボタン [インポートする...] をクリックして下さい。"
 
 #: src/protocols/silc/buddy.c:1038
 msgid "Import..."
-msgstr ""
+msgstr "インポートする..."
 
 #: src/protocols/silc/buddy.c:1125
-#, fuzzy
 msgid "Select correct user"
-msgstr "問い合わせる会議サーバの選択"
+msgstr "妥当なユーザの選択"
 
 #: src/protocols/silc/buddy.c:1127
 msgid ""
 "More than one user was found with the same public key. Select the correct "
 "user from the list to add to the buddy list."
 msgstr ""
+"同じ公開鍵を持ったユーザが一人以上います。仲間リストへ追加する妥当なユーザを"
+"一覧から選択して下さい。"
 
 #: src/protocols/silc/buddy.c:1129
 msgid ""
 "More than one user was found with the same name. Select the correct user "
 "from the list to add to the buddy list."
 msgstr ""
+"同じ名前を持ったユーザが一人以上います。仲間リストへ追加する妥当なユーザを一"
+"覧から選択して下さい。"
 
 #: src/protocols/silc/buddy.c:1377
 msgid "Detached"
-msgstr ""
+msgstr "切り離し済"
 
 #: src/protocols/silc/buddy.c:1381 src/protocols/silc/silc.c:48
 #: src/protocols/silc/silc.c:80
 msgid "Indisposed"
-msgstr ""
+msgstr "不適済"
 
 #: src/protocols/silc/buddy.c:1385 src/protocols/silc/silc.c:49
 #: src/protocols/silc/silc.c:82
 msgid "Wake Me Up"
-msgstr ""
+msgstr "起こして下さい"
 
 #: src/protocols/silc/buddy.c:1387 src/protocols/silc/silc.c:45
 #: src/protocols/silc/silc.c:74
-#, fuzzy
 msgid "Hyper Active"
-msgstr "有効"
+msgstr "ハイパー・アクティブ"
 
 #: src/protocols/silc/buddy.c:1389
 msgid "Robot"
-msgstr ""
+msgstr "ロボット"
 
 #: src/protocols/silc/buddy.c:1396 src/protocols/silc/silc.c:610
 #: src/protocols/silc/util.c:469
-#, fuzzy
 msgid "Happy"
-msgstr "適用"
+msgstr "ハッピー"
 
 #: src/protocols/silc/buddy.c:1398 src/protocols/silc/silc.c:612
 #: src/protocols/silc/util.c:471
 msgid "Sad"
-msgstr ""
+msgstr "悲しむ"
 
 #: src/protocols/silc/buddy.c:1400 src/protocols/silc/silc.c:614
 #: src/protocols/silc/util.c:473
 msgid "Angry"
-msgstr ""
+msgstr "怒る"
 
 #: src/protocols/silc/buddy.c:1402 src/protocols/silc/silc.c:616
 #: src/protocols/silc/util.c:475
 msgid "Jealous"
-msgstr ""
+msgstr "やきもち"
 
 #: src/protocols/silc/buddy.c:1404 src/protocols/silc/silc.c:618
 #: src/protocols/silc/util.c:477
 msgid "Ashamed"
-msgstr ""
+msgstr "恥じる"
 
 #: src/protocols/silc/buddy.c:1406 src/protocols/silc/silc.c:620
 #: src/protocols/silc/util.c:479
-#, fuzzy
 msgid "Invincible"
-msgstr "隠れる"
+msgstr "無敵"
 
 #: src/protocols/silc/buddy.c:1408 src/protocols/silc/silc.c:622
 #: src/protocols/silc/util.c:481
-#, fuzzy
 msgid "In Love"
-msgstr "無視する"
+msgstr "恋愛中"
 
 #: src/protocols/silc/buddy.c:1410 src/protocols/silc/silc.c:624
 #: src/protocols/silc/util.c:483
 msgid "Sleepy"
-msgstr ""
+msgstr "眠いよ"
 
 #: src/protocols/silc/buddy.c:1412 src/protocols/silc/silc.c:626
 #: src/protocols/silc/util.c:485
-#, fuzzy
 msgid "Bored"
-msgstr "太字にします"
+msgstr "うんざり"
 
 #: src/protocols/silc/buddy.c:1414 src/protocols/silc/silc.c:628
 #: src/protocols/silc/util.c:487
 msgid "Excited"
-msgstr ""
+msgstr "興奮"
 
 #: src/protocols/silc/buddy.c:1416 src/protocols/silc/silc.c:630
 #: src/protocols/silc/util.c:489
 msgid "Anxious"
-msgstr ""
+msgstr "心配"
 
 #: src/protocols/silc/buddy.c:1448 src/protocols/silc/ops.c:962
-#, fuzzy
 msgid "User Modes"
-msgstr "ユーザ ID"
+msgstr "ユーザ・モード"
 
 #: src/protocols/silc/buddy.c:1457 src/protocols/silc/ops.c:971
 msgid "Mood"
-msgstr ""
+msgstr "不機嫌"
 
 #: src/protocols/silc/buddy.c:1461 src/protocols/silc/ops.c:977
-#, fuzzy
 msgid "Status Text"
-msgstr "状態"
+msgstr "ステータス文"
 
 #: src/protocols/silc/buddy.c:1466 src/protocols/silc/ops.c:983
-#, fuzzy
 msgid "Preferred Contact"
-msgstr "コンタクトの削除"
+msgstr "お好みの連絡先"
 
 #: src/protocols/silc/buddy.c:1471 src/protocols/silc/ops.c:988
-#, fuzzy
 msgid "Preferred Language"
-msgstr "設定"
+msgstr "お好みの言語"
 
 #: src/protocols/silc/buddy.c:1476 src/protocols/silc/ops.c:993
-#, fuzzy
 msgid "Device"
-msgstr "拒否する"
+msgstr "デバイス"
 
 #: src/protocols/silc/buddy.c:1481 src/protocols/silc/ops.c:998
 #: src/protocols/silc/silc.c:678 src/protocols/silc/silc.c:680
-#, fuzzy
 msgid "Timezone"
-msgstr "時間"
+msgstr "タイムゾーン"
 
 #: src/protocols/silc/buddy.c:1486 src/protocols/silc/ops.c:1003
-#, fuzzy
 msgid "Geolocation"
-msgstr "場所"
+msgstr "地理的位置"
 
 #: src/protocols/silc/buddy.c:1529
 msgid "Reset IM Key"
-msgstr ""
+msgstr "IM キーのリセット"
 
 #: src/protocols/silc/buddy.c:1534
 msgid "IM with Key Exchange"
-msgstr ""
+msgstr "キー交換付き IM"
 
 #: src/protocols/silc/buddy.c:1538
-#, fuzzy
 msgid "IM with Password"
-msgstr "パスワード"
+msgstr "パスワード付き IM"
 
 #: src/protocols/silc/buddy.c:1549
 msgid "Get Public Key..."
-msgstr ""
+msgstr "公開鍵を取得する..."
 
 #: src/protocols/silc/buddy.c:1555 src/protocols/silc/ops.c:1389
-#, fuzzy
 msgid "Kill User"
-msgstr "ユーザの拒否"
+msgstr "ユーザの強制終了"
 
 #: src/protocols/silc/chat.c:37
-#, fuzzy
 msgid "_Passphrase:"
-msgstr "パスワード(_P):"
+msgstr "パスフレーズ(_P):"
 
 #: src/protocols/silc/chat.c:66
 #, c-format
 msgid "Channel %s does not exist in the network"
-msgstr ""
+msgstr "チャンネル %s はネットワーク上に存在しません"
 
 #: src/protocols/silc/chat.c:67 src/protocols/silc/chat.c:159
-#, fuzzy
 msgid "Channel Information"
-msgstr "情報"
+msgstr "チャンネル情報"
 
 #: src/protocols/silc/chat.c:68
-#, fuzzy
 msgid "Cannot get channel information"
-msgstr "%s のユーザ情報の変更"
+msgstr "チャンネル情報を取得できません"
 
 #: src/protocols/silc/chat.c:105
-#, fuzzy, c-format
+#, c-format
 msgid "<b>Channel Name:</b> %s"
-msgstr "離席メッセージ"
+msgstr "<b>チャンネル名:</b> %s"
 
 #: src/protocols/silc/chat.c:108
-#, fuzzy, c-format
+#, c-format
 msgid "<br><b>User Count:</b> %d"
-msgstr "<b>ユーザ:</b> %s<br>"
+msgstr "<br><b>ユーザのカウント:</b> %d"
 
 #: src/protocols/silc/chat.c:115
 #, c-format
 msgid "<br><b>Channel Founder:</b> %s"
-msgstr ""
+msgstr "<br><b>チャンネル設立者:</b> %s"
 
 #: src/protocols/silc/chat.c:124
-#, fuzzy, c-format
+#, c-format
 msgid "<br><b>Channel Cipher:</b> %s"
-msgstr "パスワードの変更"
+msgstr "<br><b>チャンネル符号:</b> %s"
 
 #: src/protocols/silc/chat.c:127
-#, fuzzy, c-format
+#, c-format
 msgid "<br><b>Channel HMAC:</b> %s"
-msgstr "チャンネル(_C):"
+msgstr "<br><b>チャンネル HMAC:</b> %s"
 
 #: src/protocols/silc/chat.c:132
-#, fuzzy, c-format
+#, c-format
 msgid "<br><b>Channel Topic:</b><br>%s"
-msgstr ""
-"<b>変更履歴:</b>\n"
-"%s<br><br>"
+msgstr "<br><b>チャンネル・トピック:</b><br>%s"
 
 #: src/protocols/silc/chat.c:137
-#, fuzzy
 msgid "<br><b>Channel Modes:</b> "
-msgstr "離席メッセージ"
+msgstr "<br><b>チャンネル・モード:</b> "
 
 #: src/protocols/silc/chat.c:150
 #, c-format
 msgid "<br><b>Founder Key Fingerprint:</b><br>%s"
-msgstr ""
+msgstr "<br><b>創立者キーの指紋:</b><br>%s"
 
 #: src/protocols/silc/chat.c:151
 #, c-format
 msgid "<br><b>Founder Key Babbleprint:</b><br>%s"
-msgstr ""
+msgstr "<br><b>創立者キーの Babbleprint:</b><br>%s"
 
 #: src/protocols/silc/chat.c:221
 msgid "Add Channel Public Key"
-msgstr ""
+msgstr "チャンネル公開鍵の追加"
 
 #. Add new public key
 #: src/protocols/silc/chat.c:276
 msgid "Open Public Key..."
-msgstr ""
+msgstr "公開鍵を開く..."
 
 #: src/protocols/silc/chat.c:385
-#, fuzzy
 msgid "Channel Passphrase"
-msgstr "パスワードの変更"
+msgstr "チャンネルのパスフレーズ"
 
 #: src/protocols/silc/chat.c:392
 msgid "Channel Public Keys List"
-msgstr ""
+msgstr "チャンネル公開鍵の一覧"
 
 #: src/protocols/silc/chat.c:397
 msgid ""
@@ -8856,355 +8870,320 @@
 "channel public keys are set then only users whose public keys are listed are "
 "able to join."
 msgstr ""
+"チャンネル認証は認証されていないアクセスからチャンネルを保護するために使用し"
+"ます。その認証方式はパスフレーズと電子署名をベースにしています。パスフレーズ"
+"がセットされていると参加するためのパスフレーズが要求され、チャンネルの公開鍵"
+"がセットされていると、公開鍵が一覧表示されているユーザのみ参加可能です。"
 
 #: src/protocols/silc/chat.c:406 src/protocols/silc/chat.c:407
 #: src/protocols/silc/chat.c:444 src/protocols/silc/chat.c:445
 #: src/protocols/silc/chat.c:874
-#, fuzzy
 msgid "Channel Authentication"
-msgstr "プレーンテキスト認証"
+msgstr "チャンネル認証"
 
 #: src/protocols/silc/chat.c:408 src/protocols/silc/chat.c:446
-#, fuzzy
 msgid "Add / Remove"
-msgstr "削除"
+msgstr "追加 / 削除"
 
 #: src/protocols/silc/chat.c:563
-#, fuzzy
 msgid "Group Name"
-msgstr "新しいグループ名"
+msgstr "グループ名"
 
 #: src/protocols/silc/chat.c:567 src/protocols/silc/ops.c:1669
-#, fuzzy
 msgid "Passphrase"
-msgstr "パスワードの送信中"
+msgstr "パスフレーズ"
 
 #: src/protocols/silc/chat.c:578
-#, fuzzy, c-format
+#, c-format
 msgid "Please enter the %s channel private group name and passphrase."
-msgstr "追加するグループの名前を入力して下さい。"
+msgstr ""
+"チャンネル %s のプライベートなグループ名とパフフレーズを入力して下さい。"
 
 #: src/protocols/silc/chat.c:580
 msgid "Add Channel Private Group"
-msgstr ""
+msgstr "プライベートなグループの追加"
 
 #: src/protocols/silc/chat.c:707
-#, fuzzy
 msgid "User Limit"
-msgstr "許可する"
+msgstr "ユーザの制限"
 
 #: src/protocols/silc/chat.c:708
 msgid "Set user limit on channel. Set to zero to reset user limit."
 msgstr ""
+"チャンネルで制限するユーザをセットして下さい (0: ユーザ制限をクリアします)。"
 
 #: src/protocols/silc/chat.c:850
 msgid "Get Info"
-msgstr "情報取得"
+msgstr "情報の取得"
 
 #: src/protocols/silc/chat.c:857
-#, fuzzy
 msgid "Invite List"
-msgstr "招待"
+msgstr "招待リスト"
 
 #: src/protocols/silc/chat.c:861
-#, fuzzy
 msgid "Ban List"
-msgstr "仲間リスト"
+msgstr "追い出しリスト"
 
 #: src/protocols/silc/chat.c:868
-#, fuzzy
 msgid "Add Private Group"
-msgstr "グループの追加"
+msgstr "プライベート・グループの追加"
 
 #: src/protocols/silc/chat.c:879
 msgid "Reset Permanent"
-msgstr ""
+msgstr "永続性 OFF"
 
 #: src/protocols/silc/chat.c:883
 msgid "Set Permanent"
-msgstr ""
+msgstr "永続性 ON"
 
 #: src/protocols/silc/chat.c:890
-#, fuzzy
 msgid "Set User Limit"
-msgstr "ユーザ情報のセット"
+msgstr "ユーザ制限 ON"
 
 #: src/protocols/silc/chat.c:895
-#, fuzzy
 msgid "Reset Topic Restriction"
-msgstr "リリース通知"
+msgstr "トピック限定 OFF"
 
 #: src/protocols/silc/chat.c:899
 msgid "Set Topic Restriction"
-msgstr ""
+msgstr "トピック限定 ON"
 
 #: src/protocols/silc/chat.c:905
 msgid "Reset Private Channel"
-msgstr ""
+msgstr "プライベートなチャンネル OFF"
 
 #: src/protocols/silc/chat.c:909
 msgid "Set Private Channel"
-msgstr ""
+msgstr "プライベートなチャンネル ON"
 
 #: src/protocols/silc/chat.c:915
 msgid "Reset Secret Channel"
-msgstr ""
+msgstr "シークレットなチャンネル OFF"
 
 #: src/protocols/silc/chat.c:919
 msgid "Set Secret Channel"
-msgstr ""
+msgstr "シークレットなチャンネル ON"
 
 #: src/protocols/silc/chat.c:989
-#, fuzzy, c-format
+#, c-format
 msgid "You are channel founder on <I>%s</I>"
-msgstr "あなたは %s に締め出されました。"
+msgstr "あなたは <I>%s</I> のチャンネル創設者です"
 
 #: src/protocols/silc/chat.c:993
 #, c-format
 msgid "Channel founder on <I>%s</I> is <I>%s</I>"
-msgstr ""
+msgstr "<I>%s</I> のチャンネル創設者は <I>%s</I> です"
 
 #: src/protocols/silc/chat.c:1046
 #, c-format
 msgid ""
 "You have to join the %s channel before you are able to join the private group"
-msgstr ""
+msgstr "プライベートなグループへ参加する前にチャンネル %s へ参加して下さい"
 
 #: src/protocols/silc/chat.c:1048
-#, fuzzy
 msgid "Join Private Group"
-msgstr "グループ名の変更"
+msgstr "プライベート・グループへ参加"
 
 #: src/protocols/silc/chat.c:1049
-#, fuzzy
 msgid "Cannot join private group"
-msgstr "グループ 0 は削除できません"
+msgstr "プライベート・グループへ参加できません"
 
 #: src/protocols/silc/chat.c:1242 src/protocols/silc/silc.c:888
 msgid "Cannot call command"
-msgstr ""
+msgstr "コマンドを呼び出せません"
 
 #: src/protocols/silc/chat.c:1243 src/protocols/silc/silc.c:889
-#, fuzzy
 msgid "Unknown command"
-msgstr "不明なコマンド: %s"
+msgstr "不明なコマンド"
 
 #: src/protocols/silc/ft.c:89 src/protocols/silc/ft.c:92
 #: src/protocols/silc/ft.c:96 src/protocols/silc/ft.c:100
 #: src/protocols/silc/ft.c:104 src/protocols/silc/ft.c:206
 #: src/protocols/silc/ft.c:211 src/protocols/silc/ft.c:216
 #: src/protocols/silc/ft.c:222 src/protocols/silc/ft.c:342
-#, fuzzy
 msgid "Secure File Transfer"
-msgstr "ファイルの転送"
+msgstr "セキュアなファイル転送"
 
 #: src/protocols/silc/ft.c:90 src/protocols/silc/ft.c:93
 #: src/protocols/silc/ft.c:97 src/protocols/silc/ft.c:101
 #: src/protocols/silc/ft.c:105
 msgid "Error during file transfer"
-msgstr ""
+msgstr "ファイルを転送する際にエラー"
 
 #: src/protocols/silc/ft.c:94
 msgid "Permission denied"
-msgstr ""
+msgstr "権限がありません"
 
 #: src/protocols/silc/ft.c:98
 msgid "Key agreement failed"
-msgstr ""
+msgstr "キーの同意に失敗しました"
 
 #: src/protocols/silc/ft.c:102
-#, fuzzy
 msgid "File transfer sessions does not exist"
-msgstr "ユーザがいません"
+msgstr "ファイル転送セッションがありません"
 
 #: src/protocols/silc/ft.c:207
-#, fuzzy
 msgid "No file transfer session active"
-msgstr "ファイル転送のホスト"
+msgstr "ファイル転送セッションがアクティブではありません"
 
 #: src/protocols/silc/ft.c:212
-#, fuzzy
 msgid "File transfer already started"
-msgstr "%s からのファイル転送が中断されました。\n"
+msgstr "既にファイル転送を開始しています"
 
 #: src/protocols/silc/ft.c:217
-#, fuzzy
 msgid "Could not perform key agreement for file transfer"
-msgstr "転送できませんでした!"
+msgstr "ファイル転送に必要なキーの同意を実行できませんでした"
 
 #: src/protocols/silc/ft.c:223
-#, fuzzy
 msgid "Could not start the file transfer"
-msgstr "転送できませんでした!"
+msgstr "ファイル転送を開始できませんでした"
 
 #: src/protocols/silc/ft.c:343
-#, fuzzy
 msgid "Cannot send file"
-msgstr "0 バイトのファイルは送信できません。"
+msgstr "ファイルを送信できません"
 
 #: src/protocols/silc/ops.c:333 src/protocols/silc/ops.c:342
 #: src/protocols/silc/ops.c:351
-#, fuzzy, c-format
+#, c-format
 msgid "%s has changed the topic of <I>%s</I> to: %s"
-msgstr "%s はトピックを変更しました: %s"
+msgstr "%s は <I>%s</I> のトピックを %s へ変更しました:"
 
 #: src/protocols/silc/ops.c:413
 #, c-format
 msgid "<I>%s</I> set channel <I>%s</I> modes to: %s"
-msgstr ""
+msgstr "<I>%s</I> はチャンネル <I>%s</I> のモードを %s へセットしました:"
 
 #: src/protocols/silc/ops.c:417
 #, c-format
 msgid "<I>%s</I> removed all channel <I>%s</I> modes"
-msgstr ""
+msgstr "<I>%s</I> はチャンネル <I>%s</I> の全てのモードを削除しました:"
 
 #: src/protocols/silc/ops.c:448
 #, c-format
 msgid "<I>%s</I> set <I>%s's</I> modes to: %s"
-msgstr ""
+msgstr "<I>%s</I> は <I>%s の</I> モードを %s へセットしました:"
 
 #: src/protocols/silc/ops.c:452
 #, c-format
 msgid "<I>%s</I> removed all <I>%s's</I> modes"
-msgstr ""
+msgstr "<I>%s</I> は <I>%s の</I> 全てのモードを削除しました:"
 
 #: src/protocols/silc/ops.c:479
-#, fuzzy, c-format
+#, c-format
 msgid "You have been kicked off <I>%s</I> by <I>%s</I> (%s)"
-msgstr "あなたは %s に蹴られました: (%s)"
+msgstr "あなたは <I>%s</I> から <I>%s</I> (%s) によって追い出されました:"
 
 #: src/protocols/silc/ops.c:509 src/protocols/silc/ops.c:514
 #: src/protocols/silc/ops.c:519
-#, fuzzy, c-format
+#, c-format
 msgid "You have been killed by %s (%s)"
-msgstr "あなたは %s に蹴られました: (%s)"
+msgstr "あなたは %s (%s) によって強制終了させられました:"
 
 #: src/protocols/silc/ops.c:540 src/protocols/silc/ops.c:545
 #: src/protocols/silc/ops.c:550
-#, fuzzy, c-format
+#, c-format
 msgid "Killed by %s (%s)"
-msgstr "%s (%s) に蹴られました"
+msgstr "%s (%s) によって強制終了させられました"
 
 #: src/protocols/silc/ops.c:596
-#, fuzzy
 msgid "Server signoff"
-msgstr "サイン・オフ"
+msgstr "サーバのサインオフ"
 
 #: src/protocols/silc/ops.c:783
-#, fuzzy
 msgid "Personal Information"
-msgstr "プロファイル情報"
+msgstr "個人情報"
 
 #: src/protocols/silc/ops.c:806
-#, fuzzy
 msgid "Birth Day"
 msgstr "誕生日"
 
 #: src/protocols/silc/ops.c:810
-#, fuzzy
 msgid "Job Title"
 msgstr "肩書"
 
 #: src/protocols/silc/ops.c:814
-#, fuzzy
 msgid "Job Role"
 msgstr "役職"
 
 #: src/protocols/silc/ops.c:818
-#, fuzzy
 msgid "Organization"
 msgstr "担当部署"
 
 #: src/protocols/silc/ops.c:822
-#, fuzzy
 msgid "Unit"
-msgstr "招待"
+msgstr "グループ"
 
 #: src/protocols/silc/ops.c:841
-#, fuzzy
 msgid "EMail"
 msgstr "E-メール"
 
 #: src/protocols/silc/ops.c:846
-#, fuzzy
 msgid "Note"
-msgstr "なし"
+msgstr "備考"
 
 #: src/protocols/silc/ops.c:894
-#, fuzzy
 msgid "Join Chat"
 msgstr "チャットに参加"
 
 #: src/protocols/silc/ops.c:1050 src/protocols/silc/ops.c:1120
 msgid "Public Key Fingerprint"
-msgstr ""
+msgstr "公開鍵の指紋"
 
 #: src/protocols/silc/ops.c:1051 src/protocols/silc/ops.c:1121
 msgid "Public Key Babbleprint"
-msgstr ""
+msgstr "公開鍵の Babbleprint"
 
 #: src/protocols/silc/ops.c:1064
-#, fuzzy
 msgid "More..."
-msgstr "選択..."
+msgstr "詳細..."
 
 #: src/protocols/silc/ops.c:1135 src/protocols/silc/silc.c:777
-#, fuzzy
 msgid "Detach From Server"
-msgstr "プロキシ・サーバ"
+msgstr "サーバから切り離し"
 
 #: src/protocols/silc/ops.c:1135
 msgid "Cannot detach"
-msgstr ""
+msgstr "切り離せません"
 
 #: src/protocols/silc/ops.c:1146
-#, fuzzy
 msgid "Cannot set topic"
-msgstr "ニックネームを変更できません"
+msgstr "トピックをセットできません"
 
 #: src/protocols/silc/ops.c:1184
-#, fuzzy
 msgid "Failed to change nickname"
-msgstr "ニックネームを変更できませんでした"
+msgstr "あだ名の変更に失敗しました"
 
 #: src/protocols/silc/ops.c:1221
-#, fuzzy
 msgid "Roomlist"
-msgstr "部屋の一覧"
+msgstr "部屋のリスト"
 
 #: src/protocols/silc/ops.c:1221
-#, fuzzy
 msgid "Cannot get room list"
-msgstr "部屋一覧を取得できません"
+msgstr "部屋のリストを取得できません"
 
 #: src/protocols/silc/ops.c:1269
 msgid "No public key was received"
-msgstr ""
+msgstr "公開鍵を受け取っていません"
 
 #: src/protocols/silc/ops.c:1282 src/protocols/silc/ops.c:1296
-#, fuzzy
 msgid "Server Information"
-msgstr "職業"
+msgstr "サーバの情報"
 
 #: src/protocols/silc/ops.c:1283
-#, fuzzy
 msgid "Cannot get server information"
-msgstr "%s のユーザ情報の変更"
+msgstr "サーバの情報を取得できません"
 
 #: src/protocols/silc/ops.c:1314 src/protocols/silc/ops.c:1323
-#, fuzzy
 msgid "Server Statistics"
-msgstr "サーバのアドレス"
+msgstr "サーバの統計情報"
 
 #: src/protocols/silc/ops.c:1315
-#, fuzzy
 msgid "Cannot get server statistics"
-msgstr "%s のユーザ情報の変更"
+msgstr "サーバの統計情報を取得できません"
 
 #: src/protocols/silc/ops.c:1324
-#, fuzzy
 msgid "No server statisitics available"
-msgstr "利用可能なアクションはありません"
+msgstr "利用可能な統計情報はありません"
 
 #: src/protocols/silc/ops.c:1346
 #, c-format
@@ -9225,111 +9204,118 @@
 "Total server operators: %d\n"
 "Total router operators: %d\n"
 msgstr ""
+"ローカルのサーバ起動時刻: %s\n"
+"ローカルのサーバ起動時間: %s\n"
+"ローカルのサーバのクライアント数: %d\n"
+"ローカルのサーバのチャンネル数: %d\n"
+"ローカルのサーバのオペレータ数: %d\n"
+"ローカルのルータのオペレータ数: %d\n"
+"ローカルのセルのクライアント数: %d\n"
+"ローカルのセルのチャンネル数: %d\n"
+"ローカルのセルのサーバ数: %d\n"
+"クライアント数の合計: %d\n"
+"チャンネル数の合計: %d\n"
+"サーバ数の合計: %d\n"
+"ルータ数の合計: %d\n"
+"サーバのオペレータ数の合計: %d\n"
+"ルータのオペレータ数の合計: %d\n"
 
 #: src/protocols/silc/ops.c:1369
 msgid "Network Statistics"
-msgstr ""
+msgstr "ネットワークの統計情報"
 
 #: src/protocols/silc/ops.c:1377 src/protocols/silc/ops.c:1382
-#, fuzzy
 msgid "Ping"
-msgstr "ログの記録"
+msgstr "Ping"
 
 #: src/protocols/silc/ops.c:1377
-#, fuzzy
 msgid "Ping failed"
-msgstr "接続に失敗"
+msgstr "Ping に失敗"
 
 #: src/protocols/silc/ops.c:1382
-#, fuzzy
 msgid "Ping reply received from server"
-msgstr "サーバからの不正な challenge です"
+msgstr "サーバから Ping リプライを受け取りました"
 
 #: src/protocols/silc/ops.c:1390
-#, fuzzy
 msgid "Could not kill user"
-msgstr "送信できませんでした"
+msgstr "ユーザを強制終了できませんでした"
 
 #: src/protocols/silc/ops.c:1471
-#, fuzzy
 msgid "Error during connecting to SILC Server"
-msgstr "接続を開始する際にエラー"
+msgstr "SILC サーバへ接続する際にエラー"
 
 #: src/protocols/silc/ops.c:1476
 msgid "Key Exchange failed"
-msgstr ""
+msgstr "キーの交換に失敗しました"
 
 #: src/protocols/silc/ops.c:1485
 msgid ""
 "Resuming detached session failed. Press Reconnect to create new connection."
 msgstr ""
+"切り離したセッションの復帰に失敗しました。新しい接続を確立する際は、ボタン "
+"[再接続] をクリックして下さい。"
 
 #: src/protocols/silc/ops.c:1520
-#, fuzzy
 msgid "Disconnected by server"
-msgstr "サーバに接続する"
+msgstr "サーバが接続を切断しました"
 
 #: src/protocols/silc/ops.c:1580 src/protocols/silc/ops.c:1627
 #: src/protocols/silc/silc.c:167
-#, fuzzy
 msgid "Resuming session"
-msgstr "セッションが多すぎです"
+msgstr "セッションの復帰中"
 
 #: src/protocols/silc/ops.c:1582
-#, fuzzy
 msgid "Authenticating connection"
-msgstr "認証中"
+msgstr "接続の認証中"
 
 #: src/protocols/silc/ops.c:1629
-#, fuzzy
 msgid "Verifying server public key"
-msgstr "サーバ・キーの読み込み中"
+msgstr "サーバの公開鍵の検証中"
 
 #: src/protocols/silc/ops.c:1670
-#, fuzzy
 msgid "Passphrase required"
-msgstr "有料です"
+msgstr "パスフレーズの要求"
 
 #: src/protocols/silc/ops.c:1699
 msgid "Failure: Version mismatch, upgrade your client"
-msgstr ""
+msgstr "失敗: バージョン不整合、クライアントをアップグレードして下さい"
 
 #: src/protocols/silc/ops.c:1702
 msgid "Failure: Remote does not trust/support your public key"
 msgstr ""
+"失敗: リモート側は信用されていなか、お使いの公開鍵をサポートしていません"
 
 #: src/protocols/silc/ops.c:1705
 msgid "Failure: Remote does not support proposed KE group"
-msgstr ""
+msgstr "失敗: リモート側は推奨されている KE グループをサポートしていません"
 
 #: src/protocols/silc/ops.c:1708
 msgid "Failure: Remote does not support proposed cipher"
-msgstr ""
+msgstr "失敗: リモート側は推奨されている Cipher をサポートしていません"
 
 #: src/protocols/silc/ops.c:1711
 msgid "Failure: Remote does not support proposed PKCS"
-msgstr ""
+msgstr "失敗: リモート側は推奨されている PKCS をサポートしていません"
 
 #: src/protocols/silc/ops.c:1714
 msgid "Failure: Remote does not support proposed hash function"
-msgstr ""
+msgstr "失敗: リモート側は推奨されているハッシュ機能をサポートしていません"
 
 #: src/protocols/silc/ops.c:1717
 msgid "Failure: Remote does not support proposed HMAC"
-msgstr ""
+msgstr "失敗: リモート側は推奨されている HMAC をサポートしていません"
 
 #: src/protocols/silc/ops.c:1719
 msgid "Failure: Incorrect signature"
-msgstr ""
+msgstr "失敗: 不正な署名です"
 
 #: src/protocols/silc/ops.c:1721
 msgid "Failure: Invalid cookie"
-msgstr ""
+msgstr "失敗: 不正なクッキーです"
 
 #: src/protocols/silc/ops.c:1732
-#, fuzzy
 msgid "Failure: Authentication failed"
-msgstr "認証に失敗しました"
+msgstr "失敗: 認証に失敗しました"
 
 #: src/protocols/silc/pk.c:103
 #, c-format
@@ -9337,11 +9323,13 @@
 "Received %s's public key. Your local copy does not match this key. Would you "
 "still like to accept this public key?"
 msgstr ""
+"%s の公開鍵を受け取りましたが、ローカルの複製と一致しません。この受け取った公"
+"開鍵をまだ受け入れますか?"
 
 #: src/protocols/silc/pk.c:108
 #, c-format
 msgid "Received %s's public key. Would you like to accept this public key?"
-msgstr ""
+msgstr "%s の公開鍵を受け取りました。この受け取った公開鍵を受け入れますか?"
 
 #: src/protocols/silc/pk.c:112
 #, c-format
@@ -9351,99 +9339,95 @@
 "%s\n"
 "%s\n"
 msgstr ""
+"%s 鍵の指紋と Babbleprint は次のとおりです:\n"
+"\n"
+"%s\n"
+"%s\n"
 
 #: src/protocols/silc/pk.c:115 src/protocols/silc/pk.c:139
 msgid "Verify Public Key"
-msgstr ""
+msgstr "公開鍵の検証"
 
 #: src/protocols/silc/pk.c:118
-#, fuzzy
 msgid "View..."
-msgstr "新規..."
+msgstr "表示..."
 
 #: src/protocols/silc/pk.c:140
-#, fuzzy
 msgid "Unsupported public key type"
-msgstr "サポートしていない Stanza 型"
+msgstr "サポートしていない公開鍵の種類"
 
 #: src/protocols/silc/silc.c:133
-#, fuzzy
 msgid "Connection failed"
 msgstr "接続に失敗"
 
 #: src/protocols/silc/silc.c:159
-#, fuzzy
 msgid "Cannot initialize SILC Client connection"
-msgstr "接続の最終調整中"
+msgstr "SILC クライアント接続を初期化できません"
 
 #: src/protocols/silc/silc.c:170
 msgid "Performing key exchange"
-msgstr ""
+msgstr "鍵の交換の実行中"
 
 #: src/protocols/silc/silc.c:242
 msgid "Out of memory"
-msgstr ""
+msgstr "メモリが足りません"
 
 #. Progress
 #: src/protocols/silc/silc.c:276
-#, fuzzy
 msgid "Connecting to SILC Server"
-msgstr "サーバに接続する"
+msgstr "SILC サーバへ接続中"
 
 #: src/protocols/silc/silc.c:606
-#, fuzzy
 msgid "Your Current Mood"
-msgstr "現在は ON"
+msgstr "現在の Mood"
 
 #: src/protocols/silc/silc.c:608
 msgid "Normal"
-msgstr ""
+msgstr "標準"
 
 #: src/protocols/silc/silc.c:633
 msgid ""
 "\n"
 "Your Preferred Contact Methods"
 msgstr ""
+"\n"
+"お好みの連絡方法"
 
 #: src/protocols/silc/silc.c:641 src/protocols/silc/util.c:514
-#, fuzzy
 msgid "SMS"
-msgstr "MSN"
+msgstr "SMS"
 
 #: src/protocols/silc/silc.c:643 src/protocols/silc/util.c:516
-#, fuzzy
 msgid "MMS"
-msgstr "MSN"
+msgstr "MMS"
 
 #: src/protocols/silc/silc.c:645 src/protocols/silc/util.c:518
-#, fuzzy
 msgid "Video Conferencing"
-msgstr "会議に招待"
+msgstr "ビデオ会議"
 
 #: src/protocols/silc/silc.c:650
 msgid "Your Current Status"
-msgstr ""
+msgstr "現在のステータス"
 
 #: src/protocols/silc/silc.c:657
-#, fuzzy
 msgid "Online Services"
-msgstr "オンラインの期間"
+msgstr "オンライン・サービス"
 
 #: src/protocols/silc/silc.c:660
 msgid "Let others see what services you are using"
-msgstr ""
+msgstr "何のサービスが利用されているか他の人たちに公開して下さい"
 
 #: src/protocols/silc/silc.c:666
 msgid "Let others see what computer you are using"
-msgstr ""
+msgstr "どんなコンピュータを利用しているか他の人たちに公開して下さい"
 
 #: src/protocols/silc/silc.c:673
 msgid "Your VCard File"
-msgstr ""
+msgstr "VCard 型式ファイル"
 
 #: src/protocols/silc/silc.c:686 src/protocols/silc/silc.c:687
 msgid "User Online Status Attributes"
-msgstr ""
+msgstr "ユーザのオンライン・ステータスの属性"
 
 #: src/protocols/silc/silc.c:688
 msgid ""
@@ -9451,237 +9435,247 @@
 "information. Please fill the information you would like other users to see "
 "about yourself."
 msgstr ""
+"あなたのオンライン・ステータス情報と個人情報を他のユーザへ公開することが可能"
+"です。他のユーザに公開したい情報を全て入力して下さい。"
 
 #: src/protocols/silc/silc.c:728 src/protocols/silc/silc.c:734
 #: src/protocols/silc/silc.c:1135
-#, fuzzy
 msgid "Message of the Day"
-msgstr "%s からのメッセージ"
+msgstr "今日のメッセージ"
 
 #: src/protocols/silc/silc.c:728
-#, fuzzy
 msgid "No Message of the Day available"
-msgstr "MOTD を利用できません"
+msgstr "\"今日のメッセージ\" は利用できません"
 
 #: src/protocols/silc/silc.c:729 src/protocols/silc/silc.c:1130
-#, fuzzy
 msgid "There is no Message of the Day associated with this connection"
-msgstr "この接続に関連した MOTD がありません。"
+msgstr "この接続に対応した \"今日のメッセージ\" はありません"
 
 #: src/protocols/silc/silc.c:772
-#, fuzzy
 msgid "Online Status"
-msgstr "オンラインの期間"
+msgstr "オンライン・ステータス"
 
 #: src/protocols/silc/silc.c:781
 msgid "View Message of the Day"
-msgstr ""
+msgstr "\"今日のメッセージ\" を表示する"
 
 #: src/protocols/silc/silc.c:853
 #, c-format
 msgid "User <I>%s</I> is not present in the network"
-msgstr ""
+msgstr "ユーザ <I>%s</I> はネットワークに存在しません"
 
 #: src/protocols/silc/silc.c:962
-#, fuzzy
 msgid "Failed to leave channel"
-msgstr "チャットへの参加が失敗しました"
+msgstr "チャンネルからの退出に失敗しました"
 
 #: src/protocols/silc/silc.c:1006
-#, fuzzy
 msgid "Topic too long"
-msgstr "プロフィールが長すぎます"
+msgstr "トピックが長すぎます"
 
 #: src/protocols/silc/silc.c:1087
 msgid "You must specify a nick"
-msgstr ""
+msgstr "あだ名を指定して下さい"
 
 #: src/protocols/silc/silc.c:1189
-#, fuzzy, c-format
+#, c-format
 msgid "channel %s not found"
-msgstr "会議が見つかりません"
+msgstr "チャンネル %s が見つかりません"
 
 #: src/protocols/silc/silc.c:1194
-#, fuzzy, c-format
+#, c-format
 msgid "channel modes for %s: %s"
-msgstr "%s のトピック: %s"
+msgstr "%s のチャンネル・モード: %s"
 
 #: src/protocols/silc/silc.c:1196
-#, fuzzy, c-format
+#, c-format
 msgid "no channel modes are set on %s"
-msgstr "あなたは %s に締め出されました。"
+msgstr "%s ではチャンネル・モードをセットしてません"
 
 #: src/protocols/silc/silc.c:1209
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to set cmodes for %s"
-msgstr "画像の格納に失敗しました: %s\n"
+msgstr "%s のチャンネル・モードのセットに失敗"
 
 #: src/protocols/silc/silc.c:1239
-#, fuzzy, c-format
+#, c-format
 msgid "Unknown command: %s, (may be a Gaim bug)"
-msgstr "不明なコマンド: %s"
+msgstr "不明なコマンド: %s (おそらく Gaim のバグ)"
 
 #: src/protocols/silc/silc.c:1302
 msgid "part [channel]:  Leave the chat"
-msgstr ""
+msgstr "part [チャンネル]:  指定したチャンネルから退出します"
 
 #: src/protocols/silc/silc.c:1306
 msgid "leave [channel]:  Leave the chat"
-msgstr ""
+msgstr "leave [チャンネル]:  指定したチャンネルから退出します"
 
 #: src/protocols/silc/silc.c:1310
 msgid "topic [&lt;new topic&gt;]:  View or change the topic"
-msgstr ""
+msgstr "topic [&lt;新しいトピック&gt;]:  トピックを表示したり変更します"
 
 #: src/protocols/silc/silc.c:1315
 msgid "join &lt;channel&gt; [&lt;password&gt;]:  Join a chat on this network"
 msgstr ""
+"join &lt;チャンネル&gt; [&lt;パスワード&gt;]:  このネットワークのチャットへ参"
+"加します"
 
 #: src/protocols/silc/silc.c:1319
-#, fuzzy
 msgid "list:  List channels on this network"
-msgstr "ユーザ %s はネットワーク上にいません"
+msgstr "list:  このネットワーク上のチャンネルを一覧表示します"
 
 #: src/protocols/silc/silc.c:1323
 msgid "whois &lt;nick&gt;:  View nick's information"
-msgstr ""
+msgstr "whois &lt;あだ名&gt;:  指定したあだ名のユーザ情報を表示します"
 
 #: src/protocols/silc/silc.c:1327 src/protocols/zephyr/zephyr.c:1673
 msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user"
 msgstr ""
+"msg &lt;あだ名&gt; &lt;メッセージ&gt;:  指定したあだ名のユーザへ個人的なメッ"
+"セージを送信します"
 
 #: src/protocols/silc/silc.c:1331
 msgid "query &lt;nick&gt; [&lt;message&gt;]:  Send a private message to a user"
 msgstr ""
+"query &lt;あだ名&gt; [&lt;メッセージ&gt;]:  指定したあだ名のユーザへ個人的な"
+"メッセージを送信します"
 
 #: src/protocols/silc/silc.c:1335
 msgid "motd:  View the server's Message Of The Day"
-msgstr ""
+msgstr "motd:  サーバにある \"今日のメッセージ\" を表示します"
 
 #: src/protocols/silc/silc.c:1339
 msgid "detach:  Detach this session"
-msgstr ""
+msgstr "detach:  このセッションを切り離します"
 
 #: src/protocols/silc/silc.c:1343
 msgid "quit [message]:  Disconnect from the server, with an optional message"
-msgstr ""
+msgstr "quit [メッセージ]:  追加でメッセージを残して、このサーバから切断します"
 
 #: src/protocols/silc/silc.c:1347
-#, fuzzy
 msgid "call &lt;command&gt;:  Call any silc client command"
-msgstr "help &lt;コマンド&gt;:  特定のコマンドに対するヘルプを表示します"
+msgstr "call &lt;コマンド&gt;:  SILC クライアント・コマンドを呼び出します"
 
 #: src/protocols/silc/silc.c:1352
 msgid "kill &lt;nick&gt; [-pubkey|&lt;reason&gt;]:  Kill nick"
 msgstr ""
+"kill &lt;あだ名&gt; [-pubkey|&lt;理由&gt;]:  あだ名のユーザを強制終了します"
 
 #: src/protocols/silc/silc.c:1356
 msgid "nick &lt;newnick&gt;:  Change your nickname"
-msgstr ""
+msgstr "nick &lt;新しいあだ名&gt;:  お使いのあだ名を変更します"
 
 #: src/protocols/silc/silc.c:1360
 msgid "whowas &lt;nick&gt;:  View nick's information"
-msgstr ""
+msgstr "whowas &lt;あだ名&gt;:  あだ名のユーザ情報を表示します"
 
 #: src/protocols/silc/silc.c:1364
 msgid ""
 "cmode &lt;channel&gt; [+|-&lt;modes&gt]; [arguments]:  Change or display "
 "channel modes"
 msgstr ""
+"cmode &lt;チャンネル&gt; [+|-&lt;モード&gt]; [引数]:  チャンネルのモードを変"
+"更したり表示します"
 
 #: src/protocols/silc/silc.c:1368
 msgid ""
 "cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes "
 "on channel"
 msgstr ""
+"cumode &lt;チャンネル&gt; +|-&lt;モード&gt; &lt;あだ名&gt;:  指定したチャンネ"
+"ルのあだ名のユーザのモードを変更します"
 
 #: src/protocols/silc/silc.c:1372
 msgid "umode &lt;usermodes&gt;:  Set your modes in the network"
-msgstr ""
+msgstr "umode &lt;ユーザ・モード&gt;:  ネットワークでのモードをセットします"
 
 #: src/protocols/silc/silc.c:1376
 msgid "oper &lt;nick&gt; [-pubkey]:  Get server operator privileges"
-msgstr ""
+msgstr "oper &lt;あだ名&gt; [-pubkey]:  サーバのオペレータ特権を取得します"
 
 #: src/protocols/silc/silc.c:1380
 msgid ""
 "invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
 "channel invite list"
 msgstr ""
+"invite &lt;チャンネル&gt; [-|+]&lt;あだ名&gt;:  指定したあだ名のユーザを招待"
+"する、または招待リストからそのユーザを追加/削除します"
 
 #: src/protocols/silc/silc.c:1384
 msgid "kick &lt;channel&gt; &lt;nick&gt; [comment]:  Kick client from channel"
 msgstr ""
+"kick &lt;チャンネル&gt; &lt;あだ名&gt; [コメント]:  チャンネルからクライアン"
+"トを追い出します"
 
 #: src/protocols/silc/silc.c:1388
 msgid "info [server]:  View server administrative details"
-msgstr ""
+msgstr "info [サーバ]:  サーバの管理者の詳細を表示します"
 
 #: src/protocols/silc/silc.c:1392
 msgid "ban [&lt;channel&gt; +|-&lt;nick&gt;]:  Ban client from channel"
 msgstr ""
+"ban [&lt;チャンネル&gt; +|-&lt;あだ名&gt;]:  チャンネルからクライアントを追い"
+"出します"
 
 #: src/protocols/silc/silc.c:1396
 msgid "getkey &lt;nick|server&gt;:  Retrieve client's or server's public key"
 msgstr ""
+"getkey &lt;あだ名|サーバ&gt;:  クライアントまたはサーバの公開鍵を取得します"
 
 #: src/protocols/silc/silc.c:1400
 msgid "stats:  View server and network statistics"
-msgstr ""
+msgstr "stats:  サーバとネットワークの統計情報を表示します"
 
 #: src/protocols/silc/silc.c:1404
 msgid "ping:  Send PING to the connected server"
-msgstr ""
+msgstr "ping:  接続しているサーバへ PING を送信します"
 
 #: src/protocols/silc/silc.c:1409
 msgid "users &lt;channel&gt;:  List users in channel"
-msgstr ""
+msgstr "users &lt;チャンネル&gt;:  チャンネル内のユーザを一覧表示します"
 
 #: src/protocols/silc/silc.c:1413
 msgid ""
 "names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List "
 "specific users in channel(s)"
 msgstr ""
+"names [-count|-ops|-halfops|-voices|-normal] &lt;(複数の)チャンネル&gt;:  (複"
+"数の) チャンネル内の指定したユーザを一覧表示します"
 
 #: src/protocols/silc/silc.c:1425
-#, fuzzy
 msgid "Instant Messages"
-msgstr "インスタント・メッセンジャー"
+msgstr "インスタント・メッセージ"
 
 #: src/protocols/silc/silc.c:1430
-#, fuzzy
 msgid "Digitally sign all IM messages"
-msgstr "全てのインスタント・メッセージを記録する(_L)"
+msgstr "全ての IM メッセージに電子署名する"
 
 #: src/protocols/silc/silc.c:1435
 msgid "Verify all IM message signatures"
-msgstr ""
+msgstr "全ての IM メッセージの署名を検証する"
 
 #: src/protocols/silc/silc.c:1438
-#, fuzzy
 msgid "Channel Messages"
-msgstr "離席メッセージ"
+msgstr "チャンネル・メッセージ"
 
 #: src/protocols/silc/silc.c:1443
-#, fuzzy
 msgid "Digitally sign all channel messages"
-msgstr "全てのインスタント・メッセージを記録する(_L)"
+msgstr "全てのチャンネル・メッセージに電子署名する"
 
 #: src/protocols/silc/silc.c:1448
 msgid "Verify all channel message signatures"
-msgstr ""
+msgstr "全てのチャンネル・メッセージの署名を検証する"
 
 #: src/protocols/silc/silc.c:1451
 msgid "Default SILC Key Pair"
-msgstr ""
+msgstr "デフォルトの SILC 鍵ペア"
 
 #: src/protocols/silc/silc.c:1456
 msgid "SILC Public Key"
-msgstr ""
+msgstr "SILC 公開鍵"
 
 #: src/protocols/silc/silc.c:1461
 msgid "SILC Private Key"
-msgstr ""
+msgstr "SILC 秘密鍵"
 
 #. *< api_version
 #. *< type
@@ -9694,99 +9688,99 @@
 #. *< version
 #. *  summary
 #: src/protocols/silc/silc.c:1547
-#, fuzzy
 msgid "SILC Protocol Plugin"
-msgstr "IRC プロトコル・プラグイン"
+msgstr "SILC プロトコルのプラグイン"
 
 #. *  description
 #: src/protocols/silc/silc.c:1549
 msgid "Secure Internet Live Conferencing (SILC) Protocol"
-msgstr ""
+msgstr "セキュアなインターネット・ライブ会議 (SILC) プロトコル"
 
 #: src/protocols/silc/silc.c:1579
-#, fuzzy
 msgid "Public key authentication"
-msgstr "プレーンテキスト認証"
+msgstr "公開鍵の認証"
 
 #: src/protocols/silc/silc.c:1585
 msgid "Public Key File"
-msgstr ""
+msgstr "公開鍵ファイル"
 
 #: src/protocols/silc/silc.c:1589
 msgid "Private Key File"
-msgstr ""
+msgstr "秘密鍵のファイル"
 
 #: src/protocols/silc/silc.c:1594
 msgid "Reject watching by other users"
-msgstr ""
+msgstr "他のユーザからの監視を拒否する"
 
 #: src/protocols/silc/silc.c:1597
-#, fuzzy
 msgid "Block invites"
-msgstr "ユーザからの会話を拒否します"
+msgstr "招待を拒否する"
 
 #: src/protocols/silc/silc.c:1600
 msgid "Block IMs without Key Exchange"
-msgstr ""
+msgstr "鍵の交換が無い IM を拒否する"
 
 #: src/protocols/silc/silc.c:1603
 msgid "Reject online status attribute requests"
-msgstr ""
+msgstr "オンライン・ステータスの属性要求を拒否する"
 
 #: src/protocols/silc/util.c:202 src/protocols/silc/util.c:227
 msgid "Creating SILC key pair..."
-msgstr ""
+msgstr "SILC 鍵ペアの生成中..."
 
 #. Hint for translators: Please check the tabulator width here and in
 #. the next strings (short strings: 2 tabs, longer strings 1 tab,
 #. sum: 3 tabs or 24 characters)
 #: src/protocols/silc/util.c:310
-#, fuzzy, c-format
+#, c-format
 msgid "Real Name: \t%s\n"
-msgstr "氏名"
+msgstr "氏名: \t%s\n"
 
 #: src/protocols/silc/util.c:312
-#, fuzzy, c-format
+#, c-format
 msgid "User Name: \t%s\n"
-msgstr "ユーザ名"
+msgstr "ユーザ名: \t%s\n"
 
 #: src/protocols/silc/util.c:314
 #, c-format
 msgid "EMail: \t\t%s\n"
-msgstr ""
+msgstr "E-メール: \t\t%s\n"
 
 #: src/protocols/silc/util.c:316
-#, fuzzy, c-format
+#, c-format
 msgid "Host Name: \t%s\n"
-msgstr "姓"
+msgstr "ホスト名: \t%s\n"
 
 #: src/protocols/silc/util.c:318
-#, fuzzy, c-format
+#, c-format
 msgid "Organization: \t%s\n"
-msgstr "担当部署"
+msgstr "組織: \t%s\n"
 
 #: src/protocols/silc/util.c:320
-#, fuzzy, c-format
+#, c-format
 msgid "Country: \t%s\n"
-msgstr "国"
+msgstr "国: \t%s\n"
 
 #: src/protocols/silc/util.c:321
-#, fuzzy, c-format
+#, c-format
 msgid "Algorithm: \t%s\n"
-msgstr "姓"
+msgstr "アルゴリズム: \t%s\n"
 
 #: src/protocols/silc/util.c:322
 #, c-format
 msgid "Key Length: \t%d bits\n"
-msgstr ""
+msgstr "鍵の長さ: \t%d ビット\n"
 
 #: src/protocols/silc/util.c:324
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Public Key Fingerprint:\n"
 "%s\n"
 "\n"
-msgstr "プロファイル情報"
+msgstr ""
+"公開鍵の指紋:\n"
+"%s\n"
+"\n"
 
 #: src/protocols/silc/util.c:325
 #, c-format
@@ -9794,29 +9788,28 @@
 "Public Key Babbleprint:\n"
 "%s"
 msgstr ""
+"公開鍵の Babbleprint:\n"
+"%s"
 
 #: src/protocols/silc/util.c:329 src/protocols/silc/util.c:330
-#, fuzzy
 msgid "Public Key Information"
-msgstr "プロファイル情報"
+msgstr "公開鍵の情報"
 
 #: src/protocols/silc/util.c:512
-#, fuzzy
 msgid "Paging"
-msgstr "ログの記録"
+msgstr "ページング"
 
 #: src/protocols/silc/util.c:536
-#, fuzzy
 msgid "Computer"
-msgstr "国"
+msgstr "コンピュータ"
 
 #: src/protocols/silc/util.c:540
 msgid "PDA"
-msgstr ""
+msgstr "PDA"
 
 #: src/protocols/silc/util.c:542
 msgid "Terminal"
-msgstr ""
+msgstr "端末"
 
 #: src/protocols/toc/toc.c:137
 #, c-format
@@ -10191,9 +10184,8 @@
 msgstr "無効なユーザ名です。"
 
 #: src/protocols/yahoo/yahoo.c:1825
-#, fuzzy
 msgid "Normal authencation failed!"
-msgstr "認証に失敗しました"
+msgstr "標準の認証に失敗しました!"
 
 #: src/protocols/yahoo/yahoo.c:1826
 msgid ""
@@ -10202,22 +10194,27 @@
 "attempt to log in using Web Messenger authencation, will which result in "
 "reduced functionality and features."
 msgstr ""
+"標準の認証方法で失敗しました。これは、お使いのパスワードが間違っているか、あ"
+"るいは Yahoo! の認証手順が変更されかのどちらかです。Gaim はウェブ・マネージャ"
+"の認証方法を利用してログインを試みますが、利用できる機能が少なくなるかもしれ"
+"ません。"
 
 #: src/protocols/yahoo/yahoo.c:1834
 msgid "Incorrect password."
 msgstr "パスワードが間違っています。"
 
 #: src/protocols/yahoo/yahoo.c:1837
-#, fuzzy
 msgid "Your account is locked, please log in to the Yahoo! website."
 msgstr ""
-"お使いのアカウントがロックされています。Yahoo ウェブサイトへログインして下さ"
+"お使いのアカウントがロックされています。Yahoo! ウェブサイトへログインして下さ"
 "い。"
 
 #: src/protocols/yahoo/yahoo.c:1840
 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr ""
+"不明なエラー番号 %d です。Yahoo! ウェブサイトへログインすると修正されるかもし"
+"れません。"
 
 #: src/protocols/yahoo/yahoo.c:1894
 #, c-format
@@ -10318,18 +10315,16 @@
 msgstr "Yahoo! プロトコル・プラグイン"
 
 #: src/protocols/yahoo/yahoo.c:3313
-#, fuzzy
 msgid "Yahoo Japan"
-msgstr "Yahoo"
+msgstr "Yahoo Japan"
 
 #: src/protocols/yahoo/yahoo.c:3316
 msgid "Pager host"
 msgstr "ページャのホスト名"
 
 #: src/protocols/yahoo/yahoo.c:3319
-#, fuzzy
 msgid "Japan Pager host"
-msgstr "ページャのホスト名"
+msgstr "Japan ページャのホスト名"
 
 #: src/protocols/yahoo/yahoo.c:3322
 msgid "Pager port"
@@ -10340,9 +10335,8 @@
 msgstr "ファイル転送のホスト"
 
 #: src/protocols/yahoo/yahoo.c:3328
-#, fuzzy
 msgid "Japan File transfer host"
-msgstr "ファイル転送のホスト"
+msgstr "Japan ファイル転送のホスト"
 
 #: src/protocols/yahoo/yahoo.c:3331
 msgid "File transfer port"
@@ -10354,12 +10348,11 @@
 
 #: src/protocols/yahoo/yahoo.c:3337
 msgid "YCHT Host"
-msgstr ""
+msgstr "YCHT ホスト"
 
 #: src/protocols/yahoo/yahoo.c:3340
-#, fuzzy
 msgid "YCHT Port"
-msgstr "ポート番号"
+msgstr "YCHT ポート番号"
 
 #: src/protocols/yahoo/yahoo_filexfer.c:170
 msgid ""
@@ -10370,37 +10363,33 @@
 "信できません (1,048,576 バイト= 1Mバイト)"
 
 #: src/protocols/yahoo/yahoo_profile.c:675
-#, fuzzy, c-format
+#, c-format
 msgid "<b>IP Address:</b> %s<br>"
-msgstr "<b>エイリアス:</b> %s<br>"
+msgstr "<b>IP-アドレス:</b> %s<br>"
 
 #: src/protocols/yahoo/yahoo_profile.c:749
-#, fuzzy
 msgid "Yahoo! Japan Profile"
-msgstr "Yahoo"
+msgstr "Yahoo! Japan プロファイル"
 
 #: src/protocols/yahoo/yahoo_profile.c:750
-#, fuzzy
 msgid "Yahoo! Profile"
-msgstr "プロフィール"
+msgstr "Yahoo! プロファイル"
 
 #: src/protocols/yahoo/yahoo_profile.c:794
-#, fuzzy
 msgid ""
 "Sorry, profiles marked as containing adult content are not supported at this "
 "time."
 msgstr ""
-"<b>すみません、このバージョンではアダルト向けのコンテンツを含んでいるプロファ"
-"イルには対応していません。</b><br><br>\n"
+"すみません、このバージョンでは、アダルト向けコンテンツを含んでいるとマークが"
+"付けられたプロファイルは利用いただけません."
 
 #: src/protocols/yahoo/yahoo_profile.c:796
-#, fuzzy
 msgid ""
 "If you wish to view this profile, you will need to visit this link in your "
 "web browser"
 msgstr ""
-"このプロファイルの表示を希望する場合は、お使いのウェブ・ブラウザでこのリンク"
-"を訪問する必要があります。<br>"
+"このプロファイルの閲覧を希望する場合は、お使いのウェブ・ブラウザでこのリンク"
+"を訪問して下さい。"
 
 #: src/protocols/yahoo/yahoo_profile.c:969
 msgid "Yahoo! ID"
@@ -10439,19 +10428,20 @@
 msgstr "%s のユーザ情報は有効ではありません"
 
 #: src/protocols/yahoo/yahoo_profile.c:1136
-#, fuzzy
 msgid ""
 "Sorry, this profile seems to be in a language that is not supported at this "
 "time."
 msgstr ""
-"<b>すみません、このバージョンでは英語ではないプロファイルには対応していませ"
-"ん。</b><br><br>\n"
+"すみません、このプロファイルは、このバージョンではサポートされていない言語の"
+"ようです。"
 
 #: src/protocols/yahoo/yahoo_profile.c:1152
 msgid ""
 "Could not retrieve the user's profile. This most likely is a temporary "
 "server-side problem. Please try again later."
 msgstr ""
+"ユーザのプロフィールを取得できませんでした。これは、おそらく一時的なサーバ側"
+"の問題でしょう。後で再試行してみて下さい。"
 
 #: src/protocols/yahoo/yahoo_profile.c:1155
 msgid ""
@@ -10459,6 +10449,10 @@
 "does not exist; however, Yahoo! sometimes does fail to find a user's "
 "profile. If you know that the user exists, please try again later."
 msgstr ""
+"ユーザのプロフィールを取得できませんでした。これは、おそらくそのユーザが存在"
+"しないと思われます。ただし、時々 Yahoo! はユーザのプロフィールの取得に失敗す"
+"ることがあります。そのユーザが存在していることが確かならば、後で再試行してみ"
+"て下さい。"
 
 #: src/protocols/yahoo/yahoo_profile.c:1163
 msgid "The user's profile is empty."
@@ -10467,7 +10461,7 @@
 #: src/protocols/yahoo/yahoochat.c:203
 #, c-format
 msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
-msgstr "%s は会議招待をルーム \"%s\" に落としました (理由は \"%s\")。"
+msgstr "%s は会議招待を部屋 \"%s\" に落としました (理由は \"%s\")。"
 
 #: src/protocols/yahoo/yahoochat.c:205
 msgid "Invitation Rejected"
@@ -10479,7 +10473,7 @@
 
 #: src/protocols/yahoo/yahoochat.c:355
 msgid "Maybe the room is full?"
-msgstr "おそらくルームが一杯かも?"
+msgstr "おそらく部屋が一杯かも?"
 
 #: src/protocols/yahoo/yahoochat.c:429
 #, c-format
@@ -10521,7 +10515,7 @@
 #: src/protocols/zephyr/zephyr.c:589
 #, c-format
 msgid "Unable send to chat %s,%s,%s"
-msgstr ""
+msgstr "チャット %s,%s,%s へ送信できません"
 
 #: src/protocols/zephyr/zephyr.c:624
 #, c-format
@@ -10568,64 +10562,75 @@
 #: src/protocols/zephyr/zephyr.c:1409
 #, c-format
 msgid "Attempt to subscribe to %s,%s,%s failed"
-msgstr ""
+msgstr "%s,%s,%s への購読の試行に失敗"
 
 #: src/protocols/zephyr/zephyr.c:1678
 msgid "zlocate &lt;nick&gt;: Locate user"
-msgstr ""
+msgstr "zlocate &lt;あだ名&gt;: ユーザの所在地を確認します"
 
 #: src/protocols/zephyr/zephyr.c:1683
 msgid "zl &lt;nick&gt;: Locate user"
-msgstr ""
+msgstr "zl &lt;あだ名&gt;: ユーザの所在地を確認します"
 
 #: src/protocols/zephyr/zephyr.c:1688
 msgid "instance &lt;instance&gt;: Set the instance to be used on this class"
 msgstr ""
+"instance &lt;インスタンス&gt;: このクラスで使用するインスタンスをセットします"
 
 #: src/protocols/zephyr/zephyr.c:1693
 msgid "inst &lt;instance&gt;: Set the instance to be used on this class"
 msgstr ""
+"inst &lt;インスタンス&gt;: このクラスで使用するインスタンスをセットします"
 
 #: src/protocols/zephyr/zephyr.c:1699
 msgid "sub &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Join a new chat"
 msgstr ""
+"sub &lt;クラス&gt; &lt;インスタンス&gt; &lt;宛先&gt;: 新しいチャットへ参加し"
+"ます"
 
 #: src/protocols/zephyr/zephyr.c:1704
 msgid ""
 "zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
 msgstr ""
+"zi &lt;インスタンス&gt;: &lt;メッセージ、<i>インスタンス</i>、*&gt; へメッ"
+"セージを送信します"
 
 #: src/protocols/zephyr/zephyr.c:1710
 msgid ""
 "zci &lt;class&gt; &lt;instance&gt;: Send a message to &lt;<i>class</i>,"
 "<i>instance</i>,*&gt;"
 msgstr ""
+"zci &lt;クラス&gt; &lt;インスタンス&gt;: &lt;<i>クラス</i>、<i>インスタンス</"
+"i>、*&gt; へメッセージを送信します"
 
 #: src/protocols/zephyr/zephyr.c:1716
 msgid ""
 "zcir &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;"
 "<i>class</i>,<i>instance</i>,<i>recipient</i>&gt;"
 msgstr ""
+"zcir &lt;クラス&gt; &lt;インスタンス&gt; &lt;宛先&gt;: &lt;<i>クラス</i>、<i>"
+"インスタンス</i>、<i>宛先</i>&gt; へメッセージを送信します"
 
 #: src/protocols/zephyr/zephyr.c:1722
 msgid ""
 "zir &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;MESSAGE,"
 "<i>instance</i>,<i>recipient</i>&gt;"
 msgstr ""
+"zir &lt;インスタンス&gt; &lt;宛先&gt;: &lt;MESSAGE、<i>インスタンス</i>、<i>"
+"宛先</i>&gt; へメッセージを送信します"
 
 #: src/protocols/zephyr/zephyr.c:1727
 msgid "zc &lt;class&gt;: Send a message to &lt;<i>class</i>,PERSONAL,*&gt;"
 msgstr ""
+"zc &lt;クラス&gt;: &lt;<i>クラス</i>,PERSONAL,*&gt; へメッセージを送信します"
 
 #: src/protocols/zephyr/zephyr.c:1802
-#, fuzzy
 msgid "Resubscribe"
-msgstr "購読の取り消し"
+msgstr "再購読"
 
 #: src/protocols/zephyr/zephyr.c:1805
-#, fuzzy
 msgid "Retrieve subscriptions from server"
-msgstr "サーバからの応答が不正です。"
+msgstr "サーバから購読を取得します"
 
 #. *< api_version
 #. *< type
@@ -10695,9 +10700,9 @@
 msgstr "パスワードを入力して下さい"
 
 #: src/server.c:528
-#, fuzzy, c-format
+#, c-format
 msgid "%s is now known as %s.\n"
-msgstr "%s は %s と認識されました"
+msgstr "%s は %s と認識されました。\n"
 
 #: src/server.c:938
 #, c-format
@@ -10769,13 +10774,13 @@
 "User '%s' invites %s to buddy chat room: '%s'\n"
 "%s"
 msgstr ""
-"ユーザ '%s' が %s を仲間チャットルームに招待: '%s'\n"
+"ユーザ '%s' が %s を仲間のチャット・ルームに招待します: '%s'\n"
 "%s"
 
 #: src/server.c:1452
 #, c-format
 msgid "User '%s' invites %s to buddy chat room: '%s'\n"
-msgstr "ユーザ '%s' が %s を仲間チャットルームに招待: '%s'\n"
+msgstr "ユーザ '%s' が %s を仲間のチャット・ルームへ招待します: '%s'\n"
 
 #: src/server.c:1458
 msgid "Accept chat invitation?"
@@ -10813,11 +10818,10 @@
 msgstr "不明です。"
 
 #: src/util.c:2392
-#, fuzzy
 msgid "second"
 msgid_plural "seconds"
-msgstr[0] "アイコン"
-msgstr[1] "アイコン"
+msgstr[0] "秒間"
+msgstr[1] "秒間"
 
 #: src/util.c:2406
 msgid "day"
@@ -10846,36 +10850,9 @@
 msgstr "Gaim 設定の移動.."
 
 #: src/win32/win32dep.c:276
-#, fuzzy
 msgid "Moving Gaim user settings to: "
-msgstr "Gaim 設定の移動.."
+msgstr "Gaim ユーザ設定の移動先: "
 
 #: src/win32/win32dep.c:278
-#, fuzzy
 msgid "Notification"
-msgstr "入力の通知"
-
-#~ msgid "Invalid Groupname"
-#~ msgstr "おかしなグループ名です"
-
-#~ msgid "That file already exists."
-#~ msgstr "既にそのファイルは存在しています。"
-
-#~ msgid "Save As..."
-#~ msgstr "別名で保存..."
-
-#, fuzzy
-#~ msgid "MSN ID"
-#~ msgstr "MSN"
-
-#, fuzzy
-#~ msgid "User Count:\t\t%d\n"
-#~ msgstr "ユーザが見つかりません"
-
-#, fuzzy
-#~ msgid "Hostname"
-#~ msgstr "ホストがお亡くなりになりました"
-
-#, fuzzy
-#~ msgid "Channels"
-#~ msgstr "チャンネル(_C):"
+msgstr "通知"