changeset 3343:c47ae88151ac

[gaim-migrate @ 3362] blah committer: Tailor Script <tailor@pidgin.im>
author Rob Flynn <gaim@robflynn.com>
date Tue, 02 Jul 2002 05:42:26 +0000
parents d37b9be5feba
children 28033f11b3e7
files po/bg.po po/cs.po po/da.po po/de.po po/fi.po po/hu.po po/it.po po/ja.po po/ko.po po/pl.po po/ru.po po/sk.po po/sv.po po/zh_CN.po po/zh_TW.po
diffstat 15 files changed, 16229 insertions(+), 9350 deletions(-) [+]
line wrap: on
line diff
--- a/po/bg.po	Tue Jul 02 05:41:30 2002 +0000
+++ b/po/bg.po	Tue Jul 02 05:42:26 2002 +0000
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2002-04-15 21:02-0700\n"
+"POT-Creation-Date: 2002-06-25 00:10-0400\n"
 "PO-Revision-Date: 2002-04-16 04:54+0200\n"
 "Last-Translator: Hristo Todorov <igel@bofh.bg>\n"
 "Language-Team: Bulgarian <bg@li.org>\n"
@@ -14,6 +14,117 @@
 "Content-Type: text/plain; charset=Windows-1251\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: plugins/chatlist.c:67 src/buddy_chat.c:272
+msgid "Buddy Chat"
+msgstr ""
+
+#: plugins/chatlist.c:166 plugins/chatlist.c:168 plugins/chatlist.c:407
+#: plugins/chatlist.c:409
+#, fuzzy
+msgid "Gaim Chat"
+msgstr "Gaim - "
+
+#: plugins/chatlist.c:339 src/about.c:165 src/aim.c:320 src/buddy.c:2716
+#: src/buddy_chat.c:1322 src/buddy_chat.c:1419 src/buddy_chat.c:1449
+#: src/conversation.c:2864 src/dialogs.c:567 src/dialogs.c:3899
+#: src/multi.c:1069 src/plugins.c:277 src/prefs.c:2547 src/prpl.c:438
+#: src/prpl.c:685 src/server.c:1072
+msgid "Close"
+msgstr ""
+
+#: plugins/chatlist.c:344
+#, fuzzy
+msgid "Chat Rooms"
+msgstr ""
+
+#: plugins/chatlist.c:363
+msgid "Refresh"
+msgstr ""
+
+#. Put the buttons in the box
+#: plugins/chatlist.c:364 src/buddy.c:492 src/buddy.c:2827
+#: src/buddy_chat.c:1454 src/conversation.c:2389 src/conversation.c:2879
+#: src/dialogs.c:932 src/dialogs.c:1114 src/dialogs.c:2095 src/multi.c:1053
+#: src/prefs.c:2041 src/prefs.c:2383 src/prefs.c:2417
+msgid "Add"
+msgstr ""
+
+#: plugins/chatlist.c:365 src/buddy.c:494 src/buddy.c:2829
+#: src/buddy_chat.c:1456 src/conversation.c:2375 src/conversation.c:2876
+#: src/prefs.c:2055 src/prefs.c:2387 src/prefs.c:2421
+msgid "Remove"
+msgstr ""
+
+#: plugins/chatlist.c:388
+msgid "List of available chats"
+msgstr ""
+
+#: plugins/chatlist.c:398
+msgid "List of subscribed chats"
+msgstr ""
+
+#: plugins/gtik.c:699
+msgid "Gnome Stock Ticker Properties"
+msgstr ""
+
+#: plugins/gtik.c:711
+msgid "Update Frequency in min"
+msgstr ""
+
+#: plugins/gtik.c:727
+msgid "Enter symbols delimited with \"+\" in the box below."
+msgstr ""
+
+#. OUTPUT FORMAT and SCROLL DIRECTION
+#: plugins/gtik.c:737
+msgid "Check this box to display only symbols and price:"
+msgstr ""
+
+#: plugins/gtik.c:738
+msgid "Check this box to scroll left to right:"
+msgstr ""
+
+#: plugins/gtik.c:974
+#, fuzzy
+msgid "(No"
+msgstr ""
+
+#: plugins/gtik.c:975
+#, fuzzy
+msgid "Change"
+msgstr ":"
+
+#: src/protocols/gg/gg.c:71 src/protocols/msn/msn.c:1919
+#, fuzzy
+msgid "Available"
+msgstr ""
+
+#: src/protocols/gg/gg.c:72
+msgid "Available for friends only"
+msgstr ""
+
+#: src/applet.c:197 src/buddy.c:497 src/buddy.c:2582 src/buddy.c:2727
+#: src/protocols/gg/gg.c:73 src/protocols/jabber/jabber.c:1118
+msgid "Away"
+msgstr ""
+
+#: src/protocols/gg/gg.c:74
+msgid "Away for friends only"
+msgstr ""
+
+#: src/protocols/gg/gg.c:75
+#, fuzzy
+msgid "Invisible"
+msgstr ""
+
+#: src/protocols/gg/gg.c:76
+msgid "Invisible for friends only"
+msgstr ""
+
+#: src/protocols/gg/gg.c:77 src/protocols/jabber/jabber.c:1114
+msgid "Unavailable"
+msgstr ""
+
 #: src/protocols/gg/gg.c:182
 msgid "Unable to resolve hostname."
 msgstr "     ."
@@ -42,7 +153,7 @@
 msgid "Unknown Error Code."
 msgstr "   ."
 
-#: src/protocols/gg/gg.c:302
+#: src/protocols/gg/gg.c:302 src/protocols/msn/msn.c:2050
 #, c-format
 msgid "Status: %s"
 msgstr ": %s"
@@ -168,7 +279,7 @@
 msgstr ""
 
 #. Line 5
-#: src/dialogs.c:1582 src/dialogs.c:2290 src/protocols/gg/gg.c:729
+#: src/dialogs.c:1624 src/dialogs.c:2332 src/protocols/gg/gg.c:729
 msgid "City"
 msgstr ""
 
@@ -242,7 +353,12 @@
 msgid "Directory Search"
 msgstr "  "
 
-#: src/dialogs.c:1699 src/protocols/gg/gg.c:1160 src/protocols/gg/gg.c:1177
+#.
+#. } else if (!strcmp(act, _("Set Dir Info"))) {
+#. show_set_dir(gc);
+#.
+#: src/dialogs.c:1741 src/protocols/gg/gg.c:1160 src/protocols/gg/gg.c:1177
+#: src/protocols/jabber/jabber.c:3748 src/protocols/jabber/jabber.c:3761
 msgid "Change Password"
 msgstr "  "
 
@@ -263,8 +379,8 @@
 msgstr "    "
 
 #: src/protocols/icq/gaim_icq.c:469 src/protocols/irc/irc.c:1851
-#: src/protocols/jabber/jabber.c:2130 src/protocols/oscar/oscar.c:3432
-#: src/protocols/toc/toc.c:1216
+#: src/protocols/jabber/jabber.c:2860 src/protocols/oscar/oscar.c:3593
+#: src/protocols/toc/toc.c:1219
 msgid "Get Info"
 msgstr ""
 
@@ -302,7 +418,7 @@
 "connection?"
 msgstr "%s  DCC chat.       "
 
-#: src/protocols/irc/irc.c:1001
+#: src/protocols/irc/irc.c:1001 src/protocols/msn/msn.c:315
 msgid "Unable to write"
 msgstr "   "
 
@@ -329,7 +445,7 @@
 msgid "Channel:"
 msgstr ":"
 
-#: src/multi.c:547 src/protocols/irc/irc.c:1675
+#: src/multi.c:549 src/protocols/irc/irc.c:1675
 msgid "Password:"
 msgstr ""
 
@@ -337,516 +453,834 @@
 msgid "DCC Chat"
 msgstr "DCC "
 
-#: src/protocols/jabber/jabber.c:699
-msgid "Unavailable"
-msgstr ""
-
-#: src/applet.c:293 src/buddy.c:493 src/buddy.c:2508 src/buddy.c:2644
-#: src/protocols/jabber/jabber.c:703
-msgid "Away"
-msgstr ""
-
-#: src/buddy.c:2801 src/protocols/jabber/jabber.c:705
-#: src/protocols/jabber/jabber.c:723
+#: src/protocols/jabber/jabber.c:942
+msgid "Incorrect current password! Password NOT Changed!"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:943 src/protocols/jabber/jabber.c:948
+#, fuzzy
+msgid "Password Change Error!"
+msgstr "Gaim -   "
+
+#: src/protocols/jabber/jabber.c:947
+msgid "New password same as old password! Password NOT Changed!"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1092
+msgid "Unknown"
+msgstr ""
+
+#: src/buddy.c:2887 src/protocols/jabber/jabber.c:1120
+#: src/protocols/jabber/jabber.c:1138
 msgid "Online"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:707
+#: src/protocols/jabber/jabber.c:1122
 msgid "Extended Away"
 msgstr " "
 
-#: src/protocols/jabber/jabber.c:709
+#: src/protocols/jabber/jabber.c:1124
 msgid "Do Not Disturb"
 msgstr " "
 
-#: src/protocols/jabber/jabber.c:1058
+#: src/protocols/jabber/jabber.c:1434
+#, c-format
+msgid "Error %s: %s"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1437
+#, fuzzy
+msgid "Unknown Error in presence"
+msgstr "   ."
+
+#: src/protocols/jabber/jabber.c:1607
+#, fuzzy, c-format
+msgid "The user %s wants to add you to their buddy list."
+msgstr " %d      "
+
+#: src/protocols/jabber/jabber.c:1632
 msgid "No such user"
 msgstr "  "
 
-#: src/protocols/jabber/jabber.c:1060
+#: src/protocols/jabber/jabber.c:1634 src/protocols/jabber/jabber.c:2341
+#: src/protocols/jabber/jabber.c:2506
 msgid "Jabber Error"
 msgstr "Jabber "
 
-#: src/dialogs.c:845 src/protocols/jabber/jabber.c:1140
+#: src/dialogs.c:887 src/protocols/jabber/jabber.c:1719
+#: src/protocols/msn/msn.c:1110
 msgid "Buddies"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1206
+#: src/protocols/jabber/jabber.c:1782
 msgid "Authenticating"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1243
+#: src/protocols/jabber/jabber.c:1819
 msgid "Unknown login error"
 msgstr "   "
 
-#: src/protocols/jabber/jabber.c:1473 src/protocols/jabber/jabber.c:2921
+#: src/protocols/jabber/jabber.c:2010
+#, fuzzy
+msgid "Password successfully changed."
+msgstr "   "
+
+#: src/protocols/jabber/jabber.c:2012
+#, fuzzy
+msgid "Password Change"
+msgstr "Gaim -   "
+
+#: src/protocols/jabber/jabber.c:2054 src/protocols/jabber/jabber.c:3676
 msgid "Connection lost"
 msgstr "  "
 
-#: src/protocols/jabber/jabber.c:1475 src/protocols/jabber/jabber.c:1507
-#: src/protocols/jabber/jabber.c:2923 src/protocols/jabber/jabber.c:2969
+#: src/protocols/jabber/jabber.c:2056 src/protocols/jabber/jabber.c:2088
+#: src/protocols/jabber/jabber.c:3678 src/protocols/jabber/jabber.c:3724
+#: src/protocols/msn/msn.c:1741 src/protocols/msn/msn.c:1770
 msgid "Unable to connect"
 msgstr "    "
 
-#: src/protocols/jabber/jabber.c:1481
+#: src/protocols/jabber/jabber.c:2062
 msgid "Connected"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1484
+#: src/protocols/jabber/jabber.c:2065
 msgid "Requesting Authentication Method"
 msgstr "   "
 
 #. we have no chats yet
-#: src/protocols/jabber/jabber.c:1502
+#: src/protocols/jabber/jabber.c:2083 src/protocols/msn/msn.c:1762
 msgid "Connecting"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1801
+#: src/protocols/jabber/jabber.c:2340 src/protocols/jabber/jabber.c:2505
+#, fuzzy
+msgid "Invalid Jabber I.D."
+msgstr " "
+
+#: src/protocols/jabber/jabber.c:2473
 msgid "Room:"
 msgstr ":"
 
-#: src/protocols/jabber/jabber.c:1805
+#: src/protocols/jabber/jabber.c:2477
 msgid "Server:"
 msgstr ":"
 
-#: src/protocols/jabber/jabber.c:1810
+#: src/protocols/jabber/jabber.c:2482
 msgid "Handle:"
 msgstr "??:"
 
-#: src/protocols/jabber/jabber.c:2080 src/protocols/jabber/jabber.c:2419
-msgid "Unknown"
-msgstr ""
-
-#: src/buddy_chat.c:875 src/protocols/jabber/jabber.c:2135
-#: src/protocols/oscar/oscar.c:3439
+#: src/protocols/jabber/jabber.c:2539
+#, fuzzy
+msgid "Chats"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:2854
+#, fuzzy
+msgid "View Error Msg"
+msgstr ""
+
+#: src/buddy_chat.c:886 src/protocols/jabber/jabber.c:2865
+#: src/protocols/oscar/oscar.c:3606
 msgid "Get Away Msg"
 msgstr " away "
 
-#: src/protocols/jabber/jabber.c:2317
+#: src/protocols/jabber/jabber.c:2882
+msgid "Remove From Roster"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:3076
 msgid "Full Name"
 msgstr " "
 
-#: src/protocols/jabber/jabber.c:2318
+#: src/protocols/jabber/jabber.c:3077
 msgid "Family Name"
 msgstr " "
 
-#: src/protocols/jabber/jabber.c:2319
+#: src/protocols/jabber/jabber.c:3078
 msgid "Given Name"
 msgstr " "
 
-#: src/protocols/jabber/jabber.c:2320
+#: src/protocols/jabber/jabber.c:3079
 msgid "Nickname"
 msgstr ""
 
-#: src/dialogs.c:2483 src/protocols/jabber/jabber.c:2321
+#: src/dialogs.c:2525 src/protocols/jabber/jabber.c:3080
 msgid "URL"
 msgstr "URL"
 
-#: src/protocols/jabber/jabber.c:2322
+#: src/protocols/jabber/jabber.c:3081
 msgid "Street Address"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:2323
+#: src/protocols/jabber/jabber.c:3082
 msgid "Extended Address"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:2324
+#: src/protocols/jabber/jabber.c:3083
 msgid "Locality"
 msgstr "??"
 
-#: src/protocols/jabber/jabber.c:2325
+#: src/protocols/jabber/jabber.c:3084
 msgid "Region"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:2326
+#: src/protocols/jabber/jabber.c:3085
 msgid "Postal Code"
 msgstr " "
 
 #. Line 7
-#: src/dialogs.c:1604 src/dialogs.c:2312 src/protocols/jabber/jabber.c:2327
+#: src/dialogs.c:1646 src/dialogs.c:2354 src/protocols/jabber/jabber.c:3086
 msgid "Country"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:2328
+#: src/protocols/jabber/jabber.c:3087
 msgid "Telephone"
 msgstr ""
 
-#: src/dialogs.c:2388 src/protocols/jabber/jabber.c:2329
+#: src/dialogs.c:2430 src/protocols/jabber/jabber.c:3088
 msgid "Email"
 msgstr "-"
 
-#: src/protocols/jabber/jabber.c:2330
+#: src/protocols/jabber/jabber.c:3089
 msgid "Organization Name"
 msgstr "  "
 
-#: src/protocols/jabber/jabber.c:2331
+#: src/protocols/jabber/jabber.c:3090
 msgid "Organization Unit"
 msgstr ""
 
-#: src/prefs.c:1988 src/protocols/jabber/jabber.c:2332
+#: src/prefs.c:2000 src/protocols/jabber/jabber.c:3091
 msgid "Title"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:2333
+#: src/protocols/jabber/jabber.c:3092
 msgid "Role"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:2334
+#: src/protocols/jabber/jabber.c:3093
 msgid "Birthday"
 msgstr "  "
 
 #. Right side: frame with description and the filepath of plugin
-#: src/dialogs.c:2491 src/plugins.c:211 src/protocols/jabber/jabber.c:2335
+#: src/dialogs.c:2533 src/plugins.c:211 src/protocols/jabber/jabber.c:3094
 msgid "Description"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:2360
+#: src/protocols/jabber/jabber.c:3119
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable"
-msgstr "  -  .   "
-" "
-
-#: src/protocols/jabber/jabber.c:2361
+msgstr ""
+"  -  .    "
+
+#: src/protocols/jabber/jabber.c:3120
 msgid "User Identity"
 msgstr " "
 
-#: src/protocols/jabber/jabber.c:2777
+#: src/protocols/jabber/jabber.c:3532
 msgid "Gaim - Edit Jabber vCard"
 msgstr "Gaim -   Jabber vCard"
 
-#: src/protocols/jabber/jabber.c:2851
+#: src/protocols/jabber/jabber.c:3606
 msgid "Server Registration successful!"
 msgstr "   !"
 
-#: src/protocols/jabber/jabber.c:2878
+#: src/protocols/jabber/jabber.c:3633
 msgid "Unknown registration error"
 msgstr "   "
 
-#: src/protocols/jabber/jabber.c:2987 src/protocols/jabber/jabber.c:3002
+#: src/protocols/jabber/jabber.c:3742 src/protocols/jabber/jabber.c:3757
 msgid "Set User Info"
 msgstr " "
 
-#: src/protocols/msn/msn.c:719 src/protocols/msn/msn.c:2041
-#: src/protocols/msn/msn.c:2074
+#: src/protocols/msn/msn.c:230
+msgid "Syntax Error (probably a Gaim bug)"
+msgstr ""
+
+#: src/protocols/msn/msn.c:233
+msgid "Invalid Parameter (probably a Gaim bug)"
+msgstr ""
+
+#: src/protocols/msn/msn.c:236
+#, fuzzy
+msgid "Invalid User"
+msgstr " "
+
+#: src/protocols/msn/msn.c:239
+msgid "Fully Qualified Domain Name missing"
+msgstr ""
+
+#: src/protocols/msn/msn.c:242
+msgid "Already Login"
+msgstr ""
+
+#: src/protocols/msn/msn.c:245
+#, fuzzy
+msgid "Invalid Username"
+msgstr " "
+
+#: src/protocols/msn/msn.c:248
+#, fuzzy
+msgid "Invalid Friendly Name"
+msgstr " "
+
+#: src/protocols/msn/msn.c:251
+msgid "List Full"
+msgstr ""
+
+#: src/protocols/msn/msn.c:254
+msgid "Already there"
+msgstr ""
+
+#: src/protocols/msn/msn.c:257
+#, fuzzy
+msgid "Not on list"
+msgstr "  "
+
+#: src/protocols/msn/msn.c:260
+msgid "User is offline"
+msgstr ""
+
+#: src/protocols/msn/msn.c:263
+msgid "Already in the mode"
+msgstr ""
+
+#: src/protocols/msn/msn.c:266
+msgid "Already in opposite list"
+msgstr ""
+
+#: src/protocols/msn/msn.c:269
+msgid "Switchboard failed"
+msgstr ""
+
+#: src/protocols/msn/msn.c:272
+msgid "Notify Transfer failed"
+msgstr ""
+
+#: src/protocols/msn/msn.c:276
+msgid "Required fields missing"
+msgstr ""
+
+#: src/protocols/msn/msn.c:279
+#, fuzzy
+msgid "Not logged in"
+msgstr "%s ."
+
+#: src/protocols/msn/msn.c:283
+#, fuzzy
+msgid "Internal server error"
+msgstr " "
+
+#: src/protocols/msn/msn.c:286
+msgid "Database server error"
+msgstr ""
+
+#: src/protocols/msn/msn.c:289
+#, fuzzy
+msgid "File operation error"
+msgstr "   \n"
+
+#: src/protocols/msn/msn.c:292
+#, fuzzy
+msgid "Memory allocation error"
+msgstr "   \n"
+
+#: src/protocols/msn/msn.c:296
+#, fuzzy
+msgid "Server busy"
+msgstr ":"
+
+#: src/protocols/msn/msn.c:299
+#, fuzzy
+msgid "Server unavailable"
+msgstr ""
+
+#: src/protocols/msn/msn.c:302
+msgid "Peer Notification server down"
+msgstr ""
+
+#: src/protocols/msn/msn.c:305
+#, fuzzy
+msgid "Database connect error"
+msgstr "   \n"
+
+#: src/protocols/msn/msn.c:308
+msgid "Server is going down (abandon ship)"
+msgstr ""
+
+#: src/protocols/msn/msn.c:312
+#, fuzzy
+msgid "Error creating connection"
+msgstr "g003:     .\n"
+
+#: src/protocols/msn/msn.c:318
+msgid "Session overload"
+msgstr ""
+
+#: src/protocols/msn/msn.c:321
+msgid "User is too active"
+msgstr ""
+
+#: src/protocols/msn/msn.c:324
+#, fuzzy
+msgid "Too many sessions"
+msgstr "  ."
+
+#: src/protocols/msn/msn.c:327
+msgid "Not expected"
+msgstr ""
+
+#: src/protocols/msn/msn.c:330
+msgid "Bad friend file"
+msgstr ""
+
+#: src/protocols/msn/msn.c:334
+#, fuzzy
+msgid "Authentication failed"
+msgstr " ."
+
+#: src/protocols/msn/msn.c:337
+#, fuzzy
+msgid "Not allowed when offline"
+msgstr "    "
+
+#: src/protocols/msn/msn.c:340
+msgid "Not accepting new users"
+msgstr ""
+
+#: src/protocols/msn/msn.c:343
+msgid "User unverified"
+msgstr ""
+
+#: src/protocols/msn/msn.c:346
+#, fuzzy
+msgid "Unknown Error Code"
+msgstr "   ."
+
+#: src/protocols/msn/msn.c:351 src/protocols/msn/msn.c:558
+#: src/protocols/msn/msn.c:813 src/protocols/msn/msn.c:2114
+#: src/protocols/msn/msn.c:2283 src/protocols/msn/msn.c:2336
 msgid "MSN Error"
 msgstr "  MSN"
 
-#: src/protocols/msn/msn.c:719
+#: src/protocols/msn/msn.c:558
+msgid "A message may not have been received."
+msgstr ""
+
+#: src/protocols/msn/msn.c:813
 msgid "Gaim was unable to send a message"
 msgstr "Gaim     "
 
-#: src/protocols/msn/msn.c:1069
+#: src/protocols/msn/msn.c:917
+#, fuzzy, c-format
+msgid "The user %s (%s) wants to add %s to his or her buddy list."
+msgstr "%s%s%s%s  %s   %s%s%s"
+
+#: src/protocols/msn/msn.c:1074
+#, c-format
+msgid "The user %s (%s) wants to add you to their buddy list"
+msgstr ""
+
+#: src/protocols/msn/msn.c:1175
 msgid "You have been disconnected. You have signed on from another location."
 msgstr " .     ."
 
-#: src/protocols/msn/msn.c:2041 src/protocols/msn/msn.c:2074
+#: src/protocols/msn/msn.c:1435 src/protocols/msn/msn.c:1679
+#, fuzzy
+msgid "Error reading from server"
+msgstr "    socket."
+
+#: src/protocols/msn/msn.c:1568
+msgid "Requesting to send password"
+msgstr ""
+
+#: src/protocols/msn/msn.c:1618
+#, fuzzy
+msgid "Unable to send password"
+msgstr "     socket"
+
+#: src/protocols/msn/msn.c:1623
+#, fuzzy
+msgid "Password sent"
+msgstr ":"
+
+#: src/protocols/msn/msn.c:1748
+#, fuzzy
+msgid "Unable to write to server"
+msgstr "      ."
+
+#: src/protocols/msn/msn.c:1754
+#, fuzzy
+msgid "Synching with server"
+msgstr "  "
+
+#: src/protocols/msn/msn.c:1920
+msgid "Away From Computer"
+msgstr ""
+
+#: src/protocols/msn/msn.c:1921
+msgid "Be Right Back"
+msgstr ""
+
+#: src/protocols/msn/msn.c:1922
+#, fuzzy
+msgid "Busy"
+msgstr ""
+
+#: src/protocols/msn/msn.c:1923
+msgid "On The Phone"
+msgstr ""
+
+#: src/protocols/msn/msn.c:1924
+msgid "Out To Lunch"
+msgstr ""
+
+#: src/protocols/msn/msn.c:1925
+#, fuzzy
+msgid "Hidden"
+msgstr "  "
+
+#: src/protocols/msn/msn.c:2041
+msgid "Reset friendly name"
+msgstr ""
+
+#: src/protocols/msn/msn.c:2114
+msgid "Friendly name too long."
+msgstr ""
+
+#: src/protocols/msn/msn.c:2129 src/protocols/msn/msn.c:2150
+#, fuzzy
+msgid "Set Friendly Name"
+msgstr " "
+
+#: src/protocols/msn/msn.c:2130
+#, fuzzy
+msgid "Set Friendly Name:"
+msgstr ":"
+
+#: src/protocols/msn/msn.c:2131
+msgid "Reset All Friendly Names"
+msgstr ""
+
+#: src/protocols/msn/msn.c:2283 src/protocols/msn/msn.c:2336
 msgid "Invalid name"
 msgstr " "
 
-#: src/protocols/napster/napster.c:450 src/protocols/oscar/oscar.c:3071
-#: src/protocols/toc/toc.c:1101
+#: src/protocols/napster/napster.c:457 src/protocols/oscar/oscar.c:3209
+#: src/protocols/toc/toc.c:1104
 msgid "Join what group:"
 msgstr "  :"
 
-#: src/protocols/oscar/oscar.c:329
+#: src/protocols/oscar/oscar.c:330
 #, c-format
 msgid "Direct IM with %s closed"
 msgstr "   %s "
 
-#: src/protocols/oscar/oscar.c:331
+#: src/protocols/oscar/oscar.c:332
 #, c-format
 msgid "Direct IM with %s failed"
 msgstr "   %s "
 
-#: src/protocols/oscar/oscar.c:369
+#: src/protocols/oscar/oscar.c:370
 msgid "connection error (rend)\n"
 msgstr "   (rend)\n"
 
-#: src/protocols/oscar/oscar.c:380
+#: src/protocols/oscar/oscar.c:381
 msgid "major connection error\n"
 msgstr "   \n"
 
-#: src/protocols/oscar/oscar.c:381 src/protocols/toc/toc.c:511
+#: src/protocols/oscar/oscar.c:382 src/protocols/toc/toc.c:511
 #: src/protocols/toc/toc.c:524 src/protocols/toc/toc.c:590
 msgid "Disconnected."
 msgstr " ."
 
-#: src/protocols/oscar/oscar.c:393 src/protocols/toc/toc.c:761
+#: src/protocols/oscar/oscar.c:394 src/protocols/toc/toc.c:761
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "      %s."
 
-#: src/protocols/oscar/oscar.c:394
+#: src/protocols/oscar/oscar.c:395
 msgid "Chat Error!"
 msgstr "  -!"
 
-#: src/protocols/oscar/oscar.c:406
+#: src/protocols/oscar/oscar.c:407
 msgid "Chat is currently unavailable"
 msgstr "-   "
 
-#: src/protocols/oscar/oscar.c:407
+#: src/protocols/oscar/oscar.c:408
 msgid "Gaim - Chat"
 msgstr "Gaim - "
 
-#: src/protocols/oscar/oscar.c:466 src/protocols/oscar/oscar.c:526
+#: src/protocols/oscar/oscar.c:467 src/protocols/oscar/oscar.c:527
 msgid "Couldn't connect to host"
 msgstr "    "
 
-#: src/protocols/oscar/oscar.c:474
+#: src/protocols/oscar/oscar.c:475
 msgid "Password sent, waiting for response\n"
 msgstr " ,   \n"
 
-#: src/protocols/oscar/oscar.c:507
+#: src/protocols/oscar/oscar.c:508
 msgid "internal connection error\n"
 msgstr "   \n"
 
-#: src/protocols/oscar/oscar.c:508
+#: src/protocols/oscar/oscar.c:509
 msgid "Unable to login to AIM"
 msgstr "    AIM"
 
-#: src/protocols/oscar/oscar.c:513
+#: src/protocols/oscar/oscar.c:514
 #, c-format
 msgid "Signon: %s"
 msgstr ": %s"
 
-#: src/protocols/oscar/oscar.c:585
+#: src/protocols/oscar/oscar.c:586
 msgid "Signed off.\n"
 msgstr ".\n"
 
-#: src/protocols/oscar/oscar.c:604 src/protocols/oscar/oscar.c:728
+#: src/protocols/oscar/oscar.c:605 src/protocols/oscar/oscar.c:730
 msgid "Could Not Connect"
 msgstr "    "
 
-#: src/protocols/oscar/oscar.c:612
+#: src/protocols/oscar/oscar.c:613
 msgid "Connection established, cookie sent"
 msgstr " ,   cookie"
 
 #. Incorrect nick/password
-#: src/protocols/oscar/oscar.c:638 src/protocols/toc/toc.c:459
+#: src/protocols/oscar/oscar.c:639 src/protocols/toc/toc.c:459
 msgid "Incorrect nickname or password."
 msgstr "   ."
 
 #. Suspended account
-#: src/protocols/oscar/oscar.c:643
+#: src/protocols/oscar/oscar.c:644
 msgid "Your account is currently suspended."
 msgstr "    ."
 
 #. connecting too frequently
-#: src/protocols/oscar/oscar.c:647
+#: src/protocols/oscar/oscar.c:648
 msgid ""
 "You have been connecting and disconnecting too frequently. Wait ten minutes "
 "and try again. If you continue to try, you will need to wait even longer."
-msgstr "   .  10    . "
-"  ,      ."
+msgstr ""
+"   .  10    . "
+"  ,      ."
 
 #. client too old
-#: src/protocols/oscar/oscar.c:652
+#: src/protocols/oscar/oscar.c:653
 msgid "The client version you are using is too old. Please upgrade at "
 msgstr "     .  ."
 
-#: src/protocols/oscar/oscar.c:656 src/protocols/toc/toc.c:542
+#: src/protocols/oscar/oscar.c:657 src/protocols/toc/toc.c:542
 msgid "Authentication Failed"
 msgstr " "
 
-#: src/protocols/oscar/oscar.c:678
+#: src/protocols/oscar/oscar.c:679
 msgid "Internal Error"
 msgstr " "
 
-#: src/protocols/oscar/oscar.c:1246 src/protocols/oscar/oscar.c:3282
+#: src/protocols/oscar/oscar.c:1248 src/protocols/oscar/oscar.c:3420
 #, c-format
 msgid "Direct IM with %s established"
 msgstr "   %s "
 
-#: src/protocols/oscar/oscar.c:1492 src/protocols/oscar/oscar.c:2367
-#, c-format
+#: src/protocols/oscar/oscar.c:1504 src/protocols/oscar/oscar.c:2456
+#, fuzzy, c-format
 msgid ""
-"The user %d has denied your request to add them to your contact list for the "
-"following reason:\n"
+"The user %lu has denied your request to add them to your contact list for "
+"the following reason:\n"
+"%s"
+msgstr ""
+" %d       :\n"
 "\n"
-msgstr " %d       :\n"
-"\n"
-
-#: src/protocols/oscar/oscar.c:1492 src/protocols/oscar/oscar.c:2367
+
+#: src/protocols/oscar/oscar.c:1504 src/protocols/oscar/oscar.c:2456
 msgid "No reason given."
 msgstr "   ."
 
-#: src/protocols/oscar/oscar.c:1493 src/protocols/oscar/oscar.c:2368
+#: src/protocols/oscar/oscar.c:1505 src/protocols/oscar/oscar.c:2457
 msgid "Gaim - ICQ Authorization Denied"
 msgstr "Gaim -   "
 
-#: src/protocols/oscar/oscar.c:1499 src/protocols/oscar/oscar.c:2374
-#, c-format
-msgid "The user %d has granted your request to add them to your contact list."
+#: src/protocols/oscar/oscar.c:1511 src/protocols/oscar/oscar.c:2463
+#, fuzzy, c-format
+msgid "The user %lu has granted your request to add them to your contact list."
 msgstr " %d      "
 
-#: src/protocols/oscar/oscar.c:1500 src/protocols/oscar/oscar.c:2375
+#: src/protocols/oscar/oscar.c:1512 src/protocols/oscar/oscar.c:2464
 msgid "Gaim - ICQ Authorization Granted"
 msgstr "Gaim -   "
 
-#: src/protocols/oscar/oscar.c:1573
+#: src/protocols/oscar/oscar.c:1585
 #, c-format
 msgid "You missed %d message from %s because it was invalid."
 msgstr " %d   %s,   ."
 
-#: src/protocols/oscar/oscar.c:1574
+#: src/protocols/oscar/oscar.c:1586
 #, c-format
 msgid "You missed %d messages from %s because they were invalid."
 msgstr " %d    %s,   ."
 
-#: src/protocols/oscar/oscar.c:1583
+#: src/protocols/oscar/oscar.c:1595
 #, c-format
 msgid "You missed %d message from %s because it was too large."
 msgstr " %d   %s,    ."
 
-#: src/protocols/oscar/oscar.c:1584
+#: src/protocols/oscar/oscar.c:1596
 #, c-format
 msgid "You missed %d messages from %s because they were too large."
 msgstr " %d   %s,    ."
 
-#: src/protocols/oscar/oscar.c:1593
+#: src/protocols/oscar/oscar.c:1605
 #, c-format
 msgid "You missed %d message from %s because the rate limit has been exceeded."
 msgstr " %d   %s,      ."
 
-#: src/protocols/oscar/oscar.c:1594
+#: src/protocols/oscar/oscar.c:1606
 #, c-format
 msgid ""
 "You missed %d messages from %s because the rate limit has been exceeded."
 msgstr " %d   %s,      ."
 
-#: src/protocols/oscar/oscar.c:1603
+#: src/protocols/oscar/oscar.c:1615
 #, c-format
 msgid "You missed %d message from %s because it was too evil."
 msgstr " %d   %s,     ."
 
-#: src/protocols/oscar/oscar.c:1604
+#: src/protocols/oscar/oscar.c:1616
 #, c-format
 msgid "You missed %d messages from %s because they are too evil."
 msgstr " %d   %s,    ."
 
-#: src/protocols/oscar/oscar.c:1613
+#: src/protocols/oscar/oscar.c:1625
 #, c-format
 msgid "You missed %d message from %s because you are too evil."
 msgstr " %d   %s,     ."
 
-#: src/protocols/oscar/oscar.c:1614
+#: src/protocols/oscar/oscar.c:1626
 #, c-format
 msgid "You missed %d messages from %s because you are too evil."
 msgstr " %d   %s,    ."
 
-#: src/protocols/oscar/oscar.c:1622
+#: src/protocols/oscar/oscar.c:1634
 #, c-format
 msgid "You missed %d message from %s for unknown reasons."
 msgstr " %d   %s   ."
 
-#: src/protocols/oscar/oscar.c:1623
+#: src/protocols/oscar/oscar.c:1635
 #, c-format
 msgid "You missed %d messages from %s for unknown reasons."
 msgstr " %d   %s   ."
 
-#: src/dialogs.c:3034 src/dialogs.c:3040 src/protocols/oscar/oscar.c:1628
-#: src/protocols/oscar/oscar.c:1666 src/protocols/oscar/oscar.c:1684
-#: src/protocols/oscar/oscar.c:2137 src/protocols/yahoo/yahoo.c:595
+#: src/dialogs.c:3076 src/dialogs.c:3082 src/protocols/oscar/oscar.c:1640
+#: src/protocols/oscar/oscar.c:1755 src/protocols/oscar/oscar.c:1773
+#: src/protocols/oscar/oscar.c:2226 src/protocols/yahoo/yahoo.c:594
 msgid "Gaim - Error"
 msgstr "Gaim - "
 
-#: src/protocols/oscar/oscar.c:1645
+#: src/protocols/oscar/oscar.c:1703
+#, c-format
+msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR>%s<BR>"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:1705
+#, c-format
+msgid "<B>Status:</B> %s<BR><HR><BR>%s<BR>"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:1734
 #, c-format
 msgid "SNAC threw error: %s\n"
 msgstr "SNAC  : %s\n"
 
-#: src/protocols/oscar/oscar.c:1647
+#: src/protocols/oscar/oscar.c:1736
 msgid "Gaim - Oscar SNAC Error"
 msgstr "Gaim -   Oscar SNAC"
 
-#: src/protocols/oscar/oscar.c:1664
+#: src/protocols/oscar/oscar.c:1753
 #, c-format
 msgid "Your message to %s did not get sent: %s"
 msgstr "  %s   : %s"
 
-#: src/protocols/oscar/oscar.c:1665 src/protocols/oscar/oscar.c:1683
+#: src/protocols/oscar/oscar.c:1754 src/protocols/oscar/oscar.c:1772
 msgid "Reason unknown"
 msgstr " "
 
-#: src/protocols/oscar/oscar.c:1682
+#: src/protocols/oscar/oscar.c:1771
 #, c-format
 msgid "User information for %s unavailable: %s"
 msgstr "   %s : %s"
 
-#: src/buddy.c:2060 src/protocols/oscar/oscar.c:1713
+#: src/buddy.c:2131 src/protocols/oscar/oscar.c:1802
 msgid "Buddy Icon"
 msgstr ""
 
-#: src/buddy.c:2063 src/protocols/oscar/oscar.c:1716
+#: src/buddy.c:2134 src/protocols/oscar/oscar.c:1805
 msgid "Voice"
 msgstr ""
 
-#: src/buddy.c:2066 src/protocols/oscar/oscar.c:1719
+#: src/buddy.c:2137 src/protocols/oscar/oscar.c:1808
 msgid "IM Image"
 msgstr "IM "
 
-#: src/buddy.c:494 src/buddy.c:2069 src/buddy.c:2507 src/prefs.c:2912
-#: src/protocols/oscar/oscar.c:1722
+#: src/buddy.c:498 src/buddy.c:2140 src/buddy.c:2581 src/prefs.c:2926
+#: src/protocols/oscar/oscar.c:1811
 msgid "Chat"
 msgstr ""
 
-#: src/buddy.c:2072 src/protocols/oscar/oscar.c:1725
+#: src/buddy.c:2143 src/protocols/oscar/oscar.c:1814
 msgid "Get File"
 msgstr " "
 
-#: src/buddy.c:2075 src/protocols/oscar/oscar.c:1728
+#: src/buddy.c:2146 src/protocols/oscar/oscar.c:1817
 msgid "Send File"
 msgstr " "
 
-#: src/buddy.c:2079 src/protocols/oscar/oscar.c:1732
+#: src/buddy.c:2150 src/protocols/oscar/oscar.c:1821
 msgid "Games"
 msgstr ""
 
-#: src/buddy.c:2082 src/protocols/oscar/oscar.c:1735
+#: src/buddy.c:2153 src/protocols/oscar/oscar.c:1824
 msgid "Stocks"
 msgstr " "
 
-#: src/buddy.c:2085 src/protocols/oscar/oscar.c:1738
+#: src/buddy.c:2156 src/protocols/oscar/oscar.c:1827
 msgid "Send Buddy List"
 msgstr " "
 
-#: src/buddy.c:2088 src/protocols/oscar/oscar.c:1741
+#: src/buddy.c:2159 src/protocols/oscar/oscar.c:1830
 msgid "EveryBuddy Bug"
 msgstr "EveryBuddy Bug"
 
-#: src/buddy.c:2091 src/protocols/oscar/oscar.c:1744
+#: src/buddy.c:2162 src/protocols/oscar/oscar.c:1833
 msgid "AP User"
 msgstr "AP "
 
-#: src/buddy.c:2094 src/protocols/oscar/oscar.c:1747
+#: src/buddy.c:2165 src/protocols/oscar/oscar.c:1836
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
-#: src/buddy.c:2097 src/protocols/oscar/oscar.c:1750
+#: src/buddy.c:2168 src/protocols/oscar/oscar.c:1839
 msgid "Nihilist"
 msgstr ""
 
-#: src/buddy.c:2100 src/protocols/oscar/oscar.c:1753
+#: src/buddy.c:2171 src/protocols/oscar/oscar.c:1842
 msgid "ICQ Server Relay"
 msgstr "  ICQ Server"
 
-#: src/buddy.c:2103 src/protocols/oscar/oscar.c:1756
+#: src/buddy.c:2174 src/protocols/oscar/oscar.c:1845
 msgid "ICQ Unknown"
 msgstr "ICQ "
 
-#: src/buddy.c:2106 src/protocols/oscar/oscar.c:1759
+#: src/buddy.c:2177 src/protocols/oscar/oscar.c:1848
 msgid "Trillian Encryption"
 msgstr " Trillian"
 
-#: src/protocols/oscar/oscar.c:1797
+#: src/protocols/oscar/oscar.c:1886
 msgid ""
-"<br><BODY BGCOLOR=WHITE><hr><I>Legend:</I><br><br><IMG "
-"SRC=\"free_icon.gif\"> : Normal AIM User<br><IMG SRC=\"aol_icon.gif\"> : AOL "
-"User <br><IMG SRC=\"dt_icon.gif\"> : Trial AIM User <br><IMG "
-"SRC=\"admin_icon.gif\"> : Administrator <br><IMG SRC=\"ab_icon.gif\"> : "
-"ActiveBuddy Interactive Agent<br><IMG SRC=\"wireless_icon.gif\"> : Wireless "
-"Device User<br>"
+"<br><BODY BGCOLOR=WHITE><hr><I>Legend:</I><br><br><IMG SRC=\"free_icon.gif"
+"\"> : Normal AIM User<br><IMG SRC=\"aol_icon.gif\"> : AOL User <br><IMG SRC="
+"\"dt_icon.gif\"> : Trial AIM User <br><IMG SRC=\"admin_icon.gif\"> : "
+"Administrator <br><IMG SRC=\"ab_icon.gif\"> : ActiveBuddy Interactive "
+"Agent<br><IMG SRC=\"wireless_icon.gif\"> : Wireless Device User<br>"
 msgstr ""
 "<br><BODY BGCOLOR=WHITE><hr><I>:</I><br><br><IMG SRC=\"free_icon.gif"
 "\"> :  AIM <br><IMG SRC=\"aol_icon.gif\"> : AOL "
@@ -855,7 +1289,8 @@
 "ActiveBuddy   <br> <IMG SRC=\\\"wireless_icon.gif\\\"> : "
 "   <br>\""
 
-#: src/protocols/oscar/oscar.c:1825
+#: src/protocols/oscar/oscar.c:1914
+#, c-format
 msgid ""
 "Username : <B>%s</B>  %s <BR>\n"
 "Warning Level : <B>%d %%</B><BR>\n"
@@ -867,27 +1302,27 @@
 "%s%s%s<BR>\n"
 "<HR><BR>\n"
 
-#: src/protocols/oscar/oscar.c:1857
+#: src/protocols/oscar/oscar.c:1946
 msgid "<i>User has no away message</i>"
 msgstr "<i>    </i>"
 
-#: src/protocols/oscar/oscar.c:1869
+#: src/protocols/oscar/oscar.c:1958
 msgid "Client Capabilities: "
 msgstr "  :"
 
-#: src/protocols/oscar/oscar.c:1877
+#: src/protocols/oscar/oscar.c:1966
 msgid "<i>No Information Provided</i>"
 msgstr "<i>  </i>"
 
-#: src/protocols/oscar/oscar.c:1900
+#: src/protocols/oscar/oscar.c:1989
 msgid "Your connection may be lost."
 msgstr "    ."
 
-#: src/protocols/oscar/oscar.c:1901
+#: src/protocols/oscar/oscar.c:1990
 msgid "AOL error"
 msgstr "AOL "
 
-#: src/protocols/oscar/oscar.c:2136
+#: src/protocols/oscar/oscar.c:2225
 msgid ""
 "The last message was not sent because you are over the rate limit. Please "
 "wait 10 seconds and try again."
@@ -895,38 +1330,68 @@
 "         . "
 "  10 ."
 
-
-#: src/dialogs.c:3563 src/protocols/oscar/oscar.c:2478
-#: src/protocols/oscar/oscar.c:3403 src/protocols/toc/toc.c:1561
-#: src/protocols/toc/toc.c:1578 src/protocols/toc/toc.c:1638
-#: src/protocols/toc/toc.c:1680 src/protocols/toc/toc.c:1799
-#: src/protocols/toc/toc.c:1829 src/protocols/toc/toc.c:1885
+#: src/dialogs.c:3604 src/protocols/oscar/oscar.c:2589
+#: src/protocols/oscar/oscar.c:3541 src/protocols/toc/toc.c:1564
+#: src/protocols/toc/toc.c:1581 src/protocols/toc/toc.c:1641
+#: src/protocols/toc/toc.c:1683 src/protocols/toc/toc.c:1802
+#: src/protocols/toc/toc.c:1832 src/protocols/toc/toc.c:1888
 msgid "Error"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3075 src/protocols/toc/toc.c:1105
+#: src/protocols/oscar/oscar.c:3192
+#, c-format
+msgid ""
+"The maximum number of buddies allowed in your buddy list is %d, and you have "
+"%d.  Until you are below the limit, some buddies will not show up as online."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3195
+#, fuzzy
+msgid "Gaim - Warning"
+msgstr "   ?"
+
+#: src/protocols/oscar/oscar.c:3213 src/protocols/toc/toc.c:1108
 msgid "Exchange:"
 msgstr ":"
 
-#: src/protocols/oscar/oscar.c:3403
+#: src/protocols/oscar/oscar.c:3541
 msgid "Unable to open Direct IM"
 msgstr "     "
 
-#: src/protocols/oscar/oscar.c:3413
+#: src/protocols/oscar/oscar.c:3551
 #, c-format
 msgid ""
 "You have selected to open a Direct IM connection with %s. Doing this will "
 "let them see your IP address, and may be a security risk. Do you wish to "
 "continue?"
 msgstr ""
-"      %s.       IP-"
-" .     .    ."
-
-#: src/protocols/oscar/oscar.c:3446
+"      %s.       IP- "
+".     .    ."
+
+#: src/protocols/oscar/oscar.c:3568
+#, c-format
+msgid ""
+"<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR><I>Remote client does not "
+"support sending status messages.</I><BR>"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3575
+#, c-format
+msgid ""
+"<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR><I>User has no status message."
+"</I><BR>"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3600
+#, fuzzy
+msgid "Get Status Msg"
+msgstr " away "
+
+#: src/protocols/oscar/oscar.c:3613
 msgid "Direct IM"
 msgstr " "
 
-#: src/protocols/oscar/oscar.c:3454
+#: src/protocols/oscar/oscar.c:3621
 msgid "Get Capabilities"
 msgstr " "
 
@@ -1070,7 +1535,7 @@
 msgid "Password Change Successful"
 msgstr "   "
 
-#: src/dialogs.c:1688 src/protocols/toc/toc.c:782
+#: src/dialogs.c:1730 src/protocols/toc/toc.c:782
 msgid "Gaim - Password Change"
 msgstr "Gaim -   "
 
@@ -1081,76 +1546,76 @@
 "anything from going through. This is only temporary, please be patient."
 msgstr ""
 "TOC   PAUSE.   , TOC    "
-"        . Gaim    "
-"   .   ,    "
+"        . Gaim     "
+"  .   ,    "
 
 #: src/protocols/toc/toc.c:788
 msgid "TOC Pause"
 msgstr "TOC "
 
-#: src/protocols/toc/toc.c:1222
+#: src/protocols/toc/toc.c:1225
 msgid "Get Dir Info"
 msgstr "    "
 
-
-#: src/protocols/toc/toc.c:1638 src/protocols/toc/toc.c:1680
-#: src/protocols/toc/toc.c:1799 src/protocols/toc/toc.c:1885
+#: src/protocols/toc/toc.c:1641 src/protocols/toc/toc.c:1683
+#: src/protocols/toc/toc.c:1802 src/protocols/toc/toc.c:1888
 msgid "Could not connect for transfer!"
 msgstr "      !"
 
-#: src/protocols/toc/toc.c:1829
+#: src/protocols/toc/toc.c:1832
 msgid "Could not write file header!"
 msgstr "    header-  !"
 
-#: src/protocols/toc/toc.c:1918
+#: src/protocols/toc/toc.c:1921
 msgid "Gaim - Save As..."
 msgstr "Gaim -  ..."
 
-#: src/protocols/toc/toc.c:1959
+#: src/protocols/toc/toc.c:1962
 #, c-format
 msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
 msgstr "%s  %s    %d (): %s (%.2f %s)%s%s"
 
-#: src/protocols/toc/toc.c:1960
+#: src/protocols/toc/toc.c:1963
 #, c-format
 msgid "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
 msgstr "%s   %s    %d : %s (%.2f %s)%s%s"
 
-#: src/protocols/toc/toc.c:1965
+#: src/protocols/toc/toc.c:1968
 #, c-format
 msgid "%s requests you to send them a file"
 msgstr "%s     "
 
-#: src/protocols/yahoo/yahoo.c:595
+#: src/protocols/yahoo/yahoo.c:594
 msgid "Your message did not get sent."
 msgstr "   ."
 
-#: src/protocols/zephyr/zephyr.c:802
+#: src/protocols/zephyr/zephyr.c:840
 msgid "ZLocate"
 msgstr "ZLocate"
 
-#: src/protocols/zephyr/zephyr.c:839
+#: src/protocols/zephyr/zephyr.c:877
 msgid "Class:"
 msgstr ":"
 
-#: src/protocols/zephyr/zephyr.c:843
+#: src/protocols/zephyr/zephyr.c:881
 msgid "Instance:"
 msgstr ":"
 
-#: src/protocols/zephyr/zephyr.c:847
+#: src/protocols/zephyr/zephyr.c:885
 msgid "Recipient:"
 msgstr ":"
 
-#: src/about.c:93
+#: src/about.c:102
 #, c-format
 msgid "About Gaim v%s"
 msgstr " Gaim %s"
 
-#: src/about.c:126
+#: src/about.c:135
+#, fuzzy
 msgid ""
-"Gaim is a client that supports AOL's Instant Messenger protocol. It is "
-"written\n"
-"using Gtk+ and is licensed under the GPL.\n"
+"Gaim is a modular Instant Messaging client capable of using AIM, ICQ,\n"
+"Yahoo!, MSN, IRC, Jabber, Napster, Zephyr, and Gadu-Gadu all at once.\n"
+"It is written using Gtk+ and is licensed under the GPL.\n"
 "\n"
 "URL: "
 msgstr ""
@@ -1159,9 +1624,15 @@
 "\n"
 "URL: "
 
-
 #: src/about.c:137
 msgid ""
+"\n"
+"\n"
+"IRC: #gaim on irc.openprojects.net"
+msgstr ""
+
+#: src/about.c:147
+msgid ""
 "Active Developers\n"
 "====================\n"
 "Rob Flynn (maintainer) [ rob@marko.net ]\n"
@@ -1191,104 +1662,102 @@
 "Nathan Walp\n"
 "Mark Doliner\n"
 "\n"
-"  \n""===================\n"
+"  \n"
+"===================\n"
 "Jim Duchek\n"
 "Eric Warmenhoven                   [ warmenhoven@yahoo.com ]\n"
 "Mark Spencer ( )   [ markster@marko.net ]"
 
-
-#: src/about.c:155 src/aim.c:318 src/buddy.c:2633 src/buddy_chat.c:1311
-#: src/buddy_chat.c:1408 src/buddy_chat.c:1438 src/conversation.c:2795
-#: src/dialogs.c:568 src/dialogs.c:3858 src/multi.c:1057 src/plugins.c:277
-#: src/prefs.c:2535 src/prpl.c:438 src/prpl.c:679 src/server.c:1050
-msgid "Close"
-msgstr ""
-
 #. this makes the sizes not work.
 #. GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
 #. gtk_widget_grab_default(button);
-#: src/about.c:175
+#: src/about.c:185
 msgid "Web Site"
 msgstr " "
 
-#: src/aim.c:151 src/buddy.c:2626
+#: src/aim.c:153 src/buddy.c:2709
 msgid "Signoff"
 msgstr ""
 
-#: src/aim.c:163
+#: src/aim.c:165
 msgid "Please enter your logon"
 msgstr "   "
 
-#: src/aim.c:163 src/multi.c:1388 src/server.c:55
+#: src/aim.c:165 src/multi.c:1400 src/server.c:55
 msgid "Signon Error"
 msgstr "  "
 
-#: src/aim.c:261
+#: src/aim.c:263
 msgid "Gaim - Login"
 msgstr "Gaim - "
 
-#: src/aim.c:279
+#: src/aim.c:281
 msgid "Screen Name: "
 msgstr ":"
 
-#: src/aim.c:295
+#: src/aim.c:297
 msgid "Password: "
 msgstr ":"
 
-#: src/aim.c:316 src/buddy.c:2630
+#: src/aim.c:318 src/buddy.c:2713
 msgid "Quit"
 msgstr "  Gaim"
 
-#: src/aim.c:321 src/aim.c:819 src/buddy.c:2656
+#: src/aim.c:323 src/aim.c:831 src/buddy.c:2739
 msgid "Accounts"
 msgstr ""
 
-#: src/aim.c:323 src/multi.c:903
+#: src/aim.c:325 src/multi.c:915
 msgid "Signon"
 msgstr ""
 
-#: src/aim.c:355
+#: src/aim.c:357
 msgid "About"
 msgstr ""
 
-#: src/aim.c:356 src/prefs.c:1619 src/prefs.c:1893
+#: src/aim.c:358 src/prefs.c:1633 src/prefs.c:1905
 msgid "Options"
 msgstr ""
 
-#: src/aim.c:358 src/aim.c:822 src/buddy.c:2674
+#: src/aim.c:360 src/aim.c:834 src/buddy.c:2757
 msgid "Plugins"
 msgstr ""
 
-#: src/aim.c:816 src/buddy.c:2666
+#: src/aim.c:828 src/buddy.c:2749
 msgid "Preferences"
 msgstr ""
 
-#: src/applet.c:199
+#: src/aim.c:838 src/multi.c:1472
+#, fuzzy
+msgid "Auto-login"
+msgstr " "
+
+#: src/applet.c:109
 msgid "Attempting to sign on...."
 msgstr "  ..."
 
-#: src/applet.c:202
+#: src/applet.c:112
 msgid "Offline. Click to bring up login box."
 msgstr ".      login box."
 
-#: src/applet.c:218
+#: src/applet.c:128
 #, c-format
 msgid "Away: %d pending."
 msgstr ": %d ."
 
-#: src/applet.c:221
+#: src/applet.c:131
 msgid "Away."
 msgstr "."
 
-#: src/applet.c:296 src/away.c:388
+#: src/applet.c:200 src/away.c:388
 msgid "New Away Message"
 msgstr "   "
 
-#: src/applet.c:444
+#: src/applet.c:348
 msgid "Can't create Gaim applet!"
 msgstr "    Gaim !"
 
-#: src/applet.c:465
+#: src/applet.c:368
 msgid "About..."
 msgstr ""
 
@@ -1312,87 +1781,74 @@
 msgid "Set All Away"
 msgstr " -> "
 
-#. Put the buttons in the box
-#: src/buddy.c:488 src/buddy.c:2741 src/buddy_chat.c:1443
-#: src/conversation.c:2328 src/conversation.c:2810 src/dialogs.c:890
-#: src/dialogs.c:1072 src/dialogs.c:2053 src/multi.c:1041 src/prefs.c:2029
-#: src/prefs.c:2371 src/prefs.c:2405
-msgid "Add"
-msgstr ""
-
-#: src/buddy.c:489 src/buddy.c:2742 src/dialogs.c:900 src/dialogs.c:1047
+#: src/buddy.c:493 src/buddy.c:2828 src/dialogs.c:942 src/dialogs.c:1089
 msgid "Group"
 msgstr ""
 
-#: src/buddy.c:490 src/buddy.c:2743 src/buddy_chat.c:1445
-#: src/conversation.c:2314 src/conversation.c:2807 src/prefs.c:2043
-#: src/prefs.c:2375 src/prefs.c:2409
-msgid "Remove"
-msgstr ""
-
-#: src/buddy.c:495 src/buddy.c:646 src/buddy.c:798 src/buddy.c:2505
-#: src/buddy_chat.c:850 src/buddy_chat.c:1267
+#: src/buddy.c:499 src/buddy.c:664 src/buddy.c:834 src/buddy.c:2579
+#: src/buddy_chat.c:861 src/buddy_chat.c:1278
 msgid "IM"
 msgstr ""
 
-#: src/buddy.c:496 src/buddy.c:2506 src/buddy_chat.c:866 src/buddy_chat.c:1275
-#: src/buddy_chat.c:1451 src/conversation.c:2828
+#: src/buddy.c:500 src/buddy.c:2580 src/buddy_chat.c:877 src/buddy_chat.c:1286
+#: src/buddy_chat.c:1462 src/conversation.c:2897
 msgid "Info"
 msgstr ""
 
 #. Put the buttons in the box
-#: src/buddy.c:651 src/buddy.c:803 src/dialogs.c:1039 src/dialogs.c:3417
-#: src/dialogs.c:3432
+#: src/buddy.c:669 src/buddy.c:839 src/dialogs.c:1081 src/dialogs.c:3458
+#: src/dialogs.c:3473
 msgid "Alias"
 msgstr ""
 
-#: src/buddy.c:656 src/buddy.c:822
+#: src/buddy.c:674 src/buddy.c:858
 msgid "Add Buddy Pounce"
 msgstr " "
 
-#: src/buddy.c:663 src/buddy.c:828
+#: src/buddy.c:681 src/buddy.c:864
 msgid "View Log"
 msgstr ""
 
-#: src/buddy.c:785 src/buddy.c:816
+#: src/buddy.c:821 src/buddy.c:852
 msgid "Rename"
 msgstr ""
 
-#: src/buddy.c:810
+#: src/buddy.c:846
 msgid "Un-Alias"
 msgstr " "
 
-#: src/buddy.c:1581 src/buddy.c:2649
+#: src/buddy.c:1645 src/buddy.c:2732
 msgid "Buddy Pounce"
 msgstr ""
 
-#: src/buddy.c:1661
+#: src/buddy.c:1725
 msgid "New Buddy Pounce"
 msgstr " "
 
-#: src/buddy.c:1679
+#: src/buddy.c:1743
 msgid "Remove Buddy Pounce"
 msgstr "  "
 
-#: src/buddy.c:1707
+#: src/buddy.c:1771
 msgid "[Click to edit]"
 msgstr "[]"
 
-#: src/buddy.c:2183
+#: src/buddy.c:2254
 #, c-format
 msgid "Logged in: %s\n"
 msgstr ": %s\n"
 
-#: src/buddy.c:2195
+#: src/buddy.c:2266
+#, c-format
 msgid "Warnings: %d%%\n"
 msgstr ": %d%%\n"
 
-#: src/buddy.c:2207
+#: src/buddy.c:2278
 #, c-format
 msgid "Capabilities: %s\n"
 msgstr ": %s\n"
 
-#: src/buddy.c:2211
+#: src/buddy.c:2282
 #, c-format
 msgid ""
 "Alias: %s               \n"
@@ -1403,117 +1859,127 @@
 ": %s\n"
 "%s%s%s%s%s%s"
 
-#: src/buddy.c:2215
+#: src/buddy.c:2286
 msgid "Idle: "
 msgstr ":"
 
-#: src/buddy.c:2286 src/buddy.c:2291
+#: src/buddy.c:2359 src/buddy.c:2364
 #, c-format
 msgid "%s logged in."
 msgstr "%s ."
 
-#: src/buddy.c:2350 src/buddy.c:2355
+#: src/buddy.c:2424 src/buddy.c:2429
 #, c-format
 msgid "%s logged out."
 msgstr "%s ."
 
-#: src/buddy.c:2540
+#: src/buddy.c:2614
 msgid "Information on selected Buddy"
 msgstr ""
 
-#: src/buddy.c:2541 src/dialogs.c:697
+#: src/buddy.c:2615 src/dialogs.c:697
 msgid "Send Instant Message"
 msgstr " "
 
-#: src/buddy.c:2542
+#: src/buddy.c:2616
 msgid "Start/join a Buddy Chat"
 msgstr ""
 
-#: src/buddy.c:2543
+#: src/buddy.c:2617
 msgid "Activate Away Message"
 msgstr "    "
 
-#: src/buddy.c:2606
+#: src/buddy.c:2689
 msgid "File"
 msgstr ""
 
-#: src/buddy.c:2610
+#: src/buddy.c:2693
 msgid "Add A Buddy"
 msgstr ""
 
-#: src/buddy.c:2612
+#: src/buddy.c:2695
 msgid "Join A Chat"
 msgstr "  "
 
-#: src/buddy.c:2614
+#: src/buddy.c:2697
 msgid "New Instant Message"
 msgstr " "
 
-#: src/buddy.c:2616 src/dialogs.c:749
+#: src/buddy.c:2699 src/dialogs.c:759
 msgid "Get User Info"
 msgstr ""
 
-#: src/buddy.c:2621
+#: src/buddy.c:2704
 msgid "Import Buddy List"
 msgstr "  "
 
-#: src/buddy.c:2639
+#: src/buddy.c:2722
 msgid "Tools"
 msgstr ""
 
-#: src/buddy.c:2662
+#: src/buddy.c:2745
 msgid "Protocol Actions"
 msgstr "  "
 
-#: src/buddy.c:2668
+#: src/buddy.c:2751
 msgid "View System Log"
 msgstr " "
 
-#: src/buddy.c:2680
+#: src/buddy.c:2763
 msgid "Perl"
 msgstr "Perl"
 
-#: src/buddy.c:2683
+#: src/buddy.c:2766
 msgid "Load Script"
 msgstr " "
 
-#: src/buddy.c:2687
+#: src/buddy.c:2770
 msgid "Unload All Scripts"
 msgstr "  "
 
-#: src/buddy.c:2691
+#: src/buddy.c:2774
 msgid "List Scripts"
 msgstr " "
 
-#: src/buddy.c:2699
+#: src/buddy.c:2782
 msgid "Help"
 msgstr ""
 
-#: src/buddy.c:2704
+#: src/buddy.c:2787
+#, fuzzy
+msgid "Online Help"
+msgstr ""
+
+#: src/buddy.c:2788
+#, fuzzy
+msgid "Debug Window"
+msgstr " Debug "
+
+#: src/buddy.c:2789
 msgid "About Gaim"
 msgstr " Gaim"
 
-#: src/buddy.c:2721 src/prefs.c:2891
+#: src/buddy.c:2807 src/prefs.c:2905
 msgid "Buddy List"
 msgstr ""
 
-#: src/buddy.c:2774
+#: src/buddy.c:2860
 msgid "Add a new Buddy"
 msgstr ""
 
-#: src/buddy.c:2775
+#: src/buddy.c:2861
 msgid "Add a new Group"
 msgstr " "
 
-#: src/buddy.c:2776
+#: src/buddy.c:2862
 msgid "Remove selected Buddy/Group"
 msgstr "  "
 
-#: src/buddy.c:2803
+#: src/buddy.c:2889
 msgid "Edit Buddies"
 msgstr ""
 
-#: src/buddy.c:2846
+#: src/buddy.c:2932
 msgid "Gaim - Buddy List"
 msgstr "Gaim - "
 
@@ -1521,21 +1987,17 @@
 msgid "Join Chat"
 msgstr "  "
 
-#: src/buddy_chat.c:272
-msgid "Buddy Chat"
-msgstr ""
-
 #: src/buddy_chat.c:283
 msgid "Join Chat As:"
 msgstr "   :"
 
-#: src/buddy_chat.c:304 src/buddy_chat.c:392 src/dialogs.c:450
-#: src/dialogs.c:540 src/dialogs.c:715 src/dialogs.c:773 src/dialogs.c:892
-#: src/dialogs.c:1068 src/dialogs.c:1431 src/dialogs.c:1636 src/dialogs.c:1760
-#: src/dialogs.c:1820 src/dialogs.c:2042 src/dialogs.c:2224 src/dialogs.c:2399
-#: src/dialogs.c:2470 src/dialogs.c:3166 src/dialogs.c:3419 src/dialogs.c:3600
-#: src/dialogs.c:3971 src/dialogs.c:4077 src/dialogs.c:4736 src/multi.c:769
-#: src/multi.c:899 src/prpl.c:150 src/prpl.c:224
+#: src/buddy_chat.c:304 src/buddy_chat.c:392 src/dialogs.c:449
+#: src/dialogs.c:539 src/dialogs.c:715 src/dialogs.c:816 src/dialogs.c:934
+#: src/dialogs.c:1110 src/dialogs.c:1473 src/dialogs.c:1678 src/dialogs.c:1802
+#: src/dialogs.c:1862 src/dialogs.c:2084 src/dialogs.c:2266 src/dialogs.c:2441
+#: src/dialogs.c:2512 src/dialogs.c:3208 src/dialogs.c:3460 src/dialogs.c:3641
+#: src/dialogs.c:4012 src/dialogs.c:4118 src/dialogs.c:4777 src/multi.c:781
+#: src/multi.c:911 src/prpl.c:150 src/prpl.c:224
 msgid "Cancel"
 msgstr ""
 
@@ -1543,16 +2005,16 @@
 msgid "Join"
 msgstr ""
 
-#: src/buddy_chat.c:393 src/buddy_chat.c:396 src/buddy_chat.c:1317
-#: src/buddy_chat.c:1407
+#: src/buddy_chat.c:393 src/buddy_chat.c:396 src/buddy_chat.c:1328
+#: src/buddy_chat.c:1418
 msgid "Invite"
 msgstr ""
 
-#: src/buddy_chat.c:412 src/dialogs.c:1259 src/dialogs.c:3427
+#: src/buddy_chat.c:412 src/dialogs.c:1301 src/dialogs.c:3468
 msgid "Buddy"
 msgstr ""
 
-#: src/buddy_chat.c:417 src/prefs.c:1992
+#: src/buddy_chat.c:417 src/prefs.c:2004
 msgid "Message"
 msgstr ""
 
@@ -1560,286 +2022,282 @@
 msgid "Gaim - Invite Buddy Into Chat Room"
 msgstr "Gaim -     "
 
-#: src/buddy_chat.c:857
+#: src/buddy_chat.c:868
 msgid "Un-Ignore"
 msgstr "-"
 
-#: src/buddy_chat.c:859 src/buddy_chat.c:1271
+#: src/buddy_chat.c:870 src/buddy_chat.c:1282
 msgid "Ignore"
 msgstr ""
 
 #. don't remove them from ignored in case they re-enter
-#: src/buddy_chat.c:922 src/buddy_chat.c:1034 src/buddy_chat.c:1497
-#: src/buddy_chat.c:1530
+#: src/buddy_chat.c:933 src/buddy_chat.c:1045 src/buddy_chat.c:1508
+#: src/buddy_chat.c:1541
 #, c-format
 msgid "%d %s in room"
 msgstr "%d %s  "
 
-#: src/buddy_chat.c:930
+#: src/buddy_chat.c:941
 #, c-format
 msgid "%s entered the room."
 msgstr "%s   "
 
-#: src/buddy_chat.c:996
+#: src/buddy_chat.c:1007
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s    %s"
 
-#: src/buddy_chat.c:1043
+#: src/buddy_chat.c:1054
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s   (%s)."
 
-#: src/buddy_chat.c:1045
+#: src/buddy_chat.c:1056
 #, c-format
 msgid "%s left the room."
 msgstr "%s  ."
 
-#: src/buddy_chat.c:1144
+#: src/buddy_chat.c:1155
 msgid "Gaim - Group Chats"
 msgstr "Gaim -  "
 
-#: src/buddy_chat.c:1207
+#: src/buddy_chat.c:1218
 msgid "Topic:"
 msgstr ":"
 
-#: src/buddy_chat.c:1248
+#: src/buddy_chat.c:1259
 msgid "0 people in room"
 msgstr "0   "
 
-#: src/buddy_chat.c:1322 src/buddy_chat.c:1406
+#: src/buddy_chat.c:1333 src/buddy_chat.c:1417
 msgid "Whisper"
 msgstr ""
 
-#: src/buddy_chat.c:1327 src/buddy_chat.c:1404 src/buddy_chat.c:1453
-#: src/conversation.c:2839
+#: src/buddy_chat.c:1338 src/buddy_chat.c:1415 src/buddy_chat.c:1464
+#: src/conversation.c:2908
 msgid "Send"
 msgstr ""
 
-#: src/buddy_chat.c:1447 src/conversation.c:2816
+#: src/buddy_chat.c:1458 src/conversation.c:2885
 msgid "Block"
 msgstr ""
 
-#: src/buddy_chat.c:1449 src/conversation.c:2822 src/dialogs.c:425
-#: src/dialogs.c:454
+#: src/buddy_chat.c:1460 src/conversation.c:2891 src/dialogs.c:424
+#: src/dialogs.c:453
 msgid "Warn"
 msgstr ""
 
-#: src/conversation.c:413
+#: src/conversation.c:431
 msgid "Gaim - Save Conversation"
 msgstr "Gaim -   "
 
-#: src/conversation.c:474
+#: src/conversation.c:492
 msgid "Gaim - Insert Image"
 msgstr "Gaim -   "
 
-#: src/conversation.c:1278
+#: src/conversation.c:1336
 msgid "Unable to send message: too large"
 msgstr "    :  "
 
-#: src/conversation.c:1278 src/conversation.c:1282
+#: src/conversation.c:1336 src/conversation.c:1340
 msgid "Message Error"
 msgstr "  "
 
-#: src/conversation.c:1282
+#: src/conversation.c:1340
 msgid "Unable to send message: Unknown reason"
 msgstr "    :  "
 
-#: src/conversation.c:1501
+#: src/conversation.c:1559
 #, c-format
 msgid "Currently at %d, "
 msgstr "   %d,"
 
-#: src/conversation.c:1509
+#: src/conversation.c:1567
 #, c-format
 msgid "Setting position to %d\n"
 msgstr "  %d\n"
 
-#: src/conversation.c:2110 src/prefs.c:1305
+#: src/conversation.c:2170 src/prefs.c:1308
 msgid "Bold Text"
 msgstr ""
 
-#: src/conversation.c:2110
+#: src/conversation.c:2170
 msgid "Bold"
 msgstr ""
 
-#: src/conversation.c:2114
+#: src/conversation.c:2174
 msgid "Italics Text"
 msgstr ""
 
-#: src/conversation.c:2115
+#: src/conversation.c:2175
 msgid "Italics"
 msgstr ""
 
-#: src/conversation.c:2118 src/prefs.c:1317
+#: src/conversation.c:2178 src/prefs.c:1320
 msgid "Underline Text"
 msgstr ""
 
-#: src/conversation.c:2119
+#: src/conversation.c:2179
 msgid "Underline"
 msgstr ""
 
-#: src/conversation.c:2123 src/prefs.c:1323
+#: src/conversation.c:2183 src/prefs.c:1326
 msgid "Strike through Text"
 msgstr "  "
 
-#: src/conversation.c:2123
+#: src/conversation.c:2183
 msgid "Strike"
 msgstr ""
 
-#: src/conversation.c:2129
+#: src/conversation.c:2189
 msgid "Decrease font size"
 msgstr "  "
 
-#: src/conversation.c:2129
+#: src/conversation.c:2189
 msgid "Small"
 msgstr ""
 
-#: src/conversation.c:2132
+#: src/conversation.c:2192
 msgid "Normal font size"
 msgstr "   "
 
-#: src/conversation.c:2132
+#: src/conversation.c:2192
 msgid "Normal"
 msgstr ""
 
-#: src/conversation.c:2135
+#: src/conversation.c:2195
 msgid "Increase font size"
 msgstr "  "
 
-#: src/conversation.c:2135
+#: src/conversation.c:2195
 msgid "Big"
 msgstr ""
 
-#: src/conversation.c:2142 src/dialogs.c:2841 src/dialogs.c:2865
+#: src/conversation.c:2202 src/dialogs.c:2883 src/dialogs.c:2907
 msgid "Select Font"
 msgstr "  "
 
-#: src/conversation.c:2143
+#: src/conversation.c:2203
 msgid "Font"
 msgstr ""
 
-#: src/conversation.c:2146 src/prefs.c:1353
+#: src/conversation.c:2206 src/prefs.c:1356
 msgid "Text Color"
 msgstr "  "
 
-#: src/conversation.c:2147 src/conversation.c:2151
+#: src/conversation.c:2207 src/conversation.c:2211
 msgid "Color"
 msgstr ""
 
-#: src/conversation.c:2151 src/prefs.c:1371
+#: src/conversation.c:2211 src/prefs.c:1374
 msgid "Background Color"
 msgstr " "
 
-#: src/conversation.c:2158 src/dialogs.c:2464
+#: src/conversation.c:2218 src/dialogs.c:2506
 msgid "Insert Link"
 msgstr "  "
 
-#: src/conversation.c:2159
+#: src/conversation.c:2219
 msgid "Link"
 msgstr ""
 
-#: src/conversation.c:2162
+#: src/conversation.c:2222
 msgid "Insert smiley face"
 msgstr "  "
 
-#: src/conversation.c:2162
+#: src/conversation.c:2222
 msgid "Smiley"
 msgstr "  "
 
-#: src/conversation.c:2165
+#: src/conversation.c:2225
 msgid "Insert IM Image"
 msgstr "  "
 
-#: src/conversation.c:2165
+#: src/conversation.c:2225
 msgid "Image"
 msgstr ""
 
-#: src/conversation.c:2172
+#: src/conversation.c:2232
 msgid "Enable logging"
 msgstr "  e"
 
-#: src/conversation.c:2173 src/prefs.c:254
+#: src/conversation.c:2233 src/prefs.c:254
 msgid "Logging"
 msgstr ""
 
-#: src/conversation.c:2182
+#: src/conversation.c:2242
 msgid "Save Conversation"
 msgstr "  "
 
-#: src/conversation.c:2183 src/dialogs.c:1640 src/dialogs.c:1824
-#: src/dialogs.c:3178 src/dialogs.c:3867 src/dialogs.c:4744
+#: src/conversation.c:2243 src/dialogs.c:1682 src/dialogs.c:1866
+#: src/dialogs.c:3220 src/dialogs.c:3908 src/dialogs.c:4785
 msgid "Save"
 msgstr ""
 
-#: src/conversation.c:2187
-msgid "Enable sounds"
-msgstr "  "
-
-#: src/conversation.c:2188
+#: src/conversation.c:2247 src/conversation.c:2248
 msgid "Sound"
 msgstr ""
 
-#: src/conversation.c:2668
+#: src/conversation.c:2729
 msgid "Gaim - Conversations"
 msgstr "Gaim - "
 
-#: src/conversation.c:2755
+#: src/conversation.c:2816
 msgid "Send message as: "
 msgstr " :"
 
-#: src/conversation.c:3373
+#: src/conversation.c:3453
 msgid "Gaim - Save Icon"
 msgstr "Gaim -   "
 
-#: src/conversation.c:3400
+#: src/conversation.c:3487
 msgid "Disable Animation"
 msgstr "  "
 
-#: src/conversation.c:3405
+#: src/conversation.c:3492
 msgid "Enable Animation"
 msgstr "  "
 
-#: src/conversation.c:3411
+#: src/conversation.c:3498
 msgid "Hide Icon"
 msgstr "  "
 
-#: src/conversation.c:3417
+#: src/conversation.c:3504
 msgid "Save Icon As..."
 msgstr "   ..."
 
-#: src/dialogs.c:413
+#: src/dialogs.c:412
 msgid "Gaim - Warn user?"
 msgstr "   ?"
 
-#: src/dialogs.c:433
+#: src/dialogs.c:432
 #, c-format
 msgid "Do you really want to warn %s?"
 msgstr "     %s?"
 
-#: src/dialogs.c:438
+#: src/dialogs.c:437
 msgid "Warn anonymously?"
 msgstr " ?"
 
-#: src/dialogs.c:442
+#: src/dialogs.c:441
 msgid "Anonymous warnings are less harsh."
 msgstr "   -."
 
-#: src/dialogs.c:470
+#: src/dialogs.c:469
 #, c-format
 msgid "Removing '%s' from buddylist.\n"
 msgstr "  '%s'  .\n"
 
-#: src/dialogs.c:495
+#: src/dialogs.c:494
 #, c-format
 msgid "Gaim - Remove %s?"
 msgstr "Gaim -   %s?"
 
-#: src/dialogs.c:508
+#: src/dialogs.c:507
 msgid "Remove Buddy"
 msgstr ""
 
-#: src/dialogs.c:518
+#: src/dialogs.c:517
 #, c-format
 msgid ""
 "You are about to remove '%s' from\n"
@@ -1848,15 +2306,14 @@
 "  '%s'  .\n"
 "  ?"
 
-
-#: src/dialogs.c:530 src/prpl.c:154 src/prpl.c:228
+#: src/dialogs.c:529 src/prpl.c:154 src/prpl.c:228
 msgid "Accept"
 msgstr ""
 
 #. Build OK Button
-#: src/dialogs.c:637 src/dialogs.c:720 src/dialogs.c:778 src/dialogs.c:1435
-#: src/dialogs.c:1764 src/dialogs.c:1915 src/dialogs.c:2223 src/dialogs.c:2403
-#: src/dialogs.c:2469 src/dialogs.c:3976 src/dialogs.c:4082 src/multi.c:774
+#: src/dialogs.c:635 src/dialogs.c:720 src/dialogs.c:821 src/dialogs.c:1477
+#: src/dialogs.c:1806 src/dialogs.c:1957 src/dialogs.c:2265 src/dialogs.c:2445
+#: src/dialogs.c:2511 src/dialogs.c:4017 src/dialogs.c:4123 src/multi.c:786
 msgid "OK"
 msgstr "OK"
 
@@ -1868,338 +2325,343 @@
 msgid "IM who:"
 msgstr " :"
 
-#: src/dialogs.c:756
+#: src/dialogs.c:768
 msgid "User:"
 msgstr ":"
 
+#: src/dialogs.c:777
+#, fuzzy
+msgid "Account:"
+msgstr ""
+
 #. Finish up
-#: src/dialogs.c:783
+#: src/dialogs.c:826
 msgid "Gaim - Get User Info"
 msgstr ""
 
-#: src/dialogs.c:898
+#: src/dialogs.c:940
 msgid "Add Group"
 msgstr " "
 
-#: src/dialogs.c:923
+#: src/dialogs.c:965
 msgid "Gaim - Add Group"
 msgstr "Gaim -  "
 
-#: src/dialogs.c:1007
+#: src/dialogs.c:1049
 msgid "Gaim - Add Buddy"
 msgstr "Gaim -  "
 
-#: src/dialogs.c:1019
+#: src/dialogs.c:1061
 msgid "Add Buddy"
 msgstr " "
 
-#: src/dialogs.c:1029
+#: src/dialogs.c:1071
 msgid "Contact"
 msgstr ""
 
 #. Set up stuff for the account box
-#: src/dialogs.c:1055
+#: src/dialogs.c:1097
 msgid "Add To"
 msgstr " "
 
-#: src/dialogs.c:1092
+#: src/dialogs.c:1134
 msgid "Please enter a buddy to pounce."
 msgstr "   "
 
-#: src/dialogs.c:1092
+#: src/dialogs.c:1134
 msgid "Buddy Pounce Error"
 msgstr "  "
 
-#: src/dialogs.c:1228
+#: src/dialogs.c:1270
 msgid "Gaim - New Buddy Pounce"
 msgstr "Gaim -  "
 
 #. <pounce type="who">
-#: src/dialogs.c:1239
+#: src/dialogs.c:1281
 msgid "Pounce Who"
 msgstr " "
 
-#: src/dialogs.c:1250
+#: src/dialogs.c:1292
 msgid "Account"
 msgstr ""
 
 #. </pounce type="who">
 #. <pounce type="when">
-#: src/dialogs.c:1276
+#: src/dialogs.c:1318
 msgid "Pounce When"
 msgstr " "
 
-#: src/dialogs.c:1286
+#: src/dialogs.c:1328
 msgid "Pounce on sign on"
 msgstr "  "
 
-#: src/dialogs.c:1295
+#: src/dialogs.c:1337
 msgid "Pounce on return from away"
 msgstr "    "
 
-#: src/dialogs.c:1304
+#: src/dialogs.c:1346
 msgid "Pounce on return from idle"
 msgstr "    "
 
-#: src/dialogs.c:1313
+#: src/dialogs.c:1355
 msgid "Pounce when buddy is typing to you"
 msgstr "    "
 
 #. </pounce type="when">
 #. <pounce type="action">
-#: src/dialogs.c:1323
+#: src/dialogs.c:1365
 msgid "Pounce Action"
 msgstr ""
 
-#: src/dialogs.c:1334
+#: src/dialogs.c:1376
 msgid "Open IM Window"
 msgstr "   "
 
-#: src/dialogs.c:1343
+#: src/dialogs.c:1385
 msgid "Popup Notification"
 msgstr "  "
 
-#: src/dialogs.c:1352
+#: src/dialogs.c:1394
 msgid "Send Message"
 msgstr "  "
 
-#: src/dialogs.c:1373
+#: src/dialogs.c:1415
 msgid "Execute command on pounce"
 msgstr ""
 
-#: src/dialogs.c:1395
+#: src/dialogs.c:1437
 msgid "Play sound on pounce"
 msgstr ""
 
 #. </pounce type="action">
-#: src/dialogs.c:1417
+#: src/dialogs.c:1459
 msgid "Save this pounce after activation"
 msgstr "    "
 
-#: src/dialogs.c:1503
+#: src/dialogs.c:1545
 msgid "Gaim - Set Dir Info"
 msgstr "    "
 
-#: src/dialogs.c:1512
+#: src/dialogs.c:1554
 msgid "Directory Info"
 msgstr "  "
 
-#: src/dialogs.c:1534
+#: src/dialogs.c:1576
 msgid "Allow Web Searches To Find Your Info"
 msgstr "P        ."
 
 #. Line 1
-#: src/dialogs.c:1537 src/dialogs.c:2242
+#: src/dialogs.c:1579 src/dialogs.c:2284
 msgid "First Name"
 msgstr ""
 
 #. Line 2
-#: src/dialogs.c:1548 src/dialogs.c:2254
+#: src/dialogs.c:1590 src/dialogs.c:2296
 msgid "Middle Name"
 msgstr " "
 
 #. Line 3
-#: src/dialogs.c:1560 src/dialogs.c:2266
+#: src/dialogs.c:1602 src/dialogs.c:2308
 msgid "Last Name"
 msgstr " "
 
 #. Line 4
-#: src/dialogs.c:1571 src/dialogs.c:2278
+#: src/dialogs.c:1613 src/dialogs.c:2320
 msgid "Maiden Name"
 msgstr " "
 
 #. Line 6
-#: src/dialogs.c:1593 src/dialogs.c:2301
+#: src/dialogs.c:1635 src/dialogs.c:2343
 msgid "State"
 msgstr ""
 
-#: src/dialogs.c:1658
+#: src/dialogs.c:1700
 msgid "New Passwords Do Not Match"
 msgstr "  "
 
-#: src/dialogs.c:1658 src/dialogs.c:1663
+#: src/dialogs.c:1700 src/dialogs.c:1705
 msgid "Gaim - Change Password Error"
 msgstr "Gaim -     "
 
-#: src/dialogs.c:1663
+#: src/dialogs.c:1705
 msgid "Fill out all fields completely"
 msgstr "  "
 
-#: src/dialogs.c:1718
+#: src/dialogs.c:1760
 msgid "Original Password"
 msgstr " "
 
-#: src/dialogs.c:1732
+#: src/dialogs.c:1774
 msgid "New Password"
 msgstr " "
 
-#: src/dialogs.c:1746
+#: src/dialogs.c:1788
 msgid "New Password (again)"
 msgstr "  ()"
 
-#: src/dialogs.c:1787
+#: src/dialogs.c:1829
 msgid "Gaim - Set User Info"
 msgstr "Gaim -   "
 
-#: src/dialogs.c:1899
+#: src/dialogs.c:1941
 msgid "Below are the results of your search: "
 msgstr "  "
 
-#: src/dialogs.c:2032 src/dialogs.c:2039
+#: src/dialogs.c:2074 src/dialogs.c:2081
 msgid "Permit"
 msgstr ""
 
-#: src/dialogs.c:2034 src/dialogs.c:2041
+#: src/dialogs.c:2076 src/dialogs.c:2083
 msgid "Deny"
 msgstr ""
 
-#: src/dialogs.c:2078
+#: src/dialogs.c:2120
 msgid "Gaim - Add Permit"
 msgstr "Gaim -   "
 
-#: src/dialogs.c:2080
+#: src/dialogs.c:2122
 msgid "Gaim - Add Deny"
 msgstr "Gaim -   "
 
-#: src/dialogs.c:2140
+#: src/dialogs.c:2182
 msgid "Gaim - Log Conversation"
 msgstr "Gaim -   "
 
-#: src/dialogs.c:2218 src/dialogs.c:2381
+#: src/dialogs.c:2260 src/dialogs.c:2423
 msgid "Search for Buddy"
 msgstr ""
 
-#: src/dialogs.c:2346
+#: src/dialogs.c:2388
 msgid "Gaim - Find Buddy By Info"
 msgstr "Gaim -   "
 
-#: src/dialogs.c:2375
+#: src/dialogs.c:2417
 msgid "Gaim - Find Buddy By Email"
 msgstr "Gaim -   Email"
 
-#: src/dialogs.c:2515
+#: src/dialogs.c:2557
 msgid "Gaim - Add URL"
 msgstr "Gaim -  URL"
 
-#: src/dialogs.c:2666 src/dialogs.c:2687 src/dialogs.c:2741
+#: src/dialogs.c:2708 src/dialogs.c:2729 src/dialogs.c:2783
 msgid "Select Text Color"
 msgstr "  "
 
-#: src/dialogs.c:2720
+#: src/dialogs.c:2762
 msgid "Select Background Color"
 msgstr " "
 
-#: src/dialogs.c:2942
+#: src/dialogs.c:2984
 msgid "Import to:"
 msgstr " :"
 
-#: src/dialogs.c:2966
+#: src/dialogs.c:3008
 msgid "Gaim - Import Buddy List"
 msgstr "Gaim -   "
 
 #. We shouldn't allow a blank title
-#: src/dialogs.c:3033
+#: src/dialogs.c:3075
 msgid "You cannot create an away message with a blank title"
 msgstr "      "
 
 #. We shouldn't allow a blank message
-#: src/dialogs.c:3040
+#: src/dialogs.c:3082
 msgid "You cannot create an empty away message"
 msgstr "     "
 
-#: src/dialogs.c:3108
+#: src/dialogs.c:3150
 msgid "Gaim - New away message"
 msgstr "Gaim -    "
 
-#: src/dialogs.c:3118
+#: src/dialogs.c:3160
 msgid "New away message"
 msgstr "   "
 
-#: src/dialogs.c:3131
+#: src/dialogs.c:3173
 msgid "Away title: "
 msgstr "  "
 
-#: src/dialogs.c:3170
+#: src/dialogs.c:3212
 msgid "Use"
 msgstr ""
 
-#: src/dialogs.c:3174
+#: src/dialogs.c:3216
 msgid "Save & Use"
 msgstr "  "
 
 #. show everything
-#: src/dialogs.c:3372
+#: src/dialogs.c:3413
 msgid "Smile!"
 msgstr "!"
 
-#: src/dialogs.c:3425
+#: src/dialogs.c:3466
 msgid "Alias Buddy"
 msgstr ""
 
-#: src/dialogs.c:3458
+#: src/dialogs.c:3499
 msgid "Gaim - Alias Buddy"
 msgstr "Gaim - "
 
-#: src/dialogs.c:3530
+#: src/dialogs.c:3571
 msgid "Gaim - Save Log File"
 msgstr "Gaim -    "
 
-#: src/dialogs.c:3562
+#: src/dialogs.c:3603
 #, c-format
 msgid "Unable to remove file %s - %s"
 msgstr "      %s - %s"
 
-#: src/dialogs.c:3590
+#: src/dialogs.c:3631
 msgid "Really clear log?"
 msgstr "  -?"
 
-#: src/dialogs.c:3605
+#: src/dialogs.c:3646
 msgid "Okay"
 msgstr ""
 
-#: src/dialogs.c:3776
+#: src/dialogs.c:3817
 msgid "Date"
 msgstr ""
 
-#: src/dialogs.c:3839
+#: src/dialogs.c:3880
 msgid "Conversation"
 msgstr ""
 
-#: src/dialogs.c:3862
+#: src/dialogs.c:3903
 msgid "Clear"
 msgstr ""
 
-#: src/dialogs.c:3940
+#: src/dialogs.c:3981
 msgid "Gaim - Rename Group"
 msgstr "Gaim -   "
 
-#: src/dialogs.c:3950
+#: src/dialogs.c:3991
 msgid "Rename Group"
 msgstr ""
 
-#: src/dialogs.c:3957 src/dialogs.c:4063
+#: src/dialogs.c:3998 src/dialogs.c:4104
 msgid "New name:"
 msgstr " :"
 
-#: src/dialogs.c:4046
+#: src/dialogs.c:4087
 msgid "Gaim - Rename Buddy"
 msgstr "Gaim - "
 
-#: src/dialogs.c:4056
+#: src/dialogs.c:4097
 msgid "Rename Buddy"
 msgstr ""
 
 #. Below is basically stolen from plugins.c
-#: src/dialogs.c:4140
+#: src/dialogs.c:4181
 msgid "Gaim - Select Perl Script"
 msgstr "Gaim -   Perl "
 
-#: src/gaimrc.c:1117
+#: src/gaimrc.c:1136
 #, c-format
 msgid "Could not open config file %s."
 msgstr "       %s."
 
-#: src/gaimrc.c:1118
+#: src/gaimrc.c:1137
 msgid "Preferences Error"
 msgstr "  "
 
@@ -2212,100 +2674,110 @@
 msgid "g003: Error opening connection.\n"
 msgstr "g003:     .\n"
 
-#: src/multi.c:452
+#: src/module.c:106 src/module.c:112 src/module.c:122
+#, fuzzy
+msgid "Plugin Error"
+msgstr "  "
+
+#: src/multi.c:454
 msgid "Gaim - Load Buddy Icon"
 msgstr "Gaim -   "
 
-#: src/multi.c:495
+#: src/multi.c:497
 msgid "Buddy Icon File:"
 msgstr "  :"
 
-#: src/multi.c:506
+#: src/multi.c:508
 msgid "Browse"
 msgstr ""
 
-#: src/multi.c:511 src/prefs.c:1545
+#: src/multi.c:513 src/prefs.c:1548
 msgid "Reset"
 msgstr ""
 
-#: src/multi.c:538
+#: src/multi.c:540
 msgid "Screenname:"
 msgstr ":"
 
-#: src/multi.c:558
+#: src/multi.c:559
+#, fuzzy
+msgid "Alias:"
+msgstr ""
+
+#: src/multi.c:569
 msgid "Protocol:"
 msgstr ":"
 
-#: src/multi.c:563
+#: src/multi.c:574
 msgid "Remember Password"
 msgstr "  "
 
-#: src/multi.c:564
+#: src/multi.c:575
 msgid "Auto-Login"
 msgstr " "
 
-#: src/multi.c:604
+#: src/multi.c:616
 msgid "New Mail Notifications"
 msgstr "   "
 
-#: src/multi.c:694
+#: src/multi.c:706
 msgid "Register with server"
 msgstr "  "
 
-#: src/multi.c:752
+#: src/multi.c:764
 msgid "Gaim - Modify Account"
 msgstr "Gaim -   "
 
-#: src/multi.c:871
+#: src/multi.c:883
 msgid "Enter Password"
 msgstr ""
 
-#: src/multi.c:935
+#: src/multi.c:947
 msgid ""
 "You cannot log this account in; you do not have the protocol it uses loaded, "
 "or the protocol does not have a login function."
 msgstr ""
-"      .    , "
-"     "
-
-#: src/multi.c:937
+"      .    ,    "
+"  "
+
+#: src/multi.c:949
 msgid "Login Error"
 msgstr "  "
 
-#: src/multi.c:966
+#: src/multi.c:978
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "      %s?"
 
-#: src/multi.c:1003
+#: src/multi.c:1015
 msgid "Gaim - Account Editor"
 msgstr "Gaim -   "
 
-#: src/multi.c:1022
+#: src/multi.c:1034
 msgid "Select All"
 msgstr ""
 
-#: src/multi.c:1027
+#: src/multi.c:1039
 msgid "Select Autos"
 msgstr "  "
 
-#: src/multi.c:1031
+#: src/multi.c:1043
 msgid "Select None"
 msgstr "o"
 
-#: src/multi.c:1045
+#: src/multi.c:1057
 msgid "Modify"
 msgstr ""
 
-#: src/multi.c:1049
+#: src/multi.c:1061
 msgid "Sign On/Off"
 msgstr "/"
 
-#: src/multi.c:1053
+#: src/multi.c:1065
 msgid "Delete"
 msgstr ""
 
-#: src/multi.c:1368
+#: src/multi.c:1380
 #, c-format
 msgid ""
 "%s\n"
@@ -2314,25 +2786,25 @@
 "%s\n"
 "%s: %s"
 
-#: src/multi.c:1387
+#: src/multi.c:1399
 #, c-format
 msgid "%s was unable to sign on"
 msgstr "%s    "
 
-#: src/multi.c:1398
+#: src/multi.c:1410
 msgid "Notice"
 msgstr ""
 
-#: src/multi.c:1408
+#: src/multi.c:1420
 #, c-format
 msgid "%s has been signed off"
 msgstr "%s "
 
-#: src/multi.c:1409
+#: src/multi.c:1421
 msgid "Connection Error"
 msgstr "  "
 
-#: src/perl.c:856
+#: src/perl.c:875
 msgid "Perl Scripts"
 msgstr "Perl "
 
@@ -2393,9 +2865,9 @@
 msgid "General Options"
 msgstr ""
 
-#: src/prefs.c:200 src/prefs.c:383 src/prefs.c:551 src/prefs.c:665
-#: src/prefs.c:918 src/prefs.c:1068 src/prefs.c:1293 src/prefs.c:1615
-#: src/prefs.c:1889 src/prefs.c:2322
+#: src/prefs.c:200 src/prefs.c:384 src/prefs.c:552 src/prefs.c:667
+#: src/prefs.c:921 src/prefs.c:1071 src/prefs.c:1296 src/prefs.c:1629
+#: src/prefs.c:1901 src/prefs.c:2334
 msgid "All options take effect immediately unless otherwise noted."
 msgstr "   ,      ."
 
@@ -2469,8 +2941,8 @@
 msgstr ""
 
 #: src/prefs.c:291
-msgid "KFM"
-msgstr "KFM"
+msgid "Konqueror"
+msgstr ""
 
 #: src/prefs.c:292
 msgid "Opera"
@@ -2480,27 +2952,32 @@
 msgid "Netscape"
 msgstr "Netscape"
 
-#: src/prefs.c:296
+#: src/prefs.c:294
+msgid "Mozilla"
+msgstr ""
+
+#: src/prefs.c:297
 msgid "Pop up new window by default"
 msgstr "    "
 
-#: src/prefs.c:303
+#: src/prefs.c:304
 msgid "GNOME URL Handler"
 msgstr "GNOME URL "
 
-#: src/prefs.c:305
+#: src/prefs.c:306
 msgid "Galeon"
 msgstr ""
 
-#: src/prefs.c:306
-msgid "Manual"
-msgstr ""
-
-#: src/prefs.c:375
+#: src/prefs.c:307
+#, c-format
+msgid "Manual (%s for URL)"
+msgstr ""
+
+#: src/prefs.c:376
 msgid "Proxy Options"
 msgstr ""
 
-#: src/prefs.c:387
+#: src/prefs.c:388
 msgid ""
 "Not all protocols can use these proxy options. Please see the README file "
 "for details."
@@ -2508,367 +2985,377 @@
 "      !\n"
 " README   ."
 
-#: src/prefs.c:392
+#: src/prefs.c:393
 msgid "Proxy Type"
 msgstr " Proxy"
 
-#: src/prefs.c:404
+#: src/prefs.c:405
 msgid "Proxy Server"
 msgstr "Proxy "
 
-#: src/prefs.c:407
+#: src/prefs.c:408
 msgid "No Proxy"
 msgstr " "
 
-#: src/prefs.c:419
+#: src/prefs.c:420
 msgid "SOCKS 4"
 msgstr "SOCKS 4"
 
-#: src/prefs.c:429
+#: src/prefs.c:430
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
-#: src/prefs.c:438
+#: src/prefs.c:439
 msgid "HTTP"
 msgstr "HTTP"
 
-#: src/prefs.c:462
+#: src/prefs.c:463
 msgid "Host"
 msgstr ""
 
-#: src/prefs.c:478
+#: src/prefs.c:479
 msgid "Port"
 msgstr ""
 
-#: src/prefs.c:495
+#: src/prefs.c:496
 msgid "User"
 msgstr ""
 
-#: src/prefs.c:511
+#: src/prefs.c:512
 msgid "Password"
 msgstr ""
 
-#: src/prefs.c:543
+#: src/prefs.c:544
 msgid "Buddy List Options"
 msgstr " "
 
-#: src/prefs.c:555
+#: src/prefs.c:556
 msgid "Buddy List Window"
 msgstr "  "
 
-#: src/prefs.c:568
+#: src/prefs.c:569
 msgid "Tab Placement:"
 msgstr "  :"
 
-#: src/prefs.c:572 src/prefs.c:1001 src/prefs.c:1151
+#: src/prefs.c:573 src/prefs.c:1004 src/prefs.c:1154
 msgid "Top"
 msgstr ""
 
-#: src/prefs.c:573 src/prefs.c:1003 src/prefs.c:1153
+#: src/prefs.c:574 src/prefs.c:1006 src/prefs.c:1156
 msgid "Bottom"
 msgstr ""
 
-#: src/prefs.c:585
+#: src/prefs.c:586
 msgid "Hide IM/Info/Chat buttons"
 msgstr " // "
 
-#: src/prefs.c:587
+#: src/prefs.c:588
 msgid "Automatically show buddy list on sign on"
 msgstr "     "
 
-#: src/prefs.c:589
+#: src/prefs.c:590
 msgid "Display Buddy List near applet"
 msgstr "   "
 
-#: src/prefs.c:592
+#: src/prefs.c:593
 msgid "Save Window Size/Position"
 msgstr " /  "
 
-#: src/prefs.c:595
+#: src/prefs.c:596
 msgid "Show pictures on buttons"
 msgstr " / "
 
 #: src/prefs.c:600
+msgid "Raise Buddy List on Signons and Signoffs"
+msgstr ""
+
+#: src/prefs.c:602
 msgid "Group Displays"
 msgstr ""
 
-#: src/prefs.c:612
+#: src/prefs.c:614
 msgid "Hide groups with no online buddies"
 msgstr "    "
 
-#: src/prefs.c:618
+#: src/prefs.c:620
 msgid "Show numbers in groups"
 msgstr "   "
 
-#: src/prefs.c:620
+#: src/prefs.c:622
 msgid "Buddy Displays"
 msgstr " - "
 
-#: src/prefs.c:632
+#: src/prefs.c:634
 msgid "Show buddy type icons"
 msgstr "  "
 
-#: src/prefs.c:633
+#: src/prefs.c:635
 msgid "Show warning levels"
 msgstr "   "
 
-#: src/prefs.c:639
+#: src/prefs.c:641
 msgid "Show idle times"
 msgstr "   "
 
-#: src/prefs.c:640
+#: src/prefs.c:642
 msgid "Grey idle buddies"
 msgstr "  "
 
-#: src/prefs.c:657
+#: src/prefs.c:659
 msgid "Conversation Options"
 msgstr ""
 
-#: src/prefs.c:669
+#: src/prefs.c:671
 msgid "Keyboard Options"
 msgstr ""
 
-#: src/prefs.c:681
-msgid "Enter sends message"
-msgstr "Enter  "
-
-#: src/prefs.c:682
-msgid "Control-Enter sends message"
-msgstr "Ctrl-Enter  "
-
 #: src/prefs.c:683
+msgid "Enter sends message"
+msgstr "Enter  "
+
+#: src/prefs.c:684
+msgid "Control-Enter sends message"
+msgstr "Ctrl-Enter  "
+
+#: src/prefs.c:685
 msgid "Escape closes window"
 msgstr "Esc  "
 
-#: src/prefs.c:689
+#: src/prefs.c:686
+#, fuzzy
+msgid "Control-W closes window"
+msgstr "Esc  "
+
+#: src/prefs.c:692
 msgid "Control-{B/I/U/S} inserts HTML tags"
 msgstr "Ctrl-{B/I/U/S}  HTML "
 
-#: src/prefs.c:690
+#: src/prefs.c:693
 msgid "Control-(number) inserts smileys"
 msgstr "Ctrl-()  "
 
-#: src/prefs.c:691
+#: src/prefs.c:694
 msgid "F2 toggles timestamp display"
 msgstr "F2    "
 
-#: src/prefs.c:693
+#: src/prefs.c:696
 msgid "Display and General Options"
 msgstr "  "
 
-#: src/prefs.c:705
+#: src/prefs.c:708
 msgid "Show graphical smileys"
 msgstr " "
 
-#: src/prefs.c:706
+#: src/prefs.c:709
 msgid "Show timestamp on messages"
 msgstr "   "
 
-#: src/prefs.c:707
+#: src/prefs.c:710
 msgid "Show URLs as links"
 msgstr " URL  "
 
-#: src/prefs.c:708
+#: src/prefs.c:711
 msgid "Highlight misspelled words"
 msgstr "  "
 
-#: src/prefs.c:709 src/prefs.c:1911
+#: src/prefs.c:712 src/prefs.c:1923
 msgid "Sending messages removes away status"
 msgstr "  "
 
-#: src/prefs.c:710 src/prefs.c:1924
+#: src/prefs.c:713 src/prefs.c:1936
 msgid "Queue new messages when away"
 msgstr "    "
 
-#: src/prefs.c:716
+#: src/prefs.c:719
 msgid "Ignore colors"
 msgstr " "
 
-#: src/prefs.c:717
+#: src/prefs.c:720
 msgid "Ignore font faces"
 msgstr " "
 
-#: src/prefs.c:718
+#: src/prefs.c:721
 msgid "Ignore font sizes"
 msgstr "   "
 
-#: src/prefs.c:719
+#: src/prefs.c:722
 msgid "Ignore TiK Automated Messages"
 msgstr " TiK  "
 
-#: src/prefs.c:720 src/prefs.c:1909
+#: src/prefs.c:723 src/prefs.c:1921
 msgid "Ignore new conversations when away"
 msgstr "    "
 
-#: src/prefs.c:909
+#: src/prefs.c:912
 msgid "IM Options"
 msgstr "?  ?"
 
-#: src/prefs.c:922 src/prefs.c:2907
+#: src/prefs.c:925 src/prefs.c:2921
 msgid "IM Window"
 msgstr "  "
 
-#: src/prefs.c:938 src/prefs.c:1088
+#: src/prefs.c:941 src/prefs.c:1091
 msgid "Show buttons as: "
 msgstr " :"
 
-#: src/prefs.c:942 src/prefs.c:1093
+#: src/prefs.c:945 src/prefs.c:1096
 msgid "Pictures And Text"
 msgstr "  "
 
-#: src/prefs.c:943 src/prefs.c:1095
+#: src/prefs.c:946 src/prefs.c:1098
 msgid "Pictures"
 msgstr ""
 
-#: src/prefs.c:944 src/prefs.c:1096
+#: src/prefs.c:947 src/prefs.c:1099
 msgid "Text"
 msgstr ""
 
-#: src/prefs.c:955
+#: src/prefs.c:958
 msgid "Show all conversations in one tabbed window"
 msgstr "      "
 
-#: src/prefs.c:957
+#: src/prefs.c:960
 msgid "Show chats in the same tabbed window"
 msgstr "-     "
 
-#: src/prefs.c:964 src/prefs.c:1116
+#: src/prefs.c:967 src/prefs.c:1119
 msgid "Raise windows on events"
 msgstr "   "
 
-#: src/prefs.c:965
+#: src/prefs.c:968
 msgid "Show logins in window"
 msgstr "   "
 
-#: src/prefs.c:966
-msgid "Show aliases in tabs/titles"
+#: src/prefs.c:969
+#, fuzzy
+msgid "Show aliases in tabs/titles/ticker"
 msgstr "   /"
 
-#: src/prefs.c:967
+#: src/prefs.c:970
 msgid "Hide window on send"
 msgstr "    "
 
-#: src/prefs.c:969 src/prefs.c:1119
+#: src/prefs.c:972 src/prefs.c:1122
 msgid "Window Sizes"
 msgstr "  "
 
-#: src/prefs.c:977 src/prefs.c:1127
+#: src/prefs.c:980 src/prefs.c:1130
 msgid "New window width:"
 msgstr "  "
 
-#: src/prefs.c:978 src/prefs.c:1128
+#: src/prefs.c:981 src/prefs.c:1131
 msgid "New window height:"
 msgstr "  "
 
-#: src/prefs.c:979 src/prefs.c:1129
+#: src/prefs.c:982 src/prefs.c:1132
 msgid "Entry widget height:"
 msgstr "    "
 
-#: src/prefs.c:981 src/prefs.c:1131
+#: src/prefs.c:984 src/prefs.c:1134
 msgid "Tab Placement"
 msgstr "  "
 
-#: src/prefs.c:1010 src/prefs.c:1160
+#: src/prefs.c:1013 src/prefs.c:1163
 msgid "Left"
 msgstr ""
 
-#: src/prefs.c:1012 src/prefs.c:1162
+#: src/prefs.c:1015 src/prefs.c:1165
 msgid "Right"
 msgstr ""
 
-#: src/prefs.c:1016
+#: src/prefs.c:1019
 msgid "Buddy Icons"
 msgstr ""
 
-#: src/prefs.c:1028
+#: src/prefs.c:1031
 msgid "Hide Buddy Icons"
 msgstr "  "
 
-#: src/prefs.c:1034
+#: src/prefs.c:1037
 msgid "Disable Buddy Icon Animation"
 msgstr "   "
 
-#: src/prefs.c:1060
+#: src/prefs.c:1063
 msgid "Chat Options"
 msgstr ""
 
-#: src/prefs.c:1072
+#: src/prefs.c:1075
 msgid "Group Chat Window"
 msgstr "   "
 
-#: src/prefs.c:1107
+#: src/prefs.c:1110
 msgid "Show all chats in one tabbed window"
 msgstr "-     "
 
-#: src/prefs.c:1109
+#: src/prefs.c:1112
 msgid "Show conversations in the same tabbed window"
 msgstr "     "
 
-#: src/prefs.c:1117
+#: src/prefs.c:1120
 msgid "Show people joining/leaving in window"
 msgstr " /    "
 
-#: src/prefs.c:1165
+#: src/prefs.c:1168
 msgid "Tab Completion"
 msgstr " "
 
-#: src/prefs.c:1177
+#: src/prefs.c:1180
 msgid "Tab-Complete Nicks"
 msgstr "Tab -  "
 
-#: src/prefs.c:1183
+#: src/prefs.c:1186
 msgid "Old-Style Tab Completion"
 msgstr "    "
 
-#: src/prefs.c:1285 src/prefs.c:2917
+#: src/prefs.c:1288 src/prefs.c:2931
 msgid "Font Options"
 msgstr ""
 
-#: src/prefs.c:1311
+#: src/prefs.c:1314
 msgid "Italic Text"
 msgstr " "
 
-#: src/prefs.c:1355 src/prefs.c:1373 src/prefs.c:1395
+#: src/prefs.c:1358 src/prefs.c:1376 src/prefs.c:1398
 msgid "Select"
 msgstr ""
 
-#: src/prefs.c:1393
+#: src/prefs.c:1396
 msgid "Font Face for Text"
 msgstr "  "
 
-#: src/prefs.c:1408
+#: src/prefs.c:1411
 msgid "Font Size for Text"
 msgstr "    "
 
-#: src/prefs.c:1505
+#: src/prefs.c:1508
 msgid "Gaim - Sound Configuration"
 msgstr "Gaim -  - "
 
-#: src/prefs.c:1540
+#: src/prefs.c:1543
 msgid "Test"
 msgstr ""
 
-#: src/prefs.c:1550
+#: src/prefs.c:1553
 msgid "Choose..."
 msgstr "..."
 
-#: src/prefs.c:1607
+#: src/prefs.c:1621
 msgid "Sound Options"
 msgstr ""
 
-#: src/prefs.c:1635
+#: src/prefs.c:1649
 msgid "No sounds when you log in"
 msgstr "    "
 
-#: src/prefs.c:1641 src/prefs.c:1910
+#: src/prefs.c:1655 src/prefs.c:1922
 msgid "Sounds while away"
 msgstr "  "
 
-#: src/prefs.c:1651
+#: src/prefs.c:1665
 msgid "Sound method"
 msgstr " "
 
-#: src/prefs.c:1725
+#: src/prefs.c:1739
 #, c-format
 msgid ""
 "Sound command\n"
@@ -2877,103 +3364,103 @@
 " \n"
 "(%s  )"
 
-#: src/prefs.c:1737
+#: src/prefs.c:1751
 msgid "Sound played when:"
 msgstr " :"
 
-#: src/prefs.c:1881 src/prefs.c:2939
+#: src/prefs.c:1893 src/prefs.c:2953
 msgid "Away Messages"
 msgstr "  "
 
-#: src/prefs.c:1918
+#: src/prefs.c:1930
 msgid "Don't send auto-response"
 msgstr "  -"
 
-#: src/prefs.c:1919
+#: src/prefs.c:1931
 msgid "Only send auto-response when idle"
 msgstr "-   "
 
-#: src/prefs.c:1934
+#: src/prefs.c:1946
 msgid "Time between sending auto-responses (in seconds):"
 msgstr " /   ( ):"
 
-#: src/prefs.c:1949
+#: src/prefs.c:1961
 msgid "Auto Away after"
 msgstr "  "
 
-#: src/prefs.c:1963
+#: src/prefs.c:1975
 msgid "minutes using"
 msgstr " "
 
-#: src/prefs.c:1976
+#: src/prefs.c:1988
 msgid "Messages"
 msgstr ""
 
-#: src/prefs.c:2033
+#: src/prefs.c:2045
 msgid "Edit"
 msgstr ""
 
-#: src/prefs.c:2037
+#: src/prefs.c:2049
 msgid "Make Away"
 msgstr " "
 
-#: src/prefs.c:2314
+#: src/prefs.c:2326
 msgid "Privacy Options"
 msgstr ""
 
-#: src/prefs.c:2330
+#: src/prefs.c:2342
 msgid "Set privacy for:"
 msgstr " :"
 
-#: src/prefs.c:2349
+#: src/prefs.c:2361
 msgid "Allow all users to contact me"
 msgstr "o "
 
-#: src/prefs.c:2350
+#: src/prefs.c:2362
 msgid "Allow only the users below"
 msgstr "    "
 
-#: src/prefs.c:2352
+#: src/prefs.c:2364
 msgid "Allow List"
 msgstr " "
 
-#: src/prefs.c:2383
+#: src/prefs.c:2395
 msgid "Deny all users"
 msgstr " "
 
-#: src/prefs.c:2384
+#: src/prefs.c:2396
 msgid "Block the users below"
 msgstr "  -"
 
-#: src/prefs.c:2386
+#: src/prefs.c:2398
 msgid "Block List"
 msgstr " "
 
-#: src/prefs.c:2481
+#: src/prefs.c:2493
 msgid "Gaim - Preferences"
 msgstr "Gaim - "
 
-#: src/prefs.c:2564
+#: src/prefs.c:2576
 msgid "Gaim debug output window"
 msgstr "Gaim debug"
 
-#: src/prefs.c:2873
+#: src/prefs.c:2887
 msgid "General"
 msgstr ""
 
-#: src/prefs.c:2878
+#: src/prefs.c:2892
 msgid "Proxy"
 msgstr ""
 
-#: src/prefs.c:2902
+#: src/prefs.c:2916
 msgid "Conversations"
 msgstr ""
 
-#: src/prefs.c:2928
+#: src/prefs.c:2942
 msgid "Sounds"
 msgstr ""
 
-#: src/prefs.c:2950
+#: src/prefs.c:2964
 msgid "Privacy"
 msgstr ""
 
@@ -3016,12 +3503,12 @@
 msgid "Open Mail"
 msgstr "? ?"
 
-#: src/prpl.c:564
+#: src/prpl.c:570
 #, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s%s"
 msgstr "%s%s%s%s  %s   %s%s%s"
 
-#: src/prpl.c:572
+#: src/prpl.c:578
 msgid ""
 "\n"
 "\n"
@@ -3031,21 +3518,21 @@
 "\n"
 "      ?"
 
-#: src/prpl.c:615
+#: src/prpl.c:621
 msgid ""
 "You do not currently have any protocols available that are able to register "
 "new accounts."
 msgstr "         ."
 
-#: src/prpl.c:652
+#: src/prpl.c:658
 msgid "Gaim - Registration"
 msgstr "Gaim - "
 
-#: src/prpl.c:667
+#: src/prpl.c:673
 msgid "Registration Information"
 msgstr " "
 
-#: src/prpl.c:684
+#: src/prpl.c:690
 msgid "Register"
 msgstr "??"
 
@@ -3074,6 +3561,59 @@
 msgid "No"
 msgstr ""
 
-#: src/server.c:1054
+#: src/server.c:1076
 msgid "More Info"
 msgstr " "
+
+#: src/sound.c:63
+#, fuzzy
+msgid "Buddy logs in"
+msgstr ""
+
+#: src/sound.c:64
+#, fuzzy
+msgid "Buddy logs out"
+msgstr ""
+
+#: src/sound.c:65
+#, fuzzy
+msgid "Message received"
+msgstr "  "
+
+#: src/sound.c:66
+msgid "Message received begins conversation"
+msgstr ""
+
+#: src/sound.c:67
+#, fuzzy
+msgid "Message sent"
+msgstr ""
+
+#: src/sound.c:68
+msgid "Person enters chat"
+msgstr ""
+
+#: src/sound.c:69
+msgid "Person leaves chat"
+msgstr ""
+
+#: src/sound.c:70
+msgid "You talk in chat"
+msgstr ""
+
+#: src/sound.c:71
+msgid "Others talk in chat"
+msgstr ""
+
+#: src/sound.c:74
+msgid "Someone says your name in chat"
+msgstr ""
+
+#~ msgid "Enable sounds"
+#~ msgstr "  "
+
+#~ msgid "KFM"
+#~ msgstr "KFM"
+
+#~ msgid "Manual"
+#~ msgstr ""
--- a/po/cs.po	Tue Jul 02 05:41:30 2002 +0000
+++ b/po/cs.po	Tue Jul 02 05:42:26 2002 +0000
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gaim 0.48\n"
-"POT-Creation-Date: 2002-04-26 01:28-0400\n"
+"POT-Creation-Date: 2002-06-25 00:10-0400\n"
 "PO-Revision-Date: 2002-05-05 17:15GMT+1\n"
 "Last-Translator: Honza Krl <hkral@centrum.cz>\n"
 "Language-Team: esk jazyk <cs@li.org>\n"
@@ -13,7 +13,87 @@
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/protocols/gg/gg.c:71
+#: plugins/chatlist.c:67 src/buddy_chat.c:272
+msgid "Buddy Chat"
+msgstr "Chat s kamardem"
+
+#: plugins/chatlist.c:166 plugins/chatlist.c:168 plugins/chatlist.c:407
+#: plugins/chatlist.c:409
+#, fuzzy
+msgid "Gaim Chat"
+msgstr "Gaim - Chat"
+
+#: plugins/chatlist.c:339 src/about.c:165 src/aim.c:320 src/buddy.c:2716
+#: src/buddy_chat.c:1322 src/buddy_chat.c:1419 src/buddy_chat.c:1449
+#: src/conversation.c:2864 src/dialogs.c:567 src/dialogs.c:3899
+#: src/multi.c:1069 src/plugins.c:277 src/prefs.c:2547 src/prpl.c:438
+#: src/prpl.c:685 src/server.c:1072
+msgid "Close"
+msgstr "Zavt"
+
+#: plugins/chatlist.c:344
+#, fuzzy
+msgid "Chat Rooms"
+msgstr "Monosti chatu"
+
+#: plugins/chatlist.c:363
+msgid "Refresh"
+msgstr ""
+
+#. Put the buttons in the box
+#: plugins/chatlist.c:364 src/buddy.c:492 src/buddy.c:2827
+#: src/buddy_chat.c:1454 src/conversation.c:2389 src/conversation.c:2879
+#: src/dialogs.c:932 src/dialogs.c:1114 src/dialogs.c:2095 src/multi.c:1053
+#: src/prefs.c:2041 src/prefs.c:2383 src/prefs.c:2417
+msgid "Add"
+msgstr "Pidat"
+
+#: plugins/chatlist.c:365 src/buddy.c:494 src/buddy.c:2829
+#: src/buddy_chat.c:1456 src/conversation.c:2375 src/conversation.c:2876
+#: src/prefs.c:2055 src/prefs.c:2387 src/prefs.c:2421
+msgid "Remove"
+msgstr "Zruit"
+
+#: plugins/chatlist.c:388
+msgid "List of available chats"
+msgstr ""
+
+#: plugins/chatlist.c:398
+msgid "List of subscribed chats"
+msgstr ""
+
+#: plugins/gtik.c:699
+msgid "Gnome Stock Ticker Properties"
+msgstr ""
+
+#: plugins/gtik.c:711
+msgid "Update Frequency in min"
+msgstr ""
+
+#: plugins/gtik.c:727
+msgid "Enter symbols delimited with \"+\" in the box below."
+msgstr ""
+
+#. OUTPUT FORMAT and SCROLL DIRECTION
+#: plugins/gtik.c:737
+msgid "Check this box to display only symbols and price:"
+msgstr ""
+
+#: plugins/gtik.c:738
+msgid "Check this box to scroll left to right:"
+msgstr ""
+
+#: plugins/gtik.c:974
+#, fuzzy
+msgid "(No"
+msgstr "Ne"
+
+#: plugins/gtik.c:975
+#, fuzzy
+msgid "Change"
+msgstr "Kanl:"
+
+#: src/protocols/gg/gg.c:71 src/protocols/msn/msn.c:1919
 msgid "Available"
 msgstr "Ptomen"
 
@@ -21,8 +101,8 @@
 msgid "Available for friends only"
 msgstr "Ptomen jen pro ptele"
 
-#: src/applet.c:293 src/buddy.c:494 src/buddy.c:2513 src/buddy.c:2649
-#: src/protocols/gg/gg.c:73 src/protocols/jabber/jabber.c:703
+#: src/applet.c:197 src/buddy.c:497 src/buddy.c:2582 src/buddy.c:2727
+#: src/protocols/gg/gg.c:73 src/protocols/jabber/jabber.c:1118
 msgid "Away"
 msgstr "Pry"
 
@@ -38,7 +118,7 @@
 msgid "Invisible for friends only"
 msgstr "Neviditeln jen pro ptele"
 
-#: src/protocols/gg/gg.c:77 src/protocols/jabber/jabber.c:699
+#: src/protocols/gg/gg.c:77 src/protocols/jabber/jabber.c:1114
 msgid "Unavailable"
 msgstr "Nedostupn"
 
@@ -70,7 +150,7 @@
 msgid "Unknown Error Code."
 msgstr "Neznmy chybov kd."
 
-#: src/protocols/gg/gg.c:302
+#: src/protocols/gg/gg.c:302 src/protocols/msn/msn.c:2050
 #, c-format
 msgid "Status: %s"
 msgstr "Stav: %s"
@@ -122,7 +202,8 @@
 msgstr "Nemu se pipojit k serveru."
 
 #: src/protocols/gg/gg.c:533
-msgid "Send as messege"
+#, fuzzy
+msgid "Send as message"
 msgstr "Poli jako zprvu"
 
 #: src/protocols/gg/gg.c:541
@@ -139,7 +220,8 @@
 msgstr "Spojen na %s perueno"
 
 #: src/protocols/gg/gg.c:594
-msgid "You are trying to send a messege to an invalid Gadu-Gadu UIN."
+#, fuzzy
+msgid "You are trying to send a message to an invalid Gadu-Gadu UIN."
 msgstr "Pokoute se poslat zprvu na nesprvn Gadu-Gadu UIN."
 
 #: src/protocols/gg/gg.c:595 src/protocols/gg/gg.c:657
@@ -198,7 +280,7 @@
 msgstr "Pohlav"
 
 #. Line 5
-#: src/dialogs.c:1584 src/dialogs.c:2292 src/protocols/gg/gg.c:729
+#: src/dialogs.c:1624 src/dialogs.c:2332 src/protocols/gg/gg.c:729
 msgid "City"
 msgstr "Msto"
 
@@ -272,7 +354,12 @@
 msgid "Directory Search"
 msgstr "Prohledvn seznamu"
 
-#: src/dialogs.c:1701 src/protocols/gg/gg.c:1160 src/protocols/gg/gg.c:1177
+#.
+#. } else if (!strcmp(act, _("Set Dir Info"))) {
+#. show_set_dir(gc);
+#.
+#: src/dialogs.c:1741 src/protocols/gg/gg.c:1160 src/protocols/gg/gg.c:1177
+#: src/protocols/jabber/jabber.c:3748 src/protocols/jabber/jabber.c:3761
 msgid "Change Password"
 msgstr "Zmnit heslo"
 
@@ -291,12 +378,13 @@
 msgstr "Sma Buddy List ze serveru"
 
 #: src/protocols/icq/gaim_icq.c:308
-msgid "Send messege through server"
+#, fuzzy
+msgid "Send message through server"
 msgstr "Poli zprvu pes server"
 
 #: src/protocols/icq/gaim_icq.c:469 src/protocols/irc/irc.c:1851
-#: src/protocols/jabber/jabber.c:2163 src/protocols/oscar/oscar.c:3432
-#: src/protocols/toc/toc.c:1216
+#: src/protocols/jabber/jabber.c:2860 src/protocols/oscar/oscar.c:3593
+#: src/protocols/toc/toc.c:1219
 msgid "Get Info"
 msgstr "Zskej Info"
 
@@ -334,7 +422,7 @@
 "connection?"
 msgstr "%s si vydal pm chat. Chcete vytvoit pm spojen?"
 
-#: src/protocols/irc/irc.c:1001
+#: src/protocols/irc/irc.c:1001 src/protocols/msn/msn.c:315
 msgid "Unable to write"
 msgstr "Nemu zapisovat"
 
@@ -361,7 +449,7 @@
 msgid "Channel:"
 msgstr "Kanl:"
 
-#: src/multi.c:547 src/protocols/irc/irc.c:1675
+#: src/multi.c:549 src/protocols/irc/irc.c:1675
 msgid "Password:"
 msgstr "Heslo:"
 
@@ -370,332 +458,652 @@
 msgid "DCC Chat"
 msgstr "Chat"
 
-#: src/buddy.c:2806 src/protocols/jabber/jabber.c:705
-#: src/protocols/jabber/jabber.c:723
+#: src/protocols/jabber/jabber.c:942
+msgid "Incorrect current password! Password NOT Changed!"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:943 src/protocols/jabber/jabber.c:948
+#, fuzzy
+msgid "Password Change Error!"
+msgstr "Gaim - Zmna hesla"
+
+#: src/protocols/jabber/jabber.c:947
+msgid "New password same as old password! Password NOT Changed!"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1092
+msgid "Unknown"
+msgstr "Neznm"
+
+#: src/buddy.c:2887 src/protocols/jabber/jabber.c:1120
+#: src/protocols/jabber/jabber.c:1138
 msgid "Online"
 msgstr "Pipojen"
 
-#: src/protocols/jabber/jabber.c:707
+#: src/protocols/jabber/jabber.c:1122
 msgid "Extended Away"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:709
-
+#: src/protocols/jabber/jabber.c:1124
 msgid "Do Not Disturb"
 msgstr "Neruit"
 
-#: src/protocols/jabber/jabber.c:1091
+#: src/protocols/jabber/jabber.c:1434
+#, c-format
+msgid "Error %s: %s"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1437
+#, fuzzy
+msgid "Unknown Error in presence"
+msgstr "Neznmy chybov kd."
+
+#: src/protocols/jabber/jabber.c:1607
+#, fuzzy, c-format
+msgid "The user %s wants to add you to their buddy list."
+msgstr ""
+"\n"
+"\n"
+"Pejete si pidat jeho nebo ji do Vaeho Buddy Listu?"
+
+#: src/protocols/jabber/jabber.c:1632
 #, fuzzy
 msgid "No such user"
 msgstr "dn uivatel"
 
-#: src/protocols/jabber/jabber.c:1093
+#: src/protocols/jabber/jabber.c:1634 src/protocols/jabber/jabber.c:2341
+#: src/protocols/jabber/jabber.c:2506
 msgid "Jabber Error"
 msgstr "Chyba Jabberu"
 
-#: src/dialogs.c:847 src/protocols/jabber/jabber.c:1173
+#: src/dialogs.c:887 src/protocols/jabber/jabber.c:1719
+#: src/protocols/msn/msn.c:1110
 msgid "Buddies"
 msgstr "Kontakty"
 
-#: src/protocols/jabber/jabber.c:1239
+#: src/protocols/jabber/jabber.c:1782
 #, fuzzy
 msgid "Authenticating"
 msgstr "Autentifikace"
 
-#: src/protocols/jabber/jabber.c:1276
+#: src/protocols/jabber/jabber.c:1819
 msgid "Unknown login error"
 msgstr "Neznm chyba pi pihlaovn"
 
-#: src/protocols/jabber/jabber.c:1506 src/protocols/jabber/jabber.c:2954
+#: src/protocols/jabber/jabber.c:2010
+#, fuzzy
+msgid "Password successfully changed."
+msgstr "Heslo bylo spn zmnno"
+
+#: src/protocols/jabber/jabber.c:2012
+#, fuzzy
+msgid "Password Change"
+msgstr "Gaim - Zmna hesla"
+
+#: src/protocols/jabber/jabber.c:2054 src/protocols/jabber/jabber.c:3676
 msgid "Connection lost"
 msgstr "Spojen ztraceno"
 
-#: src/protocols/jabber/jabber.c:1508 src/protocols/jabber/jabber.c:1540
-#: src/protocols/jabber/jabber.c:2956 src/protocols/jabber/jabber.c:3002
+#: src/protocols/jabber/jabber.c:2056 src/protocols/jabber/jabber.c:2088
+#: src/protocols/jabber/jabber.c:3678 src/protocols/jabber/jabber.c:3724
+#: src/protocols/msn/msn.c:1741 src/protocols/msn/msn.c:1770
 msgid "Unable to connect"
 msgstr "Nemu se pipojit"
 
-#: src/protocols/jabber/jabber.c:1514
+#: src/protocols/jabber/jabber.c:2062
 msgid "Connected"
 msgstr "Pipojen"
 
-#: src/protocols/jabber/jabber.c:1517
+#: src/protocols/jabber/jabber.c:2065
 #, fuzzy
 msgid "Requesting Authentication Method"
 msgstr "dm autentifikan metodu"
 
 #. we have no chats yet
-#: src/protocols/jabber/jabber.c:1535
+#: src/protocols/jabber/jabber.c:2083 src/protocols/msn/msn.c:1762
 #, fuzzy
 msgid "Connecting"
 msgstr "Spojuji"
 
-#: src/protocols/jabber/jabber.c:1834
+#: src/protocols/jabber/jabber.c:2340 src/protocols/jabber/jabber.c:2505
+#, fuzzy
+msgid "Invalid Jabber I.D."
+msgstr "Nesprvne jmno"
+
+#: src/protocols/jabber/jabber.c:2473
 msgid "Room:"
 msgstr "Mstnost:"
 
-#: src/protocols/jabber/jabber.c:1838
+#: src/protocols/jabber/jabber.c:2477
 msgid "Server:"
 msgstr "Server:"
 
-#: src/protocols/jabber/jabber.c:1843
+#: src/protocols/jabber/jabber.c:2482
 msgid "Handle:"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:2113 src/protocols/jabber/jabber.c:2452
-msgid "Unknown"
-msgstr "Neznm"
-
-#: src/buddy_chat.c:875 src/protocols/jabber/jabber.c:2168
-#: src/protocols/oscar/oscar.c:3439
+#: src/protocols/jabber/jabber.c:2539
+#, fuzzy
+msgid "Chats"
+msgstr "Chat"
+
+#: src/protocols/jabber/jabber.c:2854
+#, fuzzy
+msgid "View Error Msg"
+msgstr "Zobrazit LOG"
+
+#: src/buddy_chat.c:886 src/protocols/jabber/jabber.c:2865
+#: src/protocols/oscar/oscar.c:3606
 msgid "Get Away Msg"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:2350
+#: src/protocols/jabber/jabber.c:2882
+msgid "Remove From Roster"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:3076
 msgid "Full Name"
 msgstr "Cel jmno"
 
-#: src/protocols/jabber/jabber.c:2351
+#: src/protocols/jabber/jabber.c:3077
 msgid "Family Name"
 msgstr "Jmno"
 
-#: src/protocols/jabber/jabber.c:2352
+#: src/protocols/jabber/jabber.c:3078
 msgid "Given Name"
 msgstr "Pjmen"
 
-#: src/protocols/jabber/jabber.c:2353
+#: src/protocols/jabber/jabber.c:3079
 msgid "Nickname"
 msgstr "Pezdvka"
 
-#: src/dialogs.c:2485 src/protocols/jabber/jabber.c:2354
+#: src/dialogs.c:2525 src/protocols/jabber/jabber.c:3080
 msgid "URL"
 msgstr "URL"
 
-#: src/protocols/jabber/jabber.c:2355
+#: src/protocols/jabber/jabber.c:3081
 msgid "Street Address"
 msgstr "Ulice"
 
-#: src/protocols/jabber/jabber.c:2356
+#: src/protocols/jabber/jabber.c:3082
 msgid "Extended Address"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:2357
+#: src/protocols/jabber/jabber.c:3083
 #, fuzzy
 msgid "Locality"
 msgstr "Lokalita"
 
-#: src/protocols/jabber/jabber.c:2358
+#: src/protocols/jabber/jabber.c:3084
 msgid "Region"
 msgstr "Region"
 
-#: src/protocols/jabber/jabber.c:2359
+#: src/protocols/jabber/jabber.c:3085
 msgid "Postal Code"
 msgstr "PS"
 
 #. Line 7
-#: src/dialogs.c:1606 src/dialogs.c:2314 src/protocols/jabber/jabber.c:2360
+#: src/dialogs.c:1646 src/dialogs.c:2354 src/protocols/jabber/jabber.c:3086
 msgid "Country"
 msgstr "Stt"
 
-#: src/protocols/jabber/jabber.c:2361
+#: src/protocols/jabber/jabber.c:3087
 #, fuzzy
 msgid "Telephone"
 msgstr "telefon"
 
-#: src/dialogs.c:2390 src/protocols/jabber/jabber.c:2362
+#: src/dialogs.c:2430 src/protocols/jabber/jabber.c:3088
 msgid "Email"
 msgstr "Email"
 
-#: src/protocols/jabber/jabber.c:2363
+#: src/protocols/jabber/jabber.c:3089
 msgid "Organization Name"
 msgstr "Nzev organizace"
 
-#: src/protocols/jabber/jabber.c:2364
+#: src/protocols/jabber/jabber.c:3090
 msgid "Organization Unit"
 msgstr ""
 
-#: src/prefs.c:1989 src/protocols/jabber/jabber.c:2365
+#: src/prefs.c:2000 src/protocols/jabber/jabber.c:3091
 msgid "Title"
 msgstr "Nzev"
 
-#: src/protocols/jabber/jabber.c:2366
+#: src/protocols/jabber/jabber.c:3092
 msgid "Role"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:2367
+#: src/protocols/jabber/jabber.c:3093
 msgid "Birthday"
 msgstr "Datum narozen"
 
 #. Right side: frame with description and the filepath of plugin
-#: src/dialogs.c:2493 src/plugins.c:211 src/protocols/jabber/jabber.c:2368
+#: src/dialogs.c:2533 src/plugins.c:211 src/protocols/jabber/jabber.c:3094
 msgid "Description"
 msgstr "Popis"
 
-#: src/protocols/jabber/jabber.c:2393
+#: src/protocols/jabber/jabber.c:3119
 #, fuzzy
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable"
-msgstr "Vechny nsledujc daje jsou voliteln. Zadejte pouze ty informace "
-"kter chcete."
-
-#: src/protocols/jabber/jabber.c:2394
+msgstr ""
+"Vechny nsledujc daje jsou voliteln. Zadejte pouze ty informace kter "
+"chcete."
+
+#: src/protocols/jabber/jabber.c:3120
 msgid "User Identity"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:2810
+#: src/protocols/jabber/jabber.c:3532
 msgid "Gaim - Edit Jabber vCard"
 msgstr "Gaim - Upravit Jaaber vizitku"
 
-#: src/protocols/jabber/jabber.c:2884
+#: src/protocols/jabber/jabber.c:3606
 msgid "Server Registration successful!"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:2911
+#: src/protocols/jabber/jabber.c:3633
 msgid "Unknown registration error"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3020 src/protocols/jabber/jabber.c:3035
+#: src/protocols/jabber/jabber.c:3742 src/protocols/jabber/jabber.c:3757
 #, fuzzy
 msgid "Set User Info"
 msgstr "Zskat informace o uivateli"
 
-#: src/protocols/msn/msn.c:738 src/protocols/msn/msn.c:2165
-#: src/protocols/msn/msn.c:2198
+#: src/protocols/msn/msn.c:230
+msgid "Syntax Error (probably a Gaim bug)"
+msgstr ""
+
+#: src/protocols/msn/msn.c:233
+msgid "Invalid Parameter (probably a Gaim bug)"
+msgstr ""
+
+#: src/protocols/msn/msn.c:236
+#, fuzzy
+msgid "Invalid User"
+msgstr "Nesprvne jmno"
+
+#: src/protocols/msn/msn.c:239
+msgid "Fully Qualified Domain Name missing"
+msgstr ""
+
+#: src/protocols/msn/msn.c:242
+msgid "Already Login"
+msgstr ""
+
+#: src/protocols/msn/msn.c:245
+#, fuzzy
+msgid "Invalid Username"
+msgstr "Nesprvne jmno"
+
+#: src/protocols/msn/msn.c:248
+#, fuzzy
+msgid "Invalid Friendly Name"
+msgstr "Nesprvne jmno"
+
+#: src/protocols/msn/msn.c:251
+msgid "List Full"
+msgstr ""
+
+#: src/protocols/msn/msn.c:254
+msgid "Already there"
+msgstr ""
+
+#: src/protocols/msn/msn.c:257
+#, fuzzy
+msgid "Not on list"
+msgstr "Spojen ztraceno"
+
+#: src/protocols/msn/msn.c:260
+msgid "User is offline"
+msgstr ""
+
+#: src/protocols/msn/msn.c:263
+msgid "Already in the mode"
+msgstr ""
+
+#: src/protocols/msn/msn.c:266
+msgid "Already in opposite list"
+msgstr ""
+
+#: src/protocols/msn/msn.c:269
+msgid "Switchboard failed"
+msgstr ""
+
+#: src/protocols/msn/msn.c:272
+msgid "Notify Transfer failed"
+msgstr ""
+
+#: src/protocols/msn/msn.c:276
+msgid "Required fields missing"
+msgstr ""
+
+#: src/protocols/msn/msn.c:279
+#, fuzzy
+msgid "Not logged in"
+msgstr "%s prihlen."
+
+#: src/protocols/msn/msn.c:283
+#, fuzzy
+msgid "Internal server error"
+msgstr "Vnitn chyba"
+
+#: src/protocols/msn/msn.c:286
+msgid "Database server error"
+msgstr ""
+
+#: src/protocols/msn/msn.c:289
+#, fuzzy
+msgid "File operation error"
+msgstr "vnitn chyba spojen\n"
+
+#: src/protocols/msn/msn.c:292
+#, fuzzy
+msgid "Memory allocation error"
+msgstr "vnitn chyba spojen\n"
+
+#: src/protocols/msn/msn.c:296
+#, fuzzy
+msgid "Server busy"
+msgstr "Server:"
+
+#: src/protocols/msn/msn.c:299
+#, fuzzy
+msgid "Server unavailable"
+msgstr "Nedostupn"
+
+#: src/protocols/msn/msn.c:302
+msgid "Peer Notification server down"
+msgstr ""
+
+#: src/protocols/msn/msn.c:305
+#, fuzzy
+msgid "Database connect error"
+msgstr "vnitn chyba spojen\n"
+
+#: src/protocols/msn/msn.c:308
+msgid "Server is going down (abandon ship)"
+msgstr ""
+
+#: src/protocols/msn/msn.c:312
+#, fuzzy
+msgid "Error creating connection"
+msgstr "g003: Chyba pi otvrn spojen.\n"
+
+#: src/protocols/msn/msn.c:318
+msgid "Session overload"
+msgstr ""
+
+#: src/protocols/msn/msn.c:321
+msgid "User is too active"
+msgstr ""
+
+#: src/protocols/msn/msn.c:324
+msgid "Too many sessions"
+msgstr ""
+
+#: src/protocols/msn/msn.c:327
+msgid "Not expected"
+msgstr ""
+
+#: src/protocols/msn/msn.c:330
+msgid "Bad friend file"
+msgstr ""
+
+#: src/protocols/msn/msn.c:334
+#, fuzzy
+msgid "Authentication failed"
+msgstr "Autentifikace nespn"
+
+#: src/protocols/msn/msn.c:337
+#, fuzzy
+msgid "Not allowed when offline"
+msgstr "dn zvuky pi pihlen"
+
+#: src/protocols/msn/msn.c:340
+msgid "Not accepting new users"
+msgstr ""
+
+#: src/protocols/msn/msn.c:343
+msgid "User unverified"
+msgstr ""
+
+#: src/protocols/msn/msn.c:346
+#, fuzzy
+msgid "Unknown Error Code"
+msgstr "Neznmy chybov kd."
+
+#: src/protocols/msn/msn.c:351 src/protocols/msn/msn.c:558
+#: src/protocols/msn/msn.c:813 src/protocols/msn/msn.c:2114
+#: src/protocols/msn/msn.c:2283 src/protocols/msn/msn.c:2336
 msgid "MSN Error"
 msgstr "Chyba MSN"
 
-#: src/protocols/msn/msn.c:738
-msgid "Gaim was unable to send a messege"
+#: src/protocols/msn/msn.c:558
+msgid "A message may not have been received."
+msgstr ""
+
+#: src/protocols/msn/msn.c:813
+#, fuzzy
+msgid "Gaim was unable to send a message"
 msgstr "Gaim nemohl odeslat zprvu"
 
-#: src/protocols/msn/msn.c:1088
+#: src/protocols/msn/msn.c:917
+#, fuzzy, c-format
+msgid "The user %s (%s) wants to add %s to his or her buddy list."
+msgstr "%s%s%s%s udlal %s jeho kamardem%s%s%s"
+
+#: src/protocols/msn/msn.c:1074
+#, c-format
+msgid "The user %s (%s) wants to add you to their buddy list"
+msgstr ""
+
+#: src/protocols/msn/msn.c:1175
 #, fuzzy
 msgid "You have been disconnected. You have signed on from another location."
 msgstr "Byl jste odpojen. Pihlsil jste se z jin lokace."
 
-#: src/protocols/msn/msn.c:2165 src/protocols/msn/msn.c:2198
+#: src/protocols/msn/msn.c:1435 src/protocols/msn/msn.c:1679
+#, fuzzy
+msgid "Error reading from server"
+msgstr "Chyba pri ten ze socketu."
+
+#: src/protocols/msn/msn.c:1568
+msgid "Requesting to send password"
+msgstr ""
+
+#: src/protocols/msn/msn.c:1618
+#, fuzzy
+msgid "Unable to send password"
+msgstr "Nemu st ze socketu"
+
+#: src/protocols/msn/msn.c:1623
+#, fuzzy
+msgid "Password sent"
+msgstr "Heslo: "
+
+#: src/protocols/msn/msn.c:1748
+#, fuzzy
+msgid "Unable to write to server"
+msgstr "Nemu se pripojit na server."
+
+#: src/protocols/msn/msn.c:1754
+msgid "Synching with server"
+msgstr ""
+
+#: src/protocols/msn/msn.c:1920
+msgid "Away From Computer"
+msgstr ""
+
+#: src/protocols/msn/msn.c:1921
+msgid "Be Right Back"
+msgstr ""
+
+#: src/protocols/msn/msn.c:1922
+#, fuzzy
+msgid "Busy"
+msgstr "Kamard"
+
+#: src/protocols/msn/msn.c:1923
+msgid "On The Phone"
+msgstr ""
+
+#: src/protocols/msn/msn.c:1924
+msgid "Out To Lunch"
+msgstr ""
+
+#: src/protocols/msn/msn.c:1925
+#, fuzzy
+msgid "Hidden"
+msgstr "Skryj ikonu"
+
+#: src/protocols/msn/msn.c:2041
+msgid "Reset friendly name"
+msgstr ""
+
+#: src/protocols/msn/msn.c:2114
+msgid "Friendly name too long."
+msgstr ""
+
+#: src/protocols/msn/msn.c:2129 src/protocols/msn/msn.c:2150
+#, fuzzy
+msgid "Set Friendly Name"
+msgstr "Pjmen"
+
+#: src/protocols/msn/msn.c:2130
+#, fuzzy
+msgid "Set Friendly Name:"
+msgstr "ID: "
+
+#: src/protocols/msn/msn.c:2131
+msgid "Reset All Friendly Names"
+msgstr ""
+
+#: src/protocols/msn/msn.c:2283 src/protocols/msn/msn.c:2336
 msgid "Invalid name"
 msgstr "Nesprvne jmno"
 
-#: src/protocols/napster/napster.c:450 src/protocols/oscar/oscar.c:3071
-#: src/protocols/toc/toc.c:1101
+#: src/protocols/napster/napster.c:457 src/protocols/oscar/oscar.c:3209
+#: src/protocols/toc/toc.c:1104
 msgid "Join what group:"
 msgstr "Ke kter skupin pripojit:"
 
-#: src/protocols/oscar/oscar.c:329
+#: src/protocols/oscar/oscar.c:330
 #, c-format
 msgid "Direct IM with %s closed"
 msgstr "Pm IM s %s zrueno"
 
-#: src/protocols/oscar/oscar.c:331
+#: src/protocols/oscar/oscar.c:332
 #, c-format
 msgid "Direct IM with %s failed"
 msgstr "Pm IM s %s selhalo"
 
-#: src/protocols/oscar/oscar.c:369
+#: src/protocols/oscar/oscar.c:370
 msgid "connection error (rend)\n"
 msgstr "chyba spojen (rend)\n"
 
-#: src/protocols/oscar/oscar.c:380
+#: src/protocols/oscar/oscar.c:381
 msgid "major connection error\n"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:381 src/protocols/toc/toc.c:511
+#: src/protocols/oscar/oscar.c:382 src/protocols/toc/toc.c:511
 #: src/protocols/toc/toc.c:524 src/protocols/toc/toc.c:590
 msgid "Disconnected."
 msgstr "Odpojen."
 
-#: src/protocols/oscar/oscar.c:393 src/protocols/toc/toc.c:761
+#: src/protocols/oscar/oscar.c:394 src/protocols/toc/toc.c:761
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "Byl jste odpojen z chatov mstnosti %s."
 
-#: src/protocols/oscar/oscar.c:394
+#: src/protocols/oscar/oscar.c:395
 msgid "Chat Error!"
 msgstr "Chyba Chatu!"
 
-#: src/protocols/oscar/oscar.c:406
+#: src/protocols/oscar/oscar.c:407
 msgid "Chat is currently unavailable"
 msgstr "Chat je momentln nedostupn"
 
-#: src/protocols/oscar/oscar.c:407
+#: src/protocols/oscar/oscar.c:408
 msgid "Gaim - Chat"
 msgstr "Gaim - Chat"
 
-#: src/protocols/oscar/oscar.c:466 src/protocols/oscar/oscar.c:526
+#: src/protocols/oscar/oscar.c:467 src/protocols/oscar/oscar.c:527
 msgid "Couldn't connect to host"
 msgstr "Nemu se spojit s hostitelem"
 
-#: src/protocols/oscar/oscar.c:474
+#: src/protocols/oscar/oscar.c:475
 msgid "Password sent, waiting for response\n"
 msgstr "Poslno heslo, ekm na odpov\n"
 
-#: src/protocols/oscar/oscar.c:507
+#: src/protocols/oscar/oscar.c:508
 msgid "internal connection error\n"
 msgstr "vnitn chyba spojen\n"
 
-#: src/protocols/oscar/oscar.c:508
+#: src/protocols/oscar/oscar.c:509
 msgid "Unable to login to AIM"
 msgstr "Nemu se pihlsit do AIM"
 
-#: src/protocols/oscar/oscar.c:513
+#: src/protocols/oscar/oscar.c:514
 #, c-format
 msgid "Signon: %s"
 msgstr "Prihlsit: %s"
 
-#: src/protocols/oscar/oscar.c:585
+#: src/protocols/oscar/oscar.c:586
 msgid "Signed off.\n"
 msgstr "Odhlen.\n"
 
-#: src/protocols/oscar/oscar.c:604 src/protocols/oscar/oscar.c:728
+#: src/protocols/oscar/oscar.c:605 src/protocols/oscar/oscar.c:730
 msgid "Could Not Connect"
 msgstr "Nemu se pipojit"
 
-#: src/protocols/oscar/oscar.c:612
+#: src/protocols/oscar/oscar.c:613
 #, fuzzy
 msgid "Connection established, cookie sent"
 msgstr "Spojen vytvoeno, cookie poslno"
 
 #. Incorrect nick/password
-#: src/protocols/oscar/oscar.c:638 src/protocols/toc/toc.c:459
+#: src/protocols/oscar/oscar.c:639 src/protocols/toc/toc.c:459
 msgid "Incorrect nickname or password."
 msgstr "Nesprvne heslo alebo pezdvka."
 
 #. Suspended account
+#: src/protocols/oscar/oscar.c:644
 #, fuzzy
-#: src/protocols/oscar/oscar.c:643
 msgid "Your account is currently suspended."
 msgstr "V et je momentln suspendovm"
 
 #. connecting too frequently
-#: src/protocols/oscar/oscar.c:647
+#: src/protocols/oscar/oscar.c:648
 msgid ""
 "You have been connecting and disconnecting too frequently. Wait ten minutes "
 "and try again. If you continue to try, you will need to wait even longer."
 msgstr ""
-"Pipojovali a odpoovali jste se pli asto. Pokejte 10 minut a zkuste to"
-"znova. Jestli budete pokraovat v pipojovn, budete muset ekat jet dle."
+"Pipojovali a odpoovali jste se pli asto. Pokejte 10 minut a zkuste "
+"toznova. Jestli budete pokraovat v pipojovn, budete muset ekat jet "
+"dle."
 
 #. client too old
-#: src/protocols/oscar/oscar.c:652
+#: src/protocols/oscar/oscar.c:653
 msgid "The client version you are using is too old. Please upgrade at "
-msgstr "Verze klienta kterou pouvate je pli star. Nainstalujte si novou na"
-
-#: src/protocols/oscar/oscar.c:656 src/protocols/toc/toc.c:542
+msgstr ""
+"Verze klienta kterou pouvate je pli star. Nainstalujte si novou na"
+
+#: src/protocols/oscar/oscar.c:657 src/protocols/toc/toc.c:542
 msgid "Authentication Failed"
 msgstr "Autentifikace peruena"
 
-#: src/protocols/oscar/oscar.c:678
+#: src/protocols/oscar/oscar.c:679
 msgid "Internal Error"
 msgstr "Vnitn chyba"
 
-#: src/protocols/oscar/oscar.c:1246 src/protocols/oscar/oscar.c:3282
+#: src/protocols/oscar/oscar.c:1248 src/protocols/oscar/oscar.c:3420
 #, c-format
 msgid "Direct IM with %s established"
 msgstr "Pam IM spojen s %s vytvoeno"
 
-#: src/protocols/oscar/oscar.c:1492 src/protocols/oscar/oscar.c:2367
+#: src/protocols/oscar/oscar.c:1504 src/protocols/oscar/oscar.c:2456
 #, c-format
 msgid ""
 "The user %lu has denied your request to add them to your contact list for "
@@ -703,179 +1111,196 @@
 "%s"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1492 src/protocols/oscar/oscar.c:2367
+#: src/protocols/oscar/oscar.c:1504 src/protocols/oscar/oscar.c:2456
 #, fuzzy
 msgid "No reason given."
 msgstr "dn dvod."
 
-#: src/protocols/oscar/oscar.c:1493 src/protocols/oscar/oscar.c:2368
+#: src/protocols/oscar/oscar.c:1505 src/protocols/oscar/oscar.c:2457
 msgid "Gaim - ICQ Authorization Denied"
 msgstr "Gaim - ICQ Autorizace odepena"
 
-#: src/protocols/oscar/oscar.c:1499 src/protocols/oscar/oscar.c:2374
+#: src/protocols/oscar/oscar.c:1511 src/protocols/oscar/oscar.c:2463
 #, c-format
 msgid "The user %lu has granted your request to add them to your contact list."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1500 src/protocols/oscar/oscar.c:2375
+#: src/protocols/oscar/oscar.c:1512 src/protocols/oscar/oscar.c:2464
 #, fuzzy
 msgid "Gaim - ICQ Authorization Granted"
 msgstr "Gaim - ICQ autorizace pijata"
 
-#: src/protocols/oscar/oscar.c:1573
-msgid "You missed %d messege from %s because it was invalid."
+#: src/protocols/oscar/oscar.c:1585
+#, fuzzy, c-format
+msgid "You missed %d message from %s because it was invalid."
 msgstr "Ztratil jste %d zprvu z %s protoe byla neplatn."
 
-#: src/protocols/oscar/oscar.c:1574
-msgid "You missed %d messeges from %s because they were invalid."
+#: src/protocols/oscar/oscar.c:1586
+#, fuzzy, c-format
+msgid "You missed %d messages from %s because they were invalid."
 msgstr "Ztratil jste %d zprv z %s protoe byly neplatn."
 
-#: src/protocols/oscar/oscar.c:1583
-msgid "You missed %d messege from %s because it was too large."
+#: src/protocols/oscar/oscar.c:1595
+#, fuzzy, c-format
+msgid "You missed %d message from %s because it was too large."
 msgstr "Ztratil jste %d zprvu z %s protoe byla pli velk."
 
-#: src/protocols/oscar/oscar.c:1584
-msgid "You missed %d messeges from %s because they were too large."
+#: src/protocols/oscar/oscar.c:1596
+#, fuzzy, c-format
+msgid "You missed %d messages from %s because they were too large."
 msgstr "Ztratil jste %d zprv z %s protoe byly pli velk."
 
-#: src/protocols/oscar/oscar.c:1593
-msgid "You missed %d messege from %s because the rate limit has been exceeded."
+#: src/protocols/oscar/oscar.c:1605
+#, fuzzy, c-format
+msgid "You missed %d message from %s because the rate limit has been exceeded."
 msgstr "Ztratil jste %d zprvu z %s protoe jste vyerpali limit zprv."
 
-#: src/protocols/oscar/oscar.c:1594
-msgid "You missed %d messeges from %s because the rate limit has been exceeded."
+#: src/protocols/oscar/oscar.c:1606
+#, fuzzy, c-format
+msgid ""
+"You missed %d messages from %s because the rate limit has been exceeded."
 msgstr "Ztratil jste %d zprv z %s protoe jste vyerpali limit zprv."
 
-#: src/protocols/oscar/oscar.c:1603
-#, fuzzy
-msgid "You missed %d messege from %s because it was too evil."
+#: src/protocols/oscar/oscar.c:1615
+#, fuzzy, c-format
+msgid "You missed %d message from %s because it was too evil."
 msgstr "Ztratil jste %d zprvu z %s protoe byla velmi zl."
 
-#: src/protocols/oscar/oscar.c:1604
-#, fuzzy
-msgid "You missed %d messeges from %s because they are too evil."
+#: src/protocols/oscar/oscar.c:1616
+#, fuzzy, c-format
+msgid "You missed %d messages from %s because they are too evil."
 msgstr "Ztratil jste %d zprv z %s protoe byly velmi zl."
 
-#: src/protocols/oscar/oscar.c:1613
-#, fuzzy
-msgid "You missed %d messege from %s because you are too evil."
+#: src/protocols/oscar/oscar.c:1625
+#, fuzzy, c-format
+msgid "You missed %d message from %s because you are too evil."
 msgstr "Ztratil jste %d zprvu z %s pretoe jste velmi zl."
 
-#: src/protocols/oscar/oscar.c:1614
-#, fuzzy
-msgid "You missed %d messeges from %s because you are too evil."
+#: src/protocols/oscar/oscar.c:1626
+#, fuzzy, c-format
+msgid "You missed %d messages from %s because you are too evil."
 msgstr "Ztratil jste %d zprv z %s protoe jste velmi zl."
 
-#: src/protocols/oscar/oscar.c:1622
-#, fuzzy
-msgid "You missed %d messege from %s for unknown reasons."
+#: src/protocols/oscar/oscar.c:1634
+#, fuzzy, c-format
+msgid "You missed %d message from %s for unknown reasons."
 msgstr "Ztratil jste %d zprvu z %s z neznmch dvod."
 
-#: src/protocols/oscar/oscar.c:1623
-#, fuzzy
-msgid "You missed %d messeges from %s for unknown reasons."
+#: src/protocols/oscar/oscar.c:1635
+#, fuzzy, c-format
+msgid "You missed %d messages from %s for unknown reasons."
 msgstr "Ztratil jste %d zprv z %s z neznmch dvod."
 
-#: src/dialogs.c:3036 src/dialogs.c:3042 src/protocols/oscar/oscar.c:1628
-#: src/protocols/oscar/oscar.c:1666 src/protocols/oscar/oscar.c:1684
-#: src/protocols/oscar/oscar.c:2137 src/protocols/yahoo/yahoo.c:594
+#: src/dialogs.c:3076 src/dialogs.c:3082 src/protocols/oscar/oscar.c:1640
+#: src/protocols/oscar/oscar.c:1755 src/protocols/oscar/oscar.c:1773
+#: src/protocols/oscar/oscar.c:2226 src/protocols/yahoo/yahoo.c:594
 msgid "Gaim - Error"
 msgstr "Gaim - Chyba"
 
-#: src/protocols/oscar/oscar.c:1645
+#: src/protocols/oscar/oscar.c:1703
+#, c-format
+msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR>%s<BR>"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:1705
+#, c-format
+msgid "<B>Status:</B> %s<BR><HR><BR>%s<BR>"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:1734
 #, c-format
 msgid "SNAC threw error: %s\n"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1647
+#: src/protocols/oscar/oscar.c:1736
 #, fuzzy
 msgid "Gaim - Oscar SNAC Error"
 msgstr "Gaim - Oscar SNAC Chyba"
 
-#: src/protocols/oscar/oscar.c:1664
-#, c-format
-msgid "Your messege to %s did not get sent: %s"
+#: src/protocols/oscar/oscar.c:1753
+#, fuzzy, c-format
+msgid "Your message to %s did not get sent: %s"
 msgstr "Vaa zprva pro %s nebyla poslan: %s"
 
-#: src/protocols/oscar/oscar.c:1665 src/protocols/oscar/oscar.c:1683
+#: src/protocols/oscar/oscar.c:1754 src/protocols/oscar/oscar.c:1772
 msgid "Reason unknown"
 msgstr "Dvod neznm"
 
-#: src/protocols/oscar/oscar.c:1682
+#: src/protocols/oscar/oscar.c:1771
 #, c-format
 msgid "User information for %s unavailable: %s"
 msgstr "Informcie o uivateli %s nejsou pstupn: %s"
 
-#: src/buddy.c:2065 src/protocols/oscar/oscar.c:1713
+#: src/buddy.c:2131 src/protocols/oscar/oscar.c:1802
 #, fuzzy
 msgid "Buddy Icon"
 msgstr "Kamardova ikona"
 
-#: src/buddy.c:2068 src/protocols/oscar/oscar.c:1716
+#: src/buddy.c:2134 src/protocols/oscar/oscar.c:1805
 msgid "Voice"
 msgstr "Hlas"
 
-#: src/buddy.c:2071 src/protocols/oscar/oscar.c:1719
+#: src/buddy.c:2137 src/protocols/oscar/oscar.c:1808
 #, fuzzy
 msgid "IM Image"
 msgstr "IM Obrzek"
 
-#: src/buddy.c:495 src/buddy.c:2074 src/buddy.c:2512 src/prefs.c:2913
-#: src/protocols/oscar/oscar.c:1722
+#: src/buddy.c:498 src/buddy.c:2140 src/buddy.c:2581 src/prefs.c:2926
+#: src/protocols/oscar/oscar.c:1811
 msgid "Chat"
 msgstr "Chat"
 
-#: src/buddy.c:2077 src/protocols/oscar/oscar.c:1725
+#: src/buddy.c:2143 src/protocols/oscar/oscar.c:1814
 msgid "Get File"
 msgstr "Zskat soubor"
 
-#: src/buddy.c:2080 src/protocols/oscar/oscar.c:1728
+#: src/buddy.c:2146 src/protocols/oscar/oscar.c:1817
 msgid "Send File"
 msgstr "Poslat soubor"
 
-#: src/buddy.c:2084 src/protocols/oscar/oscar.c:1732
+#: src/buddy.c:2150 src/protocols/oscar/oscar.c:1821
 msgid "Games"
 msgstr "Hry"
 
-#: src/buddy.c:2087 src/protocols/oscar/oscar.c:1735
+#: src/buddy.c:2153 src/protocols/oscar/oscar.c:1824
 msgid "Stocks"
 msgstr ""
 
-#: src/buddy.c:2090 src/protocols/oscar/oscar.c:1738
+#: src/buddy.c:2156 src/protocols/oscar/oscar.c:1827
 #, fuzzy
 msgid "Send Buddy List"
 msgstr "Poslat Buddy List"
 
-#: src/buddy.c:2093 src/protocols/oscar/oscar.c:1741
+#: src/buddy.c:2159 src/protocols/oscar/oscar.c:1830
 msgid "EveryBuddy Bug"
 msgstr ""
 
-#: src/buddy.c:2096 src/protocols/oscar/oscar.c:1744
+#: src/buddy.c:2162 src/protocols/oscar/oscar.c:1833
 #, fuzzy
 msgid "AP User"
 msgstr "AP Uivatel"
 
-#: src/buddy.c:2099 src/protocols/oscar/oscar.c:1747
+#: src/buddy.c:2165 src/protocols/oscar/oscar.c:1836
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
-#: src/buddy.c:2102 src/protocols/oscar/oscar.c:1750
+#: src/buddy.c:2168 src/protocols/oscar/oscar.c:1839
 msgid "Nihilist"
 msgstr ""
 
-#: src/buddy.c:2105 src/protocols/oscar/oscar.c:1753
+#: src/buddy.c:2171 src/protocols/oscar/oscar.c:1842
 msgid "ICQ Server Relay"
 msgstr ""
 
-#: src/buddy.c:2108 src/protocols/oscar/oscar.c:1756
+#: src/buddy.c:2174 src/protocols/oscar/oscar.c:1845
 msgid "ICQ Unknown"
 msgstr ""
 
-#: src/buddy.c:2111 src/protocols/oscar/oscar.c:1759
+#: src/buddy.c:2177 src/protocols/oscar/oscar.c:1848
 msgid "Trillian Encryption"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1797
+#: src/protocols/oscar/oscar.c:1886
 #, fuzzy
 msgid ""
 "<br><BODY BGCOLOR=WHITE><hr><I>Legend:</I><br><br><IMG SRC=\"free_icon.gif"
@@ -889,7 +1314,7 @@
 "<br><IMG SRC=\"dt_icon.gif\"> : Zkuebn AIM uivatet <br><IMG SRC="
 "\"admin_icon.gif\"> : Administrtor"
 
-#: src/protocols/oscar/oscar.c:1825
+#: src/protocols/oscar/oscar.c:1914
 #, fuzzy, c-format
 msgid ""
 "Username : <B>%s</B>  %s <BR>\n"
@@ -902,68 +1327,98 @@
 "%s%s%s<BR>\n"
 "<HR><BR>\n"
 
-#: src/protocols/oscar/oscar.c:1857
+#: src/protocols/oscar/oscar.c:1946
 #, fuzzy
-msgid "<i>User has no away messege</i>"
+msgid "<i>User has no away message</i>"
 msgstr "<i>Uivatel nem dnou 'Pry' zprvu</i>"
 
-#: src/protocols/oscar/oscar.c:1869
+#: src/protocols/oscar/oscar.c:1958
 msgid "Client Capabilities: "
 msgstr "Monosti klienta"
 
-#: src/protocols/oscar/oscar.c:1877
+#: src/protocols/oscar/oscar.c:1966
 msgid "<i>No Information Provided</i>"
 msgstr "<i>Neposkytnut dn informace</i>"
 
-#: src/protocols/oscar/oscar.c:1900
+#: src/protocols/oscar/oscar.c:1989
 msgid "Your connection may be lost."
 msgstr "Vae spojen me bt peruen."
 
-#: src/protocols/oscar/oscar.c:1901
+#: src/protocols/oscar/oscar.c:1990
 msgid "AOL error"
 msgstr "Chyba AOL"
 
-#: src/protocols/oscar/oscar.c:2136
+#: src/protocols/oscar/oscar.c:2225
 #, fuzzy
 msgid ""
-"The last messege was not sent because you are over the rate limit. Please "
+"The last message was not sent because you are over the rate limit. Please "
 "wait 10 seconds and try again."
 msgstr ""
-"Vae posledn zprva nebyla odeslna protoe u mte pes limit. Pokejte"
-"prosm 10 sekund a pokus opakujte."
-
-#: src/dialogs.c:3564 src/protocols/oscar/oscar.c:2478
-#: src/protocols/oscar/oscar.c:3403 src/protocols/toc/toc.c:1561
-#: src/protocols/toc/toc.c:1578 src/protocols/toc/toc.c:1638
-#: src/protocols/toc/toc.c:1680 src/protocols/toc/toc.c:1799
-#: src/protocols/toc/toc.c:1829 src/protocols/toc/toc.c:1885
+"Vae posledn zprva nebyla odeslna protoe u mte pes limit. "
+"Pokejteprosm 10 sekund a pokus opakujte."
+
+#: src/dialogs.c:3604 src/protocols/oscar/oscar.c:2589
+#: src/protocols/oscar/oscar.c:3541 src/protocols/toc/toc.c:1564
+#: src/protocols/toc/toc.c:1581 src/protocols/toc/toc.c:1641
+#: src/protocols/toc/toc.c:1683 src/protocols/toc/toc.c:1802
+#: src/protocols/toc/toc.c:1832 src/protocols/toc/toc.c:1888
 msgid "Error"
 msgstr "Chyba"
 
-#: src/protocols/oscar/oscar.c:3075 src/protocols/toc/toc.c:1105
+#: src/protocols/oscar/oscar.c:3192
+#, c-format
+msgid ""
+"The maximum number of buddies allowed in your buddy list is %d, and you have "
+"%d.  Until you are below the limit, some buddies will not show up as online."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3195
+#, fuzzy
+msgid "Gaim - Warning"
+msgstr "Gaim - Varovat uivatele?"
+
+#: src/protocols/oscar/oscar.c:3213 src/protocols/toc/toc.c:1108
 msgid "Exchange:"
 msgstr "Vmna:"
 
-#: src/protocols/oscar/oscar.c:3403
+#: src/protocols/oscar/oscar.c:3541
 msgid "Unable to open Direct IM"
 msgstr "Nemu otevt Pme IM spojen"
 
-#: src/protocols/oscar/oscar.c:3413
+#: src/protocols/oscar/oscar.c:3551
 #, c-format
 msgid ""
 "You have selected to open a Direct IM connection with %s. Doing this will "
 "let them see your IP address, and may be a security risk. Do you wish to "
 "continue?"
 msgstr ""
-"Vybrali ste oteven Pmho IM spojen s %s. Toto dovol jinm "
-"uivatelm vidt Vai IP adresu, me to bt bezpenostn riziko. Pejete "
-"si pokraovat?"
-
-#: src/protocols/oscar/oscar.c:3446
+"Vybrali ste oteven Pmho IM spojen s %s. Toto dovol jinm uivatelm "
+"vidt Vai IP adresu, me to bt bezpenostn riziko. Pejete si pokraovat?"
+
+#: src/protocols/oscar/oscar.c:3568
+#, c-format
+msgid ""
+"<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR><I>Remote client does not "
+"support sending status messages.</I><BR>"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3575
+#, c-format
+msgid ""
+"<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR><I>User has no status message."
+"</I><BR>"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3600
+#, fuzzy
+msgid "Get Status Msg"
+msgstr "Stav: %s"
+
+#: src/protocols/oscar/oscar.c:3613
 msgid "Direct IM"
 msgstr "Pm IM"
 
-#: src/protocols/oscar/oscar.c:3454
+#: src/protocols/oscar/oscar.c:3621
 msgid "Get Capabilities"
 msgstr "Zskat Monosti"
 
@@ -978,8 +1433,8 @@
 msgstr "Nemu st ze souboru %s."
 
 #: src/protocols/toc/toc.c:404
-#, c-format
-msgid "Messege too long, last %s bytes truncated."
+#, fuzzy, c-format
+msgid "Message too long, last %s bytes truncated."
 msgstr "Zprva je moc dlouh, poslednch %s bit bude vymazno."
 
 #: src/protocols/toc/toc.c:407
@@ -993,7 +1448,8 @@
 msgstr "Vstraha %s nen dovolena."
 
 #: src/protocols/toc/toc.c:413
-msgid "A messege has been dropped, you are exceeding the server speed limit."
+#, fuzzy
+msgid "A message has been dropped, you are exceeding the server speed limit."
 msgstr "Sprva byla zahozena, pekroili jste omezen rchlosti serveru."
 
 #: src/protocols/toc/toc.c:416
@@ -1002,8 +1458,8 @@
 msgstr "Chat %s nen pstupn."
 
 #: src/protocols/toc/toc.c:419
-#, c-format
-msgid "You are sending messeges too fast to %s."
+#, fuzzy, c-format
+msgid "You are sending messages too fast to %s."
 msgstr "Zprvy pro %s poslte pli rychle."
 
 #: src/protocols/toc/toc.c:422
@@ -1070,8 +1526,9 @@
 "You have been connecting and disconnecting too frequently.  Wait ten minutes "
 "and try again.  If you continue to try, you will need to wait even longer."
 msgstr ""
-"Pipojovali a odpoovali jste se pli asto. Pokejte 10 minut a zkuste to"
-"znova. Jestli budete pokraovat v pipojovn, budete muset ekat jet dle."
+"Pipojovali a odpoovali jste se pli asto. Pokejte 10 minut a zkuste "
+"toznova. Jestli budete pokraovat v pipojovn, budete muset ekat jet "
+"dle."
 
 #: src/protocols/toc/toc.c:471
 #, c-format
@@ -1092,7 +1549,7 @@
 msgstr "ekejte na odezvu..."
 
 #: src/protocols/toc/toc.c:598
-msgid "TOC has come back from its pause. You may now send messeges again."
+msgid "TOC has come back from its pause. You may now send messages again."
 msgstr ""
 
 #: src/protocols/toc/toc.c:599
@@ -1108,14 +1565,14 @@
 msgid "Password Change Successful"
 msgstr "Heslo bylo spn zmnn"
 
-#: src/dialogs.c:1690 src/protocols/toc/toc.c:782
+#: src/dialogs.c:1730 src/protocols/toc/toc.c:782
 msgid "Gaim - Password Change"
 msgstr "Gaim - Zmna hesla"
 
 #: src/protocols/toc/toc.c:785
 msgid ""
-"TOC has sent a PAUSE command. When this happens, TOC ignores any messeges "
-"sent to it, and may kick you off if you send a messege. Gaim will prevent "
+"TOC has sent a PAUSE command. When this happens, TOC ignores any messages "
+"sent to it, and may kick you off if you send a message. Gaim will prevent "
 "anything from going through. This is only temporary, please be patient."
 msgstr ""
 
@@ -1123,68 +1580,70 @@
 msgid "TOC Pause"
 msgstr ""
 
-#: src/protocols/toc/toc.c:1222
+#: src/protocols/toc/toc.c:1225
 msgid "Get Dir Info"
 msgstr ""
 
-#: src/protocols/toc/toc.c:1638 src/protocols/toc/toc.c:1680
-#: src/protocols/toc/toc.c:1799 src/protocols/toc/toc.c:1885
+#: src/protocols/toc/toc.c:1641 src/protocols/toc/toc.c:1683
+#: src/protocols/toc/toc.c:1802 src/protocols/toc/toc.c:1888
 msgid "Could not connect for transfer!"
 msgstr "Nemu se spojit pro penos!"
 
-#: src/protocols/toc/toc.c:1829
+#: src/protocols/toc/toc.c:1832
 msgid "Could not write file header!"
 msgstr "Nemu zapsat hlaviku souboru!"
 
-#: src/protocols/toc/toc.c:1918
+#: src/protocols/toc/toc.c:1921
 msgid "Gaim - Save As..."
 msgstr "Gaim - Uloit jako..."
 
-#: src/protocols/toc/toc.c:1959
+#: src/protocols/toc/toc.c:1962
 #, c-format
 msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
 msgstr ""
 
-#: src/protocols/toc/toc.c:1960
+#: src/protocols/toc/toc.c:1963
 #, c-format
 msgid "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
 msgstr ""
 
-#: src/protocols/toc/toc.c:1965
+#: src/protocols/toc/toc.c:1968
 #, c-format
 msgid "%s requests you to send them a file"
 msgstr ""
 
 #: src/protocols/yahoo/yahoo.c:594
-msgid "Your messege did not get sent."
+#, fuzzy
+msgid "Your message did not get sent."
 msgstr "Vaa zprva nebyla odeslna."
 
-#: src/protocols/zephyr/zephyr.c:802
+#: src/protocols/zephyr/zephyr.c:840
 msgid "ZLocate"
 msgstr "ZLocate"
 
-#: src/protocols/zephyr/zephyr.c:839
+#: src/protocols/zephyr/zephyr.c:877
 msgid "Class:"
 msgstr "Tda:"
 
-#: src/protocols/zephyr/zephyr.c:843
+#: src/protocols/zephyr/zephyr.c:881
 msgid "Instance:"
 msgstr "Instance:"
 
-#: src/protocols/zephyr/zephyr.c:847
+#: src/protocols/zephyr/zephyr.c:885
 msgid "Recipient:"
 msgstr "Pjemnce:"
 
-#: src/about.c:93
+#: src/about.c:102
 #, c-format
 msgid "About Gaim v%s"
 msgstr "O aplikaci Gaim v%s"
 
-#: src/about.c:126
+#: src/about.c:135
+#, fuzzy
 msgid ""
-"Gaim is a client that supports AOL's Instant Messenger protocol. It is "
-"written\n"
-"using Gtk+ and is licensed under the GPL.\n"
+"Gaim is a modular Instant Messaging client capable of using AIM, ICQ,\n"
+"Yahoo!, MSN, IRC, Jabber, Napster, Zephyr, and Gadu-Gadu all at once.\n"
+"It is written using Gtk+ and is licensed under the GPL.\n"
 "\n"
 "URL: "
 msgstr ""
@@ -1193,7 +1652,7 @@
 "\n"
 "URL: "
 
-#: src/about.c:127
+#: src/about.c:137
 msgid ""
 "\n"
 "\n"
@@ -1203,7 +1662,7 @@
 "\n"
 "IRC: #gaim na irc.openprojects.net"
 
-#: src/about.c:137
+#: src/about.c:147
 msgid ""
 "Active Developers\n"
 "====================\n"
@@ -1224,100 +1683,99 @@
 "Mark Spencer (original author)   [ markster@marko.net ]"
 msgstr ""
 
-#: src/about.c:155 src/aim.c:318 src/buddy.c:2638 src/buddy_chat.c:1311
-#: src/buddy_chat.c:1408 src/buddy_chat.c:1438 src/conversetion.c:2836
-#: src/dialogs.c:568 src/dialogs.c:3859 src/multi.c:1057 src/plugins.c:277
-#: src/prefs.c:2536 src/prpl.c:438 src/prpl.c:679 src/server.c:1072
-msgid "Close"
-msgstr "Zavt"
-
 #. this makes the sizes not work.
 #. GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
 #. gtk_widget_grab_default(button);
-#: src/about.c:175
+#: src/about.c:185
 msgid "Web Site"
 msgstr "Internetov strnka"
 
-#: src/aim.c:151 src/buddy.c:2631
+#: src/aim.c:153 src/buddy.c:2709
 msgid "Signoff"
 msgstr "Odhlsit"
 
-#: src/aim.c:163
+#: src/aim.c:165
 #, fuzzy
 msgid "Please enter your logon"
 msgstr "Prosm zadejte svj logon"
 
-#: src/aim.c:163 src/multi.c:1388 src/server.c:55
+#: src/aim.c:165 src/multi.c:1400 src/server.c:55
 msgid "Signon Error"
 msgstr "Chyba pi pihlaovn"
 
-#: src/aim.c:261
+#: src/aim.c:263
 msgid "Gaim - Login"
 msgstr "Gaim - Pihlen"
 
-#: src/aim.c:279
+#: src/aim.c:281
 msgid "Screen Name: "
 msgstr "ID: "
 
-#: src/aim.c:295
+#: src/aim.c:297
 msgid "Password: "
 msgstr "Heslo: "
 
-#: src/aim.c:316 src/buddy.c:2635
+#: src/aim.c:318 src/buddy.c:2713
 msgid "Quit"
 msgstr "Konec"
 
-#: src/aim.c:321 src/aim.c:819 src/buddy.c:2661
+#: src/aim.c:323 src/aim.c:831 src/buddy.c:2739
 msgid "Accounts"
 msgstr "ty"
 
-#: src/aim.c:323 src/multi.c:903
+#: src/aim.c:325 src/multi.c:915
 msgid "Signon"
 msgstr "Pihlsit"
 
-#: src/aim.c:355
+#: src/aim.c:357
 #, fuzzy
 msgid "About"
 msgstr "O aplikaci Gaim"
 
-#: src/aim.c:356 src/prefs.c:1620 src/prefs.c:1894
+#: src/aim.c:358 src/prefs.c:1633 src/prefs.c:1905
 msgid "Options"
 msgstr "Volby"
 
-#: src/aim.c:358 src/aim.c:822 src/buddy.c:2679
+#: src/aim.c:360 src/aim.c:834 src/buddy.c:2757
 msgid "Plugins"
 msgstr ""
 
-#: src/aim.c:816 src/buddy.c:2671
+#: src/aim.c:828 src/buddy.c:2749
 msgid "Preferences"
 msgstr "Nastaven"
 
-#: src/applet.c:199
+#: src/aim.c:838 src/multi.c:1472
+#, fuzzy
+msgid "Auto-login"
+msgstr "Aotomatick pihlaovn"
+
+#: src/applet.c:109
 msgid "Attempting to sign on...."
 msgstr "Pokoum se pihlsit...."
 
-#: src/applet.c:202
+#: src/applet.c:112
 msgid "Offline. Click to bring up login box."
 msgstr "Nepipojen. Kliknte pro otveven pihlaovacho okna."
 
-#: src/applet.c:218
+#: src/applet.c:128
 #, c-format
 msgid "Away: %d pending."
 msgstr ""
 
-#: src/applet.c:221
+#: src/applet.c:131
 msgid "Away."
 msgstr "Pry."
 
-#: src/applet.c:296 src/away.c:388
-msgid "New Away Messege"
+#: src/applet.c:200 src/away.c:388
+#, fuzzy
+msgid "New Away Message"
 msgstr "Nov 'Pry' zprva"
 
-#: src/applet.c:444
+#: src/applet.c:348
 msgid "Can't create Gaim applet!"
 msgstr "Nemu vytvoit applet Gaim!"
 
-#: src/applet.c:465
+#: src/applet.c:368
 msgid "About..."
 msgstr "O..."
 
@@ -1334,95 +1792,82 @@
 msgstr "Zpt"
 
 #: src/away.c:408
-msgid "Remove Away Messege"
+#, fuzzy
+msgid "Remove Away Message"
 msgstr "Odstra 'Pry' zprvu"
 
 #: src/away.c:596
 msgid "Set All Away"
 msgstr "Nastav ve na 'Pry'"
 
-#. Put the buttons in the box
-#: src/buddy.c:489 src/buddy.c:2746 src/buddy_chat.c:1443
-#: src/conversetion.c:2369 src/conversetion.c:2851 src/dialogs.c:892
-#: src/dialogs.c:1074 src/dialogs.c:2055 src/multi.c:1041 src/prefs.c:2030
-#: src/prefs.c:2372 src/prefs.c:2406
-msgid "Add"
-msgstr "Pidat"
-
-#: src/buddy.c:490 src/buddy.c:2747 src/dialogs.c:902 src/dialogs.c:1049
+#: src/buddy.c:493 src/buddy.c:2828 src/dialogs.c:942 src/dialogs.c:1089
 msgid "Group"
 msgstr "Skupina"
 
-#: src/buddy.c:491 src/buddy.c:2748 src/buddy_chat.c:1445
-#: src/conversetion.c:2355 src/conversetion.c:2848 src/prefs.c:2044
-#: src/prefs.c:2376 src/prefs.c:2410
-msgid "Remove"
-msgstr "Zruit"
-
-#: src/buddy.c:496 src/buddy.c:649 src/buddy.c:803 src/buddy.c:2510
-#: src/buddy_chat.c:850 src/buddy_chat.c:1267
+#: src/buddy.c:499 src/buddy.c:664 src/buddy.c:834 src/buddy.c:2579
+#: src/buddy_chat.c:861 src/buddy_chat.c:1278
 msgid "IM"
 msgstr "IM"
 
-#: src/buddy.c:497 src/buddy.c:2511 src/buddy_chat.c:866 src/buddy_chat.c:1275
-#: src/buddy_chat.c:1451 src/conversetion.c:2869
+#: src/buddy.c:500 src/buddy.c:2580 src/buddy_chat.c:877 src/buddy_chat.c:1286
+#: src/buddy_chat.c:1462 src/conversation.c:2897
 msgid "Info"
 msgstr "Info"
 
 #. Put the buttons in the box
-#: src/buddy.c:654 src/buddy.c:808 src/dialogs.c:1041 src/dialogs.c:3418
-#: src/dialogs.c:3433
+#: src/buddy.c:669 src/buddy.c:839 src/dialogs.c:1081 src/dialogs.c:3458
+#: src/dialogs.c:3473
 msgid "Alias"
 msgstr "Alias"
 
-#: src/buddy.c:659 src/buddy.c:827
+#: src/buddy.c:674 src/buddy.c:858
 msgid "Add Buddy Pounce"
 msgstr ""
 
-#: src/buddy.c:666 src/buddy.c:833
+#: src/buddy.c:681 src/buddy.c:864
 msgid "View Log"
 msgstr "Zobrazit LOG"
 
-#: src/buddy.c:790 src/buddy.c:821
+#: src/buddy.c:821 src/buddy.c:852
 msgid "Rename"
 msgstr "Pejmenovat"
 
-#: src/buddy.c:815
+#: src/buddy.c:846
 msgid "Un-Alias"
 msgstr "Zruit alias"
 
-#: src/buddy.c:1587 src/buddy.c:2654
+#: src/buddy.c:1645 src/buddy.c:2732
 msgid "Buddy Pounce"
 msgstr ""
 
-#: src/buddy.c:1667
+#: src/buddy.c:1725
 msgid "New Buddy Pounce"
 msgstr ""
 
-#: src/buddy.c:1685
+#: src/buddy.c:1743
 msgid "Remove Buddy Pounce"
 msgstr ""
 
-#: src/buddy.c:1713
+#: src/buddy.c:1771
 msgid "[Click to edit]"
 msgstr "[Klikni pro pravu]"
 
-#: src/buddy.c:2188
+#: src/buddy.c:2254
 #, c-format
 msgid "Logged in: %s\n"
 msgstr "Pihlen v: %s\n"
 
-#: src/buddy.c:2200
+#: src/buddy.c:2266
 #, c-format
 msgid "Warnings: %d%%\n"
 msgstr "Vstrahy: %d%%\n"
 
-#: src/buddy.c:2212
+#: src/buddy.c:2278
 #, c-format
 msgid "Capabilities: %s\n"
 msgstr "monosti: %s\n"
 
-#: src/buddy.c:2216
+#: src/buddy.c:2282
 #, c-format
 msgid ""
 "Alias: %s               \n"
@@ -1433,117 +1878,130 @@
 "ID: %s\n"
 "%s%s%s%s%s%s"
 
-#: src/buddy.c:2220
+#: src/buddy.c:2286
 msgid "Idle: "
 msgstr "Neinn:"
 
-#: src/buddy.c:2291 src/buddy.c:2296
+#: src/buddy.c:2359 src/buddy.c:2364
 #, c-format
 msgid "%s logged in."
 msgstr "%s prihlen."
 
-#: src/buddy.c:2355 src/buddy.c:2360
+#: src/buddy.c:2424 src/buddy.c:2429
 #, c-format
 msgid "%s logged out."
 msgstr "%s odhlen."
 
-#: src/buddy.c:2545
+#: src/buddy.c:2614
 msgid "Information on selected Buddy"
 msgstr "Informace o vybranm kamardovi"
 
-#: src/buddy.c:2546 src/dialogs.c:699
-msgid "Send Instant Messege"
+#: src/buddy.c:2615 src/dialogs.c:697
+#, fuzzy
+msgid "Send Instant Message"
 msgstr "Poslat zprvu"
 
-#: src/buddy.c:2547
+#: src/buddy.c:2616
 msgid "Start/join a Buddy Chat"
 msgstr "Zat/Pripojit se k chatu s kamardem"
 
-#: src/buddy.c:2548
-msgid "Activate Away Messege"
+#: src/buddy.c:2617
+#, fuzzy
+msgid "Activate Away Message"
 msgstr "Aktivuj 'Pry' sprvu"
 
-#: src/buddy.c:2611
+#: src/buddy.c:2689
 msgid "File"
 msgstr "Soubor"
 
-#: src/buddy.c:2615
+#: src/buddy.c:2693
 msgid "Add A Buddy"
 msgstr "Pridat kamarda"
 
-#: src/buddy.c:2617
+#: src/buddy.c:2695
 msgid "Join A Chat"
 msgstr "Pripojit se k chatu"
 
-#: src/buddy.c:2619
-msgid "New Instant Messege"
+#: src/buddy.c:2697
+#, fuzzy
+msgid "New Instant Message"
 msgstr "Nov zprva"
 
-#: src/buddy.c:2621 src/dialogs.c:751
+#: src/buddy.c:2699 src/dialogs.c:759
 msgid "Get User Info"
 msgstr "Zskat informace o uivateli"
 
-#: src/buddy.c:2626
+#: src/buddy.c:2704
 msgid "Import Buddy List"
 msgstr "Importuj Buddy List"
 
-#: src/buddy.c:2644
+#: src/buddy.c:2722
 msgid "Tools"
 msgstr "Nstroje"
 
-#: src/buddy.c:2667
+#: src/buddy.c:2745
 msgid "Protocol Actions"
 msgstr "Akce protokolu"
 
-#: src/buddy.c:2673
+#: src/buddy.c:2751
 msgid "View System Log"
 msgstr "Zobrazit systmov LOG"
 
-#: src/buddy.c:2685
+#: src/buddy.c:2763
 msgid "Perl"
 msgstr "Perl"
 
-#: src/buddy.c:2688
+#: src/buddy.c:2766
 msgid "Load Script"
 msgstr "Nahrt skript"
 
-#: src/buddy.c:2692
+#: src/buddy.c:2770
 msgid "Unload All Scripts"
 msgstr "Zruit vechny skripty"
 
-#: src/buddy.c:2696
+#: src/buddy.c:2774
 msgid "List Scripts"
 msgstr "Seznam script"
 
-#: src/buddy.c:2704
+#: src/buddy.c:2782
 msgid "Help"
 msgstr "Pomoc"
 
-#: src/buddy.c:2709
+#: src/buddy.c:2787
+#, fuzzy
+msgid "Online Help"
+msgstr "Pipojen"
+
+#: src/buddy.c:2788
+#, fuzzy
+msgid "Debug Window"
+msgstr "Zobraz ladc okno"
+
+#: src/buddy.c:2789
 msgid "About Gaim"
 msgstr "O aplikaci Gaim"
 
-#: src/buddy.c:2726 src/prefs.c:2892
+#: src/buddy.c:2807 src/prefs.c:2905
 msgid "Buddy List"
 msgstr "Buddy List"
 
-#: src/buddy.c:2779
+#: src/buddy.c:2860
 msgid "Add a new Buddy"
 msgstr "Prida novho kamarda"
 
-#: src/buddy.c:2780
+#: src/buddy.c:2861
 msgid "Add a new Group"
 msgstr "Pridat novou skupinu"
 
-#: src/buddy.c:2781
+#: src/buddy.c:2862
 msgid "Remove selected Buddy/Group"
 msgstr "Vymazat vybranho kamarda/skupinu"
 
-#: src/buddy.c:2808
+#: src/buddy.c:2889
 msgid "Edit Buddies"
 msgstr "Editovat kamardy"
 
-#: src/buddy.c:2851
+#: src/buddy.c:2932
 msgid "Gaim - Buddy List"
 msgstr "Gaim - Buddy List"
 
@@ -1551,21 +2009,17 @@
 msgid "Join Chat"
 msgstr "Pripojit se k chatu"
 
-#: src/buddy_chat.c:272
-msgid "Buddy Chat"
-msgstr "Chat s kamardem"
-
 #: src/buddy_chat.c:283
 msgid "Join Chat As:"
 msgstr "Pipojit se k chatu jako:"
 
-#: src/buddy_chat.c:304 src/buddy_chat.c:392 src/dialogs.c:450
-#: src/dialogs.c:540 src/dialogs.c:717 src/dialogs.c:775 src/dialogs.c:894
-#: src/dialogs.c:1070 src/dialogs.c:1433 src/dialogs.c:1638 src/dialogs.c:1762
-#: src/dialogs.c:1822 src/dialogs.c:2044 src/dialogs.c:2226 src/dialogs.c:2401
-#: src/dialogs.c:2472 src/dialogs.c:3168 src/dialogs.c:3420 src/dialogs.c:3601
-#: src/dialogs.c:3972 src/dialogs.c:4078 src/dialogs.c:4737 src/multi.c:769
-#: src/multi.c:899 src/prpl.c:150 src/prpl.c:224
+#: src/buddy_chat.c:304 src/buddy_chat.c:392 src/dialogs.c:449
+#: src/dialogs.c:539 src/dialogs.c:715 src/dialogs.c:816 src/dialogs.c:934
+#: src/dialogs.c:1110 src/dialogs.c:1473 src/dialogs.c:1678 src/dialogs.c:1802
+#: src/dialogs.c:1862 src/dialogs.c:2084 src/dialogs.c:2266 src/dialogs.c:2441
+#: src/dialogs.c:2512 src/dialogs.c:3208 src/dialogs.c:3460 src/dialogs.c:3641
+#: src/dialogs.c:4012 src/dialogs.c:4118 src/dialogs.c:4777 src/multi.c:781
+#: src/multi.c:911 src/prpl.c:150 src/prpl.c:224
 msgid "Cancel"
 msgstr "Zruit"
 
@@ -1573,306 +2027,311 @@
 msgid "Join"
 msgstr "Pripojit"
 
-#: src/buddy_chat.c:393 src/buddy_chat.c:396 src/buddy_chat.c:1317
-#: src/buddy_chat.c:1407
+#: src/buddy_chat.c:393 src/buddy_chat.c:396 src/buddy_chat.c:1328
+#: src/buddy_chat.c:1418
 msgid "Invite"
 msgstr "Pozvat"
 
-#: src/buddy_chat.c:412 src/dialogs.c:1261 src/dialogs.c:3428
+#: src/buddy_chat.c:412 src/dialogs.c:1301 src/dialogs.c:3468
 msgid "Buddy"
 msgstr "Kamard"
 
-#: src/buddy_chat.c:417 src/prefs.c:1993
-msgid "Messege"
+#: src/buddy_chat.c:417 src/prefs.c:2004
+#, fuzzy
+msgid "Message"
 msgstr "Zprva"
 
 #: src/buddy_chat.c:454
 msgid "Gaim - Invite Buddy Into Chat Room"
 msgstr "Gaim - Pozvat kamarda do chatovac mstnosti"
 
-#: src/buddy_chat.c:857
+#: src/buddy_chat.c:868
 msgid "Un-Ignore"
 msgstr "Od-ignorovat"
 
-#: src/buddy_chat.c:859 src/buddy_chat.c:1271
+#: src/buddy_chat.c:870 src/buddy_chat.c:1282
 msgid "Ignore"
 msgstr "Ignorovat"
 
 #. don't remove them from ignored in case they re-enter
-#: src/buddy_chat.c:922 src/buddy_chat.c:1034 src/buddy_chat.c:1497
-#: src/buddy_chat.c:1530
+#: src/buddy_chat.c:933 src/buddy_chat.c:1045 src/buddy_chat.c:1508
+#: src/buddy_chat.c:1541
 #, c-format
 msgid "%d %s in room"
 msgstr "%d %s v mstnosti"
 
-#: src/buddy_chat.c:930
+#: src/buddy_chat.c:941
 #, c-format
 msgid "%s entered the room."
 msgstr "%s vstoupil do mstnosti."
 
-#: src/buddy_chat.c:996
+#: src/buddy_chat.c:1007
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s je te znm jako %s"
 
-#: src/buddy_chat.c:1043
+#: src/buddy_chat.c:1054
 #, fuzzy, c-format
 msgid "%s left the room (%s)."
 msgstr "%s opustil mstnost (%s)."
 
-#: src/buddy_chat.c:1045
+#: src/buddy_chat.c:1056
 #, c-format
 msgid "%s left the room."
 msgstr "%s opustil miestnost."
 
-#: src/buddy_chat.c:1144
+#: src/buddy_chat.c:1155
 msgid "Gaim - Group Chats"
 msgstr "Gaim - Skupinov chaty"
 
-#: src/buddy_chat.c:1207
+#: src/buddy_chat.c:1218
 msgid "Topic:"
 msgstr "Tma:"
 
-#: src/buddy_chat.c:1248
+#: src/buddy_chat.c:1259
 msgid "0 people in room"
 msgstr "0 lid v mstnosti"
 
-#: src/buddy_chat.c:1322 src/buddy_chat.c:1406
+#: src/buddy_chat.c:1333 src/buddy_chat.c:1417
 msgid "Whisper"
 msgstr "eptat"
 
-#: src/buddy_chat.c:1327 src/buddy_chat.c:1404 src/buddy_chat.c:1453
-#: src/conversetion.c:2880
+#: src/buddy_chat.c:1338 src/buddy_chat.c:1415 src/buddy_chat.c:1464
+#: src/conversation.c:2908
 msgid "Send"
 msgstr "Poslat"
 
-#: src/buddy_chat.c:1447 src/conversetion.c:2857
+#: src/buddy_chat.c:1458 src/conversation.c:2885
 msgid "Block"
 msgstr "Blokovat"
 
-#: src/buddy_chat.c:1449 src/conversetion.c:2863 src/dialogs.c:425
-#: src/dialogs.c:454
+#: src/buddy_chat.c:1460 src/conversation.c:2891 src/dialogs.c:424
+#: src/dialogs.c:453
 msgid "Warn"
 msgstr "Varovat"
 
-#: src/conversetion.c:415
-msgid "Gaim - Save Conversetion"
+#: src/conversation.c:431
+#, fuzzy
+msgid "Gaim - Save Conversation"
 msgstr "Gaim - Ulo konverzaci"
 
-#: src/conversetion.c:476
+#: src/conversation.c:492
 #, fuzzy
 msgid "Gaim - Insert Image"
 msgstr "Gaim - Vlo Obrzek"
 
-#: src/conversetion.c:1319
-msgid "Unable to send messege: too large"
+#: src/conversation.c:1336
+#, fuzzy
+msgid "Unable to send message: too large"
 msgstr "Nemu poslat zprvu: moc velk"
 
-#: src/conversetion.c:1319 src/conversetion.c:1323
-msgid "Messege Error"
+#: src/conversation.c:1336 src/conversation.c:1340
+#, fuzzy
+msgid "Message Error"
 msgstr "Chyba zprvy"
 
-#: src/conversetion.c:1323
-msgid "Unable to send messege: Unknown reason"
+#: src/conversation.c:1340
+#, fuzzy
+msgid "Unable to send message: Unknown reason"
 msgstr "Nemu poslat sprvu: Neznmy dvod"
 
-#: src/conversetion.c:1542
+#: src/conversation.c:1559
 #, c-format
 msgid "Currently at %d, "
 msgstr ""
 
-#: src/conversetion.c:1550
+#: src/conversation.c:1567
 #, c-format
 msgid "Setting position to %d\n"
 msgstr "Nastavuji pozici na %d\n"
 
-#: src/conversetion.c:2151 src/prefs.c:1306
+#: src/conversation.c:2170 src/prefs.c:1308
 msgid "Bold Text"
 msgstr "Tun text"
 
-#: src/conversetion.c:2151
+#: src/conversation.c:2170
 msgid "Bold"
 msgstr "Tun"
 
-#: src/conversetion.c:2155
+#: src/conversation.c:2174
 msgid "Italics Text"
 msgstr "Kurzva"
 
-#: src/conversetion.c:2156
+#: src/conversation.c:2175
 msgid "Italics"
 msgstr "Kurzva"
 
-#: src/conversetion.c:2159 src/prefs.c:1318
+#: src/conversation.c:2178 src/prefs.c:1320
 msgid "Underline Text"
 msgstr "Podtren text"
 
-#: src/conversetion.c:2160
+#: src/conversation.c:2179
 msgid "Underline"
 msgstr "Podtren"
 
-#: src/conversetion.c:2164 src/prefs.c:1324
+#: src/conversation.c:2183 src/prefs.c:1326
 msgid "Strike through Text"
 msgstr "Pekrtnut text"
 
-#: src/conversetion.c:2164
+#: src/conversation.c:2183
 msgid "Strike"
 msgstr "Pekrtnut"
 
-#: src/conversetion.c:2170
+#: src/conversation.c:2189
 msgid "Decrease font size"
 msgstr "Zmenit velikost psma"
 
-#: src/conversetion.c:2170
+#: src/conversation.c:2189
 msgid "Small"
 msgstr "Mal"
 
-#: src/conversetion.c:2173
+#: src/conversation.c:2192
 msgid "Normal font size"
 msgstr "Normlna vekost psma"
 
-#: src/conversetion.c:2173
+#: src/conversation.c:2192
 msgid "Normal"
 msgstr "Normln"
 
-#: src/conversetion.c:2176
+#: src/conversation.c:2195
 msgid "Increase font size"
 msgstr "Zvtit velikost psma"
 
-#: src/conversetion.c:2176
+#: src/conversation.c:2195
 msgid "Big"
 msgstr "Velk"
 
-#: src/conversetion.c:2183 src/dialogs.c:2843 src/dialogs.c:2867
+#: src/conversation.c:2202 src/dialogs.c:2883 src/dialogs.c:2907
 msgid "Select Font"
 msgstr "Vybrat psmo"
 
-#: src/conversetion.c:2184
+#: src/conversation.c:2203
 msgid "Font"
 msgstr "Psmo"
 
-#: src/conversetion.c:2187 src/prefs.c:1354
+#: src/conversation.c:2206 src/prefs.c:1356
 msgid "Text Color"
 msgstr "Barva textu"
 
-#: src/conversetion.c:2188 src/conversetion.c:2192
+#: src/conversation.c:2207 src/conversation.c:2211
 msgid "Color"
 msgstr "Barva"
 
-#: src/conversetion.c:2192 src/prefs.c:1372
+#: src/conversation.c:2211 src/prefs.c:1374
 msgid "Background Color"
 msgstr "Barva pozad"
 
-#: src/conversetion.c:2199 src/dialogs.c:2466
+#: src/conversation.c:2218 src/dialogs.c:2506
 msgid "Insert Link"
 msgstr "Vloit odkaz"
 
-#: src/conversetion.c:2200
+#: src/conversation.c:2219
 msgid "Link"
 msgstr "Odkaz"
 
-#: src/conversetion.c:2203
+#: src/conversation.c:2222
 msgid "Insert smiley face"
 msgstr "Vloit smajlk"
 
-#: src/conversetion.c:2203
+#: src/conversation.c:2222
 msgid "Smiley"
 msgstr "Smajlk"
 
-#: src/conversetion.c:2206
+#: src/conversation.c:2225
 #, fuzzy
 msgid "Insert IM Image"
 msgstr "Vloit IM obrzek"
 
-#: src/conversetion.c:2206
+#: src/conversation.c:2225
 msgid "Image"
 msgstr ""
 
-#: src/conversetion.c:2213
+#: src/conversation.c:2232
 msgid "Enable logging"
 msgstr "Povolit logovn"
 
-#: src/conversetion.c:2214 src/prefs.c:254
+#: src/conversation.c:2233 src/prefs.c:254
 msgid "Logging"
 msgstr "Logovn"
 
-#: src/conversetion.c:2223
-msgid "Save Conversetion"
+#: src/conversation.c:2242
+#, fuzzy
+msgid "Save Conversation"
 msgstr "Uloit konverzaci"
 
-#: src/conversetion.c:2224 src/dialogs.c:1642 src/dialogs.c:1826
-#: src/dialogs.c:3180 src/dialogs.c:3868 src/dialogs.c:4745
+#: src/conversation.c:2243 src/dialogs.c:1682 src/dialogs.c:1866
+#: src/dialogs.c:3220 src/dialogs.c:3908 src/dialogs.c:4785
 msgid "Save"
 msgstr "Uloit"
 
-#: src/conversetion.c:2228
-msgid "Enable sounds"
-msgstr "Povolit zvuky"
-
-#: src/conversetion.c:2229
+#: src/conversation.c:2247 src/conversation.c:2248
 msgid "Sound"
 msgstr "Zvuk"
 
-#: src/conversetion.c:2709
-msgid "Gaim - Conversetions"
+#: src/conversation.c:2729
+#, fuzzy
+msgid "Gaim - Conversations"
 msgstr "Gaim - Konverzace"
 
-#: src/conversetion.c:2796
-msgid "Send messege as: "
+#: src/conversation.c:2816
+#, fuzzy
+msgid "Send message as: "
 msgstr "Poslat zprvu jako: "
 
-#: src/conversetion.c:3414
+#: src/conversation.c:3453
 msgid "Gaim - Save Icon"
 msgstr "Gaim - Uloit ikonu"
 
-#: src/conversetion.c:3441
-msgid "Diseble Animation"
+#: src/conversation.c:3487
+#, fuzzy
+msgid "Disable Animation"
 msgstr "Zakzat animace"
 
-#: src/conversetion.c:3446
+#: src/conversation.c:3492
 msgid "Enable Animation"
 msgstr "Povolit animace"
 
-#: src/conversetion.c:3452
+#: src/conversation.c:3498
 msgid "Hide Icon"
 msgstr "Skryj ikonu"
 
-#: src/conversetion.c:3458
+#: src/conversation.c:3504
 msgid "Save Icon As..."
 msgstr "Uloit ikonu jako..."
 
-#: src/dialogs.c:413
+#: src/dialogs.c:412
 msgid "Gaim - Warn user?"
 msgstr "Gaim - Varovat uivatele?"
 
-#: src/dialogs.c:433
+#: src/dialogs.c:432
 #, c-format
 msgid "Do you really want to warn %s?"
 msgstr "opravdu chcete varovat %s?"
 
-#: src/dialogs.c:438
+#: src/dialogs.c:437
 msgid "Warn anonymously?"
 msgstr "Varovat anonymn?"
 
-#: src/dialogs.c:442
+#: src/dialogs.c:441
 msgid "Anonymous warnings are less harsh."
 msgstr "Anonymn varovn nejsou tak krut."
 
-#: src/dialogs.c:470
+#: src/dialogs.c:469
 #, c-format
 msgid "Removing '%s' from buddylist.\n"
 msgstr "Mau '%s' z buddy Listu.\n"
 
-#: src/dialogs.c:495
+#: src/dialogs.c:494
 #, fuzzy, c-format
 msgid "Gaim - Remove %s?"
 msgstr "Gaim - Odstranit %s?"
 
-#: src/dialogs.c:508
+#: src/dialogs.c:507
 #, fuzzy
 msgid "Remove Buddy"
 msgstr "Pejmenovat kamarda"
 
-#: src/dialogs.c:518
+#: src/dialogs.c:517
 #, c-format
 msgid ""
 "You are about to remove '%s' from\n"
@@ -1881,358 +2340,370 @@
 "Chystte se odstranit '%s' z Vaeho\n"
 "Buddy Listu. Opravdu to chcete udlat?"
 
-#: src/dialogs.c:530 src/prpl.c:154 src/prpl.c:228
+#: src/dialogs.c:529 src/prpl.c:154 src/prpl.c:228
 msgid "Accept"
 msgstr "Akceptovat"
 
 #. Build OK Button
-#: src/dialogs.c:637 src/dialogs.c:722 src/dialogs.c:780 src/dialogs.c:1437
-#: src/dialogs.c:1766 src/dialogs.c:1917 src/dialogs.c:2225 src/dialogs.c:2405
-#: src/dialogs.c:2471 src/dialogs.c:3977 src/dialogs.c:4083 src/multi.c:774
+#: src/dialogs.c:635 src/dialogs.c:720 src/dialogs.c:821 src/dialogs.c:1477
+#: src/dialogs.c:1806 src/dialogs.c:1957 src/dialogs.c:2265 src/dialogs.c:2445
+#: src/dialogs.c:2511 src/dialogs.c:4017 src/dialogs.c:4123 src/multi.c:786
 msgid "OK"
 msgstr "OK"
 
-#: src/dialogs.c:689
+#: src/dialogs.c:687
 msgid "Gaim - IM user"
 msgstr "Gaim - IM uivatel"
 
-#: src/dialogs.c:706
+#: src/dialogs.c:704
 msgid "IM who:"
 msgstr ""
 
-#: src/dialogs.c:758
+#: src/dialogs.c:768
 msgid "User:"
 msgstr "Uivatel:"
 
+#: src/dialogs.c:777
+#, fuzzy
+msgid "Account:"
+msgstr "et"
+
 #. Finish up
-#: src/dialogs.c:785
+#: src/dialogs.c:826
 msgid "Gaim - Get User Info"
 msgstr "Gaim - Zskat informace o uivateli"
 
-#: src/dialogs.c:900
+#: src/dialogs.c:940
 msgid "Add Group"
 msgstr "Pidat skupinu"
 
-#: src/dialogs.c:925
+#: src/dialogs.c:965
 msgid "Gaim - Add Group"
 msgstr "Gaim - Pidat skupinu"
 
-#: src/dialogs.c:1009
+#: src/dialogs.c:1049
 msgid "Gaim - Add Buddy"
 msgstr "Gaim - Pidat kamarda"
 
-#: src/dialogs.c:1021
+#: src/dialogs.c:1061
 msgid "Add Buddy"
 msgstr "Pidat kamarda"
 
-#: src/dialogs.c:1031
+#: src/dialogs.c:1071
 msgid "Contact"
 msgstr "Kontakt"
 
 #. Set up stuff for the account box
-#: src/dialogs.c:1057
+#: src/dialogs.c:1097
 msgid "Add To"
 msgstr "Pidat k"
 
-#: src/dialogs.c:1094
+#: src/dialogs.c:1134
 msgid "Please enter a buddy to pounce."
 msgstr ""
 
-#: src/dialogs.c:1094
+#: src/dialogs.c:1134
 msgid "Buddy Pounce Error"
 msgstr ""
 
-#: src/dialogs.c:1230
+#: src/dialogs.c:1270
 msgid "Gaim - New Buddy Pounce"
 msgstr ""
 
-#. <poun ce type="who">
-#: src/dialogs.c:1241
+#. <pounce type="who">
+#: src/dialogs.c:1281
 msgid "Pounce Who"
 msgstr ""
 
-#: src/dialogs.c:1252
+#: src/dialogs.c:1292
 msgid "Account"
 msgstr "et"
 
 #. </pounce type="who">
 #. <pounce type="when">
-#: src/dialogs.c:1278
+#: src/dialogs.c:1318
 msgid "Pounce When"
 msgstr ""
 
-#: src/dialogs.c:1288
+#: src/dialogs.c:1328
 msgid "Pounce on sign on"
 msgstr ""
 
-#: src/dialogs.c:1297
+#: src/dialogs.c:1337
 msgid "Pounce on return from away"
 msgstr ""
 
-#: src/dialogs.c:1306
+#: src/dialogs.c:1346
 msgid "Pounce on return from idle"
 msgstr ""
 
-#: src/dialogs.c:1315
+#: src/dialogs.c:1355
 #, fuzzy
 msgid "Pounce when buddy is typing to you"
 msgstr "Zvuk kdy se kamard pihls"
 
 #. </pounce type="when">
 #. <pounce type="action">
-#: src/dialogs.c:1325
+#: src/dialogs.c:1365
 msgid "Pounce Action"
 msgstr ""
 
-#: src/dialogs.c:1336
+#: src/dialogs.c:1376
 msgid "Open IM Window"
 msgstr "Otevt IM okno"
 
-#: src/dialogs.c:1345
+#: src/dialogs.c:1385
 msgid "Popup Notification"
 msgstr "Zobrazit notifikaci"
 
-#: src/dialogs.c:1354
-msgid "Send Messege"
+#: src/dialogs.c:1394
+#, fuzzy
+msgid "Send Message"
 msgstr "Poslat zprvu"
 
-#: src/dialogs.c:1375
+#: src/dialogs.c:1415
 msgid "Execute command on pounce"
 msgstr ""
 
-#: src/dialogs.c:1397
+#: src/dialogs.c:1437
 msgid "Play sound on pounce"
 msgstr ""
 
 #. </pounce type="action">
-#: src/dialogs.c:1419
+#: src/dialogs.c:1459
 msgid "Save this pounce after activation"
 msgstr ""
 
-#: src/dialogs.c:1505
+#: src/dialogs.c:1545
 msgid "Gaim - Set Dir Info"
 msgstr ""
 
-#: src/dialogs.c:1514
+#: src/dialogs.c:1554
 msgid "Directory Info"
 msgstr ""
 
-#: src/dialogs.c:1536
+#: src/dialogs.c:1576
 msgid "Allow Web Searches To Find Your Info"
 msgstr "Povolit Internetovm vyhladvam najt informace o Vs"
 
 #. Line 1
-#: src/dialogs.c:1539 src/dialogs.c:2244
+#: src/dialogs.c:1579 src/dialogs.c:2284
 msgid "First Name"
 msgstr "Jmno"
 
 #. Line 2
-#: src/dialogs.c:1550 src/dialogs.c:2256
+#: src/dialogs.c:1590 src/dialogs.c:2296
 msgid "Middle Name"
 msgstr "Prostedn jmno"
 
 #. Line 3
-#: src/dialogs.c:1562 src/dialogs.c:2268
+#: src/dialogs.c:1602 src/dialogs.c:2308
 msgid "Last Name"
 msgstr "Pjmen"
 
 #. Line 4
-#: src/dialogs.c:1573 src/dialogs.c:2280
+#: src/dialogs.c:1613 src/dialogs.c:2320
 msgid "Maiden Name"
 msgstr "Jmno za svobodna"
 
 #. Line 6
-#: src/dialogs.c:1595 src/dialogs.c:2303
+#: src/dialogs.c:1635 src/dialogs.c:2343
 msgid "State"
 msgstr "Stt"
 
-#: src/dialogs.c:1660
+#: src/dialogs.c:1700
 msgid "New Passwords Do Not Match"
 msgstr "Nov heslo nesouhlas"
 
-#: src/dialogs.c:1660 src/dialogs.c:1665
+#: src/dialogs.c:1700 src/dialogs.c:1705
 msgid "Gaim - Change Password Error"
 msgstr "Gaim - Chyba zmny hesla"
 
-#: src/dialogs.c:1665
+#: src/dialogs.c:1705
 msgid "Fill out all fields completely"
 msgstr "Vyplte vechny polka"
 
-#: src/dialogs.c:1720
+#: src/dialogs.c:1760
 msgid "Original Password"
 msgstr "Star heslo"
 
-#: src/dialogs.c:1734
+#: src/dialogs.c:1774
 msgid "New Password"
 msgstr "Nov heslo"
 
-#: src/dialogs.c:1748
+#: src/dialogs.c:1788
 msgid "New Password (again)"
 msgstr "Nov heslo (znova)"
 
-#: src/dialogs.c:1789
+#: src/dialogs.c:1829
 msgid "Gaim - Set User Info"
 msgstr "Gaim - Nastavit informace o uivateli"
 
-#: src/dialogs.c:1901
+#: src/dialogs.c:1941
 msgid "Below are the results of your search: "
 msgstr "Zde jsou vsledky Vaeho hledn: "
 
-#: src/dialogs.c:2034 src/dialogs.c:2041
+#: src/dialogs.c:2074 src/dialogs.c:2081
 msgid "Permit"
 msgstr "Povolit"
 
-#: src/dialogs.c:2036 src/dialogs.c:2043
+#: src/dialogs.c:2076 src/dialogs.c:2083
 msgid "Deny"
 msgstr "Zamtnout"
 
-#: src/dialogs.c:2080
+#: src/dialogs.c:2120
 msgid "Gaim - Add Permit"
 msgstr "Gaim - Pidat povolen"
 
-#: src/dialogs.c:2082
+#: src/dialogs.c:2122
 msgid "Gaim - Add Deny"
 msgstr "Gaim - Pidat zkaz"
 
-#: src/dialogs.c:2142
-msgid "Gaim - Log Conversetion"
+#: src/dialogs.c:2182
+#, fuzzy
+msgid "Gaim - Log Conversation"
 msgstr "Gaim - Loguj konverzaci"
 
-#: src/dialogs.c:2220 src/dialogs.c:2383
+#: src/dialogs.c:2260 src/dialogs.c:2423
 msgid "Search for Buddy"
 msgstr "Njt kamarda"
 
-#: src/dialogs.c:2348
+#: src/dialogs.c:2388
 msgid "Gaim - Find Buddy By Info"
 msgstr "Gaim - Najt kamarda podle informac"
 
-#: src/dialogs.c:2377
+#: src/dialogs.c:2417
 msgid "Gaim - Find Buddy By Email"
 msgstr "Gaim - Najt kamarda podle emailu"
 
-#: src/dialogs.c:2517
+#: src/dialogs.c:2557
 msgid "Gaim - Add URL"
 msgstr "Gaim - Pidat URL"
 
-#: src/dialogs.c:2668 src/dialogs.c:2689 src/dialogs.c:2743
+#: src/dialogs.c:2708 src/dialogs.c:2729 src/dialogs.c:2783
 msgid "Select Text Color"
 msgstr "Vyberte barvu textu"
 
-#: src/dialogs.c:2722
+#: src/dialogs.c:2762
 msgid "Select Background Color"
 msgstr "Vyberte barvu pozad"
 
-#: src/dialogs.c:2944
+#: src/dialogs.c:2984
 msgid "Import to:"
 msgstr "Importuj do:"
 
-#: src/dialogs.c:2968
+#: src/dialogs.c:3008
 msgid "Gaim - Import Buddy List"
 msgstr "Gaim - Importuj Buddy List"
 
 #. We shouldn't allow a blank title
-#: src/dialogs.c:3035
-msgid "You cannot create an away messege with a blank title"
+#: src/dialogs.c:3075
+#, fuzzy
+msgid "You cannot create an away message with a blank title"
 msgstr "Nemete vytvoit 'Pry' zprvu s przdnm nzvem"
 
-#. We shouldn't allow a blank messege
-#: src/dialogs.c:3042
-msgid "You cannot create an empty away messege"
+#. We shouldn't allow a blank message
+#: src/dialogs.c:3082
+#, fuzzy
+msgid "You cannot create an empty away message"
 msgstr "Nemete vytvoit przdnou 'Pry' zprvu"
 
-#: src/dialogs.c:3110
-msgid "Gaim - New away messege"
+#: src/dialogs.c:3150
+#, fuzzy
+msgid "Gaim - New away message"
 msgstr "Gaim - Nov 'Pry' zprva"
 
-#: src/dialogs.c:3120
-msgid "New away messege"
+#: src/dialogs.c:3160
+#, fuzzy
+msgid "New away message"
 msgstr "Nov 'Pry' zprva"
 
-#: src/dialogs.c:3133
+#: src/dialogs.c:3173
 msgid "Away title: "
 msgstr "Nzev 'Pry': "
 
-#: src/dialogs.c:3172
+#: src/dialogs.c:3212
 msgid "Use"
 msgstr "Pout"
 
-#: src/dialogs.c:3176
+#: src/dialogs.c:3216
 msgid "Save & Use"
 msgstr "Uloit a Pout"
 
 #. show everything
-#: src/dialogs.c:3373
+#: src/dialogs.c:3413
 msgid "Smile!"
 msgstr "smv"
 
-#: src/dialogs.c:3426
+#: src/dialogs.c:3466
 msgid "Alias Buddy"
 msgstr "Alias kamarda"
 
-#: src/dialogs.c:3459
+#: src/dialogs.c:3499
 msgid "Gaim - Alias Buddy"
 msgstr "Gaim - Alias kamarda"
 
-#: src/dialogs.c:3531
+#: src/dialogs.c:3571
 msgid "Gaim - Save Log File"
 msgstr "Gaim - Uloit LOG"
 
-#: src/dialogs.c:3563
+#: src/dialogs.c:3603
 #, c-format
 msgid "Unable to remove file %s - %s"
 msgstr "Nemu vymazat soubor %s - %s"
 
-#: src/dialogs.c:3591
+#: src/dialogs.c:3631
 msgid "Really clear log?"
 msgstr "Skuten vymazat LOG?"
 
-#: src/dialogs.c:3606
+#: src/dialogs.c:3646
 msgid "Okay"
 msgstr "OK"
 
-#: src/dialogs.c:3777
+#: src/dialogs.c:3817
 msgid "Date"
 msgstr "Datum"
 
-#: src/dialogs.c:3840
-msgid "Conversetion"
+#: src/dialogs.c:3880
+#, fuzzy
+msgid "Conversation"
 msgstr "Konverzace"
 
-#: src/dialogs.c:3863
+#: src/dialogs.c:3903
 msgid "Clear"
 msgstr "Vymazat"
 
-#: src/dialogs.c:3941
+#: src/dialogs.c:3981
 msgid "Gaim - Rename Group"
 msgstr "Gaim - Pejmenovat skupinu"
 
-#: src/dialogs.c:3951
+#: src/dialogs.c:3991
 msgid "Rename Group"
 msgstr "Pejmenovat skupinu"
 
-#: src/dialogs.c:3958 src/dialogs.c:4064
+#: src/dialogs.c:3998 src/dialogs.c:4104
 msgid "New name:"
 msgstr "Nov jmno"
 
-#: src/dialogs.c:4047
+#: src/dialogs.c:4087
 msgid "Gaim - Rename Buddy"
 msgstr "Gaim - Pejmenovat kamarda"
 
-#: src/dialogs.c:4057
+#: src/dialogs.c:4097
 msgid "Rename Buddy"
 msgstr "Pejmenovat kamarda"
 
 #. Below is basically stolen from plugins.c
-#: src/dialogs.c:4141
+#: src/dialogs.c:4181
 msgid "Gaim - Select Perl Script"
 msgstr "Gaim - Vyberte si Perlov skript"
 
-#: src/gaimrc.c:1117
+#: src/gaimrc.c:1136
 #, c-format
 msgid "Could not open config file %s."
 msgstr "Nemu otevt konfiguran soubor %s."
 
-#: src/gaimrc.c:1118
+#: src/gaimrc.c:1137
 msgid "Preferences Error"
 msgstr "Chyba nastaven"
 
@@ -2245,55 +2716,65 @@
 msgid "g003: Error opening connection.\n"
 msgstr "g003: Chyba pi otvrn spojen.\n"
 
-#: src/multi.c:452
+#: src/module.c:106 src/module.c:112 src/module.c:122
+#, fuzzy
+msgid "Plugin Error"
+msgstr "Chyba pi Pihlaovn"
+
+#: src/multi.c:454
 msgid "Gaim - Load Buddy Icon"
 msgstr "Gaim - Nahra ikonu kamarda"
 
-#: src/multi.c:495
+#: src/multi.c:497
 msgid "Buddy Icon File:"
 msgstr "Soubor s ikonami kamard:"
 
-#: src/multi.c:506
+#: src/multi.c:508
 msgid "Browse"
 msgstr "Prochzet"
 
-#: src/multi.c:511 src/prefs.c:1546
+#: src/multi.c:513 src/prefs.c:1548
 msgid "Reset"
 msgstr "Zruit"
 
-#: src/multi.c:538
+#: src/multi.c:540
 msgid "Screenname:"
 msgstr "ID:"
 
-#: src/multi.c:558
+#: src/multi.c:559
+#, fuzzy
+msgid "Alias:"
+msgstr "Alias"
+
+#: src/multi.c:569
 msgid "Protocol:"
 msgstr "Protokol:"
 
-#: src/multi.c:563
+#: src/multi.c:574
 msgid "Remember Password"
 msgstr "Zapamatovat heslo"
 
-#: src/multi.c:564
+#: src/multi.c:575
 msgid "Auto-Login"
 msgstr "Aotomatick pihlaovn"
 
-#: src/multi.c:604
+#: src/multi.c:616
 msgid "New Mail Notifications"
 msgstr "Upozorovn na nov zprvy"
 
-#: src/multi.c:694
+#: src/multi.c:706
 msgid "Register with server"
 msgstr ""
 
-#: src/multi.c:752
+#: src/multi.c:764
 msgid "Gaim - Modify Account"
 msgstr "Gaim - Zmnit et"
 
-#: src/multi.c:871
+#: src/multi.c:883
 msgid "Enter Password"
 msgstr "Vlote heslo"
 
-#: src/multi.c:935
+#: src/multi.c:947
 msgid ""
 "You cannot log this account in; you do not have the protocol it uses loaded, "
 "or the protocol does not have a login function."
@@ -2301,71 +2782,70 @@
 "Nemete se pihlsit na tento et, nemte nahran protokol, nebo protokol "
 "nem funkci pihlen"
 
-#: src/multi.c:937
+#: src/multi.c:949
 msgid "Login Error"
 msgstr "Chyba pi Pihlaovn"
 
-#: src/multi.c:966
+#: src/multi.c:978
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "Jste si jisti, e chcete vymazat %s"
 
-#: src/multi.c:1003
+#: src/multi.c:1015
 msgid "Gaim - Account Editor"
 msgstr "Gaim - Editor t"
 
-#: src/multi.c:1022
+#: src/multi.c:1034
 msgid "Select All"
 msgstr "Vybrat ve"
 
-#: src/multi.c:1027
+#: src/multi.c:1039
 msgid "Select Autos"
 msgstr "Vybrat automatick"
 
-#: src/multi.c:1031
+#: src/multi.c:1043
 msgid "Select None"
 msgstr "Vybrat dn"
 
-#: src/multi.c:1045
+#: src/multi.c:1057
 msgid "Modify"
 msgstr "Zmnit"
 
-#: src/multi.c:1049
+#: src/multi.c:1061
 msgid "Sign On/Off"
 msgstr "Prihlsit/Odhlsit"
 
-#: src/multi.c:1053
+#: src/multi.c:1065
 msgid "Delete"
 msgstr "Smazat"
 
-#: src/multi.c:1368
+#: src/multi.c:1380
 #, c-format
 msgid ""
 "%s\n"
 "%s: %s"
 msgstr ""
 
-#: src/multi.c:1387
+#: src/multi.c:1399
 #, fuzzy, c-format
 msgid "%s was unable to sign on"
 msgstr "%s nebyl schopn se pihlsit"
 
-#: src/multi.c:1398
-#, fuzzy
+#: src/multi.c:1410
 msgid "Notice"
 msgstr ""
 
-#: src/multi.c:1408
+#: src/multi.c:1420
 #, fuzzy, c-format
 msgid "%s has been signed off"
 msgstr "%s byl odhlen"
 
-#: src/multi.c:1409
+#: src/multi.c:1421
 #, fuzzy
 msgid "Connection Error"
 msgstr "Chyba spojen"
 
-#: src/perl.c:856
+#: src/perl.c:875
 msgid "Perl Scripts"
 msgstr "Perlov skripty"
 
@@ -2427,9 +2907,9 @@
 msgid "General Options"
 msgstr "Veobecn monosti"
 
-#: src/prefs.c:200 src/prefs.c:383 src/prefs.c:551 src/prefs.c:665
-#: src/prefs.c:919 src/prefs.c:1069 src/prefs.c:1294 src/prefs.c:1616
-#: src/prefs.c:1890 src/prefs.c:2323
+#: src/prefs.c:200 src/prefs.c:384 src/prefs.c:552 src/prefs.c:667
+#: src/prefs.c:921 src/prefs.c:1071 src/prefs.c:1296 src/prefs.c:1629
+#: src/prefs.c:1901 src/prefs.c:2334
 msgid "All options take effect immediately unless otherwise noted."
 msgstr "vechny nastaven vejdou okamit v platnost, pokud nen eeno jinak."
 
@@ -2471,7 +2951,8 @@
 msgstr "Pout X"
 
 #: src/prefs.c:262
-msgid "Log all conversetions"
+#, fuzzy
+msgid "Log all conversations"
 msgstr "Logovat vechny rozhovory"
 
 #: src/prefs.c:263
@@ -2503,8 +2984,8 @@
 msgstr "Prohle"
 
 #: src/prefs.c:291
-msgid "KFM"
-msgstr "KFM"
+msgid "Konqueror"
+msgstr ""
 
 #: src/prefs.c:292
 msgid "Opera"
@@ -2514,27 +2995,32 @@
 msgid "Netscape"
 msgstr "Netscape"
 
-#: src/prefs.c:296
+#: src/prefs.c:294
+msgid "Mozilla"
+msgstr ""
+
+#: src/prefs.c:297
 msgid "Pop up new window by default"
 msgstr "Standartn otevi nov okno"
 
-#: src/prefs.c:303
+#: src/prefs.c:304
 msgid "GNOME URL Handler"
 msgstr "GNOME URL ???"
 
-#: src/prefs.c:305
+#: src/prefs.c:306
 msgid "Galeon"
 msgstr "Galeon"
 
-#: src/prefs.c:306
-msgid "Manual"
-msgstr "Nvod"
-
-#: src/prefs.c:375
+#: src/prefs.c:307
+#, c-format
+msgid "Manual (%s for URL)"
+msgstr ""
+
+#: src/prefs.c:376
 msgid "Proxy Options"
 msgstr "Nastaven proxy"
 
-#: src/prefs.c:387
+#: src/prefs.c:388
 msgid ""
 "Not all protocols can use these proxy options. Please see the README file "
 "for details."
@@ -2542,379 +3028,392 @@
 "Ne vechny protokoly mou vyuvat tyto nastaven proxy. Zkonsultujte,\n"
 "prosm, README soubor kvli detailm."
 
-#: src/prefs.c:392
+#: src/prefs.c:393
 msgid "Proxy Type"
 msgstr "Typ proxy"
 
-#: src/prefs.c:404
+#: src/prefs.c:405
 msgid "Proxy Server"
 msgstr "Proxy Server"
 
-#: src/prefs.c:407
+#: src/prefs.c:408
 msgid "No Proxy"
 msgstr "Bez proxy"
 
-#: src/prefs.c:419
+#: src/prefs.c:420
 msgid "SOCKS 4"
 msgstr "SOCKS 4"
 
-#: src/prefs.c:429
+#: src/prefs.c:430
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
-#: src/prefs.c:438
+#: src/prefs.c:439
 msgid "HTTP"
 msgstr "HTTP"
 
-#: src/prefs.c:462
+#: src/prefs.c:463
 msgid "Host"
 msgstr "Hostitel"
 
-#: src/prefs.c:478
+#: src/prefs.c:479
 msgid "Port"
 msgstr "Port"
 
-#: src/prefs.c:495
+#: src/prefs.c:496
 msgid "User"
 msgstr "Uivatel"
 
-#: src/prefs.c:511
+#: src/prefs.c:512
 msgid "Password"
 msgstr "Heslo"
 
-#: src/prefs.c:543
+#: src/prefs.c:544
 msgid "Buddy List Options"
 msgstr "Monosti Buddy Listu"
 
-#: src/prefs.c:555
+#: src/prefs.c:556
 msgid "Buddy List Window"
 msgstr "Okno Buddy Listu"
 
-#: src/prefs.c:568
+#: src/prefs.c:569
 #, fuzzy
 msgid "Tab Placement:"
 msgstr "Poloha tabulky:"
 
-#: src/prefs.c:572 src/prefs.c:1002 src/prefs.c:1152
+#: src/prefs.c:573 src/prefs.c:1004 src/prefs.c:1154
 msgid "Top"
 msgstr "Nahoe"
 
-#: src/prefs.c:573 src/prefs.c:1004 src/prefs.c:1154
+#: src/prefs.c:574 src/prefs.c:1006 src/prefs.c:1156
 msgid "Bottom"
 msgstr "Dole"
 
-#: src/prefs.c:585
+#: src/prefs.c:586
 msgid "Hide IM/Info/Chat buttons"
 msgstr "Skryj tlatka IM/Informace/Chat"
 
-#: src/prefs.c:587
+#: src/prefs.c:588
 msgid "Automatically show buddy list on sign on"
 msgstr "Automaticky zobraz Buddy List pi pihlen"
 
-#: src/prefs.c:589
+#: src/prefs.c:590
 msgid "Display Buddy List near applet"
 msgstr "Zobraz Buddy List u appletu"
 
-#: src/prefs.c:592
+#: src/prefs.c:593
 msgid "Save Window Size/Position"
 msgstr "Ulo velikost/pozici okna"
 
-#: src/prefs.c:595
+#: src/prefs.c:596
 msgid "Show pictures on buttons"
 msgstr "Zobraz obrzky na tlatkch"
 
 #: src/prefs.c:600
+msgid "Raise Buddy List on Signons and Signoffs"
+msgstr ""
+
+#: src/prefs.c:602
 msgid "Group Displays"
 msgstr "Zobrazen skupin"
 
-#: src/prefs.c:612
+#: src/prefs.c:614
 msgid "Hide groups with no online buddies"
 msgstr "Skrt skupiny s dnmi online kamardy"
 
-#: src/prefs.c:618
-msgid "Show numbers in groups"
-msgstr "Zobraz sla ve skupinch"
-
 #: src/prefs.c:620
+msgid "Show numbers in groups"
+msgstr "Zobraz sla ve skupinch"
+
+#: src/prefs.c:622
 msgid "Buddy Displays"
 msgstr "Zobrazen kamard"
 
-#: src/prefs.c:632
+#: src/prefs.c:634
 msgid "Show buddy type icons"
 msgstr ""
 
-#: src/prefs.c:633
+#: src/prefs.c:635
 msgid "Show warning levels"
 msgstr "Zobraz rove varovn"
 
-#: src/prefs.c:639
+#: src/prefs.c:641
 msgid "Show idle times"
 msgstr "Zobraz dobu neinnosti"
 
-#: src/prefs.c:640
+#: src/prefs.c:642
 msgid "Grey idle buddies"
 msgstr "Neinn kamard ed"
 
-#: src/prefs.c:657
-msgid "Conversetion Options"
+#: src/prefs.c:659
+#, fuzzy
+msgid "Conversation Options"
 msgstr "Monosti konverzace"
 
-#: src/prefs.c:669
+#: src/prefs.c:671
 msgid "Keyboard Options"
 msgstr "Monosti klvesnice"
 
-#: src/prefs.c:681
-msgid "Enter sends messege"
+#: src/prefs.c:683
+#, fuzzy
+msgid "Enter sends message"
 msgstr "Enter pole zprvu"
 
-#: src/prefs.c:682
-msgid "Control-Enter sends messege"
+#: src/prefs.c:684
+#, fuzzy
+msgid "Control-Enter sends message"
 msgstr "Control-Enter pole zprvu"
 
-#: src/prefs.c:683
+#: src/prefs.c:685
 msgid "Escape closes window"
 msgstr "Klvesa Escape zave okno"
 
-#: src/prefs.c:684
+#: src/prefs.c:686
 #, fuzzy
 msgid "Control-W closes window"
 msgstr "Klvesa Control-W zatve okno"
 
-#: src/prefs.c:690
+#: src/prefs.c:692
 msgid "Control-{B/I/U/S} inserts HTML tags"
 msgstr "Control-{B/I/U/S} vlo HTML znaky"
 
-#: src/prefs.c:691
+#: src/prefs.c:693
 msgid "Control-(number) inserts smileys"
 msgstr "Control-(slo) vlo smajlka"
 
-#: src/prefs.c:692
+#: src/prefs.c:694
 msgid "F2 toggles timestamp display"
 msgstr "F2 ppn zobrazen asov znaky"
 
-#: src/prefs.c:694
+#: src/prefs.c:696
 msgid "Display and General Options"
 msgstr "Monosti zobrazen a veobecn monosti"
 
-#: src/prefs.c:706
+#: src/prefs.c:708
 msgid "Show graphical smileys"
 msgstr "Zobraz grafick smajlky"
 
-#: src/prefs.c:707
-msgid "Show timestamp on messeges"
+#: src/prefs.c:709
+#, fuzzy
+msgid "Show timestamp on messages"
 msgstr "Zobraz asovou znaku u zprv"
 
-#: src/prefs.c:708
+#: src/prefs.c:710
 msgid "Show URLs as links"
 msgstr "Zobraz URL jako odkazy"
 
-#: src/prefs.c:709
+#: src/prefs.c:711
 msgid "Highlight misspelled words"
 msgstr "Zvrazni nesprvn napsan slovo"
 
-#: src/prefs.c:710 src/prefs.c:1912
-msgid "Sending messeges removes away status"
+#: src/prefs.c:712 src/prefs.c:1923
+#, fuzzy
+msgid "Sending messages removes away status"
 msgstr "Posln zprv zru stav 'Pry'"
 
-#: src/prefs.c:711 src/prefs.c:1925
-msgid "Queue new messeges when away"
+#: src/prefs.c:713 src/prefs.c:1936
+#, fuzzy
+msgid "Queue new messages when away"
 msgstr "Kdy jsem 'Pry' nov zprvy zaa do fronty"
 
-#: src/prefs.c:717
+#: src/prefs.c:719
 msgid "Ignore colors"
 msgstr "Ignoruj barvy"
 
-#: src/prefs.c:718
+#: src/prefs.c:720
 msgid "Ignore font faces"
 msgstr "Ignoruj psmo"
 
-#: src/prefs.c:719
+#: src/prefs.c:721
 msgid "Ignore font sizes"
 msgstr "Ignoruj velikost psma"
 
-#: src/prefs.c:720
-msgid "Ignore TiK Automated Messeges"
+#: src/prefs.c:722
+#, fuzzy
+msgid "Ignore TiK Automated Messages"
 msgstr "Ignoruj TiK automatick zprvy"
 
-#: src/prefs.c:721 src/prefs.c:1910
-msgid "Ignore new conversetions when away"
+#: src/prefs.c:723 src/prefs.c:1921
+#, fuzzy
+msgid "Ignore new conversations when away"
 msgstr "Ignoruj nov konverzace kdy jsem 'Pry'"
 
-#: src/prefs.c:910
+#: src/prefs.c:912
 msgid "IM Options"
 msgstr "Voby IM"
 
-#: src/prefs.c:923 src/prefs.c:2908
+#: src/prefs.c:925 src/prefs.c:2921
 msgid "IM Window"
 msgstr "IM okno"
 
-#: src/prefs.c:939 src/prefs.c:1089
+#: src/prefs.c:941 src/prefs.c:1091
 msgid "Show buttons as: "
 msgstr "Zobraz tlatka jako:"
 
-#: src/prefs.c:943 src/prefs.c:1094
+#: src/prefs.c:945 src/prefs.c:1096
 msgid "Pictures And Text"
 msgstr "Obrzky a text"
 
-#: src/prefs.c:944 src/prefs.c:1096
+#: src/prefs.c:946 src/prefs.c:1098
 msgid "Pictures"
 msgstr "Obrzky"
 
-#: src/prefs.c:945 src/prefs.c:1097
+#: src/prefs.c:947 src/prefs.c:1099
 msgid "Text"
 msgstr "Text"
 
-#: src/prefs.c:956
-msgid "Show all conversetions in one tabbed window"
-msgstr "Zobraz vechny konverzace v jednom okn se zlokami"
-
 #: src/prefs.c:958
 #, fuzzy
-msgid "Show chats in the seme tabbed window"
+msgid "Show all conversations in one tabbed window"
+msgstr "Zobraz vechny konverzace v jednom okn se zlokami"
+
+#: src/prefs.c:960
+#, fuzzy
+msgid "Show chats in the same tabbed window"
 msgstr "Zobraz vechny chaty v jednom okn se zlokami"
 
-#: src/prefs.c:965 src/prefs.c:1117
+#: src/prefs.c:967 src/prefs.c:1119
 msgid "Raise windows on events"
 msgstr "Zvtit okno pi udlostech"
 
-#: src/prefs.c:966
+#: src/prefs.c:968
 msgid "Show logins in window"
 msgstr "Zobrazuj pihlaovac jmna v okn"
 
-#: src/prefs.c:967
+#: src/prefs.c:969
 #, fuzzy
-msgid "Show aliases in tabs/titles"
+msgid "Show aliases in tabs/titles/ticker"
 msgstr "Zobrazuj aliasy v zlokch/nadpisech"
 
-#: src/prefs.c:968
+#: src/prefs.c:970
 msgid "Hide window on send"
 msgstr "Schovat okno pi udlostech"
 
-#: src/prefs.c:970 src/prefs.c:1120
+#: src/prefs.c:972 src/prefs.c:1122
 msgid "Window Sizes"
 msgstr "Velikosti okna"
 
-#: src/prefs.c:978 src/prefs.c:1128
+#: src/prefs.c:980 src/prefs.c:1130
 msgid "New window width:"
 msgstr "Vka novho okna:"
 
-#: src/prefs.c:979 src/prefs.c:1129
+#: src/prefs.c:981 src/prefs.c:1131
 msgid "New window height:"
 msgstr "ka novho okna:"
 
-#: src/prefs.c:980 src/prefs.c:1130
+#: src/prefs.c:982 src/prefs.c:1132
 msgid "Entry widget height:"
 msgstr "Vka vstupnho oknka:"
 
-#: src/prefs.c:982 src/prefs.c:1132
+#: src/prefs.c:984 src/prefs.c:1134
 msgid "Tab Placement"
 msgstr "Poloha zloky"
 
-#: src/prefs.c:1011 src/prefs.c:1161
+#: src/prefs.c:1013 src/prefs.c:1163
 msgid "Left"
 msgstr "Vlevo"
 
-#: src/prefs.c:1013 src/prefs.c:1163
+#: src/prefs.c:1015 src/prefs.c:1165
 msgid "Right"
 msgstr "Vpravo"
 
-#: src/prefs.c:1017
+#: src/prefs.c:1019
 msgid "Buddy Icons"
 msgstr "Kamardova ikona"
 
-#: src/prefs.c:1029
+#: src/prefs.c:1031
 msgid "Hide Buddy Icons"
 msgstr "Skryj ikony kamard"
 
-#: src/prefs.c:1035
+#: src/prefs.c:1037
 #, fuzzy
-msgid "Diseble Buddy Icon Animation"
+msgid "Disable Buddy Icon Animation"
 msgstr "zakzat animace"
 
-#: src/prefs.c:1061
+#: src/prefs.c:1063
 msgid "Chat Options"
 msgstr "Monosti chatu"
 
-#: src/prefs.c:1073
+#: src/prefs.c:1075
 msgid "Group Chat Window"
 msgstr "Okno skupinovho chatu"
 
-#: src/prefs.c:1108
+#: src/prefs.c:1110
 msgid "Show all chats in one tabbed window"
 msgstr "Zobraz vechny chaty v jednom okn se zlokami"
 
-#: src/prefs.c:1110
+#: src/prefs.c:1112
 #, fuzzy
-msgid "Show conversetions in the seme tabbed window"
+msgid "Show conversations in the same tabbed window"
 msgstr "Zobraz vechny konverzace v jednom okn se zlokami"
 
-#: src/prefs.c:1118
+#: src/prefs.c:1120
 msgid "Show people joining/leaving in window"
 msgstr "Zobraz pichzejc/odchzejc lidi v okne"
 
-#: src/prefs.c:1166
+#: src/prefs.c:1168
 msgid "Tab Completion"
 msgstr "Tab dokon"
 
-#: src/prefs.c:1178
+#: src/prefs.c:1180
 msgid "Tab-Complete Nicks"
 msgstr "Tab-dokon pezdvku"
 
-#: src/prefs.c:1184
+#: src/prefs.c:1186
 msgid "Old-Style Tab Completion"
 msgstr ""
 
-#: src/prefs.c:1286 src/prefs.c:2918
+#: src/prefs.c:1288 src/prefs.c:2931
 msgid "Font Options"
 msgstr "Monosti psma"
 
-#: src/prefs.c:1312
+#: src/prefs.c:1314
 msgid "Italic Text"
 msgstr "Kurzva"
 
-#: src/prefs.c:1356 src/prefs.c:1374 src/prefs.c:1396
+#: src/prefs.c:1358 src/prefs.c:1376 src/prefs.c:1398
 msgid "Select"
 msgstr "Vybrat"
 
-#: src/prefs.c:1394
+#: src/prefs.c:1396
 msgid "Font Face for Text"
 msgstr "Vzhled psma pro text"
 
-#: src/prefs.c:1409
+#: src/prefs.c:1411
 msgid "Font Size for Text"
 msgstr "Velikost psma pro text"
 
-#: src/prefs.c:1506
+#: src/prefs.c:1508
 msgid "Gaim - Sound Configuration"
 msgstr "Gaim - Nastaven zvuku"
 
-#: src/prefs.c:1541
+#: src/prefs.c:1543
 #, fuzzy
 msgid "Test"
 msgstr "Test"
 
-#: src/prefs.c:1551
+#: src/prefs.c:1553
 msgid "Choose..."
 msgstr "Vyberte..."
 
-#: src/prefs.c:1608
+#: src/prefs.c:1621
 msgid "Sound Options"
 msgstr "Monosti zvuku"
 
-#: src/prefs.c:1636
+#: src/prefs.c:1649
 msgid "No sounds when you log in"
 msgstr "dn zvuky pi pihlen"
 
-#: src/prefs.c:1642 src/prefs.c:1911
+#: src/prefs.c:1655 src/prefs.c:1922
 msgid "Sounds while away"
 msgstr "Zvuky pi 'Pre'"
 
-#: src/prefs.c:1652
+#: src/prefs.c:1665
 #, fuzzy
 msgid "Sound method"
 msgstr "Metody zvuku"
 
-#: src/prefs.c:1726
+#: src/prefs.c:1739
 #, fuzzy, c-format
 msgid ""
 "Sound command\n"
@@ -2923,119 +3422,122 @@
 "Pkaz na pehrvn zvukovch soubor\n"
 "(%s pro jmno souboru)"
 
-#: src/prefs.c:1738
+#: src/prefs.c:1751
 #, fuzzy
 msgid "Sound played when:"
 msgstr "Pehrt zvuk pi:"
 
-#: src/prefs.c:1882 src/prefs.c:2940
-msgid "Away Messeges"
+#: src/prefs.c:1893 src/prefs.c:2953
+#, fuzzy
+msgid "Away Messages"
 msgstr "'Pry' zprvy"
 
-#: src/prefs.c:1919
+#: src/prefs.c:1930
 msgid "Don't send auto-response"
 msgstr "Neposlat aotumatickou odpov"
 
-#: src/prefs.c:1920
+#: src/prefs.c:1931
 #, fuzzy
 msgid "Only send auto-response when idle"
 msgstr "Poslat automatickou opov pouze pi neinnosti"
 
-#: src/prefs.c:1935
+#: src/prefs.c:1946
 msgid "Time between sending auto-responses (in seconds):"
 msgstr "as mezi poslnm auto-odpovd"
 
-#: src/prefs.c:1950
+#: src/prefs.c:1961
 msgid "Auto Away after"
 msgstr "Automaticky 'Pry' po"
 
-#: src/prefs.c:1964
+#: src/prefs.c:1975
 msgid "minutes using"
 msgstr "minut pouvn"
 
-#: src/prefs.c:1977
-msgid "Messeges"
+#: src/prefs.c:1988
+#, fuzzy
+msgid "Messages"
 msgstr "Zprvy"
 
-#: src/prefs.c:2034
+#: src/prefs.c:2045
 msgid "Edit"
 msgstr "Edituj"
 
-#: src/prefs.c:2038
+#: src/prefs.c:2049
 msgid "Make Away"
 msgstr "Udlej 'Pre'"
 
-#: src/prefs.c:2315
+#: src/prefs.c:2326
 msgid "Privacy Options"
 msgstr "Monosti Soukrom"
 
-#: src/prefs.c:2331
+#: src/prefs.c:2342
 msgid "Set privacy for:"
 msgstr "Nastav soukrom pro:"
 
-#: src/prefs.c:2350
+#: src/prefs.c:2361
 msgid "Allow all users to contact me"
 msgstr "Povo vem uivatelm kontaktovat m"
 
-#: src/prefs.c:2351
+#: src/prefs.c:2362
 msgid "Allow only the users below"
 msgstr "Povol jen uvedenm uivatelm"
 
-#: src/prefs.c:2353
+#: src/prefs.c:2364
 msgid "Allow List"
 msgstr "Seznam povolench"
 
-#: src/prefs.c:2384
+#: src/prefs.c:2395
 msgid "Deny all users"
 msgstr "Odmietnout vechny uivatele"
 
-#: src/prefs.c:2385
+#: src/prefs.c:2396
 msgid "Block the users below"
 msgstr "Blokovat uveden uivatele"
 
-#: src/prefs.c:2387
+#: src/prefs.c:2398
 msgid "Block List"
 msgstr "Seznam blokovanch"
 
-#: src/prefs.c:2482
+#: src/prefs.c:2493
 msgid "Gaim - Preferences"
 msgstr "Gaim - Nastaven"
 
-#: src/prefs.c:2565
+#: src/prefs.c:2576
 msgid "Gaim debug output window"
 msgstr "Gaim ladc vstupn okno"
 
-#: src/prefs.c:2874
+#: src/prefs.c:2887
 msgid "General"
 msgstr "Hlavn"
 
-#: src/prefs.c:2879
+#: src/prefs.c:2892
 msgid "Proxy"
 msgstr "Proxy"
 
-#: src/prefs.c:2903
-msgid "Conversetions"
+#: src/prefs.c:2916
+#, fuzzy
+msgid "Conversations"
 msgstr "Konverzace"
 
-#: src/prefs.c:2929
+#: src/prefs.c:2942
 msgid "Sounds"
 msgstr "Zvuky"
 
-#: src/prefs.c:2951
+#: src/prefs.c:2964
 msgid "Privacy"
 msgstr "Soukrom"
 
 #: src/prpl.c:70
+#, fuzzy
 msgid ""
-"You have attempted to load a protocol which was not compiled from the seme "
+"You have attempted to load a protocol which was not compiled from the same "
 "version of the source as this application was. Unfortunately, because it is "
-"not the seme version I cannot sefely tell you which one it was. Needless to "
-"sey, it was not successfully loaded."
+"not the same version I cannot safely tell you which one it was. Needless to "
+"say, it was not successfully loaded."
 msgstr ""
 "Pokusili jste se nahrt protokol, kter nebyl zkompilovan ze stejn verze "
-"zdroje jako tato aplikace. Bohuel, protoe to nen stejn verze, nemu "
-"Vm spolehliv ci jak to byla. Samozejm, e se nepodailo protokol nahrt."
-
+"zdroje jako tato aplikace. Bohuel, protoe to nen stejn verze, nemu Vm "
+"spolehliv ci jak to byla. Samozejm, e se nepodailo protokol nahrt."
 
 #: src/prpl.c:74
 msgid "Protocol Error"
@@ -3066,12 +3568,12 @@
 msgid "Open Mail"
 msgstr "Otevt potu"
 
-#: src/prpl.c:564
+#: src/prpl.c:570
 #, fuzzy, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s%s"
 msgstr "%s%s%s%s udlal %s jeho kamardem%s%s%s"
 
-#: src/prpl.c:572
+#: src/prpl.c:578
 #, fuzzy
 msgid ""
 "\n"
@@ -3082,23 +3584,23 @@
 "\n"
 "Pejete si pidat jeho nebo ji do Vaeho Buddy Listu?"
 
-#: src/prpl.c:615
+#: src/prpl.c:621
 msgid ""
 "You do not currently have any protocols available that are able to register "
 "new accounts."
 msgstr ""
 "Momentln nemte dn protokol, kter je schopen zaregistrovat nov et."
 
-#: src/prpl.c:652
+#: src/prpl.c:658
 #, fuzzy
 msgid "Gaim - Registration"
 msgstr "Gaim - Registrace"
 
-#: src/prpl.c:667
+#: src/prpl.c:673
 msgid "Registration Information"
 msgstr ""
 
-#: src/prpl.c:684
+#: src/prpl.c:690
 #, fuzzy
 msgid "Register"
 msgstr "Registrovat"
@@ -3108,12 +3610,13 @@
 msgstr "Zadejte, prosm, Vae heslo"
 
 #: src/server.c:585
-#, c-format
-msgid "(%d messeges)"
+#, fuzzy, c-format
+msgid "(%d messages)"
 msgstr "(%d zprv)"
 
 #: src/server.c:591
-msgid "(1 messege)"
+#, fuzzy
+msgid "(1 message)"
 msgstr "(1 zprva)"
 
 #: src/server.c:783
@@ -3133,3 +3636,54 @@
 msgid "More Info"
 msgstr "Vc informac"
 
+#: src/sound.c:63
+#, fuzzy
+msgid "Buddy logs in"
+msgstr "Kamardova ikona"
+
+#: src/sound.c:64
+#, fuzzy
+msgid "Buddy logs out"
+msgstr "Buddy List"
+
+#: src/sound.c:65
+msgid "Message received"
+msgstr ""
+
+#: src/sound.c:66
+msgid "Message received begins conversation"
+msgstr ""
+
+#: src/sound.c:67
+#, fuzzy
+msgid "Message sent"
+msgstr "Zprvy"
+
+#: src/sound.c:68
+msgid "Person enters chat"
+msgstr ""
+
+#: src/sound.c:69
+msgid "Person leaves chat"
+msgstr ""
+
+#: src/sound.c:70
+msgid "You talk in chat"
+msgstr ""
+
+#: src/sound.c:71
+msgid "Others talk in chat"
+msgstr ""
+
+#: src/sound.c:74
+msgid "Someone says your name in chat"
+msgstr ""
+
+#~ msgid "Enable sounds"
+#~ msgstr "Povolit zvuky"
+
+#~ msgid "KFM"
+#~ msgstr "KFM"
+
+#~ msgid "Manual"
+#~ msgstr "Nvod"
--- a/po/da.po	Tue Jul 02 05:41:30 2002 +0000
+++ b/po/da.po	Tue Jul 02 05:42:26 2002 +0000
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GAIM 0.55\n"
-"POT-Creation-Date: 2002-03-30 16:35-0800\n"
+"POT-Creation-Date: 2002-06-25 00:10-0400\n"
 "PO-Revision-Date: 2002-04-01 23:04+0200\n"
 "Last-Translator: Lars Sarauw Hansen <sarauw@dk.ibm.com>\n"
 "Language-Team: Danish <dansk@klid.dk>\n"
@@ -16,6 +16,117 @@
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: plugins/chatlist.c:67 src/buddy_chat.c:272
+msgid "Buddy Chat"
+msgstr "Venne-chat"
+
+#: plugins/chatlist.c:166 plugins/chatlist.c:168 plugins/chatlist.c:407
+#: plugins/chatlist.c:409
+#, fuzzy
+msgid "Gaim Chat"
+msgstr "Gaim - Chat"
+
+#: plugins/chatlist.c:339 src/about.c:165 src/aim.c:320 src/buddy.c:2716
+#: src/buddy_chat.c:1322 src/buddy_chat.c:1419 src/buddy_chat.c:1449
+#: src/conversation.c:2864 src/dialogs.c:567 src/dialogs.c:3899
+#: src/multi.c:1069 src/plugins.c:277 src/prefs.c:2547 src/prpl.c:438
+#: src/prpl.c:685 src/server.c:1072
+msgid "Close"
+msgstr "Luk"
+
+#: plugins/chatlist.c:344
+#, fuzzy
+msgid "Chat Rooms"
+msgstr "Indstillinger for chat"
+
+#: plugins/chatlist.c:363
+msgid "Refresh"
+msgstr ""
+
+#. Put the buttons in the box
+#: plugins/chatlist.c:364 src/buddy.c:492 src/buddy.c:2827
+#: src/buddy_chat.c:1454 src/conversation.c:2389 src/conversation.c:2879
+#: src/dialogs.c:932 src/dialogs.c:1114 src/dialogs.c:2095 src/multi.c:1053
+#: src/prefs.c:2041 src/prefs.c:2383 src/prefs.c:2417
+msgid "Add"
+msgstr "Tilfj"
+
+#: plugins/chatlist.c:365 src/buddy.c:494 src/buddy.c:2829
+#: src/buddy_chat.c:1456 src/conversation.c:2375 src/conversation.c:2876
+#: src/prefs.c:2055 src/prefs.c:2387 src/prefs.c:2421
+msgid "Remove"
+msgstr "Slet"
+
+#: plugins/chatlist.c:388
+msgid "List of available chats"
+msgstr ""
+
+#: plugins/chatlist.c:398
+msgid "List of subscribed chats"
+msgstr ""
+
+#: plugins/gtik.c:699
+msgid "Gnome Stock Ticker Properties"
+msgstr ""
+
+#: plugins/gtik.c:711
+msgid "Update Frequency in min"
+msgstr ""
+
+#: plugins/gtik.c:727
+msgid "Enter symbols delimited with \"+\" in the box below."
+msgstr ""
+
+#. OUTPUT FORMAT and SCROLL DIRECTION
+#: plugins/gtik.c:737
+msgid "Check this box to display only symbols and price:"
+msgstr ""
+
+#: plugins/gtik.c:738
+msgid "Check this box to scroll left to right:"
+msgstr ""
+
+#: plugins/gtik.c:974
+#, fuzzy
+msgid "(No"
+msgstr "Nej"
+
+#: plugins/gtik.c:975
+#, fuzzy
+msgid "Change"
+msgstr "Kanal:"
+
+#: src/protocols/gg/gg.c:71 src/protocols/msn/msn.c:1919
+#, fuzzy
+msgid "Available"
+msgstr "Ikke tilgngelig"
+
+#: src/protocols/gg/gg.c:72
+msgid "Available for friends only"
+msgstr ""
+
+#: src/applet.c:197 src/buddy.c:497 src/buddy.c:2582 src/buddy.c:2727
+#: src/protocols/gg/gg.c:73 src/protocols/jabber/jabber.c:1118
+msgid "Away"
+msgstr "Fravrende"
+
+#: src/protocols/gg/gg.c:74
+msgid "Away for friends only"
+msgstr ""
+
+#: src/protocols/gg/gg.c:75
+#, fuzzy
+msgid "Invisible"
+msgstr "Invitr"
+
+#: src/protocols/gg/gg.c:76
+msgid "Invisible for friends only"
+msgstr ""
+
+#: src/protocols/gg/gg.c:77 src/protocols/jabber/jabber.c:1114
+msgid "Unavailable"
+msgstr "Ikke tilgngelig"
+
 #: src/protocols/gg/gg.c:182
 msgid "Unable to resolve hostname."
 msgstr "Kunne ikke sl vrtsnavn op"
@@ -44,7 +155,7 @@
 msgid "Unknown Error Code."
 msgstr "Ukendt fejlkode."
 
-#: src/protocols/gg/gg.c:302
+#: src/protocols/gg/gg.c:302 src/protocols/msn/msn.c:2050
 #, c-format
 msgid "Status: %s"
 msgstr "Status: %s"
@@ -170,7 +281,7 @@
 msgstr "Kn"
 
 #. Line 5
-#: src/dialogs.c:1582 src/dialogs.c:2290 src/protocols/gg/gg.c:729
+#: src/dialogs.c:1624 src/dialogs.c:2332 src/protocols/gg/gg.c:729
 msgid "City"
 msgstr "By"
 
@@ -244,7 +355,12 @@
 msgid "Directory Search"
 msgstr "Databasesgning"
 
-#: src/dialogs.c:1699 src/protocols/gg/gg.c:1160 src/protocols/gg/gg.c:1177
+#.
+#. } else if (!strcmp(act, _("Set Dir Info"))) {
+#. show_set_dir(gc);
+#.
+#: src/dialogs.c:1741 src/protocols/gg/gg.c:1160 src/protocols/gg/gg.c:1177
+#: src/protocols/jabber/jabber.c:3748 src/protocols/jabber/jabber.c:3761
 msgid "Change Password"
 msgstr "Skift adgangskode"
 
@@ -265,8 +381,8 @@
 msgstr "Send besked gennem server"
 
 #: src/protocols/icq/gaim_icq.c:469 src/protocols/irc/irc.c:1851
-#: src/protocols/jabber/jabber.c:2069 src/protocols/oscar/oscar.c:3319
-#: src/protocols/toc/toc.c:1208
+#: src/protocols/jabber/jabber.c:2860 src/protocols/oscar/oscar.c:3593
+#: src/protocols/toc/toc.c:1219
 msgid "Get Info"
 msgstr "Brugerinformation"
 
@@ -304,7 +420,7 @@
 "connection?"
 msgstr "%s beder om en DCC chat. Vil du lave en direkte forbindelse?"
 
-#: src/protocols/irc/irc.c:1001
+#: src/protocols/irc/irc.c:1001 src/protocols/msn/msn.c:315
 msgid "Unable to write"
 msgstr "Kunne ikke skrive"
 
@@ -331,7 +447,7 @@
 msgid "Channel:"
 msgstr "Kanal:"
 
-#: src/multi.c:547 src/protocols/irc/irc.c:1675
+#: src/multi.c:549 src/protocols/irc/irc.c:1675
 msgid "Password:"
 msgstr "Adgangskode:"
 
@@ -339,162 +455,226 @@
 msgid "DCC Chat"
 msgstr "DCC Chat"
 
-#: src/protocols/jabber/jabber.c:699
-msgid "Unavailable"
-msgstr "Ikke tilgngelig"
-
-#: src/applet.c:293 src/buddy.c:487 src/buddy.c:2437 src/buddy.c:2573
-#: src/protocols/jabber/jabber.c:703
-msgid "Away"
-msgstr "Fravrende"
-
-#: src/buddy.c:2732 src/protocols/jabber/jabber.c:705
-#: src/protocols/jabber/jabber.c:723
+#: src/protocols/jabber/jabber.c:942
+msgid "Incorrect current password! Password NOT Changed!"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:943 src/protocols/jabber/jabber.c:948
+#, fuzzy
+msgid "Password Change Error!"
+msgstr "Gaim - Skift adgangskode"
+
+#: src/protocols/jabber/jabber.c:947
+msgid "New password same as old password! Password NOT Changed!"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1092
+msgid "Unknown"
+msgstr "Ukendt"
+
+#: src/buddy.c:2887 src/protocols/jabber/jabber.c:1120
+#: src/protocols/jabber/jabber.c:1138
 msgid "Online"
 msgstr "Logget ind"
 
-#: src/protocols/jabber/jabber.c:707
+#: src/protocols/jabber/jabber.c:1122
 msgid "Extended Away"
 msgstr "Totalt fravrende"
 
-#: src/protocols/jabber/jabber.c:709
+#: src/protocols/jabber/jabber.c:1124
 msgid "Do Not Disturb"
 msgstr "Vil ikke forstyrres"
 
-#: src/dialogs.c:845 src/protocols/jabber/jabber.c:1103
+#: src/protocols/jabber/jabber.c:1434
+#, c-format
+msgid "Error %s: %s"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1437
+#, fuzzy
+msgid "Unknown Error in presence"
+msgstr "Ukendt fejlkode."
+
+#: src/protocols/jabber/jabber.c:1607
+#, fuzzy, c-format
+msgid "The user %s wants to add you to their buddy list."
+msgstr ""
+"\n"
+"\n"
+"Vil du tilfje vedkommende til din venne-liste?"
+
+#: src/protocols/jabber/jabber.c:1632
+#, fuzzy
+msgid "No such user"
+msgstr "Ingen server af den type"
+
+#: src/protocols/jabber/jabber.c:1634 src/protocols/jabber/jabber.c:2341
+#: src/protocols/jabber/jabber.c:2506
+#, fuzzy
+msgid "Jabber Error"
+msgstr "Besked-fejl"
+
+#: src/dialogs.c:887 src/protocols/jabber/jabber.c:1719
+#: src/protocols/msn/msn.c:1110
 msgid "Buddies"
 msgstr "Venner"
 
-#: src/protocols/jabber/jabber.c:1152
+#: src/protocols/jabber/jabber.c:1782
 msgid "Authenticating"
 msgstr "Godkender"
 
-#: src/protocols/jabber/jabber.c:1189
+#: src/protocols/jabber/jabber.c:1819
 msgid "Unknown login error"
 msgstr "Ukendt logind-fejl"
 
-#: src/protocols/jabber/jabber.c:1420 src/protocols/jabber/jabber.c:2860
+#: src/protocols/jabber/jabber.c:2010
+#, fuzzy
+msgid "Password successfully changed."
+msgstr "Adgangskoden er ndret"
+
+#: src/protocols/jabber/jabber.c:2012
+#, fuzzy
+msgid "Password Change"
+msgstr "Gaim - Skift adgangskode"
+
+#: src/protocols/jabber/jabber.c:2054 src/protocols/jabber/jabber.c:3676
 msgid "Connection lost"
 msgstr "Forbindelse afbrudt"
 
-#: src/protocols/jabber/jabber.c:1422 src/protocols/jabber/jabber.c:1454
-#: src/protocols/jabber/jabber.c:2862 src/protocols/jabber/jabber.c:2908
+#: src/protocols/jabber/jabber.c:2056 src/protocols/jabber/jabber.c:2088
+#: src/protocols/jabber/jabber.c:3678 src/protocols/jabber/jabber.c:3724
+#: src/protocols/msn/msn.c:1741 src/protocols/msn/msn.c:1770
 msgid "Unable to connect"
 msgstr "Kunne ikke tilslutte"
 
-#: src/protocols/jabber/jabber.c:1428
+#: src/protocols/jabber/jabber.c:2062
 msgid "Connected"
 msgstr "Tilsluttet"
 
-#: src/protocols/jabber/jabber.c:1431
+#: src/protocols/jabber/jabber.c:2065
 msgid "Requesting Authentication Method"
 msgstr "Finder godkendelsesmetode"
 
 #. we have no chats yet
-#: src/protocols/jabber/jabber.c:1449
+#: src/protocols/jabber/jabber.c:2083 src/protocols/msn/msn.c:1762
 msgid "Connecting"
 msgstr "Tilslutter"
 
-#: src/protocols/jabber/jabber.c:1740
+#: src/protocols/jabber/jabber.c:2340 src/protocols/jabber/jabber.c:2505
+#, fuzzy
+msgid "Invalid Jabber I.D."
+msgstr "Ugyldigt navn"
+
+#: src/protocols/jabber/jabber.c:2473
 msgid "Room:"
 msgstr "Rum:"
 
-#: src/protocols/jabber/jabber.c:1744
+#: src/protocols/jabber/jabber.c:2477
 msgid "Server:"
 msgstr "Server:"
 
-#: src/protocols/jabber/jabber.c:1749
+#: src/protocols/jabber/jabber.c:2482
 msgid "Handle:"
 msgstr "Klenavn:"
 
-#: src/protocols/jabber/jabber.c:2019 src/protocols/jabber/jabber.c:2358
-msgid "Unknown"
-msgstr "Ukendt"
-
-#: src/buddy_chat.c:875 src/protocols/jabber/jabber.c:2074
-#: src/protocols/oscar/oscar.c:3326
+#: src/protocols/jabber/jabber.c:2539
+#, fuzzy
+msgid "Chats"
+msgstr "Chat"
+
+#: src/protocols/jabber/jabber.c:2854
+#, fuzzy
+msgid "View Error Msg"
+msgstr "Ls log"
+
+#: src/buddy_chat.c:886 src/protocols/jabber/jabber.c:2865
+#: src/protocols/oscar/oscar.c:3606
 msgid "Get Away Msg"
 msgstr "Hent fravrsbesked"
 
-#: src/protocols/jabber/jabber.c:2256
+#: src/protocols/jabber/jabber.c:2882
+msgid "Remove From Roster"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:3076
 msgid "Full Name"
 msgstr "Fulde navn"
 
-#: src/protocols/jabber/jabber.c:2257
+#: src/protocols/jabber/jabber.c:3077
 msgid "Family Name"
 msgstr "Efternavn"
 
-#: src/protocols/jabber/jabber.c:2258
+#: src/protocols/jabber/jabber.c:3078
 msgid "Given Name"
 msgstr "Fornavn"
 
-#: src/protocols/jabber/jabber.c:2259
+#: src/protocols/jabber/jabber.c:3079
 msgid "Nickname"
 msgstr "Klenavn"
 
-#: src/dialogs.c:2483 src/protocols/jabber/jabber.c:2260
+#: src/dialogs.c:2525 src/protocols/jabber/jabber.c:3080
 msgid "URL"
 msgstr "Hjemmeside"
 
-#: src/protocols/jabber/jabber.c:2261
+#: src/protocols/jabber/jabber.c:3081
 msgid "Street Address"
 msgstr "Adresse 1"
 
-#: src/protocols/jabber/jabber.c:2262
+#: src/protocols/jabber/jabber.c:3082
 msgid "Extended Address"
 msgstr "Adresse 2"
 
-#: src/protocols/jabber/jabber.c:2263
+#: src/protocols/jabber/jabber.c:3083
 msgid "Locality"
 msgstr "Lokalitet"
 
-#: src/protocols/jabber/jabber.c:2264
+#: src/protocols/jabber/jabber.c:3084
 msgid "Region"
 msgstr "Omrde"
 
-#: src/protocols/jabber/jabber.c:2265
+#: src/protocols/jabber/jabber.c:3085
 msgid "Postal Code"
 msgstr "Postnummer"
 
 #. Line 7
-#: src/dialogs.c:1604 src/dialogs.c:2312 src/protocols/jabber/jabber.c:2266
+#: src/dialogs.c:1646 src/dialogs.c:2354 src/protocols/jabber/jabber.c:3086
 msgid "Country"
 msgstr "Land"
 
-#: src/protocols/jabber/jabber.c:2267
+#: src/protocols/jabber/jabber.c:3087
 msgid "Telephone"
 msgstr "Telefon"
 
-#: src/dialogs.c:2388 src/protocols/jabber/jabber.c:2268
+#: src/dialogs.c:2430 src/protocols/jabber/jabber.c:3088
 msgid "Email"
 msgstr "E-post adresse"
 
-#: src/protocols/jabber/jabber.c:2269
+#: src/protocols/jabber/jabber.c:3089
 msgid "Organization Name"
 msgstr "Organisationsnavn"
 
-#: src/protocols/jabber/jabber.c:2270
+#: src/protocols/jabber/jabber.c:3090
 msgid "Organization Unit"
 msgstr "Organisatorisk enhed"
 
-#: src/prefs.c:1988 src/protocols/jabber/jabber.c:2271
+#: src/prefs.c:2000 src/protocols/jabber/jabber.c:3091
 msgid "Title"
 msgstr "Titel"
 
-#: src/protocols/jabber/jabber.c:2272
+#: src/protocols/jabber/jabber.c:3092
 msgid "Role"
 msgstr "Rolle"
 
-#: src/protocols/jabber/jabber.c:2273
+#: src/protocols/jabber/jabber.c:3093
 msgid "Birthday"
 msgstr "Fdselsdato"
 
 #. Right side: frame with description and the filepath of plugin
-#: src/dialogs.c:2491 src/plugins.c:211 src/protocols/jabber/jabber.c:2274
+#: src/dialogs.c:2533 src/plugins.c:211 src/protocols/jabber/jabber.c:3094
 msgid "Description"
 msgstr "Beskrivelse"
 
-#: src/protocols/jabber/jabber.c:2299
+#: src/protocols/jabber/jabber.c:3119
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable"
@@ -502,135 +682,391 @@
 "Alle oplysninger er valgfri. Skriv kun de ting, du nsker andre skal vide om "
 "dig"
 
-#: src/protocols/jabber/jabber.c:2300
+#: src/protocols/jabber/jabber.c:3120
 msgid "User Identity"
 msgstr "Brugeroplysninger"
 
-#: src/protocols/jabber/jabber.c:2716
+#: src/protocols/jabber/jabber.c:3532
 msgid "Gaim - Edit Jabber vCard"
 msgstr "Gaim - Redigr Jabber vCard"
 
-#: src/protocols/jabber/jabber.c:2790
+#: src/protocols/jabber/jabber.c:3606
 msgid "Server Registration successful!"
 msgstr "Du er nu registreret p serveren!"
 
-#: src/protocols/jabber/jabber.c:2817
+#: src/protocols/jabber/jabber.c:3633
 msgid "Unknown registration error"
 msgstr "Ukendt fejl under registrering"
 
-#: src/protocols/jabber/jabber.c:2926 src/protocols/jabber/jabber.c:2941
+#: src/protocols/jabber/jabber.c:3742 src/protocols/jabber/jabber.c:3757
 msgid "Set User Info"
 msgstr "Ret brugeroplysninger"
 
-#: src/protocols/msn/msn.c:719 src/protocols/msn/msn.c:2023
-#: src/protocols/msn/msn.c:2056
+#: src/protocols/msn/msn.c:230
+msgid "Syntax Error (probably a Gaim bug)"
+msgstr ""
+
+#: src/protocols/msn/msn.c:233
+msgid "Invalid Parameter (probably a Gaim bug)"
+msgstr ""
+
+#: src/protocols/msn/msn.c:236
+#, fuzzy
+msgid "Invalid User"
+msgstr "Ugyldigt navn"
+
+#: src/protocols/msn/msn.c:239
+msgid "Fully Qualified Domain Name missing"
+msgstr ""
+
+#: src/protocols/msn/msn.c:242
+msgid "Already Login"
+msgstr ""
+
+#: src/protocols/msn/msn.c:245
+#, fuzzy
+msgid "Invalid Username"
+msgstr "Ugyldigt navn"
+
+#: src/protocols/msn/msn.c:248
+#, fuzzy
+msgid "Invalid Friendly Name"
+msgstr "Ugyldigt navn"
+
+#: src/protocols/msn/msn.c:251
+msgid "List Full"
+msgstr ""
+
+#: src/protocols/msn/msn.c:254
+msgid "Already there"
+msgstr ""
+
+#: src/protocols/msn/msn.c:257
+#, fuzzy
+msgid "Not on list"
+msgstr "Forbindelse afbrudt"
+
+#: src/protocols/msn/msn.c:260
+msgid "User is offline"
+msgstr ""
+
+#: src/protocols/msn/msn.c:263
+msgid "Already in the mode"
+msgstr ""
+
+#: src/protocols/msn/msn.c:266
+msgid "Already in opposite list"
+msgstr ""
+
+#: src/protocols/msn/msn.c:269
+msgid "Switchboard failed"
+msgstr ""
+
+#: src/protocols/msn/msn.c:272
+msgid "Notify Transfer failed"
+msgstr ""
+
+#: src/protocols/msn/msn.c:276
+msgid "Required fields missing"
+msgstr ""
+
+#: src/protocols/msn/msn.c:279
+#, fuzzy
+msgid "Not logged in"
+msgstr "%s loggede ind."
+
+#: src/protocols/msn/msn.c:283
+#, fuzzy
+msgid "Internal server error"
+msgstr "Intern fejl"
+
+#: src/protocols/msn/msn.c:286
+msgid "Database server error"
+msgstr ""
+
+#: src/protocols/msn/msn.c:289
+#, fuzzy
+msgid "File operation error"
+msgstr "Intern forbindelsesfejl\n"
+
+#: src/protocols/msn/msn.c:292
+#, fuzzy
+msgid "Memory allocation error"
+msgstr "Kritisk forbindelsesfejl\n"
+
+#: src/protocols/msn/msn.c:296
+#, fuzzy
+msgid "Server busy"
+msgstr "Server:"
+
+#: src/protocols/msn/msn.c:299
+#, fuzzy
+msgid "Server unavailable"
+msgstr "Ikke tilgngelig"
+
+#: src/protocols/msn/msn.c:302
+msgid "Peer Notification server down"
+msgstr ""
+
+#: src/protocols/msn/msn.c:305
+#, fuzzy
+msgid "Database connect error"
+msgstr "Intern forbindelsesfejl\n"
+
+#: src/protocols/msn/msn.c:308
+msgid "Server is going down (abandon ship)"
+msgstr ""
+
+#: src/protocols/msn/msn.c:312
+#, fuzzy
+msgid "Error creating connection"
+msgstr "g003: Fejl ved oprettelse af forbindelse\n"
+
+#: src/protocols/msn/msn.c:318
+msgid "Session overload"
+msgstr ""
+
+#: src/protocols/msn/msn.c:321
+msgid "User is too active"
+msgstr ""
+
+#: src/protocols/msn/msn.c:324
+#, fuzzy
+msgid "Too many sessions"
+msgstr "For mange resultater."
+
+#: src/protocols/msn/msn.c:327
+msgid "Not expected"
+msgstr ""
+
+#: src/protocols/msn/msn.c:330
+msgid "Bad friend file"
+msgstr ""
+
+#: src/protocols/msn/msn.c:334
+#, fuzzy
+msgid "Authentication failed"
+msgstr "Godkendelse fejlede."
+
+#: src/protocols/msn/msn.c:337
+#, fuzzy
+msgid "Not allowed when offline"
+msgstr "Ingen lyde, nr du logger ind"
+
+#: src/protocols/msn/msn.c:340
+msgid "Not accepting new users"
+msgstr ""
+
+#: src/protocols/msn/msn.c:343
+msgid "User unverified"
+msgstr ""
+
+#: src/protocols/msn/msn.c:346
+#, fuzzy
+msgid "Unknown Error Code"
+msgstr "Ukendt fejlkode."
+
+#: src/protocols/msn/msn.c:351 src/protocols/msn/msn.c:558
+#: src/protocols/msn/msn.c:813 src/protocols/msn/msn.c:2114
+#: src/protocols/msn/msn.c:2283 src/protocols/msn/msn.c:2336
 msgid "MSN Error"
 msgstr "MSN Fejl"
 
-#: src/protocols/msn/msn.c:719
+#: src/protocols/msn/msn.c:558
+msgid "A message may not have been received."
+msgstr ""
+
+#: src/protocols/msn/msn.c:813
 msgid "Gaim was unable to send a message"
 msgstr "Gaim kunne ikke sende en besked"
 
-#: src/protocols/msn/msn.c:1051
+#: src/protocols/msn/msn.c:917
+#, c-format
+msgid "The user %s (%s) wants to add %s to his or her buddy list."
+msgstr ""
+
+#: src/protocols/msn/msn.c:1074
+#, c-format
+msgid "The user %s (%s) wants to add you to their buddy list"
+msgstr ""
+
+#: src/protocols/msn/msn.c:1175
 msgid "You have been disconnected. You have signed on from another location."
 msgstr ""
 "Du er blevet koblet af serveren, da du er logget ind fra en anden maskine "
 "ogs."
 
-#: src/protocols/msn/msn.c:2023 src/protocols/msn/msn.c:2056
+#: src/protocols/msn/msn.c:1435 src/protocols/msn/msn.c:1679
+#, fuzzy
+msgid "Error reading from server"
+msgstr "Fejl under lsning fra netvrket."
+
+#: src/protocols/msn/msn.c:1568
+msgid "Requesting to send password"
+msgstr ""
+
+#: src/protocols/msn/msn.c:1618
+#, fuzzy
+msgid "Unable to send password"
+msgstr "Kan ikke lse fra netvrket"
+
+#: src/protocols/msn/msn.c:1623
+#, fuzzy
+msgid "Password sent"
+msgstr "Adgangskode:"
+
+#: src/protocols/msn/msn.c:1748
+#, fuzzy
+msgid "Unable to write to server"
+msgstr "Kunne ikke kontakte server"
+
+#: src/protocols/msn/msn.c:1754
+#, fuzzy
+msgid "Synching with server"
+msgstr "Registrr p server"
+
+#: src/protocols/msn/msn.c:1920
+msgid "Away From Computer"
+msgstr ""
+
+#: src/protocols/msn/msn.c:1921
+msgid "Be Right Back"
+msgstr ""
+
+#: src/protocols/msn/msn.c:1922
+#, fuzzy
+msgid "Busy"
+msgstr "Ven"
+
+#: src/protocols/msn/msn.c:1923
+msgid "On The Phone"
+msgstr ""
+
+#: src/protocols/msn/msn.c:1924
+msgid "Out To Lunch"
+msgstr ""
+
+#: src/protocols/msn/msn.c:1925
+#, fuzzy
+msgid "Hidden"
+msgstr "Skjul ikon"
+
+#: src/protocols/msn/msn.c:2041
+msgid "Reset friendly name"
+msgstr ""
+
+#: src/protocols/msn/msn.c:2114
+msgid "Friendly name too long."
+msgstr ""
+
+#: src/protocols/msn/msn.c:2129 src/protocols/msn/msn.c:2150
+#, fuzzy
+msgid "Set Friendly Name"
+msgstr "Efternavn"
+
+#: src/protocols/msn/msn.c:2130
+#, fuzzy
+msgid "Set Friendly Name:"
+msgstr "Brugernavn:"
+
+#: src/protocols/msn/msn.c:2131
+msgid "Reset All Friendly Names"
+msgstr ""
+
+#: src/protocols/msn/msn.c:2283 src/protocols/msn/msn.c:2336
 msgid "Invalid name"
 msgstr "Ugyldigt navn"
 
-#: src/protocols/napster/napster.c:450 src/protocols/oscar/oscar.c:2958
-#: src/protocols/toc/toc.c:1093
+#: src/protocols/napster/napster.c:457 src/protocols/oscar/oscar.c:3209
+#: src/protocols/toc/toc.c:1104
 msgid "Join what group:"
 msgstr "Hvilken gruppe:"
 
-#: src/protocols/oscar/oscar.c:328
-#, c-format
-msgid "Direct IM with %s closed"
-msgstr "Direkte forbindelse til %s lukket"
-
 #: src/protocols/oscar/oscar.c:330
 #, c-format
+msgid "Direct IM with %s closed"
+msgstr "Direkte forbindelse til %s lukket"
+
+#: src/protocols/oscar/oscar.c:332
+#, c-format
 msgid "Direct IM with %s failed"
 msgstr "Direkte forbindelse til %s fejlede"
 
-#: src/protocols/oscar/oscar.c:368
+#: src/protocols/oscar/oscar.c:370
 msgid "connection error (rend)\n"
 msgstr "Forbindelsesfejl (rend)\n"
 
-#: src/protocols/oscar/oscar.c:379
+#: src/protocols/oscar/oscar.c:381
 msgid "major connection error\n"
 msgstr "Kritisk forbindelsesfejl\n"
 
-#: src/protocols/oscar/oscar.c:380 src/protocols/toc/toc.c:511
+#: src/protocols/oscar/oscar.c:382 src/protocols/toc/toc.c:511
 #: src/protocols/toc/toc.c:524 src/protocols/toc/toc.c:590
 msgid "Disconnected."
 msgstr "Forbindelse afbrudt"
 
-#: src/protocols/oscar/oscar.c:392 src/protocols/toc/toc.c:761
+#: src/protocols/oscar/oscar.c:394 src/protocols/toc/toc.c:761
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "Forbindelse til chat-rum %s afbrudt."
 
-#: src/protocols/oscar/oscar.c:393
+#: src/protocols/oscar/oscar.c:395
 msgid "Chat Error!"
 msgstr "Chat-fejl!"
 
-#: src/protocols/oscar/oscar.c:405
+#: src/protocols/oscar/oscar.c:407
 msgid "Chat is currently unavailable"
 msgstr "Chat er ikke tilgngelig nu"
 
-#: src/protocols/oscar/oscar.c:406
+#: src/protocols/oscar/oscar.c:408
 msgid "Gaim - Chat"
 msgstr "Gaim - Chat"
 
-#: src/protocols/oscar/oscar.c:465 src/protocols/oscar/oscar.c:525
+#: src/protocols/oscar/oscar.c:467 src/protocols/oscar/oscar.c:527
 msgid "Couldn't connect to host"
 msgstr "Kunne ikke kontakte vrt"
 
-#: src/protocols/oscar/oscar.c:473
+#: src/protocols/oscar/oscar.c:475
 msgid "Password sent, waiting for response\n"
 msgstr "Adgangskode sendt - venter p svar\n"
 
-#: src/protocols/oscar/oscar.c:506
+#: src/protocols/oscar/oscar.c:508
 msgid "internal connection error\n"
 msgstr "Intern forbindelsesfejl\n"
 
-#: src/protocols/oscar/oscar.c:507
+#: src/protocols/oscar/oscar.c:509
 msgid "Unable to login to AIM"
 msgstr "Kunne ikke logge p AIM"
 
-#: src/protocols/oscar/oscar.c:512
+#: src/protocols/oscar/oscar.c:514
 #, c-format
 msgid "Signon: %s"
 msgstr "Tilsluttet: %s"
 
-#: src/protocols/oscar/oscar.c:584
+#: src/protocols/oscar/oscar.c:586
 msgid "Signed off.\n"
 msgstr "Koblet af.\n"
 
-#: src/protocols/oscar/oscar.c:603 src/protocols/oscar/oscar.c:727
+#: src/protocols/oscar/oscar.c:605 src/protocols/oscar/oscar.c:730
 msgid "Could Not Connect"
 msgstr "Forbindelse fejlede"
 
-#: src/protocols/oscar/oscar.c:611
+#: src/protocols/oscar/oscar.c:613
 msgid "Connection established, cookie sent"
 msgstr "Forbindelse oprettet, infokage sendt"
 
 #. Incorrect nick/password
-#: src/protocols/oscar/oscar.c:637 src/protocols/toc/toc.c:459
+#: src/protocols/oscar/oscar.c:639 src/protocols/toc/toc.c:459
 msgid "Incorrect nickname or password."
 msgstr "Forkert navn eller adgangskode."
 
 #. Suspended account
-#: src/protocols/oscar/oscar.c:642
+#: src/protocols/oscar/oscar.c:644
 msgid "Your account is currently suspended."
 msgstr "Din konto er ikke aktiv for jeblikket."
 
 #. connecting too frequently
-#: src/protocols/oscar/oscar.c:646
+#: src/protocols/oscar/oscar.c:648
 msgid ""
 "You have been connecting and disconnecting too frequently. Wait ten minutes "
 "and try again. If you continue to try, you will need to wait even longer."
@@ -639,51 +1075,76 @@
 "minutter og prv s igen, for ellers skal du bare vente endnu lngere."
 
 #. client too old
-#: src/protocols/oscar/oscar.c:651
+#: src/protocols/oscar/oscar.c:653
 msgid "The client version you are using is too old. Please upgrade at "
 msgstr "Din klient er for gammel. Hent en opgradering p"
 
-#: src/protocols/oscar/oscar.c:655 src/protocols/toc/toc.c:542
+#: src/protocols/oscar/oscar.c:657 src/protocols/toc/toc.c:542
 msgid "Authentication Failed"
 msgstr "Godkendelse fejlede."
 
-#: src/protocols/oscar/oscar.c:677
+#: src/protocols/oscar/oscar.c:679
 msgid "Internal Error"
 msgstr "Intern fejl"
 
-#: src/protocols/oscar/oscar.c:1245 src/protocols/oscar/oscar.c:3169
+#: src/protocols/oscar/oscar.c:1248 src/protocols/oscar/oscar.c:3420
 #, c-format
 msgid "Direct IM with %s established"
 msgstr "Direkte forbindelse til %s oprettet"
 
-#: src/protocols/oscar/oscar.c:1497
+#: src/protocols/oscar/oscar.c:1504 src/protocols/oscar/oscar.c:2456
+#, c-format
+msgid ""
+"The user %lu has denied your request to add them to your contact list for "
+"the following reason:\n"
+"%s"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:1504 src/protocols/oscar/oscar.c:2456
+#, fuzzy
+msgid "No reason given."
+msgstr "Klenavn ikke angivet"
+
+#: src/protocols/oscar/oscar.c:1505 src/protocols/oscar/oscar.c:2457
+msgid "Gaim - ICQ Authorization Denied"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:1511 src/protocols/oscar/oscar.c:2463
+#, c-format
+msgid "The user %lu has granted your request to add them to your contact list."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:1512 src/protocols/oscar/oscar.c:2464
+msgid "Gaim - ICQ Authorization Granted"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:1585
 #, c-format
 msgid "You missed %d message from %s because it was invalid."
 msgstr "Du har ikke modtaget %d besked fra %s fordi den var ugyldig."
 
-#: src/protocols/oscar/oscar.c:1498
+#: src/protocols/oscar/oscar.c:1586
 #, c-format
 msgid "You missed %d messages from %s because they were invalid."
 msgstr "Du har ikke modtaget %d beskeder fra %s fordi de var ugyldige"
 
-#: src/protocols/oscar/oscar.c:1507
+#: src/protocols/oscar/oscar.c:1595
 #, c-format
 msgid "You missed %d message from %s because it was too large."
 msgstr "Du har ikke modtaget %d besked fra %s fordi den var for stor."
 
-#: src/protocols/oscar/oscar.c:1508
+#: src/protocols/oscar/oscar.c:1596
 #, c-format
 msgid "You missed %d messages from %s because they were too large."
 msgstr "Du har ikke modtaget %d beskeder fra %s fordi de var for store."
 
-#: src/protocols/oscar/oscar.c:1517
+#: src/protocols/oscar/oscar.c:1605
 #, c-format
-msgid ""
-"You missed %d message from %s because the rate limit has been exceeded."
+msgid "You missed %d message from %s because the rate limit has been exceeded."
 msgstr ""
 "Du har ikke modtaget %d besked fra %s fordi der er sendt for mange beskeder."
 
-#: src/protocols/oscar/oscar.c:1518
+#: src/protocols/oscar/oscar.c:1606
 #, c-format
 msgid ""
 "You missed %d messages from %s because the rate limit has been exceeded."
@@ -691,145 +1152,156 @@
 "Du har ikke modtaget %d beskeder fra %s fordi der er sendt for mange "
 "beskeder."
 
-#: src/protocols/oscar/oscar.c:1527
+#: src/protocols/oscar/oscar.c:1615
 #, c-format
 msgid "You missed %d message from %s because it was too evil."
 msgstr "Du har ikke modtaget %d besked fra %s fordi den var storeslem :-)."
 
-#: src/protocols/oscar/oscar.c:1528
+#: src/protocols/oscar/oscar.c:1616
 #, c-format
 msgid "You missed %d messages from %s because they are too evil."
 msgstr "Du har ikke modtaget %d beskeder fra %s fordi de var storeslemme :-)."
 
-#: src/protocols/oscar/oscar.c:1537
+#: src/protocols/oscar/oscar.c:1625
 #, c-format
 msgid "You missed %d message from %s because you are too evil."
 msgstr "Du har ikke modtaget %d besked fra %s pga din drlige opfrsel :-)."
 
-#: src/protocols/oscar/oscar.c:1538
+#: src/protocols/oscar/oscar.c:1626
 #, c-format
 msgid "You missed %d messages from %s because you are too evil."
 msgstr "Du har ikke modtaget %d beskeder fra %s pga din drlige opfrsel :-)"
 
-#: src/protocols/oscar/oscar.c:1546
+#: src/protocols/oscar/oscar.c:1634
 #, c-format
 msgid "You missed %d message from %s for unknown reasons."
 msgstr "Du har ikke modtaget %d besked fra %s af ukendte rsager."
 
-#: src/protocols/oscar/oscar.c:1547
+#: src/protocols/oscar/oscar.c:1635
 #, c-format
 msgid "You missed %d messages from %s for unknown reasons."
 msgstr "Du har ikke modtaget %d beskeder fra %s af ukendte rsager"
 
-#: src/dialogs.c:3034 src/dialogs.c:3040 src/protocols/oscar/oscar.c:1552
-#: src/protocols/oscar/oscar.c:1590 src/protocols/oscar/oscar.c:1608
-#: src/protocols/oscar/oscar.c:2061 src/protocols/yahoo/yahoo.c:585
+#: src/dialogs.c:3076 src/dialogs.c:3082 src/protocols/oscar/oscar.c:1640
+#: src/protocols/oscar/oscar.c:1755 src/protocols/oscar/oscar.c:1773
+#: src/protocols/oscar/oscar.c:2226 src/protocols/yahoo/yahoo.c:594
 msgid "Gaim - Error"
 msgstr "Gaim - Fejl"
 
-#: src/protocols/oscar/oscar.c:1569
+#: src/protocols/oscar/oscar.c:1703
+#, c-format
+msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR>%s<BR>"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:1705
+#, c-format
+msgid "<B>Status:</B> %s<BR><HR><BR>%s<BR>"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:1734
 #, c-format
 msgid "SNAC threw error: %s\n"
 msgstr "SNAC gav fejlen: %s\n"
 
-#: src/protocols/oscar/oscar.c:1571
+#: src/protocols/oscar/oscar.c:1736
 msgid "Gaim - Oscar SNAC Error"
 msgstr "Gaim - Oscar SNAC fejl"
 
-#: src/protocols/oscar/oscar.c:1588
+#: src/protocols/oscar/oscar.c:1753
 #, c-format
 msgid "Your message to %s did not get sent: %s"
 msgstr "Din besked til %s blev ikke sendt: %s"
 
-#: src/protocols/oscar/oscar.c:1589 src/protocols/oscar/oscar.c:1607
+#: src/protocols/oscar/oscar.c:1754 src/protocols/oscar/oscar.c:1772
 msgid "Reason unknown"
 msgstr "Ukendt rsag"
 
-#: src/protocols/oscar/oscar.c:1606
+#: src/protocols/oscar/oscar.c:1771
 #, c-format
 msgid "User information for %s unavailable: %s"
 msgstr "Oplysninger om %s ikke tilgngelige: %s"
 
-#: src/buddy.c:1989 src/protocols/oscar/oscar.c:1637
+#: src/buddy.c:2131 src/protocols/oscar/oscar.c:1802
 msgid "Buddy Icon"
 msgstr "Venne-ikon"
 
-#: src/buddy.c:1992 src/protocols/oscar/oscar.c:1640
+#: src/buddy.c:2134 src/protocols/oscar/oscar.c:1805
 msgid "Voice"
 msgstr "Tale"
 
-#: src/buddy.c:1995 src/protocols/oscar/oscar.c:1643
+#: src/buddy.c:2137 src/protocols/oscar/oscar.c:1808
 msgid "IM Image"
 msgstr "Billede"
 
-#: src/buddy.c:488 src/buddy.c:1998 src/buddy.c:2436 src/prefs.c:2912
-#: src/protocols/oscar/oscar.c:1646
+#: src/buddy.c:498 src/buddy.c:2140 src/buddy.c:2581 src/prefs.c:2926
+#: src/protocols/oscar/oscar.c:1811
 msgid "Chat"
 msgstr "Chat"
 
-#: src/buddy.c:2001 src/protocols/oscar/oscar.c:1649
+#: src/buddy.c:2143 src/protocols/oscar/oscar.c:1814
 msgid "Get File"
 msgstr "Modtag fil"
 
-#: src/buddy.c:2004 src/protocols/oscar/oscar.c:1652
+#: src/buddy.c:2146 src/protocols/oscar/oscar.c:1817
 msgid "Send File"
 msgstr "Send fil"
 
-#: src/buddy.c:2008 src/protocols/oscar/oscar.c:1656
+#: src/buddy.c:2150 src/protocols/oscar/oscar.c:1821
 msgid "Games"
 msgstr "Spil"
 
-#: src/buddy.c:2011 src/protocols/oscar/oscar.c:1659
+#: src/buddy.c:2153 src/protocols/oscar/oscar.c:1824
 msgid "Stocks"
 msgstr "Aktier"
 
-#: src/buddy.c:2014 src/protocols/oscar/oscar.c:1662
+#: src/buddy.c:2156 src/protocols/oscar/oscar.c:1827
 msgid "Send Buddy List"
 msgstr "Send venne-liste"
 
-#: src/buddy.c:2017 src/protocols/oscar/oscar.c:1665
+#: src/buddy.c:2159 src/protocols/oscar/oscar.c:1830
 msgid "EveryBuddy Bug"
 msgstr "EveryBuddy Bug"
 
-#: src/buddy.c:2020 src/protocols/oscar/oscar.c:1668
+#: src/buddy.c:2162 src/protocols/oscar/oscar.c:1833
 msgid "AP User"
 msgstr "AP Bruger"
 
-#: src/buddy.c:2023 src/protocols/oscar/oscar.c:1671
+#: src/buddy.c:2165 src/protocols/oscar/oscar.c:1836
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
-#: src/buddy.c:2026 src/protocols/oscar/oscar.c:1674
+#: src/buddy.c:2168 src/protocols/oscar/oscar.c:1839
 msgid "Nihilist"
 msgstr "Nihilist"
 
-#: src/buddy.c:2029 src/protocols/oscar/oscar.c:1677
+#: src/buddy.c:2171 src/protocols/oscar/oscar.c:1842
 msgid "ICQ Server Relay"
 msgstr "ICQ Send gennem server"
 
-#: src/buddy.c:2032 src/protocols/oscar/oscar.c:1680
+#: src/buddy.c:2174 src/protocols/oscar/oscar.c:1845
 msgid "ICQ Unknown"
 msgstr "ICQ Ukendt"
 
-#: src/buddy.c:2035 src/protocols/oscar/oscar.c:1683
+#: src/buddy.c:2177 src/protocols/oscar/oscar.c:1848
 msgid "Trillian Encryption"
 msgstr "Trillian Kryptering"
 
-#: src/protocols/oscar/oscar.c:1721
+#: src/protocols/oscar/oscar.c:1886
 msgid ""
-"<br><BODY BGCOLOR=WHITE><hr><I>Legend:</I><br><br><IMG SRC=\"free_icon.gif\"> "
-": Normal AIM User<br><IMG SRC=\"aol_icon.gif\"> : AOL User <br><IMG "
-"SRC=\"dt_icon.gif\"> : Trial AIM User <br><IMG SRC=\"admin_icon.gif\"> : "
+"<br><BODY BGCOLOR=WHITE><hr><I>Legend:</I><br><br><IMG SRC=\"free_icon.gif"
+"\"> : Normal AIM User<br><IMG SRC=\"aol_icon.gif\"> : AOL User <br><IMG SRC="
+"\"dt_icon.gif\"> : Trial AIM User <br><IMG SRC=\"admin_icon.gif\"> : "
 "Administrator <br><IMG SRC=\"ab_icon.gif\"> : ActiveBuddy Interactive "
 "Agent<br><IMG SRC=\"wireless_icon.gif\"> : Wireless Device User<br>"
 msgstr ""
-"<br><BODY BGCOLOR=WHITE><hr><I>Betydning:</I><br><br><IMG "
-"SRC=\"free_icon.gif\"> : Normal AIM Bruger<br><IMG SRC=\"aol_icon.gif\"> : AOL Bruger <br><IMG "
-"SRC=\"dt_icon.gif\"> : AIM Bruger p prve <br><IMG SRC=\"admin_icon.gif\"> : "
-"Administrator <br><IMG SRC=\"ab_icon.gif\"> : ActiveBuddy Interaktiv "
+"<br><BODY BGCOLOR=WHITE><hr><I>Betydning:</I><br><br><IMG SRC=\"free_icon.gif"
+"\"> : Normal AIM Bruger<br><IMG SRC=\"aol_icon.gif\"> : AOL Bruger <br><IMG "
+"SRC=\"dt_icon.gif\"> : AIM Bruger p prve <br><IMG SRC=\"admin_icon.gif"
+"\"> : Administrator <br><IMG SRC=\"ab_icon.gif\"> : ActiveBuddy Interaktiv "
 "Agent<br><IMG SRC=\"wireless_icon.gif\"> : Trdls bruger<br>"
 
-#: src/protocols/oscar/oscar.c:1749
+#: src/protocols/oscar/oscar.c:1914
+#, c-format
 msgid ""
 "Username : <B>%s</B>  %s <BR>\n"
 "Warning Level : <B>%d %%</B><BR>\n"
@@ -841,27 +1313,27 @@
 "%s%s%s<BR>\n"
 "<HR><BR>\n"
 
-#: src/protocols/oscar/oscar.c:1781
+#: src/protocols/oscar/oscar.c:1946
 msgid "<i>User has no away message</i>"
 msgstr "<i>Brugeren har ingen fravrsbesked</i>"
 
-#: src/protocols/oscar/oscar.c:1793
+#: src/protocols/oscar/oscar.c:1958
 msgid "Client Capabilities: "
 msgstr "Klient understtter:"
 
-#: src/protocols/oscar/oscar.c:1801
+#: src/protocols/oscar/oscar.c:1966
 msgid "<i>No Information Provided</i>"
 msgstr "<i>Ingen information tilgngelig</i>"
 
-#: src/protocols/oscar/oscar.c:1824
+#: src/protocols/oscar/oscar.c:1989
 msgid "Your connection may be lost."
 msgstr "Din forbindelse kan vre afbrudt."
 
-#: src/protocols/oscar/oscar.c:1825
+#: src/protocols/oscar/oscar.c:1990
 msgid "AOL error"
 msgstr "AOL fejl"
 
-#: src/protocols/oscar/oscar.c:2060
+#: src/protocols/oscar/oscar.c:2225
 msgid ""
 "The last message was not sent because you are over the rate limit. Please "
 "wait 10 seconds and try again."
@@ -869,37 +1341,68 @@
 "Den seneste besked blev ikke sendt, fordi serveren har for travlt. Vent 10 "
 "sekunder og prv s igen."
 
-#: src/dialogs.c:3562 src/protocols/oscar/oscar.c:2374
-#: src/protocols/oscar/oscar.c:3290 src/protocols/toc/toc.c:1553
-#: src/protocols/toc/toc.c:1570 src/protocols/toc/toc.c:1630
-#: src/protocols/toc/toc.c:1672 src/protocols/toc/toc.c:1791
-#: src/protocols/toc/toc.c:1821 src/protocols/toc/toc.c:1877
+#: src/dialogs.c:3604 src/protocols/oscar/oscar.c:2589
+#: src/protocols/oscar/oscar.c:3541 src/protocols/toc/toc.c:1564
+#: src/protocols/toc/toc.c:1581 src/protocols/toc/toc.c:1641
+#: src/protocols/toc/toc.c:1683 src/protocols/toc/toc.c:1802
+#: src/protocols/toc/toc.c:1832 src/protocols/toc/toc.c:1888
 msgid "Error"
 msgstr "Fejl"
 
-#: src/protocols/oscar/oscar.c:2962 src/protocols/toc/toc.c:1097
+#: src/protocols/oscar/oscar.c:3192
+#, c-format
+msgid ""
+"The maximum number of buddies allowed in your buddy list is %d, and you have "
+"%d.  Until you are below the limit, some buddies will not show up as online."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3195
+#, fuzzy
+msgid "Gaim - Warning"
+msgstr "Gaim - Advar bruger?"
+
+#: src/protocols/oscar/oscar.c:3213 src/protocols/toc/toc.c:1108
 msgid "Exchange:"
 msgstr "Deltagere:"
 
-#: src/protocols/oscar/oscar.c:3290
+#: src/protocols/oscar/oscar.c:3541
 msgid "Unable to open Direct IM"
 msgstr "Kunne ikke oprette direkte forbindelse"
 
-#: src/protocols/oscar/oscar.c:3300
+#: src/protocols/oscar/oscar.c:3551
 #, c-format
 msgid ""
-"You have selected to open a Direct IM connection with %s. Doing this will let "
-"them see your IP address, and may be a security risk. Do you wish to "
+"You have selected to open a Direct IM connection with %s. Doing this will "
+"let them see your IP address, and may be a security risk. Do you wish to "
 "continue?"
 msgstr ""
-"Du har valgt at bne en direkte forbindelse til %s. Dermed kan vedkommende se "
-"din IP-adresse og det indebrer en sikkerhedsrisiko. Vil du fortstte?"
-
-#: src/protocols/oscar/oscar.c:3333
+"Du har valgt at bne en direkte forbindelse til %s. Dermed kan vedkommende "
+"se din IP-adresse og det indebrer en sikkerhedsrisiko. Vil du fortstte?"
+
+#: src/protocols/oscar/oscar.c:3568
+#, c-format
+msgid ""
+"<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR><I>Remote client does not "
+"support sending status messages.</I><BR>"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3575
+#, c-format
+msgid ""
+"<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR><I>User has no status message."
+"</I><BR>"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3600
+#, fuzzy
+msgid "Get Status Msg"
+msgstr "Hent fravrsbesked"
+
+#: src/protocols/oscar/oscar.c:3613
 msgid "Direct IM"
 msgstr "Direkte forbindelse"
 
-#: src/protocols/oscar/oscar.c:3341
+#: src/protocols/oscar/oscar.c:3621
 msgid "Get Capabilities"
 msgstr "Klientinformation"
 
@@ -1044,7 +1547,7 @@
 msgid "Password Change Successful"
 msgstr "Adgangskode skiftet"
 
-#: src/dialogs.c:1688 src/protocols/toc/toc.c:782
+#: src/dialogs.c:1730 src/protocols/toc/toc.c:782
 msgid "Gaim - Password Change"
 msgstr "Gaim - Skift adgangskode"
 
@@ -1055,86 +1558,94 @@
 "anything from going through. This is only temporary, please be patient."
 msgstr ""
 "TOC har sendt en PAUSE-kommando. Dermed ignorerer TOC alle beskeder der "
-"sendes, men du kan alligevel risikere at blive logget af, hvis du forsger at "
-"sende en besked. Gaim vil derfor tilbageholde alle beskeder. Dette er kun "
+"sendes, men du kan alligevel risikere at blive logget af, hvis du forsger "
+"at sende en besked. Gaim vil derfor tilbageholde alle beskeder. Dette er kun "
 "midlertidigt, s hav tlmodighed..."
 
 #: src/protocols/toc/toc.c:788
 msgid "TOC Pause"
 msgstr "TOC Pause"
 
-#: src/protocols/toc/toc.c:1214
+#: src/protocols/toc/toc.c:1225
 msgid "Get Dir Info"
 msgstr "Hent oplysninger"
 
-#: src/protocols/toc/toc.c:1630 src/protocols/toc/toc.c:1672
-#: src/protocols/toc/toc.c:1791 src/protocols/toc/toc.c:1877
+#: src/protocols/toc/toc.c:1641 src/protocols/toc/toc.c:1683
+#: src/protocols/toc/toc.c:1802 src/protocols/toc/toc.c:1888
 msgid "Could not connect for transfer!"
 msgstr "Kunne ikke oprette forbindelse til overfrsel!"
 
-#: src/protocols/toc/toc.c:1821
+#: src/protocols/toc/toc.c:1832
 msgid "Could not write file header!"
 msgstr "Kunne ikke skrive starten af filen."
 
-#: src/protocols/toc/toc.c:1910
+#: src/protocols/toc/toc.c:1921
 msgid "Gaim - Save As..."
 msgstr "Gaim - Gem som..."
 
-#: src/protocols/toc/toc.c:1951
+#: src/protocols/toc/toc.c:1962
 #, c-format
 msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
 msgstr "%s beder %s om at modtage %d fil: %s (%.2f %s)%s%s"
 
-#: src/protocols/toc/toc.c:1952
+#: src/protocols/toc/toc.c:1963
 #, c-format
 msgid "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
 msgstr "%s beder %s om at modtage %d filer: %s (%.2f %s)%s%s"
 
-#: src/protocols/toc/toc.c:1957
+#: src/protocols/toc/toc.c:1968
 #, c-format
 msgid "%s requests you to send them a file"
 msgstr "%s beder dig om at sende en fil"
 
-#: src/protocols/yahoo/yahoo.c:585
+#: src/protocols/yahoo/yahoo.c:594
 msgid "Your message did not get sent."
 msgstr "Din besked blev ikke sendt"
 
-#: src/protocols/zephyr/zephyr.c:802
+#: src/protocols/zephyr/zephyr.c:840
 msgid "ZLocate"
 msgstr "ZLocate"
 
-#: src/protocols/zephyr/zephyr.c:839
+#: src/protocols/zephyr/zephyr.c:877
 msgid "Class:"
 msgstr "Klasse:"
 
-#: src/protocols/zephyr/zephyr.c:843
+#: src/protocols/zephyr/zephyr.c:881
 msgid "Instance:"
 msgstr "Instans:"
 
-#: src/protocols/zephyr/zephyr.c:847
+#: src/protocols/zephyr/zephyr.c:885
 msgid "Recipient:"
 msgstr "Modtager:"
 
-#: src/about.c:93
+#: src/about.c:102
 #, c-format
 msgid "About Gaim v%s"
 msgstr "Om Gaim %s"
 
-#: src/about.c:126
+#: src/about.c:135
+#, fuzzy
 msgid ""
-"Gaim is a client that supports AOL's Instant Messenger protocol. It is "
-"written\n"
-"using Gtk+ and is licensed under the GPL.\n"
+"Gaim is a modular Instant Messaging client capable of using AIM, ICQ,\n"
+"Yahoo!, MSN, IRC, Jabber, Napster, Zephyr, and Gadu-Gadu all at once.\n"
+"It is written using Gtk+ and is licensed under the GPL.\n"
 "\n"
 "URL: "
 msgstr ""
-"Gaim er et program, der understtter AOL's Instant Messenger "
-"protokol.\nDet bruger Gtk+ og licenseres under GPL.\n"
+"Gaim er et program, der understtter AOL's Instant Messenger protokol.\n"
+"Det bruger Gtk+ og licenseres under GPL.\n"
 "\n"
 "Hjemmeside: "
 
 #: src/about.c:137
 msgid ""
+"\n"
+"\n"
+"IRC: #gaim on irc.openprojects.net"
+msgstr ""
+
+#: src/about.c:147
+msgid ""
 "Active Developers\n"
 "====================\n"
 "Rob Flynn (maintainer) [ rob@marko.net ]\n"
@@ -1175,98 +1686,96 @@
 "===============\n"
 "Lars Sarauw Hansen                 [ sarauw@dk.ibm.com ]"
 
-#: src/about.c:155 src/aim.c:318 src/buddy.c:2562 src/buddy_chat.c:1311
-#: src/buddy_chat.c:1408 src/buddy_chat.c:1438 src/conversation.c:2742
-#: src/dialogs.c:568 src/dialogs.c:3857 src/multi.c:1057 src/plugins.c:277
-#: src/prefs.c:2535 src/prpl.c:438 src/prpl.c:679 src/server.c:1019
-msgid "Close"
-msgstr "Luk"
-
 #. this makes the sizes not work.
 #. GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
 #. gtk_widget_grab_default(button);
-#: src/about.c:175
+#: src/about.c:185
 msgid "Web Site"
 msgstr "Hjemmeside"
 
-#: src/aim.c:151 src/buddy.c:2555
+#: src/aim.c:153 src/buddy.c:2709
 msgid "Signoff"
 msgstr "Log af"
 
-#: src/aim.c:163
+#: src/aim.c:165
 msgid "Please enter your logon"
 msgstr "Indtast dit brugernavn"
 
-#: src/aim.c:163 src/multi.c:1388 src/server.c:55
+#: src/aim.c:165 src/multi.c:1400 src/server.c:55
 msgid "Signon Error"
 msgstr "Logind-fejl"
 
-#: src/aim.c:261
+#: src/aim.c:263
 msgid "Gaim - Login"
 msgstr "Gaim - Logind"
 
-#: src/aim.c:279
+#: src/aim.c:281
 msgid "Screen Name: "
 msgstr "Brugernavn:"
 
-#: src/aim.c:295
+#: src/aim.c:297
 msgid "Password: "
 msgstr "Adgangskode:"
 
-#: src/aim.c:316 src/buddy.c:2559
+#: src/aim.c:318 src/buddy.c:2713
 msgid "Quit"
 msgstr "Luk"
 
-#: src/aim.c:321 src/aim.c:798 src/buddy.c:2585
+#: src/aim.c:323 src/aim.c:831 src/buddy.c:2739
 msgid "Accounts"
 msgstr "Konti"
 
-#: src/aim.c:323 src/multi.c:903
+#: src/aim.c:325 src/multi.c:915
 msgid "Signon"
 msgstr "Log p"
 
-#: src/aim.c:355
+#: src/aim.c:357
 msgid "About"
 msgstr "Om"
 
-#: src/aim.c:356 src/prefs.c:1619 src/prefs.c:1893
+#: src/aim.c:358 src/prefs.c:1633 src/prefs.c:1905
 msgid "Options"
 msgstr "Valgmuligheder"
 
-#: src/aim.c:358 src/aim.c:801 src/buddy.c:2603
+#: src/aim.c:360 src/aim.c:834 src/buddy.c:2757
 msgid "Plugins"
 msgstr "Udvidelsesmoduler"
 
-#: src/aim.c:795 src/buddy.c:2595
+#: src/aim.c:828 src/buddy.c:2749
 msgid "Preferences"
 msgstr "Indstillinger"
 
-#: src/applet.c:199
+#: src/aim.c:838 src/multi.c:1472
+#, fuzzy
+msgid "Auto-login"
+msgstr "Auto-logind"
+
+#: src/applet.c:109
 msgid "Attempting to sign on...."
 msgstr "Prver at logge p..."
 
-#: src/applet.c:202
+#: src/applet.c:112
 msgid "Offline. Click to bring up login box."
 msgstr "Ikke logget ind. Klik for at logge ind."
 
-#: src/applet.c:218
+#: src/applet.c:128
 #, c-format
 msgid "Away: %d pending."
 msgstr "Fravrende: %d venter."
 
-#: src/applet.c:221
+#: src/applet.c:131
 msgid "Away."
 msgstr "Fravrende"
 
-#: src/applet.c:296 src/away.c:388
+#: src/applet.c:200 src/away.c:388
 msgid "New Away Message"
 msgstr "Ny fravrsbesked"
 
-#: src/applet.c:444
+#: src/applet.c:348
 msgid "Can't create Gaim applet!"
 msgstr "Kan ikke starte Gaim i panelet!"
 
-#: src/applet.c:465
+#: src/applet.c:368
 msgid "About..."
 msgstr "Om..."
 
@@ -1290,87 +1799,74 @@
 msgid "Set All Away"
 msgstr "St alle fravrende"
 
-#. Put the buttons in the box
-#: src/buddy.c:482 src/buddy.c:2672 src/buddy_chat.c:1443
-#: src/conversation.c:2275 src/conversation.c:2757 src/dialogs.c:890
-#: src/dialogs.c:1072 src/dialogs.c:2053 src/multi.c:1041 src/prefs.c:2029
-#: src/prefs.c:2371 src/prefs.c:2405
-msgid "Add"
-msgstr "Tilfj"
-
-#: src/buddy.c:483 src/buddy.c:2673 src/dialogs.c:900 src/dialogs.c:1047
+#: src/buddy.c:493 src/buddy.c:2828 src/dialogs.c:942 src/dialogs.c:1089
 msgid "Group"
 msgstr "Gruppe"
 
-#: src/buddy.c:484 src/buddy.c:2674 src/buddy_chat.c:1445
-#: src/conversation.c:2261 src/conversation.c:2754 src/prefs.c:2043
-#: src/prefs.c:2375 src/prefs.c:2409
-msgid "Remove"
-msgstr "Slet"
-
-#: src/buddy.c:489 src/buddy.c:640 src/buddy.c:791 src/buddy.c:2434
-#: src/buddy_chat.c:850 src/buddy_chat.c:1267
+#: src/buddy.c:499 src/buddy.c:664 src/buddy.c:834 src/buddy.c:2579
+#: src/buddy_chat.c:861 src/buddy_chat.c:1278
 msgid "IM"
 msgstr "Besked"
 
-#: src/buddy.c:490 src/buddy.c:2435 src/buddy_chat.c:866 src/buddy_chat.c:1275
-#: src/buddy_chat.c:1451 src/conversation.c:2775
+#: src/buddy.c:500 src/buddy.c:2580 src/buddy_chat.c:877 src/buddy_chat.c:1286
+#: src/buddy_chat.c:1462 src/conversation.c:2897
 msgid "Info"
 msgstr "Information"
 
 #. Put the buttons in the box
-#: src/buddy.c:645 src/buddy.c:796 src/dialogs.c:1039 src/dialogs.c:3416
-#: src/dialogs.c:3431
+#: src/buddy.c:669 src/buddy.c:839 src/dialogs.c:1081 src/dialogs.c:3458
+#: src/dialogs.c:3473
 msgid "Alias"
 msgstr "Alias"
 
-#: src/buddy.c:650 src/buddy.c:815
+#: src/buddy.c:674 src/buddy.c:858
 msgid "Add Buddy Pounce"
 msgstr "Tilfj handling"
 
-#: src/buddy.c:657 src/buddy.c:821
+#: src/buddy.c:681 src/buddy.c:864
 msgid "View Log"
 msgstr "Ls log"
 
-#: src/buddy.c:778 src/buddy.c:809
+#: src/buddy.c:821 src/buddy.c:852
 msgid "Rename"
 msgstr "Omdb"
 
-#: src/buddy.c:803
+#: src/buddy.c:846
 msgid "Un-Alias"
 msgstr "Slet alias"
 
-#: src/buddy.c:1567 src/buddy.c:2578
+#: src/buddy.c:1645 src/buddy.c:2732
 msgid "Buddy Pounce"
 msgstr "Handling"
 
-#: src/buddy.c:1647
+#: src/buddy.c:1725
 msgid "New Buddy Pounce"
 msgstr "Opret handling"
 
-#: src/buddy.c:1665
+#: src/buddy.c:1743
 msgid "Remove Buddy Pounce"
 msgstr "Slet handling"
 
-#: src/buddy.c:1693
+#: src/buddy.c:1771
 msgid "[Click to edit]"
 msgstr "[Klik for at ndre]"
 
-#: src/buddy.c:2112
+#: src/buddy.c:2254
 #, c-format
 msgid "Logged in: %s\n"
 msgstr "Logget ind: %s\n"
 
-#: src/buddy.c:2124
+#: src/buddy.c:2266
+#, c-format
 msgid "Warnings: %d%%\n"
 msgstr "Advarsler: %d%%\n"
 
-#: src/buddy.c:2136
+#: src/buddy.c:2278
 #, c-format
 msgid "Capabilities: %s\n"
 msgstr "Understtter: %s\n"
 
-#: src/buddy.c:2140
+#: src/buddy.c:2282
 #, c-format
 msgid ""
 "Alias: %s               \n"
@@ -1381,117 +1877,127 @@
 "Brugernavn: %s\n"
 "%s%s%s%s%s%s"
 
-#: src/buddy.c:2144
+#: src/buddy.c:2286
 msgid "Idle: "
 msgstr "Inaktiv:"
 
-#: src/buddy.c:2215 src/buddy.c:2220
+#: src/buddy.c:2359 src/buddy.c:2364
 #, c-format
 msgid "%s logged in."
 msgstr "%s loggede ind."
 
-#: src/buddy.c:2279 src/buddy.c:2284
+#: src/buddy.c:2424 src/buddy.c:2429
 #, c-format
 msgid "%s logged out."
 msgstr "%s loggede ud."
 
-#: src/buddy.c:2469
+#: src/buddy.c:2614
 msgid "Information on selected Buddy"
 msgstr "Information om markeret ven"
 
-#: src/buddy.c:2470 src/dialogs.c:697
+#: src/buddy.c:2615 src/dialogs.c:697
 msgid "Send Instant Message"
 msgstr "Send besked"
 
-#: src/buddy.c:2471
+#: src/buddy.c:2616
 msgid "Start/join a Buddy Chat"
 msgstr "Start/deltag i chat"
 
-#: src/buddy.c:2472
+#: src/buddy.c:2617
 msgid "Activate Away Message"
 msgstr "Jeg er fravrende"
 
-#: src/buddy.c:2535
+#: src/buddy.c:2689
 msgid "File"
 msgstr "Handlinger"
 
-#: src/buddy.c:2539
+#: src/buddy.c:2693
 msgid "Add A Buddy"
 msgstr "Tilfj en ven"
 
-#: src/buddy.c:2541
+#: src/buddy.c:2695
 msgid "Join A Chat"
 msgstr "Deltag i chat"
 
-#: src/buddy.c:2543
+#: src/buddy.c:2697
 msgid "New Instant Message"
 msgstr "Ny besked"
 
-#: src/buddy.c:2545 src/dialogs.c:749
+#: src/buddy.c:2699 src/dialogs.c:759
 msgid "Get User Info"
 msgstr "Se brugeroplysninger"
 
-#: src/buddy.c:2550
+#: src/buddy.c:2704
 msgid "Import Buddy List"
 msgstr "Importr venne-liste"
 
-#: src/buddy.c:2568
+#: src/buddy.c:2722
 msgid "Tools"
 msgstr "Vrktjer"
 
-#: src/buddy.c:2591
+#: src/buddy.c:2745
 msgid "Protocol Actions"
 msgstr "Protokolhandlinger"
 
-#: src/buddy.c:2597
+#: src/buddy.c:2751
 msgid "View System Log"
 msgstr "Se systemlog"
 
-#: src/buddy.c:2609
+#: src/buddy.c:2763
 msgid "Perl"
 msgstr "Perl"
 
-#: src/buddy.c:2612
+#: src/buddy.c:2766
 msgid "Load Script"
 msgstr "bn skript"
 
-#: src/buddy.c:2616
+#: src/buddy.c:2770
 msgid "Unload All Scripts"
 msgstr "Luk alle skripts"
 
-#: src/buddy.c:2620
+#: src/buddy.c:2774
 msgid "List Scripts"
 msgstr "Vis skripts"
 
-#: src/buddy.c:2628
+#: src/buddy.c:2782
 msgid "Help"
 msgstr "Hjlp"
 
-#: src/buddy.c:2633
+#: src/buddy.c:2787
+#, fuzzy
+msgid "Online Help"
+msgstr "Logget ind"
+
+#: src/buddy.c:2788
+#, fuzzy
+msgid "Debug Window"
+msgstr "Vis fejlsgningsvindue"
+
+#: src/buddy.c:2789
 msgid "About Gaim"
 msgstr "Om Gaim"
 
-#: src/buddy.c:2652 src/prefs.c:2891
+#: src/buddy.c:2807 src/prefs.c:2905
 msgid "Buddy List"
 msgstr "Venne-liste"
 
-#: src/buddy.c:2705
+#: src/buddy.c:2860
 msgid "Add a new Buddy"
 msgstr "Tilfj en ven"
 
-#: src/buddy.c:2706
+#: src/buddy.c:2861
 msgid "Add a new Group"
 msgstr "Tilfj en gruppe"
 
-#: src/buddy.c:2707
+#: src/buddy.c:2862
 msgid "Remove selected Buddy/Group"
 msgstr "Slet markeret ven/gruppe"
 
-#: src/buddy.c:2734
+#: src/buddy.c:2889
 msgid "Edit Buddies"
 msgstr "Redigr liste"
 
-#: src/buddy.c:2777
+#: src/buddy.c:2932
 msgid "Gaim - Buddy List"
 msgstr "Gaim - Mine venner"
 
@@ -1499,21 +2005,17 @@
 msgid "Join Chat"
 msgstr "Deltag i chat"
 
-#: src/buddy_chat.c:272
-msgid "Buddy Chat"
-msgstr "Venne-chat"
-
 #: src/buddy_chat.c:283
 msgid "Join Chat As:"
 msgstr "Deltag i chat som:"
 
-#: src/buddy_chat.c:304 src/buddy_chat.c:392 src/dialogs.c:450
-#: src/dialogs.c:540 src/dialogs.c:715 src/dialogs.c:773 src/dialogs.c:892
-#: src/dialogs.c:1068 src/dialogs.c:1431 src/dialogs.c:1636 src/dialogs.c:1760
-#: src/dialogs.c:1820 src/dialogs.c:2042 src/dialogs.c:2224 src/dialogs.c:2399
-#: src/dialogs.c:2470 src/dialogs.c:3166 src/dialogs.c:3418 src/dialogs.c:3599
-#: src/dialogs.c:3970 src/dialogs.c:4076 src/dialogs.c:4735 src/multi.c:769
-#: src/multi.c:899 src/prpl.c:150 src/prpl.c:224
+#: src/buddy_chat.c:304 src/buddy_chat.c:392 src/dialogs.c:449
+#: src/dialogs.c:539 src/dialogs.c:715 src/dialogs.c:816 src/dialogs.c:934
+#: src/dialogs.c:1110 src/dialogs.c:1473 src/dialogs.c:1678 src/dialogs.c:1802
+#: src/dialogs.c:1862 src/dialogs.c:2084 src/dialogs.c:2266 src/dialogs.c:2441
+#: src/dialogs.c:2512 src/dialogs.c:3208 src/dialogs.c:3460 src/dialogs.c:3641
+#: src/dialogs.c:4012 src/dialogs.c:4118 src/dialogs.c:4777 src/multi.c:781
+#: src/multi.c:911 src/prpl.c:150 src/prpl.c:224
 msgid "Cancel"
 msgstr "Annullr"
 
@@ -1521,16 +2023,16 @@
 msgid "Join"
 msgstr "Deltag"
 
-#: src/buddy_chat.c:393 src/buddy_chat.c:396 src/buddy_chat.c:1317
-#: src/buddy_chat.c:1407
+#: src/buddy_chat.c:393 src/buddy_chat.c:396 src/buddy_chat.c:1328
+#: src/buddy_chat.c:1418
 msgid "Invite"
 msgstr "Invitr"
 
-#: src/buddy_chat.c:412 src/dialogs.c:1259 src/dialogs.c:3426
+#: src/buddy_chat.c:412 src/dialogs.c:1301 src/dialogs.c:3468
 msgid "Buddy"
 msgstr "Ven"
 
-#: src/buddy_chat.c:417 src/prefs.c:1992
+#: src/buddy_chat.c:417 src/prefs.c:2004
 msgid "Message"
 msgstr "Besked"
 
@@ -1538,286 +2040,282 @@
 msgid "Gaim - Invite Buddy Into Chat Room"
 msgstr "Gaim - Invitr ven med i chat-rum"
 
-#: src/buddy_chat.c:857
+#: src/buddy_chat.c:868
 msgid "Un-Ignore"
 msgstr "Ignorr ikke"
 
-#: src/buddy_chat.c:859 src/buddy_chat.c:1271
+#: src/buddy_chat.c:870 src/buddy_chat.c:1282
 msgid "Ignore"
 msgstr "Ignorr"
 
 #. don't remove them from ignored in case they re-enter
-#: src/buddy_chat.c:922 src/buddy_chat.c:1034 src/buddy_chat.c:1497
-#: src/buddy_chat.c:1530
+#: src/buddy_chat.c:933 src/buddy_chat.c:1045 src/buddy_chat.c:1508
+#: src/buddy_chat.c:1541
 #, c-format
 msgid "%d %s in room"
 msgstr "%d %s i rum"
 
-#: src/buddy_chat.c:930
+#: src/buddy_chat.c:941
 #, c-format
 msgid "%s entered the room."
 msgstr "%s er nu i rummet"
 
-#: src/buddy_chat.c:996
+#: src/buddy_chat.c:1007
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s kalder sig nu for %s"
 
-#: src/buddy_chat.c:1043
+#: src/buddy_chat.c:1054
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s forlod rummet (%s)."
 
-#: src/buddy_chat.c:1045
+#: src/buddy_chat.c:1056
 #, c-format
 msgid "%s left the room."
 msgstr "%s forlod rummet."
 
-#: src/buddy_chat.c:1144
+#: src/buddy_chat.c:1155
 msgid "Gaim - Group Chats"
 msgstr "Gaim - Gruppe-chats"
 
-#: src/buddy_chat.c:1207
+#: src/buddy_chat.c:1218
 msgid "Topic:"
 msgstr "Emne:"
 
-#: src/buddy_chat.c:1248
+#: src/buddy_chat.c:1259
 msgid "0 people in room"
 msgstr "Ingen chattere i rummet"
 
-#: src/buddy_chat.c:1322 src/buddy_chat.c:1406
+#: src/buddy_chat.c:1333 src/buddy_chat.c:1417
 msgid "Whisper"
 msgstr "Hvisk"
 
-#: src/buddy_chat.c:1327 src/buddy_chat.c:1404 src/buddy_chat.c:1453
-#: src/conversation.c:2786
+#: src/buddy_chat.c:1338 src/buddy_chat.c:1415 src/buddy_chat.c:1464
+#: src/conversation.c:2908
 msgid "Send"
 msgstr "Send"
 
-#: src/buddy_chat.c:1447 src/conversation.c:2763
+#: src/buddy_chat.c:1458 src/conversation.c:2885
 msgid "Block"
 msgstr "Ignorr"
 
-#: src/buddy_chat.c:1449 src/conversation.c:2769 src/dialogs.c:425
-#: src/dialogs.c:454
+#: src/buddy_chat.c:1460 src/conversation.c:2891 src/dialogs.c:424
+#: src/dialogs.c:453
 msgid "Warn"
 msgstr "Advar"
 
-#: src/conversation.c:405
+#: src/conversation.c:431
 msgid "Gaim - Save Conversation"
 msgstr "Gaim - Gem samtale"
 
-#: src/conversation.c:466
+#: src/conversation.c:492
 msgid "Gaim - Insert Image"
 msgstr "Gaim - Indst billede"
 
-#: src/conversation.c:1225
+#: src/conversation.c:1336
 msgid "Unable to send message: too large"
 msgstr "Kunne ikke sende besked: For lang"
 
-#: src/conversation.c:1225 src/conversation.c:1229
+#: src/conversation.c:1336 src/conversation.c:1340
 msgid "Message Error"
 msgstr "Besked-fejl"
 
-#: src/conversation.c:1229
+#: src/conversation.c:1340
 msgid "Unable to send message: Unknown reason"
 msgstr "Kunne ikke sende besked af ukendte rsager"
 
-#: src/conversation.c:1448
+#: src/conversation.c:1559
 #, c-format
 msgid "Currently at %d, "
 msgstr "Netop nu: %d,"
 
-#: src/conversation.c:1456
+#: src/conversation.c:1567
 #, c-format
 msgid "Setting position to %d\n"
 msgstr "Flytter position til %d\n"
 
-#: src/conversation.c:2057 src/prefs.c:1305
+#: src/conversation.c:2170 src/prefs.c:1308
 msgid "Bold Text"
 msgstr "Fed tekst"
 
-#: src/conversation.c:2057
+#: src/conversation.c:2170
 msgid "Bold"
 msgstr "Fed"
 
-#: src/conversation.c:2061
+#: src/conversation.c:2174
 msgid "Italics Text"
 msgstr "Kursiv tekst"
 
-#: src/conversation.c:2062
+#: src/conversation.c:2175
 msgid "Italics"
 msgstr "Kursiv"
 
-#: src/conversation.c:2065 src/prefs.c:1317
+#: src/conversation.c:2178 src/prefs.c:1320
 msgid "Underline Text"
 msgstr "Understreget tekst"
 
-#: src/conversation.c:2066
+#: src/conversation.c:2179
 msgid "Underline"
 msgstr "Understregning"
 
-#: src/conversation.c:2070 src/prefs.c:1323
+#: src/conversation.c:2183 src/prefs.c:1326
 msgid "Strike through Text"
 msgstr "Gennemstreget tekst"
 
-#: src/conversation.c:2070
+#: src/conversation.c:2183
 msgid "Strike"
 msgstr "Gennemstregning"
 
-#: src/conversation.c:2076
+#: src/conversation.c:2189
 msgid "Decrease font size"
 msgstr "Mindre skrift"
 
-#: src/conversation.c:2076
+#: src/conversation.c:2189
 msgid "Small"
 msgstr "Lille"
 
-#: src/conversation.c:2079
+#: src/conversation.c:2192
 msgid "Normal font size"
 msgstr "Normal skriftstrrelse"
 
-#: src/conversation.c:2079
+#: src/conversation.c:2192
 msgid "Normal"
 msgstr "Normal"
 
-#: src/conversation.c:2082
+#: src/conversation.c:2195
 msgid "Increase font size"
 msgstr "Strre skrift"
 
-#: src/conversation.c:2082
+#: src/conversation.c:2195
 msgid "Big"
 msgstr "Stor"
 
-#: src/conversation.c:2089 src/dialogs.c:2841 src/dialogs.c:2865
+#: src/conversation.c:2202 src/dialogs.c:2883 src/dialogs.c:2907
 msgid "Select Font"
 msgstr "Vlg skrifttype"
 
-#: src/conversation.c:2090
+#: src/conversation.c:2203
 msgid "Font"
 msgstr "Skrifttype"
 
-#: src/conversation.c:2093 src/prefs.c:1353
+#: src/conversation.c:2206 src/prefs.c:1356
 msgid "Text Color"
 msgstr "Tekstfarve"
 
-#: src/conversation.c:2094 src/conversation.c:2098
+#: src/conversation.c:2207 src/conversation.c:2211
 msgid "Color"
 msgstr "Farve"
 
-#: src/conversation.c:2098 src/prefs.c:1371
+#: src/conversation.c:2211 src/prefs.c:1374
 msgid "Background Color"
 msgstr "Baggrundsfarve"
 
-#: src/conversation.c:2105 src/dialogs.c:2464
+#: src/conversation.c:2218 src/dialogs.c:2506
 msgid "Insert Link"
 msgstr "Indst lnke"
 
-#: src/conversation.c:2106
+#: src/conversation.c:2219
 msgid "Link"
 msgstr "Lnke"
 
-#: src/conversation.c:2109
+#: src/conversation.c:2222
 msgid "Insert smiley face"
 msgstr "Indst humr-ansigt"
 
-#: src/conversation.c:2109
+#: src/conversation.c:2222
 msgid "Smiley"
 msgstr "Humr-ansigt"
 
-#: src/conversation.c:2112
+#: src/conversation.c:2225
 msgid "Insert IM Image"
 msgstr "Indst billede"
 
-#: src/conversation.c:2112
+#: src/conversation.c:2225
 msgid "Image"
 msgstr "Billede"
 
-#: src/conversation.c:2119
+#: src/conversation.c:2232
 msgid "Enable logging"
 msgstr "Registrr i logfil"
 
-#: src/conversation.c:2120 src/prefs.c:254
+#: src/conversation.c:2233 src/prefs.c:254
 msgid "Logging"
 msgstr "Logger"
 
-#: src/conversation.c:2129
+#: src/conversation.c:2242
 msgid "Save Conversation"
 msgstr "Gem samtale"
 
-#: src/conversation.c:2130 src/dialogs.c:1640 src/dialogs.c:1824
-#: src/dialogs.c:3178 src/dialogs.c:3866 src/dialogs.c:4743
+#: src/conversation.c:2243 src/dialogs.c:1682 src/dialogs.c:1866
+#: src/dialogs.c:3220 src/dialogs.c:3908 src/dialogs.c:4785
 msgid "Save"
 msgstr "Gem"
 
-#: src/conversation.c:2134
-msgid "Enable sounds"
-msgstr "Brug lyde"
-
-#: src/conversation.c:2135
+#: src/conversation.c:2247 src/conversation.c:2248
 msgid "Sound"
 msgstr "Lyd"
 
-#: src/conversation.c:2615
+#: src/conversation.c:2729
 msgid "Gaim - Conversations"
 msgstr "Gaim - Samtaler"
 
-#: src/conversation.c:2702
+#: src/conversation.c:2816
 msgid "Send message as: "
 msgstr "Send besked som:"
 
-#: src/conversation.c:3318
+#: src/conversation.c:3453
 msgid "Gaim - Save Icon"
 msgstr "Gaim - Gem ikon"
 
-#: src/conversation.c:3345
+#: src/conversation.c:3487
 msgid "Disable Animation"
 msgstr "Brug ikke animation"
 
-#: src/conversation.c:3350
+#: src/conversation.c:3492
 msgid "Enable Animation"
 msgstr "Brug animation"
 
-#: src/conversation.c:3356
+#: src/conversation.c:3498
 msgid "Hide Icon"
 msgstr "Skjul ikon"
 
-#: src/conversation.c:3362
+#: src/conversation.c:3504
 msgid "Save Icon As..."
 msgstr "Gem ikon som..."
 
-#: src/dialogs.c:413
+#: src/dialogs.c:412
 msgid "Gaim - Warn user?"
 msgstr "Gaim - Advar bruger?"
 
-#: src/dialogs.c:433
+#: src/dialogs.c:432
 #, c-format
 msgid "Do you really want to warn %s?"
 msgstr "Er du sikker p at du vil advare %s?"
 
-#: src/dialogs.c:438
+#: src/dialogs.c:437
 msgid "Warn anonymously?"
 msgstr "Advar anonymt?"
 
-#: src/dialogs.c:442
+#: src/dialogs.c:441
 msgid "Anonymous warnings are less harsh."
 msgstr "Anonyme advarsler er mindre grove."
 
-#: src/dialogs.c:470
+#: src/dialogs.c:469
 #, c-format
 msgid "Removing '%s' from buddylist.\n"
 msgstr "Sletter %s fra venne-liste.\n"
 
-#: src/dialogs.c:495
+#: src/dialogs.c:494
 #, c-format
 msgid "Gaim - Remove %s?"
 msgstr "Gaim - Slet %s?"
 
-#: src/dialogs.c:508
+#: src/dialogs.c:507
 msgid "Remove Buddy"
 msgstr "Slet ven"
 
-#: src/dialogs.c:518
+#: src/dialogs.c:517
 #, c-format
 msgid ""
 "You are about to remove '%s' from\n"
@@ -1826,14 +2324,14 @@
 "Du er ved at slette %s fra din\n"
 "venneliste. Vil du fortstte?"
 
-#: src/dialogs.c:530 src/prpl.c:154 src/prpl.c:228
+#: src/dialogs.c:529 src/prpl.c:154 src/prpl.c:228
 msgid "Accept"
 msgstr "Acceptr"
 
 #. Build OK Button
-#: src/dialogs.c:637 src/dialogs.c:720 src/dialogs.c:778 src/dialogs.c:1435
-#: src/dialogs.c:1764 src/dialogs.c:1915 src/dialogs.c:2223 src/dialogs.c:2403
-#: src/dialogs.c:2469 src/dialogs.c:3975 src/dialogs.c:4081 src/multi.c:774
+#: src/dialogs.c:635 src/dialogs.c:720 src/dialogs.c:821 src/dialogs.c:1477
+#: src/dialogs.c:1806 src/dialogs.c:1957 src/dialogs.c:2265 src/dialogs.c:2445
+#: src/dialogs.c:2511 src/dialogs.c:4017 src/dialogs.c:4123 src/multi.c:786
 msgid "OK"
 msgstr "O.k."
 
@@ -1845,338 +2343,343 @@
 msgid "IM who:"
 msgstr "Besked til:"
 
-#: src/dialogs.c:756
+#: src/dialogs.c:768
 msgid "User:"
 msgstr "Bruger:"
 
+#: src/dialogs.c:777
+#, fuzzy
+msgid "Account:"
+msgstr "Konto"
+
 #. Finish up
-#: src/dialogs.c:783
+#: src/dialogs.c:826
 msgid "Gaim - Get User Info"
 msgstr "Gaim - Se brugeroplysninger"
 
-#: src/dialogs.c:898
+#: src/dialogs.c:940
 msgid "Add Group"
 msgstr "Tilfj gruppe"
 
-#: src/dialogs.c:923
+#: src/dialogs.c:965
 msgid "Gaim - Add Group"
 msgstr "Gaim - Tilfj gruppe"
 
-#: src/dialogs.c:1007
+#: src/dialogs.c:1049
 msgid "Gaim - Add Buddy"
 msgstr "Gaim - Tilfj ven"
 
-#: src/dialogs.c:1019
+#: src/dialogs.c:1061
 msgid "Add Buddy"
 msgstr "Tilfj ven"
 
-#: src/dialogs.c:1029
+#: src/dialogs.c:1071
 msgid "Contact"
 msgstr "Kontakt"
 
 #. Set up stuff for the account box
-#: src/dialogs.c:1055
+#: src/dialogs.c:1097
 msgid "Add To"
 msgstr "Tilfj til"
 
-#: src/dialogs.c:1092
+#: src/dialogs.c:1134
 msgid "Please enter a buddy to pounce."
 msgstr "Hvem vil du sende en handling ved logind?"
 
-#: src/dialogs.c:1092
+#: src/dialogs.c:1134
 msgid "Buddy Pounce Error"
 msgstr "Fejl ved udfrsel af handling"
 
-#: src/dialogs.c:1228
+#: src/dialogs.c:1270
 msgid "Gaim - New Buddy Pounce"
 msgstr "Gaim - Ny handling"
 
 #. <pounce type="who">
-#: src/dialogs.c:1239
+#: src/dialogs.c:1281
 msgid "Pounce Who"
 msgstr "Hvem vil du vente p:"
 
-#: src/dialogs.c:1250
+#: src/dialogs.c:1292
 msgid "Account"
 msgstr "Konto"
 
 #. </pounce type="who">
 #. <pounce type="when">
-#: src/dialogs.c:1276
+#: src/dialogs.c:1318
 msgid "Pounce When"
 msgstr "Hvornr skal handlingen udfres:"
 
-#: src/dialogs.c:1286
+#: src/dialogs.c:1328
 msgid "Pounce on sign on"
 msgstr "Nr ven logger ind"
 
-#: src/dialogs.c:1295
+#: src/dialogs.c:1337
 msgid "Pounce on return from away"
 msgstr "Nr ikke lngere fravrende"
 
-#: src/dialogs.c:1304
+#: src/dialogs.c:1346
 msgid "Pounce on return from idle"
 msgstr "Nr ven bliver aktiv igen"
 
-#: src/dialogs.c:1313
+#: src/dialogs.c:1355
 msgid "Pounce when buddy is typing to you"
 msgstr "Nr ven skriver til dig"
 
 #. </pounce type="when">
 #. <pounce type="action">
-#: src/dialogs.c:1323
+#: src/dialogs.c:1365
 msgid "Pounce Action"
 msgstr "Hvad skal der ske:"
 
-#: src/dialogs.c:1334
+#: src/dialogs.c:1376
 msgid "Open IM Window"
 msgstr "bn besked-vindue"
 
-#: src/dialogs.c:1343
+#: src/dialogs.c:1385
 msgid "Popup Notification"
 msgstr "Vis besked"
 
-#: src/dialogs.c:1352
+#: src/dialogs.c:1394
 msgid "Send Message"
 msgstr "Send besked"
 
-#: src/dialogs.c:1373
+#: src/dialogs.c:1415
 msgid "Execute command on pounce"
 msgstr "Udfr kommando"
 
-#: src/dialogs.c:1395
+#: src/dialogs.c:1437
 msgid "Play sound on pounce"
 msgstr "Afspil lyd"
 
 #. </pounce type="action">
-#: src/dialogs.c:1417
+#: src/dialogs.c:1459
 msgid "Save this pounce after activation"
 msgstr "Gem denne handling til senere brug"
 
-#: src/dialogs.c:1503
+#: src/dialogs.c:1545
 msgid "Gaim - Set Dir Info"
 msgstr "Gaim - Ret kataloginformation"
 
-#: src/dialogs.c:1512
+#: src/dialogs.c:1554
 msgid "Directory Info"
 msgstr "Kataloginformation"
 
-#: src/dialogs.c:1534
+#: src/dialogs.c:1576
 msgid "Allow Web Searches To Find Your Info"
 msgstr "Tillad netsgninger at finde information om dig"
 
 #. Line 1
-#: src/dialogs.c:1537 src/dialogs.c:2242
+#: src/dialogs.c:1579 src/dialogs.c:2284
 msgid "First Name"
 msgstr "Fornavn"
 
 #. Line 2
-#: src/dialogs.c:1548 src/dialogs.c:2254
+#: src/dialogs.c:1590 src/dialogs.c:2296
 msgid "Middle Name"
 msgstr "Mellemnavn"
 
 #. Line 3
-#: src/dialogs.c:1560 src/dialogs.c:2266
+#: src/dialogs.c:1602 src/dialogs.c:2308
 msgid "Last Name"
 msgstr "Efternavn"
 
 #. Line 4
-#: src/dialogs.c:1571 src/dialogs.c:2278
+#: src/dialogs.c:1613 src/dialogs.c:2320
 msgid "Maiden Name"
 msgstr "Dbsnavn"
 
 #. Line 6
-#: src/dialogs.c:1593 src/dialogs.c:2301
+#: src/dialogs.c:1635 src/dialogs.c:2343
 msgid "State"
 msgstr "Landsdel"
 
-#: src/dialogs.c:1658
+#: src/dialogs.c:1700
 msgid "New Passwords Do Not Match"
 msgstr "Adgangskoder er ikke ens"
 
-#: src/dialogs.c:1658 src/dialogs.c:1663
+#: src/dialogs.c:1700 src/dialogs.c:1705
 msgid "Gaim - Change Password Error"
 msgstr "Gaim - Fejl ved skift af adgangskode"
 
-#: src/dialogs.c:1663
+#: src/dialogs.c:1705
 msgid "Fill out all fields completely"
 msgstr "Udfyld alle felter ordentligt"
 
-#: src/dialogs.c:1718
+#: src/dialogs.c:1760
 msgid "Original Password"
 msgstr "Oprindelig adgangskode"
 
-#: src/dialogs.c:1732
+#: src/dialogs.c:1774
 msgid "New Password"
 msgstr "Ny adgangskode"
 
-#: src/dialogs.c:1746
+#: src/dialogs.c:1788
 msgid "New Password (again)"
 msgstr "Ny adgangskode (igen)"
 
-#: src/dialogs.c:1787
+#: src/dialogs.c:1829
 msgid "Gaim - Set User Info"
 msgstr "Gaim - Ret brugerinformation"
 
-#: src/dialogs.c:1899
+#: src/dialogs.c:1941
 msgid "Below are the results of your search: "
 msgstr "Her er resultatet af din sgning:"
 
-#: src/dialogs.c:2032 src/dialogs.c:2039
+#: src/dialogs.c:2074 src/dialogs.c:2081
 msgid "Permit"
 msgstr "Tillad"
 
-#: src/dialogs.c:2034 src/dialogs.c:2041
+#: src/dialogs.c:2076 src/dialogs.c:2083
 msgid "Deny"
 msgstr "Ignorr"
 
-#: src/dialogs.c:2078
+#: src/dialogs.c:2120
 msgid "Gaim - Add Permit"
 msgstr "Gaim - Tilfj tilladelse"
 
-#: src/dialogs.c:2080
+#: src/dialogs.c:2122
 msgid "Gaim - Add Deny"
 msgstr "Gaim - Ignorr fra nu af"
 
-#: src/dialogs.c:2140
+#: src/dialogs.c:2182
 msgid "Gaim - Log Conversation"
 msgstr "Gaim - "
 
-#: src/dialogs.c:2218 src/dialogs.c:2381
+#: src/dialogs.c:2260 src/dialogs.c:2423
 msgid "Search for Buddy"
 msgstr "Sg efter ven"
 
-#: src/dialogs.c:2346
+#: src/dialogs.c:2388
 msgid "Gaim - Find Buddy By Info"
 msgstr "Gaim - Find ven udfra information"
 
-#: src/dialogs.c:2375
+#: src/dialogs.c:2417
 msgid "Gaim - Find Buddy By Email"
 msgstr "Gaim - Find ven udfra e-post adresse"
 
-#: src/dialogs.c:2515
+#: src/dialogs.c:2557
 msgid "Gaim - Add URL"
 msgstr "Gaim - Tilfj hjemmesideadresse"
 
-#: src/dialogs.c:2666 src/dialogs.c:2687 src/dialogs.c:2741
+#: src/dialogs.c:2708 src/dialogs.c:2729 src/dialogs.c:2783
 msgid "Select Text Color"
 msgstr "Vlg tekstfarve"
 
-#: src/dialogs.c:2720
+#: src/dialogs.c:2762
 msgid "Select Background Color"
 msgstr "Vlg baggrundsfarve"
 
-#: src/dialogs.c:2942
+#: src/dialogs.c:2984
 msgid "Import to:"
 msgstr "Importr til:"
 
-#: src/dialogs.c:2966
+#: src/dialogs.c:3008
 msgid "Gaim - Import Buddy List"
 msgstr "Gaim - Importr venne-liste"
 
 #. We shouldn't allow a blank title
-#: src/dialogs.c:3033
+#: src/dialogs.c:3075
 msgid "You cannot create an away message with a blank title"
 msgstr "Du kan ikke lave en fravrsbesked uden en titel"
 
 #. We shouldn't allow a blank message
-#: src/dialogs.c:3040
+#: src/dialogs.c:3082
 msgid "You cannot create an empty away message"
 msgstr "Du kan ikke lave en tom fravrsbesked"
 
-#: src/dialogs.c:3108
+#: src/dialogs.c:3150
 msgid "Gaim - New away message"
 msgstr "Gaim - Ny fravrsbesked"
 
-#: src/dialogs.c:3118
+#: src/dialogs.c:3160
 msgid "New away message"
 msgstr "Ny fravrsbesked"
 
-#: src/dialogs.c:3131
+#: src/dialogs.c:3173
 msgid "Away title: "
 msgstr "Titel:"
 
-#: src/dialogs.c:3170
+#: src/dialogs.c:3212
 msgid "Use"
 msgstr "Brug"
 
-#: src/dialogs.c:3174
+#: src/dialogs.c:3216
 msgid "Save & Use"
 msgstr "Gem og brug"
 
 #. show everything
-#: src/dialogs.c:3372
+#: src/dialogs.c:3413
 msgid "Smile!"
 msgstr "Smil!"
 
-#: src/dialogs.c:3424
+#: src/dialogs.c:3466
 msgid "Alias Buddy"
 msgstr "Lav alias for ven"
 
-#: src/dialogs.c:3457
+#: src/dialogs.c:3499
 msgid "Gaim - Alias Buddy"
 msgstr "Gaim - Lav alias for ven"
 
-#: src/dialogs.c:3529
+#: src/dialogs.c:3571
 msgid "Gaim - Save Log File"
 msgstr "Gaim - Gem logfil"
 
-#: src/dialogs.c:3561
+#: src/dialogs.c:3603
 #, c-format
 msgid "Unable to remove file %s - %s"
 msgstr "Kunne ikke slette filen %s - %s"
 
-#: src/dialogs.c:3589
+#: src/dialogs.c:3631
 msgid "Really clear log?"
 msgstr "Er du sikker p at du vil slette loggen?"
 
-#: src/dialogs.c:3604
+#: src/dialogs.c:3646
 msgid "Okay"
 msgstr "O.k."
 
-#: src/dialogs.c:3775
+#: src/dialogs.c:3817
 msgid "Date"
 msgstr "Dato"
 
-#: src/dialogs.c:3838
+#: src/dialogs.c:3880
 msgid "Conversation"
 msgstr "Samtale"
 
-#: src/dialogs.c:3861
+#: src/dialogs.c:3903
 msgid "Clear"
 msgstr "Ryd"
 
-#: src/dialogs.c:3939
+#: src/dialogs.c:3981
 msgid "Gaim - Rename Group"
 msgstr "Gaim - Omdb gruppe"
 
-#: src/dialogs.c:3949
+#: src/dialogs.c:3991
 msgid "Rename Group"
 msgstr "Omdb gruppe"
 
-#: src/dialogs.c:3956 src/dialogs.c:4062
+#: src/dialogs.c:3998 src/dialogs.c:4104
 msgid "New name:"
 msgstr "Nyt navn:"
 
-#: src/dialogs.c:4045
+#: src/dialogs.c:4087
 msgid "Gaim - Rename Buddy"
 msgstr "Gaim - Omdb ven"
 
-#: src/dialogs.c:4055
+#: src/dialogs.c:4097
 msgid "Rename Buddy"
 msgstr "Omdb ven"
 
 #. Below is basically stolen from plugins.c
-#: src/dialogs.c:4139
+#: src/dialogs.c:4181
 msgid "Gaim - Select Perl Script"
 msgstr "Gaim - Vlg Perl-skript"
 
-#: src/gaimrc.c:1117
+#: src/gaimrc.c:1136
 #, c-format
 msgid "Could not open config file %s."
 msgstr "Kunne ikke bne konfigurationsfilen %s."
 
-#: src/gaimrc.c:1118
+#: src/gaimrc.c:1137
 msgid "Preferences Error"
 msgstr "Fejl i indstillinger"
 
@@ -2189,55 +2692,65 @@
 msgid "g003: Error opening connection.\n"
 msgstr "g003: Fejl ved oprettelse af forbindelse\n"
 
-#: src/multi.c:452
+#: src/module.c:106 src/module.c:112 src/module.c:122
+#, fuzzy
+msgid "Plugin Error"
+msgstr "Fejl ved logind"
+
+#: src/multi.c:454
 msgid "Gaim - Load Buddy Icon"
 msgstr "Gaim - Hent venne-ikon"
 
-#: src/multi.c:495
+#: src/multi.c:497
 msgid "Buddy Icon File:"
 msgstr "Ikonfil:"
 
-#: src/multi.c:506
+#: src/multi.c:508
 msgid "Browse"
 msgstr "Gennemse"
 
-#: src/multi.c:511 src/prefs.c:1545
+#: src/multi.c:513 src/prefs.c:1548
 msgid "Reset"
 msgstr "Nulstil"
 
-#: src/multi.c:538
+#: src/multi.c:540
 msgid "Screenname:"
 msgstr "Brugernavn:"
 
-#: src/multi.c:558
+#: src/multi.c:559
+#, fuzzy
+msgid "Alias:"
+msgstr "Alias"
+
+#: src/multi.c:569
 msgid "Protocol:"
 msgstr "Protokol:"
 
-#: src/multi.c:563
+#: src/multi.c:574
 msgid "Remember Password"
 msgstr "Husk adgangskode"
 
-#: src/multi.c:564
+#: src/multi.c:575
 msgid "Auto-Login"
 msgstr "Auto-logind"
 
-#: src/multi.c:604
+#: src/multi.c:616
 msgid "New Mail Notifications"
 msgstr "Pmindelser om ny post"
 
-#: src/multi.c:694
+#: src/multi.c:706
 msgid "Register with server"
 msgstr "Registrr p server"
 
-#: src/multi.c:752
+#: src/multi.c:764
 msgid "Gaim - Modify Account"
 msgstr "Gaim - Ret konto"
 
-#: src/multi.c:871
+#: src/multi.c:883
 msgid "Enter Password"
 msgstr "Indtast adgangskode"
 
-#: src/multi.c:935
+#: src/multi.c:947
 msgid ""
 "You cannot log this account in; you do not have the protocol it uses loaded, "
 "or the protocol does not have a login function."
@@ -2245,44 +2758,44 @@
 "Du kan ikke logge ind med denne konto, da du ikke har indlst den protokol, "
 "der skal bruges eller ogs har denne protokol ingen logind-funktion."
 
-#: src/multi.c:937
+#: src/multi.c:949
 msgid "Login Error"
 msgstr "Fejl ved logind"
 
-#: src/multi.c:966
+#: src/multi.c:978
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "Er du sikker p at du vil slette %s?"
 
-#: src/multi.c:1003
+#: src/multi.c:1015
 msgid "Gaim - Account Editor"
 msgstr "Gaim - Ret konto"
 
-#: src/multi.c:1022
+#: src/multi.c:1034
 msgid "Select All"
 msgstr "Vlg alle"
 
-#: src/multi.c:1027
+#: src/multi.c:1039
 msgid "Select Autos"
 msgstr "Vlg auto-logind"
 
-#: src/multi.c:1031
+#: src/multi.c:1043
 msgid "Select None"
 msgstr "Vlg ingen"
 
-#: src/multi.c:1045
+#: src/multi.c:1057
 msgid "Modify"
 msgstr "Ret"
 
-#: src/multi.c:1049
+#: src/multi.c:1061
 msgid "Sign On/Off"
 msgstr "Log ind/ud"
 
-#: src/multi.c:1053
+#: src/multi.c:1065
 msgid "Delete"
 msgstr "Slet"
 
-#: src/multi.c:1368
+#: src/multi.c:1380
 #, c-format
 msgid ""
 "%s\n"
@@ -2291,25 +2804,25 @@
 "%s\n"
 "%s: %s"
 
-#: src/multi.c:1387
+#: src/multi.c:1399
 #, c-format
 msgid "%s was unable to sign on"
 msgstr "%s kunne ikke logge ind"
 
-#: src/multi.c:1398
+#: src/multi.c:1410
 msgid "Notice"
 msgstr "Bemrk!"
 
-#: src/multi.c:1408
+#: src/multi.c:1420
 #, c-format
 msgid "%s has been signed off"
 msgstr "%s er logget ud"
 
-#: src/multi.c:1409
+#: src/multi.c:1421
 msgid "Connection Error"
 msgstr "Forbindelsesfejl"
 
-#: src/perl.c:856
+#: src/perl.c:875
 msgid "Perl Scripts"
 msgstr "Perl-skripter"
 
@@ -2370,9 +2883,9 @@
 msgid "General Options"
 msgstr "Generelle indstillinger"
 
-#: src/prefs.c:200 src/prefs.c:383 src/prefs.c:551 src/prefs.c:665
-#: src/prefs.c:918 src/prefs.c:1068 src/prefs.c:1293 src/prefs.c:1615
-#: src/prefs.c:1889 src/prefs.c:2322
+#: src/prefs.c:200 src/prefs.c:384 src/prefs.c:552 src/prefs.c:667
+#: src/prefs.c:921 src/prefs.c:1071 src/prefs.c:1296 src/prefs.c:1629
+#: src/prefs.c:1901 src/prefs.c:2334
 msgid "All options take effect immediately unless otherwise noted."
 msgstr "ndringer bliver aktive jeblikkeligt, medmindre andet er beskrevet."
 
@@ -2446,8 +2959,8 @@
 msgstr "Netlser/browser"
 
 #: src/prefs.c:291
-msgid "KFM"
-msgstr "KFM"
+msgid "Konqueror"
+msgstr ""
 
 #: src/prefs.c:292
 msgid "Opera"
@@ -2457,498 +2970,513 @@
 msgid "Netscape"
 msgstr "Netscape"
 
-#: src/prefs.c:296
+#: src/prefs.c:294
+msgid "Mozilla"
+msgstr ""
+
+#: src/prefs.c:297
 msgid "Pop up new window by default"
 msgstr "Start altid program i nyt vindue"
 
-#: src/prefs.c:303
+#: src/prefs.c:304
 msgid "GNOME URL Handler"
 msgstr "GNOME URL Behandler"
 
-#: src/prefs.c:305
+#: src/prefs.c:306
 msgid "Galeon"
 msgstr "Galeon"
 
-#: src/prefs.c:306
-msgid "Manual"
-msgstr "Andet program"
-
-#: src/prefs.c:375
+#: src/prefs.c:307
+#, c-format
+msgid "Manual (%s for URL)"
+msgstr ""
+
+#: src/prefs.c:376
 msgid "Proxy Options"
 msgstr "Indstillinger for mellemvrt (proxy)"
 
-#: src/prefs.c:387
+#: src/prefs.c:388
 msgid ""
-"Not all protocols can use these proxy options. Please see the README file for "
-"details."
+"Not all protocols can use these proxy options. Please see the README file "
+"for details."
 msgstr ""
 "Ikke alle protokoller kan bruge en mellemvrt (proxy). Ls README-filen for "
 "detaljer."
 
-#: src/prefs.c:392
+#: src/prefs.c:393
 msgid "Proxy Type"
 msgstr "Mellemvrtstype"
 
-#: src/prefs.c:404
+#: src/prefs.c:405
 msgid "Proxy Server"
 msgstr "Mellemvrt"
 
-#: src/prefs.c:407
+#: src/prefs.c:408
 msgid "No Proxy"
 msgstr "Ingen mellemvrt"
 
-#: src/prefs.c:419
+#: src/prefs.c:420
 msgid "SOCKS 4"
 msgstr "SOCKS 4"
 
-#: src/prefs.c:429
+#: src/prefs.c:430
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
-#: src/prefs.c:438
+#: src/prefs.c:439
 msgid "HTTP"
 msgstr "HTTP"
 
-#: src/prefs.c:462
+#: src/prefs.c:463
 msgid "Host"
 msgstr "Vrtsnavn"
 
-#: src/prefs.c:478
+#: src/prefs.c:479
 msgid "Port"
 msgstr "Port"
 
-#: src/prefs.c:495
+#: src/prefs.c:496
 msgid "User"
 msgstr "Brugernavn"
 
-#: src/prefs.c:511
+#: src/prefs.c:512
 msgid "Password"
 msgstr "Adgangskode"
 
-#: src/prefs.c:543
+#: src/prefs.c:544
 msgid "Buddy List Options"
 msgstr "Udseende"
 
-#: src/prefs.c:555
+#: src/prefs.c:556
 msgid "Buddy List Window"
 msgstr "Venne-liste"
 
-#: src/prefs.c:568
+#: src/prefs.c:569
 msgid "Tab Placement:"
 msgstr "Placering af faneblade"
 
-#: src/prefs.c:572 src/prefs.c:1001 src/prefs.c:1151
+#: src/prefs.c:573 src/prefs.c:1004 src/prefs.c:1154
 msgid "Top"
 msgstr "I toppen"
 
-#: src/prefs.c:573 src/prefs.c:1003 src/prefs.c:1153
+#: src/prefs.c:574 src/prefs.c:1006 src/prefs.c:1156
 msgid "Bottom"
 msgstr "I bunden"
 
-#: src/prefs.c:585
+#: src/prefs.c:586
 msgid "Hide IM/Info/Chat buttons"
 msgstr "Skjul besked/info/chat-knapperne"
 
-#: src/prefs.c:587
+#: src/prefs.c:588
 msgid "Automatically show buddy list on sign on"
 msgstr "Vis automatisk venne-listen efter logind"
 
-#: src/prefs.c:589
+#: src/prefs.c:590
 msgid "Display Buddy List near applet"
 msgstr "Vis venne-listen tt ved panelet"
 
-#: src/prefs.c:592
+#: src/prefs.c:593
 msgid "Save Window Size/Position"
 msgstr "Husk vinduets strrelse og placering"
 
-#: src/prefs.c:595
+#: src/prefs.c:596
 msgid "Show pictures on buttons"
 msgstr "Brug billeder p knapper"
 
 #: src/prefs.c:600
+msgid "Raise Buddy List on Signons and Signoffs"
+msgstr ""
+
+#: src/prefs.c:602
 msgid "Group Displays"
 msgstr "Visning af grupper"
 
-#: src/prefs.c:612
+#: src/prefs.c:614
 msgid "Hide groups with no online buddies"
 msgstr "Vis ikke gruppe, hvis ingen er logget ind"
 
-#: src/prefs.c:618
+#: src/prefs.c:620
 msgid "Show numbers in groups"
 msgstr "Vis tal for hver gruppe"
 
-#: src/prefs.c:620
+#: src/prefs.c:622
 msgid "Buddy Displays"
 msgstr "Visning af venner"
 
-#: src/prefs.c:632
+#: src/prefs.c:634
 msgid "Show buddy type icons"
 msgstr "Brug status-ikoner"
 
-#: src/prefs.c:633
+#: src/prefs.c:635
 msgid "Show warning levels"
 msgstr "Vis advarselsniveau"
 
-#: src/prefs.c:639
+#: src/prefs.c:641
 msgid "Show idle times"
 msgstr "Vis inaktiv tid"
 
-#: src/prefs.c:640
+#: src/prefs.c:642
 msgid "Grey idle buddies"
 msgstr "Vis inaktive venner med gr farve"
 
-#: src/prefs.c:657
+#: src/prefs.c:659
 msgid "Conversation Options"
 msgstr "Indstillinger for samtaler"
 
-#: src/prefs.c:669
+#: src/prefs.c:671
 msgid "Keyboard Options"
 msgstr "Genvejstaster"
 
-#: src/prefs.c:681
-msgid "Enter sends message"
-msgstr "ENTER sender besked"
-
-#: src/prefs.c:682
-msgid "Control-Enter sends message"
-msgstr "CTRL+ENTER sender besked"
-
 #: src/prefs.c:683
+msgid "Enter sends message"
+msgstr "ENTER sender besked"
+
+#: src/prefs.c:684
+msgid "Control-Enter sends message"
+msgstr "CTRL+ENTER sender besked"
+
+#: src/prefs.c:685
 msgid "Escape closes window"
 msgstr "ESC lukker vindue"
 
-#: src/prefs.c:689
+#: src/prefs.c:686
+#, fuzzy
+msgid "Control-W closes window"
+msgstr "ESC lukker vindue"
+
+#: src/prefs.c:692
 msgid "Control-{B/I/U/S} inserts HTML tags"
 msgstr "CTRL+{B/I/U/S} indstter HTML-koder"
 
-#: src/prefs.c:690
+#: src/prefs.c:693
 msgid "Control-(number) inserts smileys"
 msgstr "CTRL+nummer indstter humransigt"
 
-#: src/prefs.c:691
+#: src/prefs.c:694
 msgid "F2 toggles timestamp display"
 msgstr "F2 slr visning af tidspunkt til og fra"
 
-#: src/prefs.c:693
+#: src/prefs.c:696
 msgid "Display and General Options"
 msgstr "Diverse indstillinger"
 
-#: src/prefs.c:705
+#: src/prefs.c:708
 msgid "Show graphical smileys"
 msgstr "Vis grafiske humransigter"
 
-#: src/prefs.c:706
+#: src/prefs.c:709
 msgid "Show timestamp on messages"
 msgstr "Vis tidspunkt i beskeder"
 
-#: src/prefs.c:707
+#: src/prefs.c:710
 msgid "Show URLs as links"
 msgstr "Vis URLer som henvisninger"
 
-#: src/prefs.c:708
+#: src/prefs.c:711
 msgid "Highlight misspelled words"
 msgstr "Fremhv forkert stavede ord"
 
-#: src/prefs.c:709 src/prefs.c:1911
+#: src/prefs.c:712 src/prefs.c:1923
 msgid "Sending messages removes away status"
 msgstr "Beskedafsendelse ophver fravrsstatus"
 
-#: src/prefs.c:710 src/prefs.c:1924
+#: src/prefs.c:713 src/prefs.c:1936
 msgid "Queue new messages when away"
 msgstr "St nye beskeder i k under fravr"
 
-#: src/prefs.c:716
+#: src/prefs.c:719
 msgid "Ignore colors"
 msgstr "Ignorr farver"
 
-#: src/prefs.c:717
+#: src/prefs.c:720
 msgid "Ignore font faces"
 msgstr "Ignrer skrifttyper"
 
-#: src/prefs.c:718
+#: src/prefs.c:721
 msgid "Ignore font sizes"
 msgstr "Ignrer skriftstrrelser"
 
-#: src/prefs.c:719
+#: src/prefs.c:722
 msgid "Ignore TiK Automated Messages"
 msgstr "Ignrer TiK's automatiske beskeder"
 
-#: src/prefs.c:720 src/prefs.c:1909
+#: src/prefs.c:723 src/prefs.c:1921
 msgid "Ignore new conversations when away"
 msgstr "Ignrer nye samtaler under fravr"
 
-#: src/prefs.c:909
+#: src/prefs.c:912
 msgid "IM Options"
 msgstr "Indstillinger for beskeder"
 
-#: src/prefs.c:922 src/prefs.c:2907
+#: src/prefs.c:925 src/prefs.c:2921
 msgid "IM Window"
 msgstr "Besked-vindue"
 
-#: src/prefs.c:938 src/prefs.c:1088
+#: src/prefs.c:941 src/prefs.c:1091
 msgid "Show buttons as: "
 msgstr "Vis knapper som:"
 
-#: src/prefs.c:942 src/prefs.c:1093
+#: src/prefs.c:945 src/prefs.c:1096
 msgid "Pictures And Text"
 msgstr "Billeder og tekst"
 
-#: src/prefs.c:943 src/prefs.c:1095
+#: src/prefs.c:946 src/prefs.c:1098
 msgid "Pictures"
 msgstr "Billeder"
 
-#: src/prefs.c:944 src/prefs.c:1096
+#: src/prefs.c:947 src/prefs.c:1099
 msgid "Text"
 msgstr "Tekst"
 
-#: src/prefs.c:955
+#: src/prefs.c:958
 msgid "Show all conversations in one tabbed window"
 msgstr "Vis alle samtaler som faneblade i et vindue"
 
-#: src/prefs.c:957
+#: src/prefs.c:960
 msgid "Show chats in the same tabbed window"
 msgstr "Vis hver chat som et faneblad i samme vindue"
 
-#: src/prefs.c:964 src/prefs.c:1116
+#: src/prefs.c:967 src/prefs.c:1119
 msgid "Raise windows on events"
 msgstr "Send vindue i forgrunden ved aktivitet"
 
-#: src/prefs.c:965
+#: src/prefs.c:968
 msgid "Show logins in window"
 msgstr "Besked nr venner logger ind/ud"
 
-#: src/prefs.c:966
-msgid "Show aliases in tabs/titles"
+#: src/prefs.c:969
+#, fuzzy
+msgid "Show aliases in tabs/titles/ticker"
 msgstr "Vis aliaser i faneblade/titler"
 
-#: src/prefs.c:967
+#: src/prefs.c:970
 msgid "Hide window on send"
 msgstr "Luk vindue nr besked er sendt"
 
-#: src/prefs.c:969 src/prefs.c:1119
+#: src/prefs.c:972 src/prefs.c:1122
 msgid "Window Sizes"
 msgstr "Besked-vinduets strrelse"
 
-#: src/prefs.c:977 src/prefs.c:1127
+#: src/prefs.c:980 src/prefs.c:1130
 msgid "New window width:"
 msgstr "Bredde i punkter:"
 
-#: src/prefs.c:978 src/prefs.c:1128
+#: src/prefs.c:981 src/prefs.c:1131
 msgid "New window height:"
 msgstr "Hjde i punkter:"
 
-#: src/prefs.c:979 src/prefs.c:1129
+#: src/prefs.c:982 src/prefs.c:1132
 msgid "Entry widget height:"
 msgstr "Hjde p skrivefeltet:"
 
-#: src/prefs.c:981 src/prefs.c:1131
+#: src/prefs.c:984 src/prefs.c:1134
 msgid "Tab Placement"
 msgstr "Placering af faneblade"
 
-#: src/prefs.c:1010 src/prefs.c:1160
+#: src/prefs.c:1013 src/prefs.c:1163
 msgid "Left"
 msgstr "Til venstre"
 
-#: src/prefs.c:1012 src/prefs.c:1162
+#: src/prefs.c:1015 src/prefs.c:1165
 msgid "Right"
 msgstr "Til hjre"
 
-#: src/prefs.c:1016
+#: src/prefs.c:1019
 msgid "Buddy Icons"
 msgstr "Ikoner/knapper"
 
-#: src/prefs.c:1028
+#: src/prefs.c:1031
 msgid "Hide Buddy Icons"
 msgstr "Skjul knapper"
 
-#: src/prefs.c:1034
+#: src/prefs.c:1037
 msgid "Disable Buddy Icon Animation"
 msgstr "Animr ikke venne-ikoner"
 
-#: src/prefs.c:1060
+#: src/prefs.c:1063
 msgid "Chat Options"
 msgstr "Indstillinger for chat"
 
-#: src/prefs.c:1072
+#: src/prefs.c:1075
 msgid "Group Chat Window"
 msgstr "Gruppechat-vindue"
 
-#: src/prefs.c:1107
+#: src/prefs.c:1110
 msgid "Show all chats in one tabbed window"
 msgstr "Vis hver chat som faneblad i et vindue"
 
-#: src/prefs.c:1109
+#: src/prefs.c:1112
 msgid "Show conversations in the same tabbed window"
 msgstr "Vis samtaler som faneblade i samme vindue"
 
-#: src/prefs.c:1117
+#: src/prefs.c:1120
 msgid "Show people joining/leaving in window"
 msgstr "Vis nr nogen logger ind eller ud "
 
-#: src/prefs.c:1165
+#: src/prefs.c:1168
 msgid "Tab Completion"
 msgstr "Autofuldfrelse"
 
-#: src/prefs.c:1177
+#: src/prefs.c:1180
 msgid "Tab-Complete Nicks"
 msgstr "Autofuldfr navne ved tryk p TAB"
 
-#: src/prefs.c:1183
+#: src/prefs.c:1186
 msgid "Old-Style Tab Completion"
 msgstr "TAB som i gamle Gaim-versioner"
 
-#: src/prefs.c:1285 src/prefs.c:2917
+#: src/prefs.c:1288 src/prefs.c:2931
 msgid "Font Options"
 msgstr "Indstillinger for skrifttyper"
 
-#: src/prefs.c:1311
+#: src/prefs.c:1314
 msgid "Italic Text"
 msgstr "Kursiv tekst"
 
-#: src/prefs.c:1355 src/prefs.c:1373 src/prefs.c:1395
+#: src/prefs.c:1358 src/prefs.c:1376 src/prefs.c:1398
 msgid "Select"
 msgstr "Vlg"
 
-#: src/prefs.c:1393
+#: src/prefs.c:1396
 msgid "Font Face for Text"
 msgstr "Skrifttype:"
 
-#: src/prefs.c:1408
+#: src/prefs.c:1411
 msgid "Font Size for Text"
 msgstr "Skriftstrrelse:"
 
-#: src/prefs.c:1505
+#: src/prefs.c:1508
 msgid "Gaim - Sound Configuration"
 msgstr "Gaim - Opstning af lyd"
 
-#: src/prefs.c:1540
+#: src/prefs.c:1543
 msgid "Test"
 msgstr "Test"
 
-#: src/prefs.c:1550
+#: src/prefs.c:1553
 msgid "Choose..."
 msgstr "Vlg..."
 
-#: src/prefs.c:1607
+#: src/prefs.c:1621
 msgid "Sound Options"
 msgstr "Indstillinger for lyd"
 
-#: src/prefs.c:1635
+#: src/prefs.c:1649
 msgid "No sounds when you log in"
 msgstr "Ingen lyde, nr du logger ind"
 
-#: src/prefs.c:1641 src/prefs.c:1910
+#: src/prefs.c:1655 src/prefs.c:1922
 msgid "Sounds while away"
 msgstr "Afspil lyde under fravr"
 
-#: src/prefs.c:1651
+#: src/prefs.c:1665
 msgid "Sound method"
 msgstr "Afspil lyd ved hjlp af:"
 
-#: src/prefs.c:1725
+#: src/prefs.c:1739
 #, c-format
 msgid ""
 "Sound command\n"
 "(%s for filename)"
 msgstr "Kommando (brug %s istedet for filnavn):"
 
-#: src/prefs.c:1737
+#: src/prefs.c:1751
 msgid "Sound played when:"
 msgstr "Afspil lyd, nr:"
 
-#: src/prefs.c:1881 src/prefs.c:2939
+#: src/prefs.c:1893 src/prefs.c:2953
 msgid "Away Messages"
 msgstr "Fravrsbeskeder"
 
-#: src/prefs.c:1918
+#: src/prefs.c:1930
 msgid "Don't send auto-response"
 msgstr "Send ikke automatisk svar"
 
-#: src/prefs.c:1919
+#: src/prefs.c:1931
 msgid "Only send auto-response when idle"
 msgstr "Send kun automatisk svar, nr fravrende"
 
-#: src/prefs.c:1934
+#: src/prefs.c:1946
 msgid "Time between sending auto-responses (in seconds):"
 msgstr "Tid mellem afsendelse af automatiske svar (i sekunder):"
 
-#: src/prefs.c:1949
+#: src/prefs.c:1961
 msgid "Auto Away after"
 msgstr "St som fravrende efter"
 
-#: src/prefs.c:1963
+#: src/prefs.c:1975
 msgid "minutes using"
 msgstr "minutter og send"
 
-#: src/prefs.c:1976
+#: src/prefs.c:1988
 msgid "Messages"
 msgstr "Beskeder"
 
-#: src/prefs.c:2033
+#: src/prefs.c:2045
 msgid "Edit"
 msgstr "Ret"
 
-#: src/prefs.c:2037
+#: src/prefs.c:2049
 msgid "Make Away"
 msgstr "St fravrende"
 
-#: src/prefs.c:2314
+#: src/prefs.c:2326
 msgid "Privacy Options"
 msgstr "Privatlivets fred"
 
-#: src/prefs.c:2330
+#: src/prefs.c:2342
 msgid "Set privacy for:"
 msgstr "Indstil for:"
 
-#: src/prefs.c:2349
+#: src/prefs.c:2361
 msgid "Allow all users to contact me"
 msgstr "Tillad alle brugere at kontakte mig"
 
-#: src/prefs.c:2350
+#: src/prefs.c:2362
 msgid "Allow only the users below"
 msgstr "Tillad kun nedenstende brugere"
 
-#: src/prefs.c:2352
+#: src/prefs.c:2364
 msgid "Allow List"
 msgstr "Tilladte brugere"
 
-#: src/prefs.c:2383
+#: src/prefs.c:2395
 msgid "Deny all users"
 msgstr "Ignorr alle brugere"
 
-#: src/prefs.c:2384
+#: src/prefs.c:2396
 msgid "Block the users below"
 msgstr "Ignorr kun nedenstende brugere"
 
-#: src/prefs.c:2386
+#: src/prefs.c:2398
 msgid "Block List"
 msgstr "Ignorerede brugere"
 
-#: src/prefs.c:2481
+#: src/prefs.c:2493
 msgid "Gaim - Preferences"
 msgstr "Gaim - Indstillinger"
 
-#: src/prefs.c:2564
+#: src/prefs.c:2576
 msgid "Gaim debug output window"
 msgstr "Gaim fejlsgningsvindue"
 
-#: src/prefs.c:2873
+#: src/prefs.c:2887
 msgid "General"
 msgstr "Generelt"
 
-#: src/prefs.c:2878
+#: src/prefs.c:2892
 msgid "Proxy"
 msgstr "Mellemvrt"
 
-#: src/prefs.c:2902
+#: src/prefs.c:2916
 msgid "Conversations"
 msgstr "Samtaler"
 
-#: src/prefs.c:2928
+#: src/prefs.c:2942
 msgid "Sounds"
 msgstr "Lydeffekter"
 
-#: src/prefs.c:2950
+#: src/prefs.c:2964
 msgid "Privacy"
 msgstr "Privatliv"
 
@@ -2993,22 +3521,23 @@
 msgid "Open Mail"
 msgstr "bn post"
 
-#: src/prpl.c:564
-#, c-format
-msgid "%s%s%s%s has made %s their buddy%s%s%s"
+#: src/prpl.c:570
+#, fuzzy, c-format
+msgid "%s%s%s%s has made %s his or her buddy%s%s%s"
 msgstr "%s%s%s%s har gjort %s til en ven%s%s%s"
 
-#: src/prpl.c:572
+#: src/prpl.c:578
+#, fuzzy
 msgid ""
 "\n"
 "\n"
-"Do you wish to add them to your buddy list?"
+"Do you wish to add him or her to your buddy list?"
 msgstr ""
 "\n"
 "\n"
 "Vil du tilfje vedkommende til din venne-liste?"
 
-#: src/prpl.c:615
+#: src/prpl.c:621
 msgid ""
 "You do not currently have any protocols available that are able to register "
 "new accounts."
@@ -3016,15 +3545,15 @@
 "Du har ikke nogen protokoller indlst, som understtter oprettelsen af nye "
 "konti."
 
-#: src/prpl.c:652
+#: src/prpl.c:658
 msgid "Gaim - Registration"
 msgstr "Gaim - Registrering"
 
-#: src/prpl.c:667
+#: src/prpl.c:673
 msgid "Registration Information"
 msgstr "Registreringsinformation"
 
-#: src/prpl.c:684
+#: src/prpl.c:690
 msgid "Register"
 msgstr "Registrr"
 
@@ -3032,28 +3561,80 @@
 msgid "Please enter your password"
 msgstr "Indtast din adgangskode"
 
-#: src/server.c:555
+#: src/server.c:585
 #, c-format
 msgid "(%d messages)"
 msgstr "(%d beskeder)"
 
-#: src/server.c:561
+#: src/server.c:591
 msgid "(1 message)"
 msgstr "(1 besked)"
 
-#: src/server.c:753
+#: src/server.c:783
 msgid "Warned"
 msgstr "Advaret!"
 
-#: src/server.c:846
+#: src/server.c:876
 msgid "Yes"
 msgstr "Ja"
 
-#: src/server.c:847
+#: src/server.c:877
 msgid "No"
 msgstr "Nej"
 
-#: src/server.c:1023
+#: src/server.c:1076
 msgid "More Info"
 msgstr "Flere oplysninger"
 
+#: src/sound.c:63
+#, fuzzy
+msgid "Buddy logs in"
+msgstr "Venne-ikon"
+
+#: src/sound.c:64
+#, fuzzy
+msgid "Buddy logs out"
+msgstr "Venne-liste"
+
+#: src/sound.c:65
+#, fuzzy
+msgid "Message received"
+msgstr "Besked-fejl"
+
+#: src/sound.c:66
+msgid "Message received begins conversation"
+msgstr ""
+
+#: src/sound.c:67
+#, fuzzy
+msgid "Message sent"
+msgstr "Beskeder"
+
+#: src/sound.c:68
+msgid "Person enters chat"
+msgstr ""
+
+#: src/sound.c:69
+msgid "Person leaves chat"
+msgstr ""
+
+#: src/sound.c:70
+msgid "You talk in chat"
+msgstr ""
+
+#: src/sound.c:71
+msgid "Others talk in chat"
+msgstr ""
+
+#: src/sound.c:74
+msgid "Someone says your name in chat"
+msgstr ""
+
+#~ msgid "Enable sounds"
+#~ msgstr "Brug lyde"
+
+#~ msgid "KFM"
+#~ msgstr "KFM"
+
+#~ msgid "Manual"
+#~ msgstr "Andet program"
--- a/po/de.po	Tue Jul 02 05:41:30 2002 +0000
+++ b/po/de.po	Tue Jul 02 05:42:26 2002 +0000
@@ -15,7 +15,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Gaim 0.9.19\n"
-"POT-Creation-Date: 2002-04-11 22:46-0700\n"
+"POT-Creation-Date: 2002-06-25 00:10-0400\n"
 "PO-Revision-Date: 2002-03-31 11:29+0200\n"
 "Last-Translator: Karsten Weiss <knweiss@gmx.de>\n"
 "Language-Team: de <de@li.org>\n"
@@ -23,6 +23,115 @@
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: plugins/chatlist.c:67 src/buddy_chat.c:272
+msgid "Buddy Chat"
+msgstr "Buddy-Chat"
+
+#: plugins/chatlist.c:166 plugins/chatlist.c:168 plugins/chatlist.c:407
+#: plugins/chatlist.c:409
+#, fuzzy
+msgid "Gaim Chat"
+msgstr "Gaim - Chat"
+
+#: plugins/chatlist.c:339 src/about.c:165 src/aim.c:320 src/buddy.c:2716
+#: src/buddy_chat.c:1322 src/buddy_chat.c:1419 src/buddy_chat.c:1449
+#: src/conversation.c:2864 src/dialogs.c:567 src/dialogs.c:3899
+#: src/multi.c:1069 src/plugins.c:277 src/prefs.c:2547 src/prpl.c:438
+#: src/prpl.c:685 src/server.c:1072
+msgid "Close"
+msgstr "Schlieen"
+
+#: plugins/chatlist.c:344
+#, fuzzy
+msgid "Chat Rooms"
+msgstr "Chat-Optionen"
+
+#: plugins/chatlist.c:363
+msgid "Refresh"
+msgstr ""
+
+#. Put the buttons in the box
+#: plugins/chatlist.c:364 src/buddy.c:492 src/buddy.c:2827
+#: src/buddy_chat.c:1454 src/conversation.c:2389 src/conversation.c:2879
+#: src/dialogs.c:932 src/dialogs.c:1114 src/dialogs.c:2095 src/multi.c:1053
+#: src/prefs.c:2041 src/prefs.c:2383 src/prefs.c:2417
+msgid "Add"
+msgstr "Hinzufgen"
+
+#: plugins/chatlist.c:365 src/buddy.c:494 src/buddy.c:2829
+#: src/buddy_chat.c:1456 src/conversation.c:2375 src/conversation.c:2876
+#: src/prefs.c:2055 src/prefs.c:2387 src/prefs.c:2421
+msgid "Remove"
+msgstr "Entfernen"
+
+#: plugins/chatlist.c:388
+msgid "List of available chats"
+msgstr ""
+
+#: plugins/chatlist.c:398
+msgid "List of subscribed chats"
+msgstr ""
+
+#: plugins/gtik.c:699
+msgid "Gnome Stock Ticker Properties"
+msgstr ""
+
+#: plugins/gtik.c:711
+msgid "Update Frequency in min"
+msgstr ""
+
+#: plugins/gtik.c:727
+msgid "Enter symbols delimited with \"+\" in the box below."
+msgstr ""
+
+#. OUTPUT FORMAT and SCROLL DIRECTION
+#: plugins/gtik.c:737
+msgid "Check this box to display only symbols and price:"
+msgstr ""
+
+#: plugins/gtik.c:738
+msgid "Check this box to scroll left to right:"
+msgstr ""
+
+#: plugins/gtik.c:974
+#, fuzzy
+msgid "(No"
+msgstr "Nein"
+
+#: plugins/gtik.c:975
+#, fuzzy
+msgid "Change"
+msgstr "Kanal:"
+
+#: src/protocols/gg/gg.c:71 src/protocols/msn/msn.c:1919
+msgid "Available"
+msgstr "Erreichbar"
+
+#: src/protocols/gg/gg.c:72
+msgid "Available for friends only"
+msgstr "Nur fr Freunde erreichbar"
+
+#: src/applet.c:197 src/buddy.c:497 src/buddy.c:2582 src/buddy.c:2727
+#: src/protocols/gg/gg.c:73 src/protocols/jabber/jabber.c:1118
+msgid "Away"
+msgstr "Abwesend"
+
+#: src/protocols/gg/gg.c:74
+msgid "Away for friends only"
+msgstr "Nur fr Freunde abwesend"
+
+#: src/protocols/gg/gg.c:75
+msgid "Invisible"
+msgstr "Unsichtbar"
+
+#: src/protocols/gg/gg.c:76
+msgid "Invisible for friends only"
+msgstr "Nur fr Freunde unsichtbar"
+
+#: src/protocols/gg/gg.c:77 src/protocols/jabber/jabber.c:1114
+msgid "Unavailable"
+msgstr "Unerreichbar"
+
 #: src/protocols/gg/gg.c:182
 msgid "Unable to resolve hostname."
 msgstr "Der Rechnername kann nicht aufgelst werden."
@@ -51,7 +160,7 @@
 msgid "Unknown Error Code."
 msgstr "Unbekannter Fehlercode."
 
-#: src/protocols/gg/gg.c:302
+#: src/protocols/gg/gg.c:302 src/protocols/msn/msn.c:2050
 #, c-format
 msgid "Status: %s"
 msgstr "Status: %s"
@@ -179,7 +288,7 @@
 msgstr "Geschlecht"
 
 #. Line 5
-#: src/dialogs.c:1582 src/dialogs.c:2290 src/protocols/gg/gg.c:729
+#: src/dialogs.c:1624 src/dialogs.c:2332 src/protocols/gg/gg.c:729
 msgid "City"
 msgstr "Stadt"
 
@@ -253,7 +362,12 @@
 msgid "Directory Search"
 msgstr "Verzeichnissuche"
 
-#: src/dialogs.c:1699 src/protocols/gg/gg.c:1160 src/protocols/gg/gg.c:1177
+#.
+#. } else if (!strcmp(act, _("Set Dir Info"))) {
+#. show_set_dir(gc);
+#.
+#: src/dialogs.c:1741 src/protocols/gg/gg.c:1160 src/protocols/gg/gg.c:1177
+#: src/protocols/jabber/jabber.c:3748 src/protocols/jabber/jabber.c:3761
 msgid "Change Password"
 msgstr "Passwort ndern"
 
@@ -274,8 +388,8 @@
 msgstr "Nachricht mittels Server senden"
 
 #: src/protocols/icq/gaim_icq.c:469 src/protocols/irc/irc.c:1851
-#: src/protocols/jabber/jabber.c:2112 src/protocols/oscar/oscar.c:3436
-#: src/protocols/toc/toc.c:1216
+#: src/protocols/jabber/jabber.c:2860 src/protocols/oscar/oscar.c:3593
+#: src/protocols/toc/toc.c:1219
 msgid "Get Info"
 msgstr "Benutzer-Info"
 
@@ -316,7 +430,7 @@
 "%s fordert Sie zu einem DDC Chat auf. Mchten Sie die direkte Verbindung "
 "aufbauen?"
 
-#: src/protocols/irc/irc.c:1001
+#: src/protocols/irc/irc.c:1001 src/protocols/msn/msn.c:315
 msgid "Unable to write"
 msgstr "Schreiben nicht mglich"
 
@@ -343,7 +457,7 @@
 msgid "Channel:"
 msgstr "Kanal:"
 
-#: src/multi.c:547 src/protocols/irc/irc.c:1675
+#: src/multi.c:549 src/protocols/irc/irc.c:1675
 msgid "Password:"
 msgstr "Passwort:"
 
@@ -351,174 +465,228 @@
 msgid "DCC Chat"
 msgstr "DCC-Chat"
 
-#: src/protocols/jabber/jabber.c:699
-msgid "Unavailable"
-msgstr "Unerreichbar"
-
-#: src/applet.c:293 src/buddy.c:493 src/buddy.c:2508 src/buddy.c:2644
-#: src/protocols/jabber/jabber.c:703
-msgid "Away"
-msgstr "Abwesend"
-
-#: src/buddy.c:2801 src/protocols/jabber/jabber.c:705
-#: src/protocols/jabber/jabber.c:723
+#: src/protocols/jabber/jabber.c:942
+msgid "Incorrect current password! Password NOT Changed!"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:943 src/protocols/jabber/jabber.c:948
+#, fuzzy
+msgid "Password Change Error!"
+msgstr "Gaim - Passwort-nderung"
+
+#: src/protocols/jabber/jabber.c:947
+msgid "New password same as old password! Password NOT Changed!"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1092
+msgid "Unknown"
+msgstr "Unbekannt"
+
+#: src/buddy.c:2887 src/protocols/jabber/jabber.c:1120
+#: src/protocols/jabber/jabber.c:1138
 msgid "Online"
 msgstr "Online"
 
-#: src/protocols/jabber/jabber.c:707
+#: src/protocols/jabber/jabber.c:1122
 msgid "Extended Away"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:709
+#: src/protocols/jabber/jabber.c:1124
 msgid "Do Not Disturb"
 msgstr "Nicht stren"
 
-#: src/protocols/jabber/jabber.c:1042
+#: src/protocols/jabber/jabber.c:1434
+#, c-format
+msgid "Error %s: %s"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1437
+#, fuzzy
+msgid "Unknown Error in presence"
+msgstr "Unbekannter Fehlercode."
+
+#: src/protocols/jabber/jabber.c:1607
+#, fuzzy, c-format
+msgid "The user %s wants to add you to their buddy list."
+msgstr ""
+"\n"
+"\n"
+"Mchten Sie sie zu Ihrer Buddy-List hinzufgen?"
+
+#: src/protocols/jabber/jabber.c:1632
 #, fuzzy
 msgid "No such user"
 msgstr "Dieser Server existiert nicht"
 
-#: src/protocols/jabber/jabber.c:1044
+#: src/protocols/jabber/jabber.c:1634 src/protocols/jabber/jabber.c:2341
+#: src/protocols/jabber/jabber.c:2506
 #, fuzzy
 msgid "Jabber Error"
 msgstr "Nachrichten-Fehler"
 
-#: src/dialogs.c:845 src/protocols/jabber/jabber.c:1124
+#: src/dialogs.c:887 src/protocols/jabber/jabber.c:1719
+#: src/protocols/msn/msn.c:1110
 msgid "Buddies"
 msgstr "Buddies"
 
-#: src/protocols/jabber/jabber.c:1188
+#: src/protocols/jabber/jabber.c:1782
 msgid "Authenticating"
 msgstr "Authentifizierung"
 
-#: src/protocols/jabber/jabber.c:1225
+#: src/protocols/jabber/jabber.c:1819
 msgid "Unknown login error"
 msgstr "Unbekannter Anmeldefehler"
 
-#: src/protocols/jabber/jabber.c:1455 src/protocols/jabber/jabber.c:2903
+#: src/protocols/jabber/jabber.c:2010
+#, fuzzy
+msgid "Password successfully changed."
+msgstr "Das Passwort wurde erfolgreich gendert"
+
+#: src/protocols/jabber/jabber.c:2012
+#, fuzzy
+msgid "Password Change"
+msgstr "Gaim - Passwort-nderung"
+
+#: src/protocols/jabber/jabber.c:2054 src/protocols/jabber/jabber.c:3676
 msgid "Connection lost"
 msgstr "Verbindung abgebrochen"
 
-#: src/protocols/jabber/jabber.c:1457 src/protocols/jabber/jabber.c:1489
-#: src/protocols/jabber/jabber.c:2905 src/protocols/jabber/jabber.c:2951
+#: src/protocols/jabber/jabber.c:2056 src/protocols/jabber/jabber.c:2088
+#: src/protocols/jabber/jabber.c:3678 src/protocols/jabber/jabber.c:3724
+#: src/protocols/msn/msn.c:1741 src/protocols/msn/msn.c:1770
 msgid "Unable to connect"
 msgstr "Verbindung kann nicht hergestellt werden"
 
-#: src/protocols/jabber/jabber.c:1463
+#: src/protocols/jabber/jabber.c:2062
 msgid "Connected"
 msgstr "Verbunden"
 
-#: src/protocols/jabber/jabber.c:1466
+#: src/protocols/jabber/jabber.c:2065
 msgid "Requesting Authentication Method"
 msgstr "Anfrage der Authentifizierungsmethode fehlgeschlagen"
 
 #. we have no chats yet
-#: src/protocols/jabber/jabber.c:1484
+#: src/protocols/jabber/jabber.c:2083 src/protocols/msn/msn.c:1762
 msgid "Connecting"
 msgstr "Verbindungsaufbau"
 
-#: src/protocols/jabber/jabber.c:1783
+#: src/protocols/jabber/jabber.c:2340 src/protocols/jabber/jabber.c:2505
+#, fuzzy
+msgid "Invalid Jabber I.D."
+msgstr "Ungltiger Name"
+
+#: src/protocols/jabber/jabber.c:2473
 msgid "Room:"
 msgstr "Raum:"
 
-#: src/protocols/jabber/jabber.c:1787
+#: src/protocols/jabber/jabber.c:2477
 msgid "Server:"
 msgstr "Server:"
 
-#: src/protocols/jabber/jabber.c:1792
+#: src/protocols/jabber/jabber.c:2482
 msgid "Handle:"
 msgstr "Krzel:"
 
-#: src/protocols/jabber/jabber.c:2062 src/protocols/jabber/jabber.c:2401
-msgid "Unknown"
-msgstr "Unbekannt"
-
-#: src/buddy_chat.c:875 src/protocols/jabber/jabber.c:2117
-#: src/protocols/oscar/oscar.c:3443
+#: src/protocols/jabber/jabber.c:2539
+#, fuzzy
+msgid "Chats"
+msgstr "Chat"
+
+#: src/protocols/jabber/jabber.c:2854
+#, fuzzy
+msgid "View Error Msg"
+msgstr "Mitschnitt anzeigen"
+
+#: src/buddy_chat.c:886 src/protocols/jabber/jabber.c:2865
+#: src/protocols/oscar/oscar.c:3606
 msgid "Get Away Msg"
 msgstr "Abwesenheits-Mitteilung holen"
 
-#: src/protocols/jabber/jabber.c:2299
+#: src/protocols/jabber/jabber.c:2882
+msgid "Remove From Roster"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:3076
 msgid "Full Name"
 msgstr "Vollstndiger Name"
 
-#: src/protocols/jabber/jabber.c:2300
+#: src/protocols/jabber/jabber.c:3077
 msgid "Family Name"
 msgstr "Nachname"
 
-#: src/protocols/jabber/jabber.c:2301
+#: src/protocols/jabber/jabber.c:3078
 msgid "Given Name"
 msgstr "Vorname"
 
-#: src/protocols/jabber/jabber.c:2302
+#: src/protocols/jabber/jabber.c:3079
 msgid "Nickname"
 msgstr "Spitzname"
 
-#: src/dialogs.c:2483 src/protocols/jabber/jabber.c:2303
+#: src/dialogs.c:2525 src/protocols/jabber/jabber.c:3080
 msgid "URL"
 msgstr "URL"
 
-#: src/protocols/jabber/jabber.c:2304
+#: src/protocols/jabber/jabber.c:3081
 msgid "Street Address"
 msgstr "Strae"
 
-#: src/protocols/jabber/jabber.c:2305
+#: src/protocols/jabber/jabber.c:3082
 msgid "Extended Address"
 msgstr "Erweiterte Adresse"
 
 # ???
-#: src/protocols/jabber/jabber.c:2306
+#: src/protocols/jabber/jabber.c:3083
 msgid "Locality"
 msgstr "rtlichkeit"
 
-#: src/protocols/jabber/jabber.c:2307
+#: src/protocols/jabber/jabber.c:3084
 msgid "Region"
 msgstr "Bezirk"
 
-#: src/protocols/jabber/jabber.c:2308
+#: src/protocols/jabber/jabber.c:3085
 msgid "Postal Code"
 msgstr "Postleitzahl"
 
 #. Line 7
-#: src/dialogs.c:1604 src/dialogs.c:2312 src/protocols/jabber/jabber.c:2309
+#: src/dialogs.c:1646 src/dialogs.c:2354 src/protocols/jabber/jabber.c:3086
 msgid "Country"
 msgstr "Land"
 
-#: src/protocols/jabber/jabber.c:2310
+#: src/protocols/jabber/jabber.c:3087
 msgid "Telephone"
 msgstr "Telefon"
 
 # Die offizielle GNOME-bersetzung
-#: src/dialogs.c:2388 src/protocols/jabber/jabber.c:2311
+#: src/dialogs.c:2430 src/protocols/jabber/jabber.c:3088
 msgid "Email"
 msgstr "E-Mail"
 
-#: src/protocols/jabber/jabber.c:2312
+#: src/protocols/jabber/jabber.c:3089
 msgid "Organization Name"
 msgstr "Name der Organisation"
 
-#: src/protocols/jabber/jabber.c:2313
+#: src/protocols/jabber/jabber.c:3090
 msgid "Organization Unit"
 msgstr "Organisationseinheit"
 
-#: src/prefs.c:1988 src/protocols/jabber/jabber.c:2314
+#: src/prefs.c:2000 src/protocols/jabber/jabber.c:3091
 msgid "Title"
 msgstr "Titel"
 
-#: src/protocols/jabber/jabber.c:2315
+#: src/protocols/jabber/jabber.c:3092
 msgid "Role"
 msgstr "Funktion"
 
-#: src/protocols/jabber/jabber.c:2316
+#: src/protocols/jabber/jabber.c:3093
 msgid "Birthday"
 msgstr "Geburtstag"
 
 #. Right side: frame with description and the filepath of plugin
-#: src/dialogs.c:2491 src/plugins.c:211 src/protocols/jabber/jabber.c:2317
+#: src/dialogs.c:2533 src/plugins.c:211 src/protocols/jabber/jabber.c:3094
 msgid "Description"
 msgstr "Beschreibung"
 
-#: src/protocols/jabber/jabber.c:2342
+#: src/protocols/jabber/jabber.c:3119
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable"
@@ -526,137 +694,393 @@
 "Die folgenden Punkte sind optional. Geben Sie nur die Informationen an, die "
 "Sie angeben mchten."
 
-#: src/protocols/jabber/jabber.c:2343
+#: src/protocols/jabber/jabber.c:3120
 msgid "User Identity"
 msgstr "Benutzer Identitt"
 
-#: src/protocols/jabber/jabber.c:2759
+#: src/protocols/jabber/jabber.c:3532
 msgid "Gaim - Edit Jabber vCard"
 msgstr "Gaim - Jabber vCard bearbeiten"
 
-#: src/protocols/jabber/jabber.c:2833
+#: src/protocols/jabber/jabber.c:3606
 msgid "Server Registration successful!"
 msgstr "Server-Anmeldung erfolgreich!"
 
-#: src/protocols/jabber/jabber.c:2860
+#: src/protocols/jabber/jabber.c:3633
 msgid "Unknown registration error"
 msgstr "Unbekannter Fehler bei der Anmeldung"
 
-#: src/protocols/jabber/jabber.c:2969 src/protocols/jabber/jabber.c:2984
+#: src/protocols/jabber/jabber.c:3742 src/protocols/jabber/jabber.c:3757
 msgid "Set User Info"
 msgstr "Benutzer-Info setzen"
 
-#: src/protocols/msn/msn.c:719 src/protocols/msn/msn.c:2041
-#: src/protocols/msn/msn.c:2074
+#: src/protocols/msn/msn.c:230
+msgid "Syntax Error (probably a Gaim bug)"
+msgstr ""
+
+#: src/protocols/msn/msn.c:233
+msgid "Invalid Parameter (probably a Gaim bug)"
+msgstr ""
+
+#: src/protocols/msn/msn.c:236
+#, fuzzy
+msgid "Invalid User"
+msgstr "Ungltiger Name"
+
+#: src/protocols/msn/msn.c:239
+msgid "Fully Qualified Domain Name missing"
+msgstr ""
+
+#: src/protocols/msn/msn.c:242
+msgid "Already Login"
+msgstr ""
+
+#: src/protocols/msn/msn.c:245
+#, fuzzy
+msgid "Invalid Username"
+msgstr "Ungltiger Name"
+
+#: src/protocols/msn/msn.c:248
+#, fuzzy
+msgid "Invalid Friendly Name"
+msgstr "Ungltiger Name"
+
+#: src/protocols/msn/msn.c:251
+msgid "List Full"
+msgstr ""
+
+#: src/protocols/msn/msn.c:254
+msgid "Already there"
+msgstr ""
+
+#: src/protocols/msn/msn.c:257
+#, fuzzy
+msgid "Not on list"
+msgstr "Verbindung abgebrochen"
+
+#: src/protocols/msn/msn.c:260
+msgid "User is offline"
+msgstr ""
+
+#: src/protocols/msn/msn.c:263
+msgid "Already in the mode"
+msgstr ""
+
+#: src/protocols/msn/msn.c:266
+msgid "Already in opposite list"
+msgstr ""
+
+#: src/protocols/msn/msn.c:269
+msgid "Switchboard failed"
+msgstr ""
+
+#: src/protocols/msn/msn.c:272
+msgid "Notify Transfer failed"
+msgstr ""
+
+#: src/protocols/msn/msn.c:276
+msgid "Required fields missing"
+msgstr ""
+
+#: src/protocols/msn/msn.c:279
+#, fuzzy
+msgid "Not logged in"
+msgstr "%s hat sich angemeldet."
+
+#: src/protocols/msn/msn.c:283
+#, fuzzy
+msgid "Internal server error"
+msgstr "Interner Fehler"
+
+#: src/protocols/msn/msn.c:286
+msgid "Database server error"
+msgstr ""
+
+#: src/protocols/msn/msn.c:289
+#, fuzzy
+msgid "File operation error"
+msgstr "Interner Verbindungsfehler\n"
+
+#: src/protocols/msn/msn.c:292
+#, fuzzy
+msgid "Memory allocation error"
+msgstr "Schwerwiegender Verbindungsfehler!\n"
+
+#: src/protocols/msn/msn.c:296
+#, fuzzy
+msgid "Server busy"
+msgstr "Server:"
+
+#: src/protocols/msn/msn.c:299
+#, fuzzy
+msgid "Server unavailable"
+msgstr "Unerreichbar"
+
+#: src/protocols/msn/msn.c:302
+msgid "Peer Notification server down"
+msgstr ""
+
+#: src/protocols/msn/msn.c:305
+#, fuzzy
+msgid "Database connect error"
+msgstr "Interner Verbindungsfehler\n"
+
+#: src/protocols/msn/msn.c:308
+msgid "Server is going down (abandon ship)"
+msgstr ""
+
+#: src/protocols/msn/msn.c:312
+#, fuzzy
+msgid "Error creating connection"
+msgstr "g003: Fehler: Verbindung kann nicht hergestellt werden.\n"
+
+#: src/protocols/msn/msn.c:318
+msgid "Session overload"
+msgstr ""
+
+#: src/protocols/msn/msn.c:321
+msgid "User is too active"
+msgstr ""
+
+#: src/protocols/msn/msn.c:324
+#, fuzzy
+msgid "Too many sessions"
+msgstr "Zu viele bereinstimmungen."
+
+#: src/protocols/msn/msn.c:327
+msgid "Not expected"
+msgstr ""
+
+#: src/protocols/msn/msn.c:330
+msgid "Bad friend file"
+msgstr ""
+
+#: src/protocols/msn/msn.c:334
+#, fuzzy
+msgid "Authentication failed"
+msgstr "Authentifizierung fehlgeschlagen."
+
+#: src/protocols/msn/msn.c:337
+#, fuzzy
+msgid "Not allowed when offline"
+msgstr "Kein Klang beim Anmelden"
+
+#: src/protocols/msn/msn.c:340
+msgid "Not accepting new users"
+msgstr ""
+
+#: src/protocols/msn/msn.c:343
+msgid "User unverified"
+msgstr ""
+
+#: src/protocols/msn/msn.c:346
+#, fuzzy
+msgid "Unknown Error Code"
+msgstr "Unbekannter Fehlercode."
+
+#: src/protocols/msn/msn.c:351 src/protocols/msn/msn.c:558
+#: src/protocols/msn/msn.c:813 src/protocols/msn/msn.c:2114
+#: src/protocols/msn/msn.c:2283 src/protocols/msn/msn.c:2336
 msgid "MSN Error"
 msgstr "MSN-Fehler"
 
-#: src/protocols/msn/msn.c:719
+#: src/protocols/msn/msn.c:558
+msgid "A message may not have been received."
+msgstr ""
+
+#: src/protocols/msn/msn.c:813
 msgid "Gaim was unable to send a message"
 msgstr "Gaim konnte keine Nachricht senden"
 
-#: src/protocols/msn/msn.c:1069
+#: src/protocols/msn/msn.c:917
+#, c-format
+msgid "The user %s (%s) wants to add %s to his or her buddy list."
+msgstr ""
+
+#: src/protocols/msn/msn.c:1074
+#, c-format
+msgid "The user %s (%s) wants to add you to their buddy list"
+msgstr ""
+
+#: src/protocols/msn/msn.c:1175
 msgid "You have been disconnected. You have signed on from another location."
 msgstr ""
 "Die Verbindung wurde getrennt. Sie haben sich von einem anderen Ort "
 "angemeldet."
 
-#: src/protocols/msn/msn.c:2041 src/protocols/msn/msn.c:2074
+#: src/protocols/msn/msn.c:1435 src/protocols/msn/msn.c:1679
+#, fuzzy
+msgid "Error reading from server"
+msgstr "Fehler beim Lesen aus Socket."
+
+#: src/protocols/msn/msn.c:1568
+msgid "Requesting to send password"
+msgstr ""
+
+#: src/protocols/msn/msn.c:1618
+#, fuzzy
+msgid "Unable to send password"
+msgstr "Socket kann nicht gelesen werden."
+
+#: src/protocols/msn/msn.c:1623
+#, fuzzy
+msgid "Password sent"
+msgstr "Passwort: "
+
+#: src/protocols/msn/msn.c:1748
+#, fuzzy
+msgid "Unable to write to server"
+msgstr "Verbindung zum Server nicht mglich."
+
+#: src/protocols/msn/msn.c:1754
+#, fuzzy
+msgid "Synching with server"
+msgstr "Beim Server anmelden"
+
+#: src/protocols/msn/msn.c:1920
+msgid "Away From Computer"
+msgstr ""
+
+#: src/protocols/msn/msn.c:1921
+msgid "Be Right Back"
+msgstr ""
+
+#: src/protocols/msn/msn.c:1922
+#, fuzzy
+msgid "Busy"
+msgstr "Buddy"
+
+#: src/protocols/msn/msn.c:1923
+msgid "On The Phone"
+msgstr ""
+
+#: src/protocols/msn/msn.c:1924
+msgid "Out To Lunch"
+msgstr ""
+
+#: src/protocols/msn/msn.c:1925
+#, fuzzy
+msgid "Hidden"
+msgstr "Icon verbergen"
+
+#: src/protocols/msn/msn.c:2041
+msgid "Reset friendly name"
+msgstr ""
+
+#: src/protocols/msn/msn.c:2114
+msgid "Friendly name too long."
+msgstr ""
+
+#: src/protocols/msn/msn.c:2129 src/protocols/msn/msn.c:2150
+#, fuzzy
+msgid "Set Friendly Name"
+msgstr "Zweiter Name"
+
+#: src/protocols/msn/msn.c:2130
+#, fuzzy
+msgid "Set Friendly Name:"
+msgstr "Benutzername: "
+
+#: src/protocols/msn/msn.c:2131
+msgid "Reset All Friendly Names"
+msgstr ""
+
+#: src/protocols/msn/msn.c:2283 src/protocols/msn/msn.c:2336
 msgid "Invalid name"
 msgstr "Ungltiger Name"
 
-#: src/protocols/napster/napster.c:450 src/protocols/oscar/oscar.c:3075
-#: src/protocols/toc/toc.c:1101
+#: src/protocols/napster/napster.c:457 src/protocols/oscar/oscar.c:3209
+#: src/protocols/toc/toc.c:1104
 msgid "Join what group:"
 msgstr "An welcher Gruppe teilnehmen:"
 
 # Direct IM erwhnen?
-#: src/protocols/oscar/oscar.c:333
+#: src/protocols/oscar/oscar.c:330
 #, c-format
 msgid "Direct IM with %s closed"
 msgstr "Direkte Verbindung zu %s geschlossen"
 
 # Direct IM erwhnen?
-#: src/protocols/oscar/oscar.c:335
+#: src/protocols/oscar/oscar.c:332
 #, c-format
 msgid "Direct IM with %s failed"
 msgstr "Direkte Verbindung mit %s fehlgeschlagen"
 
-#: src/protocols/oscar/oscar.c:373
+#: src/protocols/oscar/oscar.c:370
 msgid "connection error (rend)\n"
 msgstr "Verbindungsfehler!\n"
 
-#: src/protocols/oscar/oscar.c:384
+#: src/protocols/oscar/oscar.c:381
 msgid "major connection error\n"
 msgstr "Schwerwiegender Verbindungsfehler!\n"
 
-#: src/protocols/oscar/oscar.c:385 src/protocols/toc/toc.c:511
+#: src/protocols/oscar/oscar.c:382 src/protocols/toc/toc.c:511
 #: src/protocols/toc/toc.c:524 src/protocols/toc/toc.c:590
 msgid "Disconnected."
 msgstr "Verbindung unterbrochen"
 
-#: src/protocols/oscar/oscar.c:397 src/protocols/toc/toc.c:761
+#: src/protocols/oscar/oscar.c:394 src/protocols/toc/toc.c:761
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "Die Verbindung zum Raum %s wurde unterbrochen"
 
-#: src/protocols/oscar/oscar.c:398
+#: src/protocols/oscar/oscar.c:395
 msgid "Chat Error!"
 msgstr "Chat-Fehler!"
 
-#: src/protocols/oscar/oscar.c:410
+#: src/protocols/oscar/oscar.c:407
 msgid "Chat is currently unavailable"
 msgstr "Chat ist momentan nicht mglich."
 
-#: src/protocols/oscar/oscar.c:411
+#: src/protocols/oscar/oscar.c:408
 msgid "Gaim - Chat"
 msgstr "Gaim - Chat"
 
-#: src/protocols/oscar/oscar.c:470 src/protocols/oscar/oscar.c:530
+#: src/protocols/oscar/oscar.c:467 src/protocols/oscar/oscar.c:527
 msgid "Couldn't connect to host"
 msgstr "Keine Verbindung zum Host"
 
-#: src/protocols/oscar/oscar.c:478
+#: src/protocols/oscar/oscar.c:475
 msgid "Password sent, waiting for response\n"
 msgstr "Passwort wurde bertragen. Warte auf Antwort\n"
 
-#: src/protocols/oscar/oscar.c:511
+#: src/protocols/oscar/oscar.c:508
 msgid "internal connection error\n"
 msgstr "Interner Verbindungsfehler\n"
 
-#: src/protocols/oscar/oscar.c:512
+#: src/protocols/oscar/oscar.c:509
 msgid "Unable to login to AIM"
 msgstr "Anmeldung nicht mglich"
 
-#: src/protocols/oscar/oscar.c:517
+#: src/protocols/oscar/oscar.c:514
 #, c-format
 msgid "Signon: %s"
 msgstr "Anmeldung: %s"
 
-#: src/protocols/oscar/oscar.c:589
+#: src/protocols/oscar/oscar.c:586
 msgid "Signed off.\n"
 msgstr "Abgemeldet.\n"
 
-#: src/protocols/oscar/oscar.c:608 src/protocols/oscar/oscar.c:732
+#: src/protocols/oscar/oscar.c:605 src/protocols/oscar/oscar.c:730
 msgid "Could Not Connect"
 msgstr "Verbinden nicht mglich"
 
-#: src/protocols/oscar/oscar.c:616
+#: src/protocols/oscar/oscar.c:613
 msgid "Connection established, cookie sent"
 msgstr "Verbindung hergestellt. Cookie gesendet"
 
 #. Incorrect nick/password
-#: src/protocols/oscar/oscar.c:642 src/protocols/toc/toc.c:459
+#: src/protocols/oscar/oscar.c:639 src/protocols/toc/toc.c:459
 msgid "Incorrect nickname or password."
 msgstr "Ungltiger Benutzername oder Passwort."
 
 #. Suspended account
-#: src/protocols/oscar/oscar.c:647
+#: src/protocols/oscar/oscar.c:644
 msgid "Your account is currently suspended."
 msgstr "Ihr Benutzerkonto ist momentan gesperrt."
 
 #. connecting too frequently
-#: src/protocols/oscar/oscar.c:651
+#: src/protocols/oscar/oscar.c:648
 msgid ""
 "You have been connecting and disconnecting too frequently. Wait ten minutes "
 "and try again. If you continue to try, you will need to wait even longer."
@@ -666,76 +1090,76 @@
 "noch lnger warten"
 
 #. client too old
-#: src/protocols/oscar/oscar.c:656
+#: src/protocols/oscar/oscar.c:653
 msgid "The client version you are using is too old. Please upgrade at "
 msgstr "Ihre AIM-Software ist zu alt. Aktuelle Software finden Sie unter "
 
-#: src/protocols/oscar/oscar.c:660 src/protocols/toc/toc.c:542
+#: src/protocols/oscar/oscar.c:657 src/protocols/toc/toc.c:542
 msgid "Authentication Failed"
 msgstr "Legitimation fehlgeschlagen"
 
-#: src/protocols/oscar/oscar.c:682
+#: src/protocols/oscar/oscar.c:679
 msgid "Internal Error"
 msgstr "Interner Fehler"
 
-#: src/protocols/oscar/oscar.c:1250 src/protocols/oscar/oscar.c:3286
+#: src/protocols/oscar/oscar.c:1248 src/protocols/oscar/oscar.c:3420
 #, c-format
 msgid "Direct IM with %s established"
 msgstr "Direkte Verbindung mit %s hergestellt"
 
-#: src/protocols/oscar/oscar.c:1496 src/protocols/oscar/oscar.c:2371
+#: src/protocols/oscar/oscar.c:1504 src/protocols/oscar/oscar.c:2456
 #, c-format
 msgid ""
-"The user %d has denied your request to add them to your contact list for the "
-"following reason:\n"
-"\n"
+"The user %lu has denied your request to add them to your contact list for "
+"the following reason:\n"
+"%s"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1496 src/protocols/oscar/oscar.c:2371
+#: src/protocols/oscar/oscar.c:1504 src/protocols/oscar/oscar.c:2456
 #, fuzzy
 msgid "No reason given."
 msgstr "Kein Spitzname angegeben"
 
-#: src/protocols/oscar/oscar.c:1497 src/protocols/oscar/oscar.c:2372
+#: src/protocols/oscar/oscar.c:1505 src/protocols/oscar/oscar.c:2457
 msgid "Gaim - ICQ Authorization Denied"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1503 src/protocols/oscar/oscar.c:2378
+#: src/protocols/oscar/oscar.c:1511 src/protocols/oscar/oscar.c:2463
 #, c-format
-msgid "The user %d has granted your request to add them to your contact list."
+msgid "The user %lu has granted your request to add them to your contact list."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1504 src/protocols/oscar/oscar.c:2379
+#: src/protocols/oscar/oscar.c:1512 src/protocols/oscar/oscar.c:2464
 msgid "Gaim - ICQ Authorization Granted"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1577
+#: src/protocols/oscar/oscar.c:1585
 #, c-format
 msgid "You missed %d message from %s because it was invalid."
 msgstr "Sie haben %d Nachricht von %s verpasst, da sie ungltig war."
 
-#: src/protocols/oscar/oscar.c:1578
+#: src/protocols/oscar/oscar.c:1586
 #, c-format
 msgid "You missed %d messages from %s because they were invalid."
 msgstr "Sie haben %d Nachrichten von %s verpasst, da sie ungltig waren."
 
-#: src/protocols/oscar/oscar.c:1587
+#: src/protocols/oscar/oscar.c:1595
 #, c-format
 msgid "You missed %d message from %s because it was too large."
 msgstr "Sie haben %d Nachricht von %s verpasst, da sie zu gro war."
 
-#: src/protocols/oscar/oscar.c:1588
+#: src/protocols/oscar/oscar.c:1596
 #, c-format
 msgid "You missed %d messages from %s because they were too large."
 msgstr "Sie haben %d Nachrichten von %s verpasst, da sie zu gro waren."
 
-#: src/protocols/oscar/oscar.c:1597
+#: src/protocols/oscar/oscar.c:1605
 #, c-format
 msgid "You missed %d message from %s because the rate limit has been exceeded."
 msgstr ""
 "Sie haben %d Nachricht von %s verpasst, da die Senderate berschritten wurde."
 
-#: src/protocols/oscar/oscar.c:1598
+#: src/protocols/oscar/oscar.c:1606
 #, c-format
 msgid ""
 "You missed %d messages from %s because the rate limit has been exceeded."
@@ -743,150 +1167,160 @@
 "Sie haben %d Nachrichten von %s verpasst, da die Senderate berschritten "
 "wurde."
 
-#: src/protocols/oscar/oscar.c:1607
+#: src/protocols/oscar/oscar.c:1615
 #, c-format
 msgid "You missed %d message from %s because it was too evil."
 msgstr "Sie haben %d Nachricht von %s verpasst, da sie zu boshaft war."
 
 # ???
-#: src/protocols/oscar/oscar.c:1608
+#: src/protocols/oscar/oscar.c:1616
 #, c-format
 msgid "You missed %d messages from %s because they are too evil."
 msgstr "Sie haben %d Nachrichten von %s verpasst, da sie zu boshaft waren."
 
 # ???
-#: src/protocols/oscar/oscar.c:1617
+#: src/protocols/oscar/oscar.c:1625
 #, c-format
 msgid "You missed %d message from %s because you are too evil."
 msgstr "Sie haben %d Nachricht von %s verpasst, da Sie zu boshaft sind."
 
 # ???
-#: src/protocols/oscar/oscar.c:1618
+#: src/protocols/oscar/oscar.c:1626
 #, c-format
 msgid "You missed %d messages from %s because you are too evil."
 msgstr "Sie haben %d Nachrichten von %s verpasst, da Sie zu boshaft sind."
 
-#: src/protocols/oscar/oscar.c:1626
+#: src/protocols/oscar/oscar.c:1634
 #, c-format
 msgid "You missed %d message from %s for unknown reasons."
 msgstr "Sie haben %d Nachricht von %s aus unbekannten Grnden verpasst."
 
-#: src/protocols/oscar/oscar.c:1627
+#: src/protocols/oscar/oscar.c:1635
 #, c-format
 msgid "You missed %d messages from %s for unknown reasons."
 msgstr "Sie haben %d Nachricht von %s aus unbekannten Grnden verpasst."
 
-#: src/dialogs.c:3034 src/dialogs.c:3040 src/protocols/oscar/oscar.c:1632
-#: src/protocols/oscar/oscar.c:1670 src/protocols/oscar/oscar.c:1688
-#: src/protocols/oscar/oscar.c:2141 src/protocols/yahoo/yahoo.c:585
+#: src/dialogs.c:3076 src/dialogs.c:3082 src/protocols/oscar/oscar.c:1640
+#: src/protocols/oscar/oscar.c:1755 src/protocols/oscar/oscar.c:1773
+#: src/protocols/oscar/oscar.c:2226 src/protocols/yahoo/yahoo.c:594
 msgid "Gaim - Error"
 msgstr "Gaim - Fehler"
 
-#: src/protocols/oscar/oscar.c:1649
+#: src/protocols/oscar/oscar.c:1703
+#, c-format
+msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR>%s<BR>"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:1705
+#, c-format
+msgid "<B>Status:</B> %s<BR><HR><BR>%s<BR>"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:1734
 #, c-format
 msgid "SNAC threw error: %s\n"
 msgstr "SNAC war den Fehler: %s\n"
 
-#: src/protocols/oscar/oscar.c:1651
+#: src/protocols/oscar/oscar.c:1736
 msgid "Gaim - Oscar SNAC Error"
 msgstr "Gaim - Oscar SNAC Fehler"
 
-#: src/protocols/oscar/oscar.c:1668
+#: src/protocols/oscar/oscar.c:1753
 #, c-format
 msgid "Your message to %s did not get sent: %s"
 msgstr "Ihre Nachricht zu %s wurde nicht gesendet: %s"
 
-#: src/protocols/oscar/oscar.c:1669 src/protocols/oscar/oscar.c:1687
+#: src/protocols/oscar/oscar.c:1754 src/protocols/oscar/oscar.c:1772
 msgid "Reason unknown"
 msgstr "Grund unbekannt"
 
-#: src/protocols/oscar/oscar.c:1686
+#: src/protocols/oscar/oscar.c:1771
 #, c-format
 msgid "User information for %s unavailable: %s"
 msgstr "Benutzerinformationen fr %s sind nicht verfgbar: %s"
 
-#: src/buddy.c:2060 src/protocols/oscar/oscar.c:1717
+#: src/buddy.c:2131 src/protocols/oscar/oscar.c:1802
 msgid "Buddy Icon"
 msgstr "Buddy-Icon"
 
-#: src/buddy.c:2063 src/protocols/oscar/oscar.c:1720
+#: src/buddy.c:2134 src/protocols/oscar/oscar.c:1805
 msgid "Voice"
 msgstr "Stimme"
 
-#: src/buddy.c:2066 src/protocols/oscar/oscar.c:1723
+#: src/buddy.c:2137 src/protocols/oscar/oscar.c:1808
 msgid "IM Image"
 msgstr "IM Bild"
 
-#: src/buddy.c:494 src/buddy.c:2069 src/buddy.c:2507 src/prefs.c:2912
-#: src/protocols/oscar/oscar.c:1726
+#: src/buddy.c:498 src/buddy.c:2140 src/buddy.c:2581 src/prefs.c:2926
+#: src/protocols/oscar/oscar.c:1811
 msgid "Chat"
 msgstr "Chat"
 
-#: src/buddy.c:2072 src/protocols/oscar/oscar.c:1729
+#: src/buddy.c:2143 src/protocols/oscar/oscar.c:1814
 msgid "Get File"
 msgstr "Datei holen"
 
-#: src/buddy.c:2075 src/protocols/oscar/oscar.c:1732
+#: src/buddy.c:2146 src/protocols/oscar/oscar.c:1817
 msgid "Send File"
 msgstr "Datei versenden"
 
-#: src/buddy.c:2079 src/protocols/oscar/oscar.c:1736
+#: src/buddy.c:2150 src/protocols/oscar/oscar.c:1821
 msgid "Games"
 msgstr "Spiele"
 
-#: src/buddy.c:2082 src/protocols/oscar/oscar.c:1739
+#: src/buddy.c:2153 src/protocols/oscar/oscar.c:1824
 msgid "Stocks"
 msgstr "Bestnde"
 
-#: src/buddy.c:2085 src/protocols/oscar/oscar.c:1742
+#: src/buddy.c:2156 src/protocols/oscar/oscar.c:1827
 msgid "Send Buddy List"
 msgstr "Buddy-Liste senden"
 
-#: src/buddy.c:2088 src/protocols/oscar/oscar.c:1745
+#: src/buddy.c:2159 src/protocols/oscar/oscar.c:1830
 msgid "EveryBuddy Bug"
 msgstr "EveryBuddy Bug"
 
-#: src/buddy.c:2091 src/protocols/oscar/oscar.c:1748
+#: src/buddy.c:2162 src/protocols/oscar/oscar.c:1833
 msgid "AP User"
 msgstr "AP Benutzer"
 
-#: src/buddy.c:2094 src/protocols/oscar/oscar.c:1751
+#: src/buddy.c:2165 src/protocols/oscar/oscar.c:1836
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
-#: src/buddy.c:2097 src/protocols/oscar/oscar.c:1754
+#: src/buddy.c:2168 src/protocols/oscar/oscar.c:1839
 msgid "Nihilist"
 msgstr "Nihilist"
 
-#: src/buddy.c:2100 src/protocols/oscar/oscar.c:1757
+#: src/buddy.c:2171 src/protocols/oscar/oscar.c:1842
 msgid "ICQ Server Relay"
 msgstr "ICQ Server Relay"
 
-#: src/buddy.c:2103 src/protocols/oscar/oscar.c:1760
+#: src/buddy.c:2174 src/protocols/oscar/oscar.c:1845
 msgid "ICQ Unknown"
 msgstr "ICQ Unbekannt"
 
-#: src/buddy.c:2106 src/protocols/oscar/oscar.c:1763
+#: src/buddy.c:2177 src/protocols/oscar/oscar.c:1848
 msgid "Trillian Encryption"
 msgstr "Trillian Verschlsselung"
 
-#: src/protocols/oscar/oscar.c:1801
+#: src/protocols/oscar/oscar.c:1886
 msgid ""
-"<br><BODY BGCOLOR=WHITE><hr><I>Legend:</I><br><br><IMG "
-"SRC=\"free_icon.gif\"> : Normal AIM User<br><IMG SRC=\"aol_icon.gif\"> : AOL "
-"User <br><IMG SRC=\"dt_icon.gif\"> : Trial AIM User <br><IMG "
-"SRC=\"admin_icon.gif\"> : Administrator <br><IMG SRC=\"ab_icon.gif\"> : "
-"ActiveBuddy Interactive Agent<br><IMG SRC=\"wireless_icon.gif\"> : Wireless "
-"Device User<br>"
+"<br><BODY BGCOLOR=WHITE><hr><I>Legend:</I><br><br><IMG SRC=\"free_icon.gif"
+"\"> : Normal AIM User<br><IMG SRC=\"aol_icon.gif\"> : AOL User <br><IMG SRC="
+"\"dt_icon.gif\"> : Trial AIM User <br><IMG SRC=\"admin_icon.gif\"> : "
+"Administrator <br><IMG SRC=\"ab_icon.gif\"> : ActiveBuddy Interactive "
+"Agent<br><IMG SRC=\"wireless_icon.gif\"> : Wireless Device User<br>"
 msgstr ""
-"<br><BODY BGCOLOR=WHITE><hr><I>Legende:</I><br><br><IMG "
-"SRC=\"free_icon.gif\"> : Normaler AIM-Benutzer<br><IMG SRC=\"aol_icon.gif\"> "
-": AOL Benutzer <br><IMG SRC=\"dt_icon.gif\"> : AIM Test-Benutzer <br><IMG "
-"SRC=\"admin_icon.gif\"> : Administrator <br><IMG SRC=\"ab_icon.gif\"> : "
-"ActiveBuddy Interaktiver Agent<br><IMG SRC=\"wireless_icon.gif\"> : Benutzer "
-"eines drahtlosen Gerts<br>"
-
-#: src/protocols/oscar/oscar.c:1829
+"<br><BODY BGCOLOR=WHITE><hr><I>Legende:</I><br><br><IMG SRC=\"free_icon.gif"
+"\"> : Normaler AIM-Benutzer<br><IMG SRC=\"aol_icon.gif\"> : AOL Benutzer "
+"<br><IMG SRC=\"dt_icon.gif\"> : AIM Test-Benutzer <br><IMG SRC=\"admin_icon."
+"gif\"> : Administrator <br><IMG SRC=\"ab_icon.gif\"> : ActiveBuddy "
+"Interaktiver Agent<br><IMG SRC=\"wireless_icon.gif\"> : Benutzer eines "
+"drahtlosen Gerts<br>"
+
+#: src/protocols/oscar/oscar.c:1914
+#, c-format
 msgid ""
 "Username : <B>%s</B>  %s <BR>\n"
 "Warning Level : <B>%d %%</B><BR>\n"
@@ -898,27 +1332,27 @@
 "%s%s%s<BR>\n"
 "<HR><BR>\n"
 
-#: src/protocols/oscar/oscar.c:1861
+#: src/protocols/oscar/oscar.c:1946
 msgid "<i>User has no away message</i>"
 msgstr "<i>Benutzer hat keine Abwesenheits-Mitteilung</i>"
 
-#: src/protocols/oscar/oscar.c:1873
+#: src/protocols/oscar/oscar.c:1958
 msgid "Client Capabilities: "
 msgstr "Client-Fhigkeiten: "
 
-#: src/protocols/oscar/oscar.c:1881
+#: src/protocols/oscar/oscar.c:1966
 msgid "<i>No Information Provided</i>"
 msgstr "<i>Keine Information bereitgestellt</i>"
 
-#: src/protocols/oscar/oscar.c:1904
+#: src/protocols/oscar/oscar.c:1989
 msgid "Your connection may be lost."
 msgstr "Die Verbindung wurde unterbrochen"
 
-#: src/protocols/oscar/oscar.c:1905
+#: src/protocols/oscar/oscar.c:1990
 msgid "AOL error"
 msgstr "AOL-Fehler"
 
-#: src/protocols/oscar/oscar.c:2140
+#: src/protocols/oscar/oscar.c:2225
 msgid ""
 "The last message was not sent because you are over the rate limit. Please "
 "wait 10 seconds and try again."
@@ -926,26 +1360,38 @@
 "Die letzte Nachricht wurde nicht verschickt, da die Senderate berschritten "
 "wurde. Bitte warten Sie 10 Sekunden und versuchen Sie es erneut."
 
-#: src/dialogs.c:3563 src/protocols/oscar/oscar.c:2482
-#: src/protocols/oscar/oscar.c:3407 src/protocols/toc/toc.c:1561
-#: src/protocols/toc/toc.c:1578 src/protocols/toc/toc.c:1638
-#: src/protocols/toc/toc.c:1680 src/protocols/toc/toc.c:1799
-#: src/protocols/toc/toc.c:1829 src/protocols/toc/toc.c:1885
+#: src/dialogs.c:3604 src/protocols/oscar/oscar.c:2589
+#: src/protocols/oscar/oscar.c:3541 src/protocols/toc/toc.c:1564
+#: src/protocols/toc/toc.c:1581 src/protocols/toc/toc.c:1641
+#: src/protocols/toc/toc.c:1683 src/protocols/toc/toc.c:1802
+#: src/protocols/toc/toc.c:1832 src/protocols/toc/toc.c:1888
 msgid "Error"
 msgstr "Fehler"
 
+#: src/protocols/oscar/oscar.c:3192
+#, c-format
+msgid ""
+"The maximum number of buddies allowed in your buddy list is %d, and you have "
+"%d.  Until you are below the limit, some buddies will not show up as online."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3195
+#, fuzzy
+msgid "Gaim - Warning"
+msgstr "Gaim - Benutzer warnen?"
+
 # Ich bin mir nicht sicher was "Exchange" hier genau bedeutet.
-#: src/protocols/oscar/oscar.c:3079 src/protocols/toc/toc.c:1105
+#: src/protocols/oscar/oscar.c:3213 src/protocols/toc/toc.c:1108
 msgid "Exchange:"
 msgstr "Austausch:"
 
 # "Direct IM"
-#: src/protocols/oscar/oscar.c:3407
+#: src/protocols/oscar/oscar.c:3541
 msgid "Unable to open Direct IM"
 msgstr "Direkte Verbindung nicht mglich"
 
 # Direct IM
-#: src/protocols/oscar/oscar.c:3417
+#: src/protocols/oscar/oscar.c:3551
 #, c-format
 msgid ""
 "You have selected to open a Direct IM connection with %s. Doing this will "
@@ -956,11 +1402,30 @@
 "kann er Ihre ipadresse sehn und knnte ein sicherheitsrisiko darstellen. "
 "Mchten Sie weitermachen?"
 
-#: src/protocols/oscar/oscar.c:3450
+#: src/protocols/oscar/oscar.c:3568
+#, c-format
+msgid ""
+"<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR><I>Remote client does not "
+"support sending status messages.</I><BR>"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3575
+#, c-format
+msgid ""
+"<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR><I>User has no status message."
+"</I><BR>"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3600
+#, fuzzy
+msgid "Get Status Msg"
+msgstr "Abwesenheits-Mitteilung holen"
+
+#: src/protocols/oscar/oscar.c:3613
 msgid "Direct IM"
 msgstr "Direkte Nachricht"
 
-#: src/protocols/oscar/oscar.c:3458
+#: src/protocols/oscar/oscar.c:3621
 msgid "Get Capabilities"
 msgstr "Fhigkeiten holen"
 
@@ -1109,7 +1574,7 @@
 msgid "Password Change Successful"
 msgstr "Passwort-nderung erfolgreich"
 
-#: src/dialogs.c:1688 src/protocols/toc/toc.c:782
+#: src/dialogs.c:1730 src/protocols/toc/toc.c:782
 msgid "Gaim - Password Change"
 msgstr "Gaim - Passwort-nderung"
 
@@ -1128,70 +1593,71 @@
 msgid "TOC Pause"
 msgstr "TOC Pause"
 
-#: src/protocols/toc/toc.c:1222
+#: src/protocols/toc/toc.c:1225
 msgid "Get Dir Info"
 msgstr "Verzeichnis Information holen"
 
-#: src/protocols/toc/toc.c:1638 src/protocols/toc/toc.c:1680
-#: src/protocols/toc/toc.c:1799 src/protocols/toc/toc.c:1885
+#: src/protocols/toc/toc.c:1641 src/protocols/toc/toc.c:1683
+#: src/protocols/toc/toc.c:1802 src/protocols/toc/toc.c:1888
 msgid "Could not connect for transfer!"
 msgstr "bertragungsverbindung konnte nicht hergestellt werden!"
 
-#: src/protocols/toc/toc.c:1829
+#: src/protocols/toc/toc.c:1832
 msgid "Could not write file header!"
 msgstr "Dateikopf konnte nicht geschrieben werden!"
 
-#: src/protocols/toc/toc.c:1918
+#: src/protocols/toc/toc.c:1921
 msgid "Gaim - Save As..."
 msgstr "Gaim - Speichern unter..."
 
-#: src/protocols/toc/toc.c:1959
+#: src/protocols/toc/toc.c:1962
 #, c-format
 msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
 msgstr "%s bittet %s %d Datei zu akzeptieren: %s (%.2f %s)%s%s "
 
-#: src/protocols/toc/toc.c:1960
+#: src/protocols/toc/toc.c:1963
 #, c-format
 msgid "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
 msgstr "%s bittet %s %d Dateien zu akzeptieren: %s (%.2f %s)%s%s "
 
-#: src/protocols/toc/toc.c:1965
+#: src/protocols/toc/toc.c:1968
 #, c-format
 msgid "%s requests you to send them a file"
 msgstr "%s bittet Sie eine Datei zu senden"
 
-#: src/protocols/yahoo/yahoo.c:585
+#: src/protocols/yahoo/yahoo.c:594
 msgid "Your message did not get sent."
 msgstr "Die Nachricht wurde nicht verschickt"
 
 # ???
-#: src/protocols/zephyr/zephyr.c:802
+#: src/protocols/zephyr/zephyr.c:840
 msgid "ZLocate"
 msgstr "ZLocate"
 
-#: src/protocols/zephyr/zephyr.c:839
+#: src/protocols/zephyr/zephyr.c:877
 msgid "Class:"
 msgstr "Klasse:"
 
-#: src/protocols/zephyr/zephyr.c:843
+#: src/protocols/zephyr/zephyr.c:881
 msgid "Instance:"
 msgstr "Instanz:"
 
-#: src/protocols/zephyr/zephyr.c:847
+#: src/protocols/zephyr/zephyr.c:885
 msgid "Recipient:"
 msgstr "Empfnger:"
 
 # "Info" ist die offizielle GNOME bersetzung
-#: src/about.c:93
+#: src/about.c:102
 #, c-format
 msgid "About Gaim v%s"
 msgstr "Info zu Gaim v%s"
 
-#: src/about.c:126
+#: src/about.c:135
+#, fuzzy
 msgid ""
-"Gaim is a client that supports AOL's Instant Messenger protocol. It is "
-"written\n"
-"using Gtk+ and is licensed under the GPL.\n"
+"Gaim is a modular Instant Messaging client capable of using AIM, ICQ,\n"
+"Yahoo!, MSN, IRC, Jabber, Napster, Zephyr, and Gadu-Gadu all at once.\n"
+"It is written using Gtk+ and is licensed under the GPL.\n"
 "\n"
 "URL: "
 msgstr ""
@@ -1202,6 +1668,16 @@
 
 #: src/about.c:137
 msgid ""
+"\n"
+"\n"
+"IRC: #gaim on irc.openprojects.net"
+msgstr ""
+"\n"
+"\n"
+"IRC: #gaim auf irc.openprojects.net"
+
+#: src/about.c:147
+msgid ""
 "Active Developers\n"
 "====================\n"
 "Rob Flynn (maintainer) [ rob@marko.net ]\n"
@@ -1238,100 +1714,98 @@
 "Eric Warmenhoven                   [ warmenhoven@yahoo.com ]\n"
 "Mark Spencer (original author)   [ markster@marko.net ]"
 
-#: src/about.c:155 src/aim.c:318 src/buddy.c:2633 src/buddy_chat.c:1311
-#: src/buddy_chat.c:1408 src/buddy_chat.c:1438 src/conversation.c:2795
-#: src/dialogs.c:568 src/dialogs.c:3858 src/multi.c:1057 src/plugins.c:277
-#: src/prefs.c:2535 src/prpl.c:438 src/prpl.c:679 src/server.c:1050
-msgid "Close"
-msgstr "Schlieen"
-
 #. this makes the sizes not work.
 #. GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
 #. gtk_widget_grab_default(button);
-#: src/about.c:175
+#: src/about.c:185
 msgid "Web Site"
 msgstr "Webseite"
 
-#: src/aim.c:151 src/buddy.c:2626
+#: src/aim.c:153 src/buddy.c:2709
 msgid "Signoff"
 msgstr "Abmelden"
 
-#: src/aim.c:163
+#: src/aim.c:165
 msgid "Please enter your logon"
 msgstr "Bitte geben Sie einen Benutzernamen ein"
 
-#: src/aim.c:163 src/multi.c:1388 src/server.c:55
+#: src/aim.c:165 src/multi.c:1400 src/server.c:55
 msgid "Signon Error"
 msgstr "Anmeldefehler"
 
-#: src/aim.c:261
+#: src/aim.c:263
 msgid "Gaim - Login"
 msgstr "Gaim - Anmeldung"
 
-#: src/aim.c:279
+#: src/aim.c:281
 msgid "Screen Name: "
 msgstr "Benutzername: "
 
-#: src/aim.c:295
+#: src/aim.c:297
 msgid "Password: "
 msgstr "Passwort: "
 
-#: src/aim.c:316 src/buddy.c:2630
+#: src/aim.c:318 src/buddy.c:2713
 msgid "Quit"
 msgstr "Beenden"
 
-#: src/aim.c:321 src/aim.c:819 src/buddy.c:2656
+#: src/aim.c:323 src/aim.c:831 src/buddy.c:2739
 msgid "Accounts"
 msgstr "Konten"
 
-#: src/aim.c:323 src/multi.c:903
+#: src/aim.c:325 src/multi.c:915
 msgid "Signon"
 msgstr "Anmelden"
 
 # "Info" ist die offizielle GNOME bersetzung
-#: src/aim.c:355
+#: src/aim.c:357
 msgid "About"
 msgstr "Info"
 
-#: src/aim.c:356 src/prefs.c:1619 src/prefs.c:1893
+#: src/aim.c:358 src/prefs.c:1633 src/prefs.c:1905
 msgid "Options"
 msgstr "Einstellungen"
 
-#: src/aim.c:358 src/aim.c:822 src/buddy.c:2674
+#: src/aim.c:360 src/aim.c:834 src/buddy.c:2757
 msgid "Plugins"
 msgstr "Plugins"
 
-#: src/aim.c:816 src/buddy.c:2666
+#: src/aim.c:828 src/buddy.c:2749
 msgid "Preferences"
 msgstr "Einstellungen"
 
-#: src/applet.c:199
+#: src/aim.c:838 src/multi.c:1472
+#, fuzzy
+msgid "Auto-login"
+msgstr "Auto-Login"
+
+#: src/applet.c:109
 msgid "Attempting to sign on...."
 msgstr "Anmeldeversuch..."
 
-#: src/applet.c:202
+#: src/applet.c:112
 msgid "Offline. Click to bring up login box."
 msgstr "Offline. Hier klicken, um das Anmeldefenster zu ffnen."
 
-#: src/applet.c:218
+#: src/applet.c:128
 #, c-format
 msgid "Away: %d pending."
 msgstr "Abwesend: %d ausstehend."
 
-#: src/applet.c:221
+#: src/applet.c:131
 msgid "Away."
 msgstr "Abwesend."
 
-#: src/applet.c:296 src/away.c:388
+#: src/applet.c:200 src/away.c:388
 msgid "New Away Message"
 msgstr "Neue Abwesenheits-Mitteilung"
 
-#: src/applet.c:444
+#: src/applet.c:348
 msgid "Can't create Gaim applet!"
 msgstr "Gaim-Applet kann nicht erstellt werden"
 
 # "Info" ist die offizielle GNOME-bersetzung
-#: src/applet.c:465
+#: src/applet.c:368
 msgid "About..."
 msgstr "Info..."
 
@@ -1355,87 +1829,74 @@
 msgid "Set All Away"
 msgstr "Alle auf Abwesend setzen"
 
-#. Put the buttons in the box
-#: src/buddy.c:488 src/buddy.c:2741 src/buddy_chat.c:1443
-#: src/conversation.c:2328 src/conversation.c:2810 src/dialogs.c:890
-#: src/dialogs.c:1072 src/dialogs.c:2053 src/multi.c:1041 src/prefs.c:2029
-#: src/prefs.c:2371 src/prefs.c:2405
-msgid "Add"
-msgstr "Hinzufgen"
-
-#: src/buddy.c:489 src/buddy.c:2742 src/dialogs.c:900 src/dialogs.c:1047
+#: src/buddy.c:493 src/buddy.c:2828 src/dialogs.c:942 src/dialogs.c:1089
 msgid "Group"
 msgstr "Gruppe"
 
-#: src/buddy.c:490 src/buddy.c:2743 src/buddy_chat.c:1445
-#: src/conversation.c:2314 src/conversation.c:2807 src/prefs.c:2043
-#: src/prefs.c:2375 src/prefs.c:2409
-msgid "Remove"
-msgstr "Entfernen"
-
-#: src/buddy.c:495 src/buddy.c:646 src/buddy.c:798 src/buddy.c:2505
-#: src/buddy_chat.c:850 src/buddy_chat.c:1267
+#: src/buddy.c:499 src/buddy.c:664 src/buddy.c:834 src/buddy.c:2579
+#: src/buddy_chat.c:861 src/buddy_chat.c:1278
 msgid "IM"
 msgstr "Nachricht"
 
-#: src/buddy.c:496 src/buddy.c:2506 src/buddy_chat.c:866 src/buddy_chat.c:1275
-#: src/buddy_chat.c:1451 src/conversation.c:2828
+#: src/buddy.c:500 src/buddy.c:2580 src/buddy_chat.c:877 src/buddy_chat.c:1286
+#: src/buddy_chat.c:1462 src/conversation.c:2897
 msgid "Info"
 msgstr "Info"
 
 #. Put the buttons in the box
-#: src/buddy.c:651 src/buddy.c:803 src/dialogs.c:1039 src/dialogs.c:3417
-#: src/dialogs.c:3432
+#: src/buddy.c:669 src/buddy.c:839 src/dialogs.c:1081 src/dialogs.c:3458
+#: src/dialogs.c:3473
 msgid "Alias"
 msgstr "Alias"
 
-#: src/buddy.c:656 src/buddy.c:822
+#: src/buddy.c:674 src/buddy.c:858
 msgid "Add Buddy Pounce"
 msgstr "Buddy-Alarm hinzufgen"
 
-#: src/buddy.c:663 src/buddy.c:828
+#: src/buddy.c:681 src/buddy.c:864
 msgid "View Log"
 msgstr "Mitschnitt anzeigen"
 
-#: src/buddy.c:785 src/buddy.c:816
+#: src/buddy.c:821 src/buddy.c:852
 msgid "Rename"
 msgstr "Name ndern"
 
-#: src/buddy.c:810
+#: src/buddy.c:846
 msgid "Un-Alias"
 msgstr "Alias entfernen"
 
-#: src/buddy.c:1581 src/buddy.c:2649
+#: src/buddy.c:1645 src/buddy.c:2732
 msgid "Buddy Pounce"
 msgstr "Buddy-Alarm"
 
-#: src/buddy.c:1661
+#: src/buddy.c:1725
 msgid "New Buddy Pounce"
 msgstr "Neuer Buddy-Alarm"
 
-#: src/buddy.c:1679
+#: src/buddy.c:1743
 msgid "Remove Buddy Pounce"
 msgstr "Buddy-Alarm entfernen"
 
-#: src/buddy.c:1707
+#: src/buddy.c:1771
 msgid "[Click to edit]"
 msgstr "[Zum Bearbeiten anklicken]"
 
-#: src/buddy.c:2183
+#: src/buddy.c:2254
 #, c-format
 msgid "Logged in: %s\n"
 msgstr "Angemeldet: %s\n"
 
-#: src/buddy.c:2195
+#: src/buddy.c:2266
+#, c-format
 msgid "Warnings: %d%%\n"
 msgstr "Warnungen: %d%%\n"
 
-#: src/buddy.c:2207
+#: src/buddy.c:2278
 #, c-format
 msgid "Capabilities: %s\n"
 msgstr "Fhigkeiten: %s\n"
 
-#: src/buddy.c:2211
+#: src/buddy.c:2282
 #, c-format
 msgid ""
 "Alias: %s               \n"
@@ -1446,118 +1907,128 @@
 "Bildschirmname: %s\n"
 "%s%s%s%s%s%s"
 
-#: src/buddy.c:2215
+#: src/buddy.c:2286
 msgid "Idle: "
 msgstr "Inaktiv:"
 
-#: src/buddy.c:2286 src/buddy.c:2291
+#: src/buddy.c:2359 src/buddy.c:2364
 #, c-format
 msgid "%s logged in."
 msgstr "%s hat sich angemeldet."
 
-#: src/buddy.c:2350 src/buddy.c:2355
+#: src/buddy.c:2424 src/buddy.c:2429
 #, c-format
 msgid "%s logged out."
 msgstr "%s hat sich abgemeldet."
 
-#: src/buddy.c:2540
+#: src/buddy.c:2614
 msgid "Information on selected Buddy"
 msgstr "Info ber ausgewhlten Buddy"
 
-#: src/buddy.c:2541 src/dialogs.c:697
+#: src/buddy.c:2615 src/dialogs.c:697
 msgid "Send Instant Message"
 msgstr "Nachricht senden"
 
-#: src/buddy.c:2542
+#: src/buddy.c:2616
 msgid "Start/join a Buddy Chat"
 msgstr "Buddy-Chat starten"
 
-#: src/buddy.c:2543
+#: src/buddy.c:2617
 msgid "Activate Away Message"
 msgstr "Abwesenheits-Mitteilung aktivieren"
 
-#: src/buddy.c:2606
+#: src/buddy.c:2689
 msgid "File"
 msgstr "Datei"
 
-#: src/buddy.c:2610
+#: src/buddy.c:2693
 msgid "Add A Buddy"
 msgstr "Buddy hinzufgen"
 
 # vgl. "Join Chat"
-#: src/buddy.c:2612
+#: src/buddy.c:2695
 msgid "Join A Chat"
 msgstr "Einen Chat betreten"
 
-#: src/buddy.c:2614
+#: src/buddy.c:2697
 msgid "New Instant Message"
 msgstr "Neue Nachricht"
 
-#: src/buddy.c:2616 src/dialogs.c:749
+#: src/buddy.c:2699 src/dialogs.c:759
 msgid "Get User Info"
 msgstr "Benutzer-Info holen"
 
-#: src/buddy.c:2621
+#: src/buddy.c:2704
 msgid "Import Buddy List"
 msgstr "Buddy-Liste importieren"
 
-#: src/buddy.c:2639
+#: src/buddy.c:2722
 msgid "Tools"
 msgstr "System"
 
-#: src/buddy.c:2662
+#: src/buddy.c:2745
 msgid "Protocol Actions"
 msgstr "Protokoll-Aktionen"
 
-#: src/buddy.c:2668
+#: src/buddy.c:2751
 msgid "View System Log"
 msgstr "System-Mitschnitt anzeigen"
 
-#: src/buddy.c:2680
+#: src/buddy.c:2763
 msgid "Perl"
 msgstr "Perl"
 
-#: src/buddy.c:2683
+#: src/buddy.c:2766
 msgid "Load Script"
 msgstr "Skript laden"
 
-#: src/buddy.c:2687
+#: src/buddy.c:2770
 msgid "Unload All Scripts"
 msgstr "Alle Skripte entladen"
 
-#: src/buddy.c:2691
+#: src/buddy.c:2774
 msgid "List Scripts"
 msgstr "Skripte zeigen"
 
-#: src/buddy.c:2699
+#: src/buddy.c:2782
 msgid "Help"
 msgstr "Hilfe"
 
-#: src/buddy.c:2704
+#: src/buddy.c:2787
+#, fuzzy
+msgid "Online Help"
+msgstr "Online"
+
+#: src/buddy.c:2788
+#, fuzzy
+msgid "Debug Window"
+msgstr "Debug-Fenster zeigen"
+
+#: src/buddy.c:2789
 msgid "About Gaim"
 msgstr "Info ber Gaim"
 
-#: src/buddy.c:2721 src/prefs.c:2891
+#: src/buddy.c:2807 src/prefs.c:2905
 msgid "Buddy List"
 msgstr "Buddy-Liste"
 
-#: src/buddy.c:2774
+#: src/buddy.c:2860
 msgid "Add a new Buddy"
 msgstr "Buddy hinzufgen"
 
-#: src/buddy.c:2775
+#: src/buddy.c:2861
 msgid "Add a new Group"
 msgstr "Neue Gruppe hinzufgen"
 
-#: src/buddy.c:2776
+#: src/buddy.c:2862
 msgid "Remove selected Buddy/Group"
 msgstr "Ausgewhlten Buddy/Gruppe entfernen"
 
-#: src/buddy.c:2803
+#: src/buddy.c:2889
 msgid "Edit Buddies"
 msgstr "Buddies bearbeiten"
 
-#: src/buddy.c:2846
+#: src/buddy.c:2932
 msgid "Gaim - Buddy List"
 msgstr "Gaim - Buddy-Liste"
 
@@ -1565,22 +2036,18 @@
 msgid "Join Chat"
 msgstr "Chat betreten"
 
-#: src/buddy_chat.c:272
-msgid "Buddy Chat"
-msgstr "Buddy-Chat"
-
 # vgl. "Join Chat"!
 #: src/buddy_chat.c:283
 msgid "Join Chat As:"
 msgstr "Chat betreten als:"
 
-#: src/buddy_chat.c:304 src/buddy_chat.c:392 src/dialogs.c:450
-#: src/dialogs.c:540 src/dialogs.c:715 src/dialogs.c:773 src/dialogs.c:892
-#: src/dialogs.c:1068 src/dialogs.c:1431 src/dialogs.c:1636 src/dialogs.c:1760
-#: src/dialogs.c:1820 src/dialogs.c:2042 src/dialogs.c:2224 src/dialogs.c:2399
-#: src/dialogs.c:2470 src/dialogs.c:3166 src/dialogs.c:3419 src/dialogs.c:3600
-#: src/dialogs.c:3971 src/dialogs.c:4077 src/dialogs.c:4736 src/multi.c:769
-#: src/multi.c:899 src/prpl.c:150 src/prpl.c:224
+#: src/buddy_chat.c:304 src/buddy_chat.c:392 src/dialogs.c:449
+#: src/dialogs.c:539 src/dialogs.c:715 src/dialogs.c:816 src/dialogs.c:934
+#: src/dialogs.c:1110 src/dialogs.c:1473 src/dialogs.c:1678 src/dialogs.c:1802
+#: src/dialogs.c:1862 src/dialogs.c:2084 src/dialogs.c:2266 src/dialogs.c:2441
+#: src/dialogs.c:2512 src/dialogs.c:3208 src/dialogs.c:3460 src/dialogs.c:3641
+#: src/dialogs.c:4012 src/dialogs.c:4118 src/dialogs.c:4777 src/multi.c:781
+#: src/multi.c:911 src/prpl.c:150 src/prpl.c:224
 msgid "Cancel"
 msgstr "Abbrechen"
 
@@ -1588,16 +2055,16 @@
 msgid "Join"
 msgstr "Betreten"
 
-#: src/buddy_chat.c:393 src/buddy_chat.c:396 src/buddy_chat.c:1317
-#: src/buddy_chat.c:1407
+#: src/buddy_chat.c:393 src/buddy_chat.c:396 src/buddy_chat.c:1328
+#: src/buddy_chat.c:1418
 msgid "Invite"
 msgstr "Einladen"
 
-#: src/buddy_chat.c:412 src/dialogs.c:1259 src/dialogs.c:3427
+#: src/buddy_chat.c:412 src/dialogs.c:1301 src/dialogs.c:3468
 msgid "Buddy"
 msgstr "Buddy"
 
-#: src/buddy_chat.c:417 src/prefs.c:1992
+#: src/buddy_chat.c:417 src/prefs.c:2004
 msgid "Message"
 msgstr "Nachricht"
 
@@ -1605,286 +2072,282 @@
 msgid "Gaim - Invite Buddy Into Chat Room"
 msgstr "Gaim - Buddy in einen Chatraum einladen"
 
-#: src/buddy_chat.c:857
+#: src/buddy_chat.c:868
 msgid "Un-Ignore"
 msgstr "Beachten"
 
-#: src/buddy_chat.c:859 src/buddy_chat.c:1271
+#: src/buddy_chat.c:870 src/buddy_chat.c:1282
 msgid "Ignore"
 msgstr "Ignorieren"
 
 #. don't remove them from ignored in case they re-enter
-#: src/buddy_chat.c:922 src/buddy_chat.c:1034 src/buddy_chat.c:1497
-#: src/buddy_chat.c:1530
+#: src/buddy_chat.c:933 src/buddy_chat.c:1045 src/buddy_chat.c:1508
+#: src/buddy_chat.c:1541
 #, c-format
 msgid "%d %s in room"
 msgstr "%d %s im Raum"
 
-#: src/buddy_chat.c:930
+#: src/buddy_chat.c:941
 #, c-format
 msgid "%s entered the room."
 msgstr "%s hat den Raum betreten."
 
-#: src/buddy_chat.c:996
+#: src/buddy_chat.c:1007
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s heit jetzt %s"
 
-#: src/buddy_chat.c:1043
+#: src/buddy_chat.c:1054
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s hat den Raum verlassen (%s)."
 
-#: src/buddy_chat.c:1045
+#: src/buddy_chat.c:1056
 #, c-format
 msgid "%s left the room."
 msgstr "%s hat den Raum verlassen"
 
-#: src/buddy_chat.c:1144
+#: src/buddy_chat.c:1155
 msgid "Gaim - Group Chats"
 msgstr "Gaim - Gruppenchats"
 
-#: src/buddy_chat.c:1207
+#: src/buddy_chat.c:1218
 msgid "Topic:"
 msgstr "Thema:"
 
-#: src/buddy_chat.c:1248
+#: src/buddy_chat.c:1259
 msgid "0 people in room"
 msgstr "0 Leute im Raum"
 
-#: src/buddy_chat.c:1322 src/buddy_chat.c:1406
+#: src/buddy_chat.c:1333 src/buddy_chat.c:1417
 msgid "Whisper"
 msgstr "Flstern"
 
-#: src/buddy_chat.c:1327 src/buddy_chat.c:1404 src/buddy_chat.c:1453
-#: src/conversation.c:2839
+#: src/buddy_chat.c:1338 src/buddy_chat.c:1415 src/buddy_chat.c:1464
+#: src/conversation.c:2908
 msgid "Send"
 msgstr "Abschicken"
 
-#: src/buddy_chat.c:1447 src/conversation.c:2816
+#: src/buddy_chat.c:1458 src/conversation.c:2885
 msgid "Block"
 msgstr "Sperren"
 
-#: src/buddy_chat.c:1449 src/conversation.c:2822 src/dialogs.c:425
-#: src/dialogs.c:454
+#: src/buddy_chat.c:1460 src/conversation.c:2891 src/dialogs.c:424
+#: src/dialogs.c:453
 msgid "Warn"
 msgstr "Warnen"
 
-#: src/conversation.c:413
+#: src/conversation.c:431
 msgid "Gaim - Save Conversation"
 msgstr "Gaim - Unterhaltung speichern"
 
-#: src/conversation.c:474
+#: src/conversation.c:492
 msgid "Gaim - Insert Image"
 msgstr "Gaim - Bild einfgen"
 
-#: src/conversation.c:1278
+#: src/conversation.c:1336
 msgid "Unable to send message: too large"
 msgstr "Nachricht kann nicht gesendet werden: zu gro"
 
-#: src/conversation.c:1278 src/conversation.c:1282
+#: src/conversation.c:1336 src/conversation.c:1340
 msgid "Message Error"
 msgstr "Nachrichten-Fehler"
 
-#: src/conversation.c:1282
+#: src/conversation.c:1340
 msgid "Unable to send message: Unknown reason"
 msgstr "Nachricht kann nicht gesendet werden: Unbekannter Grund"
 
-#: src/conversation.c:1501
+#: src/conversation.c:1559
 #, c-format
 msgid "Currently at %d, "
 msgstr "Momentan bei %d, "
 
-#: src/conversation.c:1509
+#: src/conversation.c:1567
 #, c-format
 msgid "Setting position to %d\n"
 msgstr "Setze Position auf %d\n"
 
-#: src/conversation.c:2110 src/prefs.c:1305
+#: src/conversation.c:2170 src/prefs.c:1308
 msgid "Bold Text"
 msgstr "Fetter Text"
 
-#: src/conversation.c:2110
+#: src/conversation.c:2170
 msgid "Bold"
 msgstr "Fett"
 
-#: src/conversation.c:2114
+#: src/conversation.c:2174
 msgid "Italics Text"
 msgstr "Kursiver Text"
 
-#: src/conversation.c:2115
+#: src/conversation.c:2175
 msgid "Italics"
 msgstr "Kursiv"
 
-#: src/conversation.c:2118 src/prefs.c:1317
+#: src/conversation.c:2178 src/prefs.c:1320
 msgid "Underline Text"
 msgstr "Unterstrichener Text"
 
-#: src/conversation.c:2119
+#: src/conversation.c:2179
 msgid "Underline"
 msgstr "Unterstrichen"
 
-#: src/conversation.c:2123 src/prefs.c:1323
+#: src/conversation.c:2183 src/prefs.c:1326
 msgid "Strike through Text"
 msgstr "Durchgestrichener Text"
 
-#: src/conversation.c:2123
+#: src/conversation.c:2183
 msgid "Strike"
 msgstr "Durchgestrichen"
 
-#: src/conversation.c:2129
+#: src/conversation.c:2189
 msgid "Decrease font size"
 msgstr "Schrift verkleinern"
 
-#: src/conversation.c:2129
+#: src/conversation.c:2189
 msgid "Small"
 msgstr "Klein"
 
-#: src/conversation.c:2132
+#: src/conversation.c:2192
 msgid "Normal font size"
 msgstr "Normale Schriftgre"
 
-#: src/conversation.c:2132
+#: src/conversation.c:2192
 msgid "Normal"
 msgstr "Normal"
 
-#: src/conversation.c:2135
+#: src/conversation.c:2195
 msgid "Increase font size"
 msgstr "Schrift vergrern"
 
-#: src/conversation.c:2135
+#: src/conversation.c:2195
 msgid "Big"
 msgstr "Gro"
 
-#: src/conversation.c:2142 src/dialogs.c:2841 src/dialogs.c:2865
+#: src/conversation.c:2202 src/dialogs.c:2883 src/dialogs.c:2907
 msgid "Select Font"
 msgstr "Schriftart whlen "
 
-#: src/conversation.c:2143
+#: src/conversation.c:2203
 msgid "Font"
 msgstr "Schriftart"
 
-#: src/conversation.c:2146 src/prefs.c:1353
+#: src/conversation.c:2206 src/prefs.c:1356
 msgid "Text Color"
 msgstr "Text-Farbe"
 
-#: src/conversation.c:2147 src/conversation.c:2151
+#: src/conversation.c:2207 src/conversation.c:2211
 msgid "Color"
 msgstr "Farbe"
 
-#: src/conversation.c:2151 src/prefs.c:1371
+#: src/conversation.c:2211 src/prefs.c:1374
 msgid "Background Color"
 msgstr "Hintergrundfarbe"
 
-#: src/conversation.c:2158 src/dialogs.c:2464
+#: src/conversation.c:2218 src/dialogs.c:2506
 msgid "Insert Link"
 msgstr "Link einfgen"
 
-#: src/conversation.c:2159
+#: src/conversation.c:2219
 msgid "Link"
 msgstr "Link"
 
-#: src/conversation.c:2162
+#: src/conversation.c:2222
 msgid "Insert smiley face"
 msgstr "Smiley-Gesicht einfgen"
 
-#: src/conversation.c:2162
+#: src/conversation.c:2222
 msgid "Smiley"
 msgstr "Smiley"
 
-#: src/conversation.c:2165
+#: src/conversation.c:2225
 msgid "Insert IM Image"
 msgstr "IM Bild einfgen"
 
-#: src/conversation.c:2165
+#: src/conversation.c:2225
 msgid "Image"
 msgstr "Bild"
 
-#: src/conversation.c:2172
+#: src/conversation.c:2232
 msgid "Enable logging"
 msgstr "Mitschnitt aktivieren"
 
-#: src/conversation.c:2173 src/prefs.c:254
+#: src/conversation.c:2233 src/prefs.c:254
 msgid "Logging"
 msgstr "Mitschnitt"
 
-#: src/conversation.c:2182
+#: src/conversation.c:2242
 msgid "Save Conversation"
 msgstr "Unterhaltung speichern"
 
-#: src/conversation.c:2183 src/dialogs.c:1640 src/dialogs.c:1824
-#: src/dialogs.c:3178 src/dialogs.c:3867 src/dialogs.c:4744
+#: src/conversation.c:2243 src/dialogs.c:1682 src/dialogs.c:1866
+#: src/dialogs.c:3220 src/dialogs.c:3908 src/dialogs.c:4785
 msgid "Save"
 msgstr "Speichern"
 
-#: src/conversation.c:2187
-msgid "Enable sounds"
-msgstr "Klnge aktivieren"
-
-#: src/conversation.c:2188
+#: src/conversation.c:2247 src/conversation.c:2248
 msgid "Sound"
 msgstr "Klnge"
 
-#: src/conversation.c:2668
+#: src/conversation.c:2729
 msgid "Gaim - Conversations"
 msgstr "Gaim - Unterhaltungen"
 
-#: src/conversation.c:2755
+#: src/conversation.c:2816
 msgid "Send message as: "
 msgstr "Nachricht senden als: "
 
-#: src/conversation.c:3373
+#: src/conversation.c:3453
 msgid "Gaim - Save Icon"
 msgstr "Gaim - Icon speichern"
 
-#: src/conversation.c:3400
+#: src/conversation.c:3487
 msgid "Disable Animation"
 msgstr "Animation deaktivieren"
 
-#: src/conversation.c:3405
+#: src/conversation.c:3492
 msgid "Enable Animation"
 msgstr "Animation aktivieren"
 
-#: src/conversation.c:3411
+#: src/conversation.c:3498
 msgid "Hide Icon"
 msgstr "Icon verbergen"
 
-#: src/conversation.c:3417
+#: src/conversation.c:3504
 msgid "Save Icon As..."
 msgstr "Icon speichern unter..."
 
-#: src/dialogs.c:413
+#: src/dialogs.c:412
 msgid "Gaim - Warn user?"
 msgstr "Gaim - Benutzer warnen?"
 
-#: src/dialogs.c:433
+#: src/dialogs.c:432
 #, c-format
 msgid "Do you really want to warn %s?"
 msgstr "Wollen Sie %s wirklich verwarnen?"
 
-#: src/dialogs.c:438
+#: src/dialogs.c:437
 msgid "Warn anonymously?"
 msgstr "Anonym warnen?"
 
-#: src/dialogs.c:442
+#: src/dialogs.c:441
 msgid "Anonymous warnings are less harsh."
 msgstr "Anonyme Warnungen sind nicht so barsch."
 
-#: src/dialogs.c:470
+#: src/dialogs.c:469
 #, c-format
 msgid "Removing '%s' from buddylist.\n"
 msgstr "'%s' wird von der Buddy-Liste entfernt.\n"
 
-#: src/dialogs.c:495
+#: src/dialogs.c:494
 #, c-format
 msgid "Gaim - Remove %s?"
 msgstr "Gaim - %s entfernen?"
 
-#: src/dialogs.c:508
+#: src/dialogs.c:507
 msgid "Remove Buddy"
 msgstr "Buddy entfernen"
 
-#: src/dialogs.c:518
+#: src/dialogs.c:517
 #, c-format
 msgid ""
 "You are about to remove '%s' from\n"
@@ -1893,14 +2356,14 @@
 "Sie sind dabei '%s' aus Ihrer\n"
 "Buddy-List zu entfernen. Fortsetzen?"
 
-#: src/dialogs.c:530 src/prpl.c:154 src/prpl.c:228
+#: src/dialogs.c:529 src/prpl.c:154 src/prpl.c:228
 msgid "Accept"
 msgstr "Akzeptieren"
 
 #. Build OK Button
-#: src/dialogs.c:637 src/dialogs.c:720 src/dialogs.c:778 src/dialogs.c:1435
-#: src/dialogs.c:1764 src/dialogs.c:1915 src/dialogs.c:2223 src/dialogs.c:2403
-#: src/dialogs.c:2469 src/dialogs.c:3976 src/dialogs.c:4082 src/multi.c:774
+#: src/dialogs.c:635 src/dialogs.c:720 src/dialogs.c:821 src/dialogs.c:1477
+#: src/dialogs.c:1806 src/dialogs.c:1957 src/dialogs.c:2265 src/dialogs.c:2445
+#: src/dialogs.c:2511 src/dialogs.c:4017 src/dialogs.c:4123 src/multi.c:786
 msgid "OK"
 msgstr "OK"
 
@@ -1912,341 +2375,346 @@
 msgid "IM who:"
 msgstr "Nachricht an:"
 
-#: src/dialogs.c:756
+#: src/dialogs.c:768
 msgid "User:"
 msgstr "Benutzer:"
 
+#: src/dialogs.c:777
+#, fuzzy
+msgid "Account:"
+msgstr "Konto"
+
 #. Finish up
-#: src/dialogs.c:783
+#: src/dialogs.c:826
 msgid "Gaim - Get User Info"
 msgstr "Gaim - Benutzer-Info holen"
 
-#: src/dialogs.c:898
+#: src/dialogs.c:940
 msgid "Add Group"
 msgstr "Gruppe hinzufgen"
 
-#: src/dialogs.c:923
+#: src/dialogs.c:965
 msgid "Gaim - Add Group"
 msgstr "Gaim - Gruppe hinzufgen"
 
-#: src/dialogs.c:1007
+#: src/dialogs.c:1049
 msgid "Gaim - Add Buddy"
 msgstr "Gaim - Buddy hinzufgen"
 
-#: src/dialogs.c:1019
+#: src/dialogs.c:1061
 msgid "Add Buddy"
 msgstr "Buddy hinzufgen"
 
-#: src/dialogs.c:1029
+#: src/dialogs.c:1071
 msgid "Contact"
 msgstr "Kontakt"
 
 #. Set up stuff for the account box
-#: src/dialogs.c:1055
+#: src/dialogs.c:1097
 msgid "Add To"
 msgstr "Hinzufgen zu"
 
-#: src/dialogs.c:1092
+#: src/dialogs.c:1134
 msgid "Please enter a buddy to pounce."
 msgstr "Bitte Buddy zum Alarmieren angeben."
 
-#: src/dialogs.c:1092
+#: src/dialogs.c:1134
 msgid "Buddy Pounce Error"
 msgstr "Buddy-Alarmierungsfehler"
 
-#: src/dialogs.c:1228
+#: src/dialogs.c:1270
 msgid "Gaim - New Buddy Pounce"
 msgstr "Gaim - Neuer Buddy-Alarm"
 
 #. <pounce type="who">
-#: src/dialogs.c:1239
+#: src/dialogs.c:1281
 msgid "Pounce Who"
 msgstr "Wen alarmieren"
 
-#: src/dialogs.c:1250
+#: src/dialogs.c:1292
 msgid "Account"
 msgstr "Konto"
 
 #. </pounce type="who">
 #. <pounce type="when">
-#: src/dialogs.c:1276
+#: src/dialogs.c:1318
 msgid "Pounce When"
 msgstr "Wann alarmieren"
 
-#: src/dialogs.c:1286
+#: src/dialogs.c:1328
 msgid "Pounce on sign on"
 msgstr "Alarm beim Anmelden"
 
-#: src/dialogs.c:1295
+#: src/dialogs.c:1337
 msgid "Pounce on return from away"
 msgstr "Alarm bei Rckkehr von Abwesenheit"
 
-#: src/dialogs.c:1304
+#: src/dialogs.c:1346
 msgid "Pounce on return from idle"
 msgstr "Alarm bei Rckkehr von Inaktivitt"
 
-#: src/dialogs.c:1313
+#: src/dialogs.c:1355
 msgid "Pounce when buddy is typing to you"
 msgstr "Alarm wenn der Buddy schreibt"
 
 #. </pounce type="when">
 #. <pounce type="action">
-#: src/dialogs.c:1323
+#: src/dialogs.c:1365
 msgid "Pounce Action"
 msgstr "Alarm-Aktion"
 
 # IM benutzen?
-#: src/dialogs.c:1334
+#: src/dialogs.c:1376
 msgid "Open IM Window"
 msgstr "Nachricht-Fenster ffnen"
 
-#: src/dialogs.c:1343
+#: src/dialogs.c:1385
 msgid "Popup Notification"
 msgstr "Popup-Benachrichtigung"
 
-#: src/dialogs.c:1352
+#: src/dialogs.c:1394
 msgid "Send Message"
 msgstr "Nachricht senden"
 
-#: src/dialogs.c:1373
+#: src/dialogs.c:1415
 msgid "Execute command on pounce"
 msgstr "Befehl bei Alarm ausfhren"
 
-#: src/dialogs.c:1395
+#: src/dialogs.c:1437
 msgid "Play sound on pounce"
 msgstr "Klang bei Alarm abspielen"
 
 #. </pounce type="action">
-#: src/dialogs.c:1417
+#: src/dialogs.c:1459
 msgid "Save this pounce after activation"
 msgstr "Diesen Alarm nach Aktivierung speichern"
 
-#: src/dialogs.c:1503
+#: src/dialogs.c:1545
 msgid "Gaim - Set Dir Info"
 msgstr "Gaim - Profil anlegen"
 
-#: src/dialogs.c:1512
+#: src/dialogs.c:1554
 msgid "Directory Info"
 msgstr "Profil"
 
 # Die bersetzung stimmt nicht, oder?
-#: src/dialogs.c:1534
+#: src/dialogs.c:1576
 msgid "Allow Web Searches To Find Your Info"
 msgstr "Ermglicht Personen, Ihr Profil im Web zu finden"
 
 #. Line 1
-#: src/dialogs.c:1537 src/dialogs.c:2242
+#: src/dialogs.c:1579 src/dialogs.c:2284
 msgid "First Name"
 msgstr "Vorname"
 
 #. Line 2
-#: src/dialogs.c:1548 src/dialogs.c:2254
+#: src/dialogs.c:1590 src/dialogs.c:2296
 msgid "Middle Name"
 msgstr "Zweiter Name"
 
 #. Line 3
-#: src/dialogs.c:1560 src/dialogs.c:2266
+#: src/dialogs.c:1602 src/dialogs.c:2308
 msgid "Last Name"
 msgstr "Nachname"
 
 #. Line 4
-#: src/dialogs.c:1571 src/dialogs.c:2278
+#: src/dialogs.c:1613 src/dialogs.c:2320
 msgid "Maiden Name"
 msgstr "Mdchenname"
 
 #. Line 6
-#: src/dialogs.c:1593 src/dialogs.c:2301
+#: src/dialogs.c:1635 src/dialogs.c:2343
 msgid "State"
 msgstr "Provinz/Bundesland"
 
-#: src/dialogs.c:1658
+#: src/dialogs.c:1700
 msgid "New Passwords Do Not Match"
 msgstr "Die neuen Passwrter stimmen nicht berein"
 
-#: src/dialogs.c:1658 src/dialogs.c:1663
+#: src/dialogs.c:1700 src/dialogs.c:1705
 msgid "Gaim - Change Password Error"
 msgstr "Gaim - Fehler beim ndern des Passworts"
 
-#: src/dialogs.c:1663
+#: src/dialogs.c:1705
 msgid "Fill out all fields completely"
 msgstr "Bitte alle Felder komplett ausfllen"
 
-#: src/dialogs.c:1718
+#: src/dialogs.c:1760
 msgid "Original Password"
 msgstr "Altes Passwort"
 
-#: src/dialogs.c:1732
+#: src/dialogs.c:1774
 msgid "New Password"
 msgstr "Neues Passwort"
 
-#: src/dialogs.c:1746
+#: src/dialogs.c:1788
 msgid "New Password (again)"
 msgstr "Neues Passwort (wiederholen)"
 
-#: src/dialogs.c:1787
+#: src/dialogs.c:1829
 msgid "Gaim - Set User Info"
 msgstr "Gaim - Benutzerinfo setzen"
 
-#: src/dialogs.c:1899
+#: src/dialogs.c:1941
 msgid "Below are the results of your search: "
 msgstr "Das Resultat Ihrer Suche:"
 
-#: src/dialogs.c:2032 src/dialogs.c:2039
+#: src/dialogs.c:2074 src/dialogs.c:2081
 msgid "Permit"
 msgstr "Zulassen"
 
-#: src/dialogs.c:2034 src/dialogs.c:2041
+#: src/dialogs.c:2076 src/dialogs.c:2083
 msgid "Deny"
 msgstr "Sperren"
 
-#: src/dialogs.c:2078
+#: src/dialogs.c:2120
 msgid "Gaim - Add Permit"
 msgstr "Gaim - Zulassung hinzufgen"
 
-#: src/dialogs.c:2080
+#: src/dialogs.c:2122
 msgid "Gaim - Add Deny"
 msgstr "Gaim - Sperre hinzufgen"
 
-#: src/dialogs.c:2140
+#: src/dialogs.c:2182
 msgid "Gaim - Log Conversation"
 msgstr "Gaim - Unterhaltungs-Mitschnitt"
 
-#: src/dialogs.c:2218 src/dialogs.c:2381
+#: src/dialogs.c:2260 src/dialogs.c:2423
 msgid "Search for Buddy"
 msgstr "Nach Buddies suchen"
 
-#: src/dialogs.c:2346
+#: src/dialogs.c:2388
 msgid "Gaim - Find Buddy By Info"
 msgstr "Gaim - Buddy nach Profil suchen"
 
 # E-Mail
-#: src/dialogs.c:2375
+#: src/dialogs.c:2417
 msgid "Gaim - Find Buddy By Email"
 msgstr "Gaim - Buddy nach E-Mail-Adresse suchen"
 
-#: src/dialogs.c:2515
+#: src/dialogs.c:2557
 msgid "Gaim - Add URL"
 msgstr "Gaim - Url hinzufgen"
 
-#: src/dialogs.c:2666 src/dialogs.c:2687 src/dialogs.c:2741
+#: src/dialogs.c:2708 src/dialogs.c:2729 src/dialogs.c:2783
 msgid "Select Text Color"
 msgstr "Textfarbe auswhlen"
 
-#: src/dialogs.c:2720
+#: src/dialogs.c:2762
 msgid "Select Background Color"
 msgstr "Hintergrundfarbe auswhlen"
 
-#: src/dialogs.c:2942
+#: src/dialogs.c:2984
 msgid "Import to:"
 msgstr "Importieren zu:"
 
-#: src/dialogs.c:2966
+#: src/dialogs.c:3008
 msgid "Gaim - Import Buddy List"
 msgstr "Gaim - Buddy-Liste laden"
 
 #. We shouldn't allow a blank title
-#: src/dialogs.c:3033
+#: src/dialogs.c:3075
 msgid "You cannot create an away message with a blank title"
 msgstr "Fgen Sie bitte einen Titel ein"
 
 #. We shouldn't allow a blank message
-#: src/dialogs.c:3040
+#: src/dialogs.c:3082
 msgid "You cannot create an empty away message"
 msgstr "Sie knnen keine leere Abwesenheitsmeldung erstellen"
 
-#: src/dialogs.c:3108
+#: src/dialogs.c:3150
 msgid "Gaim - New away message"
 msgstr "Gaim - Neue Abwesenheits-Mitteilung"
 
-#: src/dialogs.c:3118
+#: src/dialogs.c:3160
 msgid "New away message"
 msgstr "Neue Abwesenheits-Mitteilung"
 
-#: src/dialogs.c:3131
+#: src/dialogs.c:3173
 msgid "Away title: "
 msgstr "Abwesenheits-Titel:"
 
-#: src/dialogs.c:3170
+#: src/dialogs.c:3212
 msgid "Use"
 msgstr "bernehmen"
 
-#: src/dialogs.c:3174
+#: src/dialogs.c:3216
 msgid "Save & Use"
 msgstr "Speichern & bernehmen"
 
 #. show everything
-#: src/dialogs.c:3372
+#: src/dialogs.c:3413
 msgid "Smile!"
 msgstr "Lchle!"
 
-#: src/dialogs.c:3425
+#: src/dialogs.c:3466
 msgid "Alias Buddy"
 msgstr "Alias fr Buddy"
 
-#: src/dialogs.c:3458
+#: src/dialogs.c:3499
 msgid "Gaim - Alias Buddy"
 msgstr "Gaim - Alias fr Buddy"
 
-#: src/dialogs.c:3530
+#: src/dialogs.c:3571
 msgid "Gaim - Save Log File"
 msgstr "Gaim - Mitschnitt speichern"
 
-#: src/dialogs.c:3562
+#: src/dialogs.c:3603
 #, c-format
 msgid "Unable to remove file %s - %s"
 msgstr "Datei %s kann nicht entfernt werden - %s"
 
-#: src/dialogs.c:3590
+#: src/dialogs.c:3631
 msgid "Really clear log?"
 msgstr "Mitschnitt wirklich lschen?"
 
-#: src/dialogs.c:3605
+#: src/dialogs.c:3646
 msgid "Okay"
 msgstr "OK"
 
-#: src/dialogs.c:3776
+#: src/dialogs.c:3817
 msgid "Date"
 msgstr "Datum"
 
-#: src/dialogs.c:3839
+#: src/dialogs.c:3880
 msgid "Conversation"
 msgstr "Unterhaltung"
 
-#: src/dialogs.c:3862
+#: src/dialogs.c:3903
 msgid "Clear"
 msgstr "Lschen"
 
-#: src/dialogs.c:3940
+#: src/dialogs.c:3981
 msgid "Gaim - Rename Group"
 msgstr "Gaim - Gruppe umbenennen"
 
-#: src/dialogs.c:3950
+#: src/dialogs.c:3991
 msgid "Rename Group"
 msgstr "Gruppe umbenennen"
 
-#: src/dialogs.c:3957 src/dialogs.c:4063
+#: src/dialogs.c:3998 src/dialogs.c:4104
 msgid "New name:"
 msgstr "Neuer Name:"
 
-#: src/dialogs.c:4046
+#: src/dialogs.c:4087
 msgid "Gaim - Rename Buddy"
 msgstr "Gaim - Buddy umbenennen"
 
-#: src/dialogs.c:4056
+#: src/dialogs.c:4097
 msgid "Rename Buddy"
 msgstr "Buddy umbenennen"
 
 #. Below is basically stolen from plugins.c
-#: src/dialogs.c:4140
+#: src/dialogs.c:4181
 msgid "Gaim - Select Perl Script"
 msgstr "Gaim - Perl-Skript auswhlen"
 
-#: src/gaimrc.c:1117
+#: src/gaimrc.c:1136
 #, c-format
 msgid "Could not open config file %s."
 msgstr "Konfigurationsdatei %s kann nicht geffnet werden."
 
-#: src/gaimrc.c:1118
+#: src/gaimrc.c:1137
 msgid "Preferences Error"
 msgstr "Einstellungen-Fehler"
 
@@ -2259,101 +2727,111 @@
 msgid "g003: Error opening connection.\n"
 msgstr "g003: Fehler: Verbindung kann nicht hergestellt werden.\n"
 
-#: src/multi.c:452
+#: src/module.c:106 src/module.c:112 src/module.c:122
+#, fuzzy
+msgid "Plugin Error"
+msgstr "Anmelde-Fehler"
+
+#: src/multi.c:454
 msgid "Gaim - Load Buddy Icon"
 msgstr "Gaim - Buddy-Icon laden"
 
-#: src/multi.c:495
+#: src/multi.c:497
 msgid "Buddy Icon File:"
 msgstr "Buddy-Icon Datei:"
 
-#: src/multi.c:506
+#: src/multi.c:508
 msgid "Browse"
 msgstr "Stbern"
 
-#: src/multi.c:511 src/prefs.c:1545
+#: src/multi.c:513 src/prefs.c:1548
 msgid "Reset"
 msgstr "Zurcksetzen"
 
-#: src/multi.c:538
+#: src/multi.c:540
 msgid "Screenname:"
 msgstr "Benutzername:"
 
-#: src/multi.c:558
+#: src/multi.c:559
+#, fuzzy
+msgid "Alias:"
+msgstr "Alias"
+
+#: src/multi.c:569
 msgid "Protocol:"
 msgstr "Protokoll:"
 
-#: src/multi.c:563
+#: src/multi.c:574
 msgid "Remember Password"
 msgstr "Passwort speichern"
 
-#: src/multi.c:564
+#: src/multi.c:575
 msgid "Auto-Login"
 msgstr "Auto-Login"
 
-#: src/multi.c:604
+#: src/multi.c:616
 msgid "New Mail Notifications"
 msgstr "Neue Mail-Benachrichtigungen"
 
-#: src/multi.c:694
+#: src/multi.c:706
 msgid "Register with server"
 msgstr "Beim Server anmelden"
 
-#: src/multi.c:752
+#: src/multi.c:764
 msgid "Gaim - Modify Account"
 msgstr "Gaim - Konto bearbeiten"
 
-#: src/multi.c:871
+#: src/multi.c:883
 msgid "Enter Password"
 msgstr "Passwort eingeben"
 
-#: src/multi.c:935
+#: src/multi.c:947
 msgid ""
 "You cannot log this account in; you do not have the protocol it uses loaded, "
 "or the protocol does not have a login function."
 msgstr ""
 "Sie knnen sich mit diesem Konto nicht anmelden, da Sie das entsprechende "
-"Protokoll nicht geladen haben oder da dieses Protokoll keine "
-"Anmelde-Funktion besitzt."
-
-#: src/multi.c:937
+"Protokoll nicht geladen haben oder da dieses Protokoll keine Anmelde-"
+"Funktion besitzt."
+
+#: src/multi.c:949
 msgid "Login Error"
 msgstr "Anmelde-Fehler"
 
-#: src/multi.c:966
+#: src/multi.c:978
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "Wollen Sie %s wirklich lschen?"
 
-#: src/multi.c:1003
+#: src/multi.c:1015
 msgid "Gaim - Account Editor"
 msgstr "Gaim - Konten-Editor"
 
-#: src/multi.c:1022
+#: src/multi.c:1034
 msgid "Select All"
 msgstr "Alles auswhlen"
 
-#: src/multi.c:1027
+#: src/multi.c:1039
 msgid "Select Autos"
 msgstr "\"Auto\" auswhlen"
 
-#: src/multi.c:1031
+#: src/multi.c:1043
 msgid "Select None"
 msgstr "Nichts auswhlen"
 
-#: src/multi.c:1045
+#: src/multi.c:1057
 msgid "Modify"
 msgstr "Bearbeiten"
 
-#: src/multi.c:1049
+#: src/multi.c:1061
 msgid "Sign On/Off"
 msgstr "An-/Abmelden"
 
-#: src/multi.c:1053
+#: src/multi.c:1065
 msgid "Delete"
 msgstr "Lschen"
 
-#: src/multi.c:1368
+#: src/multi.c:1380
 #, c-format
 msgid ""
 "%s\n"
@@ -2362,25 +2840,25 @@
 "%s\n"
 "%s: %s"
 
-#: src/multi.c:1387
+#: src/multi.c:1399
 #, c-format
 msgid "%s was unable to sign on"
 msgstr "%s konnte sich nicht anmelden"
 
-#: src/multi.c:1398
+#: src/multi.c:1410
 msgid "Notice"
 msgstr "Hinweis"
 
-#: src/multi.c:1408
+#: src/multi.c:1420
 #, c-format
 msgid "%s has been signed off"
 msgstr "%s wurde abgemeldet"
 
-#: src/multi.c:1409
+#: src/multi.c:1421
 msgid "Connection Error"
 msgstr "Verbindungsfehler"
 
-#: src/perl.c:856
+#: src/perl.c:875
 msgid "Perl Scripts"
 msgstr "Perl-skripte"
 
@@ -2441,9 +2919,9 @@
 msgid "General Options"
 msgstr "Allgemeine Einstellungen"
 
-#: src/prefs.c:200 src/prefs.c:383 src/prefs.c:551 src/prefs.c:665
-#: src/prefs.c:918 src/prefs.c:1068 src/prefs.c:1293 src/prefs.c:1615
-#: src/prefs.c:1889 src/prefs.c:2322
+#: src/prefs.c:200 src/prefs.c:384 src/prefs.c:552 src/prefs.c:667
+#: src/prefs.c:921 src/prefs.c:1071 src/prefs.c:1296 src/prefs.c:1629
+#: src/prefs.c:1901 src/prefs.c:2334
 msgid "All options take effect immediately unless otherwise noted."
 msgstr "Alle Einstellungen werden sofort wirksam, wenn nicht anders angegeben."
 
@@ -2517,8 +2995,8 @@
 msgstr "Browser"
 
 #: src/prefs.c:291
-msgid "KFM"
-msgstr "KFM/Konqueror"
+msgid "Konqueror"
+msgstr ""
 
 #: src/prefs.c:292
 msgid "Opera"
@@ -2528,27 +3006,32 @@
 msgid "Netscape"
 msgstr "Netscape"
 
-#: src/prefs.c:296
+#: src/prefs.c:294
+msgid "Mozilla"
+msgstr ""
+
+#: src/prefs.c:297
 msgid "Pop up new window by default"
 msgstr "Per Vorgabe neues Fenster ffnen"
 
-#: src/prefs.c:303
+#: src/prefs.c:304
 msgid "GNOME URL Handler"
 msgstr "GNOME URL-Handler"
 
-#: src/prefs.c:305
+#: src/prefs.c:306
 msgid "Galeon"
 msgstr "Galeon"
 
-#: src/prefs.c:306
-msgid "Manual"
-msgstr "Manuell"
-
-#: src/prefs.c:375
+#: src/prefs.c:307
+#, c-format
+msgid "Manual (%s for URL)"
+msgstr ""
+
+#: src/prefs.c:376
 msgid "Proxy Options"
 msgstr "Proxy-Einstellungen"
 
-#: src/prefs.c:387
+#: src/prefs.c:388
 msgid ""
 "Not all protocols can use these proxy options. Please see the README file "
 "for details."
@@ -2556,367 +3039,377 @@
 "Nicht alle Protokolle knnen diese Proxy-Einstellungen nutzen. Bitte lesen "
 "Sie die README-Datei."
 
-#: src/prefs.c:392
+#: src/prefs.c:393
 msgid "Proxy Type"
 msgstr "Proxy-Typ"
 
-#: src/prefs.c:404
+#: src/prefs.c:405
 msgid "Proxy Server"
 msgstr "Proxy-Server"
 
-#: src/prefs.c:407
+#: src/prefs.c:408
 msgid "No Proxy"
 msgstr "Kein Proxy"
 
-#: src/prefs.c:419
+#: src/prefs.c:420
 msgid "SOCKS 4"
 msgstr "SOCKS 4"
 
-#: src/prefs.c:429
+#: src/prefs.c:430
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
-#: src/prefs.c:438
+#: src/prefs.c:439
 msgid "HTTP"
 msgstr "HTTP"
 
-#: src/prefs.c:462
+#: src/prefs.c:463
 msgid "Host"
 msgstr "Rechner"
 
-#: src/prefs.c:478
+#: src/prefs.c:479
 msgid "Port"
 msgstr "Port"
 
-#: src/prefs.c:495
+#: src/prefs.c:496
 msgid "User"
 msgstr "Benutzer"
 
-#: src/prefs.c:511
+#: src/prefs.c:512
 msgid "Password"
 msgstr "Passwort"
 
-#: src/prefs.c:543
+#: src/prefs.c:544
 msgid "Buddy List Options"
 msgstr "Einstellungen fr Buddy-Liste"
 
-#: src/prefs.c:555
+#: src/prefs.c:556
 msgid "Buddy List Window"
 msgstr "Buddy-Listen-Fenster"
 
-#: src/prefs.c:568
+#: src/prefs.c:569
 msgid "Tab Placement:"
 msgstr "Reiter-Platzierung:"
 
-#: src/prefs.c:572 src/prefs.c:1001 src/prefs.c:1151
+#: src/prefs.c:573 src/prefs.c:1004 src/prefs.c:1154
 msgid "Top"
 msgstr "Oben"
 
-#: src/prefs.c:573 src/prefs.c:1003 src/prefs.c:1153
+#: src/prefs.c:574 src/prefs.c:1006 src/prefs.c:1156
 msgid "Bottom"
 msgstr "Unten"
 
-#: src/prefs.c:585
+#: src/prefs.c:586
 msgid "Hide IM/Info/Chat buttons"
 msgstr "Nachrichten/Info/Chat-Knpfe verstecken"
 
-#: src/prefs.c:587
+#: src/prefs.c:588
 msgid "Automatically show buddy list on sign on"
 msgstr "Buddy-Liste automatisch beim Anmelden zeigen"
 
-#: src/prefs.c:589
+#: src/prefs.c:590
 msgid "Display Buddy List near applet"
 msgstr "Buddy-List beim Applet anzeigen"
 
-#: src/prefs.c:592
+#: src/prefs.c:593
 msgid "Save Window Size/Position"
 msgstr "Fensterposition und -gre speichern"
 
-#: src/prefs.c:595
+#: src/prefs.c:596
 msgid "Show pictures on buttons"
 msgstr "Bild auf Knpfen anzeigen"
 
 #: src/prefs.c:600
+msgid "Raise Buddy List on Signons and Signoffs"
+msgstr ""
+
+#: src/prefs.c:602
 msgid "Group Displays"
 msgstr "Gruppen-Anzeige"
 
-#: src/prefs.c:612
+#: src/prefs.c:614
 msgid "Hide groups with no online buddies"
 msgstr "Gruppen verstecken, wenn kein Buddy online ist"
 
-#: src/prefs.c:618
+#: src/prefs.c:620
 msgid "Show numbers in groups"
 msgstr "Anzahl in Gruppe anzeigen"
 
-#: src/prefs.c:620
+#: src/prefs.c:622
 msgid "Buddy Displays"
 msgstr "Buddy-Anzeige"
 
-#: src/prefs.c:632
+#: src/prefs.c:634
 msgid "Show buddy type icons"
 msgstr "Typ-Icon fr Buddy anzeigen"
 
-#: src/prefs.c:633
+#: src/prefs.c:635
 msgid "Show warning levels"
 msgstr "Warn-Stufen anzeigen"
 
-#: src/prefs.c:639
+#: src/prefs.c:641
 msgid "Show idle times"
 msgstr "Inaktivittszeiten anzeigen"
 
-#: src/prefs.c:640
+#: src/prefs.c:642
 msgid "Grey idle buddies"
 msgstr "Inaktive Buddies grau anzeigen"
 
-#: src/prefs.c:657
+#: src/prefs.c:659
 msgid "Conversation Options"
 msgstr "Unterhaltungens-Einstellungen"
 
-#: src/prefs.c:669
+#: src/prefs.c:671
 msgid "Keyboard Options"
 msgstr "Tastatur-Einstellungen"
 
-#: src/prefs.c:681
-msgid "Enter sends message"
-msgstr "Enter-Taste verschickt Nachricht"
-
-#: src/prefs.c:682
-msgid "Control-Enter sends message"
-msgstr "Strg+Enter-Taste verschickt Nachricht"
-
 #: src/prefs.c:683
+msgid "Enter sends message"
+msgstr "Enter-Taste verschickt Nachricht"
+
+#: src/prefs.c:684
+msgid "Control-Enter sends message"
+msgstr "Strg+Enter-Taste verschickt Nachricht"
+
+#: src/prefs.c:685
 msgid "Escape closes window"
 msgstr "Esc schliet Fenster"
 
-#: src/prefs.c:689
+#: src/prefs.c:686
+#, fuzzy
+msgid "Control-W closes window"
+msgstr "Esc schliet Fenster"
+
+#: src/prefs.c:692
 msgid "Control-{B/I/U/S} inserts HTML tags"
 msgstr "Strg-{B/I/U/S} fgt HTML-Tags ein"
 
-#: src/prefs.c:690
+#: src/prefs.c:693
 msgid "Control-(number) inserts smileys"
 msgstr "Strg-(ziffer) fgt Smileys ein"
 
-#: src/prefs.c:691
+#: src/prefs.c:694
 msgid "F2 toggles timestamp display"
 msgstr "F2 schaltet Zeitanzeige um"
 
-#: src/prefs.c:693
+#: src/prefs.c:696
 msgid "Display and General Options"
 msgstr "Anzeige und Allgemeine Einstellungen"
 
-#: src/prefs.c:705
+#: src/prefs.c:708
 msgid "Show graphical smileys"
 msgstr "Grafische Smileys anzeigen"
 
-#: src/prefs.c:706
+#: src/prefs.c:709
 msgid "Show timestamp on messages"
 msgstr "Zeit bei Nachrichten zeigen"
 
-#: src/prefs.c:707
+#: src/prefs.c:710
 msgid "Show URLs as links"
 msgstr "URLs als Link zeigen"
 
-#: src/prefs.c:708
+#: src/prefs.c:711
 msgid "Highlight misspelled words"
 msgstr "Falsch geschriebene Wrter hervorheben"
 
-#: src/prefs.c:709 src/prefs.c:1911
+#: src/prefs.c:712 src/prefs.c:1923
 msgid "Sending messages removes away status"
 msgstr "Senden von Nachrichten hebt Abwesenheit auf"
 
-#: src/prefs.c:710 src/prefs.c:1924
+#: src/prefs.c:713 src/prefs.c:1936
 msgid "Queue new messages when away"
 msgstr "Neue Nachrichten bei Abwesenheit sammeln"
 
-#: src/prefs.c:716
+#: src/prefs.c:719
 msgid "Ignore colors"
 msgstr "Schriftfarben ignorieren"
 
-#: src/prefs.c:717
+#: src/prefs.c:720
 msgid "Ignore font faces"
 msgstr "Schriftarten ignorieren"
 
-#: src/prefs.c:718
+#: src/prefs.c:721
 msgid "Ignore font sizes"
 msgstr "Schriftgre ignorieren"
 
-#: src/prefs.c:719
+#: src/prefs.c:722
 msgid "Ignore TiK Automated Messages"
 msgstr "TiK-automatisierte Mitteilungen ignorieren"
 
-#: src/prefs.c:720 src/prefs.c:1909
+#: src/prefs.c:723 src/prefs.c:1921
 msgid "Ignore new conversations when away"
 msgstr "Neue Unterhaltungen bei Abwesenheit ignorieren"
 
-#: src/prefs.c:909
+#: src/prefs.c:912
 msgid "IM Options"
 msgstr "Einstellungen fr Nachrichten"
 
-#: src/prefs.c:922 src/prefs.c:2907
+#: src/prefs.c:925 src/prefs.c:2921
 msgid "IM Window"
 msgstr "Nachrichten-Fenster"
 
-#: src/prefs.c:938 src/prefs.c:1088
+#: src/prefs.c:941 src/prefs.c:1091
 msgid "Show buttons as: "
 msgstr "Knpfe zeigen als:"
 
-#: src/prefs.c:942 src/prefs.c:1093
+#: src/prefs.c:945 src/prefs.c:1096
 msgid "Pictures And Text"
 msgstr "Bilder und Text"
 
-#: src/prefs.c:943 src/prefs.c:1095
+#: src/prefs.c:946 src/prefs.c:1098
 msgid "Pictures"
 msgstr "nur Bilder"
 
-#: src/prefs.c:944 src/prefs.c:1096
+#: src/prefs.c:947 src/prefs.c:1099
 msgid "Text"
 msgstr "nur Text"
 
-#: src/prefs.c:955
+#: src/prefs.c:958
 msgid "Show all conversations in one tabbed window"
 msgstr "Alle Unterhaltungen in einem Reiter-Fenster zeigen"
 
-#: src/prefs.c:957
+#: src/prefs.c:960
 msgid "Show chats in the same tabbed window"
 msgstr "Chats im selben Reiter-Fenster anzeigen"
 
-#: src/prefs.c:964 src/prefs.c:1116
+#: src/prefs.c:967 src/prefs.c:1119
 msgid "Raise windows on events"
 msgstr "Fenster bei Ereignis in Vordergrund bringen"
 
-#: src/prefs.c:965
+#: src/prefs.c:968
 msgid "Show logins in window"
 msgstr "Anmeldungen im Fenster zeigen"
 
-#: src/prefs.c:966
-msgid "Show aliases in tabs/titles"
+#: src/prefs.c:969
+#, fuzzy
+msgid "Show aliases in tabs/titles/ticker"
 msgstr "Aliase in Reitern/Titeln anzeigen"
 
-#: src/prefs.c:967
+#: src/prefs.c:970
 msgid "Hide window on send"
 msgstr "Fenster beim Senden verbergen"
 
-#: src/prefs.c:969 src/prefs.c:1119
+#: src/prefs.c:972 src/prefs.c:1122
 msgid "Window Sizes"
 msgstr "Fenstergre"
 
-#: src/prefs.c:977 src/prefs.c:1127
+#: src/prefs.c:980 src/prefs.c:1130
 msgid "New window width:"
 msgstr "Neue Fensterbreite:"
 
-#: src/prefs.c:978 src/prefs.c:1128
+#: src/prefs.c:981 src/prefs.c:1131
 msgid "New window height:"
 msgstr "Neue Fensterhhe:"
 
-#: src/prefs.c:979 src/prefs.c:1129
+#: src/prefs.c:982 src/prefs.c:1132
 msgid "Entry widget height:"
 msgstr "Hhe des Eingabefelds:"
 
-#: src/prefs.c:981 src/prefs.c:1131
+#: src/prefs.c:984 src/prefs.c:1134
 msgid "Tab Placement"
 msgstr "Reiter-Platzierung"
 
-#: src/prefs.c:1010 src/prefs.c:1160
+#: src/prefs.c:1013 src/prefs.c:1163
 msgid "Left"
 msgstr "Links"
 
-#: src/prefs.c:1012 src/prefs.c:1162
+#: src/prefs.c:1015 src/prefs.c:1165
 msgid "Right"
 msgstr "Rechts"
 
-#: src/prefs.c:1016
+#: src/prefs.c:1019
 msgid "Buddy Icons"
 msgstr "Buddy-Icons"
 
-#: src/prefs.c:1028
+#: src/prefs.c:1031
 msgid "Hide Buddy Icons"
 msgstr "Buddy-Icons verbergen"
 
-#: src/prefs.c:1034
+#: src/prefs.c:1037
 msgid "Disable Buddy Icon Animation"
 msgstr "Buddy-Icon-Animation deaktivieren"
 
-#: src/prefs.c:1060
+#: src/prefs.c:1063
 msgid "Chat Options"
 msgstr "Chat-Optionen"
 
-#: src/prefs.c:1072
+#: src/prefs.c:1075
 msgid "Group Chat Window"
 msgstr "Gruppenchat-Fenster"
 
-#: src/prefs.c:1107
+#: src/prefs.c:1110
 msgid "Show all chats in one tabbed window"
 msgstr "Alle Chats in einem Reiter-Fenster zeigen"
 
-#: src/prefs.c:1109
+#: src/prefs.c:1112
 msgid "Show conversations in the same tabbed window"
 msgstr "Alle Unterhaltungen im selben Reiter-Fenster zeigen"
 
-#: src/prefs.c:1117
+#: src/prefs.c:1120
 msgid "Show people joining/leaving in window"
 msgstr "Eintretende im Fenster anzeigen"
 
-#: src/prefs.c:1165
+#: src/prefs.c:1168
 msgid "Tab Completion"
 msgstr "Tabulator-Vervollstndigung"
 
-#: src/prefs.c:1177
+#: src/prefs.c:1180
 msgid "Tab-Complete Nicks"
 msgstr "Spitznamen vervollstndigen"
 
-#: src/prefs.c:1183
+#: src/prefs.c:1186
 msgid "Old-Style Tab Completion"
 msgstr "Alte Tabulator-Vervollstndigung"
 
-#: src/prefs.c:1285 src/prefs.c:2917
+#: src/prefs.c:1288 src/prefs.c:2931
 msgid "Font Options"
 msgstr "Schriften-Optionen"
 
-#: src/prefs.c:1311
+#: src/prefs.c:1314
 msgid "Italic Text"
 msgstr "Kursiver Text"
 
-#: src/prefs.c:1355 src/prefs.c:1373 src/prefs.c:1395
+#: src/prefs.c:1358 src/prefs.c:1376 src/prefs.c:1398
 msgid "Select"
 msgstr "Auswhlen"
 
-#: src/prefs.c:1393
+#: src/prefs.c:1396
 msgid "Font Face for Text"
 msgstr "Schriftart fr Text"
 
-#: src/prefs.c:1408
+#: src/prefs.c:1411
 msgid "Font Size for Text"
 msgstr "Schriftgre fr Text"
 
-#: src/prefs.c:1505
+#: src/prefs.c:1508
 msgid "Gaim - Sound Configuration"
 msgstr "Gaim - Klang-Konfiguration"
 
-#: src/prefs.c:1540
+#: src/prefs.c:1543
 msgid "Test"
 msgstr "Testen"
 
-#: src/prefs.c:1550
+#: src/prefs.c:1553
 msgid "Choose..."
 msgstr "Auswhlen..."
 
-#: src/prefs.c:1607
+#: src/prefs.c:1621
 msgid "Sound Options"
 msgstr "Klang-Einstellungen"
 
-#: src/prefs.c:1635
+#: src/prefs.c:1649
 msgid "No sounds when you log in"
 msgstr "Kein Klang beim Anmelden"
 
-#: src/prefs.c:1641 src/prefs.c:1910
+#: src/prefs.c:1655 src/prefs.c:1922
 msgid "Sounds while away"
 msgstr "Klnge bei Abwesenheit"
 
-#: src/prefs.c:1651
+#: src/prefs.c:1665
 msgid "Sound method"
 msgstr "Klang-Ausgabesystem"
 
-#: src/prefs.c:1725
+#: src/prefs.c:1739
 #, c-format
 msgid ""
 "Sound command\n"
@@ -2925,103 +3418,103 @@
 "Klang-Abspielbefehl\n"
 "(%s fr Dateiname)"
 
-#: src/prefs.c:1737
+#: src/prefs.c:1751
 msgid "Sound played when:"
 msgstr "Klang abspielen bei:"
 
-#: src/prefs.c:1881 src/prefs.c:2939
+#: src/prefs.c:1893 src/prefs.c:2953
 msgid "Away Messages"
 msgstr "Abwesenheits-Mitteilungen"
 
-#: src/prefs.c:1918
+#: src/prefs.c:1930
 msgid "Don't send auto-response"
 msgstr "Keine automatische Antwort schicken"
 
-#: src/prefs.c:1919
+#: src/prefs.c:1931
 msgid "Only send auto-response when idle"
 msgstr "Automatische Antwort nur bei Inaktivitt schicken"
 
-#: src/prefs.c:1934
+#: src/prefs.c:1946
 msgid "Time between sending auto-responses (in seconds):"
 msgstr "Zeit zwischen dem Senden einer automatischen Antwort (in Sekunden):"
 
-#: src/prefs.c:1949
+#: src/prefs.c:1961
 msgid "Auto Away after"
 msgstr "Auto-Abwesenheit nach"
 
-#: src/prefs.c:1963
+#: src/prefs.c:1975
 msgid "minutes using"
 msgstr "Minuten und benutze"
 
-#: src/prefs.c:1976
+#: src/prefs.c:1988
 msgid "Messages"
 msgstr "Nachrichten"
 
-#: src/prefs.c:2033
+#: src/prefs.c:2045
 msgid "Edit"
 msgstr "Bearbeiten"
 
-#: src/prefs.c:2037
+#: src/prefs.c:2049
 msgid "Make Away"
 msgstr "Jetzt abwesend"
 
-#: src/prefs.c:2314
+#: src/prefs.c:2326
 msgid "Privacy Options"
 msgstr "Einstellungen zur Privatsphre"
 
-#: src/prefs.c:2330
+#: src/prefs.c:2342
 msgid "Set privacy for:"
 msgstr "Setze Privatsphre fr:"
 
-#: src/prefs.c:2349
+#: src/prefs.c:2361
 msgid "Allow all users to contact me"
 msgstr "Allen Benutzern erlauben, mich zu kontaktieren"
 
-#: src/prefs.c:2350
+#: src/prefs.c:2362
 msgid "Allow only the users below"
 msgstr "Nur den untenstehenden Benutzern erlauben"
 
-#: src/prefs.c:2352
+#: src/prefs.c:2364
 msgid "Allow List"
 msgstr "Erlauben"
 
-#: src/prefs.c:2383
+#: src/prefs.c:2395
 msgid "Deny all users"
 msgstr "Allen Usern verwehren"
 
-#: src/prefs.c:2384
+#: src/prefs.c:2396
 msgid "Block the users below"
 msgstr "Nur den untenstehenden Benutzern verwehren"
 
-#: src/prefs.c:2386
+#: src/prefs.c:2398
 msgid "Block List"
 msgstr "Verwehren"
 
-#: src/prefs.c:2481
+#: src/prefs.c:2493
 msgid "Gaim - Preferences"
 msgstr "Gaim - Einstellungen"
 
-#: src/prefs.c:2564
+#: src/prefs.c:2576
 msgid "Gaim debug output window"
 msgstr "Gaim Debug-Ausgabefenster"
 
-#: src/prefs.c:2873
+#: src/prefs.c:2887
 msgid "General"
 msgstr "Allgemein"
 
-#: src/prefs.c:2878
+#: src/prefs.c:2892
 msgid "Proxy"
 msgstr "Proxy"
 
-#: src/prefs.c:2902
+#: src/prefs.c:2916
 msgid "Conversations"
 msgstr "Unterhaltungen"
 
-#: src/prefs.c:2928
+#: src/prefs.c:2942
 msgid "Sounds"
 msgstr "Klnge"
 
-#: src/prefs.c:2950
+#: src/prefs.c:2964
 msgid "Privacy"
 msgstr "Privatsphre"
 
@@ -3066,22 +3559,23 @@
 msgid "Open Mail"
 msgstr "Mail ffnen"
 
-#: src/prpl.c:564
-#, c-format
-msgid "%s%s%s%s has made %s their buddy%s%s%s"
+#: src/prpl.c:570
+#, fuzzy, c-format
+msgid "%s%s%s%s has made %s his or her buddy%s%s%s"
 msgstr "%s%s%s%s hat %s zum Buddy%s%s%s gemacht"
 
-#: src/prpl.c:572
+#: src/prpl.c:578
+#, fuzzy
 msgid ""
 "\n"
 "\n"
-"Do you wish to add them to your buddy list?"
+"Do you wish to add him or her to your buddy list?"
 msgstr ""
 "\n"
 "\n"
 "Mchten Sie sie zu Ihrer Buddy-List hinzufgen?"
 
-#: src/prpl.c:615
+#: src/prpl.c:621
 msgid ""
 "You do not currently have any protocols available that are able to register "
 "new accounts."
@@ -3089,15 +3583,15 @@
 "Sie haben momentan keine verfgbaren Protokolle, die das\n"
 "Registrieren neuer Benutzeraccounts ermglichen."
 
-#: src/prpl.c:652
+#: src/prpl.c:658
 msgid "Gaim - Registration"
 msgstr "Gaim - Anmeldung"
 
-#: src/prpl.c:667
+#: src/prpl.c:673
 msgid "Registration Information"
 msgstr "Anmeldungsinformationen"
 
-#: src/prpl.c:684
+#: src/prpl.c:690
 msgid "Register"
 msgstr "Anmelden"
 
@@ -3126,30 +3620,59 @@
 msgid "No"
 msgstr "Nein"
 
-#: src/server.c:1054
+#: src/server.c:1076
 msgid "More Info"
 msgstr "Mehr Informationen"
 
-#~ msgid "Available"
-#~ msgstr "Erreichbar"
-
-#~ msgid "Available for friends only"
-#~ msgstr "Nur fr Freunde erreichbar"
-
-#~ msgid "Away for friends only"
-#~ msgstr "Nur fr Freunde abwesend"
-
-#~ msgid "Invisible"
-#~ msgstr "Unsichtbar"
-
-#~ msgid "Invisible for friends only"
-#~ msgstr "Nur fr Freunde unsichtbar"
-
-#~ msgid ""
-#~ "\n"
-#~ "\n"
-#~ "IRC: #gaim on irc.openprojects.net"
-#~ msgstr ""
-#~ "\n"
-#~ "\n"
-#~ "IRC: #gaim auf irc.openprojects.net"
+#: src/sound.c:63
+#, fuzzy
+msgid "Buddy logs in"
+msgstr "Buddy-Icon"
+
+#: src/sound.c:64
+#, fuzzy
+msgid "Buddy logs out"
+msgstr "Buddy-Liste"
+
+#: src/sound.c:65
+#, fuzzy
+msgid "Message received"
+msgstr "Nachrichten-Fehler"
+
+#: src/sound.c:66
+msgid "Message received begins conversation"
+msgstr ""
+
+#: src/sound.c:67
+#, fuzzy
+msgid "Message sent"
+msgstr "Nachrichten"
+
+#: src/sound.c:68
+msgid "Person enters chat"
+msgstr ""
+
+#: src/sound.c:69
+msgid "Person leaves chat"
+msgstr ""
+
+#: src/sound.c:70
+msgid "You talk in chat"
+msgstr ""
+
+#: src/sound.c:71
+msgid "Others talk in chat"
+msgstr ""
+
+#: src/sound.c:74
+msgid "Someone says your name in chat"
+msgstr ""
+
+#~ msgid "Enable sounds"
+#~ msgstr "Klnge aktivieren"
+
+#~ msgid "KFM"
+#~ msgstr "KFM/Konqueror"
+
+#~ msgid "Manual"
+#~ msgstr "Manuell"
--- a/po/fi.po	Tue Jul 02 05:41:30 2002 +0000
+++ b/po/fi.po	Tue Jul 02 05:42:26 2002 +0000
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gaim 0.55\n"
-"POT-Creation-Date: 2002-04-11 22:46-0700\n"
+"POT-Creation-Date: 2002-06-25 00:10-0400\n"
 "PO-Revision-Date: 2002-03-23 20:32+0200\n"
 "Last-Translator: Tero Kuusela <teroajk@subdimension.com>\n"
 "Language-Team: Finnish <fi@li.org>\n"
@@ -13,6 +13,117 @@
 "Content-Type: text/plain; charset=iso-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: plugins/chatlist.c:67 src/buddy_chat.c:272
+msgid "Buddy Chat"
+msgstr "Tuttavakeskustelu"
+
+#: plugins/chatlist.c:166 plugins/chatlist.c:168 plugins/chatlist.c:407
+#: plugins/chatlist.c:409
+#, fuzzy
+msgid "Gaim Chat"
+msgstr "Gaim - Ryhmkeskustelu"
+
+#: plugins/chatlist.c:339 src/about.c:165 src/aim.c:320 src/buddy.c:2716
+#: src/buddy_chat.c:1322 src/buddy_chat.c:1419 src/buddy_chat.c:1449
+#: src/conversation.c:2864 src/dialogs.c:567 src/dialogs.c:3899
+#: src/multi.c:1069 src/plugins.c:277 src/prefs.c:2547 src/prpl.c:438
+#: src/prpl.c:685 src/server.c:1072
+msgid "Close"
+msgstr "Sulje"
+
+#: plugins/chatlist.c:344
+#, fuzzy
+msgid "Chat Rooms"
+msgstr "Ryhmkeskusteluvalinnat"
+
+#: plugins/chatlist.c:363
+msgid "Refresh"
+msgstr ""
+
+#. Put the buttons in the box
+#: plugins/chatlist.c:364 src/buddy.c:492 src/buddy.c:2827
+#: src/buddy_chat.c:1454 src/conversation.c:2389 src/conversation.c:2879
+#: src/dialogs.c:932 src/dialogs.c:1114 src/dialogs.c:2095 src/multi.c:1053
+#: src/prefs.c:2041 src/prefs.c:2383 src/prefs.c:2417
+msgid "Add"
+msgstr "Lis"
+
+#: plugins/chatlist.c:365 src/buddy.c:494 src/buddy.c:2829
+#: src/buddy_chat.c:1456 src/conversation.c:2375 src/conversation.c:2876
+#: src/prefs.c:2055 src/prefs.c:2387 src/prefs.c:2421
+msgid "Remove"
+msgstr "Poista"
+
+#: plugins/chatlist.c:388
+msgid "List of available chats"
+msgstr ""
+
+#: plugins/chatlist.c:398
+msgid "List of subscribed chats"
+msgstr ""
+
+#: plugins/gtik.c:699
+msgid "Gnome Stock Ticker Properties"
+msgstr ""
+
+#: plugins/gtik.c:711
+msgid "Update Frequency in min"
+msgstr ""
+
+#: plugins/gtik.c:727
+msgid "Enter symbols delimited with \"+\" in the box below."
+msgstr ""
+
+#. OUTPUT FORMAT and SCROLL DIRECTION
+#: plugins/gtik.c:737
+msgid "Check this box to display only symbols and price:"
+msgstr ""
+
+#: plugins/gtik.c:738
+msgid "Check this box to scroll left to right:"
+msgstr ""
+
+#: plugins/gtik.c:974
+#, fuzzy
+msgid "(No"
+msgstr "Ei"
+
+#: plugins/gtik.c:975
+#, fuzzy
+msgid "Change"
+msgstr "Kanava:"
+
+#: src/protocols/gg/gg.c:71 src/protocols/msn/msn.c:1919
+#, fuzzy
+msgid "Available"
+msgstr "Tavoittamattomissa"
+
+#: src/protocols/gg/gg.c:72
+msgid "Available for friends only"
+msgstr ""
+
+#: src/applet.c:197 src/buddy.c:497 src/buddy.c:2582 src/buddy.c:2727
+#: src/protocols/gg/gg.c:73 src/protocols/jabber/jabber.c:1118
+msgid "Away"
+msgstr "Poissa"
+
+#: src/protocols/gg/gg.c:74
+msgid "Away for friends only"
+msgstr ""
+
+#: src/protocols/gg/gg.c:75
+#, fuzzy
+msgid "Invisible"
+msgstr "Kutsu"
+
+#: src/protocols/gg/gg.c:76
+msgid "Invisible for friends only"
+msgstr ""
+
+#: src/protocols/gg/gg.c:77 src/protocols/jabber/jabber.c:1114
+msgid "Unavailable"
+msgstr "Tavoittamattomissa"
+
 #: src/protocols/gg/gg.c:182
 msgid "Unable to resolve hostname."
 msgstr "Ei kyetty selvittmn isnnn nime."
@@ -41,7 +152,7 @@
 msgid "Unknown Error Code."
 msgstr "Tuntematon virhekoodi."
 
-#: src/protocols/gg/gg.c:302
+#: src/protocols/gg/gg.c:302 src/protocols/msn/msn.c:2050
 #, c-format
 msgid "Status: %s"
 msgstr "Tila: %s"
@@ -168,7 +279,7 @@
 msgstr "Sukupuoli"
 
 #. Line 5
-#: src/dialogs.c:1582 src/dialogs.c:2290 src/protocols/gg/gg.c:729
+#: src/dialogs.c:1624 src/dialogs.c:2332 src/protocols/gg/gg.c:729
 msgid "City"
 msgstr "Kunta"
 
@@ -242,7 +353,12 @@
 msgid "Directory Search"
 msgstr "Haku hakemistosta"
 
-#: src/dialogs.c:1699 src/protocols/gg/gg.c:1160 src/protocols/gg/gg.c:1177
+#.
+#. } else if (!strcmp(act, _("Set Dir Info"))) {
+#. show_set_dir(gc);
+#.
+#: src/dialogs.c:1741 src/protocols/gg/gg.c:1160 src/protocols/gg/gg.c:1177
+#: src/protocols/jabber/jabber.c:3748 src/protocols/jabber/jabber.c:3761
 msgid "Change Password"
 msgstr "Vaihda salasanaa"
 
@@ -263,8 +379,8 @@
 msgstr "Lhet viesti palvelimen kautta"
 
 #: src/protocols/icq/gaim_icq.c:469 src/protocols/irc/irc.c:1851
-#: src/protocols/jabber/jabber.c:2112 src/protocols/oscar/oscar.c:3436
-#: src/protocols/toc/toc.c:1216
+#: src/protocols/jabber/jabber.c:2860 src/protocols/oscar/oscar.c:3593
+#: src/protocols/toc/toc.c:1219
 msgid "Get Info"
 msgstr "Hae tiedot"
 
@@ -300,10 +416,9 @@
 msgid ""
 "%s has requested a DCC chat.  Would you like to establish the direct "
 "connection?"
-msgstr ""
-"%s on pyytnyt DCC-keskustelua. Haluatko muodostaa suoran yhteyden?"
-
-#: src/protocols/irc/irc.c:1001
+msgstr "%s on pyytnyt DCC-keskustelua. Haluatko muodostaa suoran yhteyden?"
+
+#: src/protocols/irc/irc.c:1001 src/protocols/msn/msn.c:315
 msgid "Unable to write"
 msgstr "Ei kyetty kirjoittamaan"
 
@@ -330,7 +445,7 @@
 msgid "Channel:"
 msgstr "Kanava:"
 
-#: src/multi.c:547 src/protocols/irc/irc.c:1675
+#: src/multi.c:549 src/protocols/irc/irc.c:1675
 msgid "Password:"
 msgstr "Salasana:"
 
@@ -338,170 +453,224 @@
 msgid "DCC Chat"
 msgstr "DCC-keskustelu"
 
-#: src/protocols/jabber/jabber.c:699
-msgid "Unavailable"
-msgstr "Tavoittamattomissa"
-
-#: src/applet.c:293 src/buddy.c:493 src/buddy.c:2508 src/buddy.c:2644
-#: src/protocols/jabber/jabber.c:703
-msgid "Away"
-msgstr "Poissa"
-
-#: src/buddy.c:2801 src/protocols/jabber/jabber.c:705
-#: src/protocols/jabber/jabber.c:723
+#: src/protocols/jabber/jabber.c:942
+msgid "Incorrect current password! Password NOT Changed!"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:943 src/protocols/jabber/jabber.c:948
+#, fuzzy
+msgid "Password Change Error!"
+msgstr "Gaim - Salasanan vaihto"
+
+#: src/protocols/jabber/jabber.c:947
+msgid "New password same as old password! Password NOT Changed!"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1092
+msgid "Unknown"
+msgstr "Tuntematon"
+
+#: src/buddy.c:2887 src/protocols/jabber/jabber.c:1120
+#: src/protocols/jabber/jabber.c:1138
 msgid "Online"
 msgstr "Linjoilla"
 
-#: src/protocols/jabber/jabber.c:707
+#: src/protocols/jabber/jabber.c:1122
 msgid "Extended Away"
 msgstr "Pidennetty poissaolo"
 
-#: src/protocols/jabber/jabber.c:709
+#: src/protocols/jabber/jabber.c:1124
 msgid "Do Not Disturb"
 msgstr "l hiritse"
 
-#: src/protocols/jabber/jabber.c:1042
+#: src/protocols/jabber/jabber.c:1434
+#, c-format
+msgid "Error %s: %s"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1437
+#, fuzzy
+msgid "Unknown Error in presence"
+msgstr "Tuntematon virhekoodi."
+
+#: src/protocols/jabber/jabber.c:1607
+#, fuzzy, c-format
+msgid "The user %s wants to add you to their buddy list."
+msgstr ""
+"\n"
+"\n"
+"Haluatko list hnet tuttavalistallesi?"
+
+#: src/protocols/jabber/jabber.c:1632
 msgid "No such user"
 msgstr "Palvelinta ei ole olemassa"
 
-#: src/protocols/jabber/jabber.c:1044
+#: src/protocols/jabber/jabber.c:1634 src/protocols/jabber/jabber.c:2341
+#: src/protocols/jabber/jabber.c:2506
 msgid "Jabber Error"
 msgstr "Jabber-virhe"
 
-#: src/dialogs.c:845 src/protocols/jabber/jabber.c:1124
+#: src/dialogs.c:887 src/protocols/jabber/jabber.c:1719
+#: src/protocols/msn/msn.c:1110
 msgid "Buddies"
 msgstr "Tuttavat"
 
-#: src/protocols/jabber/jabber.c:1188
+#: src/protocols/jabber/jabber.c:1782
 msgid "Authenticating"
 msgstr "Todennetaan"
 
-#: src/protocols/jabber/jabber.c:1225
+#: src/protocols/jabber/jabber.c:1819
 msgid "Unknown login error"
 msgstr "Tuntematon sisnkirjautumisvirhe"
 
-#: src/protocols/jabber/jabber.c:1455 src/protocols/jabber/jabber.c:2903
+#: src/protocols/jabber/jabber.c:2010
+#, fuzzy
+msgid "Password successfully changed."
+msgstr "Salasanan vaihto onnistui"
+
+#: src/protocols/jabber/jabber.c:2012
+#, fuzzy
+msgid "Password Change"
+msgstr "Gaim - Salasanan vaihto"
+
+#: src/protocols/jabber/jabber.c:2054 src/protocols/jabber/jabber.c:3676
 msgid "Connection lost"
 msgstr "Yhteys kadotettu"
 
-#: src/protocols/jabber/jabber.c:1457 src/protocols/jabber/jabber.c:1489
-#: src/protocols/jabber/jabber.c:2905 src/protocols/jabber/jabber.c:2951
+#: src/protocols/jabber/jabber.c:2056 src/protocols/jabber/jabber.c:2088
+#: src/protocols/jabber/jabber.c:3678 src/protocols/jabber/jabber.c:3724
+#: src/protocols/msn/msn.c:1741 src/protocols/msn/msn.c:1770
 msgid "Unable to connect"
 msgstr "Yhteyden muodostaminen eponnistui"
 
-#: src/protocols/jabber/jabber.c:1463
+#: src/protocols/jabber/jabber.c:2062
 msgid "Connected"
 msgstr "Yhdistettyn"
 
-#: src/protocols/jabber/jabber.c:1466
+#: src/protocols/jabber/jabber.c:2065
 msgid "Requesting Authentication Method"
 msgstr "Pyydetn todennusmuotoa"
 
 #. we have no chats yet
-#: src/protocols/jabber/jabber.c:1484
+#: src/protocols/jabber/jabber.c:2083 src/protocols/msn/msn.c:1762
 msgid "Connecting"
 msgstr "Yhdistetn"
 
-#: src/protocols/jabber/jabber.c:1783
+#: src/protocols/jabber/jabber.c:2340 src/protocols/jabber/jabber.c:2505
+#, fuzzy
+msgid "Invalid Jabber I.D."
+msgstr "Epkelpo nimi"
+
+#: src/protocols/jabber/jabber.c:2473
 msgid "Room:"
 msgstr "Huone:"
 
-#: src/protocols/jabber/jabber.c:1787
+#: src/protocols/jabber/jabber.c:2477
 msgid "Server:"
 msgstr "Palvelin:"
 
-#: src/protocols/jabber/jabber.c:1792
+#: src/protocols/jabber/jabber.c:2482
 msgid "Handle:"
 msgstr "Kdensija:"
 
-#: src/protocols/jabber/jabber.c:2062 src/protocols/jabber/jabber.c:2401
-msgid "Unknown"
-msgstr "Tuntematon"
-
-#: src/buddy_chat.c:875 src/protocols/jabber/jabber.c:2117
-#: src/protocols/oscar/oscar.c:3443
+#: src/protocols/jabber/jabber.c:2539
+#, fuzzy
+msgid "Chats"
+msgstr "Ryhmkeskustelu"
+
+#: src/protocols/jabber/jabber.c:2854
+#, fuzzy
+msgid "View Error Msg"
+msgstr "Nyt loki"
+
+#: src/buddy_chat.c:886 src/protocols/jabber/jabber.c:2865
+#: src/protocols/oscar/oscar.c:3606
 msgid "Get Away Msg"
 msgstr "Hae poissaoloviesti"
 
-#: src/protocols/jabber/jabber.c:2299
+#: src/protocols/jabber/jabber.c:2882
+msgid "Remove From Roster"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:3076
 msgid "Full Name"
 msgstr "Koko nimi"
 
-#: src/protocols/jabber/jabber.c:2300
+#: src/protocols/jabber/jabber.c:3077
 msgid "Family Name"
 msgstr "Sukunimi"
 
-#: src/protocols/jabber/jabber.c:2301
+#: src/protocols/jabber/jabber.c:3078
 msgid "Given Name"
 msgstr "Etunimi"
 
-#: src/protocols/jabber/jabber.c:2302
+#: src/protocols/jabber/jabber.c:3079
 msgid "Nickname"
 msgstr "Kutsumanimi"
 
-#: src/dialogs.c:2483 src/protocols/jabber/jabber.c:2303
+#: src/dialogs.c:2525 src/protocols/jabber/jabber.c:3080
 msgid "URL"
 msgstr "URL"
 
-#: src/protocols/jabber/jabber.c:2304
+#: src/protocols/jabber/jabber.c:3081
 msgid "Street Address"
 msgstr "Katuosoite"
 
-#: src/protocols/jabber/jabber.c:2305
+#: src/protocols/jabber/jabber.c:3082
 msgid "Extended Address"
 msgstr "Laajennettu osoite"
 
-#: src/protocols/jabber/jabber.c:2306
+#: src/protocols/jabber/jabber.c:3083
 msgid "Locality"
 msgstr "Alue"
 
-#: src/protocols/jabber/jabber.c:2307
+#: src/protocols/jabber/jabber.c:3084
 msgid "Region"
 msgstr "Seutu"
 
-#: src/protocols/jabber/jabber.c:2308
+#: src/protocols/jabber/jabber.c:3085
 msgid "Postal Code"
 msgstr "Postinumero"
 
 #. Line 7
-#: src/dialogs.c:1604 src/dialogs.c:2312 src/protocols/jabber/jabber.c:2309
+#: src/dialogs.c:1646 src/dialogs.c:2354 src/protocols/jabber/jabber.c:3086
 msgid "Country"
 msgstr "Maa"
 
-#: src/protocols/jabber/jabber.c:2310
+#: src/protocols/jabber/jabber.c:3087
 msgid "Telephone"
 msgstr "Puhelin"
 
-#: src/dialogs.c:2388 src/protocols/jabber/jabber.c:2311
+#: src/dialogs.c:2430 src/protocols/jabber/jabber.c:3088
 msgid "Email"
 msgstr "Shkposti"
 
-#: src/protocols/jabber/jabber.c:2312
+#: src/protocols/jabber/jabber.c:3089
 msgid "Organization Name"
 msgstr "Organisaation nimi"
 
-#: src/protocols/jabber/jabber.c:2313
+#: src/protocols/jabber/jabber.c:3090
 msgid "Organization Unit"
 msgstr "Organisaatioyksikk"
 
-#: src/prefs.c:1988 src/protocols/jabber/jabber.c:2314
+#: src/prefs.c:2000 src/protocols/jabber/jabber.c:3091
 msgid "Title"
 msgstr "Arvonimi"
 
-#: src/protocols/jabber/jabber.c:2315
+#: src/protocols/jabber/jabber.c:3092
 msgid "Role"
 msgstr "Asema"
 
-#: src/protocols/jabber/jabber.c:2316
+#: src/protocols/jabber/jabber.c:3093
 msgid "Birthday"
 msgstr "Syntympiv"
 
 #. Right side: frame with description and the filepath of plugin
-#: src/dialogs.c:2491 src/plugins.c:211 src/protocols/jabber/jabber.c:2317
+#: src/dialogs.c:2533 src/plugins.c:211 src/protocols/jabber/jabber.c:3094
 msgid "Description"
 msgstr "Kuvaus"
 
-#: src/protocols/jabber/jabber.c:2342
+#: src/protocols/jabber/jabber.c:3119
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable"
@@ -509,133 +678,389 @@
 "Kaikki allaolevat kentt ovat valinnaisia. Kirjoita vain tiedot, joiden "
 "luovuttamista pidt sopivana."
 
-#: src/protocols/jabber/jabber.c:2343
+#: src/protocols/jabber/jabber.c:3120
 msgid "User Identity"
 msgstr "Kyttjn henkilllisyys"
 
-#: src/protocols/jabber/jabber.c:2759
+#: src/protocols/jabber/jabber.c:3532
 msgid "Gaim - Edit Jabber vCard"
 msgstr "Gaim - Muokkaa Jabberin vCardia"
 
-#: src/protocols/jabber/jabber.c:2833
+#: src/protocols/jabber/jabber.c:3606
 msgid "Server Registration successful!"
 msgstr "Palvelimelle rekisterityminen onnistui!"
 
-#: src/protocols/jabber/jabber.c:2860
+#: src/protocols/jabber/jabber.c:3633
 msgid "Unknown registration error"
 msgstr "Tunnistamaton rekisterintivirhe"
 
-#: src/protocols/jabber/jabber.c:2969 src/protocols/jabber/jabber.c:2984
+#: src/protocols/jabber/jabber.c:3742 src/protocols/jabber/jabber.c:3757
 msgid "Set User Info"
 msgstr "Aseta kyttjtiedot"
 
-#: src/protocols/msn/msn.c:719 src/protocols/msn/msn.c:2041
-#: src/protocols/msn/msn.c:2074
+#: src/protocols/msn/msn.c:230
+msgid "Syntax Error (probably a Gaim bug)"
+msgstr ""
+
+#: src/protocols/msn/msn.c:233
+msgid "Invalid Parameter (probably a Gaim bug)"
+msgstr ""
+
+#: src/protocols/msn/msn.c:236
+#, fuzzy
+msgid "Invalid User"
+msgstr "Epkelpo nimi"
+
+#: src/protocols/msn/msn.c:239
+msgid "Fully Qualified Domain Name missing"
+msgstr ""
+
+#: src/protocols/msn/msn.c:242
+msgid "Already Login"
+msgstr ""
+
+#: src/protocols/msn/msn.c:245
+#, fuzzy
+msgid "Invalid Username"
+msgstr "Epkelpo nimi"
+
+#: src/protocols/msn/msn.c:248
+#, fuzzy
+msgid "Invalid Friendly Name"
+msgstr "Epkelpo nimi"
+
+#: src/protocols/msn/msn.c:251
+msgid "List Full"
+msgstr ""
+
+#: src/protocols/msn/msn.c:254
+msgid "Already there"
+msgstr ""
+
+#: src/protocols/msn/msn.c:257
+#, fuzzy
+msgid "Not on list"
+msgstr "Yhteys kadotettu"
+
+#: src/protocols/msn/msn.c:260
+msgid "User is offline"
+msgstr ""
+
+#: src/protocols/msn/msn.c:263
+msgid "Already in the mode"
+msgstr ""
+
+#: src/protocols/msn/msn.c:266
+msgid "Already in opposite list"
+msgstr ""
+
+#: src/protocols/msn/msn.c:269
+msgid "Switchboard failed"
+msgstr ""
+
+#: src/protocols/msn/msn.c:272
+msgid "Notify Transfer failed"
+msgstr ""
+
+#: src/protocols/msn/msn.c:276
+msgid "Required fields missing"
+msgstr ""
+
+#: src/protocols/msn/msn.c:279
+#, fuzzy
+msgid "Not logged in"
+msgstr "%s kirjautui sisn."
+
+#: src/protocols/msn/msn.c:283
+#, fuzzy
+msgid "Internal server error"
+msgstr "Sisinen virhe"
+
+#: src/protocols/msn/msn.c:286
+msgid "Database server error"
+msgstr ""
+
+#: src/protocols/msn/msn.c:289
+#, fuzzy
+msgid "File operation error"
+msgstr "sisinen yhteysvirhe\n"
+
+#: src/protocols/msn/msn.c:292
+#, fuzzy
+msgid "Memory allocation error"
+msgstr "merkittv yhteysvirhe\n"
+
+#: src/protocols/msn/msn.c:296
+#, fuzzy
+msgid "Server busy"
+msgstr "Palvelin:"
+
+#: src/protocols/msn/msn.c:299
+#, fuzzy
+msgid "Server unavailable"
+msgstr "Tavoittamattomissa"
+
+#: src/protocols/msn/msn.c:302
+msgid "Peer Notification server down"
+msgstr ""
+
+#: src/protocols/msn/msn.c:305
+#, fuzzy
+msgid "Database connect error"
+msgstr "sisinen yhteysvirhe\n"
+
+#: src/protocols/msn/msn.c:308
+msgid "Server is going down (abandon ship)"
+msgstr ""
+
+#: src/protocols/msn/msn.c:312
+#, fuzzy
+msgid "Error creating connection"
+msgstr "g003: Virhe avattaessa yhteytt.\n"
+
+#: src/protocols/msn/msn.c:318
+msgid "Session overload"
+msgstr ""
+
+#: src/protocols/msn/msn.c:321
+msgid "User is too active"
+msgstr ""
+
+#: src/protocols/msn/msn.c:324
+#, fuzzy
+msgid "Too many sessions"
+msgstr "Liian monta tsmvyytt."
+
+#: src/protocols/msn/msn.c:327
+msgid "Not expected"
+msgstr ""
+
+#: src/protocols/msn/msn.c:330
+msgid "Bad friend file"
+msgstr ""
+
+#: src/protocols/msn/msn.c:334
+#, fuzzy
+msgid "Authentication failed"
+msgstr "Todennus eponnistui."
+
+#: src/protocols/msn/msn.c:337
+#, fuzzy
+msgid "Not allowed when offline"
+msgstr "Ei ni kun kirjaudut sisn"
+
+#: src/protocols/msn/msn.c:340
+msgid "Not accepting new users"
+msgstr ""
+
+#: src/protocols/msn/msn.c:343
+msgid "User unverified"
+msgstr ""
+
+#: src/protocols/msn/msn.c:346
+#, fuzzy
+msgid "Unknown Error Code"
+msgstr "Tuntematon virhekoodi."
+
+#: src/protocols/msn/msn.c:351 src/protocols/msn/msn.c:558
+#: src/protocols/msn/msn.c:813 src/protocols/msn/msn.c:2114
+#: src/protocols/msn/msn.c:2283 src/protocols/msn/msn.c:2336
 msgid "MSN Error"
 msgstr "MSN-virhe"
 
-#: src/protocols/msn/msn.c:719
+#: src/protocols/msn/msn.c:558
+msgid "A message may not have been received."
+msgstr ""
+
+#: src/protocols/msn/msn.c:813
 msgid "Gaim was unable to send a message"
 msgstr "Gaim ei kyennyt lhettmn viesti"
 
-#: src/protocols/msn/msn.c:1069
+#: src/protocols/msn/msn.c:917
+#, c-format
+msgid "The user %s (%s) wants to add %s to his or her buddy list."
+msgstr ""
+
+#: src/protocols/msn/msn.c:1074
+#, c-format
+msgid "The user %s (%s) wants to add you to their buddy list"
+msgstr ""
+
+#: src/protocols/msn/msn.c:1175
 msgid "You have been disconnected. You have signed on from another location."
 msgstr "Yhteytesi on katkennut. Olet kirjautunut sisn toisesta paikasta."
 
-#: src/protocols/msn/msn.c:2041 src/protocols/msn/msn.c:2074
+#: src/protocols/msn/msn.c:1435 src/protocols/msn/msn.c:1679
+#, fuzzy
+msgid "Error reading from server"
+msgstr "Virhe luettaessa socketista."
+
+#: src/protocols/msn/msn.c:1568
+msgid "Requesting to send password"
+msgstr ""
+
+#: src/protocols/msn/msn.c:1618
+#, fuzzy
+msgid "Unable to send password"
+msgstr "Ei kyetty lukemaan socketia"
+
+#: src/protocols/msn/msn.c:1623
+#, fuzzy
+msgid "Password sent"
+msgstr "Salasana: "
+
+#: src/protocols/msn/msn.c:1748
+#, fuzzy
+msgid "Unable to write to server"
+msgstr "Palvelimeen ei kyetty muodostamaan yhteytt."
+
+#: src/protocols/msn/msn.c:1754
+#, fuzzy
+msgid "Synching with server"
+msgstr "Rekisteridy palvelimeen"
+
+#: src/protocols/msn/msn.c:1920
+msgid "Away From Computer"
+msgstr ""
+
+#: src/protocols/msn/msn.c:1921
+msgid "Be Right Back"
+msgstr ""
+
+#: src/protocols/msn/msn.c:1922
+#, fuzzy
+msgid "Busy"
+msgstr "Tuttava"
+
+#: src/protocols/msn/msn.c:1923
+msgid "On The Phone"
+msgstr ""
+
+#: src/protocols/msn/msn.c:1924
+msgid "Out To Lunch"
+msgstr ""
+
+#: src/protocols/msn/msn.c:1925
+#, fuzzy
+msgid "Hidden"
+msgstr "Piilota kuvake"
+
+#: src/protocols/msn/msn.c:2041
+msgid "Reset friendly name"
+msgstr ""
+
+#: src/protocols/msn/msn.c:2114
+msgid "Friendly name too long."
+msgstr ""
+
+#: src/protocols/msn/msn.c:2129 src/protocols/msn/msn.c:2150
+#, fuzzy
+msgid "Set Friendly Name"
+msgstr "Sukunimi"
+
+#: src/protocols/msn/msn.c:2130
+#, fuzzy
+msgid "Set Friendly Name:"
+msgstr "Nyttnimi: "
+
+#: src/protocols/msn/msn.c:2131
+msgid "Reset All Friendly Names"
+msgstr ""
+
+#: src/protocols/msn/msn.c:2283 src/protocols/msn/msn.c:2336
 msgid "Invalid name"
 msgstr "Epkelpo nimi"
 
-#: src/protocols/napster/napster.c:450 src/protocols/oscar/oscar.c:3075
-#: src/protocols/toc/toc.c:1101
+#: src/protocols/napster/napster.c:457 src/protocols/oscar/oscar.c:3209
+#: src/protocols/toc/toc.c:1104
 msgid "Join what group:"
 msgstr "Mihin ryhmn liitytn:"
 
-#: src/protocols/oscar/oscar.c:333
+#: src/protocols/oscar/oscar.c:330
 #, c-format
 msgid "Direct IM with %s closed"
 msgstr "Suora pikaviesti %s:n kanssa suljettu"
 
-#: src/protocols/oscar/oscar.c:335
+#: src/protocols/oscar/oscar.c:332
 #, c-format
 msgid "Direct IM with %s failed"
 msgstr "Suora pikaviesti %s:n kanssa eponnistui"
 
-#: src/protocols/oscar/oscar.c:373
+#: src/protocols/oscar/oscar.c:370
 msgid "connection error (rend)\n"
 msgstr "yhteysvirhe (rend)\n"
 
-#: src/protocols/oscar/oscar.c:384
+#: src/protocols/oscar/oscar.c:381
 msgid "major connection error\n"
 msgstr "merkittv yhteysvirhe\n"
 
-#: src/protocols/oscar/oscar.c:385 src/protocols/toc/toc.c:511
+#: src/protocols/oscar/oscar.c:382 src/protocols/toc/toc.c:511
 #: src/protocols/toc/toc.c:524 src/protocols/toc/toc.c:590
 msgid "Disconnected."
 msgstr "Yhteys katkennut."
 
-#: src/protocols/oscar/oscar.c:397 src/protocols/toc/toc.c:761
+#: src/protocols/oscar/oscar.c:394 src/protocols/toc/toc.c:761
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "Yhteytesi keskusteluhuoneeseen %s on katkennut."
 
-#: src/protocols/oscar/oscar.c:398
+#: src/protocols/oscar/oscar.c:395
 msgid "Chat Error!"
 msgstr "Ryhmkeskusteluvirhe!"
 
-#: src/protocols/oscar/oscar.c:410
+#: src/protocols/oscar/oscar.c:407
 msgid "Chat is currently unavailable"
 msgstr "Ryhmkeskustelu ei ole parhaillaan kytettviss"
 
-#: src/protocols/oscar/oscar.c:411
+#: src/protocols/oscar/oscar.c:408
 msgid "Gaim - Chat"
 msgstr "Gaim - Ryhmkeskustelu"
 
-#: src/protocols/oscar/oscar.c:470 src/protocols/oscar/oscar.c:530
+#: src/protocols/oscar/oscar.c:467 src/protocols/oscar/oscar.c:527
 msgid "Couldn't connect to host"
 msgstr "Yhteytt isntn ei voitu muodostaa"
 
-#: src/protocols/oscar/oscar.c:478
+#: src/protocols/oscar/oscar.c:475
 msgid "Password sent, waiting for response\n"
 msgstr "Salasana lhetetty, odotetaan vastausta\n"
 
-#: src/protocols/oscar/oscar.c:511
+#: src/protocols/oscar/oscar.c:508
 msgid "internal connection error\n"
 msgstr "sisinen yhteysvirhe\n"
 
-#: src/protocols/oscar/oscar.c:512
+#: src/protocols/oscar/oscar.c:509
 msgid "Unable to login to AIM"
 msgstr "Ei kyetty kirjautumaan sisn AIM:iin"
 
-#: src/protocols/oscar/oscar.c:517
+#: src/protocols/oscar/oscar.c:514
 #, c-format
 msgid "Signon: %s"
 msgstr "Sisnkirjaus: %s"
 
-#: src/protocols/oscar/oscar.c:589
+#: src/protocols/oscar/oscar.c:586
 msgid "Signed off.\n"
 msgstr "Kirjauduttu ulos.\n"
 
-#: src/protocols/oscar/oscar.c:608 src/protocols/oscar/oscar.c:732
+#: src/protocols/oscar/oscar.c:605 src/protocols/oscar/oscar.c:730
 msgid "Could Not Connect"
 msgstr "Yhteytt ei voitu muodostaa"
 
-#: src/protocols/oscar/oscar.c:616
+#: src/protocols/oscar/oscar.c:613
 msgid "Connection established, cookie sent"
 msgstr "Yhteys muodostettu, evste lhetetty"
 
 #. Incorrect nick/password
-#: src/protocols/oscar/oscar.c:642 src/protocols/toc/toc.c:459
+#: src/protocols/oscar/oscar.c:639 src/protocols/toc/toc.c:459
 msgid "Incorrect nickname or password."
 msgstr "Virheellinen kutsumanimi tai salasana."
 
 #. Suspended account
-#: src/protocols/oscar/oscar.c:647
+#: src/protocols/oscar/oscar.c:644
 msgid "Your account is currently suspended."
 msgstr "Kyttjtilisi palvelu on parhaillaan keskeytetty."
 
 #. connecting too frequently
-#: src/protocols/oscar/oscar.c:651
+#: src/protocols/oscar/oscar.c:648
 msgid ""
 "You have been connecting and disconnecting too frequently. Wait ten minutes "
 "and try again. If you continue to try, you will need to wait even longer."
@@ -645,223 +1070,233 @@
 "pidempn."
 
 #. client too old
-#: src/protocols/oscar/oscar.c:656
+#: src/protocols/oscar/oscar.c:653
 msgid "The client version you are using is too old. Please upgrade at "
 msgstr "Asiakasohjelmasi versio on liian vanha. Pivit "
 
-#: src/protocols/oscar/oscar.c:660 src/protocols/toc/toc.c:542
+#: src/protocols/oscar/oscar.c:657 src/protocols/toc/toc.c:542
 msgid "Authentication Failed"
 msgstr "Todennus eponnistui"
 
-#: src/protocols/oscar/oscar.c:682
+#: src/protocols/oscar/oscar.c:679
 msgid "Internal Error"
 msgstr "Sisinen virhe"
 
-#: src/protocols/oscar/oscar.c:1250 src/protocols/oscar/oscar.c:3286
+#: src/protocols/oscar/oscar.c:1248 src/protocols/oscar/oscar.c:3420
 #, c-format
 msgid "Direct IM with %s established"
 msgstr "Suora pikaviesti %s:n kanssa muodostettu"
 
-#: src/protocols/oscar/oscar.c:1496 src/protocols/oscar/oscar.c:2371
-#, c-format
+#: src/protocols/oscar/oscar.c:1504 src/protocols/oscar/oscar.c:2456
+#, fuzzy, c-format
 msgid ""
-"The user %d has denied your request to add them to your contact list for the "
-"following reason:\n"
-"\n"
+"The user %lu has denied your request to add them to your contact list for "
+"the following reason:\n"
+"%s"
 msgstr ""
 "Kyttj %d on evnnyt pyyntsi list hnet tuttavalistallesi seuraavasta "
 "syyst:\n"
 "\n"
 
-#: src/protocols/oscar/oscar.c:1496 src/protocols/oscar/oscar.c:2371
+#: src/protocols/oscar/oscar.c:1504 src/protocols/oscar/oscar.c:2456
 msgid "No reason given."
 msgstr "Syyt ei annettu"
 
-#: src/protocols/oscar/oscar.c:1497 src/protocols/oscar/oscar.c:2372
+#: src/protocols/oscar/oscar.c:1505 src/protocols/oscar/oscar.c:2457
 msgid "Gaim - ICQ Authorization Denied"
 msgstr "Gaim - ICQ valtuutus evtty"
 
-#: src/protocols/oscar/oscar.c:1503 src/protocols/oscar/oscar.c:2378
-#, c-format
-msgid "The user %d has granted your request to add them to your contact list."
+#: src/protocols/oscar/oscar.c:1511 src/protocols/oscar/oscar.c:2463
+#, fuzzy, c-format
+msgid "The user %lu has granted your request to add them to your contact list."
 msgstr "Kyttj %d on hyvksynyt pyyntsi list hnet tuttavalistallesi."
 
-#: src/protocols/oscar/oscar.c:1504 src/protocols/oscar/oscar.c:2379
+#: src/protocols/oscar/oscar.c:1512 src/protocols/oscar/oscar.c:2464
 msgid "Gaim - ICQ Authorization Granted"
 msgstr "Gaim - ICQ valtuutus hyvksytty"
 
-#: src/protocols/oscar/oscar.c:1577
+#: src/protocols/oscar/oscar.c:1585
 #, c-format
 msgid "You missed %d message from %s because it was invalid."
 msgstr "Et saanut %d viesti %s:lta koska se oli epkelpo."
 
-#: src/protocols/oscar/oscar.c:1578
+#: src/protocols/oscar/oscar.c:1586
 #, c-format
 msgid "You missed %d messages from %s because they were invalid."
 msgstr "Et saanut %d viesti %s:lta koska ne olivat epkelpoja."
 
-#: src/protocols/oscar/oscar.c:1587
+#: src/protocols/oscar/oscar.c:1595
 #, c-format
 msgid "You missed %d message from %s because it was too large."
 msgstr "Et saanut %d viesti %s:lta koska se oli liian suuri."
 
-#: src/protocols/oscar/oscar.c:1588
+#: src/protocols/oscar/oscar.c:1596
 #, c-format
 msgid "You missed %d messages from %s because they were too large."
 msgstr "Et saanut %d viesti %s:lta koska ne olivat liian suuria."
 
-#: src/protocols/oscar/oscar.c:1597
+#: src/protocols/oscar/oscar.c:1605
 #, c-format
 msgid "You missed %d message from %s because the rate limit has been exceeded."
 msgstr "Et saanut %d viesti %s:lta koska taajuusraja ylittyi."
 
-#: src/protocols/oscar/oscar.c:1598
+#: src/protocols/oscar/oscar.c:1606
 #, c-format
 msgid ""
 "You missed %d messages from %s because the rate limit has been exceeded."
 msgstr "Et saanut %d viesti %s:lta koska taajuusraja ylittyi."
 
-#: src/protocols/oscar/oscar.c:1607
+#: src/protocols/oscar/oscar.c:1615
 #, c-format
 msgid "You missed %d message from %s because it was too evil."
 msgstr "Et saanut %d viesti %s:lta koska se oli liian hirve."
 
-#: src/protocols/oscar/oscar.c:1608
+#: src/protocols/oscar/oscar.c:1616
 #, c-format
 msgid "You missed %d messages from %s because they are too evil."
 msgstr "Et saanut %d viesti %s:lta koska ne ovat liian hirveit."
 
-#: src/protocols/oscar/oscar.c:1617
+#: src/protocols/oscar/oscar.c:1625
 #, c-format
 msgid "You missed %d message from %s because you are too evil."
 msgstr "Et saanut %d viesti %s:lta koska olet liian hirve."
 
-#: src/protocols/oscar/oscar.c:1618
-#, c-format
-msgid "You missed %d messages from %s because you are too evil."
-msgstr "Et saanut %d viesti %s:lta koska olet liian hirve."
-
 #: src/protocols/oscar/oscar.c:1626
 #, c-format
+msgid "You missed %d messages from %s because you are too evil."
+msgstr "Et saanut %d viesti %s:lta koska olet liian hirve."
+
+#: src/protocols/oscar/oscar.c:1634
+#, c-format
 msgid "You missed %d message from %s for unknown reasons."
 msgstr "Et saanut %d viesti %s:lta tuntemattomista syist."
 
-#: src/protocols/oscar/oscar.c:1627
+#: src/protocols/oscar/oscar.c:1635
 #, c-format
 msgid "You missed %d messages from %s for unknown reasons."
 msgstr "Et saanut %d viesti %s:lta tuntemattomista syist."
 
-#: src/dialogs.c:3034 src/dialogs.c:3040 src/protocols/oscar/oscar.c:1632
-#: src/protocols/oscar/oscar.c:1670 src/protocols/oscar/oscar.c:1688
-#: src/protocols/oscar/oscar.c:2141 src/protocols/yahoo/yahoo.c:585
+#: src/dialogs.c:3076 src/dialogs.c:3082 src/protocols/oscar/oscar.c:1640
+#: src/protocols/oscar/oscar.c:1755 src/protocols/oscar/oscar.c:1773
+#: src/protocols/oscar/oscar.c:2226 src/protocols/yahoo/yahoo.c:594
 msgid "Gaim - Error"
 msgstr "Gaim - Virhe"
 
-#: src/protocols/oscar/oscar.c:1649
+#: src/protocols/oscar/oscar.c:1703
+#, c-format
+msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR>%s<BR>"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:1705
+#, c-format
+msgid "<B>Status:</B> %s<BR><HR><BR>%s<BR>"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:1734
 #, c-format
 msgid "SNAC threw error: %s\n"
 msgstr "SNAC heitti virheen: %s\n"
 
-#: src/protocols/oscar/oscar.c:1651
+#: src/protocols/oscar/oscar.c:1736
 msgid "Gaim - Oscar SNAC Error"
 msgstr "Gaim - Oscar SNAC Virhe"
 
-#: src/protocols/oscar/oscar.c:1668
+#: src/protocols/oscar/oscar.c:1753
 #, c-format
 msgid "Your message to %s did not get sent: %s"
 msgstr "Viestisi %s:lle ei lhetetty: %s"
 
-#: src/protocols/oscar/oscar.c:1669 src/protocols/oscar/oscar.c:1687
+#: src/protocols/oscar/oscar.c:1754 src/protocols/oscar/oscar.c:1772
 msgid "Reason unknown"
 msgstr "Tuntematon syy"
 
-#: src/protocols/oscar/oscar.c:1686
+#: src/protocols/oscar/oscar.c:1771
 #, c-format
 msgid "User information for %s unavailable: %s"
 msgstr "%s:n kyttjtiedot eivt ole saatavilla: %s"
 
-#: src/buddy.c:2060 src/protocols/oscar/oscar.c:1717
+#: src/buddy.c:2131 src/protocols/oscar/oscar.c:1802
 msgid "Buddy Icon"
 msgstr "Tuttavakuvake"
 
-#: src/buddy.c:2063 src/protocols/oscar/oscar.c:1720
+#: src/buddy.c:2134 src/protocols/oscar/oscar.c:1805
 msgid "Voice"
 msgstr "ni"
 
-#: src/buddy.c:2066 src/protocols/oscar/oscar.c:1723
+#: src/buddy.c:2137 src/protocols/oscar/oscar.c:1808
 msgid "IM Image"
 msgstr "Pikaviestikuva"
 
-#: src/buddy.c:494 src/buddy.c:2069 src/buddy.c:2507 src/prefs.c:2912
-#: src/protocols/oscar/oscar.c:1726
+#: src/buddy.c:498 src/buddy.c:2140 src/buddy.c:2581 src/prefs.c:2926
+#: src/protocols/oscar/oscar.c:1811
 msgid "Chat"
 msgstr "Ryhmkeskustelu"
 
-#: src/buddy.c:2072 src/protocols/oscar/oscar.c:1729
+#: src/buddy.c:2143 src/protocols/oscar/oscar.c:1814
 msgid "Get File"
 msgstr "Vastaanota tiedosto"
 
-#: src/buddy.c:2075 src/protocols/oscar/oscar.c:1732
+#: src/buddy.c:2146 src/protocols/oscar/oscar.c:1817
 msgid "Send File"
 msgstr "Lhet tiedosto"
 
-#: src/buddy.c:2079 src/protocols/oscar/oscar.c:1736
+#: src/buddy.c:2150 src/protocols/oscar/oscar.c:1821
 msgid "Games"
 msgstr "Pelit"
 
-#: src/buddy.c:2082 src/protocols/oscar/oscar.c:1739
+#: src/buddy.c:2153 src/protocols/oscar/oscar.c:1824
 msgid "Stocks"
 msgstr "Osakkeet"
 
-#: src/buddy.c:2085 src/protocols/oscar/oscar.c:1742
+#: src/buddy.c:2156 src/protocols/oscar/oscar.c:1827
 msgid "Send Buddy List"
 msgstr "Lhet tuttavalista"
 
-#: src/buddy.c:2088 src/protocols/oscar/oscar.c:1745
+#: src/buddy.c:2159 src/protocols/oscar/oscar.c:1830
 msgid "EveryBuddy Bug"
 msgstr "EveryBuddy-ohjelmistovirhe"
 
-#: src/buddy.c:2091 src/protocols/oscar/oscar.c:1748
+#: src/buddy.c:2162 src/protocols/oscar/oscar.c:1833
 msgid "AP User"
 msgstr "AP-kyttj"
 
-#: src/buddy.c:2094 src/protocols/oscar/oscar.c:1751
+#: src/buddy.c:2165 src/protocols/oscar/oscar.c:1836
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
-#: src/buddy.c:2097 src/protocols/oscar/oscar.c:1754
+#: src/buddy.c:2168 src/protocols/oscar/oscar.c:1839
 msgid "Nihilist"
 msgstr "Nihilistinen"
 
-#: src/buddy.c:2100 src/protocols/oscar/oscar.c:1757
+#: src/buddy.c:2171 src/protocols/oscar/oscar.c:1842
 msgid "ICQ Server Relay"
 msgstr "ICQ-palvelimen vlitys"
 
-#: src/buddy.c:2103 src/protocols/oscar/oscar.c:1760
+#: src/buddy.c:2174 src/protocols/oscar/oscar.c:1845
 msgid "ICQ Unknown"
 msgstr "ICQ tuntematon"
 
-#: src/buddy.c:2106 src/protocols/oscar/oscar.c:1763
+#: src/buddy.c:2177 src/protocols/oscar/oscar.c:1848
 msgid "Trillian Encryption"
 msgstr "Trillian-salaus"
 
-#: src/protocols/oscar/oscar.c:1801
+#: src/protocols/oscar/oscar.c:1886
 msgid ""
-"<br><BODY BGCOLOR=WHITE><hr><I>Legend:</I><br><br><IMG "
-"SRC=\"free_icon.gif\"> : Normal AIM User<br><IMG SRC=\"aol_icon.gif\"> : AOL "
-"User <br><IMG SRC=\"dt_icon.gif\"> : Trial AIM User <br><IMG "
-"SRC=\"admin_icon.gif\"> : Administrator <br><IMG SRC=\"ab_icon.gif\"> : "
-"ActiveBuddy Interactive Agent<br><IMG SRC=\"wireless_icon.gif\"> : Wireless "
-"Device User<br>"
+"<br><BODY BGCOLOR=WHITE><hr><I>Legend:</I><br><br><IMG SRC=\"free_icon.gif"
+"\"> : Normal AIM User<br><IMG SRC=\"aol_icon.gif\"> : AOL User <br><IMG SRC="
+"\"dt_icon.gif\"> : Trial AIM User <br><IMG SRC=\"admin_icon.gif\"> : "
+"Administrator <br><IMG SRC=\"ab_icon.gif\"> : ActiveBuddy Interactive "
+"Agent<br><IMG SRC=\"wireless_icon.gif\"> : Wireless Device User<br>"
 msgstr ""
-"<br><BODY BGCOLOR=WHITE><hr><I>Selite:</I><br><br><IMG "
-"SRC=\"free_icon.gif\"> : Tavallinen AIM-kyttj<br><IMG "
-"SRC=\"aol_icon.gif\"> : AOL-kyttj <br><IMG SRC=\"dt_icon.gif\"> : "
-"AIM-koekyttj <br><IMG SRC=\"admin_icon.gif\"> : Pkyttj <br><IMG "
-"SRC=\"ab_icon.gif\"> : ActiveBuddy vuorovaikutteinen agentti<br><IMG "
-"SRC=\"wireless_icon.gif\"> : Langattoman laitteen kyttj<br>"
-
-#: src/protocols/oscar/oscar.c:1829
+"<br><BODY BGCOLOR=WHITE><hr><I>Selite:</I><br><br><IMG SRC=\"free_icon.gif"
+"\"> : Tavallinen AIM-kyttj<br><IMG SRC=\"aol_icon.gif\"> : AOL-kyttj "
+"<br><IMG SRC=\"dt_icon.gif\"> : AIM-koekyttj <br><IMG SRC=\"admin_icon.gif"
+"\"> : Pkyttj <br><IMG SRC=\"ab_icon.gif\"> : ActiveBuddy "
+"vuorovaikutteinen agentti<br><IMG SRC=\"wireless_icon.gif\"> : Langattoman "
+"laitteen kyttj<br>"
+
+#: src/protocols/oscar/oscar.c:1914
+#, c-format
 msgid ""
 "Username : <B>%s</B>  %s <BR>\n"
 "Warning Level : <B>%d %%</B><BR>\n"
@@ -873,27 +1308,27 @@
 "%s%s%s<BR>\n"
 "<HR><BR>\n"
 
-#: src/protocols/oscar/oscar.c:1861
+#: src/protocols/oscar/oscar.c:1946
 msgid "<i>User has no away message</i>"
 msgstr "<i>Kyttjll ei ole poissaoloviesti</i>"
 
-#: src/protocols/oscar/oscar.c:1873
+#: src/protocols/oscar/oscar.c:1958
 msgid "Client Capabilities: "
 msgstr "Asiakasohjelman kyvyt: "
 
-#: src/protocols/oscar/oscar.c:1881
+#: src/protocols/oscar/oscar.c:1966
 msgid "<i>No Information Provided</i>"
 msgstr "<i>Ei tietoja annettu</i>"
 
-#: src/protocols/oscar/oscar.c:1904
+#: src/protocols/oscar/oscar.c:1989
 msgid "Your connection may be lost."
 msgstr "Yhteytesi voi olla kadonnut."
 
-#: src/protocols/oscar/oscar.c:1905
+#: src/protocols/oscar/oscar.c:1990
 msgid "AOL error"
 msgstr "AOL-virhe"
 
-#: src/protocols/oscar/oscar.c:2140
+#: src/protocols/oscar/oscar.c:2225
 msgid ""
 "The last message was not sent because you are over the rate limit. Please "
 "wait 10 seconds and try again."
@@ -901,23 +1336,35 @@
 "Viimeist viesti ei lhetetty koska olet ylittnyt taajuusrajan. Odota 10 "
 "sekuntia ja yrit uudelleen."
 
-#: src/dialogs.c:3563 src/protocols/oscar/oscar.c:2482
-#: src/protocols/oscar/oscar.c:3407 src/protocols/toc/toc.c:1561
-#: src/protocols/toc/toc.c:1578 src/protocols/toc/toc.c:1638
-#: src/protocols/toc/toc.c:1680 src/protocols/toc/toc.c:1799
-#: src/protocols/toc/toc.c:1829 src/protocols/toc/toc.c:1885
+#: src/dialogs.c:3604 src/protocols/oscar/oscar.c:2589
+#: src/protocols/oscar/oscar.c:3541 src/protocols/toc/toc.c:1564
+#: src/protocols/toc/toc.c:1581 src/protocols/toc/toc.c:1641
+#: src/protocols/toc/toc.c:1683 src/protocols/toc/toc.c:1802
+#: src/protocols/toc/toc.c:1832 src/protocols/toc/toc.c:1888
 msgid "Error"
 msgstr "Virhe"
 
-#: src/protocols/oscar/oscar.c:3079 src/protocols/toc/toc.c:1105
+#: src/protocols/oscar/oscar.c:3192
+#, c-format
+msgid ""
+"The maximum number of buddies allowed in your buddy list is %d, and you have "
+"%d.  Until you are below the limit, some buddies will not show up as online."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3195
+#, fuzzy
+msgid "Gaim - Warning"
+msgstr "Gaim - Varoita kyttj?"
+
+#: src/protocols/oscar/oscar.c:3213 src/protocols/toc/toc.c:1108
 msgid "Exchange:"
 msgstr "Vaihto:"
 
-#: src/protocols/oscar/oscar.c:3407
+#: src/protocols/oscar/oscar.c:3541
 msgid "Unable to open Direct IM"
 msgstr "Ei kyetty avaamaan suoraa pikaviestint"
 
-#: src/protocols/oscar/oscar.c:3417
+#: src/protocols/oscar/oscar.c:3551
 #, c-format
 msgid ""
 "You have selected to open a Direct IM connection with %s. Doing this will "
@@ -928,11 +1375,30 @@
 "antaa vastapuolen nhd IP-osoitteesi ja voi olla turvallisuusriski. "
 "Haluatko jatkaa?"
 
-#: src/protocols/oscar/oscar.c:3450
+#: src/protocols/oscar/oscar.c:3568
+#, c-format
+msgid ""
+"<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR><I>Remote client does not "
+"support sending status messages.</I><BR>"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3575
+#, c-format
+msgid ""
+"<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR><I>User has no status message."
+"</I><BR>"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3600
+#, fuzzy
+msgid "Get Status Msg"
+msgstr "Hae poissaoloviesti"
+
+#: src/protocols/oscar/oscar.c:3613
 msgid "Direct IM"
 msgstr "Suora pikaviesti"
 
-#: src/protocols/oscar/oscar.c:3458
+#: src/protocols/oscar/oscar.c:3621
 msgid "Get Capabilities"
 msgstr "Hae kyvyt"
 
@@ -1077,7 +1543,7 @@
 msgid "Password Change Successful"
 msgstr "Salasanan vaihto onnistui"
 
-#: src/dialogs.c:1688 src/protocols/toc/toc.c:782
+#: src/dialogs.c:1730 src/protocols/toc/toc.c:782
 msgid "Gaim - Password Change"
 msgstr "Gaim - Salasanan vaihto"
 
@@ -1096,68 +1562,69 @@
 msgid "TOC Pause"
 msgstr "TOC Tauko"
 
-#: src/protocols/toc/toc.c:1222
+#: src/protocols/toc/toc.c:1225
 msgid "Get Dir Info"
 msgstr "Hae hakemistotiedot"
 
-#: src/protocols/toc/toc.c:1638 src/protocols/toc/toc.c:1680
-#: src/protocols/toc/toc.c:1799 src/protocols/toc/toc.c:1885
+#: src/protocols/toc/toc.c:1641 src/protocols/toc/toc.c:1683
+#: src/protocols/toc/toc.c:1802 src/protocols/toc/toc.c:1888
 msgid "Could not connect for transfer!"
 msgstr "Yhteytt siirtoa varten ei voitu muodostaa!"
 
-#: src/protocols/toc/toc.c:1829
+#: src/protocols/toc/toc.c:1832
 msgid "Could not write file header!"
 msgstr "Ei voitu kirjoittaa tiedoston otsikkoa!"
 
-#: src/protocols/toc/toc.c:1918
+#: src/protocols/toc/toc.c:1921
 msgid "Gaim - Save As..."
 msgstr "Gaim - Tallenna nimell..."
 
-#: src/protocols/toc/toc.c:1959
+#: src/protocols/toc/toc.c:1962
 #, c-format
 msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
 msgstr "%s pyyt %s hyvksymn %d tiedoston: %s (%.2f %s)%s%s"
 
-#: src/protocols/toc/toc.c:1960
+#: src/protocols/toc/toc.c:1963
 #, c-format
 msgid "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
 msgstr "%s pyyt %s hyvksymn %d tiedostoa: %s (%.2f %s)%s%s"
 
-#: src/protocols/toc/toc.c:1965
+#: src/protocols/toc/toc.c:1968
 #, c-format
 msgid "%s requests you to send them a file"
 msgstr "%s pyyt sinua lhettmn hnelle tiedoston"
 
-#: src/protocols/yahoo/yahoo.c:585
+#: src/protocols/yahoo/yahoo.c:594
 msgid "Your message did not get sent."
 msgstr "Viestisi ei lhetetty."
 
-#: src/protocols/zephyr/zephyr.c:802
+#: src/protocols/zephyr/zephyr.c:840
 msgid "ZLocate"
 msgstr "ZLocate"
 
-#: src/protocols/zephyr/zephyr.c:839
+#: src/protocols/zephyr/zephyr.c:877
 msgid "Class:"
 msgstr "Luokka:"
 
-#: src/protocols/zephyr/zephyr.c:843
+#: src/protocols/zephyr/zephyr.c:881
 msgid "Instance:"
 msgstr "Ilmentym:"
 
-#: src/protocols/zephyr/zephyr.c:847
+#: src/protocols/zephyr/zephyr.c:885
 msgid "Recipient:"
 msgstr "Vastaanottaja:"
 
-#: src/about.c:93
+#: src/about.c:102
 #, c-format
 msgid "About Gaim v%s"
 msgstr "Tietoja Gaimista v%s"
 
-#: src/about.c:126
+#: src/about.c:135
+#, fuzzy
 msgid ""
-"Gaim is a client that supports AOL's Instant Messenger protocol. It is "
-"written\n"
-"using Gtk+ and is licensed under the GPL.\n"
+"Gaim is a modular Instant Messaging client capable of using AIM, ICQ,\n"
+"Yahoo!, MSN, IRC, Jabber, Napster, Zephyr, and Gadu-Gadu all at once.\n"
+"It is written using Gtk+ and is licensed under the GPL.\n"
 "\n"
 "URL: "
 msgstr ""
@@ -1168,6 +1635,13 @@
 
 #: src/about.c:137
 msgid ""
+"\n"
+"\n"
+"IRC: #gaim on irc.openprojects.net"
+msgstr ""
+
+#: src/about.c:147
+msgid ""
 "Active Developers\n"
 "====================\n"
 "Rob Flynn (maintainer) [ rob@marko.net ]\n"
@@ -1204,99 +1678,97 @@
 "Eric Warmenhoven                   [ warmenhoven@yahoo.com ]\n"
 "Mark Spencer (alkuperinen tekij)   [ markster@marko.net ]"
 
-#: src/about.c:155 src/aim.c:318 src/buddy.c:2633 src/buddy_chat.c:1311
-#: src/buddy_chat.c:1408 src/buddy_chat.c:1438 src/conversation.c:2795
-#: src/dialogs.c:568 src/dialogs.c:3858 src/multi.c:1057 src/plugins.c:277
-#: src/prefs.c:2535 src/prpl.c:438 src/prpl.c:679 src/server.c:1050
-msgid "Close"
-msgstr "Sulje"
-
 #. this makes the sizes not work.
 #. GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
 #. gtk_widget_grab_default(button);
-#: src/about.c:175
+#: src/about.c:185
 msgid "Web Site"
 msgstr "Web-sivusto"
 
-#: src/aim.c:151 src/buddy.c:2626
+#: src/aim.c:153 src/buddy.c:2709
 msgid "Signoff"
 msgstr "Kirjaudu ulos"
 
-#: src/aim.c:163
+#: src/aim.c:165
 msgid "Please enter your logon"
 msgstr "Anna sisnkirjautumistietosi"
 
-#: src/aim.c:163 src/multi.c:1388 src/server.c:55
+#: src/aim.c:165 src/multi.c:1400 src/server.c:55
 msgid "Signon Error"
 msgstr "Sisnkirjautumisvirhe"
 
-#: src/aim.c:261
+#: src/aim.c:263
 msgid "Gaim - Login"
 msgstr "Gaim - Sisnkirjautuminen"
 
-#: src/aim.c:279
+#: src/aim.c:281
 msgid "Screen Name: "
 msgstr "Nyttnimi: "
 
-#: src/aim.c:295
+#: src/aim.c:297
 msgid "Password: "
 msgstr "Salasana: "
 
-#: src/aim.c:316 src/buddy.c:2630
+#: src/aim.c:318 src/buddy.c:2713
 msgid "Quit"
 msgstr "Lopeta"
 
-#: src/aim.c:321 src/aim.c:819 src/buddy.c:2656
+#: src/aim.c:323 src/aim.c:831 src/buddy.c:2739
 msgid "Accounts"
 msgstr "Kyttjtilit"
 
-#: src/aim.c:323 src/multi.c:903
+#: src/aim.c:325 src/multi.c:915
 msgid "Signon"
 msgstr "Kirjaudu sisn"
 
-#: src/aim.c:355
+#: src/aim.c:357
 msgid "About"
 msgstr "Tietoja"
 
 # src/menus.c:311
-#: src/aim.c:356 src/prefs.c:1619 src/prefs.c:1893
+#: src/aim.c:358 src/prefs.c:1633 src/prefs.c:1905
 msgid "Options"
 msgstr "Valinnat"
 
-#: src/aim.c:358 src/aim.c:822 src/buddy.c:2674
+#: src/aim.c:360 src/aim.c:834 src/buddy.c:2757
 msgid "Plugins"
 msgstr "Liitnniset"
 
-#: src/aim.c:816 src/buddy.c:2666
+#: src/aim.c:828 src/buddy.c:2749
 msgid "Preferences"
 msgstr "Asetukset"
 
-#: src/applet.c:199
+#: src/aim.c:838 src/multi.c:1472
+#, fuzzy
+msgid "Auto-login"
+msgstr "Kirjaudu sisn automaattisesti"
+
+#: src/applet.c:109
 msgid "Attempting to sign on...."
 msgstr "Yritetn kirjautua sisn..."
 
-#: src/applet.c:202
+#: src/applet.c:112
 msgid "Offline. Click to bring up login box."
 msgstr "Ei linjoilla. Napsauta avataksesi sisnkirjautumisruutu."
 
-#: src/applet.c:218
+#: src/applet.c:128
 #, c-format
 msgid "Away: %d pending."
 msgstr "Poissa: %d odottamassa."
 
-#: src/applet.c:221
+#: src/applet.c:131
 msgid "Away."
 msgstr "Poissa."
 
-#: src/applet.c:296 src/away.c:388
+#: src/applet.c:200 src/away.c:388
 msgid "New Away Message"
 msgstr "Uusi poissaoloviesti"
 
-#: src/applet.c:444
+#: src/applet.c:348
 msgid "Can't create Gaim applet!"
 msgstr "Ei voitu luoda Gaim-sovelmaa!"
 
-#: src/applet.c:465
+#: src/applet.c:368
 msgid "About..."
 msgstr "Tietoja..."
 
@@ -1321,87 +1793,74 @@
 msgid "Set All Away"
 msgstr "Aseta kaikki poissaoleviksi"
 
-#. Put the buttons in the box
-#: src/buddy.c:488 src/buddy.c:2741 src/buddy_chat.c:1443
-#: src/conversation.c:2328 src/conversation.c:2810 src/dialogs.c:890
-#: src/dialogs.c:1072 src/dialogs.c:2053 src/multi.c:1041 src/prefs.c:2029
-#: src/prefs.c:2371 src/prefs.c:2405
-msgid "Add"
-msgstr "Lis"
-
-#: src/buddy.c:489 src/buddy.c:2742 src/dialogs.c:900 src/dialogs.c:1047
+#: src/buddy.c:493 src/buddy.c:2828 src/dialogs.c:942 src/dialogs.c:1089
 msgid "Group"
 msgstr "Ryhm"
 
-#: src/buddy.c:490 src/buddy.c:2743 src/buddy_chat.c:1445
-#: src/conversation.c:2314 src/conversation.c:2807 src/prefs.c:2043
-#: src/prefs.c:2375 src/prefs.c:2409
-msgid "Remove"
-msgstr "Poista"
-
-#: src/buddy.c:495 src/buddy.c:646 src/buddy.c:798 src/buddy.c:2505
-#: src/buddy_chat.c:850 src/buddy_chat.c:1267
+#: src/buddy.c:499 src/buddy.c:664 src/buddy.c:834 src/buddy.c:2579
+#: src/buddy_chat.c:861 src/buddy_chat.c:1278
 msgid "IM"
 msgstr "Pikaviesti"
 
-#: src/buddy.c:496 src/buddy.c:2506 src/buddy_chat.c:866 src/buddy_chat.c:1275
-#: src/buddy_chat.c:1451 src/conversation.c:2828
+#: src/buddy.c:500 src/buddy.c:2580 src/buddy_chat.c:877 src/buddy_chat.c:1286
+#: src/buddy_chat.c:1462 src/conversation.c:2897
 msgid "Info"
 msgstr "Tietoja"
 
 #. Put the buttons in the box
-#: src/buddy.c:651 src/buddy.c:803 src/dialogs.c:1039 src/dialogs.c:3417
-#: src/dialogs.c:3432
+#: src/buddy.c:669 src/buddy.c:839 src/dialogs.c:1081 src/dialogs.c:3458
+#: src/dialogs.c:3473
 msgid "Alias"
 msgstr "Alias"
 
-#: src/buddy.c:656 src/buddy.c:822
+#: src/buddy.c:674 src/buddy.c:858
 msgid "Add Buddy Pounce"
 msgstr "Lis tuttavailmoitin"
 
-#: src/buddy.c:663 src/buddy.c:828
+#: src/buddy.c:681 src/buddy.c:864
 msgid "View Log"
 msgstr "Nyt loki"
 
-#: src/buddy.c:785 src/buddy.c:816
+#: src/buddy.c:821 src/buddy.c:852
 msgid "Rename"
 msgstr "Nime uudelleen"
 
-#: src/buddy.c:810
+#: src/buddy.c:846
 msgid "Un-Alias"
 msgstr "Poista alias"
 
-#: src/buddy.c:1581 src/buddy.c:2649
+#: src/buddy.c:1645 src/buddy.c:2732
 msgid "Buddy Pounce"
 msgstr "Tuttavailmoitin"
 
-#: src/buddy.c:1661
+#: src/buddy.c:1725
 msgid "New Buddy Pounce"
 msgstr "Uusi tuttavailmoitin"
 
-#: src/buddy.c:1679
+#: src/buddy.c:1743
 msgid "Remove Buddy Pounce"
 msgstr "Poista tuttavailmoitin"
 
-#: src/buddy.c:1707
+#: src/buddy.c:1771
 msgid "[Click to edit]"
 msgstr "[Napsauta muokataksesi]"
 
-#: src/buddy.c:2183
+#: src/buddy.c:2254
 #, c-format
 msgid "Logged in: %s\n"
 msgstr "Kirjautuneena sisn: %s\n"
 
-#: src/buddy.c:2195
+#: src/buddy.c:2266
+#, c-format
 msgid "Warnings: %d%%\n"
 msgstr "Varoitukset: %d%%\n"
 
-#: src/buddy.c:2207
+#: src/buddy.c:2278
 #, c-format
 msgid "Capabilities: %s\n"
 msgstr "Kyvyt: %s\n"
 
-#: src/buddy.c:2211
+#: src/buddy.c:2282
 #, c-format
 msgid ""
 "Alias: %s               \n"
@@ -1412,117 +1871,127 @@
 "Nyttnimi: %s\n"
 "%s%s%s%s%s%s"
 
-#: src/buddy.c:2215
+#: src/buddy.c:2286
 msgid "Idle: "
 msgstr "Jouten: "
 
-#: src/buddy.c:2286 src/buddy.c:2291
+#: src/buddy.c:2359 src/buddy.c:2364
 #, c-format
 msgid "%s logged in."
 msgstr "%s kirjautui sisn."
 
-#: src/buddy.c:2350 src/buddy.c:2355
+#: src/buddy.c:2424 src/buddy.c:2429
 #, c-format
 msgid "%s logged out."
 msgstr "%s kirjautui ulos."
 
-#: src/buddy.c:2540
+#: src/buddy.c:2614
 msgid "Information on selected Buddy"
 msgstr "Tietoja valitusta tuttavasta"
 
-#: src/buddy.c:2541 src/dialogs.c:697
+#: src/buddy.c:2615 src/dialogs.c:697
 msgid "Send Instant Message"
 msgstr "Lhet pikaviesti"
 
-#: src/buddy.c:2542
+#: src/buddy.c:2616
 msgid "Start/join a Buddy Chat"
 msgstr "Aloita/liity tuttavakeskusteluun"
 
-#: src/buddy.c:2543
+#: src/buddy.c:2617
 msgid "Activate Away Message"
 msgstr "Aktivoi poissaoloviesti"
 
-#: src/buddy.c:2606
+#: src/buddy.c:2689
 msgid "File"
 msgstr "Tiedosto"
 
-#: src/buddy.c:2610
+#: src/buddy.c:2693
 msgid "Add A Buddy"
 msgstr "Lis tuttava"
 
-#: src/buddy.c:2612
+#: src/buddy.c:2695
 msgid "Join A Chat"
 msgstr "Liity ryhmkeskusteluun"
 
-#: src/buddy.c:2614
+#: src/buddy.c:2697
 msgid "New Instant Message"
 msgstr "Uusi pikaviesti"
 
-#: src/buddy.c:2616 src/dialogs.c:749
+#: src/buddy.c:2699 src/dialogs.c:759
 msgid "Get User Info"
 msgstr "Hae kyttjtiedot"
 
-#: src/buddy.c:2621
+#: src/buddy.c:2704
 msgid "Import Buddy List"
 msgstr "Tuo tuttavalista"
 
-#: src/buddy.c:2639
+#: src/buddy.c:2722
 msgid "Tools"
 msgstr "Tykalut"
 
-#: src/buddy.c:2662
+#: src/buddy.c:2745
 msgid "Protocol Actions"
 msgstr "Protokollatoiminnot"
 
-#: src/buddy.c:2668
+#: src/buddy.c:2751
 msgid "View System Log"
 msgstr "Nyt jrjestelmn loki"
 
-#: src/buddy.c:2680
+#: src/buddy.c:2763
 msgid "Perl"
 msgstr "Perl"
 
-#: src/buddy.c:2683
+#: src/buddy.c:2766
 msgid "Load Script"
 msgstr "Lataa skripti"
 
-#: src/buddy.c:2687
+#: src/buddy.c:2770
 msgid "Unload All Scripts"
 msgstr "Poista kaikki skriptit"
 
-#: src/buddy.c:2691
+#: src/buddy.c:2774
 msgid "List Scripts"
 msgstr "Listaa skriptit"
 
-#: src/buddy.c:2699
+#: src/buddy.c:2782
 msgid "Help"
 msgstr "Ohje"
 
-#: src/buddy.c:2704
+#: src/buddy.c:2787
+#, fuzzy
+msgid "Online Help"
+msgstr "Linjoilla"
+
+#: src/buddy.c:2788
+#, fuzzy
+msgid "Debug Window"
+msgstr "Nyt testausikkuna"
+
+#: src/buddy.c:2789
 msgid "About Gaim"
 msgstr "Gaim:ista"
 
-#: src/buddy.c:2721 src/prefs.c:2891
+#: src/buddy.c:2807 src/prefs.c:2905
 msgid "Buddy List"
 msgstr "Tuttavalista"
 
-#: src/buddy.c:2774
+#: src/buddy.c:2860
 msgid "Add a new Buddy"
 msgstr "Lis uusi tuttava"
 
-#: src/buddy.c:2775
+#: src/buddy.c:2861
 msgid "Add a new Group"
 msgstr "Lis uusi ryhm"
 
-#: src/buddy.c:2776
+#: src/buddy.c:2862
 msgid "Remove selected Buddy/Group"
 msgstr "Poista valittu tuttava/ryhm"
 
-#: src/buddy.c:2803
+#: src/buddy.c:2889
 msgid "Edit Buddies"
 msgstr "Muokkaa tuttavia"
 
-#: src/buddy.c:2846
+#: src/buddy.c:2932
 msgid "Gaim - Buddy List"
 msgstr "Gaim - Tuttavalista"
 
@@ -1530,21 +1999,17 @@
 msgid "Join Chat"
 msgstr "Liity ryhmkeskusteluun"
 
-#: src/buddy_chat.c:272
-msgid "Buddy Chat"
-msgstr "Tuttavakeskustelu"
-
 #: src/buddy_chat.c:283
 msgid "Join Chat As:"
 msgstr "Liity ryhmkeskusteluun nimell:"
 
-#: src/buddy_chat.c:304 src/buddy_chat.c:392 src/dialogs.c:450
-#: src/dialogs.c:540 src/dialogs.c:715 src/dialogs.c:773 src/dialogs.c:892
-#: src/dialogs.c:1068 src/dialogs.c:1431 src/dialogs.c:1636 src/dialogs.c:1760
-#: src/dialogs.c:1820 src/dialogs.c:2042 src/dialogs.c:2224 src/dialogs.c:2399
-#: src/dialogs.c:2470 src/dialogs.c:3166 src/dialogs.c:3419 src/dialogs.c:3600
-#: src/dialogs.c:3971 src/dialogs.c:4077 src/dialogs.c:4736 src/multi.c:769
-#: src/multi.c:899 src/prpl.c:150 src/prpl.c:224
+#: src/buddy_chat.c:304 src/buddy_chat.c:392 src/dialogs.c:449
+#: src/dialogs.c:539 src/dialogs.c:715 src/dialogs.c:816 src/dialogs.c:934
+#: src/dialogs.c:1110 src/dialogs.c:1473 src/dialogs.c:1678 src/dialogs.c:1802
+#: src/dialogs.c:1862 src/dialogs.c:2084 src/dialogs.c:2266 src/dialogs.c:2441
+#: src/dialogs.c:2512 src/dialogs.c:3208 src/dialogs.c:3460 src/dialogs.c:3641
+#: src/dialogs.c:4012 src/dialogs.c:4118 src/dialogs.c:4777 src/multi.c:781
+#: src/multi.c:911 src/prpl.c:150 src/prpl.c:224
 msgid "Cancel"
 msgstr "Peruuta"
 
@@ -1552,17 +2017,17 @@
 msgid "Join"
 msgstr "Liity"
 
-#: src/buddy_chat.c:393 src/buddy_chat.c:396 src/buddy_chat.c:1317
-#: src/buddy_chat.c:1407
+#: src/buddy_chat.c:393 src/buddy_chat.c:396 src/buddy_chat.c:1328
+#: src/buddy_chat.c:1418
 msgid "Invite"
 msgstr "Kutsu"
 
-#: src/buddy_chat.c:412 src/dialogs.c:1259 src/dialogs.c:3427
+#: src/buddy_chat.c:412 src/dialogs.c:1301 src/dialogs.c:3468
 msgid "Buddy"
 msgstr "Tuttava"
 
 # src/sidebar.c:103
-#: src/buddy_chat.c:417 src/prefs.c:1992
+#: src/buddy_chat.c:417 src/prefs.c:2004
 msgid "Message"
 msgstr "Viesti"
 
@@ -1570,287 +2035,283 @@
 msgid "Gaim - Invite Buddy Into Chat Room"
 msgstr "Gaim - Kutsu tuttava keskusteluhuoneeseen"
 
-#: src/buddy_chat.c:857
+#: src/buddy_chat.c:868
 msgid "Un-Ignore"
 msgstr "Vlit"
 
-#: src/buddy_chat.c:859 src/buddy_chat.c:1271
+#: src/buddy_chat.c:870 src/buddy_chat.c:1282
 msgid "Ignore"
 msgstr "l vlit"
 
 #. don't remove them from ignored in case they re-enter
-#: src/buddy_chat.c:922 src/buddy_chat.c:1034 src/buddy_chat.c:1497
-#: src/buddy_chat.c:1530
+#: src/buddy_chat.c:933 src/buddy_chat.c:1045 src/buddy_chat.c:1508
+#: src/buddy_chat.c:1541
 #, c-format
 msgid "%d %s in room"
 msgstr "%d %s huoneessa"
 
-#: src/buddy_chat.c:930
+#: src/buddy_chat.c:941
 #, c-format
 msgid "%s entered the room."
 msgstr "%s saapui huoneeseen."
 
-#: src/buddy_chat.c:996
+#: src/buddy_chat.c:1007
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s on nyt nimeltn %s"
 
-#: src/buddy_chat.c:1043
+#: src/buddy_chat.c:1054
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s poistui huoneesta (%s)."
 
-#: src/buddy_chat.c:1045
+#: src/buddy_chat.c:1056
 #, c-format
 msgid "%s left the room."
 msgstr "%s poistui huoneesta."
 
-#: src/buddy_chat.c:1144
+#: src/buddy_chat.c:1155
 msgid "Gaim - Group Chats"
 msgstr "Gaim - Yhdistetyt ryhmkeskustelut"
 
-#: src/buddy_chat.c:1207
+#: src/buddy_chat.c:1218
 msgid "Topic:"
 msgstr "Aihe:"
 
-#: src/buddy_chat.c:1248
+#: src/buddy_chat.c:1259
 msgid "0 people in room"
 msgstr "0 ihmist huoneessa"
 
-#: src/buddy_chat.c:1322 src/buddy_chat.c:1406
+#: src/buddy_chat.c:1333 src/buddy_chat.c:1417
 msgid "Whisper"
 msgstr "Kuiskaa"
 
-#: src/buddy_chat.c:1327 src/buddy_chat.c:1404 src/buddy_chat.c:1453
-#: src/conversation.c:2839
+#: src/buddy_chat.c:1338 src/buddy_chat.c:1415 src/buddy_chat.c:1464
+#: src/conversation.c:2908
 msgid "Send"
 msgstr "Lhet"
 
-#: src/buddy_chat.c:1447 src/conversation.c:2816
+#: src/buddy_chat.c:1458 src/conversation.c:2885
 msgid "Block"
 msgstr "Est"
 
-#: src/buddy_chat.c:1449 src/conversation.c:2822 src/dialogs.c:425
-#: src/dialogs.c:454
+#: src/buddy_chat.c:1460 src/conversation.c:2891 src/dialogs.c:424
+#: src/dialogs.c:453
 msgid "Warn"
 msgstr "Varoita"
 
-#: src/conversation.c:413
+#: src/conversation.c:431
 msgid "Gaim - Save Conversation"
 msgstr "Gaim - Tallenna keskustelu"
 
-#: src/conversation.c:474
+#: src/conversation.c:492
 msgid "Gaim - Insert Image"
 msgstr "Gaim - Liit kuva"
 
-#: src/conversation.c:1278
+#: src/conversation.c:1336
 msgid "Unable to send message: too large"
 msgstr "Viesti ei voitu lhett: liian suuri"
 
-#: src/conversation.c:1278 src/conversation.c:1282
+#: src/conversation.c:1336 src/conversation.c:1340
 msgid "Message Error"
 msgstr "Viestivirhe"
 
-#: src/conversation.c:1282
+#: src/conversation.c:1340
 msgid "Unable to send message: Unknown reason"
 msgstr "Viesti ei voitu lhett: Tuntematon syy"
 
-#: src/conversation.c:1501
+#: src/conversation.c:1559
 #, c-format
 msgid "Currently at %d, "
 msgstr "Parhaillaan %d:ssa, "
 
-#: src/conversation.c:1509
+#: src/conversation.c:1567
 #, c-format
 msgid "Setting position to %d\n"
 msgstr "Asetetaan sijainniksi %d\n"
 
-#: src/conversation.c:2110 src/prefs.c:1305
+#: src/conversation.c:2170 src/prefs.c:1308
 msgid "Bold Text"
 msgstr "Lihavoi teksti"
 
-#: src/conversation.c:2110
+#: src/conversation.c:2170
 msgid "Bold"
 msgstr "Lihavoi"
 
-#: src/conversation.c:2114
+#: src/conversation.c:2174
 msgid "Italics Text"
 msgstr "Kursivoi teksti"
 
-#: src/conversation.c:2115
+#: src/conversation.c:2175
 msgid "Italics"
 msgstr "Kursivoi"
 
-#: src/conversation.c:2118 src/prefs.c:1317
+#: src/conversation.c:2178 src/prefs.c:1320
 msgid "Underline Text"
 msgstr "Alleviivaa teksti"
 
-#: src/conversation.c:2119
+#: src/conversation.c:2179
 msgid "Underline"
 msgstr "Alleviivaa"
 
-#: src/conversation.c:2123 src/prefs.c:1323
+#: src/conversation.c:2183 src/prefs.c:1326
 msgid "Strike through Text"
 msgstr "Yliviivaa teksti"
 
-#: src/conversation.c:2123
+#: src/conversation.c:2183
 msgid "Strike"
 msgstr "Yliviivaa"
 
-#: src/conversation.c:2129
+#: src/conversation.c:2189
 msgid "Decrease font size"
 msgstr "Pienenn fonttikokoa"
 
-#: src/conversation.c:2129
+#: src/conversation.c:2189
 msgid "Small"
 msgstr "Pieni"
 
-#: src/conversation.c:2132
+#: src/conversation.c:2192
 msgid "Normal font size"
 msgstr "Normaali fonttikoko"
 
-#: src/conversation.c:2132
+#: src/conversation.c:2192
 msgid "Normal"
 msgstr "Normaali"
 
-#: src/conversation.c:2135
+#: src/conversation.c:2195
 msgid "Increase font size"
 msgstr "Suurenna fonttikokoa"
 
-#: src/conversation.c:2135
+#: src/conversation.c:2195
 msgid "Big"
 msgstr "Suuri"
 
-#: src/conversation.c:2142 src/dialogs.c:2841 src/dialogs.c:2865
+#: src/conversation.c:2202 src/dialogs.c:2883 src/dialogs.c:2907
 msgid "Select Font"
 msgstr "Valitse fontti"
 
-#: src/conversation.c:2143
+#: src/conversation.c:2203
 msgid "Font"
 msgstr "Fontti"
 
-#: src/conversation.c:2146 src/prefs.c:1353
+#: src/conversation.c:2206 src/prefs.c:1356
 msgid "Text Color"
 msgstr "Tekstin vri"
 
-#: src/conversation.c:2147 src/conversation.c:2151
+#: src/conversation.c:2207 src/conversation.c:2211
 msgid "Color"
 msgstr "Vri"
 
-#: src/conversation.c:2151 src/prefs.c:1371
+#: src/conversation.c:2211 src/prefs.c:1374
 msgid "Background Color"
 msgstr "Taustavri"
 
-#: src/conversation.c:2158 src/dialogs.c:2464
+#: src/conversation.c:2218 src/dialogs.c:2506
 msgid "Insert Link"
 msgstr "Lis linkki"
 
-#: src/conversation.c:2159
+#: src/conversation.c:2219
 msgid "Link"
 msgstr "Linkki"
 
-#: src/conversation.c:2162
+#: src/conversation.c:2222
 msgid "Insert smiley face"
 msgstr "Lis hymi"
 
-#: src/conversation.c:2162
+#: src/conversation.c:2222
 msgid "Smiley"
 msgstr "Hymi"
 
-#: src/conversation.c:2165
+#: src/conversation.c:2225
 msgid "Insert IM Image"
 msgstr "Lis pikaviestikuva"
 
-#: src/conversation.c:2165
+#: src/conversation.c:2225
 msgid "Image"
 msgstr "Kuva"
 
-#: src/conversation.c:2172
+#: src/conversation.c:2232
 msgid "Enable logging"
 msgstr "Ota kyttn kirjaaminen lokiin"
 
-#: src/conversation.c:2173 src/prefs.c:254
+#: src/conversation.c:2233 src/prefs.c:254
 msgid "Logging"
 msgstr "Kirjataan lokiin"
 
-#: src/conversation.c:2182
+#: src/conversation.c:2242
 msgid "Save Conversation"
 msgstr "Tallenna keskustelu"
 
 # src/menus.c:280
-#: src/conversation.c:2183 src/dialogs.c:1640 src/dialogs.c:1824
-#: src/dialogs.c:3178 src/dialogs.c:3867 src/dialogs.c:4744
+#: src/conversation.c:2243 src/dialogs.c:1682 src/dialogs.c:1866
+#: src/dialogs.c:3220 src/dialogs.c:3908 src/dialogs.c:4785
 msgid "Save"
 msgstr "Tallenna"
 
-#: src/conversation.c:2187
-msgid "Enable sounds"
-msgstr "Ota net kyttn"
-
-#: src/conversation.c:2188
+#: src/conversation.c:2247 src/conversation.c:2248
 msgid "Sound"
 msgstr "ni"
 
-#: src/conversation.c:2668
+#: src/conversation.c:2729
 msgid "Gaim - Conversations"
 msgstr "Gaim - Keskustelut"
 
-#: src/conversation.c:2755
+#: src/conversation.c:2816
 msgid "Send message as: "
 msgstr "Lhet viesti nimell: "
 
-#: src/conversation.c:3373
+#: src/conversation.c:3453
 msgid "Gaim - Save Icon"
 msgstr "Gaim - Tallenna kuvake"
 
-#: src/conversation.c:3400
+#: src/conversation.c:3487
 msgid "Disable Animation"
 msgstr "Poista animaatio kytst"
 
-#: src/conversation.c:3405
+#: src/conversation.c:3492
 msgid "Enable Animation"
 msgstr "Ota animaatio kyttn"
 
-#: src/conversation.c:3411
+#: src/conversation.c:3498
 msgid "Hide Icon"
 msgstr "Piilota kuvake"
 
-#: src/conversation.c:3417
+#: src/conversation.c:3504
 msgid "Save Icon As..."
 msgstr "Tallenna kuvake nimell..."
 
-#: src/dialogs.c:413
+#: src/dialogs.c:412
 msgid "Gaim - Warn user?"
 msgstr "Gaim - Varoita kyttj?"
 
-#: src/dialogs.c:433
+#: src/dialogs.c:432
 #, c-format
 msgid "Do you really want to warn %s?"
 msgstr "Haluatko todella varoittaa kyttj %s?"
 
-#: src/dialogs.c:438
+#: src/dialogs.c:437
 msgid "Warn anonymously?"
 msgstr "Varoita nimettmn?"
 
-#: src/dialogs.c:442
+#: src/dialogs.c:441
 msgid "Anonymous warnings are less harsh."
 msgstr "Nimettmt varoitukset ovat vhemmn ankaria."
 
-#: src/dialogs.c:470
+#: src/dialogs.c:469
 #, c-format
 msgid "Removing '%s' from buddylist.\n"
 msgstr "Poistetaan '%s' tuttavalistalta.\n"
 
-#: src/dialogs.c:495
+#: src/dialogs.c:494
 #, c-format
 msgid "Gaim - Remove %s?"
 msgstr "Gaim - Poista %s?"
 
-#: src/dialogs.c:508
+#: src/dialogs.c:507
 msgid "Remove Buddy"
 msgstr "Poista tuttava"
 
-#: src/dialogs.c:518
+#: src/dialogs.c:517
 #, c-format
 msgid ""
 "You are about to remove '%s' from\n"
@@ -1859,14 +2320,14 @@
 "Olet poistamassa '%s':n tuttavalistaltasi.\n"
 "Haluatko jatkaa?"
 
-#: src/dialogs.c:530 src/prpl.c:154 src/prpl.c:228
+#: src/dialogs.c:529 src/prpl.c:154 src/prpl.c:228
 msgid "Accept"
 msgstr "Hyvksy"
 
 #. Build OK Button
-#: src/dialogs.c:637 src/dialogs.c:720 src/dialogs.c:778 src/dialogs.c:1435
-#: src/dialogs.c:1764 src/dialogs.c:1915 src/dialogs.c:2223 src/dialogs.c:2403
-#: src/dialogs.c:2469 src/dialogs.c:3976 src/dialogs.c:4082 src/multi.c:774
+#: src/dialogs.c:635 src/dialogs.c:720 src/dialogs.c:821 src/dialogs.c:1477
+#: src/dialogs.c:1806 src/dialogs.c:1957 src/dialogs.c:2265 src/dialogs.c:2445
+#: src/dialogs.c:2511 src/dialogs.c:4017 src/dialogs.c:4123 src/multi.c:786
 msgid "OK"
 msgstr "OK"
 
@@ -1878,338 +2339,343 @@
 msgid "IM who:"
 msgstr "Pikaviesti kenelle:"
 
-#: src/dialogs.c:756
+#: src/dialogs.c:768
 msgid "User:"
 msgstr "Kyttj:"
 
+#: src/dialogs.c:777
+#, fuzzy
+msgid "Account:"
+msgstr "Kyttjtili"
+
 #. Finish up
-#: src/dialogs.c:783
+#: src/dialogs.c:826
 msgid "Gaim - Get User Info"
 msgstr "Gaim - Hae kyttjtiedot"
 
-#: src/dialogs.c:898
+#: src/dialogs.c:940
 msgid "Add Group"
 msgstr "Lis ryhm"
 
-#: src/dialogs.c:923
+#: src/dialogs.c:965
 msgid "Gaim - Add Group"
 msgstr "Gaim - Lis ryhm"
 
-#: src/dialogs.c:1007
+#: src/dialogs.c:1049
 msgid "Gaim - Add Buddy"
 msgstr "Gaim - Lis tuttava"
 
-#: src/dialogs.c:1019
+#: src/dialogs.c:1061
 msgid "Add Buddy"
 msgstr "Lis tuttava"
 
-#: src/dialogs.c:1029
+#: src/dialogs.c:1071
 msgid "Contact"
 msgstr "Kontakti"
 
 #. Set up stuff for the account box
-#: src/dialogs.c:1055
+#: src/dialogs.c:1097
 msgid "Add To"
 msgstr "Lis"
 
-#: src/dialogs.c:1092
+#: src/dialogs.c:1134
 msgid "Please enter a buddy to pounce."
 msgstr "Syt ilmoitettava tuttava."
 
-#: src/dialogs.c:1092
+#: src/dialogs.c:1134
 msgid "Buddy Pounce Error"
 msgstr "Tuttavailmoitinvirhe"
 
-#: src/dialogs.c:1228
+#: src/dialogs.c:1270
 msgid "Gaim - New Buddy Pounce"
 msgstr "Gaim - Uusi tuttavailmoitin"
 
 #. <pounce type="who">
-#: src/dialogs.c:1239
+#: src/dialogs.c:1281
 msgid "Pounce Who"
 msgstr "Kenest ilmoitetaan"
 
-#: src/dialogs.c:1250
+#: src/dialogs.c:1292
 msgid "Account"
 msgstr "Kyttjtili"
 
 #. </pounce type="who">
 #. <pounce type="when">
-#: src/dialogs.c:1276
+#: src/dialogs.c:1318
 msgid "Pounce When"
 msgstr "Milloin ilmoitetaan"
 
-#: src/dialogs.c:1286
+#: src/dialogs.c:1328
 msgid "Pounce on sign on"
 msgstr "Ilmoita sisnkirjautuessa"
 
-#: src/dialogs.c:1295
+#: src/dialogs.c:1337
 msgid "Pounce on return from away"
 msgstr "Ilmoita palatessa oltuaan poissa"
 
-#: src/dialogs.c:1304
+#: src/dialogs.c:1346
 msgid "Pounce on return from idle"
 msgstr "Ilmoita palatessa oltuaan jouten"
 
-#: src/dialogs.c:1313
+#: src/dialogs.c:1355
 msgid "Pounce when buddy is typing to you"
 msgstr "Ilmoitin kun tuttava kirjoittaa sinulle"
 
 #. </pounce type="when">
 #. <pounce type="action">
-#: src/dialogs.c:1323
+#: src/dialogs.c:1365
 msgid "Pounce Action"
 msgstr "Ilmoittimen toiminto"
 
-#: src/dialogs.c:1334
+#: src/dialogs.c:1376
 msgid "Open IM Window"
 msgstr "Avaa pikaviesti-ikkuna"
 
-#: src/dialogs.c:1343
+#: src/dialogs.c:1385
 msgid "Popup Notification"
 msgstr "Nyt ilmoitus"
 
-#: src/dialogs.c:1352
+#: src/dialogs.c:1394
 msgid "Send Message"
 msgstr "Lhet viesti"
 
-#: src/dialogs.c:1373
+#: src/dialogs.c:1415
 msgid "Execute command on pounce"
 msgstr "Suorita komento ilmoitettaessa"
 
-#: src/dialogs.c:1395
+#: src/dialogs.c:1437
 msgid "Play sound on pounce"
 msgstr "Soita ni ilmoitettaessa"
 
 #. </pounce type="action">
-#: src/dialogs.c:1417
+#: src/dialogs.c:1459
 msgid "Save this pounce after activation"
 msgstr "Tallenna tm ilmoitin aktivoinnin jlkeen"
 
-#: src/dialogs.c:1503
+#: src/dialogs.c:1545
 msgid "Gaim - Set Dir Info"
 msgstr "Gaim - Aseta hakemistotiedot"
 
-#: src/dialogs.c:1512
+#: src/dialogs.c:1554
 msgid "Directory Info"
 msgstr "Hakemistotiedot"
 
-#: src/dialogs.c:1534
+#: src/dialogs.c:1576
 msgid "Allow Web Searches To Find Your Info"
 msgstr "Salli verkkohaut tietojesi lytmiseksi"
 
 #. Line 1
-#: src/dialogs.c:1537 src/dialogs.c:2242
+#: src/dialogs.c:1579 src/dialogs.c:2284
 msgid "First Name"
 msgstr "Etunimi"
 
 #. Line 2
-#: src/dialogs.c:1548 src/dialogs.c:2254
+#: src/dialogs.c:1590 src/dialogs.c:2296
 msgid "Middle Name"
 msgstr "Muut etunimet"
 
 #. Line 3
-#: src/dialogs.c:1560 src/dialogs.c:2266
+#: src/dialogs.c:1602 src/dialogs.c:2308
 msgid "Last Name"
 msgstr "Sukunimi"
 
 #. Line 4
-#: src/dialogs.c:1571 src/dialogs.c:2278
+#: src/dialogs.c:1613 src/dialogs.c:2320
 msgid "Maiden Name"
 msgstr "Entinen nimi"
 
 #. Line 6
-#: src/dialogs.c:1593 src/dialogs.c:2301
+#: src/dialogs.c:1635 src/dialogs.c:2343
 msgid "State"
 msgstr "Lni"
 
-#: src/dialogs.c:1658
+#: src/dialogs.c:1700
 msgid "New Passwords Do Not Match"
 msgstr "Uudet salasanat eivt tsm"
 
-#: src/dialogs.c:1658 src/dialogs.c:1663
+#: src/dialogs.c:1700 src/dialogs.c:1705
 msgid "Gaim - Change Password Error"
 msgstr "Gaim - Salasanan muuttamisvirhe"
 
-#: src/dialogs.c:1663
+#: src/dialogs.c:1705
 msgid "Fill out all fields completely"
 msgstr "Tyt kaikki kentt kokonaan"
 
-#: src/dialogs.c:1718
+#: src/dialogs.c:1760
 msgid "Original Password"
 msgstr "Vanha salasana"
 
-#: src/dialogs.c:1732
+#: src/dialogs.c:1774
 msgid "New Password"
 msgstr "Uusi salasana"
 
-#: src/dialogs.c:1746
+#: src/dialogs.c:1788
 msgid "New Password (again)"
 msgstr "Uusi salasana (uudelleen)"
 
-#: src/dialogs.c:1787
+#: src/dialogs.c:1829
 msgid "Gaim - Set User Info"
 msgstr "Gaim - Aseta kyttjtiedot"
 
-#: src/dialogs.c:1899
+#: src/dialogs.c:1941
 msgid "Below are the results of your search: "
 msgstr "Alla ovat hakusi tulokset: "
 
-#: src/dialogs.c:2032 src/dialogs.c:2039
+#: src/dialogs.c:2074 src/dialogs.c:2081
 msgid "Permit"
 msgstr "Salli"
 
-#: src/dialogs.c:2034 src/dialogs.c:2041
+#: src/dialogs.c:2076 src/dialogs.c:2083
 msgid "Deny"
 msgstr "Kiell"
 
-#: src/dialogs.c:2078
+#: src/dialogs.c:2120
 msgid "Gaim - Add Permit"
 msgstr "Gaim - Salli lis"
 
-#: src/dialogs.c:2080
+#: src/dialogs.c:2122
 msgid "Gaim - Add Deny"
 msgstr "Gaim - Kiell lis"
 
-#: src/dialogs.c:2140
+#: src/dialogs.c:2182
 msgid "Gaim - Log Conversation"
 msgstr "Gaim - Kirjaa keskustelu lokiin"
 
-#: src/dialogs.c:2218 src/dialogs.c:2381
+#: src/dialogs.c:2260 src/dialogs.c:2423
 msgid "Search for Buddy"
 msgstr "Etsi tuttavaa"
 
-#: src/dialogs.c:2346
+#: src/dialogs.c:2388
 msgid "Gaim - Find Buddy By Info"
 msgstr "Gaim - Etsi tuttava tietojen perusteella"
 
-#: src/dialogs.c:2375
+#: src/dialogs.c:2417
 msgid "Gaim - Find Buddy By Email"
 msgstr "Gaim - Etsi tuttava shkpostin perusteella"
 
-#: src/dialogs.c:2515
+#: src/dialogs.c:2557
 msgid "Gaim - Add URL"
 msgstr "Gaim - Lis URL"
 
-#: src/dialogs.c:2666 src/dialogs.c:2687 src/dialogs.c:2741
+#: src/dialogs.c:2708 src/dialogs.c:2729 src/dialogs.c:2783
 msgid "Select Text Color"
 msgstr "Valitse tekstin vri"
 
-#: src/dialogs.c:2720
+#: src/dialogs.c:2762
 msgid "Select Background Color"
 msgstr "Valitse taustavri"
 
-#: src/dialogs.c:2942
+#: src/dialogs.c:2984
 msgid "Import to:"
 msgstr "Tuo:"
 
-#: src/dialogs.c:2966
+#: src/dialogs.c:3008
 msgid "Gaim - Import Buddy List"
 msgstr "Gaim - Tuo tuttavalista"
 
 #. We shouldn't allow a blank title
-#: src/dialogs.c:3033
+#: src/dialogs.c:3075
 msgid "You cannot create an away message with a blank title"
 msgstr "Et voi luoda poissaoloviesti tyhjll otsikolla"
 
 #. We shouldn't allow a blank message
-#: src/dialogs.c:3040
+#: src/dialogs.c:3082
 msgid "You cannot create an empty away message"
 msgstr "Et voi luoda tyhj poissaoloviesti"
 
-#: src/dialogs.c:3108
+#: src/dialogs.c:3150
 msgid "Gaim - New away message"
 msgstr "Gaim - Uusi poissaoloviesti"
 
-#: src/dialogs.c:3118
+#: src/dialogs.c:3160
 msgid "New away message"
 msgstr "Uusi poissaoloviesti"
 
-#: src/dialogs.c:3131
+#: src/dialogs.c:3173
 msgid "Away title: "
 msgstr "Poissaolon otsikko: "
 
-#: src/dialogs.c:3170
+#: src/dialogs.c:3212
 msgid "Use"
 msgstr "Kyt"
 
-#: src/dialogs.c:3174
+#: src/dialogs.c:3216
 msgid "Save & Use"
 msgstr "Tallenna ja kyt"
 
 #. show everything
-#: src/dialogs.c:3372
+#: src/dialogs.c:3413
 msgid "Smile!"
 msgstr "Hymyile!"
 
-#: src/dialogs.c:3425
+#: src/dialogs.c:3466
 msgid "Alias Buddy"
 msgstr "Anna tuttavalle alias"
 
-#: src/dialogs.c:3458
+#: src/dialogs.c:3499
 msgid "Gaim - Alias Buddy"
 msgstr "Gaim - Anna tuttavalle alias"
 
-#: src/dialogs.c:3530
+#: src/dialogs.c:3571
 msgid "Gaim - Save Log File"
 msgstr "Gaim - Tallenna lokitiedosto"
 
-#: src/dialogs.c:3562
+#: src/dialogs.c:3603
 #, c-format
 msgid "Unable to remove file %s - %s"
 msgstr "Ei kyetty poistamaan tiedostoa %s - %s"
 
-#: src/dialogs.c:3590
+#: src/dialogs.c:3631
 msgid "Really clear log?"
 msgstr "Tyhjenn loki?"
 
-#: src/dialogs.c:3605
+#: src/dialogs.c:3646
 msgid "Okay"
 msgstr "Selv"
 
-#: src/dialogs.c:3776
+#: src/dialogs.c:3817
 msgid "Date"
 msgstr "Ajankohta"
 
-#: src/dialogs.c:3839
+#: src/dialogs.c:3880
 msgid "Conversation"
 msgstr "Keskustelu"
 
-#: src/dialogs.c:3862
+#: src/dialogs.c:3903
 msgid "Clear"
 msgstr "Tyhjenn"
 
-#: src/dialogs.c:3940
+#: src/dialogs.c:3981
 msgid "Gaim - Rename Group"
 msgstr "Gaim - Nime ryhm uudelleen"
 
-#: src/dialogs.c:3950
+#: src/dialogs.c:3991
 msgid "Rename Group"
 msgstr "Nime ryhm uudelleen"
 
-#: src/dialogs.c:3957 src/dialogs.c:4063
+#: src/dialogs.c:3998 src/dialogs.c:4104
 msgid "New name:"
 msgstr "Uusi nimi:"
 
-#: src/dialogs.c:4046
+#: src/dialogs.c:4087
 msgid "Gaim - Rename Buddy"
 msgstr "Gaim - Nime tuttava uudelleen"
 
-#: src/dialogs.c:4056
+#: src/dialogs.c:4097
 msgid "Rename Buddy"
 msgstr "Nime tuttava uudelleen"
 
 #. Below is basically stolen from plugins.c
-#: src/dialogs.c:4140
+#: src/dialogs.c:4181
 msgid "Gaim - Select Perl Script"
 msgstr "Gaim - Valitse Perlskripti"
 
-#: src/gaimrc.c:1117
+#: src/gaimrc.c:1136
 #, c-format
 msgid "Could not open config file %s."
 msgstr "Ei voitu avata asetustiedostoa %s."
 
-#: src/gaimrc.c:1118
+#: src/gaimrc.c:1137
 msgid "Preferences Error"
 msgstr "Asetusvirhe"
 
@@ -2222,55 +2688,65 @@
 msgid "g003: Error opening connection.\n"
 msgstr "g003: Virhe avattaessa yhteytt.\n"
 
-#: src/multi.c:452
+#: src/module.c:106 src/module.c:112 src/module.c:122
+#, fuzzy
+msgid "Plugin Error"
+msgstr "Sisnkirjautumisvirhe"
+
+#: src/multi.c:454
 msgid "Gaim - Load Buddy Icon"
 msgstr "Gaim - Lataa tuttavakuvake"
 
-#: src/multi.c:495
+#: src/multi.c:497
 msgid "Buddy Icon File:"
 msgstr "Tuttavakuvaketiedosto:"
 
-#: src/multi.c:506
+#: src/multi.c:508
 msgid "Browse"
 msgstr "Selaa"
 
-#: src/multi.c:511 src/prefs.c:1545
+#: src/multi.c:513 src/prefs.c:1548
 msgid "Reset"
 msgstr "Nollaa"
 
-#: src/multi.c:538
+#: src/multi.c:540
 msgid "Screenname:"
 msgstr "Nyttnimi:"
 
-#: src/multi.c:558
+#: src/multi.c:559
+#, fuzzy
+msgid "Alias:"
+msgstr "Alias"
+
+#: src/multi.c:569
 msgid "Protocol:"
 msgstr "Protokolla:"
 
-#: src/multi.c:563
+#: src/multi.c:574
 msgid "Remember Password"
 msgstr "Muista salasana"
 
-#: src/multi.c:564
+#: src/multi.c:575
 msgid "Auto-Login"
 msgstr "Kirjaudu sisn automaattisesti"
 
-#: src/multi.c:604
+#: src/multi.c:616
 msgid "New Mail Notifications"
 msgstr "Tiedota uusista shkposteista"
 
-#: src/multi.c:694
+#: src/multi.c:706
 msgid "Register with server"
 msgstr "Rekisteridy palvelimeen"
 
-#: src/multi.c:752
+#: src/multi.c:764
 msgid "Gaim - Modify Account"
 msgstr "Gaim - Muokkaa tili"
 
-#: src/multi.c:871
+#: src/multi.c:883
 msgid "Enter Password"
 msgstr "Anna salasana"
 
-#: src/multi.c:935
+#: src/multi.c:947
 msgid ""
 "You cannot log this account in; you do not have the protocol it uses loaded, "
 "or the protocol does not have a login function."
@@ -2278,44 +2754,44 @@
 "Et voi kirjata tt kyttjtili sisn. Et ole ladannut protokollaa, jota "
 "se kytt, tai protokollassa ei ole sisnkirjautumisfunktiota."
 
-#: src/multi.c:937
+#: src/multi.c:949
 msgid "Login Error"
 msgstr "Sisnkirjautumisvirhe"
 
-#: src/multi.c:966
+#: src/multi.c:978
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "Haluatko varmasti poistaa %s:n?"
 
-#: src/multi.c:1003
+#: src/multi.c:1015
 msgid "Gaim - Account Editor"
 msgstr "Gaim - Tilin muokkaus"
 
-#: src/multi.c:1022
+#: src/multi.c:1034
 msgid "Select All"
 msgstr "Valitse kaikki"
 
-#: src/multi.c:1027
+#: src/multi.c:1039
 msgid "Select Autos"
 msgstr "Valitse automaattiset"
 
-#: src/multi.c:1031
+#: src/multi.c:1043
 msgid "Select None"
 msgstr "Poista valinnat"
 
-#: src/multi.c:1045
+#: src/multi.c:1057
 msgid "Modify"
 msgstr "Muuta"
 
-#: src/multi.c:1049
+#: src/multi.c:1061
 msgid "Sign On/Off"
 msgstr "Kirjaa sisn/ulos"
 
-#: src/multi.c:1053
+#: src/multi.c:1065
 msgid "Delete"
 msgstr "Poista"
 
-#: src/multi.c:1368
+#: src/multi.c:1380
 #, c-format
 msgid ""
 "%s\n"
@@ -2324,25 +2800,25 @@
 "%s\n"
 "%s: %s"
 
-#: src/multi.c:1387
+#: src/multi.c:1399
 #, c-format
 msgid "%s was unable to sign on"
 msgstr "%s ei kyennyt kirjautumaan sisn"
 
-#: src/multi.c:1398
+#: src/multi.c:1410
 msgid "Notice"
 msgstr "Ilmoitus"
 
-#: src/multi.c:1408
+#: src/multi.c:1420
 #, c-format
 msgid "%s has been signed off"
 msgstr "%s on kirjautunut ulos"
 
-#: src/multi.c:1409
+#: src/multi.c:1421
 msgid "Connection Error"
 msgstr "Yhteysvirhe"
 
-#: src/perl.c:856
+#: src/perl.c:875
 msgid "Perl Scripts"
 msgstr "Perlskripti"
 
@@ -2403,9 +2879,9 @@
 msgid "General Options"
 msgstr "Yleiset valinnat"
 
-#: src/prefs.c:200 src/prefs.c:383 src/prefs.c:551 src/prefs.c:665
-#: src/prefs.c:918 src/prefs.c:1068 src/prefs.c:1293 src/prefs.c:1615
-#: src/prefs.c:1889 src/prefs.c:2322
+#: src/prefs.c:200 src/prefs.c:384 src/prefs.c:552 src/prefs.c:667
+#: src/prefs.c:921 src/prefs.c:1071 src/prefs.c:1296 src/prefs.c:1629
+#: src/prefs.c:1901 src/prefs.c:2334
 msgid "All options take effect immediately unless otherwise noted."
 msgstr "Kaikki muutokset tapahtuvat vlittmsti ellei muuta ole mainittu."
 
@@ -2480,8 +2956,8 @@
 msgstr "Selain"
 
 #: src/prefs.c:291
-msgid "KFM"
-msgstr "KFM"
+msgid "Konqueror"
+msgstr ""
 
 #: src/prefs.c:292
 msgid "Opera"
@@ -2491,27 +2967,32 @@
 msgid "Netscape"
 msgstr "Netscape"
 
-#: src/prefs.c:296
+#: src/prefs.c:294
+msgid "Mozilla"
+msgstr ""
+
+#: src/prefs.c:297
 msgid "Pop up new window by default"
 msgstr "Avaa uusi ikkuna oletuksena"
 
-#: src/prefs.c:303
+#: src/prefs.c:304
 msgid "GNOME URL Handler"
 msgstr "Gnomen URL-ksittelij"
 
-#: src/prefs.c:305
+#: src/prefs.c:306
 msgid "Galeon"
 msgstr "Galeon"
 
-#: src/prefs.c:306
-msgid "Manual"
-msgstr "Manuaalinen"
-
-#: src/prefs.c:375
+#: src/prefs.c:307
+#, c-format
+msgid "Manual (%s for URL)"
+msgstr ""
+
+#: src/prefs.c:376
 msgid "Proxy Options"
 msgstr "Vlityspalvelimen valinnat"
 
-#: src/prefs.c:387
+#: src/prefs.c:388
 msgid ""
 "Not all protocols can use these proxy options. Please see the README file "
 "for details."
@@ -2519,367 +3000,377 @@
 "Kaikki protokollat eivt voi kytt nit vlityspalvelinvalintoja. Lue "
 "README-tiedostosta yksityiskohdat."
 
-#: src/prefs.c:392
+#: src/prefs.c:393
 msgid "Proxy Type"
 msgstr "Vlityspalvelimen tyyppi"
 
-#: src/prefs.c:404
+#: src/prefs.c:405
 msgid "Proxy Server"
 msgstr "Vlityspalvelin"
 
-#: src/prefs.c:407
+#: src/prefs.c:408
 msgid "No Proxy"
 msgstr "Ei vlityspalvelinta"
 
-#: src/prefs.c:419
+#: src/prefs.c:420
 msgid "SOCKS 4"
 msgstr "SOCKS 4"
 
-#: src/prefs.c:429
+#: src/prefs.c:430
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
-#: src/prefs.c:438
+#: src/prefs.c:439
 msgid "HTTP"
 msgstr "HTTP"
 
-#: src/prefs.c:462
+#: src/prefs.c:463
 msgid "Host"
 msgstr "Verkkoasema"
 
-#: src/prefs.c:478
+#: src/prefs.c:479
 msgid "Port"
 msgstr "Portti"
 
-#: src/prefs.c:495
+#: src/prefs.c:496
 msgid "User"
 msgstr "Kyttj"
 
-#: src/prefs.c:511
+#: src/prefs.c:512
 msgid "Password"
 msgstr "Salasana"
 
-#: src/prefs.c:543
+#: src/prefs.c:544
 msgid "Buddy List Options"
 msgstr "Tuttavalistan valinnat"
 
-#: src/prefs.c:555
+#: src/prefs.c:556
 msgid "Buddy List Window"
 msgstr "Tuttavalistaikkuna"
 
-#: src/prefs.c:568
+#: src/prefs.c:569
 msgid "Tab Placement:"
 msgstr "Vlilehtien sijoitus:"
 
-#: src/prefs.c:572 src/prefs.c:1001 src/prefs.c:1151
+#: src/prefs.c:573 src/prefs.c:1004 src/prefs.c:1154
 msgid "Top"
 msgstr "Ylhll"
 
-#: src/prefs.c:573 src/prefs.c:1003 src/prefs.c:1153
+#: src/prefs.c:574 src/prefs.c:1006 src/prefs.c:1156
 msgid "Bottom"
 msgstr "Alhaalla"
 
-#: src/prefs.c:585
+#: src/prefs.c:586
 msgid "Hide IM/Info/Chat buttons"
 msgstr "Piilota pikaviesti-/tiedot- ja ryhmkeskustelupainikkeet"
 
-#: src/prefs.c:587
+#: src/prefs.c:588
 msgid "Automatically show buddy list on sign on"
 msgstr "Nyt automaattisesti tuttavalista kirjauduttaessa sisn"
 
-#: src/prefs.c:589
+#: src/prefs.c:590
 msgid "Display Buddy List near applet"
 msgstr "Nyt tuttavalista lhell sovelmaa"
 
-#: src/prefs.c:592
+#: src/prefs.c:593
 msgid "Save Window Size/Position"
 msgstr "Tallenna ikkunan koko/sijainti"
 
-#: src/prefs.c:595
+#: src/prefs.c:596
 msgid "Show pictures on buttons"
 msgstr "Nyt kuvat painikkeissa"
 
 #: src/prefs.c:600
+msgid "Raise Buddy List on Signons and Signoffs"
+msgstr ""
+
+#: src/prefs.c:602
 msgid "Group Displays"
 msgstr "Ryhmien nytt"
 
-#: src/prefs.c:612
+#: src/prefs.c:614
 msgid "Hide groups with no online buddies"
 msgstr "Piilota ryhmt joissa ei ole sisnkirjautuneita tuttavia"
 
-#: src/prefs.c:618
+#: src/prefs.c:620
 msgid "Show numbers in groups"
 msgstr "Nyt mrt ryhmiss"
 
-#: src/prefs.c:620
+#: src/prefs.c:622
 msgid "Buddy Displays"
 msgstr "Tuttavien nytt"
 
-#: src/prefs.c:632
+#: src/prefs.c:634
 msgid "Show buddy type icons"
 msgstr "Nyt tuttavatyyppien kuvakkeet"
 
-#: src/prefs.c:633
+#: src/prefs.c:635
 msgid "Show warning levels"
 msgstr "Nyt varoitustasot"
 
-#: src/prefs.c:639
+#: src/prefs.c:641
 msgid "Show idle times"
 msgstr "Nyt joutenoloajat"
 
-#: src/prefs.c:640
+#: src/prefs.c:642
 msgid "Grey idle buddies"
 msgstr "Nyt jouten olevat tuttavat harmaina"
 
-#: src/prefs.c:657
+#: src/prefs.c:659
 msgid "Conversation Options"
 msgstr "Keskusteluvalinnat"
 
-#: src/prefs.c:669
+#: src/prefs.c:671
 msgid "Keyboard Options"
 msgstr "Nppimistvalinnat"
 
-#: src/prefs.c:681
-msgid "Enter sends message"
-msgstr "\"Enter\" lhett viestin"
-
-#: src/prefs.c:682
-msgid "Control-Enter sends message"
-msgstr "\"Control-Enter\" lhett viestin"
-
 #: src/prefs.c:683
+msgid "Enter sends message"
+msgstr "\"Enter\" lhett viestin"
+
+#: src/prefs.c:684
+msgid "Control-Enter sends message"
+msgstr "\"Control-Enter\" lhett viestin"
+
+#: src/prefs.c:685
 msgid "Escape closes window"
 msgstr "\"Escape\" sulkee ikkunan"
 
-#: src/prefs.c:689
+#: src/prefs.c:686
+#, fuzzy
+msgid "Control-W closes window"
+msgstr "\"Escape\" sulkee ikkunan"
+
+#: src/prefs.c:692
 msgid "Control-{B/I/U/S} inserts HTML tags"
 msgstr "\"Control-{B/I/U/S}\" lis HTML-lapun"
 
-#: src/prefs.c:690
+#: src/prefs.c:693
 msgid "Control-(number) inserts smileys"
 msgstr "\"Control-(numero)\" lis hymin"
 
-#: src/prefs.c:691
+#: src/prefs.c:694
 msgid "F2 toggles timestamp display"
 msgstr "F2 asettaa aikaleiman plle/pois"
 
-#: src/prefs.c:693
+#: src/prefs.c:696
 msgid "Display and General Options"
 msgstr "Nytt- ja yleiset valinnat"
 
-#: src/prefs.c:705
+#: src/prefs.c:708
 msgid "Show graphical smileys"
 msgstr "Nyt graafiset hymit"
 
-#: src/prefs.c:706
+#: src/prefs.c:709
 msgid "Show timestamp on messages"
 msgstr "Nyt aikaleimat viesteiss"
 
-#: src/prefs.c:707
+#: src/prefs.c:710
 msgid "Show URLs as links"
 msgstr "Nyt URL:t linkkein"
 
-#: src/prefs.c:708
+#: src/prefs.c:711
 msgid "Highlight misspelled words"
 msgstr "Korosta vrinkirjoitetut sanat"
 
-#: src/prefs.c:709 src/prefs.c:1911
+#: src/prefs.c:712 src/prefs.c:1923
 msgid "Sending messages removes away status"
 msgstr "Viestien lhettminen poistaa poissaolotilan"
 
-#: src/prefs.c:710 src/prefs.c:1924
+#: src/prefs.c:713 src/prefs.c:1936
 msgid "Queue new messages when away"
 msgstr "Laita uudet viestit jonoon poissaollessa"
 
-#: src/prefs.c:716
+#: src/prefs.c:719
 msgid "Ignore colors"
 msgstr "l vlit vreist"
 
-#: src/prefs.c:717
+#: src/prefs.c:720
 msgid "Ignore font faces"
 msgstr "l vlit fonttien tyypist"
 
-#: src/prefs.c:718
+#: src/prefs.c:721
 msgid "Ignore font sizes"
 msgstr "l vlit fonttien koosta"
 
-#: src/prefs.c:719
+#: src/prefs.c:722
 msgid "Ignore TiK Automated Messages"
 msgstr "l vlit automatisoiduista TiK-viesteist"
 
-#: src/prefs.c:720 src/prefs.c:1909
+#: src/prefs.c:723 src/prefs.c:1921
 msgid "Ignore new conversations when away"
 msgstr "l vlit uusista keskusteluista poissaollessa"
 
-#: src/prefs.c:909
+#: src/prefs.c:912
 msgid "IM Options"
 msgstr "Pikaviestivalinnat"
 
-#: src/prefs.c:922 src/prefs.c:2907
+#: src/prefs.c:925 src/prefs.c:2921
 msgid "IM Window"
 msgstr "Pikaviesti-ikkuna"
 
-#: src/prefs.c:938 src/prefs.c:1088
+#: src/prefs.c:941 src/prefs.c:1091
 msgid "Show buttons as: "
 msgstr "Nyt painikkeissa: "
 
-#: src/prefs.c:942 src/prefs.c:1093
+#: src/prefs.c:945 src/prefs.c:1096
 msgid "Pictures And Text"
 msgstr "Kuvat ja teksti"
 
-#: src/prefs.c:943 src/prefs.c:1095
+#: src/prefs.c:946 src/prefs.c:1098
 msgid "Pictures"
 msgstr "Kuvat"
 
-#: src/prefs.c:944 src/prefs.c:1096
+#: src/prefs.c:947 src/prefs.c:1099
 msgid "Text"
 msgstr "Teksti"
 
-#: src/prefs.c:955
+#: src/prefs.c:958
 msgid "Show all conversations in one tabbed window"
 msgstr "Nyt kaikki keskustelut yhdess jaetussa ikkunassa"
 
-#: src/prefs.c:957
+#: src/prefs.c:960
 msgid "Show chats in the same tabbed window"
 msgstr "Nyt ryhmkeskustelut samassa jaetussa ikkunassa"
 
-#: src/prefs.c:964 src/prefs.c:1116
+#: src/prefs.c:967 src/prefs.c:1119
 msgid "Raise windows on events"
 msgstr "Nosta ikkuna tapahtumahetkin"
 
-#: src/prefs.c:965
+#: src/prefs.c:968
 msgid "Show logins in window"
 msgstr "Nyt sisnkirjautumiset ikkunassa"
 
-#: src/prefs.c:966
-msgid "Show aliases in tabs/titles"
+#: src/prefs.c:969
+#, fuzzy
+msgid "Show aliases in tabs/titles/ticker"
 msgstr "Nyt aliakset vlilehdiss/otsikoissa"
 
-#: src/prefs.c:967
+#: src/prefs.c:970
 msgid "Hide window on send"
 msgstr "Piilota ikkuna lhetettess"
 
-#: src/prefs.c:969 src/prefs.c:1119
+#: src/prefs.c:972 src/prefs.c:1122
 msgid "Window Sizes"
 msgstr "Ikkunakoot"
 
-#: src/prefs.c:977 src/prefs.c:1127
+#: src/prefs.c:980 src/prefs.c:1130
 msgid "New window width:"
 msgstr "Uuden ikkunan leveys:"
 
-#: src/prefs.c:978 src/prefs.c:1128
+#: src/prefs.c:981 src/prefs.c:1131
 msgid "New window height:"
 msgstr "Uuden ikkunan korkeus:"
 
-#: src/prefs.c:979 src/prefs.c:1129
+#: src/prefs.c:982 src/prefs.c:1132
 msgid "Entry widget height:"
 msgstr "Kirjoitusalueen korkeus:"
 
-#: src/prefs.c:981 src/prefs.c:1131
+#: src/prefs.c:984 src/prefs.c:1134
 msgid "Tab Placement"
 msgstr "Vlilehtien sijoitus"
 
-#: src/prefs.c:1010 src/prefs.c:1160
+#: src/prefs.c:1013 src/prefs.c:1163
 msgid "Left"
 msgstr "Vasemmalla"
 
-#: src/prefs.c:1012 src/prefs.c:1162
+#: src/prefs.c:1015 src/prefs.c:1165
 msgid "Right"
 msgstr "Oikealla"
 
-#: src/prefs.c:1016
+#: src/prefs.c:1019
 msgid "Buddy Icons"
 msgstr "Tuttavakuvakkeet"
 
-#: src/prefs.c:1028
+#: src/prefs.c:1031
 msgid "Hide Buddy Icons"
 msgstr "Piilota tuttavakuvakkeet"
 
-#: src/prefs.c:1034
+#: src/prefs.c:1037
 msgid "Disable Buddy Icon Animation"
 msgstr "Poista tuttavakuvakkeen animaatio kytst"
 
-#: src/prefs.c:1060
+#: src/prefs.c:1063
 msgid "Chat Options"
 msgstr "Ryhmkeskusteluvalinnat"
 
-#: src/prefs.c:1072
+#: src/prefs.c:1075
 msgid "Group Chat Window"
 msgstr "Ryhmkeskustelu-ikkuna"
 
-#: src/prefs.c:1107
+#: src/prefs.c:1110
 msgid "Show all chats in one tabbed window"
 msgstr "Nyt kaikki ryhmkeskustelut yhdess jaetussa ikkunassa"
 
-#: src/prefs.c:1109
+#: src/prefs.c:1112
 msgid "Show conversations in the same tabbed window"
 msgstr "Nyt keskustelut samassa jaetussa ikkunassa"
 
-#: src/prefs.c:1117
+#: src/prefs.c:1120
 msgid "Show people joining/leaving in window"
 msgstr "Nyt ihmisten saapuminen/poistuminen ikkunassa"
 
-#: src/prefs.c:1165
+#: src/prefs.c:1168
 msgid "Tab Completion"
 msgstr "\"Tab\"-tydennys"
 
-#: src/prefs.c:1177
+#: src/prefs.c:1180
 msgid "Tab-Complete Nicks"
 msgstr "\"Tab\"-tydenn lempinimet"
 
-#: src/prefs.c:1183
+#: src/prefs.c:1186
 msgid "Old-Style Tab Completion"
 msgstr "Vanhanmallinen \"Tab\"-tydennys"
 
-#: src/prefs.c:1285 src/prefs.c:2917
+#: src/prefs.c:1288 src/prefs.c:2931
 msgid "Font Options"
 msgstr "Fonttivalinnat"
 
-#: src/prefs.c:1311
+#: src/prefs.c:1314
 msgid "Italic Text"
 msgstr "Kursivoitu teksti"
 
-#: src/prefs.c:1355 src/prefs.c:1373 src/prefs.c:1395
+#: src/prefs.c:1358 src/prefs.c:1376 src/prefs.c:1398
 msgid "Select"
 msgstr "Valitse"
 
-#: src/prefs.c:1393
+#: src/prefs.c:1396
 msgid "Font Face for Text"
 msgstr "Tekstin fontin tyyppi"
 
-#: src/prefs.c:1408
+#: src/prefs.c:1411
 msgid "Font Size for Text"
 msgstr "Tekstin fonttikoko"
 
-#: src/prefs.c:1505
+#: src/prefs.c:1508
 msgid "Gaim - Sound Configuration"
 msgstr "Gaim - niasetukset"
 
-#: src/prefs.c:1540
+#: src/prefs.c:1543
 msgid "Test"
 msgstr "Kokeilu"
 
-#: src/prefs.c:1550
+#: src/prefs.c:1553
 msgid "Choose..."
 msgstr "Valitse..."
 
-#: src/prefs.c:1607
+#: src/prefs.c:1621
 msgid "Sound Options"
 msgstr "nivalinnat"
 
-#: src/prefs.c:1635
+#: src/prefs.c:1649
 msgid "No sounds when you log in"
 msgstr "Ei ni kun kirjaudut sisn"
 
-#: src/prefs.c:1641 src/prefs.c:1910
+#: src/prefs.c:1655 src/prefs.c:1922
 msgid "Sounds while away"
 msgstr "net poissaollessasi"
 
-#: src/prefs.c:1651
+#: src/prefs.c:1665
 msgid "Sound method"
 msgstr "nimenetelm"
 
-#: src/prefs.c:1725
+#: src/prefs.c:1739
 #, c-format
 msgid ""
 "Sound command\n"
@@ -2888,103 +3379,103 @@
 "nikomento\n"
 "(%s tiedostonimeksi)"
 
-#: src/prefs.c:1737
+#: src/prefs.c:1751
 msgid "Sound played when:"
 msgstr "ni soitetaan kun:"
 
-#: src/prefs.c:1881 src/prefs.c:2939
+#: src/prefs.c:1893 src/prefs.c:2953
 msgid "Away Messages"
 msgstr "Poissaoloviestit"
 
-#: src/prefs.c:1918
+#: src/prefs.c:1930
 msgid "Don't send auto-response"
 msgstr "l lhet automaattista vastausta"
 
-#: src/prefs.c:1919
+#: src/prefs.c:1931
 msgid "Only send auto-response when idle"
 msgstr "Lhet automaattinen vastaus vain jouten ollessa"
 
-#: src/prefs.c:1934
+#: src/prefs.c:1946
 msgid "Time between sending auto-responses (in seconds):"
 msgstr "Aika automaattisten vastausten lhettmisten vleill (sekunneissa):"
 
-#: src/prefs.c:1949
+#: src/prefs.c:1961
 msgid "Auto Away after"
 msgstr "Merkitse poissaolevaksi"
 
-#: src/prefs.c:1963
+#: src/prefs.c:1975
 msgid "minutes using"
 msgstr "minuutin jlkeen viestill"
 
-#: src/prefs.c:1976
+#: src/prefs.c:1988
 msgid "Messages"
 msgstr "Viestit"
 
-#: src/prefs.c:2033
+#: src/prefs.c:2045
 msgid "Edit"
 msgstr "Muokkaa"
 
-#: src/prefs.c:2037
+#: src/prefs.c:2049
 msgid "Make Away"
 msgstr "Luo poissaolo"
 
-#: src/prefs.c:2314
+#: src/prefs.c:2326
 msgid "Privacy Options"
 msgstr "Yksityisyysvalinnat"
 
-#: src/prefs.c:2330
+#: src/prefs.c:2342
 msgid "Set privacy for:"
 msgstr "Yksityisyysasetukset tilille:"
 
-#: src/prefs.c:2349
+#: src/prefs.c:2361
 msgid "Allow all users to contact me"
 msgstr "Salli kaikkien kyttjien ottaa minuun yhteytt"
 
-#: src/prefs.c:2350
+#: src/prefs.c:2362
 msgid "Allow only the users below"
 msgstr "Salli vain allaolevat kyttjt"
 
-#: src/prefs.c:2352
+#: src/prefs.c:2364
 msgid "Allow List"
 msgstr "Sallittujen lista"
 
-#: src/prefs.c:2383
+#: src/prefs.c:2395
 msgid "Deny all users"
 msgstr "Kiell kaikki kyttjt"
 
-#: src/prefs.c:2384
+#: src/prefs.c:2396
 msgid "Block the users below"
 msgstr "Kiell allaolevia kyttji"
 
-#: src/prefs.c:2386
+#: src/prefs.c:2398
 msgid "Block List"
 msgstr "Kiellettyjen lista"
 
-#: src/prefs.c:2481
+#: src/prefs.c:2493
 msgid "Gaim - Preferences"
 msgstr "Gaim - Asetukset"
 
-#: src/prefs.c:2564
+#: src/prefs.c:2576
 msgid "Gaim debug output window"
 msgstr "Gaim-virheidenetsinnn tulostusikkuna"
 
-#: src/prefs.c:2873
+#: src/prefs.c:2887
 msgid "General"
 msgstr "Yleist"
 
-#: src/prefs.c:2878
+#: src/prefs.c:2892
 msgid "Proxy"
 msgstr "Vlityspalvelin"
 
-#: src/prefs.c:2902
+#: src/prefs.c:2916
 msgid "Conversations"
 msgstr "Keskustelut"
 
-#: src/prefs.c:2928
+#: src/prefs.c:2942
 msgid "Sounds"
 msgstr "net"
 
-#: src/prefs.c:2950
+#: src/prefs.c:2964
 msgid "Privacy"
 msgstr "Yksityisyys"
 
@@ -3029,22 +3520,23 @@
 msgid "Open Mail"
 msgstr "Avaa shkposti"
 
-#: src/prpl.c:564
-#, c-format
-msgid "%s%s%s%s has made %s their buddy%s%s%s"
+#: src/prpl.c:570
+#, fuzzy, c-format
+msgid "%s%s%s%s has made %s his or her buddy%s%s%s"
 msgstr "%s%s%s%s on tehnyt %s:sta tuttavansa%s%s%s"
 
-#: src/prpl.c:572
+#: src/prpl.c:578
+#, fuzzy
 msgid ""
 "\n"
 "\n"
-"Do you wish to add them to your buddy list?"
+"Do you wish to add him or her to your buddy list?"
 msgstr ""
 "\n"
 "\n"
 "Haluatko list hnet tuttavalistallesi?"
 
-#: src/prpl.c:615
+#: src/prpl.c:621
 msgid ""
 "You do not currently have any protocols available that are able to register "
 "new accounts."
@@ -3052,15 +3544,15 @@
 "Sinulla ei ole tll hetkell kytettviss yhtn protokollaa joka kykenisi "
 "rekisterimn uusia kyttjtilej."
 
-#: src/prpl.c:652
+#: src/prpl.c:658
 msgid "Gaim - Registration"
 msgstr "Gaim - Rekisterinti"
 
-#: src/prpl.c:667
+#: src/prpl.c:673
 msgid "Registration Information"
 msgstr "Rekisterintitiedot"
 
-#: src/prpl.c:684
+#: src/prpl.c:690
 msgid "Register"
 msgstr "Rekisteri"
 
@@ -3089,7 +3581,59 @@
 msgid "No"
 msgstr "Ei"
 
-#: src/server.c:1054
+#: src/server.c:1076
 msgid "More Info"
 msgstr "Lis tietoja"
 
+#: src/sound.c:63
+#, fuzzy
+msgid "Buddy logs in"
+msgstr "Tuttavakuvake"
+
+#: src/sound.c:64
+#, fuzzy
+msgid "Buddy logs out"
+msgstr "Tuttavalista"
+
+#: src/sound.c:65
+#, fuzzy
+msgid "Message received"
+msgstr "Viestivirhe"
+
+#: src/sound.c:66
+msgid "Message received begins conversation"
+msgstr ""
+
+#: src/sound.c:67
+#, fuzzy
+msgid "Message sent"
+msgstr "Viestit"
+
+#: src/sound.c:68
+msgid "Person enters chat"
+msgstr ""
+
+#: src/sound.c:69
+msgid "Person leaves chat"
+msgstr ""
+
+#: src/sound.c:70
+msgid "You talk in chat"
+msgstr ""
+
+#: src/sound.c:71
+msgid "Others talk in chat"
+msgstr ""
+
+#: src/sound.c:74
+msgid "Someone says your name in chat"
+msgstr ""
+
+#~ msgid "Enable sounds"
+#~ msgstr "Ota net kyttn"
+
+#~ msgid "KFM"
+#~ msgstr "KFM"
+
+#~ msgid "Manual"
+#~ msgstr "Manuaalinen"
--- a/po/hu.po	Tue Jul 02 05:41:30 2002 +0000
+++ b/po/hu.po	Tue Jul 02 05:42:26 2002 +0000
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2002-05-15 00:00-0400\n"
+"POT-Creation-Date: 2002-06-25 00:10-0400\n"
 "PO-Revision-Date: 2002-05-12 19:00+0100\n"
 "Last-Translator: Zoltan Sutto <suttozoltan@broadband.hu>\n"
 "Language-Team: HU <hu@li.org>\n"
@@ -14,7 +14,87 @@
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/protocols/gg/gg.c:71
+#: plugins/chatlist.c:67 src/buddy_chat.c:272
+msgid "Buddy Chat"
+msgstr "Csevegs partnerrel"
+
+#: plugins/chatlist.c:166 plugins/chatlist.c:168 plugins/chatlist.c:407
+#: plugins/chatlist.c:409
+#, fuzzy
+msgid "Gaim Chat"
+msgstr "Gaim - Csevegs"
+
+#: plugins/chatlist.c:339 src/about.c:165 src/aim.c:320 src/buddy.c:2716
+#: src/buddy_chat.c:1322 src/buddy_chat.c:1419 src/buddy_chat.c:1449
+#: src/conversation.c:2864 src/dialogs.c:567 src/dialogs.c:3899
+#: src/multi.c:1069 src/plugins.c:277 src/prefs.c:2547 src/prpl.c:438
+#: src/prpl.c:685 src/server.c:1072
+msgid "Close"
+msgstr "Bezr"
+
+#: plugins/chatlist.c:344
+#, fuzzy
+msgid "Chat Rooms"
+msgstr "Csevegs belltsai"
+
+#: plugins/chatlist.c:363
+msgid "Refresh"
+msgstr ""
+
+#. Put the buttons in the box
+#: plugins/chatlist.c:364 src/buddy.c:492 src/buddy.c:2827
+#: src/buddy_chat.c:1454 src/conversation.c:2389 src/conversation.c:2879
+#: src/dialogs.c:932 src/dialogs.c:1114 src/dialogs.c:2095 src/multi.c:1053
+#: src/prefs.c:2041 src/prefs.c:2383 src/prefs.c:2417
+msgid "Add"
+msgstr "Hozzad"
+
+#: plugins/chatlist.c:365 src/buddy.c:494 src/buddy.c:2829
+#: src/buddy_chat.c:1456 src/conversation.c:2375 src/conversation.c:2876
+#: src/prefs.c:2055 src/prefs.c:2387 src/prefs.c:2421
+msgid "Remove"
+msgstr "Elvtolt"
+
+#: plugins/chatlist.c:388
+msgid "List of available chats"
+msgstr ""
+
+#: plugins/chatlist.c:398
+msgid "List of subscribed chats"
+msgstr ""
+
+#: plugins/gtik.c:699
+msgid "Gnome Stock Ticker Properties"
+msgstr ""
+
+#: plugins/gtik.c:711
+msgid "Update Frequency in min"
+msgstr ""
+
+#: plugins/gtik.c:727
+msgid "Enter symbols delimited with \"+\" in the box below."
+msgstr ""
+
+#. OUTPUT FORMAT and SCROLL DIRECTION
+#: plugins/gtik.c:737
+msgid "Check this box to display only symbols and price:"
+msgstr ""
+
+#: plugins/gtik.c:738
+msgid "Check this box to scroll left to right:"
+msgstr ""
+
+#: plugins/gtik.c:974
+#, fuzzy
+msgid "(No"
+msgstr "Nem"
+
+#: plugins/gtik.c:975
+#, fuzzy
+msgid "Change"
+msgstr "Csatorna:"
+
+#: src/protocols/gg/gg.c:71 src/protocols/msn/msn.c:1919
 msgid "Available"
 msgstr "Elrhet"
 
@@ -22,8 +102,8 @@
 msgid "Available for friends only"
 msgstr "Elrhet csak bartoknak"
 
-#: src/applet.c:186 src/buddy.c:494 src/buddy.c:2524 src/buddy.c:2669
-#: src/protocols/gg/gg.c:73 src/protocols/jabber/jabber.c:703
+#: src/applet.c:197 src/buddy.c:497 src/buddy.c:2582 src/buddy.c:2727
+#: src/protocols/gg/gg.c:73 src/protocols/jabber/jabber.c:1118
 msgid "Away"
 msgstr "Tvol"
 
@@ -39,7 +119,7 @@
 msgid "Invisible for friends only"
 msgstr "Lthatatlan csak bartoknak"
 
-#: src/protocols/gg/gg.c:77 src/protocols/jabber/jabber.c:699
+#: src/protocols/gg/gg.c:77 src/protocols/jabber/jabber.c:1114
 msgid "Unavailable"
 msgstr "Nem elrhet"
 
@@ -71,7 +151,7 @@
 msgid "Unknown Error Code."
 msgstr "Ismeretlen hiba kd"
 
-#: src/protocols/gg/gg.c:302
+#: src/protocols/gg/gg.c:302 src/protocols/msn/msn.c:2050
 #, c-format
 msgid "Status: %s"
 msgstr "llapot: %s"
@@ -271,7 +351,12 @@
 msgid "Directory Search"
 msgstr "Knyvtr keresse"
 
+#.
+#. } else if (!strcmp(act, _("Set Dir Info"))) {
+#. show_set_dir(gc);
+#.
 #: src/dialogs.c:1741 src/protocols/gg/gg.c:1160 src/protocols/gg/gg.c:1177
+#: src/protocols/jabber/jabber.c:3748 src/protocols/jabber/jabber.c:3761
 msgid "Change Password"
 msgstr "Jelsz megvltoztatsa"
 
@@ -292,7 +377,7 @@
 msgstr "zenet kldse a kiszolgln keresztl"
 
 #: src/protocols/icq/gaim_icq.c:469 src/protocols/irc/irc.c:1851
-#: src/protocols/jabber/jabber.c:2227 src/protocols/oscar/oscar.c:3580
+#: src/protocols/jabber/jabber.c:2860 src/protocols/oscar/oscar.c:3593
 #: src/protocols/toc/toc.c:1219
 msgid "Get Info"
 msgstr "Informcigyjts"
@@ -329,9 +414,10 @@
 msgid ""
 "%s has requested a DCC chat.  Would you like to establish the direct "
 "connection?"
-msgstr "%s DCC csevegst kezdemnyez. Szeretnd a kzvetlen kapcsolatot ltrehozni?"
-
-#: src/protocols/irc/irc.c:1001
+msgstr ""
+"%s DCC csevegst kezdemnyez. Szeretnd a kzvetlen kapcsolatot ltrehozni?"
+
+#: src/protocols/irc/irc.c:1001 src/protocols/msn/msn.c:315
 msgid "Unable to write"
 msgstr "Sikertelen rs"
 
@@ -366,209 +452,522 @@
 msgid "DCC Chat"
 msgstr "DCC csevegs"
 
-#: src/buddy.c:2829 src/protocols/jabber/jabber.c:705
-#: src/protocols/jabber/jabber.c:723
+#: src/protocols/jabber/jabber.c:942
+msgid "Incorrect current password! Password NOT Changed!"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:943 src/protocols/jabber/jabber.c:948
+#, fuzzy
+msgid "Password Change Error!"
+msgstr "Gaim - Jelsz megvltoztatsa"
+
+#: src/protocols/jabber/jabber.c:947
+msgid "New password same as old password! Password NOT Changed!"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1092
+msgid "Unknown"
+msgstr "Ismeretlen"
+
+#: src/buddy.c:2887 src/protocols/jabber/jabber.c:1120
+#: src/protocols/jabber/jabber.c:1138
 msgid "Online"
 msgstr "Elrhet"
 
-#: src/protocols/jabber/jabber.c:707
+#: src/protocols/jabber/jabber.c:1122
 msgid "Extended Away"
 msgstr "Tvol a gptl"
 
-#: src/protocols/jabber/jabber.c:709
+#: src/protocols/jabber/jabber.c:1124
 msgid "Do Not Disturb"
 msgstr "Ne zavarj"
 
-#: src/protocols/jabber/jabber.c:1130
+#: src/protocols/jabber/jabber.c:1434
+#, c-format
+msgid "Error %s: %s"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1437
+#, fuzzy
+msgid "Unknown Error in presence"
+msgstr "Ismeretlen hiba kd"
+
+#: src/protocols/jabber/jabber.c:1607
 #, c-format
 msgid "The user %s wants to add you to their buddy list."
 msgstr "%s felhasznl szeretne tged a partnerei kzz felvenni."
 
-#: src/protocols/jabber/jabber.c:1155
+#: src/protocols/jabber/jabber.c:1632
 msgid "No such user"
 msgstr "Nincs ilyen felhasznl"
 
-#: src/protocols/jabber/jabber.c:1157
+#: src/protocols/jabber/jabber.c:1634 src/protocols/jabber/jabber.c:2341
+#: src/protocols/jabber/jabber.c:2506
 msgid "Jabber Error"
 msgstr "Jabber hiba"
 
-#: src/dialogs.c:887 src/protocols/jabber/jabber.c:1237
+#: src/dialogs.c:887 src/protocols/jabber/jabber.c:1719
+#: src/protocols/msn/msn.c:1110
 msgid "Buddies"
 msgstr "Partnerek"
 
-#: src/protocols/jabber/jabber.c:1303
+#: src/protocols/jabber/jabber.c:1782
 msgid "Authenticating"
 msgstr "Azonosts"
 
-#: src/protocols/jabber/jabber.c:1340
+#: src/protocols/jabber/jabber.c:1819
 msgid "Unknown login error"
 msgstr "Ismeretlen bejelentkezsi hiba"
 
-#: src/protocols/jabber/jabber.c:1570 src/protocols/jabber/jabber.c:3018
+#: src/protocols/jabber/jabber.c:2010
+#, fuzzy
+msgid "Password successfully changed."
+msgstr "Jelsz sikeresen megvltoztatva"
+
+#: src/protocols/jabber/jabber.c:2012
+#, fuzzy
+msgid "Password Change"
+msgstr "Gaim - Jelsz megvltoztatsa"
+
+#: src/protocols/jabber/jabber.c:2054 src/protocols/jabber/jabber.c:3676
 msgid "Connection lost"
 msgstr "Kapcsolat megszakadt"
 
-#: src/protocols/jabber/jabber.c:1572 src/protocols/jabber/jabber.c:1604
-#: src/protocols/jabber/jabber.c:3020 src/protocols/jabber/jabber.c:3066
+#: src/protocols/jabber/jabber.c:2056 src/protocols/jabber/jabber.c:2088
+#: src/protocols/jabber/jabber.c:3678 src/protocols/jabber/jabber.c:3724
+#: src/protocols/msn/msn.c:1741 src/protocols/msn/msn.c:1770
 msgid "Unable to connect"
 msgstr "Nem sikerl kapcsoldni"
 
-#: src/protocols/jabber/jabber.c:1578
+#: src/protocols/jabber/jabber.c:2062
 msgid "Connected"
 msgstr "Kapcsoldva"
 
-#: src/protocols/jabber/jabber.c:1581
+#: src/protocols/jabber/jabber.c:2065
 msgid "Requesting Authentication Method"
 msgstr "Azonostsi mdszer lekrdezse"
 
 #. we have no chats yet
-#: src/protocols/jabber/jabber.c:1599
+#: src/protocols/jabber/jabber.c:2083 src/protocols/msn/msn.c:1762
 msgid "Connecting"
 msgstr "Kapcsolatfelvtel"
 
-#: src/protocols/jabber/jabber.c:1898
+#: src/protocols/jabber/jabber.c:2340 src/protocols/jabber/jabber.c:2505
+#, fuzzy
+msgid "Invalid Jabber I.D."
+msgstr "rvnytelen nv"
+
+#: src/protocols/jabber/jabber.c:2473
 msgid "Room:"
 msgstr "Szoba:"
 
-#: src/protocols/jabber/jabber.c:1902
+#: src/protocols/jabber/jabber.c:2477
 msgid "Server:"
 msgstr "Kiszolgl:"
 
-#: src/protocols/jabber/jabber.c:1907
+#: src/protocols/jabber/jabber.c:2482
 msgid "Handle:"
 msgstr "Kezel:"
 
-#: src/protocols/jabber/jabber.c:2177 src/protocols/jabber/jabber.c:2516
-msgid "Unknown"
-msgstr "Ismeretlen"
-
-#: src/buddy_chat.c:879 src/protocols/jabber/jabber.c:2232
-#: src/protocols/oscar/oscar.c:3593
+#: src/protocols/jabber/jabber.c:2539
+#, fuzzy
+msgid "Chats"
+msgstr "Csevegs"
+
+#: src/protocols/jabber/jabber.c:2854
+#, fuzzy
+msgid "View Error Msg"
+msgstr "Napl"
+
+#: src/buddy_chat.c:886 src/protocols/jabber/jabber.c:2865
+#: src/protocols/oscar/oscar.c:3606
 msgid "Get Away Msg"
 msgstr "Tvol zenet lekrdezse"
 
-#: src/protocols/jabber/jabber.c:2414
+#: src/protocols/jabber/jabber.c:2882
+msgid "Remove From Roster"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:3076
 msgid "Full Name"
 msgstr "Teljes nv"
 
-#: src/protocols/jabber/jabber.c:2415
+#: src/protocols/jabber/jabber.c:3077
 msgid "Family Name"
 msgstr "Csaldnv"
 
-#: src/protocols/jabber/jabber.c:2416
+#: src/protocols/jabber/jabber.c:3078
 msgid "Given Name"
 msgstr "Keresztnv"
 
-#: src/protocols/jabber/jabber.c:2417
+#: src/protocols/jabber/jabber.c:3079
 msgid "Nickname"
 msgstr "Becenv"
 
-#: src/dialogs.c:2525 src/protocols/jabber/jabber.c:2418
+#: src/dialogs.c:2525 src/protocols/jabber/jabber.c:3080
 msgid "URL"
 msgstr "URL"
 
-#: src/protocols/jabber/jabber.c:2419
+#: src/protocols/jabber/jabber.c:3081
 msgid "Street Address"
 msgstr "Utca"
 
-#: src/protocols/jabber/jabber.c:2420
+#: src/protocols/jabber/jabber.c:3082
 msgid "Extended Address"
 msgstr "Tovbbi cm"
 
-#: src/protocols/jabber/jabber.c:2421
+#: src/protocols/jabber/jabber.c:3083
 msgid "Locality"
 msgstr "Helysg"
 
-#: src/protocols/jabber/jabber.c:2422
+#: src/protocols/jabber/jabber.c:3084
 msgid "Region"
 msgstr "Rgi"
 
-#: src/protocols/jabber/jabber.c:2423
+#: src/protocols/jabber/jabber.c:3085
 msgid "Postal Code"
 msgstr "Irnytszm"
 
 #. Line 7
-#: src/dialogs.c:1646 src/dialogs.c:2354 src/protocols/jabber/jabber.c:2424
+#: src/dialogs.c:1646 src/dialogs.c:2354 src/protocols/jabber/jabber.c:3086
 msgid "Country"
 msgstr "Orszg"
 
-#: src/protocols/jabber/jabber.c:2425
+#: src/protocols/jabber/jabber.c:3087
 msgid "Telephone"
 msgstr "Telefonszm"
 
-#: src/dialogs.c:2430 src/protocols/jabber/jabber.c:2426
+#: src/dialogs.c:2430 src/protocols/jabber/jabber.c:3088
 msgid "Email"
 msgstr "E-mail"
 
-#: src/protocols/jabber/jabber.c:2427
+#: src/protocols/jabber/jabber.c:3089
 msgid "Organization Name"
 msgstr "Szervezet neve"
 
-#: src/protocols/jabber/jabber.c:2428
+#: src/protocols/jabber/jabber.c:3090
 msgid "Organization Unit"
 msgstr "Szervezeti egysg"
 
-#: src/prefs.c:1990 src/protocols/jabber/jabber.c:2429
+#: src/prefs.c:2000 src/protocols/jabber/jabber.c:3091
 msgid "Title"
 msgstr "Titulus"
 
-#: src/protocols/jabber/jabber.c:2430
+#: src/protocols/jabber/jabber.c:3092
 msgid "Role"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:2431
+#: src/protocols/jabber/jabber.c:3093
 msgid "Birthday"
 msgstr "Szletett"
 
 #. Right side: frame with description and the filepath of plugin
-#: src/dialogs.c:2533 src/plugins.c:211 src/protocols/jabber/jabber.c:2432
+#: src/dialogs.c:2533 src/plugins.c:211 src/protocols/jabber/jabber.c:3094
 msgid "Description"
 msgstr "Lers"
 
-#: src/protocols/jabber/jabber.c:2457
+#: src/protocols/jabber/jabber.c:3119
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable"
-msgstr "A kvetkez krdsek kzl csak azokra adj vlaszt, melyek nem rintenek knyelmetlenl."
-
-#: src/protocols/jabber/jabber.c:2458
+msgstr ""
+"A kvetkez krdsek kzl csak azokra adj vlaszt, melyek nem rintenek "
+"knyelmetlenl."
+
+#: src/protocols/jabber/jabber.c:3120
 msgid "User Identity"
 msgstr "Azonost"
 
-#: src/protocols/jabber/jabber.c:2874
+#: src/protocols/jabber/jabber.c:3532
 msgid "Gaim - Edit Jabber vCard"
 msgstr "Gaim - Jabber vCard szerkesztse"
 
-#: src/protocols/jabber/jabber.c:2948
+#: src/protocols/jabber/jabber.c:3606
 msgid "Server Registration successful!"
 msgstr "Kiszolgl regisztrci sikerlt!"
 
-#: src/protocols/jabber/jabber.c:2975
+#: src/protocols/jabber/jabber.c:3633
 msgid "Unknown registration error"
 msgstr "Ismeretlen regisztrcis hiba"
 
-#: src/protocols/jabber/jabber.c:3084 src/protocols/jabber/jabber.c:3099
+#: src/protocols/jabber/jabber.c:3742 src/protocols/jabber/jabber.c:3757
 msgid "Set User Info"
 msgstr "Felhasznli adatok"
 
-#: src/protocols/msn/msn.c:826 src/protocols/msn/msn.c:2264
-#: src/protocols/msn/msn.c:2297
+#: src/protocols/msn/msn.c:230
+msgid "Syntax Error (probably a Gaim bug)"
+msgstr ""
+
+#: src/protocols/msn/msn.c:233
+msgid "Invalid Parameter (probably a Gaim bug)"
+msgstr ""
+
+#: src/protocols/msn/msn.c:236
+#, fuzzy
+msgid "Invalid User"
+msgstr "rvnytelen nv"
+
+#: src/protocols/msn/msn.c:239
+msgid "Fully Qualified Domain Name missing"
+msgstr ""
+
+#: src/protocols/msn/msn.c:242
+msgid "Already Login"
+msgstr ""
+
+#: src/protocols/msn/msn.c:245
+#, fuzzy
+msgid "Invalid Username"
+msgstr "rvnytelen nv"
+
+#: src/protocols/msn/msn.c:248
+#, fuzzy
+msgid "Invalid Friendly Name"
+msgstr "rvnytelen nv"
+
+#: src/protocols/msn/msn.c:251
+msgid "List Full"
+msgstr ""
+
+#: src/protocols/msn/msn.c:254
+msgid "Already there"
+msgstr ""
+
+#: src/protocols/msn/msn.c:257
+#, fuzzy
+msgid "Not on list"
+msgstr "Kapcsolat megszakadt"
+
+#: src/protocols/msn/msn.c:260
+msgid "User is offline"
+msgstr ""
+
+#: src/protocols/msn/msn.c:263
+msgid "Already in the mode"
+msgstr ""
+
+#: src/protocols/msn/msn.c:266
+msgid "Already in opposite list"
+msgstr ""
+
+#: src/protocols/msn/msn.c:269
+msgid "Switchboard failed"
+msgstr ""
+
+#: src/protocols/msn/msn.c:272
+msgid "Notify Transfer failed"
+msgstr ""
+
+#: src/protocols/msn/msn.c:276
+msgid "Required fields missing"
+msgstr ""
+
+#: src/protocols/msn/msn.c:279
+#, fuzzy
+msgid "Not logged in"
+msgstr "%s bejelentkezett."
+
+#: src/protocols/msn/msn.c:283
+#, fuzzy
+msgid "Internal server error"
+msgstr "Bels hiba"
+
+#: src/protocols/msn/msn.c:286
+msgid "Database server error"
+msgstr ""
+
+#: src/protocols/msn/msn.c:289
+#, fuzzy
+msgid "File operation error"
+msgstr "bels kapcsolat hiba\n"
+
+#: src/protocols/msn/msn.c:292
+#, fuzzy
+msgid "Memory allocation error"
+msgstr "komoly hiba a kapcsolatban\n"
+
+#: src/protocols/msn/msn.c:296
+#, fuzzy
+msgid "Server busy"
+msgstr "Kiszolgl:"
+
+#: src/protocols/msn/msn.c:299
+#, fuzzy
+msgid "Server unavailable"
+msgstr "Nem elrhet"
+
+#: src/protocols/msn/msn.c:302
+msgid "Peer Notification server down"
+msgstr ""
+
+#: src/protocols/msn/msn.c:305
+#, fuzzy
+msgid "Database connect error"
+msgstr "bels kapcsolat hiba\n"
+
+#: src/protocols/msn/msn.c:308
+msgid "Server is going down (abandon ship)"
+msgstr ""
+
+#: src/protocols/msn/msn.c:312
+#, fuzzy
+msgid "Error creating connection"
+msgstr "g003: Hiba a kapcsolat megnyitsa kzben.\n"
+
+#: src/protocols/msn/msn.c:318
+msgid "Session overload"
+msgstr ""
+
+#: src/protocols/msn/msn.c:321
+msgid "User is too active"
+msgstr ""
+
+#: src/protocols/msn/msn.c:324
+#, fuzzy
+msgid "Too many sessions"
+msgstr "Tl sok egyezsg."
+
+#: src/protocols/msn/msn.c:327
+msgid "Not expected"
+msgstr ""
+
+#: src/protocols/msn/msn.c:330
+msgid "Bad friend file"
+msgstr ""
+
+#: src/protocols/msn/msn.c:334
+#, fuzzy
+msgid "Authentication failed"
+msgstr "Azonosts sikertelen"
+
+#: src/protocols/msn/msn.c:337
+#, fuzzy
+msgid "Not allowed when offline"
+msgstr "Nincs hang bejelentkezskor"
+
+#: src/protocols/msn/msn.c:340
+msgid "Not accepting new users"
+msgstr ""
+
+#: src/protocols/msn/msn.c:343
+msgid "User unverified"
+msgstr ""
+
+#: src/protocols/msn/msn.c:346
+#, fuzzy
+msgid "Unknown Error Code"
+msgstr "Ismeretlen hiba kd"
+
+#: src/protocols/msn/msn.c:351 src/protocols/msn/msn.c:558
+#: src/protocols/msn/msn.c:813 src/protocols/msn/msn.c:2114
+#: src/protocols/msn/msn.c:2283 src/protocols/msn/msn.c:2336
 msgid "MSN Error"
 msgstr "MSn hiba"
 
-#: src/protocols/msn/msn.c:826
+#: src/protocols/msn/msn.c:558
+msgid "A message may not have been received."
+msgstr ""
+
+#: src/protocols/msn/msn.c:813
 msgid "Gaim was unable to send a message"
 msgstr "Gaim nem tudta az zenetet elkldeni"
 
-#: src/protocols/msn/msn.c:1176
+#: src/protocols/msn/msn.c:917
+#, fuzzy, c-format
+msgid "The user %s (%s) wants to add %s to his or her buddy list."
+msgstr "%s felhasznl szeretne tged a partnerei kzz felvenni."
+
+#: src/protocols/msn/msn.c:1074
+#, fuzzy, c-format
+msgid "The user %s (%s) wants to add you to their buddy list"
+msgstr "%s felhasznl szeretne tged a partnerei kzz felvenni."
+
+#: src/protocols/msn/msn.c:1175
 msgid "You have been disconnected. You have signed on from another location."
 msgstr "Kapcsolatod megszakadt mivel egy msik helyrl bejelentkeztl."
 
-#: src/protocols/msn/msn.c:2264 src/protocols/msn/msn.c:2297
+#: src/protocols/msn/msn.c:1435 src/protocols/msn/msn.c:1679
+#, fuzzy
+msgid "Error reading from server"
+msgstr "Hiba a foglalat olvassakor."
+
+#: src/protocols/msn/msn.c:1568
+msgid "Requesting to send password"
+msgstr ""
+
+#: src/protocols/msn/msn.c:1618
+#, fuzzy
+msgid "Unable to send password"
+msgstr "Foglalatot nem lehet olvasni"
+
+#: src/protocols/msn/msn.c:1623
+#, fuzzy
+msgid "Password sent"
+msgstr "Jelsz: "
+
+#: src/protocols/msn/msn.c:1748
+#, fuzzy
+msgid "Unable to write to server"
+msgstr "Nem sikerl a kiszolglhoz kapcsoldni"
+
+#: src/protocols/msn/msn.c:1754
+#, fuzzy
+msgid "Synching with server"
+msgstr "Regisztrci a kiszolglval"
+
+#: src/protocols/msn/msn.c:1920
+msgid "Away From Computer"
+msgstr ""
+
+#: src/protocols/msn/msn.c:1921
+msgid "Be Right Back"
+msgstr ""
+
+#: src/protocols/msn/msn.c:1922
+#, fuzzy
+msgid "Busy"
+msgstr "Partner"
+
+#: src/protocols/msn/msn.c:1923
+msgid "On The Phone"
+msgstr ""
+
+#: src/protocols/msn/msn.c:1924
+msgid "Out To Lunch"
+msgstr ""
+
+#: src/protocols/msn/msn.c:1925
+#, fuzzy
+msgid "Hidden"
+msgstr "Ikon elrejtse"
+
+#: src/protocols/msn/msn.c:2041
+msgid "Reset friendly name"
+msgstr ""
+
+#: src/protocols/msn/msn.c:2114
+msgid "Friendly name too long."
+msgstr ""
+
+#: src/protocols/msn/msn.c:2129 src/protocols/msn/msn.c:2150
+#, fuzzy
+msgid "Set Friendly Name"
+msgstr "Vezetknv"
+
+#: src/protocols/msn/msn.c:2130
+#, fuzzy
+msgid "Set Friendly Name:"
+msgstr "Kperny neve: "
+
+#: src/protocols/msn/msn.c:2131
+msgid "Reset All Friendly Names"
+msgstr ""
+
+#: src/protocols/msn/msn.c:2283 src/protocols/msn/msn.c:2336
 msgid "Invalid name"
 msgstr "rvnytelen nv"
 
-#: src/protocols/napster/napster.c:450 src/protocols/oscar/oscar.c:3196
+#: src/protocols/napster/napster.c:457 src/protocols/oscar/oscar.c:3209
 #: src/protocols/toc/toc.c:1104
 msgid "Join what group:"
 msgstr "Melyik csoporthoz kapcsoldsz"
@@ -661,8 +1060,9 @@
 msgid ""
 "You have been connecting and disconnecting too frequently. Wait ten minutes "
 "and try again. If you continue to try, you will need to wait even longer."
-msgstr "Gyakran jelentkezel ki/be. Vrj 10 percig s prbld jra. Ha tovbb folytatod,"
-"mg tbbet kell majd vrnod."
+msgstr ""
+"Gyakran jelentkezel ki/be. Vrj 10 percig s prbld jra. Ha tovbb "
+"folytatod,mg tbbet kell majd vrnod."
 
 #. client too old
 #: src/protocols/oscar/oscar.c:653
@@ -677,203 +1077,204 @@
 msgid "Internal Error"
 msgstr "Bels hiba"
 
-#: src/protocols/oscar/oscar.c:1248 src/protocols/oscar/oscar.c:3407
+#: src/protocols/oscar/oscar.c:1248 src/protocols/oscar/oscar.c:3420
 #, c-format
 msgid "Direct IM with %s established"
 msgstr "Kzvetlen IM kapcsolat %s-(val/vel) ltrejtt"
 
-#: src/protocols/oscar/oscar.c:1494 src/protocols/oscar/oscar.c:2446
+#: src/protocols/oscar/oscar.c:1504 src/protocols/oscar/oscar.c:2456
 #, c-format
 msgid ""
 "The user %lu has denied your request to add them to your contact list for "
 "the following reason:\n"
 "%s"
-msgstr "%lu felhasznl elutastotta a krsed a kvetkez magyarzattal:\n"
+msgstr ""
+"%lu felhasznl elutastotta a krsed a kvetkez magyarzattal:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:1494 src/protocols/oscar/oscar.c:2446
+#: src/protocols/oscar/oscar.c:1504 src/protocols/oscar/oscar.c:2456
 msgid "No reason given."
 msgstr "Nincs magyarzat."
 
-#: src/protocols/oscar/oscar.c:1495 src/protocols/oscar/oscar.c:2447
+#: src/protocols/oscar/oscar.c:1505 src/protocols/oscar/oscar.c:2457
 msgid "Gaim - ICQ Authorization Denied"
 msgstr "Gaim - ICQ azonosts elutastva"
 
-#: src/protocols/oscar/oscar.c:1501 src/protocols/oscar/oscar.c:2453
+#: src/protocols/oscar/oscar.c:1511 src/protocols/oscar/oscar.c:2463
 #, c-format
 msgid "The user %lu has granted your request to add them to your contact list."
 msgstr "%lu felhasznl elfogadta a krsed."
 
-#: src/protocols/oscar/oscar.c:1502 src/protocols/oscar/oscar.c:2454
+#: src/protocols/oscar/oscar.c:1512 src/protocols/oscar/oscar.c:2464
 msgid "Gaim - ICQ Authorization Granted"
 msgstr "Gaim - ICQ azonosts elfogadva"
 
-#: src/protocols/oscar/oscar.c:1575
+#: src/protocols/oscar/oscar.c:1585
 #, c-format
 msgid "You missed %d message from %s because it was invalid."
 msgstr "Nem kaptl meg %d zenetet %s-tl mert rvnytelen volt."
 
-#: src/protocols/oscar/oscar.c:1576
+#: src/protocols/oscar/oscar.c:1586
 #, c-format
 msgid "You missed %d messages from %s because they were invalid."
 msgstr "Nem kaptl meg %d zeneteket %s-tl mert rvnytelenek voltak."
 
-#: src/protocols/oscar/oscar.c:1585
+#: src/protocols/oscar/oscar.c:1595
 #, c-format
 msgid "You missed %d message from %s because it was too large."
 msgstr "Nem kaptl meg %d zenetet %s-tl mert tl hossz volt."
 
-#: src/protocols/oscar/oscar.c:1586
+#: src/protocols/oscar/oscar.c:1596
 #, c-format
 msgid "You missed %d messages from %s because they were too large."
 msgstr "Nem kaptl meg %d zenetet %s-tl mert tl hosszak voltak."
 
-#: src/protocols/oscar/oscar.c:1595
+#: src/protocols/oscar/oscar.c:1605
 #, c-format
 msgid "You missed %d message from %s because the rate limit has been exceeded."
 msgstr "Nhny %d zenet nem rkezett meg mivel a korltot meghaladta."
 
-#: src/protocols/oscar/oscar.c:1596
+#: src/protocols/oscar/oscar.c:1606
 #, c-format
 msgid ""
 "You missed %d messages from %s because the rate limit has been exceeded."
 msgstr "Nem kaptl meg %d zenetet %s-tl,mert meghaladta a korltot."
 
-#: src/protocols/oscar/oscar.c:1605
+#: src/protocols/oscar/oscar.c:1615
 #, c-format
 msgid "You missed %d message from %s because it was too evil."
 msgstr "Nem kaptl meg %d zenetet %s-tl,mert nagyon durva szveg."
 
-#: src/protocols/oscar/oscar.c:1606
+#: src/protocols/oscar/oscar.c:1616
 #, c-format
 msgid "You missed %d messages from %s because they are too evil."
 msgstr "Nem kaptl meg %d zenetet %s-tl,mert nagyon durva szvegek."
 
-#: src/protocols/oscar/oscar.c:1615
+#: src/protocols/oscar/oscar.c:1625
 #, c-format
 msgid "You missed %d message from %s because you are too evil."
 msgstr "Nem kaptl meg %d zenetet %s-tl, mert nagyon gonosz vagy."
 
-#: src/protocols/oscar/oscar.c:1616
+#: src/protocols/oscar/oscar.c:1626
 #, c-format
 msgid "You missed %d messages from %s because you are too evil."
 msgstr "Nem kaptl meg %d zenetet %s-tl, mert tl gonosz vagy."
 
-#: src/protocols/oscar/oscar.c:1624
+#: src/protocols/oscar/oscar.c:1634
 #, c-format
 msgid "You missed %d message from %s for unknown reasons."
 msgstr "Nem kaptl meg %d zenetet %s-tl ismeretlen okokbl."
 
-#: src/protocols/oscar/oscar.c:1625
+#: src/protocols/oscar/oscar.c:1635
 #, c-format
 msgid "You missed %d messages from %s for unknown reasons."
 msgstr "Nem kaptl meg %d zenetet %s-tl ismeretlen okokbl."
 
-#: src/dialogs.c:3076 src/dialogs.c:3082 src/protocols/oscar/oscar.c:1630
-#: src/protocols/oscar/oscar.c:1745 src/protocols/oscar/oscar.c:1763
-#: src/protocols/oscar/oscar.c:2216 src/protocols/yahoo/yahoo.c:594
+#: src/dialogs.c:3076 src/dialogs.c:3082 src/protocols/oscar/oscar.c:1640
+#: src/protocols/oscar/oscar.c:1755 src/protocols/oscar/oscar.c:1773
+#: src/protocols/oscar/oscar.c:2226 src/protocols/yahoo/yahoo.c:594
 msgid "Gaim - Error"
 msgstr "Gaim - Hiba"
 
-#: src/protocols/oscar/oscar.c:1693
+#: src/protocols/oscar/oscar.c:1703
 #, c-format
 msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR>%s<BR>"
 msgstr "<B>UIN:</B> %s<BR><B>llapot:</B> %s<BR><HR><BR>%s<BR>"
 
-#: src/protocols/oscar/oscar.c:1695
+#: src/protocols/oscar/oscar.c:1705
 #, c-format
 msgid "<B>Status:</B> %s<BR><HR><BR>%s<BR>"
 msgstr "<B>llapot:</B> %s<BR><HR><BR>%s<BR>"
 
-#: src/protocols/oscar/oscar.c:1724
+#: src/protocols/oscar/oscar.c:1734
 #, c-format
 msgid "SNAC threw error: %s\n"
 msgstr "SNAC hiba: %s\n"
 
-#: src/protocols/oscar/oscar.c:1726
+#: src/protocols/oscar/oscar.c:1736
 msgid "Gaim - Oscar SNAC Error"
 msgstr "Gaim - Oscar SNAC hiba"
 
-#: src/protocols/oscar/oscar.c:1743
+#: src/protocols/oscar/oscar.c:1753
 #, c-format
 msgid "Your message to %s did not get sent: %s"
 msgstr "zeneted %s-nak/nek nem lett elkldve: %s"
 
-#: src/protocols/oscar/oscar.c:1744 src/protocols/oscar/oscar.c:1762
+#: src/protocols/oscar/oscar.c:1754 src/protocols/oscar/oscar.c:1772
 msgid "Reason unknown"
 msgstr "Ismeretlen ok"
 
-#: src/protocols/oscar/oscar.c:1761
+#: src/protocols/oscar/oscar.c:1771
 #, c-format
 msgid "User information for %s unavailable: %s"
 msgstr "Felhasznl informci %s nem elrhet: %s"
 
-#: src/buddy.c:2073 src/protocols/oscar/oscar.c:1792
+#: src/buddy.c:2131 src/protocols/oscar/oscar.c:1802
 msgid "Buddy Icon"
 msgstr "Buddy Ikon"
 
-#: src/buddy.c:2076 src/protocols/oscar/oscar.c:1795
+#: src/buddy.c:2134 src/protocols/oscar/oscar.c:1805
 msgid "Voice"
 msgstr "Hang"
 
-#: src/buddy.c:2079 src/protocols/oscar/oscar.c:1798
+#: src/buddy.c:2137 src/protocols/oscar/oscar.c:1808
 msgid "IM Image"
 msgstr "IM kp"
 
-#: src/buddy.c:495 src/buddy.c:2082 src/buddy.c:2523 src/prefs.c:2914
-#: src/protocols/oscar/oscar.c:1801
+#: src/buddy.c:498 src/buddy.c:2140 src/buddy.c:2581 src/prefs.c:2926
+#: src/protocols/oscar/oscar.c:1811
 msgid "Chat"
 msgstr "Csevegs"
 
-#: src/buddy.c:2085 src/protocols/oscar/oscar.c:1804
+#: src/buddy.c:2143 src/protocols/oscar/oscar.c:1814
 msgid "Get File"
 msgstr "Fjl letltse"
 
-#: src/buddy.c:2088 src/protocols/oscar/oscar.c:1807
+#: src/buddy.c:2146 src/protocols/oscar/oscar.c:1817
 msgid "Send File"
 msgstr "Fjl kldse"
 
-#: src/buddy.c:2092 src/protocols/oscar/oscar.c:1811
+#: src/buddy.c:2150 src/protocols/oscar/oscar.c:1821
 msgid "Games"
 msgstr "Jtkok"
 
-#: src/buddy.c:2095 src/protocols/oscar/oscar.c:1814
+#: src/buddy.c:2153 src/protocols/oscar/oscar.c:1824
 msgid "Stocks"
 msgstr "Kszlet"
 
-#: src/buddy.c:2098 src/protocols/oscar/oscar.c:1817
+#: src/buddy.c:2156 src/protocols/oscar/oscar.c:1827
 msgid "Send Buddy List"
 msgstr "Partner lista kldse"
 
-#: src/buddy.c:2101 src/protocols/oscar/oscar.c:1820
+#: src/buddy.c:2159 src/protocols/oscar/oscar.c:1830
 msgid "EveryBuddy Bug"
 msgstr "EveryBuddy hiba"
 
-#: src/buddy.c:2104 src/protocols/oscar/oscar.c:1823
+#: src/buddy.c:2162 src/protocols/oscar/oscar.c:1833
 msgid "AP User"
 msgstr "AP felhasznl"
 
-#: src/buddy.c:2107 src/protocols/oscar/oscar.c:1826
+#: src/buddy.c:2165 src/protocols/oscar/oscar.c:1836
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
-#: src/buddy.c:2110 src/protocols/oscar/oscar.c:1829
+#: src/buddy.c:2168 src/protocols/oscar/oscar.c:1839
 msgid "Nihilist"
 msgstr "Nihilista"
 
-#: src/buddy.c:2113 src/protocols/oscar/oscar.c:1832
+#: src/buddy.c:2171 src/protocols/oscar/oscar.c:1842
 msgid "ICQ Server Relay"
 msgstr "ICQ kiszolgl kzvett"
 
-#: src/buddy.c:2116 src/protocols/oscar/oscar.c:1835
+#: src/buddy.c:2174 src/protocols/oscar/oscar.c:1845
 msgid "ICQ Unknown"
 msgstr "ICQ ismeretlen"
 
-#: src/buddy.c:2119 src/protocols/oscar/oscar.c:1838
+#: src/buddy.c:2177 src/protocols/oscar/oscar.c:1848
 msgid "Trillian Encryption"
 msgstr "Trillian titkosts"
 
-#: src/protocols/oscar/oscar.c:1876
+#: src/protocols/oscar/oscar.c:1886
 msgid ""
 "<br><BODY BGCOLOR=WHITE><hr><I>Legend:</I><br><br><IMG SRC=\"free_icon.gif"
 "\"> : Normal AIM User<br><IMG SRC=\"aol_icon.gif\"> : AOL User <br><IMG SRC="
@@ -882,12 +1283,13 @@
 "Agent<br><IMG SRC=\"wireless_icon.gif\"> : Wireless Device User<br>"
 msgstr ""
 "<br><BODY BGCOLOR=WHITE><hr><I>Legenda:</I><br><br><IMG SRC=\"free_icon.gif"
-"\"> : Norml AIM felhasznl<br><IMG SRC=\"aol_icon.gif\"> : AOL felhasznl <br><IMG SRC="
-"\"dt_icon.gif\"> : Prba AIM felhasznl <br><IMG SRC=\"admin_icon.gif\"> : "
-"Adminisztrtor <br><IMG SRC=\"ab_icon.gif\"> : ActiveBuddy Interaktv "
-"gynk<br><IMG SRC=\"wireless_icon.gif\"> : Wireless eszkz felhasznl<br>"
-
-#: src/protocols/oscar/oscar.c:1904
+"\"> : Norml AIM felhasznl<br><IMG SRC=\"aol_icon.gif\"> : AOL felhasznl "
+"<br><IMG SRC=\"dt_icon.gif\"> : Prba AIM felhasznl <br><IMG SRC="
+"\"admin_icon.gif\"> : Adminisztrtor <br><IMG SRC=\"ab_icon.gif\"> : "
+"ActiveBuddy Interaktv gynk<br><IMG SRC=\"wireless_icon.gif\"> : Wireless "
+"eszkz felhasznl<br>"
+
+#: src/protocols/oscar/oscar.c:1914
 #, c-format
 msgid ""
 "Username : <B>%s</B>  %s <BR>\n"
@@ -900,100 +1302,100 @@
 "%s%s%s<BR>\n"
 "<HR><BR>\n"
 
-#: src/protocols/oscar/oscar.c:1936
+#: src/protocols/oscar/oscar.c:1946
 msgid "<i>User has no away message</i>"
 msgstr "<i>Felhasznl nem rendelkezik zenettel tvollt esetre</i>"
 
-#: src/protocols/oscar/oscar.c:1948
+#: src/protocols/oscar/oscar.c:1958
 msgid "Client Capabilities: "
 msgstr "gyfl kpessgei: "
 
-#: src/protocols/oscar/oscar.c:1956
+#: src/protocols/oscar/oscar.c:1966
 msgid "<i>No Information Provided</i>"
 msgstr "<i>Nincs informci megadva</i>"
 
-#: src/protocols/oscar/oscar.c:1979
+#: src/protocols/oscar/oscar.c:1989
 msgid "Your connection may be lost."
 msgstr "A kapcsolat valsznleg megszakadt."
 
-#: src/protocols/oscar/oscar.c:1980
+#: src/protocols/oscar/oscar.c:1990
 msgid "AOL error"
 msgstr "AOL hiba"
 
-#: src/protocols/oscar/oscar.c:2215
+#: src/protocols/oscar/oscar.c:2225
 msgid ""
 "The last message was not sent because you are over the rate limit. Please "
 "wait 10 seconds and try again."
 msgstr ""
-"Az utols zenet nem lett elkldve mert a korltot meghaladtad. Krlek "
-"vrj 10 msodpercet s prbld jra."
-
-#: src/dialogs.c:3604 src/protocols/oscar/oscar.c:2576
-#: src/protocols/oscar/oscar.c:3528 src/protocols/toc/toc.c:1564
+"Az utols zenet nem lett elkldve mert a korltot meghaladtad. Krlek vrj "
+"10 msodpercet s prbld jra."
+
+#: src/dialogs.c:3604 src/protocols/oscar/oscar.c:2589
+#: src/protocols/oscar/oscar.c:3541 src/protocols/toc/toc.c:1564
 #: src/protocols/toc/toc.c:1581 src/protocols/toc/toc.c:1641
 #: src/protocols/toc/toc.c:1683 src/protocols/toc/toc.c:1802
 #: src/protocols/toc/toc.c:1832 src/protocols/toc/toc.c:1888
 msgid "Error"
 msgstr "Hiba"
 
-#: src/protocols/oscar/oscar.c:3179
+#: src/protocols/oscar/oscar.c:3192
 #, c-format
 msgid ""
 "The maximum number of buddies allowed in your buddy list is %d, and you have "
 "%d.  Until you are below the limit, some buddies will not show up as online."
 msgstr ""
-"A megengedett partnerek szma maximum %d, jelenleg "
-"%d.  Amg a korltot el nem red, nhny partnered nem fog megjelenni elrhetknt."
-
-#: src/protocols/oscar/oscar.c:3182
+"A megengedett partnerek szma maximum %d, jelenleg %d.  Amg a korltot el "
+"nem red, nhny partnered nem fog megjelenni elrhetknt."
+
+#: src/protocols/oscar/oscar.c:3195
 msgid "Gaim - Warning"
 msgstr "Gaim - figyelmeztets"
 
-#: src/protocols/oscar/oscar.c:3200 src/protocols/toc/toc.c:1108
+#: src/protocols/oscar/oscar.c:3213 src/protocols/toc/toc.c:1108
 msgid "Exchange:"
 msgstr "Vlts:"
 
-#: src/protocols/oscar/oscar.c:3528
+#: src/protocols/oscar/oscar.c:3541
 msgid "Unable to open Direct IM"
 msgstr "Nem sikerlt megnyitni a kzvetlen IM-et"
 
-#: src/protocols/oscar/oscar.c:3538
+#: src/protocols/oscar/oscar.c:3551
 #, c-format
 msgid ""
 "You have selected to open a Direct IM connection with %s. Doing this will "
 "let them see your IP address, and may be a security risk. Do you wish to "
 "continue?"
 msgstr ""
-"Kzvetlen IM kapcsolatot vlasztottl %s-(val/vel). Ezzel "
-"lthatv vlik az IP cmed. Folytatni akarod?"
-
-#: src/protocols/oscar/oscar.c:3555
+"Kzvetlen IM kapcsolatot vlasztottl %s-(val/vel). Ezzel lthatv vlik az "
+"IP cmed. Folytatni akarod?"
+
+#: src/protocols/oscar/oscar.c:3568
 #, c-format
 msgid ""
 "<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR><I>Remote client does not "
 "support sending status messages.</I><BR>"
 msgstr ""
-"<B>UIN:</B> %s<BR><B>Sttusz:</B> %s<BR><HR><BR><I>Tvoli gyfl nem tmogatja "
-"a sttuszt zenetek kldst.</I><BR>"
-
-#: src/protocols/oscar/oscar.c:3562
+"<B>UIN:</B> %s<BR><B>Sttusz:</B> %s<BR><HR><BR><I>Tvoli gyfl nem "
+"tmogatja a sttuszt zenetek kldst.</I><BR>"
+
+#: src/protocols/oscar/oscar.c:3575
 #, c-format
 msgid ""
 "<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR><I>User has no status message."
 "</I><BR>"
 msgstr ""
-"<B>UIN:</B> %s<BR><B>Sttusz:</B> %s<BR><HR><BR><I>Felhasznlnak nincs sttusz zenete."
-"</I><BR>"
-
-#: src/protocols/oscar/oscar.c:3587
+"<B>UIN:</B> %s<BR><B>Sttusz:</B> %s<BR><HR><BR><I>Felhasznlnak nincs "
+"sttusz zenete.</I><BR>"
+
+#: src/protocols/oscar/oscar.c:3600
 msgid "Get Status Msg"
 msgstr "Sttsz zenet lekrdezse"
 
-#: src/protocols/oscar/oscar.c:3600
+#: src/protocols/oscar/oscar.c:3613
 msgid "Direct IM"
 msgstr "Kzvetlen IM"
 
-#: src/protocols/oscar/oscar.c:3608
+#: src/protocols/oscar/oscar.c:3621
 msgid "Get Capabilities"
 msgstr "Lehetsgek lekrdezse"
 
@@ -1147,9 +1549,9 @@
 "sent to it, and may kick you off if you send a message. Gaim will prevent "
 "anything from going through. This is only temporary, please be patient."
 msgstr ""
-"TOC egy PAUSE parancsot kldtt. Ebben az esetben a TOC figyelmen kvl "
-"hagy minden neki kldtt zenetet s kizrhat hogyha kldesz egy zenetet "
-"Gaim megakadlyozza ezt. Ez csak ideiglenes, lgy trelemmel."
+"TOC egy PAUSE parancsot kldtt. Ebben az esetben a TOC figyelmen kvl hagy "
+"minden neki kldtt zenetet s kizrhat hogyha kldesz egy zenetet Gaim "
+"megakadlyozza ezt. Ez csak ideiglenes, lgy trelemmel."
 
 #: src/protocols/toc/toc.c:788
 msgid "TOC Pause"
@@ -1191,19 +1593,19 @@
 msgid "Your message did not get sent."
 msgstr "zeneted nem lett elkldve."
 
-#: src/protocols/zephyr/zephyr.c:802
+#: src/protocols/zephyr/zephyr.c:840
 msgid "ZLocate"
 msgstr "ZHely:"
 
-#: src/protocols/zephyr/zephyr.c:839
+#: src/protocols/zephyr/zephyr.c:877
 msgid "Class:"
 msgstr "Osztly:"
 
-#: src/protocols/zephyr/zephyr.c:843
+#: src/protocols/zephyr/zephyr.c:881
 msgid "Instance:"
 msgstr "Pldny:"
 
-#: src/protocols/zephyr/zephyr.c:847
+#: src/protocols/zephyr/zephyr.c:885
 msgid "Recipient:"
 msgstr "Cmzett:"
 
@@ -1213,19 +1615,20 @@
 msgstr "Gaim v%s"
 
 #: src/about.c:135
+#, fuzzy
 msgid ""
-"Gaim is a client that supports AOL's Instant Messenger protocol. It is "
-"written\n"
-"using Gtk+ and is licensed under the GPL.\n"
+"Gaim is a modular Instant Messaging client capable of using AIM, ICQ,\n"
+"Yahoo!, MSN, IRC, Jabber, Napster, Zephyr, and Gadu-Gadu all at once.\n"
+"It is written using Gtk+ and is licensed under the GPL.\n"
 "\n"
 "URL: "
 msgstr ""
-"Gaim AOL protokolt tmogat gyfl szoftver. Gtk+ segtsgvel s a "
-"GPL licensznek megfelelen kszl.\n"
+"Gaim AOL protokolt tmogat gyfl szoftver. Gtk+ segtsgvel s a GPL "
+"licensznek megfelelen kszl.\n"
 "\n"
 "URL: "
 
-#: src/about.c:136
+#: src/about.c:137
 msgid ""
 "\n"
 "\n"
@@ -1235,7 +1638,7 @@
 "\n"
 "IRC: #gaim a irc.openprojects.net cmen"
 
-#: src/about.c:146
+#: src/about.c:147
 msgid ""
 "Active Developers\n"
 "====================\n"
@@ -1273,98 +1676,96 @@
 "Eric Warmenhoven                [ warmenhoven@yahoo.com ]\n"
 "Mark Spencer (eredeti szerz)   [ markster@marko.net ]"
 
-#: src/about.c:164 src/aim.c:319 src/buddy.c:2658 src/buddy_chat.c:1315
-#: src/buddy_chat.c:1412 src/buddy_chat.c:1442 src/conversation.c:2839
-#: src/dialogs.c:567 src/dialogs.c:3899 src/multi.c:1069 src/plugins.c:277
-#: src/prefs.c:2537 src/prpl.c:438 src/prpl.c:679 src/server.c:1072
-msgid "Close"
-msgstr "Bezr"
-
 #. this makes the sizes not work.
 #. GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
 #. gtk_widget_grab_default(button);
-#: src/about.c:184
+#: src/about.c:185
 msgid "Web Site"
 msgstr "Web cm"
 
-#: src/aim.c:152 src/buddy.c:2651
+#: src/aim.c:153 src/buddy.c:2709
 msgid "Signoff"
 msgstr "Kijelentkezs"
 
-#: src/aim.c:164
+#: src/aim.c:165
 msgid "Please enter your logon"
 msgstr "Add meg a belpsi neved"
 
-#: src/aim.c:164 src/multi.c:1400 src/server.c:55
+#: src/aim.c:165 src/multi.c:1400 src/server.c:55
 msgid "Signon Error"
 msgstr "Bejelentkezsi hiba"
 
-#: src/aim.c:262
+#: src/aim.c:263
 msgid "Gaim - Login"
 msgstr "Gaim - Bejelentkezs"
 
-#: src/aim.c:280
+#: src/aim.c:281
 msgid "Screen Name: "
 msgstr "Kperny neve: "
 
-#: src/aim.c:296
+#: src/aim.c:297
 msgid "Password: "
 msgstr "Jelsz: "
 
-#: src/aim.c:317 src/buddy.c:2655
+#: src/aim.c:318 src/buddy.c:2713
 msgid "Quit"
 msgstr "Kilp"
 
-#: src/aim.c:322 src/aim.c:830 src/buddy.c:2681
+#: src/aim.c:323 src/aim.c:831 src/buddy.c:2739
 msgid "Accounts"
 msgstr "Fikok"
 
-#: src/aim.c:324 src/multi.c:915
+#: src/aim.c:325 src/multi.c:915
 msgid "Signon"
 msgstr "Bejelentkezs"
 
-#: src/aim.c:356
+#: src/aim.c:357
 msgid "About"
 msgstr "Nvjegy"
 
-#: src/aim.c:357 src/prefs.c:1621 src/prefs.c:1895
+#: src/aim.c:358 src/prefs.c:1633 src/prefs.c:1905
 msgid "Options"
 msgstr "Belltsok"
 
-#: src/aim.c:359 src/aim.c:833 src/buddy.c:2699
+#: src/aim.c:360 src/aim.c:834 src/buddy.c:2757
 msgid "Plugins"
 msgstr "Pluginek"
 
-#: src/aim.c:827 src/buddy.c:2691
+#: src/aim.c:828 src/buddy.c:2749
 msgid "Preferences"
 msgstr "Preferencik"
 
-#: src/applet.c:110
+#: src/aim.c:838 src/multi.c:1472
+#, fuzzy
+msgid "Auto-login"
+msgstr "Automatikus bejelentkezs"
+
+#: src/applet.c:109
 msgid "Attempting to sign on...."
 msgstr "Prblok bejelentkezni ..."
 
-#: src/applet.c:113
+#: src/applet.c:112
 msgid "Offline. Click to bring up login box."
 msgstr "Kilpve. Kattints a bejelentkezsi ablak megjelenshez."
 
-#: src/applet.c:129
+#: src/applet.c:128
 #, c-format
 msgid "Away: %d pending."
 msgstr "Tvol: %d"
 
-#: src/applet.c:132
+#: src/applet.c:131
 msgid "Away."
 msgstr "Tvol."
 
-#: src/applet.c:189 src/away.c:388
+#: src/applet.c:200 src/away.c:388
 msgid "New Away Message"
 msgstr "j zenet tvollt esetre"
 
-#: src/applet.c:337
+#: src/applet.c:348
 msgid "Can't create Gaim applet!"
 msgstr "Nem sikerl ltrehozni a Gaim appletet!"
 
-#: src/applet.c:359
+#: src/applet.c:368
 msgid "About..."
 msgstr "Nvjegy..."
 
@@ -1388,88 +1789,74 @@
 msgid "Set All Away"
 msgstr "Tvol mindenhonnan"
 
-#. Put the buttons in the box
-#: src/buddy.c:489 src/buddy.c:2769 src/buddy_chat.c:1447
-#: src/conversation.c:2372 src/conversation.c:2854 src/dialogs.c:932
-#: src/dialogs.c:1114 src/dialogs.c:2095 src/multi.c:1053 src/prefs.c:2031
-#: src/prefs.c:2373 src/prefs.c:2407
-msgid "Add"
-msgstr "Hozzad"
-
-#: src/buddy.c:490 src/buddy.c:2770 src/dialogs.c:942 src/dialogs.c:1089
+#: src/buddy.c:493 src/buddy.c:2828 src/dialogs.c:942 src/dialogs.c:1089
 msgid "Group"
 msgstr "Csoport"
 
-#: src/buddy.c:491 src/buddy.c:2771 src/buddy_chat.c:1449
-#: src/conversation.c:2358 src/conversation.c:2851 src/prefs.c:2045
-#: src/prefs.c:2377 src/prefs.c:2411
-msgid "Remove"
-msgstr "Elvtolt"
-
-#: src/buddy.c:496 src/buddy.c:649 src/buddy.c:803 src/buddy.c:2521
-#: src/buddy_chat.c:854 src/buddy_chat.c:1271
+#: src/buddy.c:499 src/buddy.c:664 src/buddy.c:834 src/buddy.c:2579
+#: src/buddy_chat.c:861 src/buddy_chat.c:1278
 msgid "IM"
 msgstr "IM"
 
-#: src/buddy.c:497 src/buddy.c:2522 src/buddy_chat.c:870 src/buddy_chat.c:1279
-#: src/buddy_chat.c:1455 src/conversation.c:2872
+#: src/buddy.c:500 src/buddy.c:2580 src/buddy_chat.c:877 src/buddy_chat.c:1286
+#: src/buddy_chat.c:1462 src/conversation.c:2897
 msgid "Info"
 msgstr "Informci"
 
 #. Put the buttons in the box
-#: src/buddy.c:654 src/buddy.c:808 src/dialogs.c:1081 src/dialogs.c:3458
+#: src/buddy.c:669 src/buddy.c:839 src/dialogs.c:1081 src/dialogs.c:3458
 #: src/dialogs.c:3473
 msgid "Alias"
 msgstr "lnv"
 
-#: src/buddy.c:659 src/buddy.c:827
+#: src/buddy.c:674 src/buddy.c:858
 msgid "Add Buddy Pounce"
 msgstr "j figyelmeztets"
 
-#: src/buddy.c:666 src/buddy.c:833
+#: src/buddy.c:681 src/buddy.c:864
 msgid "View Log"
 msgstr "Napl"
 
-#: src/buddy.c:790 src/buddy.c:821
+#: src/buddy.c:821 src/buddy.c:852
 msgid "Rename"
 msgstr "tnevez"
 
-#: src/buddy.c:815
+#: src/buddy.c:846
 msgid "Un-Alias"
 msgstr "lnv trlse"
 
-#: src/buddy.c:1587 src/buddy.c:2674
+#: src/buddy.c:1645 src/buddy.c:2732
 msgid "Buddy Pounce"
 msgstr ""
 
-#: src/buddy.c:1667
+#: src/buddy.c:1725
 msgid "New Buddy Pounce"
 msgstr "j"
 
-#: src/buddy.c:1685
+#: src/buddy.c:1743
 msgid "Remove Buddy Pounce"
 msgstr "Figyelmeztets trlse"
 
-#: src/buddy.c:1713
+#: src/buddy.c:1771
 msgid "[Click to edit]"
 msgstr "Szerkesztshez kattints"
 
-#: src/buddy.c:2196
+#: src/buddy.c:2254
 #, c-format
 msgid "Logged in: %s\n"
 msgstr "Bejelentkezve: %s\n"
 
-#: src/buddy.c:2208
+#: src/buddy.c:2266
 #, c-format
 msgid "Warnings: %d%%\n"
 msgstr "Figyelmeztetsek: %d%%\n"
 
-#: src/buddy.c:2220
+#: src/buddy.c:2278
 #, c-format
 msgid "Capabilities: %s\n"
 msgstr "Lehetsgek: %s\n"
 
-#: src/buddy.c:2224
+#: src/buddy.c:2282
 #, c-format
 msgid ""
 "Alias: %s               \n"
@@ -1480,125 +1867,125 @@
 "Kperny neve: %s\n"
 "%s%s%s%s%s%s"
 
-#: src/buddy.c:2228
+#: src/buddy.c:2286
 msgid "Idle: "
 msgstr "Inaktv: "
 
-#: src/buddy.c:2301 src/buddy.c:2306
+#: src/buddy.c:2359 src/buddy.c:2364
 #, c-format
 msgid "%s logged in."
 msgstr "%s bejelentkezett."
 
-#: src/buddy.c:2366 src/buddy.c:2371
+#: src/buddy.c:2424 src/buddy.c:2429
 #, c-format
 msgid "%s logged out."
 msgstr "%s kijelentkezett."
 
-#: src/buddy.c:2556
+#: src/buddy.c:2614
 msgid "Information on selected Buddy"
 msgstr "Partner adatai"
 
-#: src/buddy.c:2557 src/dialogs.c:697
+#: src/buddy.c:2615 src/dialogs.c:697
 msgid "Send Instant Message"
 msgstr "Azonnali zenet kldse"
 
-#: src/buddy.c:2558
+#: src/buddy.c:2616
 msgid "Start/join a Buddy Chat"
 msgstr "j csevegs/kapcsolds csevegshez"
 
-#: src/buddy.c:2559
+#: src/buddy.c:2617
 msgid "Activate Away Message"
 msgstr "Tvollt zenetnek aktivlsa"
 
-#: src/buddy.c:2631
+#: src/buddy.c:2689
 msgid "File"
 msgstr "Fjl"
 
-#: src/buddy.c:2635
+#: src/buddy.c:2693
 msgid "Add A Buddy"
 msgstr "Partner felvtele"
 
-#: src/buddy.c:2637
+#: src/buddy.c:2695
 msgid "Join A Chat"
 msgstr "Csatlakozs egy csevegshez"
 
-#: src/buddy.c:2639
+#: src/buddy.c:2697
 msgid "New Instant Message"
 msgstr "j azonnali zenet"
 
-#: src/buddy.c:2641 src/dialogs.c:759
+#: src/buddy.c:2699 src/dialogs.c:759
 msgid "Get User Info"
 msgstr "Felhasznl adatai"
 
-#: src/buddy.c:2646
+#: src/buddy.c:2704
 msgid "Import Buddy List"
 msgstr "Partner lista importlsa"
 
-#: src/buddy.c:2664
+#: src/buddy.c:2722
 msgid "Tools"
 msgstr "Eszkzk"
 
-#: src/buddy.c:2687
+#: src/buddy.c:2745
 msgid "Protocol Actions"
 msgstr "Protokol esemnyek"
 
-#: src/buddy.c:2693
+#: src/buddy.c:2751
 msgid "View System Log"
 msgstr "Napl megtekintse"
 
-#: src/buddy.c:2705
+#: src/buddy.c:2763
 msgid "Perl"
 msgstr "Perl"
 
-#: src/buddy.c:2708
+#: src/buddy.c:2766
 msgid "Load Script"
 msgstr "Script betltse"
 
-#: src/buddy.c:2712
+#: src/buddy.c:2770
 msgid "Unload All Scripts"
 msgstr "sszes script eltvoltsa"
 
-#: src/buddy.c:2716
+#: src/buddy.c:2774
 msgid "List Scripts"
 msgstr "Scriptek listja"
 
-#: src/buddy.c:2724
+#: src/buddy.c:2782
 msgid "Help"
 msgstr "Sg"
 
-#: src/buddy.c:2729
+#: src/buddy.c:2787
 msgid "Online Help"
 msgstr "Sg"
 
-#: src/buddy.c:2730
+#: src/buddy.c:2788
 msgid "Debug Window"
 msgstr "Nyomkvet ablak"
 
-#: src/buddy.c:2731
+#: src/buddy.c:2789
 msgid "About Gaim"
 msgstr "Gaim nvjegy"
 
-#: src/buddy.c:2749 src/prefs.c:2893
+#: src/buddy.c:2807 src/prefs.c:2905
 msgid "Buddy List"
 msgstr "Partner lista"
 
-#: src/buddy.c:2802
+#: src/buddy.c:2860
 msgid "Add a new Buddy"
 msgstr "j partner felvtele"
 
-#: src/buddy.c:2803
+#: src/buddy.c:2861
 msgid "Add a new Group"
 msgstr "j csoport felvtele"
 
-#: src/buddy.c:2804
+#: src/buddy.c:2862
 msgid "Remove selected Buddy/Group"
 msgstr "Kivlasztott partner/csoport trlse"
 
-#: src/buddy.c:2831
+#: src/buddy.c:2889
 msgid "Edit Buddies"
 msgstr "Partnerek szerkesztse"
 
-#: src/buddy.c:2874
+#: src/buddy.c:2932
 msgid "Gaim - Buddy List"
 msgstr "Gaim - Partner lista"
 
@@ -1606,10 +1993,6 @@
 msgid "Join Chat"
 msgstr "Csatlakozs csevegshez"
 
-#: src/buddy_chat.c:272
-msgid "Buddy Chat"
-msgstr "Csevegs partnerrel"
-
 #: src/buddy_chat.c:283
 msgid "Join Chat As:"
 msgstr "Csatlakozs mint:"
@@ -1628,8 +2011,8 @@
 msgid "Join"
 msgstr "Csatlakozs"
 
-#: src/buddy_chat.c:393 src/buddy_chat.c:396 src/buddy_chat.c:1321
-#: src/buddy_chat.c:1411
+#: src/buddy_chat.c:393 src/buddy_chat.c:396 src/buddy_chat.c:1328
+#: src/buddy_chat.c:1418
 msgid "Invite"
 msgstr "Invitl"
 
@@ -1637,7 +2020,7 @@
 msgid "Buddy"
 msgstr "Partner"
 
-#: src/buddy_chat.c:417 src/prefs.c:1994
+#: src/buddy_chat.c:417 src/prefs.c:2004
 msgid "Message"
 msgstr "zenet"
 
@@ -1645,251 +2028,247 @@
 msgid "Gaim - Invite Buddy Into Chat Room"
 msgstr "Gaim - Partner inivitlsa a szobba"
 
-#: src/buddy_chat.c:861
+#: src/buddy_chat.c:868
 msgid "Un-Ignore"
 msgstr "Vissza"
 
-#: src/buddy_chat.c:863 src/buddy_chat.c:1275
+#: src/buddy_chat.c:870 src/buddy_chat.c:1282
 msgid "Ignore"
 msgstr "tlp"
 
 #. don't remove them from ignored in case they re-enter
-#: src/buddy_chat.c:926 src/buddy_chat.c:1038 src/buddy_chat.c:1501
-#: src/buddy_chat.c:1534
+#: src/buddy_chat.c:933 src/buddy_chat.c:1045 src/buddy_chat.c:1508
+#: src/buddy_chat.c:1541
 #, c-format
 msgid "%d %s in room"
 msgstr "%d %s a szobban"
 
-#: src/buddy_chat.c:934
+#: src/buddy_chat.c:941
 #, c-format
 msgid "%s entered the room."
 msgstr "%s belpett a szobba."
 
-#: src/buddy_chat.c:1000
+#: src/buddy_chat.c:1007
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s ezentl %s nven szerepel"
 
-#: src/buddy_chat.c:1047
+#: src/buddy_chat.c:1054
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s elhagyta a szobt (%s)."
 
-#: src/buddy_chat.c:1049
+#: src/buddy_chat.c:1056
 #, c-format
 msgid "%s left the room."
 msgstr "%s elhagyta a szobt."
 
-#: src/buddy_chat.c:1148
+#: src/buddy_chat.c:1155
 msgid "Gaim - Group Chats"
 msgstr "Gaim - Csoportos csevegs"
 
-#: src/buddy_chat.c:1211
+#: src/buddy_chat.c:1218
 msgid "Topic:"
 msgstr "Tma:"
 
-#: src/buddy_chat.c:1252
+#: src/buddy_chat.c:1259
 msgid "0 people in room"
 msgstr "0 tartzkodnak a szobban"
 
-#: src/buddy_chat.c:1326 src/buddy_chat.c:1410
+#: src/buddy_chat.c:1333 src/buddy_chat.c:1417
 msgid "Whisper"
 msgstr "Pletyka"
 
-#: src/buddy_chat.c:1331 src/buddy_chat.c:1408 src/buddy_chat.c:1457
-#: src/conversation.c:2883
+#: src/buddy_chat.c:1338 src/buddy_chat.c:1415 src/buddy_chat.c:1464
+#: src/conversation.c:2908
 msgid "Send"
 msgstr "Kld"
 
-#: src/buddy_chat.c:1451 src/conversation.c:2860
+#: src/buddy_chat.c:1458 src/conversation.c:2885
 msgid "Block"
 msgstr "Tilt"
 
-#: src/buddy_chat.c:1453 src/conversation.c:2866 src/dialogs.c:424
+#: src/buddy_chat.c:1460 src/conversation.c:2891 src/dialogs.c:424
 #: src/dialogs.c:453
 msgid "Warn"
 msgstr "Figyelmeztet"
 
-#: src/conversation.c:416
+#: src/conversation.c:431
 msgid "Gaim - Save Conversation"
 msgstr "Gaim - Trsalgs mentse"
 
-#: src/conversation.c:477
+#: src/conversation.c:492
 msgid "Gaim - Insert Image"
 msgstr "Gaim - Kp beszrsa"
 
-#: src/conversation.c:1320
+#: src/conversation.c:1336
 msgid "Unable to send message: too large"
 msgstr "zenetet nem lehet elkldeni: tl nagy"
 
-#: src/conversation.c:1320 src/conversation.c:1324
+#: src/conversation.c:1336 src/conversation.c:1340
 msgid "Message Error"
 msgstr "zenet hiba"
 
-#: src/conversation.c:1324
+#: src/conversation.c:1340
 msgid "Unable to send message: Unknown reason"
 msgstr "zenetet nem lehet elkldeni: ismeretlen hiba"
 
-#: src/conversation.c:1543
+#: src/conversation.c:1559
 #, c-format
 msgid "Currently at %d, "
 msgstr "Jelenleg %d, "
 
-#: src/conversation.c:1551
+#: src/conversation.c:1567
 #, c-format
 msgid "Setting position to %d\n"
 msgstr "Pozci belltsa %d-(ra/re)\n"
 
-#: src/conversation.c:2154 src/prefs.c:1307
+#: src/conversation.c:2170 src/prefs.c:1308
 msgid "Bold Text"
 msgstr "Kvr szveg"
 
-#: src/conversation.c:2154
+#: src/conversation.c:2170
 msgid "Bold"
 msgstr "Kvr"
 
-#: src/conversation.c:2158
+#: src/conversation.c:2174
 msgid "Italics Text"
 msgstr "Dlt szveg"
 
-#: src/conversation.c:2159
+#: src/conversation.c:2175
 msgid "Italics"
 msgstr "Dlt"
 
-#: src/conversation.c:2162 src/prefs.c:1319
+#: src/conversation.c:2178 src/prefs.c:1320
 msgid "Underline Text"
 msgstr "Alhzott szveg"
 
-#: src/conversation.c:2163
+#: src/conversation.c:2179
 msgid "Underline"
 msgstr "Alhzott"
 
-#: src/conversation.c:2167 src/prefs.c:1325
+#: src/conversation.c:2183 src/prefs.c:1326
 msgid "Strike through Text"
 msgstr "thzott szveg"
 
-#: src/conversation.c:2167
+#: src/conversation.c:2183
 msgid "Strike"
 msgstr "thzott"
 
-#: src/conversation.c:2173
+#: src/conversation.c:2189
 msgid "Decrease font size"
 msgstr "Betmret cskkentse"
 
-#: src/conversation.c:2173
+#: src/conversation.c:2189
 msgid "Small"
 msgstr "Kicsi"
 
-#: src/conversation.c:2176
+#: src/conversation.c:2192
 msgid "Normal font size"
 msgstr "Norml mret"
 
-#: src/conversation.c:2176
+#: src/conversation.c:2192
 msgid "Normal"
 msgstr "Norml"
 
-#: src/conversation.c:2179
+#: src/conversation.c:2195
 msgid "Increase font size"
 msgstr "Betmret nvelse"
 
-#: src/conversation.c:2179
+#: src/conversation.c:2195
 msgid "Big"
 msgstr "Nagy"
 
-#: src/conversation.c:2186 src/dialogs.c:2883 src/dialogs.c:2907
+#: src/conversation.c:2202 src/dialogs.c:2883 src/dialogs.c:2907
 msgid "Select Font"
 msgstr "Bettpus vlaszts"
 
-#: src/conversation.c:2187
+#: src/conversation.c:2203
 msgid "Font"
 msgstr "Bettpus"
 
-#: src/conversation.c:2190 src/prefs.c:1355
+#: src/conversation.c:2206 src/prefs.c:1356
 msgid "Text Color"
 msgstr "Szveg szne"
 
-#: src/conversation.c:2191 src/conversation.c:2195
+#: src/conversation.c:2207 src/conversation.c:2211
 msgid "Color"
 msgstr "Szn"
 
-#: src/conversation.c:2195 src/prefs.c:1373
+#: src/conversation.c:2211 src/prefs.c:1374
 msgid "Background Color"
 msgstr "Httr szn"
 
-#: src/conversation.c:2202 src/dialogs.c:2506
+#: src/conversation.c:2218 src/dialogs.c:2506
 msgid "Insert Link"
 msgstr "Hivatkozs beszrsa"
 
-#: src/conversation.c:2203
+#: src/conversation.c:2219
 msgid "Link"
 msgstr "Hivatkozs"
 
-#: src/conversation.c:2206
+#: src/conversation.c:2222
 msgid "Insert smiley face"
 msgstr "Mosolyg arc beszrsa"
 
-#: src/conversation.c:2206
+#: src/conversation.c:2222
 msgid "Smiley"
 msgstr "Mosolyg"
 
-#: src/conversation.c:2209
+#: src/conversation.c:2225
 msgid "Insert IM Image"
 msgstr "IM kp beszrsa"
 
-#: src/conversation.c:2209
+#: src/conversation.c:2225
 msgid "Image"
 msgstr "Kp"
 
-#: src/conversation.c:2216
+#: src/conversation.c:2232
 msgid "Enable logging"
 msgstr "Naplzs bekapcsolsa"
 
-#: src/conversation.c:2217 src/prefs.c:254
+#: src/conversation.c:2233 src/prefs.c:254
 msgid "Logging"
 msgstr "Naplzs"
 
-#: src/conversation.c:2226
+#: src/conversation.c:2242
 msgid "Save Conversation"
 msgstr "Trsalgs mentse"
 
-#: src/conversation.c:2227 src/dialogs.c:1682 src/dialogs.c:1866
+#: src/conversation.c:2243 src/dialogs.c:1682 src/dialogs.c:1866
 #: src/dialogs.c:3220 src/dialogs.c:3908 src/dialogs.c:4785
 msgid "Save"
 msgstr "Ments"
 
-#: src/conversation.c:2231
-msgid "Enable sounds"
-msgstr "Hangok engedlyezse"
-
-#: src/conversation.c:2232
+#: src/conversation.c:2247 src/conversation.c:2248
 msgid "Sound"
 msgstr "Hang"
 
-#: src/conversation.c:2712
+#: src/conversation.c:2729
 msgid "Gaim - Conversations"
 msgstr "Gaim - Trsalgsok"
 
-#: src/conversation.c:2799
+#: src/conversation.c:2816
 msgid "Send message as: "
 msgstr "zenet kldse mint: "
 
-#: src/conversation.c:3428
+#: src/conversation.c:3453
 msgid "Gaim - Save Icon"
 msgstr "Gaim - Ikon mentse"
 
-#: src/conversation.c:3455
+#: src/conversation.c:3487
 msgid "Disable Animation"
 msgstr "Animci kikapcsolsa"
 
-#: src/conversation.c:3460
+#: src/conversation.c:3492
 msgid "Enable Animation"
 msgstr "Animci bekapcsolsa"
 
-#: src/conversation.c:3466
+#: src/conversation.c:3498
 msgid "Hide Icon"
 msgstr "Ikon elrejtse"
 
-#: src/conversation.c:3472
+#: src/conversation.c:3504
 msgid "Save Icon As..."
 msgstr "Ikon mentse mint"
 
@@ -2282,12 +2661,12 @@
 msgid "Gaim - Select Perl Script"
 msgstr "Gaim - Perl sciprt kivlasztsa"
 
-#: src/gaimrc.c:1130
+#: src/gaimrc.c:1136
 #, c-format
 msgid "Could not open config file %s."
 msgstr "Nem lehet a konfigurcis fjlt %s megnyitni."
 
-#: src/gaimrc.c:1131
+#: src/gaimrc.c:1137
 msgid "Preferences Error"
 msgstr "Preferencik hiba"
 
@@ -2300,6 +2679,11 @@
 msgid "g003: Error opening connection.\n"
 msgstr "g003: Hiba a kapcsolat megnyitsa kzben.\n"
 
+#: src/module.c:106 src/module.c:112 src/module.c:122
+#, fuzzy
+msgid "Plugin Error"
+msgstr "Bejelentkezsi hiba"
+
 #: src/multi.c:454
 msgid "Gaim - Load Buddy Icon"
 msgstr "Gaim - Ikon betltse"
@@ -2312,7 +2696,7 @@
 msgid "Browse"
 msgstr "Tallz"
 
-#: src/multi.c:513 src/prefs.c:1547
+#: src/multi.c:513 src/prefs.c:1548
 msgid "Reset"
 msgstr "Trl"
 
@@ -2424,7 +2808,7 @@
 msgid "Connection Error"
 msgstr "Hiba a kapcsolatban"
 
-#: src/perl.c:856
+#: src/perl.c:875
 msgid "Perl Scripts"
 msgstr "Perl scriptek"
 
@@ -2485,9 +2869,9 @@
 msgid "General Options"
 msgstr "ltalnos belltsok"
 
-#: src/prefs.c:200 src/prefs.c:383 src/prefs.c:551 src/prefs.c:666
-#: src/prefs.c:920 src/prefs.c:1070 src/prefs.c:1295 src/prefs.c:1617
-#: src/prefs.c:1891 src/prefs.c:2324
+#: src/prefs.c:200 src/prefs.c:384 src/prefs.c:552 src/prefs.c:667
+#: src/prefs.c:921 src/prefs.c:1071 src/prefs.c:1296 src/prefs.c:1629
+#: src/prefs.c:1901 src/prefs.c:2334
 msgid "All options take effect immediately unless otherwise noted."
 msgstr "Minden opci azonnal rvnybe lp mg msok figyelmeztetnek."
 
@@ -2561,8 +2945,8 @@
 msgstr "Bngsz?"
 
 #: src/prefs.c:291
-msgid "KFM"
-msgstr "KFM"
+msgid "Konqueror"
+msgstr ""
 
 #: src/prefs.c:292
 msgid "Opera"
@@ -2572,403 +2956,409 @@
 msgid "Netscape"
 msgstr "Netscape"
 
-#: src/prefs.c:296
+#: src/prefs.c:294
+msgid "Mozilla"
+msgstr ""
+
+#: src/prefs.c:297
 msgid "Pop up new window by default"
 msgstr "j ablak el?ugrik (alaprtelmezsben)"
 
-#: src/prefs.c:303
+#: src/prefs.c:304
 msgid "GNOME URL Handler"
 msgstr "GNOME URL kezel?"
 
-#: src/prefs.c:305
+#: src/prefs.c:306
 msgid "Galeon"
 msgstr "Galeon"
 
-#: src/prefs.c:306
-msgid "Manual"
-msgstr "Egyni"
-
-#: src/prefs.c:375
+#: src/prefs.c:307
+#, c-format
+msgid "Manual (%s for URL)"
+msgstr ""
+
+#: src/prefs.c:376
 msgid "Proxy Options"
 msgstr "Proxy belltsok"
 
-#: src/prefs.c:387
+#: src/prefs.c:388
 msgid ""
 "Not all protocols can use these proxy options. Please see the README file "
 "for details."
 msgstr ""
-"Nem mindegyik protokol tudja ezeket a proxy belltsokat hasznlni. Olvasd el a README fjlt "
-"a rszletekrt."
-
-#: src/prefs.c:392
+"Nem mindegyik protokol tudja ezeket a proxy belltsokat hasznlni. Olvasd "
+"el a README fjlt a rszletekrt."
+
+#: src/prefs.c:393
 msgid "Proxy Type"
 msgstr "Proxy tpusa"
 
-#: src/prefs.c:404
+#: src/prefs.c:405
 msgid "Proxy Server"
 msgstr "Proxy kiszolgl"
 
-#: src/prefs.c:407
+#: src/prefs.c:408
 msgid "No Proxy"
 msgstr "Nincs Proxy"
 
-#: src/prefs.c:419
+#: src/prefs.c:420
 msgid "SOCKS 4"
 msgstr "SOCKS 4"
 
-#: src/prefs.c:429
+#: src/prefs.c:430
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
-#: src/prefs.c:438
+#: src/prefs.c:439
 msgid "HTTP"
 msgstr "HTTP"
 
-#: src/prefs.c:462
+#: src/prefs.c:463
 msgid "Host"
 msgstr "Gpnv"
 
-#: src/prefs.c:478
+#: src/prefs.c:479
 msgid "Port"
 msgstr "Port"
 
-#: src/prefs.c:495
+#: src/prefs.c:496
 msgid "User"
 msgstr "Felhasznl"
 
-#: src/prefs.c:511
+#: src/prefs.c:512
 msgid "Password"
 msgstr "Jelsz"
 
-#: src/prefs.c:543
+#: src/prefs.c:544
 msgid "Buddy List Options"
 msgstr "Partnet lista belltsai"
 
-#: src/prefs.c:555
+#: src/prefs.c:556
 msgid "Buddy List Window"
 msgstr "Partner lista"
 
-#: src/prefs.c:568
+#: src/prefs.c:569
 msgid "Tab Placement:"
 msgstr "Fl elhelyezse"
 
-#: src/prefs.c:572 src/prefs.c:1003 src/prefs.c:1153
+#: src/prefs.c:573 src/prefs.c:1004 src/prefs.c:1154
 msgid "Top"
 msgstr "Fell"
 
-#: src/prefs.c:573 src/prefs.c:1005 src/prefs.c:1155
+#: src/prefs.c:574 src/prefs.c:1006 src/prefs.c:1156
 msgid "Bottom"
 msgstr "Alul"
 
-#: src/prefs.c:585
+#: src/prefs.c:586
 msgid "Hide IM/Info/Chat buttons"
 msgstr "IM/Informci/Csevegs gombok elrejtse"
 
-#: src/prefs.c:587
+#: src/prefs.c:588
 msgid "Automatically show buddy list on sign on"
 msgstr "Partner lista automatikus megjelentse bejelentkezskor"
 
-#: src/prefs.c:589
+#: src/prefs.c:590
 msgid "Display Buddy List near applet"
 msgstr "Partner lista megjelentse az applet mellett"
 
-#: src/prefs.c:592
+#: src/prefs.c:593
 msgid "Save Window Size/Position"
 msgstr "Ablak mretek/pozck mentse"
 
-#: src/prefs.c:595
+#: src/prefs.c:596
 msgid "Show pictures on buttons"
 msgstr "Kpek mutatsa gombokon"
 
-#: src/prefs.c:599
+#: src/prefs.c:600
 msgid "Raise Buddy List on Signons and Signoffs"
 msgstr "Partner lista megjelentse be/kijelentkezskor"
 
-#: src/prefs.c:601
+#: src/prefs.c:602
 msgid "Group Displays"
 msgstr "Csoportok megjelentsei"
 
-#: src/prefs.c:613
+#: src/prefs.c:614
 msgid "Hide groups with no online buddies"
 msgstr "Elrhet partnerek nlkli csoportok elrejtse"
 
-#: src/prefs.c:619
+#: src/prefs.c:620
 msgid "Show numbers in groups"
 msgstr "Szmok megjelentse a csoportokban"
 
-#: src/prefs.c:621
+#: src/prefs.c:622
 msgid "Buddy Displays"
 msgstr "Partnerek megjelentsei"
 
-#: src/prefs.c:633
+#: src/prefs.c:634
 msgid "Show buddy type icons"
 msgstr "Partner tpusnak megfelel? ikonok hasznlata"
 
-#: src/prefs.c:634
+#: src/prefs.c:635
 msgid "Show warning levels"
 msgstr "Figyelmeztetsi szint megjelentse"
 
-#: src/prefs.c:640
+#: src/prefs.c:641
 msgid "Show idle times"
 msgstr "Inaktv id? megjelentse"
 
-#: src/prefs.c:641
+#: src/prefs.c:642
 msgid "Grey idle buddies"
 msgstr "Inaktv partnerek szrkn"
 
-#: src/prefs.c:658
+#: src/prefs.c:659
 msgid "Conversation Options"
 msgstr "Trsalgsi belltsok"
 
-#: src/prefs.c:670
+#: src/prefs.c:671
 msgid "Keyboard Options"
 msgstr "Billenytzet belltsai"
 
-#: src/prefs.c:682
+#: src/prefs.c:683
 msgid "Enter sends message"
 msgstr "Enter zenetet kld"
 
-#: src/prefs.c:683
+#: src/prefs.c:684
 msgid "Control-Enter sends message"
 msgstr "Control-Enter zenet kld"
 
-#: src/prefs.c:684
+#: src/prefs.c:685
 msgid "Escape closes window"
 msgstr "Escape ablakot bezrja"
 
-#: src/prefs.c:685
+#: src/prefs.c:686
 msgid "Control-W closes window"
 msgstr "Control-W ablak bezrsa"
 
-#: src/prefs.c:691
+#: src/prefs.c:692
 msgid "Control-{B/I/U/S} inserts HTML tags"
 msgstr "Control-{B/I/U/S} HTML cmkket szr be"
 
-#: src/prefs.c:692
+#: src/prefs.c:693
 msgid "Control-(number) inserts smileys"
 msgstr "Control-(szm) mosoly beszrsa"
 
-#: src/prefs.c:693
+#: src/prefs.c:694
 msgid "F2 toggles timestamp display"
 msgstr "F2-vel id?pont formtum vltsa"
 
-#: src/prefs.c:695
+#: src/prefs.c:696
 msgid "Display and General Options"
 msgstr "ltalnos s megjelentsi belltsok"
 
-#: src/prefs.c:707
+#: src/prefs.c:708
 msgid "Show graphical smileys"
 msgstr "Mosoly megjelentse kpknt"
 
-#: src/prefs.c:708
+#: src/prefs.c:709
 msgid "Show timestamp on messages"
 msgstr "Id?pont megjelentse zeneteknl"
 
-#: src/prefs.c:709
+#: src/prefs.c:710
 msgid "Show URLs as links"
 msgstr "URL-ek mutatsa hivatkozsknt"
 
-#: src/prefs.c:710
+#: src/prefs.c:711
 msgid "Highlight misspelled words"
 msgstr "Helytelen szavak kiemelse"
 
-#: src/prefs.c:711 src/prefs.c:1913
+#: src/prefs.c:712 src/prefs.c:1923
 msgid "Sending messages removes away status"
 msgstr "zenet kldse megsznteti a tvollt llapott"
 
-#: src/prefs.c:712 src/prefs.c:1926
+#: src/prefs.c:713 src/prefs.c:1936
 msgid "Queue new messages when away"
 msgstr "j zenetk vrakozsi sorba kerljenek ha tvol van"
 
-#: src/prefs.c:718
+#: src/prefs.c:719
 msgid "Ignore colors"
 msgstr "Szinek figyelmenkvl hagysa"
 
-#: src/prefs.c:719
+#: src/prefs.c:720
 msgid "Ignore font faces"
 msgstr "Bettpus figyelmenkvl hagysa"
 
-#: src/prefs.c:720
-msgid "Ignore font sizes"
-msgstr "Betmretek figyelmenkivl hagysa"
-
 #: src/prefs.c:721
+msgid "Ignore font sizes"
+msgstr "Betmretek figyelmenkivl hagysa"
+
+#: src/prefs.c:722
 msgid "Ignore TiK Automated Messages"
 msgstr "TiK zenetek figyelmenkvl hagysa"
 
-#: src/prefs.c:722 src/prefs.c:1911
+#: src/prefs.c:723 src/prefs.c:1921
 msgid "Ignore new conversations when away"
 msgstr "j trsalgs figyelmenkvl hagysa ha tvol van"
 
-#: src/prefs.c:911
+#: src/prefs.c:912
 msgid "IM Options"
 msgstr "IM belltsok"
 
-#: src/prefs.c:924 src/prefs.c:2909
+#: src/prefs.c:925 src/prefs.c:2921
 msgid "IM Window"
 msgstr "IM ablak"
 
-#: src/prefs.c:940 src/prefs.c:1090
+#: src/prefs.c:941 src/prefs.c:1091
 msgid "Show buttons as: "
 msgstr "Gombok megjelentse: "
 
-#: src/prefs.c:944 src/prefs.c:1095
+#: src/prefs.c:945 src/prefs.c:1096
 msgid "Pictures And Text"
 msgstr "Kpek s szveg"
 
-#: src/prefs.c:945 src/prefs.c:1097
+#: src/prefs.c:946 src/prefs.c:1098
 msgid "Pictures"
 msgstr "Kpek"
 
-#: src/prefs.c:946 src/prefs.c:1098
+#: src/prefs.c:947 src/prefs.c:1099
 msgid "Text"
 msgstr "Szveg"
 
-#: src/prefs.c:957
+#: src/prefs.c:958
 msgid "Show all conversations in one tabbed window"
 msgstr "Minden trsalgs megjelentse egy ablakban"
 
-#: src/prefs.c:959
+#: src/prefs.c:960
 msgid "Show chats in the same tabbed window"
 msgstr "Csevegsek megjelentse ugyabban az ablakban"
 
-#: src/prefs.c:966 src/prefs.c:1118
+#: src/prefs.c:967 src/prefs.c:1119
 msgid "Raise windows on events"
 msgstr "Ablak megjelentse esemnyek bekvetkeztekor"
 
-#: src/prefs.c:967
+#: src/prefs.c:968
 msgid "Show logins in window"
 msgstr "Bejelentkezsek megjelentse ablakban"
 
-#: src/prefs.c:968
-msgid "Show aliases in tabs/titles"
+#: src/prefs.c:969
+#, fuzzy
+msgid "Show aliases in tabs/titles/ticker"
 msgstr "lnevek megjelentse a cmben/fleken"
 
-#: src/prefs.c:969
+#: src/prefs.c:970
 msgid "Hide window on send"
 msgstr "Ablak elrejtse kldskor"
 
-#: src/prefs.c:971 src/prefs.c:1121
+#: src/prefs.c:972 src/prefs.c:1122
 msgid "Window Sizes"
 msgstr "Ablak mretek"
 
-#: src/prefs.c:979 src/prefs.c:1129
+#: src/prefs.c:980 src/prefs.c:1130
 msgid "New window width:"
 msgstr "j ablak szlessge:"
 
-#: src/prefs.c:980 src/prefs.c:1130
+#: src/prefs.c:981 src/prefs.c:1131
 msgid "New window height:"
 msgstr "j ablak magassga:"
 
-#: src/prefs.c:981 src/prefs.c:1131
+#: src/prefs.c:982 src/prefs.c:1132
 msgid "Entry widget height:"
 msgstr "Input doboz magassga:"
 
-#: src/prefs.c:983 src/prefs.c:1133
+#: src/prefs.c:984 src/prefs.c:1134
 msgid "Tab Placement"
 msgstr "Fl elhelyezkedse"
 
-#: src/prefs.c:1012 src/prefs.c:1162
+#: src/prefs.c:1013 src/prefs.c:1163
 msgid "Left"
 msgstr "Bal oldalon"
 
-#: src/prefs.c:1014 src/prefs.c:1164
+#: src/prefs.c:1015 src/prefs.c:1165
 msgid "Right"
 msgstr "Jobb oldalon"
 
-#: src/prefs.c:1018
+#: src/prefs.c:1019
 msgid "Buddy Icons"
 msgstr "Ikonok"
 
-#: src/prefs.c:1030
+#: src/prefs.c:1031
 msgid "Hide Buddy Icons"
 msgstr "Ikon elrejtse"
 
-#: src/prefs.c:1036
+#: src/prefs.c:1037
 msgid "Disable Buddy Icon Animation"
 msgstr "Ikon animci tiltsa"
 
-#: src/prefs.c:1062
+#: src/prefs.c:1063
 msgid "Chat Options"
 msgstr "Csevegs belltsai"
 
-#: src/prefs.c:1074
+#: src/prefs.c:1075
 msgid "Group Chat Window"
 msgstr "Csoportos cseveg ablak"
 
-#: src/prefs.c:1109
+#: src/prefs.c:1110
 msgid "Show all chats in one tabbed window"
 msgstr "Minden egy ablakban trtn megjelentse"
 
-#: src/prefs.c:1111
+#: src/prefs.c:1112
 msgid "Show conversations in the same tabbed window"
 msgstr "Trsalgsok megjelents ugyanabban az ablakban"
 
-#: src/prefs.c:1119
+#: src/prefs.c:1120
 msgid "Show people joining/leaving in window"
 msgstr "Csatlakoz=kilp pertnerek mutatsa ablakban"
 
-#: src/prefs.c:1167
+#: src/prefs.c:1168
 msgid "Tab Completion"
 msgstr "Kiegszts"
 
-#: src/prefs.c:1179
+#: src/prefs.c:1180
 msgid "Tab-Complete Nicks"
 msgstr "Becenv kiegsztse TAB-al"
 
-#: src/prefs.c:1185
+#: src/prefs.c:1186
 msgid "Old-Style Tab Completion"
 msgstr "Rgi stlus kiegszts TAB-al"
 
-#: src/prefs.c:1287 src/prefs.c:2919
+#: src/prefs.c:1288 src/prefs.c:2931
 msgid "Font Options"
 msgstr "Bettpusok belltsa"
 
-#: src/prefs.c:1313
+#: src/prefs.c:1314
 msgid "Italic Text"
 msgstr "Dlt szveg"
 
-#: src/prefs.c:1357 src/prefs.c:1375 src/prefs.c:1397
+#: src/prefs.c:1358 src/prefs.c:1376 src/prefs.c:1398
 msgid "Select"
 msgstr "Kivlaszt"
 
-#: src/prefs.c:1395
+#: src/prefs.c:1396
 msgid "Font Face for Text"
 msgstr "Szveg bettpusa"
 
-#: src/prefs.c:1410
+#: src/prefs.c:1411
 msgid "Font Size for Text"
 msgstr "Szveg betmrete"
 
-#: src/prefs.c:1507
+#: src/prefs.c:1508
 msgid "Gaim - Sound Configuration"
 msgstr "Gaim - Hangok belltsa"
 
-#: src/prefs.c:1542
+#: src/prefs.c:1543
 msgid "Test"
 msgstr "Prba"
 
-#: src/prefs.c:1552
+#: src/prefs.c:1553
 msgid "Choose..."
 msgstr "Kivlaszt..."
 
-#: src/prefs.c:1609
+#: src/prefs.c:1621
 msgid "Sound Options"
 msgstr "Hangok belltsa"
 
-#: src/prefs.c:1637
+#: src/prefs.c:1649
 msgid "No sounds when you log in"
 msgstr "Nincs hang bejelentkezskor"
 
-#: src/prefs.c:1643 src/prefs.c:1912
+#: src/prefs.c:1655 src/prefs.c:1922
 msgid "Sounds while away"
 msgstr "Hang lejtszsa mialatt tvol van"
 
-#: src/prefs.c:1653
+#: src/prefs.c:1665
 msgid "Sound method"
 msgstr "Lejtszs mdja"
 
-#: src/prefs.c:1727
+#: src/prefs.c:1739
 #, c-format
 msgid ""
 "Sound command\n"
@@ -2977,103 +3367,103 @@
 "Parancs\n"
 "(%s fjl nv megadshoz)"
 
-#: src/prefs.c:1739
+#: src/prefs.c:1751
 msgid "Sound played when:"
 msgstr "Hang lejtszsa akkor, ha:"
 
-#: src/prefs.c:1883 src/prefs.c:2941
+#: src/prefs.c:1893 src/prefs.c:2953
 msgid "Away Messages"
 msgstr "Tvollt zenetek"
 
-#: src/prefs.c:1920
+#: src/prefs.c:1930
 msgid "Don't send auto-response"
 msgstr "Nem kld automatikus vlaszokat"
 
-#: src/prefs.c:1921
+#: src/prefs.c:1931
 msgid "Only send auto-response when idle"
 msgstr "Automatikus vlaszok kldse csak inaktv llapotban"
 
-#: src/prefs.c:1936
+#: src/prefs.c:1946
 msgid "Time between sending auto-responses (in seconds):"
 msgstr "Id automatikus vlaszok kldse kztt (msodpercben):"
 
-#: src/prefs.c:1951
+#: src/prefs.c:1961
 msgid "Auto Away after"
 msgstr "Automatikus tvollt"
 
-#: src/prefs.c:1965
+#: src/prefs.c:1975
 msgid "minutes using"
 msgstr "perc utn a kvetkez?vel"
 
-#: src/prefs.c:1978
+#: src/prefs.c:1988
 msgid "Messages"
 msgstr "zenetek"
 
-#: src/prefs.c:2035
+#: src/prefs.c:2045
 msgid "Edit"
 msgstr "Szerkeszt"
 
-#: src/prefs.c:2039
+#: src/prefs.c:2049
 msgid "Make Away"
 msgstr "Nincs a gpnl"
 
-#: src/prefs.c:2316
+#: src/prefs.c:2326
 msgid "Privacy Options"
 msgstr "Biztonsgi belltsok"
 
-#: src/prefs.c:2332
+#: src/prefs.c:2342
 msgid "Set privacy for:"
 msgstr "Biztonsgi belltsa a kvetkez?re"
 
-#: src/prefs.c:2351
+#: src/prefs.c:2361
 msgid "Allow all users to contact me"
 msgstr "Mindenki kapcsolatba lphet velem"
 
-#: src/prefs.c:2352
+#: src/prefs.c:2362
 msgid "Allow only the users below"
 msgstr "Csak a kvetkez felhasznlk engedlyezse"
 
-#: src/prefs.c:2354
+#: src/prefs.c:2364
 msgid "Allow List"
 msgstr "Engedlyezettek"
 
-#: src/prefs.c:2385
+#: src/prefs.c:2395
 msgid "Deny all users"
 msgstr "Minden felhasznl elutastsa"
 
-#: src/prefs.c:2386
+#: src/prefs.c:2396
 msgid "Block the users below"
 msgstr "A kvetkez felhasznlk tiltsa"
 
-#: src/prefs.c:2388
+#: src/prefs.c:2398
 msgid "Block List"
 msgstr "Tilt lista"
 
-#: src/prefs.c:2483
+#: src/prefs.c:2493
 msgid "Gaim - Preferences"
 msgstr "Gaim - Preferencik"
 
-#: src/prefs.c:2566
+#: src/prefs.c:2576
 msgid "Gaim debug output window"
 msgstr "Gaim nyomkvet ablak"
 
-#: src/prefs.c:2875
+#: src/prefs.c:2887
 msgid "General"
 msgstr "ltalnos"
 
-#: src/prefs.c:2880
+#: src/prefs.c:2892
 msgid "Proxy"
 msgstr "Proxy"
 
-#: src/prefs.c:2904
+#: src/prefs.c:2916
 msgid "Conversations"
 msgstr "Trsalgsok"
 
-#: src/prefs.c:2930
+#: src/prefs.c:2942
 msgid "Sounds"
 msgstr "Hangok"
 
-#: src/prefs.c:2952
+#: src/prefs.c:2964
 msgid "Privacy"
 msgstr "Biztonsg"
 
@@ -3084,8 +3474,8 @@
 "not the same version I cannot safely tell you which one it was. Needless to "
 "say, it was not successfully loaded."
 msgstr ""
-"A olyan protokolt prblt meg betlteni melynek verzija nem egyezik meg "
-"a program verzival."
+"A olyan protokolt prblt meg betlteni melynek verzija nem egyezik meg a "
+"program verzival."
 
 #: src/prpl.c:74
 msgid "Protocol Error"
@@ -3116,12 +3506,12 @@
 msgid "Open Mail"
 msgstr "Level megnyitsa"
 
-#: src/prpl.c:564
+#: src/prpl.c:570
 #, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s%s"
 msgstr "%s%s%s%s felvette %s-t a partnerei kzz %s%s%s"
 
-#: src/prpl.c:572
+#: src/prpl.c:578
 msgid ""
 "\n"
 "\n"
@@ -3131,21 +3521,21 @@
 "\n"
 "Fel kvnod venni ezt a partnert a listdra?"
 
-#: src/prpl.c:615
+#: src/prpl.c:621
 msgid ""
 "You do not currently have any protocols available that are able to register "
 "new accounts."
 msgstr "Nem rendelkezik j fik regisztrlshoz szksges protokollal."
 
-#: src/prpl.c:652
+#: src/prpl.c:658
 msgid "Gaim - Registration"
 msgstr "Gaim - Regisztrci"
 
-#: src/prpl.c:667
+#: src/prpl.c:673
 msgid "Registration Information"
 msgstr "Regisztrcis adatok"
 
-#: src/prpl.c:684
+#: src/prpl.c:690
 msgid "Register"
 msgstr "Regisztrci"
 
@@ -3177,3 +3567,56 @@
 #: src/server.c:1076
 msgid "More Info"
 msgstr "Tovbbi informci"
+
+#: src/sound.c:63
+#, fuzzy
+msgid "Buddy logs in"
+msgstr "Buddy Ikon"
+
+#: src/sound.c:64
+#, fuzzy
+msgid "Buddy logs out"
+msgstr "Partner lista"
+
+#: src/sound.c:65
+#, fuzzy
+msgid "Message received"
+msgstr "zenet hiba"
+
+#: src/sound.c:66
+msgid "Message received begins conversation"
+msgstr ""
+
+#: src/sound.c:67
+#, fuzzy
+msgid "Message sent"
+msgstr "zenetek"
+
+#: src/sound.c:68
+msgid "Person enters chat"
+msgstr ""
+
+#: src/sound.c:69
+msgid "Person leaves chat"
+msgstr ""
+
+#: src/sound.c:70
+msgid "You talk in chat"
+msgstr ""
+
+#: src/sound.c:71
+msgid "Others talk in chat"
+msgstr ""
+
+#: src/sound.c:74
+msgid "Someone says your name in chat"
+msgstr ""
+
+#~ msgid "Enable sounds"
+#~ msgstr "Hangok engedlyezse"
+
+#~ msgid "KFM"
+#~ msgstr "KFM"
+
+#~ msgid "Manual"
+#~ msgstr "Egyni"
--- a/po/it.po	Tue Jul 02 05:41:30 2002 +0000
+++ b/po/it.po	Tue Jul 02 05:42:26 2002 +0000
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Gaim 0.53\n"
-"POT-Creation-Date: 2002-04-11 22:46-0700\n"
+"POT-Creation-Date: 2002-06-25 00:10-0400\n"
 "PO-Revision-Date: 2002-03-13 19:26+0100\n"
 "Last-Translator: Salvatore di Maggio <titanicus@libero.it>\n"
 "Language-Team: Italian <it@li.org>\n"
@@ -13,6 +13,115 @@
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: plugins/chatlist.c:67 src/buddy_chat.c:272
+msgid "Buddy Chat"
+msgstr "Ciatta con Contatto"
+
+#: plugins/chatlist.c:166 plugins/chatlist.c:168 plugins/chatlist.c:407
+#: plugins/chatlist.c:409
+#, fuzzy
+msgid "Gaim Chat"
+msgstr "Gaim - Chat"
+
+#: plugins/chatlist.c:339 src/about.c:165 src/aim.c:320 src/buddy.c:2716
+#: src/buddy_chat.c:1322 src/buddy_chat.c:1419 src/buddy_chat.c:1449
+#: src/conversation.c:2864 src/dialogs.c:567 src/dialogs.c:3899
+#: src/multi.c:1069 src/plugins.c:277 src/prefs.c:2547 src/prpl.c:438
+#: src/prpl.c:685 src/server.c:1072
+msgid "Close"
+msgstr "Chiudi"
+
+#: plugins/chatlist.c:344
+#, fuzzy
+msgid "Chat Rooms"
+msgstr "Opzioni di Chat"
+
+#: plugins/chatlist.c:363
+msgid "Refresh"
+msgstr ""
+
+#. Put the buttons in the box
+#: plugins/chatlist.c:364 src/buddy.c:492 src/buddy.c:2827
+#: src/buddy_chat.c:1454 src/conversation.c:2389 src/conversation.c:2879
+#: src/dialogs.c:932 src/dialogs.c:1114 src/dialogs.c:2095 src/multi.c:1053
+#: src/prefs.c:2041 src/prefs.c:2383 src/prefs.c:2417
+msgid "Add"
+msgstr "Aggiungi"
+
+#: plugins/chatlist.c:365 src/buddy.c:494 src/buddy.c:2829
+#: src/buddy_chat.c:1456 src/conversation.c:2375 src/conversation.c:2876
+#: src/prefs.c:2055 src/prefs.c:2387 src/prefs.c:2421
+msgid "Remove"
+msgstr "Elimina"
+
+#: plugins/chatlist.c:388
+msgid "List of available chats"
+msgstr ""
+
+#: plugins/chatlist.c:398
+msgid "List of subscribed chats"
+msgstr ""
+
+#: plugins/gtik.c:699
+msgid "Gnome Stock Ticker Properties"
+msgstr ""
+
+#: plugins/gtik.c:711
+msgid "Update Frequency in min"
+msgstr ""
+
+#: plugins/gtik.c:727
+msgid "Enter symbols delimited with \"+\" in the box below."
+msgstr ""
+
+#. OUTPUT FORMAT and SCROLL DIRECTION
+#: plugins/gtik.c:737
+msgid "Check this box to display only symbols and price:"
+msgstr ""
+
+#: plugins/gtik.c:738
+msgid "Check this box to scroll left to right:"
+msgstr ""
+
+#: plugins/gtik.c:974
+#, fuzzy
+msgid "(No"
+msgstr "No"
+
+#: plugins/gtik.c:975
+#, fuzzy
+msgid "Change"
+msgstr "Canale:"
+
+#: src/protocols/gg/gg.c:71 src/protocols/msn/msn.c:1919
+msgid "Available"
+msgstr "Presente"
+
+#: src/protocols/gg/gg.c:72
+msgid "Available for friends only"
+msgstr "Presente solo per gli amici"
+
+#: src/applet.c:197 src/buddy.c:497 src/buddy.c:2582 src/buddy.c:2727
+#: src/protocols/gg/gg.c:73 src/protocols/jabber/jabber.c:1118
+msgid "Away"
+msgstr "Assente"
+
+#: src/protocols/gg/gg.c:74
+msgid "Away for friends only"
+msgstr "Assente solo per gli amici"
+
+#: src/protocols/gg/gg.c:75
+msgid "Invisible"
+msgstr "Invisibile"
+
+#: src/protocols/gg/gg.c:76
+msgid "Invisible for friends only"
+msgstr "Invisibile solo per gli amici"
+
+#: src/protocols/gg/gg.c:77 src/protocols/jabber/jabber.c:1114
+msgid "Unavailable"
+msgstr "Occupato"
+
 #: src/protocols/gg/gg.c:182
 msgid "Unable to resolve hostname."
 msgstr "Nome host sconosciuto."
@@ -43,7 +152,7 @@
 msgid "Unknown Error Code."
 msgstr "Codice di errore sconosciuto."
 
-#: src/protocols/gg/gg.c:302
+#: src/protocols/gg/gg.c:302 src/protocols/msn/msn.c:2050
 #, c-format
 msgid "Status: %s"
 msgstr "Stato: %s"
@@ -170,7 +279,7 @@
 msgstr "Sesso :9"
 
 #. Line 5
-#: src/dialogs.c:1582 src/dialogs.c:2290 src/protocols/gg/gg.c:729
+#: src/dialogs.c:1624 src/dialogs.c:2332 src/protocols/gg/gg.c:729
 msgid "City"
 msgstr "Citt"
 
@@ -249,7 +358,12 @@
 msgid "Directory Search"
 msgstr "Cerca directory"
 
-#: src/dialogs.c:1699 src/protocols/gg/gg.c:1160 src/protocols/gg/gg.c:1177
+#.
+#. } else if (!strcmp(act, _("Set Dir Info"))) {
+#. show_set_dir(gc);
+#.
+#: src/dialogs.c:1741 src/protocols/gg/gg.c:1160 src/protocols/gg/gg.c:1177
+#: src/protocols/jabber/jabber.c:3748 src/protocols/jabber/jabber.c:3761
 msgid "Change Password"
 msgstr "Cambia password"
 
@@ -270,8 +384,8 @@
 msgstr "Spedisci il messaggio attraverso il server"
 
 #: src/protocols/icq/gaim_icq.c:469 src/protocols/irc/irc.c:1851
-#: src/protocols/jabber/jabber.c:2112 src/protocols/oscar/oscar.c:3436
-#: src/protocols/toc/toc.c:1216
+#: src/protocols/jabber/jabber.c:2860 src/protocols/oscar/oscar.c:3593
+#: src/protocols/toc/toc.c:1219
 msgid "Get Info"
 msgstr "Prendi informazioni"
 
@@ -309,7 +423,7 @@
 "connection?"
 msgstr ""
 
-#: src/protocols/irc/irc.c:1001
+#: src/protocols/irc/irc.c:1001 src/protocols/msn/msn.c:315
 msgid "Unable to write"
 msgstr "Impossibile scrivere"
 
@@ -336,7 +450,7 @@
 msgid "Channel:"
 msgstr "Canale:"
 
-#: src/multi.c:547 src/protocols/irc/irc.c:1675
+#: src/multi.c:549 src/protocols/irc/irc.c:1675
 msgid "Password:"
 msgstr "Password:"
 
@@ -345,174 +459,228 @@
 msgid "DCC Chat"
 msgstr "Chat"
 
-#: src/protocols/jabber/jabber.c:699
-msgid "Unavailable"
-msgstr "Occupato"
-
-#: src/applet.c:293 src/buddy.c:493 src/buddy.c:2508 src/buddy.c:2644
-#: src/protocols/jabber/jabber.c:703
-msgid "Away"
-msgstr "Assente"
-
-#: src/buddy.c:2801 src/protocols/jabber/jabber.c:705
-#: src/protocols/jabber/jabber.c:723
+#: src/protocols/jabber/jabber.c:942
+msgid "Incorrect current password! Password NOT Changed!"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:943 src/protocols/jabber/jabber.c:948
+#, fuzzy
+msgid "Password Change Error!"
+msgstr "Gaim - Cambio password"
+
+#: src/protocols/jabber/jabber.c:947
+msgid "New password same as old password! Password NOT Changed!"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1092
+#, fuzzy
+msgid "Unknown"
+msgstr "ICQ sconosciuto"
+
+#: src/buddy.c:2887 src/protocols/jabber/jabber.c:1120
+#: src/protocols/jabber/jabber.c:1138
 msgid "Online"
 msgstr "Presente"
 
-#: src/protocols/jabber/jabber.c:707
+#: src/protocols/jabber/jabber.c:1122
 msgid "Extended Away"
 msgstr "Assente ovunque"
 
-#: src/protocols/jabber/jabber.c:709
+#: src/protocols/jabber/jabber.c:1124
 msgid "Do Not Disturb"
 msgstr "Non disturbare"
 
-#: src/protocols/jabber/jabber.c:1042
+#: src/protocols/jabber/jabber.c:1434
+#, c-format
+msgid "Error %s: %s"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1437
+#, fuzzy
+msgid "Unknown Error in presence"
+msgstr "Codice di errore sconosciuto."
+
+#: src/protocols/jabber/jabber.c:1607
+#, fuzzy, c-format
+msgid "The user %s wants to add you to their buddy list."
+msgstr ""
+"\n"
+"\n"
+"Vuoi aggiungerli alla tua lista dei contatti?"
+
+#: src/protocols/jabber/jabber.c:1632
 #, fuzzy
 msgid "No such user"
 msgstr "Il server non esiste"
 
-#: src/protocols/jabber/jabber.c:1044
+#: src/protocols/jabber/jabber.c:1634 src/protocols/jabber/jabber.c:2341
+#: src/protocols/jabber/jabber.c:2506
 #, fuzzy
 msgid "Jabber Error"
 msgstr "Errore messaggio"
 
-#: src/dialogs.c:845 src/protocols/jabber/jabber.c:1124
+#: src/dialogs.c:887 src/protocols/jabber/jabber.c:1719
+#: src/protocols/msn/msn.c:1110
 msgid "Buddies"
 msgstr "Contatti"
 
-#: src/protocols/jabber/jabber.c:1188
+#: src/protocols/jabber/jabber.c:1782
 msgid "Authenticating"
 msgstr "Autentificazione"
 
-#: src/protocols/jabber/jabber.c:1225
+#: src/protocols/jabber/jabber.c:1819
 msgid "Unknown login error"
 msgstr "Errore di login sconosciuto"
 
-#: src/protocols/jabber/jabber.c:1455 src/protocols/jabber/jabber.c:2903
+#: src/protocols/jabber/jabber.c:2010
+#, fuzzy
+msgid "Password successfully changed."
+msgstr "Password cambiata!"
+
+#: src/protocols/jabber/jabber.c:2012
+#, fuzzy
+msgid "Password Change"
+msgstr "Gaim - Cambio password"
+
+#: src/protocols/jabber/jabber.c:2054 src/protocols/jabber/jabber.c:3676
 #, fuzzy
 msgid "Connection lost"
 msgstr "Connessione chiusa."
 
-#: src/protocols/jabber/jabber.c:1457 src/protocols/jabber/jabber.c:1489
-#: src/protocols/jabber/jabber.c:2905 src/protocols/jabber/jabber.c:2951
+#: src/protocols/jabber/jabber.c:2056 src/protocols/jabber/jabber.c:2088
+#: src/protocols/jabber/jabber.c:3678 src/protocols/jabber/jabber.c:3724
+#: src/protocols/msn/msn.c:1741 src/protocols/msn/msn.c:1770
 msgid "Unable to connect"
 msgstr "Impossibile connettersi"
 
-#: src/protocols/jabber/jabber.c:1463
+#: src/protocols/jabber/jabber.c:2062
 msgid "Connected"
 msgstr "Connesso"
 
-#: src/protocols/jabber/jabber.c:1466
+#: src/protocols/jabber/jabber.c:2065
 msgid "Requesting Authentication Method"
 msgstr "Richiesta metodo autentificazione in corso"
 
 #. we have no chats yet
-#: src/protocols/jabber/jabber.c:1484
+#: src/protocols/jabber/jabber.c:2083 src/protocols/msn/msn.c:1762
 msgid "Connecting"
 msgstr "Connessione in corso"
 
-#: src/protocols/jabber/jabber.c:1783
+#: src/protocols/jabber/jabber.c:2340 src/protocols/jabber/jabber.c:2505
+#, fuzzy
+msgid "Invalid Jabber I.D."
+msgstr "Nome non valido"
+
+#: src/protocols/jabber/jabber.c:2473
 msgid "Room:"
 msgstr "Stanza:"
 
-#: src/protocols/jabber/jabber.c:1787
+#: src/protocols/jabber/jabber.c:2477
 msgid "Server:"
 msgstr "Server:"
 
-#: src/protocols/jabber/jabber.c:1792
+#: src/protocols/jabber/jabber.c:2482
 msgid "Handle:"
 msgstr "Gestisci:"
 
-#: src/protocols/jabber/jabber.c:2062 src/protocols/jabber/jabber.c:2401
+#: src/protocols/jabber/jabber.c:2539
 #, fuzzy
-msgid "Unknown"
-msgstr "ICQ sconosciuto"
-
-#: src/buddy_chat.c:875 src/protocols/jabber/jabber.c:2117
-#: src/protocols/oscar/oscar.c:3443
+msgid "Chats"
+msgstr "Chat"
+
+#: src/protocols/jabber/jabber.c:2854
+#, fuzzy
+msgid "View Error Msg"
+msgstr "Vedi i log"
+
+#: src/buddy_chat.c:886 src/protocols/jabber/jabber.c:2865
+#: src/protocols/oscar/oscar.c:3606
 msgid "Get Away Msg"
 msgstr "Prendi messaggio di Assente"
 
-#: src/protocols/jabber/jabber.c:2299
+#: src/protocols/jabber/jabber.c:2882
+msgid "Remove From Roster"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:3076
 msgid "Full Name"
 msgstr "Nome al secolo"
 
-#: src/protocols/jabber/jabber.c:2300
+#: src/protocols/jabber/jabber.c:3077
 msgid "Family Name"
 msgstr "Cognome"
 
-#: src/protocols/jabber/jabber.c:2301
+#: src/protocols/jabber/jabber.c:3078
 msgid "Given Name"
 msgstr "Nome assegnato"
 
-#: src/protocols/jabber/jabber.c:2302
+#: src/protocols/jabber/jabber.c:3079
 msgid "Nickname"
 msgstr "Soprannome"
 
-#: src/dialogs.c:2483 src/protocols/jabber/jabber.c:2303
+#: src/dialogs.c:2525 src/protocols/jabber/jabber.c:3080
 msgid "URL"
 msgstr "URL"
 
-#: src/protocols/jabber/jabber.c:2304
+#: src/protocols/jabber/jabber.c:3081
 msgid "Street Address"
 msgstr "Indirizzo"
 
-#: src/protocols/jabber/jabber.c:2305
+#: src/protocols/jabber/jabber.c:3082
 msgid "Extended Address"
 msgstr "Indirizzo per esteso"
 
-#: src/protocols/jabber/jabber.c:2306
+#: src/protocols/jabber/jabber.c:3083
 msgid "Locality"
 msgstr "Localit"
 
-#: src/protocols/jabber/jabber.c:2307
+#: src/protocols/jabber/jabber.c:3084
 msgid "Region"
 msgstr "Regione"
 
-#: src/protocols/jabber/jabber.c:2308
+#: src/protocols/jabber/jabber.c:3085
 msgid "Postal Code"
 msgstr "Codice Postale"
 
 #. Line 7
-#: src/dialogs.c:1604 src/dialogs.c:2312 src/protocols/jabber/jabber.c:2309
+#: src/dialogs.c:1646 src/dialogs.c:2354 src/protocols/jabber/jabber.c:3086
 msgid "Country"
 msgstr "Paese"
 
-#: src/protocols/jabber/jabber.c:2310
+#: src/protocols/jabber/jabber.c:3087
 msgid "Telephone"
 msgstr "Telefono"
 
-#: src/dialogs.c:2388 src/protocols/jabber/jabber.c:2311
+#: src/dialogs.c:2430 src/protocols/jabber/jabber.c:3088
 msgid "Email"
 msgstr "E-mail"
 
-#: src/protocols/jabber/jabber.c:2312
+#: src/protocols/jabber/jabber.c:3089
 msgid "Organization Name"
 msgstr "Nome dell'organizzazione"
 
-#: src/protocols/jabber/jabber.c:2313
+#: src/protocols/jabber/jabber.c:3090
 msgid "Organization Unit"
 msgstr "Divisione"
 
-#: src/prefs.c:1988 src/protocols/jabber/jabber.c:2314
+#: src/prefs.c:2000 src/protocols/jabber/jabber.c:3091
 msgid "Title"
 msgstr "Titolo"
 
-#: src/protocols/jabber/jabber.c:2315
+#: src/protocols/jabber/jabber.c:3092
 msgid "Role"
 msgstr "Posizione"
 
-#: src/protocols/jabber/jabber.c:2316
+#: src/protocols/jabber/jabber.c:3093
 msgid "Birthday"
 msgstr "Compleanno"
 
 #. Right side: frame with description and the filepath of plugin
-#: src/dialogs.c:2491 src/plugins.c:211 src/protocols/jabber/jabber.c:2317
+#: src/dialogs.c:2533 src/plugins.c:211 src/protocols/jabber/jabber.c:3094
 msgid "Description"
 msgstr "Descrizione"
 
-#: src/protocols/jabber/jabber.c:2342
+#: src/protocols/jabber/jabber.c:3119
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable"
@@ -520,133 +688,389 @@
 "Tutti i dati qui sotto sono opzionali. Inserisci solo le informazioni che "
 "ritieni opportune"
 
-#: src/protocols/jabber/jabber.c:2343
+#: src/protocols/jabber/jabber.c:3120
 msgid "User Identity"
 msgstr "Identit"
 
-#: src/protocols/jabber/jabber.c:2759
+#: src/protocols/jabber/jabber.c:3532
 msgid "Gaim - Edit Jabber vCard"
 msgstr "Gaim - Edita la vCard Jabber"
 
-#: src/protocols/jabber/jabber.c:2833
+#: src/protocols/jabber/jabber.c:3606
 msgid "Server Registration successful!"
 msgstr "Sei stato registrato sul server!"
 
-#: src/protocols/jabber/jabber.c:2860
+#: src/protocols/jabber/jabber.c:3633
 msgid "Unknown registration error"
 msgstr "Errore di registrazione sconosciuto"
 
-#: src/protocols/jabber/jabber.c:2969 src/protocols/jabber/jabber.c:2984
+#: src/protocols/jabber/jabber.c:3742 src/protocols/jabber/jabber.c:3757
 msgid "Set User Info"
 msgstr "Imposta informazioni utente"
 
-#: src/protocols/msn/msn.c:719 src/protocols/msn/msn.c:2041
-#: src/protocols/msn/msn.c:2074
+#: src/protocols/msn/msn.c:230
+msgid "Syntax Error (probably a Gaim bug)"
+msgstr ""
+
+#: src/protocols/msn/msn.c:233
+msgid "Invalid Parameter (probably a Gaim bug)"
+msgstr ""
+
+#: src/protocols/msn/msn.c:236
+#, fuzzy
+msgid "Invalid User"
+msgstr "Nome non valido"
+
+#: src/protocols/msn/msn.c:239
+msgid "Fully Qualified Domain Name missing"
+msgstr ""
+
+#: src/protocols/msn/msn.c:242
+msgid "Already Login"
+msgstr ""
+
+#: src/protocols/msn/msn.c:245
+#, fuzzy
+msgid "Invalid Username"
+msgstr "Nome non valido"
+
+#: src/protocols/msn/msn.c:248
+#, fuzzy
+msgid "Invalid Friendly Name"
+msgstr "Nome non valido"
+
+#: src/protocols/msn/msn.c:251
+msgid "List Full"
+msgstr ""
+
+#: src/protocols/msn/msn.c:254
+msgid "Already there"
+msgstr ""
+
+#: src/protocols/msn/msn.c:257
+#, fuzzy
+msgid "Not on list"
+msgstr "Connessione chiusa."
+
+#: src/protocols/msn/msn.c:260
+msgid "User is offline"
+msgstr ""
+
+#: src/protocols/msn/msn.c:263
+msgid "Already in the mode"
+msgstr ""
+
+#: src/protocols/msn/msn.c:266
+msgid "Already in opposite list"
+msgstr ""
+
+#: src/protocols/msn/msn.c:269
+msgid "Switchboard failed"
+msgstr ""
+
+#: src/protocols/msn/msn.c:272
+msgid "Notify Transfer failed"
+msgstr ""
+
+#: src/protocols/msn/msn.c:276
+msgid "Required fields missing"
+msgstr ""
+
+#: src/protocols/msn/msn.c:279
+#, fuzzy
+msgid "Not logged in"
+msgstr "%s entrato."
+
+#: src/protocols/msn/msn.c:283
+#, fuzzy
+msgid "Internal server error"
+msgstr "Errore interno"
+
+#: src/protocols/msn/msn.c:286
+msgid "Database server error"
+msgstr ""
+
+#: src/protocols/msn/msn.c:289
+#, fuzzy
+msgid "File operation error"
+msgstr "errore interno di connessione\n"
+
+#: src/protocols/msn/msn.c:292
+#, fuzzy
+msgid "Memory allocation error"
+msgstr "grave errore di connessione\n"
+
+#: src/protocols/msn/msn.c:296
+#, fuzzy
+msgid "Server busy"
+msgstr "Server:"
+
+#: src/protocols/msn/msn.c:299
+#, fuzzy
+msgid "Server unavailable"
+msgstr "Occupato"
+
+#: src/protocols/msn/msn.c:302
+msgid "Peer Notification server down"
+msgstr ""
+
+#: src/protocols/msn/msn.c:305
+#, fuzzy
+msgid "Database connect error"
+msgstr "errore interno di connessione\n"
+
+#: src/protocols/msn/msn.c:308
+msgid "Server is going down (abandon ship)"
+msgstr ""
+
+#: src/protocols/msn/msn.c:312
+#, fuzzy
+msgid "Error creating connection"
+msgstr "g003: Errore apertura connessione.\n"
+
+#: src/protocols/msn/msn.c:318
+msgid "Session overload"
+msgstr ""
+
+#: src/protocols/msn/msn.c:321
+msgid "User is too active"
+msgstr ""
+
+#: src/protocols/msn/msn.c:324
+#, fuzzy
+msgid "Too many sessions"
+msgstr "Troppe corrispondenze."
+
+#: src/protocols/msn/msn.c:327
+msgid "Not expected"
+msgstr ""
+
+#: src/protocols/msn/msn.c:330
+msgid "Bad friend file"
+msgstr ""
+
+#: src/protocols/msn/msn.c:334
+#, fuzzy
+msgid "Authentication failed"
+msgstr "Autentificazione fallita."
+
+#: src/protocols/msn/msn.c:337
+#, fuzzy
+msgid "Not allowed when offline"
+msgstr "Nessun suono quando entri"
+
+#: src/protocols/msn/msn.c:340
+msgid "Not accepting new users"
+msgstr ""
+
+#: src/protocols/msn/msn.c:343
+msgid "User unverified"
+msgstr ""
+
+#: src/protocols/msn/msn.c:346
+#, fuzzy
+msgid "Unknown Error Code"
+msgstr "Codice di errore sconosciuto."
+
+#: src/protocols/msn/msn.c:351 src/protocols/msn/msn.c:558
+#: src/protocols/msn/msn.c:813 src/protocols/msn/msn.c:2114
+#: src/protocols/msn/msn.c:2283 src/protocols/msn/msn.c:2336
 msgid "MSN Error"
 msgstr "Errore MSN"
 
-#: src/protocols/msn/msn.c:719
+#: src/protocols/msn/msn.c:558
+msgid "A message may not have been received."
+msgstr ""
+
+#: src/protocols/msn/msn.c:813
 msgid "Gaim was unable to send a message"
 msgstr "Gaim non riesce a spedire il messaggio"
 
-#: src/protocols/msn/msn.c:1069
+#: src/protocols/msn/msn.c:917
+#, c-format
+msgid "The user %s (%s) wants to add %s to his or her buddy list."
+msgstr ""
+
+#: src/protocols/msn/msn.c:1074
+#, c-format
+msgid "The user %s (%s) wants to add you to their buddy list"
+msgstr ""
+
+#: src/protocols/msn/msn.c:1175
 msgid "You have been disconnected. You have signed on from another location."
 msgstr "Sei stato disconnesso. Ti sei gi connesso da un'altra locazione."
 
-#: src/protocols/msn/msn.c:2041 src/protocols/msn/msn.c:2074
+#: src/protocols/msn/msn.c:1435 src/protocols/msn/msn.c:1679
+#, fuzzy
+msgid "Error reading from server"
+msgstr "Errore di lettura dal socket."
+
+#: src/protocols/msn/msn.c:1568
+msgid "Requesting to send password"
+msgstr ""
+
+#: src/protocols/msn/msn.c:1618
+#, fuzzy
+msgid "Unable to send password"
+msgstr "Non riesco a leggere il socket"
+
+#: src/protocols/msn/msn.c:1623
+#, fuzzy
+msgid "Password sent"
+msgstr "Password: "
+
+#: src/protocols/msn/msn.c:1748
+#, fuzzy
+msgid "Unable to write to server"
+msgstr "Non riesco a collegarmi al server"
+
+#: src/protocols/msn/msn.c:1754
+#, fuzzy
+msgid "Synching with server"
+msgstr "Registro dal server"
+
+#: src/protocols/msn/msn.c:1920
+msgid "Away From Computer"
+msgstr ""
+
+#: src/protocols/msn/msn.c:1921
+msgid "Be Right Back"
+msgstr ""
+
+#: src/protocols/msn/msn.c:1922
+#, fuzzy
+msgid "Busy"
+msgstr "Contatto"
+
+#: src/protocols/msn/msn.c:1923
+msgid "On The Phone"
+msgstr ""
+
+#: src/protocols/msn/msn.c:1924
+msgid "Out To Lunch"
+msgstr ""
+
+#: src/protocols/msn/msn.c:1925
+#, fuzzy
+msgid "Hidden"
+msgstr "Nascondi icona"
+
+#: src/protocols/msn/msn.c:2041
+msgid "Reset friendly name"
+msgstr ""
+
+#: src/protocols/msn/msn.c:2114
+msgid "Friendly name too long."
+msgstr ""
+
+#: src/protocols/msn/msn.c:2129 src/protocols/msn/msn.c:2150
+#, fuzzy
+msgid "Set Friendly Name"
+msgstr "Cognome"
+
+#: src/protocols/msn/msn.c:2130
+#, fuzzy
+msgid "Set Friendly Name:"
+msgstr "Account: "
+
+#: src/protocols/msn/msn.c:2131
+msgid "Reset All Friendly Names"
+msgstr ""
+
+#: src/protocols/msn/msn.c:2283 src/protocols/msn/msn.c:2336
 msgid "Invalid name"
 msgstr "Nome non valido"
 
-#: src/protocols/napster/napster.c:450 src/protocols/oscar/oscar.c:3075
-#: src/protocols/toc/toc.c:1101
+#: src/protocols/napster/napster.c:457 src/protocols/oscar/oscar.c:3209
+#: src/protocols/toc/toc.c:1104
 msgid "Join what group:"
 msgstr "Con quale gruppo vuoi ciattare:"
 
-#: src/protocols/oscar/oscar.c:333
+#: src/protocols/oscar/oscar.c:330
 #, c-format
 msgid "Direct IM with %s closed"
 msgstr " stato chiuso il canale diretto con %s"
 
-#: src/protocols/oscar/oscar.c:335
+#: src/protocols/oscar/oscar.c:332
 #, fuzzy, c-format
 msgid "Direct IM with %s failed"
 msgstr " stato chiuso il canale diretto con %s"
 
-#: src/protocols/oscar/oscar.c:373
+#: src/protocols/oscar/oscar.c:370
 msgid "connection error (rend)\n"
 msgstr "errore di connessione (rend?)\n"
 
-#: src/protocols/oscar/oscar.c:384
+#: src/protocols/oscar/oscar.c:381
 msgid "major connection error\n"
 msgstr "grave errore di connessione\n"
 
-#: src/protocols/oscar/oscar.c:385 src/protocols/toc/toc.c:511
+#: src/protocols/oscar/oscar.c:382 src/protocols/toc/toc.c:511
 #: src/protocols/toc/toc.c:524 src/protocols/toc/toc.c:590
 msgid "Disconnected."
 msgstr "Disconnesso."
 
-#: src/protocols/oscar/oscar.c:397 src/protocols/toc/toc.c:761
+#: src/protocols/oscar/oscar.c:394 src/protocols/toc/toc.c:761
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "Sei stato disconnesso dalla chat room %s."
 
-#: src/protocols/oscar/oscar.c:398
+#: src/protocols/oscar/oscar.c:395
 msgid "Chat Error!"
 msgstr "Errore di chat!"
 
-#: src/protocols/oscar/oscar.c:410
+#: src/protocols/oscar/oscar.c:407
 msgid "Chat is currently unavailable"
 msgstr "La chat al momento non  disponibile"
 
-#: src/protocols/oscar/oscar.c:411
+#: src/protocols/oscar/oscar.c:408
 msgid "Gaim - Chat"
 msgstr "Gaim - Chat"
 
-#: src/protocols/oscar/oscar.c:470 src/protocols/oscar/oscar.c:530
+#: src/protocols/oscar/oscar.c:467 src/protocols/oscar/oscar.c:527
 msgid "Couldn't connect to host"
 msgstr "Impossibile connettersi all'host"
 
-#: src/protocols/oscar/oscar.c:478
+#: src/protocols/oscar/oscar.c:475
 msgid "Password sent, waiting for response\n"
 msgstr "Password inviata; attendo la risposta\n"
 
-#: src/protocols/oscar/oscar.c:511
+#: src/protocols/oscar/oscar.c:508
 msgid "internal connection error\n"
 msgstr "errore interno di connessione\n"
 
-#: src/protocols/oscar/oscar.c:512
+#: src/protocols/oscar/oscar.c:509
 msgid "Unable to login to AIM"
 msgstr "Impossibile entrare in AIM"
 
-#: src/protocols/oscar/oscar.c:517
+#: src/protocols/oscar/oscar.c:514
 #, c-format
 msgid "Signon: %s"
 msgstr "Collegato: %s"
 
-#: src/protocols/oscar/oscar.c:589
+#: src/protocols/oscar/oscar.c:586
 msgid "Signed off.\n"
 msgstr "Scollegato.\n"
 
-#: src/protocols/oscar/oscar.c:608 src/protocols/oscar/oscar.c:732
+#: src/protocols/oscar/oscar.c:605 src/protocols/oscar/oscar.c:730
 msgid "Could Not Connect"
 msgstr "Impossibile connettersi"
 
-#: src/protocols/oscar/oscar.c:616
+#: src/protocols/oscar/oscar.c:613
 msgid "Connection established, cookie sent"
 msgstr "Connessione effettuata: spedito il cookie"
 
 #. Incorrect nick/password
-#: src/protocols/oscar/oscar.c:642 src/protocols/toc/toc.c:459
+#: src/protocols/oscar/oscar.c:639 src/protocols/toc/toc.c:459
 msgid "Incorrect nickname or password."
 msgstr "Soprannome o password sbagliati."
 
 #. Suspended account
-#: src/protocols/oscar/oscar.c:647
+#: src/protocols/oscar/oscar.c:644
 msgid "Your account is currently suspended."
 msgstr "Il tuo account al momento  sospeso"
 
 #. connecting too frequently
-#: src/protocols/oscar/oscar.c:651
+#: src/protocols/oscar/oscar.c:648
 msgid ""
 "You have been connecting and disconnecting too frequently. Wait ten minutes "
 "and try again. If you continue to try, you will need to wait even longer."
@@ -655,79 +1079,79 @@
 "dopo riprova. Se continui, dovrai aspettare anche pi a lungo."
 
 #. client too old
-#: src/protocols/oscar/oscar.c:656
+#: src/protocols/oscar/oscar.c:653
 msgid "The client version you are using is too old. Please upgrade at "
 msgstr ""
 "La versione del client che stai usando  troppo vecchia. Aggiornalo alla "
 "versione "
 
-#: src/protocols/oscar/oscar.c:660 src/protocols/toc/toc.c:542
+#: src/protocols/oscar/oscar.c:657 src/protocols/toc/toc.c:542
 msgid "Authentication Failed"
 msgstr "Autentificazione fallita"
 
-#: src/protocols/oscar/oscar.c:682
+#: src/protocols/oscar/oscar.c:679
 msgid "Internal Error"
 msgstr "Errore interno"
 
-#: src/protocols/oscar/oscar.c:1250 src/protocols/oscar/oscar.c:3286
+#: src/protocols/oscar/oscar.c:1248 src/protocols/oscar/oscar.c:3420
 #, c-format
 msgid "Direct IM with %s established"
 msgstr "Aperto il canale diretto con %s"
 
-#: src/protocols/oscar/oscar.c:1496 src/protocols/oscar/oscar.c:2371
+#: src/protocols/oscar/oscar.c:1504 src/protocols/oscar/oscar.c:2456
 #, c-format
 msgid ""
-"The user %d has denied your request to add them to your contact list for the "
-"following reason:\n"
-"\n"
+"The user %lu has denied your request to add them to your contact list for "
+"the following reason:\n"
+"%s"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1496 src/protocols/oscar/oscar.c:2371
+#: src/protocols/oscar/oscar.c:1504 src/protocols/oscar/oscar.c:2456
 #, fuzzy
 msgid "No reason given."
 msgstr "Nessun soprannome dato"
 
-#: src/protocols/oscar/oscar.c:1497 src/protocols/oscar/oscar.c:2372
+#: src/protocols/oscar/oscar.c:1505 src/protocols/oscar/oscar.c:2457
 msgid "Gaim - ICQ Authorization Denied"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1503 src/protocols/oscar/oscar.c:2378
+#: src/protocols/oscar/oscar.c:1511 src/protocols/oscar/oscar.c:2463
 #, c-format
-msgid "The user %d has granted your request to add them to your contact list."
+msgid "The user %lu has granted your request to add them to your contact list."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1504 src/protocols/oscar/oscar.c:2379
+#: src/protocols/oscar/oscar.c:1512 src/protocols/oscar/oscar.c:2464
 msgid "Gaim - ICQ Authorization Granted"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1577
+#: src/protocols/oscar/oscar.c:1585
 #, c-format
 msgid "You missed %d message from %s because it was invalid."
 msgstr "Hai perso %d messaggio da %s perch non valido."
 
-#: src/protocols/oscar/oscar.c:1578
+#: src/protocols/oscar/oscar.c:1586
 #, c-format
 msgid "You missed %d messages from %s because they were invalid."
 msgstr "Hai perso %d messaggi da %s perch non validi."
 
-#: src/protocols/oscar/oscar.c:1587
+#: src/protocols/oscar/oscar.c:1595
 #, c-format
 msgid "You missed %d message from %s because it was too large."
 msgstr "Hai perso %d messaggio da %s perch era troppo lungo."
 
-#: src/protocols/oscar/oscar.c:1588
+#: src/protocols/oscar/oscar.c:1596
 #, c-format
 msgid "You missed %d messages from %s because they were too large."
 msgstr "Hai perso %d messaggi da %s perch troppo lunghi."
 
-#: src/protocols/oscar/oscar.c:1597
+#: src/protocols/oscar/oscar.c:1605
 #, c-format
 msgid "You missed %d message from %s because the rate limit has been exceeded."
 msgstr ""
 "Hai perso %d messaggio da %s perch  stato superata la frequenza massima "
 "dei messaggi."
 
-#: src/protocols/oscar/oscar.c:1598
+#: src/protocols/oscar/oscar.c:1606
 #, c-format
 msgid ""
 "You missed %d messages from %s because the rate limit has been exceeded."
@@ -735,147 +1159,157 @@
 "Hai perso %d messaggi da %s perch  stato superata la frequenza massima di "
 "messaggi."
 
-#: src/protocols/oscar/oscar.c:1607
+#: src/protocols/oscar/oscar.c:1615
 #, c-format
 msgid "You missed %d message from %s because it was too evil."
 msgstr "Hai perso %d messaggio da %s perch era troppo cattivo."
 
-#: src/protocols/oscar/oscar.c:1608
+#: src/protocols/oscar/oscar.c:1616
 #, c-format
 msgid "You missed %d messages from %s because they are too evil."
 msgstr "Hai perso %d messaggi da %s perch erano troppo cattivi."
 
-#: src/protocols/oscar/oscar.c:1617
+#: src/protocols/oscar/oscar.c:1625
 #, c-format
 msgid "You missed %d message from %s because you are too evil."
 msgstr "Hai perso %d messaggio da %s perch sei troppo molesto."
 
-#: src/protocols/oscar/oscar.c:1618
+#: src/protocols/oscar/oscar.c:1626
 #, c-format
 msgid "You missed %d messages from %s because you are too evil."
 msgstr "Hai perso %d messaggi da %s perch volevo farti i dispetti."
 
-#: src/protocols/oscar/oscar.c:1626
+#: src/protocols/oscar/oscar.c:1634
 #, c-format
 msgid "You missed %d message from %s for unknown reasons."
 msgstr "Hai perso %d messaggio da %s: non chiedermi perch, non lo so."
 
-#: src/protocols/oscar/oscar.c:1627
+#: src/protocols/oscar/oscar.c:1635
 #, c-format
 msgid "You missed %d messages from %s for unknown reasons."
 msgstr "Non  Winzozz, per hai perso %d messaggi da %s e non so il perch."
 
-#: src/dialogs.c:3034 src/dialogs.c:3040 src/protocols/oscar/oscar.c:1632
-#: src/protocols/oscar/oscar.c:1670 src/protocols/oscar/oscar.c:1688
-#: src/protocols/oscar/oscar.c:2141 src/protocols/yahoo/yahoo.c:585
+#: src/dialogs.c:3076 src/dialogs.c:3082 src/protocols/oscar/oscar.c:1640
+#: src/protocols/oscar/oscar.c:1755 src/protocols/oscar/oscar.c:1773
+#: src/protocols/oscar/oscar.c:2226 src/protocols/yahoo/yahoo.c:594
 msgid "Gaim - Error"
 msgstr "Gaim - Errore"
 
-#: src/protocols/oscar/oscar.c:1649
+#: src/protocols/oscar/oscar.c:1703
+#, c-format
+msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR>%s<BR>"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:1705
+#, c-format
+msgid "<B>Status:</B> %s<BR><HR><BR>%s<BR>"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:1734
 #, c-format
 msgid "SNAC threw error: %s\n"
 msgstr "SNAC ha inviato un errore: %s\n"
 
-#: src/protocols/oscar/oscar.c:1651
+#: src/protocols/oscar/oscar.c:1736
 msgid "Gaim - Oscar SNAC Error"
 msgstr "Gaim - Errore SNAC di Oscar"
 
-#: src/protocols/oscar/oscar.c:1668
+#: src/protocols/oscar/oscar.c:1753
 #, c-format
 msgid "Your message to %s did not get sent: %s"
 msgstr "Il tuo messaggio a %s non  stato spedito: %s"
 
-#: src/protocols/oscar/oscar.c:1669 src/protocols/oscar/oscar.c:1687
+#: src/protocols/oscar/oscar.c:1754 src/protocols/oscar/oscar.c:1772
 msgid "Reason unknown"
 msgstr "Motivo sconosciuto."
 
-#: src/protocols/oscar/oscar.c:1686
+#: src/protocols/oscar/oscar.c:1771
 #, c-format
 msgid "User information for %s unavailable: %s"
 msgstr "Le informazioni dell'utente %s non sono disponibili: %s"
 
-#: src/buddy.c:2060 src/protocols/oscar/oscar.c:1717
+#: src/buddy.c:2131 src/protocols/oscar/oscar.c:1802
 msgid "Buddy Icon"
 msgstr "Icona della persona"
 
-#: src/buddy.c:2063 src/protocols/oscar/oscar.c:1720
+#: src/buddy.c:2134 src/protocols/oscar/oscar.c:1805
 msgid "Voice"
 msgstr "Voce"
 
-#: src/buddy.c:2066 src/protocols/oscar/oscar.c:1723
+#: src/buddy.c:2137 src/protocols/oscar/oscar.c:1808
 msgid "IM Image"
 msgstr "Immagine di IM"
 
-#: src/buddy.c:494 src/buddy.c:2069 src/buddy.c:2507 src/prefs.c:2912
-#: src/protocols/oscar/oscar.c:1726
+#: src/buddy.c:498 src/buddy.c:2140 src/buddy.c:2581 src/prefs.c:2926
+#: src/protocols/oscar/oscar.c:1811
 msgid "Chat"
 msgstr "Chat"
 
-#: src/buddy.c:2072 src/protocols/oscar/oscar.c:1729
+#: src/buddy.c:2143 src/protocols/oscar/oscar.c:1814
 msgid "Get File"
 msgstr "Prendi file"
 
-#: src/buddy.c:2075 src/protocols/oscar/oscar.c:1732
+#: src/buddy.c:2146 src/protocols/oscar/oscar.c:1817
 msgid "Send File"
 msgstr "Invia file"
 
-#: src/buddy.c:2079 src/protocols/oscar/oscar.c:1736
+#: src/buddy.c:2150 src/protocols/oscar/oscar.c:1821
 msgid "Games"
 msgstr "Giochi"
 
-#: src/buddy.c:2082 src/protocols/oscar/oscar.c:1739
+#: src/buddy.c:2153 src/protocols/oscar/oscar.c:1824
 msgid "Stocks"
 msgstr "Scorte"
 
-#: src/buddy.c:2085 src/protocols/oscar/oscar.c:1742
+#: src/buddy.c:2156 src/protocols/oscar/oscar.c:1827
 msgid "Send Buddy List"
 msgstr "Invia lista contatti"
 
-#: src/buddy.c:2088 src/protocols/oscar/oscar.c:1745
+#: src/buddy.c:2159 src/protocols/oscar/oscar.c:1830
 msgid "EveryBuddy Bug"
 msgstr "Baco di EveryBuddy"
 
-#: src/buddy.c:2091 src/protocols/oscar/oscar.c:1748
+#: src/buddy.c:2162 src/protocols/oscar/oscar.c:1833
 msgid "AP User"
 msgstr "Utente AP"
 
-#: src/buddy.c:2094 src/protocols/oscar/oscar.c:1751
+#: src/buddy.c:2165 src/protocols/oscar/oscar.c:1836
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
-#: src/buddy.c:2097 src/protocols/oscar/oscar.c:1754
+#: src/buddy.c:2168 src/protocols/oscar/oscar.c:1839
 msgid "Nihilist"
 msgstr "Nichilista"
 
-#: src/buddy.c:2100 src/protocols/oscar/oscar.c:1757
+#: src/buddy.c:2171 src/protocols/oscar/oscar.c:1842
 msgid "ICQ Server Relay"
 msgstr "Trasmissione al server ICQ"
 
-#: src/buddy.c:2103 src/protocols/oscar/oscar.c:1760
+#: src/buddy.c:2174 src/protocols/oscar/oscar.c:1845
 msgid "ICQ Unknown"
 msgstr "ICQ sconosciuto"
 
-#: src/buddy.c:2106 src/protocols/oscar/oscar.c:1763
+#: src/buddy.c:2177 src/protocols/oscar/oscar.c:1848
 msgid "Trillian Encryption"
 msgstr "Criptaggio trilliano (?)"
 
-#: src/protocols/oscar/oscar.c:1801
+#: src/protocols/oscar/oscar.c:1886
 #, fuzzy
 msgid ""
-"<br><BODY BGCOLOR=WHITE><hr><I>Legend:</I><br><br><IMG "
-"SRC=\"free_icon.gif\"> : Normal AIM User<br><IMG SRC=\"aol_icon.gif\"> : AOL "
-"User <br><IMG SRC=\"dt_icon.gif\"> : Trial AIM User <br><IMG "
-"SRC=\"admin_icon.gif\"> : Administrator <br><IMG SRC=\"ab_icon.gif\"> : "
-"ActiveBuddy Interactive Agent<br><IMG SRC=\"wireless_icon.gif\"> : Wireless "
-"Device User<br>"
+"<br><BODY BGCOLOR=WHITE><hr><I>Legend:</I><br><br><IMG SRC=\"free_icon.gif"
+"\"> : Normal AIM User<br><IMG SRC=\"aol_icon.gif\"> : AOL User <br><IMG SRC="
+"\"dt_icon.gif\"> : Trial AIM User <br><IMG SRC=\"admin_icon.gif\"> : "
+"Administrator <br><IMG SRC=\"ab_icon.gif\"> : ActiveBuddy Interactive "
+"Agent<br><IMG SRC=\"wireless_icon.gif\"> : Wireless Device User<br>"
 msgstr ""
-"<br><BODY BGCOLOR=WHITE><hr><I>Legenda:</I><br><br><IMG "
-"SRC=\"free_icon.gif\"> : Normale Utente AIM <br><IMG SRC=\"aol_icon.gif\"> : "
-"Utente AOL <br><IMG SRC=\"dt_icon.gif\"> : Utente AIM in prova <br><IMG "
-"SRC=\"admin_icon.gif\"> : Amministratore <br><IMG SRC=\"ab_icon.gif\"> : "
-"Agente Interattivo ActiveBuddy<br>"
-
-#: src/protocols/oscar/oscar.c:1829
+"<br><BODY BGCOLOR=WHITE><hr><I>Legenda:</I><br><br><IMG SRC=\"free_icon.gif"
+"\"> : Normale Utente AIM <br><IMG SRC=\"aol_icon.gif\"> : Utente AOL "
+"<br><IMG SRC=\"dt_icon.gif\"> : Utente AIM in prova <br><IMG SRC="
+"\"admin_icon.gif\"> : Amministratore <br><IMG SRC=\"ab_icon.gif\"> : Agente "
+"Interattivo ActiveBuddy<br>"
+
+#: src/protocols/oscar/oscar.c:1914
+#, c-format
 msgid ""
 "Username : <B>%s</B>  %s <BR>\n"
 "Warning Level : <B>%d %%</B><BR>\n"
@@ -887,27 +1321,27 @@
 "%s%s%s<BR>\n"
 "<HR><BR>\n"
 
-#: src/protocols/oscar/oscar.c:1861
+#: src/protocols/oscar/oscar.c:1946
 msgid "<i>User has no away message</i>"
 msgstr "<i>L'utente non ha messaggio di Assente</i>"
 
-#: src/protocols/oscar/oscar.c:1873
+#: src/protocols/oscar/oscar.c:1958
 msgid "Client Capabilities: "
 msgstr "Potenzialit del client: "
 
-#: src/protocols/oscar/oscar.c:1881
+#: src/protocols/oscar/oscar.c:1966
 msgid "<i>No Information Provided</i>"
 msgstr "<i>Nessuna informazione fornita</i>"
 
-#: src/protocols/oscar/oscar.c:1904
+#: src/protocols/oscar/oscar.c:1989
 msgid "Your connection may be lost."
 msgstr "La connessione potrebbe essersi interrotta."
 
-#: src/protocols/oscar/oscar.c:1905
+#: src/protocols/oscar/oscar.c:1990
 msgid "AOL error"
 msgstr "Errore AOL"
 
-#: src/protocols/oscar/oscar.c:2140
+#: src/protocols/oscar/oscar.c:2225
 msgid ""
 "The last message was not sent because you are over the rate limit. Please "
 "wait 10 seconds and try again."
@@ -915,23 +1349,35 @@
 "L'ultimo messaggio non  stato inviato perch ne hai spediti con troppa "
 "frequenza. Aspetta 10 secondi e riprova."
 
-#: src/dialogs.c:3563 src/protocols/oscar/oscar.c:2482
-#: src/protocols/oscar/oscar.c:3407 src/protocols/toc/toc.c:1561
-#: src/protocols/toc/toc.c:1578 src/protocols/toc/toc.c:1638
-#: src/protocols/toc/toc.c:1680 src/protocols/toc/toc.c:1799
-#: src/protocols/toc/toc.c:1829 src/protocols/toc/toc.c:1885
+#: src/dialogs.c:3604 src/protocols/oscar/oscar.c:2589
+#: src/protocols/oscar/oscar.c:3541 src/protocols/toc/toc.c:1564
+#: src/protocols/toc/toc.c:1581 src/protocols/toc/toc.c:1641
+#: src/protocols/toc/toc.c:1683 src/protocols/toc/toc.c:1802
+#: src/protocols/toc/toc.c:1832 src/protocols/toc/toc.c:1888
 msgid "Error"
 msgstr "Errore"
 
-#: src/protocols/oscar/oscar.c:3079 src/protocols/toc/toc.c:1105
+#: src/protocols/oscar/oscar.c:3192
+#, c-format
+msgid ""
+"The maximum number of buddies allowed in your buddy list is %d, and you have "
+"%d.  Until you are below the limit, some buddies will not show up as online."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3195
+#, fuzzy
+msgid "Gaim - Warning"
+msgstr "Gaim - Avvisa l'utente?"
+
+#: src/protocols/oscar/oscar.c:3213 src/protocols/toc/toc.c:1108
 msgid "Exchange:"
 msgstr "Scambia:"
 
-#: src/protocols/oscar/oscar.c:3407
+#: src/protocols/oscar/oscar.c:3541
 msgid "Unable to open Direct IM"
 msgstr "Impossibile aprire un canale diretto di IM"
 
-#: src/protocols/oscar/oscar.c:3417
+#: src/protocols/oscar/oscar.c:3551
 #, c-format
 msgid ""
 "You have selected to open a Direct IM connection with %s. Doing this will "
@@ -942,11 +1388,30 @@
 "permetterai di vedere il tuo indirizzo IP, rischiando per la sicurezza del "
 "tuo sistema. Vuoi continuare?"
 
-#: src/protocols/oscar/oscar.c:3450
+#: src/protocols/oscar/oscar.c:3568
+#, c-format
+msgid ""
+"<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR><I>Remote client does not "
+"support sending status messages.</I><BR>"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3575
+#, c-format
+msgid ""
+"<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR><I>User has no status message."
+"</I><BR>"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3600
+#, fuzzy
+msgid "Get Status Msg"
+msgstr "Prendi messaggio di Assente"
+
+#: src/protocols/oscar/oscar.c:3613
 msgid "Direct IM"
 msgstr "IM diretto"
 
-#: src/protocols/oscar/oscar.c:3458
+#: src/protocols/oscar/oscar.c:3621
 msgid "Get Capabilities"
 msgstr "Prendi le potenzialit"
 
@@ -1094,7 +1559,7 @@
 msgid "Password Change Successful"
 msgstr "Cambio password effettuato"
 
-#: src/dialogs.c:1688 src/protocols/toc/toc.c:782
+#: src/dialogs.c:1730 src/protocols/toc/toc.c:782
 msgid "Gaim - Password Change"
 msgstr "Gaim - Cambio password"
 
@@ -1113,68 +1578,69 @@
 msgid "TOC Pause"
 msgstr "Pausa TOC"
 
-#: src/protocols/toc/toc.c:1222
+#: src/protocols/toc/toc.c:1225
 msgid "Get Dir Info"
 msgstr "Prendi le info di Dir"
 
-#: src/protocols/toc/toc.c:1638 src/protocols/toc/toc.c:1680
-#: src/protocols/toc/toc.c:1799 src/protocols/toc/toc.c:1885
+#: src/protocols/toc/toc.c:1641 src/protocols/toc/toc.c:1683
+#: src/protocols/toc/toc.c:1802 src/protocols/toc/toc.c:1888
 msgid "Could not connect for transfer!"
 msgstr "Impossibile connettersi per trasferire file!"
 
-#: src/protocols/toc/toc.c:1829
+#: src/protocols/toc/toc.c:1832
 msgid "Could not write file header!"
 msgstr "Impossibile scrivere le intestazioni dei file!"
 
-#: src/protocols/toc/toc.c:1918
+#: src/protocols/toc/toc.c:1921
 msgid "Gaim - Save As..."
 msgstr "Gaim - Salva come..."
 
-#: src/protocols/toc/toc.c:1959
+#: src/protocols/toc/toc.c:1962
 #, c-format
 msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
 msgstr "%s chiede a %s di accettare %d file: %s (%.2f %s)%s%s"
 
-#: src/protocols/toc/toc.c:1960
+#: src/protocols/toc/toc.c:1963
 #, c-format
 msgid "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
 msgstr "%s chiede a %s di accettare %d file: %s (%.2f %s)%s%s"
 
-#: src/protocols/toc/toc.c:1965
+#: src/protocols/toc/toc.c:1968
 #, c-format
 msgid "%s requests you to send them a file"
 msgstr "%s ti chiede di mandargli un file"
 
-#: src/protocols/yahoo/yahoo.c:585
+#: src/protocols/yahoo/yahoo.c:594
 msgid "Your message did not get sent."
 msgstr "Il tuo messaggio non  stato inviato."
 
-#: src/protocols/zephyr/zephyr.c:802
+#: src/protocols/zephyr/zephyr.c:840
 msgid "ZLocate"
 msgstr "Zlocate"
 
-#: src/protocols/zephyr/zephyr.c:839
+#: src/protocols/zephyr/zephyr.c:877
 msgid "Class:"
 msgstr "Classe:"
 
-#: src/protocols/zephyr/zephyr.c:843
+#: src/protocols/zephyr/zephyr.c:881
 msgid "Instance:"
 msgstr "Istanza:"
 
-#: src/protocols/zephyr/zephyr.c:847
+#: src/protocols/zephyr/zephyr.c:885
 msgid "Recipient:"
 msgstr "Recipiente:"
 
-#: src/about.c:93
+#: src/about.c:102
 #, c-format
 msgid "About Gaim v%s"
 msgstr "Informazioni su Gaim v. %s"
 
-#: src/about.c:126
+#: src/about.c:135
+#, fuzzy
 msgid ""
-"Gaim is a client that supports AOL's Instant Messenger protocol. It is "
-"written\n"
-"using Gtk+ and is licensed under the GPL.\n"
+"Gaim is a modular Instant Messaging client capable of using AIM, ICQ,\n"
+"Yahoo!, MSN, IRC, Jabber, Napster, Zephyr, and Gadu-Gadu all at once.\n"
+"It is written using Gtk+ and is licensed under the GPL.\n"
 "\n"
 "URL: "
 msgstr ""
@@ -1186,6 +1652,16 @@
 "URL: "
 
 #: src/about.c:137
+msgid ""
+"\n"
+"\n"
+"IRC: #gaim on irc.openprojects.net"
+msgstr ""
+"\n"
+"\n"
+"IRC: #gaim su irc.openprojects.net"
+
+#: src/about.c:147
 #, fuzzy
 msgid ""
 "Active Developers\n"
@@ -1223,98 +1699,96 @@
 "Eric Warmenhoven                   [ warmenhoven@yahoo.com ]\n"
 "Mark Spencer (original author)   [ markster@marko.net ]"
 
-#: src/about.c:155 src/aim.c:318 src/buddy.c:2633 src/buddy_chat.c:1311
-#: src/buddy_chat.c:1408 src/buddy_chat.c:1438 src/conversation.c:2795
-#: src/dialogs.c:568 src/dialogs.c:3858 src/multi.c:1057 src/plugins.c:277
-#: src/prefs.c:2535 src/prpl.c:438 src/prpl.c:679 src/server.c:1050
-msgid "Close"
-msgstr "Chiudi"
-
 #. this makes the sizes not work.
 #. GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
 #. gtk_widget_grab_default(button);
-#: src/about.c:175
+#: src/about.c:185
 msgid "Web Site"
 msgstr "Sito Web"
 
-#: src/aim.c:151 src/buddy.c:2626
+#: src/aim.c:153 src/buddy.c:2709
 msgid "Signoff"
 msgstr "Abbandona"
 
-#: src/aim.c:163
+#: src/aim.c:165
 msgid "Please enter your logon"
 msgstr "Inserisci il tuo account"
 
-#: src/aim.c:163 src/multi.c:1388 src/server.c:55
+#: src/aim.c:165 src/multi.c:1400 src/server.c:55
 msgid "Signon Error"
 msgstr "Errore di iscrizione"
 
-#: src/aim.c:261
+#: src/aim.c:263
 msgid "Gaim - Login"
 msgstr "Gaim - Login"
 
-#: src/aim.c:279
+#: src/aim.c:281
 msgid "Screen Name: "
 msgstr "Account: "
 
-#: src/aim.c:295
+#: src/aim.c:297
 msgid "Password: "
 msgstr "Password: "
 
-#: src/aim.c:316 src/buddy.c:2630
+#: src/aim.c:318 src/buddy.c:2713
 msgid "Quit"
 msgstr "Esci"
 
-#: src/aim.c:321 src/aim.c:819 src/buddy.c:2656
+#: src/aim.c:323 src/aim.c:831 src/buddy.c:2739
 msgid "Accounts"
 msgstr "Accounts"
 
-#: src/aim.c:323 src/multi.c:903
+#: src/aim.c:325 src/multi.c:915
 msgid "Signon"
 msgstr "Entra"
 
-#: src/aim.c:355
+#: src/aim.c:357
 msgid "About"
 msgstr "Informazioni"
 
-#: src/aim.c:356 src/prefs.c:1619 src/prefs.c:1893
+#: src/aim.c:358 src/prefs.c:1633 src/prefs.c:1905
 msgid "Options"
 msgstr "Opzioni"
 
-#: src/aim.c:358 src/aim.c:822 src/buddy.c:2674
+#: src/aim.c:360 src/aim.c:834 src/buddy.c:2757
 msgid "Plugins"
 msgstr "Plugins"
 
-#: src/aim.c:816 src/buddy.c:2666
+#: src/aim.c:828 src/buddy.c:2749
 msgid "Preferences"
 msgstr "Preferenze"
 
-#: src/applet.c:199
+#: src/aim.c:838 src/multi.c:1472
+#, fuzzy
+msgid "Auto-login"
+msgstr "Auto Login"
+
+#: src/applet.c:109
 msgid "Attempting to sign on...."
 msgstr "Cerco di entrare..."
 
-#: src/applet.c:202
+#: src/applet.c:112
 msgid "Offline. Click to bring up login box."
 msgstr "Sei sconnesso. Clicca per la finestra di connessione."
 
-#: src/applet.c:218
+#: src/applet.c:128
 #, c-format
 msgid "Away: %d pending."
 msgstr "Assente: %d in attesa."
 
-#: src/applet.c:221
+#: src/applet.c:131
 msgid "Away."
 msgstr "Assente."
 
-#: src/applet.c:296 src/away.c:388
+#: src/applet.c:200 src/away.c:388
 msgid "New Away Message"
 msgstr "Nuovo msg di Assente"
 
-#: src/applet.c:444
+#: src/applet.c:348
 msgid "Can't create Gaim applet!"
 msgstr "Impossibile creare l'applet di Gaim!"
 
-#: src/applet.c:465
+#: src/applet.c:368
 msgid "About..."
 msgstr "Informazioni su..."
 
@@ -1338,87 +1812,74 @@
 msgid "Set All Away"
 msgstr "Tutti come Assente"
 
-#. Put the buttons in the box
-#: src/buddy.c:488 src/buddy.c:2741 src/buddy_chat.c:1443
-#: src/conversation.c:2328 src/conversation.c:2810 src/dialogs.c:890
-#: src/dialogs.c:1072 src/dialogs.c:2053 src/multi.c:1041 src/prefs.c:2029
-#: src/prefs.c:2371 src/prefs.c:2405
-msgid "Add"
-msgstr "Aggiungi"
-
-#: src/buddy.c:489 src/buddy.c:2742 src/dialogs.c:900 src/dialogs.c:1047
+#: src/buddy.c:493 src/buddy.c:2828 src/dialogs.c:942 src/dialogs.c:1089
 msgid "Group"
 msgstr "Gruppo"
 
-#: src/buddy.c:490 src/buddy.c:2743 src/buddy_chat.c:1445
-#: src/conversation.c:2314 src/conversation.c:2807 src/prefs.c:2043
-#: src/prefs.c:2375 src/prefs.c:2409
-msgid "Remove"
-msgstr "Elimina"
-
-#: src/buddy.c:495 src/buddy.c:646 src/buddy.c:798 src/buddy.c:2505
-#: src/buddy_chat.c:850 src/buddy_chat.c:1267
+#: src/buddy.c:499 src/buddy.c:664 src/buddy.c:834 src/buddy.c:2579
+#: src/buddy_chat.c:861 src/buddy_chat.c:1278
 msgid "IM"
 msgstr "IM"
 
-#: src/buddy.c:496 src/buddy.c:2506 src/buddy_chat.c:866 src/buddy_chat.c:1275
-#: src/buddy_chat.c:1451 src/conversation.c:2828
+#: src/buddy.c:500 src/buddy.c:2580 src/buddy_chat.c:877 src/buddy_chat.c:1286
+#: src/buddy_chat.c:1462 src/conversation.c:2897
 msgid "Info"
 msgstr "Informazioni"
 
 #. Put the buttons in the box
-#: src/buddy.c:651 src/buddy.c:803 src/dialogs.c:1039 src/dialogs.c:3417
-#: src/dialogs.c:3432
+#: src/buddy.c:669 src/buddy.c:839 src/dialogs.c:1081 src/dialogs.c:3458
+#: src/dialogs.c:3473
 msgid "Alias"
 msgstr "Alias"
 
-#: src/buddy.c:656 src/buddy.c:822
+#: src/buddy.c:674 src/buddy.c:858
 msgid "Add Buddy Pounce"
 msgstr "Aggiungi salto a Contatto"
 
-#: src/buddy.c:663 src/buddy.c:828
+#: src/buddy.c:681 src/buddy.c:864
 msgid "View Log"
 msgstr "Vedi i log"
 
-#: src/buddy.c:785 src/buddy.c:816
+#: src/buddy.c:821 src/buddy.c:852
 msgid "Rename"
 msgstr "Rinomina"
 
-#: src/buddy.c:810
+#: src/buddy.c:846
 msgid "Un-Alias"
 msgstr "Cancella Alias"
 
-#: src/buddy.c:1581 src/buddy.c:2649
+#: src/buddy.c:1645 src/buddy.c:2732
 msgid "Buddy Pounce"
 msgstr "Salto a Contatto"
 
-#: src/buddy.c:1661
+#: src/buddy.c:1725
 msgid "New Buddy Pounce"
 msgstr "Nuovo salto a Contatto"
 
-#: src/buddy.c:1679
+#: src/buddy.c:1743
 msgid "Remove Buddy Pounce"
 msgstr "Rimuovi salto a Contatto"
 
-#: src/buddy.c:1707
+#: src/buddy.c:1771
 msgid "[Click to edit]"
 msgstr "[Clicca per modificare]"
 
-#: src/buddy.c:2183
+#: src/buddy.c:2254
 #, c-format
 msgid "Logged in: %s\n"
 msgstr "Entrato in: %s\n"
 
-#: src/buddy.c:2195
+#: src/buddy.c:2266
+#, c-format
 msgid "Warnings: %d%%\n"
 msgstr "Avvisi: %d%%\n"
 
-#: src/buddy.c:2207
+#: src/buddy.c:2278
 #, c-format
 msgid "Capabilities: %s\n"
 msgstr "Potenzialit: %s\n"
 
-#: src/buddy.c:2211
+#: src/buddy.c:2282
 #, c-format
 msgid ""
 "Alias: %s               \n"
@@ -1429,117 +1890,127 @@
 "Account: %s\n"
 "%s%s%s%s%s%s"
 
-#: src/buddy.c:2215
+#: src/buddy.c:2286
 msgid "Idle: "
 msgstr "A riposo: "
 
-#: src/buddy.c:2286 src/buddy.c:2291
+#: src/buddy.c:2359 src/buddy.c:2364
 #, c-format
 msgid "%s logged in."
 msgstr "%s entrato."
 
-#: src/buddy.c:2350 src/buddy.c:2355
+#: src/buddy.c:2424 src/buddy.c:2429
 #, c-format
 msgid "%s logged out."
 msgstr "%s uscito."
 
-#: src/buddy.c:2540
+#: src/buddy.c:2614
 msgid "Information on selected Buddy"
 msgstr "Informazioni Contatto selezionato."
 
-#: src/buddy.c:2541 src/dialogs.c:697
+#: src/buddy.c:2615 src/dialogs.c:697
 msgid "Send Instant Message"
 msgstr "Invia un messaggio"
 
-#: src/buddy.c:2542
+#: src/buddy.c:2616
 msgid "Start/join a Buddy Chat"
 msgstr "Inizia/unisciti a chat con Contatto"
 
-#: src/buddy.c:2543
+#: src/buddy.c:2617
 msgid "Activate Away Message"
 msgstr "Attiva messaggio di Assente"
 
-#: src/buddy.c:2606
+#: src/buddy.c:2689
 msgid "File"
 msgstr "File"
 
-#: src/buddy.c:2610
+#: src/buddy.c:2693
 msgid "Add A Buddy"
 msgstr "Aggiungi Contatto"
 
-#: src/buddy.c:2612
+#: src/buddy.c:2695
 msgid "Join A Chat"
 msgstr "Unisciti a una chat"
 
-#: src/buddy.c:2614
+#: src/buddy.c:2697
 msgid "New Instant Message"
 msgstr "Nuovo messaggio"
 
-#: src/buddy.c:2616 src/dialogs.c:749
+#: src/buddy.c:2699 src/dialogs.c:759
 msgid "Get User Info"
 msgstr "Vedi info utente"
 
-#: src/buddy.c:2621
+#: src/buddy.c:2704
 msgid "Import Buddy List"
 msgstr "Importa lista contatti"
 
-#: src/buddy.c:2639
+#: src/buddy.c:2722
 msgid "Tools"
 msgstr "Strumenti"
 
-#: src/buddy.c:2662
+#: src/buddy.c:2745
 msgid "Protocol Actions"
 msgstr "Azioni protocollo"
 
-#: src/buddy.c:2668
+#: src/buddy.c:2751
 msgid "View System Log"
 msgstr "Vedi log di sistema"
 
-#: src/buddy.c:2680
+#: src/buddy.c:2763
 msgid "Perl"
 msgstr "Perl"
 
-#: src/buddy.c:2683
+#: src/buddy.c:2766
 msgid "Load Script"
 msgstr "Esegui script"
 
-#: src/buddy.c:2687
+#: src/buddy.c:2770
 msgid "Unload All Scripts"
 msgstr "Anunulla tutti gli script"
 
-#: src/buddy.c:2691
+#: src/buddy.c:2774
 msgid "List Scripts"
 msgstr "Elenco script"
 
-#: src/buddy.c:2699
+#: src/buddy.c:2782
 msgid "Help"
 msgstr "Aiuto"
 
-#: src/buddy.c:2704
+#: src/buddy.c:2787
+#, fuzzy
+msgid "Online Help"
+msgstr "Presente"
+
+#: src/buddy.c:2788
+#, fuzzy
+msgid "Debug Window"
+msgstr "Mostra finestra debug"
+
+#: src/buddy.c:2789
 msgid "About Gaim"
 msgstr "Informazioni su Gaim"
 
-#: src/buddy.c:2721 src/prefs.c:2891
+#: src/buddy.c:2807 src/prefs.c:2905
 msgid "Buddy List"
 msgstr "Lista contatti"
 
-#: src/buddy.c:2774
+#: src/buddy.c:2860
 msgid "Add a new Buddy"
 msgstr "Aggiungi nuovo contatto"
 
-#: src/buddy.c:2775
+#: src/buddy.c:2861
 msgid "Add a new Group"
 msgstr "Aggiungio nuovo gruppo"
 
-#: src/buddy.c:2776
+#: src/buddy.c:2862
 msgid "Remove selected Buddy/Group"
 msgstr "Elimina Contatto/Gruppo selezionato"
 
-#: src/buddy.c:2803
+#: src/buddy.c:2889
 msgid "Edit Buddies"
 msgstr "Modifica Contatti"
 
-#: src/buddy.c:2846
+#: src/buddy.c:2932
 msgid "Gaim - Buddy List"
 msgstr "Gaim - Lista Contatti"
 
@@ -1547,21 +2018,17 @@
 msgid "Join Chat"
 msgstr "Unisciti a chat"
 
-#: src/buddy_chat.c:272
-msgid "Buddy Chat"
-msgstr "Ciatta con Contatto"
-
 #: src/buddy_chat.c:283
 msgid "Join Chat As:"
 msgstr "Unisciti a chat come:"
 
-#: src/buddy_chat.c:304 src/buddy_chat.c:392 src/dialogs.c:450
-#: src/dialogs.c:540 src/dialogs.c:715 src/dialogs.c:773 src/dialogs.c:892
-#: src/dialogs.c:1068 src/dialogs.c:1431 src/dialogs.c:1636 src/dialogs.c:1760
-#: src/dialogs.c:1820 src/dialogs.c:2042 src/dialogs.c:2224 src/dialogs.c:2399
-#: src/dialogs.c:2470 src/dialogs.c:3166 src/dialogs.c:3419 src/dialogs.c:3600
-#: src/dialogs.c:3971 src/dialogs.c:4077 src/dialogs.c:4736 src/multi.c:769
-#: src/multi.c:899 src/prpl.c:150 src/prpl.c:224
+#: src/buddy_chat.c:304 src/buddy_chat.c:392 src/dialogs.c:449
+#: src/dialogs.c:539 src/dialogs.c:715 src/dialogs.c:816 src/dialogs.c:934
+#: src/dialogs.c:1110 src/dialogs.c:1473 src/dialogs.c:1678 src/dialogs.c:1802
+#: src/dialogs.c:1862 src/dialogs.c:2084 src/dialogs.c:2266 src/dialogs.c:2441
+#: src/dialogs.c:2512 src/dialogs.c:3208 src/dialogs.c:3460 src/dialogs.c:3641
+#: src/dialogs.c:4012 src/dialogs.c:4118 src/dialogs.c:4777 src/multi.c:781
+#: src/multi.c:911 src/prpl.c:150 src/prpl.c:224
 msgid "Cancel"
 msgstr "Annulla"
 
@@ -1569,16 +2036,16 @@
 msgid "Join"
 msgstr "Inserisciti"
 
-#: src/buddy_chat.c:393 src/buddy_chat.c:396 src/buddy_chat.c:1317
-#: src/buddy_chat.c:1407
+#: src/buddy_chat.c:393 src/buddy_chat.c:396 src/buddy_chat.c:1328
+#: src/buddy_chat.c:1418
 msgid "Invite"
 msgstr "Invita"
 
-#: src/buddy_chat.c:412 src/dialogs.c:1259 src/dialogs.c:3427
+#: src/buddy_chat.c:412 src/dialogs.c:1301 src/dialogs.c:3468
 msgid "Buddy"
 msgstr "Contatto"
 
-#: src/buddy_chat.c:417 src/prefs.c:1992
+#: src/buddy_chat.c:417 src/prefs.c:2004
 msgid "Message"
 msgstr "Messaggio"
 
@@ -1586,289 +2053,285 @@
 msgid "Gaim - Invite Buddy Into Chat Room"
 msgstr "Gaim - Invita Contatto nella stanza di chat"
 
-#: src/buddy_chat.c:857
+#: src/buddy_chat.c:868
 msgid "Un-Ignore"
 msgstr "Rimuovi Ignora"
 
-#: src/buddy_chat.c:859 src/buddy_chat.c:1271
+#: src/buddy_chat.c:870 src/buddy_chat.c:1282
 msgid "Ignore"
 msgstr "Ignora"
 
 #. don't remove them from ignored in case they re-enter
-#: src/buddy_chat.c:922 src/buddy_chat.c:1034 src/buddy_chat.c:1497
-#: src/buddy_chat.c:1530
+#: src/buddy_chat.c:933 src/buddy_chat.c:1045 src/buddy_chat.c:1508
+#: src/buddy_chat.c:1541
 #, c-format
 msgid "%d %s in room"
 msgstr "%d %s nella stanza"
 
-#: src/buddy_chat.c:930
+#: src/buddy_chat.c:941
 #, c-format
 msgid "%s entered the room."
 msgstr "%s  entrato nella stanza."
 
-#: src/buddy_chat.c:996
+#: src/buddy_chat.c:1007
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s  ora visto come %s"
 
-#: src/buddy_chat.c:1043
+#: src/buddy_chat.c:1054
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s ha lasciato la stanza (%s)."
 
-#: src/buddy_chat.c:1045
+#: src/buddy_chat.c:1056
 #, c-format
 msgid "%s left the room."
 msgstr "%s ha lasciato la stanza."
 
-#: src/buddy_chat.c:1144
+#: src/buddy_chat.c:1155
 msgid "Gaim - Group Chats"
 msgstr "Gaim - Chat in gruppo"
 
-#: src/buddy_chat.c:1207
+#: src/buddy_chat.c:1218
 msgid "Topic:"
 msgstr "Argomento:"
 
-#: src/buddy_chat.c:1248
+#: src/buddy_chat.c:1259
 msgid "0 people in room"
 msgstr "Nessuno in stanza"
 
-#: src/buddy_chat.c:1322 src/buddy_chat.c:1406
+#: src/buddy_chat.c:1333 src/buddy_chat.c:1417
 msgid "Whisper"
 msgstr "Msg privato"
 
-#: src/buddy_chat.c:1327 src/buddy_chat.c:1404 src/buddy_chat.c:1453
-#: src/conversation.c:2839
+#: src/buddy_chat.c:1338 src/buddy_chat.c:1415 src/buddy_chat.c:1464
+#: src/conversation.c:2908
 msgid "Send"
 msgstr "Invia"
 
-#: src/buddy_chat.c:1447 src/conversation.c:2816
+#: src/buddy_chat.c:1458 src/conversation.c:2885
 msgid "Block"
 msgstr "Blocca"
 
-#: src/buddy_chat.c:1449 src/conversation.c:2822 src/dialogs.c:425
-#: src/dialogs.c:454
+#: src/buddy_chat.c:1460 src/conversation.c:2891 src/dialogs.c:424
+#: src/dialogs.c:453
 msgid "Warn"
 msgstr "Avviso"
 
-#: src/conversation.c:413
+#: src/conversation.c:431
 msgid "Gaim - Save Conversation"
 msgstr "Gaim - Salva la conversazione"
 
-#: src/conversation.c:474
+#: src/conversation.c:492
 #, fuzzy
 msgid "Gaim - Insert Image"
 msgstr "Gaim - Utente IM"
 
-#: src/conversation.c:1278
+#: src/conversation.c:1336
 msgid "Unable to send message: too large"
 msgstr "Messaggio non spedito: troppo lungo"
 
-#: src/conversation.c:1278 src/conversation.c:1282
+#: src/conversation.c:1336 src/conversation.c:1340
 msgid "Message Error"
 msgstr "Errore messaggio"
 
-#: src/conversation.c:1282
+#: src/conversation.c:1340
 msgid "Unable to send message: Unknown reason"
 msgstr "Impossibile spedire messaggio: motivo sconosciuto."
 
-#: src/conversation.c:1501
+#: src/conversation.c:1559
 #, c-format
 msgid "Currently at %d, "
 msgstr "Al momento a %d, "
 
-#: src/conversation.c:1509
+#: src/conversation.c:1567
 #, c-format
 msgid "Setting position to %d\n"
 msgstr "Imposta posizione a %d\n"
 
-#: src/conversation.c:2110 src/prefs.c:1305
+#: src/conversation.c:2170 src/prefs.c:1308
 msgid "Bold Text"
 msgstr "Testo Grassetto"
 
-#: src/conversation.c:2110
+#: src/conversation.c:2170
 msgid "Bold"
 msgstr "Grassetto"
 
-#: src/conversation.c:2114
+#: src/conversation.c:2174
 msgid "Italics Text"
 msgstr "Testo Corsivo"
 
-#: src/conversation.c:2115
+#: src/conversation.c:2175
 msgid "Italics"
 msgstr "Corsivo"
 
-#: src/conversation.c:2118 src/prefs.c:1317
+#: src/conversation.c:2178 src/prefs.c:1320
 msgid "Underline Text"
 msgstr "Testo Sottolineato"
 
-#: src/conversation.c:2119
+#: src/conversation.c:2179
 msgid "Underline"
 msgstr "Sottolineato"
 
-#: src/conversation.c:2123 src/prefs.c:1323
+#: src/conversation.c:2183 src/prefs.c:1326
 msgid "Strike through Text"
 msgstr "Testo barrato"
 
-#: src/conversation.c:2123
+#: src/conversation.c:2183
 msgid "Strike"
 msgstr "Barrato"
 
-#: src/conversation.c:2129
+#: src/conversation.c:2189
 msgid "Decrease font size"
 msgstr "Riduci font"
 
-#: src/conversation.c:2129
+#: src/conversation.c:2189
 msgid "Small"
 msgstr "Piccolo"
 
-#: src/conversation.c:2132
+#: src/conversation.c:2192
 msgid "Normal font size"
 msgstr "Font normale"
 
-#: src/conversation.c:2132
+#: src/conversation.c:2192
 msgid "Normal"
 msgstr "Normale"
 
-#: src/conversation.c:2135
+#: src/conversation.c:2195
 msgid "Increase font size"
 msgstr "Ingrandisci font"
 
-#: src/conversation.c:2135
+#: src/conversation.c:2195
 msgid "Big"
 msgstr "Grande"
 
-#: src/conversation.c:2142 src/dialogs.c:2841 src/dialogs.c:2865
+#: src/conversation.c:2202 src/dialogs.c:2883 src/dialogs.c:2907
 msgid "Select Font"
 msgstr "Seleziona font"
 
-#: src/conversation.c:2143
+#: src/conversation.c:2203
 msgid "Font"
 msgstr "Font"
 
-#: src/conversation.c:2146 src/prefs.c:1353
+#: src/conversation.c:2206 src/prefs.c:1356
 msgid "Text Color"
 msgstr "Colore testo"
 
-#: src/conversation.c:2147 src/conversation.c:2151
+#: src/conversation.c:2207 src/conversation.c:2211
 msgid "Color"
 msgstr "Colore"
 
-#: src/conversation.c:2151 src/prefs.c:1371
+#: src/conversation.c:2211 src/prefs.c:1374
 msgid "Background Color"
 msgstr "Colore sfondo"
 
-#: src/conversation.c:2158 src/dialogs.c:2464
+#: src/conversation.c:2218 src/dialogs.c:2506
 msgid "Insert Link"
 msgstr "Inserisci link"
 
-#: src/conversation.c:2159
+#: src/conversation.c:2219
 msgid "Link"
 msgstr "Link"
 
-#: src/conversation.c:2162
+#: src/conversation.c:2222
 msgid "Insert smiley face"
 msgstr "Inserisci faccina"
 
-#: src/conversation.c:2162
+#: src/conversation.c:2222
 msgid "Smiley"
 msgstr "Faccine"
 
-#: src/conversation.c:2165
+#: src/conversation.c:2225
 #, fuzzy
 msgid "Insert IM Image"
 msgstr "Immagine di IM"
 
-#: src/conversation.c:2165
+#: src/conversation.c:2225
 #, fuzzy
 msgid "Image"
 msgstr "Immagine di IM"
 
-#: src/conversation.c:2172
+#: src/conversation.c:2232
 msgid "Enable logging"
 msgstr "Abilita i log"
 
-#: src/conversation.c:2173 src/prefs.c:254
+#: src/conversation.c:2233 src/prefs.c:254
 msgid "Logging"
 msgstr "Log"
 
-#: src/conversation.c:2182
+#: src/conversation.c:2242
 msgid "Save Conversation"
 msgstr "Salva la conversazione"
 
-#: src/conversation.c:2183 src/dialogs.c:1640 src/dialogs.c:1824
-#: src/dialogs.c:3178 src/dialogs.c:3867 src/dialogs.c:4744
+#: src/conversation.c:2243 src/dialogs.c:1682 src/dialogs.c:1866
+#: src/dialogs.c:3220 src/dialogs.c:3908 src/dialogs.c:4785
 msgid "Save"
 msgstr "Salva"
 
-#: src/conversation.c:2187
-msgid "Enable sounds"
-msgstr "Abilita suoni"
-
-#: src/conversation.c:2188
+#: src/conversation.c:2247 src/conversation.c:2248
 msgid "Sound"
 msgstr "Suoni"
 
-#: src/conversation.c:2668
+#: src/conversation.c:2729
 msgid "Gaim - Conversations"
 msgstr "Gaim - Conversazioni"
 
-#: src/conversation.c:2755
+#: src/conversation.c:2816
 msgid "Send message as: "
 msgstr "Manda messaggio come: "
 
-#: src/conversation.c:3373
+#: src/conversation.c:3453
 msgid "Gaim - Save Icon"
 msgstr "Gaim - Salva icona"
 
-#: src/conversation.c:3400
+#: src/conversation.c:3487
 msgid "Disable Animation"
 msgstr "Disabilita animazione"
 
-#: src/conversation.c:3405
+#: src/conversation.c:3492
 msgid "Enable Animation"
 msgstr "Abilita animazione"
 
-#: src/conversation.c:3411
+#: src/conversation.c:3498
 msgid "Hide Icon"
 msgstr "Nascondi icona"
 
-#: src/conversation.c:3417
+#: src/conversation.c:3504
 msgid "Save Icon As..."
 msgstr "Salva icona come..."
 
-#: src/dialogs.c:413
+#: src/dialogs.c:412
 msgid "Gaim - Warn user?"
 msgstr "Gaim - Avvisa l'utente?"
 
-#: src/dialogs.c:433
+#: src/dialogs.c:432
 #, c-format
 msgid "Do you really want to warn %s?"
 msgstr "Vuoi davvero avvisare %s?"
 
-#: src/dialogs.c:438
+#: src/dialogs.c:437
 msgid "Warn anonymously?"
 msgstr "Avvisa come anonimo?"
 
-#: src/dialogs.c:442
+#: src/dialogs.c:441
 msgid "Anonymous warnings are less harsh."
 msgstr "Gli avvisi anonimi sono meno aggressivi."
 
-#: src/dialogs.c:470
+#: src/dialogs.c:469
 #, c-format
 msgid "Removing '%s' from buddylist.\n"
 msgstr "Rimozione di '%s' da lista contatti.\n"
 
-#: src/dialogs.c:495
+#: src/dialogs.c:494
 #, c-format
 msgid "Gaim - Remove %s?"
 msgstr "Gaim - Rimuovi %s?"
 
-#: src/dialogs.c:508
+#: src/dialogs.c:507
 msgid "Remove Buddy"
 msgstr "Rimuovi Contatto"
 
-#: src/dialogs.c:518
+#: src/dialogs.c:517
 #, c-format
 msgid ""
 "You are about to remove '%s' from\n"
@@ -1877,14 +2340,14 @@
 "Stai per rimuovere '%s' dalla\n"
 "lista dei contatti. Vuoi continuare?"
 
-#: src/dialogs.c:530 src/prpl.c:154 src/prpl.c:228
+#: src/dialogs.c:529 src/prpl.c:154 src/prpl.c:228
 msgid "Accept"
 msgstr "Accetta"
 
 #. Build OK Button
-#: src/dialogs.c:637 src/dialogs.c:720 src/dialogs.c:778 src/dialogs.c:1435
-#: src/dialogs.c:1764 src/dialogs.c:1915 src/dialogs.c:2223 src/dialogs.c:2403
-#: src/dialogs.c:2469 src/dialogs.c:3976 src/dialogs.c:4082 src/multi.c:774
+#: src/dialogs.c:635 src/dialogs.c:720 src/dialogs.c:821 src/dialogs.c:1477
+#: src/dialogs.c:1806 src/dialogs.c:1957 src/dialogs.c:2265 src/dialogs.c:2445
+#: src/dialogs.c:2511 src/dialogs.c:4017 src/dialogs.c:4123 src/multi.c:786
 msgid "OK"
 msgstr "OK"
 
@@ -1896,338 +2359,343 @@
 msgid "IM who:"
 msgstr "IM chi:"
 
-#: src/dialogs.c:756
+#: src/dialogs.c:768
 msgid "User:"
 msgstr "Utente:"
 
+#: src/dialogs.c:777
+#, fuzzy
+msgid "Account:"
+msgstr "Account"
+
 #. Finish up
-#: src/dialogs.c:783
+#: src/dialogs.c:826
 msgid "Gaim - Get User Info"
 msgstr "Gaim - Vedi info utente"
 
-#: src/dialogs.c:898
+#: src/dialogs.c:940
 msgid "Add Group"
 msgstr "Aggiungi Gruppo"
 
-#: src/dialogs.c:923
+#: src/dialogs.c:965
 msgid "Gaim - Add Group"
 msgstr "Gaim - Aggiungi Gruppo"
 
-#: src/dialogs.c:1007
+#: src/dialogs.c:1049
 msgid "Gaim - Add Buddy"
 msgstr "Gaim - Aggiungi Contatto"
 
-#: src/dialogs.c:1019
+#: src/dialogs.c:1061
 msgid "Add Buddy"
 msgstr "Aggiungi Contatto"
 
-#: src/dialogs.c:1029
+#: src/dialogs.c:1071
 msgid "Contact"
 msgstr "Contatto"
 
 #. Set up stuff for the account box
-#: src/dialogs.c:1055
+#: src/dialogs.c:1097
 msgid "Add To"
 msgstr "Aggiungi a"
 
-#: src/dialogs.c:1092
+#: src/dialogs.c:1134
 msgid "Please enter a buddy to pounce."
 msgstr "Inserisci un contatto al salto."
 
-#: src/dialogs.c:1092
+#: src/dialogs.c:1134
 msgid "Buddy Pounce Error"
 msgstr "Errore di salto a contatto"
 
-#: src/dialogs.c:1228
+#: src/dialogs.c:1270
 msgid "Gaim - New Buddy Pounce"
 msgstr "Gaim - Nuovo Salto a Contatto"
 
 #. <pounce type="who">
-#: src/dialogs.c:1239
+#: src/dialogs.c:1281
 msgid "Pounce Who"
 msgstr "Salto a chi"
 
-#: src/dialogs.c:1250
+#: src/dialogs.c:1292
 msgid "Account"
 msgstr "Account"
 
 #. </pounce type="who">
 #. <pounce type="when">
-#: src/dialogs.c:1276
+#: src/dialogs.c:1318
 msgid "Pounce When"
 msgstr "Salto dove"
 
-#: src/dialogs.c:1286
+#: src/dialogs.c:1328
 msgid "Pounce on sign on"
 msgstr "Salto appena entrato"
 
-#: src/dialogs.c:1295
+#: src/dialogs.c:1337
 msgid "Pounce on return from away"
 msgstr "Salto appena tornato da Assente"
 
-#: src/dialogs.c:1304
+#: src/dialogs.c:1346
 msgid "Pounce on return from idle"
 msgstr "Salto appena tornato da Riposo"
 
-#: src/dialogs.c:1313
+#: src/dialogs.c:1355
 msgid "Pounce when buddy is typing to you"
 msgstr "Salta quando Contatto ti scrive"
 
 #. </pounce type="when">
 #. <pounce type="action">
-#: src/dialogs.c:1323
+#: src/dialogs.c:1365
 msgid "Pounce Action"
 msgstr "Azioni di salto"
 
-#: src/dialogs.c:1334
+#: src/dialogs.c:1376
 msgid "Open IM Window"
 msgstr "Apri finestra di IM"
 
-#: src/dialogs.c:1343
+#: src/dialogs.c:1385
 msgid "Popup Notification"
 msgstr "Notifica Popup"
 
-#: src/dialogs.c:1352
+#: src/dialogs.c:1394
 msgid "Send Message"
 msgstr "Invia messaggio"
 
-#: src/dialogs.c:1373
+#: src/dialogs.c:1415
 msgid "Execute command on pounce"
 msgstr "Esegui il comando al salto"
 
-#: src/dialogs.c:1395
+#: src/dialogs.c:1437
 msgid "Play sound on pounce"
 msgstr "Suona al salto"
 
 #. </pounce type="action">
-#: src/dialogs.c:1417
+#: src/dialogs.c:1459
 msgid "Save this pounce after activation"
 msgstr "Salva questo salto dopo attivazione"
 
-#: src/dialogs.c:1503
+#: src/dialogs.c:1545
 msgid "Gaim - Set Dir Info"
 msgstr "Gaim - Imposta Dir Info"
 
-#: src/dialogs.c:1512
+#: src/dialogs.c:1554
 msgid "Directory Info"
 msgstr "Info Directory"
 
-#: src/dialogs.c:1534
+#: src/dialogs.c:1576
 msgid "Allow Web Searches To Find Your Info"
 msgstr "Metti le tue info a disposizione nel Web"
 
 #. Line 1
-#: src/dialogs.c:1537 src/dialogs.c:2242
+#: src/dialogs.c:1579 src/dialogs.c:2284
 msgid "First Name"
 msgstr "Nome"
 
 #. Line 2
-#: src/dialogs.c:1548 src/dialogs.c:2254
+#: src/dialogs.c:1590 src/dialogs.c:2296
 msgid "Middle Name"
 msgstr "Secondo nome"
 
 #. Line 3
-#: src/dialogs.c:1560 src/dialogs.c:2266
+#: src/dialogs.c:1602 src/dialogs.c:2308
 msgid "Last Name"
 msgstr "Cognome"
 
 #. Line 4
-#: src/dialogs.c:1571 src/dialogs.c:2278
+#: src/dialogs.c:1613 src/dialogs.c:2320
 msgid "Maiden Name"
 msgstr "Nome da nubile"
 
 #. Line 6
-#: src/dialogs.c:1593 src/dialogs.c:2301
+#: src/dialogs.c:1635 src/dialogs.c:2343
 msgid "State"
 msgstr "Stato civile"
 
-#: src/dialogs.c:1658
+#: src/dialogs.c:1700
 msgid "New Passwords Do Not Match"
 msgstr "Le nuove password non coincidono"
 
-#: src/dialogs.c:1658 src/dialogs.c:1663
+#: src/dialogs.c:1700 src/dialogs.c:1705
 msgid "Gaim - Change Password Error"
 msgstr "Gaim - Errore di cambio Password"
 
-#: src/dialogs.c:1663
+#: src/dialogs.c:1705
 msgid "Fill out all fields completely"
 msgstr "Riempi completamente i campi"
 
-#: src/dialogs.c:1718
+#: src/dialogs.c:1760
 msgid "Original Password"
 msgstr "Password attuale"
 
-#: src/dialogs.c:1732
+#: src/dialogs.c:1774
 msgid "New Password"
 msgstr "Nuova password"
 
-#: src/dialogs.c:1746
+#: src/dialogs.c:1788
 msgid "New Password (again)"
 msgstr "Nuova password (di nuovo)"
 
-#: src/dialogs.c:1787
+#: src/dialogs.c:1829
 msgid "Gaim - Set User Info"
 msgstr "Gaim - Imposta info utente"
 
-#: src/dialogs.c:1899
+#: src/dialogs.c:1941
 msgid "Below are the results of your search: "
 msgstr "Sotto i risultati della ricerca: "
 
-#: src/dialogs.c:2032 src/dialogs.c:2039
+#: src/dialogs.c:2074 src/dialogs.c:2081
 msgid "Permit"
 msgstr "Autorizza"
 
-#: src/dialogs.c:2034 src/dialogs.c:2041
+#: src/dialogs.c:2076 src/dialogs.c:2083
 msgid "Deny"
 msgstr "Nega"
 
-#: src/dialogs.c:2078
+#: src/dialogs.c:2120
 msgid "Gaim - Add Permit"
 msgstr "Gaim - Aggiugni Autorizzazione"
 
-#: src/dialogs.c:2080
+#: src/dialogs.c:2122
 msgid "Gaim - Add Deny"
 msgstr "Gaim - Aggiungi Diniego"
 
-#: src/dialogs.c:2140
+#: src/dialogs.c:2182
 msgid "Gaim - Log Conversation"
 msgstr "Gaim - Registro Conversazione"
 
-#: src/dialogs.c:2218 src/dialogs.c:2381
+#: src/dialogs.c:2260 src/dialogs.c:2423
 msgid "Search for Buddy"
 msgstr "Cerca Contatto"
 
-#: src/dialogs.c:2346
+#: src/dialogs.c:2388
 msgid "Gaim - Find Buddy By Info"
 msgstr "Gaim - Cerca Contatto da Info"
 
-#: src/dialogs.c:2375
+#: src/dialogs.c:2417
 msgid "Gaim - Find Buddy By Email"
 msgstr "Gaim - Cerca Contatto da E-mail"
 
-#: src/dialogs.c:2515
+#: src/dialogs.c:2557
 msgid "Gaim - Add URL"
 msgstr "Gaim - Aggiungi URL"
 
-#: src/dialogs.c:2666 src/dialogs.c:2687 src/dialogs.c:2741
+#: src/dialogs.c:2708 src/dialogs.c:2729 src/dialogs.c:2783
 msgid "Select Text Color"
 msgstr "Seleziona colore testo"
 
-#: src/dialogs.c:2720
+#: src/dialogs.c:2762
 msgid "Select Background Color"
 msgstr "Seleziona colore sfondo"
 
-#: src/dialogs.c:2942
+#: src/dialogs.c:2984
 msgid "Import to:"
 msgstr "Importa in:"
 
-#: src/dialogs.c:2966
+#: src/dialogs.c:3008
 msgid "Gaim - Import Buddy List"
 msgstr "Gaim - Importa lista dei contatti"
 
 #. We shouldn't allow a blank title
-#: src/dialogs.c:3033
+#: src/dialogs.c:3075
 msgid "You cannot create an away message with a blank title"
 msgstr "Non puoi creare un messaggio di Assente con titolo vuoto"
 
 #. We shouldn't allow a blank message
-#: src/dialogs.c:3040
+#: src/dialogs.c:3082
 msgid "You cannot create an empty away message"
 msgstr "Non puoi creare un messaggio di Assente vuoto"
 
-#: src/dialogs.c:3108
+#: src/dialogs.c:3150
 msgid "Gaim - New away message"
 msgstr "Gaim - Nuovo messaggio di Assente"
 
-#: src/dialogs.c:3118
+#: src/dialogs.c:3160
 msgid "New away message"
 msgstr "Nuovo messaggio di Assente"
 
-#: src/dialogs.c:3131
+#: src/dialogs.c:3173
 msgid "Away title: "
 msgstr "Titolo di Assente: "
 
-#: src/dialogs.c:3170
+#: src/dialogs.c:3212
 msgid "Use"
 msgstr "Utilizzo"
 
-#: src/dialogs.c:3174
+#: src/dialogs.c:3216
 msgid "Save & Use"
 msgstr "Salva & Usa"
 
 #. show everything
-#: src/dialogs.c:3372
+#: src/dialogs.c:3413
 msgid "Smile!"
 msgstr "Sorridi!"
 
-#: src/dialogs.c:3425
+#: src/dialogs.c:3466
 msgid "Alias Buddy"
 msgstr "Alias Contatto"
 
-#: src/dialogs.c:3458
+#: src/dialogs.c:3499
 msgid "Gaim - Alias Buddy"
 msgstr "Gaim - Alias Contatto"
 
-#: src/dialogs.c:3530
+#: src/dialogs.c:3571
 msgid "Gaim - Save Log File"
 msgstr "Gaim - Salva file di log"
 
-#: src/dialogs.c:3562
+#: src/dialogs.c:3603
 #, c-format
 msgid "Unable to remove file %s - %s"
 msgstr "Impossibile rimuovere il file %s - %s"
 
-#: src/dialogs.c:3590
+#: src/dialogs.c:3631
 msgid "Really clear log?"
 msgstr "Cancello davvero il log?"
 
-#: src/dialogs.c:3605
+#: src/dialogs.c:3646
 msgid "Okay"
 msgstr "Va bene!"
 
-#: src/dialogs.c:3776
+#: src/dialogs.c:3817
 msgid "Date"
 msgstr "Data"
 
-#: src/dialogs.c:3839
+#: src/dialogs.c:3880
 msgid "Conversation"
 msgstr "Conversazione"
 
-#: src/dialogs.c:3862
+#: src/dialogs.c:3903
 msgid "Clear"
 msgstr "Pulisci"
 
-#: src/dialogs.c:3940
+#: src/dialogs.c:3981
 msgid "Gaim - Rename Group"
 msgstr "Gaim - Rinomina Gruppo"
 
-#: src/dialogs.c:3950
+#: src/dialogs.c:3991
 msgid "Rename Group"
 msgstr "Rinomina Gruppo"
 
-#: src/dialogs.c:3957 src/dialogs.c:4063
+#: src/dialogs.c:3998 src/dialogs.c:4104
 msgid "New name:"
 msgstr "Nuovo nome:"
 
-#: src/dialogs.c:4046
+#: src/dialogs.c:4087
 msgid "Gaim - Rename Buddy"
 msgstr "Gaim - Rinomina Contatto"
 
-#: src/dialogs.c:4056
+#: src/dialogs.c:4097
 msgid "Rename Buddy"
 msgstr "Rinomina Contatto"
 
 #. Below is basically stolen from plugins.c
-#: src/dialogs.c:4140
+#: src/dialogs.c:4181
 msgid "Gaim - Select Perl Script"
 msgstr "Gaim - Seleziona script Perl"
 
-#: src/gaimrc.c:1117
+#: src/gaimrc.c:1136
 #, c-format
 msgid "Could not open config file %s."
 msgstr "File di configurazione %s non aperto."
 
-#: src/gaimrc.c:1118
+#: src/gaimrc.c:1137
 msgid "Preferences Error"
 msgstr "Errore di Preferenze"
 
@@ -2240,55 +2708,65 @@
 msgid "g003: Error opening connection.\n"
 msgstr "g003: Errore apertura connessione.\n"
 
-#: src/multi.c:452
+#: src/module.c:106 src/module.c:112 src/module.c:122
+#, fuzzy
+msgid "Plugin Error"
+msgstr "Errore di login"
+
+#: src/multi.c:454
 msgid "Gaim - Load Buddy Icon"
 msgstr "Gaim - Carica Icona Contatto"
 
-#: src/multi.c:495
+#: src/multi.c:497
 msgid "Buddy Icon File:"
 msgstr "File icona Contatto:"
 
-#: src/multi.c:506
+#: src/multi.c:508
 msgid "Browse"
 msgstr "Esamina"
 
-#: src/multi.c:511 src/prefs.c:1545
+#: src/multi.c:513 src/prefs.c:1548
 msgid "Reset"
 msgstr "Reimposta"
 
-#: src/multi.c:538
+#: src/multi.c:540
 msgid "Screenname:"
 msgstr "Nome account:"
 
-#: src/multi.c:558
+#: src/multi.c:559
+#, fuzzy
+msgid "Alias:"
+msgstr "Alias"
+
+#: src/multi.c:569
 msgid "Protocol:"
 msgstr "Protocollo:"
 
-#: src/multi.c:563
+#: src/multi.c:574
 msgid "Remember Password"
 msgstr "Memorizzo password"
 
-#: src/multi.c:564
+#: src/multi.c:575
 msgid "Auto-Login"
 msgstr "Auto Login"
 
-#: src/multi.c:604
+#: src/multi.c:616
 msgid "New Mail Notifications"
 msgstr "Notifica nuova mail"
 
-#: src/multi.c:694
+#: src/multi.c:706
 msgid "Register with server"
 msgstr "Registro dal server"
 
-#: src/multi.c:752
+#: src/multi.c:764
 msgid "Gaim - Modify Account"
 msgstr "Gaim - Modifica Account"
 
-#: src/multi.c:871
+#: src/multi.c:883
 msgid "Enter Password"
 msgstr "Inserisci password"
 
-#: src/multi.c:935
+#: src/multi.c:947
 msgid ""
 "You cannot log this account in; you do not have the protocol it uses loaded, "
 "or the protocol does not have a login function."
@@ -2296,44 +2774,44 @@
 "Non puoi entrare con questo account; non hai caricato il protocollo giusto "
 "oppure quel protocollo non ha una funzione di login."
 
-#: src/multi.c:937
+#: src/multi.c:949
 msgid "Login Error"
 msgstr "Errore di login"
 
-#: src/multi.c:966
+#: src/multi.c:978
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "Sei sicuro che vuoi eliminare %s?"
 
-#: src/multi.c:1003
+#: src/multi.c:1015
 msgid "Gaim - Account Editor"
 msgstr "Gaim - Editore Account"
 
-#: src/multi.c:1022
+#: src/multi.c:1034
 msgid "Select All"
 msgstr "Seleziona tutti"
 
-#: src/multi.c:1027
+#: src/multi.c:1039
 msgid "Select Autos"
 msgstr "Seleziona gli Auto"
 
-#: src/multi.c:1031
+#: src/multi.c:1043
 msgid "Select None"
 msgstr "Annulla selezione"
 
-#: src/multi.c:1045
+#: src/multi.c:1057
 msgid "Modify"
 msgstr "Modifica"
 
-#: src/multi.c:1049
+#: src/multi.c:1061
 msgid "Sign On/Off"
 msgstr "Entra/Esci"
 
-#: src/multi.c:1053
+#: src/multi.c:1065
 msgid "Delete"
 msgstr "Elimina"
 
-#: src/multi.c:1368
+#: src/multi.c:1380
 #, c-format
 msgid ""
 "%s\n"
@@ -2342,26 +2820,26 @@
 "%s\n"
 "%s: %s"
 
-#: src/multi.c:1387
+#: src/multi.c:1399
 #, c-format
 msgid "%s was unable to sign on"
 msgstr "%s non riesce a entrare"
 
-#: src/multi.c:1398
+#: src/multi.c:1410
 msgid "Notice"
 msgstr "Notifica"
 
-#: src/multi.c:1408
+#: src/multi.c:1420
 #, fuzzy, c-format
 msgid "%s has been signed off"
 msgstr "%s non riesce a entrare"
 
-#: src/multi.c:1409
+#: src/multi.c:1421
 #, fuzzy
 msgid "Connection Error"
 msgstr "Connessione chiusa."
 
-#: src/perl.c:856
+#: src/perl.c:875
 msgid "Perl Scripts"
 msgstr "Script Perl"
 
@@ -2423,9 +2901,9 @@
 msgid "General Options"
 msgstr "Opzioni generali"
 
-#: src/prefs.c:200 src/prefs.c:383 src/prefs.c:551 src/prefs.c:665
-#: src/prefs.c:918 src/prefs.c:1068 src/prefs.c:1293 src/prefs.c:1615
-#: src/prefs.c:1889 src/prefs.c:2322
+#: src/prefs.c:200 src/prefs.c:384 src/prefs.c:552 src/prefs.c:667
+#: src/prefs.c:921 src/prefs.c:1071 src/prefs.c:1296 src/prefs.c:1629
+#: src/prefs.c:1901 src/prefs.c:2334
 msgid "All options take effect immediately unless otherwise noted."
 msgstr ""
 "Tutte le opzioni hanno effetto immediato se non altrimenti specificato."
@@ -2500,8 +2978,8 @@
 msgstr "Browser"
 
 #: src/prefs.c:291
-msgid "KFM"
-msgstr "KFM"
+msgid "Konqueror"
+msgstr ""
 
 #: src/prefs.c:292
 msgid "Opera"
@@ -2511,27 +2989,32 @@
 msgid "Netscape"
 msgstr "Netscape"
 
-#: src/prefs.c:296
+#: src/prefs.c:294
+msgid "Mozilla"
+msgstr ""
+
+#: src/prefs.c:297
 msgid "Pop up new window by default"
 msgstr "Crea nuova finestra di default"
 
-#: src/prefs.c:303
+#: src/prefs.c:304
 msgid "GNOME URL Handler"
 msgstr "Gestore URL di GNOME"
 
-#: src/prefs.c:305
+#: src/prefs.c:306
 msgid "Galeon"
 msgstr "Galeon"
 
-#: src/prefs.c:306
-msgid "Manual"
-msgstr "Manuale"
-
-#: src/prefs.c:375
+#: src/prefs.c:307
+#, c-format
+msgid "Manual (%s for URL)"
+msgstr ""
+
+#: src/prefs.c:376
 msgid "Proxy Options"
 msgstr "Opzioni Proxy"
 
-#: src/prefs.c:387
+#: src/prefs.c:388
 msgid ""
 "Not all protocols can use these proxy options. Please see the README file "
 "for details."
@@ -2539,371 +3022,381 @@
 "Non tutti i protocolli usano queste opzioni proxy. Leggi il file README per "
 "i dettagli."
 
-#: src/prefs.c:392
+#: src/prefs.c:393
 msgid "Proxy Type"
 msgstr "Tipo di Proxy"
 
-#: src/prefs.c:404
+#: src/prefs.c:405
 msgid "Proxy Server"
 msgstr "Server Proxy"
 
-#: src/prefs.c:407
+#: src/prefs.c:408
 msgid "No Proxy"
 msgstr "Nessun Proxy"
 
-#: src/prefs.c:419
+#: src/prefs.c:420
 msgid "SOCKS 4"
 msgstr "SOCKS 4"
 
-#: src/prefs.c:429
+#: src/prefs.c:430
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
-#: src/prefs.c:438
+#: src/prefs.c:439
 msgid "HTTP"
 msgstr "HTTP"
 
-#: src/prefs.c:462
+#: src/prefs.c:463
 msgid "Host"
 msgstr "Host"
 
-#: src/prefs.c:478
+#: src/prefs.c:479
 msgid "Port"
 msgstr "Porta"
 
-#: src/prefs.c:495
+#: src/prefs.c:496
 msgid "User"
 msgstr "Utente"
 
-#: src/prefs.c:511
+#: src/prefs.c:512
 msgid "Password"
 msgstr "Password"
 
-#: src/prefs.c:543
+#: src/prefs.c:544
 msgid "Buddy List Options"
 msgstr "Opzioni lista contatti"
 
-#: src/prefs.c:555
+#: src/prefs.c:556
 msgid "Buddy List Window"
 msgstr "Finestra lista contatti"
 
-#: src/prefs.c:568
+#: src/prefs.c:569
 #, fuzzy
 msgid "Tab Placement:"
 msgstr "Posizione linguetta"
 
-#: src/prefs.c:572 src/prefs.c:1001 src/prefs.c:1151
+#: src/prefs.c:573 src/prefs.c:1004 src/prefs.c:1154
 msgid "Top"
 msgstr "In alto"
 
-#: src/prefs.c:573 src/prefs.c:1003 src/prefs.c:1153
+#: src/prefs.c:574 src/prefs.c:1006 src/prefs.c:1156
 msgid "Bottom"
 msgstr "In basso"
 
-#: src/prefs.c:585
+#: src/prefs.c:586
 msgid "Hide IM/Info/Chat buttons"
 msgstr "Nascondi bottoni IM/Info/Chat"
 
-#: src/prefs.c:587
+#: src/prefs.c:588
 msgid "Automatically show buddy list on sign on"
 msgstr "Mostra lista contatti all'entrata"
 
-#: src/prefs.c:589
+#: src/prefs.c:590
 msgid "Display Buddy List near applet"
 msgstr "Mostra lista contatti vicino applet"
 
-#: src/prefs.c:592
+#: src/prefs.c:593
 msgid "Save Window Size/Position"
 msgstr "Salva posiz./dimens. finestra"
 
-#: src/prefs.c:595
+#: src/prefs.c:596
 msgid "Show pictures on buttons"
 msgstr "Mostra figure su bottoni"
 
 #: src/prefs.c:600
+msgid "Raise Buddy List on Signons and Signoffs"
+msgstr ""
+
+#: src/prefs.c:602
 msgid "Group Displays"
 msgstr "Visualizzazioni Gruppo"
 
-#: src/prefs.c:612
+#: src/prefs.c:614
 msgid "Hide groups with no online buddies"
 msgstr "Nascondi gruppi senza contatti collegati"
 
-#: src/prefs.c:618
+#: src/prefs.c:620
 msgid "Show numbers in groups"
 msgstr "Mostra numeri nei gruppi"
 
-#: src/prefs.c:620
+#: src/prefs.c:622
 msgid "Buddy Displays"
 msgstr "Visualizzazioni Contatto"
 
-#: src/prefs.c:632
+#: src/prefs.c:634
 msgid "Show buddy type icons"
 msgstr "Mostra tipo icone di contatto"
 
-#: src/prefs.c:633
+#: src/prefs.c:635
 msgid "Show warning levels"
 msgstr "Mostra livelli di avviso"
 
-#: src/prefs.c:639
+#: src/prefs.c:641
 msgid "Show idle times"
 msgstr "Mostra tempi di Riposo"
 
-#: src/prefs.c:640
+#: src/prefs.c:642
 msgid "Grey idle buddies"
 msgstr "Ingrigisci contatti in Riposo"
 
-#: src/prefs.c:657
+#: src/prefs.c:659
 msgid "Conversation Options"
 msgstr "Opzioni conversazione"
 
-#: src/prefs.c:669
+#: src/prefs.c:671
 msgid "Keyboard Options"
 msgstr "Opzioni tastiera"
 
-#: src/prefs.c:681
-msgid "Enter sends message"
-msgstr "Tasto 'Invio' manda messaggio"
-
-#: src/prefs.c:682
-msgid "Control-Enter sends message"
-msgstr "Ctrl-Invio manda messaggio"
-
 #: src/prefs.c:683
+msgid "Enter sends message"
+msgstr "Tasto 'Invio' manda messaggio"
+
+#: src/prefs.c:684
+msgid "Control-Enter sends message"
+msgstr "Ctrl-Invio manda messaggio"
+
+#: src/prefs.c:685
 msgid "Escape closes window"
 msgstr "Esc chiude la finestra"
 
-#: src/prefs.c:689
+#: src/prefs.c:686
+#, fuzzy
+msgid "Control-W closes window"
+msgstr "Esc chiude la finestra"
+
+#: src/prefs.c:692
 msgid "Control-{B/I/U/S} inserts HTML tags"
 msgstr "Ctrl-{B/I/U/S} inserisce tag HTML"
 
-#: src/prefs.c:690
+#: src/prefs.c:693
 msgid "Control-(number) inserts smileys"
 msgstr "Ctrl-(numero) inserisce faccina"
 
-#: src/prefs.c:691
+#: src/prefs.c:694
 msgid "F2 toggles timestamp display"
 msgstr "F2 cambia stato visualizzatore tempo"
 
-#: src/prefs.c:693
+#: src/prefs.c:696
 msgid "Display and General Options"
 msgstr "Opzioni Visualizzazione e Generali"
 
-#: src/prefs.c:705
+#: src/prefs.c:708
 msgid "Show graphical smileys"
 msgstr "Mostra faccine grafiche"
 
-#: src/prefs.c:706
+#: src/prefs.c:709
 msgid "Show timestamp on messages"
 msgstr "Mostra tempo nei messaggi"
 
-#: src/prefs.c:707
+#: src/prefs.c:710
 msgid "Show URLs as links"
 msgstr "Mostra URL come link"
 
-#: src/prefs.c:708
+#: src/prefs.c:711
 msgid "Highlight misspelled words"
 msgstr "Evidenzia parole errate"
 
-#: src/prefs.c:709 src/prefs.c:1911
+#: src/prefs.c:712 src/prefs.c:1923
 msgid "Sending messages removes away status"
 msgstr "Spedire un messaggio rimuove stato Assente"
 
-#: src/prefs.c:710 src/prefs.c:1924
+#: src/prefs.c:713 src/prefs.c:1936
 msgid "Queue new messages when away"
 msgstr "Accoda nuovi messaggi se sei Assente"
 
-#: src/prefs.c:716
+#: src/prefs.c:719
 msgid "Ignore colors"
 msgstr "Ignora i colori"
 
-#: src/prefs.c:717
+#: src/prefs.c:720
 msgid "Ignore font faces"
 msgstr "Ignora il seme dei font"
 
-#: src/prefs.c:718
+#: src/prefs.c:721
 msgid "Ignore font sizes"
 msgstr "Ignora la dimensione dei font"
 
-#: src/prefs.c:719
+#: src/prefs.c:722
 msgid "Ignore TiK Automated Messages"
 msgstr "Ignora messaggi automatizzati TiK"
 
-#: src/prefs.c:720 src/prefs.c:1909
+#: src/prefs.c:723 src/prefs.c:1921
 msgid "Ignore new conversations when away"
 msgstr "Ignora nuove conversazioni se Assente"
 
-#: src/prefs.c:909
+#: src/prefs.c:912
 msgid "IM Options"
 msgstr "Opzioni IM"
 
-#: src/prefs.c:922 src/prefs.c:2907
+#: src/prefs.c:925 src/prefs.c:2921
 msgid "IM Window"
 msgstr "Finestra di IM"
 
-#: src/prefs.c:938 src/prefs.c:1088
+#: src/prefs.c:941 src/prefs.c:1091
 msgid "Show buttons as: "
 msgstr "Mostra i bottoni come: "
 
-#: src/prefs.c:942 src/prefs.c:1093
+#: src/prefs.c:945 src/prefs.c:1096
 msgid "Pictures And Text"
 msgstr "Testo e Figure"
 
-#: src/prefs.c:943 src/prefs.c:1095
+#: src/prefs.c:946 src/prefs.c:1098
 msgid "Pictures"
 msgstr "Figure"
 
-#: src/prefs.c:944 src/prefs.c:1096
+#: src/prefs.c:947 src/prefs.c:1099
 msgid "Text"
 msgstr "Testo"
 
-#: src/prefs.c:955
+#: src/prefs.c:958
 msgid "Show all conversations in one tabbed window"
 msgstr "Tutte le conversazioni in una finestra a schede"
 
-#: src/prefs.c:957
+#: src/prefs.c:960
 msgid "Show chats in the same tabbed window"
 msgstr "Tutte le chat in una finestra a schede"
 
-#: src/prefs.c:964 src/prefs.c:1116
+#: src/prefs.c:967 src/prefs.c:1119
 msgid "Raise windows on events"
 msgstr "Evidenzia finestra ad un evento"
 
-#: src/prefs.c:965
+#: src/prefs.c:968
 msgid "Show logins in window"
 msgstr "Mostra account nella finestra"
 
-#: src/prefs.c:966
-msgid "Show aliases in tabs/titles"
+#: src/prefs.c:969
+#, fuzzy
+msgid "Show aliases in tabs/titles/ticker"
 msgstr "Alias nelle linguette/titoli schede"
 
-#: src/prefs.c:967
+#: src/prefs.c:970
 msgid "Hide window on send"
 msgstr "Nascondi finestra dopo l'invio"
 
-#: src/prefs.c:969 src/prefs.c:1119
+#: src/prefs.c:972 src/prefs.c:1122
 msgid "Window Sizes"
 msgstr "Dimensione finestra"
 
-#: src/prefs.c:977 src/prefs.c:1127
+#: src/prefs.c:980 src/prefs.c:1130
 msgid "New window width:"
 msgstr "Nuova larghezza finestra:"
 
-#: src/prefs.c:978 src/prefs.c:1128
+#: src/prefs.c:981 src/prefs.c:1131
 msgid "New window height:"
 msgstr "Nuova altezza finestra:"
 
-#: src/prefs.c:979 src/prefs.c:1129
+#: src/prefs.c:982 src/prefs.c:1132
 msgid "Entry widget height:"
 msgstr "Altezza campo di testo:"
 
-#: src/prefs.c:981 src/prefs.c:1131
+#: src/prefs.c:984 src/prefs.c:1134
 msgid "Tab Placement"
 msgstr "Posizione linguetta"
 
-#: src/prefs.c:1010 src/prefs.c:1160
+#: src/prefs.c:1013 src/prefs.c:1163
 msgid "Left"
 msgstr "A sinistra"
 
-#: src/prefs.c:1012 src/prefs.c:1162
+#: src/prefs.c:1015 src/prefs.c:1165
 msgid "Right"
 msgstr "A destra"
 
-#: src/prefs.c:1016
+#: src/prefs.c:1019
 msgid "Buddy Icons"
 msgstr "Icone Contatti"
 
-#: src/prefs.c:1028
+#: src/prefs.c:1031
 msgid "Hide Buddy Icons"
 msgstr "Nascondi Icone Contatti"
 
-#: src/prefs.c:1034
+#: src/prefs.c:1037
 #, fuzzy
 msgid "Disable Buddy Icon Animation"
 msgstr "Disabilita animazione"
 
-#: src/prefs.c:1060
+#: src/prefs.c:1063
 msgid "Chat Options"
 msgstr "Opzioni di Chat"
 
-#: src/prefs.c:1072
+#: src/prefs.c:1075
 msgid "Group Chat Window"
 msgstr "Finestra chat gruppo"
 
-#: src/prefs.c:1107
+#: src/prefs.c:1110
 msgid "Show all chats in one tabbed window"
 msgstr "Tutte le chat in una finestra a schede"
 
-#: src/prefs.c:1109
+#: src/prefs.c:1112
 msgid "Show conversations in the same tabbed window"
 msgstr "Tutte le conversazioni in una finestra a schede"
 
-#: src/prefs.c:1117
+#: src/prefs.c:1120
 msgid "Show people joining/leaving in window"
 msgstr "Mostra chi entra/esce dalla finestra"
 
-#: src/prefs.c:1165
+#: src/prefs.c:1168
 msgid "Tab Completion"
 msgstr "Completamento col TAB"
 
-#: src/prefs.c:1177
+#: src/prefs.c:1180
 msgid "Tab-Complete Nicks"
 msgstr "Il tasto TAB completa il nome"
 
-#: src/prefs.c:1183
+#: src/prefs.c:1186
 msgid "Old-Style Tab Completion"
 msgstr "Completamento di TAB all'antica"
 
-#: src/prefs.c:1285 src/prefs.c:2917
+#: src/prefs.c:1288 src/prefs.c:2931
 msgid "Font Options"
 msgstr "Opzioni font"
 
-#: src/prefs.c:1311
+#: src/prefs.c:1314
 msgid "Italic Text"
 msgstr "Testo corsivo"
 
-#: src/prefs.c:1355 src/prefs.c:1373 src/prefs.c:1395
+#: src/prefs.c:1358 src/prefs.c:1376 src/prefs.c:1398
 msgid "Select"
 msgstr "Seleziona"
 
-#: src/prefs.c:1393
+#: src/prefs.c:1396
 msgid "Font Face for Text"
 msgstr "Seme dei font per il testo"
 
-#: src/prefs.c:1408
+#: src/prefs.c:1411
 msgid "Font Size for Text"
 msgstr "Dimensione font del testo"
 
-#: src/prefs.c:1505
+#: src/prefs.c:1508
 msgid "Gaim - Sound Configuration"
 msgstr "Gaim - Configurazione Suoni"
 
-#: src/prefs.c:1540
+#: src/prefs.c:1543
 #, fuzzy
 msgid "Test"
 msgstr "Testo"
 
-#: src/prefs.c:1550
+#: src/prefs.c:1553
 msgid "Choose..."
 msgstr "Scegli..."
 
-#: src/prefs.c:1607
+#: src/prefs.c:1621
 msgid "Sound Options"
 msgstr "Opzioni suoni"
 
-#: src/prefs.c:1635
+#: src/prefs.c:1649
 msgid "No sounds when you log in"
 msgstr "Nessun suono quando entri"
 
-#: src/prefs.c:1641 src/prefs.c:1910
+#: src/prefs.c:1655 src/prefs.c:1922
 msgid "Sounds while away"
 msgstr "Suona quando Assente"
 
-#: src/prefs.c:1651
+#: src/prefs.c:1665
 #, fuzzy
 msgid "Sound method"
 msgstr "Opzioni suoni"
 
-#: src/prefs.c:1725
+#: src/prefs.c:1739
 #, fuzzy, c-format
 msgid ""
 "Sound command\n"
@@ -2912,104 +3405,104 @@
 "Comando per suonare i file dei suoni\n"
 "(%s per il nome del file, interno se vuoto)"
 
-#: src/prefs.c:1737
+#: src/prefs.c:1751
 #, fuzzy
 msgid "Sound played when:"
 msgstr "Programma che suona:"
 
-#: src/prefs.c:1881 src/prefs.c:2939
+#: src/prefs.c:1893 src/prefs.c:2953
 msgid "Away Messages"
 msgstr "Messaggio di Assente"
 
-#: src/prefs.c:1918
+#: src/prefs.c:1930
 msgid "Don't send auto-response"
 msgstr "Non rispondere in automatico"
 
-#: src/prefs.c:1919
+#: src/prefs.c:1931
 msgid "Only send auto-response when idle"
 msgstr "Auto-rispondi solo quando a Riposo"
 
-#: src/prefs.c:1934
+#: src/prefs.c:1946
 msgid "Time between sending auto-responses (in seconds):"
 msgstr "Tempo fra l'invio delle risposte automatiche (in secondi):"
 
-#: src/prefs.c:1949
+#: src/prefs.c:1961
 msgid "Auto Away after"
 msgstr "Assente automatico dopo"
 
-#: src/prefs.c:1963
+#: src/prefs.c:1975
 msgid "minutes using"
 msgstr "minuti usando"
 
-#: src/prefs.c:1976
+#: src/prefs.c:1988
 msgid "Messages"
 msgstr "Messaggi"
 
-#: src/prefs.c:2033
+#: src/prefs.c:2045
 msgid "Edit"
 msgstr "Modifica"
 
-#: src/prefs.c:2037
+#: src/prefs.c:2049
 msgid "Make Away"
 msgstr "Metti Assente"
 
-#: src/prefs.c:2314
+#: src/prefs.c:2326
 msgid "Privacy Options"
 msgstr "Opzioni di Privacy"
 
-#: src/prefs.c:2330
+#: src/prefs.c:2342
 msgid "Set privacy for:"
 msgstr "Imposta privacy per:"
 
-#: src/prefs.c:2349
+#: src/prefs.c:2361
 msgid "Allow all users to contact me"
 msgstr "Permetti a tutti di contattarmi"
 
-#: src/prefs.c:2350
+#: src/prefs.c:2362
 msgid "Allow only the users below"
 msgstr "Permetti solo agli utenti sotto"
 
-#: src/prefs.c:2352
+#: src/prefs.c:2364
 msgid "Allow List"
 msgstr "Permetti alla lista"
 
-#: src/prefs.c:2383
+#: src/prefs.c:2395
 msgid "Deny all users"
 msgstr "Nega a tutti"
 
-#: src/prefs.c:2384
+#: src/prefs.c:2396
 msgid "Block the users below"
 msgstr "Blocca gli utenti qui sotto"
 
-#: src/prefs.c:2386
+#: src/prefs.c:2398
 msgid "Block List"
 msgstr "Lista dei bloccati"
 
-#: src/prefs.c:2481
+#: src/prefs.c:2493
 msgid "Gaim - Preferences"
 msgstr "Gaim - Preferenze"
 
-#: src/prefs.c:2564
+#: src/prefs.c:2576
 msgid "Gaim debug output window"
 msgstr "Finestra di output del debug di Gaim"
 
-#: src/prefs.c:2873
+#: src/prefs.c:2887
 msgid "General"
 msgstr "Generale"
 
-#: src/prefs.c:2878
+#: src/prefs.c:2892
 msgid "Proxy"
 msgstr "Proxy"
 
-#: src/prefs.c:2902
+#: src/prefs.c:2916
 msgid "Conversations"
 msgstr "Conversazioni"
 
-#: src/prefs.c:2928
+#: src/prefs.c:2942
 msgid "Sounds"
 msgstr "Suoni"
 
-#: src/prefs.c:2950
+#: src/prefs.c:2964
 msgid "Privacy"
 msgstr "Privacy"
 
@@ -3054,22 +3547,23 @@
 msgid "Open Mail"
 msgstr "Apri la mail"
 
-#: src/prpl.c:564
-#, c-format
-msgid "%s%s%s%s has made %s their buddy%s%s%s"
+#: src/prpl.c:570
+#, fuzzy, c-format
+msgid "%s%s%s%s has made %s his or her buddy%s%s%s"
 msgstr "%s%s%s%s ha fatto %s il loro contatto %s%s%s"
 
-#: src/prpl.c:572
+#: src/prpl.c:578
+#, fuzzy
 msgid ""
 "\n"
 "\n"
-"Do you wish to add them to your buddy list?"
+"Do you wish to add him or her to your buddy list?"
 msgstr ""
 "\n"
 "\n"
 "Vuoi aggiungerli alla tua lista dei contatti?"
 
-#: src/prpl.c:615
+#: src/prpl.c:621
 msgid ""
 "You do not currently have any protocols available that are able to register "
 "new accounts."
@@ -3077,15 +3571,15 @@
 "Attualmente c' nessun protocollo che ti permetta di registrarti con nuovi "
 "account."
 
-#: src/prpl.c:652
+#: src/prpl.c:658
 msgid "Gaim - Registration"
 msgstr "Gaim - Registrazione"
 
-#: src/prpl.c:667
+#: src/prpl.c:673
 msgid "Registration Information"
 msgstr "Informazioni sulla registrazione"
 
-#: src/prpl.c:684
+#: src/prpl.c:690
 msgid "Register"
 msgstr "Registra"
 
@@ -3114,25 +3608,70 @@
 msgid "No"
 msgstr "No"
 
-#: src/server.c:1054
+#: src/server.c:1076
 msgid "More Info"
 msgstr "Informazioni in pi"
 
+#: src/sound.c:63
+#, fuzzy
+msgid "Buddy logs in"
+msgstr "Icona della persona"
+
+#: src/sound.c:64
+#, fuzzy
+msgid "Buddy logs out"
+msgstr "Suona quando un contatto esce"
+
+#: src/sound.c:65
+#, fuzzy
+msgid "Message received"
+msgstr "Suona quando ricevi un messaggio"
+
+#: src/sound.c:66
+#, fuzzy
+msgid "Message received begins conversation"
+msgstr "Suona ad un messaggio di inizio conversazione"
+
+#: src/sound.c:67
+#, fuzzy
+msgid "Message sent"
+msgstr "Messaggi"
+
+#: src/sound.c:68
+msgid "Person enters chat"
+msgstr ""
+
+#: src/sound.c:69
+msgid "Person leaves chat"
+msgstr ""
+
+#: src/sound.c:70
+msgid "You talk in chat"
+msgstr ""
+
+#: src/sound.c:71
+msgid "Others talk in chat"
+msgstr ""
+
+#: src/sound.c:74
+msgid "Someone says your name in chat"
+msgstr ""
+
+#~ msgid "Enable sounds"
+#~ msgstr "Abilita suoni"
+
+#~ msgid "KFM"
+#~ msgstr "KFM"
+
+#~ msgid "Manual"
+#~ msgstr "Manuale"
+
 #~ msgid "Events"
 #~ msgstr "Eventi"
 
 #~ msgid "Sound when buddy logs in"
 #~ msgstr "Suona quando un contatto entra"
 
-#~ msgid "Sound when buddy logs out"
-#~ msgstr "Suona quando un contatto esce"
-
-#~ msgid "Sound when received message begins conversation"
-#~ msgstr "Suona ad un messaggio di inizio conversazione"
-
-#~ msgid "Sound when message is received"
-#~ msgstr "Suona quando ricevi un messaggio"
-
 #~ msgid "Sound when message is sent"
 #~ msgstr "Suona quando spedisci messaggio"
 
@@ -3148,29 +3687,5 @@
 #~ msgid "Sound in chat rooms when others talk"
 #~ msgstr "Suona quando gli altri parlano in una stanza"
 
-#~ msgid "Available"
-#~ msgstr "Presente"
-
-#~ msgid "Available for friends only"
-#~ msgstr "Presente solo per gli amici"
-
-#~ msgid "Away for friends only"
-#~ msgstr "Assente solo per gli amici"
-
-#~ msgid "Invisible"
-#~ msgstr "Invisibile"
-
-#~ msgid "Invisible for friends only"
-#~ msgstr "Invisibile solo per gli amici"
-
-#~ msgid ""
-#~ "\n"
-#~ "\n"
-#~ "IRC: #gaim on irc.openprojects.net"
-#~ msgstr ""
-#~ "\n"
-#~ "\n"
-#~ "IRC: #gaim su irc.openprojects.net"
-
 #~ msgid "Play"
 #~ msgstr "Suona"
--- a/po/ja.po	Tue Jul 02 05:41:30 2002 +0000
+++ b/po/ja.po	Tue Jul 02 05:42:26 2002 +0000
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gaim version 0.56\n"
-"POT-Creation-Date: 2002-04-11 22:59-0400\n"
+"POT-Creation-Date: 2002-06-25 00:10-0400\n"
 "PO-Revision-Date: 2002-04-22 13:12+0900\n"
 "Last-Translator: Ryosuke Kutsuna <ryosuke@cool.email.ne.jp>\n"
 "Language-Team: Japanese\n"
@@ -14,7 +14,87 @@
 "Content-Type: text/plain; charset=EUC-JP\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/protocols/gg/gg.c:71
+#: plugins/chatlist.c:67 src/buddy_chat.c:272
+msgid "Buddy Chat"
+msgstr "֥å"
+
+#: plugins/chatlist.c:166 plugins/chatlist.c:168 plugins/chatlist.c:407
+#: plugins/chatlist.c:409
+#, fuzzy
+msgid "Gaim Chat"
+msgstr "Gaim - å"
+
+#: plugins/chatlist.c:339 src/about.c:165 src/aim.c:320 src/buddy.c:2716
+#: src/buddy_chat.c:1322 src/buddy_chat.c:1419 src/buddy_chat.c:1449
+#: src/conversation.c:2864 src/dialogs.c:567 src/dialogs.c:3899
+#: src/multi.c:1069 src/plugins.c:277 src/prefs.c:2547 src/prpl.c:438
+#: src/prpl.c:685 src/server.c:1072
+msgid "Close"
+msgstr "Ĥ"
+
+#: plugins/chatlist.c:344
+#, fuzzy
+msgid "Chat Rooms"
+msgstr "åȥץ"
+
+#: plugins/chatlist.c:363
+msgid "Refresh"
+msgstr ""
+
+#. Put the buttons in the box
+#: plugins/chatlist.c:364 src/buddy.c:492 src/buddy.c:2827
+#: src/buddy_chat.c:1454 src/conversation.c:2389 src/conversation.c:2879
+#: src/dialogs.c:932 src/dialogs.c:1114 src/dialogs.c:2095 src/multi.c:1053
+#: src/prefs.c:2041 src/prefs.c:2383 src/prefs.c:2417
+msgid "Add"
+msgstr "ä"
+
+#: plugins/chatlist.c:365 src/buddy.c:494 src/buddy.c:2829
+#: src/buddy_chat.c:1456 src/conversation.c:2375 src/conversation.c:2876
+#: src/prefs.c:2055 src/prefs.c:2387 src/prefs.c:2421
+msgid "Remove"
+msgstr ""
+
+#: plugins/chatlist.c:388
+msgid "List of available chats"
+msgstr ""
+
+#: plugins/chatlist.c:398
+msgid "List of subscribed chats"
+msgstr ""
+
+#: plugins/gtik.c:699
+msgid "Gnome Stock Ticker Properties"
+msgstr ""
+
+#: plugins/gtik.c:711
+msgid "Update Frequency in min"
+msgstr ""
+
+#: plugins/gtik.c:727
+msgid "Enter symbols delimited with \"+\" in the box below."
+msgstr ""
+
+#. OUTPUT FORMAT and SCROLL DIRECTION
+#: plugins/gtik.c:737
+msgid "Check this box to display only symbols and price:"
+msgstr ""
+
+#: plugins/gtik.c:738
+msgid "Check this box to scroll left to right:"
+msgstr ""
+
+#: plugins/gtik.c:974
+#, fuzzy
+msgid "(No"
+msgstr ""
+
+#: plugins/gtik.c:975
+#, fuzzy
+msgid "Change"
+msgstr "³:"
+
+#: src/protocols/gg/gg.c:71 src/protocols/msn/msn.c:1919
 msgid "Available"
 msgstr "Ļ"
 
@@ -22,8 +102,8 @@
 msgid "Available for friends only"
 msgstr "ͧã˲Ļ"
 
-#: src/applet.c:293 src/buddy.c:493 src/buddy.c:2508 src/buddy.c:2644
-#: src/protocols/gg/gg.c:73 src/protocols/jabber/jabber.c:703
+#: src/applet.c:197 src/buddy.c:497 src/buddy.c:2582 src/buddy.c:2727
+#: src/protocols/gg/gg.c:73 src/protocols/jabber/jabber.c:1118
 msgid "Away"
 msgstr "Υ"
 
@@ -39,7 +119,7 @@
 msgid "Invisible for friends only"
 msgstr "ͧã鱣"
 
-#: src/protocols/gg/gg.c:77 src/protocols/jabber/jabber.c:699
+#: src/protocols/gg/gg.c:77 src/protocols/jabber/jabber.c:1114
 msgid "Unavailable"
 msgstr ""
 
@@ -71,7 +151,7 @@
 msgid "Unknown Error Code."
 msgstr "ǽʥ"
 
-#: src/protocols/gg/gg.c:302
+#: src/protocols/gg/gg.c:302 src/protocols/msn/msn.c:2050
 #, c-format
 msgid "Status: %s"
 msgstr ": %s"
@@ -197,7 +277,7 @@
 msgstr ""
 
 #. Line 5
-#: src/dialogs.c:1582 src/dialogs.c:2290 src/protocols/gg/gg.c:729
+#: src/dialogs.c:1624 src/dialogs.c:2332 src/protocols/gg/gg.c:729
 msgid "City"
 msgstr "Į"
 
@@ -271,7 +351,12 @@
 msgid "Directory Search"
 msgstr "ǥ쥯ȥ긡"
 
-#: src/dialogs.c:1699 src/protocols/gg/gg.c:1160 src/protocols/gg/gg.c:1177
+#.
+#. } else if (!strcmp(act, _("Set Dir Info"))) {
+#. show_set_dir(gc);
+#.
+#: src/dialogs.c:1741 src/protocols/gg/gg.c:1160 src/protocols/gg/gg.c:1177
+#: src/protocols/jabber/jabber.c:3748 src/protocols/jabber/jabber.c:3761
 msgid "Change Password"
 msgstr "ѥѹ"
 
@@ -292,8 +377,8 @@
 msgstr "зͳǥå"
 
 #: src/protocols/icq/gaim_icq.c:469 src/protocols/irc/irc.c:1851
-#: src/protocols/jabber/jabber.c:2112 src/protocols/oscar/oscar.c:3436
-#: src/protocols/toc/toc.c:1216
+#: src/protocols/jabber/jabber.c:2860 src/protocols/oscar/oscar.c:3593
+#: src/protocols/toc/toc.c:1219
 msgid "Get Info"
 msgstr ""
 
@@ -329,11 +414,9 @@
 msgid ""
 "%s has requested a DCC chat.  Would you like to establish the direct "
 "connection?"
-msgstr ""
-"%s DCCå׵򤷤ޤ ľ³ޤ?"
-""
-
-#: src/protocols/irc/irc.c:1001
+msgstr "%s DCCå׵򤷤ޤ ľ³ޤ?"
+
+#: src/protocols/irc/irc.c:1001 src/protocols/msn/msn.c:315
 msgid "Unable to write"
 msgstr "񤭹ޤ"
 
@@ -360,7 +443,7 @@
 msgid "Channel:"
 msgstr "³:"
 
-#: src/multi.c:547 src/protocols/irc/irc.c:1675
+#: src/multi.c:549 src/protocols/irc/irc.c:1675
 msgid "Password:"
 msgstr "ѥ:"
 
@@ -368,503 +451,833 @@
 msgid "DCC Chat"
 msgstr "DCCå"
 
-#: src/buddy.c:2801 src/protocols/jabber/jabber.c:705
-#: src/protocols/jabber/jabber.c:723
+#: src/protocols/jabber/jabber.c:942
+msgid "Incorrect current password! Password NOT Changed!"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:943 src/protocols/jabber/jabber.c:948
+#, fuzzy
+msgid "Password Change Error!"
+msgstr "Gaim - ѥѹ"
+
+#: src/protocols/jabber/jabber.c:947
+msgid "New password same as old password! Password NOT Changed!"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1092
+msgid "Unknown"
+msgstr ""
+
+#: src/buddy.c:2887 src/protocols/jabber/jabber.c:1120
+#: src/protocols/jabber/jabber.c:1138
 msgid "Online"
 msgstr "饤"
 
-#: src/protocols/jabber/jabber.c:707
+#: src/protocols/jabber/jabber.c:1122
 msgid "Extended Away"
 msgstr "ƨ"
 
-#: src/protocols/jabber/jabber.c:709
+#: src/protocols/jabber/jabber.c:1124
 msgid "Do Not Disturb"
 msgstr "⤹"
 
-#: src/protocols/jabber/jabber.c:1042
+#: src/protocols/jabber/jabber.c:1434
+#, c-format
+msgid "Error %s: %s"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1437
+#, fuzzy
+msgid "Unknown Error in presence"
+msgstr "ǽʥ"
+
+#: src/protocols/jabber/jabber.c:1607
+#, fuzzy, c-format
+msgid "The user %s wants to add you to their buddy list."
+msgstr ""
+"\n"
+"\n"
+"֥ꥹȤɲäޤ?"
+
+#: src/protocols/jabber/jabber.c:1632
 msgid "No such user"
 msgstr "Τ褦ʥ桼Ϥޤ"
 
-#: src/protocols/jabber/jabber.c:1044
+#: src/protocols/jabber/jabber.c:1634 src/protocols/jabber/jabber.c:2341
+#: src/protocols/jabber/jabber.c:2506
 msgid "Jabber Error"
 msgstr "Jabber 顼"
 
-#: src/dialogs.c:845 src/protocols/jabber/jabber.c:1124
+#: src/dialogs.c:887 src/protocols/jabber/jabber.c:1719
+#: src/protocols/msn/msn.c:1110
 msgid "Buddies"
 msgstr "֤"
 
-#: src/protocols/jabber/jabber.c:1188
+#: src/protocols/jabber/jabber.c:1782
 msgid "Authenticating"
 msgstr "ǧ"
 
-#: src/protocols/jabber/jabber.c:1225
+#: src/protocols/jabber/jabber.c:1819
 msgid "Unknown login error"
 msgstr "ʥ󥨥顼"
 
-#: src/protocols/jabber/jabber.c:1455 src/protocols/jabber/jabber.c:2903
+#: src/protocols/jabber/jabber.c:2010
+#, fuzzy
+msgid "Password successfully changed."
+msgstr "ѥѹǤޤ"
+
+#: src/protocols/jabber/jabber.c:2012
+#, fuzzy
+msgid "Password Change"
+msgstr "Gaim - ѥѹ"
+
+#: src/protocols/jabber/jabber.c:2054 src/protocols/jabber/jabber.c:3676
 msgid "Connection lost"
 msgstr "³ڤޤ"
 
-#: src/protocols/jabber/jabber.c:1457 src/protocols/jabber/jabber.c:1489
-#: src/protocols/jabber/jabber.c:2905 src/protocols/jabber/jabber.c:2951
+#: src/protocols/jabber/jabber.c:2056 src/protocols/jabber/jabber.c:2088
+#: src/protocols/jabber/jabber.c:3678 src/protocols/jabber/jabber.c:3724
+#: src/protocols/msn/msn.c:1741 src/protocols/msn/msn.c:1770
 msgid "Unable to connect"
 msgstr "³Ǥޤ"
 
-#: src/protocols/jabber/jabber.c:1463
+#: src/protocols/jabber/jabber.c:2062
 msgid "Connected"
 msgstr "³ޤ"
 
-#: src/protocols/jabber/jabber.c:1466
+#: src/protocols/jabber/jabber.c:2065
 msgid "Requesting Authentication Method"
 msgstr "ǧ׵"
 
 #. we have no chats yet
-#: src/protocols/jabber/jabber.c:1484
+#: src/protocols/jabber/jabber.c:2083 src/protocols/msn/msn.c:1762
 msgid "Connecting"
 msgstr "³"
 
-#: src/protocols/jabber/jabber.c:1783
+#: src/protocols/jabber/jabber.c:2340 src/protocols/jabber/jabber.c:2505
+#, fuzzy
+msgid "Invalid Jabber I.D."
+msgstr "̵̾"
+
+#: src/protocols/jabber/jabber.c:2473
 msgid "Room:"
 msgstr ":"
 
-#: src/protocols/jabber/jabber.c:1787
+#: src/protocols/jabber/jabber.c:2477
 msgid "Server:"
 msgstr ":"
 
-#: src/protocols/jabber/jabber.c:1792
+#: src/protocols/jabber/jabber.c:2482
 msgid "Handle:"
 msgstr "ϥɥ:"
 
-#: src/protocols/jabber/jabber.c:2062 src/protocols/jabber/jabber.c:2401
-msgid "Unknown"
-msgstr ""
-
-#: src/buddy_chat.c:875 src/protocols/jabber/jabber.c:2117
-#: src/protocols/oscar/oscar.c:3443
+#: src/protocols/jabber/jabber.c:2539
+#, fuzzy
+msgid "Chats"
+msgstr "å"
+
+#: src/protocols/jabber/jabber.c:2854
+#, fuzzy
+msgid "View Error Msg"
+msgstr "򸫤"
+
+#: src/buddy_chat.c:886 src/protocols/jabber/jabber.c:2865
+#: src/protocols/oscar/oscar.c:3606
 msgid "Get Away Msg"
 msgstr "Υʥå"
 
-#: src/protocols/jabber/jabber.c:2299
+#: src/protocols/jabber/jabber.c:2882
+msgid "Remove From Roster"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:3076
 msgid "Full Name"
 msgstr "̾"
 
-#: src/protocols/jabber/jabber.c:2300
+#: src/protocols/jabber/jabber.c:3077
 msgid "Family Name"
 msgstr "²̾"
 
-#: src/protocols/jabber/jabber.c:2301
+#: src/protocols/jabber/jabber.c:3078
 msgid "Given Name"
 msgstr "Ϳ줿̾"
 
-#: src/protocols/jabber/jabber.c:2302
+#: src/protocols/jabber/jabber.c:3079
 msgid "Nickname"
 msgstr "˥å͡"
 
-#: src/dialogs.c:2483 src/protocols/jabber/jabber.c:2303
+#: src/dialogs.c:2525 src/protocols/jabber/jabber.c:3080
 msgid "URL"
 msgstr "URL"
 
-#: src/protocols/jabber/jabber.c:2304
+#: src/protocols/jabber/jabber.c:3081
 msgid "Street Address"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:2305
+#: src/protocols/jabber/jabber.c:3082
 msgid "Extended Address"
 msgstr "¾"
 
-#: src/protocols/jabber/jabber.c:2306
+#: src/protocols/jabber/jabber.c:3083
 msgid "Locality"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:2307
+#: src/protocols/jabber/jabber.c:3084
 msgid "Region"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:2308
+#: src/protocols/jabber/jabber.c:3085
 msgid "Postal Code"
 msgstr "͹ֹ"
 
 #. Line 7
-#: src/dialogs.c:1604 src/dialogs.c:2312 src/protocols/jabber/jabber.c:2309
+#: src/dialogs.c:1646 src/dialogs.c:2354 src/protocols/jabber/jabber.c:3086
 msgid "Country"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:2310
+#: src/protocols/jabber/jabber.c:3087
 msgid "Telephone"
 msgstr "ֹ"
 
-#: src/dialogs.c:2388 src/protocols/jabber/jabber.c:2311
+#: src/dialogs.c:2430 src/protocols/jabber/jabber.c:3088
 msgid "Email"
 msgstr "E-mail"
 
-#: src/protocols/jabber/jabber.c:2312
+#: src/protocols/jabber/jabber.c:3089
 msgid "Organization Name"
 msgstr "ȿ̾"
 
-#: src/protocols/jabber/jabber.c:2313
+#: src/protocols/jabber/jabber.c:3090
 msgid "Organization Unit"
 msgstr "°"
 
-#: src/prefs.c:1988 src/protocols/jabber/jabber.c:2314
+#: src/prefs.c:2000 src/protocols/jabber/jabber.c:3091
 msgid "Title"
 msgstr "̾"
 
-#: src/protocols/jabber/jabber.c:2315
+#: src/protocols/jabber/jabber.c:3092
 msgid "Role"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:2316
+#: src/protocols/jabber/jabber.c:3093
 msgid "Birthday"
 msgstr ""
 
 #. Right side: frame with description and the filepath of plugin
-#: src/dialogs.c:2491 src/plugins.c:211 src/protocols/jabber/jabber.c:2317
+#: src/dialogs.c:2533 src/plugins.c:211 src/protocols/jabber/jabber.c:3094
 msgid "Description"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:2342
+#: src/protocols/jabber/jabber.c:3119
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable"
 msgstr ""
-"ΥƥϤ٤ƥץǤ"
-"Ŭ˴Ϥޤ"
-
-#: src/protocols/jabber/jabber.c:2343
+"ΥƥϤ٤ƥץǤŬ˴Ϥޤ"
+
+#: src/protocols/jabber/jabber.c:3120
 msgid "User Identity"
 msgstr "桼ID"
 
-#: src/protocols/jabber/jabber.c:2759
+#: src/protocols/jabber/jabber.c:3532
 msgid "Gaim - Edit Jabber vCard"
 msgstr "Gaim - Jabber vCardˤäƳȯ줿"
 
-#: src/protocols/jabber/jabber.c:2833
+#: src/protocols/jabber/jabber.c:3606
 msgid "Server Registration successful!"
 msgstr "ФϿޤ"
 
-#: src/protocols/jabber/jabber.c:2860
+#: src/protocols/jabber/jabber.c:3633
 msgid "Unknown registration error"
 msgstr "Ͽ顼"
 
-#: src/protocols/jabber/jabber.c:2969 src/protocols/jabber/jabber.c:2984
+#: src/protocols/jabber/jabber.c:3742 src/protocols/jabber/jabber.c:3757
 msgid "Set User Info"
 msgstr "桼Ͽ"
 
-#: src/protocols/msn/msn.c:719 src/protocols/msn/msn.c:2041
-#: src/protocols/msn/msn.c:2074
+#: src/protocols/msn/msn.c:230
+msgid "Syntax Error (probably a Gaim bug)"
+msgstr ""
+
+#: src/protocols/msn/msn.c:233
+msgid "Invalid Parameter (probably a Gaim bug)"
+msgstr ""
+
+#: src/protocols/msn/msn.c:236
+#, fuzzy
+msgid "Invalid User"
+msgstr "̵̾"
+
+#: src/protocols/msn/msn.c:239
+msgid "Fully Qualified Domain Name missing"
+msgstr ""
+
+#: src/protocols/msn/msn.c:242
+msgid "Already Login"
+msgstr ""
+
+#: src/protocols/msn/msn.c:245
+#, fuzzy
+msgid "Invalid Username"
+msgstr "̵̾"
+
+#: src/protocols/msn/msn.c:248
+#, fuzzy
+msgid "Invalid Friendly Name"
+msgstr "̵̾"
+
+#: src/protocols/msn/msn.c:251
+msgid "List Full"
+msgstr ""
+
+#: src/protocols/msn/msn.c:254
+msgid "Already there"
+msgstr ""
+
+#: src/protocols/msn/msn.c:257
+#, fuzzy
+msgid "Not on list"
+msgstr "³ڤޤ"
+
+#: src/protocols/msn/msn.c:260
+msgid "User is offline"
+msgstr ""
+
+#: src/protocols/msn/msn.c:263
+msgid "Already in the mode"
+msgstr ""
+
+#: src/protocols/msn/msn.c:266
+msgid "Already in opposite list"
+msgstr ""
+
+#: src/protocols/msn/msn.c:269
+msgid "Switchboard failed"
+msgstr ""
+
+#: src/protocols/msn/msn.c:272
+msgid "Notify Transfer failed"
+msgstr ""
+
+#: src/protocols/msn/msn.c:276
+msgid "Required fields missing"
+msgstr ""
+
+#: src/protocols/msn/msn.c:279
+#, fuzzy
+msgid "Not logged in"
+msgstr "%s ϥ󤷤Ƥޤ"
+
+#: src/protocols/msn/msn.c:283
+#, fuzzy
+msgid "Internal server error"
+msgstr "顼"
+
+#: src/protocols/msn/msn.c:286
+msgid "Database server error"
+msgstr ""
+
+#: src/protocols/msn/msn.c:289
+#, fuzzy
+msgid "File operation error"
+msgstr "³顼Ǥ\n"
+
+#: src/protocols/msn/msn.c:292
+#, fuzzy
+msgid "Memory allocation error"
+msgstr "פ³顼\n"
+
+#: src/protocols/msn/msn.c:296
+#, fuzzy
+msgid "Server busy"
+msgstr ":"
+
+#: src/protocols/msn/msn.c:299
+#, fuzzy
+msgid "Server unavailable"
+msgstr ""
+
+#: src/protocols/msn/msn.c:302
+msgid "Peer Notification server down"
+msgstr ""
+
+#: src/protocols/msn/msn.c:305
+#, fuzzy
+msgid "Database connect error"
+msgstr "³顼Ǥ\n"
+
+#: src/protocols/msn/msn.c:308
+msgid "Server is going down (abandon ship)"
+msgstr ""
+
+#: src/protocols/msn/msn.c:312
+#, fuzzy
+msgid "Error creating connection"
+msgstr "g003: ³ϥ顼\n"
+
+#: src/protocols/msn/msn.c:318
+msgid "Session overload"
+msgstr ""
+
+#: src/protocols/msn/msn.c:321
+msgid "User is too active"
+msgstr ""
+
+#: src/protocols/msn/msn.c:324
+#, fuzzy
+msgid "Too many sessions"
+msgstr "ޥå"
+
+#: src/protocols/msn/msn.c:327
+msgid "Not expected"
+msgstr ""
+
+#: src/protocols/msn/msn.c:330
+msgid "Bad friend file"
+msgstr ""
+
+#: src/protocols/msn/msn.c:334
+#, fuzzy
+msgid "Authentication failed"
+msgstr "ǧڥ顼"
+
+#: src/protocols/msn/msn.c:337
+#, fuzzy
+msgid "Not allowed when offline"
+msgstr "󤷤Ȥ˲Ĥ餵ʤ"
+
+#: src/protocols/msn/msn.c:340
+msgid "Not accepting new users"
+msgstr ""
+
+#: src/protocols/msn/msn.c:343
+msgid "User unverified"
+msgstr ""
+
+#: src/protocols/msn/msn.c:346
+#, fuzzy
+msgid "Unknown Error Code"
+msgstr "ǽʥ"
+
+#: src/protocols/msn/msn.c:351 src/protocols/msn/msn.c:558
+#: src/protocols/msn/msn.c:813 src/protocols/msn/msn.c:2114
+#: src/protocols/msn/msn.c:2283 src/protocols/msn/msn.c:2336
 msgid "MSN Error"
 msgstr "MSN顼"
 
-#: src/protocols/msn/msn.c:719
+#: src/protocols/msn/msn.c:558
+msgid "A message may not have been received."
+msgstr ""
+
+#: src/protocols/msn/msn.c:813
 msgid "Gaim was unable to send a message"
 msgstr "Gaimϥåޤ"
 
-#: src/protocols/msn/msn.c:1069
+#: src/protocols/msn/msn.c:917
+#, c-format
+msgid "The user %s (%s) wants to add %s to his or her buddy list."
+msgstr ""
+
+#: src/protocols/msn/msn.c:1074
+#, c-format
+msgid "The user %s (%s) wants to add you to their buddy list"
+msgstr ""
+
+#: src/protocols/msn/msn.c:1175
 msgid "You have been disconnected. You have signed on from another location."
 msgstr "ǤƤޤ 㤦³Ƥޤ"
 
-#: src/protocols/msn/msn.c:2041 src/protocols/msn/msn.c:2074
+#: src/protocols/msn/msn.c:1435 src/protocols/msn/msn.c:1679
+#, fuzzy
+msgid "Error reading from server"
+msgstr "åȤɤ߹ߤ˼"
+
+#: src/protocols/msn/msn.c:1568
+msgid "Requesting to send password"
+msgstr ""
+
+#: src/protocols/msn/msn.c:1618
+#, fuzzy
+msgid "Unable to send password"
+msgstr "åȤɤޤ"
+
+#: src/protocols/msn/msn.c:1623
+#, fuzzy
+msgid "Password sent"
+msgstr "ѥ"
+
+#: src/protocols/msn/msn.c:1748
+#, fuzzy
+msgid "Unable to write to server"
+msgstr "Ф³Ǥޤ"
+
+#: src/protocols/msn/msn.c:1754
+#, fuzzy
+msgid "Synching with server"
+msgstr "ФϿ"
+
+#: src/protocols/msn/msn.c:1920
+msgid "Away From Computer"
+msgstr ""
+
+#: src/protocols/msn/msn.c:1921
+msgid "Be Right Back"
+msgstr ""
+
+#: src/protocols/msn/msn.c:1922
+#, fuzzy
+msgid "Busy"
+msgstr ""
+
+#: src/protocols/msn/msn.c:1923
+msgid "On The Phone"
+msgstr ""
+
+#: src/protocols/msn/msn.c:1924
+msgid "Out To Lunch"
+msgstr ""
+
+#: src/protocols/msn/msn.c:1925
+#, fuzzy
+msgid "Hidden"
+msgstr "쥢"
+
+#: src/protocols/msn/msn.c:2041
+msgid "Reset friendly name"
+msgstr ""
+
+#: src/protocols/msn/msn.c:2114
+msgid "Friendly name too long."
+msgstr ""
+
+#: src/protocols/msn/msn.c:2129 src/protocols/msn/msn.c:2150
+#, fuzzy
+msgid "Set Friendly Name"
+msgstr "̾"
+
+#: src/protocols/msn/msn.c:2130
+#, fuzzy
+msgid "Set Friendly Name:"
+msgstr "꡼͡: "
+
+#: src/protocols/msn/msn.c:2131
+msgid "Reset All Friendly Names"
+msgstr ""
+
+#: src/protocols/msn/msn.c:2283 src/protocols/msn/msn.c:2336
 msgid "Invalid name"
 msgstr "̵̾"
 
-#: src/protocols/napster/napster.c:450 src/protocols/oscar/oscar.c:3075
-#: src/protocols/toc/toc.c:1101
+#: src/protocols/napster/napster.c:457 src/protocols/oscar/oscar.c:3209
+#: src/protocols/toc/toc.c:1104
 msgid "Join what group:"
 msgstr "롼פؤλ:"
 
-#: src/protocols/oscar/oscar.c:333
+#: src/protocols/oscar/oscar.c:330
 #, c-format
 msgid "Direct IM with %s closed"
 msgstr "%sľIMĤޤ"
 
-#: src/protocols/oscar/oscar.c:335
+#: src/protocols/oscar/oscar.c:332
 #, c-format
 msgid "Direct IM with %s failed"
 msgstr "%sľIMϼԤޤ"
 
-#: src/protocols/oscar/oscar.c:373
+#: src/protocols/oscar/oscar.c:370
 msgid "connection error (rend)\n"
 msgstr "³顼 (䤱)\n"
 
-#: src/protocols/oscar/oscar.c:384
+#: src/protocols/oscar/oscar.c:381
 msgid "major connection error\n"
 msgstr "פ³顼\n"
 
-#: src/protocols/oscar/oscar.c:385 src/protocols/toc/toc.c:511
+#: src/protocols/oscar/oscar.c:382 src/protocols/toc/toc.c:511
 #: src/protocols/toc/toc.c:524 src/protocols/toc/toc.c:590
 msgid "Disconnected."
 msgstr "Ǥޤ"
 
-#: src/protocols/oscar/oscar.c:397 src/protocols/toc/toc.c:761
+#: src/protocols/oscar/oscar.c:394 src/protocols/toc/toc.c:761
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "åȥ롼%sǤޤ"
 
-#: src/protocols/oscar/oscar.c:398
+#: src/protocols/oscar/oscar.c:395
 msgid "Chat Error!"
 msgstr "åȥ顼"
 
-#: src/protocols/oscar/oscar.c:410
+#: src/protocols/oscar/oscar.c:407
 msgid "Chat is currently unavailable"
 msgstr "åȤ³Ǥޤ"
 
-#: src/protocols/oscar/oscar.c:411
+#: src/protocols/oscar/oscar.c:408
 msgid "Gaim - Chat"
 msgstr "Gaim - å"
 
-#: src/protocols/oscar/oscar.c:470 src/protocols/oscar/oscar.c:530
+#: src/protocols/oscar/oscar.c:467 src/protocols/oscar/oscar.c:527
 msgid "Couldn't connect to host"
 msgstr "ۥȤ³ǤޤǤ"
 
-#: src/protocols/oscar/oscar.c:478
+#: src/protocols/oscar/oscar.c:475
 msgid "Password sent, waiting for response\n"
 msgstr "ѥԤǤ\n"
 
-#: src/protocols/oscar/oscar.c:511
+#: src/protocols/oscar/oscar.c:508
 msgid "internal connection error\n"
 msgstr "³顼Ǥ\n"
 
-#: src/protocols/oscar/oscar.c:512
+#: src/protocols/oscar/oscar.c:509
 msgid "Unable to login to AIM"
 msgstr "AIMإǤޤ"
 
-#: src/protocols/oscar/oscar.c:517
+#: src/protocols/oscar/oscar.c:514
 #, c-format
 msgid "Signon: %s"
 msgstr "󥪥: %s"
 
-#: src/protocols/oscar/oscar.c:589
+#: src/protocols/oscar/oscar.c:586
 msgid "Signed off.\n"
 msgstr "󥪥\n"
 
-#: src/protocols/oscar/oscar.c:608 src/protocols/oscar/oscar.c:732
+#: src/protocols/oscar/oscar.c:605 src/protocols/oscar/oscar.c:730
 msgid "Could Not Connect"
 msgstr "³Ǥޤ"
 
-#: src/protocols/oscar/oscar.c:616
+#: src/protocols/oscar/oscar.c:613
 msgid "Connection established, cookie sent"
 msgstr "³Ǥޤcookie"
 
 #. Incorrect nick/password
-#: src/protocols/oscar/oscar.c:642 src/protocols/toc/toc.c:459
+#: src/protocols/oscar/oscar.c:639 src/protocols/toc/toc.c:459
 msgid "Incorrect nickname or password."
 msgstr "ְä˥å͡फѥɤǤ"
 
 #. Suspended account
-#: src/protocols/oscar/oscar.c:647
+#: src/protocols/oscar/oscar.c:644
 msgid "Your account is currently suspended."
 msgstr "ʤΥȤϸǤ"
 
 #. connecting too frequently
-#: src/protocols/oscar/oscar.c:651
+#: src/protocols/oscar/oscar.c:648
 msgid ""
 "You have been connecting and disconnecting too frequently. Wait ten minutes "
 "and try again. If you continue to try, you will need to wait even longer."
 msgstr ""
-"ˤ³ƤʬΥƤޤ10ʬԤäơƤӻߤƤ"
-"Ϥ³СĹԤɬפǤ礦"
+"ˤ³ƤʬΥƤޤ10ʬԤäơƤӻߤƤ"
+"³СĹԤɬפǤ礦"
 
 #. client too old
-#: src/protocols/oscar/oscar.c:656
+#: src/protocols/oscar/oscar.c:653
 msgid "The client version you are using is too old. Please upgrade at "
 msgstr "饤ȤΥС󤬸Ťޤ åץǡȤޤ礦"
 
-#: src/protocols/oscar/oscar.c:660 src/protocols/toc/toc.c:542
+#: src/protocols/oscar/oscar.c:657 src/protocols/toc/toc.c:542
 msgid "Authentication Failed"
 msgstr "ǧڤ˼"
 
-#: src/protocols/oscar/oscar.c:682
+#: src/protocols/oscar/oscar.c:679
 msgid "Internal Error"
 msgstr "顼"
 
-#: src/protocols/oscar/oscar.c:1250 src/protocols/oscar/oscar.c:3286
+#: src/protocols/oscar/oscar.c:1248 src/protocols/oscar/oscar.c:3420
 #, c-format
 msgid "Direct IM with %s established"
 msgstr "%s ȤľIMΩޤ"
 
-#: src/protocols/oscar/oscar.c:1496 src/protocols/oscar/oscar.c:2371
-#, c-format
+#: src/protocols/oscar/oscar.c:1504 src/protocols/oscar/oscar.c:2456
+#, fuzzy, c-format
 msgid ""
-"The user %d has denied your request to add them to your contact list for the "
-"following reason:\n"
-"\n"
+"The user %lu has denied your request to add them to your contact list for "
+"the following reason:\n"
+"%s"
 msgstr ""
-"桼%dϡͳΤˤʤܿꥹȤˤä"
-"ʤΥꥯȤꤷޤ\n"
-
-#: src/protocols/oscar/oscar.c:1496 src/protocols/oscar/oscar.c:2371
+"桼%dϡͳΤˤʤܿꥹȤˤä뤢ʤΥꥯ"
+"Ȥꤷޤ\n"
+
+#: src/protocols/oscar/oscar.c:1504 src/protocols/oscar/oscar.c:2456
 msgid "No reason given."
 msgstr "ͳ"
 
-#: src/protocols/oscar/oscar.c:1497 src/protocols/oscar/oscar.c:2372
+#: src/protocols/oscar/oscar.c:1505 src/protocols/oscar/oscar.c:2457
 msgid "Gaim - ICQ Authorization Denied"
 msgstr "Gaim - ICQǧڤ˵ݤޤ"
 
-#: src/protocols/oscar/oscar.c:1503 src/protocols/oscar/oscar.c:2378
-#, c-format
-msgid "The user %d has granted your request to add them to your contact list."
-msgstr "桼%dϡʤΥꥯȤʤΥ󥿥ȥꥹȤä뤳Ȥǧޤ"
-
-#: src/protocols/oscar/oscar.c:1504 src/protocols/oscar/oscar.c:2379
+#: src/protocols/oscar/oscar.c:1511 src/protocols/oscar/oscar.c:2463
+#, fuzzy, c-format
+msgid "The user %lu has granted your request to add them to your contact list."
+msgstr ""
+"桼%dϡʤΥꥯȤʤΥ󥿥ȥꥹȤä뤳Ȥ"
+"ǧޤ"
+
+#: src/protocols/oscar/oscar.c:1512 src/protocols/oscar/oscar.c:2464
 msgid "Gaim - ICQ Authorization Granted"
 msgstr "Gaim - ICQǧ"
 
-#: src/protocols/oscar/oscar.c:1577
+#: src/protocols/oscar/oscar.c:1585
 #, c-format
 msgid "You missed %d message from %s because it was invalid."
 msgstr "%sΥå%d̵Ǥ뤿˼Ԥޤ"
 
-#: src/protocols/oscar/oscar.c:1578
+#: src/protocols/oscar/oscar.c:1586
 #, c-format
 msgid "You missed %d messages from %s because they were invalid."
 msgstr "%sΥå%d̵Ǥ뤿˼Ԥޤ"
 
-#: src/protocols/oscar/oscar.c:1587
+#: src/protocols/oscar/oscar.c:1595
 #, c-format
 msgid "You missed %d message from %s because it was too large."
 msgstr "%s%dåϤǤ뤿˼Ԥޤ"
 
-#: src/protocols/oscar/oscar.c:1588
+#: src/protocols/oscar/oscar.c:1596
 #, c-format
 msgid "You missed %d messages from %s because they were too large."
 msgstr "%s%dåϤǤ뤿˼Ԥޤ"
 
-#: src/protocols/oscar/oscar.c:1597
+#: src/protocols/oscar/oscar.c:1605
 #, c-format
 msgid "You missed %d message from %s because the rate limit has been exceeded."
 msgstr "³ĶᤷΤ%s%dåƨޤ"
 
-#: src/protocols/oscar/oscar.c:1598
+#: src/protocols/oscar/oscar.c:1606
 #, c-format
 msgid ""
 "You missed %d messages from %s because the rate limit has been exceeded."
 msgstr "³ĶᤷΤ%s%dåƨޤ"
 
-#: src/protocols/oscar/oscar.c:1607
+#: src/protocols/oscar/oscar.c:1615
 #, c-format
 msgid "You missed %d message from %s because it was too evil."
 msgstr "ͭΤǡ%s%dåƨޤ"
 
-#: src/protocols/oscar/oscar.c:1608
+#: src/protocols/oscar/oscar.c:1616
 #, c-format
 msgid "You missed %d messages from %s because they are too evil."
 msgstr "ͭΤǡ%s%dåƨޤ"
 
-#: src/protocols/oscar/oscar.c:1617
+#: src/protocols/oscar/oscar.c:1625
 #, c-format
 msgid "You missed %d message from %s because you are too evil."
 msgstr "ͭΤǡ%s%dåƨޤ"
 
-#: src/protocols/oscar/oscar.c:1618
-#, c-format
-msgid "You missed %d messages from %s because you are too evil."
-msgstr "ͭΤǡ%s%dåƨޤ"
-
 #: src/protocols/oscar/oscar.c:1626
 #, c-format
+msgid "You missed %d messages from %s because you are too evil."
+msgstr "ͭΤǡ%s%dåƨޤ"
+
+#: src/protocols/oscar/oscar.c:1634
+#, c-format
 msgid "You missed %d message from %s for unknown reasons."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1627
+#: src/protocols/oscar/oscar.c:1635
 #, c-format
 msgid "You missed %d messages from %s for unknown reasons."
 msgstr "Ǥ%s%dåƨޤ"
 
-#: src/dialogs.c:3034 src/dialogs.c:3040 src/protocols/oscar/oscar.c:1632
-#: src/protocols/oscar/oscar.c:1670 src/protocols/oscar/oscar.c:1688
-#: src/protocols/oscar/oscar.c:2141 src/protocols/yahoo/yahoo.c:585
+#: src/dialogs.c:3076 src/dialogs.c:3082 src/protocols/oscar/oscar.c:1640
+#: src/protocols/oscar/oscar.c:1755 src/protocols/oscar/oscar.c:1773
+#: src/protocols/oscar/oscar.c:2226 src/protocols/yahoo/yahoo.c:594
 msgid "Gaim - Error"
 msgstr "Gaim - 顼"
 
-#: src/protocols/oscar/oscar.c:1649
+#: src/protocols/oscar/oscar.c:1703
+#, c-format
+msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR>%s<BR>"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:1705
+#, c-format
+msgid "<B>Status:</B> %s<BR><HR><BR>%s<BR>"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:1734
 #, c-format
 msgid "SNAC threw error: %s\n"
 msgstr "SNAC 롼顼: %s\n"
 
-#: src/protocols/oscar/oscar.c:1651
+#: src/protocols/oscar/oscar.c:1736
 msgid "Gaim - Oscar SNAC Error"
 msgstr "Gaim - Oscar SNAC 顼"
 
-#: src/protocols/oscar/oscar.c:1668
+#: src/protocols/oscar/oscar.c:1753
 #, c-format
 msgid "Your message to %s did not get sent: %s"
 msgstr "%sؤΥåǤޤǤ:%s"
 
-#: src/protocols/oscar/oscar.c:1669 src/protocols/oscar/oscar.c:1687
+#: src/protocols/oscar/oscar.c:1754 src/protocols/oscar/oscar.c:1772
 msgid "Reason unknown"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1686
+#: src/protocols/oscar/oscar.c:1771
 #, c-format
 msgid "User information for %s unavailable: %s"
 msgstr "%sΥ桼󤬸ޤ: %s"
 
-#: src/buddy.c:2060 src/protocols/oscar/oscar.c:1717
+#: src/buddy.c:2131 src/protocols/oscar/oscar.c:1802
 msgid "Buddy Icon"
 msgstr "֥"
 
-#: src/buddy.c:2063 src/protocols/oscar/oscar.c:1720
+#: src/buddy.c:2134 src/protocols/oscar/oscar.c:1805
 msgid "Voice"
 msgstr ""
 
-#: src/buddy.c:2066 src/protocols/oscar/oscar.c:1723
+#: src/buddy.c:2137 src/protocols/oscar/oscar.c:1808
 msgid "IM Image"
 msgstr "IM ᡼"
 
-#: src/buddy.c:494 src/buddy.c:2069 src/buddy.c:2507 src/prefs.c:2912
-#: src/protocols/oscar/oscar.c:1726
+#: src/buddy.c:498 src/buddy.c:2140 src/buddy.c:2581 src/prefs.c:2926
+#: src/protocols/oscar/oscar.c:1811
 msgid "Chat"
 msgstr "å"
 
-#: src/buddy.c:2072 src/protocols/oscar/oscar.c:1729
+#: src/buddy.c:2143 src/protocols/oscar/oscar.c:1814
 msgid "Get File"
 msgstr "ե"
 
-#: src/buddy.c:2075 src/protocols/oscar/oscar.c:1732
+#: src/buddy.c:2146 src/protocols/oscar/oscar.c:1817
 msgid "Send File"
 msgstr "ե"
 
-#: src/buddy.c:2079 src/protocols/oscar/oscar.c:1736
+#: src/buddy.c:2150 src/protocols/oscar/oscar.c:1821
 msgid "Games"
 msgstr ""
 
-#: src/buddy.c:2082 src/protocols/oscar/oscar.c:1739
+#: src/buddy.c:2153 src/protocols/oscar/oscar.c:1824
 msgid "Stocks"
 msgstr "ȥå"
 
-#: src/buddy.c:2085 src/protocols/oscar/oscar.c:1742
+#: src/buddy.c:2156 src/protocols/oscar/oscar.c:1827
 msgid "Send Buddy List"
 msgstr "֥ꥹ"
 
-#: src/buddy.c:2088 src/protocols/oscar/oscar.c:1745
+#: src/buddy.c:2159 src/protocols/oscar/oscar.c:1830
 msgid "EveryBuddy Bug"
 msgstr " Х"
 
-#: src/buddy.c:2091 src/protocols/oscar/oscar.c:1748
+#: src/buddy.c:2162 src/protocols/oscar/oscar.c:1833
 msgid "AP User"
 msgstr "AP桼"
 
-#: src/buddy.c:2094 src/protocols/oscar/oscar.c:1751
+#: src/buddy.c:2165 src/protocols/oscar/oscar.c:1836
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
-#: src/buddy.c:2097 src/protocols/oscar/oscar.c:1754
+#: src/buddy.c:2168 src/protocols/oscar/oscar.c:1839
 msgid "Nihilist"
 msgstr "˥ҥꥹ"
 
-#: src/buddy.c:2100 src/protocols/oscar/oscar.c:1757
+#: src/buddy.c:2171 src/protocols/oscar/oscar.c:1842
 msgid "ICQ Server Relay"
 msgstr "ICQзͳ"
 
-#: src/buddy.c:2103 src/protocols/oscar/oscar.c:1760
+#: src/buddy.c:2174 src/protocols/oscar/oscar.c:1845
 msgid "ICQ Unknown"
 msgstr "ʬʤICQ"
 
-#: src/buddy.c:2106 src/protocols/oscar/oscar.c:1763
+#: src/buddy.c:2177 src/protocols/oscar/oscar.c:1848
 msgid "Trillian Encryption"
 msgstr "TrillianŹ沽"
 
-#: src/protocols/oscar/oscar.c:1801
+#: src/protocols/oscar/oscar.c:1886
 msgid ""
 "<br><BODY BGCOLOR=WHITE><hr><I>Legend:</I><br><br><IMG SRC=\"free_icon.gif"
 "\"> : Normal AIM User<br><IMG SRC=\"aol_icon.gif\"> : AOL User <br><IMG SRC="
@@ -873,12 +1286,12 @@
 "Agent<br><IMG SRC=\"wireless_icon.gif\"> : Wireless Device User<br>"
 msgstr ""
 "<br><BODY BGCOLOR=WHITE><hr><I>:</I><br><br><IMG SRC=\"free_icon.gif"
-"\"> : ̤ AIM 桼<br><IMG SRC=\"aol_icon.gif\"> : AOL 桼 <br><IMG SRC="
-"\"dt_icon.gif\"> : AIM θ桼 <br><IMG SRC=\"admin_icon.gif\"> : "
-" <br><IMG SRC=\"ab_icon.gif\"> : ͭ"
-"<br><IMG SRC=\"wireless_icon.gif\"> : 磻쥹ǥХ桼<br>"
-
-#: src/protocols/oscar/oscar.c:1829
+"\"> : ̤ AIM 桼<br><IMG SRC=\"aol_icon.gif\"> : AOL 桼 <br><IMG "
+"SRC=\"dt_icon.gif\"> : AIM θ桼 <br><IMG SRC=\"admin_icon.gif\"> : "
+" <br><IMG SRC=\"ab_icon.gif\"> : ͭ<br><IMG SRC="
+"\"wireless_icon.gif\"> : 磻쥹ǥХ桼<br>"
+
+#: src/protocols/oscar/oscar.c:1914
 #, c-format
 msgid ""
 "Username : <B>%s</B>  %s <BR>\n"
@@ -891,66 +1304,96 @@
 "%s%s%s<BR>\n"
 "<HR><BR>\n"
 
-#: src/protocols/oscar/oscar.c:1861
+#: src/protocols/oscar/oscar.c:1946
 msgid "<i>User has no away message</i>"
 msgstr "<i>桼ΥʥåäƤޤ</i>"
 
-#: src/protocols/oscar/oscar.c:1873
+#: src/protocols/oscar/oscar.c:1958
 msgid "Client Capabilities: "
 msgstr "饤ȵǽ"
 
-#: src/protocols/oscar/oscar.c:1881
+#: src/protocols/oscar/oscar.c:1966
 msgid "<i>No Information Provided</i>"
 msgstr "<i>󶡤ƤϤޤ</i>"
 
-#: src/protocols/oscar/oscar.c:1904
+#: src/protocols/oscar/oscar.c:1989
 msgid "Your connection may be lost."
 msgstr "³ޤ"
 
-#: src/protocols/oscar/oscar.c:1905
+#: src/protocols/oscar/oscar.c:1990
 msgid "AOL error"
 msgstr "AOL顼"
 
-#: src/protocols/oscar/oscar.c:2140
+#: src/protocols/oscar/oscar.c:2225
 msgid ""
 "The last message was not sent because you are over the rate limit. Please "
 "wait 10 seconds and try again."
 msgstr ""
-"³ãƤ뤿åޤǤ"
-"10äޤäƺƤ"
-
-#: src/dialogs.c:3563 src/protocols/oscar/oscar.c:2482
-#: src/protocols/oscar/oscar.c:3407 src/protocols/toc/toc.c:1561
-#: src/protocols/toc/toc.c:1578 src/protocols/toc/toc.c:1638
-#: src/protocols/toc/toc.c:1680 src/protocols/toc/toc.c:1799
-#: src/protocols/toc/toc.c:1829 src/protocols/toc/toc.c:1885
+"³ãƤ뤿åޤǤ10äޤäƺƤ"
+""
+
+#: src/dialogs.c:3604 src/protocols/oscar/oscar.c:2589
+#: src/protocols/oscar/oscar.c:3541 src/protocols/toc/toc.c:1564
+#: src/protocols/toc/toc.c:1581 src/protocols/toc/toc.c:1641
+#: src/protocols/toc/toc.c:1683 src/protocols/toc/toc.c:1802
+#: src/protocols/toc/toc.c:1832 src/protocols/toc/toc.c:1888
 msgid "Error"
 msgstr "顼"
 
-#: src/protocols/oscar/oscar.c:3079 src/protocols/toc/toc.c:1105
+#: src/protocols/oscar/oscar.c:3192
+#, c-format
+msgid ""
+"The maximum number of buddies allowed in your buddy list is %d, and you have "
+"%d.  Until you are below the limit, some buddies will not show up as online."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3195
+#, fuzzy
+msgid "Gaim - Warning"
+msgstr "Gaim - 桼ٹ𤷤ޤ?"
+
+#: src/protocols/oscar/oscar.c:3213 src/protocols/toc/toc.c:1108
 msgid "Exchange:"
 msgstr ":"
 
-#: src/protocols/oscar/oscar.c:3407
+#: src/protocols/oscar/oscar.c:3541
 msgid "Unable to open Direct IM"
 msgstr "ľIM򳫤ޤ"
 
-#: src/protocols/oscar/oscar.c:3417
+#: src/protocols/oscar/oscar.c:3551
 #, c-format
 msgid ""
 "You have selected to open a Direct IM connection with %s. Doing this will "
 "let them see your IP address, and may be a security risk. Do you wish to "
 "continue?"
 msgstr ""
-"%sȤľIM򤷤ޤ ʤIPɥ쥹˸褦ˤޤ"
-"ƥŪޤ"
-"³ޤ?"
-
-#: src/protocols/oscar/oscar.c:3450
+"%sȤľIM򤷤ޤ ʤIPɥ쥹˸褦ˤޤ"
+"ƥŪޤ³ޤ?"
+
+#: src/protocols/oscar/oscar.c:3568
+#, c-format
+msgid ""
+"<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR><I>Remote client does not "
+"support sending status messages.</I><BR>"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3575
+#, c-format
+msgid ""
+"<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR><I>User has no status message."
+"</I><BR>"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3600
+#, fuzzy
+msgid "Get Status Msg"
+msgstr "Υʥå"
+
+#: src/protocols/oscar/oscar.c:3613
 msgid "Direct IM"
 msgstr "ľIM"
 
-#: src/protocols/oscar/oscar.c:3458
+#: src/protocols/oscar/oscar.c:3621
 msgid "Get Capabilities"
 msgstr "ǽ"
 
@@ -1057,8 +1500,8 @@
 "You have been connecting and disconnecting too frequently.  Wait ten minutes "
 "and try again.  If you continue to try, you will need to wait even longer."
 msgstr ""
-"ˤ³³ڤޤ 10ʬޤäƺ³Ƥ"
-"Τޤ³³ФäԤĤȤˤʤޤ"
+"ˤ³³ڤޤ 10ʬޤäƺ³ƤΤޤ³³"
+"ФäԤĤȤˤʤޤ"
 
 #: src/protocols/toc/toc.c:471
 #, c-format
@@ -1094,7 +1537,7 @@
 msgid "Password Change Successful"
 msgstr "ѥѹ"
 
-#: src/dialogs.c:1688 src/protocols/toc/toc.c:782
+#: src/dialogs.c:1730 src/protocols/toc/toc.c:782
 msgid "Gaim - Password Change"
 msgstr "Gaim - ѥѹ"
 
@@ -1104,85 +1547,85 @@
 "sent to it, and may kick you off if you send a message. Gaim will prevent "
 "anything from going through. This is only temporary, please be patient."
 msgstr ""
-"TOCϵٻߥޥɤޤ 줬ȯTOCϥå"
-"̵뤷ʤåäƤ⽳ޤ GaimϤˤɤΥ"
-"̤ȴ뤳Ȥ⤢ޤ ŪǤΤDzƤ"
+"TOCϵٻߥޥɤޤ 줬ȯTOCϥå̵"
+"ʤåäƤ⽳ޤ GaimϤˤɤΥå"
+"ȴ뤳Ȥ⤢ޤ ŪǤΤDzƤ"
 
 #: src/protocols/toc/toc.c:788
 msgid "TOC Pause"
 msgstr "TOCٻ"
 
-#: src/protocols/toc/toc.c:1222
+#: src/protocols/toc/toc.c:1225
 msgid "Get Dir Info"
 msgstr "ǥ쥯ȥ"
 
-#: src/protocols/toc/toc.c:1638 src/protocols/toc/toc.c:1680
-#: src/protocols/toc/toc.c:1799 src/protocols/toc/toc.c:1885
+#: src/protocols/toc/toc.c:1641 src/protocols/toc/toc.c:1683
+#: src/protocols/toc/toc.c:1802 src/protocols/toc/toc.c:1888
 msgid "Could not connect for transfer!"
 msgstr "ž³Ǥޤ"
 
-#: src/protocols/toc/toc.c:1829
+#: src/protocols/toc/toc.c:1832
 msgid "Could not write file header!"
 msgstr "եإå񤯤ȤǤޤ!"
 
-#: src/protocols/toc/toc.c:1918
+#: src/protocols/toc/toc.c:1921
 msgid "Gaim - Save As..."
 msgstr "Gaim - ̾դ¸"
 
-#: src/protocols/toc/toc.c:1959
+#: src/protocols/toc/toc.c:1962
 #, c-format
 msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
 msgstr "%s  %s ؤ׵ե%dϼդޤ: %s (%.2f %s)%s%s"
 
-#: src/protocols/toc/toc.c:1960
+#: src/protocols/toc/toc.c:1963
 #, c-format
 msgid "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
 msgstr "%s  %s ؤ׵ե%dϼդޤ: %s (%.2f %s)%s%s"
 
-#: src/protocols/toc/toc.c:1965
+#: src/protocols/toc/toc.c:1968
 #, c-format
 msgid "%s requests you to send them a file"
 msgstr "%sե褦׵ᤷƤޤ"
 
-#: src/protocols/yahoo/yahoo.c:585
+#: src/protocols/yahoo/yahoo.c:594
 msgid "Your message did not get sent."
 msgstr "åޤǤ"
 
-#: src/protocols/zephyr/zephyr.c:802
+#: src/protocols/zephyr/zephyr.c:840
 msgid "ZLocate"
 msgstr "ZLocate"
 
-#: src/protocols/zephyr/zephyr.c:839
+#: src/protocols/zephyr/zephyr.c:877
 msgid "Class:"
 msgstr "饹:"
 
-#: src/protocols/zephyr/zephyr.c:843
+#: src/protocols/zephyr/zephyr.c:881
 msgid "Instance:"
 msgstr "󥹥:"
 
-#: src/protocols/zephyr/zephyr.c:847
+#: src/protocols/zephyr/zephyr.c:885
 msgid "Recipient:"
 msgstr ""
 
-#: src/about.c:93
+#: src/about.c:102
 #, c-format
 msgid "About Gaim v%s"
 msgstr "Gaim v%s ˤĤ"
 
-#: src/about.c:126
+#: src/about.c:135
+#, fuzzy
 msgid ""
-"Gaim is a client that supports AOL's Instant Messenger protocol. It is "
-"written\n"
-"using Gtk+ and is licensed under the GPL.\n"
+"Gaim is a modular Instant Messaging client capable of using AIM, ICQ,\n"
+"Yahoo!, MSN, IRC, Jabber, Napster, Zephyr, and Gadu-Gadu all at once.\n"
+"It is written using Gtk+ and is licensed under the GPL.\n"
 "\n"
 "URL: "
 msgstr ""
-"Gaim AOLΥ󥹥ȥå󥸥㡼ץȥ򥵥ݡȤ饤"
-"Ǥ Gtk+GPLΥ饤󥹤Τȳȯޤ"
-"\n"
+"Gaim AOLΥ󥹥ȥå󥸥㡼ץȥ򥵥ݡȤ饤Ȥ"
+" Gtk+GPLΥ饤󥹤Τȳȯޤ\n"
 "URL:"
 
-#: src/about.c:127
+#: src/about.c:137
 msgid ""
 "\n"
 "\n"
@@ -1192,7 +1635,7 @@
 "\n"
 "IRC: irc.openprojects.net #gaim ͥ"
 
-#: src/about.c:137
+#: src/about.c:147
 msgid ""
 "Active Developers\n"
 "====================\n"
@@ -1230,98 +1673,96 @@
 "Eric Warmenhoven                   [ warmenhoven@yahoo.com ]\n"
 "Mark Spencer (original author)   [ markster@marko.net ]"
 
-#: src/about.c:155 src/aim.c:318 src/buddy.c:2633 src/buddy_chat.c:1311
-#: src/buddy_chat.c:1408 src/buddy_chat.c:1438 src/conversation.c:2795
-#: src/dialogs.c:568 src/dialogs.c:3858 src/multi.c:1057 src/plugins.c:277
-#: src/prefs.c:2535 src/prpl.c:438 src/prpl.c:679 src/server.c:1050
-msgid "Close"
-msgstr "Ĥ"
-
 #. this makes the sizes not work.
 #. GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
 #. gtk_widget_grab_default(button);
-#: src/about.c:175
+#: src/about.c:185
 msgid "Web Site"
 msgstr "Web"
 
-#: src/aim.c:151 src/buddy.c:2626
+#: src/aim.c:153 src/buddy.c:2709
 msgid "Signoff"
 msgstr "󥪥"
 
-#: src/aim.c:163
+#: src/aim.c:165
 msgid "Please enter your logon"
 msgstr "󤷤Ƥ"
 
-#: src/aim.c:163 src/multi.c:1388 src/server.c:55
+#: src/aim.c:165 src/multi.c:1400 src/server.c:55
 msgid "Signon Error"
 msgstr "󥪥󥨥顼"
 
-#: src/aim.c:261
+#: src/aim.c:263
 msgid "Gaim - Login"
 msgstr "Gaim - "
 
-#: src/aim.c:279
+#: src/aim.c:281
 msgid "Screen Name: "
 msgstr "꡼͡: "
 
-#: src/aim.c:295
+#: src/aim.c:297
 msgid "Password: "
 msgstr "ѥ"
 
-#: src/aim.c:316 src/buddy.c:2630
+#: src/aim.c:318 src/buddy.c:2713
 msgid "Quit"
 msgstr "Ĥ"
 
-#: src/aim.c:321 src/aim.c:819 src/buddy.c:2656
+#: src/aim.c:323 src/aim.c:831 src/buddy.c:2739
 msgid "Accounts"
 msgstr ""
 
-#: src/aim.c:323 src/multi.c:903
+#: src/aim.c:325 src/multi.c:915
 msgid "Signon"
 msgstr "󥪥"
 
-#: src/aim.c:355
+#: src/aim.c:357
 msgid "About"
 msgstr "About"
 
-#: src/aim.c:356 src/prefs.c:1619 src/prefs.c:1893
+#: src/aim.c:358 src/prefs.c:1633 src/prefs.c:1905
 msgid "Options"
 msgstr "ץ"
 
-#: src/aim.c:358 src/aim.c:822 src/buddy.c:2674
+#: src/aim.c:360 src/aim.c:834 src/buddy.c:2757
 msgid "Plugins"
 msgstr "ץ饰"
 
-#: src/aim.c:816 src/buddy.c:2666
+#: src/aim.c:828 src/buddy.c:2749
 msgid "Preferences"
 msgstr ""
 
-#: src/applet.c:199
+#: src/aim.c:838 src/multi.c:1472
+#, fuzzy
+msgid "Auto-login"
+msgstr "ư"
+
+#: src/applet.c:109
 msgid "Attempting to sign on...."
 msgstr "󥪥ξǧ"
 
-#: src/applet.c:202
+#: src/applet.c:112
 msgid "Offline. Click to bring up login box."
 msgstr "ե饤 ܥå򥯥åƤ"
 
-#: src/applet.c:218
+#: src/applet.c:128
 #, c-format
 msgid "Away: %d pending."
 msgstr "Υ: %d ڥǥ"
 
-#: src/applet.c:221
+#: src/applet.c:131
 msgid "Away."
 msgstr "Υ"
 
-#: src/applet.c:296 src/away.c:388
+#: src/applet.c:200 src/away.c:388
 msgid "New Away Message"
 msgstr "Υʥå"
 
-#: src/applet.c:444
+#: src/applet.c:348
 msgid "Can't create Gaim applet!"
 msgstr "GaimץåȤĤޤ!"
 
-#: src/applet.c:465
+#: src/applet.c:368
 msgid "About..."
 msgstr "About..."
 
@@ -1345,88 +1786,74 @@
 msgid "Set All Away"
 msgstr "Υʤ"
 
-#. Put the buttons in the box
-#: src/buddy.c:488 src/buddy.c:2741 src/buddy_chat.c:1443
-#: src/conversation.c:2328 src/conversation.c:2810 src/dialogs.c:890
-#: src/dialogs.c:1072 src/dialogs.c:2053 src/multi.c:1041 src/prefs.c:2029
-#: src/prefs.c:2371 src/prefs.c:2405
-msgid "Add"
-msgstr "ä"
-
-#: src/buddy.c:489 src/buddy.c:2742 src/dialogs.c:900 src/dialogs.c:1047
+#: src/buddy.c:493 src/buddy.c:2828 src/dialogs.c:942 src/dialogs.c:1089
 msgid "Group"
 msgstr "롼"
 
-#: src/buddy.c:490 src/buddy.c:2743 src/buddy_chat.c:1445
-#: src/conversation.c:2314 src/conversation.c:2807 src/prefs.c:2043
-#: src/prefs.c:2375 src/prefs.c:2409
-msgid "Remove"
-msgstr ""
-
-#: src/buddy.c:495 src/buddy.c:646 src/buddy.c:798 src/buddy.c:2505
-#: src/buddy_chat.c:850 src/buddy_chat.c:1267
+#: src/buddy.c:499 src/buddy.c:664 src/buddy.c:834 src/buddy.c:2579
+#: src/buddy_chat.c:861 src/buddy_chat.c:1278
 msgid "IM"
 msgstr "IM"
 
-#: src/buddy.c:496 src/buddy.c:2506 src/buddy_chat.c:866 src/buddy_chat.c:1275
-#: src/buddy_chat.c:1451 src/conversation.c:2828
+#: src/buddy.c:500 src/buddy.c:2580 src/buddy_chat.c:877 src/buddy_chat.c:1286
+#: src/buddy_chat.c:1462 src/conversation.c:2897
 msgid "Info"
 msgstr ""
 
 #. Put the buttons in the box
-#: src/buddy.c:651 src/buddy.c:803 src/dialogs.c:1039 src/dialogs.c:3417
-#: src/dialogs.c:3432
+#: src/buddy.c:669 src/buddy.c:839 src/dialogs.c:1081 src/dialogs.c:3458
+#: src/dialogs.c:3473
 msgid "Alias"
 msgstr "ꥢ"
 
-#: src/buddy.c:656 src/buddy.c:822
+#: src/buddy.c:674 src/buddy.c:858
 msgid "Add Buddy Pounce"
 msgstr "ַä"
 
-#: src/buddy.c:663 src/buddy.c:828
+#: src/buddy.c:681 src/buddy.c:864
 msgid "View Log"
 msgstr "򸫤"
 
-#: src/buddy.c:785 src/buddy.c:816
+#: src/buddy.c:821 src/buddy.c:852
 msgid "Rename"
 msgstr "̾"
 
-#: src/buddy.c:810
+#: src/buddy.c:846
 msgid "Un-Alias"
 msgstr "ꥢ"
 
-#: src/buddy.c:1581 src/buddy.c:2649
+#: src/buddy.c:1645 src/buddy.c:2732
 msgid "Buddy Pounce"
 msgstr "֤Ϥ"
 
-#: src/buddy.c:1661
+#: src/buddy.c:1725
 msgid "New Buddy Pounce"
 msgstr "֤Ϥ"
 
-#: src/buddy.c:1679
+#: src/buddy.c:1743
 msgid "Remove Buddy Pounce"
 msgstr "Ϥ֤κ"
 
-#: src/buddy.c:1707
+#: src/buddy.c:1771
 msgid "[Click to edit]"
 msgstr "[Խ򥯥å]"
 
-#: src/buddy.c:2183
+#: src/buddy.c:2254
 #, c-format
 msgid "Logged in: %s\n"
 msgstr "󤷤ޤ: %s\n"
 
-#: src/buddy.c:2195
+#: src/buddy.c:2266
 #, c-format
 msgid "Warnings: %d%%\n"
 msgstr "ٹ: %d%%\n"
 
-#: src/buddy.c:2207
+#: src/buddy.c:2278
 #, c-format
 msgid "Capabilities: %s\n"
 msgstr "ǽ: %s\n"
 
-#: src/buddy.c:2211
+#: src/buddy.c:2282
 #, c-format
 msgid ""
 "Alias: %s               \n"
@@ -1437,117 +1864,127 @@
 "꡼̾: %s\n"
 "%s%s%s%s%s%s"
 
-#: src/buddy.c:2215
+#: src/buddy.c:2286
 msgid "Idle: "
 msgstr "ɥ: "
 
-#: src/buddy.c:2286 src/buddy.c:2291
+#: src/buddy.c:2359 src/buddy.c:2364
 #, c-format
 msgid "%s logged in."
 msgstr "%s ϥ󤷤Ƥޤ"
 
-#: src/buddy.c:2350 src/buddy.c:2355
+#: src/buddy.c:2424 src/buddy.c:2429
 #, c-format
 msgid "%s logged out."
 msgstr "%s ϥȤޤ"
 
-#: src/buddy.c:2540
+#: src/buddy.c:2614
 msgid "Information on selected Buddy"
 msgstr "򤷤֤ξ"
 
-#: src/buddy.c:2541 src/dialogs.c:697
+#: src/buddy.c:2615 src/dialogs.c:697
 msgid "Send Instant Message"
 msgstr "ʰץå"
 
-#: src/buddy.c:2542
+#: src/buddy.c:2616
 msgid "Start/join a Buddy Chat"
 msgstr "֥åȤγ/"
 
-#: src/buddy.c:2543
+#: src/buddy.c:2617
 msgid "Activate Away Message"
 msgstr "ͭΥʥå"
 
-#: src/buddy.c:2606
+#: src/buddy.c:2689
 msgid "File"
 msgstr "ե"
 
-#: src/buddy.c:2610
+#: src/buddy.c:2693
 msgid "Add A Buddy"
 msgstr "֤ä"
 
-#: src/buddy.c:2612
+#: src/buddy.c:2695
 msgid "Join A Chat"
 msgstr "åȤ˲ä"
 
-#: src/buddy.c:2614
+#: src/buddy.c:2697
 msgid "New Instant Message"
 msgstr "ʰץå"
 
-#: src/buddy.c:2616 src/dialogs.c:749
+#: src/buddy.c:2699 src/dialogs.c:759
 msgid "Get User Info"
 msgstr "桼"
 
-#: src/buddy.c:2621
+#: src/buddy.c:2704
 msgid "Import Buddy List"
 msgstr "֥ꥹȤΥݡ"
 
-#: src/buddy.c:2639
+#: src/buddy.c:2722
 msgid "Tools"
 msgstr "ġ"
 
-#: src/buddy.c:2662
+#: src/buddy.c:2745
 msgid "Protocol Actions"
 msgstr "ץȥ"
 
-#: src/buddy.c:2668
+#: src/buddy.c:2751
 msgid "View System Log"
 msgstr "ƥ򸫤"
 
-#: src/buddy.c:2680
+#: src/buddy.c:2763
 msgid "Perl"
 msgstr "Perl"
 
-#: src/buddy.c:2683
+#: src/buddy.c:2766
 msgid "Load Script"
 msgstr "ץȤɤ߹"
 
-#: src/buddy.c:2687
+#: src/buddy.c:2770
 msgid "Unload All Scripts"
 msgstr "ƤΥץȤβ"
 
-#: src/buddy.c:2691
+#: src/buddy.c:2774
 msgid "List Scripts"
 msgstr "ץȥꥹ"
 
-#: src/buddy.c:2699
+#: src/buddy.c:2782
 msgid "Help"
 msgstr "إ"
 
-#: src/buddy.c:2704
+#: src/buddy.c:2787
+#, fuzzy
+msgid "Online Help"
+msgstr "饤"
+
+#: src/buddy.c:2788
+#, fuzzy
+msgid "Debug Window"
+msgstr "ǥХåɥɽ"
+
+#: src/buddy.c:2789
 msgid "About Gaim"
 msgstr "GaimˤĤ"
 
-#: src/buddy.c:2721 src/prefs.c:2891
+#: src/buddy.c:2807 src/prefs.c:2905
 msgid "Buddy List"
 msgstr "֥ꥹ"
 
-#: src/buddy.c:2774
+#: src/buddy.c:2860
 msgid "Add a new Buddy"
 msgstr "֤ä"
 
-#: src/buddy.c:2775
+#: src/buddy.c:2861
 msgid "Add a new Group"
 msgstr "롼"
 
-#: src/buddy.c:2776
+#: src/buddy.c:2862
 msgid "Remove selected Buddy/Group"
 msgstr "򤷤/롼פκ"
 
-#: src/buddy.c:2803
+#: src/buddy.c:2889
 msgid "Edit Buddies"
 msgstr "֤Խ"
 
-#: src/buddy.c:2846
+#: src/buddy.c:2932
 msgid "Gaim - Buddy List"
 msgstr "Gaim - ֥ꥹ"
 
@@ -1555,21 +1992,17 @@
 msgid "Join Chat"
 msgstr "åȤز"
 
-#: src/buddy_chat.c:272
-msgid "Buddy Chat"
-msgstr "֥å"
-
 #: src/buddy_chat.c:283
 msgid "Join Chat As:"
 msgstr "̾ꤷƥåȤ˲"
 
-#: src/buddy_chat.c:304 src/buddy_chat.c:392 src/dialogs.c:450
-#: src/dialogs.c:540 src/dialogs.c:715 src/dialogs.c:773 src/dialogs.c:892
-#: src/dialogs.c:1068 src/dialogs.c:1431 src/dialogs.c:1636 src/dialogs.c:1760
-#: src/dialogs.c:1820 src/dialogs.c:2042 src/dialogs.c:2224 src/dialogs.c:2399
-#: src/dialogs.c:2470 src/dialogs.c:3166 src/dialogs.c:3419 src/dialogs.c:3600
-#: src/dialogs.c:3971 src/dialogs.c:4077 src/dialogs.c:4736 src/multi.c:769
-#: src/multi.c:899 src/prpl.c:150 src/prpl.c:224
+#: src/buddy_chat.c:304 src/buddy_chat.c:392 src/dialogs.c:449
+#: src/dialogs.c:539 src/dialogs.c:715 src/dialogs.c:816 src/dialogs.c:934
+#: src/dialogs.c:1110 src/dialogs.c:1473 src/dialogs.c:1678 src/dialogs.c:1802
+#: src/dialogs.c:1862 src/dialogs.c:2084 src/dialogs.c:2266 src/dialogs.c:2441
+#: src/dialogs.c:2512 src/dialogs.c:3208 src/dialogs.c:3460 src/dialogs.c:3641
+#: src/dialogs.c:4012 src/dialogs.c:4118 src/dialogs.c:4777 src/multi.c:781
+#: src/multi.c:911 src/prpl.c:150 src/prpl.c:224
 msgid "Cancel"
 msgstr ""
 
@@ -1577,16 +2010,16 @@
 msgid "Join"
 msgstr ""
 
-#: src/buddy_chat.c:393 src/buddy_chat.c:396 src/buddy_chat.c:1317
-#: src/buddy_chat.c:1407
+#: src/buddy_chat.c:393 src/buddy_chat.c:396 src/buddy_chat.c:1328
+#: src/buddy_chat.c:1418
 msgid "Invite"
 msgstr ""
 
-#: src/buddy_chat.c:412 src/dialogs.c:1259 src/dialogs.c:3427
+#: src/buddy_chat.c:412 src/dialogs.c:1301 src/dialogs.c:3468
 msgid "Buddy"
 msgstr ""
 
-#: src/buddy_chat.c:417 src/prefs.c:1992
+#: src/buddy_chat.c:417 src/prefs.c:2004
 msgid "Message"
 msgstr "å"
 
@@ -1594,302 +2027,296 @@
 msgid "Gaim - Invite Buddy Into Chat Room"
 msgstr "Gaim - ֤Υåȥ롼Ǿ"
 
-#: src/buddy_chat.c:857
+#: src/buddy_chat.c:868
 msgid "Un-Ignore"
 msgstr "̵"
 
-#: src/buddy_chat.c:859 src/buddy_chat.c:1271
+#: src/buddy_chat.c:870 src/buddy_chat.c:1282
 msgid "Ignore"
 msgstr "̵"
 
 #. don't remove them from ignored in case they re-enter
-#: src/buddy_chat.c:922 src/buddy_chat.c:1034 src/buddy_chat.c:1497
-#: src/buddy_chat.c:1530
+#: src/buddy_chat.c:933 src/buddy_chat.c:1045 src/buddy_chat.c:1508
+#: src/buddy_chat.c:1541
 #, c-format
 msgid "%d %s in room"
 msgstr "%d%sˤޤ"
 
-#: src/buddy_chat.c:930
+#: src/buddy_chat.c:941
 #, c-format
 msgid "%s entered the room."
 msgstr "%sޤ"
 
-#: src/buddy_chat.c:996
+#: src/buddy_chat.c:1007
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s%sȤΤƤޤ"
 
-#: src/buddy_chat.c:1043
+#: src/buddy_chat.c:1054
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s(%s)ޤ"
 
-#: src/buddy_chat.c:1045
+#: src/buddy_chat.c:1056
 #, c-format
 msgid "%s left the room."
 msgstr "%sޤ"
 
-#: src/buddy_chat.c:1144
+#: src/buddy_chat.c:1155
 msgid "Gaim - Group Chats"
 msgstr "Gaim - 롼ץå"
 
-#: src/buddy_chat.c:1207
+#: src/buddy_chat.c:1218
 msgid "Topic:"
 msgstr "ȥԥå:"
 
-#: src/buddy_chat.c:1248
+#: src/buddy_chat.c:1259
 msgid "0 people in room"
 msgstr "ï⤤ޤ"
 
-#: src/buddy_chat.c:1322 src/buddy_chat.c:1406
+#: src/buddy_chat.c:1333 src/buddy_chat.c:1417
 msgid "Whisper"
 msgstr "䤯"
 
-#: src/buddy_chat.c:1327 src/buddy_chat.c:1404 src/buddy_chat.c:1453
-#: src/conversation.c:2839
+#: src/buddy_chat.c:1338 src/buddy_chat.c:1415 src/buddy_chat.c:1464
+#: src/conversation.c:2908
 msgid "Send"
 msgstr ""
 
-#: src/buddy_chat.c:1447 src/conversation.c:2816
+#: src/buddy_chat.c:1458 src/conversation.c:2885
 msgid "Block"
 msgstr ""
 
-#: src/buddy_chat.c:1449 src/conversation.c:2822 src/dialogs.c:425
-#: src/dialogs.c:454
+#: src/buddy_chat.c:1460 src/conversation.c:2891 src/dialogs.c:424
+#: src/dialogs.c:453
 msgid "Warn"
 msgstr "ٹ"
 
-#: src/conversation.c:413
+#: src/conversation.c:431
 msgid "Gaim - Save Conversation"
 msgstr "Gaim - ¸"
 
-#: src/conversation.c:474
+#: src/conversation.c:492
 msgid "Gaim - Insert Image"
 msgstr "Gaim - "
 
-#: src/conversation.c:1278
+#: src/conversation.c:1336
 msgid "Unable to send message: too large"
 msgstr "åޤ: Ǥ"
 
-#: src/conversation.c:1278 src/conversation.c:1282
+#: src/conversation.c:1336 src/conversation.c:1340
 msgid "Message Error"
 msgstr "å顼"
 
-#: src/conversation.c:1282
+#: src/conversation.c:1340
 msgid "Unable to send message: Unknown reason"
 msgstr "åޤ: "
 
-#: src/conversation.c:1501
+#: src/conversation.c:1559
 #, c-format
 msgid "Currently at %d, "
 msgstr "%dˤޤ"
 
-#: src/conversation.c:1509
+#: src/conversation.c:1567
 #, c-format
 msgid "Setting position to %d\n"
 msgstr "֤%dˤޤ\n"
 
-#: src/conversation.c:2110 src/prefs.c:1305
+#: src/conversation.c:2170 src/prefs.c:1308
 msgid "Bold Text"
 msgstr "ܡɥƥ"
 
-#: src/conversation.c:2110
+#: src/conversation.c:2170
 msgid "Bold"
 msgstr "ܡ"
 
-#: src/conversation.c:2114
+#: src/conversation.c:2174
 msgid "Italics Text"
 msgstr "åƥ"
 
-#: src/conversation.c:2115
+#: src/conversation.c:2175
 msgid "Italics"
 msgstr "å"
 
-#: src/conversation.c:2118 src/prefs.c:1317
+#: src/conversation.c:2178 src/prefs.c:1320
 msgid "Underline Text"
 msgstr "ƥ"
 
-#: src/conversation.c:2119
+#: src/conversation.c:2179
 msgid "Underline"
 msgstr ""
 
-#: src/conversation.c:2123 src/prefs.c:1323
+#: src/conversation.c:2183 src/prefs.c:1326
 msgid "Strike through Text"
 msgstr "ƥ"
 
-#: src/conversation.c:2123
+#: src/conversation.c:2183
 msgid "Strike"
 msgstr ""
 
-#: src/conversation.c:2129
+#: src/conversation.c:2189
 msgid "Decrease font size"
 msgstr ""
 
-#: src/conversation.c:2129
+#: src/conversation.c:2189
 msgid "Small"
 msgstr ""
 
-#: src/conversation.c:2132
+#: src/conversation.c:2192
 msgid "Normal font size"
 msgstr "̤Υեȥ"
 
-#: src/conversation.c:2132
+#: src/conversation.c:2192
 msgid "Normal"
 msgstr ""
 
-#: src/conversation.c:2135
+#: src/conversation.c:2195
 msgid "Increase font size"
 msgstr ""
 
-#: src/conversation.c:2135
+#: src/conversation.c:2195
 msgid "Big"
 msgstr "礭"
 
-#: src/conversation.c:2142 src/dialogs.c:2841 src/dialogs.c:2865
+#: src/conversation.c:2202 src/dialogs.c:2883 src/dialogs.c:2907
 msgid "Select Font"
 msgstr "եȤ"
 
-#: src/conversation.c:2143
+#: src/conversation.c:2203
 msgid "Font"
 msgstr "ե"
 
-#: src/conversation.c:2146 src/prefs.c:1353
+#: src/conversation.c:2206 src/prefs.c:1356
 msgid "Text Color"
 msgstr "ʸ"
 
-#: src/conversation.c:2147 src/conversation.c:2151
+#: src/conversation.c:2207 src/conversation.c:2211
 msgid "Color"
 msgstr ""
 
-#: src/conversation.c:2151 src/prefs.c:1371
+#: src/conversation.c:2211 src/prefs.c:1374
 msgid "Background Color"
 msgstr "طʿ"
 
-#: src/conversation.c:2158 src/dialogs.c:2464
+#: src/conversation.c:2218 src/dialogs.c:2506
 msgid "Insert Link"
 msgstr "󥯤"
 
-#: src/conversation.c:2159
+#: src/conversation.c:2219
 msgid "Link"
 msgstr ""
 
-#: src/conversation.c:2162
+#: src/conversation.c:2222
 msgid "Insert smiley face"
 msgstr "ޥ꡼"
 
-#: src/conversation.c:2162
+#: src/conversation.c:2222
 msgid "Smiley"
 msgstr "ޥ꡼"
 
-#: src/conversation.c:2165
+#: src/conversation.c:2225
 msgid "Insert IM Image"
 msgstr "IM"
 
-#: src/conversation.c:2165
+#: src/conversation.c:2225
 msgid "Image"
 msgstr ""
 
-#: src/conversation.c:2172
+#: src/conversation.c:2232
 msgid "Enable logging"
 msgstr "ͭ"
 
-#: src/conversation.c:2173 src/prefs.c:254
+#: src/conversation.c:2233 src/prefs.c:254
 msgid "Logging"
 msgstr ""
 
-#: src/conversation.c:2182
+#: src/conversation.c:2242
 msgid "Save Conversation"
 msgstr "ä¸"
 
-#: src/conversation.c:2183 src/dialogs.c:1640 src/dialogs.c:1824
-#: src/dialogs.c:3178 src/dialogs.c:3867 src/dialogs.c:4744
+#: src/conversation.c:2243 src/dialogs.c:1682 src/dialogs.c:1866
+#: src/dialogs.c:3220 src/dialogs.c:3908 src/dialogs.c:4785
 msgid "Save"
 msgstr "¸"
 
-#: src/conversation.c:2187
-msgid "Enable sounds"
-msgstr "ͭ"
-
-#: src/conversation.c:2188
+#: src/conversation.c:2247 src/conversation.c:2248
 msgid "Sound"
 msgstr ""
 
-#: src/conversation.c:2668
+#: src/conversation.c:2729
 msgid "Gaim - Conversations"
 msgstr "Gaim - "
 
-#: src/conversation.c:2755
+#: src/conversation.c:2816
 msgid "Send message as: "
 msgstr "̾դƥå:"
 
-#: src/conversation.c:3373
+#: src/conversation.c:3453
 msgid "Gaim - Save Icon"
 msgstr "Gaim - ¸"
 
-#: src/conversation.c:3400
+#: src/conversation.c:3487
 msgid "Disable Animation"
 msgstr "˥᡼̵"
 
-#: src/conversation.c:3405
+#: src/conversation.c:3492
 msgid "Enable Animation"
 msgstr "˥᡼ͭ"
 
-#: src/conversation.c:3411
+#: src/conversation.c:3498
 msgid "Hide Icon"
 msgstr "쥢"
 
-#: src/conversation.c:3417
+#: src/conversation.c:3504
 msgid "Save Icon As..."
 msgstr "̾դƥ¸"
 
-#: src/dialogs.c:413
+#: src/dialogs.c:412
 msgid "Gaim - Warn user?"
 msgstr "Gaim - 桼ٹ𤷤ޤ?"
 
-#: src/dialogs.c:433
+#: src/dialogs.c:432
 #, c-format
 msgid "Do you really want to warn %s?"
 msgstr "%sٹ𤷤ΤǤ?"
 
-#: src/dialogs.c:438
+#: src/dialogs.c:437
 msgid "Warn anonymously?"
 msgstr "ƿ̾Ƿٹ𤷤ޤ?"
 
-#: src/dialogs.c:442
+#: src/dialogs.c:441
 msgid "Anonymous warnings are less harsh."
 msgstr "ƿ̾ηٹϤۤɹӤޤ"
 
-#: src/dialogs.c:470
+#: src/dialogs.c:469
 #, c-format
 msgid "Removing '%s' from buddylist.\n"
 msgstr "֥ꥹȤ'%s'\n"
 
-#: src/dialogs.c:495
+#: src/dialogs.c:494
 #, c-format
 msgid "Gaim - Remove %s?"
 msgstr "Gaim - %s"
 
-#: src/dialogs.c:508
+#: src/dialogs.c:507
 msgid "Remove Buddy"
 msgstr "֤"
 
-#: src/dialogs.c:518
+#: src/dialogs.c:517
 #, c-format
 msgid ""
 "You are about to remove '%s' from\n"
 "your buddylist. Do you want to continue?"
-msgstr ""
-"֥ꥹȤ'%s'뤳ȤˤĤ"
-"³ޤ?"
-
-#: src/dialogs.c:530 src/prpl.c:154 src/prpl.c:228
+msgstr "֥ꥹȤ'%s'뤳ȤˤĤ³ޤ?"
+
+#: src/dialogs.c:529 src/prpl.c:154 src/prpl.c:228
 msgid "Accept"
 msgstr "λ"
 
 #. Build OK Button
-#: src/dialogs.c:637 src/dialogs.c:720 src/dialogs.c:778 src/dialogs.c:1435
-#: src/dialogs.c:1764 src/dialogs.c:1915 src/dialogs.c:2223 src/dialogs.c:2403
-#: src/dialogs.c:2469 src/dialogs.c:3976 src/dialogs.c:4082 src/multi.c:774
+#: src/dialogs.c:635 src/dialogs.c:720 src/dialogs.c:821 src/dialogs.c:1477
+#: src/dialogs.c:1806 src/dialogs.c:1957 src/dialogs.c:2265 src/dialogs.c:2445
+#: src/dialogs.c:2511 src/dialogs.c:4017 src/dialogs.c:4123 src/multi.c:786
 msgid "OK"
 msgstr "λ"
 
@@ -1901,338 +2328,343 @@
 msgid "IM who:"
 msgstr "IM ï:"
 
-#: src/dialogs.c:756
+#: src/dialogs.c:768
 msgid "User:"
 msgstr "桼:"
 
+#: src/dialogs.c:777
+#, fuzzy
+msgid "Account:"
+msgstr ""
+
 #. Finish up
-#: src/dialogs.c:783
+#: src/dialogs.c:826
 msgid "Gaim - Get User Info"
 msgstr "Gaim - 桼"
 
-#: src/dialogs.c:898
+#: src/dialogs.c:940
 msgid "Add Group"
 msgstr "롼ɲ"
 
-#: src/dialogs.c:923
+#: src/dialogs.c:965
 msgid "Gaim - Add Group"
 msgstr "Gaim - 롼ɲ"
 
-#: src/dialogs.c:1007
+#: src/dialogs.c:1049
 msgid "Gaim - Add Buddy"
 msgstr "Gaim - ɲ"
 
-#: src/dialogs.c:1019
+#: src/dialogs.c:1061
 msgid "Add Buddy"
 msgstr "ɲ"
 
-#: src/dialogs.c:1029
+#: src/dialogs.c:1071
 msgid "Contact"
 msgstr "󥿥"
 
 #. Set up stuff for the account box
-#: src/dialogs.c:1055
+#: src/dialogs.c:1097
 msgid "Add To"
 msgstr "ɲ"
 
-#: src/dialogs.c:1092
+#: src/dialogs.c:1134
 msgid "Please enter a buddy to pounce."
 msgstr "Ϥߤ֤򤤤Ƥ"
 
-#: src/dialogs.c:1092
+#: src/dialogs.c:1134
 msgid "Buddy Pounce Error"
 msgstr "Ϥߥ顼"
 
-#: src/dialogs.c:1228
+#: src/dialogs.c:1270
 msgid "Gaim - New Buddy Pounce"
 msgstr "Gaim - ֤Ϥ"
 
 #. <pounce type="who">
-#: src/dialogs.c:1239
+#: src/dialogs.c:1281
 msgid "Pounce Who"
 msgstr "ïϤ"
 
-#: src/dialogs.c:1250
+#: src/dialogs.c:1292
 msgid "Account"
 msgstr ""
 
 #. </pounce type="who">
 #. <pounce type="when">
-#: src/dialogs.c:1276
+#: src/dialogs.c:1318
 msgid "Pounce When"
 msgstr "ĤĤߤ"
 
-#: src/dialogs.c:1286
+#: src/dialogs.c:1328
 msgid "Pounce on sign on"
 msgstr "󥪥λ"
 
-#: src/dialogs.c:1295
+#: src/dialogs.c:1337
 msgid "Pounce on return from away"
 msgstr "Υʤä"
 
-#: src/dialogs.c:1304
+#: src/dialogs.c:1346
 msgid "Pounce on return from idle"
 msgstr "ٻߤä"
 
-#: src/dialogs.c:1313
+#: src/dialogs.c:1355
 msgid "Pounce when buddy is typing to you"
 msgstr "ʤ֤Ϥ"
 
 #. </pounce type="when">
 #. <pounce type="action">
-#: src/dialogs.c:1323
+#: src/dialogs.c:1365
 msgid "Pounce Action"
 msgstr "Ϥ"
 
-#: src/dialogs.c:1334
+#: src/dialogs.c:1376
 msgid "Open IM Window"
 msgstr "IMɥ򳫤"
 
-#: src/dialogs.c:1343
+#: src/dialogs.c:1385
 msgid "Popup Notification"
 msgstr "ݥåץå"
 
-#: src/dialogs.c:1352
+#: src/dialogs.c:1394
 msgid "Send Message"
 msgstr "å"
 
-#: src/dialogs.c:1373
+#: src/dialogs.c:1415
 msgid "Execute command on pounce"
 msgstr "Ϥॳޥɤμ¹"
 
-#: src/dialogs.c:1395
+#: src/dialogs.c:1437
 msgid "Play sound on pounce"
 msgstr "Ϥ಻"
 
 #. </pounce type="action">
-#: src/dialogs.c:1417
+#: src/dialogs.c:1459
 msgid "Save this pounce after activation"
 msgstr "Ϥߤ¸"
 
-#: src/dialogs.c:1503
+#: src/dialogs.c:1545
 msgid "Gaim - Set Dir Info"
 msgstr "Gaim - ǥ쥯ȥ"
 
-#: src/dialogs.c:1512
+#: src/dialogs.c:1554
 msgid "Directory Info"
 msgstr "ǥ쥯ȥ"
 
-#: src/dialogs.c:1534
+#: src/dialogs.c:1576
 msgid "Allow Web Searches To Find Your Info"
 msgstr "Web餢ʤξդ뤳ȤĤ"
 
 #. Line 1
-#: src/dialogs.c:1537 src/dialogs.c:2242
+#: src/dialogs.c:1579 src/dialogs.c:2284
 msgid "First Name"
 msgstr ""
 
 #. Line 2
-#: src/dialogs.c:1548 src/dialogs.c:2254
+#: src/dialogs.c:1590 src/dialogs.c:2296
 msgid "Middle Name"
 msgstr "ߥɥ͡"
 
 #. Line 3
-#: src/dialogs.c:1560 src/dialogs.c:2266
+#: src/dialogs.c:1602 src/dialogs.c:2308
 msgid "Last Name"
 msgstr "̾"
 
 #. Line 4
-#: src/dialogs.c:1571 src/dialogs.c:2278
+#: src/dialogs.c:1613 src/dialogs.c:2320
 msgid "Maiden Name"
 msgstr ""
 
 #. Line 6
-#: src/dialogs.c:1593 src/dialogs.c:2301
+#: src/dialogs.c:1635 src/dialogs.c:2343
 msgid "State"
 msgstr ""
 
-#: src/dialogs.c:1658
+#: src/dialogs.c:1700
 msgid "New Passwords Do Not Match"
 msgstr "ѥɤϥޥåޤ"
 
-#: src/dialogs.c:1658 src/dialogs.c:1663
+#: src/dialogs.c:1700 src/dialogs.c:1705
 msgid "Gaim - Change Password Error"
 msgstr "Gaim - ѥѹ顼"
 
-#: src/dialogs.c:1663
+#: src/dialogs.c:1705
 msgid "Fill out all fields completely"
 msgstr "ƤϤƤ"
 
-#: src/dialogs.c:1718
+#: src/dialogs.c:1760
 msgid "Original Password"
 msgstr "ꥸʥѥ"
 
-#: src/dialogs.c:1732
+#: src/dialogs.c:1774
 msgid "New Password"
 msgstr "ѥ"
 
-#: src/dialogs.c:1746
+#: src/dialogs.c:1788
 msgid "New Password (again)"
 msgstr "ѥ()"
 
-#: src/dialogs.c:1787
+#: src/dialogs.c:1829
 msgid "Gaim - Set User Info"
 msgstr "Gaim - 桼Ͽ"
 
-#: src/dialogs.c:1899
+#: src/dialogs.c:1941
 msgid "Below are the results of your search: "
 msgstr "ʤθ̤: "
 
-#: src/dialogs.c:2032 src/dialogs.c:2039
+#: src/dialogs.c:2074 src/dialogs.c:2081
 msgid "Permit"
 msgstr ""
 
-#: src/dialogs.c:2034 src/dialogs.c:2041
+#: src/dialogs.c:2076 src/dialogs.c:2083
 msgid "Deny"
 msgstr ""
 
-#: src/dialogs.c:2078
+#: src/dialogs.c:2120
 msgid "Gaim - Add Permit"
 msgstr "Gaim - Ĥɲ"
 
-#: src/dialogs.c:2080
+#: src/dialogs.c:2122
 msgid "Gaim - Add Deny"
 msgstr "Gaim - Ĥɲ"
 
-#: src/dialogs.c:2140
+#: src/dialogs.c:2182
 msgid "Gaim - Log Conversation"
 msgstr "Gaim - "
 
-#: src/dialogs.c:2218 src/dialogs.c:2381
+#: src/dialogs.c:2260 src/dialogs.c:2423
 msgid "Search for Buddy"
 msgstr "֤θ"
 
-#: src/dialogs.c:2346
+#: src/dialogs.c:2388
 msgid "Gaim - Find Buddy By Info"
 msgstr "Gaim - 󤫤֤õ"
 
-#: src/dialogs.c:2375
+#: src/dialogs.c:2417
 msgid "Gaim - Find Buddy By Email"
 msgstr "Gaim - E-mail֤õ"
 
-#: src/dialogs.c:2515
+#: src/dialogs.c:2557
 msgid "Gaim - Add URL"
 msgstr "Gaim - URLɲ"
 
-#: src/dialogs.c:2666 src/dialogs.c:2687 src/dialogs.c:2741
+#: src/dialogs.c:2708 src/dialogs.c:2729 src/dialogs.c:2783
 msgid "Select Text Color"
 msgstr "ʸ"
 
-#: src/dialogs.c:2720
+#: src/dialogs.c:2762
 msgid "Select Background Color"
 msgstr "طʿ"
 
-#: src/dialogs.c:2942
+#: src/dialogs.c:2984
 msgid "Import to:"
 msgstr "ݡȤ: "
 
-#: src/dialogs.c:2966
+#: src/dialogs.c:3008
 msgid "Gaim - Import Buddy List"
 msgstr "Gaim - ֥ꥹȤΥݡ"
 
 #. We shouldn't allow a blank title
-#: src/dialogs.c:3033
+#: src/dialogs.c:3075
 msgid "You cannot create an away message with a blank title"
 msgstr "̾ΥʥåϺޤ"
 
 #. We shouldn't allow a blank message
-#: src/dialogs.c:3040
+#: src/dialogs.c:3082
 msgid "You cannot create an empty away message"
 msgstr "Υåޤ"
 
-#: src/dialogs.c:3108
+#: src/dialogs.c:3150
 msgid "Gaim - New away message"
 msgstr "Gaim - Υʥå"
 
-#: src/dialogs.c:3118
+#: src/dialogs.c:3160
 msgid "New away message"
 msgstr "Υʥå"
 
-#: src/dialogs.c:3131
+#: src/dialogs.c:3173
 msgid "Away title: "
 msgstr "Υʥå ̾:"
 
-#: src/dialogs.c:3170
+#: src/dialogs.c:3212
 msgid "Use"
 msgstr "Ȥ"
 
-#: src/dialogs.c:3174
+#: src/dialogs.c:3216
 msgid "Save & Use"
 msgstr "¸ƻȤ"
 
 #. show everything
-#: src/dialogs.c:3372
+#: src/dialogs.c:3413
 msgid "Smile!"
 msgstr "Ф!"
 
-#: src/dialogs.c:3425
+#: src/dialogs.c:3466
 msgid "Alias Buddy"
 msgstr "֤Υꥢ"
 
-#: src/dialogs.c:3458
+#: src/dialogs.c:3499
 msgid "Gaim - Alias Buddy"
 msgstr "Gaim - ֤Υꥢ"
 
-#: src/dialogs.c:3530
+#: src/dialogs.c:3571
 msgid "Gaim - Save Log File"
 msgstr "Gaim - ¸"
 
-#: src/dialogs.c:3562
+#: src/dialogs.c:3603
 #, c-format
 msgid "Unable to remove file %s - %s"
 msgstr "ե %s - %s "
 
-#: src/dialogs.c:3590
+#: src/dialogs.c:3631
 msgid "Really clear log?"
 msgstr "˥?"
 
-#: src/dialogs.c:3605
+#: src/dialogs.c:3646
 msgid "Okay"
 msgstr "OK"
 
-#: src/dialogs.c:3776
+#: src/dialogs.c:3817
 msgid "Date"
 msgstr ""
 
-#: src/dialogs.c:3839
+#: src/dialogs.c:3880
 msgid "Conversation"
 msgstr ""
 
-#: src/dialogs.c:3862
+#: src/dialogs.c:3903
 msgid "Clear"
 msgstr "õ"
 
-#: src/dialogs.c:3940
+#: src/dialogs.c:3981
 msgid "Gaim - Rename Group"
 msgstr "Gaim - 롼פβ̾"
 
-#: src/dialogs.c:3950
+#: src/dialogs.c:3991
 msgid "Rename Group"
 msgstr "롼פβ̾"
 
-#: src/dialogs.c:3957 src/dialogs.c:4063
+#: src/dialogs.c:3998 src/dialogs.c:4104
 msgid "New name:"
 msgstr "̾"
 
-#: src/dialogs.c:4046
+#: src/dialogs.c:4087
 msgid "Gaim - Rename Buddy"
 msgstr "Gaim - ֤β̾"
 
-#: src/dialogs.c:4056
+#: src/dialogs.c:4097
 msgid "Rename Buddy"
 msgstr "֤β̾"
 
 #. Below is basically stolen from plugins.c
-#: src/dialogs.c:4140
+#: src/dialogs.c:4181
 msgid "Gaim - Select Perl Script"
 msgstr "Gaim - PerlץȤ"
 
-#: src/gaimrc.c:1117
+#: src/gaimrc.c:1136
 #, c-format
 msgid "Could not open config file %s."
 msgstr "ե%s򳫤ޤ"
 
-#: src/gaimrc.c:1118
+#: src/gaimrc.c:1137
 msgid "Preferences Error"
 msgstr "ꥨ顼"
 
@@ -2245,55 +2677,65 @@
 msgid "g003: Error opening connection.\n"
 msgstr "g003: ³ϥ顼\n"
 
-#: src/multi.c:452
+#: src/module.c:106 src/module.c:112 src/module.c:122
+#, fuzzy
+msgid "Plugin Error"
+msgstr "󥨥顼"
+
+#: src/multi.c:454
 msgid "Gaim - Load Buddy Icon"
 msgstr "Gaim - ֥ɤ߹"
 
-#: src/multi.c:495
+#: src/multi.c:497
 msgid "Buddy Icon File:"
 msgstr "֥ե:"
 
-#: src/multi.c:506
+#: src/multi.c:508
 msgid "Browse"
 msgstr ""
 
-#: src/multi.c:511 src/prefs.c:1545
+#: src/multi.c:513 src/prefs.c:1548
 msgid "Reset"
 msgstr "ꥻå"
 
-#: src/multi.c:538
+#: src/multi.c:540
 msgid "Screenname:"
 msgstr "꡼̾:"
 
-#: src/multi.c:558
+#: src/multi.c:559
+#, fuzzy
+msgid "Alias:"
+msgstr "ꥢ"
+
+#: src/multi.c:569
 msgid "Protocol:"
 msgstr "ץȥ:"
 
-#: src/multi.c:563
+#: src/multi.c:574
 msgid "Remember Password"
 msgstr "ѥɤФ"
 
-#: src/multi.c:564
+#: src/multi.c:575
 msgid "Auto-Login"
 msgstr "ư"
 
-#: src/multi.c:604
+#: src/multi.c:616
 msgid "New Mail Notifications"
 msgstr "᡼"
 
-#: src/multi.c:694
+#: src/multi.c:706
 msgid "Register with server"
 msgstr "ФϿ"
 
-#: src/multi.c:752
+#: src/multi.c:764
 msgid "Gaim - Modify Account"
 msgstr "Gaim - Ƚ"
 
-#: src/multi.c:871
+#: src/multi.c:883
 msgid "Enter Password"
 msgstr "ѥ"
 
-#: src/multi.c:935
+#: src/multi.c:947
 msgid ""
 "You cannot log this account in; you do not have the protocol it uses loaded, "
 "or the protocol does not have a login function."
@@ -2301,44 +2743,44 @@
 "ΥȤǤϥȤޤ ץȥɤ߹Ǥʤʤɤ߹"
 "ץȥ뤬ǤϵǽʤǤ"
 
-#: src/multi.c:937
+#: src/multi.c:949
 msgid "Login Error"
 msgstr "󥨥顼"
 
-#: src/multi.c:966
+#: src/multi.c:978
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "%sΤǤ?"
 
-#: src/multi.c:1003
+#: src/multi.c:1015
 msgid "Gaim - Account Editor"
 msgstr "Gaim - Խ"
 
-#: src/multi.c:1022
+#: src/multi.c:1034
 msgid "Select All"
 msgstr ""
 
-#: src/multi.c:1027
+#: src/multi.c:1039
 msgid "Select Autos"
 msgstr "Ƽư"
 
-#: src/multi.c:1031
+#: src/multi.c:1043
 msgid "Select None"
 msgstr "򤷤ʤ"
 
-#: src/multi.c:1045
+#: src/multi.c:1057
 msgid "Modify"
 msgstr "Խ"
 
-#: src/multi.c:1049
+#: src/multi.c:1061
 msgid "Sign On/Off"
 msgstr "󥪥/"
 
-#: src/multi.c:1053
+#: src/multi.c:1065
 msgid "Delete"
 msgstr ""
 
-#: src/multi.c:1368
+#: src/multi.c:1380
 #, c-format
 msgid ""
 "%s\n"
@@ -2347,25 +2789,25 @@
 "%s\n"
 "%s: %s"
 
-#: src/multi.c:1387
+#: src/multi.c:1399
 #, c-format
 msgid "%s was unable to sign on"
 msgstr "%s ϥ󥪥Ǥޤ"
 
-#: src/multi.c:1398
+#: src/multi.c:1410
 msgid "Notice"
 msgstr ""
 
-#: src/multi.c:1408
+#: src/multi.c:1420
 #, c-format
 msgid "%s has been signed off"
 msgstr "%s ϥ󥪥դޤ"
 
-#: src/multi.c:1409
+#: src/multi.c:1421
 msgid "Connection Error"
 msgstr "³顼"
 
-#: src/perl.c:856
+#: src/perl.c:875
 msgid "Perl Scripts"
 msgstr "Perl ץ"
 
@@ -2426,11 +2868,13 @@
 msgid "General Options"
 msgstr "Ūʥץ"
 
-#: src/prefs.c:200 src/prefs.c:383 src/prefs.c:551 src/prefs.c:665
-#: src/prefs.c:918 src/prefs.c:1068 src/prefs.c:1293 src/prefs.c:1615
-#: src/prefs.c:1889 src/prefs.c:2322
+#: src/prefs.c:200 src/prefs.c:384 src/prefs.c:552 src/prefs.c:667
+#: src/prefs.c:921 src/prefs.c:1071 src/prefs.c:1296 src/prefs.c:1629
+#: src/prefs.c:1901 src/prefs.c:2334
 msgid "All options take effect immediately unless otherwise noted."
-msgstr "⤷¾ˡդʤäʤСץϤ٤Ƹ̤ľ˸路ޤ"
+msgstr ""
+"⤷¾ˡդʤäʤСץϤ٤Ƹ̤ľ˸路"
+""
 
 #: src/prefs.c:212
 msgid "Miscellaneous"
@@ -2502,8 +2946,8 @@
 msgstr ""
 
 #: src/prefs.c:291
-msgid "KFM"
-msgstr "KFM"
+msgid "Konqueror"
+msgstr ""
 
 #: src/prefs.c:292
 msgid "Opera"
@@ -2513,395 +2957,409 @@
 msgid "Netscape"
 msgstr "Netscape"
 
-#: src/prefs.c:296
+#: src/prefs.c:294
+msgid "Mozilla"
+msgstr ""
+
+#: src/prefs.c:297
 msgid "Pop up new window by default"
 msgstr "ǥեȤǿɥ򳫤"
 
-#: src/prefs.c:303
+#: src/prefs.c:304
 msgid "GNOME URL Handler"
 msgstr "GNOME URLϥɥ顼"
 
-#: src/prefs.c:305
+#: src/prefs.c:306
 msgid "Galeon"
 msgstr "Galeon"
 
-#: src/prefs.c:306
-msgid "Manual"
-msgstr ""
-
-#: src/prefs.c:375
+#: src/prefs.c:307
+#, c-format
+msgid "Manual (%s for URL)"
+msgstr ""
+
+#: src/prefs.c:376
 msgid "Proxy Options"
 msgstr "ץץ"
 
-#: src/prefs.c:387
+#: src/prefs.c:388
 msgid ""
 "Not all protocols can use these proxy options. Please see the README file "
 "for details."
 msgstr ""
-"ƤΥץȥǥץץϻȤʤ READMEեߤ"
-""
-
-#: src/prefs.c:392
+"ƤΥץȥǥץץϻȤʤ READMEեߤƤ"
+
+#: src/prefs.c:393
 msgid "Proxy Type"
 msgstr "ץ"
 
-#: src/prefs.c:404
+#: src/prefs.c:405
 msgid "Proxy Server"
 msgstr "ץ"
 
-#: src/prefs.c:407
+#: src/prefs.c:408
 msgid "No Proxy"
 msgstr "ץѤʤ"
 
-#: src/prefs.c:419
+#: src/prefs.c:420
 msgid "SOCKS 4"
 msgstr "SOCKS 4"
 
-#: src/prefs.c:429
+#: src/prefs.c:430
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
-#: src/prefs.c:438
+#: src/prefs.c:439
 msgid "HTTP"
 msgstr "HTTP"
 
-#: src/prefs.c:462
+#: src/prefs.c:463
 msgid "Host"
 msgstr "ۥ̾"
 
-#: src/prefs.c:478
+#: src/prefs.c:479
 msgid "Port"
 msgstr "ݡֹ"
 
-#: src/prefs.c:495
+#: src/prefs.c:496
 msgid "User"
 msgstr "桼̾"
 
-#: src/prefs.c:511
+#: src/prefs.c:512
 msgid "Password"
 msgstr "ѥ"
 
-#: src/prefs.c:543
+#: src/prefs.c:544
 msgid "Buddy List Options"
 msgstr "֥ꥹȥץ"
 
-#: src/prefs.c:555
+#: src/prefs.c:556
 msgid "Buddy List Window"
 msgstr "֥ꥹȥɥ"
 
-#: src/prefs.c:568
+#: src/prefs.c:569
 msgid "Tab Placement:"
 msgstr "ִ"
 
-#: src/prefs.c:572 src/prefs.c:1001 src/prefs.c:1151
+#: src/prefs.c:573 src/prefs.c:1004 src/prefs.c:1154
 msgid "Top"
 msgstr "־"
 
-#: src/prefs.c:573 src/prefs.c:1003 src/prefs.c:1153
+#: src/prefs.c:574 src/prefs.c:1006 src/prefs.c:1156
 msgid "Bottom"
 msgstr "ֲ"
 
-#: src/prefs.c:585
+#: src/prefs.c:586
 msgid "Hide IM/Info/Chat buttons"
 msgstr "IM//åȥܥ򱣤"
 
-#: src/prefs.c:587
+#: src/prefs.c:588
 msgid "Automatically show buddy list on sign on"
 msgstr "Ͽ줿ͧãꥹȤưɽ"
 
-#: src/prefs.c:589
+#: src/prefs.c:590
 msgid "Display Buddy List near applet"
 msgstr "ץåնͧãꥹȤɽ"
 
-#: src/prefs.c:592
+#: src/prefs.c:593
 msgid "Save Window Size/Position"
 msgstr "ɥ֤¸"
 
-#: src/prefs.c:595
+#: src/prefs.c:596
 msgid "Show pictures on buttons"
 msgstr "ܥɽ"
 
 #: src/prefs.c:600
+msgid "Raise Buddy List on Signons and Signoffs"
+msgstr ""
+
+#: src/prefs.c:602
 msgid "Group Displays"
 msgstr "롼פɽ"
 
-#: src/prefs.c:612
+#: src/prefs.c:614
 msgid "Hide groups with no online buddies"
 msgstr "ե饤ͧãϥ롼פ򱣤"
 
-#: src/prefs.c:618
+#: src/prefs.c:620
 msgid "Show numbers in groups"
 msgstr "롼׿ɽ"
 
-#: src/prefs.c:620
+#: src/prefs.c:622
 msgid "Buddy Displays"
 msgstr "֤ɽ"
 
-#: src/prefs.c:632
+#: src/prefs.c:634
 msgid "Show buddy type icons"
 msgstr "֥ץɽ"
 
-#: src/prefs.c:633
+#: src/prefs.c:635
 msgid "Show warning levels"
 msgstr "ٹ٥ɽ"
 
-#: src/prefs.c:639
+#: src/prefs.c:641
 msgid "Show idle times"
 msgstr "ٻ߻֤ɽ"
 
-#: src/prefs.c:640
+#: src/prefs.c:642
 msgid "Grey idle buddies"
 msgstr "ٻ֤ϥ졼"
 
-#: src/prefs.c:657
+#: src/prefs.c:659
 msgid "Conversation Options"
 msgstr "åץ"
 
-#: src/prefs.c:669
+#: src/prefs.c:671
 msgid "Keyboard Options"
 msgstr "ܡɥץ"
 
-#: src/prefs.c:681
-msgid "Enter sends message"
-msgstr "Enterפǥå"
-
-#: src/prefs.c:682
-msgid "Control-Enter sends message"
-msgstr "Control-Enterפǥå"
-
 #: src/prefs.c:683
+msgid "Enter sends message"
+msgstr "Enterפǥå"
+
+#: src/prefs.c:684
+msgid "Control-Enter sends message"
+msgstr "Control-Enterפǥå"
+
+#: src/prefs.c:685
 msgid "Escape closes window"
 msgstr "EscapeפǥɥĤ"
 
-#: src/prefs.c:689
+#: src/prefs.c:686
+#, fuzzy
+msgid "Control-W closes window"
+msgstr "EscapeפǥɥĤ"
+
+#: src/prefs.c:692
 msgid "Control-{B/I/U/S} inserts HTML tags"
 msgstr "Control-{B/I/U/S}פHTML"
 
-#: src/prefs.c:690
+#: src/prefs.c:693
 msgid "Control-(number) inserts smileys"
 msgstr "Control-(number)פǥޥ꡼"
 
-#: src/prefs.c:691
+#: src/prefs.c:694
 msgid "F2 toggles timestamp display"
 msgstr "F2 ǥॹɽ"
 
-#: src/prefs.c:693
+#: src/prefs.c:696
 msgid "Display and General Options"
 msgstr "ɽȰ̥ץ"
 
-#: src/prefs.c:705
+#: src/prefs.c:708
 msgid "Show graphical smileys"
 msgstr "եåޥ꡼ɽ"
 
-#: src/prefs.c:706
+#: src/prefs.c:709
 msgid "Show timestamp on messages"
 msgstr "åΥॹפɽ"
 
-#: src/prefs.c:707
+#: src/prefs.c:710
 msgid "Show URLs as links"
 msgstr "󥯤ȤURLɽ"
 
-#: src/prefs.c:708
+#: src/prefs.c:711
 msgid "Highlight misspelled words"
 msgstr "ߥڥϥ饤Ȥ"
 
-#: src/prefs.c:709 src/prefs.c:1911
+#: src/prefs.c:712 src/prefs.c:1923
 msgid "Sending messages removes away status"
 msgstr "Υʾ֤Υå"
 
-#: src/prefs.c:710 src/prefs.c:1924
+#: src/prefs.c:713 src/prefs.c:1936
 msgid "Queue new messages when away"
 msgstr "Υʤ鿷åϥ塼"
 
-#: src/prefs.c:716
+#: src/prefs.c:719
 msgid "Ignore colors"
 msgstr "̵"
 
-#: src/prefs.c:717
+#: src/prefs.c:720
 msgid "Ignore font faces"
 msgstr "եȤ̵"
 
-#: src/prefs.c:718
+#: src/prefs.c:721
 msgid "Ignore font sizes"
 msgstr "եȥ̵"
 
-#: src/prefs.c:719
+#: src/prefs.c:722
 msgid "Ignore TiK Automated Messages"
 msgstr "TiKưå̵"
 
-#: src/prefs.c:720 src/prefs.c:1909
+#: src/prefs.c:723 src/prefs.c:1921
 msgid "Ignore new conversations when away"
 msgstr "Υʻοä̵"
 
-#: src/prefs.c:909
+#: src/prefs.c:912
 msgid "IM Options"
 msgstr "IMץ"
 
-#: src/prefs.c:922 src/prefs.c:2907
+#: src/prefs.c:925 src/prefs.c:2921
 msgid "IM Window"
 msgstr "IMɥ"
 
-#: src/prefs.c:938 src/prefs.c:1088
+#: src/prefs.c:941 src/prefs.c:1091
 msgid "Show buttons as: "
 msgstr "̾դƥܥɽ"
 
-#: src/prefs.c:942 src/prefs.c:1093
+#: src/prefs.c:945 src/prefs.c:1096
 msgid "Pictures And Text"
 msgstr "ȥƥ"
 
-#: src/prefs.c:943 src/prefs.c:1095
+#: src/prefs.c:946 src/prefs.c:1098
 msgid "Pictures"
 msgstr ""
 
-#: src/prefs.c:944 src/prefs.c:1096
+#: src/prefs.c:947 src/prefs.c:1099
 msgid "Text"
 msgstr "ƥ"
 
-#: src/prefs.c:955
+#: src/prefs.c:958
 msgid "Show all conversations in one tabbed window"
 msgstr "ƤβäĤΥ֥ɥɽ"
 
-#: src/prefs.c:957
+#: src/prefs.c:960
 msgid "Show chats in the same tabbed window"
 msgstr "Ʊ֥ɥǥåȤɽ"
 
-#: src/prefs.c:964 src/prefs.c:1116
+#: src/prefs.c:967 src/prefs.c:1119
 msgid "Raise windows on events"
 msgstr "٥ȯǥɥ򥢥ƥ֤ˤ"
 
-#: src/prefs.c:965
+#: src/prefs.c:968
 msgid "Show logins in window"
 msgstr "ɥǥɽ"
 
-#: src/prefs.c:966
-msgid "Show aliases in tabs/titles"
+#: src/prefs.c:969
+#, fuzzy
+msgid "Show aliases in tabs/titles/ticker"
 msgstr "/̾򥨥ꥢɽ"
 
-#: src/prefs.c:967
+#: src/prefs.c:970
 msgid "Hide window on send"
 msgstr "ɥ򱣤"
 
-#: src/prefs.c:969 src/prefs.c:1119
+#: src/prefs.c:972 src/prefs.c:1122
 msgid "Window Sizes"
 msgstr "ɥ"
 
-#: src/prefs.c:977 src/prefs.c:1127
+#: src/prefs.c:980 src/prefs.c:1130
 msgid "New window width:"
 msgstr "ɥ:"
 
-#: src/prefs.c:978 src/prefs.c:1128
+#: src/prefs.c:981 src/prefs.c:1131
 msgid "New window height:"
 msgstr "ɥι⤵:"
 
-#: src/prefs.c:979 src/prefs.c:1129
+#: src/prefs.c:982 src/prefs.c:1132
 msgid "Entry widget height:"
 msgstr "ϥåȤι⤵:"
 
-#: src/prefs.c:981 src/prefs.c:1131
+#: src/prefs.c:984 src/prefs.c:1134
 msgid "Tab Placement"
 msgstr "ִ"
 
-#: src/prefs.c:1010 src/prefs.c:1160
+#: src/prefs.c:1013 src/prefs.c:1163
 msgid "Left"
 msgstr ""
 
-#: src/prefs.c:1012 src/prefs.c:1162
+#: src/prefs.c:1015 src/prefs.c:1165
 msgid "Right"
 msgstr ""
 
-#: src/prefs.c:1016
+#: src/prefs.c:1019
 msgid "Buddy Icons"
 msgstr "֥"
 
-#: src/prefs.c:1028
+#: src/prefs.c:1031
 msgid "Hide Buddy Icons"
 msgstr "֥򱣤"
 
-#: src/prefs.c:1034
+#: src/prefs.c:1037
 msgid "Disable Buddy Icon Animation"
 msgstr "˥᡼̵֥"
 
-#: src/prefs.c:1060
+#: src/prefs.c:1063
 msgid "Chat Options"
 msgstr "åȥץ"
 
-#: src/prefs.c:1072
+#: src/prefs.c:1075
 msgid "Group Chat Window"
 msgstr "롼ץåȥɥ"
 
-#: src/prefs.c:1107
+#: src/prefs.c:1110
 msgid "Show all chats in one tabbed window"
 msgstr "ƤΥåȤĤΥ֥ɥɽ"
 
-#: src/prefs.c:1109
+#: src/prefs.c:1112
 msgid "Show conversations in the same tabbed window"
 msgstr "ƤβäƱ֥ɥɽ"
 
-#: src/prefs.c:1117
+#: src/prefs.c:1120
 msgid "Show people joining/leaving in window"
 msgstr "/Υʤ򥦥ɥɽ"
 
-#: src/prefs.c:1165
+#: src/prefs.c:1168
 msgid "Tab Completion"
 msgstr "ִλ"
 
-#: src/prefs.c:1177
+#: src/prefs.c:1180
 msgid "Tab-Complete Nicks"
 msgstr "֤Υ˥å͡"
 
-#: src/prefs.c:1183
+#: src/prefs.c:1186
 msgid "Old-Style Tab Completion"
 msgstr "ŤΥ"
 
-#: src/prefs.c:1285 src/prefs.c:2917
+#: src/prefs.c:1288 src/prefs.c:2931
 msgid "Font Options"
 msgstr "եȥץ"
 
-#: src/prefs.c:1311
+#: src/prefs.c:1314
 msgid "Italic Text"
 msgstr "åƥ"
 
-#: src/prefs.c:1355 src/prefs.c:1373 src/prefs.c:1395
+#: src/prefs.c:1358 src/prefs.c:1376 src/prefs.c:1398
 msgid "Select"
 msgstr ""
 
-#: src/prefs.c:1393
+#: src/prefs.c:1396
 msgid "Font Face for Text"
 msgstr "ƥȤΥե"
 
-#: src/prefs.c:1408
+#: src/prefs.c:1411
 msgid "Font Size for Text"
 msgstr "ƥȤΥեȥ"
 
-#: src/prefs.c:1505
+#: src/prefs.c:1508
 msgid "Gaim - Sound Configuration"
 msgstr "Gaim - "
 
-#: src/prefs.c:1540
+#: src/prefs.c:1543
 msgid "Test"
 msgstr "ƥ"
 
-#: src/prefs.c:1550
+#: src/prefs.c:1553
 msgid "Choose..."
 msgstr "..."
 
-#: src/prefs.c:1607
+#: src/prefs.c:1621
 msgid "Sound Options"
 msgstr "ץ"
 
-#: src/prefs.c:1635
+#: src/prefs.c:1649
 msgid "No sounds when you log in"
 msgstr "󤷤Ȥ˲Ĥ餵ʤ"
 
-#: src/prefs.c:1641 src/prefs.c:1910
+#: src/prefs.c:1655 src/prefs.c:1922
 msgid "Sounds while away"
 msgstr "Υβ"
 
-#: src/prefs.c:1651
+#: src/prefs.c:1665
 msgid "Sound method"
 msgstr "᥽å"
 
-#: src/prefs.c:1725
+#: src/prefs.c:1739
 #, c-format
 msgid ""
 "Sound command\n"
@@ -2910,103 +3368,103 @@
 "ޥ\n"
 "(ե̾%s)"
 
-#: src/prefs.c:1737
+#: src/prefs.c:1751
 msgid "Sound played when:"
 msgstr "Ĥ餹Ȥ:"
 
-#: src/prefs.c:1881 src/prefs.c:2939
+#: src/prefs.c:1893 src/prefs.c:2953
 msgid "Away Messages"
 msgstr "Υʥå"
 
-#: src/prefs.c:1918
+#: src/prefs.c:1930
 msgid "Don't send auto-response"
 msgstr "ưʤ"
 
-#: src/prefs.c:1919
+#: src/prefs.c:1931
 msgid "Only send auto-response when idle"
 msgstr "ٻϼưΤ"
 
-#: src/prefs.c:1934
+#: src/prefs.c:1946
 msgid "Time between sending auto-responses (in seconds):"
 msgstr "ưֳ()"
 
-#: src/prefs.c:1949
+#: src/prefs.c:1961
 msgid "Auto Away after"
 msgstr "ưΥʸ"
 
-#: src/prefs.c:1963
+#: src/prefs.c:1975
 msgid "minutes using"
 msgstr "ʬ"
 
-#: src/prefs.c:1976
+#: src/prefs.c:1988
 msgid "Messages"
 msgstr "å"
 
-#: src/prefs.c:2033
+#: src/prefs.c:2045
 msgid "Edit"
 msgstr "Խ"
 
-#: src/prefs.c:2037
+#: src/prefs.c:2049
 msgid "Make Away"
 msgstr "ɤä"
 
-#: src/prefs.c:2314
+#: src/prefs.c:2326
 msgid "Privacy Options"
 msgstr "Ŀ;󥪥ץ"
 
-#: src/prefs.c:2330
+#: src/prefs.c:2342
 msgid "Set privacy for:"
 msgstr "Ŀ;:"
 
-#: src/prefs.c:2349
+#: src/prefs.c:2361
 msgid "Allow all users to contact me"
 msgstr "ܿ"
 
-#: src/prefs.c:2350
+#: src/prefs.c:2362
 msgid "Allow only the users below"
 msgstr "ʲΥ桼Τߵ"
 
-#: src/prefs.c:2352
+#: src/prefs.c:2364
 msgid "Allow List"
 msgstr "ĥꥹ"
 
-#: src/prefs.c:2383
+#: src/prefs.c:2395
 msgid "Deny all users"
 msgstr "ïʤ"
 
-#: src/prefs.c:2384
+#: src/prefs.c:2396
 msgid "Block the users below"
 msgstr "ʲΥ桼Τߵ"
 
-#: src/prefs.c:2386
+#: src/prefs.c:2398
 msgid "Block List"
 msgstr "ݥꥹ"
 
-#: src/prefs.c:2481
+#: src/prefs.c:2493
 msgid "Gaim - Preferences"
 msgstr "Gaim - "
 
-#: src/prefs.c:2564
+#: src/prefs.c:2576
 msgid "Gaim debug output window"
 msgstr "Gaim ǥХåɥ"
 
-#: src/prefs.c:2873
+#: src/prefs.c:2887
 msgid "General"
 msgstr ""
 
-#: src/prefs.c:2878
+#: src/prefs.c:2892
 msgid "Proxy"
 msgstr "ץ"
 
-#: src/prefs.c:2902
+#: src/prefs.c:2916
 msgid "Conversations"
 msgstr ""
 
-#: src/prefs.c:2928
+#: src/prefs.c:2942
 msgid "Sounds"
 msgstr ""
 
-#: src/prefs.c:2950
+#: src/prefs.c:2964
 msgid "Privacy"
 msgstr "Ŀ;"
 
@@ -3017,10 +3475,10 @@
 "not the same version I cannot safely tell you which one it was. Needless to "
 "say, it was not successfully loaded."
 msgstr ""
-"ŬѤȤƽнƱС󤫤饳ѥ뤵ʤäץȥ"
-"ɤ뤳ȤߤޤԱˤ⡢줬ƱСǤʤΤǡϡ"
-"줬ɤäʤ뤳ȤǤޤ"
-"ޤǤʤΣ˥ɤޤǤ"
+"ŬѤȤƽнƱС󤫤饳ѥ뤵ʤäץȥ"
+"ɤ뤳ȤߤޤԱˤ⡢줬ƱСǤʤΤǡϡ줬"
+"ɤäʤ뤳ȤǤޤޤǤʤΣ˥"
+"ɤޤǤ"
 
 #: src/prpl.c:74
 msgid "Protocol Error"
@@ -3051,37 +3509,37 @@
 msgid "Open Mail"
 msgstr "᡼򳫤"
 
-#: src/prpl.c:564
-#, c-format
-msgid "%s%s%s%s has made %s their buddy%s%s%s"
+#: src/prpl.c:570
+#, fuzzy, c-format
+msgid "%s%s%s%s has made %s his or her buddy%s%s%s"
 msgstr "%s%s%s%s %s%s%sޤ"
 
-#: src/prpl.c:572
+#: src/prpl.c:578
+#, fuzzy
 msgid ""
 "\n"
 "\n"
-"Do you wish to add them to your buddy list?"
+"Do you wish to add him or her to your buddy list?"
 msgstr ""
 "\n"
 "\n"
 "֥ꥹȤɲäޤ?"
 
-#: src/prpl.c:615
+#: src/prpl.c:621
 msgid ""
 "You do not currently have any protocols available that are able to register "
 "new accounts."
-msgstr ""
-"ϿɬפʥץȥǸ߻Ȥޤ"
-
-#: src/prpl.c:652
+msgstr "ϿɬפʥץȥǸ߻Ȥޤ"
+
+#: src/prpl.c:658
 msgid "Gaim - Registration"
 msgstr "Gaim - Ͽ"
 
-#: src/prpl.c:667
+#: src/prpl.c:673
 msgid "Registration Information"
 msgstr "Ͽ"
 
-#: src/prpl.c:684
+#: src/prpl.c:690
 msgid "Register"
 msgstr "Ͽ"
 
@@ -3110,6 +3568,59 @@
 msgid "No"
 msgstr ""
 
-#: src/server.c:1054
+#: src/server.c:1076
 msgid "More Info"
 msgstr "äȾ"
+
+#: src/sound.c:63
+#, fuzzy
+msgid "Buddy logs in"
+msgstr "֥"
+
+#: src/sound.c:64
+#, fuzzy
+msgid "Buddy logs out"
+msgstr "֥ꥹ"
+
+#: src/sound.c:65
+#, fuzzy
+msgid "Message received"
+msgstr "å顼"
+
+#: src/sound.c:66
+msgid "Message received begins conversation"
+msgstr ""
+
+#: src/sound.c:67
+#, fuzzy
+msgid "Message sent"
+msgstr "å"
+
+#: src/sound.c:68
+msgid "Person enters chat"
+msgstr ""
+
+#: src/sound.c:69
+msgid "Person leaves chat"
+msgstr ""
+
+#: src/sound.c:70
+msgid "You talk in chat"
+msgstr ""
+
+#: src/sound.c:71
+msgid "Others talk in chat"
+msgstr ""
+
+#: src/sound.c:74
+msgid "Someone says your name in chat"
+msgstr ""
+
+#~ msgid "Enable sounds"
+#~ msgstr "ͭ"
+
+#~ msgid "KFM"
+#~ msgstr "KFM"
+
+#~ msgid "Manual"
+#~ msgstr ""
--- a/po/ko.po	Tue Jul 02 05:41:30 2002 +0000
+++ b/po/ko.po	Tue Jul 02 05:42:26 2002 +0000
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gaim 0.58\n"
-"POT-Creation-Date: 2002-05-13 22:41-0400\n"
+"POT-Creation-Date: 2002-06-25 00:10-0400\n"
 "PO-Revision-Date: 2002-06-03 09:02+0900\n"
 "Last-Translator: A Lee <alee@debian.org>\n"
 "Language-Team: artsilly and alee team\n"
@@ -14,7 +14,87 @@
 "Content-Type: text/plain; charset=euc-kr\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/protocols/gg/gg.c:71
+#: plugins/chatlist.c:67 src/buddy_chat.c:272
+msgid "Buddy Chat"
+msgstr "ä"
+
+#: plugins/chatlist.c:166 plugins/chatlist.c:168 plugins/chatlist.c:407
+#: plugins/chatlist.c:409
+#, fuzzy
+msgid "Gaim Chat"
+msgstr " - ä"
+
+#: plugins/chatlist.c:339 src/about.c:165 src/aim.c:320 src/buddy.c:2716
+#: src/buddy_chat.c:1322 src/buddy_chat.c:1419 src/buddy_chat.c:1449
+#: src/conversation.c:2864 src/dialogs.c:567 src/dialogs.c:3899
+#: src/multi.c:1069 src/plugins.c:277 src/prefs.c:2547 src/prpl.c:438
+#: src/prpl.c:685 src/server.c:1072
+msgid "Close"
+msgstr "ݱ"
+
+#: plugins/chatlist.c:344
+#, fuzzy
+msgid "Chat Rooms"
+msgstr "ä ɼ"
+
+#: plugins/chatlist.c:363
+msgid "Refresh"
+msgstr ""
+
+#. Put the buttons in the box
+#: plugins/chatlist.c:364 src/buddy.c:492 src/buddy.c:2827
+#: src/buddy_chat.c:1454 src/conversation.c:2389 src/conversation.c:2879
+#: src/dialogs.c:932 src/dialogs.c:1114 src/dialogs.c:2095 src/multi.c:1053
+#: src/prefs.c:2041 src/prefs.c:2383 src/prefs.c:2417
+msgid "Add"
+msgstr "߰"
+
+#: plugins/chatlist.c:365 src/buddy.c:494 src/buddy.c:2829
+#: src/buddy_chat.c:1456 src/conversation.c:2375 src/conversation.c:2876
+#: src/prefs.c:2055 src/prefs.c:2387 src/prefs.c:2421
+msgid "Remove"
+msgstr ""
+
+#: plugins/chatlist.c:388
+msgid "List of available chats"
+msgstr ""
+
+#: plugins/chatlist.c:398
+msgid "List of subscribed chats"
+msgstr ""
+
+#: plugins/gtik.c:699
+msgid "Gnome Stock Ticker Properties"
+msgstr ""
+
+#: plugins/gtik.c:711
+msgid "Update Frequency in min"
+msgstr ""
+
+#: plugins/gtik.c:727
+msgid "Enter symbols delimited with \"+\" in the box below."
+msgstr ""
+
+#. OUTPUT FORMAT and SCROLL DIRECTION
+#: plugins/gtik.c:737
+msgid "Check this box to display only symbols and price:"
+msgstr ""
+
+#: plugins/gtik.c:738
+msgid "Check this box to scroll left to right:"
+msgstr ""
+
+#: plugins/gtik.c:974
+#, fuzzy
+msgid "(No"
+msgstr ""
+
+#: plugins/gtik.c:975
+#, fuzzy
+msgid "Change"
+msgstr "ä:"
+
+#: src/protocols/gg/gg.c:71 src/protocols/msn/msn.c:1919
 msgid "Available"
 msgstr "޽   "
 
@@ -22,8 +102,8 @@
 msgid "Available for friends only"
 msgstr "ģ鿡Ը ޽   "
 
-#: src/applet.c:186 src/buddy.c:494 src/buddy.c:2524 src/buddy.c:2669
-#: src/protocols/gg/gg.c:73 src/protocols/jabber/jabber.c:723
+#: src/applet.c:197 src/buddy.c:497 src/buddy.c:2582 src/buddy.c:2727
+#: src/protocols/gg/gg.c:73 src/protocols/jabber/jabber.c:1118
 msgid "Away"
 msgstr "ڸ"
 
@@ -39,7 +119,7 @@
 msgid "Invisible for friends only"
 msgstr "ģ鿡Ը  ʵ "
 
-#: src/protocols/gg/gg.c:77 src/protocols/jabber/jabber.c:719
+#: src/protocols/gg/gg.c:77 src/protocols/jabber/jabber.c:1114
 msgid "Unavailable"
 msgstr "޽   "
 
@@ -71,7 +151,7 @@
 msgid "Unknown Error Code."
 msgstr "    ڵ."
 
-#: src/protocols/gg/gg.c:302
+#: src/protocols/gg/gg.c:302 src/protocols/msn/msn.c:2050
 #, c-format
 msgid "Status: %s"
 msgstr ": %s"
@@ -271,7 +351,12 @@
 msgid "Directory Search"
 msgstr "丮 ˻"
 
+#.
+#. } else if (!strcmp(act, _("Set Dir Info"))) {
+#. show_set_dir(gc);
+#.
 #: src/dialogs.c:1741 src/protocols/gg/gg.c:1160 src/protocols/gg/gg.c:1177
+#: src/protocols/jabber/jabber.c:3748 src/protocols/jabber/jabber.c:3761
 msgid "Change Password"
 msgstr "йȣ "
 
@@ -292,7 +377,7 @@
 msgstr "  ޽ "
 
 #: src/protocols/icq/gaim_icq.c:469 src/protocols/irc/irc.c:1851
-#: src/protocols/jabber/jabber.c:2255 src/protocols/oscar/oscar.c:3580
+#: src/protocols/jabber/jabber.c:2860 src/protocols/oscar/oscar.c:3593
 #: src/protocols/toc/toc.c:1219
 msgid "Get Info"
 msgstr " "
@@ -329,10 +414,9 @@
 msgid ""
 "%s has requested a DCC chat.  Would you like to establish the direct "
 "connection?"
-msgstr ""
-"%s DCC ä û߽ϴ.  ޾Ƶ̽ðڽϱ?"
-
-#: src/protocols/irc/irc.c:1001
+msgstr "%s DCC ä û߽ϴ.  ޾Ƶ̽ðڽϱ?"
+
+#: src/protocols/irc/irc.c:1001 src/protocols/msn/msn.c:315
 msgid "Unable to write"
 msgstr "  ϴ."
 
@@ -367,216 +451,521 @@
 msgid "DCC Chat"
 msgstr "DCC ä"
 
-#: src/buddy.c:2829 src/protocols/jabber/jabber.c:725
-#: src/protocols/jabber/jabber.c:743
+#: src/protocols/jabber/jabber.c:942
+msgid "Incorrect current password! Password NOT Changed!"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:943 src/protocols/jabber/jabber.c:948
+#, fuzzy
+msgid "Password Change Error!"
+msgstr " - йȣ "
+
+#: src/protocols/jabber/jabber.c:947
+msgid "New password same as old password! Password NOT Changed!"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1092
+msgid "Unknown"
+msgstr "˷ "
+
+#: src/buddy.c:2887 src/protocols/jabber/jabber.c:1120
+#: src/protocols/jabber/jabber.c:1138
 msgid "Online"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:727
+#: src/protocols/jabber/jabber.c:1122
 msgid "Extended Away"
 msgstr "ڸ"
 
-#: src/protocols/jabber/jabber.c:729
+#: src/protocols/jabber/jabber.c:1124
 msgid "Do Not Disturb"
 msgstr "ر"
 
-#: src/protocols/jabber/jabber.c:1150
+#: src/protocols/jabber/jabber.c:1434
+#, c-format
+msgid "Error %s: %s"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1437
+#, fuzzy
+msgid "Unknown Error in presence"
+msgstr "    ڵ."
+
+#: src/protocols/jabber/jabber.c:1607
 #, c-format
 msgid "The user %s wants to add you to their buddy list."
 msgstr "%s  ڽ ģ Ͽ ߰ϰ ;մϴ."
 
-#: src/protocols/jabber/jabber.c:1175
+#: src/protocols/jabber/jabber.c:1632
 msgid "No such user"
 msgstr "׷  "
 
-#: src/protocols/jabber/jabber.c:1177 src/protocols/jabber/jabber.c:1809
-#: src/protocols/jabber/jabber.c:1955
+#: src/protocols/jabber/jabber.c:1634 src/protocols/jabber/jabber.c:2341
+#: src/protocols/jabber/jabber.c:2506
 msgid "Jabber Error"
 msgstr " "
 
-#: src/dialogs.c:887 src/protocols/jabber/jabber.c:1257
+#: src/dialogs.c:887 src/protocols/jabber/jabber.c:1719
+#: src/protocols/msn/msn.c:1110
 msgid "Buddies"
 msgstr "ģ"
 
-#: src/protocols/jabber/jabber.c:1315
+#: src/protocols/jabber/jabber.c:1782
 msgid "Authenticating"
 msgstr " Ȯ "
 
-#: src/protocols/jabber/jabber.c:1352
+#: src/protocols/jabber/jabber.c:1819
 msgid "Unknown login error"
 msgstr "   α "
 
-#: src/protocols/jabber/jabber.c:1582 src/protocols/jabber/jabber.c:3046
+#: src/protocols/jabber/jabber.c:2010
+#, fuzzy
+msgid "Password successfully changed."
+msgstr "йȣ  Ǿϴ."
+
+#: src/protocols/jabber/jabber.c:2012
+#, fuzzy
+msgid "Password Change"
+msgstr " - йȣ "
+
+#: src/protocols/jabber/jabber.c:2054 src/protocols/jabber/jabber.c:3676
 msgid "Connection lost"
 msgstr " "
 
-#: src/protocols/jabber/jabber.c:1584 src/protocols/jabber/jabber.c:1616
-#: src/protocols/jabber/jabber.c:3048 src/protocols/jabber/jabber.c:3094
+#: src/protocols/jabber/jabber.c:2056 src/protocols/jabber/jabber.c:2088
+#: src/protocols/jabber/jabber.c:3678 src/protocols/jabber/jabber.c:3724
+#: src/protocols/msn/msn.c:1741 src/protocols/msn/msn.c:1770
 msgid "Unable to connect"
 msgstr "  ϴ"
 
-#: src/protocols/jabber/jabber.c:1590
+#: src/protocols/jabber/jabber.c:2062
 msgid "Connected"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1593
+#: src/protocols/jabber/jabber.c:2065
 msgid "Requesting Authentication Method"
 msgstr "  ûϴ "
 
 #. we have no chats yet
-#: src/protocols/jabber/jabber.c:1611
+#: src/protocols/jabber/jabber.c:2083 src/protocols/msn/msn.c:1762
 msgid "Connecting"
 msgstr " "
 
-#: src/protocols/jabber/jabber.c:1808 src/protocols/jabber/jabber.c:1954
+#: src/protocols/jabber/jabber.c:2340 src/protocols/jabber/jabber.c:2505
 msgid "Invalid Jabber I.D."
 msgstr "߸  ̵"
 
-#: src/protocols/jabber/jabber.c:1921
-msgid "ȭ:"
+#: src/protocols/jabber/jabber.c:2473
+msgid "Room:"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1925
-msgid ":"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:1930
+#: src/protocols/jabber/jabber.c:2477
+#, fuzzy
+msgid "Server:"
+msgstr "Ͻ "
+
+#: src/protocols/jabber/jabber.c:2482
 msgid "Handle:"
 msgstr "ó:"
 
-#: src/protocols/jabber/jabber.c:2205 src/protocols/jabber/jabber.c:2544
-msgid "Unknown"
-msgstr "˷ "
-
-#: src/buddy_chat.c:879 src/protocols/jabber/jabber.c:2260
-#: src/protocols/oscar/oscar.c:3593
+#: src/protocols/jabber/jabber.c:2539
+#, fuzzy
+msgid "Chats"
+msgstr "ä"
+
+#: src/protocols/jabber/jabber.c:2854
+#, fuzzy
+msgid "View Error Msg"
+msgstr " ȭ "
+
+#: src/buddy_chat.c:886 src/protocols/jabber/jabber.c:2865
+#: src/protocols/oscar/oscar.c:3606
 msgid "Get Away Msg"
 msgstr "ڸ ޽ "
 
-#: src/protocols/jabber/jabber.c:2442
+#: src/protocols/jabber/jabber.c:2882
+msgid "Remove From Roster"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:3076
 msgid "Full Name"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:2443
+#: src/protocols/jabber/jabber.c:3077
 msgid "Family Name"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:2444
+#: src/protocols/jabber/jabber.c:3078
 msgid "Given Name"
 msgstr "̸"
 
-#: src/protocols/jabber/jabber.c:2445
+#: src/protocols/jabber/jabber.c:3079
 msgid "Nickname"
 msgstr ""
 
-#: src/dialogs.c:2525 src/protocols/jabber/jabber.c:2446
+#: src/dialogs.c:2525 src/protocols/jabber/jabber.c:3080
 msgid "URL"
 msgstr "URL"
 
-#: src/protocols/jabber/jabber.c:2447
+#: src/protocols/jabber/jabber.c:3081
 msgid "Street Address"
 msgstr "Ÿ ּ"
 
-#: src/protocols/jabber/jabber.c:2448
+#: src/protocols/jabber/jabber.c:3082
 msgid "Extended Address"
 msgstr " ּ"
 
-#: src/protocols/jabber/jabber.c:2449
+#: src/protocols/jabber/jabber.c:3083
 msgid "Locality"
 msgstr "ġ"
 
-#: src/protocols/jabber/jabber.c:2450
+#: src/protocols/jabber/jabber.c:3084
 msgid "Region"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:2451
+#: src/protocols/jabber/jabber.c:3085
 msgid "Postal Code"
 msgstr "ȣ"
 
 #. Line 7
-#: src/dialogs.c:1646 src/dialogs.c:2354 src/protocols/jabber/jabber.c:2452
+#: src/dialogs.c:1646 src/dialogs.c:2354 src/protocols/jabber/jabber.c:3086
 msgid "Country"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:2453
+#: src/protocols/jabber/jabber.c:3087
 msgid "Telephone"
 msgstr "ȭ"
 
-#: src/dialogs.c:2430 src/protocols/jabber/jabber.c:2454
+#: src/dialogs.c:2430 src/protocols/jabber/jabber.c:3088
 msgid "Email"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:2455
+#: src/protocols/jabber/jabber.c:3089
 msgid "Organization Name"
 msgstr " ̸"
 
-#: src/protocols/jabber/jabber.c:2456
+#: src/protocols/jabber/jabber.c:3090
 msgid "Organization Unit"
 msgstr " μ"
 
-#: src/prefs.c:1990 src/protocols/jabber/jabber.c:2457
+#: src/prefs.c:2000 src/protocols/jabber/jabber.c:3091
 msgid "Title"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:2458
+#: src/protocols/jabber/jabber.c:3092
 msgid "Role"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:2459
+#: src/protocols/jabber/jabber.c:3093
 msgid "Birthday"
 msgstr ""
 
 #. Right side: frame with description and the filepath of plugin
-#: src/dialogs.c:2533 src/plugins.c:211 src/protocols/jabber/jabber.c:2460
+#: src/dialogs.c:2533 src/plugins.c:211 src/protocols/jabber/jabber.c:3094
 msgid "Description"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:2485
+#: src/protocols/jabber/jabber.c:3119
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable"
 msgstr ""
-"  ׸ ûԴϴ. Էص ϴٰ ϴ  "
-"ԷϽʽÿ."
-
-#: src/protocols/jabber/jabber.c:2486
+"  ׸ ûԴϴ. Էص ϴٰ ϴ  Է"
+"ʽÿ."
+
+#: src/protocols/jabber/jabber.c:3120
 msgid "User Identity"
 msgstr " Ȯ"
 
-#: src/protocols/jabber/jabber.c:2902
+#: src/protocols/jabber/jabber.c:3532
 msgid "Gaim - Edit Jabber vCard"
 msgstr " -  vCard "
 
-#: src/protocols/jabber/jabber.c:2976
+#: src/protocols/jabber/jabber.c:3606
 msgid "Server Registration successful!"
 msgstr "  ߽ϴ!"
 
-#: src/protocols/jabber/jabber.c:3003
+#: src/protocols/jabber/jabber.c:3633
 msgid "Unknown registration error"
 msgstr "    "
 
-#: src/protocols/jabber/jabber.c:3112 src/protocols/jabber/jabber.c:3127
+#: src/protocols/jabber/jabber.c:3742 src/protocols/jabber/jabber.c:3757
 msgid "Set User Info"
 msgstr "  Է"
 
-#: src/protocols/msn/msn.c:826 src/protocols/msn/msn.c:2264
-#: src/protocols/msn/msn.c:2297
+#: src/protocols/msn/msn.c:230
+msgid "Syntax Error (probably a Gaim bug)"
+msgstr ""
+
+#: src/protocols/msn/msn.c:233
+msgid "Invalid Parameter (probably a Gaim bug)"
+msgstr ""
+
+#: src/protocols/msn/msn.c:236
+#, fuzzy
+msgid "Invalid User"
+msgstr "߸ ̸"
+
+#: src/protocols/msn/msn.c:239
+msgid "Fully Qualified Domain Name missing"
+msgstr ""
+
+#: src/protocols/msn/msn.c:242
+msgid "Already Login"
+msgstr ""
+
+#: src/protocols/msn/msn.c:245
+#, fuzzy
+msgid "Invalid Username"
+msgstr "߸ ̸"
+
+#: src/protocols/msn/msn.c:248
+#, fuzzy
+msgid "Invalid Friendly Name"
+msgstr "߸ ̸"
+
+#: src/protocols/msn/msn.c:251
+msgid "List Full"
+msgstr ""
+
+#: src/protocols/msn/msn.c:254
+msgid "Already there"
+msgstr ""
+
+#: src/protocols/msn/msn.c:257
+#, fuzzy
+msgid "Not on list"
+msgstr " "
+
+#: src/protocols/msn/msn.c:260
+msgid "User is offline"
+msgstr ""
+
+#: src/protocols/msn/msn.c:263
+msgid "Already in the mode"
+msgstr ""
+
+#: src/protocols/msn/msn.c:266
+msgid "Already in opposite list"
+msgstr ""
+
+#: src/protocols/msn/msn.c:269
+msgid "Switchboard failed"
+msgstr ""
+
+#: src/protocols/msn/msn.c:272
+msgid "Notify Transfer failed"
+msgstr ""
+
+#: src/protocols/msn/msn.c:276
+msgid "Required fields missing"
+msgstr ""
+
+#: src/protocols/msn/msn.c:279
+#, fuzzy
+msgid "Not logged in"
+msgstr "%s ߽ϴ."
+
+#: src/protocols/msn/msn.c:283
+#, fuzzy
+msgid "Internal server error"
+msgstr " "
+
+#: src/protocols/msn/msn.c:286
+msgid "Database server error"
+msgstr ""
+
+#: src/protocols/msn/msn.c:289
+#, fuzzy
+msgid "File operation error"
+msgstr "  \n"
+
+#: src/protocols/msn/msn.c:292
+#, fuzzy
+msgid "Memory allocation error"
+msgstr "  (߿)\n"
+
+#: src/protocols/msn/msn.c:296
+msgid "Server busy"
+msgstr ""
+
+#: src/protocols/msn/msn.c:299
+#, fuzzy
+msgid "Server unavailable"
+msgstr "޽   "
+
+#: src/protocols/msn/msn.c:302
+msgid "Peer Notification server down"
+msgstr ""
+
+#: src/protocols/msn/msn.c:305
+#, fuzzy
+msgid "Database connect error"
+msgstr "  \n"
+
+#: src/protocols/msn/msn.c:308
+msgid "Server is going down (abandon ship)"
+msgstr ""
+
+#: src/protocols/msn/msn.c:312
+#, fuzzy
+msgid "Error creating connection"
+msgstr "g003:  .\n"
+
+#: src/protocols/msn/msn.c:318
+msgid "Session overload"
+msgstr ""
+
+#: src/protocols/msn/msn.c:321
+msgid "User is too active"
+msgstr ""
+
+#: src/protocols/msn/msn.c:324
+#, fuzzy
+msgid "Too many sessions"
+msgstr "ش ׸ ʹ ϴ."
+
+#: src/protocols/msn/msn.c:327
+msgid "Not expected"
+msgstr ""
+
+#: src/protocols/msn/msn.c:330
+msgid "Bad friend file"
+msgstr ""
+
+#: src/protocols/msn/msn.c:334
+#, fuzzy
+msgid "Authentication failed"
+msgstr " ."
+
+#: src/protocols/msn/msn.c:337
+#, fuzzy
+msgid "Not allowed when offline"
+msgstr "ӽ Ҹ  "
+
+#: src/protocols/msn/msn.c:340
+msgid "Not accepting new users"
+msgstr ""
+
+#: src/protocols/msn/msn.c:343
+msgid "User unverified"
+msgstr ""
+
+#: src/protocols/msn/msn.c:346
+#, fuzzy
+msgid "Unknown Error Code"
+msgstr "    ڵ."
+
+#: src/protocols/msn/msn.c:351 src/protocols/msn/msn.c:558
+#: src/protocols/msn/msn.c:813 src/protocols/msn/msn.c:2114
+#: src/protocols/msn/msn.c:2283 src/protocols/msn/msn.c:2336
 msgid "MSN Error"
 msgstr "MSN "
 
-#: src/protocols/msn/msn.c:826
+#: src/protocols/msn/msn.c:558
+msgid "A message may not have been received."
+msgstr ""
+
+#: src/protocols/msn/msn.c:813
 msgid "Gaim was unable to send a message"
 msgstr "޽   ϴ"
 
-#: src/protocols/msn/msn.c:1176
+#: src/protocols/msn/msn.c:917
+#, fuzzy, c-format
+msgid "The user %s (%s) wants to add %s to his or her buddy list."
+msgstr "%s  ڽ ģ Ͽ ߰ϰ ;մϴ."
+
+#: src/protocols/msn/msn.c:1074
+#, fuzzy, c-format
+msgid "The user %s (%s) wants to add you to their buddy list"
+msgstr "%s  ڽ ģ Ͽ ߰ϰ ;մϴ."
+
+#: src/protocols/msn/msn.c:1175
 msgid "You have been disconnected. You have signed on from another location."
 msgstr "ٸ   ̵ αϿ  ϴ."
 
-#: src/protocols/msn/msn.c:2264 src/protocols/msn/msn.c:2297
+#: src/protocols/msn/msn.c:1435 src/protocols/msn/msn.c:1679
+#, fuzzy
+msgid "Error reading from server"
+msgstr "Ͽ д ߿  ߻߽ϴ."
+
+#: src/protocols/msn/msn.c:1568
+msgid "Requesting to send password"
+msgstr ""
+
+#: src/protocols/msn/msn.c:1618
+#, fuzzy
+msgid "Unable to send password"
+msgstr "   ϴ."
+
+#: src/protocols/msn/msn.c:1623
+#, fuzzy
+msgid "Password sent"
+msgstr "йȣ: "
+
+#: src/protocols/msn/msn.c:1748
+#, fuzzy
+msgid "Unable to write to server"
+msgstr "   ϴ."
+
+#: src/protocols/msn/msn.c:1754
+#, fuzzy
+msgid "Synching with server"
+msgstr " "
+
+#: src/protocols/msn/msn.c:1920
+msgid "Away From Computer"
+msgstr ""
+
+#: src/protocols/msn/msn.c:1921
+msgid "Be Right Back"
+msgstr ""
+
+#: src/protocols/msn/msn.c:1922
+#, fuzzy
+msgid "Busy"
+msgstr "ģ"
+
+#: src/protocols/msn/msn.c:1923
+msgid "On The Phone"
+msgstr ""
+
+#: src/protocols/msn/msn.c:1924
+msgid "Out To Lunch"
+msgstr ""
+
+#: src/protocols/msn/msn.c:1925
+#, fuzzy
+msgid "Hidden"
+msgstr " "
+
+#: src/protocols/msn/msn.c:2041
+msgid "Reset friendly name"
+msgstr ""
+
+#: src/protocols/msn/msn.c:2114
+msgid "Friendly name too long."
+msgstr ""
+
+#: src/protocols/msn/msn.c:2129 src/protocols/msn/msn.c:2150
+#, fuzzy
+msgid "Set Friendly Name"
+msgstr ""
+
+#: src/protocols/msn/msn.c:2130
+#, fuzzy
+msgid "Set Friendly Name:"
+msgstr "̵: "
+
+#: src/protocols/msn/msn.c:2131
+msgid "Reset All Friendly Names"
+msgstr ""
+
+#: src/protocols/msn/msn.c:2283 src/protocols/msn/msn.c:2336
 msgid "Invalid name"
 msgstr "߸ ̸"
 
-#: src/protocols/napster/napster.c:450 src/protocols/oscar/oscar.c:3196
+#: src/protocols/napster/napster.c:457 src/protocols/oscar/oscar.c:3209
 #: src/protocols/toc/toc.c:1104
 msgid "Join what group:"
 msgstr " ׷:"
@@ -676,7 +1065,9 @@
 #. client too old
 #: src/protocols/oscar/oscar.c:653
 msgid "The client version you are using is too old. Please upgrade at "
-msgstr "ϰ ִ Ŭ̾Ʈ ʹ Ǿϴ.  ġ ׷̵Ͻʽÿ. "
+msgstr ""
+"ϰ ִ Ŭ̾Ʈ ʹ Ǿϴ.  ġ ׷̵Ͻ"
+"ÿ. "
 
 #: src/protocols/oscar/oscar.c:657 src/protocols/toc/toc.c:542
 msgid "Authentication Failed"
@@ -686,206 +1077,207 @@
 msgid "Internal Error"
 msgstr " "
 
-#: src/protocols/oscar/oscar.c:1248 src/protocols/oscar/oscar.c:3407
+#: src/protocols/oscar/oscar.c:1248 src/protocols/oscar/oscar.c:3420
 #, c-format
 msgid "Direct IM with %s established"
 msgstr "%s  "
 
-#: src/protocols/oscar/oscar.c:1494 src/protocols/oscar/oscar.c:2446
+#: src/protocols/oscar/oscar.c:1504 src/protocols/oscar/oscar.c:2456
 #, c-format
 msgid ""
 "The user %lu has denied your request to add them to your contact list for "
 "the following reason:\n"
 "%s"
 msgstr ""
-"%lu  ģ Ͽ ڽ ߰ϴ     "
-"߽ϴ: \n"
+"%lu  ģ Ͽ ڽ ߰ϴ     ߽"
+": \n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:1494 src/protocols/oscar/oscar.c:2446
+#: src/protocols/oscar/oscar.c:1504 src/protocols/oscar/oscar.c:2456
 msgid "No reason given."
 msgstr " Է ʾҽϴ."
 
-#: src/protocols/oscar/oscar.c:1495 src/protocols/oscar/oscar.c:2447
+#: src/protocols/oscar/oscar.c:1505 src/protocols/oscar/oscar.c:2457
 msgid "Gaim - ICQ Authorization Denied"
 msgstr " - ICQ  źε"
 
-#: src/protocols/oscar/oscar.c:1501 src/protocols/oscar/oscar.c:2453
+#: src/protocols/oscar/oscar.c:1511 src/protocols/oscar/oscar.c:2463
 #, c-format
 msgid "The user %lu has granted your request to add them to your contact list."
 msgstr "%lu  ģ Ͽ ڽ ߰ϴ  ޾Ƶ鿴ϴ."
 
-#: src/protocols/oscar/oscar.c:1502 src/protocols/oscar/oscar.c:2454
+#: src/protocols/oscar/oscar.c:1512 src/protocols/oscar/oscar.c:2464
 msgid "Gaim - ICQ Authorization Granted"
 msgstr " - ICQ  ޾Ƶ鿩"
 
-#: src/protocols/oscar/oscar.c:1575
+#: src/protocols/oscar/oscar.c:1585
 #, c-format
 msgid "You missed %d message from %s because it was invalid."
 msgstr "%d %s  ޽ ȿ ʾ   ϴ."
 
-#: src/protocols/oscar/oscar.c:1576
+#: src/protocols/oscar/oscar.c:1586
 #, c-format
 msgid "You missed %d messages from %s because they were invalid."
 msgstr "%d %s  ޽ ȿ ʾ   ϴ."
 
-#: src/protocols/oscar/oscar.c:1585
+#: src/protocols/oscar/oscar.c:1595
 #, c-format
 msgid "You missed %d message from %s because it was too large."
 msgstr "%s %s  ޽ ʹ Ŀ   ϴ."
 
-#: src/protocols/oscar/oscar.c:1586
+#: src/protocols/oscar/oscar.c:1596
 #, c-format
 msgid "You missed %d messages from %s because they were too large."
 msgstr "%s %s  ޽ ʹ Ŀ   ϴ."
 
-#: src/protocols/oscar/oscar.c:1595
+#: src/protocols/oscar/oscar.c:1605
 #, c-format
 msgid "You missed %d message from %s because the rate limit has been exceeded."
 msgstr "%d %s  ޽ ð  ʰ   ϴ."
 
-#: src/protocols/oscar/oscar.c:1596
+#: src/protocols/oscar/oscar.c:1606
 #, c-format
 msgid ""
 "You missed %d messages from %s because the rate limit has been exceeded."
-msgstr ""
-"%d %s  ޽ ð  ʰ   ϴ."
-
-#: src/protocols/oscar/oscar.c:1605
+msgstr "%d %s  ޽ ð  ʰ   ϴ."
+
+#: src/protocols/oscar/oscar.c:1615
 #, c-format
 msgid "You missed %d message from %s because it was too evil."
-msgstr "%d %s  ޽  ܾ ϰ ־   ϴ."
-
-#: src/protocols/oscar/oscar.c:1606
+msgstr ""
+"%d %s  ޽  ܾ ϰ ־   ϴ."
+
+#: src/protocols/oscar/oscar.c:1616
 #, c-format
 msgid "You missed %d messages from %s because they are too evil."
-msgstr "%d %s  ޽  ܾ ϰ ־   ϴ."
-
-#: src/protocols/oscar/oscar.c:1615
+msgstr ""
+"%d %s  ޽  ܾ ϰ ־   ϴ."
+
+#: src/protocols/oscar/oscar.c:1625
 #, c-format
 msgid "You missed %d message from %s because you are too evil."
 msgstr " ܾ ؼ %d %s  ޽   ϴ."
 
-#: src/protocols/oscar/oscar.c:1616
+#: src/protocols/oscar/oscar.c:1626
 #, c-format
 msgid "You missed %d messages from %s because you are too evil."
 msgstr " ܾ ؼ %d %s  ޽   ϴ."
 
-#: src/protocols/oscar/oscar.c:1624
+#: src/protocols/oscar/oscar.c:1634
 #, c-format
 msgid "You missed %d message from %s for unknown reasons."
 msgstr "    %d %s  ޽   ϴ."
 
-#: src/protocols/oscar/oscar.c:1625
+#: src/protocols/oscar/oscar.c:1635
 #, c-format
 msgid "You missed %d messages from %s for unknown reasons."
 msgstr "    %d %s  ޽   ϴ."
 
-#: src/dialogs.c:3076 src/dialogs.c:3082 src/protocols/oscar/oscar.c:1630
-#: src/protocols/oscar/oscar.c:1745 src/protocols/oscar/oscar.c:1763
-#: src/protocols/oscar/oscar.c:2216 src/protocols/yahoo/yahoo.c:594
+#: src/dialogs.c:3076 src/dialogs.c:3082 src/protocols/oscar/oscar.c:1640
+#: src/protocols/oscar/oscar.c:1755 src/protocols/oscar/oscar.c:1773
+#: src/protocols/oscar/oscar.c:2226 src/protocols/yahoo/yahoo.c:594
 msgid "Gaim - Error"
 msgstr " - "
 
-#: src/protocols/oscar/oscar.c:1693
+#: src/protocols/oscar/oscar.c:1703
 #, c-format
 msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR>%s<BR>"
 msgstr "<B>UIN:</B> %s<BR><B>:</B> %s<BR><HR><BR>%s<BR>"
 
-#: src/protocols/oscar/oscar.c:1695
+#: src/protocols/oscar/oscar.c:1705
 #, c-format
 msgid "<B>Status:</B> %s<BR><HR><BR>%s<BR>"
 msgstr "<B>:</B> %s<BR><HR><BR>%s<BR>"
 
-#: src/protocols/oscar/oscar.c:1724
+#: src/protocols/oscar/oscar.c:1734
 #, c-format
 msgid "SNAC threw error: %s\n"
 msgstr "SNAC : %s\n"
 
-#: src/protocols/oscar/oscar.c:1726
+#: src/protocols/oscar/oscar.c:1736
 msgid "Gaim - Oscar SNAC Error"
 msgstr " - ī SNAC "
 
-#: src/protocols/oscar/oscar.c:1743
+#: src/protocols/oscar/oscar.c:1753
 #, c-format
 msgid "Your message to %s did not get sent: %s"
 msgstr "%sԿ ޽  ߽ϴ: %s"
 
-#: src/protocols/oscar/oscar.c:1744 src/protocols/oscar/oscar.c:1762
+#: src/protocols/oscar/oscar.c:1754 src/protocols/oscar/oscar.c:1772
 msgid "Reason unknown"
 msgstr "   "
 
-#: src/protocols/oscar/oscar.c:1761
+#: src/protocols/oscar/oscar.c:1771
 #, c-format
 msgid "User information for %s unavailable: %s"
 msgstr "%s   ޾ƿ  ϴ: %s"
 
-#: src/buddy.c:2073 src/protocols/oscar/oscar.c:1792
+#: src/buddy.c:2131 src/protocols/oscar/oscar.c:1802
 msgid "Buddy Icon"
 msgstr "ģ "
 
-#: src/buddy.c:2076 src/protocols/oscar/oscar.c:1795
+#: src/buddy.c:2134 src/protocols/oscar/oscar.c:1805
 msgid "Voice"
 msgstr ""
 
-#: src/buddy.c:2079 src/protocols/oscar/oscar.c:1798
+#: src/buddy.c:2137 src/protocols/oscar/oscar.c:1808
 msgid "IM Image"
 msgstr "׸ ޽"
 
-#: src/buddy.c:495 src/buddy.c:2082 src/buddy.c:2523 src/prefs.c:2914
-#: src/protocols/oscar/oscar.c:1801
+#: src/buddy.c:498 src/buddy.c:2140 src/buddy.c:2581 src/prefs.c:2926
+#: src/protocols/oscar/oscar.c:1811
 msgid "Chat"
 msgstr "ä"
 
-#: src/buddy.c:2085 src/protocols/oscar/oscar.c:1804
+#: src/buddy.c:2143 src/protocols/oscar/oscar.c:1814
 msgid "Get File"
 msgstr " ޱ"
 
-#: src/buddy.c:2088 src/protocols/oscar/oscar.c:1807
+#: src/buddy.c:2146 src/protocols/oscar/oscar.c:1817
 msgid "Send File"
 msgstr " "
 
-#: src/buddy.c:2092 src/protocols/oscar/oscar.c:1811
+#: src/buddy.c:2150 src/protocols/oscar/oscar.c:1821
 msgid "Games"
 msgstr ""
 
-#: src/buddy.c:2095 src/protocols/oscar/oscar.c:1814
+#: src/buddy.c:2153 src/protocols/oscar/oscar.c:1824
 msgid "Stocks"
 msgstr ""
 
-#: src/buddy.c:2098 src/protocols/oscar/oscar.c:1817
+#: src/buddy.c:2156 src/protocols/oscar/oscar.c:1827
 msgid "Send Buddy List"
 msgstr "ģ  "
 
-#: src/buddy.c:2101 src/protocols/oscar/oscar.c:1820
+#: src/buddy.c:2159 src/protocols/oscar/oscar.c:1830
 msgid "EveryBuddy Bug"
 msgstr "EveryBuddy "
 
-#: src/buddy.c:2104 src/protocols/oscar/oscar.c:1823
+#: src/buddy.c:2162 src/protocols/oscar/oscar.c:1833
 msgid "AP User"
 msgstr "AP "
 
-#: src/buddy.c:2107 src/protocols/oscar/oscar.c:1826
+#: src/buddy.c:2165 src/protocols/oscar/oscar.c:1836
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
-#: src/buddy.c:2110 src/protocols/oscar/oscar.c:1829
+#: src/buddy.c:2168 src/protocols/oscar/oscar.c:1839
 msgid "Nihilist"
 msgstr "㹫"
 
-#: src/buddy.c:2113 src/protocols/oscar/oscar.c:1832
+#: src/buddy.c:2171 src/protocols/oscar/oscar.c:1842
 msgid "ICQ Server Relay"
 msgstr "ICQ  "
 
-#: src/buddy.c:2116 src/protocols/oscar/oscar.c:1835
+#: src/buddy.c:2174 src/protocols/oscar/oscar.c:1845
 msgid "ICQ Unknown"
 msgstr "ICQ ˷ "
 
-#: src/buddy.c:2119 src/protocols/oscar/oscar.c:1838
+#: src/buddy.c:2177 src/protocols/oscar/oscar.c:1848
 msgid "Trillian Encryption"
 msgstr "Ʈ ȣȭ"
 
-#: src/protocols/oscar/oscar.c:1876
+#: src/protocols/oscar/oscar.c:1886
 msgid ""
 "<br><BODY BGCOLOR=WHITE><hr><I>Legend:</I><br><br><IMG SRC=\"free_icon.gif"
 "\"> : Normal AIM User<br><IMG SRC=\"aol_icon.gif\"> : AOL User <br><IMG SRC="
@@ -894,7 +1286,7 @@
 "Agent<br><IMG SRC=\"wireless_icon.gif\"> : Wireless Device User<br>"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1904
+#: src/protocols/oscar/oscar.c:1914
 #, c-format
 msgid ""
 "Username : <B>%s</B>  %s <BR>\n"
@@ -907,64 +1299,65 @@
 "%s%s%s<BR>\n"
 "<HR><BR>\n"
 
-#: src/protocols/oscar/oscar.c:1936
+#: src/protocols/oscar/oscar.c:1946
 msgid "<i>User has no away message</i>"
 msgstr "<i>ڸ ޽ </i>"
 
-#: src/protocols/oscar/oscar.c:1948
+#: src/protocols/oscar/oscar.c:1958
 msgid "Client Capabilities: "
 msgstr "Ŭ̾Ʈ ȣȯ: "
 
-#: src/protocols/oscar/oscar.c:1956
+#: src/protocols/oscar/oscar.c:1966
 msgid "<i>No Information Provided</i>"
 msgstr "<i> </i>"
 
-#: src/protocols/oscar/oscar.c:1979
+#: src/protocols/oscar/oscar.c:1989
 msgid "Your connection may be lost."
 msgstr " ϴ."
 
-#: src/protocols/oscar/oscar.c:1980
+#: src/protocols/oscar/oscar.c:1990
 msgid "AOL error"
 msgstr "AOL "
 
-#: src/protocols/oscar/oscar.c:2215
+#: src/protocols/oscar/oscar.c:2225
 msgid ""
 "The last message was not sent because you are over the rate limit. Please "
 "wait 10 seconds and try again."
 msgstr ""
-"ʹ  ޽   ʰϿ  ޽   ϴ. "
-"10  ٽ õϽʽÿ."
-
-#: src/dialogs.c:3604 src/protocols/oscar/oscar.c:2576
-#: src/protocols/oscar/oscar.c:3528 src/protocols/toc/toc.c:1564
+"ʹ  ޽   ʰϿ  ޽   "
+". 10  ٽ õϽʽÿ."
+
+#: src/dialogs.c:3604 src/protocols/oscar/oscar.c:2589
+#: src/protocols/oscar/oscar.c:3541 src/protocols/toc/toc.c:1564
 #: src/protocols/toc/toc.c:1581 src/protocols/toc/toc.c:1641
 #: src/protocols/toc/toc.c:1683 src/protocols/toc/toc.c:1802
 #: src/protocols/toc/toc.c:1832 src/protocols/toc/toc.c:1888
 msgid "Error"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3179
+#: src/protocols/oscar/oscar.c:3192
 #, c-format
 msgid ""
 "The maximum number of buddies allowed in your buddy list is %d, and you have "
 "%d.  Until you are below the limit, some buddies will not show up as online."
 msgstr ""
-"ģ Ͽ ִ %d ģ ߰  ,  ģ Ͽ %d ֽϴ. "
-"ѵ ں ģ     ģ ¶    ֽϴ."
-
-#: src/protocols/oscar/oscar.c:3182
+"ģ Ͽ ִ %d ģ ߰  ,  ģ Ͽ %d "
+"ϴ. ѵ ں ģ     ģ ¶  "
+"  ֽϴ."
+
+#: src/protocols/oscar/oscar.c:3195
 msgid "Gaim - Warning"
 msgstr " - "
 
-#: src/protocols/oscar/oscar.c:3200 src/protocols/toc/toc.c:1108
+#: src/protocols/oscar/oscar.c:3213 src/protocols/toc/toc.c:1108
 msgid "Exchange:"
 msgstr "ȯ:"
 
-#: src/protocols/oscar/oscar.c:3528
+#: src/protocols/oscar/oscar.c:3541
 msgid "Unable to open Direct IM"
 msgstr " ޽   "
 
-#: src/protocols/oscar/oscar.c:3538
+#: src/protocols/oscar/oscar.c:3551
 #, c-format
 msgid ""
 "You have selected to open a Direct IM connection with %s. Doing this will "
@@ -972,10 +1365,10 @@
 "continue?"
 msgstr ""
 "%s԰   ߽ϴ.       "
-"IP ּҸ   , ̴ Ȼ    ֽϴ. ׷  "
-"ұ?"
-
-#: src/protocols/oscar/oscar.c:3555
+"IP ּҸ   , ̴ Ȼ    ֽϴ. ׷  "
+"ұ?"
+
+#: src/protocols/oscar/oscar.c:3568
 #, c-format
 msgid ""
 "<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR><I>Remote client does not "
@@ -984,22 +1377,24 @@
 "<B>UIN:</B> %s<BR><B>:</B> %s<BR><HR><BR><I> ϴ α׷ "
 " ޽    ʽϴ.</I><BR>"
 
-#: src/protocols/oscar/oscar.c:3562
-#, c-format
+#: src/protocols/oscar/oscar.c:3575
+#, fuzzy, c-format
 msgid ""
-"<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR><I>  ޽ ϴ."
+"<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR><I>User has no status message."
 "</I><BR>"
 msgstr ""
-
-#: src/protocols/oscar/oscar.c:3587
+"<B>UIN:</B> %s<BR><B>:</B> %s<BR><HR><BR><I> ϴ α׷ "
+" ޽    ʽϴ.</I><BR>"
+
+#: src/protocols/oscar/oscar.c:3600
 msgid "Get Status Msg"
 msgstr " ޽ "
 
-#: src/protocols/oscar/oscar.c:3600
+#: src/protocols/oscar/oscar.c:3613
 msgid "Direct IM"
 msgstr " "
 
-#: src/protocols/oscar/oscar.c:3608
+#: src/protocols/oscar/oscar.c:3621
 msgid "Get Capabilities"
 msgstr "   "
 
@@ -1129,7 +1524,8 @@
 
 #: src/protocols/toc/toc.c:598
 msgid "TOC has come back from its pause. You may now send messages again."
-msgstr "TOC Ͻ ¿ ٽ ۵Ǿϴ.  ޽   ֽϴ."
+msgstr ""
+"TOC Ͻ ¿ ٽ ۵Ǿϴ.  ޽   ֽϴ."
 
 #: src/protocols/toc/toc.c:599
 msgid "TOC Resume"
@@ -1153,8 +1549,8 @@
 "sent to it, and may kick you off if you send a message. Gaim will prevent "
 "anything from going through. This is only temporary, please be patient."
 msgstr ""
-"TOC Ͻ  ½ϴ. TOC Ͻ    ޽ "
-"ϴ. ׸  ޽     ֽϴ. ̰"
+"TOC Ͻ  ½ϴ. TOC Ͻ    ޽ "
+"մϴ. ׸  ޽     ֽϴ. ̰"
 " Ͻ ̴ Ű澲 ʽÿ."
 
 #: src/protocols/toc/toc.c:788
@@ -1181,12 +1577,14 @@
 #: src/protocols/toc/toc.c:1962
 #, c-format
 msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
-msgstr "%s %s %d  ϱ⸦ ûϿϴ :%s (%.2f %s)%s%s"
+msgstr ""
+"%s %s %d  ϱ⸦ ûϿϴ :%s (%.2f %s)%s%s"
 
 #: src/protocols/toc/toc.c:1963
 #, c-format
 msgid "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
-msgstr "%s %s %d  ϱ⸦ ûϿϴ :%s (%.2f %s)%s%s"
+msgstr ""
+"%s %s %d  ϱ⸦ ûϿϴ :%s (%.2f %s)%s%s"
 
 #: src/protocols/toc/toc.c:1968
 #, c-format
@@ -1197,19 +1595,19 @@
 msgid "Your message did not get sent."
 msgstr "޽ ޵ ʾҽϴ."
 
-#: src/protocols/zephyr/zephyr.c:802
+#: src/protocols/zephyr/zephyr.c:840
 msgid "ZLocate"
 msgstr "Zġ"
 
-#: src/protocols/zephyr/zephyr.c:839
+#: src/protocols/zephyr/zephyr.c:877
 msgid "Class:"
 msgstr "Ŭ:"
 
-#: src/protocols/zephyr/zephyr.c:843
+#: src/protocols/zephyr/zephyr.c:881
 msgid "Instance:"
 msgstr "νϽ:"
 
-#: src/protocols/zephyr/zephyr.c:847
+#: src/protocols/zephyr/zephyr.c:885
 msgid "Recipient:"
 msgstr "޴»:"
 
@@ -1219,9 +1617,12 @@
 msgstr "(v%s)..."
 
 #: src/about.c:135
+#, fuzzy
 msgid ""
-"Gaim is a client that supports AOL's Instant Messenger protocol. It is written\n"
-"using Gtk+ and is licensed under the GPL.\n\n"
+"Gaim is a modular Instant Messaging client capable of using AIM, ICQ,\n"
+"Yahoo!, MSN, IRC, Jabber, Napster, Zephyr, and Gadu-Gadu all at once.\n"
+"It is written using Gtk+ and is licensed under the GPL.\n"
+"\n"
 "URL: "
 msgstr ""
 " AOL  ϴ ޽Դϴ. Gtk+ ̿Ͽ \n"
@@ -1229,15 +1630,17 @@
 "\n"
 "URL:"
 
-#: src/about.c:136
+#: src/about.c:137
 msgid ""
-"\n\n"
+"\n"
+"\n"
 "IRC: #gaim on irc.openprojects.net"
 msgstr ""
-"\n\n"
+"\n"
+"\n"
 "IRC: irc.openprojects.net  #gaim ä"
 
-#: src/about.c:146
+#: src/about.c:147
 msgid ""
 "Active Developers\n"
 "====================\n"
@@ -1275,98 +1678,96 @@
 "Eric Warmenhoven                   [ warmenhoven@yahoo.com ]\n"
 "Mark Spencer ( )   [ markster@marko.net ]"
 
-#: src/about.c:164 src/aim.c:319 src/buddy.c:2658 src/buddy_chat.c:1315
-#: src/buddy_chat.c:1412 src/buddy_chat.c:1442 src/conversation.c:2839
-#: src/dialogs.c:567 src/dialogs.c:3899 src/multi.c:1069 src/plugins.c:277
-#: src/prefs.c:2537 src/prpl.c:438 src/prpl.c:679 src/server.c:1072
-msgid "Close"
-msgstr "ݱ"
-
 #. this makes the sizes not work.
 #. GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
 #. gtk_widget_grab_default(button);
-#: src/about.c:184
+#: src/about.c:185
 msgid "Web Site"
 msgstr "Ʈ"
 
-#: src/aim.c:152 src/buddy.c:2651
+#: src/aim.c:153 src/buddy.c:2709
 msgid "Signoff"
 msgstr " "
 
-#: src/aim.c:164
+#: src/aim.c:165
 msgid "Please enter your logon"
 msgstr "  Էϼ"
 
-#: src/aim.c:164 src/multi.c:1400 src/server.c:55
+#: src/aim.c:165 src/multi.c:1400 src/server.c:55
 msgid "Signon Error"
 msgstr " "
 
-#: src/aim.c:262
+#: src/aim.c:263
 msgid "Gaim - Login"
 msgstr " - α"
 
-#: src/aim.c:280
+#: src/aim.c:281
 msgid "Screen Name: "
 msgstr "̵: "
 
-#: src/aim.c:296
+#: src/aim.c:297
 msgid "Password: "
 msgstr "йȣ: "
 
-#: src/aim.c:317 src/buddy.c:2655
+#: src/aim.c:318 src/buddy.c:2713
 msgid "Quit"
 msgstr ""
 
-#: src/aim.c:322 src/aim.c:830 src/buddy.c:2681
+#: src/aim.c:323 src/aim.c:831 src/buddy.c:2739
 msgid "Accounts"
 msgstr ""
 
-#: src/aim.c:324 src/multi.c:915
+#: src/aim.c:325 src/multi.c:915
 msgid "Signon"
 msgstr ""
 
-#: src/aim.c:356
+#: src/aim.c:357
 msgid "About"
 msgstr "... Ͽ"
 
-#: src/aim.c:357 src/prefs.c:1621 src/prefs.c:1895
+#: src/aim.c:358 src/prefs.c:1633 src/prefs.c:1905
 msgid "Options"
 msgstr "ɼ"
 
-#: src/aim.c:359 src/aim.c:833 src/buddy.c:2699
+#: src/aim.c:360 src/aim.c:834 src/buddy.c:2757
 msgid "Plugins"
 msgstr "÷"
 
-#: src/aim.c:827 src/buddy.c:2691
+#: src/aim.c:828 src/buddy.c:2749
 msgid "Preferences"
 msgstr "ȯ漳"
 
-#: src/applet.c:110
+#: src/aim.c:838 src/multi.c:1472
+#, fuzzy
+msgid "Auto-login"
+msgstr "ڵ α"
+
+#: src/applet.c:109
 msgid "Attempting to sign on...."
 msgstr " õմϴ...."
 
-#: src/applet.c:113
+#: src/applet.c:112
 msgid "Offline. Click to bring up login box."
 msgstr "ӵǾ  ʽϴ. Ŭϸ α ȭ ɴϴ."
 
-#: src/applet.c:129
+#: src/applet.c:128
 #, c-format
 msgid "Away: %d pending."
 msgstr "ڸ: %d "
 
-#: src/applet.c:132
+#: src/applet.c:131
 msgid "Away."
 msgstr "ڸ"
 
-#: src/applet.c:189 src/away.c:388
+#: src/applet.c:200 src/away.c:388
 msgid "New Away Message"
 msgstr " ڸ ޽"
 
-#: src/applet.c:337
+#: src/applet.c:348
 msgid "Can't create Gaim applet!"
 msgstr " ø   ϴ!"
 
-#: src/applet.c:359
+#: src/applet.c:368
 msgid "About..."
 msgstr "... Ͽ"
 
@@ -1390,88 +1791,74 @@
 msgid "Set All Away"
 msgstr " ڸ ޽ "
 
-#. Put the buttons in the box
-#: src/buddy.c:489 src/buddy.c:2769 src/buddy_chat.c:1447
-#: src/conversation.c:2372 src/conversation.c:2854 src/dialogs.c:932
-#: src/dialogs.c:1114 src/dialogs.c:2095 src/multi.c:1053 src/prefs.c:2031
-#: src/prefs.c:2373 src/prefs.c:2407
-msgid "Add"
-msgstr "߰"
-
-#: src/buddy.c:490 src/buddy.c:2770 src/dialogs.c:942 src/dialogs.c:1089
+#: src/buddy.c:493 src/buddy.c:2828 src/dialogs.c:942 src/dialogs.c:1089
 msgid "Group"
 msgstr "׷"
 
-#: src/buddy.c:491 src/buddy.c:2771 src/buddy_chat.c:1449
-#: src/conversation.c:2358 src/conversation.c:2851 src/prefs.c:2045
-#: src/prefs.c:2377 src/prefs.c:2411
-msgid "Remove"
-msgstr ""
-
-#: src/buddy.c:496 src/buddy.c:649 src/buddy.c:803 src/buddy.c:2521
-#: src/buddy_chat.c:854 src/buddy_chat.c:1271
+#: src/buddy.c:499 src/buddy.c:664 src/buddy.c:834 src/buddy.c:2579
+#: src/buddy_chat.c:861 src/buddy_chat.c:1278
 msgid "IM"
 msgstr "޽"
 
-#: src/buddy.c:497 src/buddy.c:2522 src/buddy_chat.c:870 src/buddy_chat.c:1279
-#: src/buddy_chat.c:1455 src/conversation.c:2872
+#: src/buddy.c:500 src/buddy.c:2580 src/buddy_chat.c:877 src/buddy_chat.c:1286
+#: src/buddy_chat.c:1462 src/conversation.c:2897
 msgid "Info"
 msgstr ""
 
 #. Put the buttons in the box
-#: src/buddy.c:654 src/buddy.c:808 src/dialogs.c:1081 src/dialogs.c:3458
+#: src/buddy.c:669 src/buddy.c:839 src/dialogs.c:1081 src/dialogs.c:3458
 #: src/dialogs.c:3473
 msgid "Alias"
 msgstr ""
 
-#: src/buddy.c:659 src/buddy.c:827
+#: src/buddy.c:674 src/buddy.c:858
 msgid "Add Buddy Pounce"
 msgstr "ģ˸ ߰"
 
-#: src/buddy.c:666 src/buddy.c:833
+#: src/buddy.c:681 src/buddy.c:864
 msgid "View Log"
 msgstr " ȭ "
 
-#: src/buddy.c:790 src/buddy.c:821
+#: src/buddy.c:821 src/buddy.c:852
 msgid "Rename"
 msgstr "̸ ٲٱ"
 
-#: src/buddy.c:815
+#: src/buddy.c:846
 msgid "Un-Alias"
 msgstr " "
 
-#: src/buddy.c:1587 src/buddy.c:2674
+#: src/buddy.c:1645 src/buddy.c:2732
 msgid "Buddy Pounce"
 msgstr "ģ˸"
 
-#: src/buddy.c:1667
+#: src/buddy.c:1725
 msgid "New Buddy Pounce"
 msgstr " ģ˸"
 
-#: src/buddy.c:1685
+#: src/buddy.c:1743
 msgid "Remove Buddy Pounce"
 msgstr "ģ˸ "
 
-#: src/buddy.c:1713
+#: src/buddy.c:1771
 msgid "[Click to edit]"
 msgstr "[Ϸ Ŭϼ]"
 
-#: src/buddy.c:2196
+#: src/buddy.c:2254
 #, c-format
 msgid "Logged in: %s\n"
 msgstr "ӵ: %s\n"
 
-#: src/buddy.c:2208
+#: src/buddy.c:2266
 #, c-format
 msgid "Warnings: %d%%\n"
 msgstr ": %d%%\n"
 
-#: src/buddy.c:2220
+#: src/buddy.c:2278
 #, c-format
 msgid "Capabilities: %s\n"
 msgstr "밡: %s\n"
 
-#: src/buddy.c:2224
+#: src/buddy.c:2282
 #, c-format
 msgid ""
 "Alias: %s               \n"
@@ -1482,125 +1869,126 @@
 "̵: %s\n"
 "%s%s%s%s%s%s"
 
-#: src/buddy.c:2228
-msgid " ð: "
-msgstr ""
-
-#: src/buddy.c:2301 src/buddy.c:2306
+#: src/buddy.c:2286
+#, fuzzy
+msgid "Idle: "
+msgstr "ó:"
+
+#: src/buddy.c:2359 src/buddy.c:2364
 #, c-format
 msgid "%s logged in."
 msgstr "%s ߽ϴ."
 
-#: src/buddy.c:2366 src/buddy.c:2371
+#: src/buddy.c:2424 src/buddy.c:2429
 #, c-format
 msgid "%s logged out."
 msgstr "%s  ϴ."
 
-#: src/buddy.c:2556
+#: src/buddy.c:2614
 msgid "Information on selected Buddy"
 msgstr " ģ  "
 
-#: src/buddy.c:2557 src/dialogs.c:697
+#: src/buddy.c:2615 src/dialogs.c:697
 msgid "Send Instant Message"
 msgstr "޽ "
 
-#: src/buddy.c:2558
+#: src/buddy.c:2616
 msgid "Start/join a Buddy Chat"
 msgstr "ä /"
 
-#: src/buddy.c:2559
+#: src/buddy.c:2617
 msgid "Activate Away Message"
 msgstr "ڸ ޽ "
 
-#: src/buddy.c:2631
+#: src/buddy.c:2689
 msgid "File"
 msgstr ""
 
-#: src/buddy.c:2635
+#: src/buddy.c:2693
 msgid "Add A Buddy"
 msgstr "ģ ߰"
 
-#: src/buddy.c:2637
+#: src/buddy.c:2695
 msgid "Join A Chat"
 msgstr "ä "
 
-#: src/buddy.c:2639
+#: src/buddy.c:2697
 msgid "New Instant Message"
 msgstr " ޽"
 
-#: src/buddy.c:2641 src/dialogs.c:759
+#: src/buddy.c:2699 src/dialogs.c:759
 msgid "Get User Info"
 msgstr "  "
 
-#: src/buddy.c:2646
+#: src/buddy.c:2704
 msgid "Import Buddy List"
 msgstr "ģ "
 
-#: src/buddy.c:2664
+#: src/buddy.c:2722
 msgid "Tools"
 msgstr ""
 
-#: src/buddy.c:2687
+#: src/buddy.c:2745
 msgid "Protocol Actions"
 msgstr "  "
 
-#: src/buddy.c:2693
+#: src/buddy.c:2751
 msgid "View System Log"
 msgstr "ý α "
 
-#: src/buddy.c:2705
+#: src/buddy.c:2763
 msgid "Perl"
 msgstr "(ũƮ)"
 
-#: src/buddy.c:2708
+#: src/buddy.c:2766
 msgid "Load Script"
 msgstr "ũƮ "
 
-#: src/buddy.c:2712
+#: src/buddy.c:2770
 msgid "Unload All Scripts"
 msgstr " ũƮ "
 
-#: src/buddy.c:2716
+#: src/buddy.c:2774
 msgid "List Scripts"
 msgstr "ũƮ "
 
-#: src/buddy.c:2724
+#: src/buddy.c:2782
 msgid "Help"
 msgstr ""
 
-#: src/buddy.c:2729
+#: src/buddy.c:2787
 msgid "Online Help"
 msgstr "¶ "
 
-#: src/buddy.c:2730
+#: src/buddy.c:2788
 msgid "Debug Window"
 msgstr " â"
 
-#: src/buddy.c:2731
+#: src/buddy.c:2789
 msgid "About Gaim"
 msgstr "..."
 
-#: src/buddy.c:2749 src/prefs.c:2893
+#: src/buddy.c:2807 src/prefs.c:2905
 msgid "Buddy List"
 msgstr "ģ "
 
-#: src/buddy.c:2802
+#: src/buddy.c:2860
 msgid "Add a new Buddy"
 msgstr " ģ ߰"
 
-#: src/buddy.c:2803
+#: src/buddy.c:2861
 msgid "Add a new Group"
 msgstr " ׷ ߰"
 
-#: src/buddy.c:2804
+#: src/buddy.c:2862
 msgid "Remove selected Buddy/Group"
 msgstr " ģ ׷ "
 
-#: src/buddy.c:2831
+#: src/buddy.c:2889
 msgid "Edit Buddies"
 msgstr ""
 
-#: src/buddy.c:2874
+#: src/buddy.c:2932
 msgid "Gaim - Buddy List"
 msgstr " - ģ"
 
@@ -1608,10 +1996,6 @@
 msgid "Join Chat"
 msgstr "ä "
 
-#: src/buddy_chat.c:272
-msgid "Buddy Chat"
-msgstr "ä"
-
 #: src/buddy_chat.c:283
 msgid "Join Chat As:"
 msgstr "ä  :"
@@ -1630,8 +2014,8 @@
 msgid "Join"
 msgstr ""
 
-#: src/buddy_chat.c:393 src/buddy_chat.c:396 src/buddy_chat.c:1321
-#: src/buddy_chat.c:1411
+#: src/buddy_chat.c:393 src/buddy_chat.c:396 src/buddy_chat.c:1328
+#: src/buddy_chat.c:1418
 msgid "Invite"
 msgstr "ʴ"
 
@@ -1639,7 +2023,7 @@
 msgid "Buddy"
 msgstr "ģ"
 
-#: src/buddy_chat.c:417 src/prefs.c:1994
+#: src/buddy_chat.c:417 src/prefs.c:2004
 msgid "Message"
 msgstr "޽"
 
@@ -1647,251 +2031,247 @@
 msgid "Gaim - Invite Buddy Into Chat Room"
 msgstr " - ȭǷ ģ ʴ"
 
-#: src/buddy_chat.c:861
+#: src/buddy_chat.c:868
 msgid "Un-Ignore"
 msgstr " "
 
-#: src/buddy_chat.c:863 src/buddy_chat.c:1275
+#: src/buddy_chat.c:870 src/buddy_chat.c:1282
 msgid "Ignore"
 msgstr ""
 
 #. don't remove them from ignored in case they re-enter
-#: src/buddy_chat.c:926 src/buddy_chat.c:1038 src/buddy_chat.c:1501
-#: src/buddy_chat.c:1534
+#: src/buddy_chat.c:933 src/buddy_chat.c:1045 src/buddy_chat.c:1508
+#: src/buddy_chat.c:1541
 #, c-format
 msgid "%d %s in room"
 msgstr "%d %s() ȭǿ ֽϴ."
 
-#: src/buddy_chat.c:934
+#: src/buddy_chat.c:941
 #, c-format
 msgid "%s entered the room."
 msgstr "%s ȭǿ ̽ϴ."
 
-#: src/buddy_chat.c:1000
+#: src/buddy_chat.c:1007
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s ȭ %s ٲټ̽ϴ."
 
-#: src/buddy_chat.c:1047
+#: src/buddy_chat.c:1054
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s ȭǿ ̽ϴ. (%s)"
 
-#: src/buddy_chat.c:1049
+#: src/buddy_chat.c:1056
 #, c-format
 msgid "%s left the room."
 msgstr "%s ȭǿ ̽ϴ."
 
-#: src/buddy_chat.c:1148
+#: src/buddy_chat.c:1155
 msgid "Gaim - Group Chats"
 msgstr " - ׷ ä"
 
-#: src/buddy_chat.c:1211
+#: src/buddy_chat.c:1218
 msgid "Topic:"
 msgstr ":"
 
-#: src/buddy_chat.c:1252
+#: src/buddy_chat.c:1259
 msgid "0 people in room"
 msgstr "ȭǿ ƹ ϴ."
 
-#: src/buddy_chat.c:1326 src/buddy_chat.c:1410
+#: src/buddy_chat.c:1333 src/buddy_chat.c:1417
 msgid "Whisper"
 msgstr "ӼӸ"
 
-#: src/buddy_chat.c:1331 src/buddy_chat.c:1408 src/buddy_chat.c:1457
-#: src/conversation.c:2883
+#: src/buddy_chat.c:1338 src/buddy_chat.c:1415 src/buddy_chat.c:1464
+#: src/conversation.c:2908
 msgid "Send"
 msgstr ""
 
-#: src/buddy_chat.c:1451 src/conversation.c:2860
+#: src/buddy_chat.c:1458 src/conversation.c:2885
 msgid "Block"
 msgstr ""
 
-#: src/buddy_chat.c:1453 src/conversation.c:2866 src/dialogs.c:424
+#: src/buddy_chat.c:1460 src/conversation.c:2891 src/dialogs.c:424
 #: src/dialogs.c:453
 msgid "Warn"
 msgstr ""
 
-#: src/conversation.c:416
+#: src/conversation.c:431
 msgid "Gaim - Save Conversation"
 msgstr " - ȭ "
 
-#: src/conversation.c:477
+#: src/conversation.c:492
 msgid "Gaim - Insert Image"
 msgstr " - ׸ "
 
-#: src/conversation.c:1320
+#: src/conversation.c:1336
 msgid "Unable to send message: too large"
 msgstr "޽   ϴ : ʹ Ůϴ."
 
-#: src/conversation.c:1320 src/conversation.c:1324
+#: src/conversation.c:1336 src/conversation.c:1340
 msgid "Message Error"
 msgstr "޽ "
 
-#: src/conversation.c:1324
+#: src/conversation.c:1340
 msgid "Unable to send message: Unknown reason"
 msgstr "޽   ϴ :    "
 
-#: src/conversation.c:1543
+#: src/conversation.c:1559
 #, c-format
 msgid "Currently at %d, "
 msgstr " %d, "
 
-#: src/conversation.c:1551
+#: src/conversation.c:1567
 #, c-format
 msgid "Setting position to %d\n"
 msgstr "%d ġ űϴ\n"
 
-#: src/conversation.c:2154 src/prefs.c:1307
+#: src/conversation.c:2170 src/prefs.c:1308
 msgid "Bold Text"
 msgstr "β ۾"
 
-#: src/conversation.c:2154
+#: src/conversation.c:2170
 msgid "Bold"
 msgstr "β"
 
-#: src/conversation.c:2158
+#: src/conversation.c:2174
 msgid "Italics Text"
 msgstr " ۾"
 
-#: src/conversation.c:2159
+#: src/conversation.c:2175
 msgid "Italics"
 msgstr ""
 
-#: src/conversation.c:2162 src/prefs.c:1319
+#: src/conversation.c:2178 src/prefs.c:1320
 msgid "Underline Text"
 msgstr " ģ ۾"
 
-#: src/conversation.c:2163
+#: src/conversation.c:2179
 msgid "Underline"
 msgstr ""
 
-#: src/conversation.c:2167 src/prefs.c:1325
+#: src/conversation.c:2183 src/prefs.c:1326
 msgid "Strike through Text"
 msgstr " ģ ۾"
 
-#: src/conversation.c:2167
+#: src/conversation.c:2183
 msgid "Strike"
 msgstr ""
 
-#: src/conversation.c:2173
+#: src/conversation.c:2189
 msgid "Decrease font size"
 msgstr " ũ ̱"
 
-#: src/conversation.c:2173
+#: src/conversation.c:2189
 msgid "Small"
 msgstr "۰"
 
-#: src/conversation.c:2176
+#: src/conversation.c:2192
 msgid "Normal font size"
 msgstr " ũ "
 
-#: src/conversation.c:2176
+#: src/conversation.c:2192
 msgid "Normal"
 msgstr ""
 
-#: src/conversation.c:2179
+#: src/conversation.c:2195
 msgid "Increase font size"
 msgstr " ũ Ű"
 
-#: src/conversation.c:2179
+#: src/conversation.c:2195
 msgid "Big"
 msgstr "ũ"
 
-#: src/conversation.c:2186 src/dialogs.c:2883 src/dialogs.c:2907
+#: src/conversation.c:2202 src/dialogs.c:2883 src/dialogs.c:2907
 msgid "Select Font"
 msgstr "۲ "
 
-#: src/conversation.c:2187
+#: src/conversation.c:2203
 msgid "Font"
 msgstr "۲"
 
-#: src/conversation.c:2190 src/prefs.c:1355
+#: src/conversation.c:2206 src/prefs.c:1356
 msgid "Text Color"
 msgstr " "
 
-#: src/conversation.c:2191 src/conversation.c:2195
+#: src/conversation.c:2207 src/conversation.c:2211
 msgid "Color"
 msgstr ""
 
-#: src/conversation.c:2195 src/prefs.c:1373
+#: src/conversation.c:2211 src/prefs.c:1374
 msgid "Background Color"
 msgstr "  "
 
-#: src/conversation.c:2202 src/dialogs.c:2506
+#: src/conversation.c:2218 src/dialogs.c:2506
 msgid "Insert Link"
 msgstr "ũ "
 
-#: src/conversation.c:2203
+#: src/conversation.c:2219
 msgid "Link"
 msgstr "ũ"
 
-#: src/conversation.c:2206
+#: src/conversation.c:2222
 msgid "Insert smiley face"
 msgstr "ϸ  "
 
-#: src/conversation.c:2206
+#: src/conversation.c:2222
 msgid "Smiley"
 msgstr "ϸ"
 
-#: src/conversation.c:2209
+#: src/conversation.c:2225
 msgid "Insert IM Image"
 msgstr "޽ ׸ "
 
-#: src/conversation.c:2209
+#: src/conversation.c:2225
 msgid "Image"
 msgstr "׸"
 
-#: src/conversation.c:2216
+#: src/conversation.c:2232
 msgid "Enable logging"
 msgstr " ϱ"
 
-#: src/conversation.c:2217 src/prefs.c:254
+#: src/conversation.c:2233 src/prefs.c:254
 msgid "Logging"
 msgstr ""
 
-#: src/conversation.c:2226
+#: src/conversation.c:2242
 msgid "Save Conversation"
 msgstr "ȭ "
 
-#: src/conversation.c:2227 src/dialogs.c:1682 src/dialogs.c:1866
+#: src/conversation.c:2243 src/dialogs.c:1682 src/dialogs.c:1866
 #: src/dialogs.c:3220 src/dialogs.c:3908 src/dialogs.c:4785
 msgid "Save"
 msgstr ""
 
-#: src/conversation.c:2231
-msgid "Enable sounds"
-msgstr "Ҹ "
-
-#: src/conversation.c:2232
+#: src/conversation.c:2247 src/conversation.c:2248
 msgid "Sound"
 msgstr "Ҹ"
 
-#: src/conversation.c:2712
+#: src/conversation.c:2729
 msgid "Gaim - Conversations"
 msgstr " - ȭ"
 
-#: src/conversation.c:2799
+#: src/conversation.c:2816
 msgid "Send message as: "
 msgstr "äý  :"
 
-#: src/conversation.c:3428
+#: src/conversation.c:3453
 msgid "Gaim - Save Icon"
 msgstr " -  "
 
-#: src/conversation.c:3455
+#: src/conversation.c:3487
 msgid "Disable Animation"
 msgstr "ִϸ̼ "
 
-#: src/conversation.c:3460
+#: src/conversation.c:3492
 msgid "Enable Animation"
 msgstr "ִϸ̼ "
 
-#: src/conversation.c:3466
+#: src/conversation.c:3498
 msgid "Hide Icon"
 msgstr " "
 
-#: src/conversation.c:3472
+#: src/conversation.c:3504
 msgid "Save Icon As..."
 msgstr " ̸  "
 
@@ -2284,12 +2664,12 @@
 msgid "Gaim - Select Perl Script"
 msgstr " -  ũƮ "
 
-#: src/gaimrc.c:1130
+#: src/gaimrc.c:1136
 #, c-format
 msgid "Could not open config file %s."
 msgstr "  %s   ϴ."
 
-#: src/gaimrc.c:1131
+#: src/gaimrc.c:1137
 msgid "Preferences Error"
 msgstr "ȯ漳 "
 
@@ -2302,6 +2682,11 @@
 msgid "g003: Error opening connection.\n"
 msgstr "g003:  .\n"
 
+#: src/module.c:106 src/module.c:112 src/module.c:122
+#, fuzzy
+msgid "Plugin Error"
+msgstr "α "
+
 #: src/multi.c:454
 msgid "Gaim - Load Buddy Icon"
 msgstr " - ģ  ҷ"
@@ -2314,7 +2699,7 @@
 msgid "Browse"
 msgstr "Ž"
 
-#: src/multi.c:513 src/prefs.c:1547
+#: src/multi.c:513 src/prefs.c:1548
 msgid "Reset"
 msgstr ""
 
@@ -2424,7 +2809,7 @@
 msgid "Connection Error"
 msgstr " "
 
-#: src/perl.c:856
+#: src/perl.c:875
 msgid "Perl Scripts"
 msgstr " ũƮ"
 
@@ -2433,8 +2818,9 @@
 msgstr " - ÷ "
 
 #: src/plugins.c:178
-msgid " - ÷"
-msgstr ""
+#, fuzzy
+msgid "Gaim - Plugins"
+msgstr " - ÷ "
 
 #. Left side: frame with list of plugin file names
 #: src/plugins.c:192
@@ -2485,9 +2871,9 @@
 msgid "General Options"
 msgstr "Ϲ ɼ"
 
-#: src/prefs.c:200 src/prefs.c:383 src/prefs.c:551 src/prefs.c:666
-#: src/prefs.c:920 src/prefs.c:1070 src/prefs.c:1295 src/prefs.c:1617
-#: src/prefs.c:1891 src/prefs.c:2324
+#: src/prefs.c:200 src/prefs.c:384 src/prefs.c:552 src/prefs.c:667
+#: src/prefs.c:921 src/prefs.c:1071 src/prefs.c:1296 src/prefs.c:1629
+#: src/prefs.c:1901 src/prefs.c:2334
 msgid "All options take effect immediately unless otherwise noted."
 msgstr "ٸ    ɼ   ˴ϴ."
 
@@ -2561,8 +2947,8 @@
 msgstr ""
 
 #: src/prefs.c:291
-msgid "KFM"
-msgstr ""
+msgid "Konqueror"
+msgstr ""
 
 #: src/prefs.c:292
 msgid "Opera"
@@ -2572,403 +2958,409 @@
 msgid "Netscape"
 msgstr "ݽ"
 
-#: src/prefs.c:296
+#: src/prefs.c:294
+msgid "Mozilla"
+msgstr ""
+
+#: src/prefs.c:297
 msgid "Pop up new window by default"
 msgstr "⺻  â "
 
-#: src/prefs.c:303
+#: src/prefs.c:304
 msgid "GNOME URL Handler"
 msgstr "׳ URL ó"
 
-#: src/prefs.c:305
+#: src/prefs.c:306
 msgid "Galeon"
 msgstr ""
 
-#: src/prefs.c:306
-msgid "Manual"
-msgstr ""
-
-#: src/prefs.c:375
+#: src/prefs.c:307
+#, c-format
+msgid "Manual (%s for URL)"
+msgstr ""
+
+#: src/prefs.c:376
 msgid "Proxy Options"
 msgstr "Ͻ ɼ"
 
-#: src/prefs.c:387
+#: src/prefs.c:388
 msgid ""
 "Not all protocols can use these proxy options. Please see the README file "
 "for details."
 msgstr ""
-"Ͻø     ֽϴ. ڼ  ϸ README "
-" оʽÿ."
-
-#: src/prefs.c:392
+"Ͻø     ֽϴ. ڼ  ϸ README "
+" оʽÿ."
+
+#: src/prefs.c:393
 msgid "Proxy Type"
 msgstr "Ͻ "
 
-#: src/prefs.c:404
+#: src/prefs.c:405
 msgid "Proxy Server"
 msgstr "Ͻ "
 
-#: src/prefs.c:407
+#: src/prefs.c:408
 msgid "No Proxy"
 msgstr "Ͻ  "
 
-#: src/prefs.c:419
+#: src/prefs.c:420
 msgid "SOCKS 4"
 msgstr "SOCKS v4 Ͻ"
 
-#: src/prefs.c:429
+#: src/prefs.c:430
 msgid "SOCKS 5"
 msgstr "SOCKS v5 Ͻ"
 
-#: src/prefs.c:438
+#: src/prefs.c:439
 msgid "HTTP"
 msgstr "HTTP Ͻ"
 
-#: src/prefs.c:462
+#: src/prefs.c:463
 msgid "Host"
 msgstr "ȣƮ"
 
-#: src/prefs.c:478
+#: src/prefs.c:479
 msgid "Port"
 msgstr "Ʈ"
 
-#: src/prefs.c:495
+#: src/prefs.c:496
 msgid "User"
 msgstr ""
 
-#: src/prefs.c:511
+#: src/prefs.c:512
 msgid "Password"
 msgstr "н"
 
-#: src/prefs.c:543
+#: src/prefs.c:544
 msgid "Buddy List Options"
 msgstr "ģ ɼ"
 
-#: src/prefs.c:555
+#: src/prefs.c:556
 msgid "Buddy List Window"
 msgstr "ģâ"
 
-#: src/prefs.c:568
+#: src/prefs.c:569
 msgid "Tab Placement:"
 msgstr " ġ"
 
-#: src/prefs.c:572 src/prefs.c:1003 src/prefs.c:1153
+#: src/prefs.c:573 src/prefs.c:1004 src/prefs.c:1154
 msgid "Top"
 msgstr ""
 
-#: src/prefs.c:573 src/prefs.c:1005 src/prefs.c:1155
+#: src/prefs.c:574 src/prefs.c:1006 src/prefs.c:1156
 msgid "Bottom"
 msgstr "Ʒ"
 
-#: src/prefs.c:585
+#: src/prefs.c:586
 msgid "Hide IM/Info/Chat buttons"
 msgstr "޽/ä//ڸ ư "
 
-#: src/prefs.c:587
+#: src/prefs.c:588
 msgid "Automatically show buddy list on sign on"
 msgstr "α׿   ģ ڵ "
 
-#: src/prefs.c:589
+#: src/prefs.c:590
 msgid "Display Buddy List near applet"
 msgstr "ģ ø αٿ ǥ"
 
-#: src/prefs.c:592
+#: src/prefs.c:593
 msgid "Save Window Size/Position"
 msgstr "Ϻ â ġ ũ "
 
-#: src/prefs.c:595
+#: src/prefs.c:596
 msgid "Show pictures on buttons"
 msgstr "ư ׸ ֱ"
 
-#: src/prefs.c:599
+#: src/prefs.c:600
 msgid "Raise Buddy List on Signons and Signoffs"
 msgstr "ģ /  ģ â ø"
 
-#: src/prefs.c:601
+#: src/prefs.c:602
 msgid "Group Displays"
 msgstr "׷ ǥ"
 
-#: src/prefs.c:613
+#: src/prefs.c:614
 msgid "Hide groups with no online buddies"
 msgstr "ӵ ģ  ׷ "
 
-#: src/prefs.c:619
+#: src/prefs.c:620
 msgid "Show numbers in groups"
 msgstr "׷쿡 ο ǥ"
 
-#: src/prefs.c:621
+#: src/prefs.c:622
 msgid "Buddy Displays"
 msgstr "ģ ǥ"
 
-#: src/prefs.c:633
+#: src/prefs.c:634
 msgid "Show buddy type icons"
 msgstr "ģ  ׸ ֱ"
 
-#: src/prefs.c:634
+#: src/prefs.c:635
 msgid "Show warning levels"
 msgstr "  ǥ"
 
-#: src/prefs.c:640
+#: src/prefs.c:641
 msgid "Show idle times"
 msgstr "  ð ֱ"
 
-#: src/prefs.c:641
+#: src/prefs.c:642
 msgid "Grey idle buddies"
 msgstr "ڸ ģ ȸ ǥϱ"
 
-#: src/prefs.c:658
+#: src/prefs.c:659
 msgid "Conversation Options"
 msgstr "ȭ ɼ"
 
-#: src/prefs.c:670
+#: src/prefs.c:671
 msgid "Keyboard Options"
 msgstr "Ű ɼ"
 
-#: src/prefs.c:682
+#: src/prefs.c:683
 msgid "Enter sends message"
 msgstr "Ű  ޽ "
 
-#: src/prefs.c:683
+#: src/prefs.c:684
 msgid "Control-Enter sends message"
 msgstr "Ʈ-Ű  ޽ "
 
-#: src/prefs.c:684
+#: src/prefs.c:685
 msgid "Escape closes window"
 msgstr "Esc Ű  â "
 
-#: src/prefs.c:685
+#: src/prefs.c:686
 msgid "Control-W closes window"
 msgstr "Ʈ-W Ű  â "
 
-#: src/prefs.c:691
+#: src/prefs.c:692
 msgid "Control-{B/I/U/S} inserts HTML tags"
 msgstr "Ʈ-{B/I/U/S}  HTL ± "
 
-#: src/prefs.c:692
+#: src/prefs.c:693
 msgid "Control-(number) inserts smileys"
 msgstr "Ʈ-() Ͽ ׸ "
 
-#: src/prefs.c:693
+#: src/prefs.c:694
 msgid "F2 toggles timestamp display"
 msgstr "Ÿӽ  ϱ  F2 "
 
-#: src/prefs.c:695
+#: src/prefs.c:696
 msgid "Display and General Options"
 msgstr "ȭǥ  Ϲ ɼ"
 
-#: src/prefs.c:707
+#: src/prefs.c:708
 msgid "Show graphical smileys"
 msgstr "̸Ƽ ׸ ֱ"
 
-#: src/prefs.c:708
+#: src/prefs.c:709
 msgid "Show timestamp on messages"
 msgstr "޽ ð ǥ"
 
-#: src/prefs.c:709
+#: src/prefs.c:710
 msgid "Show URLs as links"
 msgstr "URL  ũ ֱ"
 
-#: src/prefs.c:710
+#: src/prefs.c:711
 msgid "Highlight misspelled words"
 msgstr "Ʋ öڸ Ͽ ǥ"
 
-#: src/prefs.c:711 src/prefs.c:1913
+#: src/prefs.c:712 src/prefs.c:1923
 msgid "Sending messages removes away status"
 msgstr "޽  ڸ ¿ "
 
-#: src/prefs.c:712 src/prefs.c:1926
+#: src/prefs.c:713 src/prefs.c:1936
 msgid "Queue new messages when away"
 msgstr "ڸ߿   ޽ "
 
-#: src/prefs.c:718
+#: src/prefs.c:719
 msgid "Ignore colors"
 msgstr " "
 
-#: src/prefs.c:719
+#: src/prefs.c:720
 msgid "Ignore font faces"
 msgstr "۲ "
 
-#: src/prefs.c:720
-msgid "Ignore font sizes"
-msgstr " ũ "
-
 #: src/prefs.c:721
+msgid "Ignore font sizes"
+msgstr " ũ "
+
+#: src/prefs.c:722
 msgid "Ignore TiK Automated Messages"
 msgstr "TiK ڵȭ ޽ "
 
-#: src/prefs.c:722 src/prefs.c:1911
+#: src/prefs.c:723 src/prefs.c:1921
 msgid "Ignore new conversations when away"
 msgstr "ڸ ο ȭ "
 
-#: src/prefs.c:911
+#: src/prefs.c:912
 msgid "IM Options"
 msgstr "޽ ɼ"
 
-#: src/prefs.c:924 src/prefs.c:2909
+#: src/prefs.c:925 src/prefs.c:2921
 msgid "IM Window"
 msgstr "޽ â"
 
-#: src/prefs.c:940 src/prefs.c:1090
+#: src/prefs.c:941 src/prefs.c:1091
 msgid "Show buttons as: "
 msgstr "  ư Դϴ: "
 
-#: src/prefs.c:944 src/prefs.c:1095
+#: src/prefs.c:945 src/prefs.c:1096
 msgid "Pictures And Text"
 msgstr "ܰ "
 
-#: src/prefs.c:945 src/prefs.c:1097
+#: src/prefs.c:946 src/prefs.c:1098
 msgid "Pictures"
 msgstr "ܸ"
 
-#: src/prefs.c:946 src/prefs.c:1098
+#: src/prefs.c:947 src/prefs.c:1099
 msgid "Text"
 msgstr "ڸ"
 
-#: src/prefs.c:957
+#: src/prefs.c:958
 msgid "Show all conversations in one tabbed window"
 msgstr " ȭ ϳ â  "
 
-#: src/prefs.c:959
+#: src/prefs.c:960
 msgid "Show chats in the same tabbed window"
 msgstr "äõ ȭ  â  "
 
-#: src/prefs.c:966 src/prefs.c:1118
+#: src/prefs.c:967 src/prefs.c:1119
 msgid "Raise windows on events"
 msgstr "޽  ڵ â ø"
 
-#: src/prefs.c:967
+#: src/prefs.c:968
 msgid "Show logins in window"
 msgstr "â  ֱ"
 
-#: src/prefs.c:968
-msgid "Show aliases in tabs/titles"
+#: src/prefs.c:969
+#, fuzzy
+msgid "Show aliases in tabs/titles/ticker"
 msgstr " Ǵ   ֱ"
 
-#: src/prefs.c:969
+#: src/prefs.c:970
 msgid "Hide window on send"
 msgstr "޽   ڵ â ݱ"
 
-#: src/prefs.c:971 src/prefs.c:1121
+#: src/prefs.c:972 src/prefs.c:1122
 msgid "Window Sizes"
 msgstr "â ũ"
 
-#: src/prefs.c:979 src/prefs.c:1129
+#: src/prefs.c:980 src/prefs.c:1130
 msgid "New window width:"
 msgstr " ȭâ  ũ"
 
-#: src/prefs.c:980 src/prefs.c:1130
+#: src/prefs.c:981 src/prefs.c:1131
 msgid "New window height:"
 msgstr " ȭâ  ũ"
 
-#: src/prefs.c:981 src/prefs.c:1131
+#: src/prefs.c:982 src/prefs.c:1132
 msgid "Entry widget height:"
 msgstr "Ʈ  "
 
-#: src/prefs.c:983 src/prefs.c:1133
+#: src/prefs.c:984 src/prefs.c:1134
 msgid "Tab Placement"
 msgstr " ġ"
 
-#: src/prefs.c:1012 src/prefs.c:1162
+#: src/prefs.c:1013 src/prefs.c:1163
 msgid "Left"
 msgstr ""
 
-#: src/prefs.c:1014 src/prefs.c:1164
+#: src/prefs.c:1015 src/prefs.c:1165
 msgid "Right"
 msgstr ""
 
-#: src/prefs.c:1018
+#: src/prefs.c:1019
 msgid "Buddy Icons"
 msgstr "ģ "
 
-#: src/prefs.c:1030
+#: src/prefs.c:1031
 msgid "Hide Buddy Icons"
 msgstr "ģ  "
 
-#: src/prefs.c:1036
+#: src/prefs.c:1037
 msgid "Disable Buddy Icon Animation"
 msgstr "ִϸ̼ "
 
-#: src/prefs.c:1062
+#: src/prefs.c:1063
 msgid "Chat Options"
 msgstr "ä ɼ"
 
-#: src/prefs.c:1074
+#: src/prefs.c:1075
 msgid "Group Chat Window"
 msgstr "׷ ä â"
 
-#: src/prefs.c:1109
+#: src/prefs.c:1110
 msgid "Show all chats in one tabbed window"
 msgstr " ä ϳ â  "
 
-#: src/prefs.c:1111
+#: src/prefs.c:1112
 msgid "Show conversations in the same tabbed window"
 msgstr "ȭ äð  â  "
 
-#: src/prefs.c:1119
+#: src/prefs.c:1120
 msgid "Show people joining/leaving in window"
 msgstr "ģ ϴ/° â "
 
-#: src/prefs.c:1167
+#: src/prefs.c:1168
 msgid "Tab Completion"
 msgstr "ڵϼ"
 
-#: src/prefs.c:1179
+#: src/prefs.c:1180
 msgid "Tab-Complete Nicks"
 msgstr " Ű  ڵϼϱ"
 
-#: src/prefs.c:1185
+#: src/prefs.c:1186
 msgid "Old-Style Tab Completion"
 msgstr "  ڵϼϱ"
 
-#: src/prefs.c:1287 src/prefs.c:2919
+#: src/prefs.c:1288 src/prefs.c:2931
 msgid "Font Options"
 msgstr "޲ ɼ"
 
-#: src/prefs.c:1313
+#: src/prefs.c:1314
 msgid "Italic Text"
 msgstr " ۾"
 
-#: src/prefs.c:1357 src/prefs.c:1375 src/prefs.c:1397
+#: src/prefs.c:1358 src/prefs.c:1376 src/prefs.c:1398
 msgid "Select"
 msgstr ""
 
-#: src/prefs.c:1395
+#: src/prefs.c:1396
 msgid "Font Face for Text"
 msgstr "ؽƮ  ۲"
 
-#: src/prefs.c:1410
+#: src/prefs.c:1411
 msgid "Font Size for Text"
 msgstr "ؽƮ   ũ"
 
-#: src/prefs.c:1507
+#: src/prefs.c:1508
 msgid "Gaim - Sound Configuration"
 msgstr " - Ҹ "
 
-#: src/prefs.c:1542
+#: src/prefs.c:1543
 msgid "Test"
 msgstr "׽Ʈ"
 
-#: src/prefs.c:1552
+#: src/prefs.c:1553
 msgid "Choose..."
 msgstr ""
 
-#: src/prefs.c:1609
+#: src/prefs.c:1621
 msgid "Sound Options"
 msgstr "Ҹ ɼ"
 
-#: src/prefs.c:1637
+#: src/prefs.c:1649
 msgid "No sounds when you log in"
 msgstr "ӽ Ҹ  "
 
-#: src/prefs.c:1643 src/prefs.c:1912
+#: src/prefs.c:1655 src/prefs.c:1922
 msgid "Sounds while away"
 msgstr "ڸ Ҹ "
 
-#: src/prefs.c:1653
+#: src/prefs.c:1665
 msgid "Sound method"
 msgstr "Ҹ  "
 
-#: src/prefs.c:1727
+#: src/prefs.c:1739
 #, c-format
 msgid ""
 "Sound command\n"
@@ -2977,103 +3369,103 @@
 "Ҹ  ɾ\n"
 "(%s  ̸)"
 
-#: src/prefs.c:1739
+#: src/prefs.c:1751
 msgid "Sound played when:"
 msgstr "  Ҹ :"
 
-#: src/prefs.c:1883 src/prefs.c:2941
+#: src/prefs.c:1893 src/prefs.c:2953
 msgid "Away Messages"
 msgstr "ڸ"
 
-#: src/prefs.c:1920
+#: src/prefs.c:1930
 msgid "Don't send auto-response"
 msgstr "ڵ 亯  "
 
-#: src/prefs.c:1921
+#: src/prefs.c:1931
 msgid "Only send auto-response when idle"
 msgstr "Խÿ ڵ 亯 "
 
-#: src/prefs.c:1936
+#: src/prefs.c:1946
 msgid "Time between sending auto-responses (in seconds):"
 msgstr " ð   ڵ 亯( ):"
 
-#: src/prefs.c:1951
+#: src/prefs.c:1961
 msgid "Auto Away after"
 msgstr " "
 
-#: src/prefs.c:1965
+#: src/prefs.c:1975
 msgid "minutes using"
 msgstr "     ڸ ޽ : "
 
-#: src/prefs.c:1978
+#: src/prefs.c:1988
 msgid "Messages"
 msgstr "޽"
 
-#: src/prefs.c:2035
+#: src/prefs.c:2045
 msgid "Edit"
 msgstr ""
 
-#: src/prefs.c:2039
+#: src/prefs.c:2049
 msgid "Make Away"
 msgstr " ڸ"
 
-#: src/prefs.c:2316
+#: src/prefs.c:2326
 msgid "Privacy Options"
 msgstr "̹ ɼ"
 
-#: src/prefs.c:2332
+#: src/prefs.c:2342
 msgid "Set privacy for:"
 msgstr " :"
 
-#: src/prefs.c:2351
+#: src/prefs.c:2361
 msgid "Allow all users to contact me"
 msgstr " ڰ   ֵ "
 
-#: src/prefs.c:2352
+#: src/prefs.c:2362
 msgid "Allow only the users below"
 msgstr " Ͽ ִ ڸ   ֵ "
 
-#: src/prefs.c:2354
+#: src/prefs.c:2364
 msgid "Allow List"
 msgstr " "
 
-#: src/prefs.c:2385
+#: src/prefs.c:2395
 msgid "Deny all users"
 msgstr " ڸ ź"
 
-#: src/prefs.c:2386
+#: src/prefs.c:2396
 msgid "Block the users below"
 msgstr " Ͽ ִ ڸ "
 
-#: src/prefs.c:2388
+#: src/prefs.c:2398
 msgid "Block List"
 msgstr " "
 
-#: src/prefs.c:2483
+#: src/prefs.c:2493
 msgid "Gaim - Preferences"
 msgstr " - ȯ漳"
 
-#: src/prefs.c:2566
+#: src/prefs.c:2576
 msgid "Gaim debug output window"
 msgstr "   â"
 
-#: src/prefs.c:2875
+#: src/prefs.c:2887
 msgid "General"
 msgstr "Ϲ"
 
-#: src/prefs.c:2880
+#: src/prefs.c:2892
 msgid "Proxy"
 msgstr "Ͻ"
 
-#: src/prefs.c:2904
+#: src/prefs.c:2916
 msgid "Conversations"
 msgstr "ȭ"
 
-#: src/prefs.c:2930
+#: src/prefs.c:2942
 msgid "Sounds"
 msgstr "Ҹ"
 
-#: src/prefs.c:2952
+#: src/prefs.c:2964
 msgid "Privacy"
 msgstr "̹"
 
@@ -3116,12 +3508,12 @@
 msgid "Open Mail"
 msgstr " "
 
-#: src/prpl.c:564
+#: src/prpl.c:570
 #, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s%s"
 msgstr "%s%s%s%s %s ģ Ͽ ߰ ߽ϴ%s%s%s"
 
-#: src/prpl.c:572
+#: src/prpl.c:578
 msgid ""
 "\n"
 "\n"
@@ -3131,22 +3523,21 @@
 "\n"
 " ģ Ͽ ߰ұ?"
 
-#: src/prpl.c:615
+#: src/prpl.c:621
 msgid ""
 "You do not currently have any protocols available that are able to register "
 "new accounts."
-msgstr ""
-"     ִ  ϴ."
-
-#: src/prpl.c:652
+msgstr "     ִ  ϴ."
+
+#: src/prpl.c:658
 msgid "Gaim - Registration"
 msgstr " - "
 
-#: src/prpl.c:667
+#: src/prpl.c:673
 msgid "Registration Information"
 msgstr " "
 
-#: src/prpl.c:684
+#: src/prpl.c:690
 msgid "Register"
 msgstr ""
 
@@ -3178,3 +3569,56 @@
 #: src/server.c:1076
 msgid "More Info"
 msgstr " "
+
+#: src/sound.c:63
+#, fuzzy
+msgid "Buddy logs in"
+msgstr "ģ "
+
+#: src/sound.c:64
+#, fuzzy
+msgid "Buddy logs out"
+msgstr "ģ "
+
+#: src/sound.c:65
+#, fuzzy
+msgid "Message received"
+msgstr "޽ "
+
+#: src/sound.c:66
+msgid "Message received begins conversation"
+msgstr ""
+
+#: src/sound.c:67
+#, fuzzy
+msgid "Message sent"
+msgstr "޽"
+
+#: src/sound.c:68
+msgid "Person enters chat"
+msgstr ""
+
+#: src/sound.c:69
+msgid "Person leaves chat"
+msgstr ""
+
+#: src/sound.c:70
+msgid "You talk in chat"
+msgstr ""
+
+#: src/sound.c:71
+msgid "Others talk in chat"
+msgstr ""
+
+#: src/sound.c:74
+msgid "Someone says your name in chat"
+msgstr ""
+
+#~ msgid "Enable sounds"
+#~ msgstr "Ҹ "
+
+#~ msgid "KFM"
+#~ msgstr ""
+
+#~ msgid "Manual"
+#~ msgstr ""
--- a/po/pl.po	Tue Jul 02 05:41:30 2002 +0000
+++ b/po/pl.po	Tue Jul 02 05:42:26 2002 +0000
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gaim 0.59\n"
-"POT-Creation-Date: 2002-06-15 17:14-0400\n"
+"POT-Creation-Date: 2002-06-25 00:10-0400\n"
 "PO-Revision-Date: 2002-06-02 20:01+0100\n"
 "Last-Translator: Przemysaw Suek <pbs@linux.net.pl>\n"
 "Language-Team: POLISH <pl@li.org>\n"
@@ -25,7 +25,7 @@
 #: plugins/chatlist.c:339 src/about.c:165 src/aim.c:320 src/buddy.c:2716
 #: src/buddy_chat.c:1322 src/buddy_chat.c:1419 src/buddy_chat.c:1449
 #: src/conversation.c:2864 src/dialogs.c:567 src/dialogs.c:3899
-#: src/multi.c:1069 src/plugins.c:277 src/prefs.c:2537 src/prpl.c:438
+#: src/multi.c:1069 src/plugins.c:277 src/prefs.c:2547 src/prpl.c:438
 #: src/prpl.c:685 src/server.c:1072
 msgid "Close"
 msgstr "Zamknij"
@@ -42,13 +42,13 @@
 #: plugins/chatlist.c:364 src/buddy.c:492 src/buddy.c:2827
 #: src/buddy_chat.c:1454 src/conversation.c:2389 src/conversation.c:2879
 #: src/dialogs.c:932 src/dialogs.c:1114 src/dialogs.c:2095 src/multi.c:1053
-#: src/prefs.c:2031 src/prefs.c:2373 src/prefs.c:2407
+#: src/prefs.c:2041 src/prefs.c:2383 src/prefs.c:2417
 msgid "Add"
 msgstr "Dodaj"
 
 #: plugins/chatlist.c:365 src/buddy.c:494 src/buddy.c:2829
 #: src/buddy_chat.c:1456 src/conversation.c:2375 src/conversation.c:2876
-#: src/prefs.c:2045 src/prefs.c:2377 src/prefs.c:2411
+#: src/prefs.c:2055 src/prefs.c:2387 src/prefs.c:2421
 msgid "Remove"
 msgstr "Usu"
 
@@ -89,7 +89,7 @@
 msgid "Change"
 msgstr "Zmie"
 
-#: src/protocols/gg/gg.c:71 src/protocols/msn/msn.c:1924
+#: src/protocols/gg/gg.c:71 src/protocols/msn/msn.c:1919
 msgid "Available"
 msgstr "Dostpny"
 
@@ -146,7 +146,7 @@
 msgid "Unknown Error Code."
 msgstr "Nieznany Kod Bdu."
 
-#: src/protocols/gg/gg.c:302 src/protocols/msn/msn.c:2055
+#: src/protocols/gg/gg.c:302 src/protocols/msn/msn.c:2050
 #, c-format
 msgid "Status: %s"
 msgstr "Stan: %s"
@@ -351,7 +351,7 @@
 #. show_set_dir(gc);
 #.
 #: src/dialogs.c:1741 src/protocols/gg/gg.c:1160 src/protocols/gg/gg.c:1177
-#: src/protocols/jabber/jabber.c:3741 src/protocols/jabber/jabber.c:3754
+#: src/protocols/jabber/jabber.c:3748 src/protocols/jabber/jabber.c:3761
 msgid "Change Password"
 msgstr "Zmie haso"
 
@@ -372,7 +372,7 @@
 msgstr "Wylij wiadomo poprzez serwer"
 
 #: src/protocols/icq/gaim_icq.c:469 src/protocols/irc/irc.c:1851
-#: src/protocols/jabber/jabber.c:2853 src/protocols/oscar/oscar.c:3583
+#: src/protocols/jabber/jabber.c:2860 src/protocols/oscar/oscar.c:3593
 #: src/protocols/toc/toc.c:1219
 msgid "Get Info"
 msgstr "Pobierz informacj"
@@ -411,7 +411,7 @@
 "connection?"
 msgstr "%s zada czatu DCC. Czy chcesz ustanowi poczenie bezporednie?"
 
-#: src/protocols/irc/irc.c:1001 src/protocols/msn/msn.c:310
+#: src/protocols/irc/irc.c:1001 src/protocols/msn/msn.c:315
 msgid "Unable to write"
 msgstr "Nie mona zapisa"
 
@@ -493,167 +493,167 @@
 msgid "No such user"
 msgstr "Brak uytkownika"
 
-#: src/protocols/jabber/jabber.c:1634 src/protocols/jabber/jabber.c:2334
-#: src/protocols/jabber/jabber.c:2499
+#: src/protocols/jabber/jabber.c:1634 src/protocols/jabber/jabber.c:2341
+#: src/protocols/jabber/jabber.c:2506
 msgid "Jabber Error"
 msgstr "Bd Jabber"
 
-#: src/dialogs.c:887 src/protocols/jabber/jabber.c:1716
-#: src/protocols/msn/msn.c:1121
+#: src/dialogs.c:887 src/protocols/jabber/jabber.c:1719
+#: src/protocols/msn/msn.c:1110
 msgid "Buddies"
 msgstr "Kumple"
 
-#: src/protocols/jabber/jabber.c:1775
+#: src/protocols/jabber/jabber.c:1782
 msgid "Authenticating"
 msgstr "Autentykowanie"
 
-#: src/protocols/jabber/jabber.c:1812
+#: src/protocols/jabber/jabber.c:1819
 msgid "Unknown login error"
 msgstr "Nieznany bd logowania."
 
-#: src/protocols/jabber/jabber.c:2003
+#: src/protocols/jabber/jabber.c:2010
 msgid "Password successfully changed."
 msgstr "Zmiana hasa powioda si."
 
-#: src/protocols/jabber/jabber.c:2005
+#: src/protocols/jabber/jabber.c:2012
 msgid "Password Change"
 msgstr "Zmiana hasa"
 
-#: src/protocols/jabber/jabber.c:2047 src/protocols/jabber/jabber.c:3669
+#: src/protocols/jabber/jabber.c:2054 src/protocols/jabber/jabber.c:3676
 msgid "Connection lost"
 msgstr "Poczenie utracone"
 
-#: src/protocols/jabber/jabber.c:2049 src/protocols/jabber/jabber.c:2081
-#: src/protocols/jabber/jabber.c:3671 src/protocols/jabber/jabber.c:3717
-#: src/protocols/msn/msn.c:1748 src/protocols/msn/msn.c:1775
+#: src/protocols/jabber/jabber.c:2056 src/protocols/jabber/jabber.c:2088
+#: src/protocols/jabber/jabber.c:3678 src/protocols/jabber/jabber.c:3724
+#: src/protocols/msn/msn.c:1741 src/protocols/msn/msn.c:1770
 msgid "Unable to connect"
 msgstr "Nie mona si poczy"
 
-#: src/protocols/jabber/jabber.c:2055
+#: src/protocols/jabber/jabber.c:2062
 msgid "Connected"
 msgstr "Poczony"
 
-#: src/protocols/jabber/jabber.c:2058
+#: src/protocols/jabber/jabber.c:2065
 msgid "Requesting Authentication Method"
 msgstr "danie metody autentykacji"
 
 #. we have no chats yet
-#: src/protocols/jabber/jabber.c:2076 src/protocols/msn/msn.c:1769
+#: src/protocols/jabber/jabber.c:2083 src/protocols/msn/msn.c:1762
 msgid "Connecting"
 msgstr "czenie"
 
-#: src/protocols/jabber/jabber.c:2333 src/protocols/jabber/jabber.c:2498
+#: src/protocols/jabber/jabber.c:2340 src/protocols/jabber/jabber.c:2505
 msgid "Invalid Jabber I.D."
 msgstr "Niepoprawna ID Jabber"
 
-#: src/protocols/jabber/jabber.c:2466
+#: src/protocols/jabber/jabber.c:2473
 msgid "Room:"
 msgstr "Pokj:"
 
-#: src/protocols/jabber/jabber.c:2470
+#: src/protocols/jabber/jabber.c:2477
 msgid "Server:"
 msgstr "Serwer:"
 
-#: src/protocols/jabber/jabber.c:2475
+#: src/protocols/jabber/jabber.c:2482
 msgid "Handle:"
 msgstr "Uchwyt:"
 
-#: src/protocols/jabber/jabber.c:2532
+#: src/protocols/jabber/jabber.c:2539
 msgid "Chats"
 msgstr "Czaty"
 
-#: src/protocols/jabber/jabber.c:2847
+#: src/protocols/jabber/jabber.c:2854
 msgid "View Error Msg"
 msgstr "Poka komunikat bdu"
 
-#: src/buddy_chat.c:886 src/protocols/jabber/jabber.c:2858
-#: src/protocols/oscar/oscar.c:3596
+#: src/buddy_chat.c:886 src/protocols/jabber/jabber.c:2865
+#: src/protocols/oscar/oscar.c:3606
 msgid "Get Away Msg"
 msgstr "Pobierz wiadomo Zajty"
 
-#: src/protocols/jabber/jabber.c:2875
+#: src/protocols/jabber/jabber.c:2882
 msgid "Remove From Roster"
 msgstr "Usu ze spisu"
 
-#: src/protocols/jabber/jabber.c:3069
+#: src/protocols/jabber/jabber.c:3076
 msgid "Full Name"
 msgstr "Pena nazwa"
 
-#: src/protocols/jabber/jabber.c:3070
+#: src/protocols/jabber/jabber.c:3077
 msgid "Family Name"
 msgstr "Nazwisko"
 
-#: src/protocols/jabber/jabber.c:3071
+#: src/protocols/jabber/jabber.c:3078
 msgid "Given Name"
 msgstr "Nazwisko panieskie"
 
-#: src/protocols/jabber/jabber.c:3072
+#: src/protocols/jabber/jabber.c:3079
 msgid "Nickname"
 msgstr "Pseudonim"
 
-#: src/dialogs.c:2525 src/protocols/jabber/jabber.c:3073
+#: src/dialogs.c:2525 src/protocols/jabber/jabber.c:3080
 msgid "URL"
 msgstr "URL"
 
-#: src/protocols/jabber/jabber.c:3074
+#: src/protocols/jabber/jabber.c:3081
 msgid "Street Address"
 msgstr "Adres ulica"
 
-#: src/protocols/jabber/jabber.c:3075
+#: src/protocols/jabber/jabber.c:3082
 msgid "Extended Address"
 msgstr "Rozszerzony adres"
 
-#: src/protocols/jabber/jabber.c:3076
+#: src/protocols/jabber/jabber.c:3083
 msgid "Locality"
 msgstr "Miejsce (lokalizacja)"
 
-#: src/protocols/jabber/jabber.c:3077
+#: src/protocols/jabber/jabber.c:3084
 msgid "Region"
 msgstr "Region"
 
-#: src/protocols/jabber/jabber.c:3078
+#: src/protocols/jabber/jabber.c:3085
 msgid "Postal Code"
 msgstr "Kod pocztowy"
 
 #. Line 7
-#: src/dialogs.c:1646 src/dialogs.c:2354 src/protocols/jabber/jabber.c:3079
+#: src/dialogs.c:1646 src/dialogs.c:2354 src/protocols/jabber/jabber.c:3086
 msgid "Country"
 msgstr "Kraj"
 
-#: src/protocols/jabber/jabber.c:3080
+#: src/protocols/jabber/jabber.c:3087
 msgid "Telephone"
 msgstr "Telefon"
 
-#: src/dialogs.c:2430 src/protocols/jabber/jabber.c:3081
+#: src/dialogs.c:2430 src/protocols/jabber/jabber.c:3088
 msgid "Email"
 msgstr "Email"
 
-#: src/protocols/jabber/jabber.c:3082
+#: src/protocols/jabber/jabber.c:3089
 msgid "Organization Name"
 msgstr "Nazwa organizacji"
 
-#: src/protocols/jabber/jabber.c:3083
+#: src/protocols/jabber/jabber.c:3090
 msgid "Organization Unit"
 msgstr "Jednostka organizacyjna"
 
-#: src/prefs.c:1990 src/protocols/jabber/jabber.c:3084
+#: src/prefs.c:2000 src/protocols/jabber/jabber.c:3091
 msgid "Title"
 msgstr "Tytu"
 
-#: src/protocols/jabber/jabber.c:3085
+#: src/protocols/jabber/jabber.c:3092
 msgid "Role"
 msgstr "Rola"
 
-#: src/protocols/jabber/jabber.c:3086
+#: src/protocols/jabber/jabber.c:3093
 msgid "Birthday"
 msgstr "Data urodzenia"
 
 #. Right side: frame with description and the filepath of plugin
-#: src/dialogs.c:2533 src/plugins.c:211 src/protocols/jabber/jabber.c:3087
+#: src/dialogs.c:2533 src/plugins.c:211 src/protocols/jabber/jabber.c:3094
 msgid "Description"
 msgstr "Opis"
 
-#: src/protocols/jabber/jabber.c:3112
+#: src/protocols/jabber/jabber.c:3119
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable"
@@ -661,275 +661,275 @@
 "Wszystkie ponisze pola s opcjonalne. Wprowad jedynie te informacje, ktre "
 "uwaasz za stosowne"
 
-#: src/protocols/jabber/jabber.c:3113
+#: src/protocols/jabber/jabber.c:3120
 msgid "User Identity"
 msgstr "Identyfikacja uytkownika"
 
-#: src/protocols/jabber/jabber.c:3525
+#: src/protocols/jabber/jabber.c:3532
 msgid "Gaim - Edit Jabber vCard"
 msgstr "Gaim - Edycja vCard Jabber"
 
-#: src/protocols/jabber/jabber.c:3599
+#: src/protocols/jabber/jabber.c:3606
 msgid "Server Registration successful!"
 msgstr "Poprawa rejestracja na serwerze!"
 
-#: src/protocols/jabber/jabber.c:3626
+#: src/protocols/jabber/jabber.c:3633
 msgid "Unknown registration error"
 msgstr "Nieznany bd rejestracji"
 
-#: src/protocols/jabber/jabber.c:3735 src/protocols/jabber/jabber.c:3750
+#: src/protocols/jabber/jabber.c:3742 src/protocols/jabber/jabber.c:3757
 msgid "Set User Info"
 msgstr "Ustaw informacje o uytkowniku"
 
-#: src/protocols/msn/msn.c:225
+#: src/protocols/msn/msn.c:230
 msgid "Syntax Error (probably a Gaim bug)"
 msgstr "Bd skadni (prawdopodobnie bd w Gaim)"
 
-#: src/protocols/msn/msn.c:228
+#: src/protocols/msn/msn.c:233
 msgid "Invalid Parameter (probably a Gaim bug)"
 msgstr "Niepoprawny parametr (prawdopodobnie bd w Gaim)"
 
-#: src/protocols/msn/msn.c:231
+#: src/protocols/msn/msn.c:236
 msgid "Invalid User"
 msgstr "Niepoprawny yytkownik"
 
-#: src/protocols/msn/msn.c:234
+#: src/protocols/msn/msn.c:239
 msgid "Fully Qualified Domain Name missing"
 msgstr "Pomienito pen nazw domeny (FQDN)"
 
-#: src/protocols/msn/msn.c:237
+#: src/protocols/msn/msn.c:242
 msgid "Already Login"
 msgstr "Ju zalogowany"
 
-#: src/protocols/msn/msn.c:240
+#: src/protocols/msn/msn.c:245
 msgid "Invalid Username"
 msgstr "Niepoprawna nazwa uytkownika"
 
-#: src/protocols/msn/msn.c:243
+#: src/protocols/msn/msn.c:248
 msgid "Invalid Friendly Name"
 msgstr "Niepoprawna przujazna nazwa"
 
-#: src/protocols/msn/msn.c:246
+#: src/protocols/msn/msn.c:251
 msgid "List Full"
 msgstr "Pena lista"
 
-#: src/protocols/msn/msn.c:249
+#: src/protocols/msn/msn.c:254
 msgid "Already there"
 msgstr "Ju tu jeste"
 
-#: src/protocols/msn/msn.c:252
+#: src/protocols/msn/msn.c:257
 msgid "Not on list"
 msgstr "Nie ma na licie"
 
-#: src/protocols/msn/msn.c:255
+#: src/protocols/msn/msn.c:260
 msgid "User is offline"
 msgstr "Uytkownik jest niedostpny"
 
-#: src/protocols/msn/msn.c:258
+#: src/protocols/msn/msn.c:263
 msgid "Already in the mode"
 msgstr "Jeste ju w trybie"
 
-#: src/protocols/msn/msn.c:261
+#: src/protocols/msn/msn.c:266
 msgid "Already in opposite list"
 msgstr "Jest ju na przeciwnej licie"
 
-#: src/protocols/msn/msn.c:264
+#: src/protocols/msn/msn.c:269
 msgid "Switchboard failed"
 msgstr "Bd tablicy pocze (Switchboard)"
 
-#: src/protocols/msn/msn.c:267
+#: src/protocols/msn/msn.c:272
 msgid "Notify Transfer failed"
 msgstr "Bd (Notify Transfer)"
 
-#: src/protocols/msn/msn.c:271
+#: src/protocols/msn/msn.c:276
 msgid "Required fields missing"
 msgstr "Pominito wymagane pola"
 
-#: src/protocols/msn/msn.c:274
+#: src/protocols/msn/msn.c:279
 msgid "Not logged in"
 msgstr "Niezalogowany."
 
-#: src/protocols/msn/msn.c:278
+#: src/protocols/msn/msn.c:283
 msgid "Internal server error"
 msgstr "Bd wewntrzny serwera"
 
-#: src/protocols/msn/msn.c:281
+#: src/protocols/msn/msn.c:286
 msgid "Database server error"
 msgstr "Bd serwera bazy danych"
 
-#: src/protocols/msn/msn.c:284
+#: src/protocols/msn/msn.c:289
 msgid "File operation error"
 msgstr "Bd operacji na pliku"
 
-#: src/protocols/msn/msn.c:287
+#: src/protocols/msn/msn.c:292
 msgid "Memory allocation error"
 msgstr "Bd alokacji pamici"
 
-#: src/protocols/msn/msn.c:291
+#: src/protocols/msn/msn.c:296
 msgid "Server busy"
 msgstr "Serwer zajty"
 
-#: src/protocols/msn/msn.c:294
+#: src/protocols/msn/msn.c:299
 msgid "Server unavailable"
 msgstr "Server niedostpny"
 
-#: src/protocols/msn/msn.c:297
+#: src/protocols/msn/msn.c:302
 msgid "Peer Notification server down"
 msgstr "Serwer obecnoci jest wyczony"
 
-#: src/protocols/msn/msn.c:300
+#: src/protocols/msn/msn.c:305
 msgid "Database connect error"
 msgstr "Bd poczenia z baz danych"
 
-#: src/protocols/msn/msn.c:303
+#: src/protocols/msn/msn.c:308
 msgid "Server is going down (abandon ship)"
 msgstr "Serwer koczy prac (opu okrt)"
 
-#: src/protocols/msn/msn.c:307
+#: src/protocols/msn/msn.c:312
 msgid "Error creating connection"
 msgstr "Bd podczas tworzenia poczenia"
 
-#: src/protocols/msn/msn.c:313
+#: src/protocols/msn/msn.c:318
 msgid "Session overload"
 msgstr "Sesja przeciona"
 
-#: src/protocols/msn/msn.c:316
+#: src/protocols/msn/msn.c:321
 msgid "User is too active"
 msgstr "Uytkownik jest zbyt aktywny"
 
-#: src/protocols/msn/msn.c:319
+#: src/protocols/msn/msn.c:324
 msgid "Too many sessions"
 msgstr "Zbyt wiele sesji"
 
-#: src/protocols/msn/msn.c:322
+#: src/protocols/msn/msn.c:327
 msgid "Not expected"
 msgstr "Nieoczekiwano."
 
-#: src/protocols/msn/msn.c:325
+#: src/protocols/msn/msn.c:330
 msgid "Bad friend file"
 msgstr "Zy plik przyjaciela"
 
-#: src/protocols/msn/msn.c:329
+#: src/protocols/msn/msn.c:334
 msgid "Authentication failed"
 msgstr "Autoryzacja nie powioda si."
 
-#: src/protocols/msn/msn.c:332
+#: src/protocols/msn/msn.c:337
 msgid "Not allowed when offline"
 msgstr "Niedopuszczalne gdy niedostpny"
 
-#: src/protocols/msn/msn.c:335
+#: src/protocols/msn/msn.c:340
 msgid "Not accepting new users"
 msgstr "Bez akceptacji nowych uytkownikw"
 
-#: src/protocols/msn/msn.c:338
+#: src/protocols/msn/msn.c:343
 msgid "User unverified"
 msgstr "Uytkownik niezweryfikowany"
 
-#: src/protocols/msn/msn.c:341
+#: src/protocols/msn/msn.c:346
 msgid "Unknown Error Code"
 msgstr "Nieznany Kod Bdu."
 
-#: src/protocols/msn/msn.c:346 src/protocols/msn/msn.c:551
-#: src/protocols/msn/msn.c:830 src/protocols/msn/msn.c:2116
-#: src/protocols/msn/msn.c:2284 src/protocols/msn/msn.c:2337
+#: src/protocols/msn/msn.c:351 src/protocols/msn/msn.c:558
+#: src/protocols/msn/msn.c:813 src/protocols/msn/msn.c:2114
+#: src/protocols/msn/msn.c:2283 src/protocols/msn/msn.c:2336
 msgid "MSN Error"
 msgstr "Bad MSN"
 
-#: src/protocols/msn/msn.c:551
+#: src/protocols/msn/msn.c:558
 msgid "A message may not have been received."
 msgstr "Wiadomo moga zosta nieodebrana."
 
-#: src/protocols/msn/msn.c:830
+#: src/protocols/msn/msn.c:813
 msgid "Gaim was unable to send a message"
 msgstr "Gaim nie mg wysa wiadomoci"
 
-#: src/protocols/msn/msn.c:928
+#: src/protocols/msn/msn.c:917
 #, c-format
 msgid "The user %s (%s) wants to add %s to his or her buddy list."
 msgstr "Uytkownik %s (%s) chce doda %s do swojej listy kolesi."
 
-#: src/protocols/msn/msn.c:1085
+#: src/protocols/msn/msn.c:1074
 #, c-format
 msgid "The user %s (%s) wants to add you to their buddy list"
 msgstr "Uytkownik %s (%s) chce doda Ci do swojej listy kolesi."
 
-#: src/protocols/msn/msn.c:1186
+#: src/protocols/msn/msn.c:1175
 msgid "You have been disconnected. You have signed on from another location."
 msgstr "Zostae rozczony. Zapisae si z innego miejsca."
 
-#: src/protocols/msn/msn.c:1445 src/protocols/msn/msn.c:1686
+#: src/protocols/msn/msn.c:1435 src/protocols/msn/msn.c:1679
 msgid "Error reading from server"
 msgstr "Bd podczas odczytu z serwera"
 
-#: src/protocols/msn/msn.c:1578
+#: src/protocols/msn/msn.c:1568
 msgid "Requesting to send password"
 msgstr "danie wysania hasa"
 
-#: src/protocols/msn/msn.c:1625
+#: src/protocols/msn/msn.c:1618
 msgid "Unable to send password"
 msgstr "Nie mona wysa hasa"
 
-#: src/protocols/msn/msn.c:1630
+#: src/protocols/msn/msn.c:1623
 msgid "Password sent"
 msgstr "Haso wysane"
 
-#: src/protocols/msn/msn.c:1755
+#: src/protocols/msn/msn.c:1748
 msgid "Unable to write to server"
 msgstr "Nie mona zapisa na serwer"
 
-#: src/protocols/msn/msn.c:1761
+#: src/protocols/msn/msn.c:1754
 msgid "Synching with server"
 msgstr "Synchronizacja z serwerem"
 
-#: src/protocols/msn/msn.c:1925
+#: src/protocols/msn/msn.c:1920
 msgid "Away From Computer"
 msgstr "Nie ma mnie przy komputerze"
 
-#: src/protocols/msn/msn.c:1926
+#: src/protocols/msn/msn.c:1921
 msgid "Be Right Back"
 msgstr "Zaraz bd"
 
-#: src/protocols/msn/msn.c:1927
+#: src/protocols/msn/msn.c:1922
 msgid "Busy"
 msgstr "Zajty"
 
-#: src/protocols/msn/msn.c:1928
+#: src/protocols/msn/msn.c:1923
 msgid "On The Phone"
 msgstr "Na telefonie"
 
-#: src/protocols/msn/msn.c:1929
+#: src/protocols/msn/msn.c:1924
 msgid "Out To Lunch"
 msgstr "Na lanczu"
 
-#: src/protocols/msn/msn.c:1930
+#: src/protocols/msn/msn.c:1925
 msgid "Hidden"
 msgstr "Ukryty"
 
-#: src/protocols/msn/msn.c:2046
+#: src/protocols/msn/msn.c:2041
 msgid "Reset friendly name"
 msgstr "Wyczy przyjazn nazw"
 
-#: src/protocols/msn/msn.c:2116
+#: src/protocols/msn/msn.c:2114
 msgid "Friendly name too long."
 msgstr "Przyjazna nazwa zbyt duga."
 
-#: src/protocols/msn/msn.c:2130 src/protocols/msn/msn.c:2151
+#: src/protocols/msn/msn.c:2129 src/protocols/msn/msn.c:2150
 msgid "Set Friendly Name"
 msgstr "Ustaw przyjazn nazw"
 
-#: src/protocols/msn/msn.c:2131
+#: src/protocols/msn/msn.c:2130
 msgid "Set Friendly Name:"
 msgstr "Ustaw przyjazn nazw:"
 
-#: src/protocols/msn/msn.c:2132
+#: src/protocols/msn/msn.c:2131
 msgid "Reset All Friendly Names"
 msgstr "Wyczy wszystkie przyjazne nazwy"
 
-#: src/protocols/msn/msn.c:2284 src/protocols/msn/msn.c:2337
+#: src/protocols/msn/msn.c:2283 src/protocols/msn/msn.c:2336
 msgid "Invalid name"
 msgstr "Niepoprawna nazwa"
 
-#: src/protocols/napster/napster.c:450 src/protocols/oscar/oscar.c:3199
+#: src/protocols/napster/napster.c:457 src/protocols/oscar/oscar.c:3209
 #: src/protocols/toc/toc.c:1104
 msgid "Join what group:"
 msgstr "Do jakiej grupy przyczy:"
@@ -1040,12 +1040,12 @@
 msgid "Internal Error"
 msgstr "Bd wewntrzny"
 
-#: src/protocols/oscar/oscar.c:1248 src/protocols/oscar/oscar.c:3410
+#: src/protocols/oscar/oscar.c:1248 src/protocols/oscar/oscar.c:3420
 #, c-format
 msgid "Direct IM with %s established"
 msgstr "Ustanowiono bezporedni IM z %s"
 
-#: src/protocols/oscar/oscar.c:1494 src/protocols/oscar/oscar.c:2446
+#: src/protocols/oscar/oscar.c:1504 src/protocols/oscar/oscar.c:2456
 #, c-format
 msgid ""
 "The user %lu has denied your request to add them to your contact list for "
@@ -1056,191 +1056,191 @@
 "uytkownikw z nastpujcego powodu:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:1494 src/protocols/oscar/oscar.c:2446
+#: src/protocols/oscar/oscar.c:1504 src/protocols/oscar/oscar.c:2456
 msgid "No reason given."
 msgstr "Nie podano powodu."
 
-#: src/protocols/oscar/oscar.c:1495 src/protocols/oscar/oscar.c:2447
+#: src/protocols/oscar/oscar.c:1505 src/protocols/oscar/oscar.c:2457
 msgid "Gaim - ICQ Authorization Denied"
 msgstr "Gaim - Odmowa autoryzacji ICQ"
 
-#: src/protocols/oscar/oscar.c:1501 src/protocols/oscar/oscar.c:2453
+#: src/protocols/oscar/oscar.c:1511 src/protocols/oscar/oscar.c:2463
 #, c-format
 msgid "The user %lu has granted your request to add them to your contact list."
 msgstr ""
 "Uytkownik %lu zaakceptowa Twoj prob o dodanie go do Twojej listy "
 "uytkownikw."
 
-#: src/protocols/oscar/oscar.c:1502 src/protocols/oscar/oscar.c:2454
+#: src/protocols/oscar/oscar.c:1512 src/protocols/oscar/oscar.c:2464
 msgid "Gaim - ICQ Authorization Granted"
 msgstr "Gaim - Zaakceptowano autoryzacj ICQ"
 
-#: src/protocols/oscar/oscar.c:1575
+#: src/protocols/oscar/oscar.c:1585
 #, c-format
 msgid "You missed %d message from %s because it was invalid."
 msgstr "Opucie %d wiadomo od %s poniewa bya ona niepoprawna."
 
-#: src/protocols/oscar/oscar.c:1576
+#: src/protocols/oscar/oscar.c:1586
 #, c-format
 msgid "You missed %d messages from %s because they were invalid."
 msgstr "Opucie %d wiadomoci od %s poniewa byy one niepoprawne."
 
-#: src/protocols/oscar/oscar.c:1585
+#: src/protocols/oscar/oscar.c:1595
 #, c-format
 msgid "You missed %d message from %s because it was too large."
 msgstr "Opucie %d wiadomo od %s poniewa bya ona zbyt dua."
 
-#: src/protocols/oscar/oscar.c:1586
+#: src/protocols/oscar/oscar.c:1596
 #, c-format
 msgid "You missed %d messages from %s because they were too large."
 msgstr "Opucie %d wiadomoci od %s poniewa byy one zbyt due."
 
-#: src/protocols/oscar/oscar.c:1595
+#: src/protocols/oscar/oscar.c:1605
 #, c-format
 msgid "You missed %d message from %s because the rate limit has been exceeded."
 msgstr "Opucie %d wiadomo od %s poniewa przekroczono limit szybkoci."
 
-#: src/protocols/oscar/oscar.c:1596
+#: src/protocols/oscar/oscar.c:1606
 #, c-format
 msgid ""
 "You missed %d messages from %s because the rate limit has been exceeded."
 msgstr "Opucie %d wiadomoci od %s poniewa przekroczono limit szybkoci."
 
-#: src/protocols/oscar/oscar.c:1605
+#: src/protocols/oscar/oscar.c:1615
 #, c-format
 msgid "You missed %d message from %s because it was too evil."
 msgstr "Opucie %d wiadomo od %s poniewa bya ona zbyt okrutna."
 
-#: src/protocols/oscar/oscar.c:1606
+#: src/protocols/oscar/oscar.c:1616
 #, c-format
 msgid "You missed %d messages from %s because they are too evil."
 msgstr "Opucie %d wiadomoci od %s poniewa byy one zbyt okrutne."
 
-#: src/protocols/oscar/oscar.c:1615
+#: src/protocols/oscar/oscar.c:1625
 #, c-format
 msgid "You missed %d message from %s because you are too evil."
 msgstr "Opucie %d wiadomo od %s poniewa jeste zbyt okrutny."
 
-#: src/protocols/oscar/oscar.c:1616
+#: src/protocols/oscar/oscar.c:1626
 #, c-format
 msgid "You missed %d messages from %s because you are too evil."
 msgstr "Opucie %d wiadomoci od %s poniewa jeste zbyt okrutny."
 
-#: src/protocols/oscar/oscar.c:1624
+#: src/protocols/oscar/oscar.c:1634
 #, c-format
 msgid "You missed %d message from %s for unknown reasons."
 msgstr "Opucie %d wiadomo od %s z nieznanych powodw."
 
-#: src/protocols/oscar/oscar.c:1625
+#: src/protocols/oscar/oscar.c:1635
 #, c-format
 msgid "You missed %d messages from %s for unknown reasons."
 msgstr "Opucie %d wiadomoci od %s z nieznanych powodw."
 
-#: src/dialogs.c:3076 src/dialogs.c:3082 src/protocols/oscar/oscar.c:1630
-#: src/protocols/oscar/oscar.c:1745 src/protocols/oscar/oscar.c:1763
-#: src/protocols/oscar/oscar.c:2216 src/protocols/yahoo/yahoo.c:594
+#: src/dialogs.c:3076 src/dialogs.c:3082 src/protocols/oscar/oscar.c:1640
+#: src/protocols/oscar/oscar.c:1755 src/protocols/oscar/oscar.c:1773
+#: src/protocols/oscar/oscar.c:2226 src/protocols/yahoo/yahoo.c:594
 msgid "Gaim - Error"
 msgstr "Gaim - Bd"
 
-#: src/protocols/oscar/oscar.c:1693
+#: src/protocols/oscar/oscar.c:1703
 #, c-format
 msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR>%s<BR>"
 msgstr "<B>UIN:</B> %s<BR><B>Stan:</B> %s<BR><HR><BR>%s<BR>"
 
-#: src/protocols/oscar/oscar.c:1695
+#: src/protocols/oscar/oscar.c:1705
 #, c-format
 msgid "<B>Status:</B> %s<BR><HR><BR>%s<BR>"
 msgstr "<B>Stan:</B> %s<BR><HR><BR>%s<BR>"
 
-#: src/protocols/oscar/oscar.c:1724
+#: src/protocols/oscar/oscar.c:1734
 #, c-format
 msgid "SNAC threw error: %s\n"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1726
+#: src/protocols/oscar/oscar.c:1736
 msgid "Gaim - Oscar SNAC Error"
 msgstr "Gaim - Bd Oscar SNAC"
 
-#: src/protocols/oscar/oscar.c:1743
+#: src/protocols/oscar/oscar.c:1753
 #, c-format
 msgid "Your message to %s did not get sent: %s"
 msgstr "Twoja wiadomo do %s nie zostaa wysana: %s"
 
-#: src/protocols/oscar/oscar.c:1744 src/protocols/oscar/oscar.c:1762
+#: src/protocols/oscar/oscar.c:1754 src/protocols/oscar/oscar.c:1772
 msgid "Reason unknown"
 msgstr "Powd nieznany"
 
-#: src/protocols/oscar/oscar.c:1761
+#: src/protocols/oscar/oscar.c:1771
 #, c-format
 msgid "User information for %s unavailable: %s"
 msgstr "Informacja uytkownika dla %s niedostpna: %s"
 
-#: src/buddy.c:2131 src/protocols/oscar/oscar.c:1792
+#: src/buddy.c:2131 src/protocols/oscar/oscar.c:1802
 msgid "Buddy Icon"
 msgstr "Ikona kupla"
 
-#: src/buddy.c:2134 src/protocols/oscar/oscar.c:1795
+#: src/buddy.c:2134 src/protocols/oscar/oscar.c:1805
 msgid "Voice"
 msgstr "Gos"
 
-#: src/buddy.c:2137 src/protocols/oscar/oscar.c:1798
+#: src/buddy.c:2137 src/protocols/oscar/oscar.c:1808
 msgid "IM Image"
 msgstr "Obraz IM"
 
-#: src/buddy.c:498 src/buddy.c:2140 src/buddy.c:2581 src/prefs.c:2916
-#: src/protocols/oscar/oscar.c:1801
+#: src/buddy.c:498 src/buddy.c:2140 src/buddy.c:2581 src/prefs.c:2926
+#: src/protocols/oscar/oscar.c:1811
 msgid "Chat"
 msgstr "Czat"
 
-#: src/buddy.c:2143 src/protocols/oscar/oscar.c:1804
+#: src/buddy.c:2143 src/protocols/oscar/oscar.c:1814
 msgid "Get File"
 msgstr "Pobierz plik"
 
-#: src/buddy.c:2146 src/protocols/oscar/oscar.c:1807
+#: src/buddy.c:2146 src/protocols/oscar/oscar.c:1817
 msgid "Send File"
 msgstr "Wylij plik"
 
-#: src/buddy.c:2150 src/protocols/oscar/oscar.c:1811
+#: src/buddy.c:2150 src/protocols/oscar/oscar.c:1821
 msgid "Games"
 msgstr "Gry"
 
-#: src/buddy.c:2153 src/protocols/oscar/oscar.c:1814
+#: src/buddy.c:2153 src/protocols/oscar/oscar.c:1824
 msgid "Stocks"
 msgstr "Zapasy"
 
-#: src/buddy.c:2156 src/protocols/oscar/oscar.c:1817
+#: src/buddy.c:2156 src/protocols/oscar/oscar.c:1827
 msgid "Send Buddy List"
 msgstr "Wylij list kumpli"
 
-#: src/buddy.c:2159 src/protocols/oscar/oscar.c:1820
+#: src/buddy.c:2159 src/protocols/oscar/oscar.c:1830
 msgid "EveryBuddy Bug"
 msgstr "Bd EveryBuddy"
 
-#: src/buddy.c:2162 src/protocols/oscar/oscar.c:1823
+#: src/buddy.c:2162 src/protocols/oscar/oscar.c:1833
 msgid "AP User"
 msgstr "Uytkownik AP"
 
-#: src/buddy.c:2165 src/protocols/oscar/oscar.c:1826
+#: src/buddy.c:2165 src/protocols/oscar/oscar.c:1836
 msgid "ICQ RTF"
 msgstr "Icq RTF"
 
-#: src/buddy.c:2168 src/protocols/oscar/oscar.c:1829
+#: src/buddy.c:2168 src/protocols/oscar/oscar.c:1839
 msgid "Nihilist"
 msgstr "Nihilist"
 
-#: src/buddy.c:2171 src/protocols/oscar/oscar.c:1832
+#: src/buddy.c:2171 src/protocols/oscar/oscar.c:1842
 msgid "ICQ Server Relay"
 msgstr "Serwer przekazujcy ICQ"
 
-#: src/buddy.c:2174 src/protocols/oscar/oscar.c:1835
+#: src/buddy.c:2174 src/protocols/oscar/oscar.c:1845
 msgid "ICQ Unknown"
 msgstr "Nieznany ICQ"
 
-#: src/buddy.c:2177 src/protocols/oscar/oscar.c:1838
+#: src/buddy.c:2177 src/protocols/oscar/oscar.c:1848
 msgid "Trillian Encryption"
 msgstr "Szyfrowanie Trillian"
 
-#: src/protocols/oscar/oscar.c:1876
+#: src/protocols/oscar/oscar.c:1886
 msgid ""
 "<br><BODY BGCOLOR=WHITE><hr><I>Legend:</I><br><br><IMG SRC=\"free_icon.gif"
 "\"> : Normal AIM User<br><IMG SRC=\"aol_icon.gif\"> : AOL User <br><IMG SRC="
@@ -1255,7 +1255,7 @@
 "ActiveBuddy Interactive Agent<br><IMG SRC=\"wireless_icon.gif\"> :  "
 "Uytkownik urzdzenia bezprzewodowego<br>"
 
-#: src/protocols/oscar/oscar.c:1904
+#: src/protocols/oscar/oscar.c:1914
 #, c-format
 msgid ""
 "Username : <B>%s</B>  %s <BR>\n"
@@ -1268,27 +1268,27 @@
 "%s%s%s<BR>\n"
 "<HR><BR>\n"
 
-#: src/protocols/oscar/oscar.c:1936
+#: src/protocols/oscar/oscar.c:1946
 msgid "<i>User has no away message</i>"
 msgstr "<i>Uytkownik nie ma wiadomoci zajtoci</i>"
 
-#: src/protocols/oscar/oscar.c:1948
+#: src/protocols/oscar/oscar.c:1958
 msgid "Client Capabilities: "
 msgstr "Uprawnienia klienta: "
 
-#: src/protocols/oscar/oscar.c:1956
+#: src/protocols/oscar/oscar.c:1966
 msgid "<i>No Information Provided</i>"
 msgstr "<i>Brak podanych informacji</i>"
 
-#: src/protocols/oscar/oscar.c:1979
+#: src/protocols/oscar/oscar.c:1989
 msgid "Your connection may be lost."
 msgstr "Twoje poczenie moe by utracone."
 
-#: src/protocols/oscar/oscar.c:1980
+#: src/protocols/oscar/oscar.c:1990
 msgid "AOL error"
 msgstr "Bd AOL"
 
-#: src/protocols/oscar/oscar.c:2215
+#: src/protocols/oscar/oscar.c:2225
 msgid ""
 "The last message was not sent because you are over the rate limit. Please "
 "wait 10 seconds and try again."
@@ -1296,15 +1296,15 @@
 "Ostatnia wiadomo nie zostaa wysana poniewa przekroczye limit "
 "prdkoci. Zaczekaj 10 sekund i sprbuj ponownie."
 
-#: src/dialogs.c:3604 src/protocols/oscar/oscar.c:2579
-#: src/protocols/oscar/oscar.c:3531 src/protocols/toc/toc.c:1564
+#: src/dialogs.c:3604 src/protocols/oscar/oscar.c:2589
+#: src/protocols/oscar/oscar.c:3541 src/protocols/toc/toc.c:1564
 #: src/protocols/toc/toc.c:1581 src/protocols/toc/toc.c:1641
 #: src/protocols/toc/toc.c:1683 src/protocols/toc/toc.c:1802
 #: src/protocols/toc/toc.c:1832 src/protocols/toc/toc.c:1888
 msgid "Error"
 msgstr "Bd"
 
-#: src/protocols/oscar/oscar.c:3182
+#: src/protocols/oscar/oscar.c:3192
 #, c-format
 msgid ""
 "The maximum number of buddies allowed in your buddy list is %d, and you have "
@@ -1314,19 +1314,19 @@
 "Dopki przekraczasz limit niektrzy kolesie nie bd pokazywani jako "
 "dostpni."
 
-#: src/protocols/oscar/oscar.c:3185
+#: src/protocols/oscar/oscar.c:3195
 msgid "Gaim - Warning"
 msgstr "Gaim - Ostrzeenie"
 
-#: src/protocols/oscar/oscar.c:3203 src/protocols/toc/toc.c:1108
+#: src/protocols/oscar/oscar.c:3213 src/protocols/toc/toc.c:1108
 msgid "Exchange:"
 msgstr "Wymiana:"
 
-#: src/protocols/oscar/oscar.c:3531
+#: src/protocols/oscar/oscar.c:3541
 msgid "Unable to open Direct IM"
 msgstr "Nie mona otworzy bezporedniego IM"
 
-#: src/protocols/oscar/oscar.c:3541
+#: src/protocols/oscar/oscar.c:3551
 #, c-format
 msgid ""
 "You have selected to open a Direct IM connection with %s. Doing this will "
@@ -1337,7 +1337,7 @@
 "zobaczy twj adres IP i moe to by ryzykiem zabezpiecze. Czy chcesz "
 "kontynuowa?"
 
-#: src/protocols/oscar/oscar.c:3558
+#: src/protocols/oscar/oscar.c:3568
 #, c-format
 msgid ""
 "<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR><I>Remote client does not "
@@ -1346,7 +1346,7 @@
 "<B>UIN:</B> %s<BR><B>Stan:</B> %s<BR><HR><BR><I>Zdalny klient nie potrafi "
 "wysya wiadomoci o stanie.</I><BR>"
 
-#: src/protocols/oscar/oscar.c:3565
+#: src/protocols/oscar/oscar.c:3575
 #, c-format
 msgid ""
 "<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR><I>User has no status message."
@@ -1355,15 +1355,15 @@
 "<B>UIN:</B> %s<BR><B>Stan:</B> %s<BR><HR><BR><I>Uytkownik nie ma wiadomoci "
 "o stanie.</I><BR>"
 
-#: src/protocols/oscar/oscar.c:3590
+#: src/protocols/oscar/oscar.c:3600
 msgid "Get Status Msg"
 msgstr "Pobierz wiadomo o stanie"
 
-#: src/protocols/oscar/oscar.c:3603
+#: src/protocols/oscar/oscar.c:3613
 msgid "Direct IM"
 msgstr "Bezporednia IM"
 
-#: src/protocols/oscar/oscar.c:3611
+#: src/protocols/oscar/oscar.c:3621
 msgid "Get Capabilities"
 msgstr "Pobierz uprawnienia: "
 
@@ -1694,7 +1694,7 @@
 msgid "About"
 msgstr "O ..."
 
-#: src/aim.c:358 src/prefs.c:1621 src/prefs.c:1895
+#: src/aim.c:358 src/prefs.c:1633 src/prefs.c:1905
 msgid "Options"
 msgstr "Opcje"
 
@@ -1935,7 +1935,7 @@
 msgid "About Gaim"
 msgstr "O Gaim"
 
-#: src/buddy.c:2807 src/prefs.c:2895
+#: src/buddy.c:2807 src/prefs.c:2905
 msgid "Buddy List"
 msgstr "Lista kumpli"
 
@@ -1990,7 +1990,7 @@
 msgid "Buddy"
 msgstr "Kole"
 
-#: src/buddy_chat.c:417 src/prefs.c:1994
+#: src/buddy_chat.c:417 src/prefs.c:2004
 msgid "Message"
 msgstr "Wiadomo"
 
@@ -2093,7 +2093,7 @@
 msgid "Setting position to %d\n"
 msgstr "Ustawianie pozycji na %d\n"
 
-#: src/conversation.c:2170 src/prefs.c:1307
+#: src/conversation.c:2170 src/prefs.c:1308
 msgid "Bold Text"
 msgstr "Tekst pogrubiony"
 
@@ -2109,7 +2109,7 @@
 msgid "Italics"
 msgstr "Pochylenie"
 
-#: src/conversation.c:2178 src/prefs.c:1319
+#: src/conversation.c:2178 src/prefs.c:1320
 msgid "Underline Text"
 msgstr "Tekst podkrelony"
 
@@ -2117,7 +2117,7 @@
 msgid "Underline"
 msgstr "Podkrelenie"
 
-#: src/conversation.c:2183 src/prefs.c:1325
+#: src/conversation.c:2183 src/prefs.c:1326
 msgid "Strike through Text"
 msgstr "Tekst przekrelony"
 
@@ -2157,7 +2157,7 @@
 msgid "Font"
 msgstr "Czcionka"
 
-#: src/conversation.c:2206 src/prefs.c:1355
+#: src/conversation.c:2206 src/prefs.c:1356
 msgid "Text Color"
 msgstr "Kolor tekstu"
 
@@ -2165,7 +2165,7 @@
 msgid "Color"
 msgstr "Kolor"
 
-#: src/conversation.c:2211 src/prefs.c:1373
+#: src/conversation.c:2211 src/prefs.c:1374
 msgid "Background Color"
 msgstr "Kolor ta"
 
@@ -2665,7 +2665,7 @@
 msgid "Browse"
 msgstr "Przegldaj"
 
-#: src/multi.c:513 src/prefs.c:1547
+#: src/multi.c:513 src/prefs.c:1548
 msgid "Reset"
 msgstr "Zeruj"
 
@@ -2838,9 +2838,9 @@
 msgid "General Options"
 msgstr "Opcje oglne"
 
-#: src/prefs.c:200 src/prefs.c:383 src/prefs.c:551 src/prefs.c:666
-#: src/prefs.c:920 src/prefs.c:1070 src/prefs.c:1295 src/prefs.c:1617
-#: src/prefs.c:1891 src/prefs.c:2324
+#: src/prefs.c:200 src/prefs.c:384 src/prefs.c:552 src/prefs.c:667
+#: src/prefs.c:921 src/prefs.c:1071 src/prefs.c:1296 src/prefs.c:1629
+#: src/prefs.c:1901 src/prefs.c:2334
 msgid "All options take effect immediately unless otherwise noted."
 msgstr "Wszystkie opcje dziaaj od razu, chyba, e napisano inaczej."
 
@@ -2914,8 +2914,8 @@
 msgstr "Przegldarka"
 
 #: src/prefs.c:291
-msgid "KFM"
-msgstr "KFM"
+msgid "Konqueror"
+msgstr ""
 
 #: src/prefs.c:292
 msgid "Opera"
@@ -2925,28 +2925,32 @@
 msgid "Netscape"
 msgstr "Netscape"
 
-#: src/prefs.c:296
+#: src/prefs.c:294
+msgid "Mozilla"
+msgstr ""
+
+#: src/prefs.c:297
 msgid "Pop up new window by default"
 msgstr "Domylnie otwieraj nowe okno"
 
-#: src/prefs.c:303
+#: src/prefs.c:304
 msgid "GNOME URL Handler"
 msgstr "Obsuga URL przez Gnome"
 
-#: src/prefs.c:305
+#: src/prefs.c:306
 msgid "Galeon"
 msgstr "Galeon"
 
-#: src/prefs.c:306
+#: src/prefs.c:307
 #, c-format
 msgid "Manual (%s for URL)"
 msgstr "Rcznie (%s dla URL)"
 
-#: src/prefs.c:375
+#: src/prefs.c:376
 msgid "Proxy Options"
 msgstr "Opcje proxy"
 
-#: src/prefs.c:387
+#: src/prefs.c:388
 msgid ""
 "Not all protocols can use these proxy options. Please see the README file "
 "for details."
@@ -2954,375 +2958,375 @@
 "Nie wszystkie protokoy mog uywa proxy. Przeczytaj plik README by "
 "dowiedzie si szczegw"
 
-#: src/prefs.c:392
+#: src/prefs.c:393
 msgid "Proxy Type"
 msgstr "Typ proxy"
 
-#: src/prefs.c:404
+#: src/prefs.c:405
 msgid "Proxy Server"
 msgstr "Serwer proxy"
 
-#: src/prefs.c:407
+#: src/prefs.c:408
 msgid "No Proxy"
 msgstr "Bez proxy"
 
-#: src/prefs.c:419
+#: src/prefs.c:420
 msgid "SOCKS 4"
 msgstr "Socks 4"
 
-#: src/prefs.c:429
+#: src/prefs.c:430
 msgid "SOCKS 5"
 msgstr "Socks 5"
 
-#: src/prefs.c:438
+#: src/prefs.c:439
 msgid "HTTP"
 msgstr "HTTP"
 
-#: src/prefs.c:462
+#: src/prefs.c:463
 msgid "Host"
 msgstr "Serwer"
 
-#: src/prefs.c:478
+#: src/prefs.c:479
 msgid "Port"
 msgstr "Port"
 
-#: src/prefs.c:495
+#: src/prefs.c:496
 msgid "User"
 msgstr "Uytkownik"
 
-#: src/prefs.c:511
+#: src/prefs.c:512
 msgid "Password"
 msgstr "Haso"
 
-#: src/prefs.c:543
+#: src/prefs.c:544
 msgid "Buddy List Options"
 msgstr "Opcje listy kumpli"
 
-#: src/prefs.c:555
+#: src/prefs.c:556
 msgid "Buddy List Window"
 msgstr "Okno listy kumpli"
 
-#: src/prefs.c:568
+#: src/prefs.c:569
 msgid "Tab Placement:"
 msgstr "Ustawienie zakadek"
 
-#: src/prefs.c:572 src/prefs.c:1003 src/prefs.c:1153
+#: src/prefs.c:573 src/prefs.c:1004 src/prefs.c:1154
 msgid "Top"
 msgstr "Gra"
 
-#: src/prefs.c:573 src/prefs.c:1005 src/prefs.c:1155
+#: src/prefs.c:574 src/prefs.c:1006 src/prefs.c:1156
 msgid "Bottom"
 msgstr "D"
 
-#: src/prefs.c:585
+#: src/prefs.c:586
 msgid "Hide IM/Info/Chat buttons"
 msgstr "Ukryj przyciski IM/Info/Czat"
 
-#: src/prefs.c:587
+#: src/prefs.c:588
 msgid "Automatically show buddy list on sign on"
 msgstr "Automatycznie poka po zapisaniu si list kumpli"
 
-#: src/prefs.c:589
+#: src/prefs.c:590
 msgid "Display Buddy List near applet"
 msgstr "Poka list kumpli blisko apletu"
 
-#: src/prefs.c:592
+#: src/prefs.c:593
 msgid "Save Window Size/Position"
 msgstr "Zapisz wielko/pozycj okna"
 
-#: src/prefs.c:595
+#: src/prefs.c:596
 msgid "Show pictures on buttons"
 msgstr "Poka obrazki na przyciskach"
 
-#: src/prefs.c:599
+#: src/prefs.c:600
 msgid "Raise Buddy List on Signons and Signoffs"
 msgstr "Poka list kumpli przy logowaniach i wylogowaniach"
 
-#: src/prefs.c:601
+#: src/prefs.c:602
 msgid "Group Displays"
 msgstr "Ekrany grup"
 
-#: src/prefs.c:613
+#: src/prefs.c:614
 msgid "Hide groups with no online buddies"
 msgstr "Ukryj grupy bez dostpnych kumpli"
 
-#: src/prefs.c:619
+#: src/prefs.c:620
 msgid "Show numbers in groups"
 msgstr "Poka liczby w grupach"
 
-#: src/prefs.c:621
+#: src/prefs.c:622
 msgid "Buddy Displays"
 msgstr "Ekrany kumpli"
 
-#: src/prefs.c:633
+#: src/prefs.c:634
 msgid "Show buddy type icons"
 msgstr "Poka ikony typu kumpli"
 
-#: src/prefs.c:634
+#: src/prefs.c:635
 msgid "Show warning levels"
 msgstr "Poka poziomy ostrzee"
 
-#: src/prefs.c:640
-msgid "Show idle times"
-msgstr "Poka czasy bezczynnoci"
-
 #: src/prefs.c:641
+msgid "Show idle times"
+msgstr "Poka czasy bezczynnoci"
+
+#: src/prefs.c:642
 msgid "Grey idle buddies"
 msgstr "Bezczynni kumple w szarym kolorze"
 
-#: src/prefs.c:658
+#: src/prefs.c:659
 msgid "Conversation Options"
 msgstr "Opcje rozmw"
 
-#: src/prefs.c:670
+#: src/prefs.c:671
 msgid "Keyboard Options"
 msgstr "Opcje klawiatury"
 
-#: src/prefs.c:682
+#: src/prefs.c:683
 msgid "Enter sends message"
 msgstr "Enter wysya wiadomo"
 
-#: src/prefs.c:683
+#: src/prefs.c:684
 msgid "Control-Enter sends message"
 msgstr "Control-Enter wysya wiadomo"
 
-#: src/prefs.c:684
-msgid "Escape closes window"
-msgstr "Escape zamyka okno"
-
 #: src/prefs.c:685
+msgid "Escape closes window"
+msgstr "Escape zamyka okno"
+
+#: src/prefs.c:686
 msgid "Control-W closes window"
 msgstr "Control-W zamyka okno"
 
-#: src/prefs.c:691
+#: src/prefs.c:692
 msgid "Control-{B/I/U/S} inserts HTML tags"
 msgstr "Control-[B/I/U/S] wstawia tagi HTML"
 
-#: src/prefs.c:692
+#: src/prefs.c:693
 msgid "Control-(number) inserts smileys"
 msgstr "Control-(liczba) wstawia twarzyczki :-)"
 
-#: src/prefs.c:693
+#: src/prefs.c:694
 msgid "F2 toggles timestamp display"
 msgstr "F2 przecza wywietlanie znacznika czasu"
 
-#: src/prefs.c:695
+#: src/prefs.c:696
 msgid "Display and General Options"
 msgstr "Ekran i Opcje oglne"
 
-#: src/prefs.c:707
+#: src/prefs.c:708
 msgid "Show graphical smileys"
 msgstr "Poka graficzne twarzyczki ;-)"
 
-#: src/prefs.c:708
+#: src/prefs.c:709
 msgid "Show timestamp on messages"
 msgstr "Poka znaczniki czasu wiadomoci"
 
-#: src/prefs.c:709
+#: src/prefs.c:710
 msgid "Show URLs as links"
 msgstr "Poka URLe jako linki"
 
-#: src/prefs.c:710
+#: src/prefs.c:711
 msgid "Highlight misspelled words"
 msgstr "Podwietlaj le napisane sowa"
 
-#: src/prefs.c:711 src/prefs.c:1913
+#: src/prefs.c:712 src/prefs.c:1923
 msgid "Sending messages removes away status"
 msgstr "Wysanie wiadomoci usuwa stan Zajty"
 
-#: src/prefs.c:712 src/prefs.c:1926
+#: src/prefs.c:713 src/prefs.c:1936
 msgid "Queue new messages when away"
 msgstr "Kolejkuj nowe wiadomoci gdy zajty"
 
-#: src/prefs.c:718
-msgid "Ignore colors"
-msgstr "Ignoruj kolory"
-
 #: src/prefs.c:719
+msgid "Ignore colors"
+msgstr "Ignoruj kolory"
+
+#: src/prefs.c:720
 msgid "Ignore font faces"
 msgstr "Ignoruj krj czcionki"
 
-#: src/prefs.c:720
-msgid "Ignore font sizes"
-msgstr "Ignoruj wielkoci czcionki"
-
 #: src/prefs.c:721
+msgid "Ignore font sizes"
+msgstr "Ignoruj wielkoci czcionki"
+
+#: src/prefs.c:722
 msgid "Ignore TiK Automated Messages"
 msgstr "Ignoruj automatyzowane wiadomoci TIK"
 
-#: src/prefs.c:722 src/prefs.c:1911
+#: src/prefs.c:723 src/prefs.c:1921
 msgid "Ignore new conversations when away"
 msgstr "Ignoruj nowe rozmowy gdy zajty"
 
-#: src/prefs.c:911
+#: src/prefs.c:912
 msgid "IM Options"
 msgstr "Opcje IM"
 
-#: src/prefs.c:924 src/prefs.c:2911
+#: src/prefs.c:925 src/prefs.c:2921
 msgid "IM Window"
 msgstr "Okno IM"
 
-#: src/prefs.c:940 src/prefs.c:1090
+#: src/prefs.c:941 src/prefs.c:1091
 msgid "Show buttons as: "
 msgstr "Poka przyciski jako: "
 
-#: src/prefs.c:944 src/prefs.c:1095
+#: src/prefs.c:945 src/prefs.c:1096
 msgid "Pictures And Text"
 msgstr "Obrazki i tekst"
 
-#: src/prefs.c:945 src/prefs.c:1097
+#: src/prefs.c:946 src/prefs.c:1098
 msgid "Pictures"
 msgstr "Obrazki"
 
-#: src/prefs.c:946 src/prefs.c:1098
+#: src/prefs.c:947 src/prefs.c:1099
 msgid "Text"
 msgstr "Tekst"
 
-#: src/prefs.c:957
+#: src/prefs.c:958
 msgid "Show all conversations in one tabbed window"
 msgstr "Poka wszystkie rozmowy w jednym oknie z zakadkami"
 
-#: src/prefs.c:959
+#: src/prefs.c:960
 msgid "Show chats in the same tabbed window"
 msgstr "Poka wszystkie czaty w jednym oknie z zakadkami"
 
-#: src/prefs.c:966 src/prefs.c:1118
+#: src/prefs.c:967 src/prefs.c:1119
 msgid "Raise windows on events"
 msgstr "Powiksz okno przy zdarzeniach"
 
-#: src/prefs.c:967
+#: src/prefs.c:968
 msgid "Show logins in window"
 msgstr "Poka logowania w oknie"
 
-#: src/prefs.c:968
+#: src/prefs.c:969
 msgid "Show aliases in tabs/titles/ticker"
 msgstr "Pokazuj aliasy w zakadkach/tytuach/wskaniku"
 
-#: src/prefs.c:969
+#: src/prefs.c:970
 msgid "Hide window on send"
 msgstr "Ukryj okno przy wysyaniu"
 
-#: src/prefs.c:971 src/prefs.c:1121
+#: src/prefs.c:972 src/prefs.c:1122
 msgid "Window Sizes"
 msgstr "Wielkoci okna"
 
-#: src/prefs.c:979 src/prefs.c:1129
+#: src/prefs.c:980 src/prefs.c:1130
 msgid "New window width:"
 msgstr "Szeroko nowego okna:"
 
-#: src/prefs.c:980 src/prefs.c:1130
+#: src/prefs.c:981 src/prefs.c:1131
 msgid "New window height:"
 msgstr "Wysoko nowego okna:"
 
-#: src/prefs.c:981 src/prefs.c:1131
+#: src/prefs.c:982 src/prefs.c:1132
 msgid "Entry widget height:"
 msgstr "Wprowad wysoko widgetu"
 
-#: src/prefs.c:983 src/prefs.c:1133
+#: src/prefs.c:984 src/prefs.c:1134
 msgid "Tab Placement"
 msgstr "Ustawienie zakadek"
 
-#: src/prefs.c:1012 src/prefs.c:1162
+#: src/prefs.c:1013 src/prefs.c:1163
 msgid "Left"
 msgstr "Lewo"
 
-#: src/prefs.c:1014 src/prefs.c:1164
+#: src/prefs.c:1015 src/prefs.c:1165
 msgid "Right"
 msgstr "Prawo"
 
-#: src/prefs.c:1018
+#: src/prefs.c:1019
 msgid "Buddy Icons"
 msgstr "Ikony kumpla"
 
-#: src/prefs.c:1030
+#: src/prefs.c:1031
 msgid "Hide Buddy Icons"
 msgstr "Ukryj ikony kumpla"
 
-#: src/prefs.c:1036
+#: src/prefs.c:1037
 msgid "Disable Buddy Icon Animation"
 msgstr "Wycz animacj ikon kumpli"
 
-#: src/prefs.c:1062
+#: src/prefs.c:1063
 msgid "Chat Options"
 msgstr "Opcje czatu"
 
-#: src/prefs.c:1074
+#: src/prefs.c:1075
 msgid "Group Chat Window"
 msgstr "Okno grupy czatu"
 
-#: src/prefs.c:1109
+#: src/prefs.c:1110
 msgid "Show all chats in one tabbed window"
 msgstr "Poka wszystkie czaty w jednym oknie z zakadkami"
 
-#: src/prefs.c:1111
+#: src/prefs.c:1112
 msgid "Show conversations in the same tabbed window"
 msgstr "Poka wszystkie rozmowy w jednym oknie z zakadkami"
 
-#: src/prefs.c:1119
+#: src/prefs.c:1120
 msgid "Show people joining/leaving in window"
 msgstr "Poka ludzi przyczajcych si/wychodzcych w oknie"
 
-#: src/prefs.c:1167
+#: src/prefs.c:1168
 msgid "Tab Completion"
 msgstr "Uzupenianie tab"
 
-#: src/prefs.c:1179
+#: src/prefs.c:1180
 msgid "Tab-Complete Nicks"
 msgstr "Uzupenianie nickw tabulatorem"
 
-#: src/prefs.c:1185
+#: src/prefs.c:1186
 msgid "Old-Style Tab Completion"
 msgstr "Uzupenianie tab w starym stylu"
 
-#: src/prefs.c:1287 src/prefs.c:2921
+#: src/prefs.c:1288 src/prefs.c:2931
 msgid "Font Options"
 msgstr "Opcje czcionki"
 
-#: src/prefs.c:1313
+#: src/prefs.c:1314
 msgid "Italic Text"
 msgstr "Pochylony tekst"
 
-#: src/prefs.c:1357 src/prefs.c:1375 src/prefs.c:1397
+#: src/prefs.c:1358 src/prefs.c:1376 src/prefs.c:1398
 msgid "Select"
 msgstr "Wybierz"
 
-#: src/prefs.c:1395
+#: src/prefs.c:1396
 msgid "Font Face for Text"
 msgstr "Krj czcionki tekstu"
 
-#: src/prefs.c:1410
+#: src/prefs.c:1411
 msgid "Font Size for Text"
 msgstr "Wielko czcionki tekstu"
 
-#: src/prefs.c:1507
+#: src/prefs.c:1508
 msgid "Gaim - Sound Configuration"
 msgstr "Gaim - konfiguracja dwiku"
 
-#: src/prefs.c:1542
+#: src/prefs.c:1543
 msgid "Test"
 msgstr "Test"
 
-#: src/prefs.c:1552
+#: src/prefs.c:1553
 msgid "Choose..."
 msgstr "Wybierz..."
 
-#: src/prefs.c:1609
+#: src/prefs.c:1621
 msgid "Sound Options"
 msgstr "Opcje dwiku"
 
-#: src/prefs.c:1637
+#: src/prefs.c:1649
 msgid "No sounds when you log in"
 msgstr "Bez dwikw gdy si logujesz"
 
-#: src/prefs.c:1643 src/prefs.c:1912
+#: src/prefs.c:1655 src/prefs.c:1922
 msgid "Sounds while away"
 msgstr "Dwiki podczas zajtoci"
 
-#: src/prefs.c:1653
+#: src/prefs.c:1665
 msgid "Sound method"
 msgstr "Sposb odgrywania"
 
-#: src/prefs.c:1727
+#: src/prefs.c:1739
 #, c-format
 msgid ""
 "Sound command\n"
@@ -3331,103 +3335,103 @@
 "Polecenie odegrania plikw\n"
 "(%s dla nazwy pliku)"
 
-#: src/prefs.c:1739
+#: src/prefs.c:1751
 msgid "Sound played when:"
 msgstr "Dwik odtwarzany gdy:"
 
-#: src/prefs.c:1883 src/prefs.c:2943
+#: src/prefs.c:1893 src/prefs.c:2953
 msgid "Away Messages"
 msgstr "Wiadomoci Zajty"
 
-#: src/prefs.c:1920
+#: src/prefs.c:1930
 msgid "Don't send auto-response"
 msgstr "Nie wysyaj automatycznej odpowiedzi"
 
-#: src/prefs.c:1921
+#: src/prefs.c:1931
 msgid "Only send auto-response when idle"
 msgstr "Wysyaj automatyczn odpowied tylko gdy bezczynny"
 
-#: src/prefs.c:1936
+#: src/prefs.c:1946
 msgid "Time between sending auto-responses (in seconds):"
 msgstr "Czas pomidzy auto-opdowiedziami (w sekundach):"
 
-#: src/prefs.c:1951
+#: src/prefs.c:1961
 msgid "Auto Away after"
 msgstr "Automatycznie Zajty po"
 
-#: src/prefs.c:1965
+#: src/prefs.c:1975
 msgid "minutes using"
 msgstr "minutach uywajc"
 
-#: src/prefs.c:1978
+#: src/prefs.c:1988
 msgid "Messages"
 msgstr "Wiadomoci"
 
-#: src/prefs.c:2035
+#: src/prefs.c:2045
 msgid "Edit"
 msgstr "Edycja"
 
-#: src/prefs.c:2039
+#: src/prefs.c:2049
 msgid "Make Away"
 msgstr "Zrb Zajty"
 
-#: src/prefs.c:2316
+#: src/prefs.c:2326
 msgid "Privacy Options"
 msgstr "Opcje prywatnoci"
 
-#: src/prefs.c:2332
+#: src/prefs.c:2342
 msgid "Set privacy for:"
 msgstr "Ustaw prywatno dla:"
 
-#: src/prefs.c:2351
+#: src/prefs.c:2361
 msgid "Allow all users to contact me"
 msgstr "Pozwl wszystkim uytkownikom na kontakt ze mn"
 
-#: src/prefs.c:2352
+#: src/prefs.c:2362
 msgid "Allow only the users below"
 msgstr "Pozwl tylko uytkownikom poniej"
 
-#: src/prefs.c:2354
+#: src/prefs.c:2364
 msgid "Allow List"
 msgstr "Lista zezwole"
 
-#: src/prefs.c:2385
+#: src/prefs.c:2395
 msgid "Deny all users"
 msgstr "Zabro wszystkim uytkownikom"
 
-#: src/prefs.c:2386
+#: src/prefs.c:2396
 msgid "Block the users below"
 msgstr "Blokuj uytkownikw poniej"
 
-#: src/prefs.c:2388
+#: src/prefs.c:2398
 msgid "Block List"
 msgstr "Lista blokowa"
 
-#: src/prefs.c:2483
+#: src/prefs.c:2493
 msgid "Gaim - Preferences"
 msgstr "Gaim - preferencje"
 
-#: src/prefs.c:2566
+#: src/prefs.c:2576
 msgid "Gaim debug output window"
 msgstr "Gaim okno wyjcia odplukswiania"
 
-#: src/prefs.c:2877
+#: src/prefs.c:2887
 msgid "General"
 msgstr "Oglnie"
 
-#: src/prefs.c:2882
+#: src/prefs.c:2892
 msgid "Proxy"
 msgstr ""
 
-#: src/prefs.c:2906
+#: src/prefs.c:2916
 msgid "Conversations"
 msgstr "Rozmowy"
 
-#: src/prefs.c:2932
+#: src/prefs.c:2942
 msgid "Sounds"
 msgstr "Dwiki"
 
-#: src/prefs.c:2954
+#: src/prefs.c:2964
 msgid "Privacy"
 msgstr "Prywatno"
 
@@ -3536,46 +3540,49 @@
 msgid "More Info"
 msgstr "Wicej informacji"
 
-#: src/sound.c:59
+#: src/sound.c:63
 msgid "Buddy logs in"
 msgstr "Kumpel loguje si"
 
-#: src/sound.c:60
+#: src/sound.c:64
 msgid "Buddy logs out"
 msgstr "Kumpel wylogowuje si"
 
-#: src/sound.c:61
+#: src/sound.c:65
 msgid "Message received"
 msgstr "Odebrano wiadomo"
 
-#: src/sound.c:62
+#: src/sound.c:66
 msgid "Message received begins conversation"
 msgstr "Odebrana wiadomo rozpoczyna rozmow"
 
-#: src/sound.c:63
+#: src/sound.c:67
 msgid "Message sent"
 msgstr "Wiadomo wysana"
 
-#: src/sound.c:64
+#: src/sound.c:68
 msgid "Person enters chat"
 msgstr "Osoba wchodzi na czat"
 
-#: src/sound.c:65
+#: src/sound.c:69
 msgid "Person leaves chat"
 msgstr "Osoba opuszcza czat"
 
-#: src/sound.c:66
+#: src/sound.c:70
 msgid "You talk in chat"
 msgstr "Miwsz na czacie"
 
-#: src/sound.c:67
+#: src/sound.c:71
 msgid "Others talk in chat"
 msgstr "Inni mwi na czacie"
 
-#: src/sound.c:69
+#: src/sound.c:74
 msgid "Someone says your name in chat"
 msgstr "Kto wymawia Twoje imi na czacie"
 
+#~ msgid "KFM"
+#~ msgstr "KFM"
+
 #~ msgid "Enable sounds"
 #~ msgstr "Zacz dwiki"
 
--- a/po/ru.po	Tue Jul 02 05:41:30 2002 +0000
+++ b/po/ru.po	Tue Jul 02 05:42:26 2002 +0000
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gaim 0.48\n"
-"POT-Creation-Date: 2002-04-11 22:46-0700\n"
+"POT-Creation-Date: 2002-06-25 00:10-0400\n"
 "PO-Revision-Date: 2002-03-22 14:05+0300\n"
 "Last-Translator: Grigory Bakunov <black@asplinux.ru>\n"
 "Language-Team: RUSSIAN <RU@li.org>\n"
@@ -13,6 +13,115 @@
 "Content-Type: text/plain; charset=KOI8-R\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: plugins/chatlist.c:67 src/buddy_chat.c:272
+msgid "Buddy Chat"
+msgstr ""
+
+#: plugins/chatlist.c:166 plugins/chatlist.c:168 plugins/chatlist.c:407
+#: plugins/chatlist.c:409
+#, fuzzy
+msgid "Gaim Chat"
+msgstr "Gaim - "
+
+#: plugins/chatlist.c:339 src/about.c:165 src/aim.c:320 src/buddy.c:2716
+#: src/buddy_chat.c:1322 src/buddy_chat.c:1419 src/buddy_chat.c:1449
+#: src/conversation.c:2864 src/dialogs.c:567 src/dialogs.c:3899
+#: src/multi.c:1069 src/plugins.c:277 src/prefs.c:2547 src/prpl.c:438
+#: src/prpl.c:685 src/server.c:1072
+msgid "Close"
+msgstr ""
+
+#: plugins/chatlist.c:344
+#, fuzzy
+msgid "Chat Rooms"
+msgstr " "
+
+#: plugins/chatlist.c:363
+msgid "Refresh"
+msgstr ""
+
+#. Put the buttons in the box
+#: plugins/chatlist.c:364 src/buddy.c:492 src/buddy.c:2827
+#: src/buddy_chat.c:1454 src/conversation.c:2389 src/conversation.c:2879
+#: src/dialogs.c:932 src/dialogs.c:1114 src/dialogs.c:2095 src/multi.c:1053
+#: src/prefs.c:2041 src/prefs.c:2383 src/prefs.c:2417
+msgid "Add"
+msgstr ""
+
+#: plugins/chatlist.c:365 src/buddy.c:494 src/buddy.c:2829
+#: src/buddy_chat.c:1456 src/conversation.c:2375 src/conversation.c:2876
+#: src/prefs.c:2055 src/prefs.c:2387 src/prefs.c:2421
+msgid "Remove"
+msgstr ""
+
+#: plugins/chatlist.c:388
+msgid "List of available chats"
+msgstr ""
+
+#: plugins/chatlist.c:398
+msgid "List of subscribed chats"
+msgstr ""
+
+#: plugins/gtik.c:699
+msgid "Gnome Stock Ticker Properties"
+msgstr ""
+
+#: plugins/gtik.c:711
+msgid "Update Frequency in min"
+msgstr ""
+
+#: plugins/gtik.c:727
+msgid "Enter symbols delimited with \"+\" in the box below."
+msgstr ""
+
+#. OUTPUT FORMAT and SCROLL DIRECTION
+#: plugins/gtik.c:737
+msgid "Check this box to display only symbols and price:"
+msgstr ""
+
+#: plugins/gtik.c:738
+msgid "Check this box to scroll left to right:"
+msgstr ""
+
+#: plugins/gtik.c:974
+#, fuzzy
+msgid "(No"
+msgstr ""
+
+#: plugins/gtik.c:975
+#, fuzzy
+msgid "Change"
+msgstr ":"
+
+#: src/protocols/gg/gg.c:71 src/protocols/msn/msn.c:1919
+msgid "Available"
+msgstr ""
+
+#: src/protocols/gg/gg.c:72
+msgid "Available for friends only"
+msgstr "   "
+
+#: src/applet.c:197 src/buddy.c:497 src/buddy.c:2582 src/buddy.c:2727
+#: src/protocols/gg/gg.c:73 src/protocols/jabber/jabber.c:1118
+msgid "Away"
+msgstr ""
+
+#: src/protocols/gg/gg.c:74
+msgid "Away for friends only"
+msgstr "   "
+
+#: src/protocols/gg/gg.c:75
+msgid "Invisible"
+msgstr ""
+
+#: src/protocols/gg/gg.c:76
+msgid "Invisible for friends only"
+msgstr "   "
+
+#: src/protocols/gg/gg.c:77 src/protocols/jabber/jabber.c:1114
+msgid "Unavailable"
+msgstr ""
+
 #: src/protocols/gg/gg.c:182
 msgid "Unable to resolve hostname."
 msgstr "    ."
@@ -43,7 +152,7 @@
 msgid "Unknown Error Code."
 msgstr "  "
 
-#: src/protocols/gg/gg.c:302
+#: src/protocols/gg/gg.c:302 src/protocols/msn/msn.c:2050
 #, c-format
 msgid "Status: %s"
 msgstr ": %s"
@@ -170,7 +279,7 @@
 msgstr ""
 
 #. Line 5
-#: src/dialogs.c:1582 src/dialogs.c:2290 src/protocols/gg/gg.c:729
+#: src/dialogs.c:1624 src/dialogs.c:2332 src/protocols/gg/gg.c:729
 msgid "City"
 msgstr ""
 
@@ -249,7 +358,12 @@
 msgid "Directory Search"
 msgstr " "
 
-#: src/dialogs.c:1699 src/protocols/gg/gg.c:1160 src/protocols/gg/gg.c:1177
+#.
+#. } else if (!strcmp(act, _("Set Dir Info"))) {
+#. show_set_dir(gc);
+#.
+#: src/dialogs.c:1741 src/protocols/gg/gg.c:1160 src/protocols/gg/gg.c:1177
+#: src/protocols/jabber/jabber.c:3748 src/protocols/jabber/jabber.c:3761
 msgid "Change Password"
 msgstr " "
 
@@ -270,8 +384,8 @@
 msgstr "   "
 
 #: src/protocols/icq/gaim_icq.c:469 src/protocols/irc/irc.c:1851
-#: src/protocols/jabber/jabber.c:2112 src/protocols/oscar/oscar.c:3436
-#: src/protocols/toc/toc.c:1216
+#: src/protocols/jabber/jabber.c:2860 src/protocols/oscar/oscar.c:3593
+#: src/protocols/toc/toc.c:1219
 msgid "Get Info"
 msgstr " "
 
@@ -309,7 +423,7 @@
 "connection?"
 msgstr "%s    DCC chat.    ?"
 
-#: src/protocols/irc/irc.c:1001
+#: src/protocols/irc/irc.c:1001 src/protocols/msn/msn.c:315
 msgid "Unable to write"
 msgstr " "
 
@@ -336,7 +450,7 @@
 msgid "Channel:"
 msgstr ":"
 
-#: src/multi.c:547 src/protocols/irc/irc.c:1675
+#: src/multi.c:549 src/protocols/irc/irc.c:1675
 msgid "Password:"
 msgstr ""
 
@@ -344,305 +458,615 @@
 msgid "DCC Chat"
 msgstr "DCC "
 
-#: src/protocols/jabber/jabber.c:699
-msgid "Unavailable"
-msgstr ""
-
-#: src/applet.c:293 src/buddy.c:493 src/buddy.c:2508 src/buddy.c:2644
-#: src/protocols/jabber/jabber.c:703
-msgid "Away"
-msgstr ""
-
-#: src/buddy.c:2801 src/protocols/jabber/jabber.c:705
-#: src/protocols/jabber/jabber.c:723
+#: src/protocols/jabber/jabber.c:942
+msgid "Incorrect current password! Password NOT Changed!"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:943 src/protocols/jabber/jabber.c:948
+#, fuzzy
+msgid "Password Change Error!"
+msgstr "Gaim -  "
+
+#: src/protocols/jabber/jabber.c:947
+msgid "New password same as old password! Password NOT Changed!"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1092
+#, fuzzy
+msgid "Unknown"
+msgstr " ICQ"
+
+#: src/buddy.c:2887 src/protocols/jabber/jabber.c:1120
+#: src/protocols/jabber/jabber.c:1138
 msgid "Online"
 msgstr " "
 
-#: src/protocols/jabber/jabber.c:707
+#: src/protocols/jabber/jabber.c:1122
 msgid "Extended Away"
 msgstr " \"\""
 
-#: src/protocols/jabber/jabber.c:709
+#: src/protocols/jabber/jabber.c:1124
 msgid "Do Not Disturb"
 msgstr " "
 
-#: src/protocols/jabber/jabber.c:1042
+#: src/protocols/jabber/jabber.c:1434
+#, c-format
+msgid "Error %s: %s"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1437
+#, fuzzy
+msgid "Unknown Error in presence"
+msgstr "  "
+
+#: src/protocols/jabber/jabber.c:1607
+#, fuzzy, c-format
+msgid "The user %s wants to add you to their buddy list."
+msgstr ""
+"\n"
+"\n"
+"   ?"
+
+#: src/protocols/jabber/jabber.c:1632
 #, fuzzy
 msgid "No such user"
 msgstr "  "
 
-#: src/protocols/jabber/jabber.c:1044
+#: src/protocols/jabber/jabber.c:1634 src/protocols/jabber/jabber.c:2341
+#: src/protocols/jabber/jabber.c:2506
 #, fuzzy
 msgid "Jabber Error"
 msgstr " "
 
-#: src/dialogs.c:845 src/protocols/jabber/jabber.c:1124
+#: src/dialogs.c:887 src/protocols/jabber/jabber.c:1719
+#: src/protocols/msn/msn.c:1110
 msgid "Buddies"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1188
+#: src/protocols/jabber/jabber.c:1782
 msgid "Authenticating"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1225
+#: src/protocols/jabber/jabber.c:1819
 msgid "Unknown login error"
 msgstr "  "
 
-#: src/protocols/jabber/jabber.c:1455 src/protocols/jabber/jabber.c:2903
+#: src/protocols/jabber/jabber.c:2010
+#, fuzzy
+msgid "Password successfully changed."
+msgstr "  "
+
+#: src/protocols/jabber/jabber.c:2012
+#, fuzzy
+msgid "Password Change"
+msgstr "Gaim -  "
+
+#: src/protocols/jabber/jabber.c:2054 src/protocols/jabber/jabber.c:3676
 msgid "Connection lost"
 msgstr " "
 
-#: src/protocols/jabber/jabber.c:1457 src/protocols/jabber/jabber.c:1489
-#: src/protocols/jabber/jabber.c:2905 src/protocols/jabber/jabber.c:2951
+#: src/protocols/jabber/jabber.c:2056 src/protocols/jabber/jabber.c:2088
+#: src/protocols/jabber/jabber.c:3678 src/protocols/jabber/jabber.c:3724
+#: src/protocols/msn/msn.c:1741 src/protocols/msn/msn.c:1770
 msgid "Unable to connect"
 msgstr "   "
 
-#: src/protocols/jabber/jabber.c:1463
+#: src/protocols/jabber/jabber.c:2062
 msgid "Connected"
 msgstr "."
 
-#: src/protocols/jabber/jabber.c:1466
+#: src/protocols/jabber/jabber.c:2065
 msgid "Requesting Authentication Method"
 msgstr "  "
 
 #. we have no chats yet
-#: src/protocols/jabber/jabber.c:1484
+#: src/protocols/jabber/jabber.c:2083 src/protocols/msn/msn.c:1762
 msgid "Connecting"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1783
+#: src/protocols/jabber/jabber.c:2340 src/protocols/jabber/jabber.c:2505
+#, fuzzy
+msgid "Invalid Jabber I.D."
+msgstr " "
+
+#: src/protocols/jabber/jabber.c:2473
 msgid "Room:"
 msgstr ":"
 
-#: src/protocols/jabber/jabber.c:1787
+#: src/protocols/jabber/jabber.c:2477
 msgid "Server:"
 msgstr ":"
 
-#: src/protocols/jabber/jabber.c:1792
+#: src/protocols/jabber/jabber.c:2482
 msgid "Handle:"
 msgstr ":"
 
-#: src/protocols/jabber/jabber.c:2062 src/protocols/jabber/jabber.c:2401
+#: src/protocols/jabber/jabber.c:2539
 #, fuzzy
-msgid "Unknown"
-msgstr " ICQ"
-
-#: src/buddy_chat.c:875 src/protocols/jabber/jabber.c:2117
-#: src/protocols/oscar/oscar.c:3443
+msgid "Chats"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:2854
+#, fuzzy
+msgid "View Error Msg"
+msgstr " "
+
+#: src/buddy_chat.c:886 src/protocols/jabber/jabber.c:2865
+#: src/protocols/oscar/oscar.c:3606
 msgid "Get Away Msg"
 msgstr "   "
 
-#: src/protocols/jabber/jabber.c:2299
+#: src/protocols/jabber/jabber.c:2882
+msgid "Remove From Roster"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:3076
 msgid "Full Name"
 msgstr " "
 
-#: src/protocols/jabber/jabber.c:2300
+#: src/protocols/jabber/jabber.c:3077
 msgid "Family Name"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:2301
+#: src/protocols/jabber/jabber.c:3078
 msgid "Given Name"
 msgstr " "
 
-#: src/protocols/jabber/jabber.c:2302
+#: src/protocols/jabber/jabber.c:3079
 msgid "Nickname"
 msgstr ""
 
-#: src/dialogs.c:2483 src/protocols/jabber/jabber.c:2303
+#: src/dialogs.c:2525 src/protocols/jabber/jabber.c:3080
 msgid "URL"
 msgstr "URL"
 
-#: src/protocols/jabber/jabber.c:2304
+#: src/protocols/jabber/jabber.c:3081
 msgid "Street Address"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:2305
+#: src/protocols/jabber/jabber.c:3082
 msgid "Extended Address"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:2306
+#: src/protocols/jabber/jabber.c:3083
 msgid "Locality"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:2307
+#: src/protocols/jabber/jabber.c:3084
 msgid "Region"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:2308
+#: src/protocols/jabber/jabber.c:3085
 msgid "Postal Code"
 msgstr " "
 
 #. Line 7
-#: src/dialogs.c:1604 src/dialogs.c:2312 src/protocols/jabber/jabber.c:2309
+#: src/dialogs.c:1646 src/dialogs.c:2354 src/protocols/jabber/jabber.c:3086
 msgid "Country"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:2310
+#: src/protocols/jabber/jabber.c:3087
 msgid "Telephone"
 msgstr ""
 
-#: src/dialogs.c:2388 src/protocols/jabber/jabber.c:2311
+#: src/dialogs.c:2430 src/protocols/jabber/jabber.c:3088
 msgid "Email"
 msgstr "e-mail"
 
-#: src/protocols/jabber/jabber.c:2312
+#: src/protocols/jabber/jabber.c:3089
 msgid "Organization Name"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:2313
+#: src/protocols/jabber/jabber.c:3090
 msgid "Organization Unit"
 msgstr ""
 
-#: src/prefs.c:1988 src/protocols/jabber/jabber.c:2314
+#: src/prefs.c:2000 src/protocols/jabber/jabber.c:3091
 msgid "Title"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:2315
+#: src/protocols/jabber/jabber.c:3092
 msgid "Role"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:2316
+#: src/protocols/jabber/jabber.c:3093
 msgid "Birthday"
 msgstr " "
 
 #. Right side: frame with description and the filepath of plugin
-#: src/dialogs.c:2491 src/plugins.c:211 src/protocols/jabber/jabber.c:2317
+#: src/dialogs.c:2533 src/plugins.c:211 src/protocols/jabber/jabber.c:3094
 msgid "Description"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:2342
+#: src/protocols/jabber/jabber.c:3119
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable"
 msgstr "   .   ."
 
-#: src/protocols/jabber/jabber.c:2343
+#: src/protocols/jabber/jabber.c:3120
 msgid "User Identity"
 msgstr " "
 
-#: src/protocols/jabber/jabber.c:2759
+#: src/protocols/jabber/jabber.c:3532
 msgid "Gaim - Edit Jabber vCard"
 msgstr "Gaim -  Jabber vCard"
 
-#: src/protocols/jabber/jabber.c:2833
+#: src/protocols/jabber/jabber.c:3606
 msgid "Server Registration successful!"
 msgstr " !"
 
-#: src/protocols/jabber/jabber.c:2860
+#: src/protocols/jabber/jabber.c:3633
 msgid "Unknown registration error"
 msgstr "  "
 
-#: src/protocols/jabber/jabber.c:2969 src/protocols/jabber/jabber.c:2984
+#: src/protocols/jabber/jabber.c:3742 src/protocols/jabber/jabber.c:3757
 msgid "Set User Info"
 msgstr "   "
 
-#: src/protocols/msn/msn.c:719 src/protocols/msn/msn.c:2041
-#: src/protocols/msn/msn.c:2074
+#: src/protocols/msn/msn.c:230
+msgid "Syntax Error (probably a Gaim bug)"
+msgstr ""
+
+#: src/protocols/msn/msn.c:233
+msgid "Invalid Parameter (probably a Gaim bug)"
+msgstr ""
+
+#: src/protocols/msn/msn.c:236
+#, fuzzy
+msgid "Invalid User"
+msgstr " "
+
+#: src/protocols/msn/msn.c:239
+msgid "Fully Qualified Domain Name missing"
+msgstr ""
+
+#: src/protocols/msn/msn.c:242
+msgid "Already Login"
+msgstr ""
+
+#: src/protocols/msn/msn.c:245
+#, fuzzy
+msgid "Invalid Username"
+msgstr " "
+
+#: src/protocols/msn/msn.c:248
+#, fuzzy
+msgid "Invalid Friendly Name"
+msgstr " "
+
+#: src/protocols/msn/msn.c:251
+msgid "List Full"
+msgstr ""
+
+#: src/protocols/msn/msn.c:254
+msgid "Already there"
+msgstr ""
+
+#: src/protocols/msn/msn.c:257
+#, fuzzy
+msgid "Not on list"
+msgstr " "
+
+#: src/protocols/msn/msn.c:260
+msgid "User is offline"
+msgstr ""
+
+#: src/protocols/msn/msn.c:263
+msgid "Already in the mode"
+msgstr ""
+
+#: src/protocols/msn/msn.c:266
+msgid "Already in opposite list"
+msgstr ""
+
+#: src/protocols/msn/msn.c:269
+msgid "Switchboard failed"
+msgstr ""
+
+#: src/protocols/msn/msn.c:272
+msgid "Notify Transfer failed"
+msgstr ""
+
+#: src/protocols/msn/msn.c:276
+msgid "Required fields missing"
+msgstr ""
+
+#: src/protocols/msn/msn.c:279
+#, fuzzy
+msgid "Not logged in"
+msgstr "%s  "
+
+#: src/protocols/msn/msn.c:283
+#, fuzzy
+msgid "Internal server error"
+msgstr " "
+
+#: src/protocols/msn/msn.c:286
+msgid "Database server error"
+msgstr ""
+
+#: src/protocols/msn/msn.c:289
+#, fuzzy
+msgid "File operation error"
+msgstr "  \n"
+
+#: src/protocols/msn/msn.c:292
+#, fuzzy
+msgid "Memory allocation error"
+msgstr "  \n"
+
+#: src/protocols/msn/msn.c:296
+#, fuzzy
+msgid "Server busy"
+msgstr ":"
+
+#: src/protocols/msn/msn.c:299
+#, fuzzy
+msgid "Server unavailable"
+msgstr ""
+
+#: src/protocols/msn/msn.c:302
+msgid "Peer Notification server down"
+msgstr ""
+
+#: src/protocols/msn/msn.c:305
+#, fuzzy
+msgid "Database connect error"
+msgstr "  \n"
+
+#: src/protocols/msn/msn.c:308
+msgid "Server is going down (abandon ship)"
+msgstr ""
+
+#: src/protocols/msn/msn.c:312
+#, fuzzy
+msgid "Error creating connection"
+msgstr "g003:   .\n"
+
+#: src/protocols/msn/msn.c:318
+msgid "Session overload"
+msgstr ""
+
+#: src/protocols/msn/msn.c:321
+msgid "User is too active"
+msgstr ""
+
+#: src/protocols/msn/msn.c:324
+#, fuzzy
+msgid "Too many sessions"
+msgstr "  ."
+
+#: src/protocols/msn/msn.c:327
+msgid "Not expected"
+msgstr ""
+
+#: src/protocols/msn/msn.c:330
+msgid "Bad friend file"
+msgstr ""
+
+#: src/protocols/msn/msn.c:334
+#, fuzzy
+msgid "Authentication failed"
+msgstr " "
+
+#: src/protocols/msn/msn.c:337
+#, fuzzy
+msgid "Not allowed when offline"
+msgstr "   "
+
+#: src/protocols/msn/msn.c:340
+msgid "Not accepting new users"
+msgstr ""
+
+#: src/protocols/msn/msn.c:343
+msgid "User unverified"
+msgstr ""
+
+#: src/protocols/msn/msn.c:346
+#, fuzzy
+msgid "Unknown Error Code"
+msgstr "  "
+
+#: src/protocols/msn/msn.c:351 src/protocols/msn/msn.c:558
+#: src/protocols/msn/msn.c:813 src/protocols/msn/msn.c:2114
+#: src/protocols/msn/msn.c:2283 src/protocols/msn/msn.c:2336
 msgid "MSN Error"
 msgstr " MSN"
 
-#: src/protocols/msn/msn.c:719
+#: src/protocols/msn/msn.c:558
+msgid "A message may not have been received."
+msgstr ""
+
+#: src/protocols/msn/msn.c:813
 msgid "Gaim was unable to send a message"
 msgstr "Gaim   "
 
-#: src/protocols/msn/msn.c:1069
+#: src/protocols/msn/msn.c:917
+#, c-format
+msgid "The user %s (%s) wants to add %s to his or her buddy list."
+msgstr ""
+
+#: src/protocols/msn/msn.c:1074
+#, c-format
+msgid "The user %s (%s) wants to add you to their buddy list"
+msgstr ""
+
+#: src/protocols/msn/msn.c:1175
 msgid "You have been disconnected. You have signed on from another location."
 msgstr "      ."
 
-#: src/protocols/msn/msn.c:2041 src/protocols/msn/msn.c:2074
+#: src/protocols/msn/msn.c:1435 src/protocols/msn/msn.c:1679
+#, fuzzy
+msgid "Error reading from server"
+msgstr "    ."
+
+#: src/protocols/msn/msn.c:1568
+msgid "Requesting to send password"
+msgstr ""
+
+#: src/protocols/msn/msn.c:1618
+#, fuzzy
+msgid "Unable to send password"
+msgstr "   "
+
+#: src/protocols/msn/msn.c:1623
+#, fuzzy
+msgid "Password sent"
+msgstr ""
+
+#: src/protocols/msn/msn.c:1748
+#, fuzzy
+msgid "Unable to write to server"
+msgstr "    ."
+
+#: src/protocols/msn/msn.c:1754
+#, fuzzy
+msgid "Synching with server"
+msgstr "  "
+
+#: src/protocols/msn/msn.c:1920
+msgid "Away From Computer"
+msgstr ""
+
+#: src/protocols/msn/msn.c:1921
+msgid "Be Right Back"
+msgstr ""
+
+#: src/protocols/msn/msn.c:1922
+#, fuzzy
+msgid "Busy"
+msgstr "(UIN)"
+
+#: src/protocols/msn/msn.c:1923
+msgid "On The Phone"
+msgstr ""
+
+#: src/protocols/msn/msn.c:1924
+msgid "Out To Lunch"
+msgstr ""
+
+#: src/protocols/msn/msn.c:1925
+#, fuzzy
+msgid "Hidden"
+msgstr " "
+
+#: src/protocols/msn/msn.c:2041
+msgid "Reset friendly name"
+msgstr ""
+
+#: src/protocols/msn/msn.c:2114
+msgid "Friendly name too long."
+msgstr ""
+
+#: src/protocols/msn/msn.c:2129 src/protocols/msn/msn.c:2150
+#, fuzzy
+msgid "Set Friendly Name"
+msgstr ""
+
+#: src/protocols/msn/msn.c:2130
+#, fuzzy
+msgid "Set Friendly Name:"
+msgstr "UIN"
+
+#: src/protocols/msn/msn.c:2131
+msgid "Reset All Friendly Names"
+msgstr ""
+
+#: src/protocols/msn/msn.c:2283 src/protocols/msn/msn.c:2336
 msgid "Invalid name"
 msgstr " "
 
-#: src/protocols/napster/napster.c:450 src/protocols/oscar/oscar.c:3075
-#: src/protocols/toc/toc.c:1101
+#: src/protocols/napster/napster.c:457 src/protocols/oscar/oscar.c:3209
+#: src/protocols/toc/toc.c:1104
 msgid "Join what group:"
 msgstr "  "
 
-#: src/protocols/oscar/oscar.c:333
+#: src/protocols/oscar/oscar.c:330
 #, c-format
 msgid "Direct IM with %s closed"
 msgstr "   %s "
 
-#: src/protocols/oscar/oscar.c:335
+#: src/protocols/oscar/oscar.c:332
 #, c-format
 msgid "Direct IM with %s failed"
 msgstr "   %s "
 
-#: src/protocols/oscar/oscar.c:373
+#: src/protocols/oscar/oscar.c:370
 msgid "connection error (rend)\n"
 msgstr "  (rend)\n"
 
-#: src/protocols/oscar/oscar.c:384
+#: src/protocols/oscar/oscar.c:381
 msgid "major connection error\n"
 msgstr "  \n"
 
-#: src/protocols/oscar/oscar.c:385 src/protocols/toc/toc.c:511
+#: src/protocols/oscar/oscar.c:382 src/protocols/toc/toc.c:511
 #: src/protocols/toc/toc.c:524 src/protocols/toc/toc.c:590
 msgid "Disconnected."
 msgstr " ."
 
-#: src/protocols/oscar/oscar.c:397 src/protocols/toc/toc.c:761
+#: src/protocols/oscar/oscar.c:394 src/protocols/toc/toc.c:761
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "    %s."
 
-#: src/protocols/oscar/oscar.c:398
+#: src/protocols/oscar/oscar.c:395
 msgid "Chat Error!"
 msgstr " !"
 
-#: src/protocols/oscar/oscar.c:410
+#: src/protocols/oscar/oscar.c:407
 msgid "Chat is currently unavailable"
 msgstr "  "
 
-#: src/protocols/oscar/oscar.c:411
+#: src/protocols/oscar/oscar.c:408
 msgid "Gaim - Chat"
 msgstr "Gaim - "
 
-#: src/protocols/oscar/oscar.c:470 src/protocols/oscar/oscar.c:530
+#: src/protocols/oscar/oscar.c:467 src/protocols/oscar/oscar.c:527
 msgid "Couldn't connect to host"
 msgstr "    "
 
-#: src/protocols/oscar/oscar.c:478
+#: src/protocols/oscar/oscar.c:475
 msgid "Password sent, waiting for response\n"
 msgstr " ,  \n"
 
-#: src/protocols/oscar/oscar.c:511
+#: src/protocols/oscar/oscar.c:508
 msgid "internal connection error\n"
 msgstr "  \n"
 
-#: src/protocols/oscar/oscar.c:512
+#: src/protocols/oscar/oscar.c:509
 msgid "Unable to login to AIM"
 msgstr "   AIM"
 
-#: src/protocols/oscar/oscar.c:517
+#: src/protocols/oscar/oscar.c:514
 #, c-format
 msgid "Signon: %s"
 msgstr ": %s"
 
-#: src/protocols/oscar/oscar.c:589
+#: src/protocols/oscar/oscar.c:586
 msgid "Signed off.\n"
 msgstr ".\n"
 
-#: src/protocols/oscar/oscar.c:608 src/protocols/oscar/oscar.c:732
+#: src/protocols/oscar/oscar.c:605 src/protocols/oscar/oscar.c:730
 msgid "Could Not Connect"
 msgstr "  "
 
-#: src/protocols/oscar/oscar.c:616
+#: src/protocols/oscar/oscar.c:613
 msgid "Connection established, cookie sent"
 msgstr " ,  "
 
 #. Incorrect nick/password
-#: src/protocols/oscar/oscar.c:642 src/protocols/toc/toc.c:459
+#: src/protocols/oscar/oscar.c:639 src/protocols/toc/toc.c:459
 msgid "Incorrect nickname or password."
 msgstr "    ."
 
 #. Suspended account
-#: src/protocols/oscar/oscar.c:647
+#: src/protocols/oscar/oscar.c:644
 msgid "Your account is currently suspended."
 msgstr "   ."
 
 #. connecting too frequently
-#: src/protocols/oscar/oscar.c:651
+#: src/protocols/oscar/oscar.c:648
 msgid ""
 "You have been connecting and disconnecting too frequently. Wait ten minutes "
 "and try again. If you continue to try, you will need to wait even longer."
@@ -652,223 +1076,233 @@
 "."
 
 #. client too old
-#: src/protocols/oscar/oscar.c:656
+#: src/protocols/oscar/oscar.c:653
 msgid "The client version you are using is too old. Please upgrade at "
 msgstr "     ."
 
-#: src/protocols/oscar/oscar.c:660 src/protocols/toc/toc.c:542
+#: src/protocols/oscar/oscar.c:657 src/protocols/toc/toc.c:542
 msgid "Authentication Failed"
 msgstr " "
 
-#: src/protocols/oscar/oscar.c:682
+#: src/protocols/oscar/oscar.c:679
 msgid "Internal Error"
 msgstr " "
 
-#: src/protocols/oscar/oscar.c:1250 src/protocols/oscar/oscar.c:3286
+#: src/protocols/oscar/oscar.c:1248 src/protocols/oscar/oscar.c:3420
 #, c-format
 msgid "Direct IM with %s established"
 msgstr "   %s "
 
-#: src/protocols/oscar/oscar.c:1496 src/protocols/oscar/oscar.c:2371
+#: src/protocols/oscar/oscar.c:1504 src/protocols/oscar/oscar.c:2456
 #, c-format
 msgid ""
-"The user %d has denied your request to add them to your contact list for the "
-"following reason:\n"
-"\n"
+"The user %lu has denied your request to add them to your contact list for "
+"the following reason:\n"
+"%s"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1496 src/protocols/oscar/oscar.c:2371
+#: src/protocols/oscar/oscar.c:1504 src/protocols/oscar/oscar.c:2456
 #, fuzzy
 msgid "No reason given."
 msgstr "  "
 
-#: src/protocols/oscar/oscar.c:1497 src/protocols/oscar/oscar.c:2372
+#: src/protocols/oscar/oscar.c:1505 src/protocols/oscar/oscar.c:2457
 msgid "Gaim - ICQ Authorization Denied"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1503 src/protocols/oscar/oscar.c:2378
+#: src/protocols/oscar/oscar.c:1511 src/protocols/oscar/oscar.c:2463
 #, c-format
-msgid "The user %d has granted your request to add them to your contact list."
+msgid "The user %lu has granted your request to add them to your contact list."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1504 src/protocols/oscar/oscar.c:2379
+#: src/protocols/oscar/oscar.c:1512 src/protocols/oscar/oscar.c:2464
 msgid "Gaim - ICQ Authorization Granted"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1577
+#: src/protocols/oscar/oscar.c:1585
 #, c-format
 msgid "You missed %d message from %s because it was invalid."
 msgstr "   %d   %s,  ."
 
-#: src/protocols/oscar/oscar.c:1578
+#: src/protocols/oscar/oscar.c:1586
 #, c-format
 msgid "You missed %d messages from %s because they were invalid."
 msgstr "   %d  %s,  ."
 
-#: src/protocols/oscar/oscar.c:1587
+#: src/protocols/oscar/oscar.c:1595
 #, c-format
 msgid "You missed %d message from %s because it was too large."
 msgstr "   %d   %s,  ."
 
-#: src/protocols/oscar/oscar.c:1588
+#: src/protocols/oscar/oscar.c:1596
 #, c-format
 msgid "You missed %d messages from %s because they were too large."
 msgstr "   %d   %s,    ."
 
-#: src/protocols/oscar/oscar.c:1597
+#: src/protocols/oscar/oscar.c:1605
 #, c-format
 msgid "You missed %d message from %s because the rate limit has been exceeded."
 msgstr ""
 "   %d   %s,    ."
 
-#: src/protocols/oscar/oscar.c:1598
+#: src/protocols/oscar/oscar.c:1606
 #, c-format
 msgid ""
 "You missed %d messages from %s because the rate limit has been exceeded."
 msgstr ""
 "   %d   %s,    ."
 
-#: src/protocols/oscar/oscar.c:1607
+#: src/protocols/oscar/oscar.c:1615
 #, c-format
 msgid "You missed %d message from %s because it was too evil."
 msgstr "   %d   %s,    ."
 
-#: src/protocols/oscar/oscar.c:1608
+#: src/protocols/oscar/oscar.c:1616
 #, c-format
 msgid "You missed %d messages from %s because they are too evil."
 msgstr "   %d   %s,    ."
 
-#: src/protocols/oscar/oscar.c:1617
+#: src/protocols/oscar/oscar.c:1625
 #, c-format
 msgid "You missed %d message from %s because you are too evil."
 msgstr "   %d   %s,   ."
 
-#: src/protocols/oscar/oscar.c:1618
+#: src/protocols/oscar/oscar.c:1626
 #, c-format
 msgid "You missed %d messages from %s because you are too evil."
 msgstr "   %d   %s,   ."
 
-#: src/protocols/oscar/oscar.c:1626
+#: src/protocols/oscar/oscar.c:1634
 #, c-format
 msgid "You missed %d message from %s for unknown reasons."
 msgstr "   %d   %s   ."
 
-#: src/protocols/oscar/oscar.c:1627
+#: src/protocols/oscar/oscar.c:1635
 #, c-format
 msgid "You missed %d messages from %s for unknown reasons."
 msgstr "   %d   %s   ."
 
-#: src/dialogs.c:3034 src/dialogs.c:3040 src/protocols/oscar/oscar.c:1632
-#: src/protocols/oscar/oscar.c:1670 src/protocols/oscar/oscar.c:1688
-#: src/protocols/oscar/oscar.c:2141 src/protocols/yahoo/yahoo.c:585
+#: src/dialogs.c:3076 src/dialogs.c:3082 src/protocols/oscar/oscar.c:1640
+#: src/protocols/oscar/oscar.c:1755 src/protocols/oscar/oscar.c:1773
+#: src/protocols/oscar/oscar.c:2226 src/protocols/yahoo/yahoo.c:594
 msgid "Gaim - Error"
 msgstr "Gaim - "
 
-#: src/protocols/oscar/oscar.c:1649
+#: src/protocols/oscar/oscar.c:1703
+#, c-format
+msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR>%s<BR>"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:1705
+#, c-format
+msgid "<B>Status:</B> %s<BR><HR><BR>%s<BR>"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:1734
 #, c-format
 msgid "SNAC threw error: %s\n"
 msgstr "SNAC  : %s\n"
 
-#: src/protocols/oscar/oscar.c:1651
+#: src/protocols/oscar/oscar.c:1736
 msgid "Gaim - Oscar SNAC Error"
 msgstr "Gaim -  Oscar SNAC"
 
-#: src/protocols/oscar/oscar.c:1668
+#: src/protocols/oscar/oscar.c:1753
 #, c-format
 msgid "Your message to %s did not get sent: %s"
 msgstr "   %s  : %s"
 
-#: src/protocols/oscar/oscar.c:1669 src/protocols/oscar/oscar.c:1687
+#: src/protocols/oscar/oscar.c:1754 src/protocols/oscar/oscar.c:1772
 msgid "Reason unknown"
 msgstr " "
 
-#: src/protocols/oscar/oscar.c:1686
+#: src/protocols/oscar/oscar.c:1771
 #, c-format
 msgid "User information for %s unavailable: %s"
 msgstr "   %s : %s"
 
-#: src/buddy.c:2060 src/protocols/oscar/oscar.c:1717
+#: src/buddy.c:2131 src/protocols/oscar/oscar.c:1802
 msgid "Buddy Icon"
 msgstr " "
 
-#: src/buddy.c:2063 src/protocols/oscar/oscar.c:1720
+#: src/buddy.c:2134 src/protocols/oscar/oscar.c:1805
 msgid "Voice"
 msgstr ""
 
-#: src/buddy.c:2066 src/protocols/oscar/oscar.c:1723
+#: src/buddy.c:2137 src/protocols/oscar/oscar.c:1808
 msgid "IM Image"
 msgstr "IM "
 
-#: src/buddy.c:494 src/buddy.c:2069 src/buddy.c:2507 src/prefs.c:2912
-#: src/protocols/oscar/oscar.c:1726
+#: src/buddy.c:498 src/buddy.c:2140 src/buddy.c:2581 src/prefs.c:2926
+#: src/protocols/oscar/oscar.c:1811
 msgid "Chat"
 msgstr ""
 
-#: src/buddy.c:2072 src/protocols/oscar/oscar.c:1729
+#: src/buddy.c:2143 src/protocols/oscar/oscar.c:1814
 msgid "Get File"
 msgstr " "
 
-#: src/buddy.c:2075 src/protocols/oscar/oscar.c:1732
+#: src/buddy.c:2146 src/protocols/oscar/oscar.c:1817
 msgid "Send File"
 msgstr " "
 
-#: src/buddy.c:2079 src/protocols/oscar/oscar.c:1736
+#: src/buddy.c:2150 src/protocols/oscar/oscar.c:1821
 msgid "Games"
 msgstr ""
 
-#: src/buddy.c:2082 src/protocols/oscar/oscar.c:1739
+#: src/buddy.c:2153 src/protocols/oscar/oscar.c:1824
 msgid "Stocks"
 msgstr ""
 
-#: src/buddy.c:2085 src/protocols/oscar/oscar.c:1742
+#: src/buddy.c:2156 src/protocols/oscar/oscar.c:1827
 msgid "Send Buddy List"
 msgstr "  "
 
-#: src/buddy.c:2088 src/protocols/oscar/oscar.c:1745
+#: src/buddy.c:2159 src/protocols/oscar/oscar.c:1830
 msgid "EveryBuddy Bug"
 msgstr "EvryBuddy Bug"
 
-#: src/buddy.c:2091 src/protocols/oscar/oscar.c:1748
+#: src/buddy.c:2162 src/protocols/oscar/oscar.c:1833
 msgid "AP User"
 msgstr ""
 
-#: src/buddy.c:2094 src/protocols/oscar/oscar.c:1751
+#: src/buddy.c:2165 src/protocols/oscar/oscar.c:1836
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
-#: src/buddy.c:2097 src/protocols/oscar/oscar.c:1754
+#: src/buddy.c:2168 src/protocols/oscar/oscar.c:1839
 msgid "Nihilist"
 msgstr ""
 
-#: src/buddy.c:2100 src/protocols/oscar/oscar.c:1757
+#: src/buddy.c:2171 src/protocols/oscar/oscar.c:1842
 msgid "ICQ Server Relay"
 msgstr " ICQ Server'"
 
-#: src/buddy.c:2103 src/protocols/oscar/oscar.c:1760
+#: src/buddy.c:2174 src/protocols/oscar/oscar.c:1845
 msgid "ICQ Unknown"
 msgstr " ICQ"
 
-#: src/buddy.c:2106 src/protocols/oscar/oscar.c:1763
+#: src/buddy.c:2177 src/protocols/oscar/oscar.c:1848
 msgid "Trillian Encryption"
 msgstr " Trillian"
 
-#: src/protocols/oscar/oscar.c:1801
+#: src/protocols/oscar/oscar.c:1886
 msgid ""
-"<br><BODY BGCOLOR=WHITE><hr><I>Legend:</I><br><br><IMG "
-"SRC=\"free_icon.gif\"> : Normal AIM User<br><IMG SRC=\"aol_icon.gif\"> : AOL "
-"User <br><IMG SRC=\"dt_icon.gif\"> : Trial AIM User <br><IMG "
-"SRC=\"admin_icon.gif\"> : Administrator <br><IMG SRC=\"ab_icon.gif\"> : "
-"ActiveBuddy Interactive Agent<br><IMG SRC=\"wireless_icon.gif\"> : Wireless "
-"Device User<br>"
+"<br><BODY BGCOLOR=WHITE><hr><I>Legend:</I><br><br><IMG SRC=\"free_icon.gif"
+"\"> : Normal AIM User<br><IMG SRC=\"aol_icon.gif\"> : AOL User <br><IMG SRC="
+"\"dt_icon.gif\"> : Trial AIM User <br><IMG SRC=\"admin_icon.gif\"> : "
+"Administrator <br><IMG SRC=\"ab_icon.gif\"> : ActiveBuddy Interactive "
+"Agent<br><IMG SRC=\"wireless_icon.gif\"> : Wireless Device User<br>"
 msgstr ""
-"<br><BODY BGCOLOR=WHITE><hr><I>:</I><br><br><IMG "
-"SRC=\"free_icon.gif\"> :   AIM<br><IMG "
-"SRC=\"aol_icon.gif\"> :  AOL <br><IMG SRC=\"dt_icon.gif\"> : "
-"  AIM<br><IMG SRC=\"admin_icon.gif\"> :  "
-"<br><IMG SRC=\\\"ab_icon.gif\\\"> :   <br> <IMG "
-"SRC=\\\"wireless_icon.gif\\\"> :   <br>\""
-
-#: src/protocols/oscar/oscar.c:1829
+"<br><BODY BGCOLOR=WHITE><hr><I>:</I><br><br><IMG SRC=\"free_icon.gif"
+"\"> :   AIM<br><IMG SRC=\"aol_icon.gif\"> :  "
+"AOL <br><IMG SRC=\"dt_icon.gif\"> :   AIM<br><IMG SRC="
+"\"admin_icon.gif\"> :  <br><IMG SRC=\\\"ab_icon.gif\\\"> : "
+"  <br> <IMG SRC=\\\"wireless_icon.gif\\\"> :   <br>"
+"\""
+
+#: src/protocols/oscar/oscar.c:1914
+#, c-format
 msgid ""
 "Username : <B>%s</B>  %s <BR>\n"
 "Warning Level : <B>%d %%</B><BR>\n"
@@ -880,27 +1314,27 @@
 "%s%s%s<BR>\n"
 "<HR><BR>\n"
 
-#: src/protocols/oscar/oscar.c:1861
+#: src/protocols/oscar/oscar.c:1946
 msgid "<i>User has no away message</i>"
 msgstr "<i>     </i>"
 
-#: src/protocols/oscar/oscar.c:1873
+#: src/protocols/oscar/oscar.c:1958
 msgid "Client Capabilities: "
 msgstr " :"
 
-#: src/protocols/oscar/oscar.c:1881
+#: src/protocols/oscar/oscar.c:1966
 msgid "<i>No Information Provided</i>"
 msgstr "<i>  </i>"
 
-#: src/protocols/oscar/oscar.c:1904
+#: src/protocols/oscar/oscar.c:1989
 msgid "Your connection may be lost."
 msgstr "   ."
 
-#: src/protocols/oscar/oscar.c:1905
+#: src/protocols/oscar/oscar.c:1990
 msgid "AOL error"
 msgstr " AOL"
 
-#: src/protocols/oscar/oscar.c:2140
+#: src/protocols/oscar/oscar.c:2225
 msgid ""
 "The last message was not sent because you are over the rate limit. Please "
 "wait 10 seconds and try again."
@@ -908,23 +1342,35 @@
 "   ,  .  10   "
 "  ."
 
-#: src/dialogs.c:3563 src/protocols/oscar/oscar.c:2482
-#: src/protocols/oscar/oscar.c:3407 src/protocols/toc/toc.c:1561
-#: src/protocols/toc/toc.c:1578 src/protocols/toc/toc.c:1638
-#: src/protocols/toc/toc.c:1680 src/protocols/toc/toc.c:1799
-#: src/protocols/toc/toc.c:1829 src/protocols/toc/toc.c:1885
+#: src/dialogs.c:3604 src/protocols/oscar/oscar.c:2589
+#: src/protocols/oscar/oscar.c:3541 src/protocols/toc/toc.c:1564
+#: src/protocols/toc/toc.c:1581 src/protocols/toc/toc.c:1641
+#: src/protocols/toc/toc.c:1683 src/protocols/toc/toc.c:1802
+#: src/protocols/toc/toc.c:1832 src/protocols/toc/toc.c:1888
 msgid "Error"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3079 src/protocols/toc/toc.c:1105
+#: src/protocols/oscar/oscar.c:3192
+#, c-format
+msgid ""
+"The maximum number of buddies allowed in your buddy list is %d, and you have "
+"%d.  Until you are below the limit, some buddies will not show up as online."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3195
+#, fuzzy
+msgid "Gaim - Warning"
+msgstr "  ?"
+
+#: src/protocols/oscar/oscar.c:3213 src/protocols/toc/toc.c:1108
 msgid "Exchange:"
 msgstr ":"
 
-#: src/protocols/oscar/oscar.c:3407
+#: src/protocols/oscar/oscar.c:3541
 msgid "Unable to open Direct IM"
 msgstr "   "
 
-#: src/protocols/oscar/oscar.c:3417
+#: src/protocols/oscar/oscar.c:3551
 #, c-format
 msgid ""
 "You have selected to open a Direct IM connection with %s. Doing this will "
@@ -934,11 +1380,30 @@
 "      %s.     IP "
 ",      .   ?"
 
-#: src/protocols/oscar/oscar.c:3450
+#: src/protocols/oscar/oscar.c:3568
+#, c-format
+msgid ""
+"<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR><I>Remote client does not "
+"support sending status messages.</I><BR>"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3575
+#, c-format
+msgid ""
+"<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR><I>User has no status message."
+"</I><BR>"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3600
+#, fuzzy
+msgid "Get Status Msg"
+msgstr "   "
+
+#: src/protocols/oscar/oscar.c:3613
 msgid "Direct IM"
 msgstr " "
 
-#: src/protocols/oscar/oscar.c:3458
+#: src/protocols/oscar/oscar.c:3621
 msgid "Get Capabilities"
 msgstr " "
 
@@ -1084,7 +1549,7 @@
 msgid "Password Change Successful"
 msgstr "  "
 
-#: src/dialogs.c:1688 src/protocols/toc/toc.c:782
+#: src/dialogs.c:1730 src/protocols/toc/toc.c:782
 msgid "Gaim - Password Change"
 msgstr "Gaim -  "
 
@@ -1103,70 +1568,71 @@
 msgid "TOC Pause"
 msgstr "TOC "
 
-#: src/protocols/toc/toc.c:1222
+#: src/protocols/toc/toc.c:1225
 msgid "Get Dir Info"
 msgstr " "
 
-#: src/protocols/toc/toc.c:1638 src/protocols/toc/toc.c:1680
-#: src/protocols/toc/toc.c:1799 src/protocols/toc/toc.c:1885
+#: src/protocols/toc/toc.c:1641 src/protocols/toc/toc.c:1683
+#: src/protocols/toc/toc.c:1802 src/protocols/toc/toc.c:1888
 msgid "Could not connect for transfer!"
 msgstr "    !"
 
-#: src/protocols/toc/toc.c:1829
+#: src/protocols/toc/toc.c:1832
 msgid "Could not write file header!"
 msgstr "    !"
 
-#: src/protocols/toc/toc.c:1918
+#: src/protocols/toc/toc.c:1921
 msgid "Gaim - Save As..."
 msgstr "Gaim -  ..."
 
-#: src/protocols/toc/toc.c:1959
+#: src/protocols/toc/toc.c:1962
 #, c-format
 msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
 msgstr ""
 "%s   %s    %d (): %s (%.2f %s)%s%s"
 
-#: src/protocols/toc/toc.c:1960
+#: src/protocols/toc/toc.c:1963
 #, c-format
 msgid "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
 msgstr ""
 "%s   %s    %d (): %s (%.2f %s)%s%s"
 
-#: src/protocols/toc/toc.c:1965
+#: src/protocols/toc/toc.c:1968
 #, c-format
 msgid "%s requests you to send them a file"
 msgstr "%s   "
 
-#: src/protocols/yahoo/yahoo.c:585
+#: src/protocols/yahoo/yahoo.c:594
 msgid "Your message did not get sent."
 msgstr "     "
 
-#: src/protocols/zephyr/zephyr.c:802
+#: src/protocols/zephyr/zephyr.c:840
 msgid "ZLocate"
 msgstr "ZLocate"
 
-#: src/protocols/zephyr/zephyr.c:839
+#: src/protocols/zephyr/zephyr.c:877
 msgid "Class:"
 msgstr ":"
 
-#: src/protocols/zephyr/zephyr.c:843
+#: src/protocols/zephyr/zephyr.c:881
 msgid "Instance:"
 msgstr ":"
 
-#: src/protocols/zephyr/zephyr.c:847
+#: src/protocols/zephyr/zephyr.c:885
 msgid "Recipient:"
 msgstr ":"
 
-#: src/about.c:93
+#: src/about.c:102
 #, c-format
 msgid "About Gaim v%s"
 msgstr " Gaim %s "
 
-#: src/about.c:126
+#: src/about.c:135
+#, fuzzy
 msgid ""
-"Gaim is a client that supports AOL's Instant Messenger protocol. It is "
-"written\n"
-"using Gtk+ and is licensed under the GPL.\n"
+"Gaim is a modular Instant Messaging client capable of using AIM, ICQ,\n"
+"Yahoo!, MSN, IRC, Jabber, Napster, Zephyr, and Gadu-Gadu all at once.\n"
+"It is written using Gtk+ and is licensed under the GPL.\n"
 "\n"
 "URL: "
 msgstr ""
@@ -1177,6 +1643,16 @@
 
 #: src/about.c:137
 msgid ""
+"\n"
+"\n"
+"IRC: #gaim on irc.openprojects.net"
+msgstr ""
+"\n"
+"\n"
+"IRC: #gaim on irc.openprojects.net"
+
+#: src/about.c:147
+msgid ""
 "Active Developers\n"
 "====================\n"
 "Rob Flynn (maintainer) [ rob@marko.net ]\n"
@@ -1213,98 +1689,96 @@
 "Eric Warmenhoven                   [ warmenhoven@yahoo.com ]\n"
 "Mark Spencer (original author)   [ markster@marko.net ]"
 
-#: src/about.c:155 src/aim.c:318 src/buddy.c:2633 src/buddy_chat.c:1311
-#: src/buddy_chat.c:1408 src/buddy_chat.c:1438 src/conversation.c:2795
-#: src/dialogs.c:568 src/dialogs.c:3858 src/multi.c:1057 src/plugins.c:277
-#: src/prefs.c:2535 src/prpl.c:438 src/prpl.c:679 src/server.c:1050
-msgid "Close"
-msgstr ""
-
 #. this makes the sizes not work.
 #. GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
 #. gtk_widget_grab_default(button);
-#: src/about.c:175
+#: src/about.c:185
 msgid "Web Site"
 msgstr " "
 
-#: src/aim.c:151 src/buddy.c:2626
+#: src/aim.c:153 src/buddy.c:2709
 msgid "Signoff"
 msgstr " "
 
-#: src/aim.c:163
+#: src/aim.c:165
 msgid "Please enter your logon"
 msgstr ",   "
 
-#: src/aim.c:163 src/multi.c:1388 src/server.c:55
+#: src/aim.c:165 src/multi.c:1400 src/server.c:55
 msgid "Signon Error"
 msgstr " "
 
-#: src/aim.c:261
+#: src/aim.c:263
 msgid "Gaim - Login"
 msgstr "Gaim - "
 
-#: src/aim.c:279
+#: src/aim.c:281
 msgid "Screen Name: "
 msgstr "UIN"
 
-#: src/aim.c:295
+#: src/aim.c:297
 msgid "Password: "
 msgstr ""
 
-#: src/aim.c:316 src/buddy.c:2630
+#: src/aim.c:318 src/buddy.c:2713
 msgid "Quit"
 msgstr ""
 
-#: src/aim.c:321 src/aim.c:819 src/buddy.c:2656
+#: src/aim.c:323 src/aim.c:831 src/buddy.c:2739
 msgid "Accounts"
 msgstr " "
 
-#: src/aim.c:323 src/multi.c:903
+#: src/aim.c:325 src/multi.c:915
 msgid "Signon"
 msgstr ""
 
-#: src/aim.c:355
+#: src/aim.c:357
 msgid "About"
 msgstr " ..."
 
-#: src/aim.c:356 src/prefs.c:1619 src/prefs.c:1893
+#: src/aim.c:358 src/prefs.c:1633 src/prefs.c:1905
 msgid "Options"
 msgstr ""
 
-#: src/aim.c:358 src/aim.c:822 src/buddy.c:2674
+#: src/aim.c:360 src/aim.c:834 src/buddy.c:2757
 msgid "Plugins"
 msgstr ""
 
-#: src/aim.c:816 src/buddy.c:2666
+#: src/aim.c:828 src/buddy.c:2749
 msgid "Preferences"
 msgstr ""
 
-#: src/applet.c:199
+#: src/aim.c:838 src/multi.c:1472
+#, fuzzy
+msgid "Auto-login"
+msgstr " "
+
+#: src/applet.c:109
 msgid "Attempting to sign on...."
 msgstr " "
 
-#: src/applet.c:202
+#: src/applet.c:112
 msgid "Offline. Click to bring up login box."
 msgstr ".   ."
 
-#: src/applet.c:218
+#: src/applet.c:128
 #, c-format
 msgid "Away: %d pending."
 msgstr ":   %d."
 
-#: src/applet.c:221
+#: src/applet.c:131
 msgid "Away."
 msgstr "."
 
-#: src/applet.c:296 src/away.c:388
+#: src/applet.c:200 src/away.c:388
 msgid "New Away Message"
 msgstr "   "
 
-#: src/applet.c:444
+#: src/applet.c:348
 msgid "Can't create Gaim applet!"
 msgstr "  Gaim !"
 
-#: src/applet.c:465
+#: src/applet.c:368
 msgid "About..."
 msgstr " ..."
 
@@ -1328,87 +1802,74 @@
 msgid "Set All Away"
 msgstr "  \"\""
 
-#. Put the buttons in the box
-#: src/buddy.c:488 src/buddy.c:2741 src/buddy_chat.c:1443
-#: src/conversation.c:2328 src/conversation.c:2810 src/dialogs.c:890
-#: src/dialogs.c:1072 src/dialogs.c:2053 src/multi.c:1041 src/prefs.c:2029
-#: src/prefs.c:2371 src/prefs.c:2405
-msgid "Add"
-msgstr ""
-
-#: src/buddy.c:489 src/buddy.c:2742 src/dialogs.c:900 src/dialogs.c:1047
+#: src/buddy.c:493 src/buddy.c:2828 src/dialogs.c:942 src/dialogs.c:1089
 msgid "Group"
 msgstr ""
 
-#: src/buddy.c:490 src/buddy.c:2743 src/buddy_chat.c:1445
-#: src/conversation.c:2314 src/conversation.c:2807 src/prefs.c:2043
-#: src/prefs.c:2375 src/prefs.c:2409
-msgid "Remove"
-msgstr ""
-
-#: src/buddy.c:495 src/buddy.c:646 src/buddy.c:798 src/buddy.c:2505
-#: src/buddy_chat.c:850 src/buddy_chat.c:1267
+#: src/buddy.c:499 src/buddy.c:664 src/buddy.c:834 src/buddy.c:2579
+#: src/buddy_chat.c:861 src/buddy_chat.c:1278
 msgid "IM"
 msgstr " "
 
-#: src/buddy.c:496 src/buddy.c:2506 src/buddy_chat.c:866 src/buddy_chat.c:1275
-#: src/buddy_chat.c:1451 src/conversation.c:2828
+#: src/buddy.c:500 src/buddy.c:2580 src/buddy_chat.c:877 src/buddy_chat.c:1286
+#: src/buddy_chat.c:1462 src/conversation.c:2897
 msgid "Info"
 msgstr ""
 
 #. Put the buttons in the box
-#: src/buddy.c:651 src/buddy.c:803 src/dialogs.c:1039 src/dialogs.c:3417
-#: src/dialogs.c:3432
+#: src/buddy.c:669 src/buddy.c:839 src/dialogs.c:1081 src/dialogs.c:3458
+#: src/dialogs.c:3473
 msgid "Alias"
 msgstr ""
 
-#: src/buddy.c:656 src/buddy.c:822
+#: src/buddy.c:674 src/buddy.c:858
 msgid "Add Buddy Pounce"
 msgstr ""
 
-#: src/buddy.c:663 src/buddy.c:828
+#: src/buddy.c:681 src/buddy.c:864
 msgid "View Log"
 msgstr " "
 
-#: src/buddy.c:785 src/buddy.c:816
+#: src/buddy.c:821 src/buddy.c:852
 msgid "Rename"
 msgstr ""
 
-#: src/buddy.c:810
+#: src/buddy.c:846
 msgid "Un-Alias"
 msgstr " "
 
-#: src/buddy.c:1581 src/buddy.c:2649
+#: src/buddy.c:1645 src/buddy.c:2732
 msgid "Buddy Pounce"
 msgstr ""
 
-#: src/buddy.c:1661
+#: src/buddy.c:1725
 msgid "New Buddy Pounce"
 msgstr " "
 
-#: src/buddy.c:1679
+#: src/buddy.c:1743
 msgid "Remove Buddy Pounce"
 msgstr " "
 
-#: src/buddy.c:1707
+#: src/buddy.c:1771
 msgid "[Click to edit]"
 msgstr "[]"
 
-#: src/buddy.c:2183
+#: src/buddy.c:2254
 #, c-format
 msgid "Logged in: %s\n"
 msgstr ": %s\n"
 
-#: src/buddy.c:2195
+#: src/buddy.c:2266
+#, c-format
 msgid "Warnings: %d%%\n"
 msgstr ": %d%%\n"
 
-#: src/buddy.c:2207
+#: src/buddy.c:2278
 #, c-format
 msgid "Capabilities: %s\n"
 msgstr ": %s\n"
 
-#: src/buddy.c:2211
+#: src/buddy.c:2282
 #, c-format
 msgid ""
 "Alias: %s               \n"
@@ -1419,117 +1880,127 @@
 " : %s\n"
 "%s%s%s%s%s%s"
 
-#: src/buddy.c:2215
+#: src/buddy.c:2286
 msgid "Idle: "
 msgstr " "
 
-#: src/buddy.c:2286 src/buddy.c:2291
+#: src/buddy.c:2359 src/buddy.c:2364
 #, c-format
 msgid "%s logged in."
 msgstr "%s  "
 
-#: src/buddy.c:2350 src/buddy.c:2355
+#: src/buddy.c:2424 src/buddy.c:2429
 #, c-format
 msgid "%s logged out."
 msgstr "%s "
 
-#: src/buddy.c:2540
+#: src/buddy.c:2614
 msgid "Information on selected Buddy"
 msgstr "  "
 
-#: src/buddy.c:2541 src/dialogs.c:697
+#: src/buddy.c:2615 src/dialogs.c:697
 msgid "Send Instant Message"
 msgstr " "
 
-#: src/buddy.c:2542
+#: src/buddy.c:2616
 msgid "Start/join a Buddy Chat"
 msgstr ""
 
-#: src/buddy.c:2543
+#: src/buddy.c:2617
 msgid "Activate Away Message"
 msgstr "!"
 
-#: src/buddy.c:2606
+#: src/buddy.c:2689
 msgid "File"
 msgstr ""
 
-#: src/buddy.c:2610
+#: src/buddy.c:2693
 msgid "Add A Buddy"
 msgstr " "
 
-#: src/buddy.c:2612
+#: src/buddy.c:2695
 msgid "Join A Chat"
 msgstr "  "
 
-#: src/buddy.c:2614
+#: src/buddy.c:2697
 msgid "New Instant Message"
 msgstr " "
 
-#: src/buddy.c:2616 src/dialogs.c:749
+#: src/buddy.c:2699 src/dialogs.c:759
 msgid "Get User Info"
 msgstr "  "
 
-#: src/buddy.c:2621
+#: src/buddy.c:2704
 msgid "Import Buddy List"
 msgstr "  "
 
-#: src/buddy.c:2639
+#: src/buddy.c:2722
 msgid "Tools"
 msgstr ""
 
-#: src/buddy.c:2662
+#: src/buddy.c:2745
 msgid "Protocol Actions"
 msgstr ""
 
-#: src/buddy.c:2668
+#: src/buddy.c:2751
 msgid "View System Log"
 msgstr "  "
 
-#: src/buddy.c:2680
+#: src/buddy.c:2763
 msgid "Perl"
 msgstr "Perl"
 
-#: src/buddy.c:2683
+#: src/buddy.c:2766
 msgid "Load Script"
 msgstr " "
 
-#: src/buddy.c:2687
+#: src/buddy.c:2770
 msgid "Unload All Scripts"
 msgstr "  "
 
-#: src/buddy.c:2691
+#: src/buddy.c:2774
 msgid "List Scripts"
 msgstr " "
 
-#: src/buddy.c:2699
+#: src/buddy.c:2782
 msgid "Help"
 msgstr ""
 
-#: src/buddy.c:2704
+#: src/buddy.c:2787
+#, fuzzy
+msgid "Online Help"
+msgstr " "
+
+#: src/buddy.c:2788
+#, fuzzy
+msgid "Debug Window"
+msgstr "  "
+
+#: src/buddy.c:2789
 msgid "About Gaim"
 msgstr " "
 
-#: src/buddy.c:2721 src/prefs.c:2891
+#: src/buddy.c:2807 src/prefs.c:2905
 msgid "Buddy List"
 msgstr " "
 
-#: src/buddy.c:2774
+#: src/buddy.c:2860
 msgid "Add a new Buddy"
 msgstr "  "
 
-#: src/buddy.c:2775
+#: src/buddy.c:2861
 msgid "Add a new Group"
 msgstr "  "
 
-#: src/buddy.c:2776
+#: src/buddy.c:2862
 msgid "Remove selected Buddy/Group"
 msgstr "  /"
 
-#: src/buddy.c:2803
+#: src/buddy.c:2889
 msgid "Edit Buddies"
 msgstr " "
 
-#: src/buddy.c:2846
+#: src/buddy.c:2932
 msgid "Gaim - Buddy List"
 msgstr "Gaim - C "
 
@@ -1537,21 +2008,17 @@
 msgid "Join Chat"
 msgstr "  "
 
-#: src/buddy_chat.c:272
-msgid "Buddy Chat"
-msgstr ""
-
 #: src/buddy_chat.c:283
 msgid "Join Chat As:"
 msgstr "   :"
 
-#: src/buddy_chat.c:304 src/buddy_chat.c:392 src/dialogs.c:450
-#: src/dialogs.c:540 src/dialogs.c:715 src/dialogs.c:773 src/dialogs.c:892
-#: src/dialogs.c:1068 src/dialogs.c:1431 src/dialogs.c:1636 src/dialogs.c:1760
-#: src/dialogs.c:1820 src/dialogs.c:2042 src/dialogs.c:2224 src/dialogs.c:2399
-#: src/dialogs.c:2470 src/dialogs.c:3166 src/dialogs.c:3419 src/dialogs.c:3600
-#: src/dialogs.c:3971 src/dialogs.c:4077 src/dialogs.c:4736 src/multi.c:769
-#: src/multi.c:899 src/prpl.c:150 src/prpl.c:224
+#: src/buddy_chat.c:304 src/buddy_chat.c:392 src/dialogs.c:449
+#: src/dialogs.c:539 src/dialogs.c:715 src/dialogs.c:816 src/dialogs.c:934
+#: src/dialogs.c:1110 src/dialogs.c:1473 src/dialogs.c:1678 src/dialogs.c:1802
+#: src/dialogs.c:1862 src/dialogs.c:2084 src/dialogs.c:2266 src/dialogs.c:2441
+#: src/dialogs.c:2512 src/dialogs.c:3208 src/dialogs.c:3460 src/dialogs.c:3641
+#: src/dialogs.c:4012 src/dialogs.c:4118 src/dialogs.c:4777 src/multi.c:781
+#: src/multi.c:911 src/prpl.c:150 src/prpl.c:224
 msgid "Cancel"
 msgstr ""
 
@@ -1559,16 +2026,16 @@
 msgid "Join"
 msgstr ""
 
-#: src/buddy_chat.c:393 src/buddy_chat.c:396 src/buddy_chat.c:1317
-#: src/buddy_chat.c:1407
+#: src/buddy_chat.c:393 src/buddy_chat.c:396 src/buddy_chat.c:1328
+#: src/buddy_chat.c:1418
 msgid "Invite"
 msgstr ""
 
-#: src/buddy_chat.c:412 src/dialogs.c:1259 src/dialogs.c:3427
+#: src/buddy_chat.c:412 src/dialogs.c:1301 src/dialogs.c:3468
 msgid "Buddy"
 msgstr "(UIN)"
 
-#: src/buddy_chat.c:417 src/prefs.c:1992
+#: src/buddy_chat.c:417 src/prefs.c:2004
 msgid "Message"
 msgstr ""
 
@@ -1576,286 +2043,282 @@
 msgid "Gaim - Invite Buddy Into Chat Room"
 msgstr "Gaim -    "
 
-#: src/buddy_chat.c:857
+#: src/buddy_chat.c:868
 msgid "Un-Ignore"
 msgstr ""
 
-#: src/buddy_chat.c:859 src/buddy_chat.c:1271
+#: src/buddy_chat.c:870 src/buddy_chat.c:1282
 msgid "Ignore"
 msgstr ""
 
 #. don't remove them from ignored in case they re-enter
-#: src/buddy_chat.c:922 src/buddy_chat.c:1034 src/buddy_chat.c:1497
-#: src/buddy_chat.c:1530
+#: src/buddy_chat.c:933 src/buddy_chat.c:1045 src/buddy_chat.c:1508
+#: src/buddy_chat.c:1541
 #, c-format
 msgid "%d %s in room"
 msgstr "%d %s   "
 
-#: src/buddy_chat.c:930
+#: src/buddy_chat.c:941
 #, c-format
 msgid "%s entered the room."
 msgstr "%s    "
 
-#: src/buddy_chat.c:996
+#: src/buddy_chat.c:1007
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s  %s"
 
-#: src/buddy_chat.c:1043
+#: src/buddy_chat.c:1054
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s    (%s)"
 
-#: src/buddy_chat.c:1045
+#: src/buddy_chat.c:1056
 #, c-format
 msgid "%s left the room."
 msgstr "%s   "
 
-#: src/buddy_chat.c:1144
+#: src/buddy_chat.c:1155
 msgid "Gaim - Group Chats"
 msgstr "Gaim - "
 
-#: src/buddy_chat.c:1207
+#: src/buddy_chat.c:1218
 msgid "Topic:"
 msgstr ""
 
-#: src/buddy_chat.c:1248
+#: src/buddy_chat.c:1259
 msgid "0 people in room"
 msgstr "0    "
 
-#: src/buddy_chat.c:1322 src/buddy_chat.c:1406
+#: src/buddy_chat.c:1333 src/buddy_chat.c:1417
 msgid "Whisper"
 msgstr ""
 
-#: src/buddy_chat.c:1327 src/buddy_chat.c:1404 src/buddy_chat.c:1453
-#: src/conversation.c:2839
+#: src/buddy_chat.c:1338 src/buddy_chat.c:1415 src/buddy_chat.c:1464
+#: src/conversation.c:2908
 msgid "Send"
 msgstr ""
 
-#: src/buddy_chat.c:1447 src/conversation.c:2816
+#: src/buddy_chat.c:1458 src/conversation.c:2885
 msgid "Block"
 msgstr ""
 
-#: src/buddy_chat.c:1449 src/conversation.c:2822 src/dialogs.c:425
-#: src/dialogs.c:454
+#: src/buddy_chat.c:1460 src/conversation.c:2891 src/dialogs.c:424
+#: src/dialogs.c:453
 msgid "Warn"
 msgstr ""
 
-#: src/conversation.c:413
+#: src/conversation.c:431
 msgid "Gaim - Save Conversation"
 msgstr "Gaim -  "
 
-#: src/conversation.c:474
+#: src/conversation.c:492
 msgid "Gaim - Insert Image"
 msgstr "Gaim -  "
 
-#: src/conversation.c:1278
+#: src/conversation.c:1336
 msgid "Unable to send message: too large"
 msgstr "  :   "
 
-#: src/conversation.c:1278 src/conversation.c:1282
+#: src/conversation.c:1336 src/conversation.c:1340
 msgid "Message Error"
 msgstr " "
 
-#: src/conversation.c:1282
+#: src/conversation.c:1340
 msgid "Unable to send message: Unknown reason"
 msgstr "   : ."
 
-#: src/conversation.c:1501
+#: src/conversation.c:1559
 #, c-format
 msgid "Currently at %d, "
 msgstr "   %d,"
 
-#: src/conversation.c:1509
+#: src/conversation.c:1567
 #, c-format
 msgid "Setting position to %d\n"
 msgstr "   %d\n"
 
-#: src/conversation.c:2110 src/prefs.c:1305
+#: src/conversation.c:2170 src/prefs.c:1308
 msgid "Bold Text"
 msgstr ""
 
-#: src/conversation.c:2110
+#: src/conversation.c:2170
 msgid "Bold"
 msgstr ""
 
-#: src/conversation.c:2114
+#: src/conversation.c:2174
 msgid "Italics Text"
 msgstr ""
 
-#: src/conversation.c:2115
+#: src/conversation.c:2175
 msgid "Italics"
 msgstr ""
 
-#: src/conversation.c:2118 src/prefs.c:1317
+#: src/conversation.c:2178 src/prefs.c:1320
 msgid "Underline Text"
 msgstr ""
 
-#: src/conversation.c:2119
+#: src/conversation.c:2179
 msgid "Underline"
 msgstr ""
 
-#: src/conversation.c:2123 src/prefs.c:1323
+#: src/conversation.c:2183 src/prefs.c:1326
 msgid "Strike through Text"
 msgstr " "
 
-#: src/conversation.c:2123
+#: src/conversation.c:2183
 msgid "Strike"
 msgstr ""
 
-#: src/conversation.c:2129
+#: src/conversation.c:2189
 msgid "Decrease font size"
 msgstr " "
 
-#: src/conversation.c:2129
+#: src/conversation.c:2189
 msgid "Small"
 msgstr ""
 
-#: src/conversation.c:2132
+#: src/conversation.c:2192
 msgid "Normal font size"
 msgstr "   "
 
-#: src/conversation.c:2132
+#: src/conversation.c:2192
 msgid "Normal"
 msgstr ""
 
-#: src/conversation.c:2135
+#: src/conversation.c:2195
 msgid "Increase font size"
 msgstr " "
 
-#: src/conversation.c:2135
+#: src/conversation.c:2195
 msgid "Big"
 msgstr ""
 
-#: src/conversation.c:2142 src/dialogs.c:2841 src/dialogs.c:2865
+#: src/conversation.c:2202 src/dialogs.c:2883 src/dialogs.c:2907
 msgid "Select Font"
 msgstr " "
 
-#: src/conversation.c:2143
+#: src/conversation.c:2203
 msgid "Font"
 msgstr ""
 
-#: src/conversation.c:2146 src/prefs.c:1353
+#: src/conversation.c:2206 src/prefs.c:1356
 msgid "Text Color"
 msgstr " "
 
-#: src/conversation.c:2147 src/conversation.c:2151
+#: src/conversation.c:2207 src/conversation.c:2211
 msgid "Color"
 msgstr ""
 
-#: src/conversation.c:2151 src/prefs.c:1371
+#: src/conversation.c:2211 src/prefs.c:1374
 msgid "Background Color"
 msgstr " "
 
-#: src/conversation.c:2158 src/dialogs.c:2464
+#: src/conversation.c:2218 src/dialogs.c:2506
 msgid "Insert Link"
 msgstr " "
 
-#: src/conversation.c:2159
+#: src/conversation.c:2219
 msgid "Link"
 msgstr ""
 
-#: src/conversation.c:2162
+#: src/conversation.c:2222
 msgid "Insert smiley face"
 msgstr " "
 
-#: src/conversation.c:2162
+#: src/conversation.c:2222
 msgid "Smiley"
 msgstr ""
 
-#: src/conversation.c:2165
+#: src/conversation.c:2225
 msgid "Insert IM Image"
 msgstr " IM "
 
-#: src/conversation.c:2165
+#: src/conversation.c:2225
 msgid "Image"
 msgstr ""
 
-#: src/conversation.c:2172
+#: src/conversation.c:2232
 msgid "Enable logging"
 msgstr " "
 
-#: src/conversation.c:2173 src/prefs.c:254
+#: src/conversation.c:2233 src/prefs.c:254
 msgid "Logging"
 msgstr ""
 
-#: src/conversation.c:2182
+#: src/conversation.c:2242
 msgid "Save Conversation"
 msgstr " "
 
-#: src/conversation.c:2183 src/dialogs.c:1640 src/dialogs.c:1824
-#: src/dialogs.c:3178 src/dialogs.c:3867 src/dialogs.c:4744
+#: src/conversation.c:2243 src/dialogs.c:1682 src/dialogs.c:1866
+#: src/dialogs.c:3220 src/dialogs.c:3908 src/dialogs.c:4785
 msgid "Save"
 msgstr ""
 
-#: src/conversation.c:2187
-msgid "Enable sounds"
-msgstr " "
-
-#: src/conversation.c:2188
+#: src/conversation.c:2247 src/conversation.c:2248
 msgid "Sound"
 msgstr ""
 
-#: src/conversation.c:2668
+#: src/conversation.c:2729
 msgid "Gaim - Conversations"
 msgstr "Gaim - "
 
-#: src/conversation.c:2755
+#: src/conversation.c:2816
 msgid "Send message as: "
 msgstr "  :"
 
-#: src/conversation.c:3373
+#: src/conversation.c:3453
 msgid "Gaim - Save Icon"
 msgstr "Gaim -  "
 
-#: src/conversation.c:3400
+#: src/conversation.c:3487
 msgid "Disable Animation"
 msgstr " "
 
-#: src/conversation.c:3405
+#: src/conversation.c:3492
 msgid "Enable Animation"
 msgstr " "
 
-#: src/conversation.c:3411
+#: src/conversation.c:3498
 msgid "Hide Icon"
 msgstr " "
 
-#: src/conversation.c:3417
+#: src/conversation.c:3504
 msgid "Save Icon As..."
 msgstr "  ..."
 
-#: src/dialogs.c:413
+#: src/dialogs.c:412
 msgid "Gaim - Warn user?"
 msgstr "  ?"
 
-#: src/dialogs.c:433
+#: src/dialogs.c:432
 #, c-format
 msgid "Do you really want to warn %s?"
 msgstr "    %s?"
 
-#: src/dialogs.c:438
+#: src/dialogs.c:437
 msgid "Warn anonymously?"
 msgstr " ?"
 
-#: src/dialogs.c:442
+#: src/dialogs.c:441
 msgid "Anonymous warnings are less harsh."
 msgstr "   ."
 
-#: src/dialogs.c:470
+#: src/dialogs.c:469
 #, c-format
 msgid "Removing '%s' from buddylist.\n"
 msgstr " '%s'   .\n"
 
-#: src/dialogs.c:495
+#: src/dialogs.c:494
 #, c-format
 msgid "Gaim - Remove %s?"
 msgstr "Gaim -  %s?"
 
-#: src/dialogs.c:508
+#: src/dialogs.c:507
 msgid "Remove Buddy"
 msgstr " "
 
-#: src/dialogs.c:518
+#: src/dialogs.c:517
 #, c-format
 msgid ""
 "You are about to remove '%s' from\n"
@@ -1864,14 +2327,14 @@
 "  '%s' \n"
 "  ?"
 
-#: src/dialogs.c:530 src/prpl.c:154 src/prpl.c:228
+#: src/dialogs.c:529 src/prpl.c:154 src/prpl.c:228
 msgid "Accept"
 msgstr ""
 
 #. Build OK Button
-#: src/dialogs.c:637 src/dialogs.c:720 src/dialogs.c:778 src/dialogs.c:1435
-#: src/dialogs.c:1764 src/dialogs.c:1915 src/dialogs.c:2223 src/dialogs.c:2403
-#: src/dialogs.c:2469 src/dialogs.c:3976 src/dialogs.c:4082 src/multi.c:774
+#: src/dialogs.c:635 src/dialogs.c:720 src/dialogs.c:821 src/dialogs.c:1477
+#: src/dialogs.c:1806 src/dialogs.c:1957 src/dialogs.c:2265 src/dialogs.c:2445
+#: src/dialogs.c:2511 src/dialogs.c:4017 src/dialogs.c:4123 src/multi.c:786
 msgid "OK"
 msgstr "OK"
 
@@ -1883,338 +2346,343 @@
 msgid "IM who:"
 msgstr " (UIN):"
 
-#: src/dialogs.c:756
+#: src/dialogs.c:768
 msgid "User:"
 msgstr "(UIN):"
 
+#: src/dialogs.c:777
+#, fuzzy
+msgid "Account:"
+msgstr "a "
+
 #. Finish up
-#: src/dialogs.c:783
+#: src/dialogs.c:826
 msgid "Gaim - Get User Info"
 msgstr "  "
 
-#: src/dialogs.c:898
+#: src/dialogs.c:940
 msgid "Add Group"
 msgstr " "
 
-#: src/dialogs.c:923
+#: src/dialogs.c:965
 msgid "Gaim - Add Group"
 msgstr "Gaim -  "
 
-#: src/dialogs.c:1007
+#: src/dialogs.c:1049
 msgid "Gaim - Add Buddy"
 msgstr "Gaim -  "
 
-#: src/dialogs.c:1019
+#: src/dialogs.c:1061
 msgid "Add Buddy"
 msgstr " "
 
-#: src/dialogs.c:1029
+#: src/dialogs.c:1071
 msgid "Contact"
 msgstr "UIN"
 
 #. Set up stuff for the account box
-#: src/dialogs.c:1055
+#: src/dialogs.c:1097
 msgid "Add To"
 msgstr " "
 
-#: src/dialogs.c:1092
+#: src/dialogs.c:1134
 msgid "Please enter a buddy to pounce."
 msgstr " "
 
-#: src/dialogs.c:1092
+#: src/dialogs.c:1134
 msgid "Buddy Pounce Error"
 msgstr ""
 
-#: src/dialogs.c:1228
+#: src/dialogs.c:1270
 msgid "Gaim - New Buddy Pounce"
 msgstr "Gaim -  "
 
 #. <pounce type="who">
-#: src/dialogs.c:1239
+#: src/dialogs.c:1281
 msgid "Pounce Who"
 msgstr ""
 
-#: src/dialogs.c:1250
+#: src/dialogs.c:1292
 msgid "Account"
 msgstr "a "
 
 #. </pounce type="who">
 #. <pounce type="when">
-#: src/dialogs.c:1276
+#: src/dialogs.c:1318
 msgid "Pounce When"
 msgstr " "
 
-#: src/dialogs.c:1286
+#: src/dialogs.c:1328
 msgid "Pounce on sign on"
 msgstr "  "
 
-#: src/dialogs.c:1295
+#: src/dialogs.c:1337
 msgid "Pounce on return from away"
 msgstr "  "
 
-#: src/dialogs.c:1304
+#: src/dialogs.c:1346
 msgid "Pounce on return from idle"
 msgstr "  "
 
-#: src/dialogs.c:1313
+#: src/dialogs.c:1355
 msgid "Pounce when buddy is typing to you"
 msgstr "   "
 
 #. </pounce type="when">
 #. <pounce type="action">
-#: src/dialogs.c:1323
+#: src/dialogs.c:1365
 msgid "Pounce Action"
 msgstr "  "
 
-#: src/dialogs.c:1334
+#: src/dialogs.c:1376
 msgid "Open IM Window"
 msgstr "  "
 
-#: src/dialogs.c:1343
+#: src/dialogs.c:1385
 msgid "Popup Notification"
 msgstr " "
 
-#: src/dialogs.c:1352
+#: src/dialogs.c:1394
 msgid "Send Message"
 msgstr " "
 
-#: src/dialogs.c:1373
+#: src/dialogs.c:1415
 msgid "Execute command on pounce"
 msgstr "   "
 
-#: src/dialogs.c:1395
+#: src/dialogs.c:1437
 msgid "Play sound on pounce"
 msgstr "   "
 
 #. </pounce type="action">
-#: src/dialogs.c:1417
+#: src/dialogs.c:1459
 msgid "Save this pounce after activation"
 msgstr "  "
 
-#: src/dialogs.c:1503
+#: src/dialogs.c:1545
 msgid "Gaim - Set Dir Info"
 msgstr " "
 
-#: src/dialogs.c:1512
+#: src/dialogs.c:1554
 msgid "Directory Info"
 msgstr ""
 
-#: src/dialogs.c:1534
+#: src/dialogs.c:1576
 msgid "Allow Web Searches To Find Your Info"
 msgstr "   web    ."
 
 #. Line 1
-#: src/dialogs.c:1537 src/dialogs.c:2242
+#: src/dialogs.c:1579 src/dialogs.c:2284
 msgid "First Name"
 msgstr ""
 
 #. Line 2
-#: src/dialogs.c:1548 src/dialogs.c:2254
+#: src/dialogs.c:1590 src/dialogs.c:2296
 msgid "Middle Name"
 msgstr ""
 
 #. Line 3
-#: src/dialogs.c:1560 src/dialogs.c:2266
+#: src/dialogs.c:1602 src/dialogs.c:2308
 msgid "Last Name"
 msgstr ""
 
 #. Line 4
-#: src/dialogs.c:1571 src/dialogs.c:2278
+#: src/dialogs.c:1613 src/dialogs.c:2320
 msgid "Maiden Name"
 msgstr " "
 
 #. Line 6
-#: src/dialogs.c:1593 src/dialogs.c:2301
+#: src/dialogs.c:1635 src/dialogs.c:2343
 msgid "State"
 msgstr "/"
 
-#: src/dialogs.c:1658
+#: src/dialogs.c:1700
 msgid "New Passwords Do Not Match"
 msgstr " "
 
-#: src/dialogs.c:1658 src/dialogs.c:1663
+#: src/dialogs.c:1700 src/dialogs.c:1705
 msgid "Gaim - Change Password Error"
 msgstr "Gaim -   "
 
-#: src/dialogs.c:1663
+#: src/dialogs.c:1705
 msgid "Fill out all fields completely"
 msgstr "  "
 
-#: src/dialogs.c:1718
+#: src/dialogs.c:1760
 msgid "Original Password"
 msgstr " "
 
-#: src/dialogs.c:1732
+#: src/dialogs.c:1774
 msgid "New Password"
 msgstr " "
 
-#: src/dialogs.c:1746
+#: src/dialogs.c:1788
 msgid "New Password (again)"
 msgstr "  ( )"
 
-#: src/dialogs.c:1787
+#: src/dialogs.c:1829
 msgid "Gaim - Set User Info"
 msgstr "Gaim -  "
 
-#: src/dialogs.c:1899
+#: src/dialogs.c:1941
 msgid "Below are the results of your search: "
 msgstr " "
 
-#: src/dialogs.c:2032 src/dialogs.c:2039
+#: src/dialogs.c:2074 src/dialogs.c:2081
 msgid "Permit"
 msgstr ""
 
-#: src/dialogs.c:2034 src/dialogs.c:2041
+#: src/dialogs.c:2076 src/dialogs.c:2083
 msgid "Deny"
 msgstr ""
 
-#: src/dialogs.c:2078
+#: src/dialogs.c:2120
 msgid "Gaim - Add Permit"
 msgstr "Gaim - "
 
-#: src/dialogs.c:2080
+#: src/dialogs.c:2122
 msgid "Gaim - Add Deny"
 msgstr "Gaim - "
 
-#: src/dialogs.c:2140
+#: src/dialogs.c:2182
 msgid "Gaim - Log Conversation"
 msgstr "Gaim -  "
 
-#: src/dialogs.c:2218 src/dialogs.c:2381
+#: src/dialogs.c:2260 src/dialogs.c:2423
 msgid "Search for Buddy"
 msgstr " "
 
-#: src/dialogs.c:2346
+#: src/dialogs.c:2388
 msgid "Gaim - Find Buddy By Info"
 msgstr "Gaim -   "
 
-#: src/dialogs.c:2375
+#: src/dialogs.c:2417
 msgid "Gaim - Find Buddy By Email"
 msgstr "Gaim -   Email"
 
-#: src/dialogs.c:2515
+#: src/dialogs.c:2557
 msgid "Gaim - Add URL"
 msgstr "Gaim -  URL"
 
-#: src/dialogs.c:2666 src/dialogs.c:2687 src/dialogs.c:2741
+#: src/dialogs.c:2708 src/dialogs.c:2729 src/dialogs.c:2783
 msgid "Select Text Color"
 msgstr "  "
 
-#: src/dialogs.c:2720
+#: src/dialogs.c:2762
 msgid "Select Background Color"
 msgstr "  "
 
-#: src/dialogs.c:2942
+#: src/dialogs.c:2984
 msgid "Import to:"
 msgstr ":"
 
-#: src/dialogs.c:2966
+#: src/dialogs.c:3008
 msgid "Gaim - Import Buddy List"
 msgstr "Gaim -   "
 
 #. We shouldn't allow a blank title
-#: src/dialogs.c:3033
+#: src/dialogs.c:3075
 msgid "You cannot create an away message with a blank title"
 msgstr "      "
 
 #. We shouldn't allow a blank message
-#: src/dialogs.c:3040
+#: src/dialogs.c:3082
 msgid "You cannot create an empty away message"
 msgstr "     "
 
-#: src/dialogs.c:3108
+#: src/dialogs.c:3150
 msgid "Gaim - New away message"
 msgstr "Gaim -   "
 
-#: src/dialogs.c:3118
+#: src/dialogs.c:3160
 msgid "New away message"
 msgstr ""
 
-#: src/dialogs.c:3131
+#: src/dialogs.c:3173
 msgid "Away title: "
 msgstr ""
 
-#: src/dialogs.c:3170
+#: src/dialogs.c:3212
 msgid "Use"
 msgstr ""
 
-#: src/dialogs.c:3174
+#: src/dialogs.c:3216
 msgid "Save & Use"
 msgstr "  "
 
 #. show everything
-#: src/dialogs.c:3372
+#: src/dialogs.c:3413
 msgid "Smile!"
 msgstr "!"
 
-#: src/dialogs.c:3425
+#: src/dialogs.c:3466
 msgid "Alias Buddy"
 msgstr " "
 
-#: src/dialogs.c:3458
+#: src/dialogs.c:3499
 msgid "Gaim - Alias Buddy"
 msgstr "Gaim -  "
 
-#: src/dialogs.c:3530
+#: src/dialogs.c:3571
 msgid "Gaim - Save Log File"
 msgstr "Gaim - "
 
-#: src/dialogs.c:3562
+#: src/dialogs.c:3603
 #, c-format
 msgid "Unable to remove file %s - %s"
 msgstr "   %s - %s"
 
-#: src/dialogs.c:3590
+#: src/dialogs.c:3631
 msgid "Really clear log?"
 msgstr "  ?"
 
-#: src/dialogs.c:3605
+#: src/dialogs.c:3646
 msgid "Okay"
 msgstr ""
 
-#: src/dialogs.c:3776
+#: src/dialogs.c:3817
 msgid "Date"
 msgstr ""
 
-#: src/dialogs.c:3839
+#: src/dialogs.c:3880
 msgid "Conversation"
 msgstr ""
 
-#: src/dialogs.c:3862
+#: src/dialogs.c:3903
 msgid "Clear"
 msgstr ""
 
-#: src/dialogs.c:3940
+#: src/dialogs.c:3981
 msgid "Gaim - Rename Group"
 msgstr "Gaim -  "
 
-#: src/dialogs.c:3950
+#: src/dialogs.c:3991
 msgid "Rename Group"
 msgstr " "
 
-#: src/dialogs.c:3957 src/dialogs.c:4063
+#: src/dialogs.c:3998 src/dialogs.c:4104
 msgid "New name:"
 msgstr " (UIN):"
 
-#: src/dialogs.c:4046
+#: src/dialogs.c:4087
 msgid "Gaim - Rename Buddy"
 msgstr "Gaim -  "
 
-#: src/dialogs.c:4056
+#: src/dialogs.c:4097
 msgid "Rename Buddy"
 msgstr " "
 
 #. Below is basically stolen from plugins.c
-#: src/dialogs.c:4140
+#: src/dialogs.c:4181
 msgid "Gaim - Select Perl Script"
 msgstr "Gaim -   Perl"
 
-#: src/gaimrc.c:1117
+#: src/gaimrc.c:1136
 #, c-format
 msgid "Could not open config file %s."
 msgstr "     %s."
 
-#: src/gaimrc.c:1118
+#: src/gaimrc.c:1137
 msgid "Preferences Error"
 msgstr " "
 
@@ -2227,55 +2695,65 @@
 msgid "g003: Error opening connection.\n"
 msgstr "g003:   .\n"
 
-#: src/multi.c:452
+#: src/module.c:106 src/module.c:112 src/module.c:122
+#, fuzzy
+msgid "Plugin Error"
+msgstr " "
+
+#: src/multi.c:454
 msgid "Gaim - Load Buddy Icon"
 msgstr "Gaim -   "
 
-#: src/multi.c:495
+#: src/multi.c:497
 msgid "Buddy Icon File:"
 msgstr "  :"
 
-#: src/multi.c:506
+#: src/multi.c:508
 msgid "Browse"
 msgstr ""
 
-#: src/multi.c:511 src/prefs.c:1545
+#: src/multi.c:513 src/prefs.c:1548
 msgid "Reset"
 msgstr ""
 
-#: src/multi.c:538
+#: src/multi.c:540
 msgid "Screenname:"
 msgstr " (UIN)"
 
-#: src/multi.c:558
+#: src/multi.c:559
+#, fuzzy
+msgid "Alias:"
+msgstr ""
+
+#: src/multi.c:569
 msgid "Protocol:"
 msgstr ""
 
-#: src/multi.c:563
+#: src/multi.c:574
 msgid "Remember Password"
 msgstr " "
 
-#: src/multi.c:564
+#: src/multi.c:575
 msgid "Auto-Login"
 msgstr " "
 
-#: src/multi.c:604
+#: src/multi.c:616
 msgid "New Mail Notifications"
 msgstr "   "
 
-#: src/multi.c:694
+#: src/multi.c:706
 msgid "Register with server"
 msgstr "  "
 
-#: src/multi.c:752
+#: src/multi.c:764
 msgid "Gaim - Modify Account"
 msgstr "Gaim - "
 
-#: src/multi.c:871
+#: src/multi.c:883
 msgid "Enter Password"
 msgstr " "
 
-#: src/multi.c:935
+#: src/multi.c:947
 msgid ""
 "You cannot log this account in; you do not have the protocol it uses loaded, "
 "or the protocol does not have a login function."
@@ -2284,44 +2762,44 @@
 "    ,\n"
 "     ."
 
-#: src/multi.c:937
+#: src/multi.c:949
 msgid "Login Error"
 msgstr " "
 
-#: src/multi.c:966
+#: src/multi.c:978
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "   %s?"
 
-#: src/multi.c:1003
+#: src/multi.c:1015
 msgid "Gaim - Account Editor"
 msgstr "Gaim -  "
 
-#: src/multi.c:1022
+#: src/multi.c:1034
 msgid "Select All"
 msgstr " "
 
-#: src/multi.c:1027
+#: src/multi.c:1039
 msgid "Select Autos"
 msgstr ""
 
-#: src/multi.c:1031
+#: src/multi.c:1043
 msgid "Select None"
 msgstr ""
 
-#: src/multi.c:1045
+#: src/multi.c:1057
 msgid "Modify"
 msgstr ""
 
-#: src/multi.c:1049
+#: src/multi.c:1061
 msgid "Sign On/Off"
 msgstr "/"
 
-#: src/multi.c:1053
+#: src/multi.c:1065
 msgid "Delete"
 msgstr ""
 
-#: src/multi.c:1368
+#: src/multi.c:1380
 #, c-format
 msgid ""
 "%s\n"
@@ -2330,25 +2808,25 @@
 "%s\n"
 "%s: %s"
 
-#: src/multi.c:1387
+#: src/multi.c:1399
 #, c-format
 msgid "%s was unable to sign on"
 msgstr "%s  "
 
-#: src/multi.c:1398
+#: src/multi.c:1410
 msgid "Notice"
 msgstr ""
 
-#: src/multi.c:1408
+#: src/multi.c:1420
 #, c-format
 msgid "%s has been signed off"
 msgstr "%s "
 
-#: src/multi.c:1409
+#: src/multi.c:1421
 msgid "Connection Error"
 msgstr " "
 
-#: src/perl.c:856
+#: src/perl.c:875
 msgid "Perl Scripts"
 msgstr "Perl "
 
@@ -2409,9 +2887,9 @@
 msgid "General Options"
 msgstr " "
 
-#: src/prefs.c:200 src/prefs.c:383 src/prefs.c:551 src/prefs.c:665
-#: src/prefs.c:918 src/prefs.c:1068 src/prefs.c:1293 src/prefs.c:1615
-#: src/prefs.c:1889 src/prefs.c:2322
+#: src/prefs.c:200 src/prefs.c:384 src/prefs.c:552 src/prefs.c:667
+#: src/prefs.c:921 src/prefs.c:1071 src/prefs.c:1296 src/prefs.c:1629
+#: src/prefs.c:1901 src/prefs.c:2334
 msgid "All options take effect immediately unless otherwise noted."
 msgstr "   ,    ."
 
@@ -2485,8 +2963,8 @@
 msgstr ""
 
 #: src/prefs.c:291
-msgid "KFM"
-msgstr "KFM"
+msgid "Konqueror"
+msgstr ""
 
 #: src/prefs.c:292
 msgid "Opera"
@@ -2496,27 +2974,32 @@
 msgid "Netscape"
 msgstr "Netscape"
 
-#: src/prefs.c:296
+#: src/prefs.c:294
+msgid "Mozilla"
+msgstr ""
+
+#: src/prefs.c:297
 msgid "Pop up new window by default"
 msgstr "    "
 
-#: src/prefs.c:303
+#: src/prefs.c:304
 msgid "GNOME URL Handler"
 msgstr "GNOME URL Handler"
 
-#: src/prefs.c:305
+#: src/prefs.c:306
 msgid "Galeon"
 msgstr ""
 
-#: src/prefs.c:306
-msgid "Manual"
-msgstr ""
-
-#: src/prefs.c:375
+#: src/prefs.c:307
+#, c-format
+msgid "Manual (%s for URL)"
+msgstr ""
+
+#: src/prefs.c:376
 msgid "Proxy Options"
 msgstr " Proxy"
 
-#: src/prefs.c:387
+#: src/prefs.c:388
 msgid ""
 "Not all protocols can use these proxy options. Please see the README file "
 "for details."
@@ -2524,371 +3007,381 @@
 "       .\n"
 "  README     ."
 
-#: src/prefs.c:392
+#: src/prefs.c:393
 msgid "Proxy Type"
 msgstr " Proxy"
 
-#: src/prefs.c:404
+#: src/prefs.c:405
 msgid "Proxy Server"
 msgstr "Proxy "
 
-#: src/prefs.c:407
+#: src/prefs.c:408
 msgid "No Proxy"
 msgstr " "
 
-#: src/prefs.c:419
+#: src/prefs.c:420
 msgid "SOCKS 4"
 msgstr "SOCKS 4"
 
-#: src/prefs.c:429
+#: src/prefs.c:430
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
-#: src/prefs.c:438
+#: src/prefs.c:439
 msgid "HTTP"
 msgstr "HTTP"
 
-#: src/prefs.c:462
+#: src/prefs.c:463
 msgid "Host"
 msgstr ""
 
-#: src/prefs.c:478
+#: src/prefs.c:479
 msgid "Port"
 msgstr ""
 
-#: src/prefs.c:495
+#: src/prefs.c:496
 msgid "User"
 msgstr ""
 
-#: src/prefs.c:511
+#: src/prefs.c:512
 msgid "Password"
 msgstr ""
 
-#: src/prefs.c:543
+#: src/prefs.c:544
 msgid "Buddy List Options"
 msgstr "  "
 
-#: src/prefs.c:555
+#: src/prefs.c:556
 msgid "Buddy List Window"
 msgstr "  "
 
-#: src/prefs.c:568
+#: src/prefs.c:569
 msgid "Tab Placement:"
 msgstr " :"
 
-#: src/prefs.c:572 src/prefs.c:1001 src/prefs.c:1151
+#: src/prefs.c:573 src/prefs.c:1004 src/prefs.c:1154
 msgid "Top"
 msgstr ""
 
-#: src/prefs.c:573 src/prefs.c:1003 src/prefs.c:1153
+#: src/prefs.c:574 src/prefs.c:1006 src/prefs.c:1156
 msgid "Bottom"
 msgstr ""
 
-#: src/prefs.c:585
+#: src/prefs.c:586
 msgid "Hide IM/Info/Chat buttons"
 msgstr " "
 
-#: src/prefs.c:587
+#: src/prefs.c:588
 msgid "Automatically show buddy list on sign on"
 msgstr "     "
 
-#: src/prefs.c:589
+#: src/prefs.c:590
 msgid "Display Buddy List near applet"
 msgstr "    "
 
-#: src/prefs.c:592
+#: src/prefs.c:593
 msgid "Save Window Size/Position"
 msgstr " / "
 
-#: src/prefs.c:595
+#: src/prefs.c:596
 msgid "Show pictures on buttons"
 msgstr "   "
 
 #: src/prefs.c:600
+msgid "Raise Buddy List on Signons and Signoffs"
+msgstr ""
+
+#: src/prefs.c:602
 msgid "Group Displays"
 msgstr ""
 
-#: src/prefs.c:612
+#: src/prefs.c:614
 msgid "Hide groups with no online buddies"
 msgstr "   (  Ofline)"
 
-#: src/prefs.c:618
+#: src/prefs.c:620
 msgid "Show numbers in groups"
 msgstr "  "
 
-#: src/prefs.c:620
+#: src/prefs.c:622
 msgid "Buddy Displays"
 msgstr ""
 
-#: src/prefs.c:632
+#: src/prefs.c:634
 msgid "Show buddy type icons"
 msgstr "  "
 
-#: src/prefs.c:633
+#: src/prefs.c:635
 msgid "Show warning levels"
 msgstr "  "
 
-#: src/prefs.c:639
+#: src/prefs.c:641
 msgid "Show idle times"
 msgstr "  "
 
-#: src/prefs.c:640
+#: src/prefs.c:642
 msgid "Grey idle buddies"
 msgstr " "
 
-#: src/prefs.c:657
+#: src/prefs.c:659
 msgid "Conversation Options"
 msgstr " "
 
-#: src/prefs.c:669
+#: src/prefs.c:671
 msgid "Keyboard Options"
 msgstr " "
 
-#: src/prefs.c:681
+#: src/prefs.c:683
 msgid "Enter sends message"
 msgstr "Enter  "
 
-#: src/prefs.c:682
+#: src/prefs.c:684
 msgid "Control-Enter sends message"
 msgstr "Ctrl-Enter  "
 
-#: src/prefs.c:683
+#: src/prefs.c:685
 msgid "Escape closes window"
 msgstr "Esc  "
 
-#: src/prefs.c:689
+#: src/prefs.c:686
+#, fuzzy
+msgid "Control-W closes window"
+msgstr "Esc  "
+
+#: src/prefs.c:692
 msgid "Control-{B/I/U/S} inserts HTML tags"
 msgstr "Ctrl-{B/I/U/S}   HTML "
 
-#: src/prefs.c:690
+#: src/prefs.c:693
 msgid "Control-(number) inserts smileys"
 msgstr "Ctrl-()  "
 
-#: src/prefs.c:691
+#: src/prefs.c:694
 msgid "F2 toggles timestamp display"
 msgstr "        F2"
 
-#: src/prefs.c:693
+#: src/prefs.c:696
 msgid "Display and General Options"
 msgstr "   "
 
-#: src/prefs.c:705
+#: src/prefs.c:708
 msgid "Show graphical smileys"
 msgstr "  "
 
-#: src/prefs.c:706
+#: src/prefs.c:709
 msgid "Show timestamp on messages"
 msgstr "  "
 
-#: src/prefs.c:707
+#: src/prefs.c:710
 msgid "Show URLs as links"
 msgstr " URL  "
 
-#: src/prefs.c:708
+#: src/prefs.c:711
 msgid "Highlight misspelled words"
 msgstr " "
 
-#: src/prefs.c:709 src/prefs.c:1911
+#: src/prefs.c:712 src/prefs.c:1923
 msgid "Sending messages removes away status"
 msgstr "      "
 
-#: src/prefs.c:710 src/prefs.c:1924
+#: src/prefs.c:713 src/prefs.c:1936
 msgid "Queue new messages when away"
 msgstr ""
 "   \n"
 " "
 
-#: src/prefs.c:716
+#: src/prefs.c:719
 msgid "Ignore colors"
 msgstr " "
 
-#: src/prefs.c:717
+#: src/prefs.c:720
 msgid "Ignore font faces"
 msgstr "  "
 
-#: src/prefs.c:718
+#: src/prefs.c:721
 msgid "Ignore font sizes"
 msgstr "  "
 
-#: src/prefs.c:719
+#: src/prefs.c:722
 msgid "Ignore TiK Automated Messages"
 msgstr "  "
 
-#: src/prefs.c:720 src/prefs.c:1909
+#: src/prefs.c:723 src/prefs.c:1921
 msgid "Ignore new conversations when away"
 msgstr ""
 "     \n"
 ""
 
-#: src/prefs.c:909
+#: src/prefs.c:912
 msgid "IM Options"
 msgstr " "
 
-#: src/prefs.c:922 src/prefs.c:2907
+#: src/prefs.c:925 src/prefs.c:2921
 msgid "IM Window"
 msgstr " "
 
-#: src/prefs.c:938 src/prefs.c:1088
+#: src/prefs.c:941 src/prefs.c:1091
 msgid "Show buttons as: "
 msgstr "  :"
 
-#: src/prefs.c:942 src/prefs.c:1093
+#: src/prefs.c:945 src/prefs.c:1096
 msgid "Pictures And Text"
 msgstr "  "
 
-#: src/prefs.c:943 src/prefs.c:1095
+#: src/prefs.c:946 src/prefs.c:1098
 msgid "Pictures"
 msgstr ""
 
-#: src/prefs.c:944 src/prefs.c:1096
+#: src/prefs.c:947 src/prefs.c:1099
 msgid "Text"
 msgstr ""
 
-#: src/prefs.c:955
+#: src/prefs.c:958
 msgid "Show all conversations in one tabbed window"
 msgstr "      c "
 
-#: src/prefs.c:957
+#: src/prefs.c:960
 msgid "Show chats in the same tabbed window"
 msgstr "     "
 
-#: src/prefs.c:964 src/prefs.c:1116
+#: src/prefs.c:967 src/prefs.c:1119
 msgid "Raise windows on events"
 msgstr "-   "
 
-#: src/prefs.c:965
+#: src/prefs.c:968
 msgid "Show logins in window"
 msgstr " "
 
-#: src/prefs.c:966
-msgid "Show aliases in tabs/titles"
+#: src/prefs.c:969
+#, fuzzy
+msgid "Show aliases in tabs/titles/ticker"
 msgstr "   "
 
-#: src/prefs.c:967
+#: src/prefs.c:970
 msgid "Hide window on send"
 msgstr "   "
 
-#: src/prefs.c:969 src/prefs.c:1119
+#: src/prefs.c:972 src/prefs.c:1122
 msgid "Window Sizes"
 msgstr " "
 
-#: src/prefs.c:977 src/prefs.c:1127
+#: src/prefs.c:980 src/prefs.c:1130
 msgid "New window width:"
 msgstr "  "
 
-#: src/prefs.c:978 src/prefs.c:1128
+#: src/prefs.c:981 src/prefs.c:1131
 msgid "New window height:"
 msgstr "  "
 
-#: src/prefs.c:979 src/prefs.c:1129
+#: src/prefs.c:982 src/prefs.c:1132
 msgid "Entry widget height:"
 msgstr "  "
 
-#: src/prefs.c:981 src/prefs.c:1131
+#: src/prefs.c:984 src/prefs.c:1134
 msgid "Tab Placement"
 msgstr "  "
 
-#: src/prefs.c:1010 src/prefs.c:1160
+#: src/prefs.c:1013 src/prefs.c:1163
 msgid "Left"
 msgstr ""
 
-#: src/prefs.c:1012 src/prefs.c:1162
+#: src/prefs.c:1015 src/prefs.c:1165
 msgid "Right"
 msgstr ""
 
-#: src/prefs.c:1016
+#: src/prefs.c:1019
 msgid "Buddy Icons"
 msgstr " "
 
-#: src/prefs.c:1028
+#: src/prefs.c:1031
 msgid "Hide Buddy Icons"
 msgstr "  "
 
-#: src/prefs.c:1034
+#: src/prefs.c:1037
 msgid "Disable Buddy Icon Animation"
 msgstr " "
 
-#: src/prefs.c:1060
+#: src/prefs.c:1063
 msgid "Chat Options"
 msgstr " "
 
-#: src/prefs.c:1072
+#: src/prefs.c:1075
 msgid "Group Chat Window"
 msgstr " "
 
-#: src/prefs.c:1107
+#: src/prefs.c:1110
 msgid "Show all chats in one tabbed window"
 msgstr "       "
 
-#: src/prefs.c:1109
+#: src/prefs.c:1112
 msgid "Show conversations in the same tabbed window"
 msgstr "     "
 
-#: src/prefs.c:1117
+#: src/prefs.c:1120
 msgid "Show people joining/leaving in window"
 msgstr " /   "
 
-#: src/prefs.c:1165
+#: src/prefs.c:1168
 msgid "Tab Completion"
 msgstr " "
 
-#: src/prefs.c:1177
+#: src/prefs.c:1180
 msgid "Tab-Complete Nicks"
 msgstr "Tab -  "
 
-#: src/prefs.c:1183
+#: src/prefs.c:1186
 msgid "Old-Style Tab Completion"
 msgstr "  "
 
-#: src/prefs.c:1285 src/prefs.c:2917
+#: src/prefs.c:1288 src/prefs.c:2931
 msgid "Font Options"
 msgstr ""
 
-#: src/prefs.c:1311
+#: src/prefs.c:1314
 msgid "Italic Text"
 msgstr " "
 
-#: src/prefs.c:1355 src/prefs.c:1373 src/prefs.c:1395
+#: src/prefs.c:1358 src/prefs.c:1376 src/prefs.c:1398
 msgid "Select"
 msgstr ""
 
-#: src/prefs.c:1393
+#: src/prefs.c:1396
 msgid "Font Face for Text"
 msgstr " "
 
-#: src/prefs.c:1408
+#: src/prefs.c:1411
 msgid "Font Size for Text"
 msgstr " "
 
-#: src/prefs.c:1505
+#: src/prefs.c:1508
 msgid "Gaim - Sound Configuration"
 msgstr "Gaim -  "
 
-#: src/prefs.c:1540
+#: src/prefs.c:1543
 msgid "Test"
 msgstr ""
 
-#: src/prefs.c:1550
+#: src/prefs.c:1553
 msgid "Choose..."
 msgstr ""
 
-#: src/prefs.c:1607
+#: src/prefs.c:1621
 msgid "Sound Options"
 msgstr " "
 
-#: src/prefs.c:1635
+#: src/prefs.c:1649
 msgid "No sounds when you log in"
 msgstr "   "
 
-#: src/prefs.c:1641 src/prefs.c:1910
+#: src/prefs.c:1655 src/prefs.c:1922
 msgid "Sounds while away"
 msgstr "   "
 
-#: src/prefs.c:1651
+#: src/prefs.c:1665
 msgid "Sound method"
 msgstr " "
 
-#: src/prefs.c:1725
+#: src/prefs.c:1739
 #, c-format
 msgid ""
 "Sound command\n"
@@ -2897,103 +3390,103 @@
 "  \n"
 "(%s    )"
 
-#: src/prefs.c:1737
+#: src/prefs.c:1751
 msgid "Sound played when:"
 msgstr " :"
 
-#: src/prefs.c:1881 src/prefs.c:2939
+#: src/prefs.c:1893 src/prefs.c:2953
 msgid "Away Messages"
 msgstr "  (Away)"
 
-#: src/prefs.c:1918
+#: src/prefs.c:1930
 msgid "Don't send auto-response"
 msgstr "  "
 
-#: src/prefs.c:1919
+#: src/prefs.c:1931
 msgid "Only send auto-response when idle"
 msgstr "  "
 
-#: src/prefs.c:1934
+#: src/prefs.c:1946
 msgid "Time between sending auto-responses (in seconds):"
 msgstr "    ( ):"
 
-#: src/prefs.c:1949
+#: src/prefs.c:1961
 msgid "Auto Away after"
 msgstr " Away "
 
-#: src/prefs.c:1963
+#: src/prefs.c:1975
 msgid "minutes using"
 msgstr " "
 
-#: src/prefs.c:1976
+#: src/prefs.c:1988
 msgid "Messages"
 msgstr ""
 
-#: src/prefs.c:2033
+#: src/prefs.c:2045
 msgid "Edit"
 msgstr ""
 
-#: src/prefs.c:2037
+#: src/prefs.c:2049
 msgid "Make Away"
 msgstr ""
 
-#: src/prefs.c:2314
+#: src/prefs.c:2326
 msgid "Privacy Options"
 msgstr " "
 
-#: src/prefs.c:2330
+#: src/prefs.c:2342
 msgid "Set privacy for:"
 msgstr "  :"
 
-#: src/prefs.c:2349
+#: src/prefs.c:2361
 msgid "Allow all users to contact me"
 msgstr "   "
 
-#: src/prefs.c:2350
+#: src/prefs.c:2362
 msgid "Allow only the users below"
 msgstr "   "
 
-#: src/prefs.c:2352
+#: src/prefs.c:2364
 msgid "Allow List"
 msgstr " "
 
-#: src/prefs.c:2383
+#: src/prefs.c:2395
 msgid "Deny all users"
 msgstr "   "
 
-#: src/prefs.c:2384
+#: src/prefs.c:2396
 msgid "Block the users below"
 msgstr "    ' '"
 
-#: src/prefs.c:2386
+#: src/prefs.c:2398
 msgid "Block List"
 msgstr "' '"
 
-#: src/prefs.c:2481
+#: src/prefs.c:2493
 msgid "Gaim - Preferences"
 msgstr "Gaim - "
 
-#: src/prefs.c:2564
+#: src/prefs.c:2576
 msgid "Gaim debug output window"
 msgstr "  Gaim"
 
-#: src/prefs.c:2873
+#: src/prefs.c:2887
 msgid "General"
 msgstr ""
 
-#: src/prefs.c:2878
+#: src/prefs.c:2892
 msgid "Proxy"
 msgstr ""
 
-#: src/prefs.c:2902
+#: src/prefs.c:2916
 msgid "Conversations"
 msgstr ""
 
-#: src/prefs.c:2928
+#: src/prefs.c:2942
 msgid "Sounds"
 msgstr ""
 
-#: src/prefs.c:2950
+#: src/prefs.c:2964
 msgid "Privacy"
 msgstr ""
 
@@ -3037,36 +3530,37 @@
 msgid "Open Mail"
 msgstr " "
 
-#: src/prpl.c:564
-#, c-format
-msgid "%s%s%s%s has made %s their buddy%s%s%s"
+#: src/prpl.c:570
+#, fuzzy, c-format
+msgid "%s%s%s%s has made %s his or her buddy%s%s%s"
 msgstr "%s%s%s%s  %s   %s%s%s"
 
-#: src/prpl.c:572
+#: src/prpl.c:578
+#, fuzzy
 msgid ""
 "\n"
 "\n"
-"Do you wish to add them to your buddy list?"
+"Do you wish to add him or her to your buddy list?"
 msgstr ""
 "\n"
 "\n"
 "   ?"
 
-#: src/prpl.c:615
+#: src/prpl.c:621
 msgid ""
 "You do not currently have any protocols available that are able to register "
 "new accounts."
 msgstr "      ."
 
-#: src/prpl.c:652
+#: src/prpl.c:658
 msgid "Gaim - Registration"
 msgstr "Gaim - "
 
-#: src/prpl.c:667
+#: src/prpl.c:673
 msgid "Registration Information"
 msgstr " "
 
-#: src/prpl.c:684
+#: src/prpl.c:690
 msgid "Register"
 msgstr ""
 
@@ -3095,30 +3589,59 @@
 msgid "No"
 msgstr ""
 
-#: src/server.c:1054
+#: src/server.c:1076
 msgid "More Info"
 msgstr " "
 
-#~ msgid "Available"
-#~ msgstr ""
-
-#~ msgid "Available for friends only"
-#~ msgstr "   "
-
-#~ msgid "Away for friends only"
-#~ msgstr "   "
-
-#~ msgid "Invisible"
-#~ msgstr ""
-
-#~ msgid "Invisible for friends only"
-#~ msgstr "   "
-
-#~ msgid ""
-#~ "\n"
-#~ "\n"
-#~ "IRC: #gaim on irc.openprojects.net"
-#~ msgstr ""
-#~ "\n"
-#~ "\n"
-#~ "IRC: #gaim on irc.openprojects.net"
+#: src/sound.c:63
+#, fuzzy
+msgid "Buddy logs in"
+msgstr " "
+
+#: src/sound.c:64
+#, fuzzy
+msgid "Buddy logs out"
+msgstr " "
+
+#: src/sound.c:65
+#, fuzzy
+msgid "Message received"
+msgstr " "
+
+#: src/sound.c:66
+msgid "Message received begins conversation"
+msgstr ""
+
+#: src/sound.c:67
+#, fuzzy
+msgid "Message sent"
+msgstr ""
+
+#: src/sound.c:68
+msgid "Person enters chat"
+msgstr ""
+
+#: src/sound.c:69
+msgid "Person leaves chat"
+msgstr ""
+
+#: src/sound.c:70
+msgid "You talk in chat"
+msgstr ""
+
+#: src/sound.c:71
+msgid "Others talk in chat"
+msgstr ""
+
+#: src/sound.c:74
+msgid "Someone says your name in chat"
+msgstr ""
+
+#~ msgid "Enable sounds"
+#~ msgstr " "
+
+#~ msgid "KFM"
+#~ msgstr "KFM"
+
+#~ msgid "Manual"
+#~ msgstr ""
--- a/po/sk.po	Tue Jul 02 05:41:30 2002 +0000
+++ b/po/sk.po	Tue Jul 02 05:42:26 2002 +0000
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gaim 0.48\n"
-"POT-Creation-Date: 2002-04-11 22:46-0700\n"
+"POT-Creation-Date: 2002-06-25 00:10-0400\n"
 "PO-Revision-Date: 2001-02-22 00:00\n"
 "Last-Translator: Daniel Ren <daniel@rezny.sk>\n"
 "Language-Team: SK <SK@li.org>\n"
@@ -13,6 +13,115 @@
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: plugins/chatlist.c:67 src/buddy_chat.c:272
+msgid "Buddy Chat"
+msgstr "Chat s kamartom"
+
+#: plugins/chatlist.c:166 plugins/chatlist.c:168 plugins/chatlist.c:407
+#: plugins/chatlist.c:409
+#, fuzzy
+msgid "Gaim Chat"
+msgstr "Gaim - Chat"
+
+#: plugins/chatlist.c:339 src/about.c:165 src/aim.c:320 src/buddy.c:2716
+#: src/buddy_chat.c:1322 src/buddy_chat.c:1419 src/buddy_chat.c:1449
+#: src/conversation.c:2864 src/dialogs.c:567 src/dialogs.c:3899
+#: src/multi.c:1069 src/plugins.c:277 src/prefs.c:2547 src/prpl.c:438
+#: src/prpl.c:685 src/server.c:1072
+msgid "Close"
+msgstr "Zatvori"
+
+#: plugins/chatlist.c:344
+#, fuzzy
+msgid "Chat Rooms"
+msgstr "Voby chatu"
+
+#: plugins/chatlist.c:363
+msgid "Refresh"
+msgstr ""
+
+#. Put the buttons in the box
+#: plugins/chatlist.c:364 src/buddy.c:492 src/buddy.c:2827
+#: src/buddy_chat.c:1454 src/conversation.c:2389 src/conversation.c:2879
+#: src/dialogs.c:932 src/dialogs.c:1114 src/dialogs.c:2095 src/multi.c:1053
+#: src/prefs.c:2041 src/prefs.c:2383 src/prefs.c:2417
+msgid "Add"
+msgstr "Prida"
+
+#: plugins/chatlist.c:365 src/buddy.c:494 src/buddy.c:2829
+#: src/buddy_chat.c:1456 src/conversation.c:2375 src/conversation.c:2876
+#: src/prefs.c:2055 src/prefs.c:2387 src/prefs.c:2421
+msgid "Remove"
+msgstr "Zrui"
+
+#: plugins/chatlist.c:388
+msgid "List of available chats"
+msgstr ""
+
+#: plugins/chatlist.c:398
+msgid "List of subscribed chats"
+msgstr ""
+
+#: plugins/gtik.c:699
+msgid "Gnome Stock Ticker Properties"
+msgstr ""
+
+#: plugins/gtik.c:711
+msgid "Update Frequency in min"
+msgstr ""
+
+#: plugins/gtik.c:727
+msgid "Enter symbols delimited with \"+\" in the box below."
+msgstr ""
+
+#. OUTPUT FORMAT and SCROLL DIRECTION
+#: plugins/gtik.c:737
+msgid "Check this box to display only symbols and price:"
+msgstr ""
+
+#: plugins/gtik.c:738
+msgid "Check this box to scroll left to right:"
+msgstr ""
+
+#: plugins/gtik.c:974
+#, fuzzy
+msgid "(No"
+msgstr "Nie"
+
+#: plugins/gtik.c:975
+#, fuzzy
+msgid "Change"
+msgstr "Kanl:"
+
+#: src/protocols/gg/gg.c:71 src/protocols/msn/msn.c:1919
+msgid "Available"
+msgstr "Prtomn"
+
+#: src/protocols/gg/gg.c:72
+msgid "Available for friends only"
+msgstr "Prtomn iba pre priateov"
+
+#: src/applet.c:197 src/buddy.c:497 src/buddy.c:2582 src/buddy.c:2727
+#: src/protocols/gg/gg.c:73 src/protocols/jabber/jabber.c:1118
+msgid "Away"
+msgstr "Pre"
+
+#: src/protocols/gg/gg.c:74
+msgid "Away for friends only"
+msgstr "Pre iba pre priateov"
+
+#: src/protocols/gg/gg.c:75
+msgid "Invisible"
+msgstr "Neviditen"
+
+#: src/protocols/gg/gg.c:76
+msgid "Invisible for friends only"
+msgstr "Neviditen iba pre priateov"
+
+#: src/protocols/gg/gg.c:77 src/protocols/jabber/jabber.c:1114
+msgid "Unavailable"
+msgstr "Nedostupn"
+
 #: src/protocols/gg/gg.c:182
 msgid "Unable to resolve hostname."
 msgstr "Nemem rozpozna meno hostitea."
@@ -43,7 +152,7 @@
 msgid "Unknown Error Code."
 msgstr "Neznmy chybov kd."
 
-#: src/protocols/gg/gg.c:302
+#: src/protocols/gg/gg.c:302 src/protocols/msn/msn.c:2050
 #, c-format
 msgid "Status: %s"
 msgstr "Stav: %s"
@@ -174,7 +283,7 @@
 msgstr "Pohlavie"
 
 #. Line 5
-#: src/dialogs.c:1582 src/dialogs.c:2290 src/protocols/gg/gg.c:729
+#: src/dialogs.c:1624 src/dialogs.c:2332 src/protocols/gg/gg.c:729
 msgid "City"
 msgstr "Mesto"
 
@@ -253,7 +362,12 @@
 msgid "Directory Search"
 msgstr "Vyhladvanie v prieinku"
 
-#: src/dialogs.c:1699 src/protocols/gg/gg.c:1160 src/protocols/gg/gg.c:1177
+#.
+#. } else if (!strcmp(act, _("Set Dir Info"))) {
+#. show_set_dir(gc);
+#.
+#: src/dialogs.c:1741 src/protocols/gg/gg.c:1160 src/protocols/gg/gg.c:1177
+#: src/protocols/jabber/jabber.c:3748 src/protocols/jabber/jabber.c:3761
 msgid "Change Password"
 msgstr "Zmeni heslo"
 
@@ -276,8 +390,8 @@
 msgstr "Poli sprvu cez server"
 
 #: src/protocols/icq/gaim_icq.c:469 src/protocols/irc/irc.c:1851
-#: src/protocols/jabber/jabber.c:2112 src/protocols/oscar/oscar.c:3436
-#: src/protocols/toc/toc.c:1216
+#: src/protocols/jabber/jabber.c:2860 src/protocols/oscar/oscar.c:3593
+#: src/protocols/toc/toc.c:1219
 msgid "Get Info"
 msgstr "Zskaj Info"
 
@@ -315,7 +429,7 @@
 "connection?"
 msgstr ""
 
-#: src/protocols/irc/irc.c:1001
+#: src/protocols/irc/irc.c:1001 src/protocols/msn/msn.c:315
 msgid "Unable to write"
 msgstr "Nemem zapisova"
 
@@ -342,7 +456,7 @@
 msgid "Channel:"
 msgstr "Kanl:"
 
-#: src/multi.c:547 src/protocols/irc/irc.c:1675
+#: src/multi.c:549 src/protocols/irc/irc.c:1675
 msgid "Password:"
 msgstr "Heslo:"
 
@@ -351,321 +465,630 @@
 msgid "DCC Chat"
 msgstr "Chat"
 
-#: src/protocols/jabber/jabber.c:699
-msgid "Unavailable"
-msgstr "Nedostupn"
-
-#: src/applet.c:293 src/buddy.c:493 src/buddy.c:2508 src/buddy.c:2644
-#: src/protocols/jabber/jabber.c:703
-msgid "Away"
-msgstr "Pre"
-
-#: src/buddy.c:2801 src/protocols/jabber/jabber.c:705
-#: src/protocols/jabber/jabber.c:723
+#: src/protocols/jabber/jabber.c:942
+msgid "Incorrect current password! Password NOT Changed!"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:943 src/protocols/jabber/jabber.c:948
+#, fuzzy
+msgid "Password Change Error!"
+msgstr "Gaim - Zmena hesla"
+
+#: src/protocols/jabber/jabber.c:947
+msgid "New password same as old password! Password NOT Changed!"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1092
+msgid "Unknown"
+msgstr ""
+
+#: src/buddy.c:2887 src/protocols/jabber/jabber.c:1120
+#: src/protocols/jabber/jabber.c:1138
 msgid "Online"
 msgstr "Pripojen"
 
-#: src/protocols/jabber/jabber.c:707
+#: src/protocols/jabber/jabber.c:1122
 msgid "Extended Away"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:709
+#: src/protocols/jabber/jabber.c:1124
 msgid "Do Not Disturb"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1042
+#: src/protocols/jabber/jabber.c:1434
+#, c-format
+msgid "Error %s: %s"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1437
+#, fuzzy
+msgid "Unknown Error in presence"
+msgstr "Neznmy chybov kd."
+
+#: src/protocols/jabber/jabber.c:1607
+#, fuzzy, c-format
+msgid "The user %s wants to add you to their buddy list."
+msgstr ""
+"\n"
+"\n"
+"elte si prida ich do Vho zoznamu kamartov?"
+
+#: src/protocols/jabber/jabber.c:1632
 #, fuzzy
 msgid "No such user"
 msgstr "iaden server"
 
-#: src/protocols/jabber/jabber.c:1044
+#: src/protocols/jabber/jabber.c:1634 src/protocols/jabber/jabber.c:2341
+#: src/protocols/jabber/jabber.c:2506
 #, fuzzy
 msgid "Jabber Error"
 msgstr "Chyba sprvy"
 
-#: src/dialogs.c:845 src/protocols/jabber/jabber.c:1124
+#: src/dialogs.c:887 src/protocols/jabber/jabber.c:1719
+#: src/protocols/msn/msn.c:1110
 msgid "Buddies"
 msgstr "Kamarti"
 
-#: src/protocols/jabber/jabber.c:1188
+#: src/protocols/jabber/jabber.c:1782
 #, fuzzy
 msgid "Authenticating"
 msgstr "Autentifikcia preruen"
 
-#: src/protocols/jabber/jabber.c:1225
+#: src/protocols/jabber/jabber.c:1819
 #, fuzzy
 msgid "Unknown login error"
 msgstr "Neznmy chybov kd."
 
-#: src/protocols/jabber/jabber.c:1455 src/protocols/jabber/jabber.c:2903
+#: src/protocols/jabber/jabber.c:2010
+#, fuzzy
+msgid "Password successfully changed."
+msgstr "Heslo bolo spene zmenen"
+
+#: src/protocols/jabber/jabber.c:2012
+#, fuzzy
+msgid "Password Change"
+msgstr "Gaim - Zmena hesla"
+
+#: src/protocols/jabber/jabber.c:2054 src/protocols/jabber/jabber.c:3676
 #, fuzzy
 msgid "Connection lost"
 msgstr "Spojenie ukonen"
 
-#: src/protocols/jabber/jabber.c:1457 src/protocols/jabber/jabber.c:1489
-#: src/protocols/jabber/jabber.c:2905 src/protocols/jabber/jabber.c:2951
+#: src/protocols/jabber/jabber.c:2056 src/protocols/jabber/jabber.c:2088
+#: src/protocols/jabber/jabber.c:3678 src/protocols/jabber/jabber.c:3724
+#: src/protocols/msn/msn.c:1741 src/protocols/msn/msn.c:1770
 #, fuzzy
 msgid "Unable to connect"
 msgstr "Nemem sa pripoji."
 
-#: src/protocols/jabber/jabber.c:1463
+#: src/protocols/jabber/jabber.c:2062
 #, fuzzy
 msgid "Connected"
 msgstr "Odpojen."
 
-#: src/protocols/jabber/jabber.c:1466
+#: src/protocols/jabber/jabber.c:2065
 #, fuzzy
 msgid "Requesting Authentication Method"
 msgstr "Autentifikcia preruen"
 
 #. we have no chats yet
-#: src/protocols/jabber/jabber.c:1484
+#: src/protocols/jabber/jabber.c:2083 src/protocols/msn/msn.c:1762
 #, fuzzy
 msgid "Connecting"
 msgstr "Spojenie ukonen"
 
-#: src/protocols/jabber/jabber.c:1783
+#: src/protocols/jabber/jabber.c:2340 src/protocols/jabber/jabber.c:2505
+#, fuzzy
+msgid "Invalid Jabber I.D."
+msgstr "Nesprvne meno"
+
+#: src/protocols/jabber/jabber.c:2473
 msgid "Room:"
 msgstr "Miestnos:"
 
-#: src/protocols/jabber/jabber.c:1787
+#: src/protocols/jabber/jabber.c:2477
 msgid "Server:"
 msgstr "Server:"
 
-#: src/protocols/jabber/jabber.c:1792
+#: src/protocols/jabber/jabber.c:2482
 msgid "Handle:"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:2062 src/protocols/jabber/jabber.c:2401
-msgid "Unknown"
-msgstr ""
-
-#: src/buddy_chat.c:875 src/protocols/jabber/jabber.c:2117
-#: src/protocols/oscar/oscar.c:3443
+#: src/protocols/jabber/jabber.c:2539
+#, fuzzy
+msgid "Chats"
+msgstr "Chat"
+
+#: src/protocols/jabber/jabber.c:2854
+#, fuzzy
+msgid "View Error Msg"
+msgstr "Pozrie zznam"
+
+#: src/buddy_chat.c:886 src/protocols/jabber/jabber.c:2865
+#: src/protocols/oscar/oscar.c:3606
 msgid "Get Away Msg"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:2299
+#: src/protocols/jabber/jabber.c:2882
+msgid "Remove From Roster"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:3076
 #, fuzzy
 msgid "Full Name"
 msgstr "Prv meno"
 
-#: src/protocols/jabber/jabber.c:2300
+#: src/protocols/jabber/jabber.c:3077
 #, fuzzy
 msgid "Family Name"
 msgstr "Prv meno"
 
-#: src/protocols/jabber/jabber.c:2301
+#: src/protocols/jabber/jabber.c:3078
 #, fuzzy
 msgid "Given Name"
 msgstr "Druh meno"
 
-#: src/protocols/jabber/jabber.c:2302
+#: src/protocols/jabber/jabber.c:3079
 #, fuzzy
 msgid "Nickname"
 msgstr "Prezvka"
 
-#: src/dialogs.c:2483 src/protocols/jabber/jabber.c:2303
+#: src/dialogs.c:2525 src/protocols/jabber/jabber.c:3080
 msgid "URL"
 msgstr "URL"
 
-#: src/protocols/jabber/jabber.c:2304
+#: src/protocols/jabber/jabber.c:3081
 msgid "Street Address"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:2305
+#: src/protocols/jabber/jabber.c:3082
 msgid "Extended Address"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:2306
+#: src/protocols/jabber/jabber.c:3083
 #, fuzzy
 msgid "Locality"
 msgstr "ZLocate"
 
-#: src/protocols/jabber/jabber.c:2307
+#: src/protocols/jabber/jabber.c:3084
 msgid "Region"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:2308
+#: src/protocols/jabber/jabber.c:3085
 msgid "Postal Code"
 msgstr ""
 
 #. Line 7
-#: src/dialogs.c:1604 src/dialogs.c:2312 src/protocols/jabber/jabber.c:2309
+#: src/dialogs.c:1646 src/dialogs.c:2354 src/protocols/jabber/jabber.c:3086
 msgid "Country"
 msgstr "Krajina"
 
-#: src/protocols/jabber/jabber.c:2310
+#: src/protocols/jabber/jabber.c:3087
 #, fuzzy
 msgid "Telephone"
 msgstr "Vybrat iaden"
 
-#: src/dialogs.c:2388 src/protocols/jabber/jabber.c:2311
+#: src/dialogs.c:2430 src/protocols/jabber/jabber.c:3088
 msgid "Email"
 msgstr "Email"
 
-#: src/protocols/jabber/jabber.c:2312
+#: src/protocols/jabber/jabber.c:3089
 msgid "Organization Name"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:2313
+#: src/protocols/jabber/jabber.c:3090
 msgid "Organization Unit"
 msgstr ""
 
-#: src/prefs.c:1988 src/protocols/jabber/jabber.c:2314
+#: src/prefs.c:2000 src/protocols/jabber/jabber.c:3091
 msgid "Title"
 msgstr "Nzov"
 
-#: src/protocols/jabber/jabber.c:2315
+#: src/protocols/jabber/jabber.c:3092
 #, fuzzy
 msgid "Role"
 msgstr "Zrui"
 
-#: src/protocols/jabber/jabber.c:2316
+#: src/protocols/jabber/jabber.c:3093
 #, fuzzy
 msgid "Birthday"
 msgstr "Rok narodenia"
 
 #. Right side: frame with description and the filepath of plugin
-#: src/dialogs.c:2491 src/plugins.c:211 src/protocols/jabber/jabber.c:2317
+#: src/dialogs.c:2533 src/plugins.c:211 src/protocols/jabber/jabber.c:3094
 msgid "Description"
 msgstr "Popis"
 
-#: src/protocols/jabber/jabber.c:2342
+#: src/protocols/jabber/jabber.c:3119
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:2343
+#: src/protocols/jabber/jabber.c:3120
 msgid "User Identity"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:2759
+#: src/protocols/jabber/jabber.c:3532
 msgid "Gaim - Edit Jabber vCard"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:2833
+#: src/protocols/jabber/jabber.c:3606
 msgid "Server Registration successful!"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:2860
+#: src/protocols/jabber/jabber.c:3633
 msgid "Unknown registration error"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:2969 src/protocols/jabber/jabber.c:2984
+#: src/protocols/jabber/jabber.c:3742 src/protocols/jabber/jabber.c:3757
 #, fuzzy
 msgid "Set User Info"
 msgstr "Zska informcie o uvateovi"
 
-#: src/protocols/msn/msn.c:719 src/protocols/msn/msn.c:2041
-#: src/protocols/msn/msn.c:2074
+#: src/protocols/msn/msn.c:230
+msgid "Syntax Error (probably a Gaim bug)"
+msgstr ""
+
+#: src/protocols/msn/msn.c:233
+msgid "Invalid Parameter (probably a Gaim bug)"
+msgstr ""
+
+#: src/protocols/msn/msn.c:236
+#, fuzzy
+msgid "Invalid User"
+msgstr "Nesprvne meno"
+
+#: src/protocols/msn/msn.c:239
+msgid "Fully Qualified Domain Name missing"
+msgstr ""
+
+#: src/protocols/msn/msn.c:242
+msgid "Already Login"
+msgstr ""
+
+#: src/protocols/msn/msn.c:245
+#, fuzzy
+msgid "Invalid Username"
+msgstr "Nesprvne meno"
+
+#: src/protocols/msn/msn.c:248
+#, fuzzy
+msgid "Invalid Friendly Name"
+msgstr "Nesprvne meno"
+
+#: src/protocols/msn/msn.c:251
+msgid "List Full"
+msgstr ""
+
+#: src/protocols/msn/msn.c:254
+msgid "Already there"
+msgstr ""
+
+#: src/protocols/msn/msn.c:257
+#, fuzzy
+msgid "Not on list"
+msgstr "Spojenie ukonen"
+
+#: src/protocols/msn/msn.c:260
+msgid "User is offline"
+msgstr ""
+
+#: src/protocols/msn/msn.c:263
+msgid "Already in the mode"
+msgstr ""
+
+#: src/protocols/msn/msn.c:266
+msgid "Already in opposite list"
+msgstr ""
+
+#: src/protocols/msn/msn.c:269
+msgid "Switchboard failed"
+msgstr ""
+
+#: src/protocols/msn/msn.c:272
+msgid "Notify Transfer failed"
+msgstr ""
+
+#: src/protocols/msn/msn.c:276
+msgid "Required fields missing"
+msgstr ""
+
+#: src/protocols/msn/msn.c:279
+#, fuzzy
+msgid "Not logged in"
+msgstr "%s prihlsen."
+
+#: src/protocols/msn/msn.c:283
+#, fuzzy
+msgid "Internal server error"
+msgstr "Vntorn chyba"
+
+#: src/protocols/msn/msn.c:286
+msgid "Database server error"
+msgstr ""
+
+#: src/protocols/msn/msn.c:289
+#, fuzzy
+msgid "File operation error"
+msgstr "vntorn chyba spojenia\n"
+
+#: src/protocols/msn/msn.c:292
+#, fuzzy
+msgid "Memory allocation error"
+msgstr "vntorn chyba spojenia\n"
+
+#: src/protocols/msn/msn.c:296
+#, fuzzy
+msgid "Server busy"
+msgstr "Server:"
+
+#: src/protocols/msn/msn.c:299
+#, fuzzy
+msgid "Server unavailable"
+msgstr "Nedostupn"
+
+#: src/protocols/msn/msn.c:302
+msgid "Peer Notification server down"
+msgstr ""
+
+#: src/protocols/msn/msn.c:305
+#, fuzzy
+msgid "Database connect error"
+msgstr "vntorn chyba spojenia\n"
+
+#: src/protocols/msn/msn.c:308
+msgid "Server is going down (abandon ship)"
+msgstr ""
+
+#: src/protocols/msn/msn.c:312
+#, fuzzy
+msgid "Error creating connection"
+msgstr "g003: Chyba pri otvran spojenia.\n"
+
+#: src/protocols/msn/msn.c:318
+msgid "Session overload"
+msgstr ""
+
+#: src/protocols/msn/msn.c:321
+msgid "User is too active"
+msgstr ""
+
+#: src/protocols/msn/msn.c:324
+msgid "Too many sessions"
+msgstr ""
+
+#: src/protocols/msn/msn.c:327
+msgid "Not expected"
+msgstr ""
+
+#: src/protocols/msn/msn.c:330
+msgid "Bad friend file"
+msgstr ""
+
+#: src/protocols/msn/msn.c:334
+#, fuzzy
+msgid "Authentication failed"
+msgstr "Autentifikcia neuspen"
+
+#: src/protocols/msn/msn.c:337
+#, fuzzy
+msgid "Not allowed when offline"
+msgstr "Ziadne zvuky ke sa prihlsite"
+
+#: src/protocols/msn/msn.c:340
+msgid "Not accepting new users"
+msgstr ""
+
+#: src/protocols/msn/msn.c:343
+msgid "User unverified"
+msgstr ""
+
+#: src/protocols/msn/msn.c:346
+#, fuzzy
+msgid "Unknown Error Code"
+msgstr "Neznmy chybov kd."
+
+#: src/protocols/msn/msn.c:351 src/protocols/msn/msn.c:558
+#: src/protocols/msn/msn.c:813 src/protocols/msn/msn.c:2114
+#: src/protocols/msn/msn.c:2283 src/protocols/msn/msn.c:2336
 msgid "MSN Error"
 msgstr "Chyba MSN"
 
-#: src/protocols/msn/msn.c:719
+#: src/protocols/msn/msn.c:558
+msgid "A message may not have been received."
+msgstr ""
+
+#: src/protocols/msn/msn.c:813
 msgid "Gaim was unable to send a message"
 msgstr "Gaim neme posla sprvu"
 
-#: src/protocols/msn/msn.c:1069
+#: src/protocols/msn/msn.c:917
+#, c-format
+msgid "The user %s (%s) wants to add %s to his or her buddy list."
+msgstr ""
+
+#: src/protocols/msn/msn.c:1074
+#, c-format
+msgid "The user %s (%s) wants to add you to their buddy list"
+msgstr ""
+
+#: src/protocols/msn/msn.c:1175
 #, fuzzy
 msgid "You have been disconnected. You have signed on from another location."
 msgstr "Boli ste odpojen z chatovacej miestnosti %s."
 
-#: src/protocols/msn/msn.c:2041 src/protocols/msn/msn.c:2074
+#: src/protocols/msn/msn.c:1435 src/protocols/msn/msn.c:1679
+#, fuzzy
+msgid "Error reading from server"
+msgstr "Chyba pri tan zo socketu."
+
+#: src/protocols/msn/msn.c:1568
+msgid "Requesting to send password"
+msgstr ""
+
+#: src/protocols/msn/msn.c:1618
+#, fuzzy
+msgid "Unable to send password"
+msgstr "Nemem ta sbor %s."
+
+#: src/protocols/msn/msn.c:1623
+#, fuzzy
+msgid "Password sent"
+msgstr "Heslo: "
+
+#: src/protocols/msn/msn.c:1748
+#, fuzzy
+msgid "Unable to write to server"
+msgstr "Nemem sa pripoji na server."
+
+#: src/protocols/msn/msn.c:1754
+#, fuzzy
+msgid "Synching with server"
+msgstr "Pripjam sa na GG server"
+
+#: src/protocols/msn/msn.c:1920
+msgid "Away From Computer"
+msgstr ""
+
+#: src/protocols/msn/msn.c:1921
+msgid "Be Right Back"
+msgstr ""
+
+#: src/protocols/msn/msn.c:1922
+#, fuzzy
+msgid "Busy"
+msgstr "Kamart"
+
+#: src/protocols/msn/msn.c:1923
+msgid "On The Phone"
+msgstr ""
+
+#: src/protocols/msn/msn.c:1924
+msgid "Out To Lunch"
+msgstr ""
+
+#: src/protocols/msn/msn.c:1925
+#, fuzzy
+msgid "Hidden"
+msgstr "Skry ikonu"
+
+#: src/protocols/msn/msn.c:2041
+msgid "Reset friendly name"
+msgstr ""
+
+#: src/protocols/msn/msn.c:2114
+msgid "Friendly name too long."
+msgstr ""
+
+#: src/protocols/msn/msn.c:2129 src/protocols/msn/msn.c:2150
+#, fuzzy
+msgid "Set Friendly Name"
+msgstr "Druh meno"
+
+#: src/protocols/msn/msn.c:2130
+#, fuzzy
+msgid "Set Friendly Name:"
+msgstr "Meno obrazovky: "
+
+#: src/protocols/msn/msn.c:2131
+msgid "Reset All Friendly Names"
+msgstr ""
+
+#: src/protocols/msn/msn.c:2283 src/protocols/msn/msn.c:2336
 msgid "Invalid name"
 msgstr "Nesprvne meno"
 
-#: src/protocols/napster/napster.c:450 src/protocols/oscar/oscar.c:3075
-#: src/protocols/toc/toc.c:1101
+#: src/protocols/napster/napster.c:457 src/protocols/oscar/oscar.c:3209
+#: src/protocols/toc/toc.c:1104
 msgid "Join what group:"
 msgstr "Ktor skupinu pripoji:"
 
-#: src/protocols/oscar/oscar.c:333
+#: src/protocols/oscar/oscar.c:330
 #, c-format
 msgid "Direct IM with %s closed"
 msgstr "Priame IM s %s zruen"
 
-#: src/protocols/oscar/oscar.c:335
+#: src/protocols/oscar/oscar.c:332
 #, fuzzy, c-format
 msgid "Direct IM with %s failed"
 msgstr "Priame IM s %s zruen"
 
-#: src/protocols/oscar/oscar.c:373
+#: src/protocols/oscar/oscar.c:370
 msgid "connection error (rend)\n"
 msgstr "chyba spojenia (rend)\n"
 
-#: src/protocols/oscar/oscar.c:384
+#: src/protocols/oscar/oscar.c:381
 msgid "major connection error\n"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:385 src/protocols/toc/toc.c:511
+#: src/protocols/oscar/oscar.c:382 src/protocols/toc/toc.c:511
 #: src/protocols/toc/toc.c:524 src/protocols/toc/toc.c:590
 msgid "Disconnected."
 msgstr "Odpojen."
 
-#: src/protocols/oscar/oscar.c:397 src/protocols/toc/toc.c:761
+#: src/protocols/oscar/oscar.c:394 src/protocols/toc/toc.c:761
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "Boli ste odpojen z chatovacej miestnosti %s."
 
-#: src/protocols/oscar/oscar.c:398
+#: src/protocols/oscar/oscar.c:395
 msgid "Chat Error!"
 msgstr "Chyba Chatu!"
 
-#: src/protocols/oscar/oscar.c:410
+#: src/protocols/oscar/oscar.c:407
 msgid "Chat is currently unavailable"
 msgstr "Chat je teraz nedostupn"
 
-#: src/protocols/oscar/oscar.c:411
+#: src/protocols/oscar/oscar.c:408
 msgid "Gaim - Chat"
 msgstr "Gaim - Chat"
 
-#: src/protocols/oscar/oscar.c:470 src/protocols/oscar/oscar.c:530
+#: src/protocols/oscar/oscar.c:467 src/protocols/oscar/oscar.c:527
 msgid "Couldn't connect to host"
 msgstr "Nemem sa spoji s hostiteom"
 
-#: src/protocols/oscar/oscar.c:478
+#: src/protocols/oscar/oscar.c:475
 msgid "Password sent, waiting for response\n"
 msgstr "Poslan heslo, akm na odpove\n"
 
-#: src/protocols/oscar/oscar.c:511
+#: src/protocols/oscar/oscar.c:508
 msgid "internal connection error\n"
 msgstr "vntorn chyba spojenia\n"
 
-#: src/protocols/oscar/oscar.c:512
+#: src/protocols/oscar/oscar.c:509
 msgid "Unable to login to AIM"
 msgstr "Nemem sa prihlsi do AIM"
 
-#: src/protocols/oscar/oscar.c:517
+#: src/protocols/oscar/oscar.c:514
 #, c-format
 msgid "Signon: %s"
 msgstr "Prihlsi: %s"
 
-#: src/protocols/oscar/oscar.c:589
+#: src/protocols/oscar/oscar.c:586
 msgid "Signed off.\n"
 msgstr "Odhlsen.\n"
 
-#: src/protocols/oscar/oscar.c:608 src/protocols/oscar/oscar.c:732
+#: src/protocols/oscar/oscar.c:605 src/protocols/oscar/oscar.c:730
 msgid "Could Not Connect"
 msgstr "Nemem sa pripoji"
 
-#: src/protocols/oscar/oscar.c:616
+#: src/protocols/oscar/oscar.c:613
 msgid "Connection established, cookie sent"
 msgstr "Spojenie vytvoren, poslan cookie"
 
 #. Incorrect nick/password
-#: src/protocols/oscar/oscar.c:642 src/protocols/toc/toc.c:459
+#: src/protocols/oscar/oscar.c:639 src/protocols/toc/toc.c:459
 msgid "Incorrect nickname or password."
 msgstr "Nesprvne heslo alebo prezvka."
 
 #. Suspended account
-#: src/protocols/oscar/oscar.c:647
+#: src/protocols/oscar/oscar.c:644
 msgid "Your account is currently suspended."
 msgstr ""
 
 #. connecting too frequently
-#: src/protocols/oscar/oscar.c:651
+#: src/protocols/oscar/oscar.c:648
 msgid ""
 "You have been connecting and disconnecting too frequently. Wait ten minutes "
 "and try again. If you continue to try, you will need to wait even longer."
@@ -674,224 +1097,233 @@
 "znova. Ak budete pokraova v pripjan, budete aka dlhie."
 
 #. client too old
-#: src/protocols/oscar/oscar.c:656
+#: src/protocols/oscar/oscar.c:653
 msgid "The client version you are using is too old. Please upgrade at "
 msgstr "Verzia klienta ktor pouvate je velmi star. Naintalujte si nov na"
 
-#: src/protocols/oscar/oscar.c:660 src/protocols/toc/toc.c:542
+#: src/protocols/oscar/oscar.c:657 src/protocols/toc/toc.c:542
 msgid "Authentication Failed"
 msgstr "Autentifikcia preruen"
 
-#: src/protocols/oscar/oscar.c:682
+#: src/protocols/oscar/oscar.c:679
 msgid "Internal Error"
 msgstr "Vntorn chyba"
 
-#: src/protocols/oscar/oscar.c:1250 src/protocols/oscar/oscar.c:3286
+#: src/protocols/oscar/oscar.c:1248 src/protocols/oscar/oscar.c:3420
 #, c-format
 msgid "Direct IM with %s established"
 msgstr "Priame IM spojenie s %s vytvoren"
 
-#: src/protocols/oscar/oscar.c:1496 src/protocols/oscar/oscar.c:2371
+#: src/protocols/oscar/oscar.c:1504 src/protocols/oscar/oscar.c:2456
 #, c-format
 msgid ""
-"The user %d has denied your request to add them to your contact list for the "
-"following reason:\n"
-"\n"
+"The user %lu has denied your request to add them to your contact list for "
+"the following reason:\n"
+"%s"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1496 src/protocols/oscar/oscar.c:2371
+#: src/protocols/oscar/oscar.c:1504 src/protocols/oscar/oscar.c:2456
 #, fuzzy
 msgid "No reason given."
 msgstr "Nenapsali ste prezvku"
 
-#: src/protocols/oscar/oscar.c:1497 src/protocols/oscar/oscar.c:2372
+#: src/protocols/oscar/oscar.c:1505 src/protocols/oscar/oscar.c:2457
 msgid "Gaim - ICQ Authorization Denied"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1503 src/protocols/oscar/oscar.c:2378
+#: src/protocols/oscar/oscar.c:1511 src/protocols/oscar/oscar.c:2463
 #, c-format
-msgid "The user %d has granted your request to add them to your contact list."
+msgid "The user %lu has granted your request to add them to your contact list."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1504 src/protocols/oscar/oscar.c:2379
+#: src/protocols/oscar/oscar.c:1512 src/protocols/oscar/oscar.c:2464
 msgid "Gaim - ICQ Authorization Granted"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1577
+#: src/protocols/oscar/oscar.c:1585
 #, fuzzy, c-format
 msgid "You missed %d message from %s because it was invalid."
 msgstr "Stratili ste %d sprv%s z %s pretoe %s je neplatn."
 
-#: src/protocols/oscar/oscar.c:1578
+#: src/protocols/oscar/oscar.c:1586
 #, fuzzy, c-format
 msgid "You missed %d messages from %s because they were invalid."
 msgstr "Stratili ste %d sprv%s z %s pretoe %s je neplatn."
 
-#: src/protocols/oscar/oscar.c:1587
+#: src/protocols/oscar/oscar.c:1595
 #, fuzzy, c-format
 msgid "You missed %d message from %s because it was too large."
 msgstr "Stratili ste %d sprv%s z %s pretoe %s je prli vek."
 
-#: src/protocols/oscar/oscar.c:1588
+#: src/protocols/oscar/oscar.c:1596
 #, fuzzy, c-format
 msgid "You missed %d messages from %s because they were too large."
 msgstr "Stratili ste %d sprv%s z %s pretoe s velmi zl."
 
-#: src/protocols/oscar/oscar.c:1597
+#: src/protocols/oscar/oscar.c:1605
 #, fuzzy, c-format
 msgid "You missed %d message from %s because the rate limit has been exceeded."
 msgstr "Stratili ste %d sprv%s z %s pretoe ste vyerpali limit sprv."
 
-#: src/protocols/oscar/oscar.c:1598
+#: src/protocols/oscar/oscar.c:1606
 #, fuzzy, c-format
 msgid ""
 "You missed %d messages from %s because the rate limit has been exceeded."
 msgstr "Stratili ste %d sprv%s z %s pretoe ste vyerpali limit sprv."
 
-#: src/protocols/oscar/oscar.c:1607
+#: src/protocols/oscar/oscar.c:1615
 #, fuzzy, c-format
 msgid "You missed %d message from %s because it was too evil."
 msgstr "Stratili ste %d sprv%s z %s pretoe s velmi zl."
 
-#: src/protocols/oscar/oscar.c:1608
+#: src/protocols/oscar/oscar.c:1616
 #, fuzzy, c-format
 msgid "You missed %d messages from %s because they are too evil."
 msgstr "Stratili ste %d sprv%s z %s pretoe s velmi zl."
 
-#: src/protocols/oscar/oscar.c:1617
+#: src/protocols/oscar/oscar.c:1625
 #, fuzzy, c-format
 msgid "You missed %d message from %s because you are too evil."
 msgstr "Stratili ste %d sprv%s z %s pretoe ste velmi zl."
 
-#: src/protocols/oscar/oscar.c:1618
-#, fuzzy, c-format
-msgid "You missed %d messages from %s because you are too evil."
-msgstr "Stratili ste %d sprv%s z %s pretoe ste velmi zl."
-
 #: src/protocols/oscar/oscar.c:1626
 #, fuzzy, c-format
+msgid "You missed %d messages from %s because you are too evil."
+msgstr "Stratili ste %d sprv%s z %s pretoe ste velmi zl."
+
+#: src/protocols/oscar/oscar.c:1634
+#, fuzzy, c-format
 msgid "You missed %d message from %s for unknown reasons."
 msgstr "Stratili ste %d sprv%s z %s z neznmych dvodov."
 
-#: src/protocols/oscar/oscar.c:1627
+#: src/protocols/oscar/oscar.c:1635
 #, fuzzy, c-format
 msgid "You missed %d messages from %s for unknown reasons."
 msgstr "Stratili ste %d sprv%s z %s z neznmych dvodov."
 
-#: src/dialogs.c:3034 src/dialogs.c:3040 src/protocols/oscar/oscar.c:1632
-#: src/protocols/oscar/oscar.c:1670 src/protocols/oscar/oscar.c:1688
-#: src/protocols/oscar/oscar.c:2141 src/protocols/yahoo/yahoo.c:585
+#: src/dialogs.c:3076 src/dialogs.c:3082 src/protocols/oscar/oscar.c:1640
+#: src/protocols/oscar/oscar.c:1755 src/protocols/oscar/oscar.c:1773
+#: src/protocols/oscar/oscar.c:2226 src/protocols/yahoo/yahoo.c:594
 msgid "Gaim - Error"
 msgstr "Gaim - Chyba"
 
-#: src/protocols/oscar/oscar.c:1649
+#: src/protocols/oscar/oscar.c:1703
+#, c-format
+msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR>%s<BR>"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:1705
+#, c-format
+msgid "<B>Status:</B> %s<BR><HR><BR>%s<BR>"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:1734
 #, c-format
 msgid "SNAC threw error: %s\n"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1651
+#: src/protocols/oscar/oscar.c:1736
 #, fuzzy
 msgid "Gaim - Oscar SNAC Error"
 msgstr "Gaim - Chyba"
 
-#: src/protocols/oscar/oscar.c:1668
+#: src/protocols/oscar/oscar.c:1753
 #, c-format
 msgid "Your message to %s did not get sent: %s"
 msgstr "Vaa sprva %s nebola poslan: %s"
 
-#: src/protocols/oscar/oscar.c:1669 src/protocols/oscar/oscar.c:1687
+#: src/protocols/oscar/oscar.c:1754 src/protocols/oscar/oscar.c:1772
 msgid "Reason unknown"
 msgstr "Dvod neznmy"
 
-#: src/protocols/oscar/oscar.c:1686
+#: src/protocols/oscar/oscar.c:1771
 #, c-format
 msgid "User information for %s unavailable: %s"
 msgstr "Informcie o pouvateovi %s su neprstupn: %s"
 
-#: src/buddy.c:2060 src/protocols/oscar/oscar.c:1717
+#: src/buddy.c:2131 src/protocols/oscar/oscar.c:1802
 msgid "Buddy Icon"
 msgstr "Kamartova ikona"
 
-#: src/buddy.c:2063 src/protocols/oscar/oscar.c:1720
+#: src/buddy.c:2134 src/protocols/oscar/oscar.c:1805
 msgid "Voice"
 msgstr "Hlas"
 
-#: src/buddy.c:2066 src/protocols/oscar/oscar.c:1723
+#: src/buddy.c:2137 src/protocols/oscar/oscar.c:1808
 msgid "IM Image"
 msgstr ""
 
-#: src/buddy.c:494 src/buddy.c:2069 src/buddy.c:2507 src/prefs.c:2912
-#: src/protocols/oscar/oscar.c:1726
+#: src/buddy.c:498 src/buddy.c:2140 src/buddy.c:2581 src/prefs.c:2926
+#: src/protocols/oscar/oscar.c:1811
 msgid "Chat"
 msgstr "Chat"
 
-#: src/buddy.c:2072 src/protocols/oscar/oscar.c:1729
+#: src/buddy.c:2143 src/protocols/oscar/oscar.c:1814
 msgid "Get File"
 msgstr "Zska sbor"
 
-#: src/buddy.c:2075 src/protocols/oscar/oscar.c:1732
+#: src/buddy.c:2146 src/protocols/oscar/oscar.c:1817
 msgid "Send File"
 msgstr "Posla sbor"
 
-#: src/buddy.c:2079 src/protocols/oscar/oscar.c:1736
+#: src/buddy.c:2150 src/protocols/oscar/oscar.c:1821
 msgid "Games"
 msgstr "Hry"
 
-#: src/buddy.c:2082 src/protocols/oscar/oscar.c:1739
+#: src/buddy.c:2153 src/protocols/oscar/oscar.c:1824
 msgid "Stocks"
 msgstr ""
 
-#: src/buddy.c:2085 src/protocols/oscar/oscar.c:1742
+#: src/buddy.c:2156 src/protocols/oscar/oscar.c:1827
 #, fuzzy
 msgid "Send Buddy List"
 msgstr "Zoznam kamartov"
 
-#: src/buddy.c:2088 src/protocols/oscar/oscar.c:1745
+#: src/buddy.c:2159 src/protocols/oscar/oscar.c:1830
 msgid "EveryBuddy Bug"
 msgstr ""
 
-#: src/buddy.c:2091 src/protocols/oscar/oscar.c:1748
+#: src/buddy.c:2162 src/protocols/oscar/oscar.c:1833
 #, fuzzy
 msgid "AP User"
 msgstr "Pouvate"
 
-#: src/buddy.c:2094 src/protocols/oscar/oscar.c:1751
+#: src/buddy.c:2165 src/protocols/oscar/oscar.c:1836
 msgid "ICQ RTF"
 msgstr ""
 
-#: src/buddy.c:2097 src/protocols/oscar/oscar.c:1754
+#: src/buddy.c:2168 src/protocols/oscar/oscar.c:1839
 msgid "Nihilist"
 msgstr ""
 
-#: src/buddy.c:2100 src/protocols/oscar/oscar.c:1757
+#: src/buddy.c:2171 src/protocols/oscar/oscar.c:1842
 msgid "ICQ Server Relay"
 msgstr ""
 
-#: src/buddy.c:2103 src/protocols/oscar/oscar.c:1760
+#: src/buddy.c:2174 src/protocols/oscar/oscar.c:1845
 msgid "ICQ Unknown"
 msgstr ""
 
-#: src/buddy.c:2106 src/protocols/oscar/oscar.c:1763
+#: src/buddy.c:2177 src/protocols/oscar/oscar.c:1848
 msgid "Trillian Encryption"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1801
+#: src/protocols/oscar/oscar.c:1886
 #, fuzzy
 msgid ""
-"<br><BODY BGCOLOR=WHITE><hr><I>Legend:</I><br><br><IMG "
-"SRC=\"free_icon.gif\"> : Normal AIM User<br><IMG SRC=\"aol_icon.gif\"> : AOL "
-"User <br><IMG SRC=\"dt_icon.gif\"> : Trial AIM User <br><IMG "
-"SRC=\"admin_icon.gif\"> : Administrator <br><IMG SRC=\"ab_icon.gif\"> : "
-"ActiveBuddy Interactive Agent<br><IMG SRC=\"wireless_icon.gif\"> : Wireless "
-"Device User<br>"
+"<br><BODY BGCOLOR=WHITE><hr><I>Legend:</I><br><br><IMG SRC=\"free_icon.gif"
+"\"> : Normal AIM User<br><IMG SRC=\"aol_icon.gif\"> : AOL User <br><IMG SRC="
+"\"dt_icon.gif\"> : Trial AIM User <br><IMG SRC=\"admin_icon.gif\"> : "
+"Administrator <br><IMG SRC=\"ab_icon.gif\"> : ActiveBuddy Interactive "
+"Agent<br><IMG SRC=\"wireless_icon.gif\"> : Wireless Device User<br>"
 msgstr ""
-"<br><BODY BGCOLOR=WHITE><hr><I>Legenda:</I><br><br><IMG "
-"SRC=\"free_icon.gif\"> : Normlny AIM pouvate<br><IMG "
-"SRC=\"aol_icon.gif\"> : AOL pouvate <br><IMG SRC=\"dt_icon.gif\"> : "
-"Skobn AIM pouvate <br><IMG SRC=\"admin_icon.gif\"> : Administrtor"
-
-#: src/protocols/oscar/oscar.c:1829
-#, fuzzy
+"<br><BODY BGCOLOR=WHITE><hr><I>Legenda:</I><br><br><IMG SRC=\"free_icon.gif"
+"\"> : Normlny AIM pouvate<br><IMG SRC=\"aol_icon.gif\"> : AOL pouvate "
+"<br><IMG SRC=\"dt_icon.gif\"> : Skobn AIM pouvate <br><IMG SRC="
+"\"admin_icon.gif\"> : Administrtor"
+
+#: src/protocols/oscar/oscar.c:1914
+#, fuzzy, c-format
 msgid ""
 "Username : <B>%s</B>  %s <BR>\n"
 "Warning Level : <B>%d %%</B><BR>\n"
@@ -905,49 +1337,61 @@
 "<BR>\n"
 "<HR><BR>\n"
 
-#: src/protocols/oscar/oscar.c:1861
+#: src/protocols/oscar/oscar.c:1946
 msgid "<i>User has no away message</i>"
 msgstr "<i>Pouvate nem iadnu 'Pre' sprvu</i>"
 
-#: src/protocols/oscar/oscar.c:1873
+#: src/protocols/oscar/oscar.c:1958
 msgid "Client Capabilities: "
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1881
+#: src/protocols/oscar/oscar.c:1966
 msgid "<i>No Information Provided</i>"
 msgstr "<i>Neposkytnut iane informcie</i>"
 
-#: src/protocols/oscar/oscar.c:1904
+#: src/protocols/oscar/oscar.c:1989
 msgid "Your connection may be lost."
 msgstr "Vae spojenie moe by preruen."
 
-#: src/protocols/oscar/oscar.c:1905
+#: src/protocols/oscar/oscar.c:1990
 msgid "AOL error"
 msgstr "Chyba AOL"
 
-#: src/protocols/oscar/oscar.c:2140
+#: src/protocols/oscar/oscar.c:2225
 msgid ""
 "The last message was not sent because you are over the rate limit. Please "
 "wait 10 seconds and try again."
 msgstr ""
 
-#: src/dialogs.c:3563 src/protocols/oscar/oscar.c:2482
-#: src/protocols/oscar/oscar.c:3407 src/protocols/toc/toc.c:1561
-#: src/protocols/toc/toc.c:1578 src/protocols/toc/toc.c:1638
-#: src/protocols/toc/toc.c:1680 src/protocols/toc/toc.c:1799
-#: src/protocols/toc/toc.c:1829 src/protocols/toc/toc.c:1885
+#: src/dialogs.c:3604 src/protocols/oscar/oscar.c:2589
+#: src/protocols/oscar/oscar.c:3541 src/protocols/toc/toc.c:1564
+#: src/protocols/toc/toc.c:1581 src/protocols/toc/toc.c:1641
+#: src/protocols/toc/toc.c:1683 src/protocols/toc/toc.c:1802
+#: src/protocols/toc/toc.c:1832 src/protocols/toc/toc.c:1888
 msgid "Error"
 msgstr "Chyba"
 
-#: src/protocols/oscar/oscar.c:3079 src/protocols/toc/toc.c:1105
+#: src/protocols/oscar/oscar.c:3192
+#, c-format
+msgid ""
+"The maximum number of buddies allowed in your buddy list is %d, and you have "
+"%d.  Until you are below the limit, some buddies will not show up as online."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3195
+#, fuzzy
+msgid "Gaim - Warning"
+msgstr "Gaim - Prihlsenie"
+
+#: src/protocols/oscar/oscar.c:3213 src/protocols/toc/toc.c:1108
 msgid "Exchange:"
 msgstr "Vmena:"
 
-#: src/protocols/oscar/oscar.c:3407
+#: src/protocols/oscar/oscar.c:3541
 msgid "Unable to open Direct IM"
 msgstr "Nemem otvori Priame IM spojenie"
 
-#: src/protocols/oscar/oscar.c:3417
+#: src/protocols/oscar/oscar.c:3551
 #, c-format
 msgid ""
 "You have selected to open a Direct IM connection with %s. Doing this will "
@@ -958,11 +1402,30 @@
 "pouvateom vidie Vau IP adresu, moe to by bezpenostn riziko. elte "
 "si pokraova"
 
-#: src/protocols/oscar/oscar.c:3450
+#: src/protocols/oscar/oscar.c:3568
+#, c-format
+msgid ""
+"<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR><I>Remote client does not "
+"support sending status messages.</I><BR>"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3575
+#, c-format
+msgid ""
+"<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR><I>User has no status message."
+"</I><BR>"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3600
+#, fuzzy
+msgid "Get Status Msg"
+msgstr "Stav: %s"
+
+#: src/protocols/oscar/oscar.c:3613
 msgid "Direct IM"
 msgstr "Priame IM"
 
-#: src/protocols/oscar/oscar.c:3458
+#: src/protocols/oscar/oscar.c:3621
 msgid "Get Capabilities"
 msgstr ""
 
@@ -1107,7 +1570,7 @@
 msgid "Password Change Successful"
 msgstr "Heslo bolo spene zmenen"
 
-#: src/dialogs.c:1688 src/protocols/toc/toc.c:782
+#: src/dialogs.c:1730 src/protocols/toc/toc.c:782
 msgid "Gaim - Password Change"
 msgstr "Gaim - Zmena hesla"
 
@@ -1122,68 +1585,69 @@
 msgid "TOC Pause"
 msgstr ""
 
-#: src/protocols/toc/toc.c:1222
+#: src/protocols/toc/toc.c:1225
 msgid "Get Dir Info"
 msgstr ""
 
-#: src/protocols/toc/toc.c:1638 src/protocols/toc/toc.c:1680
-#: src/protocols/toc/toc.c:1799 src/protocols/toc/toc.c:1885
+#: src/protocols/toc/toc.c:1641 src/protocols/toc/toc.c:1683
+#: src/protocols/toc/toc.c:1802 src/protocols/toc/toc.c:1888
 msgid "Could not connect for transfer!"
 msgstr "Nemem sa spoji pre prenos!"
 
-#: src/protocols/toc/toc.c:1829
+#: src/protocols/toc/toc.c:1832
 msgid "Could not write file header!"
 msgstr "Nemem zapsa hlaviku sboru!"
 
-#: src/protocols/toc/toc.c:1918
+#: src/protocols/toc/toc.c:1921
 msgid "Gaim - Save As..."
 msgstr "Gaim - Uloi ako..."
 
-#: src/protocols/toc/toc.c:1959
+#: src/protocols/toc/toc.c:1962
 #, c-format
 msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
 msgstr ""
 
-#: src/protocols/toc/toc.c:1960
+#: src/protocols/toc/toc.c:1963
 #, c-format
 msgid "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
 msgstr ""
 
-#: src/protocols/toc/toc.c:1965
+#: src/protocols/toc/toc.c:1968
 #, c-format
 msgid "%s requests you to send them a file"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:585
+#: src/protocols/yahoo/yahoo.c:594
 msgid "Your message did not get sent."
 msgstr "Vaa sprva nebola poslan."
 
-#: src/protocols/zephyr/zephyr.c:802
+#: src/protocols/zephyr/zephyr.c:840
 msgid "ZLocate"
 msgstr "ZLocate"
 
-#: src/protocols/zephyr/zephyr.c:839
+#: src/protocols/zephyr/zephyr.c:877
 msgid "Class:"
 msgstr "Trieda:"
 
-#: src/protocols/zephyr/zephyr.c:843
+#: src/protocols/zephyr/zephyr.c:881
 msgid "Instance:"
 msgstr ""
 
-#: src/protocols/zephyr/zephyr.c:847
+#: src/protocols/zephyr/zephyr.c:885
 msgid "Recipient:"
 msgstr "Prijmate:"
 
-#: src/about.c:93
+#: src/about.c:102
 #, c-format
 msgid "About Gaim v%s"
 msgstr "O aplikcii Gaim v%s"
 
-#: src/about.c:126
+#: src/about.c:135
+#, fuzzy
 msgid ""
-"Gaim is a client that supports AOL's Instant Messenger protocol. It is "
-"written\n"
-"using Gtk+ and is licensed under the GPL.\n"
+"Gaim is a modular Instant Messaging client capable of using AIM, ICQ,\n"
+"Yahoo!, MSN, IRC, Jabber, Napster, Zephyr, and Gadu-Gadu all at once.\n"
+"It is written using Gtk+ and is licensed under the GPL.\n"
 "\n"
 "URL: "
 msgstr ""
@@ -1194,6 +1658,16 @@
 
 #: src/about.c:137
 msgid ""
+"\n"
+"\n"
+"IRC: #gaim on irc.openprojects.net"
+msgstr ""
+"\n"
+"\n"
+"IRC: #gaim na irc.openprojects.net"
+
+#: src/about.c:147
+msgid ""
 "Active Developers\n"
 "====================\n"
 "Rob Flynn (maintainer) [ rob@marko.net ]\n"
@@ -1213,99 +1687,97 @@
 "Mark Spencer (original author)   [ markster@marko.net ]"
 msgstr ""
 
-#: src/about.c:155 src/aim.c:318 src/buddy.c:2633 src/buddy_chat.c:1311
-#: src/buddy_chat.c:1408 src/buddy_chat.c:1438 src/conversation.c:2795
-#: src/dialogs.c:568 src/dialogs.c:3858 src/multi.c:1057 src/plugins.c:277
-#: src/prefs.c:2535 src/prpl.c:438 src/prpl.c:679 src/server.c:1050
-msgid "Close"
-msgstr "Zatvori"
-
 #. this makes the sizes not work.
 #. GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
 #. gtk_widget_grab_default(button);
-#: src/about.c:175
+#: src/about.c:185
 msgid "Web Site"
 msgstr "Internetov strnka"
 
-#: src/aim.c:151 src/buddy.c:2626
+#: src/aim.c:153 src/buddy.c:2709
 msgid "Signoff"
 msgstr "Odhlsi"
 
-#: src/aim.c:163
+#: src/aim.c:165
 msgid "Please enter your logon"
 msgstr ""
 
-#: src/aim.c:163 src/multi.c:1388 src/server.c:55
+#: src/aim.c:165 src/multi.c:1400 src/server.c:55
 msgid "Signon Error"
 msgstr "Chyba pri prihlasovan"
 
-#: src/aim.c:261
+#: src/aim.c:263
 msgid "Gaim - Login"
 msgstr "Gaim - Prihlsenie"
 
-#: src/aim.c:279
+#: src/aim.c:281
 msgid "Screen Name: "
 msgstr "Meno obrazovky: "
 
-#: src/aim.c:295
+#: src/aim.c:297
 msgid "Password: "
 msgstr "Heslo: "
 
-#: src/aim.c:316 src/buddy.c:2630
+#: src/aim.c:318 src/buddy.c:2713
 msgid "Quit"
 msgstr "Odchod"
 
-#: src/aim.c:321 src/aim.c:819 src/buddy.c:2656
+#: src/aim.c:323 src/aim.c:831 src/buddy.c:2739
 msgid "Accounts"
 msgstr "Kont"
 
-#: src/aim.c:323 src/multi.c:903
+#: src/aim.c:325 src/multi.c:915
 msgid "Signon"
 msgstr "Prihlsi"
 
-#: src/aim.c:355
+#: src/aim.c:357
 #, fuzzy
 msgid "About"
 msgstr "O aplikcii Gaim"
 
-#: src/aim.c:356 src/prefs.c:1619 src/prefs.c:1893
+#: src/aim.c:358 src/prefs.c:1633 src/prefs.c:1905
 msgid "Options"
 msgstr "Voby"
 
-#: src/aim.c:358 src/aim.c:822 src/buddy.c:2674
+#: src/aim.c:360 src/aim.c:834 src/buddy.c:2757
 msgid "Plugins"
 msgstr ""
 
-#: src/aim.c:816 src/buddy.c:2666
+#: src/aim.c:828 src/buddy.c:2749
 msgid "Preferences"
 msgstr ""
 
-#: src/applet.c:199
+#: src/aim.c:838 src/multi.c:1472
+#, fuzzy
+msgid "Auto-login"
+msgstr "Aotomatick prihlasovanie sa"
+
+#: src/applet.c:109
 msgid "Attempting to sign on...."
 msgstr "Pokam sa prihlsi...."
 
-#: src/applet.c:202
+#: src/applet.c:112
 msgid "Offline. Click to bring up login box."
 msgstr "Nepripojen. Kliknite pre otvorenie prihlasovacieho okna."
 
-#: src/applet.c:218
+#: src/applet.c:128
 #, c-format
 msgid "Away: %d pending."
 msgstr ""
 
-#: src/applet.c:221
+#: src/applet.c:131
 msgid "Away."
 msgstr "Pre."
 
-#: src/applet.c:296 src/away.c:388
+#: src/applet.c:200 src/away.c:388
 msgid "New Away Message"
 msgstr "Nov 'Pre' sprva"
 
-#: src/applet.c:444
+#: src/applet.c:348
 msgid "Can't create Gaim applet!"
 msgstr "Nemem vytvori applet Gaim!"
 
-#: src/applet.c:465
+#: src/applet.c:368
 msgid "About..."
 msgstr ""
 
@@ -1329,87 +1801,74 @@
 msgid "Set All Away"
 msgstr "Nastav vetko na 'Pre'"
 
-#. Put the buttons in the box
-#: src/buddy.c:488 src/buddy.c:2741 src/buddy_chat.c:1443
-#: src/conversation.c:2328 src/conversation.c:2810 src/dialogs.c:890
-#: src/dialogs.c:1072 src/dialogs.c:2053 src/multi.c:1041 src/prefs.c:2029
-#: src/prefs.c:2371 src/prefs.c:2405
-msgid "Add"
-msgstr "Prida"
-
-#: src/buddy.c:489 src/buddy.c:2742 src/dialogs.c:900 src/dialogs.c:1047
+#: src/buddy.c:493 src/buddy.c:2828 src/dialogs.c:942 src/dialogs.c:1089
 msgid "Group"
 msgstr "Skupina"
 
-#: src/buddy.c:490 src/buddy.c:2743 src/buddy_chat.c:1445
-#: src/conversation.c:2314 src/conversation.c:2807 src/prefs.c:2043
-#: src/prefs.c:2375 src/prefs.c:2409
-msgid "Remove"
-msgstr "Zrui"
-
-#: src/buddy.c:495 src/buddy.c:646 src/buddy.c:798 src/buddy.c:2505
-#: src/buddy_chat.c:850 src/buddy_chat.c:1267
+#: src/buddy.c:499 src/buddy.c:664 src/buddy.c:834 src/buddy.c:2579
+#: src/buddy_chat.c:861 src/buddy_chat.c:1278
 msgid "IM"
 msgstr "IM"
 
-#: src/buddy.c:496 src/buddy.c:2506 src/buddy_chat.c:866 src/buddy_chat.c:1275
-#: src/buddy_chat.c:1451 src/conversation.c:2828
+#: src/buddy.c:500 src/buddy.c:2580 src/buddy_chat.c:877 src/buddy_chat.c:1286
+#: src/buddy_chat.c:1462 src/conversation.c:2897
 msgid "Info"
 msgstr "Info"
 
 #. Put the buttons in the box
-#: src/buddy.c:651 src/buddy.c:803 src/dialogs.c:1039 src/dialogs.c:3417
-#: src/dialogs.c:3432
+#: src/buddy.c:669 src/buddy.c:839 src/dialogs.c:1081 src/dialogs.c:3458
+#: src/dialogs.c:3473
 msgid "Alias"
 msgstr "Alias"
 
-#: src/buddy.c:656 src/buddy.c:822
+#: src/buddy.c:674 src/buddy.c:858
 msgid "Add Buddy Pounce"
 msgstr ""
 
-#: src/buddy.c:663 src/buddy.c:828
+#: src/buddy.c:681 src/buddy.c:864
 msgid "View Log"
 msgstr "Pozrie zznam"
 
-#: src/buddy.c:785 src/buddy.c:816
+#: src/buddy.c:821 src/buddy.c:852
 msgid "Rename"
 msgstr "Premenova"
 
-#: src/buddy.c:810
+#: src/buddy.c:846
 msgid "Un-Alias"
 msgstr "Zrui alias"
 
-#: src/buddy.c:1581 src/buddy.c:2649
+#: src/buddy.c:1645 src/buddy.c:2732
 msgid "Buddy Pounce"
 msgstr ""
 
-#: src/buddy.c:1661
+#: src/buddy.c:1725
 msgid "New Buddy Pounce"
 msgstr ""
 
-#: src/buddy.c:1679
+#: src/buddy.c:1743
 msgid "Remove Buddy Pounce"
 msgstr ""
 
-#: src/buddy.c:1707
+#: src/buddy.c:1771
 msgid "[Click to edit]"
 msgstr ""
 
-#: src/buddy.c:2183
+#: src/buddy.c:2254
 #, c-format
 msgid "Logged in: %s\n"
 msgstr "Pihlsen v: %s\n"
 
-#: src/buddy.c:2195
+#: src/buddy.c:2266
+#, c-format
 msgid "Warnings: %d%%\n"
 msgstr "Vstrahy: %d%%\n"
 
-#: src/buddy.c:2207
+#: src/buddy.c:2278
 #, c-format
 msgid "Capabilities: %s\n"
 msgstr ""
 
-#: src/buddy.c:2211
+#: src/buddy.c:2282
 #, c-format
 msgid ""
 "Alias: %s               \n"
@@ -1420,117 +1879,127 @@
 "Meno obrazovky: %s\n"
 "%s%s%s%s%s%s"
 
-#: src/buddy.c:2215
+#: src/buddy.c:2286
 msgid "Idle: "
 msgstr ""
 
-#: src/buddy.c:2286 src/buddy.c:2291
+#: src/buddy.c:2359 src/buddy.c:2364
 #, c-format
 msgid "%s logged in."
 msgstr "%s prihlsen."
 
-#: src/buddy.c:2350 src/buddy.c:2355
+#: src/buddy.c:2424 src/buddy.c:2429
 #, c-format
 msgid "%s logged out."
 msgstr "%s odhlsen."
 
-#: src/buddy.c:2540
+#: src/buddy.c:2614
 msgid "Information on selected Buddy"
 msgstr "Informcie o vybratom kamartovi"
 
-#: src/buddy.c:2541 src/dialogs.c:697
+#: src/buddy.c:2615 src/dialogs.c:697
 msgid "Send Instant Message"
 msgstr ""
 
-#: src/buddy.c:2542
+#: src/buddy.c:2616
 msgid "Start/join a Buddy Chat"
 msgstr "Zaa/Pripoji sa k chatu s kamartom"
 
-#: src/buddy.c:2543
+#: src/buddy.c:2617
 msgid "Activate Away Message"
 msgstr "Aktivuj 'Pre' sprvu"
 
-#: src/buddy.c:2606
+#: src/buddy.c:2689
 msgid "File"
 msgstr "Sbor"
 
-#: src/buddy.c:2610
+#: src/buddy.c:2693
 msgid "Add A Buddy"
 msgstr "Prida kamarta"
 
-#: src/buddy.c:2612
+#: src/buddy.c:2695
 msgid "Join A Chat"
 msgstr "Pripoji sa k chatu"
 
-#: src/buddy.c:2614
+#: src/buddy.c:2697
 msgid "New Instant Message"
 msgstr ""
 
-#: src/buddy.c:2616 src/dialogs.c:749
+#: src/buddy.c:2699 src/dialogs.c:759
 msgid "Get User Info"
 msgstr "Zska informcie o uvateovi"
 
-#: src/buddy.c:2621
+#: src/buddy.c:2704
 msgid "Import Buddy List"
 msgstr "Importuj zoznam kamartov"
 
-#: src/buddy.c:2639
+#: src/buddy.c:2722
 msgid "Tools"
 msgstr "Nstroje"
 
-#: src/buddy.c:2662
+#: src/buddy.c:2745
 msgid "Protocol Actions"
 msgstr "Akcie protokolu"
 
-#: src/buddy.c:2668
+#: src/buddy.c:2751
 msgid "View System Log"
 msgstr "Pozrie systmov zznam"
 
-#: src/buddy.c:2680
+#: src/buddy.c:2763
 msgid "Perl"
 msgstr "Perl"
 
-#: src/buddy.c:2683
+#: src/buddy.c:2766
 msgid "Load Script"
 msgstr "Nahra skript"
 
-#: src/buddy.c:2687
+#: src/buddy.c:2770
 msgid "Unload All Scripts"
 msgstr "Zrui vetky skripty"
 
-#: src/buddy.c:2691
+#: src/buddy.c:2774
 msgid "List Scripts"
 msgstr "Zoznam scriptov"
 
-#: src/buddy.c:2699
+#: src/buddy.c:2782
 msgid "Help"
 msgstr "Pomoc"
 
-#: src/buddy.c:2704
+#: src/buddy.c:2787
+#, fuzzy
+msgid "Online Help"
+msgstr "Pripojen"
+
+#: src/buddy.c:2788
+#, fuzzy
+msgid "Debug Window"
+msgstr "Zobraz ladiace okno"
+
+#: src/buddy.c:2789
 msgid "About Gaim"
 msgstr "O aplikcii Gaim"
 
-#: src/buddy.c:2721 src/prefs.c:2891
+#: src/buddy.c:2807 src/prefs.c:2905
 msgid "Buddy List"
 msgstr "Zoznam kamartov"
 
-#: src/buddy.c:2774
+#: src/buddy.c:2860
 msgid "Add a new Buddy"
 msgstr "Prida novho kamarta"
 
-#: src/buddy.c:2775
+#: src/buddy.c:2861
 msgid "Add a new Group"
 msgstr "Prida nov skupinu"
 
-#: src/buddy.c:2776
+#: src/buddy.c:2862
 msgid "Remove selected Buddy/Group"
 msgstr "Vymaza vybratho kamarta/skupinu"
 
-#: src/buddy.c:2803
+#: src/buddy.c:2889
 msgid "Edit Buddies"
 msgstr "Editova kamartov"
 
-#: src/buddy.c:2846
+#: src/buddy.c:2932
 msgid "Gaim - Buddy List"
 msgstr "Gaim - Zoznam kamartov"
 
@@ -1538,21 +2007,17 @@
 msgid "Join Chat"
 msgstr "Pripoji sa k chatu"
 
-#: src/buddy_chat.c:272
-msgid "Buddy Chat"
-msgstr "Chat s kamartom"
-
 #: src/buddy_chat.c:283
 msgid "Join Chat As:"
 msgstr "Pripoji sa k chatu ako:"
 
-#: src/buddy_chat.c:304 src/buddy_chat.c:392 src/dialogs.c:450
-#: src/dialogs.c:540 src/dialogs.c:715 src/dialogs.c:773 src/dialogs.c:892
-#: src/dialogs.c:1068 src/dialogs.c:1431 src/dialogs.c:1636 src/dialogs.c:1760
-#: src/dialogs.c:1820 src/dialogs.c:2042 src/dialogs.c:2224 src/dialogs.c:2399
-#: src/dialogs.c:2470 src/dialogs.c:3166 src/dialogs.c:3419 src/dialogs.c:3600
-#: src/dialogs.c:3971 src/dialogs.c:4077 src/dialogs.c:4736 src/multi.c:769
-#: src/multi.c:899 src/prpl.c:150 src/prpl.c:224
+#: src/buddy_chat.c:304 src/buddy_chat.c:392 src/dialogs.c:449
+#: src/dialogs.c:539 src/dialogs.c:715 src/dialogs.c:816 src/dialogs.c:934
+#: src/dialogs.c:1110 src/dialogs.c:1473 src/dialogs.c:1678 src/dialogs.c:1802
+#: src/dialogs.c:1862 src/dialogs.c:2084 src/dialogs.c:2266 src/dialogs.c:2441
+#: src/dialogs.c:2512 src/dialogs.c:3208 src/dialogs.c:3460 src/dialogs.c:3641
+#: src/dialogs.c:4012 src/dialogs.c:4118 src/dialogs.c:4777 src/multi.c:781
+#: src/multi.c:911 src/prpl.c:150 src/prpl.c:224
 msgid "Cancel"
 msgstr "Zrui"
 
@@ -1560,16 +2025,16 @@
 msgid "Join"
 msgstr "Pripoji"
 
-#: src/buddy_chat.c:393 src/buddy_chat.c:396 src/buddy_chat.c:1317
-#: src/buddy_chat.c:1407
+#: src/buddy_chat.c:393 src/buddy_chat.c:396 src/buddy_chat.c:1328
+#: src/buddy_chat.c:1418
 msgid "Invite"
 msgstr "Pozva"
 
-#: src/buddy_chat.c:412 src/dialogs.c:1259 src/dialogs.c:3427
+#: src/buddy_chat.c:412 src/dialogs.c:1301 src/dialogs.c:3468
 msgid "Buddy"
 msgstr "Kamart"
 
-#: src/buddy_chat.c:417 src/prefs.c:1992
+#: src/buddy_chat.c:417 src/prefs.c:2004
 msgid "Message"
 msgstr "Sprva"
 
@@ -1577,303 +2042,299 @@
 msgid "Gaim - Invite Buddy Into Chat Room"
 msgstr "Gaim - Pozva kamarta do chatovacej miestnosti"
 
-#: src/buddy_chat.c:857
+#: src/buddy_chat.c:868
 msgid "Un-Ignore"
 msgstr "Od-ignorova"
 
-#: src/buddy_chat.c:859 src/buddy_chat.c:1271
+#: src/buddy_chat.c:870 src/buddy_chat.c:1282
 msgid "Ignore"
 msgstr "Ignorova"
 
 #. don't remove them from ignored in case they re-enter
-#: src/buddy_chat.c:922 src/buddy_chat.c:1034 src/buddy_chat.c:1497
-#: src/buddy_chat.c:1530
+#: src/buddy_chat.c:933 src/buddy_chat.c:1045 src/buddy_chat.c:1508
+#: src/buddy_chat.c:1541
 #, c-format
 msgid "%d %s in room"
 msgstr "%d %s v miestnosti"
 
-#: src/buddy_chat.c:930
+#: src/buddy_chat.c:941
 #, c-format
 msgid "%s entered the room."
 msgstr "%s vstpil do miestnosti."
 
-#: src/buddy_chat.c:996
+#: src/buddy_chat.c:1007
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s je teraz znmy ako %s"
 
-#: src/buddy_chat.c:1043
+#: src/buddy_chat.c:1054
 #, fuzzy, c-format
 msgid "%s left the room (%s)."
 msgstr "%s opustil miestnos."
 
-#: src/buddy_chat.c:1045
+#: src/buddy_chat.c:1056
 #, c-format
 msgid "%s left the room."
 msgstr "%s opustil miestnos."
 
-#: src/buddy_chat.c:1144
+#: src/buddy_chat.c:1155
 msgid "Gaim - Group Chats"
 msgstr "Gaim - Skupinov chaty"
 
-#: src/buddy_chat.c:1207
+#: src/buddy_chat.c:1218
 msgid "Topic:"
 msgstr "Tma:"
 
-#: src/buddy_chat.c:1248
+#: src/buddy_chat.c:1259
 msgid "0 people in room"
 msgstr "0 ud v miestnosti"
 
-#: src/buddy_chat.c:1322 src/buddy_chat.c:1406
+#: src/buddy_chat.c:1333 src/buddy_chat.c:1417
 msgid "Whisper"
 msgstr ""
 
-#: src/buddy_chat.c:1327 src/buddy_chat.c:1404 src/buddy_chat.c:1453
-#: src/conversation.c:2839
+#: src/buddy_chat.c:1338 src/buddy_chat.c:1415 src/buddy_chat.c:1464
+#: src/conversation.c:2908
 msgid "Send"
 msgstr "Posla"
 
-#: src/buddy_chat.c:1447 src/conversation.c:2816
+#: src/buddy_chat.c:1458 src/conversation.c:2885
 msgid "Block"
 msgstr "Blokova"
 
-#: src/buddy_chat.c:1449 src/conversation.c:2822 src/dialogs.c:425
-#: src/dialogs.c:454
+#: src/buddy_chat.c:1460 src/conversation.c:2891 src/dialogs.c:424
+#: src/dialogs.c:453
 msgid "Warn"
 msgstr "Varova"
 
-#: src/conversation.c:413
+#: src/conversation.c:431
 msgid "Gaim - Save Conversation"
 msgstr "Gaim - Ulo konverzciu"
 
-#: src/conversation.c:474
+#: src/conversation.c:492
 #, fuzzy
 msgid "Gaim - Insert Image"
 msgstr "Gaim - IM pouvate"
 
-#: src/conversation.c:1278
+#: src/conversation.c:1336
 msgid "Unable to send message: too large"
 msgstr "Nemem posla sprvu: vemi vek"
 
-#: src/conversation.c:1278 src/conversation.c:1282
+#: src/conversation.c:1336 src/conversation.c:1340
 msgid "Message Error"
 msgstr "Chyba sprvy"
 
-#: src/conversation.c:1282
+#: src/conversation.c:1340
 msgid "Unable to send message: Unknown reason"
 msgstr "Nemem posla sprvu: Neznmy dvod"
 
-#: src/conversation.c:1501
+#: src/conversation.c:1559
 #, c-format
 msgid "Currently at %d, "
 msgstr ""
 
-#: src/conversation.c:1509
+#: src/conversation.c:1567
 #, c-format
 msgid "Setting position to %d\n"
 msgstr "Nastavi pozciu na %d\n"
 
-#: src/conversation.c:2110 src/prefs.c:1305
+#: src/conversation.c:2170 src/prefs.c:1308
 msgid "Bold Text"
 msgstr "Tun text"
 
-#: src/conversation.c:2110
+#: src/conversation.c:2170
 msgid "Bold"
 msgstr "Tun"
 
-#: src/conversation.c:2114
+#: src/conversation.c:2174
 msgid "Italics Text"
 msgstr ""
 
-#: src/conversation.c:2115
+#: src/conversation.c:2175
 msgid "Italics"
 msgstr "Kurzva"
 
-#: src/conversation.c:2118 src/prefs.c:1317
+#: src/conversation.c:2178 src/prefs.c:1320
 msgid "Underline Text"
 msgstr "Podiarknut text"
 
-#: src/conversation.c:2119
+#: src/conversation.c:2179
 msgid "Underline"
 msgstr "Podiarknut"
 
-#: src/conversation.c:2123 src/prefs.c:1323
+#: src/conversation.c:2183 src/prefs.c:1326
 msgid "Strike through Text"
 msgstr "Preiarknut text"
 
-#: src/conversation.c:2123
+#: src/conversation.c:2183
 msgid "Strike"
 msgstr "Preiarknut"
 
-#: src/conversation.c:2129
+#: src/conversation.c:2189
 msgid "Decrease font size"
 msgstr "Zmeni vekos fontu"
 
-#: src/conversation.c:2129
+#: src/conversation.c:2189
 msgid "Small"
 msgstr "Mal"
 
-#: src/conversation.c:2132
+#: src/conversation.c:2192
 msgid "Normal font size"
 msgstr "Normlna vekos fontu"
 
-#: src/conversation.c:2132
+#: src/conversation.c:2192
 msgid "Normal"
 msgstr "Normlny"
 
-#: src/conversation.c:2135
+#: src/conversation.c:2195
 msgid "Increase font size"
 msgstr "Zvi vekost fontu"
 
-#: src/conversation.c:2135
+#: src/conversation.c:2195
 msgid "Big"
 msgstr "Vek"
 
-#: src/conversation.c:2142 src/dialogs.c:2841 src/dialogs.c:2865
+#: src/conversation.c:2202 src/dialogs.c:2883 src/dialogs.c:2907
 msgid "Select Font"
 msgstr "Vybra font"
 
-#: src/conversation.c:2143
+#: src/conversation.c:2203
 msgid "Font"
 msgstr "Font"
 
-#: src/conversation.c:2146 src/prefs.c:1353
+#: src/conversation.c:2206 src/prefs.c:1356
 msgid "Text Color"
 msgstr "Farba textu"
 
-#: src/conversation.c:2147 src/conversation.c:2151
+#: src/conversation.c:2207 src/conversation.c:2211
 msgid "Color"
 msgstr "Farba"
 
-#: src/conversation.c:2151 src/prefs.c:1371
+#: src/conversation.c:2211 src/prefs.c:1374
 msgid "Background Color"
 msgstr "Farba pozadia"
 
-#: src/conversation.c:2158 src/dialogs.c:2464
+#: src/conversation.c:2218 src/dialogs.c:2506
 msgid "Insert Link"
 msgstr "Vloi odkaz"
 
-#: src/conversation.c:2159
+#: src/conversation.c:2219
 msgid "Link"
 msgstr "Odkaz"
 
-#: src/conversation.c:2162
+#: src/conversation.c:2222
 msgid "Insert smiley face"
 msgstr "Vloi smajlka"
 
-#: src/conversation.c:2162
+#: src/conversation.c:2222
 msgid "Smiley"
 msgstr "Smajlk"
 
-#: src/conversation.c:2165
+#: src/conversation.c:2225
 #, fuzzy
 msgid "Insert IM Image"
 msgstr "Vloi smajlka"
 
-#: src/conversation.c:2165
+#: src/conversation.c:2225
 msgid "Image"
 msgstr ""
 
-#: src/conversation.c:2172
+#: src/conversation.c:2232
 msgid "Enable logging"
 msgstr "Povoli zaznamenvanie"
 
-#: src/conversation.c:2173 src/prefs.c:254
+#: src/conversation.c:2233 src/prefs.c:254
 msgid "Logging"
 msgstr "Zanamenvanie"
 
-#: src/conversation.c:2182
+#: src/conversation.c:2242
 msgid "Save Conversation"
 msgstr "Uloi konverzciu"
 
-#: src/conversation.c:2183 src/dialogs.c:1640 src/dialogs.c:1824
-#: src/dialogs.c:3178 src/dialogs.c:3867 src/dialogs.c:4744
+#: src/conversation.c:2243 src/dialogs.c:1682 src/dialogs.c:1866
+#: src/dialogs.c:3220 src/dialogs.c:3908 src/dialogs.c:4785
 msgid "Save"
 msgstr "Uloi"
 
-#: src/conversation.c:2187
-msgid "Enable sounds"
-msgstr "Povoli zvuky"
-
-#: src/conversation.c:2188
+#: src/conversation.c:2247 src/conversation.c:2248
 msgid "Sound"
 msgstr "Zvuk"
 
-#: src/conversation.c:2668
+#: src/conversation.c:2729
 msgid "Gaim - Conversations"
 msgstr "Gaim - Konverzcie"
 
-#: src/conversation.c:2755
+#: src/conversation.c:2816
 msgid "Send message as: "
 msgstr "Posla sprvu ako: "
 
-#: src/conversation.c:3373
+#: src/conversation.c:3453
 msgid "Gaim - Save Icon"
 msgstr "Gaim - Uloi ikonu"
 
-#: src/conversation.c:3400
+#: src/conversation.c:3487
 msgid "Disable Animation"
 msgstr "Nepovoli animcie"
 
-#: src/conversation.c:3405
+#: src/conversation.c:3492
 msgid "Enable Animation"
 msgstr "Povoli animcie"
 
-#: src/conversation.c:3411
+#: src/conversation.c:3498
 msgid "Hide Icon"
 msgstr "Skry ikonu"
 
-#: src/conversation.c:3417
+#: src/conversation.c:3504
 msgid "Save Icon As..."
 msgstr "Uloi ikonu ako..."
 
-#: src/dialogs.c:413
+#: src/dialogs.c:412
 msgid "Gaim - Warn user?"
 msgstr ""
 
-#: src/dialogs.c:433
+#: src/dialogs.c:432
 #, c-format
 msgid "Do you really want to warn %s?"
 msgstr ""
 
-#: src/dialogs.c:438
+#: src/dialogs.c:437
 msgid "Warn anonymously?"
 msgstr ""
 
-#: src/dialogs.c:442
+#: src/dialogs.c:441
 msgid "Anonymous warnings are less harsh."
 msgstr ""
 
-#: src/dialogs.c:470
+#: src/dialogs.c:469
 #, c-format
 msgid "Removing '%s' from buddylist.\n"
 msgstr "Maem '%s' zo zoznamu kamaratov.\n"
 
-#: src/dialogs.c:495
+#: src/dialogs.c:494
 #, fuzzy, c-format
 msgid "Gaim - Remove %s?"
 msgstr "Gaim - Premenova skupinu"
 
-#: src/dialogs.c:508
+#: src/dialogs.c:507
 #, fuzzy
 msgid "Remove Buddy"
 msgstr "Premenova kamarta"
 
-#: src/dialogs.c:518
+#: src/dialogs.c:517
 #, c-format
 msgid ""
 "You are about to remove '%s' from\n"
 "your buddylist. Do you want to continue?"
 msgstr ""
 
-#: src/dialogs.c:530 src/prpl.c:154 src/prpl.c:228
+#: src/dialogs.c:529 src/prpl.c:154 src/prpl.c:228
 msgid "Accept"
 msgstr "Akceptova"
 
 #. Build OK Button
-#: src/dialogs.c:637 src/dialogs.c:720 src/dialogs.c:778 src/dialogs.c:1435
-#: src/dialogs.c:1764 src/dialogs.c:1915 src/dialogs.c:2223 src/dialogs.c:2403
-#: src/dialogs.c:2469 src/dialogs.c:3976 src/dialogs.c:4082 src/multi.c:774
+#: src/dialogs.c:635 src/dialogs.c:720 src/dialogs.c:821 src/dialogs.c:1477
+#: src/dialogs.c:1806 src/dialogs.c:1957 src/dialogs.c:2265 src/dialogs.c:2445
+#: src/dialogs.c:2511 src/dialogs.c:4017 src/dialogs.c:4123 src/multi.c:786
 msgid "OK"
 msgstr "OK"
 
@@ -1885,339 +2346,344 @@
 msgid "IM who:"
 msgstr ""
 
-#: src/dialogs.c:756
+#: src/dialogs.c:768
 msgid "User:"
 msgstr "Pouvate:"
 
+#: src/dialogs.c:777
+#, fuzzy
+msgid "Account:"
+msgstr "Konto"
+
 #. Finish up
-#: src/dialogs.c:783
+#: src/dialogs.c:826
 msgid "Gaim - Get User Info"
 msgstr "Gaim - Zska informcie o pouvatelovi"
 
-#: src/dialogs.c:898
+#: src/dialogs.c:940
 msgid "Add Group"
 msgstr "Prida skupinu"
 
-#: src/dialogs.c:923
+#: src/dialogs.c:965
 msgid "Gaim - Add Group"
 msgstr "Gaim - Prida skupinu"
 
-#: src/dialogs.c:1007
+#: src/dialogs.c:1049
 msgid "Gaim - Add Buddy"
 msgstr "Gaim - Prida kamarta"
 
-#: src/dialogs.c:1019
+#: src/dialogs.c:1061
 msgid "Add Buddy"
 msgstr "Prida kamarta"
 
-#: src/dialogs.c:1029
+#: src/dialogs.c:1071
 msgid "Contact"
 msgstr "Kontakt"
 
 #. Set up stuff for the account box
-#: src/dialogs.c:1055
+#: src/dialogs.c:1097
 msgid "Add To"
 msgstr "Prida k"
 
-#: src/dialogs.c:1092
+#: src/dialogs.c:1134
 msgid "Please enter a buddy to pounce."
 msgstr ""
 
-#: src/dialogs.c:1092
+#: src/dialogs.c:1134
 msgid "Buddy Pounce Error"
 msgstr ""
 
-#: src/dialogs.c:1228
+#: src/dialogs.c:1270
 msgid "Gaim - New Buddy Pounce"
 msgstr ""
 
 #. <pounce type="who">
-#: src/dialogs.c:1239
+#: src/dialogs.c:1281
 msgid "Pounce Who"
 msgstr ""
 
-#: src/dialogs.c:1250
+#: src/dialogs.c:1292
 msgid "Account"
 msgstr "Konto"
 
 #. </pounce type="who">
 #. <pounce type="when">
-#: src/dialogs.c:1276
+#: src/dialogs.c:1318
 msgid "Pounce When"
 msgstr ""
 
-#: src/dialogs.c:1286
+#: src/dialogs.c:1328
 msgid "Pounce on sign on"
 msgstr ""
 
-#: src/dialogs.c:1295
+#: src/dialogs.c:1337
 msgid "Pounce on return from away"
 msgstr ""
 
-#: src/dialogs.c:1304
+#: src/dialogs.c:1346
 msgid "Pounce on return from idle"
 msgstr ""
 
-#: src/dialogs.c:1313
+#: src/dialogs.c:1355
 #, fuzzy
 msgid "Pounce when buddy is typing to you"
 msgstr "Zvuk ke sa kamart prihlsi"
 
 #. </pounce type="when">
 #. <pounce type="action">
-#: src/dialogs.c:1323
+#: src/dialogs.c:1365
 msgid "Pounce Action"
 msgstr ""
 
-#: src/dialogs.c:1334
+#: src/dialogs.c:1376
 msgid "Open IM Window"
 msgstr "Otvori IM okno"
 
-#: src/dialogs.c:1343
+#: src/dialogs.c:1385
 msgid "Popup Notification"
 msgstr "Zobrazi notifikciu"
 
-#: src/dialogs.c:1352
+#: src/dialogs.c:1394
 msgid "Send Message"
 msgstr "Posla sprvu"
 
-#: src/dialogs.c:1373
+#: src/dialogs.c:1415
 msgid "Execute command on pounce"
 msgstr ""
 
-#: src/dialogs.c:1395
+#: src/dialogs.c:1437
 msgid "Play sound on pounce"
 msgstr ""
 
 #. </pounce type="action">
-#: src/dialogs.c:1417
+#: src/dialogs.c:1459
 msgid "Save this pounce after activation"
 msgstr ""
 
-#: src/dialogs.c:1503
+#: src/dialogs.c:1545
 msgid "Gaim - Set Dir Info"
 msgstr ""
 
-#: src/dialogs.c:1512
+#: src/dialogs.c:1554
 msgid "Directory Info"
 msgstr ""
 
-#: src/dialogs.c:1534
+#: src/dialogs.c:1576
 msgid "Allow Web Searches To Find Your Info"
 msgstr "Povoli Internetovm vyhladvaom njs informcie o Vs"
 
 #. Line 1
-#: src/dialogs.c:1537 src/dialogs.c:2242
+#: src/dialogs.c:1579 src/dialogs.c:2284
 msgid "First Name"
 msgstr "Prv meno"
 
 #. Line 2
-#: src/dialogs.c:1548 src/dialogs.c:2254
+#: src/dialogs.c:1590 src/dialogs.c:2296
 msgid "Middle Name"
 msgstr "Druh meno"
 
 #. Line 3
-#: src/dialogs.c:1560 src/dialogs.c:2266
+#: src/dialogs.c:1602 src/dialogs.c:2308
 msgid "Last Name"
 msgstr "Priezvisko"
 
 #. Line 4
-#: src/dialogs.c:1571 src/dialogs.c:2278
+#: src/dialogs.c:1613 src/dialogs.c:2320
 msgid "Maiden Name"
 msgstr ""
 
 #. Line 6
-#: src/dialogs.c:1593 src/dialogs.c:2301
+#: src/dialogs.c:1635 src/dialogs.c:2343
 msgid "State"
 msgstr "tt"
 
-#: src/dialogs.c:1658
+#: src/dialogs.c:1700
 msgid "New Passwords Do Not Match"
 msgstr ""
 
-#: src/dialogs.c:1658 src/dialogs.c:1663
+#: src/dialogs.c:1700 src/dialogs.c:1705
 msgid "Gaim - Change Password Error"
 msgstr "Gaim - Chyba zmeny hesla"
 
-#: src/dialogs.c:1663
+#: src/dialogs.c:1705
 msgid "Fill out all fields completely"
 msgstr "Vyplte vetky polka"
 
-#: src/dialogs.c:1718
+#: src/dialogs.c:1760
 msgid "Original Password"
 msgstr "Star heslo"
 
-#: src/dialogs.c:1732
+#: src/dialogs.c:1774
 msgid "New Password"
 msgstr "Nov heslo"
 
-#: src/dialogs.c:1746
+#: src/dialogs.c:1788
 msgid "New Password (again)"
 msgstr "Nov heslo (znova)"
 
-#: src/dialogs.c:1787
+#: src/dialogs.c:1829
 msgid "Gaim - Set User Info"
 msgstr "Gaim - Nastavi informcie o pouvateovi"
 
-#: src/dialogs.c:1899
+#: src/dialogs.c:1941
 msgid "Below are the results of your search: "
 msgstr "Niie s vsledky vyhadvania: "
 
-#: src/dialogs.c:2032 src/dialogs.c:2039
+#: src/dialogs.c:2074 src/dialogs.c:2081
 msgid "Permit"
 msgstr "Povoli"
 
-#: src/dialogs.c:2034 src/dialogs.c:2041
+#: src/dialogs.c:2076 src/dialogs.c:2083
 msgid "Deny"
 msgstr "Zamietnu"
 
-#: src/dialogs.c:2078
+#: src/dialogs.c:2120
 msgid "Gaim - Add Permit"
 msgstr "Gaim - Prida povolenie"
 
-#: src/dialogs.c:2080
+#: src/dialogs.c:2122
 msgid "Gaim - Add Deny"
 msgstr "Gaim - Prida zkaz"
 
-#: src/dialogs.c:2140
+#: src/dialogs.c:2182
 msgid "Gaim - Log Conversation"
 msgstr "Gaim - Zaznamenaj konverzciu"
 
-#: src/dialogs.c:2218 src/dialogs.c:2381
+#: src/dialogs.c:2260 src/dialogs.c:2423
 msgid "Search for Buddy"
 msgstr "Njs kamarta"
 
-#: src/dialogs.c:2346
+#: src/dialogs.c:2388
 msgid "Gaim - Find Buddy By Info"
 msgstr "Gaim - Njs kamarta poda informcie"
 
-#: src/dialogs.c:2375
+#: src/dialogs.c:2417
 msgid "Gaim - Find Buddy By Email"
 msgstr "Gaim - Njs kamarta poda emailu"
 
-#: src/dialogs.c:2515
+#: src/dialogs.c:2557
 msgid "Gaim - Add URL"
 msgstr "Gaim - Prida URL"
 
-#: src/dialogs.c:2666 src/dialogs.c:2687 src/dialogs.c:2741
+#: src/dialogs.c:2708 src/dialogs.c:2729 src/dialogs.c:2783
 msgid "Select Text Color"
 msgstr "Veberte farbu textu"
 
-#: src/dialogs.c:2720
+#: src/dialogs.c:2762
 msgid "Select Background Color"
 msgstr "Vyberte farbu pozadia"
 
-#: src/dialogs.c:2942
+#: src/dialogs.c:2984
 msgid "Import to:"
 msgstr "Importuj do:"
 
-#: src/dialogs.c:2966
+#: src/dialogs.c:3008
 msgid "Gaim - Import Buddy List"
 msgstr "Gaim - Importuj zoznam kamartov"
 
 #. We shouldn't allow a blank title
-#: src/dialogs.c:3033
+#: src/dialogs.c:3075
 msgid "You cannot create an away message with a blank title"
 msgstr "Nemete vytvori 'Pre' sprvu s przdnym nzvom"
 
 #. We shouldn't allow a blank message
-#: src/dialogs.c:3040
+#: src/dialogs.c:3082
 msgid "You cannot create an empty away message"
 msgstr "Nemete vytvori przdnu 'Pre' sprvu"
 
-#: src/dialogs.c:3108
+#: src/dialogs.c:3150
 msgid "Gaim - New away message"
 msgstr "Gaim - Nov 'Pre' sprva"
 
-#: src/dialogs.c:3118
+#: src/dialogs.c:3160
 msgid "New away message"
 msgstr "Nov 'Pre' sprva"
 
-#: src/dialogs.c:3131
+#: src/dialogs.c:3173
 msgid "Away title: "
 msgstr "Nzov 'Pre': "
 
-#: src/dialogs.c:3170
+#: src/dialogs.c:3212
 msgid "Use"
 msgstr "Poui"
 
-#: src/dialogs.c:3174
+#: src/dialogs.c:3216
 msgid "Save & Use"
 msgstr "Uloi a Poui"
 
 #. show everything
-#: src/dialogs.c:3372
+#: src/dialogs.c:3413
 msgid "Smile!"
 msgstr "???"
 
-#: src/dialogs.c:3425
+#: src/dialogs.c:3466
 msgid "Alias Buddy"
 msgstr "Alias kamarta"
 
-#: src/dialogs.c:3458
+#: src/dialogs.c:3499
 msgid "Gaim - Alias Buddy"
 msgstr "Gaim - Alias kamarta"
 
-#: src/dialogs.c:3530
+#: src/dialogs.c:3571
 msgid "Gaim - Save Log File"
 msgstr "Gaim - Uloit zznamov sbor"
 
-#: src/dialogs.c:3562
+#: src/dialogs.c:3603
 #, c-format
 msgid "Unable to remove file %s - %s"
 msgstr "Nemem vymaza sbor %s - %s"
 
-#: src/dialogs.c:3590
+#: src/dialogs.c:3631
 msgid "Really clear log?"
 msgstr "Skutone vymaza zznamy?"
 
-#: src/dialogs.c:3605
+#: src/dialogs.c:3646
 msgid "Okay"
 msgstr "OK"
 
-#: src/dialogs.c:3776
+#: src/dialogs.c:3817
 msgid "Date"
 msgstr "Dtum"
 
-#: src/dialogs.c:3839
+#: src/dialogs.c:3880
 msgid "Conversation"
 msgstr "Konverzcia"
 
-#: src/dialogs.c:3862
+#: src/dialogs.c:3903
 msgid "Clear"
 msgstr "Vyisti"
 
-#: src/dialogs.c:3940
+#: src/dialogs.c:3981
 msgid "Gaim - Rename Group"
 msgstr "Gaim - Premenova skupinu"
 
-#: src/dialogs.c:3950
+#: src/dialogs.c:3991
 msgid "Rename Group"
 msgstr "Premenova Skupinu"
 
-#: src/dialogs.c:3957 src/dialogs.c:4063
+#: src/dialogs.c:3998 src/dialogs.c:4104
 msgid "New name:"
 msgstr "Nov meno"
 
-#: src/dialogs.c:4046
+#: src/dialogs.c:4087
 msgid "Gaim - Rename Buddy"
 msgstr "Gaim - Premenova kamarta"
 
-#: src/dialogs.c:4056
+#: src/dialogs.c:4097
 msgid "Rename Buddy"
 msgstr "Premenova kamarta"
 
 #. Below is basically stolen from plugins.c
-#: src/dialogs.c:4140
+#: src/dialogs.c:4181
 msgid "Gaim - Select Perl Script"
 msgstr "Gaim - Vyberte si Perlov skript"
 
-#: src/gaimrc.c:1117
+#: src/gaimrc.c:1136
 #, c-format
 msgid "Could not open config file %s."
 msgstr "Nemem otvori konfiguran sbor %s."
 
-#: src/gaimrc.c:1118
+#: src/gaimrc.c:1137
 msgid "Preferences Error"
 msgstr "Chyba ???"
 
@@ -2230,55 +2696,65 @@
 msgid "g003: Error opening connection.\n"
 msgstr "g003: Chyba pri otvran spojenia.\n"
 
-#: src/multi.c:452
+#: src/module.c:106 src/module.c:112 src/module.c:122
+#, fuzzy
+msgid "Plugin Error"
+msgstr "Chyba pri Prihlasovan"
+
+#: src/multi.c:454
 msgid "Gaim - Load Buddy Icon"
 msgstr "Gaim - Nahra ikonu kamarta"
 
-#: src/multi.c:495
+#: src/multi.c:497
 msgid "Buddy Icon File:"
 msgstr "Sbor s ikonami kamartov:"
 
-#: src/multi.c:506
+#: src/multi.c:508
 msgid "Browse"
 msgstr "Prehliada"
 
-#: src/multi.c:511 src/prefs.c:1545
+#: src/multi.c:513 src/prefs.c:1548
 msgid "Reset"
 msgstr "Zrui"
 
-#: src/multi.c:538
+#: src/multi.c:540
 msgid "Screenname:"
 msgstr "???meno:"
 
-#: src/multi.c:558
+#: src/multi.c:559
+#, fuzzy
+msgid "Alias:"
+msgstr "Alias"
+
+#: src/multi.c:569
 msgid "Protocol:"
 msgstr "Protokol:"
 
-#: src/multi.c:563
+#: src/multi.c:574
 msgid "Remember Password"
 msgstr "Zapamta heslo"
 
-#: src/multi.c:564
+#: src/multi.c:575
 msgid "Auto-Login"
 msgstr "Aotomatick prihlasovanie sa"
 
-#: src/multi.c:604
+#: src/multi.c:616
 msgid "New Mail Notifications"
 msgstr "Upozorovanie na nov sprvy"
 
-#: src/multi.c:694
+#: src/multi.c:706
 msgid "Register with server"
 msgstr ""
 
-#: src/multi.c:752
+#: src/multi.c:764
 msgid "Gaim - Modify Account"
 msgstr "Gaim - Zmeni konto"
 
-#: src/multi.c:871
+#: src/multi.c:883
 msgid "Enter Password"
 msgstr "Vlote heslo"
 
-#: src/multi.c:935
+#: src/multi.c:947
 msgid ""
 "You cannot log this account in; you do not have the protocol it uses loaded, "
 "or the protocol does not have a login function."
@@ -2286,75 +2762,75 @@
 "Nemoete sa prihlsi na toto konto, nemte nahran protokol, alebo protokol "
 "nem funkciu prihlsenia"
 
-#: src/multi.c:937
+#: src/multi.c:949
 msgid "Login Error"
 msgstr "Chyba pri Prihlasovan"
 
-#: src/multi.c:966
+#: src/multi.c:978
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "Ste si, e chcete vymazat %s"
 
-#: src/multi.c:1003
+#: src/multi.c:1015
 msgid "Gaim - Account Editor"
 msgstr "Gaim - Editor knt"
 
-#: src/multi.c:1022
+#: src/multi.c:1034
 msgid "Select All"
 msgstr "Vybra Vetky"
 
-#: src/multi.c:1027
+#: src/multi.c:1039
 msgid "Select Autos"
 msgstr ""
 
-#: src/multi.c:1031
+#: src/multi.c:1043
 msgid "Select None"
 msgstr "Vybrat iaden"
 
-#: src/multi.c:1045
+#: src/multi.c:1057
 msgid "Modify"
 msgstr "Zmeni"
 
-#: src/multi.c:1049
+#: src/multi.c:1061
 msgid "Sign On/Off"
 msgstr "Prihlsi/Odhlsi"
 
-#: src/multi.c:1053
+#: src/multi.c:1065
 msgid "Delete"
 msgstr "Zmaza"
 
-#: src/multi.c:1368
+#: src/multi.c:1380
 #, c-format
 msgid ""
 "%s\n"
 "%s: %s"
 msgstr ""
 
-#: src/multi.c:1387
+#: src/multi.c:1399
 #, fuzzy, c-format
 msgid "%s was unable to sign on"
 msgstr ""
 "%s\n"
 "%s nebol schopn prihlsi sa do: %s"
 
-#: src/multi.c:1398
+#: src/multi.c:1410
 #, fuzzy
 msgid "Notice"
 msgstr "Hlas"
 
-#: src/multi.c:1408
+#: src/multi.c:1420
 #, fuzzy, c-format
 msgid "%s has been signed off"
 msgstr ""
 "%s\n"
 "%s nebol schopn prihlsi sa do: %s"
 
-#: src/multi.c:1409
+#: src/multi.c:1421
 #, fuzzy
 msgid "Connection Error"
 msgstr "Spojenie ukonen"
 
-#: src/perl.c:856
+#: src/perl.c:875
 msgid "Perl Scripts"
 msgstr "Perlov skripty"
 
@@ -2416,9 +2892,9 @@
 msgid "General Options"
 msgstr "Veobecn voby"
 
-#: src/prefs.c:200 src/prefs.c:383 src/prefs.c:551 src/prefs.c:665
-#: src/prefs.c:918 src/prefs.c:1068 src/prefs.c:1293 src/prefs.c:1615
-#: src/prefs.c:1889 src/prefs.c:2322
+#: src/prefs.c:200 src/prefs.c:384 src/prefs.c:552 src/prefs.c:667
+#: src/prefs.c:921 src/prefs.c:1071 src/prefs.c:1296 src/prefs.c:1629
+#: src/prefs.c:1901 src/prefs.c:2334
 msgid "All options take effect immediately unless otherwise noted."
 msgstr "Vetky voby sa ihne pouij, pokia nie je napsan inak."
 
@@ -2492,8 +2968,8 @@
 msgstr "Prehliada"
 
 #: src/prefs.c:291
-msgid "KFM"
-msgstr "KFM"
+msgid "Konqueror"
+msgstr ""
 
 #: src/prefs.c:292
 msgid "Opera"
@@ -2503,27 +2979,32 @@
 msgid "Netscape"
 msgstr "Netscape"
 
-#: src/prefs.c:296
+#: src/prefs.c:294
+msgid "Mozilla"
+msgstr ""
+
+#: src/prefs.c:297
 msgid "Pop up new window by default"
 msgstr "tandadne otvor nov okno"
 
-#: src/prefs.c:303
+#: src/prefs.c:304
 msgid "GNOME URL Handler"
 msgstr ""
 
-#: src/prefs.c:305
-msgid "Galeon"
-msgstr ""
-
 #: src/prefs.c:306
-msgid "Manual"
-msgstr "Nvod"
-
-#: src/prefs.c:375
+msgid "Galeon"
+msgstr ""
+
+#: src/prefs.c:307
+#, c-format
+msgid "Manual (%s for URL)"
+msgstr ""
+
+#: src/prefs.c:376
 msgid "Proxy Options"
 msgstr "Voby proxy"
 
-#: src/prefs.c:387
+#: src/prefs.c:388
 msgid ""
 "Not all protocols can use these proxy options. Please see the README file "
 "for details."
@@ -2531,374 +3012,383 @@
 "Nie vetky protokoly mou poui tieto voby proxy. Pozrite si,\n"
 "prosm, README sbor pre detaily."
 
-#: src/prefs.c:392
+#: src/prefs.c:393
 msgid "Proxy Type"
 msgstr "Typ proxy"
 
-#: src/prefs.c:404
+#: src/prefs.c:405
 msgid "Proxy Server"
 msgstr "Proxy Server"
 
-#: src/prefs.c:407
+#: src/prefs.c:408
 msgid "No Proxy"
 msgstr "Bez proxy"
 
-#: src/prefs.c:419
+#: src/prefs.c:420
 msgid "SOCKS 4"
 msgstr "SOCKS 4"
 
-#: src/prefs.c:429
+#: src/prefs.c:430
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
-#: src/prefs.c:438
+#: src/prefs.c:439
 msgid "HTTP"
 msgstr "HTTP"
 
-#: src/prefs.c:462
+#: src/prefs.c:463
 msgid "Host"
 msgstr "Hostite"
 
-#: src/prefs.c:478
+#: src/prefs.c:479
 msgid "Port"
 msgstr "Port"
 
-#: src/prefs.c:495
+#: src/prefs.c:496
 msgid "User"
 msgstr "Pouvate"
 
-#: src/prefs.c:511
+#: src/prefs.c:512
 msgid "Password"
 msgstr "Heslo"
 
-#: src/prefs.c:543
+#: src/prefs.c:544
 msgid "Buddy List Options"
 msgstr "Voby zoznamu kamratov"
 
-#: src/prefs.c:555
+#: src/prefs.c:556
 msgid "Buddy List Window"
 msgstr "Okno zo zoznamom kamartov"
 
-#: src/prefs.c:568
+#: src/prefs.c:569
 #, fuzzy
 msgid "Tab Placement:"
 msgstr "Poloha zloky"
 
-#: src/prefs.c:572 src/prefs.c:1001 src/prefs.c:1151
+#: src/prefs.c:573 src/prefs.c:1004 src/prefs.c:1154
 msgid "Top"
 msgstr "Hore"
 
-#: src/prefs.c:573 src/prefs.c:1003 src/prefs.c:1153
+#: src/prefs.c:574 src/prefs.c:1006 src/prefs.c:1156
 msgid "Bottom"
 msgstr "Dole"
 
-#: src/prefs.c:585
+#: src/prefs.c:586
 msgid "Hide IM/Info/Chat buttons"
 msgstr "Skry tlatka IM/Informcie/Chat"
 
-#: src/prefs.c:587
+#: src/prefs.c:588
 msgid "Automatically show buddy list on sign on"
 msgstr "Automaticky zobraz zoznam kamartov pri prihlsen"
 
-#: src/prefs.c:589
+#: src/prefs.c:590
 msgid "Display Buddy List near applet"
 msgstr ""
 
-#: src/prefs.c:592
+#: src/prefs.c:593
 msgid "Save Window Size/Position"
 msgstr "Ulo vekost/pozciu okna"
 
-#: src/prefs.c:595
+#: src/prefs.c:596
 msgid "Show pictures on buttons"
 msgstr "Zobraz obrzky na tlatkach"
 
 #: src/prefs.c:600
+msgid "Raise Buddy List on Signons and Signoffs"
+msgstr ""
+
+#: src/prefs.c:602
 msgid "Group Displays"
 msgstr "Zobrazenia skupiny"
 
-#: src/prefs.c:612
+#: src/prefs.c:614
 msgid "Hide groups with no online buddies"
 msgstr "Skry skupiny so iadnymi propojenmi kamartmi"
 
-#: src/prefs.c:618
+#: src/prefs.c:620
 msgid "Show numbers in groups"
 msgstr "Zobraz sla v skupinch"
 
-#: src/prefs.c:620
+#: src/prefs.c:622
 msgid "Buddy Displays"
 msgstr ""
 
-#: src/prefs.c:632
+#: src/prefs.c:634
 msgid "Show buddy type icons"
 msgstr ""
 
-#: src/prefs.c:633
+#: src/prefs.c:635
 msgid "Show warning levels"
 msgstr ""
 
-#: src/prefs.c:639
+#: src/prefs.c:641
 msgid "Show idle times"
 msgstr ""
 
-#: src/prefs.c:640
+#: src/prefs.c:642
 msgid "Grey idle buddies"
 msgstr ""
 
-#: src/prefs.c:657
+#: src/prefs.c:659
 msgid "Conversation Options"
 msgstr "Voby konverzcie"
 
-#: src/prefs.c:669
+#: src/prefs.c:671
 msgid "Keyboard Options"
 msgstr "Voby klvesnice"
 
-#: src/prefs.c:681
+#: src/prefs.c:683
 msgid "Enter sends message"
 msgstr "Enter pole sprvu"
 
-#: src/prefs.c:682
+#: src/prefs.c:684
 msgid "Control-Enter sends message"
 msgstr "Control-Enter pole sprvu"
 
-#: src/prefs.c:683
+#: src/prefs.c:685
 msgid "Escape closes window"
 msgstr "Tlaidlo Escape zatvor okno"
 
-#: src/prefs.c:689
+#: src/prefs.c:686
+#, fuzzy
+msgid "Control-W closes window"
+msgstr "Tlaidlo Escape zatvor okno"
+
+#: src/prefs.c:692
 msgid "Control-{B/I/U/S} inserts HTML tags"
 msgstr "Control-{B/I/U/S} vlo HTML znaky"
 
-#: src/prefs.c:690
+#: src/prefs.c:693
 msgid "Control-(number) inserts smileys"
 msgstr "Control-(slo) vlo smajlka"
 
-#: src/prefs.c:691
+#: src/prefs.c:694
 msgid "F2 toggles timestamp display"
 msgstr ""
 
-#: src/prefs.c:693
+#: src/prefs.c:696
 msgid "Display and General Options"
 msgstr "Voby zobrazenia a veobecn voby"
 
-#: src/prefs.c:705
+#: src/prefs.c:708
 msgid "Show graphical smileys"
 msgstr "Zobraz smajlkov graficky"
 
-#: src/prefs.c:706
+#: src/prefs.c:709
 msgid "Show timestamp on messages"
 msgstr "Zobraz asov znaku pri sprvach"
 
-#: src/prefs.c:707
+#: src/prefs.c:710
 msgid "Show URLs as links"
 msgstr "Zobraz URL ako linky"
 
-#: src/prefs.c:708
+#: src/prefs.c:711
 msgid "Highlight misspelled words"
 msgstr "Zvrazni nesprvne psan slov"
 
-#: src/prefs.c:709 src/prefs.c:1911
+#: src/prefs.c:712 src/prefs.c:1923
 msgid "Sending messages removes away status"
 msgstr "Posielanie sprv zru stav 'Pre'"
 
-#: src/prefs.c:710 src/prefs.c:1924
+#: src/prefs.c:713 src/prefs.c:1936
 msgid "Queue new messages when away"
 msgstr "Ke som 'Pre' nov sprvy zara do rady"
 
-#: src/prefs.c:716
+#: src/prefs.c:719
 msgid "Ignore colors"
 msgstr "Ignoruj farby"
 
-#: src/prefs.c:717
+#: src/prefs.c:720
 msgid "Ignore font faces"
 msgstr "Ignoruj vzhady fontu"
 
-#: src/prefs.c:718
+#: src/prefs.c:721
 msgid "Ignore font sizes"
 msgstr "Ignoruj vekosti fontu"
 
-#: src/prefs.c:719
+#: src/prefs.c:722
 msgid "Ignore TiK Automated Messages"
 msgstr "Ignoruj TiK automatick sprvy"
 
-#: src/prefs.c:720 src/prefs.c:1909
+#: src/prefs.c:723 src/prefs.c:1921
 msgid "Ignore new conversations when away"
 msgstr "Ignoruj nov konverzciu ke ste 'Pre'"
 
-#: src/prefs.c:909
+#: src/prefs.c:912
 msgid "IM Options"
 msgstr "Voby IM"
 
-#: src/prefs.c:922 src/prefs.c:2907
+#: src/prefs.c:925 src/prefs.c:2921
 msgid "IM Window"
 msgstr "IM okno"
 
-#: src/prefs.c:938 src/prefs.c:1088
+#: src/prefs.c:941 src/prefs.c:1091
 msgid "Show buttons as: "
 msgstr "Zobraz tlatka ako:"
 
-#: src/prefs.c:942 src/prefs.c:1093
+#: src/prefs.c:945 src/prefs.c:1096
 msgid "Pictures And Text"
 msgstr "Obrzky a text"
 
-#: src/prefs.c:943 src/prefs.c:1095
+#: src/prefs.c:946 src/prefs.c:1098
 msgid "Pictures"
 msgstr "Obrzky"
 
-#: src/prefs.c:944 src/prefs.c:1096
+#: src/prefs.c:947 src/prefs.c:1099
 msgid "Text"
 msgstr "Text"
 
-#: src/prefs.c:955
+#: src/prefs.c:958
 msgid "Show all conversations in one tabbed window"
 msgstr "Zobraz vetky konverzcie v jednom okne so zlokami"
 
-#: src/prefs.c:957
+#: src/prefs.c:960
 #, fuzzy
 msgid "Show chats in the same tabbed window"
 msgstr "Zobraz vetky chaty v jednom okne so zlokami"
 
-#: src/prefs.c:964 src/prefs.c:1116
+#: src/prefs.c:967 src/prefs.c:1119
 msgid "Raise windows on events"
 msgstr "Zvi okno pri udalostiach"
 
-#: src/prefs.c:965
+#: src/prefs.c:968
 msgid "Show logins in window"
 msgstr "Zobraz prihlasovacie men v okne"
 
-#: src/prefs.c:966
-msgid "Show aliases in tabs/titles"
+#: src/prefs.c:969
+msgid "Show aliases in tabs/titles/ticker"
 msgstr ""
 
-#: src/prefs.c:967
+#: src/prefs.c:970
 #, fuzzy
 msgid "Hide window on send"
 msgstr "Zvi okno pri udalostiach"
 
-#: src/prefs.c:969 src/prefs.c:1119
+#: src/prefs.c:972 src/prefs.c:1122
 msgid "Window Sizes"
 msgstr "Vekosti okna"
 
-#: src/prefs.c:977 src/prefs.c:1127
+#: src/prefs.c:980 src/prefs.c:1130
 msgid "New window width:"
 msgstr "Vka novho okna:"
 
-#: src/prefs.c:978 src/prefs.c:1128
+#: src/prefs.c:981 src/prefs.c:1131
 msgid "New window height:"
 msgstr "rka novho okna:"
 
-#: src/prefs.c:979 src/prefs.c:1129
+#: src/prefs.c:982 src/prefs.c:1132
 msgid "Entry widget height:"
 msgstr "Vka vstupnho okienka:"
 
-#: src/prefs.c:981 src/prefs.c:1131
+#: src/prefs.c:984 src/prefs.c:1134
 msgid "Tab Placement"
 msgstr "Poloha zloky"
 
-#: src/prefs.c:1010 src/prefs.c:1160
+#: src/prefs.c:1013 src/prefs.c:1163
 msgid "Left"
 msgstr "Vavo"
 
-#: src/prefs.c:1012 src/prefs.c:1162
+#: src/prefs.c:1015 src/prefs.c:1165
 msgid "Right"
 msgstr "Vpravo"
 
-#: src/prefs.c:1016
+#: src/prefs.c:1019
 msgid "Buddy Icons"
 msgstr "Kamartova ikona"
 
-#: src/prefs.c:1028
+#: src/prefs.c:1031
 msgid "Hide Buddy Icons"
 msgstr "Skry ikony kamartov"
 
-#: src/prefs.c:1034
+#: src/prefs.c:1037
 #, fuzzy
 msgid "Disable Buddy Icon Animation"
 msgstr "Nepovoli animcie"
 
-#: src/prefs.c:1060
+#: src/prefs.c:1063
 msgid "Chat Options"
 msgstr "Voby chatu"
 
-#: src/prefs.c:1072
+#: src/prefs.c:1075
 msgid "Group Chat Window"
 msgstr "Okno skupinovho chatu"
 
-#: src/prefs.c:1107
+#: src/prefs.c:1110
 msgid "Show all chats in one tabbed window"
 msgstr "Zobraz vetky chaty v jednom okne so zlokami"
 
-#: src/prefs.c:1109
+#: src/prefs.c:1112
 #, fuzzy
 msgid "Show conversations in the same tabbed window"
 msgstr "Zobraz vetky konverzcie v jednom okne so zlokami"
 
-#: src/prefs.c:1117
+#: src/prefs.c:1120
 msgid "Show people joining/leaving in window"
 msgstr "Zobraz ud pripjajcich/odchdzajcich v okne"
 
-#: src/prefs.c:1165
+#: src/prefs.c:1168
 msgid "Tab Completion"
 msgstr ""
 
-#: src/prefs.c:1177
+#: src/prefs.c:1180
 msgid "Tab-Complete Nicks"
 msgstr ""
 
-#: src/prefs.c:1183
+#: src/prefs.c:1186
 msgid "Old-Style Tab Completion"
 msgstr ""
 
-#: src/prefs.c:1285 src/prefs.c:2917
+#: src/prefs.c:1288 src/prefs.c:2931
 msgid "Font Options"
 msgstr "Voby fontov"
 
-#: src/prefs.c:1311
+#: src/prefs.c:1314
 msgid "Italic Text"
 msgstr "Kurzva"
 
-#: src/prefs.c:1355 src/prefs.c:1373 src/prefs.c:1395
+#: src/prefs.c:1358 src/prefs.c:1376 src/prefs.c:1398
 msgid "Select"
 msgstr "Vybra"
 
-#: src/prefs.c:1393
+#: src/prefs.c:1396
 msgid "Font Face for Text"
 msgstr "Vzhad fontu pre text"
 
-#: src/prefs.c:1408
+#: src/prefs.c:1411
 msgid "Font Size for Text"
 msgstr "Vekos fontu pre text"
 
-#: src/prefs.c:1505
+#: src/prefs.c:1508
 msgid "Gaim - Sound Configuration"
 msgstr "Gaim - Nastavenie zvukov"
 
-#: src/prefs.c:1540
+#: src/prefs.c:1543
 #, fuzzy
 msgid "Test"
 msgstr "Text"
 
-#: src/prefs.c:1550
+#: src/prefs.c:1553
 msgid "Choose..."
 msgstr "Vyberte..."
 
-#: src/prefs.c:1607
+#: src/prefs.c:1621
 msgid "Sound Options"
 msgstr "Zvuky Voby"
 
-#: src/prefs.c:1635
+#: src/prefs.c:1649
 msgid "No sounds when you log in"
 msgstr "Ziadne zvuky ke sa prihlsite"
 
-#: src/prefs.c:1641 src/prefs.c:1910
+#: src/prefs.c:1655 src/prefs.c:1922
 msgid "Sounds while away"
 msgstr "Zvuky pokia ste 'Pre'"
 
-#: src/prefs.c:1651
+#: src/prefs.c:1665
 #, fuzzy
 msgid "Sound method"
 msgstr "Zvuky Voby"
 
-#: src/prefs.c:1725
+#: src/prefs.c:1739
 #, fuzzy, c-format
 msgid ""
 "Sound command\n"
@@ -2907,105 +3397,105 @@
 "Prkaz na prehrvanie zvukovch sborov\n"
 "(%s pre meno sboru; vntorn ak je przdny)"
 
-#: src/prefs.c:1737
+#: src/prefs.c:1751
 #, fuzzy
 msgid "Sound played when:"
 msgstr "Zvukov prehrva:"
 
-#: src/prefs.c:1881 src/prefs.c:2939
+#: src/prefs.c:1893 src/prefs.c:2953
 msgid "Away Messages"
 msgstr "'Pre' sprvy"
 
-#: src/prefs.c:1918
+#: src/prefs.c:1930
 msgid "Don't send auto-response"
 msgstr "Neposla aotumatick odpove"
 
-#: src/prefs.c:1919
+#: src/prefs.c:1931
 #, fuzzy
 msgid "Only send auto-response when idle"
 msgstr "Neposla aotumatick odpove"
 
-#: src/prefs.c:1934
+#: src/prefs.c:1946
 msgid "Time between sending auto-responses (in seconds):"
 msgstr ""
 
-#: src/prefs.c:1949
+#: src/prefs.c:1961
 msgid "Auto Away after"
 msgstr "Automaticky 'Pre' po"
 
-#: src/prefs.c:1963
+#: src/prefs.c:1975
 msgid "minutes using"
 msgstr "mint pouva"
 
-#: src/prefs.c:1976
+#: src/prefs.c:1988
 msgid "Messages"
 msgstr "Sprvy"
 
-#: src/prefs.c:2033
+#: src/prefs.c:2045
 msgid "Edit"
 msgstr "Edituj"
 
-#: src/prefs.c:2037
+#: src/prefs.c:2049
 msgid "Make Away"
 msgstr "Urob 'Pre'"
 
-#: src/prefs.c:2314
+#: src/prefs.c:2326
 msgid "Privacy Options"
 msgstr "Voba Skromie"
 
-#: src/prefs.c:2330
+#: src/prefs.c:2342
 msgid "Set privacy for:"
 msgstr "Nastav bezpenos pre:"
 
-#: src/prefs.c:2349
+#: src/prefs.c:2361
 msgid "Allow all users to contact me"
 msgstr "Povo vetkm povateom kontaktova ma"
 
-#: src/prefs.c:2350
+#: src/prefs.c:2362
 msgid "Allow only the users below"
 msgstr "Povo iba niie uvedench pouvateov"
 
-#: src/prefs.c:2352
+#: src/prefs.c:2364
 msgid "Allow List"
 msgstr "Zoznam povolench"
 
-#: src/prefs.c:2383
+#: src/prefs.c:2395
 msgid "Deny all users"
 msgstr "Odmietnu vetkch pouvateov"
 
-#: src/prefs.c:2384
+#: src/prefs.c:2396
 msgid "Block the users below"
 msgstr "Blokova niie uvedench pouvateov"
 
-#: src/prefs.c:2386
+#: src/prefs.c:2398
 msgid "Block List"
 msgstr "Zoznam blokovanch"
 
-#: src/prefs.c:2481
+#: src/prefs.c:2493
 msgid "Gaim - Preferences"
 msgstr "Gaim - Nastavenia"
 
-#: src/prefs.c:2564
+#: src/prefs.c:2576
 msgid "Gaim debug output window"
 msgstr "Gaim vonkajie ladiace okno"
 
-#: src/prefs.c:2873
+#: src/prefs.c:2887
 msgid "General"
 msgstr "Hlavn"
 
-#: src/prefs.c:2878
+#: src/prefs.c:2892
 msgid "Proxy"
 msgstr "Proxy"
 
-#: src/prefs.c:2902
+#: src/prefs.c:2916
 msgid "Conversations"
 msgstr "Konverzcie"
 
-#: src/prefs.c:2928
+#: src/prefs.c:2942
 msgid "Sounds"
 msgstr "Zvuky"
 
-#: src/prefs.c:2950
+#: src/prefs.c:2964
 msgid "Privacy"
 msgstr "Skromie"
 
@@ -3049,37 +3539,38 @@
 msgid "Open Mail"
 msgstr "Otvori potu"
 
-#: src/prpl.c:564
-#, c-format
-msgid "%s%s%s%s has made %s their buddy%s%s%s"
+#: src/prpl.c:570
+#, fuzzy, c-format
+msgid "%s%s%s%s has made %s his or her buddy%s%s%s"
 msgstr "%s%s%s%s urobil %s jeho kamarta%s%s%s"
 
-#: src/prpl.c:572
+#: src/prpl.c:578
+#, fuzzy
 msgid ""
 "\n"
 "\n"
-"Do you wish to add them to your buddy list?"
+"Do you wish to add him or her to your buddy list?"
 msgstr ""
 "\n"
 "\n"
 "elte si prida ich do Vho zoznamu kamartov?"
 
-#: src/prpl.c:615
+#: src/prpl.c:621
 msgid ""
 "You do not currently have any protocols available that are able to register "
 "new accounts."
 msgstr ""
 
-#: src/prpl.c:652
+#: src/prpl.c:658
 #, fuzzy
 msgid "Gaim - Registration"
 msgstr "Gaim - Konverzcie"
 
-#: src/prpl.c:667
+#: src/prpl.c:673
 msgid "Registration Information"
 msgstr ""
 
-#: src/prpl.c:684
+#: src/prpl.c:690
 #, fuzzy
 msgid "Register"
 msgstr "Zrui"
@@ -3109,26 +3600,71 @@
 msgid "No"
 msgstr "Nie"
 
-#: src/server.c:1054
+#: src/server.c:1076
 #, fuzzy
 msgid "More Info"
 msgstr "Zskaj Info"
 
+#: src/sound.c:63
+#, fuzzy
+msgid "Buddy logs in"
+msgstr "Kamartova ikona"
+
+#: src/sound.c:64
+#, fuzzy
+msgid "Buddy logs out"
+msgstr "Zvuk ke sa kamart odhlsi"
+
+#: src/sound.c:65
+#, fuzzy
+msgid "Message received"
+msgstr "Zvuk ke dostanete sprvu"
+
+#: src/sound.c:66
+#, fuzzy
+msgid "Message received begins conversation"
+msgstr "Zvuk ke dostanete sprvu o zaiatku konverzcie"
+
+#: src/sound.c:67
+#, fuzzy
+msgid "Message sent"
+msgstr "Sprvy"
+
+#: src/sound.c:68
+msgid "Person enters chat"
+msgstr ""
+
+#: src/sound.c:69
+msgid "Person leaves chat"
+msgstr ""
+
+#: src/sound.c:70
+msgid "You talk in chat"
+msgstr ""
+
+#: src/sound.c:71
+msgid "Others talk in chat"
+msgstr ""
+
+#: src/sound.c:74
+msgid "Someone says your name in chat"
+msgstr ""
+
+#~ msgid "Enable sounds"
+#~ msgstr "Povoli zvuky"
+
+#~ msgid "KFM"
+#~ msgstr "KFM"
+
+#~ msgid "Manual"
+#~ msgstr "Nvod"
+
 #~ msgid "Events"
 #~ msgstr "Udalosti"
 
 #~ msgid "Sound when buddy logs in"
 #~ msgstr "Zvuk ke sa kamart prihlsi"
 
-#~ msgid "Sound when buddy logs out"
-#~ msgstr "Zvuk ke sa kamart odhlsi"
-
-#~ msgid "Sound when received message begins conversation"
-#~ msgstr "Zvuk ke dostanete sprvu o zaiatku konverzcie"
-
-#~ msgid "Sound when message is received"
-#~ msgstr "Zvuk ke dostanete sprvu"
-
 #~ msgid "Sound when message is sent"
 #~ msgstr "Zvuk ke polete sprvu"
 
@@ -3144,27 +3680,9 @@
 #~ msgid "Sound in chat rooms when others talk"
 #~ msgstr "Zvuk v chatovacej miestnosti ke sa rozprvaju in"
 
-#~ msgid "Available"
-#~ msgstr "Prtomn"
-
-#~ msgid "Available for friends only"
-#~ msgstr "Prtomn iba pre priateov"
-
-#~ msgid "Away for friends only"
-#~ msgstr "Pre iba pre priateov"
-
-#~ msgid "Invisible"
-#~ msgstr "Neviditen"
-
-#~ msgid "Invisible for friends only"
-#~ msgstr "Neviditen iba pre priateov"
-
 #~ msgid "Handshake"
 #~ msgstr "Nadvzujem spojenie"
 
-#~ msgid "Connecting to GG server"
-#~ msgstr "Pripjam sa na GG server"
-
 #~ msgid "Sending key"
 #~ msgstr "Posielam k"
 
@@ -3175,15 +3693,6 @@
 #~ msgstr "Poli sprvu bez pripojenia"
 
 #~ msgid ""
-#~ "\n"
-#~ "\n"
-#~ "IRC: #gaim on irc.openprojects.net"
-#~ msgstr ""
-#~ "\n"
-#~ "\n"
-#~ "IRC: #gaim na irc.openprojects.net"
-
-#~ msgid ""
 #~ "Rob Flynn (maintainer)               rob@marko.net\n"
 #~ "Eric Warmenhoven (lead coder)  warmenhoven@yahoo.com\n"
 #~ "\n"
@@ -3203,29 +3712,31 @@
 #~ "Mark Spencer (originlny autor)   markster@marko.net"
 
 #~ msgid ""
-#~ "Relax, help is just around the corner. The first thing you'll need to do is "
-#~ "get an AIM account; you can get one from http://aim.aol.com/. Just click the "
-#~ "button that says \"New Users\" and you can create an account that way. Once "
-#~ "you have your account, enter the username and password into the login window "
-#~ "that comes up when you start Gaim, and click the Signon button. Once you're "
-#~ "online, you can talk to one of the Gaim developers for more assistance; "
-#~ "their contact information is in the AUTHORS file in the Gaim source, or at "
+#~ "Relax, help is just around the corner. The first thing you'll need to do "
+#~ "is get an AIM account; you can get one from http://aim.aol.com/. Just "
+#~ "click the button that says \"New Users\" and you can create an account "
+#~ "that way. Once you have your account, enter the username and password "
+#~ "into the login window that comes up when you start Gaim, and click the "
+#~ "Signon button. Once you're online, you can talk to one of the Gaim "
+#~ "developers for more assistance; their contact information is in the "
+#~ "AUTHORS file in the Gaim source, or at "
 #~ msgstr ""
-#~ "Relac, pomoc je za rohom. Prv vec, ktor muste urobi je zska AIM konto; "
-#~ "moete to urobi na http://aim.aol.com. Iba kliknite na tlatko \"New "
-#~ "Users\" a moete konto vytvori touto cestou. Potom ako vytvorte Vae "
-#~ "konto, vpte pouivatesk meno a heslo do prihlasovacieho okna, ktor sa "
-#~ "objav po tarte aplikcie Gaim, a potom kliknite na tlaidlo Prihlsi. Ke "
-#~ "ste pripojen, mete sa rozprva s niektorm s vvojrov Gaim-u, ak "
-#~ "potrebujete daiu pomoc; ich kontaktn informcie s v sbore AUTHORS v "
-#~ "zdrojovom kde Gaim-u, alebo v "
+#~ "Relac, pomoc je za rohom. Prv vec, ktor muste urobi je zska AIM "
+#~ "konto; moete to urobi na http://aim.aol.com. Iba kliknite na tlatko "
+#~ "\"New Users\" a moete konto vytvori touto cestou. Potom ako vytvorte "
+#~ "Vae konto, vpte pouivatesk meno a heslo do prihlasovacieho okna, "
+#~ "ktor sa objav po tarte aplikcie Gaim, a potom kliknite na tlaidlo "
+#~ "Prihlsi. Ke ste pripojen, mete sa rozprva s niektorm s vvojrov "
+#~ "Gaim-u, ak potrebujete daiu pomoc; ich kontaktn informcie s v sbore "
+#~ "AUTHORS v zdrojovom kde Gaim-u, alebo v "
 
 #~ msgid ""
 #~ "contactinfo.php. If you can't get online and still need more assistance, "
 #~ "feel free to email us at gaim@marko.net. Thanks for using Gaim!"
 #~ msgstr ""
-#~ "contactinfo.php. Ak sa nemoete pripoji a stle potrebujete daiu pomoc, "
-#~ "bez obv polite email na gaim@marko.net. akujeme za pouvanie Gaim-u!"
+#~ "contactinfo.php. Ak sa nemoete pripoji a stle potrebujete daiu "
+#~ "pomoc, bez obv polite email na gaim@marko.net. akujeme za pouvanie "
+#~ "Gaim-u!"
 
 #~ msgid "Help!"
 #~ msgstr "Pomoc!"
--- a/po/sv.po	Tue Jul 02 05:41:30 2002 +0000
+++ b/po/sv.po	Tue Jul 02 05:42:26 2002 +0000
@@ -2,12 +2,12 @@
 # Copyright (C) 2001, 2002 Free Software Foundation, Inc.
 # Christian Rose <menthos@menthos.com>, 2001.
 #
-# $Id: sv.po 3279 2002-05-19 03:07:31Z robflynn $
+# $Id: sv.po 3362 2002-07-02 05:42:26Z robflynn $
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: gaim\n"
-"POT-Creation-Date: 2002-05-19 03:54+0200\n"
+"POT-Creation-Date: 2002-06-25 00:10-0400\n"
 "PO-Revision-Date: 2002-05-19 03:54+0200\n"
 "Last-Translator: Christian Rose <menthos@menthos.com>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -15,7 +15,83 @@
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/protocols/gg/gg.c:71
+#: plugins/chatlist.c:67 src/buddy_chat.c:272
+msgid "Buddy Chat"
+msgstr "Kompischatt"
+
+#: plugins/chatlist.c:166 plugins/chatlist.c:168 plugins/chatlist.c:407
+#: plugins/chatlist.c:409
+msgid "Gaim Chat"
+msgstr "Gaim-chatt"
+
+#: plugins/chatlist.c:339 src/about.c:165 src/aim.c:320 src/buddy.c:2716
+#: src/buddy_chat.c:1322 src/buddy_chat.c:1419 src/buddy_chat.c:1449
+#: src/conversation.c:2864 src/dialogs.c:567 src/dialogs.c:3899
+#: src/multi.c:1069 src/plugins.c:277 src/prefs.c:2547 src/prpl.c:438
+#: src/prpl.c:685 src/server.c:1072
+msgid "Close"
+msgstr "Stng"
+
+#: plugins/chatlist.c:344
+msgid "Chat Rooms"
+msgstr "Chattrum"
+
+#: plugins/chatlist.c:363
+msgid "Refresh"
+msgstr "Uppdatera"
+
+#. Put the buttons in the box
+#: plugins/chatlist.c:364 src/buddy.c:492 src/buddy.c:2827
+#: src/buddy_chat.c:1454 src/conversation.c:2389 src/conversation.c:2879
+#: src/dialogs.c:932 src/dialogs.c:1114 src/dialogs.c:2095 src/multi.c:1053
+#: src/prefs.c:2041 src/prefs.c:2383 src/prefs.c:2417
+msgid "Add"
+msgstr "Lgg till"
+
+#: plugins/chatlist.c:365 src/buddy.c:494 src/buddy.c:2829
+#: src/buddy_chat.c:1456 src/conversation.c:2375 src/conversation.c:2876
+#: src/prefs.c:2055 src/prefs.c:2387 src/prefs.c:2421
+msgid "Remove"
+msgstr "Ta bort"
+
+#: plugins/chatlist.c:388
+msgid "List of available chats"
+msgstr "Lista med tillgngliga chattar"
+
+#: plugins/chatlist.c:398
+msgid "List of subscribed chats"
+msgstr "Lista med prenumererade chattar"
+
+#: plugins/gtik.c:699
+msgid "Gnome Stock Ticker Properties"
+msgstr "Egenskaper fr Gnome Stick Ticker"
+
+#: plugins/gtik.c:711
+msgid "Update Frequency in min"
+msgstr "Uppdateringsfrekvens i minuter"
+
+#: plugins/gtik.c:727
+msgid "Enter symbols delimited with \"+\" in the box below."
+msgstr "Ange symboler tskilda med \"+\" i fltet nedan."
+
+#. OUTPUT FORMAT and SCROLL DIRECTION
+#: plugins/gtik.c:737
+msgid "Check this box to display only symbols and price:"
+msgstr "Kryssa i denna ruta fr att endast visa symboler och pris:"
+
+#: plugins/gtik.c:738
+msgid "Check this box to scroll left to right:"
+msgstr "Kryssa i denna ruta fr att rulla vnster till hger:"
+
+#: plugins/gtik.c:974
+msgid "(No"
+msgstr "(Nej"
+
+#: plugins/gtik.c:975
+msgid "Change"
+msgstr "ndra"
+
+#: src/protocols/gg/gg.c:71 src/protocols/msn/msn.c:1919
 msgid "Available"
 msgstr "Tillgnglig"
 
@@ -23,8 +99,8 @@
 msgid "Available for friends only"
 msgstr "Tillgnglig endast fr vnner"
 
-#: src/protocols/gg/gg.c:73 src/protocols/jabber/jabber.c:767 src/applet.c:185
-#: src/buddy.c:494 src/buddy.c:2553 src/buddy.c:2698
+#: src/applet.c:197 src/buddy.c:497 src/buddy.c:2582 src/buddy.c:2727
+#: src/protocols/gg/gg.c:73 src/protocols/jabber/jabber.c:1118
 msgid "Away"
 msgstr "Frnvarande"
 
@@ -40,7 +116,7 @@
 msgid "Invisible for friends only"
 msgstr "Osynlig endast fr vnner"
 
-#: src/protocols/gg/gg.c:77 src/protocols/jabber/jabber.c:763
+#: src/protocols/gg/gg.c:77 src/protocols/jabber/jabber.c:1114
 msgid "Unavailable"
 msgstr "Otillgnglig"
 
@@ -72,7 +148,7 @@
 msgid "Unknown Error Code."
 msgstr "Oknd felkod."
 
-#: src/protocols/gg/gg.c:302
+#: src/protocols/gg/gg.c:302 src/protocols/msn/msn.c:2050
 #, c-format
 msgid "Status: %s"
 msgstr "Status: %s"
@@ -199,7 +275,7 @@
 msgstr "Kn"
 
 #. Line 5
-#: src/protocols/gg/gg.c:729 src/dialogs.c:1624 src/dialogs.c:2332
+#: src/dialogs.c:1624 src/dialogs.c:2332 src/protocols/gg/gg.c:729
 msgid "City"
 msgstr "Ort"
 
@@ -277,9 +353,8 @@
 #. } else if (!strcmp(act, _("Set Dir Info"))) {
 #. show_set_dir(gc);
 #.
-#: src/protocols/gg/gg.c:1160 src/protocols/gg/gg.c:1177
-#: src/protocols/jabber/jabber.c:3186 src/protocols/jabber/jabber.c:3199
-#: src/dialogs.c:1741
+#: src/dialogs.c:1741 src/protocols/gg/gg.c:1160 src/protocols/gg/gg.c:1177
+#: src/protocols/jabber/jabber.c:3748 src/protocols/jabber/jabber.c:3761
 msgid "Change Password"
 msgstr "Byt lsenord"
 
@@ -300,7 +375,7 @@
 msgstr "Skicka meddelande genom servern"
 
 #: src/protocols/icq/gaim_icq.c:469 src/protocols/irc/irc.c:1851
-#: src/protocols/jabber/jabber.c:2323 src/protocols/oscar/oscar.c:3580
+#: src/protocols/jabber/jabber.c:2860 src/protocols/oscar/oscar.c:3593
 #: src/protocols/toc/toc.c:1219
 msgid "Get Info"
 msgstr "Hmta information"
@@ -339,7 +414,7 @@
 "connection?"
 msgstr "%s har begrt en DCC-chatt. Vill du etablera direktanslutningen?"
 
-#: src/protocols/irc/irc.c:1001
+#: src/protocols/irc/irc.c:1001 src/protocols/msn/msn.c:315
 msgid "Unable to write"
 msgstr "Kan inte skriva"
 
@@ -366,7 +441,7 @@
 msgid "Channel:"
 msgstr "Kanal:"
 
-#: src/protocols/irc/irc.c:1675 src/multi.c:549
+#: src/multi.c:549 src/protocols/irc/irc.c:1675
 msgid "Password:"
 msgstr "Lsenord:"
 
@@ -374,200 +449,216 @@
 msgid "DCC Chat"
 msgstr "DCC-chatt"
 
-#: src/protocols/jabber/jabber.c:716
+#: src/protocols/jabber/jabber.c:942
 msgid "Incorrect current password! Password NOT Changed!"
 msgstr "Ogiltigt aktuellt lsenord! Lsenordet ndrades INTE!"
 
-#: src/protocols/jabber/jabber.c:717 src/protocols/jabber/jabber.c:722
+#: src/protocols/jabber/jabber.c:943 src/protocols/jabber/jabber.c:948
 msgid "Password Change Error!"
 msgstr "Fel vid lsenordsndring!"
 
-#: src/protocols/jabber/jabber.c:721
+#: src/protocols/jabber/jabber.c:947
 msgid "New password same as old password! Password NOT Changed!"
 msgstr "Nya lsenordet samma som det gamla! Lsenordet ndrades INTE!"
 
-#: src/protocols/jabber/jabber.c:769 src/protocols/jabber/jabber.c:798
-#: src/buddy.c:2858
+#: src/protocols/jabber/jabber.c:1092
+msgid "Unknown"
+msgstr "Oknd"
+
+#: src/buddy.c:2887 src/protocols/jabber/jabber.c:1120
+#: src/protocols/jabber/jabber.c:1138
 msgid "Online"
 msgstr "Ansluten"
 
-#: src/protocols/jabber/jabber.c:771
+#: src/protocols/jabber/jabber.c:1122
 msgid "Extended Away"
 msgstr "Utkad frnvaro"
 
-#: src/protocols/jabber/jabber.c:773
+#: src/protocols/jabber/jabber.c:1124
 msgid "Do Not Disturb"
 msgstr "Str inte"
 
-#: src/protocols/jabber/jabber.c:782
+#: src/protocols/jabber/jabber.c:1434
 #, c-format
 msgid "Error %s: %s"
 msgstr "Fel %s: %s"
 
-#: src/protocols/jabber/jabber.c:785
+#: src/protocols/jabber/jabber.c:1437
 msgid "Unknown Error in presence"
 msgstr "Oknt fel i nrvaro"
 
-#: src/protocols/jabber/jabber.c:1211
+#: src/protocols/jabber/jabber.c:1607
 #, c-format
 msgid "The user %s wants to add you to their buddy list."
 msgstr "Anvndaren %s vill lgga till dig i dennes kompislista."
 
-#: src/protocols/jabber/jabber.c:1236
+#: src/protocols/jabber/jabber.c:1632
 msgid "No such user"
 msgstr "Ingen sdan anvndare"
 
-#: src/protocols/jabber/jabber.c:1238 src/protocols/jabber/jabber.c:1875
-#: src/protocols/jabber/jabber.c:2023
+#: src/protocols/jabber/jabber.c:1634 src/protocols/jabber/jabber.c:2341
+#: src/protocols/jabber/jabber.c:2506
 msgid "Jabber Error"
 msgstr "Jabber-fel"
 
-#: src/protocols/jabber/jabber.c:1318 src/dialogs.c:887
+#: src/dialogs.c:887 src/protocols/jabber/jabber.c:1719
+#: src/protocols/msn/msn.c:1110
 msgid "Buddies"
 msgstr "Kompisar"
 
-#: src/protocols/jabber/jabber.c:1376
+#: src/protocols/jabber/jabber.c:1782
 msgid "Authenticating"
 msgstr "Autentiserar"
 
-#: src/protocols/jabber/jabber.c:1413
+#: src/protocols/jabber/jabber.c:1819
 msgid "Unknown login error"
 msgstr "Oknt inloggningsfel"
 
-#: src/protocols/jabber/jabber.c:1604
+#: src/protocols/jabber/jabber.c:2010
 msgid "Password successfully changed."
 msgstr "ndring av lsenord lyckades."
 
-#: src/protocols/jabber/jabber.c:1606
+#: src/protocols/jabber/jabber.c:2012
 msgid "Password Change"
 msgstr "Lsenordsndring"
 
-#: src/protocols/jabber/jabber.c:1648 src/protocols/jabber/jabber.c:3114
+#: src/protocols/jabber/jabber.c:2054 src/protocols/jabber/jabber.c:3676
 msgid "Connection lost"
 msgstr "Anslutningen tappades"
 
-#: src/protocols/jabber/jabber.c:1650 src/protocols/jabber/jabber.c:1682
-#: src/protocols/jabber/jabber.c:3116 src/protocols/jabber/jabber.c:3162
+#: src/protocols/jabber/jabber.c:2056 src/protocols/jabber/jabber.c:2088
+#: src/protocols/jabber/jabber.c:3678 src/protocols/jabber/jabber.c:3724
+#: src/protocols/msn/msn.c:1741 src/protocols/msn/msn.c:1770
 msgid "Unable to connect"
 msgstr "Kan inte ansluta"
 
-#: src/protocols/jabber/jabber.c:1656
+#: src/protocols/jabber/jabber.c:2062
 msgid "Connected"
 msgstr "Ansluten"
 
-#: src/protocols/jabber/jabber.c:1659
+#: src/protocols/jabber/jabber.c:2065
 msgid "Requesting Authentication Method"
 msgstr "Begr autentiseringsmetod"
 
 #. we have no chats yet
-#: src/protocols/jabber/jabber.c:1677
+#: src/protocols/jabber/jabber.c:2083 src/protocols/msn/msn.c:1762
 msgid "Connecting"
 msgstr "Ansluter"
 
-#: src/protocols/jabber/jabber.c:1874 src/protocols/jabber/jabber.c:2022
+#: src/protocols/jabber/jabber.c:2340 src/protocols/jabber/jabber.c:2505
 msgid "Invalid Jabber I.D."
 msgstr "Ogiltigt Jabber-id."
 
-#: src/protocols/jabber/jabber.c:1989
+#: src/protocols/jabber/jabber.c:2473
 msgid "Room:"
 msgstr "Rum:"
 
-#: src/protocols/jabber/jabber.c:1993
+#: src/protocols/jabber/jabber.c:2477
 msgid "Server:"
 msgstr "Server:"
 
-#: src/protocols/jabber/jabber.c:1998
+#: src/protocols/jabber/jabber.c:2482
 msgid "Handle:"
 msgstr "Handtag:"
 
-#: src/protocols/jabber/jabber.c:2273 src/protocols/jabber/jabber.c:2612
-msgid "Unknown"
-msgstr "Oknd"
-
-#: src/protocols/jabber/jabber.c:2328 src/protocols/oscar/oscar.c:3593
-#: src/buddy_chat.c:886
+#: src/protocols/jabber/jabber.c:2539
+#, fuzzy
+msgid "Chats"
+msgstr "Chatt"
+
+#: src/protocols/jabber/jabber.c:2854
+#, fuzzy
+msgid "View Error Msg"
+msgstr "Visa logg"
+
+#: src/buddy_chat.c:886 src/protocols/jabber/jabber.c:2865
+#: src/protocols/oscar/oscar.c:3606
 msgid "Get Away Msg"
 msgstr "Frnvaromeddelande"
 
-#: src/protocols/jabber/jabber.c:2510
+#: src/protocols/jabber/jabber.c:2882
+msgid "Remove From Roster"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:3076
 msgid "Full Name"
 msgstr "Fullstndigt namn"
 
-#: src/protocols/jabber/jabber.c:2511
+#: src/protocols/jabber/jabber.c:3077
 msgid "Family Name"
 msgstr "Efternamn"
 
-#: src/protocols/jabber/jabber.c:2512
+#: src/protocols/jabber/jabber.c:3078
 msgid "Given Name"
 msgstr "Frnamn"
 
-#: src/protocols/jabber/jabber.c:2513
+#: src/protocols/jabber/jabber.c:3079
 msgid "Nickname"
 msgstr "Smeknamn"
 
-#: src/protocols/jabber/jabber.c:2514 src/dialogs.c:2525
+#: src/dialogs.c:2525 src/protocols/jabber/jabber.c:3080
 msgid "URL"
 msgstr "URL"
 
-#: src/protocols/jabber/jabber.c:2515
+#: src/protocols/jabber/jabber.c:3081
 msgid "Street Address"
 msgstr "Gatuadress"
 
-#: src/protocols/jabber/jabber.c:2516
+#: src/protocols/jabber/jabber.c:3082
 msgid "Extended Address"
 msgstr "Utkad adress"
 
-#: src/protocols/jabber/jabber.c:2517
+#: src/protocols/jabber/jabber.c:3083
 msgid "Locality"
 msgstr "Lokalitet"
 
-#: src/protocols/jabber/jabber.c:2518
+#: src/protocols/jabber/jabber.c:3084
 msgid "Region"
 msgstr "Region"
 
-#: src/protocols/jabber/jabber.c:2519
+#: src/protocols/jabber/jabber.c:3085
 msgid "Postal Code"
 msgstr "Postnummer"
 
 #. Line 7
-#: src/protocols/jabber/jabber.c:2520 src/dialogs.c:1646 src/dialogs.c:2354
+#: src/dialogs.c:1646 src/dialogs.c:2354 src/protocols/jabber/jabber.c:3086
 msgid "Country"
 msgstr "Land"
 
-#: src/protocols/jabber/jabber.c:2521
+#: src/protocols/jabber/jabber.c:3087
 msgid "Telephone"
 msgstr "Telefon"
 
-#: src/protocols/jabber/jabber.c:2522 src/dialogs.c:2430
+#: src/dialogs.c:2430 src/protocols/jabber/jabber.c:3088
 msgid "Email"
 msgstr "E-post"
 
-#: src/protocols/jabber/jabber.c:2523
+#: src/protocols/jabber/jabber.c:3089
 msgid "Organization Name"
 msgstr "Organisationsnamn"
 
-#: src/protocols/jabber/jabber.c:2524
+#: src/protocols/jabber/jabber.c:3090
 msgid "Organization Unit"
 msgstr "Organisationsenhet"
 
-#: src/protocols/jabber/jabber.c:2525 src/prefs.c:1990
+#: src/prefs.c:2000 src/protocols/jabber/jabber.c:3091
 msgid "Title"
 msgstr "Titel"
 
-#: src/protocols/jabber/jabber.c:2526
+#: src/protocols/jabber/jabber.c:3092
 msgid "Role"
 msgstr "Roll"
 
-#: src/protocols/jabber/jabber.c:2527
+#: src/protocols/jabber/jabber.c:3093
 msgid "Birthday"
 msgstr "Fdelsedag"
 
 #. Right side: frame with description and the filepath of plugin
-#: src/protocols/jabber/jabber.c:2528 src/dialogs.c:2533 src/plugins.c:211
+#: src/dialogs.c:2533 src/plugins.c:211 src/protocols/jabber/jabber.c:3094
 msgid "Description"
 msgstr "Beskrivning"
 
-#: src/protocols/jabber/jabber.c:2553
+#: src/protocols/jabber/jabber.c:3119
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable"
@@ -575,44 +666,300 @@
 "Alla poster nedan r valfria. Ange endast den information som du trivs med "
 "att lmna ut"
 
-#: src/protocols/jabber/jabber.c:2554
+#: src/protocols/jabber/jabber.c:3120
 msgid "User Identity"
 msgstr "Anvndaridentitet"
 
-#: src/protocols/jabber/jabber.c:2970
+#: src/protocols/jabber/jabber.c:3532
 msgid "Gaim - Edit Jabber vCard"
 msgstr "Gaim - Redigera Jabber-vCard"
 
-#: src/protocols/jabber/jabber.c:3044
+#: src/protocols/jabber/jabber.c:3606
 msgid "Server Registration successful!"
 msgstr "Serverregistrering lyckades!"
 
-#: src/protocols/jabber/jabber.c:3071
+#: src/protocols/jabber/jabber.c:3633
 msgid "Unknown registration error"
 msgstr "Oknt registreringsfel"
 
-#: src/protocols/jabber/jabber.c:3180 src/protocols/jabber/jabber.c:3195
+#: src/protocols/jabber/jabber.c:3742 src/protocols/jabber/jabber.c:3757
 msgid "Set User Info"
 msgstr "Stll in anvndarinformation"
 
-#: src/protocols/msn/msn.c:826 src/protocols/msn/msn.c:2264
-#: src/protocols/msn/msn.c:2297
+#: src/protocols/msn/msn.c:230
+msgid "Syntax Error (probably a Gaim bug)"
+msgstr ""
+
+#: src/protocols/msn/msn.c:233
+msgid "Invalid Parameter (probably a Gaim bug)"
+msgstr ""
+
+#: src/protocols/msn/msn.c:236
+#, fuzzy
+msgid "Invalid User"
+msgstr "Ogiltigt namn"
+
+#: src/protocols/msn/msn.c:239
+msgid "Fully Qualified Domain Name missing"
+msgstr ""
+
+#: src/protocols/msn/msn.c:242
+msgid "Already Login"
+msgstr ""
+
+#: src/protocols/msn/msn.c:245
+#, fuzzy
+msgid "Invalid Username"
+msgstr "Ogiltigt namn"
+
+#: src/protocols/msn/msn.c:248
+#, fuzzy
+msgid "Invalid Friendly Name"
+msgstr "Ogiltigt namn"
+
+#: src/protocols/msn/msn.c:251
+msgid "List Full"
+msgstr ""
+
+#: src/protocols/msn/msn.c:254
+msgid "Already there"
+msgstr ""
+
+#: src/protocols/msn/msn.c:257
+#, fuzzy
+msgid "Not on list"
+msgstr "Anslutningen tappades"
+
+#: src/protocols/msn/msn.c:260
+msgid "User is offline"
+msgstr ""
+
+#: src/protocols/msn/msn.c:263
+msgid "Already in the mode"
+msgstr ""
+
+#: src/protocols/msn/msn.c:266
+msgid "Already in opposite list"
+msgstr ""
+
+#: src/protocols/msn/msn.c:269
+msgid "Switchboard failed"
+msgstr ""
+
+#: src/protocols/msn/msn.c:272
+msgid "Notify Transfer failed"
+msgstr ""
+
+#: src/protocols/msn/msn.c:276
+msgid "Required fields missing"
+msgstr ""
+
+#: src/protocols/msn/msn.c:279
+#, fuzzy
+msgid "Not logged in"
+msgstr "%s loggade in."
+
+#: src/protocols/msn/msn.c:283
+#, fuzzy
+msgid "Internal server error"
+msgstr "Internt fel"
+
+#: src/protocols/msn/msn.c:286
+msgid "Database server error"
+msgstr ""
+
+#: src/protocols/msn/msn.c:289
+#, fuzzy
+msgid "File operation error"
+msgstr "internt anslutningsfel\n"
+
+#: src/protocols/msn/msn.c:292
+#, fuzzy
+msgid "Memory allocation error"
+msgstr "stort anslutningsfel\n"
+
+#: src/protocols/msn/msn.c:296
+#, fuzzy
+msgid "Server busy"
+msgstr "Server:"
+
+#: src/protocols/msn/msn.c:299
+#, fuzzy
+msgid "Server unavailable"
+msgstr "Otillgnglig"
+
+#: src/protocols/msn/msn.c:302
+msgid "Peer Notification server down"
+msgstr ""
+
+#: src/protocols/msn/msn.c:305
+#, fuzzy
+msgid "Database connect error"
+msgstr "internt anslutningsfel\n"
+
+#: src/protocols/msn/msn.c:308
+msgid "Server is going down (abandon ship)"
+msgstr ""
+
+#: src/protocols/msn/msn.c:312
+#, fuzzy
+msgid "Error creating connection"
+msgstr "g003: Fel vid ppnande av anslutning.\n"
+
+#: src/protocols/msn/msn.c:318
+msgid "Session overload"
+msgstr ""
+
+#: src/protocols/msn/msn.c:321
+msgid "User is too active"
+msgstr ""
+
+#: src/protocols/msn/msn.c:324
+#, fuzzy
+msgid "Too many sessions"
+msgstr "Fr mnga trffar."
+
+#: src/protocols/msn/msn.c:327
+msgid "Not expected"
+msgstr ""
+
+#: src/protocols/msn/msn.c:330
+msgid "Bad friend file"
+msgstr ""
+
+#: src/protocols/msn/msn.c:334
+#, fuzzy
+msgid "Authentication failed"
+msgstr "Autentisering misslyckades."
+
+#: src/protocols/msn/msn.c:337
+#, fuzzy
+msgid "Not allowed when offline"
+msgstr "Inga ljud nr du loggar in"
+
+#: src/protocols/msn/msn.c:340
+msgid "Not accepting new users"
+msgstr ""
+
+#: src/protocols/msn/msn.c:343
+msgid "User unverified"
+msgstr ""
+
+#: src/protocols/msn/msn.c:346
+#, fuzzy
+msgid "Unknown Error Code"
+msgstr "Oknd felkod."
+
+#: src/protocols/msn/msn.c:351 src/protocols/msn/msn.c:558
+#: src/protocols/msn/msn.c:813 src/protocols/msn/msn.c:2114
+#: src/protocols/msn/msn.c:2283 src/protocols/msn/msn.c:2336
 msgid "MSN Error"
 msgstr "MSN-fel"
 
-#: src/protocols/msn/msn.c:826
+#: src/protocols/msn/msn.c:558
+msgid "A message may not have been received."
+msgstr ""
+
+#: src/protocols/msn/msn.c:813
 msgid "Gaim was unable to send a message"
 msgstr "Gaim kunde inte skicka ett meddelande"
 
-#: src/protocols/msn/msn.c:1176
+#: src/protocols/msn/msn.c:917
+#, fuzzy, c-format
+msgid "The user %s (%s) wants to add %s to his or her buddy list."
+msgstr "Anvndaren %s vill lgga till dig i dennes kompislista."
+
+#: src/protocols/msn/msn.c:1074
+#, fuzzy, c-format
+msgid "The user %s (%s) wants to add you to their buddy list"
+msgstr "Anvndaren %s vill lgga till dig i dennes kompislista."
+
+#: src/protocols/msn/msn.c:1175
 msgid "You have been disconnected. You have signed on from another location."
 msgstr "Du har blivit frnkopplad. Du har loggat in frn en annan plats."
 
-#: src/protocols/msn/msn.c:2264 src/protocols/msn/msn.c:2297
+#: src/protocols/msn/msn.c:1435 src/protocols/msn/msn.c:1679
+#, fuzzy
+msgid "Error reading from server"
+msgstr "Fel vid lsning frn uttag (socket)."
+
+#: src/protocols/msn/msn.c:1568
+msgid "Requesting to send password"
+msgstr ""
+
+#: src/protocols/msn/msn.c:1618
+#, fuzzy
+msgid "Unable to send password"
+msgstr "Kan inte lsa frn uttag"
+
+#: src/protocols/msn/msn.c:1623
+#, fuzzy
+msgid "Password sent"
+msgstr "Lsenord: "
+
+#: src/protocols/msn/msn.c:1748
+#, fuzzy
+msgid "Unable to write to server"
+msgstr "Kan inte ansluta till servern."
+
+#: src/protocols/msn/msn.c:1754
+#, fuzzy
+msgid "Synching with server"
+msgstr "Ansluter till GG-servern"
+
+#: src/protocols/msn/msn.c:1920
+msgid "Away From Computer"
+msgstr ""
+
+#: src/protocols/msn/msn.c:1921
+msgid "Be Right Back"
+msgstr ""
+
+#: src/protocols/msn/msn.c:1922
+#, fuzzy
+msgid "Busy"
+msgstr "Kompis"
+
+#: src/protocols/msn/msn.c:1923
+msgid "On The Phone"
+msgstr ""
+
+#: src/protocols/msn/msn.c:1924
+msgid "Out To Lunch"
+msgstr ""
+
+#: src/protocols/msn/msn.c:1925
+#, fuzzy
+msgid "Hidden"
+msgstr "Dlj ikon"
+
+#: src/protocols/msn/msn.c:2041
+msgid "Reset friendly name"
+msgstr ""
+
+#: src/protocols/msn/msn.c:2114
+msgid "Friendly name too long."
+msgstr ""
+
+#: src/protocols/msn/msn.c:2129 src/protocols/msn/msn.c:2150
+#, fuzzy
+msgid "Set Friendly Name"
+msgstr "Efternamn"
+
+#: src/protocols/msn/msn.c:2130
+#, fuzzy
+msgid "Set Friendly Name:"
+msgstr "Skrmnamn: "
+
+#: src/protocols/msn/msn.c:2131
+msgid "Reset All Friendly Names"
+msgstr ""
+
+#: src/protocols/msn/msn.c:2283 src/protocols/msn/msn.c:2336
 msgid "Invalid name"
 msgstr "Ogiltigt namn"
 
-#: src/protocols/napster/napster.c:450 src/protocols/oscar/oscar.c:3196
+#: src/protocols/napster/napster.c:457 src/protocols/oscar/oscar.c:3209
 #: src/protocols/toc/toc.c:1104
 msgid "Join what group:"
 msgstr "G in i vilken grupp:"
@@ -722,12 +1069,12 @@
 msgid "Internal Error"
 msgstr "Internt fel"
 
-#: src/protocols/oscar/oscar.c:1248 src/protocols/oscar/oscar.c:3407
+#: src/protocols/oscar/oscar.c:1248 src/protocols/oscar/oscar.c:3420
 #, c-format
 msgid "Direct IM with %s established"
 msgstr "Direktmeddelande med %s etablerat"
 
-#: src/protocols/oscar/oscar.c:1494 src/protocols/oscar/oscar.c:2446
+#: src/protocols/oscar/oscar.c:1504 src/protocols/oscar/oscar.c:2456
 #, c-format
 msgid ""
 "The user %lu has denied your request to add them to your contact list for "
@@ -738,193 +1085,193 @@
 "kontaktlista med fljande motivering:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:1494 src/protocols/oscar/oscar.c:2446
+#: src/protocols/oscar/oscar.c:1504 src/protocols/oscar/oscar.c:2456
 msgid "No reason given."
 msgstr "Ingen motivering angiven."
 
-#: src/protocols/oscar/oscar.c:1495 src/protocols/oscar/oscar.c:2447
+#: src/protocols/oscar/oscar.c:1505 src/protocols/oscar/oscar.c:2457
 msgid "Gaim - ICQ Authorization Denied"
 msgstr "Gaim - ICQ-auktorisering nekades"
 
-#: src/protocols/oscar/oscar.c:1501 src/protocols/oscar/oscar.c:2453
+#: src/protocols/oscar/oscar.c:1511 src/protocols/oscar/oscar.c:2463
 #, c-format
 msgid "The user %lu has granted your request to add them to your contact list."
 msgstr ""
 "Anvndaren %lu har beviljat din begran att lgga till denne till din "
 "kontaktlista"
 
-#: src/protocols/oscar/oscar.c:1502 src/protocols/oscar/oscar.c:2454
+#: src/protocols/oscar/oscar.c:1512 src/protocols/oscar/oscar.c:2464
 msgid "Gaim - ICQ Authorization Granted"
 msgstr "Gaim - ICQ-auktorisering beviljades"
 
-#: src/protocols/oscar/oscar.c:1575
+#: src/protocols/oscar/oscar.c:1585
 #, c-format
 msgid "You missed %d message from %s because it was invalid."
 msgstr "Du missade %d meddelande frn %s eftersom det var ogiltigt."
 
-#: src/protocols/oscar/oscar.c:1576
+#: src/protocols/oscar/oscar.c:1586
 #, c-format
 msgid "You missed %d messages from %s because they were invalid."
 msgstr "Du missade %d meddelanden frn %s eftersom de var ogiltiga."
 
-#: src/protocols/oscar/oscar.c:1585
+#: src/protocols/oscar/oscar.c:1595
 #, c-format
 msgid "You missed %d message from %s because it was too large."
 msgstr "Du missade %d meddelande frn %s eftersom det var fr stort."
 
-#: src/protocols/oscar/oscar.c:1586
+#: src/protocols/oscar/oscar.c:1596
 #, c-format
 msgid "You missed %d messages from %s because they were too large."
 msgstr "Du missade %d meddelanden frn %s eftersom de var fr stora."
 
-#: src/protocols/oscar/oscar.c:1595
+#: src/protocols/oscar/oscar.c:1605
 #, c-format
 msgid "You missed %d message from %s because the rate limit has been exceeded."
 msgstr ""
 "Du missade %d meddelande frn %s eftersom frekvensgrnsen har verskridits."
 
-#: src/protocols/oscar/oscar.c:1596
+#: src/protocols/oscar/oscar.c:1606
 #, c-format
 msgid ""
 "You missed %d messages from %s because the rate limit has been exceeded."
 msgstr ""
 "Du missade %d meddelanden frn %s eftersom frekvensgrnsen har verskridits."
 
-#: src/protocols/oscar/oscar.c:1605
+#: src/protocols/oscar/oscar.c:1615
 #, c-format
 msgid "You missed %d message from %s because it was too evil."
 msgstr "Du missade %d meddelande frn %s eftersom det var fr hemskt."
 
-#: src/protocols/oscar/oscar.c:1606
+#: src/protocols/oscar/oscar.c:1616
 #, c-format
 msgid "You missed %d messages from %s because they are too evil."
 msgstr "Du missade %d meddelanden frn %s eftersom de r fr hemska."
 
-#: src/protocols/oscar/oscar.c:1615
+#: src/protocols/oscar/oscar.c:1625
 #, c-format
 msgid "You missed %d message from %s because you are too evil."
 msgstr "Du missade %d meddelande frn %s eftersom du r fr hemsk."
 
-#: src/protocols/oscar/oscar.c:1616
+#: src/protocols/oscar/oscar.c:1626
 #, c-format
 msgid "You missed %d messages from %s because you are too evil."
 msgstr "Du missade %d meddelanden frn %s eftersom du r fr hemsk."
 
-#: src/protocols/oscar/oscar.c:1624
+#: src/protocols/oscar/oscar.c:1634
 #, c-format
 msgid "You missed %d message from %s for unknown reasons."
 msgstr "Du missade %d meddelande frn %s p grund av oknda orsaker."
 
-#: src/protocols/oscar/oscar.c:1625
+#: src/protocols/oscar/oscar.c:1635
 #, c-format
 msgid "You missed %d messages from %s for unknown reasons."
 msgstr "Du missade %d meddelanden frn %s p grund av oknda orsaker."
 
-#: src/protocols/oscar/oscar.c:1630 src/protocols/oscar/oscar.c:1745
-#: src/protocols/oscar/oscar.c:1763 src/protocols/oscar/oscar.c:2216
-#: src/protocols/yahoo/yahoo.c:594 src/dialogs.c:3076 src/dialogs.c:3082
+#: src/dialogs.c:3076 src/dialogs.c:3082 src/protocols/oscar/oscar.c:1640
+#: src/protocols/oscar/oscar.c:1755 src/protocols/oscar/oscar.c:1773
+#: src/protocols/oscar/oscar.c:2226 src/protocols/yahoo/yahoo.c:594
 msgid "Gaim - Error"
 msgstr "Gaim - Fel"
 
-#: src/protocols/oscar/oscar.c:1693
+#: src/protocols/oscar/oscar.c:1703
 #, c-format
 msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR>%s<BR>"
 msgstr "<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR>%s<BR>"
 
-#: src/protocols/oscar/oscar.c:1695
+#: src/protocols/oscar/oscar.c:1705
 #, c-format
 msgid "<B>Status:</B> %s<BR><HR><BR>%s<BR>"
 msgstr "<B>Status:</B> %s<BR><HR><BR>%s<BR>"
 
-#: src/protocols/oscar/oscar.c:1724
+#: src/protocols/oscar/oscar.c:1734
 #, c-format
 msgid "SNAC threw error: %s\n"
 msgstr "SNAC gav fel: %s\n"
 
-#: src/protocols/oscar/oscar.c:1726
+#: src/protocols/oscar/oscar.c:1736
 msgid "Gaim - Oscar SNAC Error"
 msgstr "Gaim - Oscar SNAC-fel"
 
-#: src/protocols/oscar/oscar.c:1743
+#: src/protocols/oscar/oscar.c:1753
 #, c-format
 msgid "Your message to %s did not get sent: %s"
 msgstr "Ditt meddelande till %s skickades inte: %s"
 
-#: src/protocols/oscar/oscar.c:1744 src/protocols/oscar/oscar.c:1762
+#: src/protocols/oscar/oscar.c:1754 src/protocols/oscar/oscar.c:1772
 msgid "Reason unknown"
 msgstr "Oknd orsak"
 
-#: src/protocols/oscar/oscar.c:1761
+#: src/protocols/oscar/oscar.c:1771
 #, c-format
 msgid "User information for %s unavailable: %s"
 msgstr "Anvndarinformation fr %s r inte tillgnglig: %s"
 
-#: src/protocols/oscar/oscar.c:1792 src/buddy.c:2102
+#: src/buddy.c:2131 src/protocols/oscar/oscar.c:1802
 msgid "Buddy Icon"
 msgstr "Kompisikon"
 
-#: src/protocols/oscar/oscar.c:1795 src/buddy.c:2105
+#: src/buddy.c:2134 src/protocols/oscar/oscar.c:1805
 msgid "Voice"
 msgstr "Rst"
 
-#: src/protocols/oscar/oscar.c:1798 src/buddy.c:2108
+#: src/buddy.c:2137 src/protocols/oscar/oscar.c:1808
 msgid "IM Image"
 msgstr "Snabbmeddelandebild"
 
-#: src/protocols/oscar/oscar.c:1801 src/buddy.c:495 src/buddy.c:2111
-#: src/buddy.c:2552 src/prefs.c:2914
+#: src/buddy.c:498 src/buddy.c:2140 src/buddy.c:2581 src/prefs.c:2926
+#: src/protocols/oscar/oscar.c:1811
 msgid "Chat"
 msgstr "Chatt"
 
-#: src/protocols/oscar/oscar.c:1804 src/buddy.c:2114
+#: src/buddy.c:2143 src/protocols/oscar/oscar.c:1814
 msgid "Get File"
 msgstr "Hmta fil"
 
-#: src/protocols/oscar/oscar.c:1807 src/buddy.c:2117
+#: src/buddy.c:2146 src/protocols/oscar/oscar.c:1817
 msgid "Send File"
 msgstr "Skicka fil"
 
-#: src/protocols/oscar/oscar.c:1811 src/buddy.c:2121
+#: src/buddy.c:2150 src/protocols/oscar/oscar.c:1821
 msgid "Games"
 msgstr "Spel"
 
-#: src/protocols/oscar/oscar.c:1814 src/buddy.c:2124
+#: src/buddy.c:2153 src/protocols/oscar/oscar.c:1824
 msgid "Stocks"
 msgstr "Aktier"
 
-#: src/protocols/oscar/oscar.c:1817 src/buddy.c:2127
+#: src/buddy.c:2156 src/protocols/oscar/oscar.c:1827
 msgid "Send Buddy List"
 msgstr "Skicka kompislista"
 
-#: src/protocols/oscar/oscar.c:1820 src/buddy.c:2130
+#: src/buddy.c:2159 src/protocols/oscar/oscar.c:1830
 msgid "EveryBuddy Bug"
 msgstr "EveryBuddy-fel"
 
-#: src/protocols/oscar/oscar.c:1823 src/buddy.c:2133
+#: src/buddy.c:2162 src/protocols/oscar/oscar.c:1833
 msgid "AP User"
 msgstr "AP-anvndare"
 
-#: src/protocols/oscar/oscar.c:1826 src/buddy.c:2136
+#: src/buddy.c:2165 src/protocols/oscar/oscar.c:1836
 msgid "ICQ RTF"
 msgstr "ICQ-RTF"
 
-#: src/protocols/oscar/oscar.c:1829 src/buddy.c:2139
+#: src/buddy.c:2168 src/protocols/oscar/oscar.c:1839
 msgid "Nihilist"
 msgstr "Nihilist"
 
-#: src/protocols/oscar/oscar.c:1832 src/buddy.c:2142
+#: src/buddy.c:2171 src/protocols/oscar/oscar.c:1842
 msgid "ICQ Server Relay"
 msgstr "ICQ-serverrelay"
 
-#: src/protocols/oscar/oscar.c:1835 src/buddy.c:2145
+#: src/buddy.c:2174 src/protocols/oscar/oscar.c:1845
 msgid "ICQ Unknown"
 msgstr "ICQ-oknd"
 
-#: src/protocols/oscar/oscar.c:1838 src/buddy.c:2148
+#: src/buddy.c:2177 src/protocols/oscar/oscar.c:1848
 msgid "Trillian Encryption"
 msgstr "Trillansk kryptering"
 
-#: src/protocols/oscar/oscar.c:1876
+#: src/protocols/oscar/oscar.c:1886
 msgid ""
 "<br><BODY BGCOLOR=WHITE><hr><I>Legend:</I><br><br><IMG SRC=\"free_icon.gif"
 "\"> : Normal AIM User<br><IMG SRC=\"aol_icon.gif\"> : AOL User <br><IMG SRC="
@@ -939,7 +1286,7 @@
 "Interaktiv ActiveBuddy-agent<br><IMG SRC=\"wireless_icon.gif\"> : Anvndare "
 "av trdls enhet<br>"
 
-#: src/protocols/oscar/oscar.c:1904
+#: src/protocols/oscar/oscar.c:1914
 #, c-format
 msgid ""
 "Username : <B>%s</B>  %s <BR>\n"
@@ -952,27 +1299,27 @@
 "%s%s%s<BR>\n"
 "<HR><BR>\n"
 
-#: src/protocols/oscar/oscar.c:1936
+#: src/protocols/oscar/oscar.c:1946
 msgid "<i>User has no away message</i>"
 msgstr "<i>Anvndaren har inget frnvaromeddelande</i>"
 
-#: src/protocols/oscar/oscar.c:1948
+#: src/protocols/oscar/oscar.c:1958
 msgid "Client Capabilities: "
 msgstr "Klientkapabiliteter: "
 
-#: src/protocols/oscar/oscar.c:1956
+#: src/protocols/oscar/oscar.c:1966
 msgid "<i>No Information Provided</i>"
 msgstr "<i>Ingen information tillhandahllen</i>"
 
-#: src/protocols/oscar/oscar.c:1979
+#: src/protocols/oscar/oscar.c:1989
 msgid "Your connection may be lost."
 msgstr "Din anslutning kan vara borta."
 
-#: src/protocols/oscar/oscar.c:1980
+#: src/protocols/oscar/oscar.c:1990
 msgid "AOL error"
 msgstr "AOL-fel"
 
-#: src/protocols/oscar/oscar.c:2215
+#: src/protocols/oscar/oscar.c:2225
 msgid ""
 "The last message was not sent because you are over the rate limit. Please "
 "wait 10 seconds and try again."
@@ -980,15 +1327,15 @@
 "Det senaste meddelandet skickades inte eftersom du r ver frekvensgrnsen. "
 "Vnta 10 sekunder och frsk igen."
 
-#: src/protocols/oscar/oscar.c:2576 src/protocols/oscar/oscar.c:3528
-#: src/protocols/toc/toc.c:1564 src/protocols/toc/toc.c:1581
-#: src/protocols/toc/toc.c:1641 src/protocols/toc/toc.c:1683
-#: src/protocols/toc/toc.c:1802 src/protocols/toc/toc.c:1832
-#: src/protocols/toc/toc.c:1888 src/dialogs.c:3604
+#: src/dialogs.c:3604 src/protocols/oscar/oscar.c:2589
+#: src/protocols/oscar/oscar.c:3541 src/protocols/toc/toc.c:1564
+#: src/protocols/toc/toc.c:1581 src/protocols/toc/toc.c:1641
+#: src/protocols/toc/toc.c:1683 src/protocols/toc/toc.c:1802
+#: src/protocols/toc/toc.c:1832 src/protocols/toc/toc.c:1888
 msgid "Error"
 msgstr "Fel"
 
-#: src/protocols/oscar/oscar.c:3179
+#: src/protocols/oscar/oscar.c:3192
 #, c-format
 msgid ""
 "The maximum number of buddies allowed in your buddy list is %d, and you have "
@@ -998,19 +1345,19 @@
 "har %d. Till dess att du r under grnsen kommer en del av dina kompisar "
 "inte att visas som online."
 
-#: src/protocols/oscar/oscar.c:3182
+#: src/protocols/oscar/oscar.c:3195
 msgid "Gaim - Warning"
 msgstr "Gaim - Varning"
 
-#: src/protocols/oscar/oscar.c:3200 src/protocols/toc/toc.c:1108
+#: src/protocols/oscar/oscar.c:3213 src/protocols/toc/toc.c:1108
 msgid "Exchange:"
 msgstr "Vxel:"
 
-#: src/protocols/oscar/oscar.c:3528
+#: src/protocols/oscar/oscar.c:3541
 msgid "Unable to open Direct IM"
 msgstr "Kan inte ppna direktmeddelande"
 
-#: src/protocols/oscar/oscar.c:3538
+#: src/protocols/oscar/oscar.c:3551
 #, c-format
 msgid ""
 "You have selected to open a Direct IM connection with %s. Doing this will "
@@ -1021,7 +1368,7 @@
 "kommer att lta dem se din IP-adress, och kan vara en skerhetsrisk. Vill du "
 "fortstta?"
 
-#: src/protocols/oscar/oscar.c:3555
+#: src/protocols/oscar/oscar.c:3568
 #, c-format
 msgid ""
 "<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR><I>Remote client does not "
@@ -1030,7 +1377,7 @@
 "<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR><I>Fjrrklienten stder inte "
 "skickande av statusmeddelanden.</I><BR>"
 
-#: src/protocols/oscar/oscar.c:3562
+#: src/protocols/oscar/oscar.c:3575
 #, c-format
 msgid ""
 "<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR><I>User has no status message."
@@ -1039,15 +1386,15 @@
 "<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR><I>Anvndaren har inga "
 "statusmeddelanden.</I><BR>"
 
-#: src/protocols/oscar/oscar.c:3587
+#: src/protocols/oscar/oscar.c:3600
 msgid "Get Status Msg"
 msgstr "Hmta statusmeddelande"
 
-#: src/protocols/oscar/oscar.c:3600
+#: src/protocols/oscar/oscar.c:3613
 msgid "Direct IM"
 msgstr "Direktmeddelande"
 
-#: src/protocols/oscar/oscar.c:3608
+#: src/protocols/oscar/oscar.c:3621
 msgid "Get Capabilities"
 msgstr "Hmta kapabiliteter"
 
@@ -1193,7 +1540,7 @@
 msgid "Password Change Successful"
 msgstr "Lsenordsndring lyckades"
 
-#: src/protocols/toc/toc.c:782 src/dialogs.c:1730
+#: src/dialogs.c:1730 src/protocols/toc/toc.c:782
 msgid "Gaim - Password Change"
 msgstr "Gaim - Lsenordsndring"
 
@@ -1248,19 +1595,19 @@
 msgid "Your message did not get sent."
 msgstr "Ditt meddelande skickades inte."
 
-#: src/protocols/zephyr/zephyr.c:802
+#: src/protocols/zephyr/zephyr.c:840
 msgid "ZLocate"
 msgstr "ZLocate"
 
-#: src/protocols/zephyr/zephyr.c:839
+#: src/protocols/zephyr/zephyr.c:877
 msgid "Class:"
 msgstr "Klass:"
 
-#: src/protocols/zephyr/zephyr.c:843
+#: src/protocols/zephyr/zephyr.c:881
 msgid "Instance:"
 msgstr "Instans:"
 
-#: src/protocols/zephyr/zephyr.c:847
+#: src/protocols/zephyr/zephyr.c:885
 msgid "Recipient:"
 msgstr "Mottagare:"
 
@@ -1270,10 +1617,11 @@
 msgstr "Om Gaim v%s"
 
 #: src/about.c:135
+#, fuzzy
 msgid ""
-"Gaim is a client that supports AOL's Instant Messenger protocol. It is "
-"written\n"
-"using Gtk+ and is licensed under the GPL.\n"
+"Gaim is a modular Instant Messaging client capable of using AIM, ICQ,\n"
+"Yahoo!, MSN, IRC, Jabber, Napster, Zephyr, and Gadu-Gadu all at once.\n"
+"It is written using Gtk+ and is licensed under the GPL.\n"
 "\n"
 "URL: "
 msgstr ""
@@ -1282,7 +1630,7 @@
 "\n"
 "URL: "
 
-#: src/about.c:136
+#: src/about.c:137
 msgid ""
 "\n"
 "\n"
@@ -1292,7 +1640,7 @@
 "\n"
 "IRC: #gaim p irc.openprojects.net"
 
-#: src/about.c:146
+#: src/about.c:147
 msgid ""
 "Active Developers\n"
 "====================\n"
@@ -1330,74 +1678,71 @@
 "Eric Warmenhoven                      [ warmenhoven@yahoo.com ]\n"
 "Mark Spencer (ursprunglig frfattare) [ markster@marko.net ]"
 
-#: src/about.c:164 src/aim.c:319 src/buddy.c:2687 src/buddy_chat.c:1322
-#: src/buddy_chat.c:1419 src/buddy_chat.c:1449 src/conversation.c:2839
-#: src/dialogs.c:567 src/dialogs.c:3899 src/multi.c:1069 src/plugins.c:277
-#: src/prefs.c:2537 src/prpl.c:438 src/prpl.c:679 src/server.c:1072
-#: plugins/chatlist.c:339
-msgid "Close"
-msgstr "Stng"
-
 #. this makes the sizes not work.
 #. GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
 #. gtk_widget_grab_default(button);
-#: src/about.c:184
+#: src/about.c:185
 msgid "Web Site"
 msgstr "Webbplats"
 
-#: src/aim.c:152 src/buddy.c:2680
+#: src/aim.c:153 src/buddy.c:2709
 msgid "Signoff"
 msgstr "Logga ut"
 
-#: src/aim.c:164
+#: src/aim.c:165
 msgid "Please enter your logon"
 msgstr "Ange ditt inloggningsnamn"
 
-#: src/aim.c:164 src/multi.c:1400 src/server.c:55
+#: src/aim.c:165 src/multi.c:1400 src/server.c:55
 msgid "Signon Error"
 msgstr "Inloggningsfel"
 
-#: src/aim.c:262
+#: src/aim.c:263
 msgid "Gaim - Login"
 msgstr "Gaim - Inloggning"
 
-#: src/aim.c:280
+#: src/aim.c:281
 msgid "Screen Name: "
 msgstr "Skrmnamn: "
 
-#: src/aim.c:296
+#: src/aim.c:297
 msgid "Password: "
 msgstr "Lsenord: "
 
-#: src/aim.c:317 src/buddy.c:2684
+#: src/aim.c:318 src/buddy.c:2713
 msgid "Quit"
 msgstr "Avsluta"
 
-#: src/aim.c:322 src/aim.c:830 src/buddy.c:2710
+#: src/aim.c:323 src/aim.c:831 src/buddy.c:2739
 msgid "Accounts"
 msgstr "Konton"
 
-#: src/aim.c:324 src/multi.c:915
+#: src/aim.c:325 src/multi.c:915
 msgid "Signon"
 msgstr "Logga in"
 
-#: src/aim.c:356
+#: src/aim.c:357
 msgid "About"
 msgstr "Om"
 
 # src/menus.c:311
-#: src/aim.c:357 src/prefs.c:1621 src/prefs.c:1895
+#: src/aim.c:358 src/prefs.c:1633 src/prefs.c:1905
 msgid "Options"
 msgstr "Alternativ"
 
-#: src/aim.c:359 src/aim.c:833 src/buddy.c:2728
+#: src/aim.c:360 src/aim.c:834 src/buddy.c:2757
 msgid "Plugins"
 msgstr "Insticksmoduler"
 
-#: src/aim.c:827 src/buddy.c:2720
+#: src/aim.c:828 src/buddy.c:2749
 msgid "Preferences"
 msgstr "Instllningar"
 
+#: src/aim.c:838 src/multi.c:1472
+#, fuzzy
+msgid "Auto-login"
+msgstr "Logga in automatiskt"
+
 #: src/applet.c:109
 msgid "Attempting to sign on...."
 msgstr "Frsker att logga in..."
@@ -1415,15 +1760,15 @@
 msgid "Away."
 msgstr "Frnvarande."
 
-#: src/applet.c:188 src/away.c:388
+#: src/applet.c:200 src/away.c:388
 msgid "New Away Message"
 msgstr "Nytt frnvaromeddelande:"
 
-#: src/applet.c:336
+#: src/applet.c:348
 msgid "Can't create Gaim applet!"
 msgstr "Kan inte skapa Gaim-panelprogram!"
 
-#: src/applet.c:356
+#: src/applet.c:368
 msgid "About..."
 msgstr "Om..."
 
@@ -1448,88 +1793,74 @@
 msgid "Set All Away"
 msgstr "Stll in alla frnvarande"
 
-#. Put the buttons in the box
-#: src/buddy.c:489 src/buddy.c:2798 src/buddy_chat.c:1454
-#: src/conversation.c:2372 src/conversation.c:2854 src/dialogs.c:932
-#: src/dialogs.c:1114 src/dialogs.c:2095 src/multi.c:1053 src/prefs.c:2031
-#: src/prefs.c:2373 src/prefs.c:2407 plugins/chatlist.c:364
-msgid "Add"
-msgstr "Lgg till"
-
-#: src/buddy.c:490 src/buddy.c:2799 src/dialogs.c:942 src/dialogs.c:1089
+#: src/buddy.c:493 src/buddy.c:2828 src/dialogs.c:942 src/dialogs.c:1089
 msgid "Group"
 msgstr "Grupp"
 
-#: src/buddy.c:491 src/buddy.c:2800 src/buddy_chat.c:1456
-#: src/conversation.c:2358 src/conversation.c:2851 src/prefs.c:2045
-#: src/prefs.c:2377 src/prefs.c:2411 plugins/chatlist.c:365
-msgid "Remove"
-msgstr "Ta bort"
-
-#: src/buddy.c:496 src/buddy.c:661 src/buddy.c:825 src/buddy.c:2550
+#: src/buddy.c:499 src/buddy.c:664 src/buddy.c:834 src/buddy.c:2579
 #: src/buddy_chat.c:861 src/buddy_chat.c:1278
 msgid "IM"
 msgstr "Snabbmeddelande"
 
-#: src/buddy.c:497 src/buddy.c:2551 src/buddy_chat.c:877 src/buddy_chat.c:1286
-#: src/buddy_chat.c:1462 src/conversation.c:2872
+#: src/buddy.c:500 src/buddy.c:2580 src/buddy_chat.c:877 src/buddy_chat.c:1286
+#: src/buddy_chat.c:1462 src/conversation.c:2897
 msgid "Info"
 msgstr "Information"
 
 #. Put the buttons in the box
-#: src/buddy.c:666 src/buddy.c:830 src/dialogs.c:1081 src/dialogs.c:3458
+#: src/buddy.c:669 src/buddy.c:839 src/dialogs.c:1081 src/dialogs.c:3458
 #: src/dialogs.c:3473
 msgid "Alias"
 msgstr "Alias"
 
-#: src/buddy.c:671 src/buddy.c:849
+#: src/buddy.c:674 src/buddy.c:858
 msgid "Add Buddy Pounce"
 msgstr "Lgg till kompisanfall"
 
-#: src/buddy.c:678 src/buddy.c:855
+#: src/buddy.c:681 src/buddy.c:864
 msgid "View Log"
 msgstr "Visa logg"
 
-#: src/buddy.c:812 src/buddy.c:843
+#: src/buddy.c:821 src/buddy.c:852
 msgid "Rename"
 msgstr "Byt namn"
 
-#: src/buddy.c:837
+#: src/buddy.c:846
 msgid "Un-Alias"
 msgstr "Avaliasera"
 
-#: src/buddy.c:1616 src/buddy.c:2703
+#: src/buddy.c:1645 src/buddy.c:2732
 msgid "Buddy Pounce"
 msgstr "Kompisanfall"
 
-#: src/buddy.c:1696
+#: src/buddy.c:1725
 msgid "New Buddy Pounce"
 msgstr "Nytt kompisanfall"
 
-#: src/buddy.c:1714
+#: src/buddy.c:1743
 msgid "Remove Buddy Pounce"
 msgstr "Ta bort kompisanfall"
 
-#: src/buddy.c:1742
+#: src/buddy.c:1771
 msgid "[Click to edit]"
 msgstr "[Klicka fr att redigera]"
 
-#: src/buddy.c:2225
+#: src/buddy.c:2254
 #, c-format
 msgid "Logged in: %s\n"
 msgstr "Inloggad: %s\n"
 
-#: src/buddy.c:2237
+#: src/buddy.c:2266
 #, c-format
 msgid "Warnings: %d%%\n"
 msgstr "Varningar: %d%%\n"
 
-#: src/buddy.c:2249
+#: src/buddy.c:2278
 #, c-format
 msgid "Capabilities: %s\n"
 msgstr "Kapabiliteter: %s\n"
 
-#: src/buddy.c:2253
+#: src/buddy.c:2282
 #, c-format
 msgid ""
 "Alias: %s               \n"
@@ -1540,125 +1871,125 @@
 "Skrmnamn: %s\n"
 "%s%s%s%s%s%s"
 
-#: src/buddy.c:2257
+#: src/buddy.c:2286
 msgid "Idle: "
 msgstr "Inaktivitet: "
 
-#: src/buddy.c:2330 src/buddy.c:2335
+#: src/buddy.c:2359 src/buddy.c:2364
 #, c-format
 msgid "%s logged in."
 msgstr "%s loggade in."
 
-#: src/buddy.c:2395 src/buddy.c:2400
+#: src/buddy.c:2424 src/buddy.c:2429
 #, c-format
 msgid "%s logged out."
 msgstr "%s loggade ut."
 
-#: src/buddy.c:2585
+#: src/buddy.c:2614
 msgid "Information on selected Buddy"
 msgstr "Information om vald kompis"
 
-#: src/buddy.c:2586 src/dialogs.c:697
+#: src/buddy.c:2615 src/dialogs.c:697
 msgid "Send Instant Message"
 msgstr "Skicka snabbmeddelande"
 
-#: src/buddy.c:2587
+#: src/buddy.c:2616
 msgid "Start/join a Buddy Chat"
 msgstr "Starta/g in i en kompischatt"
 
-#: src/buddy.c:2588
+#: src/buddy.c:2617
 msgid "Activate Away Message"
 msgstr "Aktivera frnvaromeddelande"
 
-#: src/buddy.c:2660
+#: src/buddy.c:2689
 msgid "File"
 msgstr "Arkiv"
 
-#: src/buddy.c:2664
+#: src/buddy.c:2693
 msgid "Add A Buddy"
 msgstr "Lgg till en kompis"
 
-#: src/buddy.c:2666
+#: src/buddy.c:2695
 msgid "Join A Chat"
 msgstr "G in i en chatt"
 
-#: src/buddy.c:2668
+#: src/buddy.c:2697
 msgid "New Instant Message"
 msgstr "Nytt snabbmeddelande"
 
-#: src/buddy.c:2670 src/dialogs.c:759
+#: src/buddy.c:2699 src/dialogs.c:759
 msgid "Get User Info"
 msgstr "Hmta anvndarinformation"
 
-#: src/buddy.c:2675
+#: src/buddy.c:2704
 msgid "Import Buddy List"
 msgstr "Importera kompislista"
 
-#: src/buddy.c:2693
+#: src/buddy.c:2722
 msgid "Tools"
 msgstr "Verktyg"
 
-#: src/buddy.c:2716
+#: src/buddy.c:2745
 msgid "Protocol Actions"
 msgstr "Protokolltgrder"
 
-#: src/buddy.c:2722
+#: src/buddy.c:2751
 msgid "View System Log"
 msgstr "Visa systemlogg"
 
-#: src/buddy.c:2734
+#: src/buddy.c:2763
 msgid "Perl"
 msgstr "Perl"
 
-#: src/buddy.c:2737
+#: src/buddy.c:2766
 msgid "Load Script"
 msgstr "Ls in skript"
 
-#: src/buddy.c:2741
+#: src/buddy.c:2770
 msgid "Unload All Scripts"
 msgstr "Glm alla skript"
 
-#: src/buddy.c:2745
+#: src/buddy.c:2774
 msgid "List Scripts"
 msgstr "Lista skript"
 
-#: src/buddy.c:2753
+#: src/buddy.c:2782
 msgid "Help"
 msgstr "Hjlp"
 
-#: src/buddy.c:2758
+#: src/buddy.c:2787
 msgid "Online Help"
 msgstr "Onlinehjlp"
 
-#: src/buddy.c:2759
+#: src/buddy.c:2788
 msgid "Debug Window"
 msgstr "Felskningsfnster"
 
-#: src/buddy.c:2760
+#: src/buddy.c:2789
 msgid "About Gaim"
 msgstr "Om Gaim"
 
-#: src/buddy.c:2778 src/prefs.c:2893
+#: src/buddy.c:2807 src/prefs.c:2905
 msgid "Buddy List"
 msgstr "Kompislista"
 
-#: src/buddy.c:2831
+#: src/buddy.c:2860
 msgid "Add a new Buddy"
 msgstr "Lgg till en ny kompis"
 
-#: src/buddy.c:2832
+#: src/buddy.c:2861
 msgid "Add a new Group"
 msgstr "Lgg till en ny grupp"
 
-#: src/buddy.c:2833
+#: src/buddy.c:2862
 msgid "Remove selected Buddy/Group"
 msgstr "Ta bort vald kompis/grupp"
 
-#: src/buddy.c:2860
+#: src/buddy.c:2889
 msgid "Edit Buddies"
 msgstr "Redigera kompisar"
 
-#: src/buddy.c:2903
+#: src/buddy.c:2932
 msgid "Gaim - Buddy List"
 msgstr "Gaim - Kompislista"
 
@@ -1666,10 +1997,6 @@
 msgid "Join Chat"
 msgstr "G in i chatt"
 
-#: src/buddy_chat.c:272 plugins/chatlist.c:67
-msgid "Buddy Chat"
-msgstr "Kompischatt"
-
 #: src/buddy_chat.c:283
 msgid "Join Chat As:"
 msgstr "G in i chatt som:"
@@ -1698,7 +2025,7 @@
 msgstr "Kompis"
 
 # src/sidebar.c:103
-#: src/buddy_chat.c:417 src/prefs.c:1994
+#: src/buddy_chat.c:417 src/prefs.c:2004
 msgid "Message"
 msgstr "Meddelande"
 
@@ -1758,200 +2085,196 @@
 msgstr "Viska"
 
 #: src/buddy_chat.c:1338 src/buddy_chat.c:1415 src/buddy_chat.c:1464
-#: src/conversation.c:2883
+#: src/conversation.c:2908
 msgid "Send"
 msgstr "Skicka"
 
-#: src/buddy_chat.c:1458 src/conversation.c:2860
+#: src/buddy_chat.c:1458 src/conversation.c:2885
 msgid "Block"
 msgstr "Blockera"
 
-#: src/buddy_chat.c:1460 src/conversation.c:2866 src/dialogs.c:424
+#: src/buddy_chat.c:1460 src/conversation.c:2891 src/dialogs.c:424
 #: src/dialogs.c:453
 msgid "Warn"
 msgstr "Varna"
 
-#: src/conversation.c:416
+#: src/conversation.c:431
 msgid "Gaim - Save Conversation"
 msgstr "Gaim - Spara konversation"
 
-#: src/conversation.c:477
+#: src/conversation.c:492
 msgid "Gaim - Insert Image"
 msgstr "Gaim - Infoga bild"
 
-#: src/conversation.c:1320
+#: src/conversation.c:1336
 msgid "Unable to send message: too large"
 msgstr "Kan inte skicka meddelande: fr stort"
 
-#: src/conversation.c:1320 src/conversation.c:1324
+#: src/conversation.c:1336 src/conversation.c:1340
 msgid "Message Error"
 msgstr "Meddelandefel"
 
-#: src/conversation.c:1324
+#: src/conversation.c:1340
 msgid "Unable to send message: Unknown reason"
 msgstr "Kan inte skicka meddelande: Oknd orsak"
 
-#: src/conversation.c:1543
+#: src/conversation.c:1559
 #, c-format
 msgid "Currently at %d, "
 msgstr "Fr nrvarande %d, "
 
-#: src/conversation.c:1551
+#: src/conversation.c:1567
 #, c-format
 msgid "Setting position to %d\n"
 msgstr "Stller in positionen till %d\n"
 
-#: src/conversation.c:2154 src/prefs.c:1307
+#: src/conversation.c:2170 src/prefs.c:1308
 msgid "Bold Text"
 msgstr "Gr texten fet"
 
-#: src/conversation.c:2154
+#: src/conversation.c:2170
 msgid "Bold"
 msgstr "Fet"
 
-#: src/conversation.c:2158
+#: src/conversation.c:2174
 msgid "Italics Text"
 msgstr "Gr texten kursiv"
 
-#: src/conversation.c:2159
+#: src/conversation.c:2175
 msgid "Italics"
 msgstr "Kursiv"
 
-#: src/conversation.c:2162 src/prefs.c:1319
+#: src/conversation.c:2178 src/prefs.c:1320
 msgid "Underline Text"
 msgstr "Understryk text"
 
-#: src/conversation.c:2163
+#: src/conversation.c:2179
 msgid "Underline"
 msgstr "Understrykning"
 
-#: src/conversation.c:2167 src/prefs.c:1325
+#: src/conversation.c:2183 src/prefs.c:1326
 msgid "Strike through Text"
 msgstr "Genomstryk text"
 
-#: src/conversation.c:2167
+#: src/conversation.c:2183
 msgid "Strike"
 msgstr "Genomstrykning"
 
-#: src/conversation.c:2173
+#: src/conversation.c:2189
 msgid "Decrease font size"
 msgstr "Minska typsnittsstorleken"
 
-#: src/conversation.c:2173
+#: src/conversation.c:2189
 msgid "Small"
 msgstr "Liten"
 
-#: src/conversation.c:2176
+#: src/conversation.c:2192
 msgid "Normal font size"
 msgstr "Normal typsnittsstorlek"
 
-#: src/conversation.c:2176
+#: src/conversation.c:2192
 msgid "Normal"
 msgstr "Normal"
 
-#: src/conversation.c:2179
+#: src/conversation.c:2195
 msgid "Increase font size"
 msgstr "ka typsnittsstorleken"
 
-#: src/conversation.c:2179
+#: src/conversation.c:2195
 msgid "Big"
 msgstr "Stor"
 
-#: src/conversation.c:2186 src/dialogs.c:2883 src/dialogs.c:2907
+#: src/conversation.c:2202 src/dialogs.c:2883 src/dialogs.c:2907
 msgid "Select Font"
 msgstr "Vlj typsnitt"
 
-#: src/conversation.c:2187
+#: src/conversation.c:2203
 msgid "Font"
 msgstr "Typsnitt"
 
-#: src/conversation.c:2190 src/prefs.c:1355
+#: src/conversation.c:2206 src/prefs.c:1356
 msgid "Text Color"
 msgstr "Textfrg"
 
-#: src/conversation.c:2191 src/conversation.c:2195
+#: src/conversation.c:2207 src/conversation.c:2211
 msgid "Color"
 msgstr "Frg"
 
-#: src/conversation.c:2195 src/prefs.c:1373
+#: src/conversation.c:2211 src/prefs.c:1374
 msgid "Background Color"
 msgstr "Bakgrundsfrg"
 
-#: src/conversation.c:2202 src/dialogs.c:2506
+#: src/conversation.c:2218 src/dialogs.c:2506
 msgid "Insert Link"
 msgstr "Infoga lnk"
 
-#: src/conversation.c:2203
+#: src/conversation.c:2219
 msgid "Link"
 msgstr "Lnk"
 
-#: src/conversation.c:2206
+#: src/conversation.c:2222
 msgid "Insert smiley face"
 msgstr "Infoga smiley"
 
-#: src/conversation.c:2206
+#: src/conversation.c:2222
 msgid "Smiley"
 msgstr "Smiley"
 
-#: src/conversation.c:2209
+#: src/conversation.c:2225
 msgid "Insert IM Image"
 msgstr "Infoga snabbmeddelandebild"
 
-#: src/conversation.c:2209
+#: src/conversation.c:2225
 msgid "Image"
 msgstr "Bild"
 
-#: src/conversation.c:2216
+#: src/conversation.c:2232
 msgid "Enable logging"
 msgstr "Anvnd loggning"
 
-#: src/conversation.c:2217 src/prefs.c:254
+#: src/conversation.c:2233 src/prefs.c:254
 msgid "Logging"
 msgstr "Loggning"
 
-#: src/conversation.c:2226
+#: src/conversation.c:2242
 msgid "Save Conversation"
 msgstr "Spara konversation"
 
 # src/menus.c:280
-#: src/conversation.c:2227 src/dialogs.c:1682 src/dialogs.c:1866
+#: src/conversation.c:2243 src/dialogs.c:1682 src/dialogs.c:1866
 #: src/dialogs.c:3220 src/dialogs.c:3908 src/dialogs.c:4785
 msgid "Save"
 msgstr "Spara"
 
-#: src/conversation.c:2231
-msgid "Enable sounds"
-msgstr "Anvnd ljud"
-
-#: src/conversation.c:2232
+#: src/conversation.c:2247 src/conversation.c:2248
 msgid "Sound"
 msgstr "Ljud"
 
-#: src/conversation.c:2712
+#: src/conversation.c:2729
 msgid "Gaim - Conversations"
 msgstr "Gaim - Konversationer"
 
-#: src/conversation.c:2799
+#: src/conversation.c:2816
 msgid "Send message as: "
 msgstr "Skicka meddelande som: "
 
-#: src/conversation.c:3428
+#: src/conversation.c:3453
 msgid "Gaim - Save Icon"
 msgstr "Gaim - Spara ikon"
 
-#: src/conversation.c:3462
+#: src/conversation.c:3487
 msgid "Disable Animation"
 msgstr "Anvnd inte animering"
 
-#: src/conversation.c:3467
+#: src/conversation.c:3492
 msgid "Enable Animation"
 msgstr "Anvnd animation"
 
-#: src/conversation.c:3473
+#: src/conversation.c:3498
 msgid "Hide Icon"
 msgstr "Dlj ikon"
 
-#: src/conversation.c:3479
+#: src/conversation.c:3504
 msgid "Save Icon As..."
 msgstr "Spara ikon som..."
 
@@ -2344,12 +2667,12 @@
 msgid "Gaim - Select Perl Script"
 msgstr "Gaim - Vlj Perlskript"
 
-#: src/gaimrc.c:1130
+#: src/gaimrc.c:1136
 #, c-format
 msgid "Could not open config file %s."
 msgstr "Kunde inte ppna konfigurationsfilen %s."
 
-#: src/gaimrc.c:1131
+#: src/gaimrc.c:1137
 msgid "Preferences Error"
 msgstr "Instllningsfel"
 
@@ -2362,6 +2685,10 @@
 msgid "g003: Error opening connection.\n"
 msgstr "g003: Fel vid ppnande av anslutning.\n"
 
+#: src/module.c:106 src/module.c:112 src/module.c:122
+msgid "Plugin Error"
+msgstr "Insticksmodulfel"
+
 #: src/multi.c:454
 msgid "Gaim - Load Buddy Icon"
 msgstr "Gaim - Ls in kompisikon"
@@ -2374,7 +2701,7 @@
 msgid "Browse"
 msgstr "Blddra"
 
-#: src/multi.c:513 src/prefs.c:1547
+#: src/multi.c:513 src/prefs.c:1548
 msgid "Reset"
 msgstr "terstll"
 
@@ -2486,7 +2813,7 @@
 msgid "Connection Error"
 msgstr "Anslutningsfel"
 
-#: src/perl.c:856
+#: src/perl.c:875
 msgid "Perl Scripts"
 msgstr "Perlskript"
 
@@ -2547,9 +2874,9 @@
 msgid "General Options"
 msgstr "Allmnna instllningar"
 
-#: src/prefs.c:200 src/prefs.c:383 src/prefs.c:551 src/prefs.c:666
-#: src/prefs.c:920 src/prefs.c:1070 src/prefs.c:1295 src/prefs.c:1617
-#: src/prefs.c:1891 src/prefs.c:2324
+#: src/prefs.c:200 src/prefs.c:384 src/prefs.c:552 src/prefs.c:667
+#: src/prefs.c:921 src/prefs.c:1071 src/prefs.c:1296 src/prefs.c:1629
+#: src/prefs.c:1901 src/prefs.c:2334
 msgid "All options take effect immediately unless otherwise noted."
 msgstr "Alla ndringar brjar glla omedelbart svida inte annat anges."
 
@@ -2624,8 +2951,8 @@
 msgstr "Webblsare"
 
 #: src/prefs.c:291
-msgid "KFM"
-msgstr "KFM"
+msgid "Konqueror"
+msgstr ""
 
 #: src/prefs.c:292
 msgid "Opera"
@@ -2635,27 +2962,32 @@
 msgid "Netscape"
 msgstr "Netscape"
 
-#: src/prefs.c:296
+#: src/prefs.c:294
+msgid "Mozilla"
+msgstr ""
+
+#: src/prefs.c:297
 msgid "Pop up new window by default"
 msgstr "Visa nytt fnster som standard"
 
-#: src/prefs.c:303
+#: src/prefs.c:304
 msgid "GNOME URL Handler"
 msgstr "GNOME:s URL-hanterare"
 
-#: src/prefs.c:305
+#: src/prefs.c:306
 msgid "Galeon"
 msgstr "Galeon"
 
-#: src/prefs.c:306
-msgid "Manual"
-msgstr "Manuell"
-
-#: src/prefs.c:375
+#: src/prefs.c:307
+#, c-format
+msgid "Manual (%s for URL)"
+msgstr ""
+
+#: src/prefs.c:376
 msgid "Proxy Options"
 msgstr "Proxyalternativ"
 
-#: src/prefs.c:387
+#: src/prefs.c:388
 msgid ""
 "Not all protocols can use these proxy options. Please see the README file "
 "for details."
@@ -2663,375 +2995,376 @@
 "Inte alla protokoll kan anvnda dessa proxyalternativ. Se filen README fr "
 "detaljer."
 
-#: src/prefs.c:392
+#: src/prefs.c:393
 msgid "Proxy Type"
 msgstr "Proxytyp"
 
-#: src/prefs.c:404
+#: src/prefs.c:405
 msgid "Proxy Server"
 msgstr "Proxyserver"
 
-#: src/prefs.c:407
+#: src/prefs.c:408
 msgid "No Proxy"
 msgstr "Ingen proxy"
 
-#: src/prefs.c:419
+#: src/prefs.c:420
 msgid "SOCKS 4"
 msgstr "SOCKS 4"
 
-#: src/prefs.c:429
+#: src/prefs.c:430
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
-#: src/prefs.c:438
+#: src/prefs.c:439
 msgid "HTTP"
 msgstr "HTTP"
 
-#: src/prefs.c:462
+#: src/prefs.c:463
 msgid "Host"
 msgstr "Vrd"
 
-#: src/prefs.c:478
+#: src/prefs.c:479
 msgid "Port"
 msgstr "Port"
 
-#: src/prefs.c:495
+#: src/prefs.c:496
 msgid "User"
 msgstr "Anvndare"
 
-#: src/prefs.c:511
+#: src/prefs.c:512
 msgid "Password"
 msgstr "Lsenord"
 
-#: src/prefs.c:543
+#: src/prefs.c:544
 msgid "Buddy List Options"
 msgstr "Alternativ fr kompislista"
 
-#: src/prefs.c:555
+#: src/prefs.c:556
 msgid "Buddy List Window"
 msgstr "Kompislistefnster"
 
-#: src/prefs.c:568
+#: src/prefs.c:569
 msgid "Tab Placement:"
 msgstr "Flikplacering:"
 
-#: src/prefs.c:572 src/prefs.c:1003 src/prefs.c:1153
+#: src/prefs.c:573 src/prefs.c:1004 src/prefs.c:1154
 msgid "Top"
 msgstr "verst"
 
-#: src/prefs.c:573 src/prefs.c:1005 src/prefs.c:1155
+#: src/prefs.c:574 src/prefs.c:1006 src/prefs.c:1156
 msgid "Bottom"
 msgstr "Nederst"
 
-#: src/prefs.c:585
+#: src/prefs.c:586
 msgid "Hide IM/Info/Chat buttons"
 msgstr "Dlj snabbmeddelande-/info-/chattknappar"
 
-#: src/prefs.c:587
+#: src/prefs.c:588
 msgid "Automatically show buddy list on sign on"
 msgstr "Visa automatiskt kompislista vid inloggning"
 
-#: src/prefs.c:589
+#: src/prefs.c:590
 msgid "Display Buddy List near applet"
 msgstr "Visa kompislista nra panelprogrammet"
 
-#: src/prefs.c:592
+#: src/prefs.c:593
 msgid "Save Window Size/Position"
 msgstr "Spara fnsterstorlek/position"
 
-#: src/prefs.c:595
+#: src/prefs.c:596
 msgid "Show pictures on buttons"
 msgstr "Visa bilder p knappar"
 
-#: src/prefs.c:599
+#: src/prefs.c:600
 msgid "Raise Buddy List on Signons and Signoffs"
 msgstr "Hj kompislista vid inloggningar och utloggningar"
 
-#: src/prefs.c:601
+#: src/prefs.c:602
 msgid "Group Displays"
 msgstr "Gruppvisningar"
 
-#: src/prefs.c:613
+#: src/prefs.c:614
 msgid "Hide groups with no online buddies"
 msgstr "Dlj grupper med inga anslutna kompisar"
 
-#: src/prefs.c:619
+#: src/prefs.c:620
 msgid "Show numbers in groups"
 msgstr "Visa nummer i grupper"
 
-#: src/prefs.c:621
+#: src/prefs.c:622
 msgid "Buddy Displays"
 msgstr "Kompisvisningar"
 
-#: src/prefs.c:633
+#: src/prefs.c:634
 msgid "Show buddy type icons"
 msgstr "Visa kompistypikoner"
 
-#: src/prefs.c:634
+#: src/prefs.c:635
 msgid "Show warning levels"
 msgstr "Visa varningsniver"
 
-#: src/prefs.c:640
-msgid "Show idle times"
-msgstr "Visa inaktivitetstider"
-
 #: src/prefs.c:641
+msgid "Show idle times"
+msgstr "Visa inaktivitetstider"
+
+#: src/prefs.c:642
 msgid "Grey idle buddies"
 msgstr "Frga inaktiva kompisar gra"
 
-#: src/prefs.c:658
+#: src/prefs.c:659
 msgid "Conversation Options"
 msgstr "Konversationsalternativ"
 
-#: src/prefs.c:670
+#: src/prefs.c:671
 msgid "Keyboard Options"
 msgstr "Tangentbordsalternativ"
 
-#: src/prefs.c:682
+#: src/prefs.c:683
 msgid "Enter sends message"
 msgstr "Retur skickar meddelande"
 
-#: src/prefs.c:683
+#: src/prefs.c:684
 msgid "Control-Enter sends message"
 msgstr "Control-Retur skickar meddelande"
 
-#: src/prefs.c:684
-msgid "Escape closes window"
-msgstr "Escape stnger fnster"
-
 #: src/prefs.c:685
+msgid "Escape closes window"
+msgstr "Escape stnger fnster"
+
+#: src/prefs.c:686
 msgid "Control-W closes window"
 msgstr "Control-W stnger fnster"
 
-#: src/prefs.c:691
+#: src/prefs.c:692
 msgid "Control-{B/I/U/S} inserts HTML tags"
 msgstr "Control-{B/I/U/S} infogar HTML-taggar"
 
-#: src/prefs.c:692
+#: src/prefs.c:693
 msgid "Control-(number) inserts smileys"
 msgstr "Control-(nummer) infogar smileys"
 
-#: src/prefs.c:693
+#: src/prefs.c:694
 msgid "F2 toggles timestamp display"
 msgstr "F2 slr p/av tidsstmpelvisningen"
 
-#: src/prefs.c:695
+#: src/prefs.c:696
 msgid "Display and General Options"
 msgstr "Visnings- och allmnna instllningar"
 
-#: src/prefs.c:707
+#: src/prefs.c:708
 msgid "Show graphical smileys"
 msgstr "Visa grafiska smileys"
 
-#: src/prefs.c:708
+#: src/prefs.c:709
 msgid "Show timestamp on messages"
 msgstr "Visa tidsstmpel p meddelanden"
 
-#: src/prefs.c:709
+#: src/prefs.c:710
 msgid "Show URLs as links"
 msgstr "Visa URL:er som lnkar"
 
-#: src/prefs.c:710
+#: src/prefs.c:711
 msgid "Highlight misspelled words"
 msgstr "Markera felstavade ord"
 
-#: src/prefs.c:711 src/prefs.c:1913
+#: src/prefs.c:712 src/prefs.c:1923
 msgid "Sending messages removes away status"
 msgstr "Att skicka meddelanden tar bort frnvarostatus"
 
-#: src/prefs.c:712 src/prefs.c:1926
+#: src/prefs.c:713 src/prefs.c:1936
 msgid "Queue new messages when away"
 msgstr "Klgg nya meddelanden vid frnvaro"
 
-#: src/prefs.c:718
-msgid "Ignore colors"
-msgstr "Ignorera frger"
-
 #: src/prefs.c:719
+msgid "Ignore colors"
+msgstr "Ignorera frger"
+
+#: src/prefs.c:720
 msgid "Ignore font faces"
 msgstr "Ignorera typsnittsvarianter"
 
-#: src/prefs.c:720
-msgid "Ignore font sizes"
-msgstr "Ignorera typsnittsstorlekar"
-
 #: src/prefs.c:721
+msgid "Ignore font sizes"
+msgstr "Ignorera typsnittsstorlekar"
+
+#: src/prefs.c:722
 msgid "Ignore TiK Automated Messages"
 msgstr "Ignorera automatiserade TiK-meddelanden"
 
-#: src/prefs.c:722 src/prefs.c:1911
+#: src/prefs.c:723 src/prefs.c:1921
 msgid "Ignore new conversations when away"
 msgstr "Ignorera nya konversationer vid frnvaro"
 
-#: src/prefs.c:911
+#: src/prefs.c:912
 msgid "IM Options"
 msgstr "Snabbmeddelandealternativ"
 
-#: src/prefs.c:924 src/prefs.c:2909
+#: src/prefs.c:925 src/prefs.c:2921
 msgid "IM Window"
 msgstr "Snabbmeddelandefnster"
 
-#: src/prefs.c:940 src/prefs.c:1090
+#: src/prefs.c:941 src/prefs.c:1091
 msgid "Show buttons as: "
 msgstr "Visa knappar som: "
 
-#: src/prefs.c:944 src/prefs.c:1095
+#: src/prefs.c:945 src/prefs.c:1096
 msgid "Pictures And Text"
 msgstr "Bilder och text"
 
-#: src/prefs.c:945 src/prefs.c:1097
+#: src/prefs.c:946 src/prefs.c:1098
 msgid "Pictures"
 msgstr "Bilder"
 
-#: src/prefs.c:946 src/prefs.c:1098
+#: src/prefs.c:947 src/prefs.c:1099
 msgid "Text"
 msgstr "Text"
 
-#: src/prefs.c:957
+#: src/prefs.c:958
 msgid "Show all conversations in one tabbed window"
 msgstr "Visa alla konversationer i ett fnster med flikar"
 
-#: src/prefs.c:959
+#: src/prefs.c:960
 msgid "Show chats in the same tabbed window"
 msgstr "Visa chattar i samma flikfnster"
 
-#: src/prefs.c:966 src/prefs.c:1118
+#: src/prefs.c:967 src/prefs.c:1119
 msgid "Raise windows on events"
 msgstr "Hj fnster vid hndelser"
 
-#: src/prefs.c:967
+#: src/prefs.c:968
 msgid "Show logins in window"
 msgstr "Visa inloggningar i fnster"
 
-#: src/prefs.c:968
-msgid "Show aliases in tabs/titles"
+#: src/prefs.c:969
+#, fuzzy
+msgid "Show aliases in tabs/titles/ticker"
 msgstr "Visa alias i flikar/titlar"
 
-#: src/prefs.c:969
+#: src/prefs.c:970
 msgid "Hide window on send"
 msgstr "Dlj fnster vid skickande"
 
-#: src/prefs.c:971 src/prefs.c:1121
+#: src/prefs.c:972 src/prefs.c:1122
 msgid "Window Sizes"
 msgstr "Fnsterstorlekar"
 
-#: src/prefs.c:979 src/prefs.c:1129
+#: src/prefs.c:980 src/prefs.c:1130
 msgid "New window width:"
 msgstr "Ny fnsterbredd:"
 
-#: src/prefs.c:980 src/prefs.c:1130
+#: src/prefs.c:981 src/prefs.c:1131
 msgid "New window height:"
 msgstr "Ny fnsterhjd:"
 
-#: src/prefs.c:981 src/prefs.c:1131
+#: src/prefs.c:982 src/prefs.c:1132
 msgid "Entry widget height:"
 msgstr "Hjd p postwidget:"
 
-#: src/prefs.c:983 src/prefs.c:1133
+#: src/prefs.c:984 src/prefs.c:1134
 msgid "Tab Placement"
 msgstr "Flikplacering"
 
-#: src/prefs.c:1012 src/prefs.c:1162
+#: src/prefs.c:1013 src/prefs.c:1163
 msgid "Left"
 msgstr "Vnster"
 
-#: src/prefs.c:1014 src/prefs.c:1164
+#: src/prefs.c:1015 src/prefs.c:1165
 msgid "Right"
 msgstr "Hger"
 
-#: src/prefs.c:1018
+#: src/prefs.c:1019
 msgid "Buddy Icons"
 msgstr "Kompisikoner"
 
-#: src/prefs.c:1030
+#: src/prefs.c:1031
 msgid "Hide Buddy Icons"
 msgstr "Dlj kompisikoner"
 
-#: src/prefs.c:1036
+#: src/prefs.c:1037
 msgid "Disable Buddy Icon Animation"
 msgstr "Inaktivera kompisikonanimering"
 
-#: src/prefs.c:1062
+#: src/prefs.c:1063
 msgid "Chat Options"
 msgstr "Chattalternativ"
 
-#: src/prefs.c:1074
+#: src/prefs.c:1075
 msgid "Group Chat Window"
 msgstr "Gruppchatfnster"
 
-#: src/prefs.c:1109
+#: src/prefs.c:1110
 msgid "Show all chats in one tabbed window"
 msgstr "Visa alla chattar i ett fnster med flikar"
 
-#: src/prefs.c:1111
+#: src/prefs.c:1112
 msgid "Show conversations in the same tabbed window"
 msgstr "Visa konversationer i samma flikfnster"
 
-#: src/prefs.c:1119
+#: src/prefs.c:1120
 msgid "Show people joining/leaving in window"
 msgstr "Visa personer som gr in/lmnar i fnstret"
 
-#: src/prefs.c:1167
+#: src/prefs.c:1168
 msgid "Tab Completion"
 msgstr "Tabbkomplettering"
 
-#: src/prefs.c:1179
+#: src/prefs.c:1180
 msgid "Tab-Complete Nicks"
 msgstr "Tabbkomplettera smeknamn"
 
-#: src/prefs.c:1185
+#: src/prefs.c:1186
 msgid "Old-Style Tab Completion"
 msgstr "Gammaldags tabbkomplettering"
 
-#: src/prefs.c:1287 src/prefs.c:2919
+#: src/prefs.c:1288 src/prefs.c:2931
 msgid "Font Options"
 msgstr "Typsnittsalternativ"
 
-#: src/prefs.c:1313
+#: src/prefs.c:1314
 msgid "Italic Text"
 msgstr "Kursiv text"
 
-#: src/prefs.c:1357 src/prefs.c:1375 src/prefs.c:1397
+#: src/prefs.c:1358 src/prefs.c:1376 src/prefs.c:1398
 msgid "Select"
 msgstr "Markera"
 
-#: src/prefs.c:1395
+#: src/prefs.c:1396
 msgid "Font Face for Text"
 msgstr "Typsnitt fr text"
 
-#: src/prefs.c:1410
+#: src/prefs.c:1411
 msgid "Font Size for Text"
 msgstr "Typsnittsstorlek fr text"
 
-#: src/prefs.c:1507
+#: src/prefs.c:1508
 msgid "Gaim - Sound Configuration"
 msgstr "Gaim - Ljudkonfiguration"
 
-#: src/prefs.c:1542
+#: src/prefs.c:1543
 msgid "Test"
 msgstr "Test"
 
-#: src/prefs.c:1552
+#: src/prefs.c:1553
 msgid "Choose..."
 msgstr "Vlj..."
 
-#: src/prefs.c:1609
+#: src/prefs.c:1621
 msgid "Sound Options"
 msgstr "Ljudalternativ"
 
-#: src/prefs.c:1637
+#: src/prefs.c:1649
 msgid "No sounds when you log in"
 msgstr "Inga ljud nr du loggar in"
 
-#: src/prefs.c:1643 src/prefs.c:1912
+#: src/prefs.c:1655 src/prefs.c:1922
 msgid "Sounds while away"
 msgstr "Ljud d du r frnvarande"
 
-#: src/prefs.c:1653
+#: src/prefs.c:1665
 msgid "Sound method"
 msgstr "Ljudmetod"
 
-#: src/prefs.c:1727
+#: src/prefs.c:1739
 #, c-format
 msgid ""
 "Sound command\n"
@@ -3040,103 +3373,103 @@
 "Ljudkommando\n"
 "(%s fr filnamn)"
 
-#: src/prefs.c:1739
+#: src/prefs.c:1751
 msgid "Sound played when:"
 msgstr "Ljud spelas d:"
 
-#: src/prefs.c:1883 src/prefs.c:2941
+#: src/prefs.c:1893 src/prefs.c:2953
 msgid "Away Messages"
 msgstr "Frnvaromeddelanden"
 
-#: src/prefs.c:1920
+#: src/prefs.c:1930
 msgid "Don't send auto-response"
 msgstr "Skicka inte automatiskt svar"
 
-#: src/prefs.c:1921
+#: src/prefs.c:1931
 msgid "Only send auto-response when idle"
 msgstr "Skicka endast automatiskt svar vid inaktivitet"
 
-#: src/prefs.c:1936
+#: src/prefs.c:1946
 msgid "Time between sending auto-responses (in seconds):"
 msgstr "Tid mellan skickande av automatiskt svar (i sekunder):"
 
-#: src/prefs.c:1951
+#: src/prefs.c:1961
 msgid "Auto Away after"
 msgstr "Automatiskt frnvarande efter"
 
-#: src/prefs.c:1965
+#: src/prefs.c:1975
 msgid "minutes using"
 msgstr "minuters anvndning"
 
-#: src/prefs.c:1978
+#: src/prefs.c:1988
 msgid "Messages"
 msgstr "Meddelanden"
 
-#: src/prefs.c:2035
+#: src/prefs.c:2045
 msgid "Edit"
 msgstr "Redigera"
 
-#: src/prefs.c:2039
+#: src/prefs.c:2049
 msgid "Make Away"
 msgstr "Gr frnvarande"
 
-#: src/prefs.c:2316
+#: src/prefs.c:2326
 msgid "Privacy Options"
 msgstr "Ostrdhetsalternativ"
 
-#: src/prefs.c:2332
+#: src/prefs.c:2342
 msgid "Set privacy for:"
 msgstr "Stll in ostrdhet fr:"
 
-#: src/prefs.c:2351
+#: src/prefs.c:2361
 msgid "Allow all users to contact me"
 msgstr "Tillt alla anvndare att kontakta mig"
 
-#: src/prefs.c:2352
+#: src/prefs.c:2362
 msgid "Allow only the users below"
 msgstr "Tillt endast anvndarna nedan"
 
-#: src/prefs.c:2354
+#: src/prefs.c:2364
 msgid "Allow List"
 msgstr "Tilltelselista"
 
-#: src/prefs.c:2385
+#: src/prefs.c:2395
 msgid "Deny all users"
 msgstr "Neka alla anvndare"
 
-#: src/prefs.c:2386
+#: src/prefs.c:2396
 msgid "Block the users below"
 msgstr "Blockera anvndarna nedan"
 
-#: src/prefs.c:2388
+#: src/prefs.c:2398
 msgid "Block List"
 msgstr "Blockera lista"
 
-#: src/prefs.c:2483
+#: src/prefs.c:2493
 msgid "Gaim - Preferences"
 msgstr "Gaim - Egenskaper"
 
-#: src/prefs.c:2566
+#: src/prefs.c:2576
 msgid "Gaim debug output window"
 msgstr "Gaim-felskningsutdatafnster"
 
-#: src/prefs.c:2875
+#: src/prefs.c:2887
 msgid "General"
 msgstr "Allmnt"
 
-#: src/prefs.c:2880
+#: src/prefs.c:2892
 msgid "Proxy"
 msgstr "Proxyserver"
 
-#: src/prefs.c:2904
+#: src/prefs.c:2916
 msgid "Conversations"
 msgstr "Konversationer"
 
-#: src/prefs.c:2930
+#: src/prefs.c:2942
 msgid "Sounds"
 msgstr "Ljud"
 
-#: src/prefs.c:2952
+#: src/prefs.c:2964
 msgid "Privacy"
 msgstr "Persondataskydd"
 
@@ -3181,12 +3514,12 @@
 msgid "Open Mail"
 msgstr "ppna brev"
 
-#: src/prpl.c:564
+#: src/prpl.c:570
 #, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s%s"
 msgstr "%s%s%s%s har gjort %s till sin kompis%s%s%s"
 
-#: src/prpl.c:572
+#: src/prpl.c:578
 msgid ""
 "\n"
 "\n"
@@ -3196,7 +3529,7 @@
 "\n"
 "Vill du lgga till honom eller henne till din kompislista?"
 
-#: src/prpl.c:615
+#: src/prpl.c:621
 msgid ""
 "You do not currently have any protocols available that are able to register "
 "new accounts."
@@ -3204,15 +3537,15 @@
 "Du har fr tillfllet inga tillgngliga protokoll som klarar av att "
 "registrera nya konton."
 
-#: src/prpl.c:652
+#: src/prpl.c:658
 msgid "Gaim - Registration"
 msgstr "Gaim - Registrering"
 
-#: src/prpl.c:667
+#: src/prpl.c:673
 msgid "Registration Information"
 msgstr "Registreringsinformation"
 
-#: src/prpl.c:684
+#: src/prpl.c:690
 msgid "Register"
 msgstr "Registrera"
 
@@ -3245,109 +3578,61 @@
 msgid "More Info"
 msgstr "Mer information"
 
-#: plugins/chatlist.c:166 plugins/chatlist.c:168 plugins/chatlist.c:407
-#: plugins/chatlist.c:409
-msgid "Gaim Chat"
-msgstr "Gaim-chatt"
-
-#: plugins/chatlist.c:344
-msgid "Chat Rooms"
-msgstr "Chattrum"
-
-#: plugins/chatlist.c:363
-msgid "Refresh"
-msgstr "Uppdatera"
-
-#: plugins/chatlist.c:388
-msgid "List of available chats"
-msgstr "Lista med tillgngliga chattar"
-
-#: plugins/chatlist.c:398
-msgid "List of subscribed chats"
-msgstr "Lista med prenumererade chattar"
-
-#: plugins/gtik.c:699
-msgid "Gnome Stock Ticker Properties"
-msgstr "Egenskaper fr Gnome Stick Ticker"
-
-#: plugins/gtik.c:711
-msgid "Update Frequency in min"
-msgstr "Uppdateringsfrekvens i minuter"
-
-#: plugins/gtik.c:727
-msgid "Enter symbols delimited with \"+\" in the box below."
-msgstr "Ange symboler tskilda med \"+\" i fltet nedan."
-
-#. OUTPUT FORMAT and SCROLL DIRECTION
-#: plugins/gtik.c:737
-msgid "Check this box to display only symbols and price:"
-msgstr "Kryssa i denna ruta fr att endast visa symboler och pris:"
-
-#: plugins/gtik.c:738
-msgid "Check this box to scroll left to right:"
-msgstr "Kryssa i denna ruta fr att rulla vnster till hger:"
-
-#: plugins/gtik.c:974
-msgid "(No"
-msgstr "(Nej"
-
-#: plugins/gtik.c:975
-msgid "Change"
-msgstr "ndra"
-
-#: src/module.c:106 src/module.c:112 src/module.c:122
-msgid "Plugin Error"
-msgstr "Insticksmodulfel"
-
-#: src/sound.c:59
+#: src/sound.c:63
 msgid "Buddy logs in"
 msgstr "Kompis loggar in"
 
-#: src/sound.c:60
+#: src/sound.c:64
 msgid "Buddy logs out"
 msgstr "Kompis loggar ut"
 
-#: src/sound.c:61
+#: src/sound.c:65
 msgid "Message received"
 msgstr "Meddelande mottas"
 
-#: src/sound.c:62
+#: src/sound.c:66
 msgid "Message received begins conversation"
 msgstr "Mottaget meddelande inleder konversationen"
 
-#: src/sound.c:63
+#: src/sound.c:67
 msgid "Message sent"
 msgstr "Meddelande skickat"
 
-#: src/sound.c:64
+#: src/sound.c:68
 msgid "Person enters chat"
 msgstr "Person gr in i chatt"
 
-#: src/sound.c:65
+#: src/sound.c:69
 msgid "Person leaves chat"
 msgstr "Person lmnar chatt"
 
-#: src/sound.c:66
+#: src/sound.c:70
 msgid "You talk in chat"
 msgstr "Du pratar i chatt"
 
-#: src/sound.c:67
+#: src/sound.c:71
 msgid "Others talk in chat"
 msgstr "Andra pratar i chatt"
 
-#: src/sound.c:69
+#: src/sound.c:74
 msgid "Someone says your name in chat"
 msgstr "Ngon sger ditt namn i chatt"
 
+#~ msgid "Enable sounds"
+#~ msgstr "Anvnd ljud"
+
+#~ msgid "KFM"
+#~ msgstr "KFM"
+
+#~ msgid "Manual"
+#~ msgstr "Manuell"
+
 #~ msgid "Error while writting to socket."
 #~ msgstr "Fel vid skrivning till uttag (socket)."
 
 #~ msgid "Handshake"
 #~ msgstr "Handskakning"
 
-#~ msgid "Connecting to GG server"
-#~ msgstr "Ansluter till GG-servern"
-
 #~ msgid "Sending key"
 #~ msgstr "Skickar nyckel"
 
--- a/po/zh_CN.po	Tue Jul 02 05:41:30 2002 +0000
+++ b/po/zh_CN.po	Tue Jul 02 05:42:26 2002 +0000
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 0.9.19\n"
-"POT-Creation-Date: 2002-04-11 22:46-0700\n"
+"POT-Creation-Date: 2002-06-25 00:10-0400\n"
 "PO-Revision-Date: 2000-06-17 17:55+08\n"
 "Last-Translator: hashao <hashao@china.com>\n"
 "Language-Team: Simplified Chinese <zh@li.org>\n"
@@ -16,6 +16,114 @@
 "Content-Type: text/plain; charset=gb2312\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: plugins/chatlist.c:67 src/buddy_chat.c:272
+msgid "Buddy Chat"
+msgstr ""
+
+#: plugins/chatlist.c:166 plugins/chatlist.c:168 plugins/chatlist.c:407
+#: plugins/chatlist.c:409
+msgid "Gaim Chat"
+msgstr "Gaim "
+
+#: plugins/chatlist.c:339 src/about.c:165 src/aim.c:320 src/buddy.c:2716
+#: src/buddy_chat.c:1322 src/buddy_chat.c:1419 src/buddy_chat.c:1449
+#: src/conversation.c:2864 src/dialogs.c:567 src/dialogs.c:3899
+#: src/multi.c:1069 src/plugins.c:277 src/prefs.c:2547 src/prpl.c:438
+#: src/prpl.c:685 src/server.c:1072
+msgid "Close"
+msgstr "ر"
+
+#: plugins/chatlist.c:344
+msgid "Chat Rooms"
+msgstr ""
+
+#: plugins/chatlist.c:363
+msgid "Refresh"
+msgstr "ˢ"
+
+#. Put the buttons in the box
+#: plugins/chatlist.c:364 src/buddy.c:492 src/buddy.c:2827
+#: src/buddy_chat.c:1454 src/conversation.c:2389 src/conversation.c:2879
+#: src/dialogs.c:932 src/dialogs.c:1114 src/dialogs.c:2095 src/multi.c:1053
+#: src/prefs.c:2041 src/prefs.c:2383 src/prefs.c:2417
+msgid "Add"
+msgstr ""
+
+#: plugins/chatlist.c:365 src/buddy.c:494 src/buddy.c:2829
+#: src/buddy_chat.c:1456 src/conversation.c:2375 src/conversation.c:2876
+#: src/prefs.c:2055 src/prefs.c:2387 src/prefs.c:2421
+msgid "Remove"
+msgstr "ɾ"
+
+#: plugins/chatlist.c:388
+msgid "List of available chats"
+msgstr "б"
+
+#: plugins/chatlist.c:398
+msgid "List of subscribed chats"
+msgstr "ĵб"
+
+#: plugins/gtik.c:699
+msgid "Gnome Stock Ticker Properties"
+msgstr ""
+
+#: plugins/gtik.c:711
+msgid "Update Frequency in min"
+msgstr ""
+
+#: plugins/gtik.c:727
+msgid "Enter symbols delimited with \"+\" in the box below."
+msgstr ""
+
+#. OUTPUT FORMAT and SCROLL DIRECTION
+#: plugins/gtik.c:737
+msgid "Check this box to display only symbols and price:"
+msgstr ""
+
+#: plugins/gtik.c:738
+msgid "Check this box to scroll left to right:"
+msgstr ""
+
+#: plugins/gtik.c:974
+#, fuzzy
+msgid "(No"
+msgstr "No"
+
+#: plugins/gtik.c:975
+#, fuzzy
+msgid "Change"
+msgstr "ȡ"
+
+#: src/protocols/gg/gg.c:71 src/protocols/msn/msn.c:1919
+msgid "Available"
+msgstr ""
+
+#: src/protocols/gg/gg.c:72
+msgid "Available for friends only"
+msgstr ""
+
+#: src/applet.c:197 src/buddy.c:497 src/buddy.c:2582 src/buddy.c:2727
+#: src/protocols/gg/gg.c:73 src/protocols/jabber/jabber.c:1118
+msgid "Away"
+msgstr "ʱ뿪"
+
+#: src/protocols/gg/gg.c:74
+msgid "Away for friends only"
+msgstr ""
+
+#: src/protocols/gg/gg.c:75
+#, fuzzy
+msgid "Invisible"
+msgstr ""
+
+#: src/protocols/gg/gg.c:76
+msgid "Invisible for friends only"
+msgstr ""
+
+#: src/protocols/gg/gg.c:77 src/protocols/jabber/jabber.c:1114
+msgid "Unavailable"
+msgstr ""
+
 #: src/protocols/gg/gg.c:182
 #, fuzzy
 msgid "Unable to resolve hostname."
@@ -49,7 +157,7 @@
 msgid "Unknown Error Code."
 msgstr ""
 
-#: src/protocols/gg/gg.c:302
+#: src/protocols/gg/gg.c:302 src/protocols/msn/msn.c:2050
 #, c-format
 msgid "Status: %s"
 msgstr ""
@@ -187,7 +295,7 @@
 msgstr ""
 
 #. Line 5
-#: src/dialogs.c:1582 src/dialogs.c:2290 src/protocols/gg/gg.c:729
+#: src/dialogs.c:1624 src/dialogs.c:2332 src/protocols/gg/gg.c:729
 msgid "City"
 msgstr ""
 
@@ -266,7 +374,12 @@
 msgid "Directory Search"
 msgstr "ַ¼"
 
-#: src/dialogs.c:1699 src/protocols/gg/gg.c:1160 src/protocols/gg/gg.c:1177
+#.
+#. } else if (!strcmp(act, _("Set Dir Info"))) {
+#. show_set_dir(gc);
+#.
+#: src/dialogs.c:1741 src/protocols/gg/gg.c:1160 src/protocols/gg/gg.c:1177
+#: src/protocols/jabber/jabber.c:3748 src/protocols/jabber/jabber.c:3761
 msgid "Change Password"
 msgstr ""
 
@@ -290,8 +403,8 @@
 msgstr "Ϣ"
 
 #: src/protocols/icq/gaim_icq.c:469 src/protocols/irc/irc.c:1851
-#: src/protocols/jabber/jabber.c:2112 src/protocols/oscar/oscar.c:3436
-#: src/protocols/toc/toc.c:1216
+#: src/protocols/jabber/jabber.c:2860 src/protocols/oscar/oscar.c:3593
+#: src/protocols/toc/toc.c:1219
 msgid "Get Info"
 msgstr "ûϸ"
 
@@ -330,7 +443,7 @@
 "connection?"
 msgstr ""
 
-#: src/protocols/irc/irc.c:1001
+#: src/protocols/irc/irc.c:1001 src/protocols/msn/msn.c:315
 #, fuzzy
 msgid "Unable to write"
 msgstr "дļ %s"
@@ -359,7 +472,7 @@
 msgid "Channel:"
 msgstr "ȡ"
 
-#: src/multi.c:547 src/protocols/irc/irc.c:1675
+#: src/multi.c:549 src/protocols/irc/irc.c:1675
 msgid "Password:"
 msgstr "룺"
 
@@ -368,326 +481,632 @@
 msgid "DCC Chat"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:699
-msgid "Unavailable"
+#: src/protocols/jabber/jabber.c:942
+msgid "Incorrect current password! Password NOT Changed!"
 msgstr ""
 
-#: src/applet.c:293 src/buddy.c:493 src/buddy.c:2508 src/buddy.c:2644
-#: src/protocols/jabber/jabber.c:703
-msgid "Away"
-msgstr "ʱ뿪"
-
-#: src/buddy.c:2801 src/protocols/jabber/jabber.c:705
-#: src/protocols/jabber/jabber.c:723
+#: src/protocols/jabber/jabber.c:943 src/protocols/jabber/jabber.c:948
+#, fuzzy
+msgid "Password Change Error!"
+msgstr "Gaim - "
+
+#: src/protocols/jabber/jabber.c:947
+msgid "New password same as old password! Password NOT Changed!"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1092
+msgid "Unknown"
+msgstr ""
+
+#: src/buddy.c:2887 src/protocols/jabber/jabber.c:1120
+#: src/protocols/jabber/jabber.c:1138
 msgid "Online"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:707
+#: src/protocols/jabber/jabber.c:1122
 msgid "Extended Away"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:709
+#: src/protocols/jabber/jabber.c:1124
 msgid "Do Not Disturb"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1042
+#: src/protocols/jabber/jabber.c:1434
+#, c-format
+msgid "Error %s: %s"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1437
+msgid "Unknown Error in presence"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1607
+#, c-format
+msgid "The user %s wants to add you to their buddy list."
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1632
 msgid "No such user"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1044
+#: src/protocols/jabber/jabber.c:1634 src/protocols/jabber/jabber.c:2341
+#: src/protocols/jabber/jabber.c:2506
 #, fuzzy
 msgid "Jabber Error"
 msgstr "Ϣ"
 
-#: src/dialogs.c:845 src/protocols/jabber/jabber.c:1124
+#: src/dialogs.c:887 src/protocols/jabber/jabber.c:1719
+#: src/protocols/msn/msn.c:1110
 msgid "Buddies"
 msgstr "Ƕ"
 
-#: src/protocols/jabber/jabber.c:1188
+#: src/protocols/jabber/jabber.c:1782
 #, fuzzy
 msgid "Authenticating"
 msgstr "֤ʧ"
 
-#: src/protocols/jabber/jabber.c:1225
+#: src/protocols/jabber/jabber.c:1819
 #, fuzzy
 msgid "Unknown login error"
 msgstr "¼"
 
-#: src/protocols/jabber/jabber.c:1455 src/protocols/jabber/jabber.c:2903
+#: src/protocols/jabber/jabber.c:2010
+#, fuzzy
+msgid "Password successfully changed."
+msgstr "Gaim - "
+
+#: src/protocols/jabber/jabber.c:2012
+#, fuzzy
+msgid "Password Change"
+msgstr "Gaim - "
+
+#: src/protocols/jabber/jabber.c:2054 src/protocols/jabber/jabber.c:3676
 #, fuzzy
 msgid "Connection lost"
 msgstr "ѹر"
 
-#: src/protocols/jabber/jabber.c:1457 src/protocols/jabber/jabber.c:1489
-#: src/protocols/jabber/jabber.c:2905 src/protocols/jabber/jabber.c:2951
+#: src/protocols/jabber/jabber.c:2056 src/protocols/jabber/jabber.c:2088
+#: src/protocols/jabber/jabber.c:3678 src/protocols/jabber/jabber.c:3724
+#: src/protocols/msn/msn.c:1741 src/protocols/msn/msn.c:1770
 #, fuzzy
 msgid "Unable to connect"
 msgstr "ֱܽ"
 
-#: src/protocols/jabber/jabber.c:1463
+#: src/protocols/jabber/jabber.c:2062
 #, fuzzy
 msgid "Connected"
 msgstr "ѶϿ"
 
-#: src/protocols/jabber/jabber.c:1466
+#: src/protocols/jabber/jabber.c:2065
 #, fuzzy
 msgid "Requesting Authentication Method"
 msgstr "֤ʧ"
 
 #. we have no chats yet
-#: src/protocols/jabber/jabber.c:1484
+#: src/protocols/jabber/jabber.c:2083 src/protocols/msn/msn.c:1762
 #, fuzzy
 msgid "Connecting"
 msgstr "ѹر"
 
-#: src/protocols/jabber/jabber.c:1783
+#: src/protocols/jabber/jabber.c:2340 src/protocols/jabber/jabber.c:2505
+#, fuzzy
+msgid "Invalid Jabber I.D."
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:2473
 msgid "Room:"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1787
+#: src/protocols/jabber/jabber.c:2477
 #, fuzzy
 msgid "Server:"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1792
+#: src/protocols/jabber/jabber.c:2482
 #, fuzzy
 msgid "Handle:"
 msgstr "ʱ䣺"
 
-#: src/protocols/jabber/jabber.c:2062 src/protocols/jabber/jabber.c:2401
-msgid "Unknown"
-msgstr ""
-
-#: src/buddy_chat.c:875 src/protocols/jabber/jabber.c:2117
-#: src/protocols/oscar/oscar.c:3443
+#: src/protocols/jabber/jabber.c:2539
+#, fuzzy
+msgid "Chats"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:2854
+#, fuzzy
+msgid "View Error Msg"
+msgstr "鿴¼"
+
+#: src/buddy_chat.c:886 src/protocols/jabber/jabber.c:2865
+#: src/protocols/oscar/oscar.c:3606
 msgid "Get Away Msg"
 msgstr "յʱ뿪Ϣ"
 
-#: src/protocols/jabber/jabber.c:2299
+#: src/protocols/jabber/jabber.c:2882
+msgid "Remove From Roster"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:3076
 #, fuzzy
 msgid "Full Name"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:2300
+#: src/protocols/jabber/jabber.c:3077
 #, fuzzy
 msgid "Family Name"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:2301
+#: src/protocols/jabber/jabber.c:3078
 #, fuzzy
 msgid "Given Name"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:2302
+#: src/protocols/jabber/jabber.c:3079
 msgid "Nickname"
 msgstr ""
 
-#: src/dialogs.c:2483 src/protocols/jabber/jabber.c:2303
+#: src/dialogs.c:2525 src/protocols/jabber/jabber.c:3080
 msgid "URL"
 msgstr "URL"
 
-#: src/protocols/jabber/jabber.c:2304
+#: src/protocols/jabber/jabber.c:3081
 msgid "Street Address"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:2305
+#: src/protocols/jabber/jabber.c:3082
 msgid "Extended Address"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:2306
+#: src/protocols/jabber/jabber.c:3083
 msgid "Locality"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:2307
+#: src/protocols/jabber/jabber.c:3084
 msgid "Region"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:2308
+#: src/protocols/jabber/jabber.c:3085
 msgid "Postal Code"
 msgstr ""
 
 #. Line 7
-#: src/dialogs.c:1604 src/dialogs.c:2312 src/protocols/jabber/jabber.c:2309
+#: src/dialogs.c:1646 src/dialogs.c:2354 src/protocols/jabber/jabber.c:3086
 msgid "Country"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:2310
+#: src/protocols/jabber/jabber.c:3087
 #, fuzzy
 msgid "Telephone"
 msgstr "ȫѡ"
 
-#: src/dialogs.c:2388 src/protocols/jabber/jabber.c:2311
+#: src/dialogs.c:2430 src/protocols/jabber/jabber.c:3088
 msgid "Email"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:2312
+#: src/protocols/jabber/jabber.c:3089
 msgid "Organization Name"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:2313
+#: src/protocols/jabber/jabber.c:3090
 msgid "Organization Unit"
 msgstr ""
 
-#: src/prefs.c:1988 src/protocols/jabber/jabber.c:2314
+#: src/prefs.c:2000 src/protocols/jabber/jabber.c:3091
 msgid "Title"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:2315
+#: src/protocols/jabber/jabber.c:3092
 #, fuzzy
 msgid "Role"
 msgstr "ɾ"
 
-#: src/protocols/jabber/jabber.c:2316
+#: src/protocols/jabber/jabber.c:3093
 msgid "Birthday"
 msgstr ""
 
 #. Right side: frame with description and the filepath of plugin
-#: src/dialogs.c:2491 src/plugins.c:211 src/protocols/jabber/jabber.c:2317
+#: src/dialogs.c:2533 src/plugins.c:211 src/protocols/jabber/jabber.c:3094
 msgid "Description"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:2342
+#: src/protocols/jabber/jabber.c:3119
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:2343
+#: src/protocols/jabber/jabber.c:3120
 #, fuzzy
 msgid "User Identity"
 msgstr "ûϸ"
 
-#: src/protocols/jabber/jabber.c:2759
+#: src/protocols/jabber/jabber.c:3532
 msgid "Gaim - Edit Jabber vCard"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:2833
+#: src/protocols/jabber/jabber.c:3606
 #, fuzzy
 msgid "Server Registration successful!"
 msgstr "ûע"
 
-#: src/protocols/jabber/jabber.c:2860
+#: src/protocols/jabber/jabber.c:3633
 msgid "Unknown registration error"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:2969 src/protocols/jabber/jabber.c:2984
+#: src/protocols/jabber/jabber.c:3742 src/protocols/jabber/jabber.c:3757
 #, fuzzy
 msgid "Set User Info"
 msgstr "ûϸ"
 
-#: src/protocols/msn/msn.c:719 src/protocols/msn/msn.c:2041
-#: src/protocols/msn/msn.c:2074
+#: src/protocols/msn/msn.c:230
+msgid "Syntax Error (probably a Gaim bug)"
+msgstr ""
+
+#: src/protocols/msn/msn.c:233
+msgid "Invalid Parameter (probably a Gaim bug)"
+msgstr ""
+
+#: src/protocols/msn/msn.c:236
+#, fuzzy
+msgid "Invalid User"
+msgstr ""
+
+#: src/protocols/msn/msn.c:239
+msgid "Fully Qualified Domain Name missing"
+msgstr ""
+
+#: src/protocols/msn/msn.c:242
+msgid "Already Login"
+msgstr ""
+
+#: src/protocols/msn/msn.c:245
+#, fuzzy
+msgid "Invalid Username"
+msgstr ""
+
+#: src/protocols/msn/msn.c:248
+#, fuzzy
+msgid "Invalid Friendly Name"
+msgstr ""
+
+#: src/protocols/msn/msn.c:251
+msgid "List Full"
+msgstr ""
+
+#: src/protocols/msn/msn.c:254
+msgid "Already there"
+msgstr ""
+
+#: src/protocols/msn/msn.c:257
+#, fuzzy
+msgid "Not on list"
+msgstr "ѹر"
+
+#: src/protocols/msn/msn.c:260
+msgid "User is offline"
+msgstr ""
+
+#: src/protocols/msn/msn.c:263
+msgid "Already in the mode"
+msgstr ""
+
+#: src/protocols/msn/msn.c:266
+msgid "Already in opposite list"
+msgstr ""
+
+#: src/protocols/msn/msn.c:269
+msgid "Switchboard failed"
+msgstr ""
+
+#: src/protocols/msn/msn.c:272
+msgid "Notify Transfer failed"
+msgstr ""
+
+#: src/protocols/msn/msn.c:276
+msgid "Required fields missing"
+msgstr ""
+
+#: src/protocols/msn/msn.c:279
+#, fuzzy
+msgid "Not logged in"
+msgstr "<HR><B>%s ѵ¼</B><BR><HR>"
+
+#: src/protocols/msn/msn.c:283
+#, fuzzy
+msgid "Internal server error"
+msgstr "ڲ"
+
+#: src/protocols/msn/msn.c:286
+msgid "Database server error"
+msgstr ""
+
+#: src/protocols/msn/msn.c:289
+#, fuzzy
+msgid "File operation error"
+msgstr "ڲӴ\n"
+
+#: src/protocols/msn/msn.c:292
+#, fuzzy
+msgid "Memory allocation error"
+msgstr "شӴ\n"
+
+#: src/protocols/msn/msn.c:296
+#, fuzzy
+msgid "Server busy"
+msgstr ""
+
+#: src/protocols/msn/msn.c:299
+#, fuzzy
+msgid "Server unavailable"
+msgstr "ַ¼ʱϡ"
+
+#: src/protocols/msn/msn.c:302
+msgid "Peer Notification server down"
+msgstr ""
+
+#: src/protocols/msn/msn.c:305
+#, fuzzy
+msgid "Database connect error"
+msgstr "ڲӴ\n"
+
+#: src/protocols/msn/msn.c:308
+msgid "Server is going down (abandon ship)"
+msgstr ""
+
+#: src/protocols/msn/msn.c:312
+#, fuzzy
+msgid "Error creating connection"
+msgstr "g003: Ӵ\n"
+
+#: src/protocols/msn/msn.c:318
+msgid "Session overload"
+msgstr ""
+
+#: src/protocols/msn/msn.c:321
+msgid "User is too active"
+msgstr ""
+
+#: src/protocols/msn/msn.c:324
+#, fuzzy
+msgid "Too many sessions"
+msgstr "ƥ̫ࡣ"
+
+#: src/protocols/msn/msn.c:327
+msgid "Not expected"
+msgstr ""
+
+#: src/protocols/msn/msn.c:330
+msgid "Bad friend file"
+msgstr ""
+
+#: src/protocols/msn/msn.c:334
+#, fuzzy
+msgid "Authentication failed"
+msgstr "֤ʧ"
+
+#: src/protocols/msn/msn.c:337
+#, fuzzy
+msgid "Not allowed when offline"
+msgstr "ĵؽȥǹزҪ"
+
+#: src/protocols/msn/msn.c:340
+msgid "Not accepting new users"
+msgstr ""
+
+#: src/protocols/msn/msn.c:343
+msgid "User unverified"
+msgstr ""
+
+#: src/protocols/msn/msn.c:346
+#, fuzzy
+msgid "Unknown Error Code"
+msgstr "¼"
+
+#: src/protocols/msn/msn.c:351 src/protocols/msn/msn.c:558
+#: src/protocols/msn/msn.c:813 src/protocols/msn/msn.c:2114
+#: src/protocols/msn/msn.c:2283 src/protocols/msn/msn.c:2336
 #, fuzzy
 msgid "MSN Error"
 msgstr ""
 
-#: src/protocols/msn/msn.c:719
+#: src/protocols/msn/msn.c:558
+msgid "A message may not have been received."
+msgstr ""
+
+#: src/protocols/msn/msn.c:813
 #, fuzzy
 msgid "Gaim was unable to send a message"
 msgstr ""
 "%s\n"
 "%s ޷¼ %s"
 
-#: src/protocols/msn/msn.c:1069
+#: src/protocols/msn/msn.c:917
+#, c-format
+msgid "The user %s (%s) wants to add %s to his or her buddy list."
+msgstr ""
+
+#: src/protocols/msn/msn.c:1074
+#, c-format
+msgid "The user %s (%s) wants to add you to their buddy list"
+msgstr ""
+
+#: src/protocols/msn/msn.c:1175
 #, fuzzy
 msgid "You have been disconnected. You have signed on from another location."
 msgstr "㱻 (%s) ϳˣ"
 
-#: src/protocols/msn/msn.c:2041 src/protocols/msn/msn.c:2074
+#: src/protocols/msn/msn.c:1435 src/protocols/msn/msn.c:1679
+#, fuzzy
+msgid "Error reading from server"
+msgstr "ȡļ %s "
+
+#: src/protocols/msn/msn.c:1568
+msgid "Requesting to send password"
+msgstr ""
+
+#: src/protocols/msn/msn.c:1618
+#, fuzzy
+msgid "Unable to send password"
+msgstr "ܶļ %s"
+
+#: src/protocols/msn/msn.c:1623
+#, fuzzy
+msgid "Password sent"
+msgstr "룺"
+
+#: src/protocols/msn/msn.c:1748
+#, fuzzy
+msgid "Unable to write to server"
+msgstr "ܵ¼ AIM"
+
+#: src/protocols/msn/msn.c:1754
+#, fuzzy
+msgid "Synching with server"
+msgstr "עµû"
+
+#: src/protocols/msn/msn.c:1920
+msgid "Away From Computer"
+msgstr ""
+
+#: src/protocols/msn/msn.c:1921
+msgid "Be Right Back"
+msgstr ""
+
+#: src/protocols/msn/msn.c:1922
+#, fuzzy
+msgid "Busy"
+msgstr ""
+
+#: src/protocols/msn/msn.c:1923
+msgid "On The Phone"
+msgstr ""
+
+#: src/protocols/msn/msn.c:1924
+msgid "Out To Lunch"
+msgstr ""
+
+#: src/protocols/msn/msn.c:1925
+#, fuzzy
+msgid "Hidden"
+msgstr "ظǶǵͼ"
+
+#: src/protocols/msn/msn.c:2041
+msgid "Reset friendly name"
+msgstr ""
+
+#: src/protocols/msn/msn.c:2114
+msgid "Friendly name too long."
+msgstr ""
+
+#: src/protocols/msn/msn.c:2129 src/protocols/msn/msn.c:2150
+#, fuzzy
+msgid "Set Friendly Name"
+msgstr "¼"
+
+#: src/protocols/msn/msn.c:2130
+#, fuzzy
+msgid "Set Friendly Name:"
+msgstr "¼"
+
+#: src/protocols/msn/msn.c:2131
+msgid "Reset All Friendly Names"
+msgstr ""
+
+#: src/protocols/msn/msn.c:2283 src/protocols/msn/msn.c:2336
 #, fuzzy
 msgid "Invalid name"
 msgstr ""
 
-#: src/protocols/napster/napster.c:450 src/protocols/oscar/oscar.c:3075
-#: src/protocols/toc/toc.c:1101
+#: src/protocols/napster/napster.c:457 src/protocols/oscar/oscar.c:3209
+#: src/protocols/toc/toc.c:1104
 msgid "Join what group:"
 msgstr "Ҫ飺"
 
-#: src/protocols/oscar/oscar.c:333
+#: src/protocols/oscar/oscar.c:330
 #, c-format
 msgid "Direct IM with %s closed"
 msgstr "<HR><B> %s ֱ֮Ѿرա</B><BR><HR>"
 
-#: src/protocols/oscar/oscar.c:335
+#: src/protocols/oscar/oscar.c:332
 #, fuzzy, c-format
 msgid "Direct IM with %s failed"
 msgstr "<HR><B> %s ֱ֮Ѿرա</B><BR><HR>"
 
-#: src/protocols/oscar/oscar.c:373
+#: src/protocols/oscar/oscar.c:370
 msgid "connection error (rend)\n"
 msgstr "Ӵ\n"
 
-#: src/protocols/oscar/oscar.c:384
+#: src/protocols/oscar/oscar.c:381
 msgid "major connection error\n"
 msgstr "شӴ\n"
 
-#: src/protocols/oscar/oscar.c:385 src/protocols/toc/toc.c:511
+#: src/protocols/oscar/oscar.c:382 src/protocols/toc/toc.c:511
 #: src/protocols/toc/toc.c:524 src/protocols/toc/toc.c:590
 msgid "Disconnected."
 msgstr "ѶϿ"
 
-#: src/protocols/oscar/oscar.c:397 src/protocols/toc/toc.c:761
+#: src/protocols/oscar/oscar.c:394 src/protocols/toc/toc.c:761
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "㱻 (%s) ϳˣ"
 
-#: src/protocols/oscar/oscar.c:398
+#: src/protocols/oscar/oscar.c:395
 msgid "Chat Error!"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:410
+#: src/protocols/oscar/oscar.c:407
 msgid "Chat is currently unavailable"
 msgstr "û졣"
 
-#: src/protocols/oscar/oscar.c:411
+#: src/protocols/oscar/oscar.c:408
 msgid "Gaim - Chat"
 msgstr "Gaim "
 
-#: src/protocols/oscar/oscar.c:470 src/protocols/oscar/oscar.c:530
+#: src/protocols/oscar/oscar.c:467 src/protocols/oscar/oscar.c:527
 msgid "Couldn't connect to host"
 msgstr "ӵ"
 
-#: src/protocols/oscar/oscar.c:478
+#: src/protocols/oscar/oscar.c:475
 msgid "Password sent, waiting for response\n"
 msgstr "ͳȺӦ\n"
 
-#: src/protocols/oscar/oscar.c:511
+#: src/protocols/oscar/oscar.c:508
 msgid "internal connection error\n"
 msgstr "ڲӴ\n"
 
-#: src/protocols/oscar/oscar.c:512
+#: src/protocols/oscar/oscar.c:509
 msgid "Unable to login to AIM"
 msgstr "ܵ¼ AIM"
 
-#: src/protocols/oscar/oscar.c:517
+#: src/protocols/oscar/oscar.c:514
 #, c-format
 msgid "Signon: %s"
 msgstr "¼ %s"
 
-#: src/protocols/oscar/oscar.c:589
+#: src/protocols/oscar/oscar.c:586
 msgid "Signed off.\n"
 msgstr "dz\n"
 
-#: src/protocols/oscar/oscar.c:608 src/protocols/oscar/oscar.c:732
+#: src/protocols/oscar/oscar.c:605 src/protocols/oscar/oscar.c:730
 msgid "Could Not Connect"
 msgstr "޷"
 
-#: src/protocols/oscar/oscar.c:616
+#: src/protocols/oscar/oscar.c:613
 msgid "Connection established, cookie sent"
 msgstr "ӳɹͳɡɣ"
 
 #. Incorrect nick/password
-#: src/protocols/oscar/oscar.c:642 src/protocols/toc/toc.c:459
+#: src/protocols/oscar/oscar.c:639 src/protocols/toc/toc.c:459
 msgid "Incorrect nickname or password."
 msgstr ""
 
 #. Suspended account
-#: src/protocols/oscar/oscar.c:647
+#: src/protocols/oscar/oscar.c:644
 msgid "Your account is currently suspended."
 msgstr ""
 
 #. connecting too frequently
-#: src/protocols/oscar/oscar.c:651
+#: src/protocols/oscar/oscar.c:648
 msgid ""
 "You have been connecting and disconnecting too frequently. Wait ten minutes "
 "and try again. If you continue to try, you will need to wait even longer."
@@ -695,216 +1114,225 @@
 "ӣϿƵ̫ˣʮԡҪԣȵʱ"
 
 #. client too old
-#: src/protocols/oscar/oscar.c:656
+#: src/protocols/oscar/oscar.c:653
 msgid "The client version you are using is too old. Please upgrade at "
 msgstr "ʹõ汾̫ˡµİɣ"
 
-#: src/protocols/oscar/oscar.c:660 src/protocols/toc/toc.c:542
+#: src/protocols/oscar/oscar.c:657 src/protocols/toc/toc.c:542
 msgid "Authentication Failed"
 msgstr "֤ʧ"
 
-#: src/protocols/oscar/oscar.c:682
+#: src/protocols/oscar/oscar.c:679
 msgid "Internal Error"
 msgstr "ڲ"
 
-#: src/protocols/oscar/oscar.c:1250 src/protocols/oscar/oscar.c:3286
+#: src/protocols/oscar/oscar.c:1248 src/protocols/oscar/oscar.c:3420
 #, c-format
 msgid "Direct IM with %s established"
 msgstr "<HR><B>ѽ %s ֱӡ</B><BR><HR>"
 
-#: src/protocols/oscar/oscar.c:1496 src/protocols/oscar/oscar.c:2371
+#: src/protocols/oscar/oscar.c:1504 src/protocols/oscar/oscar.c:2456
 #, c-format
 msgid ""
-"The user %d has denied your request to add them to your contact list for the "
-"following reason:\n"
-"\n"
+"The user %lu has denied your request to add them to your contact list for "
+"the following reason:\n"
+"%s"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1496 src/protocols/oscar/oscar.c:2371
+#: src/protocols/oscar/oscar.c:1504 src/protocols/oscar/oscar.c:2456
 msgid "No reason given."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1497 src/protocols/oscar/oscar.c:2372
+#: src/protocols/oscar/oscar.c:1505 src/protocols/oscar/oscar.c:2457
 msgid "Gaim - ICQ Authorization Denied"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1503 src/protocols/oscar/oscar.c:2378
+#: src/protocols/oscar/oscar.c:1511 src/protocols/oscar/oscar.c:2463
 #, c-format
-msgid "The user %d has granted your request to add them to your contact list."
+msgid "The user %lu has granted your request to add them to your contact list."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1504 src/protocols/oscar/oscar.c:2379
+#: src/protocols/oscar/oscar.c:1512 src/protocols/oscar/oscar.c:2464
 msgid "Gaim - ICQ Authorization Granted"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1577
+#: src/protocols/oscar/oscar.c:1585
 #, fuzzy, c-format
 msgid "You missed %d message from %s because it was invalid."
 msgstr "һ %s ļʱϢϢ̫ˡ"
 
-#: src/protocols/oscar/oscar.c:1578
+#: src/protocols/oscar/oscar.c:1586
 #, fuzzy, c-format
 msgid "You missed %d messages from %s because they were invalid."
 msgstr "һ %s ļʱϢϢ̫ˡ"
 
-#: src/protocols/oscar/oscar.c:1587
+#: src/protocols/oscar/oscar.c:1595
 #, fuzzy, c-format
 msgid "You missed %d message from %s because it was too large."
 msgstr "һ %s ļʱϢϢ̫ˡ"
 
-#: src/protocols/oscar/oscar.c:1588
+#: src/protocols/oscar/oscar.c:1596
 #, fuzzy, c-format
 msgid "You missed %d messages from %s because they were too large."
 msgstr "һ %s ļʱϢϢ̫ˡ"
 
-#: src/protocols/oscar/oscar.c:1597
+#: src/protocols/oscar/oscar.c:1605
 #, fuzzy, c-format
 msgid "You missed %d message from %s because the rate limit has been exceeded."
 msgstr "һ %s ļʱϢϢ̫ˡ"
 
-#: src/protocols/oscar/oscar.c:1598
+#: src/protocols/oscar/oscar.c:1606
 #, fuzzy, c-format
 msgid ""
 "You missed %d messages from %s because the rate limit has been exceeded."
 msgstr "һ %s ļʱϢϢ̫ˡ"
 
-#: src/protocols/oscar/oscar.c:1607
+#: src/protocols/oscar/oscar.c:1615
 #, fuzzy, c-format
 msgid "You missed %d message from %s because it was too evil."
 msgstr "һ %s ļʱϢϢ̫ˡ"
 
-#: src/protocols/oscar/oscar.c:1608
+#: src/protocols/oscar/oscar.c:1616
 #, fuzzy, c-format
 msgid "You missed %d messages from %s because they are too evil."
 msgstr "һ %s ļʱϢϢ̫ˡ"
 
-#: src/protocols/oscar/oscar.c:1617
+#: src/protocols/oscar/oscar.c:1625
 #, fuzzy, c-format
 msgid "You missed %d message from %s because you are too evil."
 msgstr "һ %s ļʱϢϢ̫ˡ"
 
-#: src/protocols/oscar/oscar.c:1618
-#, fuzzy, c-format
-msgid "You missed %d messages from %s because you are too evil."
-msgstr "һ %s ļʱϢϢ̫ˡ"
-
 #: src/protocols/oscar/oscar.c:1626
 #, fuzzy, c-format
+msgid "You missed %d messages from %s because you are too evil."
+msgstr "һ %s ļʱϢϢ̫ˡ"
+
+#: src/protocols/oscar/oscar.c:1634
+#, fuzzy, c-format
 msgid "You missed %d message from %s for unknown reasons."
 msgstr "Īضʧһ %s Ϣ"
 
-#: src/protocols/oscar/oscar.c:1627
+#: src/protocols/oscar/oscar.c:1635
 #, fuzzy, c-format
 msgid "You missed %d messages from %s for unknown reasons."
 msgstr "Īضʧһ %s Ϣ"
 
-#: src/dialogs.c:3034 src/dialogs.c:3040 src/protocols/oscar/oscar.c:1632
-#: src/protocols/oscar/oscar.c:1670 src/protocols/oscar/oscar.c:1688
-#: src/protocols/oscar/oscar.c:2141 src/protocols/yahoo/yahoo.c:585
+#: src/dialogs.c:3076 src/dialogs.c:3082 src/protocols/oscar/oscar.c:1640
+#: src/protocols/oscar/oscar.c:1755 src/protocols/oscar/oscar.c:1773
+#: src/protocols/oscar/oscar.c:2226 src/protocols/yahoo/yahoo.c:594
 msgid "Gaim - Error"
 msgstr "Gaim - "
 
-#: src/protocols/oscar/oscar.c:1649
+#: src/protocols/oscar/oscar.c:1703
+#, c-format
+msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR>%s<BR>"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:1705
+#, c-format
+msgid "<B>Status:</B> %s<BR><HR><BR>%s<BR>"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:1734
 #, c-format
 msgid "SNAC threw error: %s\n"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1651
+#: src/protocols/oscar/oscar.c:1736
 #, fuzzy
 msgid "Gaim - Oscar SNAC Error"
 msgstr "Gaim - "
 
-#: src/protocols/oscar/oscar.c:1668
+#: src/protocols/oscar/oscar.c:1753
 #, c-format
 msgid "Your message to %s did not get sent: %s"
 msgstr " %s Ϣûб"
 
-#: src/protocols/oscar/oscar.c:1669 src/protocols/oscar/oscar.c:1687
+#: src/protocols/oscar/oscar.c:1754 src/protocols/oscar/oscar.c:1772
 msgid "Reason unknown"
 msgstr "ԭ"
 
-#: src/protocols/oscar/oscar.c:1686
+#: src/protocols/oscar/oscar.c:1771
 #, c-format
 msgid "User information for %s unavailable: %s"
 msgstr "޷鵽û %s Ϣ"
 
-#: src/buddy.c:2060 src/protocols/oscar/oscar.c:1717
+#: src/buddy.c:2131 src/protocols/oscar/oscar.c:1802
 #, fuzzy
 msgid "Buddy Icon"
 msgstr "ͼ"
 
-#: src/buddy.c:2063 src/protocols/oscar/oscar.c:1720
+#: src/buddy.c:2134 src/protocols/oscar/oscar.c:1805
 msgid "Voice"
 msgstr ""
 
-#: src/buddy.c:2066 src/protocols/oscar/oscar.c:1723
+#: src/buddy.c:2137 src/protocols/oscar/oscar.c:1808
 msgid "IM Image"
 msgstr "IM ͼ"
 
-#: src/buddy.c:494 src/buddy.c:2069 src/buddy.c:2507 src/prefs.c:2912
-#: src/protocols/oscar/oscar.c:1726
+#: src/buddy.c:498 src/buddy.c:2140 src/buddy.c:2581 src/prefs.c:2926
+#: src/protocols/oscar/oscar.c:1811
 msgid "Chat"
 msgstr ""
 
-#: src/buddy.c:2072 src/protocols/oscar/oscar.c:1729
+#: src/buddy.c:2143 src/protocols/oscar/oscar.c:1814
 msgid "Get File"
 msgstr "ļ"
 
-#: src/buddy.c:2075 src/protocols/oscar/oscar.c:1732
+#: src/buddy.c:2146 src/protocols/oscar/oscar.c:1817
 msgid "Send File"
 msgstr "ļ"
 
-#: src/buddy.c:2079 src/protocols/oscar/oscar.c:1736
+#: src/buddy.c:2150 src/protocols/oscar/oscar.c:1821
 msgid "Games"
 msgstr "Ϸ"
 
-#: src/buddy.c:2082 src/protocols/oscar/oscar.c:1739
+#: src/buddy.c:2153 src/protocols/oscar/oscar.c:1824
 msgid "Stocks"
 msgstr "Ʊ"
 
-#: src/buddy.c:2085 src/protocols/oscar/oscar.c:1742
+#: src/buddy.c:2156 src/protocols/oscar/oscar.c:1827
 #, fuzzy
 msgid "Send Buddy List"
 msgstr "б"
 
-#: src/buddy.c:2088 src/protocols/oscar/oscar.c:1745
+#: src/buddy.c:2159 src/protocols/oscar/oscar.c:1830
 msgid "EveryBuddy Bug"
 msgstr ""
 
-#: src/buddy.c:2091 src/protocols/oscar/oscar.c:1748
+#: src/buddy.c:2162 src/protocols/oscar/oscar.c:1833
 #, fuzzy
 msgid "AP User"
 msgstr "¼û"
 
-#: src/buddy.c:2094 src/protocols/oscar/oscar.c:1751
+#: src/buddy.c:2165 src/protocols/oscar/oscar.c:1836
 msgid "ICQ RTF"
 msgstr ""
 
-#: src/buddy.c:2097 src/protocols/oscar/oscar.c:1754
+#: src/buddy.c:2168 src/protocols/oscar/oscar.c:1839
 msgid "Nihilist"
 msgstr ""
 
-#: src/buddy.c:2100 src/protocols/oscar/oscar.c:1757
+#: src/buddy.c:2171 src/protocols/oscar/oscar.c:1842
 msgid "ICQ Server Relay"
 msgstr ""
 
-#: src/buddy.c:2103 src/protocols/oscar/oscar.c:1760
+#: src/buddy.c:2174 src/protocols/oscar/oscar.c:1845
 msgid "ICQ Unknown"
 msgstr ""
 
-#: src/buddy.c:2106 src/protocols/oscar/oscar.c:1763
+#: src/buddy.c:2177 src/protocols/oscar/oscar.c:1848
 msgid "Trillian Encryption"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1801
+#: src/protocols/oscar/oscar.c:1886
 #, fuzzy
 msgid ""
-"<br><BODY BGCOLOR=WHITE><hr><I>Legend:</I><br><br><IMG "
-"SRC=\"free_icon.gif\"> : Normal AIM User<br><IMG SRC=\"aol_icon.gif\"> : AOL "
-"User <br><IMG SRC=\"dt_icon.gif\"> : Trial AIM User <br><IMG "
-"SRC=\"admin_icon.gif\"> : Administrator <br><IMG SRC=\"ab_icon.gif\"> : "
-"ActiveBuddy Interactive Agent<br><IMG SRC=\"wireless_icon.gif\"> : Wireless "
-"Device User<br>"
+"<br><BODY BGCOLOR=WHITE><hr><I>Legend:</I><br><br><IMG SRC=\"free_icon.gif"
+"\"> : Normal AIM User<br><IMG SRC=\"aol_icon.gif\"> : AOL User <br><IMG SRC="
+"\"dt_icon.gif\"> : Trial AIM User <br><IMG SRC=\"admin_icon.gif\"> : "
+"Administrator <br><IMG SRC=\"ab_icon.gif\"> : ActiveBuddy Interactive "
+"Agent<br><IMG SRC=\"wireless_icon.gif\"> : Wireless Device User<br>"
 msgstr ""
 "û: <B>%s</B>  %s <BR>\n"
 "%s 漶 : <B>%d %%</B><BR>\n"
@@ -912,13 +1340,12 @@
 "ʱ䣨ӣ: <B>%d</B>\n"
 "<BR>\n"
 "<HR><BR>\n"
-"%s <br><BODY BGCOLOR=WHITE><hr><I>˵:</I><br><br><IMG "
-"SRC=\"free_icon.gif\"> : ͨ AIM û<br><IMG SRC=\"aol_icon.gif\"> : AOL "
-"û <br><IMG SRC=\"dt_icon.gif\"> : AIM û <br><IMG "
-"SRC=\"admin_icon.gif\"> : Ա"
-
-#: src/protocols/oscar/oscar.c:1829
-#, fuzzy
+"%s <br><BODY BGCOLOR=WHITE><hr><I>˵:</I><br><br><IMG SRC=\"free_icon.gif"
+"\"> : ͨ AIM û<br><IMG SRC=\"aol_icon.gif\"> : AOL û <br><IMG SRC="
+"\"dt_icon.gif\"> : AIM û <br><IMG SRC=\"admin_icon.gif\"> : Ա"
+
+#: src/protocols/oscar/oscar.c:1914
+#, fuzzy, c-format
 msgid ""
 "Username : <B>%s</B>  %s <BR>\n"
 "Warning Level : <B>%d %%</B><BR>\n"
@@ -930,50 +1357,62 @@
 "<BR>ʱ̣ <B>%s</B><BR>תʱ䣨ӣ <B>%d</B>\n"
 "<BR><HR><BR>%s\n"
 
-#: src/protocols/oscar/oscar.c:1861
+#: src/protocols/oscar/oscar.c:1946
 msgid "<i>User has no away message</i>"
 msgstr "<i>û뿪ʱû¿</i>"
 
-#: src/protocols/oscar/oscar.c:1873
+#: src/protocols/oscar/oscar.c:1958
 #, fuzzy
 msgid "Client Capabilities: "
 msgstr "ԣ%s\n"
 
-#: src/protocols/oscar/oscar.c:1881
+#: src/protocols/oscar/oscar.c:1966
 msgid "<i>No Information Provided</i>"
 msgstr "<i>δṩκϢ</i>"
 
-#: src/protocols/oscar/oscar.c:1904
+#: src/protocols/oscar/oscar.c:1989
 msgid "Your connection may be lost."
 msgstr "ӿѾϿ"
 
-#: src/protocols/oscar/oscar.c:1905
+#: src/protocols/oscar/oscar.c:1990
 msgid "AOL error"
 msgstr "AOL "
 
-#: src/protocols/oscar/oscar.c:2140
+#: src/protocols/oscar/oscar.c:2225
 msgid ""
 "The last message was not sent because you are over the rate limit. Please "
 "wait 10 seconds and try again."
 msgstr ""
 
-#: src/dialogs.c:3563 src/protocols/oscar/oscar.c:2482
-#: src/protocols/oscar/oscar.c:3407 src/protocols/toc/toc.c:1561
-#: src/protocols/toc/toc.c:1578 src/protocols/toc/toc.c:1638
-#: src/protocols/toc/toc.c:1680 src/protocols/toc/toc.c:1799
-#: src/protocols/toc/toc.c:1829 src/protocols/toc/toc.c:1885
+#: src/dialogs.c:3604 src/protocols/oscar/oscar.c:2589
+#: src/protocols/oscar/oscar.c:3541 src/protocols/toc/toc.c:1564
+#: src/protocols/toc/toc.c:1581 src/protocols/toc/toc.c:1641
+#: src/protocols/toc/toc.c:1683 src/protocols/toc/toc.c:1802
+#: src/protocols/toc/toc.c:1832 src/protocols/toc/toc.c:1888
 msgid "Error"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3079 src/protocols/toc/toc.c:1105
+#: src/protocols/oscar/oscar.c:3192
+#, c-format
+msgid ""
+"The maximum number of buddies allowed in your buddy list is %d, and you have "
+"%d.  Until you are below the limit, some buddies will not show up as online."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3195
+#, fuzzy
+msgid "Gaim - Warning"
+msgstr "Gaim - û"
+
+#: src/protocols/oscar/oscar.c:3213 src/protocols/toc/toc.c:1108
 msgid "Exchange:"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3407
+#: src/protocols/oscar/oscar.c:3541
 msgid "Unable to open Direct IM"
 msgstr "ֱܽ"
 
-#: src/protocols/oscar/oscar.c:3417
+#: src/protocols/oscar/oscar.c:3551
 #, c-format
 msgid ""
 "You have selected to open a Direct IM connection with %s. Doing this will "
@@ -981,11 +1420,30 @@
 "continue?"
 msgstr " %s ׽¶ĺβͣзա"
 
-#: src/protocols/oscar/oscar.c:3450
+#: src/protocols/oscar/oscar.c:3568
+#, c-format
+msgid ""
+"<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR><I>Remote client does not "
+"support sending status messages.</I><BR>"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3575
+#, c-format
+msgid ""
+"<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR><I>User has no status message."
+"</I><BR>"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3600
+#, fuzzy
+msgid "Get Status Msg"
+msgstr "յʱ뿪Ϣ"
+
+#: src/protocols/oscar/oscar.c:3613
 msgid "Direct IM"
 msgstr "ֱϢ"
 
-#: src/protocols/oscar/oscar.c:3458
+#: src/protocols/oscar/oscar.c:3621
 #, fuzzy
 msgid "Get Capabilities"
 msgstr "ԣ%s\n"
@@ -1130,7 +1588,7 @@
 msgid "Password Change Successful"
 msgstr "Gaim - "
 
-#: src/dialogs.c:1688 src/protocols/toc/toc.c:782
+#: src/dialogs.c:1730 src/protocols/toc/toc.c:782
 msgid "Gaim - Password Change"
 msgstr "Gaim - "
 
@@ -1148,69 +1606,69 @@
 msgid "TOC Pause"
 msgstr "TOC ͣ"
 
-#: src/protocols/toc/toc.c:1222
+#: src/protocols/toc/toc.c:1225
 msgid "Get Dir Info"
 msgstr "ַ¼"
 
-#: src/protocols/toc/toc.c:1638 src/protocols/toc/toc.c:1680
-#: src/protocols/toc/toc.c:1799 src/protocols/toc/toc.c:1885
+#: src/protocols/toc/toc.c:1641 src/protocols/toc/toc.c:1683
+#: src/protocols/toc/toc.c:1802 src/protocols/toc/toc.c:1888
 msgid "Could not connect for transfer!"
 msgstr "޷ӡ"
 
-#: src/protocols/toc/toc.c:1829
+#: src/protocols/toc/toc.c:1832
 msgid "Could not write file header!"
 msgstr "޷дļͷ"
 
-#: src/protocols/toc/toc.c:1918
+#: src/protocols/toc/toc.c:1921
 msgid "Gaim - Save As..."
 msgstr "Gaim - Ϊ"
 
-#: src/protocols/toc/toc.c:1959
+#: src/protocols/toc/toc.c:1962
 #, fuzzy, c-format
 msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
 msgstr "%s  %s  %d ļ %s  %s (%.2f %s)%s%s"
 
-#: src/protocols/toc/toc.c:1960
+#: src/protocols/toc/toc.c:1963
 #, fuzzy, c-format
 msgid "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
 msgstr "%s  %s  %d ļ %s  %s (%.2f %s)%s%s"
 
-#: src/protocols/toc/toc.c:1965
+#: src/protocols/toc/toc.c:1968
 #, c-format
 msgid "%s requests you to send them a file"
 msgstr "%s Ƿһļ"
 
-#: src/protocols/yahoo/yahoo.c:585
+#: src/protocols/yahoo/yahoo.c:594
 msgid "Your message did not get sent."
 msgstr "Ϣ޷ͳ"
 
-#: src/protocols/zephyr/zephyr.c:802
+#: src/protocols/zephyr/zephyr.c:840
 msgid "ZLocate"
 msgstr ""
 
-#: src/protocols/zephyr/zephyr.c:839
+#: src/protocols/zephyr/zephyr.c:877
 msgid "Class:"
 msgstr ""
 
-#: src/protocols/zephyr/zephyr.c:843
+#: src/protocols/zephyr/zephyr.c:881
 msgid "Instance:"
 msgstr ""
 
-#: src/protocols/zephyr/zephyr.c:847
+#: src/protocols/zephyr/zephyr.c:885
 msgid "Recipient:"
 msgstr ""
 
-#: src/about.c:93
+#: src/about.c:102
 #, c-format
 msgid "About Gaim v%s"
 msgstr " Gaim  %s "
 
-#: src/about.c:126
+#: src/about.c:135
 #, fuzzy
 msgid ""
-"Gaim is a client that supports AOL's Instant Messenger protocol. It is "
-"written\n"
-"using Gtk+ and is licensed under the GPL.\n"
+"Gaim is a modular Instant Messaging client capable of using AIM, ICQ,\n"
+"Yahoo!, MSN, IRC, Jabber, Napster, Zephyr, and Gadu-Gadu all at once.\n"
+"It is written using Gtk+ and is licensed under the GPL.\n"
 "\n"
 "URL: "
 msgstr ""
@@ -1220,6 +1678,13 @@
 
 #: src/about.c:137
 msgid ""
+"\n"
+"\n"
+"IRC: #gaim on irc.openprojects.net"
+msgstr ""
+
+#: src/about.c:147
+msgid ""
 "Active Developers\n"
 "====================\n"
 "Rob Flynn (maintainer) [ rob@marko.net ]\n"
@@ -1239,99 +1704,97 @@
 "Mark Spencer (original author)   [ markster@marko.net ]"
 msgstr ""
 
-#: src/about.c:155 src/aim.c:318 src/buddy.c:2633 src/buddy_chat.c:1311
-#: src/buddy_chat.c:1408 src/buddy_chat.c:1438 src/conversation.c:2795
-#: src/dialogs.c:568 src/dialogs.c:3858 src/multi.c:1057 src/plugins.c:277
-#: src/prefs.c:2535 src/prpl.c:438 src/prpl.c:679 src/server.c:1050
-msgid "Close"
-msgstr "ر"
-
 #. this makes the sizes not work.
 #. GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
 #. gtk_widget_grab_default(button);
-#: src/about.c:175
+#: src/about.c:185
 msgid "Web Site"
 msgstr "ַ"
 
-#: src/aim.c:151 src/buddy.c:2626
+#: src/aim.c:153 src/buddy.c:2709
 msgid "Signoff"
 msgstr "뿪"
 
-#: src/aim.c:163
+#: src/aim.c:165
 msgid "Please enter your logon"
 msgstr "ĵ¼"
 
-#: src/aim.c:163 src/multi.c:1388 src/server.c:55
+#: src/aim.c:165 src/multi.c:1400 src/server.c:55
 msgid "Signon Error"
 msgstr "¼"
 
-#: src/aim.c:261
+#: src/aim.c:263
 msgid "Gaim - Login"
 msgstr "Gaim - ¼"
 
-#: src/aim.c:279
+#: src/aim.c:281
 msgid "Screen Name: "
 msgstr "¼"
 
-#: src/aim.c:295
+#: src/aim.c:297
 msgid "Password: "
 msgstr "룺"
 
-#: src/aim.c:316 src/buddy.c:2630
+#: src/aim.c:318 src/buddy.c:2713
 msgid "Quit"
 msgstr "˳"
 
-#: src/aim.c:321 src/aim.c:819 src/buddy.c:2656
+#: src/aim.c:323 src/aim.c:831 src/buddy.c:2739
 msgid "Accounts"
 msgstr "ʺ"
 
-#: src/aim.c:323 src/multi.c:903
+#: src/aim.c:325 src/multi.c:915
 msgid "Signon"
 msgstr "¼"
 
-#: src/aim.c:355
+#: src/aim.c:357
 msgid "About"
 msgstr ""
 
-#: src/aim.c:356 src/prefs.c:1619 src/prefs.c:1893
+#: src/aim.c:358 src/prefs.c:1633 src/prefs.c:1905
 msgid "Options"
 msgstr "ѡ  "
 
-#: src/aim.c:358 src/aim.c:822 src/buddy.c:2674
+#: src/aim.c:360 src/aim.c:834 src/buddy.c:2757
 msgid "Plugins"
 msgstr "    "
 
-#: src/aim.c:816 src/buddy.c:2666
+#: src/aim.c:828 src/buddy.c:2749
 msgid "Preferences"
 msgstr ""
 
-#: src/applet.c:199
+#: src/aim.c:838 src/multi.c:1472
+#, fuzzy
+msgid "Auto-login"
+msgstr "Զ¼"
+
+#: src/applet.c:109
 msgid "Attempting to sign on...."
 msgstr "ڵ¼"
 
-#: src/applet.c:202
+#: src/applet.c:112
 msgid "Offline. Click to bring up login box."
 msgstr "ߡ¼"
 
-#: src/applet.c:218
+#: src/applet.c:128
 #, c-format
 msgid "Away: %d pending."
 msgstr ""
 
-#: src/applet.c:221
+#: src/applet.c:131
 #, fuzzy
 msgid "Away."
 msgstr "ʱ뿪"
 
-#: src/applet.c:296 src/away.c:388
+#: src/applet.c:200 src/away.c:388
 msgid "New Away Message"
 msgstr "µʱ뿪Ϣ"
 
-#: src/applet.c:444
+#: src/applet.c:348
 msgid "Can't create Gaim applet!"
 msgstr "޷ Gaim С!"
 
-#: src/applet.c:465
+#: src/applet.c:368
 msgid "About..."
 msgstr "ڡ"
 
@@ -1355,87 +1818,74 @@
 msgid "Set All Away"
 msgstr "ʺΪ뿪"
 
-#. Put the buttons in the box
-#: src/buddy.c:488 src/buddy.c:2741 src/buddy_chat.c:1443
-#: src/conversation.c:2328 src/conversation.c:2810 src/dialogs.c:890
-#: src/dialogs.c:1072 src/dialogs.c:2053 src/multi.c:1041 src/prefs.c:2029
-#: src/prefs.c:2371 src/prefs.c:2405
-msgid "Add"
-msgstr ""
-
-#: src/buddy.c:489 src/buddy.c:2742 src/dialogs.c:900 src/dialogs.c:1047
+#: src/buddy.c:493 src/buddy.c:2828 src/dialogs.c:942 src/dialogs.c:1089
 msgid "Group"
 msgstr "Ⱥ"
 
-#: src/buddy.c:490 src/buddy.c:2743 src/buddy_chat.c:1445
-#: src/conversation.c:2314 src/conversation.c:2807 src/prefs.c:2043
-#: src/prefs.c:2375 src/prefs.c:2409
-msgid "Remove"
-msgstr "ɾ"
-
-#: src/buddy.c:495 src/buddy.c:646 src/buddy.c:798 src/buddy.c:2505
-#: src/buddy_chat.c:850 src/buddy_chat.c:1267
+#: src/buddy.c:499 src/buddy.c:664 src/buddy.c:834 src/buddy.c:2579
+#: src/buddy_chat.c:861 src/buddy_chat.c:1278
 msgid "IM"
 msgstr "ʱϢ"
 
-#: src/buddy.c:496 src/buddy.c:2506 src/buddy_chat.c:866 src/buddy_chat.c:1275
-#: src/buddy_chat.c:1451 src/conversation.c:2828
+#: src/buddy.c:500 src/buddy.c:2580 src/buddy_chat.c:877 src/buddy_chat.c:1286
+#: src/buddy_chat.c:1462 src/conversation.c:2897
 msgid "Info"
 msgstr "ϸ"
 
 #. Put the buttons in the box
-#: src/buddy.c:651 src/buddy.c:803 src/dialogs.c:1039 src/dialogs.c:3417
-#: src/dialogs.c:3432
+#: src/buddy.c:669 src/buddy.c:839 src/dialogs.c:1081 src/dialogs.c:3458
+#: src/dialogs.c:3473
 msgid "Alias"
 msgstr "Ŷ"
 
-#: src/buddy.c:656 src/buddy.c:822
+#: src/buddy.c:674 src/buddy.c:858
 msgid "Add Buddy Pounce"
 msgstr "Ӽ"
 
-#: src/buddy.c:663 src/buddy.c:828
+#: src/buddy.c:681 src/buddy.c:864
 msgid "View Log"
 msgstr "鿴¼"
 
-#: src/buddy.c:785 src/buddy.c:816
+#: src/buddy.c:821 src/buddy.c:852
 msgid "Rename"
 msgstr ""
 
-#: src/buddy.c:810
+#: src/buddy.c:846
 msgid "Un-Alias"
 msgstr "ȥŶ"
 
-#: src/buddy.c:1581 src/buddy.c:2649
+#: src/buddy.c:1645 src/buddy.c:2732
 msgid "Buddy Pounce"
 msgstr ""
 
-#: src/buddy.c:1661
+#: src/buddy.c:1725
 msgid "New Buddy Pounce"
 msgstr ""
 
-#: src/buddy.c:1679
+#: src/buddy.c:1743
 msgid "Remove Buddy Pounce"
 msgstr "ȡ"
 
-#: src/buddy.c:1707
+#: src/buddy.c:1771
 msgid "[Click to edit]"
 msgstr ""
 
-#: src/buddy.c:2183
+#: src/buddy.c:2254
 #, c-format
 msgid "Logged in: %s\n"
 msgstr "ѵ¼ʺţ %s\n"
 
-#: src/buddy.c:2195
+#: src/buddy.c:2266
+#, c-format
 msgid "Warnings: %d%%\n"
 msgstr "棺%d%%\n"
 
-#: src/buddy.c:2207
+#: src/buddy.c:2278
 #, c-format
 msgid "Capabilities: %s\n"
 msgstr "ԣ%s\n"
 
-#: src/buddy.c:2211
+#: src/buddy.c:2282
 #, c-format
 msgid ""
 "Alias: %s               \n"
@@ -1446,118 +1896,128 @@
 "¼%s\n"
 "%s%s%s"
 
-#: src/buddy.c:2215
+#: src/buddy.c:2286
 msgid "Idle: "
 msgstr "ʱ䣺"
 
-#: src/buddy.c:2286 src/buddy.c:2291
+#: src/buddy.c:2359 src/buddy.c:2364
 #, c-format
 msgid "%s logged in."
 msgstr "<HR><B>%s ѵ¼</B><BR><HR>"
 
-#: src/buddy.c:2350 src/buddy.c:2355
+#: src/buddy.c:2424 src/buddy.c:2429
 #, c-format
 msgid "%s logged out."
 msgstr "<HR><B>%s 뿪 %s%s </B><BR><HR>"
 
-#: src/buddy.c:2540
+#: src/buddy.c:2614
 msgid "Information on selected Buddy"
 msgstr "ѡеѵ"
 
-#: src/buddy.c:2541 src/dialogs.c:697
+#: src/buddy.c:2615 src/dialogs.c:697
 msgid "Send Instant Message"
 msgstr "ʱϢ"
 
-#: src/buddy.c:2542
+#: src/buddy.c:2616
 msgid "Start/join a Buddy Chat"
 msgstr "һ"
 
-#: src/buddy.c:2543
+#: src/buddy.c:2617
 msgid "Activate Away Message"
 msgstr "ʱ뿪Ϣ"
 
-#: src/buddy.c:2606
+#: src/buddy.c:2689
 msgid "File"
 msgstr "ļ"
 
-#: src/buddy.c:2610
+#: src/buddy.c:2693
 msgid "Add A Buddy"
 msgstr "һǶ"
 
-#: src/buddy.c:2612
+#: src/buddy.c:2695
 msgid "Join A Chat"
 msgstr ""
 
-#: src/buddy.c:2614
+#: src/buddy.c:2697
 msgid "New Instant Message"
 msgstr "ʱϢ"
 
-#: src/buddy.c:2616 src/dialogs.c:749
+#: src/buddy.c:2699 src/dialogs.c:759
 msgid "Get User Info"
 msgstr "ûϸ"
 
-#: src/buddy.c:2621
+#: src/buddy.c:2704
 msgid "Import Buddy List"
 msgstr "б"
 
-#: src/buddy.c:2639
+#: src/buddy.c:2722
 msgid "Tools"
 msgstr ""
 
-#: src/buddy.c:2662
+#: src/buddy.c:2745
 msgid "Protocol Actions"
 msgstr "Э鶯"
 
-#: src/buddy.c:2668
+#: src/buddy.c:2751
 msgid "View System Log"
 msgstr "鿴ϵͳ¼"
 
-#: src/buddy.c:2680
+#: src/buddy.c:2763
 msgid "Perl"
 msgstr "Perl "
 
-#: src/buddy.c:2683
+#: src/buddy.c:2766
 msgid "Load Script"
 msgstr "ؽű"
 
-#: src/buddy.c:2687
+#: src/buddy.c:2770
 msgid "Unload All Scripts"
 msgstr "жؽű"
 
-#: src/buddy.c:2691
+#: src/buddy.c:2774
 msgid "List Scripts"
 msgstr "гѼؽű"
 
-#: src/buddy.c:2699
+#: src/buddy.c:2782
 msgid "Help"
 msgstr ""
 
-#: src/buddy.c:2704
+#: src/buddy.c:2787
+#, fuzzy
+msgid "Online Help"
+msgstr ""
+
+#: src/buddy.c:2788
+#, fuzzy
+msgid "Debug Window"
+msgstr "ʾ Debug "
+
+#: src/buddy.c:2789
 msgid "About Gaim"
 msgstr " Gaim"
 
-#: src/buddy.c:2721 src/prefs.c:2891
+#: src/buddy.c:2807 src/prefs.c:2905
 msgid "Buddy List"
 msgstr "б"
 
-#: src/buddy.c:2774
+#: src/buddy.c:2860
 msgid "Add a new Buddy"
 msgstr "һ¸Ƕ"
 
-#: src/buddy.c:2775
+#: src/buddy.c:2861
 msgid "Add a new Group"
 msgstr "һ¸Ƕ"
 
-#: src/buddy.c:2776
+#: src/buddy.c:2862
 #, fuzzy
 msgid "Remove selected Buddy/Group"
 msgstr "ɾѡеĸǶ"
 
-#: src/buddy.c:2803
+#: src/buddy.c:2889
 msgid "Edit Buddies"
 msgstr "޸б"
 
-#: src/buddy.c:2846
+#: src/buddy.c:2932
 msgid "Gaim - Buddy List"
 msgstr "Gaim - б"
 
@@ -1565,21 +2025,17 @@
 msgid "Join Chat"
 msgstr ""
 
-#: src/buddy_chat.c:272
-msgid "Buddy Chat"
-msgstr ""
-
 #: src/buddy_chat.c:283
 msgid "Join Chat As:"
 msgstr "趨ʹõdzƣ"
 
-#: src/buddy_chat.c:304 src/buddy_chat.c:392 src/dialogs.c:450
-#: src/dialogs.c:540 src/dialogs.c:715 src/dialogs.c:773 src/dialogs.c:892
-#: src/dialogs.c:1068 src/dialogs.c:1431 src/dialogs.c:1636 src/dialogs.c:1760
-#: src/dialogs.c:1820 src/dialogs.c:2042 src/dialogs.c:2224 src/dialogs.c:2399
-#: src/dialogs.c:2470 src/dialogs.c:3166 src/dialogs.c:3419 src/dialogs.c:3600
-#: src/dialogs.c:3971 src/dialogs.c:4077 src/dialogs.c:4736 src/multi.c:769
-#: src/multi.c:899 src/prpl.c:150 src/prpl.c:224
+#: src/buddy_chat.c:304 src/buddy_chat.c:392 src/dialogs.c:449
+#: src/dialogs.c:539 src/dialogs.c:715 src/dialogs.c:816 src/dialogs.c:934
+#: src/dialogs.c:1110 src/dialogs.c:1473 src/dialogs.c:1678 src/dialogs.c:1802
+#: src/dialogs.c:1862 src/dialogs.c:2084 src/dialogs.c:2266 src/dialogs.c:2441
+#: src/dialogs.c:2512 src/dialogs.c:3208 src/dialogs.c:3460 src/dialogs.c:3641
+#: src/dialogs.c:4012 src/dialogs.c:4118 src/dialogs.c:4777 src/multi.c:781
+#: src/multi.c:911 src/prpl.c:150 src/prpl.c:224
 msgid "Cancel"
 msgstr "ȡ"
 
@@ -1587,16 +2043,16 @@
 msgid "Join"
 msgstr ""
 
-#: src/buddy_chat.c:393 src/buddy_chat.c:396 src/buddy_chat.c:1317
-#: src/buddy_chat.c:1407
+#: src/buddy_chat.c:393 src/buddy_chat.c:396 src/buddy_chat.c:1328
+#: src/buddy_chat.c:1418
 msgid "Invite"
 msgstr ""
 
-#: src/buddy_chat.c:412 src/dialogs.c:1259 src/dialogs.c:3427
+#: src/buddy_chat.c:412 src/dialogs.c:1301 src/dialogs.c:3468
 msgid "Buddy"
 msgstr ""
 
-#: src/buddy_chat.c:417 src/prefs.c:1992
+#: src/buddy_chat.c:417 src/prefs.c:2004
 msgid "Message"
 msgstr "Ϣ"
 
@@ -1605,311 +2061,307 @@
 msgid "Gaim - Invite Buddy Into Chat Room"
 msgstr ""
 
-#: src/buddy_chat.c:857
+#: src/buddy_chat.c:868
 #, fuzzy
 msgid "Un-Ignore"
 msgstr ""
 
-#: src/buddy_chat.c:859 src/buddy_chat.c:1271
+#: src/buddy_chat.c:870 src/buddy_chat.c:1282
 msgid "Ignore"
 msgstr ""
 
 #. don't remove them from ignored in case they re-enter
-#: src/buddy_chat.c:922 src/buddy_chat.c:1034 src/buddy_chat.c:1497
-#: src/buddy_chat.c:1530
+#: src/buddy_chat.c:933 src/buddy_chat.c:1045 src/buddy_chat.c:1508
+#: src/buddy_chat.c:1541
 #, c-format
 msgid "%d %s in room"
 msgstr " %d һ"
 
-#: src/buddy_chat.c:930
+#: src/buddy_chat.c:941
 #, c-format
 msgid "%s entered the room."
 msgstr "%s "
 
-#: src/buddy_chat.c:996
+#: src/buddy_chat.c:1007
 #, c-format
 msgid "%s is now known as %s"
 msgstr "[%s] ʹû [%s]"
 
-#: src/buddy_chat.c:1043
+#: src/buddy_chat.c:1054
 #, fuzzy, c-format
 msgid "%s left the room (%s)."
 msgstr "%s 뿪"
 
-#: src/buddy_chat.c:1045
+#: src/buddy_chat.c:1056
 #, c-format
 msgid "%s left the room."
 msgstr "%s 뿪"
 
-#: src/buddy_chat.c:1144
+#: src/buddy_chat.c:1155
 msgid "Gaim - Group Chats"
 msgstr "Gaim Ⱥ"
 
-#: src/buddy_chat.c:1207
+#: src/buddy_chat.c:1218
 msgid "Topic:"
 msgstr "⣺"
 
-#: src/buddy_chat.c:1248
+#: src/buddy_chat.c:1259
 msgid "0 people in room"
 msgstr "ûˣȥ"
 
-#: src/buddy_chat.c:1322 src/buddy_chat.c:1406
+#: src/buddy_chat.c:1333 src/buddy_chat.c:1417
 msgid "Whisper"
 msgstr "Ļ"
 
-#: src/buddy_chat.c:1327 src/buddy_chat.c:1404 src/buddy_chat.c:1453
-#: src/conversation.c:2839
+#: src/buddy_chat.c:1338 src/buddy_chat.c:1415 src/buddy_chat.c:1464
+#: src/conversation.c:2908
 msgid "Send"
 msgstr "ͳ"
 
-#: src/buddy_chat.c:1447 src/conversation.c:2816
+#: src/buddy_chat.c:1458 src/conversation.c:2885
 msgid "Block"
 msgstr "ס죡"
 
-#: src/buddy_chat.c:1449 src/conversation.c:2822 src/dialogs.c:425
-#: src/dialogs.c:454
+#: src/buddy_chat.c:1460 src/conversation.c:2891 src/dialogs.c:424
+#: src/dialogs.c:453
 msgid "Warn"
 msgstr ""
 
-#: src/conversation.c:413
+#: src/conversation.c:431
 msgid "Gaim - Save Conversation"
 msgstr "Gaim - ¼Ի"
 
-#: src/conversation.c:474
+#: src/conversation.c:492
 #, fuzzy
 msgid "Gaim - Insert Image"
 msgstr "Gaim - ʱϢû"
 
-#: src/conversation.c:1278
+#: src/conversation.c:1336
 msgid "Unable to send message: too large"
 msgstr ""
 
-#: src/conversation.c:1278 src/conversation.c:1282
+#: src/conversation.c:1336 src/conversation.c:1340
 #, fuzzy
 msgid "Message Error"
 msgstr "Ϣ"
 
-#: src/conversation.c:1282
+#: src/conversation.c:1340
 #, fuzzy
 msgid "Unable to send message: Unknown reason"
 msgstr "Īضʧһ %s Ϣ"
 
-#: src/conversation.c:1501
+#: src/conversation.c:1559
 #, c-format
 msgid "Currently at %d, "
 msgstr "Ŀǰ %d"
 
-#: src/conversation.c:1509
+#: src/conversation.c:1567
 #, c-format
 msgid "Setting position to %d\n"
 msgstr "λ趨 %d\n"
 
-#: src/conversation.c:2110 src/prefs.c:1305
+#: src/conversation.c:2170 src/prefs.c:1308
 msgid "Bold Text"
 msgstr ""
 
-#: src/conversation.c:2110
+#: src/conversation.c:2170
 msgid "Bold"
 msgstr ""
 
-#: src/conversation.c:2114
+#: src/conversation.c:2174
 msgid "Italics Text"
 msgstr "б"
 
-#: src/conversation.c:2115
+#: src/conversation.c:2175
 msgid "Italics"
 msgstr "б"
 
-#: src/conversation.c:2118 src/prefs.c:1317
+#: src/conversation.c:2178 src/prefs.c:1320
 msgid "Underline Text"
 msgstr "¼"
 
-#: src/conversation.c:2119
+#: src/conversation.c:2179
 msgid "Underline"
 msgstr "¼"
 
-#: src/conversation.c:2123 src/prefs.c:1323
+#: src/conversation.c:2183 src/prefs.c:1326
 msgid "Strike through Text"
 msgstr ""
 
-#: src/conversation.c:2123
+#: src/conversation.c:2183
 msgid "Strike"
 msgstr ""
 
-#: src/conversation.c:2129
+#: src/conversation.c:2189
 msgid "Decrease font size"
 msgstr "С"
 
-#: src/conversation.c:2129
+#: src/conversation.c:2189
 msgid "Small"
 msgstr "С"
 
-#: src/conversation.c:2132
+#: src/conversation.c:2192
 msgid "Normal font size"
 msgstr "С"
 
-#: src/conversation.c:2132
+#: src/conversation.c:2192
 msgid "Normal"
 msgstr ""
 
-#: src/conversation.c:2135
+#: src/conversation.c:2195
 msgid "Increase font size"
 msgstr ""
 
-#: src/conversation.c:2135
+#: src/conversation.c:2195
 msgid "Big"
 msgstr ""
 
-#: src/conversation.c:2142 src/dialogs.c:2841 src/dialogs.c:2865
+#: src/conversation.c:2202 src/dialogs.c:2883 src/dialogs.c:2907
 msgid "Select Font"
 msgstr "ѡ"
 
-#: src/conversation.c:2143
+#: src/conversation.c:2203
 msgid "Font"
 msgstr ""
 
-#: src/conversation.c:2146 src/prefs.c:1353
+#: src/conversation.c:2206 src/prefs.c:1356
 msgid "Text Color"
 msgstr "ɫ"
 
-#: src/conversation.c:2147 src/conversation.c:2151
+#: src/conversation.c:2207 src/conversation.c:2211
 msgid "Color"
 msgstr "ɫ"
 
-#: src/conversation.c:2151 src/prefs.c:1371
+#: src/conversation.c:2211 src/prefs.c:1374
 msgid "Background Color"
 msgstr "ɫ"
 
-#: src/conversation.c:2158 src/dialogs.c:2464
+#: src/conversation.c:2218 src/dialogs.c:2506
 msgid "Insert Link"
 msgstr "볬"
 
-#: src/conversation.c:2159
+#: src/conversation.c:2219
 msgid "Link"
 msgstr ""
 
-#: src/conversation.c:2162
+#: src/conversation.c:2222
 msgid "Insert smiley face"
 msgstr "Цͼ"
 
-#: src/conversation.c:2162
+#: src/conversation.c:2222
 msgid "Smiley"
 msgstr "Ц"
 
-#: src/conversation.c:2165
+#: src/conversation.c:2225
 #, fuzzy
 msgid "Insert IM Image"
 msgstr "IM ͼ"
 
-#: src/conversation.c:2165
+#: src/conversation.c:2225
 #, fuzzy
 msgid "Image"
 msgstr "IM ͼ"
 
-#: src/conversation.c:2172
+#: src/conversation.c:2232
 msgid "Enable logging"
 msgstr "ʼ¼"
 
-#: src/conversation.c:2173 src/prefs.c:254
+#: src/conversation.c:2233 src/prefs.c:254
 msgid "Logging"
 msgstr "¼"
 
-#: src/conversation.c:2182
+#: src/conversation.c:2242
 msgid "Save Conversation"
 msgstr "Ի"
 
-#: src/conversation.c:2183 src/dialogs.c:1640 src/dialogs.c:1824
-#: src/dialogs.c:3178 src/dialogs.c:3867 src/dialogs.c:4744
+#: src/conversation.c:2243 src/dialogs.c:1682 src/dialogs.c:1866
+#: src/dialogs.c:3220 src/dialogs.c:3908 src/dialogs.c:4785
 msgid "Save"
 msgstr ""
 
-#: src/conversation.c:2187
-msgid "Enable sounds"
-msgstr ""
-
-#: src/conversation.c:2188
+#: src/conversation.c:2247 src/conversation.c:2248
 msgid "Sound"
 msgstr ""
 
-#: src/conversation.c:2668
+#: src/conversation.c:2729
 msgid "Gaim - Conversations"
 msgstr "Gaim - жԻ"
 
-#: src/conversation.c:2755
+#: src/conversation.c:2816
 msgid "Send message as: "
 msgstr "Ϣ"
 
-#: src/conversation.c:3373
+#: src/conversation.c:3453
 #, fuzzy
 msgid "Gaim - Save Icon"
 msgstr "Gaim - Ϊ"
 
-#: src/conversation.c:3400
+#: src/conversation.c:3487
 msgid "Disable Animation"
 msgstr ""
 
-#: src/conversation.c:3405
+#: src/conversation.c:3492
 #, fuzzy
 msgid "Enable Animation"
 msgstr ""
 
-#: src/conversation.c:3411
+#: src/conversation.c:3498
 #, fuzzy
 msgid "Hide Icon"
 msgstr "ظǶǵͼ"
 
-#: src/conversation.c:3417
+#: src/conversation.c:3504
 #, fuzzy
 msgid "Save Icon As..."
 msgstr "Gaim - Ϊ"
 
-#: src/dialogs.c:413
+#: src/dialogs.c:412
 msgid "Gaim - Warn user?"
 msgstr "Gaim - û"
 
-#: src/dialogs.c:433
+#: src/dialogs.c:432
 #, c-format
 msgid "Do you really want to warn %s?"
 msgstr "뾯 %s"
 
-#: src/dialogs.c:438
+#: src/dialogs.c:437
 msgid "Warn anonymously?"
 msgstr "棿"
 
-#: src/dialogs.c:442
+#: src/dialogs.c:441
 msgid "Anonymous warnings are less harsh."
 msgstr "治ô"
 
-#: src/dialogs.c:470
+#: src/dialogs.c:469
 #, c-format
 msgid "Removing '%s' from buddylist.\n"
 msgstr " %sѱɾȥ\n"
 
-#: src/dialogs.c:495
+#: src/dialogs.c:494
 #, fuzzy, c-format
 msgid "Gaim - Remove %s?"
 msgstr "Gaim - "
 
-#: src/dialogs.c:508
+#: src/dialogs.c:507
 #, fuzzy
 msgid "Remove Buddy"
 msgstr "Ƕ"
 
-#: src/dialogs.c:518
+#: src/dialogs.c:517
 #, c-format
 msgid ""
 "You are about to remove '%s' from\n"
 "your buddylist. Do you want to continue?"
 msgstr ""
 
-#: src/dialogs.c:530 src/prpl.c:154 src/prpl.c:228
+#: src/dialogs.c:529 src/prpl.c:154 src/prpl.c:228
 msgid "Accept"
 msgstr ""
 
 #. Build OK Button
-#: src/dialogs.c:637 src/dialogs.c:720 src/dialogs.c:778 src/dialogs.c:1435
-#: src/dialogs.c:1764 src/dialogs.c:1915 src/dialogs.c:2223 src/dialogs.c:2403
-#: src/dialogs.c:2469 src/dialogs.c:3976 src/dialogs.c:4082 src/multi.c:774
+#: src/dialogs.c:635 src/dialogs.c:720 src/dialogs.c:821 src/dialogs.c:1477
+#: src/dialogs.c:1806 src/dialogs.c:1957 src/dialogs.c:2265 src/dialogs.c:2445
+#: src/dialogs.c:2511 src/dialogs.c:4017 src/dialogs.c:4123 src/multi.c:786
 msgid "OK"
 msgstr "ȷ"
 
@@ -1921,347 +2373,352 @@
 msgid "IM who:"
 msgstr "һTʱϢ"
 
-#: src/dialogs.c:756
+#: src/dialogs.c:768
 msgid "User:"
 msgstr "û"
 
+#: src/dialogs.c:777
+#, fuzzy
+msgid "Account:"
+msgstr "ʺ"
+
 #. Finish up
-#: src/dialogs.c:783
+#: src/dialogs.c:826
 msgid "Gaim - Get User Info"
 msgstr "Gaim - ȡû"
 
-#: src/dialogs.c:898
+#: src/dialogs.c:940
 msgid "Add Group"
 msgstr ""
 
-#: src/dialogs.c:923
+#: src/dialogs.c:965
 msgid "Gaim - Add Group"
 msgstr "Gaim - "
 
-#: src/dialogs.c:1007
+#: src/dialogs.c:1049
 msgid "Gaim - Add Buddy"
 msgstr "Gaim - "
 
-#: src/dialogs.c:1019
+#: src/dialogs.c:1061
 msgid "Add Buddy"
 msgstr ""
 
-#: src/dialogs.c:1029
+#: src/dialogs.c:1071
 #, fuzzy
 msgid "Contact"
 msgstr ""
 
 #. Set up stuff for the account box
-#: src/dialogs.c:1055
+#: src/dialogs.c:1097
 #, fuzzy
 msgid "Add To"
 msgstr ""
 
-#: src/dialogs.c:1092
+#: src/dialogs.c:1134
 msgid "Please enter a buddy to pounce."
 msgstr "ҪӵģǶ"
 
-#: src/dialogs.c:1092
+#: src/dialogs.c:1134
 msgid "Buddy Pounce Error"
 msgstr "ʱ"
 
-#: src/dialogs.c:1228
+#: src/dialogs.c:1270
 msgid "Gaim - New Buddy Pounce"
 msgstr "Gaim - "
 
 #. <pounce type="who">
-#: src/dialogs.c:1239
+#: src/dialogs.c:1281
 msgid "Pounce Who"
 msgstr ""
 
-#: src/dialogs.c:1250
+#: src/dialogs.c:1292
 #, fuzzy
 msgid "Account"
 msgstr "ʺ"
 
 #. </pounce type="who">
 #. <pounce type="when">
-#: src/dialogs.c:1276
+#: src/dialogs.c:1318
 msgid "Pounce When"
 msgstr ""
 
-#: src/dialogs.c:1286
+#: src/dialogs.c:1328
 msgid "Pounce on sign on"
 msgstr "Ӻʱ¼"
 
-#: src/dialogs.c:1295
+#: src/dialogs.c:1337
 msgid "Pounce on return from away"
 msgstr "Ӻʱ"
 
-#: src/dialogs.c:1304
+#: src/dialogs.c:1346
 msgid "Pounce on return from idle"
 msgstr "Ӻʱ־ָ"
 
-#: src/dialogs.c:1313
+#: src/dialogs.c:1355
 #, fuzzy
 msgid "Pounce when buddy is typing to you"
 msgstr "ѵ¼"
 
 #. </pounce type="when">
 #. <pounce type="action">
-#: src/dialogs.c:1323
+#: src/dialogs.c:1365
 #, fuzzy
 msgid "Pounce Action"
 msgstr ""
 
-#: src/dialogs.c:1334
+#: src/dialogs.c:1376
 #, fuzzy
 msgid "Open IM Window"
 msgstr "ʱϢ"
 
-#: src/dialogs.c:1343
+#: src/dialogs.c:1385
 msgid "Popup Notification"
 msgstr ""
 
-#: src/dialogs.c:1352
+#: src/dialogs.c:1394
 #, fuzzy
 msgid "Send Message"
 msgstr "Ϣ"
 
-#: src/dialogs.c:1373
+#: src/dialogs.c:1415
 msgid "Execute command on pounce"
 msgstr "ִֶ"
 
-#: src/dialogs.c:1395
+#: src/dialogs.c:1437
 msgid "Play sound on pounce"
 msgstr "ֶͲ"
 
 #. </pounce type="action">
-#: src/dialogs.c:1417
+#: src/dialogs.c:1459
 msgid "Save this pounce after activation"
 msgstr "´ηȻִ"
 
-#: src/dialogs.c:1503
+#: src/dialogs.c:1545
 msgid "Gaim - Set Dir Info"
 msgstr "Gaim - 趨ַ¼"
 
-#: src/dialogs.c:1512
+#: src/dialogs.c:1554
 msgid "Directory Info"
 msgstr "ַ¼"
 
-#: src/dialogs.c:1534
+#: src/dialogs.c:1576
 msgid "Allow Web Searches To Find Your Info"
 msgstr "ҳѰҵ"
 
 #. Line 1
-#: src/dialogs.c:1537 src/dialogs.c:2242
+#: src/dialogs.c:1579 src/dialogs.c:2284
 msgid "First Name"
 msgstr ""
 
 #. Line 2
-#: src/dialogs.c:1548 src/dialogs.c:2254
+#: src/dialogs.c:1590 src/dialogs.c:2296
 msgid "Middle Name"
 msgstr ""
 
 #. Line 3
-#: src/dialogs.c:1560 src/dialogs.c:2266
+#: src/dialogs.c:1602 src/dialogs.c:2308
 msgid "Last Name"
 msgstr ""
 
 #. Line 4
-#: src/dialogs.c:1571 src/dialogs.c:2278
+#: src/dialogs.c:1613 src/dialogs.c:2320
 msgid "Maiden Name"
 msgstr ""
 
 #. Line 6
-#: src/dialogs.c:1593 src/dialogs.c:2301
+#: src/dialogs.c:1635 src/dialogs.c:2343
 msgid "State"
 msgstr "ʡ"
 
-#: src/dialogs.c:1658
+#: src/dialogs.c:1700
 msgid "New Passwords Do Not Match"
 msgstr "벻һ"
 
-#: src/dialogs.c:1658 src/dialogs.c:1663
+#: src/dialogs.c:1700 src/dialogs.c:1705
 msgid "Gaim - Change Password Error"
 msgstr "Gaim - "
 
-#: src/dialogs.c:1663
+#: src/dialogs.c:1705
 msgid "Fill out all fields completely"
 msgstr "еı"
 
-#: src/dialogs.c:1718
+#: src/dialogs.c:1760
 msgid "Original Password"
 msgstr ""
 
-#: src/dialogs.c:1732
+#: src/dialogs.c:1774
 msgid "New Password"
 msgstr ""
 
-#: src/dialogs.c:1746
+#: src/dialogs.c:1788
 msgid "New Password (again)"
 msgstr "루ȷ"
 
-#: src/dialogs.c:1787
+#: src/dialogs.c:1829
 msgid "Gaim - Set User Info"
 msgstr "Gaim - 趨û"
 
-#: src/dialogs.c:1899
+#: src/dialogs.c:1941
 msgid "Below are the results of your search: "
 msgstr "Ľ"
 
-#: src/dialogs.c:2032 src/dialogs.c:2039
+#: src/dialogs.c:2074 src/dialogs.c:2081
 msgid "Permit"
 msgstr ""
 
-#: src/dialogs.c:2034 src/dialogs.c:2041
+#: src/dialogs.c:2076 src/dialogs.c:2083
 msgid "Deny"
 msgstr "ܾ"
 
-#: src/dialogs.c:2078
+#: src/dialogs.c:2120
 msgid "Gaim - Add Permit"
 msgstr "Gaim - "
 
-#: src/dialogs.c:2080
+#: src/dialogs.c:2122
 msgid "Gaim - Add Deny"
 msgstr "Gaim - ӽֹ"
 
-#: src/dialogs.c:2140
+#: src/dialogs.c:2182
 msgid "Gaim - Log Conversation"
 msgstr "Gaim - ¼Ի"
 
-#: src/dialogs.c:2218 src/dialogs.c:2381
+#: src/dialogs.c:2260 src/dialogs.c:2423
 msgid "Search for Buddy"
 msgstr "Ѱ"
 
-#: src/dialogs.c:2346
+#: src/dialogs.c:2388
 msgid "Gaim - Find Buddy By Info"
 msgstr "Gaim - ûϲѰ"
 
-#: src/dialogs.c:2375
+#: src/dialogs.c:2417
 msgid "Gaim - Find Buddy By Email"
 msgstr "Gaim - ݵʲѰ"
 
-#: src/dialogs.c:2515
+#: src/dialogs.c:2557
 msgid "Gaim - Add URL"
 msgstr "Gaim -  URL"
 
-#: src/dialogs.c:2666 src/dialogs.c:2687 src/dialogs.c:2741
+#: src/dialogs.c:2708 src/dialogs.c:2729 src/dialogs.c:2783
 msgid "Select Text Color"
 msgstr "趨ɫ"
 
-#: src/dialogs.c:2720
+#: src/dialogs.c:2762
 msgid "Select Background Color"
 msgstr "趨ɫ"
 
-#: src/dialogs.c:2942
+#: src/dialogs.c:2984
 msgid "Import to:"
 msgstr ""
 
-#: src/dialogs.c:2966
+#: src/dialogs.c:3008
 msgid "Gaim - Import Buddy List"
 msgstr "Gaim - б"
 
 #. We shouldn't allow a blank title
-#: src/dialogs.c:3033
+#: src/dialogs.c:3075
 msgid "You cannot create an away message with a blank title"
 msgstr "ʱ뿪Ϣûб"
 
 #. We shouldn't allow a blank message
-#: src/dialogs.c:3040
+#: src/dialogs.c:3082
 msgid "You cannot create an empty away message"
 msgstr "ʱ뿪ϢΪ"
 
-#: src/dialogs.c:3108
+#: src/dialogs.c:3150
 msgid "Gaim - New away message"
 msgstr "Gaim - ʱ뿪Ϣ"
 
-#: src/dialogs.c:3118
+#: src/dialogs.c:3160
 msgid "New away message"
 msgstr "µʱ뿪Ϣ"
 
-#: src/dialogs.c:3131
+#: src/dialogs.c:3173
 msgid "Away title: "
 msgstr "ʱ뿪⣺"
 
-#: src/dialogs.c:3170
+#: src/dialogs.c:3212
 msgid "Use"
 msgstr "ʹ"
 
-#: src/dialogs.c:3174
+#: src/dialogs.c:3216
 msgid "Save & Use"
 msgstr "沢ʹ"
 
 #. show everything
-#: src/dialogs.c:3372
+#: src/dialogs.c:3413
 msgid "Smile!"
 msgstr "Ц"
 
-#: src/dialogs.c:3425
+#: src/dialogs.c:3466
 msgid "Alias Buddy"
 msgstr "ȡһŶ"
 
-#: src/dialogs.c:3458
+#: src/dialogs.c:3499
 msgid "Gaim - Alias Buddy"
 msgstr "Gaim - ȡһŶ"
 
-#: src/dialogs.c:3530
+#: src/dialogs.c:3571
 msgid "Gaim - Save Log File"
 msgstr "Gaim - ¼Ϊ"
 
-#: src/dialogs.c:3562
+#: src/dialogs.c:3603
 #, c-format
 msgid "Unable to remove file %s - %s"
 msgstr "ɾļ %s"
 
-#: src/dialogs.c:3590
+#: src/dialogs.c:3631
 msgid "Really clear log?"
 msgstr "Ҫ¼"
 
-#: src/dialogs.c:3605
+#: src/dialogs.c:3646
 msgid "Okay"
 msgstr "ȷ"
 
-#: src/dialogs.c:3776
+#: src/dialogs.c:3817
 #, fuzzy
 msgid "Date"
 msgstr "ʡ"
 
-#: src/dialogs.c:3839
+#: src/dialogs.c:3880
 #, fuzzy
 msgid "Conversation"
 msgstr "Ի"
 
-#: src/dialogs.c:3862
+#: src/dialogs.c:3903
 msgid "Clear"
 msgstr ""
 
-#: src/dialogs.c:3940
+#: src/dialogs.c:3981
 msgid "Gaim - Rename Group"
 msgstr "Gaim - "
 
-#: src/dialogs.c:3950
+#: src/dialogs.c:3991
 msgid "Rename Group"
 msgstr ""
 
-#: src/dialogs.c:3957 src/dialogs.c:4063
+#: src/dialogs.c:3998 src/dialogs.c:4104
 msgid "New name:"
 msgstr "֣"
 
-#: src/dialogs.c:4046
+#: src/dialogs.c:4087
 msgid "Gaim - Rename Buddy"
 msgstr "Gaim - Ƕ"
 
-#: src/dialogs.c:4056
+#: src/dialogs.c:4097
 msgid "Rename Buddy"
 msgstr "Ƕ"
 
 #. Below is basically stolen from plugins.c
-#: src/dialogs.c:4140
+#: src/dialogs.c:4181
 msgid "Gaim - Select Perl Script"
 msgstr "Gaim - ѡ Perl ű"
 
-#: src/gaimrc.c:1117
+#: src/gaimrc.c:1136
 #, c-format
 msgid "Could not open config file %s."
 msgstr "޷ļ"
 
-#: src/gaimrc.c:1118
+#: src/gaimrc.c:1137
 msgid "Preferences Error"
 msgstr "ѡ"
 
@@ -2274,59 +2731,68 @@
 msgid "g003: Error opening connection.\n"
 msgstr "g003: Ӵ\n"
 
-#: src/multi.c:452
+#: src/module.c:106 src/module.c:112 src/module.c:122
+msgid "Plugin Error"
+msgstr ""
+
+#: src/multi.c:454
 #, fuzzy
 msgid "Gaim - Load Buddy Icon"
 msgstr "Gaim - "
 
-#: src/multi.c:495
+#: src/multi.c:497
 #, fuzzy
 msgid "Buddy Icon File:"
 msgstr "ͼ"
 
-#: src/multi.c:506
+#: src/multi.c:508
 #, fuzzy
 msgid "Browse"
 msgstr ""
 
-#: src/multi.c:511 src/prefs.c:1545
+#: src/multi.c:513 src/prefs.c:1548
 msgid "Reset"
 msgstr ""
 
-#: src/multi.c:538
+#: src/multi.c:540
 msgid "Screenname:"
 msgstr "¼"
 
-#: src/multi.c:558
+#: src/multi.c:559
+#, fuzzy
+msgid "Alias:"
+msgstr "Ŷ"
+
+#: src/multi.c:569
 msgid "Protocol:"
 msgstr "Э飺"
 
-#: src/multi.c:563
+#: src/multi.c:574
 msgid "Remember Password"
 msgstr "ס"
 
-#: src/multi.c:564
+#: src/multi.c:575
 msgid "Auto-Login"
 msgstr "Զ¼"
 
-#: src/multi.c:604
+#: src/multi.c:616
 msgid "New Mail Notifications"
 msgstr ""
 
-#: src/multi.c:694
+#: src/multi.c:706
 #, fuzzy
 msgid "Register with server"
 msgstr "עµû"
 
-#: src/multi.c:752
+#: src/multi.c:764
 msgid "Gaim - Modify Account"
 msgstr "Gaim - ޸ʺ"
 
-#: src/multi.c:871
+#: src/multi.c:883
 msgid "Enter Password"
 msgstr ""
 
-#: src/multi.c:935
+#: src/multi.c:947
 msgid ""
 "You cannot log this account in; you do not have the protocol it uses loaded, "
 "or the protocol does not have a login function."
@@ -2335,75 +2801,75 @@
 "cannot log this account in; you do not have the protocol it uses loaded, or "
 "the protocol does not have a login function."
 
-#: src/multi.c:937
+#: src/multi.c:949
 msgid "Login Error"
 msgstr "¼"
 
-#: src/multi.c:966
+#: src/multi.c:978
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "ɾ %s"
 
-#: src/multi.c:1003
+#: src/multi.c:1015
 msgid "Gaim - Account Editor"
 msgstr "Gaim - ʺű༭"
 
-#: src/multi.c:1022
+#: src/multi.c:1034
 msgid "Select All"
 msgstr "ȫѡ"
 
-#: src/multi.c:1027
+#: src/multi.c:1039
 msgid "Select Autos"
 msgstr "ѡԶظϢ"
 
-#: src/multi.c:1031
+#: src/multi.c:1043
 msgid "Select None"
 msgstr "ȫѡ"
 
-#: src/multi.c:1045
+#: src/multi.c:1057
 msgid "Modify"
 msgstr "޸"
 
-#: src/multi.c:1049
+#: src/multi.c:1061
 msgid "Sign On/Off"
 msgstr "¼/뿪"
 
-#: src/multi.c:1053
+#: src/multi.c:1065
 msgid "Delete"
 msgstr "ɾ"
 
-#: src/multi.c:1368
+#: src/multi.c:1380
 #, c-format
 msgid ""
 "%s\n"
 "%s: %s"
 msgstr ""
 
-#: src/multi.c:1387
+#: src/multi.c:1399
 #, fuzzy, c-format
 msgid "%s was unable to sign on"
 msgstr ""
 "%s\n"
 "%s ޷¼ %s"
 
-#: src/multi.c:1398
+#: src/multi.c:1410
 #, fuzzy
 msgid "Notice"
 msgstr ""
 
-#: src/multi.c:1408
+#: src/multi.c:1420
 #, fuzzy, c-format
 msgid "%s has been signed off"
 msgstr ""
 "%s\n"
 "%s ޷¼ %s"
 
-#: src/multi.c:1409
+#: src/multi.c:1421
 #, fuzzy
 msgid "Connection Error"
 msgstr "ѹر"
 
-#: src/perl.c:856
+#: src/perl.c:875
 msgid "Perl Scripts"
 msgstr "Perl ű"
 
@@ -2465,9 +2931,9 @@
 msgid "General Options"
 msgstr "һѡ"
 
-#: src/prefs.c:200 src/prefs.c:383 src/prefs.c:551 src/prefs.c:665
-#: src/prefs.c:918 src/prefs.c:1068 src/prefs.c:1293 src/prefs.c:1615
-#: src/prefs.c:1889 src/prefs.c:2322
+#: src/prefs.c:200 src/prefs.c:384 src/prefs.c:552 src/prefs.c:667
+#: src/prefs.c:921 src/prefs.c:1071 src/prefs.c:1296 src/prefs.c:1629
+#: src/prefs.c:1901 src/prefs.c:2334
 msgid "All options take effect immediately unless otherwise noted."
 msgstr "û⣬е趨Ч"
 
@@ -2541,8 +3007,8 @@
 msgstr ""
 
 #: src/prefs.c:291
-msgid "KFM"
-msgstr "KFM"
+msgid "Konqueror"
+msgstr ""
 
 #: src/prefs.c:292
 msgid "Opera"
@@ -2552,398 +3018,413 @@
 msgid "Netscape"
 msgstr "Netscape"
 
-#: src/prefs.c:296
+#: src/prefs.c:294
+msgid "Mozilla"
+msgstr ""
+
+#: src/prefs.c:297
 msgid "Pop up new window by default"
 msgstr "ȱʡ´"
 
-#: src/prefs.c:303
+#: src/prefs.c:304
 msgid "GNOME URL Handler"
 msgstr "GNOME URL Handler"
 
-#: src/prefs.c:305
+#: src/prefs.c:306
 msgid "Galeon"
 msgstr ""
 
-#: src/prefs.c:306
-msgid "Manual"
-msgstr "ûֲ"
-
-#: src/prefs.c:375
+#: src/prefs.c:307
+#, c-format
+msgid "Manual (%s for URL)"
+msgstr ""
+
+#: src/prefs.c:376
 msgid "Proxy Options"
 msgstr "ѡ"
 
-#: src/prefs.c:387
+#: src/prefs.c:388
 msgid ""
 "Not all protocols can use these proxy options. Please see the README file "
 "for details."
 msgstr "еЭ鶼ʹЩã README ļ"
 
-#: src/prefs.c:392
+#: src/prefs.c:393
 msgid "Proxy Type"
 msgstr ""
 
-#: src/prefs.c:404
+#: src/prefs.c:405
 msgid "Proxy Server"
 msgstr ""
 
-#: src/prefs.c:407
+#: src/prefs.c:408
 msgid "No Proxy"
 msgstr "޴"
 
-#: src/prefs.c:419
+#: src/prefs.c:420
 #, fuzzy
 msgid "SOCKS 4"
 msgstr "SOCKS v4 "
 
-#: src/prefs.c:429
+#: src/prefs.c:430
 msgid "SOCKS 5"
 msgstr ""
 
-#: src/prefs.c:438
+#: src/prefs.c:439
 msgid "HTTP"
 msgstr ""
 
-#: src/prefs.c:462
+#: src/prefs.c:463
 msgid "Host"
 msgstr "ַ"
 
-#: src/prefs.c:478
+#: src/prefs.c:479
 msgid "Port"
 msgstr "˿"
 
-#: src/prefs.c:495
+#: src/prefs.c:496
 msgid "User"
 msgstr "¼û"
 
-#: src/prefs.c:511
+#: src/prefs.c:512
 msgid "Password"
 msgstr "¼"
 
-#: src/prefs.c:543
+#: src/prefs.c:544
 msgid "Buddy List Options"
 msgstr "бѡ"
 
-#: src/prefs.c:555
+#: src/prefs.c:556
 msgid "Buddy List Window"
 msgstr "б"
 
-#: src/prefs.c:568
+#: src/prefs.c:569
 #, fuzzy
 msgid "Tab Placement:"
 msgstr "Իҳλ"
 
-#: src/prefs.c:572 src/prefs.c:1001 src/prefs.c:1151
+#: src/prefs.c:573 src/prefs.c:1004 src/prefs.c:1154
 msgid "Top"
 msgstr ""
 
-#: src/prefs.c:573 src/prefs.c:1003 src/prefs.c:1153
+#: src/prefs.c:574 src/prefs.c:1006 src/prefs.c:1156
 msgid "Bottom"
 msgstr "׶"
 
-#: src/prefs.c:585
+#: src/prefs.c:586
 msgid "Hide IM/Info/Chat buttons"
 msgstr " Ϣ/Ϣ/ ť"
 
-#: src/prefs.c:587
+#: src/prefs.c:588
 msgid "Automatically show buddy list on sign on"
 msgstr "¼Զʾб"
 
-#: src/prefs.c:589
+#: src/prefs.c:590
 msgid "Display Buddy List near applet"
 msgstr " applet ʾб"
 
-#: src/prefs.c:592
+#: src/prefs.c:593
 msgid "Save Window Size/Position"
 msgstr "洰ڵĴСλ"
 
-#: src/prefs.c:595
+#: src/prefs.c:596
 msgid "Show pictures on buttons"
 msgstr "ڰťʾͼ"
 
 #: src/prefs.c:600
+msgid "Raise Buddy List on Signons and Signoffs"
+msgstr ""
+
+#: src/prefs.c:602
 msgid "Group Displays"
 msgstr "ʾ"
 
-#: src/prefs.c:612
+#: src/prefs.c:614
 msgid "Hide groups with no online buddies"
 msgstr "ûиǶ¼"
 
-#: src/prefs.c:618
+#: src/prefs.c:620
 msgid "Show numbers in groups"
 msgstr "ʾ"
 
-#: src/prefs.c:620
+#: src/prefs.c:622
 msgid "Buddy Displays"
 msgstr "бʾ"
 
-#: src/prefs.c:632
+#: src/prefs.c:634
 msgid "Show buddy type icons"
 msgstr "ʾͼ"
 
-#: src/prefs.c:633
+#: src/prefs.c:635
 msgid "Show warning levels"
 msgstr "ʾ漶"
 
-#: src/prefs.c:639
+#: src/prefs.c:641
 msgid "Show idle times"
 msgstr "ʾתʱ"
 
-#: src/prefs.c:640
+#: src/prefs.c:642
 msgid "Grey idle buddies"
 msgstr ""
 
-#: src/prefs.c:657
+#: src/prefs.c:659
 msgid "Conversation Options"
 msgstr "Իѡ"
 
-#: src/prefs.c:669
+#: src/prefs.c:671
 msgid "Keyboard Options"
 msgstr "ѡ"
 
-#: src/prefs.c:681
-msgid "Enter sends message"
-msgstr " Enter Ϣ"
-
-#: src/prefs.c:682
-msgid "Control-Enter sends message"
-msgstr "Ctrl-Enter Ϣ"
-
 #: src/prefs.c:683
+msgid "Enter sends message"
+msgstr " Enter Ϣ"
+
+#: src/prefs.c:684
+msgid "Control-Enter sends message"
+msgstr "Ctrl-Enter Ϣ"
+
+#: src/prefs.c:685
 msgid "Escape closes window"
 msgstr "ESC رմ"
 
-#: src/prefs.c:689
+#: src/prefs.c:686
+#, fuzzy
+msgid "Control-W closes window"
+msgstr "ESC رմ"
+
+#: src/prefs.c:692
 msgid "Control-{B/I/U/S} inserts HTML tags"
 msgstr "Ctrl-{B/I/U/S}  HTML "
 
-#: src/prefs.c:690
+#: src/prefs.c:693
 msgid "Control-(number) inserts smileys"
 msgstr "Ctrl- Цͼ"
 
-#: src/prefs.c:691
+#: src/prefs.c:694
 msgid "F2 toggles timestamp display"
 msgstr "F2 лʱʾ"
 
-#: src/prefs.c:693
+#: src/prefs.c:696
 msgid "Display and General Options"
 msgstr "ʾһѡ"
 
-#: src/prefs.c:705
+#: src/prefs.c:708
 msgid "Show graphical smileys"
 msgstr "ʾͼЦ"
 
-#: src/prefs.c:706
+#: src/prefs.c:709
 msgid "Show timestamp on messages"
 msgstr "Ϣʾʱ"
 
-#: src/prefs.c:707
+#: src/prefs.c:710
 msgid "Show URLs as links"
 msgstr "Գӷʽʾ URL"
 
-#: src/prefs.c:708
+#: src/prefs.c:711
 msgid "Highlight misspelled words"
 msgstr "ʾƴĵ"
 
-#: src/prefs.c:709 src/prefs.c:1911
+#: src/prefs.c:712 src/prefs.c:1923
 msgid "Sending messages removes away status"
 msgstr "ϢʱԶȡʱ뿪״̬"
 
-#: src/prefs.c:710 src/prefs.c:1924
+#: src/prefs.c:713 src/prefs.c:1936
 msgid "Queue new messages when away"
 msgstr "ʱ뿪ʱյϢŵ"
 
-#: src/prefs.c:716
+#: src/prefs.c:719
 msgid "Ignore colors"
 msgstr "յϢɫ"
 
-#: src/prefs.c:717
+#: src/prefs.c:720
 msgid "Ignore font faces"
 msgstr "յϢ"
 
-#: src/prefs.c:718
+#: src/prefs.c:721
 msgid "Ignore font sizes"
 msgstr "յϢС"
 
-#: src/prefs.c:719
+#: src/prefs.c:722
 msgid "Ignore TiK Automated Messages"
 msgstr "ԶɵϢ"
 
-#: src/prefs.c:720 src/prefs.c:1909
+#: src/prefs.c:723 src/prefs.c:1921
 msgid "Ignore new conversations when away"
 msgstr "ʱ뿪ʱµĶԻ"
 
-#: src/prefs.c:909
+#: src/prefs.c:912
 msgid "IM Options"
 msgstr "ʱϢѡ"
 
-#: src/prefs.c:922 src/prefs.c:2907
+#: src/prefs.c:925 src/prefs.c:2921
 msgid "IM Window"
 msgstr "ʱϢ"
 
-#: src/prefs.c:938 src/prefs.c:1088
+#: src/prefs.c:941 src/prefs.c:1091
 msgid "Show buttons as: "
 msgstr "ťʾã"
 
-#: src/prefs.c:942 src/prefs.c:1093
+#: src/prefs.c:945 src/prefs.c:1096
 msgid "Pictures And Text"
 msgstr "ͼκ"
 
-#: src/prefs.c:943 src/prefs.c:1095
+#: src/prefs.c:946 src/prefs.c:1098
 msgid "Pictures"
 msgstr "ͼ"
 
-#: src/prefs.c:944 src/prefs.c:1096
+#: src/prefs.c:947 src/prefs.c:1099
 msgid "Text"
 msgstr ""
 
-#: src/prefs.c:955
+#: src/prefs.c:958
 msgid "Show all conversations in one tabbed window"
 msgstr "һҳʾжԻ"
 
-#: src/prefs.c:957
+#: src/prefs.c:960
 msgid "Show chats in the same tabbed window"
 msgstr "ͬһһҳʾԻ"
 
-#: src/prefs.c:964 src/prefs.c:1116
+#: src/prefs.c:967 src/prefs.c:1119
 msgid "Raise windows on events"
 msgstr "¼ʱ"
 
-#: src/prefs.c:965
+#: src/prefs.c:968
 msgid "Show logins in window"
 msgstr "ڽ̸ʾ¼dzϢ"
 
-#: src/prefs.c:966
-msgid "Show aliases in tabs/titles"
+#: src/prefs.c:969
+#, fuzzy
+msgid "Show aliases in tabs/titles/ticker"
 msgstr "ڴڻҳıʾŶ"
 
-#: src/prefs.c:967
+#: src/prefs.c:970
 msgid "Hide window on send"
 msgstr "Ϣش"
 
-#: src/prefs.c:969 src/prefs.c:1119
+#: src/prefs.c:972 src/prefs.c:1122
 msgid "Window Sizes"
 msgstr "ڴС趨"
 
-#: src/prefs.c:977 src/prefs.c:1127
+#: src/prefs.c:980 src/prefs.c:1130
 msgid "New window width:"
 msgstr "µĴڿ趨"
 
-#: src/prefs.c:978 src/prefs.c:1128
+#: src/prefs.c:981 src/prefs.c:1131
 msgid "New window height:"
 msgstr "µĴڸ߶趨"
 
-#: src/prefs.c:979 src/prefs.c:1129
+#: src/prefs.c:982 src/prefs.c:1132
 msgid "Entry widget height:"
 msgstr "봰ڸ߶ȣ"
 
-#: src/prefs.c:981 src/prefs.c:1131
+#: src/prefs.c:984 src/prefs.c:1134
 msgid "Tab Placement"
 msgstr "Իҳλ"
 
-#: src/prefs.c:1010 src/prefs.c:1160
+#: src/prefs.c:1013 src/prefs.c:1163
 msgid "Left"
 msgstr ""
 
-#: src/prefs.c:1012 src/prefs.c:1162
+#: src/prefs.c:1015 src/prefs.c:1165
 msgid "Right"
 msgstr "ұ"
 
-#: src/prefs.c:1016
+#: src/prefs.c:1019
 msgid "Buddy Icons"
 msgstr "ͼ"
 
-#: src/prefs.c:1028
+#: src/prefs.c:1031
 msgid "Hide Buddy Icons"
 msgstr "ظǶǵͼ"
 
-#: src/prefs.c:1034
+#: src/prefs.c:1037
 #, fuzzy
 msgid "Disable Buddy Icon Animation"
 msgstr ""
 
-#: src/prefs.c:1060
+#: src/prefs.c:1063
 msgid "Chat Options"
 msgstr "ѡ"
 
-#: src/prefs.c:1072
+#: src/prefs.c:1075
 msgid "Group Chat Window"
 msgstr "촰"
 
-#: src/prefs.c:1107
+#: src/prefs.c:1110
 msgid "Show all chats in one tabbed window"
 msgstr "һҳʾ"
 
-#: src/prefs.c:1109
+#: src/prefs.c:1112
 msgid "Show conversations in the same tabbed window"
 msgstr "һҳʾжԻ"
 
-#: src/prefs.c:1117
+#: src/prefs.c:1120
 msgid "Show people joining/leaving in window"
 msgstr "ڴʾǼ/뿪Ϣ"
 
-#: src/prefs.c:1165
+#: src/prefs.c:1168
 msgid "Tab Completion"
 msgstr "TAB Զȫ"
 
-#: src/prefs.c:1177
+#: src/prefs.c:1180
 msgid "Tab-Complete Nicks"
 msgstr "TAB Զȫdz"
 
-#: src/prefs.c:1183
+#: src/prefs.c:1186
 msgid "Old-Style Tab Completion"
 msgstr "ʽ TAB Զȫ"
 
-#: src/prefs.c:1285 src/prefs.c:2917
+#: src/prefs.c:1288 src/prefs.c:2931
 msgid "Font Options"
 msgstr "ѡ"
 
-#: src/prefs.c:1311
+#: src/prefs.c:1314
 msgid "Italic Text"
 msgstr "б"
 
-#: src/prefs.c:1355 src/prefs.c:1373 src/prefs.c:1395
+#: src/prefs.c:1358 src/prefs.c:1376 src/prefs.c:1398
 msgid "Select"
 msgstr "ѡ"
 
-#: src/prefs.c:1393
+#: src/prefs.c:1396
 msgid "Font Face for Text"
 msgstr "ֵ"
 
-#: src/prefs.c:1408
+#: src/prefs.c:1411
 msgid "Font Size for Text"
 msgstr "ֵС"
 
-#: src/prefs.c:1505
+#: src/prefs.c:1508
 msgid "Gaim - Sound Configuration"
 msgstr "Gaim - "
 
-#: src/prefs.c:1540
+#: src/prefs.c:1543
 #, fuzzy
 msgid "Test"
 msgstr ""
 
-#: src/prefs.c:1550
+#: src/prefs.c:1553
 msgid "Choose..."
 msgstr "ѡ"
 
-#: src/prefs.c:1607
+#: src/prefs.c:1621
 msgid "Sound Options"
 msgstr "ѡ"
 
-#: src/prefs.c:1635
+#: src/prefs.c:1649
 msgid "No sounds when you log in"
 msgstr "ĵؽȥǹزҪ"
 
-#: src/prefs.c:1641 src/prefs.c:1910
+#: src/prefs.c:1655 src/prefs.c:1922
 msgid "Sounds while away"
 msgstr "뿪ʱ"
 
-#: src/prefs.c:1651
+#: src/prefs.c:1665
 #, fuzzy
 msgid "Sound method"
 msgstr ""
 
-#: src/prefs.c:1725
+#: src/prefs.c:1739
 #, fuzzy, c-format
 msgid ""
 "Sound command\n"
@@ -2952,104 +3433,104 @@
 "\n"
 "(ļ·ʹ %s; Ϊʹڲ)"
 
-#: src/prefs.c:1737
+#: src/prefs.c:1751
 #, fuzzy
 msgid "Sound played when:"
 msgstr ""
 
-#: src/prefs.c:1881 src/prefs.c:2939
+#: src/prefs.c:1893 src/prefs.c:2953
 msgid "Away Messages"
 msgstr "ʱ뿪Ϣ"
 
-#: src/prefs.c:1918
+#: src/prefs.c:1930
 msgid "Don't send auto-response"
 msgstr "ҪԶظ"
 
-#: src/prefs.c:1919
+#: src/prefs.c:1931
 msgid "Only send auto-response when idle"
 msgstr "ֻڷʱŷԶظ"
 
-#: src/prefs.c:1934
+#: src/prefs.c:1946
 msgid "Time between sending auto-responses (in seconds):"
 msgstr "Զظļ ()"
 
-#: src/prefs.c:1949
+#: src/prefs.c:1961
 msgid "Auto Away after"
 msgstr "Զ"
 
-#: src/prefs.c:1963
+#: src/prefs.c:1975
 msgid "minutes using"
 msgstr "ʱʹ"
 
-#: src/prefs.c:1976
+#: src/prefs.c:1988
 msgid "Messages"
 msgstr "Ϣ"
 
-#: src/prefs.c:2033
+#: src/prefs.c:2045
 msgid "Edit"
 msgstr "༭"
 
-#: src/prefs.c:2037
+#: src/prefs.c:2049
 msgid "Make Away"
 msgstr "趨Ϊʱ뿪"
 
-#: src/prefs.c:2314
+#: src/prefs.c:2326
 msgid "Privacy Options"
 msgstr "˽ѡ"
 
-#: src/prefs.c:2330
+#: src/prefs.c:2342
 msgid "Set privacy for:"
 msgstr "˽ѡΪ"
 
-#: src/prefs.c:2349
+#: src/prefs.c:2361
 msgid "Allow all users to contact me"
 msgstr "еûϵ"
 
-#: src/prefs.c:2350
+#: src/prefs.c:2362
 msgid "Allow only the users below"
 msgstr "ֻûϵ"
 
-#: src/prefs.c:2352
+#: src/prefs.c:2364
 msgid "Allow List"
 msgstr "ûб"
 
-#: src/prefs.c:2383
+#: src/prefs.c:2395
 msgid "Deny all users"
 msgstr "ܾûϵ"
 
-#: src/prefs.c:2384
+#: src/prefs.c:2396
 msgid "Block the users below"
 msgstr "סЩһ"
 
-#: src/prefs.c:2386
+#: src/prefs.c:2398
 msgid "Block List"
 msgstr "סļһ"
 
-#: src/prefs.c:2481
+#: src/prefs.c:2493
 msgid "Gaim - Preferences"
 msgstr "Gaim - 趨"
 
-#: src/prefs.c:2564
+#: src/prefs.c:2576
 msgid "Gaim debug output window"
 msgstr "Gaim "
 
-#: src/prefs.c:2873
+#: src/prefs.c:2887
 msgid "General"
 msgstr "һ趨"
 
-#: src/prefs.c:2878
+#: src/prefs.c:2892
 msgid "Proxy"
 msgstr ""
 
-#: src/prefs.c:2902
+#: src/prefs.c:2916
 msgid "Conversations"
 msgstr "Ի"
 
-#: src/prefs.c:2928
+#: src/prefs.c:2942
 msgid "Sounds"
 msgstr ""
 
-#: src/prefs.c:2950
+#: src/prefs.c:2964
 msgid "Privacy"
 msgstr "˽"
 
@@ -3091,34 +3572,34 @@
 msgid "Open Mail"
 msgstr ""
 
-#: src/prpl.c:564
+#: src/prpl.c:570
 #, fuzzy, c-format
-msgid "%s%s%s%s has made %s their buddy%s%s%s"
+msgid "%s%s%s%s has made %s his or her buddy%s%s%s"
 msgstr "%s has made %s their buddy%s%s"
 
-#: src/prpl.c:572
+#: src/prpl.c:578
 msgid ""
 "\n"
 "\n"
-"Do you wish to add them to your buddy list?"
+"Do you wish to add him or her to your buddy list?"
 msgstr ""
 
-#: src/prpl.c:615
+#: src/prpl.c:621
 msgid ""
 "You do not currently have any protocols available that are able to register "
 "new accounts."
 msgstr ""
 
-#: src/prpl.c:652
+#: src/prpl.c:658
 #, fuzzy
 msgid "Gaim - Registration"
 msgstr "Gaim - ûע"
 
-#: src/prpl.c:667
+#: src/prpl.c:673
 msgid "Registration Information"
 msgstr ""
 
-#: src/prpl.c:684
+#: src/prpl.c:690
 msgid "Register"
 msgstr "ע"
 
@@ -3148,11 +3629,65 @@
 msgid "No"
 msgstr "No"
 
-#: src/server.c:1054
+#: src/server.c:1076
 #, fuzzy
 msgid "More Info"
 msgstr "ûϸ"
 
+#: src/sound.c:63
+#, fuzzy
+msgid "Buddy logs in"
+msgstr "ͼ"
+
+#: src/sound.c:64
+#, fuzzy
+msgid "Buddy logs out"
+msgstr "ӵѣ"
+
+#: src/sound.c:65
+#, fuzzy
+msgid "Message received"
+msgstr "յϢʱ"
+
+#: src/sound.c:66
+#, fuzzy
+msgid "Message received begins conversation"
+msgstr "µĶԻʱ"
+
+#: src/sound.c:67
+#, fuzzy
+msgid "Message sent"
+msgstr "Ϣ"
+
+#: src/sound.c:68
+msgid "Person enters chat"
+msgstr ""
+
+#: src/sound.c:69
+msgid "Person leaves chat"
+msgstr ""
+
+#: src/sound.c:70
+msgid "You talk in chat"
+msgstr ""
+
+#: src/sound.c:71
+msgid "Others talk in chat"
+msgstr ""
+
+#: src/sound.c:74
+msgid "Someone says your name in chat"
+msgstr ""
+
+#~ msgid "Enable sounds"
+#~ msgstr ""
+
+#~ msgid "KFM"
+#~ msgstr "KFM"
+
+#~ msgid "Manual"
+#~ msgstr "ûֲ"
+
 #~ msgid "Events"
 #~ msgstr "¼Ч"
 
@@ -3162,12 +3697,6 @@
 #~ msgid "Sound when buddy logs out"
 #~ msgstr "ѵdz"
 
-#~ msgid "Sound when received message begins conversation"
-#~ msgstr "µĶԻʱ"
-
-#~ msgid "Sound when message is received"
-#~ msgstr "յϢʱ"
-
 #~ msgid "Sound when message is sent"
 #~ msgstr "Ϣʱ"
 
@@ -3238,35 +3767,18 @@
 #~ msgstr "ڳԵ¼ %s\n"
 
 #~ msgid ""
-#~ "Unfortunately, currently Oscar only allows new user registration by going to "
-#~ "http://aim.aol.com/aimnew/Aim/register.adp?promo=106723&pageset=Aim&client=no"
-#~ ". Clicking the Register button will open the URL for you."
+#~ "Unfortunately, currently Oscar only allows new user registration by going "
+#~ "to http://aim.aol.com/aimnew/Aim/register.adp?"
+#~ "promo=106723&pageset=Aim&client=no. Clicking the Register button will "
+#~ "open the URL for you."
 #~ msgstr ""
 #~ "ܲңڰ˹ֻͨ WEB ҳûעᣬԿ "
-#~ "http://aim.aol.com/aimnew/Aim/register.adp?promo=106723&pageset=Aim&client=no"
-#~ "עᡱťעᡣ"
-
-#~ msgid "Plugin Error"
-#~ msgstr ""
+#~ "http://aim.aol.com/aimnew/Aim/register.adp?"
+#~ "promo=106723&pageset=Aim&client=noעᡱťעᡣ"
 
 #~ msgid "Tabbed Window Options"
 #~ msgstr "ҳѡ"
 
-#~ msgid "Gaim Chat"
-#~ msgstr "Gaim "
-
-#~ msgid "Chat Rooms"
-#~ msgstr ""
-
-#~ msgid "Refresh"
-#~ msgstr "ˢ"
-
-#~ msgid "List of available chats"
-#~ msgstr "б"
-
-#~ msgid "List of subscribed chats"
-#~ msgstr "ĵб"
-
 #~ msgid "Font Style"
 #~ msgstr "ʽ"
 
@@ -3289,13 +3801,15 @@
 #~ msgstr ""
 
 #~ msgid ""
-#~ "Unfortunately, currently TOC only allows new user registration by going to "
-#~ "http://aim.aol.com/aimnew/Aim/register.adp?promo=106723&pageset=Aim&client=no"
-#~ ". Clicking the Register button will open the URL for you."
+#~ "Unfortunately, currently TOC only allows new user registration by going "
+#~ "to http://aim.aol.com/aimnew/Aim/register.adp?"
+#~ "promo=106723&pageset=Aim&client=no. Clicking the Register button will "
+#~ "open the URL for you."
 #~ msgstr ""
-#~ "Unfortunately, currently TOC only allows new user registration by going to "
-#~ "http://aim.aol.com/aimnew/Aim/register.adp?promo=106723&pageset=Aim&client=no"
-#~ ". Clicking the Register button will open the URL for you."
+#~ "Unfortunately, currently TOC only allows new user registration by going "
+#~ "to http://aim.aol.com/aimnew/Aim/register.adp?"
+#~ "promo=106723&pageset=Aim&client=no. Clicking the Register button will "
+#~ "open the URL for you."
 
 #~ msgid "Gaim - Change MSN Name"
 #~ msgstr "Gaim -  MSN "
@@ -3384,9 +3898,6 @@
 #~ msgid "Error Resolving Mail Server.\n"
 #~ msgstr "ʷʱ\n"
 
-#~ msgid "Buddy To Pounce:"
-#~ msgstr "ӵѣ"
-
 #~ msgid "Message to send:"
 #~ msgstr "Ϣ"
 
--- a/po/zh_TW.po	Tue Jul 02 05:41:30 2002 +0000
+++ b/po/zh_TW.po	Tue Jul 02 05:42:26 2002 +0000
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 0.1 for gaim-0.5.7\n"
-"POT-Creation-Date: 2002-04-26 01:28-0400\n"
+"POT-Creation-Date: 2002-06-25 00:10-0400\n"
 "PO-Revision-Date: 2002-05-18 04:21+0800\n"
 "Last-Translator: Paladin Liu <paladin@ms1.hinet.net>\n"
 "Language-Team: z10n <z10n>\n"
@@ -16,7 +16,87 @@
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/protocols/gg/gg.c:71
+#: plugins/chatlist.c:67 src/buddy_chat.c:272
+msgid "Buddy Chat"
+msgstr "與好友聊天"
+
+#: plugins/chatlist.c:166 plugins/chatlist.c:168 plugins/chatlist.c:407
+#: plugins/chatlist.c:409
+#, fuzzy
+msgid "Gaim Chat"
+msgstr "Gaim - 聊天"
+
+#: plugins/chatlist.c:339 src/about.c:165 src/aim.c:320 src/buddy.c:2716
+#: src/buddy_chat.c:1322 src/buddy_chat.c:1419 src/buddy_chat.c:1449
+#: src/conversation.c:2864 src/dialogs.c:567 src/dialogs.c:3899
+#: src/multi.c:1069 src/plugins.c:277 src/prefs.c:2547 src/prpl.c:438
+#: src/prpl.c:685 src/server.c:1072
+msgid "Close"
+msgstr "關閉"
+
+#: plugins/chatlist.c:344
+#, fuzzy
+msgid "Chat Rooms"
+msgstr "聊天選項"
+
+#: plugins/chatlist.c:363
+msgid "Refresh"
+msgstr ""
+
+#. Put the buttons in the box
+#: plugins/chatlist.c:364 src/buddy.c:492 src/buddy.c:2827
+#: src/buddy_chat.c:1454 src/conversation.c:2389 src/conversation.c:2879
+#: src/dialogs.c:932 src/dialogs.c:1114 src/dialogs.c:2095 src/multi.c:1053
+#: src/prefs.c:2041 src/prefs.c:2383 src/prefs.c:2417
+msgid "Add"
+msgstr "增加"
+
+#: plugins/chatlist.c:365 src/buddy.c:494 src/buddy.c:2829
+#: src/buddy_chat.c:1456 src/conversation.c:2375 src/conversation.c:2876
+#: src/prefs.c:2055 src/prefs.c:2387 src/prefs.c:2421
+msgid "Remove"
+msgstr "移除"
+
+#: plugins/chatlist.c:388
+msgid "List of available chats"
+msgstr ""
+
+#: plugins/chatlist.c:398
+msgid "List of subscribed chats"
+msgstr ""
+
+#: plugins/gtik.c:699
+msgid "Gnome Stock Ticker Properties"
+msgstr ""
+
+#: plugins/gtik.c:711
+msgid "Update Frequency in min"
+msgstr ""
+
+#: plugins/gtik.c:727
+msgid "Enter symbols delimited with \"+\" in the box below."
+msgstr ""
+
+#. OUTPUT FORMAT and SCROLL DIRECTION
+#: plugins/gtik.c:737
+msgid "Check this box to display only symbols and price:"
+msgstr ""
+
+#: plugins/gtik.c:738
+msgid "Check this box to scroll left to right:"
+msgstr ""
+
+#: plugins/gtik.c:974
+#, fuzzy
+msgid "(No"
+msgstr "No"
+
+#: plugins/gtik.c:975
+#, fuzzy
+msgid "Change"
+msgstr "Channel:"
+
+#: src/protocols/gg/gg.c:71 src/protocols/msn/msn.c:1919
 msgid "Available"
 msgstr ""
 
@@ -24,12 +104,8 @@
 msgid "Available for friends only"
 msgstr "只有好友可以看到我上線"
 
-#: src/applet.c:293
-#: src/buddy.c:494
-#: src/buddy.c:2513
-#: src/buddy.c:2649
-#: src/protocols/gg/gg.c:73
-#: src/protocols/jabber/jabber.c:703
+#: src/applet.c:197 src/buddy.c:497 src/buddy.c:2582 src/buddy.c:2727
+#: src/protocols/gg/gg.c:73 src/protocols/jabber/jabber.c:1118
 msgid "Away"
 msgstr "離開"
 
@@ -45,8 +121,7 @@
 msgid "Invisible for friends only"
 msgstr "隱身(只好好友可以看到我)"
 
-#: src/protocols/gg/gg.c:77
-#: src/protocols/jabber/jabber.c:699
+#: src/protocols/gg/gg.c:77 src/protocols/jabber/jabber.c:1114
 msgid "Unavailable"
 msgstr ""
 
@@ -78,7 +153,8 @@
 msgid "Unknown Error Code."
 msgstr "未知的錯誤代碼。"
 
-#: src/protocols/gg/gg.c:302
+#: src/protocols/gg/gg.c:302 src/protocols/msn/msn.c:2050
+#, c-format
 msgid "Status: %s"
 msgstr "狀態:%s"
 
@@ -139,6 +215,7 @@
 msgstr "無效的 Gadu-Gadu UIN 定義"
 
 #: src/protocols/gg/gg.c:570
+#, c-format
 msgid "Connect to %s failed"
 msgstr "連結到 %s 失敗"
 
@@ -146,20 +223,13 @@
 msgid "You are trying to send a message to an invalid Gadu-Gadu UIN."
 msgstr "您試圖對無效的 Gadu-Gadu UIN 送出一個訊息。"
 
-#: src/protocols/gg/gg.c:595
-#: src/protocols/gg/gg.c:657
-#: src/protocols/gg/gg.c:762
-#: src/protocols/gg/gg.c:768
-#: src/protocols/gg/gg.c:821
-#: src/protocols/gg/gg.c:833
-#: src/protocols/gg/gg.c:845
-#: src/protocols/gg/gg.c:956
-#: src/protocols/gg/gg.c:984
-#: src/protocols/gg/gg.c:1043
-#: src/protocols/gg/gg.c:1066
-#: src/protocols/gg/gg.c:1116
-#: src/protocols/gg/gg.c:1149
-#: src/protocols/gg/gg.c:1214
+#: src/protocols/gg/gg.c:595 src/protocols/gg/gg.c:657
+#: src/protocols/gg/gg.c:762 src/protocols/gg/gg.c:768
+#: src/protocols/gg/gg.c:821 src/protocols/gg/gg.c:833
+#: src/protocols/gg/gg.c:845 src/protocols/gg/gg.c:956
+#: src/protocols/gg/gg.c:984 src/protocols/gg/gg.c:1043
+#: src/protocols/gg/gg.c:1066 src/protocols/gg/gg.c:1116
+#: src/protocols/gg/gg.c:1149 src/protocols/gg/gg.c:1214
 msgid "Gadu-Gadu Error"
 msgstr "Gadu-Gadu 錯誤"
 
@@ -199,21 +269,17 @@
 msgid "Nick"
 msgstr "暱稱"
 
-#: src/protocols/gg/gg.c:712
-#: src/protocols/gg/gg.c:715
+#: src/protocols/gg/gg.c:712 src/protocols/gg/gg.c:715
 msgid "Birth year"
 msgstr "出生年"
 
-#: src/protocols/gg/gg.c:721
-#: src/protocols/gg/gg.c:723
+#: src/protocols/gg/gg.c:721 src/protocols/gg/gg.c:723
 #: src/protocols/gg/gg.c:725
 msgid "Sex"
 msgstr "性別"
 
 #. Line 5
-#: src/dialogs.c:1584
-#: src/dialogs.c:2292
-#: src/protocols/gg/gg.c:729
+#: src/dialogs.c:1624 src/dialogs.c:2332 src/protocols/gg/gg.c:729
 msgid "City"
 msgstr "城市"
 
@@ -229,8 +295,7 @@
 msgid "Buddy List successfully transferred to server"
 msgstr "成功的將好朋名單傳送到伺服器上"
 
-#: src/protocols/gg/gg.c:816
-#: src/protocols/gg/gg.c:828
+#: src/protocols/gg/gg.c:816 src/protocols/gg/gg.c:828
 #: src/protocols/gg/gg.c:840
 msgid "Gadu-Gadu Information"
 msgstr "Gadu-Gadu 資訊"
@@ -260,49 +325,52 @@
 msgstr "無法送出 HTTP 要求"
 
 #: src/protocols/gg/gg.c:982
+#, c-format
 msgid "Buddies List import from Server failed (%s)"
 msgstr "自伺服器上匯入好友名單失敗(%s)"
 
 #: src/protocols/gg/gg.c:1041
+#, c-format
 msgid "Buddies List export to Server failed (%s)"
 msgstr "匯出好友名單到伺服器上失敗(%s)"
 
 #: src/protocols/gg/gg.c:1064
+#, c-format
 msgid "Deletion of Buddies List from Server failed (%s)"
 msgstr "刪除伺服器上的好友名單失敗(%s)"
 
-#: src/protocols/gg/gg.c:1114
-#: src/protocols/gg/gg.c:1212
+#: src/protocols/gg/gg.c:1114 src/protocols/gg/gg.c:1212
+#, c-format
 msgid "Connect to search service failed (%s)"
 msgstr "連線到搜尋服務失敗(%s)"
 
 #: src/protocols/gg/gg.c:1147
+#, c-format
 msgid "Changing Password failed (%s)"
 msgstr "修改密碼失敗(%s)"
 
-#: src/protocols/gg/gg.c:1158
-#: src/protocols/gg/gg.c:1175
+#: src/protocols/gg/gg.c:1158 src/protocols/gg/gg.c:1175
 msgid "Directory Search"
 msgstr ""
 
-#: src/dialogs.c:1701
-#: src/protocols/gg/gg.c:1160
-#: src/protocols/gg/gg.c:1177
+#.
+#. } else if (!strcmp(act, _("Set Dir Info"))) {
+#. show_set_dir(gc);
+#.
+#: src/dialogs.c:1741 src/protocols/gg/gg.c:1160 src/protocols/gg/gg.c:1177
+#: src/protocols/jabber/jabber.c:3748 src/protocols/jabber/jabber.c:3761
 msgid "Change Password"
 msgstr "修改密碼"
 
-#: src/protocols/gg/gg.c:1162
-#: src/protocols/gg/gg.c:1179
+#: src/protocols/gg/gg.c:1162 src/protocols/gg/gg.c:1179
 msgid "Import Buddies List from Server"
 msgstr "自伺服器上匯入好友名單"
 
-#: src/protocols/gg/gg.c:1164
-#: src/protocols/gg/gg.c:1180
+#: src/protocols/gg/gg.c:1164 src/protocols/gg/gg.c:1180
 msgid "Export Buddies List to Server"
 msgstr "匯出好友名單到伺服器上"
 
-#: src/protocols/gg/gg.c:1166
-#: src/protocols/gg/gg.c:1181
+#: src/protocols/gg/gg.c:1166 src/protocols/gg/gg.c:1181
 msgid "Delete Buddies List from Server"
 msgstr "將伺服器上的好友名單刪除"
 
@@ -310,21 +378,19 @@
 msgid "Send message through server"
 msgstr "透過伺服器傳送訊息"
 
-#: src/protocols/icq/gaim_icq.c:469
-#: src/protocols/irc/irc.c:1851
-#: src/protocols/jabber/jabber.c:2163
-#: src/protocols/oscar/oscar.c:3432
-#: src/protocols/toc/toc.c:1216
+#: src/protocols/icq/gaim_icq.c:469 src/protocols/irc/irc.c:1851
+#: src/protocols/jabber/jabber.c:2860 src/protocols/oscar/oscar.c:3593
+#: src/protocols/toc/toc.c:1219
 msgid "Get Info"
 msgstr "取得資訊"
 
-#: src/protocols/irc/irc.c:444
-#: src/protocols/irc/irc.c:1783
+#: src/protocols/irc/irc.c:444 src/protocols/irc/irc.c:1783
+#, c-format
 msgid "DCC Chat with %s closed"
 msgstr ""
 
-#: src/protocols/irc/irc.c:572
-#: src/protocols/irc/irc.c:1144
+#: src/protocols/irc/irc.c:572 src/protocols/irc/irc.c:1144
+#, c-format
 msgid "<B>%s has changed the topic to: %s</B>"
 msgstr "<B>%s 把聊天主題修改為:%s</B>"
 
@@ -332,10 +398,8 @@
 msgid "No such nick/channel"
 msgstr "沒有那個暱稱或頻道"
 
-#: src/protocols/irc/irc.c:825
-#: src/protocols/irc/irc.c:828
-#: src/protocols/irc/irc.c:830
-#: src/protocols/irc/irc.c:1073
+#: src/protocols/irc/irc.c:825 src/protocols/irc/irc.c:828
+#: src/protocols/irc/irc.c:830 src/protocols/irc/irc.c:1073
 msgid "IRC Error"
 msgstr "IRC 錯誤"
 
@@ -348,22 +412,28 @@
 msgstr "沒有給定暱名"
 
 #: src/protocols/irc/irc.c:976
-msgid "%s has requested a DCC chat.  Would you like to establish the direct connection?"
+#, c-format
+msgid ""
+"%s has requested a DCC chat.  Would you like to establish the direct "
+"connection?"
 msgstr "%s 要求和您用 DCC 來聊天。您想接受他的邀請嗎?"
 
-#: src/protocols/irc/irc.c:1001
+#: src/protocols/irc/irc.c:1001 src/protocols/msn/msn.c:315
 msgid "Unable to write"
 msgstr "無法寫入"
 
 #: src/protocols/irc/irc.c:1071
+#, c-format
 msgid "You have been kicked from %s: %s"
 msgstr "%s 正在呼叫您:%s"
 
 #: src/protocols/irc/irc.c:1076
+#, c-format
 msgid "Kicked by %s: %s"
 msgstr "被 %s 呼叫:%s"
 
 #: src/protocols/irc/irc.c:1581
+#, c-format
 msgid "You have left %s"
 msgstr "您離開了 %s"
 
@@ -375,8 +445,7 @@
 msgid "Channel:"
 msgstr "Channel:"
 
-#: src/multi.c:547
-#: src/protocols/irc/irc.c:1675
+#: src/multi.c:549 src/protocols/irc/irc.c:1675
 msgid "Password:"
 msgstr "密碼:"
 
@@ -384,526 +453,842 @@
 msgid "DCC Chat"
 msgstr "DCC 聊天"
 
-#: src/buddy.c:2806
-#: src/protocols/jabber/jabber.c:705
-#: src/protocols/jabber/jabber.c:723
+#: src/protocols/jabber/jabber.c:942
+msgid "Incorrect current password! Password NOT Changed!"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:943 src/protocols/jabber/jabber.c:948
+#, fuzzy
+msgid "Password Change Error!"
+msgstr "Gaim - 修改密碼"
+
+#: src/protocols/jabber/jabber.c:947
+msgid "New password same as old password! Password NOT Changed!"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1092
+msgid "Unknown"
+msgstr "未知"
+
+#: src/buddy.c:2887 src/protocols/jabber/jabber.c:1120
+#: src/protocols/jabber/jabber.c:1138
 msgid "Online"
 msgstr "上線"
 
-#: src/protocols/jabber/jabber.c:707
+#: src/protocols/jabber/jabber.c:1122
 msgid "Extended Away"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:709
+#: src/protocols/jabber/jabber.c:1124
 msgid "Do Not Disturb"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1091
+#: src/protocols/jabber/jabber.c:1434
+#, c-format
+msgid "Error %s: %s"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1437
+#, fuzzy
+msgid "Unknown Error in presence"
+msgstr "未知的錯誤代碼。"
+
+#: src/protocols/jabber/jabber.c:1607
+#, fuzzy, c-format
+msgid "The user %s wants to add you to their buddy list."
+msgstr ""
+"\n"
+"\n"
+"您想將他(她)加入到您的好友名單中嗎?"
+
+#: src/protocols/jabber/jabber.c:1632
 msgid "No such user"
 msgstr "沒有這個使用者"
 
-#: src/protocols/jabber/jabber.c:1093
+#: src/protocols/jabber/jabber.c:1634 src/protocols/jabber/jabber.c:2341
+#: src/protocols/jabber/jabber.c:2506
 msgid "Jabber Error"
 msgstr "Jabber 錯誤"
 
-#: src/dialogs.c:847
-#: src/protocols/jabber/jabber.c:1173
+#: src/dialogs.c:887 src/protocols/jabber/jabber.c:1719
+#: src/protocols/msn/msn.c:1110
 msgid "Buddies"
 msgstr "好友"
 
-#: src/protocols/jabber/jabber.c:1239
+#: src/protocols/jabber/jabber.c:1782
 msgid "Authenticating"
 msgstr "認證中"
 
-#: src/protocols/jabber/jabber.c:1276
+#: src/protocols/jabber/jabber.c:1819
 msgid "Unknown login error"
 msgstr "未知的登入錯誤"
 
-#: src/protocols/jabber/jabber.c:1506
-#: src/protocols/jabber/jabber.c:2954
+#: src/protocols/jabber/jabber.c:2010
+#, fuzzy
+msgid "Password successfully changed."
+msgstr "密碼修改成功"
+
+#: src/protocols/jabber/jabber.c:2012
+#, fuzzy
+msgid "Password Change"
+msgstr "Gaim - 修改密碼"
+
+#: src/protocols/jabber/jabber.c:2054 src/protocols/jabber/jabber.c:3676
 msgid "Connection lost"
 msgstr "失去連線"
 
-#: src/protocols/jabber/jabber.c:1508
-#: src/protocols/jabber/jabber.c:1540
-#: src/protocols/jabber/jabber.c:2956
-#: src/protocols/jabber/jabber.c:3002
+#: src/protocols/jabber/jabber.c:2056 src/protocols/jabber/jabber.c:2088
+#: src/protocols/jabber/jabber.c:3678 src/protocols/jabber/jabber.c:3724
+#: src/protocols/msn/msn.c:1741 src/protocols/msn/msn.c:1770
 msgid "Unable to connect"
 msgstr "無法連線"
 
-#: src/protocols/jabber/jabber.c:1514
+#: src/protocols/jabber/jabber.c:2062
 msgid "Connected"
 msgstr "連線成功"
 
-#: src/protocols/jabber/jabber.c:1517
+#: src/protocols/jabber/jabber.c:2065
 msgid "Requesting Authentication Method"
 msgstr "要求認證的方式"
 
-#: src/protocols/jabber/jabber.c:1535
+#. we have no chats yet
+#: src/protocols/jabber/jabber.c:2083 src/protocols/msn/msn.c:1762
 msgid "Connecting"
 msgstr "連線中"
 
-#: src/protocols/jabber/jabber.c:1834
+#: src/protocols/jabber/jabber.c:2340 src/protocols/jabber/jabber.c:2505
+#, fuzzy
+msgid "Invalid Jabber I.D."
+msgstr "無效的名稱"
+
+#: src/protocols/jabber/jabber.c:2473
 msgid "Room:"
 msgstr "聊天室:"
 
-#: src/protocols/jabber/jabber.c:1838
+#: src/protocols/jabber/jabber.c:2477
 msgid "Server:"
 msgstr "伺服器:"
 
-#: src/protocols/jabber/jabber.c:1843
+#: src/protocols/jabber/jabber.c:2482
 msgid "Handle:"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:2113
-#: src/protocols/jabber/jabber.c:2452
-msgid "Unknown"
-msgstr "未知"
-
-#: src/buddy_chat.c:875
-#: src/protocols/jabber/jabber.c:2168
-#: src/protocols/oscar/oscar.c:3439
+#: src/protocols/jabber/jabber.c:2539
+#, fuzzy
+msgid "Chats"
+msgstr "聊天"
+
+#: src/protocols/jabber/jabber.c:2854
+#, fuzzy
+msgid "View Error Msg"
+msgstr "觀看日誌"
+
+#: src/buddy_chat.c:886 src/protocols/jabber/jabber.c:2865
+#: src/protocols/oscar/oscar.c:3606
 msgid "Get Away Msg"
 msgstr "取得離線訊息"
 
-#: src/protocols/jabber/jabber.c:2350
+#: src/protocols/jabber/jabber.c:2882
+msgid "Remove From Roster"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:3076
 msgid "Full Name"
 msgstr "全名"
 
-#: src/protocols/jabber/jabber.c:2351
+#: src/protocols/jabber/jabber.c:3077
 msgid "Family Name"
 msgstr "姓"
 
-#: src/protocols/jabber/jabber.c:2352
+#: src/protocols/jabber/jabber.c:3078
 msgid "Given Name"
 msgstr "給予一個名字"
 
-#: src/protocols/jabber/jabber.c:2353
+#: src/protocols/jabber/jabber.c:3079
 msgid "Nickname"
 msgstr "暱稱"
 
-#: src/dialogs.c:2485
-#: src/protocols/jabber/jabber.c:2354
+#: src/dialogs.c:2525 src/protocols/jabber/jabber.c:3080
 msgid "URL"
 msgstr "URL"
 
-#: src/protocols/jabber/jabber.c:2355
+#: src/protocols/jabber/jabber.c:3081
 msgid "Street Address"
 msgstr "街道地址"
 
-#: src/protocols/jabber/jabber.c:2356
+#: src/protocols/jabber/jabber.c:3082
 msgid "Extended Address"
 msgstr "其他地址"
 
-#: src/protocols/jabber/jabber.c:2357
+#: src/protocols/jabber/jabber.c:3083
 msgid "Locality"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:2358
+#: src/protocols/jabber/jabber.c:3084
 msgid "Region"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:2359
+#: src/protocols/jabber/jabber.c:3085
 msgid "Postal Code"
 msgstr "郵遞區號"
 
 #. Line 7
-#: src/dialogs.c:1606
-#: src/dialogs.c:2314
-#: src/protocols/jabber/jabber.c:2360
+#: src/dialogs.c:1646 src/dialogs.c:2354 src/protocols/jabber/jabber.c:3086
 msgid "Country"
 msgstr "國家"
 
-#: src/protocols/jabber/jabber.c:2361
+#: src/protocols/jabber/jabber.c:3087
 msgid "Telephone"
 msgstr "電話"
 
-#: src/dialogs.c:2390
-#: src/protocols/jabber/jabber.c:2362
+#: src/dialogs.c:2430 src/protocols/jabber/jabber.c:3088
 msgid "Email"
 msgstr "電子郵件"
 
-#: src/protocols/jabber/jabber.c:2363
+#: src/protocols/jabber/jabber.c:3089
 msgid "Organization Name"
 msgstr "組織名稱"
 
-#: src/protocols/jabber/jabber.c:2364
+#: src/protocols/jabber/jabber.c:3090
 msgid "Organization Unit"
 msgstr "組織單位"
 
-#: src/prefs.c:1989
-#: src/protocols/jabber/jabber.c:2365
+#: src/prefs.c:2000 src/protocols/jabber/jabber.c:3091
 msgid "Title"
 msgstr "離開原因的標題"
 
-#: src/protocols/jabber/jabber.c:2366
+#: src/protocols/jabber/jabber.c:3092
 msgid "Role"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:2367
+#: src/protocols/jabber/jabber.c:3093
 msgid "Birthday"
 msgstr "生日"
 
 #. Right side: frame with description and the filepath of plugin
-#: src/dialogs.c:2493
-#: src/plugins.c:211
-#: src/protocols/jabber/jabber.c:2368
+#: src/dialogs.c:2533 src/plugins.c:211 src/protocols/jabber/jabber.c:3094
 msgid "Description"
 msgstr "描述"
 
-#: src/protocols/jabber/jabber.c:2393
-msgid "All items below are optional. Enter only the information with which you feel comfortable"
+#: src/protocols/jabber/jabber.c:3119
+msgid ""
+"All items below are optional. Enter only the information with which you feel "
+"comfortable"
 msgstr "以下所有的欄位都是選擇性的。您只要輸入您想輸入您想填入的訊息即可"
 
-#: src/protocols/jabber/jabber.c:2394
+#: src/protocols/jabber/jabber.c:3120
 msgid "User Identity"
 msgstr "使用者識別"
 
-#: src/protocols/jabber/jabber.c:2810
+#: src/protocols/jabber/jabber.c:3532
 msgid "Gaim - Edit Jabber vCard"
 msgstr "Gaim - 編輯 Jabber vCard"
 
-#: src/protocols/jabber/jabber.c:2884
+#: src/protocols/jabber/jabber.c:3606
 msgid "Server Registration successful!"
 msgstr "伺服器註冊成功!"
 
-#: src/protocols/jabber/jabber.c:2911
+#: src/protocols/jabber/jabber.c:3633
 msgid "Unknown registration error"
 msgstr "未知的註冊錯誤"
 
-#: src/protocols/jabber/jabber.c:3020
-#: src/protocols/jabber/jabber.c:3035
+#: src/protocols/jabber/jabber.c:3742 src/protocols/jabber/jabber.c:3757
 msgid "Set User Info"
 msgstr "設定使用者資訊"
 
-#: src/protocols/msn/msn.c:738
-#: src/protocols/msn/msn.c:2165
-#: src/protocols/msn/msn.c:2198
+#: src/protocols/msn/msn.c:230
+msgid "Syntax Error (probably a Gaim bug)"
+msgstr ""
+
+#: src/protocols/msn/msn.c:233
+msgid "Invalid Parameter (probably a Gaim bug)"
+msgstr ""
+
+#: src/protocols/msn/msn.c:236
+#, fuzzy
+msgid "Invalid User"
+msgstr "無效的名稱"
+
+#: src/protocols/msn/msn.c:239
+msgid "Fully Qualified Domain Name missing"
+msgstr ""
+
+#: src/protocols/msn/msn.c:242
+msgid "Already Login"
+msgstr ""
+
+#: src/protocols/msn/msn.c:245
+#, fuzzy
+msgid "Invalid Username"
+msgstr "無效的名稱"
+
+#: src/protocols/msn/msn.c:248
+#, fuzzy
+msgid "Invalid Friendly Name"
+msgstr "無效的名稱"
+
+#: src/protocols/msn/msn.c:251
+msgid "List Full"
+msgstr ""
+
+#: src/protocols/msn/msn.c:254
+msgid "Already there"
+msgstr ""
+
+#: src/protocols/msn/msn.c:257
+#, fuzzy
+msgid "Not on list"
+msgstr "失去連線"
+
+#: src/protocols/msn/msn.c:260
+msgid "User is offline"
+msgstr ""
+
+#: src/protocols/msn/msn.c:263
+msgid "Already in the mode"
+msgstr ""
+
+#: src/protocols/msn/msn.c:266
+msgid "Already in opposite list"
+msgstr ""
+
+#: src/protocols/msn/msn.c:269
+msgid "Switchboard failed"
+msgstr ""
+
+#: src/protocols/msn/msn.c:272
+msgid "Notify Transfer failed"
+msgstr ""
+
+#: src/protocols/msn/msn.c:276
+msgid "Required fields missing"
+msgstr ""
+
+#: src/protocols/msn/msn.c:279
+#, fuzzy
+msgid "Not logged in"
+msgstr "%s 登入。"
+
+#: src/protocols/msn/msn.c:283
+#, fuzzy
+msgid "Internal server error"
+msgstr "內部錯誤"
+
+#: src/protocols/msn/msn.c:286
+msgid "Database server error"
+msgstr ""
+
+#: src/protocols/msn/msn.c:289
+#, fuzzy
+msgid "File operation error"
+msgstr "內部連結錯誤\n"
+
+#: src/protocols/msn/msn.c:292
+#, fuzzy
+msgid "Memory allocation error"
+msgstr "主要連結錯誤\n"
+
+#: src/protocols/msn/msn.c:296
+#, fuzzy
+msgid "Server busy"
+msgstr "伺服器:"
+
+#: src/protocols/msn/msn.c:299
+#, fuzzy
+msgid "Server unavailable"
+msgstr "目錄服務暫時不存在。"
+
+#: src/protocols/msn/msn.c:302
+msgid "Peer Notification server down"
+msgstr ""
+
+#: src/protocols/msn/msn.c:305
+#, fuzzy
+msgid "Database connect error"
+msgstr "內部連結錯誤\n"
+
+#: src/protocols/msn/msn.c:308
+msgid "Server is going down (abandon ship)"
+msgstr ""
+
+#: src/protocols/msn/msn.c:312
+#, fuzzy
+msgid "Error creating connection"
+msgstr "g003: 連線開啟錯誤。\n"
+
+#: src/protocols/msn/msn.c:318
+msgid "Session overload"
+msgstr ""
+
+#: src/protocols/msn/msn.c:321
+msgid "User is too active"
+msgstr ""
+
+#: src/protocols/msn/msn.c:324
+#, fuzzy
+msgid "Too many sessions"
+msgstr "匹配太多。"
+
+#: src/protocols/msn/msn.c:327
+msgid "Not expected"
+msgstr ""
+
+#: src/protocols/msn/msn.c:330
+msgid "Bad friend file"
+msgstr ""
+
+#: src/protocols/msn/msn.c:334
+#, fuzzy
+msgid "Authentication failed"
+msgstr "認證失敗。"
+
+#: src/protocols/msn/msn.c:337
+msgid "Not allowed when offline"
+msgstr ""
+
+#: src/protocols/msn/msn.c:340
+msgid "Not accepting new users"
+msgstr ""
+
+#: src/protocols/msn/msn.c:343
+msgid "User unverified"
+msgstr ""
+
+#: src/protocols/msn/msn.c:346
+#, fuzzy
+msgid "Unknown Error Code"
+msgstr "未知的錯誤代碼。"
+
+#: src/protocols/msn/msn.c:351 src/protocols/msn/msn.c:558
+#: src/protocols/msn/msn.c:813 src/protocols/msn/msn.c:2114
+#: src/protocols/msn/msn.c:2283 src/protocols/msn/msn.c:2336
 msgid "MSN Error"
 msgstr "MSN 錯誤"
 
-#: src/protocols/msn/msn.c:738
+#: src/protocols/msn/msn.c:558
+msgid "A message may not have been received."
+msgstr ""
+
+#: src/protocols/msn/msn.c:813
 msgid "Gaim was unable to send a message"
 msgstr "Gaim 無法送出訊息"
 
-#: src/protocols/msn/msn.c:1088
+#: src/protocols/msn/msn.c:917
+#, fuzzy, c-format
+msgid "The user %s (%s) wants to add %s to his or her buddy list."
+msgstr ""
+"\n"
+"\n"
+"您想將他(她)加入到您的好友名單中嗎?"
+
+#: src/protocols/msn/msn.c:1074
+#, c-format
+msgid "The user %s (%s) wants to add you to their buddy list"
+msgstr ""
+
+#: src/protocols/msn/msn.c:1175
 msgid "You have been disconnected. You have signed on from another location."
 msgstr "您被中斷連線,因為您由其他的地方登入。"
 
-#: src/protocols/msn/msn.c:2165
-#: src/protocols/msn/msn.c:2198
+#: src/protocols/msn/msn.c:1435 src/protocols/msn/msn.c:1679
+#, fuzzy
+msgid "Error reading from server"
+msgstr "讀取 Socket 時發生錯誤。"
+
+#: src/protocols/msn/msn.c:1568
+msgid "Requesting to send password"
+msgstr ""
+
+#: src/protocols/msn/msn.c:1618
+#, fuzzy
+msgid "Unable to send password"
+msgstr "無法讀取 Socket"
+
+#: src/protocols/msn/msn.c:1623
+#, fuzzy
+msgid "Password sent"
+msgstr "密  碼:"
+
+#: src/protocols/msn/msn.c:1748
+#, fuzzy
+msgid "Unable to write to server"
+msgstr "無法連線到伺服器。"
+
+#: src/protocols/msn/msn.c:1754
+#, fuzzy
+msgid "Synching with server"
+msgstr "向伺服器註冊"
+
+#: src/protocols/msn/msn.c:1920
+msgid "Away From Computer"
+msgstr ""
+
+#: src/protocols/msn/msn.c:1921
+msgid "Be Right Back"
+msgstr ""
+
+#: src/protocols/msn/msn.c:1922
+#, fuzzy
+msgid "Busy"
+msgstr "好友"
+
+#: src/protocols/msn/msn.c:1923
+msgid "On The Phone"
+msgstr ""
+
+#: src/protocols/msn/msn.c:1924
+msgid "Out To Lunch"
+msgstr ""
+
+#: src/protocols/msn/msn.c:1925
+#, fuzzy
+msgid "Hidden"
+msgstr "隱藏圖示"
+
+#: src/protocols/msn/msn.c:2041
+msgid "Reset friendly name"
+msgstr ""
+
+#: src/protocols/msn/msn.c:2114
+msgid "Friendly name too long."
+msgstr ""
+
+#: src/protocols/msn/msn.c:2129 src/protocols/msn/msn.c:2150
+#, fuzzy
+msgid "Set Friendly Name"
+msgstr "姓"
+
+#: src/protocols/msn/msn.c:2130
+#, fuzzy
+msgid "Set Friendly Name:"
+msgstr "帳  號:"
+
+#: src/protocols/msn/msn.c:2131
+msgid "Reset All Friendly Names"
+msgstr ""
+
+#: src/protocols/msn/msn.c:2283 src/protocols/msn/msn.c:2336
 msgid "Invalid name"
 msgstr "無效的名稱"
 
-#: src/protocols/napster/napster.c:450
-#: src/protocols/oscar/oscar.c:3071
-#: src/protocols/toc/toc.c:1101
+#: src/protocols/napster/napster.c:457 src/protocols/oscar/oscar.c:3209
+#: src/protocols/toc/toc.c:1104
 msgid "Join what group:"
 msgstr "加入群組:"
 
-#: src/protocols/oscar/oscar.c:329
+#: src/protocols/oscar/oscar.c:330
+#, c-format
 msgid "Direct IM with %s closed"
 msgstr "和 %s 的即時訊息關閉"
 
-#: src/protocols/oscar/oscar.c:331
+#: src/protocols/oscar/oscar.c:332
+#, c-format
 msgid "Direct IM with %s failed"
 msgstr "和 %s 的即時訊息失敗"
 
-#: src/protocols/oscar/oscar.c:369
+#: src/protocols/oscar/oscar.c:370
 msgid "connection error (rend)\n"
 msgstr "連線錯誤 (rend)\n"
 
-#: src/protocols/oscar/oscar.c:380
+#: src/protocols/oscar/oscar.c:381
 msgid "major connection error\n"
 msgstr "主要連結錯誤\n"
 
-#: src/protocols/oscar/oscar.c:381
-#: src/protocols/toc/toc.c:511
-#: src/protocols/toc/toc.c:524
-#: src/protocols/toc/toc.c:590
+#: src/protocols/oscar/oscar.c:382 src/protocols/toc/toc.c:511
+#: src/protocols/toc/toc.c:524 src/protocols/toc/toc.c:590
 msgid "Disconnected."
 msgstr "停止連線。"
 
-#: src/protocols/oscar/oscar.c:393
-#: src/protocols/toc/toc.c:761
+#: src/protocols/oscar/oscar.c:394 src/protocols/toc/toc.c:761
+#, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "您已經由聊天室 %s 停止連線。"
 
-#: src/protocols/oscar/oscar.c:394
+#: src/protocols/oscar/oscar.c:395
 msgid "Chat Error!"
 msgstr "聊天錯誤!"
 
-#: src/protocols/oscar/oscar.c:406
+#: src/protocols/oscar/oscar.c:407
 msgid "Chat is currently unavailable"
 msgstr "這個交談目前並不存在"
 
-#: src/protocols/oscar/oscar.c:407
+#: src/protocols/oscar/oscar.c:408
 msgid "Gaim - Chat"
 msgstr "Gaim - 聊天"
 
-#: src/protocols/oscar/oscar.c:466
-#: src/protocols/oscar/oscar.c:526
+#: src/protocols/oscar/oscar.c:467 src/protocols/oscar/oscar.c:527
 msgid "Couldn't connect to host"
 msgstr "無法連到伺服器"
 
-#: src/protocols/oscar/oscar.c:474
+#: src/protocols/oscar/oscar.c:475
 msgid "Password sent, waiting for response\n"
 msgstr "送出密碼,等待回應\n"
 
-#: src/protocols/oscar/oscar.c:507
+#: src/protocols/oscar/oscar.c:508
 msgid "internal connection error\n"
 msgstr "內部連結錯誤\n"
 
-#: src/protocols/oscar/oscar.c:508
+#: src/protocols/oscar/oscar.c:509
 msgid "Unable to login to AIM"
 msgstr "無法登入到 AIM"
 
-#: src/protocols/oscar/oscar.c:513
+#: src/protocols/oscar/oscar.c:514
+#, c-format
 msgid "Signon: %s"
 msgstr "登入:%s"
 
-#: src/protocols/oscar/oscar.c:585
+#: src/protocols/oscar/oscar.c:586
 msgid "Signed off.\n"
 msgstr "登出。\n"
 
-#: src/protocols/oscar/oscar.c:604
-#: src/protocols/oscar/oscar.c:728
+#: src/protocols/oscar/oscar.c:605 src/protocols/oscar/oscar.c:730
 msgid "Could Not Connect"
 msgstr "無法連線"
 
-#: src/protocols/oscar/oscar.c:612
+#: src/protocols/oscar/oscar.c:613
 msgid "Connection established, cookie sent"
 msgstr "連線建立,送出 Cookie"
 
 #. Incorrect nick/password
-#: src/protocols/oscar/oscar.c:638
-#: src/protocols/toc/toc.c:459
+#: src/protocols/oscar/oscar.c:639 src/protocols/toc/toc.c:459
 msgid "Incorrect nickname or password."
 msgstr "錯誤的暱稱或密碼"
 
 #. Suspended account
-#: src/protocols/oscar/oscar.c:643
+#: src/protocols/oscar/oscar.c:644
 msgid "Your account is currently suspended."
 msgstr "您的帳號目前停用中。"
 
 #. connecting too frequently
-#: src/protocols/oscar/oscar.c:647
-msgid "You have been connecting and disconnecting too frequently. Wait ten minutes and try again. If you continue to try, you will need to wait even longer."
-msgstr "您的連線/斷線動作太過頻繁。請等待十分鐘後再行重試。如果您依然繼續嘗試著連線,那麼您的等待時間將會更加的延長。"
+#: src/protocols/oscar/oscar.c:648
+msgid ""
+"You have been connecting and disconnecting too frequently. Wait ten minutes "
+"and try again. If you continue to try, you will need to wait even longer."
+msgstr ""
+"您的連線/斷線動作太過頻繁。請等待十分鐘後再行重試。如果您依然繼續嘗試著連"
+"線,那麼您的等待時間將會更加的延長。"
 
 #. client too old
-#: src/protocols/oscar/oscar.c:652
+#: src/protocols/oscar/oscar.c:653
 msgid "The client version you are using is too old. Please upgrade at "
 msgstr "您所使用的 Client 端程式太過老舊。請更新到"
 
-#: src/protocols/oscar/oscar.c:656
-#: src/protocols/toc/toc.c:542
+#: src/protocols/oscar/oscar.c:657 src/protocols/toc/toc.c:542
 msgid "Authentication Failed"
 msgstr "認證失敗"
 
-#: src/protocols/oscar/oscar.c:678
+#: src/protocols/oscar/oscar.c:679
 msgid "Internal Error"
 msgstr "內部錯誤"
 
-#: src/protocols/oscar/oscar.c:1246
-#: src/protocols/oscar/oscar.c:3282
+#: src/protocols/oscar/oscar.c:1248 src/protocols/oscar/oscar.c:3420
+#, c-format
 msgid "Direct IM with %s established"
 msgstr "和 %s 的即時訊息已經被建立"
 
-#: src/protocols/oscar/oscar.c:1492
-#: src/protocols/oscar/oscar.c:2367
-msgid "The user %lu has denied your request to add them to your contact list for the following reason:\n"
+#: src/protocols/oscar/oscar.c:1504 src/protocols/oscar/oscar.c:2456
+#, c-format
+msgid ""
+"The user %lu has denied your request to add them to your contact list for "
+"the following reason:\n"
 "%s"
-msgstr "使用者 %lu 因為下列原因,拒絕了您將其加入好友清單的要求:\n"
+msgstr ""
+"使用者 %lu 因為下列原因,拒絕了您將其加入好友清單的要求:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:1492
-#: src/protocols/oscar/oscar.c:2367
+#: src/protocols/oscar/oscar.c:1504 src/protocols/oscar/oscar.c:2456
 msgid "No reason given."
 msgstr "沒有給予原因。"
 
-#: src/protocols/oscar/oscar.c:1493
-#: src/protocols/oscar/oscar.c:2368
+#: src/protocols/oscar/oscar.c:1505 src/protocols/oscar/oscar.c:2457
 msgid "Gaim - ICQ Authorization Denied"
 msgstr "Gaim - ICQ 拒絕認證"
 
-#: src/protocols/oscar/oscar.c:1499
-#: src/protocols/oscar/oscar.c:2374
+#: src/protocols/oscar/oscar.c:1511 src/protocols/oscar/oscar.c:2463
+#, c-format
 msgid "The user %lu has granted your request to add them to your contact list."
 msgstr "使用者 %lu 同意了您將其加入好友清單的要求。"
 
-#: src/protocols/oscar/oscar.c:1500
-#: src/protocols/oscar/oscar.c:2375
+#: src/protocols/oscar/oscar.c:1512 src/protocols/oscar/oscar.c:2464
 msgid "Gaim - ICQ Authorization Granted"
 msgstr "Gaim - ICQ 許可認證"
 
-#: src/protocols/oscar/oscar.c:1573
+#: src/protocols/oscar/oscar.c:1585
+#, c-format
 msgid "You missed %d message from %s because it was invalid."
 msgstr "您遺失了由 %s 送來的 %d 個訊息,因為那是無效的。"
 
-#: src/protocols/oscar/oscar.c:1574
+#: src/protocols/oscar/oscar.c:1586
+#, c-format
 msgid "You missed %d messages from %s because they were invalid."
 msgstr "您遺失了由 %s 送來的 %d 個訊息,因為那是無效的。"
 
-#: src/protocols/oscar/oscar.c:1583
+#: src/protocols/oscar/oscar.c:1595
+#, c-format
 msgid "You missed %d message from %s because it was too large."
 msgstr "您遺失了由 %s 送來的 %d 個訊息,因為這個訊息太大了。"
 
-#: src/protocols/oscar/oscar.c:1584
+#: src/protocols/oscar/oscar.c:1596
+#, c-format
 msgid "You missed %d messages from %s because they were too large."
 msgstr "您遺失了由 %s 送來的 %d 個訊息,因為這個訊息太大了。"
 
-#: src/protocols/oscar/oscar.c:1593
+#: src/protocols/oscar/oscar.c:1605
+#, c-format
 msgid "You missed %d message from %s because the rate limit has been exceeded."
 msgstr "您遺失了由 %s 送來的 %d 個訊息,因為訊息的發送速率到了上限。"
 
-#: src/protocols/oscar/oscar.c:1594
-msgid "You missed %d messages from %s because the rate limit has been exceeded."
+#: src/protocols/oscar/oscar.c:1606
+#, c-format
+msgid ""
+"You missed %d messages from %s because the rate limit has been exceeded."
 msgstr "您遺失了由 %s 送來的 %d 個訊息,因為訊息的發送速率到了上限。"
 
-#: src/protocols/oscar/oscar.c:1603
+#: src/protocols/oscar/oscar.c:1615
+#, c-format
 msgid "You missed %d message from %s because it was too evil."
 msgstr "您遺失了由 %s 送來的 %d 個訊息,因為這個訊息可能不懷好意。"
 
-#: src/protocols/oscar/oscar.c:1604
+#: src/protocols/oscar/oscar.c:1616
+#, c-format
 msgid "You missed %d messages from %s because they are too evil."
 msgstr "您遺失了由 %s 送來的 %d 個訊息,因為這些訊息可能不懷好意。"
 
-#: src/protocols/oscar/oscar.c:1613
+#: src/protocols/oscar/oscar.c:1625
+#, c-format
 msgid "You missed %d message from %s because you are too evil."
 msgstr "您遺失了由 %s 送來的 %d 個訊息,因為這個訊息可能不懷好意。"
 
-#: src/protocols/oscar/oscar.c:1614
+#: src/protocols/oscar/oscar.c:1626
+#, c-format
 msgid "You missed %d messages from %s because you are too evil."
 msgstr "您遺失了由 %s 送來的 %d 個訊息,因為這個訊息可能不懷好意。"
 
-#: src/protocols/oscar/oscar.c:1622
+#: src/protocols/oscar/oscar.c:1634
+#, c-format
 msgid "You missed %d message from %s for unknown reasons."
 msgstr "您因為不明的原因,而遺失了由 %s 送來的 %d 個訊息。"
 
-#: src/protocols/oscar/oscar.c:1623
+#: src/protocols/oscar/oscar.c:1635
+#, c-format
 msgid "You missed %d messages from %s for unknown reasons."
 msgstr "您因為不明的原因,而遺失了由 %s 送來的 %d 個訊息。"
 
-#: src/dialogs.c:3036
-#: src/dialogs.c:3042
-#: src/protocols/oscar/oscar.c:1628
-#: src/protocols/oscar/oscar.c:1666
-#: src/protocols/oscar/oscar.c:1684
-#: src/protocols/oscar/oscar.c:2137
-#: src/protocols/yahoo/yahoo.c:594
+#: src/dialogs.c:3076 src/dialogs.c:3082 src/protocols/oscar/oscar.c:1640
+#: src/protocols/oscar/oscar.c:1755 src/protocols/oscar/oscar.c:1773
+#: src/protocols/oscar/oscar.c:2226 src/protocols/yahoo/yahoo.c:594
 msgid "Gaim - Error"
 msgstr "Gaim - 錯誤"
 
-#: src/protocols/oscar/oscar.c:1645
+#: src/protocols/oscar/oscar.c:1703
+#, c-format
+msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR>%s<BR>"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:1705
+#, c-format
+msgid "<B>Status:</B> %s<BR><HR><BR>%s<BR>"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:1734
+#, c-format
 msgid "SNAC threw error: %s\n"
 msgstr "SNAC 丟出錯誤:%s\n"
 
-#: src/protocols/oscar/oscar.c:1647
+#: src/protocols/oscar/oscar.c:1736
 msgid "Gaim - Oscar SNAC Error"
 msgstr "Gaim - Oscar SNAC 錯誤"
 
-#: src/protocols/oscar/oscar.c:1664
+#: src/protocols/oscar/oscar.c:1753
+#, c-format
 msgid "Your message to %s did not get sent: %s"
 msgstr "您要送給 %s 的訊息無法送出:%s"
 
-#: src/protocols/oscar/oscar.c:1665
-#: src/protocols/oscar/oscar.c:1683
+#: src/protocols/oscar/oscar.c:1754 src/protocols/oscar/oscar.c:1772
 msgid "Reason unknown"
 msgstr "原因不明"
 
-#: src/protocols/oscar/oscar.c:1682
+#: src/protocols/oscar/oscar.c:1771
+#, c-format
 msgid "User information for %s unavailable: %s"
 msgstr "使用者 %s 的個人資訊並不存在:%s"
 
-#: src/buddy.c:2065
-#: src/protocols/oscar/oscar.c:1713
+#: src/buddy.c:2131 src/protocols/oscar/oscar.c:1802
 msgid "Buddy Icon"
 msgstr "好友圖示"
 
-#: src/buddy.c:2068
-#: src/protocols/oscar/oscar.c:1716
+#: src/buddy.c:2134 src/protocols/oscar/oscar.c:1805
 msgid "Voice"
 msgstr "聲音"
 
-#: src/buddy.c:2071
-#: src/protocols/oscar/oscar.c:1719
+#: src/buddy.c:2137 src/protocols/oscar/oscar.c:1808
 msgid "IM Image"
 msgstr "即時訊息圖片"
 
-#: src/buddy.c:495
-#: src/buddy.c:2074
-#: src/buddy.c:2512
-#: src/prefs.c:2913
-#: src/protocols/oscar/oscar.c:1722
+#: src/buddy.c:498 src/buddy.c:2140 src/buddy.c:2581 src/prefs.c:2926
+#: src/protocols/oscar/oscar.c:1811
 msgid "Chat"
 msgstr "聊天"
 
-#: src/buddy.c:2077
-#: src/protocols/oscar/oscar.c:1725
+#: src/buddy.c:2143 src/protocols/oscar/oscar.c:1814
 msgid "Get File"
 msgstr "接收文件"
 
-#: src/buddy.c:2080
-#: src/protocols/oscar/oscar.c:1728
+#: src/buddy.c:2146 src/protocols/oscar/oscar.c:1817
 msgid "Send File"
 msgstr "傳送檔案"
 
-#: src/buddy.c:2084
-#: src/protocols/oscar/oscar.c:1732
+#: src/buddy.c:2150 src/protocols/oscar/oscar.c:1821
 msgid "Games"
 msgstr "遊戲"
 
-#: src/buddy.c:2087
-#: src/protocols/oscar/oscar.c:1735
+#: src/buddy.c:2153 src/protocols/oscar/oscar.c:1824
 msgid "Stocks"
 msgstr "股票"
 
-#: src/buddy.c:2090
-#: src/protocols/oscar/oscar.c:1738
+#: src/buddy.c:2156 src/protocols/oscar/oscar.c:1827
 msgid "Send Buddy List"
 msgstr "送出好友清單"
 
-#: src/buddy.c:2093
-#: src/protocols/oscar/oscar.c:1741
+#: src/buddy.c:2159 src/protocols/oscar/oscar.c:1830
 msgid "EveryBuddy Bug"
 msgstr ""
 
-#: src/buddy.c:2096
-#: src/protocols/oscar/oscar.c:1744
+#: src/buddy.c:2162 src/protocols/oscar/oscar.c:1833
 msgid "AP User"
 msgstr ""
 
-#: src/buddy.c:2099
-#: src/protocols/oscar/oscar.c:1747
+#: src/buddy.c:2165 src/protocols/oscar/oscar.c:1836
 msgid "ICQ RTF"
 msgstr ""
 
-#: src/buddy.c:2102
-#: src/protocols/oscar/oscar.c:1750
+#: src/buddy.c:2168 src/protocols/oscar/oscar.c:1839
 msgid "Nihilist"
 msgstr ""
 
-#: src/buddy.c:2105
-#: src/protocols/oscar/oscar.c:1753
+#: src/buddy.c:2171 src/protocols/oscar/oscar.c:1842
 msgid "ICQ Server Relay"
 msgstr "ICQ 伺服器轉送"
 
-#: src/buddy.c:2108
-#: src/protocols/oscar/oscar.c:1756
+#: src/buddy.c:2174 src/protocols/oscar/oscar.c:1845
 msgid "ICQ Unknown"
 msgstr "ICQ 未知"
 
-#: src/buddy.c:2111
-#: src/protocols/oscar/oscar.c:1759
+#: src/buddy.c:2177 src/protocols/oscar/oscar.c:1848
 msgid "Trillian Encryption"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1797
-msgid "<br><BODY BGCOLOR=WHITE><hr><I>Legend:</I><br><br><IMG SRC=\"free_icon.gif\"> : Normal AIM User<br><IMG SRC=\"aol_icon.gif\"> : AOL User <br><IMG SRC=\"dt_icon.gif\"> : Trial AIM User <br><IMG SRC=\"admin_icon.gif\"> : Administrator <br><IMG SRC=\"ab_icon.gif\"> : ActiveBuddy Interactive Agent<br><IMG SRC=\"wireless_icon.gif\"> : Wireless Device User<br>"
+#: src/protocols/oscar/oscar.c:1886
+msgid ""
+"<br><BODY BGCOLOR=WHITE><hr><I>Legend:</I><br><br><IMG SRC=\"free_icon.gif"
+"\"> : Normal AIM User<br><IMG SRC=\"aol_icon.gif\"> : AOL User <br><IMG SRC="
+"\"dt_icon.gif\"> : Trial AIM User <br><IMG SRC=\"admin_icon.gif\"> : "
+"Administrator <br><IMG SRC=\"ab_icon.gif\"> : ActiveBuddy Interactive "
+"Agent<br><IMG SRC=\"wireless_icon.gif\"> : Wireless Device User<br>"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1825
+#: src/protocols/oscar/oscar.c:1914
+#, c-format
 msgid ""
 "Username : <B>%s</B>  %s <BR>\n"
 "Warning Level : <B>%d %%</B><BR>\n"
@@ -915,81 +1300,119 @@
 "%s%s%s<BR>\n"
 "<HR><BR>\n"
 
-#: src/protocols/oscar/oscar.c:1857
+#: src/protocols/oscar/oscar.c:1946
 msgid "<i>User has no away message</i>"
 msgstr "<i>使用者沒有離開訊息</i>"
 
-#: src/protocols/oscar/oscar.c:1869
+#: src/protocols/oscar/oscar.c:1958
 msgid "Client Capabilities: "
 msgstr "Client 相容性:"
 
-#: src/protocols/oscar/oscar.c:1877
+#: src/protocols/oscar/oscar.c:1966
 msgid "<i>No Information Provided</i>"
 msgstr "<i>未提供任何信息</i>"
 
-#: src/protocols/oscar/oscar.c:1900
+#: src/protocols/oscar/oscar.c:1989
 msgid "Your connection may be lost."
 msgstr "您可能斷線了。"
 
-#: src/protocols/oscar/oscar.c:1901
+#: src/protocols/oscar/oscar.c:1990
 msgid "AOL error"
 msgstr "AOL 錯誤"
 
-#: src/protocols/oscar/oscar.c:2136
-msgid "The last message was not sent because you are over the rate limit. Please wait 10 seconds and try again."
+#: src/protocols/oscar/oscar.c:2225
+msgid ""
+"The last message was not sent because you are over the rate limit. Please "
+"wait 10 seconds and try again."
 msgstr "訊息並未送出,因為您已經達到發送訊息速率的上限。請等待十秒後再試一次。"
 
-#: src/dialogs.c:3564
-#: src/protocols/oscar/oscar.c:2478
-#: src/protocols/oscar/oscar.c:3403
-#: src/protocols/toc/toc.c:1561
-#: src/protocols/toc/toc.c:1578
-#: src/protocols/toc/toc.c:1638
-#: src/protocols/toc/toc.c:1680
-#: src/protocols/toc/toc.c:1799
-#: src/protocols/toc/toc.c:1829
-#: src/protocols/toc/toc.c:1885
+#: src/dialogs.c:3604 src/protocols/oscar/oscar.c:2589
+#: src/protocols/oscar/oscar.c:3541 src/protocols/toc/toc.c:1564
+#: src/protocols/toc/toc.c:1581 src/protocols/toc/toc.c:1641
+#: src/protocols/toc/toc.c:1683 src/protocols/toc/toc.c:1802
+#: src/protocols/toc/toc.c:1832 src/protocols/toc/toc.c:1888
 msgid "Error"
 msgstr "錯誤"
 
-#: src/protocols/oscar/oscar.c:3075
-#: src/protocols/toc/toc.c:1105
+#: src/protocols/oscar/oscar.c:3192
+#, c-format
+msgid ""
+"The maximum number of buddies allowed in your buddy list is %d, and you have "
+"%d.  Until you are below the limit, some buddies will not show up as online."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3195
+#, fuzzy
+msgid "Gaim - Warning"
+msgstr "Gaim - 警告使用者?"
+
+#: src/protocols/oscar/oscar.c:3213 src/protocols/toc/toc.c:1108
 msgid "Exchange:"
 msgstr "交換:"
 
-#: src/protocols/oscar/oscar.c:3403
+#: src/protocols/oscar/oscar.c:3541
 msgid "Unable to open Direct IM"
 msgstr "無法開啟直接的即時訊息"
 
-#: src/protocols/oscar/oscar.c:3413
-msgid "You have selected to open a Direct IM connection with %s. Doing this will let them see your IP address, and may be a security risk. Do you wish to continue?"
-msgstr "您選擇和 %s 開啟一個即時訊息。這樣子的做法會讓對方知道您的 IP 位址,同時存在著系統安全上的顧慮。您確定要繼續嗎?"
-
-#: src/protocols/oscar/oscar.c:3446
+#: src/protocols/oscar/oscar.c:3551
+#, c-format
+msgid ""
+"You have selected to open a Direct IM connection with %s. Doing this will "
+"let them see your IP address, and may be a security risk. Do you wish to "
+"continue?"
+msgstr ""
+"您選擇和 %s 開啟一個即時訊息。這樣子的做法會讓對方知道您的 IP 位址,同時存在"
+"著系統安全上的顧慮。您確定要繼續嗎?"
+
+#: src/protocols/oscar/oscar.c:3568
+#, c-format
+msgid ""
+"<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR><I>Remote client does not "
+"support sending status messages.</I><BR>"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3575
+#, c-format
+msgid ""
+"<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR><I>User has no status message."
+"</I><BR>"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3600
+#, fuzzy
+msgid "Get Status Msg"
+msgstr "取得離線訊息"
+
+#: src/protocols/oscar/oscar.c:3613
 msgid "Direct IM"
 msgstr "直接消息"
 
-#: src/protocols/oscar/oscar.c:3454
+#: src/protocols/oscar/oscar.c:3621
 msgid "Get Capabilities"
 msgstr "取得相容性資訊"
 
 #: src/protocols/toc/toc.c:398
+#, c-format
 msgid "Unable to write file %s."
 msgstr "無法寫入檔案 %s。"
 
 #: src/protocols/toc/toc.c:401
+#, c-format
 msgid "Unable to read file %s."
 msgstr "無法讀取檔案 %s。"
 
 #: src/protocols/toc/toc.c:404
+#, c-format
 msgid "Message too long, last %s bytes truncated."
 msgstr "訊息太長,最後的 %s bytes 被截去。"
 
 #: src/protocols/toc/toc.c:407
+#, c-format
 msgid "%s not currently logged in."
 msgstr "%s 目前並未登入。"
 
 #: src/protocols/toc/toc.c:410
+#, c-format
 msgid "Warning of %s not allowed."
 msgstr "警告:%s 是不被允許的。"
 
@@ -998,18 +1421,22 @@
 msgstr "訊息被丟棄,因為您達到伺服器所限制的發送速度。"
 
 #: src/protocols/toc/toc.c:416
+#, c-format
 msgid "Chat in %s is not available."
 msgstr "在 %s 不可以聊天。"
 
 #: src/protocols/toc/toc.c:419
+#, c-format
 msgid "You are sending messages too fast to %s."
 msgstr "您送訊息給 %s 的速度太快了。"
 
 #: src/protocols/toc/toc.c:422
+#, c-format
 msgid "You missed an IM from %s because it was too big."
 msgstr "您遺失了一個由 %s 送來的訊息,因為它太大了。"
 
 #: src/protocols/toc/toc.c:425
+#, c-format
 msgid "You missed an IM from %s because it was sent too fast."
 msgstr "您遺失了一個由 %s 送來的訊息,因為它傳送的速度太快。"
 
@@ -1050,6 +1477,7 @@
 msgstr "這個國家不被支援。"
 
 #: src/protocols/toc/toc.c:456
+#, c-format
 msgid "Failure unknown: %s."
 msgstr "未知的失敗原因:%s。"
 
@@ -1062,14 +1490,20 @@
 msgstr ""
 
 #: src/protocols/toc/toc.c:468
-msgid "You have been connecting and disconnecting too frequently.  Wait ten minutes and try again.  If you continue to try, you will need to wait even longer."
-msgstr "您的連線/斷線動作太過頻繁。請等待十分鐘後再行重試。如果您依然繼續嘗試著連線,那麼您的等待時間將會更加的延長。"
+msgid ""
+"You have been connecting and disconnecting too frequently.  Wait ten minutes "
+"and try again.  If you continue to try, you will need to wait even longer."
+msgstr ""
+"您的連線/斷線動作太過頻繁。請等待十分鐘後再行重試。如果您依然繼續嘗試著連"
+"線,那麼您的等待時間將會更加的延長。"
 
 #: src/protocols/toc/toc.c:471
+#, c-format
 msgid "An unknown signon error has occurred: %s."
 msgstr "發生了一個未知的登入錯誤:%s。"
 
 #: src/protocols/toc/toc.c:474
+#, c-format
 msgid "An unknown error, %d, has occurred.  Info: %s"
 msgstr "一個未知的錯誤 %d 發生。資訊:%s"
 
@@ -1097,47 +1531,53 @@
 msgid "Password Change Successful"
 msgstr "密碼修改成功"
 
-#: src/dialogs.c:1690
-#: src/protocols/toc/toc.c:782
+#: src/dialogs.c:1730 src/protocols/toc/toc.c:782
 msgid "Gaim - Password Change"
 msgstr "Gaim - 修改密碼"
 
 #: src/protocols/toc/toc.c:785
-msgid "TOC has sent a PAUSE command. When this happens, TOC ignores any messages sent to it, and may kick you off if you send a message. Gaim will prevent anything from going through. This is only temporary, please be patient."
-msgstr "TOC has sent a PAUSE command. When this happens, TOC ignores any messages sent to it, and may kick you off if you send a message. Gaim will prevent anything from going through. This is only temporary, please be patient."
+msgid ""
+"TOC has sent a PAUSE command. When this happens, TOC ignores any messages "
+"sent to it, and may kick you off if you send a message. Gaim will prevent "
+"anything from going through. This is only temporary, please be patient."
+msgstr ""
+"TOC has sent a PAUSE command. When this happens, TOC ignores any messages "
+"sent to it, and may kick you off if you send a message. Gaim will prevent "
+"anything from going through. This is only temporary, please be patient."
 
 #: src/protocols/toc/toc.c:788
 msgid "TOC Pause"
 msgstr "TOC 暫停"
 
-#: src/protocols/toc/toc.c:1222
+#: src/protocols/toc/toc.c:1225
 msgid "Get Dir Info"
 msgstr "取得使用者個人資訊"
 
-#: src/protocols/toc/toc.c:1638
-#: src/protocols/toc/toc.c:1680
-#: src/protocols/toc/toc.c:1799
-#: src/protocols/toc/toc.c:1885
+#: src/protocols/toc/toc.c:1641 src/protocols/toc/toc.c:1683
+#: src/protocols/toc/toc.c:1802 src/protocols/toc/toc.c:1888
 msgid "Could not connect for transfer!"
 msgstr "無法開啟傳輸的連線!"
 
-#: src/protocols/toc/toc.c:1829
+#: src/protocols/toc/toc.c:1832
 msgid "Could not write file header!"
 msgstr "無法寫入檔頭!"
 
-#: src/protocols/toc/toc.c:1918
+#: src/protocols/toc/toc.c:1921
 msgid "Gaim - Save As..."
 msgstr "Gaim - 儲存為…"
 
-#: src/protocols/toc/toc.c:1959
+#: src/protocols/toc/toc.c:1962
+#, c-format
 msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
 msgstr "%s 要求 %s 接收 %d 個檔案:%s (%.2f %s)%s%s"
 
-#: src/protocols/toc/toc.c:1960
+#: src/protocols/toc/toc.c:1963
+#, c-format
 msgid "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
 msgstr "%s 要求 %s 接收 %d 個檔案:%s (%.2f %s)%s%s"
 
-#: src/protocols/toc/toc.c:1965
+#: src/protocols/toc/toc.c:1968
+#, c-format
 msgid "%s requests you to send them a file"
 msgstr "%s 要求您傳送檔案給他們。"
 
@@ -1145,30 +1585,33 @@
 msgid "Your message did not get sent."
 msgstr "您的訊息並沒有被送出。"
 
-#: src/protocols/zephyr/zephyr.c:802
+#: src/protocols/zephyr/zephyr.c:840
 msgid "ZLocate"
 msgstr ""
 
-#: src/protocols/zephyr/zephyr.c:839
+#: src/protocols/zephyr/zephyr.c:877
 msgid "Class:"
 msgstr "類別:"
 
-#: src/protocols/zephyr/zephyr.c:843
+#: src/protocols/zephyr/zephyr.c:881
 msgid "Instance:"
 msgstr ""
 
-#: src/protocols/zephyr/zephyr.c:847
+#: src/protocols/zephyr/zephyr.c:885
 msgid "Recipient:"
 msgstr ""
 
-#: src/about.c:93
+#: src/about.c:102
+#, c-format
 msgid "About Gaim v%s"
 msgstr "關於 Gaim v%s"
 
-#: src/about.c:126
+#: src/about.c:135
+#, fuzzy
 msgid ""
-"Gaim is a client that supports AOL's Instant Messenger protocol. It is written\n"
-"using Gtk+ and is licensed under the GPL.\n"
+"Gaim is a modular Instant Messaging client capable of using AIM, ICQ,\n"
+"Yahoo!, MSN, IRC, Jabber, Napster, Zephyr, and Gadu-Gadu all at once.\n"
+"It is written using Gtk+ and is licensed under the GPL.\n"
 "\n"
 "URL: "
 msgstr ""
@@ -1177,14 +1620,14 @@
 "\n"
 "網址:"
 
-#: src/about.c:127
+#: src/about.c:137
 msgid ""
 "\n"
 "\n"
 "IRC: #gaim on irc.openprojects.net"
 msgstr ""
 
-#: src/about.c:137
+#: src/about.c:147
 msgid ""
 "Active Developers\n"
 "====================\n"
@@ -1205,121 +1648,96 @@
 "Mark Spencer (original author)   [ markster@marko.net ]"
 msgstr ""
 
-#: src/about.c:155
-#: src/aim.c:318
-#: src/buddy.c:2638
-#: src/buddy_chat.c:1311
-#: src/buddy_chat.c:1408
-#: src/buddy_chat.c:1438
-#: src/conversation.c:2836
-#: src/dialogs.c:568
-#: src/dialogs.c:3859
-#: src/multi.c:1057
-#: src/plugins.c:277
-#: src/prefs.c:2536
-#: src/prpl.c:438
-#: src/prpl.c:679
-#: src/server.c:1072
-msgid "Close"
-msgstr "關閉"
-
 #. this makes the sizes not work.
 #. GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
 #. gtk_widget_grab_default(button);
-#: src/about.c:175
+#: src/about.c:185
 msgid "Web Site"
 msgstr "網址"
 
-#: src/aim.c:151
-#: src/buddy.c:2631
+#: src/aim.c:153 src/buddy.c:2709
 msgid "Signoff"
 msgstr "登出"
 
-#: src/aim.c:163
+#: src/aim.c:165
 msgid "Please enter your logon"
 msgstr ""
 
-#: src/aim.c:163
-#: src/multi.c:1388
-#: src/server.c:55
+#: src/aim.c:165 src/multi.c:1400 src/server.c:55
 msgid "Signon Error"
 msgstr "登入錯誤"
 
-#: src/aim.c:261
+#: src/aim.c:263
 msgid "Gaim - Login"
 msgstr "Gaim - 登入"
 
-#: src/aim.c:279
+#: src/aim.c:281
 msgid "Screen Name: "
 msgstr "帳  號:"
 
-#: src/aim.c:295
+#: src/aim.c:297
 msgid "Password: "
 msgstr "密  碼:"
 
-#: src/aim.c:316
-#: src/buddy.c:2635
+#: src/aim.c:318 src/buddy.c:2713
 msgid "Quit"
 msgstr "退    出"
 
-#: src/aim.c:321
-#: src/aim.c:819
-#: src/buddy.c:2661
+#: src/aim.c:323 src/aim.c:831 src/buddy.c:2739
 msgid "Accounts"
 msgstr "帳    號"
 
-#: src/aim.c:323
-#: src/multi.c:903
+#: src/aim.c:325 src/multi.c:915
 msgid "Signon"
 msgstr "登    入"
 
-#: src/aim.c:355
+#: src/aim.c:357
 msgid "About"
 msgstr "關    於"
 
-#: src/aim.c:356
-#: src/prefs.c:1620
-#: src/prefs.c:1894
+#: src/aim.c:358 src/prefs.c:1633 src/prefs.c:1905
 msgid "Options"
 msgstr "選    項"
 
-#: src/aim.c:358
-#: src/aim.c:822
-#: src/buddy.c:2679
+#: src/aim.c:360 src/aim.c:834 src/buddy.c:2757
 msgid "Plugins"
 msgstr "插    件"
 
-#: src/aim.c:816
-#: src/buddy.c:2671
+#: src/aim.c:828 src/buddy.c:2749
 msgid "Preferences"
 msgstr "偏好設定"
 
-#: src/applet.c:199
+#: src/aim.c:838 src/multi.c:1472
+#, fuzzy
+msgid "Auto-login"
+msgstr "自動登入"
+
+#: src/applet.c:109
 msgid "Attempting to sign on...."
 msgstr "正在嘗試登入…"
 
-#: src/applet.c:202
+#: src/applet.c:112
 msgid "Offline. Click to bring up login box."
 msgstr "斷線。點選以帶出登入視窗。"
 
-#: src/applet.c:218
+#: src/applet.c:128
+#, c-format
 msgid "Away: %d pending."
 msgstr "離開:%d 等待。"
 
-#: src/applet.c:221
+#: src/applet.c:131
 msgid "Away."
 msgstr "離開。"
 
-#: src/applet.c:296
-#: src/away.c:388
+#: src/applet.c:200 src/away.c:388
 msgid "New Away Message"
 msgstr "新的離開訊息"
 
-#: src/applet.c:444
+#: src/applet.c:348
 msgid "Can't create Gaim applet!"
 msgstr "無法建立 Gaim 小程式!"
 
-#: src/applet.c:465
+#: src/applet.c:368
 msgid "About..."
 msgstr "關於…"
 
@@ -1331,9 +1749,7 @@
 msgid "I'm Back!"
 msgstr "我回來了!"
 
-#: src/away.c:266
-#: src/away.c:346
-#: src/away.c:520
+#: src/away.c:266 src/away.c:346 src/away.c:520
 msgid "Back"
 msgstr "返回"
 
@@ -1345,116 +1761,75 @@
 msgid "Set All Away"
 msgstr "全部設為離開"
 
-#. Put the buttons in the box
-#: src/buddy.c:489
-#: src/buddy.c:2746
-#: src/buddy_chat.c:1443
-#: src/conversation.c:2369
-#: src/conversation.c:2851
-#: src/dialogs.c:892
-#: src/dialogs.c:1074
-#: src/dialogs.c:2055
-#: src/multi.c:1041
-#: src/prefs.c:2030
-#: src/prefs.c:2372
-#: src/prefs.c:2406
-msgid "Add"
-msgstr "增加"
-
-#: src/buddy.c:490
-#: src/buddy.c:2747
-#: src/dialogs.c:902
-#: src/dialogs.c:1049
+#: src/buddy.c:493 src/buddy.c:2828 src/dialogs.c:942 src/dialogs.c:1089
 msgid "Group"
 msgstr "群組"
 
-#: src/buddy.c:491
-#: src/buddy.c:2748
-#: src/buddy_chat.c:1445
-#: src/conversation.c:2355
-#: src/conversation.c:2848
-#: src/prefs.c:2044
-#: src/prefs.c:2376
-#: src/prefs.c:2410
-msgid "Remove"
-msgstr "移除"
-
-#: src/buddy.c:496
-#: src/buddy.c:649
-#: src/buddy.c:803
-#: src/buddy.c:2510
-#: src/buddy_chat.c:850
-#: src/buddy_chat.c:1267
+#: src/buddy.c:499 src/buddy.c:664 src/buddy.c:834 src/buddy.c:2579
+#: src/buddy_chat.c:861 src/buddy_chat.c:1278
 msgid "IM"
 msgstr "即時訊息"
 
-#: src/buddy.c:497
-#: src/buddy.c:2511
-#: src/buddy_chat.c:866
-#: src/buddy_chat.c:1275
-#: src/buddy_chat.c:1451
-#: src/conversation.c:2869
+#: src/buddy.c:500 src/buddy.c:2580 src/buddy_chat.c:877 src/buddy_chat.c:1286
+#: src/buddy_chat.c:1462 src/conversation.c:2897
 msgid "Info"
 msgstr "訊息內容"
 
 #. Put the buttons in the box
-#: src/buddy.c:654
-#: src/buddy.c:808
-#: src/dialogs.c:1041
-#: src/dialogs.c:3418
-#: src/dialogs.c:3433
+#: src/buddy.c:669 src/buddy.c:839 src/dialogs.c:1081 src/dialogs.c:3458
+#: src/dialogs.c:3473
 msgid "Alias"
 msgstr "別名"
 
-#: src/buddy.c:659
-#: src/buddy.c:827
+#: src/buddy.c:674 src/buddy.c:858
 msgid "Add Buddy Pounce"
 msgstr ""
 
-#: src/buddy.c:666
-#: src/buddy.c:833
+#: src/buddy.c:681 src/buddy.c:864
 msgid "View Log"
 msgstr "觀看日誌"
 
-#: src/buddy.c:790
-#: src/buddy.c:821
+#: src/buddy.c:821 src/buddy.c:852
 msgid "Rename"
 msgstr "重命名"
 
-#: src/buddy.c:815
+#: src/buddy.c:846
 msgid "Un-Alias"
 msgstr "取消別名"
 
-#: src/buddy.c:1587
-#: src/buddy.c:2654
+#: src/buddy.c:1645 src/buddy.c:2732
 msgid "Buddy Pounce"
 msgstr ""
 
-#: src/buddy.c:1667
+#: src/buddy.c:1725
 msgid "New Buddy Pounce"
 msgstr ""
 
-#: src/buddy.c:1685
+#: src/buddy.c:1743
 msgid "Remove Buddy Pounce"
 msgstr ""
 
-#: src/buddy.c:1713
+#: src/buddy.c:1771
 msgid "[Click to edit]"
 msgstr "[ 編輯 ]"
 
-#: src/buddy.c:2188
+#: src/buddy.c:2254
+#, c-format
 msgid "Logged in: %s\n"
 msgstr "登入:%s\n"
 
-#: src/buddy.c:2200
+#: src/buddy.c:2266
+#, c-format
 msgid "Warnings: %d%%\n"
 msgstr "警告:%d%%\n"
 
-#: src/buddy.c:2212
+#: src/buddy.c:2278
+#, c-format
 msgid "Capabilities: %s\n"
 msgstr "通訊協定相容性:%s\n"
 
-#: src/buddy.c:2216
+#: src/buddy.c:2282
+#, c-format
 msgid ""
 "Alias: %s               \n"
 "Screen Name: %s\n"
@@ -1464,120 +1839,127 @@
 "帳號: %s\n"
 "%s%s%s%s%s%s"
 
-#: src/buddy.c:2220
+#: src/buddy.c:2286
 msgid "Idle: "
 msgstr "閒置時間:"
 
-#: src/buddy.c:2291
-#: src/buddy.c:2296
+#: src/buddy.c:2359 src/buddy.c:2364
+#, c-format
 msgid "%s logged in."
 msgstr "%s 登入。"
 
-#: src/buddy.c:2355
-#: src/buddy.c:2360
+#: src/buddy.c:2424 src/buddy.c:2429
+#, c-format
 msgid "%s logged out."
 msgstr "%s 登出。"
 
-#: src/buddy.c:2545
+#: src/buddy.c:2614
 msgid "Information on selected Buddy"
 msgstr "顯示被選取好友的資訊"
 
-#: src/buddy.c:2546
-#: src/dialogs.c:699
+#: src/buddy.c:2615 src/dialogs.c:697
 msgid "Send Instant Message"
 msgstr "送出即時訊息"
 
-#: src/buddy.c:2547
+#: src/buddy.c:2616
 msgid "Start/join a Buddy Chat"
 msgstr "開始或加入好友的聊天"
 
-#: src/buddy.c:2548
+#: src/buddy.c:2617
 msgid "Activate Away Message"
 msgstr "開啟離開訊息"
 
-#: src/buddy.c:2611
+#: src/buddy.c:2689
 msgid "File"
 msgstr "檔案"
 
-#: src/buddy.c:2615
+#: src/buddy.c:2693
 msgid "Add A Buddy"
 msgstr "新增一個好友"
 
-#: src/buddy.c:2617
+#: src/buddy.c:2695
 msgid "Join A Chat"
 msgstr "加入聊天"
 
-#: src/buddy.c:2619
+#: src/buddy.c:2697
 msgid "New Instant Message"
 msgstr "新的即時訊息"
 
-#: src/buddy.c:2621
-#: src/dialogs.c:751
+#: src/buddy.c:2699 src/dialogs.c:759
 msgid "Get User Info"
 msgstr "取得使用者資訊"
 
-#: src/buddy.c:2626
+#: src/buddy.c:2704
 msgid "Import Buddy List"
 msgstr "匯入好友清單"
 
-#: src/buddy.c:2644
+#: src/buddy.c:2722
 msgid "Tools"
 msgstr "工具"
 
-#: src/buddy.c:2667
+#: src/buddy.c:2745
 msgid "Protocol Actions"
 msgstr "Protocol 相關設定"
 
-#: src/buddy.c:2673
+#: src/buddy.c:2751
 msgid "View System Log"
 msgstr "觀看系統日誌"
 
-#: src/buddy.c:2685
+#: src/buddy.c:2763
 msgid "Perl"
 msgstr "Perl 插件"
 
-#: src/buddy.c:2688
+#: src/buddy.c:2766
 msgid "Load Script"
 msgstr "讀取命令稿"
 
-#: src/buddy.c:2692
+#: src/buddy.c:2770
 msgid "Unload All Scripts"
 msgstr "清除所有讀入的命令稿"
 
-#: src/buddy.c:2696
+#: src/buddy.c:2774
 msgid "List Scripts"
 msgstr "列出命令稿"
 
-#: src/buddy.c:2704
+#: src/buddy.c:2782
 msgid "Help"
 msgstr "輔助說明"
 
-#: src/buddy.c:2709
+#: src/buddy.c:2787
+#, fuzzy
+msgid "Online Help"
+msgstr "上線"
+
+#: src/buddy.c:2788
+#, fuzzy
+msgid "Debug Window"
+msgstr "顯示除錯視窗"
+
+#: src/buddy.c:2789
 msgid "About Gaim"
 msgstr "關於 Gaim"
 
-#: src/buddy.c:2726
-#: src/prefs.c:2892
+#: src/buddy.c:2807 src/prefs.c:2905
 msgid "Buddy List"
 msgstr "好友清單"
 
-#: src/buddy.c:2779
+#: src/buddy.c:2860
 msgid "Add a new Buddy"
 msgstr "新增一個好友"
 
-#: src/buddy.c:2780
+#: src/buddy.c:2861
 msgid "Add a new Group"
 msgstr "新增一個群組"
 
-#: src/buddy.c:2781
+#: src/buddy.c:2862
 msgid "Remove selected Buddy/Group"
 msgstr "移除被選取的好友或群組"
 
-#: src/buddy.c:2808
+#: src/buddy.c:2889
 msgid "Edit Buddies"
 msgstr "修改好友清單"
 
-#: src/buddy.c:2851
+#: src/buddy.c:2932
 msgid "Gaim - Buddy List"
 msgstr "Gaim - 好友清單"
 
@@ -1585,40 +1967,17 @@
 msgid "Join Chat"
 msgstr "加入聊天"
 
-#: src/buddy_chat.c:272
-msgid "Buddy Chat"
-msgstr "與好友聊天"
-
 #: src/buddy_chat.c:283
 msgid "Join Chat As:"
 msgstr "加入聊天為:"
 
-#: src/buddy_chat.c:304
-#: src/buddy_chat.c:392
-#: src/dialogs.c:450
-#: src/dialogs.c:540
-#: src/dialogs.c:717
-#: src/dialogs.c:775
-#: src/dialogs.c:894
-#: src/dialogs.c:1070
-#: src/dialogs.c:1433
-#: src/dialogs.c:1638
-#: src/dialogs.c:1762
-#: src/dialogs.c:1822
-#: src/dialogs.c:2044
-#: src/dialogs.c:2226
-#: src/dialogs.c:2401
-#: src/dialogs.c:2472
-#: src/dialogs.c:3168
-#: src/dialogs.c:3420
-#: src/dialogs.c:3601
-#: src/dialogs.c:3972
-#: src/dialogs.c:4078
-#: src/dialogs.c:4737
-#: src/multi.c:769
-#: src/multi.c:899
-#: src/prpl.c:150
-#: src/prpl.c:224
+#: src/buddy_chat.c:304 src/buddy_chat.c:392 src/dialogs.c:449
+#: src/dialogs.c:539 src/dialogs.c:715 src/dialogs.c:816 src/dialogs.c:934
+#: src/dialogs.c:1110 src/dialogs.c:1473 src/dialogs.c:1678 src/dialogs.c:1802
+#: src/dialogs.c:1862 src/dialogs.c:2084 src/dialogs.c:2266 src/dialogs.c:2441
+#: src/dialogs.c:2512 src/dialogs.c:3208 src/dialogs.c:3460 src/dialogs.c:3641
+#: src/dialogs.c:4012 src/dialogs.c:4118 src/dialogs.c:4777 src/multi.c:781
+#: src/multi.c:911 src/prpl.c:150 src/prpl.c:224
 msgid "Cancel"
 msgstr "取消"
 
@@ -1626,21 +1985,16 @@
 msgid "Join"
 msgstr "加入"
 
-#: src/buddy_chat.c:393
-#: src/buddy_chat.c:396
-#: src/buddy_chat.c:1317
-#: src/buddy_chat.c:1407
+#: src/buddy_chat.c:393 src/buddy_chat.c:396 src/buddy_chat.c:1328
+#: src/buddy_chat.c:1418
 msgid "Invite"
 msgstr "邀請"
 
-#: src/buddy_chat.c:412
-#: src/dialogs.c:1261
-#: src/dialogs.c:3428
+#: src/buddy_chat.c:412 src/dialogs.c:1301 src/dialogs.c:3468
 msgid "Buddy"
 msgstr "好友"
 
-#: src/buddy_chat.c:417
-#: src/prefs.c:1993
+#: src/buddy_chat.c:417 src/prefs.c:2004
 msgid "Message"
 msgstr "訊息"
 
@@ -1648,680 +2002,651 @@
 msgid "Gaim - Invite Buddy Into Chat Room"
 msgstr "Gaim - 邀請好友進入聊天室"
 
-#: src/buddy_chat.c:857
+#: src/buddy_chat.c:868
 msgid "Un-Ignore"
 msgstr "取消忽略使用者"
 
-#: src/buddy_chat.c:859
-#: src/buddy_chat.c:1271
+#: src/buddy_chat.c:870 src/buddy_chat.c:1282
 msgid "Ignore"
 msgstr "忽略使用者"
 
 #. don't remove them from ignored in case they re-enter
-#: src/buddy_chat.c:922
-#: src/buddy_chat.c:1034
-#: src/buddy_chat.c:1497
-#: src/buddy_chat.c:1530
+#: src/buddy_chat.c:933 src/buddy_chat.c:1045 src/buddy_chat.c:1508
+#: src/buddy_chat.c:1541
+#, c-format
 msgid "%d %s in room"
 msgstr "聊天室有 %d 家伙"
 
-#: src/buddy_chat.c:930
+#: src/buddy_chat.c:941
+#, c-format
 msgid "%s entered the room."
 msgstr "%s 進入聊天室。"
 
-#: src/buddy_chat.c:996
+#: src/buddy_chat.c:1007
+#, c-format
 msgid "%s is now known as %s"
 msgstr "%s 改變暱稱為 %s"
 
-#: src/buddy_chat.c:1043
+#: src/buddy_chat.c:1054
+#, c-format
 msgid "%s left the room (%s)."
 msgstr "%s 離開聊天室 (%s)。"
 
-#: src/buddy_chat.c:1045
+#: src/buddy_chat.c:1056
+#, c-format
 msgid "%s left the room."
 msgstr "%s 離開聊天室。"
 
-#: src/buddy_chat.c:1144
+#: src/buddy_chat.c:1155
 msgid "Gaim - Group Chats"
 msgstr "Gaim - 群組聊天"
 
-#: src/buddy_chat.c:1207
+#: src/buddy_chat.c:1218
 msgid "Topic:"
 msgstr "主題:"
 
-#: src/buddy_chat.c:1248
+#: src/buddy_chat.c:1259
 msgid "0 people in room"
 msgstr "沒有人在這個房間"
 
-#: src/buddy_chat.c:1322
-#: src/buddy_chat.c:1406
+#: src/buddy_chat.c:1333 src/buddy_chat.c:1417
 msgid "Whisper"
 msgstr "悄悄話"
 
-#: src/buddy_chat.c:1327
-#: src/buddy_chat.c:1404
-#: src/buddy_chat.c:1453
-#: src/conversation.c:2880
+#: src/buddy_chat.c:1338 src/buddy_chat.c:1415 src/buddy_chat.c:1464
+#: src/conversation.c:2908
 msgid "Send"
 msgstr "送出"
 
-#: src/buddy_chat.c:1447
-#: src/conversation.c:2857
+#: src/buddy_chat.c:1458 src/conversation.c:2885
 msgid "Block"
 msgstr "堵住他的嘴!"
 
-#: src/buddy_chat.c:1449
-#: src/conversation.c:2863
-#: src/dialogs.c:425
-#: src/dialogs.c:454
+#: src/buddy_chat.c:1460 src/conversation.c:2891 src/dialogs.c:424
+#: src/dialogs.c:453
 msgid "Warn"
 msgstr "警告"
 
-#: src/conversation.c:415
+#: src/conversation.c:431
 msgid "Gaim - Save Conversation"
 msgstr "Gaim - 儲存聊天內容"
 
-#: src/conversation.c:476
+#: src/conversation.c:492
 msgid "Gaim - Insert Image"
 msgstr "Gaim - 加入影像"
 
-#: src/conversation.c:1319
+#: src/conversation.c:1336
 msgid "Unable to send message: too large"
 msgstr "無法送出訊息:太大了"
 
-#: src/conversation.c:1319
-#: src/conversation.c:1323
+#: src/conversation.c:1336 src/conversation.c:1340
 msgid "Message Error"
 msgstr "訊息錯誤"
 
-#: src/conversation.c:1323
+#: src/conversation.c:1340
 msgid "Unable to send message: Unknown reason"
 msgstr "無法送出訊息:未知原因"
 
-#: src/conversation.c:1542
+#: src/conversation.c:1559
+#, c-format
 msgid "Currently at %d, "
 msgstr "目前在 %d,"
 
-#: src/conversation.c:1550
+#: src/conversation.c:1567
+#, c-format
 msgid "Setting position to %d\n"
 msgstr ""
 
-#: src/conversation.c:2151
-#: src/prefs.c:1306
+#: src/conversation.c:2170 src/prefs.c:1308
 msgid "Bold Text"
 msgstr "粗體文字"
 
-#: src/conversation.c:2151
+#: src/conversation.c:2170
 msgid "Bold"
 msgstr "粗體"
 
-#: src/conversation.c:2155
+#: src/conversation.c:2174
 msgid "Italics Text"
 msgstr "斜體文字"
 
-#: src/conversation.c:2156
+#: src/conversation.c:2175
 msgid "Italics"
 msgstr "斜體"
 
-#: src/conversation.c:2159
-#: src/prefs.c:1318
+#: src/conversation.c:2178 src/prefs.c:1320
 msgid "Underline Text"
 msgstr "底線文字"
 
-#: src/conversation.c:2160
+#: src/conversation.c:2179
 msgid "Underline"
 msgstr "底線"
 
-#: src/conversation.c:2164
-#: src/prefs.c:1324
+#: src/conversation.c:2183 src/prefs.c:1326
 msgid "Strike through Text"
 msgstr "刪除的文字"
 
-#: src/conversation.c:2164
+#: src/conversation.c:2183
 msgid "Strike"
 msgstr "刪除"
 
-#: src/conversation.c:2170
+#: src/conversation.c:2189
 msgid "Decrease font size"
 msgstr "縮小字體"
 
-#: src/conversation.c:2170
+#: src/conversation.c:2189
 msgid "Small"
 msgstr "小"
 
-#: src/conversation.c:2173
+#: src/conversation.c:2192
 msgid "Normal font size"
 msgstr "正常字體大小"
 
-#: src/conversation.c:2173
+#: src/conversation.c:2192
 msgid "Normal"
 msgstr "正常"
 
-#: src/conversation.c:2176
+#: src/conversation.c:2195
 msgid "Increase font size"
 msgstr "增大字體"
 
-#: src/conversation.c:2176
+#: src/conversation.c:2195
 msgid "Big"
 msgstr "大"
 
-#: src/conversation.c:2183
-#: src/dialogs.c:2843
-#: src/dialogs.c:2867
+#: src/conversation.c:2202 src/dialogs.c:2883 src/dialogs.c:2907
 msgid "Select Font"
 msgstr "選擇字型"
 
-#: src/conversation.c:2184
-msgid "Font"
-msgstr "字型"
-
-#: src/conversation.c:2187
-#: src/prefs.c:1354
-msgid "Text Color"
-msgstr "文字顏色"
-
-#: src/conversation.c:2188
-#: src/conversation.c:2192
-msgid "Color"
-msgstr "顏色"
-
-#: src/conversation.c:2192
-#: src/prefs.c:1372
-msgid "Background Color"
-msgstr "背景顏色"
-
-#: src/conversation.c:2199
-#: src/dialogs.c:2466
-msgid "Insert Link"
-msgstr "加入連結"
-
-#: src/conversation.c:2200
-msgid "Link"
-msgstr "連結"
-
 #: src/conversation.c:2203
+msgid "Font"
+msgstr "字型"
+
+#: src/conversation.c:2206 src/prefs.c:1356
+msgid "Text Color"
+msgstr "文字顏色"
+
+#: src/conversation.c:2207 src/conversation.c:2211
+msgid "Color"
+msgstr "顏色"
+
+#: src/conversation.c:2211 src/prefs.c:1374
+msgid "Background Color"
+msgstr "背景顏色"
+
+#: src/conversation.c:2218 src/dialogs.c:2506
+msgid "Insert Link"
+msgstr "加入連結"
+
+#: src/conversation.c:2219
+msgid "Link"
+msgstr "連結"
+
+#: src/conversation.c:2222
 msgid "Insert smiley face"
 msgstr "加入一個笑臉"
 
-#: src/conversation.c:2203
+#: src/conversation.c:2222
 msgid "Smiley"
 msgstr "微笑"
 
-#: src/conversation.c:2206
+#: src/conversation.c:2225
 msgid "Insert IM Image"
 msgstr "加入即時訊息影像"
 
-#: src/conversation.c:2206
+#: src/conversation.c:2225
 msgid "Image"
 msgstr "影像"
 
-#: src/conversation.c:2213
+#: src/conversation.c:2232
 msgid "Enable logging"
 msgstr "開始記錄日誌"
 
-#: src/conversation.c:2214
-#: src/prefs.c:254
+#: src/conversation.c:2233 src/prefs.c:254
 msgid "Logging"
 msgstr "登入中"
 
-#: src/conversation.c:2223
+#: src/conversation.c:2242
 msgid "Save Conversation"
 msgstr "儲存交談內容"
 
-#: src/conversation.c:2224
-#: src/dialogs.c:1642
-#: src/dialogs.c:1826
-#: src/dialogs.c:3180
-#: src/dialogs.c:3868
-#: src/dialogs.c:4745
+#: src/conversation.c:2243 src/dialogs.c:1682 src/dialogs.c:1866
+#: src/dialogs.c:3220 src/dialogs.c:3908 src/dialogs.c:4785
 msgid "Save"
 msgstr "儲存"
 
-#: src/conversation.c:2228
-msgid "Enable sounds"
-msgstr "開啟音效"
-
-#: src/conversation.c:2229
+#: src/conversation.c:2247 src/conversation.c:2248
 msgid "Sound"
 msgstr "音效"
 
-#: src/conversation.c:2709
+#: src/conversation.c:2729
 msgid "Gaim - Conversations"
 msgstr "Gaim - 交談"
 
-#: src/conversation.c:2796
+#: src/conversation.c:2816
 msgid "Send message as: "
 msgstr "送出訊息為:"
 
-#: src/conversation.c:3414
+#: src/conversation.c:3453
 msgid "Gaim - Save Icon"
 msgstr "Gaim - 儲存圖示"
 
-#: src/conversation.c:3441
+#: src/conversation.c:3487
 msgid "Disable Animation"
 msgstr "關閉動畫"
 
-#: src/conversation.c:3446
+#: src/conversation.c:3492
 msgid "Enable Animation"
 msgstr "開啟動畫"
 
-#: src/conversation.c:3452
+#: src/conversation.c:3498
 msgid "Hide Icon"
 msgstr "隱藏圖示"
 
-#: src/conversation.c:3458
+#: src/conversation.c:3504
 msgid "Save Icon As..."
 msgstr "儲存圖示為…"
 
-#: src/dialogs.c:413
+#: src/dialogs.c:412
 msgid "Gaim - Warn user?"
 msgstr "Gaim - 警告使用者?"
 
-#: src/dialogs.c:433
+#: src/dialogs.c:432
+#, c-format
 msgid "Do you really want to warn %s?"
 msgstr "你真的想警告 %s?"
 
-#: src/dialogs.c:438
+#: src/dialogs.c:437
 msgid "Warn anonymously?"
 msgstr "警告所有的匿名者?"
 
-#: src/dialogs.c:442
+#: src/dialogs.c:441
 msgid "Anonymous warnings are less harsh."
 msgstr ""
 
-#: src/dialogs.c:470
+#: src/dialogs.c:469
+#, c-format
 msgid "Removing '%s' from buddylist.\n"
 msgstr "由好友名單移除 '%s'。\n"
 
-#: src/dialogs.c:495
+#: src/dialogs.c:494
+#, c-format
 msgid "Gaim - Remove %s?"
 msgstr "Gaim - 移除 %s?"
 
-#: src/dialogs.c:508
+#: src/dialogs.c:507
 msgid "Remove Buddy"
 msgstr "移除好友"
 
-#: src/dialogs.c:518
-msgid "You are about to remove '%s' from\n"
+#: src/dialogs.c:517
+#, c-format
+msgid ""
+"You are about to remove '%s' from\n"
 "your buddylist. Do you want to continue?"
-msgstr "您正試著將 '%s'  從您的好友清單\n"
+msgstr ""
+"您正試著將 '%s'  從您的好友清單\n"
 "中移除。您要繼續這個動作嗎?"
 
-#: src/dialogs.c:530
-#: src/prpl.c:154
-#: src/prpl.c:228
+#: src/dialogs.c:529 src/prpl.c:154 src/prpl.c:228
 msgid "Accept"
 msgstr "接受"
 
 #. Build OK Button
-#: src/dialogs.c:637
-#: src/dialogs.c:722
-#: src/dialogs.c:780
-#: src/dialogs.c:1437
-#: src/dialogs.c:1766
-#: src/dialogs.c:1917
-#: src/dialogs.c:2225
-#: src/dialogs.c:2405
-#: src/dialogs.c:2471
-#: src/dialogs.c:3977
-#: src/dialogs.c:4083
-#: src/multi.c:774
+#: src/dialogs.c:635 src/dialogs.c:720 src/dialogs.c:821 src/dialogs.c:1477
+#: src/dialogs.c:1806 src/dialogs.c:1957 src/dialogs.c:2265 src/dialogs.c:2445
+#: src/dialogs.c:2511 src/dialogs.c:4017 src/dialogs.c:4123 src/multi.c:786
 msgid "OK"
 msgstr "確定"
 
-#: src/dialogs.c:689
+#: src/dialogs.c:687
 msgid "Gaim - IM user"
 msgstr "Gaim - 即時訊息使用者"
 
-#: src/dialogs.c:706
+#: src/dialogs.c:704
 msgid "IM who:"
 msgstr "將即時訊息送給:"
 
-#: src/dialogs.c:758
+#: src/dialogs.c:768
 msgid "User:"
 msgstr "使用者:"
 
+#: src/dialogs.c:777
+#, fuzzy
+msgid "Account:"
+msgstr "帳號"
+
 #. Finish up
-#: src/dialogs.c:785
+#: src/dialogs.c:826
 msgid "Gaim - Get User Info"
 msgstr "Gaim - 取得使用者資訊"
 
-#: src/dialogs.c:900
+#: src/dialogs.c:940
 msgid "Add Group"
 msgstr "加入群組"
 
-#: src/dialogs.c:925
+#: src/dialogs.c:965
 msgid "Gaim - Add Group"
 msgstr "Gaim - 加入群組"
 
-#: src/dialogs.c:1009
+#: src/dialogs.c:1049
 msgid "Gaim - Add Buddy"
 msgstr "Gaim - 新增好友"
 
-#: src/dialogs.c:1021
+#: src/dialogs.c:1061
 msgid "Add Buddy"
 msgstr "新增好友"
 
-#: src/dialogs.c:1031
+#: src/dialogs.c:1071
 msgid "Contact"
 msgstr "連絡"
 
 #. Set up stuff for the account box
-#: src/dialogs.c:1057
+#: src/dialogs.c:1097
 msgid "Add To"
 msgstr "增加到"
 
-#: src/dialogs.c:1094
+#: src/dialogs.c:1134
 msgid "Please enter a buddy to pounce."
 msgstr ""
 
-#: src/dialogs.c:1094
+#: src/dialogs.c:1134
 msgid "Buddy Pounce Error"
 msgstr ""
 
-#: src/dialogs.c:1230
+#: src/dialogs.c:1270
 msgid "Gaim - New Buddy Pounce"
 msgstr ""
 
 #. <pounce type="who">
-#: src/dialogs.c:1241
+#: src/dialogs.c:1281
 msgid "Pounce Who"
 msgstr ""
 
-#: src/dialogs.c:1252
+#: src/dialogs.c:1292
 msgid "Account"
 msgstr "帳號"
 
 #. </pounce type="who">
 #. <pounce type="when">
-#: src/dialogs.c:1278
+#: src/dialogs.c:1318
 msgid "Pounce When"
 msgstr ""
 
-#: src/dialogs.c:1288
+#: src/dialogs.c:1328
 msgid "Pounce on sign on"
 msgstr ""
 
-#: src/dialogs.c:1297
+#: src/dialogs.c:1337
 msgid "Pounce on return from away"
 msgstr ""
 
-#: src/dialogs.c:1306
+#: src/dialogs.c:1346
 msgid "Pounce on return from idle"
 msgstr ""
 
-#: src/dialogs.c:1315
+#: src/dialogs.c:1355
 msgid "Pounce when buddy is typing to you"
 msgstr ""
 
 #. </pounce type="when">
 #. <pounce type="action">
-#: src/dialogs.c:1325
+#: src/dialogs.c:1365
 msgid "Pounce Action"
 msgstr ""
 
-#: src/dialogs.c:1336
+#: src/dialogs.c:1376
 msgid "Open IM Window"
 msgstr "開啟即時訊息視窗"
 
-#: src/dialogs.c:1345
+#: src/dialogs.c:1385
 msgid "Popup Notification"
 msgstr "跳出通知"
 
-#: src/dialogs.c:1354
+#: src/dialogs.c:1394
 msgid "Send Message"
 msgstr "送出訊息"
 
-#: src/dialogs.c:1375
+#: src/dialogs.c:1415
 msgid "Execute command on pounce"
 msgstr ""
 
-#: src/dialogs.c:1397
+#: src/dialogs.c:1437
 msgid "Play sound on pounce"
 msgstr ""
 
 #. </pounce type="action">
-#: src/dialogs.c:1419
+#: src/dialogs.c:1459
 msgid "Save this pounce after activation"
 msgstr ""
 
-#: src/dialogs.c:1505
+#: src/dialogs.c:1545
 msgid "Gaim - Set Dir Info"
 msgstr "Gaim - 設定目錄資訊"
 
-#: src/dialogs.c:1514
+#: src/dialogs.c:1554
 msgid "Directory Info"
 msgstr "目錄資訊"
 
-#: src/dialogs.c:1536
+#: src/dialogs.c:1576
 msgid "Allow Web Searches To Find Your Info"
 msgstr "允許在 Web 搜尋來檢視您的個人資訊"
 
 #. Line 1
-#: src/dialogs.c:1539
-#: src/dialogs.c:2244
+#: src/dialogs.c:1579 src/dialogs.c:2284
 msgid "First Name"
 msgstr "名"
 
 #. Line 2
-#: src/dialogs.c:1550
-#: src/dialogs.c:2256
+#: src/dialogs.c:1590 src/dialogs.c:2296
 msgid "Middle Name"
 msgstr ""
 
 #. Line 3
-#: src/dialogs.c:1562
-#: src/dialogs.c:2268
+#: src/dialogs.c:1602 src/dialogs.c:2308
 msgid "Last Name"
 msgstr "姓"
 
 #. Line 4
-#: src/dialogs.c:1573
-#: src/dialogs.c:2280
+#: src/dialogs.c:1613 src/dialogs.c:2320
 msgid "Maiden Name"
 msgstr ""
 
 #. Line 6
-#: src/dialogs.c:1595
-#: src/dialogs.c:2303
+#: src/dialogs.c:1635 src/dialogs.c:2343
 msgid "State"
 msgstr "省"
 
-#: src/dialogs.c:1660
+#: src/dialogs.c:1700
 msgid "New Passwords Do Not Match"
 msgstr "新密碼並不相符"
 
-#: src/dialogs.c:1660
-#: src/dialogs.c:1665
+#: src/dialogs.c:1700 src/dialogs.c:1705
 msgid "Gaim - Change Password Error"
 msgstr "Gaim - 修改密碼錯誤"
 
-#: src/dialogs.c:1665
+#: src/dialogs.c:1705
 msgid "Fill out all fields completely"
 msgstr "把所有的表格都填了"
 
-#: src/dialogs.c:1720
+#: src/dialogs.c:1760
 msgid "Original Password"
 msgstr "舊密碼"
 
-#: src/dialogs.c:1734
+#: src/dialogs.c:1774
 msgid "New Password"
 msgstr "新密碼"
 
-#: src/dialogs.c:1748
+#: src/dialogs.c:1788
 msgid "New Password (again)"
 msgstr "新密碼(再次確認)"
 
-#: src/dialogs.c:1789
+#: src/dialogs.c:1829
 msgid "Gaim - Set User Info"
 msgstr "Gaim - 設定使用者資訊"
 
-#: src/dialogs.c:1901
+#: src/dialogs.c:1941
 msgid "Below are the results of your search: "
 msgstr "以下是您所做查詢的結果:"
 
-#: src/dialogs.c:2034
-#: src/dialogs.c:2041
+#: src/dialogs.c:2074 src/dialogs.c:2081
 msgid "Permit"
 msgstr "許可"
 
-#: src/dialogs.c:2036
-#: src/dialogs.c:2043
+#: src/dialogs.c:2076 src/dialogs.c:2083
 msgid "Deny"
 msgstr "拒絕"
 
-#: src/dialogs.c:2080
+#: src/dialogs.c:2120
 msgid "Gaim - Add Permit"
 msgstr "Gaim - 加入許可"
 
-#: src/dialogs.c:2082
+#: src/dialogs.c:2122
 msgid "Gaim - Add Deny"
 msgstr "Gaim - 增加禁止人"
 
-#: src/dialogs.c:2142
+#: src/dialogs.c:2182
 msgid "Gaim - Log Conversation"
 msgstr "Gaim - 記錄交談"
 
-#: src/dialogs.c:2220
-#: src/dialogs.c:2383
+#: src/dialogs.c:2260 src/dialogs.c:2423
 msgid "Search for Buddy"
 msgstr "找尋好友"
 
-#: src/dialogs.c:2348
+#: src/dialogs.c:2388
 msgid "Gaim - Find Buddy By Info"
 msgstr "Gaim - 以資訊找尋好友"
 
-#: src/dialogs.c:2377
+#: src/dialogs.c:2417
 msgid "Gaim - Find Buddy By Email"
 msgstr "Gaim - 以 Email 來找尋好友"
 
-#: src/dialogs.c:2517
+#: src/dialogs.c:2557
 msgid "Gaim - Add URL"
 msgstr "Gaim - 增加 URL"
 
-#: src/dialogs.c:2668
-#: src/dialogs.c:2689
-#: src/dialogs.c:2743
+#: src/dialogs.c:2708 src/dialogs.c:2729 src/dialogs.c:2783
 msgid "Select Text Color"
 msgstr "設定文字顏色"
 
-#: src/dialogs.c:2722
+#: src/dialogs.c:2762
 msgid "Select Background Color"
 msgstr "設定背景顏色"
 
-#: src/dialogs.c:2944
+#: src/dialogs.c:2984
 msgid "Import to:"
 msgstr "匯入到:"
 
-#: src/dialogs.c:2968
+#: src/dialogs.c:3008
 msgid "Gaim - Import Buddy List"
 msgstr "Gaim - 匯入好友名單"
 
 #. We shouldn't allow a blank title
-#: src/dialogs.c:3035
+#: src/dialogs.c:3075
 msgid "You cannot create an away message with a blank title"
 msgstr "您不能建立一個沒有原因的離開訊息"
 
 #. We shouldn't allow a blank message
-#: src/dialogs.c:3042
+#: src/dialogs.c:3082
 msgid "You cannot create an empty away message"
 msgstr "您無法建立一個空白的離開訊息"
 
-#: src/dialogs.c:3110
+#: src/dialogs.c:3150
 msgid "Gaim - New away message"
 msgstr "Gaim - 新的離開訊息"
 
-#: src/dialogs.c:3120
+#: src/dialogs.c:3160
 msgid "New away message"
 msgstr "新的離開訊息"
 
-#: src/dialogs.c:3133
+#: src/dialogs.c:3173
 msgid "Away title: "
 msgstr "離開原因:"
 
-#: src/dialogs.c:3172
+#: src/dialogs.c:3212
 msgid "Use"
 msgstr "使用"
 
-#: src/dialogs.c:3176
+#: src/dialogs.c:3216
 msgid "Save & Use"
 msgstr "儲存並使用"
 
-#: src/dialogs.c:3373
+#. show everything
+#: src/dialogs.c:3413
 msgid "Smile!"
 msgstr "笑一個!"
 
-#: src/dialogs.c:3426
+#: src/dialogs.c:3466
 msgid "Alias Buddy"
 msgstr "為好友加上別名"
 
-#: src/dialogs.c:3459
+#: src/dialogs.c:3499
 msgid "Gaim - Alias Buddy"
 msgstr "Gaim - 為好友加上別名"
 
-#: src/dialogs.c:3531
+#: src/dialogs.c:3571
 msgid "Gaim - Save Log File"
 msgstr "Gaim - 儲存日誌檔"
 
-#: src/dialogs.c:3563
+#: src/dialogs.c:3603
+#, c-format
 msgid "Unable to remove file %s - %s"
 msgstr "無法刪除檔案 %s - %s"
 
-#: src/dialogs.c:3591
+#: src/dialogs.c:3631
 msgid "Really clear log?"
 msgstr "真的要清除日誌嗎?"
 
-#: src/dialogs.c:3606
+#: src/dialogs.c:3646
 msgid "Okay"
 msgstr "確定"
 
-#: src/dialogs.c:3777
+#: src/dialogs.c:3817
 msgid "Date"
 msgstr "日期"
 
-#: src/dialogs.c:3840
+#: src/dialogs.c:3880
 msgid "Conversation"
 msgstr "交談"
 
-#: src/dialogs.c:3863
+#: src/dialogs.c:3903
 msgid "Clear"
 msgstr "清除"
 
-#: src/dialogs.c:3941
+#: src/dialogs.c:3981
 msgid "Gaim - Rename Group"
 msgstr "Gaim - 修改群組名稱"
 
-#: src/dialogs.c:3951
+#: src/dialogs.c:3991
 msgid "Rename Group"
 msgstr "修改群組名稱"
 
-#: src/dialogs.c:3958
-#: src/dialogs.c:4064
+#: src/dialogs.c:3998 src/dialogs.c:4104
 msgid "New name:"
 msgstr "新名字:"
 
-#: src/dialogs.c:4047
+#: src/dialogs.c:4087
 msgid "Gaim - Rename Buddy"
 msgstr "Gaim - 修改好友名稱"
 
-#: src/dialogs.c:4057
+#: src/dialogs.c:4097
 msgid "Rename Buddy"
 msgstr "修改好友名稱"
 
 #. Below is basically stolen from plugins.c
-#: src/dialogs.c:4141
+#: src/dialogs.c:4181
 msgid "Gaim - Select Perl Script"
 msgstr "Gaim - 選擇 Perl 命令稿"
 
-#: src/gaimrc.c:1117
+#: src/gaimrc.c:1136
+#, c-format
 msgid "Could not open config file %s."
 msgstr "無法開啟設定檔 %s。"
 
-#: src/gaimrc.c:1118
+#: src/gaimrc.c:1137
 msgid "Preferences Error"
 msgstr "偏好設定錯誤"
 
 #: src/html.c:183
+#, c-format
 msgid "Received: '%s'\n"
 msgstr "收到:'%s'\n"
 
@@ -2329,118 +2654,137 @@
 msgid "g003: Error opening connection.\n"
 msgstr "g003: 連線開啟錯誤。\n"
 
-#: src/multi.c:452
+#: src/module.c:106 src/module.c:112 src/module.c:122
+#, fuzzy
+msgid "Plugin Error"
+msgstr "登入錯誤"
+
+#: src/multi.c:454
 msgid "Gaim - Load Buddy Icon"
 msgstr "Gaim - 讀取好友圖示"
 
-#: src/multi.c:495
+#: src/multi.c:497
 msgid "Buddy Icon File:"
 msgstr "好友圖示檔案:"
 
-#: src/multi.c:506
+#: src/multi.c:508
 msgid "Browse"
 msgstr "瀏覽"
 
-#: src/multi.c:511
-#: src/prefs.c:1546
+#: src/multi.c:513 src/prefs.c:1548
 msgid "Reset"
 msgstr "重置"
 
-#: src/multi.c:538
+#: src/multi.c:540
 msgid "Screenname:"
 msgstr "帳號"
 
-#: src/multi.c:558
+#: src/multi.c:559
+#, fuzzy
+msgid "Alias:"
+msgstr "別名"
+
+#: src/multi.c:569
 msgid "Protocol:"
 msgstr "通訊協定:"
 
-#: src/multi.c:563
+#: src/multi.c:574
 msgid "Remember Password"
 msgstr "記住密碼"
 
-#: src/multi.c:564
+#: src/multi.c:575
 msgid "Auto-Login"
 msgstr "自動登入"
 
-#: src/multi.c:604
+#: src/multi.c:616
 msgid "New Mail Notifications"
 msgstr "新郵件通知"
 
-#: src/multi.c:694
+#: src/multi.c:706
 msgid "Register with server"
 msgstr "向伺服器註冊"
 
-#: src/multi.c:752
+#: src/multi.c:764
 msgid "Gaim - Modify Account"
 msgstr "Gaim - 修改帳號"
 
-#: src/multi.c:871
+#: src/multi.c:883
 msgid "Enter Password"
 msgstr "輸入密碼"
 
-#: src/multi.c:935
-msgid "You cannot log this account in; you do not have the protocol it uses loaded, or the protocol does not have a login function."
-msgstr "您無法使用這個帳號來登入;您可能沒有設定這個帳號所使用的 Protocol,或者這個 Protocol 並沒有提供登入的功能。"
-
-#: src/multi.c:937
+#: src/multi.c:947
+msgid ""
+"You cannot log this account in; you do not have the protocol it uses loaded, "
+"or the protocol does not have a login function."
+msgstr ""
+"您無法使用這個帳號來登入;您可能沒有設定這個帳號所使用的 Protocol,或者這個 "
+"Protocol 並沒有提供登入的功能。"
+
+#: src/multi.c:949
 msgid "Login Error"
 msgstr "登入錯誤"
 
-#: src/multi.c:966
+#: src/multi.c:978
+#, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "您確定要刪除 %s?"
 
-#: src/multi.c:1003
+#: src/multi.c:1015
 msgid "Gaim - Account Editor"
 msgstr "Gaim - 帳號管理"
 
-#: src/multi.c:1022
+#: src/multi.c:1034
 msgid "Select All"
 msgstr "全部選取"
 
-#: src/multi.c:1027
+#: src/multi.c:1039
 msgid "Select Autos"
 msgstr ""
 
-#: src/multi.c:1031
+#: src/multi.c:1043
 msgid "Select None"
 msgstr "取消選取"
 
-#: src/multi.c:1045
+#: src/multi.c:1057
 msgid "Modify"
 msgstr "修改"
 
-#: src/multi.c:1049
+#: src/multi.c:1061
 msgid "Sign On/Off"
 msgstr "登入/登出"
 
-#: src/multi.c:1053
+#: src/multi.c:1065
 msgid "Delete"
 msgstr "刪除"
 
-#: src/multi.c:1368
-msgid "%s\n"
+#: src/multi.c:1380
+#, c-format
+msgid ""
+"%s\n"
 "%s: %s"
-msgstr "%s\n"
+msgstr ""
+"%s\n"
 "%s: %s"
 
-#: src/multi.c:1387
+#: src/multi.c:1399
+#, c-format
 msgid "%s was unable to sign on"
 msgstr "%s 無法登入"
 
-#: src/multi.c:1398
+#: src/multi.c:1410
 msgid "Notice"
 msgstr "通知"
 
-#: src/multi.c:1408
+#: src/multi.c:1420
+#, c-format
 msgid "%s has been signed off"
 msgstr "%s 已經登出"
 
-#: src/multi.c:1409
+#: src/multi.c:1421
 msgid "Connection Error"
 msgstr "連線錯誤"
 
-#: src/perl.c:856
+#: src/perl.c:875
 msgid "Perl Scripts"
 msgstr "Perl 命令稿"
 
@@ -2501,16 +2845,9 @@
 msgid "General Options"
 msgstr "一般選項"
 
-#: src/prefs.c:200
-#: src/prefs.c:383
-#: src/prefs.c:551
-#: src/prefs.c:665
-#: src/prefs.c:919
-#: src/prefs.c:1069
-#: src/prefs.c:1294
-#: src/prefs.c:1616
-#: src/prefs.c:1890
-#: src/prefs.c:2323
+#: src/prefs.c:200 src/prefs.c:384 src/prefs.c:552 src/prefs.c:667
+#: src/prefs.c:921 src/prefs.c:1071 src/prefs.c:1296 src/prefs.c:1629
+#: src/prefs.c:1901 src/prefs.c:2334
 msgid "All options take effect immediately unless otherwise noted."
 msgstr "所有的選項將在設定後馬上生效。"
 
@@ -2584,8 +2921,8 @@
 msgstr "瀏覽器"
 
 #: src/prefs.c:291
-msgid "KFM"
-msgstr "KFM"
+msgid "Konqueror"
+msgstr ""
 
 #: src/prefs.c:292
 msgid "Opera"
@@ -2595,527 +2932,520 @@
 msgid "Netscape"
 msgstr "Netscape"
 
-#: src/prefs.c:296
+#: src/prefs.c:294
+msgid "Mozilla"
+msgstr ""
+
+#: src/prefs.c:297
 msgid "Pop up new window by default"
 msgstr "預設為彈出個一新的視窗"
 
-#: src/prefs.c:303
+#: src/prefs.c:304
 msgid "GNOME URL Handler"
 msgstr "GNOME URL Handler"
 
-#: src/prefs.c:305
+#: src/prefs.c:306
 msgid "Galeon"
 msgstr "Galeon"
 
-#: src/prefs.c:306
-msgid "Manual"
-msgstr "自定"
-
-#: src/prefs.c:375
+#: src/prefs.c:307
+#, c-format
+msgid "Manual (%s for URL)"
+msgstr ""
+
+#: src/prefs.c:376
 msgid "Proxy Options"
 msgstr "代理伺服器選項"
 
-#: src/prefs.c:387
-msgid "Not all protocols can use these proxy options. Please see the README file for details."
-msgstr "並不是所有的通訊協定都可以使用這些代理伺服器的選項。\n"
+#: src/prefs.c:388
+msgid ""
+"Not all protocols can use these proxy options. Please see the README file "
+"for details."
+msgstr ""
+"並不是所有的通訊協定都可以使用這些代理伺服器的選項。\n"
 "請參考 README 來獲得更進一步的資訊。"
 
-#: src/prefs.c:392
+#: src/prefs.c:393
 msgid "Proxy Type"
 msgstr "代理伺服器型態"
 
-#: src/prefs.c:404
+#: src/prefs.c:405
 msgid "Proxy Server"
 msgstr "代理伺服器"
 
-#: src/prefs.c:407
+#: src/prefs.c:408
 msgid "No Proxy"
 msgstr "沒有代理伺服器"
 
-#: src/prefs.c:419
+#: src/prefs.c:420
 msgid "SOCKS 4"
 msgstr "SOCKS 4"
 
-#: src/prefs.c:429
+#: src/prefs.c:430
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
-#: src/prefs.c:438
+#: src/prefs.c:439
 msgid "HTTP"
 msgstr "HTTP"
 
-#: src/prefs.c:462
+#: src/prefs.c:463
 msgid "Host"
 msgstr "主機位址"
 
-#: src/prefs.c:478
+#: src/prefs.c:479
 msgid "Port"
 msgstr "端口"
 
-#: src/prefs.c:495
+#: src/prefs.c:496
 msgid "User"
 msgstr "使用者"
 
-#: src/prefs.c:511
+#: src/prefs.c:512
 msgid "Password"
 msgstr "密碼"
 
-#: src/prefs.c:543
+#: src/prefs.c:544
 msgid "Buddy List Options"
 msgstr "好友名單選項"
 
-#: src/prefs.c:555
+#: src/prefs.c:556
 msgid "Buddy List Window"
 msgstr "好友名單視窗"
 
-#: src/prefs.c:568
+#: src/prefs.c:569
 msgid "Tab Placement:"
 msgstr "Tab 位置:"
 
-#: src/prefs.c:572
-#: src/prefs.c:1002
-#: src/prefs.c:1152
+#: src/prefs.c:573 src/prefs.c:1004 src/prefs.c:1154
 msgid "Top"
 msgstr "視窗上方"
 
-#: src/prefs.c:573
-#: src/prefs.c:1004
-#: src/prefs.c:1154
+#: src/prefs.c:574 src/prefs.c:1006 src/prefs.c:1156
 msgid "Bottom"
 msgstr "視窗下方"
 
-#: src/prefs.c:585
+#: src/prefs.c:586
 msgid "Hide IM/Info/Chat buttons"
 msgstr "隱藏「即時訊息、資訊、聊天」按鍵"
 
-#: src/prefs.c:587
+#: src/prefs.c:588
 msgid "Automatically show buddy list on sign on"
 msgstr "在登入時自動顯示好友名單"
 
-#: src/prefs.c:589
+#: src/prefs.c:590
 msgid "Display Buddy List near applet"
 msgstr ""
 
-#: src/prefs.c:592
+#: src/prefs.c:593
 msgid "Save Window Size/Position"
 msgstr "保存視窗的大小和位置"
 
-#: src/prefs.c:595
+#: src/prefs.c:596
 msgid "Show pictures on buttons"
 msgstr "在按鍵上顯示圖示"
 
 #: src/prefs.c:600
+msgid "Raise Buddy List on Signons and Signoffs"
+msgstr ""
+
+#: src/prefs.c:602
 msgid "Group Displays"
 msgstr "群組顯示"
 
-#: src/prefs.c:612
+#: src/prefs.c:614
 msgid "Hide groups with no online buddies"
 msgstr "隱藏目前沒有線上好友的群組"
 
-#: src/prefs.c:618
+#: src/prefs.c:620
 msgid "Show numbers in groups"
 msgstr "顯示群組裡的好友數目"
 
-#: src/prefs.c:620
+#: src/prefs.c:622
 msgid "Buddy Displays"
 msgstr "好友顯示"
 
-#: src/prefs.c:632
+#: src/prefs.c:634
 msgid "Show buddy type icons"
 msgstr "顯示好友類別圖示"
 
-#: src/prefs.c:633
+#: src/prefs.c:635
 msgid "Show warning levels"
 msgstr "顯示警告等級"
 
-#: src/prefs.c:639
+#: src/prefs.c:641
 msgid "Show idle times"
 msgstr "顯示閒置時間"
 
-#: src/prefs.c:640
+#: src/prefs.c:642
 msgid "Grey idle buddies"
 msgstr "把閒置的好友設為灰色"
 
-#: src/prefs.c:657
+#: src/prefs.c:659
 msgid "Conversation Options"
 msgstr "交談選項"
 
-#: src/prefs.c:669
+#: src/prefs.c:671
 msgid "Keyboard Options"
 msgstr "鍵盤選單"
 
-#: src/prefs.c:681
-msgid "Enter sends message"
-msgstr "按下 Enter 送出訊息"
-
-#: src/prefs.c:682
-msgid "Control-Enter sends message"
-msgstr "按下 Ctrl-Enter 送出訊息"
-
 #: src/prefs.c:683
-msgid "Escape closes window"
-msgstr "按下 Escape 關閉視窗"
+msgid "Enter sends message"
+msgstr "按下 Enter 送出訊息"
 
 #: src/prefs.c:684
+msgid "Control-Enter sends message"
+msgstr "按下 Ctrl-Enter 送出訊息"
+
+#: src/prefs.c:685
+msgid "Escape closes window"
+msgstr "按下 Escape 關閉視窗"
+
+#: src/prefs.c:686
 msgid "Control-W closes window"
 msgstr "按下 Ctrl-W 關閉視窗"
 
-#: src/prefs.c:690
+#: src/prefs.c:692
 msgid "Control-{B/I/U/S} inserts HTML tags"
 msgstr "按下 Ctrl-{B/I/U/S} 加入 HTML 標籤"
 
-#: src/prefs.c:691
+#: src/prefs.c:693
 msgid "Control-(number) inserts smileys"
 msgstr "按下 CTRL-(Number) 來加入一個笑臉"
 
-#: src/prefs.c:692
+#: src/prefs.c:694
 msgid "F2 toggles timestamp display"
 msgstr ""
 
-#: src/prefs.c:694
+#: src/prefs.c:696
 msgid "Display and General Options"
 msgstr "顯示及一般選項"
 
-#: src/prefs.c:706
+#: src/prefs.c:708
 msgid "Show graphical smileys"
 msgstr "顯示所有的笑臉圖示"
 
-#: src/prefs.c:707
-msgid "Show timestamp on messages"
-msgstr "顯示訊息時間"
-
-#: src/prefs.c:708
-msgid "Show URLs as links"
-msgstr "顯示 URL 為超連結"
-
 #: src/prefs.c:709
+msgid "Show timestamp on messages"
+msgstr "顯示訊息時間"
+
+#: src/prefs.c:710
+msgid "Show URLs as links"
+msgstr "顯示 URL 為超連結"
+
+#: src/prefs.c:711
 msgid "Highlight misspelled words"
 msgstr "標示出錯誤的拼字"
 
-#: src/prefs.c:710
-#: src/prefs.c:1912
+#: src/prefs.c:712 src/prefs.c:1923
 msgid "Sending messages removes away status"
 msgstr "送出訊息時取消離開狀態"
 
-#: src/prefs.c:711
-#: src/prefs.c:1925
+#: src/prefs.c:713 src/prefs.c:1936
 msgid "Queue new messages when away"
 msgstr "在離開時,將所有的新訊息置入佇列中"
 
-#: src/prefs.c:717
+#: src/prefs.c:719
 msgid "Ignore colors"
 msgstr "忽略顏色"
 
-#: src/prefs.c:718
+#: src/prefs.c:720
 msgid "Ignore font faces"
 msgstr "忽略字型"
 
-#: src/prefs.c:719
+#: src/prefs.c:721
 msgid "Ignore font sizes"
 msgstr "忽略字體大小"
 
-#: src/prefs.c:720
+#: src/prefs.c:722
 msgid "Ignore TiK Automated Messages"
 msgstr "忽略 Tik 自動訊息"
 
-#: src/prefs.c:721
-#: src/prefs.c:1910
+#: src/prefs.c:723 src/prefs.c:1921
 msgid "Ignore new conversations when away"
 msgstr "在離開時,忽略新的交談"
 
-#: src/prefs.c:910
+#: src/prefs.c:912
 msgid "IM Options"
 msgstr "即時訊息選項"
 
-#: src/prefs.c:923
-#: src/prefs.c:2908
+#: src/prefs.c:925 src/prefs.c:2921
 msgid "IM Window"
 msgstr "即時訊息視窗"
 
-#: src/prefs.c:939
-#: src/prefs.c:1089
+#: src/prefs.c:941 src/prefs.c:1091
 msgid "Show buttons as: "
 msgstr "顯示按鍵為:"
 
-#: src/prefs.c:943
-#: src/prefs.c:1094
+#: src/prefs.c:945 src/prefs.c:1096
 msgid "Pictures And Text"
 msgstr "圖形與文字"
 
-#: src/prefs.c:944
-#: src/prefs.c:1096
+#: src/prefs.c:946 src/prefs.c:1098
 msgid "Pictures"
 msgstr "圖形"
 
-#: src/prefs.c:945
-#: src/prefs.c:1097
+#: src/prefs.c:947 src/prefs.c:1099
 msgid "Text"
 msgstr "文字"
 
-#: src/prefs.c:956
+#: src/prefs.c:958
 msgid "Show all conversations in one tabbed window"
 msgstr "將所有的交談顯示在同一個有標籤的視窗中"
 
-#: src/prefs.c:958
+#: src/prefs.c:960
 msgid "Show chats in the same tabbed window"
 msgstr "將所有的聊天顯示在同一個有標籤的視窗中"
 
-#: src/prefs.c:965
-#: src/prefs.c:1117
+#: src/prefs.c:967 src/prefs.c:1119
 msgid "Raise windows on events"
 msgstr "當事件發生時,將視窗提到最上方"
 
-#: src/prefs.c:966
+#: src/prefs.c:968
 msgid "Show logins in window"
 msgstr "在視窗中顯示登入訊息"
 
-#: src/prefs.c:967
-msgid "Show aliases in tabs/titles"
+#: src/prefs.c:969
+msgid "Show aliases in tabs/titles/ticker"
 msgstr ""
 
-#: src/prefs.c:968
-msgid "Hide window on send"
-msgstr "送出訊息後關閉視穿"
-
 #: src/prefs.c:970
-#: src/prefs.c:1120
+msgid "Hide window on send"
+msgstr "送出訊息後關閉視穿"
+
+#: src/prefs.c:972 src/prefs.c:1122
 msgid "Window Sizes"
 msgstr "視窗大小"
 
-#: src/prefs.c:978
-#: src/prefs.c:1128
+#: src/prefs.c:980 src/prefs.c:1130
 msgid "New window width:"
 msgstr "新視窗寬度:"
 
-#: src/prefs.c:979
-#: src/prefs.c:1129
+#: src/prefs.c:981 src/prefs.c:1131
 msgid "New window height:"
 msgstr "新視窗高度:"
 
-#: src/prefs.c:980
-#: src/prefs.c:1130
+#: src/prefs.c:982 src/prefs.c:1132
 msgid "Entry widget height:"
 msgstr "輸入欄位的高度:"
 
-#: src/prefs.c:982
-#: src/prefs.c:1132
+#: src/prefs.c:984 src/prefs.c:1134
 msgid "Tab Placement"
 msgstr "Tab 位置"
 
-#: src/prefs.c:1011
-#: src/prefs.c:1161
+#: src/prefs.c:1013 src/prefs.c:1163
 msgid "Left"
 msgstr "視窗左側"
 
-#: src/prefs.c:1013
-#: src/prefs.c:1163
+#: src/prefs.c:1015 src/prefs.c:1165
 msgid "Right"
 msgstr "視窗右側"
 
-#: src/prefs.c:1017
+#: src/prefs.c:1019
 msgid "Buddy Icons"
 msgstr "好友圖示"
 
-#: src/prefs.c:1029
+#: src/prefs.c:1031
 msgid "Hide Buddy Icons"
 msgstr "隱藏好友圖示"
 
-#: src/prefs.c:1035
+#: src/prefs.c:1037
 msgid "Disable Buddy Icon Animation"
 msgstr "關閉好友圖示動畫"
 
-#: src/prefs.c:1061
+#: src/prefs.c:1063
 msgid "Chat Options"
 msgstr "聊天選項"
 
-#: src/prefs.c:1073
+#: src/prefs.c:1075
 msgid "Group Chat Window"
 msgstr "群組聊天視窗"
 
-#: src/prefs.c:1108
+#: src/prefs.c:1110
 msgid "Show all chats in one tabbed window"
 msgstr "將所有的聊天顯示在同一個有標籤的視窗中"
 
-#: src/prefs.c:1110
+#: src/prefs.c:1112
 msgid "Show conversations in the same tabbed window"
 msgstr "將所有的交談顯示在同一個有標籤的視窗中"
 
-#: src/prefs.c:1118
+#: src/prefs.c:1120
 msgid "Show people joining/leaving in window"
 msgstr "在視窗中顯示其他人進入或離開的事件"
 
-#: src/prefs.c:1166
+#: src/prefs.c:1168
 msgid "Tab Completion"
 msgstr ""
 
-#: src/prefs.c:1178
+#: src/prefs.c:1180
 msgid "Tab-Complete Nicks"
 msgstr ""
 
-#: src/prefs.c:1184
+#: src/prefs.c:1186
 msgid "Old-Style Tab Completion"
 msgstr ""
 
-#: src/prefs.c:1286
-#: src/prefs.c:2918
+#: src/prefs.c:1288 src/prefs.c:2931
 msgid "Font Options"
 msgstr "字型選項"
 
-#: src/prefs.c:1312
+#: src/prefs.c:1314
 msgid "Italic Text"
 msgstr "斜体文字"
 
-#: src/prefs.c:1356
-#: src/prefs.c:1374
-#: src/prefs.c:1396
+#: src/prefs.c:1358 src/prefs.c:1376 src/prefs.c:1398
 msgid "Select"
 msgstr "選取"
 
-#: src/prefs.c:1394
+#: src/prefs.c:1396
 msgid "Font Face for Text"
 msgstr "文字的字型"
 
-#: src/prefs.c:1409
+#: src/prefs.c:1411
 msgid "Font Size for Text"
 msgstr "文字的字體大小"
 
-#: src/prefs.c:1506
+#: src/prefs.c:1508
 msgid "Gaim - Sound Configuration"
 msgstr "Gaim - 音效設定"
 
-#: src/prefs.c:1541
+#: src/prefs.c:1543
 msgid "Test"
 msgstr "測試"
 
-#: src/prefs.c:1551
+#: src/prefs.c:1553
 msgid "Choose..."
 msgstr "選擇…"
 
-#: src/prefs.c:1608
+#: src/prefs.c:1621
 msgid "Sound Options"
 msgstr "音效選項"
 
-#: src/prefs.c:1636
+#: src/prefs.c:1649
 msgid "No sounds when you log in"
 msgstr ""
 
-#: src/prefs.c:1642
-#: src/prefs.c:1911
+#: src/prefs.c:1655 src/prefs.c:1922
 msgid "Sounds while away"
 msgstr ""
 
-#: src/prefs.c:1652
+#: src/prefs.c:1665
 msgid "Sound method"
 msgstr ""
 
-#: src/prefs.c:1726
-msgid "Sound command\n"
+#: src/prefs.c:1739
+#, c-format
+msgid ""
+"Sound command\n"
 "(%s for filename)"
 msgstr ""
 
-#: src/prefs.c:1738
+#: src/prefs.c:1751
 msgid "Sound played when:"
 msgstr "播放音效,當:"
 
-#: src/prefs.c:1882
-#: src/prefs.c:2940
+#: src/prefs.c:1893 src/prefs.c:2953
 msgid "Away Messages"
 msgstr "離開訊息"
 
-#: src/prefs.c:1919
+#: src/prefs.c:1930
 msgid "Don't send auto-response"
 msgstr "不要送出自動回應"
 
-#: src/prefs.c:1920
+#: src/prefs.c:1931
 msgid "Only send auto-response when idle"
 msgstr "只在閒置的時候送出自動回應"
 
-#: src/prefs.c:1935
+#: src/prefs.c:1946
 msgid "Time between sending auto-responses (in seconds):"
 msgstr "送出自動回應的間隔時間(秒):"
 
-#: src/prefs.c:1950
+#: src/prefs.c:1961
 msgid "Auto Away after"
 msgstr "自動離開,經過"
 
-#: src/prefs.c:1964
+#: src/prefs.c:1975
 msgid "minutes using"
 msgstr "使用的分鐘數"
 
-#: src/prefs.c:1977
+#: src/prefs.c:1988
 msgid "Messages"
 msgstr "訊息"
 
-#: src/prefs.c:2034
+#: src/prefs.c:2045
 msgid "Edit"
 msgstr "編輯"
 
-#: src/prefs.c:2038
+#: src/prefs.c:2049
 msgid "Make Away"
 msgstr ""
 
-#: src/prefs.c:2315
+#: src/prefs.c:2326
 msgid "Privacy Options"
 msgstr "隱私選項"
 
-#: src/prefs.c:2331
+#: src/prefs.c:2342
 msgid "Set privacy for:"
 msgstr ""
 
-#: src/prefs.c:2350
+#: src/prefs.c:2361
 msgid "Allow all users to contact me"
 msgstr "允許所有的使用者和我聯絡"
 
-#: src/prefs.c:2351
+#: src/prefs.c:2362
 msgid "Allow only the users below"
 msgstr "允許下列的使用者和我聯絡"
 
-#: src/prefs.c:2353
+#: src/prefs.c:2364
 msgid "Allow List"
 msgstr "允許清單"
 
-#: src/prefs.c:2384
+#: src/prefs.c:2395
 msgid "Deny all users"
 msgstr "拒絕所有使用者"
 
-#: src/prefs.c:2385
+#: src/prefs.c:2396
 msgid "Block the users below"
 msgstr "拒絕以下的使用者"
 
-#: src/prefs.c:2387
+#: src/prefs.c:2398
 msgid "Block List"
 msgstr "拒絕清單"
 
-#: src/prefs.c:2482
+#: src/prefs.c:2493
 msgid "Gaim - Preferences"
 msgstr "Gaim - 偏好設定"
 
-#: src/prefs.c:2565
+#: src/prefs.c:2576
 msgid "Gaim debug output window"
 msgstr "Gaim 除錯視窗"
 
-#: src/prefs.c:2874
+#: src/prefs.c:2887
 msgid "General"
 msgstr "一般"
 
-#: src/prefs.c:2879
+#: src/prefs.c:2892
 msgid "Proxy"
 msgstr "代理伺服器"
 
-#: src/prefs.c:2903
+#: src/prefs.c:2916
 msgid "Conversations"
 msgstr "交談"
 
-#: src/prefs.c:2929
+#: src/prefs.c:2942
 msgid "Sounds"
 msgstr "音效"
 
-#: src/prefs.c:2951
+#: src/prefs.c:2964
 msgid "Privacy"
 msgstr "隱私"
 
 #: src/prpl.c:70
-msgid "You have attempted to load a protocol which was not compiled from the same version of the source as this application was. Unfortunately, because it is not the same version I cannot safely tell you which one it was. Needless to say, it was not successfully loaded."
+msgid ""
+"You have attempted to load a protocol which was not compiled from the same "
+"version of the source as this application was. Unfortunately, because it is "
+"not the same version I cannot safely tell you which one it was. Needless to "
+"say, it was not successfully loaded."
 msgstr ""
 
 #: src/prpl.c:74
@@ -3123,6 +3453,7 @@
 msgstr "通訊協定錯誤"
 
 #: src/prpl.c:93
+#, c-format
 msgid "%s was using %s, which got removed. %s is now offline."
 msgstr ""
 
@@ -3146,11 +3477,12 @@
 msgid "Open Mail"
 msgstr "開啟郵件"
 
-#: src/prpl.c:564
+#: src/prpl.c:570
+#, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s%s"
 msgstr ""
 
-#: src/prpl.c:572
+#: src/prpl.c:578
 msgid ""
 "\n"
 "\n"
@@ -3160,19 +3492,21 @@
 "\n"
 "您想將他(她)加入到您的好友名單中嗎?"
 
-#: src/prpl.c:615
-msgid "You do not currently have any protocols available that are able to register new accounts."
+#: src/prpl.c:621
+msgid ""
+"You do not currently have any protocols available that are able to register "
+"new accounts."
 msgstr ""
 
-#: src/prpl.c:652
+#: src/prpl.c:658
 msgid "Gaim - Registration"
 msgstr "Gaim - 註冊"
 
-#: src/prpl.c:667
+#: src/prpl.c:673
 msgid "Registration Information"
 msgstr "註冊資訊"
 
-#: src/prpl.c:684
+#: src/prpl.c:690
 msgid "Register"
 msgstr "註冊"
 
@@ -3181,6 +3515,7 @@
 msgstr "請輸入您的密碼"
 
 #: src/server.c:585
+#, c-format
 msgid "(%d messages)"
 msgstr "(%d 個訊息)"
 
@@ -3204,3 +3539,55 @@
 msgid "More Info"
 msgstr "更多資訊"
 
+#: src/sound.c:63
+#, fuzzy
+msgid "Buddy logs in"
+msgstr "好友圖示"
+
+#: src/sound.c:64
+#, fuzzy
+msgid "Buddy logs out"
+msgstr "好友清單"
+
+#: src/sound.c:65
+#, fuzzy
+msgid "Message received"
+msgstr "訊息錯誤"
+
+#: src/sound.c:66
+msgid "Message received begins conversation"
+msgstr ""
+
+#: src/sound.c:67
+#, fuzzy
+msgid "Message sent"
+msgstr "訊息"
+
+#: src/sound.c:68
+msgid "Person enters chat"
+msgstr ""
+
+#: src/sound.c:69
+msgid "Person leaves chat"
+msgstr ""
+
+#: src/sound.c:70
+msgid "You talk in chat"
+msgstr ""
+
+#: src/sound.c:71
+msgid "Others talk in chat"
+msgstr ""
+
+#: src/sound.c:74
+msgid "Someone says your name in chat"
+msgstr ""
+
+#~ msgid "Enable sounds"
+#~ msgstr "開啟音效"
+
+#~ msgid "KFM"
+#~ msgstr "KFM"
+
+#~ msgid "Manual"
+#~ msgstr "自定"